From 6891267b5347f42f1fc53d1f737928ade2449660 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Thu, 16 May 2024 23:59:08 +0000
Subject: [PATCH 0001/1072] Support `ByteStream`s in `bytes starts-with` and
 `bytes ends-with` (#12887)

# Description
Restores `bytes starts-with` so that it is able to work with byte
streams once again. For parity/consistency, this PR also adds byte
stream support to `bytes ends-with`.

# User-Facing Changes
- `bytes ends-with` now supports byte streams.

# Tests + Formatting
Re-enabled tests for `bytes starts-with` and added tests for `bytes
ends-with`.
---
 .../tests/commands/bytes/ends_with.rs         | 120 +++++++++++++
 .../nu-cmd-extra/tests/commands/bytes/mod.rs  |   1 +
 .../tests/commands/bytes/starts_with.rs       | 160 +++++++++---------
 crates/nu-command/src/bytes/ends_with.rs      |  54 +++++-
 crates/nu-command/src/bytes/starts_with.rs    |  36 ++--
 5 files changed, 275 insertions(+), 96 deletions(-)
 create mode 100644 crates/nu-cmd-extra/tests/commands/bytes/ends_with.rs

diff --git a/crates/nu-cmd-extra/tests/commands/bytes/ends_with.rs b/crates/nu-cmd-extra/tests/commands/bytes/ends_with.rs
new file mode 100644
index 0000000000..b90f936b96
--- /dev/null
+++ b/crates/nu-cmd-extra/tests/commands/bytes/ends_with.rs
@@ -0,0 +1,120 @@
+use nu_test_support::nu;
+
+#[test]
+fn basic_binary_end_with() {
+    let actual = nu!(r#"
+            "hello world" | into binary | bytes ends-with 0x[77 6f 72 6c 64]
+        "#);
+
+    assert_eq!(actual.out, "true");
+}
+
+#[test]
+fn basic_string_fails() {
+    let actual = nu!(r#"
+            "hello world" | bytes ends-with 0x[77 6f 72 6c 64]
+        "#);
+
+    assert!(actual.err.contains("command doesn't support"));
+    assert_eq!(actual.out, "");
+}
+
+#[test]
+fn short_stream_binary() {
+    let actual = nu!(r#"
+            nu --testbin repeater (0x[01]) 5 | bytes ends-with 0x[010101]
+        "#);
+
+    assert_eq!(actual.out, "true");
+}
+
+#[test]
+fn short_stream_mismatch() {
+    let actual = nu!(r#"
+            nu --testbin repeater (0x[010203]) 5 | bytes ends-with 0x[010204]
+        "#);
+
+    assert_eq!(actual.out, "false");
+}
+
+#[test]
+fn short_stream_binary_overflow() {
+    let actual = nu!(r#"
+            nu --testbin repeater (0x[01]) 5 | bytes ends-with 0x[010101010101]
+        "#);
+
+    assert_eq!(actual.out, "false");
+}
+
+#[test]
+fn long_stream_binary() {
+    let actual = nu!(r#"
+            nu --testbin repeater (0x[01]) 32768 | bytes ends-with 0x[010101]
+        "#);
+
+    assert_eq!(actual.out, "true");
+}
+
+#[test]
+fn long_stream_binary_overflow() {
+    // .. ranges are inclusive..inclusive, so we don't need to +1 to check for an overflow
+    let actual = nu!(r#"
+            nu --testbin repeater (0x[01]) 32768 | bytes ends-with (0..32768 | each {|| 0x[01] } | bytes collect)
+        "#);
+
+    assert_eq!(actual.out, "false");
+}
+
+#[test]
+fn long_stream_binary_exact() {
+    // ranges are inclusive..inclusive, so we don't need to +1 to check for an overflow
+    let actual = nu!(r#"
+            nu --testbin repeater (0x[01020304]) 8192 | bytes ends-with (0..<8192 | each {|| 0x[01020304] } | bytes collect)
+        "#);
+
+    assert_eq!(actual.out, "true");
+}
+
+#[test]
+fn long_stream_string_exact() {
+    // ranges are inclusive..inclusive, so we don't need to +1 to check for an overflow
+    let actual = nu!(r#"
+            nu --testbin repeater hell 8192 | bytes ends-with (0..<8192 | each {|| "hell" | into binary } | bytes collect)
+        "#);
+
+    assert_eq!(actual.out, "true");
+}
+
+#[test]
+fn long_stream_mixed_exact() {
+    // ranges are inclusive..inclusive, so we don't need to +1 to check for an overflow
+    let actual = nu!(r#"
+            let binseg = (0..<2048 | each {|| 0x[003d9fbf] } | bytes collect)
+            let strseg = (0..<2048 | each {|| "hell" | into binary } | bytes collect)
+
+            nu --testbin repeat_bytes 003d9fbf 2048 68656c6c 2048 | bytes ends-with (bytes build $binseg $strseg)
+        "#);
+
+    assert_eq!(
+        actual.err, "",
+        "invocation failed. command line limit likely reached"
+    );
+    assert_eq!(actual.out, "true");
+}
+
+#[test]
+fn long_stream_mixed_overflow() {
+    // ranges are inclusive..inclusive, so we don't need to +1 to check for an overflow
+    let actual = nu!(r#"
+            let binseg = (0..<2048 | each {|| 0x[003d9fbf] } | bytes collect)
+            let strseg = (0..<2048 | each {|| "hell" | into binary } | bytes collect)
+
+            nu --testbin repeat_bytes 003d9fbf 2048 68656c6c 2048 | bytes ends-with (bytes build 0x[01] $binseg $strseg)
+        "#);
+
+    assert_eq!(
+        actual.err, "",
+        "invocation failed. command line limit likely reached"
+    );
+    assert_eq!(actual.out, "false");
+}
diff --git a/crates/nu-cmd-extra/tests/commands/bytes/mod.rs b/crates/nu-cmd-extra/tests/commands/bytes/mod.rs
index b5517bdacb..a8a241eec0 100644
--- a/crates/nu-cmd-extra/tests/commands/bytes/mod.rs
+++ b/crates/nu-cmd-extra/tests/commands/bytes/mod.rs
@@ -1 +1,2 @@
+mod ends_with;
 mod starts_with;
diff --git a/crates/nu-cmd-extra/tests/commands/bytes/starts_with.rs b/crates/nu-cmd-extra/tests/commands/bytes/starts_with.rs
index c3ad1ec448..e7d57698b5 100644
--- a/crates/nu-cmd-extra/tests/commands/bytes/starts_with.rs
+++ b/crates/nu-cmd-extra/tests/commands/bytes/starts_with.rs
@@ -19,102 +19,102 @@ fn basic_string_fails() {
     assert_eq!(actual.out, "");
 }
 
-// #[test]
-// fn short_stream_binary() {
-//     let actual = nu!(r#"
-//             nu --testbin repeater (0x[01]) 5 | bytes starts-with 0x[010101]
-//         "#);
+#[test]
+fn short_stream_binary() {
+    let actual = nu!(r#"
+            nu --testbin repeater (0x[01]) 5 | bytes starts-with 0x[010101]
+        "#);
 
-//     assert_eq!(actual.out, "true");
-// }
+    assert_eq!(actual.out, "true");
+}
 
-// #[test]
-// fn short_stream_mismatch() {
-//     let actual = nu!(r#"
-//             nu --testbin repeater (0x[010203]) 5 | bytes starts-with 0x[010204]
-//         "#);
+#[test]
+fn short_stream_mismatch() {
+    let actual = nu!(r#"
+            nu --testbin repeater (0x[010203]) 5 | bytes starts-with 0x[010204]
+        "#);
 
-//     assert_eq!(actual.out, "false");
-// }
+    assert_eq!(actual.out, "false");
+}
 
-// #[test]
-// fn short_stream_binary_overflow() {
-//     let actual = nu!(r#"
-//             nu --testbin repeater (0x[01]) 5 | bytes starts-with 0x[010101010101]
-//         "#);
+#[test]
+fn short_stream_binary_overflow() {
+    let actual = nu!(r#"
+            nu --testbin repeater (0x[01]) 5 | bytes starts-with 0x[010101010101]
+        "#);
 
-//     assert_eq!(actual.out, "false");
-// }
+    assert_eq!(actual.out, "false");
+}
 
-// #[test]
-// fn long_stream_binary() {
-//     let actual = nu!(r#"
-//             nu --testbin repeater (0x[01]) 32768 | bytes starts-with 0x[010101]
-//         "#);
+#[test]
+fn long_stream_binary() {
+    let actual = nu!(r#"
+            nu --testbin repeater (0x[01]) 32768 | bytes starts-with 0x[010101]
+        "#);
 
-//     assert_eq!(actual.out, "true");
-// }
+    assert_eq!(actual.out, "true");
+}
 
-// #[test]
-// fn long_stream_binary_overflow() {
-//     // .. ranges are inclusive..inclusive, so we don't need to +1 to check for an overflow
-//     let actual = nu!(r#"
-//             nu --testbin repeater (0x[01]) 32768 | bytes starts-with (0..32768 | each {|| 0x[01] } | bytes collect)
-//         "#);
+#[test]
+fn long_stream_binary_overflow() {
+    // .. ranges are inclusive..inclusive, so we don't need to +1 to check for an overflow
+    let actual = nu!(r#"
+            nu --testbin repeater (0x[01]) 32768 | bytes starts-with (0..32768 | each {|| 0x[01] } | bytes collect)
+        "#);
 
-//     assert_eq!(actual.out, "false");
-// }
+    assert_eq!(actual.out, "false");
+}
 
-// #[test]
-// fn long_stream_binary_exact() {
-//     // ranges are inclusive..inclusive, so we don't need to +1 to check for an overflow
-//     let actual = nu!(r#"
-//             nu --testbin repeater (0x[01020304]) 8192 | bytes starts-with (0..<8192 | each {|| 0x[01020304] } | bytes collect)
-//         "#);
+#[test]
+fn long_stream_binary_exact() {
+    // ranges are inclusive..inclusive, so we don't need to +1 to check for an overflow
+    let actual = nu!(r#"
+            nu --testbin repeater (0x[01020304]) 8192 | bytes starts-with (0..<8192 | each {|| 0x[01020304] } | bytes collect)
+        "#);
 
-//     assert_eq!(actual.out, "true");
-// }
+    assert_eq!(actual.out, "true");
+}
 
-// #[test]
-// fn long_stream_string_exact() {
-//     // ranges are inclusive..inclusive, so we don't need to +1 to check for an overflow
-//     let actual = nu!(r#"
-//             nu --testbin repeater hell 8192 | bytes starts-with (0..<8192 | each {|| "hell" | into binary } | bytes collect)
-//         "#);
+#[test]
+fn long_stream_string_exact() {
+    // ranges are inclusive..inclusive, so we don't need to +1 to check for an overflow
+    let actual = nu!(r#"
+            nu --testbin repeater hell 8192 | bytes starts-with (0..<8192 | each {|| "hell" | into binary } | bytes collect)
+        "#);
 
-//     assert_eq!(actual.out, "true");
-// }
+    assert_eq!(actual.out, "true");
+}
 
-// #[test]
-// fn long_stream_mixed_exact() {
-//     // ranges are inclusive..inclusive, so we don't need to +1 to check for an overflow
-//     let actual = nu!(r#"
-//             let binseg = (0..<2048 | each {|| 0x[003d9fbf] } | bytes collect)
-//             let strseg = (0..<2048 | each {|| "hell" | into binary } | bytes collect)
+#[test]
+fn long_stream_mixed_exact() {
+    // ranges are inclusive..inclusive, so we don't need to +1 to check for an overflow
+    let actual = nu!(r#"
+            let binseg = (0..<2048 | each {|| 0x[003d9fbf] } | bytes collect)
+            let strseg = (0..<2048 | each {|| "hell" | into binary } | bytes collect)
 
-//             nu --testbin repeat_bytes 003d9fbf 2048 68656c6c 2048 | bytes starts-with (bytes build $binseg $strseg)
-//         "#);
+            nu --testbin repeat_bytes 003d9fbf 2048 68656c6c 2048 | bytes starts-with (bytes build $binseg $strseg)
+        "#);
 
-//     assert_eq!(
-//         actual.err, "",
-//         "invocation failed. command line limit likely reached"
-//     );
-//     assert_eq!(actual.out, "true");
-// }
+    assert_eq!(
+        actual.err, "",
+        "invocation failed. command line limit likely reached"
+    );
+    assert_eq!(actual.out, "true");
+}
 
-// #[test]
-// fn long_stream_mixed_overflow() {
-//     // ranges are inclusive..inclusive, so we don't need to +1 to check for an overflow
-//     let actual = nu!(r#"
-//             let binseg = (0..<2048 | each {|| 0x[003d9fbf] } | bytes collect)
-//             let strseg = (0..<2048 | each {|| "hell" | into binary } | bytes collect)
+#[test]
+fn long_stream_mixed_overflow() {
+    // ranges are inclusive..inclusive, so we don't need to +1 to check for an overflow
+    let actual = nu!(r#"
+            let binseg = (0..<2048 | each {|| 0x[003d9fbf] } | bytes collect)
+            let strseg = (0..<2048 | each {|| "hell" | into binary } | bytes collect)
 
-//             nu --testbin repeat_bytes 003d9fbf 2048 68656c6c 2048 | bytes starts-with (bytes build $binseg $strseg 0x[01])
-//         "#);
+            nu --testbin repeat_bytes 003d9fbf 2048 68656c6c 2048 | bytes starts-with (bytes build $binseg $strseg 0x[01])
+        "#);
 
-//     assert_eq!(
-//         actual.err, "",
-//         "invocation failed. command line limit likely reached"
-//     );
-//     assert_eq!(actual.out, "false");
-// }
+    assert_eq!(
+        actual.err, "",
+        "invocation failed. command line limit likely reached"
+    );
+    assert_eq!(actual.out, "false");
+}
diff --git a/crates/nu-command/src/bytes/ends_with.rs b/crates/nu-command/src/bytes/ends_with.rs
index ef0389db0c..d6174a189c 100644
--- a/crates/nu-command/src/bytes/ends_with.rs
+++ b/crates/nu-command/src/bytes/ends_with.rs
@@ -1,5 +1,9 @@
 use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
+use std::{
+    collections::VecDeque,
+    io::{self, BufRead},
+};
 
 struct Arguments {
     pattern: Vec<u8>,
@@ -52,14 +56,54 @@ impl Command for BytesEndsWith {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
+        let head = call.head;
         let pattern: Vec<u8> = call.req(engine_state, stack, 0)?;
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
         let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
-        let arg = Arguments {
-            pattern,
-            cell_paths,
-        };
-        operate(ends_with, arg, input, call.head, engine_state.ctrlc.clone())
+
+        if let PipelineData::ByteStream(stream, ..) = input {
+            let span = stream.span();
+            if pattern.is_empty() {
+                return Ok(Value::bool(true, head).into_pipeline_data());
+            }
+            let Some(mut reader) = stream.reader() else {
+                return Ok(Value::bool(false, head).into_pipeline_data());
+            };
+            let cap = pattern.len();
+            let mut end = VecDeque::<u8>::with_capacity(cap);
+            loop {
+                let buf = match reader.fill_buf() {
+                    Ok(&[]) => break,
+                    Ok(buf) => buf,
+                    Err(e) if e.kind() == io::ErrorKind::Interrupted => continue,
+                    Err(e) => return Err(e.into_spanned(span).into()),
+                };
+                let len = buf.len();
+                if len >= cap {
+                    end.clear();
+                    end.extend(&buf[(len - cap)..])
+                } else {
+                    let new_len = len + end.len();
+                    if new_len > cap {
+                        // The `drain` below will panic if `(new_len - cap) > end.len()`.
+                        // But this cannot happen since we know `len < cap` (as checked above):
+                        //   (len + end.len() - cap) > end.len()
+                        //   => (len - cap) > 0
+                        //   => len > cap
+                        end.drain(..(new_len - cap));
+                    }
+                    end.extend(buf);
+                }
+                reader.consume(len);
+            }
+            Ok(Value::bool(end == pattern, head).into_pipeline_data())
+        } else {
+            let arg = Arguments {
+                pattern,
+                cell_paths,
+            };
+            operate(ends_with, arg, input, head, engine_state.ctrlc.clone())
+        }
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/bytes/starts_with.rs b/crates/nu-command/src/bytes/starts_with.rs
index 2d7ca3e26a..92cc16f02c 100644
--- a/crates/nu-command/src/bytes/starts_with.rs
+++ b/crates/nu-command/src/bytes/starts_with.rs
@@ -1,5 +1,6 @@
 use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
+use std::io::Read;
 
 struct Arguments {
     pattern: Vec<u8>,
@@ -53,20 +54,33 @@ impl Command for BytesStartsWith {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
+        let head = call.head;
         let pattern: Vec<u8> = call.req(engine_state, stack, 0)?;
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
         let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
-        let arg = Arguments {
-            pattern,
-            cell_paths,
-        };
-        operate(
-            starts_with,
-            arg,
-            input,
-            call.head,
-            engine_state.ctrlc.clone(),
-        )
+
+        if let PipelineData::ByteStream(stream, ..) = input {
+            let span = stream.span();
+            if pattern.is_empty() {
+                return Ok(Value::bool(true, head).into_pipeline_data());
+            }
+            let Some(reader) = stream.reader() else {
+                return Ok(Value::bool(false, head).into_pipeline_data());
+            };
+            let mut start = Vec::with_capacity(pattern.len());
+            reader
+                .take(pattern.len() as u64)
+                .read_to_end(&mut start)
+                .err_span(span)?;
+
+            Ok(Value::bool(start == pattern, head).into_pipeline_data())
+        } else {
+            let arg = Arguments {
+                pattern,
+                cell_paths,
+            };
+            operate(starts_with, arg, input, head, engine_state.ctrlc.clone())
+        }
     }
 
     fn examples(&self) -> Vec<Example> {

From 8adf3406e5e6c19f86c82c1f51db93d47217d8ef Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Fri, 17 May 2024 08:03:13 +0800
Subject: [PATCH 0002/1072] allow define it as a variable inside closure
 (#12888)

# Description
Fixes: #12690

The issue is happened after
https://github.com/nushell/nushell/pull/12056 is merged. It will raise
error if user doesn't supply required parameter when run closure with
do.
And parser adds a `$it` parameter when parsing closure or block
expression.

I believe the previous behavior is because we allow such syntax on
previous version(0.44):
```nushell
let x = { print $it }
```
But it's no longer allowed after 0.60.  So I think they can be removed.

# User-Facing Changes
```nushell
let tmp = {
  let it = 42
  print $it
}

do -c $tmp
```
should be possible again.

# Tests + Formatting
Added 1 test
---
 crates/nu-command/tests/commands/do_.rs |  7 +++++++
 crates/nu-parser/src/parser.rs          | 28 -------------------------
 2 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/crates/nu-command/tests/commands/do_.rs b/crates/nu-command/tests/commands/do_.rs
index 6a71a0f025..5f46b02c17 100644
--- a/crates/nu-command/tests/commands/do_.rs
+++ b/crates/nu-command/tests/commands/do_.rs
@@ -66,3 +66,10 @@ fn ignore_error_works_with_list_stream() {
     let actual = nu!(r#"do -i { ["a", null, "b"] | ansi strip }"#);
     assert!(actual.err.is_empty());
 }
+
+#[test]
+fn run_closure_with_it_using() {
+    let actual = nu!(r#"let x = {let it = 3; $it}; do $x"#);
+    assert!(actual.err.is_empty());
+    assert_eq!(actual.out, "3");
+}
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index bd09f5b52a..fb36e8b503 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -4177,20 +4177,6 @@ pub fn parse_block_expression(working_set: &mut StateWorkingSet, span: Span) ->
 
     if let Some(signature) = signature {
         output.signature = signature.0;
-    } else if let Some(last) = working_set.delta.scope.last() {
-        // FIXME: this only supports the top $it. Is this sufficient?
-
-        if let Some(var_id) = last.get_var(b"$it") {
-            let mut signature = Signature::new("");
-            signature.required_positional.push(PositionalArg {
-                var_id: Some(*var_id),
-                name: "$it".into(),
-                desc: String::new(),
-                shape: SyntaxShape::Any,
-                default_value: None,
-            });
-            output.signature = Box::new(signature);
-        }
     }
 
     output.span = Some(span);
@@ -4518,20 +4504,6 @@ pub fn parse_closure_expression(
 
     if let Some(signature) = signature {
         output.signature = signature.0;
-    } else if let Some(last) = working_set.delta.scope.last() {
-        // FIXME: this only supports the top $it. Is this sufficient?
-
-        if let Some(var_id) = last.get_var(b"$it") {
-            let mut signature = Signature::new("");
-            signature.required_positional.push(PositionalArg {
-                var_id: Some(*var_id),
-                name: "$it".into(),
-                desc: String::new(),
-                shape: SyntaxShape::Any,
-                default_value: None,
-            });
-            output.signature = Box::new(signature);
-        }
     }
 
     output.span = Some(span);

From 59f7c523fac538a433ee80ebdbd8a1f410590082 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Fri, 17 May 2024 07:18:18 -0700
Subject: [PATCH 0003/1072] Fix the way the output of `table` is printed in
 `print()` (#12895)

# Description

Forgot that I fixed this already on my branch, but when printing without
a display output hook, the implicit call to `table` gets its output
mangled with newlines (since #12774). This happens when running `nu -c`
or a script file.

Here's that fix in one PR so it can be merged easily.

# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
---
 .../nu-protocol/src/pipeline/pipeline_data.rs | 46 ++++++++++---------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/crates/nu-protocol/src/pipeline/pipeline_data.rs b/crates/nu-protocol/src/pipeline/pipeline_data.rs
index d7e58e63a3..b2883b1673 100644
--- a/crates/nu-protocol/src/pipeline/pipeline_data.rs
+++ b/crates/nu-protocol/src/pipeline/pipeline_data.rs
@@ -543,16 +543,15 @@ impl PipelineData {
             if let Some(decl_id) = engine_state.table_decl_id {
                 let command = engine_state.get_decl(decl_id);
                 if command.get_block_id().is_some() {
-                    self.write_all_and_flush(engine_state, no_newline, to_stderr)?;
+                    self.write_all_and_flush(engine_state, no_newline, to_stderr)
                 } else {
                     let call = Call::new(Span::new(0, 0));
                     let table = command.run(engine_state, stack, &call, self)?;
-                    table.write_all_and_flush(engine_state, no_newline, to_stderr)?;
+                    table.write_all_and_flush(engine_state, no_newline, to_stderr)
                 }
             } else {
-                self.write_all_and_flush(engine_state, no_newline, to_stderr)?;
+                self.write_all_and_flush(engine_state, no_newline, to_stderr)
             }
-            Ok(None)
         }
     }
 
@@ -561,27 +560,32 @@ impl PipelineData {
         engine_state: &EngineState,
         no_newline: bool,
         to_stderr: bool,
-    ) -> Result<(), ShellError> {
-        let config = engine_state.get_config();
-        for item in self {
-            let mut out = if let Value::Error { error, .. } = item {
-                return Err(*error);
-            } else {
-                item.to_expanded_string("\n", config)
-            };
+    ) -> Result<Option<ExitStatus>, ShellError> {
+        if let PipelineData::ByteStream(stream, ..) = self {
+            // Copy ByteStreams directly
+            stream.print(to_stderr)
+        } else {
+            let config = engine_state.get_config();
+            for item in self {
+                let mut out = if let Value::Error { error, .. } = item {
+                    return Err(*error);
+                } else {
+                    item.to_expanded_string("\n", config)
+                };
 
-            if !no_newline {
-                out.push('\n');
+                if !no_newline {
+                    out.push('\n');
+                }
+
+                if to_stderr {
+                    stderr_write_all_and_flush(out)?
+                } else {
+                    stdout_write_all_and_flush(out)?
+                }
             }
 
-            if to_stderr {
-                stderr_write_all_and_flush(out)?
-            } else {
-                stdout_write_all_and_flush(out)?
-            }
+            Ok(None)
         }
-
-        Ok(())
     }
 }
 

From e3db6ea04ae085dbbe6f1aea984b23069fbb2a46 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Fri, 17 May 2024 08:04:59 -0700
Subject: [PATCH 0004/1072] Exclude polars from ensure_plugins_built(), for
 performance reasons (#12896)

# Description

We have been building `nu_plugin_polars` unnecessarily during `cargo
test`, which is very slow. All of its tests are run within its own
crate, which happens during the plugins CI phase.

This should speed up the CI a bit.
---
 crates/nu-test-support/src/commands.rs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/crates/nu-test-support/src/commands.rs b/crates/nu-test-support/src/commands.rs
index dca43c3c14..6939c9bc11 100644
--- a/crates/nu-test-support/src/commands.rs
+++ b/crates/nu-test-support/src/commands.rs
@@ -21,7 +21,18 @@ pub fn ensure_plugins_built() {
     }
 
     let cargo_path = env!("CARGO");
-    let mut arguments = vec!["build", "--package", "nu_plugin_*", "--quiet"];
+    let mut arguments = vec![
+        "build",
+        "--workspace",
+        "--bins",
+        // Don't build nu, so that we only build the plugins
+        "--exclude",
+        "nu",
+        // Exclude nu_plugin_polars, because it's not needed at this stage, and is a large build
+        "--exclude",
+        "nu_plugin_polars",
+        "--quiet",
+    ];
 
     let profile = std::env::var("NUSHELL_CARGO_PROFILE");
     if let Ok(profile) = &profile {

From c10aa2cf09a50fc82127c6a9cbe685075688ad1f Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Fri, 17 May 2024 09:46:03 -0700
Subject: [PATCH 0005/1072] `collect`: don't require a closure (#12788)

# Description

This changes the `collect` command so that it doesn't require a closure.
Still allowed, optionally.

Before:

```nushell
open foo.json | insert foo bar | collect { save -f foo.json }
```

After:

```nushell
open foo.json | insert foo bar | collect | save -f foo.json
```

The closure argument isn't really necessary, as collect values are also
supported as `PipelineData`.

# User-Facing Changes
- `collect` command changed

# Tests + Formatting
Example changed to reflect.

# After Submitting
- [ ] release notes
- [ ] we may want to deprecate the closure arg?
---
 .../nu-cmd-lang/src/core_commands/collect.rs  | 94 +++++++++++--------
 crates/nu-command/src/filesystem/save.rs      | 14 ++-
 crates/nu-command/tests/commands/save.rs      | 41 +++++++-
 3 files changed, 106 insertions(+), 43 deletions(-)

diff --git a/crates/nu-cmd-lang/src/core_commands/collect.rs b/crates/nu-cmd-lang/src/core_commands/collect.rs
index 404aa568da..1c28646548 100644
--- a/crates/nu-cmd-lang/src/core_commands/collect.rs
+++ b/crates/nu-cmd-lang/src/core_commands/collect.rs
@@ -1,5 +1,5 @@
 use nu_engine::{command_prelude::*, get_eval_block, redirect_env};
-use nu_protocol::engine::Closure;
+use nu_protocol::{engine::Closure, DataSource, PipelineMetadata};
 
 #[derive(Clone)]
 pub struct Collect;
@@ -12,7 +12,7 @@ impl Command for Collect {
     fn signature(&self) -> Signature {
         Signature::build("collect")
             .input_output_types(vec![(Type::Any, Type::Any)])
-            .required(
+            .optional(
                 "closure",
                 SyntaxShape::Closure(Some(vec![SyntaxShape::Any])),
                 "The closure to run once the stream is collected.",
@@ -26,7 +26,14 @@ impl Command for Collect {
     }
 
     fn usage(&self) -> &str {
-        "Collect a stream into a value and then run a closure with the collected value as input."
+        "Collect a stream into a value."
+    }
+
+    fn extra_usage(&self) -> &str {
+        r#"If provided, run a closure with the collected value as input.
+
+The entire stream will be collected into one value in memory, so if the stream
+is particularly large, this can cause high memory usage."#
     }
 
     fn run(
@@ -36,46 +43,59 @@ impl Command for Collect {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let closure: Closure = call.req(engine_state, stack, 0)?;
+        let closure: Option<Closure> = call.opt(engine_state, stack, 0)?;
 
-        let block = engine_state.get_block(closure.block_id);
-        let mut stack_captures =
-            stack.captures_to_stack_preserve_out_dest(closure.captures.clone());
+        let metadata = match input.metadata() {
+            // Remove the `FilePath` metadata, because after `collect` it's no longer necessary to
+            // check where some input came from.
+            Some(PipelineMetadata {
+                data_source: DataSource::FilePath(_),
+            }) => None,
+            other => other,
+        };
 
-        let metadata = input.metadata();
         let input = input.into_value(call.head)?;
+        let result;
 
-        let mut saved_positional = None;
-        if let Some(var) = block.signature.get_positional(0) {
-            if let Some(var_id) = &var.var_id {
-                stack_captures.add_var(*var_id, input.clone());
-                saved_positional = Some(*var_id);
+        if let Some(closure) = closure {
+            let block = engine_state.get_block(closure.block_id);
+            let mut stack_captures =
+                stack.captures_to_stack_preserve_out_dest(closure.captures.clone());
+
+            let mut saved_positional = None;
+            if let Some(var) = block.signature.get_positional(0) {
+                if let Some(var_id) = &var.var_id {
+                    stack_captures.add_var(*var_id, input.clone());
+                    saved_positional = Some(*var_id);
+                }
             }
+
+            let eval_block = get_eval_block(engine_state);
+
+            result = eval_block(
+                engine_state,
+                &mut stack_captures,
+                block,
+                input.into_pipeline_data_with_metadata(metadata),
+            );
+
+            if call.has_flag(engine_state, stack, "keep-env")? {
+                redirect_env(engine_state, stack, &stack_captures);
+                // for when we support `data | let x = $in;`
+                // remove the variables added earlier
+                for (var_id, _) in closure.captures {
+                    stack_captures.remove_var(var_id);
+                }
+                if let Some(u) = saved_positional {
+                    stack_captures.remove_var(u);
+                }
+                // add any new variables to the stack
+                stack.vars.extend(stack_captures.vars);
+            }
+        } else {
+            result = Ok(input.into_pipeline_data_with_metadata(metadata));
         }
 
-        let eval_block = get_eval_block(engine_state);
-
-        let result = eval_block(
-            engine_state,
-            &mut stack_captures,
-            block,
-            input.into_pipeline_data(),
-        )
-        .map(|x| x.set_metadata(metadata));
-
-        if call.has_flag(engine_state, stack, "keep-env")? {
-            redirect_env(engine_state, stack, &stack_captures);
-            // for when we support `data | let x = $in;`
-            // remove the variables added earlier
-            for (var_id, _) in closure.captures {
-                stack_captures.remove_var(var_id);
-            }
-            if let Some(u) = saved_positional {
-                stack_captures.remove_var(u);
-            }
-            // add any new variables to the stack
-            stack.vars.extend(stack_captures.vars);
-        }
         result
     }
 
@@ -88,7 +108,7 @@ impl Command for Collect {
             },
             Example {
                 description: "Read and write to the same file",
-                example: "open file.txt | collect { save -f file.txt }",
+                example: "open file.txt | collect | save -f file.txt",
                 result: None,
             },
         ]
diff --git a/crates/nu-command/src/filesystem/save.rs b/crates/nu-command/src/filesystem/save.rs
index ca9943eafb..7326011d9b 100644
--- a/crates/nu-command/src/filesystem/save.rs
+++ b/crates/nu-command/src/filesystem/save.rs
@@ -245,11 +245,15 @@ impl Command for Save {
                 Ok(PipelineData::empty())
             }
             input => {
-                check_saving_to_source_file(
-                    input.metadata().as_ref(),
-                    &path,
-                    stderr_path.as_ref(),
-                )?;
+                // It's not necessary to check if we are saving to the same file if this is a
+                // collected value, and not a stream
+                if !matches!(input, PipelineData::Value(..) | PipelineData::Empty) {
+                    check_saving_to_source_file(
+                        input.metadata().as_ref(),
+                        &path,
+                        stderr_path.as_ref(),
+                    )?;
+                }
 
                 let bytes =
                     input_to_bytes(input, Path::new(&path.item), raw, engine_state, stack, span)?;
diff --git a/crates/nu-command/tests/commands/save.rs b/crates/nu-command/tests/commands/save.rs
index ef0304dc7c..8a2332afdf 100644
--- a/crates/nu-command/tests/commands/save.rs
+++ b/crates/nu-command/tests/commands/save.rs
@@ -84,7 +84,7 @@ fn save_append_will_not_overwrite_content() {
 }
 
 #[test]
-fn save_stderr_and_stdout_to_afame_file() {
+fn save_stderr_and_stdout_to_same_file() {
     Playground::setup("save_test_5", |dirs, sandbox| {
         sandbox.with_files(&[]);
 
@@ -424,3 +424,42 @@ fn save_with_custom_converter() {
         assert_eq!(actual, r#"{"a":1,"b":2}"#);
     })
 }
+
+#[test]
+fn save_same_file_with_collect() {
+    Playground::setup("save_test_20", |dirs, _sandbox| {
+        let actual = nu!(
+            cwd: dirs.test(), pipeline("
+                echo 'world'
+                | save hello;
+                open hello
+                | prepend 'hello'
+                | collect
+                | save --force hello;
+                open hello
+            ")
+        );
+        assert!(actual.status.success());
+        assert_eq!("helloworld", actual.out);
+    })
+}
+
+#[test]
+fn save_same_file_with_collect_and_filter() {
+    Playground::setup("save_test_21", |dirs, _sandbox| {
+        let actual = nu!(
+            cwd: dirs.test(), pipeline("
+                echo 'world'
+                | save hello;
+                open hello
+                | prepend 'hello'
+                | collect
+                | filter { true }
+                | save --force hello;
+                open hello
+            ")
+        );
+        assert!(actual.status.success());
+        assert_eq!("helloworld", actual.out);
+    })
+}

From 580c60bb821af25f838edafd8461bb206d3419f3 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Fri, 17 May 2024 17:59:32 +0000
Subject: [PATCH 0006/1072] Preserve metadata in more places (#12848)

# Description
This PR makes some commands and areas of code preserve pipeline
metadata. This is in an attempt to make the issue described in #12599
and #9456 less likely to occur. That is, reading and writing to the same
file in a pipeline will result in an empty file. Since we preserve
metadata in more places now, there will be a higher chance that we
successfully detect this error case and abort the pipeline.
---
 crates/nu-command/src/filesystem/save.rs      |   4 +-
 .../nu-protocol/src/pipeline/pipeline_data.rs | 104 ++++++++++--------
 2 files changed, 59 insertions(+), 49 deletions(-)

diff --git a/crates/nu-command/src/filesystem/save.rs b/crates/nu-command/src/filesystem/save.rs
index 7326011d9b..1be74665b2 100644
--- a/crates/nu-command/src/filesystem/save.rs
+++ b/crates/nu-command/src/filesystem/save.rs
@@ -322,7 +322,9 @@ fn saving_to_source_file_error(dest: &Spanned<PathBuf>) -> ShellError {
             dest.item.display()
         ),
         span: Some(dest.span),
-        help: Some("You should use `collect` to run your save command (see `help collect`). Or, you can put the file data in a variable and then pass the variable to `save`.".into()),
+        help: Some(
+            "insert a `collect` command in the pipeline before `save` (see `help collect`).".into(),
+        ),
         inner: vec![],
     }
 }
diff --git a/crates/nu-protocol/src/pipeline/pipeline_data.rs b/crates/nu-protocol/src/pipeline/pipeline_data.rs
index b2883b1673..0f4d1eb826 100644
--- a/crates/nu-protocol/src/pipeline/pipeline_data.rs
+++ b/crates/nu-protocol/src/pipeline/pipeline_data.rs
@@ -291,36 +291,38 @@ impl PipelineData {
         F: FnMut(Value) -> Value + 'static + Send,
     {
         match self {
-            PipelineData::Value(value, ..) => {
+            PipelineData::Value(value, metadata) => {
                 let span = value.span();
-                match value {
+                let pipeline = match value {
                     Value::List { vals, .. } => {
-                        Ok(vals.into_iter().map(f).into_pipeline_data(span, ctrlc))
+                        vals.into_iter().map(f).into_pipeline_data(span, ctrlc)
                     }
-                    Value::Range { val, .. } => Ok(val
+                    Value::Range { val, .. } => val
                         .into_range_iter(span, ctrlc.clone())
                         .map(f)
-                        .into_pipeline_data(span, ctrlc)),
+                        .into_pipeline_data(span, ctrlc),
                     value => match f(value) {
-                        Value::Error { error, .. } => Err(*error),
-                        v => Ok(v.into_pipeline_data()),
+                        Value::Error { error, .. } => return Err(*error),
+                        v => v.into_pipeline_data(),
                     },
-                }
+                };
+                Ok(pipeline.set_metadata(metadata))
             }
             PipelineData::Empty => Ok(PipelineData::Empty),
-            PipelineData::ListStream(stream, ..) => {
-                Ok(PipelineData::ListStream(stream.map(f), None))
+            PipelineData::ListStream(stream, metadata) => {
+                Ok(PipelineData::ListStream(stream.map(f), metadata))
             }
-            PipelineData::ByteStream(stream, ..) => {
+            PipelineData::ByteStream(stream, metadata) => {
                 // TODO: is this behavior desired / correct ?
                 let span = stream.span();
-                match String::from_utf8(stream.into_bytes()?) {
+                let value = match String::from_utf8(stream.into_bytes()?) {
                     Ok(mut str) => {
                         str.truncate(str.trim_end_matches(LINE_ENDING_PATTERN).len());
-                        Ok(f(Value::string(str, span)).into_pipeline_data())
+                        f(Value::string(str, span))
                     }
-                    Err(err) => Ok(f(Value::binary(err.into_bytes(), span)).into_pipeline_data()),
-                }
+                    Err(err) => f(Value::binary(err.into_bytes(), span)),
+                };
+                Ok(value.into_pipeline_data_with_metadata(metadata))
             }
         }
     }
@@ -339,36 +341,37 @@ impl PipelineData {
     {
         match self {
             PipelineData::Empty => Ok(PipelineData::Empty),
-            PipelineData::Value(value, ..) => {
+            PipelineData::Value(value, metadata) => {
                 let span = value.span();
-                match value {
+                let pipeline = match value {
                     Value::List { vals, .. } => {
-                        Ok(vals.into_iter().flat_map(f).into_pipeline_data(span, ctrlc))
+                        vals.into_iter().flat_map(f).into_pipeline_data(span, ctrlc)
                     }
-                    Value::Range { val, .. } => Ok(val
+                    Value::Range { val, .. } => val
                         .into_range_iter(span, ctrlc.clone())
                         .flat_map(f)
-                        .into_pipeline_data(span, ctrlc)),
-                    value => Ok(f(value).into_iter().into_pipeline_data(span, ctrlc)),
-                }
+                        .into_pipeline_data(span, ctrlc),
+                    value => f(value).into_iter().into_pipeline_data(span, ctrlc),
+                };
+                Ok(pipeline.set_metadata(metadata))
             }
-            PipelineData::ListStream(stream, ..) => {
-                Ok(stream.modify(|iter| iter.flat_map(f)).into())
-            }
-            PipelineData::ByteStream(stream, ..) => {
+            PipelineData::ListStream(stream, metadata) => Ok(PipelineData::ListStream(
+                stream.modify(|iter| iter.flat_map(f)),
+                metadata,
+            )),
+            PipelineData::ByteStream(stream, metadata) => {
                 // TODO: is this behavior desired / correct ?
                 let span = stream.span();
-                match String::from_utf8(stream.into_bytes()?) {
+                let iter = match String::from_utf8(stream.into_bytes()?) {
                     Ok(mut str) => {
                         str.truncate(str.trim_end_matches(LINE_ENDING_PATTERN).len());
-                        Ok(f(Value::string(str, span))
-                            .into_iter()
-                            .into_pipeline_data(span, ctrlc))
+                        f(Value::string(str, span))
                     }
-                    Err(err) => Ok(f(Value::binary(err.into_bytes(), span))
-                        .into_iter()
-                        .into_pipeline_data(span, ctrlc)),
-                }
+                    Err(err) => f(Value::binary(err.into_bytes(), span)),
+                };
+                Ok(iter
+                    .into_iter()
+                    .into_pipeline_data_with_metadata(span, ctrlc, metadata))
             }
         }
     }
@@ -384,27 +387,31 @@ impl PipelineData {
     {
         match self {
             PipelineData::Empty => Ok(PipelineData::Empty),
-            PipelineData::Value(value, ..) => {
+            PipelineData::Value(value, metadata) => {
                 let span = value.span();
-                match value {
+                let pipeline = match value {
                     Value::List { vals, .. } => {
-                        Ok(vals.into_iter().filter(f).into_pipeline_data(span, ctrlc))
+                        vals.into_iter().filter(f).into_pipeline_data(span, ctrlc)
                     }
-                    Value::Range { val, .. } => Ok(val
+                    Value::Range { val, .. } => val
                         .into_range_iter(span, ctrlc.clone())
                         .filter(f)
-                        .into_pipeline_data(span, ctrlc)),
+                        .into_pipeline_data(span, ctrlc),
                     value => {
                         if f(&value) {
-                            Ok(value.into_pipeline_data())
+                            value.into_pipeline_data()
                         } else {
-                            Ok(Value::nothing(span).into_pipeline_data())
+                            Value::nothing(span).into_pipeline_data()
                         }
                     }
-                }
+                };
+                Ok(pipeline.set_metadata(metadata))
             }
-            PipelineData::ListStream(stream, ..) => Ok(stream.modify(|iter| iter.filter(f)).into()),
-            PipelineData::ByteStream(stream, ..) => {
+            PipelineData::ListStream(stream, metadata) => Ok(PipelineData::ListStream(
+                stream.modify(|iter| iter.filter(f)),
+                metadata,
+            )),
+            PipelineData::ByteStream(stream, metadata) => {
                 // TODO: is this behavior desired / correct ?
                 let span = stream.span();
                 let value = match String::from_utf8(stream.into_bytes()?) {
@@ -414,11 +421,12 @@ impl PipelineData {
                     }
                     Err(err) => Value::binary(err.into_bytes(), span),
                 };
-                if f(&value) {
-                    Ok(value.into_pipeline_data())
+                let value = if f(&value) {
+                    value
                 } else {
-                    Ok(Value::nothing(span).into_pipeline_data())
-                }
+                    Value::nothing(span)
+                };
+                Ok(value.into_pipeline_data_with_metadata(metadata))
             }
         }
     }

From cc9f41e553333b1ad0aa4185a912f7a52355a238 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Sat, 18 May 2024 23:37:31 +0000
Subject: [PATCH 0007/1072] Use `CommandType` in more places (#12832)

# Description
Kind of a vague title, but this PR does two main things:
1. Rather than overriding functions like `Command::is_parser_keyword`,
this PR instead changes commands to override `Command::command_type`.
The `CommandType` returned by `Command::command_type` is then used to
automatically determine whether `Command::is_parser_keyword` and the
other `is_{type}` functions should return true. These changes allow us
to remove the `CommandType::Other` case and should also guarantee than
only one of the `is_{type}` functions on `Command` will return true.
2. Uses the new, reworked `Command::command_type` function in the `scope
commands` and `which` commands.


# User-Facing Changes
- Breaking change for `scope commands`: multiple columns (`is_builtin`,
`is_keyword`, `is_plugin`, etc.) have been merged into the `type`
column.
- Breaking change: the `which` command can now report `plugin` or
`keyword` instead of `built-in` in the `type` column. It may also now
report `external` instead of `custom` in the `type` column for known
`extern`s.
---
 crates/nu-cli/src/commands/keybindings.rs     |   2 +-
 crates/nu-cli/src/menus/help_completions.rs   |   6 +-
 crates/nu-cmd-dataframe/src/dataframe/stub.rs |   2 +-
 crates/nu-cmd-extra/src/extra/bits/bits_.rs   |   2 +-
 .../src/extra/filters/roll/roll_.rs           |   2 +-
 .../src/extra/strings/str_/case/str_.rs       |   2 +-
 crates/nu-cmd-lang/src/core_commands/alias.rs |   5 +-
 .../nu-cmd-lang/src/core_commands/const_.rs   |   5 +-
 crates/nu-cmd-lang/src/core_commands/def.rs   |   5 +-
 .../nu-cmd-lang/src/core_commands/export.rs   |   7 +-
 .../src/core_commands/export_alias.rs         |   5 +-
 .../src/core_commands/export_const.rs         |   5 +-
 .../src/core_commands/export_def.rs           |   5 +-
 .../src/core_commands/export_extern.rs        |   5 +-
 .../src/core_commands/export_module.rs        |   5 +-
 .../src/core_commands/export_use.rs           |   5 +-
 .../nu-cmd-lang/src/core_commands/extern_.rs  |   5 +-
 crates/nu-cmd-lang/src/core_commands/for_.rs  |   5 +-
 crates/nu-cmd-lang/src/core_commands/hide.rs  |   5 +-
 crates/nu-cmd-lang/src/core_commands/let_.rs  |   5 +-
 .../nu-cmd-lang/src/core_commands/module.rs   |   5 +-
 crates/nu-cmd-lang/src/core_commands/mut_.rs  |   5 +-
 .../src/core_commands/overlay/command.rs      |   7 +-
 .../src/core_commands/overlay/hide.rs         |   5 +-
 .../src/core_commands/overlay/new.rs          |   5 +-
 .../src/core_commands/overlay/use_.rs         |   6 +-
 .../nu-cmd-lang/src/core_commands/return_.rs  |   5 +-
 .../src/core_commands/scope/command.rs        |   7 +-
 crates/nu-cmd-lang/src/core_commands/use_.rs  |   9 +-
 .../nu-cmd-plugin/src/commands/plugin/mod.rs  |   2 +-
 .../nu-cmd-plugin/src/commands/plugin/use_.rs |   5 +-
 crates/nu-cmd-plugin/src/commands/register.rs |   5 +-
 crates/nu-command/src/bytes/bytes_.rs         |   2 +-
 .../src/conversions/into/command.rs           |   2 +-
 crates/nu-command/src/debug/view.rs           |   2 +-
 crates/nu-command/src/debug/view_source.rs    |   2 +-
 crates/nu-command/src/env/config/config_.rs   |   2 +-
 crates/nu-command/src/filesystem/open.rs      |   2 +-
 crates/nu-command/src/filesystem/save.rs      |   2 +-
 crates/nu-command/src/formats/from/command.rs |   2 +-
 crates/nu-command/src/formats/to/command.rs   |   2 +-
 crates/nu-command/src/hash/hash_.rs           |   2 +-
 crates/nu-command/src/help/help_commands.rs   |  13 +-
 crates/nu-command/src/help/help_externs.rs    |  13 +-
 crates/nu-command/src/math/math_.rs           |   2 +-
 crates/nu-command/src/misc/source.rs          |   5 +-
 crates/nu-command/src/network/http/http_.rs   |   2 +-
 crates/nu-command/src/network/url/url_.rs     |   2 +-
 crates/nu-command/src/path/path_.rs           |   2 +-
 crates/nu-command/src/random/random_.rs       |   2 +-
 crates/nu-command/src/stor/stor_.rs           |   2 +-
 .../nu-command/src/strings/format/format_.rs  |   2 +-
 .../nu-command/src/strings/split/command.rs   |   2 +-
 .../nu-command/src/strings/str_/case/str_.rs  |   2 +-
 crates/nu-command/src/system/which_.rs        |  27 ++--
 crates/nu-engine/src/eval.rs                  |   4 +-
 crates/nu-engine/src/scope.rs                 |   7 +-
 crates/nu-lsp/src/lib.rs                      |   2 +-
 crates/nu-parser/src/known_external.rs        |  13 +-
 crates/nu-parser/src/parse_keywords.rs        |   2 +-
 crates/nu-parser/src/parser.rs                |   2 +-
 crates/nu-plugin-engine/src/declaration.rs    |   6 +-
 crates/nu-protocol/src/alias.rs               |   6 +-
 crates/nu-protocol/src/engine/command.rs      | 119 ++++++++----------
 crates/nu-protocol/src/engine/engine_state.rs |  18 +--
 .../nu-protocol/src/pipeline/pipeline_data.rs |   2 +-
 crates/nu-protocol/src/signature.rs           |   8 +-
 src/ide.rs                                    |   2 +-
 68 files changed, 224 insertions(+), 217 deletions(-)

diff --git a/crates/nu-cli/src/commands/keybindings.rs b/crates/nu-cli/src/commands/keybindings.rs
index 469c0f96cd..a8c8053a56 100644
--- a/crates/nu-cli/src/commands/keybindings.rs
+++ b/crates/nu-cli/src/commands/keybindings.rs
@@ -42,7 +42,7 @@ For more information on input and keybindings, check:
                 &Keybindings.examples(),
                 engine_state,
                 stack,
-                self.is_parser_keyword(),
+                self.is_keyword(),
             ),
             call.head,
         )
diff --git a/crates/nu-cli/src/menus/help_completions.rs b/crates/nu-cli/src/menus/help_completions.rs
index b8bdaad435..62f40b9d8d 100644
--- a/crates/nu-cli/src/menus/help_completions.rs
+++ b/crates/nu-cli/src/menus/help_completions.rs
@@ -18,7 +18,7 @@ impl NuHelpCompleter {
         //Vec<(Signature, Vec<Example>, bool, bool)> {
         let mut commands = full_commands
             .iter()
-            .filter(|(sig, _, _, _, _)| {
+            .filter(|(sig, _, _)| {
                 sig.name.to_folded_case().contains(&folded_line)
                     || sig.usage.to_folded_case().contains(&folded_line)
                     || sig
@@ -29,7 +29,7 @@ impl NuHelpCompleter {
             })
             .collect::<Vec<_>>();
 
-        commands.sort_by(|(a, _, _, _, _), (b, _, _, _, _)| {
+        commands.sort_by(|(a, _, _), (b, _, _)| {
             let a_distance = levenshtein_distance(line, &a.name);
             let b_distance = levenshtein_distance(line, &b.name);
             a_distance.cmp(&b_distance)
@@ -37,7 +37,7 @@ impl NuHelpCompleter {
 
         commands
             .into_iter()
-            .map(|(sig, examples, _, _, _)| {
+            .map(|(sig, examples, _)| {
                 let mut long_desc = String::new();
 
                 let usage = &sig.usage;
diff --git a/crates/nu-cmd-dataframe/src/dataframe/stub.rs b/crates/nu-cmd-dataframe/src/dataframe/stub.rs
index 2d8cfde423..58dd2996cd 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/stub.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/stub.rs
@@ -35,7 +35,7 @@ impl Command for Dfr {
                 &Dfr.examples(),
                 engine_state,
                 stack,
-                self.is_parser_keyword(),
+                self.is_keyword(),
             ),
             call.head,
         )
diff --git a/crates/nu-cmd-extra/src/extra/bits/bits_.rs b/crates/nu-cmd-extra/src/extra/bits/bits_.rs
index 6767d3dd83..d795beda4e 100644
--- a/crates/nu-cmd-extra/src/extra/bits/bits_.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/bits_.rs
@@ -35,7 +35,7 @@ impl Command for Bits {
                 &Bits.examples(),
                 engine_state,
                 stack,
-                self.is_parser_keyword(),
+                self.is_keyword(),
             ),
             call.head,
         )
diff --git a/crates/nu-cmd-extra/src/extra/filters/roll/roll_.rs b/crates/nu-cmd-extra/src/extra/filters/roll/roll_.rs
index 76e167a575..a1622d71c0 100644
--- a/crates/nu-cmd-extra/src/extra/filters/roll/roll_.rs
+++ b/crates/nu-cmd-extra/src/extra/filters/roll/roll_.rs
@@ -39,7 +39,7 @@ impl Command for Roll {
                 &Roll.examples(),
                 engine_state,
                 stack,
-                self.is_parser_keyword(),
+                self.is_keyword(),
             ),
             call.head,
         )
diff --git a/crates/nu-cmd-extra/src/extra/strings/str_/case/str_.rs b/crates/nu-cmd-extra/src/extra/strings/str_/case/str_.rs
index cf4537f046..56e0d1164f 100644
--- a/crates/nu-cmd-extra/src/extra/strings/str_/case/str_.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/str_/case/str_.rs
@@ -35,7 +35,7 @@ impl Command for Str {
                 &Str.examples(),
                 engine_state,
                 stack,
-                self.is_parser_keyword(),
+                self.is_keyword(),
             ),
             call.head,
         )
diff --git a/crates/nu-cmd-lang/src/core_commands/alias.rs b/crates/nu-cmd-lang/src/core_commands/alias.rs
index f3603611e4..f14f4d5827 100644
--- a/crates/nu-cmd-lang/src/core_commands/alias.rs
+++ b/crates/nu-cmd-lang/src/core_commands/alias.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct Alias;
@@ -29,8 +30,8 @@ impl Command for Alias {
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
 
-    fn is_parser_keyword(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
     }
 
     fn search_terms(&self) -> Vec<&str> {
diff --git a/crates/nu-cmd-lang/src/core_commands/const_.rs b/crates/nu-cmd-lang/src/core_commands/const_.rs
index 4076ae87c9..f780c5ada9 100644
--- a/crates/nu-cmd-lang/src/core_commands/const_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/const_.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct Const;
@@ -30,8 +31,8 @@ impl Command for Const {
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
 
-    fn is_parser_keyword(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
     }
 
     fn search_terms(&self) -> Vec<&str> {
diff --git a/crates/nu-cmd-lang/src/core_commands/def.rs b/crates/nu-cmd-lang/src/core_commands/def.rs
index 922ba78abb..eb1124da19 100644
--- a/crates/nu-cmd-lang/src/core_commands/def.rs
+++ b/crates/nu-cmd-lang/src/core_commands/def.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct Def;
@@ -28,8 +29,8 @@ impl Command for Def {
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
 
-    fn is_parser_keyword(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
     }
 
     fn run(
diff --git a/crates/nu-cmd-lang/src/core_commands/export.rs b/crates/nu-cmd-lang/src/core_commands/export.rs
index e5d3d45683..8634a8c06b 100644
--- a/crates/nu-cmd-lang/src/core_commands/export.rs
+++ b/crates/nu-cmd-lang/src/core_commands/export.rs
@@ -1,4 +1,5 @@
 use nu_engine::{command_prelude::*, get_full_help};
+use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct ExportCommand;
@@ -23,8 +24,8 @@ impl Command for ExportCommand {
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
 
-    fn is_parser_keyword(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
     }
 
     fn run(
@@ -40,7 +41,7 @@ impl Command for ExportCommand {
                 &ExportCommand.examples(),
                 engine_state,
                 stack,
-                self.is_parser_keyword(),
+                self.is_keyword(),
             ),
             call.head,
         )
diff --git a/crates/nu-cmd-lang/src/core_commands/export_alias.rs b/crates/nu-cmd-lang/src/core_commands/export_alias.rs
index 14caddcc7a..4df335da44 100644
--- a/crates/nu-cmd-lang/src/core_commands/export_alias.rs
+++ b/crates/nu-cmd-lang/src/core_commands/export_alias.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct ExportAlias;
@@ -29,8 +30,8 @@ impl Command for ExportAlias {
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
 
-    fn is_parser_keyword(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
     }
 
     fn search_terms(&self) -> Vec<&str> {
diff --git a/crates/nu-cmd-lang/src/core_commands/export_const.rs b/crates/nu-cmd-lang/src/core_commands/export_const.rs
index 988db50b2a..631d85ad89 100644
--- a/crates/nu-cmd-lang/src/core_commands/export_const.rs
+++ b/crates/nu-cmd-lang/src/core_commands/export_const.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct ExportConst;
@@ -30,8 +31,8 @@ impl Command for ExportConst {
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
 
-    fn is_parser_keyword(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
     }
 
     fn run(
diff --git a/crates/nu-cmd-lang/src/core_commands/export_def.rs b/crates/nu-cmd-lang/src/core_commands/export_def.rs
index 93c5932efb..7a2d3949e1 100644
--- a/crates/nu-cmd-lang/src/core_commands/export_def.rs
+++ b/crates/nu-cmd-lang/src/core_commands/export_def.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct ExportDef;
@@ -28,8 +29,8 @@ impl Command for ExportDef {
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
 
-    fn is_parser_keyword(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
     }
 
     fn run(
diff --git a/crates/nu-cmd-lang/src/core_commands/export_extern.rs b/crates/nu-cmd-lang/src/core_commands/export_extern.rs
index 9ca756cf93..1a2ba4e5cb 100644
--- a/crates/nu-cmd-lang/src/core_commands/export_extern.rs
+++ b/crates/nu-cmd-lang/src/core_commands/export_extern.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct ExportExtern;
@@ -25,8 +26,8 @@ impl Command for ExportExtern {
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
 
-    fn is_parser_keyword(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
     }
 
     fn run(
diff --git a/crates/nu-cmd-lang/src/core_commands/export_module.rs b/crates/nu-cmd-lang/src/core_commands/export_module.rs
index fdbd143fb0..53a6ca750c 100644
--- a/crates/nu-cmd-lang/src/core_commands/export_module.rs
+++ b/crates/nu-cmd-lang/src/core_commands/export_module.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct ExportModule;
@@ -30,8 +31,8 @@ impl Command for ExportModule {
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
 
-    fn is_parser_keyword(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
     }
 
     fn run(
diff --git a/crates/nu-cmd-lang/src/core_commands/export_use.rs b/crates/nu-cmd-lang/src/core_commands/export_use.rs
index 2e4fd3f3e9..5ca96a899e 100644
--- a/crates/nu-cmd-lang/src/core_commands/export_use.rs
+++ b/crates/nu-cmd-lang/src/core_commands/export_use.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct ExportUse;
@@ -29,8 +30,8 @@ impl Command for ExportUse {
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
 
-    fn is_parser_keyword(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
     }
 
     fn run(
diff --git a/crates/nu-cmd-lang/src/core_commands/extern_.rs b/crates/nu-cmd-lang/src/core_commands/extern_.rs
index 71400dbb7c..496f104650 100644
--- a/crates/nu-cmd-lang/src/core_commands/extern_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/extern_.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct Extern;
@@ -25,8 +26,8 @@ impl Command for Extern {
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
 
-    fn is_parser_keyword(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
     }
 
     fn run(
diff --git a/crates/nu-cmd-lang/src/core_commands/for_.rs b/crates/nu-cmd-lang/src/core_commands/for_.rs
index 6f9391614e..387af45282 100644
--- a/crates/nu-cmd-lang/src/core_commands/for_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/for_.rs
@@ -1,4 +1,5 @@
 use nu_engine::{command_prelude::*, get_eval_block, get_eval_expression};
+use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct For;
@@ -41,8 +42,8 @@ impl Command for For {
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
 
-    fn is_parser_keyword(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
     }
 
     fn run(
diff --git a/crates/nu-cmd-lang/src/core_commands/hide.rs b/crates/nu-cmd-lang/src/core_commands/hide.rs
index 2cfafa6c02..d52d2131c9 100644
--- a/crates/nu-cmd-lang/src/core_commands/hide.rs
+++ b/crates/nu-cmd-lang/src/core_commands/hide.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct Hide;
@@ -31,8 +32,8 @@ This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
 
-    fn is_parser_keyword(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
     }
 
     fn run(
diff --git a/crates/nu-cmd-lang/src/core_commands/let_.rs b/crates/nu-cmd-lang/src/core_commands/let_.rs
index cc5504d8d6..f2da628c31 100644
--- a/crates/nu-cmd-lang/src/core_commands/let_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/let_.rs
@@ -1,4 +1,5 @@
 use nu_engine::{command_prelude::*, get_eval_block};
+use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct Let;
@@ -30,8 +31,8 @@ impl Command for Let {
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
 
-    fn is_parser_keyword(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
     }
 
     fn search_terms(&self) -> Vec<&str> {
diff --git a/crates/nu-cmd-lang/src/core_commands/module.rs b/crates/nu-cmd-lang/src/core_commands/module.rs
index 45641649ff..908c0764e5 100644
--- a/crates/nu-cmd-lang/src/core_commands/module.rs
+++ b/crates/nu-cmd-lang/src/core_commands/module.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct Module;
@@ -30,8 +31,8 @@ impl Command for Module {
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
 
-    fn is_parser_keyword(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
     }
 
     fn run(
diff --git a/crates/nu-cmd-lang/src/core_commands/mut_.rs b/crates/nu-cmd-lang/src/core_commands/mut_.rs
index 60c4c146db..5db3c929af 100644
--- a/crates/nu-cmd-lang/src/core_commands/mut_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/mut_.rs
@@ -1,4 +1,5 @@
 use nu_engine::{command_prelude::*, get_eval_block};
+use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct Mut;
@@ -30,8 +31,8 @@ impl Command for Mut {
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
 
-    fn is_parser_keyword(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
     }
 
     fn search_terms(&self) -> Vec<&str> {
diff --git a/crates/nu-cmd-lang/src/core_commands/overlay/command.rs b/crates/nu-cmd-lang/src/core_commands/overlay/command.rs
index db502c0932..72cc28e77c 100644
--- a/crates/nu-cmd-lang/src/core_commands/overlay/command.rs
+++ b/crates/nu-cmd-lang/src/core_commands/overlay/command.rs
@@ -1,4 +1,5 @@
 use nu_engine::{command_prelude::*, get_full_help};
+use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct Overlay;
@@ -25,8 +26,8 @@ impl Command for Overlay {
   You must use one of the following subcommands. Using this command as-is will only produce this help message."#
     }
 
-    fn is_parser_keyword(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
     }
 
     fn run(
@@ -42,7 +43,7 @@ impl Command for Overlay {
                 &[],
                 engine_state,
                 stack,
-                self.is_parser_keyword(),
+                self.is_keyword(),
             ),
             call.head,
         )
diff --git a/crates/nu-cmd-lang/src/core_commands/overlay/hide.rs b/crates/nu-cmd-lang/src/core_commands/overlay/hide.rs
index c1b4a653bc..7ea84a2a91 100644
--- a/crates/nu-cmd-lang/src/core_commands/overlay/hide.rs
+++ b/crates/nu-cmd-lang/src/core_commands/overlay/hide.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct OverlayHide;
@@ -35,8 +36,8 @@ impl Command for OverlayHide {
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
 
-    fn is_parser_keyword(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
     }
 
     fn run(
diff --git a/crates/nu-cmd-lang/src/core_commands/overlay/new.rs b/crates/nu-cmd-lang/src/core_commands/overlay/new.rs
index 8f9a0e53ea..a571c37947 100644
--- a/crates/nu-cmd-lang/src/core_commands/overlay/new.rs
+++ b/crates/nu-cmd-lang/src/core_commands/overlay/new.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct OverlayNew;
@@ -33,8 +34,8 @@ This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
 
-    fn is_parser_keyword(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
     }
 
     fn run(
diff --git a/crates/nu-cmd-lang/src/core_commands/overlay/use_.rs b/crates/nu-cmd-lang/src/core_commands/overlay/use_.rs
index 13c3f711ad..e8b51fb59b 100644
--- a/crates/nu-cmd-lang/src/core_commands/overlay/use_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/overlay/use_.rs
@@ -2,7 +2,7 @@ use nu_engine::{
     command_prelude::*, find_in_dirs_env, get_dirs_var_from_call, get_eval_block, redirect_env,
 };
 use nu_parser::trim_quotes_str;
-use nu_protocol::ast::Expr;
+use nu_protocol::{ast::Expr, engine::CommandType};
 
 use std::path::Path;
 
@@ -50,8 +50,8 @@ impl Command for OverlayUse {
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
 
-    fn is_parser_keyword(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
     }
 
     fn run(
diff --git a/crates/nu-cmd-lang/src/core_commands/return_.rs b/crates/nu-cmd-lang/src/core_commands/return_.rs
index 969456d005..478224079b 100644
--- a/crates/nu-cmd-lang/src/core_commands/return_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/return_.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct Return;
@@ -28,8 +29,8 @@ impl Command for Return {
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
 
-    fn is_parser_keyword(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
     }
 
     fn run(
diff --git a/crates/nu-cmd-lang/src/core_commands/scope/command.rs b/crates/nu-cmd-lang/src/core_commands/scope/command.rs
index da507f3159..72a9e74932 100644
--- a/crates/nu-cmd-lang/src/core_commands/scope/command.rs
+++ b/crates/nu-cmd-lang/src/core_commands/scope/command.rs
@@ -1,4 +1,5 @@
 use nu_engine::{command_prelude::*, get_full_help};
+use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct Scope;
@@ -19,8 +20,8 @@ impl Command for Scope {
         "Commands for getting info about what is in scope."
     }
 
-    fn is_parser_keyword(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
     }
 
     fn run(
@@ -36,7 +37,7 @@ impl Command for Scope {
                 &[],
                 engine_state,
                 stack,
-                self.is_parser_keyword(),
+                self.is_keyword(),
             ),
             call.head,
         )
diff --git a/crates/nu-cmd-lang/src/core_commands/use_.rs b/crates/nu-cmd-lang/src/core_commands/use_.rs
index 32978d7e62..b0f3648304 100644
--- a/crates/nu-cmd-lang/src/core_commands/use_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/use_.rs
@@ -1,7 +1,10 @@
 use nu_engine::{
     command_prelude::*, find_in_dirs_env, get_dirs_var_from_call, get_eval_block, redirect_env,
 };
-use nu_protocol::ast::{Expr, Expression};
+use nu_protocol::{
+    ast::{Expr, Expression},
+    engine::CommandType,
+};
 
 #[derive(Clone)]
 pub struct Use;
@@ -40,8 +43,8 @@ This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
 
-    fn is_parser_keyword(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
     }
 
     fn run(
diff --git a/crates/nu-cmd-plugin/src/commands/plugin/mod.rs b/crates/nu-cmd-plugin/src/commands/plugin/mod.rs
index 87daa5a328..cf4ee5d9a3 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/mod.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/mod.rs
@@ -43,7 +43,7 @@ impl Command for PluginCommand {
                 &PluginCommand.examples(),
                 engine_state,
                 stack,
-                self.is_parser_keyword(),
+                self.is_keyword(),
             ),
             call.head,
         )
diff --git a/crates/nu-cmd-plugin/src/commands/plugin/use_.rs b/crates/nu-cmd-plugin/src/commands/plugin/use_.rs
index e5997efcf0..3cfb28f28b 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/use_.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/use_.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct PluginUse;
@@ -52,8 +53,8 @@ it was already previously registered with `plugin add`.
         vec!["add", "register", "scope"]
     }
 
-    fn is_parser_keyword(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
     }
 
     fn run(
diff --git a/crates/nu-cmd-plugin/src/commands/register.rs b/crates/nu-cmd-plugin/src/commands/register.rs
index 924ab00d62..2c10456db7 100644
--- a/crates/nu-cmd-plugin/src/commands/register.rs
+++ b/crates/nu-cmd-plugin/src/commands/register.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct Register;
@@ -48,8 +49,8 @@ This command is a parser keyword. For details, check:
         vec!["add"]
     }
 
-    fn is_parser_keyword(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
     }
 
     fn run(
diff --git a/crates/nu-command/src/bytes/bytes_.rs b/crates/nu-command/src/bytes/bytes_.rs
index f262e6a82e..451ee1e5d5 100644
--- a/crates/nu-command/src/bytes/bytes_.rs
+++ b/crates/nu-command/src/bytes/bytes_.rs
@@ -35,7 +35,7 @@ impl Command for Bytes {
                 &Bytes.examples(),
                 engine_state,
                 stack,
-                self.is_parser_keyword(),
+                self.is_keyword(),
             ),
             call.head,
         )
diff --git a/crates/nu-command/src/conversions/into/command.rs b/crates/nu-command/src/conversions/into/command.rs
index 37bbbff02e..5a8175b298 100644
--- a/crates/nu-command/src/conversions/into/command.rs
+++ b/crates/nu-command/src/conversions/into/command.rs
@@ -35,7 +35,7 @@ impl Command for Into {
                 &[],
                 engine_state,
                 stack,
-                self.is_parser_keyword(),
+                self.is_keyword(),
             ),
             call.head,
         )
diff --git a/crates/nu-command/src/debug/view.rs b/crates/nu-command/src/debug/view.rs
index 38a4efc2e7..fcbc377e4b 100644
--- a/crates/nu-command/src/debug/view.rs
+++ b/crates/nu-command/src/debug/view.rs
@@ -35,7 +35,7 @@ impl Command for View {
                 &View.examples(),
                 engine_state,
                 stack,
-                self.is_parser_keyword(),
+                self.is_keyword(),
             ),
             call.head,
         )
diff --git a/crates/nu-command/src/debug/view_source.rs b/crates/nu-command/src/debug/view_source.rs
index 974a92e1ee..54bca55956 100644
--- a/crates/nu-command/src/debug/view_source.rs
+++ b/crates/nu-command/src/debug/view_source.rs
@@ -55,7 +55,7 @@ impl Command for ViewSource {
                         }
                     }
                     // gets vector of positionals.
-                    else if let Some(block_id) = decl.get_block_id() {
+                    else if let Some(block_id) = decl.block_id() {
                         let block = engine_state.get_block(block_id);
                         if let Some(block_span) = block.span {
                             let contents = engine_state.get_span_contents(block_span);
diff --git a/crates/nu-command/src/env/config/config_.rs b/crates/nu-command/src/env/config/config_.rs
index 30285c5c9e..948e8248b8 100644
--- a/crates/nu-command/src/env/config/config_.rs
+++ b/crates/nu-command/src/env/config/config_.rs
@@ -35,7 +35,7 @@ impl Command for ConfigMeta {
                 &ConfigMeta.examples(),
                 engine_state,
                 stack,
-                self.is_parser_keyword(),
+                self.is_keyword(),
             ),
             call.head,
         )
diff --git a/crates/nu-command/src/filesystem/open.rs b/crates/nu-command/src/filesystem/open.rs
index 5fb8527511..842eaa5f4c 100644
--- a/crates/nu-command/src/filesystem/open.rs
+++ b/crates/nu-command/src/filesystem/open.rs
@@ -172,7 +172,7 @@ impl Command for Open {
                     match converter {
                         Some((converter_id, ext)) => {
                             let decl = engine_state.get_decl(converter_id);
-                            let command_output = if let Some(block_id) = decl.get_block_id() {
+                            let command_output = if let Some(block_id) = decl.block_id() {
                                 let block = engine_state.get_block(block_id);
                                 eval_block(engine_state, stack, block, stream)
                             } else {
diff --git a/crates/nu-command/src/filesystem/save.rs b/crates/nu-command/src/filesystem/save.rs
index 1be74665b2..340ceb4f62 100644
--- a/crates/nu-command/src/filesystem/save.rs
+++ b/crates/nu-command/src/filesystem/save.rs
@@ -393,7 +393,7 @@ fn convert_to_extension(
 ) -> Result<PipelineData, ShellError> {
     if let Some(decl_id) = engine_state.find_decl(format!("to {extension}").as_bytes(), &[]) {
         let decl = engine_state.get_decl(decl_id);
-        if let Some(block_id) = decl.get_block_id() {
+        if let Some(block_id) = decl.block_id() {
             let block = engine_state.get_block(block_id);
             let eval_block = get_eval_block(engine_state);
             eval_block(engine_state, stack, block, input)
diff --git a/crates/nu-command/src/formats/from/command.rs b/crates/nu-command/src/formats/from/command.rs
index ce5987e5b1..3df3d86e2e 100644
--- a/crates/nu-command/src/formats/from/command.rs
+++ b/crates/nu-command/src/formats/from/command.rs
@@ -35,7 +35,7 @@ impl Command for From {
                 &From.examples(),
                 engine_state,
                 stack,
-                self.is_parser_keyword(),
+                self.is_keyword(),
             ),
             call.head,
         )
diff --git a/crates/nu-command/src/formats/to/command.rs b/crates/nu-command/src/formats/to/command.rs
index 26c9a259b6..1288c2d73b 100644
--- a/crates/nu-command/src/formats/to/command.rs
+++ b/crates/nu-command/src/formats/to/command.rs
@@ -35,7 +35,7 @@ impl Command for To {
                 &To.examples(),
                 engine_state,
                 stack,
-                self.is_parser_keyword(),
+                self.is_keyword(),
             ),
             call.head,
         )
diff --git a/crates/nu-command/src/hash/hash_.rs b/crates/nu-command/src/hash/hash_.rs
index e3b19624a2..fc7f58cd3b 100644
--- a/crates/nu-command/src/hash/hash_.rs
+++ b/crates/nu-command/src/hash/hash_.rs
@@ -35,7 +35,7 @@ impl Command for Hash {
                 &Self.examples(),
                 engine_state,
                 stack,
-                self.is_parser_keyword(),
+                self.is_keyword(),
             ),
             call.head,
         )
diff --git a/crates/nu-command/src/help/help_commands.rs b/crates/nu-command/src/help/help_commands.rs
index bc0fd92d92..2633595356 100644
--- a/crates/nu-command/src/help/help_commands.rs
+++ b/crates/nu-command/src/help/help_commands.rs
@@ -1,6 +1,7 @@
 use crate::help::highlight_search_in_table;
 use nu_color_config::StyleComputer;
 use nu_engine::{command_prelude::*, get_full_help};
+use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct HelpCommands;
@@ -90,9 +91,15 @@ pub fn help_commands(
         let output = engine_state
             .get_signatures_with_examples(false)
             .iter()
-            .filter(|(signature, _, _, _, _)| signature.name == name)
-            .map(|(signature, examples, _, _, is_parser_keyword)| {
-                get_full_help(signature, examples, engine_state, stack, *is_parser_keyword)
+            .filter(|(signature, _, _)| signature.name == name)
+            .map(|(signature, examples, cmd_type)| {
+                get_full_help(
+                    signature,
+                    examples,
+                    engine_state,
+                    stack,
+                    cmd_type == &CommandType::Keyword,
+                )
             })
             .collect::<Vec<String>>();
 
diff --git a/crates/nu-command/src/help/help_externs.rs b/crates/nu-command/src/help/help_externs.rs
index 22fb4a303c..0378553463 100644
--- a/crates/nu-command/src/help/help_externs.rs
+++ b/crates/nu-command/src/help/help_externs.rs
@@ -1,6 +1,7 @@
 use crate::help::highlight_search_in_table;
 use nu_color_config::StyleComputer;
 use nu_engine::{command_prelude::*, get_full_help, scope::ScopeData};
+use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct HelpExterns;
@@ -110,9 +111,15 @@ pub fn help_externs(
         let output = engine_state
             .get_signatures_with_examples(false)
             .iter()
-            .filter(|(signature, _, _, _, _)| signature.name == name)
-            .map(|(signature, examples, _, _, is_parser_keyword)| {
-                get_full_help(signature, examples, engine_state, stack, *is_parser_keyword)
+            .filter(|(signature, _, _)| signature.name == name)
+            .map(|(signature, examples, cmd_type)| {
+                get_full_help(
+                    signature,
+                    examples,
+                    engine_state,
+                    stack,
+                    cmd_type == &CommandType::Keyword,
+                )
             })
             .collect::<Vec<String>>();
 
diff --git a/crates/nu-command/src/math/math_.rs b/crates/nu-command/src/math/math_.rs
index a4a146738f..9f230362ea 100644
--- a/crates/nu-command/src/math/math_.rs
+++ b/crates/nu-command/src/math/math_.rs
@@ -35,7 +35,7 @@ impl Command for MathCommand {
                 &MathCommand.examples(),
                 engine_state,
                 stack,
-                self.is_parser_keyword(),
+                self.is_keyword(),
             ),
             call.head,
         )
diff --git a/crates/nu-command/src/misc/source.rs b/crates/nu-command/src/misc/source.rs
index 798b321c6b..08a979b9f5 100644
--- a/crates/nu-command/src/misc/source.rs
+++ b/crates/nu-command/src/misc/source.rs
@@ -1,4 +1,5 @@
 use nu_engine::{command_prelude::*, get_eval_block_with_early_return};
+use nu_protocol::engine::CommandType;
 
 /// Source a file for environment variables.
 #[derive(Clone)]
@@ -29,8 +30,8 @@ impl Command for Source {
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
 
-    fn is_parser_keyword(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
     }
 
     fn run(
diff --git a/crates/nu-command/src/network/http/http_.rs b/crates/nu-command/src/network/http/http_.rs
index 15bc96494c..b1e8d64120 100644
--- a/crates/nu-command/src/network/http/http_.rs
+++ b/crates/nu-command/src/network/http/http_.rs
@@ -41,7 +41,7 @@ impl Command for Http {
                 &Http.examples(),
                 engine_state,
                 stack,
-                self.is_parser_keyword(),
+                self.is_keyword(),
             ),
             call.head,
         )
diff --git a/crates/nu-command/src/network/url/url_.rs b/crates/nu-command/src/network/url/url_.rs
index 9f795c7eab..49d55c4c6b 100644
--- a/crates/nu-command/src/network/url/url_.rs
+++ b/crates/nu-command/src/network/url/url_.rs
@@ -39,7 +39,7 @@ impl Command for Url {
                 &Url.examples(),
                 engine_state,
                 stack,
-                self.is_parser_keyword(),
+                self.is_keyword(),
             ),
             call.head,
         )
diff --git a/crates/nu-command/src/path/path_.rs b/crates/nu-command/src/path/path_.rs
index 19351d590a..2d1d0730fa 100644
--- a/crates/nu-command/src/path/path_.rs
+++ b/crates/nu-command/src/path/path_.rs
@@ -48,7 +48,7 @@ the path literal."#
                 &PathCommand.examples(),
                 engine_state,
                 stack,
-                self.is_parser_keyword(),
+                self.is_keyword(),
             ),
             call.head,
         )
diff --git a/crates/nu-command/src/random/random_.rs b/crates/nu-command/src/random/random_.rs
index 21819fa24f..16135000ea 100644
--- a/crates/nu-command/src/random/random_.rs
+++ b/crates/nu-command/src/random/random_.rs
@@ -39,7 +39,7 @@ impl Command for RandomCommand {
                 &RandomCommand.examples(),
                 engine_state,
                 stack,
-                self.is_parser_keyword(),
+                self.is_keyword(),
             ),
             call.head,
         )
diff --git a/crates/nu-command/src/stor/stor_.rs b/crates/nu-command/src/stor/stor_.rs
index e736fd8357..3fb6840e7d 100644
--- a/crates/nu-command/src/stor/stor_.rs
+++ b/crates/nu-command/src/stor/stor_.rs
@@ -35,7 +35,7 @@ impl Command for Stor {
                 &Stor.examples(),
                 engine_state,
                 stack,
-                self.is_parser_keyword(),
+                self.is_keyword(),
             ),
             call.head,
         )
diff --git a/crates/nu-command/src/strings/format/format_.rs b/crates/nu-command/src/strings/format/format_.rs
index 18159b610f..c51213e4ef 100644
--- a/crates/nu-command/src/strings/format/format_.rs
+++ b/crates/nu-command/src/strings/format/format_.rs
@@ -35,7 +35,7 @@ impl Command for Format {
                 &Format.examples(),
                 engine_state,
                 stack,
-                self.is_parser_keyword(),
+                self.is_keyword(),
             ),
             call.head,
         )
diff --git a/crates/nu-command/src/strings/split/command.rs b/crates/nu-command/src/strings/split/command.rs
index cb52cdb44c..0333249c2b 100644
--- a/crates/nu-command/src/strings/split/command.rs
+++ b/crates/nu-command/src/strings/split/command.rs
@@ -35,7 +35,7 @@ impl Command for SplitCommand {
                 &SplitCommand.examples(),
                 engine_state,
                 stack,
-                self.is_parser_keyword(),
+                self.is_keyword(),
             ),
             call.head,
         )
diff --git a/crates/nu-command/src/strings/str_/case/str_.rs b/crates/nu-command/src/strings/str_/case/str_.rs
index cf4537f046..56e0d1164f 100644
--- a/crates/nu-command/src/strings/str_/case/str_.rs
+++ b/crates/nu-command/src/strings/str_/case/str_.rs
@@ -35,7 +35,7 @@ impl Command for Str {
                 &Str.examples(),
                 engine_state,
                 stack,
-                self.is_parser_keyword(),
+                self.is_keyword(),
             ),
             call.head,
         )
diff --git a/crates/nu-command/src/system/which_.rs b/crates/nu-command/src/system/which_.rs
index 1244a57d99..81b6057864 100644
--- a/crates/nu-command/src/system/which_.rs
+++ b/crates/nu-command/src/system/which_.rs
@@ -1,5 +1,5 @@
-use log::trace;
 use nu_engine::{command_prelude::*, env};
+use nu_protocol::engine::CommandType;
 use std::{ffi::OsStr, path::Path};
 
 #[derive(Clone)]
@@ -51,14 +51,14 @@ impl Command for Which {
 fn entry(
     arg: impl Into<String>,
     path: impl Into<String>,
-    cmd_type: impl Into<String>,
+    cmd_type: CommandType,
     span: Span,
 ) -> Value {
     Value::record(
         record! {
-            "command" => Value::string(arg.into(), span),
-            "path" => Value::string(path.into(), span),
-            "type" => Value::string(cmd_type.into(), span),
+            "command" => Value::string(arg, span),
+            "path" => Value::string(path, span),
+            "type" => Value::string(cmd_type.to_string(), span),
         },
         span,
     )
@@ -66,17 +66,8 @@ fn entry(
 
 fn get_entry_in_commands(engine_state: &EngineState, name: &str, span: Span) -> Option<Value> {
     if let Some(decl_id) = engine_state.find_decl(name.as_bytes(), &[]) {
-        let cmd_type = if engine_state.get_decl(decl_id).is_custom_command() {
-            "custom"
-        } else if engine_state.get_decl(decl_id).is_alias() {
-            "alias"
-        } else {
-            "built-in"
-        };
-
-        trace!("Found command: {}", name);
-
-        Some(entry(name, "", cmd_type, span))
+        let decl = engine_state.get_decl(decl_id);
+        Some(entry(name, "", decl.command_type(), span))
     } else {
         None
     }
@@ -109,7 +100,7 @@ fn get_first_entry_in_path(
     paths: impl AsRef<OsStr>,
 ) -> Option<Value> {
     which::which_in(item, Some(paths), cwd)
-        .map(|path| entry(item, path.to_string_lossy().to_string(), "external", span))
+        .map(|path| entry(item, path.to_string_lossy(), CommandType::External, span))
         .ok()
 }
 
@@ -132,7 +123,7 @@ fn get_all_entries_in_path(
 ) -> Vec<Value> {
     which::which_in_all(&item, Some(paths), cwd)
         .map(|iter| {
-            iter.map(|path| entry(item, path.to_string_lossy().to_string(), "external", span))
+            iter.map(|path| entry(item, path.to_string_lossy(), CommandType::External, span))
                 .collect()
         })
         .unwrap_or_default()
diff --git a/crates/nu-engine/src/eval.rs b/crates/nu-engine/src/eval.rs
index 0bc0c3727c..02feef3f38 100644
--- a/crates/nu-engine/src/eval.rs
+++ b/crates/nu-engine/src/eval.rs
@@ -36,10 +36,10 @@ pub fn eval_call<D: DebugContext>(
             &decl.examples(),
             engine_state,
             caller_stack,
-            decl.is_parser_keyword(),
+            decl.is_keyword(),
         );
         Ok(Value::string(full_help, call.head).into_pipeline_data())
-    } else if let Some(block_id) = decl.get_block_id() {
+    } else if let Some(block_id) = decl.block_id() {
         let block = engine_state.get_block(block_id);
 
         let mut callee_stack = caller_stack.gather_captures(engine_state, &block.captures);
diff --git a/crates/nu-engine/src/scope.rs b/crates/nu-engine/src/scope.rs
index 1f5bf2a358..b6a43ca47c 100644
--- a/crates/nu-engine/src/scope.rs
+++ b/crates/nu-engine/src/scope.rs
@@ -111,13 +111,8 @@ impl<'e, 's> ScopeData<'e, 's> {
                     "signatures" => self.collect_signatures(&signature, span),
                     "usage" => Value::string(decl.usage(), span),
                     "examples" => Value::list(examples, span),
-                    // we can only be a is_builtin or is_custom, not both
-                    "is_builtin" => Value::bool(!decl.is_custom_command(), span),
+                    "type" => Value::string(decl.command_type().to_string(), span),
                     "is_sub" => Value::bool(decl.is_sub(), span),
-                    "is_plugin" => Value::bool(decl.is_plugin(), span),
-                    "is_custom" => Value::bool(decl.is_custom_command(), span),
-                    "is_keyword" => Value::bool(decl.is_parser_keyword(), span),
-                    "is_extern" => Value::bool(decl.is_known_external(), span),
                     "creates_scope" => Value::bool(signature.creates_scope, span),
                     "extra_usage" => Value::string(decl.extra_usage(), span),
                     "search_terms" => Value::string(decl.search_terms().join(", "), span),
diff --git a/crates/nu-lsp/src/lib.rs b/crates/nu-lsp/src/lib.rs
index 47535d9bd4..44eeeb5756 100644
--- a/crates/nu-lsp/src/lib.rs
+++ b/crates/nu-lsp/src/lib.rs
@@ -279,7 +279,7 @@ impl LanguageServer {
 
         match id {
             Id::Declaration(decl_id) => {
-                if let Some(block_id) = working_set.get_decl(decl_id).get_block_id() {
+                if let Some(block_id) = working_set.get_decl(decl_id).block_id() {
                     let block = working_set.get_block(block_id);
                     if let Some(span) = &block.span {
                         for cached_file in working_set.files() {
diff --git a/crates/nu-parser/src/known_external.rs b/crates/nu-parser/src/known_external.rs
index d5cc1f2369..1463a3b080 100644
--- a/crates/nu-parser/src/known_external.rs
+++ b/crates/nu-parser/src/known_external.rs
@@ -1,5 +1,8 @@
 use nu_engine::command_prelude::*;
-use nu_protocol::ast::{Argument, Expr, Expression};
+use nu_protocol::{
+    ast::{Argument, Expr, Expression},
+    engine::CommandType,
+};
 
 #[derive(Clone)]
 pub struct KnownExternal {
@@ -22,12 +25,8 @@ impl Command for KnownExternal {
         &self.usage
     }
 
-    fn is_known_external(&self) -> bool {
-        true
-    }
-
-    fn is_builtin(&self) -> bool {
-        false
+    fn command_type(&self) -> CommandType {
+        CommandType::External
     }
 
     fn run(
diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index 015873e69a..25a55c8489 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -1020,7 +1020,7 @@ pub fn parse_alias(
                 } => {
                     let cmd = working_set.get_decl(rhs_call.decl_id);
 
-                    if cmd.is_parser_keyword()
+                    if cmd.is_keyword()
                         && !ALIASABLE_PARSER_KEYWORDS.contains(&cmd.name().as_bytes())
                     {
                         working_set.error(ParseError::CantAliasKeyword(
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index fb36e8b503..61a4261d8d 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -5966,7 +5966,7 @@ pub fn discover_captures_in_expr(
         Expr::Bool(_) => {}
         Expr::Call(call) => {
             let decl = working_set.get_decl(call.decl_id);
-            if let Some(block_id) = decl.get_block_id() {
+            if let Some(block_id) = decl.block_id() {
                 match seen_blocks.get(&block_id) {
                     Some(capture_list) => {
                         // Push captures onto the outer closure that aren't created by that outer closure
diff --git a/crates/nu-plugin-engine/src/declaration.rs b/crates/nu-plugin-engine/src/declaration.rs
index 7f45ce1507..d48fa39b85 100644
--- a/crates/nu-plugin-engine/src/declaration.rs
+++ b/crates/nu-plugin-engine/src/declaration.rs
@@ -1,6 +1,6 @@
 use nu_engine::{command_prelude::*, get_eval_expression};
 use nu_plugin_protocol::{CallInfo, EvaluatedCall};
-use nu_protocol::{PluginIdentity, PluginSignature};
+use nu_protocol::{engine::CommandType, PluginIdentity, PluginSignature};
 use std::sync::Arc;
 
 use crate::{GetPlugin, PluginExecutionCommandContext, PluginSource};
@@ -116,8 +116,8 @@ impl Command for PluginDeclaration {
         )
     }
 
-    fn is_plugin(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Plugin
     }
 
     fn plugin_identity(&self) -> Option<&PluginIdentity> {
diff --git a/crates/nu-protocol/src/alias.rs b/crates/nu-protocol/src/alias.rs
index 47b7e0fd9e..24448225d4 100644
--- a/crates/nu-protocol/src/alias.rs
+++ b/crates/nu-protocol/src/alias.rs
@@ -1,6 +1,6 @@
 use crate::{
     ast::{Call, Expression},
-    engine::{Command, EngineState, Stack},
+    engine::{Command, CommandType, EngineState, Stack},
     PipelineData, ShellError, Signature,
 };
 
@@ -48,8 +48,8 @@ impl Command for Alias {
         })
     }
 
-    fn is_alias(&self) -> bool {
-        true
+    fn command_type(&self) -> CommandType {
+        CommandType::Alias
     }
 
     fn as_alias(&self) -> Option<&Alias> {
diff --git a/crates/nu-protocol/src/engine/command.rs b/crates/nu-protocol/src/engine/command.rs
index 38119d6f8f..043d2a66c7 100644
--- a/crates/nu-protocol/src/engine/command.rs
+++ b/crates/nu-protocol/src/engine/command.rs
@@ -1,8 +1,8 @@
-use crate::{ast::Call, Alias, BlockId, Example, OutDest, PipelineData, ShellError, Signature};
-
 use super::{EngineState, Stack, StateWorkingSet};
+use crate::{ast::Call, Alias, BlockId, Example, OutDest, PipelineData, ShellError, Signature};
+use std::fmt::Display;
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum CommandType {
     Builtin,
     Custom,
@@ -10,7 +10,20 @@ pub enum CommandType {
     External,
     Alias,
     Plugin,
-    Other,
+}
+
+impl Display for CommandType {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let str = match self {
+            CommandType::Builtin => "built-in",
+            CommandType::Custom => "custom",
+            CommandType::Keyword => "keyword",
+            CommandType::External => "external",
+            CommandType::Alias => "alias",
+            CommandType::Plugin => "plugin",
+        };
+        write!(f, "{str}")
+    }
 }
 
 pub trait Command: Send + Sync + CommandClone {
@@ -49,49 +62,29 @@ pub trait Command: Send + Sync + CommandClone {
         Vec::new()
     }
 
-    // This is a built-in command
-    fn is_builtin(&self) -> bool {
-        true
+    // Related terms to help with command search
+    fn search_terms(&self) -> Vec<&str> {
+        vec![]
     }
 
-    // This is a signature for a known external command
-    fn is_known_external(&self) -> bool {
+    // Whether can run in const evaluation in the parser
+    fn is_const(&self) -> bool {
         false
     }
 
-    // This is an alias of another command
-    fn is_alias(&self) -> bool {
-        false
-    }
-
-    // Return reference to the command as Alias
-    fn as_alias(&self) -> Option<&Alias> {
-        None
-    }
-
-    // This is an enhanced method to determine if a command is custom command or not
-    // since extern "foo" [] and def "foo" [] behaves differently
-    fn is_custom_command(&self) -> bool {
-        if self.get_block_id().is_some() {
-            true
-        } else {
-            self.is_known_external()
-        }
-    }
-
     // Is a sub command
     fn is_sub(&self) -> bool {
         self.name().contains(' ')
     }
 
-    // Is a parser keyword (source, def, etc.)
-    fn is_parser_keyword(&self) -> bool {
-        false
+    // If command is a block i.e. def blah [] { }, get the block id
+    fn block_id(&self) -> Option<BlockId> {
+        None
     }
 
-    /// Is a plugin command
-    fn is_plugin(&self) -> bool {
-        false
+    // Return reference to the command as Alias
+    fn as_alias(&self) -> Option<&Alias> {
+        None
     }
 
     /// The identity of the plugin, if this is a plugin command
@@ -100,38 +93,32 @@ pub trait Command: Send + Sync + CommandClone {
         None
     }
 
-    // Whether can run in const evaluation in the parser
-    fn is_const(&self) -> bool {
-        false
-    }
-
-    // If command is a block i.e. def blah [] { }, get the block id
-    fn get_block_id(&self) -> Option<BlockId> {
-        None
-    }
-
-    // Related terms to help with command search
-    fn search_terms(&self) -> Vec<&str> {
-        vec![]
-    }
-
     fn command_type(&self) -> CommandType {
-        match (
-            self.is_builtin(),
-            self.is_custom_command(),
-            self.is_parser_keyword(),
-            self.is_known_external(),
-            self.is_alias(),
-            self.is_plugin(),
-        ) {
-            (true, false, false, false, false, false) => CommandType::Builtin,
-            (true, true, false, false, false, false) => CommandType::Custom,
-            (true, false, true, false, false, false) => CommandType::Keyword,
-            (false, true, false, true, false, false) => CommandType::External,
-            (_, _, _, _, true, _) => CommandType::Alias,
-            (true, false, false, false, false, true) => CommandType::Plugin,
-            _ => CommandType::Other,
-        }
+        CommandType::Builtin
+    }
+
+    fn is_builtin(&self) -> bool {
+        self.command_type() == CommandType::Builtin
+    }
+
+    fn is_custom(&self) -> bool {
+        self.command_type() == CommandType::Custom
+    }
+
+    fn is_keyword(&self) -> bool {
+        self.command_type() == CommandType::Keyword
+    }
+
+    fn is_known_external(&self) -> bool {
+        self.command_type() == CommandType::External
+    }
+
+    fn is_alias(&self) -> bool {
+        self.command_type() == CommandType::Alias
+    }
+
+    fn is_plugin(&self) -> bool {
+        self.command_type() == CommandType::Plugin
     }
 
     fn pipe_redirection(&self) -> (Option<OutDest>, Option<OutDest>) {
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index bea49b5d6c..1948b67d43 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -794,7 +794,7 @@ impl EngineState {
     }
 
     pub fn get_signature(&self, decl: &dyn Command) -> Signature {
-        if let Some(block_id) = decl.get_block_id() {
+        if let Some(block_id) = decl.block_id() {
             *self.blocks[block_id].signature.clone()
         } else {
             decl.signature()
@@ -814,26 +814,16 @@ impl EngineState {
 
     /// Get signatures of all commands within scope.
     ///
-    /// In addition to signatures, it returns whether each command is:
-    ///     a) a plugin
-    ///     b) custom
+    /// In addition to signatures, it returns each command's examples and type.
     pub fn get_signatures_with_examples(
         &self,
         include_hidden: bool,
-    ) -> Vec<(Signature, Vec<Example>, bool, bool, bool)> {
+    ) -> Vec<(Signature, Vec<Example>, CommandType)> {
         self.get_decls_sorted(include_hidden)
             .map(|(_, id)| {
                 let decl = self.get_decl(id);
-
                 let signature = self.get_signature(decl).update_from_command(decl);
-
-                (
-                    signature,
-                    decl.examples(),
-                    decl.is_plugin(),
-                    decl.get_block_id().is_some(),
-                    decl.is_parser_keyword(),
-                )
+                (signature, decl.examples(), decl.command_type())
             })
             .collect()
     }
diff --git a/crates/nu-protocol/src/pipeline/pipeline_data.rs b/crates/nu-protocol/src/pipeline/pipeline_data.rs
index 0f4d1eb826..7faa4ed221 100644
--- a/crates/nu-protocol/src/pipeline/pipeline_data.rs
+++ b/crates/nu-protocol/src/pipeline/pipeline_data.rs
@@ -550,7 +550,7 @@ impl PipelineData {
             // to create the table value that will be printed in the terminal
             if let Some(decl_id) = engine_state.table_decl_id {
                 let command = engine_state.get_decl(decl_id);
-                if command.get_block_id().is_some() {
+                if command.block_id().is_some() {
                     self.write_all_and_flush(engine_state, no_newline, to_stderr)
                 } else {
                     let call = Call::new(Span::new(0, 0));
diff --git a/crates/nu-protocol/src/signature.rs b/crates/nu-protocol/src/signature.rs
index 7f3a48cc35..70e94b35f1 100644
--- a/crates/nu-protocol/src/signature.rs
+++ b/crates/nu-protocol/src/signature.rs
@@ -1,6 +1,6 @@
 use crate::{
     ast::Call,
-    engine::{Command, EngineState, Stack},
+    engine::{Command, CommandType, EngineState, Stack},
     BlockId, PipelineData, ShellError, SyntaxShape, Type, Value, VarId,
 };
 use serde::{Deserialize, Serialize};
@@ -703,7 +703,11 @@ impl Command for BlockCommand {
         })
     }
 
-    fn get_block_id(&self) -> Option<BlockId> {
+    fn command_type(&self) -> CommandType {
+        CommandType::Custom
+    }
+
+    fn block_id(&self) -> Option<BlockId> {
         Some(self.block_id)
     }
 }
diff --git a/src/ide.rs b/src/ide.rs
index a3474fe3b6..0a24bcd013 100644
--- a/src/ide.rs
+++ b/src/ide.rs
@@ -145,7 +145,7 @@ pub fn goto_def(engine_state: &mut EngineState, file_path: &str, location: &Valu
     match find_id(&mut working_set, file_path, &file, location) {
         Some((Id::Declaration(decl_id), ..)) => {
             let result = working_set.get_decl(decl_id);
-            if let Some(block_id) = result.get_block_id() {
+            if let Some(block_id) = result.block_id() {
                 let block = working_set.get_block(block_id);
                 if let Some(span) = &block.span {
                     for file in working_set.files() {

From 474293bf1cfe1efdf1312de93710f2b741e5260a Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Sun, 19 May 2024 15:35:07 +0000
Subject: [PATCH 0008/1072] Clear environment for child `Command`s (#12901)

# Description
There is a bug when `hide-env` is used on environment variables that
were present at shell startup. Namely, child processes still inherit the
hidden environment variable. This PR fixes #12900, fixes #11495, and
fixes #7937.

# Tests + Formatting
Added a test.
---
 crates/nu-command/src/system/run_external.rs | 4 ++++
 tests/shell/environment/env.rs               | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index 2941d80de3..b12b89263c 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -530,6 +530,9 @@ impl ExternalCommand {
     }
 
     /// Spawn a command without shelling out to an external shell
+    ///
+    /// Note that this function will not set the cwd or environment variables.
+    /// It only creates the command and adds arguments.
     pub fn spawn_simple_command(&self, cwd: &str) -> Result<std::process::Command, ShellError> {
         let (head, _, _) = trim_enclosing_quotes(&self.name.item);
         let head = nu_path::expand_to_real_path(head)
@@ -537,6 +540,7 @@ impl ExternalCommand {
             .to_string();
 
         let mut process = std::process::Command::new(head);
+        process.env_clear();
 
         for (arg, arg_keep_raw) in self.args.iter().zip(self.arg_keep_raw.iter()) {
             trim_expand_and_apply_arg(&mut process, arg, arg_keep_raw, cwd);
diff --git a/tests/shell/environment/env.rs b/tests/shell/environment/env.rs
index 7061761c70..74736415a3 100644
--- a/tests/shell/environment/env.rs
+++ b/tests/shell/environment/env.rs
@@ -126,6 +126,15 @@ fn passes_with_env_env_var_to_external_process() {
     assert_eq!(actual.out, "foo");
 }
 
+#[test]
+fn hides_environment_from_child() {
+    let actual = nu!(r#"
+        $env.TEST = 1; ^$nu.current-exe -c "hide-env TEST; ^$nu.current-exe -c '$env.TEST'"
+    "#);
+    assert!(actual.out.is_empty());
+    assert!(actual.err.contains("cannot find column"));
+}
+
 #[test]
 fn has_file_pwd() {
     Playground::setup("has_file_pwd", |dirs, sandbox| {

From baeba19b22c08e7a4c6cf3f1ff4b37df0c54987a Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Sun, 19 May 2024 17:56:33 +0000
Subject: [PATCH 0009/1072] Make `get_full_help` take `&dyn Command` (#12903)

# Description
Changes `get_full_help` to take a `&dyn Command` instead of multiple
arguments (`&Signature`, `&Examples` `is_parser_keyword`). All of these
arguments can be gathered from a `Command`, so there is no need to pass
the pieces to `get_full_help`.

This PR also fixes an issue where the search terms are not shown if
`--help` is used on a command.
---
 crates/nu-cli/src/commands/keybindings.rs     | 12 +----
 crates/nu-cli/src/menus/help_completions.rs   | 44 +++++++++----------
 crates/nu-cmd-dataframe/src/dataframe/stub.rs | 12 +----
 crates/nu-cmd-extra/src/extra/bits/bits_.rs   | 12 +----
 .../src/extra/filters/roll/roll_.rs           | 12 +----
 .../src/extra/strings/str_/case/str_.rs       | 12 +----
 .../nu-cmd-lang/src/core_commands/export.rs   | 12 +----
 .../src/core_commands/overlay/command.rs      | 12 +----
 .../src/core_commands/scope/command.rs        | 12 +----
 .../nu-cmd-plugin/src/commands/plugin/mod.rs  | 12 +----
 crates/nu-command/src/bytes/bytes_.rs         | 12 +----
 .../src/conversions/into/command.rs           | 12 +----
 crates/nu-command/src/date/date_.rs           | 22 +---------
 crates/nu-command/src/debug/view.rs           | 12 +----
 crates/nu-command/src/env/config/config_.rs   | 12 +----
 crates/nu-command/src/formats/from/command.rs | 12 +----
 crates/nu-command/src/formats/to/command.rs   | 12 +----
 crates/nu-command/src/hash/hash_.rs           | 12 +----
 crates/nu-command/src/help/help_commands.rs   | 18 +++-----
 crates/nu-command/src/help/help_externs.rs    | 18 +++-----
 crates/nu-command/src/help/help_modules.rs    |  2 +
 crates/nu-command/src/math/math_.rs           | 12 +----
 crates/nu-command/src/network/http/http_.rs   | 12 +----
 crates/nu-command/src/network/url/url_.rs     | 12 +----
 crates/nu-command/src/path/path_.rs           | 12 +----
 crates/nu-command/src/random/random_.rs       | 12 +----
 crates/nu-command/src/stor/stor_.rs           | 12 +----
 .../nu-command/src/strings/format/format_.rs  | 12 +----
 .../nu-command/src/strings/split/command.rs   | 12 +----
 .../nu-command/src/strings/str_/case/str_.rs  | 12 +----
 crates/nu-engine/src/documentation.rs         | 14 +++---
 crates/nu-engine/src/eval.rs                  | 14 +-----
 crates/nu-plugin-engine/src/context.rs        | 10 ++---
 crates/nu-protocol/src/engine/engine_state.rs | 26 ++---------
 src/command.rs                                | 22 ++--------
 tests/repl/test_engine.rs                     |  5 +--
 36 files changed, 82 insertions(+), 413 deletions(-)

diff --git a/crates/nu-cli/src/commands/keybindings.rs b/crates/nu-cli/src/commands/keybindings.rs
index a8c8053a56..347ce983ea 100644
--- a/crates/nu-cli/src/commands/keybindings.rs
+++ b/crates/nu-cli/src/commands/keybindings.rs
@@ -36,16 +36,6 @@ For more information on input and keybindings, check:
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(Value::string(
-            get_full_help(
-                &Keybindings.signature(),
-                &Keybindings.examples(),
-                engine_state,
-                stack,
-                self.is_keyword(),
-            ),
-            call.head,
-        )
-        .into_pipeline_data())
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 }
diff --git a/crates/nu-cli/src/menus/help_completions.rs b/crates/nu-cli/src/menus/help_completions.rs
index 62f40b9d8d..c9c1b7bf94 100644
--- a/crates/nu-cli/src/menus/help_completions.rs
+++ b/crates/nu-cli/src/menus/help_completions.rs
@@ -12,50 +12,49 @@ impl NuHelpCompleter {
     }
 
     fn completion_helper(&self, line: &str, pos: usize) -> Vec<Suggestion> {
-        let full_commands = self.0.get_signatures_with_examples(false);
         let folded_line = line.to_folded_case();
 
-        //Vec<(Signature, Vec<Example>, bool, bool)> {
-        let mut commands = full_commands
-            .iter()
-            .filter(|(sig, _, _)| {
-                sig.name.to_folded_case().contains(&folded_line)
-                    || sig.usage.to_folded_case().contains(&folded_line)
-                    || sig
-                        .search_terms
-                        .iter()
+        let mut commands = self
+            .0
+            .get_decls_sorted(false)
+            .into_iter()
+            .filter_map(|(_, decl_id)| {
+                let decl = self.0.get_decl(decl_id);
+                (decl.name().to_folded_case().contains(&folded_line)
+                    || decl.usage().to_folded_case().contains(&folded_line)
+                    || decl
+                        .search_terms()
+                        .into_iter()
                         .any(|term| term.to_folded_case().contains(&folded_line))
-                    || sig.extra_usage.to_folded_case().contains(&folded_line)
+                    || decl.extra_usage().to_folded_case().contains(&folded_line))
+                .then_some(decl)
             })
             .collect::<Vec<_>>();
 
-        commands.sort_by(|(a, _, _), (b, _, _)| {
-            let a_distance = levenshtein_distance(line, &a.name);
-            let b_distance = levenshtein_distance(line, &b.name);
-            a_distance.cmp(&b_distance)
-        });
+        commands.sort_by_cached_key(|decl| levenshtein_distance(line, decl.name()));
 
         commands
             .into_iter()
-            .map(|(sig, examples, _)| {
+            .map(|decl| {
                 let mut long_desc = String::new();
 
-                let usage = &sig.usage;
+                let usage = decl.usage();
                 if !usage.is_empty() {
                     long_desc.push_str(usage);
                     long_desc.push_str("\r\n\r\n");
                 }
 
-                let extra_usage = &sig.extra_usage;
+                let extra_usage = decl.extra_usage();
                 if !extra_usage.is_empty() {
                     long_desc.push_str(extra_usage);
                     long_desc.push_str("\r\n\r\n");
                 }
 
+                let sig = decl.signature();
                 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(Some(&*self.0.clone()), &sig, |v| {
                         v.to_parsable_string(", ", &self.0.config)
                     }))
                 }
@@ -93,13 +92,14 @@ impl NuHelpCompleter {
                     }
                 }
 
-                let extra: Vec<String> = examples
+                let extra: Vec<String> = decl
+                    .examples()
                     .iter()
                     .map(|example| example.example.replace('\n', "\r\n"))
                     .collect();
 
                 Suggestion {
-                    value: sig.name.clone(),
+                    value: decl.name().into(),
                     description: Some(long_desc),
                     style: None,
                     extra: Some(extra),
diff --git a/crates/nu-cmd-dataframe/src/dataframe/stub.rs b/crates/nu-cmd-dataframe/src/dataframe/stub.rs
index 58dd2996cd..dfabbe0b82 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/stub.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/stub.rs
@@ -29,16 +29,6 @@ impl Command for Dfr {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(Value::string(
-            get_full_help(
-                &Dfr.signature(),
-                &Dfr.examples(),
-                engine_state,
-                stack,
-                self.is_keyword(),
-            ),
-            call.head,
-        )
-        .into_pipeline_data())
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 }
diff --git a/crates/nu-cmd-extra/src/extra/bits/bits_.rs b/crates/nu-cmd-extra/src/extra/bits/bits_.rs
index d795beda4e..1190c01b4d 100644
--- a/crates/nu-cmd-extra/src/extra/bits/bits_.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/bits_.rs
@@ -29,16 +29,6 @@ impl Command for Bits {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(Value::string(
-            get_full_help(
-                &Bits.signature(),
-                &Bits.examples(),
-                engine_state,
-                stack,
-                self.is_keyword(),
-            ),
-            call.head,
-        )
-        .into_pipeline_data())
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 }
diff --git a/crates/nu-cmd-extra/src/extra/filters/roll/roll_.rs b/crates/nu-cmd-extra/src/extra/filters/roll/roll_.rs
index a1622d71c0..867bc2706e 100644
--- a/crates/nu-cmd-extra/src/extra/filters/roll/roll_.rs
+++ b/crates/nu-cmd-extra/src/extra/filters/roll/roll_.rs
@@ -33,16 +33,6 @@ impl Command for Roll {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(Value::string(
-            get_full_help(
-                &Roll.signature(),
-                &Roll.examples(),
-                engine_state,
-                stack,
-                self.is_keyword(),
-            ),
-            call.head,
-        )
-        .into_pipeline_data())
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 }
diff --git a/crates/nu-cmd-extra/src/extra/strings/str_/case/str_.rs b/crates/nu-cmd-extra/src/extra/strings/str_/case/str_.rs
index 56e0d1164f..fe6cb86324 100644
--- a/crates/nu-cmd-extra/src/extra/strings/str_/case/str_.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/str_/case/str_.rs
@@ -29,16 +29,6 @@ impl Command for Str {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(Value::string(
-            get_full_help(
-                &Str.signature(),
-                &Str.examples(),
-                engine_state,
-                stack,
-                self.is_keyword(),
-            ),
-            call.head,
-        )
-        .into_pipeline_data())
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 }
diff --git a/crates/nu-cmd-lang/src/core_commands/export.rs b/crates/nu-cmd-lang/src/core_commands/export.rs
index 8634a8c06b..565e7895dc 100644
--- a/crates/nu-cmd-lang/src/core_commands/export.rs
+++ b/crates/nu-cmd-lang/src/core_commands/export.rs
@@ -35,17 +35,7 @@ impl Command for ExportCommand {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(Value::string(
-            get_full_help(
-                &ExportCommand.signature(),
-                &ExportCommand.examples(),
-                engine_state,
-                stack,
-                self.is_keyword(),
-            ),
-            call.head,
-        )
-        .into_pipeline_data())
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-cmd-lang/src/core_commands/overlay/command.rs b/crates/nu-cmd-lang/src/core_commands/overlay/command.rs
index 72cc28e77c..00ec7438ad 100644
--- a/crates/nu-cmd-lang/src/core_commands/overlay/command.rs
+++ b/crates/nu-cmd-lang/src/core_commands/overlay/command.rs
@@ -37,16 +37,6 @@ impl Command for Overlay {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(Value::string(
-            get_full_help(
-                &Overlay.signature(),
-                &[],
-                engine_state,
-                stack,
-                self.is_keyword(),
-            ),
-            call.head,
-        )
-        .into_pipeline_data())
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 }
diff --git a/crates/nu-cmd-lang/src/core_commands/scope/command.rs b/crates/nu-cmd-lang/src/core_commands/scope/command.rs
index 72a9e74932..98439226cf 100644
--- a/crates/nu-cmd-lang/src/core_commands/scope/command.rs
+++ b/crates/nu-cmd-lang/src/core_commands/scope/command.rs
@@ -31,16 +31,6 @@ impl Command for Scope {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(Value::string(
-            get_full_help(
-                &Scope.signature(),
-                &[],
-                engine_state,
-                stack,
-                self.is_keyword(),
-            ),
-            call.head,
-        )
-        .into_pipeline_data())
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 }
diff --git a/crates/nu-cmd-plugin/src/commands/plugin/mod.rs b/crates/nu-cmd-plugin/src/commands/plugin/mod.rs
index cf4ee5d9a3..36590e9a8a 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/mod.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/mod.rs
@@ -37,17 +37,7 @@ impl Command for PluginCommand {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(Value::string(
-            get_full_help(
-                &PluginCommand.signature(),
-                &PluginCommand.examples(),
-                engine_state,
-                stack,
-                self.is_keyword(),
-            ),
-            call.head,
-        )
-        .into_pipeline_data())
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/bytes/bytes_.rs b/crates/nu-command/src/bytes/bytes_.rs
index 451ee1e5d5..82bf7c619b 100644
--- a/crates/nu-command/src/bytes/bytes_.rs
+++ b/crates/nu-command/src/bytes/bytes_.rs
@@ -29,16 +29,6 @@ impl Command for Bytes {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(Value::string(
-            get_full_help(
-                &Bytes.signature(),
-                &Bytes.examples(),
-                engine_state,
-                stack,
-                self.is_keyword(),
-            ),
-            call.head,
-        )
-        .into_pipeline_data())
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 }
diff --git a/crates/nu-command/src/conversions/into/command.rs b/crates/nu-command/src/conversions/into/command.rs
index 5a8175b298..03b8e81c4a 100644
--- a/crates/nu-command/src/conversions/into/command.rs
+++ b/crates/nu-command/src/conversions/into/command.rs
@@ -29,16 +29,6 @@ impl Command for Into {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(Value::string(
-            get_full_help(
-                &Into.signature(),
-                &[],
-                engine_state,
-                stack,
-                self.is_keyword(),
-            ),
-            call.head,
-        )
-        .into_pipeline_data())
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 }
diff --git a/crates/nu-command/src/date/date_.rs b/crates/nu-command/src/date/date_.rs
index 158940cc2e..fd67e9c923 100644
--- a/crates/nu-command/src/date/date_.rs
+++ b/crates/nu-command/src/date/date_.rs
@@ -42,26 +42,6 @@ impl Command for Date {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        date(engine_state, stack, call)
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 }
-
-fn date(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-) -> Result<PipelineData, ShellError> {
-    let head = call.head;
-
-    Ok(Value::string(
-        get_full_help(
-            &Date.signature(),
-            &Date.examples(),
-            engine_state,
-            stack,
-            false,
-        ),
-        head,
-    )
-    .into_pipeline_data())
-}
diff --git a/crates/nu-command/src/debug/view.rs b/crates/nu-command/src/debug/view.rs
index fcbc377e4b..4ef1c1c7e0 100644
--- a/crates/nu-command/src/debug/view.rs
+++ b/crates/nu-command/src/debug/view.rs
@@ -29,16 +29,6 @@ impl Command for View {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(Value::string(
-            get_full_help(
-                &View.signature(),
-                &View.examples(),
-                engine_state,
-                stack,
-                self.is_keyword(),
-            ),
-            call.head,
-        )
-        .into_pipeline_data())
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 }
diff --git a/crates/nu-command/src/env/config/config_.rs b/crates/nu-command/src/env/config/config_.rs
index 948e8248b8..1cd6ef4621 100644
--- a/crates/nu-command/src/env/config/config_.rs
+++ b/crates/nu-command/src/env/config/config_.rs
@@ -29,17 +29,7 @@ impl Command for ConfigMeta {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(Value::string(
-            get_full_help(
-                &ConfigMeta.signature(),
-                &ConfigMeta.examples(),
-                engine_state,
-                stack,
-                self.is_keyword(),
-            ),
-            call.head,
-        )
-        .into_pipeline_data())
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 
     fn search_terms(&self) -> Vec<&str> {
diff --git a/crates/nu-command/src/formats/from/command.rs b/crates/nu-command/src/formats/from/command.rs
index 3df3d86e2e..40085b51d2 100644
--- a/crates/nu-command/src/formats/from/command.rs
+++ b/crates/nu-command/src/formats/from/command.rs
@@ -29,16 +29,6 @@ impl Command for From {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(Value::string(
-            get_full_help(
-                &From.signature(),
-                &From.examples(),
-                engine_state,
-                stack,
-                self.is_keyword(),
-            ),
-            call.head,
-        )
-        .into_pipeline_data())
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 }
diff --git a/crates/nu-command/src/formats/to/command.rs b/crates/nu-command/src/formats/to/command.rs
index 1288c2d73b..2138085c87 100644
--- a/crates/nu-command/src/formats/to/command.rs
+++ b/crates/nu-command/src/formats/to/command.rs
@@ -29,16 +29,6 @@ impl Command for To {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(Value::string(
-            get_full_help(
-                &To.signature(),
-                &To.examples(),
-                engine_state,
-                stack,
-                self.is_keyword(),
-            ),
-            call.head,
-        )
-        .into_pipeline_data())
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 }
diff --git a/crates/nu-command/src/hash/hash_.rs b/crates/nu-command/src/hash/hash_.rs
index fc7f58cd3b..d4eca79354 100644
--- a/crates/nu-command/src/hash/hash_.rs
+++ b/crates/nu-command/src/hash/hash_.rs
@@ -29,16 +29,6 @@ impl Command for Hash {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(Value::string(
-            get_full_help(
-                &Self.signature(),
-                &Self.examples(),
-                engine_state,
-                stack,
-                self.is_keyword(),
-            ),
-            call.head,
-        )
-        .into_pipeline_data())
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 }
diff --git a/crates/nu-command/src/help/help_commands.rs b/crates/nu-command/src/help/help_commands.rs
index 2633595356..f2440cc36f 100644
--- a/crates/nu-command/src/help/help_commands.rs
+++ b/crates/nu-command/src/help/help_commands.rs
@@ -1,7 +1,6 @@
 use crate::help::highlight_search_in_table;
 use nu_color_config::StyleComputer;
 use nu_engine::{command_prelude::*, get_full_help};
-use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct HelpCommands;
@@ -89,18 +88,13 @@ pub fn help_commands(
         }
 
         let output = engine_state
-            .get_signatures_with_examples(false)
-            .iter()
-            .filter(|(signature, _, _)| signature.name == name)
-            .map(|(signature, examples, cmd_type)| {
-                get_full_help(
-                    signature,
-                    examples,
-                    engine_state,
-                    stack,
-                    cmd_type == &CommandType::Keyword,
-                )
+            .get_decls_sorted(false)
+            .into_iter()
+            .filter_map(|(_, decl_id)| {
+                let decl = engine_state.get_decl(decl_id);
+                (decl.name() == name).then_some(decl)
             })
+            .map(|cmd| get_full_help(cmd, engine_state, stack))
             .collect::<Vec<String>>();
 
         if !output.is_empty() {
diff --git a/crates/nu-command/src/help/help_externs.rs b/crates/nu-command/src/help/help_externs.rs
index 0378553463..4a5c8123a4 100644
--- a/crates/nu-command/src/help/help_externs.rs
+++ b/crates/nu-command/src/help/help_externs.rs
@@ -1,7 +1,6 @@
 use crate::help::highlight_search_in_table;
 use nu_color_config::StyleComputer;
 use nu_engine::{command_prelude::*, get_full_help, scope::ScopeData};
-use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct HelpExterns;
@@ -109,18 +108,13 @@ pub fn help_externs(
         }
 
         let output = engine_state
-            .get_signatures_with_examples(false)
-            .iter()
-            .filter(|(signature, _, _)| signature.name == name)
-            .map(|(signature, examples, cmd_type)| {
-                get_full_help(
-                    signature,
-                    examples,
-                    engine_state,
-                    stack,
-                    cmd_type == &CommandType::Keyword,
-                )
+            .get_decls_sorted(false)
+            .into_iter()
+            .filter_map(|(_, decl_id)| {
+                let decl = engine_state.get_decl(decl_id);
+                (decl.name() == name).then_some(decl)
             })
+            .map(|cmd| get_full_help(cmd, engine_state, stack))
             .collect::<Vec<String>>();
 
         if !output.is_empty() {
diff --git a/crates/nu-command/src/help/help_modules.rs b/crates/nu-command/src/help/help_modules.rs
index 690968251b..5b39133a6d 100644
--- a/crates/nu-command/src/help/help_modules.rs
+++ b/crates/nu-command/src/help/help_modules.rs
@@ -149,6 +149,7 @@ pub fn help_modules(
         if !module.decls.is_empty() || module.main.is_some() {
             let commands: Vec<(Vec<u8>, DeclId)> = engine_state
                 .get_decls_sorted(false)
+                .into_iter()
                 .filter(|(_, id)| !engine_state.get_decl(*id).is_alias())
                 .collect();
 
@@ -186,6 +187,7 @@ pub fn help_modules(
         if !module.decls.is_empty() {
             let aliases: Vec<(Vec<u8>, DeclId)> = engine_state
                 .get_decls_sorted(false)
+                .into_iter()
                 .filter(|(_, id)| engine_state.get_decl(*id).is_alias())
                 .collect();
 
diff --git a/crates/nu-command/src/math/math_.rs b/crates/nu-command/src/math/math_.rs
index 9f230362ea..2ac067af4e 100644
--- a/crates/nu-command/src/math/math_.rs
+++ b/crates/nu-command/src/math/math_.rs
@@ -29,16 +29,6 @@ impl Command for MathCommand {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(Value::string(
-            get_full_help(
-                &MathCommand.signature(),
-                &MathCommand.examples(),
-                engine_state,
-                stack,
-                self.is_keyword(),
-            ),
-            call.head,
-        )
-        .into_pipeline_data())
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 }
diff --git a/crates/nu-command/src/network/http/http_.rs b/crates/nu-command/src/network/http/http_.rs
index b1e8d64120..361033708e 100644
--- a/crates/nu-command/src/network/http/http_.rs
+++ b/crates/nu-command/src/network/http/http_.rs
@@ -35,16 +35,6 @@ impl Command for Http {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(Value::string(
-            get_full_help(
-                &Http.signature(),
-                &Http.examples(),
-                engine_state,
-                stack,
-                self.is_keyword(),
-            ),
-            call.head,
-        )
-        .into_pipeline_data())
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 }
diff --git a/crates/nu-command/src/network/url/url_.rs b/crates/nu-command/src/network/url/url_.rs
index 49d55c4c6b..9988063d46 100644
--- a/crates/nu-command/src/network/url/url_.rs
+++ b/crates/nu-command/src/network/url/url_.rs
@@ -33,16 +33,6 @@ impl Command for Url {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(Value::string(
-            get_full_help(
-                &Url.signature(),
-                &Url.examples(),
-                engine_state,
-                stack,
-                self.is_keyword(),
-            ),
-            call.head,
-        )
-        .into_pipeline_data())
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 }
diff --git a/crates/nu-command/src/path/path_.rs b/crates/nu-command/src/path/path_.rs
index 2d1d0730fa..667008b658 100644
--- a/crates/nu-command/src/path/path_.rs
+++ b/crates/nu-command/src/path/path_.rs
@@ -42,16 +42,6 @@ the path literal."#
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(Value::string(
-            get_full_help(
-                &PathCommand.signature(),
-                &PathCommand.examples(),
-                engine_state,
-                stack,
-                self.is_keyword(),
-            ),
-            call.head,
-        )
-        .into_pipeline_data())
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 }
diff --git a/crates/nu-command/src/random/random_.rs b/crates/nu-command/src/random/random_.rs
index 16135000ea..5cf14d7748 100644
--- a/crates/nu-command/src/random/random_.rs
+++ b/crates/nu-command/src/random/random_.rs
@@ -33,16 +33,6 @@ impl Command for RandomCommand {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(Value::string(
-            get_full_help(
-                &RandomCommand.signature(),
-                &RandomCommand.examples(),
-                engine_state,
-                stack,
-                self.is_keyword(),
-            ),
-            call.head,
-        )
-        .into_pipeline_data())
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 }
diff --git a/crates/nu-command/src/stor/stor_.rs b/crates/nu-command/src/stor/stor_.rs
index 3fb6840e7d..c5bb378c2d 100644
--- a/crates/nu-command/src/stor/stor_.rs
+++ b/crates/nu-command/src/stor/stor_.rs
@@ -29,16 +29,6 @@ impl Command for Stor {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(Value::string(
-            get_full_help(
-                &Stor.signature(),
-                &Stor.examples(),
-                engine_state,
-                stack,
-                self.is_keyword(),
-            ),
-            call.head,
-        )
-        .into_pipeline_data())
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 }
diff --git a/crates/nu-command/src/strings/format/format_.rs b/crates/nu-command/src/strings/format/format_.rs
index c51213e4ef..21b46a8b05 100644
--- a/crates/nu-command/src/strings/format/format_.rs
+++ b/crates/nu-command/src/strings/format/format_.rs
@@ -29,16 +29,6 @@ impl Command for Format {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(Value::string(
-            get_full_help(
-                &Format.signature(),
-                &Format.examples(),
-                engine_state,
-                stack,
-                self.is_keyword(),
-            ),
-            call.head,
-        )
-        .into_pipeline_data())
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 }
diff --git a/crates/nu-command/src/strings/split/command.rs b/crates/nu-command/src/strings/split/command.rs
index 0333249c2b..ff9057eacc 100644
--- a/crates/nu-command/src/strings/split/command.rs
+++ b/crates/nu-command/src/strings/split/command.rs
@@ -29,16 +29,6 @@ impl Command for SplitCommand {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(Value::string(
-            get_full_help(
-                &SplitCommand.signature(),
-                &SplitCommand.examples(),
-                engine_state,
-                stack,
-                self.is_keyword(),
-            ),
-            call.head,
-        )
-        .into_pipeline_data())
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 }
diff --git a/crates/nu-command/src/strings/str_/case/str_.rs b/crates/nu-command/src/strings/str_/case/str_.rs
index 56e0d1164f..fe6cb86324 100644
--- a/crates/nu-command/src/strings/str_/case/str_.rs
+++ b/crates/nu-command/src/strings/str_/case/str_.rs
@@ -29,16 +29,6 @@ impl Command for Str {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(Value::string(
-            get_full_help(
-                &Str.signature(),
-                &Str.examples(),
-                engine_state,
-                stack,
-                self.is_keyword(),
-            ),
-            call.head,
-        )
-        .into_pipeline_data())
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 }
diff --git a/crates/nu-engine/src/documentation.rs b/crates/nu-engine/src/documentation.rs
index 62e68eaa6c..3cd1130060 100644
--- a/crates/nu-engine/src/documentation.rs
+++ b/crates/nu-engine/src/documentation.rs
@@ -2,18 +2,16 @@ use crate::eval_call;
 use nu_protocol::{
     ast::{Argument, Call, Expr, Expression, RecordItem},
     debugger::WithoutDebug,
-    engine::{EngineState, Stack},
+    engine::{Command, EngineState, Stack},
     record, Category, Example, IntoPipelineData, PipelineData, Signature, Span, SyntaxShape, Type,
     Value,
 };
 use std::{collections::HashMap, fmt::Write};
 
 pub fn get_full_help(
-    sig: &Signature,
-    examples: &[Example],
+    command: &dyn Command,
     engine_state: &EngineState,
     stack: &mut Stack,
-    is_parser_keyword: bool,
 ) -> String {
     let config = engine_state.get_config();
     let doc_config = DocumentationConfig {
@@ -23,14 +21,15 @@ pub fn get_full_help(
     };
 
     let stack = &mut stack.start_capture();
+    let signature = command.signature().update_from_command(command);
 
     get_documentation(
-        sig,
-        examples,
+        &signature,
+        &command.examples(),
         engine_state,
         stack,
         &doc_config,
-        is_parser_keyword,
+        command.is_keyword(),
     )
 }
 
@@ -61,7 +60,6 @@ fn nu_highlight_string(code_string: &str, engine_state: &EngineState, stack: &mu
     code_string.to_string()
 }
 
-#[allow(clippy::cognitive_complexity)]
 fn get_documentation(
     sig: &Signature,
     examples: &[Example],
diff --git a/crates/nu-engine/src/eval.rs b/crates/nu-engine/src/eval.rs
index 02feef3f38..af051a1dc7 100644
--- a/crates/nu-engine/src/eval.rs
+++ b/crates/nu-engine/src/eval.rs
@@ -27,18 +27,8 @@ pub fn eval_call<D: DebugContext>(
     let decl = engine_state.get_decl(call.decl_id);
 
     if !decl.is_known_external() && call.named_iter().any(|(flag, _, _)| flag.item == "help") {
-        let mut signature = engine_state.get_signature(decl);
-        signature.usage = decl.usage().to_string();
-        signature.extra_usage = decl.extra_usage().to_string();
-
-        let full_help = get_full_help(
-            &signature,
-            &decl.examples(),
-            engine_state,
-            caller_stack,
-            decl.is_keyword(),
-        );
-        Ok(Value::string(full_help, call.head).into_pipeline_data())
+        let help = get_full_help(decl, engine_state, caller_stack);
+        Ok(Value::string(help, call.head).into_pipeline_data())
     } else if let Some(block_id) = decl.block_id() {
         let block = engine_state.get_block(block_id);
 
diff --git a/crates/nu-plugin-engine/src/context.rs b/crates/nu-plugin-engine/src/context.rs
index 0b1d56c050..d5be6ad4b6 100644
--- a/crates/nu-plugin-engine/src/context.rs
+++ b/crates/nu-plugin-engine/src/context.rs
@@ -139,14 +139,10 @@ impl<'a> PluginExecutionContext for PluginExecutionCommandContext<'a> {
     fn get_help(&self) -> Result<Spanned<String>, ShellError> {
         let decl = self.engine_state.get_decl(self.call.decl_id);
 
-        Ok(get_full_help(
-            &decl.signature(),
-            &decl.examples(),
-            &self.engine_state,
-            &mut self.stack.clone(),
-            false,
+        Ok(
+            get_full_help(decl, &self.engine_state, &mut self.stack.clone())
+                .into_spanned(self.call.head),
         )
-        .into_spanned(self.call.head))
     }
 
     fn get_span_contents(&self, span: Span) -> Result<Spanned<Vec<u8>>, ShellError> {
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index 1948b67d43..710ca77d4c 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -7,7 +7,7 @@ use crate::{
         Variable, Visibility, DEFAULT_OVERLAY_NAME,
     },
     eval_const::create_nu_constant,
-    BlockId, Category, Config, DeclId, Example, FileId, HistoryConfig, Module, ModuleId, OverlayId,
+    BlockId, Category, Config, DeclId, FileId, HistoryConfig, Module, ModuleId, OverlayId,
     ShellError, Signature, Span, Type, Value, VarId, VirtualPathId,
 };
 use fancy_regex::Regex;
@@ -766,10 +766,7 @@ impl EngineState {
     }
 
     /// Get all commands within scope, sorted by the commands' names
-    pub fn get_decls_sorted(
-        &self,
-        include_hidden: bool,
-    ) -> impl Iterator<Item = (Vec<u8>, DeclId)> {
+    pub fn get_decls_sorted(&self, include_hidden: bool) -> Vec<(Vec<u8>, DeclId)> {
         let mut decls_map = HashMap::new();
 
         for overlay_frame in self.active_overlays(&[]) {
@@ -790,7 +787,7 @@ impl EngineState {
         let mut decls: Vec<(Vec<u8>, DeclId)> = decls_map.into_iter().collect();
 
         decls.sort_by(|a, b| a.0.cmp(&b.0));
-        decls.into_iter()
+        decls
     }
 
     pub fn get_signature(&self, decl: &dyn Command) -> Signature {
@@ -804,6 +801,7 @@ impl EngineState {
     /// Get signatures of all commands within scope.
     pub fn get_signatures(&self, include_hidden: bool) -> Vec<Signature> {
         self.get_decls_sorted(include_hidden)
+            .into_iter()
             .map(|(_, id)| {
                 let decl = self.get_decl(id);
 
@@ -812,22 +810,6 @@ impl EngineState {
             .collect()
     }
 
-    /// Get signatures of all commands within scope.
-    ///
-    /// In addition to signatures, it returns each command's examples and type.
-    pub fn get_signatures_with_examples(
-        &self,
-        include_hidden: bool,
-    ) -> Vec<(Signature, Vec<Example>, CommandType)> {
-        self.get_decls_sorted(include_hidden)
-            .map(|(_, id)| {
-                let decl = self.get_decl(id);
-                let signature = self.get_signature(decl).update_from_command(decl);
-                (signature, decl.examples(), decl.command_type())
-            })
-            .collect()
-    }
-
     pub fn get_block(&self, block_id: BlockId) -> &Arc<Block> {
         self.blocks
             .get(block_id)
diff --git a/src/command.rs b/src/command.rs
index ab7a74884e..7fcf2da1b3 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -191,13 +191,7 @@ pub(crate) fn parse_commandline_args(
             let help = call.has_flag(engine_state, &mut stack, "help")?;
 
             if help {
-                let full_help = get_full_help(
-                    &Nu.signature(),
-                    &Nu.examples(),
-                    engine_state,
-                    &mut stack,
-                    true,
-                );
+                let full_help = get_full_help(&Nu, engine_state, &mut stack);
 
                 let _ = std::panic::catch_unwind(move || stdout_write_all_and_flush(full_help));
 
@@ -245,13 +239,7 @@ pub(crate) fn parse_commandline_args(
     }
 
     // Just give the help and exit if the above fails
-    let full_help = get_full_help(
-        &Nu.signature(),
-        &Nu.examples(),
-        engine_state,
-        &mut stack,
-        true,
-    );
+    let full_help = get_full_help(&Nu, engine_state, &mut stack);
     print!("{full_help}");
     std::process::exit(1);
 }
@@ -452,11 +440,7 @@ impl Command for Nu {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(Value::string(
-            get_full_help(&Nu.signature(), &Nu.examples(), engine_state, stack, true),
-            call.head,
-        )
-        .into_pipeline_data())
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 
     fn examples(&self) -> Vec<nu_protocol::Example> {
diff --git a/tests/repl/test_engine.rs b/tests/repl/test_engine.rs
index c1eb919afa..e452295f42 100644
--- a/tests/repl/test_engine.rs
+++ b/tests/repl/test_engine.rs
@@ -54,8 +54,7 @@ fn in_and_if_else() -> TestResult {
 
 #[test]
 fn help_works_with_missing_requirements() -> TestResult {
-    let expected_length = "70";
-    run_test(r#"each --help | lines | length"#, expected_length)
+    run_test(r#"each --help | lines | length"#, "72")
 }
 
 #[test]
@@ -65,12 +64,12 @@ fn scope_variable() -> TestResult {
         "int",
     )
 }
+
 #[rstest]
 #[case("a", "<> nothing")]
 #[case("b", "<1.23> float")]
 #[case("flag1", "<> nothing")]
 #[case("flag2", "<4.56> float")]
-
 fn scope_command_defaults(#[case] var: &str, #[case] exp_result: &str) -> TestResult {
     run_test(
         &format!(

From c61075e20e328bc33f4765feb6d5fcef5e6039ce Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Sun, 19 May 2024 17:35:32 -0700
Subject: [PATCH 0010/1072] Add string/binary type color to `ByteStream`
 (#12897)

# Description

This PR allows byte streams to optionally be colored as being
specifically binary or string data, which guarantees that they'll be
converted to `Binary` or `String` appropriately on `into_value()`,
making them compatible with `Type` guarantees. This makes them
significantly more broadly usable for command input and output.

There is still an `Unknown` type for byte streams coming from external
commands, which uses the same behavior as we previously did where it's a
string if it's UTF-8.

A small number of commands were updated to take advantage of this, just
to prove the point. I will be adding more after this merges.

# User-Facing Changes
- New types in `describe`: `string (stream)`, `binary (stream)`
- These commands now return a stream if their input was a stream:
  - `into binary`
  - `into string`
  - `bytes collect`
  - `str join`
  - `first` (binary)
  - `last` (binary)
  - `take` (binary)
  - `skip` (binary)
- Streams that are explicitly binary colored will print as a streaming
hexdump
  - example:
    ```nushell
    1.. | each { into binary } | bytes collect
    ```

# Tests + Formatting
I've added some tests to cover it at a basic level, and it doesn't break
anything existing, but I do think more would be nice. Some of those will
come when I modify more commands to stream.

# After Submitting
There are a few things I'm not quite satisfied with:

- **String trimming behavior.** We automatically trim newlines from
streams from external commands, but I don't think we should do this with
internal commands. If I call a command that happens to turn my string
into a stream, I don't want the newline to suddenly disappear. I changed
this to specifically do it only on `Child` and `File`, but I don't know
if this is quite right, and maybe we should bring back the old flag for
`trim_end_newline`
- **Known binary always resulting in a hexdump.** It would be nice to
have a `print --raw`, so that we can put binary data on stdout
explicitly if we want to. This PR doesn't change how external commands
work though - they still dump straight to stdout.

Otherwise, here's the normal checklist:

- [ ] release notes
- [ ] docs update for plugin protocol changes (added `type` field)

---------

Co-authored-by: Ian Manske <ian.manske@pm.me>
---
 crates/nu-cli/src/util.rs                     |   4 +-
 .../nu-cmd-lang/src/core_commands/describe.rs |   6 +-
 crates/nu-command/src/bytes/collect.rs        |  58 +-
 .../nu-command/src/conversions/into/binary.rs |  11 +-
 .../src/conversions/into/cell_path.rs         |   2 +-
 .../nu-command/src/conversions/into/string.rs |  20 +-
 crates/nu-command/src/filters/drop/column.rs  |   2 +-
 crates/nu-command/src/filters/first.rs        |  43 +-
 crates/nu-command/src/filters/insert.rs       |   4 +-
 crates/nu-command/src/filters/items.rs        |   2 +-
 crates/nu-command/src/filters/last.rs         |  48 +-
 crates/nu-command/src/filters/skip/skip_.rs   |  36 +-
 crates/nu-command/src/filters/take/take_.rs   |  32 +-
 crates/nu-command/src/filters/tee.rs          | 229 +++----
 crates/nu-command/src/filters/update.rs       |   4 +-
 crates/nu-command/src/filters/upsert.rs       |   4 +-
 crates/nu-command/src/filters/values.rs       |   2 +-
 crates/nu-command/src/formats/to/text.rs      |   7 +-
 crates/nu-command/src/network/http/client.rs  |  12 +-
 crates/nu-command/src/strings/str_/join.rs    |  50 +-
 crates/nu-command/src/system/run_external.rs  |   1 +
 crates/nu-command/src/viewers/table.rs        |  86 ++-
 .../tests/commands/bytes/collect.rs           |  27 +
 crates/nu-command/tests/commands/bytes/mod.rs |   1 +
 crates/nu-command/tests/commands/first.rs     |  14 +
 crates/nu-command/tests/commands/last.rs      |  14 +
 crates/nu-command/tests/commands/mod.rs       |   1 +
 .../nu-command/tests/commands/skip/skip_.rs   |  16 +-
 .../commands/str_/{collect.rs => join.rs}     |  12 +
 crates/nu-command/tests/commands/str_/mod.rs  |   2 +-
 crates/nu-command/tests/commands/take/rows.rs |  14 +
 crates/nu-engine/src/command_prelude.rs       |   6 +-
 crates/nu-plugin-core/src/interface/mod.rs    |   5 +-
 crates/nu-plugin-core/src/interface/tests.rs  |  12 +-
 .../nu-plugin-engine/src/interface/tests.rs   |   6 +-
 crates/nu-plugin-protocol/src/lib.rs          |   6 +-
 .../nu-plugin/src/plugin/interface/tests.rs   |   5 +-
 crates/nu-pretty-hex/src/pretty_hex.rs        |  50 +-
 crates/nu-protocol/src/errors/shell_error.rs  |  10 +-
 .../nu-protocol/src/pipeline/byte_stream.rs   | 604 ++++++++++++++----
 .../nu-protocol/src/pipeline/pipeline_data.rs |  51 +-
 .../src/commands/collect_bytes.rs             |   4 +-
 42 files changed, 1107 insertions(+), 416 deletions(-)
 create mode 100644 crates/nu-command/tests/commands/bytes/collect.rs
 create mode 100644 crates/nu-command/tests/commands/bytes/mod.rs
 rename crates/nu-command/tests/commands/str_/{collect.rs => join.rs} (65%)

diff --git a/crates/nu-cli/src/util.rs b/crates/nu-cli/src/util.rs
index 7ebea0deb2..e4912e012f 100644
--- a/crates/nu-cli/src/util.rs
+++ b/crates/nu-cli/src/util.rs
@@ -276,8 +276,8 @@ fn evaluate_source(
         eval_block::<WithoutDebug>(engine_state, stack, &block, input)
     }?;
 
-    let status = if let PipelineData::ByteStream(stream, ..) = pipeline {
-        stream.print(false)?
+    let status = if let PipelineData::ByteStream(..) = pipeline {
+        pipeline.print(engine_state, stack, false, false)?
     } else {
         if let Some(hook) = engine_state.get_config().hooks.display_output.clone() {
             let pipeline = eval_hook(
diff --git a/crates/nu-cmd-lang/src/core_commands/describe.rs b/crates/nu-cmd-lang/src/core_commands/describe.rs
index 7d6d7f6f83..3d992f3f33 100644
--- a/crates/nu-cmd-lang/src/core_commands/describe.rs
+++ b/crates/nu-cmd-lang/src/core_commands/describe.rs
@@ -163,6 +163,8 @@ fn run(
 
     let description = match input {
         PipelineData::ByteStream(stream, ..) => {
+            let type_ = stream.type_().describe();
+
             let description = if options.detailed {
                 let origin = match stream.source() {
                     ByteStreamSource::Read(_) => "unknown",
@@ -172,14 +174,14 @@ fn run(
 
                 Value::record(
                     record! {
-                        "type" => Value::string("byte stream", head),
+                        "type" => Value::string(type_, head),
                         "origin" => Value::string(origin, head),
                         "metadata" => metadata_to_value(metadata, head),
                     },
                     head,
                 )
             } else {
-                Value::string("byte stream", head)
+                Value::string(type_, head)
             };
 
             if !options.no_collect {
diff --git a/crates/nu-command/src/bytes/collect.rs b/crates/nu-command/src/bytes/collect.rs
index 9cd34496e4..74ea3e5d14 100644
--- a/crates/nu-command/src/bytes/collect.rs
+++ b/crates/nu-command/src/bytes/collect.rs
@@ -1,3 +1,4 @@
+use itertools::Itertools;
 use nu_engine::command_prelude::*;
 
 #[derive(Clone, Copy)]
@@ -35,46 +36,33 @@ impl Command for BytesCollect {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let separator: Option<Vec<u8>> = call.opt(engine_state, stack, 0)?;
+
+        let span = call.head;
+
         // input should be a list of binary data.
-        let mut output_binary = vec![];
-        for value in input {
-            match value {
-                Value::Binary { mut val, .. } => {
-                    output_binary.append(&mut val);
-                    // manually concat
-                    // TODO: make use of std::slice::Join when it's available in stable.
-                    if let Some(sep) = &separator {
-                        let mut work_sep = sep.clone();
-                        output_binary.append(&mut work_sep)
-                    }
-                }
-                // Explicitly propagate errors instead of dropping them.
-                Value::Error { error, .. } => return Err(*error),
-                other => {
-                    return Err(ShellError::OnlySupportsThisInputType {
+        let metadata = input.metadata();
+        let iter = Itertools::intersperse(
+            input.into_iter_strict(span)?.map(move |value| {
+                // Everything is wrapped in Some in case there's a separator, so we can flatten
+                Some(match value {
+                    // Explicitly propagate errors instead of dropping them.
+                    Value::Error { error, .. } => Err(*error),
+                    Value::Binary { val, .. } => Ok(val),
+                    other => Err(ShellError::OnlySupportsThisInputType {
                         exp_input_type: "binary".into(),
                         wrong_type: other.get_type().to_string(),
-                        dst_span: call.head,
+                        dst_span: span,
                         src_span: other.span(),
-                    });
-                }
-            }
-        }
+                    }),
+                })
+            }),
+            Ok(separator).transpose(),
+        )
+        .flatten();
 
-        match separator {
-            None => Ok(Value::binary(output_binary, call.head).into_pipeline_data()),
-            Some(sep) => {
-                if output_binary.is_empty() {
-                    Ok(Value::binary(output_binary, call.head).into_pipeline_data())
-                } else {
-                    // have push one extra separator in previous step, pop them out.
-                    for _ in sep {
-                        let _ = output_binary.pop();
-                    }
-                    Ok(Value::binary(output_binary, call.head).into_pipeline_data())
-                }
-            }
-        }
+        let output = ByteStream::from_result_iter(iter, span, None, ByteStreamType::Binary);
+
+        Ok(PipelineData::ByteStream(output, metadata))
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/conversions/into/binary.rs b/crates/nu-command/src/conversions/into/binary.rs
index 479b0fc7d7..8eb7715754 100644
--- a/crates/nu-command/src/conversions/into/binary.rs
+++ b/crates/nu-command/src/conversions/into/binary.rs
@@ -127,15 +127,18 @@ fn into_binary(
     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 {
-        // TODO: in the future, we may want this to stream out, converting each to bytes
-        Ok(Value::binary(stream.into_bytes()?, head).into_pipeline_data())
+    if let PipelineData::ByteStream(stream, metadata) = input {
+        // Just set the type - that should be good enough
+        Ok(PipelineData::ByteStream(
+            stream.with_type(ByteStreamType::Binary),
+            metadata,
+        ))
     } else {
         let args = Arguments {
             cell_paths,
             compact: call.has_flag(engine_state, stack, "compact")?,
         };
-        operate(action, args, input, call.head, engine_state.ctrlc.clone())
+        operate(action, args, input, head, engine_state.ctrlc.clone())
     }
 }
 
diff --git a/crates/nu-command/src/conversions/into/cell_path.rs b/crates/nu-command/src/conversions/into/cell_path.rs
index 6da317abd3..c05dad57ba 100644
--- a/crates/nu-command/src/conversions/into/cell_path.rs
+++ b/crates/nu-command/src/conversions/into/cell_path.rs
@@ -103,7 +103,7 @@ fn into_cell_path(call: &Call, input: PipelineData) -> Result<PipelineData, Shel
         }
         PipelineData::ByteStream(stream, ..) => Err(ShellError::OnlySupportsThisInputType {
             exp_input_type: "list, int".into(),
-            wrong_type: "byte stream".into(),
+            wrong_type: stream.type_().describe().into(),
             dst_span: head,
             src_span: stream.span(),
         }),
diff --git a/crates/nu-command/src/conversions/into/string.rs b/crates/nu-command/src/conversions/into/string.rs
index eda4f7e5a5..c0731b2e20 100644
--- a/crates/nu-command/src/conversions/into/string.rs
+++ b/crates/nu-command/src/conversions/into/string.rs
@@ -156,9 +156,23 @@ fn string_helper(
     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 {
-        // TODO: in the future, we may want this to stream out, converting each to bytes
-        Ok(Value::string(stream.into_string()?, head).into_pipeline_data())
+    if let PipelineData::ByteStream(stream, metadata) = input {
+        // Just set the type - that should be good enough. There is no guarantee that the data
+        // within a string stream is actually valid UTF-8. But refuse to do it if it was already set
+        // to binary
+        if stream.type_() != ByteStreamType::Binary {
+            Ok(PipelineData::ByteStream(
+                stream.with_type(ByteStreamType::String),
+                metadata,
+            ))
+        } else {
+            Err(ShellError::CantConvert {
+                to_type: "string".into(),
+                from_type: "binary".into(),
+                span: stream.span(),
+                help: Some("try using the `decode` command".into()),
+            })
+        }
     } else {
         let config = engine_state.get_config().clone();
         let args = Arguments {
diff --git a/crates/nu-command/src/filters/drop/column.rs b/crates/nu-command/src/filters/drop/column.rs
index 01c13deee4..94c0308ea8 100644
--- a/crates/nu-command/src/filters/drop/column.rs
+++ b/crates/nu-command/src/filters/drop/column.rs
@@ -135,7 +135,7 @@ fn drop_cols(
         PipelineData::Empty => Ok(PipelineData::Empty),
         PipelineData::ByteStream(stream, ..) => Err(ShellError::OnlySupportsThisInputType {
             exp_input_type: "table or record".into(),
-            wrong_type: "byte stream".into(),
+            wrong_type: stream.type_().describe().into(),
             dst_span: head,
             src_span: stream.span(),
         }),
diff --git a/crates/nu-command/src/filters/first.rs b/crates/nu-command/src/filters/first.rs
index e581c3e84d..f625847a3f 100644
--- a/crates/nu-command/src/filters/first.rs
+++ b/crates/nu-command/src/filters/first.rs
@@ -170,12 +170,43 @@ fn first_helper(
                 ))
             }
         }
-        PipelineData::ByteStream(stream, ..) => Err(ShellError::OnlySupportsThisInputType {
-            exp_input_type: "list, binary or range".into(),
-            wrong_type: "byte stream".into(),
-            dst_span: head,
-            src_span: stream.span(),
-        }),
+        PipelineData::ByteStream(stream, metadata) => {
+            if stream.type_() == ByteStreamType::Binary {
+                let span = stream.span();
+                if let Some(mut reader) = stream.reader() {
+                    use std::io::Read;
+                    if return_single_element {
+                        // Take a single byte
+                        let mut byte = [0u8];
+                        if reader.read(&mut byte).err_span(span)? > 0 {
+                            Ok(Value::int(byte[0] as i64, head).into_pipeline_data())
+                        } else {
+                            Err(ShellError::AccessEmptyContent { span: head })
+                        }
+                    } else {
+                        // Just take 'rows' bytes off the stream, mimicking the binary behavior
+                        Ok(PipelineData::ByteStream(
+                            ByteStream::read(
+                                reader.take(rows as u64),
+                                head,
+                                None,
+                                ByteStreamType::Binary,
+                            ),
+                            metadata,
+                        ))
+                    }
+                } else {
+                    Ok(PipelineData::Empty)
+                }
+            } else {
+                Err(ShellError::OnlySupportsThisInputType {
+                    exp_input_type: "list, binary or range".into(),
+                    wrong_type: stream.type_().describe().into(),
+                    dst_span: head,
+                    src_span: stream.span(),
+                })
+            }
+        }
         PipelineData::Empty => Err(ShellError::OnlySupportsThisInputType {
             exp_input_type: "list, binary or range".into(),
             wrong_type: "null".into(),
diff --git a/crates/nu-command/src/filters/insert.rs b/crates/nu-command/src/filters/insert.rs
index e8794304c8..5f1380b2ac 100644
--- a/crates/nu-command/src/filters/insert.rs
+++ b/crates/nu-command/src/filters/insert.rs
@@ -261,8 +261,8 @@ fn insert(
             type_name: "empty pipeline".to_string(),
             span: head,
         }),
-        PipelineData::ByteStream(..) => Err(ShellError::IncompatiblePathAccess {
-            type_name: "byte stream".to_string(),
+        PipelineData::ByteStream(stream, ..) => Err(ShellError::IncompatiblePathAccess {
+            type_name: stream.type_().describe().into(),
             span: head,
         }),
     }
diff --git a/crates/nu-command/src/filters/items.rs b/crates/nu-command/src/filters/items.rs
index 6afc0bc536..ed30486bee 100644
--- a/crates/nu-command/src/filters/items.rs
+++ b/crates/nu-command/src/filters/items.rs
@@ -86,7 +86,7 @@ impl Command for Items {
             }),
             PipelineData::ByteStream(stream, ..) => Err(ShellError::OnlySupportsThisInputType {
                 exp_input_type: "record".into(),
-                wrong_type: "byte stream".into(),
+                wrong_type: stream.type_().describe().into(),
                 dst_span: call.head,
                 src_span: stream.span(),
             }),
diff --git a/crates/nu-command/src/filters/last.rs b/crates/nu-command/src/filters/last.rs
index 7530126c26..510e6457a8 100644
--- a/crates/nu-command/src/filters/last.rs
+++ b/crates/nu-command/src/filters/last.rs
@@ -160,12 +160,48 @@ impl Command for Last {
                     }),
                 }
             }
-            PipelineData::ByteStream(stream, ..) => Err(ShellError::OnlySupportsThisInputType {
-                exp_input_type: "list, binary or range".into(),
-                wrong_type: "byte stream".into(),
-                dst_span: head,
-                src_span: stream.span(),
-            }),
+            PipelineData::ByteStream(stream, ..) => {
+                if stream.type_() == ByteStreamType::Binary {
+                    let span = stream.span();
+                    if let Some(mut reader) = stream.reader() {
+                        use std::io::Read;
+                        // Have to be a bit tricky here, but just consume into a VecDeque that we
+                        // shrink to fit each time
+                        const TAKE: u64 = 8192;
+                        let mut buf = VecDeque::with_capacity(rows + TAKE as usize);
+                        loop {
+                            let taken = std::io::copy(&mut (&mut reader).take(TAKE), &mut buf)
+                                .err_span(span)?;
+                            if buf.len() > rows {
+                                buf.drain(..(buf.len() - rows));
+                            }
+                            if taken < TAKE {
+                                // This must be EOF.
+                                if return_single_element {
+                                    if !buf.is_empty() {
+                                        return Ok(
+                                            Value::int(buf[0] as i64, head).into_pipeline_data()
+                                        );
+                                    } else {
+                                        return Err(ShellError::AccessEmptyContent { span: head });
+                                    }
+                                } else {
+                                    return Ok(Value::binary(buf, head).into_pipeline_data());
+                                }
+                            }
+                        }
+                    } else {
+                        Ok(PipelineData::Empty)
+                    }
+                } else {
+                    Err(ShellError::OnlySupportsThisInputType {
+                        exp_input_type: "list, binary or range".into(),
+                        wrong_type: stream.type_().describe().into(),
+                        dst_span: head,
+                        src_span: stream.span(),
+                    })
+                }
+            }
             PipelineData::Empty => Err(ShellError::OnlySupportsThisInputType {
                 exp_input_type: "list, binary or range".into(),
                 wrong_type: "null".into(),
diff --git a/crates/nu-command/src/filters/skip/skip_.rs b/crates/nu-command/src/filters/skip/skip_.rs
index 9048b34a58..df53cfacba 100644
--- a/crates/nu-command/src/filters/skip/skip_.rs
+++ b/crates/nu-command/src/filters/skip/skip_.rs
@@ -12,6 +12,7 @@ impl Command for Skip {
         Signature::build(self.name())
             .input_output_types(vec![
                 (Type::table(), Type::table()),
+                (Type::Binary, Type::Binary),
                 (
                     Type::List(Box::new(Type::Any)),
                     Type::List(Box::new(Type::Any)),
@@ -51,6 +52,11 @@ impl Command for Skip {
                     "editions" => Value::test_int(2021),
                 })])),
             },
+            Example {
+                description: "Skip 2 bytes of a binary value",
+                example: "0x[01 23 45 67] | skip 2",
+                result: Some(Value::test_binary(vec![0x45, 0x67])),
+            },
         ]
     }
     fn run(
@@ -87,12 +93,30 @@ impl Command for Skip {
         let ctrlc = engine_state.ctrlc.clone();
         let input_span = input.span().unwrap_or(call.head);
         match input {
-            PipelineData::ByteStream(stream, ..) => Err(ShellError::OnlySupportsThisInputType {
-                exp_input_type: "list, binary or range".into(),
-                wrong_type: "byte stream".into(),
-                dst_span: call.head,
-                src_span: stream.span(),
-            }),
+            PipelineData::ByteStream(stream, metadata) => {
+                if stream.type_() == ByteStreamType::Binary {
+                    let span = stream.span();
+                    if let Some(mut reader) = stream.reader() {
+                        use std::io::Read;
+                        // Copy the number of skipped bytes into the sink before proceeding
+                        std::io::copy(&mut (&mut reader).take(n as u64), &mut std::io::sink())
+                            .err_span(span)?;
+                        Ok(PipelineData::ByteStream(
+                            ByteStream::read(reader, call.head, None, ByteStreamType::Binary),
+                            metadata,
+                        ))
+                    } else {
+                        Ok(PipelineData::Empty)
+                    }
+                } else {
+                    Err(ShellError::OnlySupportsThisInputType {
+                        exp_input_type: "list, binary or range".into(),
+                        wrong_type: stream.type_().describe().into(),
+                        dst_span: call.head,
+                        src_span: stream.span(),
+                    })
+                }
+            }
             PipelineData::Value(Value::Binary { val, .. }, metadata) => {
                 let bytes = val.into_iter().skip(n).collect::<Vec<_>>();
                 Ok(Value::binary(bytes, input_span).into_pipeline_data_with_metadata(metadata))
diff --git a/crates/nu-command/src/filters/take/take_.rs b/crates/nu-command/src/filters/take/take_.rs
index 12840aa8d6..d4bf455c4a 100644
--- a/crates/nu-command/src/filters/take/take_.rs
+++ b/crates/nu-command/src/filters/take/take_.rs
@@ -78,12 +78,32 @@ impl Command for Take {
                 stream.modify(|iter| iter.take(rows_desired)),
                 metadata,
             )),
-            PipelineData::ByteStream(stream, ..) => Err(ShellError::OnlySupportsThisInputType {
-                exp_input_type: "list, binary or range".into(),
-                wrong_type: "byte stream".into(),
-                dst_span: head,
-                src_span: stream.span(),
-            }),
+            PipelineData::ByteStream(stream, metadata) => {
+                if stream.type_() == ByteStreamType::Binary {
+                    if let Some(reader) = stream.reader() {
+                        use std::io::Read;
+                        // Just take 'rows' bytes off the stream, mimicking the binary behavior
+                        Ok(PipelineData::ByteStream(
+                            ByteStream::read(
+                                reader.take(rows_desired as u64),
+                                head,
+                                None,
+                                ByteStreamType::Binary,
+                            ),
+                            metadata,
+                        ))
+                    } else {
+                        Ok(PipelineData::Empty)
+                    }
+                } else {
+                    Err(ShellError::OnlySupportsThisInputType {
+                        exp_input_type: "list, binary or range".into(),
+                        wrong_type: stream.type_().describe().into(),
+                        dst_span: head,
+                        src_span: stream.span(),
+                    })
+                }
+            }
             PipelineData::Empty => Err(ShellError::OnlySupportsThisInputType {
                 exp_input_type: "list, binary or range".into(),
                 wrong_type: "null".into(),
diff --git a/crates/nu-command/src/filters/tee.rs b/crates/nu-command/src/filters/tee.rs
index 936dee5c79..d6decd3bc6 100644
--- a/crates/nu-command/src/filters/tee.rs
+++ b/crates/nu-command/src/filters/tee.rs
@@ -1,7 +1,7 @@
 use nu_engine::{command_prelude::*, get_eval_block_with_early_return};
 use nu_protocol::{
     byte_stream::copy_with_interrupt, engine::Closure, process::ChildPipe, ByteStream,
-    ByteStreamSource, OutDest,
+    ByteStreamSource, OutDest, PipelineMetadata,
 };
 use std::{
     io::{self, Read, Write},
@@ -104,9 +104,13 @@ use it in your pipeline."#
         if let PipelineData::ByteStream(stream, metadata) = input {
             let span = stream.span();
             let ctrlc = engine_state.ctrlc.clone();
-            let eval_block = {
-                let metadata = metadata.clone();
-                move |stream| eval_block(PipelineData::ByteStream(stream, metadata))
+            let type_ = stream.type_();
+
+            let info = StreamInfo {
+                span,
+                ctrlc: ctrlc.clone(),
+                type_,
+                metadata: metadata.clone(),
             };
 
             match stream.into_source() {
@@ -115,10 +119,11 @@ use it in your pipeline."#
                         return stderr_misuse(span, head);
                     }
 
-                    let tee = IoTee::new(read, span, eval_block)?;
+                    let tee_thread = spawn_tee(info, eval_block)?;
+                    let tee = IoTee::new(read, tee_thread);
 
                     Ok(PipelineData::ByteStream(
-                        ByteStream::read(tee, span, ctrlc),
+                        ByteStream::read(tee, span, ctrlc, type_),
                         metadata,
                     ))
                 }
@@ -127,44 +132,32 @@ use it in your pipeline."#
                         return stderr_misuse(span, head);
                     }
 
-                    let tee = IoTee::new(file, span, eval_block)?;
+                    let tee_thread = spawn_tee(info, eval_block)?;
+                    let tee = IoTee::new(file, tee_thread);
 
                     Ok(PipelineData::ByteStream(
-                        ByteStream::read(tee, span, ctrlc),
+                        ByteStream::read(tee, span, ctrlc, type_),
                         metadata,
                     ))
                 }
                 ByteStreamSource::Child(mut child) => {
                     let stderr_thread = if use_stderr {
                         let stderr_thread = if let Some(stderr) = child.stderr.take() {
+                            let tee_thread = spawn_tee(info.clone(), eval_block)?;
+                            let tee = IoTee::new(stderr, tee_thread);
                             match stack.stderr() {
                                 OutDest::Pipe | OutDest::Capture => {
-                                    let tee = IoTee::new(stderr, span, eval_block)?;
                                     child.stderr = Some(ChildPipe::Tee(Box::new(tee)));
-                                    None
+                                    Ok(None)
                                 }
-                                OutDest::Null => Some(tee_pipe_on_thread(
-                                    stderr,
-                                    io::sink(),
-                                    span,
-                                    ctrlc.as_ref(),
-                                    eval_block,
-                                )?),
-                                OutDest::Inherit => Some(tee_pipe_on_thread(
-                                    stderr,
-                                    io::stderr(),
-                                    span,
-                                    ctrlc.as_ref(),
-                                    eval_block,
-                                )?),
-                                OutDest::File(file) => Some(tee_pipe_on_thread(
-                                    stderr,
-                                    file.clone(),
-                                    span,
-                                    ctrlc.as_ref(),
-                                    eval_block,
-                                )?),
-                            }
+                                OutDest::Null => copy_on_thread(tee, io::sink(), &info).map(Some),
+                                OutDest::Inherit => {
+                                    copy_on_thread(tee, io::stderr(), &info).map(Some)
+                                }
+                                OutDest::File(file) => {
+                                    copy_on_thread(tee, file.clone(), &info).map(Some)
+                                }
+                            }?
                         } else {
                             None
                         };
@@ -175,37 +168,29 @@ use it in your pipeline."#
                                     child.stdout = Some(stdout);
                                     Ok(())
                                 }
-                                OutDest::Null => {
-                                    copy_pipe(stdout, io::sink(), span, ctrlc.as_deref())
-                                }
-                                OutDest::Inherit => {
-                                    copy_pipe(stdout, io::stdout(), span, ctrlc.as_deref())
-                                }
-                                OutDest::File(file) => {
-                                    copy_pipe(stdout, file.as_ref(), span, ctrlc.as_deref())
-                                }
+                                OutDest::Null => copy_pipe(stdout, io::sink(), &info),
+                                OutDest::Inherit => copy_pipe(stdout, io::stdout(), &info),
+                                OutDest::File(file) => copy_pipe(stdout, file.as_ref(), &info),
                             }?;
                         }
 
                         stderr_thread
                     } else {
                         let stderr_thread = if let Some(stderr) = child.stderr.take() {
+                            let info = info.clone();
                             match stack.stderr() {
                                 OutDest::Pipe | OutDest::Capture => {
                                     child.stderr = Some(stderr);
                                     Ok(None)
                                 }
                                 OutDest::Null => {
-                                    copy_pipe_on_thread(stderr, io::sink(), span, ctrlc.as_ref())
-                                        .map(Some)
+                                    copy_pipe_on_thread(stderr, io::sink(), &info).map(Some)
                                 }
                                 OutDest::Inherit => {
-                                    copy_pipe_on_thread(stderr, io::stderr(), span, ctrlc.as_ref())
-                                        .map(Some)
+                                    copy_pipe_on_thread(stderr, io::stderr(), &info).map(Some)
                                 }
                                 OutDest::File(file) => {
-                                    copy_pipe_on_thread(stderr, file.clone(), span, ctrlc.as_ref())
-                                        .map(Some)
+                                    copy_pipe_on_thread(stderr, file.clone(), &info).map(Some)
                                 }
                             }?
                         } else {
@@ -213,29 +198,16 @@ use it in your pipeline."#
                         };
 
                         if let Some(stdout) = child.stdout.take() {
+                            let tee_thread = spawn_tee(info.clone(), eval_block)?;
+                            let tee = IoTee::new(stdout, tee_thread);
                             match stack.stdout() {
                                 OutDest::Pipe | OutDest::Capture => {
-                                    let tee = IoTee::new(stdout, span, eval_block)?;
                                     child.stdout = Some(ChildPipe::Tee(Box::new(tee)));
                                     Ok(())
                                 }
-                                OutDest::Null => {
-                                    tee_pipe(stdout, io::sink(), span, ctrlc.as_deref(), eval_block)
-                                }
-                                OutDest::Inherit => tee_pipe(
-                                    stdout,
-                                    io::stdout(),
-                                    span,
-                                    ctrlc.as_deref(),
-                                    eval_block,
-                                ),
-                                OutDest::File(file) => tee_pipe(
-                                    stdout,
-                                    file.as_ref(),
-                                    span,
-                                    ctrlc.as_deref(),
-                                    eval_block,
-                                ),
+                                OutDest::Null => copy(tee, io::sink(), &info),
+                                OutDest::Inherit => copy(tee, io::stdout(), &info),
+                                OutDest::File(file) => copy(tee, file.as_ref(), &info),
                             }?;
                         }
 
@@ -350,7 +322,7 @@ where
 fn stderr_misuse<T>(span: Span, head: Span) -> Result<T, ShellError> {
     Err(ShellError::UnsupportedInput {
         msg: "--stderr can only be used on external commands".into(),
-        input: "the input to `tee` is not an external commands".into(),
+        input: "the input to `tee` is not an external command".into(),
         msg_span: head,
         input_span: span,
     })
@@ -363,23 +335,12 @@ struct IoTee<R: Read> {
 }
 
 impl<R: Read> IoTee<R> {
-    fn new(
-        reader: R,
-        span: Span,
-        eval_block: impl FnOnce(ByteStream) -> Result<(), ShellError> + Send + 'static,
-    ) -> Result<Self, ShellError> {
-        let (sender, receiver) = mpsc::channel();
-
-        let thread = thread::Builder::new()
-            .name("tee".into())
-            .spawn(move || eval_block(ByteStream::from_iter(receiver, span, None)))
-            .err_span(span)?;
-
-        Ok(Self {
+    fn new(reader: R, tee: TeeThread) -> Self {
+        Self {
             reader,
-            sender: Some(sender),
-            thread: Some(thread),
-        })
+            sender: Some(tee.sender),
+            thread: Some(tee.thread),
+        }
     }
 }
 
@@ -411,68 +372,74 @@ impl<R: Read> Read for IoTee<R> {
     }
 }
 
-fn tee_pipe(
-    pipe: ChildPipe,
-    mut dest: impl Write,
+struct TeeThread {
+    sender: Sender<Vec<u8>>,
+    thread: JoinHandle<Result<(), ShellError>>,
+}
+
+fn spawn_tee(
+    info: StreamInfo,
+    mut eval_block: impl FnMut(PipelineData) -> Result<(), ShellError> + Send + 'static,
+) -> Result<TeeThread, ShellError> {
+    let (sender, receiver) = mpsc::channel();
+
+    let thread = thread::Builder::new()
+        .name("tee".into())
+        .spawn(move || {
+            // We don't use ctrlc here because we assume it already has it on the other side
+            let stream = ByteStream::from_iter(receiver.into_iter(), info.span, None, info.type_);
+            eval_block(PipelineData::ByteStream(stream, info.metadata))
+        })
+        .err_span(info.span)?;
+
+    Ok(TeeThread { sender, thread })
+}
+
+#[derive(Clone)]
+struct StreamInfo {
     span: Span,
-    ctrlc: Option<&AtomicBool>,
-    eval_block: impl FnOnce(ByteStream) -> Result<(), ShellError> + Send + 'static,
-) -> Result<(), ShellError> {
-    match pipe {
-        ChildPipe::Pipe(pipe) => {
-            let mut tee = IoTee::new(pipe, span, eval_block)?;
-            copy_with_interrupt(&mut tee, &mut dest, span, ctrlc)?;
-        }
-        ChildPipe::Tee(tee) => {
-            let mut tee = IoTee::new(tee, span, eval_block)?;
-            copy_with_interrupt(&mut tee, &mut dest, span, ctrlc)?;
-        }
-    }
+    ctrlc: Option<Arc<AtomicBool>>,
+    type_: ByteStreamType,
+    metadata: Option<PipelineMetadata>,
+}
+
+fn copy(mut src: impl Read, mut dest: impl Write, info: &StreamInfo) -> Result<(), ShellError> {
+    copy_with_interrupt(&mut src, &mut dest, info.span, info.ctrlc.as_deref())?;
     Ok(())
 }
 
-fn tee_pipe_on_thread(
-    pipe: ChildPipe,
-    dest: impl Write + Send + 'static,
-    span: Span,
-    ctrlc: Option<&Arc<AtomicBool>>,
-    eval_block: impl FnOnce(ByteStream) -> Result<(), ShellError> + Send + 'static,
+fn copy_pipe(pipe: ChildPipe, dest: impl Write, info: &StreamInfo) -> Result<(), ShellError> {
+    match pipe {
+        ChildPipe::Pipe(pipe) => copy(pipe, dest, info),
+        ChildPipe::Tee(tee) => copy(tee, dest, info),
+    }
+}
+
+fn copy_on_thread(
+    mut src: impl Read + Send + 'static,
+    mut dest: impl Write + Send + 'static,
+    info: &StreamInfo,
 ) -> Result<JoinHandle<Result<(), ShellError>>, ShellError> {
-    let ctrlc = ctrlc.cloned();
+    let span = info.span;
+    let ctrlc = info.ctrlc.clone();
     thread::Builder::new()
-        .name("stderr tee".into())
-        .spawn(move || tee_pipe(pipe, dest, span, ctrlc.as_deref(), eval_block))
+        .name("stderr copier".into())
+        .spawn(move || {
+            copy_with_interrupt(&mut src, &mut dest, span, ctrlc.as_deref())?;
+            Ok(())
+        })
         .map_err(|e| e.into_spanned(span).into())
 }
 
-fn copy_pipe(
-    pipe: ChildPipe,
-    mut dest: impl Write,
-    span: Span,
-    ctrlc: Option<&AtomicBool>,
-) -> Result<(), ShellError> {
-    match pipe {
-        ChildPipe::Pipe(mut pipe) => {
-            copy_with_interrupt(&mut pipe, &mut dest, span, ctrlc)?;
-        }
-        ChildPipe::Tee(mut tee) => {
-            copy_with_interrupt(&mut tee, &mut dest, span, ctrlc)?;
-        }
-    }
-    Ok(())
-}
-
 fn copy_pipe_on_thread(
     pipe: ChildPipe,
     dest: impl Write + Send + 'static,
-    span: Span,
-    ctrlc: Option<&Arc<AtomicBool>>,
+    info: &StreamInfo,
 ) -> Result<JoinHandle<Result<(), ShellError>>, ShellError> {
-    let ctrlc = ctrlc.cloned();
-    thread::Builder::new()
-        .name("stderr copier".into())
-        .spawn(move || copy_pipe(pipe, dest, span, ctrlc.as_deref()))
-        .map_err(|e| e.into_spanned(span).into())
+    match pipe {
+        ChildPipe::Pipe(pipe) => copy_on_thread(pipe, dest, info),
+        ChildPipe::Tee(tee) => copy_on_thread(tee, dest, info),
+    }
 }
 
 #[test]
diff --git a/crates/nu-command/src/filters/update.rs b/crates/nu-command/src/filters/update.rs
index 0d914d2d8e..e724ae77ad 100644
--- a/crates/nu-command/src/filters/update.rs
+++ b/crates/nu-command/src/filters/update.rs
@@ -225,8 +225,8 @@ fn update(
             type_name: "empty pipeline".to_string(),
             span: head,
         }),
-        PipelineData::ByteStream(..) => Err(ShellError::IncompatiblePathAccess {
-            type_name: "byte stream".to_string(),
+        PipelineData::ByteStream(stream, ..) => Err(ShellError::IncompatiblePathAccess {
+            type_name: stream.type_().describe().into(),
             span: head,
         }),
     }
diff --git a/crates/nu-command/src/filters/upsert.rs b/crates/nu-command/src/filters/upsert.rs
index 4313addd89..e3678972fb 100644
--- a/crates/nu-command/src/filters/upsert.rs
+++ b/crates/nu-command/src/filters/upsert.rs
@@ -285,8 +285,8 @@ fn upsert(
             type_name: "empty pipeline".to_string(),
             span: head,
         }),
-        PipelineData::ByteStream(..) => Err(ShellError::IncompatiblePathAccess {
-            type_name: "byte stream".to_string(),
+        PipelineData::ByteStream(stream, ..) => Err(ShellError::IncompatiblePathAccess {
+            type_name: stream.type_().describe().into(),
             span: head,
         }),
     }
diff --git a/crates/nu-command/src/filters/values.rs b/crates/nu-command/src/filters/values.rs
index ed33ebf643..f6ff8cda2e 100644
--- a/crates/nu-command/src/filters/values.rs
+++ b/crates/nu-command/src/filters/values.rs
@@ -182,7 +182,7 @@ fn values(
         }
         PipelineData::ByteStream(stream, ..) => Err(ShellError::OnlySupportsThisInputType {
             exp_input_type: "record or table".into(),
-            wrong_type: "byte stream".into(),
+            wrong_type: stream.type_().describe().into(),
             dst_span: head,
             src_span: stream.span(),
         }),
diff --git a/crates/nu-command/src/formats/to/text.rs b/crates/nu-command/src/formats/to/text.rs
index 7f1d632c13..fb240654f6 100644
--- a/crates/nu-command/src/formats/to/text.rs
+++ b/crates/nu-command/src/formats/to/text.rs
@@ -51,7 +51,12 @@ impl Command for ToText {
                     str
                 });
                 Ok(PipelineData::ByteStream(
-                    ByteStream::from_iter(iter, span, engine_state.ctrlc.clone()),
+                    ByteStream::from_iter(
+                        iter,
+                        span,
+                        engine_state.ctrlc.clone(),
+                        ByteStreamType::String,
+                    ),
                     meta,
                 ))
             }
diff --git a/crates/nu-command/src/network/http/client.rs b/crates/nu-command/src/network/http/client.rs
index 54f7749627..8317fb50bc 100644
--- a/crates/nu-command/src/network/http/client.rs
+++ b/crates/nu-command/src/network/http/client.rs
@@ -117,10 +117,20 @@ pub fn response_to_buffer(
         _ => None,
     };
 
+    // Try to guess whether the response is definitely intended to binary or definitely intended to
+    // be UTF-8 text. Otherwise specify `None` and just guess. This doesn't have to be thorough.
+    let content_type_lowercase = response.header("content-type").map(|s| s.to_lowercase());
+    let response_type = match content_type_lowercase.as_deref() {
+        Some("application/octet-stream") => ByteStreamType::Binary,
+        Some(h) if h.contains("charset=utf-8") => ByteStreamType::String,
+        _ => ByteStreamType::Unknown,
+    };
+
     let reader = response.into_reader();
 
     PipelineData::ByteStream(
-        ByteStream::read(reader, span, engine_state.ctrlc.clone()).with_known_size(buffer_size),
+        ByteStream::read(reader, span, engine_state.ctrlc.clone(), response_type)
+            .with_known_size(buffer_size),
         None,
     )
 }
diff --git a/crates/nu-command/src/strings/str_/join.rs b/crates/nu-command/src/strings/str_/join.rs
index 732434b20f..dd3a87dd61 100644
--- a/crates/nu-command/src/strings/str_/join.rs
+++ b/crates/nu-command/src/strings/str_/join.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use std::io::Write;
 
 #[derive(Clone)]
 pub struct StrJoin;
@@ -40,31 +41,40 @@ impl Command for StrJoin {
     ) -> Result<PipelineData, ShellError> {
         let separator: Option<String> = call.opt(engine_state, stack, 0)?;
 
-        let config = engine_state.get_config();
+        let config = engine_state.config.clone();
 
-        // let output = input.collect_string(&separator.unwrap_or_default(), &config)?;
-        // Hmm, not sure what we actually want.
-        // `to_formatted_string` formats dates as human readable which feels funny.
-        let mut strings: Vec<String> = vec![];
+        let span = call.head;
 
-        for value in input {
-            let str = match value {
-                Value::Error { error, .. } => {
-                    return Err(*error);
+        let metadata = input.metadata();
+        let mut iter = input.into_iter();
+        let mut first = true;
+
+        let output = ByteStream::from_fn(span, None, ByteStreamType::String, move |buffer| {
+            // Write each input to the buffer
+            if let Some(value) = iter.next() {
+                // Write the separator if this is not the first
+                if first {
+                    first = false;
+                } else if let Some(separator) = &separator {
+                    write!(buffer, "{}", separator)?;
                 }
-                Value::Date { val, .. } => format!("{val:?}"),
-                value => value.to_expanded_string("\n", config),
-            };
-            strings.push(str);
-        }
 
-        let output = if let Some(separator) = separator {
-            strings.join(&separator)
-        } else {
-            strings.join("")
-        };
+                match value {
+                    Value::Error { error, .. } => {
+                        return Err(*error);
+                    }
+                    // Hmm, not sure what we actually want.
+                    // `to_expanded_string` formats dates as human readable which feels funny.
+                    Value::Date { val, .. } => write!(buffer, "{val:?}")?,
+                    value => write!(buffer, "{}", value.to_expanded_string("\n", &config))?,
+                }
+                Ok(true)
+            } else {
+                Ok(false)
+            }
+        });
 
-        Ok(Value::string(output, call.head).into_pipeline_data())
+        Ok(PipelineData::ByteStream(output, metadata))
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index b12b89263c..b37d3a2fcb 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -416,6 +416,7 @@ impl ExternalCommand {
                             .name("external stdin worker".to_string())
                             .spawn(move || {
                                 let input = match input {
+                                    // Don't touch binary input or byte streams
                                     input @ PipelineData::ByteStream(..) => input,
                                     input @ PipelineData::Value(Value::Binary { .. }, ..) => input,
                                     input => {
diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index 26b8c921c5..2fe9319821 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -5,6 +5,7 @@
 use lscolors::{LsColors, Style};
 use nu_color_config::{color_from_hex, StyleComputer, TextStyle};
 use nu_engine::{command_prelude::*, env::get_config, env_to_string};
+use nu_pretty_hex::HexConfig;
 use nu_protocol::{
     ByteStream, Config, DataSource, ListStream, PipelineMetadata, TableMode, ValueIterator,
 };
@@ -15,7 +16,7 @@ use nu_table::{
 use nu_utils::get_ls_colors;
 use std::{
     collections::VecDeque,
-    io::{Cursor, IsTerminal},
+    io::{IsTerminal, Read},
     path::PathBuf,
     str::FromStr,
     sync::{atomic::AtomicBool, Arc},
@@ -364,16 +365,18 @@ fn handle_table_command(
 ) -> Result<PipelineData, ShellError> {
     let span = input.data.span().unwrap_or(input.call.head);
     match input.data {
+        // Binary streams should behave as if they really are `binary` data, and printed as hex
+        PipelineData::ByteStream(stream, _) if stream.type_() == ByteStreamType::Binary => Ok(
+            PipelineData::ByteStream(pretty_hex_stream(stream, input.call.head), None),
+        ),
         PipelineData::ByteStream(..) => Ok(input.data),
         PipelineData::Value(Value::Binary { val, .. }, ..) => {
-            let bytes = {
-                let mut str = nu_pretty_hex::pretty_hex(&val);
-                str.push('\n');
-                str.into_bytes()
-            };
             let ctrlc = input.engine_state.ctrlc.clone();
-            let stream = ByteStream::read(Cursor::new(bytes), input.call.head, ctrlc);
-            Ok(PipelineData::ByteStream(stream, None))
+            let stream = ByteStream::read_binary(val, input.call.head, ctrlc);
+            Ok(PipelineData::ByteStream(
+                pretty_hex_stream(stream, input.call.head),
+                None,
+            ))
         }
         // None of these two receive a StyleComputer because handle_row_stream() can produce it by itself using engine_state and stack.
         PipelineData::Value(Value::List { vals, .. }, metadata) => {
@@ -410,6 +413,70 @@ fn handle_table_command(
     }
 }
 
+fn pretty_hex_stream(stream: ByteStream, span: Span) -> ByteStream {
+    let mut cfg = HexConfig {
+        // We are going to render the title manually first
+        title: true,
+        // If building on 32-bit, the stream size might be bigger than a usize
+        length: stream.known_size().and_then(|sz| sz.try_into().ok()),
+        ..HexConfig::default()
+    };
+
+    // This won't really work for us
+    debug_assert!(cfg.width > 0, "the default hex config width was zero");
+
+    let mut read_buf = Vec::with_capacity(cfg.width);
+
+    let mut reader = if let Some(reader) = stream.reader() {
+        reader
+    } else {
+        // No stream to read from
+        return ByteStream::read_string("".into(), span, None);
+    };
+
+    ByteStream::from_fn(span, None, ByteStreamType::String, move |buffer| {
+        // Turn the buffer into a String we can write to
+        let mut write_buf = std::mem::take(buffer);
+        write_buf.clear();
+        // SAFETY: we just truncated it empty
+        let mut write_buf = unsafe { String::from_utf8_unchecked(write_buf) };
+
+        // Write the title at the beginning
+        if cfg.title {
+            nu_pretty_hex::write_title(&mut write_buf, cfg, true).expect("format error");
+            cfg.title = false;
+
+            // Put the write_buf back into buffer
+            *buffer = write_buf.into_bytes();
+
+            Ok(true)
+        } else {
+            // Read up to `cfg.width` bytes
+            read_buf.clear();
+            (&mut reader)
+                .take(cfg.width as u64)
+                .read_to_end(&mut read_buf)
+                .err_span(span)?;
+
+            if !read_buf.is_empty() {
+                nu_pretty_hex::hex_write(&mut write_buf, &read_buf, cfg, Some(true))
+                    .expect("format error");
+                write_buf.push('\n');
+
+                // Advance the address offset for next time
+                cfg.address_offset += read_buf.len();
+
+                // Put the write_buf back into buffer
+                *buffer = write_buf.into_bytes();
+
+                Ok(true)
+            } else {
+                Ok(false)
+            }
+        }
+    })
+}
+
 fn handle_record(
     input: CmdInput,
     cfg: TableConfig,
@@ -608,7 +675,8 @@ fn handle_row_stream(
         ctrlc.clone(),
         cfg,
     );
-    let stream = ByteStream::from_result_iter(paginator, input.call.head, None);
+    let stream =
+        ByteStream::from_result_iter(paginator, input.call.head, None, ByteStreamType::String);
     Ok(PipelineData::ByteStream(stream, None))
 }
 
diff --git a/crates/nu-command/tests/commands/bytes/collect.rs b/crates/nu-command/tests/commands/bytes/collect.rs
new file mode 100644
index 0000000000..768ab16df4
--- /dev/null
+++ b/crates/nu-command/tests/commands/bytes/collect.rs
@@ -0,0 +1,27 @@
+use nu_test_support::{nu, pipeline};
+
+#[test]
+fn test_stream() {
+    let actual = nu!(pipeline(
+        "
+            [0x[01] 0x[02] 0x[03] 0x[04]]
+            | filter {true}
+            | bytes collect 0x[aa aa]
+            | encode hex
+        "
+    ));
+    assert_eq!(actual.out, "01AAAA02AAAA03AAAA04");
+}
+
+#[test]
+fn test_stream_type() {
+    let actual = nu!(pipeline(
+        "
+            [0x[01] 0x[02] 0x[03] 0x[04]]
+            | filter {true}
+            | bytes collect 0x[00]
+            | describe -n
+        "
+    ));
+    assert_eq!(actual.out, "binary (stream)");
+}
diff --git a/crates/nu-command/tests/commands/bytes/mod.rs b/crates/nu-command/tests/commands/bytes/mod.rs
new file mode 100644
index 0000000000..10b2a494f8
--- /dev/null
+++ b/crates/nu-command/tests/commands/bytes/mod.rs
@@ -0,0 +1 @@
+mod collect;
diff --git a/crates/nu-command/tests/commands/first.rs b/crates/nu-command/tests/commands/first.rs
index e01478f820..23ccda6669 100644
--- a/crates/nu-command/tests/commands/first.rs
+++ b/crates/nu-command/tests/commands/first.rs
@@ -68,6 +68,20 @@ fn gets_first_byte() {
     assert_eq!(actual.out, "170");
 }
 
+#[test]
+fn gets_first_bytes_from_stream() {
+    let actual = nu!("(1.. | each { 0x[aa bb cc] } | bytes collect | first 2) == 0x[aa bb]");
+
+    assert_eq!(actual.out, "true");
+}
+
+#[test]
+fn gets_first_byte_from_stream() {
+    let actual = nu!("1.. | each { 0x[aa bb cc] } | bytes collect | first");
+
+    assert_eq!(actual.out, "170");
+}
+
 #[test]
 // covers a situation where `first` used to behave strangely on list<binary> input
 fn works_with_binary_list() {
diff --git a/crates/nu-command/tests/commands/last.rs b/crates/nu-command/tests/commands/last.rs
index b0c67e49be..986b433ea7 100644
--- a/crates/nu-command/tests/commands/last.rs
+++ b/crates/nu-command/tests/commands/last.rs
@@ -68,6 +68,20 @@ fn gets_last_byte() {
     assert_eq!(actual.out, "204");
 }
 
+#[test]
+fn gets_last_bytes_from_stream() {
+    let actual = nu!("(1..10 | each { 0x[aa bb cc] } | bytes collect | last 2) == 0x[bb cc]");
+
+    assert_eq!(actual.out, "true");
+}
+
+#[test]
+fn gets_last_byte_from_stream() {
+    let actual = nu!("1..10 | each { 0x[aa bb cc] } | bytes collect | last");
+
+    assert_eq!(actual.out, "204");
+}
+
 #[test]
 fn last_errors_on_negative_index() {
     let actual = nu!("[1, 2, 3] | last -2");
diff --git a/crates/nu-command/tests/commands/mod.rs b/crates/nu-command/tests/commands/mod.rs
index d7215e002b..922e804405 100644
--- a/crates/nu-command/tests/commands/mod.rs
+++ b/crates/nu-command/tests/commands/mod.rs
@@ -4,6 +4,7 @@ mod any;
 mod append;
 mod assignment;
 mod break_;
+mod bytes;
 mod cal;
 mod cd;
 mod compact;
diff --git a/crates/nu-command/tests/commands/skip/skip_.rs b/crates/nu-command/tests/commands/skip/skip_.rs
index 790c58db4e..c98de496c8 100644
--- a/crates/nu-command/tests/commands/skip/skip_.rs
+++ b/crates/nu-command/tests/commands/skip/skip_.rs
@@ -1,13 +1,17 @@
 use nu_test_support::nu;
 
 #[test]
-fn binary_skip_will_raise_error() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats",
-        "open sample_data.ods --raw | skip 2"
-    );
+fn skips_bytes() {
+    let actual = nu!("(0x[aa bb cc] | skip 2) == 0x[cc]");
 
-    assert!(actual.err.contains("only_supports_this_input_type"));
+    assert_eq!(actual.out, "true");
+}
+
+#[test]
+fn skips_bytes_from_stream() {
+    let actual = nu!("([0 1] | each { 0x[aa bb cc] } | bytes collect | skip 2) == 0x[cc aa bb cc]");
+
+    assert_eq!(actual.out, "true");
 }
 
 #[test]
diff --git a/crates/nu-command/tests/commands/str_/collect.rs b/crates/nu-command/tests/commands/str_/join.rs
similarity index 65%
rename from crates/nu-command/tests/commands/str_/collect.rs
rename to crates/nu-command/tests/commands/str_/join.rs
index 154ce30537..e04652e810 100644
--- a/crates/nu-command/tests/commands/str_/collect.rs
+++ b/crates/nu-command/tests/commands/str_/join.rs
@@ -22,6 +22,18 @@ fn test_2() {
     assert_eq!(actual.out, "a<sep>b<sep>c<sep>d");
 }
 
+#[test]
+fn test_stream() {
+    let actual = nu!("[a b c d] | filter {true} | str join .");
+    assert_eq!(actual.out, "a.b.c.d");
+}
+
+#[test]
+fn test_stream_type() {
+    let actual = nu!("[a b c d] | filter {true} | str join . | describe -n");
+    assert_eq!(actual.out, "string (stream)");
+}
+
 #[test]
 fn construct_a_path() {
     let actual = nu!(pipeline(
diff --git a/crates/nu-command/tests/commands/str_/mod.rs b/crates/nu-command/tests/commands/str_/mod.rs
index 9f1e90e853..9efa28b1ef 100644
--- a/crates/nu-command/tests/commands/str_/mod.rs
+++ b/crates/nu-command/tests/commands/str_/mod.rs
@@ -1,5 +1,5 @@
-mod collect;
 mod into_string;
+mod join;
 
 use nu_test_support::fs::Stub::FileWithContent;
 use nu_test_support::playground::Playground;
diff --git a/crates/nu-command/tests/commands/take/rows.rs b/crates/nu-command/tests/commands/take/rows.rs
index d5f3d1c601..6c34b61310 100644
--- a/crates/nu-command/tests/commands/take/rows.rs
+++ b/crates/nu-command/tests/commands/take/rows.rs
@@ -35,6 +35,20 @@ fn fails_on_string() {
     assert!(actual.err.contains("command doesn't support"));
 }
 
+#[test]
+fn takes_bytes() {
+    let actual = nu!("(0x[aa bb cc] | take 2) == 0x[aa bb]");
+
+    assert_eq!(actual.out, "true");
+}
+
+#[test]
+fn takes_bytes_from_stream() {
+    let actual = nu!("(1.. | each { 0x[aa bb cc] } | bytes collect | take 2) == 0x[aa bb]");
+
+    assert_eq!(actual.out, "true");
+}
+
 #[test]
 // covers a situation where `take` used to behave strangely on list<binary> input
 fn works_with_binary_list() {
diff --git a/crates/nu-engine/src/command_prelude.rs b/crates/nu-engine/src/command_prelude.rs
index 089a2fb8fa..112f280db5 100644
--- a/crates/nu-engine/src/command_prelude.rs
+++ b/crates/nu-engine/src/command_prelude.rs
@@ -2,7 +2,7 @@ pub use crate::CallExt;
 pub use nu_protocol::{
     ast::{Call, CellPath},
     engine::{Command, EngineState, Stack},
-    record, Category, ErrSpan, Example, IntoInterruptiblePipelineData, IntoPipelineData,
-    IntoSpanned, PipelineData, Record, ShellError, Signature, Span, Spanned, SyntaxShape, Type,
-    Value,
+    record, ByteStream, ByteStreamType, Category, ErrSpan, Example, IntoInterruptiblePipelineData,
+    IntoPipelineData, IntoSpanned, PipelineData, Record, ShellError, Signature, Span, Spanned,
+    SyntaxShape, Type, Value,
 };
diff --git a/crates/nu-plugin-core/src/interface/mod.rs b/crates/nu-plugin-core/src/interface/mod.rs
index b4a2bc9a25..4f287f39c0 100644
--- a/crates/nu-plugin-core/src/interface/mod.rs
+++ b/crates/nu-plugin-core/src/interface/mod.rs
@@ -183,7 +183,7 @@ pub trait InterfaceManager {
             PipelineDataHeader::ByteStream(info) => {
                 let handle = self.stream_manager().get_handle();
                 let reader = handle.read_stream(info.id, self.get_interface())?;
-                ByteStream::from_result_iter(reader, info.span, ctrlc.cloned()).into()
+                ByteStream::from_result_iter(reader, info.span, ctrlc.cloned(), info.type_).into()
             }
         })
     }
@@ -261,9 +261,10 @@ pub trait Interface: Clone + Send {
             }
             PipelineData::ByteStream(stream, ..) => {
                 let span = stream.span();
+                let type_ = stream.type_();
                 if let Some(reader) = stream.reader() {
                     let (id, writer) = new_stream(RAW_STREAM_HIGH_PRESSURE)?;
-                    let header = PipelineDataHeader::ByteStream(ByteStreamInfo { id, span });
+                    let header = PipelineDataHeader::ByteStream(ByteStreamInfo { id, span, type_ });
                     Ok((header, PipelineDataWriter::ByteStream(writer, reader)))
                 } else {
                     Ok((PipelineDataHeader::Empty, PipelineDataWriter::None))
diff --git a/crates/nu-plugin-core/src/interface/tests.rs b/crates/nu-plugin-core/src/interface/tests.rs
index fb3d737190..e318a2648e 100644
--- a/crates/nu-plugin-core/src/interface/tests.rs
+++ b/crates/nu-plugin-core/src/interface/tests.rs
@@ -10,8 +10,8 @@ use nu_plugin_protocol::{
     StreamMessage,
 };
 use nu_protocol::{
-    ByteStream, ByteStreamSource, DataSource, ListStream, PipelineData, PipelineMetadata,
-    ShellError, Span, Value,
+    ByteStream, ByteStreamSource, ByteStreamType, DataSource, ListStream, PipelineData,
+    PipelineMetadata, ShellError, Span, Value,
 };
 use std::{path::Path, sync::Arc};
 
@@ -208,6 +208,7 @@ fn read_pipeline_data_byte_stream() -> Result<(), ShellError> {
     let header = PipelineDataHeader::ByteStream(ByteStreamInfo {
         id: 12,
         span: test_span,
+        type_: ByteStreamType::Unknown,
     });
 
     let pipe = manager.read_pipeline_data(header, None)?;
@@ -401,7 +402,12 @@ fn write_pipeline_data_byte_stream() -> Result<(), ShellError> {
 
     // Set up pipeline data for a byte stream
     let data = PipelineData::ByteStream(
-        ByteStream::read(std::io::Cursor::new(expected), span, None),
+        ByteStream::read(
+            std::io::Cursor::new(expected),
+            span,
+            None,
+            ByteStreamType::Unknown,
+        ),
         None,
     );
 
diff --git a/crates/nu-plugin-engine/src/interface/tests.rs b/crates/nu-plugin-engine/src/interface/tests.rs
index aca59a664e..e718886b3b 100644
--- a/crates/nu-plugin-engine/src/interface/tests.rs
+++ b/crates/nu-plugin-engine/src/interface/tests.rs
@@ -17,8 +17,8 @@ use nu_plugin_protocol::{
 use nu_protocol::{
     ast::{Math, Operator},
     engine::Closure,
-    CustomValue, IntoInterruptiblePipelineData, IntoSpanned, PipelineData, PluginSignature,
-    ShellError, Span, Spanned, Value,
+    ByteStreamType, CustomValue, IntoInterruptiblePipelineData, IntoSpanned, PipelineData,
+    PluginSignature, ShellError, Span, Spanned, Value,
 };
 use serde::{Deserialize, Serialize};
 use std::{
@@ -157,6 +157,7 @@ fn manager_consume_all_propagates_message_error_to_readers() -> Result<(), Shell
         PipelineDataHeader::ByteStream(ByteStreamInfo {
             id: 0,
             span: Span::test_data(),
+            type_: ByteStreamType::Unknown,
         }),
         None,
     )?;
@@ -384,6 +385,7 @@ fn manager_consume_call_response_registers_streams() -> Result<(), ShellError> {
         PluginCallResponse::PipelineData(PipelineDataHeader::ByteStream(ByteStreamInfo {
             id: 1,
             span: Span::test_data(),
+            type_: ByteStreamType::Unknown,
         })),
     ))?;
 
diff --git a/crates/nu-plugin-protocol/src/lib.rs b/crates/nu-plugin-protocol/src/lib.rs
index ea27f82654..db19ee02f6 100644
--- a/crates/nu-plugin-protocol/src/lib.rs
+++ b/crates/nu-plugin-protocol/src/lib.rs
@@ -22,8 +22,8 @@ mod tests;
 pub mod test_util;
 
 use nu_protocol::{
-    ast::Operator, engine::Closure, Config, LabeledError, PipelineData, PluginSignature,
-    ShellError, Span, Spanned, Value,
+    ast::Operator, engine::Closure, ByteStreamType, Config, LabeledError, PipelineData,
+    PluginSignature, ShellError, Span, Spanned, Value,
 };
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
@@ -112,6 +112,8 @@ pub struct ListStreamInfo {
 pub struct ByteStreamInfo {
     pub id: StreamId,
     pub span: Span,
+    #[serde(rename = "type")]
+    pub type_: ByteStreamType,
 }
 
 /// Calls that a plugin can execute. The type parameter determines the input type.
diff --git a/crates/nu-plugin/src/plugin/interface/tests.rs b/crates/nu-plugin/src/plugin/interface/tests.rs
index ed04190712..6c3dfdf6c9 100644
--- a/crates/nu-plugin/src/plugin/interface/tests.rs
+++ b/crates/nu-plugin/src/plugin/interface/tests.rs
@@ -9,8 +9,8 @@ use nu_plugin_protocol::{
     PluginCustomValue, PluginInput, PluginOutput, Protocol, ProtocolInfo, StreamData,
 };
 use nu_protocol::{
-    engine::Closure, Config, CustomValue, IntoInterruptiblePipelineData, LabeledError,
-    PipelineData, PluginSignature, ShellError, Span, Spanned, Value,
+    engine::Closure, ByteStreamType, Config, CustomValue, IntoInterruptiblePipelineData,
+    LabeledError, PipelineData, PluginSignature, ShellError, Span, Spanned, Value,
 };
 use std::{
     collections::HashMap,
@@ -160,6 +160,7 @@ fn manager_consume_all_propagates_message_error_to_readers() -> Result<(), Shell
         PipelineDataHeader::ByteStream(ByteStreamInfo {
             id: 0,
             span: Span::test_data(),
+            type_: ByteStreamType::Unknown,
         }),
         None,
     )?;
diff --git a/crates/nu-pretty-hex/src/pretty_hex.rs b/crates/nu-pretty-hex/src/pretty_hex.rs
index 81bd5451c4..2fab2a9b43 100644
--- a/crates/nu-pretty-hex/src/pretty_hex.rs
+++ b/crates/nu-pretty-hex/src/pretty_hex.rs
@@ -174,20 +174,14 @@ where
         .collect();
 
     if cfg.title {
-        if use_color {
-            writeln!(
-                writer,
-                "Length: {0} (0x{0:x}) bytes | {1}printable {2}whitespace {3}ascii_other {4}non_ascii{5}",
-                source_part_vec.len(),
-                Style::default().fg(Color::Cyan).bold().prefix(),
-                Style::default().fg(Color::Green).bold().prefix(),
-                Style::default().fg(Color::Purple).bold().prefix(),
-                Style::default().fg(Color::Yellow).bold().prefix(),
-                Style::default().fg(Color::Yellow).suffix()
-            )?;
-        } else {
-            writeln!(writer, "Length: {0} (0x{0:x}) bytes", source_part_vec.len(),)?;
-        }
+        write_title(
+            writer,
+            HexConfig {
+                length: Some(source_part_vec.len()),
+                ..cfg
+            },
+            use_color,
+        )?;
     }
 
     let lines = source_part_vec.chunks(if cfg.width > 0 {
@@ -256,6 +250,34 @@ where
     Ok(())
 }
 
+/// Write the title for the given config. The length will be taken from `cfg.length`.
+pub fn write_title<W>(writer: &mut W, cfg: HexConfig, use_color: bool) -> Result<(), fmt::Error>
+where
+    W: fmt::Write,
+{
+    let write = |writer: &mut W, length: fmt::Arguments<'_>| {
+        if use_color {
+            writeln!(
+                writer,
+                "Length: {length} | {0}printable {1}whitespace {2}ascii_other {3}non_ascii{4}",
+                Style::default().fg(Color::Cyan).bold().prefix(),
+                Style::default().fg(Color::Green).bold().prefix(),
+                Style::default().fg(Color::Purple).bold().prefix(),
+                Style::default().fg(Color::Yellow).bold().prefix(),
+                Style::default().fg(Color::Yellow).suffix()
+            )
+        } else {
+            writeln!(writer, "Length: {length}")
+        }
+    };
+
+    if let Some(len) = cfg.length {
+        write(writer, format_args!("{len} (0x{len:x}) bytes"))
+    } else {
+        write(writer, format_args!("unknown (stream)"))
+    }
+}
+
 /// Reference wrapper for use in arguments formatting.
 pub struct Hex<'a, T: 'a>(&'a T, HexConfig);
 
diff --git a/crates/nu-protocol/src/errors/shell_error.rs b/crates/nu-protocol/src/errors/shell_error.rs
index 525f32e925..81139d1a52 100644
--- a/crates/nu-protocol/src/errors/shell_error.rs
+++ b/crates/nu-protocol/src/errors/shell_error.rs
@@ -1017,7 +1017,10 @@ pub enum ShellError {
     ///
     /// Check your input's encoding. Are there any funny characters/bytes?
     #[error("Non-UTF8 string")]
-    #[diagnostic(code(nu::parser::non_utf8))]
+    #[diagnostic(
+        code(nu::parser::non_utf8),
+        help("see `decode` for handling character sets other than UTF-8")
+    )]
     NonUtf8 {
         #[label("non-UTF8 string")]
         span: Span,
@@ -1029,7 +1032,10 @@ pub enum ShellError {
     ///
     /// Check your input's encoding. Are there any funny characters/bytes?
     #[error("Non-UTF8 string")]
-    #[diagnostic(code(nu::parser::non_utf8_custom))]
+    #[diagnostic(
+        code(nu::parser::non_utf8_custom),
+        help("see `decode` for handling character sets other than UTF-8")
+    )]
     NonUtf8Custom {
         msg: String,
         #[label("{msg}")]
diff --git a/crates/nu-protocol/src/pipeline/byte_stream.rs b/crates/nu-protocol/src/pipeline/byte_stream.rs
index 64b566a625..e77c2cc855 100644
--- a/crates/nu-protocol/src/pipeline/byte_stream.rs
+++ b/crates/nu-protocol/src/pipeline/byte_stream.rs
@@ -1,6 +1,8 @@
+use serde::{Deserialize, Serialize};
+
 use crate::{
     process::{ChildPipe, ChildProcess, ExitStatus},
-    ErrSpan, IntoSpanned, OutDest, PipelineData, ShellError, Span, Value,
+    ErrSpan, IntoSpanned, OutDest, PipelineData, ShellError, Span, Type, Value,
 };
 #[cfg(unix)]
 use std::os::fd::OwnedFd;
@@ -41,6 +43,24 @@ impl ByteStreamSource {
             }),
         }
     }
+
+    /// Source is a `Child` or `File`, rather than `Read`. Currently affects trimming
+    fn is_external(&self) -> bool {
+        matches!(
+            self,
+            ByteStreamSource::File(..) | ByteStreamSource::Child(..)
+        )
+    }
+}
+
+impl Debug for ByteStreamSource {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            ByteStreamSource::Read(_) => f.debug_tuple("Read").field(&"..").finish(),
+            ByteStreamSource::File(file) => f.debug_tuple("File").field(file).finish(),
+            ByteStreamSource::Child(child) => f.debug_tuple("Child").field(child).finish(),
+        }
+    }
 }
 
 enum SourceReader {
@@ -57,6 +77,55 @@ impl Read for SourceReader {
     }
 }
 
+impl Debug for SourceReader {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            SourceReader::Read(_) => f.debug_tuple("Read").field(&"..").finish(),
+            SourceReader::File(file) => f.debug_tuple("File").field(file).finish(),
+        }
+    }
+}
+
+/// Optional type color for [`ByteStream`], which determines type compatibility.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Default)]
+pub enum ByteStreamType {
+    /// Compatible with [`Type::Binary`], and should only be converted to binary, even when the
+    /// desired type is unknown.
+    Binary,
+    /// Compatible with [`Type::String`], and should only be converted to string, even when the
+    /// desired type is unknown.
+    ///
+    /// This does not guarantee valid UTF-8 data, but it is conventionally so. Converting to
+    /// `String` still requires validation of the data.
+    String,
+    /// Unknown whether the stream should contain binary or string data. This usually is the result
+    /// of an external stream, e.g. an external command or file.
+    #[default]
+    Unknown,
+}
+
+impl ByteStreamType {
+    /// Returns the string that describes the byte stream type - i.e., the same as what `describe`
+    /// produces. This can be used in type mismatch error messages.
+    pub fn describe(self) -> &'static str {
+        match self {
+            ByteStreamType::Binary => "binary (stream)",
+            ByteStreamType::String => "string (stream)",
+            ByteStreamType::Unknown => "byte stream",
+        }
+    }
+}
+
+impl From<ByteStreamType> for Type {
+    fn from(value: ByteStreamType) -> Self {
+        match value {
+            ByteStreamType::Binary => Type::Binary,
+            ByteStreamType::String => Type::String,
+            ByteStreamType::Unknown => Type::Any,
+        }
+    }
+}
+
 /// A potentially infinite, interruptible stream of bytes.
 ///
 /// To create a [`ByteStream`], you can use any of the following methods:
@@ -65,20 +134,31 @@ impl Read for SourceReader {
 /// - [`from_iter`](ByteStream::from_iter): takes an [`Iterator`] whose items implement `AsRef<[u8]>`.
 /// - [`from_result_iter`](ByteStream::from_result_iter): same as [`from_iter`](ByteStream::from_iter),
 ///   but each item is a `Result<T, ShellError>`.
+/// - [`from_fn`](ByteStream::from_fn): uses a generator function to fill a buffer whenever it is
+///   empty. This has high performance because it doesn't need to allocate for each chunk of data,
+///   and can just reuse the same buffer.
+///
+/// Byte streams have a [type](.type_()) which is used to preserve type compatibility when they
+/// are the result of an internal command. It is important that this be set to the correct value.
+/// [`Unknown`](ByteStreamType::Unknown) is used only for external sources where the type can not
+/// be inherently determined, and having it automatically act as a string or binary depending on
+/// whether it parses as UTF-8 or not is desirable.
 ///
 /// The data of a [`ByteStream`] can be accessed using one of the following methods:
 /// - [`reader`](ByteStream::reader): returns a [`Read`]-able type to get the raw bytes in the stream.
 /// - [`lines`](ByteStream::lines): splits the bytes on lines and returns an [`Iterator`]
 ///   where each item is a `Result<String, ShellError>`.
-/// - [`chunks`](ByteStream::chunks): returns an [`Iterator`] of [`Value`]s where each value is either a string or binary.
+/// - [`chunks`](ByteStream::chunks): returns an [`Iterator`] of [`Value`]s where each value is
+///   either a string or binary.
 ///   Try not to use this method if possible. Rather, please use [`reader`](ByteStream::reader)
 ///   (or [`lines`](ByteStream::lines) if it matches the situation).
 ///
 /// Additionally, there are few methods to collect a [`Bytestream`] into memory:
 /// - [`into_bytes`](ByteStream::into_bytes): collects all bytes into a [`Vec<u8>`].
 /// - [`into_string`](ByteStream::into_string): collects all bytes into a [`String`], erroring if utf-8 decoding failed.
-/// - [`into_value`](ByteStream::into_value): collects all bytes into a string [`Value`].
-///   If utf-8 decoding failed, then a binary [`Value`] is returned instead.
+/// - [`into_value`](ByteStream::into_value): collects all bytes into a value typed appropriately
+///   for the [type](.type_()) of this stream. If the type is [`Unknown`](ByteStreamType::Unknown),
+///   it will produce a string value if the data is valid UTF-8, or a binary value otherwise.
 ///
 /// There are also a few other methods to consume all the data of a [`Bytestream`]:
 /// - [`drain`](ByteStream::drain): consumes all bytes and outputs nothing.
@@ -88,54 +168,135 @@ impl Read for SourceReader {
 ///
 /// Internally, [`ByteStream`]s currently come in three flavors according to [`ByteStreamSource`].
 /// See its documentation for more information.
+#[derive(Debug)]
 pub struct ByteStream {
     stream: ByteStreamSource,
     span: Span,
     ctrlc: Option<Arc<AtomicBool>>,
+    type_: ByteStreamType,
     known_size: Option<u64>,
 }
 
 impl ByteStream {
     /// Create a new [`ByteStream`] from a [`ByteStreamSource`].
-    pub fn new(stream: ByteStreamSource, span: Span, interrupt: Option<Arc<AtomicBool>>) -> Self {
+    pub fn new(
+        stream: ByteStreamSource,
+        span: Span,
+        interrupt: Option<Arc<AtomicBool>>,
+        type_: ByteStreamType,
+    ) -> Self {
         Self {
             stream,
             span,
             ctrlc: interrupt,
+            type_,
             known_size: None,
         }
     }
 
-    /// Create a new [`ByteStream`] from a [`ByteStreamSource::Read`].
+    /// Create a [`ByteStream`] from an arbitrary reader. The type must be provided.
     pub fn read(
         reader: impl Read + Send + 'static,
         span: Span,
         interrupt: Option<Arc<AtomicBool>>,
+        type_: ByteStreamType,
     ) -> Self {
-        Self::new(ByteStreamSource::Read(Box::new(reader)), span, interrupt)
+        Self::new(
+            ByteStreamSource::Read(Box::new(reader)),
+            span,
+            interrupt,
+            type_,
+        )
     }
 
-    /// Create a new [`ByteStream`] from a [`ByteStreamSource::File`].
+    /// Create a [`ByteStream`] from a string. The type of the stream is always `String`.
+    pub fn read_string(string: String, span: Span, interrupt: Option<Arc<AtomicBool>>) -> Self {
+        let len = string.len();
+        ByteStream::read(
+            Cursor::new(string.into_bytes()),
+            span,
+            interrupt,
+            ByteStreamType::String,
+        )
+        .with_known_size(Some(len as u64))
+    }
+
+    /// Create a [`ByteStream`] from a byte vector. The type of the stream is always `Binary`.
+    pub fn read_binary(bytes: Vec<u8>, span: Span, interrupt: Option<Arc<AtomicBool>>) -> Self {
+        let len = bytes.len();
+        ByteStream::read(Cursor::new(bytes), span, interrupt, ByteStreamType::Binary)
+            .with_known_size(Some(len as u64))
+    }
+
+    /// Create a [`ByteStream`] from a file.
+    ///
+    /// The type is implicitly `Unknown`, as it's not typically known whether files will
+    /// return text or binary.
     pub fn file(file: File, span: Span, interrupt: Option<Arc<AtomicBool>>) -> Self {
-        Self::new(ByteStreamSource::File(file), span, interrupt)
+        Self::new(
+            ByteStreamSource::File(file),
+            span,
+            interrupt,
+            ByteStreamType::Unknown,
+        )
     }
 
-    /// Create a new [`ByteStream`] from a [`ByteStreamSource::Child`].
+    /// Create a [`ByteStream`] from a child process's stdout and stderr.
+    ///
+    /// The type is implicitly `Unknown`, as it's not typically known whether child processes will
+    /// return text or binary.
     pub fn child(child: ChildProcess, span: Span) -> Self {
-        Self::new(ByteStreamSource::Child(Box::new(child)), span, None)
+        Self::new(
+            ByteStreamSource::Child(Box::new(child)),
+            span,
+            None,
+            ByteStreamType::Unknown,
+        )
     }
 
-    /// Create a new [`ByteStream`] that reads from stdin.
+    /// Create a [`ByteStream`] that reads from stdin.
+    ///
+    /// The type is implicitly `Unknown`, as it's not typically known whether stdin is text or
+    /// binary.
     pub fn stdin(span: Span) -> Result<Self, ShellError> {
         let stdin = os_pipe::dup_stdin().err_span(span)?;
         let source = ByteStreamSource::File(convert_file(stdin));
-        Ok(Self::new(source, span, None))
+        Ok(Self::new(source, span, None, ByteStreamType::Unknown))
+    }
+
+    /// Create a [`ByteStream`] from a generator function that writes data to the given buffer
+    /// when called, and returns `Ok(false)` on end of stream.
+    pub fn from_fn(
+        span: Span,
+        interrupt: Option<Arc<AtomicBool>>,
+        type_: ByteStreamType,
+        generator: impl FnMut(&mut Vec<u8>) -> Result<bool, ShellError> + Send + 'static,
+    ) -> Self {
+        Self::read(
+            ReadGenerator {
+                buffer: Cursor::new(Vec::new()),
+                generator,
+            },
+            span,
+            interrupt,
+            type_,
+        )
+    }
+
+    pub fn with_type(mut self, type_: ByteStreamType) -> Self {
+        self.type_ = type_;
+        self
     }
 
     /// Create a new [`ByteStream`] from an [`Iterator`] of bytes slices.
     ///
     /// The returned [`ByteStream`] will have a [`ByteStreamSource`] of `Read`.
-    pub fn from_iter<I>(iter: I, span: Span, interrupt: Option<Arc<AtomicBool>>) -> Self
+    pub fn from_iter<I>(
+        iter: I,
+        span: Span,
+        interrupt: Option<Arc<AtomicBool>>,
+        type_: ByteStreamType,
+    ) -> Self
     where
         I: IntoIterator,
         I::IntoIter: Send + 'static,
@@ -143,13 +304,18 @@ impl ByteStream {
     {
         let iter = iter.into_iter();
         let cursor = Some(Cursor::new(I::Item::default()));
-        Self::read(ReadIterator { iter, cursor }, span, interrupt)
+        Self::read(ReadIterator { iter, cursor }, span, interrupt, type_)
     }
 
     /// Create a new [`ByteStream`] from an [`Iterator`] of [`Result`] bytes slices.
     ///
     /// The returned [`ByteStream`] will have a [`ByteStreamSource`] of `Read`.
-    pub fn from_result_iter<I, T>(iter: I, span: Span, interrupt: Option<Arc<AtomicBool>>) -> Self
+    pub fn from_result_iter<I, T>(
+        iter: I,
+        span: Span,
+        interrupt: Option<Arc<AtomicBool>>,
+        type_: ByteStreamType,
+    ) -> Self
     where
         I: IntoIterator<Item = Result<T, ShellError>>,
         I::IntoIter: Send + 'static,
@@ -157,7 +323,7 @@ impl ByteStream {
     {
         let iter = iter.into_iter();
         let cursor = Some(Cursor::new(T::default()));
-        Self::read(ReadResultIterator { iter, cursor }, span, interrupt)
+        Self::read(ReadResultIterator { iter, cursor }, span, interrupt, type_)
     }
 
     /// Set the known size, in number of bytes, of the [`ByteStream`].
@@ -181,6 +347,11 @@ impl ByteStream {
         self.span
     }
 
+    /// Returns the [`ByteStreamType`] associated with the [`ByteStream`].
+    pub fn type_(&self) -> ByteStreamType {
+        self.type_
+    }
+
     /// Returns the known size, in number of bytes, of the [`ByteStream`].
     pub fn known_size(&self) -> Option<u64> {
         self.known_size
@@ -220,8 +391,10 @@ impl ByteStream {
     /// Convert the [`ByteStream`] into a [`Chunks`] iterator where each element is a `Result<Value, ShellError>`.
     ///
     /// Each call to [`next`](Iterator::next) reads the currently available data from the byte stream source,
-    /// up to a maximum size. If the chunk of bytes, or an expected portion of it, succeeds utf-8 decoding,
-    /// then it is returned as a [`Value::String`]. Otherwise, it is turned into a [`Value::Binary`].
+    /// up to a maximum size. The values are typed according to the [type](.type_()) of the
+    /// stream, and if that type is [`Unknown`](ByteStreamType::Unknown), string values will be
+    /// produced as long as the stream continues to parse as valid UTF-8, but binary values will
+    /// be produced instead of the stream fails to parse as UTF-8 instead at any point.
     /// Any and all newlines are kept intact in each chunk.
     ///
     /// Where possible, prefer [`reader`](ByteStream::reader) or [`lines`](ByteStream::lines) over this method.
@@ -232,12 +405,7 @@ impl ByteStream {
     /// then the stream is considered empty and `None` will be returned.
     pub fn chunks(self) -> Option<Chunks> {
         let reader = self.stream.reader()?;
-        Some(Chunks {
-            reader: BufReader::new(reader),
-            span: self.span,
-            ctrlc: self.ctrlc,
-            leftover: Vec::new(),
-        })
+        Some(Chunks::new(reader, self.span, self.ctrlc, self.type_))
     }
 
     /// Convert the [`ByteStream`] into its inner [`ByteStreamSource`].
@@ -305,33 +473,64 @@ impl ByteStream {
         }
     }
 
-    /// Collect all the bytes of the [`ByteStream`] into a [`String`].
+    /// Collect the stream into a `String` in-memory. This can only succeed if the data contained is
+    /// valid UTF-8.
     ///
-    /// The trailing new line (`\n` or `\r\n`), if any, is removed from the [`String`] prior to being returned.
+    /// The trailing new line (`\n` or `\r\n`), if any, is removed from the [`String`] prior to
+    /// being returned, if this is a stream coming from an external process or file.
     ///
-    /// If utf-8 decoding fails, an error is returned.
+    /// If the [type](.type_()) is specified as `Binary`, this operation always fails, even if the
+    /// data would have been valid UTF-8.
     pub fn into_string(self) -> Result<String, ShellError> {
         let span = self.span;
-        let bytes = self.into_bytes()?;
-        let mut string = String::from_utf8(bytes).map_err(|_| ShellError::NonUtf8 { span })?;
-        trim_end_newline(&mut string);
-        Ok(string)
+        if self.type_ != ByteStreamType::Binary {
+            let trim = self.stream.is_external();
+            let bytes = self.into_bytes()?;
+            let mut string = String::from_utf8(bytes).map_err(|err| ShellError::NonUtf8Custom {
+                span,
+                msg: err.to_string(),
+            })?;
+            if trim {
+                trim_end_newline(&mut string);
+            }
+            Ok(string)
+        } else {
+            Err(ShellError::TypeMismatch {
+                err_message: "expected string, but got binary".into(),
+                span,
+            })
+        }
     }
 
     /// Collect all the bytes of the [`ByteStream`] into a [`Value`].
     ///
-    /// If the collected bytes are successfully decoded as utf-8, then a [`Value::String`] is returned.
-    /// The trailing new line (`\n` or `\r\n`), if any, is removed from the [`String`] prior to being returned.
-    /// Otherwise, a [`Value::Binary`] is returned with any trailing new lines preserved.
+    /// If this is a `String` stream, the stream is decoded to UTF-8. If the stream came from an
+    /// external process or file, the trailing new line (`\n` or `\r\n`), if any, is removed from
+    /// the [`String`] prior to being returned.
+    ///
+    /// If this is a `Binary` stream, a [`Value::Binary`] is returned with any trailing new lines
+    /// preserved.
+    ///
+    /// If this is an `Unknown` stream, the behavior depends on whether the stream parses as valid
+    /// UTF-8 or not. If it does, this is uses the `String` behavior; if not, it uses the `Binary`
+    /// behavior.
     pub fn into_value(self) -> Result<Value, ShellError> {
         let span = self.span;
-        let bytes = self.into_bytes()?;
-        let value = match String::from_utf8(bytes) {
-            Ok(mut str) => {
-                trim_end_newline(&mut str);
-                Value::string(str, span)
-            }
-            Err(err) => Value::binary(err.into_bytes(), span),
+        let trim = self.stream.is_external();
+        let value = match self.type_ {
+            // If the type is specified, then the stream should always become that type:
+            ByteStreamType::Binary => Value::binary(self.into_bytes()?, span),
+            ByteStreamType::String => Value::string(self.into_string()?, span),
+            // If the type is not specified, then it just depends on whether it parses or not:
+            ByteStreamType::Unknown => match String::from_utf8(self.into_bytes()?) {
+                Ok(mut str) => {
+                    if trim {
+                        trim_end_newline(&mut str);
+                    }
+                    Value::string(str, span)
+                }
+                Err(err) => Value::binary(err.into_bytes(), span),
+            },
         };
         Ok(value)
     }
@@ -477,12 +676,6 @@ impl ByteStream {
     }
 }
 
-impl Debug for ByteStream {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("ByteStream").finish()
-    }
-}
-
 impl From<ByteStream> for PipelineData {
     fn from(stream: ByteStream) -> Self {
         Self::ByteStream(stream, None)
@@ -613,54 +806,157 @@ impl Iterator for Lines {
     }
 }
 
+/// Turn a readable stream into [`Value`]s.
+///
+/// The `Value` type depends on the type of the stream ([`ByteStreamType`]). If `Unknown`, the
+/// stream will return strings as long as UTF-8 parsing succeeds, but will start returning binary
+/// if it fails.
 pub struct Chunks {
     reader: BufReader<SourceReader>,
+    pos: u64,
+    error: bool,
     span: Span,
     ctrlc: Option<Arc<AtomicBool>>,
-    leftover: Vec<u8>,
+    type_: ByteStreamType,
 }
 
 impl Chunks {
+    fn new(
+        reader: SourceReader,
+        span: Span,
+        ctrlc: Option<Arc<AtomicBool>>,
+        type_: ByteStreamType,
+    ) -> Self {
+        Self {
+            reader: BufReader::new(reader),
+            pos: 0,
+            error: false,
+            span,
+            ctrlc,
+            type_,
+        }
+    }
+
     pub fn span(&self) -> Span {
         self.span
     }
+
+    fn next_string(&mut self) -> Result<Option<String>, (Vec<u8>, ShellError)> {
+        // Get some data from the reader
+        let buf = self
+            .reader
+            .fill_buf()
+            .err_span(self.span)
+            .map_err(|err| (vec![], ShellError::from(err)))?;
+
+        // If empty, this is EOF
+        if buf.is_empty() {
+            return Ok(None);
+        }
+
+        let mut buf = buf.to_vec();
+        let mut consumed = 0;
+
+        // If the buf length is under 4 bytes, it could be invalid, so try to get more
+        if buf.len() < 4 {
+            consumed += buf.len();
+            self.reader.consume(buf.len());
+            match self.reader.fill_buf().err_span(self.span) {
+                Ok(more_bytes) => buf.extend_from_slice(more_bytes),
+                Err(err) => return Err((buf, err.into())),
+            }
+        }
+
+        // Try to parse utf-8 and decide what to do
+        match String::from_utf8(buf) {
+            Ok(string) => {
+                self.reader.consume(string.len() - consumed);
+                self.pos += string.len() as u64;
+                Ok(Some(string))
+            }
+            Err(err) if err.utf8_error().error_len().is_none() => {
+                // There is some valid data at the beginning, and this is just incomplete, so just
+                // consume that and return it
+                let valid_up_to = err.utf8_error().valid_up_to();
+                if valid_up_to > consumed {
+                    self.reader.consume(valid_up_to - consumed);
+                }
+                let mut buf = err.into_bytes();
+                buf.truncate(valid_up_to);
+                buf.shrink_to_fit();
+                let string = String::from_utf8(buf)
+                    .expect("failed to parse utf-8 even after correcting error");
+                self.pos += string.len() as u64;
+                Ok(Some(string))
+            }
+            Err(err) => {
+                // There is an error at the beginning and we have no hope of parsing further.
+                let shell_error = ShellError::NonUtf8Custom {
+                    msg: format!("invalid utf-8 sequence starting at index {}", self.pos),
+                    span: self.span,
+                };
+                let buf = err.into_bytes();
+                // We are consuming the entire buf though, because we're returning it in case it
+                // will be cast to binary
+                if buf.len() > consumed {
+                    self.reader.consume(buf.len() - consumed);
+                }
+                self.pos += buf.len() as u64;
+                Err((buf, shell_error))
+            }
+        }
+    }
 }
 
 impl Iterator for Chunks {
     type Item = Result<Value, ShellError>;
 
     fn next(&mut self) -> Option<Self::Item> {
-        if nu_utils::ctrl_c::was_pressed(&self.ctrlc) {
+        if self.error || nu_utils::ctrl_c::was_pressed(&self.ctrlc) {
             None
         } else {
-            loop {
-                match self.reader.fill_buf() {
-                    Ok(buf) => {
-                        self.leftover.extend_from_slice(buf);
+            match self.type_ {
+                // Binary should always be binary
+                ByteStreamType::Binary => {
+                    let buf = match self.reader.fill_buf().err_span(self.span) {
+                        Ok(buf) => buf,
+                        Err(err) => {
+                            self.error = true;
+                            return Some(Err(err.into()));
+                        }
+                    };
+                    if !buf.is_empty() {
                         let len = buf.len();
+                        let value = Value::binary(buf, self.span);
                         self.reader.consume(len);
-                        break;
-                    }
-                    Err(e) if e.kind() == io::ErrorKind::Interrupted => continue,
-                    Err(err) => return Some(Err(err.into_spanned(self.span).into())),
-                };
-            }
-
-            if self.leftover.is_empty() {
-                return None;
-            }
-
-            match String::from_utf8(std::mem::take(&mut self.leftover)) {
-                Ok(str) => Some(Ok(Value::string(str, self.span))),
-                Err(err) => {
-                    if err.utf8_error().error_len().is_some() {
-                        Some(Ok(Value::binary(err.into_bytes(), self.span)))
+                        self.pos += len as u64;
+                        Some(Ok(value))
                     } else {
-                        let i = err.utf8_error().valid_up_to();
-                        let mut bytes = err.into_bytes();
-                        self.leftover = bytes.split_off(i);
-                        let str = String::from_utf8(bytes).expect("valid utf8");
-                        Some(Ok(Value::string(str, self.span)))
+                        None
+                    }
+                }
+                // String produces an error if UTF-8 can't be parsed
+                ByteStreamType::String => match self.next_string().transpose()? {
+                    Ok(string) => Some(Ok(Value::string(string, self.span))),
+                    Err((_, err)) => {
+                        self.error = true;
+                        Some(Err(err))
+                    }
+                },
+                // For Unknown, we try to create strings, but we switch to binary mode if we
+                // fail
+                ByteStreamType::Unknown => {
+                    match self.next_string().transpose()? {
+                        Ok(string) => Some(Ok(Value::string(string, self.span))),
+                        Err((buf, _)) if !buf.is_empty() => {
+                            // Switch to binary mode
+                            self.type_ = ByteStreamType::Binary;
+                            Some(Ok(Value::binary(buf, self.span)))
+                        }
+                        Err((_, err)) => {
+                            self.error = true;
+                            Some(Err(err))
+                        }
                     }
                 }
             }
@@ -776,11 +1072,58 @@ where
     Ok(len as u64)
 }
 
+struct ReadGenerator<F>
+where
+    F: FnMut(&mut Vec<u8>) -> Result<bool, ShellError> + Send + 'static,
+{
+    buffer: Cursor<Vec<u8>>,
+    generator: F,
+}
+
+impl<F> BufRead for ReadGenerator<F>
+where
+    F: FnMut(&mut Vec<u8>) -> Result<bool, ShellError> + Send + 'static,
+{
+    fn fill_buf(&mut self) -> std::io::Result<&[u8]> {
+        // We have to loop, because it's important that we don't leave the buffer empty unless we're
+        // truly at the end of the stream.
+        while self.buffer.fill_buf()?.is_empty() {
+            // Reset the cursor to the beginning and truncate
+            self.buffer.set_position(0);
+            self.buffer.get_mut().clear();
+            // Ask the generator to generate data
+            if !(self.generator)(self.buffer.get_mut())? {
+                // End of stream
+                break;
+            }
+        }
+        self.buffer.fill_buf()
+    }
+
+    fn consume(&mut self, amt: usize) {
+        self.buffer.consume(amt);
+    }
+}
+
+impl<F> Read for ReadGenerator<F>
+where
+    F: FnMut(&mut Vec<u8>) -> Result<bool, ShellError> + Send + 'static,
+{
+    fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
+        // Straightforward implementation on top of BufRead
+        let slice = self.fill_buf()?;
+        let len = buf.len().min(slice.len());
+        buf[..len].copy_from_slice(&slice[..len]);
+        self.consume(len);
+        Ok(len)
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
 
-    fn test_chunks<T>(data: Vec<T>) -> Chunks
+    fn test_chunks<T>(data: Vec<T>, type_: ByteStreamType) -> Chunks
     where
         T: AsRef<[u8]> + Default + Send + 'static,
     {
@@ -788,46 +1131,89 @@ mod tests {
             iter: data.into_iter(),
             cursor: Some(Cursor::new(T::default())),
         };
-        Chunks {
-            reader: BufReader::new(SourceReader::Read(Box::new(reader))),
-            span: Span::test_data(),
-            ctrlc: None,
-            leftover: Vec::new(),
-        }
+        Chunks::new(
+            SourceReader::Read(Box::new(reader)),
+            Span::test_data(),
+            None,
+            type_,
+        )
     }
 
     #[test]
-    fn chunks_read_string() {
-        let data = vec!["Nushell", "が好きです"];
-        let chunks = test_chunks(data.clone());
-        let actual = chunks.collect::<Result<Vec<_>, _>>().unwrap();
-        let expected = data.into_iter().map(Value::test_string).collect::<Vec<_>>();
-        assert_eq!(expected, actual);
-    }
+    fn chunks_read_binary_passthrough() {
+        let bins = vec![&[0, 1][..], &[2, 3][..]];
+        let iter = test_chunks(bins.clone(), ByteStreamType::Binary);
 
-    #[test]
-    fn chunks_read_string_split_utf8() {
-        let expected = "Nushell最高!";
-        let chunks = test_chunks(vec![&b"Nushell\xe6"[..], b"\x9c\x80\xe9", b"\xab\x98!"]);
-
-        let actual = chunks
+        let bins_values: Vec<Value> = bins
             .into_iter()
-            .map(|value| value.and_then(Value::into_string))
-            .collect::<Result<String, _>>()
-            .unwrap();
-
-        assert_eq!(expected, actual);
+            .map(|bin| Value::binary(bin, Span::test_data()))
+            .collect();
+        assert_eq!(
+            bins_values,
+            iter.collect::<Result<Vec<Value>, _>>().expect("error")
+        );
     }
 
     #[test]
-    fn chunks_returns_string_or_binary() {
-        let chunks = test_chunks(vec![b"Nushell".as_slice(), b"\x9c\x80\xe9abcd", b"efgh"]);
-        let actual = chunks.collect::<Result<Vec<_>, _>>().unwrap();
-        let expected = vec![
-            Value::test_string("Nushell"),
-            Value::test_binary(b"\x9c\x80\xe9abcd"),
-            Value::test_string("efgh"),
-        ];
-        assert_eq!(actual, expected)
+    fn chunks_read_string_clean() {
+        let strs = vec!["Nushell", "が好きです"];
+        let iter = test_chunks(strs.clone(), ByteStreamType::String);
+
+        let strs_values: Vec<Value> = strs
+            .into_iter()
+            .map(|string| Value::string(string, Span::test_data()))
+            .collect();
+        assert_eq!(
+            strs_values,
+            iter.collect::<Result<Vec<Value>, _>>().expect("error")
+        );
+    }
+
+    #[test]
+    fn chunks_read_string_split_boundary() {
+        let real = "Nushell最高!";
+        let chunks = vec![&b"Nushell\xe6"[..], &b"\x9c\x80\xe9"[..], &b"\xab\x98!"[..]];
+        let iter = test_chunks(chunks.clone(), ByteStreamType::String);
+
+        let mut string = String::new();
+        for value in iter {
+            let chunk_string = value.expect("error").into_string().expect("not a string");
+            string.push_str(&chunk_string);
+        }
+        assert_eq!(real, string);
+    }
+
+    #[test]
+    fn chunks_read_string_utf8_error() {
+        let chunks = vec![&b"Nushell\xe6"[..], &b"\x9c\x80\xe9"[..], &b"\xab"[..]];
+        let iter = test_chunks(chunks, ByteStreamType::String);
+
+        let mut string = String::new();
+        for value in iter {
+            match value {
+                Ok(value) => string.push_str(&value.into_string().expect("not a string")),
+                Err(err) => {
+                    println!("string so far: {:?}", string);
+                    println!("got error: {err:?}");
+                    assert!(!string.is_empty());
+                    assert!(matches!(err, ShellError::NonUtf8Custom { .. }));
+                    return;
+                }
+            }
+        }
+        panic!("no error");
+    }
+
+    #[test]
+    fn chunks_read_unknown_fallback() {
+        let chunks = vec![&b"Nushell"[..], &b"\x9c\x80\xe9abcd"[..], &b"efgh"[..]];
+        let mut iter = test_chunks(chunks, ByteStreamType::Unknown);
+
+        let mut get = || iter.next().expect("end of iter").expect("error");
+
+        assert_eq!(Value::test_string("Nushell"), get());
+        assert_eq!(Value::test_binary(b"\x9c\x80\xe9abcd"), get());
+        // Once it's in binary mode it won't go back
+        assert_eq!(Value::test_binary(b"efgh"), get());
     }
 }
diff --git a/crates/nu-protocol/src/pipeline/pipeline_data.rs b/crates/nu-protocol/src/pipeline/pipeline_data.rs
index 7faa4ed221..0a13ffa4b3 100644
--- a/crates/nu-protocol/src/pipeline/pipeline_data.rs
+++ b/crates/nu-protocol/src/pipeline/pipeline_data.rs
@@ -2,8 +2,8 @@ use crate::{
     ast::{Call, PathMember},
     engine::{EngineState, Stack},
     process::{ChildPipe, ChildProcess, ExitStatus},
-    ByteStream, Config, ErrSpan, ListStream, OutDest, PipelineMetadata, Range, ShellError, Span,
-    Value,
+    ByteStream, ByteStreamType, Config, ErrSpan, ListStream, OutDest, PipelineMetadata, Range,
+    ShellError, Span, Value,
 };
 use nu_utils::{stderr_write_all_and_flush, stdout_write_all_and_flush};
 use std::{
@@ -170,6 +170,8 @@ impl PipelineData {
     /// Try convert from self into iterator
     ///
     /// It returns Err if the `self` cannot be converted to an iterator.
+    ///
+    /// The `span` should be the span of the command or operation that would raise an error.
     pub fn into_iter_strict(self, span: Span) -> Result<PipelineIterator, ShellError> {
         Ok(PipelineIterator(match self {
             PipelineData::Value(value, ..) => {
@@ -274,7 +276,7 @@ impl PipelineData {
                 span: head,
             }),
             PipelineData::ByteStream(stream, ..) => Err(ShellError::IncompatiblePathAccess {
-                type_name: "byte stream".to_string(),
+                type_name: stream.type_().describe().to_owned(),
                 span: stream.span(),
             }),
         }
@@ -313,16 +315,7 @@ impl PipelineData {
                 Ok(PipelineData::ListStream(stream.map(f), metadata))
             }
             PipelineData::ByteStream(stream, metadata) => {
-                // TODO: is this behavior desired / correct ?
-                let span = stream.span();
-                let value = match String::from_utf8(stream.into_bytes()?) {
-                    Ok(mut str) => {
-                        str.truncate(str.trim_end_matches(LINE_ENDING_PATTERN).len());
-                        f(Value::string(str, span))
-                    }
-                    Err(err) => f(Value::binary(err.into_bytes(), span)),
-                };
-                Ok(value.into_pipeline_data_with_metadata(metadata))
+                Ok(f(stream.into_value()?).into_pipeline_data_with_metadata(metadata))
             }
         }
     }
@@ -543,22 +536,26 @@ impl PipelineData {
         no_newline: bool,
         to_stderr: bool,
     ) -> Result<Option<ExitStatus>, ShellError> {
-        if let PipelineData::ByteStream(stream, ..) = self {
-            stream.print(to_stderr)
-        } else {
-            // If the table function is in the declarations, then we can use it
-            // to create the table value that will be printed in the terminal
-            if let Some(decl_id) = engine_state.table_decl_id {
-                let command = engine_state.get_decl(decl_id);
-                if command.block_id().is_some() {
-                    self.write_all_and_flush(engine_state, no_newline, to_stderr)
+        match self {
+            // Print byte streams directly as long as they aren't binary.
+            PipelineData::ByteStream(stream, ..) if stream.type_() != ByteStreamType::Binary => {
+                stream.print(to_stderr)
+            }
+            _ => {
+                // If the table function is in the declarations, then we can use it
+                // to create the table value that will be printed in the terminal
+                if let Some(decl_id) = engine_state.table_decl_id {
+                    let command = engine_state.get_decl(decl_id);
+                    if command.block_id().is_some() {
+                        self.write_all_and_flush(engine_state, no_newline, to_stderr)
+                    } else {
+                        let call = Call::new(Span::new(0, 0));
+                        let table = command.run(engine_state, stack, &call, self)?;
+                        table.write_all_and_flush(engine_state, no_newline, to_stderr)
+                    }
                 } else {
-                    let call = Call::new(Span::new(0, 0));
-                    let table = command.run(engine_state, stack, &call, self)?;
-                    table.write_all_and_flush(engine_state, no_newline, to_stderr)
+                    self.write_all_and_flush(engine_state, no_newline, to_stderr)
                 }
-            } else {
-                self.write_all_and_flush(engine_state, no_newline, to_stderr)
             }
         }
     }
diff --git a/crates/nu_plugin_example/src/commands/collect_bytes.rs b/crates/nu_plugin_example/src/commands/collect_bytes.rs
index 51ca1d4222..398a1de4b1 100644
--- a/crates/nu_plugin_example/src/commands/collect_bytes.rs
+++ b/crates/nu_plugin_example/src/commands/collect_bytes.rs
@@ -1,6 +1,7 @@
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
-    ByteStream, Category, Example, LabeledError, PipelineData, Signature, Type, Value,
+    ByteStream, ByteStreamType, Category, Example, LabeledError, PipelineData, Signature, Type,
+    Value,
 };
 
 use crate::ExamplePlugin;
@@ -52,6 +53,7 @@ impl PluginCommand for CollectBytes {
                 input.into_iter().map(Value::coerce_into_binary),
                 call.head,
                 None,
+                ByteStreamType::Unknown,
             ),
             None,
         ))

From c98960d0536dc0849d538e24cd52038b4c26685b Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Mon, 20 May 2024 13:10:36 +0000
Subject: [PATCH 0011/1072] Take owned `Read` and `Write` (#12909)

# Description
As @YizhePKU pointed out, the [Rust API
guidelines](https://rust-lang.github.io/api-guidelines/interoperability.html#generic-readerwriter-functions-take-r-read-and-w-write-by-value-c-rw-value)
recommend that generic functions take readers and writers by value and
not by reference. This PR changes `copy_with_interupt` and few other
places to take owned `Read` and `Write` instead of mutable references.
---
 crates/nu-command/src/filesystem/save.rs      |  4 +-
 crates/nu-command/src/filters/tee.rs          | 10 +--
 .../nu-protocol/src/pipeline/byte_stream.rs   | 68 ++++++++-----------
 3 files changed, 36 insertions(+), 46 deletions(-)

diff --git a/crates/nu-command/src/filesystem/save.rs b/crates/nu-command/src/filesystem/save.rs
index 340ceb4f62..ab5257fb01 100644
--- a/crates/nu-command/src/filesystem/save.rs
+++ b/crates/nu-command/src/filesystem/save.rs
@@ -508,7 +508,7 @@ fn get_files(
 }
 
 fn stream_to_file(
-    mut source: impl Read,
+    source: impl Read,
     known_size: Option<u64>,
     ctrlc: Option<Arc<AtomicBool>>,
     mut file: File,
@@ -555,7 +555,7 @@ fn stream_to_file(
             Ok(())
         }
     } else {
-        copy_with_interrupt(&mut source, &mut file, span, ctrlc.as_deref())?;
+        copy_with_interrupt(source, file, span, ctrlc.as_deref())?;
         Ok(())
     }
 }
diff --git a/crates/nu-command/src/filters/tee.rs b/crates/nu-command/src/filters/tee.rs
index d6decd3bc6..2251f6646a 100644
--- a/crates/nu-command/src/filters/tee.rs
+++ b/crates/nu-command/src/filters/tee.rs
@@ -403,8 +403,8 @@ struct StreamInfo {
     metadata: Option<PipelineMetadata>,
 }
 
-fn copy(mut src: impl Read, mut dest: impl Write, info: &StreamInfo) -> Result<(), ShellError> {
-    copy_with_interrupt(&mut src, &mut dest, info.span, info.ctrlc.as_deref())?;
+fn copy(src: impl Read, dest: impl Write, info: &StreamInfo) -> Result<(), ShellError> {
+    copy_with_interrupt(src, dest, info.span, info.ctrlc.as_deref())?;
     Ok(())
 }
 
@@ -416,8 +416,8 @@ fn copy_pipe(pipe: ChildPipe, dest: impl Write, info: &StreamInfo) -> Result<(),
 }
 
 fn copy_on_thread(
-    mut src: impl Read + Send + 'static,
-    mut dest: impl Write + Send + 'static,
+    src: impl Read + Send + 'static,
+    dest: impl Write + Send + 'static,
     info: &StreamInfo,
 ) -> Result<JoinHandle<Result<(), ShellError>>, ShellError> {
     let span = info.span;
@@ -425,7 +425,7 @@ fn copy_on_thread(
     thread::Builder::new()
         .name("stderr copier".into())
         .spawn(move || {
-            copy_with_interrupt(&mut src, &mut dest, span, ctrlc.as_deref())?;
+            copy_with_interrupt(src, dest, span, ctrlc.as_deref())?;
             Ok(())
         })
         .map_err(|e| e.into_spanned(span).into())
diff --git a/crates/nu-protocol/src/pipeline/byte_stream.rs b/crates/nu-protocol/src/pipeline/byte_stream.rs
index e77c2cc855..35ce39ed31 100644
--- a/crates/nu-protocol/src/pipeline/byte_stream.rs
+++ b/crates/nu-protocol/src/pipeline/byte_stream.rs
@@ -541,8 +541,8 @@ impl ByteStream {
     /// then the [`ExitStatus`] of the [`ChildProcess`] is returned.
     pub fn drain(self) -> Result<Option<ExitStatus>, ShellError> {
         match self.stream {
-            ByteStreamSource::Read(mut read) => {
-                copy_with_interrupt(&mut read, &mut io::sink(), self.span, self.ctrlc.as_deref())?;
+            ByteStreamSource::Read(read) => {
+                copy_with_interrupt(read, io::sink(), self.span, self.ctrlc.as_deref())?;
                 Ok(None)
             }
             ByteStreamSource::File(_) => Ok(None),
@@ -566,16 +566,16 @@ impl ByteStream {
     ///
     /// If the source of the [`ByteStream`] is [`ByteStreamSource::Child`],
     /// then the [`ExitStatus`] of the [`ChildProcess`] is returned.
-    pub fn write_to(self, dest: &mut impl Write) -> Result<Option<ExitStatus>, ShellError> {
+    pub fn write_to(self, dest: impl Write) -> Result<Option<ExitStatus>, ShellError> {
         let span = self.span;
         let ctrlc = self.ctrlc.as_deref();
         match self.stream {
-            ByteStreamSource::Read(mut read) => {
-                copy_with_interrupt(&mut read, dest, span, ctrlc)?;
+            ByteStreamSource::Read(read) => {
+                copy_with_interrupt(read, dest, span, ctrlc)?;
                 Ok(None)
             }
-            ByteStreamSource::File(mut file) => {
-                copy_with_interrupt(&mut file, dest, span, ctrlc)?;
+            ByteStreamSource::File(file) => {
+                copy_with_interrupt(file, dest, span, ctrlc)?;
                 Ok(None)
             }
             ByteStreamSource::Child(mut child) => {
@@ -586,11 +586,11 @@ impl ByteStream {
 
                 if let Some(stdout) = child.stdout.take() {
                     match stdout {
-                        ChildPipe::Pipe(mut pipe) => {
-                            copy_with_interrupt(&mut pipe, dest, span, ctrlc)?;
+                        ChildPipe::Pipe(pipe) => {
+                            copy_with_interrupt(pipe, dest, span, ctrlc)?;
                         }
-                        ChildPipe::Tee(mut tee) => {
-                            copy_with_interrupt(&mut tee, dest, span, ctrlc)?;
+                        ChildPipe::Tee(tee) => {
+                            copy_with_interrupt(tee, dest, span, ctrlc)?;
                         }
                     }
                 }
@@ -612,14 +612,14 @@ impl ByteStream {
                 write_to_out_dest(read, stdout, true, span, ctrlc)?;
                 Ok(None)
             }
-            ByteStreamSource::File(mut file) => {
+            ByteStreamSource::File(file) => {
                 match stdout {
                     OutDest::Pipe | OutDest::Capture | OutDest::Null => {}
                     OutDest::Inherit => {
-                        copy_with_interrupt(&mut file, &mut io::stdout(), span, ctrlc)?;
+                        copy_with_interrupt(file, io::stdout(), span, ctrlc)?;
                     }
                     OutDest::File(f) => {
-                        copy_with_interrupt(&mut file, &mut f.as_ref(), span, ctrlc)?;
+                        copy_with_interrupt(file, f.as_ref(), span, ctrlc)?;
                     }
                 }
                 Ok(None)
@@ -974,7 +974,7 @@ fn trim_end_newline(string: &mut String) {
 }
 
 fn write_to_out_dest(
-    mut read: impl Read,
+    read: impl Read,
     stream: &OutDest,
     stdout: bool,
     span: Span,
@@ -982,12 +982,10 @@ fn write_to_out_dest(
 ) -> Result<(), ShellError> {
     match stream {
         OutDest::Pipe | OutDest::Capture => return Ok(()),
-        OutDest::Null => copy_with_interrupt(&mut read, &mut io::sink(), span, ctrlc),
-        OutDest::Inherit if stdout => {
-            copy_with_interrupt(&mut read, &mut io::stdout(), span, ctrlc)
-        }
-        OutDest::Inherit => copy_with_interrupt(&mut read, &mut io::stderr(), span, ctrlc),
-        OutDest::File(file) => copy_with_interrupt(&mut read, &mut file.as_ref(), span, ctrlc),
+        OutDest::Null => copy_with_interrupt(read, io::sink(), span, ctrlc),
+        OutDest::Inherit if stdout => copy_with_interrupt(read, io::stdout(), span, ctrlc),
+        OutDest::Inherit => copy_with_interrupt(read, io::stderr(), span, ctrlc),
+        OutDest::File(file) => copy_with_interrupt(read, file.as_ref(), span, ctrlc),
     }?;
     Ok(())
 }
@@ -1004,22 +1002,18 @@ pub(crate) fn convert_file<T: From<OwnedHandle>>(file: impl Into<OwnedHandle>) -
 
 const DEFAULT_BUF_SIZE: usize = 8192;
 
-pub fn copy_with_interrupt<R: ?Sized, W: ?Sized>(
-    reader: &mut R,
-    writer: &mut W,
+pub fn copy_with_interrupt(
+    mut reader: impl Read,
+    mut writer: impl Write,
     span: Span,
     interrupt: Option<&AtomicBool>,
-) -> Result<u64, ShellError>
-where
-    R: Read,
-    W: Write,
-{
+) -> Result<u64, ShellError> {
     if let Some(interrupt) = interrupt {
         // #[cfg(any(target_os = "linux", target_os = "android"))]
         // {
         //     return crate::sys::kernel_copy::copy_spec(reader, writer);
         // }
-        match generic_copy(reader, writer, span, interrupt) {
+        match generic_copy(&mut reader, &mut writer, span, interrupt) {
             Ok(len) => {
                 writer.flush().err_span(span)?;
                 Ok(len)
@@ -1030,7 +1024,7 @@ where
             }
         }
     } else {
-        match io::copy(reader, writer) {
+        match io::copy(&mut reader, &mut writer) {
             Ok(n) => {
                 writer.flush().err_span(span)?;
                 Ok(n)
@@ -1044,16 +1038,12 @@ where
 }
 
 // Copied from [`std::io::copy`]
-fn generic_copy<R: ?Sized, W: ?Sized>(
-    reader: &mut R,
-    writer: &mut W,
+fn generic_copy(
+    mut reader: impl Read,
+    mut writer: impl Write,
     span: Span,
     interrupt: &AtomicBool,
-) -> Result<u64, ShellError>
-where
-    R: Read,
-    W: Write,
-{
+) -> Result<u64, ShellError> {
     let buf = &mut [0; DEFAULT_BUF_SIZE];
     let mut len = 0;
     loop {

From 4f69ba172e141a23ed7d9a27a65bbed7b2f91b0d Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Mon, 20 May 2024 10:08:03 -0500
Subject: [PATCH 0012/1072] add `math min` and `math max` to `bench` command
 (#12913)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

This PR adds min and max to the bench command.
```nushell
❯ use std bench
❯ bench { dply -c 'parquet("./data.parquet") | group_by(year) | summarize(count = n(), sum = sum(geo_count)) | show()' | complete | null } --rounds 100 --verbose
100 / 100
╭───────┬───────────────────╮
│ mean  │ 71ms 358µs 850ns  │
│ min   │ 66ms 457µs 583ns  │
│ max   │ 120ms 338µs 167ns │
│ std   │ 6ms 553µs 949ns   │
│ times │ [list 100 items]  │
╰───────┴───────────────────╯
```

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

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

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

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

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

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

diff --git a/crates/nu-std/std/mod.nu b/crates/nu-std/std/mod.nu
index 9d4387fa95..a20bdb4b78 100644
--- a/crates/nu-std/std/mod.nu
+++ b/crates/nu-std/std/mod.nu
@@ -148,6 +148,8 @@ export def bench [
 
     let report = {
         mean: ($times | math avg | from ns)
+        min: ($times | math min | from ns)
+        max: ($times | math max | from ns)
         std: ($times | math stddev | from ns)
         times: ($times | each { from ns })
     }

From 905e3d0715ad82fbf837e059ad7cd5184ea77f89 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Mon, 20 May 2024 17:22:08 +0000
Subject: [PATCH 0013/1072] Remove dataframes crate and feature (#12889)

# Description
Removes the old `nu-cmd-dataframe` crate in favor of the polars plugin.
As such, this PR also removes the `dataframe` feature, related CI, and
full releases of nushell.
---
 .github/workflows/ci.yml                      |   42 +-
 .github/workflows/nightly-build.yml           |  131 +-
 .github/workflows/release-pkg.nu              |   75 +-
 .github/workflows/release.yml                 |  105 +-
 CONTRIBUTING.md                               |   12 +-
 Cargo.lock                                    |   24 -
 Cargo.toml                                    |    7 -
 crates/nu-cmd-dataframe/Cargo.toml            |   75 -
 crates/nu-cmd-dataframe/LICENSE               |   21 -
 .../nu-cmd-dataframe/src/dataframe/README.md  |   12 -
 .../src/dataframe/eager/append.rs             |  134 --
 .../src/dataframe/eager/cast.rs               |  195 ---
 .../src/dataframe/eager/columns.rs            |   73 -
 .../src/dataframe/eager/drop.rs               |  115 --
 .../src/dataframe/eager/drop_duplicates.rs    |  119 --
 .../src/dataframe/eager/drop_nulls.rs         |  137 --
 .../src/dataframe/eager/dtypes.rs             |  104 --
 .../src/dataframe/eager/dummies.rs            |  107 --
 .../src/dataframe/eager/filter_with.rs        |  154 --
 .../src/dataframe/eager/first.rs              |  144 --
 .../src/dataframe/eager/get.rs                |   87 -
 .../src/dataframe/eager/last.rs               |  118 --
 .../src/dataframe/eager/list.rs               |   68 -
 .../src/dataframe/eager/melt.rs               |  248 ---
 .../src/dataframe/eager/mod.rs                |  114 --
 .../src/dataframe/eager/open.rs               |  518 ------
 .../src/dataframe/eager/query_df.rs           |  104 --
 .../src/dataframe/eager/rename.rs             |  185 ---
 .../src/dataframe/eager/sample.rs             |  127 --
 .../src/dataframe/eager/schema.rs             |  112 --
 .../src/dataframe/eager/shape.rs              |   82 -
 .../src/dataframe/eager/slice.rs              |   84 -
 .../src/dataframe/eager/sql_context.rs        |  228 ---
 .../src/dataframe/eager/sql_expr.rs           |  200 ---
 .../src/dataframe/eager/summary.rs            |  279 ----
 .../src/dataframe/eager/take.rs               |  148 --
 .../src/dataframe/eager/to_arrow.rs           |   79 -
 .../src/dataframe/eager/to_avro.rs            |  109 --
 .../src/dataframe/eager/to_csv.rs             |  125 --
 .../src/dataframe/eager/to_df.rs              |  189 ---
 .../src/dataframe/eager/to_json_lines.rs      |   80 -
 .../src/dataframe/eager/to_nu.rs              |  136 --
 .../src/dataframe/eager/to_parquet.rs         |   79 -
 .../src/dataframe/eager/with_column.rs        |  202 ---
 .../src/dataframe/expressions/alias.rs        |   86 -
 .../src/dataframe/expressions/arg_where.rs    |   78 -
 .../src/dataframe/expressions/col.rs          |   68 -
 .../src/dataframe/expressions/concat_str.rs   |  108 --
 .../src/dataframe/expressions/datepart.rs     |  170 --
 .../expressions/expressions_macro.rs          |  736 ---------
 .../src/dataframe/expressions/is_in.rs        |  116 --
 .../src/dataframe/expressions/lit.rs          |   69 -
 .../src/dataframe/expressions/mod.rs          |   62 -
 .../src/dataframe/expressions/otherwise.rs    |  126 --
 .../src/dataframe/expressions/quantile.rs     |  101 --
 .../src/dataframe/expressions/when.rs         |  147 --
 .../src/dataframe/lazy/aggregate.rs           |  216 ---
 .../src/dataframe/lazy/collect.rs             |   73 -
 .../src/dataframe/lazy/explode.rs             |  153 --
 .../src/dataframe/lazy/fetch.rs               |   92 --
 .../src/dataframe/lazy/fill_nan.rs            |  143 --
 .../src/dataframe/lazy/fill_null.rs           |   93 --
 .../src/dataframe/lazy/filter.rs              |   83 -
 .../src/dataframe/lazy/flatten.rs             |  126 --
 .../src/dataframe/lazy/groupby.rs             |  161 --
 .../src/dataframe/lazy/join.rs                |  252 ---
 .../src/dataframe/lazy/macro_commands.rs      |  246 ---
 .../src/dataframe/lazy/mod.rs                 |   65 -
 .../src/dataframe/lazy/quantile.rs            |   87 -
 .../src/dataframe/lazy/select.rs              |   75 -
 .../src/dataframe/lazy/sort_by_expr.rs        |  159 --
 .../src/dataframe/lazy/to_lazy.rs             |   53 -
 crates/nu-cmd-dataframe/src/dataframe/mod.rs  |   36 -
 .../src/dataframe/series/all_false.rs         |  108 --
 .../src/dataframe/series/all_true.rs          |  105 --
 .../src/dataframe/series/arg_max.rs           |   85 -
 .../src/dataframe/series/arg_min.rs           |   85 -
 .../src/dataframe/series/cumulative.rs        |  148 --
 .../src/dataframe/series/date/as_date.rs      |   94 --
 .../src/dataframe/series/date/as_datetime.rs  |  187 ---
 .../src/dataframe/series/date/get_day.rs      |   90 --
 .../src/dataframe/series/date/get_hour.rs     |   90 --
 .../src/dataframe/series/date/get_minute.rs   |   90 --
 .../src/dataframe/series/date/get_month.rs    |   90 --
 .../dataframe/series/date/get_nanosecond.rs   |   90 --
 .../src/dataframe/series/date/get_ordinal.rs  |   90 --
 .../src/dataframe/series/date/get_second.rs   |   90 --
 .../src/dataframe/series/date/get_week.rs     |   90 --
 .../src/dataframe/series/date/get_weekday.rs  |   90 --
 .../src/dataframe/series/date/get_year.rs     |   90 --
 .../src/dataframe/series/date/mod.rs          |   25 -
 .../src/dataframe/series/indexes/arg_sort.rs  |  130 --
 .../src/dataframe/series/indexes/arg_true.rs  |  115 --
 .../dataframe/series/indexes/arg_unique.rs    |   93 --
 .../src/dataframe/series/indexes/mod.rs       |    9 -
 .../dataframe/series/indexes/set_with_idx.rs  |  213 ---
 .../dataframe/series/masks/is_duplicated.rs   |  122 --
 .../src/dataframe/series/masks/is_in.rs       |  104 --
 .../src/dataframe/series/masks/is_not_null.rs |  122 --
 .../src/dataframe/series/masks/is_null.rs     |  122 --
 .../src/dataframe/series/masks/is_unique.rs   |  121 --
 .../src/dataframe/series/masks/mod.rs         |   15 -
 .../src/dataframe/series/masks/not.rs         |   93 --
 .../src/dataframe/series/masks/set.rs         |  201 ---
 .../src/dataframe/series/mod.rs               |   95 --
 .../src/dataframe/series/n_null.rs            |   82 -
 .../src/dataframe/series/n_unique.rs          |  127 --
 .../src/dataframe/series/rolling.rs           |  186 ---
 .../src/dataframe/series/shift.rs             |  115 --
 .../dataframe/series/string/concatenate.rs    |  113 --
 .../src/dataframe/series/string/contains.rs   |  106 --
 .../src/dataframe/series/string/mod.rs        |   19 -
 .../src/dataframe/series/string/replace.rs    |  120 --
 .../dataframe/series/string/replace_all.rs    |  121 --
 .../dataframe/series/string/str_lengths.rs    |   87 -
 .../src/dataframe/series/string/str_slice.rs  |  136 --
 .../src/dataframe/series/string/strftime.rs   |  105 --
 .../dataframe/series/string/to_lowercase.rs   |   92 --
 .../dataframe/series/string/to_uppercase.rs   |   96 --
 .../src/dataframe/series/unique.rs            |  146 --
 .../src/dataframe/series/value_counts.rs      |   95 --
 crates/nu-cmd-dataframe/src/dataframe/stub.rs |   34 -
 .../src/dataframe/test_dataframe.rs           |   98 --
 .../nu-cmd-dataframe/src/dataframe/utils.rs   |   16 -
 .../src/dataframe/values/mod.rs               |   14 -
 .../values/nu_dataframe/between_values.rs     |  884 ----------
 .../values/nu_dataframe/conversion.rs         | 1435 -----------------
 .../values/nu_dataframe/custom_value.rs       |   79 -
 .../src/dataframe/values/nu_dataframe/mod.rs  |  580 -------
 .../values/nu_dataframe/operations.rs         |  206 ---
 .../values/nu_expression/custom_value.rs      |  147 --
 .../src/dataframe/values/nu_expression/mod.rs |  443 -----
 .../values/nu_lazyframe/custom_value.rs       |   50 -
 .../src/dataframe/values/nu_lazyframe/mod.rs  |  188 ---
 .../values/nu_lazygroupby/custom_value.rs     |   44 -
 .../dataframe/values/nu_lazygroupby/mod.rs    |  113 --
 .../src/dataframe/values/nu_schema.rs         |  376 -----
 .../dataframe/values/nu_when/custom_value.rs  |   41 -
 .../src/dataframe/values/nu_when/mod.rs       |   77 -
 .../src/dataframe/values/utils.rs             |   86 -
 crates/nu-cmd-dataframe/src/lib.rs            |    4 -
 crates/nu-cmd-lang/Cargo.toml                 |    1 -
 crates/nu-cmd-lang/README.md                  |    1 -
 .../nu-cmd-lang/src/core_commands/version.rs  |    5 -
 crates/nu-command/tests/commands/open.rs      |   16 -
 crates/nu-command/tests/main.rs               |    3 +-
 crates/nu-protocol/src/errors/shell_error.rs  |   13 -
 crates/nu_plugin_polars/Cargo.toml            |    2 +-
 devdocs/PLATFORM_SUPPORT.md                   |    8 +-
 scripts/build-all-maclin.sh                   |    4 +-
 scripts/build-all-windows.cmd                 |    4 +-
 scripts/build-all.nu                          |    4 +-
 scripts/install-all.ps1                       |    4 +-
 scripts/install-all.sh                        |    4 +-
 src/main.rs                                   |    2 -
 toolkit.nu                                    |   29 +-
 156 files changed, 56 insertions(+), 19464 deletions(-)
 delete mode 100644 crates/nu-cmd-dataframe/Cargo.toml
 delete mode 100644 crates/nu-cmd-dataframe/LICENSE
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/README.md
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/append.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/cast.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/columns.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/drop.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/drop_duplicates.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/drop_nulls.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/dtypes.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/dummies.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/filter_with.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/first.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/get.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/last.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/list.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/melt.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/mod.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/open.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/query_df.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/rename.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/sample.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/schema.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/shape.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/slice.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/sql_context.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/sql_expr.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/summary.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/take.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/to_arrow.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/to_avro.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/to_csv.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/to_df.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/to_json_lines.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/to_nu.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/to_parquet.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/eager/with_column.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/expressions/alias.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/expressions/arg_where.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/expressions/col.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/expressions/concat_str.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/expressions/datepart.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/expressions/expressions_macro.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/expressions/is_in.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/expressions/lit.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/expressions/mod.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/expressions/otherwise.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/expressions/quantile.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/expressions/when.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/lazy/aggregate.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/lazy/collect.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/lazy/explode.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/lazy/fetch.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/lazy/fill_nan.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/lazy/fill_null.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/lazy/filter.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/lazy/flatten.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/lazy/groupby.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/lazy/join.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/lazy/macro_commands.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/lazy/mod.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/lazy/quantile.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/lazy/select.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/lazy/sort_by_expr.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/lazy/to_lazy.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/mod.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/all_false.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/all_true.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/arg_max.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/arg_min.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/cumulative.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/date/as_date.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/date/as_datetime.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/date/get_day.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/date/get_hour.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/date/get_minute.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/date/get_month.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/date/get_nanosecond.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/date/get_ordinal.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/date/get_second.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/date/get_week.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/date/get_weekday.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/date/get_year.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/date/mod.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/indexes/arg_sort.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/indexes/arg_true.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/indexes/arg_unique.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/indexes/mod.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/indexes/set_with_idx.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/masks/is_duplicated.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/masks/is_in.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/masks/is_not_null.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/masks/is_null.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/masks/is_unique.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/masks/mod.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/masks/not.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/masks/set.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/mod.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/n_null.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/n_unique.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/rolling.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/shift.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/string/concatenate.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/string/contains.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/string/mod.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/string/replace.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/string/replace_all.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/string/str_lengths.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/string/str_slice.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/string/strftime.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/string/to_lowercase.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/string/to_uppercase.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/unique.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/series/value_counts.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/stub.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/test_dataframe.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/utils.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/values/mod.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/values/nu_dataframe/between_values.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/values/nu_dataframe/conversion.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/values/nu_dataframe/custom_value.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/values/nu_dataframe/mod.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/values/nu_dataframe/operations.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/values/nu_expression/custom_value.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/values/nu_expression/mod.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/values/nu_lazyframe/custom_value.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/values/nu_lazyframe/mod.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/values/nu_lazygroupby/custom_value.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/values/nu_lazygroupby/mod.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/values/nu_schema.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/values/nu_when/custom_value.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/values/nu_when/mod.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/dataframe/values/utils.rs
 delete mode 100644 crates/nu-cmd-dataframe/src/lib.rs

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4815491854..3acdfa71d1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,17 +29,6 @@ jobs:
         # instead of 14 GB) which is too little for us right now. Revisit when `dfr` commands are
         # removed and we're only building the `polars` plugin instead
         platform: [windows-latest, macos-13, ubuntu-20.04]
-        feature: [default, dataframe]
-        include:
-          - feature: default
-            flags: ""
-          - feature: dataframe
-            flags: "--features=dataframe"
-        exclude:
-          - platform: windows-latest
-            feature: dataframe
-          - platform: macos-13
-            feature: dataframe
 
     runs-on: ${{ matrix.platform }}
 
@@ -48,43 +37,31 @@ jobs:
 
       - name: Setup Rust toolchain and cache
         uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
-        with:
-          rustflags: ""
 
       - name: cargo fmt
         run: cargo fmt --all -- --check
 
         # If changing these settings also change toolkit.nu
       - name: Clippy
-        run: cargo clippy --workspace ${{ matrix.flags }} --exclude nu_plugin_* -- $CLIPPY_OPTIONS
+        run: cargo clippy --workspace --exclude nu_plugin_* -- $CLIPPY_OPTIONS
 
         # In tests we don't have to deny unwrap
       - name: Clippy of tests
-        run: cargo clippy --tests --workspace ${{ matrix.flags }} --exclude nu_plugin_* -- -D warnings
+        run: cargo clippy --tests --workspace --exclude nu_plugin_* -- -D warnings
 
       - name: Clippy of benchmarks
-        run: cargo clippy --benches --workspace ${{ matrix.flags }} --exclude nu_plugin_* -- -D warnings
+        run: cargo clippy --benches --workspace --exclude nu_plugin_* -- -D warnings
 
   tests:
     strategy:
       fail-fast: true
       matrix:
         platform: [windows-latest, macos-latest, ubuntu-20.04]
-        feature: [default, dataframe]
         include:
-          # linux CI cannot handle clipboard feature
           - default-flags: ""
-          - platform:  ubuntu-20.04
+          # linux CI cannot handle clipboard feature
+          - platform: ubuntu-20.04
             default-flags: "--no-default-features --features=default-no-clipboard"
-          - feature: default
-            flags: ""
-          - feature: dataframe
-            flags: "--features=dataframe"
-        exclude:
-          - platform: windows-latest
-            feature: dataframe
-          - platform: macos-latest
-            feature: dataframe
 
     runs-on: ${{ matrix.platform }}
 
@@ -93,12 +70,9 @@ jobs:
 
       - name: Setup Rust toolchain and cache
         uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
-        with:
-          rustflags: ""
 
       - name: Tests
-        run: cargo test --workspace --profile ci --exclude nu_plugin_* ${{ matrix.default-flags }} ${{ matrix.flags }}
-
+        run: cargo test --workspace --profile ci --exclude nu_plugin_* ${{ matrix.default-flags }}
       - name: Check for clean repo
         shell: bash
         run: |
@@ -125,8 +99,6 @@ jobs:
 
       - name: Setup Rust toolchain and cache
         uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
-        with:
-          rustflags: ""
 
       - name: Install Nushell
         run: cargo install --path . --locked --no-default-features
@@ -178,8 +150,6 @@ jobs:
 
       - name: Setup Rust toolchain and cache
         uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
-        with:
-          rustflags: ""
 
       - name: Clippy
         run: cargo clippy --package nu_plugin_* -- $CLIPPY_OPTIONS
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index ab9f93d97d..418b392fce 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -84,41 +84,30 @@ jobs:
         include:
         - target: aarch64-apple-darwin
           os: macos-latest
-          target_rustflags: ''
         - target: x86_64-apple-darwin
           os: macos-latest
-          target_rustflags: ''
         - target: x86_64-pc-windows-msvc
           extra: 'bin'
           os: windows-latest
-          target_rustflags: ''
         - target: x86_64-pc-windows-msvc
           extra: msi
           os: windows-latest
-          target_rustflags: ''
         - target: aarch64-pc-windows-msvc
           extra: 'bin'
           os: windows-latest
-          target_rustflags: ''
         - target: aarch64-pc-windows-msvc
           extra: msi
           os: windows-latest
-          target_rustflags: ''
         - target: x86_64-unknown-linux-gnu
           os: ubuntu-20.04
-          target_rustflags: ''
         - target: x86_64-unknown-linux-musl
           os: ubuntu-20.04
-          target_rustflags: ''
         - target: aarch64-unknown-linux-gnu
           os: ubuntu-20.04
-          target_rustflags: ''
         - target: armv7-unknown-linux-gnueabihf
           os: ubuntu-20.04
-          target_rustflags: ''
         - target: riscv64gc-unknown-linux-gnu
           os: ubuntu-latest
-          target_rustflags: ''
 
     runs-on: ${{matrix.os}}
 
@@ -134,7 +123,7 @@ jobs:
 
     - name: Setup Rust toolchain and cache
       uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
-      # WARN: Keep the rustflags to prevent from the winget submission error: `CAQuietExec:  Error 0xc0000135`
+      # WARN: Keep the rustflags to prevent from the winget submission error: `CAQuietExec: Error 0xc0000135`
       with:
         rustflags: ''
 
@@ -147,12 +136,10 @@ jobs:
       id: nu
       run: nu .github/workflows/release-pkg.nu
       env:
-        RELEASE_TYPE: standard
         OS: ${{ matrix.os }}
         REF: ${{ github.ref }}
         TARGET: ${{ matrix.target }}
         _EXTRA_: ${{ matrix.extra }}
-        TARGET_RUSTFLAGS: ${{ matrix.target_rustflags }}
 
     - name: Create an Issue for Release Failure
       if: ${{ failure() }}
@@ -184,122 +171,6 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  full:
-    name: Full
-    needs: prepare
-    strategy:
-      fail-fast: false
-      matrix:
-        target:
-        - aarch64-apple-darwin
-        - x86_64-apple-darwin
-        - x86_64-pc-windows-msvc
-        - aarch64-pc-windows-msvc
-        - x86_64-unknown-linux-gnu
-        - x86_64-unknown-linux-musl
-        - aarch64-unknown-linux-gnu
-        extra: ['bin']
-        include:
-        - target: aarch64-apple-darwin
-          os: macos-latest
-          target_rustflags: '--features=dataframe'
-        - target: x86_64-apple-darwin
-          os: macos-latest
-          target_rustflags: '--features=dataframe'
-        - target: x86_64-pc-windows-msvc
-          extra: 'bin'
-          os: windows-latest
-          target_rustflags: '--features=dataframe'
-        - target: x86_64-pc-windows-msvc
-          extra: msi
-          os: windows-latest
-          target_rustflags: '--features=dataframe'
-        - target: aarch64-pc-windows-msvc
-          extra: 'bin'
-          os: windows-latest
-          target_rustflags: '--features=dataframe'
-        - target: aarch64-pc-windows-msvc
-          extra: msi
-          os: windows-latest
-          target_rustflags: '--features=dataframe'
-        - target: x86_64-unknown-linux-gnu
-          os: ubuntu-20.04
-          target_rustflags: '--features=dataframe'
-        - target: x86_64-unknown-linux-musl
-          os: ubuntu-20.04
-          target_rustflags: '--features=dataframe'
-        - target: aarch64-unknown-linux-gnu
-          os: ubuntu-20.04
-          target_rustflags: '--features=dataframe'
-
-    runs-on: ${{matrix.os}}
-
-    steps:
-    - uses: actions/checkout@v4.1.5
-      with:
-        ref: main
-        fetch-depth: 0
-
-    - name: Update Rust Toolchain Target
-      run: |
-        echo "targets = ['${{matrix.target}}']" >> rust-toolchain.toml
-
-    - name: Setup Rust toolchain and cache
-      uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
-      # WARN: Keep the rustflags to prevent from the winget submission error: `CAQuietExec:  Error 0xc0000135`
-      with:
-        rustflags: ''
-
-    - name: Setup Nushell
-      uses: hustcer/setup-nu@v3.10
-      with:
-        version: 0.93.0
-
-    - name: Release Nu Binary
-      id: nu
-      run: nu .github/workflows/release-pkg.nu
-      env:
-        RELEASE_TYPE: full
-        OS: ${{ matrix.os }}
-        REF: ${{ github.ref }}
-        TARGET: ${{ matrix.target }}
-        _EXTRA_: ${{ matrix.extra }}
-        TARGET_RUSTFLAGS: ${{ matrix.target_rustflags }}
-
-    - name: Create an Issue for Release Failure
-      if: ${{ failure() }}
-      uses: JasonEtco/create-an-issue@v2.9.2
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        update_existing: true
-        search_existing: open
-        filename: .github/AUTO_ISSUE_TEMPLATE/nightly-build-fail.md
-
-    - name: Set Outputs of Short SHA
-      id: vars
-      run: |
-        echo "date=$(date -u +'%Y-%m-%d')" >> $GITHUB_OUTPUT
-        sha_short=$(git rev-parse --short HEAD)
-        echo "sha_short=${sha_short:0:7}" >> $GITHUB_OUTPUT
-
-    # 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
-      if: ${{ startsWith(github.repository, 'nushell/nightly') }}
-      with:
-        draft: false
-        prerelease: true
-        name: Nu-nightly-${{ steps.vars.outputs.date }}-${{ steps.vars.outputs.sha_short }}
-        tag_name: nightly-${{ steps.vars.outputs.sha_short }}
-        body: |
-          This is a NIGHTLY build of Nushell.
-          It is NOT recommended for production use.
-        files: ${{ steps.nu.outputs.archive }}
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
   cleanup:
     name: Cleanup
     # Should only run in nushell/nightly repo
diff --git a/.github/workflows/release-pkg.nu b/.github/workflows/release-pkg.nu
index 046ea2475e..da2779f6d1 100755
--- a/.github/workflows/release-pkg.nu
+++ b/.github/workflows/release-pkg.nu
@@ -9,7 +9,6 @@
 # Instructions for manually creating an MSI for Winget Releases when they fail
 # Added 2022-11-29 when Windows packaging wouldn't work
 # Updated again on 2023-02-23 because msis are still failing validation
-# Update on 2023-10-18 to use RELEASE_TYPE env var to determine if full or not
 # To run this manual for windows here are the steps I take
 # checkout the release you want to publish
 # 1. git checkout 0.86.0
@@ -17,28 +16,26 @@
 # 2. $env:CARGO_TARGET_DIR = ""
 # 2. hide-env CARGO_TARGET_DIR
 # 3. $env.TARGET = 'x86_64-pc-windows-msvc'
-# 4. $env.TARGET_RUSTFLAGS = ''
-# 5. $env.GITHUB_WORKSPACE = 'D:\nushell'
-# 6. $env.GITHUB_OUTPUT = 'D:\nushell\output\out.txt'
-# 7. $env.OS = 'windows-latest'
-# 8. $env.RELEASE_TYPE = '' # There is full and '' for normal releases
+# 4. $env.GITHUB_WORKSPACE = 'D:\nushell'
+# 5. $env.GITHUB_OUTPUT = 'D:\nushell\output\out.txt'
+# 6. $env.OS = 'windows-latest'
 # make sure 7z.exe is in your path https://www.7-zip.org/download.html
-# 9. $env.Path = ($env.Path | append 'c:\apps\7-zip')
+# 7. $env.Path = ($env.Path | append 'c:\apps\7-zip')
 # make sure aria2c.exe is in your path https://github.com/aria2/aria2
-# 10. $env.Path = ($env.Path | append 'c:\path\to\aria2c')
+# 8. $env.Path = ($env.Path | append 'c:\path\to\aria2c')
 # make sure you have the wixtools installed https://wixtoolset.org/
-# 11. $env.Path = ($env.Path | append 'C:\Users\dschroeder\AppData\Local\tauri\WixTools')
+# 9. $env.Path = ($env.Path | append 'C:\Users\dschroeder\AppData\Local\tauri\WixTools')
 # You need to run the release-pkg twice. The first pass, with _EXTRA_ as 'bin', makes the output
 # folder and builds everything. The second pass, that generates the msi file, with _EXTRA_ as 'msi'
-# 12. $env._EXTRA_ = 'bin'
-# 13. source .github\workflows\release-pkg.nu
-# 14. cd ..
-# 15. $env._EXTRA_ = 'msi'
-# 16. source .github\workflows\release-pkg.nu
+# 10. $env._EXTRA_ = 'bin'
+# 11. source .github\workflows\release-pkg.nu
+# 12. cd ..
+# 13. $env._EXTRA_ = 'msi'
+# 14. source .github\workflows\release-pkg.nu
 # After msi is generated, you have to update winget-pkgs repo, you'll need to patch the release
 # by deleting the existing msi and uploading this new msi. Then you'll need to update the hash
 # on the winget-pkgs PR. To generate the hash, run this command
-# 17. open target\wix\nu-0.74.0-x86_64-pc-windows-msvc.msi | hash sha256
+# 15. open target\wix\nu-0.74.0-x86_64-pc-windows-msvc.msi | hash sha256
 # Then, just take the output and put it in the winget-pkgs PR for the hash on the msi
 
 
@@ -48,31 +45,15 @@ let os = $env.OS
 let target = $env.TARGET
 # Repo source dir like `/home/runner/work/nushell/nushell`
 let src = $env.GITHUB_WORKSPACE
-let flags = $env.TARGET_RUSTFLAGS
 let dist = $'($env.GITHUB_WORKSPACE)/output'
 let version = (open Cargo.toml | get package.version)
 
 print $'Debugging info:'
-print { version: $version, bin: $bin, os: $os, releaseType: $env.RELEASE_TYPE, target: $target, src: $src, flags: $flags, dist: $dist }; hr-line -b
-
-# Rename the full release name so that we won't break the existing scripts for standard release downloading, such as:
-# curl -s https://api.github.com/repos/chmln/sd/releases/latest | grep browser_download_url | cut -d '"' -f 4 | grep x86_64-unknown-linux-musl
-const FULL_RLS_NAMING = {
-    x86_64-apple-darwin: 'x86_64-darwin-full',
-    aarch64-apple-darwin: 'aarch64-darwin-full',
-    x86_64-unknown-linux-gnu: 'x86_64-linux-gnu-full',
-    x86_64-pc-windows-msvc: 'x86_64-windows-msvc-full',
-    x86_64-unknown-linux-musl: 'x86_64-linux-musl-full',
-    aarch64-unknown-linux-gnu: 'aarch64-linux-gnu-full',
-    aarch64-pc-windows-msvc: 'aarch64-windows-msvc-full',
-    riscv64gc-unknown-linux-gnu: 'riscv64-linux-gnu-full',
-    armv7-unknown-linux-gnueabihf: 'armv7-linux-gnueabihf-full',
-}
+print { version: $version, bin: $bin, os: $os, target: $target, src: $src, dist: $dist }; hr-line -b
 
 # $env
 
 let USE_UBUNTU = $os starts-with ubuntu
-let FULL_NAME = $FULL_RLS_NAMING | get -i $target | default 'unknown-target-full'
 
 print $'(char nl)Packaging ($bin) v($version) for ($target) in ($src)...'; hr-line -b
 if not ('Cargo.lock' | path exists) { cargo generate-lockfile }
@@ -91,23 +72,23 @@ if $os in ['macos-latest'] or $USE_UBUNTU {
         'aarch64-unknown-linux-gnu' => {
             sudo apt-get install gcc-aarch64-linux-gnu -y
             $env.CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER = 'aarch64-linux-gnu-gcc'
-            cargo-build-nu $flags
+            cargo-build-nu
         }
         'riscv64gc-unknown-linux-gnu' => {
             sudo apt-get install gcc-riscv64-linux-gnu -y
             $env.CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_LINKER = 'riscv64-linux-gnu-gcc'
-            cargo-build-nu $flags
+            cargo-build-nu
         }
         'armv7-unknown-linux-gnueabihf' => {
             sudo apt-get install pkg-config gcc-arm-linux-gnueabihf -y
             $env.CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER = 'arm-linux-gnueabihf-gcc'
-            cargo-build-nu $flags
+            cargo-build-nu
         }
         _ => {
             # musl-tools to fix 'Failed to find tool. Is `musl-gcc` installed?'
             # Actually just for x86_64-unknown-linux-musl target
             if $USE_UBUNTU { sudo apt install musl-tools -y }
-            cargo-build-nu $flags
+            cargo-build-nu
         }
     }
 }
@@ -116,7 +97,7 @@ if $os in ['macos-latest'] or $USE_UBUNTU {
 # Build for Windows without static-link-openssl feature
 # ----------------------------------------------------------------------------
 if $os in ['windows-latest'] {
-    cargo-build-nu $flags
+    cargo-build-nu
 }
 
 # ----------------------------------------------------------------------------
@@ -162,7 +143,7 @@ cd $dist; print $'(char nl)Creating release archive...'; hr-line
 if $os in ['macos-latest'] or $USE_UBUNTU {
 
     let files = (ls | get name)
-    let dest = if $env.RELEASE_TYPE == 'full' { $'($bin)-($version)-($FULL_NAME)' } else { $'($bin)-($version)-($target)' }
+    let dest = $'($bin)-($version)-($target)'
     let archive = $'($dist)/($dest).tar.gz'
 
     mkdir $dest
@@ -177,7 +158,7 @@ if $os in ['macos-latest'] or $USE_UBUNTU {
 
 } else if $os == 'windows-latest' {
 
-    let releaseStem = if $env.RELEASE_TYPE == 'full' { $'($bin)-($version)-($FULL_NAME)' } else { $'($bin)-($version)-($target)' }
+    let releaseStem = $'($bin)-($version)-($target)'
 
     print $'(char nl)Download less related stuffs...'; hr-line
     aria2c https://github.com/jftuga/less-Windows/releases/download/less-v608/less.exe -o less.exe
@@ -214,19 +195,11 @@ if $os in ['macos-latest'] or $USE_UBUNTU {
     }
 }
 
-def 'cargo-build-nu' [ options: string ] {
-    if ($options | str trim | is-empty) {
-        if $os == 'windows-latest' {
-            cargo build --release --all --target $target
-        } else {
-            cargo build --release --all --target $target --features=static-link-openssl
-        }
+def 'cargo-build-nu' [] {
+    if $os == 'windows-latest' {
+        cargo build --release --all --target $target
     } else {
-        if $os == 'windows-latest' {
-            cargo build --release --all --target $target $options
-        } else {
-            cargo build --release --all --target $target --features=static-link-openssl $options
-        }
+        cargo build --release --all --target $target --features=static-link-openssl
     }
 }
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ffe653bd22..fb1b384d54 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,41 +34,30 @@ jobs:
         include:
         - target: aarch64-apple-darwin
           os: macos-latest
-          target_rustflags: ''
         - target: x86_64-apple-darwin
           os: macos-latest
-          target_rustflags: ''
         - target: x86_64-pc-windows-msvc
           extra: 'bin'
           os: windows-latest
-          target_rustflags: ''
         - target: x86_64-pc-windows-msvc
           extra: msi
           os: windows-latest
-          target_rustflags: ''
         - target: aarch64-pc-windows-msvc
           extra: 'bin'
           os: windows-latest
-          target_rustflags: ''
         - target: aarch64-pc-windows-msvc
           extra: msi
           os: windows-latest
-          target_rustflags: ''
         - target: x86_64-unknown-linux-gnu
           os: ubuntu-20.04
-          target_rustflags: ''
         - target: x86_64-unknown-linux-musl
           os: ubuntu-20.04
-          target_rustflags: ''
         - target: aarch64-unknown-linux-gnu
           os: ubuntu-20.04
-          target_rustflags: ''
         - target: armv7-unknown-linux-gnueabihf
           os: ubuntu-20.04
-          target_rustflags: ''
         - target: riscv64gc-unknown-linux-gnu
           os: ubuntu-latest
-          target_rustflags: ''
 
     runs-on: ${{matrix.os}}
 
@@ -81,7 +70,7 @@ jobs:
 
     - name: Setup Rust toolchain
       uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
-      # WARN: Keep the rustflags to prevent from the winget submission error: `CAQuietExec:  Error 0xc0000135`
+      # WARN: Keep the rustflags to prevent from the winget submission error: `CAQuietExec: Error 0xc0000135`
       with:
         cache: false
         rustflags: ''
@@ -95,102 +84,10 @@ jobs:
       id: nu
       run: nu .github/workflows/release-pkg.nu
       env:
-        RELEASE_TYPE: standard
         OS: ${{ matrix.os }}
         REF: ${{ github.ref }}
         TARGET: ${{ matrix.target }}
         _EXTRA_: ${{ matrix.extra }}
-        TARGET_RUSTFLAGS: ${{ matrix.target_rustflags }}
-
-    # REF: https://github.com/marketplace/actions/gh-release
-    - name: Publish Archive
-      uses: softprops/action-gh-release@v2.0.5
-      if: ${{ startsWith(github.ref, 'refs/tags/') }}
-      with:
-        draft: true
-        files: ${{ steps.nu.outputs.archive }}
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  full:
-    name: Full
-
-    strategy:
-      fail-fast: false
-      matrix:
-        target:
-        - aarch64-apple-darwin
-        - x86_64-apple-darwin
-        - x86_64-pc-windows-msvc
-        - aarch64-pc-windows-msvc
-        - x86_64-unknown-linux-gnu
-        - x86_64-unknown-linux-musl
-        - aarch64-unknown-linux-gnu
-        extra: ['bin']
-        include:
-        - target: aarch64-apple-darwin
-          os: macos-latest
-          target_rustflags: '--features=dataframe'
-        - target: x86_64-apple-darwin
-          os: macos-latest
-          target_rustflags: '--features=dataframe'
-        - target: x86_64-pc-windows-msvc
-          extra: 'bin'
-          os: windows-latest
-          target_rustflags: '--features=dataframe'
-        - target: x86_64-pc-windows-msvc
-          extra: msi
-          os: windows-latest
-          target_rustflags: '--features=dataframe'
-        - target: aarch64-pc-windows-msvc
-          extra: 'bin'
-          os: windows-latest
-          target_rustflags: '--features=dataframe'
-        - target: aarch64-pc-windows-msvc
-          extra: msi
-          os: windows-latest
-          target_rustflags: '--features=dataframe'
-        - target: x86_64-unknown-linux-gnu
-          os: ubuntu-20.04
-          target_rustflags: '--features=dataframe'
-        - target: x86_64-unknown-linux-musl
-          os: ubuntu-20.04
-          target_rustflags: '--features=dataframe'
-        - target: aarch64-unknown-linux-gnu
-          os: ubuntu-20.04
-          target_rustflags: '--features=dataframe'
-
-    runs-on: ${{matrix.os}}
-
-    steps:
-    - uses: actions/checkout@v4.1.5
-
-    - name: Update Rust Toolchain Target
-      run: |
-        echo "targets = ['${{matrix.target}}']" >> rust-toolchain.toml
-
-    - name: Setup Rust toolchain
-      uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
-      # WARN: Keep the rustflags to prevent from the winget submission error: `CAQuietExec:  Error 0xc0000135`
-      with:
-        cache: false
-        rustflags: ''
-
-    - name: Setup Nushell
-      uses: hustcer/setup-nu@v3.10
-      with:
-        version: 0.93.0
-
-    - name: Release Nu Binary
-      id: nu
-      run: nu .github/workflows/release-pkg.nu
-      env:
-        RELEASE_TYPE: full
-        OS: ${{ matrix.os }}
-        REF: ${{ github.ref }}
-        TARGET: ${{ matrix.target }}
-        _EXTRA_: ${{ matrix.extra }}
-        TARGET_RUSTFLAGS: ${{ matrix.target_rustflags }}
 
     # REF: https://github.com/marketplace/actions/gh-release
     - name: Publish Archive
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d5cf758b56..6d7c256d4c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -71,11 +71,6 @@ Read cargo's documentation for more details: https://doc.rust-lang.org/cargo/ref
   cargo run
   ```
 
-- Build and run with dataframe support.
-  ```nushell
-  cargo run --features=dataframe
-  ```
-
 - Run Clippy on Nushell:
 
   ```nushell
@@ -93,11 +88,6 @@ Read cargo's documentation for more details: https://doc.rust-lang.org/cargo/ref
   cargo test --workspace
   ```
 
-  along with dataframe tests
-
-  ```nushell
-  cargo test --workspace --features=dataframe
-  ```
   or via the `toolkit.nu` command:
   ```nushell
   use toolkit.nu test
@@ -240,7 +230,7 @@ You can help us to make the review process a smooth experience:
     - Choose what simplifies having confidence in the conflict resolution and the review. **Merge commits in your branch are OK** in the squash model.
   - Feel free to notify your reviewers or affected PR authors if your change might cause larger conflicts with another change.
   - During the rollup of multiple PRs, we may choose to resolve merge conflicts and CI failures ourselves. (Allow maintainers to push to your branch to enable us to do this quickly.)
- 
+
 ## License
 
 We use the [MIT License](https://github.com/nushell/nushell/blob/main/LICENSE) in all of our Nushell projects. If you are including or referencing a crate that uses the [GPL License](https://www.gnu.org/licenses/gpl-3.0.en.html#license-text) unfortunately we will not be able to accept your PR.
diff --git a/Cargo.lock b/Cargo.lock
index ad5a1e3a76..fb792cbd2a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2782,7 +2782,6 @@ dependencies = [
  "nix",
  "nu-cli",
  "nu-cmd-base",
- "nu-cmd-dataframe",
  "nu-cmd-extra",
  "nu-cmd-lang",
  "nu-cmd-plugin",
@@ -2870,29 +2869,6 @@ dependencies = [
  "nu-protocol",
 ]
 
-[[package]]
-name = "nu-cmd-dataframe"
-version = "0.93.1"
-dependencies = [
- "chrono",
- "chrono-tz 0.8.6",
- "fancy-regex",
- "indexmap",
- "nu-cmd-lang",
- "nu-engine",
- "nu-parser",
- "nu-protocol",
- "num",
- "polars",
- "polars-arrow",
- "polars-io",
- "polars-ops",
- "polars-plan",
- "polars-utils",
- "serde",
- "sqlparser 0.45.0",
-]
-
 [[package]]
 name = "nu-cmd-extra"
 version = "0.93.1"
diff --git a/Cargo.toml b/Cargo.toml
index 2e9c7e0b0f..afc31383f9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,7 +32,6 @@ members = [
   "crates/nu-cmd-extra",
   "crates/nu-cmd-lang",
   "crates/nu-cmd-plugin",
-  "crates/nu-cmd-dataframe",
   "crates/nu-command",
   "crates/nu-color-config",
   "crates/nu-explore",
@@ -179,9 +178,6 @@ nu-cli = { path = "./crates/nu-cli", version = "0.93.1" }
 nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.93.1" }
 nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.93.1" }
 nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.93.1", optional = true }
-nu-cmd-dataframe = { path = "./crates/nu-cmd-dataframe", version = "0.93.1", features = [
-  "dataframe",
-], optional = true }
 nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.93.1" }
 nu-command = { path = "./crates/nu-command", version = "0.93.1" }
 nu-engine = { path = "./crates/nu-engine", version = "0.93.1" }
@@ -271,9 +267,6 @@ system-clipboard = [
 which-support = ["nu-command/which-support", "nu-cmd-lang/which-support"]
 trash-support = ["nu-command/trash-support", "nu-cmd-lang/trash-support"]
 
-# Dataframe feature for nushell
-dataframe = ["dep:nu-cmd-dataframe", "nu-cmd-lang/dataframe"]
-
 # SQLite commands for nushell
 sqlite = ["nu-command/sqlite", "nu-cmd-lang/sqlite"]
 
diff --git a/crates/nu-cmd-dataframe/Cargo.toml b/crates/nu-cmd-dataframe/Cargo.toml
deleted file mode 100644
index a156435a8d..0000000000
--- a/crates/nu-cmd-dataframe/Cargo.toml
+++ /dev/null
@@ -1,75 +0,0 @@
-[package]
-authors = ["The Nushell Project Developers"]
-description = "Nushell's dataframe commands based on polars."
-edition = "2021"
-license = "MIT"
-name = "nu-cmd-dataframe"
-repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-dataframe"
-version = "0.93.1"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[lib]
-bench = false
-
-[dependencies]
-nu-engine = { path = "../nu-engine", version = "0.93.1" }
-nu-parser = { path = "../nu-parser", version = "0.93.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.93.1" }
-
-# Potential dependencies for extras
-chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
-chrono-tz = { workspace = true }
-fancy-regex = { workspace = true }
-indexmap = { workspace = true }
-num = { version = "0.4", optional = true }
-serde = { workspace = true, features = ["derive"] }
-# keep sqlparser at 0.39.0 until we can update polars
-sqlparser = { version = "0.45", optional = true }
-polars-io = { version = "0.39", features = ["avro"], optional = true }
-polars-arrow = { version = "0.39", optional = true }
-polars-ops = { version = "0.39", optional = true }
-polars-plan = { version = "0.39", features = ["regex"], optional = true }
-polars-utils = { version = "0.39", optional = true }
-
-[dependencies.polars]
-features = [
-	"arg_where",
-	"checked_arithmetic",
-	"concat_str",
-	"cross_join",
-	"csv",
-	"cum_agg",
-	"dtype-categorical",
-	"dtype-datetime",
-	"dtype-struct",
-	"dtype-i8",
-	"dtype-i16",
-	"dtype-u8",
-	"dtype-u16",
-	"dynamic_group_by",
-	"ipc",
-	"is_in",
-	"json",
-	"lazy",
-	"object",
-	"parquet",
-	"random",
-	"rolling_window",
-	"rows",
-	"serde",
-	"serde-lazy",
-	"strings",
-	"temporal",
-	"to_dummies",
-]
-default-features = false
-optional = true
-version = "0.39"
-
-[features]
-dataframe = ["num", "polars", "polars-io", "polars-arrow", "polars-ops", "polars-plan", "polars-utils", "sqlparser"]
-default = []
-
-[dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.93.1" }
diff --git a/crates/nu-cmd-dataframe/LICENSE b/crates/nu-cmd-dataframe/LICENSE
deleted file mode 100644
index ae174e8595..0000000000
--- a/crates/nu-cmd-dataframe/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 - 2023 The Nushell Project Developers
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/crates/nu-cmd-dataframe/src/dataframe/README.md b/crates/nu-cmd-dataframe/src/dataframe/README.md
deleted file mode 100644
index 593217ede6..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Dataframe
-
-This dataframe directory holds all of the definitions of the dataframe data structures and commands.
-
-There are three sections of commands:
-
-* [eager](./eager)
-* [series](./series)
-* [values](./values)
-
-For more details see the
-[Nushell book section on dataframes](https://www.nushell.sh/book/dataframes.html)
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/append.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/append.rs
deleted file mode 100644
index c0be67ed6e..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/append.rs
+++ /dev/null
@@ -1,134 +0,0 @@
-use crate::dataframe::values::{Axis, Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct AppendDF;
-
-impl Command for AppendDF {
-    fn name(&self) -> &str {
-        "dfr append"
-    }
-
-    fn usage(&self) -> &str {
-        "Appends a new dataframe."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required("other", SyntaxShape::Any, "dataframe to be appended")
-            .switch("col", "appends in col orientation", Some('c'))
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Appends a dataframe as new columns",
-                example: r#"let a = ([[a b]; [1 2] [3 4]] | dfr into-df);
-    $a | dfr append $a"#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new(
-                                "a".to_string(),
-                                vec![Value::test_int(1), Value::test_int(3)],
-                            ),
-                            Column::new(
-                                "b".to_string(),
-                                vec![Value::test_int(2), Value::test_int(4)],
-                            ),
-                            Column::new(
-                                "a_x".to_string(),
-                                vec![Value::test_int(1), Value::test_int(3)],
-                            ),
-                            Column::new(
-                                "b_x".to_string(),
-                                vec![Value::test_int(2), Value::test_int(4)],
-                            ),
-                        ],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Appends a dataframe merging at the end of columns",
-                example: r#"let a = ([[a b]; [1 2] [3 4]] | dfr into-df);
-    $a | dfr append $a --col"#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new(
-                                "a".to_string(),
-                                vec![
-                                    Value::test_int(1),
-                                    Value::test_int(3),
-                                    Value::test_int(1),
-                                    Value::test_int(3),
-                                ],
-                            ),
-                            Column::new(
-                                "b".to_string(),
-                                vec![
-                                    Value::test_int(2),
-                                    Value::test_int(4),
-                                    Value::test_int(2),
-                                    Value::test_int(4),
-                                ],
-                            ),
-                        ],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let other: Value = call.req(engine_state, stack, 0)?;
-
-    let axis = if call.has_flag(engine_state, stack, "col")? {
-        Axis::Column
-    } else {
-        Axis::Row
-    };
-    let df_other = NuDataFrame::try_from_value(other)?;
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-
-    df.append_df(&df_other, axis, call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(AppendDF {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/cast.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/cast.rs
deleted file mode 100644
index be9c33a229..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/cast.rs
+++ /dev/null
@@ -1,195 +0,0 @@
-use crate::dataframe::values::{str_to_dtype, NuDataFrame, NuExpression, NuLazyFrame};
-use nu_engine::command_prelude::*;
-
-use polars::prelude::*;
-
-#[derive(Clone)]
-pub struct CastDF;
-
-impl Command for CastDF {
-    fn name(&self) -> &str {
-        "dfr cast"
-    }
-
-    fn usage(&self) -> &str {
-        "Cast a column to a different dtype."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_types(vec![
-                (
-                    Type::Custom("expression".into()),
-                    Type::Custom("expression".into()),
-                ),
-                (
-                    Type::Custom("dataframe".into()),
-                    Type::Custom("dataframe".into()),
-                ),
-            ])
-            .required(
-                "dtype",
-                SyntaxShape::String,
-                "The dtype to cast the column to",
-            )
-            .optional(
-                "column",
-                SyntaxShape::String,
-                "The column to cast. Required when used with a dataframe.",
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Cast a column in a dataframe to a different dtype",
-                example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr cast u8 a | dfr schema",
-                result: Some(Value::record(
-                    record! {
-                        "a" => Value::string("u8", Span::test_data()),
-                        "b" => Value::string("i64", Span::test_data()),
-                    },
-                    Span::test_data(),
-                )),
-            },
-            Example {
-                description: "Cast a column in a lazy dataframe to a different dtype",
-                example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr into-lazy | dfr cast u8 a | dfr schema",
-                result: Some(Value::record(
-                    record! {
-                        "a" => Value::string("u8", Span::test_data()),
-                        "b" => Value::string("i64", Span::test_data()),
-                    },
-                    Span::test_data(),
-                )),
-            },
-            Example {
-                description: "Cast a column in a expression to a different dtype",
-                example: r#"[[a b]; [1 2] [1 4]] | dfr into-df | dfr group-by a | dfr agg [ (dfr col b | dfr cast u8 | dfr min | dfr as "b_min") ] | dfr schema"#,
-                result: None
-            }
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let value = input.into_value(call.head)?;
-        if NuLazyFrame::can_downcast(&value) {
-            let (dtype, column_nm) = df_args(engine_state, stack, call)?;
-            let df = NuLazyFrame::try_from_value(value)?;
-            command_lazy(call, column_nm, dtype, df)
-        } else if NuDataFrame::can_downcast(&value) {
-            let (dtype, column_nm) = df_args(engine_state, stack, call)?;
-            let df = NuDataFrame::try_from_value(value)?;
-            command_eager(call, column_nm, dtype, df)
-        } else {
-            let dtype: String = call.req(engine_state, stack, 0)?;
-            let dtype = str_to_dtype(&dtype, call.head)?;
-
-            let expr = NuExpression::try_from_value(value)?;
-            let expr: NuExpression = expr.into_polars().cast(dtype).into();
-
-            Ok(PipelineData::Value(
-                NuExpression::into_value(expr, call.head),
-                None,
-            ))
-        }
-    }
-}
-
-fn df_args(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-) -> Result<(DataType, String), ShellError> {
-    let dtype = dtype_arg(engine_state, stack, call)?;
-    let column_nm: String =
-        call.opt(engine_state, stack, 1)?
-            .ok_or(ShellError::MissingParameter {
-                param_name: "column_name".into(),
-                span: call.head,
-            })?;
-    Ok((dtype, column_nm))
-}
-
-fn dtype_arg(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-) -> Result<DataType, ShellError> {
-    let dtype: String = call.req(engine_state, stack, 0)?;
-    str_to_dtype(&dtype, call.head)
-}
-
-fn command_lazy(
-    call: &Call,
-    column_nm: String,
-    dtype: DataType,
-    lazy: NuLazyFrame,
-) -> Result<PipelineData, ShellError> {
-    let column = col(&column_nm).cast(dtype);
-    let lazy = lazy.into_polars().with_columns(&[column]);
-    let lazy = NuLazyFrame::new(false, lazy);
-
-    Ok(PipelineData::Value(
-        NuLazyFrame::into_value(lazy, call.head)?,
-        None,
-    ))
-}
-
-fn command_eager(
-    call: &Call,
-    column_nm: String,
-    dtype: DataType,
-    nu_df: NuDataFrame,
-) -> Result<PipelineData, ShellError> {
-    let mut df = nu_df.df;
-    let column = df
-        .column(&column_nm)
-        .map_err(|e| ShellError::GenericError {
-            error: format!("{e}"),
-            msg: "".into(),
-            span: Some(call.head),
-            help: None,
-            inner: vec![],
-        })?;
-
-    let casted = column.cast(&dtype).map_err(|e| ShellError::GenericError {
-        error: format!("{e}"),
-        msg: "".into(),
-        span: Some(call.head),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let _ = df
-        .with_column(casted)
-        .map_err(|e| ShellError::GenericError {
-            error: format!("{e}"),
-            msg: "".into(),
-            span: Some(call.head),
-            help: None,
-            inner: vec![],
-        })?;
-
-    let df = NuDataFrame::new(false, df);
-    Ok(PipelineData::Value(df.into_value(call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(CastDF {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/columns.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/columns.rs
deleted file mode 100644
index c9167659b5..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/columns.rs
+++ /dev/null
@@ -1,73 +0,0 @@
-use crate::dataframe::values::NuDataFrame;
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct ColumnsDF;
-
-impl Command for ColumnsDF {
-    fn name(&self) -> &str {
-        "dfr columns"
-    }
-
-    fn usage(&self) -> &str {
-        "Show dataframe columns."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(Type::Custom("dataframe".into()), Type::Any)
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Dataframe columns",
-            example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr columns",
-            result: Some(Value::list(
-                vec![Value::test_string("a"), Value::test_string("b")],
-                Span::test_data(),
-            )),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-
-    let names: Vec<Value> = df
-        .as_ref()
-        .get_column_names()
-        .iter()
-        .map(|v| Value::string(*v, call.head))
-        .collect();
-
-    let names = Value::list(names, call.head);
-
-    Ok(PipelineData::Value(names, None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(ColumnsDF {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/drop.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/drop.rs
deleted file mode 100644
index 8f9d086947..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/drop.rs
+++ /dev/null
@@ -1,115 +0,0 @@
-use crate::dataframe::values::{utils::convert_columns, Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct DropDF;
-
-impl Command for DropDF {
-    fn name(&self) -> &str {
-        "dfr drop"
-    }
-
-    fn usage(&self) -> &str {
-        "Creates a new dataframe by dropping the selected columns."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .rest("rest", SyntaxShape::Any, "column names to be dropped")
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "drop column a",
-            example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr drop a",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "b".to_string(),
-                        vec![Value::test_int(2), Value::test_int(4)],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let columns: Vec<Value> = call.rest(engine_state, stack, 0)?;
-    let (col_string, col_span) = convert_columns(columns, call.head)?;
-
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-
-    let new_df = col_string
-        .first()
-        .ok_or_else(|| ShellError::GenericError {
-            error: "Empty names list".into(),
-            msg: "No column names were found".into(),
-            span: Some(col_span),
-            help: None,
-            inner: vec![],
-        })
-        .and_then(|col| {
-            df.as_ref()
-                .drop(&col.item)
-                .map_err(|e| ShellError::GenericError {
-                    error: "Error dropping column".into(),
-                    msg: e.to_string(),
-                    span: Some(col.span),
-                    help: None,
-                    inner: vec![],
-                })
-        })?;
-
-    // If there are more columns in the drop selection list, these
-    // are added from the resulting dataframe
-    col_string
-        .iter()
-        .skip(1)
-        .try_fold(new_df, |new_df, col| {
-            new_df
-                .drop(&col.item)
-                .map_err(|e| ShellError::GenericError {
-                    error: "Error dropping column".into(),
-                    msg: e.to_string(),
-                    span: Some(col.span),
-                    help: None,
-                    inner: vec![],
-                })
-        })
-        .map(|df| PipelineData::Value(NuDataFrame::dataframe_into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(DropDF {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/drop_duplicates.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/drop_duplicates.rs
deleted file mode 100644
index b2ae6f7cfc..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/drop_duplicates.rs
+++ /dev/null
@@ -1,119 +0,0 @@
-use crate::dataframe::values::{utils::convert_columns_string, Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-
-use polars::prelude::UniqueKeepStrategy;
-
-#[derive(Clone)]
-pub struct DropDuplicates;
-
-impl Command for DropDuplicates {
-    fn name(&self) -> &str {
-        "dfr drop-duplicates"
-    }
-
-    fn usage(&self) -> &str {
-        "Drops duplicate values in dataframe."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .optional(
-                "subset",
-                SyntaxShape::Table(vec![]),
-                "subset of columns to drop duplicates",
-            )
-            .switch("maintain", "maintain order", Some('m'))
-            .switch(
-                "last",
-                "keeps last duplicate value (by default keeps first)",
-                Some('l'),
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "drop duplicates",
-            example: "[[a b]; [1 2] [3 4] [1 2]] | dfr into-df | dfr drop-duplicates",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![Value::test_int(3), Value::test_int(1)],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![Value::test_int(4), Value::test_int(2)],
-                        ),
-                    ],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let columns: Option<Vec<Value>> = call.opt(engine_state, stack, 0)?;
-    let (subset, col_span) = match columns {
-        Some(cols) => {
-            let (agg_string, col_span) = convert_columns_string(cols, call.head)?;
-            (Some(agg_string), col_span)
-        }
-        None => (None, call.head),
-    };
-
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-
-    let subset_slice = subset.as_ref().map(|cols| &cols[..]);
-
-    let keep_strategy = if call.has_flag(engine_state, stack, "last")? {
-        UniqueKeepStrategy::Last
-    } else {
-        UniqueKeepStrategy::First
-    };
-
-    df.as_ref()
-        .unique(subset_slice, keep_strategy, None)
-        .map_err(|e| ShellError::GenericError {
-            error: "Error dropping duplicates".into(),
-            msg: e.to_string(),
-            span: Some(col_span),
-            help: None,
-            inner: vec![],
-        })
-        .map(|df| PipelineData::Value(NuDataFrame::dataframe_into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(DropDuplicates {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/drop_nulls.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/drop_nulls.rs
deleted file mode 100644
index 25a3907426..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/drop_nulls.rs
+++ /dev/null
@@ -1,137 +0,0 @@
-use crate::dataframe::values::{utils::convert_columns_string, Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct DropNulls;
-
-impl Command for DropNulls {
-    fn name(&self) -> &str {
-        "dfr drop-nulls"
-    }
-
-    fn usage(&self) -> &str {
-        "Drops null values in dataframe."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .optional(
-                "subset",
-                SyntaxShape::Table(vec![]),
-                "subset of columns to drop nulls",
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "drop null values in dataframe",
-                example: r#"let df = ([[a b]; [1 2] [3 0] [1 2]] | dfr into-df);
-    let res = ($df.b / $df.b);
-    let a = ($df | dfr with-column $res --name res);
-    $a | dfr drop-nulls"#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new(
-                                "a".to_string(),
-                                vec![Value::test_int(1), Value::test_int(1)],
-                            ),
-                            Column::new(
-                                "b".to_string(),
-                                vec![Value::test_int(2), Value::test_int(2)],
-                            ),
-                            Column::new(
-                                "res".to_string(),
-                                vec![Value::test_int(1), Value::test_int(1)],
-                            ),
-                        ],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "drop null values in dataframe",
-                example: r#"let s = ([1 2 0 0 3 4] | dfr into-df);
-    ($s / $s) | dfr drop-nulls"#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![Column::new(
-                            "div_0_0".to_string(),
-                            vec![
-                                Value::test_int(1),
-                                Value::test_int(1),
-                                Value::test_int(1),
-                                Value::test_int(1),
-                            ],
-                        )],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-
-    let columns: Option<Vec<Value>> = call.opt(engine_state, stack, 0)?;
-
-    let (subset, col_span) = match columns {
-        Some(cols) => {
-            let (agg_string, col_span) = convert_columns_string(cols, call.head)?;
-            (Some(agg_string), col_span)
-        }
-        None => (None, call.head),
-    };
-
-    let subset_slice = subset.as_ref().map(|cols| &cols[..]);
-
-    df.as_ref()
-        .drop_nulls(subset_slice)
-        .map_err(|e| ShellError::GenericError {
-            error: "Error dropping nulls".into(),
-            msg: e.to_string(),
-            span: Some(col_span),
-            help: None,
-            inner: vec![],
-        })
-        .map(|df| PipelineData::Value(NuDataFrame::dataframe_into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::super::WithColumn;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(DropNulls {}), Box::new(WithColumn {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/dtypes.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/dtypes.rs
deleted file mode 100644
index a572a49551..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/dtypes.rs
+++ /dev/null
@@ -1,104 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct DataTypes;
-
-impl Command for DataTypes {
-    fn name(&self) -> &str {
-        "dfr dtypes"
-    }
-
-    fn usage(&self) -> &str {
-        "Show dataframe data types."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Dataframe dtypes",
-            example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr dtypes",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "column".to_string(),
-                            vec![Value::test_string("a"), Value::test_string("b")],
-                        ),
-                        Column::new(
-                            "dtype".to_string(),
-                            vec![Value::test_string("i64"), Value::test_string("i64")],
-                        ),
-                    ],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-
-    let mut dtypes: Vec<Value> = Vec::new();
-    let names: Vec<Value> = df
-        .as_ref()
-        .get_column_names()
-        .iter()
-        .map(|v| {
-            let dtype = df
-                .as_ref()
-                .column(v)
-                .expect("using name from list of names from dataframe")
-                .dtype();
-
-            let dtype_str = dtype.to_string();
-
-            dtypes.push(Value::string(dtype_str, call.head));
-
-            Value::string(*v, call.head)
-        })
-        .collect();
-
-    let names_col = Column::new("column".to_string(), names);
-    let dtypes_col = Column::new("dtype".to_string(), dtypes);
-
-    NuDataFrame::try_from_columns(vec![names_col, dtypes_col], None)
-        .map(|df| PipelineData::Value(df.into_value(call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(DataTypes {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/dummies.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/dummies.rs
deleted file mode 100644
index f47f65a004..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/dummies.rs
+++ /dev/null
@@ -1,107 +0,0 @@
-use crate::dataframe::values::NuDataFrame;
-use nu_engine::command_prelude::*;
-
-use polars::{prelude::*, series::Series};
-
-#[derive(Clone)]
-pub struct Dummies;
-
-impl Command for Dummies {
-    fn name(&self) -> &str {
-        "dfr dummies"
-    }
-
-    fn usage(&self) -> &str {
-        "Creates a new dataframe with dummy variables."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .switch("drop-first", "Drop first row", Some('d'))
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Create new dataframe with dummy variables from a dataframe",
-                example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr dummies",
-                result: Some(
-                    NuDataFrame::try_from_series(
-                        vec![
-                            Series::new("a_1", &[1_u8, 0]),
-                            Series::new("a_3", &[0_u8, 1]),
-                            Series::new("b_2", &[1_u8, 0]),
-                            Series::new("b_4", &[0_u8, 1]),
-                        ],
-                        Span::test_data(),
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Create new dataframe with dummy variables from a series",
-                example: "[1 2 2 3 3] | dfr into-df | dfr dummies",
-                result: Some(
-                    NuDataFrame::try_from_series(
-                        vec![
-                            Series::new("0_1", &[1_u8, 0, 0, 0, 0]),
-                            Series::new("0_2", &[0_u8, 1, 1, 0, 0]),
-                            Series::new("0_3", &[0_u8, 0, 0, 1, 1]),
-                        ],
-                        Span::test_data(),
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let drop_first: bool = call.has_flag(engine_state, stack, "drop-first")?;
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-
-    df.as_ref()
-        .to_dummies(None, drop_first)
-        .map_err(|e| ShellError::GenericError {
-            error: "Error calculating dummies".into(),
-            msg: e.to_string(),
-            span: Some(call.head),
-            help: Some("The only allowed column types for dummies are String or Int".into()),
-            inner: vec![],
-        })
-        .map(|df| PipelineData::Value(NuDataFrame::dataframe_into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(Dummies {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/filter_with.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/filter_with.rs
deleted file mode 100644
index e0e94d10a0..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/filter_with.rs
+++ /dev/null
@@ -1,154 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuLazyFrame};
-use nu_engine::command_prelude::*;
-
-use polars::prelude::LazyFrame;
-
-#[derive(Clone)]
-pub struct FilterWith;
-
-impl Command for FilterWith {
-    fn name(&self) -> &str {
-        "dfr filter-with"
-    }
-
-    fn usage(&self) -> &str {
-        "Filters dataframe using a mask or expression as reference."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required(
-                "mask or expression",
-                SyntaxShape::Any,
-                "boolean mask used to filter data",
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe or lazyframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Filter dataframe using a bool mask",
-                example: r#"let mask = ([true false] | dfr into-df);
-    [[a b]; [1 2] [3 4]] | dfr into-df | dfr filter-with $mask"#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new("a".to_string(), vec![Value::test_int(1)]),
-                            Column::new("b".to_string(), vec![Value::test_int(2)]),
-                        ],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Filter dataframe using an expression",
-                example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr filter-with ((dfr col a) > 1)",
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new("a".to_string(), vec![Value::test_int(3)]),
-                            Column::new("b".to_string(), vec![Value::test_int(4)]),
-                        ],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let value = input.into_value(call.head)?;
-        if NuLazyFrame::can_downcast(&value) {
-            let df = NuLazyFrame::try_from_value(value)?;
-            command_lazy(engine_state, stack, call, df)
-        } else {
-            let df = NuDataFrame::try_from_value(value)?;
-            command_eager(engine_state, stack, call, df)
-        }
-    }
-}
-
-fn command_eager(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    df: NuDataFrame,
-) -> Result<PipelineData, ShellError> {
-    let mask_value: Value = call.req(engine_state, stack, 0)?;
-    let mask_span = mask_value.span();
-
-    if NuExpression::can_downcast(&mask_value) {
-        let expression = NuExpression::try_from_value(mask_value)?;
-        let lazy = NuLazyFrame::new(true, df.lazy());
-        let lazy = lazy.apply_with_expr(expression, LazyFrame::filter);
-
-        Ok(PipelineData::Value(
-            NuLazyFrame::into_value(lazy, call.head)?,
-            None,
-        ))
-    } else {
-        let mask = NuDataFrame::try_from_value(mask_value)?.as_series(mask_span)?;
-        let mask = mask.bool().map_err(|e| ShellError::GenericError {
-            error: "Error casting to bool".into(),
-            msg: e.to_string(),
-            span: Some(mask_span),
-            help: Some("Perhaps you want to use a series with booleans as mask".into()),
-            inner: vec![],
-        })?;
-
-        df.as_ref()
-            .filter(mask)
-            .map_err(|e| ShellError::GenericError {
-                error: "Error filtering dataframe".into(),
-                msg: e.to_string(),
-                span: Some(call.head),
-                help: Some("The only allowed column types for dummies are String or Int".into()),
-                inner: vec![],
-            })
-            .map(|df| PipelineData::Value(NuDataFrame::dataframe_into_value(df, call.head), None))
-    }
-}
-
-fn command_lazy(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    lazy: NuLazyFrame,
-) -> Result<PipelineData, ShellError> {
-    let expr: Value = call.req(engine_state, stack, 0)?;
-    let expr = NuExpression::try_from_value(expr)?;
-
-    let lazy = lazy.apply_with_expr(expr, LazyFrame::filter);
-
-    Ok(PipelineData::Value(
-        NuLazyFrame::into_value(lazy, call.head)?,
-        None,
-    ))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-    use crate::dataframe::expressions::ExprCol;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(FilterWith {}), Box::new(ExprCol {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/first.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/first.rs
deleted file mode 100644
index 14c86e8c40..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/first.rs
+++ /dev/null
@@ -1,144 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuExpression};
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct FirstDF;
-
-impl Command for FirstDF {
-    fn name(&self) -> &str {
-        "dfr first"
-    }
-
-    fn usage(&self) -> &str {
-        "Show only the first number of rows or create a first expression"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .optional(
-                "rows",
-                SyntaxShape::Int,
-                "starting from the front, the number of rows to return",
-            )
-            .input_output_types(vec![
-                (
-                    Type::Custom("expression".into()),
-                    Type::Custom("expression".into()),
-                ),
-                (
-                    Type::Custom("dataframe".into()),
-                    Type::Custom("dataframe".into()),
-                ),
-            ])
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Return the first row of a dataframe",
-                example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr first",
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new("a".to_string(), vec![Value::test_int(1)]),
-                            Column::new("b".to_string(), vec![Value::test_int(2)]),
-                        ],
-                        None,
-                    )
-                    .expect("should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Return the first two rows of a dataframe",
-                example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr first 2",
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new(
-                                "a".to_string(),
-                                vec![Value::test_int(1), Value::test_int(3)],
-                            ),
-                            Column::new(
-                                "b".to_string(),
-                                vec![Value::test_int(2), Value::test_int(4)],
-                            ),
-                        ],
-                        None,
-                    )
-                    .expect("should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Creates a first expression from a column",
-                example: "dfr col a | dfr first",
-                result: None,
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let value = input.into_value(call.head)?;
-        if NuDataFrame::can_downcast(&value) {
-            let df = NuDataFrame::try_from_value(value)?;
-            command(engine_state, stack, call, df)
-        } else {
-            let expr = NuExpression::try_from_value(value)?;
-            let expr: NuExpression = expr.into_polars().first().into();
-
-            Ok(PipelineData::Value(
-                NuExpression::into_value(expr, call.head),
-                None,
-            ))
-        }
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    df: NuDataFrame,
-) -> Result<PipelineData, ShellError> {
-    let rows: Option<usize> = call.opt(engine_state, stack, 0)?;
-    let rows = rows.unwrap_or(1);
-
-    let res = df.as_ref().head(Some(rows));
-    Ok(PipelineData::Value(
-        NuDataFrame::dataframe_into_value(res, call.head),
-        None,
-    ))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::{build_test_engine_state, test_dataframe_example};
-    use super::*;
-    use crate::dataframe::lazy::aggregate::LazyAggregate;
-    use crate::dataframe::lazy::groupby::ToLazyGroupBy;
-
-    #[test]
-    fn test_examples_dataframe() {
-        let mut engine_state = build_test_engine_state(vec![Box::new(FirstDF {})]);
-        test_dataframe_example(&mut engine_state, &FirstDF.examples()[0]);
-        test_dataframe_example(&mut engine_state, &FirstDF.examples()[1]);
-    }
-
-    #[test]
-    fn test_examples_expression() {
-        let mut engine_state = build_test_engine_state(vec![
-            Box::new(FirstDF {}),
-            Box::new(LazyAggregate {}),
-            Box::new(ToLazyGroupBy {}),
-        ]);
-        test_dataframe_example(&mut engine_state, &FirstDF.examples()[2]);
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/get.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/get.rs
deleted file mode 100644
index e8cf337864..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/get.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-use crate::dataframe::values::{utils::convert_columns_string, Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct GetDF;
-
-impl Command for GetDF {
-    fn name(&self) -> &str {
-        "dfr get"
-    }
-
-    fn usage(&self) -> &str {
-        "Creates dataframe with the selected columns."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .rest("rest", SyntaxShape::Any, "column names to sort dataframe")
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns the selected column",
-            example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr get a",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "a".to_string(),
-                        vec![Value::test_int(1), Value::test_int(3)],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let columns: Vec<Value> = call.rest(engine_state, stack, 0)?;
-    let (col_string, col_span) = convert_columns_string(columns, call.head)?;
-
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-
-    df.as_ref()
-        .select(col_string)
-        .map_err(|e| ShellError::GenericError {
-            error: "Error selecting columns".into(),
-            msg: e.to_string(),
-            span: Some(col_span),
-            help: None,
-            inner: vec![],
-        })
-        .map(|df| PipelineData::Value(NuDataFrame::dataframe_into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(GetDF {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/last.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/last.rs
deleted file mode 100644
index ff2c4f98a2..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/last.rs
+++ /dev/null
@@ -1,118 +0,0 @@
-use crate::dataframe::values::{utils::DEFAULT_ROWS, Column, NuDataFrame, NuExpression};
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct LastDF;
-
-impl Command for LastDF {
-    fn name(&self) -> &str {
-        "dfr last"
-    }
-
-    fn usage(&self) -> &str {
-        "Creates new dataframe with tail rows or creates a last expression."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .optional("rows", SyntaxShape::Int, "Number of rows for tail")
-            .input_output_types(vec![
-                (
-                    Type::Custom("expression".into()),
-                    Type::Custom("expression".into()),
-                ),
-                (
-                    Type::Custom("dataframe".into()),
-                    Type::Custom("dataframe".into()),
-                ),
-            ])
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Create new dataframe with last rows",
-                example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr last 1",
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new("a".to_string(), vec![Value::test_int(3)]),
-                            Column::new("b".to_string(), vec![Value::test_int(4)]),
-                        ],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Creates a last expression from a column",
-                example: "dfr col a | dfr last",
-                result: None,
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let value = input.into_value(call.head)?;
-        if NuDataFrame::can_downcast(&value) {
-            let df = NuDataFrame::try_from_value(value)?;
-            command(engine_state, stack, call, df)
-        } else {
-            let expr = NuExpression::try_from_value(value)?;
-            let expr: NuExpression = expr.into_polars().last().into();
-
-            Ok(PipelineData::Value(
-                NuExpression::into_value(expr, call.head),
-                None,
-            ))
-        }
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    df: NuDataFrame,
-) -> Result<PipelineData, ShellError> {
-    let rows: Option<usize> = call.opt(engine_state, stack, 0)?;
-    let rows = rows.unwrap_or(DEFAULT_ROWS);
-
-    let res = df.as_ref().tail(Some(rows));
-    Ok(PipelineData::Value(
-        NuDataFrame::dataframe_into_value(res, call.head),
-        None,
-    ))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::{build_test_engine_state, test_dataframe_example};
-    use super::*;
-    use crate::dataframe::lazy::aggregate::LazyAggregate;
-    use crate::dataframe::lazy::groupby::ToLazyGroupBy;
-
-    #[test]
-    fn test_examples_dataframe() {
-        let mut engine_state = build_test_engine_state(vec![Box::new(LastDF {})]);
-        test_dataframe_example(&mut engine_state, &LastDF.examples()[0]);
-    }
-
-    #[test]
-    fn test_examples_expression() {
-        let mut engine_state = build_test_engine_state(vec![
-            Box::new(LastDF {}),
-            Box::new(LazyAggregate {}),
-            Box::new(ToLazyGroupBy {}),
-        ]);
-        test_dataframe_example(&mut engine_state, &LastDF.examples()[1]);
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/list.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/list.rs
deleted file mode 100644
index 1cee694180..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/list.rs
+++ /dev/null
@@ -1,68 +0,0 @@
-use crate::dataframe::values::NuDataFrame;
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct ListDF;
-
-impl Command for ListDF {
-    fn name(&self) -> &str {
-        "dfr ls"
-    }
-
-    fn usage(&self) -> &str {
-        "Lists stored dataframes."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name()).category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Creates a new dataframe and shows it in the dataframe list",
-            example: r#"let test = ([[a b];[1 2] [3 4]] | dfr into-df);
-    ls"#,
-            result: None,
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let mut vals: Vec<(String, Value)> = vec![];
-
-        for overlay_frame in engine_state.active_overlays(&[]) {
-            for var in &overlay_frame.vars {
-                if let Ok(value) = stack.get_var(*var.1, call.head) {
-                    let name = String::from_utf8_lossy(var.0).to_string();
-                    vals.push((name, value));
-                }
-            }
-        }
-
-        let vals = vals
-            .into_iter()
-            .filter_map(|(name, value)| {
-                NuDataFrame::try_from_value(value).ok().map(|df| (name, df))
-            })
-            .map(|(name, df)| {
-                Value::record(
-                    record! {
-                        "name" => Value::string(name, call.head),
-                        "columns" => Value::int(df.as_ref().width() as i64, call.head),
-                        "rows" => Value::int(df.as_ref().height() as i64, call.head),
-                    },
-                    call.head,
-                )
-            })
-            .collect::<Vec<Value>>();
-
-        let list = Value::list(vals, call.head);
-
-        Ok(list.into_pipeline_data())
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/melt.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/melt.rs
deleted file mode 100644
index 6379e9270e..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/melt.rs
+++ /dev/null
@@ -1,248 +0,0 @@
-use crate::dataframe::values::{utils::convert_columns_string, Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct MeltDF;
-
-impl Command for MeltDF {
-    fn name(&self) -> &str {
-        "dfr melt"
-    }
-
-    fn usage(&self) -> &str {
-        "Unpivot a DataFrame from wide to long format."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required_named(
-                "columns",
-                SyntaxShape::Table(vec![]),
-                "column names for melting",
-                Some('c'),
-            )
-            .required_named(
-                "values",
-                SyntaxShape::Table(vec![]),
-                "column names used as value columns",
-                Some('v'),
-            )
-            .named(
-                "variable-name",
-                SyntaxShape::String,
-                "optional name for variable column",
-                Some('r'),
-            )
-            .named(
-                "value-name",
-                SyntaxShape::String,
-                "optional name for value column",
-                Some('l'),
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "melt dataframe",
-            example:
-                "[[a b c d]; [x 1 4 a] [y 2 5 b] [z 3 6 c]] | dfr into-df | dfr melt -c [b c] -v [a d]",
-            result: Some(
-                NuDataFrame::try_from_columns(vec![
-                    Column::new(
-                        "b".to_string(),
-                        vec![
-                            Value::test_int(1),
-                            Value::test_int(2),
-                            Value::test_int(3),
-                            Value::test_int(1),
-                            Value::test_int(2),
-                            Value::test_int(3),
-                        ],
-                    ),
-                    Column::new(
-                        "c".to_string(),
-                        vec![
-                            Value::test_int(4),
-                            Value::test_int(5),
-                            Value::test_int(6),
-                            Value::test_int(4),
-                            Value::test_int(5),
-                            Value::test_int(6),
-                        ],
-                    ),
-                    Column::new(
-                        "variable".to_string(),
-                        vec![
-                            Value::test_string("a"),
-                            Value::test_string("a"),
-                            Value::test_string("a"),
-                            Value::test_string("d"),
-                            Value::test_string("d"),
-                            Value::test_string("d"),
-                        ],
-                    ),
-                    Column::new(
-                        "value".to_string(),
-                        vec![
-                            Value::test_string("x"),
-                            Value::test_string("y"),
-                            Value::test_string("z"),
-                            Value::test_string("a"),
-                            Value::test_string("b"),
-                            Value::test_string("c"),
-                        ],
-                    ),
-                ], None)
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let id_col: Vec<Value> = call
-        .get_flag(engine_state, stack, "columns")?
-        .expect("required value");
-    let val_col: Vec<Value> = call
-        .get_flag(engine_state, stack, "values")?
-        .expect("required value");
-
-    let value_name: Option<Spanned<String>> = call.get_flag(engine_state, stack, "value-name")?;
-    let variable_name: Option<Spanned<String>> =
-        call.get_flag(engine_state, stack, "variable-name")?;
-
-    let (id_col_string, id_col_span) = convert_columns_string(id_col, call.head)?;
-    let (val_col_string, val_col_span) = convert_columns_string(val_col, call.head)?;
-
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-
-    check_column_datatypes(df.as_ref(), &id_col_string, id_col_span)?;
-    check_column_datatypes(df.as_ref(), &val_col_string, val_col_span)?;
-
-    let mut res = df
-        .as_ref()
-        .melt(&id_col_string, &val_col_string)
-        .map_err(|e| ShellError::GenericError {
-            error: "Error calculating melt".into(),
-            msg: e.to_string(),
-            span: Some(call.head),
-            help: None,
-            inner: vec![],
-        })?;
-
-    if let Some(name) = &variable_name {
-        res.rename("variable", &name.item)
-            .map_err(|e| ShellError::GenericError {
-                error: "Error renaming column".into(),
-                msg: e.to_string(),
-                span: Some(name.span),
-                help: None,
-                inner: vec![],
-            })?;
-    }
-
-    if let Some(name) = &value_name {
-        res.rename("value", &name.item)
-            .map_err(|e| ShellError::GenericError {
-                error: "Error renaming column".into(),
-                msg: e.to_string(),
-                span: Some(name.span),
-                help: None,
-                inner: vec![],
-            })?;
-    }
-
-    Ok(PipelineData::Value(
-        NuDataFrame::dataframe_into_value(res, call.head),
-        None,
-    ))
-}
-
-fn check_column_datatypes<T: AsRef<str>>(
-    df: &polars::prelude::DataFrame,
-    cols: &[T],
-    col_span: Span,
-) -> Result<(), ShellError> {
-    if cols.is_empty() {
-        return Err(ShellError::GenericError {
-            error: "Merge error".into(),
-            msg: "empty column list".into(),
-            span: Some(col_span),
-            help: None,
-            inner: vec![],
-        });
-    }
-
-    // Checking if they are same type
-    if cols.len() > 1 {
-        for w in cols.windows(2) {
-            let l_series = df
-                .column(w[0].as_ref())
-                .map_err(|e| ShellError::GenericError {
-                    error: "Error selecting columns".into(),
-                    msg: e.to_string(),
-                    span: Some(col_span),
-                    help: None,
-                    inner: vec![],
-                })?;
-
-            let r_series = df
-                .column(w[1].as_ref())
-                .map_err(|e| ShellError::GenericError {
-                    error: "Error selecting columns".into(),
-                    msg: e.to_string(),
-                    span: Some(col_span),
-                    help: None,
-                    inner: vec![],
-                })?;
-
-            if l_series.dtype() != r_series.dtype() {
-                return Err(ShellError::GenericError {
-                    error: "Merge error".into(),
-                    msg: "found different column types in list".into(),
-                    span: Some(col_span),
-                    help: Some(format!(
-                        "datatypes {} and {} are incompatible",
-                        l_series.dtype(),
-                        r_series.dtype()
-                    )),
-                    inner: vec![],
-                });
-            }
-        }
-    }
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(MeltDF {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/mod.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/mod.rs
deleted file mode 100644
index db7a5c9312..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/mod.rs
+++ /dev/null
@@ -1,114 +0,0 @@
-mod append;
-mod cast;
-mod columns;
-mod drop;
-mod drop_duplicates;
-mod drop_nulls;
-mod dtypes;
-mod dummies;
-mod filter_with;
-mod first;
-mod get;
-mod last;
-mod list;
-mod melt;
-mod open;
-mod query_df;
-mod rename;
-mod sample;
-mod schema;
-mod shape;
-mod slice;
-mod sql_context;
-mod sql_expr;
-mod summary;
-mod take;
-mod to_arrow;
-mod to_avro;
-mod to_csv;
-mod to_df;
-mod to_json_lines;
-mod to_nu;
-mod to_parquet;
-mod with_column;
-
-use nu_protocol::engine::StateWorkingSet;
-
-pub use self::open::OpenDataFrame;
-pub use append::AppendDF;
-pub use cast::CastDF;
-pub use columns::ColumnsDF;
-pub use drop::DropDF;
-pub use drop_duplicates::DropDuplicates;
-pub use drop_nulls::DropNulls;
-pub use dtypes::DataTypes;
-pub use dummies::Dummies;
-pub use filter_with::FilterWith;
-pub use first::FirstDF;
-pub use get::GetDF;
-pub use last::LastDF;
-pub use list::ListDF;
-pub use melt::MeltDF;
-pub use query_df::QueryDf;
-pub use rename::RenameDF;
-pub use sample::SampleDF;
-pub use schema::SchemaDF;
-pub use shape::ShapeDF;
-pub use slice::SliceDF;
-pub use sql_context::SQLContext;
-pub use summary::Summary;
-pub use take::TakeDF;
-pub use to_arrow::ToArrow;
-pub use to_avro::ToAvro;
-pub use to_csv::ToCSV;
-pub use to_df::ToDataFrame;
-pub use to_json_lines::ToJsonLines;
-pub use to_nu::ToNu;
-pub use to_parquet::ToParquet;
-pub use with_column::WithColumn;
-
-pub fn add_eager_decls(working_set: &mut StateWorkingSet) {
-    macro_rules! bind_command {
-            ( $command:expr ) => {
-                working_set.add_decl(Box::new($command));
-            };
-            ( $( $command:expr ),* ) => {
-                $( working_set.add_decl(Box::new($command)); )*
-            };
-        }
-
-    // Dataframe commands
-    bind_command!(
-        AppendDF,
-        CastDF,
-        ColumnsDF,
-        DataTypes,
-        Summary,
-        DropDF,
-        DropDuplicates,
-        DropNulls,
-        Dummies,
-        FilterWith,
-        FirstDF,
-        GetDF,
-        LastDF,
-        ListDF,
-        MeltDF,
-        OpenDataFrame,
-        QueryDf,
-        RenameDF,
-        SampleDF,
-        SchemaDF,
-        ShapeDF,
-        SliceDF,
-        TakeDF,
-        ToArrow,
-        ToAvro,
-        ToCSV,
-        ToDataFrame,
-        ToNu,
-        ToParquet,
-        ToJsonLines,
-        WithColumn
-    );
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/open.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/open.rs
deleted file mode 100644
index 38d0d0c49f..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/open.rs
+++ /dev/null
@@ -1,518 +0,0 @@
-use crate::dataframe::values::{NuDataFrame, NuLazyFrame, NuSchema};
-use nu_engine::command_prelude::*;
-
-use polars::prelude::{
-    CsvEncoding, CsvReader, IpcReader, JsonFormat, JsonReader, LazyCsvReader, LazyFileListReader,
-    LazyFrame, ParallelStrategy, ParquetReader, ScanArgsIpc, ScanArgsParquet, SerReader,
-};
-use polars_io::{avro::AvroReader, HiveOptions};
-use std::{fs::File, io::BufReader, path::PathBuf};
-
-#[derive(Clone)]
-pub struct OpenDataFrame;
-
-impl Command for OpenDataFrame {
-    fn name(&self) -> &str {
-        "dfr open"
-    }
-
-    fn usage(&self) -> &str {
-        "Opens CSV, JSON, JSON lines, arrow, avro, or parquet file to create dataframe."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required(
-                "file",
-                SyntaxShape::Filepath,
-                "file path to load values from",
-            )
-            .switch("lazy", "creates a lazy dataframe", Some('l'))
-            .named(
-                "type",
-                SyntaxShape::String,
-                "File type: csv, tsv, json, parquet, arrow, avro. If omitted, derive from file extension",
-                Some('t'),
-            )
-            .named(
-                "delimiter",
-                SyntaxShape::String,
-                "file delimiter character. CSV file",
-                Some('d'),
-            )
-            .switch(
-                "no-header",
-                "Indicates if file doesn't have header. CSV file",
-                None,
-            )
-            .named(
-                "infer-schema",
-                SyntaxShape::Number,
-                "Number of rows to infer the schema of the file. CSV file",
-                None,
-            )
-            .named(
-                "skip-rows",
-                SyntaxShape::Number,
-                "Number of rows to skip from file. CSV file",
-                None,
-            )
-            .named(
-                "columns",
-                SyntaxShape::List(Box::new(SyntaxShape::String)),
-                "Columns to be selected from csv file. CSV and Parquet file",
-                None,
-            )
-            .named(
-                "schema",
-                SyntaxShape::Record(vec![]),
-                r#"Polars Schema in format [{name: str}]. CSV, JSON, and JSONL files"#,
-                Some('s')
-            )
-            .input_output_type(Type::Any, Type::Custom("dataframe".into()))
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Takes a file name and creates a dataframe",
-            example: "dfr open test.csv",
-            result: None,
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-) -> Result<PipelineData, ShellError> {
-    let file: Spanned<PathBuf> = call.req(engine_state, stack, 0)?;
-
-    let type_option: Option<Spanned<String>> = call.get_flag(engine_state, stack, "type")?;
-
-    let type_id = match &type_option {
-        Some(ref t) => Some((t.item.to_owned(), "Invalid type", t.span)),
-        None => file.item.extension().map(|e| {
-            (
-                e.to_string_lossy().into_owned(),
-                "Invalid extension",
-                file.span,
-            )
-        }),
-    };
-
-    match type_id {
-        Some((e, msg, blamed)) => match e.as_str() {
-            "csv" | "tsv" => from_csv(engine_state, stack, call),
-            "parquet" | "parq" => from_parquet(engine_state, stack, call),
-            "ipc" | "arrow" => from_ipc(engine_state, stack, call),
-            "json" => from_json(engine_state, stack, call),
-            "jsonl" => from_jsonl(engine_state, stack, call),
-            "avro" => from_avro(engine_state, stack, call),
-            _ => Err(ShellError::FileNotFoundCustom {
-                msg: format!(
-                    "{msg}. Supported values: csv, tsv, parquet, ipc, arrow, json, jsonl, avro"
-                ),
-                span: blamed,
-            }),
-        },
-        None => Err(ShellError::FileNotFoundCustom {
-            msg: "File without extension".into(),
-            span: file.span,
-        }),
-    }
-    .map(|value| PipelineData::Value(value, None))
-}
-
-fn from_parquet(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-) -> Result<Value, ShellError> {
-    if call.has_flag(engine_state, stack, "lazy")? {
-        let file: String = call.req(engine_state, stack, 0)?;
-        let args = ScanArgsParquet {
-            n_rows: None,
-            cache: true,
-            parallel: ParallelStrategy::Auto,
-            rechunk: false,
-            row_index: None,
-            low_memory: false,
-            cloud_options: None,
-            use_statistics: false,
-            hive_options: HiveOptions::default(),
-        };
-
-        let df: NuLazyFrame = LazyFrame::scan_parquet(file, args)
-            .map_err(|e| ShellError::GenericError {
-                error: "Parquet reader error".into(),
-                msg: format!("{e:?}"),
-                span: Some(call.head),
-                help: None,
-                inner: vec![],
-            })?
-            .into();
-
-        df.into_value(call.head)
-    } else {
-        let file: Spanned<PathBuf> = call.req(engine_state, stack, 0)?;
-        let columns: Option<Vec<String>> = call.get_flag(engine_state, stack, "columns")?;
-
-        let r = File::open(&file.item).map_err(|e| ShellError::GenericError {
-            error: "Error opening file".into(),
-            msg: e.to_string(),
-            span: Some(file.span),
-            help: None,
-            inner: vec![],
-        })?;
-        let reader = ParquetReader::new(r);
-
-        let reader = match columns {
-            None => reader,
-            Some(columns) => reader.with_columns(Some(columns)),
-        };
-
-        let df: NuDataFrame = reader
-            .finish()
-            .map_err(|e| ShellError::GenericError {
-                error: "Parquet reader error".into(),
-                msg: format!("{e:?}"),
-                span: Some(call.head),
-                help: None,
-                inner: vec![],
-            })?
-            .into();
-
-        Ok(df.into_value(call.head))
-    }
-}
-
-fn from_avro(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-) -> Result<Value, ShellError> {
-    let file: Spanned<PathBuf> = call.req(engine_state, stack, 0)?;
-    let columns: Option<Vec<String>> = call.get_flag(engine_state, stack, "columns")?;
-
-    let r = File::open(&file.item).map_err(|e| ShellError::GenericError {
-        error: "Error opening file".into(),
-        msg: e.to_string(),
-        span: Some(file.span),
-        help: None,
-        inner: vec![],
-    })?;
-    let reader = AvroReader::new(r);
-
-    let reader = match columns {
-        None => reader,
-        Some(columns) => reader.with_columns(Some(columns)),
-    };
-
-    let df: NuDataFrame = reader
-        .finish()
-        .map_err(|e| ShellError::GenericError {
-            error: "Avro reader error".into(),
-            msg: format!("{e:?}"),
-            span: Some(call.head),
-            help: None,
-            inner: vec![],
-        })?
-        .into();
-
-    Ok(df.into_value(call.head))
-}
-
-fn from_ipc(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-) -> Result<Value, ShellError> {
-    if call.has_flag(engine_state, stack, "lazy")? {
-        let file: String = call.req(engine_state, stack, 0)?;
-        let args = ScanArgsIpc {
-            n_rows: None,
-            cache: true,
-            rechunk: false,
-            row_index: None,
-            memory_map: true,
-            cloud_options: None,
-        };
-
-        let df: NuLazyFrame = LazyFrame::scan_ipc(file, args)
-            .map_err(|e| ShellError::GenericError {
-                error: "IPC reader error".into(),
-                msg: format!("{e:?}"),
-                span: Some(call.head),
-                help: None,
-                inner: vec![],
-            })?
-            .into();
-
-        df.into_value(call.head)
-    } else {
-        let file: Spanned<PathBuf> = call.req(engine_state, stack, 0)?;
-        let columns: Option<Vec<String>> = call.get_flag(engine_state, stack, "columns")?;
-
-        let r = File::open(&file.item).map_err(|e| ShellError::GenericError {
-            error: "Error opening file".into(),
-            msg: e.to_string(),
-            span: Some(file.span),
-            help: None,
-            inner: vec![],
-        })?;
-        let reader = IpcReader::new(r);
-
-        let reader = match columns {
-            None => reader,
-            Some(columns) => reader.with_columns(Some(columns)),
-        };
-
-        let df: NuDataFrame = reader
-            .finish()
-            .map_err(|e| ShellError::GenericError {
-                error: "IPC reader error".into(),
-                msg: format!("{e:?}"),
-                span: Some(call.head),
-                help: None,
-                inner: vec![],
-            })?
-            .into();
-
-        Ok(df.into_value(call.head))
-    }
-}
-
-fn from_json(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-) -> Result<Value, ShellError> {
-    let file: Spanned<PathBuf> = call.req(engine_state, stack, 0)?;
-    let file = File::open(&file.item).map_err(|e| ShellError::GenericError {
-        error: "Error opening file".into(),
-        msg: e.to_string(),
-        span: Some(file.span),
-        help: None,
-        inner: vec![],
-    })?;
-    let maybe_schema = call
-        .get_flag(engine_state, stack, "schema")?
-        .map(|schema| NuSchema::try_from(&schema))
-        .transpose()?;
-
-    let buf_reader = BufReader::new(file);
-    let reader = JsonReader::new(buf_reader);
-
-    let reader = match maybe_schema {
-        Some(schema) => reader.with_schema(schema.into()),
-        None => reader,
-    };
-
-    let df: NuDataFrame = reader
-        .finish()
-        .map_err(|e| ShellError::GenericError {
-            error: "Json reader error".into(),
-            msg: format!("{e:?}"),
-            span: Some(call.head),
-            help: None,
-            inner: vec![],
-        })?
-        .into();
-
-    Ok(df.into_value(call.head))
-}
-
-fn from_jsonl(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-) -> Result<Value, ShellError> {
-    let infer_schema: Option<usize> = call.get_flag(engine_state, stack, "infer-schema")?;
-    let maybe_schema = call
-        .get_flag(engine_state, stack, "schema")?
-        .map(|schema| NuSchema::try_from(&schema))
-        .transpose()?;
-    let file: Spanned<PathBuf> = call.req(engine_state, stack, 0)?;
-    let file = File::open(&file.item).map_err(|e| ShellError::GenericError {
-        error: "Error opening file".into(),
-        msg: e.to_string(),
-        span: Some(file.span),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let buf_reader = BufReader::new(file);
-    let reader = JsonReader::new(buf_reader)
-        .with_json_format(JsonFormat::JsonLines)
-        .infer_schema_len(infer_schema);
-
-    let reader = match maybe_schema {
-        Some(schema) => reader.with_schema(schema.into()),
-        None => reader,
-    };
-
-    let df: NuDataFrame = reader
-        .finish()
-        .map_err(|e| ShellError::GenericError {
-            error: "Json lines reader error".into(),
-            msg: format!("{e:?}"),
-            span: Some(call.head),
-            help: None,
-            inner: vec![],
-        })?
-        .into();
-
-    Ok(df.into_value(call.head))
-}
-
-fn from_csv(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-) -> Result<Value, ShellError> {
-    let delimiter: Option<Spanned<String>> = call.get_flag(engine_state, stack, "delimiter")?;
-    let no_header: bool = call.has_flag(engine_state, stack, "no-header")?;
-    let infer_schema: Option<usize> = call.get_flag(engine_state, stack, "infer-schema")?;
-    let skip_rows: Option<usize> = call.get_flag(engine_state, stack, "skip-rows")?;
-    let columns: Option<Vec<String>> = call.get_flag(engine_state, stack, "columns")?;
-
-    let maybe_schema = call
-        .get_flag(engine_state, stack, "schema")?
-        .map(|schema| NuSchema::try_from(&schema))
-        .transpose()?;
-
-    if call.has_flag(engine_state, stack, "lazy")? {
-        let file: String = call.req(engine_state, stack, 0)?;
-        let csv_reader = LazyCsvReader::new(file);
-
-        let csv_reader = match delimiter {
-            None => csv_reader,
-            Some(d) => {
-                if d.item.len() != 1 {
-                    return Err(ShellError::GenericError {
-                        error: "Incorrect delimiter".into(),
-                        msg: "Delimiter has to be one character".into(),
-                        span: Some(d.span),
-                        help: None,
-                        inner: vec![],
-                    });
-                } else {
-                    let delimiter = match d.item.chars().next() {
-                        Some(d) => d as u8,
-                        None => unreachable!(),
-                    };
-                    csv_reader.with_separator(delimiter)
-                }
-            }
-        };
-
-        let csv_reader = csv_reader.has_header(!no_header);
-
-        let csv_reader = match maybe_schema {
-            Some(schema) => csv_reader.with_schema(Some(schema.into())),
-            None => csv_reader,
-        };
-
-        let csv_reader = match infer_schema {
-            None => csv_reader,
-            Some(r) => csv_reader.with_infer_schema_length(Some(r)),
-        };
-
-        let csv_reader = match skip_rows {
-            None => csv_reader,
-            Some(r) => csv_reader.with_skip_rows(r),
-        };
-
-        let df: NuLazyFrame = csv_reader
-            .finish()
-            .map_err(|e| ShellError::GenericError {
-                error: "Parquet reader error".into(),
-                msg: format!("{e:?}"),
-                span: Some(call.head),
-                help: None,
-                inner: vec![],
-            })?
-            .into();
-
-        df.into_value(call.head)
-    } else {
-        let file: Spanned<PathBuf> = call.req(engine_state, stack, 0)?;
-        let csv_reader = CsvReader::from_path(&file.item)
-            .map_err(|e| ShellError::GenericError {
-                error: "Error creating CSV reader".into(),
-                msg: e.to_string(),
-                span: Some(file.span),
-                help: None,
-                inner: vec![],
-            })?
-            .with_encoding(CsvEncoding::LossyUtf8);
-
-        let csv_reader = match delimiter {
-            None => csv_reader,
-            Some(d) => {
-                if d.item.len() != 1 {
-                    return Err(ShellError::GenericError {
-                        error: "Incorrect delimiter".into(),
-                        msg: "Delimiter has to be one character".into(),
-                        span: Some(d.span),
-                        help: None,
-                        inner: vec![],
-                    });
-                } else {
-                    let delimiter = match d.item.chars().next() {
-                        Some(d) => d as u8,
-                        None => unreachable!(),
-                    };
-                    csv_reader.with_separator(delimiter)
-                }
-            }
-        };
-
-        let csv_reader = csv_reader.has_header(!no_header);
-
-        let csv_reader = match maybe_schema {
-            Some(schema) => csv_reader.with_schema(Some(schema.into())),
-            None => csv_reader,
-        };
-
-        let csv_reader = match infer_schema {
-            None => csv_reader,
-            Some(r) => csv_reader.infer_schema(Some(r)),
-        };
-
-        let csv_reader = match skip_rows {
-            None => csv_reader,
-            Some(r) => csv_reader.with_skip_rows(r),
-        };
-
-        let csv_reader = match columns {
-            None => csv_reader,
-            Some(columns) => csv_reader.with_columns(Some(columns)),
-        };
-
-        let df: NuDataFrame = csv_reader
-            .finish()
-            .map_err(|e| ShellError::GenericError {
-                error: "Parquet reader error".into(),
-                msg: format!("{e:?}"),
-                span: Some(call.head),
-                help: None,
-                inner: vec![],
-            })?
-            .into();
-
-        Ok(df.into_value(call.head))
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/query_df.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/query_df.rs
deleted file mode 100644
index 4088e00afa..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/query_df.rs
+++ /dev/null
@@ -1,104 +0,0 @@
-use crate::dataframe::{
-    eager::SQLContext,
-    values::{Column, NuDataFrame, NuLazyFrame},
-};
-use nu_engine::command_prelude::*;
-
-// attribution:
-// sql_context.rs, and sql_expr.rs were copied from polars-sql. thank you.
-// maybe we should just use the crate at some point but it's not published yet.
-// https://github.com/pola-rs/polars/tree/master/polars-sql
-
-#[derive(Clone)]
-pub struct QueryDf;
-
-impl Command for QueryDf {
-    fn name(&self) -> &str {
-        "dfr query"
-    }
-
-    fn usage(&self) -> &str {
-        "Query dataframe using SQL. Note: The dataframe is always named 'df' in your query's from clause."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required("sql", SyntaxShape::String, "sql query")
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["dataframe", "sql", "search"]
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Query dataframe using SQL",
-            example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr query 'select a from df'",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "a".to_string(),
-                        vec![Value::test_int(1), Value::test_int(3)],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let sql_query: String = call.req(engine_state, stack, 0)?;
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-
-    let mut ctx = SQLContext::new();
-    ctx.register("df", &df.df);
-    let df_sql = ctx
-        .execute(&sql_query)
-        .map_err(|e| ShellError::GenericError {
-            error: "Dataframe Error".into(),
-            msg: e.to_string(),
-            span: Some(call.head),
-            help: None,
-            inner: vec![],
-        })?;
-    let lazy = NuLazyFrame::new(false, df_sql);
-
-    let eager = lazy.collect(call.head)?;
-    let value = Value::custom(Box::new(eager), call.head);
-
-    Ok(PipelineData::Value(value, None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(QueryDf {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/rename.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/rename.rs
deleted file mode 100644
index 0cb75f34f2..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/rename.rs
+++ /dev/null
@@ -1,185 +0,0 @@
-use crate::dataframe::{
-    utils::extract_strings,
-    values::{Column, NuDataFrame, NuLazyFrame},
-};
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct RenameDF;
-
-impl Command for RenameDF {
-    fn name(&self) -> &str {
-        "dfr rename"
-    }
-
-    fn usage(&self) -> &str {
-        "Rename a dataframe column."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required(
-                "columns",
-                SyntaxShape::Any,
-                "Column(s) to be renamed. A string or list of strings",
-            )
-            .required(
-                "new names",
-                SyntaxShape::Any,
-                "New names for the selected column(s). A string or list of strings",
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe or lazyframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Renames a series",
-                example: "[5 6 7 8] | dfr into-df | dfr rename '0' new_name",
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![Column::new(
-                            "new_name".to_string(),
-                            vec![
-                                Value::test_int(5),
-                                Value::test_int(6),
-                                Value::test_int(7),
-                                Value::test_int(8),
-                            ],
-                        )],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Renames a dataframe column",
-                example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr rename a a_new",
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new(
-                                "a_new".to_string(),
-                                vec![Value::test_int(1), Value::test_int(3)],
-                            ),
-                            Column::new(
-                                "b".to_string(),
-                                vec![Value::test_int(2), Value::test_int(4)],
-                            ),
-                        ],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Renames two dataframe columns",
-                example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr rename [a b] [a_new b_new]",
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new(
-                                "a_new".to_string(),
-                                vec![Value::test_int(1), Value::test_int(3)],
-                            ),
-                            Column::new(
-                                "b_new".to_string(),
-                                vec![Value::test_int(2), Value::test_int(4)],
-                            ),
-                        ],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let value = input.into_value(call.head)?;
-        if NuLazyFrame::can_downcast(&value) {
-            let df = NuLazyFrame::try_from_value(value)?;
-            command_lazy(engine_state, stack, call, df)
-        } else {
-            let df = NuDataFrame::try_from_value(value)?;
-            command_eager(engine_state, stack, call, df)
-        }
-    }
-}
-
-fn command_eager(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    mut df: NuDataFrame,
-) -> Result<PipelineData, ShellError> {
-    let columns: Value = call.req(engine_state, stack, 0)?;
-    let columns = extract_strings(columns)?;
-
-    let new_names: Value = call.req(engine_state, stack, 1)?;
-    let new_names = extract_strings(new_names)?;
-
-    for (from, to) in columns.iter().zip(new_names.iter()) {
-        df.as_mut()
-            .rename(from, to)
-            .map_err(|e| ShellError::GenericError {
-                error: "Error renaming".into(),
-                msg: e.to_string(),
-                span: Some(call.head),
-                help: None,
-                inner: vec![],
-            })?;
-    }
-
-    Ok(PipelineData::Value(df.into_value(call.head), None))
-}
-
-fn command_lazy(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    lazy: NuLazyFrame,
-) -> Result<PipelineData, ShellError> {
-    let columns: Value = call.req(engine_state, stack, 0)?;
-    let columns = extract_strings(columns)?;
-
-    let new_names: Value = call.req(engine_state, stack, 1)?;
-    let new_names = extract_strings(new_names)?;
-
-    if columns.len() != new_names.len() {
-        let value: Value = call.req(engine_state, stack, 1)?;
-        return Err(ShellError::IncompatibleParametersSingle {
-            msg: "New name list has different size to column list".into(),
-            span: value.span(),
-        });
-    }
-
-    let lazy = lazy.into_polars();
-    let lazy: NuLazyFrame = lazy.rename(&columns, &new_names).into();
-
-    Ok(PipelineData::Value(lazy.into_value(call.head)?, None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(RenameDF {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/sample.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/sample.rs
deleted file mode 100644
index 2387cca489..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/sample.rs
+++ /dev/null
@@ -1,127 +0,0 @@
-use crate::dataframe::values::NuDataFrame;
-use nu_engine::command_prelude::*;
-
-use polars::{prelude::NamedFrom, series::Series};
-
-#[derive(Clone)]
-pub struct SampleDF;
-
-impl Command for SampleDF {
-    fn name(&self) -> &str {
-        "dfr sample"
-    }
-
-    fn usage(&self) -> &str {
-        "Create sample dataframe."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .named(
-                "n-rows",
-                SyntaxShape::Int,
-                "number of rows to be taken from dataframe",
-                Some('n'),
-            )
-            .named(
-                "fraction",
-                SyntaxShape::Number,
-                "fraction of dataframe to be taken",
-                Some('f'),
-            )
-            .named(
-                "seed",
-                SyntaxShape::Number,
-                "seed for the selection",
-                Some('s'),
-            )
-            .switch("replace", "sample with replace", Some('e'))
-            .switch("shuffle", "shuffle sample", Some('u'))
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Sample rows from dataframe",
-                example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr sample --n-rows 1",
-                result: None, // No expected value because sampling is random
-            },
-            Example {
-                description: "Shows sample row using fraction and replace",
-                example:
-                    "[[a b]; [1 2] [3 4] [5 6]] | dfr into-df | dfr sample --fraction 0.5 --replace",
-                result: None, // No expected value because sampling is random
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let rows: Option<Spanned<i64>> = call.get_flag(engine_state, stack, "n-rows")?;
-    let fraction: Option<Spanned<f64>> = call.get_flag(engine_state, stack, "fraction")?;
-    let seed: Option<u64> = call
-        .get_flag::<i64>(engine_state, stack, "seed")?
-        .map(|val| val as u64);
-    let replace: bool = call.has_flag(engine_state, stack, "replace")?;
-    let shuffle: bool = call.has_flag(engine_state, stack, "shuffle")?;
-
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-
-    match (rows, fraction) {
-        (Some(rows), None) => df
-            .as_ref()
-            .sample_n(&Series::new("s", &[rows.item]), replace, shuffle, seed)
-            .map_err(|e| ShellError::GenericError {
-                error: "Error creating sample".into(),
-                msg: e.to_string(),
-                span: Some(rows.span),
-                help: None,
-                inner: vec![],
-            }),
-        (None, Some(frac)) => df
-            .as_ref()
-            .sample_frac(&Series::new("frac", &[frac.item]), replace, shuffle, seed)
-            .map_err(|e| ShellError::GenericError {
-                error: "Error creating sample".into(),
-                msg: e.to_string(),
-                span: Some(frac.span),
-                help: None,
-                inner: vec![],
-            }),
-        (Some(_), Some(_)) => Err(ShellError::GenericError {
-            error: "Incompatible flags".into(),
-            msg: "Only one selection criterion allowed".into(),
-            span: Some(call.head),
-            help: None,
-            inner: vec![],
-        }),
-        (None, None) => Err(ShellError::GenericError {
-            error: "No selection".into(),
-            msg: "No selection criterion was found".into(),
-            span: Some(call.head),
-            help: Some("Perhaps you want to use the flag -n or -f".into()),
-            inner: vec![],
-        }),
-    }
-    .map(|df| PipelineData::Value(NuDataFrame::dataframe_into_value(df, call.head), None))
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/schema.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/schema.rs
deleted file mode 100644
index cf887482bd..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/schema.rs
+++ /dev/null
@@ -1,112 +0,0 @@
-use crate::dataframe::values::NuDataFrame;
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct SchemaDF;
-
-impl Command for SchemaDF {
-    fn name(&self) -> &str {
-        "dfr schema"
-    }
-
-    fn usage(&self) -> &str {
-        "Show schema for a dataframe."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .switch("datatype-list", "creates a lazy dataframe", Some('l'))
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Dataframe schema",
-            example: r#"[[a b]; [1 "foo"] [3 "bar"]] | dfr into-df | dfr schema"#,
-            result: Some(Value::record(
-                record! {
-                    "a" => Value::string("i64", Span::test_data()),
-                    "b" => Value::string("str", Span::test_data()),
-                },
-                Span::test_data(),
-            )),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        if call.has_flag(engine_state, stack, "datatype-list")? {
-            Ok(PipelineData::Value(datatype_list(Span::unknown()), None))
-        } else {
-            command(engine_state, stack, call, input)
-        }
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let schema = df.schema();
-    let value: Value = schema.into();
-    Ok(PipelineData::Value(value, None))
-}
-
-fn datatype_list(span: Span) -> Value {
-    let types: Vec<Value> = [
-        ("null", ""),
-        ("bool", ""),
-        ("u8", ""),
-        ("u16", ""),
-        ("u32", ""),
-        ("u64", ""),
-        ("i8", ""),
-        ("i16", ""),
-        ("i32", ""),
-        ("i64", ""),
-        ("f32", ""),
-        ("f64", ""),
-        ("str", ""),
-        ("binary", ""),
-        ("date", ""),
-        ("datetime<time_unit: (ms, us, ns) timezone (optional)>", "Time Unit can be: milliseconds: ms, microseconds: us, nanoseconds: ns. Timezone wildcard is *. Other Timezone examples: UTC, America/Los_Angeles."),
-        ("duration<time_unit: (ms, us, ns)>", "Time Unit can be: milliseconds: ms, microseconds: us, nanoseconds: ns."),
-        ("time", ""),
-        ("object", ""),
-        ("unknown", ""),
-        ("list<dtype>", ""),
-    ]
-    .iter()
-    .map(|(dtype, note)| {
-        Value::record(record! {
-            "dtype" => Value::string(*dtype, span),
-            "note" => Value::string(*note, span),
-        },
-        span)
-    })
-    .collect();
-    Value::list(types, span)
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(SchemaDF {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/shape.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/shape.rs
deleted file mode 100644
index 6e5e7fa9d3..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/shape.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct ShapeDF;
-
-impl Command for ShapeDF {
-    fn name(&self) -> &str {
-        "dfr shape"
-    }
-
-    fn usage(&self) -> &str {
-        "Shows column and row size for a dataframe."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Shows row and column shape",
-            example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr shape",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new("rows".to_string(), vec![Value::test_int(2)]),
-                        Column::new("columns".to_string(), vec![Value::test_int(2)]),
-                    ],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-
-    let rows = Value::int(df.as_ref().height() as i64, call.head);
-
-    let cols = Value::int(df.as_ref().width() as i64, call.head);
-
-    let rows_col = Column::new("rows".to_string(), vec![rows]);
-    let cols_col = Column::new("columns".to_string(), vec![cols]);
-
-    NuDataFrame::try_from_columns(vec![rows_col, cols_col], None)
-        .map(|df| PipelineData::Value(df.into_value(call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(ShapeDF {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/slice.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/slice.rs
deleted file mode 100644
index 48906cba2c..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/slice.rs
+++ /dev/null
@@ -1,84 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct SliceDF;
-
-impl Command for SliceDF {
-    fn name(&self) -> &str {
-        "dfr slice"
-    }
-
-    fn usage(&self) -> &str {
-        "Creates new dataframe from a slice of rows."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required("offset", SyntaxShape::Int, "start of slice")
-            .required("size", SyntaxShape::Int, "size of slice")
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Create new dataframe from a slice of the rows",
-            example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr slice 0 1",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new("a".to_string(), vec![Value::test_int(1)]),
-                        Column::new("b".to_string(), vec![Value::test_int(2)]),
-                    ],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let offset: i64 = call.req(engine_state, stack, 0)?;
-    let size: usize = call.req(engine_state, stack, 1)?;
-
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-
-    let res = df.as_ref().slice(offset, size);
-
-    Ok(PipelineData::Value(
-        NuDataFrame::dataframe_into_value(res, call.head),
-        None,
-    ))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(SliceDF {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/sql_context.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/sql_context.rs
deleted file mode 100644
index f558904344..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/sql_context.rs
+++ /dev/null
@@ -1,228 +0,0 @@
-use crate::dataframe::eager::sql_expr::parse_sql_expr;
-use polars::error::{ErrString, PolarsError};
-use polars::prelude::{col, DataFrame, DataType, IntoLazy, LazyFrame};
-use sqlparser::ast::{
-    Expr as SqlExpr, GroupByExpr, Select, SelectItem, SetExpr, Statement, TableFactor,
-    Value as SQLValue,
-};
-use sqlparser::dialect::GenericDialect;
-use sqlparser::parser::Parser;
-use std::collections::HashMap;
-
-#[derive(Default)]
-pub struct SQLContext {
-    table_map: HashMap<String, LazyFrame>,
-    dialect: GenericDialect,
-}
-
-impl SQLContext {
-    pub fn new() -> Self {
-        Self {
-            table_map: HashMap::new(),
-            dialect: GenericDialect,
-        }
-    }
-
-    pub fn register(&mut self, name: &str, df: &DataFrame) {
-        self.table_map.insert(name.to_owned(), df.clone().lazy());
-    }
-
-    fn execute_select(&self, select_stmt: &Select) -> Result<LazyFrame, PolarsError> {
-        // Determine involved dataframe
-        // Implicit join require some more work in query parsers, Explicit join are preferred for now.
-        let tbl = select_stmt.from.first().ok_or_else(|| {
-            PolarsError::ComputeError(ErrString::from("No table found in select statement"))
-        })?;
-        let mut alias_map = HashMap::new();
-        let tbl_name = match &tbl.relation {
-            TableFactor::Table { name, alias, .. } => {
-                let tbl_name = name
-                    .0
-                    .first()
-                    .ok_or_else(|| {
-                        PolarsError::ComputeError(ErrString::from(
-                            "No table found in select statement",
-                        ))
-                    })?
-                    .value
-                    .to_string();
-                if self.table_map.contains_key(&tbl_name) {
-                    if let Some(alias) = alias {
-                        alias_map.insert(alias.name.value.clone(), tbl_name.to_owned());
-                    };
-                    tbl_name
-                } else {
-                    return Err(PolarsError::ComputeError(
-                        format!("Table name {tbl_name} was not found").into(),
-                    ));
-                }
-            }
-            // Support bare table, optional with alias for now
-            _ => return Err(PolarsError::ComputeError("Not implemented".into())),
-        };
-        let df = &self.table_map[&tbl_name];
-        let mut raw_projection_before_alias: HashMap<String, usize> = HashMap::new();
-        let mut contain_wildcard = false;
-        // Filter Expression
-        let df = match select_stmt.selection.as_ref() {
-            Some(expr) => {
-                let filter_expression = parse_sql_expr(expr)?;
-                df.clone().filter(filter_expression)
-            }
-            None => df.clone(),
-        };
-        // Column Projections
-        let projection = select_stmt
-            .projection
-            .iter()
-            .enumerate()
-            .map(|(i, select_item)| {
-                Ok(match select_item {
-                    SelectItem::UnnamedExpr(expr) => {
-                        let expr = parse_sql_expr(expr)?;
-                        raw_projection_before_alias.insert(format!("{expr:?}"), i);
-                        expr
-                    }
-                    SelectItem::ExprWithAlias { expr, alias } => {
-                        let expr = parse_sql_expr(expr)?;
-                        raw_projection_before_alias.insert(format!("{expr:?}"), i);
-                        expr.alias(&alias.value)
-                    }
-                    SelectItem::QualifiedWildcard(_, _) | SelectItem::Wildcard(_) => {
-                        contain_wildcard = true;
-                        col("*")
-                    }
-                })
-            })
-            .collect::<Result<Vec<_>, PolarsError>>()?;
-        // Check for group by
-        // After projection since there might be number.
-        let group_by = match &select_stmt.group_by {
-                GroupByExpr::All =>
-                  Err(
-                      PolarsError::ComputeError("Group-By Error: Only positive number or expression are supported, not all".into())
-                  )?,
-                GroupByExpr::Expressions(expressions) => expressions
-            }
-            .iter()
-            .map(
-                |e|match e {
-                  SqlExpr::Value(SQLValue::Number(idx, _)) => {
-                    let idx = match idx.parse::<usize>() {
-                        Ok(0)| Err(_) => Err(
-                        PolarsError::ComputeError(
-                            format!("Group-By Error: Only positive number or expression are supported, got {idx}").into()
-                        )),
-                        Ok(idx) => Ok(idx)
-                    }?;
-                    Ok(projection[idx].clone())
-                  }
-                  SqlExpr::Value(_) => Err(
-                      PolarsError::ComputeError("Group-By Error: Only positive number or expression are supported".into())
-                  ),
-                  _ => parse_sql_expr(e)
-                }
-            )
-            .collect::<Result<Vec<_>, PolarsError>>()?;
-
-        let df = if group_by.is_empty() {
-            df.select(projection)
-        } else {
-            // check groupby and projection due to difference between SQL and polars
-            // Return error on wild card, shouldn't process this
-            if contain_wildcard {
-                return Err(PolarsError::ComputeError(
-                    "Group-By Error: Can't process wildcard in group-by".into(),
-                ));
-            }
-            // Default polars group by will have group by columns at the front
-            // need some container to contain position of group by columns and its position
-            // at the final agg projection, check the schema for the existence of group by column
-            // and its projections columns, keeping the original index
-            let (exclude_expr, groupby_pos): (Vec<_>, Vec<_>) = group_by
-                .iter()
-                .map(|expr| raw_projection_before_alias.get(&format!("{expr:?}")))
-                .enumerate()
-                .filter(|(_, proj_p)| proj_p.is_some())
-                .map(|(gb_p, proj_p)| (*proj_p.unwrap_or(&0), (*proj_p.unwrap_or(&0), gb_p)))
-                .unzip();
-            let (agg_projection, agg_proj_pos): (Vec<_>, Vec<_>) = projection
-                .iter()
-                .enumerate()
-                .filter(|(i, _)| !exclude_expr.contains(i))
-                .enumerate()
-                .map(|(agg_pj, (proj_p, expr))| (expr.clone(), (proj_p, agg_pj + group_by.len())))
-                .unzip();
-            let agg_df = df.group_by(group_by).agg(agg_projection);
-            let mut final_proj_pos = groupby_pos
-                .into_iter()
-                .chain(agg_proj_pos)
-                .collect::<Vec<_>>();
-
-            final_proj_pos.sort_by(|(proj_pa, _), (proj_pb, _)| proj_pa.cmp(proj_pb));
-            let final_proj = final_proj_pos
-                .into_iter()
-                .map(|(_, shm_p)| {
-                    col(agg_df
-                        .clone()
-                        // FIXME: had to do this mess to get get_index to work, not sure why. need help
-                        .collect()
-                        .unwrap_or_default()
-                        .schema()
-                        .get_at_index(shm_p)
-                        .unwrap_or((&"".into(), &DataType::Null))
-                        .0)
-                })
-                .collect::<Vec<_>>();
-            agg_df.select(final_proj)
-        };
-        Ok(df)
-    }
-
-    pub fn execute(&self, query: &str) -> Result<LazyFrame, PolarsError> {
-        let ast = Parser::parse_sql(&self.dialect, query)
-            .map_err(|e| PolarsError::ComputeError(format!("{e:?}").into()))?;
-        if ast.len() != 1 {
-            Err(PolarsError::ComputeError(
-                "One and only one statement at a time please".into(),
-            ))
-        } else {
-            let ast = ast
-                .first()
-                .ok_or_else(|| PolarsError::ComputeError(ErrString::from("No statement found")))?;
-            Ok(match ast {
-                Statement::Query(query) => {
-                    let rs = match &*query.body {
-                        SetExpr::Select(select_stmt) => self.execute_select(select_stmt)?,
-                        _ => {
-                            return Err(PolarsError::ComputeError(
-                                "INSERT, UPDATE is not supported for polars".into(),
-                            ))
-                        }
-                    };
-                    match &query.limit {
-                        Some(SqlExpr::Value(SQLValue::Number(nrow, _))) => {
-                            let nrow = nrow.parse().map_err(|err| {
-                                PolarsError::ComputeError(
-                                    format!("Conversion Error: {err:?}").into(),
-                                )
-                            })?;
-                            rs.limit(nrow)
-                        }
-                        None => rs,
-                        _ => {
-                            return Err(PolarsError::ComputeError(
-                                "Only support number argument to LIMIT clause".into(),
-                            ))
-                        }
-                    }
-                }
-                _ => {
-                    return Err(PolarsError::ComputeError(
-                        format!("Statement type {ast:?} is not supported").into(),
-                    ))
-                }
-            })
-        }
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/sql_expr.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/sql_expr.rs
deleted file mode 100644
index 9c0728ea5f..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/sql_expr.rs
+++ /dev/null
@@ -1,200 +0,0 @@
-use polars::error::PolarsError;
-use polars::prelude::{col, lit, DataType, Expr, LiteralValue, PolarsResult as Result, TimeUnit};
-
-use sqlparser::ast::{
-    ArrayElemTypeDef, BinaryOperator as SQLBinaryOperator, DataType as SQLDataType,
-    Expr as SqlExpr, Function as SQLFunction, Value as SqlValue, WindowType,
-};
-
-fn map_sql_polars_datatype(data_type: &SQLDataType) -> Result<DataType> {
-    Ok(match data_type {
-        SQLDataType::Char(_)
-        | SQLDataType::Varchar(_)
-        | SQLDataType::Uuid
-        | SQLDataType::Clob(_)
-        | SQLDataType::Text
-        | SQLDataType::String(_) => DataType::String,
-        SQLDataType::Float(_) => DataType::Float32,
-        SQLDataType::Real => DataType::Float32,
-        SQLDataType::Double => DataType::Float64,
-        SQLDataType::TinyInt(_) => DataType::Int8,
-        SQLDataType::UnsignedTinyInt(_) => DataType::UInt8,
-        SQLDataType::SmallInt(_) => DataType::Int16,
-        SQLDataType::UnsignedSmallInt(_) => DataType::UInt16,
-        SQLDataType::Int(_) => DataType::Int32,
-        SQLDataType::UnsignedInt(_) => DataType::UInt32,
-        SQLDataType::BigInt(_) => DataType::Int64,
-        SQLDataType::UnsignedBigInt(_) => DataType::UInt64,
-
-        SQLDataType::Boolean => DataType::Boolean,
-        SQLDataType::Date => DataType::Date,
-        SQLDataType::Time(_, _) => DataType::Time,
-        SQLDataType::Timestamp(_, _) => DataType::Datetime(TimeUnit::Microseconds, None),
-        SQLDataType::Interval => DataType::Duration(TimeUnit::Microseconds),
-        SQLDataType::Array(array_type_def) => match array_type_def {
-            ArrayElemTypeDef::AngleBracket(inner_type)
-            | ArrayElemTypeDef::SquareBracket(inner_type) => {
-                DataType::List(Box::new(map_sql_polars_datatype(inner_type)?))
-            }
-            _ => {
-                return Err(PolarsError::ComputeError(
-                    "SQL Datatype Array(None) was not supported in polars-sql yet!".into(),
-                ))
-            }
-        },
-        _ => {
-            return Err(PolarsError::ComputeError(
-                format!("SQL Datatype {data_type:?} was not supported in polars-sql yet!").into(),
-            ))
-        }
-    })
-}
-
-fn cast_(expr: Expr, data_type: &SQLDataType) -> Result<Expr> {
-    let polars_type = map_sql_polars_datatype(data_type)?;
-    Ok(expr.cast(polars_type))
-}
-
-fn binary_op_(left: Expr, right: Expr, op: &SQLBinaryOperator) -> Result<Expr> {
-    Ok(match op {
-        SQLBinaryOperator::Plus => left + right,
-        SQLBinaryOperator::Minus => left - right,
-        SQLBinaryOperator::Multiply => left * right,
-        SQLBinaryOperator::Divide => left / right,
-        SQLBinaryOperator::Modulo => left % right,
-        SQLBinaryOperator::StringConcat => {
-            left.cast(DataType::String) + right.cast(DataType::String)
-        }
-        SQLBinaryOperator::Gt => left.gt(right),
-        SQLBinaryOperator::Lt => left.lt(right),
-        SQLBinaryOperator::GtEq => left.gt_eq(right),
-        SQLBinaryOperator::LtEq => left.lt_eq(right),
-        SQLBinaryOperator::Eq => left.eq(right),
-        SQLBinaryOperator::NotEq => left.eq(right).not(),
-        SQLBinaryOperator::And => left.and(right),
-        SQLBinaryOperator::Or => left.or(right),
-        SQLBinaryOperator::Xor => left.xor(right),
-        _ => {
-            return Err(PolarsError::ComputeError(
-                format!("SQL Operator {op:?} was not supported in polars-sql yet!").into(),
-            ))
-        }
-    })
-}
-
-fn literal_expr(value: &SqlValue) -> Result<Expr> {
-    Ok(match value {
-        SqlValue::Number(s, _) => {
-            // Check for existence of decimal separator dot
-            if s.contains('.') {
-                s.parse::<f64>().map(lit).map_err(|_| {
-                    PolarsError::ComputeError(format!("Can't parse literal {s:?}").into())
-                })
-            } else {
-                s.parse::<i64>().map(lit).map_err(|_| {
-                    PolarsError::ComputeError(format!("Can't parse literal {s:?}").into())
-                })
-            }?
-        }
-        SqlValue::SingleQuotedString(s) => lit(s.clone()),
-        SqlValue::NationalStringLiteral(s) => lit(s.clone()),
-        SqlValue::HexStringLiteral(s) => lit(s.clone()),
-        SqlValue::DoubleQuotedString(s) => lit(s.clone()),
-        SqlValue::Boolean(b) => lit(*b),
-        SqlValue::Null => Expr::Literal(LiteralValue::Null),
-        _ => {
-            return Err(PolarsError::ComputeError(
-                format!("Parsing SQL Value {value:?} was not supported in polars-sql yet!").into(),
-            ))
-        }
-    })
-}
-
-pub fn parse_sql_expr(expr: &SqlExpr) -> Result<Expr> {
-    Ok(match expr {
-        SqlExpr::Identifier(e) => col(&e.value),
-        SqlExpr::BinaryOp { left, op, right } => {
-            let left = parse_sql_expr(left)?;
-            let right = parse_sql_expr(right)?;
-            binary_op_(left, right, op)?
-        }
-        SqlExpr::Function(sql_function) => parse_sql_function(sql_function)?,
-        SqlExpr::Cast {
-            expr,
-            data_type,
-            format: _,
-        } => cast_(parse_sql_expr(expr)?, data_type)?,
-        SqlExpr::Nested(expr) => parse_sql_expr(expr)?,
-        SqlExpr::Value(value) => literal_expr(value)?,
-        _ => {
-            return Err(PolarsError::ComputeError(
-                format!("Expression: {expr:?} was not supported in polars-sql yet!").into(),
-            ))
-        }
-    })
-}
-
-fn apply_window_spec(expr: Expr, window_type: Option<&WindowType>) -> Result<Expr> {
-    Ok(match &window_type {
-        Some(wtype) => match wtype {
-            WindowType::WindowSpec(window_spec) => {
-                // Process for simple window specification, partition by first
-                let partition_by = window_spec
-                    .partition_by
-                    .iter()
-                    .map(parse_sql_expr)
-                    .collect::<Result<Vec<_>>>()?;
-                expr.over(partition_by)
-                // Order by and Row range may not be supported at the moment
-            }
-            // TODO: make NamedWindow work
-            WindowType::NamedWindow(_named) => {
-                return Err(PolarsError::ComputeError(
-                    format!("Expression: {expr:?} was not supported in polars-sql yet!").into(),
-                ))
-            }
-        },
-        None => expr,
-    })
-}
-
-fn parse_sql_function(sql_function: &SQLFunction) -> Result<Expr> {
-    use sqlparser::ast::{FunctionArg, FunctionArgExpr};
-    // Function name mostly do not have name space, so it mostly take the first args
-    let function_name = sql_function.name.0[0].value.to_ascii_lowercase();
-    let args = sql_function
-        .args
-        .iter()
-        .map(|arg| match arg {
-            FunctionArg::Named { arg, .. } => arg,
-            FunctionArg::Unnamed(arg) => arg,
-        })
-        .collect::<Vec<_>>();
-    Ok(
-        match (
-            function_name.as_str(),
-            args.as_slice(),
-            sql_function.distinct,
-        ) {
-            ("sum", [FunctionArgExpr::Expr(expr)], false) => {
-                apply_window_spec(parse_sql_expr(expr)?, sql_function.over.as_ref())?.sum()
-            }
-            ("count", [FunctionArgExpr::Expr(expr)], false) => {
-                apply_window_spec(parse_sql_expr(expr)?, sql_function.over.as_ref())?.count()
-            }
-            ("count", [FunctionArgExpr::Expr(expr)], true) => {
-                apply_window_spec(parse_sql_expr(expr)?, sql_function.over.as_ref())?.n_unique()
-            }
-            // Special case for wildcard args to count function.
-            ("count", [FunctionArgExpr::Wildcard], false) => lit(1i32).count(),
-            _ => {
-                return Err(PolarsError::ComputeError(
-                    format!(
-                        "Function {function_name:?} with args {args:?} was not supported in polars-sql yet!"
-                    )
-                    .into(),
-                ))
-            }
-        },
-    )
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/summary.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/summary.rs
deleted file mode 100644
index 845929a52d..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/summary.rs
+++ /dev/null
@@ -1,279 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-
-use polars::{
-    chunked_array::ChunkedArray,
-    prelude::{
-        AnyValue, DataFrame, DataType, Float64Type, IntoSeries, NewChunkedArray,
-        QuantileInterpolOptions, Series, StringType,
-    },
-};
-
-#[derive(Clone)]
-pub struct Summary;
-
-impl Command for Summary {
-    fn name(&self) -> &str {
-        "dfr summary"
-    }
-
-    fn usage(&self) -> &str {
-        "For a dataframe, produces descriptive statistics (summary statistics) for its numeric columns."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .category(Category::Custom("dataframe".into()))
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .named(
-                "quantiles",
-                SyntaxShape::Table(vec![]),
-                "provide optional quantiles",
-                Some('q'),
-            )
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "list dataframe descriptives",
-            example: "[[a b]; [1 1] [1 1]] | dfr into-df | dfr summary",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "descriptor".to_string(),
-                            vec![
-                                Value::test_string("count"),
-                                Value::test_string("sum"),
-                                Value::test_string("mean"),
-                                Value::test_string("median"),
-                                Value::test_string("std"),
-                                Value::test_string("min"),
-                                Value::test_string("25%"),
-                                Value::test_string("50%"),
-                                Value::test_string("75%"),
-                                Value::test_string("max"),
-                            ],
-                        ),
-                        Column::new(
-                            "a (i64)".to_string(),
-                            vec![
-                                Value::test_float(2.0),
-                                Value::test_float(2.0),
-                                Value::test_float(1.0),
-                                Value::test_float(1.0),
-                                Value::test_float(0.0),
-                                Value::test_float(1.0),
-                                Value::test_float(1.0),
-                                Value::test_float(1.0),
-                                Value::test_float(1.0),
-                                Value::test_float(1.0),
-                            ],
-                        ),
-                        Column::new(
-                            "b (i64)".to_string(),
-                            vec![
-                                Value::test_float(2.0),
-                                Value::test_float(2.0),
-                                Value::test_float(1.0),
-                                Value::test_float(1.0),
-                                Value::test_float(0.0),
-                                Value::test_float(1.0),
-                                Value::test_float(1.0),
-                                Value::test_float(1.0),
-                                Value::test_float(1.0),
-                                Value::test_float(1.0),
-                            ],
-                        ),
-                    ],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let quantiles: Option<Vec<Value>> = call.get_flag(engine_state, stack, "quantiles")?;
-    let quantiles = quantiles.map(|values| {
-        values
-            .iter()
-            .map(|value| {
-                let span = value.span();
-                match value {
-                    Value::Float { val, .. } => {
-                        if (&0.0..=&1.0).contains(&val) {
-                            Ok(*val)
-                        } else {
-                            Err(ShellError::GenericError {
-                                error: "Incorrect value for quantile".into(),
-                                msg: "value should be between 0 and 1".into(),
-                                span: Some(span),
-                                help: None,
-                                inner: vec![],
-                            })
-                        }
-                    }
-                    Value::Error { error, .. } => Err(*error.clone()),
-                    _ => Err(ShellError::GenericError {
-                        error: "Incorrect value for quantile".into(),
-                        msg: "value should be a float".into(),
-                        span: Some(span),
-                        help: None,
-                        inner: vec![],
-                    }),
-                }
-            })
-            .collect::<Result<Vec<f64>, ShellError>>()
-    });
-
-    let quantiles = match quantiles {
-        Some(quantiles) => quantiles?,
-        None => vec![0.25, 0.50, 0.75],
-    };
-
-    let mut quantiles_labels = quantiles
-        .iter()
-        .map(|q| Some(format!("{}%", q * 100.0)))
-        .collect::<Vec<Option<String>>>();
-    let mut labels = vec![
-        Some("count".to_string()),
-        Some("sum".to_string()),
-        Some("mean".to_string()),
-        Some("median".to_string()),
-        Some("std".to_string()),
-        Some("min".to_string()),
-    ];
-    labels.append(&mut quantiles_labels);
-    labels.push(Some("max".to_string()));
-
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-
-    let names = ChunkedArray::<StringType>::from_slice_options("descriptor", &labels).into_series();
-
-    let head = std::iter::once(names);
-
-    let tail = df
-        .as_ref()
-        .get_columns()
-        .iter()
-        .filter(|col| !matches!(col.dtype(), &DataType::Object("object", _)))
-        .map(|col| {
-            let count = col.len() as f64;
-
-            let sum = col.sum_as_series().ok().and_then(|series| {
-                series
-                    .cast(&DataType::Float64)
-                    .ok()
-                    .and_then(|ca| match ca.get(0) {
-                        Ok(AnyValue::Float64(v)) => Some(v),
-                        _ => None,
-                    })
-            });
-
-            let mean = match col.mean_as_series().get(0) {
-                Ok(AnyValue::Float64(v)) => Some(v),
-                _ => None,
-            };
-
-            let median = match col.median_as_series() {
-                Ok(v) => match v.get(0) {
-                    Ok(AnyValue::Float64(v)) => Some(v),
-                    _ => None,
-                },
-                _ => None,
-            };
-
-            let std = match col.std_as_series(0) {
-                Ok(v) => match v.get(0) {
-                    Ok(AnyValue::Float64(v)) => Some(v),
-                    _ => None,
-                },
-                _ => None,
-            };
-
-            let min = col.min_as_series().ok().and_then(|series| {
-                series
-                    .cast(&DataType::Float64)
-                    .ok()
-                    .and_then(|ca| match ca.get(0) {
-                        Ok(AnyValue::Float64(v)) => Some(v),
-                        _ => None,
-                    })
-            });
-
-            let mut quantiles = quantiles
-                .clone()
-                .into_iter()
-                .map(|q| {
-                    col.quantile_as_series(q, QuantileInterpolOptions::default())
-                        .ok()
-                        .and_then(|ca| ca.cast(&DataType::Float64).ok())
-                        .and_then(|ca| match ca.get(0) {
-                            Ok(AnyValue::Float64(v)) => Some(v),
-                            _ => None,
-                        })
-                })
-                .collect::<Vec<Option<f64>>>();
-
-            let max = col.max_as_series().ok().and_then(|series| {
-                series
-                    .cast(&DataType::Float64)
-                    .ok()
-                    .and_then(|ca| match ca.get(0) {
-                        Ok(AnyValue::Float64(v)) => Some(v),
-                        _ => None,
-                    })
-            });
-
-            let mut descriptors = vec![Some(count), sum, mean, median, std, min];
-            descriptors.append(&mut quantiles);
-            descriptors.push(max);
-
-            let name = format!("{} ({})", col.name(), col.dtype());
-            ChunkedArray::<Float64Type>::from_slice_options(&name, &descriptors).into_series()
-        });
-
-    let res = head.chain(tail).collect::<Vec<Series>>();
-
-    DataFrame::new(res)
-        .map_err(|e| ShellError::GenericError {
-            error: "Dataframe Error".into(),
-            msg: e.to_string(),
-            span: Some(call.head),
-            help: None,
-            inner: vec![],
-        })
-        .map(|df| PipelineData::Value(NuDataFrame::dataframe_into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(Summary {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/take.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/take.rs
deleted file mode 100644
index 406dd1d624..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/take.rs
+++ /dev/null
@@ -1,148 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-
-use polars::prelude::DataType;
-
-#[derive(Clone)]
-pub struct TakeDF;
-
-impl Command for TakeDF {
-    fn name(&self) -> &str {
-        "dfr take"
-    }
-
-    fn usage(&self) -> &str {
-        "Creates new dataframe using the given indices."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required(
-                "indices",
-                SyntaxShape::Any,
-                "list of indices used to take data",
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Takes selected rows from dataframe",
-                example: r#"let df = ([[a b]; [4 1] [5 2] [4 3]] | dfr into-df);
-    let indices = ([0 2] | dfr into-df);
-    $df | dfr take $indices"#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new(
-                                "a".to_string(),
-                                vec![Value::test_int(4), Value::test_int(4)],
-                            ),
-                            Column::new(
-                                "b".to_string(),
-                                vec![Value::test_int(1), Value::test_int(3)],
-                            ),
-                        ],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Takes selected rows from series",
-                example: r#"let series = ([4 1 5 2 4 3] | dfr into-df);
-    let indices = ([0 2] | dfr into-df);
-    $series | dfr take $indices"#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![Column::new(
-                            "0".to_string(),
-                            vec![Value::test_int(4), Value::test_int(5)],
-                        )],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let index_value: Value = call.req(engine_state, stack, 0)?;
-    let index_span = index_value.span();
-    let index = NuDataFrame::try_from_value(index_value)?.as_series(index_span)?;
-
-    let casted = match index.dtype() {
-        DataType::UInt32 | DataType::UInt64 | DataType::Int32 | DataType::Int64 => index
-            .cast(&DataType::UInt32)
-            .map_err(|e| ShellError::GenericError {
-                error: "Error casting index list".into(),
-                msg: e.to_string(),
-                span: Some(index_span),
-                help: None,
-                inner: vec![],
-            }),
-        _ => Err(ShellError::GenericError {
-            error: "Incorrect type".into(),
-            msg: "Series with incorrect type".into(),
-            span: Some(call.head),
-            help: Some("Consider using a Series with type int type".into()),
-            inner: vec![],
-        }),
-    }?;
-
-    let indices = casted.u32().map_err(|e| ShellError::GenericError {
-        error: "Error casting index list".into(),
-        msg: e.to_string(),
-        span: Some(index_span),
-        help: None,
-        inner: vec![],
-    })?;
-
-    NuDataFrame::try_from_pipeline(input, call.head).and_then(|df| {
-        df.as_ref()
-            .take(indices)
-            .map_err(|e| ShellError::GenericError {
-                error: "Error taking values".into(),
-                msg: e.to_string(),
-                span: Some(call.head),
-                help: None,
-                inner: vec![],
-            })
-            .map(|df| PipelineData::Value(NuDataFrame::dataframe_into_value(df, call.head), None))
-    })
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(TakeDF {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/to_arrow.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/to_arrow.rs
deleted file mode 100644
index 66f13121bf..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/to_arrow.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-use crate::dataframe::values::NuDataFrame;
-use nu_engine::command_prelude::*;
-
-use polars::prelude::{IpcWriter, SerWriter};
-use std::{fs::File, path::PathBuf};
-
-#[derive(Clone)]
-pub struct ToArrow;
-
-impl Command for ToArrow {
-    fn name(&self) -> &str {
-        "dfr to-arrow"
-    }
-
-    fn usage(&self) -> &str {
-        "Saves dataframe to arrow file."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required("file", SyntaxShape::Filepath, "file path to save dataframe")
-            .input_output_type(Type::Custom("dataframe".into()), Type::Any)
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Saves dataframe to arrow file",
-            example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr to-arrow test.arrow",
-            result: None,
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let file_name: Spanned<PathBuf> = call.req(engine_state, stack, 0)?;
-
-    let mut df = NuDataFrame::try_from_pipeline(input, call.head)?;
-
-    let mut file = File::create(&file_name.item).map_err(|e| ShellError::GenericError {
-        error: "Error with file name".into(),
-        msg: e.to_string(),
-        span: Some(file_name.span),
-        help: None,
-        inner: vec![],
-    })?;
-
-    IpcWriter::new(&mut file)
-        .finish(df.as_mut())
-        .map_err(|e| ShellError::GenericError {
-            error: "Error saving file".into(),
-            msg: e.to_string(),
-            span: Some(file_name.span),
-            help: None,
-            inner: vec![],
-        })?;
-
-    let file_value = Value::string(format!("saved {:?}", &file_name.item), file_name.span);
-
-    Ok(PipelineData::Value(
-        Value::list(vec![file_value], call.head),
-        None,
-    ))
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/to_avro.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/to_avro.rs
deleted file mode 100644
index e5e5c6fae1..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/to_avro.rs
+++ /dev/null
@@ -1,109 +0,0 @@
-use crate::dataframe::values::NuDataFrame;
-use nu_engine::command_prelude::*;
-
-use polars_io::{
-    avro::{AvroCompression, AvroWriter},
-    SerWriter,
-};
-use std::{fs::File, path::PathBuf};
-
-#[derive(Clone)]
-pub struct ToAvro;
-
-impl Command for ToAvro {
-    fn name(&self) -> &str {
-        "dfr to-avro"
-    }
-
-    fn usage(&self) -> &str {
-        "Saves dataframe to avro file."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .named(
-                "compression",
-                SyntaxShape::String,
-                "use compression, supports deflate or snappy",
-                Some('c'),
-            )
-            .required("file", SyntaxShape::Filepath, "file path to save dataframe")
-            .input_output_type(Type::Custom("dataframe".into()), Type::Any)
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Saves dataframe to avro file",
-            example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr to-avro test.avro",
-            result: None,
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn get_compression(call: &Call) -> Result<Option<AvroCompression>, ShellError> {
-    if let Some((compression, span)) = call
-        .get_flag_expr("compression")
-        .and_then(|e| e.as_string().map(|s| (s, e.span)))
-    {
-        match compression.as_ref() {
-            "snappy" => Ok(Some(AvroCompression::Snappy)),
-            "deflate" => Ok(Some(AvroCompression::Deflate)),
-            _ => Err(ShellError::IncorrectValue {
-                msg: "compression must be one of deflate or snappy".to_string(),
-                val_span: span,
-                call_span: span,
-            }),
-        }
-    } else {
-        Ok(None)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let file_name: Spanned<PathBuf> = call.req(engine_state, stack, 0)?;
-    let compression = get_compression(call)?;
-
-    let mut df = NuDataFrame::try_from_pipeline(input, call.head)?;
-
-    let file = File::create(&file_name.item).map_err(|e| ShellError::GenericError {
-        error: "Error with file name".into(),
-        msg: e.to_string(),
-        span: Some(file_name.span),
-        help: None,
-        inner: vec![],
-    })?;
-
-    AvroWriter::new(file)
-        .with_compression(compression)
-        .finish(df.as_mut())
-        .map_err(|e| ShellError::GenericError {
-            error: "Error saving file".into(),
-            msg: e.to_string(),
-            span: Some(file_name.span),
-            help: None,
-            inner: vec![],
-        })?;
-
-    let file_value = Value::string(format!("saved {:?}", &file_name.item), file_name.span);
-
-    Ok(PipelineData::Value(
-        Value::list(vec![file_value], call.head),
-        None,
-    ))
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/to_csv.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/to_csv.rs
deleted file mode 100644
index d85bed5150..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/to_csv.rs
+++ /dev/null
@@ -1,125 +0,0 @@
-use crate::dataframe::values::NuDataFrame;
-use nu_engine::command_prelude::*;
-
-use polars::prelude::{CsvWriter, SerWriter};
-use std::{fs::File, path::PathBuf};
-
-#[derive(Clone)]
-pub struct ToCSV;
-
-impl Command for ToCSV {
-    fn name(&self) -> &str {
-        "dfr to-csv"
-    }
-
-    fn usage(&self) -> &str {
-        "Saves dataframe to CSV file."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required("file", SyntaxShape::Filepath, "file path to save dataframe")
-            .named(
-                "delimiter",
-                SyntaxShape::String,
-                "file delimiter character",
-                Some('d'),
-            )
-            .switch("no-header", "Indicates if file doesn't have header", None)
-            .input_output_type(Type::Custom("dataframe".into()), Type::Any)
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Saves dataframe to CSV file",
-                example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr to-csv test.csv",
-                result: None,
-            },
-            Example {
-                description: "Saves dataframe to CSV file using other delimiter",
-                example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr to-csv test.csv --delimiter '|'",
-                result: None,
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let file_name: Spanned<PathBuf> = call.req(engine_state, stack, 0)?;
-    let delimiter: Option<Spanned<String>> = call.get_flag(engine_state, stack, "delimiter")?;
-    let no_header: bool = call.has_flag(engine_state, stack, "no-header")?;
-
-    let mut df = NuDataFrame::try_from_pipeline(input, call.head)?;
-
-    let mut file = File::create(&file_name.item).map_err(|e| ShellError::GenericError {
-        error: "Error with file name".into(),
-        msg: e.to_string(),
-        span: Some(file_name.span),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let writer = CsvWriter::new(&mut file);
-
-    let writer = if no_header {
-        writer.include_header(false)
-    } else {
-        writer.include_header(true)
-    };
-
-    let mut writer = match delimiter {
-        None => writer,
-        Some(d) => {
-            if d.item.len() != 1 {
-                return Err(ShellError::GenericError {
-                    error: "Incorrect delimiter".into(),
-                    msg: "Delimiter has to be one char".into(),
-                    span: Some(d.span),
-                    help: None,
-                    inner: vec![],
-                });
-            } else {
-                let delimiter = match d.item.chars().next() {
-                    Some(d) => d as u8,
-                    None => unreachable!(),
-                };
-
-                writer.with_separator(delimiter)
-            }
-        }
-    };
-
-    writer
-        .finish(df.as_mut())
-        .map_err(|e| ShellError::GenericError {
-            error: "Error writing to file".into(),
-            msg: e.to_string(),
-            span: Some(file_name.span),
-            help: None,
-            inner: vec![],
-        })?;
-
-    let file_value = Value::string(format!("saved {:?}", &file_name.item), file_name.span);
-
-    Ok(PipelineData::Value(
-        Value::list(vec![file_value], call.head),
-        None,
-    ))
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/to_df.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/to_df.rs
deleted file mode 100644
index d768c7a742..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/to_df.rs
+++ /dev/null
@@ -1,189 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuSchema};
-use nu_engine::command_prelude::*;
-
-use polars::prelude::*;
-
-#[derive(Clone)]
-pub struct ToDataFrame;
-
-impl Command for ToDataFrame {
-    fn name(&self) -> &str {
-        "dfr into-df"
-    }
-
-    fn usage(&self) -> &str {
-        "Converts a list, table or record into a dataframe."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .named(
-                "schema",
-                SyntaxShape::Record(vec![]),
-                r#"Polars Schema in format [{name: str}]. CSV, JSON, and JSONL files"#,
-                Some('s'),
-            )
-            .input_output_type(Type::Any, Type::Custom("dataframe".into()))
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Takes a dictionary and creates a dataframe",
-                example: "[[a b];[1 2] [3 4]] | dfr into-df",
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new(
-                                "a".to_string(),
-                                vec![Value::test_int(1), Value::test_int(3)],
-                            ),
-                            Column::new(
-                                "b".to_string(),
-                                vec![Value::test_int(2), Value::test_int(4)],
-                            ),
-                        ],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Takes a list of tables and creates a dataframe",
-                example: "[[1 2 a] [3 4 b] [5 6 c]] | dfr into-df",
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new(
-                                "0".to_string(),
-                                vec![Value::test_int(1), Value::test_int(3), Value::test_int(5)],
-                            ),
-                            Column::new(
-                                "1".to_string(),
-                                vec![Value::test_int(2), Value::test_int(4), Value::test_int(6)],
-                            ),
-                            Column::new(
-                                "2".to_string(),
-                                vec![
-                                    Value::test_string("a"),
-                                    Value::test_string("b"),
-                                    Value::test_string("c"),
-                                ],
-                            ),
-                        ],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Takes a list and creates a dataframe",
-                example: "[a b c] | dfr into-df",
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![Column::new(
-                            "0".to_string(),
-                            vec![
-                                Value::test_string("a"),
-                                Value::test_string("b"),
-                                Value::test_string("c"),
-                            ],
-                        )],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Takes a list of booleans and creates a dataframe",
-                example: "[true true false] | dfr into-df",
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![Column::new(
-                            "0".to_string(),
-                            vec![
-                                Value::test_bool(true),
-                                Value::test_bool(true),
-                                Value::test_bool(false),
-                            ],
-                        )],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Convert to a dataframe and provide a schema",
-                example: "{a: 1, b: {a: [1 2 3]}, c: [a b c]}| dfr into-df -s {a: u8, b: {a: list<u64>}, c: list<str>}",
-                result: Some(
-                    NuDataFrame::try_from_series(vec![
-                        Series::new("a", &[1u8]),
-                        {
-                            let dtype = DataType::Struct(vec![Field::new("a", DataType::List(Box::new(DataType::UInt64)))]);
-                            let vals = vec![AnyValue::StructOwned(
-                                Box::new((vec![AnyValue::List(Series::new("a", &[1u64, 2, 3]))], vec![Field::new("a", DataType::String)]))); 1];
-                            Series::from_any_values_and_dtype("b", &vals, &dtype, false)
-                                .expect("Struct series should not fail")
-                        },
-                        {
-                            let dtype = DataType::List(Box::new(DataType::String));
-                            let vals = vec![AnyValue::List(Series::new("c", &["a", "b", "c"]))];
-                            Series::from_any_values_and_dtype("c", &vals, &dtype, false)
-                                .expect("List series should not fail")
-                        }
-                    ], Span::test_data())
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Convert to a dataframe and provide a schema that adds a new column",
-                example: r#"[[a b]; [1 "foo"] [2 "bar"]] | dfr into-df -s {a: u8, b:str, c:i64} | dfr fill-null 3"#,
-                result: Some(NuDataFrame::try_from_series(vec![
-                        Series::new("a", [1u8, 2]),
-                        Series::new("b", ["foo", "bar"]),
-                        Series::new("c", [3i64, 3]),
-                    ], Span::test_data())
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            }
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let maybe_schema = call
-            .get_flag(engine_state, stack, "schema")?
-            .map(|schema| NuSchema::try_from(&schema))
-            .transpose()?;
-
-        let df = NuDataFrame::try_from_iter(input.into_iter(), maybe_schema.clone())?;
-
-        Ok(PipelineData::Value(
-            NuDataFrame::into_value(df, call.head),
-            None,
-        ))
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(ToDataFrame {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/to_json_lines.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/to_json_lines.rs
deleted file mode 100644
index 5875f17107..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/to_json_lines.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-use crate::dataframe::values::NuDataFrame;
-use nu_engine::command_prelude::*;
-
-use polars::prelude::{JsonWriter, SerWriter};
-use std::{fs::File, io::BufWriter, path::PathBuf};
-
-#[derive(Clone)]
-pub struct ToJsonLines;
-
-impl Command for ToJsonLines {
-    fn name(&self) -> &str {
-        "dfr to-jsonl"
-    }
-
-    fn usage(&self) -> &str {
-        "Saves dataframe to a JSON lines file."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required("file", SyntaxShape::Filepath, "file path to save dataframe")
-            .input_output_type(Type::Custom("dataframe".into()), Type::Any)
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Saves dataframe to JSON lines file",
-            example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr to-jsonl test.jsonl",
-            result: None,
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let file_name: Spanned<PathBuf> = call.req(engine_state, stack, 0)?;
-
-    let mut df = NuDataFrame::try_from_pipeline(input, call.head)?;
-
-    let file = File::create(&file_name.item).map_err(|e| ShellError::GenericError {
-        error: "Error with file name".into(),
-        msg: e.to_string(),
-        span: Some(file_name.span),
-        help: None,
-        inner: vec![],
-    })?;
-    let buf_writer = BufWriter::new(file);
-
-    JsonWriter::new(buf_writer)
-        .finish(df.as_mut())
-        .map_err(|e| ShellError::GenericError {
-            error: "Error saving file".into(),
-            msg: e.to_string(),
-            span: Some(file_name.span),
-            help: None,
-            inner: vec![],
-        })?;
-
-    let file_value = Value::string(format!("saved {:?}", &file_name.item), file_name.span);
-
-    Ok(PipelineData::Value(
-        Value::list(vec![file_value], call.head),
-        None,
-    ))
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/to_nu.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/to_nu.rs
deleted file mode 100644
index a6ab42052c..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/to_nu.rs
+++ /dev/null
@@ -1,136 +0,0 @@
-use crate::dataframe::values::{NuDataFrame, NuExpression};
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct ToNu;
-
-impl Command for ToNu {
-    fn name(&self) -> &str {
-        "dfr into-nu"
-    }
-
-    fn usage(&self) -> &str {
-        "Converts a dataframe or an expression into into nushell value for access and exploration."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .named(
-                "rows",
-                SyntaxShape::Number,
-                "number of rows to be shown",
-                Some('n'),
-            )
-            .switch("tail", "shows tail rows", Some('t'))
-            .input_output_types(vec![
-                (Type::Custom("expression".into()), Type::Any),
-                (Type::Custom("dataframe".into()), Type::table()),
-            ])
-            //.input_output_type(Type::Any, Type::Any)
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        let rec_1 = Value::test_record(record! {
-            "index" => Value::test_int(0),
-            "a" =>     Value::test_int(1),
-            "b" =>     Value::test_int(2),
-        });
-        let rec_2 = Value::test_record(record! {
-            "index" => Value::test_int(1),
-            "a" =>     Value::test_int(3),
-            "b" =>     Value::test_int(4),
-        });
-        let rec_3 = Value::test_record(record! {
-            "index" => Value::test_int(2),
-            "a" =>     Value::test_int(3),
-            "b" =>     Value::test_int(4),
-        });
-
-        vec![
-            Example {
-                description: "Shows head rows from dataframe",
-                example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr into-nu",
-                result: Some(Value::list(vec![rec_1, rec_2], Span::test_data())),
-            },
-            Example {
-                description: "Shows tail rows from dataframe",
-                example: "[[a b]; [1 2] [5 6] [3 4]] | dfr into-df | dfr into-nu --tail --rows 1",
-                result: Some(Value::list(vec![rec_3], Span::test_data())),
-            },
-            Example {
-                description: "Convert a col expression into a nushell value",
-                example: "dfr col a | dfr into-nu",
-                result: Some(Value::test_record(record! {
-                    "expr" =>  Value::test_string("column"),
-                    "value" => Value::test_string("a"),
-                })),
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let value = input.into_value(call.head)?;
-        if NuDataFrame::can_downcast(&value) {
-            dataframe_command(engine_state, stack, call, value)
-        } else {
-            expression_command(call, value)
-        }
-    }
-}
-
-fn dataframe_command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: Value,
-) -> Result<PipelineData, ShellError> {
-    let rows: Option<usize> = call.get_flag(engine_state, stack, "rows")?;
-    let tail: bool = call.has_flag(engine_state, stack, "tail")?;
-
-    let df = NuDataFrame::try_from_value(input)?;
-
-    let values = if tail {
-        df.tail(rows, call.head)?
-    } else {
-        // if rows is specified, return those rows, otherwise return everything
-        if rows.is_some() {
-            df.head(rows, call.head)?
-        } else {
-            df.head(Some(df.height()), call.head)?
-        }
-    };
-
-    let value = Value::list(values, call.head);
-
-    Ok(PipelineData::Value(value, None))
-}
-fn expression_command(call: &Call, input: Value) -> Result<PipelineData, ShellError> {
-    let expr = NuExpression::try_from_value(input)?;
-    let value = expr.to_value(call.head)?;
-
-    Ok(PipelineData::Value(value, None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::expressions::ExprCol;
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples_dataframe_input() {
-        test_dataframe(vec![Box::new(ToNu {})])
-    }
-
-    #[test]
-    fn test_examples_expression_input() {
-        test_dataframe(vec![Box::new(ToNu {}), Box::new(ExprCol {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/to_parquet.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/to_parquet.rs
deleted file mode 100644
index ce6419a9ac..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/to_parquet.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-use crate::dataframe::values::NuDataFrame;
-use nu_engine::command_prelude::*;
-
-use polars::prelude::ParquetWriter;
-use std::{fs::File, path::PathBuf};
-
-#[derive(Clone)]
-pub struct ToParquet;
-
-impl Command for ToParquet {
-    fn name(&self) -> &str {
-        "dfr to-parquet"
-    }
-
-    fn usage(&self) -> &str {
-        "Saves dataframe to parquet file."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required("file", SyntaxShape::Filepath, "file path to save dataframe")
-            .input_output_type(Type::Custom("dataframe".into()), Type::Any)
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Saves dataframe to parquet file",
-            example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr to-parquet test.parquet",
-            result: None,
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let file_name: Spanned<PathBuf> = call.req(engine_state, stack, 0)?;
-
-    let mut df = NuDataFrame::try_from_pipeline(input, call.head)?;
-
-    let file = File::create(&file_name.item).map_err(|e| ShellError::GenericError {
-        error: "Error with file name".into(),
-        msg: e.to_string(),
-        span: Some(file_name.span),
-        help: None,
-        inner: vec![],
-    })?;
-
-    ParquetWriter::new(file)
-        .finish(df.as_mut())
-        .map_err(|e| ShellError::GenericError {
-            error: "Error saving file".into(),
-            msg: e.to_string(),
-            span: Some(file_name.span),
-            help: None,
-            inner: vec![],
-        })?;
-
-    let file_value = Value::string(format!("saved {:?}", &file_name.item), file_name.span);
-
-    Ok(PipelineData::Value(
-        Value::list(vec![file_value], call.head),
-        None,
-    ))
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/with_column.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/with_column.rs
deleted file mode 100644
index 79d3427e8a..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/with_column.rs
+++ /dev/null
@@ -1,202 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuLazyFrame};
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct WithColumn;
-
-impl Command for WithColumn {
-    fn name(&self) -> &str {
-        "dfr with-column"
-    }
-
-    fn usage(&self) -> &str {
-        "Adds a series to the dataframe."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .named("name", SyntaxShape::String, "new column name", Some('n'))
-            .rest(
-                "series or expressions",
-                SyntaxShape::Any,
-                "series to be added or expressions used to define the new columns",
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe or lazyframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Adds a series to the dataframe",
-                example: r#"[[a b]; [1 2] [3 4]]
-    | dfr into-df
-    | dfr with-column ([5 6] | dfr into-df) --name c"#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new(
-                                "a".to_string(),
-                                vec![Value::test_int(1), Value::test_int(3)],
-                            ),
-                            Column::new(
-                                "b".to_string(),
-                                vec![Value::test_int(2), Value::test_int(4)],
-                            ),
-                            Column::new(
-                                "c".to_string(),
-                                vec![Value::test_int(5), Value::test_int(6)],
-                            ),
-                        ],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Adds a series to the dataframe",
-                example: r#"[[a b]; [1 2] [3 4]]
-    | dfr into-lazy
-    | dfr with-column [
-        ((dfr col a) * 2 | dfr as "c")
-        ((dfr col a) * 3 | dfr as "d")
-      ]
-    | dfr collect"#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new(
-                                "a".to_string(),
-                                vec![Value::test_int(1), Value::test_int(3)],
-                            ),
-                            Column::new(
-                                "b".to_string(),
-                                vec![Value::test_int(2), Value::test_int(4)],
-                            ),
-                            Column::new(
-                                "c".to_string(),
-                                vec![Value::test_int(2), Value::test_int(6)],
-                            ),
-                            Column::new(
-                                "d".to_string(),
-                                vec![Value::test_int(3), Value::test_int(9)],
-                            ),
-                        ],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let value = input.into_value(call.head)?;
-        if NuLazyFrame::can_downcast(&value) {
-            let df = NuLazyFrame::try_from_value(value)?;
-            command_lazy(engine_state, stack, call, df)
-        } else if NuDataFrame::can_downcast(&value) {
-            let df = NuDataFrame::try_from_value(value)?;
-            command_eager(engine_state, stack, call, df)
-        } else {
-            Err(ShellError::CantConvert {
-                to_type: "lazy or eager dataframe".into(),
-                from_type: value.get_type().to_string(),
-                span: value.span(),
-                help: None,
-            })
-        }
-    }
-}
-
-fn command_eager(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    mut df: NuDataFrame,
-) -> Result<PipelineData, ShellError> {
-    let new_column: Value = call.req(engine_state, stack, 0)?;
-    let column_span = new_column.span();
-
-    if NuExpression::can_downcast(&new_column) {
-        let vals: Vec<Value> = call.rest(engine_state, stack, 0)?;
-        let value = Value::list(vals, call.head);
-        let expressions = NuExpression::extract_exprs(value)?;
-        let lazy = NuLazyFrame::new(true, df.lazy().with_columns(&expressions));
-
-        let df = lazy.collect(call.head)?;
-
-        Ok(PipelineData::Value(df.into_value(call.head), None))
-    } else {
-        let mut other = NuDataFrame::try_from_value(new_column)?.as_series(column_span)?;
-
-        let name = match call.get_flag::<String>(engine_state, stack, "name")? {
-            Some(name) => name,
-            None => other.name().to_string(),
-        };
-
-        let series = other.rename(&name).clone();
-
-        df.as_mut()
-            .with_column(series)
-            .map_err(|e| ShellError::GenericError {
-                error: "Error adding column to dataframe".into(),
-                msg: e.to_string(),
-                span: Some(column_span),
-                help: None,
-                inner: vec![],
-            })
-            .map(|df| {
-                PipelineData::Value(
-                    NuDataFrame::dataframe_into_value(df.clone(), call.head),
-                    None,
-                )
-            })
-    }
-}
-
-fn command_lazy(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    lazy: NuLazyFrame,
-) -> Result<PipelineData, ShellError> {
-    let vals: Vec<Value> = call.rest(engine_state, stack, 0)?;
-    let value = Value::list(vals, call.head);
-    let expressions = NuExpression::extract_exprs(value)?;
-
-    let lazy: NuLazyFrame = lazy.into_polars().with_columns(&expressions).into();
-
-    Ok(PipelineData::Value(
-        NuLazyFrame::into_value(lazy, call.head)?,
-        None,
-    ))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-    use crate::dataframe::expressions::ExprAlias;
-    use crate::dataframe::expressions::ExprCol;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![
-            Box::new(WithColumn {}),
-            Box::new(ExprAlias {}),
-            Box::new(ExprCol {}),
-        ])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/expressions/alias.rs b/crates/nu-cmd-dataframe/src/dataframe/expressions/alias.rs
deleted file mode 100644
index 9d36100276..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/expressions/alias.rs
+++ /dev/null
@@ -1,86 +0,0 @@
-use crate::dataframe::values::NuExpression;
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct ExprAlias;
-
-impl Command for ExprAlias {
-    fn name(&self) -> &str {
-        "dfr as"
-    }
-
-    fn usage(&self) -> &str {
-        "Creates an alias expression."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required(
-                "Alias name",
-                SyntaxShape::String,
-                "Alias name for the expression",
-            )
-            .input_output_type(
-                Type::Custom("expression".into()),
-                Type::Custom("expression".into()),
-            )
-            .category(Category::Custom("expression".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Creates and alias expression",
-            example: "dfr col a | dfr as new_a | dfr into-nu",
-            result: {
-                let record = Value::test_record(record! {
-                    "expr" =>  Value::test_record(record! {
-                        "expr" =>  Value::test_string("column"),
-                        "value" => Value::test_string("a"),
-                    }),
-                    "alias" => Value::test_string("new_a"),
-                });
-
-                Some(record)
-            },
-        }]
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["aka", "abbr", "otherwise"]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let alias: String = call.req(engine_state, stack, 0)?;
-
-        let expr = NuExpression::try_from_pipeline(input, call.head)?;
-        let expr: NuExpression = expr.into_polars().alias(alias.as_str()).into();
-
-        Ok(PipelineData::Value(
-            NuExpression::into_value(expr, call.head),
-            None,
-        ))
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-    use crate::dataframe::eager::ToNu;
-    use crate::dataframe::expressions::ExprCol;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![
-            Box::new(ExprAlias {}),
-            Box::new(ExprCol {}),
-            Box::new(ToNu {}),
-        ])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/expressions/arg_where.rs b/crates/nu-cmd-dataframe/src/dataframe/expressions/arg_where.rs
deleted file mode 100644
index 49c13c3f44..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/expressions/arg_where.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuExpression};
-use nu_engine::command_prelude::*;
-
-use polars::prelude::arg_where;
-
-#[derive(Clone)]
-pub struct ExprArgWhere;
-
-impl Command for ExprArgWhere {
-    fn name(&self) -> &str {
-        "dfr arg-where"
-    }
-
-    fn usage(&self) -> &str {
-        "Creates an expression that returns the arguments where expression is true."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required("column name", SyntaxShape::Any, "Expression to evaluate")
-            .input_output_type(Type::Any, Type::Custom("expression".into()))
-            .category(Category::Custom("expression".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Return a dataframe where the value match the expression",
-            example: "let df = ([[a b]; [one 1] [two 2] [three 3]] | dfr into-df);
-    $df | dfr select (dfr arg-where ((dfr col b) >= 2) | dfr as b_arg)",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "b_arg".to_string(),
-                        vec![Value::test_int(1), Value::test_int(2)],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["condition", "match", "if"]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let value: Value = call.req(engine_state, stack, 0)?;
-        let expr = NuExpression::try_from_value(value)?;
-        let expr: NuExpression = arg_where(expr.into_polars()).into();
-
-        Ok(PipelineData::Value(expr.into_value(call.head), None))
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-    use crate::dataframe::expressions::ExprAlias;
-    use crate::dataframe::lazy::LazySelect;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![
-            Box::new(ExprArgWhere {}),
-            Box::new(ExprAlias {}),
-            Box::new(LazySelect {}),
-        ])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/expressions/col.rs b/crates/nu-cmd-dataframe/src/dataframe/expressions/col.rs
deleted file mode 100644
index 1520ef995d..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/expressions/col.rs
+++ /dev/null
@@ -1,68 +0,0 @@
-use crate::dataframe::values::NuExpression;
-use nu_engine::command_prelude::*;
-
-use polars::prelude::col;
-
-#[derive(Clone)]
-pub struct ExprCol;
-
-impl Command for ExprCol {
-    fn name(&self) -> &str {
-        "dfr col"
-    }
-
-    fn usage(&self) -> &str {
-        "Creates a named column expression."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required(
-                "column name",
-                SyntaxShape::String,
-                "Name of column to be used",
-            )
-            .input_output_type(Type::Any, Type::Custom("expression".into()))
-            .category(Category::Custom("expression".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Creates a named column expression and converts it to a nu object",
-            example: "dfr col a | dfr into-nu",
-            result: Some(Value::test_record(record! {
-                "expr" =>  Value::test_string("column"),
-                "value" => Value::test_string("a"),
-            })),
-        }]
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["create"]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let name: String = call.req(engine_state, stack, 0)?;
-        let expr: NuExpression = col(name.as_str()).into();
-
-        Ok(PipelineData::Value(expr.into_value(call.head), None))
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-    use crate::dataframe::eager::ToNu;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(ExprCol {}), Box::new(ToNu {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/expressions/concat_str.rs b/crates/nu-cmd-dataframe/src/dataframe/expressions/concat_str.rs
deleted file mode 100644
index 28f9bbda71..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/expressions/concat_str.rs
+++ /dev/null
@@ -1,108 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuExpression};
-use nu_engine::command_prelude::*;
-
-use polars::prelude::concat_str;
-
-#[derive(Clone)]
-pub struct ExprConcatStr;
-
-impl Command for ExprConcatStr {
-    fn name(&self) -> &str {
-        "dfr concat-str"
-    }
-
-    fn usage(&self) -> &str {
-        "Creates a concat string expression."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required(
-                "separator",
-                SyntaxShape::String,
-                "Separator used during the concatenation",
-            )
-            .required(
-                "concat expressions",
-                SyntaxShape::List(Box::new(SyntaxShape::Any)),
-                "Expression(s) that define the string concatenation",
-            )
-            .input_output_type(Type::Any, Type::Custom("expression".into()))
-            .category(Category::Custom("expression".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Creates a concat string expression",
-            example: r#"let df = ([[a b c]; [one two 1] [three four 2]] | dfr into-df);
-    $df | dfr with-column ((dfr concat-str "-" [(dfr col a) (dfr col b) ((dfr col c) * 2)]) | dfr as concat)"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![Value::test_string("one"), Value::test_string("three")],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![Value::test_string("two"), Value::test_string("four")],
-                        ),
-                        Column::new(
-                            "c".to_string(),
-                            vec![Value::test_int(1), Value::test_int(2)],
-                        ),
-                        Column::new(
-                            "concat".to_string(),
-                            vec![
-                                Value::test_string("one-two-2"),
-                                Value::test_string("three-four-4"),
-                            ],
-                        ),
-                    ],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["join", "connect", "update"]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let separator: String = call.req(engine_state, stack, 0)?;
-        let value: Value = call.req(engine_state, stack, 1)?;
-
-        let expressions = NuExpression::extract_exprs(value)?;
-        let expr: NuExpression = concat_str(expressions, &separator, false).into();
-
-        Ok(PipelineData::Value(expr.into_value(call.head), None))
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-    use crate::dataframe::eager::WithColumn;
-    use crate::dataframe::expressions::alias::ExprAlias;
-    use crate::dataframe::expressions::col::ExprCol;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![
-            Box::new(ExprConcatStr {}),
-            Box::new(ExprAlias {}),
-            Box::new(ExprCol {}),
-            Box::new(WithColumn {}),
-        ])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/expressions/datepart.rs b/crates/nu-cmd-dataframe/src/dataframe/expressions/datepart.rs
deleted file mode 100644
index 60913c0dc6..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/expressions/datepart.rs
+++ /dev/null
@@ -1,170 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuExpression};
-use chrono::{DateTime, FixedOffset};
-use nu_engine::command_prelude::*;
-
-use polars::{
-    datatypes::{DataType, TimeUnit},
-    prelude::NamedFrom,
-    series::Series,
-};
-
-#[derive(Clone)]
-pub struct ExprDatePart;
-
-impl Command for ExprDatePart {
-    fn name(&self) -> &str {
-        "dfr datepart"
-    }
-
-    fn usage(&self) -> &str {
-        "Creates an expression for capturing the specified datepart in a column."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required(
-                "Datepart name",
-                SyntaxShape::String,
-                "Part of the date to capture.  Possible values are year, quarter, month, week, weekday, day, hour, minute, second, millisecond, microsecond, nanosecond",
-            )
-            .input_output_type(
-                Type::Custom("expression".into()),
-                Type::Custom("expression".into()),
-            )
-            .category(Category::Custom("expression".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        let dt = DateTime::<FixedOffset>::parse_from_str(
-            "2021-12-30T01:02:03.123456789 +0000",
-            "%Y-%m-%dT%H:%M:%S.%9f %z",
-        )
-        .expect("date calculation should not fail in test");
-        vec![
-            Example {
-                description: "Creates an expression to capture the year date part",
-                example: r#"[["2021-12-30T01:02:03.123456789"]] | dfr into-df | dfr as-datetime "%Y-%m-%dT%H:%M:%S.%9f" | dfr with-column [(dfr col datetime | dfr datepart year | dfr as datetime_year )]"#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new("datetime".to_string(), vec![Value::test_date(dt)]),
-                            Column::new("datetime_year".to_string(), vec![Value::test_int(2021)]),
-                        ],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Creates an expression to capture multiple date parts",
-                example: r#"[["2021-12-30T01:02:03.123456789"]] | dfr into-df | dfr as-datetime "%Y-%m-%dT%H:%M:%S.%9f" |
-                dfr with-column [ (dfr col datetime | dfr datepart year | dfr as datetime_year ),
-                (dfr col datetime | dfr datepart month | dfr as datetime_month ),
-                (dfr col datetime | dfr datepart day | dfr as datetime_day ),
-                (dfr col datetime | dfr datepart hour | dfr as datetime_hour ),
-                (dfr col datetime | dfr datepart minute | dfr as datetime_minute ),
-                (dfr col datetime | dfr datepart second | dfr as datetime_second ),
-                (dfr col datetime | dfr datepart nanosecond | dfr as datetime_ns ) ]"#,
-                result: Some(
-                    NuDataFrame::try_from_series(
-                        vec![
-                            Series::new("datetime", &[dt.timestamp_nanos_opt()])
-                                .cast(&DataType::Datetime(TimeUnit::Nanoseconds, None))
-                                .expect("Error casting to datetime type"),
-                            Series::new("datetime_year", &[2021_i64]), // i32 was coerced to i64
-                            Series::new("datetime_month", &[12_i8]),
-                            Series::new("datetime_day", &[30_i8]),
-                            Series::new("datetime_hour", &[1_i8]),
-                            Series::new("datetime_minute", &[2_i8]),
-                            Series::new("datetime_second", &[3_i8]),
-                            Series::new("datetime_ns", &[123456789_i64]), // i32 was coerced to i64
-                        ],
-                        Span::test_data(),
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-        ]
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec![
-            "year",
-            "month",
-            "week",
-            "weekday",
-            "quarter",
-            "day",
-            "hour",
-            "minute",
-            "second",
-            "millisecond",
-            "microsecond",
-            "nanosecond",
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let part: Spanned<String> = call.req(engine_state, stack, 0)?;
-
-        let expr = NuExpression::try_from_pipeline(input, call.head)?;
-        let expr_dt = expr.into_polars().dt();
-        let expr = match part.item.as_str() {
-            "year" => expr_dt.year(),
-            "quarter" => expr_dt.quarter(),
-            "month" => expr_dt.month(),
-            "week" => expr_dt.week(),
-            "day" => expr_dt.day(),
-            "hour" => expr_dt.hour(),
-            "minute" => expr_dt.minute(),
-            "second" => expr_dt.second(),
-            "millisecond" => expr_dt.millisecond(),
-            "microsecond" => expr_dt.microsecond(),
-            "nanosecond" => expr_dt.nanosecond(),
-            _ => {
-                return Err(ShellError::UnsupportedInput {
-                    msg: format!("{} is not a valid datepart, expected one of year, month, day, hour, minute, second, millisecond, microsecond, nanosecond", part.item),
-                    input: "value originates from here".to_string(),
-                    msg_span: call.head,
-                    input_span: part.span,
-                });
-            }
-        }.into();
-
-        Ok(PipelineData::Value(
-            NuExpression::into_value(expr, call.head),
-            None,
-        ))
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-    use crate::dataframe::eager::ToNu;
-    use crate::dataframe::eager::WithColumn;
-    use crate::dataframe::expressions::ExprAlias;
-    use crate::dataframe::expressions::ExprCol;
-    use crate::dataframe::series::AsDateTime;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![
-            Box::new(ExprDatePart {}),
-            Box::new(ExprCol {}),
-            Box::new(ToNu {}),
-            Box::new(AsDateTime {}),
-            Box::new(WithColumn {}),
-            Box::new(ExprAlias {}),
-        ])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/expressions/expressions_macro.rs b/crates/nu-cmd-dataframe/src/dataframe/expressions/expressions_macro.rs
deleted file mode 100644
index 4cc56e030b..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/expressions/expressions_macro.rs
+++ /dev/null
@@ -1,736 +0,0 @@
-/// Definition of multiple Expression commands using a macro rule
-/// All of these expressions have an identical body and only require
-/// to have a change in the name, description and expression function
-use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuLazyFrame};
-use nu_engine::command_prelude::*;
-
-// The structs defined in this file are structs that form part of other commands
-// since they share a similar name
-macro_rules! expr_command {
-    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident, $test: ident) => {
-        #[derive(Clone)]
-        pub struct $command;
-
-        impl Command for $command {
-            fn name(&self) -> &str {
-                $name
-            }
-
-            fn usage(&self) -> &str {
-                $desc
-            }
-
-            fn signature(&self) -> Signature {
-                Signature::build(self.name())
-                    .input_output_type(
-                        Type::Custom("expression".into()),
-                        Type::Custom("expression".into()),
-                    )
-                    .category(Category::Custom("expression".into()))
-            }
-
-            fn examples(&self) -> Vec<Example> {
-                $examples
-            }
-
-            fn run(
-                &self,
-                _engine_state: &EngineState,
-                _stack: &mut Stack,
-                call: &Call,
-                input: PipelineData,
-            ) -> Result<PipelineData, ShellError> {
-                let expr = NuExpression::try_from_pipeline(input, call.head)?;
-                let expr: NuExpression = expr.into_polars().$func().into();
-
-                Ok(PipelineData::Value(
-                    NuExpression::into_value(expr, call.head),
-                    None,
-                ))
-            }
-        }
-
-        #[cfg(test)]
-        mod $test {
-            use super::super::super::test_dataframe::test_dataframe;
-            use super::*;
-            use crate::dataframe::lazy::aggregate::LazyAggregate;
-            use crate::dataframe::lazy::groupby::ToLazyGroupBy;
-
-            #[test]
-            fn test_examples() {
-                test_dataframe(vec![
-                    Box::new($command {}),
-                    Box::new(LazyAggregate {}),
-                    Box::new(ToLazyGroupBy {}),
-                ])
-            }
-        }
-    };
-
-    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident, $test: ident, $ddof: expr) => {
-        #[derive(Clone)]
-        pub struct $command;
-
-        impl Command for $command {
-            fn name(&self) -> &str {
-                $name
-            }
-
-            fn usage(&self) -> &str {
-                $desc
-            }
-
-            fn signature(&self) -> Signature {
-                Signature::build(self.name())
-                    .input_output_type(
-                        Type::Custom("expression".into()),
-                        Type::Custom("expression".into()),
-                    )
-                    .category(Category::Custom("expression".into()))
-            }
-
-            fn examples(&self) -> Vec<Example> {
-                $examples
-            }
-
-            fn run(
-                &self,
-                _engine_state: &EngineState,
-                _stack: &mut Stack,
-                call: &Call,
-                input: PipelineData,
-            ) -> Result<PipelineData, ShellError> {
-                let expr = NuExpression::try_from_pipeline(input, call.head)?;
-                let expr: NuExpression = expr.into_polars().$func($ddof).into();
-
-                Ok(PipelineData::Value(
-                    NuExpression::into_value(expr, call.head),
-                    None,
-                ))
-            }
-        }
-
-        #[cfg(test)]
-        mod $test {
-            use super::super::super::test_dataframe::test_dataframe;
-            use super::*;
-            use crate::dataframe::lazy::aggregate::LazyAggregate;
-            use crate::dataframe::lazy::groupby::ToLazyGroupBy;
-
-            #[test]
-            fn test_examples() {
-                test_dataframe(vec![
-                    Box::new($command {}),
-                    Box::new(LazyAggregate {}),
-                    Box::new(ToLazyGroupBy {}),
-                ])
-            }
-        }
-    };
-}
-
-// The structs defined in this file are structs that form part of other commands
-// since they share a similar name
-macro_rules! lazy_expr_command {
-    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident, $test: ident) => {
-        #[derive(Clone)]
-        pub struct $command;
-
-        impl Command for $command {
-            fn name(&self) -> &str {
-                $name
-            }
-
-            fn usage(&self) -> &str {
-                $desc
-            }
-
-            fn signature(&self) -> Signature {
-                Signature::build(self.name())
-                    .input_output_types(vec![
-                        (
-                            Type::Custom("expression".into()),
-                            Type::Custom("expression".into()),
-                        ),
-                        (
-                            Type::Custom("dataframe".into()),
-                            Type::Custom("dataframe".into()),
-                        ),
-                    ])
-                    .category(Category::Custom("expression".into()))
-            }
-
-            fn examples(&self) -> Vec<Example> {
-                $examples
-            }
-
-            fn run(
-                &self,
-                _engine_state: &EngineState,
-                _stack: &mut Stack,
-                call: &Call,
-                input: PipelineData,
-            ) -> Result<PipelineData, ShellError> {
-                let value = input.into_value(call.head)?;
-                if NuDataFrame::can_downcast(&value) {
-                    let lazy = NuLazyFrame::try_from_value(value)?;
-                    let lazy = NuLazyFrame::new(
-                        lazy.from_eager,
-                        lazy.into_polars()
-                            .$func()
-                            .map_err(|e| ShellError::GenericError {
-                                error: "Dataframe Error".into(),
-                                msg: e.to_string(),
-                                help: None,
-                                span: None,
-                                inner: vec![],
-                            })?,
-                    );
-
-                    Ok(PipelineData::Value(lazy.into_value(call.head)?, None))
-                } else {
-                    let expr = NuExpression::try_from_value(value)?;
-                    let expr: NuExpression = expr.into_polars().$func().into();
-
-                    Ok(PipelineData::Value(
-                        NuExpression::into_value(expr, call.head),
-                        None,
-                    ))
-                }
-            }
-        }
-
-        #[cfg(test)]
-        mod $test {
-            use super::super::super::test_dataframe::{
-                build_test_engine_state, test_dataframe_example,
-            };
-            use super::*;
-            use crate::dataframe::lazy::aggregate::LazyAggregate;
-            use crate::dataframe::lazy::groupby::ToLazyGroupBy;
-
-            #[test]
-            fn test_examples_dataframe() {
-                // the first example should be a for the dataframe case
-                let example = &$command.examples()[0];
-                let mut engine_state = build_test_engine_state(vec![Box::new($command {})]);
-                test_dataframe_example(&mut engine_state, &example)
-            }
-
-            #[test]
-            fn test_examples_expressions() {
-                // the second example should be a for the dataframe case
-                let example = &$command.examples()[1];
-                let mut engine_state = build_test_engine_state(vec![
-                    Box::new($command {}),
-                    Box::new(LazyAggregate {}),
-                    Box::new(ToLazyGroupBy {}),
-                ]);
-                test_dataframe_example(&mut engine_state, &example)
-            }
-        }
-    };
-
-    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident, $test: ident, $ddof: expr) => {
-        #[derive(Clone)]
-        pub struct $command;
-
-        impl Command for $command {
-            fn name(&self) -> &str {
-                $name
-            }
-
-            fn usage(&self) -> &str {
-                $desc
-            }
-
-            fn signature(&self) -> Signature {
-                Signature::build(self.name())
-                    .input_output_types(vec![
-                        (
-                            Type::Custom("expression".into()),
-                            Type::Custom("expression".into()),
-                        ),
-                        (
-                            Type::Custom("dataframe".into()),
-                            Type::Custom("dataframe".into()),
-                        ),
-                    ])
-                    .category(Category::Custom("expression".into()))
-            }
-
-            fn examples(&self) -> Vec<Example> {
-                $examples
-            }
-
-            fn run(
-                &self,
-                _engine_state: &EngineState,
-                _stack: &mut Stack,
-                call: &Call,
-                input: PipelineData,
-            ) -> Result<PipelineData, ShellError> {
-                let value = input.into_value(call.head)?;
-                if NuDataFrame::can_downcast(&value) {
-                    let lazy = NuLazyFrame::try_from_value(value)?;
-                    let lazy = NuLazyFrame::new(
-                        lazy.from_eager,
-                        lazy.into_polars()
-                            .$func($ddof)
-                            .map_err(|e| ShellError::GenericError {
-                                error: "Dataframe Error".into(),
-                                msg: e.to_string(),
-                                help: None,
-                                span: None,
-                                inner: vec![],
-                            })?,
-                    );
-
-                    Ok(PipelineData::Value(lazy.into_value(call.head)?, None))
-                } else {
-                    let expr = NuExpression::try_from_value(value)?;
-                    let expr: NuExpression = expr.into_polars().$func($ddof).into();
-
-                    Ok(PipelineData::Value(
-                        NuExpression::into_value(expr, call.head),
-                        None,
-                    ))
-                }
-            }
-        }
-
-        #[cfg(test)]
-        mod $test {
-            use super::super::super::test_dataframe::{
-                build_test_engine_state, test_dataframe_example,
-            };
-            use super::*;
-            use crate::dataframe::lazy::aggregate::LazyAggregate;
-            use crate::dataframe::lazy::groupby::ToLazyGroupBy;
-
-            #[test]
-            fn test_examples_dataframe() {
-                // the first example should be a for the dataframe case
-                let example = &$command.examples()[0];
-                let mut engine_state = build_test_engine_state(vec![Box::new($command {})]);
-                test_dataframe_example(&mut engine_state, &example)
-            }
-
-            #[test]
-            fn test_examples_expressions() {
-                // the second example should be a for the dataframe case
-                let example = &$command.examples()[1];
-                let mut engine_state = build_test_engine_state(vec![
-                    Box::new($command {}),
-                    Box::new(LazyAggregate {}),
-                    Box::new(ToLazyGroupBy {}),
-                ]);
-                test_dataframe_example(&mut engine_state, &example)
-            }
-        }
-    };
-}
-
-// ExprList command
-// Expands to a command definition for a list expression
-expr_command!(
-    ExprList,
-    "dfr implode",
-    "Aggregates a group to a Series.",
-    vec![Example {
-        description: "",
-        example: "",
-        result: None,
-    }],
-    implode,
-    test_implode
-);
-
-// ExprAggGroups command
-// Expands to a command definition for a agg groups expression
-expr_command!(
-    ExprAggGroups,
-    "dfr agg-groups",
-    "Creates an agg_groups expression.",
-    vec![Example {
-        description: "",
-        example: "",
-        result: None,
-    }],
-    agg_groups,
-    test_groups
-);
-
-// ExprCount command
-// Expands to a command definition for a count expression
-expr_command!(
-    ExprCount,
-    "dfr count",
-    "Creates a count expression.",
-    vec![Example {
-        description: "",
-        example: "",
-        result: None,
-    }],
-    count,
-    test_count
-);
-
-// ExprNot command
-// Expands to a command definition for a not expression
-expr_command!(
-    ExprNot,
-    "dfr expr-not",
-    "Creates a not expression.",
-    vec![Example {
-        description: "Creates a not expression",
-        example: "(dfr col a) > 2) | dfr expr-not",
-        result: None,
-    },],
-    not,
-    test_not
-);
-
-// ExprMax command
-// Expands to a command definition for max aggregation
-lazy_expr_command!(
-    ExprMax,
-    "dfr max",
-    "Creates a max expression or aggregates columns to their max value.",
-    vec![
-        Example {
-            description: "Max value from columns in a dataframe",
-            example: "[[a b]; [6 2] [1 4] [4 1]] | dfr into-df | dfr max",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new("a".to_string(), vec![Value::test_int(6)],),
-                        Column::new("b".to_string(), vec![Value::test_int(4)],),
-                    ],
-                    None
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        },
-        Example {
-            description: "Max aggregation for a group-by",
-            example: r#"[[a b]; [one 2] [one 4] [two 1]]
-    | dfr into-df
-    | dfr group-by a
-    | dfr agg (dfr col b | dfr max)"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![Value::test_string("one"), Value::test_string("two")],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![Value::test_int(4), Value::test_int(1)],
-                        ),
-                    ],
-                    None
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        },
-    ],
-    max,
-    test_max
-);
-
-// ExprMin command
-// Expands to a command definition for min aggregation
-lazy_expr_command!(
-    ExprMin,
-    "dfr min",
-    "Creates a min expression or aggregates columns to their min value.",
-    vec![
-        Example {
-            description: "Min value from columns in a dataframe",
-            example: "[[a b]; [6 2] [1 4] [4 1]] | dfr into-df | dfr min",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new("a".to_string(), vec![Value::test_int(1)],),
-                        Column::new("b".to_string(), vec![Value::test_int(1)],),
-                    ],
-                    None
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        },
-        Example {
-            description: "Min aggregation for a group-by",
-            example: r#"[[a b]; [one 2] [one 4] [two 1]]
-    | dfr into-df
-    | dfr group-by a
-    | dfr agg (dfr col b | dfr min)"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![Value::test_string("one"), Value::test_string("two")],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![Value::test_int(2), Value::test_int(1)],
-                        ),
-                    ],
-                    None
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        },
-    ],
-    min,
-    test_min
-);
-
-// ExprSum command
-// Expands to a command definition for sum aggregation
-lazy_expr_command!(
-    ExprSum,
-    "dfr sum",
-    "Creates a sum expression for an aggregation or aggregates columns to their sum value.",
-    vec![
-        Example {
-            description: "Sums all columns in a dataframe",
-            example: "[[a b]; [6 2] [1 4] [4 1]] | dfr into-df | dfr sum",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new("a".to_string(), vec![Value::test_int(11)],),
-                        Column::new("b".to_string(), vec![Value::test_int(7)],),
-                    ],
-                    None
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        },
-        Example {
-            description: "Sum aggregation for a group-by",
-            example: r#"[[a b]; [one 2] [one 4] [two 1]]
-    | dfr into-df
-    | dfr group-by a
-    | dfr agg (dfr col b | dfr sum)"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![Value::test_string("one"), Value::test_string("two")],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![Value::test_int(6), Value::test_int(1)],
-                        ),
-                    ],
-                    None
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        },
-    ],
-    sum,
-    test_sum
-);
-
-// ExprMean command
-// Expands to a command definition for mean aggregation
-lazy_expr_command!(
-    ExprMean,
-    "dfr mean",
-    "Creates a mean expression for an aggregation or aggregates columns to their mean value.",
-    vec![
-        Example {
-            description: "Mean value from columns in a dataframe",
-            example: "[[a b]; [6 2] [4 2] [2 2]] | dfr into-df | dfr mean",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new("a".to_string(), vec![Value::test_float(4.0)],),
-                        Column::new("b".to_string(), vec![Value::test_float(2.0)],),
-                    ],
-                    None
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        },
-        Example {
-            description: "Mean aggregation for a group-by",
-            example: r#"[[a b]; [one 2] [one 4] [two 1]]
-    | dfr into-df
-    | dfr group-by a
-    | dfr agg (dfr col b | dfr mean)"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![Value::test_string("one"), Value::test_string("two")],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![Value::test_float(3.0), Value::test_float(1.0)],
-                        ),
-                    ],
-                    None
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        },
-    ],
-    mean,
-    test_mean
-);
-
-// ExprMedian command
-// Expands to a command definition for median aggregation
-expr_command!(
-    ExprMedian,
-    "dfr median",
-    "Creates a median expression for an aggregation.",
-    vec![Example {
-        description: "Median aggregation for a group-by",
-        example: r#"[[a b]; [one 2] [one 4] [two 1]]
-    | dfr into-df
-    | dfr group-by a
-    | dfr agg (dfr col b | dfr median)"#,
-        result: Some(
-            NuDataFrame::try_from_columns(
-                vec![
-                    Column::new(
-                        "a".to_string(),
-                        vec![Value::test_string("one"), Value::test_string("two")],
-                    ),
-                    Column::new(
-                        "b".to_string(),
-                        vec![Value::test_float(3.0), Value::test_float(1.0)],
-                    ),
-                ],
-                None
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Span::test_data()),
-        ),
-    },],
-    median,
-    test_median
-);
-
-// ExprStd command
-// Expands to a command definition for std aggregation
-lazy_expr_command!(
-    ExprStd,
-    "dfr std",
-    "Creates a std expression for an aggregation of std value from columns in a dataframe.",
-    vec![
-        Example {
-            description: "Std value from columns in a dataframe",
-            example: "[[a b]; [6 2] [4 2] [2 2]] | dfr into-df | dfr std",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new("a".to_string(), vec![Value::test_float(2.0)],),
-                        Column::new("b".to_string(), vec![Value::test_float(0.0)],),
-                    ],
-                    None
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        },
-        Example {
-            description: "Std aggregation for a group-by",
-            example: r#"[[a b]; [one 2] [one 2] [two 1] [two 1]]
-    | dfr into-df
-    | dfr group-by a
-    | dfr agg (dfr col b | dfr std)"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![Value::test_string("one"), Value::test_string("two")],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![Value::test_float(0.0), Value::test_float(0.0)],
-                        ),
-                    ],
-                    None
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        },
-    ],
-    std,
-    test_std,
-    1
-);
-
-// ExprVar command
-// Expands to a command definition for var aggregation
-lazy_expr_command!(
-    ExprVar,
-    "dfr var",
-    "Create a var expression for an aggregation.",
-    vec![
-        Example {
-            description:
-                "Var value from columns in a dataframe or aggregates columns to their var value",
-            example: "[[a b]; [6 2] [4 2] [2 2]] | dfr into-df | dfr var",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new("a".to_string(), vec![Value::test_float(4.0)],),
-                        Column::new("b".to_string(), vec![Value::test_float(0.0)],),
-                    ],
-                    None
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        },
-        Example {
-            description: "Var aggregation for a group-by",
-            example: r#"[[a b]; [one 2] [one 2] [two 1] [two 1]]
-    | dfr into-df
-    | dfr group-by a
-    | dfr agg (dfr col b | dfr var)"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![Value::test_string("one"), Value::test_string("two")],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![Value::test_float(0.0), Value::test_float(0.0)],
-                        ),
-                    ],
-                    None
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        },
-    ],
-    var,
-    test_var,
-    1
-);
diff --git a/crates/nu-cmd-dataframe/src/dataframe/expressions/is_in.rs b/crates/nu-cmd-dataframe/src/dataframe/expressions/is_in.rs
deleted file mode 100644
index 1579ba0e20..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/expressions/is_in.rs
+++ /dev/null
@@ -1,116 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuExpression};
-use nu_engine::command_prelude::*;
-
-use polars::prelude::{lit, DataType};
-
-#[derive(Clone)]
-pub struct ExprIsIn;
-
-impl Command for ExprIsIn {
-    fn name(&self) -> &str {
-        "dfr is-in"
-    }
-
-    fn usage(&self) -> &str {
-        "Creates an is-in expression."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required(
-                "list",
-                SyntaxShape::List(Box::new(SyntaxShape::Any)),
-                "List to check if values are in",
-            )
-            .input_output_type(
-                Type::Custom("expression".into()),
-                Type::Custom("expression".into()),
-            )
-            .category(Category::Custom("expression".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Creates a is-in expression",
-            example: r#"let df = ([[a b]; [one 1] [two 2] [three 3]] | dfr into-df);
-    $df | dfr with-column (dfr col a | dfr is-in [one two] | dfr as a_in)"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![
-                                Value::test_string("one"),
-                                Value::test_string("two"),
-                                Value::test_string("three"),
-                            ],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![Value::test_int(1), Value::test_int(2), Value::test_int(3)],
-                        ),
-                        Column::new(
-                            "a_in".to_string(),
-                            vec![
-                                Value::test_bool(true),
-                                Value::test_bool(true),
-                                Value::test_bool(false),
-                            ],
-                        ),
-                    ],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["check", "contained", "is-contain", "match"]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let list: Vec<Value> = call.req(engine_state, stack, 0)?;
-        let expr = NuExpression::try_from_pipeline(input, call.head)?;
-
-        let values =
-            NuDataFrame::try_from_columns(vec![Column::new("list".to_string(), list)], None)?;
-        let list = values.as_series(call.head)?;
-
-        if matches!(list.dtype(), DataType::Object(..)) {
-            return Err(ShellError::IncompatibleParametersSingle {
-                msg: "Cannot use a mixed list as argument".into(),
-                span: call.head,
-            });
-        }
-
-        let expr: NuExpression = expr.into_polars().is_in(lit(list)).into();
-        Ok(PipelineData::Value(expr.into_value(call.head), None))
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-    use crate::dataframe::eager::WithColumn;
-    use crate::dataframe::expressions::alias::ExprAlias;
-    use crate::dataframe::expressions::col::ExprCol;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![
-            Box::new(ExprIsIn {}),
-            Box::new(ExprAlias {}),
-            Box::new(ExprCol {}),
-            Box::new(WithColumn {}),
-        ])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/expressions/lit.rs b/crates/nu-cmd-dataframe/src/dataframe/expressions/lit.rs
deleted file mode 100644
index 8610a59048..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/expressions/lit.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-use crate::dataframe::values::NuExpression;
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct ExprLit;
-
-impl Command for ExprLit {
-    fn name(&self) -> &str {
-        "dfr lit"
-    }
-
-    fn usage(&self) -> &str {
-        "Creates a literal expression."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required(
-                "literal",
-                SyntaxShape::Any,
-                "literal to construct the expression",
-            )
-            .input_output_type(Type::Any, Type::Custom("expression".into()))
-            .category(Category::Custom("expression".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Created a literal expression and converts it to a nu object",
-            example: "dfr lit 2 | dfr into-nu",
-            result: Some(Value::test_record(record! {
-                "expr" =>  Value::test_string("literal"),
-                "value" => Value::test_string("2"),
-            })),
-        }]
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["string", "literal", "expression"]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let literal: Value = call.req(engine_state, stack, 0)?;
-
-        let expr = NuExpression::try_from_value(literal)?;
-        Ok(PipelineData::Value(
-            NuExpression::into_value(expr, call.head),
-            None,
-        ))
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-    use crate::dataframe::eager::ToNu;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(ExprLit {}), Box::new(ToNu {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/expressions/mod.rs b/crates/nu-cmd-dataframe/src/dataframe/expressions/mod.rs
deleted file mode 100644
index 4ba70d900d..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/expressions/mod.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-mod alias;
-mod arg_where;
-mod col;
-mod concat_str;
-mod datepart;
-mod expressions_macro;
-mod is_in;
-mod lit;
-mod otherwise;
-mod quantile;
-mod when;
-
-use nu_protocol::engine::StateWorkingSet;
-
-pub(crate) use crate::dataframe::expressions::alias::ExprAlias;
-use crate::dataframe::expressions::arg_where::ExprArgWhere;
-pub(super) use crate::dataframe::expressions::col::ExprCol;
-pub(super) use crate::dataframe::expressions::concat_str::ExprConcatStr;
-pub(crate) use crate::dataframe::expressions::datepart::ExprDatePart;
-pub(crate) use crate::dataframe::expressions::expressions_macro::*;
-pub(super) use crate::dataframe::expressions::is_in::ExprIsIn;
-pub(super) use crate::dataframe::expressions::lit::ExprLit;
-pub(super) use crate::dataframe::expressions::otherwise::ExprOtherwise;
-pub(super) use crate::dataframe::expressions::quantile::ExprQuantile;
-pub(super) use crate::dataframe::expressions::when::ExprWhen;
-
-pub fn add_expressions(working_set: &mut StateWorkingSet) {
-    macro_rules! bind_command {
-            ( $command:expr ) => {
-                working_set.add_decl(Box::new($command));
-            };
-            ( $( $command:expr ),* ) => {
-                $( working_set.add_decl(Box::new($command)); )*
-            };
-        }
-
-    // Dataframe commands
-    bind_command!(
-        ExprAlias,
-        ExprArgWhere,
-        ExprCol,
-        ExprConcatStr,
-        ExprCount,
-        ExprLit,
-        ExprWhen,
-        ExprOtherwise,
-        ExprQuantile,
-        ExprList,
-        ExprAggGroups,
-        ExprCount,
-        ExprIsIn,
-        ExprNot,
-        ExprMax,
-        ExprMin,
-        ExprSum,
-        ExprMean,
-        ExprMedian,
-        ExprStd,
-        ExprVar,
-        ExprDatePart
-    );
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/expressions/otherwise.rs b/crates/nu-cmd-dataframe/src/dataframe/expressions/otherwise.rs
deleted file mode 100644
index eb97c575b7..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/expressions/otherwise.rs
+++ /dev/null
@@ -1,126 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuWhen};
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct ExprOtherwise;
-
-impl Command for ExprOtherwise {
-    fn name(&self) -> &str {
-        "dfr otherwise"
-    }
-
-    fn usage(&self) -> &str {
-        "Completes a when expression."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required(
-                "otherwise expression",
-                SyntaxShape::Any,
-                "expression to apply when no when predicate matches",
-            )
-            .input_output_type(Type::Any, Type::Custom("expression".into()))
-            .category(Category::Custom("expression".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Create a when conditions",
-                example: "dfr when ((dfr col a) > 2) 4 | dfr otherwise 5",
-                result: None,
-            },
-            Example {
-                description: "Create a when conditions",
-                example:
-                    "dfr when ((dfr col a) > 2) 4 | dfr when ((dfr col a) < 0) 6 | dfr otherwise 0",
-                result: None,
-            },
-            Example {
-                description: "Create a new column for the dataframe",
-                example: r#"[[a b]; [6 2] [1 4] [4 1]]
-   | dfr into-lazy
-   | dfr with-column (
-    dfr when ((dfr col a) > 2) 4 | dfr otherwise 5 | dfr as c
-     )
-   | dfr with-column (
-    dfr when ((dfr col a) > 5) 10 | dfr when ((dfr col a) < 2) 6 | dfr otherwise 0 | dfr as d
-     )
-   | dfr collect"#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new(
-                                "a".to_string(),
-                                vec![Value::test_int(6), Value::test_int(1), Value::test_int(4)],
-                            ),
-                            Column::new(
-                                "b".to_string(),
-                                vec![Value::test_int(2), Value::test_int(4), Value::test_int(1)],
-                            ),
-                            Column::new(
-                                "c".to_string(),
-                                vec![Value::test_int(4), Value::test_int(5), Value::test_int(4)],
-                            ),
-                            Column::new(
-                                "d".to_string(),
-                                vec![Value::test_int(10), Value::test_int(6), Value::test_int(0)],
-                            ),
-                        ],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-        ]
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["condition", "else"]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let otherwise_predicate: Value = call.req(engine_state, stack, 0)?;
-        let otherwise_predicate = NuExpression::try_from_value(otherwise_predicate)?;
-
-        let value = input.into_value(call.head)?;
-        let complete: NuExpression = match NuWhen::try_from_value(value)? {
-            NuWhen::Then(then) => then.otherwise(otherwise_predicate.into_polars()).into(),
-            NuWhen::ChainedThen(chained_when) => chained_when
-                .otherwise(otherwise_predicate.into_polars())
-                .into(),
-        };
-
-        Ok(PipelineData::Value(complete.into_value(call.head), None))
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use crate::dataframe::eager::{ToNu, WithColumn};
-    use crate::dataframe::expressions::when::ExprWhen;
-    use crate::dataframe::expressions::{ExprAlias, ExprCol};
-
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![
-            Box::new(WithColumn {}),
-            Box::new(ExprCol {}),
-            Box::new(ExprAlias {}),
-            Box::new(ExprWhen {}),
-            Box::new(ExprOtherwise {}),
-            Box::new(ToNu {}),
-        ])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/expressions/quantile.rs b/crates/nu-cmd-dataframe/src/dataframe/expressions/quantile.rs
deleted file mode 100644
index aaa1029ee9..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/expressions/quantile.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuExpression};
-use nu_engine::command_prelude::*;
-
-use polars::prelude::{lit, QuantileInterpolOptions};
-
-#[derive(Clone)]
-pub struct ExprQuantile;
-
-impl Command for ExprQuantile {
-    fn name(&self) -> &str {
-        "dfr quantile"
-    }
-
-    fn usage(&self) -> &str {
-        "Aggregates the columns to the selected quantile."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required(
-                "quantile",
-                SyntaxShape::Number,
-                "quantile value for quantile operation",
-            )
-            .input_output_type(
-                Type::Custom("expression".into()),
-                Type::Custom("expression".into()),
-            )
-            .category(Category::Custom("expression".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Quantile aggregation for a group-by",
-            example: r#"[[a b]; [one 2] [one 4] [two 1]]
-    | dfr into-df
-    | dfr group-by a
-    | dfr agg (dfr col b | dfr quantile 0.5)"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![Value::test_string("one"), Value::test_string("two")],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![Value::test_float(4.0), Value::test_float(1.0)],
-                        ),
-                    ],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["statistics", "percentile", "distribution"]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let value = input.into_value(call.head)?;
-        let quantile: f64 = call.req(engine_state, stack, 0)?;
-
-        let expr = NuExpression::try_from_value(value)?;
-        let expr: NuExpression = expr
-            .into_polars()
-            .quantile(lit(quantile), QuantileInterpolOptions::default())
-            .into();
-
-        Ok(PipelineData::Value(
-            NuExpression::into_value(expr, call.head),
-            None,
-        ))
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-    use crate::dataframe::lazy::aggregate::LazyAggregate;
-    use crate::dataframe::lazy::groupby::ToLazyGroupBy;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![
-            Box::new(ExprQuantile {}),
-            Box::new(LazyAggregate {}),
-            Box::new(ToLazyGroupBy {}),
-        ])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/expressions/when.rs b/crates/nu-cmd-dataframe/src/dataframe/expressions/when.rs
deleted file mode 100644
index 5a6aad2de7..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/expressions/when.rs
+++ /dev/null
@@ -1,147 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuWhen};
-use nu_engine::command_prelude::*;
-
-use polars::prelude::when;
-
-#[derive(Clone)]
-pub struct ExprWhen;
-
-impl Command for ExprWhen {
-    fn name(&self) -> &str {
-        "dfr when"
-    }
-
-    fn usage(&self) -> &str {
-        "Creates and modifies a when expression."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required(
-                "when expression",
-                SyntaxShape::Any,
-                "when expression used for matching",
-            )
-            .required(
-                "then expression",
-                SyntaxShape::Any,
-                "expression that will be applied when predicate is true",
-            )
-            .input_output_type(
-                Type::Custom("expression".into()),
-                Type::Custom("expression".into()),
-            )
-            .category(Category::Custom("expression".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Create a when conditions",
-                example: "dfr when ((dfr col a) > 2) 4",
-                result: None,
-            },
-            Example {
-                description: "Create a when conditions",
-                example: "dfr when ((dfr col a) > 2) 4 | dfr when ((dfr col a) < 0) 6",
-                result: None,
-            },
-            Example {
-                description: "Create a new column for the dataframe",
-                example: r#"[[a b]; [6 2] [1 4] [4 1]]
-   | dfr into-lazy
-   | dfr with-column (
-    dfr when ((dfr col a) > 2) 4 | dfr otherwise 5 | dfr as c
-     )
-   | dfr with-column (
-    dfr when ((dfr col a) > 5) 10 | dfr when ((dfr col a) < 2) 6 | dfr otherwise 0 | dfr as d
-     )
-   | dfr collect"#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new(
-                                "a".to_string(),
-                                vec![Value::test_int(6), Value::test_int(1), Value::test_int(4)],
-                            ),
-                            Column::new(
-                                "b".to_string(),
-                                vec![Value::test_int(2), Value::test_int(4), Value::test_int(1)],
-                            ),
-                            Column::new(
-                                "c".to_string(),
-                                vec![Value::test_int(4), Value::test_int(5), Value::test_int(4)],
-                            ),
-                            Column::new(
-                                "d".to_string(),
-                                vec![Value::test_int(10), Value::test_int(6), Value::test_int(0)],
-                            ),
-                        ],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-        ]
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["condition", "match", "if", "else"]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let when_predicate: Value = call.req(engine_state, stack, 0)?;
-        let when_predicate = NuExpression::try_from_value(when_predicate)?;
-
-        let then_predicate: Value = call.req(engine_state, stack, 1)?;
-        let then_predicate = NuExpression::try_from_value(then_predicate)?;
-
-        let value = input.into_value(call.head)?;
-        let when_then: NuWhen = match value {
-            Value::Nothing { .. } => when(when_predicate.into_polars())
-                .then(then_predicate.into_polars())
-                .into(),
-            v => match NuWhen::try_from_value(v)? {
-                NuWhen::Then(when_then) => when_then
-                    .when(when_predicate.into_polars())
-                    .then(then_predicate.into_polars())
-                    .into(),
-                NuWhen::ChainedThen(when_then_then) => when_then_then
-                    .when(when_predicate.into_polars())
-                    .then(then_predicate.into_polars())
-                    .into(),
-            },
-        };
-
-        Ok(PipelineData::Value(when_then.into_value(call.head), None))
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use crate::dataframe::eager::{ToNu, WithColumn};
-    use crate::dataframe::expressions::otherwise::ExprOtherwise;
-    use crate::dataframe::expressions::{ExprAlias, ExprCol};
-
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![
-            Box::new(WithColumn {}),
-            Box::new(ExprCol {}),
-            Box::new(ExprAlias {}),
-            Box::new(ExprWhen {}),
-            Box::new(ExprOtherwise {}),
-            Box::new(ToNu {}),
-        ])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/lazy/aggregate.rs b/crates/nu-cmd-dataframe/src/dataframe/lazy/aggregate.rs
deleted file mode 100644
index 715c3d156b..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/lazy/aggregate.rs
+++ /dev/null
@@ -1,216 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuLazyFrame, NuLazyGroupBy};
-use nu_engine::command_prelude::*;
-
-use polars::{datatypes::DataType, prelude::Expr};
-
-#[derive(Clone)]
-pub struct LazyAggregate;
-
-impl Command for LazyAggregate {
-    fn name(&self) -> &str {
-        "dfr agg"
-    }
-
-    fn usage(&self) -> &str {
-        "Performs a series of aggregations from a group-by."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .rest(
-                "Group-by expressions",
-                SyntaxShape::Any,
-                "Expression(s) that define the aggregations to be applied",
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("lazyframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Group by and perform an aggregation",
-                example: r#"[[a b]; [1 2] [1 4] [2 6] [2 4]]
-    | dfr into-df
-    | dfr group-by a
-    | dfr agg [
-        (dfr col b | dfr min | dfr as "b_min")
-        (dfr col b | dfr max | dfr as "b_max")
-        (dfr col b | dfr sum | dfr as "b_sum")
-     ]"#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new(
-                                "a".to_string(),
-                                vec![Value::test_int(1), Value::test_int(2)],
-                            ),
-                            Column::new(
-                                "b_min".to_string(),
-                                vec![Value::test_int(2), Value::test_int(4)],
-                            ),
-                            Column::new(
-                                "b_max".to_string(),
-                                vec![Value::test_int(4), Value::test_int(6)],
-                            ),
-                            Column::new(
-                                "b_sum".to_string(),
-                                vec![Value::test_int(6), Value::test_int(10)],
-                            ),
-                        ],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Group by and perform an aggregation",
-                example: r#"[[a b]; [1 2] [1 4] [2 6] [2 4]]
-    | dfr into-lazy
-    | dfr group-by a
-    | dfr agg [
-        (dfr col b | dfr min | dfr as "b_min")
-        (dfr col b | dfr max | dfr as "b_max")
-        (dfr col b | dfr sum | dfr as "b_sum")
-     ]
-    | dfr collect"#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new(
-                                "a".to_string(),
-                                vec![Value::test_int(1), Value::test_int(2)],
-                            ),
-                            Column::new(
-                                "b_min".to_string(),
-                                vec![Value::test_int(2), Value::test_int(4)],
-                            ),
-                            Column::new(
-                                "b_max".to_string(),
-                                vec![Value::test_int(4), Value::test_int(6)],
-                            ),
-                            Column::new(
-                                "b_sum".to_string(),
-                                vec![Value::test_int(6), Value::test_int(10)],
-                            ),
-                        ],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let vals: Vec<Value> = call.rest(engine_state, stack, 0)?;
-        let value = Value::list(vals, call.head);
-        let expressions = NuExpression::extract_exprs(value)?;
-
-        let group_by = NuLazyGroupBy::try_from_pipeline(input, call.head)?;
-
-        if let Some(schema) = &group_by.schema {
-            for expr in expressions.iter() {
-                if let Some(name) = get_col_name(expr) {
-                    let dtype = schema.get(name.as_str());
-
-                    if matches!(dtype, Some(DataType::Object(..))) {
-                        return Err(ShellError::GenericError {
-                            error: "Object type column not supported for aggregation".into(),
-                            msg: format!("Column '{name}' is type Object"),
-                            span: Some(call.head),
-                            help: Some("Aggregations cannot be performed on Object type columns. Use dtype command to check column types".into()),
-                            inner: vec![],
-                        });
-                    }
-                }
-            }
-        }
-
-        let lazy = NuLazyFrame {
-            from_eager: group_by.from_eager,
-            lazy: Some(group_by.into_polars().agg(&expressions)),
-            schema: None,
-        };
-
-        let res = lazy.into_value(call.head)?;
-        Ok(PipelineData::Value(res, None))
-    }
-}
-
-fn get_col_name(expr: &Expr) -> Option<String> {
-    match expr {
-        Expr::Column(column) => Some(column.to_string()),
-        Expr::Agg(agg) => match agg {
-            polars::prelude::AggExpr::Min { input: e, .. }
-            | polars::prelude::AggExpr::Max { input: e, .. }
-            | polars::prelude::AggExpr::Median(e)
-            | polars::prelude::AggExpr::NUnique(e)
-            | polars::prelude::AggExpr::First(e)
-            | polars::prelude::AggExpr::Last(e)
-            | polars::prelude::AggExpr::Mean(e)
-            | polars::prelude::AggExpr::Implode(e)
-            | polars::prelude::AggExpr::Count(e, _)
-            | polars::prelude::AggExpr::Sum(e)
-            | polars::prelude::AggExpr::AggGroups(e)
-            | polars::prelude::AggExpr::Std(e, _)
-            | polars::prelude::AggExpr::Var(e, _) => get_col_name(e.as_ref()),
-            polars::prelude::AggExpr::Quantile { expr, .. } => get_col_name(expr.as_ref()),
-        },
-        Expr::Filter { input: expr, .. }
-        | Expr::Slice { input: expr, .. }
-        | Expr::Cast { expr, .. }
-        | Expr::Sort { expr, .. }
-        | Expr::Gather { expr, .. }
-        | Expr::SortBy { expr, .. }
-        | Expr::Exclude(expr, _)
-        | Expr::Alias(expr, _)
-        | Expr::KeepName(expr)
-        | Expr::Explode(expr) => get_col_name(expr.as_ref()),
-        Expr::Ternary { .. }
-        | Expr::AnonymousFunction { .. }
-        | Expr::Function { .. }
-        | Expr::Columns(_)
-        | Expr::DtypeColumn(_)
-        | Expr::Literal(_)
-        | Expr::BinaryExpr { .. }
-        | Expr::Window { .. }
-        | Expr::Wildcard
-        | Expr::RenameAlias { .. }
-        | Expr::Len
-        | Expr::Nth(_)
-        | Expr::SubPlan(_, _)
-        | Expr::Selector(_) => None,
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-    use crate::dataframe::expressions::{ExprAlias, ExprMax, ExprMin, ExprSum};
-    use crate::dataframe::lazy::groupby::ToLazyGroupBy;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![
-            Box::new(LazyAggregate {}),
-            Box::new(ToLazyGroupBy {}),
-            Box::new(ExprAlias {}),
-            Box::new(ExprMin {}),
-            Box::new(ExprMax {}),
-            Box::new(ExprSum {}),
-        ])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/lazy/collect.rs b/crates/nu-cmd-dataframe/src/dataframe/lazy/collect.rs
deleted file mode 100644
index c27591cc1d..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/lazy/collect.rs
+++ /dev/null
@@ -1,73 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuLazyFrame};
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct LazyCollect;
-
-impl Command for LazyCollect {
-    fn name(&self) -> &str {
-        "dfr collect"
-    }
-
-    fn usage(&self) -> &str {
-        "Collect lazy dataframe into eager dataframe."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("lazyframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "drop duplicates",
-            example: "[[a b]; [1 2] [3 4]] | dfr into-lazy | dfr collect",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![Value::test_int(1), Value::test_int(3)],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![Value::test_int(2), Value::test_int(4)],
-                        ),
-                    ],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        _engine_state: &EngineState,
-        _stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let lazy = NuLazyFrame::try_from_pipeline(input, call.head)?;
-        let eager = lazy.collect(call.head)?;
-        let value = Value::custom(Box::new(eager), call.head);
-
-        Ok(PipelineData::Value(value, None))
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(LazyCollect {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/lazy/explode.rs b/crates/nu-cmd-dataframe/src/dataframe/lazy/explode.rs
deleted file mode 100644
index a027e84d36..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/lazy/explode.rs
+++ /dev/null
@@ -1,153 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuLazyFrame};
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct LazyExplode;
-
-impl Command for LazyExplode {
-    fn name(&self) -> &str {
-        "dfr explode"
-    }
-
-    fn usage(&self) -> &str {
-        "Explodes a dataframe or creates a explode expression."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .rest(
-                "columns",
-                SyntaxShape::String,
-                "columns to explode, only applicable for dataframes",
-            )
-            .input_output_types(vec![
-                (
-                    Type::Custom("expression".into()),
-                    Type::Custom("expression".into()),
-                ),
-                (
-                    Type::Custom("dataframe".into()),
-                    Type::Custom("dataframe".into()),
-                ),
-            ])
-            .category(Category::Custom("lazyframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Explode the specified dataframe",
-                example: "[[id name hobbies]; [1 Mercy [Cycling Knitting]] [2 Bob [Skiing Football]]] | dfr into-df | dfr explode hobbies | dfr collect",
-                result: Some(
-                   NuDataFrame::try_from_columns(vec![
-                    Column::new(
-                        "id".to_string(),
-                        vec![
-                            Value::test_int(1),
-                            Value::test_int(1),
-                            Value::test_int(2),
-                            Value::test_int(2),
-                        ]),
-                    Column::new(
-                        "name".to_string(),
-                        vec![
-                            Value::test_string("Mercy"),
-                            Value::test_string("Mercy"),
-                            Value::test_string("Bob"),
-                            Value::test_string("Bob"),
-                        ]),
-                    Column::new(
-                        "hobbies".to_string(),
-                        vec![
-                            Value::test_string("Cycling"),
-                            Value::test_string("Knitting"),
-                            Value::test_string("Skiing"),
-                            Value::test_string("Football"),
-                        ]),
-                   ], None).expect("simple df for test should not fail")
-                   .into_value(Span::test_data()),
-                    )
-            },
-            Example {
-                description: "Select a column and explode the values",
-                example: "[[id name hobbies]; [1 Mercy [Cycling Knitting]] [2 Bob [Skiing Football]]] | dfr into-df | dfr select (dfr col hobbies | dfr explode)",
-                result: Some(
-                   NuDataFrame::try_from_columns(vec![
-                    Column::new(
-                        "hobbies".to_string(),
-                        vec![
-                            Value::test_string("Cycling"),
-                            Value::test_string("Knitting"),
-                            Value::test_string("Skiing"),
-                            Value::test_string("Football"),
-                        ]),
-                   ], None).expect("simple df for test should not fail")
-                   .into_value(Span::test_data()),
-                    ),
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        _engine_state: &EngineState,
-        _stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        explode(call, input)
-    }
-}
-
-pub(crate) fn explode(call: &Call, input: PipelineData) -> Result<PipelineData, ShellError> {
-    let value = input.into_value(call.head)?;
-    if NuDataFrame::can_downcast(&value) {
-        let df = NuLazyFrame::try_from_value(value)?;
-        let columns: Vec<String> = call
-            .positional_iter()
-            .filter_map(|e| e.as_string())
-            .collect();
-
-        let exploded = df
-            .into_polars()
-            .explode(columns.iter().map(AsRef::as_ref).collect::<Vec<&str>>());
-
-        Ok(PipelineData::Value(
-            NuLazyFrame::from(exploded).into_value(call.head)?,
-            None,
-        ))
-    } else {
-        let expr = NuExpression::try_from_value(value)?;
-        let expr: NuExpression = expr.into_polars().explode().into();
-
-        Ok(PipelineData::Value(
-            NuExpression::into_value(expr, call.head),
-            None,
-        ))
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::{build_test_engine_state, test_dataframe_example};
-    use super::*;
-    use crate::dataframe::lazy::aggregate::LazyAggregate;
-    use crate::dataframe::lazy::groupby::ToLazyGroupBy;
-
-    #[test]
-    fn test_examples_dataframe() {
-        let mut engine_state = build_test_engine_state(vec![Box::new(LazyExplode {})]);
-        test_dataframe_example(&mut engine_state, &LazyExplode.examples()[0]);
-    }
-
-    #[ignore]
-    #[test]
-    fn test_examples_expression() {
-        let mut engine_state = build_test_engine_state(vec![
-            Box::new(LazyExplode {}),
-            Box::new(LazyAggregate {}),
-            Box::new(ToLazyGroupBy {}),
-        ]);
-        test_dataframe_example(&mut engine_state, &LazyExplode.examples()[1]);
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/lazy/fetch.rs b/crates/nu-cmd-dataframe/src/dataframe/lazy/fetch.rs
deleted file mode 100644
index 6ba75aa970..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/lazy/fetch.rs
+++ /dev/null
@@ -1,92 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuLazyFrame};
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct LazyFetch;
-
-impl Command for LazyFetch {
-    fn name(&self) -> &str {
-        "dfr fetch"
-    }
-
-    fn usage(&self) -> &str {
-        "Collects the lazyframe to the selected rows."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required(
-                "rows",
-                SyntaxShape::Int,
-                "number of rows to be fetched from lazyframe",
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("lazyframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Fetch a rows from the dataframe",
-            example: "[[a b]; [6 2] [4 2] [2 2]] | dfr into-df | dfr fetch 2",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![Value::test_int(6), Value::test_int(4)],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![Value::test_int(2), Value::test_int(2)],
-                        ),
-                    ],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let rows: i64 = call.req(engine_state, stack, 0)?;
-
-        let lazy = NuLazyFrame::try_from_pipeline(input, call.head)?;
-        let eager: NuDataFrame = lazy
-            .into_polars()
-            .fetch(rows as usize)
-            .map_err(|e| ShellError::GenericError {
-                error: "Error fetching rows".into(),
-                msg: e.to_string(),
-                span: Some(call.head),
-                help: None,
-                inner: vec![],
-            })?
-            .into();
-
-        Ok(PipelineData::Value(
-            NuDataFrame::into_value(eager, call.head),
-            None,
-        ))
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(LazyFetch {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/lazy/fill_nan.rs b/crates/nu-cmd-dataframe/src/dataframe/lazy/fill_nan.rs
deleted file mode 100644
index 4c75f1d9a3..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/lazy/fill_nan.rs
+++ /dev/null
@@ -1,143 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuExpression};
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct LazyFillNA;
-
-impl Command for LazyFillNA {
-    fn name(&self) -> &str {
-        "dfr fill-nan"
-    }
-
-    fn usage(&self) -> &str {
-        "Replaces NaN values with the given expression."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required(
-                "fill",
-                SyntaxShape::Any,
-                "Expression to use to fill the NAN values",
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("lazyframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Fills the NaN values with 0",
-                example: "[1 2 NaN 3 NaN] | dfr into-df | dfr fill-nan 0",
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![Column::new(
-                            "0".to_string(),
-                            vec![
-                                Value::test_int(1),
-                                Value::test_int(2),
-                                Value::test_int(0),
-                                Value::test_int(3),
-                                Value::test_int(0),
-                            ],
-                        )],
-                        None,
-                    )
-                    .expect("Df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Fills the NaN values of a whole dataframe",
-                example: "[[a b]; [0.2 1] [0.1 NaN]] | dfr into-df | dfr fill-nan 0",
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new(
-                                "a".to_string(),
-                                vec![Value::test_float(0.2), Value::test_float(0.1)],
-                            ),
-                            Column::new(
-                                "b".to_string(),
-                                vec![Value::test_int(1), Value::test_int(0)],
-                            ),
-                        ],
-                        None,
-                    )
-                    .expect("Df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let fill: Value = call.req(engine_state, stack, 0)?;
-        let value = input.into_value(call.head)?;
-
-        if NuExpression::can_downcast(&value) {
-            let expr = NuExpression::try_from_value(value)?;
-            let fill = NuExpression::try_from_value(fill)?.into_polars();
-            let expr: NuExpression = expr.into_polars().fill_nan(fill).into();
-
-            Ok(PipelineData::Value(
-                NuExpression::into_value(expr, call.head),
-                None,
-            ))
-        } else {
-            let val_span = value.span();
-            let frame = NuDataFrame::try_from_value(value)?;
-            let columns = frame.columns(val_span)?;
-            let dataframe = columns
-                .into_iter()
-                .map(|column| {
-                    let column_name = column.name().to_string();
-                    let values = column
-                        .into_iter()
-                        .map(|value| {
-                            let span = value.span();
-                            match value {
-                                Value::Float { val, .. } => {
-                                    if val.is_nan() {
-                                        fill.clone()
-                                    } else {
-                                        value
-                                    }
-                                }
-                                Value::List { vals, .. } => {
-                                    NuDataFrame::fill_list_nan(vals, span, fill.clone())
-                                }
-                                _ => value,
-                            }
-                        })
-                        .collect::<Vec<Value>>();
-                    Column::new(column_name, values)
-                })
-                .collect::<Vec<Column>>();
-            Ok(PipelineData::Value(
-                NuDataFrame::try_from_columns(dataframe, None)?.into_value(call.head),
-                None,
-            ))
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(LazyFillNA {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/lazy/fill_null.rs b/crates/nu-cmd-dataframe/src/dataframe/lazy/fill_null.rs
deleted file mode 100644
index 88be2a9e88..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/lazy/fill_null.rs
+++ /dev/null
@@ -1,93 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuLazyFrame};
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct LazyFillNull;
-
-impl Command for LazyFillNull {
-    fn name(&self) -> &str {
-        "dfr fill-null"
-    }
-
-    fn usage(&self) -> &str {
-        "Replaces NULL values with the given expression."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required(
-                "fill",
-                SyntaxShape::Any,
-                "Expression to use to fill the null values",
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("lazyframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Fills the null values by 0",
-            example: "[1 2 2 3 3] | dfr into-df | dfr shift 2 | dfr fill-null 0",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![
-                            Value::test_int(0),
-                            Value::test_int(0),
-                            Value::test_int(1),
-                            Value::test_int(2),
-                            Value::test_int(2),
-                        ],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let fill: Value = call.req(engine_state, stack, 0)?;
-        let value = input.into_value(call.head)?;
-
-        if NuExpression::can_downcast(&value) {
-            let expr = NuExpression::try_from_value(value)?;
-            let fill = NuExpression::try_from_value(fill)?.into_polars();
-            let expr: NuExpression = expr.into_polars().fill_null(fill).into();
-
-            Ok(PipelineData::Value(
-                NuExpression::into_value(expr, call.head),
-                None,
-            ))
-        } else {
-            let lazy = NuLazyFrame::try_from_value(value)?;
-            let expr = NuExpression::try_from_value(fill)?.into_polars();
-            let lazy = NuLazyFrame::new(lazy.from_eager, lazy.into_polars().fill_null(expr));
-
-            Ok(PipelineData::Value(lazy.into_value(call.head)?, None))
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::series::Shift;
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(LazyFillNull {}), Box::new(Shift {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/lazy/filter.rs b/crates/nu-cmd-dataframe/src/dataframe/lazy/filter.rs
deleted file mode 100644
index 5635a77e88..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/lazy/filter.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuLazyFrame};
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct LazyFilter;
-
-impl Command for LazyFilter {
-    fn name(&self) -> &str {
-        "dfr filter"
-    }
-
-    fn usage(&self) -> &str {
-        "Filter dataframe based in expression."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required(
-                "filter expression",
-                SyntaxShape::Any,
-                "Expression that define the column selection",
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("lazyframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Filter dataframe using an expression",
-            example: "[[a b]; [6 2] [4 2] [2 2]] | dfr into-df | dfr filter ((dfr col a) >= 4)",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![Value::test_int(6), Value::test_int(4)],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![Value::test_int(2), Value::test_int(2)],
-                        ),
-                    ],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let value: Value = call.req(engine_state, stack, 0)?;
-        let expression = NuExpression::try_from_value(value)?;
-
-        let lazy = NuLazyFrame::try_from_pipeline(input, call.head)?;
-        let lazy = NuLazyFrame::new(
-            lazy.from_eager,
-            lazy.into_polars().filter(expression.into_polars()),
-        );
-
-        Ok(PipelineData::Value(lazy.into_value(call.head)?, None))
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(LazyFilter {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/lazy/flatten.rs b/crates/nu-cmd-dataframe/src/dataframe/lazy/flatten.rs
deleted file mode 100644
index 602dcbcee3..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/lazy/flatten.rs
+++ /dev/null
@@ -1,126 +0,0 @@
-use super::explode::explode;
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct LazyFlatten;
-
-impl Command for LazyFlatten {
-    fn name(&self) -> &str {
-        "dfr flatten"
-    }
-
-    fn usage(&self) -> &str {
-        "An alias for dfr explode."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .rest(
-                "columns",
-                SyntaxShape::String,
-                "columns to flatten, only applicable for dataframes",
-            )
-            .input_output_types(vec![
-                (
-                    Type::Custom("expression".into()),
-                    Type::Custom("expression".into()),
-                ),
-                (
-                    Type::Custom("dataframe".into()),
-                    Type::Custom("dataframe".into()),
-                ),
-            ])
-            .category(Category::Custom("lazyframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-Example {
-                description: "Flatten the specified dataframe",
-                example: "[[id name hobbies]; [1 Mercy [Cycling Knitting]] [2 Bob [Skiing Football]]] | dfr into-df | dfr flatten hobbies | dfr collect",
-                result: Some(
-                   NuDataFrame::try_from_columns(vec![
-                    Column::new(
-                        "id".to_string(),
-                        vec![
-                            Value::test_int(1),
-                            Value::test_int(1),
-                            Value::test_int(2),
-                            Value::test_int(2),
-                        ]),
-                    Column::new(
-                        "name".to_string(),
-                        vec![
-                            Value::test_string("Mercy"),
-                            Value::test_string("Mercy"),
-                            Value::test_string("Bob"),
-                            Value::test_string("Bob"),
-                        ]),
-                    Column::new(
-                        "hobbies".to_string(),
-                        vec![
-                            Value::test_string("Cycling"),
-                            Value::test_string("Knitting"),
-                            Value::test_string("Skiing"),
-                            Value::test_string("Football"),
-                        ]),
-                   ], None).expect("simple df for test should not fail")
-                   .into_value(Span::test_data()),
-                    )
-            },
-        Example {
-                description: "Select a column and flatten the values",
-                example: "[[id name hobbies]; [1 Mercy [Cycling Knitting]] [2 Bob [Skiing Football]]] | dfr into-df | dfr select (dfr col hobbies | dfr flatten)",
-                result: Some(
-                   NuDataFrame::try_from_columns(vec![
-                    Column::new(
-                        "hobbies".to_string(),
-                        vec![
-                            Value::test_string("Cycling"),
-                            Value::test_string("Knitting"),
-                            Value::test_string("Skiing"),
-                            Value::test_string("Football"),
-                        ]),
-                   ], None).expect("simple df for test should not fail")
-                   .into_value(Span::test_data()),
-                    ),
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        _engine_state: &EngineState,
-        _stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        explode(call, input)
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::{build_test_engine_state, test_dataframe_example};
-    use super::*;
-    use crate::dataframe::lazy::aggregate::LazyAggregate;
-    use crate::dataframe::lazy::groupby::ToLazyGroupBy;
-
-    #[test]
-    fn test_examples_dataframe() {
-        let mut engine_state = build_test_engine_state(vec![Box::new(LazyFlatten {})]);
-        test_dataframe_example(&mut engine_state, &LazyFlatten.examples()[0]);
-    }
-
-    #[ignore]
-    #[test]
-    fn test_examples_expression() {
-        let mut engine_state = build_test_engine_state(vec![
-            Box::new(LazyFlatten {}),
-            Box::new(LazyAggregate {}),
-            Box::new(ToLazyGroupBy {}),
-        ]);
-        test_dataframe_example(&mut engine_state, &LazyFlatten.examples()[1]);
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/lazy/groupby.rs b/crates/nu-cmd-dataframe/src/dataframe/lazy/groupby.rs
deleted file mode 100644
index c31d563eb6..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/lazy/groupby.rs
+++ /dev/null
@@ -1,161 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuLazyFrame, NuLazyGroupBy};
-use nu_engine::command_prelude::*;
-
-use polars::prelude::Expr;
-
-#[derive(Clone)]
-pub struct ToLazyGroupBy;
-
-impl Command for ToLazyGroupBy {
-    fn name(&self) -> &str {
-        "dfr group-by"
-    }
-
-    fn usage(&self) -> &str {
-        "Creates a group-by object that can be used for other aggregations."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .rest(
-                "Group-by expressions",
-                SyntaxShape::Any,
-                "Expression(s) that define the lazy group-by",
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("lazyframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Group by and perform an aggregation",
-                example: r#"[[a b]; [1 2] [1 4] [2 6] [2 4]]
-    | dfr into-df
-    | dfr group-by a
-    | dfr agg [
-        (dfr col b | dfr min | dfr as "b_min")
-        (dfr col b | dfr max | dfr as "b_max")
-        (dfr col b | dfr sum | dfr as "b_sum")
-     ]"#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new(
-                                "a".to_string(),
-                                vec![Value::test_int(1), Value::test_int(2)],
-                            ),
-                            Column::new(
-                                "b_min".to_string(),
-                                vec![Value::test_int(2), Value::test_int(4)],
-                            ),
-                            Column::new(
-                                "b_max".to_string(),
-                                vec![Value::test_int(4), Value::test_int(6)],
-                            ),
-                            Column::new(
-                                "b_sum".to_string(),
-                                vec![Value::test_int(6), Value::test_int(10)],
-                            ),
-                        ],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Group by and perform an aggregation",
-                example: r#"[[a b]; [1 2] [1 4] [2 6] [2 4]]
-    | dfr into-lazy
-    | dfr group-by a
-    | dfr agg [
-        (dfr col b | dfr min | dfr as "b_min")
-        (dfr col b | dfr max | dfr as "b_max")
-        (dfr col b | dfr sum | dfr as "b_sum")
-     ]
-    | dfr collect"#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new(
-                                "a".to_string(),
-                                vec![Value::test_int(1), Value::test_int(2)],
-                            ),
-                            Column::new(
-                                "b_min".to_string(),
-                                vec![Value::test_int(2), Value::test_int(4)],
-                            ),
-                            Column::new(
-                                "b_max".to_string(),
-                                vec![Value::test_int(4), Value::test_int(6)],
-                            ),
-                            Column::new(
-                                "b_sum".to_string(),
-                                vec![Value::test_int(6), Value::test_int(10)],
-                            ),
-                        ],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let vals: Vec<Value> = call.rest(engine_state, stack, 0)?;
-        let value = Value::list(vals, call.head);
-        let expressions = NuExpression::extract_exprs(value)?;
-
-        if expressions
-            .iter()
-            .any(|expr| !matches!(expr, Expr::Column(..)))
-        {
-            let value: Value = call.req(engine_state, stack, 0)?;
-            return Err(ShellError::IncompatibleParametersSingle {
-                msg: "Expected only Col expressions".into(),
-                span: value.span(),
-            });
-        }
-
-        let lazy = NuLazyFrame::try_from_pipeline(input, call.head)?;
-        let group_by = NuLazyGroupBy {
-            schema: lazy.schema.clone(),
-            from_eager: lazy.from_eager,
-            group_by: Some(lazy.into_polars().group_by(&expressions)),
-        };
-
-        Ok(PipelineData::Value(group_by.into_value(call.head), None))
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-    use crate::dataframe::expressions::{ExprAlias, ExprMax, ExprMin, ExprSum};
-    use crate::dataframe::lazy::aggregate::LazyAggregate;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![
-            Box::new(LazyAggregate {}),
-            Box::new(ToLazyGroupBy {}),
-            Box::new(ExprAlias {}),
-            Box::new(ExprMin {}),
-            Box::new(ExprMax {}),
-            Box::new(ExprSum {}),
-        ])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/lazy/join.rs b/crates/nu-cmd-dataframe/src/dataframe/lazy/join.rs
deleted file mode 100644
index 4ae297acfd..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/lazy/join.rs
+++ /dev/null
@@ -1,252 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuLazyFrame};
-use nu_engine::command_prelude::*;
-
-use polars::prelude::{Expr, JoinType};
-
-#[derive(Clone)]
-pub struct LazyJoin;
-
-impl Command for LazyJoin {
-    fn name(&self) -> &str {
-        "dfr join"
-    }
-
-    fn usage(&self) -> &str {
-        "Joins a lazy frame with other lazy frame."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required("other", SyntaxShape::Any, "LazyFrame to join with")
-            .required("left_on", SyntaxShape::Any, "Left column(s) to join on")
-            .required("right_on", SyntaxShape::Any, "Right column(s) to join on")
-            .switch(
-                "inner",
-                "inner join between lazyframes (default)",
-                Some('i'),
-            )
-            .switch("left", "left join between lazyframes", Some('l'))
-            .switch("outer", "outer join between lazyframes", Some('o'))
-            .switch("cross", "cross join between lazyframes", Some('c'))
-            .named(
-                "suffix",
-                SyntaxShape::String,
-                "Suffix to use on columns with same name",
-                Some('s'),
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("lazyframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Join two lazy dataframes",
-                example: r#"let df_a = ([[a b c];[1 "a" 0] [2 "b" 1] [1 "c" 2] [1 "c" 3]] | dfr into-lazy);
-    let df_b = ([["foo" "bar" "ham"];[1 "a" "let"] [2 "c" "var"] [3 "c" "const"]] | dfr into-lazy);
-    $df_a | dfr join $df_b a foo | dfr collect"#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new(
-                                "a".to_string(),
-                                vec![
-                                    Value::test_int(1),
-                                    Value::test_int(2),
-                                    Value::test_int(1),
-                                    Value::test_int(1),
-                                ],
-                            ),
-                            Column::new(
-                                "b".to_string(),
-                                vec![
-                                    Value::test_string("a"),
-                                    Value::test_string("b"),
-                                    Value::test_string("c"),
-                                    Value::test_string("c"),
-                                ],
-                            ),
-                            Column::new(
-                                "c".to_string(),
-                                vec![
-                                    Value::test_int(0),
-                                    Value::test_int(1),
-                                    Value::test_int(2),
-                                    Value::test_int(3),
-                                ],
-                            ),
-                            Column::new(
-                                "bar".to_string(),
-                                vec![
-                                    Value::test_string("a"),
-                                    Value::test_string("c"),
-                                    Value::test_string("a"),
-                                    Value::test_string("a"),
-                                ],
-                            ),
-                            Column::new(
-                                "ham".to_string(),
-                                vec![
-                                    Value::test_string("let"),
-                                    Value::test_string("var"),
-                                    Value::test_string("let"),
-                                    Value::test_string("let"),
-                                ],
-                            ),
-                        ],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Join one eager dataframe with a lazy dataframe",
-                example: r#"let df_a = ([[a b c];[1 "a" 0] [2 "b" 1] [1 "c" 2] [1 "c" 3]] | dfr into-df);
-    let df_b = ([["foo" "bar" "ham"];[1 "a" "let"] [2 "c" "var"] [3 "c" "const"]] | dfr into-lazy);
-    $df_a | dfr join $df_b a foo"#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new(
-                                "a".to_string(),
-                                vec![
-                                    Value::test_int(1),
-                                    Value::test_int(2),
-                                    Value::test_int(1),
-                                    Value::test_int(1),
-                                ],
-                            ),
-                            Column::new(
-                                "b".to_string(),
-                                vec![
-                                    Value::test_string("a"),
-                                    Value::test_string("b"),
-                                    Value::test_string("c"),
-                                    Value::test_string("c"),
-                                ],
-                            ),
-                            Column::new(
-                                "c".to_string(),
-                                vec![
-                                    Value::test_int(0),
-                                    Value::test_int(1),
-                                    Value::test_int(2),
-                                    Value::test_int(3),
-                                ],
-                            ),
-                            Column::new(
-                                "bar".to_string(),
-                                vec![
-                                    Value::test_string("a"),
-                                    Value::test_string("c"),
-                                    Value::test_string("a"),
-                                    Value::test_string("a"),
-                                ],
-                            ),
-                            Column::new(
-                                "ham".to_string(),
-                                vec![
-                                    Value::test_string("let"),
-                                    Value::test_string("var"),
-                                    Value::test_string("let"),
-                                    Value::test_string("let"),
-                                ],
-                            ),
-                        ],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let left = call.has_flag(engine_state, stack, "left")?;
-        let outer = call.has_flag(engine_state, stack, "outer")?;
-        let cross = call.has_flag(engine_state, stack, "cross")?;
-
-        let how = if left {
-            JoinType::Left
-        } else if outer {
-            JoinType::Outer { coalesce: true }
-        } else if cross {
-            JoinType::Cross
-        } else {
-            JoinType::Inner
-        };
-
-        let other: Value = call.req(engine_state, stack, 0)?;
-        let other = NuLazyFrame::try_from_value(other)?;
-        let other = other.into_polars();
-
-        let left_on: Value = call.req(engine_state, stack, 1)?;
-        let left_on = NuExpression::extract_exprs(left_on)?;
-
-        let right_on: Value = call.req(engine_state, stack, 2)?;
-        let right_on = NuExpression::extract_exprs(right_on)?;
-
-        if left_on.len() != right_on.len() {
-            let right_on: Value = call.req(engine_state, stack, 2)?;
-            return Err(ShellError::IncompatibleParametersSingle {
-                msg: "The right column list has a different size to the left column list".into(),
-                span: right_on.span(),
-            });
-        }
-
-        // Checking that both list of expressions are made out of col expressions or strings
-        for (index, list) in &[(1usize, &left_on), (2, &left_on)] {
-            if list.iter().any(|expr| !matches!(expr, Expr::Column(..))) {
-                let value: Value = call.req(engine_state, stack, *index)?;
-                return Err(ShellError::IncompatibleParametersSingle {
-                    msg: "Expected only a string, col expressions or list of strings".into(),
-                    span: value.span(),
-                });
-            }
-        }
-
-        let suffix: Option<String> = call.get_flag(engine_state, stack, "suffix")?;
-        let suffix = suffix.unwrap_or_else(|| "_x".into());
-
-        let value = input.into_value(call.head)?;
-        let lazy = NuLazyFrame::try_from_value(value)?;
-        let from_eager = lazy.from_eager;
-        let lazy = lazy.into_polars();
-
-        let lazy = lazy
-            .join_builder()
-            .with(other)
-            .left_on(left_on)
-            .right_on(right_on)
-            .how(how)
-            .force_parallel(true)
-            .suffix(suffix)
-            .finish();
-
-        let lazy = NuLazyFrame::new(from_eager, lazy);
-
-        Ok(PipelineData::Value(lazy.into_value(call.head)?, None))
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(LazyJoin {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/lazy/macro_commands.rs b/crates/nu-cmd-dataframe/src/dataframe/lazy/macro_commands.rs
deleted file mode 100644
index 89655b8e3f..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/lazy/macro_commands.rs
+++ /dev/null
@@ -1,246 +0,0 @@
-/// Definition of multiple lazyframe commands using a macro rule
-/// All of these commands have an identical body and only require
-/// to have a change in the name, description and function
-use crate::dataframe::values::{Column, NuDataFrame, NuLazyFrame};
-use nu_engine::command_prelude::*;
-
-macro_rules! lazy_command {
-    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident, $test: ident) => {
-        #[derive(Clone)]
-        pub struct $command;
-
-        impl Command for $command {
-            fn name(&self) -> &str {
-                $name
-            }
-
-            fn usage(&self) -> &str {
-                $desc
-            }
-
-            fn signature(&self) -> Signature {
-                Signature::build(self.name())
-                    .input_output_type(
-                        Type::Custom("dataframe".into()),
-                        Type::Custom("dataframe".into()),
-                    )
-                    .category(Category::Custom("lazyframe".into()))
-            }
-
-            fn examples(&self) -> Vec<Example> {
-                $examples
-            }
-
-            fn run(
-                &self,
-                _engine_state: &EngineState,
-                _stack: &mut Stack,
-                call: &Call,
-                input: PipelineData,
-            ) -> Result<PipelineData, ShellError> {
-                let lazy = NuLazyFrame::try_from_pipeline(input, call.head)?;
-                let lazy = NuLazyFrame::new(lazy.from_eager, lazy.into_polars().$func());
-
-                Ok(PipelineData::Value(lazy.into_value(call.head)?, None))
-            }
-        }
-
-        #[cfg(test)]
-        mod $test {
-            use super::super::super::test_dataframe::test_dataframe;
-            use super::*;
-
-            #[test]
-            fn test_examples() {
-                test_dataframe(vec![Box::new($command {})])
-            }
-        }
-    };
-
-    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident, $test: ident, $ddot: expr) => {
-        #[derive(Clone)]
-        pub struct $command;
-
-        impl Command for $command {
-            fn name(&self) -> &str {
-                $name
-            }
-
-            fn usage(&self) -> &str {
-                $desc
-            }
-
-            fn signature(&self) -> Signature {
-                Signature::build(self.name())
-                    .input_output_type(
-                        Type::Custom("dataframe".into()),
-                        Type::Custom("dataframe".into()),
-                    )
-                    .category(Category::Custom("lazyframe".into()))
-            }
-
-            fn examples(&self) -> Vec<Example> {
-                $examples
-            }
-
-            fn run(
-                &self,
-                _engine_state: &EngineState,
-                _stack: &mut Stack,
-                call: &Call,
-                input: PipelineData,
-            ) -> Result<PipelineData, ShellError> {
-                let lazy = NuLazyFrame::try_from_pipeline(input, call.head)?;
-                let lazy = NuLazyFrame::new(lazy.from_eager, lazy.into_polars().$func($ddot));
-
-                Ok(PipelineData::Value(lazy.into_value(call.head)?, None))
-            }
-        }
-
-        #[cfg(test)]
-        mod $test {
-            use super::super::super::test_dataframe::test_dataframe;
-            use super::*;
-
-            #[test]
-            fn test_examples() {
-                test_dataframe(vec![Box::new($command {})])
-            }
-        }
-    };
-
-    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident?, $test: ident) => {
-        #[derive(Clone)]
-        pub struct $command;
-
-        impl Command for $command {
-            fn name(&self) -> &str {
-                $name
-            }
-
-            fn usage(&self) -> &str {
-                $desc
-            }
-
-            fn signature(&self) -> Signature {
-                Signature::build(self.name())
-                    .input_output_type(
-                        Type::Custom("dataframe".into()),
-                        Type::Custom("dataframe".into()),
-                    )
-                    .category(Category::Custom("lazyframe".into()))
-            }
-
-            fn examples(&self) -> Vec<Example> {
-                $examples
-            }
-
-            fn run(
-                &self,
-                _engine_state: &EngineState,
-                _stack: &mut Stack,
-                call: &Call,
-                input: PipelineData,
-            ) -> Result<PipelineData, ShellError> {
-                let lazy = NuLazyFrame::try_from_pipeline(input, call.head)?;
-
-                let lazy = NuLazyFrame::new(
-                    lazy.from_eager,
-                    lazy.into_polars()
-                        .$func()
-                        .map_err(|e| ShellError::GenericError {
-                            error: "Dataframe Error".into(),
-                            msg: e.to_string(),
-                            help: None,
-                            span: None,
-                            inner: vec![],
-                        })?,
-                );
-
-                Ok(PipelineData::Value(lazy.into_value(call.head)?, None))
-            }
-        }
-
-        #[cfg(test)]
-        mod $test {
-            use super::super::super::test_dataframe::test_dataframe;
-            use super::*;
-
-            #[test]
-            fn test_examples() {
-                test_dataframe(vec![Box::new($command {})])
-            }
-        }
-    };
-}
-
-// LazyReverse command
-// Expands to a command definition for reverse
-lazy_command!(
-    LazyReverse,
-    "dfr reverse",
-    "Reverses the LazyFrame",
-    vec![Example {
-        description: "Reverses the dataframe.",
-        example: "[[a b]; [6 2] [4 2] [2 2]] | dfr into-df | dfr reverse",
-        result: Some(
-            NuDataFrame::try_from_columns(
-                vec![
-                    Column::new(
-                        "a".to_string(),
-                        vec![Value::test_int(2), Value::test_int(4), Value::test_int(6),],
-                    ),
-                    Column::new(
-                        "b".to_string(),
-                        vec![Value::test_int(2), Value::test_int(2), Value::test_int(2),],
-                    ),
-                ],
-                None
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Span::test_data()),
-        ),
-    },],
-    reverse,
-    test_reverse
-);
-
-// LazyCache command
-// Expands to a command definition for cache
-lazy_command!(
-    LazyCache,
-    "dfr cache",
-    "Caches operations in a new LazyFrame.",
-    vec![Example {
-        description: "Caches the result into a new LazyFrame",
-        example: "[[a b]; [6 2] [4 2] [2 2]] | dfr into-df | dfr reverse | dfr cache",
-        result: None,
-    }],
-    cache,
-    test_cache
-);
-
-// LazyMedian command
-// Expands to a command definition for median aggregation
-lazy_command!(
-    LazyMedian,
-    "dfr median",
-    "Aggregates columns to their median value",
-    vec![Example {
-        description: "Median value from columns in a dataframe",
-        example: "[[a b]; [6 2] [4 2] [2 2]] | dfr into-df | dfr median",
-        result: Some(
-            NuDataFrame::try_from_columns(
-                vec![
-                    Column::new("a".to_string(), vec![Value::test_float(4.0)],),
-                    Column::new("b".to_string(), vec![Value::test_float(2.0)],),
-                ],
-                None
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Span::test_data()),
-        ),
-    },],
-    median?,
-    test_median
-);
diff --git a/crates/nu-cmd-dataframe/src/dataframe/lazy/mod.rs b/crates/nu-cmd-dataframe/src/dataframe/lazy/mod.rs
deleted file mode 100644
index cbbc4e8589..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/lazy/mod.rs
+++ /dev/null
@@ -1,65 +0,0 @@
-pub mod aggregate;
-mod collect;
-mod explode;
-mod fetch;
-mod fill_nan;
-mod fill_null;
-mod filter;
-mod flatten;
-pub mod groupby;
-mod join;
-mod macro_commands;
-mod quantile;
-mod select;
-mod sort_by_expr;
-mod to_lazy;
-
-use nu_protocol::engine::StateWorkingSet;
-
-use crate::dataframe::lazy::aggregate::LazyAggregate;
-pub use crate::dataframe::lazy::collect::LazyCollect;
-use crate::dataframe::lazy::fetch::LazyFetch;
-use crate::dataframe::lazy::fill_nan::LazyFillNA;
-pub use crate::dataframe::lazy::fill_null::LazyFillNull;
-use crate::dataframe::lazy::filter::LazyFilter;
-use crate::dataframe::lazy::groupby::ToLazyGroupBy;
-use crate::dataframe::lazy::join::LazyJoin;
-pub(crate) use crate::dataframe::lazy::macro_commands::*;
-use crate::dataframe::lazy::quantile::LazyQuantile;
-pub(crate) use crate::dataframe::lazy::select::LazySelect;
-use crate::dataframe::lazy::sort_by_expr::LazySortBy;
-pub use crate::dataframe::lazy::to_lazy::ToLazyFrame;
-pub use explode::LazyExplode;
-pub use flatten::LazyFlatten;
-
-pub fn add_lazy_decls(working_set: &mut StateWorkingSet) {
-    macro_rules! bind_command {
-            ( $command:expr ) => {
-                working_set.add_decl(Box::new($command));
-            };
-            ( $( $command:expr ),* ) => {
-                $( working_set.add_decl(Box::new($command)); )*
-            };
-        }
-
-    // Dataframe commands
-    bind_command!(
-        LazyAggregate,
-        LazyCache,
-        LazyCollect,
-        LazyFetch,
-        LazyFillNA,
-        LazyFillNull,
-        LazyFilter,
-        LazyJoin,
-        LazyQuantile,
-        LazyMedian,
-        LazyReverse,
-        LazySelect,
-        LazySortBy,
-        ToLazyFrame,
-        ToLazyGroupBy,
-        LazyExplode,
-        LazyFlatten
-    );
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/lazy/quantile.rs b/crates/nu-cmd-dataframe/src/dataframe/lazy/quantile.rs
deleted file mode 100644
index ac8ec590c6..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/lazy/quantile.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuLazyFrame};
-use nu_engine::command_prelude::*;
-
-use polars::prelude::{lit, QuantileInterpolOptions};
-
-#[derive(Clone)]
-pub struct LazyQuantile;
-
-impl Command for LazyQuantile {
-    fn name(&self) -> &str {
-        "dfr quantile"
-    }
-
-    fn usage(&self) -> &str {
-        "Aggregates the columns to the selected quantile."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required(
-                "quantile",
-                SyntaxShape::Number,
-                "quantile value for quantile operation",
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("lazyframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "quantile value from columns in a dataframe",
-            example: "[[a b]; [6 2] [1 4] [4 1]] | dfr into-df | dfr quantile 0.5",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new("a".to_string(), vec![Value::test_float(4.0)]),
-                        Column::new("b".to_string(), vec![Value::test_float(2.0)]),
-                    ],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let value = input.into_value(call.head)?;
-        let quantile: f64 = call.req(engine_state, stack, 0)?;
-
-        let lazy = NuLazyFrame::try_from_value(value)?;
-        let lazy = NuLazyFrame::new(
-            lazy.from_eager,
-            lazy.into_polars()
-                .quantile(lit(quantile), QuantileInterpolOptions::default())
-                .map_err(|e| ShellError::GenericError {
-                    error: "Dataframe Error".into(),
-                    msg: e.to_string(),
-                    help: None,
-                    span: None,
-                    inner: vec![],
-                })?,
-        );
-
-        Ok(PipelineData::Value(lazy.into_value(call.head)?, None))
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(LazyQuantile {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/lazy/select.rs b/crates/nu-cmd-dataframe/src/dataframe/lazy/select.rs
deleted file mode 100644
index b4f01bdc07..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/lazy/select.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuLazyFrame};
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct LazySelect;
-
-impl Command for LazySelect {
-    fn name(&self) -> &str {
-        "dfr select"
-    }
-
-    fn usage(&self) -> &str {
-        "Selects columns from lazyframe."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .rest(
-                "select expressions",
-                SyntaxShape::Any,
-                "Expression(s) that define the column selection",
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("lazyframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Select a column from the dataframe",
-            example: "[[a b]; [6 2] [4 2] [2 2]] | dfr into-df | dfr select a",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "a".to_string(),
-                        vec![Value::test_int(6), Value::test_int(4), Value::test_int(2)],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let vals: Vec<Value> = call.rest(engine_state, stack, 0)?;
-        let value = Value::list(vals, call.head);
-        let expressions = NuExpression::extract_exprs(value)?;
-
-        let lazy = NuLazyFrame::try_from_pipeline(input, call.head)?;
-        let lazy = NuLazyFrame::new(lazy.from_eager, lazy.into_polars().select(&expressions));
-
-        Ok(PipelineData::Value(lazy.into_value(call.head)?, None))
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(LazySelect {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/lazy/sort_by_expr.rs b/crates/nu-cmd-dataframe/src/dataframe/lazy/sort_by_expr.rs
deleted file mode 100644
index 2e109338a9..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/lazy/sort_by_expr.rs
+++ /dev/null
@@ -1,159 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuLazyFrame};
-use nu_engine::command_prelude::*;
-use polars::chunked_array::ops::SortMultipleOptions;
-
-#[derive(Clone)]
-pub struct LazySortBy;
-
-impl Command for LazySortBy {
-    fn name(&self) -> &str {
-        "dfr sort-by"
-    }
-
-    fn usage(&self) -> &str {
-        "Sorts a lazy dataframe based on expression(s)."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .rest(
-                "sort expression",
-                SyntaxShape::Any,
-                "sort expression for the dataframe",
-            )
-            .named(
-                "reverse",
-                SyntaxShape::List(Box::new(SyntaxShape::Boolean)),
-                "Reverse sorting. Default is false",
-                Some('r'),
-            )
-            .switch(
-                "nulls-last",
-                "nulls are shown last in the dataframe",
-                Some('n'),
-            )
-            .switch("maintain-order", "Maintains order during sort", Some('m'))
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("lazyframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Sort dataframe by one column",
-                example: "[[a b]; [6 2] [1 4] [4 1]] | dfr into-df | dfr sort-by a",
-                result: Some(
-                    NuDataFrame::try_from_columns(vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![Value::test_int(1), Value::test_int(4), Value::test_int(6)],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![Value::test_int(4), Value::test_int(1), Value::test_int(2)],
-                        ),
-                    ], None)
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Sort column using two columns",
-                example:
-                    "[[a b]; [6 2] [1 1] [1 4] [2 4]] | dfr into-df | dfr sort-by [a b] -r [false true]",
-                result: Some(
-                    NuDataFrame::try_from_columns(vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![
-                                Value::test_int(1),
-                                Value::test_int(1),
-                                Value::test_int(2),
-                                Value::test_int(6),
-                            ],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![
-                                Value::test_int(4),
-                                Value::test_int(1),
-                                Value::test_int(4),
-                                Value::test_int(2),
-                            ],
-                        ),
-                    ], None)
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let vals: Vec<Value> = call.rest(engine_state, stack, 0)?;
-        let value = Value::list(vals, call.head);
-        let expressions = NuExpression::extract_exprs(value)?;
-        let nulls_last = call.has_flag(engine_state, stack, "nulls-last")?;
-        let maintain_order = call.has_flag(engine_state, stack, "maintain-order")?;
-
-        let reverse: Option<Vec<bool>> = call.get_flag(engine_state, stack, "reverse")?;
-        let reverse = match reverse {
-            Some(list) => {
-                if expressions.len() != list.len() {
-                    let span = call
-                        .get_flag::<Value>(engine_state, stack, "reverse")?
-                        .expect("already checked and it exists")
-                        .span();
-                    return Err(ShellError::GenericError {
-                        error: "Incorrect list size".into(),
-                        msg: "Size doesn't match expression list".into(),
-                        span: Some(span),
-                        help: None,
-                        inner: vec![],
-                    });
-                } else {
-                    list
-                }
-            }
-            None => expressions.iter().map(|_| false).collect::<Vec<bool>>(),
-        };
-
-        let sort_options = SortMultipleOptions {
-            descending: reverse,
-            nulls_last,
-            multithreaded: true,
-            maintain_order,
-        };
-
-        let lazy = NuLazyFrame::try_from_pipeline(input, call.head)?;
-        let lazy = NuLazyFrame::new(
-            lazy.from_eager,
-            lazy.into_polars().sort_by_exprs(&expressions, sort_options),
-        );
-
-        Ok(PipelineData::Value(
-            NuLazyFrame::into_value(lazy, call.head)?,
-            None,
-        ))
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(LazySortBy {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/lazy/to_lazy.rs b/crates/nu-cmd-dataframe/src/dataframe/lazy/to_lazy.rs
deleted file mode 100644
index 1c711cdd57..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/lazy/to_lazy.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-use crate::dataframe::values::{NuDataFrame, NuLazyFrame, NuSchema};
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct ToLazyFrame;
-
-impl Command for ToLazyFrame {
-    fn name(&self) -> &str {
-        "dfr into-lazy"
-    }
-
-    fn usage(&self) -> &str {
-        "Converts a dataframe into a lazy dataframe."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .named(
-                "schema",
-                SyntaxShape::Record(vec![]),
-                r#"Polars Schema in format [{name: str}]. CSV, JSON, and JSONL files"#,
-                Some('s'),
-            )
-            .input_output_type(Type::Any, Type::Custom("dataframe".into()))
-            .category(Category::Custom("lazyframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Takes a dictionary and creates a lazy dataframe",
-            example: "[[a b];[1 2] [3 4]] | dfr into-lazy",
-            result: None,
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let maybe_schema = call
-            .get_flag(engine_state, stack, "schema")?
-            .map(|schema| NuSchema::try_from(&schema))
-            .transpose()?;
-
-        let df = NuDataFrame::try_from_iter(input.into_iter(), maybe_schema)?;
-        let lazy = NuLazyFrame::from_dataframe(df);
-        let value = Value::custom(Box::new(lazy), call.head);
-        Ok(PipelineData::Value(value, None))
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/mod.rs b/crates/nu-cmd-dataframe/src/dataframe/mod.rs
deleted file mode 100644
index d99ce516be..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/mod.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-mod eager;
-mod expressions;
-mod lazy;
-mod series;
-mod stub;
-mod utils;
-mod values;
-
-pub use eager::add_eager_decls;
-pub use expressions::add_expressions;
-pub use lazy::add_lazy_decls;
-pub use series::add_series_decls;
-
-use nu_protocol::engine::{EngineState, StateWorkingSet};
-
-pub fn add_dataframe_context(mut engine_state: EngineState) -> EngineState {
-    let delta = {
-        let mut working_set = StateWorkingSet::new(&engine_state);
-        working_set.add_decl(Box::new(stub::Dfr));
-        add_series_decls(&mut working_set);
-        add_eager_decls(&mut working_set);
-        add_expressions(&mut working_set);
-        add_lazy_decls(&mut working_set);
-
-        working_set.render()
-    };
-
-    if let Err(err) = engine_state.merge_delta(delta) {
-        eprintln!("Error creating dataframe command context: {err:?}");
-    }
-
-    engine_state
-}
-
-#[cfg(test)]
-mod test_dataframe;
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/all_false.rs b/crates/nu-cmd-dataframe/src/dataframe/series/all_false.rs
deleted file mode 100644
index 66921e793c..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/all_false.rs
+++ /dev/null
@@ -1,108 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct AllFalse;
-
-impl Command for AllFalse {
-    fn name(&self) -> &str {
-        "dfr all-false"
-    }
-
-    fn usage(&self) -> &str {
-        "Returns true if all values are false."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Returns true if all values are false",
-                example: "[false false false] | dfr into-df | dfr all-false",
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![Column::new(
-                            "all_false".to_string(),
-                            vec![Value::test_bool(true)],
-                        )],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Checks the result from a comparison",
-                example: r#"let s = ([5 6 2 10] | dfr into-df);
-    let res = ($s > 9);
-    $res | dfr all-false"#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![Column::new(
-                            "all_false".to_string(),
-                            vec![Value::test_bool(false)],
-                        )],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-
-    let series = df.as_series(call.head)?;
-    let bool = series.bool().map_err(|_| ShellError::GenericError {
-        error: "Error converting to bool".into(),
-        msg: "all-false only works with series of type bool".into(),
-        span: Some(call.head),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let value = Value::bool(!bool.any(), call.head);
-
-    NuDataFrame::try_from_columns(
-        vec![Column::new("all_false".to_string(), vec![value])],
-        None,
-    )
-    .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(AllFalse {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/all_true.rs b/crates/nu-cmd-dataframe/src/dataframe/series/all_true.rs
deleted file mode 100644
index 16b4a9edd9..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/all_true.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct AllTrue;
-
-impl Command for AllTrue {
-    fn name(&self) -> &str {
-        "dfr all-true"
-    }
-
-    fn usage(&self) -> &str {
-        "Returns true if all values are true."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Returns true if all values are true",
-                example: "[true true true] | dfr into-df | dfr all-true",
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![Column::new(
-                            "all_true".to_string(),
-                            vec![Value::test_bool(true)],
-                        )],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Checks the result from a comparison",
-                example: r#"let s = ([5 6 2 8] | dfr into-df);
-    let res = ($s > 9);
-    $res | dfr all-true"#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![Column::new(
-                            "all_true".to_string(),
-                            vec![Value::test_bool(false)],
-                        )],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-
-    let series = df.as_series(call.head)?;
-    let bool = series.bool().map_err(|_| ShellError::GenericError {
-        error: "Error converting to bool".into(),
-        msg: "all-false only works with series of type bool".into(),
-        span: Some(call.head),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let value = Value::bool(bool.all(), call.head);
-
-    NuDataFrame::try_from_columns(vec![Column::new("all_true".to_string(), vec![value])], None)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(AllTrue {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/arg_max.rs b/crates/nu-cmd-dataframe/src/dataframe/series/arg_max.rs
deleted file mode 100644
index d7539401ab..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/arg_max.rs
+++ /dev/null
@@ -1,85 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-use polars::prelude::{ArgAgg, IntoSeries, NewChunkedArray, UInt32Chunked};
-
-#[derive(Clone)]
-pub struct ArgMax;
-
-impl Command for ArgMax {
-    fn name(&self) -> &str {
-        "dfr arg-max"
-    }
-
-    fn usage(&self) -> &str {
-        "Return index for max value in series."
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["argmax", "maximum", "most", "largest", "greatest"]
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns index for max value",
-            example: "[1 3 2] | dfr into-df | dfr arg-max",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new("arg_max".to_string(), vec![Value::test_int(1)])],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let series = df.as_series(call.head)?;
-
-    let res = series.arg_max();
-    let chunked = match res {
-        Some(index) => UInt32Chunked::from_slice("arg_max", &[index as u32]),
-        None => UInt32Chunked::from_slice("arg_max", &[]),
-    };
-
-    let res = chunked.into_series();
-    NuDataFrame::try_from_series(vec![res], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(ArgMax {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/arg_min.rs b/crates/nu-cmd-dataframe/src/dataframe/series/arg_min.rs
deleted file mode 100644
index 1b685d65b4..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/arg_min.rs
+++ /dev/null
@@ -1,85 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-use polars::prelude::{ArgAgg, IntoSeries, NewChunkedArray, UInt32Chunked};
-
-#[derive(Clone)]
-pub struct ArgMin;
-
-impl Command for ArgMin {
-    fn name(&self) -> &str {
-        "dfr arg-min"
-    }
-
-    fn usage(&self) -> &str {
-        "Return index for min value in series."
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["argmin", "minimum", "least", "smallest", "lowest"]
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns index for min value",
-            example: "[1 3 2] | dfr into-df | dfr arg-min",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new("arg_min".to_string(), vec![Value::test_int(0)])],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let series = df.as_series(call.head)?;
-
-    let res = series.arg_min();
-    let chunked = match res {
-        Some(index) => UInt32Chunked::from_slice("arg_min", &[index as u32]),
-        None => UInt32Chunked::from_slice("arg_min", &[]),
-    };
-
-    let res = chunked.into_series();
-    NuDataFrame::try_from_series(vec![res], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(ArgMin {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/cumulative.rs b/crates/nu-cmd-dataframe/src/dataframe/series/cumulative.rs
deleted file mode 100644
index c32875e87b..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/cumulative.rs
+++ /dev/null
@@ -1,148 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-
-use polars::prelude::{DataType, IntoSeries};
-use polars_ops::prelude::{cum_max, cum_min, cum_sum};
-
-enum CumType {
-    Min,
-    Max,
-    Sum,
-}
-
-impl CumType {
-    fn from_str(roll_type: &str, span: Span) -> Result<Self, ShellError> {
-        match roll_type {
-            "min" => Ok(Self::Min),
-            "max" => Ok(Self::Max),
-            "sum" => Ok(Self::Sum),
-            _ => Err(ShellError::GenericError {
-                error: "Wrong operation".into(),
-                msg: "Operation not valid for cumulative".into(),
-                span: Some(span),
-                help: Some("Allowed values: max, min, sum".into()),
-                inner: vec![],
-            }),
-        }
-    }
-
-    fn to_str(&self) -> &'static str {
-        match self {
-            CumType::Min => "cumulative_min",
-            CumType::Max => "cumulative_max",
-            CumType::Sum => "cumulative_sum",
-        }
-    }
-}
-
-#[derive(Clone)]
-pub struct Cumulative;
-
-impl Command for Cumulative {
-    fn name(&self) -> &str {
-        "dfr cumulative"
-    }
-
-    fn usage(&self) -> &str {
-        "Cumulative calculation for a series."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required("type", SyntaxShape::String, "rolling operation")
-            .switch("reverse", "Reverse cumulative calculation", Some('r'))
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Cumulative sum for a series",
-            example: "[1 2 3 4 5] | dfr into-df | dfr cumulative sum",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0_cumulative_sum".to_string(),
-                        vec![
-                            Value::test_int(1),
-                            Value::test_int(3),
-                            Value::test_int(6),
-                            Value::test_int(10),
-                            Value::test_int(15),
-                        ],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let cum_type: Spanned<String> = call.req(engine_state, stack, 0)?;
-    let reverse = call.has_flag(engine_state, stack, "reverse")?;
-
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let series = df.as_series(call.head)?;
-
-    if let DataType::Object(..) = series.dtype() {
-        return Err(ShellError::GenericError {
-            error: "Found object series".into(),
-            msg: "Series of type object cannot be used for cumulative operation".into(),
-            span: Some(call.head),
-            help: None,
-            inner: vec![],
-        });
-    }
-
-    let cum_type = CumType::from_str(&cum_type.item, cum_type.span)?;
-    let mut res = match cum_type {
-        CumType::Max => cum_max(&series, reverse),
-        CumType::Min => cum_min(&series, reverse),
-        CumType::Sum => cum_sum(&series, reverse),
-    }
-    .map_err(|e| ShellError::GenericError {
-        error: "Error creating cumulative".into(),
-        msg: e.to_string(),
-        span: Some(call.head),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let name = format!("{}_{}", series.name(), cum_type.to_str());
-    res.rename(&name);
-
-    NuDataFrame::try_from_series(vec![res.into_series()], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(Cumulative {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/date/as_date.rs b/crates/nu-cmd-dataframe/src/dataframe/series/date/as_date.rs
deleted file mode 100644
index b406057572..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/date/as_date.rs
+++ /dev/null
@@ -1,94 +0,0 @@
-use crate::dataframe::values::NuDataFrame;
-use nu_engine::command_prelude::*;
-
-use polars::prelude::{IntoSeries, StringMethods};
-
-#[derive(Clone)]
-pub struct AsDate;
-
-impl Command for AsDate {
-    fn name(&self) -> &str {
-        "dfr as-date"
-    }
-
-    fn usage(&self) -> &str {
-        r#"Converts string to date."#
-    }
-
-    fn extra_usage(&self) -> &str {
-        r#"Format example:
-        "%Y-%m-%d"    => 2021-12-31
-        "%d-%m-%Y"    => 31-12-2021
-        "%Y%m%d"      => 2021319 (2021-03-19)"#
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required("format", SyntaxShape::String, "formatting date string")
-            .switch("not-exact", "the format string may be contained in the date (e.g. foo-2021-01-01-bar could match 2021-01-01)", Some('n'))
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Converts string to date",
-            example: r#"["2021-12-30" "2021-12-31"] | dfr into-df | dfr as-datetime "%Y-%m-%d""#,
-            result: None,
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let format: String = call.req(engine_state, stack, 0)?;
-    let not_exact = call.has_flag(engine_state, stack, "not-exact")?;
-
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let series = df.as_series(call.head)?;
-    let casted = series.str().map_err(|e| ShellError::GenericError {
-        error: "Error casting to string".into(),
-        msg: e.to_string(),
-        span: Some(call.head),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let res = if not_exact {
-        casted.as_date_not_exact(Some(format.as_str()))
-    } else {
-        casted.as_date(Some(format.as_str()), false)
-    };
-
-    let mut res = res
-        .map_err(|e| ShellError::GenericError {
-            error: "Error creating datetime".into(),
-            msg: e.to_string(),
-            span: Some(call.head),
-            help: None,
-            inner: vec![],
-        })?
-        .into_series();
-
-    res.rename("date");
-
-    NuDataFrame::try_from_series(vec![res], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/date/as_datetime.rs b/crates/nu-cmd-dataframe/src/dataframe/series/date/as_datetime.rs
deleted file mode 100644
index 6ee979b069..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/date/as_datetime.rs
+++ /dev/null
@@ -1,187 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use chrono::DateTime;
-use nu_engine::command_prelude::*;
-
-use polars::prelude::{IntoSeries, StringMethods, TimeUnit};
-
-#[derive(Clone)]
-pub struct AsDateTime;
-
-impl Command for AsDateTime {
-    fn name(&self) -> &str {
-        "dfr as-datetime"
-    }
-
-    fn usage(&self) -> &str {
-        r#"Converts string to datetime."#
-    }
-
-    fn extra_usage(&self) -> &str {
-        r#"Format example:
-        "%y/%m/%d %H:%M:%S"  => 21/12/31 12:54:98
-        "%y-%m-%d %H:%M:%S"  => 2021-12-31 24:58:01
-        "%y/%m/%d %H:%M:%S"  => 21/12/31 24:58:01
-        "%y%m%d %H:%M:%S"    => 210319 23:58:50
-        "%Y/%m/%d %H:%M:%S"  => 2021/12/31 12:54:98
-        "%Y-%m-%d %H:%M:%S"  => 2021-12-31 24:58:01
-        "%Y/%m/%d %H:%M:%S"  => 2021/12/31 24:58:01
-        "%Y%m%d %H:%M:%S"    => 20210319 23:58:50
-        "%FT%H:%M:%S"        => 2019-04-18T02:45:55
-        "%FT%H:%M:%S.%6f"    => microseconds
-        "%FT%H:%M:%S.%9f"    => nanoseconds"#
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required("format", SyntaxShape::String, "formatting date time string")
-            .switch("not-exact", "the format string may be contained in the date (e.g. foo-2021-01-01-bar could match 2021-01-01)", Some('n'))
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Converts string to datetime",
-                example: r#"["2021-12-30 00:00:00" "2021-12-31 00:00:00"] | dfr into-df | dfr as-datetime "%Y-%m-%d %H:%M:%S""#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![Column::new(
-                            "datetime".to_string(),
-                            vec![
-                                Value::date(
-                                    DateTime::parse_from_str(
-                                        "2021-12-30 00:00:00 +0000",
-                                        "%Y-%m-%d %H:%M:%S %z",
-                                    )
-                                    .expect("date calculation should not fail in test"),
-                                    Span::test_data(),
-                                ),
-                                Value::date(
-                                    DateTime::parse_from_str(
-                                        "2021-12-31 00:00:00 +0000",
-                                        "%Y-%m-%d %H:%M:%S %z",
-                                    )
-                                    .expect("date calculation should not fail in test"),
-                                    Span::test_data(),
-                                ),
-                            ],
-                        )],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Converts string to datetime with high resolutions",
-                example: r#"["2021-12-30 00:00:00.123456789" "2021-12-31 00:00:00.123456789"] | dfr into-df | dfr as-datetime "%Y-%m-%d %H:%M:%S.%9f""#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![Column::new(
-                            "datetime".to_string(),
-                            vec![
-                                Value::date(
-                                    DateTime::parse_from_str(
-                                        "2021-12-30 00:00:00.123456789 +0000",
-                                        "%Y-%m-%d %H:%M:%S.%9f %z",
-                                    )
-                                    .expect("date calculation should not fail in test"),
-                                    Span::test_data(),
-                                ),
-                                Value::date(
-                                    DateTime::parse_from_str(
-                                        "2021-12-31 00:00:00.123456789 +0000",
-                                        "%Y-%m-%d %H:%M:%S.%9f %z",
-                                    )
-                                    .expect("date calculation should not fail in test"),
-                                    Span::test_data(),
-                                ),
-                            ],
-                        )],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let format: String = call.req(engine_state, stack, 0)?;
-    let not_exact = call.has_flag(engine_state, stack, "not-exact")?;
-
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let series = df.as_series(call.head)?;
-    let casted = series.str().map_err(|e| ShellError::GenericError {
-        error: "Error casting to string".into(),
-        msg: e.to_string(),
-        span: Some(call.head),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let res = if not_exact {
-        casted.as_datetime_not_exact(
-            Some(format.as_str()),
-            TimeUnit::Nanoseconds,
-            false,
-            None,
-            &Default::default(),
-        )
-    } else {
-        casted.as_datetime(
-            Some(format.as_str()),
-            TimeUnit::Nanoseconds,
-            false,
-            false,
-            None,
-            &Default::default(),
-        )
-    };
-
-    let mut res = res
-        .map_err(|e| ShellError::GenericError {
-            error: "Error creating datetime".into(),
-            msg: e.to_string(),
-            span: Some(call.head),
-            help: None,
-            inner: vec![],
-        })?
-        .into_series();
-
-    res.rename("datetime");
-    NuDataFrame::try_from_series(vec![res], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(AsDateTime {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/date/get_day.rs b/crates/nu-cmd-dataframe/src/dataframe/series/date/get_day.rs
deleted file mode 100644
index 9187219d7a..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/date/get_day.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-use polars::prelude::{DatetimeMethods, IntoSeries};
-
-#[derive(Clone)]
-pub struct GetDay;
-
-impl Command for GetDay {
-    fn name(&self) -> &str {
-        "dfr get-day"
-    }
-
-    fn usage(&self) -> &str {
-        "Gets day from date."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns day from a date",
-            example: r#"let dt = ('2020-08-04T16:39:18+00:00' | into datetime --timezone 'UTC');
-    let df = ([$dt $dt] | dfr into-df);
-    $df | dfr get-day"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![Value::test_int(4), Value::test_int(4)],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let series = df.as_series(call.head)?;
-
-    let casted = series.datetime().map_err(|e| ShellError::GenericError {
-        error: "Error casting to datetime type".into(),
-        msg: e.to_string(),
-        span: Some(call.head),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let res = casted.day().into_series();
-
-    NuDataFrame::try_from_series(vec![res], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(explore_refactor_IntoDatetime)]
-mod test {
-    use super::super::super::super::super::IntoDatetime;
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(GetDay {}), Box::new(IntoDatetime {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/date/get_hour.rs b/crates/nu-cmd-dataframe/src/dataframe/series/date/get_hour.rs
deleted file mode 100644
index ba05843047..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/date/get_hour.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-use polars::prelude::{DatetimeMethods, IntoSeries};
-
-#[derive(Clone)]
-pub struct GetHour;
-
-impl Command for GetHour {
-    fn name(&self) -> &str {
-        "dfr get-hour"
-    }
-
-    fn usage(&self) -> &str {
-        "Gets hour from date."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns hour from a date",
-            example: r#"let dt = ('2020-08-04T16:39:18+00:00' | into datetime --timezone 'UTC');
-    let df = ([$dt $dt] | dfr into-df);
-    $df | dfr get-hour"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![Value::test_int(16), Value::test_int(16)],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let series = df.as_series(call.head)?;
-
-    let casted = series.datetime().map_err(|e| ShellError::GenericError {
-        error: "Error casting to datetime type".into(),
-        msg: e.to_string(),
-        span: Some(call.head),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let res = casted.hour().into_series();
-
-    NuDataFrame::try_from_series(vec![res], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(explore_refactor_IntoDatetime)]
-mod test {
-    use super::super::super::super::super::IntoDatetime;
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(GetHour {}), Box::new(IntoDatetime {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/date/get_minute.rs b/crates/nu-cmd-dataframe/src/dataframe/series/date/get_minute.rs
deleted file mode 100644
index 902ed61d56..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/date/get_minute.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-use polars::prelude::{DatetimeMethods, IntoSeries};
-
-#[derive(Clone)]
-pub struct GetMinute;
-
-impl Command for GetMinute {
-    fn name(&self) -> &str {
-        "dfr get-minute"
-    }
-
-    fn usage(&self) -> &str {
-        "Gets minute from date."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns minute from a date",
-            example: r#"let dt = ('2020-08-04T16:39:18+00:00' | into datetime --timezone 'UTC');
-    let df = ([$dt $dt] | dfr into-df);
-    $df | dfr get-minute"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![Value::test_int(39), Value::test_int(39)],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let series = df.as_series(call.head)?;
-
-    let casted = series.datetime().map_err(|e| ShellError::GenericError {
-        error: "Error casting to datetime type".into(),
-        msg: e.to_string(),
-        span: Some(call.head),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let res = casted.minute().into_series();
-
-    NuDataFrame::try_from_series(vec![res], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(explore_refactor_IntoDatetime)]
-mod test {
-    use super::super::super::super::super::IntoDatetime;
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(GetMinute {}), Box::new(IntoDatetime {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/date/get_month.rs b/crates/nu-cmd-dataframe/src/dataframe/series/date/get_month.rs
deleted file mode 100644
index 077d5afc1e..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/date/get_month.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-use polars::prelude::{DatetimeMethods, IntoSeries};
-
-#[derive(Clone)]
-pub struct GetMonth;
-
-impl Command for GetMonth {
-    fn name(&self) -> &str {
-        "dfr get-month"
-    }
-
-    fn usage(&self) -> &str {
-        "Gets month from date."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns month from a date",
-            example: r#"let dt = ('2020-08-04T16:39:18+00:00' | into datetime --timezone 'UTC');
-    let df = ([$dt $dt] | dfr into-df);
-    $df | dfr get-month"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![Value::test_int(8), Value::test_int(8)],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let series = df.as_series(call.head)?;
-
-    let casted = series.datetime().map_err(|e| ShellError::GenericError {
-        error: "Error casting to datetime type".into(),
-        msg: e.to_string(),
-        span: Some(call.head),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let res = casted.month().into_series();
-
-    NuDataFrame::try_from_series(vec![res], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(explore_refactor_IntoDatetime)]
-mod test {
-    use super::super::super::super::super::IntoDatetime;
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(GetMonth {}), Box::new(IntoDatetime {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/date/get_nanosecond.rs b/crates/nu-cmd-dataframe/src/dataframe/series/date/get_nanosecond.rs
deleted file mode 100644
index 1543e31082..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/date/get_nanosecond.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-use polars::prelude::{DatetimeMethods, IntoSeries};
-
-#[derive(Clone)]
-pub struct GetNanosecond;
-
-impl Command for GetNanosecond {
-    fn name(&self) -> &str {
-        "dfr get-nanosecond"
-    }
-
-    fn usage(&self) -> &str {
-        "Gets nanosecond from date."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns nanosecond from a date",
-            example: r#"let dt = ('2020-08-04T16:39:18+00:00' | into datetime --timezone 'UTC');
-    let df = ([$dt $dt] | dfr into-df);
-    $df | dfr get-nanosecond"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![Value::test_int(0), Value::test_int(0)],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let series = df.as_series(call.head)?;
-
-    let casted = series.datetime().map_err(|e| ShellError::GenericError {
-        error: "Error casting to datetime type".into(),
-        msg: e.to_string(),
-        span: Some(call.head),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let res = casted.nanosecond().into_series();
-
-    NuDataFrame::try_from_series(vec![res], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(explore_refactor_IntoDatetime)]
-mod test {
-    use super::super::super::super::super::IntoDatetime;
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(GetNanosecond {}), Box::new(IntoDatetime {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/date/get_ordinal.rs b/crates/nu-cmd-dataframe/src/dataframe/series/date/get_ordinal.rs
deleted file mode 100644
index b77ebbc14c..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/date/get_ordinal.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-use polars::prelude::{DatetimeMethods, IntoSeries};
-
-#[derive(Clone)]
-pub struct GetOrdinal;
-
-impl Command for GetOrdinal {
-    fn name(&self) -> &str {
-        "dfr get-ordinal"
-    }
-
-    fn usage(&self) -> &str {
-        "Gets ordinal from date."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns ordinal from a date",
-            example: r#"let dt = ('2020-08-04T16:39:18+00:00' | into datetime --timezone 'UTC');
-    let df = ([$dt $dt] | dfr into-df);
-    $df | dfr get-ordinal"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![Value::test_int(217), Value::test_int(217)],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let series = df.as_series(call.head)?;
-
-    let casted = series.datetime().map_err(|e| ShellError::GenericError {
-        error: "Error casting to datetime type".into(),
-        msg: e.to_string(),
-        span: Some(call.head),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let res = casted.ordinal().into_series();
-
-    NuDataFrame::try_from_series(vec![res], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(explore_refactor_IntoDatetime)]
-mod test {
-    use super::super::super::super::super::IntoDatetime;
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(GetOrdinal {}), Box::new(IntoDatetime {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/date/get_second.rs b/crates/nu-cmd-dataframe/src/dataframe/series/date/get_second.rs
deleted file mode 100644
index e039bcc010..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/date/get_second.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-use polars::prelude::{DatetimeMethods, IntoSeries};
-
-#[derive(Clone)]
-pub struct GetSecond;
-
-impl Command for GetSecond {
-    fn name(&self) -> &str {
-        "dfr get-second"
-    }
-
-    fn usage(&self) -> &str {
-        "Gets second from date."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns second from a date",
-            example: r#"let dt = ('2020-08-04T16:39:18+00:00' | into datetime --timezone 'UTC');
-    let df = ([$dt $dt] | dfr into-df);
-    $df | dfr get-second"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![Value::test_int(18), Value::test_int(18)],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let series = df.as_series(call.head)?;
-
-    let casted = series.datetime().map_err(|e| ShellError::GenericError {
-        error: "Error casting to datetime type".into(),
-        msg: e.to_string(),
-        span: Some(call.head),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let res = casted.second().into_series();
-
-    NuDataFrame::try_from_series(vec![res], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(explore_refactor_IntoDatetime)]
-mod test {
-    use super::super::super::super::super::IntoDatetime;
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(GetSecond {}), Box::new(IntoDatetime {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/date/get_week.rs b/crates/nu-cmd-dataframe/src/dataframe/series/date/get_week.rs
deleted file mode 100644
index 1a1bc2c12d..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/date/get_week.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-use polars::prelude::{DatetimeMethods, IntoSeries};
-
-#[derive(Clone)]
-pub struct GetWeek;
-
-impl Command for GetWeek {
-    fn name(&self) -> &str {
-        "dfr get-week"
-    }
-
-    fn usage(&self) -> &str {
-        "Gets week from date."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns week from a date",
-            example: r#"let dt = ('2020-08-04T16:39:18+00:00' | into datetime --timezone 'UTC');
-    let df = ([$dt $dt] | dfr into-df);
-    $df | dfr get-week"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![Value::test_int(32), Value::test_int(32)],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let series = df.as_series(call.head)?;
-
-    let casted = series.datetime().map_err(|e| ShellError::GenericError {
-        error: "Error casting to datetime type".into(),
-        msg: e.to_string(),
-        span: Some(call.head),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let res = casted.week().into_series();
-
-    NuDataFrame::try_from_series(vec![res], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(explore_refactor_IntoDatetime)]
-mod test {
-    use super::super::super::super::super::IntoDatetime;
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(GetWeek {}), Box::new(IntoDatetime {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/date/get_weekday.rs b/crates/nu-cmd-dataframe/src/dataframe/series/date/get_weekday.rs
deleted file mode 100644
index b5cf1b3197..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/date/get_weekday.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-use polars::prelude::{DatetimeMethods, IntoSeries};
-
-#[derive(Clone)]
-pub struct GetWeekDay;
-
-impl Command for GetWeekDay {
-    fn name(&self) -> &str {
-        "dfr get-weekday"
-    }
-
-    fn usage(&self) -> &str {
-        "Gets weekday from date."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns weekday from a date",
-            example: r#"let dt = ('2020-08-04T16:39:18+00:00' | into datetime --timezone 'UTC');
-    let df = ([$dt $dt] | dfr into-df);
-    $df | dfr get-weekday"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![Value::test_int(2), Value::test_int(2)],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let series = df.as_series(call.head)?;
-
-    let casted = series.datetime().map_err(|e| ShellError::GenericError {
-        error: "Error casting to datetime type".into(),
-        msg: e.to_string(),
-        span: Some(call.head),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let res = casted.weekday().into_series();
-
-    NuDataFrame::try_from_series(vec![res], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(explore_refactor_IntoDatetime)]
-mod test {
-    use super::super::super::super::super::IntoDatetime;
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(GetWeekDay {}), Box::new(IntoDatetime {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/date/get_year.rs b/crates/nu-cmd-dataframe/src/dataframe/series/date/get_year.rs
deleted file mode 100644
index 1ec3515949..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/date/get_year.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-use polars::prelude::{DatetimeMethods, IntoSeries};
-
-#[derive(Clone)]
-pub struct GetYear;
-
-impl Command for GetYear {
-    fn name(&self) -> &str {
-        "dfr get-year"
-    }
-
-    fn usage(&self) -> &str {
-        "Gets year from date."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns year from a date",
-            example: r#"let dt = ('2020-08-04T16:39:18+00:00' | into datetime --timezone 'UTC');
-    let df = ([$dt $dt] | dfr into-df);
-    $df | dfr get-year"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![Value::test_int(2020), Value::test_int(2020)],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let series = df.as_series(call.head)?;
-
-    let casted = series.datetime().map_err(|e| ShellError::GenericError {
-        error: "Error casting to datetime type".into(),
-        msg: e.to_string(),
-        span: Some(call.head),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let res = casted.year().into_series();
-
-    NuDataFrame::try_from_series(vec![res], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(explore_refactor_IntoDatetime)]
-mod test {
-    use super::super::super::super::super::IntoDatetime;
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(GetYear {}), Box::new(IntoDatetime {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/date/mod.rs b/crates/nu-cmd-dataframe/src/dataframe/series/date/mod.rs
deleted file mode 100644
index ed3895a172..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/date/mod.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-mod as_date;
-mod as_datetime;
-mod get_day;
-mod get_hour;
-mod get_minute;
-mod get_month;
-mod get_nanosecond;
-mod get_ordinal;
-mod get_second;
-mod get_week;
-mod get_weekday;
-mod get_year;
-
-pub use as_date::AsDate;
-pub use as_datetime::AsDateTime;
-pub use get_day::GetDay;
-pub use get_hour::GetHour;
-pub use get_minute::GetMinute;
-pub use get_month::GetMonth;
-pub use get_nanosecond::GetNanosecond;
-pub use get_ordinal::GetOrdinal;
-pub use get_second::GetSecond;
-pub use get_week::GetWeek;
-pub use get_weekday::GetWeekDay;
-pub use get_year::GetYear;
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/indexes/arg_sort.rs b/crates/nu-cmd-dataframe/src/dataframe/series/indexes/arg_sort.rs
deleted file mode 100644
index bf28cbac58..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/indexes/arg_sort.rs
+++ /dev/null
@@ -1,130 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-
-use polars::prelude::{IntoSeries, SortOptions};
-
-#[derive(Clone)]
-pub struct ArgSort;
-
-impl Command for ArgSort {
-    fn name(&self) -> &str {
-        "dfr arg-sort"
-    }
-
-    fn usage(&self) -> &str {
-        "Returns indexes for a sorted series."
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["argsort", "order", "arrange"]
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .switch("reverse", "reverse order", Some('r'))
-            .switch("nulls-last", "nulls ordered last", Some('n'))
-            .switch(
-                "maintain-order",
-                "maintain order on sorted items",
-                Some('m'),
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Returns indexes for a sorted series",
-                example: "[1 2 2 3 3] | dfr into-df | dfr arg-sort",
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![Column::new(
-                            "arg_sort".to_string(),
-                            vec![
-                                Value::test_int(0),
-                                Value::test_int(1),
-                                Value::test_int(2),
-                                Value::test_int(3),
-                                Value::test_int(4),
-                            ],
-                        )],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Returns indexes for a sorted series",
-                example: "[1 2 2 3 3] | dfr into-df | dfr arg-sort --reverse",
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![Column::new(
-                            "arg_sort".to_string(),
-                            vec![
-                                Value::test_int(3),
-                                Value::test_int(4),
-                                Value::test_int(1),
-                                Value::test_int(2),
-                                Value::test_int(0),
-                            ],
-                        )],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-
-    let sort_options = SortOptions {
-        descending: call.has_flag(engine_state, stack, "reverse")?,
-        nulls_last: call.has_flag(engine_state, stack, "nulls-last")?,
-        multithreaded: true,
-        maintain_order: call.has_flag(engine_state, stack, "maintain-order")?,
-    };
-
-    let mut res = df
-        .as_series(call.head)?
-        .arg_sort(sort_options)
-        .into_series();
-    res.rename("arg_sort");
-
-    NuDataFrame::try_from_series(vec![res], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(ArgSort {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/indexes/arg_true.rs b/crates/nu-cmd-dataframe/src/dataframe/series/indexes/arg_true.rs
deleted file mode 100644
index 106e95f5ea..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/indexes/arg_true.rs
+++ /dev/null
@@ -1,115 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-use polars::prelude::{arg_where, col, IntoLazy};
-
-#[derive(Clone)]
-pub struct ArgTrue;
-
-impl Command for ArgTrue {
-    fn name(&self) -> &str {
-        "dfr arg-true"
-    }
-
-    fn usage(&self) -> &str {
-        "Returns indexes where values are true."
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["argtrue", "truth", "boolean-true"]
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns indexes where values are true",
-            example: "[false true false] | dfr into-df | dfr arg-true",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "arg_true".to_string(),
-                        vec![Value::test_int(1)],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let columns = df.as_ref().get_column_names();
-    if columns.len() > 1 {
-        return Err(ShellError::GenericError {
-            error: "Error using as series".into(),
-            msg: "dataframe has more than one column".into(),
-            span: Some(call.head),
-            help: None,
-            inner: vec![],
-        });
-    }
-
-    match columns.first() {
-        Some(column) => {
-            let expression = arg_where(col(column).eq(true)).alias("arg_true");
-            let res = df
-                .as_ref()
-                .clone()
-                .lazy()
-                .select(&[expression])
-                .collect()
-                .map_err(|err| ShellError::GenericError {
-                    error: "Error creating index column".into(),
-                    msg: err.to_string(),
-                    span: Some(call.head),
-                    help: None,
-                    inner: vec![],
-                })?;
-
-            let value = NuDataFrame::dataframe_into_value(res, call.head);
-            Ok(PipelineData::Value(value, None))
-        }
-        _ => Err(ShellError::UnsupportedInput {
-            msg: "Expected the dataframe to have a column".to_string(),
-            input: "".to_string(),
-            msg_span: call.head,
-            input_span: call.head,
-        }),
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(ArgTrue {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/indexes/arg_unique.rs b/crates/nu-cmd-dataframe/src/dataframe/series/indexes/arg_unique.rs
deleted file mode 100644
index 6b69518cba..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/indexes/arg_unique.rs
+++ /dev/null
@@ -1,93 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-use polars::prelude::IntoSeries;
-
-#[derive(Clone)]
-pub struct ArgUnique;
-
-impl Command for ArgUnique {
-    fn name(&self) -> &str {
-        "dfr arg-unique"
-    }
-
-    fn usage(&self) -> &str {
-        "Returns indexes for unique values."
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["argunique", "distinct", "noduplicate", "unrepeated"]
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns indexes for unique values",
-            example: "[1 2 2 3 3] | dfr into-df | dfr arg-unique",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "arg_unique".to_string(),
-                        vec![Value::test_int(0), Value::test_int(1), Value::test_int(3)],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-
-    let mut res = df
-        .as_series(call.head)?
-        .arg_unique()
-        .map_err(|e| ShellError::GenericError {
-            error: "Error extracting unique values".into(),
-            msg: e.to_string(),
-            span: Some(call.head),
-            help: None,
-            inner: vec![],
-        })?
-        .into_series();
-    res.rename("arg_unique");
-
-    NuDataFrame::try_from_series(vec![res], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(ArgUnique {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/indexes/mod.rs b/crates/nu-cmd-dataframe/src/dataframe/series/indexes/mod.rs
deleted file mode 100644
index c0af8c8653..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/indexes/mod.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-mod arg_sort;
-mod arg_true;
-mod arg_unique;
-mod set_with_idx;
-
-pub use arg_sort::ArgSort;
-pub use arg_true::ArgTrue;
-pub use arg_unique::ArgUnique;
-pub use set_with_idx::SetWithIndex;
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/indexes/set_with_idx.rs b/crates/nu-cmd-dataframe/src/dataframe/series/indexes/set_with_idx.rs
deleted file mode 100644
index 307ef4d5c3..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/indexes/set_with_idx.rs
+++ /dev/null
@@ -1,213 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-
-use polars::prelude::{ChunkSet, DataType, IntoSeries};
-
-#[derive(Clone)]
-pub struct SetWithIndex;
-
-impl Command for SetWithIndex {
-    fn name(&self) -> &str {
-        "dfr set-with-idx"
-    }
-
-    fn usage(&self) -> &str {
-        "Sets value in the given index."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required("value", SyntaxShape::Any, "value to be inserted in series")
-            .required_named(
-                "indices",
-                SyntaxShape::Any,
-                "list of indices indicating where to set the value",
-                Some('i'),
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Set value in selected rows from series",
-            example: r#"let series = ([4 1 5 2 4 3] | dfr into-df);
-    let indices = ([0 2] | dfr into-df);
-    $series | dfr set-with-idx 6 --indices $indices"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![
-                            Value::test_int(6),
-                            Value::test_int(1),
-                            Value::test_int(6),
-                            Value::test_int(2),
-                            Value::test_int(4),
-                            Value::test_int(3),
-                        ],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let value: Value = call.req(engine_state, stack, 0)?;
-
-    let indices_value: Value = call
-        .get_flag(engine_state, stack, "indices")?
-        .expect("required named value");
-    let indices_span = indices_value.span();
-    let indices = NuDataFrame::try_from_value(indices_value)?.as_series(indices_span)?;
-
-    let casted = match indices.dtype() {
-        DataType::UInt32 | DataType::UInt64 | DataType::Int32 | DataType::Int64 => indices
-            .as_ref()
-            .cast(&DataType::UInt32)
-            .map_err(|e| ShellError::GenericError {
-                error: "Error casting indices".into(),
-                msg: e.to_string(),
-                span: Some(indices_span),
-                help: None,
-                inner: vec![],
-            }),
-        _ => Err(ShellError::GenericError {
-            error: "Incorrect type".into(),
-            msg: "Series with incorrect type".into(),
-            span: Some(indices_span),
-            help: Some("Consider using a Series with type int type".into()),
-            inner: vec![],
-        }),
-    }?;
-
-    let indices = casted
-        .u32()
-        .map_err(|e| ShellError::GenericError {
-            error: "Error casting indices".into(),
-            msg: e.to_string(),
-            span: Some(indices_span),
-            help: None,
-            inner: vec![],
-        })?
-        .into_iter()
-        .flatten();
-
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let series = df.as_series(call.head)?;
-
-    let span = value.span();
-    let res = match value {
-        Value::Int { val, .. } => {
-            let chunked = series.i64().map_err(|e| ShellError::GenericError {
-                error: "Error casting to i64".into(),
-                msg: e.to_string(),
-                span: Some(span),
-                help: None,
-                inner: vec![],
-            })?;
-
-            let res = chunked.scatter_single(indices, Some(val)).map_err(|e| {
-                ShellError::GenericError {
-                    error: "Error setting value".into(),
-                    msg: e.to_string(),
-                    span: Some(span),
-                    help: None,
-                    inner: vec![],
-                }
-            })?;
-
-            NuDataFrame::try_from_series(vec![res.into_series()], call.head)
-        }
-        Value::Float { val, .. } => {
-            let chunked = series.f64().map_err(|e| ShellError::GenericError {
-                error: "Error casting to f64".into(),
-                msg: e.to_string(),
-                span: Some(span),
-                help: None,
-                inner: vec![],
-            })?;
-
-            let res = chunked.scatter_single(indices, Some(val)).map_err(|e| {
-                ShellError::GenericError {
-                    error: "Error setting value".into(),
-                    msg: e.to_string(),
-                    span: Some(span),
-                    help: None,
-                    inner: vec![],
-                }
-            })?;
-
-            NuDataFrame::try_from_series(vec![res.into_series()], call.head)
-        }
-        Value::String { val, .. } => {
-            let chunked = series.str().map_err(|e| ShellError::GenericError {
-                error: "Error casting to string".into(),
-                msg: e.to_string(),
-                span: Some(span),
-                help: None,
-                inner: vec![],
-            })?;
-
-            let res = chunked
-                .scatter_single(indices, Some(val.as_ref()))
-                .map_err(|e| ShellError::GenericError {
-                    error: "Error setting value".into(),
-                    msg: e.to_string(),
-                    span: Some(span),
-                    help: None,
-                    inner: vec![],
-                })?;
-
-            let mut res = res.into_series();
-            res.rename("string");
-
-            NuDataFrame::try_from_series(vec![res.into_series()], call.head)
-        }
-        _ => Err(ShellError::GenericError {
-            error: "Incorrect value type".into(),
-            msg: format!(
-                "this value cannot be set in a series of type '{}'",
-                series.dtype()
-            ),
-            span: Some(span),
-            help: None,
-            inner: vec![],
-        }),
-    };
-
-    res.map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(SetWithIndex {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/masks/is_duplicated.rs b/crates/nu-cmd-dataframe/src/dataframe/series/masks/is_duplicated.rs
deleted file mode 100644
index b28f977b47..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/masks/is_duplicated.rs
+++ /dev/null
@@ -1,122 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-use polars::prelude::IntoSeries;
-
-#[derive(Clone)]
-pub struct IsDuplicated;
-
-impl Command for IsDuplicated {
-    fn name(&self) -> &str {
-        "dfr is-duplicated"
-    }
-
-    fn usage(&self) -> &str {
-        "Creates mask indicating duplicated values."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Create mask indicating duplicated values",
-                example: "[5 6 6 6 8 8 8] | dfr into-df | dfr is-duplicated",
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![Column::new(
-                            "is_duplicated".to_string(),
-                            vec![
-                                Value::test_bool(false),
-                                Value::test_bool(true),
-                                Value::test_bool(true),
-                                Value::test_bool(true),
-                                Value::test_bool(true),
-                                Value::test_bool(true),
-                                Value::test_bool(true),
-                            ],
-                        )],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Create mask indicating duplicated rows in a dataframe",
-                example:
-                    "[[a, b]; [1 2] [1 2] [3 3] [3 3] [1 1]] | dfr into-df | dfr is-duplicated",
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![Column::new(
-                            "is_duplicated".to_string(),
-                            vec![
-                                Value::test_bool(true),
-                                Value::test_bool(true),
-                                Value::test_bool(true),
-                                Value::test_bool(true),
-                                Value::test_bool(false),
-                            ],
-                        )],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-
-    let mut res = df
-        .as_ref()
-        .is_duplicated()
-        .map_err(|e| ShellError::GenericError {
-            error: "Error finding duplicates".into(),
-            msg: e.to_string(),
-            span: Some(call.head),
-            help: None,
-            inner: vec![],
-        })?
-        .into_series();
-
-    res.rename("is_duplicated");
-
-    NuDataFrame::try_from_series(vec![res], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(IsDuplicated {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/masks/is_in.rs b/crates/nu-cmd-dataframe/src/dataframe/series/masks/is_in.rs
deleted file mode 100644
index 0792d3fddf..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/masks/is_in.rs
+++ /dev/null
@@ -1,104 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-
-use polars::prelude::{is_in, IntoSeries};
-
-#[derive(Clone)]
-pub struct IsIn;
-
-impl Command for IsIn {
-    fn name(&self) -> &str {
-        "dfr is-in"
-    }
-
-    fn usage(&self) -> &str {
-        "Checks if elements from a series are contained in right series."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required("other", SyntaxShape::Any, "right series")
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Checks if elements from a series are contained in right series",
-            example: r#"let other = ([1 3 6] | dfr into-df);
-    [5 6 6 6 8 8 8] | dfr into-df | dfr is-in $other"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "is_in".to_string(),
-                        vec![
-                            Value::test_bool(false),
-                            Value::test_bool(true),
-                            Value::test_bool(true),
-                            Value::test_bool(true),
-                            Value::test_bool(false),
-                            Value::test_bool(false),
-                            Value::test_bool(false),
-                        ],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?.as_series(call.head)?;
-
-    let other_value: Value = call.req(engine_state, stack, 0)?;
-    let other_span = other_value.span();
-    let other_df = NuDataFrame::try_from_value(other_value)?;
-    let other = other_df.as_series(other_span)?;
-
-    let mut res = is_in(&df, &other)
-        .map_err(|e| ShellError::GenericError {
-            error: "Error finding in other".into(),
-            msg: e.to_string(),
-            span: Some(call.head),
-            help: None,
-            inner: vec![],
-        })?
-        .into_series();
-
-    res.rename("is_in");
-
-    NuDataFrame::try_from_series(vec![res.into_series()], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(IsIn {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/masks/is_not_null.rs b/crates/nu-cmd-dataframe/src/dataframe/series/masks/is_not_null.rs
deleted file mode 100644
index 4ed33ce951..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/masks/is_not_null.rs
+++ /dev/null
@@ -1,122 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuExpression};
-use nu_engine::command_prelude::*;
-use polars::prelude::IntoSeries;
-
-#[derive(Clone)]
-pub struct IsNotNull;
-
-impl Command for IsNotNull {
-    fn name(&self) -> &str {
-        "dfr is-not-null"
-    }
-
-    fn usage(&self) -> &str {
-        "Creates mask where value is not null."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_types(vec![
-                (
-                    Type::Custom("expression".into()),
-                    Type::Custom("expression".into()),
-                ),
-                (
-                    Type::Custom("dataframe".into()),
-                    Type::Custom("dataframe".into()),
-                ),
-            ])
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Create mask where values are not null",
-                example: r#"let s = ([5 6 0 8] | dfr into-df);
-    let res = ($s / $s);
-    $res | dfr is-not-null"#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![Column::new(
-                            "is_not_null".to_string(),
-                            vec![
-                                Value::test_bool(true),
-                                Value::test_bool(true),
-                                Value::test_bool(false),
-                                Value::test_bool(true),
-                            ],
-                        )],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Creates a is not null expression from a column",
-                example: "dfr col a | dfr is-not-null",
-                result: None,
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let value = input.into_value(call.head)?;
-        if NuDataFrame::can_downcast(&value) {
-            let df = NuDataFrame::try_from_value(value)?;
-            command(engine_state, stack, call, df)
-        } else {
-            let expr = NuExpression::try_from_value(value)?;
-            let expr: NuExpression = expr.into_polars().is_not_null().into();
-
-            Ok(PipelineData::Value(
-                NuExpression::into_value(expr, call.head),
-                None,
-            ))
-        }
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    df: NuDataFrame,
-) -> Result<PipelineData, ShellError> {
-    let mut res = df.as_series(call.head)?.is_not_null();
-    res.rename("is_not_null");
-
-    NuDataFrame::try_from_series(vec![res.into_series()], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use crate::dataframe::lazy::aggregate::LazyAggregate;
-    use crate::dataframe::lazy::groupby::ToLazyGroupBy;
-    use crate::dataframe::test_dataframe::{build_test_engine_state, test_dataframe_example};
-
-    #[test]
-    fn test_examples_dataframe() {
-        let mut engine_state = build_test_engine_state(vec![Box::new(IsNotNull {})]);
-        test_dataframe_example(&mut engine_state, &IsNotNull.examples()[0]);
-    }
-
-    #[test]
-    fn test_examples_expression() {
-        let mut engine_state = build_test_engine_state(vec![
-            Box::new(IsNotNull {}),
-            Box::new(LazyAggregate {}),
-            Box::new(ToLazyGroupBy {}),
-        ]);
-        test_dataframe_example(&mut engine_state, &IsNotNull.examples()[1]);
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/masks/is_null.rs b/crates/nu-cmd-dataframe/src/dataframe/series/masks/is_null.rs
deleted file mode 100644
index b99d48af66..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/masks/is_null.rs
+++ /dev/null
@@ -1,122 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuExpression};
-use nu_engine::command_prelude::*;
-use polars::prelude::IntoSeries;
-
-#[derive(Clone)]
-pub struct IsNull;
-
-impl Command for IsNull {
-    fn name(&self) -> &str {
-        "dfr is-null"
-    }
-
-    fn usage(&self) -> &str {
-        "Creates mask where value is null."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_types(vec![
-                (
-                    Type::Custom("expression".into()),
-                    Type::Custom("expression".into()),
-                ),
-                (
-                    Type::Custom("dataframe".into()),
-                    Type::Custom("dataframe".into()),
-                ),
-            ])
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Create mask where values are null",
-                example: r#"let s = ([5 6 0 8] | dfr into-df);
-    let res = ($s / $s);
-    $res | dfr is-null"#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![Column::new(
-                            "is_null".to_string(),
-                            vec![
-                                Value::test_bool(false),
-                                Value::test_bool(false),
-                                Value::test_bool(true),
-                                Value::test_bool(false),
-                            ],
-                        )],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Creates a is null expression from a column",
-                example: "dfr col a | dfr is-null",
-                result: None,
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let value = input.into_value(call.head)?;
-        if NuDataFrame::can_downcast(&value) {
-            let df = NuDataFrame::try_from_value(value)?;
-            command(engine_state, stack, call, df)
-        } else {
-            let expr = NuExpression::try_from_value(value)?;
-            let expr: NuExpression = expr.into_polars().is_null().into();
-
-            Ok(PipelineData::Value(
-                NuExpression::into_value(expr, call.head),
-                None,
-            ))
-        }
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    df: NuDataFrame,
-) -> Result<PipelineData, ShellError> {
-    let mut res = df.as_series(call.head)?.is_null();
-    res.rename("is_null");
-
-    NuDataFrame::try_from_series(vec![res.into_series()], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use crate::dataframe::lazy::aggregate::LazyAggregate;
-    use crate::dataframe::lazy::groupby::ToLazyGroupBy;
-    use crate::dataframe::test_dataframe::{build_test_engine_state, test_dataframe_example};
-
-    #[test]
-    fn test_examples_dataframe() {
-        let mut engine_state = build_test_engine_state(vec![Box::new(IsNull {})]);
-        test_dataframe_example(&mut engine_state, &IsNull.examples()[0]);
-    }
-
-    #[test]
-    fn test_examples_expression() {
-        let mut engine_state = build_test_engine_state(vec![
-            Box::new(IsNull {}),
-            Box::new(LazyAggregate {}),
-            Box::new(ToLazyGroupBy {}),
-        ]);
-        test_dataframe_example(&mut engine_state, &IsNull.examples()[1]);
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/masks/is_unique.rs b/crates/nu-cmd-dataframe/src/dataframe/series/masks/is_unique.rs
deleted file mode 100644
index 8e313abca7..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/masks/is_unique.rs
+++ /dev/null
@@ -1,121 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-use polars::prelude::IntoSeries;
-
-#[derive(Clone)]
-pub struct IsUnique;
-
-impl Command for IsUnique {
-    fn name(&self) -> &str {
-        "dfr is-unique"
-    }
-
-    fn usage(&self) -> &str {
-        "Creates mask indicating unique values."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Create mask indicating unique values",
-                example: "[5 6 6 6 8 8 8] | dfr into-df | dfr is-unique",
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![Column::new(
-                            "is_unique".to_string(),
-                            vec![
-                                Value::test_bool(true),
-                                Value::test_bool(false),
-                                Value::test_bool(false),
-                                Value::test_bool(false),
-                                Value::test_bool(false),
-                                Value::test_bool(false),
-                                Value::test_bool(false),
-                            ],
-                        )],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Create mask indicating duplicated rows in a dataframe",
-                example: "[[a, b]; [1 2] [1 2] [3 3] [3 3] [1 1]] | dfr into-df | dfr is-unique",
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![Column::new(
-                            "is_unique".to_string(),
-                            vec![
-                                Value::test_bool(false),
-                                Value::test_bool(false),
-                                Value::test_bool(false),
-                                Value::test_bool(false),
-                                Value::test_bool(true),
-                            ],
-                        )],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-
-    let mut res = df
-        .as_ref()
-        .is_unique()
-        .map_err(|e| ShellError::GenericError {
-            error: "Error finding unique values".into(),
-            msg: e.to_string(),
-            span: Some(call.head),
-            help: None,
-            inner: vec![],
-        })?
-        .into_series();
-
-    res.rename("is_unique");
-
-    NuDataFrame::try_from_series(vec![res], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(IsUnique {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/masks/mod.rs b/crates/nu-cmd-dataframe/src/dataframe/series/masks/mod.rs
deleted file mode 100644
index 80c98b5ef0..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/masks/mod.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-mod is_duplicated;
-mod is_in;
-mod is_not_null;
-mod is_null;
-mod is_unique;
-mod not;
-mod set;
-
-pub use is_duplicated::IsDuplicated;
-pub use is_in::IsIn;
-pub use is_not_null::IsNotNull;
-pub use is_null::IsNull;
-pub use is_unique::IsUnique;
-pub use not::NotSeries;
-pub use set::SetSeries;
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/masks/not.rs b/crates/nu-cmd-dataframe/src/dataframe/series/masks/not.rs
deleted file mode 100644
index 081a3c3b23..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/masks/not.rs
+++ /dev/null
@@ -1,93 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-use polars::prelude::IntoSeries;
-
-use std::ops::Not;
-
-#[derive(Clone)]
-pub struct NotSeries;
-
-impl Command for NotSeries {
-    fn name(&self) -> &str {
-        "dfr not"
-    }
-
-    fn usage(&self) -> &str {
-        "Inverts boolean mask."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Inverts boolean mask",
-            example: "[true false true] | dfr into-df | dfr not",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![
-                            Value::test_bool(false),
-                            Value::test_bool(true),
-                            Value::test_bool(false),
-                        ],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-        command(engine_state, stack, call, df)
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    df: NuDataFrame,
-) -> Result<PipelineData, ShellError> {
-    let series = df.as_series(call.head)?;
-
-    let bool = series.bool().map_err(|e| ShellError::GenericError {
-        error: "Error inverting mask".into(),
-        msg: e.to_string(),
-        span: Some(call.head),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let res = bool.not();
-
-    NuDataFrame::try_from_series(vec![res.into_series()], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(NotSeries {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/masks/set.rs b/crates/nu-cmd-dataframe/src/dataframe/series/masks/set.rs
deleted file mode 100644
index 4dacb7117b..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/masks/set.rs
+++ /dev/null
@@ -1,201 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-
-use polars::prelude::{ChunkSet, DataType, IntoSeries};
-
-#[derive(Clone)]
-pub struct SetSeries;
-
-impl Command for SetSeries {
-    fn name(&self) -> &str {
-        "dfr set"
-    }
-
-    fn usage(&self) -> &str {
-        "Sets value where given mask is true."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required("value", SyntaxShape::Any, "value to be inserted in series")
-            .required_named(
-                "mask",
-                SyntaxShape::Any,
-                "mask indicating insertions",
-                Some('m'),
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Shifts the values by a given period",
-            example: r#"let s = ([1 2 2 3 3] | dfr into-df | dfr shift 2);
-    let mask = ($s | dfr is-null);
-    $s | dfr set 0 --mask $mask"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![
-                            Value::test_int(0),
-                            Value::test_int(0),
-                            Value::test_int(1),
-                            Value::test_int(2),
-                            Value::test_int(2),
-                        ],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let value: Value = call.req(engine_state, stack, 0)?;
-
-    let mask_value: Value = call
-        .get_flag(engine_state, stack, "mask")?
-        .expect("required named value");
-    let mask_span = mask_value.span();
-    let mask = NuDataFrame::try_from_value(mask_value)?.as_series(mask_span)?;
-
-    let bool_mask = match mask.dtype() {
-        DataType::Boolean => mask.bool().map_err(|e| ShellError::GenericError {
-            error: "Error casting to bool".into(),
-            msg: e.to_string(),
-            span: Some(mask_span),
-            help: None,
-            inner: vec![],
-        }),
-        _ => Err(ShellError::GenericError {
-            error: "Incorrect type".into(),
-            msg: "can only use bool series as mask".into(),
-            span: Some(mask_span),
-            help: None,
-            inner: vec![],
-        }),
-    }?;
-
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let series = df.as_series(call.head)?;
-    let span = value.span();
-    let res = match value {
-        Value::Int { val, .. } => {
-            let chunked = series.i64().map_err(|e| ShellError::GenericError {
-                error: "Error casting to i64".into(),
-                msg: e.to_string(),
-                span: Some(span),
-                help: None,
-                inner: vec![],
-            })?;
-
-            let res = chunked
-                .set(bool_mask, Some(val))
-                .map_err(|e| ShellError::GenericError {
-                    error: "Error setting value".into(),
-                    msg: e.to_string(),
-                    span: Some(span),
-                    help: None,
-                    inner: vec![],
-                })?;
-
-            NuDataFrame::try_from_series(vec![res.into_series()], call.head)
-        }
-        Value::Float { val, .. } => {
-            let chunked = series.f64().map_err(|e| ShellError::GenericError {
-                error: "Error casting to f64".into(),
-                msg: e.to_string(),
-                span: Some(span),
-                help: None,
-                inner: vec![],
-            })?;
-
-            let res = chunked
-                .set(bool_mask, Some(val))
-                .map_err(|e| ShellError::GenericError {
-                    error: "Error setting value".into(),
-                    msg: e.to_string(),
-                    span: Some(span),
-                    help: None,
-                    inner: vec![],
-                })?;
-
-            NuDataFrame::try_from_series(vec![res.into_series()], call.head)
-        }
-        Value::String { val, .. } => {
-            let chunked = series.str().map_err(|e| ShellError::GenericError {
-                error: "Error casting to string".into(),
-                msg: e.to_string(),
-                span: Some(span),
-                help: None,
-                inner: vec![],
-            })?;
-
-            let res = chunked.set(bool_mask, Some(val.as_ref())).map_err(|e| {
-                ShellError::GenericError {
-                    error: "Error setting value".into(),
-                    msg: e.to_string(),
-                    span: Some(span),
-                    help: None,
-                    inner: vec![],
-                }
-            })?;
-
-            let mut res = res.into_series();
-            res.rename("string");
-
-            NuDataFrame::try_from_series(vec![res.into_series()], call.head)
-        }
-        _ => Err(ShellError::GenericError {
-            error: "Incorrect value type".into(),
-            msg: format!(
-                "this value cannot be set in a series of type '{}'",
-                series.dtype()
-            ),
-            span: Some(span),
-            help: None,
-            inner: vec![],
-        }),
-    };
-
-    res.map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::super::super::{IsNull, Shift};
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![
-            Box::new(SetSeries {}),
-            Box::new(IsNull {}),
-            Box::new(Shift {}),
-        ])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/mod.rs b/crates/nu-cmd-dataframe/src/dataframe/series/mod.rs
deleted file mode 100644
index e1b9bc1087..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/mod.rs
+++ /dev/null
@@ -1,95 +0,0 @@
-mod date;
-pub use date::*;
-
-mod string;
-pub use string::*;
-
-mod masks;
-pub use masks::*;
-
-mod indexes;
-pub use indexes::*;
-
-mod all_false;
-mod all_true;
-mod arg_max;
-mod arg_min;
-mod cumulative;
-mod n_null;
-mod n_unique;
-mod rolling;
-mod shift;
-mod unique;
-mod value_counts;
-
-use nu_protocol::engine::StateWorkingSet;
-
-pub use all_false::AllFalse;
-pub use all_true::AllTrue;
-pub use arg_max::ArgMax;
-pub use arg_min::ArgMin;
-pub use cumulative::Cumulative;
-pub use n_null::NNull;
-pub use n_unique::NUnique;
-pub use rolling::Rolling;
-pub use shift::Shift;
-pub use unique::Unique;
-pub use value_counts::ValueCount;
-
-pub fn add_series_decls(working_set: &mut StateWorkingSet) {
-    macro_rules! bind_command {
-            ( $command:expr ) => {
-                working_set.add_decl(Box::new($command));
-            };
-            ( $( $command:expr ),* ) => {
-                $( working_set.add_decl(Box::new($command)); )*
-            };
-        }
-
-    // Series commands
-    bind_command!(
-        AllFalse,
-        AllTrue,
-        ArgMax,
-        ArgMin,
-        ArgSort,
-        ArgTrue,
-        ArgUnique,
-        AsDate,
-        AsDateTime,
-        Concatenate,
-        Contains,
-        Cumulative,
-        GetDay,
-        GetHour,
-        GetMinute,
-        GetMonth,
-        GetNanosecond,
-        GetOrdinal,
-        GetSecond,
-        GetWeek,
-        GetWeekDay,
-        GetYear,
-        IsDuplicated,
-        IsIn,
-        IsNotNull,
-        IsNull,
-        IsUnique,
-        NNull,
-        NUnique,
-        NotSeries,
-        Replace,
-        ReplaceAll,
-        Rolling,
-        SetSeries,
-        SetWithIndex,
-        Shift,
-        StrLengths,
-        StrSlice,
-        StrFTime,
-        ToLowerCase,
-        ToUpperCase,
-        Unique,
-        ValueCount
-    );
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/n_null.rs b/crates/nu-cmd-dataframe/src/dataframe/series/n_null.rs
deleted file mode 100644
index 6c9909da07..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/n_null.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct NNull;
-
-impl Command for NNull {
-    fn name(&self) -> &str {
-        "dfr count-null"
-    }
-
-    fn usage(&self) -> &str {
-        "Counts null values."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Counts null values",
-            example: r#"let s = ([1 1 0 0 3 3 4] | dfr into-df);
-    ($s / $s) | dfr count-null"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "count_null".to_string(),
-                        vec![Value::test_int(2)],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-
-    let res = df.as_series(call.head)?.null_count();
-    let value = Value::int(res as i64, call.head);
-
-    NuDataFrame::try_from_columns(
-        vec![Column::new("count_null".to_string(), vec![value])],
-        None,
-    )
-    .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(NNull {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/n_unique.rs b/crates/nu-cmd-dataframe/src/dataframe/series/n_unique.rs
deleted file mode 100644
index c6d6e829f8..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/n_unique.rs
+++ /dev/null
@@ -1,127 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuExpression};
-use nu_engine::command_prelude::*;
-
-#[derive(Clone)]
-pub struct NUnique;
-
-impl Command for NUnique {
-    fn name(&self) -> &str {
-        "dfr n-unique"
-    }
-
-    fn usage(&self) -> &str {
-        "Counts unique values."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_types(vec![
-                (
-                    Type::Custom("expression".into()),
-                    Type::Custom("expression".into()),
-                ),
-                (
-                    Type::Custom("dataframe".into()),
-                    Type::Custom("dataframe".into()),
-                ),
-            ])
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Counts unique values",
-                example: "[1 1 2 2 3 3 4] | dfr into-df | dfr n-unique",
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![Column::new(
-                            "count_unique".to_string(),
-                            vec![Value::test_int(4)],
-                        )],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Creates a is n-unique expression from a column",
-                example: "dfr col a | dfr n-unique",
-                result: None,
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let value = input.into_value(call.head)?;
-        if NuDataFrame::can_downcast(&value) {
-            let df = NuDataFrame::try_from_value(value)?;
-            command(engine_state, stack, call, df)
-        } else {
-            let expr = NuExpression::try_from_value(value)?;
-            let expr: NuExpression = expr.into_polars().n_unique().into();
-
-            Ok(PipelineData::Value(
-                NuExpression::into_value(expr, call.head),
-                None,
-            ))
-        }
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    df: NuDataFrame,
-) -> Result<PipelineData, ShellError> {
-    let res = df
-        .as_series(call.head)?
-        .n_unique()
-        .map_err(|e| ShellError::GenericError {
-            error: "Error counting unique values".into(),
-            msg: e.to_string(),
-            span: Some(call.head),
-            help: None,
-            inner: vec![],
-        })?;
-
-    let value = Value::int(res as i64, call.head);
-
-    NuDataFrame::try_from_columns(
-        vec![Column::new("count_unique".to_string(), vec![value])],
-        None,
-    )
-    .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::{build_test_engine_state, test_dataframe_example};
-    use super::*;
-    use crate::dataframe::lazy::aggregate::LazyAggregate;
-    use crate::dataframe::lazy::groupby::ToLazyGroupBy;
-
-    #[test]
-    fn test_examples_dataframe() {
-        let mut engine_state = build_test_engine_state(vec![Box::new(NUnique {})]);
-        test_dataframe_example(&mut engine_state, &NUnique.examples()[0]);
-    }
-
-    #[test]
-    fn test_examples_expression() {
-        let mut engine_state = build_test_engine_state(vec![
-            Box::new(NUnique {}),
-            Box::new(LazyAggregate {}),
-            Box::new(ToLazyGroupBy {}),
-        ]);
-        test_dataframe_example(&mut engine_state, &NUnique.examples()[1]);
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/rolling.rs b/crates/nu-cmd-dataframe/src/dataframe/series/rolling.rs
deleted file mode 100644
index b659462298..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/rolling.rs
+++ /dev/null
@@ -1,186 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-
-use polars::prelude::{DataType, Duration, IntoSeries, RollingOptionsImpl, SeriesOpsTime};
-
-enum RollType {
-    Min,
-    Max,
-    Sum,
-    Mean,
-}
-
-impl RollType {
-    fn from_str(roll_type: &str, span: Span) -> Result<Self, ShellError> {
-        match roll_type {
-            "min" => Ok(Self::Min),
-            "max" => Ok(Self::Max),
-            "sum" => Ok(Self::Sum),
-            "mean" => Ok(Self::Mean),
-            _ => Err(ShellError::GenericError {
-                error: "Wrong operation".into(),
-                msg: "Operation not valid for cumulative".into(),
-                span: Some(span),
-                help: Some("Allowed values: min, max, sum, mean".into()),
-                inner: vec![],
-            }),
-        }
-    }
-
-    fn to_str(&self) -> &'static str {
-        match self {
-            RollType::Min => "rolling_min",
-            RollType::Max => "rolling_max",
-            RollType::Sum => "rolling_sum",
-            RollType::Mean => "rolling_mean",
-        }
-    }
-}
-
-#[derive(Clone)]
-pub struct Rolling;
-
-impl Command for Rolling {
-    fn name(&self) -> &str {
-        "dfr rolling"
-    }
-
-    fn usage(&self) -> &str {
-        "Rolling calculation for a series."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required("type", SyntaxShape::String, "rolling operation")
-            .required("window", SyntaxShape::Int, "Window size for rolling")
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Rolling sum for a series",
-                example: "[1 2 3 4 5] | dfr into-df | dfr rolling sum 2 | dfr drop-nulls",
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![Column::new(
-                            "0_rolling_sum".to_string(),
-                            vec![
-                                Value::test_int(3),
-                                Value::test_int(5),
-                                Value::test_int(7),
-                                Value::test_int(9),
-                            ],
-                        )],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Rolling max for a series",
-                example: "[1 2 3 4 5] | dfr into-df | dfr rolling max 2 | dfr drop-nulls",
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![Column::new(
-                            "0_rolling_max".to_string(),
-                            vec![
-                                Value::test_int(2),
-                                Value::test_int(3),
-                                Value::test_int(4),
-                                Value::test_int(5),
-                            ],
-                        )],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let roll_type: Spanned<String> = call.req(engine_state, stack, 0)?;
-    let window_size: i64 = call.req(engine_state, stack, 1)?;
-
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let series = df.as_series(call.head)?;
-
-    if let DataType::Object(..) = series.dtype() {
-        return Err(ShellError::GenericError {
-            error: "Found object series".into(),
-            msg: "Series of type object cannot be used for rolling operation".into(),
-            span: Some(call.head),
-            help: None,
-            inner: vec![],
-        });
-    }
-
-    let roll_type = RollType::from_str(&roll_type.item, roll_type.span)?;
-
-    let rolling_opts = RollingOptionsImpl {
-        window_size: Duration::new(window_size),
-        min_periods: window_size as usize,
-        weights: None,
-        center: false,
-        by: None,
-        closed_window: None,
-        tu: None,
-        tz: None,
-        fn_params: None,
-    };
-    let res = match roll_type {
-        RollType::Max => series.rolling_max(rolling_opts),
-        RollType::Min => series.rolling_min(rolling_opts),
-        RollType::Sum => series.rolling_sum(rolling_opts),
-        RollType::Mean => series.rolling_mean(rolling_opts),
-    };
-
-    let mut res = res.map_err(|e| ShellError::GenericError {
-        error: "Error calculating rolling values".into(),
-        msg: e.to_string(),
-        span: Some(call.head),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let name = format!("{}_{}", series.name(), roll_type.to_str());
-    res.rename(&name);
-
-    NuDataFrame::try_from_series(vec![res.into_series()], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::eager::DropNulls;
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(Rolling {}), Box::new(DropNulls {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/shift.rs b/crates/nu-cmd-dataframe/src/dataframe/series/shift.rs
deleted file mode 100644
index 2f40cf0a45..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/shift.rs
+++ /dev/null
@@ -1,115 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuLazyFrame};
-use nu_engine::command_prelude::*;
-
-use polars_plan::prelude::lit;
-
-#[derive(Clone)]
-pub struct Shift;
-
-impl Command for Shift {
-    fn name(&self) -> &str {
-        "dfr shift"
-    }
-
-    fn usage(&self) -> &str {
-        "Shifts the values by a given period."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required("period", SyntaxShape::Int, "shift period")
-            .named(
-                "fill",
-                SyntaxShape::Any,
-                "Expression used to fill the null values (lazy df)",
-                Some('f'),
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe or lazyframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Shifts the values by a given period",
-            example: "[1 2 2 3 3] | dfr into-df | dfr shift 2 | dfr drop-nulls",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![Value::test_int(1), Value::test_int(2), Value::test_int(2)],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let value = input.into_value(call.head)?;
-        if NuLazyFrame::can_downcast(&value) {
-            let df = NuLazyFrame::try_from_value(value)?;
-            command_lazy(engine_state, stack, call, df)
-        } else {
-            let df = NuDataFrame::try_from_value(value)?;
-            command_eager(engine_state, stack, call, df)
-        }
-    }
-}
-
-fn command_eager(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    df: NuDataFrame,
-) -> Result<PipelineData, ShellError> {
-    let period: i64 = call.req(engine_state, stack, 0)?;
-    let series = df.as_series(call.head)?.shift(period);
-
-    NuDataFrame::try_from_series(vec![series], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-fn command_lazy(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    lazy: NuLazyFrame,
-) -> Result<PipelineData, ShellError> {
-    let shift: i64 = call.req(engine_state, stack, 0)?;
-    let fill: Option<Value> = call.get_flag(engine_state, stack, "fill")?;
-
-    let lazy = lazy.into_polars();
-
-    let lazy: NuLazyFrame = match fill {
-        Some(fill) => {
-            let expr = NuExpression::try_from_value(fill)?.into_polars();
-            lazy.shift_and_fill(lit(shift), expr).into()
-        }
-        None => lazy.shift(shift).into(),
-    };
-
-    Ok(PipelineData::Value(lazy.into_value(call.head)?, None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::eager::DropNulls;
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(Shift {}), Box::new(DropNulls {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/string/concatenate.rs b/crates/nu-cmd-dataframe/src/dataframe/series/string/concatenate.rs
deleted file mode 100644
index d7589bd3b1..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/string/concatenate.rs
+++ /dev/null
@@ -1,113 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-
-use polars::prelude::{IntoSeries, StringNameSpaceImpl};
-
-#[derive(Clone)]
-pub struct Concatenate;
-
-impl Command for Concatenate {
-    fn name(&self) -> &str {
-        "dfr concatenate"
-    }
-
-    fn usage(&self) -> &str {
-        "Concatenates strings with other array."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required(
-                "other",
-                SyntaxShape::Any,
-                "Other array with string to be concatenated",
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Concatenate string",
-            example: r#"let other = ([za xs cd] | dfr into-df);
-    [abc abc abc] | dfr into-df | dfr concatenate $other"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![
-                            Value::test_string("abcza"),
-                            Value::test_string("abcxs"),
-                            Value::test_string("abccd"),
-                        ],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-
-    let other: Value = call.req(engine_state, stack, 0)?;
-    let other_span = other.span();
-    let other_df = NuDataFrame::try_from_value(other)?;
-
-    let other_series = other_df.as_series(other_span)?;
-    let other_chunked = other_series.str().map_err(|e| ShellError::GenericError {
-        error: "The concatenate only with string columns".into(),
-        msg: e.to_string(),
-        span: Some(other_span),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let series = df.as_series(call.head)?;
-    let chunked = series.str().map_err(|e| ShellError::GenericError {
-        error: "The concatenate only with string columns".into(),
-        msg: e.to_string(),
-        span: Some(call.head),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let mut res = chunked.concat(other_chunked);
-
-    res.rename(series.name());
-
-    NuDataFrame::try_from_series(vec![res.into_series()], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(Concatenate {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/string/contains.rs b/crates/nu-cmd-dataframe/src/dataframe/series/string/contains.rs
deleted file mode 100644
index 9c1d92681e..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/string/contains.rs
+++ /dev/null
@@ -1,106 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-
-use polars::prelude::{IntoSeries, StringNameSpaceImpl};
-
-#[derive(Clone)]
-pub struct Contains;
-
-impl Command for Contains {
-    fn name(&self) -> &str {
-        "dfr contains"
-    }
-
-    fn usage(&self) -> &str {
-        "Checks if a pattern is contained in a string."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required(
-                "pattern",
-                SyntaxShape::String,
-                "Regex pattern to be searched",
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns boolean indicating if pattern was found",
-            example: "[abc acb acb] | dfr into-df | dfr contains ab",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![
-                            Value::test_bool(true),
-                            Value::test_bool(false),
-                            Value::test_bool(false),
-                        ],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let pattern: String = call.req(engine_state, stack, 0)?;
-
-    let series = df.as_series(call.head)?;
-    let chunked = series.str().map_err(|e| ShellError::GenericError {
-        error: "The contains command only with string columns".into(),
-        msg: e.to_string(),
-        span: Some(call.head),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let res = chunked
-        .contains(&pattern, false)
-        .map_err(|e| ShellError::GenericError {
-            error: "Error searching in series".into(),
-            msg: e.to_string(),
-            span: Some(call.head),
-            help: None,
-            inner: vec![],
-        })?;
-
-    NuDataFrame::try_from_series(vec![res.into_series()], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(Contains {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/string/mod.rs b/crates/nu-cmd-dataframe/src/dataframe/series/string/mod.rs
deleted file mode 100644
index f2fa19cbaf..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/string/mod.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-mod concatenate;
-mod contains;
-mod replace;
-mod replace_all;
-mod str_lengths;
-mod str_slice;
-mod strftime;
-mod to_lowercase;
-mod to_uppercase;
-
-pub use concatenate::Concatenate;
-pub use contains::Contains;
-pub use replace::Replace;
-pub use replace_all::ReplaceAll;
-pub use str_lengths::StrLengths;
-pub use str_slice::StrSlice;
-pub use strftime::StrFTime;
-pub use to_lowercase::ToLowerCase;
-pub use to_uppercase::ToUpperCase;
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/string/replace.rs b/crates/nu-cmd-dataframe/src/dataframe/series/string/replace.rs
deleted file mode 100644
index d954e20b66..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/string/replace.rs
+++ /dev/null
@@ -1,120 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-
-use polars::prelude::{IntoSeries, StringNameSpaceImpl};
-
-#[derive(Clone)]
-pub struct Replace;
-
-impl Command for Replace {
-    fn name(&self) -> &str {
-        "dfr replace"
-    }
-
-    fn usage(&self) -> &str {
-        "Replace the leftmost (sub)string by a regex pattern."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required_named(
-                "pattern",
-                SyntaxShape::String,
-                "Regex pattern to be matched",
-                Some('p'),
-            )
-            .required_named(
-                "replace",
-                SyntaxShape::String,
-                "replacing string",
-                Some('r'),
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Replaces string",
-            example: "[abc abc abc] | dfr into-df | dfr replace --pattern ab --replace AB",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![
-                            Value::test_string("ABc"),
-                            Value::test_string("ABc"),
-                            Value::test_string("ABc"),
-                        ],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let pattern: String = call
-        .get_flag(engine_state, stack, "pattern")?
-        .expect("required value");
-    let replace: String = call
-        .get_flag(engine_state, stack, "replace")?
-        .expect("required value");
-
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let series = df.as_series(call.head)?;
-    let chunked = series.str().map_err(|e| ShellError::GenericError {
-        error: "Error conversion to string".into(),
-        msg: e.to_string(),
-        span: Some(call.head),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let mut res = chunked
-        .replace(&pattern, &replace)
-        .map_err(|e| ShellError::GenericError {
-            error: "Error finding pattern other".into(),
-            msg: e.to_string(),
-            span: Some(call.head),
-            help: None,
-            inner: vec![],
-        })?;
-
-    res.rename(series.name());
-
-    NuDataFrame::try_from_series(vec![res.into_series()], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(Replace {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/string/replace_all.rs b/crates/nu-cmd-dataframe/src/dataframe/series/string/replace_all.rs
deleted file mode 100644
index f329cbca73..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/string/replace_all.rs
+++ /dev/null
@@ -1,121 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-
-use polars::prelude::{IntoSeries, StringNameSpaceImpl};
-
-#[derive(Clone)]
-pub struct ReplaceAll;
-
-impl Command for ReplaceAll {
-    fn name(&self) -> &str {
-        "dfr replace-all"
-    }
-
-    fn usage(&self) -> &str {
-        "Replace all (sub)strings by a regex pattern."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required_named(
-                "pattern",
-                SyntaxShape::String,
-                "Regex pattern to be matched",
-                Some('p'),
-            )
-            .required_named(
-                "replace",
-                SyntaxShape::String,
-                "replacing string",
-                Some('r'),
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Replaces string",
-            example: "[abac abac abac] | dfr into-df | dfr replace-all --pattern a --replace A",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![
-                            Value::test_string("AbAc"),
-                            Value::test_string("AbAc"),
-                            Value::test_string("AbAc"),
-                        ],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let pattern: String = call
-        .get_flag(engine_state, stack, "pattern")?
-        .expect("required value");
-    let replace: String = call
-        .get_flag(engine_state, stack, "replace")?
-        .expect("required value");
-
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let series = df.as_series(call.head)?;
-    let chunked = series.str().map_err(|e| ShellError::GenericError {
-        error: "Error conversion to string".into(),
-        msg: e.to_string(),
-        span: Some(call.head),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let mut res =
-        chunked
-            .replace_all(&pattern, &replace)
-            .map_err(|e| ShellError::GenericError {
-                error: "Error finding pattern other".into(),
-                msg: e.to_string(),
-                span: Some(call.head),
-                help: None,
-                inner: vec![],
-            })?;
-
-    res.rename(series.name());
-
-    NuDataFrame::try_from_series(vec![res.into_series()], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(ReplaceAll {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/string/str_lengths.rs b/crates/nu-cmd-dataframe/src/dataframe/series/string/str_lengths.rs
deleted file mode 100644
index 6889cef387..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/string/str_lengths.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-use polars::prelude::{IntoSeries, StringNameSpaceImpl};
-
-#[derive(Clone)]
-pub struct StrLengths;
-
-impl Command for StrLengths {
-    fn name(&self) -> &str {
-        "dfr str-lengths"
-    }
-
-    fn usage(&self) -> &str {
-        "Get lengths of all strings."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns string lengths",
-            example: "[a ab abc] | dfr into-df | dfr str-lengths",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![Value::test_int(1), Value::test_int(2), Value::test_int(3)],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let series = df.as_series(call.head)?;
-
-    let chunked = series.str().map_err(|e| ShellError::GenericError {
-        error: "Error casting to string".into(),
-        msg: e.to_string(),
-        span: Some(call.head),
-        help: Some("The str-lengths command can only be used with string columns".into()),
-        inner: vec![],
-    })?;
-
-    let res = chunked.as_ref().str_len_bytes().into_series();
-
-    NuDataFrame::try_from_series(vec![res], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(StrLengths {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/string/str_slice.rs b/crates/nu-cmd-dataframe/src/dataframe/series/string/str_slice.rs
deleted file mode 100644
index 6a5c8364c2..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/string/str_slice.rs
+++ /dev/null
@@ -1,136 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-
-use polars::{
-    prelude::{IntoSeries, NamedFrom, StringNameSpaceImpl},
-    series::Series,
-};
-
-#[derive(Clone)]
-pub struct StrSlice;
-
-impl Command for StrSlice {
-    fn name(&self) -> &str {
-        "dfr str-slice"
-    }
-
-    fn usage(&self) -> &str {
-        "Slices the string from the start position until the selected length."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required("start", SyntaxShape::Int, "start of slice")
-            .named("length", SyntaxShape::Int, "optional length", Some('l'))
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Creates slices from the strings",
-                example: "[abcded abc321 abc123] | dfr into-df | dfr str-slice 1 --length 2",
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![Column::new(
-                            "0".to_string(),
-                            vec![
-                                Value::test_string("bc"),
-                                Value::test_string("bc"),
-                                Value::test_string("bc"),
-                            ],
-                        )],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Creates slices from the strings without length",
-                example: "[abcded abc321 abc123] | dfr into-df | dfr str-slice 1",
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![Column::new(
-                            "0".to_string(),
-                            vec![
-                                Value::test_string("bcded"),
-                                Value::test_string("bc321"),
-                                Value::test_string("bc123"),
-                            ],
-                        )],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let start: i64 = call.req(engine_state, stack, 0)?;
-    let start = Series::new("", &[start]);
-
-    let length: Option<i64> = call.get_flag(engine_state, stack, "length")?;
-    let length = match length {
-        Some(v) => Series::new("", &[v as u64]),
-        None => Series::new_null("", 1),
-    };
-
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let series = df.as_series(call.head)?;
-
-    let chunked = series.str().map_err(|e| ShellError::GenericError {
-        error: "Error casting to string".into(),
-        msg: e.to_string(),
-        span: Some(call.head),
-        help: Some("The str-slice command can only be used with string columns".into()),
-        inner: vec![],
-    })?;
-
-    let res = chunked
-        .str_slice(&start, &length)
-        .map_err(|e| ShellError::GenericError {
-            error: "Dataframe Error".into(),
-            msg: e.to_string(),
-            span: Some(call.head),
-            help: None,
-            inner: vec![],
-        })?
-        .with_name(series.name());
-
-    NuDataFrame::try_from_series(vec![res.into_series()], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(StrSlice {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/string/strftime.rs b/crates/nu-cmd-dataframe/src/dataframe/series/string/strftime.rs
deleted file mode 100644
index 3cdfa84f8e..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/string/strftime.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-
-use polars::prelude::IntoSeries;
-
-#[derive(Clone)]
-pub struct StrFTime;
-
-impl Command for StrFTime {
-    fn name(&self) -> &str {
-        "dfr strftime"
-    }
-
-    fn usage(&self) -> &str {
-        "Formats date based on string rule."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required("fmt", SyntaxShape::String, "Format rule")
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Formats date",
-            example: r#"let dt = ('2020-08-04T16:39:18+00:00' | into datetime --timezone 'UTC');
-    let df = ([$dt $dt] | dfr into-df);
-    $df | dfr strftime "%Y/%m/%d""#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![
-                            Value::test_string("2020/08/04"),
-                            Value::test_string("2020/08/04"),
-                        ],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let fmt: String = call.req(engine_state, stack, 0)?;
-
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let series = df.as_series(call.head)?;
-
-    let casted = series.datetime().map_err(|e| ShellError::GenericError {
-        error: "Error casting to date".into(),
-        msg: e.to_string(),
-        span: Some(call.head),
-        help: Some("The str-slice command can only be used with string columns".into()),
-        inner: vec![],
-    })?;
-
-    let res = casted
-        .strftime(&fmt)
-        .map_err(|e| ShellError::GenericError {
-            error: "Error formatting datetime".into(),
-            msg: e.to_string(),
-            span: Some(call.head),
-            help: None,
-            inner: vec![],
-        })?
-        .into_series();
-
-    NuDataFrame::try_from_series(vec![res.into_series()], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(explore_refactor_IntoDatetime)]
-mod test {
-    use super::super::super::super::super::IntoDatetime;
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(StrFTime {}), Box::new(IntoDatetime {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/string/to_lowercase.rs b/crates/nu-cmd-dataframe/src/dataframe/series/string/to_lowercase.rs
deleted file mode 100644
index 2340437e35..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/string/to_lowercase.rs
+++ /dev/null
@@ -1,92 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-use polars::prelude::{IntoSeries, StringNameSpaceImpl};
-
-#[derive(Clone)]
-pub struct ToLowerCase;
-
-impl Command for ToLowerCase {
-    fn name(&self) -> &str {
-        "dfr lowercase"
-    }
-
-    fn usage(&self) -> &str {
-        "Lowercase the strings in the column."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Modifies strings to lowercase",
-            example: "[Abc aBc abC] | dfr into-df | dfr lowercase",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![
-                            Value::test_string("abc"),
-                            Value::test_string("abc"),
-                            Value::test_string("abc"),
-                        ],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let series = df.as_series(call.head)?;
-
-    let casted = series.str().map_err(|e| ShellError::GenericError {
-        error: "Error casting to string".into(),
-        msg: e.to_string(),
-        span: Some(call.head),
-        help: Some("The str-slice command can only be used with string columns".into()),
-        inner: vec![],
-    })?;
-
-    let mut res = casted.to_lowercase();
-    res.rename(series.name());
-
-    NuDataFrame::try_from_series(vec![res.into_series()], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(ToLowerCase {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/string/to_uppercase.rs b/crates/nu-cmd-dataframe/src/dataframe/series/string/to_uppercase.rs
deleted file mode 100644
index 23378f5dc3..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/string/to_uppercase.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-use polars::prelude::{IntoSeries, StringNameSpaceImpl};
-
-#[derive(Clone)]
-pub struct ToUpperCase;
-
-impl Command for ToUpperCase {
-    fn name(&self) -> &str {
-        "dfr uppercase"
-    }
-
-    fn usage(&self) -> &str {
-        "Uppercase the strings in the column."
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["capitalize, caps, capital"]
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Modifies strings to uppercase",
-            example: "[Abc aBc abC] | dfr into-df | dfr uppercase",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![
-                            Value::test_string("ABC"),
-                            Value::test_string("ABC"),
-                            Value::test_string("ABC"),
-                        ],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let series = df.as_series(call.head)?;
-
-    let casted = series.str().map_err(|e| ShellError::GenericError {
-        error: "Error casting to string".into(),
-        msg: e.to_string(),
-        span: Some(call.head),
-        help: Some("The str-slice command can only be used with string columns".into()),
-        inner: vec![],
-    })?;
-
-    let mut res = casted.to_uppercase();
-    res.rename(series.name());
-
-    NuDataFrame::try_from_series(vec![res.into_series()], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(ToUpperCase {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/unique.rs b/crates/nu-cmd-dataframe/src/dataframe/series/unique.rs
deleted file mode 100644
index 1bc2e0dc1b..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/unique.rs
+++ /dev/null
@@ -1,146 +0,0 @@
-use crate::dataframe::{
-    utils::extract_strings,
-    values::{Column, NuDataFrame, NuLazyFrame},
-};
-use nu_engine::command_prelude::*;
-
-use polars::prelude::{IntoSeries, UniqueKeepStrategy};
-
-#[derive(Clone)]
-pub struct Unique;
-
-impl Command for Unique {
-    fn name(&self) -> &str {
-        "dfr unique"
-    }
-
-    fn usage(&self) -> &str {
-        "Returns unique values from a dataframe."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .named(
-                "subset",
-                SyntaxShape::Any,
-                "Subset of column(s) to use to maintain rows (lazy df)",
-                Some('s'),
-            )
-            .switch(
-                "last",
-                "Keeps last unique value. Default keeps first value (lazy df)",
-                Some('l'),
-            )
-            .switch(
-                "maintain-order",
-                "Keep the same order as the original DataFrame (lazy df)",
-                Some('k'),
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe or lazyframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Returns unique values from a series",
-                example: "[2 2 2 2 2] | dfr into-df | dfr unique",
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![Column::new("0".to_string(), vec![Value::test_int(2)])],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Creates a is unique expression from a column",
-                example: "col a | unique",
-                result: None,
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let value = input.into_value(call.head)?;
-        if NuLazyFrame::can_downcast(&value) {
-            let df = NuLazyFrame::try_from_value(value)?;
-            command_lazy(engine_state, stack, call, df)
-        } else {
-            let df = NuDataFrame::try_from_value(value)?;
-            command_eager(engine_state, stack, call, df)
-        }
-    }
-}
-
-fn command_eager(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    df: NuDataFrame,
-) -> Result<PipelineData, ShellError> {
-    let series = df.as_series(call.head)?;
-
-    let res = series.unique().map_err(|e| ShellError::GenericError {
-        error: "Error calculating unique values".into(),
-        msg: e.to_string(),
-        span: Some(call.head),
-        help: Some("The str-slice command can only be used with string columns".into()),
-        inner: vec![],
-    })?;
-
-    NuDataFrame::try_from_series(vec![res.into_series()], call.head)
-        .map(|df| PipelineData::Value(NuDataFrame::into_value(df, call.head), None))
-}
-
-fn command_lazy(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    lazy: NuLazyFrame,
-) -> Result<PipelineData, ShellError> {
-    let last = call.has_flag(engine_state, stack, "last")?;
-    let maintain = call.has_flag(engine_state, stack, "maintain-order")?;
-
-    let subset: Option<Value> = call.get_flag(engine_state, stack, "subset")?;
-    let subset = match subset {
-        Some(value) => Some(extract_strings(value)?),
-        None => None,
-    };
-
-    let strategy = if last {
-        UniqueKeepStrategy::Last
-    } else {
-        UniqueKeepStrategy::First
-    };
-
-    let lazy = lazy.into_polars();
-    let lazy: NuLazyFrame = if maintain {
-        lazy.unique(subset, strategy).into()
-    } else {
-        lazy.unique_stable(subset, strategy).into()
-    };
-
-    Ok(PipelineData::Value(lazy.into_value(call.head)?, None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(Unique {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/value_counts.rs b/crates/nu-cmd-dataframe/src/dataframe/series/value_counts.rs
deleted file mode 100644
index 87d3b42b3a..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/series/value_counts.rs
+++ /dev/null
@@ -1,95 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame};
-use nu_engine::command_prelude::*;
-use polars::prelude::SeriesMethods;
-
-#[derive(Clone)]
-pub struct ValueCount;
-
-impl Command for ValueCount {
-    fn name(&self) -> &str {
-        "dfr value-counts"
-    }
-
-    fn usage(&self) -> &str {
-        "Returns a dataframe with the counts for unique values in series."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Calculates value counts",
-            example: "[5 5 5 5 6 6] | dfr into-df | dfr value-counts",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "0".to_string(),
-                            vec![Value::test_int(5), Value::test_int(6)],
-                        ),
-                        Column::new(
-                            "count".to_string(),
-                            vec![Value::test_int(4), Value::test_int(2)],
-                        ),
-                    ],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        command(engine_state, stack, call, input)
-    }
-}
-
-fn command(
-    _engine_state: &EngineState,
-    _stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline(input, call.head)?;
-    let series = df.as_series(call.head)?;
-
-    let res = series
-        .value_counts(false, false)
-        .map_err(|e| ShellError::GenericError {
-            error: "Error calculating value counts values".into(),
-            msg: e.to_string(),
-            span: Some(call.head),
-            help: Some("The str-slice command can only be used with string columns".into()),
-            inner: vec![],
-        })?;
-
-    Ok(PipelineData::Value(
-        NuDataFrame::dataframe_into_value(res, call.head),
-        None,
-    ))
-}
-
-#[cfg(test)]
-mod test {
-    use super::super::super::test_dataframe::test_dataframe;
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        test_dataframe(vec![Box::new(ValueCount {})])
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/stub.rs b/crates/nu-cmd-dataframe/src/dataframe/stub.rs
deleted file mode 100644
index dfabbe0b82..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/stub.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-use nu_engine::{command_prelude::*, get_full_help};
-
-#[derive(Clone)]
-pub struct Dfr;
-
-impl Command for Dfr {
-    fn name(&self) -> &str {
-        "dfr"
-    }
-
-    fn usage(&self) -> &str {
-        "Operate with data in a dataframe format."
-    }
-
-    fn signature(&self) -> nu_protocol::Signature {
-        Signature::build("dfr")
-            .category(Category::Custom("dataframe".into()))
-            .input_output_types(vec![(Type::Nothing, Type::String)])
-    }
-
-    fn extra_usage(&self) -> &str {
-        "You must use one of the following subcommands. Using this command as-is will only produce this help message."
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/test_dataframe.rs b/crates/nu-cmd-dataframe/src/dataframe/test_dataframe.rs
deleted file mode 100644
index 39c30be9dd..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/test_dataframe.rs
+++ /dev/null
@@ -1,98 +0,0 @@
-use super::{
-    eager::{SchemaDF, ToDataFrame},
-    expressions::ExprCol,
-    lazy::{LazyCollect, LazyFillNull, ToLazyFrame},
-};
-use nu_cmd_lang::Let;
-use nu_engine::{command_prelude::*, eval_block};
-use nu_parser::parse;
-use nu_protocol::{debugger::WithoutDebug, engine::StateWorkingSet};
-
-pub fn test_dataframe(cmds: Vec<Box<dyn Command + 'static>>) {
-    if cmds.is_empty() {
-        panic!("Empty commands vector")
-    }
-
-    // The first element in the cmds vector must be the one tested
-    let examples = cmds[0].examples();
-    let mut engine_state = build_test_engine_state(cmds.clone());
-
-    for example in examples {
-        test_dataframe_example(&mut engine_state, &example);
-    }
-}
-
-pub fn build_test_engine_state(cmds: Vec<Box<dyn Command + 'static>>) -> Box<EngineState> {
-    let mut engine_state = Box::new(EngineState::new());
-
-    let delta = {
-        // Base functions that are needed for testing
-        // Try to keep this working set small to keep tests running as fast as possible
-        let mut working_set = StateWorkingSet::new(&engine_state);
-        working_set.add_decl(Box::new(Let));
-        working_set.add_decl(Box::new(ToDataFrame));
-        working_set.add_decl(Box::new(ToLazyFrame));
-        working_set.add_decl(Box::new(LazyCollect));
-        working_set.add_decl(Box::new(ExprCol));
-        working_set.add_decl(Box::new(SchemaDF));
-        working_set.add_decl(Box::new(LazyFillNull));
-
-        // Adding the command that is being tested to the working set
-        for cmd in cmds.clone() {
-            working_set.add_decl(cmd);
-        }
-
-        working_set.render()
-    };
-
-    engine_state
-        .merge_delta(delta)
-        .expect("Error merging delta");
-
-    engine_state
-}
-
-pub fn test_dataframe_example(engine_state: &mut Box<EngineState>, example: &Example) {
-    // Skip tests that don't have results to compare to
-    if example.result.is_none() {
-        return;
-    }
-
-    let start = std::time::Instant::now();
-
-    let (block, delta) = {
-        let mut working_set = StateWorkingSet::new(engine_state);
-        let output = parse(&mut working_set, None, example.example.as_bytes(), false);
-
-        if let Some(err) = working_set.parse_errors.first() {
-            panic!("test parse error in `{}`: {:?}", example.example, err)
-        }
-
-        (output, working_set.render())
-    };
-
-    engine_state
-        .merge_delta(delta)
-        .expect("Error merging delta");
-
-    let mut stack = Stack::new().capture();
-
-    let result =
-        eval_block::<WithoutDebug>(engine_state, &mut stack, &block, PipelineData::empty())
-            .unwrap_or_else(|err| panic!("test eval error in `{}`: {:?}", example.example, err))
-            .into_value(Span::test_data())
-            .expect("ok value");
-
-    println!("input: {}", example.example);
-    println!("result: {result:?}");
-    println!("done: {:?}", start.elapsed());
-
-    // Note. Value implements PartialEq for Bool, Int, Float, String and Block
-    // If the command you are testing requires to compare another case, then
-    // you need to define its equality in the Value struct
-    if let Some(expected) = example.result.clone() {
-        if result != expected {
-            panic!("the example result is different to expected value: {result:?} != {expected:?}")
-        }
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/utils.rs b/crates/nu-cmd-dataframe/src/dataframe/utils.rs
deleted file mode 100644
index db99d550a9..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/utils.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use nu_protocol::{FromValue, ShellError, Value};
-
-pub fn extract_strings(value: Value) -> Result<Vec<String>, ShellError> {
-    let span = value.span();
-    match (
-        <String as FromValue>::from_value(value.clone()),
-        <Vec<String> as FromValue>::from_value(value),
-    ) {
-        (Ok(col), Err(_)) => Ok(vec![col]),
-        (Err(_), Ok(cols)) => Ok(cols),
-        _ => Err(ShellError::IncompatibleParametersSingle {
-            msg: "Expected a string or list of strings".into(),
-            span,
-        }),
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/values/mod.rs b/crates/nu-cmd-dataframe/src/dataframe/values/mod.rs
deleted file mode 100644
index eaed15aa4b..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/values/mod.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-mod nu_dataframe;
-mod nu_expression;
-mod nu_lazyframe;
-mod nu_lazygroupby;
-mod nu_schema;
-mod nu_when;
-pub mod utils;
-
-pub use nu_dataframe::{Axis, Column, NuDataFrame};
-pub use nu_expression::NuExpression;
-pub use nu_lazyframe::NuLazyFrame;
-pub use nu_lazygroupby::NuLazyGroupBy;
-pub use nu_schema::{str_to_dtype, NuSchema};
-pub use nu_when::NuWhen;
diff --git a/crates/nu-cmd-dataframe/src/dataframe/values/nu_dataframe/between_values.rs b/crates/nu-cmd-dataframe/src/dataframe/values/nu_dataframe/between_values.rs
deleted file mode 100644
index 74a484825a..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/values/nu_dataframe/between_values.rs
+++ /dev/null
@@ -1,884 +0,0 @@
-use super::{operations::Axis, NuDataFrame};
-use nu_protocol::{
-    ast::{Boolean, Comparison, Math, Operator},
-    ShellError, Span, Spanned, Value,
-};
-use num::Zero;
-use polars::prelude::{
-    BooleanType, ChunkCompare, ChunkedArray, DataType, Float64Type, Int64Type, IntoSeries,
-    NumOpsDispatchChecked, PolarsError, Series, StringNameSpaceImpl,
-};
-use std::ops::{Add, BitAnd, BitOr, Div, Mul, Sub};
-
-pub(super) fn between_dataframes(
-    operator: Spanned<Operator>,
-    left: &Value,
-    lhs: &NuDataFrame,
-    right: &Value,
-    rhs: &NuDataFrame,
-) -> Result<Value, ShellError> {
-    let operation_span = Span::merge(left.span(), right.span());
-    match operator.item {
-        Operator::Math(Math::Plus) => match lhs.append_df(rhs, Axis::Row, operation_span) {
-            Ok(df) => Ok(df.into_value(operation_span)),
-            Err(e) => Err(e),
-        },
-        _ => Err(ShellError::OperatorMismatch {
-            op_span: operator.span,
-            lhs_ty: left.get_type().to_string(),
-            lhs_span: left.span(),
-            rhs_ty: right.get_type().to_string(),
-            rhs_span: right.span(),
-        }),
-    }
-}
-
-pub(super) fn compute_between_series(
-    operator: Spanned<Operator>,
-    left: &Value,
-    lhs: &Series,
-    right: &Value,
-    rhs: &Series,
-) -> Result<Value, ShellError> {
-    let operation_span = Span::merge(left.span(), right.span());
-    match operator.item {
-        Operator::Math(Math::Plus) => {
-            let mut res = lhs + rhs;
-            let name = format!("sum_{}_{}", lhs.name(), rhs.name());
-            res.rename(&name);
-            NuDataFrame::series_to_value(res, operation_span)
-        }
-        Operator::Math(Math::Minus) => {
-            let mut res = lhs - rhs;
-            let name = format!("sub_{}_{}", lhs.name(), rhs.name());
-            res.rename(&name);
-            NuDataFrame::series_to_value(res, operation_span)
-        }
-        Operator::Math(Math::Multiply) => {
-            let mut res = lhs * rhs;
-            let name = format!("mul_{}_{}", lhs.name(), rhs.name());
-            res.rename(&name);
-            NuDataFrame::series_to_value(res, operation_span)
-        }
-        Operator::Math(Math::Divide) => {
-            let res = lhs.checked_div(rhs);
-            match res {
-                Ok(mut res) => {
-                    let name = format!("div_{}_{}", lhs.name(), rhs.name());
-                    res.rename(&name);
-                    NuDataFrame::series_to_value(res, operation_span)
-                }
-                Err(e) => Err(ShellError::GenericError {
-                    error: "Division error".into(),
-                    msg: e.to_string(),
-                    span: Some(right.span()),
-                    help: None,
-                    inner: vec![],
-                }),
-            }
-        }
-        Operator::Comparison(Comparison::Equal) => {
-            let name = format!("eq_{}_{}", lhs.name(), rhs.name());
-            let res = compare_series(lhs, rhs, name.as_str(), right.span(), Series::equal)?;
-            NuDataFrame::series_to_value(res, operation_span)
-        }
-        Operator::Comparison(Comparison::NotEqual) => {
-            let name = format!("neq_{}_{}", lhs.name(), rhs.name());
-            let res = compare_series(lhs, rhs, name.as_str(), right.span(), Series::not_equal)?;
-            NuDataFrame::series_to_value(res, operation_span)
-        }
-        Operator::Comparison(Comparison::LessThan) => {
-            let name = format!("lt_{}_{}", lhs.name(), rhs.name());
-            let res = compare_series(lhs, rhs, name.as_str(), right.span(), Series::lt)?;
-            NuDataFrame::series_to_value(res, operation_span)
-        }
-        Operator::Comparison(Comparison::LessThanOrEqual) => {
-            let name = format!("lte_{}_{}", lhs.name(), rhs.name());
-            let res = compare_series(lhs, rhs, name.as_str(), right.span(), Series::lt_eq)?;
-            NuDataFrame::series_to_value(res, operation_span)
-        }
-        Operator::Comparison(Comparison::GreaterThan) => {
-            let name = format!("gt_{}_{}", lhs.name(), rhs.name());
-            let res = compare_series(lhs, rhs, name.as_str(), right.span(), Series::gt)?;
-            NuDataFrame::series_to_value(res, operation_span)
-        }
-        Operator::Comparison(Comparison::GreaterThanOrEqual) => {
-            let name = format!("gte_{}_{}", lhs.name(), rhs.name());
-            let res = compare_series(lhs, rhs, name.as_str(), right.span(), Series::gt_eq)?;
-            NuDataFrame::series_to_value(res, operation_span)
-        }
-        Operator::Boolean(Boolean::And) => match lhs.dtype() {
-            DataType::Boolean => {
-                let lhs_cast = lhs.bool();
-                let rhs_cast = rhs.bool();
-
-                match (lhs_cast, rhs_cast) {
-                    (Ok(l), Ok(r)) => {
-                        let mut res = l.bitand(r).into_series();
-                        let name = format!("and_{}_{}", lhs.name(), rhs.name());
-                        res.rename(&name);
-                        NuDataFrame::series_to_value(res, operation_span)
-                    }
-                    _ => Err(ShellError::GenericError {
-                        error: "Incompatible types".into(),
-                        msg: "unable to cast to boolean".into(),
-                        span: Some(right.span()),
-                        help: None,
-                        inner: vec![],
-                    }),
-                }
-            }
-            _ => Err(ShellError::IncompatibleParametersSingle {
-                msg: format!(
-                    "Operation {} can only be done with boolean values",
-                    operator.item
-                ),
-                span: operation_span,
-            }),
-        },
-        Operator::Boolean(Boolean::Or) => match lhs.dtype() {
-            DataType::Boolean => {
-                let lhs_cast = lhs.bool();
-                let rhs_cast = rhs.bool();
-
-                match (lhs_cast, rhs_cast) {
-                    (Ok(l), Ok(r)) => {
-                        let mut res = l.bitor(r).into_series();
-                        let name = format!("or_{}_{}", lhs.name(), rhs.name());
-                        res.rename(&name);
-                        NuDataFrame::series_to_value(res, operation_span)
-                    }
-                    _ => Err(ShellError::GenericError {
-                        error: "Incompatible types".into(),
-                        msg: "unable to cast to boolean".into(),
-                        span: Some(right.span()),
-                        help: None,
-                        inner: vec![],
-                    }),
-                }
-            }
-            _ => Err(ShellError::IncompatibleParametersSingle {
-                msg: format!(
-                    "Operation {} can only be done with boolean values",
-                    operator.item
-                ),
-                span: operation_span,
-            }),
-        },
-        _ => Err(ShellError::OperatorMismatch {
-            op_span: operator.span,
-            lhs_ty: left.get_type().to_string(),
-            lhs_span: left.span(),
-            rhs_ty: right.get_type().to_string(),
-            rhs_span: right.span(),
-        }),
-    }
-}
-
-fn compare_series<'s, F>(
-    lhs: &'s Series,
-    rhs: &'s Series,
-    name: &'s str,
-    span: Span,
-    f: F,
-) -> Result<Series, ShellError>
-where
-    F: Fn(&'s Series, &'s Series) -> Result<ChunkedArray<BooleanType>, PolarsError>,
-{
-    let mut res = f(lhs, rhs)
-        .map_err(|e| ShellError::GenericError {
-            error: "Equality error".into(),
-            msg: e.to_string(),
-            span: Some(span),
-            help: None,
-            inner: vec![],
-        })?
-        .into_series();
-
-    res.rename(name);
-    Ok(res)
-}
-
-pub(super) fn compute_series_single_value(
-    operator: Spanned<Operator>,
-    left: &Value,
-    lhs: &NuDataFrame,
-    right: &Value,
-) -> Result<Value, ShellError> {
-    if !lhs.is_series() {
-        return Err(ShellError::OperatorMismatch {
-            op_span: operator.span,
-            lhs_ty: left.get_type().to_string(),
-            lhs_span: left.span(),
-            rhs_ty: right.get_type().to_string(),
-            rhs_span: right.span(),
-        });
-    }
-
-    let lhs_span = left.span();
-    let lhs = lhs.as_series(lhs_span)?;
-
-    match operator.item {
-        Operator::Math(Math::Plus) => match &right {
-            Value::Int { val, .. } => {
-                compute_series_i64(&lhs, *val, <ChunkedArray<Int64Type>>::add, lhs_span)
-            }
-            Value::Float { val, .. } => {
-                compute_series_float(&lhs, *val, <ChunkedArray<Float64Type>>::add, lhs_span)
-            }
-            Value::String { val, .. } => add_string_to_series(&lhs, val, lhs_span),
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: operator.span,
-                lhs_ty: left.get_type().to_string(),
-                lhs_span: left.span(),
-                rhs_ty: right.get_type().to_string(),
-                rhs_span: right.span(),
-            }),
-        },
-        Operator::Math(Math::Minus) => match &right {
-            Value::Int { val, .. } => {
-                compute_series_i64(&lhs, *val, <ChunkedArray<Int64Type>>::sub, lhs_span)
-            }
-            Value::Float { val, .. } => {
-                compute_series_float(&lhs, *val, <ChunkedArray<Float64Type>>::sub, lhs_span)
-            }
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: operator.span,
-                lhs_ty: left.get_type().to_string(),
-                lhs_span: left.span(),
-                rhs_ty: right.get_type().to_string(),
-                rhs_span: right.span(),
-            }),
-        },
-        Operator::Math(Math::Multiply) => match &right {
-            Value::Int { val, .. } => {
-                compute_series_i64(&lhs, *val, <ChunkedArray<Int64Type>>::mul, lhs_span)
-            }
-            Value::Float { val, .. } => {
-                compute_series_float(&lhs, *val, <ChunkedArray<Float64Type>>::mul, lhs_span)
-            }
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: operator.span,
-                lhs_ty: left.get_type().to_string(),
-                lhs_span: left.span(),
-                rhs_ty: right.get_type().to_string(),
-                rhs_span: right.span(),
-            }),
-        },
-        Operator::Math(Math::Divide) => {
-            let span = right.span();
-            match &right {
-                Value::Int { val, .. } => {
-                    if *val == 0 {
-                        Err(ShellError::DivisionByZero { span })
-                    } else {
-                        compute_series_i64(&lhs, *val, <ChunkedArray<Int64Type>>::div, lhs_span)
-                    }
-                }
-                Value::Float { val, .. } => {
-                    if val.is_zero() {
-                        Err(ShellError::DivisionByZero { span })
-                    } else {
-                        compute_series_float(&lhs, *val, <ChunkedArray<Float64Type>>::div, lhs_span)
-                    }
-                }
-                _ => Err(ShellError::OperatorMismatch {
-                    op_span: operator.span,
-                    lhs_ty: left.get_type().to_string(),
-                    lhs_span: left.span(),
-                    rhs_ty: right.get_type().to_string(),
-                    rhs_span: right.span(),
-                }),
-            }
-        }
-        Operator::Comparison(Comparison::Equal) => match &right {
-            Value::Int { val, .. } => compare_series_i64(&lhs, *val, ChunkedArray::equal, lhs_span),
-            Value::Float { val, .. } => {
-                compare_series_float(&lhs, *val, ChunkedArray::equal, lhs_span)
-            }
-            Value::String { val, .. } => {
-                let equal_pattern = format!("^{}$", fancy_regex::escape(val));
-                contains_series_pat(&lhs, &equal_pattern, lhs_span)
-            }
-            Value::Date { val, .. } => {
-                compare_series_i64(&lhs, val.timestamp_millis(), ChunkedArray::equal, lhs_span)
-            }
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: operator.span,
-                lhs_ty: left.get_type().to_string(),
-                lhs_span: left.span(),
-                rhs_ty: right.get_type().to_string(),
-                rhs_span: right.span(),
-            }),
-        },
-        Operator::Comparison(Comparison::NotEqual) => match &right {
-            Value::Int { val, .. } => {
-                compare_series_i64(&lhs, *val, ChunkedArray::not_equal, lhs_span)
-            }
-            Value::Float { val, .. } => {
-                compare_series_float(&lhs, *val, ChunkedArray::not_equal, lhs_span)
-            }
-            Value::Date { val, .. } => compare_series_i64(
-                &lhs,
-                val.timestamp_millis(),
-                ChunkedArray::not_equal,
-                lhs_span,
-            ),
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: operator.span,
-                lhs_ty: left.get_type().to_string(),
-                lhs_span: left.span(),
-                rhs_ty: right.get_type().to_string(),
-                rhs_span: right.span(),
-            }),
-        },
-        Operator::Comparison(Comparison::LessThan) => match &right {
-            Value::Int { val, .. } => compare_series_i64(&lhs, *val, ChunkedArray::lt, lhs_span),
-            Value::Float { val, .. } => {
-                compare_series_float(&lhs, *val, ChunkedArray::lt, lhs_span)
-            }
-            Value::Date { val, .. } => {
-                compare_series_i64(&lhs, val.timestamp_millis(), ChunkedArray::lt, lhs_span)
-            }
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: operator.span,
-                lhs_ty: left.get_type().to_string(),
-                lhs_span: left.span(),
-                rhs_ty: right.get_type().to_string(),
-                rhs_span: right.span(),
-            }),
-        },
-        Operator::Comparison(Comparison::LessThanOrEqual) => match &right {
-            Value::Int { val, .. } => compare_series_i64(&lhs, *val, ChunkedArray::lt_eq, lhs_span),
-            Value::Float { val, .. } => {
-                compare_series_float(&lhs, *val, ChunkedArray::lt_eq, lhs_span)
-            }
-            Value::Date { val, .. } => {
-                compare_series_i64(&lhs, val.timestamp_millis(), ChunkedArray::lt_eq, lhs_span)
-            }
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: operator.span,
-                lhs_ty: left.get_type().to_string(),
-                lhs_span: left.span(),
-                rhs_ty: right.get_type().to_string(),
-                rhs_span: right.span(),
-            }),
-        },
-        Operator::Comparison(Comparison::GreaterThan) => match &right {
-            Value::Int { val, .. } => compare_series_i64(&lhs, *val, ChunkedArray::gt, lhs_span),
-            Value::Float { val, .. } => {
-                compare_series_float(&lhs, *val, ChunkedArray::gt, lhs_span)
-            }
-            Value::Date { val, .. } => {
-                compare_series_i64(&lhs, val.timestamp_millis(), ChunkedArray::gt, lhs_span)
-            }
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: operator.span,
-                lhs_ty: left.get_type().to_string(),
-                lhs_span: left.span(),
-                rhs_ty: right.get_type().to_string(),
-                rhs_span: right.span(),
-            }),
-        },
-        Operator::Comparison(Comparison::GreaterThanOrEqual) => match &right {
-            Value::Int { val, .. } => compare_series_i64(&lhs, *val, ChunkedArray::gt_eq, lhs_span),
-            Value::Float { val, .. } => {
-                compare_series_float(&lhs, *val, ChunkedArray::gt_eq, lhs_span)
-            }
-            Value::Date { val, .. } => {
-                compare_series_i64(&lhs, val.timestamp_millis(), ChunkedArray::gt_eq, lhs_span)
-            }
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: operator.span,
-                lhs_ty: left.get_type().to_string(),
-                lhs_span: left.span(),
-                rhs_ty: right.get_type().to_string(),
-                rhs_span: right.span(),
-            }),
-        },
-        // TODO: update this to do a regex match instead of a simple contains?
-        Operator::Comparison(Comparison::RegexMatch) => match &right {
-            Value::String { val, .. } => contains_series_pat(&lhs, val, lhs_span),
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: operator.span,
-                lhs_ty: left.get_type().to_string(),
-                lhs_span: left.span(),
-                rhs_ty: right.get_type().to_string(),
-                rhs_span: right.span(),
-            }),
-        },
-        Operator::Comparison(Comparison::StartsWith) => match &right {
-            Value::String { val, .. } => {
-                let starts_with_pattern = format!("^{}", fancy_regex::escape(val));
-                contains_series_pat(&lhs, &starts_with_pattern, lhs_span)
-            }
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: operator.span,
-                lhs_ty: left.get_type().to_string(),
-                lhs_span: left.span(),
-                rhs_ty: right.get_type().to_string(),
-                rhs_span: right.span(),
-            }),
-        },
-        Operator::Comparison(Comparison::EndsWith) => match &right {
-            Value::String { val, .. } => {
-                let ends_with_pattern = format!("{}$", fancy_regex::escape(val));
-                contains_series_pat(&lhs, &ends_with_pattern, lhs_span)
-            }
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: operator.span,
-                lhs_ty: left.get_type().to_string(),
-                lhs_span: left.span(),
-                rhs_ty: right.get_type().to_string(),
-                rhs_span: right.span(),
-            }),
-        },
-        _ => Err(ShellError::OperatorMismatch {
-            op_span: operator.span,
-            lhs_ty: left.get_type().to_string(),
-            lhs_span: left.span(),
-            rhs_ty: right.get_type().to_string(),
-            rhs_span: right.span(),
-        }),
-    }
-}
-
-fn compute_series_i64<F>(series: &Series, val: i64, f: F, span: Span) -> Result<Value, ShellError>
-where
-    F: Fn(ChunkedArray<Int64Type>, i64) -> ChunkedArray<Int64Type>,
-{
-    match series.dtype() {
-        DataType::UInt32 | DataType::Int32 | DataType::UInt64 => {
-            let to_i64 = series.cast(&DataType::Int64);
-
-            match to_i64 {
-                Ok(series) => {
-                    let casted = series.i64();
-                    compute_casted_i64(casted, val, f, span)
-                }
-                Err(e) => Err(ShellError::GenericError {
-                    error: "Unable to cast to i64".into(),
-                    msg: e.to_string(),
-                    span: Some(span),
-                    help: None,
-                    inner: vec![],
-                }),
-            }
-        }
-        DataType::Int64 => {
-            let casted = series.i64();
-            compute_casted_i64(casted, val, f, span)
-        }
-        _ => Err(ShellError::GenericError {
-            error: "Incorrect type".into(),
-            msg: format!(
-                "Series of type {} can not be used for operations with an i64 value",
-                series.dtype()
-            ),
-            span: Some(span),
-            help: None,
-            inner: vec![],
-        }),
-    }
-}
-
-fn compute_casted_i64<F>(
-    casted: Result<&ChunkedArray<Int64Type>, PolarsError>,
-    val: i64,
-    f: F,
-    span: Span,
-) -> Result<Value, ShellError>
-where
-    F: Fn(ChunkedArray<Int64Type>, i64) -> ChunkedArray<Int64Type>,
-{
-    match casted {
-        Ok(casted) => {
-            let res = f(casted.clone(), val);
-            let res = res.into_series();
-            NuDataFrame::series_to_value(res, span)
-        }
-        Err(e) => Err(ShellError::GenericError {
-            error: "Unable to cast to i64".into(),
-            msg: e.to_string(),
-            span: Some(span),
-            help: None,
-            inner: vec![],
-        }),
-    }
-}
-
-fn compute_series_float<F>(series: &Series, val: f64, f: F, span: Span) -> Result<Value, ShellError>
-where
-    F: Fn(ChunkedArray<Float64Type>, f64) -> ChunkedArray<Float64Type>,
-{
-    match series.dtype() {
-        DataType::Float32 => {
-            let to_f64 = series.cast(&DataType::Float64);
-
-            match to_f64 {
-                Ok(series) => {
-                    let casted = series.f64();
-                    compute_casted_f64(casted, val, f, span)
-                }
-                Err(e) => Err(ShellError::GenericError {
-                    error: "Unable to cast to f64".into(),
-                    msg: e.to_string(),
-                    span: Some(span),
-                    help: None,
-                    inner: vec![],
-                }),
-            }
-        }
-        DataType::Float64 => {
-            let casted = series.f64();
-            compute_casted_f64(casted, val, f, span)
-        }
-        _ => Err(ShellError::GenericError {
-            error: "Incorrect type".into(),
-            msg: format!(
-                "Series of type {} can not be used for operations with a float value",
-                series.dtype()
-            ),
-            span: Some(span),
-            help: None,
-            inner: vec![],
-        }),
-    }
-}
-
-fn compute_casted_f64<F>(
-    casted: Result<&ChunkedArray<Float64Type>, PolarsError>,
-    val: f64,
-    f: F,
-    span: Span,
-) -> Result<Value, ShellError>
-where
-    F: Fn(ChunkedArray<Float64Type>, f64) -> ChunkedArray<Float64Type>,
-{
-    match casted {
-        Ok(casted) => {
-            let res = f(casted.clone(), val);
-            let res = res.into_series();
-            NuDataFrame::series_to_value(res, span)
-        }
-        Err(e) => Err(ShellError::GenericError {
-            error: "Unable to cast to f64".into(),
-            msg: e.to_string(),
-            span: Some(span),
-            help: None,
-            inner: vec![],
-        }),
-    }
-}
-
-fn compare_series_i64<F>(series: &Series, val: i64, f: F, span: Span) -> Result<Value, ShellError>
-where
-    F: Fn(&ChunkedArray<Int64Type>, i64) -> ChunkedArray<BooleanType>,
-{
-    match series.dtype() {
-        DataType::UInt32 | DataType::Int32 | DataType::UInt64 | DataType::Datetime(_, _) => {
-            let to_i64 = series.cast(&DataType::Int64);
-
-            match to_i64 {
-                Ok(series) => {
-                    let casted = series.i64();
-                    compare_casted_i64(casted, val, f, span)
-                }
-                Err(e) => Err(ShellError::GenericError {
-                    error: "Unable to cast to f64".into(),
-                    msg: e.to_string(),
-                    span: Some(span),
-                    help: None,
-                    inner: vec![],
-                }),
-            }
-        }
-        DataType::Date => {
-            let to_i64 = series.cast(&DataType::Int64);
-
-            match to_i64 {
-                Ok(series) => {
-                    let nanosecs_per_day: i64 = 24 * 60 * 60 * 1_000_000_000;
-                    let casted = series
-                        .i64()
-                        .map(|chunked| chunked.mul(nanosecs_per_day))
-                        .expect("already checked for casting");
-                    compare_casted_i64(Ok(&casted), val, f, span)
-                }
-                Err(e) => Err(ShellError::GenericError {
-                    error: "Unable to cast to f64".into(),
-                    msg: e.to_string(),
-                    span: Some(span),
-                    help: None,
-                    inner: vec![],
-                }),
-            }
-        }
-        DataType::Int64 => {
-            let casted = series.i64();
-            compare_casted_i64(casted, val, f, span)
-        }
-        _ => Err(ShellError::GenericError {
-            error: "Incorrect type".into(),
-            msg: format!(
-                "Series of type {} can not be used for operations with an i64 value",
-                series.dtype()
-            ),
-            span: Some(span),
-            help: None,
-            inner: vec![],
-        }),
-    }
-}
-
-fn compare_casted_i64<F>(
-    casted: Result<&ChunkedArray<Int64Type>, PolarsError>,
-    val: i64,
-    f: F,
-    span: Span,
-) -> Result<Value, ShellError>
-where
-    F: Fn(&ChunkedArray<Int64Type>, i64) -> ChunkedArray<BooleanType>,
-{
-    match casted {
-        Ok(casted) => {
-            let res = f(casted, val);
-            let res = res.into_series();
-            NuDataFrame::series_to_value(res, span)
-        }
-        Err(e) => Err(ShellError::GenericError {
-            error: "Unable to cast to i64".into(),
-            msg: e.to_string(),
-            span: Some(span),
-            help: None,
-            inner: vec![],
-        }),
-    }
-}
-
-fn compare_series_float<F>(series: &Series, val: f64, f: F, span: Span) -> Result<Value, ShellError>
-where
-    F: Fn(&ChunkedArray<Float64Type>, f64) -> ChunkedArray<BooleanType>,
-{
-    match series.dtype() {
-        DataType::Float32 => {
-            let to_f64 = series.cast(&DataType::Float64);
-
-            match to_f64 {
-                Ok(series) => {
-                    let casted = series.f64();
-                    compare_casted_f64(casted, val, f, span)
-                }
-                Err(e) => Err(ShellError::GenericError {
-                    error: "Unable to cast to i64".into(),
-                    msg: e.to_string(),
-                    span: Some(span),
-                    help: None,
-                    inner: vec![],
-                }),
-            }
-        }
-        DataType::Float64 => {
-            let casted = series.f64();
-            compare_casted_f64(casted, val, f, span)
-        }
-        _ => Err(ShellError::GenericError {
-            error: "Incorrect type".into(),
-            msg: format!(
-                "Series of type {} can not be used for operations with a float value",
-                series.dtype()
-            ),
-            span: Some(span),
-            help: None,
-            inner: vec![],
-        }),
-    }
-}
-
-fn compare_casted_f64<F>(
-    casted: Result<&ChunkedArray<Float64Type>, PolarsError>,
-    val: f64,
-    f: F,
-    span: Span,
-) -> Result<Value, ShellError>
-where
-    F: Fn(&ChunkedArray<Float64Type>, f64) -> ChunkedArray<BooleanType>,
-{
-    match casted {
-        Ok(casted) => {
-            let res = f(casted, val);
-            let res = res.into_series();
-            NuDataFrame::series_to_value(res, span)
-        }
-        Err(e) => Err(ShellError::GenericError {
-            error: "Unable to cast to f64".into(),
-            msg: e.to_string(),
-            span: Some(span),
-            help: None,
-            inner: vec![],
-        }),
-    }
-}
-
-fn contains_series_pat(series: &Series, pat: &str, span: Span) -> Result<Value, ShellError> {
-    let casted = series.str();
-    match casted {
-        Ok(casted) => {
-            let res = casted.contains(pat, false);
-
-            match res {
-                Ok(res) => {
-                    let res = res.into_series();
-                    NuDataFrame::series_to_value(res, span)
-                }
-                Err(e) => Err(ShellError::GenericError {
-                    error: "Error using contains".into(),
-                    msg: e.to_string(),
-                    span: Some(span),
-                    help: None,
-                    inner: vec![],
-                }),
-            }
-        }
-        Err(e) => Err(ShellError::GenericError {
-            error: "Unable to cast to string".into(),
-            msg: e.to_string(),
-            span: Some(span),
-            help: None,
-            inner: vec![],
-        }),
-    }
-}
-
-fn add_string_to_series(series: &Series, pat: &str, span: Span) -> Result<Value, ShellError> {
-    let casted = series.str();
-    match casted {
-        Ok(casted) => {
-            let res = casted + pat;
-            let res = res.into_series();
-
-            NuDataFrame::series_to_value(res, span)
-        }
-        Err(e) => Err(ShellError::GenericError {
-            error: "Unable to cast to string".into(),
-            msg: e.to_string(),
-            span: Some(span),
-            help: None,
-            inner: vec![],
-        }),
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use nu_protocol::Span;
-    use polars::{prelude::NamedFrom, series::Series};
-
-    use crate::dataframe::values::NuDataFrame;
-
-    #[test]
-    fn test_compute_between_series_comparisons() {
-        let series = Series::new("c", &[1, 2]);
-        let df = NuDataFrame::try_from_series(vec![series], Span::test_data())
-            .expect("should be able to create a simple dataframe");
-
-        let c0 = df
-            .column("c", Span::test_data())
-            .expect("should be able to get column c");
-
-        let c0_series = c0
-            .as_series(Span::test_data())
-            .expect("should be able to get series");
-
-        let c0_value = c0.into_value(Span::test_data());
-
-        let c1 = df
-            .column("c", Span::test_data())
-            .expect("should be able to get column c");
-
-        let c1_series = c1
-            .as_series(Span::test_data())
-            .expect("should be able to get series");
-
-        let c1_value = c1.into_value(Span::test_data());
-
-        let op = Spanned {
-            item: Operator::Comparison(Comparison::NotEqual),
-            span: Span::test_data(),
-        };
-        let result = compute_between_series(op, &c0_value, &c0_series, &c1_value, &c1_series)
-            .expect("compare should not fail");
-        let result = NuDataFrame::try_from_value(result)
-            .expect("should be able to create a dataframe from a value");
-        let result = result
-            .as_series(Span::test_data())
-            .expect("should be convert to a series");
-        assert_eq!(result, Series::new("neq_c_c", &[false, false]));
-
-        let op = Spanned {
-            item: Operator::Comparison(Comparison::Equal),
-            span: Span::test_data(),
-        };
-        let result = compute_between_series(op, &c0_value, &c0_series, &c1_value, &c1_series)
-            .expect("compare should not fail");
-        let result = NuDataFrame::try_from_value(result)
-            .expect("should be able to create a dataframe from a value");
-        let result = result
-            .as_series(Span::test_data())
-            .expect("should be convert to a series");
-        assert_eq!(result, Series::new("eq_c_c", &[true, true]));
-
-        let op = Spanned {
-            item: Operator::Comparison(Comparison::LessThan),
-            span: Span::test_data(),
-        };
-        let result = compute_between_series(op, &c0_value, &c0_series, &c1_value, &c1_series)
-            .expect("compare should not fail");
-        let result = NuDataFrame::try_from_value(result)
-            .expect("should be able to create a dataframe from a value");
-        let result = result
-            .as_series(Span::test_data())
-            .expect("should be convert to a series");
-        assert_eq!(result, Series::new("lt_c_c", &[false, false]));
-
-        let op = Spanned {
-            item: Operator::Comparison(Comparison::LessThanOrEqual),
-            span: Span::test_data(),
-        };
-        let result = compute_between_series(op, &c0_value, &c0_series, &c1_value, &c1_series)
-            .expect("compare should not fail");
-        let result = NuDataFrame::try_from_value(result)
-            .expect("should be able to create a dataframe from a value");
-        let result = result
-            .as_series(Span::test_data())
-            .expect("should be convert to a series");
-        assert_eq!(result, Series::new("lte_c_c", &[true, true]));
-
-        let op = Spanned {
-            item: Operator::Comparison(Comparison::GreaterThan),
-            span: Span::test_data(),
-        };
-        let result = compute_between_series(op, &c0_value, &c0_series, &c1_value, &c1_series)
-            .expect("compare should not fail");
-        let result = NuDataFrame::try_from_value(result)
-            .expect("should be able to create a dataframe from a value");
-        let result = result
-            .as_series(Span::test_data())
-            .expect("should be convert to a series");
-        assert_eq!(result, Series::new("gt_c_c", &[false, false]));
-
-        let op = Spanned {
-            item: Operator::Comparison(Comparison::GreaterThanOrEqual),
-            span: Span::test_data(),
-        };
-        let result = compute_between_series(op, &c0_value, &c0_series, &c1_value, &c1_series)
-            .expect("compare should not fail");
-        let result = NuDataFrame::try_from_value(result)
-            .expect("should be able to create a dataframe from a value");
-        let result = result
-            .as_series(Span::test_data())
-            .expect("should be convert to a series");
-        assert_eq!(result, Series::new("gte_c_c", &[true, true]));
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/values/nu_dataframe/conversion.rs b/crates/nu-cmd-dataframe/src/dataframe/values/nu_dataframe/conversion.rs
deleted file mode 100644
index 7ab339d78d..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/values/nu_dataframe/conversion.rs
+++ /dev/null
@@ -1,1435 +0,0 @@
-use super::{DataFrameValue, NuDataFrame, NuSchema};
-use chrono::{DateTime, Duration, FixedOffset, NaiveTime, TimeZone, Utc};
-use chrono_tz::Tz;
-use indexmap::map::{Entry, IndexMap};
-use nu_protocol::{Record, ShellError, Span, Value};
-use polars::{
-    chunked_array::{
-        builder::AnonymousOwnedListBuilder, object::builder::ObjectChunkedBuilder, ChunkedArray,
-    },
-    datatypes::AnyValue,
-    export::arrow::Either,
-    prelude::{
-        DataFrame, DataType, DatetimeChunked, Float32Type, Float64Type, Int16Type, Int32Type,
-        Int64Type, Int8Type, IntoSeries, ListBooleanChunkedBuilder, ListBuilderTrait,
-        ListPrimitiveChunkedBuilder, ListStringChunkedBuilder, ListType, NamedFrom,
-        NewChunkedArray, ObjectType, Schema, Series, StructChunked, TemporalMethods, TimeUnit,
-        UInt16Type, UInt32Type, UInt64Type, UInt8Type,
-    },
-};
-use std::ops::{Deref, DerefMut};
-
-const NANOS_PER_DAY: i64 = 86_400_000_000_000;
-
-// The values capacity is for the size of an  vec.
-// Since this is impossible to determine without traversing every value
-// I just picked one. Since this is for converting back and forth
-// between nushell tables the values shouldn't be too extremely large for
-// practical reasons (~ a few thousand rows).
-const VALUES_CAPACITY: usize = 10;
-
-macro_rules! value_to_primitive {
-    ($value:ident, u8) => {
-        $value.as_i64().map(|v| v as u8)
-    };
-    ($value:ident, u16) => {
-        $value.as_i64().map(|v| v as u16)
-    };
-    ($value:ident, u32) => {
-        $value.as_i64().map(|v| v as u32)
-    };
-    ($value:ident, u64) => {
-        $value.as_i64().map(|v| v as u64)
-    };
-    ($value:ident, i8) => {
-        $value.as_i64().map(|v| v as i8)
-    };
-    ($value:ident, i16) => {
-        $value.as_i64().map(|v| v as i16)
-    };
-    ($value:ident, i32) => {
-        $value.as_i64().map(|v| v as i32)
-    };
-    ($value:ident, i64) => {
-        $value.as_i64()
-    };
-    ($value:ident, f32) => {
-        $value.as_f64().map(|v| v as f32)
-    };
-    ($value:ident, f64) => {
-        $value.as_f64()
-    };
-}
-
-#[derive(Debug)]
-pub struct Column {
-    name: String,
-    values: Vec<Value>,
-}
-
-impl Column {
-    pub fn new(name: String, values: Vec<Value>) -> Self {
-        Self { name, values }
-    }
-
-    pub fn new_empty(name: String) -> Self {
-        Self {
-            name,
-            values: Vec::new(),
-        }
-    }
-
-    pub fn name(&self) -> &str {
-        self.name.as_str()
-    }
-}
-
-impl IntoIterator for Column {
-    type Item = Value;
-    type IntoIter = std::vec::IntoIter<Self::Item>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.values.into_iter()
-    }
-}
-
-impl Deref for Column {
-    type Target = Vec<Value>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.values
-    }
-}
-
-impl DerefMut for Column {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.values
-    }
-}
-
-#[derive(Debug)]
-pub struct TypedColumn {
-    column: Column,
-    column_type: Option<DataType>,
-}
-
-impl TypedColumn {
-    fn new_empty(name: String) -> Self {
-        Self {
-            column: Column::new_empty(name),
-            column_type: None,
-        }
-    }
-}
-
-impl Deref for TypedColumn {
-    type Target = Column;
-
-    fn deref(&self) -> &Self::Target {
-        &self.column
-    }
-}
-
-impl DerefMut for TypedColumn {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.column
-    }
-}
-
-pub type ColumnMap = IndexMap<String, TypedColumn>;
-
-pub fn create_column(
-    series: &Series,
-    from_row: usize,
-    to_row: usize,
-    span: Span,
-) -> Result<Column, ShellError> {
-    let size = to_row - from_row;
-    let values = series_to_values(series, Some(from_row), Some(size), span)?;
-    Ok(Column::new(series.name().into(), values))
-}
-
-// Adds a separator to the vector of values using the column names from the
-// dataframe to create the Values Row
-pub fn add_separator(values: &mut Vec<Value>, df: &DataFrame, span: Span) {
-    let mut record = Record::new();
-
-    record.push("index", Value::string("...", span));
-
-    for name in df.get_column_names() {
-        record.push(name, Value::string("...", span))
-    }
-
-    values.push(Value::record(record, span));
-}
-
-// Inserting the values found in a Value::List or Value::Record
-pub fn insert_record(
-    column_values: &mut ColumnMap,
-    record: Record,
-    maybe_schema: &Option<NuSchema>,
-) -> Result<(), ShellError> {
-    for (col, value) in record {
-        insert_value(value, col, column_values, maybe_schema)?;
-    }
-
-    Ok(())
-}
-
-pub fn insert_value(
-    value: Value,
-    key: String,
-    column_values: &mut ColumnMap,
-    maybe_schema: &Option<NuSchema>,
-) -> Result<(), ShellError> {
-    let col_val = match column_values.entry(key.clone()) {
-        Entry::Vacant(entry) => entry.insert(TypedColumn::new_empty(key.clone())),
-        Entry::Occupied(entry) => entry.into_mut(),
-    };
-
-    // Checking that the type for the value is the same
-    // for the previous value in the column
-    if col_val.values.is_empty() {
-        if let Some(schema) = maybe_schema {
-            if let Some(field) = schema.schema.get_field(&key) {
-                col_val.column_type = Some(field.data_type().clone());
-            }
-        }
-
-        if col_val.column_type.is_none() {
-            col_val.column_type = Some(value_to_data_type(&value));
-        }
-
-        col_val.values.push(value);
-    } else {
-        let prev_value = &col_val.values[col_val.values.len() - 1];
-
-        match (&prev_value, &value) {
-            (Value::Int { .. }, Value::Int { .. })
-            | (Value::Float { .. }, Value::Float { .. })
-            | (Value::String { .. }, Value::String { .. })
-            | (Value::Bool { .. }, Value::Bool { .. })
-            | (Value::Date { .. }, Value::Date { .. })
-            | (Value::Filesize { .. }, Value::Filesize { .. })
-            | (Value::Duration { .. }, Value::Duration { .. }) => col_val.values.push(value),
-            (Value::List { .. }, _) => {
-                col_val.column_type = Some(value_to_data_type(&value));
-                col_val.values.push(value);
-            }
-            _ => {
-                col_val.column_type = Some(DataType::Object("Value", None));
-                col_val.values.push(value);
-            }
-        }
-    }
-
-    Ok(())
-}
-
-fn value_to_data_type(value: &Value) -> DataType {
-    match &value {
-        Value::Int { .. } => DataType::Int64,
-        Value::Float { .. } => DataType::Float64,
-        Value::String { .. } => DataType::String,
-        Value::Bool { .. } => DataType::Boolean,
-        Value::Date { .. } => DataType::Date,
-        Value::Duration { .. } => DataType::Duration(TimeUnit::Nanoseconds),
-        Value::Filesize { .. } => DataType::Int64,
-        Value::List { vals, .. } => {
-            // We need to determined the type inside of the list.
-            // Since Value::List does not have any kind of
-            // type information, we need to look inside the list.
-            // This will cause errors if lists have inconsistent types.
-            // Basically, if a list column needs to be converted to dataframe,
-            // needs to have consistent types.
-            let list_type = vals
-                .iter()
-                .filter(|v| !matches!(v, Value::Nothing { .. }))
-                .map(value_to_data_type)
-                .nth(1)
-                .unwrap_or(DataType::Object("Value", None));
-
-            DataType::List(Box::new(list_type))
-        }
-        _ => DataType::Object("Value", None),
-    }
-}
-
-fn typed_column_to_series(name: &str, column: TypedColumn) -> Result<Series, ShellError> {
-    if let Some(column_type) = &column.column_type {
-        match column_type {
-            DataType::Float32 => {
-                let series_values: Result<Vec<_>, _> = column
-                    .values
-                    .iter()
-                    .map(|v| v.as_f64().map(|v| v as f32))
-                    .collect();
-                Ok(Series::new(name, series_values?))
-            }
-            DataType::Float64 => {
-                let series_values: Result<Vec<_>, _> =
-                    column.values.iter().map(|v| v.as_f64()).collect();
-                Ok(Series::new(name, series_values?))
-            }
-            DataType::UInt8 => {
-                let series_values: Result<Vec<_>, _> = column
-                    .values
-                    .iter()
-                    .map(|v| v.as_i64().map(|v| v as u8))
-                    .collect();
-                Ok(Series::new(name, series_values?))
-            }
-            DataType::UInt16 => {
-                let series_values: Result<Vec<_>, _> = column
-                    .values
-                    .iter()
-                    .map(|v| v.as_i64().map(|v| v as u16))
-                    .collect();
-                Ok(Series::new(name, series_values?))
-            }
-            DataType::UInt32 => {
-                let series_values: Result<Vec<_>, _> = column
-                    .values
-                    .iter()
-                    .map(|v| v.as_i64().map(|v| v as u32))
-                    .collect();
-                Ok(Series::new(name, series_values?))
-            }
-            DataType::UInt64 => {
-                let series_values: Result<Vec<_>, _> = column
-                    .values
-                    .iter()
-                    .map(|v| v.as_i64().map(|v| v as u64))
-                    .collect();
-                Ok(Series::new(name, series_values?))
-            }
-            DataType::Int8 => {
-                let series_values: Result<Vec<_>, _> = column
-                    .values
-                    .iter()
-                    .map(|v| v.as_i64().map(|v| v as i8))
-                    .collect();
-                Ok(Series::new(name, series_values?))
-            }
-            DataType::Int16 => {
-                let series_values: Result<Vec<_>, _> = column
-                    .values
-                    .iter()
-                    .map(|v| v.as_i64().map(|v| v as i16))
-                    .collect();
-                Ok(Series::new(name, series_values?))
-            }
-            DataType::Int32 => {
-                let series_values: Result<Vec<_>, _> = column
-                    .values
-                    .iter()
-                    .map(|v| v.as_i64().map(|v| v as i32))
-                    .collect();
-                Ok(Series::new(name, series_values?))
-            }
-            DataType::Int64 => {
-                let series_values: Result<Vec<_>, _> =
-                    column.values.iter().map(|v| v.as_i64()).collect();
-                Ok(Series::new(name, series_values?))
-            }
-            DataType::Boolean => {
-                let series_values: Result<Vec<_>, _> =
-                    column.values.iter().map(|v| v.as_bool()).collect();
-                Ok(Series::new(name, series_values?))
-            }
-            DataType::String => {
-                let series_values: Result<Vec<_>, _> =
-                    column.values.iter().map(|v| v.coerce_string()).collect();
-                Ok(Series::new(name, series_values?))
-            }
-            DataType::Object(_, _) => value_to_series(name, &column.values),
-            DataType::Duration(time_unit) => {
-                //todo - finish type conversion
-                let series_values: Result<Vec<_>, _> = column
-                    .values
-                    .iter()
-                    .map(|v| v.as_i64().map(|v| nanos_from_timeunit(v, *time_unit)))
-                    .collect();
-                Ok(Series::new(name, series_values?))
-            }
-            DataType::List(list_type) => {
-                match input_type_list_to_series(name, list_type.as_ref(), &column.values) {
-                    Ok(series) => Ok(series),
-                    Err(_) => {
-                        // An error case will occur when there are lists of mixed types.
-                        // If this happens, fallback to object list
-                        input_type_list_to_series(
-                            name,
-                            &DataType::Object("unknown", None),
-                            &column.values,
-                        )
-                    }
-                }
-            }
-            DataType::Date => {
-                let it = column.values.iter().map(|v| {
-                    if let Value::Date { val, .. } = &v {
-                        Some(val.timestamp_nanos_opt().unwrap_or_default())
-                    } else {
-                        None
-                    }
-                });
-
-                let res: DatetimeChunked = ChunkedArray::<Int64Type>::from_iter_options(name, it)
-                    .into_datetime(TimeUnit::Nanoseconds, None);
-
-                Ok(res.into_series())
-            }
-            DataType::Datetime(tu, maybe_tz) => {
-                let dates = column
-                    .values
-                    .iter()
-                    .map(|v| {
-                        if let Value::Date { val, .. } = &v {
-                            // If there is a timezone specified, make sure
-                            // the value is converted to it
-                            Ok(maybe_tz
-                                .as_ref()
-                                .map(|tz| tz.parse::<Tz>().map(|tz| val.with_timezone(&tz)))
-                                .transpose()
-                                .map_err(|e| ShellError::GenericError {
-                                    error: "Error parsing timezone".into(),
-                                    msg: "".into(),
-                                    span: None,
-                                    help: Some(e.to_string()),
-                                    inner: vec![],
-                                })?
-                                .and_then(|dt| dt.timestamp_nanos_opt())
-                                .map(|nanos| nanos_from_timeunit(nanos, *tu)))
-                        } else {
-                            Ok(None)
-                        }
-                    })
-                    .collect::<Result<Vec<Option<i64>>, ShellError>>()?;
-
-                let res: DatetimeChunked =
-                    ChunkedArray::<Int64Type>::from_iter_options(name, dates.into_iter())
-                        .into_datetime(*tu, maybe_tz.clone());
-
-                Ok(res.into_series())
-            }
-            DataType::Struct(fields) => {
-                let schema = Some(NuSchema::new(Schema::from_iter(fields.clone())));
-                let mut structs: Vec<Series> = Vec::new();
-
-                for v in column.values.iter() {
-                    let mut column_values: ColumnMap = IndexMap::new();
-                    let record = v.as_record()?;
-                    insert_record(&mut column_values, record.clone(), &schema)?;
-                    let df = from_parsed_columns(column_values)?;
-                    structs.push(df.as_series(Span::unknown())?);
-                }
-
-                let chunked = StructChunked::new(column.name(), structs.as_ref()).map_err(|e| {
-                    ShellError::GenericError {
-                        error: format!("Error creating struct: {e}"),
-                        msg: "".into(),
-                        span: None,
-                        help: None,
-                        inner: vec![],
-                    }
-                })?;
-                Ok(chunked.into_series())
-            }
-            _ => Err(ShellError::GenericError {
-                error: format!("Error creating dataframe: Unsupported type: {column_type:?}"),
-                msg: "".into(),
-                span: None,
-                help: None,
-                inner: vec![],
-            }),
-        }
-    } else {
-        Err(ShellError::GenericError {
-            error: "Passed a type column with no type".into(),
-            msg: "".into(),
-            span: None,
-            help: None,
-            inner: vec![],
-        })
-    }
-}
-
-// The ColumnMap has the parsed data from the StreamInput
-// This data can be used to create a Series object that can initialize
-// the dataframe based on the type of data that is found
-pub fn from_parsed_columns(column_values: ColumnMap) -> Result<NuDataFrame, ShellError> {
-    let mut df_series: Vec<Series> = Vec::new();
-    for (name, column) in column_values {
-        let series = typed_column_to_series(&name, column)?;
-        df_series.push(series);
-    }
-
-    DataFrame::new(df_series)
-        .map(|df| NuDataFrame::new(false, df))
-        .map_err(|e| ShellError::GenericError {
-            error: "Error creating dataframe".into(),
-            msg: e.to_string(),
-            span: None,
-            help: None,
-            inner: vec![],
-        })
-}
-
-fn value_to_series(name: &str, values: &[Value]) -> Result<Series, ShellError> {
-    let mut builder = ObjectChunkedBuilder::<DataFrameValue>::new(name, values.len());
-
-    for v in values {
-        builder.append_value(DataFrameValue::new(v.clone()));
-    }
-
-    let res = builder.finish();
-    Ok(res.into_series())
-}
-
-fn input_type_list_to_series(
-    name: &str,
-    data_type: &DataType,
-    values: &[Value],
-) -> Result<Series, ShellError> {
-    let inconsistent_error = |_| ShellError::GenericError {
-        error: format!(
-            "column {name} contains a list with inconsistent types: Expecting: {data_type:?}"
-        ),
-        msg: "".into(),
-        span: None,
-        help: None,
-        inner: vec![],
-    };
-
-    macro_rules! primitive_list_series {
-        ($list_type:ty, $vec_type:tt) => {{
-            let mut builder = ListPrimitiveChunkedBuilder::<$list_type>::new(
-                name,
-                values.len(),
-                VALUES_CAPACITY,
-                data_type.clone(),
-            );
-
-            for v in values {
-                let value_list = v
-                    .as_list()?
-                    .iter()
-                    .map(|v| value_to_primitive!(v, $vec_type))
-                    .collect::<Result<Vec<$vec_type>, _>>()
-                    .map_err(inconsistent_error)?;
-                builder.append_iter_values(value_list.iter().copied());
-            }
-            let res = builder.finish();
-            Ok(res.into_series())
-        }};
-    }
-
-    match *data_type {
-        // list of boolean values
-        DataType::Boolean => {
-            let mut builder = ListBooleanChunkedBuilder::new(name, values.len(), VALUES_CAPACITY);
-            for v in values {
-                let value_list = v
-                    .as_list()?
-                    .iter()
-                    .map(|v| v.as_bool())
-                    .collect::<Result<Vec<bool>, _>>()
-                    .map_err(inconsistent_error)?;
-                builder.append_iter(value_list.iter().map(|v| Some(*v)));
-            }
-            let res = builder.finish();
-            Ok(res.into_series())
-        }
-        DataType::Duration(_) => primitive_list_series!(Int64Type, i64),
-        DataType::UInt8 => primitive_list_series!(UInt8Type, u8),
-        DataType::UInt16 => primitive_list_series!(UInt16Type, u16),
-        DataType::UInt32 => primitive_list_series!(UInt32Type, u32),
-        DataType::UInt64 => primitive_list_series!(UInt64Type, u64),
-        DataType::Int8 => primitive_list_series!(Int8Type, i8),
-        DataType::Int16 => primitive_list_series!(Int16Type, i16),
-        DataType::Int32 => primitive_list_series!(Int32Type, i32),
-        DataType::Int64 => primitive_list_series!(Int64Type, i64),
-        DataType::Float32 => primitive_list_series!(Float32Type, f32),
-        DataType::Float64 => primitive_list_series!(Float64Type, f64),
-        DataType::String => {
-            let mut builder = ListStringChunkedBuilder::new(name, values.len(), VALUES_CAPACITY);
-            for v in values {
-                let value_list = v
-                    .as_list()?
-                    .iter()
-                    .map(|v| v.coerce_string())
-                    .collect::<Result<Vec<String>, _>>()
-                    .map_err(inconsistent_error)?;
-                builder.append_values_iter(value_list.iter().map(AsRef::as_ref));
-            }
-            let res = builder.finish();
-            Ok(res.into_series())
-        }
-        DataType::Date => {
-            let mut builder = AnonymousOwnedListBuilder::new(
-                name,
-                values.len(),
-                Some(DataType::Datetime(TimeUnit::Nanoseconds, None)),
-            );
-            for (i, v) in values.iter().enumerate() {
-                let list_name = i.to_string();
-
-                let it = v.as_list()?.iter().map(|v| {
-                    if let Value::Date { val, .. } = &v {
-                        Some(val.timestamp_nanos_opt().unwrap_or_default())
-                    } else {
-                        None
-                    }
-                });
-                let dt_chunked = ChunkedArray::<Int64Type>::from_iter_options(&list_name, it)
-                    .into_datetime(TimeUnit::Nanoseconds, None);
-
-                builder
-                    .append_series(&dt_chunked.into_series())
-                    .map_err(|e| ShellError::GenericError {
-                        error: "Error appending to series".into(),
-                        msg: "".into(),
-                        span: None,
-                        help: Some(e.to_string()),
-                        inner: vec![],
-                    })?
-            }
-            let res = builder.finish();
-            Ok(res.into_series())
-        }
-        DataType::List(ref sub_list_type) => {
-            Ok(input_type_list_to_series(name, sub_list_type, values)?)
-        }
-        // treat everything else as an object
-        _ => Ok(value_to_series(name, values)?),
-    }
-}
-
-fn series_to_values(
-    series: &Series,
-    maybe_from_row: Option<usize>,
-    maybe_size: Option<usize>,
-    span: Span,
-) -> Result<Vec<Value>, ShellError> {
-    match series.dtype() {
-        DataType::Null => {
-            let it = std::iter::repeat(Value::nothing(span));
-            let values = if let Some(size) = maybe_size {
-                Either::Left(it.take(size))
-            } else {
-                Either::Right(it)
-            }
-            .collect::<Vec<Value>>();
-
-            Ok(values)
-        }
-        DataType::UInt8 => {
-            let casted = series.u8().map_err(|e| ShellError::GenericError {
-                error: "Error casting column to u8".into(),
-                msg: "".into(),
-                span: None,
-                help: Some(e.to_string()),
-                inner: vec![],
-            })?;
-
-            let it = casted.into_iter();
-            let values = if let (Some(size), Some(from_row)) = (maybe_size, maybe_from_row) {
-                Either::Left(it.skip(from_row).take(size))
-            } else {
-                Either::Right(it)
-            }
-            .map(|v| match v {
-                Some(a) => Value::int(a as i64, span),
-                None => Value::nothing(span),
-            })
-            .collect::<Vec<Value>>();
-
-            Ok(values)
-        }
-        DataType::UInt16 => {
-            let casted = series.u16().map_err(|e| ShellError::GenericError {
-                error: "Error casting column to u16".into(),
-                msg: "".into(),
-                span: None,
-                help: Some(e.to_string()),
-                inner: vec![],
-            })?;
-
-            let it = casted.into_iter();
-            let values = if let (Some(size), Some(from_row)) = (maybe_size, maybe_from_row) {
-                Either::Left(it.skip(from_row).take(size))
-            } else {
-                Either::Right(it)
-            }
-            .map(|v| match v {
-                Some(a) => Value::int(a as i64, span),
-                None => Value::nothing(span),
-            })
-            .collect::<Vec<Value>>();
-
-            Ok(values)
-        }
-        DataType::UInt32 => {
-            let casted = series.u32().map_err(|e| ShellError::GenericError {
-                error: "Error casting column to u32".into(),
-                msg: "".into(),
-                span: None,
-                help: Some(e.to_string()),
-                inner: vec![],
-            })?;
-
-            let it = casted.into_iter();
-            let values = if let (Some(size), Some(from_row)) = (maybe_size, maybe_from_row) {
-                Either::Left(it.skip(from_row).take(size))
-            } else {
-                Either::Right(it)
-            }
-            .map(|v| match v {
-                Some(a) => Value::int(a as i64, span),
-                None => Value::nothing(span),
-            })
-            .collect::<Vec<Value>>();
-
-            Ok(values)
-        }
-        DataType::UInt64 => {
-            let casted = series.u64().map_err(|e| ShellError::GenericError {
-                error: "Error casting column to u64".into(),
-                msg: "".into(),
-                span: None,
-                help: Some(e.to_string()),
-                inner: vec![],
-            })?;
-
-            let it = casted.into_iter();
-            let values = if let (Some(size), Some(from_row)) = (maybe_size, maybe_from_row) {
-                Either::Left(it.skip(from_row).take(size))
-            } else {
-                Either::Right(it)
-            }
-            .map(|v| match v {
-                Some(a) => Value::int(a as i64, span),
-                None => Value::nothing(span),
-            })
-            .collect::<Vec<Value>>();
-
-            Ok(values)
-        }
-        DataType::Int8 => {
-            let casted = series.i8().map_err(|e| ShellError::GenericError {
-                error: "Error casting column to i8".into(),
-                msg: "".into(),
-                span: None,
-                help: Some(e.to_string()),
-                inner: vec![],
-            })?;
-
-            let it = casted.into_iter();
-            let values = if let (Some(size), Some(from_row)) = (maybe_size, maybe_from_row) {
-                Either::Left(it.skip(from_row).take(size))
-            } else {
-                Either::Right(it)
-            }
-            .map(|v| match v {
-                Some(a) => Value::int(a as i64, span),
-                None => Value::nothing(span),
-            })
-            .collect::<Vec<Value>>();
-
-            Ok(values)
-        }
-        DataType::Int16 => {
-            let casted = series.i16().map_err(|e| ShellError::GenericError {
-                error: "Error casting column to i16".into(),
-                msg: "".into(),
-                span: None,
-                help: Some(e.to_string()),
-                inner: vec![],
-            })?;
-
-            let it = casted.into_iter();
-            let values = if let (Some(size), Some(from_row)) = (maybe_size, maybe_from_row) {
-                Either::Left(it.skip(from_row).take(size))
-            } else {
-                Either::Right(it)
-            }
-            .map(|v| match v {
-                Some(a) => Value::int(a as i64, span),
-                None => Value::nothing(span),
-            })
-            .collect::<Vec<Value>>();
-
-            Ok(values)
-        }
-        DataType::Int32 => {
-            let casted = series.i32().map_err(|e| ShellError::GenericError {
-                error: "Error casting column to i32".into(),
-                msg: "".into(),
-                span: None,
-                help: Some(e.to_string()),
-                inner: vec![],
-            })?;
-
-            let it = casted.into_iter();
-            let values = if let (Some(size), Some(from_row)) = (maybe_size, maybe_from_row) {
-                Either::Left(it.skip(from_row).take(size))
-            } else {
-                Either::Right(it)
-            }
-            .map(|v| match v {
-                Some(a) => Value::int(a as i64, span),
-                None => Value::nothing(span),
-            })
-            .collect::<Vec<Value>>();
-
-            Ok(values)
-        }
-        DataType::Int64 => {
-            let casted = series.i64().map_err(|e| ShellError::GenericError {
-                error: "Error casting column to i64".into(),
-                msg: "".into(),
-                span: None,
-                help: Some(e.to_string()),
-                inner: vec![],
-            })?;
-
-            let it = casted.into_iter();
-            let values = if let (Some(size), Some(from_row)) = (maybe_size, maybe_from_row) {
-                Either::Left(it.skip(from_row).take(size))
-            } else {
-                Either::Right(it)
-            }
-            .map(|v| match v {
-                Some(a) => Value::int(a, span),
-                None => Value::nothing(span),
-            })
-            .collect::<Vec<Value>>();
-
-            Ok(values)
-        }
-        DataType::Float32 => {
-            let casted = series.f32().map_err(|e| ShellError::GenericError {
-                error: "Error casting column to f32".into(),
-                msg: "".into(),
-                span: None,
-                help: Some(e.to_string()),
-                inner: vec![],
-            })?;
-
-            let it = casted.into_iter();
-            let values = if let (Some(size), Some(from_row)) = (maybe_size, maybe_from_row) {
-                Either::Left(it.skip(from_row).take(size))
-            } else {
-                Either::Right(it)
-            }
-            .map(|v| match v {
-                Some(a) => Value::float(a as f64, span),
-                None => Value::nothing(span),
-            })
-            .collect::<Vec<Value>>();
-
-            Ok(values)
-        }
-        DataType::Float64 => {
-            let casted = series.f64().map_err(|e| ShellError::GenericError {
-                error: "Error casting column to f64".into(),
-                msg: "".into(),
-                span: None,
-                help: Some(e.to_string()),
-                inner: vec![],
-            })?;
-
-            let it = casted.into_iter();
-            let values = if let (Some(size), Some(from_row)) = (maybe_size, maybe_from_row) {
-                Either::Left(it.skip(from_row).take(size))
-            } else {
-                Either::Right(it)
-            }
-            .map(|v| match v {
-                Some(a) => Value::float(a, span),
-                None => Value::nothing(span),
-            })
-            .collect::<Vec<Value>>();
-
-            Ok(values)
-        }
-        DataType::Boolean => {
-            let casted = series.bool().map_err(|e| ShellError::GenericError {
-                error: "Error casting column to bool".into(),
-                msg: "".into(),
-                span: None,
-                help: Some(e.to_string()),
-                inner: vec![],
-            })?;
-
-            let it = casted.into_iter();
-            let values = if let (Some(size), Some(from_row)) = (maybe_size, maybe_from_row) {
-                Either::Left(it.skip(from_row).take(size))
-            } else {
-                Either::Right(it)
-            }
-            .map(|v| match v {
-                Some(a) => Value::bool(a, span),
-                None => Value::nothing(span),
-            })
-            .collect::<Vec<Value>>();
-
-            Ok(values)
-        }
-        DataType::String => {
-            let casted = series.str().map_err(|e| ShellError::GenericError {
-                error: "Error casting column to string".into(),
-                msg: "".into(),
-                span: None,
-                help: Some(e.to_string()),
-                inner: vec![],
-            })?;
-
-            let it = casted.into_iter();
-            let values = if let (Some(size), Some(from_row)) = (maybe_size, maybe_from_row) {
-                Either::Left(it.skip(from_row).take(size))
-            } else {
-                Either::Right(it)
-            }
-            .map(|v| match v {
-                Some(a) => Value::string(a.to_string(), span),
-                None => Value::nothing(span),
-            })
-            .collect::<Vec<Value>>();
-
-            Ok(values)
-        }
-        DataType::Object(x, _) => {
-            let casted = series
-                .as_any()
-                .downcast_ref::<ChunkedArray<ObjectType<DataFrameValue>>>();
-
-            match casted {
-                None => Err(ShellError::GenericError {
-                    error: "Error casting object from series".into(),
-                    msg: "".into(),
-                    span: None,
-                    help: Some(format!("Object not supported for conversion: {x}")),
-                    inner: vec![],
-                }),
-                Some(ca) => {
-                    let it = ca.into_iter();
-                    let values = if let (Some(size), Some(from_row)) = (maybe_size, maybe_from_row)
-                    {
-                        Either::Left(it.skip(from_row).take(size))
-                    } else {
-                        Either::Right(it)
-                    }
-                    .map(|v| match v {
-                        Some(a) => a.get_value(),
-                        None => Value::nothing(span),
-                    })
-                    .collect::<Vec<Value>>();
-
-                    Ok(values)
-                }
-            }
-        }
-        DataType::List(x) => {
-            let casted = series.as_any().downcast_ref::<ChunkedArray<ListType>>();
-            match casted {
-                None => Err(ShellError::GenericError {
-                    error: "Error casting list from series".into(),
-                    msg: "".into(),
-                    span: None,
-                    help: Some(format!("List not supported for conversion: {x}")),
-                    inner: vec![],
-                }),
-                Some(ca) => {
-                    let it = ca.into_iter();
-                    if let (Some(size), Some(from_row)) = (maybe_size, maybe_from_row) {
-                        Either::Left(it.skip(from_row).take(size))
-                    } else {
-                        Either::Right(it)
-                    }
-                    .map(|ca| {
-                        let sublist: Vec<Value> = if let Some(ref s) = ca {
-                            series_to_values(s, None, None, Span::unknown())?
-                        } else {
-                            // empty item
-                            vec![]
-                        };
-                        Ok(Value::list(sublist, span))
-                    })
-                    .collect::<Result<Vec<Value>, ShellError>>()
-                }
-            }
-        }
-        DataType::Date => {
-            let casted = series.date().map_err(|e| ShellError::GenericError {
-                error: "Error casting column to date".into(),
-                msg: "".into(),
-                span: None,
-                help: Some(e.to_string()),
-                inner: vec![],
-            })?;
-
-            let it = casted.into_iter();
-            let values = if let (Some(size), Some(from_row)) = (maybe_size, maybe_from_row) {
-                Either::Left(it.skip(from_row).take(size))
-            } else {
-                Either::Right(it)
-            }
-            .map(|v| match v {
-                Some(a) => {
-                    let nanos = nanos_per_day(a);
-                    let datetime = datetime_from_epoch_nanos(nanos, &None, span)?;
-                    Ok(Value::date(datetime, span))
-                }
-                None => Ok(Value::nothing(span)),
-            })
-            .collect::<Result<Vec<Value>, ShellError>>()?;
-            Ok(values)
-        }
-        DataType::Datetime(time_unit, tz) => {
-            let casted = series.datetime().map_err(|e| ShellError::GenericError {
-                error: "Error casting column to datetime".into(),
-                msg: "".into(),
-                span: None,
-                help: Some(e.to_string()),
-                inner: vec![],
-            })?;
-
-            let it = casted.into_iter();
-            let values = if let (Some(size), Some(from_row)) = (maybe_size, maybe_from_row) {
-                Either::Left(it.skip(from_row).take(size))
-            } else {
-                Either::Right(it)
-            }
-            .map(|v| match v {
-                Some(a) => {
-                    // elapsed time in nano/micro/milliseconds since 1970-01-01
-                    let nanos = nanos_from_timeunit(a, *time_unit);
-                    let datetime = datetime_from_epoch_nanos(nanos, tz, span)?;
-                    Ok(Value::date(datetime, span))
-                }
-                None => Ok(Value::nothing(span)),
-            })
-            .collect::<Result<Vec<Value>, ShellError>>()?;
-            Ok(values)
-        }
-        DataType::Struct(polar_fields) => {
-            let casted = series.struct_().map_err(|e| ShellError::GenericError {
-                error: "Error casting column to struct".into(),
-                msg: "".to_string(),
-                span: None,
-                help: Some(e.to_string()),
-                inner: Vec::new(),
-            })?;
-            let it = casted.into_iter();
-            let values: Result<Vec<Value>, ShellError> =
-                if let (Some(size), Some(from_row)) = (maybe_size, maybe_from_row) {
-                    Either::Left(it.skip(from_row).take(size))
-                } else {
-                    Either::Right(it)
-                }
-                .map(|any_values| {
-                    let record = polar_fields
-                        .iter()
-                        .zip(any_values)
-                        .map(|(field, val)| {
-                            any_value_to_value(val, span).map(|val| (field.name.to_string(), val))
-                        })
-                        .collect::<Result<_, _>>()?;
-
-                    Ok(Value::record(record, span))
-                })
-                .collect();
-            values
-        }
-        DataType::Time => {
-            let casted =
-                series
-                    .timestamp(TimeUnit::Nanoseconds)
-                    .map_err(|e| ShellError::GenericError {
-                        error: "Error casting column to time".into(),
-                        msg: "".into(),
-                        span: None,
-                        help: Some(e.to_string()),
-                        inner: vec![],
-                    })?;
-
-            let it = casted.into_iter();
-            let values = if let (Some(size), Some(from_row)) = (maybe_size, maybe_from_row) {
-                Either::Left(it.skip(from_row).take(size))
-            } else {
-                Either::Right(it)
-            }
-            .map(|v| match v {
-                Some(nanoseconds) => Value::duration(nanoseconds, span),
-                None => Value::nothing(span),
-            })
-            .collect::<Vec<Value>>();
-
-            Ok(values)
-        }
-        e => Err(ShellError::GenericError {
-            error: "Error creating Dataframe".into(),
-            msg: "".to_string(),
-            span: None,
-            help: Some(format!("Value not supported in nushell: {e}")),
-            inner: vec![],
-        }),
-    }
-}
-
-fn any_value_to_value(any_value: &AnyValue, span: Span) -> Result<Value, ShellError> {
-    match any_value {
-        AnyValue::Null => Ok(Value::nothing(span)),
-        AnyValue::Boolean(b) => Ok(Value::bool(*b, span)),
-        AnyValue::String(s) => Ok(Value::string(s.to_string(), span)),
-        AnyValue::UInt8(i) => Ok(Value::int(*i as i64, span)),
-        AnyValue::UInt16(i) => Ok(Value::int(*i as i64, span)),
-        AnyValue::UInt32(i) => Ok(Value::int(*i as i64, span)),
-        AnyValue::UInt64(i) => Ok(Value::int(*i as i64, span)),
-        AnyValue::Int8(i) => Ok(Value::int(*i as i64, span)),
-        AnyValue::Int16(i) => Ok(Value::int(*i as i64, span)),
-        AnyValue::Int32(i) => Ok(Value::int(*i as i64, span)),
-        AnyValue::Int64(i) => Ok(Value::int(*i, span)),
-        AnyValue::Float32(f) => Ok(Value::float(*f as f64, span)),
-        AnyValue::Float64(f) => Ok(Value::float(*f, span)),
-        AnyValue::Date(d) => {
-            let nanos = nanos_per_day(*d);
-            datetime_from_epoch_nanos(nanos, &None, span)
-                .map(|datetime| Value::date(datetime, span))
-        }
-        AnyValue::Datetime(a, time_unit, tz) => {
-            let nanos = nanos_from_timeunit(*a, *time_unit);
-            datetime_from_epoch_nanos(nanos, tz, span).map(|datetime| Value::date(datetime, span))
-        }
-        AnyValue::Duration(a, time_unit) => {
-            let nanos = match time_unit {
-                TimeUnit::Nanoseconds => *a,
-                TimeUnit::Microseconds => *a * 1_000,
-                TimeUnit::Milliseconds => *a * 1_000_000,
-            };
-            Ok(Value::duration(nanos, span))
-        }
-        // AnyValue::Time represents the current time since midnight.
-        // Unfortunately, there is no timezone related information.
-        // Given this, calculate the current date from UTC and add the time.
-        AnyValue::Time(nanos) => time_from_midnight(*nanos, span),
-        AnyValue::List(series) => {
-            series_to_values(series, None, None, span).map(|values| Value::list(values, span))
-        }
-        AnyValue::Struct(_idx, _struct_array, _s_fields) => {
-            // This should convert to a StructOwned object.
-            let static_value =
-                any_value
-                    .clone()
-                    .into_static()
-                    .map_err(|e| ShellError::GenericError {
-                        error: "Cannot convert polars struct to static value".into(),
-                        msg: e.to_string(),
-                        span: Some(span),
-                        help: None,
-                        inner: Vec::new(),
-                    })?;
-            any_value_to_value(&static_value, span)
-        }
-        AnyValue::StructOwned(struct_tuple) => {
-            let record = struct_tuple
-                .1
-                .iter()
-                .zip(&struct_tuple.0)
-                .map(|(field, val)| {
-                    any_value_to_value(val, span).map(|val| (field.name.to_string(), val))
-                })
-                .collect::<Result<_, _>>()?;
-
-            Ok(Value::record(record, span))
-        }
-        AnyValue::StringOwned(s) => Ok(Value::string(s.to_string(), span)),
-        AnyValue::Binary(bytes) => Ok(Value::binary(*bytes, span)),
-        AnyValue::BinaryOwned(bytes) => Ok(Value::binary(bytes.to_owned(), span)),
-        e => Err(ShellError::GenericError {
-            error: "Error creating Value".into(),
-            msg: "".to_string(),
-            span: None,
-            help: Some(format!("Value not supported in nushell: {e}")),
-            inner: Vec::new(),
-        }),
-    }
-}
-
-fn nanos_per_day(days: i32) -> i64 {
-    days as i64 * NANOS_PER_DAY
-}
-
-fn nanos_from_timeunit(a: i64, time_unit: TimeUnit) -> i64 {
-    a * match time_unit {
-        TimeUnit::Microseconds => 1_000, // Convert microseconds to nanoseconds
-        TimeUnit::Milliseconds => 1_000_000, // Convert milliseconds to nanoseconds
-        TimeUnit::Nanoseconds => 1,      // Already in nanoseconds
-    }
-}
-
-fn datetime_from_epoch_nanos(
-    nanos: i64,
-    timezone: &Option<String>,
-    span: Span,
-) -> Result<DateTime<FixedOffset>, ShellError> {
-    let tz: Tz = if let Some(polars_tz) = timezone {
-        polars_tz
-            .parse::<Tz>()
-            .map_err(|_| ShellError::GenericError {
-                error: format!("Could not parse polars timezone: {polars_tz}"),
-                msg: "".to_string(),
-                span: Some(span),
-                help: None,
-                inner: vec![],
-            })?
-    } else {
-        Tz::UTC
-    };
-
-    Ok(tz.timestamp_nanos(nanos).fixed_offset())
-}
-
-fn time_from_midnight(nanos: i64, span: Span) -> Result<Value, ShellError> {
-    let today = Utc::now().date_naive();
-    NaiveTime::from_hms_opt(0, 0, 0) // midnight
-        .map(|time| time + Duration::nanoseconds(nanos)) // current time
-        .map(|time| today.and_time(time)) // current date and time
-        .and_then(|datetime| {
-            FixedOffset::east_opt(0) // utc
-                .map(|offset| {
-                    DateTime::<FixedOffset>::from_naive_utc_and_offset(datetime, offset)
-                })
-        })
-        .map(|datetime| Value::date(datetime, span)) // current date and time
-        .ok_or(ShellError::CantConvert {
-            to_type: "datetime".to_string(),
-            from_type: "polars time".to_string(),
-            span,
-            help: Some("Could not convert polars time of {nanos} to datetime".to_string()),
-        })
-}
-
-#[cfg(test)]
-mod tests {
-    use indexmap::indexmap;
-    use nu_protocol::record;
-    use polars::export::arrow::array::{BooleanArray, PrimitiveArray};
-    use polars::prelude::Field;
-    use polars_io::prelude::StructArray;
-
-    use super::*;
-
-    #[test]
-    fn test_parsed_column_string_list() -> Result<(), Box<dyn std::error::Error>> {
-        let values = vec![
-            Value::list(
-                vec![Value::string("bar".to_string(), Span::test_data())],
-                Span::test_data(),
-            ),
-            Value::list(
-                vec![Value::string("baz".to_string(), Span::test_data())],
-                Span::test_data(),
-            ),
-        ];
-        let column = Column {
-            name: "foo".to_string(),
-            values: values.clone(),
-        };
-        let typed_column = TypedColumn {
-            column,
-            column_type: Some(DataType::List(Box::new(DataType::String))),
-        };
-
-        let column_map = indexmap!("foo".to_string() => typed_column);
-        let parsed_df = from_parsed_columns(column_map)?;
-        let parsed_columns = parsed_df.columns(Span::test_data())?;
-        assert_eq!(parsed_columns.len(), 1);
-        let column = parsed_columns
-            .first()
-            .expect("There should be a first value in columns");
-        assert_eq!(column.name(), "foo");
-        assert_eq!(column.values, values);
-
-        Ok(())
-    }
-
-    #[test]
-    fn test_any_value_to_value() -> Result<(), Box<dyn std::error::Error>> {
-        let span = Span::test_data();
-        assert_eq!(
-            any_value_to_value(&AnyValue::Null, span)?,
-            Value::nothing(span)
-        );
-
-        let test_bool = true;
-        assert_eq!(
-            any_value_to_value(&AnyValue::Boolean(test_bool), span)?,
-            Value::bool(test_bool, span)
-        );
-
-        let test_str = "foo";
-        assert_eq!(
-            any_value_to_value(&AnyValue::String(test_str), span)?,
-            Value::string(test_str.to_string(), span)
-        );
-        assert_eq!(
-            any_value_to_value(&AnyValue::StringOwned(test_str.into()), span)?,
-            Value::string(test_str.to_owned(), span)
-        );
-
-        let tests_uint8 = 4;
-        assert_eq!(
-            any_value_to_value(&AnyValue::UInt8(tests_uint8), span)?,
-            Value::int(tests_uint8 as i64, span)
-        );
-
-        let tests_uint16 = 233;
-        assert_eq!(
-            any_value_to_value(&AnyValue::UInt16(tests_uint16), span)?,
-            Value::int(tests_uint16 as i64, span)
-        );
-
-        let tests_uint32 = 897688233;
-        assert_eq!(
-            any_value_to_value(&AnyValue::UInt32(tests_uint32), span)?,
-            Value::int(tests_uint32 as i64, span)
-        );
-
-        let tests_uint64 = 903225135897388233;
-        assert_eq!(
-            any_value_to_value(&AnyValue::UInt64(tests_uint64), span)?,
-            Value::int(tests_uint64 as i64, span)
-        );
-
-        let tests_float32 = 903225135897388233.3223353;
-        assert_eq!(
-            any_value_to_value(&AnyValue::Float32(tests_float32), span)?,
-            Value::float(tests_float32 as f64, span)
-        );
-
-        let tests_float64 = 9064251358973882322333.64233533232;
-        assert_eq!(
-            any_value_to_value(&AnyValue::Float64(tests_float64), span)?,
-            Value::float(tests_float64, span)
-        );
-
-        let test_days = 10_957;
-        let comparison_date = Utc
-            .with_ymd_and_hms(2000, 1, 1, 0, 0, 0)
-            .unwrap()
-            .fixed_offset();
-        assert_eq!(
-            any_value_to_value(&AnyValue::Date(test_days), span)?,
-            Value::date(comparison_date, span)
-        );
-
-        let test_millis = 946_684_800_000;
-        assert_eq!(
-            any_value_to_value(
-                &AnyValue::Datetime(test_millis, TimeUnit::Milliseconds, &None),
-                span
-            )?,
-            Value::date(comparison_date, span)
-        );
-
-        let test_duration_millis = 99_999;
-        let test_duration_micros = 99_999_000;
-        let test_duration_nanos = 99_999_000_000;
-        assert_eq!(
-            any_value_to_value(
-                &AnyValue::Duration(test_duration_nanos, TimeUnit::Nanoseconds),
-                span
-            )?,
-            Value::duration(test_duration_nanos, span)
-        );
-        assert_eq!(
-            any_value_to_value(
-                &AnyValue::Duration(test_duration_micros, TimeUnit::Microseconds),
-                span
-            )?,
-            Value::duration(test_duration_nanos, span)
-        );
-        assert_eq!(
-            any_value_to_value(
-                &AnyValue::Duration(test_duration_millis, TimeUnit::Milliseconds),
-                span
-            )?,
-            Value::duration(test_duration_nanos, span)
-        );
-
-        let test_binary = b"sdf2332f32q3f3afwaf3232f32";
-        assert_eq!(
-            any_value_to_value(&AnyValue::Binary(test_binary), span)?,
-            Value::binary(test_binary.to_vec(), span)
-        );
-        assert_eq!(
-            any_value_to_value(&AnyValue::BinaryOwned(test_binary.to_vec()), span)?,
-            Value::binary(test_binary.to_vec(), span)
-        );
-
-        let test_time_nanos = 54_000_000_000_000;
-        let test_time = DateTime::<FixedOffset>::from_naive_utc_and_offset(
-            Utc::now()
-                .date_naive()
-                .and_time(NaiveTime::from_hms_opt(15, 00, 00).unwrap()),
-            FixedOffset::east_opt(0).unwrap(),
-        );
-        assert_eq!(
-            any_value_to_value(&AnyValue::Time(test_time_nanos), span)?,
-            Value::date(test_time, span)
-        );
-
-        let test_list_series = Series::new("int series", &[1, 2, 3]);
-        let comparison_list_series = Value::list(
-            vec![
-                Value::int(1, span),
-                Value::int(2, span),
-                Value::int(3, span),
-            ],
-            span,
-        );
-        assert_eq!(
-            any_value_to_value(&AnyValue::List(test_list_series), span)?,
-            comparison_list_series
-        );
-
-        let field_value_0 = AnyValue::Int32(1);
-        let field_value_1 = AnyValue::Boolean(true);
-        let values = vec![field_value_0, field_value_1];
-        let field_name_0 = "num_field";
-        let field_name_1 = "bool_field";
-        let fields = vec![
-            Field::new(field_name_0, DataType::Int32),
-            Field::new(field_name_1, DataType::Boolean),
-        ];
-        let test_owned_struct = AnyValue::StructOwned(Box::new((values, fields.clone())));
-        let comparison_owned_record = Value::test_record(record!(
-            field_name_0 => Value::int(1, span),
-            field_name_1 => Value::bool(true, span),
-        ));
-        assert_eq!(
-            any_value_to_value(&test_owned_struct, span)?,
-            comparison_owned_record.clone()
-        );
-
-        let test_int_arr = PrimitiveArray::from([Some(1_i32)]);
-        let test_bool_arr = BooleanArray::from([Some(true)]);
-        let test_struct_arr = StructArray::new(
-            DataType::Struct(fields.clone()).to_arrow(true),
-            vec![Box::new(test_int_arr), Box::new(test_bool_arr)],
-            None,
-        );
-        assert_eq!(
-            any_value_to_value(
-                &AnyValue::Struct(0, &test_struct_arr, fields.as_slice()),
-                span
-            )?,
-            comparison_owned_record
-        );
-
-        Ok(())
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/values/nu_dataframe/custom_value.rs b/crates/nu-cmd-dataframe/src/dataframe/values/nu_dataframe/custom_value.rs
deleted file mode 100644
index da8b27398b..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/values/nu_dataframe/custom_value.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-use super::NuDataFrame;
-use nu_protocol::{ast::Operator, CustomValue, ShellError, Span, Value};
-
-// CustomValue implementation for NuDataFrame
-impl CustomValue for NuDataFrame {
-    fn typetag_name(&self) -> &'static str {
-        "dataframe"
-    }
-
-    fn typetag_deserialize(&self) {
-        unimplemented!("typetag_deserialize")
-    }
-
-    fn clone_value(&self, span: nu_protocol::Span) -> Value {
-        let cloned = NuDataFrame {
-            df: self.df.clone(),
-            from_lazy: false,
-        };
-
-        Value::custom(Box::new(cloned), span)
-    }
-
-    fn type_name(&self) -> String {
-        self.typetag_name().to_string()
-    }
-
-    fn to_base_value(&self, span: Span) -> Result<Value, ShellError> {
-        let vals = self.print(span)?;
-
-        Ok(Value::list(vals, span))
-    }
-
-    fn as_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn as_mut_any(&mut self) -> &mut dyn std::any::Any {
-        self
-    }
-
-    fn follow_path_int(
-        &self,
-        _self_span: Span,
-        count: usize,
-        path_span: Span,
-    ) -> Result<Value, ShellError> {
-        self.get_value(count, path_span)
-    }
-
-    fn follow_path_string(
-        &self,
-        _self_span: Span,
-        column_name: String,
-        path_span: Span,
-    ) -> Result<Value, ShellError> {
-        let column = self.column(&column_name, path_span)?;
-        Ok(column.into_value(path_span))
-    }
-
-    fn partial_cmp(&self, other: &Value) -> Option<std::cmp::Ordering> {
-        match other {
-            Value::Custom { val, .. } => val
-                .as_any()
-                .downcast_ref::<Self>()
-                .and_then(|other| self.is_equal(other)),
-            _ => None,
-        }
-    }
-
-    fn operation(
-        &self,
-        lhs_span: Span,
-        operator: Operator,
-        op: Span,
-        right: &Value,
-    ) -> Result<Value, ShellError> {
-        self.compute_with_value(lhs_span, operator, op, right)
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/values/nu_dataframe/mod.rs b/crates/nu-cmd-dataframe/src/dataframe/values/nu_dataframe/mod.rs
deleted file mode 100644
index 967e03580f..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/values/nu_dataframe/mod.rs
+++ /dev/null
@@ -1,580 +0,0 @@
-mod between_values;
-mod conversion;
-mod custom_value;
-mod operations;
-
-pub use conversion::{Column, ColumnMap};
-pub use operations::Axis;
-
-use super::{nu_schema::NuSchema, utils::DEFAULT_ROWS, NuLazyFrame};
-use indexmap::IndexMap;
-use nu_protocol::{did_you_mean, PipelineData, Record, ShellError, Span, Value};
-use polars::{
-    chunked_array::ops::SortMultipleOptions,
-    prelude::{DataFrame, DataType, IntoLazy, LazyFrame, PolarsObject, Series},
-};
-use polars_plan::prelude::{lit, Expr, Null};
-use polars_utils::total_ord::{TotalEq, TotalHash};
-use serde::{Deserialize, Serialize};
-use std::{
-    cmp::Ordering,
-    collections::HashSet,
-    fmt::Display,
-    hash::{Hash, Hasher},
-};
-
-// DataFrameValue is an encapsulation of Nushell Value that can be used
-// to define the PolarsObject Trait. The polars object trait allows to
-// create dataframes with mixed datatypes
-#[derive(Clone, Debug)]
-pub struct DataFrameValue(Value);
-
-impl DataFrameValue {
-    fn new(value: Value) -> Self {
-        Self(value)
-    }
-
-    fn get_value(&self) -> Value {
-        self.0.clone()
-    }
-}
-
-impl TotalHash for DataFrameValue {
-    fn tot_hash<H>(&self, state: &mut H)
-    where
-        H: Hasher,
-    {
-        (*self).hash(state)
-    }
-}
-
-impl Display for DataFrameValue {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0.get_type())
-    }
-}
-
-impl Default for DataFrameValue {
-    fn default() -> Self {
-        Self(Value::nothing(Span::unknown()))
-    }
-}
-
-impl PartialEq for DataFrameValue {
-    fn eq(&self, other: &Self) -> bool {
-        self.0.partial_cmp(&other.0).map_or(false, Ordering::is_eq)
-    }
-}
-impl Eq for DataFrameValue {}
-
-impl Hash for DataFrameValue {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        match &self.0 {
-            Value::Nothing { .. } => 0.hash(state),
-            Value::Int { val, .. } => val.hash(state),
-            Value::String { val, .. } => val.hash(state),
-            // TODO. Define hash for the rest of types
-            _ => {}
-        }
-    }
-}
-
-impl TotalEq for DataFrameValue {
-    fn tot_eq(&self, other: &Self) -> bool {
-        self == other
-    }
-}
-
-impl PolarsObject for DataFrameValue {
-    fn type_name() -> &'static str {
-        "object"
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct NuDataFrame {
-    pub df: DataFrame,
-    pub from_lazy: bool,
-}
-
-impl AsRef<DataFrame> for NuDataFrame {
-    fn as_ref(&self) -> &polars::prelude::DataFrame {
-        &self.df
-    }
-}
-
-impl AsMut<DataFrame> for NuDataFrame {
-    fn as_mut(&mut self) -> &mut polars::prelude::DataFrame {
-        &mut self.df
-    }
-}
-
-impl From<DataFrame> for NuDataFrame {
-    fn from(df: DataFrame) -> Self {
-        Self {
-            df,
-            from_lazy: false,
-        }
-    }
-}
-
-impl NuDataFrame {
-    pub fn new(from_lazy: bool, df: DataFrame) -> Self {
-        Self { df, from_lazy }
-    }
-
-    pub fn lazy(&self) -> LazyFrame {
-        self.df.clone().lazy()
-    }
-
-    fn default_value(span: Span) -> Value {
-        let dataframe = DataFrame::default();
-        NuDataFrame::dataframe_into_value(dataframe, span)
-    }
-
-    pub fn dataframe_into_value(dataframe: DataFrame, span: Span) -> Value {
-        Value::custom(Box::new(Self::new(false, dataframe)), span)
-    }
-
-    pub fn into_value(self, span: Span) -> Value {
-        if self.from_lazy {
-            let lazy = NuLazyFrame::from_dataframe(self);
-            Value::custom(Box::new(lazy), span)
-        } else {
-            Value::custom(Box::new(self), span)
-        }
-    }
-
-    pub fn series_to_value(series: Series, span: Span) -> Result<Value, ShellError> {
-        match DataFrame::new(vec![series]) {
-            Ok(dataframe) => Ok(NuDataFrame::dataframe_into_value(dataframe, span)),
-            Err(e) => Err(ShellError::GenericError {
-                error: "Error creating dataframe".into(),
-                msg: e.to_string(),
-                span: Some(span),
-                help: None,
-                inner: vec![],
-            }),
-        }
-    }
-
-    pub fn try_from_iter<T>(iter: T, maybe_schema: Option<NuSchema>) -> Result<Self, ShellError>
-    where
-        T: Iterator<Item = Value>,
-    {
-        // Dictionary to store the columnar data extracted from
-        // the input. During the iteration we check if the values
-        // have different type
-        let mut column_values: ColumnMap = IndexMap::new();
-
-        for value in iter {
-            match value {
-                Value::Custom { .. } => return Self::try_from_value(value),
-                Value::List { vals, .. } => {
-                    let record = vals
-                        .into_iter()
-                        .enumerate()
-                        .map(|(i, val)| (format!("{i}"), val))
-                        .collect();
-
-                    conversion::insert_record(&mut column_values, record, &maybe_schema)?
-                }
-                Value::Record { val: record, .. } => conversion::insert_record(
-                    &mut column_values,
-                    record.into_owned(),
-                    &maybe_schema,
-                )?,
-                _ => {
-                    let key = "0".to_string();
-                    conversion::insert_value(value, key, &mut column_values, &maybe_schema)?
-                }
-            }
-        }
-
-        let df = conversion::from_parsed_columns(column_values)?;
-        add_missing_columns(df, &maybe_schema, Span::unknown())
-    }
-
-    pub fn try_from_series(columns: Vec<Series>, span: Span) -> Result<Self, ShellError> {
-        let dataframe = DataFrame::new(columns).map_err(|e| ShellError::GenericError {
-            error: "Error creating dataframe".into(),
-            msg: format!("Unable to create DataFrame: {e}"),
-            span: Some(span),
-            help: None,
-            inner: vec![],
-        })?;
-
-        Ok(Self::new(false, dataframe))
-    }
-
-    pub fn try_from_columns(
-        columns: Vec<Column>,
-        maybe_schema: Option<NuSchema>,
-    ) -> Result<Self, ShellError> {
-        let mut column_values: ColumnMap = IndexMap::new();
-
-        for column in columns {
-            let name = column.name().to_string();
-            for value in column {
-                conversion::insert_value(value, name.clone(), &mut column_values, &maybe_schema)?;
-            }
-        }
-
-        let df = conversion::from_parsed_columns(column_values)?;
-        add_missing_columns(df, &maybe_schema, Span::unknown())
-    }
-
-    pub fn fill_list_nan(list: Vec<Value>, list_span: Span, fill: Value) -> Value {
-        let newlist = list
-            .into_iter()
-            .map(|value| {
-                let span = value.span();
-                match value {
-                    Value::Float { val, .. } => {
-                        if val.is_nan() {
-                            fill.clone()
-                        } else {
-                            value
-                        }
-                    }
-                    Value::List { vals, .. } => Self::fill_list_nan(vals, span, fill.clone()),
-                    _ => value,
-                }
-            })
-            .collect::<Vec<Value>>();
-        Value::list(newlist, list_span)
-    }
-
-    pub fn columns(&self, span: Span) -> Result<Vec<Column>, ShellError> {
-        let height = self.df.height();
-        self.df
-            .get_columns()
-            .iter()
-            .map(|col| conversion::create_column(col, 0, height, span))
-            .collect::<Result<Vec<Column>, ShellError>>()
-    }
-
-    pub fn try_from_value(value: Value) -> Result<Self, ShellError> {
-        if Self::can_downcast(&value) {
-            Ok(Self::get_df(value)?)
-        } else if NuLazyFrame::can_downcast(&value) {
-            let span = value.span();
-            let lazy = NuLazyFrame::try_from_value(value)?;
-            let df = lazy.collect(span)?;
-            Ok(df)
-        } else {
-            Err(ShellError::CantConvert {
-                to_type: "lazy or eager dataframe".into(),
-                from_type: value.get_type().to_string(),
-                span: value.span(),
-                help: None,
-            })
-        }
-    }
-
-    pub fn get_df(value: Value) -> Result<Self, ShellError> {
-        let span = value.span();
-        match value {
-            Value::Custom { val, .. } => match val.as_any().downcast_ref::<Self>() {
-                Some(df) => Ok(NuDataFrame {
-                    df: df.df.clone(),
-                    from_lazy: false,
-                }),
-                None => Err(ShellError::CantConvert {
-                    to_type: "dataframe".into(),
-                    from_type: "non-dataframe".into(),
-                    span,
-                    help: None,
-                }),
-            },
-            x => Err(ShellError::CantConvert {
-                to_type: "dataframe".into(),
-                from_type: x.get_type().to_string(),
-                span: x.span(),
-                help: None,
-            }),
-        }
-    }
-
-    pub fn try_from_pipeline(input: PipelineData, span: Span) -> Result<Self, ShellError> {
-        let value = input.into_value(span)?;
-        Self::try_from_value(value)
-    }
-
-    pub fn can_downcast(value: &Value) -> bool {
-        if let Value::Custom { val, .. } = value {
-            val.as_any().downcast_ref::<Self>().is_some()
-        } else {
-            false
-        }
-    }
-
-    pub fn column(&self, column: &str, span: Span) -> Result<Self, ShellError> {
-        let s = self.df.column(column).map_err(|_| {
-            let possibilities = self
-                .df
-                .get_column_names()
-                .iter()
-                .map(|name| name.to_string())
-                .collect::<Vec<String>>();
-
-            let option = did_you_mean(&possibilities, column).unwrap_or_else(|| column.to_string());
-            ShellError::DidYouMean {
-                suggestion: option,
-                span,
-            }
-        })?;
-
-        let df = DataFrame::new(vec![s.clone()]).map_err(|e| ShellError::GenericError {
-            error: "Error creating dataframe".into(),
-            msg: e.to_string(),
-            span: Some(span),
-            help: None,
-            inner: vec![],
-        })?;
-
-        Ok(Self {
-            df,
-            from_lazy: false,
-        })
-    }
-
-    pub fn is_series(&self) -> bool {
-        self.df.width() == 1
-    }
-
-    pub fn as_series(&self, span: Span) -> Result<Series, ShellError> {
-        if !self.is_series() {
-            return Err(ShellError::GenericError {
-                error: "Error using as series".into(),
-                msg: "dataframe has more than one column".into(),
-                span: Some(span),
-                help: None,
-                inner: vec![],
-            });
-        }
-
-        let series = self
-            .df
-            .get_columns()
-            .first()
-            .expect("We have already checked that the width is 1");
-
-        Ok(series.clone())
-    }
-
-    pub fn get_value(&self, row: usize, span: Span) -> Result<Value, ShellError> {
-        let series = self.as_series(span)?;
-        let column = conversion::create_column(&series, row, row + 1, span)?;
-
-        if column.len() == 0 {
-            Err(ShellError::AccessEmptyContent { span })
-        } else {
-            let value = column
-                .into_iter()
-                .next()
-                .expect("already checked there is a value");
-            Ok(value)
-        }
-    }
-
-    // Print is made out a head and if the dataframe is too large, then a tail
-    pub fn print(&self, span: Span) -> Result<Vec<Value>, ShellError> {
-        let df = &self.df;
-        let size: usize = 20;
-
-        if df.height() > size {
-            let sample_size = size / 2;
-            let mut values = self.head(Some(sample_size), span)?;
-            conversion::add_separator(&mut values, df, span);
-            let remaining = df.height() - sample_size;
-            let tail_size = remaining.min(sample_size);
-            let mut tail_values = self.tail(Some(tail_size), span)?;
-            values.append(&mut tail_values);
-
-            Ok(values)
-        } else {
-            Ok(self.head(Some(size), span)?)
-        }
-    }
-
-    pub fn height(&self) -> usize {
-        self.df.height()
-    }
-
-    pub fn head(&self, rows: Option<usize>, span: Span) -> Result<Vec<Value>, ShellError> {
-        let to_row = rows.unwrap_or(5);
-        let values = self.to_rows(0, to_row, span)?;
-
-        Ok(values)
-    }
-
-    pub fn tail(&self, rows: Option<usize>, span: Span) -> Result<Vec<Value>, ShellError> {
-        let df = &self.df;
-        let to_row = df.height();
-        let size = rows.unwrap_or(DEFAULT_ROWS);
-        let from_row = to_row.saturating_sub(size);
-
-        let values = self.to_rows(from_row, to_row, span)?;
-
-        Ok(values)
-    }
-
-    pub fn to_rows(
-        &self,
-        from_row: usize,
-        to_row: usize,
-        span: Span,
-    ) -> Result<Vec<Value>, ShellError> {
-        let df = &self.df;
-        let upper_row = to_row.min(df.height());
-
-        let mut size: usize = 0;
-        let columns = self
-            .df
-            .get_columns()
-            .iter()
-            .map(
-                |col| match conversion::create_column(col, from_row, upper_row, span) {
-                    Ok(col) => {
-                        size = col.len();
-                        Ok(col)
-                    }
-                    Err(e) => Err(e),
-                },
-            )
-            .collect::<Result<Vec<Column>, ShellError>>()?;
-
-        let mut iterators = columns
-            .into_iter()
-            .map(|col| (col.name().to_string(), col.into_iter()))
-            .collect::<Vec<(String, std::vec::IntoIter<Value>)>>();
-
-        let values = (0..size)
-            .map(|i| {
-                let mut record = Record::new();
-
-                record.push("index", Value::int((i + from_row) as i64, span));
-
-                for (name, col) in &mut iterators {
-                    record.push(name.clone(), col.next().unwrap_or(Value::nothing(span)));
-                }
-
-                Value::record(record, span)
-            })
-            .collect::<Vec<Value>>();
-
-        Ok(values)
-    }
-
-    // Dataframes are considered equal if they have the same shape, column name and values
-    pub fn is_equal(&self, other: &Self) -> Option<Ordering> {
-        if self.as_ref().width() == 0 {
-            // checking for empty dataframe
-            return None;
-        }
-
-        if self.as_ref().get_column_names() != other.as_ref().get_column_names() {
-            // checking both dataframes share the same names
-            return None;
-        }
-
-        if self.as_ref().height() != other.as_ref().height() {
-            // checking both dataframes have the same row size
-            return None;
-        }
-
-        // sorting dataframe by the first column
-        let column_names = self.as_ref().get_column_names();
-        let first_col = column_names
-            .first()
-            .expect("already checked that dataframe is different than 0");
-
-        // if unable to sort, then unable to compare
-        let lhs = match self
-            .as_ref()
-            .sort(vec![*first_col], SortMultipleOptions::default())
-        {
-            Ok(df) => df,
-            Err(_) => return None,
-        };
-
-        let rhs = match other
-            .as_ref()
-            .sort(vec![*first_col], SortMultipleOptions::default())
-        {
-            Ok(df) => df,
-            Err(_) => return None,
-        };
-
-        for name in self.as_ref().get_column_names() {
-            let self_series = lhs.column(name).expect("name from dataframe names");
-
-            let other_series = rhs
-                .column(name)
-                .expect("already checked that name in other");
-
-            let self_series = match self_series.dtype() {
-                // Casting needed to compare other numeric types with nushell numeric type.
-                // In nushell we only have i64 integer numeric types and any array created
-                // with nushell untagged primitives will be of type i64
-                DataType::UInt32 | DataType::Int32 => match self_series.cast(&DataType::Int64) {
-                    Ok(series) => series,
-                    Err(_) => return None,
-                },
-                _ => self_series.clone(),
-            };
-
-            if !self_series.equals(other_series) {
-                return None;
-            }
-        }
-
-        Some(Ordering::Equal)
-    }
-
-    pub fn schema(&self) -> NuSchema {
-        NuSchema::new(self.df.schema())
-    }
-}
-
-fn add_missing_columns(
-    df: NuDataFrame,
-    maybe_schema: &Option<NuSchema>,
-    span: Span,
-) -> Result<NuDataFrame, ShellError> {
-    // If there are fields that are in the schema, but not in the dataframe
-    // add them to the dataframe.
-    if let Some(schema) = maybe_schema {
-        let fields = df.df.fields();
-        let df_field_names: HashSet<&str> = fields.iter().map(|f| f.name().as_str()).collect();
-
-        let missing: Vec<(&str, &DataType)> = schema
-            .schema
-            .iter()
-            .filter_map(|(name, dtype)| {
-                let name = name.as_str();
-                if !df_field_names.contains(name) {
-                    Some((name, dtype))
-                } else {
-                    None
-                }
-            })
-            .collect();
-
-        let missing_exprs: Vec<Expr> = missing
-            .iter()
-            .map(|(name, dtype)| lit(Null {}).cast((*dtype).to_owned()).alias(name))
-            .collect();
-
-        let df = if !missing.is_empty() {
-            let with_columns = df.lazy().with_columns(missing_exprs);
-            NuLazyFrame::new(true, with_columns).collect(span)?
-        } else {
-            df
-        };
-        Ok(df)
-    } else {
-        Ok(df)
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/values/nu_dataframe/operations.rs b/crates/nu-cmd-dataframe/src/dataframe/values/nu_dataframe/operations.rs
deleted file mode 100644
index ff2f7b7604..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/values/nu_dataframe/operations.rs
+++ /dev/null
@@ -1,206 +0,0 @@
-use super::{
-    between_values::{between_dataframes, compute_between_series, compute_series_single_value},
-    NuDataFrame,
-};
-use nu_protocol::{ast::Operator, ShellError, Span, Spanned, Value};
-use polars::prelude::{DataFrame, Series};
-
-pub enum Axis {
-    Row,
-    Column,
-}
-
-impl NuDataFrame {
-    pub fn compute_with_value(
-        &self,
-        lhs_span: Span,
-        operator: Operator,
-        op_span: Span,
-        right: &Value,
-    ) -> Result<Value, ShellError> {
-        let rhs_span = right.span();
-        match right {
-            Value::Custom { val: rhs, .. } => {
-                let rhs = rhs.as_any().downcast_ref::<NuDataFrame>().ok_or_else(|| {
-                    ShellError::DowncastNotPossible {
-                        msg: "Unable to create dataframe".to_string(),
-                        span: rhs_span,
-                    }
-                })?;
-
-                match (self.is_series(), rhs.is_series()) {
-                    (true, true) => {
-                        let lhs = &self
-                            .as_series(lhs_span)
-                            .expect("Already checked that is a series");
-                        let rhs = &rhs
-                            .as_series(rhs_span)
-                            .expect("Already checked that is a series");
-
-                        if lhs.dtype() != rhs.dtype() {
-                            return Err(ShellError::IncompatibleParameters {
-                                left_message: format!("datatype {}", lhs.dtype()),
-                                left_span: lhs_span,
-                                right_message: format!("datatype {}", lhs.dtype()),
-                                right_span: rhs_span,
-                            });
-                        }
-
-                        if lhs.len() != rhs.len() {
-                            return Err(ShellError::IncompatibleParameters {
-                                left_message: format!("len {}", lhs.len()),
-                                left_span: lhs_span,
-                                right_message: format!("len {}", rhs.len()),
-                                right_span: rhs_span,
-                            });
-                        }
-
-                        let op = Spanned {
-                            item: operator,
-                            span: op_span,
-                        };
-
-                        compute_between_series(
-                            op,
-                            &NuDataFrame::default_value(lhs_span),
-                            lhs,
-                            right,
-                            rhs,
-                        )
-                    }
-                    _ => {
-                        if self.df.height() != rhs.df.height() {
-                            return Err(ShellError::IncompatibleParameters {
-                                left_message: format!("rows {}", self.df.height()),
-                                left_span: lhs_span,
-                                right_message: format!("rows {}", rhs.df.height()),
-                                right_span: rhs_span,
-                            });
-                        }
-
-                        let op = Spanned {
-                            item: operator,
-                            span: op_span,
-                        };
-
-                        between_dataframes(
-                            op,
-                            &NuDataFrame::default_value(lhs_span),
-                            self,
-                            right,
-                            rhs,
-                        )
-                    }
-                }
-            }
-            _ => {
-                let op = Spanned {
-                    item: operator,
-                    span: op_span,
-                };
-
-                compute_series_single_value(op, &NuDataFrame::default_value(lhs_span), self, right)
-            }
-        }
-    }
-
-    pub fn append_df(
-        &self,
-        other: &NuDataFrame,
-        axis: Axis,
-        span: Span,
-    ) -> Result<Self, ShellError> {
-        match axis {
-            Axis::Row => {
-                let mut columns: Vec<&str> = Vec::new();
-
-                let new_cols = self
-                    .df
-                    .get_columns()
-                    .iter()
-                    .chain(other.df.get_columns())
-                    .map(|s| {
-                        let name = if columns.contains(&s.name()) {
-                            format!("{}_{}", s.name(), "x")
-                        } else {
-                            columns.push(s.name());
-                            s.name().to_string()
-                        };
-
-                        let mut series = s.clone();
-                        series.rename(&name);
-                        series
-                    })
-                    .collect::<Vec<Series>>();
-
-                let df_new = DataFrame::new(new_cols).map_err(|e| ShellError::GenericError {
-                    error: "Error creating dataframe".into(),
-                    msg: e.to_string(),
-                    span: Some(span),
-                    help: None,
-                    inner: vec![],
-                })?;
-
-                Ok(NuDataFrame::new(false, df_new))
-            }
-            Axis::Column => {
-                if self.df.width() != other.df.width() {
-                    return Err(ShellError::IncompatibleParametersSingle {
-                        msg: "Dataframes with different number of columns".into(),
-                        span,
-                    });
-                }
-
-                if !self
-                    .df
-                    .get_column_names()
-                    .iter()
-                    .all(|col| other.df.get_column_names().contains(col))
-                {
-                    return Err(ShellError::IncompatibleParametersSingle {
-                        msg: "Dataframes with different columns names".into(),
-                        span,
-                    });
-                }
-
-                let new_cols = self
-                    .df
-                    .get_columns()
-                    .iter()
-                    .map(|s| {
-                        let other_col = other
-                            .df
-                            .column(s.name())
-                            .expect("Already checked that dataframes have same columns");
-
-                        let mut tmp = s.clone();
-                        let res = tmp.append(other_col);
-
-                        match res {
-                            Ok(s) => Ok(s.clone()),
-                            Err(e) => Err({
-                                ShellError::GenericError {
-                                    error: "Error appending dataframe".into(),
-                                    msg: format!("Unable to append: {e}"),
-                                    span: Some(span),
-                                    help: None,
-                                    inner: vec![],
-                                }
-                            }),
-                        }
-                    })
-                    .collect::<Result<Vec<Series>, ShellError>>()?;
-
-                let df_new = DataFrame::new(new_cols).map_err(|e| ShellError::GenericError {
-                    error: "Error appending dataframe".into(),
-                    msg: format!("Unable to append dataframes: {e}"),
-                    span: Some(span),
-                    help: None,
-                    inner: vec![],
-                })?;
-
-                Ok(NuDataFrame::new(false, df_new))
-            }
-        }
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/values/nu_expression/custom_value.rs b/crates/nu-cmd-dataframe/src/dataframe/values/nu_expression/custom_value.rs
deleted file mode 100644
index 7a7f59e648..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/values/nu_expression/custom_value.rs
+++ /dev/null
@@ -1,147 +0,0 @@
-use super::NuExpression;
-use nu_protocol::{
-    ast::{Comparison, Math, Operator},
-    CustomValue, ShellError, Span, Type, Value,
-};
-use polars::prelude::Expr;
-use std::ops::{Add, Div, Mul, Rem, Sub};
-
-// CustomValue implementation for NuDataFrame
-impl CustomValue for NuExpression {
-    fn typetag_name(&self) -> &'static str {
-        "expression"
-    }
-
-    fn typetag_deserialize(&self) {
-        unimplemented!("typetag_deserialize")
-    }
-
-    fn clone_value(&self, span: nu_protocol::Span) -> Value {
-        let cloned = NuExpression(self.0.clone());
-
-        Value::custom(Box::new(cloned), span)
-    }
-
-    fn type_name(&self) -> String {
-        self.typetag_name().to_string()
-    }
-
-    fn to_base_value(&self, span: Span) -> Result<Value, ShellError> {
-        self.to_value(span)
-    }
-
-    fn as_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn as_mut_any(&mut self) -> &mut dyn std::any::Any {
-        self
-    }
-
-    fn operation(
-        &self,
-        lhs_span: Span,
-        operator: Operator,
-        op: Span,
-        right: &Value,
-    ) -> Result<Value, ShellError> {
-        compute_with_value(self, lhs_span, operator, op, right)
-    }
-}
-
-fn compute_with_value(
-    left: &NuExpression,
-    lhs_span: Span,
-    operator: Operator,
-    op: Span,
-    right: &Value,
-) -> Result<Value, ShellError> {
-    let rhs_span = right.span();
-    match right {
-        Value::Custom { val: rhs, .. } => {
-            let rhs = rhs.as_any().downcast_ref::<NuExpression>().ok_or_else(|| {
-                ShellError::DowncastNotPossible {
-                    msg: "Unable to create expression".into(),
-                    span: rhs_span,
-                }
-            })?;
-
-            match rhs.as_ref() {
-                polars::prelude::Expr::Literal(..) => {
-                    with_operator(operator, left, rhs, lhs_span, right.span(), op)
-                }
-                _ => Err(ShellError::TypeMismatch {
-                    err_message: "Only literal expressions or number".into(),
-                    span: right.span(),
-                }),
-            }
-        }
-        _ => {
-            let rhs = NuExpression::try_from_value(right.clone())?;
-            with_operator(operator, left, &rhs, lhs_span, right.span(), op)
-        }
-    }
-}
-
-fn with_operator(
-    operator: Operator,
-    left: &NuExpression,
-    right: &NuExpression,
-    lhs_span: Span,
-    rhs_span: Span,
-    op_span: Span,
-) -> Result<Value, ShellError> {
-    match operator {
-        Operator::Math(Math::Plus) => apply_arithmetic(left, right, lhs_span, Add::add),
-        Operator::Math(Math::Minus) => apply_arithmetic(left, right, lhs_span, Sub::sub),
-        Operator::Math(Math::Multiply) => apply_arithmetic(left, right, lhs_span, Mul::mul),
-        Operator::Math(Math::Divide) => apply_arithmetic(left, right, lhs_span, Div::div),
-        Operator::Math(Math::Modulo) => apply_arithmetic(left, right, lhs_span, Rem::rem),
-        Operator::Math(Math::FloorDivision) => apply_arithmetic(left, right, lhs_span, Div::div),
-        Operator::Comparison(Comparison::Equal) => Ok(left
-            .clone()
-            .apply_with_expr(right.clone(), Expr::eq)
-            .into_value(lhs_span)),
-        Operator::Comparison(Comparison::NotEqual) => Ok(left
-            .clone()
-            .apply_with_expr(right.clone(), Expr::neq)
-            .into_value(lhs_span)),
-        Operator::Comparison(Comparison::GreaterThan) => Ok(left
-            .clone()
-            .apply_with_expr(right.clone(), Expr::gt)
-            .into_value(lhs_span)),
-        Operator::Comparison(Comparison::GreaterThanOrEqual) => Ok(left
-            .clone()
-            .apply_with_expr(right.clone(), Expr::gt_eq)
-            .into_value(lhs_span)),
-        Operator::Comparison(Comparison::LessThan) => Ok(left
-            .clone()
-            .apply_with_expr(right.clone(), Expr::lt)
-            .into_value(lhs_span)),
-        Operator::Comparison(Comparison::LessThanOrEqual) => Ok(left
-            .clone()
-            .apply_with_expr(right.clone(), Expr::lt_eq)
-            .into_value(lhs_span)),
-        _ => Err(ShellError::OperatorMismatch {
-            op_span,
-            lhs_ty: Type::Custom(left.typetag_name().into()).to_string(),
-            lhs_span,
-            rhs_ty: Type::Custom(right.typetag_name().into()).to_string(),
-            rhs_span,
-        }),
-    }
-}
-
-fn apply_arithmetic<F>(
-    left: &NuExpression,
-    right: &NuExpression,
-    span: Span,
-    f: F,
-) -> Result<Value, ShellError>
-where
-    F: Fn(Expr, Expr) -> Expr,
-{
-    let expr: NuExpression = f(left.as_ref().clone(), right.as_ref().clone()).into();
-
-    Ok(expr.into_value(span))
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/values/nu_expression/mod.rs b/crates/nu-cmd-dataframe/src/dataframe/values/nu_expression/mod.rs
deleted file mode 100644
index cee31d7b53..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/values/nu_expression/mod.rs
+++ /dev/null
@@ -1,443 +0,0 @@
-mod custom_value;
-
-use nu_protocol::{record, PipelineData, ShellError, Span, Value};
-use polars::prelude::{col, AggExpr, Expr, Literal};
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
-
-// Polars Expression wrapper for Nushell operations
-// Object is behind and Option to allow easy implementation of
-// the Deserialize trait
-#[derive(Default, Clone, Debug)]
-pub struct NuExpression(Option<Expr>);
-
-// Mocked serialization of the LazyFrame object
-impl Serialize for NuExpression {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        serializer.serialize_none()
-    }
-}
-
-// Mocked deserialization of the LazyFrame object
-impl<'de> Deserialize<'de> for NuExpression {
-    fn deserialize<D>(_deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        Ok(NuExpression::default())
-    }
-}
-
-// Referenced access to the real LazyFrame
-impl AsRef<Expr> for NuExpression {
-    fn as_ref(&self) -> &polars::prelude::Expr {
-        // The only case when there cannot be an expr is if it is created
-        // using the default function or if created by deserializing something
-        self.0.as_ref().expect("there should always be a frame")
-    }
-}
-
-impl AsMut<Expr> for NuExpression {
-    fn as_mut(&mut self) -> &mut polars::prelude::Expr {
-        // The only case when there cannot be an expr is if it is created
-        // using the default function or if created by deserializing something
-        self.0.as_mut().expect("there should always be a frame")
-    }
-}
-
-impl From<Expr> for NuExpression {
-    fn from(expr: Expr) -> Self {
-        Self(Some(expr))
-    }
-}
-
-impl NuExpression {
-    pub fn into_value(self, span: Span) -> Value {
-        Value::custom(Box::new(self), span)
-    }
-
-    pub fn try_from_value(value: Value) -> Result<Self, ShellError> {
-        let span = value.span();
-        match value {
-            Value::Custom { val, .. } => match val.as_any().downcast_ref::<Self>() {
-                Some(expr) => Ok(NuExpression(expr.0.clone())),
-                None => Err(ShellError::CantConvert {
-                    to_type: "lazy expression".into(),
-                    from_type: "non-dataframe".into(),
-                    span,
-                    help: None,
-                }),
-            },
-            Value::String { val, .. } => Ok(val.lit().into()),
-            Value::Int { val, .. } => Ok(val.lit().into()),
-            Value::Bool { val, .. } => Ok(val.lit().into()),
-            Value::Float { val, .. } => Ok(val.lit().into()),
-            x => Err(ShellError::CantConvert {
-                to_type: "lazy expression".into(),
-                from_type: x.get_type().to_string(),
-                span: x.span(),
-                help: None,
-            }),
-        }
-    }
-
-    pub fn try_from_pipeline(input: PipelineData, span: Span) -> Result<Self, ShellError> {
-        let value = input.into_value(span)?;
-        Self::try_from_value(value)
-    }
-
-    pub fn can_downcast(value: &Value) -> bool {
-        match value {
-            Value::Custom { val, .. } => val.as_any().downcast_ref::<Self>().is_some(),
-            Value::List { vals, .. } => vals.iter().all(Self::can_downcast),
-            Value::String { .. } | Value::Int { .. } | Value::Bool { .. } | Value::Float { .. } => {
-                true
-            }
-            _ => false,
-        }
-    }
-
-    pub fn into_polars(self) -> Expr {
-        self.0.expect("Expression cannot be none to convert")
-    }
-
-    pub fn apply_with_expr<F>(self, other: NuExpression, f: F) -> Self
-    where
-        F: Fn(Expr, Expr) -> Expr,
-    {
-        let expr = self.0.expect("Lazy expression must not be empty to apply");
-        let other = other.0.expect("Lazy expression must not be empty to apply");
-
-        f(expr, other).into()
-    }
-
-    pub fn to_value(&self, span: Span) -> Result<Value, ShellError> {
-        expr_to_value(self.as_ref(), span)
-    }
-
-    // Convenient function to extract multiple Expr that could be inside a nushell Value
-    pub fn extract_exprs(value: Value) -> Result<Vec<Expr>, ShellError> {
-        ExtractedExpr::extract_exprs(value).map(ExtractedExpr::into_exprs)
-    }
-}
-
-#[derive(Debug)]
-// Enum to represent the parsing of the expressions from Value
-enum ExtractedExpr {
-    Single(Expr),
-    List(Vec<ExtractedExpr>),
-}
-
-impl ExtractedExpr {
-    fn into_exprs(self) -> Vec<Expr> {
-        match self {
-            Self::Single(expr) => vec![expr],
-            Self::List(expressions) => expressions
-                .into_iter()
-                .flat_map(ExtractedExpr::into_exprs)
-                .collect(),
-        }
-    }
-
-    fn extract_exprs(value: Value) -> Result<ExtractedExpr, ShellError> {
-        match value {
-            Value::String { val, .. } => Ok(ExtractedExpr::Single(col(val.as_str()))),
-            Value::Custom { .. } => NuExpression::try_from_value(value)
-                .map(NuExpression::into_polars)
-                .map(ExtractedExpr::Single),
-            Value::List { vals, .. } => vals
-                .into_iter()
-                .map(Self::extract_exprs)
-                .collect::<Result<Vec<ExtractedExpr>, ShellError>>()
-                .map(ExtractedExpr::List),
-            x => Err(ShellError::CantConvert {
-                to_type: "expression".into(),
-                from_type: x.get_type().to_string(),
-                span: x.span(),
-                help: None,
-            }),
-        }
-    }
-}
-
-pub fn expr_to_value(expr: &Expr, span: Span) -> Result<Value, ShellError> {
-    match expr {
-        Expr::Alias(expr, alias) => Ok(Value::record(
-            record! {
-                "expr" => expr_to_value(expr.as_ref(), span)?,
-                "alias" => Value::string(alias.as_ref(), span),
-            },
-            span,
-        )),
-        Expr::Column(name) => Ok(Value::record(
-            record! {
-                "expr" => Value::string("column", span),
-                "value" => Value::string(name.to_string(), span),
-            },
-            span,
-        )),
-        Expr::Columns(columns) => {
-            let value = columns.iter().map(|col| Value::string(col, span)).collect();
-            Ok(Value::record(
-                record! {
-                    "expr" => Value::string("columns", span),
-                    "value" => Value::list(value, span),
-                },
-                span,
-            ))
-        }
-        Expr::Literal(literal) => Ok(Value::record(
-            record! {
-                "expr" => Value::string("literal", span),
-                "value" => Value::string(format!("{literal:?}"), span),
-            },
-            span,
-        )),
-        Expr::BinaryExpr { left, op, right } => Ok(Value::record(
-            record! {
-                "left" => expr_to_value(left, span)?,
-                "op" => Value::string(format!("{op:?}"), span),
-                "right" => expr_to_value(right, span)?,
-            },
-            span,
-        )),
-        Expr::Ternary {
-            predicate,
-            truthy,
-            falsy,
-        } => Ok(Value::record(
-            record! {
-                "predicate" => expr_to_value(predicate.as_ref(), span)?,
-                "truthy" => expr_to_value(truthy.as_ref(), span)?,
-                "falsy" => expr_to_value(falsy.as_ref(), span)?,
-            },
-            span,
-        )),
-        Expr::Agg(agg_expr) => {
-            let value = match agg_expr {
-                AggExpr::Min { input: expr, .. }
-                | AggExpr::Max { input: expr, .. }
-                | AggExpr::Median(expr)
-                | AggExpr::NUnique(expr)
-                | AggExpr::First(expr)
-                | AggExpr::Last(expr)
-                | AggExpr::Mean(expr)
-                | AggExpr::Implode(expr)
-                | AggExpr::Count(expr, _)
-                | AggExpr::Sum(expr)
-                | AggExpr::AggGroups(expr)
-                | AggExpr::Std(expr, _)
-                | AggExpr::Var(expr, _) => expr_to_value(expr.as_ref(), span),
-                AggExpr::Quantile {
-                    expr,
-                    quantile,
-                    interpol,
-                } => Ok(Value::record(
-                    record! {
-                        "expr" => expr_to_value(expr.as_ref(), span)?,
-                        "quantile" => expr_to_value(quantile.as_ref(), span)?,
-                        "interpol" => Value::string(format!("{interpol:?}"), span),
-                    },
-                    span,
-                )),
-            };
-
-            Ok(Value::record(
-                record! {
-                    "expr" => Value::string("agg", span),
-                    "value" => value?,
-                },
-                span,
-            ))
-        }
-        Expr::Len => Ok(Value::record(
-            record! { "expr" => Value::string("count", span) },
-            span,
-        )),
-        Expr::Wildcard => Ok(Value::record(
-            record! { "expr" => Value::string("wildcard", span) },
-            span,
-        )),
-        Expr::Explode(expr) => Ok(Value::record(
-            record! { "expr" => expr_to_value(expr.as_ref(), span)? },
-            span,
-        )),
-        Expr::KeepName(expr) => Ok(Value::record(
-            record! { "expr" => expr_to_value(expr.as_ref(), span)? },
-            span,
-        )),
-        Expr::Nth(i) => Ok(Value::record(
-            record! { "expr" => Value::int(*i, span) },
-            span,
-        )),
-        Expr::DtypeColumn(dtypes) => {
-            let vals = dtypes
-                .iter()
-                .map(|d| Value::string(format!("{d}"), span))
-                .collect();
-
-            Ok(Value::list(vals, span))
-        }
-        Expr::Sort { expr, options } => Ok(Value::record(
-            record! {
-                "expr" => expr_to_value(expr.as_ref(), span)?,
-                "options" => Value::string(format!("{options:?}"), span),
-            },
-            span,
-        )),
-        Expr::Cast {
-            expr,
-            data_type,
-            strict,
-        } => Ok(Value::record(
-            record! {
-                "expr" => expr_to_value(expr.as_ref(), span)?,
-                "dtype" => Value::string(format!("{data_type:?}"), span),
-                "strict" => Value::bool(*strict, span),
-            },
-            span,
-        )),
-        Expr::Gather {
-            expr,
-            idx,
-            returns_scalar: _,
-        } => Ok(Value::record(
-            record! {
-                "expr" => expr_to_value(expr.as_ref(), span)?,
-                "idx" => expr_to_value(idx.as_ref(), span)?,
-            },
-            span,
-        )),
-        Expr::SortBy {
-            expr,
-            by,
-            sort_options,
-        } => {
-            let by: Result<Vec<Value>, ShellError> =
-                by.iter().map(|b| expr_to_value(b, span)).collect();
-            let descending: Vec<Value> = sort_options
-                .descending
-                .iter()
-                .map(|r| Value::bool(*r, span))
-                .collect();
-
-            Ok(Value::record(
-                record! {
-                    "expr" => expr_to_value(expr.as_ref(), span)?,
-                    "by" => Value::list(by?, span),
-                    "descending" => Value::list(descending, span),
-                },
-                span,
-            ))
-        }
-        Expr::Filter { input, by } => Ok(Value::record(
-            record! {
-                "input" => expr_to_value(input.as_ref(), span)?,
-                "by" => expr_to_value(by.as_ref(), span)?,
-            },
-            span,
-        )),
-        Expr::Slice {
-            input,
-            offset,
-            length,
-        } => Ok(Value::record(
-            record! {
-                "input" => expr_to_value(input.as_ref(), span)?,
-                "offset" => expr_to_value(offset.as_ref(), span)?,
-                "length" => expr_to_value(length.as_ref(), span)?,
-            },
-            span,
-        )),
-        Expr::Exclude(expr, excluded) => {
-            let excluded = excluded
-                .iter()
-                .map(|e| Value::string(format!("{e:?}"), span))
-                .collect();
-
-            Ok(Value::record(
-                record! {
-                    "expr" => expr_to_value(expr.as_ref(), span)?,
-                    "excluded" => Value::list(excluded, span),
-                },
-                span,
-            ))
-        }
-        Expr::RenameAlias { expr, function } => Ok(Value::record(
-            record! {
-                "expr" => expr_to_value(expr.as_ref(), span)?,
-                "function" => Value::string(format!("{function:?}"), span),
-            },
-            span,
-        )),
-        Expr::AnonymousFunction {
-            input,
-            function,
-            output_type,
-            options,
-        } => {
-            let input: Result<Vec<Value>, ShellError> =
-                input.iter().map(|e| expr_to_value(e, span)).collect();
-            Ok(Value::record(
-                record! {
-                    "input" => Value::list(input?, span),
-                    "function" => Value::string(format!("{function:?}"), span),
-                    "output_type" => Value::string(format!("{output_type:?}"), span),
-                    "options" => Value::string(format!("{options:?}"), span),
-                },
-                span,
-            ))
-        }
-        Expr::Function {
-            input,
-            function,
-            options,
-        } => {
-            let input: Result<Vec<Value>, ShellError> =
-                input.iter().map(|e| expr_to_value(e, span)).collect();
-            Ok(Value::record(
-                record! {
-                    "input" => Value::list(input?, span),
-                    "function" => Value::string(format!("{function:?}"), span),
-                    "options" => Value::string(format!("{options:?}"), span),
-                },
-                span,
-            ))
-        }
-        Expr::Window {
-            function,
-            partition_by,
-            options,
-        } => {
-            let partition_by: Result<Vec<Value>, ShellError> = partition_by
-                .iter()
-                .map(|e| expr_to_value(e, span))
-                .collect();
-
-            Ok(Value::record(
-                record! {
-                    "function" => expr_to_value(function, span)?,
-                    "partition_by" => Value::list(partition_by?, span),
-                    "options" => Value::string(format!("{options:?}"), span),
-                },
-                span,
-            ))
-        }
-        Expr::SubPlan(_, _) => Err(ShellError::UnsupportedInput {
-            msg: "Expressions of type SubPlan are not yet supported".to_string(),
-            input: format!("Expression is {expr:?}"),
-            msg_span: span,
-            input_span: Span::unknown(),
-        }),
-        // the parameter polars_plan::dsl::selector::Selector is not publicly exposed.
-        // I am not sure what we can meaningfully do with this at this time.
-        Expr::Selector(_) => Err(ShellError::UnsupportedInput {
-            msg: "Expressions of type Selector to Nu Values is not yet supported".to_string(),
-            input: format!("Expression is {expr:?}"),
-            msg_span: span,
-            input_span: Span::unknown(),
-        }),
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/values/nu_lazyframe/custom_value.rs b/crates/nu-cmd-dataframe/src/dataframe/values/nu_lazyframe/custom_value.rs
deleted file mode 100644
index f747ae4d18..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/values/nu_lazyframe/custom_value.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use super::NuLazyFrame;
-use nu_protocol::{record, CustomValue, ShellError, Span, Value};
-
-// CustomValue implementation for NuDataFrame
-impl CustomValue for NuLazyFrame {
-    fn typetag_name(&self) -> &'static str {
-        "lazyframe"
-    }
-
-    fn typetag_deserialize(&self) {
-        unimplemented!("typetag_deserialize")
-    }
-
-    fn clone_value(&self, span: nu_protocol::Span) -> Value {
-        let cloned = NuLazyFrame {
-            lazy: self.lazy.clone(),
-            from_eager: self.from_eager,
-            schema: self.schema.clone(),
-        };
-
-        Value::custom(Box::new(cloned), span)
-    }
-
-    fn type_name(&self) -> String {
-        self.typetag_name().to_string()
-    }
-
-    fn to_base_value(&self, span: Span) -> Result<Value, ShellError> {
-        let optimized_plan = self
-            .as_ref()
-            .describe_optimized_plan()
-            .unwrap_or_else(|_| "<NOT AVAILABLE>".to_string());
-
-        Ok(Value::record(
-            record! {
-                "plan" => Value::string(self.as_ref().describe_plan(), span),
-                "optimized_plan" => Value::string(optimized_plan, span),
-            },
-            span,
-        ))
-    }
-
-    fn as_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn as_mut_any(&mut self) -> &mut dyn std::any::Any {
-        self
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/values/nu_lazyframe/mod.rs b/crates/nu-cmd-dataframe/src/dataframe/values/nu_lazyframe/mod.rs
deleted file mode 100644
index 355516d340..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/values/nu_lazyframe/mod.rs
+++ /dev/null
@@ -1,188 +0,0 @@
-mod custom_value;
-
-use super::{NuDataFrame, NuExpression};
-use core::fmt;
-use nu_protocol::{PipelineData, ShellError, Span, Value};
-use polars::prelude::{Expr, IntoLazy, LazyFrame, Schema};
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
-
-// Lazyframe wrapper for Nushell operations
-// Polars LazyFrame is behind and Option to allow easy implementation of
-// the Deserialize trait
-#[derive(Default)]
-pub struct NuLazyFrame {
-    pub lazy: Option<LazyFrame>,
-    pub schema: Option<Schema>,
-    pub from_eager: bool,
-}
-
-// Mocked serialization of the LazyFrame object
-impl Serialize for NuLazyFrame {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        serializer.serialize_none()
-    }
-}
-
-// Mocked deserialization of the LazyFrame object
-impl<'de> Deserialize<'de> for NuLazyFrame {
-    fn deserialize<D>(_deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        Ok(NuLazyFrame::default())
-    }
-}
-
-impl fmt::Debug for NuLazyFrame {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "NuLazyframe")
-    }
-}
-
-// Referenced access to the real LazyFrame
-impl AsRef<LazyFrame> for NuLazyFrame {
-    fn as_ref(&self) -> &polars::prelude::LazyFrame {
-        // The only case when there cannot be a lazy frame is if it is created
-        // using the default function or if created by deserializing something
-        self.lazy.as_ref().expect("there should always be a frame")
-    }
-}
-
-impl AsMut<LazyFrame> for NuLazyFrame {
-    fn as_mut(&mut self) -> &mut polars::prelude::LazyFrame {
-        // The only case when there cannot be a lazy frame is if it is created
-        // using the default function or if created by deserializing something
-        self.lazy.as_mut().expect("there should always be a frame")
-    }
-}
-
-impl From<LazyFrame> for NuLazyFrame {
-    fn from(lazy_frame: LazyFrame) -> Self {
-        Self {
-            lazy: Some(lazy_frame),
-            from_eager: false,
-            schema: None,
-        }
-    }
-}
-
-impl NuLazyFrame {
-    pub fn new(from_eager: bool, lazy: LazyFrame) -> Self {
-        Self {
-            lazy: Some(lazy),
-            from_eager,
-            schema: None,
-        }
-    }
-
-    pub fn from_dataframe(df: NuDataFrame) -> Self {
-        let lazy = df.as_ref().clone().lazy();
-        Self {
-            lazy: Some(lazy),
-            from_eager: true,
-            schema: Some(df.as_ref().schema()),
-        }
-    }
-
-    pub fn into_value(self, span: Span) -> Result<Value, ShellError> {
-        if self.from_eager {
-            let df = self.collect(span)?;
-            Ok(Value::custom(Box::new(df), span))
-        } else {
-            Ok(Value::custom(Box::new(self), span))
-        }
-    }
-
-    pub fn into_polars(self) -> LazyFrame {
-        self.lazy.expect("lazyframe cannot be none to convert")
-    }
-
-    pub fn collect(self, span: Span) -> Result<NuDataFrame, ShellError> {
-        self.lazy
-            .expect("No empty lazy for collect")
-            .collect()
-            .map_err(|e| ShellError::GenericError {
-                error: "Error collecting lazy frame".into(),
-                msg: e.to_string(),
-                span: Some(span),
-                help: None,
-                inner: vec![],
-            })
-            .map(|df| NuDataFrame {
-                df,
-                from_lazy: !self.from_eager,
-            })
-    }
-
-    pub fn try_from_value(value: Value) -> Result<Self, ShellError> {
-        if Self::can_downcast(&value) {
-            Ok(Self::get_lazy_df(value)?)
-        } else if NuDataFrame::can_downcast(&value) {
-            let df = NuDataFrame::try_from_value(value)?;
-            Ok(NuLazyFrame::from_dataframe(df))
-        } else {
-            Err(ShellError::CantConvert {
-                to_type: "lazy or eager dataframe".into(),
-                from_type: value.get_type().to_string(),
-                span: value.span(),
-                help: None,
-            })
-        }
-    }
-
-    pub fn try_from_pipeline(input: PipelineData, span: Span) -> Result<Self, ShellError> {
-        let value = input.into_value(span)?;
-        Self::try_from_value(value)
-    }
-
-    pub fn get_lazy_df(value: Value) -> Result<Self, ShellError> {
-        let span = value.span();
-        match value {
-            Value::Custom { val, .. } => match val.as_any().downcast_ref::<Self>() {
-                Some(expr) => Ok(Self {
-                    lazy: expr.lazy.clone(),
-                    from_eager: false,
-                    schema: None,
-                }),
-                None => Err(ShellError::CantConvert {
-                    to_type: "lazy frame".into(),
-                    from_type: "non-dataframe".into(),
-                    span,
-                    help: None,
-                }),
-            },
-            x => Err(ShellError::CantConvert {
-                to_type: "lazy frame".into(),
-                from_type: x.get_type().to_string(),
-                span: x.span(),
-                help: None,
-            }),
-        }
-    }
-
-    pub fn can_downcast(value: &Value) -> bool {
-        if let Value::Custom { val, .. } = value {
-            val.as_any().downcast_ref::<Self>().is_some()
-        } else {
-            false
-        }
-    }
-
-    pub fn apply_with_expr<F>(self, expr: NuExpression, f: F) -> Self
-    where
-        F: Fn(LazyFrame, Expr) -> LazyFrame,
-    {
-        let df = self.lazy.expect("Lazy frame must not be empty to apply");
-        let expr = expr.into_polars();
-        let new_frame = f(df, expr);
-
-        Self {
-            from_eager: self.from_eager,
-            lazy: Some(new_frame),
-            schema: None,
-        }
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/values/nu_lazygroupby/custom_value.rs b/crates/nu-cmd-dataframe/src/dataframe/values/nu_lazygroupby/custom_value.rs
deleted file mode 100644
index 6ac6cc6046..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/values/nu_lazygroupby/custom_value.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-use super::NuLazyGroupBy;
-use nu_protocol::{record, CustomValue, ShellError, Span, Value};
-
-// CustomValue implementation for NuDataFrame
-impl CustomValue for NuLazyGroupBy {
-    fn typetag_name(&self) -> &'static str {
-        "lazygroupby"
-    }
-
-    fn typetag_deserialize(&self) {
-        unimplemented!("typetag_deserialize")
-    }
-
-    fn clone_value(&self, span: nu_protocol::Span) -> Value {
-        let cloned = NuLazyGroupBy {
-            group_by: self.group_by.clone(),
-            schema: self.schema.clone(),
-            from_eager: self.from_eager,
-        };
-
-        Value::custom(Box::new(cloned), span)
-    }
-
-    fn type_name(&self) -> String {
-        self.typetag_name().to_string()
-    }
-
-    fn to_base_value(&self, span: Span) -> Result<Value, ShellError> {
-        Ok(Value::record(
-            record! {
-                "LazyGroupBy" => Value::string("apply aggregation to complete execution plan", span)
-            },
-            span,
-        ))
-    }
-
-    fn as_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn as_mut_any(&mut self) -> &mut dyn std::any::Any {
-        self
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/values/nu_lazygroupby/mod.rs b/crates/nu-cmd-dataframe/src/dataframe/values/nu_lazygroupby/mod.rs
deleted file mode 100644
index e1bcb30069..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/values/nu_lazygroupby/mod.rs
+++ /dev/null
@@ -1,113 +0,0 @@
-mod custom_value;
-
-use core::fmt;
-use nu_protocol::{PipelineData, ShellError, Span, Value};
-use polars::prelude::{LazyGroupBy, Schema};
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
-
-// Lazyframe wrapper for Nushell operations
-// Polars LazyFrame is behind and Option to allow easy implementation of
-// the Deserialize trait
-#[derive(Default)]
-pub struct NuLazyGroupBy {
-    pub group_by: Option<LazyGroupBy>,
-    pub schema: Option<Schema>,
-    pub from_eager: bool,
-}
-
-// Mocked serialization of the LazyFrame object
-impl Serialize for NuLazyGroupBy {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        serializer.serialize_none()
-    }
-}
-
-// Mocked deserialization of the LazyFrame object
-impl<'de> Deserialize<'de> for NuLazyGroupBy {
-    fn deserialize<D>(_deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        Ok(NuLazyGroupBy::default())
-    }
-}
-
-impl fmt::Debug for NuLazyGroupBy {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "NuLazyGroupBy")
-    }
-}
-
-// Referenced access to the real LazyFrame
-impl AsRef<LazyGroupBy> for NuLazyGroupBy {
-    fn as_ref(&self) -> &polars::prelude::LazyGroupBy {
-        // The only case when there cannot be a lazy frame is if it is created
-        // using the default function or if created by deserializing something
-        self.group_by
-            .as_ref()
-            .expect("there should always be a frame")
-    }
-}
-
-impl AsMut<LazyGroupBy> for NuLazyGroupBy {
-    fn as_mut(&mut self) -> &mut polars::prelude::LazyGroupBy {
-        // The only case when there cannot be a lazy frame is if it is created
-        // using the default function or if created by deserializing something
-        self.group_by
-            .as_mut()
-            .expect("there should always be a frame")
-    }
-}
-
-impl From<LazyGroupBy> for NuLazyGroupBy {
-    fn from(group_by: LazyGroupBy) -> Self {
-        Self {
-            group_by: Some(group_by),
-            from_eager: false,
-            schema: None,
-        }
-    }
-}
-
-impl NuLazyGroupBy {
-    pub fn into_value(self, span: Span) -> Value {
-        Value::custom(Box::new(self), span)
-    }
-
-    pub fn into_polars(self) -> LazyGroupBy {
-        self.group_by.expect("GroupBy cannot be none to convert")
-    }
-
-    pub fn try_from_value(value: Value) -> Result<Self, ShellError> {
-        let span = value.span();
-        match value {
-            Value::Custom { val, .. } => match val.as_any().downcast_ref::<NuLazyGroupBy>() {
-                Some(group) => Ok(Self {
-                    group_by: group.group_by.clone(),
-                    schema: group.schema.clone(),
-                    from_eager: group.from_eager,
-                }),
-                None => Err(ShellError::CantConvert {
-                    to_type: "lazy groupby".into(),
-                    from_type: "custom value".into(),
-                    span,
-                    help: None,
-                }),
-            },
-            x => Err(ShellError::CantConvert {
-                to_type: "lazy groupby".into(),
-                from_type: x.get_type().to_string(),
-                span: x.span(),
-                help: None,
-            }),
-        }
-    }
-
-    pub fn try_from_pipeline(input: PipelineData, span: Span) -> Result<Self, ShellError> {
-        let value = input.into_value(span)?;
-        Self::try_from_value(value)
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/values/nu_schema.rs b/crates/nu-cmd-dataframe/src/dataframe/values/nu_schema.rs
deleted file mode 100644
index 3c2f689b85..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/values/nu_schema.rs
+++ /dev/null
@@ -1,376 +0,0 @@
-use nu_protocol::{ShellError, Span, Value};
-use polars::prelude::{DataType, Field, Schema, SchemaRef, TimeUnit};
-use std::sync::Arc;
-
-#[derive(Debug, Clone)]
-pub struct NuSchema {
-    pub schema: SchemaRef,
-}
-
-impl NuSchema {
-    pub fn new(schema: Schema) -> Self {
-        Self {
-            schema: Arc::new(schema),
-        }
-    }
-}
-
-impl TryFrom<&Value> for NuSchema {
-    type Error = ShellError;
-    fn try_from(value: &Value) -> Result<Self, Self::Error> {
-        let schema = value_to_schema(value, Span::unknown())?;
-        Ok(Self::new(schema))
-    }
-}
-
-impl From<NuSchema> for Value {
-    fn from(schema: NuSchema) -> Self {
-        fields_to_value(schema.schema.iter_fields(), Span::unknown())
-    }
-}
-
-impl From<NuSchema> for SchemaRef {
-    fn from(val: NuSchema) -> Self {
-        Arc::clone(&val.schema)
-    }
-}
-
-fn fields_to_value(fields: impl Iterator<Item = Field>, span: Span) -> Value {
-    let record = fields
-        .map(|field| {
-            let col = field.name().to_string();
-            let val = dtype_to_value(field.data_type(), span);
-            (col, val)
-        })
-        .collect();
-
-    Value::record(record, Span::unknown())
-}
-
-fn dtype_to_value(dtype: &DataType, span: Span) -> Value {
-    match dtype {
-        DataType::Struct(fields) => fields_to_value(fields.iter().cloned(), span),
-        _ => Value::string(dtype.to_string().replace('[', "<").replace(']', ">"), span),
-    }
-}
-
-fn value_to_schema(value: &Value, span: Span) -> Result<Schema, ShellError> {
-    let fields = value_to_fields(value, span)?;
-    let schema = Schema::from_iter(fields);
-    Ok(schema)
-}
-
-fn value_to_fields(value: &Value, span: Span) -> Result<Vec<Field>, ShellError> {
-    let fields = value
-        .as_record()?
-        .into_iter()
-        .map(|(col, val)| match val {
-            Value::Record { .. } => {
-                let fields = value_to_fields(val, span)?;
-                let dtype = DataType::Struct(fields);
-                Ok(Field::new(col, dtype))
-            }
-            _ => {
-                let dtype = str_to_dtype(&val.coerce_string()?, span)?;
-                Ok(Field::new(col, dtype))
-            }
-        })
-        .collect::<Result<Vec<Field>, ShellError>>()?;
-    Ok(fields)
-}
-
-pub fn str_to_dtype(dtype: &str, span: Span) -> Result<DataType, ShellError> {
-    match dtype {
-        "bool" => Ok(DataType::Boolean),
-        "u8" => Ok(DataType::UInt8),
-        "u16" => Ok(DataType::UInt16),
-        "u32" => Ok(DataType::UInt32),
-        "u64" => Ok(DataType::UInt64),
-        "i8" => Ok(DataType::Int8),
-        "i16" => Ok(DataType::Int16),
-        "i32" => Ok(DataType::Int32),
-        "i64" => Ok(DataType::Int64),
-        "f32" => Ok(DataType::Float32),
-        "f64" => Ok(DataType::Float64),
-        "str" => Ok(DataType::String),
-        "binary" => Ok(DataType::Binary),
-        "date" => Ok(DataType::Date),
-        "time" => Ok(DataType::Time),
-        "null" => Ok(DataType::Null),
-        "unknown" => Ok(DataType::Unknown),
-        "object" => Ok(DataType::Object("unknown", None)),
-        _ if dtype.starts_with("list") => {
-            let dtype = dtype
-                .trim_start_matches("list")
-                .trim_start_matches('<')
-                .trim_end_matches('>')
-                .trim();
-            let dtype = str_to_dtype(dtype, span)?;
-            Ok(DataType::List(Box::new(dtype)))
-        }
-        _ if dtype.starts_with("datetime") => {
-            let dtype = dtype
-                .trim_start_matches("datetime")
-                .trim_start_matches('<')
-                .trim_end_matches('>');
-            let mut split = dtype.split(',');
-            let next = split
-                .next()
-                .ok_or_else(|| ShellError::GenericError {
-                    error: "Invalid polars data type".into(),
-                    msg: "Missing time unit".into(),
-                    span: Some(span),
-                    help: None,
-                    inner: vec![],
-                })?
-                .trim();
-            let time_unit = str_to_time_unit(next, span)?;
-            let next = split
-                .next()
-                .ok_or_else(|| ShellError::GenericError {
-                    error: "Invalid polars data type".into(),
-                    msg: "Missing time zone".into(),
-                    span: Some(span),
-                    help: None,
-                    inner: vec![],
-                })?
-                .trim();
-            let timezone = if "*" == next {
-                None
-            } else {
-                Some(next.to_string())
-            };
-            Ok(DataType::Datetime(time_unit, timezone))
-        }
-        _ if dtype.starts_with("duration") => {
-            let inner = dtype.trim_start_matches("duration<").trim_end_matches('>');
-            let next = inner
-                .split(',')
-                .next()
-                .ok_or_else(|| ShellError::GenericError {
-                    error: "Invalid polars data type".into(),
-                    msg: "Missing time unit".into(),
-                    span: Some(span),
-                    help: None,
-                    inner: vec![],
-                })?
-                .trim();
-            let time_unit = str_to_time_unit(next, span)?;
-            Ok(DataType::Duration(time_unit))
-        }
-        _ => Err(ShellError::GenericError {
-            error: "Invalid polars data type".into(),
-            msg: format!("Unknown type: {dtype}"),
-            span: Some(span),
-            help: None,
-            inner: vec![],
-        }),
-    }
-}
-
-fn str_to_time_unit(ts_string: &str, span: Span) -> Result<TimeUnit, ShellError> {
-    match ts_string {
-        "ms" => Ok(TimeUnit::Milliseconds),
-        "us" | "μs" => Ok(TimeUnit::Microseconds),
-        "ns" => Ok(TimeUnit::Nanoseconds),
-        _ => Err(ShellError::GenericError {
-            error: "Invalid polars data type".into(),
-            msg: "Invalid time unit".into(),
-            span: Some(span),
-            help: None,
-            inner: vec![],
-        }),
-    }
-}
-
-#[cfg(test)]
-mod test {
-
-    use nu_protocol::record;
-
-    use super::*;
-
-    #[test]
-    fn test_value_to_schema() {
-        let address = record! {
-            "street" => Value::test_string("str"),
-            "city" => Value::test_string("str"),
-        };
-
-        let value = Value::test_record(record! {
-            "name" => Value::test_string("str"),
-            "age" => Value::test_string("i32"),
-            "address" => Value::test_record(address)
-        });
-
-        let schema = value_to_schema(&value, Span::unknown()).unwrap();
-        let expected = Schema::from_iter(vec![
-            Field::new("name", DataType::String),
-            Field::new("age", DataType::Int32),
-            Field::new(
-                "address",
-                DataType::Struct(vec![
-                    Field::new("street", DataType::String),
-                    Field::new("city", DataType::String),
-                ]),
-            ),
-        ]);
-        assert_eq!(schema, expected);
-    }
-
-    #[test]
-    fn test_dtype_str_to_schema_simple_types() {
-        let dtype = "bool";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::Boolean;
-        assert_eq!(schema, expected);
-
-        let dtype = "u8";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::UInt8;
-        assert_eq!(schema, expected);
-
-        let dtype = "u16";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::UInt16;
-        assert_eq!(schema, expected);
-
-        let dtype = "u32";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::UInt32;
-        assert_eq!(schema, expected);
-
-        let dtype = "u64";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::UInt64;
-        assert_eq!(schema, expected);
-
-        let dtype = "i8";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::Int8;
-        assert_eq!(schema, expected);
-
-        let dtype = "i16";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::Int16;
-        assert_eq!(schema, expected);
-
-        let dtype = "i32";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::Int32;
-        assert_eq!(schema, expected);
-
-        let dtype = "i64";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::Int64;
-        assert_eq!(schema, expected);
-
-        let dtype = "str";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::String;
-        assert_eq!(schema, expected);
-
-        let dtype = "binary";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::Binary;
-        assert_eq!(schema, expected);
-
-        let dtype = "date";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::Date;
-        assert_eq!(schema, expected);
-
-        let dtype = "time";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::Time;
-        assert_eq!(schema, expected);
-
-        let dtype = "null";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::Null;
-        assert_eq!(schema, expected);
-
-        let dtype = "unknown";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::Unknown;
-        assert_eq!(schema, expected);
-
-        let dtype = "object";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::Object("unknown", None);
-        assert_eq!(schema, expected);
-    }
-
-    #[test]
-    fn test_dtype_str_schema_datetime() {
-        let dtype = "datetime<ms, *>";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::Datetime(TimeUnit::Milliseconds, None);
-        assert_eq!(schema, expected);
-
-        let dtype = "datetime<us, *>";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::Datetime(TimeUnit::Microseconds, None);
-        assert_eq!(schema, expected);
-
-        let dtype = "datetime<μs, *>";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::Datetime(TimeUnit::Microseconds, None);
-        assert_eq!(schema, expected);
-
-        let dtype = "datetime<ns, *>";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::Datetime(TimeUnit::Nanoseconds, None);
-        assert_eq!(schema, expected);
-
-        let dtype = "datetime<ms, UTC>";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::Datetime(TimeUnit::Milliseconds, Some("UTC".into()));
-        assert_eq!(schema, expected);
-
-        let dtype = "invalid";
-        let schema = str_to_dtype(dtype, Span::unknown());
-        assert!(schema.is_err())
-    }
-
-    #[test]
-    fn test_dtype_str_schema_duration() {
-        let dtype = "duration<ms>";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::Duration(TimeUnit::Milliseconds);
-        assert_eq!(schema, expected);
-
-        let dtype = "duration<us>";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::Duration(TimeUnit::Microseconds);
-        assert_eq!(schema, expected);
-
-        let dtype = "duration<μs>";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::Duration(TimeUnit::Microseconds);
-        assert_eq!(schema, expected);
-
-        let dtype = "duration<ns>";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::Duration(TimeUnit::Nanoseconds);
-        assert_eq!(schema, expected);
-    }
-
-    #[test]
-    fn test_dtype_str_to_schema_list_types() {
-        let dtype = "list<i32>";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::List(Box::new(DataType::Int32));
-        assert_eq!(schema, expected);
-
-        let dtype = "list<duration<ms>>";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::List(Box::new(DataType::Duration(TimeUnit::Milliseconds)));
-        assert_eq!(schema, expected);
-
-        let dtype = "list<datetime<ms, *>>";
-        let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::List(Box::new(DataType::Datetime(TimeUnit::Milliseconds, None)));
-        assert_eq!(schema, expected);
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/values/nu_when/custom_value.rs b/crates/nu-cmd-dataframe/src/dataframe/values/nu_when/custom_value.rs
deleted file mode 100644
index e2b73bcef1..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/values/nu_when/custom_value.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-use super::NuWhen;
-use nu_protocol::{CustomValue, ShellError, Span, Value};
-
-// CustomValue implementation for NuDataFrame
-impl CustomValue for NuWhen {
-    fn typetag_name(&self) -> &'static str {
-        "when"
-    }
-
-    fn typetag_deserialize(&self) {
-        unimplemented!("typetag_deserialize")
-    }
-
-    fn clone_value(&self, span: nu_protocol::Span) -> Value {
-        let cloned = self.clone();
-
-        Value::custom(Box::new(cloned), span)
-    }
-
-    fn type_name(&self) -> String {
-        self.typetag_name().to_string()
-    }
-
-    fn to_base_value(&self, span: Span) -> Result<Value, ShellError> {
-        let val: String = match self {
-            NuWhen::Then(_) => "whenthen".into(),
-            NuWhen::ChainedThen(_) => "whenthenthen".into(),
-        };
-
-        let value = Value::string(val, span);
-        Ok(value)
-    }
-
-    fn as_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn as_mut_any(&mut self) -> &mut dyn std::any::Any {
-        self
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/values/nu_when/mod.rs b/crates/nu-cmd-dataframe/src/dataframe/values/nu_when/mod.rs
deleted file mode 100644
index b33cde7483..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/values/nu_when/mod.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-mod custom_value;
-
-use core::fmt;
-use nu_protocol::{ShellError, Span, Value};
-use polars::prelude::{col, when, ChainedThen, Then};
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
-
-#[derive(Clone)]
-pub enum NuWhen {
-    Then(Box<Then>),
-    ChainedThen(ChainedThen),
-}
-
-// Mocked serialization of the LazyFrame object
-impl Serialize for NuWhen {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        serializer.serialize_none()
-    }
-}
-
-// Mocked deserialization of the LazyFrame object
-impl<'de> Deserialize<'de> for NuWhen {
-    fn deserialize<D>(_deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        Ok(NuWhen::Then(Box::new(when(col("a")).then(col("b")))))
-    }
-}
-
-impl fmt::Debug for NuWhen {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "NuWhen")
-    }
-}
-
-impl From<Then> for NuWhen {
-    fn from(then: Then) -> Self {
-        NuWhen::Then(Box::new(then))
-    }
-}
-
-impl From<ChainedThen> for NuWhen {
-    fn from(chained_when: ChainedThen) -> Self {
-        NuWhen::ChainedThen(chained_when)
-    }
-}
-
-impl NuWhen {
-    pub fn into_value(self, span: Span) -> Value {
-        Value::custom(Box::new(self), span)
-    }
-
-    pub fn try_from_value(value: Value) -> Result<Self, ShellError> {
-        let span = value.span();
-        match value {
-            Value::Custom { val, .. } => match val.as_any().downcast_ref::<Self>() {
-                Some(expr) => Ok(expr.clone()),
-                None => Err(ShellError::CantConvert {
-                    to_type: "when expression".into(),
-                    from_type: "non when expression".into(),
-                    span,
-                    help: None,
-                }),
-            },
-            x => Err(ShellError::CantConvert {
-                to_type: "when expression".into(),
-                from_type: x.get_type().to_string(),
-                span: x.span(),
-                help: None,
-            }),
-        }
-    }
-}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/values/utils.rs b/crates/nu-cmd-dataframe/src/dataframe/values/utils.rs
deleted file mode 100644
index 0dc43399a3..0000000000
--- a/crates/nu-cmd-dataframe/src/dataframe/values/utils.rs
+++ /dev/null
@@ -1,86 +0,0 @@
-use nu_protocol::{ShellError, Span, Spanned, Value};
-
-// Default value used when selecting rows from dataframe
-pub const DEFAULT_ROWS: usize = 5;
-
-// Converts a Vec<Value> to a Vec<Spanned<String>> with a Span marking the whole
-// location of the columns for error referencing
-pub(crate) fn convert_columns(
-    columns: Vec<Value>,
-    span: Span,
-) -> Result<(Vec<Spanned<String>>, Span), ShellError> {
-    // First column span
-    let mut col_span = columns
-        .first()
-        .ok_or_else(|| ShellError::GenericError {
-            error: "Empty column list".into(),
-            msg: "Empty list found for command".into(),
-            span: Some(span),
-            help: None,
-            inner: vec![],
-        })
-        .map(|v| v.span())?;
-
-    let res = columns
-        .into_iter()
-        .map(|value| {
-            let span = value.span();
-            match value {
-                Value::String { val, .. } => {
-                    col_span = col_span.merge(span);
-                    Ok(Spanned { item: val, span })
-                }
-                _ => Err(ShellError::GenericError {
-                    error: "Incorrect column format".into(),
-                    msg: "Only string as column name".into(),
-                    span: Some(span),
-                    help: None,
-                    inner: vec![],
-                }),
-            }
-        })
-        .collect::<Result<Vec<Spanned<String>>, _>>()?;
-
-    Ok((res, col_span))
-}
-
-// Converts a Vec<Value> to a Vec<String> with a Span marking the whole
-// location of the columns for error referencing
-pub(crate) fn convert_columns_string(
-    columns: Vec<Value>,
-    span: Span,
-) -> Result<(Vec<String>, Span), ShellError> {
-    // First column span
-    let mut col_span = columns
-        .first()
-        .ok_or_else(|| ShellError::GenericError {
-            error: "Empty column list".into(),
-            msg: "Empty list found for command".into(),
-            span: Some(span),
-            help: None,
-            inner: vec![],
-        })
-        .map(|v| v.span())?;
-
-    let res = columns
-        .into_iter()
-        .map(|value| {
-            let span = value.span();
-            match value {
-                Value::String { val, .. } => {
-                    col_span = col_span.merge(span);
-                    Ok(val)
-                }
-                _ => Err(ShellError::GenericError {
-                    error: "Incorrect column format".into(),
-                    msg: "Only string as column name".into(),
-                    span: Some(span),
-                    help: None,
-                    inner: vec![],
-                }),
-            }
-        })
-        .collect::<Result<Vec<String>, _>>()?;
-
-    Ok((res, col_span))
-}
diff --git a/crates/nu-cmd-dataframe/src/lib.rs b/crates/nu-cmd-dataframe/src/lib.rs
deleted file mode 100644
index 7e7c8014c6..0000000000
--- a/crates/nu-cmd-dataframe/src/lib.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-#[cfg(feature = "dataframe")]
-pub mod dataframe;
-#[cfg(feature = "dataframe")]
-pub use dataframe::*;
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index 7592d4303b..abb89a6991 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -28,6 +28,5 @@ mimalloc = []
 which-support = []
 trash-support = []
 sqlite = []
-dataframe = []
 static-link-openssl = []
 system-clipboard = []
diff --git a/crates/nu-cmd-lang/README.md b/crates/nu-cmd-lang/README.md
index 836fabf6f8..6c7298c17a 100644
--- a/crates/nu-cmd-lang/README.md
+++ b/crates/nu-cmd-lang/README.md
@@ -8,7 +8,6 @@ top of including:
 
 * nu-command
 * nu-cli
-* nu-cmd-dataframe
 * nu-cmd-extra
 
 As time goes on and the nu language develops further in parallel with nushell we will be adding other command crates to the system.
diff --git a/crates/nu-cmd-lang/src/core_commands/version.rs b/crates/nu-cmd-lang/src/core_commands/version.rs
index 7aaa72b38a..22ef1f2a08 100644
--- a/crates/nu-cmd-lang/src/core_commands/version.rs
+++ b/crates/nu-cmd-lang/src/core_commands/version.rs
@@ -175,11 +175,6 @@ fn features_enabled() -> Vec<String> {
         names.push("sqlite".to_string());
     }
 
-    #[cfg(feature = "dataframe")]
-    {
-        names.push("dataframe".to_string());
-    }
-
     #[cfg(feature = "static-link-openssl")]
     {
         names.push("static-link-openssl".to_string());
diff --git a/crates/nu-command/tests/commands/open.rs b/crates/nu-command/tests/commands/open.rs
index f857718c72..ac5e2f99e5 100644
--- a/crates/nu-command/tests/commands/open.rs
+++ b/crates/nu-command/tests/commands/open.rs
@@ -238,22 +238,6 @@ fn parses_xml() {
     assert_eq!(actual.out, "https://www.jntrnr.com/off-to-new-adventures/")
 }
 
-#[cfg(feature = "dataframe")]
-#[test]
-fn parses_arrow_ipc() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        "
-            dfr open caco3_plastics.arrow
-            | dfr into-nu
-            | first
-            | get origin
-        "
-    ));
-
-    assert_eq!(actual.out, "SPAIN")
-}
-
 #[test]
 fn errors_if_file_not_found() {
     let actual = nu!(
diff --git a/crates/nu-command/tests/main.rs b/crates/nu-command/tests/main.rs
index 72ccee3d85..1039e1a0d7 100644
--- a/crates/nu-command/tests/main.rs
+++ b/crates/nu-command/tests/main.rs
@@ -151,9 +151,8 @@ fn commands_declare_input_output_types() {
         let sig_name = cmd.signature().name;
         let category = cmd.signature().category;
 
-        if matches!(category, Category::Removed | Category::Custom(_)) {
+        if matches!(category, Category::Removed) {
             // Deprecated/Removed commands don't have to conform
-            // TODO: also upgrade the `--features dataframe` commands
             continue;
         }
 
diff --git a/crates/nu-protocol/src/errors/shell_error.rs b/crates/nu-protocol/src/errors/shell_error.rs
index 81139d1a52..a8ca52142c 100644
--- a/crates/nu-protocol/src/errors/shell_error.rs
+++ b/crates/nu-protocol/src/errors/shell_error.rs
@@ -1042,19 +1042,6 @@ pub enum ShellError {
         span: Span,
     },
 
-    /// A custom value could not be converted to a Dataframe.
-    ///
-    /// ## Resolution
-    ///
-    /// Make sure conversion to a Dataframe is possible for this value or convert it to a type that does, first.
-    #[error("Casting error")]
-    #[diagnostic(code(nu::shell::downcast_not_possible))]
-    DowncastNotPossible {
-        msg: String,
-        #[label("{msg}")]
-        span: Span,
-    },
-
     /// The value given for this configuration is not supported.
     ///
     /// ## Resolution
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 99c95f33e4..df30c71c52 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -4,7 +4,7 @@ description = "Nushell dataframe plugin commands based on polars."
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_polars"
-repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-dataframe"
+repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_polars"
 version = "0.93.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/devdocs/PLATFORM_SUPPORT.md b/devdocs/PLATFORM_SUPPORT.md
index 46efdfbe5c..dd393ec897 100644
--- a/devdocs/PLATFORM_SUPPORT.md
+++ b/devdocs/PLATFORM_SUPPORT.md
@@ -33,12 +33,8 @@ We will try to provide builds for all of them but a standard configuration for x
 
 We have features of Nushell behind flags that can be passed at compilation time.
 
-The design focus of Nushell is primarily expressed by everything accessible without passing additional feature flag. This provides a standard command set and receives the most attention.
-
-One option feature flag is currently tested in CI but contains a feature that may be moved to a plugin:
-- `dataframe`
-    - This includes dataframe support via `polars` and `arrow2`. Introduces a significant additional compilation and binary size.
-    - Due to the use of SIMD extensions may not be compatible with every minimal architecture.
+The design focus of Nushell is primarily expressed by everything accessible without passing additional feature flag.
+This provides a standard command set and receives the most attention.
 
 ## Passively supported platforms
 
diff --git a/scripts/build-all-maclin.sh b/scripts/build-all-maclin.sh
index 5490695573..4658161874 100755
--- a/scripts/build-all-maclin.sh
+++ b/scripts/build-all-maclin.sh
@@ -6,7 +6,7 @@ DIR=$(readlink -f $(dirname "${BASH_SOURCE[0]}"))
 REPO_ROOT=$(dirname $DIR)
 
 echo "---------------------------------------------------------------"
-echo "Building nushell (nu) with dataframes and all the plugins"
+echo "Building nushell (nu) and all the plugins"
 echo "---------------------------------------------------------------"
 echo ""
 
@@ -21,7 +21,7 @@ NU_PLUGINS=(
 echo "Building nushell"
 (
     cd $REPO_ROOT
-    cargo build --features=dataframe --locked
+    cargo build --locked
 )
 
 for plugin in "${NU_PLUGINS[@]}"
diff --git a/scripts/build-all-windows.cmd b/scripts/build-all-windows.cmd
index 2619a294d0..b8a4c70ea2 100644
--- a/scripts/build-all-windows.cmd
+++ b/scripts/build-all-windows.cmd
@@ -1,11 +1,11 @@
 @echo off
 echo -------------------------------------------------------------------
-echo Building nushell (nu.exe) with dataframes and all the plugins
+echo Building nushell (nu.exe) and all the plugins
 echo -------------------------------------------------------------------
 echo.
 
 echo Building nushell.exe
-cargo build --features=dataframe --locked
+cargo build --locked
 echo.
 
 call :build crates\nu_plugin_example nu_plugin_example.exe
diff --git a/scripts/build-all.nu b/scripts/build-all.nu
index 2ad7ec467e..92fcc64635 100644
--- a/scripts/build-all.nu
+++ b/scripts/build-all.nu
@@ -1,7 +1,7 @@
 use std log warning
 
 print '-------------------------------------------------------------------'
-print 'Building nushell (nu) with dataframes and all the plugins'
+print 'Building nushell (nu) and all the plugins'
 print '-------------------------------------------------------------------'
 
 warning "./scripts/build-all.nu will be deprecated, please use the `toolkit build` command instead"
@@ -13,7 +13,7 @@ def build-nushell [] {
     print '----------------------------'
 
     cd $repo_root
-    cargo build --features=dataframe --locked
+    cargo build --locked
 }
 
 def build-plugin [] {
diff --git a/scripts/install-all.ps1 b/scripts/install-all.ps1
index 0569de4ad3..1dfc3b2dfd 100644
--- a/scripts/install-all.ps1
+++ b/scripts/install-all.ps1
@@ -2,13 +2,13 @@
 # Usage: Just run `powershell install-all.ps1` in nushell root directory
 
 Write-Output "-----------------------------------------------------------------"
-Write-Output "Installing nushell (nu) with dataframes and all the plugins"
+Write-Output "Installing nushell (nu) and all the plugins"
 Write-Output "-----------------------------------------------------------------"
 Write-Output ""
 
 Write-Output "Install nushell from local..."
 Write-Output "----------------------------------------------"
-cargo install --force --path . --features=dataframe --locked
+cargo install --force --path . --locked
 
 $NU_PLUGINS = @(
     'nu_plugin_example',
diff --git a/scripts/install-all.sh b/scripts/install-all.sh
index b53d53aa3b..b6c0f1fbfb 100755
--- a/scripts/install-all.sh
+++ b/scripts/install-all.sh
@@ -6,13 +6,13 @@ DIR=$(readlink -f $(dirname "${BASH_SOURCE[0]}"))
 REPO_ROOT=$(dirname $DIR)
 
 echo "-----------------------------------------------------------------"
-echo "Installing nushell (nu) with dataframes and all the plugins"
+echo "Installing nushell (nu) and all the plugins"
 echo "-----------------------------------------------------------------"
 echo ""
 
 echo "Install nushell from local..."
 echo "----------------------------------------------"
-cargo install --force --path "$REPO_ROOT" --features=dataframe --locked
+cargo install --force --path "$REPO_ROOT" --locked
 
 NU_PLUGINS=(
     'nu_plugin_inc'
diff --git a/src/main.rs b/src/main.rs
index d0fc023b68..bc48a9f7de 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -43,8 +43,6 @@ fn get_engine_state() -> EngineState {
     let engine_state = nu_cmd_plugin::add_plugin_command_context(engine_state);
     let engine_state = nu_command::add_shell_command_context(engine_state);
     let engine_state = nu_cmd_extra::add_extra_command_context(engine_state);
-    #[cfg(feature = "dataframe")]
-    let engine_state = nu_cmd_dataframe::add_dataframe_context(engine_state);
     let engine_state = nu_cli::add_cli_context(engine_state);
     nu_explore::add_explore_context(engine_state)
 }
diff --git a/toolkit.nu b/toolkit.nu
index 407998c514..6f19900fdb 100644
--- a/toolkit.nu
+++ b/toolkit.nu
@@ -514,7 +514,7 @@ export def "benchmark-and-log-result" [] {
 
     cargo export $"target/($current_branch)" -- bench
     ^$"./target/($current_branch)/benchmarks" compare -o -s 50 --dump $res_path
-}    
+}
 
 # Build all Windows archives and MSIs for release manually
 #
@@ -536,25 +536,14 @@ export def 'release-pkg windows' [
     mkdir $artifacts_dir
     for target in ["aarch64" "x86_64"] {
         $env.TARGET = $target ++ "-pc-windows-msvc"
-        for release_type in ["" full] {
-            $env.RELEASE_TYPE = $release_type
-            $env.TARGET_RUSTFLAGS = if $release_type == "full" {
-                "--features=dataframe"
-            } else {
-                ""
-            }
-            let out_filename = if $release_type == "full" {
-                $target ++ "-windows-msvc-full"
-            } else {
-                $target ++ "-pc-windows-msvc"
-            }
-            rm -rf output
-            _EXTRA_=bin nu .github/workflows/release-pkg.nu
-            cp $"output/nu-($version)-($out_filename).zip" $artifacts_dir
-            rm -rf output
-            _EXTRA_=msi nu .github/workflows/release-pkg.nu
-            cp $"target/wix/nu-($version)-($out_filename).msi" $artifacts_dir
-        }
+
+        rm -rf output
+        _EXTRA_=bin nu .github/workflows/release-pkg.nu
+        cp $"output/nu-($version)-($target)-pc-windows-msvc.zip" $artifacts_dir
+
+        rm -rf output
+        _EXTRA_=msi nu .github/workflows/release-pkg.nu
+        cp $"target/wix/nu-($version)-($target)-pc-windows-msvc.msi" $artifacts_dir
     }
 }
 

From 6e050f5634031c1bdcc5b79ab34e8ed9a69fd08e Mon Sep 17 00:00:00 2001
From: Reilly Wood <26268125+rgwood@users.noreply.github.com>
Date: Mon, 20 May 2024 13:03:21 -0700
Subject: [PATCH 0014/1072] `explore`: consolidate padding config, handle
 ByteStream, tweak naming+comments (#12915)

Some minor changes to `explore`, continuing on my mission to simplify
the command in preparation for a larger UX overhaul:

1. Consolidate padding configuration. I don't think we need separate
config points for the (optional) index column and regular data columns
in the normal pager, they can share padding configuration. Likewise, in
the binary viewer all 3 columns (index, data, ASCII) had their
left+right padding configured independently.
2. Update `explore` so we use the binary viewer for the new `ByteStream`
type. `cat foo.txt | into binary | explore` was not using the binary
viewer after the `ByteStream` changes.
3. Tweak the naming of a few helper functions, add a comment

I've put the changes in separate commits to make them easier to review.

---------

Co-authored-by: Stefan Holderbach <sholderbach@users.noreply.github.com>
---
 crates/nu-explore/src/commands/table.rs       | 12 ---
 crates/nu-explore/src/lib.rs                  | 14 ++-
 .../src/views/binary/binary_widget.rs         | 75 ++++++---------
 crates/nu-explore/src/views/binary/mod.rs     | 17 +---
 crates/nu-explore/src/views/record/mod.rs     | 26 ++---
 crates/nu-explore/src/views/record/tablew.rs  | 96 ++++++++++---------
 6 files changed, 98 insertions(+), 142 deletions(-)

diff --git a/crates/nu-explore/src/commands/table.rs b/crates/nu-explore/src/commands/table.rs
index 7b778a8971..39ef8f0f99 100644
--- a/crates/nu-explore/src/commands/table.rs
+++ b/crates/nu-explore/src/commands/table.rs
@@ -25,8 +25,6 @@ struct TableSettings {
     selected_column_s: Option<Style>,
     padding_column_left: Option<usize>,
     padding_column_right: Option<usize>,
-    padding_index_left: Option<usize>,
-    padding_index_right: Option<usize>,
     turn_on_cursor_mode: bool,
 }
 
@@ -102,16 +100,6 @@ impl ViewCommand for TableCmd {
             view.set_padding_column((c.0, p))
         }
 
-        if let Some(p) = self.settings.padding_index_left {
-            let c = view.get_padding_index();
-            view.set_padding_index((p, c.1))
-        }
-
-        if let Some(p) = self.settings.padding_index_right {
-            let c = view.get_padding_index();
-            view.set_padding_index((c.0, p))
-        }
-
         if self.settings.turn_on_cursor_mode {
             view.set_cursor_mode();
         }
diff --git a/crates/nu-explore/src/lib.rs b/crates/nu-explore/src/lib.rs
index f339f006ee..0f5f9a1619 100644
--- a/crates/nu-explore/src/lib.rs
+++ b/crates/nu-explore/src/lib.rs
@@ -35,13 +35,16 @@ fn run_pager(
     let commands = create_command_registry();
 
     let is_record = matches!(input, PipelineData::Value(Value::Record { .. }, ..));
-    let is_binary = matches!(input, PipelineData::Value(Value::Binary { .. }, ..));
+    let is_binary = matches!(
+        input,
+        PipelineData::Value(Value::Binary { .. }, ..) | PipelineData::ByteStream(..)
+    );
 
     if is_binary {
         p.show_message("For help type :help");
 
-        let view = binary_view(input);
-        return p.run(engine_state, stack, ctrlc, view, commands);
+        let view = binary_view(input)?;
+        return p.run(engine_state, stack, ctrlc, Some(view), commands);
     }
 
     let (columns, data) = collect_pipeline(input)?;
@@ -88,15 +91,16 @@ fn help_view() -> Option<Page> {
     Some(Page::new(HelpCmd::view(), false))
 }
 
-fn binary_view(input: PipelineData) -> Option<Page> {
+fn binary_view(input: PipelineData) -> Result<Page> {
     let data = match input {
         PipelineData::Value(Value::Binary { val, .. }, _) => val,
+        PipelineData::ByteStream(bs, _) => bs.into_bytes()?,
         _ => unreachable!("checked beforehand"),
     };
 
     let view = BinaryView::new(data);
 
-    Some(Page::new(view, true))
+    Ok(Page::new(view, true))
 }
 
 fn create_command_registry() -> CommandRegistry {
diff --git a/crates/nu-explore/src/views/binary/binary_widget.rs b/crates/nu-explore/src/views/binary/binary_widget.rs
index 39d6e3f547..bee4e9d854 100644
--- a/crates/nu-explore/src/views/binary/binary_widget.rs
+++ b/crates/nu-explore/src/views/binary/binary_widget.rs
@@ -12,6 +12,9 @@ use crate::{
     views::util::{nu_style_to_tui, text_style_to_tui_style},
 };
 
+/// Padding between segments in the hex view
+const SEGMENT_PADDING: u16 = 1;
+
 #[derive(Debug, Clone)]
 pub struct BinaryWidget<'a> {
     data: &'a [u8],
@@ -70,45 +73,27 @@ impl BinarySettings {
 #[derive(Debug, Default, Clone)]
 pub struct BinaryStyle {
     color_index: Option<NuStyle>,
-    indent_index: Indent,
-    indent_data: Indent,
-    indent_ascii: Indent,
-    indent_segment: usize,
+    column_padding_left: u16,
+    column_padding_right: u16,
     show_split: bool,
 }
 
 impl BinaryStyle {
     pub fn new(
         color_index: Option<NuStyle>,
-        indent_index: Indent,
-        indent_data: Indent,
-        indent_ascii: Indent,
-        indent_segment: usize,
+        column_padding_left: u16,
+        column_padding_right: u16,
         show_split: bool,
     ) -> Self {
         Self {
             color_index,
-            indent_index,
-            indent_data,
-            indent_ascii,
-            indent_segment,
+            column_padding_left,
+            column_padding_right,
             show_split,
         }
     }
 }
 
-#[derive(Debug, Default, Clone)]
-pub struct Indent {
-    left: u16,
-    right: u16,
-}
-
-impl Indent {
-    pub fn new(left: u16, right: u16) -> Self {
-        Self { left, right }
-    }
-}
-
 impl Widget for BinaryWidget<'_> {
     fn render(self, area: Rect, buf: &mut Buffer) {
         let min_width = get_widget_width(&self);
@@ -153,9 +138,9 @@ fn render_hexdump(area: Rect, buf: &mut Buffer, w: BinaryWidget) {
         let line = &w.data[start_index..];
 
         if show_index {
-            x += render_space(buf, x, y, 1, w.style.indent_index.left);
+            x += render_space(buf, x, y, 1, w.style.column_padding_left);
             x += render_hex_usize(buf, x, y, address, index_width, get_index_style(&w));
-            x += render_space(buf, x, y, 1, w.style.indent_index.right);
+            x += render_space(buf, x, y, 1, w.style.column_padding_right);
         }
 
         if show_split {
@@ -163,9 +148,9 @@ fn render_hexdump(area: Rect, buf: &mut Buffer, w: BinaryWidget) {
         }
 
         if show_data {
-            x += render_space(buf, x, y, 1, w.style.indent_data.left);
+            x += render_space(buf, x, y, 1, w.style.column_padding_left);
             x += render_data_line(buf, x, y, line, &w);
-            x += render_space(buf, x, y, 1, w.style.indent_data.right);
+            x += render_space(buf, x, y, 1, w.style.column_padding_right);
         }
 
         if show_split {
@@ -173,9 +158,9 @@ fn render_hexdump(area: Rect, buf: &mut Buffer, w: BinaryWidget) {
         }
 
         if show_ascii {
-            x += render_space(buf, x, y, 1, w.style.indent_ascii.left);
+            x += render_space(buf, x, y, 1, w.style.column_padding_left);
             x += render_ascii_line(buf, x, y, line, &w);
-            render_space(buf, x, y, 1, w.style.indent_ascii.right);
+            render_space(buf, x, y, 1, w.style.column_padding_right);
         }
     }
 
@@ -193,9 +178,9 @@ fn render_hexdump(area: Rect, buf: &mut Buffer, w: BinaryWidget) {
             let y = line;
 
             if show_index {
-                x += render_space(buf, x, y, 1, w.style.indent_index.left);
+                x += render_space(buf, x, y, 1, w.style.column_padding_left);
                 x += render_hex_usize(buf, x, y, address, index_width, get_index_style(&w));
-                x += render_space(buf, x, y, 1, w.style.indent_index.right);
+                x += render_space(buf, x, y, 1, w.style.column_padding_right);
             }
 
             if show_split {
@@ -203,9 +188,9 @@ fn render_hexdump(area: Rect, buf: &mut Buffer, w: BinaryWidget) {
             }
 
             if show_data {
-                x += render_space(buf, x, y, 1, w.style.indent_data.left);
+                x += render_space(buf, x, y, 1, w.style.column_padding_left);
                 x += render_space(buf, x, y, 1, data_line_size);
-                x += render_space(buf, x, y, 1, w.style.indent_data.right);
+                x += render_space(buf, x, y, 1, w.style.column_padding_right);
             }
 
             if show_split {
@@ -213,9 +198,9 @@ fn render_hexdump(area: Rect, buf: &mut Buffer, w: BinaryWidget) {
             }
 
             if show_ascii {
-                x += render_space(buf, x, y, 1, w.style.indent_ascii.left);
+                x += render_space(buf, x, y, 1, w.style.column_padding_left);
                 x += render_space(buf, x, y, 1, ascii_line_size);
-                render_space(buf, x, y, 1, w.style.indent_ascii.right);
+                render_space(buf, x, y, 1, w.style.column_padding_right);
             }
         }
     }
@@ -232,13 +217,13 @@ fn render_data_line(buf: &mut Buffer, x: u16, y: u16, line: &[u8], w: &BinaryWid
 
     while count != count_max && count * segment_size < line.len() {
         let data = &line[count * segment_size..];
-        size += render_space(buf, x + size, y, 1, w.style.indent_segment as u16);
+        size += render_space(buf, x + size, y, 1, SEGMENT_PADDING);
         size += render_segment(buf, x + size, y, data, w);
         count += 1;
     }
 
     while count != count_max {
-        size += render_space(buf, x + size, y, 1, w.style.indent_segment as u16);
+        size += render_space(buf, x + size, y, 1, SEGMENT_PADDING);
         size += render_space(buf, x + size, y, 1, w.opts.segment_size as u16 * 2);
         count += 1;
     }
@@ -398,7 +383,7 @@ fn get_widget_width(w: &BinaryWidget) -> usize {
     let index_size = usize_to_hex(max_index, 0).len();
     let index_size = index_size.max(MIN_INDEX_SIZE);
 
-    let data_split_size = w.opts.count_segments.saturating_sub(1) * w.style.indent_segment;
+    let data_split_size = w.opts.count_segments.saturating_sub(1) * (SEGMENT_PADDING as usize);
     let data_size = line_size + data_split_size;
 
     let ascii_size = w.opts.count_segments * w.opts.segment_size;
@@ -406,17 +391,17 @@ fn get_widget_width(w: &BinaryWidget) -> usize {
     let split = w.style.show_split as usize;
     #[allow(clippy::identity_op)]
     let min_width = 0
-        + w.style.indent_index.left as usize
+        + w.style.column_padding_left as usize
         + index_size
-        + w.style.indent_index.right as usize
+        + w.style.column_padding_right as usize
         + split
-        + w.style.indent_data.left as usize
+        + w.style.column_padding_left as usize
         + data_size
-        + w.style.indent_data.right as usize
+        + w.style.column_padding_right as usize
         + split
-        + w.style.indent_ascii.left as usize
+        + w.style.column_padding_left as usize
         + ascii_size
-        + w.style.indent_ascii.right as usize;
+        + w.style.column_padding_right as usize;
 
     min_width
 }
diff --git a/crates/nu-explore/src/views/binary/mod.rs b/crates/nu-explore/src/views/binary/mod.rs
index cb4bfd9c58..31ea0d6eaf 100644
--- a/crates/nu-explore/src/views/binary/mod.rs
+++ b/crates/nu-explore/src/views/binary/mod.rs
@@ -19,7 +19,7 @@ use crate::{
     util::create_map,
 };
 
-use self::binary_widget::{BinarySettings, BinaryStyle, BinaryWidget, Indent};
+use self::binary_widget::{BinarySettings, BinaryStyle, BinaryWidget};
 
 use super::{cursor::XYCursor, Layout, View, ViewConfig};
 
@@ -193,19 +193,8 @@ fn settings_from_config(config: &ConfigMap) -> Settings {
         ),
         style: BinaryStyle::new(
             colors.get("color_index").cloned(),
-            Indent::new(
-                config_get_usize(config, "padding_index_left", 2) as u16,
-                config_get_usize(config, "padding_index_right", 2) as u16,
-            ),
-            Indent::new(
-                config_get_usize(config, "padding_data_left", 2) as u16,
-                config_get_usize(config, "padding_data_right", 2) as u16,
-            ),
-            Indent::new(
-                config_get_usize(config, "padding_ascii_left", 2) as u16,
-                config_get_usize(config, "padding_ascii_right", 2) as u16,
-            ),
-            config_get_usize(config, "padding_segment", 1),
+            config_get_usize(config, "column_padding_left", 1) as u16,
+            config_get_usize(config, "column_padding_right", 1) as u16,
             config_get_bool(config, "split", false),
         ),
     }
diff --git a/crates/nu-explore/src/views/record/mod.rs b/crates/nu-explore/src/views/record/mod.rs
index 0ed8e3e761..2ad3140bf4 100644
--- a/crates/nu-explore/src/views/record/mod.rs
+++ b/crates/nu-explore/src/views/record/mod.rs
@@ -71,26 +71,14 @@ impl<'a> RecordView<'a> {
     }
 
     pub fn set_padding_column(&mut self, (left, right): (usize, usize)) {
-        self.theme.table.padding_column_left = left;
-        self.theme.table.padding_column_right = right;
-    }
-
-    pub fn set_padding_index(&mut self, (left, right): (usize, usize)) {
-        self.theme.table.padding_index_left = left;
-        self.theme.table.padding_index_right = right;
+        self.theme.table.column_padding_left = left;
+        self.theme.table.column_padding_right = right;
     }
 
     pub fn get_padding_column(&self) -> (usize, usize) {
         (
-            self.theme.table.padding_column_left,
-            self.theme.table.padding_column_right,
-        )
-    }
-
-    pub fn get_padding_index(&self) -> (usize, usize) {
-        (
-            self.theme.table.padding_index_left,
-            self.theme.table.padding_index_right,
+            self.theme.table.column_padding_left,
+            self.theme.table.column_padding_right,
         )
     }
 
@@ -853,10 +841,8 @@ fn theme_from_config(config: &ConfigMap) -> TableTheme {
     theme.table.show_header = config_get_bool(config, "show_head", true);
     theme.table.show_index = config_get_bool(config, "show_index", false);
 
-    theme.table.padding_index_left = config_get_usize(config, "padding_index_left", 2);
-    theme.table.padding_index_right = config_get_usize(config, "padding_index_right", 1);
-    theme.table.padding_column_left = config_get_usize(config, "padding_column_left", 2);
-    theme.table.padding_column_right = config_get_usize(config, "padding_column_right", 2);
+    theme.table.column_padding_left = config_get_usize(config, "column_padding_left", 1);
+    theme.table.column_padding_right = config_get_usize(config, "column_padding_right", 1);
 
     theme
 }
diff --git a/crates/nu-explore/src/views/record/tablew.rs b/crates/nu-explore/src/views/record/tablew.rs
index d43a7943f6..b4b4fe4514 100644
--- a/crates/nu-explore/src/views/record/tablew.rs
+++ b/crates/nu-explore/src/views/record/tablew.rs
@@ -41,10 +41,8 @@ pub struct TableStyle {
     pub shift_line_style: NuStyle,
     pub show_index: bool,
     pub show_header: bool,
-    pub padding_index_left: usize,
-    pub padding_index_right: usize,
-    pub padding_column_left: usize,
-    pub padding_column_right: usize,
+    pub column_padding_left: usize,
+    pub column_padding_right: usize,
 }
 
 impl<'a> TableW<'a> {
@@ -103,10 +101,8 @@ impl StatefulWidget for TableW<'_> {
 // todo: refactoring these to methods as they have quite a bit in common.
 impl<'a> TableW<'a> {
     fn render_table_horizontal(self, area: Rect, buf: &mut Buffer, state: &mut TableWState) {
-        let padding_cell_l = self.style.padding_column_left as u16;
-        let padding_cell_r = self.style.padding_column_right as u16;
-        let padding_index_l = self.style.padding_index_left as u16;
-        let padding_index_r = self.style.padding_index_right as u16;
+        let padding_l = self.style.column_padding_left as u16;
+        let padding_r = self.style.column_padding_right as u16;
 
         let show_index = self.style.show_index;
         let show_head = self.style.show_header;
@@ -153,11 +149,11 @@ impl<'a> TableW<'a> {
                 area,
                 self.style_computer,
                 self.index_row,
-                padding_index_l,
-                padding_index_r,
+                padding_l,
+                padding_r,
             );
 
-            width += render_vertical(
+            width += render_vertical_line_with_split(
                 buf,
                 width,
                 data_y,
@@ -193,7 +189,7 @@ impl<'a> TableW<'a> {
                 let is_last = col + 1 == self.columns.len();
                 let space = area.width - width;
 
-                let pad = padding_cell_l + padding_cell_r;
+                let pad = padding_l + padding_r;
                 let head = show_head.then_some(&mut head);
                 let (w, ok, shift) =
                     truncate_column_width(space, 1, use_space, pad, is_last, &mut column, head);
@@ -216,20 +212,20 @@ impl<'a> TableW<'a> {
                 }
 
                 let mut w = width;
-                w += render_space(buf, w, head_y, 1, padding_cell_l);
+                w += render_space(buf, w, head_y, 1, padding_l);
                 w += render_column(buf, w, head_y, use_space, &header);
-                w += render_space(buf, w, head_y, 1, padding_cell_r);
+                w += render_space(buf, w, head_y, 1, padding_r);
 
-                let x = w - padding_cell_r - use_space;
+                let x = w - padding_r - use_space;
                 state.layout.push(&header[0].0, x, head_y, use_space, 1);
             }
 
-            width += render_space(buf, width, data_y, data_height, padding_cell_l);
+            width += render_space(buf, width, data_y, data_height, padding_l);
             width += render_column(buf, width, data_y, use_space, &column);
-            width += render_space(buf, width, data_y, data_height, padding_cell_r);
+            width += render_space(buf, width, data_y, data_height, padding_r);
 
             for (row, (text, _)) in column.iter().enumerate() {
-                let x = width - padding_cell_r - use_space;
+                let x = width - padding_r - use_space;
                 let y = data_y + row as u16;
                 state.layout.push(text, x, y, use_space, 1);
             }
@@ -242,13 +238,13 @@ impl<'a> TableW<'a> {
         }
 
         if do_render_shift_column && show_head {
-            width += render_space(buf, width, data_y, data_height, padding_cell_l);
+            width += render_space(buf, width, data_y, data_height, padding_l);
             width += render_shift_column(buf, width, head_y, 1, shift_column_s);
-            width += render_space(buf, width, data_y, data_height, padding_cell_r);
+            width += render_space(buf, width, data_y, data_height, padding_r);
         }
 
         if width < area.width {
-            width += render_vertical(
+            width += render_vertical_line_with_split(
                 buf,
                 width,
                 data_y,
@@ -273,10 +269,8 @@ impl<'a> TableW<'a> {
             return;
         }
 
-        let padding_cell_l = self.style.padding_column_left as u16;
-        let padding_cell_r = self.style.padding_column_right as u16;
-        let padding_index_l = self.style.padding_index_left as u16;
-        let padding_index_r = self.style.padding_index_right as u16;
+        let padding_l = self.style.column_padding_left as u16;
+        let padding_r = self.style.column_padding_right as u16;
 
         let show_index = self.style.show_index;
         let show_head = self.style.show_header;
@@ -292,11 +286,11 @@ impl<'a> TableW<'a> {
                 area,
                 self.style_computer,
                 self.index_row,
-                padding_index_l,
-                padding_index_r,
+                padding_l,
+                padding_r,
             );
 
-            left_w += render_vertical(
+            left_w += render_vertical_line_with_split(
                 buf,
                 area.x + left_w,
                 area.y,
@@ -316,7 +310,7 @@ impl<'a> TableW<'a> {
             let columns_width = columns.iter().map(|s| string_width(s)).max().unwrap_or(0);
 
             let will_use_space =
-                padding_cell_l as usize + padding_cell_r as usize + columns_width + left_w as usize;
+                padding_l as usize + padding_r as usize + columns_width + left_w as usize;
             if will_use_space > area.width as usize {
                 return;
             }
@@ -328,24 +322,32 @@ impl<'a> TableW<'a> {
 
             if !show_index {
                 let x = area.x + left_w;
-                left_w += render_vertical(buf, x, area.y, area.height, false, false, splitline_s);
+                left_w += render_vertical_line_with_split(
+                    buf,
+                    x,
+                    area.y,
+                    area.height,
+                    false,
+                    false,
+                    splitline_s,
+                );
             }
 
             let x = area.x + left_w;
-            left_w += render_space(buf, x, area.y, 1, padding_cell_l);
+            left_w += render_space(buf, x, area.y, 1, padding_l);
             let x = area.x + left_w;
             left_w += render_column(buf, x, area.y, columns_width as u16, &columns);
             let x = area.x + left_w;
-            left_w += render_space(buf, x, area.y, 1, padding_cell_r);
+            left_w += render_space(buf, x, area.y, 1, padding_r);
 
-            let layout_x = left_w - padding_cell_r - columns_width as u16;
+            let layout_x = left_w - padding_r - columns_width as u16;
             for (i, (text, _)) in columns.iter().enumerate() {
                 state
                     .layout
                     .push(text, layout_x, area.y + i as u16, columns_width as u16, 1);
             }
 
-            left_w += render_vertical(
+            left_w += render_vertical_line_with_split(
                 buf,
                 area.x + left_w,
                 area.y,
@@ -372,7 +374,7 @@ impl<'a> TableW<'a> {
             let column_width = column_width as u16;
             let available = area.width - left_w;
             let is_last = col + 1 == self.data.len();
-            let pad = padding_cell_l + padding_cell_r;
+            let pad = padding_l + padding_r;
             let (column_width, ok, shift) =
                 truncate_column_width(available, 1, column_width, pad, is_last, &mut column, None);
 
@@ -385,15 +387,15 @@ impl<'a> TableW<'a> {
             }
 
             let x = area.x + left_w;
-            left_w += render_space(buf, x, area.y, area.height, padding_cell_l);
+            left_w += render_space(buf, x, area.y, area.height, padding_l);
             let x = area.x + left_w;
             left_w += render_column(buf, x, area.y, column_width, &column);
             let x = area.x + left_w;
-            left_w += render_space(buf, x, area.y, area.height, padding_cell_r);
+            left_w += render_space(buf, x, area.y, area.height, padding_r);
 
             {
                 for (row, (text, _)) in column.iter().enumerate() {
-                    let x = left_w - padding_cell_r - column_width;
+                    let x = left_w - padding_r - column_width;
                     let y = area.y + row as u16;
                     state.layout.push(text, x, y, column_width, 1);
                 }
@@ -408,11 +410,11 @@ impl<'a> TableW<'a> {
 
         if do_render_shift_column {
             let x = area.x + left_w;
-            left_w += render_space(buf, x, area.y, area.height, padding_cell_l);
+            left_w += render_space(buf, x, area.y, area.height, padding_l);
             let x = area.x + left_w;
             left_w += render_shift_column(buf, x, area.y, area.height, shift_column_s);
             let x = area.x + left_w;
-            left_w += render_space(buf, x, area.y, area.height, padding_cell_r);
+            left_w += render_space(buf, x, area.y, area.height, padding_r);
         }
 
         _ = left_w;
@@ -561,7 +563,7 @@ fn render_index(
     width
 }
 
-fn render_vertical(
+fn render_vertical_line_with_split(
     buf: &mut Buffer,
     x: u16,
     y: u16,
@@ -570,7 +572,7 @@ fn render_vertical(
     bottom_slit: bool,
     style: NuStyle,
 ) -> u16 {
-    render_vertical_split(buf, x, y, height, style);
+    render_vertical_line(buf, x, y, height, style);
 
     if top_slit && y > 0 {
         render_top_connector(buf, x, y - 1, style);
@@ -583,7 +585,7 @@ fn render_vertical(
     1
 }
 
-fn render_vertical_split(buf: &mut Buffer, x: u16, y: u16, height: u16, style: NuStyle) {
+fn render_vertical_line(buf: &mut Buffer, x: u16, y: u16, height: u16, style: NuStyle) {
     let style = TextStyle {
         alignment: Alignment::Left,
         color_style: Some(style),
@@ -615,10 +617,12 @@ fn create_column(data: &[Vec<NuText>], col: usize) -> Vec<NuText> {
     column
 }
 
+/// Starting at cell [x, y]: paint `width` characters of `c` (left to right), move 1 row down, repeat
+/// Repeat this `height` times
 fn repeat_vertical(
     buf: &mut ratatui::buffer::Buffer,
-    x_offset: u16,
-    y_offset: u16,
+    x: u16,
+    y: u16,
     width: u16,
     height: u16,
     c: char,
@@ -631,7 +635,7 @@ fn repeat_vertical(
     let span = Span::styled(text, style);
 
     for row in 0..height {
-        buf.set_span(x_offset, y_offset + row, &span, width);
+        buf.set_span(x, y + row, &span, width);
     }
 }
 

From db37bead643ae3c0b7b6dd3942f3eb6e80b8f4d2 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Tue, 21 May 2024 03:09:28 +0200
Subject: [PATCH 0015/1072] Remove unused dependencies (#12917)

- **Remove unused `pathdiff` dep in `nu-cli`**
- **Remove unused `serde_json` dep on `nu-protocol`**
- Unnecessary after moving the plugin file to msgpack (still a
dev-dependency)
---
 Cargo.lock                    | 1 -
 crates/nu-cli/Cargo.toml      | 1 -
 crates/nu-protocol/Cargo.toml | 2 --
 3 files changed, 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fb792cbd2a..38d640ab5f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2846,7 +2846,6 @@ dependencies = [
  "nu-test-support",
  "nu-utils",
  "once_cell",
- "pathdiff",
  "percent-encoding",
  "reedline",
  "rstest",
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index e631f7ccf6..d9cd728f19 100644
--- a/crates/nu-cli/Cargo.toml
+++ b/crates/nu-cli/Cargo.toml
@@ -39,7 +39,6 @@ miette = { workspace = true, features = ["fancy-no-backtrace"] }
 lscolors = { workspace = true, default-features = false, features = ["nu-ansi-term"] }
 once_cell = { workspace = true }
 percent-encoding = { workspace = true }
-pathdiff = { workspace = true }
 sysinfo = { workspace = true }
 unicode-segmentation = { workspace = true }
 uuid = { workspace = true, features = ["v4"] }
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index ae04c20ddb..84e76b3f5a 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -28,7 +28,6 @@ miette = { workspace = true, features = ["fancy-no-backtrace"] }
 num-format = { workspace = true }
 rmp-serde = { workspace = true, optional = true }
 serde = { workspace = true, default-features = false }
-serde_json = { workspace = true, optional = true }
 thiserror = "1.0"
 typetag = "0.2"
 os_pipe = { workspace = true, features = ["io_safety"] }
@@ -40,7 +39,6 @@ nix = { workspace = true, default-features = false, features = ["signal"] }
 plugin = [
   "brotli",
   "rmp-serde",
-  "serde_json",
 ]
 
 [dev-dependencies]

From 1cdc39bc2a616fde4c2b58b45893653517725643 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Mon, 20 May 2024 22:47:24 -0700
Subject: [PATCH 0016/1072] Update mimalloc to 0.1.42 (#12919)

# Description

This update fixes mimalloc for NetBSD

# Tests + Formatting

Tests are passing just fine
---
 Cargo.lock | 10 +++++-----
 Cargo.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 38d640ab5f..59948fbc51 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -377,7 +377,7 @@ dependencies = [
  "bitflags 2.5.0",
  "cexpr",
  "clang-sys",
- "itertools 0.11.0",
+ "itertools 0.12.1",
  "lazy_static",
  "lazycell",
  "proc-macro2",
@@ -2326,9 +2326,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 
 [[package]]
 name = "libmimalloc-sys"
-version = "0.1.37"
+version = "0.1.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81eb4061c0582dedea1cbc7aff2240300dd6982e0239d1c99e65c1dbf4a30ba7"
+checksum = "0e7bb23d733dfcc8af652a78b7bf232f0e967710d044732185e561e47c0336b6"
 dependencies = [
  "cc",
  "libc",
@@ -2582,9 +2582,9 @@ dependencies = [
 
 [[package]]
 name = "mimalloc"
-version = "0.1.41"
+version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f41a2280ded0da56c8cf898babb86e8f10651a34adcfff190ae9a1159c6908d"
+checksum = "e9186d86b79b52f4a77af65604b51225e8db1d6ee7e3f41aec1e40829c71a176"
 dependencies = [
  "libmimalloc-sys",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index afc31383f9..665fd21747 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -197,7 +197,7 @@ crossterm = { workspace = true }
 ctrlc = { workspace = true }
 log = { workspace = true }
 miette = { workspace = true, features = ["fancy-no-backtrace", "fancy"] }
-mimalloc = { version = "0.1.37", default-features = false, optional = true }
+mimalloc = { version = "0.1.42", default-features = false, optional = true }
 serde_json = { workspace = true }
 simplelog = "0.12"
 time = "0.3"

From f83439fdda33975f803dca653b08c9210d83826c Mon Sep 17 00:00:00 2001
From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Tue, 21 May 2024 11:31:14 -0400
Subject: [PATCH 0017/1072] Add completer for std help (#12929)

# Description

While each of the `help <subcommands>` in `std` had completers, there
wasn't one for the main `help` command.

This adds all internals and custom commands (as with `help commands`) as
possible completions.

# User-Facing Changes

`help ` + <kbd>Tab</kbd> will now suggest completions for both the `help
<subcommands>` as well as all internal and custom commands.

# Tests + Formatting

Note: Cannot add tests for completion functions since they are
module-internal and not visible to test cases, that I can see.

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
---
 crates/nu-std/std/help.nu | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/crates/nu-std/std/help.nu b/crates/nu-std/std/help.nu
index 4e08597691..20a672dd90 100644
--- a/crates/nu-std/std/help.nu
+++ b/crates/nu-std/std/help.nu
@@ -93,6 +93,18 @@ def "nu-complete list-commands" [] {
     scope commands | select name usage | rename value description
 }
 
+def "nu-complete main-help" [] {
+    [
+        { value: "commands", description: "Show help on Nushell commands." }
+        { value: "aliases", description: "Show help on Nushell aliases." }
+        { value: "modules", description: "Show help on Nushell modules." }
+        { value: "externs", description: "Show help on Nushell externs." }
+        { value: "operators", description: "Show help on Nushell operators." }
+        { value: "escapes", description: "Show help on Nushell string escapes." }
+    ]
+    | append (nu-complete list-commands)
+}
+
 def "nu-complete list-externs" [] {
     scope commands | where is_extern | select name usage | rename value description
 }
@@ -720,7 +732,7 @@ def pretty-cmd [] {
 #   search for string in command names, usage and search terms
 #   > help --find char
 export def main [
-    ...item: string  # the name of the help item to get help on
+    ...item: string@"nu-complete main-help"  # the name of the help item to get help on
     --find (-f): string  # string to find in help items names and usage
 ] {
     if ($item | is-empty) and ($find | is-empty) {

From 3cf150727c0491ede29f0902bfbd0d410a589184 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 11:22:02 +0800
Subject: [PATCH 0018/1072] Bump actions/checkout from 4.1.5 to 4.1.6 (#12934)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.5
to 4.1.6.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/actions/checkout/releases">actions/checkout's
releases</a>.</em></p>
<blockquote>
<h2>v4.1.6</h2>
<h2>What's Changed</h2>
<ul>
<li>Check platform to set archive extension appropriately by <a
href="https://github.com/cory-miller"><code>@​cory-miller</code></a> in
<a
href="https://redirect.github.com/actions/checkout/pull/1732">actions/checkout#1732</a></li>
<li>Update for 4.1.6 release by <a
href="https://github.com/cory-miller"><code>@​cory-miller</code></a> in
<a
href="https://redirect.github.com/actions/checkout/pull/1733">actions/checkout#1733</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/actions/checkout/compare/v4.1.5...v4.1.6">https://github.com/actions/checkout/compare/v4.1.5...v4.1.6</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/actions/checkout/blob/main/CHANGELOG.md">actions/checkout's
changelog</a>.</em></p>
<blockquote>
<h2>v4.1.6</h2>
<ul>
<li>Check platform to set archive extension appropriately by <a
href="https://github.com/cory-miller"><code>@​cory-miller</code></a> in
<a
href="https://redirect.github.com/actions/checkout/pull/1732">actions/checkout#1732</a></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/actions/checkout/commit/a5ac7e51b41094c92402da3b24376905380afc29"><code>a5ac7e5</code></a>
Update for 4.1.6 release (<a
href="https://redirect.github.com/actions/checkout/issues/1733">#1733</a>)</li>
<li><a
href="https://github.com/actions/checkout/commit/24ed1a352802348c9e4e8d13de9177fb95b537ba"><code>24ed1a3</code></a>
Check platform for extension (<a
href="https://redirect.github.com/actions/checkout/issues/1732">#1732</a>)</li>
<li>See full diff in <a
href="https://github.com/actions/checkout/compare/v4.1.5...v4.1.6">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/checkout&package-manager=github_actions&previous-version=4.1.5&new-version=4.1.6)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/audit.yml         | 2 +-
 .github/workflows/ci.yml            | 8 ++++----
 .github/workflows/nightly-build.yml | 6 +++---
 .github/workflows/release.yml       | 2 +-
 .github/workflows/typos.yml         | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
index e8a7f55817..a0295b3b4d 100644
--- a/.github/workflows/audit.yml
+++ b/.github/workflows/audit.yml
@@ -19,7 +19,7 @@ jobs:
     # Prevent sudden announcement of a new advisory from failing ci:
     continue-on-error: true
     steps:
-      - uses: actions/checkout@v4.1.5
+      - uses: actions/checkout@v4.1.6
       - uses: rustsec/audit-check@v1.4.1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3acdfa71d1..9cb92b0902 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
     runs-on: ${{ matrix.platform }}
 
     steps:
-      - uses: actions/checkout@v4.1.5
+      - uses: actions/checkout@v4.1.6
 
       - name: Setup Rust toolchain and cache
         uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
@@ -66,7 +66,7 @@ jobs:
     runs-on: ${{ matrix.platform }}
 
     steps:
-      - uses: actions/checkout@v4.1.5
+      - uses: actions/checkout@v4.1.6
 
       - name: Setup Rust toolchain and cache
         uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
@@ -95,7 +95,7 @@ jobs:
     runs-on: ${{ matrix.platform }}
 
     steps:
-      - uses: actions/checkout@v4.1.5
+      - uses: actions/checkout@v4.1.6
 
       - name: Setup Rust toolchain and cache
         uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
@@ -146,7 +146,7 @@ jobs:
     runs-on: ${{ matrix.platform }}
 
     steps:
-      - uses: actions/checkout@v4.1.5
+      - uses: actions/checkout@v4.1.6
 
       - name: Setup Rust toolchain and cache
         uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 418b392fce..d95ddd438a 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -27,7 +27,7 @@ jobs:
     # if: github.repository == 'nushell/nightly'
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.5
+        uses: actions/checkout@v4.1.6
         if: github.repository == 'nushell/nightly'
         with:
           ref: main
@@ -112,7 +112,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     steps:
-    - uses: actions/checkout@v4.1.5
+    - uses: actions/checkout@v4.1.6
       with:
         ref: main
         fetch-depth: 0
@@ -181,7 +181,7 @@ jobs:
       - name: Waiting for Release
         run: sleep 1800
 
-      - uses: actions/checkout@v4.1.5
+      - uses: actions/checkout@v4.1.6
         with:
           ref: main
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fb1b384d54..7d58501044 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -62,7 +62,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     steps:
-    - uses: actions/checkout@v4.1.5
+    - uses: actions/checkout@v4.1.6
 
     - name: Update Rust Toolchain Target
       run: |
diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index dacfb83928..709f09c2e7 100644
--- a/.github/workflows/typos.yml
+++ b/.github/workflows/typos.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Actions Repository
-        uses: actions/checkout@v4.1.5
+        uses: actions/checkout@v4.1.6
 
       - name: Check spelling
         uses: crate-ci/typos@v1.21.0

From d7e75c0b70570096cbaa20e61adc174ef5a135b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 15:59:33 +0800
Subject: [PATCH 0019/1072] Bump shadow-rs from 0.27.1 to 0.28.0 (#12932)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [shadow-rs](https://github.com/baoyachi/shadow-rs) from 0.27.1 to
0.28.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/baoyachi/shadow-rs/releases">shadow-rs's
releases</a>.</em></p>
<blockquote>
<h2>fix cargo clippy</h2>
<p><a
href="https://redirect.github.com/baoyachi/shadow-rs/issues/160">#160</a></p>
<p>Thx <a href="https://github.com/qartik"><code>@​qartik</code></a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/ba9f8b0c2bdb983be1f8556b956a3da1c70f41cb"><code>ba9f8b0</code></a>
Update Cargo.toml</li>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/d1b724c1e76b3ccdf87be02af0d10bbcbc0fbcd6"><code>d1b724c</code></a>
Merge pull request <a
href="https://redirect.github.com/baoyachi/shadow-rs/issues/160">#160</a>
from qartik/patch-1</li>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/505108d5d6a21d74de0e4c56df5790b3180c80b0"><code>505108d</code></a>
Allow missing_docs for deprecated CLAP_VERSION constant</li>
<li>See full diff in <a
href="https://github.com/baoyachi/shadow-rs/compare/v0.27.1...v0.28.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=shadow-rs&package-manager=cargo&previous-version=0.27.1&new-version=0.28.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                    | 4 ++--
 crates/nu-cmd-lang/Cargo.toml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 59948fbc51..2bc6f891ba 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5401,9 +5401,9 @@ dependencies = [
 
 [[package]]
 name = "shadow-rs"
-version = "0.27.1"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7960cbd6ba74691bb15e7ebf97f7136bd02d1115f5695a58c1f31d5645750128"
+checksum = "1d75516bdaee8f640543ad1f6e292448c23ce57143f812c3736ab4b0874383df"
 dependencies = [
  "const_format",
  "is_debug",
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index abb89a6991..45f5b9bc8f 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -18,10 +18,10 @@ nu-protocol = { path = "../nu-protocol", version = "0.93.1" }
 nu-utils = { path = "../nu-utils", version = "0.93.1" }
 
 itertools = { workspace = true }
-shadow-rs = { version = "0.27", default-features = false }
+shadow-rs = { version = "0.28", default-features = false }
 
 [build-dependencies]
-shadow-rs = { version = "0.27", default-features = false }
+shadow-rs = { version = "0.28", default-features = false }
 
 [features]
 mimalloc = []

From 758c5d447aeccdf75fa95dd85b6c661113935df0 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Wed, 22 May 2024 08:13:45 -0700
Subject: [PATCH 0020/1072] Add support for the `ps` command on FreeBSD,
 NetBSD, and OpenBSD (#12892)

# Description

I feel like it's a little sad that BSDs get to enjoy almost everything
other than the `ps` command, and there are some tests that rely on this
command, so I figured it would be fun to patch that and make it work.

The different BSDs have diverged from each other somewhat, but generally
have a similar enough API for reading process information via
`sysctl()`, with some slightly different args.

This supports FreeBSD with the `freebsd` module, and NetBSD and OpenBSD
with the `netbsd` module. OpenBSD is a fork of NetBSD and the interface
has some minor differences but many things are the same.

I had wanted to try to support DragonFlyBSD too, but their Rust version
in the latest release is only 1.72.0, which is too old for me to want to
try to compile rustc up to 1.77.2... but I will revisit this whenever
they do update it. Dragonfly is a fork of FreeBSD, so it's likely to be
more or less the same - I just don't want to enable it without testing
it.

Fixes #6862 (partially, we probably won't be adding `zfs list`)

# User-Facing Changes
`ps` added for FreeBSD, NetBSD, and OpenBSD.

# Tests + Formatting
The CI doesn't run tests for BSDs, so I'm not entirely sure if
everything was already passing before. (Frankly, it's unlikely.) But
nothing appears to be broken.

# After Submitting
- [ ] release notes?
- [ ] DragonflyBSD, whenever they do update Rust to something close
enough for me to try it
---
 Cargo.lock                               |   1 +
 crates/nu-command/src/default_context.rs |   3 +
 crates/nu-command/src/system/mod.rs      |   4 +
 crates/nu-command/src/system/ps.rs       |  17 +-
 crates/nu-system/Cargo.toml              |   1 +
 crates/nu-system/src/freebsd.rs          | 305 ++++++++++++++++++++
 crates/nu-system/src/lib.rs              |  10 +
 crates/nu-system/src/netbsd.rs           | 336 +++++++++++++++++++++++
 8 files changed, 662 insertions(+), 15 deletions(-)
 create mode 100644 crates/nu-system/src/freebsd.rs
 create mode 100644 crates/nu-system/src/netbsd.rs

diff --git a/Cargo.lock b/Cargo.lock
index 2bc6f891ba..362d64ba99 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3264,6 +3264,7 @@ name = "nu-system"
 version = "0.93.1"
 dependencies = [
  "chrono",
+ "itertools 0.12.1",
  "libc",
  "libproc",
  "log",
diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index ba55472e15..a23f9c4ef4 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -164,6 +164,9 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
         #[cfg(any(
             target_os = "android",
             target_os = "linux",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd",
             target_os = "macos",
             target_os = "windows"
         ))]
diff --git a/crates/nu-command/src/system/mod.rs b/crates/nu-command/src/system/mod.rs
index 788e1b7740..c0f890232d 100644
--- a/crates/nu-command/src/system/mod.rs
+++ b/crates/nu-command/src/system/mod.rs
@@ -5,6 +5,8 @@ mod nu_check;
     target_os = "android",
     target_os = "linux",
     target_os = "freebsd",
+    target_os = "netbsd",
+    target_os = "openbsd",
     target_os = "macos",
     target_os = "windows"
 ))]
@@ -23,6 +25,8 @@ pub use nu_check::NuCheck;
     target_os = "android",
     target_os = "linux",
     target_os = "freebsd",
+    target_os = "netbsd",
+    target_os = "openbsd",
     target_os = "macos",
     target_os = "windows"
 ))]
diff --git a/crates/nu-command/src/system/ps.rs b/crates/nu-command/src/system/ps.rs
index 922bf7915b..c64549a44d 100644
--- a/crates/nu-command/src/system/ps.rs
+++ b/crates/nu-command/src/system/ps.rs
@@ -2,20 +2,13 @@
 use itertools::Itertools;
 use nu_engine::command_prelude::*;
 
-#[cfg(all(
-    unix,
-    not(target_os = "freebsd"),
-    not(target_os = "macos"),
-    not(target_os = "windows"),
-    not(target_os = "android"),
-))]
+#[cfg(target_os = "linux")]
 use procfs::WithCurrentSystemInfo;
 use std::time::Duration;
 
 #[derive(Clone)]
 pub struct Ps;
 
-#[cfg(not(target_os = "freebsd"))]
 impl Command for Ps {
     fn name(&self) -> &str {
         "ps"
@@ -82,7 +75,6 @@ impl Command for Ps {
     }
 }
 
-#[cfg(not(target_os = "freebsd"))]
 fn run_ps(
     engine_state: &EngineState,
     stack: &mut Stack,
@@ -111,12 +103,7 @@ fn run_ps(
 
         if long {
             record.push("command", Value::string(proc.command(), span));
-            #[cfg(all(
-                unix,
-                not(target_os = "macos"),
-                not(target_os = "windows"),
-                not(target_os = "android"),
-            ))]
+            #[cfg(target_os = "linux")]
             {
                 let proc_stat = proc
                     .curr_proc
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index 771f4417ca..88d6b28b05 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -16,6 +16,7 @@ bench = false
 libc = { workspace = true }
 log = { workspace = true }
 sysinfo = { workspace = true }
+itertools = { workspace = true }
 
 [target.'cfg(target_family = "unix")'.dependencies]
 nix = { workspace = true, default-features = false, features = ["fs", "term", "process", "signal"] }
diff --git a/crates/nu-system/src/freebsd.rs b/crates/nu-system/src/freebsd.rs
new file mode 100644
index 0000000000..ff0f67dd10
--- /dev/null
+++ b/crates/nu-system/src/freebsd.rs
@@ -0,0 +1,305 @@
+use itertools::{EitherOrBoth, Itertools};
+use libc::{
+    kinfo_proc, sysctl, CTL_HW, CTL_KERN, KERN_PROC, KERN_PROC_ALL, KERN_PROC_ARGS, TDF_IDLETD,
+};
+use std::{
+    ffi::CStr,
+    io,
+    mem::{self, MaybeUninit},
+    ptr,
+    time::{Duration, Instant},
+};
+
+#[derive(Debug)]
+pub struct ProcessInfo {
+    pub pid: i32,
+    pub ppid: i32,
+    pub name: String,
+    pub argv: Vec<u8>,
+    pub stat: i8,
+    pub percent_cpu: f64,
+    pub mem_resident: u64, // in bytes
+    pub mem_virtual: u64,  // in bytes
+}
+
+pub fn collect_proc(interval: Duration, _with_thread: bool) -> Vec<ProcessInfo> {
+    compare_procs(interval).unwrap_or_else(|err| {
+        log::warn!("Failed to get processes: {}", err);
+        vec![]
+    })
+}
+
+fn compare_procs(interval: Duration) -> io::Result<Vec<ProcessInfo>> {
+    let pagesize = get_pagesize()? as u64;
+
+    // Compare two full snapshots of all of the processes over the interval
+    let now = Instant::now();
+    let procs_a = get_procs()?;
+    std::thread::sleep(interval);
+    let procs_b = get_procs()?;
+    let true_interval = Instant::now().saturating_duration_since(now);
+    let true_interval_sec = true_interval.as_secs_f64();
+
+    // Group all of the threads in each process together
+    let a_grouped = procs_a.into_iter().group_by(|proc| proc.ki_pid);
+    let b_grouped = procs_b.into_iter().group_by(|proc| proc.ki_pid);
+
+    // Join the processes between the two snapshots
+    Ok(a_grouped
+        .into_iter()
+        .merge_join_by(b_grouped.into_iter(), |(pid_a, _), (pid_b, _)| {
+            pid_a.cmp(pid_b)
+        })
+        .map(|threads| {
+            // Join the threads between the two snapshots for the process
+            let mut threads = {
+                let (left, right) = threads.left_and_right();
+                left.into_iter()
+                    .flat_map(|(_, threads)| threads)
+                    .merge_join_by(
+                        right.into_iter().flat_map(|(_, threads)| threads),
+                        |thread_a, thread_b| thread_a.ki_tid.cmp(&thread_b.ki_tid),
+                    )
+                    .peekable()
+            };
+
+            // Pick the later process entry of the first thread to use for basic process information
+            let proc = match threads.peek().ok_or(io::ErrorKind::NotFound)? {
+                EitherOrBoth::Both(_, b) => b,
+                EitherOrBoth::Left(a) => a,
+                EitherOrBoth::Right(b) => b,
+            }
+            .clone();
+
+            // Skip over the idle process. It always appears with high CPU usage when the
+            // system is idle
+            if proc.ki_tdflags as u64 & TDF_IDLETD as u64 != 0 {
+                return Err(io::ErrorKind::NotFound.into());
+            }
+
+            // Aggregate all of the threads that exist in both snapshots and sum their runtime.
+            let (runtime_a, runtime_b) =
+                threads
+                    .flat_map(|t| t.both())
+                    .fold((0., 0.), |(runtime_a, runtime_b), (a, b)| {
+                        let runtime_in_seconds =
+                            |proc: &kinfo_proc| proc.ki_runtime as f64 /* µsec */ / 1_000_000.0;
+                        (
+                            runtime_a + runtime_in_seconds(&a),
+                            runtime_b + runtime_in_seconds(&b),
+                        )
+                    });
+
+            // The percentage CPU is the ratio of how much runtime occurred for the process out of
+            // the true measured interval that occurred.
+            let percent_cpu = 100. * (runtime_b - runtime_a).max(0.) / true_interval_sec;
+
+            let info = ProcessInfo {
+                pid: proc.ki_pid,
+                ppid: proc.ki_ppid,
+                name: read_cstr(&proc.ki_comm).to_string_lossy().into_owned(),
+                argv: get_proc_args(proc.ki_pid)?,
+                stat: proc.ki_stat,
+                percent_cpu,
+                mem_resident: proc.ki_rssize.max(0) as u64 * pagesize,
+                mem_virtual: proc.ki_size.max(0) as u64,
+            };
+            Ok(info)
+        })
+        // Remove errors from the list - probably just processes that are gone now
+        .flat_map(|result: io::Result<_>| result.ok())
+        .collect())
+}
+
+fn check(err: libc::c_int) -> std::io::Result<()> {
+    if err < 0 {
+        Err(io::Error::last_os_error())
+    } else {
+        Ok(())
+    }
+}
+
+/// This is a bounds-checked way to read a `CStr` from a slice of `c_char`
+fn read_cstr(slice: &[libc::c_char]) -> &CStr {
+    unsafe {
+        // SAFETY: ensure that c_char and u8 are the same size
+        mem::transmute::<libc::c_char, u8>(0);
+        let slice: &[u8] = mem::transmute(slice);
+        CStr::from_bytes_until_nul(slice).unwrap_or_default()
+    }
+}
+
+fn get_procs() -> io::Result<Vec<libc::kinfo_proc>> {
+    // To understand what's going on here, see the sysctl(3) manpage for FreeBSD.
+    unsafe {
+        const STRUCT_SIZE: usize = mem::size_of::<libc::kinfo_proc>();
+        let ctl_name = [CTL_KERN, KERN_PROC, KERN_PROC_ALL];
+
+        // First, try to figure out how large a buffer we need to allocate
+        // (calling with NULL just tells us that)
+        let mut data_len = 0;
+        check(sysctl(
+            ctl_name.as_ptr(),
+            ctl_name.len() as u32,
+            ptr::null_mut(),
+            &mut data_len,
+            ptr::null(),
+            0,
+        ))?;
+
+        // data_len will be set in bytes, so divide by the size of the structure
+        let expected_len = data_len.div_ceil(STRUCT_SIZE);
+
+        // Now allocate the Vec and set data_len to the real number of bytes allocated
+        let mut vec: Vec<libc::kinfo_proc> = Vec::with_capacity(expected_len);
+        data_len = vec.capacity() * STRUCT_SIZE;
+
+        // Call sysctl() again to put the result in the vec
+        check(sysctl(
+            ctl_name.as_ptr(),
+            ctl_name.len() as u32,
+            vec.as_mut_ptr() as *mut libc::c_void,
+            &mut data_len,
+            ptr::null(),
+            0,
+        ))?;
+
+        // If that was ok, we can set the actual length of the vec to whatever
+        // data_len was changed to, since that should now all be properly initialized data.
+        let true_len = data_len.div_ceil(STRUCT_SIZE);
+        vec.set_len(true_len);
+
+        // Sort the procs by pid and then tid before using them
+        vec.sort_by_key(|p| (p.ki_pid, p.ki_tid));
+        Ok(vec)
+    }
+}
+
+fn get_proc_args(pid: i32) -> io::Result<Vec<u8>> {
+    unsafe {
+        let ctl_name = [CTL_KERN, KERN_PROC, KERN_PROC_ARGS, pid];
+
+        // First, try to figure out how large a buffer we need to allocate
+        // (calling with NULL just tells us that)
+        let mut data_len = 0;
+        check(sysctl(
+            ctl_name.as_ptr(),
+            ctl_name.len() as u32,
+            ptr::null_mut(),
+            &mut data_len,
+            ptr::null(),
+            0,
+        ))?;
+
+        // Now allocate the Vec and set data_len to the real number of bytes allocated
+        let mut vec: Vec<u8> = Vec::with_capacity(data_len);
+        data_len = vec.capacity();
+
+        // Call sysctl() again to put the result in the vec
+        check(sysctl(
+            ctl_name.as_ptr(),
+            ctl_name.len() as u32,
+            vec.as_mut_ptr() as *mut libc::c_void,
+            &mut data_len,
+            ptr::null(),
+            0,
+        ))?;
+
+        // If that was ok, we can set the actual length of the vec to whatever
+        // data_len was changed to, since that should now all be properly initialized data.
+        vec.set_len(data_len);
+        Ok(vec)
+    }
+}
+
+// For getting simple values from the sysctl interface
+unsafe fn get_ctl<T>(ctl_name: &[i32]) -> io::Result<T> {
+    let mut value: MaybeUninit<T> = MaybeUninit::uninit();
+    let mut value_len = mem::size_of_val(&value);
+    check(sysctl(
+        ctl_name.as_ptr(),
+        ctl_name.len() as u32,
+        value.as_mut_ptr() as *mut libc::c_void,
+        &mut value_len,
+        ptr::null(),
+        0,
+    ))?;
+    Ok(value.assume_init())
+}
+
+fn get_pagesize() -> io::Result<libc::c_int> {
+    // not in libc for some reason
+    const HW_PAGESIZE: i32 = 7;
+    unsafe { get_ctl(&[CTL_HW, HW_PAGESIZE]) }
+}
+
+impl ProcessInfo {
+    /// PID of process
+    pub fn pid(&self) -> i32 {
+        self.pid
+    }
+
+    /// Parent PID of process
+    pub fn ppid(&self) -> i32 {
+        self.ppid
+    }
+
+    /// Name of command
+    pub fn name(&self) -> String {
+        let argv_name = self
+            .argv
+            .split(|b| *b == 0)
+            .next()
+            .map(String::from_utf8_lossy)
+            .unwrap_or_default()
+            .into_owned();
+
+        if !argv_name.is_empty() {
+            argv_name
+        } else {
+            // Just use the command name alone.
+            self.name.clone()
+        }
+    }
+
+    /// Full name of command, with arguments
+    pub fn command(&self) -> String {
+        if let Some(last_nul) = self.argv.iter().rposition(|b| *b == 0) {
+            // The command string is NUL separated
+            // Take the string up to the last NUL, then replace the NULs with spaces
+            String::from_utf8_lossy(&self.argv[0..last_nul]).replace("\0", " ")
+        } else {
+            // The argv is empty, so use the name instead
+            self.name()
+        }
+    }
+
+    /// Get the status of the process
+    pub fn status(&self) -> String {
+        match self.stat {
+            libc::SIDL | libc::SRUN => "Running",
+            libc::SSLEEP => "Sleeping",
+            libc::SSTOP => "Stopped",
+            libc::SWAIT => "Waiting",
+            libc::SLOCK => "Locked",
+            libc::SZOMB => "Zombie",
+            _ => "Unknown",
+        }
+        .into()
+    }
+
+    /// CPU usage as a percent of total
+    pub fn cpu_usage(&self) -> f64 {
+        self.percent_cpu
+    }
+
+    /// Memory size in number of bytes
+    pub fn mem_size(&self) -> u64 {
+        self.mem_resident
+    }
+
+    /// Virtual memory size in bytes
+    pub fn virtual_size(&self) -> u64 {
+        self.mem_virtual
+    }
+}
diff --git a/crates/nu-system/src/lib.rs b/crates/nu-system/src/lib.rs
index 6058ed4fcf..2fc97d2e7e 100644
--- a/crates/nu-system/src/lib.rs
+++ b/crates/nu-system/src/lib.rs
@@ -1,8 +1,13 @@
 mod foreground;
+
+#[cfg(target_os = "freebsd")]
+mod freebsd;
 #[cfg(any(target_os = "android", target_os = "linux"))]
 mod linux;
 #[cfg(target_os = "macos")]
 mod macos;
+#[cfg(any(target_os = "netbsd", target_os = "openbsd"))]
+mod netbsd;
 pub mod os_info;
 #[cfg(target_os = "windows")]
 mod windows;
@@ -10,9 +15,14 @@ mod windows;
 #[cfg(unix)]
 pub use self::foreground::stdin_fd;
 pub use self::foreground::{ForegroundChild, ForegroundGuard};
+
+#[cfg(target_os = "freebsd")]
+pub use self::freebsd::*;
 #[cfg(any(target_os = "android", target_os = "linux"))]
 pub use self::linux::*;
 #[cfg(target_os = "macos")]
 pub use self::macos::*;
+#[cfg(any(target_os = "netbsd", target_os = "openbsd"))]
+pub use self::netbsd::*;
 #[cfg(target_os = "windows")]
 pub use self::windows::*;
diff --git a/crates/nu-system/src/netbsd.rs b/crates/nu-system/src/netbsd.rs
new file mode 100644
index 0000000000..04f69b35fe
--- /dev/null
+++ b/crates/nu-system/src/netbsd.rs
@@ -0,0 +1,336 @@
+//! This is used for both NetBSD and OpenBSD, because they are fairly similar.
+
+use itertools::{EitherOrBoth, Itertools};
+use libc::{sysctl, CTL_HW, CTL_KERN, KERN_PROC_ALL, KERN_PROC_ARGS, KERN_PROC_ARGV};
+use std::{
+    io,
+    mem::{self, MaybeUninit},
+    ptr,
+    time::{Duration, Instant},
+};
+
+#[cfg(target_os = "netbsd")]
+type KInfoProc = libc::kinfo_proc2;
+#[cfg(target_os = "openbsd")]
+type KInfoProc = libc::kinfo_proc;
+
+#[derive(Debug)]
+pub struct ProcessInfo {
+    pub pid: i32,
+    pub ppid: i32,
+    pub argv: Vec<u8>,
+    pub stat: i8,
+    pub percent_cpu: f64,
+    pub mem_resident: u64, // in bytes
+    pub mem_virtual: u64,  // in bytes
+}
+
+pub fn collect_proc(interval: Duration, _with_thread: bool) -> Vec<ProcessInfo> {
+    compare_procs(interval).unwrap_or_else(|err| {
+        log::warn!("Failed to get processes: {}", err);
+        vec![]
+    })
+}
+
+fn compare_procs(interval: Duration) -> io::Result<Vec<ProcessInfo>> {
+    let pagesize = get_pagesize()? as u64;
+
+    // Compare two full snapshots of all of the processes over the interval
+    let now = Instant::now();
+    let procs_a = get_procs()?;
+    std::thread::sleep(interval);
+    let procs_b = get_procs()?;
+    let true_interval = Instant::now().saturating_duration_since(now);
+    let true_interval_sec = true_interval.as_secs_f64();
+
+    // Join the processes between the two snapshots
+    Ok(procs_a
+        .into_iter()
+        .merge_join_by(procs_b.into_iter(), |a, b| a.p_pid.cmp(&b.p_pid))
+        .map(|proc| {
+            // Take both snapshotted processes if we can, but if not then just keep the one that
+            // exists and set prev_proc to None
+            let (prev_proc, proc) = match proc {
+                EitherOrBoth::Both(a, b) => (Some(a), b),
+                EitherOrBoth::Left(a) => (None, a),
+                EitherOrBoth::Right(b) => (None, b),
+            };
+
+            // The percentage CPU is the ratio of how much runtime occurred for the process out of
+            // the true measured interval that occurred.
+            let percent_cpu = if let Some(prev_proc) = prev_proc {
+                let prev_rtime =
+                    prev_proc.p_rtime_sec as f64 + prev_proc.p_rtime_usec as f64 / 1_000_000.0;
+                let rtime = proc.p_rtime_sec as f64 + proc.p_rtime_usec as f64 / 1_000_000.0;
+                100. * (rtime - prev_rtime).max(0.) / true_interval_sec
+            } else {
+                0.0
+            };
+
+            Ok(ProcessInfo {
+                pid: proc.p_pid,
+                ppid: proc.p_ppid,
+                argv: get_proc_args(proc.p_pid, KERN_PROC_ARGV)?,
+                stat: proc.p_stat,
+                percent_cpu,
+                mem_resident: proc.p_vm_rssize.max(0) as u64 * pagesize,
+                #[cfg(target_os = "netbsd")]
+                mem_virtual: proc.p_vm_msize.max(0) as u64 * pagesize,
+                #[cfg(target_os = "openbsd")]
+                mem_virtual: proc.p_vm_map_size.max(0) as u64 * pagesize,
+            })
+        })
+        // Remove errors from the list - probably just processes that are gone now
+        .flat_map(|result: io::Result<_>| result.ok())
+        .collect())
+}
+
+fn check(err: libc::c_int) -> std::io::Result<()> {
+    if err < 0 {
+        Err(io::Error::last_os_error())
+    } else {
+        Ok(())
+    }
+}
+
+/// Call `sysctl()` in read mode (i.e. the last two arguments are NULL and zero)
+unsafe fn sysctl_get(
+    name: *const i32,
+    name_len: u32,
+    data: *mut libc::c_void,
+    data_len: *mut usize,
+) -> i32 {
+    sysctl(
+        name,
+        name_len,
+        data,
+        data_len,
+        // NetBSD and OpenBSD differ in mutability for this pointer, but it's null anyway
+        #[cfg(target_os = "netbsd")]
+        ptr::null(),
+        #[cfg(target_os = "openbsd")]
+        ptr::null_mut(),
+        0,
+    )
+}
+
+fn get_procs() -> io::Result<Vec<KInfoProc>> {
+    // To understand what's going on here, see the sysctl(3) and sysctl(7) manpages for NetBSD.
+    unsafe {
+        const STRUCT_SIZE: usize = mem::size_of::<KInfoProc>();
+
+        #[cfg(target_os = "netbsd")]
+        const TGT_KERN_PROC: i32 = libc::KERN_PROC2;
+        #[cfg(target_os = "openbsd")]
+        const TGT_KERN_PROC: i32 = libc::KERN_PROC;
+
+        let mut ctl_name = [
+            CTL_KERN,
+            TGT_KERN_PROC,
+            KERN_PROC_ALL,
+            0,
+            STRUCT_SIZE as i32,
+            0,
+        ];
+
+        // First, try to figure out how large a buffer we need to allocate
+        // (calling with NULL just tells us that)
+        let mut data_len = 0;
+        check(sysctl_get(
+            ctl_name.as_ptr(),
+            ctl_name.len() as u32,
+            ptr::null_mut(),
+            &mut data_len,
+        ))?;
+
+        // data_len will be set in bytes, so divide by the size of the structure
+        let expected_len = data_len.div_ceil(STRUCT_SIZE);
+
+        // Now allocate the Vec and set data_len to the real number of bytes allocated
+        let mut vec: Vec<KInfoProc> = Vec::with_capacity(expected_len);
+        data_len = vec.capacity() * STRUCT_SIZE;
+
+        // We are also supposed to set ctl_name[5] to the number of structures we want
+        ctl_name[5] = expected_len.try_into().expect("expected_len too big");
+
+        // Call sysctl() again to put the result in the vec
+        check(sysctl_get(
+            ctl_name.as_ptr(),
+            ctl_name.len() as u32,
+            vec.as_mut_ptr() as *mut libc::c_void,
+            &mut data_len,
+        ))?;
+
+        // If that was ok, we can set the actual length of the vec to whatever
+        // data_len was changed to, since that should now all be properly initialized data.
+        let true_len = data_len.div_ceil(STRUCT_SIZE);
+        vec.set_len(true_len);
+
+        // Sort the procs by pid before using them
+        vec.sort_by_key(|p| p.p_pid);
+        Ok(vec)
+    }
+}
+
+fn get_proc_args(pid: i32, what: i32) -> io::Result<Vec<u8>> {
+    unsafe {
+        let ctl_name = [CTL_KERN, KERN_PROC_ARGS, pid, what];
+
+        // First, try to figure out how large a buffer we need to allocate
+        // (calling with NULL just tells us that)
+        let mut data_len = 0;
+        check(sysctl_get(
+            ctl_name.as_ptr(),
+            ctl_name.len() as u32,
+            ptr::null_mut(),
+            &mut data_len,
+        ))?;
+
+        // Now allocate the Vec and set data_len to the real number of bytes allocated
+        let mut vec: Vec<u8> = Vec::with_capacity(data_len);
+        data_len = vec.capacity();
+
+        // Call sysctl() again to put the result in the vec
+        check(sysctl_get(
+            ctl_name.as_ptr(),
+            ctl_name.len() as u32,
+            vec.as_mut_ptr() as *mut libc::c_void,
+            &mut data_len,
+        ))?;
+
+        // If that was ok, we can set the actual length of the vec to whatever
+        // data_len was changed to, since that should now all be properly initialized data.
+        vec.set_len(data_len);
+
+        // On OpenBSD we have to do an extra step, because it fills the buffer with pointers to the
+        // strings first, even though the strings are within the buffer as well.
+        #[cfg(target_os = "openbsd")]
+        let vec = {
+            use std::ffi::CStr;
+
+            // Set up some bounds checking. We assume there will be some pointers at the base until
+            // we reach NULL, but we want to make sure we only ever read data within the range of
+            // min_ptr..max_ptr.
+            let ptrs = vec.as_ptr() as *const *const u8;
+            let min_ptr = vec.as_ptr() as *const u8;
+            let max_ptr = vec.as_ptr().add(vec.len()) as *const u8;
+            let max_index: isize = (vec.len() / mem::size_of::<*const u8>())
+                .try_into()
+                .expect("too big for isize");
+
+            let mut new_vec = Vec::with_capacity(vec.len());
+            for index in 0..max_index {
+                let ptr = ptrs.offset(index);
+                if *ptr == ptr::null() {
+                    break;
+                } else {
+                    // Make sure it's within the bounds of the buffer
+                    assert!(
+                        *ptr >= min_ptr && *ptr < max_ptr,
+                        "pointer out of bounds of the buffer returned by sysctl()"
+                    );
+                    // Also bounds-check the C strings, to make sure we don't overrun the buffer
+                    new_vec.extend(
+                        CStr::from_bytes_until_nul(std::slice::from_raw_parts(
+                            *ptr,
+                            max_ptr.offset_from(*ptr) as usize,
+                        ))
+                        .expect("invalid C string")
+                        .to_bytes_with_nul(),
+                    );
+                }
+            }
+            new_vec
+        };
+
+        Ok(vec)
+    }
+}
+
+// For getting simple values from the sysctl interface
+unsafe fn get_ctl<T>(ctl_name: &[i32]) -> io::Result<T> {
+    let mut value: MaybeUninit<T> = MaybeUninit::uninit();
+    let mut value_len = mem::size_of_val(&value);
+    check(sysctl_get(
+        ctl_name.as_ptr(),
+        ctl_name.len() as u32,
+        value.as_mut_ptr() as *mut libc::c_void,
+        &mut value_len,
+    ))?;
+    Ok(value.assume_init())
+}
+
+fn get_pagesize() -> io::Result<libc::c_int> {
+    // not in libc for some reason
+    const HW_PAGESIZE: i32 = 7;
+    unsafe { get_ctl(&[CTL_HW, HW_PAGESIZE]) }
+}
+
+impl ProcessInfo {
+    /// PID of process
+    pub fn pid(&self) -> i32 {
+        self.pid
+    }
+
+    /// Parent PID of process
+    pub fn ppid(&self) -> i32 {
+        self.ppid
+    }
+
+    /// Name of command
+    pub fn name(&self) -> String {
+        self.argv
+            .split(|b| *b == 0)
+            .next()
+            .map(String::from_utf8_lossy)
+            .unwrap_or_default()
+            .into_owned()
+    }
+
+    /// Full name of command, with arguments
+    pub fn command(&self) -> String {
+        if let Some(last_nul) = self.argv.iter().rposition(|b| *b == 0) {
+            // The command string is NUL separated
+            // Take the string up to the last NUL, then replace the NULs with spaces
+            String::from_utf8_lossy(&self.argv[0..last_nul]).replace("\0", " ")
+        } else {
+            "".into()
+        }
+    }
+
+    /// Get the status of the process
+    pub fn status(&self) -> String {
+        // see sys/proc.h (OpenBSD), sys/lwp.h (NetBSD)
+        // the names given here are the NetBSD ones, starting with LS*, but the OpenBSD ones are
+        // the same, just starting with S* instead
+        match self.stat {
+            1 /* LSIDL */ => "",
+            2 /* LSRUN */ => "Waiting",
+            3 /* LSSLEEP */ => "Sleeping",
+            4 /* LSSTOP */ => "Stopped",
+            5 /* LSZOMB */ => "Zombie",
+            #[cfg(target_os = "openbsd")] // removed in NetBSD
+            6 /* LSDEAD */ => "Dead",
+            7 /* LSONPROC */ => "Running",
+            #[cfg(target_os = "netbsd")] // doesn't exist in OpenBSD
+            8 /* LSSUSPENDED */ => "Suspended",
+            _ => "Unknown",
+        }
+        .into()
+    }
+
+    /// CPU usage as a percent of total
+    pub fn cpu_usage(&self) -> f64 {
+        self.percent_cpu
+    }
+
+    /// Memory size in number of bytes
+    pub fn mem_size(&self) -> u64 {
+        self.mem_resident
+    }
+
+    /// Virtual memory size in bytes
+    pub fn virtual_size(&self) -> u64 {
+        self.mem_virtual
+    }
+}

From 7de513a4e04d4654314a02c60a1a415fc5f348a0 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Wed, 22 May 2024 09:55:24 -0700
Subject: [PATCH 0021/1072] Implement streaming I/O for CSV and TSV commands
 (#12918)

# Description

Implements streaming for:

- `from csv`
- `from tsv`
- `to csv`
- `to tsv`

via the new string-typed ByteStream support.

# User-Facing Changes
Commands above. Also:

- `to csv` and `to tsv` now have `--columns <List(String)>`, to provide
the exact columns desired in the output. This is required for them to
have streaming output, because otherwise collecting the entire list is
necessary to determine the output columns. If we introduce
`TableStream`, this may become less necessary.

# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
- [ ] release notes

---------

Co-authored-by: Ian Manske <ian.manske@pm.me>
---
 .../nu-command/src/formats/from/delimited.rs  |  78 ++++--
 crates/nu-command/src/formats/to/csv.rs       |  41 ++-
 crates/nu-command/src/formats/to/delimited.rs | 252 +++++++++---------
 crates/nu-command/src/formats/to/tsv.rs       |  31 ++-
 4 files changed, 235 insertions(+), 167 deletions(-)

diff --git a/crates/nu-command/src/formats/from/delimited.rs b/crates/nu-command/src/formats/from/delimited.rs
index 1fdea19482..853f3bd83e 100644
--- a/crates/nu-command/src/formats/from/delimited.rs
+++ b/crates/nu-command/src/formats/from/delimited.rs
@@ -1,7 +1,14 @@
 use csv::{ReaderBuilder, Trim};
-use nu_protocol::{IntoPipelineData, PipelineData, ShellError, Span, Value};
+use nu_protocol::{ByteStream, ListStream, PipelineData, ShellError, Span, Value};
 
-fn from_delimited_string_to_value(
+fn from_csv_error(err: csv::Error, span: Span) -> ShellError {
+    ShellError::DelimiterError {
+        msg: err.to_string(),
+        span,
+    }
+}
+
+fn from_delimited_stream(
     DelimitedReaderConfig {
         separator,
         comment,
@@ -12,9 +19,15 @@ fn from_delimited_string_to_value(
         no_infer,
         trim,
     }: DelimitedReaderConfig,
-    s: String,
+    input: ByteStream,
     span: Span,
-) -> Result<Value, csv::Error> {
+) -> Result<ListStream, ShellError> {
+    let input_reader = if let Some(stream) = input.reader() {
+        stream
+    } else {
+        return Ok(ListStream::new(std::iter::empty(), span, None));
+    };
+
     let mut reader = ReaderBuilder::new()
         .has_headers(!noheaders)
         .flexible(flexible)
@@ -23,19 +36,29 @@ fn from_delimited_string_to_value(
         .quote(quote as u8)
         .escape(escape.map(|c| c as u8))
         .trim(trim)
-        .from_reader(s.as_bytes());
+        .from_reader(input_reader);
 
     let headers = if noheaders {
-        (1..=reader.headers()?.len())
+        (1..=reader
+            .headers()
+            .map_err(|err| from_csv_error(err, span))?
+            .len())
             .map(|i| format!("column{i}"))
             .collect::<Vec<String>>()
     } else {
-        reader.headers()?.iter().map(String::from).collect()
+        reader
+            .headers()
+            .map_err(|err| from_csv_error(err, span))?
+            .iter()
+            .map(String::from)
+            .collect()
     };
 
-    let mut rows = vec![];
-    for row in reader.records() {
-        let row = row?;
+    let iter = reader.into_records().map(move |row| {
+        let row = match row {
+            Ok(row) => row,
+            Err(err) => return Value::error(from_csv_error(err, span), span),
+        };
         let columns = headers.iter().cloned();
         let values = row
             .into_iter()
@@ -57,10 +80,10 @@ fn from_delimited_string_to_value(
         //
         // Otherwise, if there are less values than headers,
         // then `Value::nothing(span)` is used to fill the remaining columns.
-        rows.push(Value::record(columns.zip(values).collect(), span));
-    }
+        Value::record(columns.zip(values).collect(), span)
+    });
 
-    Ok(Value::list(rows, span))
+    Ok(ListStream::new(iter, span, None))
 }
 
 pub(super) struct DelimitedReaderConfig {
@@ -79,14 +102,27 @@ pub(super) fn from_delimited_data(
     input: PipelineData,
     name: Span,
 ) -> Result<PipelineData, ShellError> {
-    let (concat_string, _span, metadata) = input.collect_string_strict(name)?;
-
-    Ok(from_delimited_string_to_value(config, concat_string, name)
-        .map_err(|x| ShellError::DelimiterError {
-            msg: x.to_string(),
-            span: name,
-        })?
-        .into_pipeline_data_with_metadata(metadata))
+    match input {
+        PipelineData::Empty => Ok(PipelineData::Empty),
+        PipelineData::Value(value, metadata) => {
+            let string = value.into_string()?;
+            let byte_stream = ByteStream::read_string(string, name, None);
+            Ok(PipelineData::ListStream(
+                from_delimited_stream(config, byte_stream, name)?,
+                metadata,
+            ))
+        }
+        PipelineData::ListStream(list_stream, _) => Err(ShellError::OnlySupportsThisInputType {
+            exp_input_type: "string".into(),
+            wrong_type: "list".into(),
+            dst_span: name,
+            src_span: list_stream.span(),
+        }),
+        PipelineData::ByteStream(byte_stream, metadata) => Ok(PipelineData::ListStream(
+            from_delimited_stream(config, byte_stream, name)?,
+            metadata,
+        )),
+    }
 }
 
 pub fn trim_from_str(trim: Option<Value>) -> Result<Trim, ShellError> {
diff --git a/crates/nu-command/src/formats/to/csv.rs b/crates/nu-command/src/formats/to/csv.rs
index 173c6fbd6b..e7786e60cc 100644
--- a/crates/nu-command/src/formats/to/csv.rs
+++ b/crates/nu-command/src/formats/to/csv.rs
@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use crate::formats::to::delimited::to_delimited_data;
 use nu_engine::command_prelude::*;
 use nu_protocol::Config;
@@ -27,26 +29,37 @@ impl Command for ToCsv {
                 "do not output the columns names as the first row",
                 Some('n'),
             )
+            .named(
+                "columns",
+                SyntaxShape::List(SyntaxShape::String.into()),
+                "the names (in order) of the columns to use",
+                None,
+            )
             .category(Category::Formats)
     }
 
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
-                description: "Outputs an CSV string representing the contents of this table",
+                description: "Outputs a CSV string representing the contents of this table",
                 example: "[[foo bar]; [1 2]] | to csv",
                 result: Some(Value::test_string("foo,bar\n1,2\n")),
             },
             Example {
-                description: "Outputs an CSV string representing the contents of this table",
+                description: "Outputs a CSV string representing the contents of this table",
                 example: "[[foo bar]; [1 2]] | to csv --separator ';' ",
                 result: Some(Value::test_string("foo;bar\n1;2\n")),
             },
             Example {
-                description: "Outputs an CSV string representing the contents of this record",
+                description: "Outputs a CSV string representing the contents of this record",
                 example: "{a: 1 b: 2} | to csv",
                 result: Some(Value::test_string("a,b\n1,2\n")),
             },
+            Example {
+                description: "Outputs a CSV stream with column names pre-determined",
+                example: "[[foo bar baz]; [1 2 3]] | to csv --columns [baz foo]",
+                result: Some(Value::test_string("baz,foo\n3,1\n")),
+            },
         ]
     }
 
@@ -64,8 +77,9 @@ impl Command for ToCsv {
         let head = call.head;
         let noheaders = call.has_flag(engine_state, stack, "noheaders")?;
         let separator: Option<Spanned<String>> = call.get_flag(engine_state, stack, "separator")?;
-        let config = engine_state.get_config();
-        to_csv(input, noheaders, separator, head, config)
+        let columns: Option<Vec<String>> = call.get_flag(engine_state, stack, "columns")?;
+        let config = engine_state.config.clone();
+        to_csv(input, noheaders, separator, columns, head, config)
     }
 }
 
@@ -73,13 +87,14 @@ fn to_csv(
     input: PipelineData,
     noheaders: bool,
     separator: Option<Spanned<String>>,
+    columns: Option<Vec<String>>,
     head: Span,
-    config: &Config,
+    config: Arc<Config>,
 ) -> Result<PipelineData, ShellError> {
     let sep = match separator {
         Some(Spanned { item: s, span, .. }) => {
             if s == r"\t" {
-                '\t'
+                Spanned { item: '\t', span }
             } else {
                 let vec_s: Vec<char> = s.chars().collect();
                 if vec_s.len() != 1 {
@@ -89,13 +104,19 @@ fn to_csv(
                         span,
                     });
                 };
-                vec_s[0]
+                Spanned {
+                    item: vec_s[0],
+                    span: head,
+                }
             }
         }
-        _ => ',',
+        _ => Spanned {
+            item: ',',
+            span: head,
+        },
     };
 
-    to_delimited_data(noheaders, sep, "CSV", input, head, config)
+    to_delimited_data(noheaders, sep, columns, "CSV", input, head, config)
 }
 
 #[cfg(test)]
diff --git a/crates/nu-command/src/formats/to/delimited.rs b/crates/nu-command/src/formats/to/delimited.rs
index 490983d67b..a7a2480a34 100644
--- a/crates/nu-command/src/formats/to/delimited.rs
+++ b/crates/nu-command/src/formats/to/delimited.rs
@@ -1,113 +1,31 @@
-use csv::{Writer, WriterBuilder};
+use csv::WriterBuilder;
 use nu_cmd_base::formats::to::delimited::merge_descriptors;
-use nu_protocol::{Config, IntoPipelineData, PipelineData, Record, ShellError, Span, Value};
-use std::{collections::VecDeque, error::Error};
+use nu_protocol::{
+    ByteStream, ByteStreamType, Config, PipelineData, ShellError, Span, Spanned, Value,
+};
+use std::{iter, sync::Arc};
 
-fn from_value_to_delimited_string(
-    value: &Value,
-    separator: char,
-    config: &Config,
-    head: Span,
-) -> Result<String, ShellError> {
-    let span = value.span();
-    match value {
-        Value::Record { val, .. } => record_to_delimited(val, span, separator, config, head),
-        Value::List { vals, .. } => table_to_delimited(vals, span, separator, config, head),
-        // Propagate errors by explicitly matching them before the final case.
-        Value::Error { error, .. } => Err(*error.clone()),
-        v => Err(make_unsupported_input_error(v, head, v.span())),
-    }
-}
-
-fn record_to_delimited(
-    record: &Record,
-    span: Span,
-    separator: char,
-    config: &Config,
-    head: Span,
-) -> Result<String, ShellError> {
-    let mut wtr = WriterBuilder::new()
-        .delimiter(separator as u8)
-        .from_writer(vec![]);
-    let mut fields: VecDeque<String> = VecDeque::new();
-    let mut values: VecDeque<String> = VecDeque::new();
-
-    for (k, v) in record {
-        fields.push_back(k.clone());
-
-        values.push_back(to_string_tagged_value(v, config, head, span)?);
-    }
-
-    wtr.write_record(fields).expect("can not write.");
-    wtr.write_record(values).expect("can not write.");
-
-    writer_to_string(wtr).map_err(|_| make_conversion_error("record", span))
-}
-
-fn table_to_delimited(
-    vals: &[Value],
-    span: Span,
-    separator: char,
-    config: &Config,
-    head: Span,
-) -> Result<String, ShellError> {
-    if let Some(val) = find_non_record(vals) {
-        return Err(make_unsupported_input_error(val, head, span));
-    }
-
-    let mut wtr = WriterBuilder::new()
-        .delimiter(separator as u8)
-        .from_writer(vec![]);
-
-    let merged_descriptors = merge_descriptors(vals);
-
-    if merged_descriptors.is_empty() {
-        let vals = vals
-            .iter()
-            .map(|ele| {
-                to_string_tagged_value(ele, config, head, span).unwrap_or_else(|_| String::new())
-            })
-            .collect::<Vec<_>>();
-        wtr.write_record(vals).expect("can not write");
-    } else {
-        wtr.write_record(merged_descriptors.iter().map(|item| &item[..]))
-            .expect("can not write.");
-
-        for l in vals {
-            // should always be true because of `find_non_record` above
-            if let Value::Record { val: l, .. } = l {
-                let mut row = vec![];
-                for desc in &merged_descriptors {
-                    row.push(match l.get(desc) {
-                        Some(s) => to_string_tagged_value(s, config, head, span)?,
-                        None => String::new(),
-                    });
-                }
-                wtr.write_record(&row).expect("can not write");
-            }
+fn make_csv_error(error: csv::Error, format_name: &str, head: Span) -> ShellError {
+    if let csv::ErrorKind::Io(error) = error.kind() {
+        ShellError::IOErrorSpanned {
+            msg: error.to_string(),
+            span: head,
+        }
+    } else {
+        ShellError::GenericError {
+            error: format!("Failed to generate {format_name} data"),
+            msg: error.to_string(),
+            span: Some(head),
+            help: None,
+            inner: vec![],
         }
-    }
-    writer_to_string(wtr).map_err(|_| make_conversion_error("table", span))
-}
-
-fn writer_to_string(writer: Writer<Vec<u8>>) -> Result<String, Box<dyn Error>> {
-    Ok(String::from_utf8(writer.into_inner()?)?)
-}
-
-fn make_conversion_error(type_from: &str, span: Span) -> ShellError {
-    ShellError::CantConvert {
-        to_type: type_from.to_string(),
-        from_type: "string".to_string(),
-        span,
-        help: None,
     }
 }
 
 fn to_string_tagged_value(
     v: &Value,
     config: &Config,
-    span: Span,
-    head: Span,
+    format_name: &'static str,
 ) -> Result<String, ShellError> {
     match &v {
         Value::String { .. }
@@ -123,50 +41,124 @@ fn to_string_tagged_value(
         Value::Nothing { .. } => Ok(String::new()),
         // Propagate existing errors
         Value::Error { error, .. } => Err(*error.clone()),
-        _ => Err(make_unsupported_input_error(v, head, span)),
+        _ => Err(make_cant_convert_error(v, format_name)),
     }
 }
 
-fn make_unsupported_input_error(value: &Value, head: Span, span: Span) -> ShellError {
+fn make_unsupported_input_error(
+    r#type: impl std::fmt::Display,
+    head: Span,
+    span: Span,
+) -> ShellError {
     ShellError::UnsupportedInput {
-        msg: "Unexpected type".to_string(),
-        input: format!("input type: {:?}", value.get_type()),
+        msg: "expected table or record".to_string(),
+        input: format!("input type: {}", r#type),
         msg_span: head,
         input_span: span,
     }
 }
 
-pub fn find_non_record(values: &[Value]) -> Option<&Value> {
-    values
-        .iter()
-        .find(|val| !matches!(val, Value::Record { .. }))
+fn make_cant_convert_error(value: &Value, format_name: &'static str) -> ShellError {
+    ShellError::CantConvert {
+        to_type: "string".into(),
+        from_type: value.get_type().to_string(),
+        span: value.span(),
+        help: Some(format!(
+            "only simple values are supported for {format_name} output"
+        )),
+    }
 }
 
 pub fn to_delimited_data(
     noheaders: bool,
-    sep: char,
+    separator: Spanned<char>,
+    columns: Option<Vec<String>>,
     format_name: &'static str,
     input: PipelineData,
-    span: Span,
-    config: &Config,
+    head: Span,
+    config: Arc<Config>,
 ) -> Result<PipelineData, ShellError> {
-    let value = input.into_value(span)?;
-    let output = match from_value_to_delimited_string(&value, sep, config, span) {
-        Ok(mut x) => {
-            if noheaders {
-                if let Some(second_line) = x.find('\n') {
-                    let start = second_line + 1;
-                    x.replace_range(0..start, "");
-                }
-            }
-            Ok(x)
+    let mut input = input;
+    let span = input.span().unwrap_or(head);
+    let metadata = input.metadata();
+
+    let separator = u8::try_from(separator.item).map_err(|_| ShellError::IncorrectValue {
+        msg: "separator must be an ASCII character".into(),
+        val_span: separator.span,
+        call_span: head,
+    })?;
+
+    // Check to ensure the input is likely one of our supported types first. We can't check a stream
+    // without consuming it though
+    match input {
+        PipelineData::Value(Value::List { .. } | Value::Record { .. }, _) => (),
+        PipelineData::Value(Value::Error { error, .. }, _) => return Err(*error),
+        PipelineData::Value(other, _) => {
+            return Err(make_unsupported_input_error(other.get_type(), head, span))
         }
-        Err(_) => Err(ShellError::CantConvert {
-            to_type: format_name.into(),
-            from_type: value.get_type().to_string(),
-            span: value.span(),
-            help: None,
-        }),
-    }?;
-    Ok(Value::string(output, span).into_pipeline_data())
+        PipelineData::ByteStream(..) => {
+            return Err(make_unsupported_input_error("byte stream", head, span))
+        }
+        PipelineData::ListStream(..) => (),
+        PipelineData::Empty => (),
+    }
+
+    // Determine the columns we'll use. This is necessary even if we don't write the header row,
+    // because we need to write consistent columns.
+    let columns = match columns {
+        Some(columns) => columns,
+        None => {
+            // The columns were not provided. We need to detect them, and in order to do so, we have
+            // to convert the input into a value first, so that we can find all of them
+            let value = input.into_value(span)?;
+            let columns = match &value {
+                Value::List { vals, .. } => merge_descriptors(vals),
+                Value::Record { val, .. } => val.columns().cloned().collect(),
+                _ => return Err(make_unsupported_input_error(value.get_type(), head, span)),
+            };
+            input = PipelineData::Value(value, metadata.clone());
+            columns
+        }
+    };
+
+    // Generate a byte stream of all of the values in the pipeline iterator, with a non-strict
+    // iterator so we can still accept plain records.
+    let mut iter = input.into_iter();
+
+    // If we're configured to generate a header, we generate it first, then set this false
+    let mut is_header = !noheaders;
+
+    let stream = ByteStream::from_fn(head, None, ByteStreamType::String, move |buffer| {
+        let mut wtr = WriterBuilder::new()
+            .delimiter(separator)
+            .from_writer(buffer);
+
+        if is_header {
+            // Unless we are configured not to write a header, we write the header row now, once,
+            // before everything else.
+            wtr.write_record(&columns)
+                .map_err(|err| make_csv_error(err, format_name, head))?;
+            is_header = false;
+            Ok(true)
+        } else if let Some(row) = iter.next() {
+            // Write each column of a normal row, in order
+            let record = row.into_record()?;
+            for column in &columns {
+                let field = record
+                    .get(column)
+                    .map(|v| to_string_tagged_value(v, &config, format_name))
+                    .unwrap_or(Ok(String::new()))?;
+                wtr.write_field(field)
+                    .map_err(|err| make_csv_error(err, format_name, head))?;
+            }
+            // End the row
+            wtr.write_record(iter::empty::<String>())
+                .map_err(|err| make_csv_error(err, format_name, head))?;
+            Ok(true)
+        } else {
+            Ok(false)
+        }
+    });
+
+    Ok(PipelineData::ByteStream(stream, metadata))
 }
diff --git a/crates/nu-command/src/formats/to/tsv.rs b/crates/nu-command/src/formats/to/tsv.rs
index eeaeb6b401..edc9592409 100644
--- a/crates/nu-command/src/formats/to/tsv.rs
+++ b/crates/nu-command/src/formats/to/tsv.rs
@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use crate::formats::to::delimited::to_delimited_data;
 use nu_engine::command_prelude::*;
 use nu_protocol::Config;
@@ -21,6 +23,12 @@ impl Command for ToTsv {
                 "do not output the column names as the first row",
                 Some('n'),
             )
+            .named(
+                "columns",
+                SyntaxShape::List(SyntaxShape::String.into()),
+                "the names (in order) of the columns to use",
+                None,
+            )
             .category(Category::Formats)
     }
 
@@ -31,15 +39,20 @@ impl Command for ToTsv {
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
-                description: "Outputs an TSV string representing the contents of this table",
+                description: "Outputs a TSV string representing the contents of this table",
                 example: "[[foo bar]; [1 2]] | to tsv",
                 result: Some(Value::test_string("foo\tbar\n1\t2\n")),
             },
             Example {
-                description: "Outputs an TSV string representing the contents of this record",
+                description: "Outputs a TSV string representing the contents of this record",
                 example: "{a: 1 b: 2} | to tsv",
                 result: Some(Value::test_string("a\tb\n1\t2\n")),
             },
+            Example {
+                description: "Outputs a TSV stream with column names pre-determined",
+                example: "[[foo bar baz]; [1 2 3]] | to tsv --columns [baz foo]",
+                result: Some(Value::test_string("baz\tfoo\n3\t1\n")),
+            },
         ]
     }
 
@@ -52,18 +65,24 @@ impl Command for ToTsv {
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
         let noheaders = call.has_flag(engine_state, stack, "noheaders")?;
-        let config = engine_state.get_config();
-        to_tsv(input, noheaders, head, config)
+        let columns: Option<Vec<String>> = call.get_flag(engine_state, stack, "columns")?;
+        let config = engine_state.config.clone();
+        to_tsv(input, noheaders, columns, head, config)
     }
 }
 
 fn to_tsv(
     input: PipelineData,
     noheaders: bool,
+    columns: Option<Vec<String>>,
     head: Span,
-    config: &Config,
+    config: Arc<Config>,
 ) -> Result<PipelineData, ShellError> {
-    to_delimited_data(noheaders, '\t', "TSV", input, head, config)
+    let sep = Spanned {
+        item: '\t',
+        span: head,
+    };
+    to_delimited_data(noheaders, sep, columns, "TSV", input, head, config)
 }
 
 #[cfg(test)]

From 75689ec98aa7037f1101844ea16f1934c51ff706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C5=BD=C3=A1dn=C3=ADk?= <kubouch@gmail.com>
Date: Wed, 22 May 2024 19:56:51 +0300
Subject: [PATCH 0022/1072] Small improvements to `debug profile` (#12930)

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

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

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

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

1. With the `-l` flag, `debug profile` now collects files and line
numbers of profiled pipeline elements

![profiler_lines](https://github.com/nushell/nushell/assets/25571562/b400a956-d958-4aff-aa4c-7e65da3f78fa)

2. Error from the profiled closure will be reported instead of silently
ignored.

![profiler_lines_error](https://github.com/nushell/nushell/assets/25571562/54f7ad7a-06a3-4d56-92c2-c3466917bee8)


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

New `--lines(-l)` flag to `debug profile`. The command will also fail if
the profiled closure fails, so technically it is a breaking change.

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

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

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

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

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

---------

Co-authored-by: Ian Manske <ian.manske@pm.me>
---
 crates/nu-command/src/debug/profile.rs      | 16 ++++-----
 crates/nu-protocol/src/debugger/profiler.rs | 40 +++++++++++++++++++++
 2 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/crates/nu-command/src/debug/profile.rs b/crates/nu-command/src/debug/profile.rs
index bd5de6041a..0cef979094 100644
--- a/crates/nu-command/src/debug/profile.rs
+++ b/crates/nu-command/src/debug/profile.rs
@@ -28,6 +28,7 @@ impl Command for DebugProfile {
                 Some('v'),
             )
             .switch("expr", "Collect expression types", Some('x'))
+            .switch("lines", "Collect line numbers", Some('l'))
             .named(
                 "max-depth",
                 SyntaxShape::Int,
@@ -90,6 +91,7 @@ confusing the id/parent_id hierarchy. The --expr flag is helpful for investigati
         let collect_expanded_source = call.has_flag(engine_state, stack, "expanded-source")?;
         let collect_values = call.has_flag(engine_state, stack, "values")?;
         let collect_exprs = call.has_flag(engine_state, stack, "expr")?;
+        let collect_lines = call.has_flag(engine_state, stack, "lines")?;
         let max_depth = call
             .get_flag(engine_state, stack, "max-depth")?
             .unwrap_or(2);
@@ -101,6 +103,7 @@ confusing the id/parent_id hierarchy. The --expr flag is helpful for investigati
             collect_expanded_source,
             collect_values,
             collect_exprs,
+            collect_lines,
             call.span(),
         );
 
@@ -118,14 +121,11 @@ confusing the id/parent_id hierarchy. The --expr flag is helpful for investigati
 
         let result = ClosureEvalOnce::new(engine_state, stack, closure).run_with_input(input);
 
-        // TODO: See eval_source()
-        match result {
-            Ok(pipeline_data) => {
-                let _ = pipeline_data.into_value(call.span());
-                // pipeline_data.print(engine_state, caller_stack, true, false)
-            }
-            Err(_e) => (), // TODO: Report error
-        }
+        // Return potential errors
+        let pipeline_data = result?;
+
+        // Collect the output
+        let _ = pipeline_data.into_value(call.span());
 
         Ok(engine_state
             .deactivate_debugger()
diff --git a/crates/nu-protocol/src/debugger/profiler.rs b/crates/nu-protocol/src/debugger/profiler.rs
index 53b9d0555a..b95bf571b4 100644
--- a/crates/nu-protocol/src/debugger/profiler.rs
+++ b/crates/nu-protocol/src/debugger/profiler.rs
@@ -9,6 +9,7 @@ use crate::{
     engine::EngineState,
     record, PipelineData, ShellError, Span, Value,
 };
+use std::io::BufRead;
 use std::time::Instant;
 
 #[derive(Debug, Clone, Copy)]
@@ -50,11 +51,13 @@ pub struct Profiler {
     collect_expanded_source: bool,
     collect_values: bool,
     collect_exprs: bool,
+    collect_lines: bool,
     elements: Vec<ElementInfo>,
     element_stack: Vec<ElementId>,
 }
 
 impl Profiler {
+    #[allow(clippy::too_many_arguments)]
     pub fn new(
         max_depth: i64,
         collect_spans: bool,
@@ -62,6 +65,7 @@ impl Profiler {
         collect_expanded_source: bool,
         collect_values: bool,
         collect_exprs: bool,
+        collect_lines: bool,
         span: Span,
     ) -> Self {
         let first = ElementInfo {
@@ -82,6 +86,7 @@ impl Profiler {
             collect_expanded_source,
             collect_values,
             collect_exprs,
+            collect_lines,
             elements: vec![first],
             element_stack: vec![ElementId(0)],
         }
@@ -262,6 +267,31 @@ fn expr_to_string(engine_state: &EngineState, expr: &Expr) -> String {
     }
 }
 
+// Find a file name and a line number (indexed from 1) of a span
+fn find_file_of_span(engine_state: &EngineState, span: Span) -> Option<(&str, usize)> {
+    for file in engine_state.files() {
+        if file.covered_span.contains_span(span) {
+            // count the number of lines between file start and the searched span start
+            let chunk =
+                engine_state.get_span_contents(Span::new(file.covered_span.start, span.start));
+            let nlines = chunk.lines().count();
+            // account for leading part of current line being counted as a separate line
+            let line_num = if chunk.last() == Some(&b'\n') {
+                nlines + 1
+            } else {
+                nlines
+            };
+
+            // first line has no previous line, clamp up to `1`
+            let line_num = usize::max(line_num, 1);
+
+            return Some((&file.name, line_num));
+        }
+    }
+
+    None
+}
+
 fn collect_data(
     engine_state: &EngineState,
     profiler: &Profiler,
@@ -277,6 +307,16 @@ fn collect_data(
         "parent_id" => Value::int(parent_id.0 as i64, profiler_span),
     };
 
+    if profiler.collect_lines {
+        if let Some((fname, line_num)) = find_file_of_span(engine_state, element.element_span) {
+            row.push("file", Value::string(fname, profiler_span));
+            row.push("line_num", Value::int(line_num as i64, profiler_span));
+        } else {
+            row.push("file", Value::nothing(profiler_span));
+            row.push("line", Value::nothing(profiler_span));
+        }
+    }
+
     if profiler.collect_spans {
         let span_start = i64::try_from(element.element_span.start)
             .map_err(|_| profiler_error("error converting span start to i64", profiler_span))?;

From 7ede90cba50e4dad62a2ff503a2566c82a4935ea Mon Sep 17 00:00:00 2001
From: YizhePKU <yizhe@pku.edu.cn>
Date: Thu, 23 May 2024 00:58:27 +0800
Subject: [PATCH 0023/1072] Remove `std::env::set_current_dir()` call from
 `EngineState::merge_env()` (#12922)

As discussed in https://github.com/nushell/nushell/pull/12749, we no
longer need to call `std::env::set_current_dir()` to sync `$env.PWD`
with the actual working directory. This PR removes the call from
`EngineState::merge_env()`.
---
 crates/nu-cli/src/config_files.rs             | 11 +----
 crates/nu-cli/src/repl.rs                     | 12 ++---
 crates/nu-cli/tests/completions/mod.rs        | 46 +++++++++----------
 .../support/completions_helpers.rs            |  9 ++--
 crates/nu-cmd-base/src/hook.rs                |  4 +-
 crates/nu-cmd-lang/src/example_support.rs     |  2 +-
 crates/nu-protocol/src/engine/engine_state.rs |  9 +---
 crates/nu-std/src/lib.rs                      |  3 +-
 src/config_files.rs                           | 22 ++-------
 src/test_bins.rs                              |  6 +--
 10 files changed, 41 insertions(+), 83 deletions(-)

diff --git a/crates/nu-cli/src/config_files.rs b/crates/nu-cli/src/config_files.rs
index ec7ad2f412..0684623226 100644
--- a/crates/nu-cli/src/config_files.rs
+++ b/crates/nu-cli/src/config_files.rs
@@ -235,15 +235,8 @@ pub fn eval_config_contents(
             engine_state.file = prev_file;
 
             // Merge the environment in case env vars changed in the config
-            match engine_state.cwd(Some(stack)) {
-                Ok(cwd) => {
-                    if let Err(e) = engine_state.merge_env(stack, cwd) {
-                        report_error_new(engine_state, &e);
-                    }
-                }
-                Err(e) => {
-                    report_error_new(engine_state, &e);
-                }
+            if let Err(e) = engine_state.merge_env(stack) {
+                report_error_new(engine_state, &e);
             }
         }
     }
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 29c2f62734..e79f41eb21 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -15,10 +15,7 @@ use crate::{
 use crossterm::cursor::SetCursorStyle;
 use log::{error, trace, warn};
 use miette::{ErrReport, IntoDiagnostic, Result};
-use nu_cmd_base::{
-    hook::eval_hook,
-    util::{get_editor, get_guaranteed_cwd},
-};
+use nu_cmd_base::{hook::eval_hook, util::get_editor};
 use nu_color_config::StyleComputer;
 #[allow(deprecated)]
 use nu_engine::{convert_env_values, current_dir_str, env_to_strings};
@@ -118,8 +115,7 @@ pub fn evaluate_repl(
             PipelineData::empty(),
             false,
         );
-        let cwd = get_guaranteed_cwd(engine_state, &unique_stack);
-        engine_state.merge_env(&mut unique_stack, cwd)?;
+        engine_state.merge_env(&mut unique_stack)?;
     }
 
     let hostname = System::host_name();
@@ -281,12 +277,10 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
         hostname,
     } = ctx;
 
-    let cwd = get_guaranteed_cwd(engine_state, &stack);
-
     let mut start_time = std::time::Instant::now();
     // Before doing anything, merge the environment from the previous REPL iteration into the
     // permanent state.
-    if let Err(err) = engine_state.merge_env(&mut stack, cwd) {
+    if let Err(err) = engine_state.merge_env(&mut stack) {
         report_error_new(engine_state, &err);
     }
     perf(
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index cb883b67db..a3eb692adf 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -18,11 +18,11 @@ use support::{
 #[fixture]
 fn completer() -> NuCompleter {
     // Create a new engine
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Add record value as example
     let record = "def tst [--mod -s] {}";
-    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack).is_ok());
 
     // Instantiate a new completer
     NuCompleter::new(Arc::new(engine), Arc::new(stack))
@@ -31,12 +31,12 @@ fn completer() -> NuCompleter {
 #[fixture]
 fn completer_strings() -> NuCompleter {
     // Create a new engine
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Add record value as example
     let record = r#"def animals [] { ["cat", "dog", "eel" ] }
     def my-command [animal: string@animals] { print $animal }"#;
-    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack).is_ok());
 
     // Instantiate a new completer
     NuCompleter::new(Arc::new(engine), Arc::new(stack))
@@ -45,7 +45,7 @@ fn completer_strings() -> NuCompleter {
 #[fixture]
 fn extern_completer() -> NuCompleter {
     // Create a new engine
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Add record value as example
     let record = r#"
@@ -56,7 +56,7 @@ fn extern_completer() -> NuCompleter {
             -b: string@animals
         ]
     "#;
-    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack).is_ok());
 
     // Instantiate a new completer
     NuCompleter::new(Arc::new(engine), Arc::new(stack))
@@ -65,7 +65,7 @@ fn extern_completer() -> NuCompleter {
 #[fixture]
 fn custom_completer() -> NuCompleter {
     // Create a new engine
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Add record value as example
     let record = r#"
@@ -79,7 +79,7 @@ fn custom_completer() -> NuCompleter {
             completer: $external_completer
         }
     "#;
-    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack).is_ok());
 
     // Instantiate a new completer
     NuCompleter::new(Arc::new(engine), Arc::new(stack))
@@ -705,11 +705,11 @@ fn folder_with_directorycompletions() {
 #[test]
 fn variables_completions() {
     // Create a new engine
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Add record value as example
     let record = "let actor = { name: 'Tom Hardy', age: 44 }";
-    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack).is_ok());
 
     // Instantiate a new completer
     let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
@@ -812,11 +812,11 @@ fn variables_completions() {
 
 #[test]
 fn alias_of_command_and_flags() {
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Create an alias
     let alias = r#"alias ll = ls -l"#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack).is_ok());
 
     let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
 
@@ -831,11 +831,11 @@ fn alias_of_command_and_flags() {
 
 #[test]
 fn alias_of_basic_command() {
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Create an alias
     let alias = r#"alias ll = ls "#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack).is_ok());
 
     let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
 
@@ -850,14 +850,14 @@ fn alias_of_basic_command() {
 
 #[test]
 fn alias_of_another_alias() {
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Create an alias
     let alias = r#"alias ll = ls -la"#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir.clone()).is_ok());
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack).is_ok());
     // Create the second alias
     let alias = r#"alias lf = ll -f"#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack).is_ok());
 
     let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
 
@@ -874,7 +874,7 @@ fn run_external_completion(completer: &str, input: &str) -> Vec<Suggestion> {
     let completer = format!("$env.config.completions.external.completer = {completer}");
 
     // Create a new engine
-    let (dir, _, mut engine_state, mut stack) = new_engine();
+    let (_, _, mut engine_state, mut stack) = new_engine();
     let (block, delta) = {
         let mut working_set = StateWorkingSet::new(&engine_state);
         let block = parse(&mut working_set, None, completer.as_bytes(), false);
@@ -890,7 +890,7 @@ fn run_external_completion(completer: &str, input: &str) -> Vec<Suggestion> {
     );
 
     // Merge environment into the permanent state
-    assert!(engine_state.merge_env(&mut stack, &dir).is_ok());
+    assert!(engine_state.merge_env(&mut stack).is_ok());
 
     // Instantiate a new completer
     let mut completer = NuCompleter::new(Arc::new(engine_state), Arc::new(stack));
@@ -1068,11 +1068,11 @@ fn custom_completer_triggers_cursor_after_word(mut custom_completer: NuCompleter
 #[ignore = "was reverted, still needs fixing"]
 #[rstest]
 fn alias_offset_bug_7648() {
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Create an alias
     let alias = r#"alias ea = ^$env.EDITOR /tmp/test.s"#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack).is_ok());
 
     let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
 
@@ -1087,11 +1087,11 @@ fn alias_offset_bug_7648() {
 #[ignore = "was reverted, still needs fixing"]
 #[rstest]
 fn alias_offset_bug_7754() {
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Create an alias
     let alias = r#"alias ll = ls -l"#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack).is_ok());
 
     let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
 
diff --git a/crates/nu-cli/tests/completions/support/completions_helpers.rs b/crates/nu-cli/tests/completions/support/completions_helpers.rs
index 47f46ab00e..df92979e23 100644
--- a/crates/nu-cli/tests/completions/support/completions_helpers.rs
+++ b/crates/nu-cli/tests/completions/support/completions_helpers.rs
@@ -62,7 +62,7 @@ pub fn new_engine() -> (PathBuf, String, EngineState, Stack) {
     );
 
     // Merge environment into the permanent state
-    let merge_result = engine_state.merge_env(&mut stack, &dir);
+    let merge_result = engine_state.merge_env(&mut stack);
     assert!(merge_result.is_ok());
 
     (dir, dir_str, engine_state, stack)
@@ -97,7 +97,7 @@ pub fn new_quote_engine() -> (PathBuf, String, EngineState, Stack) {
     );
 
     // Merge environment into the permanent state
-    let merge_result = engine_state.merge_env(&mut stack, &dir);
+    let merge_result = engine_state.merge_env(&mut stack);
     assert!(merge_result.is_ok());
 
     (dir, dir_str, engine_state, stack)
@@ -132,7 +132,7 @@ pub fn new_partial_engine() -> (PathBuf, String, EngineState, Stack) {
     );
 
     // Merge environment into the permanent state
-    let merge_result = engine_state.merge_env(&mut stack, &dir);
+    let merge_result = engine_state.merge_env(&mut stack);
     assert!(merge_result.is_ok());
 
     (dir, dir_str, engine_state, stack)
@@ -173,7 +173,6 @@ pub fn merge_input(
     input: &[u8],
     engine_state: &mut EngineState,
     stack: &mut Stack,
-    dir: PathBuf,
 ) -> Result<(), ShellError> {
     let (block, delta) = {
         let mut working_set = StateWorkingSet::new(engine_state);
@@ -196,5 +195,5 @@ pub fn merge_input(
     .is_ok());
 
     // Merge environment into the permanent state
-    engine_state.merge_env(stack, &dir)
+    engine_state.merge_env(stack)
 }
diff --git a/crates/nu-cmd-base/src/hook.rs b/crates/nu-cmd-base/src/hook.rs
index 76c13bd5c3..9133cf4167 100644
--- a/crates/nu-cmd-base/src/hook.rs
+++ b/crates/nu-cmd-base/src/hook.rs
@@ -1,4 +1,3 @@
-use crate::util::get_guaranteed_cwd;
 use miette::Result;
 use nu_engine::{eval_block, eval_block_with_early_return};
 use nu_parser::parse;
@@ -284,8 +283,7 @@ pub fn eval_hook(
         }
     }
 
-    let cwd = get_guaranteed_cwd(engine_state, stack);
-    engine_state.merge_env(stack, cwd)?;
+    engine_state.merge_env(stack)?;
 
     Ok(output)
 }
diff --git a/crates/nu-cmd-lang/src/example_support.rs b/crates/nu-cmd-lang/src/example_support.rs
index bb03bbaf8c..d938729fef 100644
--- a/crates/nu-cmd-lang/src/example_support.rs
+++ b/crates/nu-cmd-lang/src/example_support.rs
@@ -138,7 +138,7 @@ pub fn check_example_evaluates_to_expected_output(
     stack.add_env_var("PWD".to_string(), Value::test_string(cwd.to_string_lossy()));
 
     engine_state
-        .merge_env(&mut stack, cwd)
+        .merge_env(&mut stack)
         .expect("Error merging environment");
 
     let empty_input = PipelineData::empty();
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index 710ca77d4c..10c96b7463 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -277,11 +277,7 @@ impl EngineState {
     }
 
     /// Merge the environment from the runtime Stack into the engine state
-    pub fn merge_env(
-        &mut self,
-        stack: &mut Stack,
-        cwd: impl AsRef<Path>,
-    ) -> Result<(), ShellError> {
+    pub fn merge_env(&mut self, stack: &mut Stack) -> Result<(), ShellError> {
         let mut config_updated = false;
 
         for mut scope in stack.env_vars.drain(..) {
@@ -311,9 +307,6 @@ impl EngineState {
             }
         }
 
-        // TODO: better error
-        std::env::set_current_dir(cwd)?;
-
         if config_updated {
             // Make plugin GC config changes take effect immediately.
             #[cfg(feature = "plugin")]
diff --git a/crates/nu-std/src/lib.rs b/crates/nu-std/src/lib.rs
index a20e3fc5da..e6c8f30556 100644
--- a/crates/nu-std/src/lib.rs
+++ b/crates/nu-std/src/lib.rs
@@ -98,8 +98,7 @@ use std pwd
 
     eval_block::<WithoutDebug>(engine_state, &mut stack, &block, pipeline_data)?;
 
-    let cwd = engine_state.cwd(Some(&stack))?;
-    engine_state.merge_env(&mut stack, cwd)?;
+    engine_state.merge_env(&mut stack)?;
 
     Ok(())
 }
diff --git a/src/config_files.rs b/src/config_files.rs
index ec4511860f..3df076045f 100644
--- a/src/config_files.rs
+++ b/src/config_files.rs
@@ -164,15 +164,8 @@ pub(crate) fn read_default_env_file(engine_state: &mut EngineState, stack: &mut
     );
 
     // Merge the environment in case env vars changed in the config
-    match engine_state.cwd(Some(stack)) {
-        Ok(cwd) => {
-            if let Err(e) = engine_state.merge_env(stack, cwd) {
-                report_error_new(engine_state, &e);
-            }
-        }
-        Err(e) => {
-            report_error_new(engine_state, &e);
-        }
+    if let Err(e) = engine_state.merge_env(stack) {
+        report_error_new(engine_state, &e);
     }
 }
 
@@ -202,15 +195,8 @@ fn eval_default_config(
     );
 
     // Merge the environment in case env vars changed in the config
-    match engine_state.cwd(Some(stack)) {
-        Ok(cwd) => {
-            if let Err(e) = engine_state.merge_env(stack, cwd) {
-                report_error_new(engine_state, &e);
-            }
-        }
-        Err(e) => {
-            report_error_new(engine_state, &e);
-        }
+    if let Err(e) = engine_state.merge_env(stack) {
+        report_error_new(engine_state, &e);
     }
 }
 
diff --git a/src/test_bins.rs b/src/test_bins.rs
index 73a760ada1..d96c74a911 100644
--- a/src/test_bins.rs
+++ b/src/test_bins.rs
@@ -250,13 +250,9 @@ pub fn nu_repl() {
     for (i, line) in source_lines.iter().enumerate() {
         let mut stack = Stack::with_parent(top_stack.clone());
 
-        let cwd = engine_state
-            .cwd(Some(&stack))
-            .unwrap_or_else(|err| outcome_err(&engine_state, &err));
-
         // Before doing anything, merge the environment from the previous REPL iteration into the
         // permanent state.
-        if let Err(err) = engine_state.merge_env(&mut stack, &cwd) {
+        if let Err(err) = engine_state.merge_env(&mut stack) {
             outcome_err(&engine_state, &err);
         }
 

From ac4125f8edd5b8f3f68aa653d03d57b2d25f1da1 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Thu, 23 May 2024 01:00:58 +0800
Subject: [PATCH 0024/1072] fix range semantic in detect_columns, str
 substring, str index-of (#12894)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
Fixes: https://github.com/nushell/nushell/issues/7761

It's still unsure if we want to change the `range semantic` itself, but
it's good to keep range semantic consistent between nushell commands.

# User-Facing Changes
### Before
```nushell
❯ "abc" | str substring 1..=2
b
```
### After
```nushell
❯ "abc" | str substring 1..=2
bc
```

# Tests + Formatting
Adjust tests to fit new behavior
---
 crates/nu-cmd-base/src/util.rs                     | 4 ++--
 crates/nu-command/src/strings/str_/index_of.rs     | 2 +-
 crates/nu-command/src/strings/str_/substring.rs    | 6 +++---
 crates/nu-command/tests/commands/detect_columns.rs | 6 +++---
 crates/nu-command/tests/commands/str_/mod.rs       | 4 ++--
 tests/repl/test_strings.rs                         | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/crates/nu-cmd-base/src/util.rs b/crates/nu-cmd-base/src/util.rs
index 9c63dec836..559161329b 100644
--- a/crates/nu-cmd-base/src/util.rs
+++ b/crates/nu-cmd-base/src/util.rs
@@ -25,8 +25,8 @@ pub fn process_range(range: &Range) -> Result<(isize, isize), MakeRangeError> {
         Range::IntRange(range) => {
             let start = range.start().try_into().unwrap_or(0);
             let end = match range.end() {
-                Bound::Included(v) => v as isize,
-                Bound::Excluded(v) => (v - 1) as isize,
+                Bound::Included(v) => (v + 1) as isize,
+                Bound::Excluded(v) => v as isize,
                 Bound::Unbounded => isize::MAX,
             };
             Ok((start, end))
diff --git a/crates/nu-command/src/strings/str_/index_of.rs b/crates/nu-command/src/strings/str_/index_of.rs
index 457713c2df..df26df7493 100644
--- a/crates/nu-command/src/strings/str_/index_of.rs
+++ b/crates/nu-command/src/strings/str_/index_of.rs
@@ -405,7 +405,7 @@ mod tests {
         let range = Range::new(
             Value::int(0, Span::test_data()),
             Value::int(1, Span::test_data()),
-            Value::int(3, Span::test_data()),
+            Value::int(2, Span::test_data()),
             RangeInclusion::Inclusive,
             Span::test_data(),
         )
diff --git a/crates/nu-command/src/strings/str_/substring.rs b/crates/nu-command/src/strings/str_/substring.rs
index 55871401ef..4f5c953dda 100644
--- a/crates/nu-command/src/strings/str_/substring.rs
+++ b/crates/nu-command/src/strings/str_/substring.rs
@@ -70,7 +70,7 @@ impl Command for SubCommand {
     }
 
     fn usage(&self) -> &str {
-        "Get part of a string. Note that the start is included but the end is excluded, and that the first character of a string is index 0."
+        "Get part of a string. Note that the first character of a string is index 0."
     }
 
     fn search_terms(&self) -> Vec<&str> {
@@ -108,12 +108,12 @@ impl Command for SubCommand {
             Example {
                 description:
                     "Get a substring \"nushell\" from the text \"good nushell\" using a range",
-                example: " 'good nushell' | str substring 5..12",
+                example: " 'good nushell' | str substring 5..11",
                 result: Some(Value::test_string("nushell")),
             },
             Example {
                 description: "Count indexes and split using grapheme clusters",
-                example: " '🇯🇵ほげ ふが ぴよ' | str substring --grapheme-clusters 4..6",
+                example: " '🇯🇵ほげ ふが ぴよ' | str substring --grapheme-clusters 4..5",
                 result: Some(Value::test_string("ふが")),
             },
         ]
diff --git a/crates/nu-command/tests/commands/detect_columns.rs b/crates/nu-command/tests/commands/detect_columns.rs
index d605eb4aa1..5bc057fa18 100644
--- a/crates/nu-command/tests/commands/detect_columns.rs
+++ b/crates/nu-command/tests/commands/detect_columns.rs
@@ -31,12 +31,12 @@ fn detect_columns_with_legacy_and_flag_c() {
         (
             "$\"c1 c2 c3 c4 c5(char nl)a b c d e\"",
             "[[c1,c3,c4,c5]; ['a b',c,d,e]]",
-            "0..1",
+            "0..0",
         ),
         (
             "$\"c1 c2 c3 c4 c5(char nl)a b c d e\"",
             "[[c1,c2,c3,c4]; [a,b,c,'d e']]",
-            "(-2)..(-1)",
+            "(-2)..(-2)",
         ),
         (
             "$\"c1 c2 c3 c4 c5(char nl)a b c d e\"",
@@ -77,7 +77,7 @@ drwxr-xr-x  4 root root 4.0K Mar 20 08:18 ~(char nl)
 ['drwxr-xr-x', '4', 'root', 'root', '4.0K', 'Mar 20 08:18', '~'],
 ['-rw-r--r--',  '1', 'root', 'root', '3.0K', 'Mar 20 07:23', '~asdf']
 ]";
-    let range = "5..7";
+    let range = "5..6";
     let cmd = format!(
         "({} | detect columns -c {} -s 1 --no-headers) == {}",
         pipeline(body),
diff --git a/crates/nu-command/tests/commands/str_/mod.rs b/crates/nu-command/tests/commands/str_/mod.rs
index 9efa28b1ef..43f59b3e10 100644
--- a/crates/nu-command/tests/commands/str_/mod.rs
+++ b/crates/nu-command/tests/commands/str_/mod.rs
@@ -269,7 +269,7 @@ fn substring_errors_if_start_index_is_greater_than_end_index() {
             cwd: dirs.test(), pipeline(
             r#"
                  open sample.toml
-                 | str substring 6..5 fortune.teller.phone
+                 | str substring 6..4 fortune.teller.phone
              "#
         ));
 
@@ -342,7 +342,7 @@ fn substrings_the_input_and_treats_start_index_as_zero_if_blank_start_index_give
             cwd: dirs.test(), pipeline(
             r#"
                  open sample.toml
-                 | str substring ..2 package.name
+                 | str substring ..1 package.name
                  | get package.name
              "#
         ));
diff --git a/tests/repl/test_strings.rs b/tests/repl/test_strings.rs
index fa6c419e23..62960fed13 100644
--- a/tests/repl/test_strings.rs
+++ b/tests/repl/test_strings.rs
@@ -3,7 +3,7 @@ use crate::repl::tests::{fail_test, run_test, TestResult};
 #[test]
 fn cjk_in_substrings() -> TestResult {
     run_test(
-        r#"let s = '[Rust 程序设计语言](title-page.md)'; let start = ($s | str index-of '('); let end = ($s | str index-of ')'); $s | str substring ($start + 1)..($end)"#,
+        r#"let s = '[Rust 程序设计语言](title-page.md)'; let start = ($s | str index-of '('); let end = ($s | str index-of ')'); $s | str substring ($start + 1)..<($end)"#,
         "title-page.md",
     )
 }

From 64afb52ffaa68ac761b5f5d05d51d3fb1547084b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C5=BD=C3=A1dn=C3=ADk?= <kubouch@gmail.com>
Date: Thu, 23 May 2024 00:24:22 +0300
Subject: [PATCH 0025/1072] Fix leftover wrong column name (#12937)

# Description

Small fixup for https://github.com/nushell/nushell/pull/12930
---
 crates/nu-protocol/src/debugger/profiler.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-protocol/src/debugger/profiler.rs b/crates/nu-protocol/src/debugger/profiler.rs
index b95bf571b4..0fa2d4f3aa 100644
--- a/crates/nu-protocol/src/debugger/profiler.rs
+++ b/crates/nu-protocol/src/debugger/profiler.rs
@@ -310,7 +310,7 @@ fn collect_data(
     if profiler.collect_lines {
         if let Some((fname, line_num)) = find_file_of_span(engine_state, element.element_span) {
             row.push("file", Value::string(fname, profiler_span));
-            row.push("line_num", Value::int(line_num as i64, profiler_span));
+            row.push("line", Value::int(line_num as i64, profiler_span));
         } else {
             row.push("file", Value::nothing(profiler_span));
             row.push("line", Value::nothing(profiler_span));

From 6c649809d38a687cd63b59ab028b7f30207e5663 Mon Sep 17 00:00:00 2001
From: YizhePKU <yizhe@pku.edu.cn>
Date: Thu, 23 May 2024 10:05:27 +0800
Subject: [PATCH 0026/1072] Rewrite run_external.rs (#12921)

This PR is a complete rewrite of `run_external.rs`. The main goal of the
rewrite is improving readability, but it also fixes some bugs related to
argument handling and the PATH variable (fixes
https://github.com/nushell/nushell/issues/6011).

I'll discuss some technical details to make reviewing easier.

## Argument handling

Quoting arguments for external commands is hard. Like, *really* hard.
We've had more than a dozen issues and PRs dedicated to quoting
arguments (see Appendix) but the current implementation is still buggy.

Here's a demonstration of the buggy behavior:

```nu
let foo = "'bar'"
^touch $foo            # This creates a file named `bar`, but it should be `'bar'`
^touch ...[ "'bar'" ]  # Same
```

I'll describe how this PR deals with argument handling.

First, we'll introduce the concept of **bare strings**. Bare strings are
**string literals** that are either **unquoted** or **quoted by
backticks** [^1]. Strings within a list literal are NOT considered bare
strings, even if they are unquoted or quoted by backticks.

When a bare string is used as an argument to external process, we need
to perform tilde-expansion, glob-expansion, and inner-quotes-removal, in
that order. "Inner-quotes-removal" means transforming from
`--option="value"` into `--option=value`.

## `.bat` files and CMD built-ins

On Windows, `.bat` files and `.cmd` files are considered executable, but
they need `CMD.exe` as the interpreter. The Rust standard library
supports running `.bat` files directly and will spawn `CMD.exe` under
the hood (see
[documentation](https://doc.rust-lang.org/std/process/index.html#windows-argument-splitting)).
However, other extensions are not supported [^2].

Nushell also supports a selected number of CMD built-ins. The problem
with CMD is that it uses a different set of quoting rules. Correctly
quoting for CMD requires using
[Command::raw_arg()](https://doc.rust-lang.org/std/os/windows/process/trait.CommandExt.html#tymethod.raw_arg)
and manually quoting CMD special characters, on top of quoting from the
Nushell side. ~~I decided that this is too complex and chose to reject
special characters in CMD built-ins instead [^3]. Hopefully this will
not affact real-world use cases.~~ I've implemented escaping that works
reasonably well.

## `which-support` feature

The `which` crate is now a hard dependency of `nu-command`, making the
`which-support` feature essentially useless. The `which` crate is
already a hard dependency of `nu-cli`, and we should consider removing
the `which-support` feature entirely.

## Appendix

Here's a list of quoting-related issues and PRs in rough chronological
order.

* https://github.com/nushell/nushell/issues/4609
* https://github.com/nushell/nushell/issues/4631
* https://github.com/nushell/nushell/issues/4601
  * https://github.com/nushell/nushell/pull/5846
* https://github.com/nushell/nushell/issues/5978
  * https://github.com/nushell/nushell/pull/6014
* https://github.com/nushell/nushell/issues/6154
  * https://github.com/nushell/nushell/pull/6161
* https://github.com/nushell/nushell/issues/6399
  * https://github.com/nushell/nushell/pull/6420
  * https://github.com/nushell/nushell/pull/6426
* https://github.com/nushell/nushell/issues/6465
* https://github.com/nushell/nushell/issues/6559
  * https://github.com/nushell/nushell/pull/6560

[^1]: The idea that backtick-quoted strings act like bare strings was
introduced by Kubouch and briefly mentioned in [the language
reference](https://www.nushell.sh/lang-guide/chapters/strings_and_text.html#backtick-quotes).

[^2]: The documentation also said "running .bat scripts in this way may
be removed in the future and so should not be relied upon", which is
another reason to move away from this. But again, quoting for CMD is
hard.

[^3]: If anyone wants to try, the best resource I found on the topic is
[this](https://daviddeley.com/autohotkey/parameters/parameters.htm).
---
 Cargo.lock                                    |    1 +
 crates/nu-command/Cargo.toml                  |    5 +-
 .../nu-command/src/env/config/config_env.rs   |   75 +-
 crates/nu-command/src/env/config/config_nu.rs |   75 +-
 crates/nu-command/src/env/config/mod.rs       |    1 -
 crates/nu-command/src/env/config/utils.rs     |   36 -
 crates/nu-command/src/system/exec.rs          |  120 +-
 crates/nu-command/src/system/mod.rs           |    2 +-
 crates/nu-command/src/system/run_external.rs  | 1217 ++++++++---------
 crates/nu-command/tests/commands/all.rs       |    4 +-
 crates/nu-command/tests/commands/any.rs       |    4 +-
 crates/nu-command/tests/commands/complete.rs  |    2 +-
 .../nu-command/tests/commands/source_env.rs   |    8 +-
 crates/nu-command/tests/commands/use_.rs      |   10 +-
 src/test_bins.rs                              |    1 +
 tests/repl/test_known_external.rs             |   12 +-
 tests/repl/test_parser.rs                     |    4 +-
 tests/repl/test_spread.rs                     |    7 +-
 tests/shell/pipeline/commands/external.rs     |    6 +-
 tests/shell/pipeline/commands/internal.rs     |   11 +-
 20 files changed, 803 insertions(+), 798 deletions(-)
 delete mode 100644 crates/nu-command/src/env/config/utils.rs

diff --git a/Cargo.lock b/Cargo.lock
index 362d64ba99..e074e772a3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3012,6 +3012,7 @@ dependencies = [
  "sha2",
  "sysinfo",
  "tabled",
+ "tempfile",
  "terminal_size",
  "titlecase",
  "toml 0.8.12",
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 6010e16285..d3456764fd 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -99,7 +99,7 @@ uu_whoami = { workspace = true }
 uuid = { workspace = true, features = ["v4"] }
 v_htmlescape = { workspace = true }
 wax = { workspace = true }
-which = { workspace = true, optional = true }
+which = { workspace = true }
 unicode-width = { workspace = true }
 
 [target.'cfg(windows)'.dependencies]
@@ -134,7 +134,7 @@ workspace = true
 plugin = ["nu-parser/plugin"]
 sqlite = ["rusqlite"]
 trash-support = ["trash"]
-which-support = ["which"]
+which-support = []
 
 [dev-dependencies]
 nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.93.1" }
@@ -146,3 +146,4 @@ quickcheck = { workspace = true }
 quickcheck_macros = { workspace = true }
 rstest = { workspace = true, default-features = false }
 pretty_assertions = { workspace = true }
+tempfile = { workspace = true }
diff --git a/crates/nu-command/src/env/config/config_env.rs b/crates/nu-command/src/env/config/config_env.rs
index 3c8dff487e..32bd7bba90 100644
--- a/crates/nu-command/src/env/config/config_env.rs
+++ b/crates/nu-command/src/env/config/config_env.rs
@@ -1,6 +1,7 @@
-use super::utils::gen_command;
 use nu_cmd_base::util::get_editor;
 use nu_engine::{command_prelude::*, env_to_strings};
+use nu_protocol::{process::ChildProcess, ByteStream};
+use nu_system::ForegroundChild;
 
 #[derive(Clone)]
 pub struct ConfigEnv;
@@ -47,7 +48,7 @@ impl Command for ConfigEnv {
         engine_state: &EngineState,
         stack: &mut Stack,
         call: &Call,
-        input: PipelineData,
+        _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         // `--default` flag handling
         if call.has_flag(engine_state, stack, "default")? {
@@ -55,27 +56,59 @@ impl Command for ConfigEnv {
             return Ok(Value::string(nu_utils::get_default_env(), head).into_pipeline_data());
         }
 
-        let env_vars_str = env_to_strings(engine_state, stack)?;
-        let nu_config = match engine_state.get_config_path("env-path") {
-            Some(path) => path,
-            None => {
-                return Err(ShellError::GenericError {
-                    error: "Could not find $nu.env-path".into(),
-                    msg: "Could not find $nu.env-path".into(),
-                    span: None,
-                    help: None,
-                    inner: vec![],
-                });
-            }
+        // Find the editor executable.
+        let (editor_name, editor_args) = get_editor(engine_state, stack, call.head)?;
+        let paths = nu_engine::env::path_str(engine_state, stack, call.head)?;
+        let cwd = engine_state.cwd(Some(stack))?;
+        let editor_executable =
+            crate::which(&editor_name, &paths, &cwd).ok_or(ShellError::ExternalCommand {
+                label: format!("`{editor_name}` not found"),
+                help: "Failed to find the editor executable".into(),
+                span: call.head,
+            })?;
+
+        let Some(env_path) = engine_state.get_config_path("env-path") else {
+            return Err(ShellError::GenericError {
+                error: "Could not find $nu.env-path".into(),
+                msg: "Could not find $nu.env-path".into(),
+                span: None,
+                help: None,
+                inner: vec![],
+            });
         };
+        let env_path = env_path.to_string_lossy().to_string();
 
-        let (item, config_args) = get_editor(engine_state, stack, call.head)?;
+        // Create the command.
+        let mut command = std::process::Command::new(editor_executable);
 
-        gen_command(call.head, nu_config, item, config_args, env_vars_str).run_with_input(
-            engine_state,
-            stack,
-            input,
-            true,
-        )
+        // Configure PWD.
+        command.current_dir(cwd);
+
+        // Configure environment variables.
+        let envs = env_to_strings(engine_state, stack)?;
+        command.env_clear();
+        command.envs(envs);
+
+        // Configure args.
+        command.arg(env_path);
+        command.args(editor_args);
+
+        // Spawn the child process. On Unix, also put the child process to
+        // foreground if we're in an interactive session.
+        #[cfg(windows)]
+        let child = ForegroundChild::spawn(command)?;
+        #[cfg(unix)]
+        let child = ForegroundChild::spawn(
+            command,
+            engine_state.is_interactive,
+            &engine_state.pipeline_externals_state,
+        )?;
+
+        // Wrap the output into a `PipelineData::ByteStream`.
+        let child = ChildProcess::new(child, None, false, call.head)?;
+        Ok(PipelineData::ByteStream(
+            ByteStream::child(child, call.head),
+            None,
+        ))
     }
 }
diff --git a/crates/nu-command/src/env/config/config_nu.rs b/crates/nu-command/src/env/config/config_nu.rs
index c43d8d0726..08695ca5bb 100644
--- a/crates/nu-command/src/env/config/config_nu.rs
+++ b/crates/nu-command/src/env/config/config_nu.rs
@@ -1,6 +1,7 @@
-use super::utils::gen_command;
 use nu_cmd_base::util::get_editor;
 use nu_engine::{command_prelude::*, env_to_strings};
+use nu_protocol::{process::ChildProcess, ByteStream};
+use nu_system::ForegroundChild;
 
 #[derive(Clone)]
 pub struct ConfigNu;
@@ -51,7 +52,7 @@ impl Command for ConfigNu {
         engine_state: &EngineState,
         stack: &mut Stack,
         call: &Call,
-        input: PipelineData,
+        _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         // `--default` flag handling
         if call.has_flag(engine_state, stack, "default")? {
@@ -59,27 +60,59 @@ impl Command for ConfigNu {
             return Ok(Value::string(nu_utils::get_default_config(), head).into_pipeline_data());
         }
 
-        let env_vars_str = env_to_strings(engine_state, stack)?;
-        let nu_config = match engine_state.get_config_path("config-path") {
-            Some(path) => path,
-            None => {
-                return Err(ShellError::GenericError {
-                    error: "Could not find $nu.config-path".into(),
-                    msg: "Could not find $nu.config-path".into(),
-                    span: None,
-                    help: None,
-                    inner: vec![],
-                });
-            }
+        // Find the editor executable.
+        let (editor_name, editor_args) = get_editor(engine_state, stack, call.head)?;
+        let paths = nu_engine::env::path_str(engine_state, stack, call.head)?;
+        let cwd = engine_state.cwd(Some(stack))?;
+        let editor_executable =
+            crate::which(&editor_name, &paths, &cwd).ok_or(ShellError::ExternalCommand {
+                label: format!("`{editor_name}` not found"),
+                help: "Failed to find the editor executable".into(),
+                span: call.head,
+            })?;
+
+        let Some(config_path) = engine_state.get_config_path("config-path") else {
+            return Err(ShellError::GenericError {
+                error: "Could not find $nu.config-path".into(),
+                msg: "Could not find $nu.config-path".into(),
+                span: None,
+                help: None,
+                inner: vec![],
+            });
         };
+        let config_path = config_path.to_string_lossy().to_string();
 
-        let (item, config_args) = get_editor(engine_state, stack, call.head)?;
+        // Create the command.
+        let mut command = std::process::Command::new(editor_executable);
 
-        gen_command(call.head, nu_config, item, config_args, env_vars_str).run_with_input(
-            engine_state,
-            stack,
-            input,
-            true,
-        )
+        // Configure PWD.
+        command.current_dir(cwd);
+
+        // Configure environment variables.
+        let envs = env_to_strings(engine_state, stack)?;
+        command.env_clear();
+        command.envs(envs);
+
+        // Configure args.
+        command.arg(config_path);
+        command.args(editor_args);
+
+        // Spawn the child process. On Unix, also put the child process to
+        // foreground if we're in an interactive session.
+        #[cfg(windows)]
+        let child = ForegroundChild::spawn(command)?;
+        #[cfg(unix)]
+        let child = ForegroundChild::spawn(
+            command,
+            engine_state.is_interactive,
+            &engine_state.pipeline_externals_state,
+        )?;
+
+        // Wrap the output into a `PipelineData::ByteStream`.
+        let child = ChildProcess::new(child, None, false, call.head)?;
+        Ok(PipelineData::ByteStream(
+            ByteStream::child(child, call.head),
+            None,
+        ))
     }
 }
diff --git a/crates/nu-command/src/env/config/mod.rs b/crates/nu-command/src/env/config/mod.rs
index 9cd93d2491..fa6a3b4ca3 100644
--- a/crates/nu-command/src/env/config/mod.rs
+++ b/crates/nu-command/src/env/config/mod.rs
@@ -2,7 +2,6 @@ mod config_;
 mod config_env;
 mod config_nu;
 mod config_reset;
-mod utils;
 pub use config_::ConfigMeta;
 pub use config_env::ConfigEnv;
 pub use config_nu::ConfigNu;
diff --git a/crates/nu-command/src/env/config/utils.rs b/crates/nu-command/src/env/config/utils.rs
deleted file mode 100644
index 4b3ea43483..0000000000
--- a/crates/nu-command/src/env/config/utils.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use crate::ExternalCommand;
-use nu_protocol::{OutDest, Span, Spanned};
-use std::{collections::HashMap, path::Path};
-
-pub(crate) fn gen_command(
-    span: Span,
-    config_path: &Path,
-    item: String,
-    config_args: Vec<String>,
-    env_vars_str: HashMap<String, String>,
-) -> ExternalCommand {
-    let name = Spanned { item, span };
-
-    let mut args = vec![Spanned {
-        item: config_path.to_string_lossy().to_string(),
-        span: Span::unknown(),
-    }];
-
-    let number_of_args = config_args.len() + 1;
-
-    for arg in config_args {
-        args.push(Spanned {
-            item: arg,
-            span: Span::unknown(),
-        })
-    }
-
-    ExternalCommand {
-        name,
-        args,
-        arg_keep_raw: vec![false; number_of_args],
-        out: OutDest::Inherit,
-        err: OutDest::Inherit,
-        env_vars: env_vars_str,
-    }
-}
diff --git a/crates/nu-command/src/system/exec.rs b/crates/nu-command/src/system/exec.rs
index 21c98f121b..35ab9428be 100644
--- a/crates/nu-command/src/system/exec.rs
+++ b/crates/nu-command/src/system/exec.rs
@@ -1,7 +1,4 @@
-use super::run_external::create_external_command;
-#[allow(deprecated)]
-use nu_engine::{command_prelude::*, current_dir};
-use nu_protocol::OutDest;
+use nu_engine::{command_prelude::*, env_to_strings};
 
 #[derive(Clone)]
 pub struct Exec;
@@ -35,7 +32,66 @@ On Windows based systems, Nushell will wait for the command to finish and then e
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        exec(engine_state, stack, call)
+        let cwd = engine_state.cwd(Some(stack))?;
+
+        // Find the absolute path to the executable. If the command is not
+        // found, display a helpful error message.
+        let name: Spanned<String> = call.req(engine_state, stack, 0)?;
+        let executable = {
+            let paths = nu_engine::env::path_str(engine_state, stack, call.head)?;
+            let Some(executable) = crate::which(&name.item, &paths, &cwd) else {
+                return Err(crate::command_not_found(
+                    &name.item,
+                    call.head,
+                    engine_state,
+                    stack,
+                ));
+            };
+            executable
+        };
+
+        // Create the command.
+        let mut command = std::process::Command::new(executable);
+
+        // Configure PWD.
+        command.current_dir(cwd);
+
+        // Configure environment variables.
+        let envs = env_to_strings(engine_state, stack)?;
+        command.env_clear();
+        command.envs(envs);
+
+        // Configure args.
+        let args = crate::eval_arguments_from_call(engine_state, stack, call)?;
+        command.args(args.into_iter().map(|s| s.item));
+
+        // Execute the child process, replacing/terminating the current process
+        // depending on platform.
+        #[cfg(unix)]
+        {
+            use std::os::unix::process::CommandExt;
+
+            let err = command.exec();
+            Err(ShellError::ExternalCommand {
+                label: "Failed to exec into new process".into(),
+                help: err.to_string(),
+                span: call.head,
+            })
+        }
+        #[cfg(windows)]
+        {
+            let mut child = command.spawn().map_err(|err| ShellError::ExternalCommand {
+                label: "Failed to exec into new process".into(),
+                help: err.to_string(),
+                span: call.head,
+            })?;
+            let status = child.wait().map_err(|err| ShellError::ExternalCommand {
+                label: "Failed to wait for child process".into(),
+                help: err.to_string(),
+                span: call.head,
+            })?;
+            std::process::exit(status.code().expect("status.code() succeeds on Windows"))
+        }
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -53,57 +109,3 @@ On Windows based systems, Nushell will wait for the command to finish and then e
         ]
     }
 }
-
-fn exec(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-) -> Result<PipelineData, ShellError> {
-    let mut external_command = create_external_command(engine_state, stack, call)?;
-    external_command.out = OutDest::Inherit;
-    external_command.err = OutDest::Inherit;
-
-    #[allow(deprecated)]
-    let cwd = current_dir(engine_state, stack)?;
-    let mut command = external_command.spawn_simple_command(&cwd.to_string_lossy())?;
-    command.current_dir(cwd);
-    command.envs(external_command.env_vars);
-
-    // this either replaces our process and should not return,
-    // or the exec fails and we get an error back
-    exec_impl(command, call.head)
-}
-
-#[cfg(unix)]
-fn exec_impl(mut command: std::process::Command, span: Span) -> Result<PipelineData, ShellError> {
-    use std::os::unix::process::CommandExt;
-
-    let error = command.exec();
-
-    Err(ShellError::GenericError {
-        error: "Error on exec".into(),
-        msg: error.to_string(),
-        span: Some(span),
-        help: None,
-        inner: vec![],
-    })
-}
-
-#[cfg(windows)]
-fn exec_impl(mut command: std::process::Command, span: Span) -> Result<PipelineData, ShellError> {
-    match command.spawn() {
-        Ok(mut child) => match child.wait() {
-            Ok(status) => std::process::exit(status.code().unwrap_or(0)),
-            Err(e) => Err(ShellError::ExternalCommand {
-                label: "Error in external command".into(),
-                help: e.to_string(),
-                span,
-            }),
-        },
-        Err(e) => Err(ShellError::ExternalCommand {
-            label: "Error spawning external command".into(),
-            help: e.to_string(),
-            span,
-        }),
-    }
-}
diff --git a/crates/nu-command/src/system/mod.rs b/crates/nu-command/src/system/mod.rs
index c0f890232d..a87aac8a07 100644
--- a/crates/nu-command/src/system/mod.rs
+++ b/crates/nu-command/src/system/mod.rs
@@ -33,7 +33,7 @@ pub use nu_check::NuCheck;
 pub use ps::Ps;
 #[cfg(windows)]
 pub use registry_query::RegistryQuery;
-pub use run_external::{External, ExternalCommand};
+pub use run_external::{command_not_found, eval_arguments_from_call, which, External};
 pub use sys::*;
 pub use uname::UName;
 pub use which_::Which;
diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index b37d3a2fcb..873cee19b1 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -1,15 +1,18 @@
 use nu_cmd_base::hook::eval_hook;
 use nu_engine::{command_prelude::*, env_to_strings, get_eval_expression};
-use nu_protocol::{ast::Expr, did_you_mean, process::ChildProcess, ByteStream, NuGlob, OutDest};
+use nu_protocol::{
+    ast::{Expr, Expression},
+    did_you_mean,
+    process::ChildProcess,
+    ByteStream, OutDest,
+};
 use nu_system::ForegroundChild;
 use nu_utils::IgnoreCaseExt;
-use os_pipe::PipeReader;
-use pathdiff::diff_paths;
 use std::{
-    collections::HashMap,
+    borrow::Cow,
     io::Write,
     path::{Path, PathBuf},
-    process::{Command as CommandSys, Stdio},
+    process::Stdio,
     sync::Arc,
     thread,
 };
@@ -41,8 +44,131 @@ impl Command for External {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let command = create_external_command(engine_state, stack, call)?;
-        command.run_with_input(engine_state, stack, input, false)
+        let cwd = engine_state.cwd(Some(stack))?;
+
+        // Find the absolute path to the executable. On Windows, set the
+        // executable to "cmd.exe" if it's is a CMD internal command. If the
+        // command is not found, display a helpful error message.
+        let name: Spanned<String> = call.req(engine_state, stack, 0)?;
+        let executable = if cfg!(windows) && is_cmd_internal_command(&name.item) {
+            PathBuf::from("cmd.exe")
+        } else {
+            let paths = nu_engine::env::path_str(engine_state, stack, call.head)?;
+            let Some(executable) = which(&name.item, &paths, &cwd) else {
+                return Err(command_not_found(
+                    &name.item,
+                    call.head,
+                    engine_state,
+                    stack,
+                ));
+            };
+            executable
+        };
+
+        // Create the command.
+        let mut command = std::process::Command::new(executable);
+
+        // Configure PWD.
+        command.current_dir(cwd);
+
+        // Configure environment variables.
+        let envs = env_to_strings(engine_state, stack)?;
+        command.env_clear();
+        command.envs(envs);
+
+        // Configure args.
+        let args = eval_arguments_from_call(engine_state, stack, call)?;
+        #[cfg(windows)]
+        if is_cmd_internal_command(&name.item) {
+            use std::os::windows::process::CommandExt;
+
+            // The /D flag disables execution of AutoRun commands from registry.
+            // The /C flag followed by a command name instructs CMD to execute
+            // that command and quit.
+            command.args(["/D", "/C", &name.item]);
+            for arg in &args {
+                command.raw_arg(escape_cmd_argument(arg)?.as_ref());
+            }
+        } else {
+            command.args(args.into_iter().map(|s| s.item));
+        }
+        #[cfg(not(windows))]
+        command.args(args.into_iter().map(|s| s.item));
+
+        // Configure stdout and stderr. If both are set to `OutDest::Pipe`,
+        // we'll setup a pipe that merge two streams into one.
+        let stdout = stack.stdout();
+        let stderr = stack.stderr();
+        let merged_stream = if matches!(stdout, OutDest::Pipe) && matches!(stderr, OutDest::Pipe) {
+            let (reader, writer) = os_pipe::pipe()?;
+            command.stdout(writer.try_clone()?);
+            command.stderr(writer);
+            Some(reader)
+        } else {
+            command.stdout(Stdio::try_from(stdout)?);
+            command.stderr(Stdio::try_from(stderr)?);
+            None
+        };
+
+        // Configure stdin. We'll try connecting input to the child process
+        // directly. If that's not possible, we'll setup a pipe and spawn a
+        // thread to copy data into the child process.
+        let data_to_copy_into_stdin = match input {
+            PipelineData::ByteStream(stream, metadata) => match stream.into_stdio() {
+                Ok(stdin) => {
+                    command.stdin(stdin);
+                    None
+                }
+                Err(stream) => {
+                    command.stdin(Stdio::piped());
+                    Some(PipelineData::ByteStream(stream, metadata))
+                }
+            },
+            PipelineData::Empty => {
+                command.stdin(Stdio::inherit());
+                None
+            }
+            value => {
+                command.stdin(Stdio::piped());
+                Some(value)
+            }
+        };
+
+        // Spawn the child process. On Unix, also put the child process to
+        // foreground if we're in an interactive session.
+        #[cfg(windows)]
+        let mut child = ForegroundChild::spawn(command)?;
+        #[cfg(unix)]
+        let mut child = ForegroundChild::spawn(
+            command,
+            engine_state.is_interactive,
+            &engine_state.pipeline_externals_state,
+        )?;
+
+        // If we need to copy data into the child process, do it now.
+        if let Some(data) = data_to_copy_into_stdin {
+            let stdin = child.as_mut().stdin.take().expect("stdin is piped");
+            let engine_state = engine_state.clone();
+            let stack = stack.clone();
+            thread::Builder::new()
+                .name("external stdin worker".into())
+                .spawn(move || {
+                    let _ = write_pipeline_data(engine_state, stack, data, stdin);
+                })
+                .err_span(call.head)?;
+        }
+
+        // Wrap the output into a `PipelineData::ByteStream`.
+        let child = ChildProcess::new(
+            child,
+            merged_stream,
+            matches!(stderr, OutDest::Pipe),
+            call.head,
+        )?;
+        Ok(PipelineData::ByteStream(
+            ByteStream::child(child, call.head),
+            None,
+        ))
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -66,679 +192,514 @@ impl Command for External {
     }
 }
 
-/// Creates ExternalCommand from a call
-pub fn create_external_command(
+/// Removes surrounding quotes from a string. Doesn't remove quotes from raw
+/// strings. Returns the original string if it doesn't have matching quotes.
+fn remove_quotes(s: &str) -> &str {
+    let quoted_by_double_quotes = s.len() >= 2 && s.starts_with('"') && s.ends_with('"');
+    let quoted_by_single_quotes = s.len() >= 2 && s.starts_with('\'') && s.ends_with('\'');
+    let quoted_by_backticks = s.len() >= 2 && s.starts_with('`') && s.ends_with('`');
+    if quoted_by_double_quotes || quoted_by_single_quotes || quoted_by_backticks {
+        &s[1..s.len() - 1]
+    } else {
+        s
+    }
+}
+
+/// Evaluate all arguments from a call, performing expansions when necessary.
+pub fn eval_arguments_from_call(
     engine_state: &EngineState,
     stack: &mut Stack,
     call: &Call,
-) -> Result<ExternalCommand, ShellError> {
-    let name: Spanned<String> = call.req(engine_state, stack, 0)?;
-
-    // Translate environment variables from Values to Strings
-    let env_vars_str = env_to_strings(engine_state, stack)?;
-
-    fn value_as_spanned(value: Value) -> Result<Spanned<String>, ShellError> {
-        let span = value.span();
-
-        value
-            .coerce_string()
-            .map(|item| Spanned { item, span })
-            .map_err(|_| ShellError::ExternalCommand {
-                label: format!("Cannot convert {} to a string", value.get_type()),
-                help: "All arguments to an external command need to be string-compatible".into(),
-                span,
-            })
-    }
-
-    let eval_expression = get_eval_expression(engine_state);
-
-    let mut spanned_args = vec![];
-    let mut arg_keep_raw = vec![];
-    for (arg, spread) in call.rest_iter(1) {
-        match eval_expression(engine_state, stack, arg)? {
-            Value::List { vals, .. } => {
-                if spread {
-                    // turn all the strings in the array into params.
-                    // Example: one_arg may be something like ["ls" "-a"]
-                    // convert it to "ls" "-a"
-                    for v in vals {
-                        spanned_args.push(value_as_spanned(v)?);
-                        // for arguments in list, it's always treated as a whole arguments
-                        arg_keep_raw.push(true);
-                    }
-                } else {
-                    return Err(ShellError::CannotPassListToExternal {
-                        arg: String::from_utf8_lossy(engine_state.get_span_contents(arg.span))
-                            .into(),
-                        span: arg.span,
-                    });
+) -> Result<Vec<Spanned<String>>, ShellError> {
+    let cwd = engine_state.cwd(Some(stack))?;
+    let mut args: Vec<Spanned<String>> = vec![];
+    for (expr, spread) in call.rest_iter(1) {
+        if is_bare_string(expr) {
+            // If `expr` is a bare string, perform tilde-expansion,
+            // glob-expansion, and inner-quotes-removal, in that order.
+            for arg in eval_argument(engine_state, stack, expr, spread)? {
+                let tilde_expanded = expand_tilde(&arg);
+                for glob_expanded in expand_glob(&tilde_expanded, &cwd, expr.span)? {
+                    let inner_quotes_removed = remove_inner_quotes(&glob_expanded);
+                    args.push(inner_quotes_removed.into_owned().into_spanned(expr.span));
                 }
             }
-            val => {
-                if spread {
-                    return Err(ShellError::CannotSpreadAsList { span: arg.span });
-                } else {
-                    spanned_args.push(value_as_spanned(val)?);
-                    match arg.expr {
-                        // refer to `parse_dollar_expr` function
-                        // the expression type of $variable_name, $"($variable_name)"
-                        // will be Expr::StringInterpolation, Expr::FullCellPath
-                        Expr::StringInterpolation(_) | Expr::FullCellPath(_) => {
-                            arg_keep_raw.push(true)
-                        }
-                        _ => arg_keep_raw.push(false),
-                    }
-                }
+        } else {
+            for arg in eval_argument(engine_state, stack, expr, spread)? {
+                args.push(arg.into_spanned(expr.span));
             }
         }
     }
-
-    Ok(ExternalCommand {
-        name,
-        args: spanned_args,
-        arg_keep_raw,
-        out: stack.stdout().clone(),
-        err: stack.stderr().clone(),
-        env_vars: env_vars_str,
-    })
+    Ok(args)
 }
 
-#[derive(Clone)]
-pub struct ExternalCommand {
-    pub name: Spanned<String>,
-    pub args: Vec<Spanned<String>>,
-    pub arg_keep_raw: Vec<bool>,
-    pub out: OutDest,
-    pub err: OutDest,
-    pub env_vars: HashMap<String, String>,
-}
-
-impl ExternalCommand {
-    pub fn run_with_input(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        input: PipelineData,
-        reconfirm_command_name: bool,
-    ) -> Result<PipelineData, ShellError> {
-        let head = self.name.span;
-
-        #[cfg(windows)]
-        let (child, reader, input) = {
-            // We may need to run `create_process` again, so we have to clone the underlying
-            // file or pipe in `input` here first.
-            let (input_consumed, stdin) = match &input {
-                PipelineData::ByteStream(stream, ..) => match stream.source() {
-                    nu_protocol::ByteStreamSource::Read(_) => (false, Stdio::piped()),
-                    nu_protocol::ByteStreamSource::File(file) => {
-                        (true, file.try_clone().err_span(head)?.into())
-                    }
-                    nu_protocol::ByteStreamSource::Child(child) => {
-                        if let Some(nu_protocol::process::ChildPipe::Pipe(pipe)) = &child.stdout {
-                            (true, pipe.try_clone().err_span(head)?.into())
-                        } else {
-                            (false, Stdio::piped())
-                        }
-                    }
-                },
-                PipelineData::Empty => (false, Stdio::inherit()),
-                _ => (false, Stdio::piped()),
-            };
-
-            let mut input = input;
-            let (cmd, mut reader) = self.create_process(stdin, false, head)?;
-            let child = match ForegroundChild::spawn(cmd) {
-                Ok(child) => {
-                    if input_consumed {
-                        input = PipelineData::Empty;
-                    }
-                    Ok(child)
-                }
-                Err(err) => {
-                    // Running external commands on Windows has 2 points of complication:
-                    // 1. Some common Windows commands are actually built in to cmd.exe, not executables in their own right.
-                    // 2. We need to let users run batch scripts etc. (.bat, .cmd) without typing their extension
-
-                    // To support these situations, we have a fallback path that gets run if a command
-                    // fails to be run as a normal executable:
-                    // 1. "shell out" to cmd.exe if the command is a known cmd.exe internal command
-                    // 2. Otherwise, use `which-rs` to look for batch files etc. then run those in cmd.exe
-
-                    // set the default value, maybe we'll override it later
-                    let mut child = Err(err);
-
-                    // This has the full list of cmd.exe "internal" commands: https://ss64.com/nt/syntax-internal.html
-                    // I (Reilly) went through the full list and whittled it down to ones that are potentially useful:
-                    const CMD_INTERNAL_COMMANDS: [&str; 9] = [
-                        "ASSOC", "CLS", "ECHO", "FTYPE", "MKLINK", "PAUSE", "START", "VER", "VOL",
-                    ];
-                    let command_name = &self.name.item;
-                    let looks_like_cmd_internal = CMD_INTERNAL_COMMANDS
-                        .iter()
-                        .any(|&cmd| command_name.eq_ignore_ascii_case(cmd));
-
-                    let (data, stdin) = extract_stdio(input);
-                    input = data;
-
-                    if looks_like_cmd_internal {
-                        let (cmd, new_reader) = self.create_process(stdin, true, head)?;
-                        reader = new_reader;
-                        child = ForegroundChild::spawn(cmd);
-                    } else {
-                        #[cfg(feature = "which-support")]
-                        {
-                            // maybe it's a batch file (foo.cmd) and the user typed `foo`. Try to find it with `which-rs`
-                            // TODO: clean this up with an if-let chain once those are stable
-                            if let Ok(path) =
-                                nu_engine::env::path_str(engine_state, stack, self.name.span)
-                            {
-                                if let Some(cwd) = self.env_vars.get("PWD") {
-                                    // append cwd to PATH so `which-rs` looks in the cwd too.
-                                    // this approximates what cmd.exe does.
-                                    let path_with_cwd = format!("{};{}", cwd, path);
-                                    if let Ok(which_path) =
-                                        which::which_in(&self.name.item, Some(path_with_cwd), cwd)
-                                    {
-                                        if let Some(file_name) = which_path.file_name() {
-                                            if !file_name
-                                                .to_string_lossy()
-                                                .eq_ignore_case(command_name)
-                                            {
-                                                // which-rs found an executable file with a slightly different name
-                                                // than the one the user tried. Let's try running it
-                                                let mut new_command = self.clone();
-                                                new_command.name = Spanned {
-                                                    item: file_name.to_string_lossy().to_string(),
-                                                    span: self.name.span,
-                                                };
-                                                let (cmd, new_reader) = new_command
-                                                    .create_process(stdin, true, head)?;
-                                                reader = new_reader;
-                                                child = ForegroundChild::spawn(cmd);
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    child
-                }
-            };
-
-            (child, reader, input)
-        };
-
-        #[cfg(unix)]
-        let (child, reader, input) = {
-            let (input, stdin) = extract_stdio(input);
-            let (cmd, reader) = self.create_process(stdin, false, head)?;
-            let child = ForegroundChild::spawn(
-                cmd,
-                engine_state.is_interactive,
-                &engine_state.pipeline_externals_state,
-            );
-            (child, reader, input)
-        };
-
-        match child {
-            Err(err) => {
-                match err.kind() {
-                    // If file not found, try suggesting alternative commands to the user
-                    std::io::ErrorKind::NotFound => {
-                        // recommend a replacement if the user tried a removed command
-                        let command_name_lower = self.name.item.to_lowercase();
-                        let removed_from_nu = crate::removed_commands();
-                        if removed_from_nu.contains_key(&command_name_lower) {
-                            let replacement = match removed_from_nu.get(&command_name_lower) {
-                                Some(s) => s.clone(),
-                                None => "".to_string(),
-                            };
-                            return Err(ShellError::RemovedCommand {
-                                removed: command_name_lower,
-                                replacement,
-                                span: self.name.span,
-                            });
-                        }
-
-                        let suggestion = suggest_command(&self.name.item, engine_state);
-                        let label = match suggestion {
-                            Some(s) => {
-                                if reconfirm_command_name {
-                                    format!(
-                                        "'{}' was not found; did you mean '{s}'?",
-                                        self.name.item
-                                    )
-                                } else {
-                                    let cmd_name = &self.name.item;
-                                    let maybe_module = engine_state
-                                        .which_module_has_decl(cmd_name.as_bytes(), &[]);
-                                    if let Some(module_name) = maybe_module {
-                                        let module_name = String::from_utf8_lossy(module_name);
-                                        let new_name = &[module_name.as_ref(), cmd_name].join(" ");
-
-                                        if engine_state
-                                            .find_decl(new_name.as_bytes(), &[])
-                                            .is_some()
-                                        {
-                                            format!("command '{cmd_name}' was not found but it was imported from module '{module_name}'; try using `{new_name}`")
-                                        } else {
-                                            format!("command '{cmd_name}' was not found but it exists in module '{module_name}'; try importing it with `use`")
-                                        }
-                                    } else {
-                                        // If command and suggestion are the same, display not found
-                                        if cmd_name == &s {
-                                            format!("'{cmd_name}' was not found")
-                                        } else {
-                                            format!("did you mean '{s}'?")
-                                        }
-                                    }
-                                }
-                            }
-                            None => {
-                                if reconfirm_command_name {
-                                    format!("executable '{}' was not found", self.name.item)
-                                } else {
-                                    "executable was not found".into()
-                                }
-                            }
-                        };
-
-                        let mut err_str = err.to_string();
-                        if engine_state.is_interactive {
-                            let mut engine_state = engine_state.clone();
-                            if let Some(hook) = engine_state.config.hooks.command_not_found.clone()
-                            {
-                                let canary = "ENTERED_COMMAND_NOT_FOUND";
-                                let stack = &mut stack.start_capture();
-                                if stack.has_env_var(&engine_state, canary) {
-                                    return Err(ShellError::ExternalCommand {
-                                        label: "command_not_found handler could not be run".into(),
-                                        help: "make sure the command_not_found closure itself does not use unknown commands".to_string(),
-                                        span: self.name.span,
-                                    });
-                                }
-                                stack.add_env_var(
-                                    canary.to_string(),
-                                    Value::bool(true, Span::unknown()),
-                                );
-                                match eval_hook(
-                                    &mut engine_state,
-                                    stack,
-                                    None,
-                                    vec![(
-                                        "cmd_name".into(),
-                                        Value::string(self.name.item.to_string(), self.name.span),
-                                    )],
-                                    &hook,
-                                    "command_not_found",
-                                ) {
-                                    Ok(PipelineData::Value(Value::String { val, .. }, ..)) => {
-                                        err_str = format!("{}\n{}", err_str, val);
-                                    }
-
-                                    Err(err) => {
-                                        stack.remove_env_var(&engine_state, canary);
-                                        return Err(err);
-                                    }
-                                    _ => {}
-                                }
-                                stack.remove_env_var(&engine_state, canary);
-                            }
-                        }
-
-                        Err(ShellError::ExternalCommand {
-                            label,
-                            help: err_str,
-                            span: self.name.span,
-                        })
-                    }
-                    // otherwise, a default error message
-                    _ => Err(ShellError::ExternalCommand {
-                        label: "can't run executable".into(),
-                        help: err.to_string(),
-                        span: self.name.span,
-                    }),
-                }
-            }
-            Ok(mut child) => {
-                if !input.is_nothing() {
-                    let mut engine_state = engine_state.clone();
-                    let mut stack = stack.clone();
-
-                    // Turn off color as we pass data through
-                    Arc::make_mut(&mut engine_state.config).use_ansi_coloring = false;
-
-                    // Pipe input into the external command's stdin
-                    if let Some(mut stdin_write) = child.as_mut().stdin.take() {
-                        thread::Builder::new()
-                            .name("external stdin worker".to_string())
-                            .spawn(move || {
-                                let input = match input {
-                                    // Don't touch binary input or byte streams
-                                    input @ PipelineData::ByteStream(..) => input,
-                                    input @ PipelineData::Value(Value::Binary { .. }, ..) => input,
-                                    input => {
-                                        let stack = &mut stack.start_capture();
-                                        // Attempt to render the input as a table before piping it to the external.
-                                        // This is important for pagers like `less`;
-                                        // they need to get Nu data rendered for display to users.
-                                        //
-                                        // TODO: should we do something different for list<string> inputs?
-                                        // Users often expect those to be piped to *nix tools as raw strings separated by newlines
-                                        crate::Table.run(
-                                            &engine_state,
-                                            stack,
-                                            &Call::new(head),
-                                            input,
-                                        )?
-                                    }
-                                };
-
-                                if let PipelineData::ByteStream(stream, ..) = input {
-                                    stream.write_to(&mut stdin_write)?;
-                                } else {
-                                    for value in input.into_iter() {
-                                        let buf = value.coerce_into_binary()?;
-                                        stdin_write.write_all(&buf)?;
-                                    }
-                                }
-
-                                Ok::<_, ShellError>(())
-                            })
-                            .err_span(head)?;
-                    }
-                }
-
-                let child =
-                    ChildProcess::new(child, reader, matches!(self.err, OutDest::Pipe), head)?;
-
-                Ok(PipelineData::ByteStream(
-                    ByteStream::child(child, head),
-                    None,
-                ))
-            }
-        }
+/// Evaluates an expression, coercing the values to strings.
+///
+/// Note: The parser currently has a special hack that retains surrounding
+/// quotes for string literals in `Expression`, so that we can decide whether
+/// the expression is considered a bare string. The hack doesn't affect string
+/// literals within lists or records. This function will remove the quotes
+/// before evaluating the expression.
+fn eval_argument(
+    engine_state: &EngineState,
+    stack: &mut Stack,
+    expr: &Expression,
+    spread: bool,
+) -> Result<Vec<String>, ShellError> {
+    // Remove quotes from string literals.
+    let mut expr = expr.clone();
+    if let Expr::String(s) = &expr.expr {
+        expr.expr = Expr::String(remove_quotes(s).into());
     }
 
-    pub fn create_process(
-        &self,
-        stdin: Stdio,
-        use_cmd: bool,
-        span: Span,
-    ) -> Result<(CommandSys, Option<PipeReader>), ShellError> {
-        let mut process = if let Some(d) = self.env_vars.get("PWD") {
-            let mut process = if use_cmd {
-                self.spawn_cmd_command(d)
+    let eval = get_eval_expression(engine_state);
+    match eval(engine_state, stack, &expr)? {
+        Value::List { vals, .. } => {
+            if spread {
+                vals.into_iter()
+                    .map(|val| val.coerce_into_string())
+                    .collect()
             } else {
-                self.create_command(d)?
-            };
-
-            // do not try to set current directory if cwd does not exist
-            if Path::new(&d).exists() {
-                process.current_dir(d);
+                Err(ShellError::CannotPassListToExternal {
+                    arg: String::from_utf8_lossy(engine_state.get_span_contents(expr.span)).into(),
+                    span: expr.span,
+                })
             }
-            process
-        } else {
-            return Err(ShellError::GenericError{
-                error: "Current directory not found".into(),
-                msg: "did not find PWD environment variable".into(),
-                span: Some(span),
-                help: Some(concat!(
-                    "The environment variable 'PWD' was not found. ",
-                    "It is required to define the current directory when running an external command."
-                ).into()),
-                inner:Vec::new(),
-            });
-        };
-
-        process.envs(&self.env_vars);
-
-        // If the external is not the last command, its output will get piped
-        // either as a string or binary
-        let reader = if matches!(self.out, OutDest::Pipe) && matches!(self.err, OutDest::Pipe) {
-            let (reader, writer) = os_pipe::pipe()?;
-            let writer_clone = writer.try_clone()?;
-            process.stdout(writer);
-            process.stderr(writer_clone);
-            Some(reader)
-        } else {
-            process.stdout(Stdio::try_from(&self.out)?);
-            process.stderr(Stdio::try_from(&self.err)?);
-            None
-        };
-
-        process.stdin(stdin);
-
-        Ok((process, reader))
-    }
-
-    fn create_command(&self, cwd: &str) -> Result<CommandSys, ShellError> {
-        // in all the other cases shell out
-        if cfg!(windows) {
-            //TODO. This should be modifiable from the config file.
-            // We could give the option to call from powershell
-            // for minimal builds cwd is unused
-            if self.name.item.ends_with(".cmd") || self.name.item.ends_with(".bat") {
-                Ok(self.spawn_cmd_command(cwd))
+        }
+        value => {
+            if spread {
+                Err(ShellError::CannotSpreadAsList { span: expr.span })
             } else {
-                self.spawn_simple_command(cwd)
+                Ok(vec![value.coerce_into_string()?])
             }
-        } else {
-            self.spawn_simple_command(cwd)
         }
     }
-
-    /// Spawn a command without shelling out to an external shell
-    ///
-    /// Note that this function will not set the cwd or environment variables.
-    /// It only creates the command and adds arguments.
-    pub fn spawn_simple_command(&self, cwd: &str) -> Result<std::process::Command, ShellError> {
-        let (head, _, _) = trim_enclosing_quotes(&self.name.item);
-        let head = nu_path::expand_to_real_path(head)
-            .to_string_lossy()
-            .to_string();
-
-        let mut process = std::process::Command::new(head);
-        process.env_clear();
-
-        for (arg, arg_keep_raw) in self.args.iter().zip(self.arg_keep_raw.iter()) {
-            trim_expand_and_apply_arg(&mut process, arg, arg_keep_raw, cwd);
-        }
-
-        Ok(process)
-    }
-
-    /// Spawn a cmd command with `cmd /c args...`
-    pub fn spawn_cmd_command(&self, cwd: &str) -> std::process::Command {
-        let mut process = std::process::Command::new("cmd");
-
-        // Disable AutoRun
-        // TODO: There should be a config option to enable/disable this
-        // Alternatively (even better) a config option to specify all the arguments to pass to cmd
-        process.arg("/D");
-
-        process.arg("/c");
-        process.arg(&self.name.item);
-        for (arg, arg_keep_raw) in self.args.iter().zip(self.arg_keep_raw.iter()) {
-            // https://stackoverflow.com/questions/1200235/how-to-pass-a-quoted-pipe-character-to-cmd-exe
-            // cmd.exe needs to have a caret to escape a pipe
-            let arg = Spanned {
-                item: arg.item.replace('|', "^|"),
-                span: arg.span,
-            };
-
-            trim_expand_and_apply_arg(&mut process, &arg, arg_keep_raw, cwd)
-        }
-
-        process
-    }
 }
 
-fn trim_expand_and_apply_arg(
-    process: &mut CommandSys,
-    arg: &Spanned<String>,
-    arg_keep_raw: &bool,
-    cwd: &str,
-) {
-    // if arg is quoted, like "aa", 'aa', `aa`, or:
-    // if arg is a variable or String interpolation, like: $variable_name, $"($variable_name)"
-    // `as_a_whole` will be true, so nu won't remove the inner quotes.
-    let (trimmed_args, mut run_glob_expansion, mut keep_raw) = trim_enclosing_quotes(&arg.item);
-    if *arg_keep_raw {
-        keep_raw = true;
-        // it's a list or a variable, don't run glob expansion either
-        run_glob_expansion = false;
-    }
-    let mut arg = Spanned {
-        item: if keep_raw {
-            trimmed_args
-        } else {
-            remove_quotes(trimmed_args)
-        },
-        span: arg.span,
+/// Returns whether an expression is considered a bare string.
+///
+/// Bare strings are defined as string literals that are either unquoted or
+/// quoted by backticks. Raw strings or string interpolations don't count.
+fn is_bare_string(expr: &Expression) -> bool {
+    let Expr::String(s) = &expr.expr else {
+        return false;
     };
-    if !keep_raw {
-        arg.item = nu_path::expand_tilde(arg.item)
-            .to_string_lossy()
-            .to_string();
-    }
-    let cwd = PathBuf::from(cwd);
-    if arg.item.contains('*') && run_glob_expansion {
-        // we need to run glob expansion, so it's NeedExpand.
-        let path = Spanned {
-            item: NuGlob::Expand(arg.item.clone()),
-            span: arg.span,
-        };
-        if let Ok((prefix, matches)) = nu_engine::glob_from(&path, &cwd, arg.span, None) {
-            let matches: Vec<_> = matches.collect();
-
-            // FIXME: do we want to special-case this further? We might accidentally expand when they don't
-            // intend to
-            if matches.is_empty() {
-                process.arg(&arg.item);
-            }
-            for m in matches {
-                if let Ok(arg) = m {
-                    let arg = if let Some(prefix) = &prefix {
-                        if let Ok(remainder) = arg.strip_prefix(prefix) {
-                            let new_prefix = if let Some(pfx) = diff_paths(prefix, &cwd) {
-                                pfx
-                            } else {
-                                prefix.to_path_buf()
-                            };
-
-                            new_prefix.join(remainder).to_string_lossy().to_string()
-                        } else {
-                            arg.to_string_lossy().to_string()
-                        }
-                    } else {
-                        arg.to_string_lossy().to_string()
-                    };
-
-                    process.arg(&arg);
-                } else {
-                    process.arg(&arg.item);
-                }
-            }
-        }
-    } else {
-        process.arg(&arg.item);
-    }
+    let quoted_by_double_quotes = s.len() >= 2 && s.starts_with('"') && s.ends_with('"');
+    let quoted_by_single_quotes = s.len() >= 2 && s.starts_with('\'') && s.ends_with('\'');
+    !quoted_by_double_quotes && !quoted_by_single_quotes
 }
 
-/// Given an invalid command name, try to suggest an alternative
-fn suggest_command(attempted_command: &str, engine_state: &EngineState) -> Option<String> {
-    let commands = engine_state.get_signatures(false);
-    let command_folded_case = attempted_command.to_folded_case();
-    let search_term_match = commands.iter().find(|sig| {
+/// Performs tilde expansion on `arg`. Returns the original string if `arg`
+/// doesn't start with tilde.
+fn expand_tilde(arg: &str) -> String {
+    nu_path::expand_tilde(arg).to_string_lossy().to_string()
+}
+
+/// Performs glob expansion on `arg`. If the expansion found no matches, returns
+/// the original string as the expansion result.
+///
+/// Note: This matches the default behavior of Bash, but is known to be
+/// error-prone. We might want to change this behavior in the future.
+fn expand_glob(arg: &str, cwd: &Path, span: Span) -> Result<Vec<String>, ShellError> {
+    let paths =
+        nu_glob::glob_with_parent(arg, nu_glob::MatchOptions::default(), cwd).map_err(|err| {
+            ShellError::InvalidGlobPattern {
+                msg: err.msg.to_string(),
+                span,
+            }
+        })?;
+
+    let mut result = vec![];
+    for path in paths {
+        let path = path.map_err(|err| ShellError::IOErrorSpanned {
+            msg: format!("{}: {:?}", err.path().display(), err.error()),
+            span,
+        })?;
+        // Strip PWD from the resulting paths if possible.
+        let path_stripped = path.strip_prefix(cwd).unwrap_or(&path);
+        let path_string = path_stripped.to_string_lossy().to_string();
+        result.push(path_string);
+    }
+
+    if result.is_empty() {
+        result.push(arg.to_string());
+    }
+
+    Ok(result)
+}
+
+/// Transforms `--option="value"` into `--option=value`. `value` can be quoted
+/// with double quotes, single quotes, or backticks. Only removes the outermost
+/// pair of quotes after the equal sign.
+fn remove_inner_quotes(arg: &str) -> Cow<'_, str> {
+    // Check that `arg` is a long option.
+    if !arg.starts_with("--") {
+        return Cow::Borrowed(arg);
+    }
+    // Split `arg` on the first `=`.
+    let Some((option, value)) = arg.split_once('=') else {
+        return Cow::Borrowed(arg);
+    };
+    // Check that `option` doesn't contain quotes.
+    if option.contains('"') || option.contains('\'') || option.contains('`') {
+        return Cow::Borrowed(arg);
+    }
+    // Remove the outermost pair of quotes from `value`.
+    let value = remove_quotes(value);
+    Cow::Owned(format!("{option}={value}"))
+}
+
+/// Write `PipelineData` into `writer`. If `PipelineData` is not binary, it is
+/// first rendered using the `table` command.
+///
+/// Note: Avoid using this function when piping data from an external command to
+/// another external command, because it copies data unnecessarily. Instead,
+/// extract the pipe from the `PipelineData::ByteStream` of the first command
+/// and hand it to the second command directly.
+fn write_pipeline_data(
+    mut engine_state: EngineState,
+    mut stack: Stack,
+    data: PipelineData,
+    mut writer: impl Write,
+) -> Result<(), ShellError> {
+    if let PipelineData::ByteStream(stream, ..) = data {
+        stream.write_to(writer)?;
+    } else if let PipelineData::Value(Value::Binary { val, .. }, ..) = data {
+        writer.write_all(&val)?;
+    } else {
+        stack.start_capture();
+
+        // Turn off color as we pass data through
+        Arc::make_mut(&mut engine_state.config).use_ansi_coloring = false;
+
+        // Invoke the `table` command.
+        let output =
+            crate::Table.run(&engine_state, &mut stack, &Call::new(Span::unknown()), data)?;
+
+        // Write the output.
+        for value in output {
+            let bytes = value.coerce_into_binary()?;
+            writer.write_all(&bytes)?;
+        }
+    }
+    Ok(())
+}
+
+/// Returns a helpful error message given an invalid command name,
+pub fn command_not_found(
+    name: &str,
+    span: Span,
+    engine_state: &EngineState,
+    stack: &mut Stack,
+) -> ShellError {
+    // Run the `command_not_found` hook if there is one.
+    if let Some(hook) = &engine_state.config.hooks.command_not_found {
+        let mut stack = stack.start_capture();
+        // Set a special environment variable to avoid infinite loops when the
+        // `command_not_found` hook triggers itself.
+        let canary = "ENTERED_COMMAND_NOT_FOUND";
+        if stack.has_env_var(engine_state, canary) {
+            return ShellError::ExternalCommand {
+                label: format!(
+                    "Command {name} not found while running the `command_not_found` hook"
+                ),
+                help: "Make sure the `command_not_found` hook itself does not use unknown commands"
+                    .into(),
+                span,
+            };
+        }
+        stack.add_env_var(canary.into(), Value::bool(true, Span::unknown()));
+
+        let output = eval_hook(
+            &mut engine_state.clone(),
+            &mut stack,
+            None,
+            vec![("cmd_name".into(), Value::string(name, span))],
+            hook,
+            "command_not_found",
+        );
+
+        // Remove the special environment variable that we just set.
+        stack.remove_env_var(engine_state, canary);
+
+        match output {
+            Ok(PipelineData::Value(Value::String { val, .. }, ..)) => {
+                return ShellError::ExternalCommand {
+                    label: format!("Command `{name}` not found"),
+                    help: val,
+                    span,
+                };
+            }
+            Err(err) => {
+                return err;
+            }
+            _ => {
+                // The hook did not return a string, so ignore it.
+            }
+        }
+    }
+
+    // If the name is one of the removed commands, recommend a replacement.
+    if let Some(replacement) = crate::removed_commands().get(&name.to_lowercase()) {
+        return ShellError::RemovedCommand {
+            removed: name.to_lowercase(),
+            replacement: replacement.clone(),
+            span,
+        };
+    }
+
+    // The command might be from another module. Try to find it.
+    if let Some(module) = engine_state.which_module_has_decl(name.as_bytes(), &[]) {
+        let module = String::from_utf8_lossy(module);
+        // Is the command already imported?
+        let full_name = format!("{module} {name}");
+        if engine_state.find_decl(full_name.as_bytes(), &[]).is_some() {
+            return ShellError::ExternalCommand {
+                label: format!("Command `{name}` not found"),
+                help: format!("Did you mean `{full_name}`?"),
+                span,
+            };
+        } else {
+            return ShellError::ExternalCommand {
+                label: format!("Command `{name}` not found"),
+                help: format!("A command with that name exists in module `{module}`. Try importing it with `use`"),
+                span,
+            };
+        }
+    }
+
+    // Try to match the name with the search terms of existing commands.
+    let signatures = engine_state.get_signatures(false);
+    if let Some(sig) = signatures.iter().find(|sig| {
         sig.search_terms
             .iter()
-            .any(|term| term.to_folded_case() == command_folded_case)
-    });
-    match search_term_match {
-        Some(sig) => Some(sig.name.clone()),
-        None => {
-            let command_names: Vec<String> = commands.iter().map(|sig| sig.name.clone()).collect();
-            did_you_mean(&command_names, attempted_command)
+            .any(|term| term.to_folded_case() == name.to_folded_case())
+    }) {
+        return ShellError::ExternalCommand {
+            label: format!("Command `{name}` not found"),
+            help: format!("Did you mean `{}`?", sig.name),
+            span,
+        };
+    }
+
+    // Try a fuzzy search on the names of all existing commands.
+    if let Some(cmd) = did_you_mean(signatures.iter().map(|sig| &sig.name), name) {
+        // The user is invoking an external command with the same name as a
+        // built-in command. Remind them of this.
+        if cmd == name {
+            return ShellError::ExternalCommand {
+                label: format!("Command `{name}` not found"),
+                help: "There is a built-in command with the same name".into(),
+                span,
+            };
         }
+        return ShellError::ExternalCommand {
+            label: format!("Command `{name}` not found"),
+            help: format!("Did you mean `{cmd}`?"),
+            span,
+        };
+    }
+
+    // We found nothing useful. Give up and return a generic error message.
+    ShellError::ExternalCommand {
+        label: format!("Command `{name}` not found"),
+        help: format!("`{name}` is neither a Nushell built-in or a known external command"),
+        span,
     }
 }
 
-/// This function returns a tuple with 3 items:
-/// 1st item: trimmed string.
-/// 2nd item: a boolean value indicate if it's ok to run glob expansion.
-/// 3rd item: a boolean value indicate if we need to keep raw string.
-fn trim_enclosing_quotes(input: &str) -> (String, bool, bool) {
-    let mut chars = input.chars();
-
-    match (chars.next(), chars.next_back()) {
-        (Some('"'), Some('"')) => (chars.collect(), false, true),
-        (Some('\''), Some('\'')) => (chars.collect(), false, true),
-        // We treat back-quoted strings as bare words, so there's no need to keep them as raw strings
-        (Some('`'), Some('`')) => (chars.collect(), true, false),
-        _ => (input.to_string(), true, false),
-    }
+/// Searches for the absolute path of an executable by name. `.bat` and `.cmd`
+/// files are recognized as executables on Windows.
+///
+/// This is a wrapper around `which::which_in()` except that, on Windows, it
+/// also searches the current directory before any PATH entries.
+///
+/// Note: the `which.rs` crate always uses PATHEXT from the environment. As
+/// such, changing PATHEXT within Nushell doesn't work without updating the
+/// actual environment of the Nushell process.
+pub fn which(name: &str, paths: &str, cwd: &Path) -> Option<PathBuf> {
+    #[cfg(windows)]
+    let paths = format!("{};{}", cwd.display(), paths);
+    which::which_in(name, Some(paths), cwd).ok()
 }
 
-fn remove_quotes(input: String) -> String {
-    let mut chars = input.chars();
-
-    match (chars.next_back(), input.contains('=')) {
-        (Some('"'), true) => chars
-            .collect::<String>()
-            .replacen('"', "", 1)
-            .replace(r#"\""#, "\""),
-        (Some('\''), true) => chars.collect::<String>().replacen('\'', "", 1),
-        _ => input,
-    }
+/// Returns true if `name` is a (somewhat useful) CMD internal command. The full
+/// list can be found at https://ss64.com/nt/syntax-internal.html
+fn is_cmd_internal_command(name: &str) -> bool {
+    const COMMANDS: &[&str] = &[
+        "ASSOC", "CLS", "ECHO", "FTYPE", "MKLINK", "PAUSE", "START", "VER", "VOL",
+    ];
+    COMMANDS.iter().any(|cmd| cmd.eq_ignore_ascii_case(name))
 }
 
-fn extract_stdio(pipeline: PipelineData) -> (PipelineData, Stdio) {
-    match pipeline {
-        PipelineData::ByteStream(stream, metadata) => match stream.into_stdio() {
-            Ok(pipe) => (PipelineData::Empty, pipe),
-            Err(stream) => (PipelineData::ByteStream(stream, metadata), Stdio::piped()),
-        },
-        PipelineData::Empty => (PipelineData::Empty, Stdio::inherit()),
-        data => (data, Stdio::piped()),
+/// Returns true if a string contains CMD special characters.
+#[cfg(windows)]
+fn has_cmd_special_character(s: &str) -> bool {
+    const SPECIAL_CHARS: &[char] = &['<', '>', '&', '|', '^'];
+    SPECIAL_CHARS.iter().any(|c| s.contains(*c))
+}
+
+/// Escape an argument for CMD internal commands. The result can be safely
+/// passed to `raw_arg()`.
+#[cfg(windows)]
+fn escape_cmd_argument(arg: &Spanned<String>) -> Result<Cow<'_, str>, ShellError> {
+    let Spanned { item: arg, span } = arg;
+    if arg.contains('"') {
+        // If `arg` is already quoted by double quotes, confirm there's no
+        // embedded double quotes, then leave it as is.
+        if arg.chars().filter(|c| *c == '"').count() == 2
+            && arg.starts_with('"')
+            && arg.ends_with('"')
+        {
+            Ok(Cow::Borrowed(arg))
+        } else {
+            Err(ShellError::ExternalCommand {
+                label: "Arguments to CMD internal commands cannot contain embedded double quotes"
+                    .into(),
+                help: "CMD doesn't support escaping double quotes inside double quotes".into(),
+                span: *span,
+            })
+        }
+    } else if arg.contains(' ') || has_cmd_special_character(arg) {
+        // If `arg` contains space or special characters, quote the entire argument by double quotes.
+        Ok(Cow::Owned(format!("\"{arg}\"")))
+    } else {
+        Ok(Cow::Borrowed(arg))
     }
 }
 
 #[cfg(test)]
 mod test {
     use super::*;
+    use nu_protocol::ast::ListItem;
 
     #[test]
-    fn remove_quotes_argument_with_equal_test() {
-        let input = r#"--file="my_file.txt""#.into();
-        let res = remove_quotes(input);
-
-        assert_eq!("--file=my_file.txt", res)
+    fn test_remove_quotes() {
+        assert_eq!(remove_quotes(r#""#), r#""#);
+        assert_eq!(remove_quotes(r#"'"#), r#"'"#);
+        assert_eq!(remove_quotes(r#"''"#), r#""#);
+        assert_eq!(remove_quotes(r#""foo""#), r#"foo"#);
+        assert_eq!(remove_quotes(r#"`foo '"' bar`"#), r#"foo '"' bar"#);
+        assert_eq!(remove_quotes(r#"'foo' bar"#), r#"'foo' bar"#);
+        assert_eq!(remove_quotes(r#"r#'foo'#"#), r#"r#'foo'#"#);
     }
 
     #[test]
-    fn argument_without_equal_test() {
-        let input = r#"--file "my_file.txt""#.into();
-        let res = remove_quotes(input);
+    fn test_eval_argument() {
+        fn expression(expr: Expr) -> Expression {
+            Expression {
+                expr,
+                span: Span::unknown(),
+                ty: Type::Any,
+                custom_completion: None,
+            }
+        }
 
-        assert_eq!(r#"--file "my_file.txt""#, res)
+        fn eval(expr: Expr, spread: bool) -> Result<Vec<String>, ShellError> {
+            let engine_state = EngineState::new();
+            let mut stack = Stack::new();
+            eval_argument(&engine_state, &mut stack, &expression(expr), spread)
+        }
+
+        let actual = eval(Expr::String("".into()), false).unwrap();
+        let expected = &[""];
+        assert_eq!(actual, expected);
+
+        let actual = eval(Expr::String("'foo'".into()), false).unwrap();
+        let expected = &["foo"];
+        assert_eq!(actual, expected);
+
+        let actual = eval(Expr::RawString("'foo'".into()), false).unwrap();
+        let expected = &["'foo'"];
+        assert_eq!(actual, expected);
+
+        let actual = eval(Expr::List(vec![]), true).unwrap();
+        let expected: &[&str] = &[];
+        assert_eq!(actual, expected);
+
+        let actual = eval(
+            Expr::List(vec![
+                ListItem::Item(expression(Expr::String("'foo'".into()))),
+                ListItem::Item(expression(Expr::String("bar".into()))),
+            ]),
+            true,
+        )
+        .unwrap();
+        let expected = &["'foo'", "bar"];
+        assert_eq!(actual, expected);
+
+        eval(Expr::String("".into()), true).unwrap_err();
+        eval(Expr::List(vec![]), false).unwrap_err();
     }
 
     #[test]
-    fn remove_quotes_argument_with_single_quotes_test() {
-        let input = r#"--file='my_file.txt'"#.into();
-        let res = remove_quotes(input);
+    fn test_expand_glob() {
+        let tempdir = tempfile::tempdir().unwrap();
+        let cwd = tempdir.path();
+        std::fs::File::create(cwd.join("a.txt")).unwrap();
+        std::fs::File::create(cwd.join("b.txt")).unwrap();
 
-        assert_eq!("--file=my_file.txt", res)
+        let actual = expand_glob("*.txt", cwd, Span::unknown()).unwrap();
+        let expected = &["a.txt", "b.txt"];
+        assert_eq!(actual, expected);
+
+        let actual = expand_glob("'*.txt'", cwd, Span::unknown()).unwrap();
+        let expected = &["'*.txt'"];
+        assert_eq!(actual, expected);
+
+        expand_glob("[*.txt", cwd, Span::unknown()).unwrap_err();
     }
 
     #[test]
-    fn argument_with_inner_quotes_test() {
-        let input = r#"sh -c 'echo a'"#.into();
-        let res = remove_quotes(input);
+    fn test_remove_inner_quotes() {
+        let actual = remove_inner_quotes(r#"--option=value"#);
+        let expected = r#"--option=value"#;
+        assert_eq!(actual, expected);
 
-        assert_eq!("sh -c 'echo a'", res)
+        let actual = remove_inner_quotes(r#"--option="value""#);
+        let expected = r#"--option=value"#;
+        assert_eq!(actual, expected);
+
+        let actual = remove_inner_quotes(r#"--option='value'"#);
+        let expected = r#"--option=value"#;
+        assert_eq!(actual, expected);
+
+        let actual = remove_inner_quotes(r#"--option "value""#);
+        let expected = r#"--option "value""#;
+        assert_eq!(actual, expected);
+    }
+
+    #[test]
+    fn test_write_pipeline_data() {
+        let engine_state = EngineState::new();
+        let stack = Stack::new();
+
+        let mut buf = vec![];
+        let input = PipelineData::Empty;
+        write_pipeline_data(engine_state.clone(), stack.clone(), input, &mut buf).unwrap();
+        assert_eq!(buf, b"");
+
+        let mut buf = vec![];
+        let input = PipelineData::Value(Value::string("foo", Span::unknown()), None);
+        write_pipeline_data(engine_state.clone(), stack.clone(), input, &mut buf).unwrap();
+        assert_eq!(buf, b"foo");
+
+        let mut buf = vec![];
+        let input = PipelineData::Value(Value::binary(b"foo", Span::unknown()), None);
+        write_pipeline_data(engine_state.clone(), stack.clone(), input, &mut buf).unwrap();
+        assert_eq!(buf, b"foo");
+
+        let mut buf = vec![];
+        let input = PipelineData::ByteStream(
+            ByteStream::read(
+                b"foo".as_slice(),
+                Span::unknown(),
+                None,
+                ByteStreamType::Unknown,
+            ),
+            None,
+        );
+        write_pipeline_data(engine_state.clone(), stack.clone(), input, &mut buf).unwrap();
+        assert_eq!(buf, b"foo");
     }
 }
diff --git a/crates/nu-command/tests/commands/all.rs b/crates/nu-command/tests/commands/all.rs
index bcf6f86a45..8ed5a6f34f 100644
--- a/crates/nu-command/tests/commands/all.rs
+++ b/crates/nu-command/tests/commands/all.rs
@@ -55,7 +55,9 @@ fn checks_if_all_returns_error_with_invalid_command() {
         "#
     ));
 
-    assert!(actual.err.contains("can't run executable") || actual.err.contains("did you mean"));
+    assert!(
+        actual.err.contains("Command `st` not found") && actual.err.contains("Did you mean `ast`?")
+    );
 }
 
 #[test]
diff --git a/crates/nu-command/tests/commands/any.rs b/crates/nu-command/tests/commands/any.rs
index 0e43f26cfd..f8af25eb61 100644
--- a/crates/nu-command/tests/commands/any.rs
+++ b/crates/nu-command/tests/commands/any.rs
@@ -41,7 +41,9 @@ fn checks_if_any_returns_error_with_invalid_command() {
         "#
     ));
 
-    assert!(actual.err.contains("can't run executable") || actual.err.contains("did you mean"));
+    assert!(
+        actual.err.contains("Command `st` not found") && actual.err.contains("Did you mean `ast`?")
+    );
 }
 
 #[test]
diff --git a/crates/nu-command/tests/commands/complete.rs b/crates/nu-command/tests/commands/complete.rs
index a5a8b6a256..329e95ad71 100644
--- a/crates/nu-command/tests/commands/complete.rs
+++ b/crates/nu-command/tests/commands/complete.rs
@@ -24,7 +24,7 @@ fn basic_exit_code() {
 #[test]
 fn error() {
     let actual = nu!("not-found | complete");
-    assert!(actual.err.contains("executable was not found"));
+    assert!(actual.err.contains("Command `not-found` not found"));
 }
 
 #[test]
diff --git a/crates/nu-command/tests/commands/source_env.rs b/crates/nu-command/tests/commands/source_env.rs
index 4e8da55c78..9dd0320a45 100644
--- a/crates/nu-command/tests/commands/source_env.rs
+++ b/crates/nu-command/tests/commands/source_env.rs
@@ -283,13 +283,17 @@ fn source_env_is_scoped() {
 
         let actual = nu!(cwd: dirs.test(), &inp.join("; "));
 
-        assert!(actual.err.contains("executable was not found"));
+        assert!(actual
+            .err
+            .contains("Command `no-name-similar-to-this` not found"));
 
         let inp = &[r#"source-env spam.nu"#, r#"nor-similar-to-this"#];
 
         let actual = nu!(cwd: dirs.test(), &inp.join("; "));
 
-        assert!(actual.err.contains("executable was not found"));
+        assert!(actual
+            .err
+            .contains("Command `nor-similar-to-this` not found"));
     })
 }
 
diff --git a/crates/nu-command/tests/commands/use_.rs b/crates/nu-command/tests/commands/use_.rs
index 8cb783f96b..63b1f8391a 100644
--- a/crates/nu-command/tests/commands/use_.rs
+++ b/crates/nu-command/tests/commands/use_.rs
@@ -189,9 +189,7 @@ fn use_module_creates_accurate_did_you_mean_1() {
     let actual = nu!(r#"
             module spam { export def foo [] { "foo" } }; use spam; foo
         "#);
-    assert!(actual.err.contains(
-        "command 'foo' was not found but it was imported from module 'spam'; try using `spam foo`"
-    ));
+    assert!(actual.err.contains("Did you mean `spam foo`"));
 }
 
 #[test]
@@ -199,9 +197,9 @@ fn use_module_creates_accurate_did_you_mean_2() {
     let actual = nu!(r#"
             module spam { export def foo [] { "foo" } }; foo
         "#);
-    assert!(actual.err.contains(
-        "command 'foo' was not found but it exists in module 'spam'; try importing it with `use`"
-    ));
+    assert!(actual
+        .err
+        .contains("A command with that name exists in module `spam`"));
 }
 
 #[test]
diff --git a/src/test_bins.rs b/src/test_bins.rs
index d96c74a911..7cd542e732 100644
--- a/src/test_bins.rs
+++ b/src/test_bins.rs
@@ -242,6 +242,7 @@ pub fn nu_repl() {
     let mut top_stack = Arc::new(Stack::new());
 
     engine_state.add_env_var("PWD".into(), Value::test_string(cwd.to_string_lossy()));
+    engine_state.add_env_var("PATH".into(), Value::test_string(""));
 
     let mut last_output = String::new();
 
diff --git a/tests/repl/test_known_external.rs b/tests/repl/test_known_external.rs
index c140f4ee90..96ea677d37 100644
--- a/tests/repl/test_known_external.rs
+++ b/tests/repl/test_known_external.rs
@@ -108,14 +108,14 @@ fn known_external_misc_values() -> TestResult {
 /// GitHub issue #7822
 #[test]
 fn known_external_subcommand_from_module() -> TestResult {
-    let output = Command::new("cargo").arg("check").arg("-h").output()?;
+    let output = Command::new("cargo").arg("add").arg("-h").output()?;
     run_test(
         r#"
             module cargo {
-                export extern check []
+                export extern add []
             };
             use cargo;
-            cargo check -h
+            cargo add -h
         "#,
         String::from_utf8(output.stdout)?.trim(),
     )
@@ -124,14 +124,14 @@ fn known_external_subcommand_from_module() -> TestResult {
 /// GitHub issue #7822
 #[test]
 fn known_external_aliased_subcommand_from_module() -> TestResult {
-    let output = Command::new("cargo").arg("check").arg("-h").output()?;
+    let output = Command::new("cargo").arg("add").arg("-h").output()?;
     run_test(
         r#"
             module cargo {
-                export extern check []
+                export extern add []
             };
             use cargo;
-            alias cc = cargo check;
+            alias cc = cargo add;
             cc -h
         "#,
         String::from_utf8(output.stdout)?.trim(),
diff --git a/tests/repl/test_parser.rs b/tests/repl/test_parser.rs
index c0e7279b7b..9d743b175d 100644
--- a/tests/repl/test_parser.rs
+++ b/tests/repl/test_parser.rs
@@ -647,7 +647,7 @@ fn duration_with_underscores_2() -> TestResult {
 
 #[test]
 fn duration_with_underscores_3() -> TestResult {
-    fail_test("1_000_d_ay", "executable was not found")
+    fail_test("1_000_d_ay", "Command `1_000_d_ay` not found")
 }
 
 #[test]
@@ -667,7 +667,7 @@ fn filesize_with_underscores_2() -> TestResult {
 
 #[test]
 fn filesize_with_underscores_3() -> TestResult {
-    fail_test("42m_b", "executable was not found")
+    fail_test("42m_b", "Command `42m_b` not found")
 }
 
 #[test]
diff --git a/tests/repl/test_spread.rs b/tests/repl/test_spread.rs
index 419188be33..f0ce84d393 100644
--- a/tests/repl/test_spread.rs
+++ b/tests/repl/test_spread.rs
@@ -183,17 +183,14 @@ fn explain_spread_args() -> TestResult {
 
 #[test]
 fn disallow_implicit_spread_for_externals() -> TestResult {
-    fail_test(
-        r#"nu --testbin cococo [1 2]"#,
-        "Lists are not automatically spread",
-    )
+    fail_test(r#"^echo [1 2]"#, "Lists are not automatically spread")
 }
 
 #[test]
 fn respect_shape() -> TestResult {
     fail_test(
         "def foo [...rest] { ...$rest }; foo bar baz",
-        "executable was not found",
+        "Command `...$rest` not found",
     )
     .unwrap();
     fail_test("module foo { ...$bar }", "expected_keyword").unwrap();
diff --git a/tests/shell/pipeline/commands/external.rs b/tests/shell/pipeline/commands/external.rs
index 3cbed5a124..8557e9e327 100644
--- a/tests/shell/pipeline/commands/external.rs
+++ b/tests/shell/pipeline/commands/external.rs
@@ -72,7 +72,9 @@ fn correctly_escape_external_arguments() {
 fn escape_also_escapes_equals() {
     let actual = nu!("^MYFOONAME=MYBARVALUE");
 
-    assert!(actual.err.contains("executable was not found"));
+    assert!(actual
+        .err
+        .contains("Command `MYFOONAME=MYBARVALUE` not found"));
 }
 
 #[test]
@@ -127,7 +129,7 @@ fn command_not_found_error_shows_not_found_1() {
             export extern "foo" [];
             foo
         "#);
-    assert!(actual.err.contains("'foo' was not found"));
+    assert!(actual.err.contains("Command `foo` not found"));
 }
 
 #[test]
diff --git a/tests/shell/pipeline/commands/internal.rs b/tests/shell/pipeline/commands/internal.rs
index 6c2226ff65..67d4ee31a9 100644
--- a/tests/shell/pipeline/commands/internal.rs
+++ b/tests/shell/pipeline/commands/internal.rs
@@ -989,7 +989,9 @@ fn hide_alias_hides_alias() {
         "
     ));
 
-    assert!(actual.err.contains("did you mean 'all'?"));
+    assert!(
+        actual.err.contains("Command `ll` not found") && actual.err.contains("Did you mean `all`?")
+    );
 }
 
 mod parse {
@@ -1035,7 +1037,7 @@ mod parse {
     fn ensure_backticks_are_bareword_command() {
         let actual = nu!("`8abc123`");
 
-        assert!(actual.err.contains("was not found"),);
+        assert!(actual.err.contains("Command `8abc123` not found"),);
     }
 }
 
@@ -1146,5 +1148,8 @@ fn command_not_found_error_shows_not_found_2() {
             export def --wrapped my-foo [...rest] { foo };
             my-foo
         "#);
-    assert!(actual.err.contains("did you mean"));
+    assert!(
+        actual.err.contains("Command `foo` not found")
+            && actual.err.contains("Did you mean `for`?")
+    );
 }

From 58cf0c56f8cefc3c1bf9d4a39d3fdb19890b8681 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Thu, 23 May 2024 10:47:06 +0800
Subject: [PATCH 0027/1072] add some completion tests (#12908)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
```nushell
❯ ls
╭───┬───────┬──────┬──────┬──────────╮
│ # │ name  │ type │ size │ modified │
├───┼───────┼──────┼──────┼──────────┤
│ 0 │ a.txt │ file │  0 B │ now      │
╰───┴───────┴──────┴──────┴──────────╯

❯ ls a.
NO RECORDS FOUND
```

There is a completion issue on previous version, I think @amtoine have
reproduced it before. But currently I can't reproduce it on latest main.
To avoid such regression, I added some tests for completion.

---------

Co-authored-by: Antoine Stevan <44101798+amtoine@users.noreply.github.com>
---
 crates/nu-cli/tests/completions/mod.rs        | 46 +++++++++++++++++++
 .../partial_a/have_ext.exe                    |  0
 .../partial_a/have_ext.txt                    |  0
 3 files changed, 46 insertions(+)
 create mode 100644 tests/fixtures/partial_completions/partial_a/have_ext.exe
 create mode 100644 tests/fixtures/partial_completions/partial_a/have_ext.txt

diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index a3eb692adf..eb245e2fb2 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -292,6 +292,8 @@ 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_a").join("have_ext.txt")),
         file(dir.join("partial_a").join("hello")),
         file(dir.join("partial_a").join("hola")),
         file(dir.join("partial_b").join("hello_b")),
@@ -310,6 +312,8 @@ fn partial_completions() {
     // Create the expected values
     let expected_paths: Vec<String> = vec![
         file(dir.join("partial_a").join("anotherfile")),
+        file(dir.join("partial_a").join("have_ext.exe")),
+        file(dir.join("partial_a").join("have_ext.txt")),
         file(dir.join("partial_a").join("hello")),
         file(dir.join("partial_a").join("hola")),
         file(dir.join("partial_b").join("hello_b")),
@@ -360,6 +364,34 @@ fn partial_completions() {
 
     // Match the results
     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 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.txt")),
+    ];
+
+    // Match the results
+    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_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.txt")),
+    ];
+
+    // Match the results
+    match_suggestions(expected_paths, suggestions);
 }
 
 #[test]
@@ -394,6 +426,13 @@ fn command_ls_with_filecompletion() {
         ".hidden_folder/".to_string(),
     ];
 
+    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)
 }
 #[test]
@@ -428,6 +467,13 @@ fn command_open_with_filecompletion() {
         ".hidden_folder/".to_string(),
     ];
 
+    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)
 }
 
diff --git a/tests/fixtures/partial_completions/partial_a/have_ext.exe b/tests/fixtures/partial_completions/partial_a/have_ext.exe
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/fixtures/partial_completions/partial_a/have_ext.txt b/tests/fixtures/partial_completions/partial_a/have_ext.txt
new file mode 100644
index 0000000000..e69de29bb2

From c7097ca93761ea2062fef2271ebbdc4a10d67bce Mon Sep 17 00:00:00 2001
From: Reilly Wood <26268125+rgwood@users.noreply.github.com>
Date: Wed, 22 May 2024 20:06:14 -0700
Subject: [PATCH 0028/1072] `explore` cleanup: remove+move binary viewer config
 (#12920)

Small change, removing 4 more configuration options from `explore`'s
binary viewer:

1. `show_index`
2. `show_data`
3. `show_ascii`
4. `show_split`

These controlled whether the 3 columns in the binary viewer (index, hex
data, ASCII) and the pipe separator (`|`) in between them are shown. I
don't think we need this level of configurability until the `explore`
command is more mature, and maybe even not then; we can just show them
all.

I think it's very unlikely that anyone is using these configuration
points.

Also, the row offset (e.g. how many rows we have scrolled down) was
being stored in config/settings when it's arguably not config; more like
internal state of the binary viewer. I moved it to a more appropriate
location and renamed it.
---
 .../src/views/binary/binary_widget.rs         | 135 +++++++-----------
 crates/nu-explore/src/views/binary/mod.rs     |  14 +-
 2 files changed, 52 insertions(+), 97 deletions(-)

diff --git a/crates/nu-explore/src/views/binary/binary_widget.rs b/crates/nu-explore/src/views/binary/binary_widget.rs
index bee4e9d854..d100774be5 100644
--- a/crates/nu-explore/src/views/binary/binary_widget.rs
+++ b/crates/nu-explore/src/views/binary/binary_widget.rs
@@ -20,11 +20,17 @@ pub struct BinaryWidget<'a> {
     data: &'a [u8],
     opts: BinarySettings,
     style: BinaryStyle,
+    row_offset: usize,
 }
 
 impl<'a> BinaryWidget<'a> {
     pub fn new(data: &'a [u8], opts: BinarySettings, style: BinaryStyle) -> Self {
-        Self { data, opts, style }
+        Self {
+            data,
+            opts,
+            style,
+            row_offset: 0,
+        }
     }
 
     pub fn count_lines(&self) -> usize {
@@ -35,37 +41,22 @@ impl<'a> BinaryWidget<'a> {
         self.opts.count_segments * self.opts.segment_size
     }
 
-    pub fn set_index_offset(&mut self, offset: usize) {
-        self.opts.index_offset = offset;
+    pub fn set_row_offset(&mut self, offset: usize) {
+        self.row_offset = offset;
     }
 }
 
 #[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
 pub struct BinarySettings {
-    disable_index: bool,
-    disable_ascii: bool,
-    disable_data: bool,
     segment_size: usize,
     count_segments: usize,
-    index_offset: usize,
 }
 
 impl BinarySettings {
-    pub fn new(
-        disable_index: bool,
-        disable_ascii: bool,
-        disable_data: bool,
-        segment_size: usize,
-        count_segments: usize,
-        index_offset: usize,
-    ) -> Self {
+    pub fn new(segment_size: usize, count_segments: usize) -> Self {
         Self {
-            disable_index,
-            disable_ascii,
-            disable_data,
             segment_size,
             count_segments,
-            index_offset,
         }
     }
 }
@@ -75,7 +66,6 @@ pub struct BinaryStyle {
     color_index: Option<NuStyle>,
     column_padding_left: u16,
     column_padding_right: u16,
-    show_split: bool,
 }
 
 impl BinaryStyle {
@@ -83,13 +73,11 @@ impl BinaryStyle {
         color_index: Option<NuStyle>,
         column_padding_left: u16,
         column_padding_right: u16,
-        show_split: bool,
     ) -> Self {
         Self {
             color_index,
             column_padding_left,
             column_padding_right,
-            show_split,
         }
     }
 }
@@ -102,10 +90,6 @@ impl Widget for BinaryWidget<'_> {
             return;
         }
 
-        if self.opts.disable_index && self.opts.disable_data && self.opts.disable_ascii {
-            return;
-        }
-
         render_hexdump(area, buf, self);
     }
 }
@@ -114,11 +98,6 @@ impl Widget for BinaryWidget<'_> {
 fn render_hexdump(area: Rect, buf: &mut Buffer, w: BinaryWidget) {
     const MIN_INDEX_SIZE: usize = 8;
 
-    let show_index = !w.opts.disable_index;
-    let show_data = !w.opts.disable_data;
-    let show_ascii = !w.opts.disable_ascii;
-    let show_split = w.style.show_split;
-
     let index_width = get_max_index_size(&w).max(MIN_INDEX_SIZE) as u16; // safe as it's checked before hand that we have enough space
 
     let mut last_line = None;
@@ -126,7 +105,7 @@ fn render_hexdump(area: Rect, buf: &mut Buffer, w: BinaryWidget) {
     for line in 0..area.height {
         let data_line_length = w.opts.count_segments * w.opts.segment_size;
         let start_index = line as usize * data_line_length;
-        let address = w.opts.index_offset + start_index;
+        let address = w.row_offset + start_index;
 
         if start_index > w.data.len() {
             last_line = Some(line);
@@ -137,31 +116,24 @@ fn render_hexdump(area: Rect, buf: &mut Buffer, w: BinaryWidget) {
         let y = line;
         let line = &w.data[start_index..];
 
-        if show_index {
-            x += render_space(buf, x, y, 1, w.style.column_padding_left);
-            x += render_hex_usize(buf, x, y, address, index_width, get_index_style(&w));
-            x += render_space(buf, x, y, 1, w.style.column_padding_right);
-        }
+        // index column
+        x += render_space(buf, x, y, 1, w.style.column_padding_left);
+        x += render_hex_usize(buf, x, y, address, index_width, get_index_style(&w));
+        x += render_space(buf, x, y, 1, w.style.column_padding_right);
 
-        if show_split {
-            x += render_split(buf, x, y);
-        }
+        x += render_vertical_split(buf, x, y);
 
-        if show_data {
-            x += render_space(buf, x, y, 1, w.style.column_padding_left);
-            x += render_data_line(buf, x, y, line, &w);
-            x += render_space(buf, x, y, 1, w.style.column_padding_right);
-        }
+        // data/hex column
+        x += render_space(buf, x, y, 1, w.style.column_padding_left);
+        x += render_data_line(buf, x, y, line, &w);
+        x += render_space(buf, x, y, 1, w.style.column_padding_right);
 
-        if show_split {
-            x += render_split(buf, x, y);
-        }
+        x += render_vertical_split(buf, x, y);
 
-        if show_ascii {
-            x += render_space(buf, x, y, 1, w.style.column_padding_left);
-            x += render_ascii_line(buf, x, y, line, &w);
-            render_space(buf, x, y, 1, w.style.column_padding_right);
-        }
+        // ASCII column
+        x += render_space(buf, x, y, 1, w.style.column_padding_left);
+        x += render_ascii_line(buf, x, y, line, &w);
+        render_space(buf, x, y, 1, w.style.column_padding_right);
     }
 
     let data_line_size = (w.opts.count_segments * (w.opts.segment_size * 2)
@@ -172,36 +144,29 @@ fn render_hexdump(area: Rect, buf: &mut Buffer, w: BinaryWidget) {
         for line in last_line..area.height {
             let data_line_length = w.opts.count_segments * w.opts.segment_size;
             let start_index = line as usize * data_line_length;
-            let address = w.opts.index_offset + start_index;
+            let address = w.row_offset + start_index;
 
             let mut x = 0;
             let y = line;
 
-            if show_index {
-                x += render_space(buf, x, y, 1, w.style.column_padding_left);
-                x += render_hex_usize(buf, x, y, address, index_width, get_index_style(&w));
-                x += render_space(buf, x, y, 1, w.style.column_padding_right);
-            }
+            // index column
+            x += render_space(buf, x, y, 1, w.style.column_padding_left);
+            x += render_hex_usize(buf, x, y, address, index_width, get_index_style(&w));
+            x += render_space(buf, x, y, 1, w.style.column_padding_right);
 
-            if show_split {
-                x += render_split(buf, x, y);
-            }
+            x += render_vertical_split(buf, x, y);
 
-            if show_data {
-                x += render_space(buf, x, y, 1, w.style.column_padding_left);
-                x += render_space(buf, x, y, 1, data_line_size);
-                x += render_space(buf, x, y, 1, w.style.column_padding_right);
-            }
+            // data/hex column
+            x += render_space(buf, x, y, 1, w.style.column_padding_left);
+            x += render_space(buf, x, y, 1, data_line_size);
+            x += render_space(buf, x, y, 1, w.style.column_padding_right);
 
-            if show_split {
-                x += render_split(buf, x, y);
-            }
+            x += render_vertical_split(buf, x, y);
 
-            if show_ascii {
-                x += render_space(buf, x, y, 1, w.style.column_padding_left);
-                x += render_space(buf, x, y, 1, ascii_line_size);
-                render_space(buf, x, y, 1, w.style.column_padding_right);
-            }
+            // ASCII column
+            x += render_space(buf, x, y, 1, w.style.column_padding_left);
+            x += render_space(buf, x, y, 1, ascii_line_size);
+            render_space(buf, x, y, 1, w.style.column_padding_right);
         }
     }
 }
@@ -336,12 +301,15 @@ fn get_index_style(w: &BinaryWidget) -> Option<NuStyle> {
     w.style.color_index
 }
 
-fn render_space(buf: &mut Buffer, x: u16, y: u16, height: u16, padding: u16) -> u16 {
-    repeat_vertical(buf, x, y, padding, height, ' ', TextStyle::default());
-    padding
+/// Render blank characters starting at the given position, going right `width` characters and down `height` characters.
+/// Returns `width` for convenience.
+fn render_space(buf: &mut Buffer, x: u16, y: u16, height: u16, width: u16) -> u16 {
+    repeat_vertical(buf, x, y, width, height, ' ', TextStyle::default());
+    width
 }
 
-fn render_split(buf: &mut Buffer, x: u16, y: u16) -> u16 {
+/// Render a vertical split (│) at the given position. Returns the width of the split (always 1) for convenience.
+fn render_vertical_split(buf: &mut Buffer, x: u16, y: u16) -> u16 {
     repeat_vertical(buf, x, y, 1, 1, '│', TextStyle::default());
     1
 }
@@ -369,7 +337,7 @@ fn repeat_vertical(
 fn get_max_index_size(w: &BinaryWidget) -> usize {
     let line_size = w.opts.count_segments * (w.opts.segment_size * 2);
     let count_lines = w.data.len() / line_size;
-    let max_index = w.opts.index_offset + count_lines * line_size;
+    let max_index = w.row_offset + count_lines * line_size;
     usize_to_hex(max_index, 0).len()
 }
 
@@ -379,7 +347,7 @@ fn get_widget_width(w: &BinaryWidget) -> usize {
     let line_size = w.opts.count_segments * (w.opts.segment_size * 2);
     let count_lines = w.data.len() / line_size;
 
-    let max_index = w.opts.index_offset + count_lines * line_size;
+    let max_index = w.row_offset + count_lines * line_size;
     let index_size = usize_to_hex(max_index, 0).len();
     let index_size = index_size.max(MIN_INDEX_SIZE);
 
@@ -388,17 +356,16 @@ fn get_widget_width(w: &BinaryWidget) -> usize {
 
     let ascii_size = w.opts.count_segments * w.opts.segment_size;
 
-    let split = w.style.show_split as usize;
     #[allow(clippy::identity_op)]
     let min_width = 0
         + w.style.column_padding_left as usize
         + index_size
         + w.style.column_padding_right as usize
-        + split
+        + 1 // split
         + w.style.column_padding_left as usize
         + data_size
         + w.style.column_padding_right as usize
-        + split
+        + 1 //split
         + w.style.column_padding_left as usize
         + ascii_size
         + w.style.column_padding_right as usize;
diff --git a/crates/nu-explore/src/views/binary/mod.rs b/crates/nu-explore/src/views/binary/mod.rs
index 31ea0d6eaf..7e44a3985e 100644
--- a/crates/nu-explore/src/views/binary/mod.rs
+++ b/crates/nu-explore/src/views/binary/mod.rs
@@ -107,7 +107,7 @@ fn create_binary_widget(v: &BinaryView) -> BinaryWidget<'_> {
     let data = &v.data[index..];
 
     let mut w = BinaryWidget::new(data, v.settings.opts, v.settings.style.clone());
-    w.set_index_offset(index);
+    w.set_row_offset(index);
 
     w
 }
@@ -184,29 +184,17 @@ fn settings_from_config(config: &ConfigMap) -> Settings {
 
     Settings {
         opts: BinarySettings::new(
-            !config_get_bool(config, "show_index", true),
-            !config_get_bool(config, "show_ascii", true),
-            !config_get_bool(config, "show_data", true),
             config_get_usize(config, "segment_size", 2),
             config_get_usize(config, "count_segments", 8),
-            0,
         ),
         style: BinaryStyle::new(
             colors.get("color_index").cloned(),
             config_get_usize(config, "column_padding_left", 1) as u16,
             config_get_usize(config, "column_padding_right", 1) as u16,
-            config_get_bool(config, "split", false),
         ),
     }
 }
 
-fn config_get_bool(config: &ConfigMap, key: &str, default: bool) -> bool {
-    config
-        .get(key)
-        .and_then(|v| v.as_bool().ok())
-        .unwrap_or(default)
-}
-
 fn config_get_usize(config: &ConfigMap, key: &str, default: usize) -> usize {
     config
         .get(key)

From 2612a167e31fce874a7faaaecf2222a38c03c6c8 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Thu, 23 May 2024 05:53:55 +0000
Subject: [PATCH 0029/1072] Remove list support in `with-env` (#12939)

# Description
Following from #12523, this PR removes support for lists of environments
variables in the `with-env` command. Rather, only records will be
supported now.

# After Submitting
Update examples using the list form in the docs and book.
---
 crates/nu-command/src/env/with_env.rs | 69 +--------------------------
 1 file changed, 2 insertions(+), 67 deletions(-)

diff --git a/crates/nu-command/src/env/with_env.rs b/crates/nu-command/src/env/with_env.rs
index ff66d21f49..46f7d1eb6e 100644
--- a/crates/nu-command/src/env/with_env.rs
+++ b/crates/nu-command/src/env/with_env.rs
@@ -1,6 +1,5 @@
 use nu_engine::{command_prelude::*, eval_block};
 use nu_protocol::{debugger::WithoutDebug, engine::Closure};
-use std::collections::HashMap;
 
 #[derive(Clone)]
 pub struct WithEnv;
@@ -58,78 +57,14 @@ fn with_env(
     call: &Call,
     input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
-    let variable: Value = call.req(engine_state, stack, 0)?;
-
+    let env: Record = call.req(engine_state, stack, 0)?;
     let capture_block: Closure = call.req(engine_state, stack, 1)?;
     let block = engine_state.get_block(capture_block.block_id);
     let mut stack = stack.captures_to_stack_preserve_out_dest(capture_block.captures);
 
-    let mut env: HashMap<String, Value> = HashMap::new();
-
-    match &variable {
-        Value::List { vals: table, .. } => {
-            nu_protocol::report_error_new(
-                engine_state,
-                &ShellError::GenericError {
-                    error: "Deprecated argument type".into(),
-                    msg: "providing the variables to `with-env` as a list or single row table has been deprecated".into(),
-                    span: Some(variable.span()),
-                    help: Some("use the record form instead".into()),
-                    inner: vec![],
-                },
-            );
-            if table.len() == 1 {
-                // single row([[X W]; [Y Z]])
-                match &table[0] {
-                    Value::Record { val, .. } => {
-                        for (k, v) in &**val {
-                            env.insert(k.to_string(), v.clone());
-                        }
-                    }
-                    x => {
-                        return Err(ShellError::CantConvert {
-                            to_type: "record".into(),
-                            from_type: x.get_type().to_string(),
-                            span: x.span(),
-                            help: None,
-                        });
-                    }
-                }
-            } else {
-                // primitive values([X Y W Z])
-                for row in table.chunks(2) {
-                    if row.len() == 2 {
-                        env.insert(row[0].coerce_string()?, row[1].clone());
-                    }
-                    if row.len() == 1 {
-                        return Err(ShellError::IncorrectValue {
-                            msg: format!("Missing value for $env.{}", row[0].coerce_string()?),
-                            val_span: row[0].span(),
-                            call_span: call.head,
-                        });
-                    }
-                }
-            }
-        }
-        // when get object by `open x.json` or `from json`
-        Value::Record { val, .. } => {
-            for (k, v) in &**val {
-                env.insert(k.clone(), v.clone());
-            }
-        }
-        x => {
-            return Err(ShellError::CantConvert {
-                to_type: "record".into(),
-                from_type: x.get_type().to_string(),
-                span: x.span(),
-                help: None,
-            });
-        }
-    };
-
     // TODO: factor list of prohibited env vars into common place
     for prohibited in ["PWD", "FILE_PWD", "CURRENT_FILE"] {
-        if env.contains_key(prohibited) {
+        if env.contains(prohibited) {
             return Err(ShellError::AutomaticEnvVarSetManually {
                 envvar_name: prohibited.into(),
                 span: call.head,

From f53aa6fcbfe53563d8e04d5f3717c5890860f5da Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Thu, 23 May 2024 21:51:02 +0800
Subject: [PATCH 0030/1072] fix std help (#12943)

# Description
Fixes: #12941

~~The issue is cause by some columns(is_builtin, is_plugin, is_custom,
is_keyword) are removed in #10023~~
Edit: I'm wrong

# Tests + Formatting
Added one test for `std help`
---
 crates/nu-std/std/help.nu        | 10 +++++-----
 crates/nu-std/tests/test_help.nu |  9 +++++++++
 2 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 crates/nu-std/tests/test_help.nu

diff --git a/crates/nu-std/std/help.nu b/crates/nu-std/std/help.nu
index 20a672dd90..df6c4c6ca6 100644
--- a/crates/nu-std/std/help.nu
+++ b/crates/nu-std/std/help.nu
@@ -515,7 +515,7 @@ def build-command-page [command: record] {
             $"- (ansi cyan)does not create(ansi reset) a scope."
         }
     ) | append (
-        if ($command.is_builtin) {
+        if ($command.type == "built-in") {
             $"- (ansi cyan)is(ansi reset) a built-in command."
         } else {
             $"- (ansi cyan)is not(ansi reset) a built-in command."
@@ -527,19 +527,19 @@ def build-command-page [command: record] {
             $"- (ansi cyan)is not(ansi reset) a subcommand."
         }
     ) | append (
-        if ($command.is_plugin) {
+        if ($command.type == "plugin") {
             $"- (ansi cyan)is part(ansi reset) of a plugin."
         } else {
             $"- (ansi cyan)is not part(ansi reset) of a plugin."
         }
     ) | append (
-        if ($command.is_custom) {
+        if ($command.type == "custom") {
             $"- (ansi cyan)is(ansi reset) a custom command."
         } else {
             $"- (ansi cyan)is not(ansi reset) a custom command."
         }
     ) | append (
-        if ($command.is_keyword) {
+        if ($command.type == "keyword") {
             $"- (ansi cyan)is(ansi reset) a keyword."
         } else {
             $"- (ansi cyan)is not(ansi reset) a keyword."
@@ -689,7 +689,7 @@ export def commands [
     ...command: string@"nu-complete list-commands"  # the name of command to get help on
     --find (-f): string  # string to find in command names and usage
 ] {
-    let commands = (scope commands | where not is_extern | reject is_extern | sort-by name)
+    let commands = (scope commands | sort-by name)
 
     if not ($find | is-empty) {
         # TODO: impl find for external commands
diff --git a/crates/nu-std/tests/test_help.nu b/crates/nu-std/tests/test_help.nu
new file mode 100644
index 0000000000..1608950886
--- /dev/null
+++ b/crates/nu-std/tests/test_help.nu
@@ -0,0 +1,9 @@
+use std assert
+use std help
+
+#[test]
+def show_help_on_commands [] {
+    let help_result = (help alias)
+    assert ("item not found" not-in $help_result)
+}
+

From 0b5a4c0d951622e60c318ecaa66f15ab2c80eeaa Mon Sep 17 00:00:00 2001
From: Reilly Wood <26268125+rgwood@users.noreply.github.com>
Date: Thu, 23 May 2024 06:51:39 -0700
Subject: [PATCH 0031/1072] `explore` refactoring+clarification (#12940)

Another very boring PR cleaning up and documenting some of `explore`'s
innards. Mostly renaming things that I found confusing or vague when
reading through the code, also adding some comments.
---
 ...coloredtextw.rs => colored_text_widget.rs} | 13 ++--
 crates/nu-explore/src/views/mod.rs            |  2 +-
 crates/nu-explore/src/views/preview.rs        | 11 +--
 crates/nu-explore/src/views/record/mod.rs     | 12 ++--
 .../record/{tablew.rs => table_widget.rs}     | 68 +++++++++----------
 5 files changed, 55 insertions(+), 51 deletions(-)
 rename crates/nu-explore/src/views/{coloredtextw.rs => colored_text_widget.rs} (89%)
 rename crates/nu-explore/src/views/record/{tablew.rs => table_widget.rs} (92%)

diff --git a/crates/nu-explore/src/views/coloredtextw.rs b/crates/nu-explore/src/views/colored_text_widget.rs
similarity index 89%
rename from crates/nu-explore/src/views/coloredtextw.rs
rename to crates/nu-explore/src/views/colored_text_widget.rs
index 93ef68f38f..4b1398e713 100644
--- a/crates/nu-explore/src/views/coloredtextw.rs
+++ b/crates/nu-explore/src/views/colored_text_widget.rs
@@ -8,24 +8,27 @@ use ratatui::{
     widgets::Widget,
 };
 
-pub struct ColoredTextW<'a> {
+/// A widget that represents a single line of text with ANSI styles.
+pub struct ColoredTextWidget<'a> {
     text: &'a str,
+    /// Column to start rendering from
     col: usize,
 }
 
-impl<'a> ColoredTextW<'a> {
+impl<'a> ColoredTextWidget<'a> {
     pub fn new(text: &'a str, col: usize) -> Self {
         Self { text, col }
     }
 
-    pub fn what(&self, area: Rect) -> String {
-        cut_string(self.text, self.col, area.width as usize)
+    /// Return a window of the text that fits into the given width, with ANSI styles stripped.
+    pub fn get_plain_text(&self, max_width: usize) -> String {
+        cut_string(self.text, self.col, max_width)
             .ansi_strip()
             .into_owned()
     }
 }
 
-impl Widget for ColoredTextW<'_> {
+impl Widget for ColoredTextWidget<'_> {
     fn render(self, area: Rect, buf: &mut ratatui::buffer::Buffer) {
         let text = cut_string(self.text, self.col, area.width as usize);
 
diff --git a/crates/nu-explore/src/views/mod.rs b/crates/nu-explore/src/views/mod.rs
index 3226f546d2..dd0a4a3339 100644
--- a/crates/nu-explore/src/views/mod.rs
+++ b/crates/nu-explore/src/views/mod.rs
@@ -1,5 +1,5 @@
 mod binary;
-mod coloredtextw;
+mod colored_text_widget;
 mod cursor;
 mod interactive;
 mod preview;
diff --git a/crates/nu-explore/src/views/preview.rs b/crates/nu-explore/src/views/preview.rs
index 2bd495144b..360cfbd226 100644
--- a/crates/nu-explore/src/views/preview.rs
+++ b/crates/nu-explore/src/views/preview.rs
@@ -1,4 +1,4 @@
-use super::{coloredtextw::ColoredTextW, cursor::XYCursor, Layout, View, ViewConfig};
+use super::{colored_text_widget::ColoredTextWidget, cursor::XYCursor, Layout, View, ViewConfig};
 use crate::{
     nu_common::{NuSpan, NuText},
     pager::{report::Report, Frame, Transition, ViewInfo},
@@ -43,13 +43,14 @@ impl View for Preview {
 
         let lines = &self.lines[self.cursor.row_starts_at()..];
         for (i, line) in lines.iter().enumerate().take(area.height as usize) {
-            let text = ColoredTextW::new(line, self.cursor.column());
-            let s = text.what(area);
+            let text_widget = ColoredTextWidget::new(line, self.cursor.column());
+            let plain_text = text_widget.get_plain_text(area.width as usize);
 
             let area = Rect::new(area.x, area.y + i as u16, area.width, 1);
-            f.render_widget(text, area);
+            f.render_widget(text_widget, area);
 
-            layout.push(&s, area.x, area.y, area.width, area.height);
+            // push the plain text to layout so it can be searched
+            layout.push(&plain_text, area.x, area.y, area.width, area.height);
         }
     }
 
diff --git a/crates/nu-explore/src/views/record/mod.rs b/crates/nu-explore/src/views/record/mod.rs
index 2ad3140bf4..5bd74c2329 100644
--- a/crates/nu-explore/src/views/record/mod.rs
+++ b/crates/nu-explore/src/views/record/mod.rs
@@ -1,6 +1,6 @@
-mod tablew;
+mod table_widget;
 
-use self::tablew::{TableStyle, TableW, TableWState};
+use self::table_widget::{TableStyle, TableWidget, TableWidgetState};
 use super::{
     cursor::XYCursor,
     util::{make_styled_string, nu_style_to_tui},
@@ -25,7 +25,7 @@ use nu_protocol::{
 use ratatui::{layout::Rect, widgets::Block};
 use std::{borrow::Cow, collections::HashMap};
 
-pub use self::tablew::Orientation;
+pub use self::table_widget::Orientation;
 
 #[derive(Debug, Clone)]
 pub struct RecordView<'a> {
@@ -175,7 +175,7 @@ impl<'a> RecordView<'a> {
         }
     }
 
-    fn create_tablew(&'a self, cfg: ViewConfig<'a>) -> TableW<'a> {
+    fn create_tablew(&'a self, cfg: ViewConfig<'a>) -> TableWidget<'a> {
         let layer = self.get_layer_last();
         let mut data = convert_records_to_string(&layer.records, cfg.nu_config, cfg.style_computer);
 
@@ -185,7 +185,7 @@ impl<'a> RecordView<'a> {
         let style_computer = cfg.style_computer;
         let (row, column) = self.get_current_offset();
 
-        TableW::new(
+        TableWidget::new(
             headers,
             data,
             style_computer,
@@ -225,7 +225,7 @@ impl<'a> RecordView<'a> {
 
 impl View for RecordView<'_> {
     fn draw(&mut self, f: &mut Frame, area: Rect, cfg: ViewConfig<'_>, layout: &mut Layout) {
-        let mut table_layout = TableWState::default();
+        let mut table_layout = TableWidgetState::default();
         let table = self.create_tablew(cfg);
         f.render_stateful_widget(table, area, &mut table_layout);
 
diff --git a/crates/nu-explore/src/views/record/tablew.rs b/crates/nu-explore/src/views/record/table_widget.rs
similarity index 92%
rename from crates/nu-explore/src/views/record/tablew.rs
rename to crates/nu-explore/src/views/record/table_widget.rs
index b4b4fe4514..70debfd888 100644
--- a/crates/nu-explore/src/views/record/tablew.rs
+++ b/crates/nu-explore/src/views/record/table_widget.rs
@@ -18,13 +18,13 @@ use std::{
 };
 
 #[derive(Debug, Clone)]
-pub struct TableW<'a> {
+pub struct TableWidget<'a> {
     columns: Cow<'a, [String]>,
     data: Cow<'a, [Vec<NuText>]>,
     index_row: usize,
     index_column: usize,
     style: TableStyle,
-    head_position: Orientation,
+    header_position: Orientation,
     style_computer: &'a StyleComputer<'a>,
 }
 
@@ -38,14 +38,13 @@ pub enum Orientation {
 #[derive(Debug, Default, Clone, Copy)]
 pub struct TableStyle {
     pub splitline_style: NuStyle,
-    pub shift_line_style: NuStyle,
     pub show_index: bool,
     pub show_header: bool,
     pub column_padding_left: usize,
     pub column_padding_right: usize,
 }
 
-impl<'a> TableW<'a> {
+impl<'a> TableWidget<'a> {
     #[allow(clippy::too_many_arguments)]
     pub fn new(
         columns: impl Into<Cow<'a, [String]>>,
@@ -54,7 +53,7 @@ impl<'a> TableW<'a> {
         index_row: usize,
         index_column: usize,
         style: TableStyle,
-        head_position: Orientation,
+        header_position: Orientation,
     ) -> Self {
         Self {
             columns: columns.into(),
@@ -63,21 +62,21 @@ impl<'a> TableW<'a> {
             index_row,
             index_column,
             style,
-            head_position,
+            header_position,
         }
     }
 }
 
 #[derive(Debug, Default)]
-pub struct TableWState {
+pub struct TableWidgetState {
     pub layout: Layout,
     pub count_rows: usize,
     pub count_columns: usize,
     pub data_height: u16,
 }
 
-impl StatefulWidget for TableW<'_> {
-    type State = TableWState;
+impl StatefulWidget for TableWidget<'_> {
+    type State = TableWidgetState;
 
     fn render(
         self,
@@ -89,7 +88,7 @@ impl StatefulWidget for TableW<'_> {
             return;
         }
 
-        let is_horizontal = matches!(self.head_position, Orientation::Top);
+        let is_horizontal = matches!(self.header_position, Orientation::Top);
         if is_horizontal {
             self.render_table_horizontal(area, buf, state);
         } else {
@@ -99,8 +98,8 @@ impl StatefulWidget for TableW<'_> {
 }
 
 // todo: refactoring these to methods as they have quite a bit in common.
-impl<'a> TableW<'a> {
-    fn render_table_horizontal(self, area: Rect, buf: &mut Buffer, state: &mut TableWState) {
+impl<'a> TableWidget<'a> {
+    fn render_table_horizontal(self, area: Rect, buf: &mut Buffer, state: &mut TableWidgetState) {
         let padding_l = self.style.column_padding_left as u16;
         let padding_r = self.style.column_padding_right as u16;
 
@@ -108,7 +107,6 @@ impl<'a> TableW<'a> {
         let show_head = self.style.show_header;
 
         let splitline_s = self.style.splitline_style;
-        let shift_column_s = self.style.shift_line_style;
 
         let mut data_height = area.height;
         let mut data_y = area.y;
@@ -164,7 +162,8 @@ impl<'a> TableW<'a> {
             );
         }
 
-        let mut do_render_shift_column = false;
+        // if there is more data than we can show, add an ellipsis to the column headers to hint at that
+        let mut show_overflow_indicator = false;
         state.count_rows = data.len();
         state.count_columns = 0;
         state.data_height = data_height;
@@ -191,11 +190,11 @@ impl<'a> TableW<'a> {
 
                 let pad = padding_l + padding_r;
                 let head = show_head.then_some(&mut head);
-                let (w, ok, shift) =
+                let (w, ok, overflow) =
                     truncate_column_width(space, 1, use_space, pad, is_last, &mut column, head);
 
-                if shift {
-                    do_render_shift_column = true;
+                if overflow {
+                    show_overflow_indicator = true;
                 }
 
                 if w == 0 && !ok {
@@ -232,14 +231,14 @@ impl<'a> TableW<'a> {
 
             state.count_columns += 1;
 
-            if do_render_shift_column {
+            if show_overflow_indicator {
                 break;
             }
         }
 
-        if do_render_shift_column && show_head {
+        if show_overflow_indicator && show_head {
             width += render_space(buf, width, data_y, data_height, padding_l);
-            width += render_shift_column(buf, width, head_y, 1, shift_column_s);
+            width += render_overflow_column(buf, width, head_y, 1);
             width += render_space(buf, width, data_y, data_height, padding_r);
         }
 
@@ -264,7 +263,7 @@ impl<'a> TableW<'a> {
         }
     }
 
-    fn render_table_vertical(self, area: Rect, buf: &mut Buffer, state: &mut TableWState) {
+    fn render_table_vertical(self, area: Rect, buf: &mut Buffer, state: &mut TableWidgetState) {
         if area.width == 0 || area.height == 0 {
             return;
         }
@@ -275,7 +274,6 @@ impl<'a> TableW<'a> {
         let show_index = self.style.show_index;
         let show_head = self.style.show_header;
         let splitline_s = self.style.splitline_style;
-        let shift_column_s = self.style.shift_line_style;
 
         let mut left_w = 0;
 
@@ -358,7 +356,8 @@ impl<'a> TableW<'a> {
             );
         }
 
-        let mut do_render_shift_column = false;
+        // if there is more data than we can show, add an ellipsis to the column headers to hint at that
+        let mut show_overflow_indicator = false;
 
         state.count_rows = columns.len();
         state.count_columns = 0;
@@ -375,11 +374,11 @@ impl<'a> TableW<'a> {
             let available = area.width - left_w;
             let is_last = col + 1 == self.data.len();
             let pad = padding_l + padding_r;
-            let (column_width, ok, shift) =
+            let (column_width, ok, overflow) =
                 truncate_column_width(available, 1, column_width, pad, is_last, &mut column, None);
 
-            if shift {
-                do_render_shift_column = true;
+            if overflow {
+                show_overflow_indicator = true;
             }
 
             if column_width == 0 && !ok {
@@ -403,16 +402,16 @@ impl<'a> TableW<'a> {
                 state.count_columns += 1;
             }
 
-            if do_render_shift_column {
+            if show_overflow_indicator {
                 break;
             }
         }
 
-        if do_render_shift_column {
+        if show_overflow_indicator {
             let x = area.x + left_w;
             left_w += render_space(buf, x, area.y, area.height, padding_l);
             let x = area.x + left_w;
-            left_w += render_shift_column(buf, x, area.y, area.height, shift_column_s);
+            left_w += render_overflow_column(buf, x, area.y, area.height);
             let x = area.x + left_w;
             left_w += render_space(buf, x, area.y, area.height, padding_r);
         }
@@ -433,13 +432,13 @@ fn truncate_column_width(
 ) -> (u16, bool, bool) {
     let result = check_column_width(space, min, w, pad, is_last);
 
-    let (width, shift_column) = match result {
+    let (width, overflow) = match result {
         Some(result) => result,
         None => return (w, true, false),
     };
 
     if width == 0 {
-        return (0, false, shift_column);
+        return (0, false, overflow);
     }
 
     truncate_list(column, width as usize);
@@ -447,7 +446,7 @@ fn truncate_column_width(
         truncate_str(head, width as usize);
     }
 
-    (width, false, shift_column)
+    (width, false, overflow)
 }
 
 fn check_column_width(
@@ -652,10 +651,11 @@ fn truncate_list(list: &mut [NuText], width: usize) {
     }
 }
 
-fn render_shift_column(buf: &mut Buffer, x: u16, y: u16, height: u16, style: NuStyle) -> u16 {
+/// Render a column with an ellipsis in the header to indicate that there is more data than can be displayed
+fn render_overflow_column(buf: &mut Buffer, x: u16, y: u16, height: u16) -> u16 {
     let style = TextStyle {
         alignment: Alignment::Left,
-        color_style: Some(style),
+        color_style: None,
     };
 
     repeat_vertical(buf, x, y, 1, height, '…', style);

From bf07806b1bc96eebcaa57456c97035a6bce68ef7 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Thu, 23 May 2024 20:38:47 +0000
Subject: [PATCH 0032/1072] Use `cwd` in `grid` (#12947)

# Description
Fixes #12946. The `grid` command does not use the cwd when trying to get
the icon or color for a file/path.
---
 crates/nu-command/src/viewers/griddle.rs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/crates/nu-command/src/viewers/griddle.rs b/crates/nu-command/src/viewers/griddle.rs
index e0856e0a70..8b39bf5649 100644
--- a/crates/nu-command/src/viewers/griddle.rs
+++ b/crates/nu-command/src/viewers/griddle.rs
@@ -5,6 +5,7 @@ use nu_engine::{command_prelude::*, env_to_string};
 use nu_protocol::Config;
 use nu_term_grid::grid::{Alignment, Cell, Direction, Filling, Grid, GridOptions};
 use nu_utils::get_ls_colors;
+use std::path::Path;
 use terminal_size::{Height, Width};
 
 #[derive(Clone)]
@@ -67,6 +68,7 @@ prints out the list properly."#
         };
         let use_grid_icons = config.use_grid_icons;
         let use_color: bool = color_param && config.use_ansi_coloring;
+        let cwd = engine_state.cwd(Some(stack))?;
 
         match input {
             PipelineData::Value(Value::List { vals, .. }, ..) => {
@@ -81,6 +83,7 @@ prints out the list properly."#
                         separator_param,
                         env_str,
                         use_grid_icons,
+                        &cwd,
                     )?)
                 } else {
                     Ok(PipelineData::empty())
@@ -98,6 +101,7 @@ prints out the list properly."#
                         separator_param,
                         env_str,
                         use_grid_icons,
+                        &cwd,
                     )?)
                 } else {
                     // dbg!(data);
@@ -120,6 +124,7 @@ prints out the list properly."#
                     separator_param,
                     env_str,
                     use_grid_icons,
+                    &cwd,
                 )?)
             }
             x => {
@@ -161,6 +166,7 @@ prints out the list properly."#
     }
 }
 
+#[allow(clippy::too_many_arguments)]
 fn create_grid_output(
     items: Vec<(usize, String, String)>,
     call: &Call,
@@ -169,6 +175,7 @@ fn create_grid_output(
     separator_param: Option<String>,
     env_str: Option<String>,
     use_grid_icons: bool,
+    cwd: &Path,
 ) -> Result<PipelineData, ShellError> {
     let ls_colors = get_ls_colors(env_str);
 
@@ -196,8 +203,8 @@ fn create_grid_output(
             if use_color {
                 if use_grid_icons {
                     let no_ansi = nu_utils::strip_ansi_unlikely(&value);
-                    let path = std::path::Path::new(no_ansi.as_ref());
-                    let icon = icon_for_file(path, call.head)?;
+                    let path = cwd.join(no_ansi.as_ref());
+                    let icon = icon_for_file(&path, call.head)?;
                     let ls_colors_style = ls_colors.style_for_path(path);
 
                     let icon_style = match ls_colors_style {

From 7d11c28eea72b940a1babc11fc17072b532f9a03 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Fri, 24 May 2024 11:09:59 -0500
Subject: [PATCH 0033/1072] Revert "Remove `std::env::set_current_dir()` call
 from `EngineState::merge_env()`" (#12954)

Reverts nushell/nushell#12922
---
 crates/nu-cli/src/config_files.rs             | 11 ++++-
 crates/nu-cli/src/repl.rs                     | 12 +++--
 crates/nu-cli/tests/completions/mod.rs        | 46 +++++++++----------
 .../support/completions_helpers.rs            |  9 ++--
 crates/nu-cmd-base/src/hook.rs                |  4 +-
 crates/nu-cmd-lang/src/example_support.rs     |  2 +-
 crates/nu-protocol/src/engine/engine_state.rs |  9 +++-
 crates/nu-std/src/lib.rs                      |  3 +-
 src/config_files.rs                           | 22 +++++++--
 src/test_bins.rs                              |  6 ++-
 10 files changed, 83 insertions(+), 41 deletions(-)

diff --git a/crates/nu-cli/src/config_files.rs b/crates/nu-cli/src/config_files.rs
index 0684623226..ec7ad2f412 100644
--- a/crates/nu-cli/src/config_files.rs
+++ b/crates/nu-cli/src/config_files.rs
@@ -235,8 +235,15 @@ pub fn eval_config_contents(
             engine_state.file = prev_file;
 
             // Merge the environment in case env vars changed in the config
-            if let Err(e) = engine_state.merge_env(stack) {
-                report_error_new(engine_state, &e);
+            match engine_state.cwd(Some(stack)) {
+                Ok(cwd) => {
+                    if let Err(e) = engine_state.merge_env(stack, cwd) {
+                        report_error_new(engine_state, &e);
+                    }
+                }
+                Err(e) => {
+                    report_error_new(engine_state, &e);
+                }
             }
         }
     }
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index e79f41eb21..29c2f62734 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -15,7 +15,10 @@ use crate::{
 use crossterm::cursor::SetCursorStyle;
 use log::{error, trace, warn};
 use miette::{ErrReport, IntoDiagnostic, Result};
-use nu_cmd_base::{hook::eval_hook, util::get_editor};
+use nu_cmd_base::{
+    hook::eval_hook,
+    util::{get_editor, get_guaranteed_cwd},
+};
 use nu_color_config::StyleComputer;
 #[allow(deprecated)]
 use nu_engine::{convert_env_values, current_dir_str, env_to_strings};
@@ -115,7 +118,8 @@ pub fn evaluate_repl(
             PipelineData::empty(),
             false,
         );
-        engine_state.merge_env(&mut unique_stack)?;
+        let cwd = get_guaranteed_cwd(engine_state, &unique_stack);
+        engine_state.merge_env(&mut unique_stack, cwd)?;
     }
 
     let hostname = System::host_name();
@@ -277,10 +281,12 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
         hostname,
     } = ctx;
 
+    let cwd = get_guaranteed_cwd(engine_state, &stack);
+
     let mut start_time = std::time::Instant::now();
     // Before doing anything, merge the environment from the previous REPL iteration into the
     // permanent state.
-    if let Err(err) = engine_state.merge_env(&mut stack) {
+    if let Err(err) = engine_state.merge_env(&mut stack, cwd) {
         report_error_new(engine_state, &err);
     }
     perf(
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index eb245e2fb2..a5b0b13aa8 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -18,11 +18,11 @@ use support::{
 #[fixture]
 fn completer() -> NuCompleter {
     // Create a new engine
-    let (_, _, mut engine, mut stack) = new_engine();
+    let (dir, _, mut engine, mut stack) = new_engine();
 
     // Add record value as example
     let record = "def tst [--mod -s] {}";
-    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack).is_ok());
+    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
 
     // Instantiate a new completer
     NuCompleter::new(Arc::new(engine), Arc::new(stack))
@@ -31,12 +31,12 @@ fn completer() -> NuCompleter {
 #[fixture]
 fn completer_strings() -> NuCompleter {
     // Create a new engine
-    let (_, _, mut engine, mut stack) = new_engine();
+    let (dir, _, mut engine, mut stack) = new_engine();
 
     // Add record value as example
     let record = r#"def animals [] { ["cat", "dog", "eel" ] }
     def my-command [animal: string@animals] { print $animal }"#;
-    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack).is_ok());
+    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
 
     // Instantiate a new completer
     NuCompleter::new(Arc::new(engine), Arc::new(stack))
@@ -45,7 +45,7 @@ fn completer_strings() -> NuCompleter {
 #[fixture]
 fn extern_completer() -> NuCompleter {
     // Create a new engine
-    let (_, _, mut engine, mut stack) = new_engine();
+    let (dir, _, mut engine, mut stack) = new_engine();
 
     // Add record value as example
     let record = r#"
@@ -56,7 +56,7 @@ fn extern_completer() -> NuCompleter {
             -b: string@animals
         ]
     "#;
-    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack).is_ok());
+    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
 
     // Instantiate a new completer
     NuCompleter::new(Arc::new(engine), Arc::new(stack))
@@ -65,7 +65,7 @@ fn extern_completer() -> NuCompleter {
 #[fixture]
 fn custom_completer() -> NuCompleter {
     // Create a new engine
-    let (_, _, mut engine, mut stack) = new_engine();
+    let (dir, _, mut engine, mut stack) = new_engine();
 
     // Add record value as example
     let record = r#"
@@ -79,7 +79,7 @@ fn custom_completer() -> NuCompleter {
             completer: $external_completer
         }
     "#;
-    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack).is_ok());
+    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
 
     // Instantiate a new completer
     NuCompleter::new(Arc::new(engine), Arc::new(stack))
@@ -751,11 +751,11 @@ fn folder_with_directorycompletions() {
 #[test]
 fn variables_completions() {
     // Create a new engine
-    let (_, _, mut engine, mut stack) = new_engine();
+    let (dir, _, mut engine, mut stack) = new_engine();
 
     // Add record value as example
     let record = "let actor = { name: 'Tom Hardy', age: 44 }";
-    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack).is_ok());
+    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
 
     // Instantiate a new completer
     let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
@@ -858,11 +858,11 @@ fn variables_completions() {
 
 #[test]
 fn alias_of_command_and_flags() {
-    let (_, _, mut engine, mut stack) = new_engine();
+    let (dir, _, mut engine, mut stack) = new_engine();
 
     // Create an alias
     let alias = r#"alias ll = ls -l"#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack).is_ok());
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
 
     let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
 
@@ -877,11 +877,11 @@ fn alias_of_command_and_flags() {
 
 #[test]
 fn alias_of_basic_command() {
-    let (_, _, mut engine, mut stack) = new_engine();
+    let (dir, _, mut engine, mut stack) = new_engine();
 
     // Create an alias
     let alias = r#"alias ll = ls "#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack).is_ok());
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
 
     let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
 
@@ -896,14 +896,14 @@ fn alias_of_basic_command() {
 
 #[test]
 fn alias_of_another_alias() {
-    let (_, _, mut engine, mut stack) = new_engine();
+    let (dir, _, mut engine, mut stack) = new_engine();
 
     // Create an alias
     let alias = r#"alias ll = ls -la"#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack).is_ok());
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir.clone()).is_ok());
     // Create the second alias
     let alias = r#"alias lf = ll -f"#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack).is_ok());
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
 
     let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
 
@@ -920,7 +920,7 @@ fn run_external_completion(completer: &str, input: &str) -> Vec<Suggestion> {
     let completer = format!("$env.config.completions.external.completer = {completer}");
 
     // Create a new engine
-    let (_, _, mut engine_state, mut stack) = new_engine();
+    let (dir, _, mut engine_state, mut stack) = new_engine();
     let (block, delta) = {
         let mut working_set = StateWorkingSet::new(&engine_state);
         let block = parse(&mut working_set, None, completer.as_bytes(), false);
@@ -936,7 +936,7 @@ fn run_external_completion(completer: &str, input: &str) -> Vec<Suggestion> {
     );
 
     // Merge environment into the permanent state
-    assert!(engine_state.merge_env(&mut stack).is_ok());
+    assert!(engine_state.merge_env(&mut stack, &dir).is_ok());
 
     // Instantiate a new completer
     let mut completer = NuCompleter::new(Arc::new(engine_state), Arc::new(stack));
@@ -1114,11 +1114,11 @@ fn custom_completer_triggers_cursor_after_word(mut custom_completer: NuCompleter
 #[ignore = "was reverted, still needs fixing"]
 #[rstest]
 fn alias_offset_bug_7648() {
-    let (_, _, mut engine, mut stack) = new_engine();
+    let (dir, _, mut engine, mut stack) = new_engine();
 
     // Create an alias
     let alias = r#"alias ea = ^$env.EDITOR /tmp/test.s"#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack).is_ok());
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
 
     let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
 
@@ -1133,11 +1133,11 @@ fn alias_offset_bug_7648() {
 #[ignore = "was reverted, still needs fixing"]
 #[rstest]
 fn alias_offset_bug_7754() {
-    let (_, _, mut engine, mut stack) = new_engine();
+    let (dir, _, mut engine, mut stack) = new_engine();
 
     // Create an alias
     let alias = r#"alias ll = ls -l"#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack).is_ok());
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
 
     let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
 
diff --git a/crates/nu-cli/tests/completions/support/completions_helpers.rs b/crates/nu-cli/tests/completions/support/completions_helpers.rs
index df92979e23..47f46ab00e 100644
--- a/crates/nu-cli/tests/completions/support/completions_helpers.rs
+++ b/crates/nu-cli/tests/completions/support/completions_helpers.rs
@@ -62,7 +62,7 @@ pub fn new_engine() -> (PathBuf, String, EngineState, Stack) {
     );
 
     // Merge environment into the permanent state
-    let merge_result = engine_state.merge_env(&mut stack);
+    let merge_result = engine_state.merge_env(&mut stack, &dir);
     assert!(merge_result.is_ok());
 
     (dir, dir_str, engine_state, stack)
@@ -97,7 +97,7 @@ pub fn new_quote_engine() -> (PathBuf, String, EngineState, Stack) {
     );
 
     // Merge environment into the permanent state
-    let merge_result = engine_state.merge_env(&mut stack);
+    let merge_result = engine_state.merge_env(&mut stack, &dir);
     assert!(merge_result.is_ok());
 
     (dir, dir_str, engine_state, stack)
@@ -132,7 +132,7 @@ pub fn new_partial_engine() -> (PathBuf, String, EngineState, Stack) {
     );
 
     // Merge environment into the permanent state
-    let merge_result = engine_state.merge_env(&mut stack);
+    let merge_result = engine_state.merge_env(&mut stack, &dir);
     assert!(merge_result.is_ok());
 
     (dir, dir_str, engine_state, stack)
@@ -173,6 +173,7 @@ pub fn merge_input(
     input: &[u8],
     engine_state: &mut EngineState,
     stack: &mut Stack,
+    dir: PathBuf,
 ) -> Result<(), ShellError> {
     let (block, delta) = {
         let mut working_set = StateWorkingSet::new(engine_state);
@@ -195,5 +196,5 @@ pub fn merge_input(
     .is_ok());
 
     // Merge environment into the permanent state
-    engine_state.merge_env(stack)
+    engine_state.merge_env(stack, &dir)
 }
diff --git a/crates/nu-cmd-base/src/hook.rs b/crates/nu-cmd-base/src/hook.rs
index 9133cf4167..76c13bd5c3 100644
--- a/crates/nu-cmd-base/src/hook.rs
+++ b/crates/nu-cmd-base/src/hook.rs
@@ -1,3 +1,4 @@
+use crate::util::get_guaranteed_cwd;
 use miette::Result;
 use nu_engine::{eval_block, eval_block_with_early_return};
 use nu_parser::parse;
@@ -283,7 +284,8 @@ pub fn eval_hook(
         }
     }
 
-    engine_state.merge_env(stack)?;
+    let cwd = get_guaranteed_cwd(engine_state, stack);
+    engine_state.merge_env(stack, cwd)?;
 
     Ok(output)
 }
diff --git a/crates/nu-cmd-lang/src/example_support.rs b/crates/nu-cmd-lang/src/example_support.rs
index d938729fef..bb03bbaf8c 100644
--- a/crates/nu-cmd-lang/src/example_support.rs
+++ b/crates/nu-cmd-lang/src/example_support.rs
@@ -138,7 +138,7 @@ pub fn check_example_evaluates_to_expected_output(
     stack.add_env_var("PWD".to_string(), Value::test_string(cwd.to_string_lossy()));
 
     engine_state
-        .merge_env(&mut stack)
+        .merge_env(&mut stack, cwd)
         .expect("Error merging environment");
 
     let empty_input = PipelineData::empty();
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index 10c96b7463..710ca77d4c 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -277,7 +277,11 @@ impl EngineState {
     }
 
     /// Merge the environment from the runtime Stack into the engine state
-    pub fn merge_env(&mut self, stack: &mut Stack) -> Result<(), ShellError> {
+    pub fn merge_env(
+        &mut self,
+        stack: &mut Stack,
+        cwd: impl AsRef<Path>,
+    ) -> Result<(), ShellError> {
         let mut config_updated = false;
 
         for mut scope in stack.env_vars.drain(..) {
@@ -307,6 +311,9 @@ impl EngineState {
             }
         }
 
+        // TODO: better error
+        std::env::set_current_dir(cwd)?;
+
         if config_updated {
             // Make plugin GC config changes take effect immediately.
             #[cfg(feature = "plugin")]
diff --git a/crates/nu-std/src/lib.rs b/crates/nu-std/src/lib.rs
index e6c8f30556..a20e3fc5da 100644
--- a/crates/nu-std/src/lib.rs
+++ b/crates/nu-std/src/lib.rs
@@ -98,7 +98,8 @@ use std pwd
 
     eval_block::<WithoutDebug>(engine_state, &mut stack, &block, pipeline_data)?;
 
-    engine_state.merge_env(&mut stack)?;
+    let cwd = engine_state.cwd(Some(&stack))?;
+    engine_state.merge_env(&mut stack, cwd)?;
 
     Ok(())
 }
diff --git a/src/config_files.rs b/src/config_files.rs
index 3df076045f..ec4511860f 100644
--- a/src/config_files.rs
+++ b/src/config_files.rs
@@ -164,8 +164,15 @@ pub(crate) fn read_default_env_file(engine_state: &mut EngineState, stack: &mut
     );
 
     // Merge the environment in case env vars changed in the config
-    if let Err(e) = engine_state.merge_env(stack) {
-        report_error_new(engine_state, &e);
+    match engine_state.cwd(Some(stack)) {
+        Ok(cwd) => {
+            if let Err(e) = engine_state.merge_env(stack, cwd) {
+                report_error_new(engine_state, &e);
+            }
+        }
+        Err(e) => {
+            report_error_new(engine_state, &e);
+        }
     }
 }
 
@@ -195,8 +202,15 @@ fn eval_default_config(
     );
 
     // Merge the environment in case env vars changed in the config
-    if let Err(e) = engine_state.merge_env(stack) {
-        report_error_new(engine_state, &e);
+    match engine_state.cwd(Some(stack)) {
+        Ok(cwd) => {
+            if let Err(e) = engine_state.merge_env(stack, cwd) {
+                report_error_new(engine_state, &e);
+            }
+        }
+        Err(e) => {
+            report_error_new(engine_state, &e);
+        }
     }
 }
 
diff --git a/src/test_bins.rs b/src/test_bins.rs
index 7cd542e732..b20c01f997 100644
--- a/src/test_bins.rs
+++ b/src/test_bins.rs
@@ -251,9 +251,13 @@ pub fn nu_repl() {
     for (i, line) in source_lines.iter().enumerate() {
         let mut stack = Stack::with_parent(top_stack.clone());
 
+        let cwd = engine_state
+            .cwd(Some(&stack))
+            .unwrap_or_else(|err| outcome_err(&engine_state, &err));
+
         // Before doing anything, merge the environment from the previous REPL iteration into the
         // permanent state.
-        if let Err(err) = engine_state.merge_env(&mut stack) {
+        if let Err(err) = engine_state.merge_env(&mut stack, &cwd) {
             outcome_err(&engine_state, &err);
         }
 

From 84b7a99adfb5a5cde24f29d81c86f503e7f0e815 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Fri, 24 May 2024 23:09:26 +0000
Subject: [PATCH 0034/1072] Revert "Polars lazy refactor (#12669)" (#12962)

This reverts commit 68adc4657f9c57bb7090df3984a5d2931f8e7358.

# Description

Reverts the lazyframe refactor (#12669) for the next release, since
there are still a few lingering issues. This temporarily solves #12863
and #12828. After the release, the lazyframes can be added back and
cleaned up.
---
 Cargo.lock                                    |   1 -
 crates/nu_plugin_polars/Cargo.toml            |   1 -
 .../src/dataframe/{lazy => eager}/cast.rs     |  48 ++-
 .../src/dataframe/{lazy => eager}/drop.rs     |  47 ++-
 .../{lazy => eager}/drop_duplicates.rs        |  25 +-
 .../dataframe/{lazy => eager}/drop_nulls.rs   |  32 +-
 .../src/dataframe/eager/filter_with.rs        | 162 +++++++++
 .../src/dataframe/{lazy => eager}/first.rs    |  17 +-
 .../src/dataframe/{lazy => eager}/get.rs      |  27 +-
 .../src/dataframe/{lazy => eager}/last.rs     |  14 +-
 .../src/dataframe/{lazy => eager}/melt.rs     | 132 +++++--
 .../src/dataframe/eager/mod.rs                |  36 ++
 .../src/dataframe/eager/open.rs               | 343 ++++++++++++------
 .../src/dataframe/eager/query_df.rs           |   2 +-
 .../src/dataframe/{lazy => eager}/rename.rs   |  50 ++-
 .../src/dataframe/eager/sample.rs             |   2 +-
 .../src/dataframe/{lazy => eager}/slice.rs    |  16 +-
 .../src/dataframe/eager/summary.rs            |   2 +-
 .../src/dataframe/eager/take.rs               |   2 +-
 .../src/dataframe/eager/with_column.rs        | 196 ++++++++++
 .../expressions/expressions_macro.rs          |   2 +
 .../src/dataframe/expressions/is_in.rs        |   3 +-
 .../src/dataframe/expressions/otherwise.rs    |   2 +-
 .../src/dataframe/expressions/when.rs         |   2 +-
 .../src/dataframe/lazy/aggregate.rs           |   4 +-
 .../src/dataframe/lazy/collect.rs             |   8 +-
 .../src/dataframe/lazy/fetch.rs               |   4 +-
 .../src/dataframe/lazy/fill_null.rs           |   4 +-
 .../src/dataframe/lazy/filter.rs              |   7 +-
 .../src/dataframe/lazy/filter_with.rs         |  97 -----
 .../src/dataframe/lazy/groupby.rs             |   4 +-
 .../src/dataframe/lazy/join.rs                |   9 +-
 .../src/dataframe/lazy/macro_commands.rs      |   2 +-
 .../src/dataframe/lazy/median.rs              |   2 +-
 .../src/dataframe/lazy/mod.rs                 |  27 +-
 .../src/dataframe/lazy/quantile.rs            |   1 +
 .../src/dataframe/lazy/select.rs              |   2 +-
 .../src/dataframe/lazy/sort_by_expr.rs        |   5 +-
 .../src/dataframe/lazy/to_lazy.rs             |  90 +++++
 .../src/dataframe/lazy/with_column.rs         | 114 ------
 .../src/dataframe/series/shift.rs             |  33 +-
 .../src/dataframe/series/unique.rs            |  43 ++-
 .../src/dataframe/values/mod.rs               |  14 +-
 .../values/nu_dataframe/conversion.rs         |   2 +-
 .../src/dataframe/values/nu_dataframe/mod.rs  |  14 +-
 .../values/nu_dataframe/operations.rs         |   4 +-
 .../values/nu_expression/custom_value.rs      |  49 ++-
 .../src/dataframe/values/nu_lazyframe/mod.rs  |  12 +-
 .../dataframe/values/nu_lazygroupby/mod.rs    |   4 +-
 .../src/dataframe/values/utils.rs             |   2 +
 50 files changed, 1210 insertions(+), 511 deletions(-)
 rename crates/nu_plugin_polars/src/dataframe/{lazy => eager}/cast.rs (79%)
 rename crates/nu_plugin_polars/src/dataframe/{lazy => eager}/drop.rs (62%)
 rename crates/nu_plugin_polars/src/dataframe/{lazy => eager}/drop_duplicates.rs (82%)
 rename crates/nu_plugin_polars/src/dataframe/{lazy => eager}/drop_nulls.rs (84%)
 create mode 100644 crates/nu_plugin_polars/src/dataframe/eager/filter_with.rs
 rename crates/nu_plugin_polars/src/dataframe/{lazy => eager}/first.rs (91%)
 rename crates/nu_plugin_polars/src/dataframe/{lazy => eager}/get.rs (77%)
 rename crates/nu_plugin_polars/src/dataframe/{lazy => eager}/last.rs (90%)
 rename crates/nu_plugin_polars/src/dataframe/{lazy => eager}/melt.rs (56%)
 rename crates/nu_plugin_polars/src/dataframe/{lazy => eager}/rename.rs (77%)
 rename crates/nu_plugin_polars/src/dataframe/{lazy => eager}/slice.rs (87%)
 create mode 100644 crates/nu_plugin_polars/src/dataframe/eager/with_column.rs
 delete mode 100644 crates/nu_plugin_polars/src/dataframe/lazy/filter_with.rs
 create mode 100644 crates/nu_plugin_polars/src/dataframe/lazy/to_lazy.rs
 delete mode 100644 crates/nu_plugin_polars/src/dataframe/lazy/with_column.rs

diff --git a/Cargo.lock b/Cargo.lock
index e074e772a3..2ee4c6fc25 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3399,7 +3399,6 @@ dependencies = [
  "polars",
  "polars-arrow",
  "polars-io",
- "polars-lazy",
  "polars-ops",
  "polars-plan",
  "polars-utils",
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index df30c71c52..6a2a980383 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -34,7 +34,6 @@ polars-arrow = { version = "0.39"}
 polars-ops = { version = "0.39"}
 polars-plan = { version = "0.39", features = ["regex"]}
 polars-utils = { version = "0.39"}
-polars-lazy = { version = "0.39"}
 typetag = "0.2"
 uuid = { version = "1.7", features = ["v4", "serde"] }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/cast.rs b/crates/nu_plugin_polars/src/dataframe/eager/cast.rs
similarity index 79%
rename from crates/nu_plugin_polars/src/dataframe/lazy/cast.rs
rename to crates/nu_plugin_polars/src/dataframe/eager/cast.rs
index 9348a9ec82..d676fb04ea 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/cast.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/cast.rs
@@ -4,6 +4,7 @@ use crate::{
     PolarsPlugin,
 };
 
+use super::super::values::NuDataFrame;
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
     record, Category, Example, LabeledError, PipelineData, ShellError, Signature, Span,
@@ -66,7 +67,7 @@ impl PluginCommand for CastDF {
             Example {
                 description: "Cast a column in a lazy dataframe to a different dtype",
                 example:
-                    "[[a b]; [1 2] [3 4]] |  polars into-df | polars cast u8 a | polars schema",
+                    "[[a b]; [1 2] [3 4]] | polars into-df | polars into-lazy | polars cast u8 a | polars schema",
                 result: Some(Value::record(
                     record! {
                         "a" => Value::string("u8", Span::test_data()),
@@ -98,7 +99,7 @@ impl PluginCommand for CastDF {
             }
             PolarsPluginObject::NuDataFrame(df) => {
                 let (dtype, column_nm) = df_args(call)?;
-                command_lazy(plugin, engine, call, column_nm, dtype, df.lazy())
+                command_eager(plugin, engine, call, column_nm, dtype, df)
             }
             PolarsPluginObject::NuExpression(expr) => {
                 let dtype: String = call.req(0)?;
@@ -143,10 +144,51 @@ fn command_lazy(
 ) -> Result<PipelineData, ShellError> {
     let column = col(&column_nm).cast(dtype);
     let lazy = lazy.to_polars().with_columns(&[column]);
-    let lazy = NuLazyFrame::new(lazy);
+    let lazy = NuLazyFrame::new(false, lazy);
     lazy.to_pipeline_data(plugin, engine, call.head)
 }
 
+fn command_eager(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    column_nm: String,
+    dtype: DataType,
+    nu_df: NuDataFrame,
+) -> Result<PipelineData, ShellError> {
+    let mut df = (*nu_df.df).clone();
+    let column = df
+        .column(&column_nm)
+        .map_err(|e| ShellError::GenericError {
+            error: format!("{e}"),
+            msg: "".into(),
+            span: Some(call.head),
+            help: None,
+            inner: vec![],
+        })?;
+
+    let casted = column.cast(&dtype).map_err(|e| ShellError::GenericError {
+        error: format!("{e}"),
+        msg: "".into(),
+        span: Some(call.head),
+        help: None,
+        inner: vec![],
+    })?;
+
+    let _ = df
+        .with_column(casted)
+        .map_err(|e| ShellError::GenericError {
+            error: format!("{e}"),
+            msg: "".into(),
+            span: Some(call.head),
+            help: None,
+            inner: vec![],
+        })?;
+
+    let df = NuDataFrame::new(false, df);
+    df.to_pipeline_data(plugin, engine, call.head)
+}
+
 #[cfg(test)]
 mod test {
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/drop.rs b/crates/nu_plugin_polars/src/dataframe/eager/drop.rs
similarity index 62%
rename from crates/nu_plugin_polars/src/dataframe/lazy/drop.rs
rename to crates/nu_plugin_polars/src/dataframe/eager/drop.rs
index 6a0bd5b58a..812a77b048 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/drop.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/drop.rs
@@ -4,7 +4,7 @@ use nu_protocol::{
     Value,
 };
 
-use crate::values::{CustomValueSupport, NuLazyFrame};
+use crate::values::CustomValueSupport;
 use crate::PolarsPlugin;
 
 use super::super::values::utils::convert_columns;
@@ -37,7 +37,7 @@ impl PluginCommand for DropDF {
     fn examples(&self) -> Vec<Example> {
         vec![Example {
             description: "drop column a",
-            example: "[[a b]; [1 2] [3 4]] | polars into-df | polars drop a | polars collect",
+            example: "[[a b]; [1 2] [3 4]] | polars into-df | polars drop a",
             result: Some(
                 NuDataFrame::try_from_columns(
                     vec![Column::new(
@@ -70,11 +70,46 @@ fn command(
     input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
     let columns: Vec<Value> = call.rest(0)?;
-    let (col_string, _col_span) = convert_columns(columns, call.head)?;
+    let (col_string, col_span) = convert_columns(columns, call.head)?;
 
-    let df = NuLazyFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
-    let polars_df = df.to_polars().drop(col_string.iter().map(|s| &s.item));
-    let final_df = NuLazyFrame::new(polars_df);
+    let df = NuDataFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
+
+    let new_df = col_string
+        .first()
+        .ok_or_else(|| ShellError::GenericError {
+            error: "Empty names list".into(),
+            msg: "No column names were found".into(),
+            span: Some(col_span),
+            help: None,
+            inner: vec![],
+        })
+        .and_then(|col| {
+            df.as_ref()
+                .drop(&col.item)
+                .map_err(|e| ShellError::GenericError {
+                    error: "Error dropping column".into(),
+                    msg: e.to_string(),
+                    span: Some(col.span),
+                    help: None,
+                    inner: vec![],
+                })
+        })?;
+
+    // If there are more columns in the drop selection list, these
+    // are added from the resulting dataframe
+    let polars_df = col_string.iter().skip(1).try_fold(new_df, |new_df, col| {
+        new_df
+            .drop(&col.item)
+            .map_err(|e| ShellError::GenericError {
+                error: "Error dropping column".into(),
+                msg: e.to_string(),
+                span: Some(col.span),
+                help: None,
+                inner: vec![],
+            })
+    })?;
+
+    let final_df = NuDataFrame::new(df.from_lazy, polars_df);
 
     final_df.to_pipeline_data(plugin, engine, call.head)
 }
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/drop_duplicates.rs b/crates/nu_plugin_polars/src/dataframe/eager/drop_duplicates.rs
similarity index 82%
rename from crates/nu_plugin_polars/src/dataframe/lazy/drop_duplicates.rs
rename to crates/nu_plugin_polars/src/dataframe/eager/drop_duplicates.rs
index f3cf569a3b..3eb6311637 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/drop_duplicates.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/drop_duplicates.rs
@@ -5,11 +5,11 @@ use nu_protocol::{
 };
 use polars::prelude::UniqueKeepStrategy;
 
-use crate::values::{CustomValueSupport, NuDataFrame};
+use crate::values::CustomValueSupport;
 use crate::PolarsPlugin;
 
 use super::super::values::utils::convert_columns_string;
-use super::super::values::{Column, NuLazyFrame};
+use super::super::values::{Column, NuDataFrame};
 
 #[derive(Clone)]
 pub struct DropDuplicates;
@@ -48,7 +48,7 @@ impl PluginCommand for DropDuplicates {
     fn examples(&self) -> Vec<Example> {
         vec![Example {
             description: "drop duplicates",
-            example: "[[a b]; [1 2] [3 4] [1 2]] | polars into-df | polars drop-duplicates | polars collect",
+            example: "[[a b]; [1 2] [3 4] [1 2]] | polars into-df | polars drop-duplicates",
             result: Some(
                 NuDataFrame::try_from_columns(
                     vec![
@@ -87,7 +87,7 @@ fn command(
     input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
     let columns: Option<Vec<Value>> = call.opt(0)?;
-    let (subset, _col_span) = match columns {
+    let (subset, col_span) = match columns {
         Some(cols) => {
             let (agg_string, col_span) = convert_columns_string(cols, call.head)?;
             (Some(agg_string), col_span)
@@ -95,7 +95,9 @@ fn command(
         None => (None, call.head),
     };
 
-    let df = NuLazyFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
+    let df = NuDataFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
+
+    let subset_slice = subset.as_ref().map(|cols| &cols[..]);
 
     let keep_strategy = if call.has_flag("last")? {
         UniqueKeepStrategy::Last
@@ -103,9 +105,18 @@ fn command(
         UniqueKeepStrategy::First
     };
 
-    let polars_df = df.to_polars().unique(subset, keep_strategy);
+    let polars_df = df
+        .as_ref()
+        .unique(subset_slice, keep_strategy, None)
+        .map_err(|e| ShellError::GenericError {
+            error: "Error dropping duplicates".into(),
+            msg: e.to_string(),
+            span: Some(col_span),
+            help: None,
+            inner: vec![],
+        })?;
 
-    let df = NuLazyFrame::new(polars_df);
+    let df = NuDataFrame::new(df.from_lazy, polars_df);
     df.to_pipeline_data(plugin, engine, call.head)
 }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/drop_nulls.rs b/crates/nu_plugin_polars/src/dataframe/eager/drop_nulls.rs
similarity index 84%
rename from crates/nu_plugin_polars/src/dataframe/lazy/drop_nulls.rs
rename to crates/nu_plugin_polars/src/dataframe/eager/drop_nulls.rs
index ba03429359..4d1b41e2fa 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/drop_nulls.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/drop_nulls.rs
@@ -4,13 +4,11 @@ use nu_protocol::{
     Value,
 };
 
-use polars_lazy::dsl::col;
-
-use crate::values::{CustomValueSupport, NuDataFrame};
+use crate::values::CustomValueSupport;
 use crate::PolarsPlugin;
 
 use super::super::values::utils::convert_columns_string;
-use super::super::values::{Column, NuLazyFrame};
+use super::super::values::{Column, NuDataFrame};
 
 #[derive(Clone)]
 pub struct DropNulls;
@@ -45,7 +43,8 @@ impl PluginCommand for DropNulls {
             Example {
                 description: "drop null values in dataframe",
                 example: r#"let df = ([[a b]; [1 2] [3 0] [1 2]] | polars into-df);
-    let a = ($df | polars with-column [((polars col b) / (polars col b) | polars as res)]);
+    let res = ($df.b / $df.b);
+    let a = ($df | polars with-column $res --name res);
     $a | polars drop-nulls"#,
                 result: Some(
                     NuDataFrame::try_from_columns(
@@ -110,20 +109,31 @@ fn command(
     call: &EvaluatedCall,
     input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
-    let df = NuLazyFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
+    let df = NuDataFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
+
     let columns: Option<Vec<Value>> = call.opt(0)?;
 
-    let (subset, _col_span) = match columns {
+    let (subset, col_span) = match columns {
         Some(cols) => {
             let (agg_string, col_span) = convert_columns_string(cols, call.head)?;
-            let agg_expr = agg_string.iter().map(|s| col(s)).collect();
-            (Some(agg_expr), col_span)
+            (Some(agg_string), col_span)
         }
         None => (None, call.head),
     };
 
-    let polars_df = df.to_polars().drop_nulls(subset);
-    let df = NuLazyFrame::new(polars_df);
+    let subset_slice = subset.as_ref().map(|cols| &cols[..]);
+
+    let polars_df = df
+        .as_ref()
+        .drop_nulls(subset_slice)
+        .map_err(|e| ShellError::GenericError {
+            error: "Error dropping nulls".into(),
+            msg: e.to_string(),
+            span: Some(col_span),
+            help: None,
+            inner: vec![],
+        })?;
+    let df = NuDataFrame::new(df.from_lazy, polars_df);
     df.to_pipeline_data(plugin, engine, call.head)
 }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/filter_with.rs b/crates/nu_plugin_polars/src/dataframe/eager/filter_with.rs
new file mode 100644
index 0000000000..b95f646edd
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/eager/filter_with.rs
@@ -0,0 +1,162 @@
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{
+    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
+    Value,
+};
+use polars::prelude::LazyFrame;
+
+use crate::{
+    dataframe::values::{NuExpression, NuLazyFrame},
+    values::{cant_convert_err, CustomValueSupport, PolarsPluginObject, PolarsPluginType},
+    PolarsPlugin,
+};
+
+use super::super::values::{Column, NuDataFrame};
+
+#[derive(Clone)]
+pub struct FilterWith;
+
+impl PluginCommand for FilterWith {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars filter-with"
+    }
+
+    fn usage(&self) -> &str {
+        "Filters dataframe using a mask or expression as reference."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .required(
+                "mask or expression",
+                SyntaxShape::Any,
+                "boolean mask used to filter data",
+            )
+            .input_output_type(
+                Type::Custom("dataframe".into()),
+                Type::Custom("dataframe".into()),
+            )
+            .category(Category::Custom("dataframe or lazyframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Filter dataframe using a bool mask",
+                example: r#"let mask = ([true false] | polars into-df);
+    [[a b]; [1 2] [3 4]] | polars into-df | polars filter-with $mask"#,
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![
+                            Column::new("a".to_string(), vec![Value::test_int(1)]),
+                            Column::new("b".to_string(), vec![Value::test_int(2)]),
+                        ],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+            Example {
+                description: "Filter dataframe using an expression",
+                example: "[[a b]; [1 2] [3 4]] | polars into-df | polars filter-with ((polars col a) > 1)",
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![
+                            Column::new("a".to_string(), vec![Value::test_int(3)]),
+                            Column::new("b".to_string(), vec![Value::test_int(4)]),
+                        ],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+        ]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        let value = input.into_value(call.head)?;
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuDataFrame(df) => command_eager(plugin, engine, call, df),
+            PolarsPluginObject::NuLazyFrame(lazy) => command_lazy(plugin, engine, call, lazy),
+            _ => Err(cant_convert_err(
+                &value,
+                &[PolarsPluginType::NuDataFrame, PolarsPluginType::NuLazyFrame],
+            )),
+        }
+        .map_err(LabeledError::from)
+    }
+}
+
+fn command_eager(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    df: NuDataFrame,
+) -> Result<PipelineData, ShellError> {
+    let mask_value: Value = call.req(0)?;
+    let mask_span = mask_value.span();
+
+    if NuExpression::can_downcast(&mask_value) {
+        let expression = NuExpression::try_from_value(plugin, &mask_value)?;
+        let lazy = df.lazy();
+        let lazy = lazy.apply_with_expr(expression, LazyFrame::filter);
+
+        lazy.to_pipeline_data(plugin, engine, call.head)
+    } else {
+        let mask = NuDataFrame::try_from_value_coerce(plugin, &mask_value, mask_span)?
+            .as_series(mask_span)?;
+        let mask = mask.bool().map_err(|e| ShellError::GenericError {
+            error: "Error casting to bool".into(),
+            msg: e.to_string(),
+            span: Some(mask_span),
+            help: Some("Perhaps you want to use a series with booleans as mask".into()),
+            inner: vec![],
+        })?;
+
+        let polars_df = df
+            .as_ref()
+            .filter(mask)
+            .map_err(|e| ShellError::GenericError {
+                error: "Error filtering dataframe".into(),
+                msg: e.to_string(),
+                span: Some(call.head),
+                help: Some("The only allowed column types for dummies are String or Int".into()),
+                inner: vec![],
+            })?;
+        let df = NuDataFrame::new(df.from_lazy, polars_df);
+        df.to_pipeline_data(plugin, engine, call.head)
+    }
+}
+
+fn command_lazy(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    lazy: NuLazyFrame,
+) -> Result<PipelineData, ShellError> {
+    let expr: Value = call.req(0)?;
+    let expr = NuExpression::try_from_value(plugin, &expr)?;
+    let lazy = lazy.apply_with_expr(expr, LazyFrame::filter);
+    lazy.to_pipeline_data(plugin, engine, call.head)
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::test::test_polars_plugin_command;
+
+    #[test]
+    fn test_examples() -> Result<(), ShellError> {
+        test_polars_plugin_command(&FilterWith)
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/first.rs b/crates/nu_plugin_polars/src/dataframe/eager/first.rs
similarity index 91%
rename from crates/nu_plugin_polars/src/dataframe/lazy/first.rs
rename to crates/nu_plugin_polars/src/dataframe/eager/first.rs
index 4692a933b0..a35ea7dd16 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/first.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/first.rs
@@ -48,7 +48,7 @@ impl PluginCommand for FirstDF {
         vec![
             Example {
                 description: "Return the first row of a dataframe",
-                example: "[[a b]; [1 2] [3 4]] | polars into-df | polars first | polars collect",
+                example: "[[a b]; [1 2] [3 4]] | polars into-df | polars first",
                 result: Some(
                     NuDataFrame::try_from_columns(
                         vec![
@@ -63,7 +63,7 @@ impl PluginCommand for FirstDF {
             },
             Example {
                 description: "Return the first two rows of a dataframe",
-                example: "[[a b]; [1 2] [3 4]] | polars into-df | polars first 2 | polars collect",
+                example: "[[a b]; [1 2] [3 4]] | polars into-df | polars first 2",
                 result: Some(
                     NuDataFrame::try_from_columns(
                         vec![
@@ -98,12 +98,13 @@ impl PluginCommand for FirstDF {
         input: PipelineData,
     ) -> Result<PipelineData, LabeledError> {
         let value = input.into_value(call.head)?;
-        if NuLazyFrame::can_downcast(&value) || NuDataFrame::can_downcast(&value) {
-            let lazy = NuLazyFrame::try_from_value_coerce(plugin, &value)?;
-            command(plugin, engine, call, lazy).map_err(LabeledError::from)
+        if NuDataFrame::can_downcast(&value) || NuLazyFrame::can_downcast(&value) {
+            let df = NuDataFrame::try_from_value_coerce(plugin, &value, call.head)?;
+            command(plugin, engine, call, df).map_err(|e| e.into())
         } else {
             let expr = NuExpression::try_from_value(plugin, &value)?;
             let expr: NuExpression = expr.into_polars().first().into();
+
             expr.to_pipeline_data(plugin, engine, call.head)
                 .map_err(LabeledError::from)
         }
@@ -114,13 +115,13 @@ fn command(
     plugin: &PolarsPlugin,
     engine: &EngineInterface,
     call: &EvaluatedCall,
-    df: NuLazyFrame,
+    df: NuDataFrame,
 ) -> Result<PipelineData, ShellError> {
     let rows: Option<usize> = call.opt(0)?;
     let rows = rows.unwrap_or(1);
 
-    let res = df.to_polars().slice(0, rows as u32);
-    let res: NuLazyFrame = res.into();
+    let res = df.as_ref().head(Some(rows));
+    let res = NuDataFrame::new(false, res);
 
     res.to_pipeline_data(plugin, engine, call.head)
 }
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/get.rs b/crates/nu_plugin_polars/src/dataframe/eager/get.rs
similarity index 77%
rename from crates/nu_plugin_polars/src/dataframe/lazy/get.rs
rename to crates/nu_plugin_polars/src/dataframe/eager/get.rs
index a56978f917..34ba98154f 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/get.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/get.rs
@@ -5,13 +5,10 @@ use nu_protocol::{
 };
 
 use crate::{
-    dataframe::values::utils::convert_columns_string,
-    values::{CustomValueSupport, NuDataFrame},
-    PolarsPlugin,
+    dataframe::values::utils::convert_columns_string, values::CustomValueSupport, PolarsPlugin,
 };
 
-use super::super::values::{Column, NuLazyFrame};
-use polars::prelude::{col, Expr};
+use super::super::values::{Column, NuDataFrame};
 
 #[derive(Clone)]
 pub struct GetDF;
@@ -40,7 +37,7 @@ impl PluginCommand for GetDF {
     fn examples(&self) -> Vec<Example> {
         vec![Example {
             description: "Returns the selected column",
-            example: "[[a b]; [1 2] [3 4]] | polars into-df | polars get a | polars collect",
+            example: "[[a b]; [1 2] [3 4]] | polars into-df | polars get a",
             result: Some(
                 NuDataFrame::try_from_columns(
                     vec![Column::new(
@@ -73,13 +70,21 @@ fn command(
     input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
     let columns: Vec<Value> = call.rest(0)?;
-    let (col_string, _col_span) = convert_columns_string(columns, call.head)?;
-    let col_expr: Vec<Expr> = col_string.iter().map(|s| col(s)).collect();
+    let (col_string, col_span) = convert_columns_string(columns, call.head)?;
 
-    let df = NuLazyFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
+    let df = NuDataFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
 
-    let df = df.to_polars().select(col_expr);
-    let df = NuLazyFrame::new(df);
+    let df = df
+        .as_ref()
+        .select(col_string)
+        .map_err(|e| ShellError::GenericError {
+            error: "Error selecting columns".into(),
+            msg: e.to_string(),
+            span: Some(col_span),
+            help: None,
+            inner: vec![],
+        })?;
+    let df = NuDataFrame::new(false, df);
     df.to_pipeline_data(plugin, engine, call.head)
 }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/last.rs b/crates/nu_plugin_polars/src/dataframe/eager/last.rs
similarity index 90%
rename from crates/nu_plugin_polars/src/dataframe/lazy/last.rs
rename to crates/nu_plugin_polars/src/dataframe/eager/last.rs
index 0453c71d1e..23b44eb473 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/last.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/last.rs
@@ -3,7 +3,7 @@ use crate::{
     PolarsPlugin,
 };
 
-use super::super::values::{NuDataFrame, NuExpression};
+use super::super::values::{utils::DEFAULT_ROWS, NuDataFrame, NuExpression};
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
     Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
@@ -44,7 +44,7 @@ impl PluginCommand for LastDF {
         vec![
             Example {
                 description: "Create new dataframe with last rows",
-                example: "[[a b]; [1 2] [3 4]] | polars into-df | polars last | polars collect",
+                example: "[[a b]; [1 2] [3 4]] | polars into-df | polars last 1",
                 result: Some(
                     NuDataFrame::try_from_columns(
                         vec![
@@ -74,7 +74,7 @@ impl PluginCommand for LastDF {
     ) -> Result<PipelineData, LabeledError> {
         let value = input.into_value(call.head)?;
         if NuDataFrame::can_downcast(&value) || NuLazyFrame::can_downcast(&value) {
-            let df = NuLazyFrame::try_from_value_coerce(plugin, &value)?;
+            let df = NuDataFrame::try_from_value_coerce(plugin, &value, call.head)?;
             command(plugin, engine, call, df).map_err(|e| e.into())
         } else {
             let expr = NuExpression::try_from_value(plugin, &value)?;
@@ -90,13 +90,13 @@ fn command(
     plugin: &PolarsPlugin,
     engine: &EngineInterface,
     call: &EvaluatedCall,
-    df: NuLazyFrame,
+    df: NuDataFrame,
 ) -> Result<PipelineData, ShellError> {
     let rows: Option<usize> = call.opt(0)?;
-    let rows = rows.unwrap_or(1);
+    let rows = rows.unwrap_or(DEFAULT_ROWS);
 
-    let res = df.to_polars().tail(rows as u32);
-    let res = NuLazyFrame::new(res);
+    let res = df.as_ref().tail(Some(rows));
+    let res = NuDataFrame::new(false, res);
     res.to_pipeline_data(plugin, engine, call.head)
 }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/melt.rs b/crates/nu_plugin_polars/src/dataframe/eager/melt.rs
similarity index 56%
rename from crates/nu_plugin_polars/src/dataframe/lazy/melt.rs
rename to crates/nu_plugin_polars/src/dataframe/eager/melt.rs
index 3f0b77e2f4..b69389ed24 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/melt.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/melt.rs
@@ -1,14 +1,11 @@
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
-    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
-    Value,
+    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Spanned,
+    SyntaxShape, Type, Value,
 };
-use polars::frame::explode::MeltArgs;
 
 use crate::{
-    dataframe::values::utils::convert_columns_string,
-    values::{CustomValueSupport, NuLazyFrame},
-    PolarsPlugin,
+    dataframe::values::utils::convert_columns_string, values::CustomValueSupport, PolarsPlugin,
 };
 
 use super::super::values::{Column, NuDataFrame};
@@ -53,11 +50,6 @@ impl PluginCommand for MeltDF {
                 "optional name for value column",
                 Some('l'),
             )
-            .switch(
-                "streamable",
-                "Use polar's streaming engine. Results will not have a stable ordering.",
-                Some('s'),
-            )
             .input_output_type(
                 Type::Custom("dataframe".into()),
                 Type::Custom("dataframe".into()),
@@ -69,7 +61,7 @@ impl PluginCommand for MeltDF {
         vec![Example {
             description: "melt dataframe",
             example:
-                "[[a b c d]; [x 1 4 a] [y 2 5 b] [z 3 6 c]] | polars into-df | polars melt -c [b c] -v [a d] | polars collect",
+                "[[a b c d]; [x 1 4 a] [y 2 5 b] [z 3 6 c]] | polars into-df | polars melt -c [b c] -v [a d]",
             result: Some(
                 NuDataFrame::try_from_columns(vec![
                     Column::new(
@@ -143,31 +135,111 @@ fn command(
     let id_col: Vec<Value> = call.get_flag("columns")?.expect("required value");
     let val_col: Vec<Value> = call.get_flag("values")?.expect("required value");
 
-    let value_name = call.get_flag("value-name")?.map(|v: String| v.into());
-    let variable_name = call.get_flag("variable-name")?.map(|v: String| v.into());
-    let streamable = call.has_flag("streamable")?;
+    let value_name: Option<Spanned<String>> = call.get_flag("value-name")?;
+    let variable_name: Option<Spanned<String>> = call.get_flag("variable-name")?;
 
-    let (id_vars, _id_col_span) = convert_columns_string(id_col, call.head)?;
-    let id_vars = id_vars.into_iter().map(Into::into).collect();
-    let (value_vars, _val_col_span) = convert_columns_string(val_col, call.head)?;
-    let value_vars = value_vars.into_iter().map(Into::into).collect();
+    let (id_col_string, id_col_span) = convert_columns_string(id_col, call.head)?;
+    let (val_col_string, val_col_span) = convert_columns_string(val_col, call.head)?;
 
-    let df = NuLazyFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
-    let polars_df = df.to_polars();
+    let df = NuDataFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
 
-    let args = MeltArgs {
-        id_vars,
-        value_vars,
-        variable_name,
-        value_name,
-        streamable,
-    };
+    check_column_datatypes(df.as_ref(), &id_col_string, id_col_span)?;
+    check_column_datatypes(df.as_ref(), &val_col_string, val_col_span)?;
 
-    let res = polars_df.melt(args);
-    let res = NuLazyFrame::new(res);
+    let mut res = df
+        .as_ref()
+        .melt(&id_col_string, &val_col_string)
+        .map_err(|e| ShellError::GenericError {
+            error: "Error calculating melt".into(),
+            msg: e.to_string(),
+            span: Some(call.head),
+            help: None,
+            inner: vec![],
+        })?;
+
+    if let Some(name) = &variable_name {
+        res.rename("variable", &name.item)
+            .map_err(|e| ShellError::GenericError {
+                error: "Error renaming column".into(),
+                msg: e.to_string(),
+                span: Some(name.span),
+                help: None,
+                inner: vec![],
+            })?;
+    }
+
+    if let Some(name) = &value_name {
+        res.rename("value", &name.item)
+            .map_err(|e| ShellError::GenericError {
+                error: "Error renaming column".into(),
+                msg: e.to_string(),
+                span: Some(name.span),
+                help: None,
+                inner: vec![],
+            })?;
+    }
+
+    let res = NuDataFrame::new(false, res);
     res.to_pipeline_data(plugin, engine, call.head)
 }
 
+fn check_column_datatypes<T: AsRef<str>>(
+    df: &polars::prelude::DataFrame,
+    cols: &[T],
+    col_span: Span,
+) -> Result<(), ShellError> {
+    if cols.is_empty() {
+        return Err(ShellError::GenericError {
+            error: "Merge error".into(),
+            msg: "empty column list".into(),
+            span: Some(col_span),
+            help: None,
+            inner: vec![],
+        });
+    }
+
+    // Checking if they are same type
+    if cols.len() > 1 {
+        for w in cols.windows(2) {
+            let l_series = df
+                .column(w[0].as_ref())
+                .map_err(|e| ShellError::GenericError {
+                    error: "Error selecting columns".into(),
+                    msg: e.to_string(),
+                    span: Some(col_span),
+                    help: None,
+                    inner: vec![],
+                })?;
+
+            let r_series = df
+                .column(w[1].as_ref())
+                .map_err(|e| ShellError::GenericError {
+                    error: "Error selecting columns".into(),
+                    msg: e.to_string(),
+                    span: Some(col_span),
+                    help: None,
+                    inner: vec![],
+                })?;
+
+            if l_series.dtype() != r_series.dtype() {
+                return Err(ShellError::GenericError {
+                    error: "Merge error".into(),
+                    msg: "found different column types in list".into(),
+                    span: Some(col_span),
+                    help: Some(format!(
+                        "datatypes {} and {} are incompatible",
+                        l_series.dtype(),
+                        r_series.dtype()
+                    )),
+                    inner: vec![],
+                });
+            }
+        }
+    }
+
+    Ok(())
+}
+
 #[cfg(test)]
 mod test {
     use crate::test::test_polars_plugin_command;
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/mod.rs b/crates/nu_plugin_polars/src/dataframe/eager/mod.rs
index 28c99f1fed..dc50ba7cd2 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/mod.rs
@@ -1,11 +1,22 @@
 mod append;
+mod cast;
 mod columns;
+mod drop;
+mod drop_duplicates;
+mod drop_nulls;
 mod dummies;
+mod filter_with;
+mod first;
+mod get;
+mod last;
+mod melt;
 mod open;
 mod query_df;
+mod rename;
 mod sample;
 mod schema;
 mod shape;
+mod slice;
 mod sql_context;
 mod sql_expr;
 mod summary;
@@ -17,18 +28,30 @@ mod to_df;
 mod to_json_lines;
 mod to_nu;
 mod to_parquet;
+mod with_column;
 
 use crate::PolarsPlugin;
 
 pub use self::open::OpenDataFrame;
 pub use append::AppendDF;
+pub use cast::CastDF;
 pub use columns::ColumnsDF;
+pub use drop::DropDF;
+pub use drop_duplicates::DropDuplicates;
+pub use drop_nulls::DropNulls;
 pub use dummies::Dummies;
+pub use filter_with::FilterWith;
+pub use first::FirstDF;
+pub use get::GetDF;
+pub use last::LastDF;
+pub use melt::MeltDF;
 use nu_plugin::PluginCommand;
 pub use query_df::QueryDf;
+pub use rename::RenameDF;
 pub use sample::SampleDF;
 pub use schema::SchemaCmd;
 pub use shape::ShapeDF;
+pub use slice::SliceDF;
 pub use sql_context::SQLContext;
 pub use summary::Summary;
 pub use take::TakeDF;
@@ -39,16 +62,28 @@ pub use to_df::ToDataFrame;
 pub use to_json_lines::ToJsonLines;
 pub use to_nu::ToNu;
 pub use to_parquet::ToParquet;
+pub use with_column::WithColumn;
 
 pub(crate) fn eager_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin>>> {
     vec![
         Box::new(AppendDF),
+        Box::new(CastDF),
         Box::new(ColumnsDF),
+        Box::new(DropDF),
+        Box::new(DropDuplicates),
+        Box::new(DropNulls),
         Box::new(Dummies),
+        Box::new(FilterWith),
+        Box::new(GetDF),
         Box::new(OpenDataFrame),
+        Box::new(MeltDF),
         Box::new(Summary),
+        Box::new(FirstDF),
+        Box::new(LastDF),
+        Box::new(RenameDF),
         Box::new(SampleDF),
         Box::new(ShapeDF),
+        Box::new(SliceDF),
         Box::new(SchemaCmd),
         Box::new(TakeDF),
         Box::new(ToNu),
@@ -59,5 +94,6 @@ pub(crate) fn eager_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugi
         Box::new(ToJsonLines),
         Box::new(ToParquet),
         Box::new(QueryDf),
+        Box::new(WithColumn),
     ]
 }
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/open.rs b/crates/nu_plugin_polars/src/dataframe/eager/open.rs
index eb343900c4..da9352b2d3 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/open.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/open.rs
@@ -4,7 +4,6 @@ use crate::{
     PolarsPlugin,
 };
 use nu_path::expand_path_with;
-use polars_lazy::frame::LazyJsonLineReader;
 
 use super::super::values::NuDataFrame;
 use nu_plugin::PluginCommand;
@@ -20,8 +19,8 @@ use std::{
 };
 
 use polars::prelude::{
-    col, Expr, JsonReader, LazyCsvReader, LazyFileListReader, LazyFrame, ScanArgsIpc,
-    ScanArgsParquet, SerReader,
+    CsvEncoding, CsvReader, IpcReader, JsonFormat, JsonReader, LazyCsvReader, LazyFileListReader,
+    LazyFrame, ParquetReader, ScanArgsIpc, ScanArgsParquet, SerReader,
 };
 
 use polars_io::{avro::AvroReader, prelude::ParallelStrategy, HiveOptions};
@@ -47,6 +46,7 @@ impl PluginCommand for OpenDataFrame {
                 SyntaxShape::Filepath,
                 "file path to load values from",
             )
+            .switch("lazy", "creates a lazy dataframe", Some('l'))
             .named(
                 "type",
                 SyntaxShape::String,
@@ -161,39 +161,63 @@ fn from_parquet(
     engine: &nu_plugin::EngineInterface,
     call: &nu_plugin::EvaluatedCall,
     file_path: &Path,
-    _file_span: Span,
+    file_span: Span,
 ) -> Result<Value, ShellError> {
-    let args = ScanArgsParquet {
-        n_rows: None,
-        cache: true,
-        parallel: ParallelStrategy::Auto,
-        rechunk: false,
-        row_index: None,
-        low_memory: false,
-        cloud_options: None,
-        use_statistics: false,
-        hive_options: HiveOptions::default(),
-    };
+    if call.has_flag("lazy")? {
+        let file: String = call.req(0)?;
+        let args = ScanArgsParquet {
+            n_rows: None,
+            cache: true,
+            parallel: ParallelStrategy::Auto,
+            rechunk: false,
+            row_index: None,
+            low_memory: false,
+            cloud_options: None,
+            use_statistics: false,
+            hive_options: HiveOptions::default(),
+        };
 
-    let maybe_columns: Option<Vec<Expr>> = call
-        .get_flag::<Vec<String>>("columns")?
-        .map(|cols| cols.iter().map(|s| col(s)).collect());
+        let df: NuLazyFrame = LazyFrame::scan_parquet(file, args)
+            .map_err(|e| ShellError::GenericError {
+                error: "Parquet reader error".into(),
+                msg: format!("{e:?}"),
+                span: Some(call.head),
+                help: None,
+                inner: vec![],
+            })?
+            .into();
 
-    let mut polars_df =
-        LazyFrame::scan_parquet(file_path, args).map_err(|e| ShellError::GenericError {
-            error: "Parquet reader error".into(),
-            msg: format!("{e:?}"),
-            span: Some(call.head),
+        df.cache_and_to_value(plugin, engine, call.head)
+    } else {
+        let columns: Option<Vec<String>> = call.get_flag("columns")?;
+
+        let r = File::open(file_path).map_err(|e| ShellError::GenericError {
+            error: "Error opening file".into(),
+            msg: e.to_string(),
+            span: Some(file_span),
             help: None,
             inner: vec![],
         })?;
+        let reader = ParquetReader::new(r);
 
-    if let Some(columns) = maybe_columns {
-        polars_df = polars_df.select(columns);
+        let reader = match columns {
+            None => reader,
+            Some(columns) => reader.with_columns(Some(columns)),
+        };
+
+        let df: NuDataFrame = reader
+            .finish()
+            .map_err(|e| ShellError::GenericError {
+                error: "Parquet reader error".into(),
+                msg: format!("{e:?}"),
+                span: Some(call.head),
+                help: None,
+                inner: vec![],
+            })?
+            .into();
+
+        df.cache_and_to_value(plugin, engine, call.head)
     }
-
-    let df: NuLazyFrame = polars_df.into();
-    df.cache_and_to_value(plugin, engine, call.head)
 }
 
 fn from_avro(
@@ -238,36 +262,60 @@ fn from_ipc(
     engine: &nu_plugin::EngineInterface,
     call: &nu_plugin::EvaluatedCall,
     file_path: &Path,
-    _file_span: Span,
+    file_span: Span,
 ) -> Result<Value, ShellError> {
-    let args = ScanArgsIpc {
-        n_rows: None,
-        cache: true,
-        rechunk: false,
-        row_index: None,
-        memory_map: true,
-        cloud_options: None,
-    };
+    if call.has_flag("lazy")? {
+        let file: String = call.req(0)?;
+        let args = ScanArgsIpc {
+            n_rows: None,
+            cache: true,
+            rechunk: false,
+            row_index: None,
+            memory_map: true,
+            cloud_options: None,
+        };
 
-    let maybe_columns: Option<Vec<Expr>> = call
-        .get_flag::<Vec<String>>("columns")?
-        .map(|cols| cols.iter().map(|s| col(s)).collect());
+        let df: NuLazyFrame = LazyFrame::scan_ipc(file, args)
+            .map_err(|e| ShellError::GenericError {
+                error: "IPC reader error".into(),
+                msg: format!("{e:?}"),
+                span: Some(call.head),
+                help: None,
+                inner: vec![],
+            })?
+            .into();
 
-    let mut polars_df =
-        LazyFrame::scan_ipc(file_path, args).map_err(|e| ShellError::GenericError {
-            error: "IPC reader error".into(),
-            msg: format!("{e:?}"),
-            span: Some(call.head),
+        df.cache_and_to_value(plugin, engine, call.head)
+    } else {
+        let columns: Option<Vec<String>> = call.get_flag("columns")?;
+
+        let r = File::open(file_path).map_err(|e| ShellError::GenericError {
+            error: "Error opening file".into(),
+            msg: e.to_string(),
+            span: Some(file_span),
             help: None,
             inner: vec![],
         })?;
+        let reader = IpcReader::new(r);
 
-    if let Some(columns) = maybe_columns {
-        polars_df = polars_df.select(columns);
+        let reader = match columns {
+            None => reader,
+            Some(columns) => reader.with_columns(Some(columns)),
+        };
+
+        let df: NuDataFrame = reader
+            .finish()
+            .map_err(|e| ShellError::GenericError {
+                error: "IPC reader error".into(),
+                msg: format!("{e:?}"),
+                span: Some(call.head),
+                help: None,
+                inner: vec![],
+            })?
+            .into();
+
+        df.cache_and_to_value(plugin, engine, call.head)
     }
-
-    let df: NuLazyFrame = polars_df.into();
-    df.cache_and_to_value(plugin, engine, call.head)
 }
 
 fn from_json(
@@ -316,21 +364,32 @@ fn from_jsonl(
     engine: &nu_plugin::EngineInterface,
     call: &nu_plugin::EvaluatedCall,
     file_path: &Path,
-    _file_span: Span,
+    file_span: Span,
 ) -> Result<Value, ShellError> {
     let infer_schema: Option<usize> = call.get_flag("infer-schema")?;
     let maybe_schema = call
         .get_flag("schema")?
         .map(|schema| NuSchema::try_from(&schema))
         .transpose()?;
+    let file = File::open(file_path).map_err(|e| ShellError::GenericError {
+        error: "Error opening file".into(),
+        msg: e.to_string(),
+        span: Some(file_span),
+        help: None,
+        inner: vec![],
+    })?;
 
-    let maybe_columns: Option<Vec<Expr>> = call
-        .get_flag::<Vec<String>>("columns")?
-        .map(|cols| cols.iter().map(|s| col(s)).collect());
+    let buf_reader = BufReader::new(file);
+    let reader = JsonReader::new(buf_reader)
+        .with_json_format(JsonFormat::JsonLines)
+        .infer_schema_len(infer_schema);
 
-    let mut polars_df = LazyJsonLineReader::new(file_path)
-        .with_infer_schema_length(infer_schema)
-        .with_schema(maybe_schema.map(|s| s.into()))
+    let reader = match maybe_schema {
+        Some(schema) => reader.with_schema(schema.into()),
+        None => reader,
+    };
+
+    let df: NuDataFrame = reader
         .finish()
         .map_err(|e| ShellError::GenericError {
             error: "Json lines reader error".into(),
@@ -338,13 +397,9 @@ fn from_jsonl(
             span: Some(call.head),
             help: None,
             inner: vec![],
-        })?;
+        })?
+        .into();
 
-    if let Some(columns) = maybe_columns {
-        polars_df = polars_df.select(columns);
-    }
-
-    let df: NuLazyFrame = polars_df.into();
     df.cache_and_to_value(plugin, engine, call.head)
 }
 
@@ -353,73 +408,137 @@ fn from_csv(
     engine: &nu_plugin::EngineInterface,
     call: &nu_plugin::EvaluatedCall,
     file_path: &Path,
-    _file_span: Span,
+    file_span: Span,
 ) -> Result<Value, ShellError> {
     let delimiter: Option<Spanned<String>> = call.get_flag("delimiter")?;
     let no_header: bool = call.has_flag("no-header")?;
     let infer_schema: Option<usize> = call.get_flag("infer-schema")?;
     let skip_rows: Option<usize> = call.get_flag("skip-rows")?;
-    let maybe_columns: Option<Vec<Expr>> = call
-        .get_flag::<Vec<String>>("columns")?
-        .map(|cols| cols.iter().map(|s| col(s)).collect());
+    let columns: Option<Vec<String>> = call.get_flag("columns")?;
 
     let maybe_schema = call
         .get_flag("schema")?
         .map(|schema| NuSchema::try_from(&schema))
         .transpose()?;
 
-    let csv_reader = LazyCsvReader::new(file_path);
+    if call.has_flag("lazy")? {
+        let csv_reader = LazyCsvReader::new(file_path);
 
-    let csv_reader = match delimiter {
-        None => csv_reader,
-        Some(d) => {
-            if d.item.len() != 1 {
-                return Err(ShellError::GenericError {
-                    error: "Incorrect delimiter".into(),
-                    msg: "Delimiter has to be one character".into(),
-                    span: Some(d.span),
-                    help: None,
-                    inner: vec![],
-                });
-            } else {
-                let delimiter = match d.item.chars().next() {
-                    Some(d) => d as u8,
-                    None => unreachable!(),
-                };
-                csv_reader.with_separator(delimiter)
+        let csv_reader = match delimiter {
+            None => csv_reader,
+            Some(d) => {
+                if d.item.len() != 1 {
+                    return Err(ShellError::GenericError {
+                        error: "Incorrect delimiter".into(),
+                        msg: "Delimiter has to be one character".into(),
+                        span: Some(d.span),
+                        help: None,
+                        inner: vec![],
+                    });
+                } else {
+                    let delimiter = match d.item.chars().next() {
+                        Some(d) => d as u8,
+                        None => unreachable!(),
+                    };
+                    csv_reader.with_separator(delimiter)
+                }
             }
-        }
-    };
+        };
 
-    let csv_reader = csv_reader.has_header(!no_header);
+        let csv_reader = csv_reader.has_header(!no_header);
 
-    let csv_reader = match maybe_schema {
-        Some(schema) => csv_reader.with_schema(Some(schema.into())),
-        None => csv_reader,
-    };
+        let csv_reader = match maybe_schema {
+            Some(schema) => csv_reader.with_schema(Some(schema.into())),
+            None => csv_reader,
+        };
 
-    let csv_reader = match infer_schema {
-        None => csv_reader,
-        Some(r) => csv_reader.with_infer_schema_length(Some(r)),
-    };
+        let csv_reader = match infer_schema {
+            None => csv_reader,
+            Some(r) => csv_reader.with_infer_schema_length(Some(r)),
+        };
 
-    let csv_reader = match skip_rows {
-        None => csv_reader,
-        Some(r) => csv_reader.with_skip_rows(r),
-    };
+        let csv_reader = match skip_rows {
+            None => csv_reader,
+            Some(r) => csv_reader.with_skip_rows(r),
+        };
 
-    let mut polars_df = csv_reader.finish().map_err(|e| ShellError::GenericError {
-        error: "CSV reader error".into(),
-        msg: format!("{e:?}"),
-        span: Some(call.head),
-        help: None,
-        inner: vec![],
-    })?;
+        let df: NuLazyFrame = csv_reader
+            .finish()
+            .map_err(|e| ShellError::GenericError {
+                error: "Parquet reader error".into(),
+                msg: format!("{e:?}"),
+                span: Some(call.head),
+                help: None,
+                inner: vec![],
+            })?
+            .into();
 
-    if let Some(columns) = maybe_columns {
-        polars_df = polars_df.select(columns);
+        df.cache_and_to_value(plugin, engine, call.head)
+    } else {
+        let csv_reader = CsvReader::from_path(file_path)
+            .map_err(|e| ShellError::GenericError {
+                error: "Error creating CSV reader".into(),
+                msg: e.to_string(),
+                span: Some(file_span),
+                help: None,
+                inner: vec![],
+            })?
+            .with_encoding(CsvEncoding::LossyUtf8);
+
+        let csv_reader = match delimiter {
+            None => csv_reader,
+            Some(d) => {
+                if d.item.len() != 1 {
+                    return Err(ShellError::GenericError {
+                        error: "Incorrect delimiter".into(),
+                        msg: "Delimiter has to be one character".into(),
+                        span: Some(d.span),
+                        help: None,
+                        inner: vec![],
+                    });
+                } else {
+                    let delimiter = match d.item.chars().next() {
+                        Some(d) => d as u8,
+                        None => unreachable!(),
+                    };
+                    csv_reader.with_separator(delimiter)
+                }
+            }
+        };
+
+        let csv_reader = csv_reader.has_header(!no_header);
+
+        let csv_reader = match maybe_schema {
+            Some(schema) => csv_reader.with_schema(Some(schema.into())),
+            None => csv_reader,
+        };
+
+        let csv_reader = match infer_schema {
+            None => csv_reader,
+            Some(r) => csv_reader.infer_schema(Some(r)),
+        };
+
+        let csv_reader = match skip_rows {
+            None => csv_reader,
+            Some(r) => csv_reader.with_skip_rows(r),
+        };
+
+        let csv_reader = match columns {
+            None => csv_reader,
+            Some(columns) => csv_reader.with_columns(Some(columns)),
+        };
+
+        let df: NuDataFrame = csv_reader
+            .finish()
+            .map_err(|e| ShellError::GenericError {
+                error: "Parquet reader error".into(),
+                msg: format!("{e:?}"),
+                span: Some(call.head),
+                help: None,
+                inner: vec![],
+            })?
+            .into();
+
+        df.cache_and_to_value(plugin, engine, call.head)
     }
-
-    let df: NuLazyFrame = polars_df.into();
-    df.cache_and_to_value(plugin, engine, call.head)
 }
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/query_df.rs b/crates/nu_plugin_polars/src/dataframe/eager/query_df.rs
index aacfe5e3df..a09da57250 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/query_df.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/query_df.rs
@@ -91,7 +91,7 @@ fn command(
             help: None,
             inner: vec![],
         })?;
-    let lazy = NuLazyFrame::new(df_sql);
+    let lazy = NuLazyFrame::new(!df.from_lazy, df_sql);
     lazy.to_pipeline_data(plugin, engine, call.head)
 }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/rename.rs b/crates/nu_plugin_polars/src/dataframe/eager/rename.rs
similarity index 77%
rename from crates/nu_plugin_polars/src/dataframe/lazy/rename.rs
rename to crates/nu_plugin_polars/src/dataframe/eager/rename.rs
index c32b8d9451..724cf1f983 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/rename.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/rename.rs
@@ -6,7 +6,7 @@ use nu_protocol::{
 
 use crate::{
     dataframe::{utils::extract_strings, values::NuLazyFrame},
-    values::CustomValueSupport,
+    values::{CustomValueSupport, PolarsPluginObject},
     PolarsPlugin,
 };
 
@@ -49,7 +49,7 @@ impl PluginCommand for RenameDF {
         vec![
             Example {
                 description: "Renames a series",
-                example: "[5 6 7 8] | polars into-df | polars rename '0' new_name | polars collect",
+                example: "[5 6 7 8] | polars into-df | polars rename '0' new_name",
                 result: Some(
                     NuDataFrame::try_from_columns(
                         vec![Column::new(
@@ -69,7 +69,7 @@ impl PluginCommand for RenameDF {
             },
             Example {
                 description: "Renames a dataframe column",
-                example: "[[a b]; [1 2] [3 4]] | polars into-df | polars rename a a_new | polars collect",
+                example: "[[a b]; [1 2] [3 4]] | polars into-df | polars rename a a_new",
                 result: Some(
                     NuDataFrame::try_from_columns(
                         vec![
@@ -91,7 +91,7 @@ impl PluginCommand for RenameDF {
             Example {
                 description: "Renames two dataframe columns",
                 example:
-                    "[[a b]; [1 2] [3 4]] | polars into-df | polars rename [a b] [a_new b_new] | polars collect",
+                    "[[a b]; [1 2] [3 4]] | polars into-df | polars rename [a b] [a_new b_new]",
                 result: Some(
                     NuDataFrame::try_from_columns(
                         vec![
@@ -121,11 +121,49 @@ impl PluginCommand for RenameDF {
         input: PipelineData,
     ) -> Result<PipelineData, LabeledError> {
         let value = input.into_value(call.head)?;
-        let lazy = NuLazyFrame::try_from_value_coerce(plugin, &value)?;
-        command_lazy(plugin, engine, call, lazy).map_err(LabeledError::from)
+        match PolarsPluginObject::try_from_value(plugin, &value).map_err(LabeledError::from)? {
+            PolarsPluginObject::NuDataFrame(df) => {
+                command_eager(plugin, engine, call, df).map_err(LabeledError::from)
+            }
+            PolarsPluginObject::NuLazyFrame(lazy) => {
+                command_lazy(plugin, engine, call, lazy).map_err(LabeledError::from)
+            }
+            _ => Err(LabeledError::new(format!("Unsupported type: {value:?}"))
+                .with_label("Unsupported Type", call.head)),
+        }
     }
 }
 
+fn command_eager(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    df: NuDataFrame,
+) -> Result<PipelineData, ShellError> {
+    let columns: Value = call.req(0)?;
+    let columns = extract_strings(columns)?;
+
+    let new_names: Value = call.req(1)?;
+    let new_names = extract_strings(new_names)?;
+
+    let mut polars_df = df.to_polars();
+
+    for (from, to) in columns.iter().zip(new_names.iter()) {
+        polars_df
+            .rename(from, to)
+            .map_err(|e| ShellError::GenericError {
+                error: "Error renaming".into(),
+                msg: e.to_string(),
+                span: Some(call.head),
+                help: None,
+                inner: vec![],
+            })?;
+    }
+
+    let df = NuDataFrame::new(false, polars_df);
+    df.to_pipeline_data(plugin, engine, call.head)
+}
+
 fn command_lazy(
     plugin: &PolarsPlugin,
     engine: &EngineInterface,
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/sample.rs b/crates/nu_plugin_polars/src/dataframe/eager/sample.rs
index 64f7608c5c..59f9ad6eee 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/sample.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/sample.rs
@@ -147,7 +147,7 @@ fn command(
             inner: vec![],
         }),
     };
-    let df = NuDataFrame::new(df?);
+    let df = NuDataFrame::new(false, df?);
     df.to_pipeline_data(plugin, engine, call.head)
 }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/slice.rs b/crates/nu_plugin_polars/src/dataframe/eager/slice.rs
similarity index 87%
rename from crates/nu_plugin_polars/src/dataframe/lazy/slice.rs
rename to crates/nu_plugin_polars/src/dataframe/eager/slice.rs
index 664339d242..c7ebaff4d7 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/slice.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/slice.rs
@@ -4,11 +4,7 @@ use nu_protocol::{
     Value,
 };
 
-use crate::{
-    dataframe::values::Column,
-    values::{CustomValueSupport, NuLazyFrame},
-    PolarsPlugin,
-};
+use crate::{dataframe::values::Column, values::CustomValueSupport, PolarsPlugin};
 
 use super::super::values::NuDataFrame;
 
@@ -40,7 +36,7 @@ impl PluginCommand for SliceDF {
     fn examples(&self) -> Vec<Example> {
         vec![Example {
             description: "Create new dataframe from a slice of the rows",
-            example: "[[a b]; [1 2] [3 4]] | polars into-df | polars slice 0 1 | polars collect",
+            example: "[[a b]; [1 2] [3 4]] | polars into-df | polars slice 0 1",
             result: Some(
                 NuDataFrame::try_from_columns(
                     vec![
@@ -73,12 +69,12 @@ fn command(
     input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
     let offset: i64 = call.req(0)?;
-    let size: i64 = call.req(1)?;
+    let size: usize = call.req(1)?;
 
-    let df = NuLazyFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
+    let df = NuDataFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
 
-    let res = df.to_polars().slice(offset, size as u32);
-    let res = NuLazyFrame::new(res);
+    let res = df.as_ref().slice(offset, size);
+    let res = NuDataFrame::new(false, res);
 
     res.to_pipeline_data(plugin, engine, call.head)
 }
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/summary.rs b/crates/nu_plugin_polars/src/dataframe/eager/summary.rs
index 2b22d73bfb..5e377210b9 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/summary.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/summary.rs
@@ -272,7 +272,7 @@ fn command(
         inner: vec![],
     })?;
 
-    let df = NuDataFrame::new(polars_df);
+    let df = NuDataFrame::new(df.from_lazy, polars_df);
 
     df.to_pipeline_data(plugin, engine, call.head)
 }
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/take.rs b/crates/nu_plugin_polars/src/dataframe/eager/take.rs
index 6cbcd519e0..28b22095a1 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/take.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/take.rs
@@ -143,7 +143,7 @@ fn command(
             inner: vec![],
         })?;
 
-    let df = NuDataFrame::new(polars_df);
+    let df = NuDataFrame::new(df.from_lazy, polars_df);
     df.to_pipeline_data(plugin, engine, call.head)
 }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/with_column.rs b/crates/nu_plugin_polars/src/dataframe/eager/with_column.rs
new file mode 100644
index 0000000000..5db11766b9
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/eager/with_column.rs
@@ -0,0 +1,196 @@
+use super::super::values::{Column, NuDataFrame};
+use crate::{
+    dataframe::values::{NuExpression, NuLazyFrame},
+    values::{CustomValueSupport, PolarsPluginObject},
+    PolarsPlugin,
+};
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{
+    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
+    Value,
+};
+
+#[derive(Clone)]
+pub struct WithColumn;
+
+impl PluginCommand for WithColumn {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars with-column"
+    }
+
+    fn usage(&self) -> &str {
+        "Adds a series to the dataframe."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .named("name", SyntaxShape::String, "new column name", Some('n'))
+            .rest(
+                "series or expressions",
+                SyntaxShape::Any,
+                "series to be added or expressions used to define the new columns",
+            )
+            .input_output_type(
+                Type::Custom("dataframe".into()),
+                Type::Custom("dataframe".into()),
+            )
+            .category(Category::Custom("dataframe or lazyframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Adds a series to the dataframe",
+                example: r#"[[a b]; [1 2] [3 4]]
+    | polars into-df
+    | polars with-column ([5 6] | polars into-df) --name c"#,
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![
+                            Column::new(
+                                "a".to_string(),
+                                vec![Value::test_int(1), Value::test_int(3)],
+                            ),
+                            Column::new(
+                                "b".to_string(),
+                                vec![Value::test_int(2), Value::test_int(4)],
+                            ),
+                            Column::new(
+                                "c".to_string(),
+                                vec![Value::test_int(5), Value::test_int(6)],
+                            ),
+                        ],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+            Example {
+                description: "Adds a series to the dataframe",
+                example: r#"[[a b]; [1 2] [3 4]]
+    | polars into-lazy
+    | polars with-column [
+        ((polars col a) * 2 | polars as "c")
+        ((polars col a) * 3 | polars as "d")
+      ]
+    | polars collect"#,
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![
+                            Column::new(
+                                "a".to_string(),
+                                vec![Value::test_int(1), Value::test_int(3)],
+                            ),
+                            Column::new(
+                                "b".to_string(),
+                                vec![Value::test_int(2), Value::test_int(4)],
+                            ),
+                            Column::new(
+                                "c".to_string(),
+                                vec![Value::test_int(2), Value::test_int(6)],
+                            ),
+                            Column::new(
+                                "d".to_string(),
+                                vec![Value::test_int(3), Value::test_int(9)],
+                            ),
+                        ],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+        ]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        let value = input.into_value(call.head)?;
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuDataFrame(df) => command_eager(plugin, engine, call, df),
+            PolarsPluginObject::NuLazyFrame(lazy) => command_lazy(plugin, engine, call, lazy),
+            _ => Err(ShellError::CantConvert {
+                to_type: "lazy or eager dataframe".into(),
+                from_type: value.get_type().to_string(),
+                span: value.span(),
+                help: None,
+            }),
+        }
+        .map_err(LabeledError::from)
+    }
+}
+
+fn command_eager(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    df: NuDataFrame,
+) -> Result<PipelineData, ShellError> {
+    let new_column: Value = call.req(0)?;
+    let column_span = new_column.span();
+
+    if NuExpression::can_downcast(&new_column) {
+        let vals: Vec<Value> = call.rest(0)?;
+        let value = Value::list(vals, call.head);
+        let expressions = NuExpression::extract_exprs(plugin, value)?;
+        let lazy = NuLazyFrame::new(true, df.lazy().to_polars().with_columns(&expressions));
+        let df = lazy.collect(call.head)?;
+        df.to_pipeline_data(plugin, engine, call.head)
+    } else {
+        let mut other = NuDataFrame::try_from_value_coerce(plugin, &new_column, call.head)?
+            .as_series(column_span)?;
+
+        let name = match call.get_flag::<String>("name")? {
+            Some(name) => name,
+            None => other.name().to_string(),
+        };
+
+        let series = other.rename(&name).clone();
+
+        let mut polars_df = df.to_polars();
+        polars_df
+            .with_column(series)
+            .map_err(|e| ShellError::GenericError {
+                error: "Error adding column to dataframe".into(),
+                msg: e.to_string(),
+                span: Some(column_span),
+                help: None,
+                inner: vec![],
+            })?;
+
+        let df = NuDataFrame::new(df.from_lazy, polars_df);
+        df.to_pipeline_data(plugin, engine, call.head)
+    }
+}
+
+fn command_lazy(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    lazy: NuLazyFrame,
+) -> Result<PipelineData, ShellError> {
+    let vals: Vec<Value> = call.rest(0)?;
+    let value = Value::list(vals, call.head);
+    let expressions = NuExpression::extract_exprs(plugin, value)?;
+    let lazy: NuLazyFrame = lazy.to_polars().with_columns(&expressions).into();
+    lazy.to_pipeline_data(plugin, engine, call.head)
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::test::test_polars_plugin_command;
+
+    #[test]
+    fn test_examples() -> Result<(), ShellError> {
+        test_polars_plugin_command(&WithColumn)
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/expressions/expressions_macro.rs b/crates/nu_plugin_polars/src/dataframe/expressions/expressions_macro.rs
index feb559aba5..5b1f9f1a73 100644
--- a/crates/nu_plugin_polars/src/dataframe/expressions/expressions_macro.rs
+++ b/crates/nu_plugin_polars/src/dataframe/expressions/expressions_macro.rs
@@ -164,6 +164,7 @@ macro_rules! lazy_expr_command {
                     let lazy = NuLazyFrame::try_from_value_coerce(plugin, &value)
                         .map_err(LabeledError::from)?;
                     let lazy = NuLazyFrame::new(
+                        lazy.from_eager,
                         lazy.to_polars()
                             .$func()
                             .map_err(|e| ShellError::GenericError {
@@ -244,6 +245,7 @@ macro_rules! lazy_expr_command {
                     let lazy = NuLazyFrame::try_from_value_coerce(plugin, &value)
                         .map_err(LabeledError::from)?;
                     let lazy = NuLazyFrame::new(
+                        lazy.from_eager,
                         lazy.to_polars()
                             .$func($ddof)
                             .map_err(|e| ShellError::GenericError {
diff --git a/crates/nu_plugin_polars/src/dataframe/expressions/is_in.rs b/crates/nu_plugin_polars/src/dataframe/expressions/is_in.rs
index 47be15e2f3..136ac5c1e6 100644
--- a/crates/nu_plugin_polars/src/dataframe/expressions/is_in.rs
+++ b/crates/nu_plugin_polars/src/dataframe/expressions/is_in.rs
@@ -180,7 +180,8 @@ fn command_df(
 
     res.rename("is_in");
 
-    let new_df = NuDataFrame::try_from_series_vec(vec![res.into_series()], call.head)?;
+    let mut new_df = NuDataFrame::try_from_series_vec(vec![res.into_series()], call.head)?;
+    new_df.from_lazy = df.from_lazy;
     new_df.to_pipeline_data(plugin, engine, call.head)
 }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/expressions/otherwise.rs b/crates/nu_plugin_polars/src/dataframe/expressions/otherwise.rs
index 0e84d8fe96..73e616f8f8 100644
--- a/crates/nu_plugin_polars/src/dataframe/expressions/otherwise.rs
+++ b/crates/nu_plugin_polars/src/dataframe/expressions/otherwise.rs
@@ -48,7 +48,7 @@ impl PluginCommand for ExprOtherwise {
             Example {
                 description: "Create a new column for the dataframe",
                 example: r#"[[a b]; [6 2] [1 4] [4 1]]
-   | polars into-df
+   | polars into-lazy
    | polars with-column (
     polars when ((polars col a) > 2) 4 | polars otherwise 5 | polars as c
      )
diff --git a/crates/nu_plugin_polars/src/dataframe/expressions/when.rs b/crates/nu_plugin_polars/src/dataframe/expressions/when.rs
index 3c1b0eb481..9ed9ffddac 100644
--- a/crates/nu_plugin_polars/src/dataframe/expressions/when.rs
+++ b/crates/nu_plugin_polars/src/dataframe/expressions/when.rs
@@ -57,7 +57,7 @@ impl PluginCommand for ExprWhen {
             Example {
                 description: "Create a new column for the dataframe",
                 example: r#"[[a b]; [6 2] [1 4] [4 1]]
-   | polars into-df
+   | polars into-lazy
    | polars with-column (
     polars when ((polars col a) > 2) 4 | polars otherwise 5 | polars as c
      )
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/aggregate.rs b/crates/nu_plugin_polars/src/dataframe/lazy/aggregate.rs
index d5b824ed9a..8fa717954f 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/aggregate.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/aggregate.rs
@@ -80,7 +80,7 @@ impl PluginCommand for LazyAggregate {
             Example {
                 description: "Group by and perform an aggregation",
                 example: r#"[[a b]; [1 2] [1 4] [2 6] [2 4]]
-    | polars into-df
+    | polars into-lazy
     | polars group-by a
     | polars agg [
         (polars col b | polars min | polars as "b_min")
@@ -147,7 +147,7 @@ impl PluginCommand for LazyAggregate {
         }
 
         let polars = group_by.to_polars();
-        let lazy = NuLazyFrame::new(polars.agg(&expressions));
+        let lazy = NuLazyFrame::new(false, polars.agg(&expressions));
         lazy.to_pipeline_data(plugin, engine, call.head)
             .map_err(LabeledError::from)
     }
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/collect.rs b/crates/nu_plugin_polars/src/dataframe/lazy/collect.rs
index b6d8909e31..91adc4f713 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/collect.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/collect.rs
@@ -32,8 +32,8 @@ impl PluginCommand for LazyCollect {
 
     fn examples(&self) -> Vec<Example> {
         vec![Example {
-            description: "collect a lazy dataframe",
-            example: "[[a b]; [1 2] [3 4]] | polars into-df | polars select [(polars col a) (polars col b)] | polars collect",
+            description: "drop duplicates",
+            example: "[[a b]; [1 2] [3 4]] | polars into-lazy | polars collect",
             result: Some(
                 NuDataFrame::try_from_columns(
                     vec![
@@ -64,7 +64,9 @@ impl PluginCommand for LazyCollect {
         let value = input.into_value(call.head)?;
         match PolarsPluginObject::try_from_value(plugin, &value)? {
             PolarsPluginObject::NuLazyFrame(lazy) => {
-                let eager = lazy.collect(call.head)?;
+                let mut eager = lazy.collect(call.head)?;
+                // We don't want this converted back to a lazy frame
+                eager.from_lazy = true;
                 Ok(PipelineData::Value(
                     eager
                         .cache(plugin, engine, call.head)?
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/fetch.rs b/crates/nu_plugin_polars/src/dataframe/lazy/fetch.rs
index 8fee4cd159..eb9663265b 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/fetch.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/fetch.rs
@@ -70,7 +70,7 @@ impl PluginCommand for LazyFetch {
         let value = input.into_value(call.head)?;
         let lazy = NuLazyFrame::try_from_value_coerce(plugin, &value)?;
 
-        let eager: NuDataFrame = lazy
+        let mut eager: NuDataFrame = lazy
             .to_polars()
             .fetch(rows as usize)
             .map_err(|e| ShellError::GenericError {
@@ -82,6 +82,8 @@ impl PluginCommand for LazyFetch {
             })?
             .into();
 
+        // mark this as not from lazy so it doesn't get converted back to a lazy frame
+        eager.from_lazy = false;
         eager
             .to_pipeline_data(plugin, engine, call.head)
             .map_err(LabeledError::from)
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/fill_null.rs b/crates/nu_plugin_polars/src/dataframe/lazy/fill_null.rs
index c5fb67cd8a..6f4f13b08e 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/fill_null.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/fill_null.rs
@@ -40,7 +40,7 @@ impl PluginCommand for LazyFillNull {
     fn examples(&self) -> Vec<Example> {
         vec![Example {
             description: "Fills the null values by 0",
-            example: "[1 2 2 3 3] | polars into-df | polars shift 2 | polars fill-null 0 | polars collect",
+            example: "[1 2 2 3 3] | polars into-df | polars shift 2 | polars fill-null 0",
             result: Some(
                 NuDataFrame::try_from_columns(
                     vec![Column::new(
@@ -96,7 +96,7 @@ fn cmd_lazy(
     fill: Value,
 ) -> Result<PipelineData, ShellError> {
     let expr = NuExpression::try_from_value(plugin, &fill)?.into_polars();
-    let lazy = NuLazyFrame::new(lazy.to_polars().fill_null(expr));
+    let lazy = NuLazyFrame::new(lazy.from_eager, lazy.to_polars().fill_null(expr));
     lazy.to_pipeline_data(plugin, engine, call.head)
 }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/filter.rs b/crates/nu_plugin_polars/src/dataframe/lazy/filter.rs
index f8d400ddf4..e7e30fd57d 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/filter.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/filter.rs
@@ -42,7 +42,7 @@ impl PluginCommand for LazyFilter {
         vec![Example {
             description: "Filter dataframe using an expression",
             example:
-                "[[a b]; [6 2] [4 2] [2 2]] | polars into-df | polars filter ((polars col a) >= 4) | polars collect",
+                "[[a b]; [6 2] [4 2] [2 2]] | polars into-df | polars filter ((polars col a) >= 4)",
             result: Some(
                 NuDataFrame::try_from_columns(
                     vec![
@@ -85,7 +85,10 @@ fn command(
     lazy: NuLazyFrame,
     filter_expr: NuExpression,
 ) -> Result<PipelineData, ShellError> {
-    let lazy = NuLazyFrame::new(lazy.to_polars().filter(filter_expr.into_polars()));
+    let lazy = NuLazyFrame::new(
+        lazy.from_eager,
+        lazy.to_polars().filter(filter_expr.into_polars()),
+    );
     lazy.to_pipeline_data(plugin, engine, call.head)
 }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/filter_with.rs b/crates/nu_plugin_polars/src/dataframe/lazy/filter_with.rs
deleted file mode 100644
index 12ccfbc376..0000000000
--- a/crates/nu_plugin_polars/src/dataframe/lazy/filter_with.rs
+++ /dev/null
@@ -1,97 +0,0 @@
-use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
-use nu_protocol::{
-    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
-    Value,
-};
-use polars::prelude::LazyFrame;
-
-use crate::{
-    dataframe::values::{NuExpression, NuLazyFrame},
-    values::CustomValueSupport,
-    PolarsPlugin,
-};
-
-use super::super::values::{Column, NuDataFrame};
-
-#[derive(Clone)]
-pub struct FilterWith;
-
-impl PluginCommand for FilterWith {
-    type Plugin = PolarsPlugin;
-
-    fn name(&self) -> &str {
-        "polars filter-with"
-    }
-
-    fn usage(&self) -> &str {
-        "Filters dataframe using an expression."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required(
-                "filter expression",
-                SyntaxShape::Any,
-                "filter expression used to filter dataframe",
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe or lazyframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Filter dataframe using an expression",
-            example:
-                "[[a b]; [1 2] [3 4]] | polars into-df | polars filter-with ((polars col a) > 1)",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new("a".to_string(), vec![Value::test_int(3)]),
-                        Column::new("b".to_string(), vec![Value::test_int(4)]),
-                    ],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        plugin: &Self::Plugin,
-        engine: &EngineInterface,
-        call: &EvaluatedCall,
-        input: PipelineData,
-    ) -> Result<PipelineData, LabeledError> {
-        let value = input.into_value(call.head)?;
-        let lazy = NuLazyFrame::try_from_value_coerce(plugin, &value)?;
-        command_lazy(plugin, engine, call, lazy).map_err(LabeledError::from)
-    }
-}
-
-fn command_lazy(
-    plugin: &PolarsPlugin,
-    engine: &EngineInterface,
-    call: &EvaluatedCall,
-    lazy: NuLazyFrame,
-) -> Result<PipelineData, ShellError> {
-    let expr: Value = call.req(0)?;
-    let expr = NuExpression::try_from_value(plugin, &expr)?;
-    let lazy = lazy.apply_with_expr(expr, LazyFrame::filter);
-    lazy.to_pipeline_data(plugin, engine, call.head)
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use crate::test::test_polars_plugin_command;
-
-    #[test]
-    fn test_examples() -> Result<(), ShellError> {
-        test_polars_plugin_command(&FilterWith)
-    }
-}
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/groupby.rs b/crates/nu_plugin_polars/src/dataframe/lazy/groupby.rs
index 7aaccfead9..9edf8f5e60 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/groupby.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/groupby.rs
@@ -79,7 +79,7 @@ impl PluginCommand for ToLazyGroupBy {
             Example {
                 description: "Group by and perform an aggregation",
                 example: r#"[[a b]; [1 2] [1 4] [2 6] [2 4]]
-    | polars into-df
+    | polars into-lazy
     | polars group-by a
     | polars agg [
         (polars col b | polars min | polars as "b_min")
@@ -152,7 +152,7 @@ fn command(
     expressions: Vec<Expr>,
 ) -> Result<PipelineData, ShellError> {
     let group_by = lazy.to_polars().group_by(expressions);
-    let group_by = NuLazyGroupBy::new(group_by, lazy.schema()?);
+    let group_by = NuLazyGroupBy::new(group_by, lazy.from_eager, lazy.schema()?);
     group_by.to_pipeline_data(plugin, engine, call.head)
 }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/join.rs b/crates/nu_plugin_polars/src/dataframe/lazy/join.rs
index 6db0269403..d6d2ef69ba 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/join.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/join.rs
@@ -54,8 +54,8 @@ impl PluginCommand for LazyJoin {
         vec![
             Example {
                 description: "Join two lazy dataframes",
-                example: r#"let df_a = ([[a b c];[1 "a" 0] [2 "b" 1] [1 "c" 2] [1 "c" 3]] | polars into-df);
-    let df_b = ([["foo" "bar" "ham"];[1 "a" "let"] [2 "c" "var"] [3 "c" "const"]] | polars into-df);
+                example: r#"let df_a = ([[a b c];[1 "a" 0] [2 "b" 1] [1 "c" 2] [1 "c" 3]] | polars into-lazy);
+    let df_b = ([["foo" "bar" "ham"];[1 "a" "let"] [2 "c" "var"] [3 "c" "const"]] | polars into-lazy);
     $df_a | polars join $df_b a foo | polars collect"#,
                 result: Some(
                     NuDataFrame::try_from_columns(
@@ -115,7 +115,7 @@ impl PluginCommand for LazyJoin {
             Example {
                 description: "Join one eager dataframe with a lazy dataframe",
                 example: r#"let df_a = ([[a b c];[1 "a" 0] [2 "b" 1] [1 "c" 2] [1 "c" 3]] | polars into-df);
-    let df_b = ([["foo" "bar" "ham"];[1 "a" "let"] [2 "c" "var"] [3 "c" "const"]] | polars into-df);
+    let df_b = ([["foo" "bar" "ham"];[1 "a" "let"] [2 "c" "var"] [3 "c" "const"]] | polars into-lazy);
     $df_a | polars join $df_b a foo"#,
                 result: Some(
                     NuDataFrame::try_from_columns(
@@ -230,6 +230,7 @@ impl PluginCommand for LazyJoin {
 
         let value = input.into_value(call.head)?;
         let lazy = NuLazyFrame::try_from_value_coerce(plugin, &value)?;
+        let from_eager = lazy.from_eager;
         let lazy = lazy.to_polars();
 
         let lazy = lazy
@@ -242,7 +243,7 @@ impl PluginCommand for LazyJoin {
             .suffix(suffix)
             .finish();
 
-        let lazy = NuLazyFrame::new(lazy);
+        let lazy = NuLazyFrame::new(from_eager, lazy);
         lazy.to_pipeline_data(plugin, engine, call.head)
             .map_err(LabeledError::from)
     }
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/macro_commands.rs b/crates/nu_plugin_polars/src/dataframe/lazy/macro_commands.rs
index 447c806ea3..1727946f6a 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/macro_commands.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/macro_commands.rs
@@ -46,7 +46,7 @@ macro_rules! lazy_command {
             ) -> Result<PipelineData, LabeledError> {
                 let lazy = NuLazyFrame::try_from_pipeline_coerce(plugin, input, call.head)
                     .map_err(LabeledError::from)?;
-                let lazy = NuLazyFrame::new(lazy.to_polars().$func());
+                let lazy = NuLazyFrame::new(lazy.from_eager, lazy.to_polars().$func());
                 lazy.to_pipeline_data(plugin, engine, call.head)
                     .map_err(LabeledError::from)
             }
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/median.rs b/crates/nu_plugin_polars/src/dataframe/lazy/median.rs
index ffd69d14e4..6e42856723 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/median.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/median.rs
@@ -126,7 +126,7 @@ fn command(
             span: None,
             inner: vec![],
         })?;
-    let lazy = NuLazyFrame::new(polars_lazy);
+    let lazy = NuLazyFrame::new(lazy.from_eager, polars_lazy);
     lazy.to_pipeline_data(plugin, engine, call.head)
 }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/mod.rs b/crates/nu_plugin_polars/src/dataframe/lazy/mod.rs
index 1048fcc4c0..e70143e6ce 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/mod.rs
@@ -1,30 +1,19 @@
 mod aggregate;
-mod cast;
 mod collect;
-mod drop;
-mod drop_duplicates;
-mod drop_nulls;
 mod explode;
 mod fetch;
 mod fill_nan;
 mod fill_null;
 mod filter;
-mod filter_with;
-mod first;
 mod flatten;
-mod get;
 pub mod groupby;
 mod join;
-mod last;
 mod macro_commands;
 mod median;
-mod melt;
 mod quantile;
-mod rename;
 mod select;
-mod slice;
 mod sort_by_expr;
-mod with_column;
+mod to_lazy;
 
 use nu_plugin::PluginCommand;
 
@@ -40,20 +29,13 @@ pub(crate) use crate::dataframe::lazy::macro_commands::*;
 use crate::dataframe::lazy::quantile::LazyQuantile;
 pub(crate) use crate::dataframe::lazy::select::LazySelect;
 use crate::dataframe::lazy::sort_by_expr::LazySortBy;
+pub use crate::dataframe::lazy::to_lazy::ToLazyFrame;
 use crate::PolarsPlugin;
 pub use explode::LazyExplode;
 pub use flatten::LazyFlatten;
 
 pub(crate) fn lazy_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin>>> {
     vec![
-        Box::new(cast::CastDF),
-        Box::new(drop::DropDF),
-        Box::new(drop_duplicates::DropDuplicates),
-        Box::new(drop_nulls::DropNulls),
-        Box::new(filter_with::FilterWith),
-        Box::new(first::FirstDF),
-        Box::new(get::GetDF),
-        Box::new(last::LastDF),
         Box::new(LazyAggregate),
         Box::new(LazyCache),
         Box::new(LazyCollect),
@@ -65,14 +47,11 @@ pub(crate) fn lazy_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin
         Box::new(LazyFlatten),
         Box::new(LazyJoin),
         Box::new(median::LazyMedian),
-        Box::new(melt::MeltDF),
         Box::new(LazyReverse),
         Box::new(LazySelect),
         Box::new(LazySortBy),
         Box::new(LazyQuantile),
-        Box::new(rename::RenameDF),
-        Box::new(slice::SliceDF),
+        Box::new(ToLazyFrame),
         Box::new(ToLazyGroupBy),
-        Box::new(with_column::WithColumn),
     ]
 }
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/quantile.rs b/crates/nu_plugin_polars/src/dataframe/lazy/quantile.rs
index f6217ff89b..517fead989 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/quantile.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/quantile.rs
@@ -132,6 +132,7 @@ fn command(
     quantile: f64,
 ) -> Result<PipelineData, ShellError> {
     let lazy = NuLazyFrame::new(
+        lazy.from_eager,
         lazy.to_polars()
             .quantile(lit(quantile), QuantileInterpolOptions::default())
             .map_err(|e| ShellError::GenericError {
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/select.rs b/crates/nu_plugin_polars/src/dataframe/lazy/select.rs
index 75b3f8f804..03c4306c30 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/select.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/select.rs
@@ -67,7 +67,7 @@ impl PluginCommand for LazySelect {
 
         let pipeline_value = input.into_value(call.head)?;
         let lazy = NuLazyFrame::try_from_value_coerce(plugin, &pipeline_value)?;
-        let lazy = NuLazyFrame::new(lazy.to_polars().select(&expressions));
+        let lazy = NuLazyFrame::new(lazy.from_eager, lazy.to_polars().select(&expressions));
         lazy.to_pipeline_data(plugin, engine, call.head)
             .map_err(LabeledError::from)
     }
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/sort_by_expr.rs b/crates/nu_plugin_polars/src/dataframe/lazy/sort_by_expr.rs
index 2beba4424c..b282bd6d04 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/sort_by_expr.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/sort_by_expr.rs
@@ -147,7 +147,10 @@ impl PluginCommand for LazySortBy {
 
         let pipeline_value = input.into_value(call.head)?;
         let lazy = NuLazyFrame::try_from_value_coerce(plugin, &pipeline_value)?;
-        let lazy = NuLazyFrame::new(lazy.to_polars().sort_by_exprs(&expressions, sort_options));
+        let lazy = NuLazyFrame::new(
+            lazy.from_eager,
+            lazy.to_polars().sort_by_exprs(&expressions, sort_options),
+        );
         lazy.to_pipeline_data(plugin, engine, call.head)
             .map_err(LabeledError::from)
     }
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/to_lazy.rs b/crates/nu_plugin_polars/src/dataframe/lazy/to_lazy.rs
new file mode 100644
index 0000000000..df6616e178
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/to_lazy.rs
@@ -0,0 +1,90 @@
+use crate::{dataframe::values::NuSchema, values::CustomValueSupport, Cacheable, PolarsPlugin};
+
+use super::super::values::{NuDataFrame, NuLazyFrame};
+
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{Category, Example, LabeledError, PipelineData, Signature, SyntaxShape, Type};
+
+#[derive(Clone)]
+pub struct ToLazyFrame;
+
+impl PluginCommand for ToLazyFrame {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars into-lazy"
+    }
+
+    fn usage(&self) -> &str {
+        "Converts a dataframe into a lazy dataframe."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .named(
+                "schema",
+                SyntaxShape::Record(vec![]),
+                r#"Polars Schema in format [{name: str}]. CSV, JSON, and JSONL files"#,
+                Some('s'),
+            )
+            .input_output_type(Type::Any, Type::Custom("dataframe".into()))
+            .category(Category::Custom("lazyframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![Example {
+            description: "Takes a table and creates a lazyframe",
+            example: "[[a b];[1 2] [3 4]] | polars into-lazy",
+            result: None,
+        },
+        Example {
+            description: "Takes a table, creates a lazyframe, assigns column 'b' type str, displays the schema",
+            example: "[[a b];[1 2] [3 4]] | polars into-lazy --schema {b: str} | polars schema",
+            result: None
+        },
+        ]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        let maybe_schema = call
+            .get_flag("schema")?
+            .map(|schema| NuSchema::try_from(&schema))
+            .transpose()?;
+
+        let df = NuDataFrame::try_from_iter(plugin, input.into_iter(), maybe_schema)?;
+        let mut lazy = NuLazyFrame::from_dataframe(df);
+        // We don't want this converted back to an eager dataframe at some point
+        lazy.from_eager = false;
+        Ok(PipelineData::Value(
+            lazy.cache(plugin, engine, call.head)?.into_value(call.head),
+            None,
+        ))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::sync::Arc;
+
+    use nu_plugin_test_support::PluginTest;
+    use nu_protocol::{ShellError, Span};
+
+    use super::*;
+
+    #[test]
+    fn test_to_lazy() -> Result<(), ShellError> {
+        let plugin: Arc<PolarsPlugin> = PolarsPlugin::new_test_mode().into();
+        let mut plugin_test = PluginTest::new("polars", Arc::clone(&plugin))?;
+        let pipeline_data = plugin_test.eval("[[a b]; [6 2] [1 4] [4 1]] | polars into-lazy")?;
+        let value = pipeline_data.into_value(Span::test_data())?;
+        let df = NuLazyFrame::try_from_value(&plugin, &value)?;
+        assert!(!df.from_eager);
+        Ok(())
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/with_column.rs b/crates/nu_plugin_polars/src/dataframe/lazy/with_column.rs
deleted file mode 100644
index d2f953b068..0000000000
--- a/crates/nu_plugin_polars/src/dataframe/lazy/with_column.rs
+++ /dev/null
@@ -1,114 +0,0 @@
-use super::super::values::{Column, NuDataFrame};
-use crate::{
-    dataframe::values::{NuExpression, NuLazyFrame},
-    values::CustomValueSupport,
-    PolarsPlugin,
-};
-use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
-use nu_protocol::{
-    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
-    Value,
-};
-
-#[derive(Clone)]
-pub struct WithColumn;
-
-impl PluginCommand for WithColumn {
-    type Plugin = PolarsPlugin;
-
-    fn name(&self) -> &str {
-        "polars with-column"
-    }
-
-    fn usage(&self) -> &str {
-        "Adds a series to the dataframe."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .rest(
-                "series or expressions",
-                SyntaxShape::Any,
-                "series to be added or expressions used to define the new columns",
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe or lazyframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Adds a series to the dataframe",
-            example: r#"[[a b]; [1 2] [3 4]]
-    | polars into-df
-    | polars with-column [
-        ((polars col a) * 2 | polars as "c")
-        ((polars col a) * 3 | polars as "d")
-      ]
-    | polars collect"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![Value::test_int(1), Value::test_int(3)],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![Value::test_int(2), Value::test_int(4)],
-                        ),
-                        Column::new(
-                            "c".to_string(),
-                            vec![Value::test_int(2), Value::test_int(6)],
-                        ),
-                        Column::new(
-                            "d".to_string(),
-                            vec![Value::test_int(3), Value::test_int(9)],
-                        ),
-                    ],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        plugin: &Self::Plugin,
-        engine: &EngineInterface,
-        call: &EvaluatedCall,
-        input: PipelineData,
-    ) -> Result<PipelineData, LabeledError> {
-        let value = input.into_value(call.head)?;
-        let lazy = NuLazyFrame::try_from_value_coerce(plugin, &value)?;
-        command_lazy(plugin, engine, call, lazy).map_err(LabeledError::from)
-    }
-}
-
-fn command_lazy(
-    plugin: &PolarsPlugin,
-    engine: &EngineInterface,
-    call: &EvaluatedCall,
-    lazy: NuLazyFrame,
-) -> Result<PipelineData, ShellError> {
-    let vals: Vec<Value> = call.rest(0)?;
-    let value = Value::list(vals, call.head);
-    let expressions = NuExpression::extract_exprs(plugin, value)?;
-    let lazy: NuLazyFrame = lazy.to_polars().with_columns(&expressions).into();
-    lazy.to_pipeline_data(plugin, engine, call.head)
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use crate::test::test_polars_plugin_command;
-
-    #[test]
-    fn test_examples() -> Result<(), ShellError> {
-        test_polars_plugin_command(&WithColumn)
-    }
-}
diff --git a/crates/nu_plugin_polars/src/dataframe/series/shift.rs b/crates/nu_plugin_polars/src/dataframe/series/shift.rs
index c37ba2f2e9..58dc64ec47 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/shift.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/shift.rs
@@ -1,6 +1,6 @@
 use crate::{
     dataframe::values::{NuExpression, NuLazyFrame},
-    values::CustomValueSupport,
+    values::{cant_convert_err, CustomValueSupport, PolarsPluginObject, PolarsPluginType},
     PolarsPlugin,
 };
 
@@ -63,7 +63,8 @@ impl PluginCommand for Shift {
             },
             Example {
                 description: "Shifts the values by a given period, fill absent values with 0",
-                example: "[1 2 2 3 3] | polars into-df | polars shift 2 --fill 0 | polars collect",
+                example:
+                    "[1 2 2 3 3] | polars into-lazy | polars shift 2 --fill 0 | polars collect",
                 result: Some(
                     NuDataFrame::try_from_columns(
                         vec![Column::new(
@@ -93,11 +94,35 @@ impl PluginCommand for Shift {
         input: PipelineData,
     ) -> Result<PipelineData, LabeledError> {
         let value = input.into_value(call.head)?;
-        let lazy = NuLazyFrame::try_from_value_coerce(plugin, &value)?;
-        command_lazy(plugin, engine, call, lazy).map_err(LabeledError::from)
+
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuDataFrame(df) => command_eager(plugin, engine, call, df),
+            PolarsPluginObject::NuLazyFrame(lazy) => command_lazy(plugin, engine, call, lazy),
+            _ => Err(cant_convert_err(
+                &value,
+                &[
+                    PolarsPluginType::NuDataFrame,
+                    PolarsPluginType::NuLazyGroupBy,
+                ],
+            )),
+        }
+        .map_err(LabeledError::from)
     }
 }
 
+fn command_eager(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    df: NuDataFrame,
+) -> Result<PipelineData, ShellError> {
+    let period: i64 = call.req(0)?;
+    let series = df.as_series(call.head)?.shift(period);
+
+    let df = NuDataFrame::try_from_series_vec(vec![series], call.head)?;
+    df.to_pipeline_data(plugin, engine, call.head)
+}
+
 fn command_lazy(
     plugin: &PolarsPlugin,
     engine: &EngineInterface,
diff --git a/crates/nu_plugin_polars/src/dataframe/series/unique.rs b/crates/nu_plugin_polars/src/dataframe/series/unique.rs
index 2475ad026a..7626b35404 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/unique.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/unique.rs
@@ -1,6 +1,6 @@
 use crate::{
     dataframe::{utils::extract_strings, values::NuLazyFrame},
-    values::CustomValueSupport,
+    values::{cant_convert_err, CustomValueSupport, PolarsPluginObject, PolarsPluginType},
     PolarsPlugin,
 };
 
@@ -11,7 +11,7 @@ use nu_protocol::{
     Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
     Value,
 };
-use polars::prelude::UniqueKeepStrategy;
+use polars::prelude::{IntoSeries, UniqueKeepStrategy};
 
 #[derive(Clone)]
 pub struct Unique;
@@ -68,7 +68,7 @@ impl PluginCommand for Unique {
             },
             Example {
                 description: "Returns unique values in a subset of lazyframe columns",
-                example: "[[a b c]; [1 2 1] [2 2 2] [3 2 1]] | polars into-df | polars unique --subset [b c] | polars collect",
+                example: "[[a b c]; [1 2 1] [2 2 2] [3 2 1]] | polars into-lazy | polars unique --subset [b c] | polars collect",
                 result: Some(
                     NuDataFrame::try_from_columns(
                         vec![
@@ -94,7 +94,7 @@ impl PluginCommand for Unique {
             Example {
                 description: "Returns unique values in a subset of lazyframe columns",
                 example: r#"[[a b c]; [1 2 1] [2 2 2] [3 2 1]]
-    | polars into-df
+    | polars into-lazy
     | polars unique --subset [b c] --last
     | polars collect"#,
                 result: Some(
@@ -135,11 +135,42 @@ impl PluginCommand for Unique {
         input: PipelineData,
     ) -> Result<PipelineData, LabeledError> {
         let value = input.into_value(call.head)?;
-        let df = NuLazyFrame::try_from_value_coerce(plugin, &value)?;
-        command_lazy(plugin, engine, call, df).map_err(LabeledError::from)
+
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuDataFrame(df) => command_eager(plugin, engine, call, df),
+            PolarsPluginObject::NuLazyFrame(lazy) => command_lazy(plugin, engine, call, lazy),
+            _ => Err(cant_convert_err(
+                &value,
+                &[
+                    PolarsPluginType::NuDataFrame,
+                    PolarsPluginType::NuLazyGroupBy,
+                ],
+            )),
+        }
+        .map_err(LabeledError::from)
     }
 }
 
+fn command_eager(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    df: NuDataFrame,
+) -> Result<PipelineData, ShellError> {
+    let series = df.as_series(call.head)?;
+
+    let res = series.unique().map_err(|e| ShellError::GenericError {
+        error: "Error calculating unique values".into(),
+        msg: e.to_string(),
+        span: Some(call.head),
+        help: Some("The str-slice command can only be used with string columns".into()),
+        inner: vec![],
+    })?;
+
+    let df = NuDataFrame::try_from_series_vec(vec![res.into_series()], call.head)?;
+    df.to_pipeline_data(plugin, engine, call.head)
+}
+
 fn command_lazy(
     plugin: &PolarsPlugin,
     engine: &EngineInterface,
diff --git a/crates/nu_plugin_polars/src/dataframe/values/mod.rs b/crates/nu_plugin_polars/src/dataframe/values/mod.rs
index 179c85bf36..d52ee25203 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/mod.rs
@@ -323,7 +323,19 @@ pub trait CustomValueSupport: Cacheable {
         engine: &EngineInterface,
         span: Span,
     ) -> Result<Value, ShellError> {
-        Ok(self.cache(plugin, engine, span)?.into_value(span))
+        match self.to_cache_value()? {
+            // if it was from a lazy value, make it lazy again
+            PolarsPluginObject::NuDataFrame(df) if df.from_lazy => {
+                let df = df.lazy();
+                Ok(df.cache(plugin, engine, span)?.into_value(span))
+            }
+            // if it was from an eager value, make it eager again
+            PolarsPluginObject::NuLazyFrame(lf) if lf.from_eager => {
+                let lf = lf.collect(span)?;
+                Ok(lf.cache(plugin, engine, span)?.into_value(span))
+            }
+            _ => Ok(self.cache(plugin, engine, span)?.into_value(span)),
+        }
     }
 
     /// Caches the object, converts it to a it's CustomValue counterpart
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
index 7000cf10c4..f7941bf41d 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
@@ -472,7 +472,7 @@ pub fn from_parsed_columns(column_values: ColumnMap) -> Result<NuDataFrame, Shel
     }
 
     DataFrame::new(df_series)
-        .map(NuDataFrame::new)
+        .map(|df| NuDataFrame::new(false, df))
         .map_err(|e| ShellError::GenericError {
             error: "Error creating dataframe".into(),
             msg: e.to_string(),
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs
index 46132133dd..1c322579dd 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs
@@ -104,6 +104,7 @@ impl PolarsObject for DataFrameValue {
 pub struct NuDataFrame {
     pub id: Uuid,
     pub df: Arc<DataFrame>,
+    pub from_lazy: bool,
 }
 
 impl AsRef<DataFrame> for NuDataFrame {
@@ -114,16 +115,17 @@ impl AsRef<DataFrame> for NuDataFrame {
 
 impl From<DataFrame> for NuDataFrame {
     fn from(df: DataFrame) -> Self {
-        Self::new(df)
+        Self::new(false, df)
     }
 }
 
 impl NuDataFrame {
-    pub fn new(df: DataFrame) -> Self {
+    pub fn new(from_lazy: bool, df: DataFrame) -> Self {
         let id = Uuid::new_v4();
         Self {
             id,
             df: Arc::new(df),
+            from_lazy,
         }
     }
 
@@ -132,12 +134,12 @@ impl NuDataFrame {
     }
 
     pub fn lazy(&self) -> NuLazyFrame {
-        NuLazyFrame::new(self.to_polars().lazy())
+        NuLazyFrame::new(true, self.to_polars().lazy())
     }
 
     pub fn try_from_series(series: Series, span: Span) -> Result<Self, ShellError> {
         match DataFrame::new(vec![series]) {
-            Ok(dataframe) => Ok(NuDataFrame::new(dataframe)),
+            Ok(dataframe) => Ok(NuDataFrame::new(false, dataframe)),
             Err(e) => Err(ShellError::GenericError {
                 error: "Error creating dataframe".into(),
                 msg: e.to_string(),
@@ -200,7 +202,7 @@ impl NuDataFrame {
             inner: vec![],
         })?;
 
-        Ok(Self::new(dataframe))
+        Ok(Self::new(false, dataframe))
     }
 
     pub fn try_from_columns(
@@ -274,7 +276,7 @@ impl NuDataFrame {
             inner: vec![],
         })?;
 
-        Ok(Self::new(df))
+        Ok(Self::new(false, df))
     }
 
     pub fn is_series(&self) -> bool {
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/operations.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/operations.rs
index db5409aff2..c471fc05b8 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/operations.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/operations.rs
@@ -147,7 +147,7 @@ impl NuDataFrame {
                     inner: vec![],
                 })?;
 
-                Ok(NuDataFrame::new(df_new))
+                Ok(NuDataFrame::new(false, df_new))
             }
             Axis::Column => {
                 if self.df.width() != other.df.width() {
@@ -205,7 +205,7 @@ impl NuDataFrame {
                     inner: vec![],
                 })?;
 
-                Ok(NuDataFrame::new(df_new))
+                Ok(NuDataFrame::new(false, df_new))
             }
         }
     }
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_expression/custom_value.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_expression/custom_value.rs
index a9371f03f2..ea751b0255 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_expression/custom_value.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_expression/custom_value.rs
@@ -63,16 +63,45 @@ fn compute_with_value(
     op: Span,
     right: &Value,
 ) -> Result<Value, ShellError> {
-    let rhs = NuExpression::try_from_value(plugin, right)?;
-    with_operator(
-        (plugin, engine),
-        operator,
-        left,
-        &rhs,
-        lhs_span,
-        right.span(),
-        op,
-    )
+    let rhs_span = right.span();
+    match right {
+        Value::Custom { val: rhs, .. } => {
+            let rhs = rhs.as_any().downcast_ref::<NuExpression>().ok_or_else(|| {
+                ShellError::TypeMismatch {
+                    err_message: "Right hand side not a dataframe expression".into(),
+                    span: rhs_span,
+                }
+            })?;
+
+            match rhs.as_ref() {
+                polars::prelude::Expr::Literal(..) => with_operator(
+                    (plugin, engine),
+                    operator,
+                    left,
+                    rhs,
+                    lhs_span,
+                    right.span(),
+                    op,
+                ),
+                _ => Err(ShellError::TypeMismatch {
+                    err_message: "Only literal expressions or number".into(),
+                    span: right.span(),
+                }),
+            }
+        }
+        _ => {
+            let rhs = NuExpression::try_from_value(plugin, right)?;
+            with_operator(
+                (plugin, engine),
+                operator,
+                left,
+                &rhs,
+                lhs_span,
+                right.span(),
+                op,
+            )
+        }
+    }
 }
 
 fn with_operator(
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/mod.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/mod.rs
index 48e296e95e..53e2b425b7 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/mod.rs
@@ -21,6 +21,7 @@ pub use custom_value::NuLazyFrameCustomValue;
 pub struct NuLazyFrame {
     pub id: Uuid,
     pub lazy: Arc<LazyFrame>,
+    pub from_eager: bool,
 }
 
 impl fmt::Debug for NuLazyFrame {
@@ -31,21 +32,22 @@ impl fmt::Debug for NuLazyFrame {
 
 impl From<LazyFrame> for NuLazyFrame {
     fn from(lazy_frame: LazyFrame) -> Self {
-        NuLazyFrame::new(lazy_frame)
+        NuLazyFrame::new(false, lazy_frame)
     }
 }
 
 impl NuLazyFrame {
-    pub fn new(lazy: LazyFrame) -> Self {
+    pub fn new(from_eager: bool, lazy: LazyFrame) -> Self {
         Self {
             id: Uuid::new_v4(),
             lazy: Arc::new(lazy),
+            from_eager,
         }
     }
 
     pub fn from_dataframe(df: NuDataFrame) -> Self {
         let lazy = df.as_ref().clone().lazy();
-        NuLazyFrame::new(lazy)
+        NuLazyFrame::new(true, lazy)
     }
 
     pub fn to_polars(&self) -> LazyFrame {
@@ -62,7 +64,7 @@ impl NuLazyFrame {
                 help: None,
                 inner: vec![],
             })
-            .map(NuDataFrame::new)
+            .map(|df| NuDataFrame::new(true, df))
     }
 
     pub fn apply_with_expr<F>(self, expr: NuExpression, f: F) -> Self
@@ -72,7 +74,7 @@ impl NuLazyFrame {
         let df = self.to_polars();
         let expr = expr.into_polars();
         let new_frame = f(df, expr);
-        Self::new(new_frame)
+        Self::new(self.from_eager, new_frame)
     }
 
     pub fn schema(&self) -> Result<NuSchema, ShellError> {
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_lazygroupby/mod.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_lazygroupby/mod.rs
index fe5bc329e7..8540d13c6f 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_lazygroupby/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_lazygroupby/mod.rs
@@ -20,6 +20,7 @@ pub struct NuLazyGroupBy {
     pub id: Uuid,
     pub group_by: Arc<LazyGroupBy>,
     pub schema: NuSchema,
+    pub from_eager: bool,
 }
 
 impl fmt::Debug for NuLazyGroupBy {
@@ -29,10 +30,11 @@ impl fmt::Debug for NuLazyGroupBy {
 }
 
 impl NuLazyGroupBy {
-    pub fn new(group_by: LazyGroupBy, schema: NuSchema) -> Self {
+    pub fn new(group_by: LazyGroupBy, from_eager: bool, schema: NuSchema) -> Self {
         NuLazyGroupBy {
             id: Uuid::new_v4(),
             group_by: Arc::new(group_by),
+            from_eager,
             schema,
         }
     }
diff --git a/crates/nu_plugin_polars/src/dataframe/values/utils.rs b/crates/nu_plugin_polars/src/dataframe/values/utils.rs
index 88ce8a4656..6a51821c2f 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/utils.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/utils.rs
@@ -48,6 +48,8 @@ pub(crate) fn convert_columns(
 
 // Converts a Vec<Value> to a Vec<String> with a Span marking the whole
 // location of the columns for error referencing
+// todo - fix
+#[allow(dead_code)]
 pub(crate) fn convert_columns_string(
     columns: Vec<Value>,
     span: Span,

From b06f31d3c634a55cee5031f6a0daefb5f435a925 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Fri, 24 May 2024 16:37:50 -0700
Subject: [PATCH 0035/1072] Make `from json --objects` streaming (#12949)

# Description

Makes the `from json --objects` command produce a stream, and read
lazily from an input stream to produce its output.

Also added a helper, `PipelineData::get_type()`, to make it easier to
construct a wrong type error message when matching on `PipelineData`. I
expect checking `PipelineData` for either a string value or an `Unknown`
or `String` typed `ByteStream` will be very, very common. I would have
liked to have a helper that just returns a readable stream from either,
but that would either be a bespoke enum or a `Box<dyn BufRead>`, which
feels like it wouldn't be so great for performance. So instead, taking
the approach I did here is probably better - having a function that
accepts the `impl BufRead` and matching to use it.

# User-Facing Changes

- `from json --objects` no longer collects its input, and can be used
for large datasets or streams that produce values over time.

# Tests + Formatting
All passing.

# After Submitting
- [ ] release notes

---------

Co-authored-by: Ian Manske <ian.manske@pm.me>
---
 crates/nu-command/src/formats/from/json.rs    | 112 ++++++++++++------
 .../tests/format_conversions/json.rs          |  26 ++++
 .../nu-protocol/src/pipeline/pipeline_data.rs |  20 +++-
 3 files changed, 124 insertions(+), 34 deletions(-)

diff --git a/crates/nu-command/src/formats/from/json.rs b/crates/nu-command/src/formats/from/json.rs
index ea449711c1..e8b5d58e9e 100644
--- a/crates/nu-command/src/formats/from/json.rs
+++ b/crates/nu-command/src/formats/from/json.rs
@@ -1,4 +1,10 @@
+use std::{
+    io::{BufRead, Cursor},
+    sync::{atomic::AtomicBool, Arc},
+};
+
 use nu_engine::command_prelude::*;
+use nu_protocol::ListStream;
 
 #[derive(Clone)]
 pub struct FromJson;
@@ -45,6 +51,15 @@ impl Command for FromJson {
                     "b" => Value::test_int(2),
                 })),
             },
+            Example {
+                example: r#"'{ "a": 1 }
+{ "b": 2 }' | from json --objects"#,
+                description: "Parse a stream of line-delimited JSON values",
+                result: Some(Value::test_list(vec![
+                    Value::test_record(record! {"a" => Value::test_int(1)}),
+                    Value::test_record(record! {"b" => Value::test_int(2)}),
+                ])),
+            },
         ]
     }
 
@@ -56,49 +71,80 @@ impl Command for FromJson {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let span = call.head;
-        let (string_input, span, metadata) = input.collect_string_strict(span)?;
-
-        if string_input.is_empty() {
-            return Ok(Value::nothing(span).into_pipeline_data());
-        }
 
         let strict = call.has_flag(engine_state, stack, "strict")?;
 
         // TODO: turn this into a structured underline of the nu_json error
         if call.has_flag(engine_state, stack, "objects")? {
-            let lines = string_input.lines().filter(|line| !line.trim().is_empty());
-
-            let converted_lines: Vec<_> = if strict {
-                lines
-                    .map(|line| {
-                        convert_string_to_value_strict(line, span)
-                            .unwrap_or_else(|err| Value::error(err, span))
-                    })
-                    .collect()
-            } else {
-                lines
-                    .map(|line| {
-                        convert_string_to_value(line, span)
-                            .unwrap_or_else(|err| Value::error(err, span))
-                    })
-                    .collect()
-            };
-
-            Ok(converted_lines.into_pipeline_data_with_metadata(
-                span,
-                engine_state.ctrlc.clone(),
-                metadata,
-            ))
-        } else if strict {
-            Ok(convert_string_to_value_strict(&string_input, span)?
-                .into_pipeline_data_with_metadata(metadata))
+            // Return a stream of JSON values, one for each non-empty line
+            match input {
+                PipelineData::Value(Value::String { val, .. }, metadata) => {
+                    Ok(PipelineData::ListStream(
+                        read_json_lines(Cursor::new(val), span, strict, engine_state.ctrlc.clone()),
+                        metadata,
+                    ))
+                }
+                PipelineData::ByteStream(stream, metadata)
+                    if stream.type_() != ByteStreamType::Binary =>
+                {
+                    if let Some(reader) = stream.reader() {
+                        Ok(PipelineData::ListStream(
+                            read_json_lines(reader, span, strict, None),
+                            metadata,
+                        ))
+                    } else {
+                        Ok(PipelineData::Empty)
+                    }
+                }
+                _ => Err(ShellError::OnlySupportsThisInputType {
+                    exp_input_type: "string".into(),
+                    wrong_type: input.get_type().to_string(),
+                    dst_span: call.head,
+                    src_span: input.span().unwrap_or(call.head),
+                }),
+            }
         } else {
-            Ok(convert_string_to_value(&string_input, span)?
-                .into_pipeline_data_with_metadata(metadata))
+            // Return a single JSON value
+            let (string_input, span, metadata) = input.collect_string_strict(span)?;
+
+            if string_input.is_empty() {
+                return Ok(Value::nothing(span).into_pipeline_data());
+            }
+
+            if strict {
+                Ok(convert_string_to_value_strict(&string_input, span)?
+                    .into_pipeline_data_with_metadata(metadata))
+            } else {
+                Ok(convert_string_to_value(&string_input, span)?
+                    .into_pipeline_data_with_metadata(metadata))
+            }
         }
     }
 }
 
+/// Create a stream of values from a reader that produces line-delimited JSON
+fn read_json_lines(
+    input: impl BufRead + Send + 'static,
+    span: Span,
+    strict: bool,
+    interrupt: Option<Arc<AtomicBool>>,
+) -> ListStream {
+    let iter = input
+        .lines()
+        .filter(|line| line.as_ref().is_ok_and(|line| !line.trim().is_empty()) || line.is_err())
+        .map(move |line| {
+            let line = line.err_span(span)?;
+            if strict {
+                convert_string_to_value_strict(&line, span)
+            } else {
+                convert_string_to_value(&line, span)
+            }
+        })
+        .map(move |result| result.unwrap_or_else(|err| Value::error(err, span)));
+
+    ListStream::new(iter, span, interrupt)
+}
+
 fn convert_nujson_to_value(value: nu_json::Value, span: Span) -> Value {
     match value {
         nu_json::Value::Array(array) => Value::list(
diff --git a/crates/nu-command/tests/format_conversions/json.rs b/crates/nu-command/tests/format_conversions/json.rs
index 1989000df6..643e4c3f22 100644
--- a/crates/nu-command/tests/format_conversions/json.rs
+++ b/crates/nu-command/tests/format_conversions/json.rs
@@ -96,6 +96,32 @@ fn from_json_text_recognizing_objects_independently_to_table() {
     })
 }
 
+#[test]
+fn from_json_text_objects_is_stream() {
+    Playground::setup("filter_from_json_test_2_is_stream", |dirs, sandbox| {
+        sandbox.with_files(&[FileWithContentToBeTrimmed(
+            "katz.txt",
+            r#"
+                {"name":   "Yehuda", "rusty_luck": 1}
+                {"name": "JT", "rusty_luck": 1}
+                {"name":   "Andres", "rusty_luck": 1}
+                {"name":"GorbyPuff", "rusty_luck": 3}
+            "#,
+        )]);
+
+        let actual = nu!(
+            cwd: dirs.test(), pipeline(
+            r#"
+                open katz.txt
+                | from json -o
+                | describe -n
+            "#
+        ));
+
+        assert_eq!(actual.out, "stream");
+    })
+}
+
 #[test]
 fn from_json_text_recognizing_objects_independently_to_table_strict() {
     Playground::setup("filter_from_json_test_2_strict", |dirs, sandbox| {
diff --git a/crates/nu-protocol/src/pipeline/pipeline_data.rs b/crates/nu-protocol/src/pipeline/pipeline_data.rs
index 0a13ffa4b3..03fbc64d21 100644
--- a/crates/nu-protocol/src/pipeline/pipeline_data.rs
+++ b/crates/nu-protocol/src/pipeline/pipeline_data.rs
@@ -3,7 +3,7 @@ use crate::{
     engine::{EngineState, Stack},
     process::{ChildPipe, ChildProcess, ExitStatus},
     ByteStream, ByteStreamType, Config, ErrSpan, ListStream, OutDest, PipelineMetadata, Range,
-    ShellError, Span, Value,
+    ShellError, Span, Type, Value,
 };
 use nu_utils::{stderr_write_all_and_flush, stdout_write_all_and_flush};
 use std::{
@@ -99,6 +99,24 @@ impl PipelineData {
         }
     }
 
+    /// Get a type that is representative of the `PipelineData`.
+    ///
+    /// The type returned here makes no effort to collect a stream, so it may be a different type
+    /// than would be returned by [`Value::get_type()`] on the result of [`.into_value()`].
+    ///
+    /// Specifically, a `ListStream` results in [`list stream`](Type::ListStream) rather than
+    /// the fully complete [`list`](Type::List) type (which would require knowing the contents),
+    /// and a `ByteStream` with [unknown](crate::ByteStreamType::Unknown) type results in
+    /// [`any`](Type::Any) rather than [`string`](Type::String) or [`binary`](Type::Binary).
+    pub fn get_type(&self) -> Type {
+        match self {
+            PipelineData::Empty => Type::Nothing,
+            PipelineData::Value(value, _) => value.get_type(),
+            PipelineData::ListStream(_, _) => Type::ListStream,
+            PipelineData::ByteStream(stream, _) => stream.type_().into(),
+        }
+    }
+
     pub fn into_value(self, span: Span) -> Result<Value, ShellError> {
         match self {
             PipelineData::Empty => Ok(Value::nothing(span)),

From c5d716951fc199b6ef6b6b8ee6a3e7fd773bd824 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Sat, 25 May 2024 00:54:38 +0000
Subject: [PATCH 0036/1072] Allow byte streams with unknown type to be
 compatiable with binary (#12959)

# Description
Currently, this pipeline doesn't work `open --raw file | take 100`,
since the type of the byte stream is `Unknown`, but `take` expects
`Binary` streams. This PR changes commands that expect
`ByteStreamType::Binary` to also work with `ByteStreamType::Unknown`.
This was done by adding two new methods to `ByteStreamType`:
`is_binary_coercible` and `is_string_coercible`. These return true if
the type is `Unknown` or matches the type in the method name.
---
 crates/nu-command/src/conversions/into/string.rs |  2 +-
 crates/nu-command/src/filters/first.rs           |  4 ++--
 crates/nu-command/src/filters/last.rs            |  6 ++----
 crates/nu-command/src/filters/skip/skip_.rs      |  6 +++---
 crates/nu-command/src/filters/take/take_.rs      |  4 ++--
 crates/nu-protocol/src/pipeline/byte_stream.rs   | 12 +++++++++++-
 6 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/crates/nu-command/src/conversions/into/string.rs b/crates/nu-command/src/conversions/into/string.rs
index c0731b2e20..7c7d69cf4e 100644
--- a/crates/nu-command/src/conversions/into/string.rs
+++ b/crates/nu-command/src/conversions/into/string.rs
@@ -160,7 +160,7 @@ fn string_helper(
         // Just set the type - that should be good enough. There is no guarantee that the data
         // within a string stream is actually valid UTF-8. But refuse to do it if it was already set
         // to binary
-        if stream.type_() != ByteStreamType::Binary {
+        if stream.type_().is_string_coercible() {
             Ok(PipelineData::ByteStream(
                 stream.with_type(ByteStreamType::String),
                 metadata,
diff --git a/crates/nu-command/src/filters/first.rs b/crates/nu-command/src/filters/first.rs
index f625847a3f..97c5159b97 100644
--- a/crates/nu-command/src/filters/first.rs
+++ b/crates/nu-command/src/filters/first.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use std::io::Read;
 
 #[derive(Clone)]
 pub struct First;
@@ -171,10 +172,9 @@ fn first_helper(
             }
         }
         PipelineData::ByteStream(stream, metadata) => {
-            if stream.type_() == ByteStreamType::Binary {
+            if stream.type_().is_binary_coercible() {
                 let span = stream.span();
                 if let Some(mut reader) = stream.reader() {
-                    use std::io::Read;
                     if return_single_element {
                         // Take a single byte
                         let mut byte = [0u8];
diff --git a/crates/nu-command/src/filters/last.rs b/crates/nu-command/src/filters/last.rs
index 510e6457a8..efb300db01 100644
--- a/crates/nu-command/src/filters/last.rs
+++ b/crates/nu-command/src/filters/last.rs
@@ -1,6 +1,5 @@
 use nu_engine::command_prelude::*;
-
-use std::collections::VecDeque;
+use std::{collections::VecDeque, io::Read};
 
 #[derive(Clone)]
 pub struct Last;
@@ -161,10 +160,9 @@ impl Command for Last {
                 }
             }
             PipelineData::ByteStream(stream, ..) => {
-                if stream.type_() == ByteStreamType::Binary {
+                if stream.type_().is_binary_coercible() {
                     let span = stream.span();
                     if let Some(mut reader) = stream.reader() {
-                        use std::io::Read;
                         // Have to be a bit tricky here, but just consume into a VecDeque that we
                         // shrink to fit each time
                         const TAKE: u64 = 8192;
diff --git a/crates/nu-command/src/filters/skip/skip_.rs b/crates/nu-command/src/filters/skip/skip_.rs
index df53cfacba..d293a743da 100644
--- a/crates/nu-command/src/filters/skip/skip_.rs
+++ b/crates/nu-command/src/filters/skip/skip_.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use std::io::{self, Read};
 
 #[derive(Clone)]
 pub struct Skip;
@@ -94,12 +95,11 @@ impl Command for Skip {
         let input_span = input.span().unwrap_or(call.head);
         match input {
             PipelineData::ByteStream(stream, metadata) => {
-                if stream.type_() == ByteStreamType::Binary {
+                if stream.type_().is_binary_coercible() {
                     let span = stream.span();
                     if let Some(mut reader) = stream.reader() {
-                        use std::io::Read;
                         // Copy the number of skipped bytes into the sink before proceeding
-                        std::io::copy(&mut (&mut reader).take(n as u64), &mut std::io::sink())
+                        io::copy(&mut (&mut reader).take(n as u64), &mut io::sink())
                             .err_span(span)?;
                         Ok(PipelineData::ByteStream(
                             ByteStream::read(reader, call.head, None, ByteStreamType::Binary),
diff --git a/crates/nu-command/src/filters/take/take_.rs b/crates/nu-command/src/filters/take/take_.rs
index d4bf455c4a..7ebe22f914 100644
--- a/crates/nu-command/src/filters/take/take_.rs
+++ b/crates/nu-command/src/filters/take/take_.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use std::io::Read;
 
 #[derive(Clone)]
 pub struct Take;
@@ -79,9 +80,8 @@ impl Command for Take {
                 metadata,
             )),
             PipelineData::ByteStream(stream, metadata) => {
-                if stream.type_() == ByteStreamType::Binary {
+                if stream.type_().is_binary_coercible() {
                     if let Some(reader) = stream.reader() {
-                        use std::io::Read;
                         // Just take 'rows' bytes off the stream, mimicking the binary behavior
                         Ok(PipelineData::ByteStream(
                             ByteStream::read(
diff --git a/crates/nu-protocol/src/pipeline/byte_stream.rs b/crates/nu-protocol/src/pipeline/byte_stream.rs
index 35ce39ed31..babd195a9e 100644
--- a/crates/nu-protocol/src/pipeline/byte_stream.rs
+++ b/crates/nu-protocol/src/pipeline/byte_stream.rs
@@ -114,6 +114,16 @@ impl ByteStreamType {
             ByteStreamType::Unknown => "byte stream",
         }
     }
+
+    /// Returns true if the type is `Binary` or `Unknown`
+    pub fn is_binary_coercible(self) -> bool {
+        matches!(self, ByteStreamType::Binary | ByteStreamType::Unknown)
+    }
+
+    /// Returns true if the type is `String` or `Unknown`
+    pub fn is_string_coercible(self) -> bool {
+        matches!(self, ByteStreamType::String | ByteStreamType::Unknown)
+    }
 }
 
 impl From<ByteStreamType> for Type {
@@ -483,7 +493,7 @@ impl ByteStream {
     /// data would have been valid UTF-8.
     pub fn into_string(self) -> Result<String, ShellError> {
         let span = self.span;
-        if self.type_ != ByteStreamType::Binary {
+        if self.type_.is_string_coercible() {
             let trim = self.stream.is_external();
             let bytes = self.into_bytes()?;
             let mut string = String::from_utf8(bytes).map_err(|err| ShellError::NonUtf8Custom {

From 95977faf2d0fb048e9c898fef3c4ba542e2a99dd Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Sat, 25 May 2024 00:59:36 +0000
Subject: [PATCH 0037/1072] Do not propagate glob creation error for external
 args (#12955)

# Description
Instead of returning an error, this PR changes `expand_glob` in
`run_external.rs` to return the original string arg if glob creation
failed. This makes it so that, e.g.,
```nushell
^echo `[`
^echo `***`
```
no longer fail with a shell error. (This follows from #12921.)
---
 crates/nu-command/src/system/run_external.rs | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index 873cee19b1..15bf6ebfd3 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -295,19 +295,15 @@ fn expand_tilde(arg: &str) -> String {
     nu_path::expand_tilde(arg).to_string_lossy().to_string()
 }
 
-/// Performs glob expansion on `arg`. If the expansion found no matches, returns
-/// the original string as the expansion result.
+/// Performs glob expansion on `arg`. If the expansion found no matches or the pattern
+/// is not a valid glob, then this returns the original string as the expansion result.
 ///
 /// Note: This matches the default behavior of Bash, but is known to be
 /// error-prone. We might want to change this behavior in the future.
 fn expand_glob(arg: &str, cwd: &Path, span: Span) -> Result<Vec<String>, ShellError> {
-    let paths =
-        nu_glob::glob_with_parent(arg, nu_glob::MatchOptions::default(), cwd).map_err(|err| {
-            ShellError::InvalidGlobPattern {
-                msg: err.msg.to_string(),
-                span,
-            }
-        })?;
+    let Ok(paths) = nu_glob::glob_with_parent(arg, nu_glob::MatchOptions::default(), cwd) else {
+        return Ok(vec![arg.into()]);
+    };
 
     let mut result = vec![];
     for path in paths {
@@ -647,7 +643,9 @@ mod test {
         let expected = &["'*.txt'"];
         assert_eq!(actual, expected);
 
-        expand_glob("[*.txt", cwd, Span::unknown()).unwrap_err();
+        let actual = expand_glob("[*.txt", cwd, Span::unknown()).unwrap();
+        let expected = &["[*.txt"];
+        assert_eq!(actual, expected);
     }
 
     #[test]

From 0c5a67f4e5bf17a2fffbe3cbb54792a6464b3237 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Sat, 25 May 2024 09:10:01 -0500
Subject: [PATCH 0038/1072] make polars plugin use mimalloc (#12967)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
@maxim-uvarov did a ton of research and work with the dply-rs author and
ritchie from polars and found out that the allocator matters on macos
and it seems to be what was messing up the performance of polars plugin.
ritchie suggested to use jemalloc but i switched it to mimalloc to match
nushell and it seems to run better.

## Before (default allocator)
note - using 1..10 vs 1..100 since it takes so long. also notice how
high the `max` timings are compared to mimalloc below.
```nushell
❯ 1..10 | each {timeit {polars open Data7602DescendingYearOrder.csv | polars group-by year | polars agg (polars col geo_count | polars sum) | polars collect | null}} |   | {mean: ($in | math avg), min: ($in | math min), max: ($in | math max), stddev: ($in | into int | into float | math stddev | into int | $'($in)ns' | into duration)}
╭────────┬─────────────────────────╮
│ mean   │ 4sec 999ms 605µs 995ns  │
│ min    │ 983ms 627µs 42ns        │
│ max    │ 13sec 398ms 135µs 791ns │
│ stddev │ 3sec 476ms 479µs 939ns  │
╰────────┴─────────────────────────╯
❯ use std bench
❯ bench { polars open Data7602DescendingYearOrder.csv | polars group-by year | polars agg (polars col geo_count | polars sum) | polars collect | null } -n 10
╭───────┬────────────────────────╮
│ mean  │ 6sec 220ms 783µs 983ns │
│ min   │ 1sec 184ms 997µs 708ns │
│ max   │ 18sec 882ms 81µs 708ns │
│ std   │ 5sec 350ms 375µs 697ns │
│ times │ [list 10 items]        │
╰───────┴────────────────────────╯
```

## After (using mimalloc)
```nushell
❯ 1..100 | each {timeit {polars open Data7602DescendingYearOrder.csv | polars group-by year | polars agg (polars col geo_count | polars sum) | polars collect | null}} |   | {mean: ($in | math avg), min: ($in | math min), max: ($in | math max), stddev: ($in | into int | into float | math stddev | into int | $'($in)ns' | into duration)}
╭────────┬───────────────────╮
│ mean   │ 103ms 728µs 902ns │
│ min    │ 97ms 107µs 42ns   │
│ max    │ 149ms 430µs 84ns  │
│ stddev │ 5ms 690µs 664ns   │
╰────────┴───────────────────╯
❯ use std bench
❯ bench { polars open Data7602DescendingYearOrder.csv | polars group-by year | polars agg (polars col geo_count | polars sum) | polars collect | null } -n 100
╭───────┬───────────────────╮
│ mean  │ 103ms 620µs 195ns │
│ min   │ 97ms 541µs 166ns  │
│ max   │ 130ms 262µs 166ns │
│ std   │ 4ms 948µs 654ns   │
│ times │ [list 100 items]  │
╰───────┴───────────────────╯
```

## After (using jemalloc - just for comparison)
```nushell
❯ 1..100 | each {timeit {polars open Data7602DescendingYearOrder.csv | polars group-by year | polars agg (polars col geo_count | polars sum) | polars collect | null}} |   | {mean: ($in | math avg), min: ($in | math min), max: ($in | math max), stddev: ($in | into int | into float | math stddev | into int | $'($in)ns' | into duration)}

╭────────┬───────────────────╮
│ mean   │ 113ms 939µs 777ns │
│ min    │ 108ms 337µs 333ns │
│ max    │ 166ms 467µs 458ns │
│ stddev │ 6ms 175µs 618ns   │
╰────────┴───────────────────╯
❯ use std bench
❯ bench { polars open Data7602DescendingYearOrder.csv | polars group-by year | polars agg (polars col geo_count | polars sum) | polars collect | null } -n 100
╭───────┬───────────────────╮
│ mean  │ 114ms 363µs 530ns │
│ min   │ 108ms 804µs 833ns │
│ max   │ 143ms 521µs 459ns │
│ std   │ 5ms 88µs 56ns     │
│ times │ [list 100 items]  │
╰───────┴───────────────────╯
```

## After (using parquet + mimalloc)
```nushell
❯ 1..100 | each {timeit {polars open data.parquet | polars group-by year | polars agg (polars col geo_count | polars sum) | polars collect | null}} |   | {mean: ($in | math avg), min: ($in | math min), max: ($in | math max), stddev: ($in | into int | into float | math stddev | into int | $'($in)ns' | into duration)}
╭────────┬──────────────────╮
│ mean   │ 34ms 255µs 492ns │
│ min    │ 31ms 787µs 250ns │
│ max    │ 76ms 408µs 416ns │
│ stddev │ 4ms 472µs 916ns  │
╰────────┴──────────────────╯
❯ use std bench
❯ bench { polars open data.parquet | polars group-by year | polars agg (polars col geo_count | polars sum) | polars collect | null } -n 100
╭───────┬──────────────────╮
│ mean  │ 34ms 897µs 562ns │
│ min   │ 31ms 518µs 542ns │
│ max   │ 65ms 943µs 625ns │
│ std   │ 3ms 450µs 741ns  │
│ times │ [list 100 items] │
╰───────┴──────────────────╯
```

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock                          | 1 +
 crates/nu_plugin_polars/Cargo.toml  | 1 +
 crates/nu_plugin_polars/src/main.rs | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index 2ee4c6fc25..6e9216d447 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3387,6 +3387,7 @@ dependencies = [
  "chrono-tz 0.9.0",
  "fancy-regex",
  "indexmap",
+ "mimalloc",
  "nu-cmd-lang",
  "nu-command",
  "nu-engine",
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 6a2a980383..03d050638d 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -26,6 +26,7 @@ chrono = { workspace = true, features = ["std", "unstable-locales"], default-fea
 chrono-tz = "0.9"
 fancy-regex = { workspace = true }
 indexmap = { version = "2.2" }
+mimalloc = { version = "0.1.42" }
 num = {version = "0.4"}
 serde = { version = "1.0", features = ["derive"] }
 sqlparser = { version = "0.45"}
diff --git a/crates/nu_plugin_polars/src/main.rs b/crates/nu_plugin_polars/src/main.rs
index e060d7cd6d..4a757701ad 100644
--- a/crates/nu_plugin_polars/src/main.rs
+++ b/crates/nu_plugin_polars/src/main.rs
@@ -1,6 +1,9 @@
 use nu_plugin::{serve_plugin, MsgPackSerializer};
 use nu_plugin_polars::PolarsPlugin;
 
+#[global_allocator]
+static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
+
 fn main() {
     serve_plugin(&PolarsPlugin::default(), MsgPackSerializer {})
 }

From f38f88d42cdcd42e2dac3616eb5fafcc35fd819b Mon Sep 17 00:00:00 2001
From: YizhePKU <yizhe@pku.edu.cn>
Date: Sun, 26 May 2024 07:06:17 +0800
Subject: [PATCH 0039/1072] Fixes `.` expanded incorrectly as external argument
 (#12950)

This PR fixes a bug where `.` is expanded into an empty string when used
as an argument to external commands. Fixes
https://github.com/nushell/nushell/issues/12948.

---------

Co-authored-by: Ian Manske <ian.manske@pm.me>
---
 crates/nu-command/src/system/run_external.rs | 15 ++++++++++++++-
 tests/shell/pipeline/commands/external.rs    |  7 +++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index 15bf6ebfd3..8531217d4b 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -312,7 +312,16 @@ fn expand_glob(arg: &str, cwd: &Path, span: Span) -> Result<Vec<String>, ShellEr
             span,
         })?;
         // Strip PWD from the resulting paths if possible.
-        let path_stripped = path.strip_prefix(cwd).unwrap_or(&path);
+        let path_stripped = if let Ok(remainder) = path.strip_prefix(cwd) {
+            // If stripping PWD results in an empty path, return `.` instead.
+            if remainder.components().next().is_none() {
+                Path::new(".")
+            } else {
+                remainder
+            }
+        } else {
+            &path
+        };
         let path_string = path_stripped.to_string_lossy().to_string();
         result.push(path_string);
     }
@@ -643,6 +652,10 @@ mod test {
         let expected = &["'*.txt'"];
         assert_eq!(actual, expected);
 
+        let actual = expand_glob(cwd.to_str().unwrap(), cwd, Span::unknown()).unwrap();
+        let expected = &["."];
+        assert_eq!(actual, expected);
+
         let actual = expand_glob("[*.txt", cwd, Span::unknown()).unwrap();
         let expected = &["[*.txt"];
         assert_eq!(actual, expected);
diff --git a/tests/shell/pipeline/commands/external.rs b/tests/shell/pipeline/commands/external.rs
index 8557e9e327..2b116eb86d 100644
--- a/tests/shell/pipeline/commands/external.rs
+++ b/tests/shell/pipeline/commands/external.rs
@@ -61,6 +61,13 @@ fn automatically_change_directory_with_trailing_slash_and_same_name_as_command()
     })
 }
 
+#[test]
+fn pass_dot_as_external_arguments() {
+    let actual = nu!("nu --testbin cococo .");
+
+    assert_eq!(actual.out, ".");
+}
+
 #[test]
 fn correctly_escape_external_arguments() {
     let actual = nu!("^nu --testbin cococo '$0'");

From a1fc41db22e326309926b606e1a4c747afb673da Mon Sep 17 00:00:00 2001
From: YizhePKU <yizhe@pku.edu.cn>
Date: Mon, 27 May 2024 01:23:52 +0800
Subject: [PATCH 0040/1072] Fix `path type` using PWD from the environment
 (#12975)

This PR fixes the `path type` command so that it resolves relative paths
using PWD from the engine state.

As a bonus, it also fixes the issue of `path type` returning an empty
string instead of an error when it fails.
---
 crates/nu-command/src/path/type.rs            | 42 +++++++++----------
 .../nu-command/tests/commands/path/type_.rs   | 11 +++++
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/crates/nu-command/src/path/type.rs b/crates/nu-command/src/path/type.rs
index 8fbc270445..e048679220 100644
--- a/crates/nu-command/src/path/type.rs
+++ b/crates/nu-command/src/path/type.rs
@@ -1,10 +1,11 @@
 use super::PathSubcommandArguments;
 use nu_engine::command_prelude::*;
-use nu_path::expand_tilde;
 use nu_protocol::engine::StateWorkingSet;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 
-struct Arguments;
+struct Arguments {
+    pwd: PathBuf,
+}
 
 impl PathSubcommandArguments for Arguments {}
 
@@ -45,19 +46,21 @@ If nothing is found, an empty string will be returned."#
     fn run(
         &self,
         engine_state: &EngineState,
-        _stack: &mut Stack,
+        stack: &mut Stack,
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
-        let args = Arguments;
+        let args = Arguments {
+            pwd: engine_state.cwd(Some(stack))?,
+        };
 
         // This doesn't match explicit nulls
         if matches!(input, PipelineData::Empty) {
             return Err(ShellError::PipelineEmpty { dst_span: head });
         }
         input.map(
-            move |value| super::operate(&r#type, &args, value, head),
+            move |value| super::operate(&path_type, &args, value, head),
             engine_state.ctrlc.clone(),
         )
     }
@@ -69,14 +72,16 @@ If nothing is found, an empty string will be returned."#
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
-        let args = Arguments;
+        let args = Arguments {
+            pwd: working_set.permanent().cwd(None)?,
+        };
 
         // This doesn't match explicit nulls
         if matches!(input, PipelineData::Empty) {
             return Err(ShellError::PipelineEmpty { dst_span: head });
         }
         input.map(
-            move |value| super::operate(&r#type, &args, value, head),
+            move |value| super::operate(&path_type, &args, value, head),
             working_set.permanent().ctrlc.clone(),
         )
     }
@@ -97,21 +102,12 @@ If nothing is found, an empty string will be returned."#
     }
 }
 
-fn r#type(path: &Path, span: Span, _: &Arguments) -> Value {
-    let meta = if path.starts_with("~") {
-        let p = expand_tilde(path);
-        std::fs::symlink_metadata(p)
-    } else {
-        std::fs::symlink_metadata(path)
-    };
-
-    Value::string(
-        match &meta {
-            Ok(data) => get_file_type(data),
-            Err(_) => "",
-        },
-        span,
-    )
+fn path_type(path: &Path, span: Span, args: &Arguments) -> Value {
+    let path = nu_path::expand_path_with(path, &args.pwd, true);
+    match std::fs::symlink_metadata(path) {
+        Ok(metadata) => Value::string(get_file_type(&metadata), span),
+        Err(err) => Value::error(err.into(), span),
+    }
 }
 
 fn get_file_type(md: &std::fs::Metadata) -> &str {
diff --git a/crates/nu-command/tests/commands/path/type_.rs b/crates/nu-command/tests/commands/path/type_.rs
index 2317cea060..e67b957e4c 100644
--- a/crates/nu-command/tests/commands/path/type_.rs
+++ b/crates/nu-command/tests/commands/path/type_.rs
@@ -74,3 +74,14 @@ fn returns_type_of_existing_file_const() {
         assert_eq!(actual.out, "dir");
     })
 }
+
+#[test]
+fn respects_cwd() {
+    Playground::setup("path_type_respects_cwd", |dirs, sandbox| {
+        sandbox.within("foo").with_files(&[EmptyFile("bar.txt")]);
+
+        let actual = nu!(cwd: dirs.test(), "cd foo; 'bar.txt' | path type");
+
+        assert_eq!(actual.out, "file");
+    })
+}

From f74dd33ba9213e85e08ee96ba25558d1a89f1fb2 Mon Sep 17 00:00:00 2001
From: YizhePKU <yizhe@pku.edu.cn>
Date: Mon, 27 May 2024 01:24:00 +0800
Subject: [PATCH 0041/1072] Fix `touch --reference` using PWD from the
 environment (#12976)

This PR fixes `touch --reference path` so that it resolves `path` using
PWD from the engine state.
---
 crates/nu-command/src/filesystem/touch.rs | 12 +++++-------
 crates/nu-command/tests/commands/touch.rs | 13 +++++++++++++
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/crates/nu-command/src/filesystem/touch.rs b/crates/nu-command/src/filesystem/touch.rs
index 08843b11f0..0253e7e317 100644
--- a/crates/nu-command/src/filesystem/touch.rs
+++ b/crates/nu-command/src/filesystem/touch.rs
@@ -1,10 +1,9 @@
 use filetime::FileTime;
-#[allow(deprecated)]
-use nu_engine::{command_prelude::*, current_dir};
+use nu_engine::command_prelude::*;
 use nu_path::expand_path_with;
 use nu_protocol::NuGlob;
 
-use std::{fs::OpenOptions, path::Path, time::SystemTime};
+use std::{fs::OpenOptions, time::SystemTime};
 
 use super::util::get_rest_for_glob_pattern;
 
@@ -69,6 +68,8 @@ impl Command for Touch {
         let no_create: bool = call.has_flag(engine_state, stack, "no-create")?;
         let files: Vec<Spanned<NuGlob>> = get_rest_for_glob_pattern(engine_state, stack, call, 0)?;
 
+        let cwd = engine_state.cwd(Some(stack))?;
+
         if files.is_empty() {
             return Err(ShellError::MissingParameter {
                 param_name: "requires file paths".to_string(),
@@ -86,7 +87,7 @@ impl Command for Touch {
         }
 
         if let Some(reference) = reference {
-            let reference_path = Path::new(&reference.item);
+            let reference_path = nu_path::expand_path_with(reference.item, &cwd, true);
             if !reference_path.exists() {
                 return Err(ShellError::FileNotFoundCustom {
                     msg: "Reference path not found".into(),
@@ -114,9 +115,6 @@ impl Command for Touch {
                 })?;
         }
 
-        #[allow(deprecated)]
-        let cwd = current_dir(engine_state, stack)?;
-
         for glob in files {
             let path = expand_path_with(glob.item.as_ref(), &cwd, glob.item.is_expand());
 
diff --git a/crates/nu-command/tests/commands/touch.rs b/crates/nu-command/tests/commands/touch.rs
index 26d0325729..5f454cdec4 100644
--- a/crates/nu-command/tests/commands/touch.rs
+++ b/crates/nu-command/tests/commands/touch.rs
@@ -515,3 +515,16 @@ fn respects_cwd() {
         assert!(path.exists());
     })
 }
+
+#[test]
+fn reference_respects_cwd() {
+    Playground::setup("touch_reference_respects_cwd", |dirs, _sandbox| {
+        nu!(
+            cwd: dirs.test(),
+            "mkdir 'dir'; cd 'dir'; touch 'ref.txt'; touch --reference 'ref.txt' 'foo.txt'"
+        );
+
+        let path = dirs.test().join("dir/foo.txt");
+        assert!(path.exists());
+    })
+}

From 6012af24124f5b49c6f1d885a765f1c31e0a8631 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Mon, 27 May 2024 02:03:06 +0000
Subject: [PATCH 0042/1072] Fix panic when redirecting nothing (#12970)

# Description
Fixes #12969 where the parser can panic if a redirection is applied to
nothing / an empty command.

# Tests + Formatting
Added a test.
---
 crates/nu-parser/src/lite_parser.rs          | 148 ++++++++-----------
 crates/nu-parser/tests/test_parser.rs        |  39 +++++
 crates/nu-protocol/src/errors/parse_error.rs |   8 +
 3 files changed, 111 insertions(+), 84 deletions(-)

diff --git a/crates/nu-parser/src/lite_parser.rs b/crates/nu-parser/src/lite_parser.rs
index 65bdc4763a..f04b8befdc 100644
--- a/crates/nu-parser/src/lite_parser.rs
+++ b/crates/nu-parser/src/lite_parser.rs
@@ -51,12 +51,21 @@ impl LiteCommand {
         self.parts.push(span);
     }
 
+    fn check_accepts_redirection(&self, span: Span) -> Option<ParseError> {
+        self.parts
+            .is_empty()
+            .then_some(ParseError::UnexpectedRedirection { span })
+    }
+
     fn try_add_redirection(
         &mut self,
         source: RedirectionSource,
         target: LiteRedirectionTarget,
     ) -> Result<(), ParseError> {
         let redirection = match (self.redirection.take(), source) {
+            (None, _) if self.parts.is_empty() => Err(ParseError::UnexpectedRedirection {
+                span: target.connector(),
+            }),
             (None, source) => Ok(LiteRedirection::Single { source, target }),
             (
                 Some(LiteRedirection::Single {
@@ -162,94 +171,59 @@ pub fn lite_parse(tokens: &[Token]) -> (LiteBlock, Option<ParseError>) {
 
     for (idx, token) in tokens.iter().enumerate() {
         if let Some((source, append, span)) = file_redirection.take() {
-            if command.parts.is_empty() {
-                error = error.or(Some(ParseError::LabeledError(
-                    "Redirection without command or expression".into(),
-                    "there is nothing to redirect".into(),
-                    span,
-                )));
-
-                command.push(span);
-
-                match token.contents {
-                    TokenContents::Comment => {
-                        command.comments.push(token.span);
-                        curr_comment = None;
-                    }
-                    TokenContents::Pipe
-                    | TokenContents::ErrGreaterPipe
-                    | TokenContents::OutErrGreaterPipe => {
-                        pipeline.push(&mut command);
-                        command.pipe = Some(token.span);
-                    }
-                    TokenContents::Semicolon => {
-                        pipeline.push(&mut command);
-                        block.push(&mut pipeline);
-                    }
-                    TokenContents::Eol => {
-                        pipeline.push(&mut command);
-                    }
-                    _ => command.push(token.span),
+            match &token.contents {
+                TokenContents::PipePipe => {
+                    error = error.or(Some(ParseError::ShellOrOr(token.span)));
+                    command.push(span);
+                    command.push(token.span);
                 }
-            } else {
-                match &token.contents {
-                    TokenContents::PipePipe => {
-                        error = error.or(Some(ParseError::ShellOrOr(token.span)));
+                TokenContents::Item => {
+                    let target = LiteRedirectionTarget::File {
+                        connector: span,
+                        file: token.span,
+                        append,
+                    };
+                    if let Err(err) = command.try_add_redirection(source, target) {
+                        error = error.or(Some(err));
                         command.push(span);
-                        command.push(token.span);
-                    }
-                    TokenContents::Item => {
-                        let target = LiteRedirectionTarget::File {
-                            connector: span,
-                            file: token.span,
-                            append,
-                        };
-                        if let Err(err) = command.try_add_redirection(source, target) {
-                            error = error.or(Some(err));
-                            command.push(span);
-                            command.push(token.span)
-                        }
-                    }
-                    TokenContents::OutGreaterThan
-                    | TokenContents::OutGreaterGreaterThan
-                    | TokenContents::ErrGreaterThan
-                    | TokenContents::ErrGreaterGreaterThan
-                    | TokenContents::OutErrGreaterThan
-                    | TokenContents::OutErrGreaterGreaterThan => {
-                        error =
-                            error.or(Some(ParseError::Expected("redirection target", token.span)));
-                        command.push(span);
-                        command.push(token.span);
-                    }
-                    TokenContents::Pipe
-                    | TokenContents::ErrGreaterPipe
-                    | TokenContents::OutErrGreaterPipe => {
-                        error =
-                            error.or(Some(ParseError::Expected("redirection target", token.span)));
-                        command.push(span);
-                        pipeline.push(&mut command);
-                        command.pipe = Some(token.span);
-                    }
-                    TokenContents::Eol => {
-                        error =
-                            error.or(Some(ParseError::Expected("redirection target", token.span)));
-                        command.push(span);
-                        pipeline.push(&mut command);
-                    }
-                    TokenContents::Semicolon => {
-                        error =
-                            error.or(Some(ParseError::Expected("redirection target", token.span)));
-                        command.push(span);
-                        pipeline.push(&mut command);
-                        block.push(&mut pipeline);
-                    }
-                    TokenContents::Comment => {
-                        error = error.or(Some(ParseError::Expected("redirection target", span)));
-                        command.push(span);
-                        command.comments.push(token.span);
-                        curr_comment = None;
+                        command.push(token.span)
                     }
                 }
+                TokenContents::OutGreaterThan
+                | TokenContents::OutGreaterGreaterThan
+                | TokenContents::ErrGreaterThan
+                | TokenContents::ErrGreaterGreaterThan
+                | TokenContents::OutErrGreaterThan
+                | TokenContents::OutErrGreaterGreaterThan => {
+                    error = error.or(Some(ParseError::Expected("redirection target", token.span)));
+                    command.push(span);
+                    command.push(token.span);
+                }
+                TokenContents::Pipe
+                | TokenContents::ErrGreaterPipe
+                | TokenContents::OutErrGreaterPipe => {
+                    error = error.or(Some(ParseError::Expected("redirection target", token.span)));
+                    command.push(span);
+                    pipeline.push(&mut command);
+                    command.pipe = Some(token.span);
+                }
+                TokenContents::Eol => {
+                    error = error.or(Some(ParseError::Expected("redirection target", token.span)));
+                    command.push(span);
+                    pipeline.push(&mut command);
+                }
+                TokenContents::Semicolon => {
+                    error = error.or(Some(ParseError::Expected("redirection target", token.span)));
+                    command.push(span);
+                    pipeline.push(&mut command);
+                    block.push(&mut pipeline);
+                }
+                TokenContents::Comment => {
+                    error = error.or(Some(ParseError::Expected("redirection target", span)));
+                    command.push(span);
+                    command.comments.push(token.span);
+                    curr_comment = None;
+                }
             }
         } else {
             match &token.contents {
@@ -278,22 +252,28 @@ pub fn lite_parse(tokens: &[Token]) -> (LiteBlock, Option<ParseError>) {
                     command.push(token.span);
                 }
                 TokenContents::OutGreaterThan => {
+                    error = error.or(command.check_accepts_redirection(token.span));
                     file_redirection = Some((RedirectionSource::Stdout, false, token.span));
                 }
                 TokenContents::OutGreaterGreaterThan => {
+                    error = error.or(command.check_accepts_redirection(token.span));
                     file_redirection = Some((RedirectionSource::Stdout, true, token.span));
                 }
                 TokenContents::ErrGreaterThan => {
+                    error = error.or(command.check_accepts_redirection(token.span));
                     file_redirection = Some((RedirectionSource::Stderr, false, token.span));
                 }
                 TokenContents::ErrGreaterGreaterThan => {
+                    error = error.or(command.check_accepts_redirection(token.span));
                     file_redirection = Some((RedirectionSource::Stderr, true, token.span));
                 }
                 TokenContents::OutErrGreaterThan => {
+                    error = error.or(command.check_accepts_redirection(token.span));
                     file_redirection =
                         Some((RedirectionSource::StdoutAndStderr, false, token.span));
                 }
                 TokenContents::OutErrGreaterGreaterThan => {
+                    error = error.or(command.check_accepts_redirection(token.span));
                     file_redirection = Some((RedirectionSource::StdoutAndStderr, true, token.span));
                 }
                 TokenContents::ErrGreaterPipe => {
diff --git a/crates/nu-parser/tests/test_parser.rs b/crates/nu-parser/tests/test_parser.rs
index 9b8ae94317..ef5d968280 100644
--- a/crates/nu-parser/tests/test_parser.rs
+++ b/crates/nu-parser/tests/test_parser.rs
@@ -727,6 +727,45 @@ fn test_redirection_with_letmut(#[case] phase: &[u8]) {
     ));
 }
 
+#[rstest]
+#[case(b"o>")]
+#[case(b"o>>")]
+#[case(b"e>")]
+#[case(b"e>>")]
+#[case(b"o+e>")]
+#[case(b"o+e>>")]
+#[case(b"e>|")]
+#[case(b"o+e>|")]
+#[case(b"|o>")]
+#[case(b"|o>>")]
+#[case(b"|e>")]
+#[case(b"|e>>")]
+#[case(b"|o+e>")]
+#[case(b"|o+e>>")]
+#[case(b"|e>|")]
+#[case(b"|o+e>|")]
+#[case(b"e> file")]
+#[case(b"e>> file")]
+#[case(b"o> file")]
+#[case(b"o>> file")]
+#[case(b"o+e> file")]
+#[case(b"o+e>> file")]
+#[case(b"|e> file")]
+#[case(b"|e>> file")]
+#[case(b"|o> file")]
+#[case(b"|o>> file")]
+#[case(b"|o+e> file")]
+#[case(b"|o+e>> file")]
+fn test_redirecting_nothing(#[case] text: &[u8]) {
+    let engine_state = EngineState::new();
+    let mut working_set = StateWorkingSet::new(&engine_state);
+    let _ = parse(&mut working_set, None, text, true);
+    assert!(matches!(
+        working_set.parse_errors.first(),
+        Some(ParseError::UnexpectedRedirection { .. })
+    ));
+}
+
 #[test]
 fn test_nothing_comparison_neq() {
     let engine_state = EngineState::new();
diff --git a/crates/nu-protocol/src/errors/parse_error.rs b/crates/nu-protocol/src/errors/parse_error.rs
index 7e39fe1ef6..28c865b841 100644
--- a/crates/nu-protocol/src/errors/parse_error.rs
+++ b/crates/nu-protocol/src/errors/parse_error.rs
@@ -93,6 +93,13 @@ pub enum ParseError {
         #[label = "second redirection"] Span,
     ),
 
+    #[error("Unexpected redirection.")]
+    #[diagnostic(code(nu::parser::unexpected_redirection))]
+    UnexpectedRedirection {
+        #[label = "redirecting nothing"]
+        span: Span,
+    },
+
     #[error("{0} is not supported on values of type {3}")]
     #[diagnostic(code(nu::parser::unsupported_operation))]
     UnsupportedOperationLHS(
@@ -564,6 +571,7 @@ impl ParseError {
             ParseError::ShellErrRedirect(s) => *s,
             ParseError::ShellOutErrRedirect(s) => *s,
             ParseError::MultipleRedirections(_, _, s) => *s,
+            ParseError::UnexpectedRedirection { span } => *span,
             ParseError::UnknownOperator(_, _, s) => *s,
             ParseError::InvalidLiteral(_, _, s) => *s,
             ParseError::LabeledErrorWithHelp { span: s, .. } => *s,

From 4ab2c3238acdc8f4ef1987522b5edb37a78f83e8 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Tue, 28 May 2024 18:53:51 +0000
Subject: [PATCH 0043/1072] Disable reedline patch for 0.94.0 (#12986)

Disable crates.io git patch for reedline for 0.94.0 release.
---
 Cargo.lock | 3 ++-
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6e9216d447..b8777234ad 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4820,7 +4820,8 @@ dependencies = [
 [[package]]
 name = "reedline"
 version = "0.32.0"
-source = "git+https://github.com/nushell/reedline?branch=main#a580ea56d4e5a889468b2969d2a1534379504ab6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abf59e4c97b5049ba96b052cdb652368305a2eddcbce9bf1c16f9d003139eeea"
 dependencies = [
  "arboard",
  "chrono",
diff --git a/Cargo.toml b/Cargo.toml
index 665fd21747..6cac862ae1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -298,7 +298,7 @@ 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`

From 61182deb96c84fe1171179edcfeef9f1d301e8fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C5=BD=C3=A1dn=C3=ADk?= <kubouch@gmail.com>
Date: Tue, 28 May 2024 22:04:09 +0300
Subject: [PATCH 0044/1072] Bump version to 0.94.0 (#12987)

---
 Cargo.lock                                    | 72 +++++++++----------
 Cargo.toml                                    | 42 +++++------
 crates/nu-cli/Cargo.toml                      | 26 +++----
 crates/nu-cmd-base/Cargo.toml                 | 12 ++--
 crates/nu-cmd-extra/Cargo.toml                | 22 +++---
 crates/nu-cmd-lang/Cargo.toml                 | 12 ++--
 crates/nu-cmd-plugin/Cargo.toml               | 12 ++--
 crates/nu-color-config/Cargo.toml             | 10 +--
 crates/nu-command/Cargo.toml                  | 36 +++++-----
 crates/nu-engine/Cargo.toml                   | 12 ++--
 crates/nu-explore/Cargo.toml                  | 20 +++---
 crates/nu-glob/Cargo.toml                     |  4 +-
 crates/nu-json/Cargo.toml                     |  6 +-
 crates/nu-lsp/Cargo.toml                      | 16 ++---
 crates/nu-parser/Cargo.toml                   | 12 ++--
 crates/nu-parser/fuzz/Cargo.toml              |  2 +-
 crates/nu-path/Cargo.toml                     |  4 +-
 crates/nu-path/fuzz/Cargo.toml                |  2 +-
 crates/nu-plugin-core/Cargo.toml              |  8 +--
 crates/nu-plugin-engine/Cargo.toml            | 14 ++--
 crates/nu-plugin-protocol/Cargo.toml          |  8 +--
 crates/nu-plugin-test-support/Cargo.toml      | 20 +++---
 crates/nu-plugin/Cargo.toml                   | 12 ++--
 crates/nu-pretty-hex/Cargo.toml               |  4 +-
 crates/nu-protocol/Cargo.toml                 | 12 ++--
 crates/nu-std/Cargo.toml                      | 10 +--
 crates/nu-system/Cargo.toml                   |  4 +-
 crates/nu-table/Cargo.toml                    | 12 ++--
 crates/nu-term-grid/Cargo.toml                |  6 +-
 crates/nu-test-support/Cargo.toml             | 10 +--
 crates/nu-utils/Cargo.toml                    |  4 +-
 .../src/sample_config/default_config.nu       |  4 +-
 .../nu-utils/src/sample_config/default_env.nu |  4 +-
 crates/nu_plugin_custom_values/Cargo.toml     |  6 +-
 crates/nu_plugin_example/Cargo.toml           | 10 +--
 crates/nu_plugin_formats/Cargo.toml           |  8 +--
 crates/nu_plugin_gstat/Cargo.toml             |  8 +--
 crates/nu_plugin_inc/Cargo.toml               |  8 +--
 .../nu_plugin_nu_example.nu                   |  4 +-
 crates/nu_plugin_polars/Cargo.toml            | 20 +++---
 .../nu_plugin_python_example.py               |  4 +-
 crates/nu_plugin_query/Cargo.toml             |  8 +--
 crates/nu_plugin_stress_internals/Cargo.toml  |  4 +-
 crates/nuon/Cargo.toml                        | 10 +--
 44 files changed, 272 insertions(+), 272 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b8777234ad..6bfbddda07 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2770,7 +2770,7 @@ dependencies = [
 
 [[package]]
 name = "nu"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "assert_cmd",
  "crossterm",
@@ -2823,7 +2823,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cli"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "chrono",
  "crossterm",
@@ -2858,7 +2858,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-base"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "indexmap",
  "miette",
@@ -2870,7 +2870,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-extra"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "fancy-regex",
  "heck 0.5.0",
@@ -2895,7 +2895,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-lang"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "itertools 0.12.1",
  "nu-engine",
@@ -2907,7 +2907,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-plugin"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "itertools 0.12.1",
  "nu-engine",
@@ -2918,7 +2918,7 @@ dependencies = [
 
 [[package]]
 name = "nu-color-config"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "nu-ansi-term",
  "nu-engine",
@@ -2930,7 +2930,7 @@ dependencies = [
 
 [[package]]
 name = "nu-command"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "alphanumeric-sort",
  "base64 0.22.1",
@@ -3039,7 +3039,7 @@ dependencies = [
 
 [[package]]
 name = "nu-engine"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -3049,7 +3049,7 @@ dependencies = [
 
 [[package]]
 name = "nu-explore"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "ansi-str",
  "anyhow",
@@ -3074,14 +3074,14 @@ dependencies = [
 
 [[package]]
 name = "nu-glob"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "doc-comment",
 ]
 
 [[package]]
 name = "nu-json"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "linked-hash-map",
  "num-traits",
@@ -3091,7 +3091,7 @@ dependencies = [
 
 [[package]]
 name = "nu-lsp"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "assert-json-diff",
  "crossbeam-channel",
@@ -3112,7 +3112,7 @@ dependencies = [
 
 [[package]]
 name = "nu-parser"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "bytesize",
  "chrono",
@@ -3128,7 +3128,7 @@ dependencies = [
 
 [[package]]
 name = "nu-path"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "dirs-next",
  "omnipath",
@@ -3137,7 +3137,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "log",
  "nix",
@@ -3152,7 +3152,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-core"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "interprocess",
  "log",
@@ -3166,7 +3166,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-engine"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "log",
  "nu-engine",
@@ -3181,7 +3181,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-protocol"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "bincode",
  "nu-protocol",
@@ -3193,7 +3193,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-test-support"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "nu-ansi-term",
  "nu-cmd-lang",
@@ -3211,7 +3211,7 @@ dependencies = [
 
 [[package]]
 name = "nu-pretty-hex"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "heapless",
  "nu-ansi-term",
@@ -3220,7 +3220,7 @@ dependencies = [
 
 [[package]]
 name = "nu-protocol"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "brotli 5.0.0",
  "byte-unit",
@@ -3251,7 +3251,7 @@ dependencies = [
 
 [[package]]
 name = "nu-std"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "log",
  "miette",
@@ -3262,7 +3262,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "chrono",
  "itertools 0.12.1",
@@ -3280,7 +3280,7 @@ dependencies = [
 
 [[package]]
 name = "nu-table"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "fancy-regex",
  "nu-ansi-term",
@@ -3294,7 +3294,7 @@ dependencies = [
 
 [[package]]
 name = "nu-term-grid"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "nu-utils",
  "unicode-width",
@@ -3302,7 +3302,7 @@ dependencies = [
 
 [[package]]
 name = "nu-test-support"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -3314,7 +3314,7 @@ dependencies = [
 
 [[package]]
 name = "nu-utils"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "crossterm_winapi",
  "log",
@@ -3340,7 +3340,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_example"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "nu-cmd-lang",
  "nu-plugin",
@@ -3350,7 +3350,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_formats"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "eml-parser",
  "ical",
@@ -3363,7 +3363,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_gstat"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "git2",
  "nu-plugin",
@@ -3372,7 +3372,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_inc"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -3381,7 +3381,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_polars"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "chrono",
  "chrono-tz 0.9.0",
@@ -3412,7 +3412,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_query"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "gjson",
  "nu-plugin",
@@ -3424,7 +3424,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_stress_internals"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "interprocess",
  "serde",
@@ -3550,7 +3550,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "nuon"
-version = "0.93.1"
+version = "0.94.0"
 dependencies = [
  "chrono",
  "fancy-regex",
diff --git a/Cargo.toml b/Cargo.toml
index 6cac862ae1..f58a563552 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
 rust-version = "1.77.2"
-version = "0.93.1"
+version = "0.94.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -174,22 +174,22 @@ windows = "0.54"
 winreg = "0.52"
 
 [dependencies]
-nu-cli = { path = "./crates/nu-cli", version = "0.93.1" }
-nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.93.1" }
-nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.93.1" }
-nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.93.1", optional = true }
-nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.93.1" }
-nu-command = { path = "./crates/nu-command", version = "0.93.1" }
-nu-engine = { path = "./crates/nu-engine", version = "0.93.1" }
-nu-explore = { path = "./crates/nu-explore", version = "0.93.1" }
-nu-lsp = { path = "./crates/nu-lsp/", version = "0.93.1" }
-nu-parser = { path = "./crates/nu-parser", version = "0.93.1" }
-nu-path = { path = "./crates/nu-path", version = "0.93.1" }
-nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.93.1" }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.93.1" }
-nu-std = { path = "./crates/nu-std", version = "0.93.1" }
-nu-system = { path = "./crates/nu-system", version = "0.93.1" }
-nu-utils = { path = "./crates/nu-utils", version = "0.93.1" }
+nu-cli = { path = "./crates/nu-cli", version = "0.94.0" }
+nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.94.0" }
+nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.94.0" }
+nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.94.0", optional = true }
+nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.94.0" }
+nu-command = { path = "./crates/nu-command", version = "0.94.0" }
+nu-engine = { path = "./crates/nu-engine", version = "0.94.0" }
+nu-explore = { path = "./crates/nu-explore", version = "0.94.0" }
+nu-lsp = { path = "./crates/nu-lsp/", version = "0.94.0" }
+nu-parser = { path = "./crates/nu-parser", version = "0.94.0" }
+nu-path = { path = "./crates/nu-path", version = "0.94.0" }
+nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.94.0" }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.94.0" }
+nu-std = { path = "./crates/nu-std", version = "0.94.0" }
+nu-system = { path = "./crates/nu-system", version = "0.94.0" }
+nu-utils = { path = "./crates/nu-utils", version = "0.94.0" }
 
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
@@ -218,9 +218,9 @@ nix = { workspace = true, default-features = false, features = [
 ] }
 
 [dev-dependencies]
-nu-test-support = { path = "./crates/nu-test-support", version = "0.93.1" }
-nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.93.1" }
-nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.93.1" }
+nu-test-support = { path = "./crates/nu-test-support", version = "0.94.0" }
+nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.94.0" }
+nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.94.0" }
 assert_cmd = "2.0"
 dirs-next = { workspace = true }
 tango-bench = "0.5"
@@ -305,4 +305,4 @@ bench = false
 # Run individual benchmarks like `cargo bench -- <regex>` e.g. `cargo bench -- parse`
 [[bench]]
 name = "benchmarks"
-harness = false
+harness = false
\ No newline at end of file
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index d9cd728f19..2363df58ab 100644
--- 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.93.1"
+version = "0.94.0"
 
 [lib]
 bench = false
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.93.1" }
-nu-command = { path = "../nu-command", version = "0.93.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.93.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.0" }
+nu-command = { path = "../nu-command", version = "0.94.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.94.0" }
 rstest = { workspace = true, default-features = false }
 tempfile = { workspace = true }
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.93.1" }
-nu-engine = { path = "../nu-engine", version = "0.93.1" }
-nu-path = { path = "../nu-path", version = "0.93.1" }
-nu-parser = { path = "../nu-parser", version = "0.93.1" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.93.1", optional = true }
-nu-protocol = { path = "../nu-protocol", version = "0.93.1" }
-nu-utils = { path = "../nu-utils", version = "0.93.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.93.1" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.94.0" }
+nu-engine = { path = "../nu-engine", version = "0.94.0" }
+nu-path = { path = "../nu-path", version = "0.94.0" }
+nu-parser = { path = "../nu-parser", version = "0.94.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.94.0", optional = true }
+nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
+nu-utils = { path = "../nu-utils", version = "0.94.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.94.0" }
 nu-ansi-term = { workspace = true }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
@@ -46,4 +46,4 @@ which = { workspace = true }
 
 [features]
 plugin = ["nu-plugin-engine"]
-system-clipboard = ["reedline/system_clipboard"]
+system-clipboard = ["reedline/system_clipboard"]
\ No newline at end of file
diff --git a/crates/nu-cmd-base/Cargo.toml b/crates/nu-cmd-base/Cargo.toml
index b163ff447c..10c4613057 100644
--- a/crates/nu-cmd-base/Cargo.toml
+++ b/crates/nu-cmd-base/Cargo.toml
@@ -5,17 +5,17 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-base"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-base"
-version = "0.93.1"
+version = "0.94.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.93.1" }
-nu-parser = { path = "../nu-parser", version = "0.93.1" }
-nu-path = { path = "../nu-path", version = "0.93.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.93.1" }
+nu-engine = { path = "../nu-engine", version = "0.94.0" }
+nu-parser = { path = "../nu-parser", version = "0.94.0" }
+nu-path = { path = "../nu-path", version = "0.94.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
 
 indexmap = { workspace = true }
 miette = { workspace = true }
 
-[dev-dependencies]
+[dev-dependencies]
\ No newline at end of file
diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml
index 4c3dce09c7..695adbf120 100644
--- 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.93.1"
+version = "0.94.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,13 +13,13 @@ version = "0.93.1"
 bench = false
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.93.1" }
-nu-engine = { path = "../nu-engine", version = "0.93.1" }
-nu-json = { version = "0.93.1", path = "../nu-json" }
-nu-parser = { path = "../nu-parser", version = "0.93.1" }
-nu-pretty-hex = { version = "0.93.1", path = "../nu-pretty-hex" }
-nu-protocol = { path = "../nu-protocol", version = "0.93.1" }
-nu-utils = { path = "../nu-utils", version = "0.93.1" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.94.0" }
+nu-engine = { path = "../nu-engine", version = "0.94.0" }
+nu-json = { version = "0.94.0", path = "../nu-json" }
+nu-parser = { path = "../nu-parser", version = "0.94.0" }
+nu-pretty-hex = { version = "0.94.0", path = "../nu-pretty-hex" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
+nu-utils = { path = "../nu-utils", version = "0.94.0" }
 
 # Potential dependencies for extras
 heck = { workspace = true }
@@ -37,6 +37,6 @@ extra = ["default"]
 default = []
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.93.1" }
-nu-command = { path = "../nu-command", version = "0.93.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.93.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.0" }
+nu-command = { path = "../nu-command", version = "0.94.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.94.0" }
\ No newline at end of file
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index 45f5b9bc8f..6077b3fa81 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -6,16 +6,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-lang"
 edition = "2021"
 license = "MIT"
 name = "nu-cmd-lang"
-version = "0.93.1"
+version = "0.94.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.93.1" }
-nu-parser = { path = "../nu-parser", version = "0.93.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.93.1" }
-nu-utils = { path = "../nu-utils", version = "0.93.1" }
+nu-engine = { path = "../nu-engine", version = "0.94.0" }
+nu-parser = { path = "../nu-parser", version = "0.94.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
+nu-utils = { path = "../nu-utils", version = "0.94.0" }
 
 itertools = { workspace = true }
 shadow-rs = { version = "0.28", default-features = false }
@@ -29,4 +29,4 @@ which-support = []
 trash-support = []
 sqlite = []
 static-link-openssl = []
-system-clipboard = []
+system-clipboard = []
\ No newline at end of file
diff --git a/crates/nu-cmd-plugin/Cargo.toml b/crates/nu-cmd-plugin/Cargo.toml
index 0d83c3a407..fd6a9921b9 100644
--- a/crates/nu-cmd-plugin/Cargo.toml
+++ b/crates/nu-cmd-plugin/Cargo.toml
@@ -5,16 +5,16 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-plugin"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-plugin"
-version = "0.93.1"
+version = "0.94.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.93.1" }
-nu-path = { path = "../nu-path", version = "0.93.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.93.1", features = ["plugin"] }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.93.1" }
+nu-engine = { path = "../nu-engine", version = "0.94.0" }
+nu-path = { path = "../nu-path", version = "0.94.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.0", features = ["plugin"] }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.94.0" }
 
 itertools = { workspace = true }
 
-[dev-dependencies]
+[dev-dependencies]
\ No newline at end of file
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index f183f5c054..c1689ccb84 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -5,18 +5,18 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-color-confi
 edition = "2021"
 license = "MIT"
 name = "nu-color-config"
-version = "0.93.1"
+version = "0.94.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.93.1" }
-nu-engine = { path = "../nu-engine", version = "0.93.1" }
-nu-json = { path = "../nu-json", version = "0.93.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
+nu-engine = { path = "../nu-engine", version = "0.94.0" }
+nu-json = { path = "../nu-json", version = "0.94.0" }
 nu-ansi-term = { workspace = true }
 
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.93.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.94.0" }
\ No newline at end of file
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index d3456764fd..90dac40b0b 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-command"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
-version = "0.93.1"
+version = "0.94.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,21 +13,21 @@ version = "0.93.1"
 bench = false
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.93.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.93.1" }
-nu-engine = { path = "../nu-engine", version = "0.93.1" }
-nu-glob = { path = "../nu-glob", version = "0.93.1" }
-nu-json = { path = "../nu-json", version = "0.93.1" }
-nu-parser = { path = "../nu-parser", version = "0.93.1" }
-nu-path = { path = "../nu-path", version = "0.93.1" }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.93.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.93.1" }
-nu-system = { path = "../nu-system", version = "0.93.1" }
-nu-table = { path = "../nu-table", version = "0.93.1" }
-nu-term-grid = { path = "../nu-term-grid", version = "0.93.1" }
-nu-utils = { path = "../nu-utils", version = "0.93.1" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.94.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.94.0" }
+nu-engine = { path = "../nu-engine", version = "0.94.0" }
+nu-glob = { path = "../nu-glob", version = "0.94.0" }
+nu-json = { path = "../nu-json", version = "0.94.0" }
+nu-parser = { path = "../nu-parser", version = "0.94.0" }
+nu-path = { path = "../nu-path", version = "0.94.0" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.94.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
+nu-system = { path = "../nu-system", version = "0.94.0" }
+nu-table = { path = "../nu-table", version = "0.94.0" }
+nu-term-grid = { path = "../nu-term-grid", version = "0.94.0" }
+nu-utils = { path = "../nu-utils", version = "0.94.0" }
 nu-ansi-term = { workspace = true }
-nuon = { path = "../nuon", version = "0.93.1" }
+nuon = { path = "../nuon", version = "0.94.0" }
 
 alphanumeric-sort = { workspace = true }
 base64 = { workspace = true }
@@ -137,8 +137,8 @@ trash-support = ["trash"]
 which-support = []
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.93.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.93.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.94.0" }
 
 dirs-next = { workspace = true }
 mockito = { workspace = true, default-features = false }
@@ -146,4 +146,4 @@ quickcheck = { workspace = true }
 quickcheck_macros = { workspace = true }
 rstest = { workspace = true, default-features = false }
 pretty_assertions = { workspace = true }
-tempfile = { workspace = true }
+tempfile = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index 39fefc525e..671c5c86bf 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-engine"
 edition = "2021"
 license = "MIT"
 name = "nu-engine"
-version = "0.93.1"
+version = "0.94.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.93.1" }
-nu-path = { path = "../nu-path", version = "0.93.1" }
-nu-glob = { path = "../nu-glob", version = "0.93.1" }
-nu-utils = { path = "../nu-utils", version = "0.93.1" }
+nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.94.0" }
+nu-path = { path = "../nu-path", version = "0.94.0" }
+nu-glob = { path = "../nu-glob", version = "0.94.0" }
+nu-utils = { path = "../nu-utils", version = "0.94.0" }
 
 [features]
-plugin = []
+plugin = []
\ No newline at end of file
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index 46756e4101..274cf369e5 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -5,21 +5,21 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-explore"
 edition = "2021"
 license = "MIT"
 name = "nu-explore"
-version = "0.93.1"
+version = "0.94.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.93.1" }
-nu-parser = { path = "../nu-parser", version = "0.93.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.93.1" }
-nu-engine = { path = "../nu-engine", version = "0.93.1" }
-nu-table = { path = "../nu-table", version = "0.93.1" }
-nu-json = { path = "../nu-json", version = "0.93.1" }
-nu-utils = { path = "../nu-utils", version = "0.93.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
+nu-parser = { path = "../nu-parser", version = "0.94.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.94.0" }
+nu-engine = { path = "../nu-engine", version = "0.94.0" }
+nu-table = { path = "../nu-table", version = "0.94.0" }
+nu-json = { path = "../nu-json", version = "0.94.0" }
+nu-utils = { path = "../nu-utils", version = "0.94.0" }
 nu-ansi-term = { workspace = true }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.93.1" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.94.0" }
 
 anyhow = { workspace = true }
 log = { workspace = true }
@@ -32,4 +32,4 @@ ansi-str = { workspace = true }
 unicode-width = { workspace = true }
 lscolors = { workspace = true, default-features = false, features = [
   "nu-ansi-term",
-] }
+] }
\ No newline at end of file
diff --git a/crates/nu-glob/Cargo.toml b/crates/nu-glob/Cargo.toml
index 8a57dbe2a9..164fff93a2 100644
--- a/crates/nu-glob/Cargo.toml
+++ b/crates/nu-glob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-glob"
-version = "0.93.1"
+version = "0.94.0"
 authors = ["The Nushell Project Developers", "The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 description = """
@@ -14,4 +14,4 @@ categories = ["filesystem"]
 bench = false
 
 [dev-dependencies]
-doc-comment = "0.3"
+doc-comment = "0.3"
\ No newline at end of file
diff --git a/crates/nu-json/Cargo.toml b/crates/nu-json/Cargo.toml
index 303ed75e8a..e5561c1118 100644
--- a/crates/nu-json/Cargo.toml
+++ b/crates/nu-json/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-json"
 edition = "2021"
 license = "MIT"
 name = "nu-json"
-version = "0.93.1"
+version = "0.94.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -23,5 +23,5 @@ serde = { workspace =  true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-# nu-path = { path="../nu-path", version = "0.93.1" }
-# serde_json = "1.0"
+# nu-path = { path="../nu-path", version = "0.94.0" }
+# serde_json = "1.0"
\ No newline at end of file
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index c69499cfe3..a47da72e2d 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -3,14 +3,14 @@ authors = ["The Nushell Project Developers"]
 description = "Nushell's integrated LSP server"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-lsp"
 name = "nu-lsp"
-version = "0.93.1"
+version = "0.94.0"
 edition = "2021"
 license = "MIT"
 
 [dependencies]
-nu-cli = { path = "../nu-cli", version = "0.93.1" }
-nu-parser = { path = "../nu-parser", version = "0.93.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.93.1" }
+nu-cli = { path = "../nu-cli", version = "0.94.0" }
+nu-parser = { path = "../nu-parser", version = "0.94.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
 
 reedline = { workspace = true }
 
@@ -23,8 +23,8 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.93.1" }
-nu-command = { path = "../nu-command", version = "0.93.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.93.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.0" }
+nu-command = { path = "../nu-command", version = "0.94.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.94.0" }
 
-assert-json-diff = "2.0"
+assert-json-diff = "2.0"
\ No newline at end of file
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index 9fdf737af3..ea719ebdd4 100644
--- a/crates/nu-parser/Cargo.toml
+++ b/crates/nu-parser/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-parser"
 edition = "2021"
 license = "MIT"
 name = "nu-parser"
-version = "0.93.1"
+version = "0.94.0"
 exclude = ["/fuzz"]
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.93.1" }
-nu-path = { path = "../nu-path", version = "0.93.1" }
-nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.93.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.93.1" }
+nu-engine = { path = "../nu-engine", version = "0.94.0" }
+nu-path = { path = "../nu-path", version = "0.94.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.94.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
 
 bytesize = { workspace = true }
 chrono = { default-features = false, features = ['std'], workspace = true }
@@ -27,4 +27,4 @@ serde_json = { workspace = true }
 rstest = { workspace = true, default-features = false }
 
 [features]
-plugin = ["nu-plugin-engine"]
+plugin = ["nu-plugin-engine"]
\ No newline at end of file
diff --git a/crates/nu-parser/fuzz/Cargo.toml b/crates/nu-parser/fuzz/Cargo.toml
index db97e0f654..45216accc9 100644
--- a/crates/nu-parser/fuzz/Cargo.toml
+++ b/crates/nu-parser/fuzz/Cargo.toml
@@ -26,4 +26,4 @@ debug = 1
 name = "parse"
 path = "fuzz_targets/parse.rs"
 test = false
-doc = false
+doc = false
\ No newline at end of file
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index dbac11e336..1fc1f78ac4 100644
--- a/crates/nu-path/Cargo.toml
+++ b/crates/nu-path/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-path"
 edition = "2021"
 license = "MIT"
 name = "nu-path"
-version = "0.93.1"
+version = "0.94.0"
 exclude = ["/fuzz"]
 
 [lib]
@@ -18,4 +18,4 @@ dirs-next = { workspace = true }
 omnipath = { workspace = true }
 
 [target.'cfg(all(unix, not(target_os = "macos"), not(target_os = "android")))'.dependencies]
-pwd = { workspace = true }
+pwd = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-path/fuzz/Cargo.toml b/crates/nu-path/fuzz/Cargo.toml
index 08121602d7..c55453dba9 100644
--- a/crates/nu-path/fuzz/Cargo.toml
+++ b/crates/nu-path/fuzz/Cargo.toml
@@ -24,4 +24,4 @@ debug = 1
 name = "path"
 path = "fuzz_targets/path_fuzzer.rs"
 test = false
-doc = false
+doc = false
\ No newline at end of file
diff --git a/crates/nu-plugin-core/Cargo.toml b/crates/nu-plugin-core/Cargo.toml
index 242cac9bdf..7a2085ee90 100644
--- a/crates/nu-plugin-core/Cargo.toml
+++ b/crates/nu-plugin-core/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-core
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-core"
-version = "0.93.1"
+version = "0.94.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.93.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.93.1", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.0", default-features = false }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true }
@@ -25,4 +25,4 @@ default = ["local-socket"]
 local-socket = ["interprocess", "nu-plugin-protocol/local-socket"]
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows = { workspace = true }
+windows = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-plugin-engine/Cargo.toml b/crates/nu-plugin-engine/Cargo.toml
index 9ee6777880..40f482bd78 100644
--- a/crates/nu-plugin-engine/Cargo.toml
+++ b/crates/nu-plugin-engine/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-engi
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-engine"
-version = "0.93.1"
+version = "0.94.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.93.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.93.1" }
-nu-system = { path = "../nu-system", version = "0.93.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.93.1" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.93.1", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.94.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
+nu-system = { path = "../nu-system", version = "0.94.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.0" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.94.0", default-features = false }
 
 serde = { workspace = true }
 log = { workspace = true }
@@ -31,4 +31,4 @@ local-socket = ["nu-plugin-core/local-socket"]
 windows = { workspace = true, features = [
   # For setting process creation flags
   "Win32_System_Threading",
-] }
+] }
\ No newline at end of file
diff --git a/crates/nu-plugin-protocol/Cargo.toml b/crates/nu-plugin-protocol/Cargo.toml
index 4e364f2dba..996e1ce8f2 100644
--- a/crates/nu-plugin-protocol/Cargo.toml
+++ b/crates/nu-plugin-protocol/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-prot
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-protocol"
-version = "0.93.1"
+version = "0.94.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.93.1", features = ["plugin"] }
-nu-utils = { path = "../nu-utils", version = "0.93.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.0", features = ["plugin"] }
+nu-utils = { path = "../nu-utils", version = "0.94.0" }
 
 bincode = "1.3"
 serde = { workspace = true, features = ["derive"] }
@@ -21,4 +21,4 @@ typetag = "0.2"
 
 [features]
 default = ["local-socket"]
-local-socket = []
+local-socket = []
\ No newline at end of file
diff --git a/crates/nu-plugin-test-support/Cargo.toml b/crates/nu-plugin-test-support/Cargo.toml
index 5a92ef8d96..04f77ac7fa 100644
--- a/crates/nu-plugin-test-support/Cargo.toml
+++ b/crates/nu-plugin-test-support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-plugin-test-support"
-version = "0.93.1"
+version = "0.94.0"
 edition = "2021"
 license = "MIT"
 description = "Testing support for Nushell plugins"
@@ -12,17 +12,17 @@ bench = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.93.1", features = ["plugin"] }
-nu-protocol = { path = "../nu-protocol", version = "0.93.1", features = ["plugin"] }
-nu-parser = { path = "../nu-parser", version = "0.93.1", features = ["plugin"] }
-nu-plugin = { path = "../nu-plugin", version = "0.93.1" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.93.1" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.93.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.93.1" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.93.1" }
+nu-engine = { path = "../nu-engine", version = "0.94.0", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.94.0", features = ["plugin"] }
+nu-parser = { path = "../nu-parser", version = "0.94.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.94.0" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.94.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.94.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.0" }
 nu-ansi-term = { workspace = true }
 similar = "2.5"
 
 [dev-dependencies]
 typetag = "0.2"
-serde = "1.0"
+serde = "1.0"
\ No newline at end of file
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index ac0cb612ed..ff19f84273 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin"
 edition = "2021"
 license = "MIT"
 name = "nu-plugin"
-version = "0.93.1"
+version = "0.94.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.93.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.93.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.93.1" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.93.1", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.94.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.0" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.94.0", default-features = false }
 
 log = { workspace = true }
 thiserror = "1.0"
@@ -29,4 +29,4 @@ local-socket = ["nu-plugin-core/local-socket"]
 
 [target.'cfg(target_family = "unix")'.dependencies]
 # For setting the process group ID (EnterForeground / LeaveForeground)
-nix = { workspace = true, default-features = false, features = ["process"] }
+nix = { workspace = true, default-features = false, features = ["process"] }
\ No newline at end of file
diff --git a/crates/nu-pretty-hex/Cargo.toml b/crates/nu-pretty-hex/Cargo.toml
index ffe8f3149b..3849fc9495 100644
--- a/crates/nu-pretty-hex/Cargo.toml
+++ b/crates/nu-pretty-hex/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-pretty-hex"
 edition = "2021"
 license = "MIT"
 name = "nu-pretty-hex"
-version = "0.93.1"
+version = "0.94.0"
 
 [lib]
 doctest = false
@@ -18,4 +18,4 @@ nu-ansi-term = { workspace = true }
 
 [dev-dependencies]
 heapless = { version = "0.8", default-features = false }
-rand = "0.8"
+rand = "0.8"
\ No newline at end of file
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 84e76b3f5a..5d81535d04 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-protocol"
 edition = "2021"
 license = "MIT"
 name = "nu-protocol"
-version = "0.93.1"
+version = "0.94.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,9 +13,9 @@ version = "0.93.1"
 bench = false
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.93.1" }
-nu-path = { path = "../nu-path", version = "0.93.1" }
-nu-system = { path = "../nu-system", version = "0.93.1" }
+nu-utils = { path = "../nu-utils", version = "0.94.0" }
+nu-path = { path = "../nu-path", version = "0.94.0" }
+nu-system = { path = "../nu-system", version = "0.94.0" }
 
 brotli = { workspace = true, optional = true }
 byte-unit = { version = "5.1", features = [ "serde" ] }
@@ -45,11 +45,11 @@ plugin = [
 serde_json = { workspace = true }
 strum = "0.26"
 strum_macros = "0.26"
-nu-test-support = { path = "../nu-test-support", version = "0.93.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.94.0" }
 pretty_assertions = { workspace = true }
 rstest = { workspace = true }
 tempfile = { workspace = true }
 os_pipe = { workspace = true }
 
 [package.metadata.docs.rs]
-all-features = true
+all-features = true
\ No newline at end of file
diff --git a/crates/nu-std/Cargo.toml b/crates/nu-std/Cargo.toml
index c6f5ae0ffe..3f050b31e1 100644
--- a/crates/nu-std/Cargo.toml
+++ b/crates/nu-std/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-std"
 edition = "2021"
 license = "MIT"
 name = "nu-std"
-version = "0.93.1"
+version = "0.94.0"
 
 [dependencies]
-nu-parser = { version = "0.93.1", path = "../nu-parser" }
-nu-protocol = { version = "0.93.1", path = "../nu-protocol" }
-nu-engine = { version = "0.93.1", path = "../nu-engine" }
+nu-parser = { version = "0.94.0", path = "../nu-parser" }
+nu-protocol = { version = "0.94.0", path = "../nu-protocol" }
+nu-engine = { version = "0.94.0", path = "../nu-engine" }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
 
-log = "0.4"
+log = "0.4"
\ No newline at end of file
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index 88d6b28b05..e28c72ad53 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["The Nushell Project Developers", "procs creators"]
 description = "Nushell system querying"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-system"
 name = "nu-system"
-version = "0.93.1"
+version = "0.94.0"
 edition = "2021"
 license = "MIT"
 
@@ -45,4 +45,4 @@ windows = { workspace = true, features = [
   "Win32_System_SystemInformation",
   "Win32_System_Threading",
   "Win32_UI_Shell",
-]}
+]}
\ No newline at end of file
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index 630b72e3e3..b2bed2b555 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -5,20 +5,20 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-table"
 edition = "2021"
 license = "MIT"
 name = "nu-table"
-version = "0.93.1"
+version = "0.94.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.93.1" }
-nu-utils = { path = "../nu-utils", version = "0.93.1" }
-nu-engine = { path = "../nu-engine", version = "0.93.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.93.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
+nu-utils = { path = "../nu-utils", version = "0.94.0" }
+nu-engine = { path = "../nu-engine", version = "0.94.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.94.0" }
 nu-ansi-term = { workspace = true }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 tabled = { workspace = true, features = ["color"], default-features = false }
 
 [dev-dependencies]
-# nu-test-support = { path="../nu-test-support", version = "0.93.1"  }
+# nu-test-support = { path="../nu-test-support", version = "0.94.0"  }
\ No newline at end of file
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index 4a93d15e89..14eefa0ed1 100644
--- a/crates/nu-term-grid/Cargo.toml
+++ b/crates/nu-term-grid/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-term-grid"
 edition = "2021"
 license = "MIT"
 name = "nu-term-grid"
-version = "0.93.1"
+version = "0.94.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.93.1" }
+nu-utils = { path = "../nu-utils", version = "0.94.0" }
 
-unicode-width = { workspace = true }
+unicode-width = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml
index 3aa4af9937..8ca77631d1 100644
--- a/crates/nu-test-support/Cargo.toml
+++ b/crates/nu-test-support/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-test-suppor
 edition = "2021"
 license = "MIT"
 name = "nu-test-support"
-version = "0.93.1"
+version = "0.94.0"
 
 [lib]
 doctest = false
 bench = false
 
 [dependencies]
-nu-path = { path = "../nu-path", version = "0.93.1" }
-nu-glob = { path = "../nu-glob", version = "0.93.1" }
-nu-utils = { path = "../nu-utils", version = "0.93.1" }
+nu-path = { path = "../nu-path", version = "0.94.0" }
+nu-glob = { path = "../nu-glob", version = "0.94.0" }
+nu-utils = { path = "../nu-utils", version = "0.94.0" }
 
 num-format = { workspace = true }
 which = { workspace = true }
-tempfile = { workspace = true }
+tempfile = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index 8cf5f2dab5..681ee7d6f1 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-utils"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-utils"
-version = "0.93.1"
+version = "0.94.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
@@ -29,4 +29,4 @@ unicase = "2.7.0"
 crossterm_winapi = "0.9"
 
 [target.'cfg(unix)'.dependencies]
-nix = { workspace = true, default-features = false, features = ["user", "fs"] }
+nix = { workspace = true, default-features = false, features = ["user", "fs"] }
\ No newline at end of file
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index 5681fb1a6d..fd9a9642b0 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -1,6 +1,6 @@
 # Nushell Config File
 #
-# version = "0.93.1"
+# version = "0.94.0"
 
 # For more information on defining custom themes, see
 # https://www.nushell.sh/book/coloring_and_theming.html
@@ -892,4 +892,4 @@ $env.config = {
             event: { edit: selectall }
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/crates/nu-utils/src/sample_config/default_env.nu b/crates/nu-utils/src/sample_config/default_env.nu
index 65f93eaaba..f68396eec5 100644
--- a/crates/nu-utils/src/sample_config/default_env.nu
+++ b/crates/nu-utils/src/sample_config/default_env.nu
@@ -1,6 +1,6 @@
 # Nushell Environment Config File
 #
-# version = "0.93.1"
+# version = "0.94.0"
 
 def create_left_prompt [] {
     let dir = match (do --ignore-shell-errors { $env.PWD | path relative-to $nu.home-path }) {
@@ -97,4 +97,4 @@ $env.NU_PLUGIN_DIRS = [
 # $env.PATH = ($env.PATH | uniq)
 
 # To load from a custom file you can use:
-# source ($nu.default-config-dir | path join 'custom.nu')
+# source ($nu.default-config-dir | path join 'custom.nu')
\ No newline at end of file
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index 546436736c..5c9a2bb633 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -10,10 +10,10 @@ name = "nu_plugin_custom_values"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.93.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.93.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.94.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.0", features = ["plugin"] }
 serde = { workspace = true, default-features = false }
 typetag = "0.2"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.93.1" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.0" }
\ No newline at end of file
diff --git a/crates/nu_plugin_example/Cargo.toml b/crates/nu_plugin_example/Cargo.toml
index 80d75fd32d..356af74386 100644
--- a/crates/nu_plugin_example/Cargo.toml
+++ b/crates/nu_plugin_example/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_exam
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_example"
-version = "0.93.1"
+version = "0.94.0"
 
 [[bin]]
 name = "nu_plugin_example"
@@ -15,9 +15,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.93.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.93.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.94.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.0", features = ["plugin"] }
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.93.1" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.93.1" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.0" }
\ No newline at end of file
diff --git a/crates/nu_plugin_formats/Cargo.toml b/crates/nu_plugin_formats/Cargo.toml
index e8e1fe3cb9..55c47f33f5 100644
--- a/crates/nu_plugin_formats/Cargo.toml
+++ b/crates/nu_plugin_formats/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_form
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_formats"
-version = "0.93.1"
+version = "0.94.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.93.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.93.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.94.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.0", features = ["plugin"] }
 
 indexmap = { workspace = true }
 eml-parser = "0.1"
@@ -18,4 +18,4 @@ ical = "0.11"
 rust-ini = "0.21.0"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.93.1" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.0" }
\ No newline at end of file
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index ff9bd837f8..c779ffd8c4 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gsta
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_gstat"
-version = "0.93.1"
+version = "0.94.0"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_gstat"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.93.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.93.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.94.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
 
-git2 = "0.18"
+git2 = "0.18"
\ No newline at end of file
diff --git a/crates/nu_plugin_inc/Cargo.toml b/crates/nu_plugin_inc/Cargo.toml
index cd9d27fa92..1c12343598 100644
--- a/crates/nu_plugin_inc/Cargo.toml
+++ b/crates/nu_plugin_inc/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_inc"
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_inc"
-version = "0.93.1"
+version = "0.94.0"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_inc"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.93.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.93.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.94.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.0", features = ["plugin"] }
 
-semver = "1.0"
+semver = "1.0"
\ No newline at end of file
diff --git a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
index 6d2b2d772f..74da32809f 100755
--- a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
+++ b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
@@ -6,7 +6,7 @@
 # it also allows us to test the plugin interface with something manually implemented in a scripting
 # language without adding any extra dependencies to our tests.
 
-const NUSHELL_VERSION = "0.93.1"
+const NUSHELL_VERSION = "0.94.0"
 
 def main [--stdio] {
   if ($stdio) {
@@ -257,4 +257,4 @@ def start_plugin [] {
     }) |
     each { from json | handle_input } |
     ignore
-}
+}
\ No newline at end of file
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 03d050638d..dced0b4b85 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu_plugin_polars"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_polars"
-version = "0.93.1"
+version = "0.94.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -17,9 +17,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.93.1" }
-nu-plugin = { path = "../nu-plugin", version = "0.93.1" }
-nu-path = { path = "../nu-path", version = "0.93.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
+nu-plugin = { path = "../nu-plugin", version = "0.94.0" }
+nu-path = { path = "../nu-path", version = "0.94.0" }
 
 # Potential dependencies for extras
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
@@ -73,9 +73,9 @@ optional = false
 version = "0.39"
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.93.1" }
-nu-engine = { path = "../nu-engine", version = "0.93.1" }
-nu-parser = { path = "../nu-parser", version = "0.93.1" }
-nu-command = { path = "../nu-command", version = "0.93.1" }
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.93.1" }
-tempfile.workspace = true
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.0" }
+nu-engine = { path = "../nu-engine", version = "0.94.0" }
+nu-parser = { path = "../nu-parser", version = "0.94.0" }
+nu-command = { path = "../nu-command", version = "0.94.0" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.0" }
+tempfile.workspace = true
\ No newline at end of file
diff --git a/crates/nu_plugin_python/nu_plugin_python_example.py b/crates/nu_plugin_python/nu_plugin_python_example.py
index 17913fd28e..ff777b3d64 100755
--- a/crates/nu_plugin_python/nu_plugin_python_example.py
+++ b/crates/nu_plugin_python/nu_plugin_python_example.py
@@ -27,7 +27,7 @@ import sys
 import json
 
 
-NUSHELL_VERSION = "0.93.1"
+NUSHELL_VERSION = "0.94.0"
 
 
 def signatures():
@@ -250,4 +250,4 @@ if __name__ == "__main__":
     if len(sys.argv) == 2 and sys.argv[1] == "--stdio":
         plugin()
     else:
-        print("Run me from inside nushell!")
+        print("Run me from inside nushell!")
\ No newline at end of file
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index a640067a4f..52d2c9fd91 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_quer
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_query"
-version = "0.93.1"
+version = "0.94.0"
 
 [lib]
 doctest = false
@@ -16,10 +16,10 @@ name = "nu_plugin_query"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.93.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.93.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.94.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
 
 gjson = "0.8"
 scraper = { default-features = false, version = "0.19" }
 sxd-document = "0.3"
-sxd-xpath = "0.4"
+sxd-xpath = "0.4"
\ No newline at end of file
diff --git a/crates/nu_plugin_stress_internals/Cargo.toml b/crates/nu_plugin_stress_internals/Cargo.toml
index 2af1858d77..a374263f51 100644
--- a/crates/nu_plugin_stress_internals/Cargo.toml
+++ b/crates/nu_plugin_stress_internals/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_stre
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_stress_internals"
-version = "0.93.1"
+version = "0.94.0"
 
 [[bin]]
 name = "nu_plugin_stress_internals"
@@ -16,4 +16,4 @@ bench = false
 # assumptions about the serialized format
 serde = { workspace = true }
 serde_json = { workspace = true }
-interprocess = { workspace = true }
+interprocess = { workspace = true }
\ No newline at end of file
diff --git a/crates/nuon/Cargo.toml b/crates/nuon/Cargo.toml
index a3d6f4c6fc..ef58fd761e 100644
--- a/crates/nuon/Cargo.toml
+++ b/crates/nuon/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nuon"
 edition = "2021"
 license = "MIT"
 name = "nuon"
-version = "0.93.1"
+version = "0.94.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-parser = { path = "../nu-parser", version = "0.93.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.93.1" }
-nu-engine = { path = "../nu-engine", version = "0.93.1" }
+nu-parser = { path = "../nu-parser", version = "0.94.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
+nu-engine = { path = "../nu-engine", version = "0.94.0" }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 
 [dev-dependencies]
-chrono = { workspace = true }
+chrono = { workspace = true }
\ No newline at end of file

From f3991f2080284eadaec5a29b92def5bdf8d41248 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Tue, 28 May 2024 15:41:23 -0700
Subject: [PATCH 0045/1072] Bump version to `0.94.1` (#12988)

Merge this PR before merging any other PRs.
---
 Cargo.lock                                    | 72 +++++++++----------
 Cargo.toml                                    | 40 +++++------
 crates/nu-cli/Cargo.toml                      | 24 +++----
 crates/nu-cmd-base/Cargo.toml                 | 10 +--
 crates/nu-cmd-extra/Cargo.toml                | 22 +++---
 crates/nu-cmd-lang/Cargo.toml                 | 10 +--
 crates/nu-cmd-plugin/Cargo.toml               | 10 +--
 crates/nu-color-config/Cargo.toml             | 10 +--
 crates/nu-command/Cargo.toml                  | 34 ++++-----
 crates/nu-engine/Cargo.toml                   | 10 +--
 crates/nu-explore/Cargo.toml                  | 18 ++---
 crates/nu-glob/Cargo.toml                     |  2 +-
 crates/nu-json/Cargo.toml                     |  4 +-
 crates/nu-lsp/Cargo.toml                      | 14 ++--
 crates/nu-parser/Cargo.toml                   | 10 +--
 crates/nu-path/Cargo.toml                     |  2 +-
 crates/nu-plugin-core/Cargo.toml              |  6 +-
 crates/nu-plugin-engine/Cargo.toml            | 12 ++--
 crates/nu-plugin-protocol/Cargo.toml          |  6 +-
 crates/nu-plugin-test-support/Cargo.toml      | 18 ++---
 crates/nu-plugin/Cargo.toml                   | 10 +--
 crates/nu-pretty-hex/Cargo.toml               |  2 +-
 crates/nu-protocol/Cargo.toml                 | 10 +--
 crates/nu-std/Cargo.toml                      |  8 +--
 crates/nu-system/Cargo.toml                   |  2 +-
 crates/nu-table/Cargo.toml                    | 12 ++--
 crates/nu-term-grid/Cargo.toml                |  4 +-
 crates/nu-test-support/Cargo.toml             |  8 +--
 crates/nu-utils/Cargo.toml                    |  2 +-
 .../src/sample_config/default_config.nu       |  2 +-
 .../nu-utils/src/sample_config/default_env.nu |  2 +-
 crates/nu_plugin_custom_values/Cargo.toml     |  6 +-
 crates/nu_plugin_example/Cargo.toml           | 10 +--
 crates/nu_plugin_formats/Cargo.toml           |  8 +--
 crates/nu_plugin_gstat/Cargo.toml             |  6 +-
 crates/nu_plugin_inc/Cargo.toml               |  6 +-
 .../nu_plugin_nu_example.nu                   |  2 +-
 crates/nu_plugin_polars/Cargo.toml            | 18 ++---
 .../nu_plugin_python_example.py               |  2 +-
 crates/nu_plugin_query/Cargo.toml             |  6 +-
 crates/nu_plugin_stress_internals/Cargo.toml  |  2 +-
 crates/nuon/Cargo.toml                        |  8 +--
 42 files changed, 235 insertions(+), 235 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6bfbddda07..2d339ec7da 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2770,7 +2770,7 @@ dependencies = [
 
 [[package]]
 name = "nu"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "assert_cmd",
  "crossterm",
@@ -2823,7 +2823,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cli"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "chrono",
  "crossterm",
@@ -2858,7 +2858,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-base"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "indexmap",
  "miette",
@@ -2870,7 +2870,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-extra"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "fancy-regex",
  "heck 0.5.0",
@@ -2895,7 +2895,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-lang"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "itertools 0.12.1",
  "nu-engine",
@@ -2907,7 +2907,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-plugin"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "itertools 0.12.1",
  "nu-engine",
@@ -2918,7 +2918,7 @@ dependencies = [
 
 [[package]]
 name = "nu-color-config"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "nu-ansi-term",
  "nu-engine",
@@ -2930,7 +2930,7 @@ dependencies = [
 
 [[package]]
 name = "nu-command"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "alphanumeric-sort",
  "base64 0.22.1",
@@ -3039,7 +3039,7 @@ dependencies = [
 
 [[package]]
 name = "nu-engine"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -3049,7 +3049,7 @@ dependencies = [
 
 [[package]]
 name = "nu-explore"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "ansi-str",
  "anyhow",
@@ -3074,14 +3074,14 @@ dependencies = [
 
 [[package]]
 name = "nu-glob"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "doc-comment",
 ]
 
 [[package]]
 name = "nu-json"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "linked-hash-map",
  "num-traits",
@@ -3091,7 +3091,7 @@ dependencies = [
 
 [[package]]
 name = "nu-lsp"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "assert-json-diff",
  "crossbeam-channel",
@@ -3112,7 +3112,7 @@ dependencies = [
 
 [[package]]
 name = "nu-parser"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "bytesize",
  "chrono",
@@ -3128,7 +3128,7 @@ dependencies = [
 
 [[package]]
 name = "nu-path"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "dirs-next",
  "omnipath",
@@ -3137,7 +3137,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "log",
  "nix",
@@ -3152,7 +3152,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-core"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "interprocess",
  "log",
@@ -3166,7 +3166,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-engine"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "log",
  "nu-engine",
@@ -3181,7 +3181,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-protocol"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "bincode",
  "nu-protocol",
@@ -3193,7 +3193,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-test-support"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "nu-ansi-term",
  "nu-cmd-lang",
@@ -3211,7 +3211,7 @@ dependencies = [
 
 [[package]]
 name = "nu-pretty-hex"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "heapless",
  "nu-ansi-term",
@@ -3220,7 +3220,7 @@ dependencies = [
 
 [[package]]
 name = "nu-protocol"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "brotli 5.0.0",
  "byte-unit",
@@ -3251,7 +3251,7 @@ dependencies = [
 
 [[package]]
 name = "nu-std"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "log",
  "miette",
@@ -3262,7 +3262,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "chrono",
  "itertools 0.12.1",
@@ -3280,7 +3280,7 @@ dependencies = [
 
 [[package]]
 name = "nu-table"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "fancy-regex",
  "nu-ansi-term",
@@ -3294,7 +3294,7 @@ dependencies = [
 
 [[package]]
 name = "nu-term-grid"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "nu-utils",
  "unicode-width",
@@ -3302,7 +3302,7 @@ dependencies = [
 
 [[package]]
 name = "nu-test-support"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -3314,7 +3314,7 @@ dependencies = [
 
 [[package]]
 name = "nu-utils"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "crossterm_winapi",
  "log",
@@ -3340,7 +3340,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_example"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "nu-cmd-lang",
  "nu-plugin",
@@ -3350,7 +3350,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_formats"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "eml-parser",
  "ical",
@@ -3363,7 +3363,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_gstat"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "git2",
  "nu-plugin",
@@ -3372,7 +3372,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_inc"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -3381,7 +3381,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_polars"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "chrono",
  "chrono-tz 0.9.0",
@@ -3412,7 +3412,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_query"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "gjson",
  "nu-plugin",
@@ -3424,7 +3424,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_stress_internals"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "interprocess",
  "serde",
@@ -3550,7 +3550,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "nuon"
-version = "0.94.0"
+version = "0.94.1"
 dependencies = [
  "chrono",
  "fancy-regex",
diff --git a/Cargo.toml b/Cargo.toml
index f58a563552..a8576baa95 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
 rust-version = "1.77.2"
-version = "0.94.0"
+version = "0.94.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -174,22 +174,22 @@ windows = "0.54"
 winreg = "0.52"
 
 [dependencies]
-nu-cli = { path = "./crates/nu-cli", version = "0.94.0" }
-nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.94.0" }
-nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.94.0" }
-nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.94.0", optional = true }
-nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.94.0" }
-nu-command = { path = "./crates/nu-command", version = "0.94.0" }
-nu-engine = { path = "./crates/nu-engine", version = "0.94.0" }
-nu-explore = { path = "./crates/nu-explore", version = "0.94.0" }
-nu-lsp = { path = "./crates/nu-lsp/", version = "0.94.0" }
-nu-parser = { path = "./crates/nu-parser", version = "0.94.0" }
-nu-path = { path = "./crates/nu-path", version = "0.94.0" }
-nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.94.0" }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.94.0" }
-nu-std = { path = "./crates/nu-std", version = "0.94.0" }
-nu-system = { path = "./crates/nu-system", version = "0.94.0" }
-nu-utils = { path = "./crates/nu-utils", version = "0.94.0" }
+nu-cli = { path = "./crates/nu-cli", version = "0.94.1" }
+nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.94.1" }
+nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.94.1" }
+nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.94.1", optional = true }
+nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.94.1" }
+nu-command = { path = "./crates/nu-command", version = "0.94.1" }
+nu-engine = { path = "./crates/nu-engine", version = "0.94.1" }
+nu-explore = { path = "./crates/nu-explore", version = "0.94.1" }
+nu-lsp = { path = "./crates/nu-lsp/", version = "0.94.1" }
+nu-parser = { path = "./crates/nu-parser", version = "0.94.1" }
+nu-path = { path = "./crates/nu-path", version = "0.94.1" }
+nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.94.1" }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.94.1" }
+nu-std = { path = "./crates/nu-std", version = "0.94.1" }
+nu-system = { path = "./crates/nu-system", version = "0.94.1" }
+nu-utils = { path = "./crates/nu-utils", version = "0.94.1" }
 
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
@@ -218,9 +218,9 @@ nix = { workspace = true, default-features = false, features = [
 ] }
 
 [dev-dependencies]
-nu-test-support = { path = "./crates/nu-test-support", version = "0.94.0" }
-nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.94.0" }
-nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.94.0" }
+nu-test-support = { path = "./crates/nu-test-support", version = "0.94.1" }
+nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.94.1" }
+nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.94.1" }
 assert_cmd = "2.0"
 dirs-next = { workspace = true }
 tango-bench = "0.5"
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 2363df58ab..516afd9f0b 100644
--- 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.94.0"
+version = "0.94.1"
 
 [lib]
 bench = false
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.0" }
-nu-command = { path = "../nu-command", version = "0.94.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.94.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.1" }
+nu-command = { path = "../nu-command", version = "0.94.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.94.1" }
 rstest = { workspace = true, default-features = false }
 tempfile = { workspace = true }
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.94.0" }
-nu-engine = { path = "../nu-engine", version = "0.94.0" }
-nu-path = { path = "../nu-path", version = "0.94.0" }
-nu-parser = { path = "../nu-parser", version = "0.94.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.94.0", optional = true }
-nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
-nu-utils = { path = "../nu-utils", version = "0.94.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.94.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.94.1" }
+nu-engine = { path = "../nu-engine", version = "0.94.1" }
+nu-path = { path = "../nu-path", version = "0.94.1" }
+nu-parser = { path = "../nu-parser", version = "0.94.1" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.94.1", optional = true }
+nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
+nu-utils = { path = "../nu-utils", version = "0.94.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.94.1" }
 nu-ansi-term = { workspace = true }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
diff --git a/crates/nu-cmd-base/Cargo.toml b/crates/nu-cmd-base/Cargo.toml
index 10c4613057..1dcd95ba94 100644
--- 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.94.0"
+version = "0.94.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.94.0" }
-nu-parser = { path = "../nu-parser", version = "0.94.0" }
-nu-path = { path = "../nu-path", version = "0.94.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
+nu-engine = { path = "../nu-engine", version = "0.94.1" }
+nu-parser = { path = "../nu-parser", version = "0.94.1" }
+nu-path = { path = "../nu-path", version = "0.94.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
 
 indexmap = { workspace = true }
 miette = { workspace = true }
diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml
index 695adbf120..9e6270163d 100644
--- 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.94.0"
+version = "0.94.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,13 +13,13 @@ version = "0.94.0"
 bench = false
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.94.0" }
-nu-engine = { path = "../nu-engine", version = "0.94.0" }
-nu-json = { version = "0.94.0", path = "../nu-json" }
-nu-parser = { path = "../nu-parser", version = "0.94.0" }
-nu-pretty-hex = { version = "0.94.0", path = "../nu-pretty-hex" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
-nu-utils = { path = "../nu-utils", version = "0.94.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.94.1" }
+nu-engine = { path = "../nu-engine", version = "0.94.1" }
+nu-json = { version = "0.94.1", path = "../nu-json" }
+nu-parser = { path = "../nu-parser", version = "0.94.1" }
+nu-pretty-hex = { version = "0.94.1", path = "../nu-pretty-hex" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
+nu-utils = { path = "../nu-utils", version = "0.94.1" }
 
 # Potential dependencies for extras
 heck = { workspace = true }
@@ -37,6 +37,6 @@ extra = ["default"]
 default = []
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.0" }
-nu-command = { path = "../nu-command", version = "0.94.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.94.0" }
\ No newline at end of file
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.1" }
+nu-command = { path = "../nu-command", version = "0.94.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.94.1" }
\ No newline at end of file
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index 6077b3fa81..f7b43521d1 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -6,16 +6,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-lang"
 edition = "2021"
 license = "MIT"
 name = "nu-cmd-lang"
-version = "0.94.0"
+version = "0.94.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.94.0" }
-nu-parser = { path = "../nu-parser", version = "0.94.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
-nu-utils = { path = "../nu-utils", version = "0.94.0" }
+nu-engine = { path = "../nu-engine", version = "0.94.1" }
+nu-parser = { path = "../nu-parser", version = "0.94.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
+nu-utils = { path = "../nu-utils", version = "0.94.1" }
 
 itertools = { workspace = true }
 shadow-rs = { version = "0.28", default-features = false }
diff --git a/crates/nu-cmd-plugin/Cargo.toml b/crates/nu-cmd-plugin/Cargo.toml
index fd6a9921b9..f461f6bf04 100644
--- a/crates/nu-cmd-plugin/Cargo.toml
+++ b/crates/nu-cmd-plugin/Cargo.toml
@@ -5,15 +5,15 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-plugin"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-plugin"
-version = "0.94.0"
+version = "0.94.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.94.0" }
-nu-path = { path = "../nu-path", version = "0.94.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.0", features = ["plugin"] }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.94.0" }
+nu-engine = { path = "../nu-engine", version = "0.94.1" }
+nu-path = { path = "../nu-path", version = "0.94.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.1", features = ["plugin"] }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.94.1" }
 
 itertools = { workspace = true }
 
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index c1689ccb84..34f0ded963 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -5,18 +5,18 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-color-confi
 edition = "2021"
 license = "MIT"
 name = "nu-color-config"
-version = "0.94.0"
+version = "0.94.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
-nu-engine = { path = "../nu-engine", version = "0.94.0" }
-nu-json = { path = "../nu-json", version = "0.94.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
+nu-engine = { path = "../nu-engine", version = "0.94.1" }
+nu-json = { path = "../nu-json", version = "0.94.1" }
 nu-ansi-term = { workspace = true }
 
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.94.0" }
\ No newline at end of file
+nu-test-support = { path = "../nu-test-support", version = "0.94.1" }
\ No newline at end of file
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 90dac40b0b..25665cfc33 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-command"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
-version = "0.94.0"
+version = "0.94.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,21 +13,21 @@ version = "0.94.0"
 bench = false
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.94.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.94.0" }
-nu-engine = { path = "../nu-engine", version = "0.94.0" }
-nu-glob = { path = "../nu-glob", version = "0.94.0" }
-nu-json = { path = "../nu-json", version = "0.94.0" }
-nu-parser = { path = "../nu-parser", version = "0.94.0" }
-nu-path = { path = "../nu-path", version = "0.94.0" }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.94.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
-nu-system = { path = "../nu-system", version = "0.94.0" }
-nu-table = { path = "../nu-table", version = "0.94.0" }
-nu-term-grid = { path = "../nu-term-grid", version = "0.94.0" }
-nu-utils = { path = "../nu-utils", version = "0.94.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.94.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.94.1" }
+nu-engine = { path = "../nu-engine", version = "0.94.1" }
+nu-glob = { path = "../nu-glob", version = "0.94.1" }
+nu-json = { path = "../nu-json", version = "0.94.1" }
+nu-parser = { path = "../nu-parser", version = "0.94.1" }
+nu-path = { path = "../nu-path", version = "0.94.1" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.94.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
+nu-system = { path = "../nu-system", version = "0.94.1" }
+nu-table = { path = "../nu-table", version = "0.94.1" }
+nu-term-grid = { path = "../nu-term-grid", version = "0.94.1" }
+nu-utils = { path = "../nu-utils", version = "0.94.1" }
 nu-ansi-term = { workspace = true }
-nuon = { path = "../nuon", version = "0.94.0" }
+nuon = { path = "../nuon", version = "0.94.1" }
 
 alphanumeric-sort = { workspace = true }
 base64 = { workspace = true }
@@ -137,8 +137,8 @@ trash-support = ["trash"]
 which-support = []
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.94.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.94.1" }
 
 dirs-next = { workspace = true }
 mockito = { workspace = true, default-features = false }
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index 671c5c86bf..7bf5ffe9d5 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-engine"
 edition = "2021"
 license = "MIT"
 name = "nu-engine"
-version = "0.94.0"
+version = "0.94.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.94.0" }
-nu-path = { path = "../nu-path", version = "0.94.0" }
-nu-glob = { path = "../nu-glob", version = "0.94.0" }
-nu-utils = { path = "../nu-utils", version = "0.94.0" }
+nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.94.1" }
+nu-path = { path = "../nu-path", version = "0.94.1" }
+nu-glob = { path = "../nu-glob", version = "0.94.1" }
+nu-utils = { path = "../nu-utils", version = "0.94.1" }
 
 [features]
 plugin = []
\ No newline at end of file
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index 274cf369e5..006e301859 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -5,21 +5,21 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-explore"
 edition = "2021"
 license = "MIT"
 name = "nu-explore"
-version = "0.94.0"
+version = "0.94.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
-nu-parser = { path = "../nu-parser", version = "0.94.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.94.0" }
-nu-engine = { path = "../nu-engine", version = "0.94.0" }
-nu-table = { path = "../nu-table", version = "0.94.0" }
-nu-json = { path = "../nu-json", version = "0.94.0" }
-nu-utils = { path = "../nu-utils", version = "0.94.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
+nu-parser = { path = "../nu-parser", version = "0.94.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.94.1" }
+nu-engine = { path = "../nu-engine", version = "0.94.1" }
+nu-table = { path = "../nu-table", version = "0.94.1" }
+nu-json = { path = "../nu-json", version = "0.94.1" }
+nu-utils = { path = "../nu-utils", version = "0.94.1" }
 nu-ansi-term = { workspace = true }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.94.0" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.94.1" }
 
 anyhow = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-glob/Cargo.toml b/crates/nu-glob/Cargo.toml
index 164fff93a2..c6bfd7e493 100644
--- a/crates/nu-glob/Cargo.toml
+++ b/crates/nu-glob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-glob"
-version = "0.94.0"
+version = "0.94.1"
 authors = ["The Nushell Project Developers", "The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 description = """
diff --git a/crates/nu-json/Cargo.toml b/crates/nu-json/Cargo.toml
index e5561c1118..5a0806d7ca 100644
--- a/crates/nu-json/Cargo.toml
+++ b/crates/nu-json/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-json"
 edition = "2021"
 license = "MIT"
 name = "nu-json"
-version = "0.94.0"
+version = "0.94.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -23,5 +23,5 @@ serde = { workspace =  true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-# nu-path = { path="../nu-path", version = "0.94.0" }
+# nu-path = { path="../nu-path", version = "0.94.1" }
 # serde_json = "1.0"
\ No newline at end of file
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index a47da72e2d..92f468fdbd 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -3,14 +3,14 @@ authors = ["The Nushell Project Developers"]
 description = "Nushell's integrated LSP server"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-lsp"
 name = "nu-lsp"
-version = "0.94.0"
+version = "0.94.1"
 edition = "2021"
 license = "MIT"
 
 [dependencies]
-nu-cli = { path = "../nu-cli", version = "0.94.0" }
-nu-parser = { path = "../nu-parser", version = "0.94.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
+nu-cli = { path = "../nu-cli", version = "0.94.1" }
+nu-parser = { path = "../nu-parser", version = "0.94.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
 
 reedline = { workspace = true }
 
@@ -23,8 +23,8 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.0" }
-nu-command = { path = "../nu-command", version = "0.94.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.94.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.1" }
+nu-command = { path = "../nu-command", version = "0.94.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.94.1" }
 
 assert-json-diff = "2.0"
\ No newline at end of file
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index ea719ebdd4..feb379d091 100644
--- a/crates/nu-parser/Cargo.toml
+++ b/crates/nu-parser/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-parser"
 edition = "2021"
 license = "MIT"
 name = "nu-parser"
-version = "0.94.0"
+version = "0.94.1"
 exclude = ["/fuzz"]
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.94.0" }
-nu-path = { path = "../nu-path", version = "0.94.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.94.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
+nu-engine = { path = "../nu-engine", version = "0.94.1" }
+nu-path = { path = "../nu-path", version = "0.94.1" }
+nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.94.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
 
 bytesize = { workspace = true }
 chrono = { default-features = false, features = ['std'], workspace = true }
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index 1fc1f78ac4..1f3822089c 100644
--- a/crates/nu-path/Cargo.toml
+++ b/crates/nu-path/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-path"
 edition = "2021"
 license = "MIT"
 name = "nu-path"
-version = "0.94.0"
+version = "0.94.1"
 exclude = ["/fuzz"]
 
 [lib]
diff --git a/crates/nu-plugin-core/Cargo.toml b/crates/nu-plugin-core/Cargo.toml
index 7a2085ee90..4040095a2a 100644
--- a/crates/nu-plugin-core/Cargo.toml
+++ b/crates/nu-plugin-core/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-core
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-core"
-version = "0.94.0"
+version = "0.94.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.0", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.1", default-features = false }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true }
diff --git a/crates/nu-plugin-engine/Cargo.toml b/crates/nu-plugin-engine/Cargo.toml
index 40f482bd78..715c2b7f74 100644
--- a/crates/nu-plugin-engine/Cargo.toml
+++ b/crates/nu-plugin-engine/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-engi
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-engine"
-version = "0.94.0"
+version = "0.94.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.94.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
-nu-system = { path = "../nu-system", version = "0.94.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.0" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.94.0", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.94.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
+nu-system = { path = "../nu-system", version = "0.94.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.1" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.94.1", default-features = false }
 
 serde = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-plugin-protocol/Cargo.toml b/crates/nu-plugin-protocol/Cargo.toml
index 996e1ce8f2..8fe1c1102e 100644
--- a/crates/nu-plugin-protocol/Cargo.toml
+++ b/crates/nu-plugin-protocol/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-prot
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-protocol"
-version = "0.94.0"
+version = "0.94.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.94.0", features = ["plugin"] }
-nu-utils = { path = "../nu-utils", version = "0.94.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.1", features = ["plugin"] }
+nu-utils = { path = "../nu-utils", version = "0.94.1" }
 
 bincode = "1.3"
 serde = { workspace = true, features = ["derive"] }
diff --git a/crates/nu-plugin-test-support/Cargo.toml b/crates/nu-plugin-test-support/Cargo.toml
index 04f77ac7fa..32df904645 100644
--- a/crates/nu-plugin-test-support/Cargo.toml
+++ b/crates/nu-plugin-test-support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-plugin-test-support"
-version = "0.94.0"
+version = "0.94.1"
 edition = "2021"
 license = "MIT"
 description = "Testing support for Nushell plugins"
@@ -12,14 +12,14 @@ bench = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.94.0", features = ["plugin"] }
-nu-protocol = { path = "../nu-protocol", version = "0.94.0", features = ["plugin"] }
-nu-parser = { path = "../nu-parser", version = "0.94.0", features = ["plugin"] }
-nu-plugin = { path = "../nu-plugin", version = "0.94.0" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.94.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.94.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.0" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.0" }
+nu-engine = { path = "../nu-engine", version = "0.94.1", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.94.1", features = ["plugin"] }
+nu-parser = { path = "../nu-parser", version = "0.94.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.94.1" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.94.1" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.94.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.1" }
 nu-ansi-term = { workspace = true }
 similar = "2.5"
 
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index ff19f84273..150ab6666d 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin"
 edition = "2021"
 license = "MIT"
 name = "nu-plugin"
-version = "0.94.0"
+version = "0.94.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.94.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.0" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.94.0", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.94.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.1" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.94.1", default-features = false }
 
 log = { workspace = true }
 thiserror = "1.0"
diff --git a/crates/nu-pretty-hex/Cargo.toml b/crates/nu-pretty-hex/Cargo.toml
index 3849fc9495..639ceb0edd 100644
--- a/crates/nu-pretty-hex/Cargo.toml
+++ b/crates/nu-pretty-hex/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-pretty-hex"
 edition = "2021"
 license = "MIT"
 name = "nu-pretty-hex"
-version = "0.94.0"
+version = "0.94.1"
 
 [lib]
 doctest = false
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 5d81535d04..8b2870a378 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-protocol"
 edition = "2021"
 license = "MIT"
 name = "nu-protocol"
-version = "0.94.0"
+version = "0.94.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,9 +13,9 @@ version = "0.94.0"
 bench = false
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.94.0" }
-nu-path = { path = "../nu-path", version = "0.94.0" }
-nu-system = { path = "../nu-system", version = "0.94.0" }
+nu-utils = { path = "../nu-utils", version = "0.94.1" }
+nu-path = { path = "../nu-path", version = "0.94.1" }
+nu-system = { path = "../nu-system", version = "0.94.1" }
 
 brotli = { workspace = true, optional = true }
 byte-unit = { version = "5.1", features = [ "serde" ] }
@@ -45,7 +45,7 @@ plugin = [
 serde_json = { workspace = true }
 strum = "0.26"
 strum_macros = "0.26"
-nu-test-support = { path = "../nu-test-support", version = "0.94.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.94.1" }
 pretty_assertions = { workspace = true }
 rstest = { workspace = true }
 tempfile = { workspace = true }
diff --git a/crates/nu-std/Cargo.toml b/crates/nu-std/Cargo.toml
index 3f050b31e1..f5c6790c52 100644
--- a/crates/nu-std/Cargo.toml
+++ b/crates/nu-std/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-std"
 edition = "2021"
 license = "MIT"
 name = "nu-std"
-version = "0.94.0"
+version = "0.94.1"
 
 [dependencies]
-nu-parser = { version = "0.94.0", path = "../nu-parser" }
-nu-protocol = { version = "0.94.0", path = "../nu-protocol" }
-nu-engine = { version = "0.94.0", path = "../nu-engine" }
+nu-parser = { version = "0.94.1", path = "../nu-parser" }
+nu-protocol = { version = "0.94.1", path = "../nu-protocol" }
+nu-engine = { version = "0.94.1", path = "../nu-engine" }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
 
 log = "0.4"
\ No newline at end of file
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index e28c72ad53..33305d07bc 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["The Nushell Project Developers", "procs creators"]
 description = "Nushell system querying"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-system"
 name = "nu-system"
-version = "0.94.0"
+version = "0.94.1"
 edition = "2021"
 license = "MIT"
 
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index b2bed2b555..6fcb1ffce6 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -5,20 +5,20 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-table"
 edition = "2021"
 license = "MIT"
 name = "nu-table"
-version = "0.94.0"
+version = "0.94.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
-nu-utils = { path = "../nu-utils", version = "0.94.0" }
-nu-engine = { path = "../nu-engine", version = "0.94.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.94.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
+nu-utils = { path = "../nu-utils", version = "0.94.1" }
+nu-engine = { path = "../nu-engine", version = "0.94.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.94.1" }
 nu-ansi-term = { workspace = true }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 tabled = { workspace = true, features = ["color"], default-features = false }
 
 [dev-dependencies]
-# nu-test-support = { path="../nu-test-support", version = "0.94.0"  }
\ No newline at end of file
+# nu-test-support = { path="../nu-test-support", version = "0.94.1"  }
\ No newline at end of file
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index 14eefa0ed1..2570ce0d68 100644
--- a/crates/nu-term-grid/Cargo.toml
+++ b/crates/nu-term-grid/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-term-grid"
 edition = "2021"
 license = "MIT"
 name = "nu-term-grid"
-version = "0.94.0"
+version = "0.94.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.94.0" }
+nu-utils = { path = "../nu-utils", version = "0.94.1" }
 
 unicode-width = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml
index 8ca77631d1..e2525d8c78 100644
--- a/crates/nu-test-support/Cargo.toml
+++ b/crates/nu-test-support/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-test-suppor
 edition = "2021"
 license = "MIT"
 name = "nu-test-support"
-version = "0.94.0"
+version = "0.94.1"
 
 [lib]
 doctest = false
 bench = false
 
 [dependencies]
-nu-path = { path = "../nu-path", version = "0.94.0" }
-nu-glob = { path = "../nu-glob", version = "0.94.0" }
-nu-utils = { path = "../nu-utils", version = "0.94.0" }
+nu-path = { path = "../nu-path", version = "0.94.1" }
+nu-glob = { path = "../nu-glob", version = "0.94.1" }
+nu-utils = { path = "../nu-utils", version = "0.94.1" }
 
 num-format = { workspace = true }
 which = { workspace = true }
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index 681ee7d6f1..85b80015df 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-utils"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-utils"
-version = "0.94.0"
+version = "0.94.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index fd9a9642b0..357a1cc7d5 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -1,6 +1,6 @@
 # Nushell Config File
 #
-# version = "0.94.0"
+# version = "0.94.1"
 
 # For more information on defining custom themes, see
 # https://www.nushell.sh/book/coloring_and_theming.html
diff --git a/crates/nu-utils/src/sample_config/default_env.nu b/crates/nu-utils/src/sample_config/default_env.nu
index f68396eec5..90705230a9 100644
--- a/crates/nu-utils/src/sample_config/default_env.nu
+++ b/crates/nu-utils/src/sample_config/default_env.nu
@@ -1,6 +1,6 @@
 # Nushell Environment Config File
 #
-# version = "0.94.0"
+# version = "0.94.1"
 
 def create_left_prompt [] {
     let dir = match (do --ignore-shell-errors { $env.PWD | path relative-to $nu.home-path }) {
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index 5c9a2bb633..7cfbc0b578 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -10,10 +10,10 @@ name = "nu_plugin_custom_values"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.94.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.94.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.1", features = ["plugin"] }
 serde = { workspace = true, default-features = false }
 typetag = "0.2"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.0" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.1" }
\ No newline at end of file
diff --git a/crates/nu_plugin_example/Cargo.toml b/crates/nu_plugin_example/Cargo.toml
index 356af74386..0b4ec44e89 100644
--- a/crates/nu_plugin_example/Cargo.toml
+++ b/crates/nu_plugin_example/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_exam
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_example"
-version = "0.94.0"
+version = "0.94.1"
 
 [[bin]]
 name = "nu_plugin_example"
@@ -15,9 +15,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.94.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.94.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.1", features = ["plugin"] }
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.0" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.0" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.1" }
\ No newline at end of file
diff --git a/crates/nu_plugin_formats/Cargo.toml b/crates/nu_plugin_formats/Cargo.toml
index 55c47f33f5..213ea74cd5 100644
--- a/crates/nu_plugin_formats/Cargo.toml
+++ b/crates/nu_plugin_formats/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_form
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_formats"
-version = "0.94.0"
+version = "0.94.1"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.94.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.94.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.1", features = ["plugin"] }
 
 indexmap = { workspace = true }
 eml-parser = "0.1"
@@ -18,4 +18,4 @@ ical = "0.11"
 rust-ini = "0.21.0"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.0" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.1" }
\ No newline at end of file
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index c779ffd8c4..7c0ca79ebe 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gsta
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_gstat"
-version = "0.94.0"
+version = "0.94.1"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_gstat"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.94.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
+nu-plugin = { path = "../nu-plugin", version = "0.94.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
 
 git2 = "0.18"
\ No newline at end of file
diff --git a/crates/nu_plugin_inc/Cargo.toml b/crates/nu_plugin_inc/Cargo.toml
index 1c12343598..543982d599 100644
--- a/crates/nu_plugin_inc/Cargo.toml
+++ b/crates/nu_plugin_inc/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_inc"
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_inc"
-version = "0.94.0"
+version = "0.94.1"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_inc"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.94.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.94.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.1", features = ["plugin"] }
 
 semver = "1.0"
\ No newline at end of file
diff --git a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
index 74da32809f..d900f498da 100755
--- a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
+++ b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
@@ -6,7 +6,7 @@
 # it also allows us to test the plugin interface with something manually implemented in a scripting
 # language without adding any extra dependencies to our tests.
 
-const NUSHELL_VERSION = "0.94.0"
+const NUSHELL_VERSION = "0.94.1"
 
 def main [--stdio] {
   if ($stdio) {
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index dced0b4b85..f93e183926 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu_plugin_polars"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_polars"
-version = "0.94.0"
+version = "0.94.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -17,9 +17,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
-nu-plugin = { path = "../nu-plugin", version = "0.94.0" }
-nu-path = { path = "../nu-path", version = "0.94.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.94.1" }
+nu-path = { path = "../nu-path", version = "0.94.1" }
 
 # Potential dependencies for extras
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
@@ -73,9 +73,9 @@ optional = false
 version = "0.39"
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.0" }
-nu-engine = { path = "../nu-engine", version = "0.94.0" }
-nu-parser = { path = "../nu-parser", version = "0.94.0" }
-nu-command = { path = "../nu-command", version = "0.94.0" }
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.1" }
+nu-engine = { path = "../nu-engine", version = "0.94.1" }
+nu-parser = { path = "../nu-parser", version = "0.94.1" }
+nu-command = { path = "../nu-command", version = "0.94.1" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.1" }
 tempfile.workspace = true
\ No newline at end of file
diff --git a/crates/nu_plugin_python/nu_plugin_python_example.py b/crates/nu_plugin_python/nu_plugin_python_example.py
index ff777b3d64..55746d89c1 100755
--- a/crates/nu_plugin_python/nu_plugin_python_example.py
+++ b/crates/nu_plugin_python/nu_plugin_python_example.py
@@ -27,7 +27,7 @@ import sys
 import json
 
 
-NUSHELL_VERSION = "0.94.0"
+NUSHELL_VERSION = "0.94.1"
 
 
 def signatures():
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index 52d2c9fd91..b48ca14fa5 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_quer
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_query"
-version = "0.94.0"
+version = "0.94.1"
 
 [lib]
 doctest = false
@@ -16,8 +16,8 @@ name = "nu_plugin_query"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.94.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
+nu-plugin = { path = "../nu-plugin", version = "0.94.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
 
 gjson = "0.8"
 scraper = { default-features = false, version = "0.19" }
diff --git a/crates/nu_plugin_stress_internals/Cargo.toml b/crates/nu_plugin_stress_internals/Cargo.toml
index a374263f51..159e0b616c 100644
--- a/crates/nu_plugin_stress_internals/Cargo.toml
+++ b/crates/nu_plugin_stress_internals/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_stre
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_stress_internals"
-version = "0.94.0"
+version = "0.94.1"
 
 [[bin]]
 name = "nu_plugin_stress_internals"
diff --git a/crates/nuon/Cargo.toml b/crates/nuon/Cargo.toml
index ef58fd761e..69e7d89713 100644
--- a/crates/nuon/Cargo.toml
+++ b/crates/nuon/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nuon"
 edition = "2021"
 license = "MIT"
 name = "nuon"
-version = "0.94.0"
+version = "0.94.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-parser = { path = "../nu-parser", version = "0.94.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.0" }
-nu-engine = { path = "../nu-engine", version = "0.94.0" }
+nu-parser = { path = "../nu-parser", version = "0.94.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
+nu-engine = { path = "../nu-engine", version = "0.94.1" }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 

From 6a2996251ceaf97ea30d74f0161ee08d29602ebe Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Wed, 29 May 2024 18:06:47 -0500
Subject: [PATCH 0046/1072] fixes a bug in OSC9;9 execution (#12994)

# Description

This fixes a bug in the `OSC 9;9` functionality where the path wasn't
being constructed properly and therefore wasn't getting set right for
things like "Duplicate Tab" in Windows Terminal. Thanks to @Araxeus for
finding it.

Related to https://github.com/nushell/nushell/issues/10166

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-cli/src/repl.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 29c2f62734..d9aef32bbb 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -1110,9 +1110,9 @@ fn run_shell_integration_osc9_9(engine_state: &EngineState, stack: &mut Stack, u
         let start_time = Instant::now();
 
         // Otherwise, communicate the path as OSC 9;9 from ConEmu (often used for spawning new tabs in the same dir)
+        // This is helpful in Windows Terminal with Duplicate Tab
         run_ansi_sequence(&format!(
-            "\x1b]9;9;{}{}\x1b\\",
-            if path.starts_with('/') { "" } else { "/" },
+            "\x1b]9;9;{}\x1b\\",
             percent_encoding::utf8_percent_encode(&path, percent_encoding::CONTROLS)
         ));
 

From 0e1553026e69adec2207d259d8513764deb5f87c Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Wed, 29 May 2024 18:48:29 -0700
Subject: [PATCH 0047/1072] Restore tilde expansion on external command names
 (#13001)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

Fix a regression introduced by #12921, where tilde expansion was no
longer done on the external command name, breaking things like

```nushell
> ~/.cargo/bin/exa
```

This properly handles quoted strings, so they don't expand:

```nushell
> ^"~/.cargo/bin/exa"
Error: nu::shell::external_command

  × External command failed
   ╭─[entry #1:1:2]
 1 │ ^"~/.cargo/bin/exa"
   ·  ─────────┬────────
   ·           ╰── Command `~/.cargo/bin/exa` not found
   ╰────
  help: `~/.cargo/bin/exa` is neither a Nushell built-in or a known external command

```

This required a change to the parser, so the command name is also parsed
in the same way the arguments are - i.e. the quotes on the outside
remain in the expression. Hopefully that doesn't break anything else. 🤞

Fixes #13000. Should include in patch release 0.94.1

cc @YizhePKU

# User-Facing Changes
- Tilde expansion now works again for external commands
- The `command` of `run-external` will now have its quotes removed like
the other arguments if it is a literal string
- The parser is changed to include quotes in the command expression of
`ExternalCall` if they were present

# Tests + Formatting
I would like to add a regression test for this, but it's complicated
because we need a well-known binary within the home directory, which
just isn't a thing. We could drop one there, but that's kind of a bad
behavior for a test to do. I also considered changing the home directory
for the test, but that's so platform-specific - potentially could get it
working on specific platforms though. Changing `HOME` env on Linux
definitely works as far as tilde expansion works.

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
---
 crates/nu-command/src/system/run_external.rs | 25 ++++++++++++++++++--
 crates/nu-parser/src/parser.rs               |  5 ++--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index 8531217d4b..69c4a319bb 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -46,15 +46,36 @@ impl Command for External {
     ) -> Result<PipelineData, ShellError> {
         let cwd = engine_state.cwd(Some(stack))?;
 
+        // Evaluate the command name in the same way the arguments are evaluated. Since this isn't
+        // a spread, it should return a one-element vec.
+        let name_expr = call
+            .positional_nth(0)
+            .ok_or_else(|| ShellError::MissingParameter {
+                param_name: "command".into(),
+                span: call.head,
+            })?;
+        let name = eval_argument(engine_state, stack, name_expr, false)?
+            .pop()
+            .expect("eval_argument returned zero-element vec")
+            .into_spanned(name_expr.span);
+
         // Find the absolute path to the executable. On Windows, set the
         // executable to "cmd.exe" if it's is a CMD internal command. If the
         // command is not found, display a helpful error message.
-        let name: Spanned<String> = call.req(engine_state, stack, 0)?;
         let executable = if cfg!(windows) && is_cmd_internal_command(&name.item) {
             PathBuf::from("cmd.exe")
         } else {
+            // Expand tilde on the name if it's a bare string (#13000)
+            let expanded_name = if is_bare_string(name_expr) {
+                expand_tilde(&name.item)
+            } else {
+                name.item.clone()
+            };
+
+            // Determine the PATH to be used and then use `which` to find it - though this has no
+            // effect if it's an absolute path already
             let paths = nu_engine::env::path_str(engine_state, stack, call.head)?;
-            let Some(executable) = which(&name.item, &paths, &cwd) else {
+            let Some(executable) = which(&expanded_name, &paths, &cwd) else {
                 return Err(command_not_found(
                     &name.item,
                     call.head,
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 61a4261d8d..ad5e7d4f42 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -278,13 +278,14 @@ pub fn parse_external_call(working_set: &mut StateWorkingSet, spans: &[Span]) ->
         let arg = parse_expression(working_set, &[head_span]);
         Box::new(arg)
     } else {
-        let (contents, err) = unescape_unquote_string(&head_contents, head_span);
+        // Eval stage will unquote the string, so we don't bother with that here
+        let (contents, err) = unescape_string(&head_contents, head_span);
         if let Some(err) = err {
             working_set.error(err)
         }
 
         Box::new(Expression {
-            expr: Expr::String(contents),
+            expr: Expr::String(String::from_utf8_lossy(&contents).into_owned()),
             span: head_span,
             ty: Type::String,
             custom_completion: None,

From 40772fea15a31dddfa721be871af2185a99a1947 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Thu, 30 May 2024 21:29:46 +0800
Subject: [PATCH 0048/1072] fix do closure with both required, options, and
 rest args (#13002)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
Fixes: #12985

`val_iter` has already handle required positional and optional
positional arguments, it not skip them again while handling rest
arguments.

# User-Facing Changes
Makes `do {|a, ...b| echo $a ...$b} 1 2 3 4` output the following again:
```nushell
╭───┬───╮
│ 0 │ 1 │
│ 1 │ 2 │
│ 2 │ 3 │
│ 3 │ 4 │
╰───┴───╯
```

# Tests + Formatting
Added some test cases
---
 crates/nu-cmd-lang/src/core_commands/do_.rs | 4 +---
 tests/shell/pipeline/commands/internal.rs   | 9 +++++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/crates/nu-cmd-lang/src/core_commands/do_.rs b/crates/nu-cmd-lang/src/core_commands/do_.rs
index 5f14e88c07..8ca3fbac56 100644
--- a/crates/nu-cmd-lang/src/core_commands/do_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/do_.rs
@@ -298,9 +298,7 @@ fn bind_args_to(
     if let Some(rest_positional) = &signature.rest_positional {
         let mut rest_items = vec![];
 
-        for result in
-            val_iter.skip(signature.required_positional.len() + signature.optional_positional.len())
-        {
+        for result in val_iter {
             rest_items.push(result);
         }
 
diff --git a/tests/shell/pipeline/commands/internal.rs b/tests/shell/pipeline/commands/internal.rs
index 67d4ee31a9..98f3fb88c9 100644
--- a/tests/shell/pipeline/commands/internal.rs
+++ b/tests/shell/pipeline/commands/internal.rs
@@ -539,6 +539,15 @@ fn dynamic_closure_optional_arg() {
 fn dynamic_closure_rest_args() {
     let actual = nu!(r#"let closure = {|...args| $args | str join ""}; do $closure 1 2 3"#);
     assert_eq!(actual.out, "123");
+
+    let actual = nu!(
+        r#"let closure = {|required, ...args| $"($required), ($args | str join "")"}; do $closure 1 2 3"#
+    );
+    assert_eq!(actual.out, "1, 23");
+    let actual = nu!(
+        r#"let closure = {|required, optional?, ...args| $"($required), ($optional), ($args | str join "")"}; do $closure 1 2 3"#
+    );
+    assert_eq!(actual.out, "1, 2, 3");
 }
 
 #[cfg(feature = "which-support")]

From 31f3d2f6642b585f0d88192724723bf0ce330ecf Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Thu, 30 May 2024 13:42:22 +0000
Subject: [PATCH 0049/1072] Restore `path type` behavior (#13006)

# Description
Restores `path type` to return an empty string on error like it did pre
0.94.0.
---
 crates/nu-command/src/path/type.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/crates/nu-command/src/path/type.rs b/crates/nu-command/src/path/type.rs
index e048679220..0897593109 100644
--- a/crates/nu-command/src/path/type.rs
+++ b/crates/nu-command/src/path/type.rs
@@ -104,10 +104,9 @@ If nothing is found, an empty string will be returned."#
 
 fn path_type(path: &Path, span: Span, args: &Arguments) -> Value {
     let path = nu_path::expand_path_with(path, &args.pwd, true);
-    match std::fs::symlink_metadata(path) {
-        Ok(metadata) => Value::string(get_file_type(&metadata), span),
-        Err(err) => Value::error(err.into(), span),
-    }
+    let meta = path.symlink_metadata();
+    let ty = meta.as_ref().map(get_file_type).unwrap_or("");
+    Value::string(ty, span)
 }
 
 fn get_file_type(md: &std::fs::Metadata) -> &str {

From f3cf693ec701ab3086f984a8aeadfc9b50fadd90 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Thu, 30 May 2024 19:24:48 +0000
Subject: [PATCH 0050/1072] Disallow more characters in arguments for internal
 `cmd` commands (#13009)

# Description
Makes `run-external` error if arguments to `cmd.exe` internal commands
contain newlines or a percent sign. This is because the percent sign can
expand environment variables, potentially? allowing command injection.
Newlines I think will truncate the rest of the arguments and should
probably be disallowed to be safe.

# After Submitting
- If the user calls `cmd.exe` directly, then this bypasses our
handling/checking for internal `cmd` commands. Instead, we use the
handling from the Rust std lib which, in this case, does not do special
handling and is potentially unsafe. Then again, it could be the user's
specific intention to run `cmd` with whatever trusted input. The problem
is that since we use the std lib handling, it assumes the exe uses the C
runtime escaping rules and will perform some unwanted escaping. E.g., it
will add backslashes to the quotes in `cmd echo /c '""'`.
- If `cmd` is called indirectly via a `.bat` or `.cmd` file, then we use
the Rust std lib which has separate handling for bat files that should
be safe, but will reject some inputs.
- ~~I'm not sure how we handle `PATHEXT`, that can also cause a file
without an extension to be run as a bat file. If so, I don't know where
the handling, if any, is done for that.~~ It looks like we use the
`which` crate to do the lookup using `PATHEXT`. Then, we pass the exe
path from that to the Rust std lib `Command`, which should be safe
(except for the first `cmd.exe` note).

So, in the future we need to unify and/or fix these different
implementations, including our own special handling for internal `cmd`
commands that this PR tries to fix.
---
 crates/nu-command/src/system/run_external.rs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index 69c4a319bb..a200ce75de 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -565,12 +565,20 @@ fn has_cmd_special_character(s: &str) -> bool {
     SPECIAL_CHARS.iter().any(|c| s.contains(*c))
 }
 
-/// Escape an argument for CMD internal commands. The result can be safely
-/// passed to `raw_arg()`.
+/// Escape an argument for CMD internal commands. The result can be safely passed to `raw_arg()`.
 #[cfg(windows)]
 fn escape_cmd_argument(arg: &Spanned<String>) -> Result<Cow<'_, str>, ShellError> {
     let Spanned { item: arg, span } = arg;
-    if arg.contains('"') {
+    if arg.contains(['\r', '\n', '%']) {
+        // \r and \n trunacte the rest of the arguments and % can expand environment variables
+        Err(ShellError::ExternalCommand {
+            label:
+                "Arguments to CMD internal commands cannot contain new lines or percent signs '%'"
+                    .into(),
+            help: "some characters currently cannot be securely escaped".into(),
+            span: *span,
+        })
+    } else if arg.contains('"') {
         // If `arg` is already quoted by double quotes, confirm there's no
         // embedded double quotes, then leave it as is.
         if arg.chars().filter(|c| *c == '"').count() == 2
@@ -582,7 +590,7 @@ fn escape_cmd_argument(arg: &Spanned<String>) -> Result<Cow<'_, str>, ShellError
             Err(ShellError::ExternalCommand {
                 label: "Arguments to CMD internal commands cannot contain embedded double quotes"
                     .into(),
-                help: "CMD doesn't support escaping double quotes inside double quotes".into(),
+                help: "this case currently cannot be securely handled".into(),
                 span: *span,
             })
         }
@@ -590,6 +598,7 @@ fn escape_cmd_argument(arg: &Spanned<String>) -> Result<Cow<'_, str>, ShellError
         // If `arg` contains space or special characters, quote the entire argument by double quotes.
         Ok(Cow::Owned(format!("\"{arg}\"")))
     } else {
+        // FIXME?: what if `arg.is_empty()`?
         Ok(Cow::Borrowed(arg))
     }
 }

From 6635b74d9d8d71ae6813a1bfaa3b977f792723a4 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Mon, 3 Jun 2024 00:28:35 -0700
Subject: [PATCH 0051/1072] Bump version to `0.94.2` (#13014)

Version bump after 0.94.1 patch release.
---
 Cargo.lock                                    | 72 +++++++++----------
 Cargo.toml                                    | 40 +++++------
 crates/nu-cli/Cargo.toml                      | 24 +++----
 crates/nu-cmd-base/Cargo.toml                 | 10 +--
 crates/nu-cmd-extra/Cargo.toml                | 22 +++---
 crates/nu-cmd-lang/Cargo.toml                 | 10 +--
 crates/nu-cmd-plugin/Cargo.toml               | 10 +--
 crates/nu-color-config/Cargo.toml             | 10 +--
 crates/nu-command/Cargo.toml                  | 34 ++++-----
 crates/nu-engine/Cargo.toml                   | 10 +--
 crates/nu-explore/Cargo.toml                  | 18 ++---
 crates/nu-glob/Cargo.toml                     |  2 +-
 crates/nu-json/Cargo.toml                     |  4 +-
 crates/nu-lsp/Cargo.toml                      | 14 ++--
 crates/nu-parser/Cargo.toml                   | 10 +--
 crates/nu-path/Cargo.toml                     |  2 +-
 crates/nu-plugin-core/Cargo.toml              |  6 +-
 crates/nu-plugin-engine/Cargo.toml            | 12 ++--
 crates/nu-plugin-protocol/Cargo.toml          |  6 +-
 crates/nu-plugin-test-support/Cargo.toml      | 18 ++---
 crates/nu-plugin/Cargo.toml                   | 10 +--
 crates/nu-pretty-hex/Cargo.toml               |  2 +-
 crates/nu-protocol/Cargo.toml                 | 10 +--
 crates/nu-std/Cargo.toml                      |  8 +--
 crates/nu-system/Cargo.toml                   |  2 +-
 crates/nu-table/Cargo.toml                    | 12 ++--
 crates/nu-term-grid/Cargo.toml                |  4 +-
 crates/nu-test-support/Cargo.toml             |  8 +--
 crates/nu-utils/Cargo.toml                    |  2 +-
 .../src/sample_config/default_config.nu       |  2 +-
 .../nu-utils/src/sample_config/default_env.nu |  2 +-
 crates/nu_plugin_custom_values/Cargo.toml     |  6 +-
 crates/nu_plugin_example/Cargo.toml           | 10 +--
 crates/nu_plugin_formats/Cargo.toml           |  8 +--
 crates/nu_plugin_gstat/Cargo.toml             |  6 +-
 crates/nu_plugin_inc/Cargo.toml               |  6 +-
 .../nu_plugin_nu_example.nu                   |  2 +-
 crates/nu_plugin_polars/Cargo.toml            | 18 ++---
 .../nu_plugin_python_example.py               |  2 +-
 crates/nu_plugin_query/Cargo.toml             |  6 +-
 crates/nu_plugin_stress_internals/Cargo.toml  |  2 +-
 crates/nuon/Cargo.toml                        |  8 +--
 42 files changed, 235 insertions(+), 235 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2d339ec7da..23cafeefda 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2770,7 +2770,7 @@ dependencies = [
 
 [[package]]
 name = "nu"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "assert_cmd",
  "crossterm",
@@ -2823,7 +2823,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cli"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "chrono",
  "crossterm",
@@ -2858,7 +2858,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-base"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "indexmap",
  "miette",
@@ -2870,7 +2870,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-extra"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "fancy-regex",
  "heck 0.5.0",
@@ -2895,7 +2895,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-lang"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "itertools 0.12.1",
  "nu-engine",
@@ -2907,7 +2907,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-plugin"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "itertools 0.12.1",
  "nu-engine",
@@ -2918,7 +2918,7 @@ dependencies = [
 
 [[package]]
 name = "nu-color-config"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "nu-ansi-term",
  "nu-engine",
@@ -2930,7 +2930,7 @@ dependencies = [
 
 [[package]]
 name = "nu-command"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "alphanumeric-sort",
  "base64 0.22.1",
@@ -3039,7 +3039,7 @@ dependencies = [
 
 [[package]]
 name = "nu-engine"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -3049,7 +3049,7 @@ dependencies = [
 
 [[package]]
 name = "nu-explore"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "ansi-str",
  "anyhow",
@@ -3074,14 +3074,14 @@ dependencies = [
 
 [[package]]
 name = "nu-glob"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "doc-comment",
 ]
 
 [[package]]
 name = "nu-json"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "linked-hash-map",
  "num-traits",
@@ -3091,7 +3091,7 @@ dependencies = [
 
 [[package]]
 name = "nu-lsp"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "assert-json-diff",
  "crossbeam-channel",
@@ -3112,7 +3112,7 @@ dependencies = [
 
 [[package]]
 name = "nu-parser"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "bytesize",
  "chrono",
@@ -3128,7 +3128,7 @@ dependencies = [
 
 [[package]]
 name = "nu-path"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "dirs-next",
  "omnipath",
@@ -3137,7 +3137,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "log",
  "nix",
@@ -3152,7 +3152,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-core"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "interprocess",
  "log",
@@ -3166,7 +3166,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-engine"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "log",
  "nu-engine",
@@ -3181,7 +3181,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-protocol"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "bincode",
  "nu-protocol",
@@ -3193,7 +3193,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-test-support"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "nu-ansi-term",
  "nu-cmd-lang",
@@ -3211,7 +3211,7 @@ dependencies = [
 
 [[package]]
 name = "nu-pretty-hex"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "heapless",
  "nu-ansi-term",
@@ -3220,7 +3220,7 @@ dependencies = [
 
 [[package]]
 name = "nu-protocol"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "brotli 5.0.0",
  "byte-unit",
@@ -3251,7 +3251,7 @@ dependencies = [
 
 [[package]]
 name = "nu-std"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "log",
  "miette",
@@ -3262,7 +3262,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "chrono",
  "itertools 0.12.1",
@@ -3280,7 +3280,7 @@ dependencies = [
 
 [[package]]
 name = "nu-table"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "fancy-regex",
  "nu-ansi-term",
@@ -3294,7 +3294,7 @@ dependencies = [
 
 [[package]]
 name = "nu-term-grid"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "nu-utils",
  "unicode-width",
@@ -3302,7 +3302,7 @@ dependencies = [
 
 [[package]]
 name = "nu-test-support"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -3314,7 +3314,7 @@ dependencies = [
 
 [[package]]
 name = "nu-utils"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "crossterm_winapi",
  "log",
@@ -3340,7 +3340,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_example"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "nu-cmd-lang",
  "nu-plugin",
@@ -3350,7 +3350,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_formats"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "eml-parser",
  "ical",
@@ -3363,7 +3363,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_gstat"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "git2",
  "nu-plugin",
@@ -3372,7 +3372,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_inc"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -3381,7 +3381,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_polars"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "chrono",
  "chrono-tz 0.9.0",
@@ -3412,7 +3412,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_query"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "gjson",
  "nu-plugin",
@@ -3424,7 +3424,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_stress_internals"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "interprocess",
  "serde",
@@ -3550,7 +3550,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "nuon"
-version = "0.94.1"
+version = "0.94.2"
 dependencies = [
  "chrono",
  "fancy-regex",
diff --git a/Cargo.toml b/Cargo.toml
index a8576baa95..ce9157efb4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
 rust-version = "1.77.2"
-version = "0.94.1"
+version = "0.94.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -174,22 +174,22 @@ windows = "0.54"
 winreg = "0.52"
 
 [dependencies]
-nu-cli = { path = "./crates/nu-cli", version = "0.94.1" }
-nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.94.1" }
-nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.94.1" }
-nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.94.1", optional = true }
-nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.94.1" }
-nu-command = { path = "./crates/nu-command", version = "0.94.1" }
-nu-engine = { path = "./crates/nu-engine", version = "0.94.1" }
-nu-explore = { path = "./crates/nu-explore", version = "0.94.1" }
-nu-lsp = { path = "./crates/nu-lsp/", version = "0.94.1" }
-nu-parser = { path = "./crates/nu-parser", version = "0.94.1" }
-nu-path = { path = "./crates/nu-path", version = "0.94.1" }
-nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.94.1" }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.94.1" }
-nu-std = { path = "./crates/nu-std", version = "0.94.1" }
-nu-system = { path = "./crates/nu-system", version = "0.94.1" }
-nu-utils = { path = "./crates/nu-utils", version = "0.94.1" }
+nu-cli = { path = "./crates/nu-cli", version = "0.94.2" }
+nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.94.2" }
+nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.94.2" }
+nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.94.2", optional = true }
+nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.94.2" }
+nu-command = { path = "./crates/nu-command", version = "0.94.2" }
+nu-engine = { path = "./crates/nu-engine", version = "0.94.2" }
+nu-explore = { path = "./crates/nu-explore", version = "0.94.2" }
+nu-lsp = { path = "./crates/nu-lsp/", version = "0.94.2" }
+nu-parser = { path = "./crates/nu-parser", version = "0.94.2" }
+nu-path = { path = "./crates/nu-path", version = "0.94.2" }
+nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.94.2" }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.94.2" }
+nu-std = { path = "./crates/nu-std", version = "0.94.2" }
+nu-system = { path = "./crates/nu-system", version = "0.94.2" }
+nu-utils = { path = "./crates/nu-utils", version = "0.94.2" }
 
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
@@ -218,9 +218,9 @@ nix = { workspace = true, default-features = false, features = [
 ] }
 
 [dev-dependencies]
-nu-test-support = { path = "./crates/nu-test-support", version = "0.94.1" }
-nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.94.1" }
-nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.94.1" }
+nu-test-support = { path = "./crates/nu-test-support", version = "0.94.2" }
+nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.94.2" }
+nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.94.2" }
 assert_cmd = "2.0"
 dirs-next = { workspace = true }
 tango-bench = "0.5"
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 516afd9f0b..0d82fa4aae 100644
--- 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.94.1"
+version = "0.94.2"
 
 [lib]
 bench = false
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.1" }
-nu-command = { path = "../nu-command", version = "0.94.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.94.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.2" }
+nu-command = { path = "../nu-command", version = "0.94.2" }
+nu-test-support = { path = "../nu-test-support", version = "0.94.2" }
 rstest = { workspace = true, default-features = false }
 tempfile = { workspace = true }
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.94.1" }
-nu-engine = { path = "../nu-engine", version = "0.94.1" }
-nu-path = { path = "../nu-path", version = "0.94.1" }
-nu-parser = { path = "../nu-parser", version = "0.94.1" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.94.1", optional = true }
-nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
-nu-utils = { path = "../nu-utils", version = "0.94.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.94.1" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.94.2" }
+nu-engine = { path = "../nu-engine", version = "0.94.2" }
+nu-path = { path = "../nu-path", version = "0.94.2" }
+nu-parser = { path = "../nu-parser", version = "0.94.2" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.94.2", optional = true }
+nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
+nu-utils = { path = "../nu-utils", version = "0.94.2" }
+nu-color-config = { path = "../nu-color-config", version = "0.94.2" }
 nu-ansi-term = { workspace = true }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
diff --git a/crates/nu-cmd-base/Cargo.toml b/crates/nu-cmd-base/Cargo.toml
index 1dcd95ba94..858ff55e2d 100644
--- 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.94.1"
+version = "0.94.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.94.1" }
-nu-parser = { path = "../nu-parser", version = "0.94.1" }
-nu-path = { path = "../nu-path", version = "0.94.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
+nu-engine = { path = "../nu-engine", version = "0.94.2" }
+nu-parser = { path = "../nu-parser", version = "0.94.2" }
+nu-path = { path = "../nu-path", version = "0.94.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
 
 indexmap = { workspace = true }
 miette = { workspace = true }
diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml
index 9e6270163d..b03c7911ed 100644
--- 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.94.1"
+version = "0.94.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,13 +13,13 @@ version = "0.94.1"
 bench = false
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.94.1" }
-nu-engine = { path = "../nu-engine", version = "0.94.1" }
-nu-json = { version = "0.94.1", path = "../nu-json" }
-nu-parser = { path = "../nu-parser", version = "0.94.1" }
-nu-pretty-hex = { version = "0.94.1", path = "../nu-pretty-hex" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
-nu-utils = { path = "../nu-utils", version = "0.94.1" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.94.2" }
+nu-engine = { path = "../nu-engine", version = "0.94.2" }
+nu-json = { version = "0.94.2", path = "../nu-json" }
+nu-parser = { path = "../nu-parser", version = "0.94.2" }
+nu-pretty-hex = { version = "0.94.2", path = "../nu-pretty-hex" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
+nu-utils = { path = "../nu-utils", version = "0.94.2" }
 
 # Potential dependencies for extras
 heck = { workspace = true }
@@ -37,6 +37,6 @@ extra = ["default"]
 default = []
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.1" }
-nu-command = { path = "../nu-command", version = "0.94.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.94.1" }
\ No newline at end of file
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.2" }
+nu-command = { path = "../nu-command", version = "0.94.2" }
+nu-test-support = { path = "../nu-test-support", version = "0.94.2" }
\ No newline at end of file
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index f7b43521d1..ad94c331d8 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -6,16 +6,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-lang"
 edition = "2021"
 license = "MIT"
 name = "nu-cmd-lang"
-version = "0.94.1"
+version = "0.94.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.94.1" }
-nu-parser = { path = "../nu-parser", version = "0.94.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
-nu-utils = { path = "../nu-utils", version = "0.94.1" }
+nu-engine = { path = "../nu-engine", version = "0.94.2" }
+nu-parser = { path = "../nu-parser", version = "0.94.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
+nu-utils = { path = "../nu-utils", version = "0.94.2" }
 
 itertools = { workspace = true }
 shadow-rs = { version = "0.28", default-features = false }
diff --git a/crates/nu-cmd-plugin/Cargo.toml b/crates/nu-cmd-plugin/Cargo.toml
index f461f6bf04..62ed6851b5 100644
--- a/crates/nu-cmd-plugin/Cargo.toml
+++ b/crates/nu-cmd-plugin/Cargo.toml
@@ -5,15 +5,15 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-plugin"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-plugin"
-version = "0.94.1"
+version = "0.94.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.94.1" }
-nu-path = { path = "../nu-path", version = "0.94.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.1", features = ["plugin"] }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.94.1" }
+nu-engine = { path = "../nu-engine", version = "0.94.2" }
+nu-path = { path = "../nu-path", version = "0.94.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.2", features = ["plugin"] }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.94.2" }
 
 itertools = { workspace = true }
 
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index 34f0ded963..6268acf6f6 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -5,18 +5,18 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-color-confi
 edition = "2021"
 license = "MIT"
 name = "nu-color-config"
-version = "0.94.1"
+version = "0.94.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
-nu-engine = { path = "../nu-engine", version = "0.94.1" }
-nu-json = { path = "../nu-json", version = "0.94.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
+nu-engine = { path = "../nu-engine", version = "0.94.2" }
+nu-json = { path = "../nu-json", version = "0.94.2" }
 nu-ansi-term = { workspace = true }
 
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.94.1" }
\ No newline at end of file
+nu-test-support = { path = "../nu-test-support", version = "0.94.2" }
\ No newline at end of file
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 25665cfc33..1a88a24e5e 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-command"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
-version = "0.94.1"
+version = "0.94.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,21 +13,21 @@ version = "0.94.1"
 bench = false
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.94.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.94.1" }
-nu-engine = { path = "../nu-engine", version = "0.94.1" }
-nu-glob = { path = "../nu-glob", version = "0.94.1" }
-nu-json = { path = "../nu-json", version = "0.94.1" }
-nu-parser = { path = "../nu-parser", version = "0.94.1" }
-nu-path = { path = "../nu-path", version = "0.94.1" }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.94.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
-nu-system = { path = "../nu-system", version = "0.94.1" }
-nu-table = { path = "../nu-table", version = "0.94.1" }
-nu-term-grid = { path = "../nu-term-grid", version = "0.94.1" }
-nu-utils = { path = "../nu-utils", version = "0.94.1" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.94.2" }
+nu-color-config = { path = "../nu-color-config", version = "0.94.2" }
+nu-engine = { path = "../nu-engine", version = "0.94.2" }
+nu-glob = { path = "../nu-glob", version = "0.94.2" }
+nu-json = { path = "../nu-json", version = "0.94.2" }
+nu-parser = { path = "../nu-parser", version = "0.94.2" }
+nu-path = { path = "../nu-path", version = "0.94.2" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.94.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
+nu-system = { path = "../nu-system", version = "0.94.2" }
+nu-table = { path = "../nu-table", version = "0.94.2" }
+nu-term-grid = { path = "../nu-term-grid", version = "0.94.2" }
+nu-utils = { path = "../nu-utils", version = "0.94.2" }
 nu-ansi-term = { workspace = true }
-nuon = { path = "../nuon", version = "0.94.1" }
+nuon = { path = "../nuon", version = "0.94.2" }
 
 alphanumeric-sort = { workspace = true }
 base64 = { workspace = true }
@@ -137,8 +137,8 @@ trash-support = ["trash"]
 which-support = []
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.94.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.2" }
+nu-test-support = { path = "../nu-test-support", version = "0.94.2" }
 
 dirs-next = { workspace = true }
 mockito = { workspace = true, default-features = false }
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index 7bf5ffe9d5..d8a90fb70e 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-engine"
 edition = "2021"
 license = "MIT"
 name = "nu-engine"
-version = "0.94.1"
+version = "0.94.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.94.1" }
-nu-path = { path = "../nu-path", version = "0.94.1" }
-nu-glob = { path = "../nu-glob", version = "0.94.1" }
-nu-utils = { path = "../nu-utils", version = "0.94.1" }
+nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.94.2" }
+nu-path = { path = "../nu-path", version = "0.94.2" }
+nu-glob = { path = "../nu-glob", version = "0.94.2" }
+nu-utils = { path = "../nu-utils", version = "0.94.2" }
 
 [features]
 plugin = []
\ No newline at end of file
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index 006e301859..0837d9d683 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -5,21 +5,21 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-explore"
 edition = "2021"
 license = "MIT"
 name = "nu-explore"
-version = "0.94.1"
+version = "0.94.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
-nu-parser = { path = "../nu-parser", version = "0.94.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.94.1" }
-nu-engine = { path = "../nu-engine", version = "0.94.1" }
-nu-table = { path = "../nu-table", version = "0.94.1" }
-nu-json = { path = "../nu-json", version = "0.94.1" }
-nu-utils = { path = "../nu-utils", version = "0.94.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
+nu-parser = { path = "../nu-parser", version = "0.94.2" }
+nu-color-config = { path = "../nu-color-config", version = "0.94.2" }
+nu-engine = { path = "../nu-engine", version = "0.94.2" }
+nu-table = { path = "../nu-table", version = "0.94.2" }
+nu-json = { path = "../nu-json", version = "0.94.2" }
+nu-utils = { path = "../nu-utils", version = "0.94.2" }
 nu-ansi-term = { workspace = true }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.94.1" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.94.2" }
 
 anyhow = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-glob/Cargo.toml b/crates/nu-glob/Cargo.toml
index c6bfd7e493..d7568f7b2d 100644
--- a/crates/nu-glob/Cargo.toml
+++ b/crates/nu-glob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-glob"
-version = "0.94.1"
+version = "0.94.2"
 authors = ["The Nushell Project Developers", "The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 description = """
diff --git a/crates/nu-json/Cargo.toml b/crates/nu-json/Cargo.toml
index 5a0806d7ca..63a80f4b91 100644
--- a/crates/nu-json/Cargo.toml
+++ b/crates/nu-json/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-json"
 edition = "2021"
 license = "MIT"
 name = "nu-json"
-version = "0.94.1"
+version = "0.94.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -23,5 +23,5 @@ serde = { workspace =  true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-# nu-path = { path="../nu-path", version = "0.94.1" }
+# nu-path = { path="../nu-path", version = "0.94.2" }
 # serde_json = "1.0"
\ No newline at end of file
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index 92f468fdbd..0732862bff 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -3,14 +3,14 @@ authors = ["The Nushell Project Developers"]
 description = "Nushell's integrated LSP server"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-lsp"
 name = "nu-lsp"
-version = "0.94.1"
+version = "0.94.2"
 edition = "2021"
 license = "MIT"
 
 [dependencies]
-nu-cli = { path = "../nu-cli", version = "0.94.1" }
-nu-parser = { path = "../nu-parser", version = "0.94.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
+nu-cli = { path = "../nu-cli", version = "0.94.2" }
+nu-parser = { path = "../nu-parser", version = "0.94.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
 
 reedline = { workspace = true }
 
@@ -23,8 +23,8 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.1" }
-nu-command = { path = "../nu-command", version = "0.94.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.94.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.2" }
+nu-command = { path = "../nu-command", version = "0.94.2" }
+nu-test-support = { path = "../nu-test-support", version = "0.94.2" }
 
 assert-json-diff = "2.0"
\ No newline at end of file
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index feb379d091..fa840fc483 100644
--- a/crates/nu-parser/Cargo.toml
+++ b/crates/nu-parser/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-parser"
 edition = "2021"
 license = "MIT"
 name = "nu-parser"
-version = "0.94.1"
+version = "0.94.2"
 exclude = ["/fuzz"]
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.94.1" }
-nu-path = { path = "../nu-path", version = "0.94.1" }
-nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.94.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
+nu-engine = { path = "../nu-engine", version = "0.94.2" }
+nu-path = { path = "../nu-path", version = "0.94.2" }
+nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.94.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
 
 bytesize = { workspace = true }
 chrono = { default-features = false, features = ['std'], workspace = true }
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index 1f3822089c..bdd0157e4f 100644
--- a/crates/nu-path/Cargo.toml
+++ b/crates/nu-path/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-path"
 edition = "2021"
 license = "MIT"
 name = "nu-path"
-version = "0.94.1"
+version = "0.94.2"
 exclude = ["/fuzz"]
 
 [lib]
diff --git a/crates/nu-plugin-core/Cargo.toml b/crates/nu-plugin-core/Cargo.toml
index 4040095a2a..580e0287e2 100644
--- a/crates/nu-plugin-core/Cargo.toml
+++ b/crates/nu-plugin-core/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-core
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-core"
-version = "0.94.1"
+version = "0.94.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.1", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.2", default-features = false }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true }
diff --git a/crates/nu-plugin-engine/Cargo.toml b/crates/nu-plugin-engine/Cargo.toml
index 715c2b7f74..50fe40ab0a 100644
--- a/crates/nu-plugin-engine/Cargo.toml
+++ b/crates/nu-plugin-engine/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-engi
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-engine"
-version = "0.94.1"
+version = "0.94.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.94.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
-nu-system = { path = "../nu-system", version = "0.94.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.1" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.94.1", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.94.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
+nu-system = { path = "../nu-system", version = "0.94.2" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.2" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.94.2", default-features = false }
 
 serde = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-plugin-protocol/Cargo.toml b/crates/nu-plugin-protocol/Cargo.toml
index 8fe1c1102e..b52655a4f1 100644
--- a/crates/nu-plugin-protocol/Cargo.toml
+++ b/crates/nu-plugin-protocol/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-prot
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-protocol"
-version = "0.94.1"
+version = "0.94.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.94.1", features = ["plugin"] }
-nu-utils = { path = "../nu-utils", version = "0.94.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.2", features = ["plugin"] }
+nu-utils = { path = "../nu-utils", version = "0.94.2" }
 
 bincode = "1.3"
 serde = { workspace = true, features = ["derive"] }
diff --git a/crates/nu-plugin-test-support/Cargo.toml b/crates/nu-plugin-test-support/Cargo.toml
index 32df904645..b5ef1e4c02 100644
--- a/crates/nu-plugin-test-support/Cargo.toml
+++ b/crates/nu-plugin-test-support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-plugin-test-support"
-version = "0.94.1"
+version = "0.94.2"
 edition = "2021"
 license = "MIT"
 description = "Testing support for Nushell plugins"
@@ -12,14 +12,14 @@ bench = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.94.1", features = ["plugin"] }
-nu-protocol = { path = "../nu-protocol", version = "0.94.1", features = ["plugin"] }
-nu-parser = { path = "../nu-parser", version = "0.94.1", features = ["plugin"] }
-nu-plugin = { path = "../nu-plugin", version = "0.94.1" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.94.1" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.94.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.1" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.1" }
+nu-engine = { path = "../nu-engine", version = "0.94.2", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.94.2", features = ["plugin"] }
+nu-parser = { path = "../nu-parser", version = "0.94.2", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.94.2" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.94.2" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.94.2" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.2" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.2" }
 nu-ansi-term = { workspace = true }
 similar = "2.5"
 
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index 150ab6666d..0a9a169474 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin"
 edition = "2021"
 license = "MIT"
 name = "nu-plugin"
-version = "0.94.1"
+version = "0.94.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.94.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.1" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.94.1", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.94.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.2" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.94.2", default-features = false }
 
 log = { workspace = true }
 thiserror = "1.0"
diff --git a/crates/nu-pretty-hex/Cargo.toml b/crates/nu-pretty-hex/Cargo.toml
index 639ceb0edd..152d03df72 100644
--- a/crates/nu-pretty-hex/Cargo.toml
+++ b/crates/nu-pretty-hex/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-pretty-hex"
 edition = "2021"
 license = "MIT"
 name = "nu-pretty-hex"
-version = "0.94.1"
+version = "0.94.2"
 
 [lib]
 doctest = false
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 8b2870a378..2ccd0a07ce 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-protocol"
 edition = "2021"
 license = "MIT"
 name = "nu-protocol"
-version = "0.94.1"
+version = "0.94.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,9 +13,9 @@ version = "0.94.1"
 bench = false
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.94.1" }
-nu-path = { path = "../nu-path", version = "0.94.1" }
-nu-system = { path = "../nu-system", version = "0.94.1" }
+nu-utils = { path = "../nu-utils", version = "0.94.2" }
+nu-path = { path = "../nu-path", version = "0.94.2" }
+nu-system = { path = "../nu-system", version = "0.94.2" }
 
 brotli = { workspace = true, optional = true }
 byte-unit = { version = "5.1", features = [ "serde" ] }
@@ -45,7 +45,7 @@ plugin = [
 serde_json = { workspace = true }
 strum = "0.26"
 strum_macros = "0.26"
-nu-test-support = { path = "../nu-test-support", version = "0.94.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.94.2" }
 pretty_assertions = { workspace = true }
 rstest = { workspace = true }
 tempfile = { workspace = true }
diff --git a/crates/nu-std/Cargo.toml b/crates/nu-std/Cargo.toml
index f5c6790c52..4e5850c3fb 100644
--- a/crates/nu-std/Cargo.toml
+++ b/crates/nu-std/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-std"
 edition = "2021"
 license = "MIT"
 name = "nu-std"
-version = "0.94.1"
+version = "0.94.2"
 
 [dependencies]
-nu-parser = { version = "0.94.1", path = "../nu-parser" }
-nu-protocol = { version = "0.94.1", path = "../nu-protocol" }
-nu-engine = { version = "0.94.1", path = "../nu-engine" }
+nu-parser = { version = "0.94.2", path = "../nu-parser" }
+nu-protocol = { version = "0.94.2", path = "../nu-protocol" }
+nu-engine = { version = "0.94.2", path = "../nu-engine" }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
 
 log = "0.4"
\ No newline at end of file
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index 33305d07bc..17e621db90 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["The Nushell Project Developers", "procs creators"]
 description = "Nushell system querying"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-system"
 name = "nu-system"
-version = "0.94.1"
+version = "0.94.2"
 edition = "2021"
 license = "MIT"
 
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index 6fcb1ffce6..fe1de742d9 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -5,20 +5,20 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-table"
 edition = "2021"
 license = "MIT"
 name = "nu-table"
-version = "0.94.1"
+version = "0.94.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
-nu-utils = { path = "../nu-utils", version = "0.94.1" }
-nu-engine = { path = "../nu-engine", version = "0.94.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.94.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
+nu-utils = { path = "../nu-utils", version = "0.94.2" }
+nu-engine = { path = "../nu-engine", version = "0.94.2" }
+nu-color-config = { path = "../nu-color-config", version = "0.94.2" }
 nu-ansi-term = { workspace = true }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 tabled = { workspace = true, features = ["color"], default-features = false }
 
 [dev-dependencies]
-# nu-test-support = { path="../nu-test-support", version = "0.94.1"  }
\ No newline at end of file
+# nu-test-support = { path="../nu-test-support", version = "0.94.2"  }
\ No newline at end of file
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index 2570ce0d68..bc560257f8 100644
--- a/crates/nu-term-grid/Cargo.toml
+++ b/crates/nu-term-grid/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-term-grid"
 edition = "2021"
 license = "MIT"
 name = "nu-term-grid"
-version = "0.94.1"
+version = "0.94.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.94.1" }
+nu-utils = { path = "../nu-utils", version = "0.94.2" }
 
 unicode-width = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml
index e2525d8c78..07f4142d43 100644
--- a/crates/nu-test-support/Cargo.toml
+++ b/crates/nu-test-support/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-test-suppor
 edition = "2021"
 license = "MIT"
 name = "nu-test-support"
-version = "0.94.1"
+version = "0.94.2"
 
 [lib]
 doctest = false
 bench = false
 
 [dependencies]
-nu-path = { path = "../nu-path", version = "0.94.1" }
-nu-glob = { path = "../nu-glob", version = "0.94.1" }
-nu-utils = { path = "../nu-utils", version = "0.94.1" }
+nu-path = { path = "../nu-path", version = "0.94.2" }
+nu-glob = { path = "../nu-glob", version = "0.94.2" }
+nu-utils = { path = "../nu-utils", version = "0.94.2" }
 
 num-format = { workspace = true }
 which = { workspace = true }
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index 85b80015df..584602f184 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-utils"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-utils"
-version = "0.94.1"
+version = "0.94.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index 357a1cc7d5..6d84d8d1de 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -1,6 +1,6 @@
 # Nushell Config File
 #
-# version = "0.94.1"
+# version = "0.94.2"
 
 # For more information on defining custom themes, see
 # https://www.nushell.sh/book/coloring_and_theming.html
diff --git a/crates/nu-utils/src/sample_config/default_env.nu b/crates/nu-utils/src/sample_config/default_env.nu
index 90705230a9..edf0830f9f 100644
--- a/crates/nu-utils/src/sample_config/default_env.nu
+++ b/crates/nu-utils/src/sample_config/default_env.nu
@@ -1,6 +1,6 @@
 # Nushell Environment Config File
 #
-# version = "0.94.1"
+# version = "0.94.2"
 
 def create_left_prompt [] {
     let dir = match (do --ignore-shell-errors { $env.PWD | path relative-to $nu.home-path }) {
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index 7cfbc0b578..2f5ae29e3d 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -10,10 +10,10 @@ name = "nu_plugin_custom_values"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.94.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.94.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.2", features = ["plugin"] }
 serde = { workspace = true, default-features = false }
 typetag = "0.2"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.1" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.2" }
\ No newline at end of file
diff --git a/crates/nu_plugin_example/Cargo.toml b/crates/nu_plugin_example/Cargo.toml
index 0b4ec44e89..de370a0a5d 100644
--- a/crates/nu_plugin_example/Cargo.toml
+++ b/crates/nu_plugin_example/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_exam
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_example"
-version = "0.94.1"
+version = "0.94.2"
 
 [[bin]]
 name = "nu_plugin_example"
@@ -15,9 +15,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.94.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.94.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.2", features = ["plugin"] }
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.1" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.1" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.2" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.2" }
\ No newline at end of file
diff --git a/crates/nu_plugin_formats/Cargo.toml b/crates/nu_plugin_formats/Cargo.toml
index 213ea74cd5..797eb69656 100644
--- a/crates/nu_plugin_formats/Cargo.toml
+++ b/crates/nu_plugin_formats/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_form
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_formats"
-version = "0.94.1"
+version = "0.94.2"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.94.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.94.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.2", features = ["plugin"] }
 
 indexmap = { workspace = true }
 eml-parser = "0.1"
@@ -18,4 +18,4 @@ ical = "0.11"
 rust-ini = "0.21.0"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.1" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.2" }
\ No newline at end of file
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index 7c0ca79ebe..a16bf019f6 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gsta
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_gstat"
-version = "0.94.1"
+version = "0.94.2"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_gstat"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.94.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.94.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
 
 git2 = "0.18"
\ No newline at end of file
diff --git a/crates/nu_plugin_inc/Cargo.toml b/crates/nu_plugin_inc/Cargo.toml
index 543982d599..7b57d1591c 100644
--- a/crates/nu_plugin_inc/Cargo.toml
+++ b/crates/nu_plugin_inc/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_inc"
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_inc"
-version = "0.94.1"
+version = "0.94.2"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_inc"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.94.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.94.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.2", features = ["plugin"] }
 
 semver = "1.0"
\ No newline at end of file
diff --git a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
index d900f498da..15c8340c0e 100755
--- a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
+++ b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
@@ -6,7 +6,7 @@
 # it also allows us to test the plugin interface with something manually implemented in a scripting
 # language without adding any extra dependencies to our tests.
 
-const NUSHELL_VERSION = "0.94.1"
+const NUSHELL_VERSION = "0.94.2"
 
 def main [--stdio] {
   if ($stdio) {
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index f93e183926..0855bc9b16 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu_plugin_polars"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_polars"
-version = "0.94.1"
+version = "0.94.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -17,9 +17,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
-nu-plugin = { path = "../nu-plugin", version = "0.94.1" }
-nu-path = { path = "../nu-path", version = "0.94.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
+nu-plugin = { path = "../nu-plugin", version = "0.94.2" }
+nu-path = { path = "../nu-path", version = "0.94.2" }
 
 # Potential dependencies for extras
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
@@ -73,9 +73,9 @@ optional = false
 version = "0.39"
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.1" }
-nu-engine = { path = "../nu-engine", version = "0.94.1" }
-nu-parser = { path = "../nu-parser", version = "0.94.1" }
-nu-command = { path = "../nu-command", version = "0.94.1" }
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.2" }
+nu-engine = { path = "../nu-engine", version = "0.94.2" }
+nu-parser = { path = "../nu-parser", version = "0.94.2" }
+nu-command = { path = "../nu-command", version = "0.94.2" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.2" }
 tempfile.workspace = true
\ No newline at end of file
diff --git a/crates/nu_plugin_python/nu_plugin_python_example.py b/crates/nu_plugin_python/nu_plugin_python_example.py
index 55746d89c1..b2cb06c7eb 100755
--- a/crates/nu_plugin_python/nu_plugin_python_example.py
+++ b/crates/nu_plugin_python/nu_plugin_python_example.py
@@ -27,7 +27,7 @@ import sys
 import json
 
 
-NUSHELL_VERSION = "0.94.1"
+NUSHELL_VERSION = "0.94.2"
 
 
 def signatures():
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index b48ca14fa5..0fd251e646 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_quer
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_query"
-version = "0.94.1"
+version = "0.94.2"
 
 [lib]
 doctest = false
@@ -16,8 +16,8 @@ name = "nu_plugin_query"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.94.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.94.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
 
 gjson = "0.8"
 scraper = { default-features = false, version = "0.19" }
diff --git a/crates/nu_plugin_stress_internals/Cargo.toml b/crates/nu_plugin_stress_internals/Cargo.toml
index 159e0b616c..884244a5db 100644
--- a/crates/nu_plugin_stress_internals/Cargo.toml
+++ b/crates/nu_plugin_stress_internals/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_stre
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_stress_internals"
-version = "0.94.1"
+version = "0.94.2"
 
 [[bin]]
 name = "nu_plugin_stress_internals"
diff --git a/crates/nuon/Cargo.toml b/crates/nuon/Cargo.toml
index 69e7d89713..80a4de36ae 100644
--- a/crates/nuon/Cargo.toml
+++ b/crates/nuon/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nuon"
 edition = "2021"
 license = "MIT"
 name = "nuon"
-version = "0.94.1"
+version = "0.94.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-parser = { path = "../nu-parser", version = "0.94.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.1" }
-nu-engine = { path = "../nu-engine", version = "0.94.1" }
+nu-parser = { path = "../nu-parser", version = "0.94.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
+nu-engine = { path = "../nu-engine", version = "0.94.2" }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 

From b50903cf58a067b78815be620372e8a3d5cbdcae Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Mon, 3 Jun 2024 00:28:45 -0700
Subject: [PATCH 0052/1072] Fix external command name parsing with backslashes,
 and add tests (#13027)

# Description

Fixes #13016 and adds tests for many variations of external call
parsing.

I just realized @kubouch took a crack at this too (#13022) so really
whichever is better, but I think the
tests are a good addition.
---
 crates/nu-parser/src/parser.rs        |  35 +++--
 crates/nu-parser/tests/test_parser.rs | 215 ++++++++++++++++++++++++++
 2 files changed, 239 insertions(+), 11 deletions(-)

diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index ad5e7d4f42..830d8b81e0 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -16,6 +16,7 @@ use nu_protocol::{
     IN_VARIABLE_ID,
 };
 use std::{
+    borrow::Cow,
     collections::{HashMap, HashSet},
     num::ParseIntError,
     str,
@@ -241,15 +242,10 @@ fn parse_external_arg(working_set: &mut StateWorkingSet, span: Span) -> External
         ))
     } else {
         // Eval stage trims the quotes, so we don't have to do the same thing when parsing.
-        let contents = if contents.starts_with(b"\"") {
-            let (contents, err) = unescape_string(contents, span);
-            if let Some(err) = err {
-                working_set.error(err)
-            }
-            String::from_utf8_lossy(&contents).to_string()
-        } else {
-            String::from_utf8_lossy(contents).to_string()
-        };
+        let (contents, err) = unescape_string_preserving_quotes(contents, span);
+        if let Some(err) = err {
+            working_set.error(err);
+        }
 
         ExternalArgument::Regular(Expression {
             expr: Expr::String(contents),
@@ -279,13 +275,13 @@ pub fn parse_external_call(working_set: &mut StateWorkingSet, spans: &[Span]) ->
         Box::new(arg)
     } else {
         // Eval stage will unquote the string, so we don't bother with that here
-        let (contents, err) = unescape_string(&head_contents, head_span);
+        let (contents, err) = unescape_string_preserving_quotes(&head_contents, head_span);
         if let Some(err) = err {
             working_set.error(err)
         }
 
         Box::new(Expression {
-            expr: Expr::String(String::from_utf8_lossy(&contents).into_owned()),
+            expr: Expr::String(contents),
             span: head_span,
             ty: Type::String,
             custom_completion: None,
@@ -2699,6 +2695,23 @@ pub fn unescape_unquote_string(bytes: &[u8], span: Span) -> (String, Option<Pars
     }
 }
 
+/// XXX: This is here temporarily as a patch, but we should replace this with properly representing
+/// the quoted state of a string in the AST
+fn unescape_string_preserving_quotes(bytes: &[u8], span: Span) -> (String, Option<ParseError>) {
+    let (bytes, err) = if bytes.starts_with(b"\"") {
+        let (bytes, err) = unescape_string(bytes, span);
+        (Cow::Owned(bytes), err)
+    } else {
+        (Cow::Borrowed(bytes), None)
+    };
+
+    // The original code for args used lossy conversion here, even though that's not what we
+    // typically use for strings. Revisit whether that's actually desirable later, but don't
+    // want to introduce a breaking change for this patch.
+    let token = String::from_utf8_lossy(&bytes).into_owned();
+    (token, err)
+}
+
 pub fn parse_string(working_set: &mut StateWorkingSet, span: Span) -> Expression {
     trace!("parsing: string");
 
diff --git a/crates/nu-parser/tests/test_parser.rs b/crates/nu-parser/tests/test_parser.rs
index ef5d968280..2646b3cc90 100644
--- a/crates/nu-parser/tests/test_parser.rs
+++ b/crates/nu-parser/tests/test_parser.rs
@@ -694,6 +694,221 @@ pub fn parse_call_missing_req_flag() {
     ));
 }
 
+#[rstest]
+#[case("foo-external-call", "foo-external-call", "bare word")]
+#[case("^foo-external-call", "foo-external-call", "bare word with caret")]
+#[case(
+    "foo/external-call",
+    "foo/external-call",
+    "bare word with forward slash"
+)]
+#[case(
+    "^foo/external-call",
+    "foo/external-call",
+    "bare word with forward slash and caret"
+)]
+#[case(r"foo\external-call", r"foo\external-call", "bare word with backslash")]
+#[case(
+    r"^foo\external-call",
+    r"foo\external-call",
+    "bare word with backslash and caret"
+)]
+#[case(
+    "^'foo external call'",
+    "'foo external call'",
+    "single quote with caret"
+)]
+#[case(
+    "^'foo/external call'",
+    "'foo/external call'",
+    "single quote with forward slash and caret"
+)]
+#[case(
+    r"^'foo\external call'",
+    r"'foo\external call'",
+    "single quote with backslash and caret"
+)]
+#[case(
+    r#"^"foo external call""#,
+    r#""foo external call""#,
+    "double quote with caret"
+)]
+#[case(
+    r#"^"foo/external call""#,
+    r#""foo/external call""#,
+    "double quote with forward slash and caret"
+)]
+#[case(
+    r#"^"foo\\external call""#,
+    r#""foo\external call""#,
+    "double quote with backslash and caret"
+)]
+#[case("`foo external call`", "`foo external call`", "backtick quote")]
+#[case(
+    "^`foo external call`",
+    "`foo external call`",
+    "backtick quote with caret"
+)]
+#[case(
+    "`foo/external call`",
+    "`foo/external call`",
+    "backtick quote with forward slash"
+)]
+#[case(
+    "^`foo/external call`",
+    "`foo/external call`",
+    "backtick quote with forward slash and caret"
+)]
+#[case(
+    r"^`foo\external call`",
+    r"`foo\external call`",
+    "backtick quote with backslash"
+)]
+#[case(
+    r"^`foo\external call`",
+    r"`foo\external call`",
+    "backtick quote with backslash and caret"
+)]
+fn test_external_call_name(#[case] input: &str, #[case] expected: &str, #[case] tag: &str) {
+    let engine_state = EngineState::new();
+    let mut working_set = StateWorkingSet::new(&engine_state);
+    let block = parse(&mut working_set, None, input.as_bytes(), true);
+    assert!(
+        working_set.parse_errors.is_empty(),
+        "{tag}: errors: {:?}",
+        working_set.parse_errors
+    );
+
+    let pipeline = &block.pipelines[0];
+    assert_eq!(1, pipeline.len());
+    let element = &pipeline.elements[0];
+    match &element.expr.expr {
+        Expr::ExternalCall(name, args) => {
+            match &name.expr {
+                Expr::String(string) => {
+                    assert_eq!(expected, string);
+                }
+                other => {
+                    panic!("{tag}: Unexpected expression in command name position: {other:?}");
+                }
+            }
+            assert_eq!(0, args.len());
+        }
+        other => {
+            panic!("{tag}: Unexpected expression in pipeline: {other:?}");
+        }
+    }
+}
+
+#[rstest]
+#[case("^foo bar-baz", "bar-baz", "bare word")]
+#[case("^foo bar/baz", "bar/baz", "bare word with forward slash")]
+#[case(r"^foo bar\baz", r"bar\baz", "bare word with backslash")]
+#[case("^foo 'bar baz'", "'bar baz'", "single quote")]
+#[case("foo 'bar/baz'", "'bar/baz'", "single quote with forward slash")]
+#[case(r"foo 'bar\baz'", r"'bar\baz'", "single quote with backslash")]
+#[case(r#"^foo "bar baz""#, r#""bar baz""#, "double quote")]
+#[case(r#"^foo "bar/baz""#, r#""bar/baz""#, "double quote with forward slash")]
+#[case(r#"^foo "bar\\baz""#, r#""bar\baz""#, "double quote with backslash")]
+#[case("^foo `bar baz`", "`bar baz`", "backtick quote")]
+#[case("^foo `bar/baz`", "`bar/baz`", "backtick quote with forward slash")]
+#[case(r"^foo `bar\baz`", r"`bar\baz`", "backtick quote with backslash")]
+fn test_external_call_argument_regular(
+    #[case] input: &str,
+    #[case] expected: &str,
+    #[case] tag: &str,
+) {
+    let engine_state = EngineState::new();
+    let mut working_set = StateWorkingSet::new(&engine_state);
+    let block = parse(&mut working_set, None, input.as_bytes(), true);
+    assert!(
+        working_set.parse_errors.is_empty(),
+        "{tag}: errors: {:?}",
+        working_set.parse_errors
+    );
+
+    let pipeline = &block.pipelines[0];
+    assert_eq!(1, pipeline.len());
+    let element = &pipeline.elements[0];
+    match &element.expr.expr {
+        Expr::ExternalCall(name, args) => {
+            match &name.expr {
+                Expr::String(string) => {
+                    assert_eq!("foo", string, "{tag}: incorrect name");
+                }
+                other => {
+                    panic!("{tag}: Unexpected expression in command name position: {other:?}");
+                }
+            }
+            assert_eq!(1, args.len());
+            match &args[0] {
+                ExternalArgument::Regular(expr) => match &expr.expr {
+                    Expr::String(string) => {
+                        assert_eq!(expected, string, "{tag}: incorrect arg");
+                    }
+                    other => {
+                        panic!("Unexpected expression in command arg position: {other:?}")
+                    }
+                },
+                other @ ExternalArgument::Spread(..) => {
+                    panic!("Unexpected external spread argument in command arg position: {other:?}")
+                }
+            }
+        }
+        other => {
+            panic!("{tag}: Unexpected expression in pipeline: {other:?}");
+        }
+    }
+}
+
+#[test]
+fn test_external_call_argument_spread() {
+    let engine_state = EngineState::new();
+    let mut working_set = StateWorkingSet::new(&engine_state);
+    let block = parse(&mut working_set, None, b"^foo ...[a b c]", true);
+    assert!(
+        working_set.parse_errors.is_empty(),
+        "errors: {:?}",
+        working_set.parse_errors
+    );
+
+    let pipeline = &block.pipelines[0];
+    assert_eq!(1, pipeline.len());
+    let element = &pipeline.elements[0];
+    match &element.expr.expr {
+        Expr::ExternalCall(name, args) => {
+            match &name.expr {
+                Expr::String(string) => {
+                    assert_eq!("foo", string, "incorrect name");
+                }
+                other => {
+                    panic!("Unexpected expression in command name position: {other:?}");
+                }
+            }
+            assert_eq!(1, args.len());
+            match &args[0] {
+                ExternalArgument::Spread(expr) => match &expr.expr {
+                    Expr::List(items) => {
+                        assert_eq!(3, items.len());
+                        // that's good enough, don't really need to go so deep into it...
+                    }
+                    other => {
+                        panic!("Unexpected expression in command arg position: {other:?}")
+                    }
+                },
+                other @ ExternalArgument::Regular(..) => {
+                    panic!(
+                        "Unexpected external regular argument in command arg position: {other:?}"
+                    )
+                }
+            }
+        }
+        other => {
+            panic!("Unexpected expression in pipeline: {other:?}");
+        }
+    }
+}
+
 #[test]
 fn test_nothing_comparison_eq() {
     let engine_state = EngineState::new();

From be8c1dc0066cd1034a6b110a622f47b516bfe029 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Mon, 3 Jun 2024 00:38:55 -0700
Subject: [PATCH 0053/1072] Fix `run_external::expand_glob()` to return paths
 that are PWD-relative but reflect the original intent (#13028)

# Description

Fix #13021

This changes the `expand_glob()` function to use
`nu_engine::glob_from()` so that absolute paths are actually preserved,
rather than being made relative to the provided parent. This preserves
the intent of whoever wrote the original path/glob, and also makes it so
that tilde always produces absolute paths.

I also made `expand_glob()` handle Ctrl-C so that it can be interrupted.

cc @YizhePKU

# Tests + Formatting
No additional tests here... but that might be a good idea.
---
 crates/nu-command/src/system/run_external.rs | 143 +++++++++++++------
 1 file changed, 99 insertions(+), 44 deletions(-)

diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index a200ce75de..d4645e87e8 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -4,7 +4,7 @@ use nu_protocol::{
     ast::{Expr, Expression},
     did_you_mean,
     process::ChildProcess,
-    ByteStream, OutDest,
+    ByteStream, NuGlob, OutDest,
 };
 use nu_system::ForegroundChild;
 use nu_utils::IgnoreCaseExt;
@@ -13,7 +13,7 @@ use std::{
     io::Write,
     path::{Path, PathBuf},
     process::Stdio,
-    sync::Arc,
+    sync::{atomic::AtomicBool, Arc},
     thread,
 };
 
@@ -155,6 +155,9 @@ impl Command for External {
             }
         };
 
+        // Log the command we're about to run in case it's useful for debugging purposes.
+        log::trace!("run-external spawning: {command:?}");
+
         // Spawn the child process. On Unix, also put the child process to
         // foreground if we're in an interactive session.
         #[cfg(windows)]
@@ -232,6 +235,7 @@ pub fn eval_arguments_from_call(
     stack: &mut Stack,
     call: &Call,
 ) -> Result<Vec<Spanned<String>>, ShellError> {
+    let ctrlc = &engine_state.ctrlc;
     let cwd = engine_state.cwd(Some(stack))?;
     let mut args: Vec<Spanned<String>> = vec![];
     for (expr, spread) in call.rest_iter(1) {
@@ -240,7 +244,7 @@ pub fn eval_arguments_from_call(
             // glob-expansion, and inner-quotes-removal, in that order.
             for arg in eval_argument(engine_state, stack, expr, spread)? {
                 let tilde_expanded = expand_tilde(&arg);
-                for glob_expanded in expand_glob(&tilde_expanded, &cwd, expr.span)? {
+                for glob_expanded in expand_glob(&tilde_expanded, &cwd, expr.span, ctrlc)? {
                     let inner_quotes_removed = remove_inner_quotes(&glob_expanded);
                     args.push(inner_quotes_removed.into_owned().into_spanned(expr.span));
                 }
@@ -321,37 +325,75 @@ fn expand_tilde(arg: &str) -> String {
 ///
 /// Note: This matches the default behavior of Bash, but is known to be
 /// error-prone. We might want to change this behavior in the future.
-fn expand_glob(arg: &str, cwd: &Path, span: Span) -> Result<Vec<String>, ShellError> {
-    let Ok(paths) = nu_glob::glob_with_parent(arg, nu_glob::MatchOptions::default(), cwd) else {
+fn expand_glob(
+    arg: &str,
+    cwd: &Path,
+    span: Span,
+    interrupt: &Option<Arc<AtomicBool>>,
+) -> Result<Vec<String>, ShellError> {
+    const GLOB_CHARS: &[char] = &['*', '?', '['];
+
+    // Don't expand something that doesn't include the GLOB_CHARS
+    if !arg.contains(GLOB_CHARS) {
+        return Ok(vec![arg.into()]);
+    }
+
+    // We must use `nu_engine::glob_from` here, in order to ensure we get paths from the correct
+    // dir
+    let glob = NuGlob::Expand(arg.to_owned()).into_spanned(span);
+    let Ok((_prefix, paths)) = nu_engine::glob_from(&glob, cwd, span, None) else {
+        // If an error occurred, return the original input
         return Ok(vec![arg.into()]);
     };
 
-    let mut result = vec![];
-    for path in paths {
-        let path = path.map_err(|err| ShellError::IOErrorSpanned {
-            msg: format!("{}: {:?}", err.path().display(), err.error()),
-            span,
-        })?;
-        // Strip PWD from the resulting paths if possible.
-        let path_stripped = if let Ok(remainder) = path.strip_prefix(cwd) {
-            // If stripping PWD results in an empty path, return `.` instead.
-            if remainder.components().next().is_none() {
-                Path::new(".")
-            } else {
-                remainder
+    // If the first component of the original `arg` string path was '.', that should be preserved
+    let relative_to_dot = Path::new(arg).starts_with(".");
+
+    let paths = paths
+        // Skip over glob failures. These are usually just inaccessible paths.
+        .flat_map(|path_result| match path_result {
+            Ok(path) => Some(path),
+            Err(err) => {
+                // But internally log them just in case we need to debug this.
+                log::warn!("Error in run_external::expand_glob(): {}", err);
+                None
             }
-        } else {
-            &path
-        };
-        let path_string = path_stripped.to_string_lossy().to_string();
-        result.push(path_string);
-    }
+        })
+        // Make the paths relative to the cwd
+        .map(|path| {
+            path.strip_prefix(cwd)
+                .map(|path| path.to_owned())
+                .unwrap_or(path)
+        })
+        // Add './' to relative paths if the original pattern had it
+        .map(|path| {
+            if relative_to_dot && path.is_relative() {
+                Path::new(".").join(path)
+            } else {
+                path
+            }
+        })
+        // Convert the paths returned to UTF-8 strings.
+        //
+        // FIXME: this fails to return the correct results for non-UTF-8 paths, but we don't support
+        // those in Nushell yet.
+        .map(|path| path.to_string_lossy().into_owned())
+        // Abandon if ctrl-c is pressed
+        .map(|path| {
+            if !nu_utils::ctrl_c::was_pressed(interrupt) {
+                Ok(path)
+            } else {
+                Err(ShellError::InterruptedByUser { span: Some(span) })
+            }
+        })
+        .collect::<Result<Vec<String>, ShellError>>()?;
 
-    if result.is_empty() {
-        result.push(arg.to_string());
+    if !paths.is_empty() {
+        Ok(paths)
+    } else {
+        // If we failed to match, return the original input
+        Ok(vec![arg.into()])
     }
-
-    Ok(result)
 }
 
 /// Transforms `--option="value"` into `--option=value`. `value` can be quoted
@@ -607,6 +649,7 @@ fn escape_cmd_argument(arg: &Spanned<String>) -> Result<Cow<'_, str>, ShellError
 mod test {
     use super::*;
     use nu_protocol::ast::ListItem;
+    use nu_test_support::{fs::Stub, playground::Playground};
 
     #[test]
     fn test_remove_quotes() {
@@ -669,26 +712,38 @@ mod test {
 
     #[test]
     fn test_expand_glob() {
-        let tempdir = tempfile::tempdir().unwrap();
-        let cwd = tempdir.path();
-        std::fs::File::create(cwd.join("a.txt")).unwrap();
-        std::fs::File::create(cwd.join("b.txt")).unwrap();
+        Playground::setup("test_expand_glob", |dirs, play| {
+            play.with_files(&[Stub::EmptyFile("a.txt"), Stub::EmptyFile("b.txt")]);
 
-        let actual = expand_glob("*.txt", cwd, Span::unknown()).unwrap();
-        let expected = &["a.txt", "b.txt"];
-        assert_eq!(actual, expected);
+            let cwd = dirs.test();
 
-        let actual = expand_glob("'*.txt'", cwd, Span::unknown()).unwrap();
-        let expected = &["'*.txt'"];
-        assert_eq!(actual, expected);
+            let actual = expand_glob("*.txt", cwd, Span::unknown(), &None).unwrap();
+            let expected = &["a.txt", "b.txt"];
+            assert_eq!(actual, expected);
 
-        let actual = expand_glob(cwd.to_str().unwrap(), cwd, Span::unknown()).unwrap();
-        let expected = &["."];
-        assert_eq!(actual, expected);
+            let actual = expand_glob("./*.txt", cwd, Span::unknown(), &None).unwrap();
+            let expected = vec![
+                Path::new(".").join("a.txt").to_string_lossy().into_owned(),
+                Path::new(".").join("b.txt").to_string_lossy().into_owned(),
+            ];
+            assert_eq!(actual, expected);
 
-        let actual = expand_glob("[*.txt", cwd, Span::unknown()).unwrap();
-        let expected = &["[*.txt"];
-        assert_eq!(actual, expected);
+            let actual = expand_glob("'*.txt'", cwd, Span::unknown(), &None).unwrap();
+            let expected = &["'*.txt'"];
+            assert_eq!(actual, expected);
+
+            let actual = expand_glob(".", cwd, Span::unknown(), &None).unwrap();
+            let expected = &["."];
+            assert_eq!(actual, expected);
+
+            let actual = expand_glob("./a.txt", cwd, Span::unknown(), &None).unwrap();
+            let expected = &["./a.txt"];
+            assert_eq!(actual, expected);
+
+            let actual = expand_glob("[*.txt", cwd, Span::unknown(), &None).unwrap();
+            let expected = &["[*.txt"];
+            assert_eq!(actual, expected);
+        })
     }
 
     #[test]

From ad5a6cdc00a390ce67238f6d7a7f9552f34a1c98 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Wed, 5 Jun 2024 06:52:40 +0800
Subject: [PATCH 0054/1072] bump version to 0.94.3 (#13055)

---
 Cargo.lock                                    | 72 +++++++++----------
 Cargo.toml                                    | 42 +++++------
 crates/nu-cli/Cargo.toml                      | 26 +++----
 crates/nu-cmd-base/Cargo.toml                 | 12 ++--
 crates/nu-cmd-extra/Cargo.toml                | 22 +++---
 crates/nu-cmd-lang/Cargo.toml                 | 12 ++--
 crates/nu-cmd-plugin/Cargo.toml               | 12 ++--
 crates/nu-color-config/Cargo.toml             | 10 +--
 crates/nu-command/Cargo.toml                  | 36 +++++-----
 crates/nu-engine/Cargo.toml                   | 12 ++--
 crates/nu-explore/Cargo.toml                  | 20 +++---
 crates/nu-glob/Cargo.toml                     |  4 +-
 crates/nu-json/Cargo.toml                     |  6 +-
 crates/nu-lsp/Cargo.toml                      | 16 ++---
 crates/nu-parser/Cargo.toml                   | 12 ++--
 crates/nu-path/Cargo.toml                     |  4 +-
 crates/nu-plugin-core/Cargo.toml              |  8 +--
 crates/nu-plugin-engine/Cargo.toml            | 14 ++--
 crates/nu-plugin-protocol/Cargo.toml          |  8 +--
 crates/nu-plugin-test-support/Cargo.toml      | 20 +++---
 crates/nu-plugin/Cargo.toml                   | 12 ++--
 crates/nu-pretty-hex/Cargo.toml               |  4 +-
 crates/nu-protocol/Cargo.toml                 | 12 ++--
 crates/nu-std/Cargo.toml                      | 10 +--
 crates/nu-system/Cargo.toml                   |  4 +-
 crates/nu-table/Cargo.toml                    | 12 ++--
 crates/nu-term-grid/Cargo.toml                |  6 +-
 crates/nu-test-support/Cargo.toml             | 10 +--
 crates/nu-utils/Cargo.toml                    |  4 +-
 .../src/sample_config/default_config.nu       |  4 +-
 .../nu-utils/src/sample_config/default_env.nu |  4 +-
 crates/nu_plugin_custom_values/Cargo.toml     |  6 +-
 crates/nu_plugin_example/Cargo.toml           | 10 +--
 crates/nu_plugin_formats/Cargo.toml           |  8 +--
 crates/nu_plugin_gstat/Cargo.toml             |  8 +--
 crates/nu_plugin_inc/Cargo.toml               |  8 +--
 .../nu_plugin_nu_example.nu                   |  4 +-
 crates/nu_plugin_polars/Cargo.toml            | 20 +++---
 .../nu_plugin_python_example.py               |  9 +--
 crates/nu_plugin_query/Cargo.toml             |  8 +--
 crates/nu_plugin_stress_internals/Cargo.toml  |  4 +-
 crates/nuon/Cargo.toml                        | 10 +--
 42 files changed, 273 insertions(+), 272 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 23cafeefda..7c5596adba 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2770,7 +2770,7 @@ dependencies = [
 
 [[package]]
 name = "nu"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "assert_cmd",
  "crossterm",
@@ -2823,7 +2823,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cli"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "chrono",
  "crossterm",
@@ -2858,7 +2858,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-base"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "indexmap",
  "miette",
@@ -2870,7 +2870,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-extra"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "fancy-regex",
  "heck 0.5.0",
@@ -2895,7 +2895,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-lang"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "itertools 0.12.1",
  "nu-engine",
@@ -2907,7 +2907,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-plugin"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "itertools 0.12.1",
  "nu-engine",
@@ -2918,7 +2918,7 @@ dependencies = [
 
 [[package]]
 name = "nu-color-config"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "nu-ansi-term",
  "nu-engine",
@@ -2930,7 +2930,7 @@ dependencies = [
 
 [[package]]
 name = "nu-command"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "alphanumeric-sort",
  "base64 0.22.1",
@@ -3039,7 +3039,7 @@ dependencies = [
 
 [[package]]
 name = "nu-engine"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -3049,7 +3049,7 @@ dependencies = [
 
 [[package]]
 name = "nu-explore"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "ansi-str",
  "anyhow",
@@ -3074,14 +3074,14 @@ dependencies = [
 
 [[package]]
 name = "nu-glob"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "doc-comment",
 ]
 
 [[package]]
 name = "nu-json"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "linked-hash-map",
  "num-traits",
@@ -3091,7 +3091,7 @@ dependencies = [
 
 [[package]]
 name = "nu-lsp"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "assert-json-diff",
  "crossbeam-channel",
@@ -3112,7 +3112,7 @@ dependencies = [
 
 [[package]]
 name = "nu-parser"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "bytesize",
  "chrono",
@@ -3128,7 +3128,7 @@ dependencies = [
 
 [[package]]
 name = "nu-path"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "dirs-next",
  "omnipath",
@@ -3137,7 +3137,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "log",
  "nix",
@@ -3152,7 +3152,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-core"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "interprocess",
  "log",
@@ -3166,7 +3166,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-engine"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "log",
  "nu-engine",
@@ -3181,7 +3181,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-protocol"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "bincode",
  "nu-protocol",
@@ -3193,7 +3193,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-test-support"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "nu-ansi-term",
  "nu-cmd-lang",
@@ -3211,7 +3211,7 @@ dependencies = [
 
 [[package]]
 name = "nu-pretty-hex"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "heapless",
  "nu-ansi-term",
@@ -3220,7 +3220,7 @@ dependencies = [
 
 [[package]]
 name = "nu-protocol"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "brotli 5.0.0",
  "byte-unit",
@@ -3251,7 +3251,7 @@ dependencies = [
 
 [[package]]
 name = "nu-std"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "log",
  "miette",
@@ -3262,7 +3262,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "chrono",
  "itertools 0.12.1",
@@ -3280,7 +3280,7 @@ dependencies = [
 
 [[package]]
 name = "nu-table"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "fancy-regex",
  "nu-ansi-term",
@@ -3294,7 +3294,7 @@ dependencies = [
 
 [[package]]
 name = "nu-term-grid"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "nu-utils",
  "unicode-width",
@@ -3302,7 +3302,7 @@ dependencies = [
 
 [[package]]
 name = "nu-test-support"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -3314,7 +3314,7 @@ dependencies = [
 
 [[package]]
 name = "nu-utils"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "crossterm_winapi",
  "log",
@@ -3340,7 +3340,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_example"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "nu-cmd-lang",
  "nu-plugin",
@@ -3350,7 +3350,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_formats"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "eml-parser",
  "ical",
@@ -3363,7 +3363,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_gstat"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "git2",
  "nu-plugin",
@@ -3372,7 +3372,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_inc"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -3381,7 +3381,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_polars"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "chrono",
  "chrono-tz 0.9.0",
@@ -3412,7 +3412,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_query"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "gjson",
  "nu-plugin",
@@ -3424,7 +3424,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_stress_internals"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "interprocess",
  "serde",
@@ -3550,7 +3550,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "nuon"
-version = "0.94.2"
+version = "0.94.3"
 dependencies = [
  "chrono",
  "fancy-regex",
diff --git a/Cargo.toml b/Cargo.toml
index ce9157efb4..2d99b7b42e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
 rust-version = "1.77.2"
-version = "0.94.2"
+version = "0.94.3"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -174,22 +174,22 @@ windows = "0.54"
 winreg = "0.52"
 
 [dependencies]
-nu-cli = { path = "./crates/nu-cli", version = "0.94.2" }
-nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.94.2" }
-nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.94.2" }
-nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.94.2", optional = true }
-nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.94.2" }
-nu-command = { path = "./crates/nu-command", version = "0.94.2" }
-nu-engine = { path = "./crates/nu-engine", version = "0.94.2" }
-nu-explore = { path = "./crates/nu-explore", version = "0.94.2" }
-nu-lsp = { path = "./crates/nu-lsp/", version = "0.94.2" }
-nu-parser = { path = "./crates/nu-parser", version = "0.94.2" }
-nu-path = { path = "./crates/nu-path", version = "0.94.2" }
-nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.94.2" }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.94.2" }
-nu-std = { path = "./crates/nu-std", version = "0.94.2" }
-nu-system = { path = "./crates/nu-system", version = "0.94.2" }
-nu-utils = { path = "./crates/nu-utils", version = "0.94.2" }
+nu-cli = { path = "./crates/nu-cli", version = "0.94.3" }
+nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.94.3" }
+nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.94.3" }
+nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.94.3", optional = true }
+nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.94.3" }
+nu-command = { path = "./crates/nu-command", version = "0.94.3" }
+nu-engine = { path = "./crates/nu-engine", version = "0.94.3" }
+nu-explore = { path = "./crates/nu-explore", version = "0.94.3" }
+nu-lsp = { path = "./crates/nu-lsp/", version = "0.94.3" }
+nu-parser = { path = "./crates/nu-parser", version = "0.94.3" }
+nu-path = { path = "./crates/nu-path", version = "0.94.3" }
+nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.94.3" }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.94.3" }
+nu-std = { path = "./crates/nu-std", version = "0.94.3" }
+nu-system = { path = "./crates/nu-system", version = "0.94.3" }
+nu-utils = { path = "./crates/nu-utils", version = "0.94.3" }
 
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
@@ -218,9 +218,9 @@ nix = { workspace = true, default-features = false, features = [
 ] }
 
 [dev-dependencies]
-nu-test-support = { path = "./crates/nu-test-support", version = "0.94.2" }
-nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.94.2" }
-nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.94.2" }
+nu-test-support = { path = "./crates/nu-test-support", version = "0.94.3" }
+nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.94.3" }
+nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.94.3" }
 assert_cmd = "2.0"
 dirs-next = { workspace = true }
 tango-bench = "0.5"
@@ -305,4 +305,4 @@ bench = false
 # Run individual benchmarks like `cargo bench -- <regex>` e.g. `cargo bench -- parse`
 [[bench]]
 name = "benchmarks"
-harness = false
\ No newline at end of file
+harness = false
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 0d82fa4aae..c2ca2c9704 100644
--- 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.94.2"
+version = "0.94.3"
 
 [lib]
 bench = false
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.2" }
-nu-command = { path = "../nu-command", version = "0.94.2" }
-nu-test-support = { path = "../nu-test-support", version = "0.94.2" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.3" }
+nu-command = { path = "../nu-command", version = "0.94.3" }
+nu-test-support = { path = "../nu-test-support", version = "0.94.3" }
 rstest = { workspace = true, default-features = false }
 tempfile = { workspace = true }
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.94.2" }
-nu-engine = { path = "../nu-engine", version = "0.94.2" }
-nu-path = { path = "../nu-path", version = "0.94.2" }
-nu-parser = { path = "../nu-parser", version = "0.94.2" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.94.2", optional = true }
-nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
-nu-utils = { path = "../nu-utils", version = "0.94.2" }
-nu-color-config = { path = "../nu-color-config", version = "0.94.2" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.94.3" }
+nu-engine = { path = "../nu-engine", version = "0.94.3" }
+nu-path = { path = "../nu-path", version = "0.94.3" }
+nu-parser = { path = "../nu-parser", version = "0.94.3" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.94.3", optional = true }
+nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
+nu-utils = { path = "../nu-utils", version = "0.94.3" }
+nu-color-config = { path = "../nu-color-config", version = "0.94.3" }
 nu-ansi-term = { workspace = true }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
@@ -46,4 +46,4 @@ which = { workspace = true }
 
 [features]
 plugin = ["nu-plugin-engine"]
-system-clipboard = ["reedline/system_clipboard"]
\ No newline at end of file
+system-clipboard = ["reedline/system_clipboard"]
diff --git a/crates/nu-cmd-base/Cargo.toml b/crates/nu-cmd-base/Cargo.toml
index 858ff55e2d..fb6a977ab9 100644
--- a/crates/nu-cmd-base/Cargo.toml
+++ b/crates/nu-cmd-base/Cargo.toml
@@ -5,17 +5,17 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-base"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-base"
-version = "0.94.2"
+version = "0.94.3"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.94.2" }
-nu-parser = { path = "../nu-parser", version = "0.94.2" }
-nu-path = { path = "../nu-path", version = "0.94.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
+nu-engine = { path = "../nu-engine", version = "0.94.3" }
+nu-parser = { path = "../nu-parser", version = "0.94.3" }
+nu-path = { path = "../nu-path", version = "0.94.3" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
 
 indexmap = { workspace = true }
 miette = { workspace = true }
 
-[dev-dependencies]
\ No newline at end of file
+[dev-dependencies]
diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml
index b03c7911ed..39a705f47c 100644
--- 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.94.2"
+version = "0.94.3"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,13 +13,13 @@ version = "0.94.2"
 bench = false
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.94.2" }
-nu-engine = { path = "../nu-engine", version = "0.94.2" }
-nu-json = { version = "0.94.2", path = "../nu-json" }
-nu-parser = { path = "../nu-parser", version = "0.94.2" }
-nu-pretty-hex = { version = "0.94.2", path = "../nu-pretty-hex" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
-nu-utils = { path = "../nu-utils", version = "0.94.2" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.94.3" }
+nu-engine = { path = "../nu-engine", version = "0.94.3" }
+nu-json = { version = "0.94.3", path = "../nu-json" }
+nu-parser = { path = "../nu-parser", version = "0.94.3" }
+nu-pretty-hex = { version = "0.94.3", path = "../nu-pretty-hex" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
+nu-utils = { path = "../nu-utils", version = "0.94.3" }
 
 # Potential dependencies for extras
 heck = { workspace = true }
@@ -37,6 +37,6 @@ extra = ["default"]
 default = []
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.2" }
-nu-command = { path = "../nu-command", version = "0.94.2" }
-nu-test-support = { path = "../nu-test-support", version = "0.94.2" }
\ No newline at end of file
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.3" }
+nu-command = { path = "../nu-command", version = "0.94.3" }
+nu-test-support = { path = "../nu-test-support", version = "0.94.3" }
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index ad94c331d8..22e1cad374 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -6,16 +6,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-lang"
 edition = "2021"
 license = "MIT"
 name = "nu-cmd-lang"
-version = "0.94.2"
+version = "0.94.3"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.94.2" }
-nu-parser = { path = "../nu-parser", version = "0.94.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
-nu-utils = { path = "../nu-utils", version = "0.94.2" }
+nu-engine = { path = "../nu-engine", version = "0.94.3" }
+nu-parser = { path = "../nu-parser", version = "0.94.3" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
+nu-utils = { path = "../nu-utils", version = "0.94.3" }
 
 itertools = { workspace = true }
 shadow-rs = { version = "0.28", default-features = false }
@@ -29,4 +29,4 @@ which-support = []
 trash-support = []
 sqlite = []
 static-link-openssl = []
-system-clipboard = []
\ No newline at end of file
+system-clipboard = []
diff --git a/crates/nu-cmd-plugin/Cargo.toml b/crates/nu-cmd-plugin/Cargo.toml
index 62ed6851b5..d274f46a6a 100644
--- a/crates/nu-cmd-plugin/Cargo.toml
+++ b/crates/nu-cmd-plugin/Cargo.toml
@@ -5,16 +5,16 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-plugin"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-plugin"
-version = "0.94.2"
+version = "0.94.3"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.94.2" }
-nu-path = { path = "../nu-path", version = "0.94.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.2", features = ["plugin"] }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.94.2" }
+nu-engine = { path = "../nu-engine", version = "0.94.3" }
+nu-path = { path = "../nu-path", version = "0.94.3" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.3", features = ["plugin"] }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.94.3" }
 
 itertools = { workspace = true }
 
-[dev-dependencies]
\ No newline at end of file
+[dev-dependencies]
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index 6268acf6f6..95b06c1f77 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -5,18 +5,18 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-color-confi
 edition = "2021"
 license = "MIT"
 name = "nu-color-config"
-version = "0.94.2"
+version = "0.94.3"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
-nu-engine = { path = "../nu-engine", version = "0.94.2" }
-nu-json = { path = "../nu-json", version = "0.94.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
+nu-engine = { path = "../nu-engine", version = "0.94.3" }
+nu-json = { path = "../nu-json", version = "0.94.3" }
 nu-ansi-term = { workspace = true }
 
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.94.2" }
\ No newline at end of file
+nu-test-support = { path = "../nu-test-support", version = "0.94.3" }
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 1a88a24e5e..c6f71c8d25 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-command"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
-version = "0.94.2"
+version = "0.94.3"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,21 +13,21 @@ version = "0.94.2"
 bench = false
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.94.2" }
-nu-color-config = { path = "../nu-color-config", version = "0.94.2" }
-nu-engine = { path = "../nu-engine", version = "0.94.2" }
-nu-glob = { path = "../nu-glob", version = "0.94.2" }
-nu-json = { path = "../nu-json", version = "0.94.2" }
-nu-parser = { path = "../nu-parser", version = "0.94.2" }
-nu-path = { path = "../nu-path", version = "0.94.2" }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.94.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
-nu-system = { path = "../nu-system", version = "0.94.2" }
-nu-table = { path = "../nu-table", version = "0.94.2" }
-nu-term-grid = { path = "../nu-term-grid", version = "0.94.2" }
-nu-utils = { path = "../nu-utils", version = "0.94.2" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.94.3" }
+nu-color-config = { path = "../nu-color-config", version = "0.94.3" }
+nu-engine = { path = "../nu-engine", version = "0.94.3" }
+nu-glob = { path = "../nu-glob", version = "0.94.3" }
+nu-json = { path = "../nu-json", version = "0.94.3" }
+nu-parser = { path = "../nu-parser", version = "0.94.3" }
+nu-path = { path = "../nu-path", version = "0.94.3" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.94.3" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
+nu-system = { path = "../nu-system", version = "0.94.3" }
+nu-table = { path = "../nu-table", version = "0.94.3" }
+nu-term-grid = { path = "../nu-term-grid", version = "0.94.3" }
+nu-utils = { path = "../nu-utils", version = "0.94.3" }
 nu-ansi-term = { workspace = true }
-nuon = { path = "../nuon", version = "0.94.2" }
+nuon = { path = "../nuon", version = "0.94.3" }
 
 alphanumeric-sort = { workspace = true }
 base64 = { workspace = true }
@@ -137,8 +137,8 @@ trash-support = ["trash"]
 which-support = []
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.2" }
-nu-test-support = { path = "../nu-test-support", version = "0.94.2" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.3" }
+nu-test-support = { path = "../nu-test-support", version = "0.94.3" }
 
 dirs-next = { workspace = true }
 mockito = { workspace = true, default-features = false }
@@ -146,4 +146,4 @@ quickcheck = { workspace = true }
 quickcheck_macros = { workspace = true }
 rstest = { workspace = true, default-features = false }
 pretty_assertions = { workspace = true }
-tempfile = { workspace = true }
\ No newline at end of file
+tempfile = { workspace = true }
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index d8a90fb70e..fae2b3eff4 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-engine"
 edition = "2021"
 license = "MIT"
 name = "nu-engine"
-version = "0.94.2"
+version = "0.94.3"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.94.2" }
-nu-path = { path = "../nu-path", version = "0.94.2" }
-nu-glob = { path = "../nu-glob", version = "0.94.2" }
-nu-utils = { path = "../nu-utils", version = "0.94.2" }
+nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.94.3" }
+nu-path = { path = "../nu-path", version = "0.94.3" }
+nu-glob = { path = "../nu-glob", version = "0.94.3" }
+nu-utils = { path = "../nu-utils", version = "0.94.3" }
 
 [features]
-plugin = []
\ No newline at end of file
+plugin = []
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index 0837d9d683..dc17e6087d 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -5,21 +5,21 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-explore"
 edition = "2021"
 license = "MIT"
 name = "nu-explore"
-version = "0.94.2"
+version = "0.94.3"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
-nu-parser = { path = "../nu-parser", version = "0.94.2" }
-nu-color-config = { path = "../nu-color-config", version = "0.94.2" }
-nu-engine = { path = "../nu-engine", version = "0.94.2" }
-nu-table = { path = "../nu-table", version = "0.94.2" }
-nu-json = { path = "../nu-json", version = "0.94.2" }
-nu-utils = { path = "../nu-utils", version = "0.94.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
+nu-parser = { path = "../nu-parser", version = "0.94.3" }
+nu-color-config = { path = "../nu-color-config", version = "0.94.3" }
+nu-engine = { path = "../nu-engine", version = "0.94.3" }
+nu-table = { path = "../nu-table", version = "0.94.3" }
+nu-json = { path = "../nu-json", version = "0.94.3" }
+nu-utils = { path = "../nu-utils", version = "0.94.3" }
 nu-ansi-term = { workspace = true }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.94.2" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.94.3" }
 
 anyhow = { workspace = true }
 log = { workspace = true }
@@ -32,4 +32,4 @@ ansi-str = { workspace = true }
 unicode-width = { workspace = true }
 lscolors = { workspace = true, default-features = false, features = [
   "nu-ansi-term",
-] }
\ No newline at end of file
+] }
diff --git a/crates/nu-glob/Cargo.toml b/crates/nu-glob/Cargo.toml
index d7568f7b2d..3e0dbfbd12 100644
--- a/crates/nu-glob/Cargo.toml
+++ b/crates/nu-glob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-glob"
-version = "0.94.2"
+version = "0.94.3"
 authors = ["The Nushell Project Developers", "The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 description = """
@@ -14,4 +14,4 @@ categories = ["filesystem"]
 bench = false
 
 [dev-dependencies]
-doc-comment = "0.3"
\ No newline at end of file
+doc-comment = "0.3"
diff --git a/crates/nu-json/Cargo.toml b/crates/nu-json/Cargo.toml
index 63a80f4b91..9d348d00d4 100644
--- a/crates/nu-json/Cargo.toml
+++ b/crates/nu-json/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-json"
 edition = "2021"
 license = "MIT"
 name = "nu-json"
-version = "0.94.2"
+version = "0.94.3"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -23,5 +23,5 @@ serde = { workspace =  true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-# nu-path = { path="../nu-path", version = "0.94.2" }
-# serde_json = "1.0"
\ No newline at end of file
+# nu-path = { path="../nu-path", version = "0.94.3" }
+# serde_json = "1.0"
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index 0732862bff..c4e495f040 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -3,14 +3,14 @@ authors = ["The Nushell Project Developers"]
 description = "Nushell's integrated LSP server"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-lsp"
 name = "nu-lsp"
-version = "0.94.2"
+version = "0.94.3"
 edition = "2021"
 license = "MIT"
 
 [dependencies]
-nu-cli = { path = "../nu-cli", version = "0.94.2" }
-nu-parser = { path = "../nu-parser", version = "0.94.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
+nu-cli = { path = "../nu-cli", version = "0.94.3" }
+nu-parser = { path = "../nu-parser", version = "0.94.3" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
 
 reedline = { workspace = true }
 
@@ -23,8 +23,8 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.2" }
-nu-command = { path = "../nu-command", version = "0.94.2" }
-nu-test-support = { path = "../nu-test-support", version = "0.94.2" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.3" }
+nu-command = { path = "../nu-command", version = "0.94.3" }
+nu-test-support = { path = "../nu-test-support", version = "0.94.3" }
 
-assert-json-diff = "2.0"
\ No newline at end of file
+assert-json-diff = "2.0"
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index fa840fc483..742009424a 100644
--- a/crates/nu-parser/Cargo.toml
+++ b/crates/nu-parser/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-parser"
 edition = "2021"
 license = "MIT"
 name = "nu-parser"
-version = "0.94.2"
+version = "0.94.3"
 exclude = ["/fuzz"]
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.94.2" }
-nu-path = { path = "../nu-path", version = "0.94.2" }
-nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.94.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
+nu-engine = { path = "../nu-engine", version = "0.94.3" }
+nu-path = { path = "../nu-path", version = "0.94.3" }
+nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.94.3" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
 
 bytesize = { workspace = true }
 chrono = { default-features = false, features = ['std'], workspace = true }
@@ -27,4 +27,4 @@ serde_json = { workspace = true }
 rstest = { workspace = true, default-features = false }
 
 [features]
-plugin = ["nu-plugin-engine"]
\ No newline at end of file
+plugin = ["nu-plugin-engine"]
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index bdd0157e4f..e3c84acdb3 100644
--- a/crates/nu-path/Cargo.toml
+++ b/crates/nu-path/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-path"
 edition = "2021"
 license = "MIT"
 name = "nu-path"
-version = "0.94.2"
+version = "0.94.3"
 exclude = ["/fuzz"]
 
 [lib]
@@ -18,4 +18,4 @@ dirs-next = { workspace = true }
 omnipath = { workspace = true }
 
 [target.'cfg(all(unix, not(target_os = "macos"), not(target_os = "android")))'.dependencies]
-pwd = { workspace = true }
\ No newline at end of file
+pwd = { workspace = true }
diff --git a/crates/nu-plugin-core/Cargo.toml b/crates/nu-plugin-core/Cargo.toml
index 580e0287e2..965b09d085 100644
--- a/crates/nu-plugin-core/Cargo.toml
+++ b/crates/nu-plugin-core/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-core
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-core"
-version = "0.94.2"
+version = "0.94.3"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.2", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.3", default-features = false }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true }
@@ -25,4 +25,4 @@ default = ["local-socket"]
 local-socket = ["interprocess", "nu-plugin-protocol/local-socket"]
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows = { workspace = true }
\ No newline at end of file
+windows = { workspace = true }
diff --git a/crates/nu-plugin-engine/Cargo.toml b/crates/nu-plugin-engine/Cargo.toml
index 50fe40ab0a..95c0298c09 100644
--- a/crates/nu-plugin-engine/Cargo.toml
+++ b/crates/nu-plugin-engine/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-engi
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-engine"
-version = "0.94.2"
+version = "0.94.3"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.94.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
-nu-system = { path = "../nu-system", version = "0.94.2" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.2" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.94.2", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.94.3" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
+nu-system = { path = "../nu-system", version = "0.94.3" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.3" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.94.3", default-features = false }
 
 serde = { workspace = true }
 log = { workspace = true }
@@ -31,4 +31,4 @@ local-socket = ["nu-plugin-core/local-socket"]
 windows = { workspace = true, features = [
   # For setting process creation flags
   "Win32_System_Threading",
-] }
\ No newline at end of file
+] }
diff --git a/crates/nu-plugin-protocol/Cargo.toml b/crates/nu-plugin-protocol/Cargo.toml
index b52655a4f1..41c8a7c535 100644
--- a/crates/nu-plugin-protocol/Cargo.toml
+++ b/crates/nu-plugin-protocol/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-prot
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-protocol"
-version = "0.94.2"
+version = "0.94.3"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.94.2", features = ["plugin"] }
-nu-utils = { path = "../nu-utils", version = "0.94.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.3", features = ["plugin"] }
+nu-utils = { path = "../nu-utils", version = "0.94.3" }
 
 bincode = "1.3"
 serde = { workspace = true, features = ["derive"] }
@@ -21,4 +21,4 @@ typetag = "0.2"
 
 [features]
 default = ["local-socket"]
-local-socket = []
\ No newline at end of file
+local-socket = []
diff --git a/crates/nu-plugin-test-support/Cargo.toml b/crates/nu-plugin-test-support/Cargo.toml
index b5ef1e4c02..bc390d3994 100644
--- a/crates/nu-plugin-test-support/Cargo.toml
+++ b/crates/nu-plugin-test-support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-plugin-test-support"
-version = "0.94.2"
+version = "0.94.3"
 edition = "2021"
 license = "MIT"
 description = "Testing support for Nushell plugins"
@@ -12,17 +12,17 @@ bench = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.94.2", features = ["plugin"] }
-nu-protocol = { path = "../nu-protocol", version = "0.94.2", features = ["plugin"] }
-nu-parser = { path = "../nu-parser", version = "0.94.2", features = ["plugin"] }
-nu-plugin = { path = "../nu-plugin", version = "0.94.2" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.94.2" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.94.2" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.2" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.2" }
+nu-engine = { path = "../nu-engine", version = "0.94.3", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.94.3", features = ["plugin"] }
+nu-parser = { path = "../nu-parser", version = "0.94.3", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.94.3" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.94.3" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.94.3" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.3" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.3" }
 nu-ansi-term = { workspace = true }
 similar = "2.5"
 
 [dev-dependencies]
 typetag = "0.2"
-serde = "1.0"
\ No newline at end of file
+serde = "1.0"
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index 0a9a169474..68b3a7cadd 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin"
 edition = "2021"
 license = "MIT"
 name = "nu-plugin"
-version = "0.94.2"
+version = "0.94.3"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.94.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.2" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.94.2", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.94.3" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.3" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.94.3", default-features = false }
 
 log = { workspace = true }
 thiserror = "1.0"
@@ -29,4 +29,4 @@ local-socket = ["nu-plugin-core/local-socket"]
 
 [target.'cfg(target_family = "unix")'.dependencies]
 # For setting the process group ID (EnterForeground / LeaveForeground)
-nix = { workspace = true, default-features = false, features = ["process"] }
\ No newline at end of file
+nix = { workspace = true, default-features = false, features = ["process"] }
diff --git a/crates/nu-pretty-hex/Cargo.toml b/crates/nu-pretty-hex/Cargo.toml
index 152d03df72..ae5be298aa 100644
--- a/crates/nu-pretty-hex/Cargo.toml
+++ b/crates/nu-pretty-hex/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-pretty-hex"
 edition = "2021"
 license = "MIT"
 name = "nu-pretty-hex"
-version = "0.94.2"
+version = "0.94.3"
 
 [lib]
 doctest = false
@@ -18,4 +18,4 @@ nu-ansi-term = { workspace = true }
 
 [dev-dependencies]
 heapless = { version = "0.8", default-features = false }
-rand = "0.8"
\ No newline at end of file
+rand = "0.8"
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 2ccd0a07ce..de73ba1a2c 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-protocol"
 edition = "2021"
 license = "MIT"
 name = "nu-protocol"
-version = "0.94.2"
+version = "0.94.3"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,9 +13,9 @@ version = "0.94.2"
 bench = false
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.94.2" }
-nu-path = { path = "../nu-path", version = "0.94.2" }
-nu-system = { path = "../nu-system", version = "0.94.2" }
+nu-utils = { path = "../nu-utils", version = "0.94.3" }
+nu-path = { path = "../nu-path", version = "0.94.3" }
+nu-system = { path = "../nu-system", version = "0.94.3" }
 
 brotli = { workspace = true, optional = true }
 byte-unit = { version = "5.1", features = [ "serde" ] }
@@ -45,11 +45,11 @@ plugin = [
 serde_json = { workspace = true }
 strum = "0.26"
 strum_macros = "0.26"
-nu-test-support = { path = "../nu-test-support", version = "0.94.2" }
+nu-test-support = { path = "../nu-test-support", version = "0.94.3" }
 pretty_assertions = { workspace = true }
 rstest = { workspace = true }
 tempfile = { workspace = true }
 os_pipe = { workspace = true }
 
 [package.metadata.docs.rs]
-all-features = true
\ No newline at end of file
+all-features = true
diff --git a/crates/nu-std/Cargo.toml b/crates/nu-std/Cargo.toml
index 4e5850c3fb..660d418097 100644
--- a/crates/nu-std/Cargo.toml
+++ b/crates/nu-std/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-std"
 edition = "2021"
 license = "MIT"
 name = "nu-std"
-version = "0.94.2"
+version = "0.94.3"
 
 [dependencies]
-nu-parser = { version = "0.94.2", path = "../nu-parser" }
-nu-protocol = { version = "0.94.2", path = "../nu-protocol" }
-nu-engine = { version = "0.94.2", path = "../nu-engine" }
+nu-parser = { version = "0.94.3", path = "../nu-parser" }
+nu-protocol = { version = "0.94.3", path = "../nu-protocol" }
+nu-engine = { version = "0.94.3", path = "../nu-engine" }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
 
-log = "0.4"
\ No newline at end of file
+log = "0.4"
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index 17e621db90..3e888dba49 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["The Nushell Project Developers", "procs creators"]
 description = "Nushell system querying"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-system"
 name = "nu-system"
-version = "0.94.2"
+version = "0.94.3"
 edition = "2021"
 license = "MIT"
 
@@ -45,4 +45,4 @@ windows = { workspace = true, features = [
   "Win32_System_SystemInformation",
   "Win32_System_Threading",
   "Win32_UI_Shell",
-]}
\ No newline at end of file
+]}
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index fe1de742d9..af7cf19f36 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -5,20 +5,20 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-table"
 edition = "2021"
 license = "MIT"
 name = "nu-table"
-version = "0.94.2"
+version = "0.94.3"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
-nu-utils = { path = "../nu-utils", version = "0.94.2" }
-nu-engine = { path = "../nu-engine", version = "0.94.2" }
-nu-color-config = { path = "../nu-color-config", version = "0.94.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
+nu-utils = { path = "../nu-utils", version = "0.94.3" }
+nu-engine = { path = "../nu-engine", version = "0.94.3" }
+nu-color-config = { path = "../nu-color-config", version = "0.94.3" }
 nu-ansi-term = { workspace = true }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 tabled = { workspace = true, features = ["color"], default-features = false }
 
 [dev-dependencies]
-# nu-test-support = { path="../nu-test-support", version = "0.94.2"  }
\ No newline at end of file
+# nu-test-support = { path="../nu-test-support", version = "0.94.3"  }
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index bc560257f8..47f6724b53 100644
--- a/crates/nu-term-grid/Cargo.toml
+++ b/crates/nu-term-grid/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-term-grid"
 edition = "2021"
 license = "MIT"
 name = "nu-term-grid"
-version = "0.94.2"
+version = "0.94.3"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.94.2" }
+nu-utils = { path = "../nu-utils", version = "0.94.3" }
 
-unicode-width = { workspace = true }
\ No newline at end of file
+unicode-width = { workspace = true }
diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml
index 07f4142d43..86a1bf35e7 100644
--- a/crates/nu-test-support/Cargo.toml
+++ b/crates/nu-test-support/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-test-suppor
 edition = "2021"
 license = "MIT"
 name = "nu-test-support"
-version = "0.94.2"
+version = "0.94.3"
 
 [lib]
 doctest = false
 bench = false
 
 [dependencies]
-nu-path = { path = "../nu-path", version = "0.94.2" }
-nu-glob = { path = "../nu-glob", version = "0.94.2" }
-nu-utils = { path = "../nu-utils", version = "0.94.2" }
+nu-path = { path = "../nu-path", version = "0.94.3" }
+nu-glob = { path = "../nu-glob", version = "0.94.3" }
+nu-utils = { path = "../nu-utils", version = "0.94.3" }
 
 num-format = { workspace = true }
 which = { workspace = true }
-tempfile = { workspace = true }
\ No newline at end of file
+tempfile = { workspace = true }
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index 584602f184..0677f655d0 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-utils"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-utils"
-version = "0.94.2"
+version = "0.94.3"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
@@ -29,4 +29,4 @@ unicase = "2.7.0"
 crossterm_winapi = "0.9"
 
 [target.'cfg(unix)'.dependencies]
-nix = { workspace = true, default-features = false, features = ["user", "fs"] }
\ No newline at end of file
+nix = { workspace = true, default-features = false, features = ["user", "fs"] }
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index 6d84d8d1de..b6b1fbf3f8 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -1,6 +1,6 @@
 # Nushell Config File
 #
-# version = "0.94.2"
+# version = "0.94.3"
 
 # For more information on defining custom themes, see
 # https://www.nushell.sh/book/coloring_and_theming.html
@@ -892,4 +892,4 @@ $env.config = {
             event: { edit: selectall }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/crates/nu-utils/src/sample_config/default_env.nu b/crates/nu-utils/src/sample_config/default_env.nu
index edf0830f9f..57e255ed20 100644
--- a/crates/nu-utils/src/sample_config/default_env.nu
+++ b/crates/nu-utils/src/sample_config/default_env.nu
@@ -1,6 +1,6 @@
 # Nushell Environment Config File
 #
-# version = "0.94.2"
+# version = "0.94.3"
 
 def create_left_prompt [] {
     let dir = match (do --ignore-shell-errors { $env.PWD | path relative-to $nu.home-path }) {
@@ -97,4 +97,4 @@ $env.NU_PLUGIN_DIRS = [
 # $env.PATH = ($env.PATH | uniq)
 
 # To load from a custom file you can use:
-# source ($nu.default-config-dir | path join 'custom.nu')
\ No newline at end of file
+# source ($nu.default-config-dir | path join 'custom.nu')
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index 2f5ae29e3d..2791cdaa6f 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -10,10 +10,10 @@ name = "nu_plugin_custom_values"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.94.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.2", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.94.3" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.3", features = ["plugin"] }
 serde = { workspace = true, default-features = false }
 typetag = "0.2"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.2" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.3" }
diff --git a/crates/nu_plugin_example/Cargo.toml b/crates/nu_plugin_example/Cargo.toml
index de370a0a5d..b2fd13abd9 100644
--- a/crates/nu_plugin_example/Cargo.toml
+++ b/crates/nu_plugin_example/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_exam
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_example"
-version = "0.94.2"
+version = "0.94.3"
 
 [[bin]]
 name = "nu_plugin_example"
@@ -15,9 +15,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.94.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.2", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.94.3" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.3", features = ["plugin"] }
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.2" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.2" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.3" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.3" }
diff --git a/crates/nu_plugin_formats/Cargo.toml b/crates/nu_plugin_formats/Cargo.toml
index 797eb69656..a649a5bc5a 100644
--- a/crates/nu_plugin_formats/Cargo.toml
+++ b/crates/nu_plugin_formats/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_form
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_formats"
-version = "0.94.2"
+version = "0.94.3"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.94.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.2", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.94.3" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.3", features = ["plugin"] }
 
 indexmap = { workspace = true }
 eml-parser = "0.1"
@@ -18,4 +18,4 @@ ical = "0.11"
 rust-ini = "0.21.0"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.2" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.3" }
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index a16bf019f6..01e17fdb54 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gsta
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_gstat"
-version = "0.94.2"
+version = "0.94.3"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_gstat"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.94.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
+nu-plugin = { path = "../nu-plugin", version = "0.94.3" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
 
-git2 = "0.18"
\ No newline at end of file
+git2 = "0.18"
diff --git a/crates/nu_plugin_inc/Cargo.toml b/crates/nu_plugin_inc/Cargo.toml
index 7b57d1591c..3701ad49bd 100644
--- a/crates/nu_plugin_inc/Cargo.toml
+++ b/crates/nu_plugin_inc/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_inc"
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_inc"
-version = "0.94.2"
+version = "0.94.3"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_inc"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.94.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.2", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.94.3" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.3", features = ["plugin"] }
 
-semver = "1.0"
\ No newline at end of file
+semver = "1.0"
diff --git a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
index 15c8340c0e..028e9735fd 100755
--- a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
+++ b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
@@ -6,7 +6,7 @@
 # it also allows us to test the plugin interface with something manually implemented in a scripting
 # language without adding any extra dependencies to our tests.
 
-const NUSHELL_VERSION = "0.94.2"
+const NUSHELL_VERSION = "0.94.3"
 
 def main [--stdio] {
   if ($stdio) {
@@ -257,4 +257,4 @@ def start_plugin [] {
     }) |
     each { from json | handle_input } |
     ignore
-}
\ No newline at end of file
+}
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 0855bc9b16..a2c693128d 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu_plugin_polars"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_polars"
-version = "0.94.2"
+version = "0.94.3"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -17,9 +17,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
-nu-plugin = { path = "../nu-plugin", version = "0.94.2" }
-nu-path = { path = "../nu-path", version = "0.94.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
+nu-plugin = { path = "../nu-plugin", version = "0.94.3" }
+nu-path = { path = "../nu-path", version = "0.94.3" }
 
 # Potential dependencies for extras
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
@@ -73,9 +73,9 @@ optional = false
 version = "0.39"
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.2" }
-nu-engine = { path = "../nu-engine", version = "0.94.2" }
-nu-parser = { path = "../nu-parser", version = "0.94.2" }
-nu-command = { path = "../nu-command", version = "0.94.2" }
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.2" }
-tempfile.workspace = true
\ No newline at end of file
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.3" }
+nu-engine = { path = "../nu-engine", version = "0.94.3" }
+nu-parser = { path = "../nu-parser", version = "0.94.3" }
+nu-command = { path = "../nu-command", version = "0.94.3" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.3" }
+tempfile.workspace = true
diff --git a/crates/nu_plugin_python/nu_plugin_python_example.py b/crates/nu_plugin_python/nu_plugin_python_example.py
index b2cb06c7eb..3db89a0afc 100755
--- a/crates/nu_plugin_python/nu_plugin_python_example.py
+++ b/crates/nu_plugin_python/nu_plugin_python_example.py
@@ -27,7 +27,7 @@ import sys
 import json
 
 
-NUSHELL_VERSION = "0.94.2"
+NUSHELL_VERSION = "0.94.3"
 
 
 def signatures():
@@ -124,7 +124,7 @@ def process_call(id, plugin_call):
     span = plugin_call["call"]["head"]
 
     # Creates a Value of type List that will be encoded and sent to Nushell
-    f = lambda x, y: {
+    def f(x, y): return {
         "Int": {
             "val": x * y,
             "span": span
@@ -169,7 +169,7 @@ def tell_nushell_hello():
     """
     hello = {
         "Hello": {
-            "protocol": "nu-plugin", # always this value
+            "protocol": "nu-plugin",  # always this value
             "version": NUSHELL_VERSION,
             "features": []
         }
@@ -246,8 +246,9 @@ def plugin():
         input = json.loads(line)
         handle_input(input)
 
+
 if __name__ == "__main__":
     if len(sys.argv) == 2 and sys.argv[1] == "--stdio":
         plugin()
     else:
-        print("Run me from inside nushell!")
\ No newline at end of file
+        print("Run me from inside nushell!")
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index 0fd251e646..20a2a2729d 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_quer
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_query"
-version = "0.94.2"
+version = "0.94.3"
 
 [lib]
 doctest = false
@@ -16,10 +16,10 @@ name = "nu_plugin_query"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.94.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
+nu-plugin = { path = "../nu-plugin", version = "0.94.3" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
 
 gjson = "0.8"
 scraper = { default-features = false, version = "0.19" }
 sxd-document = "0.3"
-sxd-xpath = "0.4"
\ No newline at end of file
+sxd-xpath = "0.4"
diff --git a/crates/nu_plugin_stress_internals/Cargo.toml b/crates/nu_plugin_stress_internals/Cargo.toml
index 884244a5db..7103d99cda 100644
--- a/crates/nu_plugin_stress_internals/Cargo.toml
+++ b/crates/nu_plugin_stress_internals/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_stre
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_stress_internals"
-version = "0.94.2"
+version = "0.94.3"
 
 [[bin]]
 name = "nu_plugin_stress_internals"
@@ -16,4 +16,4 @@ bench = false
 # assumptions about the serialized format
 serde = { workspace = true }
 serde_json = { workspace = true }
-interprocess = { workspace = true }
\ No newline at end of file
+interprocess = { workspace = true }
diff --git a/crates/nuon/Cargo.toml b/crates/nuon/Cargo.toml
index 80a4de36ae..31c0cdd363 100644
--- a/crates/nuon/Cargo.toml
+++ b/crates/nuon/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nuon"
 edition = "2021"
 license = "MIT"
 name = "nuon"
-version = "0.94.2"
+version = "0.94.3"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-parser = { path = "../nu-parser", version = "0.94.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.2" }
-nu-engine = { path = "../nu-engine", version = "0.94.2" }
+nu-parser = { path = "../nu-parser", version = "0.94.3" }
+nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
+nu-engine = { path = "../nu-engine", version = "0.94.3" }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 
 [dev-dependencies]
-chrono = { workspace = true }
\ No newline at end of file
+chrono = { workspace = true }

From a84fdb1d375aa0478cae0a452a8b1aa002deef07 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Tue, 4 Jun 2024 16:40:02 -0700
Subject: [PATCH 0055/1072] Fixed a couple of incorrect errors messages
 (#13043)

Fixed a couple of error message that incorrectly reported as parquet
errors instead of CSV errors.
---
 crates/nu_plugin_polars/src/dataframe/eager/open.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/eager/open.rs b/crates/nu_plugin_polars/src/dataframe/eager/open.rs
index da9352b2d3..81ea537574 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/open.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/open.rs
@@ -465,7 +465,7 @@ fn from_csv(
         let df: NuLazyFrame = csv_reader
             .finish()
             .map_err(|e| ShellError::GenericError {
-                error: "Parquet reader error".into(),
+                error: "CSV reader error".into(),
                 msg: format!("{e:?}"),
                 span: Some(call.head),
                 help: None,
@@ -531,7 +531,7 @@ fn from_csv(
         let df: NuDataFrame = csv_reader
             .finish()
             .map_err(|e| ShellError::GenericError {
-                error: "Parquet reader error".into(),
+                error: "CSV reader error".into(),
                 msg: format!("{e:?}"),
                 span: Some(call.head),
                 help: None,

From 7746e84199a51715df64d19d4ee5ef40ec05c78c Mon Sep 17 00:00:00 2001
From: Reilly Wood <26268125+rgwood@users.noreply.github.com>
Date: Tue, 4 Jun 2024 16:43:12 -0700
Subject: [PATCH 0056/1072] Make LS_COLORS functionality faster in `explore`,
 especially on Windows (#12984)

Closes #12980. More context there, but basically `explore` was getting
file metadata for every row every time the record view was rendered. The
quick fix for now is to do the `LS_COLORS` colouring with a `&str`
instead of a path and file metadata.
---
 crates/nu-explore/src/nu_common/lscolor.rs | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/crates/nu-explore/src/nu_common/lscolor.rs b/crates/nu-explore/src/nu_common/lscolor.rs
index 31a5571ef5..491d2c3f3a 100644
--- a/crates/nu-explore/src/nu_common/lscolor.rs
+++ b/crates/nu-explore/src/nu_common/lscolor.rs
@@ -4,7 +4,6 @@ use nu_ansi_term::{Color, Style};
 use nu_engine::env_to_string;
 use nu_protocol::engine::{EngineState, Stack};
 use nu_utils::get_ls_colors;
-use std::fs::symlink_metadata;
 
 pub fn create_lscolors(engine_state: &EngineState, stack: &Stack) -> LsColors {
     let colors = stack
@@ -14,6 +13,7 @@ pub fn create_lscolors(engine_state: &EngineState, stack: &Stack) -> LsColors {
     get_ls_colors(colors)
 }
 
+/// Colorizes any columns named "name" in the table using LS_COLORS
 pub fn lscolorize(header: &[String], data: &mut [Vec<NuText>], lscolors: &LsColors) {
     for (col, col_name) in header.iter().enumerate() {
         if col_name != "name" {
@@ -33,14 +33,7 @@ pub fn lscolorize(header: &[String], data: &mut [Vec<NuText>], lscolors: &LsColo
 
 fn get_path_style(path: &str, ls_colors: &LsColors) -> Option<Style> {
     let stripped_path = nu_utils::strip_ansi_unlikely(path);
-
-    let style = match symlink_metadata(stripped_path.as_ref()) {
-        Ok(metadata) => {
-            ls_colors.style_for_path_with_metadata(stripped_path.as_ref(), Some(&metadata))
-        }
-        Err(_) => ls_colors.style_for_path(stripped_path.as_ref()),
-    };
-
+    let style = ls_colors.style_for_str(stripped_path.as_ref());
     style.map(lsstyle_to_nu_style)
 }
 

From 3f0db11ae560dcb4bb24328c5eeb9a42b7f55610 Mon Sep 17 00:00:00 2001
From: Sang-Heon Jeon <ekffu200098@gmail.com>
Date: Wed, 5 Jun 2024 08:43:50 +0900
Subject: [PATCH 0057/1072] support plus sign for "into filesize" (#12974)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
Fixes https://github.com/nushell/nushell/issues/12968. After apply this
patch, we can use explict plus sign character included string with `into
filesize` cmd.

# User-Facing Changes
AS-IS (before fixing)
```
$ "+8 KiB" | into filesize
Error: nu::shell::cant_convert

  × Can't convert to int.
   ╭─[entry #31:1:1]
 1 │ "+8 KiB" | into filesize
   · ────┬───
   ·     ╰── can't convert string to int
   ╰────
```

TO-BE (after fixing)
```
$ "+8KiB" | into filesize
8.0 KiB
```

# Tests + Formatting
Added a test

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 .../src/conversions/into/filesize.rs          | 37 ++++++++------
 .../tests/commands/into_filesize.rs           | 51 ++++++++++++++++++-
 2 files changed, 72 insertions(+), 16 deletions(-)

diff --git a/crates/nu-command/src/conversions/into/filesize.rs b/crates/nu-command/src/conversions/into/filesize.rs
index b3c1e65a3b..101a9fe6f0 100644
--- a/crates/nu-command/src/conversions/into/filesize.rs
+++ b/crates/nu-command/src/conversions/into/filesize.rs
@@ -138,6 +138,7 @@ pub fn action(input: &Value, _args: &CellPathOnlyArgs, span: Span) -> Value {
         ),
     }
 }
+
 fn int_from_string(a_string: &str, span: Span) -> Result<i64, ShellError> {
     // Get the Locale so we know what the thousands separator is
     let locale = get_system_locale();
@@ -148,29 +149,35 @@ fn int_from_string(a_string: &str, span: Span) -> Result<i64, ShellError> {
     let clean_string = no_comma_string.trim();
 
     // Hadle negative file size
-    if let Some(stripped_string) = clean_string.strip_prefix('-') {
-        match stripped_string.parse::<bytesize::ByteSize>() {
+    if let Some(stripped_negative_string) = clean_string.strip_prefix('-') {
+        match stripped_negative_string.parse::<bytesize::ByteSize>() {
             Ok(n) => Ok(-(n.as_u64() as i64)),
-            Err(_) => Err(ShellError::CantConvert {
-                to_type: "int".into(),
-                from_type: "string".into(),
-                span,
-                help: None,
-            }),
+            Err(_) => Err(string_convert_error(span)),
+        }
+    } else if let Some(stripped_positive_string) = clean_string.strip_prefix('+') {
+        match stripped_positive_string.parse::<bytesize::ByteSize>() {
+            Ok(n) if stripped_positive_string.starts_with(|c: char| c.is_ascii_digit()) => {
+                Ok(n.as_u64() as i64)
+            }
+            _ => Err(string_convert_error(span)),
         }
     } else {
         match clean_string.parse::<bytesize::ByteSize>() {
-            Ok(n) => Ok(n.0 as i64),
-            Err(_) => Err(ShellError::CantConvert {
-                to_type: "int".into(),
-                from_type: "string".into(),
-                span,
-                help: None,
-            }),
+            Ok(n) => Ok(n.as_u64() as i64),
+            Err(_) => Err(string_convert_error(span)),
         }
     }
 }
 
+fn string_convert_error(span: Span) -> ShellError {
+    ShellError::CantConvert {
+        to_type: "filesize".into(),
+        from_type: "string".into(),
+        span,
+        help: None,
+    }
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/crates/nu-command/tests/commands/into_filesize.rs b/crates/nu-command/tests/commands/into_filesize.rs
index 2917e141db..d8ba88021c 100644
--- a/crates/nu-command/tests/commands/into_filesize.rs
+++ b/crates/nu-command/tests/commands/into_filesize.rs
@@ -63,8 +63,57 @@ fn into_filesize_negative_filesize() {
 }
 
 #[test]
-fn into_negative_filesize() {
+fn into_filesize_negative_str_filesize() {
+    let actual = nu!("'-3kib' | into filesize");
+
+    assert!(actual.out.contains("-3.0 KiB"));
+}
+
+#[test]
+fn into_filesize_wrong_negative_str_filesize() {
+    let actual = nu!("'--3kib' | into filesize");
+
+    assert!(actual.err.contains("can't convert string to filesize"));
+}
+
+#[test]
+fn into_filesize_negative_str() {
     let actual = nu!("'-1' | into filesize");
 
     assert!(actual.out.contains("-1 B"));
 }
+
+#[test]
+fn into_filesize_wrong_negative_str() {
+    let actual = nu!("'--1' | into filesize");
+
+    assert!(actual.err.contains("can't convert string to filesize"));
+}
+
+#[test]
+fn into_filesize_positive_str_filesize() {
+    let actual = nu!("'+1Kib' | into filesize");
+
+    assert!(actual.out.contains("1.0 KiB"));
+}
+
+#[test]
+fn into_filesize_wrong_positive_str_filesize() {
+    let actual = nu!("'++1Kib' | into filesize");
+
+    assert!(actual.err.contains("can't convert string to filesize"));
+}
+
+#[test]
+fn into_filesize_positive_str() {
+    let actual = nu!("'+1' | into filesize");
+
+    assert!(actual.out.contains("1 B"));
+}
+
+#[test]
+fn into_filesize_wrong_positive_str() {
+    let actual = nu!("'++1' | into filesize");
+
+    assert!(actual.err.contains("can't convert string to filesize"));
+}

From 65911c125cec2d9e2f06d916a20bba5ac06320d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20B=C3=BCsch?= <antoine.busch@gmail.com>
Date: Wed, 5 Jun 2024 10:00:39 +1000
Subject: [PATCH 0058/1072] Try to preserve the ordering of elements in from
 toml (#13045)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

Enable the `preserve_order` feature of the `toml` crate to preserve the
ordering of elements when converting from/to toml.

Additionally, use `to_string_pretty()` instead of `to_string()` in `to
toml`. This displays arrays on multiple lines instead of one big single
line. I'm not sure if this one is a good idea or not... Happy to remove
this from this PR if it's not.

# User-Facing Changes
The order of elements will be different when using `from toml`. The
formatting of arrays will also be different when using `to toml`. For
example:

- before
```
❯ "foo=1\nbar=2\ndoo=3" | from toml
╭─────┬───╮
│ bar │ 2 │
│ doo │ 3 │
│ foo │ 1 │
╰─────┴───╯
❯ {a: [a b c d]} | to toml
a = ["a", "b", "c", "d"]
```
- after
```
❯ "foo=1\nbar=2\ndoo=3" | from toml
╭─────┬───╮
│ foo │ 1 │
│ bar │ 2 │
│ doo │ 3 │
╰─────┴───╯
❯ {a: [a b c d]} | to toml
a = [
    "a",
    "b",
    "c",
    "d",
]
```

# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :red_circle: `toolkit test`
- :black_circle: `toolkit test stdlib`

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock                                |    1 +
 crates/nu-command/Cargo.toml              |    2 +-
 crates/nu-command/src/formats/to/toml.rs  |    4 +-
 crates/nu-command/tests/commands/table.rs | 1384 ++++++++++-----------
 4 files changed, 696 insertions(+), 695 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7c5596adba..23e18657db 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6068,6 +6068,7 @@ version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
 dependencies = [
+ "indexmap",
  "serde",
  "serde_spanned",
  "toml_datetime",
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index c6f71c8d25..4d69ce089a 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -86,7 +86,7 @@ sysinfo = { workspace = true }
 tabled = { workspace = true, features = ["color"], default-features = false }
 terminal_size = { workspace = true }
 titlecase = { workspace = true }
-toml = { workspace = true }
+toml = { workspace = true, features = ["preserve_order"]}
 unicode-segmentation = { workspace = true }
 ureq = { workspace = true, default-features = false, features = ["charset", "gzip", "json", "native-tls"] }
 url = { workspace = true }
diff --git a/crates/nu-command/src/formats/to/toml.rs b/crates/nu-command/src/formats/to/toml.rs
index 7423f147dd..187304a7c0 100644
--- a/crates/nu-command/src/formats/to/toml.rs
+++ b/crates/nu-command/src/formats/to/toml.rs
@@ -24,7 +24,7 @@ impl Command for ToToml {
         vec![Example {
             description: "Outputs an TOML string representing the contents of this record",
             example: r#"{foo: 1 bar: 'qwe'} | to toml"#,
-            result: Some(Value::test_string("bar = \"qwe\"\nfoo = 1\n")),
+            result: Some(Value::test_string("foo = 1\nbar = \"qwe\"\n")),
         }]
     }
 
@@ -103,7 +103,7 @@ fn toml_into_pipeline_data(
     value_type: Type,
     span: Span,
 ) -> Result<PipelineData, ShellError> {
-    match toml::to_string(&toml_value) {
+    match toml::to_string_pretty(&toml_value) {
         Ok(serde_toml_string) => Ok(Value::string(serde_toml_string, span).into_pipeline_data()),
         _ => Ok(Value::error(
             ShellError::CantConvert {
diff --git a/crates/nu-command/tests/commands/table.rs b/crates/nu-command/tests/commands/table.rs
index a986c7b15b..9c4f34ebfd 100644
--- a/crates/nu-command/tests/commands/table.rs
+++ b/crates/nu-command/tests/commands/table.rs
@@ -667,106 +667,6 @@ fn test_expand_big_0() {
 
         let expected = join_lines([
             "╭──────────────────┬───────────────────────────────────────────────────────────╮",
-            "│                  │ ╭───┬─────────┬────────────╮                              │",
-            "│ bench            │ │ # │ harness │    name    │                              │",
-            "│                  │ ├───┼─────────┼────────────┤                              │",
-            "│                  │ │ 0 │ false   │ benchmarks │                              │",
-            "│                  │ ╰───┴─────────┴────────────╯                              │",
-            "│                  │ ╭───┬──────┬─────────────╮                                │",
-            "│ bin              │ │ # │ name │    path     │                                │",
-            "│                  │ ├───┼──────┼─────────────┤                                │",
-            "│                  │ │ 0 │ nu   │ src/main.rs │                                │",
-            "│                  │ ╰───┴──────┴─────────────╯                                │",
-            "│                  │ ╭───────────────┬───────────────────────────────────────╮ │",
-            "│ dependencies     │ │               │ ╭──────────┬───────────────╮          │ │",
-            "│                  │ │ chrono        │ │          │ ╭───┬───────╮ │          │ │",
-            "│                  │ │               │ │ features │ │ 0 │ serde │ │          │ │",
-            "│                  │ │               │ │          │ ╰───┴───────╯ │          │ │",
-            "│                  │ │               │ │ version  │ 0.4.23        │          │ │",
-            "│                  │ │               │ ╰──────────┴───────────────╯          │ │",
-            "│                  │ │ crossterm     │ 0.24.0                                │ │",
-            "│                  │ │ ctrlc         │ 3.2.1                                 │ │",
-            "│                  │ │ is_executable │ 1.0.1                                 │ │",
-            "│                  │ │ log           │ 0.4                                   │ │",
-            "│                  │ │               │ ╭──────────┬────────────────────────╮ │ │",
-            "│                  │ │ miette        │ │          │ ╭───┬────────────────╮ │ │ │",
-            "│                  │ │               │ │ features │ │ 0 │ fancy-no-backt │ │ │ │",
-            "│                  │ │               │ │          │ │   │ race           │ │ │ │",
-            "│                  │ │               │ │          │ ╰───┴────────────────╯ │ │ │",
-            "│                  │ │               │ │ version  │ 5.5.0                  │ │ │",
-            "│                  │ │               │ ╰──────────┴────────────────────────╯ │ │",
-            "│                  │ │ nu-ansi-term  │ 0.46.0                                │ │",
-            "│                  │ │               │ ╭─────────┬─────────────────╮         │ │",
-            "│                  │ │ nu-cli        │ │ path    │ ./crates/nu-cli │         │ │",
-            "│                  │ │               │ │ version │ 0.74.1          │         │ │",
-            "│                  │ │               │ ╰─────────┴─────────────────╯         │ │",
-            "│                  │ │               │ ╭────────────┬──────────────────────╮ │ │",
-            "│                  │ │ nu-engine     │ │ path       │ ./crates/nu-engine   │ │ │",
-            "│                  │ │               │ │ version    │ 0.74.1               │ │ │",
-            "│                  │ │               │ ╰────────────┴──────────────────────╯ │ │",
-            "│                  │ │ rayon         │ 1.6.1                                 │ │",
-            "│                  │ │               │ ╭─────────────┬─────────────────────╮ │ │",
-            "│                  │ │ reedline      │ │             │ ╭───┬──────────╮    │ │ │",
-            "│                  │ │               │ │ features    │ │ 0 │ bashisms │    │ │ │",
-            "│                  │ │               │ │             │ │ 1 │ sqlite   │    │ │ │",
-            "│                  │ │               │ │             │ ╰───┴──────────╯    │ │ │",
-            "│                  │ │               │ │ version     │ 0.14.0              │ │ │",
-            "│                  │ │               │ ╰─────────────┴─────────────────────╯ │ │",
-            "│                  │ │ simplelog     │ 0.12.0                                │ │",
-            "│                  │ │ time          │ 0.3.12                                │ │",
-            "│                  │ ╰───────────────┴───────────────────────────────────────╯ │",
-            "│                  │ ╭───────────────────┬───────────────────────────────────╮ │",
-            "│ dev-dependencies │ │ assert_cmd        │ 2.0.2                             │ │",
-            "│                  │ │ criterion         │ 0.4                               │ │",
-            "│                  │ │ hamcrest2         │ 0.3.0                             │ │",
-            "│                  │ │ itertools         │ 0.10.3                            │ │",
-            "│                  │ │                   │ ╭─────────┬─────────────────────╮ │ │",
-            "│                  │ │ nu-test-support   │ │ path    │ ./crates/nu-test-su │ │ │",
-            "│                  │ │                   │ │         │ pport               │ │ │",
-            "│                  │ │                   │ │ version │ 0.74.1              │ │ │",
-            "│                  │ │                   │ ╰─────────┴─────────────────────╯ │ │",
-            "│                  │ │ pretty_assertions │ 1.0.0                             │ │",
-            "│                  │ │                   │ ╭────────────────────┬──────────╮ │ │",
-            "│                  │ │ rstest            │ │ default-features   │ false    │ │ │",
-            "│                  │ │                   │ │ version            │ 0.15.0   │ │ │",
-            "│                  │ │                   │ ╰────────────────────┴──────────╯ │ │",
-            "│                  │ │ serial_test       │ 0.10.0                            │ │",
-            "│                  │ │ tempfile          │ 3.2.0                             │ │",
-            "│                  │ ╰───────────────────┴───────────────────────────────────╯ │",
-            "│                  │ ╭─────────────────────┬─────────────────────────────────╮ │",
-            "│ features         │ │                     │ ╭───┬───────────────╮           │ │",
-            "│                  │ │ default             │ │ 0 │ plugin        │           │ │",
-            "│                  │ │                     │ │ 1 │ which-support │           │ │",
-            "│                  │ │                     │ │ 2 │ trash-support │           │ │",
-            "│                  │ │                     │ │ 3 │ sqlite        │           │ │",
-            "│                  │ │                     │ ╰───┴───────────────╯           │ │",
-            "│                  │ │                     │ ╭───┬─────────╮                 │ │",
-            "│                  │ │ extra               │ │ 0 │ default │                 │ │",
-            "│                  │ │                     │ ╰───┴─────────╯                 │ │",
-            "│                  │ │                     │ ╭───┬────────────────────╮      │ │",
-            "│                  │ │ plugin              │ │ 0 │ nu-plugin          │      │ │",
-            "│                  │ │                     │ │ 1 │ nu-cli/plugin      │      │ │",
-            "│                  │ │                     │ │ 2 │ nu-parser/plugin   │      │ │",
-            "│                  │ │                     │ │ 3 │ nu-command/plugin  │      │ │",
-            "│                  │ │                     │ │ 4 │ nu-protocol/plugin │      │ │",
-            "│                  │ │                     │ │ 5 │ nu-engine/plugin   │      │ │",
-            "│                  │ │                     │ ╰───┴────────────────────╯      │ │",
-            "│                  │ │                     │ ╭───┬─────────╮                 │ │",
-            "│                  │ │ stable              │ │ 0 │ default │                 │ │",
-            "│                  │ │                     │ ╰───┴─────────╯                 │ │",
-            "│                  │ │                     │ ╭───┬─────────────╮             │ │",
-            "│                  │ │ static-link-openssl │ │ 0 │ dep:openssl │             │ │",
-            "│                  │ │                     │ ╰───┴─────────────╯             │ │",
-            "│                  │ │                     │ ╭───┬─────────────────────────╮ │ │",
-            "│                  │ │ trash-support       │ │ 0 │ nu-command/trash-suppor │ │ │",
-            "│                  │ │                     │ │   │ t                       │ │ │",
-            "│                  │ │                     │ ╰───┴─────────────────────────╯ │ │",
-            "│                  │ │ wasi                │ [list 0 items]                  │ │",
-            "│                  │ │                     │ ╭───┬─────────────────────────╮ │ │",
-            "│                  │ │ which-support       │ │ 0 │ nu-command/which-suppor │ │ │",
-            "│                  │ │                     │ │   │ t                       │ │ │",
-            "│                  │ │                     │ ╰───┴─────────────────────────╯ │ │",
-            "│                  │ ╰─────────────────────┴─────────────────────────────────╯ │",
             "│                  │ ╭───────────────┬───────────────────────────────────────╮ │",
             "│ package          │ │               │ ╭───┬───────────────────────────────╮ │ │",
             "│                  │ │ authors       │ │ 0 │ The Nushell Project           │ │ │",
@@ -781,13 +681,13 @@ fn test_expand_big_0() {
             "│                  │ │               │ ╰───┴────────╯                        │ │",
             "│                  │ │ homepage      │ https://www.nushell.sh                │ │",
             "│                  │ │ license       │ MIT                                   │ │",
+            "│                  │ │ name          │ nu                                    │ │",
+            "│                  │ │ repository    │ https://github.com/nushell/nushell    │ │",
+            "│                  │ │ rust-version  │ 1.60                                  │ │",
+            "│                  │ │ version       │ 0.74.1                                │ │",
             "│                  │ │               │ ╭──────────┬────────────────────────╮ │ │",
             "│                  │ │ metadata      │ │          │ ╭───────────┬────────╮ │ │ │",
-            "│                  │ │               │ │ binstall │ │ overrides │ {recor │ │ │ │",
-            "│                  │ │               │ │          │ │           │ d 1    │ │ │ │",
-            "│                  │ │               │ │          │ │           │ field} │ │ │ │",
-            "│                  │ │               │ │          │ │ pkg-fmt   │ tgz    │ │ │ │",
-            "│                  │ │               │ │          │ │ pkg-url   │ { repo │ │ │ │",
+            "│                  │ │               │ │ binstall │ │ pkg-url   │ { repo │ │ │ │",
             "│                  │ │               │ │          │ │           │  }/rel │ │ │ │",
             "│                  │ │               │ │          │ │           │ eases/ │ │ │ │",
             "│                  │ │               │ │          │ │           │ downlo │ │ │ │",
@@ -803,33 +703,14 @@ fn test_expand_big_0() {
             "│                  │ │               │ │          │ │           │ rchive │ │ │ │",
             "│                  │ │               │ │          │ │           │ -forma │ │ │ │",
             "│                  │ │               │ │          │ │           │ t }    │ │ │ │",
+            "│                  │ │               │ │          │ │ pkg-fmt   │ tgz    │ │ │ │",
+            "│                  │ │               │ │          │ │ overrides │ {recor │ │ │ │",
+            "│                  │ │               │ │          │ │           │ d 1    │ │ │ │",
+            "│                  │ │               │ │          │ │           │ field} │ │ │ │",
             "│                  │ │               │ │          │ ╰───────────┴────────╯ │ │ │",
             "│                  │ │               │ ╰──────────┴────────────────────────╯ │ │",
-            "│                  │ │ name          │ nu                                    │ │",
-            "│                  │ │ repository    │ https://github.com/nushell/nushell    │ │",
-            "│                  │ │ rust-version  │ 1.60                                  │ │",
-            "│                  │ │ version       │ 0.74.1                                │ │",
             "│                  │ ╰───────────────┴───────────────────────────────────────╯ │",
             "│                  │ ╭───────────┬───────────────────────────────────────────╮ │",
-            "│ patch            │ │           │ ╭──────────┬────────────────────────────╮ │ │",
-            "│                  │ │ crates-io │ │          │ ╭────────┬───────────────╮ │ │ │",
-            "│                  │ │           │ │ reedline │ │ branch │ main          │ │ │ │",
-            "│                  │ │           │ │          │ │ git    │ https://githu │ │ │ │",
-            "│                  │ │           │ │          │ │        │ b.com/nushell │ │ │ │",
-            "│                  │ │           │ │          │ │        │ /reedline.git │ │ │ │",
-            "│                  │ │           │ │          │ ╰────────┴───────────────╯ │ │ │",
-            "│                  │ │           │ ╰──────────┴────────────────────────────╯ │ │",
-            "│                  │ ╰───────────┴───────────────────────────────────────────╯ │",
-            "│                  │ ╭─────────────────────────────────┬─────────────────────╮ │",
-            "│ target           │ │                                 │ ╭──────────────┬──╮ │ │",
-            "│                  │ │ cfg(not(target_os = \"windows\")) │ │ dependencies │  │ │ │",
-            "│                  │ │                                 │ ╰──────────────┴──╯ │ │",
-            "│                  │ │                                 │ ╭──────────────┬──╮ │ │",
-            "│                  │ │ cfg(target_family = \"unix\")     │ │ dependencies │  │ │ │",
-            "│                  │ │                                 │ ╰──────────────┴──╯ │ │",
-            "│                  │ │ cfg(windows)                    │ {record 1 field}    │ │",
-            "│                  │ ╰─────────────────────────────────┴─────────────────────╯ │",
-            "│                  │ ╭───────────┬───────────────────────────────────────────╮ │",
             "│ workspace        │ │           │ ╭────┬────────────────────────────────╮   │ │",
             "│                  │ │ members   │ │  0 │ crates/nu-cli                  │   │ │",
             "│                  │ │           │ │  1 │ crates/nu-engine               │   │ │",
@@ -846,6 +727,125 @@ fn test_expand_big_0() {
             "│                  │ │           │ │ 12 │ crates/nu-utils                │   │ │",
             "│                  │ │           │ ╰────┴────────────────────────────────╯   │ │",
             "│                  │ ╰───────────┴───────────────────────────────────────────╯ │",
+            "│                  │ ╭───────────────┬───────────────────────────────────────╮ │",
+            "│ dependencies     │ │               │ ╭──────────┬───────────────╮          │ │",
+            "│                  │ │ chrono        │ │ version  │ 0.4.23        │          │ │",
+            "│                  │ │               │ │          │ ╭───┬───────╮ │          │ │",
+            "│                  │ │               │ │ features │ │ 0 │ serde │ │          │ │",
+            "│                  │ │               │ │          │ ╰───┴───────╯ │          │ │",
+            "│                  │ │               │ ╰──────────┴───────────────╯          │ │",
+            "│                  │ │ crossterm     │ 0.24.0                                │ │",
+            "│                  │ │ ctrlc         │ 3.2.1                                 │ │",
+            "│                  │ │ log           │ 0.4                                   │ │",
+            "│                  │ │               │ ╭──────────┬────────────────────────╮ │ │",
+            "│                  │ │ miette        │ │ version  │ 5.5.0                  │ │ │",
+            "│                  │ │               │ │          │ ╭───┬────────────────╮ │ │ │",
+            "│                  │ │               │ │ features │ │ 0 │ fancy-no-backt │ │ │ │",
+            "│                  │ │               │ │          │ │   │ race           │ │ │ │",
+            "│                  │ │               │ │          │ ╰───┴────────────────╯ │ │ │",
+            "│                  │ │               │ ╰──────────┴────────────────────────╯ │ │",
+            "│                  │ │ nu-ansi-term  │ 0.46.0                                │ │",
+            "│                  │ │               │ ╭─────────┬─────────────────╮         │ │",
+            "│                  │ │ nu-cli        │ │ path    │ ./crates/nu-cli │         │ │",
+            "│                  │ │               │ │ version │ 0.74.1          │         │ │",
+            "│                  │ │               │ ╰─────────┴─────────────────╯         │ │",
+            "│                  │ │               │ ╭────────────┬──────────────────────╮ │ │",
+            "│                  │ │ nu-engine     │ │ path       │ ./crates/nu-engine   │ │ │",
+            "│                  │ │               │ │ version    │ 0.74.1               │ │ │",
+            "│                  │ │               │ ╰────────────┴──────────────────────╯ │ │",
+            "│                  │ │               │ ╭─────────────┬─────────────────────╮ │ │",
+            "│                  │ │ reedline      │ │ version     │ 0.14.0              │ │ │",
+            "│                  │ │               │ │             │ ╭───┬──────────╮    │ │ │",
+            "│                  │ │               │ │ features    │ │ 0 │ bashisms │    │ │ │",
+            "│                  │ │               │ │             │ │ 1 │ sqlite   │    │ │ │",
+            "│                  │ │               │ │             │ ╰───┴──────────╯    │ │ │",
+            "│                  │ │               │ ╰─────────────┴─────────────────────╯ │ │",
+            "│                  │ │ rayon         │ 1.6.1                                 │ │",
+            "│                  │ │ is_executable │ 1.0.1                                 │ │",
+            "│                  │ │ simplelog     │ 0.12.0                                │ │",
+            "│                  │ │ time          │ 0.3.12                                │ │",
+            "│                  │ ╰───────────────┴───────────────────────────────────────╯ │",
+            "│                  │ ╭─────────────────────────────────┬─────────────────────╮ │",
+            "│ target           │ │                                 │ ╭──────────────┬──╮ │ │",
+            "│                  │ │ cfg(not(target_os = \"windows\")) │ │ dependencies │  │ │ │",
+            "│                  │ │                                 │ ╰──────────────┴──╯ │ │",
+            "│                  │ │ cfg(windows)                    │ {record 1 field}    │ │",
+            "│                  │ │                                 │ ╭──────────────┬──╮ │ │",
+            "│                  │ │ cfg(target_family = \"unix\")     │ │ dependencies │  │ │ │",
+            "│                  │ │                                 │ ╰──────────────┴──╯ │ │",
+            "│                  │ ╰─────────────────────────────────┴─────────────────────╯ │",
+            "│                  │ ╭───────────────────┬───────────────────────────────────╮ │",
+            "│ dev-dependencies │ │                   │ ╭─────────┬─────────────────────╮ │ │",
+            "│                  │ │ nu-test-support   │ │ path    │ ./crates/nu-test-su │ │ │",
+            "│                  │ │                   │ │         │ pport               │ │ │",
+            "│                  │ │                   │ │ version │ 0.74.1              │ │ │",
+            "│                  │ │                   │ ╰─────────┴─────────────────────╯ │ │",
+            "│                  │ │ tempfile          │ 3.2.0                             │ │",
+            "│                  │ │ assert_cmd        │ 2.0.2                             │ │",
+            "│                  │ │ criterion         │ 0.4                               │ │",
+            "│                  │ │ pretty_assertions │ 1.0.0                             │ │",
+            "│                  │ │ serial_test       │ 0.10.0                            │ │",
+            "│                  │ │ hamcrest2         │ 0.3.0                             │ │",
+            "│                  │ │                   │ ╭────────────────────┬──────────╮ │ │",
+            "│                  │ │ rstest            │ │ version            │ 0.15.0   │ │ │",
+            "│                  │ │                   │ │ default-features   │ false    │ │ │",
+            "│                  │ │                   │ ╰────────────────────┴──────────╯ │ │",
+            "│                  │ │ itertools         │ 0.10.3                            │ │",
+            "│                  │ ╰───────────────────┴───────────────────────────────────╯ │",
+            "│                  │ ╭─────────────────────┬─────────────────────────────────╮ │",
+            "│ features         │ │                     │ ╭───┬────────────────────╮      │ │",
+            "│                  │ │ plugin              │ │ 0 │ nu-plugin          │      │ │",
+            "│                  │ │                     │ │ 1 │ nu-cli/plugin      │      │ │",
+            "│                  │ │                     │ │ 2 │ nu-parser/plugin   │      │ │",
+            "│                  │ │                     │ │ 3 │ nu-command/plugin  │      │ │",
+            "│                  │ │                     │ │ 4 │ nu-protocol/plugin │      │ │",
+            "│                  │ │                     │ │ 5 │ nu-engine/plugin   │      │ │",
+            "│                  │ │                     │ ╰───┴────────────────────╯      │ │",
+            "│                  │ │                     │ ╭───┬─────────╮                 │ │",
+            "│                  │ │ extra               │ │ 0 │ default │                 │ │",
+            "│                  │ │                     │ ╰───┴─────────╯                 │ │",
+            "│                  │ │                     │ ╭───┬───────────────╮           │ │",
+            "│                  │ │ default             │ │ 0 │ plugin        │           │ │",
+            "│                  │ │                     │ │ 1 │ which-support │           │ │",
+            "│                  │ │                     │ │ 2 │ trash-support │           │ │",
+            "│                  │ │                     │ │ 3 │ sqlite        │           │ │",
+            "│                  │ │                     │ ╰───┴───────────────╯           │ │",
+            "│                  │ │                     │ ╭───┬─────────╮                 │ │",
+            "│                  │ │ stable              │ │ 0 │ default │                 │ │",
+            "│                  │ │                     │ ╰───┴─────────╯                 │ │",
+            "│                  │ │ wasi                │ [list 0 items]                  │ │",
+            "│                  │ │                     │ ╭───┬─────────────╮             │ │",
+            "│                  │ │ static-link-openssl │ │ 0 │ dep:openssl │             │ │",
+            "│                  │ │                     │ ╰───┴─────────────╯             │ │",
+            "│                  │ │                     │ ╭───┬─────────────────────────╮ │ │",
+            "│                  │ │ which-support       │ │ 0 │ nu-command/which-suppor │ │ │",
+            "│                  │ │                     │ │   │ t                       │ │ │",
+            "│                  │ │                     │ ╰───┴─────────────────────────╯ │ │",
+            "│                  │ │                     │ ╭───┬─────────────────────────╮ │ │",
+            "│                  │ │ trash-support       │ │ 0 │ nu-command/trash-suppor │ │ │",
+            "│                  │ │                     │ │   │ t                       │ │ │",
+            "│                  │ │                     │ ╰───┴─────────────────────────╯ │ │",
+            "│                  │ ╰─────────────────────┴─────────────────────────────────╯ │",
+            "│                  │ ╭───┬──────┬─────────────╮                                │",
+            "│ bin              │ │ # │ name │    path     │                                │",
+            "│                  │ ├───┼──────┼─────────────┤                                │",
+            "│                  │ │ 0 │ nu   │ src/main.rs │                                │",
+            "│                  │ ╰───┴──────┴─────────────╯                                │",
+            "│                  │ ╭───────────┬───────────────────────────────────────────╮ │",
+            "│ patch            │ │           │ ╭──────────┬────────────────────────────╮ │ │",
+            "│                  │ │ crates-io │ │          │ ╭────────┬───────────────╮ │ │ │",
+            "│                  │ │           │ │ reedline │ │ git    │ https://githu │ │ │ │",
+            "│                  │ │           │ │          │ │        │ b.com/nushell │ │ │ │",
+            "│                  │ │           │ │          │ │        │ /reedline.git │ │ │ │",
+            "│                  │ │           │ │          │ │ branch │ main          │ │ │ │",
+            "│                  │ │           │ │          │ ╰────────┴───────────────╯ │ │ │",
+            "│                  │ │           │ ╰──────────┴────────────────────────────╯ │ │",
+            "│                  │ ╰───────────┴───────────────────────────────────────────╯ │",
+            "│                  │ ╭───┬────────────┬─────────╮                              │",
+            "│ bench            │ │ # │    name    │ harness │                              │",
+            "│                  │ ├───┼────────────┼─────────┤                              │",
+            "│                  │ │ 0 │ benchmarks │ false   │                              │",
+            "│                  │ ╰───┴────────────┴─────────╯                              │",
             "╰──────────────────┴───────────────────────────────────────────────────────────╯",
         ]);
 
@@ -858,102 +858,6 @@ fn test_expand_big_0() {
 
         let expected = join_lines([
             "╭──────────────────┬───────────────────────────────────────────────────────────────────────────────────────────────────╮",
-            "│                  │ ╭───┬─────────┬────────────╮                                                                      │",
-            "│ bench            │ │ # │ harness │    name    │                                                                      │",
-            "│                  │ ├───┼─────────┼────────────┤                                                                      │",
-            "│                  │ │ 0 │ false   │ benchmarks │                                                                      │",
-            "│                  │ ╰───┴─────────┴────────────╯                                                                      │",
-            "│                  │ ╭───┬──────┬─────────────╮                                                                        │",
-            "│ bin              │ │ # │ name │    path     │                                                                        │",
-            "│                  │ ├───┼──────┼─────────────┤                                                                        │",
-            "│                  │ │ 0 │ nu   │ src/main.rs │                                                                        │",
-            "│                  │ ╰───┴──────┴─────────────╯                                                                        │",
-            "│                  │ ╭───────────────┬───────────────────────────────────────────╮                                     │",
-            "│ dependencies     │ │               │ ╭──────────┬───────────────╮              │                                     │",
-            "│                  │ │ chrono        │ │          │ ╭───┬───────╮ │              │                                     │",
-            "│                  │ │               │ │ features │ │ 0 │ serde │ │              │                                     │",
-            "│                  │ │               │ │          │ ╰───┴───────╯ │              │                                     │",
-            "│                  │ │               │ │ version  │ 0.4.23        │              │                                     │",
-            "│                  │ │               │ ╰──────────┴───────────────╯              │                                     │",
-            "│                  │ │ crossterm     │ 0.24.0                                    │                                     │",
-            "│                  │ │ ctrlc         │ 3.2.1                                     │                                     │",
-            "│                  │ │ is_executable │ 1.0.1                                     │                                     │",
-            "│                  │ │ log           │ 0.4                                       │                                     │",
-            "│                  │ │               │ ╭──────────┬────────────────────────────╮ │                                     │",
-            "│                  │ │ miette        │ │          │ ╭───┬────────────────────╮ │ │                                     │",
-            "│                  │ │               │ │ features │ │ 0 │ fancy-no-backtrace │ │ │                                     │",
-            "│                  │ │               │ │          │ ╰───┴────────────────────╯ │ │                                     │",
-            "│                  │ │               │ │ version  │ 5.5.0                      │ │                                     │",
-            "│                  │ │               │ ╰──────────┴────────────────────────────╯ │                                     │",
-            "│                  │ │ nu-ansi-term  │ 0.46.0                                    │                                     │",
-            "│                  │ │               │ ╭─────────┬─────────────────╮             │                                     │",
-            "│                  │ │ nu-cli        │ │ path    │ ./crates/nu-cli │             │                                     │",
-            "│                  │ │               │ │ version │ 0.74.1          │             │                                     │",
-            "│                  │ │               │ ╰─────────┴─────────────────╯             │                                     │",
-            "│                  │ │               │ ╭─────────┬────────────────────╮          │                                     │",
-            "│                  │ │ nu-engine     │ │ path    │ ./crates/nu-engine │          │                                     │",
-            "│                  │ │               │ │ version │ 0.74.1             │          │                                     │",
-            "│                  │ │               │ ╰─────────┴────────────────────╯          │                                     │",
-            "│                  │ │ rayon         │ 1.6.1                                     │                                     │",
-            "│                  │ │               │ ╭──────────┬──────────────────╮           │                                     │",
-            "│                  │ │ reedline      │ │          │ ╭───┬──────────╮ │           │                                     │",
-            "│                  │ │               │ │ features │ │ 0 │ bashisms │ │           │                                     │",
-            "│                  │ │               │ │          │ │ 1 │ sqlite   │ │           │                                     │",
-            "│                  │ │               │ │          │ ╰───┴──────────╯ │           │                                     │",
-            "│                  │ │               │ │ version  │ 0.14.0           │           │                                     │",
-            "│                  │ │               │ ╰──────────┴──────────────────╯           │                                     │",
-            "│                  │ │ simplelog     │ 0.12.0                                    │                                     │",
-            "│                  │ │ time          │ 0.3.12                                    │                                     │",
-            "│                  │ ╰───────────────┴───────────────────────────────────────────╯                                     │",
-            "│                  │ ╭───────────────────┬────────────────────────────────────────╮                                    │",
-            "│ dev-dependencies │ │ assert_cmd        │ 2.0.2                                  │                                    │",
-            "│                  │ │ criterion         │ 0.4                                    │                                    │",
-            "│                  │ │ hamcrest2         │ 0.3.0                                  │                                    │",
-            "│                  │ │ itertools         │ 0.10.3                                 │                                    │",
-            "│                  │ │                   │ ╭─────────┬──────────────────────────╮ │                                    │",
-            "│                  │ │ nu-test-support   │ │ path    │ ./crates/nu-test-support │ │                                    │",
-            "│                  │ │                   │ │ version │ 0.74.1                   │ │                                    │",
-            "│                  │ │                   │ ╰─────────┴──────────────────────────╯ │                                    │",
-            "│                  │ │ pretty_assertions │ 1.0.0                                  │                                    │",
-            "│                  │ │                   │ ╭──────────────────┬────────╮          │                                    │",
-            "│                  │ │ rstest            │ │ default-features │ false  │          │                                    │",
-            "│                  │ │                   │ │ version          │ 0.15.0 │          │                                    │",
-            "│                  │ │                   │ ╰──────────────────┴────────╯          │                                    │",
-            "│                  │ │ serial_test       │ 0.10.0                                 │                                    │",
-            "│                  │ │ tempfile          │ 3.2.0                                  │                                    │",
-            "│                  │ ╰───────────────────┴────────────────────────────────────────╯                                    │",
-            "│                  │ ╭─────────────────────┬──────────────────────────────────╮                                        │",
-            "│ features         │ │                     │ ╭───┬───────────────╮            │                                        │",
-            "│                  │ │ default             │ │ 0 │ plugin        │            │                                        │",
-            "│                  │ │                     │ │ 1 │ which-support │            │                                        │",
-            "│                  │ │                     │ │ 2 │ trash-support │            │                                        │",
-            "│                  │ │                     │ │ 3 │ sqlite        │            │                                        │",
-            "│                  │ │                     │ ╰───┴───────────────╯            │                                        │",
-            "│                  │ │                     │ ╭───┬─────────╮                  │                                        │",
-            "│                  │ │ extra               │ │ 0 │ default │                  │                                        │",
-            "│                  │ │                     │ ╰───┴─────────╯                  │                                        │",
-            "│                  │ │                     │ ╭───┬────────────────────╮       │                                        │",
-            "│                  │ │ plugin              │ │ 0 │ nu-plugin          │       │                                        │",
-            "│                  │ │                     │ │ 1 │ nu-cli/plugin      │       │                                        │",
-            "│                  │ │                     │ │ 2 │ nu-parser/plugin   │       │                                        │",
-            "│                  │ │                     │ │ 3 │ nu-command/plugin  │       │                                        │",
-            "│                  │ │                     │ │ 4 │ nu-protocol/plugin │       │                                        │",
-            "│                  │ │                     │ │ 5 │ nu-engine/plugin   │       │                                        │",
-            "│                  │ │                     │ ╰───┴────────────────────╯       │                                        │",
-            "│                  │ │                     │ ╭───┬─────────╮                  │                                        │",
-            "│                  │ │ stable              │ │ 0 │ default │                  │                                        │",
-            "│                  │ │                     │ ╰───┴─────────╯                  │                                        │",
-            "│                  │ │                     │ ╭───┬─────────────╮              │                                        │",
-            "│                  │ │ static-link-openssl │ │ 0 │ dep:openssl │              │                                        │",
-            "│                  │ │                     │ ╰───┴─────────────╯              │                                        │",
-            "│                  │ │                     │ ╭───┬──────────────────────────╮ │                                        │",
-            "│                  │ │ trash-support       │ │ 0 │ nu-command/trash-support │ │                                        │",
-            "│                  │ │                     │ ╰───┴──────────────────────────╯ │                                        │",
-            "│                  │ │ wasi                │ [list 0 items]                   │                                        │",
-            "│                  │ │                     │ ╭───┬──────────────────────────╮ │                                        │",
-            "│                  │ │ which-support       │ │ 0 │ nu-command/which-support │ │                                        │",
-            "│                  │ │                     │ ╰───┴──────────────────────────╯ │                                        │",
-            "│                  │ ╰─────────────────────┴──────────────────────────────────╯                                        │",
             "│                  │ ╭───────────────┬───────────────────────────────────────────────────────────────────────────────╮ │",
             "│ package          │ │               │ ╭───┬────────────────────────────────╮                                        │ │",
             "│                  │ │ authors       │ │ 0 │ The Nushell Project Developers │                                        │ │",
@@ -967,61 +871,23 @@ fn test_expand_big_0() {
             "│                  │ │               │ ╰───┴────────╯                                                                │ │",
             "│                  │ │ homepage      │ https://www.nushell.sh                                                        │ │",
             "│                  │ │ license       │ MIT                                                                           │ │",
-            "│                  │ │               │ ╭──────────┬────────────────────────────────────────────────────────────────╮ │ │",
-            "│                  │ │ metadata      │ │          │ ╭───────────┬────────────────────────────────────────────────╮ │ │ │",
-            "│                  │ │               │ │ binstall │ │           │ ╭────────────────────────┬───────────────────╮ │ │ │ │",
-            "│                  │ │               │ │          │ │ overrides │ │                        │ ╭─────────┬─────╮ │ │ │ │ │",
-            "│                  │ │               │ │          │ │           │ │ x86_64-pc-windows-msvc │ │ pkg-fmt │ zip │ │ │ │ │ │",
-            "│                  │ │               │ │          │ │           │ │                        │ ╰─────────┴─────╯ │ │ │ │ │",
-            "│                  │ │               │ │          │ │           │ ╰────────────────────────┴───────────────────╯ │ │ │ │",
-            "│                  │ │               │ │          │ │ pkg-fmt   │ tgz                                            │ │ │ │",
-            "│                  │ │               │ │          │ │ pkg-url   │ { repo }/releases/download/{ version }/{ name  │ │ │ │",
-            "│                  │ │               │ │          │ │           │ }-{ version }-{ target }.{ archive-format }    │ │ │ │",
-            "│                  │ │               │ │          │ ╰───────────┴────────────────────────────────────────────────╯ │ │ │",
-            "│                  │ │               │ ╰──────────┴────────────────────────────────────────────────────────────────╯ │ │",
             "│                  │ │ name          │ nu                                                                            │ │",
             "│                  │ │ repository    │ https://github.com/nushell/nushell                                            │ │",
             "│                  │ │ rust-version  │ 1.60                                                                          │ │",
             "│                  │ │ version       │ 0.74.1                                                                        │ │",
+            "│                  │ │               │ ╭──────────┬────────────────────────────────────────────────────────────────╮ │ │",
+            "│                  │ │ metadata      │ │          │ ╭───────────┬────────────────────────────────────────────────╮ │ │ │",
+            "│                  │ │               │ │ binstall │ │ pkg-url   │ { repo }/releases/download/{ version }/{ name  │ │ │ │",
+            "│                  │ │               │ │          │ │           │ }-{ version }-{ target }.{ archive-format }    │ │ │ │",
+            "│                  │ │               │ │          │ │ pkg-fmt   │ tgz                                            │ │ │ │",
+            "│                  │ │               │ │          │ │           │ ╭────────────────────────┬───────────────────╮ │ │ │ │",
+            "│                  │ │               │ │          │ │ overrides │ │                        │ ╭─────────┬─────╮ │ │ │ │ │",
+            "│                  │ │               │ │          │ │           │ │ x86_64-pc-windows-msvc │ │ pkg-fmt │ zip │ │ │ │ │ │",
+            "│                  │ │               │ │          │ │           │ │                        │ ╰─────────┴─────╯ │ │ │ │ │",
+            "│                  │ │               │ │          │ │           │ ╰────────────────────────┴───────────────────╯ │ │ │ │",
+            "│                  │ │               │ │          │ ╰───────────┴────────────────────────────────────────────────╯ │ │ │",
+            "│                  │ │               │ ╰──────────┴────────────────────────────────────────────────────────────────╯ │ │",
             "│                  │ ╰───────────────┴───────────────────────────────────────────────────────────────────────────────╯ │",
-            "│                  │ ╭───────────┬───────────────────────────────────────────────────────────────────────────────────╮ │",
-            "│ patch            │ │           │ ╭─────────────────┬─────────────────────────────────────────────────────────────╮ │ │",
-            "│                  │ │ crates-io │ │                 │ ╭────────┬─────────────────────────────────────────╮        │ │ │",
-            "│                  │ │           │ │ reedline        │ │ branch │ main                                    │        │ │ │",
-            "│                  │ │           │ │                 │ │ git    │ https://github.com/nushell/reedline.git │        │ │ │",
-            "│                  │ │           │ │                 │ ╰────────┴─────────────────────────────────────────╯        │ │ │",
-            "│                  │ │           │ ╰─────────────────┴─────────────────────────────────────────────────────────────╯ │ │",
-            "│                  │ ╰───────────┴───────────────────────────────────────────────────────────────────────────────────╯ │",
-            "│                  │ ╭─────────────────────────────────┬─────────────────────────────────────────────────────────────╮ │",
-            "│ target           │ │                                 │ ╭──────────────┬──────────────────────────────────────────╮ │ │",
-            "│                  │ │ cfg(not(target_os = \"windows\")) │ │              │ ╭─────────────┬────────────────────────╮ │ │ │",
-            "│                  │ │                                 │ │ dependencies │ │             │ ╭──────────┬─────────╮ │ │ │ │",
-            "│                  │ │                                 │ │              │ │ openssl     │ │ features │ [list 1 │ │ │ │ │",
-            "│                  │ │                                 │ │              │ │             │ │          │  item]  │ │ │ │ │",
-            "│                  │ │                                 │ │              │ │             │ │ optional │ true    │ │ │ │ │",
-            "│                  │ │                                 │ │              │ │             │ │ version  │ 0.10.38 │ │ │ │ │",
-            "│                  │ │                                 │ │              │ │             │ ╰──────────┴─────────╯ │ │ │ │",
-            "│                  │ │                                 │ │              │ │ signal-hook │ {record 2 fields}      │ │ │ │",
-            "│                  │ │                                 │ │              │ ╰─────────────┴────────────────────────╯ │ │ │",
-            "│                  │ │                                 │ ╰──────────────┴──────────────────────────────────────────╯ │ │",
-            "│                  │ │                                 │ ╭──────────────┬──────────────────────────────────────────╮ │ │",
-            "│                  │ │ cfg(target_family = \"unix\")     │ │              │ ╭──────┬───────────────────────────────╮ │ │ │",
-            "│                  │ │                                 │ │ dependencies │ │ atty │ 0.2                           │ │ │ │",
-            "│                  │ │                                 │ │              │ │      │ ╭──────────────────┬────────╮ │ │ │ │",
-            "│                  │ │                                 │ │              │ │ nix  │ │ default-features │ false  │ │ │ │ │",
-            "│                  │ │                                 │ │              │ │      │ │ features         │ [list  │ │ │ │ │",
-            "│                  │ │                                 │ │              │ │      │ │                  │ 4      │ │ │ │ │",
-            "│                  │ │                                 │ │              │ │      │ │                  │ items] │ │ │ │ │",
-            "│                  │ │                                 │ │              │ │      │ │ version          │ 0.25   │ │ │ │ │",
-            "│                  │ │                                 │ │              │ │      │ ╰──────────────────┴────────╯ │ │ │ │",
-            "│                  │ │                                 │ │              │ ╰──────┴───────────────────────────────╯ │ │ │",
-            "│                  │ │                                 │ ╰──────────────┴──────────────────────────────────────────╯ │ │",
-            "│                  │ │                                 │ ╭────────────────────┬──────────────────╮                   │ │",
-            "│                  │ │ cfg(windows)                    │ │                    │ ╭────────┬─────╮ │                   │ │",
-            "│                  │ │                                 │ │ build-dependencies │ │ winres │ 0.1 │ │                   │ │",
-            "│                  │ │                                 │ │                    │ ╰────────┴─────╯ │                   │ │",
-            "│                  │ │                                 │ ╰────────────────────┴──────────────────╯                   │ │",
-            "│                  │ ╰─────────────────────────────────┴─────────────────────────────────────────────────────────────╯ │",
             "│                  │ ╭─────────┬─────────────────────────────────────────╮                                             │",
             "│ workspace        │ │         │ ╭────┬────────────────────────────────╮ │                                             │",
             "│                  │ │ members │ │  0 │ crates/nu-cli                  │ │                                             │",
@@ -1039,6 +905,140 @@ fn test_expand_big_0() {
             "│                  │ │         │ │ 12 │ crates/nu-utils                │ │                                             │",
             "│                  │ │         │ ╰────┴────────────────────────────────╯ │                                             │",
             "│                  │ ╰─────────┴─────────────────────────────────────────╯                                             │",
+            "│                  │ ╭───────────────┬───────────────────────────────────────────╮                                     │",
+            "│ dependencies     │ │               │ ╭──────────┬───────────────╮              │                                     │",
+            "│                  │ │ chrono        │ │ version  │ 0.4.23        │              │                                     │",
+            "│                  │ │               │ │          │ ╭───┬───────╮ │              │                                     │",
+            "│                  │ │               │ │ features │ │ 0 │ serde │ │              │                                     │",
+            "│                  │ │               │ │          │ ╰───┴───────╯ │              │                                     │",
+            "│                  │ │               │ ╰──────────┴───────────────╯              │                                     │",
+            "│                  │ │ crossterm     │ 0.24.0                                    │                                     │",
+            "│                  │ │ ctrlc         │ 3.2.1                                     │                                     │",
+            "│                  │ │ log           │ 0.4                                       │                                     │",
+            "│                  │ │               │ ╭──────────┬────────────────────────────╮ │                                     │",
+            "│                  │ │ miette        │ │ version  │ 5.5.0                      │ │                                     │",
+            "│                  │ │               │ │          │ ╭───┬────────────────────╮ │ │                                     │",
+            "│                  │ │               │ │ features │ │ 0 │ fancy-no-backtrace │ │ │                                     │",
+            "│                  │ │               │ │          │ ╰───┴────────────────────╯ │ │                                     │",
+            "│                  │ │               │ ╰──────────┴────────────────────────────╯ │                                     │",
+            "│                  │ │ nu-ansi-term  │ 0.46.0                                    │                                     │",
+            "│                  │ │               │ ╭─────────┬─────────────────╮             │                                     │",
+            "│                  │ │ nu-cli        │ │ path    │ ./crates/nu-cli │             │                                     │",
+            "│                  │ │               │ │ version │ 0.74.1          │             │                                     │",
+            "│                  │ │               │ ╰─────────┴─────────────────╯             │                                     │",
+            "│                  │ │               │ ╭─────────┬────────────────────╮          │                                     │",
+            "│                  │ │ nu-engine     │ │ path    │ ./crates/nu-engine │          │                                     │",
+            "│                  │ │               │ │ version │ 0.74.1             │          │                                     │",
+            "│                  │ │               │ ╰─────────┴────────────────────╯          │                                     │",
+            "│                  │ │               │ ╭──────────┬──────────────────╮           │                                     │",
+            "│                  │ │ reedline      │ │ version  │ 0.14.0           │           │                                     │",
+            "│                  │ │               │ │          │ ╭───┬──────────╮ │           │                                     │",
+            "│                  │ │               │ │ features │ │ 0 │ bashisms │ │           │                                     │",
+            "│                  │ │               │ │          │ │ 1 │ sqlite   │ │           │                                     │",
+            "│                  │ │               │ │          │ ╰───┴──────────╯ │           │                                     │",
+            "│                  │ │               │ ╰──────────┴──────────────────╯           │                                     │",
+            "│                  │ │ rayon         │ 1.6.1                                     │                                     │",
+            "│                  │ │ is_executable │ 1.0.1                                     │                                     │",
+            "│                  │ │ simplelog     │ 0.12.0                                    │                                     │",
+            "│                  │ │ time          │ 0.3.12                                    │                                     │",
+            "│                  │ ╰───────────────┴───────────────────────────────────────────╯                                     │",
+            "│                  │ ╭─────────────────────────────────┬─────────────────────────────────────────────────────────────╮ │",
+            "│ target           │ │                                 │ ╭──────────────┬──────────────────────────────────────────╮ │ │",
+            "│                  │ │ cfg(not(target_os = \"windows\")) │ │              │ ╭─────────────┬────────────────────────╮ │ │ │",
+            "│                  │ │                                 │ │ dependencies │ │             │ ╭──────────┬─────────╮ │ │ │ │",
+            "│                  │ │                                 │ │              │ │ openssl     │ │ version  │ 0.10.38 │ │ │ │ │",
+            "│                  │ │                                 │ │              │ │             │ │ features │ [list 1 │ │ │ │ │",
+            "│                  │ │                                 │ │              │ │             │ │          │  item]  │ │ │ │ │",
+            "│                  │ │                                 │ │              │ │             │ │ optional │ true    │ │ │ │ │",
+            "│                  │ │                                 │ │              │ │             │ ╰──────────┴─────────╯ │ │ │ │",
+            "│                  │ │                                 │ │              │ │ signal-hook │ {record 2 fields}      │ │ │ │",
+            "│                  │ │                                 │ │              │ ╰─────────────┴────────────────────────╯ │ │ │",
+            "│                  │ │                                 │ ╰──────────────┴──────────────────────────────────────────╯ │ │",
+            "│                  │ │                                 │ ╭────────────────────┬──────────────────╮                   │ │",
+            "│                  │ │ cfg(windows)                    │ │                    │ ╭────────┬─────╮ │                   │ │",
+            "│                  │ │                                 │ │ build-dependencies │ │ winres │ 0.1 │ │                   │ │",
+            "│                  │ │                                 │ │                    │ ╰────────┴─────╯ │                   │ │",
+            "│                  │ │                                 │ ╰────────────────────┴──────────────────╯                   │ │",
+            "│                  │ │                                 │ ╭──────────────┬──────────────────────────────────────────╮ │ │",
+            "│                  │ │ cfg(target_family = \"unix\")     │ │              │ ╭──────┬───────────────────────────────╮ │ │ │",
+            "│                  │ │                                 │ │ dependencies │ │      │ ╭──────────────────┬────────╮ │ │ │ │",
+            "│                  │ │                                 │ │              │ │ nix  │ │ version          │ 0.25   │ │ │ │ │",
+            "│                  │ │                                 │ │              │ │      │ │ default-features │ false  │ │ │ │ │",
+            "│                  │ │                                 │ │              │ │      │ │ features         │ [list  │ │ │ │ │",
+            "│                  │ │                                 │ │              │ │      │ │                  │ 4      │ │ │ │ │",
+            "│                  │ │                                 │ │              │ │      │ │                  │ items] │ │ │ │ │",
+            "│                  │ │                                 │ │              │ │      │ ╰──────────────────┴────────╯ │ │ │ │",
+            "│                  │ │                                 │ │              │ │ atty │ 0.2                           │ │ │ │",
+            "│                  │ │                                 │ │              │ ╰──────┴───────────────────────────────╯ │ │ │",
+            "│                  │ │                                 │ ╰──────────────┴──────────────────────────────────────────╯ │ │",
+            "│                  │ ╰─────────────────────────────────┴─────────────────────────────────────────────────────────────╯ │",
+            "│                  │ ╭───────────────────┬────────────────────────────────────────╮                                    │",
+            "│ dev-dependencies │ │                   │ ╭─────────┬──────────────────────────╮ │                                    │",
+            "│                  │ │ nu-test-support   │ │ path    │ ./crates/nu-test-support │ │                                    │",
+            "│                  │ │                   │ │ version │ 0.74.1                   │ │                                    │",
+            "│                  │ │                   │ ╰─────────┴──────────────────────────╯ │                                    │",
+            "│                  │ │ tempfile          │ 3.2.0                                  │                                    │",
+            "│                  │ │ assert_cmd        │ 2.0.2                                  │                                    │",
+            "│                  │ │ criterion         │ 0.4                                    │                                    │",
+            "│                  │ │ pretty_assertions │ 1.0.0                                  │                                    │",
+            "│                  │ │ serial_test       │ 0.10.0                                 │                                    │",
+            "│                  │ │ hamcrest2         │ 0.3.0                                  │                                    │",
+            "│                  │ │                   │ ╭──────────────────┬────────╮          │                                    │",
+            "│                  │ │ rstest            │ │ version          │ 0.15.0 │          │                                    │",
+            "│                  │ │                   │ │ default-features │ false  │          │                                    │",
+            "│                  │ │                   │ ╰──────────────────┴────────╯          │                                    │",
+            "│                  │ │ itertools         │ 0.10.3                                 │                                    │",
+            "│                  │ ╰───────────────────┴────────────────────────────────────────╯                                    │",
+            "│                  │ ╭─────────────────────┬──────────────────────────────────╮                                        │",
+            "│ features         │ │                     │ ╭───┬────────────────────╮       │                                        │",
+            "│                  │ │ plugin              │ │ 0 │ nu-plugin          │       │                                        │",
+            "│                  │ │                     │ │ 1 │ nu-cli/plugin      │       │                                        │",
+            "│                  │ │                     │ │ 2 │ nu-parser/plugin   │       │                                        │",
+            "│                  │ │                     │ │ 3 │ nu-command/plugin  │       │                                        │",
+            "│                  │ │                     │ │ 4 │ nu-protocol/plugin │       │                                        │",
+            "│                  │ │                     │ │ 5 │ nu-engine/plugin   │       │                                        │",
+            "│                  │ │                     │ ╰───┴────────────────────╯       │                                        │",
+            "│                  │ │                     │ ╭───┬─────────╮                  │                                        │",
+            "│                  │ │ extra               │ │ 0 │ default │                  │                                        │",
+            "│                  │ │                     │ ╰───┴─────────╯                  │                                        │",
+            "│                  │ │                     │ ╭───┬───────────────╮            │                                        │",
+            "│                  │ │ default             │ │ 0 │ plugin        │            │                                        │",
+            "│                  │ │                     │ │ 1 │ which-support │            │                                        │",
+            "│                  │ │                     │ │ 2 │ trash-support │            │                                        │",
+            "│                  │ │                     │ │ 3 │ sqlite        │            │                                        │",
+            "│                  │ │                     │ ╰───┴───────────────╯            │                                        │",
+            "│                  │ │                     │ ╭───┬─────────╮                  │                                        │",
+            "│                  │ │ stable              │ │ 0 │ default │                  │                                        │",
+            "│                  │ │                     │ ╰───┴─────────╯                  │                                        │",
+            "│                  │ │ wasi                │ [list 0 items]                   │                                        │",
+            "│                  │ │                     │ ╭───┬─────────────╮              │                                        │",
+            "│                  │ │ static-link-openssl │ │ 0 │ dep:openssl │              │                                        │",
+            "│                  │ │                     │ ╰───┴─────────────╯              │                                        │",
+            "│                  │ │                     │ ╭───┬──────────────────────────╮ │                                        │",
+            "│                  │ │ which-support       │ │ 0 │ nu-command/which-support │ │                                        │",
+            "│                  │ │                     │ ╰───┴──────────────────────────╯ │                                        │",
+            "│                  │ │                     │ ╭───┬──────────────────────────╮ │                                        │",
+            "│                  │ │ trash-support       │ │ 0 │ nu-command/trash-support │ │                                        │",
+            "│                  │ │                     │ ╰───┴──────────────────────────╯ │                                        │",
+            "│                  │ ╰─────────────────────┴──────────────────────────────────╯                                        │",
+            "│                  │ ╭───┬──────┬─────────────╮                                                                        │",
+            "│ bin              │ │ # │ name │    path     │                                                                        │",
+            "│                  │ ├───┼──────┼─────────────┤                                                                        │",
+            "│                  │ │ 0 │ nu   │ src/main.rs │                                                                        │",
+            "│                  │ ╰───┴──────┴─────────────╯                                                                        │",
+            "│                  │ ╭───────────┬───────────────────────────────────────────────────────────────────────────────────╮ │",
+            "│ patch            │ │           │ ╭─────────────────┬─────────────────────────────────────────────────────────────╮ │ │",
+            "│                  │ │ crates-io │ │                 │ ╭────────┬─────────────────────────────────────────╮        │ │ │",
+            "│                  │ │           │ │ reedline        │ │ git    │ https://github.com/nushell/reedline.git │        │ │ │",
+            "│                  │ │           │ │                 │ │ branch │ main                                    │        │ │ │",
+            "│                  │ │           │ │                 │ ╰────────┴─────────────────────────────────────────╯        │ │ │",
+            "│                  │ │           │ ╰─────────────────┴─────────────────────────────────────────────────────────────╯ │ │",
+            "│                  │ ╰───────────┴───────────────────────────────────────────────────────────────────────────────────╯ │",
+            "│                  │ ╭───┬────────────┬─────────╮                                                                      │",
+            "│ bench            │ │ # │    name    │ harness │                                                                      │",
+            "│                  │ ├───┼────────────┼─────────┤                                                                      │",
+            "│                  │ │ 0 │ benchmarks │ false   │                                                                      │",
+            "│                  │ ╰───┴────────────┴─────────╯                                                                      │",
             "╰──────────────────┴───────────────────────────────────────────────────────────────────────────────────────────────────╯",
         ]);
 
@@ -1053,44 +1053,99 @@ fn test_expand_big_0() {
 
         let expected = join_lines([
             "╭──────────────────┬───────────────────────────────────────╮",
-            "│                  │ ╭───┬─────────┬────────────╮          │",
-            "│ bench            │ │ # │ harness │    name    │          │",
-            "│                  │ ├───┼─────────┼────────────┤          │",
-            "│                  │ │ 0 │ false   │ benchmarks │          │",
-            "│                  │ ╰───┴─────────┴────────────╯          │",
-            "│                  │ ╭───┬──────┬─────────────╮            │",
-            "│ bin              │ │ # │ name │    path     │            │",
-            "│                  │ ├───┼──────┼─────────────┤            │",
-            "│                  │ │ 0 │ nu   │ src/main.rs │            │",
-            "│                  │ ╰───┴──────┴─────────────╯            │",
+            "│                  │ ╭───────────────┬───────────────────╮ │",
+            "│ package          │ │               │ ╭───┬───────────╮ │ │",
+            "│                  │ │ authors       │ │ 0 │ The       │ │ │",
+            "│                  │ │               │ │   │ Nushell   │ │ │",
+            "│                  │ │               │ │   │ Project D │ │ │",
+            "│                  │ │               │ │   │ evelopers │ │ │",
+            "│                  │ │               │ ╰───┴───────────╯ │ │",
+            "│                  │ │ default-run   │ nu                │ │",
+            "│                  │ │ description   │ A new type of     │ │",
+            "│                  │ │               │ shell             │ │",
+            "│                  │ │ documentation │ https://www.nushe │ │",
+            "│                  │ │               │ ll.sh/book/       │ │",
+            "│                  │ │ edition       │ 2021              │ │",
+            "│                  │ │               │ ╭───┬────────╮    │ │",
+            "│                  │ │ exclude       │ │ 0 │ images │    │ │",
+            "│                  │ │               │ ╰───┴────────╯    │ │",
+            "│                  │ │ homepage      │ https://www.nushe │ │",
+            "│                  │ │               │ ll.sh             │ │",
+            "│                  │ │ license       │ MIT               │ │",
+            "│                  │ │ name          │ nu                │ │",
+            "│                  │ │ repository    │ https://github.co │ │",
+            "│                  │ │               │ m/nushell/nushell │ │",
+            "│                  │ │ rust-version  │ 1.60              │ │",
+            "│                  │ │ version       │ 0.74.1            │ │",
+            "│                  │ │               │ ╭──────────┬────╮ │ │",
+            "│                  │ │ metadata      │ │ binstall │ {r │ │ │",
+            "│                  │ │               │ │          │ ec │ │ │",
+            "│                  │ │               │ │          │ or │ │ │",
+            "│                  │ │               │ │          │ d  │ │ │",
+            "│                  │ │               │ │          │ 3  │ │ │",
+            "│                  │ │               │ │          │ fi │ │ │",
+            "│                  │ │               │ │          │ el │ │ │",
+            "│                  │ │               │ │          │ ds │ │ │",
+            "│                  │ │               │ │          │ }  │ │ │",
+            "│                  │ │               │ ╰──────────┴────╯ │ │",
+            "│                  │ ╰───────────────┴───────────────────╯ │",
+            "│                  │ ╭─────────┬─────────────────────────╮ │",
+            "│ workspace        │ │         │ ╭────┬────────────────╮ │ │",
+            "│                  │ │ members │ │  0 │ crates/nu-cli  │ │ │",
+            "│                  │ │         │ │  1 │ crates/nu-engi │ │ │",
+            "│                  │ │         │ │    │ ne             │ │ │",
+            "│                  │ │         │ │  2 │ crates/nu-pars │ │ │",
+            "│                  │ │         │ │    │ er             │ │ │",
+            "│                  │ │         │ │  3 │ crates/nu-syst │ │ │",
+            "│                  │ │         │ │    │ em             │ │ │",
+            "│                  │ │         │ │  4 │ crates/nu-comm │ │ │",
+            "│                  │ │         │ │    │ and            │ │ │",
+            "│                  │ │         │ │  5 │ crates/nu-prot │ │ │",
+            "│                  │ │         │ │    │ ocol           │ │ │",
+            "│                  │ │         │ │  6 │ crates/nu-plug │ │ │",
+            "│                  │ │         │ │    │ in             │ │ │",
+            "│                  │ │         │ │  7 │ crates/nu_plug │ │ │",
+            "│                  │ │         │ │    │ in_inc         │ │ │",
+            "│                  │ │         │ │  8 │ crates/nu_plug │ │ │",
+            "│                  │ │         │ │    │ in_gstat       │ │ │",
+            "│                  │ │         │ │  9 │ crates/nu_plug │ │ │",
+            "│                  │ │         │ │    │ in_example     │ │ │",
+            "│                  │ │         │ │ 10 │ crates/nu_plug │ │ │",
+            "│                  │ │         │ │    │ in_query       │ │ │",
+            "│                  │ │         │ │ 11 │ crates/nu_plug │ │ │",
+            "│                  │ │         │ │    │ in_custom_valu │ │ │",
+            "│                  │ │         │ │    │ es             │ │ │",
+            "│                  │ │         │ │ 12 │ crates/nu-util │ │ │",
+            "│                  │ │         │ │    │ s              │ │ │",
+            "│                  │ │         │ ╰────┴────────────────╯ │ │",
+            "│                  │ ╰─────────┴─────────────────────────╯ │",
             "│                  │ ╭───────────────┬───────────────────╮ │",
             "│ dependencies     │ │               │ ╭──────────┬────╮ │ │",
-            "│                  │ │ chrono        │ │ features │ [l │ │ │",
+            "│                  │ │ chrono        │ │ version  │ 0. │ │ │",
+            "│                  │ │               │ │          │ 4. │ │ │",
+            "│                  │ │               │ │          │ 23 │ │ │",
+            "│                  │ │               │ │ features │ [l │ │ │",
             "│                  │ │               │ │          │ is │ │ │",
             "│                  │ │               │ │          │ t  │ │ │",
             "│                  │ │               │ │          │ 1  │ │ │",
             "│                  │ │               │ │          │ it │ │ │",
             "│                  │ │               │ │          │ em │ │ │",
             "│                  │ │               │ │          │ ]  │ │ │",
-            "│                  │ │               │ │ version  │ 0. │ │ │",
-            "│                  │ │               │ │          │ 4. │ │ │",
-            "│                  │ │               │ │          │ 23 │ │ │",
             "│                  │ │               │ ╰──────────┴────╯ │ │",
             "│                  │ │ crossterm     │ 0.24.0            │ │",
             "│                  │ │ ctrlc         │ 3.2.1             │ │",
-            "│                  │ │ is_executable │ 1.0.1             │ │",
             "│                  │ │ log           │ 0.4               │ │",
             "│                  │ │               │ ╭──────────┬────╮ │ │",
-            "│                  │ │ miette        │ │ features │ [l │ │ │",
+            "│                  │ │ miette        │ │ version  │ 5. │ │ │",
+            "│                  │ │               │ │          │ 5. │ │ │",
+            "│                  │ │               │ │          │ 0  │ │ │",
+            "│                  │ │               │ │ features │ [l │ │ │",
             "│                  │ │               │ │          │ is │ │ │",
             "│                  │ │               │ │          │ t  │ │ │",
             "│                  │ │               │ │          │ 1  │ │ │",
             "│                  │ │               │ │          │ it │ │ │",
             "│                  │ │               │ │          │ em │ │ │",
             "│                  │ │               │ │          │ ]  │ │ │",
-            "│                  │ │               │ │ version  │ 5. │ │ │",
-            "│                  │ │               │ │          │ 5. │ │ │",
-            "│                  │ │               │ │          │ 0  │ │ │",
             "│                  │ │               │ ╰──────────┴────╯ │ │",
             "│                  │ │ nu-ansi-term  │ 0.46.0            │ │",
             "│                  │ │               │ ╭─────────┬─────╮ │ │",
@@ -1112,58 +1167,39 @@ fn test_expand_big_0() {
             "│                  │ │               │ │ version │ 0.7 │ │ │",
             "│                  │ │               │ │         │ 4.1 │ │ │",
             "│                  │ │               │ ╰─────────┴─────╯ │ │",
-            "│                  │ │ rayon         │ 1.6.1             │ │",
             "│                  │ │               │ ╭──────────┬────╮ │ │",
-            "│                  │ │ reedline      │ │ features │ [l │ │ │",
+            "│                  │ │ reedline      │ │ version  │ 0. │ │ │",
+            "│                  │ │               │ │          │ 14 │ │ │",
+            "│                  │ │               │ │          │ .0 │ │ │",
+            "│                  │ │               │ │ features │ [l │ │ │",
             "│                  │ │               │ │          │ is │ │ │",
             "│                  │ │               │ │          │ t  │ │ │",
             "│                  │ │               │ │          │ 2  │ │ │",
             "│                  │ │               │ │          │ it │ │ │",
             "│                  │ │               │ │          │ em │ │ │",
             "│                  │ │               │ │          │ s] │ │ │",
-            "│                  │ │               │ │ version  │ 0. │ │ │",
-            "│                  │ │               │ │          │ 14 │ │ │",
-            "│                  │ │               │ │          │ .0 │ │ │",
             "│                  │ │               │ ╰──────────┴────╯ │ │",
+            "│                  │ │ rayon         │ 1.6.1             │ │",
+            "│                  │ │ is_executable │ 1.0.1             │ │",
             "│                  │ │ simplelog     │ 0.12.0            │ │",
             "│                  │ │ time          │ 0.3.12            │ │",
             "│                  │ ╰───────────────┴───────────────────╯ │",
+            "│ target           │ {record 3 fields}                     │",
             "│                  │ ╭───────────────────┬───────────────╮ │",
-            "│ dev-dependencies │ │ assert_cmd        │ 2.0.2         │ │",
-            "│                  │ │ criterion         │ 0.4           │ │",
-            "│                  │ │ hamcrest2         │ 0.3.0         │ │",
-            "│                  │ │ itertools         │ 0.10.3        │ │",
-            "│                  │ │ nu-test-support   │ {record 2     │ │",
+            "│ dev-dependencies │ │ nu-test-support   │ {record 2     │ │",
             "│                  │ │                   │ fields}       │ │",
+            "│                  │ │ tempfile          │ 3.2.0         │ │",
+            "│                  │ │ assert_cmd        │ 2.0.2         │ │",
+            "│                  │ │ criterion         │ 0.4           │ │",
             "│                  │ │ pretty_assertions │ 1.0.0         │ │",
+            "│                  │ │ serial_test       │ 0.10.0        │ │",
+            "│                  │ │ hamcrest2         │ 0.3.0         │ │",
             "│                  │ │ rstest            │ {record 2     │ │",
             "│                  │ │                   │ fields}       │ │",
-            "│                  │ │ serial_test       │ 0.10.0        │ │",
-            "│                  │ │ tempfile          │ 3.2.0         │ │",
+            "│                  │ │ itertools         │ 0.10.3        │ │",
             "│                  │ ╰───────────────────┴───────────────╯ │",
             "│                  │ ╭─────────────────────┬─────────────╮ │",
             "│ features         │ │                     │ ╭───┬─────╮ │ │",
-            "│                  │ │ default             │ │ 0 │ plu │ │ │",
-            "│                  │ │                     │ │   │ gin │ │ │",
-            "│                  │ │                     │ │ 1 │ whi │ │ │",
-            "│                  │ │                     │ │   │ ch- │ │ │",
-            "│                  │ │                     │ │   │ sup │ │ │",
-            "│                  │ │                     │ │   │ por │ │ │",
-            "│                  │ │                     │ │   │ t   │ │ │",
-            "│                  │ │                     │ │ 2 │ tra │ │ │",
-            "│                  │ │                     │ │   │ sh- │ │ │",
-            "│                  │ │                     │ │   │ sup │ │ │",
-            "│                  │ │                     │ │   │ por │ │ │",
-            "│                  │ │                     │ │   │ t   │ │ │",
-            "│                  │ │                     │ │ 3 │ sql │ │ │",
-            "│                  │ │                     │ │   │ ite │ │ │",
-            "│                  │ │                     │ ╰───┴─────╯ │ │",
-            "│                  │ │                     │ ╭───┬─────╮ │ │",
-            "│                  │ │ extra               │ │ 0 │ def │ │ │",
-            "│                  │ │                     │ │   │ aul │ │ │",
-            "│                  │ │                     │ │   │ t   │ │ │",
-            "│                  │ │                     │ ╰───┴─────╯ │ │",
-            "│                  │ │                     │ ╭───┬─────╮ │ │",
             "│                  │ │ plugin              │ │ 0 │ nu- │ │ │",
             "│                  │ │                     │ │   │ plu │ │ │",
             "│                  │ │                     │ │   │ gin │ │ │",
@@ -1198,10 +1234,33 @@ fn test_expand_big_0() {
             "│                  │ │                     │ │   │ n   │ │ │",
             "│                  │ │                     │ ╰───┴─────╯ │ │",
             "│                  │ │                     │ ╭───┬─────╮ │ │",
+            "│                  │ │ extra               │ │ 0 │ def │ │ │",
+            "│                  │ │                     │ │   │ aul │ │ │",
+            "│                  │ │                     │ │   │ t   │ │ │",
+            "│                  │ │                     │ ╰───┴─────╯ │ │",
+            "│                  │ │                     │ ╭───┬─────╮ │ │",
+            "│                  │ │ default             │ │ 0 │ plu │ │ │",
+            "│                  │ │                     │ │   │ gin │ │ │",
+            "│                  │ │                     │ │ 1 │ whi │ │ │",
+            "│                  │ │                     │ │   │ ch- │ │ │",
+            "│                  │ │                     │ │   │ sup │ │ │",
+            "│                  │ │                     │ │   │ por │ │ │",
+            "│                  │ │                     │ │   │ t   │ │ │",
+            "│                  │ │                     │ │ 2 │ tra │ │ │",
+            "│                  │ │                     │ │   │ sh- │ │ │",
+            "│                  │ │                     │ │   │ sup │ │ │",
+            "│                  │ │                     │ │   │ por │ │ │",
+            "│                  │ │                     │ │   │ t   │ │ │",
+            "│                  │ │                     │ │ 3 │ sql │ │ │",
+            "│                  │ │                     │ │   │ ite │ │ │",
+            "│                  │ │                     │ ╰───┴─────╯ │ │",
+            "│                  │ │                     │ ╭───┬─────╮ │ │",
             "│                  │ │ stable              │ │ 0 │ def │ │ │",
             "│                  │ │                     │ │   │ aul │ │ │",
             "│                  │ │                     │ │   │ t   │ │ │",
             "│                  │ │                     │ ╰───┴─────╯ │ │",
+            "│                  │ │ wasi                │ [list 0     │ │",
+            "│                  │ │                     │ items]      │ │",
             "│                  │ │                     │ ╭───┬─────╮ │ │",
             "│                  │ │ static-link-openssl │ │ 0 │ dep │ │ │",
             "│                  │ │                     │ │   │ :op │ │ │",
@@ -1209,6 +1268,16 @@ fn test_expand_big_0() {
             "│                  │ │                     │ │   │ sl  │ │ │",
             "│                  │ │                     │ ╰───┴─────╯ │ │",
             "│                  │ │                     │ ╭───┬─────╮ │ │",
+            "│                  │ │ which-support       │ │ 0 │ nu- │ │ │",
+            "│                  │ │                     │ │   │ com │ │ │",
+            "│                  │ │                     │ │   │ man │ │ │",
+            "│                  │ │                     │ │   │ d/w │ │ │",
+            "│                  │ │                     │ │   │ hic │ │ │",
+            "│                  │ │                     │ │   │ h-s │ │ │",
+            "│                  │ │                     │ │   │ upp │ │ │",
+            "│                  │ │                     │ │   │ ort │ │ │",
+            "│                  │ │                     │ ╰───┴─────╯ │ │",
+            "│                  │ │                     │ ╭───┬─────╮ │ │",
             "│                  │ │ trash-support       │ │ 0 │ nu- │ │ │",
             "│                  │ │                     │ │   │ com │ │ │",
             "│                  │ │                     │ │   │ man │ │ │",
@@ -1218,55 +1287,12 @@ fn test_expand_big_0() {
             "│                  │ │                     │ │   │ upp │ │ │",
             "│                  │ │                     │ │   │ ort │ │ │",
             "│                  │ │                     │ ╰───┴─────╯ │ │",
-            "│                  │ │ wasi                │ [list 0     │ │",
-            "│                  │ │                     │ items]      │ │",
-            "│                  │ │                     │ ╭───┬─────╮ │ │",
-            "│                  │ │ which-support       │ │ 0 │ nu- │ │ │",
-            "│                  │ │                     │ │   │ com │ │ │",
-            "│                  │ │                     │ │   │ man │ │ │",
-            "│                  │ │                     │ │   │ d/w │ │ │",
-            "│                  │ │                     │ │   │ hic │ │ │",
-            "│                  │ │                     │ │   │ h-s │ │ │",
-            "│                  │ │                     │ │   │ upp │ │ │",
-            "│                  │ │                     │ │   │ ort │ │ │",
-            "│                  │ │                     │ ╰───┴─────╯ │ │",
             "│                  │ ╰─────────────────────┴─────────────╯ │",
-            "│                  │ ╭───────────────┬───────────────────╮ │",
-            "│ package          │ │               │ ╭───┬───────────╮ │ │",
-            "│                  │ │ authors       │ │ 0 │ The       │ │ │",
-            "│                  │ │               │ │   │ Nushell   │ │ │",
-            "│                  │ │               │ │   │ Project D │ │ │",
-            "│                  │ │               │ │   │ evelopers │ │ │",
-            "│                  │ │               │ ╰───┴───────────╯ │ │",
-            "│                  │ │ default-run   │ nu                │ │",
-            "│                  │ │ description   │ A new type of     │ │",
-            "│                  │ │               │ shell             │ │",
-            "│                  │ │ documentation │ https://www.nushe │ │",
-            "│                  │ │               │ ll.sh/book/       │ │",
-            "│                  │ │ edition       │ 2021              │ │",
-            "│                  │ │               │ ╭───┬────────╮    │ │",
-            "│                  │ │ exclude       │ │ 0 │ images │    │ │",
-            "│                  │ │               │ ╰───┴────────╯    │ │",
-            "│                  │ │ homepage      │ https://www.nushe │ │",
-            "│                  │ │               │ ll.sh             │ │",
-            "│                  │ │ license       │ MIT               │ │",
-            "│                  │ │               │ ╭──────────┬────╮ │ │",
-            "│                  │ │ metadata      │ │ binstall │ {r │ │ │",
-            "│                  │ │               │ │          │ ec │ │ │",
-            "│                  │ │               │ │          │ or │ │ │",
-            "│                  │ │               │ │          │ d  │ │ │",
-            "│                  │ │               │ │          │ 3  │ │ │",
-            "│                  │ │               │ │          │ fi │ │ │",
-            "│                  │ │               │ │          │ el │ │ │",
-            "│                  │ │               │ │          │ ds │ │ │",
-            "│                  │ │               │ │          │ }  │ │ │",
-            "│                  │ │               │ ╰──────────┴────╯ │ │",
-            "│                  │ │ name          │ nu                │ │",
-            "│                  │ │ repository    │ https://github.co │ │",
-            "│                  │ │               │ m/nushell/nushell │ │",
-            "│                  │ │ rust-version  │ 1.60              │ │",
-            "│                  │ │ version       │ 0.74.1            │ │",
-            "│                  │ ╰───────────────┴───────────────────╯ │",
+            "│                  │ ╭───┬──────┬─────────────╮            │",
+            "│ bin              │ │ # │ name │    path     │            │",
+            "│                  │ ├───┼──────┼─────────────┤            │",
+            "│                  │ │ 0 │ nu   │ src/main.rs │            │",
+            "│                  │ ╰───┴──────┴─────────────╯            │",
             "│                  │ ╭───────────┬───────────────────────╮ │",
             "│ patch            │ │           │ ╭──────────┬────────╮ │ │",
             "│                  │ │ crates-io │ │ reedline │ {recor │ │ │",
@@ -1274,37 +1300,11 @@ fn test_expand_big_0() {
             "│                  │ │           │ │          │ elds}  │ │ │",
             "│                  │ │           │ ╰──────────┴────────╯ │ │",
             "│                  │ ╰───────────┴───────────────────────╯ │",
-            "│ target           │ {record 3 fields}                     │",
-            "│                  │ ╭─────────┬─────────────────────────╮ │",
-            "│ workspace        │ │         │ ╭────┬────────────────╮ │ │",
-            "│                  │ │ members │ │  0 │ crates/nu-cli  │ │ │",
-            "│                  │ │         │ │  1 │ crates/nu-engi │ │ │",
-            "│                  │ │         │ │    │ ne             │ │ │",
-            "│                  │ │         │ │  2 │ crates/nu-pars │ │ │",
-            "│                  │ │         │ │    │ er             │ │ │",
-            "│                  │ │         │ │  3 │ crates/nu-syst │ │ │",
-            "│                  │ │         │ │    │ em             │ │ │",
-            "│                  │ │         │ │  4 │ crates/nu-comm │ │ │",
-            "│                  │ │         │ │    │ and            │ │ │",
-            "│                  │ │         │ │  5 │ crates/nu-prot │ │ │",
-            "│                  │ │         │ │    │ ocol           │ │ │",
-            "│                  │ │         │ │  6 │ crates/nu-plug │ │ │",
-            "│                  │ │         │ │    │ in             │ │ │",
-            "│                  │ │         │ │  7 │ crates/nu_plug │ │ │",
-            "│                  │ │         │ │    │ in_inc         │ │ │",
-            "│                  │ │         │ │  8 │ crates/nu_plug │ │ │",
-            "│                  │ │         │ │    │ in_gstat       │ │ │",
-            "│                  │ │         │ │  9 │ crates/nu_plug │ │ │",
-            "│                  │ │         │ │    │ in_example     │ │ │",
-            "│                  │ │         │ │ 10 │ crates/nu_plug │ │ │",
-            "│                  │ │         │ │    │ in_query       │ │ │",
-            "│                  │ │         │ │ 11 │ crates/nu_plug │ │ │",
-            "│                  │ │         │ │    │ in_custom_valu │ │ │",
-            "│                  │ │         │ │    │ es             │ │ │",
-            "│                  │ │         │ │ 12 │ crates/nu-util │ │ │",
-            "│                  │ │         │ │    │ s              │ │ │",
-            "│                  │ │         │ ╰────┴────────────────╯ │ │",
-            "│                  │ ╰─────────┴─────────────────────────╯ │",
+            "│                  │ ╭───┬────────────┬─────────╮          │",
+            "│ bench            │ │ # │    name    │ harness │          │",
+            "│                  │ ├───┼────────────┼─────────┤          │",
+            "│                  │ │ 0 │ benchmarks │ false   │          │",
+            "│                  │ ╰───┴────────────┴─────────╯          │",
             "╰──────────────────┴───────────────────────────────────────╯",
         ]);
 
@@ -1319,14 +1319,21 @@ fn test_expand_big_0() {
 
         let expected = join_lines([
             "╭──────────────────┬───────────────────╮",
-            "│ bench            │ [table 1 row]     │",
-            "│ bin              │ [table 1 row]     │",
-            "│ dependencies     │ {record 13        │",
-            "│                  │ fields}           │",
-            "│ dev-dependencies │ {record 9 fields} │",
-            "│ features         │ {record 8 fields} │",
             "│ package          │ {record 13        │",
             "│                  │ fields}           │",
+            "│                  │ ╭─────────┬─────╮ │",
+            "│ workspace        │ │ members │ [li │ │",
+            "│                  │ │         │ st  │ │",
+            "│                  │ │         │ 13  │ │",
+            "│                  │ │         │ ite │ │",
+            "│                  │ │         │ ms] │ │",
+            "│                  │ ╰─────────┴─────╯ │",
+            "│ dependencies     │ {record 13        │",
+            "│                  │ fields}           │",
+            "│ target           │ {record 3 fields} │",
+            "│ dev-dependencies │ {record 9 fields} │",
+            "│ features         │ {record 8 fields} │",
+            "│ bin              │ [table 1 row]     │",
             "│                  │ ╭───────────┬───╮ │",
             "│ patch            │ │ crates-io │ { │ │",
             "│                  │ │           │ r │ │",
@@ -1345,14 +1352,7 @@ fn test_expand_big_0() {
             "│                  │ │           │ d │ │",
             "│                  │ │           │ } │ │",
             "│                  │ ╰───────────┴───╯ │",
-            "│ target           │ {record 3 fields} │",
-            "│                  │ ╭─────────┬─────╮ │",
-            "│ workspace        │ │ members │ [li │ │",
-            "│                  │ │         │ st  │ │",
-            "│                  │ │         │ 13  │ │",
-            "│                  │ │         │ ite │ │",
-            "│                  │ │         │ ms] │ │",
-            "│                  │ ╰─────────┴─────╯ │",
+            "│ bench            │ [table 1 row]     │",
             "╰──────────────────┴───────────────────╯",
         ]);
 
@@ -1952,107 +1952,7 @@ fn test_collapse_big_0() {
         _print_lines(&actual.out, 80);
 
         let expected = join_lines([
-            "╭──────────────────┬─────────┬─────────────────────────────────────────────────╮",
-            "│ bench            │ harness │ name                                            │",
-            "│                  ├─────────┼─────────────────────────────────────────────────┤",
-            "│                  │ false   │ benchmarks                                      │",
-            "├──────────────────┼──────┬──┴─────────────────────────────────────────────────┤",
-            "│ bin              │ name │ path                                               │",
-            "│                  ├──────┼────────────────────────────────────────────────────┤",
-            "│                  │ nu   │ src/main.rs                                        │",
-            "├──────────────────┼──────┴────────┬──────────┬────────────────────────────────┤",
-            "│ dependencies     │ chrono        │ features │ serde                          │",
-            "│                  │               ├──────────┼────────────────────────────────┤",
-            "│                  │               │ version  │ 0.4.23                         │",
-            "│                  ├───────────────┼──────────┴────────────────────────────────┤",
-            "│                  │ crossterm     │ 0.24.0                                    │",
-            "│                  ├───────────────┼───────────────────────────────────────────┤",
-            "│                  │ ctrlc         │ 3.2.1                                     │",
-            "│                  ├───────────────┼───────────────────────────────────────────┤",
-            "│                  │ is_executable │ 1.0.1                                     │",
-            "│                  ├───────────────┼───────────────────────────────────────────┤",
-            "│                  │ log           │ 0.4                                       │",
-            "│                  ├───────────────┼──────────┬────────────────────────────────┤",
-            "│                  │ miette        │ features │ fancy-no-backtrace             │",
-            "│                  │               ├──────────┼────────────────────────────────┤",
-            "│                  │               │ version  │ 5.5.0                          │",
-            "│                  ├───────────────┼──────────┴────────────────────────────────┤",
-            "│                  │ nu-ansi-term  │ 0.46.0                                    │",
-            "│                  ├───────────────┼─────────┬─────────────────────────────────┤",
-            "│                  │ nu-cli        │ path    │ ./crates/nu-cli                 │",
-            "│                  │               ├─────────┼─────────────────────────────────┤",
-            "│                  │               │ version │ 0.74.1                          │",
-            "│                  ├───────────────┼─────────┼─────────────────────────────────┤",
-            "│                  │ nu-engine     │ path    │ ./crates/nu-engine              │",
-            "│                  │               ├─────────┼─────────────────────────────────┤",
-            "│                  │               │ version │ 0.74.1                          │",
-            "│                  ├───────────────┼─────────┴─────────────────────────────────┤",
-            "│                  │ rayon         │ 1.6.1                                     │",
-            "│                  ├───────────────┼──────────┬────────────────────────────────┤",
-            "│                  │ reedline      │ features │ bashisms                       │",
-            "│                  │               │          ├────────────────────────────────┤",
-            "│                  │               │          │ sqlite                         │",
-            "│                  │               ├──────────┼────────────────────────────────┤",
-            "│                  │               │ version  │ 0.14.0                         │",
-            "│                  ├───────────────┼──────────┴────────────────────────────────┤",
-            "│                  │ simplelog     │ 0.12.0                                    │",
-            "│                  ├───────────────┼───────────────────────────────────────────┤",
-            "│                  │ time          │ 0.3.12                                    │",
-            "├──────────────────┼───────────────┴───┬───────────────────────────────────────┤",
-            "│ dev-dependencies │ assert_cmd        │ 2.0.2                                 │",
-            "│                  ├───────────────────┼───────────────────────────────────────┤",
-            "│                  │ criterion         │ 0.4                                   │",
-            "│                  ├───────────────────┼───────────────────────────────────────┤",
-            "│                  │ hamcrest2         │ 0.3.0                                 │",
-            "│                  ├───────────────────┼───────────────────────────────────────┤",
-            "│                  │ itertools         │ 0.10.3                                │",
-            "│                  ├───────────────────┼─────────┬─────────────────────────────┤",
-            "│                  │ nu-test-support   │ path    │ ./crates/nu-test-support    │",
-            "│                  │                   ├─────────┼─────────────────────────────┤",
-            "│                  │                   │ version │ 0.74.1                      │",
-            "│                  ├───────────────────┼─────────┴─────────────────────────────┤",
-            "│                  │ pretty_assertions │ 1.0.0                                 │",
-            "│                  ├───────────────────┼──────────────────┬────────────────────┤",
-            "│                  │ rstest            │ default-features │ false              │",
-            "│                  │                   ├──────────────────┼────────────────────┤",
-            "│                  │                   │ version          │ 0.15.0             │",
-            "│                  ├───────────────────┼──────────────────┴────────────────────┤",
-            "│                  │ serial_test       │ 0.10.0                                │",
-            "│                  ├───────────────────┼───────────────────────────────────────┤",
-            "│                  │ tempfile          │ 3.2.0                                 │",
-            "├──────────────────┼───────────────────┴─┬─────────────────────────────────────┤",
-            "│ features         │ default             │ plugin                              │",
-            "│                  │                     ├─────────────────────────────────────┤",
-            "│                  │                     │ which-support                       │",
-            "│                  │                     ├─────────────────────────────────────┤",
-            "│                  │                     │ trash-support                       │",
-            "│                  │                     ├─────────────────────────────────────┤",
-            "│                  │                     │ sqlite                              │",
-            "│                  ├─────────────────────┼─────────────────────────────────────┤",
-            "│                  │ extra               │ default                             │",
-            "│                  ├─────────────────────┼─────────────────────────────────────┤",
-            "│                  │ plugin              │ nu-plugin                           │",
-            "│                  │                     ├─────────────────────────────────────┤",
-            "│                  │                     │ nu-cli/plugin                       │",
-            "│                  │                     ├─────────────────────────────────────┤",
-            "│                  │                     │ nu-parser/plugin                    │",
-            "│                  │                     ├─────────────────────────────────────┤",
-            "│                  │                     │ nu-command/plugin                   │",
-            "│                  │                     ├─────────────────────────────────────┤",
-            "│                  │                     │ nu-protocol/plugin                  │",
-            "│                  │                     ├─────────────────────────────────────┤",
-            "│                  │                     │ nu-engine/plugin                    │",
-            "│                  ├─────────────────────┼─────────────────────────────────────┤",
-            "│                  │ stable              │ default                             │",
-            "│                  ├─────────────────────┼─────────────────────────────────────┤",
-            "│                  │ static-link-openssl │ dep:openssl                         │",
-            "│                  ├─────────────────────┼─────────────────────────────────────┤",
-            "│                  │ trash-support       │ nu-command/trash-support            │",
-            "│                  ├─────────────────────┼─────────────────────────────────────┤",
-            "│                  │ wasi                │                                     │",
-            "│                  ├─────────────────────┼─────────────────────────────────────┤",
-            "│                  │ which-support       │ nu-command/which-support            │",
-            "├──────────────────┼───────────────┬─────┴─────────────────────────────────────┤",
+            "╭──────────────────┬───────────────┬───────────────────────────────────────────╮",
             "│ package          │ authors       │ The Nushell Project Developers            │",
             "│                  ├───────────────┼───────────────────────────────────────────┤",
             "│                  │ default-run   │ nu                                        │",
@@ -2068,19 +1968,7 @@ fn test_collapse_big_0() {
             "│                  │ homepage      │ https://www.nushell.sh                    │",
             "│                  ├───────────────┼───────────────────────────────────────────┤",
             "│                  │ license       │ MIT                                       │",
-            "│                  ├───────────────┼──────────┬───────────┬────────────────────┤",
-            "│                  │ metadata      │ binstall │ overrides │ ...                │",
-            "│                  │               │          ├───────────┼────────────────────┤",
-            "│                  │               │          │ pkg-fmt   │ tgz                │",
-            "│                  │               │          ├───────────┼────────────────────┤",
-            "│                  │               │          │ pkg-url   │ { repo }/releases/ │",
-            "│                  │               │          │           │ download/{ v       │",
-            "│                  │               │          │           │ ersion             │",
-            "│                  │               │          │           │  }/{ name }-{ vers │",
-            "│                  │               │          │           │ ion }-             │",
-            "│                  │               │          │           │ { target }.{       │",
-            "│                  │               │          │           │  archive-format }  │",
-            "│                  ├───────────────┼──────────┴───────────┴────────────────────┤",
+            "│                  ├───────────────┼───────────────────────────────────────────┤",
             "│                  │ name          │ nu                                        │",
             "│                  ├───────────────┼───────────────────────────────────────────┤",
             "│                  │ repository    │ https://github.com/nushell/nushell        │",
@@ -2088,22 +1976,19 @@ fn test_collapse_big_0() {
             "│                  │ rust-version  │ 1.60                                      │",
             "│                  ├───────────────┼───────────────────────────────────────────┤",
             "│                  │ version       │ 0.74.1                                    │",
-            "├──────────────────┼───────────┬───┴──────┬────────┬───────────────────────────┤",
-            "│ patch            │ crates-io │ reedline │ branch │ main                      │",
-            "│                  │           │          ├────────┼───────────────────────────┤",
-            "│                  │           │          │ git    │ https://github.com/nushel │",
-            "│                  │           │          │        │ l/reedline.git            │",
-            "├──────────────────┼───────────┴──────────┴────────┴─┬──────────────┬──────────┤",
-            "│ target           │ cfg(not(target_os = \"windows\")) │ dependencies │ ...      │",
-            "│                  │                                 │              ├──────────┤",
-            "│                  │                                 │              │ ...      │",
-            "│                  ├─────────────────────────────────┼──────────────┼──────────┤",
-            "│                  │ cfg(target_family = \"unix\")     │ dependencies │ ...      │",
-            "│                  │                                 │              ├──────────┤",
-            "│                  │                                 │              │ ...      │",
-            "│                  ├─────────────────────────────────┼──────────────┴──────────┤",
-            "│                  │ cfg(windows)                    │ ...                     │",
-            "├──────────────────┼─────────┬───────────────────────┴─────────────────────────┤",
+            "│                  ├───────────────┼──────────┬───────────┬────────────────────┤",
+            "│                  │ metadata      │ binstall │ pkg-url   │ { repo }/releases/ │",
+            "│                  │               │          │           │ download/{ v       │",
+            "│                  │               │          │           │ ersion             │",
+            "│                  │               │          │           │  }/{ name }-{ vers │",
+            "│                  │               │          │           │ ion }-             │",
+            "│                  │               │          │           │ { target }.{       │",
+            "│                  │               │          │           │  archive-format }  │",
+            "│                  │               │          ├───────────┼────────────────────┤",
+            "│                  │               │          │ pkg-fmt   │ tgz                │",
+            "│                  │               │          ├───────────┼────────────────────┤",
+            "│                  │               │          │ overrides │ ...                │",
+            "├──────────────────┼─────────┬─────┴──────────┴───────────┴────────────────────┤",
             "│ workspace        │ members │ crates/nu-cli                                   │",
             "│                  │         ├─────────────────────────────────────────────────┤",
             "│                  │         │ crates/nu-engine                                │",
@@ -2129,7 +2014,122 @@ fn test_collapse_big_0() {
             "│                  │         │ crates/nu_plugin_custom_values                  │",
             "│                  │         ├─────────────────────────────────────────────────┤",
             "│                  │         │ crates/nu-utils                                 │",
-            "╰──────────────────┴─────────┴─────────────────────────────────────────────────╯",
+            "├──────────────────┼─────────┴─────┬──────────┬────────────────────────────────┤",
+            "│ dependencies     │ chrono        │ version  │ 0.4.23                         │",
+            "│                  │               ├──────────┼────────────────────────────────┤",
+            "│                  │               │ features │ serde                          │",
+            "│                  ├───────────────┼──────────┴────────────────────────────────┤",
+            "│                  │ crossterm     │ 0.24.0                                    │",
+            "│                  ├───────────────┼───────────────────────────────────────────┤",
+            "│                  │ ctrlc         │ 3.2.1                                     │",
+            "│                  ├───────────────┼───────────────────────────────────────────┤",
+            "│                  │ log           │ 0.4                                       │",
+            "│                  ├───────────────┼──────────┬────────────────────────────────┤",
+            "│                  │ miette        │ version  │ 5.5.0                          │",
+            "│                  │               ├──────────┼────────────────────────────────┤",
+            "│                  │               │ features │ fancy-no-backtrace             │",
+            "│                  ├───────────────┼──────────┴────────────────────────────────┤",
+            "│                  │ nu-ansi-term  │ 0.46.0                                    │",
+            "│                  ├───────────────┼─────────┬─────────────────────────────────┤",
+            "│                  │ nu-cli        │ path    │ ./crates/nu-cli                 │",
+            "│                  │               ├─────────┼─────────────────────────────────┤",
+            "│                  │               │ version │ 0.74.1                          │",
+            "│                  ├───────────────┼─────────┼─────────────────────────────────┤",
+            "│                  │ nu-engine     │ path    │ ./crates/nu-engine              │",
+            "│                  │               ├─────────┼─────────────────────────────────┤",
+            "│                  │               │ version │ 0.74.1                          │",
+            "│                  ├───────────────┼─────────┴┬────────────────────────────────┤",
+            "│                  │ reedline      │ version  │ 0.14.0                         │",
+            "│                  │               ├──────────┼────────────────────────────────┤",
+            "│                  │               │ features │ bashisms                       │",
+            "│                  │               │          ├────────────────────────────────┤",
+            "│                  │               │          │ sqlite                         │",
+            "│                  ├───────────────┼──────────┴────────────────────────────────┤",
+            "│                  │ rayon         │ 1.6.1                                     │",
+            "│                  ├───────────────┼───────────────────────────────────────────┤",
+            "│                  │ is_executable │ 1.0.1                                     │",
+            "│                  ├───────────────┼───────────────────────────────────────────┤",
+            "│                  │ simplelog     │ 0.12.0                                    │",
+            "│                  ├───────────────┼───────────────────────────────────────────┤",
+            "│                  │ time          │ 0.3.12                                    │",
+            "├──────────────────┼───────────────┴─────────────────┬──────────────┬──────────┤",
+            "│ target           │ cfg(not(target_os = \"windows\")) │ dependencies │ ...      │",
+            "│                  │                                 │              ├──────────┤",
+            "│                  │                                 │              │ ...      │",
+            "│                  ├─────────────────────────────────┼──────────────┴──────────┤",
+            "│                  │ cfg(windows)                    │ ...                     │",
+            "│                  ├─────────────────────────────────┼──────────────┬──────────┤",
+            "│                  │ cfg(target_family = \"unix\")     │ dependencies │ ...      │",
+            "│                  │                                 │              ├──────────┤",
+            "│                  │                                 │              │ ...      │",
+            "├──────────────────┼───────────────────┬─────────┬───┴──────────────┴──────────┤",
+            "│ dev-dependencies │ nu-test-support   │ path    │ ./crates/nu-test-support    │",
+            "│                  │                   ├─────────┼─────────────────────────────┤",
+            "│                  │                   │ version │ 0.74.1                      │",
+            "│                  ├───────────────────┼─────────┴─────────────────────────────┤",
+            "│                  │ tempfile          │ 3.2.0                                 │",
+            "│                  ├───────────────────┼───────────────────────────────────────┤",
+            "│                  │ assert_cmd        │ 2.0.2                                 │",
+            "│                  ├───────────────────┼───────────────────────────────────────┤",
+            "│                  │ criterion         │ 0.4                                   │",
+            "│                  ├───────────────────┼───────────────────────────────────────┤",
+            "│                  │ pretty_assertions │ 1.0.0                                 │",
+            "│                  ├───────────────────┼───────────────────────────────────────┤",
+            "│                  │ serial_test       │ 0.10.0                                │",
+            "│                  ├───────────────────┼───────────────────────────────────────┤",
+            "│                  │ hamcrest2         │ 0.3.0                                 │",
+            "│                  ├───────────────────┼──────────────────┬────────────────────┤",
+            "│                  │ rstest            │ version          │ 0.15.0             │",
+            "│                  │                   ├──────────────────┼────────────────────┤",
+            "│                  │                   │ default-features │ false              │",
+            "│                  ├───────────────────┼──────────────────┴────────────────────┤",
+            "│                  │ itertools         │ 0.10.3                                │",
+            "├──────────────────┼───────────────────┴─┬─────────────────────────────────────┤",
+            "│ features         │ plugin              │ nu-plugin                           │",
+            "│                  │                     ├─────────────────────────────────────┤",
+            "│                  │                     │ nu-cli/plugin                       │",
+            "│                  │                     ├─────────────────────────────────────┤",
+            "│                  │                     │ nu-parser/plugin                    │",
+            "│                  │                     ├─────────────────────────────────────┤",
+            "│                  │                     │ nu-command/plugin                   │",
+            "│                  │                     ├─────────────────────────────────────┤",
+            "│                  │                     │ nu-protocol/plugin                  │",
+            "│                  │                     ├─────────────────────────────────────┤",
+            "│                  │                     │ nu-engine/plugin                    │",
+            "│                  ├─────────────────────┼─────────────────────────────────────┤",
+            "│                  │ extra               │ default                             │",
+            "│                  ├─────────────────────┼─────────────────────────────────────┤",
+            "│                  │ default             │ plugin                              │",
+            "│                  │                     ├─────────────────────────────────────┤",
+            "│                  │                     │ which-support                       │",
+            "│                  │                     ├─────────────────────────────────────┤",
+            "│                  │                     │ trash-support                       │",
+            "│                  │                     ├─────────────────────────────────────┤",
+            "│                  │                     │ sqlite                              │",
+            "│                  ├─────────────────────┼─────────────────────────────────────┤",
+            "│                  │ stable              │ default                             │",
+            "│                  ├─────────────────────┼─────────────────────────────────────┤",
+            "│                  │ wasi                │                                     │",
+            "│                  ├─────────────────────┼─────────────────────────────────────┤",
+            "│                  │ static-link-openssl │ dep:openssl                         │",
+            "│                  ├─────────────────────┼─────────────────────────────────────┤",
+            "│                  │ which-support       │ nu-command/which-support            │",
+            "│                  ├─────────────────────┼─────────────────────────────────────┤",
+            "│                  │ trash-support       │ nu-command/trash-support            │",
+            "├──────────────────┼──────┬──────────────┴─────────────────────────────────────┤",
+            "│ bin              │ name │ path                                               │",
+            "│                  ├──────┼────────────────────────────────────────────────────┤",
+            "│                  │ nu   │ src/main.rs                                        │",
+            "├──────────────────┼──────┴────┬──────────┬────────┬───────────────────────────┤",
+            "│ patch            │ crates-io │ reedline │ git    │ https://github.com/nushel │",
+            "│                  │           │          │        │ l/reedline.git            │",
+            "│                  │           │          ├────────┼───────────────────────────┤",
+            "│                  │           │          │ branch │ main                      │",
+            "├──────────────────┼───────────┴┬─────────┴────────┴───────────────────────────┤",
+            "│ bench            │ name       │ harness                                      │",
+            "│                  ├────────────┼──────────────────────────────────────────────┤",
+            "│                  │ benchmarks │ false                                        │",
+            "╰──────────────────┴────────────┴──────────────────────────────────────────────╯",
         ]);
 
         assert_eq!(actual.out, expected);
@@ -2142,107 +2142,7 @@ fn test_collapse_big_0() {
         _print_lines(&actual.out, 111);
 
         let expected = join_lines([
-            "╭──────────────────┬─────────┬────────────────────────────────────────────────────────────────────────────────╮",
-            "│ bench            │ harness │ name                                                                           │",
-            "│                  ├─────────┼────────────────────────────────────────────────────────────────────────────────┤",
-            "│                  │ false   │ benchmarks                                                                     │",
-            "├──────────────────┼──────┬──┴────────────────────────────────────────────────────────────────────────────────┤",
-            "│ bin              │ name │ path                                                                              │",
-            "│                  ├──────┼───────────────────────────────────────────────────────────────────────────────────┤",
-            "│                  │ nu   │ src/main.rs                                                                       │",
-            "├──────────────────┼──────┴────────┬──────────┬───────────────────────────────────────────────────────────────┤",
-            "│ dependencies     │ chrono        │ features │ serde                                                         │",
-            "│                  │               ├──────────┼───────────────────────────────────────────────────────────────┤",
-            "│                  │               │ version  │ 0.4.23                                                        │",
-            "│                  ├───────────────┼──────────┴───────────────────────────────────────────────────────────────┤",
-            "│                  │ crossterm     │ 0.24.0                                                                   │",
-            "│                  ├───────────────┼──────────────────────────────────────────────────────────────────────────┤",
-            "│                  │ ctrlc         │ 3.2.1                                                                    │",
-            "│                  ├───────────────┼──────────────────────────────────────────────────────────────────────────┤",
-            "│                  │ is_executable │ 1.0.1                                                                    │",
-            "│                  ├───────────────┼──────────────────────────────────────────────────────────────────────────┤",
-            "│                  │ log           │ 0.4                                                                      │",
-            "│                  ├───────────────┼──────────┬───────────────────────────────────────────────────────────────┤",
-            "│                  │ miette        │ features │ fancy-no-backtrace                                            │",
-            "│                  │               ├──────────┼───────────────────────────────────────────────────────────────┤",
-            "│                  │               │ version  │ 5.5.0                                                         │",
-            "│                  ├───────────────┼──────────┴───────────────────────────────────────────────────────────────┤",
-            "│                  │ nu-ansi-term  │ 0.46.0                                                                   │",
-            "│                  ├───────────────┼─────────┬────────────────────────────────────────────────────────────────┤",
-            "│                  │ nu-cli        │ path    │ ./crates/nu-cli                                                │",
-            "│                  │               ├─────────┼────────────────────────────────────────────────────────────────┤",
-            "│                  │               │ version │ 0.74.1                                                         │",
-            "│                  ├───────────────┼─────────┼────────────────────────────────────────────────────────────────┤",
-            "│                  │ nu-engine     │ path    │ ./crates/nu-engine                                             │",
-            "│                  │               ├─────────┼────────────────────────────────────────────────────────────────┤",
-            "│                  │               │ version │ 0.74.1                                                         │",
-            "│                  ├───────────────┼─────────┴────────────────────────────────────────────────────────────────┤",
-            "│                  │ rayon         │ 1.6.1                                                                    │",
-            "│                  ├───────────────┼──────────┬───────────────────────────────────────────────────────────────┤",
-            "│                  │ reedline      │ features │ bashisms                                                      │",
-            "│                  │               │          ├───────────────────────────────────────────────────────────────┤",
-            "│                  │               │          │ sqlite                                                        │",
-            "│                  │               ├──────────┼───────────────────────────────────────────────────────────────┤",
-            "│                  │               │ version  │ 0.14.0                                                        │",
-            "│                  ├───────────────┼──────────┴───────────────────────────────────────────────────────────────┤",
-            "│                  │ simplelog     │ 0.12.0                                                                   │",
-            "│                  ├───────────────┼──────────────────────────────────────────────────────────────────────────┤",
-            "│                  │ time          │ 0.3.12                                                                   │",
-            "├──────────────────┼───────────────┴───┬──────────────────────────────────────────────────────────────────────┤",
-            "│ dev-dependencies │ assert_cmd        │ 2.0.2                                                                │",
-            "│                  ├───────────────────┼──────────────────────────────────────────────────────────────────────┤",
-            "│                  │ criterion         │ 0.4                                                                  │",
-            "│                  ├───────────────────┼──────────────────────────────────────────────────────────────────────┤",
-            "│                  │ hamcrest2         │ 0.3.0                                                                │",
-            "│                  ├───────────────────┼──────────────────────────────────────────────────────────────────────┤",
-            "│                  │ itertools         │ 0.10.3                                                               │",
-            "│                  ├───────────────────┼─────────┬────────────────────────────────────────────────────────────┤",
-            "│                  │ nu-test-support   │ path    │ ./crates/nu-test-support                                   │",
-            "│                  │                   ├─────────┼────────────────────────────────────────────────────────────┤",
-            "│                  │                   │ version │ 0.74.1                                                     │",
-            "│                  ├───────────────────┼─────────┴────────────────────────────────────────────────────────────┤",
-            "│                  │ pretty_assertions │ 1.0.0                                                                │",
-            "│                  ├───────────────────┼──────────────────┬───────────────────────────────────────────────────┤",
-            "│                  │ rstest            │ default-features │ false                                             │",
-            "│                  │                   ├──────────────────┼───────────────────────────────────────────────────┤",
-            "│                  │                   │ version          │ 0.15.0                                            │",
-            "│                  ├───────────────────┼──────────────────┴───────────────────────────────────────────────────┤",
-            "│                  │ serial_test       │ 0.10.0                                                               │",
-            "│                  ├───────────────────┼──────────────────────────────────────────────────────────────────────┤",
-            "│                  │ tempfile          │ 3.2.0                                                                │",
-            "├──────────────────┼───────────────────┴─┬────────────────────────────────────────────────────────────────────┤",
-            "│ features         │ default             │ plugin                                                             │",
-            "│                  │                     ├────────────────────────────────────────────────────────────────────┤",
-            "│                  │                     │ which-support                                                      │",
-            "│                  │                     ├────────────────────────────────────────────────────────────────────┤",
-            "│                  │                     │ trash-support                                                      │",
-            "│                  │                     ├────────────────────────────────────────────────────────────────────┤",
-            "│                  │                     │ sqlite                                                             │",
-            "│                  ├─────────────────────┼────────────────────────────────────────────────────────────────────┤",
-            "│                  │ extra               │ default                                                            │",
-            "│                  ├─────────────────────┼────────────────────────────────────────────────────────────────────┤",
-            "│                  │ plugin              │ nu-plugin                                                          │",
-            "│                  │                     ├────────────────────────────────────────────────────────────────────┤",
-            "│                  │                     │ nu-cli/plugin                                                      │",
-            "│                  │                     ├────────────────────────────────────────────────────────────────────┤",
-            "│                  │                     │ nu-parser/plugin                                                   │",
-            "│                  │                     ├────────────────────────────────────────────────────────────────────┤",
-            "│                  │                     │ nu-command/plugin                                                  │",
-            "│                  │                     ├────────────────────────────────────────────────────────────────────┤",
-            "│                  │                     │ nu-protocol/plugin                                                 │",
-            "│                  │                     ├────────────────────────────────────────────────────────────────────┤",
-            "│                  │                     │ nu-engine/plugin                                                   │",
-            "│                  ├─────────────────────┼────────────────────────────────────────────────────────────────────┤",
-            "│                  │ stable              │ default                                                            │",
-            "│                  ├─────────────────────┼────────────────────────────────────────────────────────────────────┤",
-            "│                  │ static-link-openssl │ dep:openssl                                                        │",
-            "│                  ├─────────────────────┼────────────────────────────────────────────────────────────────────┤",
-            "│                  │ trash-support       │ nu-command/trash-support                                           │",
-            "│                  ├─────────────────────┼────────────────────────────────────────────────────────────────────┤",
-            "│                  │ wasi                │                                                                    │",
-            "│                  ├─────────────────────┼────────────────────────────────────────────────────────────────────┤",
-            "│                  │ which-support       │ nu-command/which-support                                           │",
-            "├──────────────────┼───────────────┬─────┴────────────────────────────────────────────────────────────────────┤",
+            "╭──────────────────┬───────────────┬──────────────────────────────────────────────────────────────────────────╮",
             "│ package          │ authors       │ The Nushell Project Developers                                           │",
             "│                  ├───────────────┼──────────────────────────────────────────────────────────────────────────┤",
             "│                  │ default-run   │ nu                                                                       │",
@@ -2258,15 +2158,7 @@ fn test_collapse_big_0() {
             "│                  │ homepage      │ https://www.nushell.sh                                                   │",
             "│                  ├───────────────┼──────────────────────────────────────────────────────────────────────────┤",
             "│                  │ license       │ MIT                                                                      │",
-            "│                  ├───────────────┼──────────┬───────────┬────────────────────────┬─────────┬────────────────┤",
-            "│                  │ metadata      │ binstall │ overrides │ x86_64-pc-windows-msvc │ pkg-fmt │ zip            │",
-            "│                  │               │          ├───────────┼────────────────────────┴─────────┴────────────────┤",
-            "│                  │               │          │ pkg-fmt   │ tgz                                               │",
-            "│                  │               │          ├───────────┼───────────────────────────────────────────────────┤",
-            "│                  │               │          │ pkg-url   │ { repo }/releases/download/{ v                    │",
-            "│                  │               │          │           │ ersion }/{ name }-{ version }-                    │",
-            "│                  │               │          │           │ { target }.{ archive-format }                     │",
-            "│                  ├───────────────┼──────────┴───────────┴───────────────────────────────────────────────────┤",
+            "│                  ├───────────────┼──────────────────────────────────────────────────────────────────────────┤",
             "│                  │ name          │ nu                                                                       │",
             "│                  ├───────────────┼──────────────────────────────────────────────────────────────────────────┤",
             "│                  │ repository    │ https://github.com/nushell/nushell                                       │",
@@ -2274,37 +2166,15 @@ fn test_collapse_big_0() {
             "│                  │ rust-version  │ 1.60                                                                     │",
             "│                  ├───────────────┼──────────────────────────────────────────────────────────────────────────┤",
             "│                  │ version       │ 0.74.1                                                                   │",
-            "├──────────────────┼───────────┬───┴──────┬────────┬──────────────────────────────────────────────────────────┤",
-            "│ patch            │ crates-io │ reedline │ branch │ main                                                     │",
-            "│                  │           │          ├────────┼──────────────────────────────────────────────────────────┤",
-            "│                  │           │          │ git    │ https://github.com/nushell/reedline.git                  │",
-            "├──────────────────┼───────────┴──────────┴────────┴─┬──────────────┬─────────────┬──────────┬────────────────┤",
-            "│ target           │ cfg(not(target_os = \"windows\")) │ dependencies │ openssl     │ features │ vendored       │",
-            "│                  │                                 │              │             ├──────────┼────────────────┤",
-            "│                  │                                 │              │             │ optional │ true           │",
-            "│                  │                                 │              │             ├──────────┼────────────────┤",
-            "│                  │                                 │              │             │ version  │ 0.10.38        │",
-            "│                  │                                 │              ├─────────────┼──────────┴───────┬────────┤",
-            "│                  │                                 │              │ signal-hook │ default-features │ false  │",
-            "│                  │                                 │              │             ├──────────────────┼────────┤",
-            "│                  │                                 │              │             │ version          │ 0.3.14 │",
-            "│                  ├─────────────────────────────────┼──────────────┼──────┬──────┴──────────────────┴────────┤",
-            "│                  │ cfg(target_family = \"unix\")     │ dependencies │ atty │ 0.2                              │",
-            "│                  │                                 │              ├──────┼──────────────────┬───────────────┤",
-            "│                  │                                 │              │ nix  │ default-features │ false         │",
-            "│                  │                                 │              │      ├──────────────────┼───────────────┤",
-            "│                  │                                 │              │      │ features         │ signal        │",
-            "│                  │                                 │              │      │                  ├───────────────┤",
-            "│                  │                                 │              │      │                  │ process       │",
-            "│                  │                                 │              │      │                  ├───────────────┤",
-            "│                  │                                 │              │      │                  │ fs            │",
-            "│                  │                                 │              │      │                  ├───────────────┤",
-            "│                  │                                 │              │      │                  │ term          │",
-            "│                  │                                 │              │      ├──────────────────┼───────────────┤",
-            "│                  │                                 │              │      │ version          │ 0.25          │",
-            "│                  ├─────────────────────────────────┼──────────────┴─────┬┴───────┬──────────┴───────────────┤",
-            "│                  │ cfg(windows)                    │ build-dependencies │ winres │ 0.1                      │",
-            "├──────────────────┼─────────┬───────────────────────┴────────────────────┴────────┴──────────────────────────┤",
+            "│                  ├───────────────┼──────────┬───────────┬───────────────────────────────────────────────────┤",
+            "│                  │ metadata      │ binstall │ pkg-url   │ { repo }/releases/download/{ v                    │",
+            "│                  │               │          │           │ ersion }/{ name }-{ version }-                    │",
+            "│                  │               │          │           │ { target }.{ archive-format }                     │",
+            "│                  │               │          ├───────────┼───────────────────────────────────────────────────┤",
+            "│                  │               │          │ pkg-fmt   │ tgz                                               │",
+            "│                  │               │          ├───────────┼────────────────────────┬─────────┬────────────────┤",
+            "│                  │               │          │ overrides │ x86_64-pc-windows-msvc │ pkg-fmt │ zip            │",
+            "├──────────────────┼─────────┬─────┴──────────┴───────────┴────────────────────────┴─────────┴────────────────┤",
             "│ workspace        │ members │ crates/nu-cli                                                                  │",
             "│                  │         ├────────────────────────────────────────────────────────────────────────────────┤",
             "│                  │         │ crates/nu-engine                                                               │",
@@ -2330,7 +2200,137 @@ fn test_collapse_big_0() {
             "│                  │         │ crates/nu_plugin_custom_values                                                 │",
             "│                  │         ├────────────────────────────────────────────────────────────────────────────────┤",
             "│                  │         │ crates/nu-utils                                                                │",
-            "╰──────────────────┴─────────┴────────────────────────────────────────────────────────────────────────────────╯",
+            "├──────────────────┼─────────┴─────┬──────────┬───────────────────────────────────────────────────────────────┤",
+            "│ dependencies     │ chrono        │ version  │ 0.4.23                                                        │",
+            "│                  │               ├──────────┼───────────────────────────────────────────────────────────────┤",
+            "│                  │               │ features │ serde                                                         │",
+            "│                  ├───────────────┼──────────┴───────────────────────────────────────────────────────────────┤",
+            "│                  │ crossterm     │ 0.24.0                                                                   │",
+            "│                  ├───────────────┼──────────────────────────────────────────────────────────────────────────┤",
+            "│                  │ ctrlc         │ 3.2.1                                                                    │",
+            "│                  ├───────────────┼──────────────────────────────────────────────────────────────────────────┤",
+            "│                  │ log           │ 0.4                                                                      │",
+            "│                  ├───────────────┼──────────┬───────────────────────────────────────────────────────────────┤",
+            "│                  │ miette        │ version  │ 5.5.0                                                         │",
+            "│                  │               ├──────────┼───────────────────────────────────────────────────────────────┤",
+            "│                  │               │ features │ fancy-no-backtrace                                            │",
+            "│                  ├───────────────┼──────────┴───────────────────────────────────────────────────────────────┤",
+            "│                  │ nu-ansi-term  │ 0.46.0                                                                   │",
+            "│                  ├───────────────┼─────────┬────────────────────────────────────────────────────────────────┤",
+            "│                  │ nu-cli        │ path    │ ./crates/nu-cli                                                │",
+            "│                  │               ├─────────┼────────────────────────────────────────────────────────────────┤",
+            "│                  │               │ version │ 0.74.1                                                         │",
+            "│                  ├───────────────┼─────────┼────────────────────────────────────────────────────────────────┤",
+            "│                  │ nu-engine     │ path    │ ./crates/nu-engine                                             │",
+            "│                  │               ├─────────┼────────────────────────────────────────────────────────────────┤",
+            "│                  │               │ version │ 0.74.1                                                         │",
+            "│                  ├───────────────┼─────────┴┬───────────────────────────────────────────────────────────────┤",
+            "│                  │ reedline      │ version  │ 0.14.0                                                        │",
+            "│                  │               ├──────────┼───────────────────────────────────────────────────────────────┤",
+            "│                  │               │ features │ bashisms                                                      │",
+            "│                  │               │          ├───────────────────────────────────────────────────────────────┤",
+            "│                  │               │          │ sqlite                                                        │",
+            "│                  ├───────────────┼──────────┴───────────────────────────────────────────────────────────────┤",
+            "│                  │ rayon         │ 1.6.1                                                                    │",
+            "│                  ├───────────────┼──────────────────────────────────────────────────────────────────────────┤",
+            "│                  │ is_executable │ 1.0.1                                                                    │",
+            "│                  ├───────────────┼──────────────────────────────────────────────────────────────────────────┤",
+            "│                  │ simplelog     │ 0.12.0                                                                   │",
+            "│                  ├───────────────┼──────────────────────────────────────────────────────────────────────────┤",
+            "│                  │ time          │ 0.3.12                                                                   │",
+            "├──────────────────┼───────────────┴─────────────────┬──────────────┬─────────────┬──────────┬────────────────┤",
+            "│ target           │ cfg(not(target_os = \"windows\")) │ dependencies │ openssl     │ version  │ 0.10.38        │",
+            "│                  │                                 │              │             ├──────────┼────────────────┤",
+            "│                  │                                 │              │             │ features │ vendored       │",
+            "│                  │                                 │              │             ├──────────┼────────────────┤",
+            "│                  │                                 │              │             │ optional │ true           │",
+            "│                  │                                 │              ├─────────────┼──────────┴───────┬────────┤",
+            "│                  │                                 │              │ signal-hook │ version          │ 0.3.14 │",
+            "│                  │                                 │              │             ├──────────────────┼────────┤",
+            "│                  │                                 │              │             │ default-features │ false  │",
+            "│                  ├─────────────────────────────────┼──────────────┴─────┬───────┴┬─────────────────┴────────┤",
+            "│                  │ cfg(windows)                    │ build-dependencies │ winres │ 0.1                      │",
+            "│                  ├─────────────────────────────────┼──────────────┬─────┴┬───────┴──────────┬───────────────┤",
+            "│                  │ cfg(target_family = \"unix\")     │ dependencies │ nix  │ version          │ 0.25          │",
+            "│                  │                                 │              │      ├──────────────────┼───────────────┤",
+            "│                  │                                 │              │      │ default-features │ false         │",
+            "│                  │                                 │              │      ├──────────────────┼───────────────┤",
+            "│                  │                                 │              │      │ features         │ signal        │",
+            "│                  │                                 │              │      │                  ├───────────────┤",
+            "│                  │                                 │              │      │                  │ process       │",
+            "│                  │                                 │              │      │                  ├───────────────┤",
+            "│                  │                                 │              │      │                  │ fs            │",
+            "│                  │                                 │              │      │                  ├───────────────┤",
+            "│                  │                                 │              │      │                  │ term          │",
+            "│                  │                                 │              ├──────┼──────────────────┴───────────────┤",
+            "│                  │                                 │              │ atty │ 0.2                              │",
+            "├──────────────────┼───────────────────┬─────────┬───┴──────────────┴──────┴──────────────────────────────────┤",
+            "│ dev-dependencies │ nu-test-support   │ path    │ ./crates/nu-test-support                                   │",
+            "│                  │                   ├─────────┼────────────────────────────────────────────────────────────┤",
+            "│                  │                   │ version │ 0.74.1                                                     │",
+            "│                  ├───────────────────┼─────────┴────────────────────────────────────────────────────────────┤",
+            "│                  │ tempfile          │ 3.2.0                                                                │",
+            "│                  ├───────────────────┼──────────────────────────────────────────────────────────────────────┤",
+            "│                  │ assert_cmd        │ 2.0.2                                                                │",
+            "│                  ├───────────────────┼──────────────────────────────────────────────────────────────────────┤",
+            "│                  │ criterion         │ 0.4                                                                  │",
+            "│                  ├───────────────────┼──────────────────────────────────────────────────────────────────────┤",
+            "│                  │ pretty_assertions │ 1.0.0                                                                │",
+            "│                  ├───────────────────┼──────────────────────────────────────────────────────────────────────┤",
+            "│                  │ serial_test       │ 0.10.0                                                               │",
+            "│                  ├───────────────────┼──────────────────────────────────────────────────────────────────────┤",
+            "│                  │ hamcrest2         │ 0.3.0                                                                │",
+            "│                  ├───────────────────┼──────────────────┬───────────────────────────────────────────────────┤",
+            "│                  │ rstest            │ version          │ 0.15.0                                            │",
+            "│                  │                   ├──────────────────┼───────────────────────────────────────────────────┤",
+            "│                  │                   │ default-features │ false                                             │",
+            "│                  ├───────────────────┼──────────────────┴───────────────────────────────────────────────────┤",
+            "│                  │ itertools         │ 0.10.3                                                               │",
+            "├──────────────────┼───────────────────┴─┬────────────────────────────────────────────────────────────────────┤",
+            "│ features         │ plugin              │ nu-plugin                                                          │",
+            "│                  │                     ├────────────────────────────────────────────────────────────────────┤",
+            "│                  │                     │ nu-cli/plugin                                                      │",
+            "│                  │                     ├────────────────────────────────────────────────────────────────────┤",
+            "│                  │                     │ nu-parser/plugin                                                   │",
+            "│                  │                     ├────────────────────────────────────────────────────────────────────┤",
+            "│                  │                     │ nu-command/plugin                                                  │",
+            "│                  │                     ├────────────────────────────────────────────────────────────────────┤",
+            "│                  │                     │ nu-protocol/plugin                                                 │",
+            "│                  │                     ├────────────────────────────────────────────────────────────────────┤",
+            "│                  │                     │ nu-engine/plugin                                                   │",
+            "│                  ├─────────────────────┼────────────────────────────────────────────────────────────────────┤",
+            "│                  │ extra               │ default                                                            │",
+            "│                  ├─────────────────────┼────────────────────────────────────────────────────────────────────┤",
+            "│                  │ default             │ plugin                                                             │",
+            "│                  │                     ├────────────────────────────────────────────────────────────────────┤",
+            "│                  │                     │ which-support                                                      │",
+            "│                  │                     ├────────────────────────────────────────────────────────────────────┤",
+            "│                  │                     │ trash-support                                                      │",
+            "│                  │                     ├────────────────────────────────────────────────────────────────────┤",
+            "│                  │                     │ sqlite                                                             │",
+            "│                  ├─────────────────────┼────────────────────────────────────────────────────────────────────┤",
+            "│                  │ stable              │ default                                                            │",
+            "│                  ├─────────────────────┼────────────────────────────────────────────────────────────────────┤",
+            "│                  │ wasi                │                                                                    │",
+            "│                  ├─────────────────────┼────────────────────────────────────────────────────────────────────┤",
+            "│                  │ static-link-openssl │ dep:openssl                                                        │",
+            "│                  ├─────────────────────┼────────────────────────────────────────────────────────────────────┤",
+            "│                  │ which-support       │ nu-command/which-support                                           │",
+            "│                  ├─────────────────────┼────────────────────────────────────────────────────────────────────┤",
+            "│                  │ trash-support       │ nu-command/trash-support                                           │",
+            "├──────────────────┼──────┬──────────────┴────────────────────────────────────────────────────────────────────┤",
+            "│ bin              │ name │ path                                                                              │",
+            "│                  ├──────┼───────────────────────────────────────────────────────────────────────────────────┤",
+            "│                  │ nu   │ src/main.rs                                                                       │",
+            "├──────────────────┼──────┴────┬──────────┬────────┬──────────────────────────────────────────────────────────┤",
+            "│ patch            │ crates-io │ reedline │ git    │ https://github.com/nushell/reedline.git                  │",
+            "│                  │           │          ├────────┼──────────────────────────────────────────────────────────┤",
+            "│                  │           │          │ branch │ main                                                     │",
+            "├──────────────────┼───────────┴┬─────────┴────────┴──────────────────────────────────────────────────────────┤",
+            "│ bench            │ name       │ harness                                                                     │",
+            "│                  ├────────────┼─────────────────────────────────────────────────────────────────────────────┤",
+            "│                  │ benchmarks │ false                                                                       │",
+            "╰──────────────────┴────────────┴─────────────────────────────────────────────────────────────────────────────╯",
         ]);
 
         assert_eq!(actual.out, expected);

From ff5cb6f1ffbc4c314749e6bf31e9cc1966147743 Mon Sep 17 00:00:00 2001
From: Antoine Stevan <44101798+amtoine@users.noreply.github.com>
Date: Wed, 5 Jun 2024 02:02:17 +0200
Subject: [PATCH 0059/1072] complete the type of `--error-label` in `std
 assert` commands (#12998)

i was looking at the website documentation of `std assert` and i noticed
one thing
- the `--error-label` argument of `assert` and `assert not` was just a
`record` -> now it's that complete type `record<text: string, span:
record<start: int, end: int>>`
---
 crates/nu-std/std/assert.nu | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/nu-std/std/assert.nu b/crates/nu-std/std/assert.nu
index 8f9e4cb906..19ca65dd64 100644
--- a/crates/nu-std/std/assert.nu
+++ b/crates/nu-std/std/assert.nu
@@ -36,7 +36,7 @@
 export def main [
     condition: bool, # Condition, which should be true
     message?: string, # Optional error message
-    --error-label: record # Label for `error make` if you want to create a custom assert
+    --error-label: record<text: string, span: record<start: int, end: int>> # Label for `error make` if you want to create a custom assert
 ] {
     if $condition { return }
     error make {
@@ -81,7 +81,7 @@ export def main [
 export def not [
     condition: bool, # Condition, which should be false
     message?: string, # Optional error message
-    --error-label: record # Label for `error make` if you want to create a custom assert
+    --error-label: record<text: string, span: record<start: int, end: int>> # Label for `error make` if you want to create a custom assert
 ] {
     if $condition {
         let span = (metadata $condition).span

From 28e33587d9a5968447b15eec8cf16e9cd1f1ed7e Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Tue, 4 Jun 2024 17:19:10 -0700
Subject: [PATCH 0060/1072] msgpackz: increase default compression level
 (#13035)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
Increase default compression level for brotli on msgpackz to 3. This has
the best compression time generally. Level 0 and 1 give weird results
and sometimes cause extremely inflated outputs rather than being
compressed. So far this hasn't really been a problem for the plugin
registry file, but has been for other data.

The `$example` is the web-app example from https://json.org/example.html

Benchmarked with:

```nushell
seq 0 11 | each { |level|
  let compressed = ($example | to msgpackz --quality $level)
  let time = (timeit { $example | to msgpackz --quality $level })
  {
    level: $level
    time: $time
    length: ($compressed | bytes length)
    ratio: (($uncompressed_length | into float) / ($compressed | bytes length))
  }
}
```

```
╭────┬───────┬─────────────────┬────────┬───────╮
│  # │ level │      time       │ length │ ratio │
├────┼───────┼─────────────────┼────────┼───────┤
│  0 │     0 │ 4ms 611µs 875ns │   3333 │  0.72 │
│  1 │     1 │ 1ms 334µs 500ns │   3333 │  0.72 │
│  2 │     2 │     190µs 333ns │   1185 │  2.02 │
│  3 │     3 │      184µs 42ns │   1128 │  2.12 │
│  4 │     4 │      245µs 83ns │   1098 │  2.18 │
│  5 │     5 │     265µs 584ns │   1040 │  2.30 │
│  6 │     6 │     270µs 792ns │   1040 │  2.30 │
│  7 │     7 │     444µs 708ns │   1040 │  2.30 │
│  8 │     8 │       1ms 801µs │   1040 │  2.30 │
│  9 │     9 │     843µs 875ns │   1037 │  2.31 │
│ 10 │    10 │ 4ms 128µs 375ns │    984 │  2.43 │
│ 11 │    11 │ 6ms 352µs 834ns │    986 │  2.43 │
╰────┴───────┴─────────────────┴────────┴───────╯
```

cc @maxim-uvarov
---
 crates/nu-command/src/formats/to/msgpackz.rs       | 4 ++--
 crates/nu-protocol/src/plugin/registry_file/mod.rs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/nu-command/src/formats/to/msgpackz.rs b/crates/nu-command/src/formats/to/msgpackz.rs
index 9168d05018..83d812cab6 100644
--- a/crates/nu-command/src/formats/to/msgpackz.rs
+++ b/crates/nu-command/src/formats/to/msgpackz.rs
@@ -5,7 +5,7 @@ use nu_engine::command_prelude::*;
 use super::msgpack::write_value;
 
 const BUFFER_SIZE: usize = 65536;
-const DEFAULT_QUALITY: u32 = 1;
+const DEFAULT_QUALITY: u32 = 3; // 1 can be very bad
 const DEFAULT_WINDOW_SIZE: u32 = 20;
 
 #[derive(Clone)]
@@ -22,7 +22,7 @@ impl Command for ToMsgpackz {
             .named(
                 "quality",
                 SyntaxShape::Int,
-                "Quality of brotli compression (default 1)",
+                "Quality of brotli compression (default 3)",
                 Some('q'),
             )
             .named(
diff --git a/crates/nu-protocol/src/plugin/registry_file/mod.rs b/crates/nu-protocol/src/plugin/registry_file/mod.rs
index 0b5cc9c315..dcaba26b90 100644
--- a/crates/nu-protocol/src/plugin/registry_file/mod.rs
+++ b/crates/nu-protocol/src/plugin/registry_file/mod.rs
@@ -11,7 +11,7 @@ use crate::{PluginIdentity, PluginSignature, ShellError, Span};
 const BUFFER_SIZE: usize = 65536;
 
 // Chose settings at the low end, because we're just trying to get the maximum speed
-const COMPRESSION_QUALITY: u32 = 1;
+const COMPRESSION_QUALITY: u32 = 3; // 1 can be very bad
 const WIN_SIZE: u32 = 20; // recommended 20-22
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]

From 6b2012bdfa3054aea87d4fd9133a8b825c7526b2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Jun 2024 00:45:10 +0000
Subject: [PATCH 0061/1072] Bump crate-ci/typos from 1.21.0 to 1.22.0

Bumps [crate-ci/typos](https://github.com/crate-ci/typos) from 1.21.0 to 1.22.0.
- [Release notes](https://github.com/crate-ci/typos/releases)
- [Changelog](https://github.com/crate-ci/typos/blob/master/CHANGELOG.md)
- [Commits](https://github.com/crate-ci/typos/compare/v1.21.0...v1.22.0)

---
updated-dependencies:
- dependency-name: crate-ci/typos
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/typos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index 709f09c2e7..7b7f3fbc6a 100644
--- a/.github/workflows/typos.yml
+++ b/.github/workflows/typos.yml
@@ -10,4 +10,4 @@ jobs:
         uses: actions/checkout@v4.1.6
 
       - name: Check spelling
-        uses: crate-ci/typos@v1.21.0
+        uses: crate-ci/typos@v1.22.0

From c310175a1e631de63941a3308b4e285ec419cb99 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Jun 2024 09:17:27 +0800
Subject: [PATCH 0062/1072] Bump hustcer/setup-nu from 3.10 to 3.11 (#13058)

---
 .github/workflows/nightly-build.yml | 6 +++---
 .github/workflows/release.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index d95ddd438a..251cffd3a1 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -36,7 +36,7 @@ jobs:
           token: ${{ secrets.WORKFLOW_TOKEN }}
 
       - name: Setup Nushell
-        uses: hustcer/setup-nu@v3.10
+        uses: hustcer/setup-nu@v3.11
         if: github.repository == 'nushell/nightly'
         with:
           version: 0.93.0
@@ -128,7 +128,7 @@ jobs:
         rustflags: ''
 
     - name: Setup Nushell
-      uses: hustcer/setup-nu@v3.10
+      uses: hustcer/setup-nu@v3.11
       with:
         version: 0.93.0
 
@@ -186,7 +186,7 @@ jobs:
           ref: main
 
       - name: Setup Nushell
-        uses: hustcer/setup-nu@v3.10
+        uses: hustcer/setup-nu@v3.11
         with:
           version: 0.93.0
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7d58501044..6aca9578d4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -76,7 +76,7 @@ jobs:
         rustflags: ''
 
     - name: Setup Nushell
-      uses: hustcer/setup-nu@v3.10
+      uses: hustcer/setup-nu@v3.11
       with:
         version: 0.93.0
 

From d4fa014534d0ed9740936a82b5fcae8013a83f71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20B=C3=BCsch?= <antoine.busch@gmail.com>
Date: Wed, 5 Jun 2024 11:47:36 +1000
Subject: [PATCH 0063/1072] Make `query xml` return nodes in document order
 (#13047)

# Description

`query xml` used to return results from an XPath query in a random,
non-deterministic order. With this change, results get returned in the
order they appear in the document.

# User-Facing Changes
`query xml` will now return results in a non-random order.

# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
---
 crates/nu_plugin_query/src/query_xml.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu_plugin_query/src/query_xml.rs b/crates/nu_plugin_query/src/query_xml.rs
index 3cbd9d6092..09bbde13df 100644
--- a/crates/nu_plugin_query/src/query_xml.rs
+++ b/crates/nu_plugin_query/src/query_xml.rs
@@ -88,7 +88,7 @@ pub fn execute_xpath_query(
 
             match r {
                 sxd_xpath::Value::Nodeset(ns) => {
-                    for n in ns.into_iter() {
+                    for n in ns.document_order() {
                         record.push(key.clone(), Value::string(n.string_value(), call.head));
                     }
                 }

From b10325dff1d78fc7971a93ebe0a7b8fc391966c2 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Tue, 4 Jun 2024 18:51:11 -0700
Subject: [PATCH 0064/1072] Allow int values to be converted into floats.
 (#13025)

Addresses the bug found by @maxim-uvarov when trying to coerce an int
Value to a polars float:

<img width="863" alt="image"
src="https://github.com/nushell/nushell/assets/56345/4d858812-a7b3-4296-98f4-dce0c544b4c6">

Conversion now works correctly:

<img width="891" alt="Screenshot 2024-05-31 at 14 28 51"
src="https://github.com/nushell/nushell/assets/56345/78d9f711-7ad5-4503-abc6-7aba64a2e675">
---
 .../values/nu_dataframe/conversion.rs         | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
index f7941bf41d..fe0a956129 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
@@ -269,13 +269,36 @@ fn typed_column_to_series(name: &str, column: TypedColumn) -> Result<Series, She
                 let series_values: Result<Vec<_>, _> = column
                     .values
                     .iter()
-                    .map(|v| v.as_f64().map(|v| v as f32))
+                    .map(|v| match v {
+                        Value::Float { val, .. } => Ok(*val as f32),
+                        Value::Int { val, .. } => Ok(*val as f32),
+                        x => Err(ShellError::GenericError {
+                            error: "Error converting to f32".into(),
+                            msg: "".into(),
+                            span: None,
+                            help: Some(format!("Unexpected type: {x:?}")),
+                            inner: vec![],
+                        }),
+                    })
                     .collect();
                 Ok(Series::new(name, series_values?))
             }
             DataType::Float64 => {
-                let series_values: Result<Vec<_>, _> =
-                    column.values.iter().map(|v| v.as_f64()).collect();
+                let series_values: Result<Vec<_>, _> = column
+                    .values
+                    .iter()
+                    .map(|v| match v {
+                        Value::Float { val, .. } => Ok(*val),
+                        Value::Int { val, .. } => Ok(*val as f64),
+                        x => Err(ShellError::GenericError {
+                            error: "Error converting to f64".into(),
+                            msg: "".into(),
+                            span: None,
+                            help: Some(format!("Unexpected type: {x:?}")),
+                            inner: vec![],
+                        }),
+                    })
+                    .collect();
                 Ok(Series::new(name, series_values?))
             }
             DataType::UInt8 => {

From e4104d079203e5506f9d497366b3b9840f1b50c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C5=BD=C3=A1dn=C3=ADk?= <kubouch@gmail.com>
Date: Wed, 5 Jun 2024 04:57:14 +0300
Subject: [PATCH 0065/1072] Span ID Refactor - Step 1 (#12960)

# Description
First part of SpanID refactoring series. This PR adds a `SpanId` type
and a corresponding `span_id` field to `Expression`. Parser creating
expressions will now add them to an array in `StateWorkingSet`,
generates a corresponding ID and saves the ID to the Expression. The IDs
are not used anywhere yet.

For the rough overall plan, see
https://github.com/nushell/nushell/issues/12963.

# User-Facing Changes
Hopefully none. This is only a refactor of Nushell's internals that
shouldn't have visible side effects.

# Tests + Formatting

# After Submitting
---
 .../src/completions/custom_completions.rs     |  22 +-
 crates/nu-command/src/system/run_external.rs  |   7 +-
 crates/nu-engine/src/documentation.rs         |  54 +-
 crates/nu-parser/src/known_external.rs        |  56 +-
 crates/nu-parser/src/parse_keywords.rs        | 802 ++++++++--------
 crates/nu-parser/src/parser.rs                | 891 ++++++++----------
 crates/nu-parser/src/type_check.rs            |  87 +-
 crates/nu-protocol/src/ast/call.rs            |  23 +-
 crates/nu-protocol/src/ast/expression.rs      |  54 +-
 crates/nu-protocol/src/engine/engine_state.rs |  30 +-
 crates/nu-protocol/src/engine/state_delta.rs  |   4 +-
 .../src/engine/state_working_set.rs           |  21 +-
 crates/nu-protocol/src/id.rs                  |   4 +
 crates/nuon/src/from.rs                       |  24 +-
 14 files changed, 1029 insertions(+), 1050 deletions(-)

diff --git a/crates/nu-cli/src/completions/custom_completions.rs b/crates/nu-cli/src/completions/custom_completions.rs
index 17c8e6a924..f14971d466 100644
--- a/crates/nu-cli/src/completions/custom_completions.rs
+++ b/crates/nu-cli/src/completions/custom_completions.rs
@@ -52,18 +52,16 @@ impl Completer for CustomCompletion {
                 decl_id: self.decl_id,
                 head: span,
                 arguments: vec![
-                    Argument::Positional(Expression {
-                        span: Span::unknown(),
-                        ty: Type::String,
-                        expr: Expr::String(self.line.clone()),
-                        custom_completion: None,
-                    }),
-                    Argument::Positional(Expression {
-                        span: Span::unknown(),
-                        ty: Type::Int,
-                        expr: Expr::Int(line_pos as i64),
-                        custom_completion: None,
-                    }),
+                    Argument::Positional(Expression::new_unknown(
+                        Expr::String(self.line.clone()),
+                        Span::unknown(),
+                        Type::String,
+                    )),
+                    Argument::Positional(Expression::new_unknown(
+                        Expr::Int(line_pos as i64),
+                        Span::unknown(),
+                        Type::Int,
+                    )),
                 ],
                 parser_info: HashMap::new(),
             },
diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index d4645e87e8..614befe352 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -665,12 +665,7 @@ mod test {
     #[test]
     fn test_eval_argument() {
         fn expression(expr: Expr) -> Expression {
-            Expression {
-                expr,
-                span: Span::unknown(),
-                ty: Type::Any,
-                custom_completion: None,
-            }
+            Expression::new_unknown(expr, Span::unknown(), Type::Any)
         }
 
         fn eval(expr: Expr, spread: bool) -> Result<Vec<String>, ShellError> {
diff --git a/crates/nu-engine/src/documentation.rs b/crates/nu-engine/src/documentation.rs
index 3cd1130060..94cef3298e 100644
--- a/crates/nu-engine/src/documentation.rs
+++ b/crates/nu-engine/src/documentation.rs
@@ -2,9 +2,9 @@ use crate::eval_call;
 use nu_protocol::{
     ast::{Argument, Call, Expr, Expression, RecordItem},
     debugger::WithoutDebug,
-    engine::{Command, EngineState, Stack},
-    record, Category, Example, IntoPipelineData, PipelineData, Signature, Span, SyntaxShape, Type,
-    Value,
+    engine::{Command, EngineState, Stack, UNKNOWN_SPAN_ID},
+    record, Category, Example, IntoPipelineData, PipelineData, Signature, Span, SpanId,
+    SyntaxShape, Type, Value,
 };
 use std::{collections::HashMap, fmt::Write};
 
@@ -339,8 +339,9 @@ fn get_ansi_color_for_component_or_default(
     if let Some(color) = &engine_state.get_config().color_config.get(theme_component) {
         let caller_stack = &mut Stack::new().capture();
         let span = Span::unknown();
+        let span_id = UNKNOWN_SPAN_ID;
 
-        let argument_opt = get_argument_for_color_value(engine_state, color, span);
+        let argument_opt = get_argument_for_color_value(engine_state, color, span, span_id);
 
         // Call ansi command using argument
         if let Some(argument) = argument_opt {
@@ -371,6 +372,7 @@ fn get_argument_for_color_value(
     engine_state: &EngineState,
     color: &&Value,
     span: Span,
+    span_id: SpanId,
 ) -> Option<Argument> {
     match color {
         Value::Record { val, .. } => {
@@ -378,43 +380,43 @@ fn get_argument_for_color_value(
                 .iter()
                 .map(|(k, v)| {
                     RecordItem::Pair(
-                        Expression {
-                            expr: Expr::String(k.clone()),
+                        Expression::new_existing(
+                            Expr::String(k.clone()),
                             span,
-                            ty: Type::String,
-                            custom_completion: None,
-                        },
-                        Expression {
-                            expr: Expr::String(
+                            span_id,
+                            Type::String,
+                        ),
+                        Expression::new_existing(
+                            Expr::String(
                                 v.clone().to_expanded_string("", engine_state.get_config()),
                             ),
                             span,
-                            ty: Type::String,
-                            custom_completion: None,
-                        },
+                            span_id,
+                            Type::String,
+                        ),
                     )
                 })
                 .collect();
 
-            Some(Argument::Positional(Expression {
-                span: Span::unknown(),
-                ty: Type::Record(
+            Some(Argument::Positional(Expression::new_existing(
+                Expr::Record(record_exp),
+                Span::unknown(),
+                UNKNOWN_SPAN_ID,
+                Type::Record(
                     [
                         ("fg".to_string(), Type::String),
                         ("attr".to_string(), Type::String),
                     ]
                     .into(),
                 ),
-                expr: Expr::Record(record_exp),
-                custom_completion: None,
-            }))
+            )))
         }
-        Value::String { val, .. } => Some(Argument::Positional(Expression {
-            span: Span::unknown(),
-            ty: Type::String,
-            expr: Expr::String(val.clone()),
-            custom_completion: None,
-        })),
+        Value::String { val, .. } => Some(Argument::Positional(Expression::new_existing(
+            Expr::String(val.clone()),
+            Span::unknown(),
+            UNKNOWN_SPAN_ID,
+            Type::String,
+        ))),
         _ => None,
     }
 }
diff --git a/crates/nu-parser/src/known_external.rs b/crates/nu-parser/src/known_external.rs
index 1463a3b080..453112aa32 100644
--- a/crates/nu-parser/src/known_external.rs
+++ b/crates/nu-parser/src/known_external.rs
@@ -1,7 +1,7 @@
 use nu_engine::command_prelude::*;
 use nu_protocol::{
     ast::{Argument, Expr, Expression},
-    engine::CommandType,
+    engine::{CommandType, UNKNOWN_SPAN_ID},
 };
 
 #[derive(Clone)]
@@ -56,43 +56,49 @@ impl Command for KnownExternal {
         };
 
         let extern_name: Vec<_> = extern_name.split(' ').collect();
+        let call_head_id = engine_state
+            .find_span_id(call.head)
+            .unwrap_or(UNKNOWN_SPAN_ID);
 
-        let arg_extern_name = Expression {
-            expr: Expr::String(extern_name[0].to_string()),
-            span: call.head,
-            ty: Type::String,
-            custom_completion: None,
-        };
+        let arg_extern_name = Expression::new_existing(
+            Expr::String(extern_name[0].to_string()),
+            call.head,
+            call_head_id,
+            Type::String,
+        );
 
         extern_call.add_positional(arg_extern_name);
 
         for subcommand in extern_name.into_iter().skip(1) {
-            extern_call.add_positional(Expression {
-                expr: Expr::String(subcommand.to_string()),
-                span: call.head,
-                ty: Type::String,
-                custom_completion: None,
-            });
+            extern_call.add_positional(Expression::new_existing(
+                Expr::String(subcommand.to_string()),
+                call.head,
+                call_head_id,
+                Type::String,
+            ));
         }
 
         for arg in &call.arguments {
             match arg {
                 Argument::Positional(positional) => extern_call.add_positional(positional.clone()),
                 Argument::Named(named) => {
+                    let named_span_id = engine_state
+                        .find_span_id(named.0.span)
+                        .unwrap_or(UNKNOWN_SPAN_ID);
                     if let Some(short) = &named.1 {
-                        extern_call.add_positional(Expression {
-                            expr: Expr::String(format!("-{}", short.item)),
-                            span: named.0.span,
-                            ty: Type::String,
-                            custom_completion: None,
-                        });
+                        extern_call.add_positional(Expression::new_existing(
+                            Expr::String(format!("-{}", short.item)),
+                            named.0.span,
+                            named_span_id,
+                            Type::String,
+                        ));
                     } else {
-                        extern_call.add_positional(Expression {
-                            expr: Expr::String(format!("--{}", named.0.item)),
-                            span: named.0.span,
-                            ty: Type::String,
-                            custom_completion: None,
-                        });
+                        extern_call.add_positional(Expression::new_existing(
+                            Expr::String(format!("--{}", named.0.item)),
+                            named.0.span,
+                            named_span_id,
+                            Type::String,
+                        ));
                     }
                     if let Some(arg) = &named.2 {
                         extern_call.add_positional(arg.clone());
diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index 25a55c8489..2849b4e39c 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -113,12 +113,12 @@ pub fn parse_keyword(working_set: &mut StateWorkingSet, lite_command: &LiteComma
         // check help flag first.
         if call.named_iter().any(|(flag, _, _)| flag.item == "help") {
             let call_span = call.span();
-            return Pipeline::from_vec(vec![Expression {
-                expr: Expr::Call(call),
-                span: call_span,
-                ty: Type::Any,
-                custom_completion: None,
-            }]);
+            return Pipeline::from_vec(vec![Expression::new(
+                working_set,
+                Expr::Call(call),
+                call_span,
+                Type::Any,
+            )]);
         }
 
         match cmd.name() {
@@ -256,11 +256,11 @@ pub fn parse_for(working_set: &mut StateWorkingSet, lite_command: &LiteCommand)
             "internal error: Wrong call name for 'for' function".into(),
             Span::concat(spans),
         ));
-        return garbage(spans[0]);
+        return garbage(working_set, spans[0]);
     }
     if let Some(redirection) = lite_command.redirection.as_ref() {
         working_set.error(redirecting_builtin_error("for", redirection));
-        return garbage(spans[0]);
+        return garbage(working_set, spans[0]);
     }
 
     // Parsing the spans and checking that they match the register signature
@@ -272,7 +272,7 @@ pub fn parse_for(working_set: &mut StateWorkingSet, lite_command: &LiteCommand)
                 "internal error: for declaration not found".into(),
                 Span::concat(spans),
             ));
-            return garbage(spans[0]);
+            return garbage(working_set, spans[0]);
         }
         Some(decl_id) => {
             working_set.enter_scope();
@@ -289,16 +289,11 @@ pub fn parse_for(working_set: &mut StateWorkingSet, lite_command: &LiteCommand)
             check_call(working_set, call_span, &sig, &call);
 
             let Ok(is_help) = has_flag_const(working_set, &call, "help") else {
-                return garbage(spans[0]);
+                return garbage(working_set, spans[0]);
             };
 
             if starting_error_count != working_set.parse_errors.len() || is_help {
-                return Expression {
-                    expr: Expr::Call(call),
-                    span: call_span,
-                    ty: output,
-                    custom_completion: None,
-                };
+                return Expression::new(working_set, Expr::Call(call), call_span, output);
             }
 
             // Let's get our block and make sure it has the right signature
@@ -355,12 +350,7 @@ pub fn parse_for(working_set: &mut StateWorkingSet, lite_command: &LiteCommand)
         );
     }
 
-    Expression {
-        expr: Expr::Call(call),
-        span: call_span,
-        ty: Type::Nothing,
-        custom_completion: None,
-    }
+    Expression::new(working_set, Expr::Call(call), call_span, Type::Nothing)
 }
 
 /// If `name` is a keyword, emit an error.
@@ -397,11 +387,11 @@ pub fn parse_def(
             "internal error: Wrong call name for def function".into(),
             Span::concat(spans),
         ));
-        return (garbage_pipeline(spans), None);
+        return (garbage_pipeline(working_set, spans), None);
     }
     if let Some(redirection) = lite_command.redirection.as_ref() {
         working_set.error(redirecting_builtin_error("def", redirection));
-        return (garbage_pipeline(spans), None);
+        return (garbage_pipeline(working_set, spans), None);
     }
 
     // Parsing the spans and checking that they match the register signature
@@ -413,7 +403,7 @@ pub fn parse_def(
                 "internal error: def declaration not found".into(),
                 Span::concat(spans),
             ));
-            return (garbage_pipeline(spans), None);
+            return (garbage_pipeline(working_set, spans), None);
         }
         Some(decl_id) => {
             working_set.enter_scope();
@@ -437,7 +427,7 @@ pub fn parse_def(
                     String::from_utf8_lossy(&def_call).as_ref(),
                 ) {
                     working_set.error(err);
-                    return (garbage_pipeline(spans), None);
+                    return (garbage_pipeline(working_set, spans), None);
                 }
             }
 
@@ -481,17 +471,17 @@ pub fn parse_def(
             working_set.parse_errors.append(&mut new_errors);
 
             let Ok(is_help) = has_flag_const(working_set, &call, "help") else {
-                return (garbage_pipeline(spans), None);
+                return (garbage_pipeline(working_set, spans), None);
             };
 
             if starting_error_count != working_set.parse_errors.len() || is_help {
                 return (
-                    Pipeline::from_vec(vec![Expression {
-                        expr: Expr::Call(call),
-                        span: call_span,
-                        ty: output,
-                        custom_completion: None,
-                    }]),
+                    Pipeline::from_vec(vec![Expression::new(
+                        working_set,
+                        Expr::Call(call),
+                        call_span,
+                        output,
+                    )]),
                     None,
                 );
             }
@@ -501,10 +491,10 @@ pub fn parse_def(
     };
 
     let Ok(has_env) = has_flag_const(working_set, &call, "env") else {
-        return (garbage_pipeline(spans), None);
+        return (garbage_pipeline(working_set, spans), None);
     };
     let Ok(has_wrapped) = has_flag_const(working_set, &call, "wrapped") else {
-        return (garbage_pipeline(spans), None);
+        return (garbage_pipeline(working_set, spans), None);
     };
 
     // All positional arguments must be in the call positional vector by this point
@@ -524,12 +514,12 @@ pub fn parse_def(
                     name_expr_span,
                 ));
                 return (
-                    Pipeline::from_vec(vec![Expression {
-                        expr: Expr::Call(call),
-                        span: call_span,
-                        ty: Type::Any,
-                        custom_completion: None,
-                    }]),
+                    Pipeline::from_vec(vec![Expression::new(
+                        working_set,
+                        Expr::Call(call),
+                        call_span,
+                        Type::Any,
+                    )]),
                     None,
                 );
             }
@@ -541,7 +531,7 @@ pub fn parse_def(
             "Could not get string from string expression".into(),
             name_expr.span,
         ));
-        return (garbage_pipeline(spans), None);
+        return (garbage_pipeline(working_set, spans), None);
     };
 
     let mut result = None;
@@ -574,12 +564,12 @@ pub fn parse_def(
                             format!("...rest-like positional argument used in 'def --wrapped' supports only strings. Change the type annotation of ...{} to 'string'.", &rest.name)));
 
                         return (
-                            Pipeline::from_vec(vec![Expression {
-                                expr: Expr::Call(call),
-                                span: call_span,
-                                ty: Type::Any,
-                                custom_completion: None,
-                            }]),
+                            Pipeline::from_vec(vec![Expression::new(
+                                working_set,
+                                Expr::Call(call),
+                                call_span,
+                                Type::Any,
+                            )]),
                             result,
                         );
                     }
@@ -588,12 +578,12 @@ pub fn parse_def(
                 working_set.error(ParseError::MissingPositional("...rest-like positional argument".to_string(), name_expr.span, "def --wrapped must have a ...rest-like positional argument. Add '...rest: string' to the command's signature.".to_string()));
 
                 return (
-                    Pipeline::from_vec(vec![Expression {
-                        expr: Expr::Call(call),
-                        span: call_span,
-                        ty: Type::Any,
-                        custom_completion: None,
-                    }]),
+                    Pipeline::from_vec(vec![Expression::new(
+                        working_set,
+                        Expr::Call(call),
+                        call_span,
+                        Type::Any,
+                    )]),
                     result,
                 );
             }
@@ -644,12 +634,12 @@ pub fn parse_def(
     working_set.merge_predecl(name.as_bytes());
 
     (
-        Pipeline::from_vec(vec![Expression {
-            expr: Expr::Call(call),
-            span: call_span,
-            ty: Type::Any,
-            custom_completion: None,
-        }]),
+        Pipeline::from_vec(vec![Expression::new(
+            working_set,
+            Expr::Call(call),
+            call_span,
+            Type::Any,
+        )]),
         result,
     )
 }
@@ -679,11 +669,11 @@ pub fn parse_extern(
             "internal error: Wrong call name for extern command".into(),
             Span::concat(spans),
         ));
-        return garbage_pipeline(spans);
+        return garbage_pipeline(working_set, spans);
     }
     if let Some(redirection) = lite_command.redirection.as_ref() {
         working_set.error(redirecting_builtin_error("extern", redirection));
-        return garbage_pipeline(spans);
+        return garbage_pipeline(working_set, spans);
     }
 
     // Parsing the spans and checking that they match the register signature
@@ -695,7 +685,7 @@ pub fn parse_extern(
                 "internal error: def declaration not found".into(),
                 Span::concat(spans),
             ));
-            return garbage_pipeline(spans);
+            return garbage_pipeline(working_set, spans);
         }
         Some(decl_id) => {
             working_set.enter_scope();
@@ -709,7 +699,7 @@ pub fn parse_extern(
                     String::from_utf8_lossy(&extern_call).as_ref(),
                 ) {
                     working_set.error(err);
-                    return garbage_pipeline(spans);
+                    return garbage_pipeline(working_set, spans);
                 }
             }
 
@@ -743,12 +733,12 @@ pub fn parse_extern(
                         "main".to_string(),
                         name_expr_span,
                     ));
-                    return Pipeline::from_vec(vec![Expression {
-                        expr: Expr::Call(call),
-                        span: call_span,
-                        ty: Type::Any,
-                        custom_completion: None,
-                    }]);
+                    return Pipeline::from_vec(vec![Expression::new(
+                        working_set,
+                        Expr::Call(call),
+                        call_span,
+                        Type::Any,
+                    )]);
                 }
             }
 
@@ -809,12 +799,12 @@ pub fn parse_extern(
         }
     }
 
-    Pipeline::from_vec(vec![Expression {
-        expr: Expr::Call(call),
-        span: call_span,
-        ty: Type::Any,
-        custom_completion: None,
-    }])
+    Pipeline::from_vec(vec![Expression::new(
+        working_set,
+        Expr::Call(call),
+        call_span,
+        Type::Any,
+    )])
 }
 
 fn check_alias_name<'a>(working_set: &mut StateWorkingSet, spans: &'a [Span]) -> Option<&'a Span> {
@@ -880,15 +870,15 @@ pub fn parse_alias(
             "Alias statement unparsable".into(),
             Span::concat(spans),
         ));
-        return garbage_pipeline(spans);
+        return garbage_pipeline(working_set, spans);
     }
     if let Some(redirection) = lite_command.redirection.as_ref() {
         working_set.error(redirecting_builtin_error("alias", redirection));
-        return garbage_pipeline(spans);
+        return garbage_pipeline(working_set, spans);
     }
 
     if let Some(span) = check_alias_name(working_set, spans) {
-        return Pipeline::from_vec(vec![garbage(*span)]);
+        return Pipeline::from_vec(vec![garbage(working_set, *span)]);
     }
 
     if let Some(decl_id) = working_set.find_decl(b"alias") {
@@ -912,15 +902,15 @@ pub fn parse_alias(
             .truncate(original_starting_error_count);
 
         let Ok(has_help_flag) = has_flag_const(working_set, &alias_call, "help") else {
-            return garbage_pipeline(spans);
+            return garbage_pipeline(working_set, spans);
         };
 
-        let alias_pipeline = Pipeline::from_vec(vec![Expression {
-            expr: Expr::Call(alias_call.clone()),
-            span: Span::concat(spans),
-            ty: output,
-            custom_completion: None,
-        }]);
+        let alias_pipeline = Pipeline::from_vec(vec![Expression::new(
+            working_set,
+            Expr::Call(alias_call.clone()),
+            Span::concat(spans),
+            output,
+        )]);
 
         if has_help_flag {
             return alias_pipeline;
@@ -931,7 +921,7 @@ pub fn parse_alias(
                 "Missing positional after call check".to_string(),
                 Span::concat(spans),
             ));
-            return garbage_pipeline(spans);
+            return garbage_pipeline(working_set, spans);
         };
 
         let alias_name = if let Some(name) = alias_name_expr.as_string() {
@@ -941,13 +931,13 @@ pub fn parse_alias(
                 || name.parse::<f64>().is_ok()
             {
                 working_set.error(ParseError::AliasNotValid(alias_name_expr.span));
-                return garbage_pipeline(spans);
+                return garbage_pipeline(working_set, spans);
             } else {
                 name
             }
         } else {
             working_set.error(ParseError::AliasNotValid(alias_name_expr.span));
-            return garbage_pipeline(spans);
+            return garbage_pipeline(working_set, spans);
         };
 
         if spans.len() >= split_id + 3 {
@@ -1008,7 +998,7 @@ pub fn parse_alias(
                             .truncate(original_starting_error_count);
                         // ignore missing required positional
                     } else {
-                        return garbage_pipeline(replacement_spans);
+                        return garbage_pipeline(working_set, replacement_spans);
                     }
                 }
             }
@@ -1118,7 +1108,7 @@ pub fn parse_alias(
         Span::concat(spans),
     ));
 
-    garbage_pipeline(spans)
+    garbage_pipeline(working_set, spans)
 }
 
 // This one will trigger if `export` appears during eval, e.g., in a script
@@ -1145,7 +1135,7 @@ pub fn parse_export_in_block(
 
     if let Some(redirection) = lite_command.redirection.as_ref() {
         working_set.error(redirecting_builtin_error(full_name, redirection));
-        return garbage_pipeline(&lite_command.parts);
+        return garbage_pipeline(working_set, &lite_command.parts);
     }
 
     if let Some(decl_id) = working_set.find_decl(full_name.as_bytes()) {
@@ -1170,23 +1160,23 @@ pub fn parse_export_in_block(
         check_call(working_set, call_span, &decl.signature(), &call);
 
         let Ok(is_help) = has_flag_const(working_set, &call, "help") else {
-            return garbage_pipeline(&lite_command.parts);
+            return garbage_pipeline(working_set, &lite_command.parts);
         };
 
         if starting_error_count != working_set.parse_errors.len() || is_help {
-            return Pipeline::from_vec(vec![Expression {
-                expr: Expr::Call(call),
-                span: call_span,
-                ty: output,
-                custom_completion: None,
-            }]);
+            return Pipeline::from_vec(vec![Expression::new(
+                working_set,
+                Expr::Call(call),
+                call_span,
+                output,
+            )]);
         }
     } else {
         working_set.error(ParseError::UnknownState(
             format!("internal error: '{full_name}' declaration not found",),
             Span::concat(&lite_command.parts),
         ));
-        return garbage_pipeline(&lite_command.parts);
+        return garbage_pipeline(working_set, &lite_command.parts);
     };
 
     if full_name == "export" {
@@ -1195,7 +1185,7 @@ pub fn parse_export_in_block(
             "export".into(),
             lite_command.parts[0],
         ));
-        return garbage_pipeline(&lite_command.parts);
+        return garbage_pipeline(working_set, &lite_command.parts);
     }
 
     match full_name {
@@ -1211,7 +1201,7 @@ pub fn parse_export_in_block(
                 lite_command.parts[0],
             ));
 
-            garbage_pipeline(&lite_command.parts)
+            garbage_pipeline(working_set, &lite_command.parts)
         }
     }
 }
@@ -1230,7 +1220,7 @@ pub fn parse_export_in_module(
                 "expected export statement".into(),
                 Span::concat(spans),
             ));
-            return (garbage_pipeline(spans), vec![]);
+            return (garbage_pipeline(working_set, spans), vec![]);
         }
 
         *sp
@@ -1239,7 +1229,7 @@ pub fn parse_export_in_module(
             "got empty input for parsing export statement".into(),
             Span::concat(spans),
         ));
-        return (garbage_pipeline(spans), vec![]);
+        return (garbage_pipeline(working_set, spans), vec![]);
     };
 
     let export_decl_id = if let Some(id) = working_set.find_decl(b"export") {
@@ -1249,7 +1239,7 @@ pub fn parse_export_in_module(
             "missing export command".into(),
             export_span,
         ));
-        return (garbage_pipeline(spans), vec![]);
+        return (garbage_pipeline(working_set, spans), vec![]);
     };
 
     let mut call = Box::new(Call {
@@ -1288,7 +1278,7 @@ pub fn parse_export_in_module(
                         "missing 'export def' command".into(),
                         export_span,
                     ));
-                    return (garbage_pipeline(spans), vec![]);
+                    return (garbage_pipeline(working_set, spans), vec![]);
                 };
 
                 // Trying to warp the 'def' call into the 'export def' in a very clumsy way
@@ -1324,7 +1314,7 @@ pub fn parse_export_in_module(
                         "missing 'export extern' command".into(),
                         export_span,
                     ));
-                    return (garbage_pipeline(spans), vec![]);
+                    return (garbage_pipeline(working_set, spans), vec![]);
                 };
 
                 // Trying to warp the 'def' call into the 'export def' in a very clumsy way
@@ -1379,7 +1369,7 @@ pub fn parse_export_in_module(
                         "missing 'export alias' command".into(),
                         export_span,
                     ));
-                    return (garbage_pipeline(spans), vec![]);
+                    return (garbage_pipeline(working_set, spans), vec![]);
                 };
 
                 // Trying to warp the 'alias' call into the 'export alias' in a very clumsy way
@@ -1435,7 +1425,7 @@ pub fn parse_export_in_module(
                         "missing 'export use' command".into(),
                         export_span,
                     ));
-                    return (garbage_pipeline(spans), vec![]);
+                    return (garbage_pipeline(working_set, spans), vec![]);
                 };
 
                 // Trying to warp the 'use' call into the 'export use' in a very clumsy way
@@ -1466,7 +1456,7 @@ pub fn parse_export_in_module(
                             "missing 'export module' command".into(),
                             export_span,
                         ));
-                        return (garbage_pipeline(spans), vec![]);
+                        return (garbage_pipeline(working_set, spans), vec![]);
                     };
 
                 // Trying to warp the 'module' call into the 'export module' in a very clumsy way
@@ -1518,7 +1508,7 @@ pub fn parse_export_in_module(
                         "missing 'export const' command".into(),
                         export_span,
                     ));
-                    return (garbage_pipeline(spans), vec![]);
+                    return (garbage_pipeline(working_set, spans), vec![]);
                 };
 
                 // Trying to warp the 'const' call into the 'export const' in a very clumsy way
@@ -1580,12 +1570,12 @@ pub fn parse_export_in_module(
     };
 
     (
-        Pipeline::from_vec(vec![Expression {
-            expr: Expr::Call(call),
-            span: Span::concat(spans),
-            ty: Type::Any,
-            custom_completion: None,
-        }]),
+        Pipeline::from_vec(vec![Expression::new(
+            working_set,
+            Expr::Call(call),
+            Span::concat(spans),
+            Type::Any,
+        )]),
         exportables,
     )
 }
@@ -1599,7 +1589,7 @@ pub fn parse_export_env(
             "internal error: Wrong call name for 'export-env' command".into(),
             Span::concat(spans),
         ));
-        return (garbage_pipeline(spans), None);
+        return (garbage_pipeline(working_set, spans), None);
     }
 
     if spans.len() < 2 {
@@ -1608,7 +1598,7 @@ pub fn parse_export_env(
             Span::concat(spans),
             "export-env <block>".into(),
         ));
-        return (garbage_pipeline(spans), None);
+        return (garbage_pipeline(working_set, spans), None);
     }
 
     let call = match working_set.find_decl(b"export-env") {
@@ -1623,17 +1613,17 @@ pub fn parse_export_env(
             check_call(working_set, call_span, &decl.signature(), &call);
 
             let Ok(is_help) = has_flag_const(working_set, &call, "help") else {
-                return (garbage_pipeline(spans), None);
+                return (garbage_pipeline(working_set, spans), None);
             };
 
             if starting_error_count != working_set.parse_errors.len() || is_help {
                 return (
-                    Pipeline::from_vec(vec![Expression {
-                        expr: Expr::Call(call),
-                        span: call_span,
-                        ty: output,
-                        custom_completion: None,
-                    }]),
+                    Pipeline::from_vec(vec![Expression::new(
+                        working_set,
+                        Expr::Call(call),
+                        call_span,
+                        output,
+                    )]),
                     None,
                 );
             }
@@ -1645,7 +1635,7 @@ pub fn parse_export_env(
                 "internal error: 'export-env' declaration not found".into(),
                 Span::concat(spans),
             ));
-            return (garbage_pipeline(spans), None);
+            return (garbage_pipeline(working_set, spans), None);
         }
     };
 
@@ -1657,22 +1647,22 @@ pub fn parse_export_env(
                 "internal error: 'export-env' block is not a block".into(),
                 block.span,
             ));
-            return (garbage_pipeline(spans), None);
+            return (garbage_pipeline(working_set, spans), None);
         }
     } else {
         working_set.error(ParseError::UnknownState(
             "internal error: 'export-env' block is missing".into(),
             Span::concat(spans),
         ));
-        return (garbage_pipeline(spans), None);
+        return (garbage_pipeline(working_set, spans), None);
     };
 
-    let pipeline = Pipeline::from_vec(vec![Expression {
-        expr: Expr::Call(call),
-        span: Span::concat(spans),
-        ty: Type::Any,
-        custom_completion: None,
-    }]);
+    let pipeline = Pipeline::from_vec(vec![Expression::new(
+        working_set,
+        Expr::Call(call),
+        Span::concat(spans),
+        Type::Any,
+    )]);
 
     (pipeline, Some(block_id))
 }
@@ -1878,12 +1868,14 @@ pub fn parse_module_block(
                         command.parts[0],
                     ));
 
-                    block.pipelines.push(garbage_pipeline(&command.parts))
+                    block
+                        .pipelines
+                        .push(garbage_pipeline(working_set, &command.parts))
                 }
             }
         } else {
             working_set.error(ParseError::Expected("not a pipeline", span));
-            block.pipelines.push(garbage_pipeline(&[span]))
+            block.pipelines.push(garbage_pipeline(working_set, &[span]))
         }
     }
 
@@ -2050,7 +2042,7 @@ pub fn parse_module(
 
     if let Some(redirection) = lite_command.redirection.as_ref() {
         working_set.error(redirecting_builtin_error("module", redirection));
-        return (garbage_pipeline(spans), None);
+        return (garbage_pipeline(working_set, spans), None);
     }
 
     let mut module_comments = lite_command.comments.clone();
@@ -2079,17 +2071,17 @@ pub fn parse_module(
             check_call(working_set, call_span, &decl.signature(), &call);
 
             let Ok(is_help) = has_flag_const(working_set, &call, "help") else {
-                return (garbage_pipeline(spans), None);
+                return (garbage_pipeline(working_set, spans), None);
             };
 
             if starting_error_count != working_set.parse_errors.len() || is_help {
                 return (
-                    Pipeline::from_vec(vec![Expression {
-                        expr: Expr::Call(call),
-                        span: call_span,
-                        ty: output,
-                        custom_completion: None,
-                    }]),
+                    Pipeline::from_vec(vec![Expression::new(
+                        working_set,
+                        Expr::Call(call),
+                        call_span,
+                        output,
+                    )]),
                     None,
                 );
             }
@@ -2101,7 +2093,7 @@ pub fn parse_module(
                 "internal error: 'module' or 'export module' declaration not found".into(),
                 Span::concat(spans),
             ));
-            return (garbage_pipeline(spans), None);
+            return (garbage_pipeline(working_set, spans), None);
         }
     };
 
@@ -2117,12 +2109,12 @@ pub fn parse_module(
                             name.span,
                         ));
                         return (
-                            Pipeline::from_vec(vec![Expression {
-                                expr: Expr::Call(call),
-                                span: call_span,
-                                ty: Type::Any,
-                                custom_completion: None,
-                            }]),
+                            Pipeline::from_vec(vec![Expression::new(
+                                working_set,
+                                Expr::Call(call),
+                                call_span,
+                                Type::Any,
+                            )]),
                             None,
                         );
                     }
@@ -2133,22 +2125,22 @@ pub fn parse_module(
                     "internal error: name not a string".into(),
                     Span::concat(spans),
                 ));
-                return (garbage_pipeline(spans), None);
+                return (garbage_pipeline(working_set, spans), None);
             }
         } else {
             working_set.error(ParseError::UnknownState(
                 "internal error: missing positional".into(),
                 Span::concat(spans),
             ));
-            return (garbage_pipeline(spans), None);
+            return (garbage_pipeline(working_set, spans), None);
         };
 
-    let pipeline = Pipeline::from_vec(vec![Expression {
-        expr: Expr::Call(call),
-        span: call_span,
-        ty: Type::Any,
-        custom_completion: None,
-    }]);
+    let pipeline = Pipeline::from_vec(vec![Expression::new(
+        working_set,
+        Expr::Call(call),
+        call_span,
+        Type::Any,
+    )]);
 
     if spans.len() == split_id + 1 {
         if let Some(module_id) = parse_module_file_or_dir(
@@ -2173,7 +2165,7 @@ pub fn parse_module(
             Span::concat(spans),
         ));
 
-        return (garbage_pipeline(spans), None);
+        return (garbage_pipeline(working_set, spans), None);
     }
 
     let module_name = module_name_or_path;
@@ -2187,7 +2179,7 @@ pub fn parse_module(
         start += 1;
     } else {
         working_set.error(ParseError::Expected("block", block_span));
-        return (garbage_pipeline(spans), None);
+        return (garbage_pipeline(working_set, spans), None);
     }
 
     if block_bytes.ends_with(b"}") {
@@ -2206,12 +2198,7 @@ pub fn parse_module(
     module_comments.extend(inner_comments);
     let module_id = working_set.add_module(&module_name, module, module_comments);
 
-    let block_expr = Expression {
-        expr: Expr::Block(block_id),
-        span: block_span,
-        ty: Type::Block,
-        custom_completion: None,
-    };
+    let block_expr = Expression::new(working_set, Expr::Block(block_id), block_span, Type::Block);
 
     let module_decl_id = working_set
         .find_decl(b"module")
@@ -2228,12 +2215,12 @@ pub fn parse_module(
     });
 
     (
-        Pipeline::from_vec(vec![Expression {
-            expr: Expr::Call(call),
-            span: Span::concat(spans),
-            ty: Type::Any,
-            custom_completion: None,
-        }]),
+        Pipeline::from_vec(vec![Expression::new(
+            working_set,
+            Expr::Call(call),
+            Span::concat(spans),
+            Type::Any,
+        )]),
         Some(module_id),
     )
 }
@@ -2257,7 +2244,7 @@ pub fn parse_use(
             "internal error: Wrong call name for 'use' command".into(),
             Span::concat(spans),
         ));
-        return (garbage_pipeline(spans), vec![]);
+        return (garbage_pipeline(working_set, spans), vec![]);
     }
 
     if working_set.get_span_contents(name_span) != b"use" {
@@ -2265,12 +2252,12 @@ pub fn parse_use(
             "internal error: Wrong call name for 'use' command".into(),
             Span::concat(spans),
         ));
-        return (garbage_pipeline(spans), vec![]);
+        return (garbage_pipeline(working_set, spans), vec![]);
     }
 
     if let Some(redirection) = lite_command.redirection.as_ref() {
         working_set.error(redirecting_builtin_error("use", redirection));
-        return (garbage_pipeline(spans), vec![]);
+        return (garbage_pipeline(working_set, spans), vec![]);
     }
 
     let (call, call_span, args_spans) = match working_set.find_decl(b"use") {
@@ -2291,17 +2278,17 @@ pub fn parse_use(
             check_call(working_set, call_span, &decl.signature(), &call);
 
             let Ok(is_help) = has_flag_const(working_set, &call, "help") else {
-                return (garbage_pipeline(spans), vec![]);
+                return (garbage_pipeline(working_set, spans), vec![]);
             };
 
             if starting_error_count != working_set.parse_errors.len() || is_help {
                 return (
-                    Pipeline::from_vec(vec![Expression {
-                        expr: Expr::Call(call),
-                        span: call_span,
-                        ty: output,
-                        custom_completion: None,
-                    }]),
+                    Pipeline::from_vec(vec![Expression::new(
+                        working_set,
+                        Expr::Call(call),
+                        call_span,
+                        output,
+                    )]),
                     vec![],
                 );
             }
@@ -2313,7 +2300,7 @@ pub fn parse_use(
                 "internal error: 'use' declaration not found".into(),
                 Span::concat(spans),
             ));
-            return (garbage_pipeline(spans), vec![]);
+            return (garbage_pipeline(working_set, spans), vec![]);
         }
     };
 
@@ -2330,7 +2317,7 @@ pub fn parse_use(
             "internal error: Import pattern positional is not import pattern".into(),
             import_pattern_expr.span,
         ));
-        return (garbage_pipeline(spans), vec![]);
+        return (garbage_pipeline(working_set, spans), vec![]);
     };
 
     let (mut import_pattern, module, module_id) = if let Some(module_id) = import_pattern.head.id {
@@ -2376,12 +2363,12 @@ pub fn parse_use(
             String::from_utf8_lossy(&import_pattern.head.name).to_string(),
         ));
         return (
-            Pipeline::from_vec(vec![Expression {
-                expr: Expr::Call(call),
-                span: call_span,
-                ty: Type::Any,
-                custom_completion: None,
-            }]),
+            Pipeline::from_vec(vec![Expression::new(
+                working_set,
+                Expr::Call(call),
+                call_span,
+                Type::Any,
+            )]),
             vec![],
         );
     };
@@ -2439,23 +2426,23 @@ pub fn parse_use(
     working_set.use_variables(constants);
 
     // Create a new Use command call to pass the import pattern as parser info
-    let import_pattern_expr = Expression {
-        expr: Expr::ImportPattern(Box::new(import_pattern)),
-        span: Span::concat(args_spans),
-        ty: Type::Any,
-        custom_completion: None,
-    };
+    let import_pattern_expr = Expression::new(
+        working_set,
+        Expr::ImportPattern(Box::new(import_pattern)),
+        Span::concat(args_spans),
+        Type::Any,
+    );
 
     let mut call = call;
     call.set_parser_info("import_pattern".to_string(), import_pattern_expr);
 
     (
-        Pipeline::from_vec(vec![Expression {
-            expr: Expr::Call(call),
-            span: Span::concat(spans),
-            ty: Type::Any,
-            custom_completion: None,
-        }]),
+        Pipeline::from_vec(vec![Expression::new(
+            working_set,
+            Expr::Call(call),
+            Span::concat(spans),
+            Type::Any,
+        )]),
         exportables,
     )
 }
@@ -2468,11 +2455,11 @@ pub fn parse_hide(working_set: &mut StateWorkingSet, lite_command: &LiteCommand)
             "internal error: Wrong call name for 'hide' command".into(),
             Span::concat(spans),
         ));
-        return garbage_pipeline(spans);
+        return garbage_pipeline(working_set, spans);
     }
     if let Some(redirection) = lite_command.redirection.as_ref() {
         working_set.error(redirecting_builtin_error("hide", redirection));
-        return garbage_pipeline(spans);
+        return garbage_pipeline(working_set, spans);
     }
 
     let (call, args_spans) = match working_set.find_decl(b"hide") {
@@ -2487,16 +2474,16 @@ pub fn parse_hide(working_set: &mut StateWorkingSet, lite_command: &LiteCommand)
             check_call(working_set, call_span, &decl.signature(), &call);
 
             let Ok(is_help) = has_flag_const(working_set, &call, "help") else {
-                return garbage_pipeline(spans);
+                return garbage_pipeline(working_set, spans);
             };
 
             if starting_error_count != working_set.parse_errors.len() || is_help {
-                return Pipeline::from_vec(vec![Expression {
-                    expr: Expr::Call(call),
-                    span: call_span,
-                    ty: output,
-                    custom_completion: None,
-                }]);
+                return Pipeline::from_vec(vec![Expression::new(
+                    working_set,
+                    Expr::Call(call),
+                    call_span,
+                    output,
+                )]);
             }
 
             (call, &spans[1..])
@@ -2506,7 +2493,7 @@ pub fn parse_hide(working_set: &mut StateWorkingSet, lite_command: &LiteCommand)
                 "internal error: 'hide' declaration not found".into(),
                 Span::concat(spans),
             ));
-            return garbage_pipeline(spans);
+            return garbage_pipeline(working_set, spans);
         }
     };
 
@@ -2523,7 +2510,7 @@ pub fn parse_hide(working_set: &mut StateWorkingSet, lite_command: &LiteCommand)
             "internal error: Import pattern positional is not import pattern".into(),
             import_pattern_expr.span,
         ));
-        return garbage_pipeline(spans);
+        return garbage_pipeline(working_set, spans);
     };
 
     let bytes = working_set.get_span_contents(spans[0]);
@@ -2554,7 +2541,7 @@ pub fn parse_hide(working_set: &mut StateWorkingSet, lite_command: &LiteCommand)
                     spans[1],
                     String::from_utf8_lossy(&import_pattern.head.name).to_string(),
                 ));
-                return garbage_pipeline(spans);
+                return garbage_pipeline(working_set, spans);
             };
 
         // This kind of inverts the import pattern matching found in parse_use()
@@ -2623,28 +2610,28 @@ pub fn parse_hide(working_set: &mut StateWorkingSet, lite_command: &LiteCommand)
         working_set.hide_decls(&decls_to_hide);
 
         // Create a new Use command call to pass the new import pattern
-        let import_pattern_expr = Expression {
-            expr: Expr::ImportPattern(Box::new(import_pattern)),
-            span: Span::concat(args_spans),
-            ty: Type::Any,
-            custom_completion: None,
-        };
+        let import_pattern_expr = Expression::new(
+            working_set,
+            Expr::ImportPattern(Box::new(import_pattern)),
+            Span::concat(args_spans),
+            Type::Any,
+        );
 
         let mut call = call;
         call.set_parser_info("import_pattern".to_string(), import_pattern_expr);
 
-        Pipeline::from_vec(vec![Expression {
-            expr: Expr::Call(call),
-            span: Span::concat(spans),
-            ty: Type::Any,
-            custom_completion: None,
-        }])
+        Pipeline::from_vec(vec![Expression::new(
+            working_set,
+            Expr::Call(call),
+            Span::concat(spans),
+            Type::Any,
+        )])
     } else {
         working_set.error(ParseError::UnknownState(
             "Expected structure: hide <name>".into(),
             Span::concat(spans),
         ));
-        garbage_pipeline(spans)
+        garbage_pipeline(working_set, spans)
     }
 }
 
@@ -2657,12 +2644,12 @@ pub fn parse_overlay_new(working_set: &mut StateWorkingSet, call: Box<Call>) ->
                 Ok(s) => (s, expr.span),
                 Err(err) => {
                     working_set.error(err.wrap(working_set, call_span));
-                    return garbage_pipeline(&[call_span]);
+                    return garbage_pipeline(working_set, &[call_span]);
                 }
             },
             Err(err) => {
                 working_set.error(err.wrap(working_set, call_span));
-                return garbage_pipeline(&[call_span]);
+                return garbage_pipeline(working_set, &[call_span]);
             }
         }
     } else {
@@ -2670,15 +2657,15 @@ pub fn parse_overlay_new(working_set: &mut StateWorkingSet, call: Box<Call>) ->
             "internal error: Missing required positional after call parsing".into(),
             call_span,
         ));
-        return garbage_pipeline(&[call_span]);
+        return garbage_pipeline(working_set, &[call_span]);
     };
 
-    let pipeline = Pipeline::from_vec(vec![Expression {
-        expr: Expr::Call(call),
-        span: call_span,
-        ty: Type::Any,
-        custom_completion: None,
-    }]);
+    let pipeline = Pipeline::from_vec(vec![Expression::new(
+        working_set,
+        Expr::Call(call),
+        call_span,
+        Type::Any,
+    )]);
 
     let module_id = working_set.add_module(
         &overlay_name,
@@ -2706,12 +2693,12 @@ pub fn parse_overlay_use(working_set: &mut StateWorkingSet, call: Box<Call>) ->
                 Ok(s) => (s, expr.span),
                 Err(err) => {
                     working_set.error(err.wrap(working_set, call_span));
-                    return garbage_pipeline(&[call_span]);
+                    return garbage_pipeline(working_set, &[call_span]);
                 }
             },
             Err(err) => {
                 working_set.error(err.wrap(working_set, call_span));
-                return garbage_pipeline(&[call_span]);
+                return garbage_pipeline(working_set, &[call_span]);
             }
         }
     } else {
@@ -2719,7 +2706,7 @@ pub fn parse_overlay_use(working_set: &mut StateWorkingSet, call: Box<Call>) ->
             "internal error: Missing required positional after call parsing".into(),
             call_span,
         ));
-        return garbage_pipeline(&[call_span]);
+        return garbage_pipeline(working_set, &[call_span]);
     };
 
     let new_name = if let Some(kw_expression) = call.positional_nth(1) {
@@ -2732,12 +2719,12 @@ pub fn parse_overlay_use(working_set: &mut StateWorkingSet, call: Box<Call>) ->
                     }),
                     Err(err) => {
                         working_set.error(err.wrap(working_set, call_span));
-                        return garbage_pipeline(&[call_span]);
+                        return garbage_pipeline(working_set, &[call_span]);
                     }
                 },
                 Err(err) => {
                     working_set.error(err.wrap(working_set, call_span));
-                    return garbage_pipeline(&[call_span]);
+                    return garbage_pipeline(working_set, &[call_span]);
                 }
             }
         } else {
@@ -2745,25 +2732,25 @@ pub fn parse_overlay_use(working_set: &mut StateWorkingSet, call: Box<Call>) ->
                 "as keyword".to_string(),
                 kw_expression.span,
             ));
-            return garbage_pipeline(&[call_span]);
+            return garbage_pipeline(working_set, &[call_span]);
         }
     } else {
         None
     };
 
     let Ok(has_prefix) = has_flag_const(working_set, &call, "prefix") else {
-        return garbage_pipeline(&[call_span]);
+        return garbage_pipeline(working_set, &[call_span]);
     };
     let Ok(do_reload) = has_flag_const(working_set, &call, "reload") else {
-        return garbage_pipeline(&[call_span]);
+        return garbage_pipeline(working_set, &[call_span]);
     };
 
-    let pipeline = Pipeline::from_vec(vec![Expression {
-        expr: Expr::Call(call.clone()),
-        span: call_span,
-        ty: Type::Any,
-        custom_completion: None,
-    }]);
+    let pipeline = Pipeline::from_vec(vec![Expression::new(
+        working_set,
+        Expr::Call(call.clone()),
+        call_span,
+        Type::Any,
+    )]);
 
     let (final_overlay_name, origin_module, origin_module_id, is_module_updated) =
         if let Some(overlay_frame) = working_set.find_overlay(overlay_name.as_bytes()) {
@@ -2898,24 +2885,24 @@ pub fn parse_overlay_use(working_set: &mut StateWorkingSet, call: Box<Call>) ->
     let mut call = call;
     call.set_parser_info(
         "overlay_expr".to_string(),
-        Expression {
-            expr: Expr::Overlay(if is_module_updated {
+        Expression::new(
+            working_set,
+            Expr::Overlay(if is_module_updated {
                 Some(origin_module_id)
             } else {
                 None
             }),
-            span: overlay_name_span,
-            ty: Type::Any,
-            custom_completion: None,
-        },
+            overlay_name_span,
+            Type::Any,
+        ),
     );
 
-    Pipeline::from_vec(vec![Expression {
-        expr: Expr::Call(call),
-        span: call_span,
-        ty: Type::Any,
-        custom_completion: None,
-    }])
+    Pipeline::from_vec(vec![Expression::new(
+        working_set,
+        Expr::Call(call),
+        call_span,
+        Type::Any,
+    )])
 }
 
 pub fn parse_overlay_hide(working_set: &mut StateWorkingSet, call: Box<Call>) -> Pipeline {
@@ -2927,12 +2914,12 @@ pub fn parse_overlay_hide(working_set: &mut StateWorkingSet, call: Box<Call>) ->
                 Ok(s) => (s, expr.span),
                 Err(err) => {
                     working_set.error(err.wrap(working_set, call_span));
-                    return garbage_pipeline(&[call_span]);
+                    return garbage_pipeline(working_set, &[call_span]);
                 }
             },
             Err(err) => {
                 working_set.error(err.wrap(working_set, call_span));
-                return garbage_pipeline(&[call_span]);
+                return garbage_pipeline(working_set, &[call_span]);
             }
         }
     } else {
@@ -2943,15 +2930,15 @@ pub fn parse_overlay_hide(working_set: &mut StateWorkingSet, call: Box<Call>) ->
     };
 
     let Ok(keep_custom) = has_flag_const(working_set, &call, "keep-custom") else {
-        return garbage_pipeline(&[call_span]);
+        return garbage_pipeline(working_set, &[call_span]);
     };
 
-    let pipeline = Pipeline::from_vec(vec![Expression {
-        expr: Expr::Call(call),
-        span: call_span,
-        ty: Type::Any,
-        custom_completion: None,
-    }]);
+    let pipeline = Pipeline::from_vec(vec![Expression::new(
+        working_set,
+        Expr::Call(call),
+        call_span,
+        Type::Any,
+    )]);
 
     if overlay_name == DEFAULT_OVERLAY_NAME {
         working_set.error(ParseError::CantHideDefaultOverlay(
@@ -3016,12 +3003,12 @@ pub fn parse_let(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipeline
 
                     let block_id = working_set.add_block(Arc::new(rvalue_block));
 
-                    let rvalue = Expression {
-                        expr: Expr::Block(block_id),
-                        span: rvalue_span,
-                        ty: output_type,
-                        custom_completion: None,
-                    };
+                    let rvalue = Expression::new(
+                        working_set,
+                        Expr::Block(block_id),
+                        rvalue_span,
+                        output_type,
+                    );
 
                     let mut idx = 0;
                     let (lvalue, explicit_type) =
@@ -3066,24 +3053,24 @@ pub fn parse_let(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipeline
                         parser_info: HashMap::new(),
                     });
 
-                    return Pipeline::from_vec(vec![Expression {
-                        expr: Expr::Call(call),
-                        span: Span::concat(spans),
-                        ty: Type::Any,
-                        custom_completion: None,
-                    }]);
+                    return Pipeline::from_vec(vec![Expression::new(
+                        working_set,
+                        Expr::Call(call),
+                        Span::concat(spans),
+                        Type::Any,
+                    )]);
                 }
             }
         }
         let ParsedInternalCall { call, output } =
             parse_internal_call(working_set, spans[0], &spans[1..], decl_id);
 
-        return Pipeline::from_vec(vec![Expression {
-            expr: Expr::Call(call),
-            span: Span::concat(spans),
-            ty: output,
-            custom_completion: None,
-        }]);
+        return Pipeline::from_vec(vec![Expression::new(
+            working_set,
+            Expr::Call(call),
+            Span::concat(spans),
+            output,
+        )]);
     } else {
         working_set.error(ParseError::UnknownState(
             "internal error: let or const statements not found in core language".into(),
@@ -3096,7 +3083,7 @@ pub fn parse_let(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipeline
         Span::concat(spans),
     ));
 
-    garbage_pipeline(spans)
+    garbage_pipeline(working_set, spans)
 }
 
 pub fn parse_const(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipeline {
@@ -3104,7 +3091,7 @@ pub fn parse_const(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipelin
 
     // JT: Disabling check_name because it doesn't work with optional types in the declaration
     // if let Some(span) = check_name(working_set, spans) {
-    //     return Pipeline::from_vec(vec![garbage(*span)]);
+    //     return Pipeline::from_vec(vec![garbage(working_set, *span)]);
     // }
 
     if let Some(decl_id) = working_set.find_decl(b"const") {
@@ -3212,24 +3199,24 @@ pub fn parse_const(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipelin
                         parser_info: HashMap::new(),
                     });
 
-                    return Pipeline::from_vec(vec![Expression {
-                        expr: Expr::Call(call),
-                        span: Span::concat(spans),
-                        ty: Type::Any,
-                        custom_completion: None,
-                    }]);
+                    return Pipeline::from_vec(vec![Expression::new(
+                        working_set,
+                        Expr::Call(call),
+                        Span::concat(spans),
+                        Type::Any,
+                    )]);
                 }
             }
         }
         let ParsedInternalCall { call, output } =
             parse_internal_call(working_set, spans[0], &spans[1..], decl_id);
 
-        return Pipeline::from_vec(vec![Expression {
-            expr: Expr::Call(call),
-            span: Span::concat(spans),
-            ty: output,
-            custom_completion: None,
-        }]);
+        return Pipeline::from_vec(vec![Expression::new(
+            working_set,
+            Expr::Call(call),
+            Span::concat(spans),
+            output,
+        )]);
     } else {
         working_set.error(ParseError::UnknownState(
             "internal error: let or const statements not found in core language".into(),
@@ -3242,7 +3229,7 @@ pub fn parse_const(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipelin
         Span::concat(spans),
     ));
 
-    garbage_pipeline(spans)
+    garbage_pipeline(working_set, spans)
 }
 
 pub fn parse_mut(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipeline {
@@ -3250,7 +3237,7 @@ pub fn parse_mut(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipeline
 
     // JT: Disabling check_name because it doesn't work with optional types in the declaration
     // if let Some(span) = check_name(working_set, spans) {
-    //     return Pipeline::from_vec(vec![garbage(*span)]);
+    //     return Pipeline::from_vec(vec![garbage(working_set, *span)]);
     // }
 
     if let Some(decl_id) = working_set.find_decl(b"mut") {
@@ -3280,12 +3267,12 @@ pub fn parse_mut(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipeline
 
                     let block_id = working_set.add_block(Arc::new(rvalue_block));
 
-                    let rvalue = Expression {
-                        expr: Expr::Block(block_id),
-                        span: rvalue_span,
-                        ty: output_type,
-                        custom_completion: None,
-                    };
+                    let rvalue = Expression::new(
+                        working_set,
+                        Expr::Block(block_id),
+                        rvalue_span,
+                        output_type,
+                    );
 
                     let mut idx = 0;
 
@@ -3331,24 +3318,24 @@ pub fn parse_mut(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipeline
                         parser_info: HashMap::new(),
                     });
 
-                    return Pipeline::from_vec(vec![Expression {
-                        expr: Expr::Call(call),
-                        span: Span::concat(spans),
-                        ty: Type::Any,
-                        custom_completion: None,
-                    }]);
+                    return Pipeline::from_vec(vec![Expression::new(
+                        working_set,
+                        Expr::Call(call),
+                        Span::concat(spans),
+                        Type::Any,
+                    )]);
                 }
             }
         }
         let ParsedInternalCall { call, output } =
             parse_internal_call(working_set, spans[0], &spans[1..], decl_id);
 
-        return Pipeline::from_vec(vec![Expression {
-            expr: Expr::Call(call),
-            span: Span::concat(spans),
-            ty: output,
-            custom_completion: None,
-        }]);
+        return Pipeline::from_vec(vec![Expression::new(
+            working_set,
+            Expr::Call(call),
+            Span::concat(spans),
+            output,
+        )]);
     } else {
         working_set.error(ParseError::UnknownState(
             "internal error: let or const statements not found in core language".into(),
@@ -3361,7 +3348,7 @@ pub fn parse_mut(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipeline
         Span::concat(spans),
     ));
 
-    garbage_pipeline(spans)
+    garbage_pipeline(working_set, spans)
 }
 
 pub fn parse_source(working_set: &mut StateWorkingSet, lite_command: &LiteCommand) -> Pipeline {
@@ -3377,7 +3364,7 @@ pub fn parse_source(working_set: &mut StateWorkingSet, lite_command: &LiteComman
                 "source-env"
             };
             working_set.error(redirecting_builtin_error(name, redirection));
-            return garbage_pipeline(spans);
+            return garbage_pipeline(working_set, spans);
         }
 
         let scoped = name == b"source-env";
@@ -3392,16 +3379,16 @@ pub fn parse_source(working_set: &mut StateWorkingSet, lite_command: &LiteComman
                 parse_internal_call(working_set, spans[0], &spans[1..], decl_id);
 
             let Ok(is_help) = has_flag_const(working_set, &call, "help") else {
-                return garbage_pipeline(spans);
+                return garbage_pipeline(working_set, spans);
             };
 
             if is_help {
-                return Pipeline::from_vec(vec![Expression {
-                    expr: Expr::Call(call),
-                    span: Span::concat(spans),
-                    ty: output,
-                    custom_completion: None,
-                }]);
+                return Pipeline::from_vec(vec![Expression::new(
+                    working_set,
+                    Expr::Call(call),
+                    Span::concat(spans),
+                    output,
+                )]);
             }
 
             // Command and one file name
@@ -3412,12 +3399,12 @@ pub fn parse_source(working_set: &mut StateWorkingSet, lite_command: &LiteComman
                     Ok(val) => val,
                     Err(err) => {
                         working_set.error(err.wrap(working_set, Span::concat(&spans[1..])));
-                        return Pipeline::from_vec(vec![Expression {
-                            expr: Expr::Call(call),
-                            span: Span::concat(&spans[1..]),
-                            ty: Type::Any,
-                            custom_completion: None,
-                        }]);
+                        return Pipeline::from_vec(vec![Expression::new(
+                            working_set,
+                            Expr::Call(call),
+                            Span::concat(&spans[1..]),
+                            Type::Any,
+                        )]);
                     }
                 };
 
@@ -3425,12 +3412,12 @@ pub fn parse_source(working_set: &mut StateWorkingSet, lite_command: &LiteComman
                     Ok(s) => s,
                     Err(err) => {
                         working_set.error(err.wrap(working_set, Span::concat(&spans[1..])));
-                        return Pipeline::from_vec(vec![Expression {
-                            expr: Expr::Call(call),
-                            span: Span::concat(&spans[1..]),
-                            ty: Type::Any,
-                            custom_completion: None,
-                        }]);
+                        return Pipeline::from_vec(vec![Expression::new(
+                            working_set,
+                            Expr::Call(call),
+                            Span::concat(&spans[1..]),
+                            Type::Any,
+                        )]);
                     }
                 };
 
@@ -3439,7 +3426,7 @@ pub fn parse_source(working_set: &mut StateWorkingSet, lite_command: &LiteComman
                         // Add the file to the stack of files being processed.
                         if let Err(e) = working_set.files.push(path.clone().path_buf(), spans[1]) {
                             working_set.error(e);
-                            return garbage_pipeline(spans);
+                            return garbage_pipeline(working_set, spans);
                         }
 
                         // This will load the defs from the file into the
@@ -3463,38 +3450,38 @@ pub fn parse_source(working_set: &mut StateWorkingSet, lite_command: &LiteComman
                         // after writing `source example.nu`
                         call_with_block.set_parser_info(
                             "block_id".to_string(),
-                            Expression {
-                                expr: Expr::Int(block_id as i64),
-                                span: spans[1],
-                                ty: Type::Any,
-                                custom_completion: None,
-                            },
+                            Expression::new(
+                                working_set,
+                                Expr::Int(block_id as i64),
+                                spans[1],
+                                Type::Any,
+                            ),
                         );
 
-                        return Pipeline::from_vec(vec![Expression {
-                            expr: Expr::Call(call_with_block),
-                            span: Span::concat(spans),
-                            ty: Type::Any,
-                            custom_completion: None,
-                        }]);
+                        return Pipeline::from_vec(vec![Expression::new(
+                            working_set,
+                            Expr::Call(call_with_block),
+                            Span::concat(spans),
+                            Type::Any,
+                        )]);
                     }
                 } else {
                     working_set.error(ParseError::SourcedFileNotFound(filename, spans[1]));
                 }
             }
-            return Pipeline::from_vec(vec![Expression {
-                expr: Expr::Call(call),
-                span: Span::concat(spans),
-                ty: Type::Any,
-                custom_completion: None,
-            }]);
+            return Pipeline::from_vec(vec![Expression::new(
+                working_set,
+                Expr::Call(call),
+                Span::concat(spans),
+                Type::Any,
+            )]);
         }
     }
     working_set.error(ParseError::UnknownState(
         "internal error: source statement unparsable".into(),
         Span::concat(spans),
     ));
-    garbage_pipeline(spans)
+    garbage_pipeline(working_set, spans)
 }
 
 pub fn parse_where_expr(working_set: &mut StateWorkingSet, spans: &[Span]) -> Expression {
@@ -3505,7 +3492,7 @@ pub fn parse_where_expr(working_set: &mut StateWorkingSet, spans: &[Span]) -> Ex
             "internal error: Wrong call name for 'where' command".into(),
             Span::concat(spans),
         ));
-        return garbage(Span::concat(spans));
+        return garbage(working_set, Span::concat(spans));
     }
 
     if spans.len() < 2 {
@@ -3514,7 +3501,7 @@ pub fn parse_where_expr(working_set: &mut StateWorkingSet, spans: &[Span]) -> Ex
             Span::concat(spans),
             "where <row_condition>".into(),
         ));
-        return garbage(Span::concat(spans));
+        return garbage(working_set, Span::concat(spans));
     }
 
     let call = match working_set.find_decl(b"where") {
@@ -3529,16 +3516,11 @@ pub fn parse_where_expr(working_set: &mut StateWorkingSet, spans: &[Span]) -> Ex
             check_call(working_set, call_span, &decl.signature(), &call);
 
             let Ok(is_help) = has_flag_const(working_set, &call, "help") else {
-                return garbage(Span::concat(spans));
+                return garbage(working_set, Span::concat(spans));
             };
 
             if starting_error_count != working_set.parse_errors.len() || is_help {
-                return Expression {
-                    expr: Expr::Call(call),
-                    span: call_span,
-                    ty: output,
-                    custom_completion: None,
-                };
+                return Expression::new(working_set, Expr::Call(call), call_span, output);
             }
 
             call
@@ -3548,16 +3530,16 @@ pub fn parse_where_expr(working_set: &mut StateWorkingSet, spans: &[Span]) -> Ex
                 "internal error: 'where' declaration not found".into(),
                 Span::concat(spans),
             ));
-            return garbage(Span::concat(spans));
+            return garbage(working_set, Span::concat(spans));
         }
     };
 
-    Expression {
-        expr: Expr::Call(call),
-        span: Span::concat(spans),
-        ty: Type::Any,
-        custom_completion: None,
-    }
+    Expression::new(
+        working_set,
+        Expr::Call(call),
+        Span::concat(spans),
+        Type::Any,
+    )
 }
 
 pub fn parse_where(working_set: &mut StateWorkingSet, lite_command: &LiteCommand) -> Pipeline {
@@ -3599,11 +3581,11 @@ pub fn parse_register(working_set: &mut StateWorkingSet, lite_command: &LiteComm
             "internal error: Wrong call name for 'register' function".into(),
             Span::concat(spans),
         ));
-        return garbage_pipeline(spans);
+        return garbage_pipeline(working_set, spans);
     }
     if let Some(redirection) = lite_command.redirection.as_ref() {
         working_set.error(redirecting_builtin_error("register", redirection));
-        return garbage_pipeline(spans);
+        return garbage_pipeline(working_set, spans);
     }
 
     // Parsing the spans and checking that they match the register signature
@@ -3615,7 +3597,7 @@ pub fn parse_register(working_set: &mut StateWorkingSet, lite_command: &LiteComm
                 "internal error: Register declaration not found".into(),
                 Span::concat(spans),
             ));
-            return garbage_pipeline(spans);
+            return garbage_pipeline(working_set, spans);
         }
         Some(decl_id) => {
             let ParsedInternalCall { call, output } =
@@ -3628,16 +3610,16 @@ pub fn parse_register(working_set: &mut StateWorkingSet, lite_command: &LiteComm
             check_call(working_set, call_span, &decl.signature(), &call);
 
             let Ok(is_help) = has_flag_const(working_set, &call, "help") else {
-                return garbage_pipeline(spans);
+                return garbage_pipeline(working_set, spans);
             };
 
             if starting_error_count != working_set.parse_errors.len() || is_help {
-                return Pipeline::from_vec(vec![Expression {
-                    expr: Expr::Call(call),
-                    span: call_span,
-                    ty: output,
-                    custom_completion: None,
-                }]);
+                return Pipeline::from_vec(vec![Expression::new(
+                    working_set,
+                    Expr::Call(call),
+                    call_span,
+                    output,
+                )]);
             }
 
             (call, call_span)
@@ -3718,12 +3700,12 @@ pub fn parse_register(working_set: &mut StateWorkingSet, lite_command: &LiteComm
             Ok(path) => Some(path),
             Err(err) => {
                 working_set.error(err);
-                return Pipeline::from_vec(vec![Expression {
-                    expr: Expr::Call(call),
-                    span: call_span,
-                    ty: Type::Any,
-                    custom_completion: None,
-                }]);
+                return Pipeline::from_vec(vec![Expression::new(
+                    working_set,
+                    Expr::Call(call),
+                    call_span,
+                    Type::Any,
+                )]);
             }
         },
     };
@@ -3799,12 +3781,12 @@ pub fn parse_register(working_set: &mut StateWorkingSet, lite_command: &LiteComm
         working_set.error(err);
     }
 
-    Pipeline::from_vec(vec![Expression {
-        expr: Expr::Call(call),
-        span: call_span,
-        ty: Type::Nothing,
-        custom_completion: None,
-    }])
+    Pipeline::from_vec(vec![Expression::new(
+        working_set,
+        Expr::Call(call),
+        call_span,
+        Type::Nothing,
+    )])
 }
 
 #[cfg(feature = "plugin")]
@@ -3905,12 +3887,12 @@ pub fn parse_plugin_use(working_set: &mut StateWorkingSet, call: Box<Call>) -> P
 
     let call_span = call.span();
 
-    Pipeline::from_vec(vec![Expression {
-        expr: Expr::Call(call),
-        span: call_span,
-        ty: Type::Nothing,
-        custom_completion: None,
-    }])
+    Pipeline::from_vec(vec![Expression::new(
+        working_set,
+        Expr::Call(call),
+        call_span,
+        Type::Nothing,
+    )])
 }
 
 pub fn find_dirs_var(working_set: &StateWorkingSet, var_name: &str) -> Option<VarId> {
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 830d8b81e0..149bce8958 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -23,12 +23,12 @@ use std::{
     sync::Arc,
 };
 
-pub fn garbage(span: Span) -> Expression {
-    Expression::garbage(span)
+pub fn garbage(working_set: &mut StateWorkingSet, span: Span) -> Expression {
+    Expression::garbage(working_set, span)
 }
 
-pub fn garbage_pipeline(spans: &[Span]) -> Pipeline {
-    Pipeline::from_vec(vec![garbage(Span::concat(spans))])
+pub fn garbage_pipeline(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipeline {
+    Pipeline::from_vec(vec![garbage(working_set, Span::concat(spans))])
 }
 
 fn is_identifier_byte(b: u8) -> bool {
@@ -247,12 +247,12 @@ fn parse_external_arg(working_set: &mut StateWorkingSet, span: Span) -> External
             working_set.error(err);
         }
 
-        ExternalArgument::Regular(Expression {
-            expr: Expr::String(contents),
+        ExternalArgument::Regular(Expression::new(
+            working_set,
+            Expr::String(contents),
             span,
-            ty: Type::String,
-            custom_completion: None,
-        })
+            Type::String,
+        ))
     }
 }
 
@@ -280,12 +280,12 @@ pub fn parse_external_call(working_set: &mut StateWorkingSet, spans: &[Span]) ->
             working_set.error(err)
         }
 
-        Box::new(Expression {
-            expr: Expr::String(contents),
-            span: head_span,
-            ty: Type::String,
-            custom_completion: None,
-        })
+        Box::new(Expression::new(
+            working_set,
+            Expr::String(contents),
+            head_span,
+            Type::String,
+        ))
     };
 
     let args = spans[1..]
@@ -293,12 +293,12 @@ pub fn parse_external_call(working_set: &mut StateWorkingSet, spans: &[Span]) ->
         .map(|&span| parse_external_arg(working_set, span))
         .collect();
 
-    Expression {
-        expr: Expr::ExternalCall(head, args),
-        span: Span::concat(spans),
-        ty: Type::Any,
-        custom_completion: None,
-    }
+    Expression::new(
+        working_set,
+        Expr::ExternalCall(head, args),
+        Span::concat(spans),
+        Type::Any,
+    )
 }
 
 fn ensure_flag_arg_type(
@@ -319,7 +319,7 @@ fn ensure_flag_arg_type(
                 item: arg_name,
                 span: long_name_span,
             },
-            Expression::garbage(arg.span),
+            Expression::garbage(working_set, arg.span),
         )
     } else {
         (
@@ -650,7 +650,7 @@ pub fn parse_multispan_value(
                 ));
             }
 
-            Expression::garbage(span)
+            Expression::garbage(working_set, span)
         }
         SyntaxShape::Expression => {
             trace!("parsing: expression");
@@ -701,14 +701,14 @@ pub fn parse_multispan_value(
                 let keyword = Keyword {
                     keyword: keyword.as_slice().into(),
                     span: spans[*spans_idx - 1],
-                    expr: Expression::garbage(arg_span),
-                };
-                return Expression {
-                    expr: Expr::Keyword(Box::new(keyword)),
-                    span: arg_span,
-                    ty: Type::Any,
-                    custom_completion: None,
+                    expr: Expression::garbage(working_set, arg_span),
                 };
+                return Expression::new(
+                    working_set,
+                    Expr::Keyword(Box::new(keyword)),
+                    arg_span,
+                    Type::Any,
+                );
             }
 
             let keyword = Keyword {
@@ -717,12 +717,12 @@ pub fn parse_multispan_value(
                 expr: parse_multispan_value(working_set, spans, spans_idx, arg),
             };
 
-            Expression {
-                ty: keyword.expr.ty.clone(),
-                expr: Expr::Keyword(Box::new(keyword)),
-                span: arg_span,
-                custom_completion: None,
-            }
+            Expression::new(
+                working_set,
+                Expr::Keyword(Box::new(keyword.clone())),
+                arg_span,
+                keyword.expr.ty,
+            )
         }
         _ => {
             // All other cases are single-span values
@@ -738,25 +738,6 @@ pub struct ParsedInternalCall {
     pub output: Type,
 }
 
-fn attach_parser_info_builtin(working_set: &StateWorkingSet, name: &str, call: &mut Call) {
-    match name {
-        "use" | "overlay use" | "source-env" | "nu-check" => {
-            if let Some(var_id) = find_dirs_var(working_set, LIB_DIRS_VAR) {
-                call.set_parser_info(
-                    DIR_VAR_PARSER_INFO.to_owned(),
-                    Expression {
-                        expr: Expr::Var(var_id),
-                        span: call.head,
-                        ty: Type::Any,
-                        custom_completion: None,
-                    },
-                );
-            }
-        }
-        _ => {}
-    }
-}
-
 pub fn parse_internal_call(
     working_set: &mut StateWorkingSet,
     command_span: Span,
@@ -768,14 +749,23 @@ pub fn parse_internal_call(
     let mut call = Call::new(command_span);
     call.decl_id = decl_id;
     call.head = command_span;
+    let _ = working_set.add_span(call.head);
 
     let decl = working_set.get_decl(decl_id);
     let signature = decl.signature();
     let output = signature.get_output_type();
 
-    if decl.is_builtin() {
-        attach_parser_info_builtin(working_set, decl.name(), &mut call);
-    }
+    // storing the var ID for later due to borrowing issues
+    let lib_dirs_var_id = if decl.is_builtin() {
+        match decl.name() {
+            "use" | "overlay use" | "source-env" | "nu-check" => {
+                find_dirs_var(working_set, LIB_DIRS_VAR)
+            }
+            _ => None,
+        }
+    } else {
+        None
+    };
 
     // The index into the positional parameter in the definition
     let mut positional_idx = 0;
@@ -807,6 +797,13 @@ pub fn parse_internal_call(
         }
     }
 
+    if let Some(var_id) = lib_dirs_var_id {
+        call.set_parser_info(
+            DIR_VAR_PARSER_INFO.to_owned(),
+            Expression::new(working_set, Expr::Var(var_id), call.head, Type::Any),
+        );
+    }
+
     if signature.creates_scope {
         working_set.enter_scope();
     }
@@ -873,6 +870,8 @@ pub fn parse_internal_call(
                 call.add_unknown(arg);
             } else {
                 for flag in short_flags {
+                    let _ = working_set.add_span(spans[spans_idx]);
+
                     if let Some(arg_shape) = flag.arg {
                         if let Some(arg) = spans.get(spans_idx + 1) {
                             let arg = parse_value(working_set, *arg, &arg_shape);
@@ -951,14 +950,14 @@ pub fn parse_internal_call(
                         signature.call_signature(),
                         arg_span,
                     ));
-                    call.add_positional(Expression::garbage(arg_span));
+                    call.add_positional(Expression::garbage(working_set, arg_span));
                 } else if positional_idx < signature.required_positional.len() {
                     working_set.error(ParseError::MissingPositional(
                         signature.required_positional[positional_idx].name.clone(),
                         Span::new(spans[spans_idx].start, spans[spans_idx].start),
                         signature.call_signature(),
                     ));
-                    call.add_positional(Expression::garbage(arg_span));
+                    call.add_positional(Expression::garbage(working_set, arg_span));
                 } else {
                     let rest_shape = match &signature.rest_positional {
                         Some(arg) => arg.shape.clone(),
@@ -1015,7 +1014,7 @@ pub fn parse_internal_call(
                     arg.ty,
                     arg.span,
                 ));
-                Expression::garbage(arg.span)
+                Expression::garbage(working_set, arg.span)
             } else {
                 arg
             };
@@ -1026,7 +1025,7 @@ pub fn parse_internal_call(
 
             call.add_unknown(arg);
         } else {
-            call.add_positional(Expression::garbage(arg_span));
+            call.add_positional(Expression::garbage(working_set, arg_span));
             working_set.error(ParseError::ExtraPositional(
                 signature.call_signature(),
                 arg_span,
@@ -1056,7 +1055,7 @@ pub fn parse_call(working_set: &mut StateWorkingSet, spans: &[Span], head: Span)
             "Encountered command with zero spans".into(),
             Span::concat(spans),
         ));
-        return garbage(head);
+        return garbage(working_set, head);
     }
 
     let mut pos = 0;
@@ -1118,7 +1117,7 @@ pub fn parse_call(working_set: &mut StateWorkingSet, spans: &[Span], head: Span)
                     "Incomplete statement".into(),
                     Span::concat(spans),
                 ));
-                return garbage(Span::concat(spans));
+                return garbage(working_set, Span::concat(spans));
             }
         }
 
@@ -1129,6 +1128,7 @@ pub fn parse_call(working_set: &mut StateWorkingSet, spans: &[Span], head: Span)
             if let Expression {
                 expr: Expr::ExternalCall(head, args),
                 span: _,
+                span_id: _,
                 ty,
                 custom_completion,
             } = &alias.clone().wrapped_call
@@ -1144,12 +1144,15 @@ pub fn parse_call(working_set: &mut StateWorkingSet, spans: &[Span], head: Span)
                     final_args.push(arg);
                 }
 
-                return Expression {
-                    expr: Expr::ExternalCall(head, final_args.into()),
-                    span: Span::concat(spans),
-                    ty: ty.clone(),
-                    custom_completion: *custom_completion,
-                };
+                let mut expression = Expression::new(
+                    working_set,
+                    Expr::ExternalCall(head, final_args.into()),
+                    Span::concat(spans),
+                    ty.clone(),
+                );
+
+                expression.custom_completion = *custom_completion;
+                return expression;
             } else {
                 trace!("parsing: alias of internal call");
                 parse_internal_call(
@@ -1169,12 +1172,12 @@ pub fn parse_call(working_set: &mut StateWorkingSet, spans: &[Span], head: Span)
             )
         };
 
-        Expression {
-            expr: Expr::Call(parsed_call.call),
-            span: Span::concat(spans),
-            ty: parsed_call.output,
-            custom_completion: None,
-        }
+        Expression::new(
+            working_set,
+            Expr::Call(parsed_call.call),
+            Span::concat(spans),
+            parsed_call.output,
+        )
     } else {
         // We might be parsing left-unbounded range ("..10")
         let bytes = working_set.get_span_contents(spans[0]);
@@ -1208,7 +1211,7 @@ pub fn parse_binary(working_set: &mut StateWorkingSet, span: Span) -> Expression
         parse_binary_with_base(working_set, span, 2, 8, b"0b[", b"]")
     } else {
         working_set.error(ParseError::Expected("binary", span));
-        garbage(span)
+        garbage(working_set, span)
     }
 }
 
@@ -1254,7 +1257,7 @@ fn parse_binary_with_base(
                     | TokenContents::OutErrGreaterThan
                     | TokenContents::OutErrGreaterGreaterThan => {
                         working_set.error(ParseError::Expected("binary", span));
-                        return garbage(span);
+                        return garbage(working_set, span);
                     }
                     TokenContents::Comment | TokenContents::Semicolon | TokenContents::Eol => {}
                 }
@@ -1275,28 +1278,21 @@ fn parse_binary_with_base(
             let str = String::from_utf8_lossy(&binary_value).to_string();
 
             match decode_with_base(&str, base, min_digits_per_byte) {
-                Ok(v) => {
-                    return Expression {
-                        expr: Expr::Binary(v),
-                        span,
-                        ty: Type::Binary,
-                        custom_completion: None,
-                    }
-                }
+                Ok(v) => return Expression::new(working_set, Expr::Binary(v), span, Type::Binary),
                 Err(x) => {
                     working_set.error(ParseError::IncorrectValue(
                         "not a binary value".into(),
                         span,
                         x.to_string(),
                     ));
-                    return garbage(span);
+                    return garbage(working_set, span);
                 }
             }
         }
     }
 
     working_set.error(ParseError::Expected("binary", span));
-    garbage(span)
+    garbage(working_set, span)
 }
 
 fn decode_with_base(s: &str, base: u32, digits_per_byte: usize) -> Result<Vec<u8>, ParseIntError> {
@@ -1327,12 +1323,7 @@ pub fn parse_int(working_set: &mut StateWorkingSet, span: Span) -> Expression {
         radix: u32,
     ) -> Expression {
         if let Ok(num) = i64::from_str_radix(token, radix) {
-            Expression {
-                expr: Expr::Int(num),
-                span,
-                ty: Type::Int,
-                custom_completion: None,
-            }
+            Expression::new(working_set, Expr::Int(num), span, Type::Int)
         } else {
             working_set.error(ParseError::InvalidLiteral(
                 format!("invalid digits for radix {}", radix),
@@ -1340,7 +1331,7 @@ pub fn parse_int(working_set: &mut StateWorkingSet, span: Span) -> Expression {
                 span,
             ));
 
-            garbage(span)
+            garbage(working_set, span)
         }
     }
 
@@ -1348,7 +1339,7 @@ pub fn parse_int(working_set: &mut StateWorkingSet, span: Span) -> Expression {
 
     if token.is_empty() {
         working_set.error(ParseError::Expected("int", span));
-        return garbage(span);
+        return garbage(working_set, span);
     }
 
     if let Some(num) = token.strip_prefix("0b") {
@@ -1358,15 +1349,10 @@ pub fn parse_int(working_set: &mut StateWorkingSet, span: Span) -> Expression {
     } else if let Some(num) = token.strip_prefix("0x") {
         extract_int(working_set, num, span, 16)
     } else if let Ok(num) = token.parse::<i64>() {
-        Expression {
-            expr: Expr::Int(num),
-            span,
-            ty: Type::Int,
-            custom_completion: None,
-        }
+        Expression::new(working_set, Expr::Int(num), span, Type::Int)
     } else {
         working_set.error(ParseError::Expected("int", span));
-        garbage(span)
+        garbage(working_set, span)
     }
 }
 
@@ -1375,16 +1361,11 @@ pub fn parse_float(working_set: &mut StateWorkingSet, span: Span) -> Expression
     let token = strip_underscores(token);
 
     if let Ok(x) = token.parse::<f64>() {
-        Expression {
-            expr: Expr::Float(x),
-            span,
-            ty: Type::Float,
-            custom_completion: None,
-        }
+        Expression::new(working_set, Expr::Float(x), span, Type::Float)
     } else {
         working_set.error(ParseError::Expected("float", span));
 
-        garbage(span)
+        garbage(working_set, span)
     }
 }
 
@@ -1410,7 +1391,7 @@ pub fn parse_number(working_set: &mut StateWorkingSet, span: Span) -> Expression
     working_set.parse_errors.truncate(starting_error_count);
 
     working_set.error(ParseError::Expected("number", span));
-    garbage(span)
+    garbage(working_set, span)
 }
 
 pub fn parse_range(working_set: &mut StateWorkingSet, span: Span) -> Expression {
@@ -1429,12 +1410,12 @@ pub fn parse_range(working_set: &mut StateWorkingSet, span: Span) -> Expression
         s
     } else {
         working_set.error(ParseError::NonUtf8(span));
-        return garbage(span);
+        return garbage(working_set, span);
     };
 
     if !token.contains("..") {
         working_set.error(ParseError::Expected("at least one range bound set", span));
-        return garbage(span);
+        return garbage(working_set, span);
     }
 
     // First, figure out what exact operators are used and determine their positions
@@ -1448,7 +1429,7 @@ pub fn parse_range(working_set: &mut StateWorkingSet, span: Span) -> Expression
                 "one range operator ('..' or '..<') and optionally one next operator ('..')",
                 span,
             ));
-            return garbage(span);
+            return garbage(working_set, span);
         }
     };
     // Avoid calling sub-parsers on unmatched parens, to prevent quadratic time on things like ((((1..2))))
@@ -1463,7 +1444,7 @@ pub fn parse_range(working_set: &mut StateWorkingSet, span: Span) -> Expression
         );
         if let Some(_err) = err {
             working_set.error(ParseError::Expected("Valid expression before ..", span));
-            return garbage(span);
+            return garbage(working_set, span);
         }
     }
 
@@ -1480,7 +1461,7 @@ pub fn parse_range(working_set: &mut StateWorkingSet, span: Span) -> Expression
                 "inclusive operator preceding second range bound",
                 span,
             ));
-            return garbage(span);
+            return garbage(working_set, span);
         }
     } else {
         let op_str = if token.contains("..=") { "..=" } else { ".." };
@@ -1513,7 +1494,7 @@ pub fn parse_range(working_set: &mut StateWorkingSet, span: Span) -> Expression
 
     if let (None, None) = (&from, &to) {
         working_set.error(ParseError::Expected("at least one range bound set", span));
-        return garbage(span);
+        return garbage(working_set, span);
     }
 
     let (next, next_op_span) = if let Some(pos) = next_op_pos {
@@ -1541,12 +1522,7 @@ pub fn parse_range(working_set: &mut StateWorkingSet, span: Span) -> Expression
         operator,
     };
 
-    Expression {
-        expr: Expr::Range(Box::new(range)),
-        span,
-        ty: Type::Range,
-        custom_completion: None,
-    }
+    Expression::new(working_set, Expr::Range(Box::new(range)), span, Type::Range)
 }
 
 pub(crate) fn parse_dollar_expr(working_set: &mut StateWorkingSet, span: Span) -> Expression {
@@ -1587,7 +1563,7 @@ pub fn parse_raw_string(working_set: &mut StateWorkingSet, span: Span) -> Expres
         sharp_cnt
     } else {
         working_set.error(ParseError::Expected("r#", span));
-        return garbage(span);
+        return garbage(working_set, span);
     };
     let expect_postfix_sharp_cnt = prefix_sharp_cnt;
     // check the length of whole raw string.
@@ -1595,7 +1571,7 @@ pub fn parse_raw_string(working_set: &mut StateWorkingSet, span: Span) -> Expres
     // 1(r) + prefix_sharp_cnt + 1(') + 1(') + postfix_sharp characters
     if bytes.len() < prefix_sharp_cnt + expect_postfix_sharp_cnt + 3 {
         working_set.error(ParseError::Unclosed('\''.into(), span));
-        return garbage(span);
+        return garbage(working_set, span);
     }
 
     // check for unbalanced # and single quotes.
@@ -1606,27 +1582,22 @@ pub fn parse_raw_string(working_set: &mut StateWorkingSet, span: Span) -> Expres
             "postfix #".to_string(),
             span,
         ));
-        return garbage(span);
+        return garbage(working_set, span);
     }
     // check for unblanaced single quotes.
     if bytes[1 + prefix_sharp_cnt] != b'\''
         || bytes[bytes.len() - expect_postfix_sharp_cnt - 1] != b'\''
     {
         working_set.error(ParseError::Unclosed('\''.into(), span));
-        return garbage(span);
+        return garbage(working_set, span);
     }
 
     let bytes = &bytes[prefix_sharp_cnt + 1 + 1..bytes.len() - 1 - prefix_sharp_cnt];
     if let Ok(token) = String::from_utf8(bytes.into()) {
-        Expression {
-            expr: Expr::RawString(token),
-            span,
-            ty: Type::String,
-            custom_completion: None,
-        }
+        Expression::new(working_set, Expr::RawString(token), span, Type::String)
     } else {
         working_set.error(ParseError::Expected("utf8 raw-string", span));
-        garbage(span)
+        garbage(working_set, span)
     }
 }
 
@@ -1670,7 +1641,7 @@ pub fn parse_brace_expr(
             format!("non-block value: {shape}"),
             span,
         ));
-        return Expression::garbage(span);
+        return Expression::garbage(working_set, span);
     }
 
     let bytes = working_set.get_span_contents(Span::new(span.start + 1, span.end - 1));
@@ -1721,7 +1692,7 @@ pub fn parse_brace_expr(
             span,
         ));
 
-        Expression::garbage(span)
+        Expression::garbage(working_set, span)
     }
 }
 
@@ -1796,12 +1767,12 @@ pub fn parse_string_interpolation(working_set: &mut StateWorkingSet, span: Span)
                         working_set.error(err);
                     }
 
-                    output.push(Expression {
-                        expr: Expr::String(String::from_utf8_lossy(&str_contents).to_string()),
+                    output.push(Expression::new(
+                        working_set,
+                        Expr::String(String::from_utf8_lossy(&str_contents).to_string()),
                         span,
-                        ty: Type::String,
-                        custom_completion: None,
-                    });
+                        Type::String,
+                    ));
                     token_start = b;
                 }
             }
@@ -1866,12 +1837,12 @@ pub fn parse_string_interpolation(working_set: &mut StateWorkingSet, span: Span)
                     working_set.error(err);
                 }
 
-                output.push(Expression {
-                    expr: Expr::String(String::from_utf8_lossy(&str_contents).to_string()),
+                output.push(Expression::new(
+                    working_set,
+                    Expr::String(String::from_utf8_lossy(&str_contents).to_string()),
                     span,
-                    ty: Type::String,
-                    custom_completion: None,
-                });
+                    Type::String,
+                ));
             }
         }
         InterpolationMode::Expression => {
@@ -1884,38 +1855,38 @@ pub fn parse_string_interpolation(working_set: &mut StateWorkingSet, span: Span)
         }
     }
 
-    Expression {
-        expr: Expr::StringInterpolation(output),
+    Expression::new(
+        working_set,
+        Expr::StringInterpolation(output),
         span,
-        ty: Type::String,
-        custom_completion: None,
-    }
+        Type::String,
+    )
 }
 
 pub fn parse_variable_expr(working_set: &mut StateWorkingSet, span: Span) -> Expression {
     let contents = working_set.get_span_contents(span);
 
     if contents == b"$nu" {
-        return Expression {
-            expr: Expr::Var(nu_protocol::NU_VARIABLE_ID),
+        return Expression::new(
+            working_set,
+            Expr::Var(nu_protocol::NU_VARIABLE_ID),
             span,
-            ty: Type::Any,
-            custom_completion: None,
-        };
+            Type::Any,
+        );
     } else if contents == b"$in" {
-        return Expression {
-            expr: Expr::Var(nu_protocol::IN_VARIABLE_ID),
+        return Expression::new(
+            working_set,
+            Expr::Var(nu_protocol::IN_VARIABLE_ID),
             span,
-            ty: Type::Any,
-            custom_completion: None,
-        };
+            Type::Any,
+        );
     } else if contents == b"$env" {
-        return Expression {
-            expr: Expr::Var(nu_protocol::ENV_VARIABLE_ID),
+        return Expression::new(
+            working_set,
+            Expr::Var(nu_protocol::ENV_VARIABLE_ID),
             span,
-            ty: Type::Any,
-            custom_completion: None,
-        };
+            Type::Any,
+        );
     }
 
     let name = if contents.starts_with(b"$") {
@@ -1925,20 +1896,20 @@ pub fn parse_variable_expr(working_set: &mut StateWorkingSet, span: Span) -> Exp
     };
 
     if let Some(id) = parse_variable(working_set, span) {
-        Expression {
-            expr: Expr::Var(id),
+        Expression::new(
+            working_set,
+            Expr::Var(id),
             span,
-            ty: working_set.get_variable(id).ty.clone(),
-            custom_completion: None,
-        }
+            working_set.get_variable(id).ty.clone(),
+        )
     } else if working_set.get_env_var(&name).is_some() {
         working_set.error(ParseError::EnvVarNotVar(name, span));
-        garbage(span)
+        garbage(working_set, span)
     } else {
         let ws = &*working_set;
         let suggestion = DidYouMean::new(&ws.list_variables(), ws.get_span_contents(span));
         working_set.error(ParseError::VariableNotFound(suggestion, span));
-        garbage(span)
+        garbage(working_set, span)
     }
 }
 
@@ -2051,12 +2022,12 @@ pub fn parse_simple_cell_path(working_set: &mut StateWorkingSet, span: Span) ->
 
     let cell_path = parse_cell_path(working_set, tokens, false);
 
-    Expression {
-        expr: Expr::CellPath(CellPath { members: cell_path }),
+    Expression::new(
+        working_set,
+        Expr::CellPath(CellPath { members: cell_path }),
         span,
-        ty: Type::CellPath,
-        custom_completion: None,
-    }
+        Type::CellPath,
+    )
 }
 
 pub fn parse_full_cell_path(
@@ -2111,12 +2082,7 @@ pub fn parse_full_cell_path(
             tokens.next();
 
             (
-                Expression {
-                    expr: Expr::Subexpression(block_id),
-                    span: head_span,
-                    ty,
-                    custom_completion: None,
-                },
+                Expression::new(working_set, Expr::Subexpression(block_id), head_span, ty),
                 true,
             )
         } else if bytes.starts_with(b"[") {
@@ -2145,12 +2111,7 @@ pub fn parse_full_cell_path(
         } else if let Some(var_id) = implicit_head {
             trace!("parsing: implicit head of full cell path");
             (
-                Expression {
-                    expr: Expr::Var(var_id),
-                    span: head.span,
-                    ty: Type::Any,
-                    custom_completion: None,
-                },
+                Expression::new(working_set, Expr::Var(var_id), head.span, Type::Any),
                 false,
             )
         } else {
@@ -2159,26 +2120,27 @@ pub fn parse_full_cell_path(
                 String::from_utf8_lossy(bytes).to_string(),
                 span,
             ));
-            return garbage(span);
+            return garbage(working_set, span);
         };
 
         let tail = parse_cell_path(working_set, tokens, expect_dot);
+        // FIXME: Get the type of the data at the tail using follow_cell_path() (or something)
+        let ty = if !tail.is_empty() {
+            // Until the aforementioned fix is implemented, this is necessary to allow mutable list upserts
+            // such as $a.1 = 2 to work correctly.
+            Type::Any
+        } else {
+            head.ty.clone()
+        };
 
-        Expression {
-            // FIXME: Get the type of the data at the tail using follow_cell_path() (or something)
-            ty: if !tail.is_empty() {
-                // Until the aforementioned fix is implemented, this is necessary to allow mutable list upserts
-                // such as $a.1 = 2 to work correctly.
-                Type::Any
-            } else {
-                head.ty.clone()
-            },
-            expr: Expr::FullCellPath(Box::new(FullCellPath { head, tail })),
-            span: full_cell_span,
-            custom_completion: None,
-        }
+        Expression::new(
+            working_set,
+            Expr::FullCellPath(Box::new(FullCellPath { head, tail })),
+            full_cell_span,
+            ty,
+        )
     } else {
-        garbage(span)
+        garbage(working_set, span)
     }
 }
 
@@ -2191,16 +2153,16 @@ pub fn parse_directory(working_set: &mut StateWorkingSet, span: Span) -> Express
     if err.is_none() {
         trace!("-- found {}", token);
 
-        Expression {
-            expr: Expr::Directory(token, quoted),
+        Expression::new(
+            working_set,
+            Expr::Directory(token, quoted),
             span,
-            ty: Type::String,
-            custom_completion: None,
-        }
+            Type::String,
+        )
     } else {
         working_set.error(ParseError::Expected("directory", span));
 
-        garbage(span)
+        garbage(working_set, span)
     }
 }
 
@@ -2213,18 +2175,19 @@ pub fn parse_filepath(working_set: &mut StateWorkingSet, span: Span) -> Expressi
     if err.is_none() {
         trace!("-- found {}", token);
 
-        Expression {
-            expr: Expr::Filepath(token, quoted),
+        Expression::new(
+            working_set,
+            Expr::Filepath(token, quoted),
             span,
-            ty: Type::String,
-            custom_completion: None,
-        }
+            Type::String,
+        )
     } else {
         working_set.error(ParseError::Expected("filepath", span));
 
-        garbage(span)
+        garbage(working_set, span)
     }
 }
+
 /// Parse a datetime type, eg '2022-02-02'
 pub fn parse_datetime(working_set: &mut StateWorkingSet, span: Span) -> Expression {
     trace!("parsing: datetime");
@@ -2239,45 +2202,30 @@ pub fn parse_datetime(working_set: &mut StateWorkingSet, span: Span) -> Expressi
         || bytes[4] != b'-'
     {
         working_set.error(ParseError::Expected("datetime", span));
-        return garbage(span);
+        return garbage(working_set, span);
     }
 
     let token = String::from_utf8_lossy(bytes).to_string();
 
     if let Ok(datetime) = chrono::DateTime::parse_from_rfc3339(&token) {
-        return Expression {
-            expr: Expr::DateTime(datetime),
-            span,
-            ty: Type::Date,
-            custom_completion: None,
-        };
+        return Expression::new(working_set, Expr::DateTime(datetime), span, Type::Date);
     }
 
     // Just the date
     let just_date = token.clone() + "T00:00:00+00:00";
     if let Ok(datetime) = chrono::DateTime::parse_from_rfc3339(&just_date) {
-        return Expression {
-            expr: Expr::DateTime(datetime),
-            span,
-            ty: Type::Date,
-            custom_completion: None,
-        };
+        return Expression::new(working_set, Expr::DateTime(datetime), span, Type::Date);
     }
 
     // Date and time, assume UTC
     let datetime = token + "+00:00";
     if let Ok(datetime) = chrono::DateTime::parse_from_rfc3339(&datetime) {
-        return Expression {
-            expr: Expr::DateTime(datetime),
-            span,
-            ty: Type::Date,
-            custom_completion: None,
-        };
+        return Expression::new(working_set, Expr::DateTime(datetime), span, Type::Date);
     }
 
     working_set.error(ParseError::Expected("datetime", span));
 
-    garbage(span)
+    garbage(working_set, span)
 }
 
 /// Parse a duration type, eg '10day'
@@ -2287,14 +2235,17 @@ pub fn parse_duration(working_set: &mut StateWorkingSet, span: Span) -> Expressi
     let bytes = working_set.get_span_contents(span);
 
     match parse_unit_value(bytes, span, DURATION_UNIT_GROUPS, Type::Duration, |x| x) {
-        Some(Ok(expr)) => expr,
+        Some(Ok(expr)) => {
+            let span_id = working_set.add_span(span);
+            expr.with_span_id(span_id)
+        }
         Some(Err(mk_err_for)) => {
             working_set.error(mk_err_for("duration"));
-            garbage(span)
+            garbage(working_set, span)
         }
         None => {
             working_set.error(ParseError::Expected("duration with valid units", span));
-            garbage(span)
+            garbage(working_set, span)
         }
     }
 }
@@ -2308,20 +2259,23 @@ pub fn parse_filesize(working_set: &mut StateWorkingSet, span: Span) -> Expressi
     // the hex digit `b` might be mistaken for the unit `b`, so check that first
     if bytes.starts_with(b"0x") {
         working_set.error(ParseError::Expected("filesize with valid units", span));
-        return garbage(span);
+        return garbage(working_set, span);
     }
 
     match parse_unit_value(bytes, span, FILESIZE_UNIT_GROUPS, Type::Filesize, |x| {
         x.to_ascii_uppercase()
     }) {
-        Some(Ok(expr)) => expr,
+        Some(Ok(expr)) => {
+            let span_id = working_set.add_span(span);
+            expr.with_span_id(span_id)
+        }
         Some(Err(mk_err_for)) => {
             working_set.error(mk_err_for("filesize"));
-            garbage(span)
+            garbage(working_set, span)
         }
         None => {
             working_set.error(ParseError::Expected("filesize with valid units", span));
-            garbage(span)
+            garbage(working_set, span)
         }
     }
 }
@@ -2379,23 +2333,13 @@ pub fn parse_unit_value<'res>(
 
         trace!("-- found {} {:?}", num, unit);
         let value = ValueWithUnit {
-            expr: Expression {
-                expr: Expr::Int(num),
-                span: lhs_span,
-                ty: Type::Number,
-                custom_completion: None,
-            },
+            expr: Expression::new_unknown(Expr::Int(num), lhs_span, Type::Number),
             unit: Spanned {
                 item: unit,
                 span: unit_span,
             },
         };
-        let expr = Expression {
-            expr: Expr::ValueWithUnit(Box::new(value)),
-            span,
-            ty,
-            custom_completion: None,
-        };
+        let expr = Expression::new_unknown(Expr::ValueWithUnit(Box::new(value)), span, ty);
 
         Some(Ok(expr))
     } else {
@@ -2487,16 +2431,16 @@ pub fn parse_glob_pattern(working_set: &mut StateWorkingSet, span: Span) -> Expr
     if err.is_none() {
         trace!("-- found {}", token);
 
-        Expression {
-            expr: Expr::GlobPattern(token, quoted),
+        Expression::new(
+            working_set,
+            Expr::GlobPattern(token, quoted),
             span,
-            ty: Type::Glob,
-            custom_completion: None,
-        }
+            Type::Glob,
+        )
     } else {
         working_set.error(ParseError::Expected("glob pattern string", span));
 
-        garbage(span)
+        garbage(working_set, span)
     }
 }
 
@@ -2719,7 +2663,7 @@ pub fn parse_string(working_set: &mut StateWorkingSet, span: Span) -> Expression
 
     if bytes.is_empty() {
         working_set.error(ParseError::Expected("String", span));
-        return Expression::garbage(span);
+        return Expression::garbage(working_set, span);
     }
 
     // Check for bare word interpolation
@@ -2732,12 +2676,7 @@ pub fn parse_string(working_set: &mut StateWorkingSet, span: Span) -> Expression
         working_set.error(err);
     }
 
-    Expression {
-        expr: Expr::String(s),
-        span,
-        ty: Type::String,
-        custom_completion: None,
-    }
+    Expression::new(working_set, Expr::String(s), span, Type::String)
 }
 
 fn is_quoted(bytes: &[u8]) -> bool {
@@ -2759,11 +2698,11 @@ pub fn parse_string_strict(working_set: &mut StateWorkingSet, span: Span) -> Exp
         };
         if bytes.starts_with(b"\"") && (bytes.len() == 1 || !bytes.ends_with(b"\"")) {
             working_set.error(ParseError::Unclosed("\"".into(), span));
-            return garbage(span);
+            return garbage(working_set, span);
         }
         if bytes.starts_with(b"\'") && (bytes.len() == 1 || !bytes.ends_with(b"\'")) {
             working_set.error(ParseError::Unclosed("\'".into(), span));
-            return garbage(span);
+            return garbage(working_set, span);
         }
     }
 
@@ -2783,27 +2722,17 @@ pub fn parse_string_strict(working_set: &mut StateWorkingSet, span: Span) -> Exp
         trace!("-- found {}", token);
 
         if quoted {
-            Expression {
-                expr: Expr::String(token),
-                span,
-                ty: Type::String,
-                custom_completion: None,
-            }
+            Expression::new(working_set, Expr::String(token), span, Type::String)
         } else if token.contains(' ') {
             working_set.error(ParseError::Expected("string", span));
 
-            garbage(span)
+            garbage(working_set, span)
         } else {
-            Expression {
-                expr: Expr::String(token),
-                span,
-                ty: Type::String,
-                custom_completion: None,
-            }
+            Expression::new(working_set, Expr::String(token), span, Type::String)
         }
     } else {
         working_set.error(ParseError::Expected("string", span));
-        garbage(span)
+        garbage(working_set, span)
     }
 }
 
@@ -2813,7 +2742,7 @@ pub fn parse_import_pattern(working_set: &mut StateWorkingSet, spans: &[Span]) -
             "needs at least one component of import pattern".to_string(),
             Span::concat(spans),
         ));
-        return garbage(Span::concat(spans));
+        return garbage(working_set, Span::concat(spans));
     };
 
     let head_expr = parse_value(working_set, *head_span, &SyntaxShape::Any);
@@ -2823,12 +2752,12 @@ pub fn parse_import_pattern(working_set: &mut StateWorkingSet, spans: &[Span]) -
             Ok(s) => (working_set.find_module(s.as_bytes()), s.into_bytes()),
             Err(err) => {
                 working_set.error(err.wrap(working_set, Span::concat(spans)));
-                return garbage(Span::concat(spans));
+                return garbage(working_set, Span::concat(spans));
             }
         },
         Err(err) => {
             working_set.error(err.wrap(working_set, Span::concat(spans)));
-            return garbage(Span::concat(spans));
+            return garbage(working_set, Span::concat(spans));
         }
     };
 
@@ -2860,12 +2789,12 @@ pub fn parse_import_pattern(working_set: &mut StateWorkingSet, spans: &[Span]) -
                     ),
                     prev_span,
                 ));
-                return Expression {
-                    expr: Expr::ImportPattern(Box::new(import_pattern)),
-                    span: prev_span,
-                    ty: Type::List(Box::new(Type::String)),
-                    custom_completion: None,
-                };
+                return Expression::new(
+                    working_set,
+                    Expr::ImportPattern(Box::new(import_pattern)),
+                    prev_span,
+                    Type::List(Box::new(Type::String)),
+                );
             }
 
             let tail = working_set.get_span_contents(*tail_span);
@@ -2906,12 +2835,12 @@ pub fn parse_import_pattern(working_set: &mut StateWorkingSet, spans: &[Span]) -
                         .push(ImportPatternMember::List { names: output });
                 } else {
                     working_set.error(ParseError::ExportNotFound(result.span));
-                    return Expression {
-                        expr: Expr::ImportPattern(Box::new(import_pattern)),
-                        span: Span::concat(spans),
-                        ty: Type::List(Box::new(Type::String)),
-                        custom_completion: None,
-                    };
+                    return Expression::new(
+                        working_set,
+                        Expr::ImportPattern(Box::new(import_pattern)),
+                        Span::concat(spans),
+                        Type::List(Box::new(Type::String)),
+                    );
                 }
 
                 leaf_member_span = Some(*tail_span);
@@ -2926,12 +2855,12 @@ pub fn parse_import_pattern(working_set: &mut StateWorkingSet, spans: &[Span]) -
         }
     }
 
-    Expression {
-        expr: Expr::ImportPattern(Box::new(import_pattern)),
-        span: Span::concat(&spans[1..]),
-        ty: Type::List(Box::new(Type::String)),
-        custom_completion: None,
-    }
+    Expression::new(
+        working_set,
+        Expr::ImportPattern(Box::new(import_pattern)),
+        Span::concat(&spans[1..]),
+        Type::List(Box::new(Type::String)),
+    )
 }
 
 /// Parse `spans[spans_idx..]` into a variable, with optional type annotation.
@@ -2952,7 +2881,7 @@ pub fn parse_var_with_opt_type(
         || bytes.contains(&b'`')
     {
         working_set.error(ParseError::VariableNotValid(spans[*spans_idx]));
-        return (garbage(spans[*spans_idx]), None);
+        return (garbage(working_set, spans[*spans_idx]), None);
     }
 
     if bytes.ends_with(b":") {
@@ -2982,18 +2911,18 @@ pub fn parse_var_with_opt_type(
                     "valid variable name",
                     spans[*spans_idx - 1],
                 ));
-                return (garbage(spans[*spans_idx - 1]), None);
+                return (garbage(working_set, spans[*spans_idx - 1]), None);
             }
 
             let id = working_set.add_variable(var_name, spans[*spans_idx - 1], ty.clone(), mutable);
 
             (
-                Expression {
-                    expr: Expr::VarDecl(id),
-                    span: Span::concat(&spans[span_beginning..*spans_idx + 1]),
-                    ty: ty.clone(),
-                    custom_completion: None,
-                },
+                Expression::new(
+                    working_set,
+                    Expr::VarDecl(id),
+                    Span::concat(&spans[span_beginning..*spans_idx + 1]),
+                    ty.clone(),
+                ),
                 Some(ty),
             )
         } else {
@@ -3004,19 +2933,14 @@ pub fn parse_var_with_opt_type(
                     "valid variable name",
                     spans[*spans_idx],
                 ));
-                return (garbage(spans[*spans_idx]), None);
+                return (garbage(working_set, spans[*spans_idx]), None);
             }
 
             let id = working_set.add_variable(var_name, spans[*spans_idx], Type::Any, mutable);
 
             working_set.error(ParseError::MissingType(spans[*spans_idx]));
             (
-                Expression {
-                    expr: Expr::VarDecl(id),
-                    span: spans[*spans_idx],
-                    ty: Type::Any,
-                    custom_completion: None,
-                },
+                Expression::new(working_set, Expr::VarDecl(id), spans[*spans_idx], Type::Any),
                 None,
             )
         }
@@ -3028,7 +2952,7 @@ pub fn parse_var_with_opt_type(
                 "valid variable name",
                 spans[*spans_idx],
             ));
-            return (garbage(spans[*spans_idx]), None);
+            return (garbage(working_set, spans[*spans_idx]), None);
         }
 
         let id = working_set.add_variable(
@@ -3039,12 +2963,7 @@ pub fn parse_var_with_opt_type(
         );
 
         (
-            Expression {
-                expr: Expr::VarDecl(id),
-                span: spans[*spans_idx],
-                ty: Type::Any,
-                custom_completion: None,
-            },
+            Expression::new(working_set, Expr::VarDecl(id), spans[*spans_idx], Type::Any),
             None,
         )
     }
@@ -3199,12 +3118,7 @@ pub fn parse_row_condition(working_set: &mut StateWorkingSet, spans: &[Span]) ->
         }
     };
 
-    Expression {
-        ty: Type::Bool,
-        span,
-        expr: Expr::RowCondition(block_id),
-        custom_completion: None,
-    }
+    Expression::new(working_set, Expr::RowCondition(block_id), span, Type::Bool)
 }
 
 pub fn parse_signature(working_set: &mut StateWorkingSet, span: Span) -> Expression {
@@ -3222,7 +3136,7 @@ pub fn parse_signature(working_set: &mut StateWorkingSet, span: Span) -> Express
         start += 1;
     } else {
         working_set.error(ParseError::Expected("[ or (", Span::new(start, start + 1)));
-        return garbage(span);
+        return garbage(working_set, span);
     }
 
     if (has_paren && bytes.ends_with(b")")) || (!has_paren && bytes.ends_with(b"]")) {
@@ -3233,12 +3147,7 @@ pub fn parse_signature(working_set: &mut StateWorkingSet, span: Span) -> Express
 
     let sig = parse_signature_helper(working_set, Span::new(start, end));
 
-    Expression {
-        expr: Expr::Signature(sig),
-        span,
-        ty: Type::Signature,
-        custom_completion: None,
-    }
+    Expression::new(working_set, Expr::Signature(sig), span, Type::Signature)
 }
 
 pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) -> Box<Signature> {
@@ -3939,16 +3848,16 @@ pub fn parse_list_expression(
         }
     }
 
-    Expression {
-        expr: Expr::List(args),
+    Expression::new(
+        working_set,
+        Expr::List(args),
         span,
-        ty: Type::List(Box::new(if let Some(ty) = contained_type {
+        Type::List(Box::new(if let Some(ty) = contained_type {
             ty
         } else {
             Type::Any
         })),
-        custom_completion: None,
-    }
+    )
 }
 
 fn parse_table_row(
@@ -4094,12 +4003,7 @@ fn parse_table_expression(working_set: &mut StateWorkingSet, span: Span) -> Expr
         rows: rows.into_iter().map(Into::into).collect(),
     };
 
-    Expression {
-        expr: Expr::Table(table),
-        span,
-        ty,
-        custom_completion: None,
-    }
+    Expression::new(working_set, Expr::Table(table), span, ty)
 }
 
 fn table_type(head: &[Expression], rows: &[Vec<Expression>]) -> (Type, Vec<ParseError>) {
@@ -4156,7 +4060,7 @@ pub fn parse_block_expression(working_set: &mut StateWorkingSet, span: Span) ->
         start += 1;
     } else {
         working_set.error(ParseError::Expected("block", span));
-        return garbage(span);
+        return garbage(working_set, span);
     }
     if bytes.ends_with(b"}") {
         end -= 1;
@@ -4199,12 +4103,7 @@ pub fn parse_block_expression(working_set: &mut StateWorkingSet, span: Span) ->
 
     let block_id = working_set.add_block(Arc::new(output));
 
-    Expression {
-        expr: Expr::Block(block_id),
-        span,
-        ty: Type::Block,
-        custom_completion: None,
-    }
+    Expression::new(working_set, Expr::Block(block_id), span, Type::Block)
 }
 
 pub fn parse_match_block_expression(working_set: &mut StateWorkingSet, span: Span) -> Expression {
@@ -4217,7 +4116,7 @@ pub fn parse_match_block_expression(working_set: &mut StateWorkingSet, span: Spa
         start += 1;
     } else {
         working_set.error(ParseError::Expected("closure", span));
-        return garbage(span);
+        return garbage(working_set, span);
     }
     if bytes.ends_with(b"}") {
         end -= 1;
@@ -4333,7 +4232,7 @@ pub fn parse_match_block_expression(working_set: &mut StateWorkingSet, span: Spa
 
             if output.get(position).is_none() {
                 working_set.error(mk_err());
-                return garbage(span);
+                return garbage(working_set, span);
             };
 
             let (tokens, found) = if let Some((pos, _)) = output[position..]
@@ -4342,7 +4241,7 @@ pub fn parse_match_block_expression(working_set: &mut StateWorkingSet, span: Spa
             {
                 if position + pos == position {
                     working_set.error(mk_err());
-                    return garbage(span);
+                    return garbage(working_set, span);
                 }
 
                 (&output[position..position + pos], true)
@@ -4397,12 +4296,12 @@ pub fn parse_match_block_expression(working_set: &mut StateWorkingSet, span: Spa
         output_matches.push((pattern, result));
     }
 
-    Expression {
-        expr: Expr::MatchBlock(output_matches),
+    Expression::new(
+        working_set,
+        Expr::MatchBlock(output_matches),
         span,
-        ty: Type::Any,
-        custom_completion: None,
-    }
+        Type::Any,
+    )
 }
 
 pub fn parse_closure_expression(
@@ -4421,7 +4320,7 @@ pub fn parse_closure_expression(
         start += 1;
     } else {
         working_set.error(ParseError::Expected("closure", span));
-        return garbage(span);
+        return garbage(working_set, span);
     }
     if bytes.ends_with(b"}") {
         end -= 1;
@@ -4526,12 +4425,7 @@ pub fn parse_closure_expression(
 
     let block_id = working_set.add_block(Arc::new(output));
 
-    Expression {
-        expr: Expr::Closure(block_id),
-        span,
-        ty: Type::Closure,
-        custom_completion: None,
-    }
+    Expression::new(working_set, Expr::Closure(block_id), span, Type::Closure)
 }
 
 pub fn parse_value(
@@ -4545,44 +4439,29 @@ pub fn parse_value(
 
     if bytes.is_empty() {
         working_set.error(ParseError::IncompleteParser(span));
-        return garbage(span);
+        return garbage(working_set, span);
     }
 
     // Check for reserved keyword values
     match bytes {
         b"true" => {
             if matches!(shape, SyntaxShape::Boolean) || matches!(shape, SyntaxShape::Any) {
-                return Expression {
-                    expr: Expr::Bool(true),
-                    span,
-                    ty: Type::Bool,
-                    custom_completion: None,
-                };
+                return Expression::new(working_set, Expr::Bool(true), span, Type::Bool);
             } else {
                 working_set.error(ParseError::Expected("non-boolean value", span));
-                return Expression::garbage(span);
+                return Expression::garbage(working_set, span);
             }
         }
         b"false" => {
             if matches!(shape, SyntaxShape::Boolean) || matches!(shape, SyntaxShape::Any) {
-                return Expression {
-                    expr: Expr::Bool(false),
-                    span,
-                    ty: Type::Bool,
-                    custom_completion: None,
-                };
+                return Expression::new(working_set, Expr::Bool(false), span, Type::Bool);
             } else {
                 working_set.error(ParseError::Expected("non-boolean value", span));
-                return Expression::garbage(span);
+                return Expression::garbage(working_set, span);
             }
         }
         b"null" => {
-            return Expression {
-                expr: Expr::Nothing,
-                span,
-                ty: Type::Nothing,
-                custom_completion: None,
-            };
+            return Expression::new(working_set, Expr::Nothing, span, Type::Nothing);
         }
         b"-inf" | b"inf" | b"NaN" => {
             return parse_float(working_set, span);
@@ -4604,7 +4483,7 @@ pub fn parse_value(
             | SyntaxShape::GlobPattern => {}
             _ => {
                 working_set.error(ParseError::Expected("non-[] value", span));
-                return Expression::garbage(span);
+                return Expression::garbage(working_set, span);
             }
         },
         b'r' if bytes.len() > 1 && bytes[1] == b'#' => {
@@ -4637,7 +4516,7 @@ pub fn parse_value(
             } else {
                 working_set.error(ParseError::Expected("signature", span));
 
-                Expression::garbage(span)
+                Expression::garbage(working_set, span)
             }
         }
         SyntaxShape::List(elem) => {
@@ -4646,7 +4525,7 @@ pub fn parse_value(
             } else {
                 working_set.error(ParseError::Expected("list", span));
 
-                Expression::garbage(span)
+                Expression::garbage(working_set, span)
             }
         }
         SyntaxShape::Table(_) => {
@@ -4655,23 +4534,18 @@ pub fn parse_value(
             } else {
                 working_set.error(ParseError::Expected("table", span));
 
-                Expression::garbage(span)
+                Expression::garbage(working_set, span)
             }
         }
         SyntaxShape::CellPath => parse_simple_cell_path(working_set, span),
         SyntaxShape::Boolean => {
             // Redundant, though we catch bad boolean parses here
             if bytes == b"true" || bytes == b"false" {
-                Expression {
-                    expr: Expr::Bool(true),
-                    span,
-                    ty: Type::Bool,
-                    custom_completion: None,
-                }
+                Expression::new(working_set, Expr::Bool(true), span, Type::Bool)
             } else {
                 working_set.error(ParseError::Expected("bool", span));
 
-                Expression::garbage(span)
+                Expression::garbage(working_set, span)
             }
         }
 
@@ -4680,7 +4554,7 @@ pub fn parse_value(
         SyntaxShape::Block | SyntaxShape::Closure(..) | SyntaxShape::Record(_) => {
             working_set.error(ParseError::Expected("block, closure or record", span));
 
-            Expression::garbage(span)
+            Expression::garbage(working_set, span)
         }
 
         SyntaxShape::Any => {
@@ -4721,7 +4595,7 @@ pub fn parse_value(
                     }
                 }
                 working_set.error(ParseError::Expected("any shape", span));
-                garbage(span)
+                garbage(working_set, span)
             }
         }
         x => {
@@ -4729,7 +4603,7 @@ pub fn parse_value(
                 x.to_type().to_string(),
                 span,
             ));
-            garbage(span)
+            garbage(working_set, span)
         }
     }
 }
@@ -4783,7 +4657,7 @@ pub fn parse_operator(working_set: &mut StateWorkingSet, span: Span) -> Expressi
                 "Use '**' for exponentiation or 'bit-xor' for bitwise XOR.",
                 span,
             ));
-            return garbage(span);
+            return garbage(working_set, span);
         }
         equality @ (b"is" | b"===") => {
             working_set.error(ParseError::UnknownOperator(
@@ -4795,7 +4669,7 @@ pub fn parse_operator(working_set: &mut StateWorkingSet, span: Span) -> Expressi
                 "Did you mean '=='?",
                 span,
             ));
-            return garbage(span);
+            return garbage(working_set, span);
         }
         b"contains" => {
             working_set.error(ParseError::UnknownOperator(
@@ -4803,7 +4677,7 @@ pub fn parse_operator(working_set: &mut StateWorkingSet, span: Span) -> Expressi
                 "Did you mean '$string =~ $pattern' or '$element in $container'?",
                 span,
             ));
-            return garbage(span);
+            return garbage(working_set, span);
         }
         b"%" => {
             working_set.error(ParseError::UnknownOperator(
@@ -4811,7 +4685,7 @@ pub fn parse_operator(working_set: &mut StateWorkingSet, span: Span) -> Expressi
                 "Did you mean 'mod'?",
                 span,
             ));
-            return garbage(span);
+            return garbage(working_set, span);
         }
         b"&" => {
             working_set.error(ParseError::UnknownOperator(
@@ -4819,7 +4693,7 @@ pub fn parse_operator(working_set: &mut StateWorkingSet, span: Span) -> Expressi
                 "Did you mean 'bit-and'?",
                 span,
             ));
-            return garbage(span);
+            return garbage(working_set, span);
         }
         b"<<" => {
             working_set.error(ParseError::UnknownOperator(
@@ -4827,7 +4701,7 @@ pub fn parse_operator(working_set: &mut StateWorkingSet, span: Span) -> Expressi
                 "Did you mean 'bit-shl'?",
                 span,
             ));
-            return garbage(span);
+            return garbage(working_set, span);
         }
         b">>" => {
             working_set.error(ParseError::UnknownOperator(
@@ -4835,7 +4709,7 @@ pub fn parse_operator(working_set: &mut StateWorkingSet, span: Span) -> Expressi
                 "Did you mean 'bit-shr'?",
                 span,
             ));
-            return garbage(span);
+            return garbage(working_set, span);
         }
         bits @ (b"bits-and" | b"bits-xor" | b"bits-or" | b"bits-shl" | b"bits-shr") => {
             working_set.error(ParseError::UnknownOperator(
@@ -4857,20 +4731,15 @@ pub fn parse_operator(working_set: &mut StateWorkingSet, span: Span) -> Expressi
                 },
                 span,
             ));
-            return garbage(span);
+            return garbage(working_set, span);
         }
         _ => {
             working_set.error(ParseError::Expected("operator", span));
-            return garbage(span);
+            return garbage(working_set, span);
         }
     };
 
-    Expression {
-        expr: Expr::Operator(operator),
-        span,
-        ty: Type::Any,
-        custom_completion: None,
-    }
+    Expression::new(working_set, Expr::Operator(operator), span, Type::Any)
 }
 
 pub fn parse_math_expression(
@@ -4908,7 +4777,7 @@ pub fn parse_math_expression(
                 "expression",
                 Span::new(spans[0].end, spans[0].end),
             ));
-            return garbage(spans[0]);
+            return garbage(working_set, spans[0]);
         }
     } else if first_span == b"not" {
         not_start_spans.push(spans[idx].start);
@@ -4929,19 +4798,25 @@ pub fn parse_math_expression(
                 "expression",
                 Span::new(spans[idx - 1].end, spans[idx - 1].end),
             ));
-            return garbage(spans[idx - 1]);
+            return garbage(working_set, spans[idx - 1]);
         }
     }
 
     let mut lhs = parse_value(working_set, spans[idx], &SyntaxShape::Any);
 
     for not_start_span in not_start_spans.iter().rev() {
-        lhs = Expression {
-            expr: Expr::UnaryNot(Box::new(lhs)),
-            span: Span::new(*not_start_span, spans[idx].end),
-            ty: Type::Bool,
-            custom_completion: None,
-        };
+        // lhs = Expression {
+        //     expr: Expr::UnaryNot(Box::new(lhs)),
+        //     span: Span::new(*not_start_span, spans[idx].end),
+        //     ty: Type::Bool,
+        //     custom_completion: None,
+        // };
+        lhs = Expression::new(
+            working_set,
+            Expr::UnaryNot(Box::new(lhs)),
+            Span::new(*not_start_span, spans[idx].end),
+            Type::Bool,
+        );
     }
     not_start_spans.clear();
 
@@ -4967,8 +4842,8 @@ pub fn parse_math_expression(
             // Handle broken math expr `1 +` etc
             working_set.error(ParseError::IncompleteMathExpression(spans[idx - 1]));
 
-            expr_stack.push(Expression::garbage(spans[idx - 1]));
-            expr_stack.push(Expression::garbage(spans[idx - 1]));
+            expr_stack.push(Expression::garbage(working_set, spans[idx - 1]));
+            expr_stack.push(Expression::garbage(working_set, spans[idx - 1]));
 
             break;
         }
@@ -5000,18 +4875,24 @@ pub fn parse_math_expression(
                     "expression",
                     Span::new(spans[idx - 1].end, spans[idx - 1].end),
                 ));
-                return garbage(spans[idx - 1]);
+                return garbage(working_set, spans[idx - 1]);
             }
         }
         let mut rhs = parse_value(working_set, spans[idx], &SyntaxShape::Any);
 
         for not_start_span in not_start_spans.iter().rev() {
-            rhs = Expression {
-                expr: Expr::UnaryNot(Box::new(rhs)),
-                span: Span::new(*not_start_span, spans[idx].end),
-                ty: Type::Bool,
-                custom_completion: None,
-            };
+            // rhs = Expression {
+            //     expr: Expr::UnaryNot(Box::new(rhs)),
+            //     span: Span::new(*not_start_span, spans[idx].end),
+            //     ty: Type::Bool,
+            //     custom_completion: None,
+            // };
+            rhs = Expression::new(
+                working_set,
+                Expr::UnaryNot(Box::new(rhs)),
+                Span::new(*not_start_span, spans[idx].end),
+                Type::Bool,
+            );
         }
         not_start_spans.clear();
 
@@ -5047,12 +4928,12 @@ pub fn parse_math_expression(
             }
 
             let op_span = Span::append(lhs.span, rhs.span);
-            expr_stack.push(Expression {
-                expr: Expr::BinaryOp(Box::new(lhs), Box::new(op), Box::new(rhs)),
-                span: op_span,
-                ty: result_ty,
-                custom_completion: None,
-            });
+            expr_stack.push(Expression::new(
+                working_set,
+                Expr::BinaryOp(Box::new(lhs), Box::new(op), Box::new(rhs)),
+                op_span,
+                result_ty,
+            ));
         }
         expr_stack.push(op);
         expr_stack.push(rhs);
@@ -5083,12 +4964,12 @@ pub fn parse_math_expression(
         }
 
         let binary_op_span = Span::append(lhs.span, rhs.span);
-        expr_stack.push(Expression {
-            expr: Expr::BinaryOp(Box::new(lhs), Box::new(op), Box::new(rhs)),
-            span: binary_op_span,
-            ty: result_ty,
-            custom_completion: None,
-        });
+        expr_stack.push(Expression::new(
+            working_set,
+            Expr::BinaryOp(Box::new(lhs), Box::new(op), Box::new(rhs)),
+            binary_op_span,
+            result_ty,
+        ));
     }
 
     expr_stack
@@ -5131,12 +5012,12 @@ pub fn parse_expression(working_set: &mut StateWorkingSet, spans: &[Span]) -> Ex
                     parse_string_strict(working_set, rhs_span)
                 }
             } else {
-                Expression {
-                    expr: Expr::String(String::new()),
-                    span: Span::unknown(),
-                    ty: Type::Nothing,
-                    custom_completion: None,
-                }
+                Expression::new(
+                    working_set,
+                    Expr::String(String::new()),
+                    Span::unknown(),
+                    Type::Nothing,
+                )
             };
 
             if starting_error_count == working_set.parse_errors.len() {
@@ -5153,7 +5034,7 @@ pub fn parse_expression(working_set: &mut StateWorkingSet, spans: &[Span]) -> Ex
 
     if pos == spans.len() {
         working_set.error(ParseError::UnknownCommand(spans[0]));
-        return garbage(Span::concat(spans));
+        return garbage(working_set, Span::concat(spans));
     }
 
     let output = if is_math_expression_like(working_set, spans[pos]) {
@@ -5246,18 +5127,18 @@ pub fn parse_expression(working_set: &mut StateWorkingSet, spans: &[Span]) -> Ex
             }
 
             let arguments = vec![
-                Argument::Positional(Expression {
-                    expr: Expr::Record(env_vars),
-                    span: Span::concat(&spans[..pos]),
-                    ty: Type::Any,
-                    custom_completion: None,
-                }),
-                Argument::Positional(Expression {
-                    expr: Expr::Closure(block_id),
-                    span: Span::concat(&spans[pos..]),
-                    ty: Type::Closure,
-                    custom_completion: None,
-                }),
+                Argument::Positional(Expression::new(
+                    working_set,
+                    Expr::Record(env_vars),
+                    Span::concat(&spans[..pos]),
+                    Type::Any,
+                )),
+                Argument::Positional(Expression::new(
+                    working_set,
+                    Expr::Closure(block_id),
+                    Span::concat(&spans[pos..]),
+                    Type::Closure,
+                )),
             ];
 
             let expr = Expr::Call(Box::new(Call {
@@ -5267,12 +5148,7 @@ pub fn parse_expression(working_set: &mut StateWorkingSet, spans: &[Span]) -> Ex
                 parser_info: HashMap::new(),
             }));
 
-            Expression {
-                expr,
-                custom_completion: None,
-                span: Span::concat(spans),
-                ty,
-            }
+            Expression::new(working_set, expr, Span::concat(spans), ty)
         } else {
             output
         }
@@ -5347,7 +5223,7 @@ pub fn parse_builtin_commands(
         b"overlay" => {
             if let Some(redirection) = lite_command.redirection.as_ref() {
                 working_set.error(redirecting_builtin_error("overlay", redirection));
-                return garbage_pipeline(&lite_command.parts);
+                return garbage_pipeline(working_set, &lite_command.parts);
             }
             parse_keyword(working_set, lite_command)
         }
@@ -5367,7 +5243,7 @@ pub fn parse_builtin_commands(
         {
             if let Some(redirection) = lite_command.redirection.as_ref() {
                 working_set.error(redirecting_builtin_error("plugin use", redirection));
-                return garbage_pipeline(&lite_command.parts);
+                return garbage_pipeline(working_set, &lite_command.parts);
             }
             parse_keyword(working_set, lite_command)
         }
@@ -5391,7 +5267,7 @@ pub fn parse_record(working_set: &mut StateWorkingSet, span: Span) -> Expression
         start += 1;
     } else {
         working_set.error(ParseError::Expected("{", Span::new(start, start + 1)));
-        return garbage(span);
+        return garbage(working_set, span);
     }
 
     if bytes.ends_with(b"}") {
@@ -5456,8 +5332,8 @@ pub fn parse_record(working_set: &mut StateWorkingSet, span: Span) -> Expression
                     Span::new(curr_span.end, curr_span.end),
                 ));
                 output.push(RecordItem::Pair(
-                    garbage(curr_span),
-                    garbage(Span::new(curr_span.end, curr_span.end)),
+                    garbage(working_set, curr_span),
+                    garbage(working_set, Span::new(curr_span.end, curr_span.end)),
                 ));
                 break;
             }
@@ -5471,10 +5347,10 @@ pub fn parse_record(working_set: &mut StateWorkingSet, span: Span) -> Expression
                 ));
                 output.push(RecordItem::Pair(
                     field,
-                    garbage(Span::new(
-                        colon_span.start,
-                        tokens[tokens.len() - 1].span.end,
-                    )),
+                    garbage(
+                        working_set,
+                        Span::new(colon_span.start, tokens[tokens.len() - 1].span.end),
+                    ),
                 ));
                 break;
             }
@@ -5484,8 +5360,11 @@ pub fn parse_record(working_set: &mut StateWorkingSet, span: Span) -> Expression
                     Span::new(colon_span.end, colon_span.end),
                 ));
                 output.push(RecordItem::Pair(
-                    garbage(Span::new(curr_span.start, colon_span.end)),
-                    garbage(Span::new(colon_span.end, tokens[tokens.len() - 1].span.end)),
+                    garbage(working_set, Span::new(curr_span.start, colon_span.end)),
+                    garbage(
+                        working_set,
+                        Span::new(colon_span.end, tokens[tokens.len() - 1].span.end),
+                    ),
                 ));
                 break;
             }
@@ -5505,16 +5384,16 @@ pub fn parse_record(working_set: &mut StateWorkingSet, span: Span) -> Expression
         }
     }
 
-    Expression {
-        expr: Expr::Record(output),
+    Expression::new(
+        working_set,
+        Expr::Record(output),
         span,
-        ty: (if let Some(fields) = field_types {
+        if let Some(fields) = field_types {
             Type::Record(fields.into())
         } else {
             Type::Any
-        }),
-        custom_completion: None,
-    }
+        },
+    )
 }
 
 fn parse_redirection_target(
@@ -6250,12 +6129,12 @@ fn wrap_expr_with_collect(working_set: &mut StateWorkingSet, expr: &Expression)
 
         let block_id = working_set.add_block(Arc::new(block));
 
-        output.push(Argument::Positional(Expression {
-            expr: Expr::Closure(block_id),
+        output.push(Argument::Positional(Expression::new(
+            working_set,
+            Expr::Closure(block_id),
             span,
-            ty: Type::Any,
-            custom_completion: None,
-        }));
+            Type::Any,
+        )));
 
         output.push(Argument::Named((
             Spanned {
@@ -6269,19 +6148,19 @@ fn wrap_expr_with_collect(working_set: &mut StateWorkingSet, expr: &Expression)
         // The containing, synthetic call to `collect`.
         // We don't want to have a real span as it will confuse flattening
         // The args are where we'll get the real info
-        Expression {
-            expr: Expr::Call(Box::new(Call {
+        Expression::new(
+            working_set,
+            Expr::Call(Box::new(Call {
                 head: Span::new(0, 0),
                 arguments: output,
                 decl_id,
                 parser_info: HashMap::new(),
             })),
             span,
-            ty: Type::Any,
-            custom_completion: None,
-        }
+            Type::Any,
+        )
     } else {
-        Expression::garbage(span)
+        Expression::garbage(working_set, span)
     }
 }
 
diff --git a/crates/nu-parser/src/type_check.rs b/crates/nu-parser/src/type_check.rs
index 14c88825db..1c76afb621 100644
--- a/crates/nu-parser/src/type_check.rs
+++ b/crates/nu-parser/src/type_check.rs
@@ -68,7 +68,7 @@ pub fn type_compatible(lhs: &Type, rhs: &Type) -> bool {
 }
 
 pub fn math_result_type(
-    _working_set: &StateWorkingSet,
+    working_set: &mut StateWorkingSet,
     lhs: &mut Expression,
     op: &mut Expression,
     rhs: &mut Expression,
@@ -104,7 +104,7 @@ pub fn math_result_type(
                     | Type::Filesize,
                     _,
                 ) => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationRHS(
@@ -118,7 +118,7 @@ pub fn math_result_type(
                     )
                 }
                 _ => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationLHS(
@@ -130,7 +130,7 @@ pub fn math_result_type(
                     )
                 }
             },
-            Operator::Math(Math::Append) => check_append(lhs, rhs, op),
+            Operator::Math(Math::Append) => check_append(working_set, lhs, rhs, op),
             Operator::Math(Math::Minus) => match (&lhs.ty, &rhs.ty) {
                 (Type::Int, Type::Int) => (Type::Int, None),
                 (Type::Float, Type::Int) => (Type::Float, None),
@@ -152,7 +152,7 @@ pub fn math_result_type(
                 (Type::Any, _) => (Type::Any, None),
                 (_, Type::Any) => (Type::Any, None),
                 (Type::Int | Type::Float | Type::Date | Type::Duration | Type::Filesize, _) => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationRHS(
@@ -166,7 +166,7 @@ pub fn math_result_type(
                     )
                 }
                 _ => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationLHS(
@@ -209,7 +209,7 @@ pub fn math_result_type(
                 | (Type::Duration, _)
                 | (Type::Filesize, _)
                 | (Type::List(_), _) => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationRHS(
@@ -223,7 +223,7 @@ pub fn math_result_type(
                     )
                 }
                 _ => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationLHS(
@@ -252,7 +252,7 @@ pub fn math_result_type(
                 (Type::Any, _) => (Type::Any, None),
                 (_, Type::Any) => (Type::Any, None),
                 (Type::Int | Type::Float, _) => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationRHS(
@@ -266,7 +266,7 @@ pub fn math_result_type(
                     )
                 }
                 _ => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationLHS(
@@ -302,7 +302,7 @@ pub fn math_result_type(
                 (Type::Any, _) => (Type::Any, None),
                 (_, Type::Any) => (Type::Any, None),
                 (Type::Int | Type::Float | Type::Filesize | Type::Duration, _) => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationRHS(
@@ -316,7 +316,7 @@ pub fn math_result_type(
                     )
                 }
                 _ => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationLHS(
@@ -348,7 +348,7 @@ pub fn math_result_type(
                 (Type::Any, _) => (Type::Any, None),
                 (_, Type::Any) => (Type::Any, None),
                 (Type::Int | Type::Float | Type::Filesize | Type::Duration, _) => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationRHS(
@@ -362,7 +362,7 @@ pub fn math_result_type(
                     )
                 }
                 _ => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationLHS(
@@ -390,7 +390,7 @@ pub fn math_result_type(
                     // definitions. As soon as that syntax is added this should be removed
                     (a, b) if a == b => (Type::Bool, None),
                     (Type::Bool, _) => {
-                        *op = Expression::garbage(op.span);
+                        *op = Expression::garbage(working_set, op.span);
                         (
                             Type::Any,
                             Some(ParseError::UnsupportedOperationRHS(
@@ -404,7 +404,7 @@ pub fn math_result_type(
                         )
                     }
                     _ => {
-                        *op = Expression::garbage(op.span);
+                        *op = Expression::garbage(working_set, op.span);
                         (
                             Type::Any,
                             Some(ParseError::UnsupportedOperationLHS(
@@ -441,7 +441,7 @@ pub fn math_result_type(
                 (Type::Any, _) => (Type::Bool, None),
                 (_, Type::Any) => (Type::Bool, None),
                 (Type::Int | Type::Float | Type::Duration | Type::Filesize, _) => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationRHS(
@@ -455,7 +455,7 @@ pub fn math_result_type(
                     )
                 }
                 _ => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationLHS(
@@ -491,7 +491,7 @@ pub fn math_result_type(
                 (Type::Any, _) => (Type::Bool, None),
                 (_, Type::Any) => (Type::Bool, None),
                 (Type::Int | Type::Float | Type::Duration | Type::Filesize, _) => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationRHS(
@@ -505,7 +505,7 @@ pub fn math_result_type(
                     )
                 }
                 _ => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationLHS(
@@ -541,7 +541,7 @@ pub fn math_result_type(
                 (Type::Nothing, _) => (Type::Nothing, None),
                 (_, Type::Nothing) => (Type::Nothing, None),
                 (Type::Int | Type::Float | Type::Duration | Type::Filesize, _) => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationRHS(
@@ -555,7 +555,7 @@ pub fn math_result_type(
                     )
                 }
                 _ => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationLHS(
@@ -591,7 +591,7 @@ pub fn math_result_type(
                 (Type::Nothing, _) => (Type::Nothing, None),
                 (_, Type::Nothing) => (Type::Nothing, None),
                 (Type::Int | Type::Float | Type::Duration | Type::Filesize, _) => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationRHS(
@@ -605,7 +605,7 @@ pub fn math_result_type(
                     )
                 }
                 _ => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationLHS(
@@ -638,7 +638,7 @@ pub fn math_result_type(
                 (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
 
                 (Type::String, _) => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationRHS(
@@ -652,7 +652,7 @@ pub fn math_result_type(
                     )
                 }
                 _ => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationLHS(
@@ -673,7 +673,7 @@ pub fn math_result_type(
                 (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
 
                 (Type::String, _) => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationRHS(
@@ -687,7 +687,7 @@ pub fn math_result_type(
                     )
                 }
                 _ => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationLHS(
@@ -708,7 +708,7 @@ pub fn math_result_type(
                 (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
 
                 (Type::String, _) => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationRHS(
@@ -722,7 +722,7 @@ pub fn math_result_type(
                     )
                 }
                 _ => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationLHS(
@@ -743,7 +743,7 @@ pub fn math_result_type(
                 (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
 
                 (Type::String, _) => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationRHS(
@@ -757,7 +757,7 @@ pub fn math_result_type(
                     )
                 }
                 _ => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationLHS(
@@ -781,7 +781,7 @@ pub fn math_result_type(
                 (Type::Any, _) => (Type::Bool, None),
                 (_, Type::Any) => (Type::Bool, None),
                 (Type::Int | Type::Float | Type::String, _) => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationRHS(
@@ -795,7 +795,7 @@ pub fn math_result_type(
                     )
                 }
                 _ => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationLHS(
@@ -819,7 +819,7 @@ pub fn math_result_type(
                 (Type::Any, _) => (Type::Bool, None),
                 (_, Type::Any) => (Type::Bool, None),
                 (Type::Int | Type::Float | Type::String, _) => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationRHS(
@@ -833,7 +833,7 @@ pub fn math_result_type(
                     )
                 }
                 _ => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationLHS(
@@ -855,7 +855,7 @@ pub fn math_result_type(
                 (Type::Any, _) => (Type::Any, None),
                 (_, Type::Any) => (Type::Any, None),
                 (Type::Int, _) => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationRHS(
@@ -869,7 +869,7 @@ pub fn math_result_type(
                     )
                 }
                 _ => {
-                    *op = Expression::garbage(op.span);
+                    *op = Expression::garbage(working_set, op.span);
                     (
                         Type::Any,
                         Some(ParseError::UnsupportedOperationLHS(
@@ -881,7 +881,9 @@ pub fn math_result_type(
                     )
                 }
             },
-            Operator::Assignment(Assignment::AppendAssign) => check_append(lhs, rhs, op),
+            Operator::Assignment(Assignment::AppendAssign) => {
+                check_append(working_set, lhs, rhs, op)
+            }
             Operator::Assignment(_) => match (&lhs.ty, &rhs.ty) {
                 (x, y) if x == y => (Type::Nothing, None),
                 (Type::Any, _) => (Type::Nothing, None),
@@ -894,7 +896,7 @@ pub fn math_result_type(
             },
         },
         _ => {
-            *op = Expression::garbage(op.span);
+            *op = Expression::garbage(working_set, op.span);
 
             (
                 Type::Any,
@@ -1026,6 +1028,7 @@ pub fn check_block_input_output(working_set: &StateWorkingSet, block: &Block) ->
 }
 
 fn check_append(
+    working_set: &mut StateWorkingSet,
     lhs: &Expression,
     rhs: &Expression,
     op: &mut Expression,
@@ -1050,7 +1053,7 @@ fn check_append(
         (Type::Binary, Type::Binary) => (Type::Binary, None),
         (Type::Any, _) | (_, Type::Any) => (Type::Any, None),
         (Type::Table(_) | Type::String | Type::Binary, _) => {
-            *op = Expression::garbage(op.span);
+            *op = Expression::garbage(working_set, op.span);
             (
                 Type::Any,
                 Some(ParseError::UnsupportedOperationRHS(
@@ -1064,7 +1067,7 @@ fn check_append(
             )
         }
         _ => {
-            *op = Expression::garbage(op.span);
+            *op = Expression::garbage(working_set, op.span);
             (
                 Type::Any,
                 Some(ParseError::UnsupportedOperationLHS(
diff --git a/crates/nu-protocol/src/ast/call.rs b/crates/nu-protocol/src/ast/call.rs
index 9aaf17d5db..6e8cc64a05 100644
--- a/crates/nu-protocol/src/ast/call.rs
+++ b/crates/nu-protocol/src/ast/call.rs
@@ -338,9 +338,13 @@ impl Call {
 #[cfg(test)]
 mod test {
     use super::*;
+    use crate::engine::EngineState;
 
     #[test]
     fn argument_span_named() {
+        let engine_state = EngineState::new();
+        let mut working_set = StateWorkingSet::new(&engine_state);
+
         let named = Spanned {
             item: "named".to_string(),
             span: Span::new(2, 3),
@@ -349,7 +353,7 @@ mod test {
             item: "short".to_string(),
             span: Span::new(5, 7),
         };
-        let expr = Expression::garbage(Span::new(11, 13));
+        let expr = Expression::garbage(&mut working_set, Span::new(11, 13));
 
         let arg = Argument::Named((named.clone(), None, None));
 
@@ -370,8 +374,11 @@ mod test {
 
     #[test]
     fn argument_span_positional() {
+        let engine_state = EngineState::new();
+        let mut working_set = StateWorkingSet::new(&engine_state);
+
         let span = Span::new(2, 3);
-        let expr = Expression::garbage(span);
+        let expr = Expression::garbage(&mut working_set, span);
         let arg = Argument::Positional(expr);
 
         assert_eq!(span, arg.span());
@@ -379,8 +386,11 @@ mod test {
 
     #[test]
     fn argument_span_unknown() {
+        let engine_state = EngineState::new();
+        let mut working_set = StateWorkingSet::new(&engine_state);
+
         let span = Span::new(2, 3);
-        let expr = Expression::garbage(span);
+        let expr = Expression::garbage(&mut working_set, span);
         let arg = Argument::Unknown(expr);
 
         assert_eq!(span, arg.span());
@@ -388,9 +398,12 @@ mod test {
 
     #[test]
     fn call_arguments_span() {
+        let engine_state = EngineState::new();
+        let mut working_set = StateWorkingSet::new(&engine_state);
+
         let mut call = Call::new(Span::new(0, 1));
-        call.add_positional(Expression::garbage(Span::new(2, 3)));
-        call.add_positional(Expression::garbage(Span::new(5, 7)));
+        call.add_positional(Expression::garbage(&mut working_set, Span::new(2, 3)));
+        call.add_positional(Expression::garbage(&mut working_set, Span::new(5, 7)));
 
         assert_eq!(Span::new(2, 7), call.arguments_span());
     }
diff --git a/crates/nu-protocol/src/ast/expression.rs b/crates/nu-protocol/src/ast/expression.rs
index 8fdbc8567c..832bc1f438 100644
--- a/crates/nu-protocol/src/ast/expression.rs
+++ b/crates/nu-protocol/src/ast/expression.rs
@@ -1,7 +1,7 @@
 use crate::{
     ast::{Argument, Block, Expr, ExternalArgument, ImportPattern, MatchPattern, RecordItem},
-    engine::StateWorkingSet,
-    BlockId, DeclId, Signature, Span, Type, VarId, IN_VARIABLE_ID,
+    engine::{EngineState, StateWorkingSet},
+    BlockId, DeclId, Signature, Span, SpanId, Type, VarId, IN_VARIABLE_ID,
 };
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
@@ -10,15 +10,18 @@ use std::sync::Arc;
 pub struct Expression {
     pub expr: Expr,
     pub span: Span,
+    pub span_id: SpanId,
     pub ty: Type,
     pub custom_completion: Option<DeclId>,
 }
 
 impl Expression {
-    pub fn garbage(span: Span) -> Expression {
+    pub fn garbage(working_set: &mut StateWorkingSet, span: Span) -> Expression {
+        let span_id = working_set.add_span(span);
         Expression {
             expr: Expr::Garbage,
             span,
+            span_id,
             ty: Type::Any,
             custom_completion: None,
         }
@@ -471,4 +474,49 @@ impl Expression {
             Expr::VarDecl(_) => {}
         }
     }
+
+    pub fn new(working_set: &mut StateWorkingSet, expr: Expr, span: Span, ty: Type) -> Expression {
+        let span_id = working_set.add_span(span);
+        Expression {
+            expr,
+            span,
+            span_id,
+            ty,
+            custom_completion: None,
+        }
+    }
+
+    pub fn new_existing(expr: Expr, span: Span, span_id: SpanId, ty: Type) -> Expression {
+        Expression {
+            expr,
+            span,
+            span_id,
+            ty,
+            custom_completion: None,
+        }
+    }
+
+    pub fn new_unknown(expr: Expr, span: Span, ty: Type) -> Expression {
+        Expression {
+            expr,
+            span,
+            span_id: SpanId(0),
+            ty,
+            custom_completion: None,
+        }
+    }
+
+    pub fn with_span_id(self, span_id: SpanId) -> Expression {
+        Expression {
+            expr: self.expr,
+            span: self.span,
+            span_id,
+            ty: self.ty,
+            custom_completion: self.custom_completion,
+        }
+    }
+
+    pub fn span(&self, engine_state: &EngineState) -> Span {
+        engine_state.get_span(self.span_id)
+    }
 }
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index 710ca77d4c..e81d3360ab 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -8,7 +8,7 @@ use crate::{
     },
     eval_const::create_nu_constant,
     BlockId, Category, Config, DeclId, FileId, HistoryConfig, Module, ModuleId, OverlayId,
-    ShellError, Signature, Span, Type, Value, VarId, VirtualPathId,
+    ShellError, Signature, Span, SpanId, Type, Value, VarId, VirtualPathId,
 };
 use fancy_regex::Regex;
 use lru::LruCache;
@@ -81,6 +81,7 @@ pub struct EngineState {
     // especially long, so it helps
     pub(super) blocks: Arc<Vec<Arc<Block>>>,
     pub(super) modules: Arc<Vec<Arc<Module>>>,
+    pub spans: Vec<Span>,
     usage: Usage,
     pub scope: ScopeFrame,
     pub ctrlc: Option<Arc<AtomicBool>>,
@@ -115,6 +116,9 @@ pub const IN_VARIABLE_ID: usize = 1;
 pub const ENV_VARIABLE_ID: usize = 2;
 // NOTE: If you add more to this list, make sure to update the > checks based on the last in the list
 
+// The first span is unknown span
+pub const UNKNOWN_SPAN_ID: SpanId = SpanId(0);
+
 impl EngineState {
     pub fn new() -> Self {
         Self {
@@ -132,6 +136,7 @@ impl EngineState {
             modules: Arc::new(vec![Arc::new(Module::new(
                 DEFAULT_OVERLAY_NAME.as_bytes().to_vec(),
             ))]),
+            spans: vec![Span::unknown()],
             usage: Usage::new(),
             // make sure we have some default overlay:
             scope: ScopeFrame::with_empty_overlay(
@@ -184,6 +189,7 @@ impl EngineState {
         self.files.extend(delta.files);
         self.virtual_paths.extend(delta.virtual_paths);
         self.vars.extend(delta.vars);
+        self.spans.extend(delta.spans);
         self.usage.merge_with(delta.usage);
 
         // Avoid potentially cloning the Arcs if we aren't adding anything
@@ -565,6 +571,9 @@ impl EngineState {
         self.modules.len()
     }
 
+    pub fn num_spans(&self) -> usize {
+        self.spans.len()
+    }
     pub fn print_vars(&self) {
         for var in self.vars.iter().enumerate() {
             println!("var{}: {:?}", var.0, var.1);
@@ -1019,6 +1028,25 @@ impl EngineState {
             )));
         }
     }
+
+    /// Add new span and return its ID
+    pub fn add_span(&mut self, span: Span) -> SpanId {
+        self.spans.push(span);
+        SpanId(self.num_spans() - 1)
+    }
+
+    /// Get existing span
+    pub fn get_span(&self, span_id: SpanId) -> Span {
+        *self
+            .spans
+            .get(span_id.0)
+            .expect("internal error: missing span")
+    }
+
+    /// Find ID of a span (should be avoided if possible)
+    pub fn find_span_id(&self, span: Span) -> Option<SpanId> {
+        self.spans.iter().position(|sp| sp == &span).map(SpanId)
+    }
 }
 
 impl Default for EngineState {
diff --git a/crates/nu-protocol/src/engine/state_delta.rs b/crates/nu-protocol/src/engine/state_delta.rs
index 1e283bade8..44c1b37386 100644
--- a/crates/nu-protocol/src/engine/state_delta.rs
+++ b/crates/nu-protocol/src/engine/state_delta.rs
@@ -4,7 +4,7 @@ use crate::{
         usage::Usage, CachedFile, Command, EngineState, OverlayFrame, ScopeFrame, Variable,
         VirtualPath,
     },
-    Module,
+    Module, Span,
 };
 use std::sync::Arc;
 
@@ -21,6 +21,7 @@ pub struct StateDelta {
     pub(super) decls: Vec<Box<dyn Command>>, // indexed by DeclId
     pub blocks: Vec<Arc<Block>>,             // indexed by BlockId
     pub(super) modules: Vec<Arc<Module>>,    // indexed by ModuleId
+    pub spans: Vec<Span>,                    // indexed by SpanId
     pub(super) usage: Usage,
     pub scope: Vec<ScopeFrame>,
     #[cfg(feature = "plugin")]
@@ -45,6 +46,7 @@ impl StateDelta {
             decls: vec![],
             blocks: vec![],
             modules: vec![],
+            spans: vec![],
             scope: vec![scope_frame],
             usage: Usage::new(),
             #[cfg(feature = "plugin")]
diff --git a/crates/nu-protocol/src/engine/state_working_set.rs b/crates/nu-protocol/src/engine/state_working_set.rs
index 0fe39682e2..31600b5eb9 100644
--- a/crates/nu-protocol/src/engine/state_working_set.rs
+++ b/crates/nu-protocol/src/engine/state_working_set.rs
@@ -5,7 +5,7 @@ use crate::{
         StateDelta, Variable, VirtualPath, Visibility,
     },
     BlockId, Category, Config, DeclId, FileId, Module, ModuleId, ParseError, ParseWarning, Span,
-    Type, Value, VarId, VirtualPathId,
+    SpanId, Type, Value, VarId, VirtualPathId,
 };
 use core::panic;
 use std::{
@@ -1013,6 +1013,25 @@ impl<'a> StateWorkingSet<'a> {
                 .expect("internal error: missing virtual path")
         }
     }
+
+    pub fn add_span(&mut self, span: Span) -> SpanId {
+        let num_permanent_spans = self.permanent_state.spans.len();
+        self.delta.spans.push(span);
+        SpanId(num_permanent_spans + self.delta.spans.len() - 1)
+    }
+
+    pub fn get_span(&self, span_id: SpanId) -> Span {
+        let num_permanent_spans = self.permanent_state.num_spans();
+        if span_id.0 < num_permanent_spans {
+            self.permanent_state.get_span(span_id)
+        } else {
+            *self
+                .delta
+                .spans
+                .get(span_id.0 - num_permanent_spans)
+                .expect("internal error: missing span")
+        }
+    }
 }
 
 impl<'a> miette::SourceCode for &StateWorkingSet<'a> {
diff --git a/crates/nu-protocol/src/id.rs b/crates/nu-protocol/src/id.rs
index dc9978b844..73c4f52e70 100644
--- a/crates/nu-protocol/src/id.rs
+++ b/crates/nu-protocol/src/id.rs
@@ -1,3 +1,5 @@
+use serde::{Deserialize, Serialize};
+
 pub type VarId = usize;
 pub type DeclId = usize;
 pub type BlockId = usize;
@@ -5,3 +7,5 @@ pub type ModuleId = usize;
 pub type OverlayId = usize;
 pub type FileId = usize;
 pub type VirtualPathId = usize;
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
+pub struct SpanId(pub usize); // more robust ID style used in the new parser
diff --git a/crates/nuon/src/from.rs b/crates/nuon/src/from.rs
index 862b756db7..f9230d6140 100644
--- a/crates/nuon/src/from.rs
+++ b/crates/nuon/src/from.rs
@@ -56,12 +56,12 @@ pub fn from_nuon(input: &str, span: Option<Span>) -> Result<Value, ShellError> {
     }
 
     let expr = if block.pipelines.is_empty() {
-        Expression {
-            expr: Expr::Nothing,
-            span: span.unwrap_or(Span::unknown()),
-            custom_completion: None,
-            ty: Type::Nothing,
-        }
+        Expression::new(
+            &mut working_set,
+            Expr::Nothing,
+            span.unwrap_or(Span::unknown()),
+            Type::Nothing,
+        )
     } else {
         let mut pipeline = Arc::make_mut(&mut block).pipelines.remove(0);
 
@@ -81,12 +81,12 @@ pub fn from_nuon(input: &str, span: Option<Span>) -> Result<Value, ShellError> {
         }
 
         if pipeline.elements.is_empty() {
-            Expression {
-                expr: Expr::Nothing,
-                span: span.unwrap_or(Span::unknown()),
-                custom_completion: None,
-                ty: Type::Nothing,
-            }
+            Expression::new(
+                &mut working_set,
+                Expr::Nothing,
+                span.unwrap_or(Span::unknown()),
+                Type::Nothing,
+            )
         } else {
             pipeline.elements.remove(0).expr
         }

From a9c2349ada110d21f0d7f404b2e7737bf896f5f9 Mon Sep 17 00:00:00 2001
From: Reilly Wood <26268125+rgwood@users.noreply.github.com>
Date: Tue, 4 Jun 2024 19:50:11 -0700
Subject: [PATCH 0066/1072] Refactor `explore` cursor code (#12979)

`explore` has 3 cursor-related structs that are extensively used to
track the currently shown "window" of the data being shown. I was
finding the cursor code quite difficult to follow, so this PR:
- rewrites the base `Cursor` struct from scratch, with some tests
- makes big changes to `WindowCursor`
- renames `XYCursor` to `WindowCursor2D`
- makes some of the cursor functions fallible as a start towards better
error handling
- changes lots of function names to things that I find more intuitive
- adds comments, including ASCII diagrams to explain how the cursors
work

More work could be done (I'd like to review/change more function names
in `WindowCursor` and `WindowCursor2D` and add more tests), but this is
the limit of what I can get done in a weekend. I think this part of the
code is in a better place now.

# Testing performed

I did a lot of manual testing in the record view and binary viewer,
moving around with arrow keys / page up+down / home+end.

This can definitely wait until after the release freeze, this area has
very few automated tests and it'd be good to let the changes bake a bit.
---
 crates/nu-explore/src/views/binary/mod.rs     |  28 +--
 crates/nu-explore/src/views/cursor/mod.rs     | 158 ++++++++++------
 .../src/views/cursor/window_cursor.rs         | 146 +++++++++++++++
 .../src/views/cursor/window_cursor_2d.rs      | 172 ++++++++++++++++++
 .../src/views/cursor/windowcursor.rs          | 106 -----------
 .../nu-explore/src/views/cursor/xycursor.rs   | 122 -------------
 crates/nu-explore/src/views/interactive.rs    |   2 +-
 crates/nu-explore/src/views/preview.rs        |  24 ++-
 crates/nu-explore/src/views/record/mod.rs     |  80 ++++----
 9 files changed, 504 insertions(+), 334 deletions(-)
 create mode 100644 crates/nu-explore/src/views/cursor/window_cursor.rs
 create mode 100644 crates/nu-explore/src/views/cursor/window_cursor_2d.rs
 delete mode 100644 crates/nu-explore/src/views/cursor/windowcursor.rs
 delete mode 100644 crates/nu-explore/src/views/cursor/xycursor.rs

diff --git a/crates/nu-explore/src/views/binary/mod.rs b/crates/nu-explore/src/views/binary/mod.rs
index 7e44a3985e..bc75002223 100644
--- a/crates/nu-explore/src/views/binary/mod.rs
+++ b/crates/nu-explore/src/views/binary/mod.rs
@@ -17,16 +17,20 @@ use crate::{
         ConfigMap, Frame, Transition, ViewInfo,
     },
     util::create_map,
+    views::cursor::Position,
 };
 
 use self::binary_widget::{BinarySettings, BinaryStyle, BinaryWidget};
 
-use super::{cursor::XYCursor, Layout, View, ViewConfig};
+use super::{cursor::WindowCursor2D, Layout, View, ViewConfig};
 
+/// An interactive view that displays binary data in a hex dump format.
+/// Not finished; many aspects are still WIP.
 #[derive(Debug, Clone)]
 pub struct BinaryView {
     data: Vec<u8>,
-    cursor: XYCursor,
+    // HACK: we are only using the vertical dimension of the cursor, should we use a plain old WindowCursor?
+    cursor: WindowCursor2D,
     settings: Settings,
 }
 
@@ -40,7 +44,7 @@ impl BinaryView {
     pub fn new(data: Vec<u8>) -> Self {
         Self {
             data,
-            cursor: XYCursor::default(),
+            cursor: WindowCursor2D::default(),
             settings: Settings::default(),
         }
     }
@@ -95,12 +99,13 @@ impl View for BinaryView {
 
         let count_rows =
             BinaryWidget::new(&self.data, self.settings.opts, Default::default()).count_lines();
-        self.cursor = XYCursor::new(count_rows, 0);
+        // TODO: refactor View so setup() is fallible and we don't have to panic here
+        self.cursor = WindowCursor2D::new(count_rows, 1).expect("Failed to create XYCursor");
     }
 }
 
 fn create_binary_widget(v: &BinaryView) -> BinaryWidget<'_> {
-    let start_line = v.cursor.row_starts_at();
+    let start_line = v.cursor.window_origin().row;
     let count_elements =
         BinaryWidget::new(&[], v.settings.opts, Default::default()).count_elements();
     let index = start_line * count_elements;
@@ -203,7 +208,7 @@ fn config_get_usize(config: &ConfigMap, key: &str, default: usize) -> usize {
         .unwrap_or(default)
 }
 
-fn create_report(cursor: XYCursor) -> Report {
+fn create_report(cursor: WindowCursor2D) -> Report {
     let covered_percent = report_row_position(cursor);
     let cursor = report_cursor_position(cursor);
     let mode = report_mode_name();
@@ -216,8 +221,8 @@ fn report_mode_name() -> String {
     String::from("VIEW")
 }
 
-fn report_row_position(cursor: XYCursor) -> String {
-    if cursor.row_starts_at() == 0 {
+fn report_row_position(cursor: WindowCursor2D) -> String {
+    if cursor.window_origin().row == 0 {
         return String::from("Top");
     }
 
@@ -233,10 +238,9 @@ fn report_row_position(cursor: XYCursor) -> String {
     }
 }
 
-fn report_cursor_position(cursor: XYCursor) -> String {
-    let rows_seen = cursor.row_starts_at();
-    let columns_seen = cursor.column_starts_at();
-    format!("{rows_seen},{columns_seen}")
+fn report_cursor_position(cursor: WindowCursor2D) -> String {
+    let Position { row, column } = cursor.window_origin();
+    format!("{row},{column}")
 }
 
 fn get_percentage(value: usize, max: usize) -> usize {
diff --git a/crates/nu-explore/src/views/cursor/mod.rs b/crates/nu-explore/src/views/cursor/mod.rs
index bb2aed5f18..ea08da0d36 100644
--- a/crates/nu-explore/src/views/cursor/mod.rs
+++ b/crates/nu-explore/src/views/cursor/mod.rs
@@ -1,71 +1,125 @@
-mod windowcursor;
-mod xycursor;
+mod window_cursor;
+mod window_cursor_2d;
 
-pub use windowcursor::WindowCursor;
-pub use xycursor::XYCursor;
+use anyhow::{bail, Result};
+pub use window_cursor::WindowCursor;
+pub use window_cursor_2d::{Position, WindowCursor2D};
 
+/// A 1-dimensional cursor to track a position from 0 to N
+///
+/// Say we have a cursor with size=9, at position 3:
+/// 0  1  2  3  4  5  6  7  8  9
+/// |  |  |  C  |  |  |  |  |  |
+///
+/// After moving forward by 2 steps:
+/// 0  1  2  3  4  5  6  7  8  9
+/// |  |  |  |  |  C  |  |  |  |
+///
+/// After moving backward by 6 steps (clamped to 0):
+/// 0  1  2  3  4  5  6  7  8  9
+/// C  |  |  |  |  |  |  |  |  |
 #[derive(Debug, Default, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
-pub struct Cursor {
-    index: usize,
-    limit: usize,
+struct Cursor {
+    /// The current position of the cursor
+    position: usize,
+    /// The number of distinct positions the cursor can be at
+    size: usize,
 }
 
 impl Cursor {
-    pub fn new(limit: usize) -> Self {
-        Self { index: 0, limit }
-    }
-
-    #[allow(dead_code)]
-    pub fn get_index(&self) -> usize {
-        self.index
-    }
-
-    pub fn cap(&self) -> usize {
-        self.limit - self.index
-    }
-
-    pub fn set(&mut self, i: usize) -> bool {
-        if i >= self.limit {
-            return false;
+    /// Constructor to create a new Cursor
+    pub fn new(size: usize) -> Result<Self> {
+        if size == 0 {
+            bail!("Size cannot be zero");
         }
-
-        self.index = i;
-        true
-    }
-
-    pub fn limit(&mut self, i: usize) -> bool {
-        if self.index > self.limit {
-            self.index = self.limit.saturating_sub(1);
-            return false;
-        }
-
-        self.limit = i;
-        if self.index >= self.limit {
-            self.index = self.limit.saturating_sub(1);
-        }
-
-        true
+        Ok(Cursor { position: 0, size })
     }
 
+    /// The max position the cursor can be at
     pub fn end(&self) -> usize {
-        self.limit
+        self.size - 1
     }
 
-    pub fn next(&mut self, i: usize) -> bool {
-        if self.index + i == self.limit {
-            return false;
+    /// Set the position to a specific value within the bounds [0, end]
+    pub fn set_position(&mut self, pos: usize) {
+        if pos <= self.end() {
+            self.position = pos;
+        } else {
+            // Clamp the position to end if out of bounds
+            self.position = self.end();
         }
-
-        self.index += i;
-        true
     }
 
-    pub fn prev(&mut self, i: usize) -> bool {
-        if self.index < i {
-            return false;
+    /// Set the size of the cursor. The position is clamped if it exceeds the new size
+    pub fn set_size(&mut self, size: usize) -> Result<()> {
+        if size == 0 {
+            bail!("Size cannot be zero");
         }
+        self.size = size;
+        if self.position > self.end() {
+            self.position = self.end();
+        }
+        Ok(())
+    }
 
-        self.index -= i;
-        true
+    /// Move the cursor forward by a specified number of steps
+    pub fn move_forward(&mut self, steps: usize) {
+        if self.position + steps <= self.end() {
+            self.position += steps;
+        } else {
+            self.position = self.end();
+        }
+    }
+
+    /// Move the cursor backward by a specified number of steps
+    pub fn move_backward(&mut self, steps: usize) {
+        if self.position >= steps {
+            self.position -= steps;
+        } else {
+            self.position = 0;
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_cursor_set_position() {
+        // from 0 to 9
+        let mut cursor = Cursor::new(10).unwrap();
+        cursor.set_position(5);
+        assert_eq!(cursor.position, 5);
+
+        cursor.set_position(15);
+        assert_eq!(cursor.position, 9);
+    }
+
+    #[test]
+    fn test_cursor_move_forward() {
+        // from 0 to 9
+        let mut cursor = Cursor::new(10).unwrap();
+        assert_eq!(cursor.position, 0);
+        cursor.move_forward(3);
+        assert_eq!(cursor.position, 3);
+
+        cursor.move_forward(10);
+        assert_eq!(cursor.position, 9);
+    }
+
+    #[test]
+    fn test_cursor_move_backward() {
+        // from 0 to 9
+        let mut cursor = Cursor::new(10).unwrap();
+        cursor.move_backward(3);
+        assert_eq!(cursor.position, 0);
+
+        cursor.move_forward(5);
+        assert_eq!(cursor.position, 5);
+        cursor.move_backward(3);
+        assert_eq!(cursor.position, 2);
+        cursor.move_backward(3);
+        assert_eq!(cursor.position, 0);
     }
 }
diff --git a/crates/nu-explore/src/views/cursor/window_cursor.rs b/crates/nu-explore/src/views/cursor/window_cursor.rs
new file mode 100644
index 0000000000..4feb0c802f
--- /dev/null
+++ b/crates/nu-explore/src/views/cursor/window_cursor.rs
@@ -0,0 +1,146 @@
+use std::cmp::min;
+
+use super::Cursor;
+use anyhow::{bail, Ok, Result};
+
+/// WindowCursor provides a mechanism to navigate through a 1-dimensional range
+/// using a smaller movable window within the view.
+///
+/// View: The larger context or total allowable range for navigation.
+/// Window: The smaller, focused subset of the view.
+///
+/// Example:
+/// ```plaintext
+/// 1. Initial view of size 20 with a window of size 5. The absolute cursor position starts at 0.
+///     View :
+///     |--------------------|
+///     Window :
+///     |X====|
+///
+/// 2. After advancing the window by 3, the absolute cursor position becomes 3.
+///     View :
+///     |--------------------|
+///     Window :
+///        |X====|
+///
+/// 3. After advancing the cursor inside the window by 2, the absolute cursor position becomes 5.
+///     View :
+///     |--------------------|
+///     Window :
+///        |==X==|
+/// ```
+#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+pub struct WindowCursor {
+    view: Cursor,
+    window: Cursor,
+}
+
+impl WindowCursor {
+    pub fn new(view_size: usize, window_size: usize) -> Result<Self> {
+        if window_size > view_size {
+            bail!("Window size cannot be greater than view size");
+        }
+
+        Ok(Self {
+            view: Cursor::new(view_size)?,
+            window: Cursor::new(window_size)?,
+        })
+    }
+
+    pub fn absolute_position(&self) -> usize {
+        self.window_starts_at() + self.window.position
+    }
+
+    pub fn window_relative_position(&self) -> usize {
+        self.window.position
+    }
+
+    pub fn window_starts_at(&self) -> usize {
+        self.view.position
+    }
+
+    pub fn window_size(&self) -> usize {
+        self.window.size
+    }
+
+    pub fn end(&self) -> usize {
+        self.view.end()
+    }
+
+    pub fn set_window_start_position(&mut self, i: usize) {
+        self.view.set_position(i)
+    }
+
+    pub fn move_window_to_end(&mut self) {
+        self.view.set_position(self.end() - self.window_size() + 1);
+    }
+
+    pub fn set_window_size(&mut self, new_size: usize) -> Result<()> {
+        if new_size > self.view.size {
+            // TODO: should we return an error here or clamp? the Ok is copying existing behavior
+            return Ok(());
+        }
+
+        self.window.set_size(new_size)?;
+        Ok(())
+    }
+
+    pub fn next_n(&mut self, n: usize) {
+        for _ in 0..n {
+            self.next();
+        }
+    }
+
+    pub fn next(&mut self) {
+        if self.absolute_position() >= self.end() {
+            return;
+        }
+
+        if self.window_relative_position() == self.window.end() {
+            self.view.move_forward(1);
+        } else {
+            self.window.move_forward(1);
+        }
+    }
+
+    pub fn next_window(&mut self) {
+        self.move_cursor_to_end_of_window();
+
+        // move window forward by window size, or less if that would send it off the end of the view
+        let window_end = self.window_starts_at() + self.window_size() - 1;
+        let distance_from_window_end_to_view_end = self.end() - window_end;
+        self.view.move_forward(min(
+            distance_from_window_end_to_view_end,
+            self.window_size(),
+        ));
+    }
+
+    pub fn prev_n(&mut self, n: usize) {
+        for _ in 0..n {
+            self.prev();
+        }
+    }
+
+    pub fn prev(&mut self) {
+        if self.window_relative_position() == 0 {
+            self.view.move_backward(1);
+        } else {
+            self.window.move_backward(1);
+        }
+    }
+
+    pub fn prev_window(&mut self) {
+        self.move_cursor_to_start_of_window();
+
+        // move the whole window back
+        self.view.move_backward(self.window_size());
+    }
+
+    pub fn move_cursor_to_start_of_window(&mut self) {
+        self.window.move_backward(self.window_size());
+    }
+
+    pub fn move_cursor_to_end_of_window(&mut self) {
+        self.window.move_forward(self.window_size());
+    }
+}
diff --git a/crates/nu-explore/src/views/cursor/window_cursor_2d.rs b/crates/nu-explore/src/views/cursor/window_cursor_2d.rs
new file mode 100644
index 0000000000..e22ec09ce3
--- /dev/null
+++ b/crates/nu-explore/src/views/cursor/window_cursor_2d.rs
@@ -0,0 +1,172 @@
+use super::WindowCursor;
+use anyhow::Result;
+
+/// `WindowCursor2D` manages a 2-dimensional "window" onto a grid of cells, with a cursor that can point to a specific cell.
+/// For example, consider a 3x3 grid of cells:
+///
+/// +---+---+---+
+/// | a | b | c |
+/// |---|---|---|
+/// | d | e | f |
+/// |---|---|---|
+/// | g | h | i |
+/// +---+---+---+
+///
+/// A `WindowCursor2D` can be used to track the currently visible section of this grid.
+/// For example, a 2x2 window onto this grid could initially show the top left 2x2 section:
+///
+/// +---+---+
+/// | a | b |
+/// |---|---|
+/// | d | e |
+/// +---+---+
+///
+/// Moving the window down 1 row:
+///
+/// +---+---+
+/// | d | e |
+/// |---|---|
+/// | g | h |
+/// +---+---+
+///
+/// Inside the window, the cursor can point to a specific cell.
+#[derive(Debug, Default, Clone, Copy)]
+pub struct WindowCursor2D {
+    x: WindowCursor,
+    y: WindowCursor,
+}
+
+pub struct Position {
+    pub row: usize,
+    pub column: usize,
+}
+
+impl WindowCursor2D {
+    pub fn new(count_rows: usize, count_columns: usize) -> Result<Self> {
+        Ok(Self {
+            x: WindowCursor::new(count_columns, count_columns)?,
+            y: WindowCursor::new(count_rows, count_rows)?,
+        })
+    }
+
+    pub fn set_window_size(&mut self, count_rows: usize, count_columns: usize) -> Result<()> {
+        self.x.set_window_size(count_columns)?;
+        self.y.set_window_size(count_rows)?;
+        Ok(())
+    }
+
+    pub fn set_window_start_position(&mut self, row: usize, col: usize) {
+        self.x.set_window_start_position(col);
+        self.y.set_window_start_position(row);
+    }
+
+    /// The absolute position of the cursor in the grid (0-indexed, row only)
+    pub fn row(&self) -> usize {
+        self.y.absolute_position()
+    }
+
+    /// The absolute position of the cursor in the grid (0-indexed, column only)
+    pub fn column(&self) -> usize {
+        self.x.absolute_position()
+    }
+
+    /// The absolute position of the cursor in the grid (0-indexed)
+    pub fn position(&self) -> Position {
+        Position {
+            row: self.row(),
+            column: self.column(),
+        }
+    }
+
+    pub fn row_limit(&self) -> usize {
+        self.y.end()
+    }
+
+    pub fn window_origin(&self) -> Position {
+        Position {
+            row: self.y.window_starts_at(),
+            column: self.x.window_starts_at(),
+        }
+    }
+
+    pub fn window_relative_position(&self) -> Position {
+        Position {
+            row: self.y.window_relative_position(),
+            column: self.x.window_relative_position(),
+        }
+    }
+
+    pub fn window_width_in_columns(&self) -> usize {
+        self.x.window_size()
+    }
+
+    pub fn next_row(&mut self) {
+        self.y.next_n(1)
+    }
+
+    pub fn next_row_page(&mut self) {
+        self.y.next_window()
+    }
+
+    pub fn row_move_to_end(&mut self) {
+        self.y.move_window_to_end();
+        self.y.move_cursor_to_end_of_window();
+    }
+
+    pub fn row_move_to_start(&mut self) {
+        self.y.move_cursor_to_start_of_window();
+        self.y.set_window_start_position(0);
+    }
+
+    pub fn prev_row(&mut self) {
+        self.y.prev()
+    }
+
+    pub fn prev_row_page(&mut self) {
+        self.y.prev_window()
+    }
+
+    pub fn next_column(&mut self) {
+        self.x.next()
+    }
+
+    pub fn next_column_by(&mut self, i: usize) {
+        self.x.next_n(i)
+    }
+
+    pub fn prev_column(&mut self) {
+        self.x.prev()
+    }
+
+    pub fn prev_column_by(&mut self, i: usize) {
+        self.x.prev_n(i)
+    }
+
+    pub fn next_column_i(&mut self) {
+        self.x
+            .set_window_start_position(self.x.window_starts_at() + 1)
+    }
+
+    pub fn prev_column_i(&mut self) {
+        if self.x.window_starts_at() == 0 {
+            return;
+        }
+
+        self.x
+            .set_window_start_position(self.x.window_starts_at() - 1)
+    }
+
+    pub fn next_row_i(&mut self) {
+        self.y
+            .set_window_start_position(self.y.window_starts_at() + 1)
+    }
+
+    pub fn prev_row_i(&mut self) {
+        if self.y.window_starts_at() == 0 {
+            return;
+        }
+
+        self.y
+            .set_window_start_position(self.y.window_starts_at() - 1)
+    }
+}
diff --git a/crates/nu-explore/src/views/cursor/windowcursor.rs b/crates/nu-explore/src/views/cursor/windowcursor.rs
deleted file mode 100644
index a223fb97cb..0000000000
--- a/crates/nu-explore/src/views/cursor/windowcursor.rs
+++ /dev/null
@@ -1,106 +0,0 @@
-use super::Cursor;
-
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
-pub struct WindowCursor {
-    view: Cursor,
-    window: Cursor,
-}
-
-impl WindowCursor {
-    pub fn new(limit: usize, window: usize) -> Option<Self> {
-        if window > limit {
-            return None;
-        }
-
-        Some(Self {
-            view: Cursor::new(limit),
-            window: Cursor::new(window),
-        })
-    }
-
-    pub fn index(&self) -> usize {
-        self.view.index + self.window.index
-    }
-
-    pub fn offset(&self) -> usize {
-        self.window.index
-    }
-
-    pub fn starts_at(&self) -> usize {
-        self.view.index
-    }
-
-    pub fn cap(&self) -> usize {
-        self.view.cap()
-    }
-
-    pub fn window(&self) -> usize {
-        self.window.end()
-    }
-
-    pub fn end(&self) -> usize {
-        self.view.end()
-    }
-
-    pub fn set_window_at(&mut self, i: usize) -> bool {
-        self.view.set(i)
-    }
-
-    pub fn set_window(&mut self, i: usize) -> bool {
-        if i > self.view.end() {
-            return false;
-        }
-
-        self.window.limit(i)
-    }
-
-    pub fn next(&mut self, i: usize) -> bool {
-        if i > self.cap() {
-            return false;
-        }
-
-        let mut rest = 0;
-        for y in 0..i {
-            if !self.window.next(1) {
-                rest = i - y;
-                break;
-            }
-        }
-
-        for _ in 0..rest {
-            if self.index() + 1 == self.end() {
-                return rest != i;
-            }
-
-            self.view.next(1);
-        }
-
-        true
-    }
-
-    pub fn next_window(&mut self) -> bool {
-        let end_cursor = self.window() - self.offset();
-        self.next(end_cursor);
-
-        let mut index_move = self.window();
-        if index_move + self.starts_at() >= self.end() {
-            index_move = self.end() - self.starts_at();
-        }
-
-        self.next(index_move)
-    }
-
-    pub fn prev(&mut self, i: usize) -> bool {
-        for _ in 0..i {
-            if !self.window.prev(1) {
-                self.view.prev(1);
-            }
-        }
-
-        true
-    }
-
-    pub fn prev_window(&mut self) -> bool {
-        self.prev(self.window() + self.offset())
-    }
-}
diff --git a/crates/nu-explore/src/views/cursor/xycursor.rs b/crates/nu-explore/src/views/cursor/xycursor.rs
deleted file mode 100644
index 82ca9422c8..0000000000
--- a/crates/nu-explore/src/views/cursor/xycursor.rs
+++ /dev/null
@@ -1,122 +0,0 @@
-use super::WindowCursor;
-
-#[derive(Debug, Default, Clone, Copy)]
-pub struct XYCursor {
-    x: WindowCursor,
-    y: WindowCursor,
-}
-
-impl XYCursor {
-    pub fn new(count_rows: usize, count_columns: usize) -> Self {
-        Self {
-            x: WindowCursor::new(count_columns, count_columns).expect("..."),
-            y: WindowCursor::new(count_rows, count_rows).expect("..."),
-        }
-    }
-
-    pub fn set_window(&mut self, count_rows: usize, count_columns: usize) {
-        self.x.set_window(count_columns);
-        self.y.set_window(count_rows);
-    }
-
-    pub fn set_position(&mut self, row: usize, col: usize) {
-        self.x.set_window_at(col);
-        self.y.set_window_at(row);
-    }
-
-    pub fn row(&self) -> usize {
-        self.y.index()
-    }
-
-    pub fn column(&self) -> usize {
-        self.x.index()
-    }
-
-    pub fn row_limit(&self) -> usize {
-        self.y.end()
-    }
-
-    pub fn row_starts_at(&self) -> usize {
-        self.y.starts_at()
-    }
-
-    pub fn column_starts_at(&self) -> usize {
-        self.x.starts_at()
-    }
-
-    pub fn row_window(&self) -> usize {
-        self.y.offset()
-    }
-
-    pub fn column_window(&self) -> usize {
-        self.x.offset()
-    }
-
-    pub fn column_window_size(&self) -> usize {
-        self.x.window()
-    }
-
-    pub fn next_row(&mut self) -> bool {
-        self.y.next(1)
-    }
-
-    pub fn next_row_page(&mut self) -> bool {
-        self.y.next_window()
-    }
-
-    pub fn row_move_to_end(&mut self) -> bool {
-        self.y.next(self.y.cap())
-    }
-
-    pub fn row_move_to_start(&mut self) -> bool {
-        self.y.prev(self.y.index())
-    }
-
-    pub fn prev_row(&mut self) -> bool {
-        self.y.prev(1)
-    }
-
-    pub fn prev_row_page(&mut self) -> bool {
-        self.y.prev_window()
-    }
-
-    pub fn next_column(&mut self) -> bool {
-        self.x.next(1)
-    }
-
-    pub fn next_column_by(&mut self, i: usize) -> bool {
-        self.x.next(i)
-    }
-
-    pub fn prev_column(&mut self) -> bool {
-        self.x.prev(1)
-    }
-
-    pub fn prev_column_by(&mut self, i: usize) -> bool {
-        self.x.prev(i)
-    }
-
-    pub fn next_column_i(&mut self) -> bool {
-        self.x.set_window_at(self.x.starts_at() + 1)
-    }
-
-    pub fn prev_column_i(&mut self) -> bool {
-        if self.x.starts_at() == 0 {
-            return false;
-        }
-
-        self.x.set_window_at(self.x.starts_at() - 1)
-    }
-
-    pub fn next_row_i(&mut self) -> bool {
-        self.y.set_window_at(self.y.starts_at() + 1)
-    }
-
-    pub fn prev_row_i(&mut self) -> bool {
-        if self.y.starts_at() == 0 {
-            return false;
-        }
-
-        self.y.set_window_at(self.y.starts_at() - 1)
-    }
-}
diff --git a/crates/nu-explore/src/views/interactive.rs b/crates/nu-explore/src/views/interactive.rs
index 3e9de30676..d95a78f85e 100644
--- a/crates/nu-explore/src/views/interactive.rs
+++ b/crates/nu-explore/src/views/interactive.rs
@@ -160,7 +160,7 @@ impl View for InteractiveView<'_> {
                 .as_mut()
                 .expect("we know that we have a table cause of a flag");
 
-            let was_at_the_top = table.get_current_position().0 == 0;
+            let was_at_the_top = table.get_cursor_position().row == 0;
 
             if was_at_the_top && matches!(key.code, KeyCode::Up | KeyCode::PageUp) {
                 self.view_mode = false;
diff --git a/crates/nu-explore/src/views/preview.rs b/crates/nu-explore/src/views/preview.rs
index 360cfbd226..de4d710113 100644
--- a/crates/nu-explore/src/views/preview.rs
+++ b/crates/nu-explore/src/views/preview.rs
@@ -1,4 +1,6 @@
-use super::{colored_text_widget::ColoredTextWidget, cursor::XYCursor, Layout, View, ViewConfig};
+use super::{
+    colored_text_widget::ColoredTextWidget, cursor::WindowCursor2D, Layout, View, ViewConfig,
+};
 use crate::{
     nu_common::{NuSpan, NuText},
     pager::{report::Report, Frame, Transition, ViewInfo},
@@ -17,7 +19,7 @@ use std::cmp::max;
 pub struct Preview {
     underlying_value: Option<Value>,
     lines: Vec<String>,
-    cursor: XYCursor,
+    cursor: WindowCursor2D,
 }
 
 impl Preview {
@@ -26,8 +28,9 @@ impl Preview {
             .lines()
             .map(|line| line.replace('\t', "    ")) // tui: doesn't support TAB
             .collect();
-        let cursor = XYCursor::new(lines.len(), usize::MAX);
 
+        // TODO: refactor so this is fallible and returns a Result instead of panicking
+        let cursor = WindowCursor2D::new(lines.len(), usize::MAX).expect("Failed to create cursor");
         Self {
             lines,
             cursor,
@@ -38,10 +41,11 @@ impl Preview {
 
 impl View for Preview {
     fn draw(&mut self, f: &mut Frame, area: Rect, _: ViewConfig<'_>, layout: &mut Layout) {
-        self.cursor
-            .set_window(area.height as usize, area.width as usize);
+        let _ = self
+            .cursor
+            .set_window_size(area.height as usize, area.width as usize);
 
-        let lines = &self.lines[self.cursor.row_starts_at()..];
+        let lines = &self.lines[self.cursor.window_origin().row..];
         for (i, line) in lines.iter().enumerate().take(area.height as usize) {
             let text_widget = ColoredTextWidget::new(line, self.cursor.column());
             let plain_text = text_widget.get_plain_text(area.width as usize);
@@ -65,13 +69,13 @@ impl View for Preview {
         match key.code {
             KeyCode::Left => {
                 self.cursor
-                    .prev_column_by(max(1, self.cursor.column_window_size() / 2));
+                    .prev_column_by(max(1, self.cursor.window_width_in_columns() / 2));
 
                 Some(Transition::Ok)
             }
             KeyCode::Right => {
                 self.cursor
-                    .next_column_by(max(1, self.cursor.column_window_size() / 2));
+                    .next_column_by(max(1, self.cursor.window_width_in_columns() / 2));
 
                 Some(Transition::Ok)
             }
@@ -128,7 +132,7 @@ impl View for Preview {
         //
         // todo: improve somehow?
 
-        self.cursor.set_position(row, 0);
+        self.cursor.set_window_start_position(row, 0);
         true
     }
 
@@ -152,7 +156,7 @@ fn set_status_end(view: &Preview, info: &mut ViewInfo) {
 }
 
 fn set_status_top(view: &Preview, info: &mut ViewInfo) {
-    if view.cursor.row_starts_at() == 0 {
+    if view.cursor.window_origin().row == 0 {
         info.status = Some(Report::info("TOP"));
     } else {
         info.status = Some(Report::default());
diff --git a/crates/nu-explore/src/views/record/mod.rs b/crates/nu-explore/src/views/record/mod.rs
index 5bd74c2329..b3cd93cfd3 100644
--- a/crates/nu-explore/src/views/record/mod.rs
+++ b/crates/nu-explore/src/views/record/mod.rs
@@ -2,7 +2,7 @@ mod table_widget;
 
 use self::table_widget::{TableStyle, TableWidget, TableWidgetState};
 use super::{
-    cursor::XYCursor,
+    cursor::{Position, WindowCursor2D},
     util::{make_styled_string, nu_style_to_tui},
     Layout, View, ViewConfig,
 };
@@ -133,22 +133,22 @@ impl<'a> RecordView<'a> {
         layer.reset_cursor();
     }
 
-    pub fn get_current_position(&self) -> (usize, usize) {
+    /// Get the current position of the cursor in the table as a whole
+    pub fn get_cursor_position(&self) -> Position {
         let layer = self.get_layer_last();
-        (layer.cursor.row(), layer.cursor.column())
+        layer.cursor.position()
     }
 
-    pub fn get_current_window(&self) -> (usize, usize) {
+    /// Get the current position of the cursor in the window being shown
+    pub fn get_cursor_position_in_window(&self) -> Position {
         let layer = self.get_layer_last();
-        (layer.cursor.row_window(), layer.cursor.column_window())
+        layer.cursor.window_relative_position()
     }
 
-    pub fn get_current_offset(&self) -> (usize, usize) {
+    /// Get the origin of the window being shown. (0,0), top left corner.
+    pub fn get_window_origin(&self) -> Position {
         let layer = self.get_layer_last();
-        (
-            layer.cursor.row_starts_at(),
-            layer.cursor.column_starts_at(),
-        )
+        layer.cursor.window_origin()
     }
 
     pub fn set_cursor_mode(&mut self) {
@@ -160,7 +160,7 @@ impl<'a> RecordView<'a> {
     }
 
     pub fn get_current_value(&self) -> Value {
-        let (row, column) = self.get_current_position();
+        let Position { row, column } = self.get_cursor_position();
         let layer = self.get_layer_last();
 
         let (row, column) = match layer.orientation {
@@ -175,15 +175,17 @@ impl<'a> RecordView<'a> {
         }
     }
 
-    fn create_tablew(&'a self, cfg: ViewConfig<'a>) -> TableWidget<'a> {
+    /// Create a table widget.
+    /// WARNING: this is currently really slow on large data sets.
+    /// It creates a string representation of every cell in the table and looks at every row for lscolorize.
+    fn create_table_widget(&'a self, cfg: ViewConfig<'a>) -> TableWidget<'a> {
         let layer = self.get_layer_last();
         let mut data = convert_records_to_string(&layer.records, cfg.nu_config, cfg.style_computer);
-
         lscolorize(&layer.columns, &mut data, cfg.lscolors);
 
         let headers = layer.columns.as_ref();
         let style_computer = cfg.style_computer;
-        let (row, column) = self.get_current_offset();
+        let Position { row, column } = self.get_window_origin();
 
         TableWidget::new(
             headers,
@@ -199,11 +201,17 @@ impl<'a> RecordView<'a> {
     fn update_cursors(&mut self, rows: usize, columns: usize) {
         match self.get_layer_last().orientation {
             Orientation::Top => {
-                self.get_layer_last_mut().cursor.set_window(rows, columns);
+                let _ = self
+                    .get_layer_last_mut()
+                    .cursor
+                    .set_window_size(rows, columns);
             }
 
             Orientation::Left => {
-                self.get_layer_last_mut().cursor.set_window(rows, columns);
+                let _ = self
+                    .get_layer_last_mut()
+                    .cursor
+                    .set_window_size(rows, columns);
             }
         }
     }
@@ -226,7 +234,10 @@ impl<'a> RecordView<'a> {
 impl View for RecordView<'_> {
     fn draw(&mut self, f: &mut Frame, area: Rect, cfg: ViewConfig<'_>, layout: &mut Layout) {
         let mut table_layout = TableWidgetState::default();
-        let table = self.create_tablew(cfg);
+        // TODO: creating the table widget is O(N) where N is the number of cells in the grid.
+        // Way too slow to do on every draw call!
+        // To make explore work for larger data sets, this needs to be improved.
+        let table = self.create_table_widget(cfg);
         f.render_stateful_widget(table, area, &mut table_layout);
 
         *layout = table_layout.layout;
@@ -234,7 +245,7 @@ impl View for RecordView<'_> {
         self.update_cursors(table_layout.count_rows, table_layout.count_columns);
 
         if self.mode == UIMode::Cursor {
-            let (row, column) = self.get_current_window();
+            let Position { row, column } = self.get_cursor_position_in_window();
             let info = get_element_info(
                 layout,
                 row,
@@ -308,7 +319,9 @@ impl View for RecordView<'_> {
 
             for (column, _) in cells.iter().enumerate() {
                 if i == pos {
-                    self.get_layer_last_mut().cursor.set_position(row, column);
+                    self.get_layer_last_mut()
+                        .cursor
+                        .set_window_start_position(row, column);
                     return true;
                 }
 
@@ -374,7 +387,7 @@ pub struct RecordLayer<'a> {
     orientation: Orientation,
     name: Option<String>,
     was_transposed: bool,
-    cursor: XYCursor,
+    cursor: WindowCursor2D,
 }
 
 impl<'a> RecordLayer<'a> {
@@ -384,7 +397,10 @@ impl<'a> RecordLayer<'a> {
     ) -> Self {
         let columns = columns.into();
         let records = records.into();
-        let cursor = XYCursor::new(records.len(), columns.len());
+
+        // TODO: refactor so this is fallible and returns a Result instead of panicking
+        let cursor =
+            WindowCursor2D::new(records.len(), columns.len()).expect("Failed to create cursor");
 
         Self {
             columns,
@@ -420,7 +436,9 @@ impl<'a> RecordLayer<'a> {
     }
 
     fn reset_cursor(&mut self) {
-        self.cursor = XYCursor::new(self.count_rows(), self.count_columns());
+        // TODO: refactor so this is fallible and returns a Result instead of panicking
+        self.cursor = WindowCursor2D::new(self.count_rows(), self.count_columns())
+            .expect("Failed to create cursor");
     }
 }
 
@@ -634,7 +652,9 @@ fn tail_data(state: &mut RecordView<'_>, page_size: usize) {
     let layer = state.get_layer_last_mut();
     let count_rows = layer.records.len();
     if count_rows > page_size {
-        layer.cursor.set_position(count_rows - page_size, 0);
+        layer
+            .cursor
+            .set_window_start_position(count_rows - page_size, 0);
     }
 }
 
@@ -731,20 +751,18 @@ fn build_table_as_record(v: &RecordView) -> Value {
     Value::record(record, NuSpan::unknown())
 }
 
-fn report_cursor_position(mode: UIMode, cursor: XYCursor) -> String {
+fn report_cursor_position(mode: UIMode, cursor: WindowCursor2D) -> String {
     if mode == UIMode::Cursor {
-        let row = cursor.row();
-        let column = cursor.column();
+        let Position { row, column } = cursor.position();
         format!("{row},{column}")
     } else {
-        let rows_seen = cursor.row_starts_at();
-        let columns_seen = cursor.column_starts_at();
-        format!("{rows_seen},{columns_seen}")
+        let Position { row, column } = cursor.window_origin();
+        format!("{row},{column}")
     }
 }
 
-fn report_row_position(cursor: XYCursor) -> String {
-    if cursor.row_starts_at() == 0 {
+fn report_row_position(cursor: WindowCursor2D) -> String {
+    if cursor.window_origin().row == 0 {
         String::from("Top")
     } else {
         let percent_rows = get_percentage(cursor.row(), cursor.row_limit());

From a3bc85bb5fba0d29f5243e5451cd8088b84af0c8 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Wed, 5 Jun 2024 01:42:55 -0700
Subject: [PATCH 0067/1072] Add options for filtering the log output from `nu`
 (#13044)

# Description

Add `--log-include` and `--log-exclude` options to filter the log output
from `nu` to specific module prefixes. For example,

```nushell
nu --log-level trace --log-exclude '[nu_parser]'
```

This avoids having to scan through parser spam when trying to debug
something else at `TRACE` level, and should make it feel much more
reasonable to add logging, particularly at `TRACE` level, to various
places in the codebase. It can also be used to debug non-Nushell crates
that support the Rust logging infrastructure, as many do.

You can also include a specific module instead of excluding the parser
log output:

```nushell
nu --log-level trace --log-include '[nu_plugin]'
```

Pinging #13041 for reference, but hesitant to outright say that this
closes that. I think it address that concern though. I've also struggled
with debugging plugin stuff with all of the other output, so this will
really help me there.

# User-Facing Changes

- New `nu` option: `--log-include`
- New `nu` option: `--log-exclude`
---
 src/command.rs | 76 +++++++++++++++++++++++++++++++++-----------------
 src/logger.rs  | 21 +++++++++++++-
 src/main.rs    | 25 +++++++++++++++--
 3 files changed, 93 insertions(+), 29 deletions(-)

diff --git a/src/command.rs b/src/command.rs
index 7fcf2da1b3..15da0e3e47 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -33,9 +33,9 @@ pub(crate) fn gather_commandline_args() -> (Vec<String>, String, Vec<String>) {
             | "--env-config" | "-I" | "ide-ast" => args.next().map(|a| escape_quote_string(&a)),
             #[cfg(feature = "plugin")]
             "--plugin-config" => args.next().map(|a| escape_quote_string(&a)),
-            "--log-level" | "--log-target" | "--testbin" | "--threads" | "-t"
-            | "--include-path" | "--lsp" | "--ide-goto-def" | "--ide-hover" | "--ide-complete"
-            | "--ide-check" => args.next(),
+            "--log-level" | "--log-target" | "--log-include" | "--log-exclude" | "--testbin"
+            | "--threads" | "-t" | "--include-path" | "--lsp" | "--ide-goto-def"
+            | "--ide-hover" | "--ide-complete" | "--ide-check" => args.next(),
             #[cfg(feature = "plugin")]
             "--plugins" => args.next(),
             _ => None,
@@ -97,6 +97,8 @@ pub(crate) fn parse_commandline_args(
             let env_file = call.get_flag_expr("env-config");
             let log_level = call.get_flag_expr("log-level");
             let log_target = call.get_flag_expr("log-target");
+            let log_include = call.get_flag_expr("log-include");
+            let log_exclude = call.get_flag_expr("log-exclude");
             let execute = call.get_flag_expr("execute");
             let table_mode: Option<Value> =
                 call.get_flag(engine_state, &mut stack, "table-mode")?;
@@ -155,39 +157,47 @@ pub(crate) fn parse_commandline_args(
                 }
             }
 
+            fn extract_list(
+                expression: Option<&Expression>,
+                type_name: &str,
+                mut extract_item: impl FnMut(&Expression) -> Option<String>,
+            ) -> Result<Option<Vec<Spanned<String>>>, ShellError> {
+                expression
+                    .map(|expr| match &expr.expr {
+                        Expr::List(list) => list
+                            .iter()
+                            .map(|item| {
+                                extract_item(item.expr())
+                                    .map(|s| s.into_spanned(item.expr().span))
+                                    .ok_or_else(|| ShellError::TypeMismatch {
+                                        err_message: type_name.into(),
+                                        span: item.expr().span,
+                                    })
+                            })
+                            .collect::<Result<Vec<Spanned<String>>, _>>(),
+                        _ => Err(ShellError::TypeMismatch {
+                            err_message: format!("list<{type_name}>"),
+                            span: expr.span,
+                        }),
+                    })
+                    .transpose()
+            }
+
             let commands = extract_contents(commands)?;
             let testbin = extract_contents(testbin)?;
             #[cfg(feature = "plugin")]
             let plugin_file = extract_path(plugin_file)?;
+            #[cfg(feature = "plugin")]
+            let plugins = extract_list(plugins, "path", |expr| expr.as_filepath().map(|t| t.0))?;
             let config_file = extract_path(config_file)?;
             let env_file = extract_path(env_file)?;
             let log_level = extract_contents(log_level)?;
             let log_target = extract_contents(log_target)?;
+            let log_include = extract_list(log_include, "string", |expr| expr.as_string())?;
+            let log_exclude = extract_list(log_exclude, "string", |expr| expr.as_string())?;
             let execute = extract_contents(execute)?;
             let include_path = extract_contents(include_path)?;
 
-            #[cfg(feature = "plugin")]
-            let plugins = plugins
-                .map(|expr| match &expr.expr {
-                    Expr::List(list) => list
-                        .iter()
-                        .map(|item| {
-                            item.expr()
-                                .as_filepath()
-                                .map(|(s, _)| s.into_spanned(item.expr().span))
-                                .ok_or_else(|| ShellError::TypeMismatch {
-                                    err_message: "path".into(),
-                                    span: item.expr().span,
-                                })
-                        })
-                        .collect::<Result<Vec<Spanned<String>>, _>>(),
-                    _ => Err(ShellError::TypeMismatch {
-                        err_message: "list<path>".into(),
-                        span: expr.span,
-                    }),
-                })
-                .transpose()?;
-
             let help = call.has_flag(engine_state, &mut stack, "help")?;
 
             if help {
@@ -224,6 +234,8 @@ pub(crate) fn parse_commandline_args(
                 env_file,
                 log_level,
                 log_target,
+                log_include,
+                log_exclude,
                 execute,
                 include_path,
                 ide_goto_def,
@@ -262,6 +274,8 @@ pub(crate) struct NushellCliArgs {
     pub(crate) env_file: Option<Spanned<String>>,
     pub(crate) log_level: Option<Spanned<String>>,
     pub(crate) log_target: Option<Spanned<String>>,
+    pub(crate) log_include: Option<Vec<Spanned<String>>>,
+    pub(crate) log_exclude: Option<Vec<Spanned<String>>>,
     pub(crate) execute: Option<Spanned<String>>,
     pub(crate) table_mode: Option<Value>,
     pub(crate) no_newline: Option<Spanned<String>>,
@@ -403,6 +417,18 @@ impl Command for Nu {
                 "set the target for the log to output. stdout, stderr(default), mixed or file",
                 None,
             )
+            .named(
+                "log-include",
+                SyntaxShape::List(Box::new(SyntaxShape::String)),
+                "set the Rust module prefixes to include in the log output. default: [nu]",
+                None,
+            )
+            .named(
+                "log-exclude",
+                SyntaxShape::List(Box::new(SyntaxShape::String)),
+                "set the Rust module prefixes to exclude from the log output",
+                None,
+            )
             .switch(
                 "stdin",
                 "redirect standard input to a command (with `-c`) or a script file",
diff --git a/src/logger.rs b/src/logger.rs
index 9a1c040503..dd66b17444 100644
--- a/src/logger.rs
+++ b/src/logger.rs
@@ -66,9 +66,15 @@ fn set_write_logger(level: LevelFilter, config: Config, path: &Path) -> Result<(
     }
 }
 
+pub struct Filters {
+    pub include: Option<Vec<String>>,
+    pub exclude: Option<Vec<String>>,
+}
+
 pub fn configure(
     level: &str,
     target: &str,
+    filters: Filters,
     builder: &mut ConfigBuilder,
 ) -> (LevelFilter, LogTarget) {
     let level = match Level::from_str(level) {
@@ -77,7 +83,20 @@ pub fn configure(
     };
 
     // Add allowed module filter
-    builder.add_filter_allow_str("nu");
+    if let Some(include) = filters.include {
+        for filter in include {
+            builder.add_filter_allow(filter);
+        }
+    } else {
+        builder.add_filter_allow_str("nu");
+    }
+
+    // Add ignored module filter
+    if let Some(exclude) = filters.exclude {
+        for filter in exclude {
+            builder.add_filter_ignore(filter);
+        }
+    }
 
     // Set level padding
     builder.set_level_padding(LevelPadding::Right);
diff --git a/src/main.rs b/src/main.rs
index bc48a9f7de..f9fdff3ccf 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -25,7 +25,8 @@ use nu_cmd_base::util::get_init_cwd;
 use nu_lsp::LanguageServer;
 use nu_path::canonicalize_with;
 use nu_protocol::{
-    engine::EngineState, report_error_new, ByteStream, PipelineData, ShellError, Span, Value,
+    engine::EngineState, report_error_new, ByteStream, PipelineData, ShellError, Span, Spanned,
+    Value,
 };
 use nu_std::load_standard_library;
 use nu_utils::utils::perf;
@@ -155,7 +156,10 @@ fn main() -> Result<()> {
 
     let (args_to_nushell, script_name, args_to_script) = gather_commandline_args();
     let parsed_nu_cli_args = parse_commandline_args(&args_to_nushell.join(" "), &mut engine_state)
-        .unwrap_or_else(|_| std::process::exit(1));
+        .unwrap_or_else(|err| {
+            report_error_new(&engine_state, &err);
+            std::process::exit(1)
+        });
 
     // keep this condition in sync with the branches at the end
     engine_state.is_interactive = parsed_nu_cli_args.interactive_shell.is_some()
@@ -168,6 +172,8 @@ fn main() -> Result<()> {
     engine_state.history_enabled = parsed_nu_cli_args.no_history.is_none();
 
     let use_color = engine_state.get_config().use_ansi_coloring;
+
+    // Set up logger
     if let Some(level) = parsed_nu_cli_args
         .log_level
         .as_ref()
@@ -187,7 +193,20 @@ fn main() -> Result<()> {
             .map(|target| target.item.clone())
             .unwrap_or_else(|| "stderr".to_string());
 
-        logger(|builder| configure(&level, &target, builder))?;
+        let make_filters = |filters: &Option<Vec<Spanned<String>>>| {
+            filters.as_ref().map(|filters| {
+                filters
+                    .iter()
+                    .map(|filter| filter.item.clone())
+                    .collect::<Vec<String>>()
+            })
+        };
+        let filters = logger::Filters {
+            include: make_filters(&parsed_nu_cli_args.log_include),
+            exclude: make_filters(&parsed_nu_cli_args.log_exclude),
+        };
+
+        logger(|builder| configure(&level, &target, filters, builder))?;
         // info!("start logging {}:{}:{}", file!(), line!(), column!());
         perf(
             "start logging",

From 78fdb2f4d12deb0b73bcbbc1ff513bbbcd24df09 Mon Sep 17 00:00:00 2001
From: Michael Angerman <1809991+stormasm@users.noreply.github.com>
Date: Wed, 5 Jun 2024 08:54:38 -0700
Subject: [PATCH 0068/1072] reduce log tracing in nu-cli (#13067)

This one trace message creates thousands of lines of trace messages that
is probably
better suited to using on an *as needed* basis rather than everyone
having to wade
through it...

For now, I just commented it out but eventually this line of code should
be removed
and used simply for the time when someone needs to see it...
---
 crates/nu-cli/src/reedline_config.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/crates/nu-cli/src/reedline_config.rs b/crates/nu-cli/src/reedline_config.rs
index 3f920a00cb..9c08265dfa 100644
--- a/crates/nu-cli/src/reedline_config.rs
+++ b/crates/nu-cli/src/reedline_config.rs
@@ -1,6 +1,5 @@
 use crate::{menus::NuMenuCompleter, NuHelpCompleter};
 use crossterm::event::{KeyCode, KeyModifiers};
-use log::trace;
 use nu_ansi_term::Style;
 use nu_color_config::{color_record_to_nustyle, lookup_ansi_color_style};
 use nu_engine::eval_block;
@@ -80,7 +79,7 @@ pub(crate) fn add_menus(
     stack: &Stack,
     config: &Config,
 ) -> Result<Reedline, ShellError> {
-    trace!("add_menus: config: {:#?}", &config);
+    //log::trace!("add_menus: config: {:#?}", &config);
     line_editor = line_editor.clear_menus();
 
     for menu in &config.menus {

From 36ad7f15c42b59f421eeb5fc6598d425c1b70c84 Mon Sep 17 00:00:00 2001
From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Wed, 5 Jun 2024 14:35:31 -0400
Subject: [PATCH 0069/1072] `cd`/`def --env` examples (#13068)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

Per a Discord question
(https://discord.com/channels/601130461678272522/1244293194603167845/1247794228696711198),
this adds examples to the `help` for both:

* `cd`
* `def`

to demonstrate that `def --env` is required when changing directories in
a custom command.

Since the existing examples for `def` were a bit more complex (and had
output) but the `cd` ones were more simplified, I did use slightly
different examples in each. Either or both could be tweaked if desired.

# User-Facing Changes

Command `help` examples

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

N/A

---------

Co-authored-by: Jakub Žádník <kubouch@gmail.com>
---
 crates/nu-cmd-lang/src/core_commands/def.rs | 5 +++++
 crates/nu-command/src/filesystem/cd.rs      | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/crates/nu-cmd-lang/src/core_commands/def.rs b/crates/nu-cmd-lang/src/core_commands/def.rs
index eb1124da19..e4a169ffcc 100644
--- a/crates/nu-cmd-lang/src/core_commands/def.rs
+++ b/crates/nu-cmd-lang/src/core_commands/def.rs
@@ -60,6 +60,11 @@ impl Command for Def {
                 example: r#"def --env foo [] { $env.BAR = "BAZ" }; foo; $env.BAR"#,
                 result: Some(Value::test_string("BAZ")),
             },
+            Example {
+                description: "cd affects the environment, so '--env' is required to change directory from within a command",
+                example: r#"def --env gohome [] { cd ~ }; gohome; $env.PWD == ('~' | path expand)"#,
+                result: Some(Value::test_string("true")),
+            },
             Example {
                 description: "Define a custom wrapper for an external command",
                 example: r#"def --wrapped my-echo [...rest] { echo $rest }; my-echo spam"#,
diff --git a/crates/nu-command/src/filesystem/cd.rs b/crates/nu-command/src/filesystem/cd.rs
index 57fe1c17e3..4e09d900d2 100644
--- a/crates/nu-command/src/filesystem/cd.rs
+++ b/crates/nu-command/src/filesystem/cd.rs
@@ -135,6 +135,11 @@ impl Command for Cd {
                 example: r#"cd -"#,
                 result: None,
             },
+            Example {
+                description: "Changing directory with a custom command requires 'def --env'",
+                example: r#"def --env gohome [] { cd ~ }"#,
+                result: None,
+            },
         ]
     }
 }

From 96493b26d914d5ffce3d8a41d406abf417af5e05 Mon Sep 17 00:00:00 2001
From: Embers-of-the-Fire <stellarishs@163.com>
Date: Thu, 6 Jun 2024 03:21:52 +0800
Subject: [PATCH 0070/1072] Make string related commands parse-time evaluatable
 (#13032)

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

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

Related meta-issue: #10239.

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

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

This PR will modify some `str`-related commands so that they can be
evaluated at parse time.

See the following list for those implemented by this pr.

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

Available now:
- `str` subcommands
  - `trim`
  - `contains`
  - `distance`
  - `ends-with`
  - `expand`
  - `index-of`
  - `join`
  - `replace`
  - `reverse`
  - `starts-with`
  - `stats`
  - `substring`
  - `capitalize`
  - `downcase`
  - `upcase`
- `split` subcommands
  - `chars`
  - `column`
  - `list`
  - `row`
  - `words`
- `format` subcommands
  - `date`
  - `duration`
  - `filesize`
- string related commands
  - `parse`
  - `detect columns`
  - `encode` & `decode`

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

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

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

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

Unresolved questions:
- [ ] Is there any routine of testing const expressions? I haven't found
any yet.
- [ ] Is const expressions required to behave just like there non-const
version, like what rust promises?

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

Unresolved questions:
- [ ] Do const commands need special marks in the docs?
---
 crates/nu-command/src/strings/char_.rs        |   2 +-
 .../nu-command/src/strings/detect_columns.rs  |  98 +++++++++++-----
 .../src/strings/encode_decode/base64.rs       |  23 ++--
 .../src/strings/encode_decode/decode.rs       |  92 +++++++++------
 .../strings/encode_decode/decode_base64.rs    |  35 +++++-
 .../src/strings/encode_decode/encode.rs       |  88 +++++++++-----
 .../strings/encode_decode/encode_base64.rs    |  35 +++++-
 crates/nu-command/src/strings/format/date.rs  |  85 +++++++++-----
 .../nu-command/src/strings/format/duration.rs |  31 +++++
 .../nu-command/src/strings/format/filesize.rs |  31 ++++-
 crates/nu-command/src/strings/parse.rs        |  26 +++-
 crates/nu-command/src/strings/split/chars.rs  |  24 +++-
 crates/nu-command/src/strings/split/column.rs |  78 ++++++++----
 crates/nu-command/src/strings/split/list.rs   |  43 +++++--
 crates/nu-command/src/strings/split/row.rs    |  71 ++++++++---
 crates/nu-command/src/strings/split/words.rs  |  58 +++++++--
 .../src/strings/str_/case/capitalize.rs       |  20 +++-
 .../src/strings/str_/case/downcase.rs         |  20 +++-
 .../src/strings/str_/case/upcase.rs           |  20 +++-
 .../nu-command/src/strings/str_/contains.rs   |  41 +++++++
 .../nu-command/src/strings/str_/distance.rs   |  28 ++++-
 .../nu-command/src/strings/str_/ends_with.rs  |  26 ++++
 crates/nu-command/src/strings/str_/expand.rs  |  71 +++++++----
 .../nu-command/src/strings/str_/index_of.rs   |  33 +++++-
 crates/nu-command/src/strings/str_/join.rs    |  91 ++++++++------
 crates/nu-command/src/strings/str_/length.rs  |   2 +-
 crates/nu-command/src/strings/str_/replace.rs |  37 ++++++
 crates/nu-command/src/strings/str_/reverse.rs |  21 ++++
 .../src/strings/str_/starts_with.rs           |  27 +++++
 crates/nu-command/src/strings/str_/stats.rs   |  14 +++
 .../nu-command/src/strings/str_/substring.rs  |  39 +++++-
 .../nu-command/src/strings/str_/trim/trim_.rs | 111 ++++++++++++------
 crates/nu-engine/src/command_prelude.rs       |   2 +-
 33 files changed, 1101 insertions(+), 322 deletions(-)

diff --git a/crates/nu-command/src/strings/char_.rs b/crates/nu-command/src/strings/char_.rs
index 7d8d152b56..dd7b5cf39b 100644
--- a/crates/nu-command/src/strings/char_.rs
+++ b/crates/nu-command/src/strings/char_.rs
@@ -1,6 +1,6 @@
 use indexmap::{indexmap, IndexMap};
 use nu_engine::command_prelude::*;
-use nu_protocol::engine::StateWorkingSet;
+
 use once_cell::sync::Lazy;
 use std::sync::{atomic::AtomicBool, Arc};
 
diff --git a/crates/nu-command/src/strings/detect_columns.rs b/crates/nu-command/src/strings/detect_columns.rs
index 74bcf07820..62a2d8bbcc 100644
--- a/crates/nu-command/src/strings/detect_columns.rs
+++ b/crates/nu-command/src/strings/detect_columns.rs
@@ -45,20 +45,6 @@ impl Command for DetectColumns {
         vec!["split", "tabular"]
     }
 
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        if call.has_flag(engine_state, stack, "guess")? {
-            guess_width(engine_state, stack, call, input)
-        } else {
-            detect_columns(engine_state, stack, call, input)
-        }
-    }
-
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
@@ -109,33 +95,87 @@ none             8150224         4   8150220   1% /mnt/c' | detect columns --gue
             },
         ]
     }
+
+    fn is_const(&self) -> bool {
+        true
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let num_rows_to_skip: Option<usize> = call.get_flag(engine_state, stack, "skip")?;
+        let noheader = call.has_flag(engine_state, stack, "no-headers")?;
+        let range: Option<Range> = call.get_flag(engine_state, stack, "combine-columns")?;
+
+        let args = Arguments {
+            noheader,
+            num_rows_to_skip,
+            range,
+        };
+
+        if call.has_flag(engine_state, stack, "guess")? {
+            guess_width(engine_state, call, input, args)
+        } else {
+            detect_columns(engine_state, call, input, args)
+        }
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let num_rows_to_skip: Option<usize> = call.get_flag_const(working_set, "skip")?;
+        let noheader = call.has_flag_const(working_set, "no-headers")?;
+        let range: Option<Range> = call.get_flag_const(working_set, "combine-columns")?;
+
+        let args = Arguments {
+            noheader,
+            num_rows_to_skip,
+            range,
+        };
+
+        if call.has_flag_const(working_set, "guess")? {
+            guess_width(working_set.permanent(), call, input, args)
+        } else {
+            detect_columns(working_set.permanent(), call, input, args)
+        }
+    }
+}
+
+struct Arguments {
+    num_rows_to_skip: Option<usize>,
+    noheader: bool,
+    range: Option<Range>,
 }
 
 fn guess_width(
     engine_state: &EngineState,
-    stack: &mut Stack,
     call: &Call,
     input: PipelineData,
+    args: Arguments,
 ) -> Result<PipelineData, ShellError> {
     use super::guess_width::GuessWidth;
     let input_span = input.span().unwrap_or(call.head);
 
     let mut input = input.collect_string("", engine_state.get_config())?;
-    let num_rows_to_skip: Option<usize> = call.get_flag(engine_state, stack, "skip")?;
-    if let Some(rows) = num_rows_to_skip {
+    if let Some(rows) = args.num_rows_to_skip {
         input = input.lines().skip(rows).map(|x| x.to_string()).join("\n");
     }
 
     let mut guess_width = GuessWidth::new_reader(Box::new(Cursor::new(input)));
-    let noheader = call.has_flag(engine_state, stack, "no-headers")?;
 
     let result = guess_width.read_all();
 
     if result.is_empty() {
         return Ok(Value::nothing(input_span).into_pipeline_data());
     }
-    let range: Option<Range> = call.get_flag(engine_state, stack, "combine-columns")?;
-    if !noheader {
+    if !args.noheader {
         let columns = result[0].clone();
         Ok(result
             .into_iter()
@@ -152,7 +192,7 @@ fn guess_width(
                 let record =
                     Record::from_raw_cols_vals(columns.clone(), values, input_span, input_span);
                 match record {
-                    Ok(r) => match &range {
+                    Ok(r) => match &args.range {
                         Some(range) => merge_record(r, range, input_span),
                         None => Value::record(r, input_span),
                     },
@@ -177,7 +217,7 @@ fn guess_width(
                 let record =
                     Record::from_raw_cols_vals(columns.clone(), values, input_span, input_span);
                 match record {
-                    Ok(r) => match &range {
+                    Ok(r) => match &args.range {
                         Some(range) => merge_record(r, range, input_span),
                         None => Value::record(r, input_span),
                     },
@@ -190,21 +230,18 @@ fn guess_width(
 
 fn detect_columns(
     engine_state: &EngineState,
-    stack: &mut Stack,
     call: &Call,
     input: PipelineData,
+    args: Arguments,
 ) -> Result<PipelineData, ShellError> {
     let name_span = call.head;
-    let num_rows_to_skip: Option<usize> = call.get_flag(engine_state, stack, "skip")?;
-    let noheader = call.has_flag(engine_state, stack, "no-headers")?;
-    let range: Option<Range> = call.get_flag(engine_state, stack, "combine-columns")?;
     let ctrlc = engine_state.ctrlc.clone();
     let config = engine_state.get_config();
     let input = input.collect_string("", config)?;
 
     let input: Vec<_> = input
         .lines()
-        .skip(num_rows_to_skip.unwrap_or_default())
+        .skip(args.num_rows_to_skip.unwrap_or_default())
         .map(|x| x.to_string())
         .collect();
 
@@ -214,13 +251,14 @@ fn detect_columns(
     if let Some(orig_headers) = headers {
         let mut headers = find_columns(&orig_headers);
 
-        if noheader {
+        if args.noheader {
             for header in headers.iter_mut().enumerate() {
                 header.1.item = format!("column{}", header.0);
             }
         }
 
-        Ok(noheader
+        Ok(args
+            .noheader
             .then_some(orig_headers)
             .into_iter()
             .chain(input)
@@ -273,7 +311,7 @@ fn detect_columns(
                     }
                 }
 
-                match &range {
+                match &args.range {
                     Some(range) => merge_record(record, range, name_span),
                     None => Value::record(record, name_span),
                 }
diff --git a/crates/nu-command/src/strings/encode_decode/base64.rs b/crates/nu-command/src/strings/encode_decode/base64.rs
index 1c257e1200..8050193212 100644
--- a/crates/nu-command/src/strings/encode_decode/base64.rs
+++ b/crates/nu-command/src/strings/encode_decode/base64.rs
@@ -7,10 +7,9 @@ use base64::{
     Engine,
 };
 use nu_cmd_base::input_handler::{operate as general_operate, CmdArgument};
-use nu_engine::CallExt;
 use nu_protocol::{
     ast::{Call, CellPath},
-    engine::{EngineState, Stack},
+    engine::EngineState,
     PipelineData, ShellError, Span, Spanned, Value,
 };
 
@@ -42,22 +41,24 @@ impl CmdArgument for Arguments {
     }
 }
 
+pub(super) struct Base64CommandArguments {
+    pub(super) character_set: Option<Spanned<String>>,
+    pub(super) action_type: ActionType,
+    pub(super) binary: bool,
+}
+
 pub fn operate(
-    action_type: ActionType,
     engine_state: &EngineState,
-    stack: &mut Stack,
     call: &Call,
     input: PipelineData,
+    cell_paths: Vec<CellPath>,
+    args: Base64CommandArguments,
 ) -> Result<PipelineData, ShellError> {
     let head = call.head;
-    let character_set: Option<Spanned<String>> =
-        call.get_flag(engine_state, stack, "character-set")?;
-    let binary = call.has_flag(engine_state, stack, "binary")?;
-    let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
     let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
 
     // Default the character set to standard if the argument is not specified.
-    let character_set = match character_set {
+    let character_set = match args.character_set {
         Some(inner_tag) => inner_tag,
         None => Spanned {
             item: "standard".to_string(),
@@ -68,9 +69,9 @@ pub fn operate(
     let args = Arguments {
         encoding_config: Base64Config {
             character_set,
-            action_type,
+            action_type: args.action_type,
         },
-        binary,
+        binary: args.binary,
         cell_paths,
     };
 
diff --git a/crates/nu-command/src/strings/encode_decode/decode.rs b/crates/nu-command/src/strings/encode_decode/decode.rs
index 9b13fad202..20385612f3 100644
--- a/crates/nu-command/src/strings/encode_decode/decode.rs
+++ b/crates/nu-command/src/strings/encode_decode/decode.rs
@@ -46,6 +46,10 @@ documentation link at https://docs.rs/encoding_rs/latest/encoding_rs/#statics"#
         ]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -53,49 +57,67 @@ documentation link at https://docs.rs/encoding_rs/latest/encoding_rs/#statics"#
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let head = call.head;
         let encoding: Option<Spanned<String>> = call.opt(engine_state, stack, 0)?;
+        run(call, input, encoding)
+    }
 
-        match input {
-            PipelineData::ByteStream(stream, ..) => {
-                let span = stream.span();
-                let bytes = stream.into_bytes()?;
-                match encoding {
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let encoding: Option<Spanned<String>> = call.opt_const(working_set, 0)?;
+        run(call, input, encoding)
+    }
+}
+
+fn run(
+    call: &Call,
+    input: PipelineData,
+    encoding: Option<Spanned<String>>,
+) -> Result<PipelineData, ShellError> {
+    let head = call.head;
+
+    match input {
+        PipelineData::ByteStream(stream, ..) => {
+            let span = stream.span();
+            let bytes = stream.into_bytes()?;
+            match encoding {
+                Some(encoding_name) => super::encoding::decode(head, encoding_name, &bytes),
+                None => super::encoding::detect_encoding_name(head, span, &bytes)
+                    .map(|encoding| encoding.decode(&bytes).0.into_owned())
+                    .map(|s| Value::string(s, head)),
+            }
+            .map(|val| val.into_pipeline_data())
+        }
+        PipelineData::Value(v, ..) => {
+            let input_span = v.span();
+            match v {
+                Value::Binary { val: bytes, .. } => match encoding {
                     Some(encoding_name) => super::encoding::decode(head, encoding_name, &bytes),
-                    None => super::encoding::detect_encoding_name(head, span, &bytes)
+                    None => super::encoding::detect_encoding_name(head, input_span, &bytes)
                         .map(|encoding| encoding.decode(&bytes).0.into_owned())
                         .map(|s| Value::string(s, head)),
                 }
-                .map(|val| val.into_pipeline_data())
+                .map(|val| val.into_pipeline_data()),
+                Value::Error { error, .. } => Err(*error),
+                _ => Err(ShellError::OnlySupportsThisInputType {
+                    exp_input_type: "binary".into(),
+                    wrong_type: v.get_type().to_string(),
+                    dst_span: head,
+                    src_span: v.span(),
+                }),
             }
-            PipelineData::Value(v, ..) => {
-                let input_span = v.span();
-                match v {
-                    Value::Binary { val: bytes, .. } => match encoding {
-                        Some(encoding_name) => super::encoding::decode(head, encoding_name, &bytes),
-                        None => super::encoding::detect_encoding_name(head, input_span, &bytes)
-                            .map(|encoding| encoding.decode(&bytes).0.into_owned())
-                            .map(|s| Value::string(s, head)),
-                    }
-                    .map(|val| val.into_pipeline_data()),
-                    Value::Error { error, .. } => Err(*error),
-                    _ => Err(ShellError::OnlySupportsThisInputType {
-                        exp_input_type: "binary".into(),
-                        wrong_type: v.get_type().to_string(),
-                        dst_span: head,
-                        src_span: v.span(),
-                    }),
-                }
-            }
-            // This should be more precise, but due to difficulties in getting spans
-            // from PipelineData::ListData, this is as it is.
-            _ => Err(ShellError::UnsupportedInput {
-                msg: "non-binary input".into(),
-                input: "value originates from here".into(),
-                msg_span: head,
-                input_span: input.span().unwrap_or(head),
-            }),
         }
+        // This should be more precise, but due to difficulties in getting spans
+        // from PipelineData::ListData, this is as it is.
+        _ => Err(ShellError::UnsupportedInput {
+            msg: "non-binary input".into(),
+            input: "value originates from here".into(),
+            msg_span: head,
+            input_span: input.span().unwrap_or(head),
+        }),
     }
 }
 
diff --git a/crates/nu-command/src/strings/encode_decode/decode_base64.rs b/crates/nu-command/src/strings/encode_decode/decode_base64.rs
index 242a99bb88..cda9de4be8 100644
--- a/crates/nu-command/src/strings/encode_decode/decode_base64.rs
+++ b/crates/nu-command/src/strings/encode_decode/decode_base64.rs
@@ -1,4 +1,4 @@
-use super::base64::{operate, ActionType, CHARACTER_SET_DESC};
+use super::base64::{operate, ActionType, Base64CommandArguments, CHARACTER_SET_DESC};
 use nu_engine::command_prelude::*;
 
 #[derive(Clone)]
@@ -66,6 +66,10 @@ impl Command for DecodeBase64 {
         ]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -73,7 +77,34 @@ impl Command for DecodeBase64 {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        operate(ActionType::Decode, engine_state, stack, call, input)
+        let character_set: Option<Spanned<String>> =
+            call.get_flag(engine_state, stack, "character-set")?;
+        let binary = call.has_flag(engine_state, stack, "binary")?;
+        let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
+        let args = Base64CommandArguments {
+            action_type: ActionType::Decode,
+            binary,
+            character_set,
+        };
+        operate(engine_state, call, input, cell_paths, args)
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let character_set: Option<Spanned<String>> =
+            call.get_flag_const(working_set, "character-set")?;
+        let binary = call.has_flag_const(working_set, "binary")?;
+        let cell_paths: Vec<CellPath> = call.rest_const(working_set, 0)?;
+        let args = Base64CommandArguments {
+            action_type: ActionType::Decode,
+            binary,
+            character_set,
+        };
+        operate(working_set.permanent(), call, input, cell_paths, args)
     }
 }
 
diff --git a/crates/nu-command/src/strings/encode_decode/encode.rs b/crates/nu-command/src/strings/encode_decode/encode.rs
index 113c0fe548..b7bebdba80 100644
--- a/crates/nu-command/src/strings/encode_decode/encode.rs
+++ b/crates/nu-command/src/strings/encode_decode/encode.rs
@@ -69,6 +69,10 @@ documentation link at https://docs.rs/encoding_rs/latest/encoding_rs/#statics"#
         ]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -76,42 +80,62 @@ documentation link at https://docs.rs/encoding_rs/latest/encoding_rs/#statics"#
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let head = call.head;
         let encoding: Spanned<String> = call.req(engine_state, stack, 0)?;
         let ignore_errors = call.has_flag(engine_state, stack, "ignore-errors")?;
+        run(call, input, encoding, ignore_errors)
+    }
 
-        match input {
-            PipelineData::ByteStream(stream, ..) => {
-                let span = stream.span();
-                let s = stream.into_string()?;
-                super::encoding::encode(head, encoding, &s, span, ignore_errors)
-                    .map(|val| val.into_pipeline_data())
-            }
-            PipelineData::Value(v, ..) => {
-                let span = v.span();
-                match v {
-                    Value::String { val: s, .. } => {
-                        super::encoding::encode(head, encoding, &s, span, ignore_errors)
-                            .map(|val| val.into_pipeline_data())
-                    }
-                    Value::Error { error, .. } => Err(*error),
-                    _ => Err(ShellError::OnlySupportsThisInputType {
-                        exp_input_type: "string".into(),
-                        wrong_type: v.get_type().to_string(),
-                        dst_span: head,
-                        src_span: v.span(),
-                    }),
-                }
-            }
-            // This should be more precise, but due to difficulties in getting spans
-            // from PipelineData::ListStream, this is as it is.
-            _ => Err(ShellError::UnsupportedInput {
-                msg: "non-string input".into(),
-                input: "value originates from here".into(),
-                msg_span: head,
-                input_span: input.span().unwrap_or(head),
-            }),
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let encoding: Spanned<String> = call.req_const(working_set, 0)?;
+        let ignore_errors = call.has_flag_const(working_set, "ignore-errors")?;
+        run(call, input, encoding, ignore_errors)
+    }
+}
+
+fn run(
+    call: &Call,
+    input: PipelineData,
+    encoding: Spanned<String>,
+    ignore_errors: bool,
+) -> Result<PipelineData, ShellError> {
+    let head = call.head;
+
+    match input {
+        PipelineData::ByteStream(stream, ..) => {
+            let span = stream.span();
+            let s = stream.into_string()?;
+            super::encoding::encode(head, encoding, &s, span, ignore_errors)
+                .map(|val| val.into_pipeline_data())
         }
+        PipelineData::Value(v, ..) => {
+            let span = v.span();
+            match v {
+                Value::String { val: s, .. } => {
+                    super::encoding::encode(head, encoding, &s, span, ignore_errors)
+                        .map(|val| val.into_pipeline_data())
+                }
+                Value::Error { error, .. } => Err(*error),
+                _ => Err(ShellError::OnlySupportsThisInputType {
+                    exp_input_type: "string".into(),
+                    wrong_type: v.get_type().to_string(),
+                    dst_span: head,
+                    src_span: v.span(),
+                }),
+            }
+        }
+        // This should be more precise, but due to difficulties in getting spans
+        // from PipelineData::ListStream, this is as it is.
+        _ => Err(ShellError::UnsupportedInput {
+            msg: "non-string input".into(),
+            input: "value originates from here".into(),
+            msg_span: head,
+            input_span: input.span().unwrap_or(head),
+        }),
     }
 }
 
diff --git a/crates/nu-command/src/strings/encode_decode/encode_base64.rs b/crates/nu-command/src/strings/encode_decode/encode_base64.rs
index 090941b76b..b01530b107 100644
--- a/crates/nu-command/src/strings/encode_decode/encode_base64.rs
+++ b/crates/nu-command/src/strings/encode_decode/encode_base64.rs
@@ -1,4 +1,4 @@
-use super::base64::{operate, ActionType, CHARACTER_SET_DESC};
+use super::base64::{operate, ActionType, Base64CommandArguments, CHARACTER_SET_DESC};
 use nu_engine::command_prelude::*;
 
 #[derive(Clone)]
@@ -70,6 +70,10 @@ impl Command for EncodeBase64 {
         ]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -77,7 +81,34 @@ impl Command for EncodeBase64 {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        operate(ActionType::Encode, engine_state, stack, call, input)
+        let character_set: Option<Spanned<String>> =
+            call.get_flag(engine_state, stack, "character-set")?;
+        let binary = call.has_flag(engine_state, stack, "binary")?;
+        let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
+        let args = Base64CommandArguments {
+            action_type: ActionType::Encode,
+            binary,
+            character_set,
+        };
+        operate(engine_state, call, input, cell_paths, args)
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let character_set: Option<Spanned<String>> =
+            call.get_flag_const(working_set, "character-set")?;
+        let binary = call.has_flag_const(working_set, "binary")?;
+        let cell_paths: Vec<CellPath> = call.rest_const(working_set, 0)?;
+        let args = Base64CommandArguments {
+            action_type: ActionType::Encode,
+            binary,
+            character_set,
+        };
+        operate(working_set.permanent(), call, input, cell_paths, args)
     }
 }
 
diff --git a/crates/nu-command/src/strings/format/date.rs b/crates/nu-command/src/strings/format/date.rs
index 2c82eb7541..f1a081d842 100644
--- a/crates/nu-command/src/strings/format/date.rs
+++ b/crates/nu-command/src/strings/format/date.rs
@@ -38,36 +38,6 @@ impl Command for FormatDate {
         vec!["fmt", "strftime"]
     }
 
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let head = call.head;
-        if call.has_flag(engine_state, stack, "list")? {
-            return Ok(PipelineData::Value(
-                generate_strftime_list(head, false),
-                None,
-            ));
-        }
-
-        let format = call.opt::<Spanned<String>>(engine_state, stack, 0)?;
-
-        // This doesn't match explicit nulls
-        if matches!(input, PipelineData::Empty) {
-            return Err(ShellError::PipelineEmpty { dst_span: head });
-        }
-        input.map(
-            move |value| match &format {
-                Some(format) => format_helper(value, format.item.as_str(), format.span, head),
-                None => format_helper_rfc2822(value, head),
-            },
-            engine_state.ctrlc.clone(),
-        )
-    }
-
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
@@ -104,6 +74,61 @@ impl Command for FormatDate {
             },
         ]
     }
+
+    fn is_const(&self) -> bool {
+        true
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let list = call.has_flag(engine_state, stack, "list")?;
+        let format = call.opt::<Spanned<String>>(engine_state, stack, 0)?;
+        run(engine_state, call, input, list, format)
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let list = call.has_flag_const(working_set, "list")?;
+        let format = call.opt_const::<Spanned<String>>(working_set, 0)?;
+        run(working_set.permanent(), call, input, list, format)
+    }
+}
+
+fn run(
+    engine_state: &EngineState,
+    call: &Call,
+    input: PipelineData,
+    list: bool,
+    format: Option<Spanned<String>>,
+) -> Result<PipelineData, ShellError> {
+    let head = call.head;
+    if list {
+        return Ok(PipelineData::Value(
+            generate_strftime_list(head, false),
+            None,
+        ));
+    }
+
+    // This doesn't match explicit nulls
+    if matches!(input, PipelineData::Empty) {
+        return Err(ShellError::PipelineEmpty { dst_span: head });
+    }
+    input.map(
+        move |value| match &format {
+            Some(format) => format_helper(value, format.item.as_str(), format.span, head),
+            None => format_helper_rfc2822(value, head),
+        },
+        engine_state.ctrlc.clone(),
+    )
 }
 
 fn format_from<Tz: TimeZone>(date_time: DateTime<Tz>, formatter: &str, span: Span) -> Value
diff --git a/crates/nu-command/src/strings/format/duration.rs b/crates/nu-command/src/strings/format/duration.rs
index ad6583cec0..281542f49a 100644
--- a/crates/nu-command/src/strings/format/duration.rs
+++ b/crates/nu-command/src/strings/format/duration.rs
@@ -53,6 +53,10 @@ impl Command for FormatDuration {
         vec!["convert", "display", "pattern", "human readable"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -81,6 +85,33 @@ impl Command for FormatDuration {
         )
     }
 
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let format_value = call
+            .req_const::<Value>(working_set, 0)?
+            .coerce_into_string()?
+            .to_ascii_lowercase();
+        let cell_paths: Vec<CellPath> = call.rest_const(working_set, 1)?;
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
+        let float_precision = working_set.permanent().config.float_precision as usize;
+        let arg = Arguments {
+            format_value,
+            float_precision,
+            cell_paths,
+        };
+        operate(
+            format_value_impl,
+            arg,
+            input,
+            call.head,
+            working_set.permanent().ctrlc.clone(),
+        )
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
diff --git a/crates/nu-command/src/strings/format/filesize.rs b/crates/nu-command/src/strings/format/filesize.rs
index b54dc92f6d..ebd43d90b1 100644
--- a/crates/nu-command/src/strings/format/filesize.rs
+++ b/crates/nu-command/src/strings/format/filesize.rs
@@ -1,6 +1,6 @@
 use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
-use nu_protocol::format_filesize;
+use nu_protocol::{engine::StateWorkingSet, format_filesize};
 
 struct Arguments {
     format_value: String,
@@ -50,6 +50,10 @@ impl Command for FormatFilesize {
         vec!["convert", "display", "pattern", "human readable"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -76,6 +80,31 @@ impl Command for FormatFilesize {
         )
     }
 
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let format_value = call
+            .req_const::<Value>(working_set, 0)?
+            .coerce_into_string()?
+            .to_ascii_lowercase();
+        let cell_paths: Vec<CellPath> = call.rest_const(working_set, 1)?;
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
+        let arg = Arguments {
+            format_value,
+            cell_paths,
+        };
+        operate(
+            format_value_impl,
+            arg,
+            input,
+            call.head,
+            working_set.permanent().ctrlc.clone(),
+        )
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
diff --git a/crates/nu-command/src/strings/parse.rs b/crates/nu-command/src/strings/parse.rs
index bc70d4679c..4318b3da8b 100644
--- a/crates/nu-command/src/strings/parse.rs
+++ b/crates/nu-command/src/strings/parse.rs
@@ -1,6 +1,6 @@
 use fancy_regex::{Captures, Regex};
 use nu_engine::command_prelude::*;
-use nu_protocol::ListStream;
+use nu_protocol::{engine::StateWorkingSet, ListStream};
 use std::{
     collections::VecDeque,
     sync::{atomic::AtomicBool, Arc},
@@ -99,6 +99,10 @@ impl Command for Parse {
         ]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -106,19 +110,31 @@ impl Command for Parse {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        operate(engine_state, stack, call, input)
+        let pattern: Spanned<String> = call.req(engine_state, stack, 0)?;
+        let regex: bool = call.has_flag(engine_state, stack, "regex")?;
+        operate(engine_state, pattern, regex, call, input)
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let pattern: Spanned<String> = call.req_const(working_set, 0)?;
+        let regex: bool = call.has_flag_const(working_set, "regex")?;
+        operate(working_set.permanent(), pattern, regex, call, input)
     }
 }
 
 fn operate(
     engine_state: &EngineState,
-    stack: &mut Stack,
+    pattern: Spanned<String>,
+    regex: bool,
     call: &Call,
     input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
     let head = call.head;
-    let pattern: Spanned<String> = call.req(engine_state, stack, 0)?;
-    let regex: bool = call.has_flag(engine_state, stack, "regex")?;
 
     let pattern_item = pattern.item;
     let pattern_span = pattern.span;
diff --git a/crates/nu-command/src/strings/split/chars.rs b/crates/nu-command/src/strings/split/chars.rs
index 625915e76d..08e73b9830 100644
--- a/crates/nu-command/src/strings/split/chars.rs
+++ b/crates/nu-command/src/strings/split/chars.rs
@@ -1,5 +1,6 @@
-use crate::grapheme_flags;
+use crate::{grapheme_flags, grapheme_flags_const};
 use nu_engine::command_prelude::*;
+
 use unicode_segmentation::UnicodeSegmentation;
 
 #[derive(Clone)]
@@ -88,6 +89,10 @@ impl Command for SubCommand {
         ]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -95,19 +100,28 @@ impl Command for SubCommand {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        split_chars(engine_state, stack, call, input)
+        let graphemes = grapheme_flags(engine_state, stack, call)?;
+        split_chars(engine_state, call, input, graphemes)
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let graphemes = grapheme_flags_const(working_set, call)?;
+        split_chars(working_set.permanent(), call, input, graphemes)
     }
 }
 
 fn split_chars(
     engine_state: &EngineState,
-    stack: &mut Stack,
     call: &Call,
     input: PipelineData,
+    graphemes: bool,
 ) -> Result<PipelineData, ShellError> {
     let span = call.head;
-
-    let graphemes = grapheme_flags(engine_state, stack, call)?;
     input.map(
         move |x| split_chars_helper(&x, span, graphemes),
         engine_state.ctrlc.clone(),
diff --git a/crates/nu-command/src/strings/split/column.rs b/crates/nu-command/src/strings/split/column.rs
index d73243322d..02eff7845f 100644
--- a/crates/nu-command/src/strings/split/column.rs
+++ b/crates/nu-command/src/strings/split/column.rs
@@ -43,16 +43,6 @@ impl Command for SubCommand {
         vec!["separate", "divide", "regex"]
     }
 
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        split_column(engine_state, stack, call, input)
-    }
-
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
@@ -103,35 +93,83 @@ impl Command for SubCommand {
             },
         ]
     }
+
+    fn is_const(&self) -> bool {
+        true
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let separator: Spanned<String> = call.req(engine_state, stack, 0)?;
+        let rest: Vec<Spanned<String>> = call.rest(engine_state, stack, 1)?;
+        let collapse_empty = call.has_flag(engine_state, stack, "collapse-empty")?;
+        let has_regex = call.has_flag(engine_state, stack, "regex")?;
+
+        let args = Arguments {
+            separator,
+            rest,
+            collapse_empty,
+            has_regex,
+        };
+        split_column(engine_state, call, input, args)
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let separator: Spanned<String> = call.req_const(working_set, 0)?;
+        let rest: Vec<Spanned<String>> = call.rest_const(working_set, 1)?;
+        let collapse_empty = call.has_flag_const(working_set, "collapse-empty")?;
+        let has_regex = call.has_flag_const(working_set, "regex")?;
+
+        let args = Arguments {
+            separator,
+            rest,
+            collapse_empty,
+            has_regex,
+        };
+        split_column(working_set.permanent(), call, input, args)
+    }
+}
+
+struct Arguments {
+    separator: Spanned<String>,
+    rest: Vec<Spanned<String>>,
+    collapse_empty: bool,
+    has_regex: bool,
 }
 
 fn split_column(
     engine_state: &EngineState,
-    stack: &mut Stack,
     call: &Call,
     input: PipelineData,
+    args: Arguments,
 ) -> Result<PipelineData, ShellError> {
     let name_span = call.head;
-    let separator: Spanned<String> = call.req(engine_state, stack, 0)?;
-    let rest: Vec<Spanned<String>> = call.rest(engine_state, stack, 1)?;
-    let collapse_empty = call.has_flag(engine_state, stack, "collapse-empty")?;
-
-    let regex = if call.has_flag(engine_state, stack, "regex")? {
-        Regex::new(&separator.item)
+    let regex = if args.has_regex {
+        Regex::new(&args.separator.item)
     } else {
-        let escaped = regex::escape(&separator.item);
+        let escaped = regex::escape(&args.separator.item);
         Regex::new(&escaped)
     }
     .map_err(|e| ShellError::GenericError {
         error: "Error with regular expression".into(),
         msg: e.to_string(),
-        span: Some(separator.span),
+        span: Some(args.separator.span),
         help: None,
         inner: vec![],
     })?;
 
     input.flat_map(
-        move |x| split_column_helper(&x, &regex, &rest, collapse_empty, name_span),
+        move |x| split_column_helper(&x, &regex, &args.rest, args.collapse_empty, name_span),
         engine_state.ctrlc.clone(),
     )
 }
diff --git a/crates/nu-command/src/strings/split/list.rs b/crates/nu-command/src/strings/split/list.rs
index 470ba12ec4..d52bb5401a 100644
--- a/crates/nu-command/src/strings/split/list.rs
+++ b/crates/nu-command/src/strings/split/list.rs
@@ -36,16 +36,6 @@ impl Command for SubCommand {
         vec!["separate", "divide", "regex"]
     }
 
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        split_list(engine_state, stack, call, input)
-    }
-
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
@@ -145,6 +135,33 @@ impl Command for SubCommand {
             },
         ]
     }
+
+    fn is_const(&self) -> bool {
+        true
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let has_regex = call.has_flag(engine_state, stack, "regex")?;
+        let separator: Value = call.req(engine_state, stack, 0)?;
+        split_list(engine_state, call, input, has_regex, separator)
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let has_regex = call.has_flag_const(working_set, "regex")?;
+        let separator: Value = call.req_const(working_set, 0)?;
+        split_list(working_set.permanent(), call, input, has_regex, separator)
+    }
 }
 
 enum Matcher {
@@ -188,15 +205,15 @@ impl Matcher {
 
 fn split_list(
     engine_state: &EngineState,
-    stack: &mut Stack,
     call: &Call,
     input: PipelineData,
+    has_regex: bool,
+    separator: Value,
 ) -> Result<PipelineData, ShellError> {
-    let separator: Value = call.req(engine_state, stack, 0)?;
     let mut temp_list = Vec::new();
     let mut returned_list = Vec::new();
 
-    let matcher = Matcher::new(call.has_flag(engine_state, stack, "regex")?, separator)?;
+    let matcher = Matcher::new(has_regex, separator)?;
     for val in input {
         if nu_utils::ctrl_c::was_pressed(&engine_state.ctrlc) {
             break;
diff --git a/crates/nu-command/src/strings/split/row.rs b/crates/nu-command/src/strings/split/row.rs
index 8ee22b213c..8bc0003cb6 100644
--- a/crates/nu-command/src/strings/split/row.rs
+++ b/crates/nu-command/src/strings/split/row.rs
@@ -43,16 +43,6 @@ impl Command for SubCommand {
         vec!["separate", "divide", "regex"]
     }
 
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        split_row(engine_state, stack, call, input)
-    }
-
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
@@ -109,32 +99,77 @@ impl Command for SubCommand {
             },
         ]
     }
+
+    fn is_const(&self) -> bool {
+        true
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let separator: Spanned<String> = call.req(engine_state, stack, 0)?;
+        let max_split: Option<usize> = call.get_flag(engine_state, stack, "number")?;
+        let has_regex = call.has_flag(engine_state, stack, "regex")?;
+
+        let args = Arguments {
+            separator,
+            max_split,
+            has_regex,
+        };
+        split_row(engine_state, call, input, args)
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let separator: Spanned<String> = call.req_const(working_set, 0)?;
+        let max_split: Option<usize> = call.get_flag_const(working_set, "number")?;
+        let has_regex = call.has_flag_const(working_set, "regex")?;
+
+        let args = Arguments {
+            separator,
+            max_split,
+            has_regex,
+        };
+        split_row(working_set.permanent(), call, input, args)
+    }
+}
+
+struct Arguments {
+    has_regex: bool,
+    separator: Spanned<String>,
+    max_split: Option<usize>,
 }
 
 fn split_row(
     engine_state: &EngineState,
-    stack: &mut Stack,
     call: &Call,
     input: PipelineData,
+    args: Arguments,
 ) -> Result<PipelineData, ShellError> {
     let name_span = call.head;
-    let separator: Spanned<String> = call.req(engine_state, stack, 0)?;
-    let regex = if call.has_flag(engine_state, stack, "regex")? {
-        Regex::new(&separator.item)
+    let regex = if args.has_regex {
+        Regex::new(&args.separator.item)
     } else {
-        let escaped = regex::escape(&separator.item);
+        let escaped = regex::escape(&args.separator.item);
         Regex::new(&escaped)
     }
     .map_err(|e| ShellError::GenericError {
         error: "Error with regular expression".into(),
         msg: e.to_string(),
-        span: Some(separator.span),
+        span: Some(args.separator.span),
         help: None,
         inner: vec![],
     })?;
-    let max_split: Option<usize> = call.get_flag(engine_state, stack, "number")?;
     input.flat_map(
-        move |x| split_row_helper(&x, &regex, max_split, name_span),
+        move |x| split_row_helper(&x, &regex, args.max_split, name_span),
         engine_state.ctrlc.clone(),
     )
 }
diff --git a/crates/nu-command/src/strings/split/words.rs b/crates/nu-command/src/strings/split/words.rs
index 17b68bd44f..0dd5dc9383 100644
--- a/crates/nu-command/src/strings/split/words.rs
+++ b/crates/nu-command/src/strings/split/words.rs
@@ -1,4 +1,4 @@
-use crate::grapheme_flags;
+use crate::{grapheme_flags, grapheme_flags_const};
 use fancy_regex::Regex;
 use nu_engine::command_prelude::*;
 
@@ -96,6 +96,10 @@ impl Command for SubCommand {
         ]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -103,40 +107,76 @@ impl Command for SubCommand {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        split_words(engine_state, stack, call, input)
+        let word_length: Option<usize> = call.get_flag(engine_state, stack, "min-word-length")?;
+        let has_grapheme = call.has_flag(engine_state, stack, "grapheme-clusters")?;
+        let has_utf8 = call.has_flag(engine_state, stack, "utf-8-bytes")?;
+        let graphemes = grapheme_flags(engine_state, stack, call)?;
+
+        let args = Arguments {
+            word_length,
+            has_grapheme,
+            has_utf8,
+            graphemes,
+        };
+        split_words(engine_state, call, input, args)
     }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let word_length: Option<usize> = call.get_flag_const(working_set, "min-word-length")?;
+        let has_grapheme = call.has_flag_const(working_set, "grapheme-clusters")?;
+        let has_utf8 = call.has_flag_const(working_set, "utf-8-bytes")?;
+        let graphemes = grapheme_flags_const(working_set, call)?;
+
+        let args = Arguments {
+            word_length,
+            has_grapheme,
+            has_utf8,
+            graphemes,
+        };
+        split_words(working_set.permanent(), call, input, args)
+    }
+}
+
+struct Arguments {
+    word_length: Option<usize>,
+    has_grapheme: bool,
+    has_utf8: bool,
+    graphemes: bool,
 }
 
 fn split_words(
     engine_state: &EngineState,
-    stack: &mut Stack,
     call: &Call,
     input: PipelineData,
+    args: Arguments,
 ) -> Result<PipelineData, ShellError> {
     let span = call.head;
     // let ignore_hyphenated = call.has_flag(engine_state, stack, "ignore-hyphenated")?;
     // let ignore_apostrophes = call.has_flag(engine_state, stack, "ignore-apostrophes")?;
     // let ignore_punctuation = call.has_flag(engine_state, stack, "ignore-punctuation")?;
-    let word_length: Option<usize> = call.get_flag(engine_state, stack, "min-word-length")?;
 
-    if word_length.is_none() {
-        if call.has_flag(engine_state, stack, "grapheme-clusters")? {
+    if args.word_length.is_none() {
+        if args.has_grapheme {
             return Err(ShellError::IncompatibleParametersSingle {
                 msg: "--grapheme-clusters (-g) requires --min-word-length (-l)".to_string(),
                 span,
             });
         }
-        if call.has_flag(engine_state, stack, "utf-8-bytes")? {
+        if args.has_utf8 {
             return Err(ShellError::IncompatibleParametersSingle {
                 msg: "--utf-8-bytes (-b) requires --min-word-length (-l)".to_string(),
                 span,
             });
         }
     }
-    let graphemes = grapheme_flags(engine_state, stack, call)?;
 
     input.map(
-        move |x| split_words_helper(&x, word_length, span, graphemes),
+        move |x| split_words_helper(&x, args.word_length, span, args.graphemes),
         engine_state.ctrlc.clone(),
     )
 }
diff --git a/crates/nu-command/src/strings/str_/case/capitalize.rs b/crates/nu-command/src/strings/str_/case/capitalize.rs
index 82f0d102e6..20f334976c 100644
--- a/crates/nu-command/src/strings/str_/case/capitalize.rs
+++ b/crates/nu-command/src/strings/str_/case/capitalize.rs
@@ -36,6 +36,10 @@ impl Command for SubCommand {
         vec!["convert", "style", "caps", "upper"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -43,7 +47,18 @@ impl Command for SubCommand {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        operate(engine_state, stack, call, input)
+        let column_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
+        operate(engine_state, call, input, column_paths)
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let column_paths: Vec<CellPath> = call.rest_const(working_set, 0)?;
+        operate(working_set.permanent(), call, input, column_paths)
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -72,12 +87,11 @@ impl Command for SubCommand {
 
 fn operate(
     engine_state: &EngineState,
-    stack: &mut Stack,
     call: &Call,
     input: PipelineData,
+    column_paths: Vec<CellPath>,
 ) -> Result<PipelineData, ShellError> {
     let head = call.head;
-    let column_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
     input.map(
         move |v| {
             if column_paths.is_empty() {
diff --git a/crates/nu-command/src/strings/str_/case/downcase.rs b/crates/nu-command/src/strings/str_/case/downcase.rs
index 7fa4785499..316050d501 100644
--- a/crates/nu-command/src/strings/str_/case/downcase.rs
+++ b/crates/nu-command/src/strings/str_/case/downcase.rs
@@ -36,6 +36,10 @@ impl Command for SubCommand {
         vec!["lower case", "lowercase"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -43,7 +47,18 @@ impl Command for SubCommand {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        operate(engine_state, stack, call, input)
+        let column_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
+        operate(engine_state, call, input, column_paths)
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let column_paths: Vec<CellPath> = call.rest_const(working_set, 0)?;
+        operate(working_set.permanent(), call, input, column_paths)
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -80,12 +95,11 @@ impl Command for SubCommand {
 
 fn operate(
     engine_state: &EngineState,
-    stack: &mut Stack,
     call: &Call,
     input: PipelineData,
+    column_paths: Vec<CellPath>,
 ) -> Result<PipelineData, ShellError> {
     let head = call.head;
-    let column_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
     input.map(
         move |v| {
             if column_paths.is_empty() {
diff --git a/crates/nu-command/src/strings/str_/case/upcase.rs b/crates/nu-command/src/strings/str_/case/upcase.rs
index 222c9eeab4..9e55f25f64 100644
--- a/crates/nu-command/src/strings/str_/case/upcase.rs
+++ b/crates/nu-command/src/strings/str_/case/upcase.rs
@@ -36,6 +36,10 @@ impl Command for SubCommand {
         vec!["uppercase", "upper case"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -43,7 +47,18 @@ impl Command for SubCommand {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        operate(engine_state, stack, call, input)
+        let column_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
+        operate(engine_state, call, input, column_paths)
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let column_paths: Vec<CellPath> = call.rest_const(working_set, 0)?;
+        operate(working_set.permanent(), call, input, column_paths)
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -57,12 +72,11 @@ impl Command for SubCommand {
 
 fn operate(
     engine_state: &EngineState,
-    stack: &mut Stack,
     call: &Call,
     input: PipelineData,
+    column_paths: Vec<CellPath>,
 ) -> Result<PipelineData, ShellError> {
     let head = call.head;
-    let column_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
     input.map(
         move |v| {
             if column_paths.is_empty() {
diff --git a/crates/nu-command/src/strings/str_/contains.rs b/crates/nu-command/src/strings/str_/contains.rs
index bc1d5bcf11..63b9366b09 100644
--- a/crates/nu-command/src/strings/str_/contains.rs
+++ b/crates/nu-command/src/strings/str_/contains.rs
@@ -52,6 +52,10 @@ impl Command for SubCommand {
         vec!["substring", "match", "find", "search"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -84,6 +88,43 @@ impl Command for SubCommand {
         operate(action, args, input, call.head, engine_state.ctrlc.clone())
     }
 
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        if call.has_flag_const(working_set, "not")? {
+            nu_protocol::report_error_new(
+                working_set.permanent(),
+                &ShellError::GenericError {
+                    error: "Deprecated option".into(),
+                    msg: "`str contains --not {string}` is deprecated and will be removed in 0.95."
+                        .into(),
+                    span: Some(call.head),
+                    help: Some("Please use the `not` operator instead.".into()),
+                    inner: vec![],
+                },
+            );
+        }
+
+        let cell_paths: Vec<CellPath> = call.rest_const(working_set, 1)?;
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
+        let args = Arguments {
+            substring: call.req_const::<String>(working_set, 0)?,
+            cell_paths,
+            case_insensitive: call.has_flag_const(working_set, "ignore-case")?,
+            not_contain: call.has_flag_const(working_set, "not")?,
+        };
+        operate(
+            action,
+            args,
+            input,
+            call.head,
+            working_set.permanent().ctrlc.clone(),
+        )
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
diff --git a/crates/nu-command/src/strings/str_/distance.rs b/crates/nu-command/src/strings/str_/distance.rs
index aa45ec5c25..bd666e53f5 100644
--- a/crates/nu-command/src/strings/str_/distance.rs
+++ b/crates/nu-command/src/strings/str_/distance.rs
@@ -1,6 +1,6 @@
 use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
-use nu_protocol::levenshtein_distance;
+use nu_protocol::{engine::StateWorkingSet, levenshtein_distance};
 
 #[derive(Clone)]
 pub struct SubCommand;
@@ -49,6 +49,10 @@ impl Command for SubCommand {
         vec!["edit", "levenshtein"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -66,6 +70,28 @@ impl Command for SubCommand {
         operate(action, args, input, call.head, engine_state.ctrlc.clone())
     }
 
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let compare_string: String = call.req_const(working_set, 0)?;
+        let cell_paths: Vec<CellPath> = call.rest_const(working_set, 1)?;
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
+        let args = Arguments {
+            compare_string,
+            cell_paths,
+        };
+        operate(
+            action,
+            args,
+            input,
+            call.head,
+            working_set.permanent().ctrlc.clone(),
+        )
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![Example {
             description: "get the edit distance between two strings",
diff --git a/crates/nu-command/src/strings/str_/ends_with.rs b/crates/nu-command/src/strings/str_/ends_with.rs
index 1b06acd880..40f643ea8e 100644
--- a/crates/nu-command/src/strings/str_/ends_with.rs
+++ b/crates/nu-command/src/strings/str_/ends_with.rs
@@ -50,6 +50,10 @@ impl Command for SubCommand {
         vec!["suffix", "match", "find", "search"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -67,6 +71,28 @@ impl Command for SubCommand {
         operate(action, args, input, call.head, engine_state.ctrlc.clone())
     }
 
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let cell_paths: Vec<CellPath> = call.rest_const(working_set, 1)?;
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
+        let args = Arguments {
+            substring: call.req_const::<String>(working_set, 0)?,
+            cell_paths,
+            case_insensitive: call.has_flag_const(working_set, "ignore-case")?,
+        };
+        operate(
+            action,
+            args,
+            input,
+            call.head,
+            working_set.permanent().ctrlc.clone(),
+        )
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
diff --git a/crates/nu-command/src/strings/str_/expand.rs b/crates/nu-command/src/strings/str_/expand.rs
index 2eca970403..70fb51ec4c 100644
--- a/crates/nu-command/src/strings/str_/expand.rs
+++ b/crates/nu-command/src/strings/str_/expand.rs
@@ -179,6 +179,10 @@ impl Command for SubCommand {
         ]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -186,32 +190,51 @@ impl Command for SubCommand {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let span = call.head;
-        if matches!(input, PipelineData::Empty) {
-            return Err(ShellError::PipelineEmpty { dst_span: span });
-        }
         let is_path = call.has_flag(engine_state, stack, "path")?;
-        input.map(
-            move |v| {
-                let value_span = v.span();
-                match v.coerce_into_string() {
-                    Ok(s) => {
-                        let contents = if is_path { s.replace('\\', "\\\\") } else { s };
-                        str_expand(&contents, span, value_span)
-                    }
-                    Err(_) => Value::error(
-                        ShellError::PipelineMismatch {
-                            exp_input_type: "string".into(),
-                            dst_span: span,
-                            src_span: value_span,
-                        },
-                        span,
-                    ),
-                }
-            },
-            engine_state.ctrlc.clone(),
-        )
+        run(call, input, is_path, engine_state)
     }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let is_path = call.has_flag_const(working_set, "path")?;
+        run(call, input, is_path, working_set.permanent())
+    }
+}
+
+fn run(
+    call: &Call,
+    input: PipelineData,
+    is_path: bool,
+    engine_state: &EngineState,
+) -> Result<PipelineData, ShellError> {
+    let span = call.head;
+    if matches!(input, PipelineData::Empty) {
+        return Err(ShellError::PipelineEmpty { dst_span: span });
+    }
+    input.map(
+        move |v| {
+            let value_span = v.span();
+            match v.coerce_into_string() {
+                Ok(s) => {
+                    let contents = if is_path { s.replace('\\', "\\\\") } else { s };
+                    str_expand(&contents, span, value_span)
+                }
+                Err(_) => Value::error(
+                    ShellError::PipelineMismatch {
+                        exp_input_type: "string".into(),
+                        dst_span: span,
+                        src_span: value_span,
+                    },
+                    span,
+                ),
+            }
+        },
+        engine_state.ctrlc.clone(),
+    )
 }
 
 fn str_expand(contents: &str, span: Span, value_span: Span) -> Value {
diff --git a/crates/nu-command/src/strings/str_/index_of.rs b/crates/nu-command/src/strings/str_/index_of.rs
index df26df7493..5b40f80d3d 100644
--- a/crates/nu-command/src/strings/str_/index_of.rs
+++ b/crates/nu-command/src/strings/str_/index_of.rs
@@ -1,10 +1,10 @@
-use crate::grapheme_flags;
+use crate::{grapheme_flags, grapheme_flags_const};
 use nu_cmd_base::{
     input_handler::{operate, CmdArgument},
     util,
 };
 use nu_engine::command_prelude::*;
-use nu_protocol::Range;
+use nu_protocol::{engine::StateWorkingSet, Range};
 use unicode_segmentation::UnicodeSegmentation;
 
 struct Arguments {
@@ -72,6 +72,10 @@ impl Command for SubCommand {
         vec!["match", "find", "search"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -92,6 +96,31 @@ impl Command for SubCommand {
         operate(action, args, input, call.head, engine_state.ctrlc.clone())
     }
 
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let substring: Spanned<String> = call.req_const(working_set, 0)?;
+        let cell_paths: Vec<CellPath> = call.rest_const(working_set, 1)?;
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
+        let args = Arguments {
+            substring: substring.item,
+            range: call.get_flag_const(working_set, "range")?,
+            end: call.has_flag_const(working_set, "end")?,
+            cell_paths,
+            graphemes: grapheme_flags_const(working_set, call)?,
+        };
+        operate(
+            action,
+            args,
+            input,
+            call.head,
+            working_set.permanent().ctrlc.clone(),
+        )
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
diff --git a/crates/nu-command/src/strings/str_/join.rs b/crates/nu-command/src/strings/str_/join.rs
index dd3a87dd61..1d36f216d0 100644
--- a/crates/nu-command/src/strings/str_/join.rs
+++ b/crates/nu-command/src/strings/str_/join.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+
 use std::io::Write;
 
 #[derive(Clone)]
@@ -32,6 +33,10 @@ impl Command for StrJoin {
         vec!["collect", "concatenate"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -40,41 +45,17 @@ impl Command for StrJoin {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let separator: Option<String> = call.opt(engine_state, stack, 0)?;
+        run(engine_state, call, input, separator)
+    }
 
-        let config = engine_state.config.clone();
-
-        let span = call.head;
-
-        let metadata = input.metadata();
-        let mut iter = input.into_iter();
-        let mut first = true;
-
-        let output = ByteStream::from_fn(span, None, ByteStreamType::String, move |buffer| {
-            // Write each input to the buffer
-            if let Some(value) = iter.next() {
-                // Write the separator if this is not the first
-                if first {
-                    first = false;
-                } else if let Some(separator) = &separator {
-                    write!(buffer, "{}", separator)?;
-                }
-
-                match value {
-                    Value::Error { error, .. } => {
-                        return Err(*error);
-                    }
-                    // Hmm, not sure what we actually want.
-                    // `to_expanded_string` formats dates as human readable which feels funny.
-                    Value::Date { val, .. } => write!(buffer, "{val:?}")?,
-                    value => write!(buffer, "{}", value.to_expanded_string("\n", &config))?,
-                }
-                Ok(true)
-            } else {
-                Ok(false)
-            }
-        });
-
-        Ok(PipelineData::ByteStream(output, metadata))
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let separator: Option<String> = call.opt_const(working_set, 0)?;
+        run(working_set.permanent(), call, input, separator)
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -93,6 +74,48 @@ impl Command for StrJoin {
     }
 }
 
+fn run(
+    engine_state: &EngineState,
+    call: &Call,
+    input: PipelineData,
+    separator: Option<String>,
+) -> Result<PipelineData, ShellError> {
+    let config = engine_state.config.clone();
+
+    let span = call.head;
+
+    let metadata = input.metadata();
+    let mut iter = input.into_iter();
+    let mut first = true;
+
+    let output = ByteStream::from_fn(span, None, ByteStreamType::String, move |buffer| {
+        // Write each input to the buffer
+        if let Some(value) = iter.next() {
+            // Write the separator if this is not the first
+            if first {
+                first = false;
+            } else if let Some(separator) = &separator {
+                write!(buffer, "{}", separator)?;
+            }
+
+            match value {
+                Value::Error { error, .. } => {
+                    return Err(*error);
+                }
+                // Hmm, not sure what we actually want.
+                // `to_expanded_string` formats dates as human readable which feels funny.
+                Value::Date { val, .. } => write!(buffer, "{val:?}")?,
+                value => write!(buffer, "{}", value.to_expanded_string("\n", &config))?,
+            }
+            Ok(true)
+        } else {
+            Ok(false)
+        }
+    });
+
+    Ok(PipelineData::ByteStream(output, metadata))
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/crates/nu-command/src/strings/str_/length.rs b/crates/nu-command/src/strings/str_/length.rs
index 6e2ae4182b..f456fe9467 100644
--- a/crates/nu-command/src/strings/str_/length.rs
+++ b/crates/nu-command/src/strings/str_/length.rs
@@ -1,7 +1,7 @@
 use crate::{grapheme_flags, grapheme_flags_const};
 use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
-use nu_protocol::engine::StateWorkingSet;
+
 use unicode_segmentation::UnicodeSegmentation;
 
 struct Arguments {
diff --git a/crates/nu-command/src/strings/str_/replace.rs b/crates/nu-command/src/strings/str_/replace.rs
index 5d5863e70a..58e2574681 100644
--- a/crates/nu-command/src/strings/str_/replace.rs
+++ b/crates/nu-command/src/strings/str_/replace.rs
@@ -73,6 +73,10 @@ impl Command for SubCommand {
         vec!["search", "shift", "switch", "regex"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -101,6 +105,39 @@ impl Command for SubCommand {
         operate(action, args, input, call.head, engine_state.ctrlc.clone())
     }
 
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let find: Spanned<String> = call.req_const(working_set, 0)?;
+        let replace: Spanned<String> = call.req_const(working_set, 1)?;
+        let cell_paths: Vec<CellPath> = call.rest_const(working_set, 2)?;
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
+        let literal_replace = call.has_flag_const(working_set, "no-expand")?;
+        let no_regex = !call.has_flag_const(working_set, "regex")?
+            && !call.has_flag_const(working_set, "multiline")?;
+        let multiline = call.has_flag_const(working_set, "multiline")?;
+
+        let args = Arguments {
+            all: call.has_flag_const(working_set, "all")?,
+            find,
+            replace,
+            cell_paths,
+            literal_replace,
+            no_regex,
+            multiline,
+        };
+        operate(
+            action,
+            args,
+            input,
+            call.head,
+            working_set.permanent().ctrlc.clone(),
+        )
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
diff --git a/crates/nu-command/src/strings/str_/reverse.rs b/crates/nu-command/src/strings/str_/reverse.rs
index becfd9be50..cc3772db7c 100644
--- a/crates/nu-command/src/strings/str_/reverse.rs
+++ b/crates/nu-command/src/strings/str_/reverse.rs
@@ -37,6 +37,10 @@ impl Command for SubCommand {
         vec!["convert", "inverse", "flip"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -49,6 +53,23 @@ impl Command for SubCommand {
         operate(action, args, input, call.head, engine_state.ctrlc.clone())
     }
 
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let cell_paths: Vec<CellPath> = call.rest_const(working_set, 0)?;
+        let args = CellPathOnlyArgs::from(cell_paths);
+        operate(
+            action,
+            args,
+            input,
+            call.head,
+            working_set.permanent().ctrlc.clone(),
+        )
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
diff --git a/crates/nu-command/src/strings/str_/starts_with.rs b/crates/nu-command/src/strings/str_/starts_with.rs
index 73396911e2..aec12f6f77 100644
--- a/crates/nu-command/src/strings/str_/starts_with.rs
+++ b/crates/nu-command/src/strings/str_/starts_with.rs
@@ -51,6 +51,10 @@ impl Command for SubCommand {
         vec!["prefix", "match", "find", "search"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -69,6 +73,29 @@ impl Command for SubCommand {
         operate(action, args, input, call.head, engine_state.ctrlc.clone())
     }
 
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let substring: Spanned<String> = call.req_const(working_set, 0)?;
+        let cell_paths: Vec<CellPath> = call.rest_const(working_set, 1)?;
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
+        let args = Arguments {
+            substring: substring.item,
+            cell_paths,
+            case_insensitive: call.has_flag_const(working_set, "ignore-case")?,
+        };
+        operate(
+            action,
+            args,
+            input,
+            call.head,
+            working_set.permanent().ctrlc.clone(),
+        )
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
diff --git a/crates/nu-command/src/strings/str_/stats.rs b/crates/nu-command/src/strings/str_/stats.rs
index 20ef35c51f..28c65afe2b 100644
--- a/crates/nu-command/src/strings/str_/stats.rs
+++ b/crates/nu-command/src/strings/str_/stats.rs
@@ -1,5 +1,6 @@
 use fancy_regex::Regex;
 use nu_engine::command_prelude::*;
+
 use std::collections::BTreeMap;
 use std::{fmt, str};
 use unicode_segmentation::UnicodeSegmentation;
@@ -29,6 +30,10 @@ impl Command for SubCommand {
         vec!["count", "word", "character", "unicode", "wc"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -39,6 +44,15 @@ impl Command for SubCommand {
         stats(engine_state, call, input)
     }
 
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        stats(working_set.permanent(), call, input)
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
diff --git a/crates/nu-command/src/strings/str_/substring.rs b/crates/nu-command/src/strings/str_/substring.rs
index 4f5c953dda..99ba8ede1e 100644
--- a/crates/nu-command/src/strings/str_/substring.rs
+++ b/crates/nu-command/src/strings/str_/substring.rs
@@ -1,10 +1,10 @@
-use crate::grapheme_flags;
+use crate::{grapheme_flags, grapheme_flags_const};
 use nu_cmd_base::{
     input_handler::{operate, CmdArgument},
     util,
 };
 use nu_engine::command_prelude::*;
-use nu_protocol::Range;
+use nu_protocol::{engine::StateWorkingSet, Range};
 use std::cmp::Ordering;
 use unicode_segmentation::UnicodeSegmentation;
 
@@ -77,6 +77,10 @@ impl Command for SubCommand {
         vec!["slice"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -103,6 +107,37 @@ impl Command for SubCommand {
         operate(action, args, input, call.head, engine_state.ctrlc.clone())
     }
 
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let range: Range = call.req_const(working_set, 0)?;
+
+        let indexes = match util::process_range(&range) {
+            Ok(idxs) => idxs.into(),
+            Err(processing_error) => {
+                return Err(processing_error("could not perform substring", call.head))
+            }
+        };
+
+        let cell_paths: Vec<CellPath> = call.rest_const(working_set, 1)?;
+        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
+        let args = Arguments {
+            indexes,
+            cell_paths,
+            graphemes: grapheme_flags_const(working_set, call)?,
+        };
+        operate(
+            action,
+            args,
+            input,
+            call.head,
+            working_set.permanent().ctrlc.clone(),
+        )
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
diff --git a/crates/nu-command/src/strings/str_/trim/trim_.rs b/crates/nu-command/src/strings/str_/trim/trim_.rs
index ee414d0da6..52c4017cda 100644
--- a/crates/nu-command/src/strings/str_/trim/trim_.rs
+++ b/crates/nu-command/src/strings/str_/trim/trim_.rs
@@ -71,6 +71,10 @@ impl Command for SubCommand {
         vec!["whitespace", "strip", "lstrip", "rstrip"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -79,44 +83,37 @@ impl Command for SubCommand {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let character = call.get_flag::<Spanned<String>>(engine_state, stack, "char")?;
-        let to_trim = match character.as_ref() {
-            Some(v) => {
-                if v.item.chars().count() > 1 {
-                    return Err(ShellError::GenericError {
-                        error: "Trim only works with single character".into(),
-                        msg: "needs single character".into(),
-                        span: Some(v.span),
-                        help: None,
-                        inner: vec![],
-                    });
-                }
-                v.item.chars().next()
-            }
-            None => None,
-        };
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
-        let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
-        let mode = match cell_paths {
-            None => ActionMode::Global,
-            Some(_) => ActionMode::Local,
-        };
-
         let left = call.has_flag(engine_state, stack, "left")?;
         let right = call.has_flag(engine_state, stack, "right")?;
-        let trim_side = match (left, right) {
-            (true, true) => TrimSide::Both,
-            (true, false) => TrimSide::Left,
-            (false, true) => TrimSide::Right,
-            (false, false) => TrimSide::Both,
-        };
-
-        let args = Arguments {
-            to_trim,
-            trim_side,
+        run(
+            character,
             cell_paths,
-            mode,
-        };
-        operate(action, args, input, call.head, engine_state.ctrlc.clone())
+            (left, right),
+            call,
+            input,
+            engine_state,
+        )
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let character = call.get_flag_const::<Spanned<String>>(working_set, "char")?;
+        let cell_paths: Vec<CellPath> = call.rest_const(working_set, 0)?;
+        let left = call.has_flag_const(working_set, "left")?;
+        let right = call.has_flag_const(working_set, "right")?;
+        run(
+            character,
+            cell_paths,
+            (left, right),
+            call,
+            input,
+            working_set.permanent(),
+        )
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -150,6 +147,52 @@ impl Command for SubCommand {
     }
 }
 
+fn run(
+    character: Option<Spanned<String>>,
+    cell_paths: Vec<CellPath>,
+    (left, right): (bool, bool),
+    call: &Call,
+    input: PipelineData,
+    engine_state: &EngineState,
+) -> Result<PipelineData, ShellError> {
+    let to_trim = match character.as_ref() {
+        Some(v) => {
+            if v.item.chars().count() > 1 {
+                return Err(ShellError::GenericError {
+                    error: "Trim only works with single character".into(),
+                    msg: "needs single character".into(),
+                    span: Some(v.span),
+                    help: None,
+                    inner: vec![],
+                });
+            }
+            v.item.chars().next()
+        }
+        None => None,
+    };
+
+    let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
+    let mode = match cell_paths {
+        None => ActionMode::Global,
+        Some(_) => ActionMode::Local,
+    };
+
+    let trim_side = match (left, right) {
+        (true, true) => TrimSide::Both,
+        (true, false) => TrimSide::Left,
+        (false, true) => TrimSide::Right,
+        (false, false) => TrimSide::Both,
+    };
+
+    let args = Arguments {
+        to_trim,
+        trim_side,
+        cell_paths,
+        mode,
+    };
+    operate(action, args, input, call.head, engine_state.ctrlc.clone())
+}
+
 #[derive(Debug, Copy, Clone)]
 pub enum ActionMode {
     Local,
diff --git a/crates/nu-engine/src/command_prelude.rs b/crates/nu-engine/src/command_prelude.rs
index 112f280db5..5c21af27e0 100644
--- a/crates/nu-engine/src/command_prelude.rs
+++ b/crates/nu-engine/src/command_prelude.rs
@@ -1,7 +1,7 @@
 pub use crate::CallExt;
 pub use nu_protocol::{
     ast::{Call, CellPath},
-    engine::{Command, EngineState, Stack},
+    engine::{Command, EngineState, Stack, StateWorkingSet},
     record, ByteStream, ByteStreamType, Category, ErrSpan, Example, IntoInterruptiblePipelineData,
     IntoPipelineData, IntoSpanned, PipelineData, Record, ShellError, Signature, Span, Spanned,
     SyntaxShape, Type, Value,

From a6b1d1f6d9d586e905b5432393fcf6d3653e35c4 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Wed, 5 Jun 2024 16:26:47 -0700
Subject: [PATCH 0071/1072] Upgrade to polars 0.40 (#13069)

Upgrading to polars 0.40
---
 Cargo.lock                                    | 157 +++++++++---------
 crates/nu_plugin_polars/Cargo.toml            |  14 +-
 .../src/dataframe/eager/open.rs               |  81 +++------
 .../src/dataframe/eager/sql_expr.rs           |  30 ++--
 .../src/dataframe/eager/summary.rs            |  58 +------
 .../expressions/expressions_macro.rs          |  35 +---
 .../src/dataframe/expressions/lit.rs          |   2 +-
 .../src/dataframe/lazy/aggregate.rs           |   1 +
 .../src/dataframe/lazy/join.rs                |   2 +-
 .../src/dataframe/lazy/median.rs              |  11 +-
 .../src/dataframe/lazy/quantile.rs            |   9 +-
 .../src/dataframe/series/rolling.rs           |  19 +--
 .../src/dataframe/values/nu_expression/mod.rs |  11 +-
 .../src/dataframe/values/nu_lazyframe/mod.rs  |  10 +-
 .../src/dataframe/values/nu_schema.rs         |   9 +-
 15 files changed, 180 insertions(+), 269 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 23e18657db..7e34334db4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -478,17 +478,6 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ada7f35ca622a86a4d6c27be2633fc6c243ecc834859628fcce0681d8e76e1c8"
 
-[[package]]
-name = "brotli"
-version = "3.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
- "brotli-decompressor 2.5.1",
-]
-
 [[package]]
 name = "brotli"
 version = "5.0.0"
@@ -497,17 +486,7 @@ checksum = "19483b140a7ac7174d34b5a581b406c64f84da5409d3e09cf4fff604f9270e67"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
- "brotli-decompressor 4.0.0",
-]
-
-[[package]]
-name = "brotli-decompressor"
-version = "2.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
+ "brotli-decompressor",
 ]
 
 [[package]]
@@ -871,7 +850,7 @@ checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7"
 dependencies = [
  "crossterm",
  "strum",
- "strum_macros 0.26.2",
+ "strum_macros",
  "unicode-width",
 ]
 
@@ -1295,6 +1274,9 @@ name = "either"
 version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "eml-parser"
@@ -1794,6 +1776,7 @@ dependencies = [
  "ahash 0.8.11",
  "allocator-api2",
  "rayon",
+ "serde",
 ]
 
 [[package]]
@@ -2935,7 +2918,7 @@ dependencies = [
  "alphanumeric-sort",
  "base64 0.22.1",
  "bracoxide",
- "brotli 5.0.0",
+ "brotli",
  "byteorder",
  "bytesize",
  "calamine",
@@ -3222,7 +3205,7 @@ dependencies = [
 name = "nu-protocol"
 version = "0.94.3"
 dependencies = [
- "brotli 5.0.0",
+ "brotli",
  "byte-unit",
  "chrono",
  "chrono-humanize",
@@ -3243,7 +3226,7 @@ dependencies = [
  "serde",
  "serde_json",
  "strum",
- "strum_macros 0.26.2",
+ "strum_macros",
  "tempfile",
  "thiserror",
  "typetag",
@@ -3404,7 +3387,7 @@ dependencies = [
  "polars-plan",
  "polars-utils",
  "serde",
- "sqlparser 0.45.0",
+ "sqlparser 0.47.0",
  "tempfile",
  "typetag",
  "uuid",
@@ -4014,9 +3997,9 @@ dependencies = [
 
 [[package]]
 name = "polars"
-version = "0.39.2"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea21b858b16b9c0e17a12db2800d11aa5b4bd182be6b3022eb537bbfc1f2db5"
+checksum = "e148396dca5496566880fa19374f3f789a29db94e3eb458afac1497b4bac5442"
 dependencies = [
  "getrandom",
  "polars-arrow",
@@ -4034,9 +4017,9 @@ dependencies = [
 
 [[package]]
 name = "polars-arrow"
-version = "0.39.2"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "725b09f2b5ef31279b66e27bbab63c58d49d8f6696b66b1f46c7eaab95e80f75"
+checksum = "1cb5e11cd0752ae022fa6ca3afa50a14b0301b7ce53c0135828fbb0f4fa8303e"
 dependencies = [
  "ahash 0.8.11",
  "atoi",
@@ -4082,9 +4065,9 @@ dependencies = [
 
 [[package]]
 name = "polars-compute"
-version = "0.39.2"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a796945b14b14fbb79b91ef0406e6fddca2be636e889f81ea5d6ee7d36efb4fe"
+checksum = "89fc4578f826234cdecb782952aa9c479dc49373f81694a7b439c70b6f609ba0"
 dependencies = [
  "bytemuck",
  "either",
@@ -4098,9 +4081,9 @@ dependencies = [
 
 [[package]]
 name = "polars-core"
-version = "0.39.2"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "465f70d3e96b6d0b1a43c358ba451286b8c8bd56696feff020d65702aa33e35c"
+checksum = "e490c6bace1366a558feea33d1846f749a8ca90bd72a6748752bc65bb4710b2a"
 dependencies = [
  "ahash 0.8.11",
  "bitflags 2.5.0",
@@ -4132,9 +4115,9 @@ dependencies = [
 
 [[package]]
 name = "polars-error"
-version = "0.39.2"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5224d5d05e6b8a6f78b75951ae1b5f82c8ab1979e11ffaf5fd41941e3d5b0757"
+checksum = "08888f58e61599b00f5ea0c2ccdc796b54b9859559cc0d4582733509451fa01a"
 dependencies = [
  "avro-schema",
  "polars-arrow-format",
@@ -4144,10 +4127,30 @@ dependencies = [
 ]
 
 [[package]]
-name = "polars-io"
-version = "0.39.2"
+name = "polars-expr"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2c8589e418cbe4a48228d64b2a8a40284a82ec3c98817c0c2bcc0267701338b"
+checksum = "4173591920fe56ad55af025f92eb0d08421ca85705c326a640c43856094e3484"
+dependencies = [
+ "ahash 0.8.11",
+ "bitflags 2.5.0",
+ "once_cell",
+ "polars-arrow",
+ "polars-core",
+ "polars-io",
+ "polars-ops",
+ "polars-plan",
+ "polars-time",
+ "polars-utils",
+ "rayon",
+ "smartstring",
+]
+
+[[package]]
+name = "polars-io"
+version = "0.40.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5842896aea46d975b425d63f156f412aed3cfde4c257b64fb1f43ceea288074e"
 dependencies = [
  "ahash 0.8.11",
  "async-trait",
@@ -4186,9 +4189,9 @@ dependencies = [
 
 [[package]]
 name = "polars-json"
-version = "0.39.2"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81224492a649a12b668480c0cf219d703f432509765d2717e72fe32ad16fc701"
+checksum = "160cbad0145b93ac6a88639aadfa6f7d7c769d05a8674f9b7e895b398cae9901"
 dependencies = [
  "ahash 0.8.11",
  "chrono",
@@ -4207,9 +4210,9 @@ dependencies = [
 
 [[package]]
 name = "polars-lazy"
-version = "0.39.2"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2632b1af668e2058d5f8f916d8fbde3cac63d03ae29a705f598e41dcfeb7f"
+checksum = "e805ea2ebbc6b7749b0afb31b7fc5d32b42b57ba29b984549d43d3a16114c4a5"
 dependencies = [
  "ahash 0.8.11",
  "bitflags 2.5.0",
@@ -4217,6 +4220,7 @@ dependencies = [
  "once_cell",
  "polars-arrow",
  "polars-core",
+ "polars-expr",
  "polars-io",
  "polars-json",
  "polars-ops",
@@ -4231,13 +4235,13 @@ dependencies = [
 
 [[package]]
 name = "polars-ops"
-version = "0.39.2"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efdbdb4d9a92109bc2e0ce8e17af5ae8ab643bb5b7ee9d1d74f0aeffd1fbc95f"
+checksum = "7b0aed7e169c81b98457641cf82b251f52239a668916c2e683abd1f38df00d58"
 dependencies = [
  "ahash 0.8.11",
  "argminmax",
- "base64 0.21.7",
+ "base64 0.22.1",
  "bytemuck",
  "chrono",
  "chrono-tz 0.8.6",
@@ -4267,14 +4271,14 @@ dependencies = [
 
 [[package]]
 name = "polars-parquet"
-version = "0.39.2"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b421d2196f786fdfe162db614c8485f8308fe41575d4de634a39bbe460d1eb6a"
+checksum = "c70670a9e51cac66d0e77fd20b5cc957dbcf9f2660d410633862bb72f846d5b8"
 dependencies = [
  "ahash 0.8.11",
  "async-stream",
- "base64 0.21.7",
- "brotli 3.5.0",
+ "base64 0.22.1",
+ "brotli",
  "ethnum",
  "flate2",
  "futures",
@@ -4293,9 +4297,9 @@ dependencies = [
 
 [[package]]
 name = "polars-pipe"
-version = "0.39.2"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48700f1d5bd56a15451e581f465c09541492750360f18637b196f995470a015c"
+checksum = "0a40ae1b3c74ee07e2d1f7cbf56c5d6e15969e45d9b6f0903bd2acaf783ba436"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-queue",
@@ -4305,6 +4309,7 @@ dependencies = [
  "polars-arrow",
  "polars-compute",
  "polars-core",
+ "polars-expr",
  "polars-io",
  "polars-ops",
  "polars-plan",
@@ -4318,13 +4323,14 @@ dependencies = [
 
 [[package]]
 name = "polars-plan"
-version = "0.39.2"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fb8e2302e20c44defd5be8cad9c96e75face63c3a5f609aced8c4ec3b3ac97d"
+checksum = "8daa3541ae7e9af311a4389bc2b21f83349c34c723cc67fa524cdefdaa172d90"
 dependencies = [
  "ahash 0.8.11",
  "bytemuck",
  "chrono-tz 0.8.6",
+ "either",
  "hashbrown 0.14.5",
  "once_cell",
  "percent-encoding",
@@ -4341,15 +4347,15 @@ dependencies = [
  "regex",
  "serde",
  "smartstring",
- "strum_macros 0.25.3",
+ "strum_macros",
  "version_check",
 ]
 
 [[package]]
 name = "polars-row"
-version = "0.39.2"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a515bdc68c2ae3702e3de70d89601f3b71ca8137e282a226dddb53ee4bacfa2e"
+checksum = "deb285f2f3a65b00dd06bef16bb9f712dbb5478f941dab5cf74f9f016d382e40"
 dependencies = [
  "bytemuck",
  "polars-arrow",
@@ -4359,11 +4365,12 @@ dependencies = [
 
 [[package]]
 name = "polars-sql"
-version = "0.39.2"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4bb7cc1c04c3023d1953b2f1dec50515e8fd8169a5a2bf4967b3b082232db7"
+checksum = "a724f699d194cb02c25124d3832f7d4d77f387f1a89ee42f6b9e88ec561d4ad9"
 dependencies = [
  "hex",
+ "once_cell",
  "polars-arrow",
  "polars-core",
  "polars-error",
@@ -4377,11 +4384,12 @@ dependencies = [
 
 [[package]]
 name = "polars-time"
-version = "0.39.2"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efc18e3ad92eec55db89d88f16c22d436559ba7030cf76f86f6ed7a754b673f1"
+checksum = "87ebec238d8b6200d9f0c3ce411c8441e950bd5a7df7806b8172d06c1d5a4b97"
 dependencies = [
  "atoi",
+ "bytemuck",
  "chrono",
  "chrono-tz 0.8.6",
  "now",
@@ -4398,9 +4406,9 @@ dependencies = [
 
 [[package]]
 name = "polars-utils"
-version = "0.39.2"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c760b6c698cfe2fbbbd93d6cfb408db14ececfe1d92445dae2229ce1b5b21ae8"
+checksum = "34e1a907c63abf71e5f21467e2e4ff748896c28196746f631c6c25512ec6102c"
 dependencies = [
  "ahash 0.8.11",
  "bytemuck",
@@ -4834,7 +4842,7 @@ dependencies = [
  "serde_json",
  "strip-ansi-escapes",
  "strum",
- "strum_macros 0.26.2",
+ "strum_macros",
  "thiserror",
  "unicode-segmentation",
  "unicode-width",
@@ -5562,9 +5570,9 @@ dependencies = [
 
 [[package]]
 name = "sqlparser"
-version = "0.45.0"
+version = "0.47.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7bbffee862a796d67959a89859d6b1046bb5016d63e23835ad0da182777bbe0"
+checksum = "295e9930cd7a97e58ca2a070541a3ca502b17f5d1fa7157376d0fabd85324f25"
 dependencies = [
  "log",
 ]
@@ -5678,20 +5686,7 @@ version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29"
 dependencies = [
- "strum_macros 0.26.2",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.25.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
-dependencies = [
- "heck 0.4.1",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 2.0.60",
+ "strum_macros",
 ]
 
 [[package]]
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index a2c693128d..98288f3ebf 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -29,12 +29,12 @@ indexmap = { version = "2.2" }
 mimalloc = { version = "0.1.42" }
 num = {version = "0.4"}
 serde = { version = "1.0", features = ["derive"] }
-sqlparser = { version = "0.45"}
-polars-io = { version = "0.39", features = ["avro"]}
-polars-arrow = { version = "0.39"}
-polars-ops = { version = "0.39"}
-polars-plan = { version = "0.39", features = ["regex"]}
-polars-utils = { version = "0.39"}
+sqlparser = { version = "0.47"}
+polars-io = { version = "0.40", features = ["avro"]}
+polars-arrow = { version = "0.40"}
+polars-ops = { version = "0.40"}
+polars-plan = { version = "0.40", features = ["regex"]}
+polars-utils = { version = "0.40"}
 typetag = "0.2"
 uuid = { version = "1.7", features = ["v4", "serde"] }
 
@@ -70,7 +70,7 @@ features = [
 	"to_dummies",
 ]
 optional = false
-version = "0.39"
+version = "0.40"
 
 [dev-dependencies]
 nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.3" }
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/open.rs b/crates/nu_plugin_polars/src/dataframe/eager/open.rs
index 81ea537574..13a65074f0 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/open.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/open.rs
@@ -16,14 +16,17 @@ use std::{
     fs::File,
     io::BufReader,
     path::{Path, PathBuf},
+    sync::Arc,
 };
 
 use polars::prelude::{
-    CsvEncoding, CsvReader, IpcReader, JsonFormat, JsonReader, LazyCsvReader, LazyFileListReader,
-    LazyFrame, ParquetReader, ScanArgsIpc, ScanArgsParquet, SerReader,
+    CsvEncoding, IpcReader, JsonFormat, JsonReader, LazyCsvReader, LazyFileListReader, LazyFrame,
+    ParquetReader, ScanArgsIpc, ScanArgsParquet, SerReader,
 };
 
-use polars_io::{avro::AvroReader, prelude::ParallelStrategy, HiveOptions};
+use polars_io::{
+    avro::AvroReader, csv::read::CsvReadOptions, prelude::ParallelStrategy, HiveOptions,
+};
 
 #[derive(Clone)]
 pub struct OpenDataFrame;
@@ -175,6 +178,7 @@ fn from_parquet(
             cloud_options: None,
             use_statistics: false,
             hive_options: HiveOptions::default(),
+            glob: true,
         };
 
         let df: NuLazyFrame = LazyFrame::scan_parquet(file, args)
@@ -445,7 +449,7 @@ fn from_csv(
             }
         };
 
-        let csv_reader = csv_reader.has_header(!no_header);
+        let csv_reader = csv_reader.with_has_header(!no_header);
 
         let csv_reader = match maybe_schema {
             Some(schema) => csv_reader.with_schema(Some(schema.into())),
@@ -475,7 +479,23 @@ fn from_csv(
 
         df.cache_and_to_value(plugin, engine, call.head)
     } else {
-        let csv_reader = CsvReader::from_path(file_path)
+        let df = CsvReadOptions::default()
+            .with_has_header(!no_header)
+            .with_infer_schema_length(infer_schema)
+            .with_skip_rows(skip_rows.unwrap_or_default())
+            .with_schema(maybe_schema.map(|s| s.into()))
+            .with_columns(columns.map(Arc::new))
+            .map_parse_options(|options| {
+                options
+                    .with_separator(
+                        delimiter
+                            .as_ref()
+                            .and_then(|d| d.item.chars().next().map(|c| c as u8))
+                            .unwrap_or(b','),
+                    )
+                    .with_encoding(CsvEncoding::LossyUtf8)
+            })
+            .try_into_reader_with_file_path(Some(file_path.to_path_buf()))
             .map_err(|e| ShellError::GenericError {
                 error: "Error creating CSV reader".into(),
                 msg: e.to_string(),
@@ -483,52 +503,6 @@ fn from_csv(
                 help: None,
                 inner: vec![],
             })?
-            .with_encoding(CsvEncoding::LossyUtf8);
-
-        let csv_reader = match delimiter {
-            None => csv_reader,
-            Some(d) => {
-                if d.item.len() != 1 {
-                    return Err(ShellError::GenericError {
-                        error: "Incorrect delimiter".into(),
-                        msg: "Delimiter has to be one character".into(),
-                        span: Some(d.span),
-                        help: None,
-                        inner: vec![],
-                    });
-                } else {
-                    let delimiter = match d.item.chars().next() {
-                        Some(d) => d as u8,
-                        None => unreachable!(),
-                    };
-                    csv_reader.with_separator(delimiter)
-                }
-            }
-        };
-
-        let csv_reader = csv_reader.has_header(!no_header);
-
-        let csv_reader = match maybe_schema {
-            Some(schema) => csv_reader.with_schema(Some(schema.into())),
-            None => csv_reader,
-        };
-
-        let csv_reader = match infer_schema {
-            None => csv_reader,
-            Some(r) => csv_reader.infer_schema(Some(r)),
-        };
-
-        let csv_reader = match skip_rows {
-            None => csv_reader,
-            Some(r) => csv_reader.with_skip_rows(r),
-        };
-
-        let csv_reader = match columns {
-            None => csv_reader,
-            Some(columns) => csv_reader.with_columns(Some(columns)),
-        };
-
-        let df: NuDataFrame = csv_reader
             .finish()
             .map_err(|e| ShellError::GenericError {
                 error: "CSV reader error".into(),
@@ -536,9 +510,8 @@ fn from_csv(
                 span: Some(call.head),
                 help: None,
                 inner: vec![],
-            })?
-            .into();
-
+            })?;
+        let df = NuDataFrame::new(false, df);
         df.cache_and_to_value(plugin, engine, call.head)
     }
 }
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/sql_expr.rs b/crates/nu_plugin_polars/src/dataframe/eager/sql_expr.rs
index 9c0728ea5f..163e974a1a 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/sql_expr.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/sql_expr.rs
@@ -3,7 +3,8 @@ use polars::prelude::{col, lit, DataType, Expr, LiteralValue, PolarsResult as Re
 
 use sqlparser::ast::{
     ArrayElemTypeDef, BinaryOperator as SQLBinaryOperator, DataType as SQLDataType,
-    Expr as SqlExpr, Function as SQLFunction, Value as SqlValue, WindowType,
+    DuplicateTreatment, Expr as SqlExpr, Function as SQLFunction, FunctionArguments,
+    Value as SqlValue, WindowType,
 };
 
 fn map_sql_polars_datatype(data_type: &SQLDataType) -> Result<DataType> {
@@ -33,7 +34,7 @@ fn map_sql_polars_datatype(data_type: &SQLDataType) -> Result<DataType> {
         SQLDataType::Interval => DataType::Duration(TimeUnit::Microseconds),
         SQLDataType::Array(array_type_def) => match array_type_def {
             ArrayElemTypeDef::AngleBracket(inner_type)
-            | ArrayElemTypeDef::SquareBracket(inner_type) => {
+            | ArrayElemTypeDef::SquareBracket(inner_type, _) => {
                 DataType::List(Box::new(map_sql_polars_datatype(inner_type)?))
             }
             _ => {
@@ -120,9 +121,7 @@ pub fn parse_sql_expr(expr: &SqlExpr) -> Result<Expr> {
         }
         SqlExpr::Function(sql_function) => parse_sql_function(sql_function)?,
         SqlExpr::Cast {
-            expr,
-            data_type,
-            format: _,
+            expr, data_type, ..
         } => cast_(parse_sql_expr(expr)?, data_type)?,
         SqlExpr::Nested(expr) => parse_sql_expr(expr)?,
         SqlExpr::Value(value) => literal_expr(value)?,
@@ -162,8 +161,17 @@ fn parse_sql_function(sql_function: &SQLFunction) -> Result<Expr> {
     use sqlparser::ast::{FunctionArg, FunctionArgExpr};
     // Function name mostly do not have name space, so it mostly take the first args
     let function_name = sql_function.name.0[0].value.to_ascii_lowercase();
-    let args = sql_function
-        .args
+
+    // One day this should support the additional argument types supported with 0.40
+    let (args, distinct) = match &sql_function.args {
+        FunctionArguments::List(list) => (
+            list.args.clone(),
+            list.duplicate_treatment == Some(DuplicateTreatment::Distinct),
+        ),
+        _ => (vec![], false),
+    };
+
+    let args = args
         .iter()
         .map(|arg| match arg {
             FunctionArg::Named { arg, .. } => arg,
@@ -174,15 +182,15 @@ fn parse_sql_function(sql_function: &SQLFunction) -> Result<Expr> {
         match (
             function_name.as_str(),
             args.as_slice(),
-            sql_function.distinct,
+            distinct,
         ) {
-            ("sum", [FunctionArgExpr::Expr(expr)], false) => {
+            ("sum", [FunctionArgExpr::Expr(ref expr)], false) => {
                 apply_window_spec(parse_sql_expr(expr)?, sql_function.over.as_ref())?.sum()
             }
-            ("count", [FunctionArgExpr::Expr(expr)], false) => {
+            ("count", [FunctionArgExpr::Expr(ref expr)], false) => {
                 apply_window_spec(parse_sql_expr(expr)?, sql_function.over.as_ref())?.count()
             }
-            ("count", [FunctionArgExpr::Expr(expr)], true) => {
+            ("count", [FunctionArgExpr::Expr(ref expr)], true) => {
                 apply_window_spec(parse_sql_expr(expr)?, sql_function.over.as_ref())?.n_unique()
             }
             // Special case for wildcard args to count function.
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/summary.rs b/crates/nu_plugin_polars/src/dataframe/eager/summary.rs
index 5e377210b9..74e96fc7be 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/summary.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/summary.rs
@@ -189,53 +189,19 @@ fn command(
         .map(|col| {
             let count = col.len() as f64;
 
-            let sum = col.sum_as_series().ok().and_then(|series| {
-                series
-                    .cast(&DataType::Float64)
-                    .ok()
-                    .and_then(|ca| match ca.get(0) {
-                        Ok(AnyValue::Float64(v)) => Some(v),
-                        _ => None,
-                    })
-            });
-
-            let mean = match col.mean_as_series().get(0) {
-                Ok(AnyValue::Float64(v)) => Some(v),
-                _ => None,
-            };
-
-            let median = match col.median_as_series() {
-                Ok(v) => match v.get(0) {
-                    Ok(AnyValue::Float64(v)) => Some(v),
-                    _ => None,
-                },
-                _ => None,
-            };
-
-            let std = match col.std_as_series(0) {
-                Ok(v) => match v.get(0) {
-                    Ok(AnyValue::Float64(v)) => Some(v),
-                    _ => None,
-                },
-                _ => None,
-            };
-
-            let min = col.min_as_series().ok().and_then(|series| {
-                series
-                    .cast(&DataType::Float64)
-                    .ok()
-                    .and_then(|ca| match ca.get(0) {
-                        Ok(AnyValue::Float64(v)) => Some(v),
-                        _ => None,
-                    })
-            });
+            let sum = col.sum::<f64>().ok();
+            let mean = col.mean();
+            let median = col.median();
+            let std = col.std(0);
+            let min = col.min::<f64>().ok().flatten();
 
             let mut quantiles = quantiles
                 .clone()
                 .into_iter()
                 .map(|q| {
-                    col.quantile_as_series(q, QuantileInterpolOptions::default())
+                    col.quantile_reduce(q, QuantileInterpolOptions::default())
                         .ok()
+                        .map(|s| s.into_series("quantile"))
                         .and_then(|ca| ca.cast(&DataType::Float64).ok())
                         .and_then(|ca| match ca.get(0) {
                             Ok(AnyValue::Float64(v)) => Some(v),
@@ -244,15 +210,7 @@ fn command(
                 })
                 .collect::<Vec<Option<f64>>>();
 
-            let max = col.max_as_series().ok().and_then(|series| {
-                series
-                    .cast(&DataType::Float64)
-                    .ok()
-                    .and_then(|ca| match ca.get(0) {
-                        Ok(AnyValue::Float64(v)) => Some(v),
-                        _ => None,
-                    })
-            });
+            let max = col.max::<f64>().ok().flatten();
 
             let mut descriptors = vec![Some(count), sum, mean, median, std, min];
             descriptors.append(&mut quantiles);
diff --git a/crates/nu_plugin_polars/src/dataframe/expressions/expressions_macro.rs b/crates/nu_plugin_polars/src/dataframe/expressions/expressions_macro.rs
index 5b1f9f1a73..58b60f3427 100644
--- a/crates/nu_plugin_polars/src/dataframe/expressions/expressions_macro.rs
+++ b/crates/nu_plugin_polars/src/dataframe/expressions/expressions_macro.rs
@@ -5,9 +5,7 @@ use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuLazyFrame};
 use crate::values::CustomValueSupport;
 use crate::PolarsPlugin;
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
-use nu_protocol::{
-    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Type, Value,
-};
+use nu_protocol::{Category, Example, LabeledError, PipelineData, Signature, Span, Type, Value};
 
 // The structs defined in this file are structs that form part of other commands
 // since they share a similar name
@@ -60,6 +58,7 @@ macro_rules! expr_command {
         mod $test {
             use super::*;
             use crate::test::test_polars_plugin_command;
+            use nu_protocol::ShellError;
 
             #[test]
             fn test_examples() -> Result<(), ShellError> {
@@ -163,19 +162,7 @@ macro_rules! lazy_expr_command {
                 if NuDataFrame::can_downcast(&value) || NuLazyFrame::can_downcast(&value) {
                     let lazy = NuLazyFrame::try_from_value_coerce(plugin, &value)
                         .map_err(LabeledError::from)?;
-                    let lazy = NuLazyFrame::new(
-                        lazy.from_eager,
-                        lazy.to_polars()
-                            .$func()
-                            .map_err(|e| ShellError::GenericError {
-                                error: "Dataframe Error".into(),
-                                msg: e.to_string(),
-                                help: None,
-                                span: None,
-                                inner: vec![],
-                            })
-                            .map_err(LabeledError::from)?,
-                    );
+                    let lazy = NuLazyFrame::new(lazy.from_eager, lazy.to_polars().$func());
                     lazy.to_pipeline_data(plugin, engine, call.head)
                         .map_err(LabeledError::from)
                 } else {
@@ -192,6 +179,7 @@ macro_rules! lazy_expr_command {
         mod $test {
             use super::*;
             use crate::test::test_polars_plugin_command;
+            use nu_protocol::ShellError;
 
             #[test]
             fn test_examples() -> Result<(), ShellError> {
@@ -244,19 +232,7 @@ macro_rules! lazy_expr_command {
                 if NuDataFrame::can_downcast(&value) || NuLazyFrame::can_downcast(&value) {
                     let lazy = NuLazyFrame::try_from_value_coerce(plugin, &value)
                         .map_err(LabeledError::from)?;
-                    let lazy = NuLazyFrame::new(
-                        lazy.from_eager,
-                        lazy.to_polars()
-                            .$func($ddof)
-                            .map_err(|e| ShellError::GenericError {
-                                error: "Dataframe Error".into(),
-                                msg: e.to_string(),
-                                help: None,
-                                span: None,
-                                inner: vec![],
-                            })
-                            .map_err(LabeledError::from)?,
-                    );
+                    let lazy = NuLazyFrame::new(lazy.from_eager, lazy.to_polars().$func($ddof));
                     lazy.to_pipeline_data(plugin, engine, call.head)
                         .map_err(LabeledError::from)
                 } else {
@@ -272,6 +248,7 @@ macro_rules! lazy_expr_command {
         mod $test {
             use super::*;
             use crate::test::test_polars_plugin_command;
+            use nu_protocol::ShellError;
 
             #[test]
             fn test_examples() -> Result<(), ShellError> {
diff --git a/crates/nu_plugin_polars/src/dataframe/expressions/lit.rs b/crates/nu_plugin_polars/src/dataframe/expressions/lit.rs
index 31f0f76cbb..1238717b2d 100644
--- a/crates/nu_plugin_polars/src/dataframe/expressions/lit.rs
+++ b/crates/nu_plugin_polars/src/dataframe/expressions/lit.rs
@@ -35,7 +35,7 @@ impl PluginCommand for ExprLit {
             example: "polars lit 2 | polars into-nu",
             result: Some(Value::test_record(record! {
                 "expr" =>  Value::test_string("literal"),
-                "value" => Value::test_string("2"),
+                "value" => Value::test_string("dyn int: 2"),
             })),
         }]
     }
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/aggregate.rs b/crates/nu_plugin_polars/src/dataframe/lazy/aggregate.rs
index 8fa717954f..d2fd92ec87 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/aggregate.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/aggregate.rs
@@ -195,6 +195,7 @@ fn get_col_name(expr: &Expr) -> Option<String> {
         | Expr::Len
         | Expr::Nth(_)
         | Expr::SubPlan(_, _)
+        | Expr::IndexColumn(_)
         | Expr::Selector(_) => None,
     }
 }
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/join.rs b/crates/nu_plugin_polars/src/dataframe/lazy/join.rs
index d6d2ef69ba..67f5aee9ba 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/join.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/join.rs
@@ -189,7 +189,7 @@ impl PluginCommand for LazyJoin {
         let how = if left {
             JoinType::Left
         } else if outer {
-            JoinType::Outer { coalesce: true }
+            JoinType::Outer
         } else if cross {
             JoinType::Cross
         } else {
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/median.rs b/crates/nu_plugin_polars/src/dataframe/lazy/median.rs
index 6e42856723..8106218c26 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/median.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/median.rs
@@ -116,16 +116,7 @@ fn command(
     call: &EvaluatedCall,
     lazy: NuLazyFrame,
 ) -> Result<PipelineData, ShellError> {
-    let polars_lazy = lazy
-        .to_polars()
-        .median()
-        .map_err(|e| ShellError::GenericError {
-            error: format!("Error in median operation: {e}"),
-            msg: "".into(),
-            help: None,
-            span: None,
-            inner: vec![],
-        })?;
+    let polars_lazy = lazy.to_polars().median();
     let lazy = NuLazyFrame::new(lazy.from_eager, polars_lazy);
     lazy.to_pipeline_data(plugin, engine, call.head)
 }
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/quantile.rs b/crates/nu_plugin_polars/src/dataframe/lazy/quantile.rs
index 517fead989..e63fae6610 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/quantile.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/quantile.rs
@@ -134,14 +134,7 @@ fn command(
     let lazy = NuLazyFrame::new(
         lazy.from_eager,
         lazy.to_polars()
-            .quantile(lit(quantile), QuantileInterpolOptions::default())
-            .map_err(|e| ShellError::GenericError {
-                error: "Dataframe Error".into(),
-                msg: e.to_string(),
-                help: None,
-                span: None,
-                inner: vec![],
-            })?,
+            .quantile(lit(quantile), QuantileInterpolOptions::default()),
     );
 
     lazy.to_pipeline_data(plugin, engine, call.head)
diff --git a/crates/nu_plugin_polars/src/dataframe/series/rolling.rs b/crates/nu_plugin_polars/src/dataframe/series/rolling.rs
index 6bc8a3929a..72394d3375 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/rolling.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/rolling.rs
@@ -7,7 +7,7 @@ use nu_protocol::{
     Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Spanned,
     SyntaxShape, Type, Value,
 };
-use polars::prelude::{DataType, Duration, IntoSeries, RollingOptionsImpl, SeriesOpsTime};
+use polars::prelude::{DataType, IntoSeries, RollingOptionsFixedWindow, SeriesOpsTime};
 
 enum RollType {
     Min,
@@ -131,7 +131,7 @@ fn command(
     input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
     let roll_type: Spanned<String> = call.req(0)?;
-    let window_size: i64 = call.req(1)?;
+    let window_size: usize = call.req(1)?;
 
     let df = NuDataFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
     let series = df.as_series(call.head)?;
@@ -148,17 +148,12 @@ fn command(
 
     let roll_type = RollType::from_str(&roll_type.item, roll_type.span)?;
 
-    let rolling_opts = RollingOptionsImpl {
-        window_size: Duration::new(window_size),
-        min_periods: window_size as usize,
-        weights: None,
-        center: false,
-        by: None,
-        closed_window: None,
-        tu: None,
-        tz: None,
-        fn_params: None,
+    let rolling_opts = RollingOptionsFixedWindow {
+        window_size,
+        min_periods: window_size,
+        ..RollingOptionsFixedWindow::default()
     };
+
     let res = match roll_type {
         RollType::Max => series.rolling_max(rolling_opts),
         RollType::Min => series.rolling_min(rolling_opts),
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_expression/mod.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_expression/mod.rs
index 96eab00d53..cead8c4a11 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_expression/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_expression/mod.rs
@@ -155,7 +155,10 @@ pub fn expr_to_value(expr: &Expr, span: Span) -> Result<Value, ShellError> {
             span,
         )),
         Expr::Columns(columns) => {
-            let value = columns.iter().map(|col| Value::string(col, span)).collect();
+            let value = columns
+                .iter()
+                .map(|col| Value::string(col.to_string(), span))
+                .collect();
             Ok(Value::record(
                 record! {
                     "expr" => Value::string("columns", span),
@@ -415,6 +418,12 @@ pub fn expr_to_value(expr: &Expr, span: Span) -> Result<Value, ShellError> {
             msg_span: span,
             input_span: Span::unknown(),
         }),
+        Expr::IndexColumn(_) => Err(ShellError::UnsupportedInput {
+            msg: "Expressions of type IndexColumn to Nu Values is not yet supported".to_string(),
+            input: format!("Expression is {expr:?}"),
+            msg_span: span,
+            input_span: Span::unknown(),
+        }),
     }
 }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/mod.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/mod.rs
index 53e2b425b7..4dc231d706 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/mod.rs
@@ -160,7 +160,15 @@ impl CustomValueSupport for NuLazyFrame {
             .unwrap_or_else(|_| "<NOT AVAILABLE>".to_string());
         Ok(Value::record(
             record! {
-                "plan" => Value::string(self.lazy.describe_plan(), span),
+                "plan" => Value::string(
+                    self.lazy.describe_plan().map_err(|e| ShellError::GenericError {
+                        error: "Error getting plan".into(),
+                        msg: e.to_string(),
+                        span: Some(span),
+                        help: None,
+                        inner: vec![],
+                    })?,
+                    span),
                 "optimized_plan" => Value::string(optimized_plan, span),
             },
             span,
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_schema.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_schema.rs
index f684b8bb38..5a30d40cd4 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_schema.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_schema.rs
@@ -1,7 +1,10 @@
 use std::sync::Arc;
 
 use nu_protocol::{ShellError, Span, Value};
-use polars::prelude::{DataType, Field, Schema, SchemaRef, TimeUnit};
+use polars::{
+    datatypes::UnknownKind,
+    prelude::{DataType, Field, Schema, SchemaRef, TimeUnit},
+};
 
 #[derive(Debug, Clone)]
 pub struct NuSchema {
@@ -104,7 +107,7 @@ pub fn str_to_dtype(dtype: &str, span: Span) -> Result<DataType, ShellError> {
         "date" => Ok(DataType::Date),
         "time" => Ok(DataType::Time),
         "null" => Ok(DataType::Null),
-        "unknown" => Ok(DataType::Unknown),
+        "unknown" => Ok(DataType::Unknown(UnknownKind::Any)),
         "object" => Ok(DataType::Object("unknown", None)),
         _ if dtype.starts_with("list") => {
             let dtype = dtype
@@ -299,7 +302,7 @@ mod test {
 
         let dtype = "unknown";
         let schema = str_to_dtype(dtype, Span::unknown()).unwrap();
-        let expected = DataType::Unknown;
+        let expected = DataType::Unknown(UnknownKind::Any);
         assert_eq!(schema, expected);
 
         let dtype = "object";

From f378c72f6f4fdd1656fd5eb11802ac2a31cac897 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikkel=20Roald-Arb=C3=B8l?=
 <25629697+roaldarbol@users.noreply.github.com>
Date: Thu, 6 Jun 2024 01:53:34 +0100
Subject: [PATCH 0072/1072] Create `CITATION.cff` (#12983)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
This PR creates a `CITATION.cff` file.

# User-Facing Changes
Users will now be able to properly cite `nushell` when used e.g. in
scientific work. The `CITATION.cff` file also enables users to get the
citation withe the Github integration, see
[documentation](https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-citation-files).
More information about the `.cff` standard
[here](https://citation-file-format.github.io/).

# After Submitting
Do you want it documented in the docs somewhere? If so, where exactly?
Happy to make a PR there.

One feature that could well be implemented later on is automatic updates
to the CITATION file with a Github Action (this is outside of my comfort
zone, so I'll leave that for a separate PR should anyone want to
implement it). Ideally, the `CITATION.cff` file points to the latest
release , and could do so with the following fields:
```
commit:
version:
date-released:
```

---------

Co-authored-by: Mikkel Roald-Arbøl <github.ggb9a@simplelogin.co>
Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Co-authored-by: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
---
 CITATION.cff | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 CITATION.cff

diff --git a/CITATION.cff b/CITATION.cff
new file mode 100644
index 0000000000..25731e87b2
--- /dev/null
+++ b/CITATION.cff
@@ -0,0 +1,26 @@
+cff-version: 1.2.0
+title: 'Nushell'
+message: >-
+  If you use this software and wish to cite it, 
+  you can use the metadata from this file.
+type: software
+authors:
+  - name: "The Nushell Project Team"
+identifiers:
+  - type: url
+    value: 'https://github.com/nushell/nushell'
+    description: Repository
+repository-code: 'https://github.com/nushell/nushell'
+url: 'https://www.nushell.sh/'
+abstract: >-
+  The goal of the Nushell project is to take the Unix
+  philosophy of shells, where pipes connect simple commands
+  together, and bring it to the modern style of development.
+  Thus, rather than being either a shell, or a programming
+  language, Nushell connects both by bringing a rich
+  programming language and a full-featured shell together
+  into one package.
+keywords:
+  - nushell
+  - shell
+license: MIT

From 75d5807dcd50876950204990dab4e1e3a326cbce Mon Sep 17 00:00:00 2001
From: Reilly Wood <26268125+rgwood@users.noreply.github.com>
Date: Wed, 5 Jun 2024 19:49:32 -0700
Subject: [PATCH 0073/1072] Fix `explore` panic on empty lists (#13074)

This fixes up a panic I accidentally introduced when refactoring the
cursor code in `explore`: https://github.com/nushell/nushell/pull/12979

Under certain circumstances (running `:nu []`, opening `:try` with the
hidden `try.reactive` setting enabled), `explore` would panic when
handling an empty list. To fix this for now I've removed the validation
I added to the Cursor constructor in that PR.
---
 crates/nu-explore/src/views/cursor/mod.rs         | 15 +++++++--------
 .../nu-explore/src/views/cursor/window_cursor.rs  |  4 ++--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/crates/nu-explore/src/views/cursor/mod.rs b/crates/nu-explore/src/views/cursor/mod.rs
index ea08da0d36..8044b59aca 100644
--- a/crates/nu-explore/src/views/cursor/mod.rs
+++ b/crates/nu-explore/src/views/cursor/mod.rs
@@ -28,11 +28,10 @@ struct Cursor {
 
 impl Cursor {
     /// Constructor to create a new Cursor
-    pub fn new(size: usize) -> Result<Self> {
-        if size == 0 {
-            bail!("Size cannot be zero");
-        }
-        Ok(Cursor { position: 0, size })
+    pub fn new(size: usize) -> Self {
+        // In theory we should not be able to create a cursor with size 0, but in practice
+        // it's easier to allow that for empty lists etc. instead of propagating errors
+        Cursor { position: 0, size }
     }
 
     /// The max position the cursor can be at
@@ -88,7 +87,7 @@ mod tests {
     #[test]
     fn test_cursor_set_position() {
         // from 0 to 9
-        let mut cursor = Cursor::new(10).unwrap();
+        let mut cursor = Cursor::new(10);
         cursor.set_position(5);
         assert_eq!(cursor.position, 5);
 
@@ -99,7 +98,7 @@ mod tests {
     #[test]
     fn test_cursor_move_forward() {
         // from 0 to 9
-        let mut cursor = Cursor::new(10).unwrap();
+        let mut cursor = Cursor::new(10);
         assert_eq!(cursor.position, 0);
         cursor.move_forward(3);
         assert_eq!(cursor.position, 3);
@@ -111,7 +110,7 @@ mod tests {
     #[test]
     fn test_cursor_move_backward() {
         // from 0 to 9
-        let mut cursor = Cursor::new(10).unwrap();
+        let mut cursor = Cursor::new(10);
         cursor.move_backward(3);
         assert_eq!(cursor.position, 0);
 
diff --git a/crates/nu-explore/src/views/cursor/window_cursor.rs b/crates/nu-explore/src/views/cursor/window_cursor.rs
index 4feb0c802f..50f376d0a7 100644
--- a/crates/nu-explore/src/views/cursor/window_cursor.rs
+++ b/crates/nu-explore/src/views/cursor/window_cursor.rs
@@ -42,8 +42,8 @@ impl WindowCursor {
         }
 
         Ok(Self {
-            view: Cursor::new(view_size)?,
-            window: Cursor::new(window_size)?,
+            view: Cursor::new(view_size),
+            window: Cursor::new(window_size),
         })
     }
 

From 5d163c1bcc8fda70412445df0bd607b1e64f0f17 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Thu, 6 Jun 2024 11:03:34 +0800
Subject: [PATCH 0074/1072] run_external: remove inner quotes once nushell gets
 `=` sign (#13073)

# Description
Fixes: #13066

nushell should remove argument values' inner quote once it gets `=`.
Whatever it's a flag or not, and it also replace from `\"` to `"` before
passing it to external commands.

# User-Facing Changes
Given the shell script:
```shell
# test.sh
echo $@
```
## Before
```
>  sh test.sh -ldflags="-s -w" github.com
-ldflags="-s -w" github.com
> sh test.sh exp='-s -w' github.com
exp='-s -w' github.com
```
## After
```
>  sh test.sh -ldflags="-s -w" github.com
-ldflags=-s -w github.com
> sh test.sh exp='-s -w' github.com
exp=-s -w github.com
```

# Tests + Formatting
Added some tests
---
 crates/nu-command/src/system/run_external.rs | 27 ++++++++++++++------
 tests/shell/pipeline/commands/external.rs    | 14 ++++++++++
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index 614befe352..66d8dde23f 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -218,14 +218,16 @@ impl Command for External {
 
 /// Removes surrounding quotes from a string. Doesn't remove quotes from raw
 /// strings. Returns the original string if it doesn't have matching quotes.
-fn remove_quotes(s: &str) -> &str {
+fn remove_quotes(s: &str) -> Cow<'_, str> {
     let quoted_by_double_quotes = s.len() >= 2 && s.starts_with('"') && s.ends_with('"');
     let quoted_by_single_quotes = s.len() >= 2 && s.starts_with('\'') && s.ends_with('\'');
     let quoted_by_backticks = s.len() >= 2 && s.starts_with('`') && s.ends_with('`');
-    if quoted_by_double_quotes || quoted_by_single_quotes || quoted_by_backticks {
-        &s[1..s.len() - 1]
+    if quoted_by_double_quotes {
+        Cow::Owned(s[1..s.len() - 1].to_string().replace(r#"\""#, "\""))
+    } else if quoted_by_single_quotes || quoted_by_backticks {
+        Cow::Borrowed(&s[1..s.len() - 1])
     } else {
-        s
+        Cow::Borrowed(s)
     }
 }
 
@@ -400,10 +402,6 @@ fn expand_glob(
 /// with double quotes, single quotes, or backticks. Only removes the outermost
 /// pair of quotes after the equal sign.
 fn remove_inner_quotes(arg: &str) -> Cow<'_, str> {
-    // Check that `arg` is a long option.
-    if !arg.starts_with("--") {
-        return Cow::Borrowed(arg);
-    }
     // Split `arg` on the first `=`.
     let Some((option, value)) = arg.split_once('=') else {
         return Cow::Borrowed(arg);
@@ -660,6 +658,7 @@ mod test {
         assert_eq!(remove_quotes(r#"`foo '"' bar`"#), r#"foo '"' bar"#);
         assert_eq!(remove_quotes(r#"'foo' bar"#), r#"'foo' bar"#);
         assert_eq!(remove_quotes(r#"r#'foo'#"#), r#"r#'foo'#"#);
+        assert_eq!(remove_quotes(r#""foo\" bar""#), r#"foo" bar"#);
     }
 
     #[test]
@@ -758,6 +757,18 @@ mod test {
         let actual = remove_inner_quotes(r#"--option "value""#);
         let expected = r#"--option "value""#;
         assert_eq!(actual, expected);
+
+        let actual = remove_inner_quotes(r#"-option="value""#);
+        let expected = r#"-option=value"#;
+        assert_eq!(actual, expected);
+
+        let actual = remove_inner_quotes(r#"option="value""#);
+        let expected = r#"option=value"#;
+        assert_eq!(actual, expected);
+
+        let actual = remove_inner_quotes(r#"option="v\"value""#);
+        let expected = r#"option=v"value"#;
+        assert_eq!(actual, expected);
     }
 
     #[test]
diff --git a/tests/shell/pipeline/commands/external.rs b/tests/shell/pipeline/commands/external.rs
index 2b116eb86d..a73cbc878d 100644
--- a/tests/shell/pipeline/commands/external.rs
+++ b/tests/shell/pipeline/commands/external.rs
@@ -590,4 +590,18 @@ mod external_command_arguments {
 
         assert_eq!(actual.out, "a;&$(hello)");
     }
+
+    #[test]
+    fn remove_quotes_in_shell_arguments() {
+        let actual = nu!("nu --testbin cococo expression='-r -w'");
+        assert_eq!(actual.out, "expression=-r -w");
+        let actual = nu!(r#"nu --testbin cococo expression="-r -w""#);
+        assert_eq!(actual.out, "expression=-r -w");
+        let actual = nu!("nu --testbin cococo expression='-r -w'");
+        assert_eq!(actual.out, "expression=-r -w");
+        let actual = nu!(r#"nu --testbin cococo expression="-r\" -w""#);
+        assert_eq!(actual.out, r#"expression=-r" -w"#);
+        let actual = nu!(r#"nu --testbin cococo expression='-r\" -w'"#);
+        assert_eq!(actual.out, r#"expression=-r\" -w"#);
+    }
 }

From f2f4b83886d0060b93eef49baac1bb3ce18d42af Mon Sep 17 00:00:00 2001
From: Reilly Wood <26268125+rgwood@users.noreply.github.com>
Date: Thu, 6 Jun 2024 06:46:43 -0700
Subject: [PATCH 0075/1072] Overhaul `explore` config (#13075)

Configuration in `explore` has always been confusing to me. This PR
overhauls (and simplifies, I think) how configuration is done.

# Details

1. Configuration is now strongly typed. In `Explore::run()` we create an
`ExploreConfig` struct from the more general Nu configuration and
arguments to `explore`, then pass that struct to other parts of
`explore` that need configuration. IMO this is a lot easier to reason
about and trace than the previous approach of creating a
`HashMap<String, Value>` and then using that to make various structs
elsewhere.
2. We now inherit more configuration from the config used for regular Nu
tables
1. Border/line styling now uses the `separator` style used for regular
Nu tables, the special `explore.split_line` config point has been
retired.
2. Cell padding in tables is now controlled by `table.padding` instead
of the undocumented `column_padding_left`/`column_padding_right` config
3. The (optional, previously not enabled by default) `selected_row` and
`selected_column` configuration has been removed. We now only highlight
the selected cell. I could re-add this if people really like the feature
but I'm guessing nobody uses it.

The interface still looks the same with a default/empty config.nu:


![image](https://github.com/nushell/nushell/assets/26268125/e40161ba-a8ec-407a-932d-5ece6f4dc616)
---
 crates/nu-explore/src/commands/table.rs       |  35 ---
 crates/nu-explore/src/commands/try.rs         |   6 +-
 crates/nu-explore/src/explore.rs              | 285 +++++++-----------
 crates/nu-explore/src/lib.rs                  |   4 +-
 crates/nu-explore/src/nu_common/mod.rs        |   2 +-
 crates/nu-explore/src/nu_common/value.rs      |   4 -
 crates/nu-explore/src/pager/mod.rs            | 202 +++----------
 crates/nu-explore/src/views/binary/mod.rs     |  36 +--
 crates/nu-explore/src/views/mod.rs            |  12 +-
 crates/nu-explore/src/views/record/mod.rs     | 160 ++--------
 .../src/views/record/table_widget.rs          |  48 ++-
 .../src/views/{interactive.rs => try.rs}      |  59 +---
 crates/nu-explore/src/views/util.rs           |   5 -
 .../src/sample_config/default_config.nu       |   7 +-
 14 files changed, 229 insertions(+), 636 deletions(-)
 rename crates/nu-explore/src/views/{interactive.rs => try.rs} (82%)

diff --git a/crates/nu-explore/src/commands/table.rs b/crates/nu-explore/src/commands/table.rs
index 39ef8f0f99..6bc6268067 100644
--- a/crates/nu-explore/src/commands/table.rs
+++ b/crates/nu-explore/src/commands/table.rs
@@ -4,7 +4,6 @@ use crate::{
     views::{Orientation, RecordView},
 };
 use anyhow::Result;
-use nu_ansi_term::Style;
 use nu_protocol::{
     engine::{EngineState, Stack},
     Value,
@@ -19,12 +18,6 @@ pub struct TableCmd {
 #[derive(Debug, Default, Clone)]
 struct TableSettings {
     orientation: Option<Orientation>,
-    split_line_s: Option<Style>,
-    selected_cell_s: Option<Style>,
-    selected_row_s: Option<Style>,
-    selected_column_s: Option<Style>,
-    padding_column_left: Option<usize>,
-    padding_column_right: Option<usize>,
     turn_on_cursor_mode: bool,
 }
 
@@ -64,8 +57,6 @@ impl ViewCommand for TableCmd {
 
         let mut view = RecordView::new(columns, data);
 
-        // todo: use setup instead ????
-
         if is_record {
             view.set_orientation_current(Orientation::Left);
         }
@@ -74,32 +65,6 @@ impl ViewCommand for TableCmd {
             view.set_orientation_current(o);
         }
 
-        if let Some(style) = self.settings.selected_cell_s {
-            view.set_style_selected_cell(style);
-        }
-
-        if let Some(style) = self.settings.selected_column_s {
-            view.set_style_selected_column(style);
-        }
-
-        if let Some(style) = self.settings.selected_row_s {
-            view.set_style_selected_row(style);
-        }
-
-        if let Some(style) = self.settings.split_line_s {
-            view.set_style_split_line(style);
-        }
-
-        if let Some(p) = self.settings.padding_column_left {
-            let c = view.get_padding_column();
-            view.set_padding_column((p, c.1))
-        }
-
-        if let Some(p) = self.settings.padding_column_right {
-            let c = view.get_padding_column();
-            view.set_padding_column((c.0, p))
-        }
-
         if self.settings.turn_on_cursor_mode {
             view.set_cursor_mode();
         }
diff --git a/crates/nu-explore/src/commands/try.rs b/crates/nu-explore/src/commands/try.rs
index cb230908d4..a81ce13e21 100644
--- a/crates/nu-explore/src/commands/try.rs
+++ b/crates/nu-explore/src/commands/try.rs
@@ -1,5 +1,5 @@
 use super::ViewCommand;
-use crate::views::InteractiveView;
+use crate::views::TryView;
 use anyhow::Result;
 use nu_protocol::{
     engine::{EngineState, Stack},
@@ -22,7 +22,7 @@ impl TryCmd {
 }
 
 impl ViewCommand for TryCmd {
-    type View = InteractiveView<'static>;
+    type View = TryView<'static>;
 
     fn name(&self) -> &'static str {
         Self::NAME
@@ -45,7 +45,7 @@ impl ViewCommand for TryCmd {
         value: Option<Value>,
     ) -> Result<Self::View> {
         let value = value.unwrap_or_default();
-        let mut view = InteractiveView::new(value);
+        let mut view = TryView::new(value);
         view.init(self.command.clone());
         view.try_run(engine_state, stack)?;
 
diff --git a/crates/nu-explore/src/explore.rs b/crates/nu-explore/src/explore.rs
index 15a7b94041..e5498ce5b3 100644
--- a/crates/nu-explore/src/explore.rs
+++ b/crates/nu-explore/src/explore.rs
@@ -1,13 +1,12 @@
 use crate::{
     run_pager,
-    util::{create_lscolors, create_map, map_into_value},
-    PagerConfig, StyleConfig,
+    util::{create_lscolors, create_map},
+    PagerConfig,
 };
 use nu_ansi_term::{Color, Style};
 use nu_color_config::{get_color_map, StyleComputer};
 use nu_engine::command_prelude::*;
-
-use std::collections::HashMap;
+use nu_protocol::Config;
 
 /// A `less` like program to render a [`Value`] as a table.
 #[derive(Clone)]
@@ -68,19 +67,21 @@ impl Command for Explore {
         let nu_config = engine_state.get_config();
         let style_computer = StyleComputer::from_config(engine_state, stack);
 
-        let mut config = nu_config.explore.clone();
-        include_nu_config(&mut config, &style_computer);
-        update_config(&mut config, show_index, show_head);
-        prepare_default_config(&mut config);
-
-        let style = style_from_config(&config);
+        let mut explore_config = ExploreConfig::from_nu_config(nu_config);
+        explore_config.table.show_header = show_head;
+        explore_config.table.show_index = show_index;
+        explore_config.table.separator_style = lookup_color(&style_computer, "separator");
 
         let lscolors = create_lscolors(engine_state, stack);
 
-        let mut config = PagerConfig::new(nu_config, &style_computer, &lscolors, config);
-        config.style = style;
-        config.peek_value = peek_value;
-        config.tail = tail;
+        let config = PagerConfig::new(
+            nu_config,
+            &explore_config,
+            &style_computer,
+            &lscolors,
+            peek_value,
+            tail,
+        );
 
         let result = run_pager(engine_state, &mut stack.clone(), ctrlc, input, config);
 
@@ -134,153 +135,118 @@ impl Command for Explore {
     }
 }
 
-fn update_config(config: &mut HashMap<String, Value>, show_index: bool, show_head: bool) {
-    let mut hm = config.get("table").and_then(create_map).unwrap_or_default();
-    if show_index {
-        insert_bool(&mut hm, "show_index", show_index);
-    }
-
-    if show_head {
-        insert_bool(&mut hm, "show_head", show_head);
-    }
-
-    config.insert(String::from("table"), map_into_value(hm));
+#[derive(Debug, Clone)]
+pub struct ExploreConfig {
+    pub table: TableConfig,
+    pub selected_cell: Style,
+    pub status_info: Style,
+    pub status_success: Style,
+    pub status_warn: Style,
+    pub status_error: Style,
+    pub status_bar_background: Style,
+    pub status_bar_text: Style,
+    pub cmd_bar_text: Style,
+    pub cmd_bar_background: Style,
+    pub highlight: Style,
+    /// if true, the explore view will immediately try to run the command as it is typed
+    pub try_reactive: bool,
 }
 
-fn style_from_config(config: &HashMap<String, Value>) -> StyleConfig {
-    let mut style = StyleConfig::default();
-
-    let colors = get_color_map(config);
-
-    if let Some(s) = colors.get("status_bar_text") {
-        style.status_bar_text = *s;
-    }
-
-    if let Some(s) = colors.get("status_bar_background") {
-        style.status_bar_background = *s;
-    }
-
-    if let Some(s) = colors.get("command_bar_text") {
-        style.cmd_bar_text = *s;
-    }
-
-    if let Some(s) = colors.get("command_bar_background") {
-        style.cmd_bar_background = *s;
-    }
-
-    if let Some(hm) = config.get("status").and_then(create_map) {
-        let colors = get_color_map(&hm);
-
-        if let Some(s) = colors.get("info") {
-            style.status_info = *s;
-        }
-
-        if let Some(s) = colors.get("success") {
-            style.status_success = *s;
-        }
-
-        if let Some(s) = colors.get("warn") {
-            style.status_warn = *s;
-        }
-
-        if let Some(s) = colors.get("error") {
-            style.status_error = *s;
+impl Default for ExploreConfig {
+    fn default() -> Self {
+        Self {
+            table: TableConfig::default(),
+            selected_cell: color(None, Some(Color::LightBlue)),
+            status_info: color(None, None),
+            status_success: color(Some(Color::Black), Some(Color::Green)),
+            status_warn: color(None, None),
+            status_error: color(Some(Color::White), Some(Color::Red)),
+            status_bar_background: color(
+                Some(Color::Rgb(29, 31, 33)),
+                Some(Color::Rgb(196, 201, 198)),
+            ),
+            status_bar_text: color(None, None),
+            cmd_bar_text: color(Some(Color::Rgb(196, 201, 198)), None),
+            cmd_bar_background: color(None, None),
+            highlight: color(Some(Color::Black), Some(Color::Yellow)),
+            try_reactive: false,
         }
     }
-
-    style
 }
+impl ExploreConfig {
+    /// take the default explore config and update it with relevant values from the nu config
+    pub fn from_nu_config(config: &Config) -> Self {
+        let mut ret = Self::default();
 
-fn prepare_default_config(config: &mut HashMap<String, Value>) {
-    const STATUS_BAR: Style = color(
-        Some(Color::Rgb(29, 31, 33)),
-        Some(Color::Rgb(196, 201, 198)),
-    );
-    const INPUT_BAR: Style = color(Some(Color::Rgb(196, 201, 198)), None);
+        ret.table.column_padding_left = config.table_indent.left;
+        ret.table.column_padding_right = config.table_indent.right;
 
-    const HIGHLIGHT: Style = color(Some(Color::Black), Some(Color::Yellow));
+        let explore_cfg_hash_map = config.explore.clone();
+        let colors = get_color_map(&explore_cfg_hash_map);
 
-    const STATUS_ERROR: Style = color(Some(Color::White), Some(Color::Red));
-    const STATUS_INFO: Style = color(None, None);
-    const STATUS_SUCCESS: Style = color(Some(Color::Black), Some(Color::Green));
-    const STATUS_WARN: Style = color(None, None);
+        if let Some(s) = colors.get("status_bar_text") {
+            ret.status_bar_text = *s;
+        }
 
-    const TABLE_SPLIT_LINE: Style = color(Some(Color::Rgb(64, 64, 64)), None);
-    const TABLE_SELECT_CELL: Style = color(None, None);
-    const TABLE_SELECT_ROW: Style = color(None, None);
-    const TABLE_SELECT_COLUMN: Style = color(None, None);
+        if let Some(s) = colors.get("status_bar_background") {
+            ret.status_bar_background = *s;
+        }
 
-    const HEXDUMP_INDEX: Style = color(Some(Color::Cyan), None);
-    const HEXDUMP_SEGMENT: Style = color(Some(Color::Cyan), None).bold();
-    const HEXDUMP_SEGMENT_ZERO: Style = color(Some(Color::Purple), None).bold();
-    const HEXDUMP_SEGMENT_UNKNOWN: Style = color(Some(Color::Green), None).bold();
-    const HEXDUMP_ASCII: Style = color(Some(Color::Cyan), None).bold();
-    const HEXDUMP_ASCII_ZERO: Style = color(Some(Color::Purple), None).bold();
-    const HEXDUMP_ASCII_UNKNOWN: Style = color(Some(Color::Green), None).bold();
+        if let Some(s) = colors.get("command_bar_text") {
+            ret.cmd_bar_text = *s;
+        }
 
-    insert_style(config, "status_bar_background", STATUS_BAR);
-    insert_style(config, "command_bar_text", INPUT_BAR);
-    insert_style(config, "highlight", HIGHLIGHT);
+        if let Some(s) = colors.get("command_bar_background") {
+            ret.cmd_bar_background = *s;
+        }
 
-    // because how config works we need to parse a string into Value::Record
+        if let Some(s) = colors.get("command_bar_background") {
+            ret.cmd_bar_background = *s;
+        }
 
-    {
-        let mut hm = config
-            .get("status")
-            .and_then(parse_hash_map)
-            .unwrap_or_default();
+        if let Some(s) = colors.get("selected_cell") {
+            ret.selected_cell = *s;
+        }
 
-        insert_style(&mut hm, "info", STATUS_INFO);
-        insert_style(&mut hm, "success", STATUS_SUCCESS);
-        insert_style(&mut hm, "warn", STATUS_WARN);
-        insert_style(&mut hm, "error", STATUS_ERROR);
+        if let Some(hm) = explore_cfg_hash_map.get("status").and_then(create_map) {
+            let colors = get_color_map(&hm);
 
-        config.insert(String::from("status"), map_into_value(hm));
-    }
+            if let Some(s) = colors.get("info") {
+                ret.status_info = *s;
+            }
 
-    {
-        let mut hm = config
-            .get("table")
-            .and_then(parse_hash_map)
-            .unwrap_or_default();
+            if let Some(s) = colors.get("success") {
+                ret.status_success = *s;
+            }
 
-        insert_style(&mut hm, "split_line", TABLE_SPLIT_LINE);
-        insert_style(&mut hm, "selected_cell", TABLE_SELECT_CELL);
-        insert_style(&mut hm, "selected_row", TABLE_SELECT_ROW);
-        insert_style(&mut hm, "selected_column", TABLE_SELECT_COLUMN);
+            if let Some(s) = colors.get("warn") {
+                ret.status_warn = *s;
+            }
 
-        config.insert(String::from("table"), map_into_value(hm));
-    }
+            if let Some(s) = colors.get("error") {
+                ret.status_error = *s;
+            }
+        }
 
-    {
-        let mut hm = config
-            .get("hex-dump")
-            .and_then(create_map)
-            .unwrap_or_default();
+        if let Some(hm) = explore_cfg_hash_map.get("try").and_then(create_map) {
+            if let Some(reactive) = hm.get("reactive") {
+                if let Ok(b) = reactive.as_bool() {
+                    ret.try_reactive = b;
+                }
+            }
+        }
 
-        insert_style(&mut hm, "color_index", HEXDUMP_INDEX);
-        insert_style(&mut hm, "color_segment", HEXDUMP_SEGMENT);
-        insert_style(&mut hm, "color_segment_zero", HEXDUMP_SEGMENT_ZERO);
-        insert_style(&mut hm, "color_segment_unknown", HEXDUMP_SEGMENT_UNKNOWN);
-        insert_style(&mut hm, "color_ascii", HEXDUMP_ASCII);
-        insert_style(&mut hm, "color_ascii_zero", HEXDUMP_ASCII_ZERO);
-        insert_style(&mut hm, "color_ascii_unknown", HEXDUMP_ASCII_UNKNOWN);
-
-        insert_int(&mut hm, "segment_size", 2);
-        insert_int(&mut hm, "count_segments", 8);
-
-        insert_bool(&mut hm, "split", true);
-
-        config.insert(String::from("hex-dump"), map_into_value(hm));
+        ret
     }
 }
 
-fn parse_hash_map(value: &Value) -> Option<HashMap<String, Value>> {
-    value.as_record().ok().map(|val| {
-        val.iter()
-            .map(|(col, val)| (col.clone(), val.clone()))
-            .collect::<HashMap<_, _>>()
-    })
+#[derive(Debug, Default, Clone, Copy)]
+pub struct TableConfig {
+    pub separator_style: Style,
+    pub show_index: bool,
+    pub show_header: bool,
+    pub column_padding_left: usize,
+    pub column_padding_right: usize,
 }
 
 const fn color(foreground: Option<Color>, background: Option<Color>) -> Style {
@@ -299,49 +265,6 @@ const fn color(foreground: Option<Color>, background: Option<Color>) -> Style {
     }
 }
 
-fn insert_style(map: &mut HashMap<String, Value>, key: &str, value: Style) {
-    if map.contains_key(key) {
-        return;
-    }
-
-    if value == Style::default() {
-        return;
-    }
-
-    let value = nu_color_config::NuStyle::from(value);
-    if let Ok(val) = nu_json::to_string_raw(&value) {
-        map.insert(String::from(key), Value::string(val, Span::unknown()));
-    }
-}
-
-fn insert_bool(map: &mut HashMap<String, Value>, key: &str, value: bool) {
-    if map.contains_key(key) {
-        return;
-    }
-
-    map.insert(String::from(key), Value::bool(value, Span::unknown()));
-}
-
-fn insert_int(map: &mut HashMap<String, Value>, key: &str, value: i64) {
-    if map.contains_key(key) {
-        return;
-    }
-
-    map.insert(String::from(key), Value::int(value, Span::unknown()));
-}
-
-fn include_nu_config(config: &mut HashMap<String, Value>, style_computer: &StyleComputer) {
-    let line_color = lookup_color(style_computer, "separator");
-    if line_color != nu_ansi_term::Style::default() {
-        let mut map = config
-            .get("table")
-            .and_then(parse_hash_map)
-            .unwrap_or_default();
-        insert_style(&mut map, "split_line", line_color);
-        config.insert(String::from("table"), map_into_value(map));
-    }
-}
-
 fn lookup_color(style_computer: &StyleComputer, key: &str) -> nu_ansi_term::Style {
     style_computer.compute(key, &Value::nothing(Span::unknown()))
 }
diff --git a/crates/nu-explore/src/lib.rs b/crates/nu-explore/src/lib.rs
index 0f5f9a1619..562602c394 100644
--- a/crates/nu-explore/src/lib.rs
+++ b/crates/nu-explore/src/lib.rs
@@ -15,13 +15,13 @@ use nu_protocol::{
     engine::{EngineState, Stack},
     PipelineData, Value,
 };
-use pager::{Page, Pager, PagerConfig, StyleConfig};
+use pager::{Page, Pager, PagerConfig};
 use registry::CommandRegistry;
 use terminal_size::{Height, Width};
 use views::{BinaryView, Orientation, Preview, RecordView};
 
 mod util {
-    pub use super::nu_common::{create_lscolors, create_map, map_into_value};
+    pub use super::nu_common::{create_lscolors, create_map};
 }
 
 fn run_pager(
diff --git a/crates/nu-explore/src/nu_common/mod.rs b/crates/nu-explore/src/nu_common/mod.rs
index 78bb61db72..091a7d6f36 100644
--- a/crates/nu-explore/src/nu_common/mod.rs
+++ b/crates/nu-explore/src/nu_common/mod.rs
@@ -18,7 +18,7 @@ pub use command::run_command_with_value;
 pub use lscolor::{create_lscolors, lscolorize};
 pub use string::{string_width, truncate_str};
 pub use table::try_build_table;
-pub use value::{collect_input, collect_pipeline, create_map, map_into_value};
+pub use value::{collect_input, collect_pipeline, create_map};
 
 pub fn has_simple_value(data: &[Vec<Value>]) -> Option<&Value> {
     if data.len() == 1
diff --git a/crates/nu-explore/src/nu_common/value.rs b/crates/nu-explore/src/nu_common/value.rs
index 8aa71a28bf..ae90278358 100644
--- a/crates/nu-explore/src/nu_common/value.rs
+++ b/crates/nu-explore/src/nu_common/value.rs
@@ -176,10 +176,6 @@ pub fn create_map(value: &Value) -> Option<HashMap<String, Value>> {
     )
 }
 
-pub fn map_into_value(hm: HashMap<String, Value>) -> Value {
-    Value::record(hm.into_iter().collect(), NuSpan::unknown())
-}
-
 fn unknown_error_value() -> Value {
     Value::string(String::from("❎"), NuSpan::unknown())
 }
diff --git a/crates/nu-explore/src/pager/mod.rs b/crates/nu-explore/src/pager/mod.rs
index 4f43078846..a56df95bc7 100644
--- a/crates/nu-explore/src/pager/mod.rs
+++ b/crates/nu-explore/src/pager/mod.rs
@@ -10,9 +10,9 @@ use self::{
 };
 use super::views::{Layout, View};
 use crate::{
-    nu_common::{CtrlC, NuColor, NuConfig, NuSpan, NuStyle},
+    explore::ExploreConfig,
+    nu_common::{CtrlC, NuColor, NuConfig, NuStyle},
     registry::{Command, CommandRegistry},
-    util::map_into_value,
     views::{util::nu_style_to_tui, ViewConfig},
 };
 use anyhow::Result;
@@ -26,15 +26,14 @@ use crossterm::{
 };
 use events::UIEvents;
 use lscolors::LsColors;
-use nu_color_config::{lookup_ansi_color_style, StyleComputer};
+use nu_color_config::StyleComputer;
 use nu_protocol::{
     engine::{EngineState, Stack},
-    Record, Value,
+    Value,
 };
 use ratatui::{backend::CrosstermBackend, layout::Rect, widgets::Block};
 use std::{
     cmp::min,
-    collections::HashMap,
     io::{self, Stdout},
     result,
     sync::atomic::Ordering,
@@ -42,7 +41,6 @@ use std::{
 
 pub type Frame<'a> = ratatui::Frame<'a>;
 pub type Terminal = ratatui::Terminal<CrosstermBackend<Stdout>>;
-pub type ConfigMap = HashMap<String, Value>;
 
 #[derive(Debug, Clone)]
 pub struct Pager<'a> {
@@ -73,19 +71,6 @@ struct CommandBuf {
     cmd_exec_info: Option<String>,
 }
 
-#[derive(Debug, Default, Clone)]
-pub struct StyleConfig {
-    pub status_info: NuStyle,
-    pub status_success: NuStyle,
-    pub status_warn: NuStyle,
-    pub status_error: NuStyle,
-    pub status_bar_background: NuStyle,
-    pub status_bar_text: NuStyle,
-    pub cmd_bar_text: NuStyle,
-    pub cmd_bar_background: NuStyle,
-    pub highlight: NuStyle,
-}
-
 impl<'a> Pager<'a> {
     pub fn new(config: PagerConfig<'a>) -> Self {
         Self {
@@ -100,27 +85,6 @@ impl<'a> Pager<'a> {
         self.message = Some(text.into());
     }
 
-    pub fn set_config(&mut self, path: &[String], value: Value) -> bool {
-        let path = path.iter().map(|s| s.as_str()).collect::<Vec<_>>();
-
-        match &path[..] {
-            ["status_bar_text"] => value_as_style(&mut self.config.style.status_bar_text, &value),
-            ["status_bar_background"] => {
-                value_as_style(&mut self.config.style.status_bar_background, &value)
-            }
-            ["command_bar_text"] => value_as_style(&mut self.config.style.cmd_bar_text, &value),
-            ["command_bar_background"] => {
-                value_as_style(&mut self.config.style.cmd_bar_background, &value)
-            }
-            ["highlight"] => value_as_style(&mut self.config.style.highlight, &value),
-            ["status", "info"] => value_as_style(&mut self.config.style.status_info, &value),
-            ["status", "success"] => value_as_style(&mut self.config.style.status_success, &value),
-            ["status", "warn"] => value_as_style(&mut self.config.style.status_warn, &value),
-            ["status", "error"] => value_as_style(&mut self.config.style.status_error, &value),
-            path => set_config(&mut self.config.config, path, value),
-        }
-    }
-
     pub fn run(
         &mut self,
         engine_state: &EngineState,
@@ -132,8 +96,8 @@ impl<'a> Pager<'a> {
         if let Some(page) = &mut view {
             page.view.setup(ViewConfig::new(
                 self.config.nu_config,
+                self.config.explore_config,
                 self.config.style_computer,
-                &self.config.config,
                 self.config.lscolors,
             ))
         }
@@ -153,10 +117,9 @@ pub enum Transition {
 #[derive(Debug, Clone)]
 pub struct PagerConfig<'a> {
     pub nu_config: &'a NuConfig,
+    pub explore_config: &'a ExploreConfig,
     pub style_computer: &'a StyleComputer<'a>,
     pub lscolors: &'a LsColors,
-    pub config: ConfigMap,
-    pub style: StyleConfig,
     // If true, when quitting output the value of the cell the cursor was on
     pub peek_value: bool,
     pub tail: bool,
@@ -165,18 +128,19 @@ pub struct PagerConfig<'a> {
 impl<'a> PagerConfig<'a> {
     pub fn new(
         nu_config: &'a NuConfig,
+        explore_config: &'a ExploreConfig,
         style_computer: &'a StyleComputer,
         lscolors: &'a LsColors,
-        config: ConfigMap,
+        peek_value: bool,
+        tail: bool,
     ) -> Self {
         Self {
             nu_config,
+            explore_config,
             style_computer,
-            config,
             lscolors,
-            peek_value: false,
-            tail: false,
-            style: StyleConfig::default(),
+            peek_value,
+            tail,
         }
     }
 }
@@ -401,7 +365,7 @@ fn draw_frame(
 
     draw_info(f, pager, info);
 
-    highlight_search_results(f, pager, layout, pager.config.style.highlight);
+    highlight_search_results(f, pager, layout, pager.config.explore_config.highlight);
     set_cursor_cmd_bar(f, area, pager);
 }
 
@@ -411,19 +375,24 @@ fn draw_info(f: &mut Frame, pager: &mut Pager<'_>, info: ViewInfo) {
     if let Some(report) = info.status {
         let last_2nd_line = area.bottom().saturating_sub(2);
         let area = Rect::new(area.left(), last_2nd_line, area.width, 1);
-        render_status_bar(f, area, report, &pager.config.style);
+        render_status_bar(f, area, report, pager.config.explore_config);
     }
 
     {
         let last_line = area.bottom().saturating_sub(1);
         let area = Rect::new(area.left(), last_line, area.width, 1);
-        render_cmd_bar(f, area, pager, info.report, &pager.config.style);
+        render_cmd_bar(f, area, pager, info.report, pager.config.explore_config);
     }
 }
 
 fn create_view_config<'a>(pager: &'a Pager<'_>) -> ViewConfig<'a> {
     let cfg = &pager.config;
-    ViewConfig::new(cfg.nu_config, cfg.style_computer, &cfg.config, cfg.lscolors)
+    ViewConfig::new(
+        cfg.nu_config,
+        cfg.explore_config,
+        cfg.style_computer,
+        cfg.lscolors,
+    )
 }
 
 fn pager_run_command(
@@ -463,16 +432,7 @@ fn run_command(
             let value = view_stack.curr_view.as_mut().and_then(|p| p.view.exit());
             let transition = command.react(engine_state, stack, pager, value)?;
             match transition {
-                Transition::Ok => {
-                    // so we basically allow a change of a config inside a command,
-                    // and cause of this we wanna update all of our views.
-                    //
-                    // THOUGH: MOST LIKELY IT WON'T BE CHANGED AND WE DO A WASTE.......
-
-                    update_view_stack_setup(view_stack, &pager.config);
-
-                    Ok(CmdResult::new(false, false, String::new()))
-                }
+                Transition::Ok => Ok(CmdResult::new(false, false, String::new())),
                 Transition::Exit => Ok(CmdResult::new(true, false, String::new())),
                 Transition::Cmd { .. } => todo!("not used so far"),
             }
@@ -487,7 +447,8 @@ fn run_command(
                 }
             }
 
-            update_view_setup(&mut new_view, &pager.config);
+            setup_view(&mut new_view, &pager.config);
+
             view_stack.curr_view = Some(Page::raw(new_view, stackable));
 
             Ok(CmdResult::new(false, true, cmd.name().to_owned()))
@@ -495,18 +456,13 @@ fn run_command(
     }
 }
 
-fn update_view_stack_setup(view_stack: &mut ViewStack, cfg: &PagerConfig<'_>) {
-    if let Some(page) = view_stack.curr_view.as_mut() {
-        update_view_setup(&mut page.view, cfg);
-    }
-
-    for page in &mut view_stack.stack {
-        update_view_setup(&mut page.view, cfg);
-    }
-}
-
-fn update_view_setup(view: &mut Box<dyn View>, cfg: &PagerConfig<'_>) {
-    let cfg = ViewConfig::new(cfg.nu_config, cfg.style_computer, &cfg.config, cfg.lscolors);
+fn setup_view(view: &mut Box<dyn View>, cfg: &PagerConfig<'_>) {
+    let cfg = ViewConfig::new(
+        cfg.nu_config,
+        cfg.explore_config,
+        cfg.style_computer,
+        cfg.lscolors,
+    );
     view.setup(cfg);
 }
 
@@ -528,7 +484,7 @@ fn set_cursor_cmd_bar(f: &mut Frame, area: Rect, pager: &Pager) {
     }
 }
 
-fn render_status_bar(f: &mut Frame, area: Rect, report: Report, theme: &StyleConfig) {
+fn render_status_bar(f: &mut Frame, area: Rect, report: Report, theme: &ExploreConfig) {
     let msg_style = report_msg_style(&report, theme, theme.status_bar_text);
     let mut status_bar = create_status_bar(report);
     status_bar.set_background_style(theme.status_bar_background);
@@ -549,11 +505,11 @@ fn create_status_bar(report: Report) -> StatusBar {
     )
 }
 
-fn report_msg_style(report: &Report, theme: &StyleConfig, style: NuStyle) -> NuStyle {
+fn report_msg_style(report: &Report, config: &ExploreConfig, style: NuStyle) -> NuStyle {
     if matches!(report.level, Severity::Info) {
         style
     } else {
-        report_level_style(report.level, theme)
+        report_level_style(report.level, config)
     }
 }
 
@@ -562,15 +518,15 @@ fn render_cmd_bar(
     area: Rect,
     pager: &Pager,
     report: Option<Report>,
-    theme: &StyleConfig,
+    config: &ExploreConfig,
 ) {
     if let Some(report) = report {
-        let style = report_msg_style(&report, theme, theme.cmd_bar_text);
+        let style = report_msg_style(&report, config, config.cmd_bar_text);
         let bar = CommandBar::new(
             &report.message,
             &report.context1,
             style,
-            theme.cmd_bar_background,
+            config.cmd_bar_background,
         );
 
         f.render_widget(bar, area);
@@ -578,16 +534,16 @@ fn render_cmd_bar(
     }
 
     if pager.cmd_buf.is_cmd_input {
-        render_cmd_bar_cmd(f, area, pager, theme);
+        render_cmd_bar_cmd(f, area, pager, config);
         return;
     }
 
     if pager.search_buf.is_search_input || !pager.search_buf.buf_cmd_input.is_empty() {
-        render_cmd_bar_search(f, area, pager, theme);
+        render_cmd_bar_search(f, area, pager, config);
     }
 }
 
-fn render_cmd_bar_search(f: &mut Frame, area: Rect, pager: &Pager<'_>, theme: &StyleConfig) {
+fn render_cmd_bar_search(f: &mut Frame, area: Rect, pager: &Pager<'_>, config: &ExploreConfig) {
     if pager.search_buf.search_results.is_empty() && !pager.search_buf.is_search_input {
         let message = format!("Pattern not found: {}", pager.search_buf.buf_cmd_input);
         let style = NuStyle {
@@ -596,7 +552,7 @@ fn render_cmd_bar_search(f: &mut Frame, area: Rect, pager: &Pager<'_>, theme: &S
             ..Default::default()
         };
 
-        let bar = CommandBar::new(&message, "", style, theme.cmd_bar_background);
+        let bar = CommandBar::new(&message, "", style, config.cmd_bar_background);
         f.render_widget(bar, area);
         return;
     }
@@ -615,11 +571,11 @@ fn render_cmd_bar_search(f: &mut Frame, area: Rect, pager: &Pager<'_>, theme: &S
         format!("[{index}/{total}]")
     };
 
-    let bar = CommandBar::new(&text, &info, theme.cmd_bar_text, theme.cmd_bar_background);
+    let bar = CommandBar::new(&text, &info, config.cmd_bar_text, config.cmd_bar_background);
     f.render_widget(bar, area);
 }
 
-fn render_cmd_bar_cmd(f: &mut Frame, area: Rect, pager: &Pager, theme: &StyleConfig) {
+fn render_cmd_bar_cmd(f: &mut Frame, area: Rect, pager: &Pager, config: &ExploreConfig) {
     let mut input = pager.cmd_buf.buf_cmd2.as_str();
     if input.len() > area.width as usize + 1 {
         // in such case we take last max_cmd_len chars
@@ -637,7 +593,7 @@ fn render_cmd_bar_cmd(f: &mut Frame, area: Rect, pager: &Pager, theme: &StyleCon
     let prefix = ':';
     let text = format!("{prefix}{input}");
 
-    let bar = CommandBar::new(&text, "", theme.cmd_bar_text, theme.cmd_bar_background);
+    let bar = CommandBar::new(&text, "", config.cmd_bar_text, config.cmd_bar_background);
     f.render_widget(bar, area);
 }
 
@@ -998,72 +954,12 @@ fn cmd_input_key_event(buf: &mut CommandBuf, key: &KeyEvent) -> bool {
     }
 }
 
-fn value_as_style(style: &mut nu_ansi_term::Style, value: &Value) -> bool {
-    match value.coerce_str() {
-        Ok(s) => {
-            *style = lookup_ansi_color_style(&s);
-            true
-        }
-        Err(_) => false,
-    }
-}
-
-fn set_config(hm: &mut HashMap<String, Value>, path: &[&str], value: Value) -> bool {
-    if path.is_empty() {
-        return false;
-    }
-
-    let key = path[0];
-
-    if !hm.contains_key(key) {
-        hm.insert(
-            key.to_string(),
-            Value::record(Record::new(), NuSpan::unknown()),
-        );
-    }
-
-    let val = hm.get_mut(key).expect("...");
-
-    if path.len() == 1 {
-        *val = value;
-        return true;
-    }
-
-    match val {
-        Value::Record { val: record, .. } => {
-            if path.len() == 2 {
-                let key = path[1];
-
-                record.to_mut().insert(key, value);
-            } else {
-                let mut hm2: HashMap<String, Value> = HashMap::new();
-                for (k, v) in record.iter() {
-                    hm2.insert(k.to_string(), v.clone());
-                }
-
-                let result = set_config(&mut hm2, &path[1..], value);
-                if !result {
-                    *val = map_into_value(hm2);
-                }
-
-                if path.len() == 2 {
-                } else {
-                    return false;
-                }
-            }
-
-            true
-        }
-        _ => false,
-    }
-}
-
-fn report_level_style(level: Severity, theme: &StyleConfig) -> NuStyle {
+fn report_level_style(level: Severity, config: &ExploreConfig) -> NuStyle {
     match level {
-        Severity::Info => theme.status_info,
-        Severity::Success => theme.status_success,
-        Severity::Warn => theme.status_warn,
-        Severity::Err => theme.status_error,
+        Severity::Info => config.status_info,
+        Severity::Success => config.status_success,
+        Severity::Warn => config.status_warn,
+        Severity::Err => config.status_error,
     }
 }
 
diff --git a/crates/nu-explore/src/views/binary/mod.rs b/crates/nu-explore/src/views/binary/mod.rs
index bc75002223..f288861be8 100644
--- a/crates/nu-explore/src/views/binary/mod.rs
+++ b/crates/nu-explore/src/views/binary/mod.rs
@@ -3,7 +3,6 @@
 mod binary_widget;
 
 use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
-use nu_color_config::get_color_map;
 use nu_protocol::{
     engine::{EngineState, Stack},
     Value,
@@ -11,12 +10,12 @@ use nu_protocol::{
 use ratatui::layout::Rect;
 
 use crate::{
+    explore::ExploreConfig,
     nu_common::NuText,
     pager::{
         report::{Report, Severity},
-        ConfigMap, Frame, Transition, ViewInfo,
+        Frame, Transition, ViewInfo,
     },
-    util::create_map,
     views::cursor::Position,
 };
 
@@ -90,12 +89,7 @@ impl View for BinaryView {
     }
 
     fn setup(&mut self, cfg: ViewConfig<'_>) {
-        let hm = match cfg.config.get("hex-dump").and_then(create_map) {
-            Some(hm) => hm,
-            None => return,
-        };
-
-        self.settings = settings_from_config(&hm);
+        self.settings = settings_from_config(cfg.explore_config);
 
         let count_rows =
             BinaryWidget::new(&self.data, self.settings.opts, Default::default()).count_lines();
@@ -184,30 +178,18 @@ fn handle_event_view_mode(view: &mut BinaryView, key: &KeyEvent) -> Option<Trans
     }
 }
 
-fn settings_from_config(config: &ConfigMap) -> Settings {
-    let colors = get_color_map(config);
-
+fn settings_from_config(config: &ExploreConfig) -> Settings {
+    // Most of this is hardcoded for now, add it to the config later if needed
     Settings {
-        opts: BinarySettings::new(
-            config_get_usize(config, "segment_size", 2),
-            config_get_usize(config, "count_segments", 8),
-        ),
+        opts: BinarySettings::new(2, 8),
         style: BinaryStyle::new(
-            colors.get("color_index").cloned(),
-            config_get_usize(config, "column_padding_left", 1) as u16,
-            config_get_usize(config, "column_padding_right", 1) as u16,
+            None,
+            config.table.column_padding_left as u16,
+            config.table.column_padding_right as u16,
         ),
     }
 }
 
-fn config_get_usize(config: &ConfigMap, key: &str, default: usize) -> usize {
-    config
-        .get(key)
-        .and_then(|v| v.coerce_str().ok())
-        .and_then(|s| s.parse::<usize>().ok())
-        .unwrap_or(default)
-}
-
 fn create_report(cursor: WindowCursor2D) -> Report {
     let covered_percent = report_row_position(cursor);
     let cursor = report_cursor_position(cursor);
diff --git a/crates/nu-explore/src/views/mod.rs b/crates/nu-explore/src/views/mod.rs
index dd0a4a3339..7aab197eb5 100644
--- a/crates/nu-explore/src/views/mod.rs
+++ b/crates/nu-explore/src/views/mod.rs
@@ -1,16 +1,16 @@
 mod binary;
 mod colored_text_widget;
 mod cursor;
-mod interactive;
 mod preview;
 mod record;
+mod r#try;
 pub mod util;
 
 use super::{
     nu_common::NuText,
     pager::{Frame, Transition, ViewInfo},
 };
-use crate::{nu_common::NuConfig, pager::ConfigMap};
+use crate::{explore::ExploreConfig, nu_common::NuConfig};
 use crossterm::event::KeyEvent;
 use lscolors::LsColors;
 use nu_color_config::StyleComputer;
@@ -21,8 +21,8 @@ use nu_protocol::{
 use ratatui::layout::Rect;
 
 pub use binary::BinaryView;
-pub use interactive::InteractiveView;
 pub use preview::Preview;
+pub use r#try::TryView;
 pub use record::{Orientation, RecordView};
 
 #[derive(Debug, Default)]
@@ -55,22 +55,22 @@ impl ElementInfo {
 #[derive(Debug, Clone, Copy)]
 pub struct ViewConfig<'a> {
     pub nu_config: &'a NuConfig,
+    pub explore_config: &'a ExploreConfig,
     pub style_computer: &'a StyleComputer<'a>,
-    pub config: &'a ConfigMap,
     pub lscolors: &'a LsColors,
 }
 
 impl<'a> ViewConfig<'a> {
     pub fn new(
         nu_config: &'a NuConfig,
+        explore_config: &'a ExploreConfig,
         style_computer: &'a StyleComputer<'a>,
-        config: &'a ConfigMap,
         lscolors: &'a LsColors,
     ) -> Self {
         Self {
             nu_config,
+            explore_config,
             style_computer,
-            config,
             lscolors,
         }
     }
diff --git a/crates/nu-explore/src/views/record/mod.rs b/crates/nu-explore/src/views/record/mod.rs
index b3cd93cfd3..557995c40b 100644
--- a/crates/nu-explore/src/views/record/mod.rs
+++ b/crates/nu-explore/src/views/record/mod.rs
@@ -1,26 +1,26 @@
 mod table_widget;
 
-use self::table_widget::{TableStyle, TableWidget, TableWidgetState};
+use self::table_widget::{TableWidget, TableWidgetState};
 use super::{
     cursor::{Position, WindowCursor2D},
     util::{make_styled_string, nu_style_to_tui},
     Layout, View, ViewConfig,
 };
 use crate::{
-    nu_common::{collect_input, lscolorize, NuConfig, NuSpan, NuStyle, NuText},
+    explore::ExploreConfig,
+    nu_common::{collect_input, lscolorize, NuSpan, NuText},
     pager::{
         report::{Report, Severity},
-        ConfigMap, Frame, Transition, ViewInfo,
+        Frame, Transition, ViewInfo,
     },
-    util::create_map,
     views::ElementInfo,
 };
 use anyhow::Result;
 use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
-use nu_color_config::{get_color_map, StyleComputer};
+use nu_color_config::StyleComputer;
 use nu_protocol::{
     engine::{EngineState, Stack},
-    Record, Span, Value,
+    Config, Record, Span, Value,
 };
 use ratatui::{layout::Rect, widgets::Block};
 use std::{borrow::Cow, collections::HashMap};
@@ -32,7 +32,7 @@ pub struct RecordView<'a> {
     layer_stack: Vec<RecordLayer<'a>>,
     mode: UIMode,
     orientation: Orientation,
-    theme: TableTheme,
+    cfg: ExploreConfig,
 }
 
 impl<'a> RecordView<'a> {
@@ -44,52 +44,18 @@ impl<'a> RecordView<'a> {
             layer_stack: vec![RecordLayer::new(columns, records)],
             mode: UIMode::View,
             orientation: Orientation::Top,
-            theme: TableTheme::default(),
+            // TODO: It's kind of gross how this temporarily has an incorrect/default config.
+            // See if we can pass correct config in through the constructor
+            cfg: ExploreConfig::default(),
         }
     }
 
     pub fn tail(&mut self, width: u16, height: u16) {
         let page_size =
-            estimate_page_size(Rect::new(0, 0, width, height), self.theme.table.show_header);
+            estimate_page_size(Rect::new(0, 0, width, height), self.cfg.table.show_header);
         tail_data(self, page_size as usize);
     }
 
-    pub fn set_style_split_line(&mut self, style: NuStyle) {
-        self.theme.table.splitline_style = style
-    }
-
-    pub fn set_style_selected_cell(&mut self, style: NuStyle) {
-        self.theme.cursor.selected_cell = Some(style)
-    }
-
-    pub fn set_style_selected_row(&mut self, style: NuStyle) {
-        self.theme.cursor.selected_row = Some(style)
-    }
-
-    pub fn set_style_selected_column(&mut self, style: NuStyle) {
-        self.theme.cursor.selected_column = Some(style)
-    }
-
-    pub fn set_padding_column(&mut self, (left, right): (usize, usize)) {
-        self.theme.table.column_padding_left = left;
-        self.theme.table.column_padding_right = right;
-    }
-
-    pub fn get_padding_column(&self) -> (usize, usize) {
-        (
-            self.theme.table.column_padding_left,
-            self.theme.table.column_padding_right,
-        )
-    }
-
-    pub fn get_theme(&self) -> &TableTheme {
-        &self.theme
-    }
-
-    pub fn set_theme(&mut self, theme: TableTheme) {
-        self.theme = theme;
-    }
-
     pub fn transpose(&mut self) {
         let layer = self.get_layer_last_mut();
         transpose_table(layer);
@@ -193,7 +159,7 @@ impl<'a> RecordView<'a> {
             style_computer,
             row,
             column,
-            self.theme.table,
+            self.cfg.table,
             layer.orientation,
         )
     }
@@ -252,11 +218,11 @@ impl View for RecordView<'_> {
                 column,
                 table_layout.count_rows,
                 self.get_layer_last().orientation,
-                self.theme.table.show_header,
+                self.cfg.table.show_header,
             );
 
             if let Some(info) = info {
-                highlight_cell(f, area, info.clone(), &self.theme.cursor);
+                highlight_selected_cell(f, info.clone(), &self.cfg);
             }
         }
     }
@@ -300,7 +266,7 @@ impl View for RecordView<'_> {
 
         let data = convert_records_to_string(
             &self.get_layer_last().records,
-            &NuConfig::default(),
+            &nu_protocol::Config::default(),
             &style_computer,
         );
 
@@ -338,22 +304,7 @@ impl View for RecordView<'_> {
 
     // todo: move the method to Command?
     fn setup(&mut self, cfg: ViewConfig<'_>) {
-        if let Some(hm) = cfg.config.get("table").and_then(create_map) {
-            self.theme = theme_from_config(&hm);
-
-            if let Some(orientation) = hm.get("orientation").and_then(|v| v.coerce_str().ok()) {
-                let orientation = match orientation.as_ref() {
-                    "left" => Some(Orientation::Left),
-                    "top" => Some(Orientation::Top),
-                    _ => None,
-                };
-
-                if let Some(orientation) = orientation {
-                    self.set_orientation(orientation);
-                    self.set_orientation_current(orientation);
-                }
-            }
-        }
+        self.cfg = cfg.explore_config.clone();
     }
 }
 
@@ -660,7 +611,7 @@ fn tail_data(state: &mut RecordView<'_>, page_size: usize) {
 
 fn convert_records_to_string(
     records: &[Vec<Value>],
-    cfg: &NuConfig,
+    cfg: &Config,
     style_computer: &StyleComputer,
 ) -> Vec<Vec<NuText>> {
     records
@@ -678,31 +629,8 @@ fn convert_records_to_string(
         .collect::<Vec<_>>()
 }
 
-fn highlight_cell(f: &mut Frame, area: Rect, info: ElementInfo, theme: &CursorStyle) {
-    // highlight selected column
-    if let Some(style) = theme.selected_column {
-        let highlight_block = Block::default().style(nu_style_to_tui(style));
-        let area = Rect::new(info.area.x, area.y, info.area.width, area.height);
-        f.render_widget(highlight_block.clone(), area);
-    }
-
-    // highlight selected row
-    if let Some(style) = theme.selected_row {
-        let highlight_block = Block::default().style(nu_style_to_tui(style));
-        let area = Rect::new(area.x, info.area.y, area.width, 1);
-        f.render_widget(highlight_block.clone(), area);
-    }
-
-    // highlight selected cell
-    let cell_style = match theme.selected_cell {
-        Some(s) => s,
-        None => {
-            let mut style = nu_ansi_term::Style::new();
-            // light blue chosen somewhat arbitrarily, looks OK but I'm not set on it
-            style.background = Some(nu_ansi_term::Color::LightBlue);
-            style
-        }
-    };
+fn highlight_selected_cell(f: &mut Frame, info: ElementInfo, cfg: &ExploreConfig) {
+    let cell_style = cfg.selected_cell;
     let highlight_block = Block::default().style(nu_style_to_tui(cell_style));
     let area = Rect::new(info.area.x, info.area.y, info.area.width, 1);
     f.render_widget(highlight_block.clone(), area)
@@ -842,53 +770,3 @@ fn _transpose_table(
 
     data
 }
-
-fn theme_from_config(config: &ConfigMap) -> TableTheme {
-    let mut theme = TableTheme::default();
-
-    let colors = get_color_map(config);
-
-    if let Some(s) = colors.get("split_line") {
-        theme.table.splitline_style = *s;
-    }
-
-    theme.cursor.selected_cell = colors.get("selected_cell").cloned();
-    theme.cursor.selected_row = colors.get("selected_row").cloned();
-    theme.cursor.selected_column = colors.get("selected_column").cloned();
-
-    theme.table.show_header = config_get_bool(config, "show_head", true);
-    theme.table.show_index = config_get_bool(config, "show_index", false);
-
-    theme.table.column_padding_left = config_get_usize(config, "column_padding_left", 1);
-    theme.table.column_padding_right = config_get_usize(config, "column_padding_right", 1);
-
-    theme
-}
-
-fn config_get_bool(config: &ConfigMap, key: &str, default: bool) -> bool {
-    config
-        .get(key)
-        .and_then(|v| v.as_bool().ok())
-        .unwrap_or(default)
-}
-
-fn config_get_usize(config: &ConfigMap, key: &str, default: usize) -> usize {
-    config
-        .get(key)
-        .and_then(|v| v.coerce_str().ok())
-        .and_then(|s| s.parse::<usize>().ok())
-        .unwrap_or(default)
-}
-
-#[derive(Debug, Default, Clone)]
-pub struct TableTheme {
-    table: TableStyle,
-    cursor: CursorStyle,
-}
-
-#[derive(Debug, Default, Clone)]
-struct CursorStyle {
-    selected_cell: Option<NuStyle>,
-    selected_column: Option<NuStyle>,
-    selected_row: Option<NuStyle>,
-}
diff --git a/crates/nu-explore/src/views/record/table_widget.rs b/crates/nu-explore/src/views/record/table_widget.rs
index 70debfd888..2410d1bd11 100644
--- a/crates/nu-explore/src/views/record/table_widget.rs
+++ b/crates/nu-explore/src/views/record/table_widget.rs
@@ -1,5 +1,6 @@
 use super::Layout;
 use crate::{
+    explore::TableConfig,
     nu_common::{truncate_str, NuStyle, NuText},
     views::util::{nu_style_to_tui, text_style_to_tui_style},
 };
@@ -23,7 +24,7 @@ pub struct TableWidget<'a> {
     data: Cow<'a, [Vec<NuText>]>,
     index_row: usize,
     index_column: usize,
-    style: TableStyle,
+    config: TableConfig,
     header_position: Orientation,
     style_computer: &'a StyleComputer<'a>,
 }
@@ -35,15 +36,6 @@ pub enum Orientation {
     Left,
 }
 
-#[derive(Debug, Default, Clone, Copy)]
-pub struct TableStyle {
-    pub splitline_style: NuStyle,
-    pub show_index: bool,
-    pub show_header: bool,
-    pub column_padding_left: usize,
-    pub column_padding_right: usize,
-}
-
 impl<'a> TableWidget<'a> {
     #[allow(clippy::too_many_arguments)]
     pub fn new(
@@ -52,7 +44,7 @@ impl<'a> TableWidget<'a> {
         style_computer: &'a StyleComputer<'a>,
         index_row: usize,
         index_column: usize,
-        style: TableStyle,
+        config: TableConfig,
         header_position: Orientation,
     ) -> Self {
         Self {
@@ -61,7 +53,7 @@ impl<'a> TableWidget<'a> {
             style_computer,
             index_row,
             index_column,
-            style,
+            config,
             header_position,
         }
     }
@@ -100,13 +92,13 @@ impl StatefulWidget for TableWidget<'_> {
 // todo: refactoring these to methods as they have quite a bit in common.
 impl<'a> TableWidget<'a> {
     fn render_table_horizontal(self, area: Rect, buf: &mut Buffer, state: &mut TableWidgetState) {
-        let padding_l = self.style.column_padding_left as u16;
-        let padding_r = self.style.column_padding_right as u16;
+        let padding_l = self.config.column_padding_left as u16;
+        let padding_r = self.config.column_padding_right as u16;
 
-        let show_index = self.style.show_index;
-        let show_head = self.style.show_header;
+        let show_index = self.config.show_index;
+        let show_head = self.config.show_header;
 
-        let splitline_s = self.style.splitline_style;
+        let separator_s = self.config.separator_style;
 
         let mut data_height = area.height;
         let mut data_y = area.y;
@@ -137,7 +129,7 @@ impl<'a> TableWidget<'a> {
         }
 
         if show_head {
-            render_header_borders(buf, area, 1, splitline_s);
+            render_header_borders(buf, area, 1, separator_s);
         }
 
         if show_index {
@@ -158,7 +150,7 @@ impl<'a> TableWidget<'a> {
                 data_height,
                 show_head,
                 false,
-                splitline_s,
+                separator_s,
             );
         }
 
@@ -250,7 +242,7 @@ impl<'a> TableWidget<'a> {
                 data_height,
                 show_head,
                 false,
-                splitline_s,
+                separator_s,
             );
         }
 
@@ -268,12 +260,12 @@ impl<'a> TableWidget<'a> {
             return;
         }
 
-        let padding_l = self.style.column_padding_left as u16;
-        let padding_r = self.style.column_padding_right as u16;
+        let padding_l = self.config.column_padding_left as u16;
+        let padding_r = self.config.column_padding_right as u16;
 
-        let show_index = self.style.show_index;
-        let show_head = self.style.show_header;
-        let splitline_s = self.style.splitline_style;
+        let show_index = self.config.show_index;
+        let show_head = self.config.show_header;
+        let separator_s = self.config.separator_style;
 
         let mut left_w = 0;
 
@@ -295,7 +287,7 @@ impl<'a> TableWidget<'a> {
                 area.height,
                 false,
                 false,
-                splitline_s,
+                separator_s,
             );
         }
 
@@ -327,7 +319,7 @@ impl<'a> TableWidget<'a> {
                     area.height,
                     false,
                     false,
-                    splitline_s,
+                    separator_s,
                 );
             }
 
@@ -352,7 +344,7 @@ impl<'a> TableWidget<'a> {
                 area.height,
                 false,
                 false,
-                splitline_s,
+                separator_s,
             );
         }
 
diff --git a/crates/nu-explore/src/views/interactive.rs b/crates/nu-explore/src/views/try.rs
similarity index 82%
rename from crates/nu-explore/src/views/interactive.rs
rename to crates/nu-explore/src/views/try.rs
index d95a78f85e..9acbb84208 100644
--- a/crates/nu-explore/src/views/interactive.rs
+++ b/crates/nu-explore/src/views/try.rs
@@ -1,16 +1,10 @@
-use super::{
-    record::{RecordView, TableTheme},
-    util::{lookup_tui_color, nu_style_to_tui},
-    Layout, Orientation, View, ViewConfig,
-};
+use super::{record::RecordView, util::nu_style_to_tui, Layout, Orientation, View, ViewConfig};
 use crate::{
     nu_common::{collect_pipeline, run_command_with_value},
     pager::{report::Report, Frame, Transition, ViewInfo},
-    util::create_map,
 };
 use anyhow::Result;
 use crossterm::event::{KeyCode, KeyEvent};
-use nu_color_config::get_color_map;
 use nu_protocol::{
     engine::{EngineState, Stack},
     PipelineData, Value,
@@ -22,26 +16,22 @@ use ratatui::{
 };
 use std::cmp::min;
 
-pub struct InteractiveView<'a> {
+pub struct TryView<'a> {
     input: Value,
     command: String,
-    immediate: bool,
+    reactive: bool,
     table: Option<RecordView<'a>>,
-    table_theme: TableTheme,
     view_mode: bool,
     border_color: Style,
-    highlighted_color: Style,
 }
 
-impl<'a> InteractiveView<'a> {
+impl<'a> TryView<'a> {
     pub fn new(input: Value) -> Self {
         Self {
             input,
             table: None,
-            immediate: false,
-            table_theme: TableTheme::default(),
+            reactive: false,
             border_color: Style::default(),
-            highlighted_color: Style::default(),
             view_mode: false,
             command: String::new(),
         }
@@ -52,18 +42,15 @@ impl<'a> InteractiveView<'a> {
     }
 
     pub fn try_run(&mut self, engine_state: &EngineState, stack: &mut Stack) -> Result<()> {
-        let mut view = run_command(&self.command, &self.input, engine_state, stack)?;
-        view.set_theme(self.table_theme.clone());
-
+        let view = run_command(&self.command, &self.input, engine_state, stack)?;
         self.table = Some(view);
         Ok(())
     }
 }
 
-impl View for InteractiveView<'_> {
+impl View for TryView<'_> {
     fn draw(&mut self, f: &mut Frame, area: Rect, cfg: ViewConfig<'_>, layout: &mut Layout) {
         let border_color = self.border_color;
-        let highlighted_color = self.highlighted_color;
 
         let cmd_block = ratatui::widgets::Block::default()
             .borders(Borders::ALL)
@@ -77,7 +64,7 @@ impl View for InteractiveView<'_> {
             cmd_block
                 .border_style(Style::default().add_modifier(Modifier::BOLD))
                 .border_type(BorderType::Double)
-                .border_style(highlighted_color)
+                .border_style(border_color)
         };
 
         f.render_widget(cmd_block, cmd_area);
@@ -127,7 +114,7 @@ impl View for InteractiveView<'_> {
             table_block
                 .border_style(Style::default().add_modifier(Modifier::BOLD))
                 .border_type(BorderType::Double)
-                .border_style(highlighted_color)
+                .border_style(border_color)
         } else {
             table_block
         };
@@ -135,6 +122,7 @@ impl View for InteractiveView<'_> {
         f.render_widget(table_block, table_area);
 
         if let Some(table) = &mut self.table {
+            table.setup(cfg);
             let area = Rect::new(
                 area.x + 2,
                 area.y + 4,
@@ -190,7 +178,7 @@ impl View for InteractiveView<'_> {
                 if !self.command.is_empty() {
                     self.command.pop();
 
-                    if self.immediate {
+                    if self.reactive {
                         match self.try_run(engine_state, stack) {
                             Ok(_) => info.report = Some(Report::default()),
                             Err(err) => info.report = Some(Report::error(format!("Error: {err}"))),
@@ -203,7 +191,7 @@ impl View for InteractiveView<'_> {
             KeyCode::Char(c) => {
                 self.command.push(*c);
 
-                if self.immediate {
+                if self.reactive {
                     match self.try_run(engine_state, stack) {
                         Ok(_) => info.report = Some(Report::default()),
                         Err(err) => info.report = Some(Report::error(format!("Error: {err}"))),
@@ -246,31 +234,14 @@ impl View for InteractiveView<'_> {
     }
 
     fn setup(&mut self, config: ViewConfig<'_>) {
-        self.border_color = lookup_tui_color(config.style_computer, "separator");
-
-        if let Some(hm) = config.config.get("try").and_then(create_map) {
-            let colors = get_color_map(&hm);
-
-            if let Some(color) = colors.get("highlighted_color").copied() {
-                self.highlighted_color = nu_style_to_tui(color);
-            }
-
-            if self.border_color != Style::default() && self.highlighted_color == Style::default() {
-                self.highlighted_color = self.border_color;
-            }
-
-            if let Some(val) = hm.get("reactive").and_then(|v| v.as_bool().ok()) {
-                self.immediate = val;
-            }
-        }
+        self.border_color = nu_style_to_tui(config.explore_config.table.separator_style);
+        self.reactive = config.explore_config.try_reactive;
 
         let mut r = RecordView::new(vec![], vec![]);
         r.setup(config);
 
-        self.table_theme = r.get_theme().clone();
-
         if let Some(view) = &mut self.table {
-            view.set_theme(self.table_theme.clone());
+            view.setup(config);
             view.set_orientation(r.get_orientation_current());
             view.set_orientation_current(r.get_orientation_current());
         }
diff --git a/crates/nu-explore/src/views/util.rs b/crates/nu-explore/src/views/util.rs
index d6cef4b0f7..285b25ea95 100644
--- a/crates/nu-explore/src/views/util.rs
+++ b/crates/nu-explore/src/views/util.rs
@@ -31,11 +31,6 @@ pub fn set_span(
     text_width as u16
 }
 
-pub fn lookup_tui_color(style_computer: &StyleComputer, key: &str) -> Style {
-    let nu_style = style_computer.compute(key, &Value::nothing(nu_protocol::Span::unknown()));
-    nu_style_to_tui(nu_style)
-}
-
 pub fn nu_style_to_tui(style: NuStyle) -> ratatui::style::Style {
     let mut out = ratatui::style::Style::default();
     if let Some(clr) = style.background {
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index b6b1fbf3f8..34418feb16 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -189,12 +189,7 @@ $env.config = {
             warn: {}
             info: {}
         },
-        table: {
-            split_line: { fg: "#404040" },
-            selected_cell: { bg: light_blue },
-            selected_row: {},
-            selected_column: {},
-        },
+        selected_cell: { bg: light_blue },
     }
 
     history: {

From 073d8850e950cfccdab9cf15821caaa0c3b726eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Fidalgo?=
 <120738170+JoaoFidalgo1403@users.noreply.github.com>
Date: Thu, 6 Jun 2024 16:30:06 +0100
Subject: [PATCH 0076/1072] Allow stor insert and stor update to accept
 pipeline input (#12882)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- this PR should close #11433

# Description
This PR implements pipeline input support for the stor insert and stor
update commands,
enabling users to directly pass data to these commands without relying
solely on flag parameters.

Previously, it was only possible to specify the record data using flag
parameters,
which could be less intuitive and become cumbersome:

```bash
stor insert --table-name nudb --data-record {bool1: true, int1: 5, float1: 1.1, str1: fdncred, datetime1: 2023-04-17}
stor update --table-name nudb --update-record {str1: nushell datetime1: 2020-04-17}
```

Now it is also possible to pass a record through pipeline input:

```bash
{bool1: true, int1: 5, float1: 1.1, str1: fdncred, datetime1: 2023-04-17} | stor insert --table-name nudb
{str1: nushell datetime1: 2020-04-17} | stor update --table-name nudb"
```

Changes made on code:

- Modified stor insert and stor update to accept a record from the
pipeline.
- Added logic to handle data from the pipeline record.
- Implemented an error case to prevent simultaneous data input from both
pipeline and flag.

# User-facing changes

Returns an error when both ways of inserting data are used.

The examples for both commands were updated and in each command, when
the -d or -u fags are being used at the same time as input is being
passed through the pipeline, it returns an error:


![image](https://github.com/nushell/nushell/assets/120738170/c5b15c1b-716a-4df4-95e8-3bca8f7ae224)

Also returns an error when both of them are missing:


![image](https://github.com/nushell/nushell/assets/120738170/47f538ab-79f1-4fcc-9c62-d7a7d60f86a1)


# Tests + Formating
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

Co-authored-by: Rodrigo Friães <rodrigo.friaes@tecnico.ulisboa.pt>
---
 crates/nu-command/src/stor/insert.rs | 166 +++++++++++++--------
 crates/nu-command/src/stor/update.rs | 208 +++++++++++++++++----------
 2 files changed, 246 insertions(+), 128 deletions(-)

diff --git a/crates/nu-command/src/stor/insert.rs b/crates/nu-command/src/stor/insert.rs
index e0c0ad4d28..4b9677941b 100644
--- a/crates/nu-command/src/stor/insert.rs
+++ b/crates/nu-command/src/stor/insert.rs
@@ -12,14 +12,17 @@ impl Command for StorInsert {
 
     fn signature(&self) -> Signature {
         Signature::build("stor insert")
-            .input_output_types(vec![(Type::Nothing, Type::table())])
+            .input_output_types(vec![
+                (Type::Nothing, Type::table()),
+                (Type::record(), Type::table()),
+            ])
             .required_named(
                 "table-name",
                 SyntaxShape::String,
                 "name of the table you want to insert into",
                 Some('t'),
             )
-            .required_named(
+            .named(
                 "data-record",
                 SyntaxShape::Record(vec![]),
                 "a record of column names and column values to insert into the specified table",
@@ -39,10 +42,16 @@ impl Command for StorInsert {
 
     fn examples(&self) -> Vec<Example> {
         vec![Example {
-            description: "Insert data the in-memory sqlite database using a data-record of column-name and column-value pairs",
-            example: "stor insert --table-name nudb --data-record {bool1: true, int1: 5, float1: 1.1, str1: fdncred, datetime1: 2023-04-17}",
-            result: None,
-        }]
+                description: "Insert data the in-memory sqlite database using a data-record of column-name and column-value pairs",
+                example: "stor insert --table-name nudb --data-record {bool1: true, int1: 5, float1: 1.1, str1: fdncred, datetime1: 2023-04-17}",
+                result: None,
+            },
+            Example {
+                description: "Insert data through pipeline input as a record of column-name and column-value pairs",
+                example: "{bool1: true, int1: 5, float1: 1.1, str1: fdncred, datetime1: 2023-04-17} | stor insert --table-name nudb",
+                result: None,
+            },
+        ]
     }
 
     fn run(
@@ -50,25 +59,79 @@ impl Command for StorInsert {
         engine_state: &EngineState,
         stack: &mut Stack,
         call: &Call,
-        _input: PipelineData,
+        input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let span = call.head;
         let table_name: Option<String> = call.get_flag(engine_state, stack, "table-name")?;
-        let columns: Option<Record> = call.get_flag(engine_state, stack, "data-record")?;
+        let data_record: Option<Record> = call.get_flag(engine_state, stack, "data-record")?;
         // let config = engine_state.get_config();
         let db = Box::new(SQLiteDatabase::new(std::path::Path::new(MEMORY_DB), None));
 
+        // Check if the record is being passed as input or using the data record parameter
+        let columns = handle(span, data_record, input)?;
+
         process(table_name, span, &db, columns)?;
 
         Ok(Value::custom(db, span).into_pipeline_data())
     }
 }
 
+fn handle(
+    span: Span,
+    data_record: Option<Record>,
+    input: PipelineData,
+) -> Result<Record, ShellError> {
+    match input {
+        PipelineData::Empty => data_record.ok_or_else(|| ShellError::MissingParameter {
+            param_name: "requires a record".into(),
+            span,
+        }),
+        PipelineData::Value(value, ..) => {
+            // Since input is being used, check if the data record parameter is used too
+            if data_record.is_some() {
+                return Err(ShellError::GenericError {
+                    error: "Pipeline and Flag both being used".into(),
+                    msg: "Use either pipeline input or '--data-record' parameter".into(),
+                    span: Some(span),
+                    help: None,
+                    inner: vec![],
+                });
+            }
+            match value {
+                Value::Record { val, .. } => Ok(val.into_owned()),
+                val => Err(ShellError::OnlySupportsThisInputType {
+                    exp_input_type: "record".into(),
+                    wrong_type: val.get_type().to_string(),
+                    dst_span: Span::unknown(),
+                    src_span: val.span(),
+                }),
+            }
+        }
+        _ => {
+            if data_record.is_some() {
+                return Err(ShellError::GenericError {
+                    error: "Pipeline and Flag both being used".into(),
+                    msg: "Use either pipeline input or '--data-record' parameter".into(),
+                    span: Some(span),
+                    help: None,
+                    inner: vec![],
+                });
+            }
+            Err(ShellError::OnlySupportsThisInputType {
+                exp_input_type: "record".into(),
+                wrong_type: "".into(),
+                dst_span: span,
+                src_span: span,
+            })
+        }
+    }
+}
+
 fn process(
     table_name: Option<String>,
     span: Span,
     db: &SQLiteDatabase,
-    columns: Option<Record>,
+    record: Record,
 ) -> Result<(), ShellError> {
     if table_name.is_none() {
         return Err(ShellError::MissingParameter {
@@ -77,54 +140,45 @@ fn process(
         });
     }
     let new_table_name = table_name.unwrap_or("table".into());
+
     if let Ok(conn) = db.open_connection() {
-        match columns {
-            Some(record) => {
-                let mut create_stmt = format!("INSERT INTO {} ( ", new_table_name);
-                let cols = record.columns();
-                cols.for_each(|col| {
-                    create_stmt.push_str(&format!("{}, ", col));
-                });
-                if create_stmt.ends_with(", ") {
-                    create_stmt.pop();
-                    create_stmt.pop();
-                }
+        let mut create_stmt = format!("INSERT INTO {} ( ", new_table_name);
+        let cols = record.columns();
+        cols.for_each(|col| {
+            create_stmt.push_str(&format!("{}, ", col));
+        });
+        if create_stmt.ends_with(", ") {
+            create_stmt.pop();
+            create_stmt.pop();
+        }
 
-                // Values are set as placeholders.
-                create_stmt.push_str(") VALUES ( ");
-                for (index, _) in record.columns().enumerate() {
-                    create_stmt.push_str(&format!("?{}, ", index + 1));
-                }
+        // Values are set as placeholders.
+        create_stmt.push_str(") VALUES ( ");
+        for (index, _) in record.columns().enumerate() {
+            create_stmt.push_str(&format!("?{}, ", index + 1));
+        }
 
-                if create_stmt.ends_with(", ") {
-                    create_stmt.pop();
-                    create_stmt.pop();
-                }
+        if create_stmt.ends_with(", ") {
+            create_stmt.pop();
+            create_stmt.pop();
+        }
 
-                create_stmt.push(')');
+        create_stmt.push(')');
 
-                // dbg!(&create_stmt);
+        // dbg!(&create_stmt);
 
-                // Get the params from the passed values
-                let params = values_to_sql(record.values().cloned())?;
+        // Get the params from the passed values
+        let params = values_to_sql(record.values().cloned())?;
 
-                conn.execute(&create_stmt, params_from_iter(params))
-                    .map_err(|err| ShellError::GenericError {
-                        error: "Failed to open SQLite connection in memory from insert".into(),
-                        msg: err.to_string(),
-                        span: Some(Span::test_data()),
-                        help: None,
-                        inner: vec![],
-                    })?;
-            }
-            None => {
-                return Err(ShellError::MissingParameter {
-                    param_name: "requires at least one column".into(),
-                    span,
-                });
-            }
-        };
-    }
+        conn.execute(&create_stmt, params_from_iter(params))
+            .map_err(|err| ShellError::GenericError {
+                error: "Failed to open SQLite connection in memory from insert".into(),
+                msg: err.to_string(),
+                span: Some(Span::test_data()),
+                help: None,
+                inner: vec![],
+            })?;
+    };
     // dbg!(db.clone());
     Ok(())
 }
@@ -176,7 +230,7 @@ mod test {
             ),
         );
 
-        let result = process(table_name, span, &db, Some(columns));
+        let result = process(table_name, span, &db, columns);
 
         assert!(result.is_ok());
     }
@@ -201,7 +255,7 @@ mod test {
             Value::test_string("String With Spaces".to_string()),
         );
 
-        let result = process(table_name, span, &db, Some(columns));
+        let result = process(table_name, span, &db, columns);
 
         assert!(result.is_ok());
     }
@@ -226,7 +280,7 @@ mod test {
             Value::test_string("ThisIsALongString".to_string()),
         );
 
-        let result = process(table_name, span, &db, Some(columns));
+        let result = process(table_name, span, &db, columns);
         // SQLite uses dynamic typing, making any length acceptable for a varchar column
         assert!(result.is_ok());
     }
@@ -251,7 +305,7 @@ mod test {
             Value::test_string("ThisIsTheWrongType".to_string()),
         );
 
-        let result = process(table_name, span, &db, Some(columns));
+        let result = process(table_name, span, &db, columns);
         // SQLite uses dynamic typing, making any type acceptable for a column
         assert!(result.is_ok());
     }
@@ -276,7 +330,7 @@ mod test {
             Value::test_string("ThisIsALongString".to_string()),
         );
 
-        let result = process(table_name, span, &db, Some(columns));
+        let result = process(table_name, span, &db, columns);
 
         assert!(result.is_err());
     }
@@ -293,7 +347,7 @@ mod test {
             Value::test_string("ThisIsALongString".to_string()),
         );
 
-        let result = process(table_name, span, &db, Some(columns));
+        let result = process(table_name, span, &db, columns);
 
         assert!(result.is_err());
     }
diff --git a/crates/nu-command/src/stor/update.rs b/crates/nu-command/src/stor/update.rs
index d50614d67f..d731207a3f 100644
--- a/crates/nu-command/src/stor/update.rs
+++ b/crates/nu-command/src/stor/update.rs
@@ -11,14 +11,17 @@ impl Command for StorUpdate {
 
     fn signature(&self) -> Signature {
         Signature::build("stor update")
-            .input_output_types(vec![(Type::Nothing, Type::table())])
+            .input_output_types(vec![
+                (Type::Nothing, Type::table()),
+                (Type::record(), Type::table()),
+            ])
             .required_named(
                 "table-name",
                 SyntaxShape::String,
                 "name of the table you want to insert into",
                 Some('t'),
             )
-            .required_named(
+            .named(
                 "update-record",
                 SyntaxShape::Record(vec![]),
                 "a record of column names and column values to update in the specified table",
@@ -54,6 +57,11 @@ impl Command for StorUpdate {
             example: "stor update --table-name nudb --update-record {str1: nushell datetime1: 2020-04-17} --where-clause \"bool1 = 1\"",
             result: None,
         },
+        Example {
+            description: "Update the in-memory sqlite database through pipeline input",
+            example: "{str1: nushell datetime1: 2020-04-17} | stor update --table-name nudb",
+            result: None,
+        },
         ]
     }
 
@@ -62,91 +70,147 @@ impl Command for StorUpdate {
         engine_state: &EngineState,
         stack: &mut Stack,
         call: &Call,
-        _input: PipelineData,
+        input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let span = call.head;
         let table_name: Option<String> = call.get_flag(engine_state, stack, "table-name")?;
-        let columns: Option<Record> = call.get_flag(engine_state, stack, "update-record")?;
+        let update_record: Option<Record> = call.get_flag(engine_state, stack, "update-record")?;
         let where_clause_opt: Option<Spanned<String>> =
             call.get_flag(engine_state, stack, "where-clause")?;
 
         // Open the in-mem database
         let db = Box::new(SQLiteDatabase::new(std::path::Path::new(MEMORY_DB), None));
 
-        if table_name.is_none() {
-            return Err(ShellError::MissingParameter {
-                param_name: "requires at table name".into(),
-                span,
-            });
-        }
-        let new_table_name = table_name.unwrap_or("table".into());
-        if let Ok(conn) = db.open_connection() {
-            match columns {
-                Some(record) => {
-                    let mut update_stmt = format!("UPDATE {} ", new_table_name);
+        // Check if the record is being passed as input or using the update record parameter
+        let columns = handle(span, update_record, input)?;
 
-                    update_stmt.push_str("SET ");
-                    let vals = record.iter();
-                    vals.for_each(|(key, val)| match val {
-                        Value::Int { val, .. } => {
-                            update_stmt.push_str(&format!("{} = {}, ", key, val));
-                        }
-                        Value::Float { val, .. } => {
-                            update_stmt.push_str(&format!("{} = {}, ", key, val));
-                        }
-                        Value::String { val, .. } => {
-                            update_stmt.push_str(&format!("{} = '{}', ", key, val));
-                        }
-                        Value::Date { val, .. } => {
-                            update_stmt.push_str(&format!("{} = '{}', ", key, val));
-                        }
-                        Value::Bool { val, .. } => {
-                            update_stmt.push_str(&format!("{} = {}, ", key, val));
-                        }
-                        _ => {
-                            // return Err(ShellError::UnsupportedInput {
-                            //     msg: format!("{} is not a valid datepart, expected one of year, month, day, hour, minute, second, millisecond, microsecond, nanosecond", part.item),
-                            //     input: "value originates from here".to_string(),
-                            //     msg_span: span,
-                            //     input_span: val.span(),
-                            // });
-                        }
-                    });
-                    if update_stmt.ends_with(", ") {
-                        update_stmt.pop();
-                        update_stmt.pop();
-                    }
+        process(table_name, span, &db, columns, where_clause_opt)?;
 
-                    // Yup, this is a bit janky, but I'm not sure a better way to do this without having
-                    // --and and --or flags as well as supporting ==, !=, <>, is null, is not null, etc.
-                    // and other sql syntax. So, for now, just type a sql where clause as a string.
-                    if let Some(where_clause) = where_clause_opt {
-                        update_stmt.push_str(&format!(" WHERE {}", where_clause.item));
-                    }
-                    // dbg!(&update_stmt);
-
-                    conn.execute(&update_stmt, [])
-                        .map_err(|err| ShellError::GenericError {
-                            error: "Failed to open SQLite connection in memory from update".into(),
-                            msg: err.to_string(),
-                            span: Some(Span::test_data()),
-                            help: None,
-                            inner: vec![],
-                        })?;
-                }
-                None => {
-                    return Err(ShellError::MissingParameter {
-                        param_name: "requires at least one column".into(),
-                        span: call.head,
-                    });
-                }
-            };
-        }
-        // dbg!(db.clone());
         Ok(Value::custom(db, span).into_pipeline_data())
     }
 }
 
+fn handle(
+    span: Span,
+    update_record: Option<Record>,
+    input: PipelineData,
+) -> Result<Record, ShellError> {
+    match input {
+        PipelineData::Empty => update_record.ok_or_else(|| ShellError::MissingParameter {
+            param_name: "requires a record".into(),
+            span,
+        }),
+        PipelineData::Value(value, ..) => {
+            // Since input is being used, check if the data record parameter is used too
+            if update_record.is_some() {
+                return Err(ShellError::GenericError {
+                    error: "Pipeline and Flag both being used".into(),
+                    msg: "Use either pipeline input or '--update-record' parameter".into(),
+                    span: Some(span),
+                    help: None,
+                    inner: vec![],
+                });
+            }
+            match value {
+                Value::Record { val, .. } => Ok(val.into_owned()),
+                val => Err(ShellError::OnlySupportsThisInputType {
+                    exp_input_type: "record".into(),
+                    wrong_type: val.get_type().to_string(),
+                    dst_span: Span::unknown(),
+                    src_span: val.span(),
+                }),
+            }
+        }
+        _ => {
+            if update_record.is_some() {
+                return Err(ShellError::GenericError {
+                    error: "Pipeline and Flag both being used".into(),
+                    msg: "Use either pipeline input or '--update-record' parameter".into(),
+                    span: Some(span),
+                    help: None,
+                    inner: vec![],
+                });
+            }
+            Err(ShellError::OnlySupportsThisInputType {
+                exp_input_type: "record".into(),
+                wrong_type: "".into(),
+                dst_span: span,
+                src_span: span,
+            })
+        }
+    }
+}
+
+fn process(
+    table_name: Option<String>,
+    span: Span,
+    db: &SQLiteDatabase,
+    record: Record,
+    where_clause_opt: Option<Spanned<String>>,
+) -> Result<(), ShellError> {
+    if table_name.is_none() {
+        return Err(ShellError::MissingParameter {
+            param_name: "requires at table name".into(),
+            span,
+        });
+    }
+    let new_table_name = table_name.unwrap_or("table".into());
+    if let Ok(conn) = db.open_connection() {
+        let mut update_stmt = format!("UPDATE {} ", new_table_name);
+
+        update_stmt.push_str("SET ");
+        let vals = record.iter();
+        vals.for_each(|(key, val)| match val {
+            Value::Int { val, .. } => {
+                update_stmt.push_str(&format!("{} = {}, ", key, val));
+            }
+            Value::Float { val, .. } => {
+                update_stmt.push_str(&format!("{} = {}, ", key, val));
+            }
+            Value::String { val, .. } => {
+                update_stmt.push_str(&format!("{} = '{}', ", key, val));
+            }
+            Value::Date { val, .. } => {
+                update_stmt.push_str(&format!("{} = '{}', ", key, val));
+            }
+            Value::Bool { val, .. } => {
+                update_stmt.push_str(&format!("{} = {}, ", key, val));
+            }
+            _ => {
+                // return Err(ShellError::UnsupportedInput {
+                //     msg: format!("{} is not a valid datepart, expected one of year, month, day, hour, minute, second, millisecond, microsecond, nanosecond", part.item),
+                //     input: "value originates from here".to_string(),
+                //     msg_span: span,
+                //     input_span: val.span(),
+                // });
+            }
+        });
+        if update_stmt.ends_with(", ") {
+            update_stmt.pop();
+            update_stmt.pop();
+        }
+
+        // Yup, this is a bit janky, but I'm not sure a better way to do this without having
+        // --and and --or flags as well as supporting ==, !=, <>, is null, is not null, etc.
+        // and other sql syntax. So, for now, just type a sql where clause as a string.
+        if let Some(where_clause) = where_clause_opt {
+            update_stmt.push_str(&format!(" WHERE {}", where_clause.item));
+        }
+        // dbg!(&update_stmt);
+
+        conn.execute(&update_stmt, [])
+            .map_err(|err| ShellError::GenericError {
+                error: "Failed to open SQLite connection in memory from update".into(),
+                msg: err.to_string(),
+                span: Some(Span::test_data()),
+                help: None,
+                inner: vec![],
+            })?;
+    }
+    // dbg!(db.clone());
+    Ok(())
+}
+
 #[cfg(test)]
 mod test {
     use super::*;

From eef4a89ff409fe4d21b777d88dd52dfafa865ad5 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Fri, 7 Jun 2024 01:32:08 +0200
Subject: [PATCH 0077/1072] Move `format date` to `Category::Strings` (#13083)

The rest of the `format` commands live there.

Closes https://github.com/nushell/nushell.github.io/issues/1435
---
 crates/nu-command/src/strings/format/date.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-command/src/strings/format/date.rs b/crates/nu-command/src/strings/format/date.rs
index f1a081d842..1aaf1fb851 100644
--- a/crates/nu-command/src/strings/format/date.rs
+++ b/crates/nu-command/src/strings/format/date.rs
@@ -27,7 +27,7 @@ impl Command for FormatDate {
                 SyntaxShape::String,
                 "The desired format date.",
             )
-            .category(Category::Date)
+            .category(Category::Strings)
     }
 
     fn usage(&self) -> &str {

From 460df0e99aeb66600128e2d0a659629cba6ffd32 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Fri, 7 Jun 2024 01:33:21 +0200
Subject: [PATCH 0078/1072] Group `polars` crate updates in dependabot (#13084)

We depend on `polars` and some of its subcrates explicitly. This leads
to the unfortunate situtation that we have dependabot opening PRs that
are not compiling, independent of whether there are breaking changes we
need to account for. By introducing a [dependabot
group](https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/customizing-dependency-updates#grouping-dependabot-updates-into-one-pull-request)
for `polars` we can at least limit that failure mode.
---
 .github/dependabot.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 2225848cb4..2193598686 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -18,6 +18,14 @@ updates:
     ignore:
       - dependency-name: "*"
         update-types: ["version-update:semver-patch"]
+    groups:
+      # Only update polars as a whole as there are many subcrates that need to
+      # be updated at once. We explicitly depend on some of them, so batch their
+      # updates to not take up dependabot PR slots with dysfunctional PRs
+      polars:
+        patterns:
+          - "polars"
+          - "polars-*"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

From 83628f04ff45261a7522098d5c3a70a8c9fbad8d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Jun 2024 23:33:47 +0000
Subject: [PATCH 0079/1072] Bump crate-ci/typos from 1.22.0 to 1.22.1

Bumps [crate-ci/typos](https://github.com/crate-ci/typos) from 1.22.0 to 1.22.1.
- [Release notes](https://github.com/crate-ci/typos/releases)
- [Changelog](https://github.com/crate-ci/typos/blob/master/CHANGELOG.md)
- [Commits](https://github.com/crate-ci/typos/compare/v1.22.0...v1.22.1)

---
updated-dependencies:
- dependency-name: crate-ci/typos
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/typos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index 7b7f3fbc6a..1142b2dbaf 100644
--- a/.github/workflows/typos.yml
+++ b/.github/workflows/typos.yml
@@ -10,4 +10,4 @@ jobs:
         uses: actions/checkout@v4.1.6
 
       - name: Check spelling
-        uses: crate-ci/typos@v1.22.0
+        uses: crate-ci/typos@v1.22.1

From e3a20e90b0ff730486fbc9375aa9d192f173aee2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 7 Jun 2024 08:08:02 +0800
Subject: [PATCH 0080/1072] Bump os_pipe from 1.1.5 to 1.2.0 (#13087)

Bumps [os_pipe](https://github.com/oconnor663/os_pipe.rs) from 1.1.5 to
1.2.0.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/oconnor663/os_pipe.rs/commit/6268f8639904dcb6adb461fbdbcda959e4eaffe2"><code>6268f86</code></a>
bump version to 1.2.0</li>
<li><a
href="https://github.com/oconnor663/os_pipe.rs/commit/b392c7e3c953fcb1d80b221677cc3091d96fea48"><code>b392c7e</code></a>
remove unsafe code from dup()</li>
<li><a
href="https://github.com/oconnor663/os_pipe.rs/commit/c7b2277bdbacef71e601d5d1ee0a7a5cd749305a"><code>c7b2277</code></a>
move <code>mod sys</code> to the top of lib.rs</li>
<li><a
href="https://github.com/oconnor663/os_pipe.rs/commit/282b1884f6c33876399cfd5b5e9910aef90003cf"><code>282b188</code></a>
update ci.yml</li>
<li><a
href="https://github.com/oconnor663/os_pipe.rs/commit/432da0803aa12920dd4669f4be13ad0c2df55d0e"><code>432da08</code></a>
add rust-version to Cargo.toml</li>
<li><a
href="https://github.com/oconnor663/os_pipe.rs/commit/12868e41e6cc42678ac1acac4478f68d5ebd58ae"><code>12868e4</code></a>
edition 2018 -&gt; 2021</li>
<li><a
href="https://github.com/oconnor663/os_pipe.rs/commit/d9e8d615936a284cc8b64e95e5f65b0fb61fbf0c"><code>d9e8d61</code></a>
activate IO safety integration by default</li>
<li><a
href="https://github.com/oconnor663/os_pipe.rs/commit/d02b96eddb5832d2ceb6a8a84c0c90e0a1c3b74e"><code>d02b96e</code></a>
added visionos</li>
<li>See full diff in <a
href="https://github.com/oconnor663/os_pipe.rs/compare/1.1.5...1.2.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=os_pipe&package-manager=cargo&previous-version=1.1.5&new-version=1.2.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7e34334db4..c95f0d1435 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3714,9 +3714,9 @@ dependencies = [
 
 [[package]]
 name = "os_pipe"
-version = "1.1.5"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9"
+checksum = "29d73ba8daf8fac13b0501d1abeddcfe21ba7401ada61a819144b6c2a4f32209"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
diff --git a/Cargo.toml b/Cargo.toml
index 2d99b7b42e..7e5f436bbf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -118,7 +118,7 @@ num-traits = "0.2"
 omnipath = "0.1"
 once_cell = "1.18"
 open = "5.1"
-os_pipe = { version = "1.1", features = ["io_safety"] }
+os_pipe = { version = "1.2", features = ["io_safety"] }
 pathdiff = "0.2"
 percent-encoding = "2"
 pretty_assertions = "1.4"

From 83cf212e2050c3f5d5f5f8046721fe485d9e3a9c Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Fri, 7 Jun 2024 10:14:42 +0800
Subject: [PATCH 0081/1072] run_external.rs: use pathdiff::diff_path to handle
 relative path (#13056)

# Description
This pr is going to use `pathdiff::diff_path`, so we don't need to
handle for relative path by ourselves.

This is also the behavior before the rewritten of run_external.rs

It's a follow up to https://github.com/nushell/nushell/pull/13028

# User-Facing Changes
NaN

# Tests + Formatting
No need to add tests
---
 crates/nu-command/src/system/run_external.rs | 88 +++++++++-----------
 1 file changed, 39 insertions(+), 49 deletions(-)

diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index 66d8dde23f..bc6152e7c8 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -8,6 +8,7 @@ use nu_protocol::{
 };
 use nu_system::ForegroundChild;
 use nu_utils::IgnoreCaseExt;
+use pathdiff::diff_paths;
 use std::{
     borrow::Cow,
     io::Write,
@@ -343,61 +344,54 @@ fn expand_glob(
     // We must use `nu_engine::glob_from` here, in order to ensure we get paths from the correct
     // dir
     let glob = NuGlob::Expand(arg.to_owned()).into_spanned(span);
-    let Ok((_prefix, paths)) = nu_engine::glob_from(&glob, cwd, span, None) else {
-        // If an error occurred, return the original input
-        return Ok(vec![arg.into()]);
-    };
+    if let Ok((prefix, matches)) = nu_engine::glob_from(&glob, cwd, span, None) {
+        let mut result = vec![];
 
-    // If the first component of the original `arg` string path was '.', that should be preserved
-    let relative_to_dot = Path::new(arg).starts_with(".");
-
-    let paths = paths
-        // Skip over glob failures. These are usually just inaccessible paths.
-        .flat_map(|path_result| match path_result {
-            Ok(path) => Some(path),
-            Err(err) => {
-                // But internally log them just in case we need to debug this.
-                log::warn!("Error in run_external::expand_glob(): {}", err);
-                None
+        for m in matches {
+            if nu_utils::ctrl_c::was_pressed(interrupt) {
+                return Err(ShellError::InterruptedByUser { span: Some(span) });
             }
-        })
-        // Make the paths relative to the cwd
-        .map(|path| {
-            path.strip_prefix(cwd)
-                .map(|path| path.to_owned())
-                .unwrap_or(path)
-        })
-        // Add './' to relative paths if the original pattern had it
-        .map(|path| {
-            if relative_to_dot && path.is_relative() {
-                Path::new(".").join(path)
+            if let Ok(arg) = m {
+                let arg = resolve_globbed_path_to_cwd_relative(arg, prefix.as_ref(), cwd);
+                result.push(arg.to_string_lossy().to_string());
             } else {
-                path
+                result.push(arg.into());
             }
-        })
-        // Convert the paths returned to UTF-8 strings.
-        //
-        // FIXME: this fails to return the correct results for non-UTF-8 paths, but we don't support
-        // those in Nushell yet.
-        .map(|path| path.to_string_lossy().into_owned())
-        // Abandon if ctrl-c is pressed
-        .map(|path| {
-            if !nu_utils::ctrl_c::was_pressed(interrupt) {
-                Ok(path)
-            } else {
-                Err(ShellError::InterruptedByUser { span: Some(span) })
-            }
-        })
-        .collect::<Result<Vec<String>, ShellError>>()?;
+        }
 
-    if !paths.is_empty() {
-        Ok(paths)
+        // FIXME: do we want to special-case this further? We might accidentally expand when they don't
+        // intend to
+        if result.is_empty() {
+            result.push(arg.into());
+        }
+
+        Ok(result)
     } else {
-        // If we failed to match, return the original input
         Ok(vec![arg.into()])
     }
 }
 
+fn resolve_globbed_path_to_cwd_relative(
+    path: PathBuf,
+    prefix: Option<&PathBuf>,
+    cwd: &Path,
+) -> PathBuf {
+    if let Some(prefix) = prefix {
+        if let Ok(remainder) = path.strip_prefix(prefix) {
+            let new_prefix = if let Some(pfx) = diff_paths(prefix, cwd) {
+                pfx
+            } else {
+                prefix.to_path_buf()
+            };
+            new_prefix.join(remainder)
+        } else {
+            path
+        }
+    } else {
+        path
+    }
+}
+
 /// Transforms `--option="value"` into `--option=value`. `value` can be quoted
 /// with double quotes, single quotes, or backticks. Only removes the outermost
 /// pair of quotes after the equal sign.
@@ -716,10 +710,6 @@ mod test {
             assert_eq!(actual, expected);
 
             let actual = expand_glob("./*.txt", cwd, Span::unknown(), &None).unwrap();
-            let expected = vec![
-                Path::new(".").join("a.txt").to_string_lossy().into_owned(),
-                Path::new(".").join("b.txt").to_string_lossy().into_owned(),
-            ];
             assert_eq!(actual, expected);
 
             let actual = expand_glob("'*.txt'", cwd, Span::unknown(), &None).unwrap();

From 2d0a60ac678543a964fc578df3ff552c22127b86 Mon Sep 17 00:00:00 2001
From: Andrej Kolchin <KAAtheWise@protonmail.com>
Date: Fri, 7 Jun 2024 15:43:30 +0300
Subject: [PATCH 0082/1072] Use native toml datetime type in `to toml` (#13018)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

Makes `to toml` use the `toml::value::Datetime` type, so that `to toml`
serializes dates properly.


# User-Facing Changes

`to toml` will now encode dates differently, in a native format instead
of a string. This could, in theory, break some workflows:

```Nushell
# Before:
~> {datetime: 2024-05-31} | to toml | from toml | get datetime | into datetime
Fri, 31 May 2024 00:00:00 +0000 (10 hours ago)
# After:
~> {datetime: 2024-05-31} | to toml | from toml | get datetime | into datetime
Error: nu::shell::only_supports_this_input_type

  × Input type not supported.
   ╭─[entry #13:1:36]
 1 │ {datetime: 2024-05-31} | to toml | from toml | get datetime | into datetime
   ·                                    ────┬────                  ──────┬──────
   ·                                        │                            ╰── only string and int input data is supported
   ·                                        ╰── input type: date
   ╰────
```

Fix #11751
---
 crates/nu-command/src/formats/to/toml.rs | 58 ++++++++++++++++++++++--
 1 file changed, 53 insertions(+), 5 deletions(-)

diff --git a/crates/nu-command/src/formats/to/toml.rs b/crates/nu-command/src/formats/to/toml.rs
index 187304a7c0..ed1490231c 100644
--- a/crates/nu-command/src/formats/to/toml.rs
+++ b/crates/nu-command/src/formats/to/toml.rs
@@ -1,4 +1,4 @@
-use chrono::SecondsFormat;
+use chrono::{DateTime, Datelike, FixedOffset, Timelike};
 use nu_engine::command_prelude::*;
 use nu_protocol::ast::PathMember;
 
@@ -49,9 +49,7 @@ fn helper(engine_state: &EngineState, v: &Value) -> Result<toml::Value, ShellErr
         Value::Int { val, .. } => toml::Value::Integer(*val),
         Value::Filesize { val, .. } => toml::Value::Integer(*val),
         Value::Duration { val, .. } => toml::Value::String(val.to_string()),
-        Value::Date { val, .. } => {
-            toml::Value::String(val.to_rfc3339_opts(SecondsFormat::AutoSi, false))
-        }
+        Value::Date { val, .. } => toml::Value::Datetime(to_toml_datetime(val)),
         Value::Range { .. } => toml::Value::String("<Range>".to_string()),
         Value::Float { val, .. } => toml::Value::Float(*val),
         Value::String { val, .. } | Value::Glob { val, .. } => toml::Value::String(val.clone()),
@@ -157,6 +155,43 @@ fn to_toml(
     }
 }
 
+/// Convert chrono datetime into a toml::Value datetime.  The latter uses its
+/// own ad-hoc datetime types, which makes this somewhat convoluted.
+fn to_toml_datetime(datetime: &DateTime<FixedOffset>) -> toml::value::Datetime {
+    let date = toml::value::Date {
+        // TODO: figure out what to do with BC dates, because the toml
+        // crate doesn't support them.  Same for large years, which
+        // don't fit in u16.
+        year: datetime.year_ce().1 as u16,
+        // Panic: this is safe, because chrono guarantees that the month
+        // value will be between 1 and 12 and the day will be between 1
+        // and 31
+        month: datetime.month() as u8,
+        day: datetime.day() as u8,
+    };
+
+    let time = toml::value::Time {
+        // Panic: same as before, chorono guarantees that all of the following 3
+        // methods return values less than 65'000
+        hour: datetime.hour() as u8,
+        minute: datetime.minute() as u8,
+        second: datetime.second() as u8,
+        nanosecond: datetime.nanosecond(),
+    };
+
+    let offset = toml::value::Offset::Custom {
+        // Panic: minute timezone offset fits into i16 (that's more than
+        // 1000 hours)
+        minutes: (-datetime.timezone().utc_minus_local() / 60) as i16,
+    };
+
+    toml::value::Datetime {
+        date: Some(date),
+        time: Some(time),
+        offset: Some(offset),
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -181,7 +216,20 @@ mod tests {
             Span::test_data(),
         );
 
-        let reference_date = toml::Value::String(String::from("1980-10-12T10:12:44+02:00"));
+        let reference_date = toml::Value::Datetime(toml::value::Datetime {
+            date: Some(toml::value::Date {
+                year: 1980,
+                month: 10,
+                day: 12,
+            }),
+            time: Some(toml::value::Time {
+                hour: 10,
+                minute: 12,
+                second: 44,
+                nanosecond: 0,
+            }),
+            offset: Some(toml::value::Offset::Custom { minutes: 120 }),
+        });
 
         let result = helper(&engine_state, &test_date);
 

From a246a19387594cea15618a89a4bcd9d4c439d16a Mon Sep 17 00:00:00 2001
From: Access <ShootingStarDragons@protonmail.com>
Date: Fri, 7 Jun 2024 21:02:52 +0800
Subject: [PATCH 0083/1072] fix: coredump without any messages (#13034)

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

- this PR should close https://github.com/nushell/nushell/issues/12874
- fixes https://github.com/nushell/nushell/issues/12874
I want to fix the issue which is induced by the fix for
https://github.com/nushell/nushell/issues/12369. after this pr. This pr
induced a new error for unix system, in order to show coredump messages

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

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

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

- this PR should close https://github.com/nushell/nushell/issues/12874
- fixes https://github.com/nushell/nushell/issues/12874
I want to fix the issue which is induced by the fix for
https://github.com/nushell/nushell/issues/12369. after this pr. This pr
induced a new error for unix system, in order to show coredump messages

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

after fix for 12874, coredump message is messing, so I want to fix it

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

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

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

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

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


![image](https://github.com/nushell/nushell/assets/60290287/6d8ab756-3031-4212-a5f5-5f71be3857f9)

---------

Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
---
 crates/nu-protocol/src/errors/shell_error.rs | 15 +++++++++++++++
 crates/nu-protocol/src/process/child.rs      | 16 +++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/crates/nu-protocol/src/errors/shell_error.rs b/crates/nu-protocol/src/errors/shell_error.rs
index a8ca52142c..e201915fcf 100644
--- a/crates/nu-protocol/src/errors/shell_error.rs
+++ b/crates/nu-protocol/src/errors/shell_error.rs
@@ -876,6 +876,21 @@ pub enum ShellError {
         span: Span,
     },
 
+    #[cfg(unix)]
+    /// An I/O operation failed.
+    ///
+    /// ## Resolution
+    ///
+    /// This is a generic error. Refer to the specific error message for further details.
+    #[error("program coredump error")]
+    #[diagnostic(code(nu::shell::coredump_error))]
+    CoredumpErrorSpanned {
+        msg: String,
+        signal: i32,
+        #[label("{msg}")]
+        span: Span,
+    },
+
     /// Tried to `cd` to a path that isn't a directory.
     ///
     /// ## Resolution
diff --git a/crates/nu-protocol/src/process/child.rs b/crates/nu-protocol/src/process/child.rs
index cc74b40fc1..08da7e704c 100644
--- a/crates/nu-protocol/src/process/child.rs
+++ b/crates/nu-protocol/src/process/child.rs
@@ -23,7 +23,21 @@ impl ExitStatusFuture {
             ExitStatusFuture::Finished(Err(err)) => Err(err.as_ref().clone()),
             ExitStatusFuture::Running(receiver) => {
                 let code = match receiver.recv() {
-                    Ok(Ok(status)) => Ok(status),
+                    Ok(Ok(status)) => {
+                        #[cfg(unix)]
+                        if let ExitStatus::Signaled {
+                            signal,
+                            core_dumped: true,
+                        } = status
+                        {
+                            return Err(ShellError::CoredumpErrorSpanned {
+                                msg: format!("coredump detected. received signal: {signal}"),
+                                signal,
+                                span,
+                            });
+                        }
+                        Ok(status)
+                    }
                     Ok(Err(err)) => Err(ShellError::IOErrorSpanned {
                         msg: format!("failed to get exit code: {err:?}"),
                         span,

From d6a9fb0e4013ba0e2d5f36e6bbf0b39f1221acab Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Fri, 7 Jun 2024 13:03:31 +0000
Subject: [PATCH 0084/1072] Fix display formatting for command type in `help
 commands` (#12996)

# Description
Related to #12832, this PR changes the way `help commands` displays the
command type to be consistent with `scope commands` and `which`.

# User-Facing Changes
Technically a breaking change since the `help commands` output can now
be different.
---
 crates/nu-command/src/help/help_commands.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-command/src/help/help_commands.rs b/crates/nu-command/src/help/help_commands.rs
index f2440cc36f..f067a9fdcb 100644
--- a/crates/nu-command/src/help/help_commands.rs
+++ b/crates/nu-command/src/help/help_commands.rs
@@ -122,7 +122,7 @@ fn build_help_commands(engine_state: &EngineState, span: Span) -> Vec<Value> {
         let usage = sig.usage;
         let search_terms = sig.search_terms;
 
-        let command_type = format!("{:?}", decl.command_type()).to_ascii_lowercase();
+        let command_type = decl.command_type().to_string();
 
         // Build table of parameters
         let param_table = {

From cfe13397edc6fde92744907fd3c4ae068543fdbf Mon Sep 17 00:00:00 2001
From: ymcx <89810988+ymcx@users.noreply.github.com>
Date: Fri, 7 Jun 2024 16:07:23 +0300
Subject: [PATCH 0085/1072] Fix the colors when completing using a relative
 path (#12898)

# Description
Fixes a bug where the autocompletion menu has the wrong colors due to
'std::fs::symlink_metadata' not being able to handle relative paths.
Attached below are screenshots before and after applying the commit, in
which the colors are wrong when autocompleting on a path prefixed by a
tilde, whereas the same directory is highlighted correctly when prefixed
by a dot.

BEFORE:

![1715982514020](https://github.com/nushell/nushell/assets/89810988/62051f03-0846-430d-b493-e6f3cd6d0e04)

![1715982873231](https://github.com/nushell/nushell/assets/89810988/28c647ab-3b2a-47ef-9967-5d09927e299d)
AFTER:

![1715982490585](https://github.com/nushell/nushell/assets/89810988/7a370138-50af-42fd-9724-a34cc605bede)

![1715982894748](https://github.com/nushell/nushell/assets/89810988/e884f69f-f757-426e-98c4-bc9f7f6fc561)
---
 crates/nu-cli/src/completions/completion_common.rs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/crates/nu-cli/src/completions/completion_common.rs b/crates/nu-cli/src/completions/completion_common.rs
index 4a8b0d57ac..26d48a8675 100644
--- a/crates/nu-cli/src/completions/completion_common.rs
+++ b/crates/nu-cli/src/completions/completion_common.rs
@@ -1,7 +1,7 @@
 use crate::completions::{matches, CompletionOptions};
 use nu_ansi_term::Style;
 use nu_engine::env_to_string;
-use nu_path::home_dir;
+use nu_path::{expand_to_real_path, home_dir};
 use nu_protocol::{
     engine::{EngineState, Stack, StateWorkingSet},
     Span,
@@ -185,9 +185,14 @@ pub fn complete_item(
     .map(|p| {
         let path = original_cwd.apply(p);
         let style = ls_colors.as_ref().map(|lsc| {
-            lsc.style_for_path_with_metadata(&path, std::fs::symlink_metadata(&path).ok().as_ref())
-                .map(lscolors::Style::to_nu_ansi_term_style)
-                .unwrap_or_default()
+            lsc.style_for_path_with_metadata(
+                &path,
+                std::fs::symlink_metadata(expand_to_real_path(&path))
+                    .ok()
+                    .as_ref(),
+            )
+            .map(lscolors::Style::to_nu_ansi_term_style)
+            .unwrap_or_default()
         });
         (span, escape_path(path, want_directory), style)
     })

From d2121a155eb5b1ee06c2b1922327b5fba52d51a9 Mon Sep 17 00:00:00 2001
From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Fri, 7 Jun 2024 10:33:48 -0400
Subject: [PATCH 0086/1072] Fixes #13093 - Erroneous example in 'touch' help
 (#13095)

# Description

Fixes #13093 by:

* Removing the mentioned help example
* Updating the `--accessed` and `--modified` flag descriptions to remove
mention of "timestamp/date"

# User-Facing Changes

Help changes

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
---
 crates/nu-command/src/filesystem/touch.rs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/crates/nu-command/src/filesystem/touch.rs b/crates/nu-command/src/filesystem/touch.rs
index 0253e7e317..2a1e128b04 100644
--- a/crates/nu-command/src/filesystem/touch.rs
+++ b/crates/nu-command/src/filesystem/touch.rs
@@ -35,12 +35,12 @@ impl Command for Touch {
             )
             .switch(
                 "modified",
-                "change the modification time of the file or directory. If no timestamp, date or reference file/directory is given, the current time is used",
+                "change the modification time of the file or directory. If no reference file/directory is given, the current time is used",
                 Some('m'),
             )
             .switch(
                 "access",
-                "change the access time of the file or directory. If no timestamp, date or reference file/directory is given, the current time is used",
+                "change the access time of the file or directory. If no reference file/directory is given, the current time is used",
                 Some('a'),
             )
             .switch(
@@ -189,11 +189,6 @@ impl Command for Touch {
                 example: r#"touch -m -r fixture.json d e"#,
                 result: None,
             },
-            Example {
-                description: r#"Changes the last accessed time of "fixture.json" to a date"#,
-                example: r#"touch -a -d "August 24, 2019; 12:30:30" fixture.json"#,
-                result: None,
-            },
         ]
     }
 }

From 48a34ffe6d39bc72d8971e40dc54ef09ec331e49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C5=BD=C3=A1dn=C3=ADk?= <kubouch@gmail.com>
Date: Sat, 8 Jun 2024 15:11:49 +0300
Subject: [PATCH 0087/1072] Fix test failure when running tests with nextest
 (#13101)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

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

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

Test was failing with “did you mean” due to the `NEXTEST` env var being
present when running tests via `cargo nextest run`.

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 tests/shell/environment/env.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/shell/environment/env.rs b/tests/shell/environment/env.rs
index 74736415a3..1a9c14b18a 100644
--- a/tests/shell/environment/env.rs
+++ b/tests/shell/environment/env.rs
@@ -132,7 +132,7 @@ fn hides_environment_from_child() {
         $env.TEST = 1; ^$nu.current-exe -c "hide-env TEST; ^$nu.current-exe -c '$env.TEST'"
     "#);
     assert!(actual.out.is_empty());
-    assert!(actual.err.contains("cannot find column"));
+    assert!(actual.err.contains("column_not_found") || actual.err.contains("name_not_found"));
 }
 
 #[test]

From e52d7bc58541e38634fa5499396903f11b7e3f28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C5=BD=C3=A1dn=C3=ADk?= <kubouch@gmail.com>
Date: Sun, 9 Jun 2024 12:15:53 +0300
Subject: [PATCH 0088/1072] Span ID Refactor (Step 2): Use SpanId of
 expressions in some places (#13102)

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

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

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

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

Part of https://github.com/nushell/nushell/issues/12963, step 2.

This PR refactors changes the use of `expression.span` to
`expression.span_id` via a new helper `Expression::span()`. A new
`GetSpan` is added to abstract getting the span from both `EngineState`
and `StateWorkingSet`.

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

`format pattern` loses the ability to use variables in the pattern,
e.g., `... | format pattern 'value of {$it.name} is {$it.value}'`. This
is because the command did a custom parse-eval cycle, creating spans
that are not merged into the main engine state. We could clone the
engine state, add Clone trait to StateDelta and merge the cloned delta
to the cloned state, but IMO there is not much value from having this
ability, since we have string interpolation nowadays: `... | $"value of
($in.name) is ($in.value)"`.

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 .../src/extra/strings/format/command.rs       |  68 ++------
 crates/nu-command/tests/commands/format.rs    |   7 +-
 crates/nu-engine/src/eval.rs                  |  34 ++--
 crates/nu-protocol/src/ast/expression.rs      |   8 +-
 crates/nu-protocol/src/engine/engine_state.rs |  16 +-
 .../src/engine/state_working_set.rs           |   8 +-
 crates/nu-protocol/src/eval_base.rs           | 153 +++++++++---------
 crates/nu-protocol/src/eval_const.rs          |   8 +-
 crates/nu-protocol/src/span.rs                |   5 +
 9 files changed, 148 insertions(+), 159 deletions(-)

diff --git a/crates/nu-cmd-extra/src/extra/strings/format/command.rs b/crates/nu-cmd-extra/src/extra/strings/format/command.rs
index 1c72627779..50e89e61e3 100644
--- 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,4 @@
-use nu_engine::{command_prelude::*, get_eval_expression};
-use nu_parser::parse_expression;
+use nu_engine::command_prelude::*;
 use nu_protocol::{ast::PathMember, engine::StateWorkingSet, ListStream};
 
 #[derive(Clone)]
@@ -57,14 +56,7 @@ impl Command for FormatPattern {
                     string_span.start + 1,
                 )?;
 
-                format(
-                    input_val,
-                    &ops,
-                    engine_state,
-                    &mut working_set,
-                    stack,
-                    call.head,
-                )
+                format(input_val, &ops, engine_state, call.head)
             }
         }
     }
@@ -100,8 +92,6 @@ enum FormatOperation {
     FixedText(String),
     // raw input is something like {column1.column2}
     ValueFromColumn(String, Span),
-    // raw input is something like {$it.column1.column2} or {$var}.
-    ValueNeedEval(String, Span),
 }
 
 /// Given a pattern that is fed into the Format command, we can process it and subdivide it
@@ -110,7 +100,6 @@ enum FormatOperation {
 /// there without any further processing.
 /// FormatOperation::ValueFromColumn contains the name of a column whose values will be
 /// formatted according to the input pattern.
-/// FormatOperation::ValueNeedEval contains expression which need to eval, it has the following form:
 /// "$it.column1.column2" or "$variable"
 fn extract_formatting_operations(
     input: String,
@@ -161,10 +150,17 @@ fn extract_formatting_operations(
 
         if !column_name.is_empty() {
             if column_need_eval {
-                output.push(FormatOperation::ValueNeedEval(
-                    column_name.clone(),
-                    Span::new(span_start + column_span_start, span_start + column_span_end),
-                ));
+                return Err(ShellError::GenericError {
+                    error: "Removed functionality".into(),
+                    msg: "The ability to use variables ($it) in `format pattern` has been removed."
+                        .into(),
+                    span: Some(error_span),
+                    help: Some(
+                        "You can use other formatting options, such as string interpolation."
+                            .into(),
+                    ),
+                    inner: vec![],
+                });
             } else {
                 output.push(FormatOperation::ValueFromColumn(
                     column_name.clone(),
@@ -185,8 +181,6 @@ fn format(
     input_data: Value,
     format_operations: &[FormatOperation],
     engine_state: &EngineState,
-    working_set: &mut StateWorkingSet,
-    stack: &mut Stack,
     head_span: Span,
 ) -> Result<PipelineData, ShellError> {
     let data_as_value = input_data;
@@ -194,13 +188,7 @@ fn format(
     //  We can only handle a Record or a List of Records
     match data_as_value {
         Value::Record { .. } => {
-            match format_record(
-                format_operations,
-                &data_as_value,
-                engine_state,
-                working_set,
-                stack,
-            ) {
+            match format_record(format_operations, &data_as_value, engine_state) {
                 Ok(value) => Ok(PipelineData::Value(Value::string(value, head_span), None)),
                 Err(value) => Err(value),
             }
@@ -211,13 +199,7 @@ fn format(
             for val in vals.iter() {
                 match val {
                     Value::Record { .. } => {
-                        match format_record(
-                            format_operations,
-                            val,
-                            engine_state,
-                            working_set,
-                            stack,
-                        ) {
+                        match format_record(format_operations, val, engine_state) {
                             Ok(value) => {
                                 list.push(Value::string(value, head_span));
                             }
@@ -256,12 +238,9 @@ fn format_record(
     format_operations: &[FormatOperation],
     data_as_value: &Value,
     engine_state: &EngineState,
-    working_set: &mut StateWorkingSet,
-    stack: &mut Stack,
 ) -> Result<String, ShellError> {
     let config = engine_state.get_config();
     let mut output = String::new();
-    let eval_expression = get_eval_expression(engine_state);
 
     for op in format_operations {
         match op {
@@ -283,23 +262,6 @@ fn format_record(
                     Err(se) => return Err(se),
                 }
             }
-            FormatOperation::ValueNeedEval(_col_name, span) => {
-                let exp = parse_expression(working_set, &[*span]);
-                match working_set.parse_errors.first() {
-                    None => {
-                        let parsed_result = eval_expression(engine_state, stack, &exp);
-                        if let Ok(val) = parsed_result {
-                            output.push_str(&val.to_abbreviated_string(config))
-                        }
-                    }
-                    Some(err) => {
-                        return Err(ShellError::TypeMismatch {
-                            err_message: format!("expression is invalid, detail message: {err:?}"),
-                            span: *span,
-                        })
-                    }
-                }
-            }
         }
     }
     Ok(output)
diff --git a/crates/nu-command/tests/commands/format.rs b/crates/nu-command/tests/commands/format.rs
index 6b1649c8b5..6084faf1e4 100644
--- a/crates/nu-command/tests/commands/format.rs
+++ b/crates/nu-command/tests/commands/format.rs
@@ -37,7 +37,7 @@ fn given_fields_can_be_column_paths() {
 }
 
 #[test]
-fn can_use_variables() {
+fn cant_use_variables() {
     let actual = nu!(
         cwd: "tests/fixtures/formats", pipeline(
         r#"
@@ -46,7 +46,8 @@ fn can_use_variables() {
         "#
     ));
 
-    assert_eq!(actual.out, "nu is a new type of shell");
+    // TODO SPAN: This has been removed during SpanId refactor
+    assert!(actual.err.contains("Removed functionality"));
 }
 
 #[test]
@@ -55,7 +56,7 @@ fn error_unmatched_brace() {
         cwd: "tests/fixtures/formats", pipeline(
         r#"
         open cargo_sample.toml
-            | format pattern "{$it.package.name"
+            | format pattern "{package.name"
         "#
     ));
 
diff --git a/crates/nu-engine/src/eval.rs b/crates/nu-engine/src/eval.rs
index af051a1dc7..044bf86980 100644
--- a/crates/nu-engine/src/eval.rs
+++ b/crates/nu-engine/src/eval.rs
@@ -208,11 +208,13 @@ fn eval_external(
 ) -> Result<PipelineData, ShellError> {
     let decl_id = engine_state
         .find_decl("run-external".as_bytes(), &[])
-        .ok_or(ShellError::ExternalNotSupported { span: head.span })?;
+        .ok_or(ShellError::ExternalNotSupported {
+            span: head.span(&engine_state),
+        })?;
 
     let command = engine_state.get_decl(decl_id);
 
-    let mut call = Call::new(head.span);
+    let mut call = Call::new(head.span(&engine_state));
 
     call.add_positional(head.clone());
 
@@ -712,7 +714,7 @@ impl Eval for EvalRuntime {
         args: &[ExternalArgument],
         _: Span,
     ) -> Result<Value, ShellError> {
-        let span = head.span;
+        let span = head.span(&engine_state);
         // FIXME: protect this collect with ctrl-c
         eval_external(engine_state, stack, head, args, PipelineData::empty())?.into_value(span)
     }
@@ -779,9 +781,11 @@ impl Eval for EvalRuntime {
                 let var_info = engine_state.get_var(*var_id);
                 if var_info.mutable {
                     stack.add_var(*var_id, rhs);
-                    Ok(Value::nothing(lhs.span))
+                    Ok(Value::nothing(lhs.span(&engine_state)))
                 } else {
-                    Err(ShellError::AssignmentRequiresMutableVar { lhs_span: lhs.span })
+                    Err(ShellError::AssignmentRequiresMutableVar {
+                        lhs_span: lhs.span(&engine_state),
+                    })
                 }
             }
             Expr::FullCellPath(cell_path) => {
@@ -797,7 +801,7 @@ impl Eval for EvalRuntime {
                                 // Reject attempts to assign to the entire $env
                                 if cell_path.tail.is_empty() {
                                     return Err(ShellError::CannotReplaceEnv {
-                                        span: cell_path.head.span,
+                                        span: cell_path.head.span(&engine_state),
                                     });
                                 }
 
@@ -837,15 +841,21 @@ impl Eval for EvalRuntime {
                                 lhs.upsert_data_at_cell_path(&cell_path.tail, rhs)?;
                                 stack.add_var(*var_id, lhs);
                             }
-                            Ok(Value::nothing(cell_path.head.span))
+                            Ok(Value::nothing(cell_path.head.span(&engine_state)))
                         } else {
-                            Err(ShellError::AssignmentRequiresMutableVar { lhs_span: lhs.span })
+                            Err(ShellError::AssignmentRequiresMutableVar {
+                                lhs_span: lhs.span(&engine_state),
+                            })
                         }
                     }
-                    _ => Err(ShellError::AssignmentRequiresVar { lhs_span: lhs.span }),
+                    _ => Err(ShellError::AssignmentRequiresVar {
+                        lhs_span: lhs.span(&engine_state),
+                    }),
                 }
             }
-            _ => Err(ShellError::AssignmentRequiresVar { lhs_span: lhs.span }),
+            _ => Err(ShellError::AssignmentRequiresVar {
+                lhs_span: lhs.span(&engine_state),
+            }),
         }
     }
 
@@ -882,8 +892,8 @@ impl Eval for EvalRuntime {
         Ok(Value::string(name, span))
     }
 
-    fn unreachable(expr: &Expression) -> Result<Value, ShellError> {
-        Ok(Value::nothing(expr.span))
+    fn unreachable(engine_state: &EngineState, expr: &Expression) -> Result<Value, ShellError> {
+        Ok(Value::nothing(expr.span(&engine_state)))
     }
 }
 
diff --git a/crates/nu-protocol/src/ast/expression.rs b/crates/nu-protocol/src/ast/expression.rs
index 832bc1f438..08ecc59aaf 100644
--- a/crates/nu-protocol/src/ast/expression.rs
+++ b/crates/nu-protocol/src/ast/expression.rs
@@ -1,7 +1,7 @@
 use crate::{
     ast::{Argument, Block, Expr, ExternalArgument, ImportPattern, MatchPattern, RecordItem},
-    engine::{EngineState, StateWorkingSet},
-    BlockId, DeclId, Signature, Span, SpanId, Type, VarId, IN_VARIABLE_ID,
+    engine::StateWorkingSet,
+    BlockId, DeclId, GetSpan, Signature, Span, SpanId, Type, VarId, IN_VARIABLE_ID,
 };
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
@@ -516,7 +516,7 @@ impl Expression {
         }
     }
 
-    pub fn span(&self, engine_state: &EngineState) -> Span {
-        engine_state.get_span(self.span_id)
+    pub fn span(&self, state: &impl GetSpan) -> Span {
+        state.get_span(self.span_id)
     }
 }
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index e81d3360ab..3960f6d9d0 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -7,7 +7,7 @@ use crate::{
         Variable, Visibility, DEFAULT_OVERLAY_NAME,
     },
     eval_const::create_nu_constant,
-    BlockId, Category, Config, DeclId, FileId, HistoryConfig, Module, ModuleId, OverlayId,
+    BlockId, Category, Config, DeclId, FileId, GetSpan, HistoryConfig, Module, ModuleId, OverlayId,
     ShellError, Signature, Span, SpanId, Type, Value, VarId, VirtualPathId,
 };
 use fancy_regex::Regex;
@@ -1035,18 +1035,20 @@ impl EngineState {
         SpanId(self.num_spans() - 1)
     }
 
+    /// Find ID of a span (should be avoided if possible)
+    pub fn find_span_id(&self, span: Span) -> Option<SpanId> {
+        self.spans.iter().position(|sp| sp == &span).map(SpanId)
+    }
+}
+
+impl<'a> GetSpan for &'a EngineState {
     /// Get existing span
-    pub fn get_span(&self, span_id: SpanId) -> Span {
+    fn get_span(&self, span_id: SpanId) -> Span {
         *self
             .spans
             .get(span_id.0)
             .expect("internal error: missing span")
     }
-
-    /// Find ID of a span (should be avoided if possible)
-    pub fn find_span_id(&self, span: Span) -> Option<SpanId> {
-        self.spans.iter().position(|sp| sp == &span).map(SpanId)
-    }
 }
 
 impl Default for EngineState {
diff --git a/crates/nu-protocol/src/engine/state_working_set.rs b/crates/nu-protocol/src/engine/state_working_set.rs
index 31600b5eb9..af950b8321 100644
--- a/crates/nu-protocol/src/engine/state_working_set.rs
+++ b/crates/nu-protocol/src/engine/state_working_set.rs
@@ -4,8 +4,8 @@ use crate::{
         usage::build_usage, CachedFile, Command, CommandType, EngineState, OverlayFrame,
         StateDelta, Variable, VirtualPath, Visibility,
     },
-    BlockId, Category, Config, DeclId, FileId, Module, ModuleId, ParseError, ParseWarning, Span,
-    SpanId, Type, Value, VarId, VirtualPathId,
+    BlockId, Category, Config, DeclId, FileId, GetSpan, Module, ModuleId, ParseError, ParseWarning,
+    Span, SpanId, Type, Value, VarId, VirtualPathId,
 };
 use core::panic;
 use std::{
@@ -1019,8 +1019,10 @@ impl<'a> StateWorkingSet<'a> {
         self.delta.spans.push(span);
         SpanId(num_permanent_spans + self.delta.spans.len() - 1)
     }
+}
 
-    pub fn get_span(&self, span_id: SpanId) -> Span {
+impl<'a> GetSpan for &'a StateWorkingSet<'a> {
+    fn get_span(&self, span_id: SpanId) -> Span {
         let num_permanent_spans = self.permanent_state.num_spans();
         if span_id.0 < num_permanent_spans {
             self.permanent_state.get_span(span_id)
diff --git a/crates/nu-protocol/src/eval_base.rs b/crates/nu-protocol/src/eval_base.rs
index 6a1c0d302f..2317149460 100644
--- a/crates/nu-protocol/src/eval_base.rs
+++ b/crates/nu-protocol/src/eval_base.rs
@@ -4,7 +4,7 @@ use crate::{
         ExternalArgument, ListItem, Math, Operator, RecordItem,
     },
     debugger::DebugContext,
-    Config, Range, Record, ShellError, Span, Value, VarId, ENV_VARIABLE_ID,
+    Config, GetSpan, Range, Record, ShellError, Span, Value, VarId, ENV_VARIABLE_ID,
 };
 use std::{borrow::Cow, collections::HashMap};
 
@@ -12,7 +12,7 @@ use std::{borrow::Cow, collections::HashMap};
 pub trait Eval {
     /// State that doesn't need to be mutated.
     /// EngineState for regular eval and StateWorkingSet for const eval
-    type State<'a>: Copy;
+    type State<'a>: Copy + GetSpan;
 
     /// State that needs to be mutated.
     /// This is the stack for regular eval, and unused by const eval
@@ -23,17 +23,19 @@ pub trait Eval {
         mut_state: &mut Self::MutState,
         expr: &Expression,
     ) -> Result<Value, ShellError> {
+        let expr_span = expr.span(&state);
+
         match &expr.expr {
-            Expr::Bool(b) => Ok(Value::bool(*b, expr.span)),
-            Expr::Int(i) => Ok(Value::int(*i, expr.span)),
-            Expr::Float(f) => Ok(Value::float(*f, expr.span)),
-            Expr::Binary(b) => Ok(Value::binary(b.clone(), expr.span)),
-            Expr::Filepath(path, quoted) => Self::eval_filepath(state, mut_state, path.clone(), *quoted, expr.span),
+            Expr::Bool(b) => Ok(Value::bool(*b, expr_span)),
+            Expr::Int(i) => Ok(Value::int(*i, expr_span)),
+            Expr::Float(f) => Ok(Value::float(*f, expr_span)),
+            Expr::Binary(b) => Ok(Value::binary(b.clone(), expr_span)),
+            Expr::Filepath(path, quoted) => Self::eval_filepath(state, mut_state, path.clone(), *quoted, expr_span),
             Expr::Directory(path, quoted) => {
-                Self::eval_directory(state, mut_state, path.clone(), *quoted, expr.span)
+                Self::eval_directory(state, mut_state, path.clone(), *quoted, expr_span)
             }
-            Expr::Var(var_id) => Self::eval_var(state, mut_state, *var_id, expr.span),
-            Expr::CellPath(cell_path) => Ok(Value::cell_path(cell_path.clone(), expr.span)),
+            Expr::Var(var_id) => Self::eval_var(state, mut_state, *var_id, expr_span),
+            Expr::CellPath(cell_path) => Ok(Value::cell_path(cell_path.clone(), expr_span)),
             Expr::FullCellPath(cell_path) => {
                 let value = Self::eval::<D>(state, mut_state, &cell_path.head)?;
 
@@ -45,7 +47,7 @@ pub trait Eval {
                     value.follow_cell_path(&cell_path.tail, false)
                 }
             }
-            Expr::DateTime(dt) => Ok(Value::date(*dt, expr.span)),
+            Expr::DateTime(dt) => Ok(Value::date(*dt, expr_span)),
             Expr::List(list) => {
                 let mut output = vec![];
                 for item in list {
@@ -53,11 +55,11 @@ pub trait Eval {
                         ListItem::Item(expr) => output.push(Self::eval::<D>(state, mut_state, expr)?),
                         ListItem::Spread(_, expr) => match Self::eval::<D>(state, mut_state, expr)? {
                             Value::List { vals, .. } => output.extend(vals),
-                            _ => return Err(ShellError::CannotSpreadAsList { span: expr.span }),
+                            _ => return Err(ShellError::CannotSpreadAsList { span: expr_span }),
                         },
                     }
                 }
-                Ok(Value::list(output, expr.span))
+                Ok(Value::list(output, expr_span))
             }
             Expr::Record(items) => {
                 let mut record = Record::new();
@@ -67,36 +69,38 @@ pub trait Eval {
                         RecordItem::Pair(col, val) => {
                             // avoid duplicate cols
                             let col_name = Self::eval::<D>(state, mut_state, col)?.coerce_into_string()?;
+                            let col_span = col.span(&state);
                             if let Some(orig_span) = col_names.get(&col_name) {
                                 return Err(ShellError::ColumnDefinedTwice {
                                     col_name,
-                                    second_use: col.span,
+                                    second_use: col_span,
                                     first_use: *orig_span,
                                 });
                             } else {
-                                col_names.insert(col_name.clone(), col.span);
+                                col_names.insert(col_name.clone(), col_span);
                                 record.push(col_name, Self::eval::<D>(state, mut_state, val)?);
                             }
                         }
                         RecordItem::Spread(_, inner) => {
+                            let inner_span = inner.span(&state);
                             match Self::eval::<D>(state, mut_state, inner)? {
                                 Value::Record { val: inner_val, .. } => {
                                     for (col_name, val) in inner_val.into_owned() {
                                         if let Some(orig_span) = col_names.get(&col_name) {
                                             return Err(ShellError::ColumnDefinedTwice {
                                                 col_name,
-                                                second_use: inner.span,
+                                                second_use: inner_span,
                                                 first_use: *orig_span,
                                             });
                                         } else {
-                                            col_names.insert(col_name.clone(), inner.span);
+                                            col_names.insert(col_name.clone(), inner_span);
                                             record.push(col_name, val);
                                         }
                                     }
                                 }
                                 _ => {
                                     return Err(ShellError::CannotSpreadAsRecord {
-                                        span: inner.span,
+                                        span: inner_span,
                                     })
                                 }
                             }
@@ -104,7 +108,7 @@ pub trait Eval {
                     }
                 }
 
-                Ok(Value::record(record, expr.span))
+                Ok(Value::record(record, expr_span))
             }
             Expr::Table(table) => {
                 let mut output_headers = vec![];
@@ -114,10 +118,11 @@ pub trait Eval {
                         .iter()
                         .position(|existing| existing == &header)
                     {
+                        let first_use = table.columns[idx].span(&state);
                         return Err(ShellError::ColumnDefinedTwice {
                             col_name: header,
-                            second_use: expr.span,
-                            first_use: table.columns[idx].span,
+                            second_use: expr_span,
+                            first_use,
                         });
                     } else {
                         output_headers.push(header);
@@ -132,66 +137,66 @@ pub trait Eval {
 
                     output_rows.push(Value::record(
                         record,
-                        expr.span,
+                        expr_span,
                     ));
                 }
-                Ok(Value::list(output_rows, expr.span))
+                Ok(Value::list(output_rows, expr_span))
             }
             Expr::Keyword(kw) => Self::eval::<D>(state, mut_state, &kw.expr),
-            Expr::String(s) | Expr::RawString(s) => Ok(Value::string(s.clone(), expr.span)),
-            Expr::Nothing => Ok(Value::nothing(expr.span)),
+            Expr::String(s) | Expr::RawString(s) => Ok(Value::string(s.clone(), expr_span)),
+            Expr::Nothing => Ok(Value::nothing(expr_span)),
             Expr::ValueWithUnit(value) => match Self::eval::<D>(state, mut_state, &value.expr)? {
                 Value::Int { val, .. } => value.unit.item.build_value(val, value.unit.span),
                 x => Err(ShellError::CantConvert {
                     to_type: "unit value".into(),
                     from_type: x.get_type().to_string(),
-                    span: value.expr.span,
+                    span: value.expr.span(&state),
                     help: None,
                 }),
             },
-            Expr::Call(call) => Self::eval_call::<D>(state, mut_state, call, expr.span),
+            Expr::Call(call) => Self::eval_call::<D>(state, mut_state, call, expr_span),
             Expr::ExternalCall(head, args) => {
-                Self::eval_external_call(state, mut_state, head, args, expr.span)
+                Self::eval_external_call(state, mut_state, head, args, expr_span)
             }
             Expr::Subexpression(block_id) => {
-                Self::eval_subexpression::<D>(state, mut_state, *block_id, expr.span)
+                Self::eval_subexpression::<D>(state, mut_state, *block_id, expr_span)
             }
             Expr::Range(range) => {
                 let from = if let Some(f) = &range.from {
                     Self::eval::<D>(state, mut_state, f)?
                 } else {
-                    Value::nothing(expr.span)
+                    Value::nothing(expr_span)
                 };
 
                 let next = if let Some(s) = &range.next {
                     Self::eval::<D>(state, mut_state, s)?
                 } else {
-                    Value::nothing(expr.span)
+                    Value::nothing(expr_span)
                 };
 
                 let to = if let Some(t) = &range.to {
                     Self::eval::<D>(state, mut_state, t)?
                 } else {
-                    Value::nothing(expr.span)
+                    Value::nothing(expr_span)
                 };
 
                 Ok(Value::range(
-                    Range::new(from, next, to, range.operator.inclusion, expr.span)?,
-                    expr.span,
+                    Range::new(from, next, to, range.operator.inclusion, expr_span)?,
+                    expr_span,
                 ))
             }
             Expr::UnaryNot(expr) => {
                 let lhs = Self::eval::<D>(state, mut_state, expr)?;
                 match lhs {
-                    Value::Bool { val, .. } => Ok(Value::bool(!val, expr.span)),
+                    Value::Bool { val, .. } => Ok(Value::bool(!val, expr_span)),
                     other => Err(ShellError::TypeMismatch {
                         err_message: format!("expected bool, found {}", other.get_type()),
-                        span: expr.span,
+                        span: expr_span,
                     }),
                 }
             }
             Expr::BinaryOp(lhs, op, rhs) => {
-                let op_span = op.span;
+                let op_span = op.span(&state);
                 let op = eval_operator(op)?;
 
                 match op {
@@ -200,23 +205,23 @@ pub trait Eval {
                         match boolean {
                             Boolean::And => {
                                 if lhs.is_false() {
-                                    Ok(Value::bool(false, expr.span))
+                                    Ok(Value::bool(false, expr_span))
                                 } else {
                                     let rhs = Self::eval::<D>(state, mut_state, rhs)?;
-                                    lhs.and(op_span, &rhs, expr.span)
+                                    lhs.and(op_span, &rhs, expr_span)
                                 }
                             }
                             Boolean::Or => {
                                 if lhs.is_true() {
-                                    Ok(Value::bool(true, expr.span))
+                                    Ok(Value::bool(true, expr_span))
                                 } else {
                                     let rhs = Self::eval::<D>(state, mut_state, rhs)?;
-                                    lhs.or(op_span, &rhs, expr.span)
+                                    lhs.or(op_span, &rhs, expr_span)
                                 }
                             }
                             Boolean::Xor => {
                                 let rhs = Self::eval::<D>(state, mut_state, rhs)?;
-                                lhs.xor(op_span, &rhs, expr.span)
+                                lhs.xor(op_span, &rhs, expr_span)
                             }
                         }
                     }
@@ -225,35 +230,35 @@ pub trait Eval {
                         let rhs = Self::eval::<D>(state, mut_state, rhs)?;
 
                         match math {
-                            Math::Plus => lhs.add(op_span, &rhs, expr.span),
-                            Math::Minus => lhs.sub(op_span, &rhs, expr.span),
-                            Math::Multiply => lhs.mul(op_span, &rhs, expr.span),
-                            Math::Divide => lhs.div(op_span, &rhs, expr.span),
-                            Math::Append => lhs.append(op_span, &rhs, expr.span),
-                            Math::Modulo => lhs.modulo(op_span, &rhs, expr.span),
-                            Math::FloorDivision => lhs.floor_div(op_span, &rhs, expr.span),
-                            Math::Pow => lhs.pow(op_span, &rhs, expr.span),
+                            Math::Plus => lhs.add(op_span, &rhs, expr_span),
+                            Math::Minus => lhs.sub(op_span, &rhs, expr_span),
+                            Math::Multiply => lhs.mul(op_span, &rhs, expr_span),
+                            Math::Divide => lhs.div(op_span, &rhs, expr_span),
+                            Math::Append => lhs.append(op_span, &rhs, expr_span),
+                            Math::Modulo => lhs.modulo(op_span, &rhs, expr_span),
+                            Math::FloorDivision => lhs.floor_div(op_span, &rhs, expr_span),
+                            Math::Pow => lhs.pow(op_span, &rhs, expr_span),
                         }
                     }
                     Operator::Comparison(comparison) => {
                         let lhs = Self::eval::<D>(state, mut_state, lhs)?;
                         let rhs = Self::eval::<D>(state, mut_state, rhs)?;
                         match comparison {
-                            Comparison::LessThan => lhs.lt(op_span, &rhs, expr.span),
-                            Comparison::LessThanOrEqual => lhs.lte(op_span, &rhs, expr.span),
-                            Comparison::GreaterThan => lhs.gt(op_span, &rhs, expr.span),
-                            Comparison::GreaterThanOrEqual => lhs.gte(op_span, &rhs, expr.span),
-                            Comparison::Equal => lhs.eq(op_span, &rhs, expr.span),
-                            Comparison::NotEqual => lhs.ne(op_span, &rhs, expr.span),
-                            Comparison::In => lhs.r#in(op_span, &rhs, expr.span),
-                            Comparison::NotIn => lhs.not_in(op_span, &rhs, expr.span),
-                            Comparison::StartsWith => lhs.starts_with(op_span, &rhs, expr.span),
-                            Comparison::EndsWith => lhs.ends_with(op_span, &rhs, expr.span),
+                            Comparison::LessThan => lhs.lt(op_span, &rhs, expr_span),
+                            Comparison::LessThanOrEqual => lhs.lte(op_span, &rhs, expr_span),
+                            Comparison::GreaterThan => lhs.gt(op_span, &rhs, expr_span),
+                            Comparison::GreaterThanOrEqual => lhs.gte(op_span, &rhs, expr_span),
+                            Comparison::Equal => lhs.eq(op_span, &rhs, expr_span),
+                            Comparison::NotEqual => lhs.ne(op_span, &rhs, expr_span),
+                            Comparison::In => lhs.r#in(op_span, &rhs, expr_span),
+                            Comparison::NotIn => lhs.not_in(op_span, &rhs, expr_span),
+                            Comparison::StartsWith => lhs.starts_with(op_span, &rhs, expr_span),
+                            Comparison::EndsWith => lhs.ends_with(op_span, &rhs, expr_span),
                             Comparison::RegexMatch => {
-                                Self::regex_match(state, op_span, &lhs, &rhs, false, expr.span)
+                                Self::regex_match(state, op_span, &lhs, &rhs, false, expr_span)
                             }
                             Comparison::NotRegexMatch => {
-                                Self::regex_match(state, op_span, &lhs, &rhs, true, expr.span)
+                                Self::regex_match(state, op_span, &lhs, &rhs, true, expr_span)
                             }
                         }
                     }
@@ -261,20 +266,20 @@ pub trait Eval {
                         let lhs = Self::eval::<D>(state, mut_state, lhs)?;
                         let rhs = Self::eval::<D>(state, mut_state, rhs)?;
                         match bits {
-                            Bits::BitAnd => lhs.bit_and(op_span, &rhs, expr.span),
-                            Bits::BitOr => lhs.bit_or(op_span, &rhs, expr.span),
-                            Bits::BitXor => lhs.bit_xor(op_span, &rhs, expr.span),
-                            Bits::ShiftLeft => lhs.bit_shl(op_span, &rhs, expr.span),
-                            Bits::ShiftRight => lhs.bit_shr(op_span, &rhs, expr.span),
+                            Bits::BitAnd => lhs.bit_and(op_span, &rhs, expr_span),
+                            Bits::BitOr => lhs.bit_or(op_span, &rhs, expr_span),
+                            Bits::BitXor => lhs.bit_xor(op_span, &rhs, expr_span),
+                            Bits::ShiftLeft => lhs.bit_shl(op_span, &rhs, expr_span),
+                            Bits::ShiftRight => lhs.bit_shr(op_span, &rhs, expr_span),
                         }
                     }
                     Operator::Assignment(assignment) => Self::eval_assignment::<D>(
-                        state, mut_state, lhs, rhs, assignment, op_span, expr.span
+                        state, mut_state, lhs, rhs, assignment, op_span, expr_span
                     ),
                 }
             }
             Expr::RowCondition(block_id) | Expr::Closure(block_id) => {
-                Self::eval_row_condition_or_closure(state, mut_state, *block_id, expr.span)
+                Self::eval_row_condition_or_closure(state, mut_state, *block_id, expr_span)
             }
             Expr::StringInterpolation(exprs) => {
                 let config = Self::get_config(state, mut_state);
@@ -283,13 +288,13 @@ pub trait Eval {
                     .map(|expr| Self::eval::<D>(state, mut_state, expr).map(|v| v.to_expanded_string(", ", &config)))
                     .collect::<Result<String, _>>()?;
 
-                Ok(Value::string(str, expr.span))
+                Ok(Value::string(str, expr_span))
             }
-            Expr::Overlay(_) => Self::eval_overlay(state, expr.span),
+            Expr::Overlay(_) => Self::eval_overlay(state, expr_span),
             Expr::GlobPattern(pattern, quoted) => {
                 // GlobPattern is similar to Filepath
                 // But we don't want to expand path during eval time, it's required for `nu_engine::glob_from` to run correctly
-                Ok(Value::glob(pattern, *quoted, expr.span))
+                Ok(Value::glob(pattern, *quoted, expr_span))
             }
             Expr::MatchBlock(_) // match blocks are handled by `match`
             | Expr::Block(_) // blocks are handled directly by core commands
@@ -297,7 +302,7 @@ pub trait Eval {
             | Expr::ImportPattern(_)
             | Expr::Signature(_)
             | Expr::Operator(_)
-            | Expr::Garbage => Self::unreachable(expr),
+            | Expr::Garbage => Self::unreachable(state, expr),
         }
     }
 
@@ -378,5 +383,5 @@ pub trait Eval {
     fn eval_overlay(state: Self::State<'_>, span: Span) -> Result<Value, ShellError>;
 
     /// For expressions that should never actually be evaluated
-    fn unreachable(expr: &Expression) -> Result<Value, ShellError>;
+    fn unreachable(state: Self::State<'_>, expr: &Expression) -> Result<Value, ShellError>;
 }
diff --git a/crates/nu-protocol/src/eval_const.rs b/crates/nu-protocol/src/eval_const.rs
index 4cc7e25324..08ff6fa391 100644
--- a/crates/nu-protocol/src/eval_const.rs
+++ b/crates/nu-protocol/src/eval_const.rs
@@ -251,7 +251,7 @@ pub fn eval_constant_with_input(
         Expr::Call(call) => eval_const_call(working_set, call, input),
         Expr::Subexpression(block_id) => {
             let block = working_set.get_block(*block_id);
-            eval_const_subexpression(working_set, block, input, expr.span)
+            eval_const_subexpression(working_set, block, input, expr.span(&working_set))
         }
         _ => eval_constant(working_set, expr).map(|v| PipelineData::Value(v, None)),
     }
@@ -379,7 +379,9 @@ impl Eval for EvalConst {
         Err(ShellError::NotAConstant { span })
     }
 
-    fn unreachable(expr: &Expression) -> Result<Value, ShellError> {
-        Err(ShellError::NotAConstant { span: expr.span })
+    fn unreachable(working_set: &StateWorkingSet, expr: &Expression) -> Result<Value, ShellError> {
+        Err(ShellError::NotAConstant {
+            span: expr.span(&working_set),
+        })
     }
 }
diff --git a/crates/nu-protocol/src/span.rs b/crates/nu-protocol/src/span.rs
index 3d32aa4ddf..0d280eaa9d 100644
--- a/crates/nu-protocol/src/span.rs
+++ b/crates/nu-protocol/src/span.rs
@@ -1,7 +1,12 @@
+use crate::SpanId;
 use miette::SourceSpan;
 use serde::{Deserialize, Serialize};
 use std::ops::Deref;
 
+pub trait GetSpan {
+    fn get_span(&self, span_id: SpanId) -> Span;
+}
+
 /// A spanned area of interest, generic over what kind of thing is of interest
 #[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq, Eq)]
 pub struct Spanned<T> {

From 5ac3ad61c42c9c97952a5df11d79e69ffcde73db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C5=BD=C3=A1dn=C3=ADk?= <kubouch@gmail.com>
Date: Sun, 9 Jun 2024 14:03:52 +0300
Subject: [PATCH 0089/1072] Extend functionality of tango benchmark helpers
 (#13107)

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

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

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

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

Refactors the tango helpers in the toolkit and makes them more flexible
(e.g., being able to benchmark any branch against any branch, not just
current and main).

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 toolkit.nu | 78 ++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 61 insertions(+), 17 deletions(-)

diff --git a/toolkit.nu b/toolkit.nu
index 6f19900fdb..0ef56d1077 100644
--- a/toolkit.nu
+++ b/toolkit.nu
@@ -491,29 +491,73 @@ export def cov [] {
     print $"Coverage generation took ($end - $start)."
 }
 
-
-# Benchmark the current branch against the main branch
+# Benchmark a target revision (default: current branch) against a reference revision (default: main branch)
+#
+# Results are saved in a `./tango` directory
 # Ensure you have `cargo-export` installed to generate separate artifacts for each branch.
-export def "benchmark-current-branch-with-main" [] {
-    let main = "main"
-    let current_branch = (git branch --show-current)
+export def benchmark-compare [
+    target?: string     # which branch to compare (default: current branch)
+    reference?: string  # the reference to compare against (default: main branch)
+] {
+    let reference = $reference | default "main"
+    let current = git branch --show-current
+    let target = $target | default $current
 
-    cargo export $"target/($current_branch)" -- bench
-    git checkout $main
-    cargo export $"target/($main)" -- bench
-    git checkout $current_branch
-    ^$"./target/($current_branch)/benchmarks" compare $"./target/($main)/benchmarks" -o -s 50
+    print $'-- Benchmarking ($target) against ($reference)'
+
+    let export_dir = $env.PWD | path join "tango"
+    let ref_bin_dir = $export_dir | path join bin $reference
+    let tgt_bin_dir = $export_dir | path join bin $target
+
+    # benchmark the target revision
+    print $'-- Running benchmarks for ($target)'
+    git checkout $target
+    cargo export $tgt_bin_dir -- bench
+
+    # benchmark the comparison reference revision
+    print $'-- Running benchmarks for ($reference)'
+    git checkout $reference
+    cargo export $ref_bin_dir -- bench
+
+    # return back to the whatever revision before benchmarking
+    print '-- Done'
+    git checkout $current
+
+    # report results
+    let reference_bin = $ref_bin_dir | path join benchmarks
+    let target_bin = $tgt_bin_dir | path join benchmarks
+    ^$target_bin compare $reference_bin -o -s 50 --dump ($export_dir | path join samples)
 }
 
-# Benchmark the current branch and logs the result in `./target/samples`
+# Benchmark the current branch and logs the result in `./tango/samples`
+#
+# Results are saved in a `./tango` directory
 # Ensure you have `cargo-export` installed to generate separate artifacts for each branch.
-export def "benchmark-and-log-result" [] {
-    let current_branch = (git branch --show-current)
-    let current_dir = "./" | path expand
-    let res_path = $"($current_dir)/target/samples"
+export def benchmark-log [
+    target?: string     # which branch to compare (default: current branch)
+] {
+    let current = git branch --show-current
+    let target = $target | default $current
+    print $'-- Benchmarking ($target)'
 
-    cargo export $"target/($current_branch)" -- bench
-    ^$"./target/($current_branch)/benchmarks" compare -o -s 50 --dump $res_path
+    let export_dir = $env.PWD | path join "tango"
+    let bin_dir = ($export_dir | path join bin $target)
+
+    # benchmark the target revision
+    if $target != $current {
+        git checkout $target
+    }
+    cargo export $bin_dir -- bench
+
+    # return back to the whatever revision before benchmarking
+    print '-- Done'
+    if $target != $current {
+        git checkout $current
+    }
+
+    # report results
+    let bench_bin = ($bin_dir | path join benchmarks)
+    ^$bench_bin compare -o -s 50 --dump ($export_dir | path join samples)
 }
 
 # Build all Windows archives and MSIs for release manually

From dc76183cd535d44eb184d6e428a5a9f33c88dfc4 Mon Sep 17 00:00:00 2001
From: Sang-Heon Jeon <ekffu200098@gmail.com>
Date: Mon, 10 Jun 2024 11:43:17 +0900
Subject: [PATCH 0090/1072] fix wrong casting with into filesize (#13110)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
Fix wrong casting which is related to
https://github.com/nushell/nushell/pull/12974#discussion_r1618598336

# User-Facing Changes
AS-IS (before fixing)
```
$ "-10000PiB" | into filesize
6.2 EiB                                                         <--- Wrong casted value
$ "10000PiB" | into filesize
-6.2 EiB                                                        <--- Wrong casted value
```

TO-BE (after fixing)
```
$ "-10000PiB" | into filesize
Error: nu::shell::cant_convert

  × Can't convert to filesize.
   ╭─[entry #6:1:1]
 1 │ "-10000PiB" | into filesize
   · ─────┬─────
   ·      ╰── can't convert string to filesize
   ╰────

$ "10000PiB" | into filesize
Error: nu::shell::cant_convert

  × Can't convert to filesize.
   ╭─[entry #7:1:1]
 1 │ "10000PiB" | into filesize
   · ─────┬────
   ·      ╰── can't convert string to filesize
   ╰────
```
---
 .../src/conversions/into/filesize.rs          | 21 ++++++++++++++-----
 .../tests/commands/into_filesize.rs           | 14 +++++++++++++
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/crates/nu-command/src/conversions/into/filesize.rs b/crates/nu-command/src/conversions/into/filesize.rs
index 101a9fe6f0..010c031b2a 100644
--- a/crates/nu-command/src/conversions/into/filesize.rs
+++ b/crates/nu-command/src/conversions/into/filesize.rs
@@ -122,7 +122,7 @@ pub fn action(input: &Value, _args: &CellPathOnlyArgs, span: Span) -> Value {
         Value::Filesize { .. } => input.clone(),
         Value::Int { val, .. } => Value::filesize(*val, value_span),
         Value::Float { val, .. } => Value::filesize(*val as i64, value_span),
-        Value::String { val, .. } => match int_from_string(val, value_span) {
+        Value::String { val, .. } => match i64_from_string(val, value_span) {
             Ok(val) => Value::filesize(val, value_span),
             Err(error) => Value::error(error, value_span),
         },
@@ -139,7 +139,7 @@ pub fn action(input: &Value, _args: &CellPathOnlyArgs, span: Span) -> Value {
     }
 }
 
-fn int_from_string(a_string: &str, span: Span) -> Result<i64, ShellError> {
+fn i64_from_string(a_string: &str, span: Span) -> Result<i64, ShellError> {
     // Get the Locale so we know what the thousands separator is
     let locale = get_system_locale();
 
@@ -151,24 +151,35 @@ fn int_from_string(a_string: &str, span: Span) -> Result<i64, ShellError> {
     // Hadle negative file size
     if let Some(stripped_negative_string) = clean_string.strip_prefix('-') {
         match stripped_negative_string.parse::<bytesize::ByteSize>() {
-            Ok(n) => Ok(-(n.as_u64() as i64)),
+            Ok(n) => i64_from_byte_size(n, true, span),
             Err(_) => Err(string_convert_error(span)),
         }
     } else if let Some(stripped_positive_string) = clean_string.strip_prefix('+') {
         match stripped_positive_string.parse::<bytesize::ByteSize>() {
             Ok(n) if stripped_positive_string.starts_with(|c: char| c.is_ascii_digit()) => {
-                Ok(n.as_u64() as i64)
+                i64_from_byte_size(n, false, span)
             }
             _ => Err(string_convert_error(span)),
         }
     } else {
         match clean_string.parse::<bytesize::ByteSize>() {
-            Ok(n) => Ok(n.as_u64() as i64),
+            Ok(n) => i64_from_byte_size(n, false, span),
             Err(_) => Err(string_convert_error(span)),
         }
     }
 }
 
+fn i64_from_byte_size(
+    byte_size: bytesize::ByteSize,
+    is_negative: bool,
+    span: Span,
+) -> Result<i64, ShellError> {
+    match i64::try_from(byte_size.as_u64()) {
+        Ok(n) => Ok(if is_negative { -n } else { n }),
+        Err(_) => Err(string_convert_error(span)),
+    }
+}
+
 fn string_convert_error(span: Span) -> ShellError {
     ShellError::CantConvert {
         to_type: "filesize".into(),
diff --git a/crates/nu-command/tests/commands/into_filesize.rs b/crates/nu-command/tests/commands/into_filesize.rs
index d8ba88021c..6a72c76b5d 100644
--- a/crates/nu-command/tests/commands/into_filesize.rs
+++ b/crates/nu-command/tests/commands/into_filesize.rs
@@ -76,6 +76,13 @@ fn into_filesize_wrong_negative_str_filesize() {
     assert!(actual.err.contains("can't convert string to filesize"));
 }
 
+#[test]
+fn into_filesize_large_negative_str_filesize() {
+    let actual = nu!("'-10000PiB' | into filesize");
+
+    assert!(actual.err.contains("can't convert string to filesize"));
+}
+
 #[test]
 fn into_filesize_negative_str() {
     let actual = nu!("'-1' | into filesize");
@@ -104,6 +111,13 @@ fn into_filesize_wrong_positive_str_filesize() {
     assert!(actual.err.contains("can't convert string to filesize"));
 }
 
+#[test]
+fn into_filesize_large_positive_str_filesize() {
+    let actual = nu!("'+10000PiB' | into filesize");
+
+    assert!(actual.err.contains("can't convert string to filesize"));
+}
+
 #[test]
 fn into_filesize_positive_str() {
     let actual = nu!("'+1' | into filesize");

From 650ae537c3a7346e9ce899e41634f611786399dd Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Sun, 9 Jun 2024 19:44:04 -0700
Subject: [PATCH 0091/1072] Fix the use of right hand expressions in operations
 (#13096)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As reported by @maxim-uvarov and pyz in the dataframes discord channel:

```nushell
[[a b]; [1 1] [1 2] [2 1] [2 2] [3 1] [3 2]] | polars into-df | polars with-column ((polars col a) / (polars col b)) --name c


  × Type mismatch.
   ╭─[entry #45:1:102]
 1 │ [[a b]; [1 1] [1 2] [2 1] [2 2] [3 1] [3 2]] | polars into-df | polars with-column ((polars col a) / (polars col b)) --name c
   ·                                                                                                      ───────┬──────
   ·                                                                                                             ╰── Right hand side not a dataframe expression
   ╰────
```

This pull request corrects the type casting on the right hand side and
allows more than just polars literal expressions.
---
 .../values/nu_expression/custom_value.rs      | 49 ++++---------------
 1 file changed, 10 insertions(+), 39 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_expression/custom_value.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_expression/custom_value.rs
index ea751b0255..a9371f03f2 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_expression/custom_value.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_expression/custom_value.rs
@@ -63,45 +63,16 @@ fn compute_with_value(
     op: Span,
     right: &Value,
 ) -> Result<Value, ShellError> {
-    let rhs_span = right.span();
-    match right {
-        Value::Custom { val: rhs, .. } => {
-            let rhs = rhs.as_any().downcast_ref::<NuExpression>().ok_or_else(|| {
-                ShellError::TypeMismatch {
-                    err_message: "Right hand side not a dataframe expression".into(),
-                    span: rhs_span,
-                }
-            })?;
-
-            match rhs.as_ref() {
-                polars::prelude::Expr::Literal(..) => with_operator(
-                    (plugin, engine),
-                    operator,
-                    left,
-                    rhs,
-                    lhs_span,
-                    right.span(),
-                    op,
-                ),
-                _ => Err(ShellError::TypeMismatch {
-                    err_message: "Only literal expressions or number".into(),
-                    span: right.span(),
-                }),
-            }
-        }
-        _ => {
-            let rhs = NuExpression::try_from_value(plugin, right)?;
-            with_operator(
-                (plugin, engine),
-                operator,
-                left,
-                &rhs,
-                lhs_span,
-                right.span(),
-                op,
-            )
-        }
-    }
+    let rhs = NuExpression::try_from_value(plugin, right)?;
+    with_operator(
+        (plugin, engine),
+        operator,
+        left,
+        &rhs,
+        lhs_span,
+        right.span(),
+        op,
+    )
 }
 
 fn with_operator(

From 021b8633cb8f776ca1a30db2597d107aa92fbf6f Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Sun, 9 Jun 2024 19:45:25 -0700
Subject: [PATCH 0092/1072] Allow the addition of an index column to be
 optional (#13097)

Per discussion on discord dataframes channel with @maxim-uvarov and pyz.

When converting a dataframe to an nushell value via `polars into-nu`,
the index column should not be added by default and should only be added
when specifying `--index`
---
 .../src/dataframe/eager/to_nu.rs              | 14 ++++----
 .../src/dataframe/values/nu_dataframe/mod.rs  | 32 +++++++++++++------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/eager/to_nu.rs b/crates/nu_plugin_polars/src/dataframe/eager/to_nu.rs
index 8e3cdffa24..72aff7a728 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/to_nu.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/to_nu.rs
@@ -35,6 +35,7 @@ impl PluginCommand for ToNu {
                 Some('n'),
             )
             .switch("tail", "shows tail rows", Some('t'))
+            .switch("index", "add an index column", Some('i'))
             .input_output_types(vec![
                 (Type::Custom("expression".into()), Type::Any),
                 (Type::Custom("dataframe".into()), Type::table()),
@@ -62,18 +63,18 @@ impl PluginCommand for ToNu {
         vec![
             Example {
                 description: "Shows head rows from dataframe",
-                example: "[[a b]; [1 2] [3 4]] | polars into-df | polars into-nu",
+                example: "[[a b]; [1 2] [3 4]] | polars into-df | polars into-nu --index",
                 result: Some(Value::list(vec![rec_1, rec_2], Span::test_data())),
             },
             Example {
                 description: "Shows tail rows from dataframe",
                 example:
-                    "[[a b]; [1 2] [5 6] [3 4]] | polars into-df | polars into-nu --tail --rows 1",
+                    "[[a b]; [1 2] [5 6] [3 4]] | polars into-df | polars into-nu --tail --rows 1 --index",
                 result: Some(Value::list(vec![rec_3], Span::test_data())),
             },
             Example {
                 description: "Convert a col expression into a nushell value",
-                example: "polars col a | polars into-nu",
+                example: "polars col a | polars into-nu --index",
                 result: Some(Value::test_record(record! {
                     "expr" =>  Value::test_string("column"),
                     "value" => Value::test_string("a"),
@@ -106,17 +107,18 @@ fn dataframe_command(
 ) -> Result<PipelineData, ShellError> {
     let rows: Option<usize> = call.get_flag("rows")?;
     let tail: bool = call.has_flag("tail")?;
+    let index: bool = call.has_flag("index")?;
 
     let df = NuDataFrame::try_from_value_coerce(plugin, &input, call.head)?;
 
     let values = if tail {
-        df.tail(rows, call.head)?
+        df.tail(rows, index, call.head)?
     } else {
         // if rows is specified, return those rows, otherwise return everything
         if rows.is_some() {
-            df.head(rows, call.head)?
+            df.head(rows, index, call.head)?
         } else {
-            df.head(Some(df.height()), call.head)?
+            df.head(Some(df.height()), index, call.head)?
         }
     };
 
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs
index 1c322579dd..89a8c862e7 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs
@@ -326,22 +326,22 @@ impl NuDataFrame {
     }
 
     // Print is made out a head and if the dataframe is too large, then a tail
-    pub fn print(&self, span: Span) -> Result<Vec<Value>, ShellError> {
+    pub fn print(&self, include_index: bool, span: Span) -> Result<Vec<Value>, ShellError> {
         let df = &self.df;
         let size: usize = 20;
 
         if df.height() > size {
             let sample_size = size / 2;
-            let mut values = self.head(Some(sample_size), span)?;
+            let mut values = self.head(Some(sample_size), include_index, span)?;
             conversion::add_separator(&mut values, df, self.has_index(), span);
             let remaining = df.height() - sample_size;
             let tail_size = remaining.min(sample_size);
-            let mut tail_values = self.tail(Some(tail_size), span)?;
+            let mut tail_values = self.tail(Some(tail_size), include_index, span)?;
             values.append(&mut tail_values);
 
             Ok(values)
         } else {
-            Ok(self.head(Some(size), span)?)
+            Ok(self.head(Some(size), include_index, span)?)
         }
     }
 
@@ -349,26 +349,38 @@ impl NuDataFrame {
         self.df.height()
     }
 
-    pub fn head(&self, rows: Option<usize>, span: Span) -> Result<Vec<Value>, ShellError> {
+    pub fn head(
+        &self,
+        rows: Option<usize>,
+        include_index: bool,
+        span: Span,
+    ) -> Result<Vec<Value>, ShellError> {
         let to_row = rows.unwrap_or(5);
-        let values = self.to_rows(0, to_row, span)?;
+        let values = self.to_rows(0, to_row, include_index, span)?;
         Ok(values)
     }
 
-    pub fn tail(&self, rows: Option<usize>, span: Span) -> Result<Vec<Value>, ShellError> {
+    pub fn tail(
+        &self,
+        rows: Option<usize>,
+        include_index: bool,
+        span: Span,
+    ) -> Result<Vec<Value>, ShellError> {
         let df = &self.df;
         let to_row = df.height();
         let size = rows.unwrap_or(DEFAULT_ROWS);
         let from_row = to_row.saturating_sub(size);
 
-        let values = self.to_rows(from_row, to_row, span)?;
+        let values = self.to_rows(from_row, to_row, include_index, span)?;
         Ok(values)
     }
 
+    /// Converts the dataframe to a nushell list of values
     pub fn to_rows(
         &self,
         from_row: usize,
         to_row: usize,
+        include_index: bool,
         span: Span,
     ) -> Result<Vec<Value>, ShellError> {
         let df = &self.df;
@@ -400,7 +412,7 @@ impl NuDataFrame {
             .map(|i| {
                 let mut record = Record::new();
 
-                if !has_index {
+                if !has_index && include_index {
                     record.push("index", Value::int((i + from_row) as i64, span));
                 }
 
@@ -602,7 +614,7 @@ impl CustomValueSupport for NuDataFrame {
     }
 
     fn base_value(self, span: Span) -> Result<Value, ShellError> {
-        let vals = self.print(span)?;
+        let vals = self.print(true, span)?;
         Ok(Value::list(vals, span))
     }
 

From 5b7e8bf1d8022b2aef50d8a0ad7cbd8e3c65f707 Mon Sep 17 00:00:00 2001
From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Sun, 9 Jun 2024 23:01:22 -0400
Subject: [PATCH 0093/1072] Deprecate `--numbered` from `for` (#13112)

# Description

#7777 removed the `--numbered` flag from `each`, `par-each`, `reduce`,
and `each while`. It was suggested at the time that it should be removed
from `for` as well, but for several reasons it wasn't.

This PR deprecates `--numbered` in anticipation of removing it in 0.96.

Note: Please review carefully, as this is my first "real" Rust/Nushell
code. I was hoping that some prior commit would be useful as a template,
but since this was an argument on a parser keyword, I didn't find too
much useful. So I had to actually find the relevant helpers in the code
and `nu_protocol` doc and learn how to use them - oh darn ;-) But please
make sure I did it correctly.

# User-Facing Changes

* Use of `--numbered` will result in a deprecation warning.
* Changed help example to demonstrate the new syntax.
* Help shows deprecation notice on the flag
---
 crates/nu-cmd-lang/src/core_commands/for_.rs  | 20 ++++++++++++++++---
 .../nu-protocol/src/errors/parse_warning.rs   |  2 +-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/crates/nu-cmd-lang/src/core_commands/for_.rs b/crates/nu-cmd-lang/src/core_commands/for_.rs
index 387af45282..0f2434d162 100644
--- a/crates/nu-cmd-lang/src/core_commands/for_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/for_.rs
@@ -1,5 +1,6 @@
 use nu_engine::{command_prelude::*, get_eval_block, get_eval_expression};
 use nu_protocol::engine::CommandType;
+use nu_protocol::ParseWarning;
 
 #[derive(Clone)]
 pub struct For;
@@ -30,7 +31,7 @@ impl Command for For {
             .required("block", SyntaxShape::Block, "The block to run.")
             .switch(
                 "numbered",
-                "return a numbered item ($it.index and $it.item)",
+                "DEPRECATED: return a numbered item ($it.index and $it.item)",
                 Some('n'),
             )
             .creates_scope()
@@ -78,6 +79,20 @@ 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();
@@ -198,8 +213,7 @@ impl Command for For {
             },
             Example {
                 description: "Number each item and print a message",
-                example:
-                    "for $it in ['bob' 'fred'] --numbered { print $\"($it.index) is ($it.item)\" }",
+                example: r#"for $it in (['bob' 'fred'] | enumerate) { print $"($it.index) is ($it.item)" }"#,
                 result: None,
             },
         ]
diff --git a/crates/nu-protocol/src/errors/parse_warning.rs b/crates/nu-protocol/src/errors/parse_warning.rs
index 0213d6889f..a30bc731d8 100644
--- a/crates/nu-protocol/src/errors/parse_warning.rs
+++ b/crates/nu-protocol/src/errors/parse_warning.rs
@@ -10,7 +10,7 @@ pub enum ParseWarning {
     DeprecatedWarning {
         old_command: String,
         new_suggestion: String,
-        #[label("`{old_command}` is deprecated and will be removed in 0.94. Please {new_suggestion} instead")]
+        #[label("`{old_command}` is deprecated and will be removed in a future release. Please {new_suggestion} instead")]
         span: Span,
         url: String,
     },

From af22bb8d52a3e011cff9f0fb5766749206822dc3 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Mon, 10 Jun 2024 11:31:47 +0000
Subject: [PATCH 0094/1072] Remove old `sys` command behavior (#13114)

# Description

Removes the old, deprecated behavior of the `sys` command. That is, it
will no longer return the full system information record.

# User-Facing Changes

Breaking change: `sys` no longer outputs anything and will instead
display help text.
---
 crates/nu-command/src/system/sys/cpu.rs   |  43 ++++-
 crates/nu-command/src/system/sys/disks.rs |  28 ++-
 crates/nu-command/src/system/sys/host.rs  |  56 +++++-
 crates/nu-command/src/system/sys/mem.rs   |  20 ++-
 crates/nu-command/src/system/sys/mod.rs   | 198 +---------------------
 crates/nu-command/src/system/sys/net.rs   |  21 ++-
 crates/nu-command/src/system/sys/sys_.rs  |  32 +---
 crates/nu-command/src/system/sys/temp.rs  |  24 ++-
 crates/nu-command/src/system/sys/users.rs |  26 ++-
 9 files changed, 215 insertions(+), 233 deletions(-)

diff --git a/crates/nu-command/src/system/sys/cpu.rs b/crates/nu-command/src/system/sys/cpu.rs
index b2f6d6afa6..d24197bf70 100644
--- a/crates/nu-command/src/system/sys/cpu.rs
+++ b/crates/nu-command/src/system/sys/cpu.rs
@@ -1,4 +1,6 @@
+use super::trim_cstyle_null;
 use nu_engine::command_prelude::*;
+use sysinfo::{CpuRefreshKind, System, MINIMUM_CPU_UPDATE_INTERVAL};
 
 #[derive(Clone)]
 pub struct SysCpu;
@@ -26,7 +28,7 @@ impl Command for SysCpu {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(super::cpu(call.head).into_pipeline_data())
+        Ok(cpu(call.head).into_pipeline_data())
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -37,3 +39,42 @@ impl Command for SysCpu {
         }]
     }
 }
+
+fn cpu(span: Span) -> Value {
+    let mut sys = System::new();
+    sys.refresh_cpu_specifics(CpuRefreshKind::everything());
+    // We must refresh the CPU twice a while apart to get valid usage data.
+    // In theory we could just sleep MINIMUM_CPU_UPDATE_INTERVAL, but I've noticed that
+    // that gives poor results (error of ~5%). Decided to wait 2x that long, somewhat arbitrarily
+    std::thread::sleep(MINIMUM_CPU_UPDATE_INTERVAL * 2);
+    sys.refresh_cpu_specifics(CpuRefreshKind::new().with_cpu_usage());
+
+    let cpus = sys
+        .cpus()
+        .iter()
+        .map(|cpu| {
+            // sysinfo CPU usage numbers are not very precise unless you wait a long time between refreshes.
+            // Round to 1DP (chosen somewhat arbitrarily) so people aren't misled by high-precision floats.
+            let rounded_usage = (cpu.cpu_usage() * 10.0).round() / 10.0;
+
+            let load_avg = System::load_average();
+            let load_avg = format!(
+                "{:.2}, {:.2}, {:.2}",
+                load_avg.one, load_avg.five, load_avg.fifteen
+            );
+
+            let record = record! {
+                "name" => Value::string(trim_cstyle_null(cpu.name()), span),
+                "brand" => Value::string(trim_cstyle_null(cpu.brand()), span),
+                "freq" => Value::int(cpu.frequency() as i64, span),
+                "cpu_usage" => Value::float(rounded_usage.into(), span),
+                "load_average" => Value::string(load_avg, span),
+                "vendor_id" => Value::string(trim_cstyle_null(cpu.vendor_id()), span),
+            };
+
+            Value::record(record, span)
+        })
+        .collect();
+
+    Value::list(cpus, span)
+}
diff --git a/crates/nu-command/src/system/sys/disks.rs b/crates/nu-command/src/system/sys/disks.rs
index 66991c9087..0d9ce09db3 100644
--- a/crates/nu-command/src/system/sys/disks.rs
+++ b/crates/nu-command/src/system/sys/disks.rs
@@ -1,4 +1,6 @@
+use super::trim_cstyle_null;
 use nu_engine::command_prelude::*;
+use sysinfo::Disks;
 
 #[derive(Clone)]
 pub struct SysDisks;
@@ -26,7 +28,7 @@ impl Command for SysDisks {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(super::disks(call.head).into_pipeline_data())
+        Ok(disks(call.head).into_pipeline_data())
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -37,3 +39,27 @@ impl Command for SysDisks {
         }]
     }
 }
+
+fn disks(span: Span) -> Value {
+    let disks = Disks::new_with_refreshed_list()
+        .iter()
+        .map(|disk| {
+            let device = trim_cstyle_null(disk.name().to_string_lossy());
+            let typ = trim_cstyle_null(disk.file_system().to_string_lossy());
+
+            let record = record! {
+                "device" => Value::string(device, span),
+                "type" => Value::string(typ, span),
+                "mount" => Value::string(disk.mount_point().to_string_lossy(), span),
+                "total" => Value::filesize(disk.total_space() as i64, span),
+                "free" => Value::filesize(disk.available_space() as i64, span),
+                "removable" => Value::bool(disk.is_removable(), span),
+                "kind" => Value::string(disk.kind().to_string(), span),
+            };
+
+            Value::record(record, span)
+        })
+        .collect();
+
+    Value::list(disks, span)
+}
diff --git a/crates/nu-command/src/system/sys/host.rs b/crates/nu-command/src/system/sys/host.rs
index 969f59ef99..64dd43424d 100644
--- a/crates/nu-command/src/system/sys/host.rs
+++ b/crates/nu-command/src/system/sys/host.rs
@@ -1,4 +1,7 @@
+use super::trim_cstyle_null;
+use chrono::{DateTime, FixedOffset, Local};
 use nu_engine::command_prelude::*;
+use sysinfo::System;
 
 #[derive(Clone)]
 pub struct SysHost;
@@ -26,8 +29,7 @@ impl Command for SysHost {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let host = super::host(call.head);
-        Ok(Value::record(host, call.head).into_pipeline_data())
+        Ok(host(call.head).into_pipeline_data())
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -38,3 +40,53 @@ impl Command for SysHost {
         }]
     }
 }
+
+fn host(span: Span) -> Value {
+    let mut record = Record::new();
+
+    if let Some(name) = System::name() {
+        record.push("name", Value::string(trim_cstyle_null(name), span));
+    }
+    if let Some(version) = System::os_version() {
+        record.push("os_version", Value::string(trim_cstyle_null(version), span));
+    }
+    if let Some(long_version) = System::long_os_version() {
+        record.push(
+            "long_os_version",
+            Value::string(trim_cstyle_null(long_version), span),
+        );
+    }
+    if let Some(version) = System::kernel_version() {
+        record.push(
+            "kernel_version",
+            Value::string(trim_cstyle_null(version), span),
+        );
+    }
+    if let Some(hostname) = System::host_name() {
+        record.push("hostname", Value::string(trim_cstyle_null(hostname), span));
+    }
+
+    let uptime = System::uptime()
+        .saturating_mul(1_000_000_000)
+        .try_into()
+        .unwrap_or(i64::MAX);
+
+    record.push("uptime", Value::duration(uptime, span));
+
+    let boot_time = boot_time()
+        .map(|time| Value::date(time, span))
+        .unwrap_or(Value::nothing(span));
+
+    record.push("boot_time", boot_time);
+
+    Value::record(record, span)
+}
+
+fn boot_time() -> Option<DateTime<FixedOffset>> {
+    // Broken systems can apparently return really high values.
+    // See: https://github.com/nushell/nushell/issues/10155
+    // First, try to convert u64 to i64, and then try to create a `DateTime`.
+    let secs = System::boot_time().try_into().ok()?;
+    let time = DateTime::from_timestamp(secs, 0)?;
+    Some(time.with_timezone(&Local).fixed_offset())
+}
diff --git a/crates/nu-command/src/system/sys/mem.rs b/crates/nu-command/src/system/sys/mem.rs
index e5dc36e1b7..89527807d7 100644
--- a/crates/nu-command/src/system/sys/mem.rs
+++ b/crates/nu-command/src/system/sys/mem.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use sysinfo::System;
 
 #[derive(Clone)]
 pub struct SysMem;
@@ -26,7 +27,7 @@ impl Command for SysMem {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(super::mem(call.head).into_pipeline_data())
+        Ok(mem(call.head).into_pipeline_data())
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -37,3 +38,20 @@ impl Command for SysMem {
         }]
     }
 }
+
+fn mem(span: Span) -> Value {
+    let mut sys = System::new();
+    sys.refresh_memory();
+
+    let record = record! {
+        "total" => Value::filesize(sys.total_memory() as i64, span),
+        "free" => Value::filesize(sys.free_memory() as i64, span),
+        "used" => Value::filesize(sys.used_memory() as i64, span),
+        "available" => Value::filesize(sys.available_memory() as i64, span),
+        "swap total" => Value::filesize(sys.total_swap() as i64, span),
+        "swap free" => Value::filesize(sys.free_swap() as i64, span),
+        "swap used" => Value::filesize(sys.used_swap() as i64, span),
+    };
+
+    Value::record(record, span)
+}
diff --git a/crates/nu-command/src/system/sys/mod.rs b/crates/nu-command/src/system/sys/mod.rs
index fcb40fd37d..02d271537e 100644
--- a/crates/nu-command/src/system/sys/mod.rs
+++ b/crates/nu-command/src/system/sys/mod.rs
@@ -16,202 +16,6 @@ pub use sys_::Sys;
 pub use temp::SysTemp;
 pub use users::SysUsers;
 
-use chrono::{DateTime, FixedOffset, Local};
-use nu_protocol::{record, Record, Span, Value};
-use sysinfo::{
-    Components, CpuRefreshKind, Disks, Networks, System, Users, MINIMUM_CPU_UPDATE_INTERVAL,
-};
-
-pub fn trim_cstyle_null(s: impl AsRef<str>) -> String {
+fn trim_cstyle_null(s: impl AsRef<str>) -> String {
     s.as_ref().trim_matches('\0').into()
 }
-
-pub fn disks(span: Span) -> Value {
-    let disks = Disks::new_with_refreshed_list()
-        .iter()
-        .map(|disk| {
-            let device = trim_cstyle_null(disk.name().to_string_lossy());
-            let typ = trim_cstyle_null(disk.file_system().to_string_lossy());
-
-            let record = record! {
-                "device" => Value::string(device, span),
-                "type" => Value::string(typ, span),
-                "mount" => Value::string(disk.mount_point().to_string_lossy(), span),
-                "total" => Value::filesize(disk.total_space() as i64, span),
-                "free" => Value::filesize(disk.available_space() as i64, span),
-                "removable" => Value::bool(disk.is_removable(), span),
-                "kind" => Value::string(disk.kind().to_string(), span),
-            };
-
-            Value::record(record, span)
-        })
-        .collect();
-
-    Value::list(disks, span)
-}
-
-pub fn net(span: Span) -> Value {
-    let networks = Networks::new_with_refreshed_list()
-        .iter()
-        .map(|(iface, data)| {
-            let record = record! {
-                "name" => Value::string(trim_cstyle_null(iface), span),
-                "sent" => Value::filesize(data.total_transmitted() as i64, span),
-                "recv" => Value::filesize(data.total_received() as i64, span),
-            };
-
-            Value::record(record, span)
-        })
-        .collect();
-
-    Value::list(networks, span)
-}
-
-pub fn cpu(span: Span) -> Value {
-    let mut sys = System::new();
-    sys.refresh_cpu_specifics(CpuRefreshKind::everything());
-    // We must refresh the CPU twice a while apart to get valid usage data.
-    // In theory we could just sleep MINIMUM_CPU_UPDATE_INTERVAL, but I've noticed that
-    // that gives poor results (error of ~5%). Decided to wait 2x that long, somewhat arbitrarily
-    std::thread::sleep(MINIMUM_CPU_UPDATE_INTERVAL * 2);
-    sys.refresh_cpu_specifics(CpuRefreshKind::new().with_cpu_usage());
-
-    let cpus = sys
-        .cpus()
-        .iter()
-        .map(|cpu| {
-            // sysinfo CPU usage numbers are not very precise unless you wait a long time between refreshes.
-            // Round to 1DP (chosen somewhat arbitrarily) so people aren't misled by high-precision floats.
-            let rounded_usage = (cpu.cpu_usage() * 10.0).round() / 10.0;
-
-            let load_avg = System::load_average();
-            let load_avg = format!(
-                "{:.2}, {:.2}, {:.2}",
-                load_avg.one, load_avg.five, load_avg.fifteen
-            );
-
-            let record = record! {
-                "name" => Value::string(trim_cstyle_null(cpu.name()), span),
-                "brand" => Value::string(trim_cstyle_null(cpu.brand()), span),
-                "freq" => Value::int(cpu.frequency() as i64, span),
-                "cpu_usage" => Value::float(rounded_usage.into(), span),
-                "load_average" => Value::string(load_avg, span),
-                "vendor_id" => Value::string(trim_cstyle_null(cpu.vendor_id()), span),
-            };
-
-            Value::record(record, span)
-        })
-        .collect();
-
-    Value::list(cpus, span)
-}
-
-pub fn mem(span: Span) -> Value {
-    let mut sys = System::new();
-    sys.refresh_memory();
-
-    let record = record! {
-        "total" => Value::filesize(sys.total_memory() as i64, span),
-        "free" => Value::filesize(sys.free_memory() as i64, span),
-        "used" => Value::filesize(sys.used_memory() as i64, span),
-        "available" => Value::filesize(sys.available_memory() as i64, span),
-        "swap total" => Value::filesize(sys.total_swap() as i64, span),
-        "swap free" => Value::filesize(sys.free_swap() as i64, span),
-        "swap used" => Value::filesize(sys.used_swap() as i64, span),
-    };
-
-    Value::record(record, span)
-}
-
-pub fn users(span: Span) -> Value {
-    let users = Users::new_with_refreshed_list()
-        .iter()
-        .map(|user| {
-            let groups = user
-                .groups()
-                .iter()
-                .map(|group| Value::string(trim_cstyle_null(group.name()), span))
-                .collect();
-
-            let record = record! {
-                "name" => Value::string(trim_cstyle_null(user.name()), span),
-                "groups" => Value::list(groups, span),
-            };
-
-            Value::record(record, span)
-        })
-        .collect();
-
-    Value::list(users, span)
-}
-
-pub fn host(span: Span) -> Record {
-    let mut record = Record::new();
-
-    if let Some(name) = System::name() {
-        record.push("name", Value::string(trim_cstyle_null(name), span));
-    }
-    if let Some(version) = System::os_version() {
-        record.push("os_version", Value::string(trim_cstyle_null(version), span));
-    }
-    if let Some(long_version) = System::long_os_version() {
-        record.push(
-            "long_os_version",
-            Value::string(trim_cstyle_null(long_version), span),
-        );
-    }
-    if let Some(version) = System::kernel_version() {
-        record.push(
-            "kernel_version",
-            Value::string(trim_cstyle_null(version), span),
-        );
-    }
-    if let Some(hostname) = System::host_name() {
-        record.push("hostname", Value::string(trim_cstyle_null(hostname), span));
-    }
-
-    let uptime = System::uptime()
-        .saturating_mul(1_000_000_000)
-        .try_into()
-        .unwrap_or(i64::MAX);
-
-    record.push("uptime", Value::duration(uptime, span));
-
-    let boot_time = boot_time()
-        .map(|time| Value::date(time, span))
-        .unwrap_or(Value::nothing(span));
-
-    record.push("boot_time", boot_time);
-
-    record
-}
-
-fn boot_time() -> Option<DateTime<FixedOffset>> {
-    // Broken systems can apparently return really high values.
-    // See: https://github.com/nushell/nushell/issues/10155
-    // First, try to convert u64 to i64, and then try to create a `DateTime`.
-    let secs = System::boot_time().try_into().ok()?;
-    let time = DateTime::from_timestamp(secs, 0)?;
-    Some(time.with_timezone(&Local).fixed_offset())
-}
-
-pub fn temp(span: Span) -> Value {
-    let components = Components::new_with_refreshed_list()
-        .iter()
-        .map(|component| {
-            let mut record = record! {
-                "unit" => Value::string(component.label(), span),
-                "temp" => Value::float(component.temperature().into(), span),
-                "high" => Value::float(component.max().into(), span),
-            };
-
-            if let Some(critical) = component.critical() {
-                record.push("critical", Value::float(critical.into(), span));
-            }
-
-            Value::record(record, span)
-        })
-        .collect();
-
-    Value::list(components, span)
-}
diff --git a/crates/nu-command/src/system/sys/net.rs b/crates/nu-command/src/system/sys/net.rs
index 98dca1bc2f..ef1c595800 100644
--- a/crates/nu-command/src/system/sys/net.rs
+++ b/crates/nu-command/src/system/sys/net.rs
@@ -1,4 +1,6 @@
+use super::trim_cstyle_null;
 use nu_engine::command_prelude::*;
+use sysinfo::Networks;
 
 #[derive(Clone)]
 pub struct SysNet;
@@ -26,7 +28,7 @@ impl Command for SysNet {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(super::net(call.head).into_pipeline_data())
+        Ok(net(call.head).into_pipeline_data())
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -37,3 +39,20 @@ impl Command for SysNet {
         }]
     }
 }
+
+fn net(span: Span) -> Value {
+    let networks = Networks::new_with_refreshed_list()
+        .iter()
+        .map(|(iface, data)| {
+            let record = record! {
+                "name" => Value::string(trim_cstyle_null(iface), span),
+                "sent" => Value::filesize(data.total_transmitted() as i64, span),
+                "recv" => Value::filesize(data.total_received() as i64, span),
+            };
+
+            Value::record(record, span)
+        })
+        .collect();
+
+    Value::list(networks, span)
+}
diff --git a/crates/nu-command/src/system/sys/sys_.rs b/crates/nu-command/src/system/sys/sys_.rs
index 2886836be9..5369064f50 100644
--- a/crates/nu-command/src/system/sys/sys_.rs
+++ b/crates/nu-command/src/system/sys/sys_.rs
@@ -1,4 +1,4 @@
-use nu_engine::command_prelude::*;
+use nu_engine::{command_prelude::*, get_full_help};
 
 #[derive(Clone)]
 pub struct Sys;
@@ -20,41 +20,17 @@ impl Command for Sys {
     }
 
     fn extra_usage(&self) -> &str {
-        "Note that this command may take a noticeable amount of time to run. To reduce the time taken, you can use the various `sys` sub commands to get the subset of information you are interested in."
+        "You must use one of the following subcommands. Using this command as-is will only produce this help message."
     }
 
     fn run(
         &self,
         engine_state: &EngineState,
-        _stack: &mut Stack,
+        stack: &mut Stack,
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        nu_protocol::report_error_new(
-            engine_state,
-            &ShellError::GenericError {
-                error: "Deprecated command".into(),
-                msg: "the `sys` command is deprecated, please use the new subcommands (`sys host`, `sys mem`, etc.)."
-                    .into(),
-                span: Some(call.head),
-                help: None,
-                inner: vec![],
-            },
-        );
-
-        let head = call.head;
-
-        let mut host = super::host(head);
-        host.push("sessions", super::users(head));
-        let record = record! {
-            "host" => Value::record(host, head),
-            "cpu" => super::cpu(head),
-            "disks" => super::disks(head),
-            "mem" => super::mem(head),
-            "temp" => super::temp(head),
-            "net" => super::net(head),
-        };
-        Ok(Value::record(record, head).into_pipeline_data())
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/system/sys/temp.rs b/crates/nu-command/src/system/sys/temp.rs
index eaf1ed05db..088471f0fd 100644
--- a/crates/nu-command/src/system/sys/temp.rs
+++ b/crates/nu-command/src/system/sys/temp.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use sysinfo::Components;
 
 #[derive(Clone)]
 pub struct SysTemp;
@@ -30,7 +31,7 @@ impl Command for SysTemp {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(super::temp(call.head).into_pipeline_data())
+        Ok(temp(call.head).into_pipeline_data())
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -41,3 +42,24 @@ impl Command for SysTemp {
         }]
     }
 }
+
+fn temp(span: Span) -> Value {
+    let components = Components::new_with_refreshed_list()
+        .iter()
+        .map(|component| {
+            let mut record = record! {
+                "unit" => Value::string(component.label(), span),
+                "temp" => Value::float(component.temperature().into(), span),
+                "high" => Value::float(component.max().into(), span),
+            };
+
+            if let Some(critical) = component.critical() {
+                record.push("critical", Value::float(critical.into(), span));
+            }
+
+            Value::record(record, span)
+        })
+        .collect();
+
+    Value::list(components, span)
+}
diff --git a/crates/nu-command/src/system/sys/users.rs b/crates/nu-command/src/system/sys/users.rs
index 9aab2b9b7b..7d4a43cae5 100644
--- a/crates/nu-command/src/system/sys/users.rs
+++ b/crates/nu-command/src/system/sys/users.rs
@@ -1,4 +1,6 @@
+use super::trim_cstyle_null;
 use nu_engine::command_prelude::*;
+use sysinfo::Users;
 
 #[derive(Clone)]
 pub struct SysUsers;
@@ -25,7 +27,7 @@ impl Command for SysUsers {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(super::users(call.head).into_pipeline_data())
+        Ok(users(call.head).into_pipeline_data())
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -36,3 +38,25 @@ impl Command for SysUsers {
         }]
     }
 }
+
+fn users(span: Span) -> Value {
+    let users = Users::new_with_refreshed_list()
+        .iter()
+        .map(|user| {
+            let groups = user
+                .groups()
+                .iter()
+                .map(|group| Value::string(trim_cstyle_null(group.name()), span))
+                .collect();
+
+            let record = record! {
+                "name" => Value::string(trim_cstyle_null(user.name()), span),
+                "groups" => Value::list(groups, span),
+            };
+
+            Value::record(record, span)
+        })
+        .collect();
+
+    Value::list(users, span)
+}

From a55a48529d57868b4ccc3ca7e19299289bca9b5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C5=BD=C3=A1dn=C3=ADk?= <kubouch@gmail.com>
Date: Mon, 10 Jun 2024 22:33:22 +0300
Subject: [PATCH 0095/1072] Fix delta not being merged when evaluating menus
 (#13120)

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

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

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

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

After parsing menu code, the changes weren't merged into the engine
state, which didn't produce any errors (somehow?) until the recent span
ID refactors. With this PR, menus get a new cloned engine state with the
parsed changes correctly merged in.

Hopefully fixes https://github.com/nushell/nushell/issues/13118

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-cli/src/reedline_config.rs | 37 +++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/crates/nu-cli/src/reedline_config.rs b/crates/nu-cli/src/reedline_config.rs
index 9c08265dfa..dd5a3199dc 100644
--- a/crates/nu-cli/src/reedline_config.rs
+++ b/crates/nu-cli/src/reedline_config.rs
@@ -75,7 +75,7 @@ const DEFAULT_HELP_MENU: &str = r#"
 // Adds all menus to line editor
 pub(crate) fn add_menus(
     mut line_editor: Reedline,
-    engine_state: Arc<EngineState>,
+    engine_state_ref: Arc<EngineState>,
     stack: &Stack,
     config: &Config,
 ) -> Result<Reedline, ShellError> {
@@ -83,7 +83,7 @@ pub(crate) fn add_menus(
     line_editor = line_editor.clear_menus();
 
     for menu in &config.menus {
-        line_editor = add_menu(line_editor, menu, engine_state.clone(), stack, config)?
+        line_editor = add_menu(line_editor, menu, engine_state_ref.clone(), stack, config)?
     }
 
     // Checking if the default menus have been added from the config file
@@ -93,13 +93,16 @@ pub(crate) fn add_menus(
         ("help_menu", DEFAULT_HELP_MENU),
     ];
 
+    let mut engine_state = (*engine_state_ref).clone();
+    let mut menu_eval_results = vec![];
+
     for (name, definition) in default_menus {
         if !config
             .menus
             .iter()
             .any(|menu| menu.name.to_expanded_string("", config) == name)
         {
-            let (block, _) = {
+            let (block, delta) = {
                 let mut working_set = StateWorkingSet::new(&engine_state);
                 let output = parse(
                     &mut working_set,
@@ -111,15 +114,31 @@ pub(crate) fn add_menus(
                 (output, working_set.render())
             };
 
+            engine_state.merge_delta(delta)?;
+
             let mut temp_stack = Stack::new().capture();
             let input = PipelineData::Empty;
-            let res = eval_block::<WithoutDebug>(&engine_state, &mut temp_stack, &block, input)?;
+            menu_eval_results.push(eval_block::<WithoutDebug>(
+                &engine_state,
+                &mut temp_stack,
+                &block,
+                input,
+            )?);
+        }
+    }
 
-            if let PipelineData::Value(value, None) = res {
-                for menu in create_menus(&value)? {
-                    line_editor =
-                        add_menu(line_editor, &menu, engine_state.clone(), stack, config)?;
-                }
+    let new_engine_state_ref = Arc::new(engine_state);
+
+    for res in menu_eval_results.into_iter() {
+        if let PipelineData::Value(value, None) = res {
+            for menu in create_menus(&value)? {
+                line_editor = add_menu(
+                    line_editor,
+                    &menu,
+                    new_engine_state_ref.clone(),
+                    stack,
+                    config,
+                )?;
             }
         }
     }

From 944d941dec0459a910a6cbf0f6f60688e94554e6 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Mon, 10 Jun 2024 21:40:09 +0000
Subject: [PATCH 0096/1072] `path type` error and not found changes (#13007)

# Description
Instead of an empty string, this PR changes `path type` to return null
if the path does not exist. If some other IO error is encountered, then
that error is bubbled up instead of treating it as a "not found" case.

# User-Facing Changes
- `path type` will now return null instead of an empty string, which is
technically a breaking change. In most cases though, I think this
shouldn't affect the behavior of scripts too much.
- `path type` can now error instead of returning an empty string if some
other IO error besides a "not found" error occurs.

Since this PR introduces breaking changes, it should be merged after the
0.94.1 patch.
---
 crates/nu-command/src/path/type.rs | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/crates/nu-command/src/path/type.rs b/crates/nu-command/src/path/type.rs
index 0897593109..e58e697604 100644
--- a/crates/nu-command/src/path/type.rs
+++ b/crates/nu-command/src/path/type.rs
@@ -1,7 +1,10 @@
 use super::PathSubcommandArguments;
 use nu_engine::command_prelude::*;
 use nu_protocol::engine::StateWorkingSet;
-use std::path::{Path, PathBuf};
+use std::{
+    io,
+    path::{Path, PathBuf},
+};
 
 struct Arguments {
     pwd: PathBuf,
@@ -36,7 +39,7 @@ impl Command for SubCommand {
 
     fn extra_usage(&self) -> &str {
         r#"This checks the file system to confirm the path's object type.
-If nothing is found, an empty string will be returned."#
+If the path does not exist, null will be returned."#
     }
 
     fn is_const(&self) -> bool {
@@ -104,9 +107,11 @@ If nothing is found, an empty string will be returned."#
 
 fn path_type(path: &Path, span: Span, args: &Arguments) -> Value {
     let path = nu_path::expand_path_with(path, &args.pwd, true);
-    let meta = path.symlink_metadata();
-    let ty = meta.as_ref().map(get_file_type).unwrap_or("");
-    Value::string(ty, span)
+    match path.symlink_metadata() {
+        Ok(metadata) => Value::string(get_file_type(&metadata), span),
+        Err(err) if err.kind() == io::ErrorKind::NotFound => Value::nothing(span),
+        Err(err) => Value::error(err.into_spanned(span).into(), span),
+    }
 }
 
 fn get_file_type(md: &std::fs::Metadata) -> &str {

From c09488f51580ac4208e300b27365ff3c4095ba4a Mon Sep 17 00:00:00 2001
From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Mon, 10 Jun 2024 20:12:54 -0400
Subject: [PATCH 0097/1072] Fix multiple issues with `def --wrapped` help
 example (#13123)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

I've noticed this several times but kept forgetting to fix it:

The example given for `help def` for the `--wrapped` flag is:

```nu
Define a custom wrapper for an external command
> def --wrapped my-echo [...rest] { echo $rest }; my-echo spam
  ╭───┬──────╮
  │ 0 │ spam │
  ╰───┴──────╯
```

That's ... odd, since (a) it specifically says *"for an external"*
command, and yet uses (and shows the output from) the builtin `echo`.
Also, (b) I believe `--wrapped` is *only* applicable to external
commands. Finally, (c) the `my-echo spam` doesn't even demonstrate a
wrapped argument.

Unless I'm truly missing something, the example just makes no sense.

This updates the example to really demonstrate `def --wrapped` with the
*external* version of `^echo`. It uses the `-e` command to interpret the
escape-tab character in the string.

```nu
> def --wrapped my-echo [...rest] { ^echo ...$rest }; my-echo -e 'spam\tspam'
spam  spam
```

# User-Facing Changes

Help example only.

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-cmd-lang/src/core_commands/def.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/nu-cmd-lang/src/core_commands/def.rs b/crates/nu-cmd-lang/src/core_commands/def.rs
index e4a169ffcc..913f74803c 100644
--- a/crates/nu-cmd-lang/src/core_commands/def.rs
+++ b/crates/nu-cmd-lang/src/core_commands/def.rs
@@ -67,8 +67,8 @@ impl Command for Def {
             },
             Example {
                 description: "Define a custom wrapper for an external command",
-                example: r#"def --wrapped my-echo [...rest] { echo $rest }; my-echo spam"#,
-                result: Some(Value::test_list(vec![Value::test_string("spam")])),
+                example: r#"def --wrapped my-echo [...rest] { ^echo ...$rest }; my-echo -e 'spam\tspam'"#,
+                result: Some(Value::test_string("spam\tspam")),
             },
         ]
     }

From a8376fad4093ce957ee6cef32d5793d1599811b8 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Tue, 11 Jun 2024 13:44:13 -0500
Subject: [PATCH 0098/1072] update uutils crates (#13130)

# Description

This PR updates the uutils/coreutils crates to the latest released
version.

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock                              | 54 +++++++++----------------
 Cargo.toml                              | 14 +++----
 crates/nu-command/tests/commands/ucp.rs |  2 +-
 3 files changed, 27 insertions(+), 43 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c95f0d1435..e0c8b048ab 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3011,7 +3011,7 @@ dependencies = [
  "uu_mv",
  "uu_uname",
  "uu_whoami",
- "uucore 0.0.25",
+ "uucore",
  "uuid",
  "v_htmlescape",
  "wax",
@@ -6352,93 +6352,77 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uu_cp"
-version = "0.0.25"
+version = "0.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcbe045dc92209114afdfd366bd18f7b95dbf999f3eaa85ad6dca910b0be3d56"
+checksum = "c31fc5c95f7668999e129464a29e9080f69ba01ccf7a0ae43ff2cfdb15baa340"
 dependencies = [
  "clap",
  "filetime",
  "indicatif",
  "libc",
  "quick-error 2.0.1",
- "uucore 0.0.26",
+ "uucore",
  "walkdir",
  "xattr",
 ]
 
 [[package]]
 name = "uu_mkdir"
-version = "0.0.25"
+version = "0.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "040aa4584036b2f65e05387b0ea9ac468afce1db325743ce5f350689fd9ce4ae"
+checksum = "496d95e0e3121e4d424ba62019eb84a6f1102213ca8ca16c0a2f8c652c7236c3"
 dependencies = [
  "clap",
- "uucore 0.0.26",
+ "uucore",
 ]
 
 [[package]]
 name = "uu_mktemp"
-version = "0.0.25"
+version = "0.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f240a99c36d768153874d198c43605a45c86996b576262689a0f18248cc3bc57"
+checksum = "a28a0d9744bdc28ceaf13f70b959bacded91aedfd008402d72fa1e3224158653"
 dependencies = [
  "clap",
  "rand",
  "tempfile",
- "uucore 0.0.26",
+ "uucore",
 ]
 
 [[package]]
 name = "uu_mv"
-version = "0.0.25"
+version = "0.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c99fd7c75e6e85553c92537314be3d9a64b4927051aa1608513feea2f933022"
+checksum = "53680908b01c5ac3cc0ee8a376de3e51a36dde2c5a5227a115a3d0977cc4539b"
 dependencies = [
  "clap",
  "fs_extra",
  "indicatif",
- "uucore 0.0.26",
+ "uucore",
 ]
 
 [[package]]
 name = "uu_uname"
-version = "0.0.25"
+version = "0.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5951832d73199636bde6c0d61cf960932b3c4450142c290375bc10c7abed6db5"
+checksum = "a7f4125fb4f286313bca8f222abaefe39db54d65179ea788c91ebd3162345f4e"
 dependencies = [
  "clap",
  "platform-info",
- "uucore 0.0.26",
+ "uucore",
 ]
 
 [[package]]
 name = "uu_whoami"
-version = "0.0.25"
+version = "0.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b44166eb6335aeac42744ea368cc4c32d3f2287a4ff765a5ce44d927ab8bb4"
+checksum = "7f7b313901a15cfde2d88f434fcd077903d690f73cc36d1cec20f47906960aec"
 dependencies = [
  "clap",
  "libc",
- "uucore 0.0.26",
+ "uucore",
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "uucore"
-version = "0.0.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23994a722acb43dbc56877e271c9723f167ae42c4c089f909b2d7dd106c3a9b4"
-dependencies = [
- "clap",
- "glob",
- "libc",
- "nix",
- "once_cell",
- "os_display",
- "uucore_procs",
- "wild",
-]
-
 [[package]]
 name = "uucore"
 version = "0.0.26"
diff --git a/Cargo.toml b/Cargo.toml
index 7e5f436bbf..f7f911a0ed 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -159,13 +159,13 @@ unicode-segmentation = "1.11"
 unicode-width = "0.1"
 ureq = { version = "2.9", default-features = false }
 url = "2.2"
-uu_cp = "0.0.25"
-uu_mkdir = "0.0.25"
-uu_mktemp = "0.0.25"
-uu_mv = "0.0.25"
-uu_whoami = "0.0.25"
-uu_uname = "0.0.25"
-uucore = "0.0.25"
+uu_cp = "0.0.26"
+uu_mkdir = "0.0.26"
+uu_mktemp = "0.0.26"
+uu_mv = "0.0.26"
+uu_whoami = "0.0.26"
+uu_uname = "0.0.26"
+uucore = "0.0.26"
 uuid = "1.8.0"
 v_htmlescape = "0.15.0"
 wax = "0.6"
diff --git a/crates/nu-command/tests/commands/ucp.rs b/crates/nu-command/tests/commands/ucp.rs
index 453786ad4e..728cf1dcb2 100644
--- a/crates/nu-command/tests/commands/ucp.rs
+++ b/crates/nu-command/tests/commands/ucp.rs
@@ -906,7 +906,7 @@ fn test_cp_debug_default() {
         #[cfg(any(target_os = "linux", target_os = "freebsd"))]
         if !actual
             .out
-            .contains("copy offload: unknown, reflink: unsupported, sparse detection: no")
+            .contains("copy offload: yes, reflink: unsupported, sparse detection: no")
         {
             panic!("{}", format!("Failure: stdout was \n{}", actual.out));
         }

From b0d1b4b1827d3d90867ca22d6095a009a7c7ae52 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Tue, 11 Jun 2024 19:00:00 +0000
Subject: [PATCH 0099/1072] Remove deprecated `--not` flag on `str contains`
 (#13124)

# Description
Removes the `str contains --not` flag that was deprecated in the last
minor release.

# User-Facing Changes
Breaking change since a flag was removed.
---
 .../nu-command/src/strings/str_/contains.rs   | 41 +++----------------
 1 file changed, 5 insertions(+), 36 deletions(-)

diff --git a/crates/nu-command/src/strings/str_/contains.rs b/crates/nu-command/src/strings/str_/contains.rs
index 63b9366b09..ff9cb85fcb 100644
--- a/crates/nu-command/src/strings/str_/contains.rs
+++ b/crates/nu-command/src/strings/str_/contains.rs
@@ -10,7 +10,6 @@ struct Arguments {
     substring: String,
     cell_paths: Option<Vec<CellPath>>,
     case_insensitive: bool,
-    not_contain: bool,
 }
 
 impl CmdArgument for Arguments {
@@ -40,7 +39,6 @@ impl Command for SubCommand {
                 "For a data structure input, check strings at the given cell paths, and replace with result.",
             )
             .switch("ignore-case", "search is case insensitive", Some('i'))
-            .switch("not", "DEPRECATED OPTION: does not contain", Some('n'))
             .category(Category::Strings)
     }
 
@@ -63,27 +61,12 @@ impl Command for SubCommand {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        if call.has_flag(engine_state, stack, "not")? {
-            nu_protocol::report_error_new(
-                engine_state,
-                &ShellError::GenericError {
-                    error: "Deprecated option".into(),
-                    msg: "`str contains --not {string}` is deprecated and will be removed in 0.95."
-                        .into(),
-                    span: Some(call.head),
-                    help: Some("Please use the `not` operator instead.".into()),
-                    inner: vec![],
-                },
-            );
-        }
-
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
         let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
         let args = Arguments {
             substring: call.req::<String>(engine_state, stack, 0)?,
             cell_paths,
             case_insensitive: call.has_flag(engine_state, stack, "ignore-case")?,
-            not_contain: call.has_flag(engine_state, stack, "not")?,
         };
         operate(action, args, input, call.head, engine_state.ctrlc.clone())
     }
@@ -114,7 +97,6 @@ impl Command for SubCommand {
             substring: call.req_const::<String>(working_set, 0)?,
             cell_paths,
             case_insensitive: call.has_flag_const(working_set, "ignore-case")?,
-            not_contain: call.has_flag_const(working_set, "not")?,
         };
         operate(
             action,
@@ -183,7 +165,6 @@ fn action(
     input: &Value,
     Arguments {
         case_insensitive,
-        not_contain,
         substring,
         ..
     }: &Arguments,
@@ -191,23 +172,11 @@ fn action(
 ) -> Value {
     match input {
         Value::String { val, .. } => Value::bool(
-            match case_insensitive {
-                true => {
-                    if *not_contain {
-                        !val.to_folded_case()
-                            .contains(substring.to_folded_case().as_str())
-                    } else {
-                        val.to_folded_case()
-                            .contains(substring.to_folded_case().as_str())
-                    }
-                }
-                false => {
-                    if *not_contain {
-                        !val.contains(substring)
-                    } else {
-                        val.contains(substring)
-                    }
-                }
+            if *case_insensitive {
+                val.to_folded_case()
+                    .contains(substring.to_folded_case().as_str())
+            } else {
+                val.contains(substring)
             },
             head,
         ),

From 0372e8c53c085d4e7d9109fda104cfa68d846e71 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Tue, 11 Jun 2024 14:10:31 -0500
Subject: [PATCH 0100/1072] add `$nu.data-dir` for completions and
 `$nu.cache-dir` for other uses (#13122)

# Description

This PR is an attempt to add a standard location for people to put
completions in. I saw this topic come up again recently and IIRC we
decided to create a standard location. I used the dirs-next crate to
dictate where these locations are. I know some people won't like that
but at least this gets the ball rolling in a direction that has a
standard directory.

This is what the default NU_LIB_DIRS looks like now in the
default_env.nu. It should also be like this when starting nushell with
`nu -n`
```nushell
$env.NU_LIB_DIRS = [
    ($nu.default-config-dir | path join 'scripts') # add <nushell-config-dir>/scripts
    ($nu.data-dir | path join 'completions') # default home for nushell completions
]
```

I also added these default folders to the `$nu` variable so now there is
`$nu.data-path` and `$nu.cache-path`.

## Data Dir Default

![image](https://github.com/nushell/nushell/assets/343840/aeeb7cd6-17b4-43e8-bb6f-986a0c7fce23)

While I was in there, I also decided to add a cache dir

## Cache Dir Default

![image](https://github.com/nushell/nushell/assets/343840/87dead66-4911-4f67-bfb2-acb16f386674)

### This is what the default looks like in Ubuntu.

![image](https://github.com/nushell/nushell/assets/343840/bca8eae8-8c18-47e8-b64f-3efe34f0004f)

### This is what it looks like with XDG_CACHE_HOME and XDG_DATA_HOME
overridden
```nushell
XDG_DATA_HOME=/tmp/data_home XDG_CACHE_HOME=/tmp/cache_home cargo r
```

![image](https://github.com/nushell/nushell/assets/343840/fae86d50-9821-41f1-868e-3814eca3730b)

### This is what the defaults look like in Windows (username scrubbed to
protect the innocent)

![image](https://github.com/nushell/nushell/assets/343840/3ebdb5cd-0150-448c-aff5-c57053e4788a)

How my NU_LIB_DIRS is set in the images above
```nushell
$env.NU_LIB_DIRS = [
    ($nu.default-config-dir | path join 'scripts') # add <nushell-config-dir>/scripts
    '/Users/fdncred/src/nu_scripts'
    ($nu.config-path | path dirname)
    ($nu.data-dir | path join 'completions') # default home for nushell completions
]
```

Let the debate begin.

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.toml                                    |  1 +
 crates/nu-cli/tests/completions/mod.rs        |  4 ++-
 crates/nu-path/src/helpers.rs                 | 26 ++++++++++++---
 crates/nu-path/src/lib.rs                     |  2 +-
 crates/nu-protocol/src/eval_const.rs          | 32 +++++++++++++++++++
 .../nu-utils/src/sample_config/default_env.nu |  1 +
 src/main.rs                                   | 19 ++++++++---
 7 files changed, 75 insertions(+), 10 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index f7f911a0ed..3442e96ff5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -195,6 +195,7 @@ reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
 crossterm = { workspace = true }
 ctrlc = { workspace = true }
+dirs-next = { workspace = true }
 log = { workspace = true }
 miette = { workspace = true, features = ["fancy-no-backtrace", "fancy"] }
 mimalloc = { version = "0.1.42", default-features = false, optional = true }
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index a5b0b13aa8..107de98c80 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -763,11 +763,13 @@ fn variables_completions() {
     // Test completions for $nu
     let suggestions = completer.complete("$nu.", 4);
 
-    assert_eq!(15, suggestions.len());
+    assert_eq!(17, suggestions.len());
 
     let expected: Vec<String> = vec![
+        "cache-dir".into(),
         "config-path".into(),
         "current-exe".into(),
+        "data-dir".into(),
         "default-config-dir".into(),
         "env-path".into(),
         "history-enabled".into(),
diff --git a/crates/nu-path/src/helpers.rs b/crates/nu-path/src/helpers.rs
index aaa53eab71..5b389410e4 100644
--- a/crates/nu-path/src/helpers.rs
+++ b/crates/nu-path/src/helpers.rs
@@ -6,18 +6,36 @@ pub fn home_dir() -> Option<PathBuf> {
     dirs_next::home_dir()
 }
 
+/// Return the data directory for the current platform or XDG_DATA_HOME if specified.
+pub fn data_dir() -> Option<PathBuf> {
+    match std::env::var("XDG_DATA_HOME").map(PathBuf::from) {
+        Ok(xdg_data) if xdg_data.is_absolute() => Some(canonicalize(&xdg_data).unwrap_or(xdg_data)),
+        _ => get_canonicalized_path(dirs_next::data_dir()),
+    }
+}
+
+/// Return the cache directory for the current platform or XDG_CACHE_HOME if specified.
+pub fn cache_dir() -> Option<PathBuf> {
+    match std::env::var("XDG_CACHE_HOME").map(PathBuf::from) {
+        Ok(xdg_cache) if xdg_cache.is_absolute() => {
+            Some(canonicalize(&xdg_cache).unwrap_or(xdg_cache))
+        }
+        _ => get_canonicalized_path(dirs_next::cache_dir()),
+    }
+}
+
+/// Return the config directory for the current platform or XDG_CONFIG_HOME if specified.
 pub fn config_dir() -> Option<PathBuf> {
     match std::env::var("XDG_CONFIG_HOME").map(PathBuf::from) {
         Ok(xdg_config) if xdg_config.is_absolute() => {
             Some(canonicalize(&xdg_config).unwrap_or(xdg_config))
         }
-        _ => config_dir_old(),
+        _ => get_canonicalized_path(dirs_next::config_dir()),
     }
 }
 
-/// Get the old default config directory. Outside of Linux, this will ignore `XDG_CONFIG_HOME`
-pub fn config_dir_old() -> Option<PathBuf> {
-    let path = dirs_next::config_dir()?;
+pub fn get_canonicalized_path(path: Option<PathBuf>) -> Option<PathBuf> {
+    let path = path?;
     Some(canonicalize(&path).unwrap_or(path))
 }
 
diff --git a/crates/nu-path/src/lib.rs b/crates/nu-path/src/lib.rs
index 6c064d4b57..13640acd2f 100644
--- a/crates/nu-path/src/lib.rs
+++ b/crates/nu-path/src/lib.rs
@@ -8,6 +8,6 @@ mod trailing_slash;
 
 pub use components::components;
 pub use expansions::{canonicalize_with, expand_path_with, expand_to_real_path, locate_in_dirs};
-pub use helpers::{config_dir, config_dir_old, home_dir};
+pub use helpers::{cache_dir, config_dir, data_dir, get_canonicalized_path, home_dir};
 pub use tilde::expand_tilde;
 pub use trailing_slash::{has_trailing_slash, strip_trailing_slash};
diff --git a/crates/nu-protocol/src/eval_const.rs b/crates/nu-protocol/src/eval_const.rs
index 08ff6fa391..9f81a6f38b 100644
--- a/crates/nu-protocol/src/eval_const.rs
+++ b/crates/nu-protocol/src/eval_const.rs
@@ -149,6 +149,38 @@ pub(crate) fn create_nu_constant(engine_state: &EngineState, span: Span) -> Valu
         },
     );
 
+    record.push(
+        "data-dir",
+        if let Some(path) = nu_path::data_dir() {
+            let mut canon_data_path = canonicalize_path(engine_state, &path);
+            canon_data_path.push("nushell");
+            Value::string(canon_data_path.to_string_lossy(), span)
+        } else {
+            Value::error(
+                ShellError::IOError {
+                    msg: "Could not get data path".into(),
+                },
+                span,
+            )
+        },
+    );
+
+    record.push(
+        "cache-dir",
+        if let Some(path) = nu_path::cache_dir() {
+            let mut canon_cache_path = canonicalize_path(engine_state, &path);
+            canon_cache_path.push("nushell");
+            Value::string(canon_cache_path.to_string_lossy(), span)
+        } else {
+            Value::error(
+                ShellError::IOError {
+                    msg: "Could not get cache path".into(),
+                },
+                span,
+            )
+        },
+    );
+
     record.push("temp-path", {
         let canon_temp_path = canonicalize_path(engine_state, &std::env::temp_dir());
         Value::string(canon_temp_path.to_string_lossy(), span)
diff --git a/crates/nu-utils/src/sample_config/default_env.nu b/crates/nu-utils/src/sample_config/default_env.nu
index 57e255ed20..effe76c98a 100644
--- a/crates/nu-utils/src/sample_config/default_env.nu
+++ b/crates/nu-utils/src/sample_config/default_env.nu
@@ -77,6 +77,7 @@ $env.ENV_CONVERSIONS = {
 # The default for this is $nu.default-config-dir/scripts
 $env.NU_LIB_DIRS = [
     ($nu.default-config-dir | path join 'scripts') # add <nushell-config-dir>/scripts
+    ($nu.data-dir | path join 'completions') # default home for nushell completions
 ]
 
 # Directories to search for plugin binaries when calling register
diff --git a/src/main.rs b/src/main.rs
index f9fdff3ccf..41d5534bb0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -104,7 +104,9 @@ fn main() -> Result<()> {
                         default: nushell_config_path.display().to_string(),
                     },
                 );
-            } else if let Some(old_config) = nu_path::config_dir_old().map(|p| p.join("nushell")) {
+            } else if let Some(old_config) =
+                nu_path::get_canonicalized_path(dirs_next::config_dir()).map(|p| p.join("nushell"))
+            {
                 let xdg_config_empty = nushell_config_path
                     .read_dir()
                     .map_or(true, |mut dir| dir.next().is_none());
@@ -125,13 +127,22 @@ fn main() -> Result<()> {
         }
     }
 
+    let default_nushell_completions_path = if let Some(mut path) = nu_path::data_dir() {
+        path.push("nushell");
+        path.push("completions");
+        path
+    } else {
+        std::path::PathBuf::new()
+    };
+
     let mut default_nu_lib_dirs_path = nushell_config_path.clone();
     default_nu_lib_dirs_path.push("scripts");
     engine_state.add_env_var(
         "NU_LIB_DIRS".to_string(),
-        Value::test_list(vec![Value::test_string(
-            default_nu_lib_dirs_path.to_string_lossy(),
-        )]),
+        Value::test_list(vec![
+            Value::test_string(default_nu_lib_dirs_path.to_string_lossy()),
+            Value::test_string(default_nushell_completions_path.to_string_lossy()),
+        ]),
     );
 
     let mut default_nu_plugin_dirs_path = nushell_config_path;

From 1e430d155ee67f9ffb0944e00b78b3be572e2f6d Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Tue, 11 Jun 2024 14:36:13 -0500
Subject: [PATCH 0101/1072] make packaging status 3 columns

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0bfb7fc0c3..0f1114c992 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ To use `Nu` in GitHub Action, check [setup-nu](https://github.com/marketplace/ac
 
 Detailed installation instructions can be found in the [installation chapter of the book](https://www.nushell.sh/book/installation.html). Nu is available via many package managers:
 
-[![Packaging status](https://repology.org/badge/vertical-allrepos/nushell.svg)](https://repology.org/project/nushell/versions)
+[![Packaging status](https://repology.org/badge/vertical-allrepos/nushell.svg?columns=3)](https://repology.org/project/nushell/versions)
 
 For details about which platforms the Nushell team actively supports, see [our platform support policy](devdocs/PLATFORM_SUPPORT.md).
 

From 17daf783b266ab121dc9c2bb4ee8c4cab95e49c4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Jun 2024 00:04:35 +0000
Subject: [PATCH 0102/1072] Bump crate-ci/typos from 1.22.1 to 1.22.4

Bumps [crate-ci/typos](https://github.com/crate-ci/typos) from 1.22.1 to 1.22.4.
- [Release notes](https://github.com/crate-ci/typos/releases)
- [Changelog](https://github.com/crate-ci/typos/blob/master/CHANGELOG.md)
- [Commits](https://github.com/crate-ci/typos/compare/v1.22.1...v1.22.4)

---
updated-dependencies:
- dependency-name: crate-ci/typos
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/typos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index 1142b2dbaf..f81f5c89a5 100644
--- a/.github/workflows/typos.yml
+++ b/.github/workflows/typos.yml
@@ -10,4 +10,4 @@ jobs:
         uses: actions/checkout@v4.1.6
 
       - name: Check spelling
-        uses: crate-ci/typos@v1.22.1
+        uses: crate-ci/typos@v1.22.4

From 63c863c81b5eb1f5318c6784bbd5528158cf7675 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Jun 2024 09:37:22 +0800
Subject: [PATCH 0103/1072] Bump actions-rust-lang/setup-rust-toolchain from
 1.8.0 to 1.9.0 (#13132)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps
[actions-rust-lang/setup-rust-toolchain](https://github.com/actions-rust-lang/setup-rust-toolchain)
from 1.8.0 to 1.9.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/releases">actions-rust-lang/setup-rust-toolchain's
releases</a>.</em></p>
<blockquote>
<h2>v1.9.0</h2>
<ul>
<li>Add extra argument <code>cache-on-failure</code> and forward it to
<code>Swatinem/rust-cache</code>. (<a
href="https://redirect.github.com/actions-rust-lang/setup-rust-toolchain/issues/39">#39</a>
by <a
href="https://github.com/samuelhnrq"><code>@​samuelhnrq</code></a>)<br
/>
Set the default the value to true.
This will result in more caching than previously.
This helps when large dependencies are compiled only for testing to
fail.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/blob/main/CHANGELOG.md">actions-rust-lang/setup-rust-toolchain's
changelog</a>.</em></p>
<blockquote>
<h2>[1.9.0] - 2024-06-08</h2>
<ul>
<li>Add extra argument <code>cache-on-failure</code> and forward it to
<code>Swatinem/rust-cache</code>. (<a
href="https://redirect.github.com/actions-rust-lang/setup-rust-toolchain/issues/39">#39</a>
by <a
href="https://github.com/samuelhnrq"><code>@​samuelhnrq</code></a>)<br
/>
Set the default the value to true.
This will result in more caching than previously.
This helps when large dependencies are compiled only for testing to
fail.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/commit/1fbea72663f6d4c03efaab13560c8a24cfd2a7cc"><code>1fbea72</code></a>
Merge pull request <a
href="https://redirect.github.com/actions-rust-lang/setup-rust-toolchain/issues/40">#40</a>
from actions-rust-lang/prepare-release</li>
<li><a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/commit/46dca5d12051bf38a65278fe635ccfc2d03c66b3"><code>46dca5d</code></a>
Add changelog entry</li>
<li><a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/commit/1734e14b0b36c9e543b432eae0fd17976456a737"><code>1734e14</code></a>
Switch default of <code>cache-on-failure</code> to true</li>
<li><a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/commit/74e1b40e68fca6ea591278060fbce481de5ab838"><code>74e1b40</code></a>
Merge pull request <a
href="https://redirect.github.com/actions-rust-lang/setup-rust-toolchain/issues/39">#39</a>
from samuelhnrq/main</li>
<li><a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/commit/d60b90debe0d884519d77df9573f555908335cbe"><code>d60b90d</code></a>
feat: adds cache-on-failure propagation</li>
<li>See full diff in <a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/compare/v1.8.0...v1.9.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions-rust-lang/setup-rust-toolchain&package-manager=github_actions&previous-version=1.8.0&new-version=1.9.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/ci.yml            | 8 ++++----
 .github/workflows/nightly-build.yml | 2 +-
 .github/workflows/release.yml       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9cb92b0902..cb94e5fe8b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/checkout@v4.1.6
 
       - name: Setup Rust toolchain and cache
-        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
 
       - name: cargo fmt
         run: cargo fmt --all -- --check
@@ -69,7 +69,7 @@ jobs:
       - uses: actions/checkout@v4.1.6
 
       - name: Setup Rust toolchain and cache
-        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
 
       - name: Tests
         run: cargo test --workspace --profile ci --exclude nu_plugin_* ${{ matrix.default-flags }}
@@ -98,7 +98,7 @@ jobs:
       - uses: actions/checkout@v4.1.6
 
       - name: Setup Rust toolchain and cache
-        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
 
       - name: Install Nushell
         run: cargo install --path . --locked --no-default-features
@@ -149,7 +149,7 @@ jobs:
       - uses: actions/checkout@v4.1.6
 
       - name: Setup Rust toolchain and cache
-        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
 
       - name: Clippy
         run: cargo clippy --package nu_plugin_* -- $CLIPPY_OPTIONS
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 251cffd3a1..4f6dccbcf9 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -122,7 +122,7 @@ jobs:
         echo "targets = ['${{matrix.target}}']" >> rust-toolchain.toml
 
     - name: Setup Rust toolchain and cache
-      uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+      uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
       # WARN: Keep the rustflags to prevent from the winget submission error: `CAQuietExec: Error 0xc0000135`
       with:
         rustflags: ''
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6aca9578d4..a71792e8c8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -69,7 +69,7 @@ jobs:
         echo "targets = ['${{matrix.target}}']" >> rust-toolchain.toml
 
     - name: Setup Rust toolchain
-      uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+      uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
       # WARN: Keep the rustflags to prevent from the winget submission error: `CAQuietExec: Error 0xc0000135`
       with:
         cache: false

From bdbb09652631bfa924c934b4013ce8230585a16f Mon Sep 17 00:00:00 2001
From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Wed, 12 Jun 2024 15:26:58 -0400
Subject: [PATCH 0104/1072] Fixed help for `banner` (#13138)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

`help banner` had several issues:

* It used a Markdown link to an Asciinema recording, but Markdown links
aren't rendered as Markdown links by the help system (and can't be,
since (most?) terminals don't support that)
* Minor grammatical issues
* The Asciinema recording is out of date anyway. It still uses `use
stdn.nu banner` which isn't valid syntax any longer.

Since everyone at this point knows exactly what `banner` does 😉, I chose
to simply remove the link to the recording. Also tweaked the text
(initial caps and removed comma).

# User-Facing Changes

Help only

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
---
 crates/nu-std/std/mod.nu | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/crates/nu-std/std/mod.nu b/crates/nu-std/std/mod.nu
index a20bdb4b78..15bad0e8e5 100644
--- a/crates/nu-std/std/mod.nu
+++ b/crates/nu-std/std/mod.nu
@@ -161,10 +161,7 @@ export def bench [
     }
 }
 
-# print a banner for nushell, with information about the project
-#
-# Example:
-# an example can be found in [this asciinema recording](https://asciinema.org/a/566513)
+# Print a banner for nushell with information about the project
 export def banner [] {
 let dt = (datetime-diff (date now) 2019-05-10T09:59:12-07:00)
 $"(ansi green)     __  ,(ansi reset)

From 634361b2d12e5cc3fecfcfec1f71532914c72d77 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Thu, 13 Jun 2024 01:04:12 +0000
Subject: [PATCH 0105/1072] Make `which-support` feature non-optional (#13125)

# Description
Removes the `which-support` cargo feature and makes all of its
feature-gated code enabled by default in all builds. I'm not sure why
this one command is gated behind a feature. It seems to be a relic of
older code where we had features for what seems like every command.
---
 Cargo.toml                                    |  2 --
 crates/nu-cmd-extra/Cargo.toml                |  4 ----
 crates/nu-cmd-lang/Cargo.toml                 |  1 -
 .../nu-cmd-lang/src/core_commands/version.rs  |  5 -----
 crates/nu-command/Cargo.toml                  |  1 -
 crates/nu-command/src/default_context.rs      |  5 +----
 crates/nu-command/src/system/which_.rs        | 22 -------------------
 crates/nu-command/tests/commands/mod.rs       |  1 -
 tests/shell/environment/nu_env.rs             |  5 -----
 tests/shell/mod.rs                            |  2 --
 tests/shell/pipeline/commands/external.rs     |  3 ---
 tests/shell/pipeline/commands/internal.rs     |  1 -
 12 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 3442e96ff5..d59d7cdbff 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -245,7 +245,6 @@ default = ["default-no-clipboard", "system-clipboard"]
 # See https://github.com/nushell/nushell/pull/11535
 default-no-clipboard = [
   "plugin",
-  "which-support",
   "trash-support",
   "sqlite",
   "mimalloc",
@@ -265,7 +264,6 @@ system-clipboard = [
 ]
 
 # Stable (Default)
-which-support = ["nu-command/which-support", "nu-cmd-lang/which-support"]
 trash-support = ["nu-command/trash-support", "nu-cmd-lang/trash-support"]
 
 # SQLite commands for nushell
diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml
index 39a705f47c..038c9421e8 100644
--- a/crates/nu-cmd-extra/Cargo.toml
+++ b/crates/nu-cmd-extra/Cargo.toml
@@ -32,10 +32,6 @@ serde_urlencoded = { workspace = true }
 v_htmlescape = { workspace = true }
 itertools = { workspace = true }
 
-[features]
-extra = ["default"]
-default = []
-
 [dev-dependencies]
 nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.3" }
 nu-command = { path = "../nu-command", version = "0.94.3" }
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index 22e1cad374..dcd940ba58 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -25,7 +25,6 @@ shadow-rs = { version = "0.28", default-features = false }
 
 [features]
 mimalloc = []
-which-support = []
 trash-support = []
 sqlite = []
 static-link-openssl = []
diff --git a/crates/nu-cmd-lang/src/core_commands/version.rs b/crates/nu-cmd-lang/src/core_commands/version.rs
index 22ef1f2a08..77283105a9 100644
--- a/crates/nu-cmd-lang/src/core_commands/version.rs
+++ b/crates/nu-cmd-lang/src/core_commands/version.rs
@@ -160,11 +160,6 @@ fn features_enabled() -> Vec<String> {
 
     // NOTE: There should be another way to know features on.
 
-    #[cfg(feature = "which-support")]
-    {
-        names.push("which".to_string());
-    }
-
     #[cfg(feature = "trash-support")]
     {
         names.push("trash".to_string());
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 4d69ce089a..f16d62d836 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -134,7 +134,6 @@ workspace = true
 plugin = ["nu-parser/plugin"]
 sqlite = ["rusqlite"]
 trash-support = ["trash"]
-which-support = []
 
 [dev-dependencies]
 nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.3" }
diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index a23f9c4ef4..0901d56588 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -127,7 +127,7 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             SysTemp,
             SysUsers,
             UName,
-
+            Which,
         };
 
         // Help
@@ -172,9 +172,6 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
         ))]
         bind_command! { Ps };
 
-        #[cfg(feature = "which-support")]
-        bind_command! { Which };
-
         // Strings
         bind_command! {
             Char,
diff --git a/crates/nu-command/src/system/which_.rs b/crates/nu-command/src/system/which_.rs
index 81b6057864..f0cf4ece39 100644
--- a/crates/nu-command/src/system/which_.rs
+++ b/crates/nu-command/src/system/which_.rs
@@ -92,7 +92,6 @@ fn get_entries_in_nu(
     all_entries
 }
 
-#[cfg(feature = "which-support")]
 fn get_first_entry_in_path(
     item: &str,
     span: Span,
@@ -104,17 +103,6 @@ fn get_first_entry_in_path(
         .ok()
 }
 
-#[cfg(not(feature = "which-support"))]
-fn get_first_entry_in_path(
-    _item: &str,
-    _span: Span,
-    _cwd: impl AsRef<Path>,
-    _paths: impl AsRef<OsStr>,
-) -> Option<Value> {
-    None
-}
-
-#[cfg(feature = "which-support")]
 fn get_all_entries_in_path(
     item: &str,
     span: Span,
@@ -129,16 +117,6 @@ fn get_all_entries_in_path(
         .unwrap_or_default()
 }
 
-#[cfg(not(feature = "which-support"))]
-fn get_all_entries_in_path(
-    _item: &str,
-    _span: Span,
-    _cwd: impl AsRef<Path>,
-    _paths: impl AsRef<OsStr>,
-) -> Vec<Value> {
-    vec![]
-}
-
 #[derive(Debug)]
 struct WhichArgs {
     applications: Vec<Spanned<String>>,
diff --git a/crates/nu-command/tests/commands/mod.rs b/crates/nu-command/tests/commands/mod.rs
index 922e804405..a1cb82a4b4 100644
--- a/crates/nu-command/tests/commands/mod.rs
+++ b/crates/nu-command/tests/commands/mod.rs
@@ -125,7 +125,6 @@ mod upsert;
 mod url;
 mod use_;
 mod where_;
-#[cfg(feature = "which-support")]
 mod which;
 mod while_;
 mod with_env;
diff --git a/tests/shell/environment/nu_env.rs b/tests/shell/environment/nu_env.rs
index c19b724ceb..d249d90678 100644
--- a/tests/shell/environment/nu_env.rs
+++ b/tests/shell/environment/nu_env.rs
@@ -36,7 +36,6 @@ fn picks_up_env_keys_when_entering_trusted_directory() {
     })
 }
 
-#[cfg(feature = "which-support")]
 #[test]
 #[serial]
 fn picks_up_and_lets_go_env_keys_when_entering_trusted_directory_with_implied_cd() {
@@ -433,7 +432,6 @@ fn given_a_hierarchy_of_trusted_directories_going_back_restores_overwritten_vari
     })
 }
 
-#[cfg(feature = "which-support")]
 #[test]
 #[serial]
 fn local_config_env_var_present_and_removed_correctly() {
@@ -487,7 +485,6 @@ fn local_config_env_var_present_and_removed_correctly() {
     });
 }
 
-#[cfg(feature = "which-support")]
 #[test]
 #[serial]
 fn local_config_env_var_gets_overwritten() {
@@ -553,7 +550,6 @@ fn local_config_env_var_gets_overwritten() {
     });
 }
 
-#[cfg(feature = "which-support")]
 #[test]
 #[serial]
 fn autoenv_test_entry_scripts() {
@@ -601,7 +597,6 @@ fn autoenv_test_entry_scripts() {
     });
 }
 
-#[cfg(feature = "which-support")]
 #[test]
 #[serial]
 fn autoenv_test_exit_scripts() {
diff --git a/tests/shell/mod.rs b/tests/shell/mod.rs
index ba7465f5e7..62f79a59c1 100644
--- a/tests/shell/mod.rs
+++ b/tests/shell/mod.rs
@@ -3,9 +3,7 @@ use nu_test_support::playground::Playground;
 use nu_test_support::{nu, nu_repl_code, pipeline};
 use pretty_assertions::assert_eq;
 
-#[cfg(feature = "which-support")]
 mod environment;
-
 mod pipeline;
 mod repl;
 
diff --git a/tests/shell/pipeline/commands/external.rs b/tests/shell/pipeline/commands/external.rs
index a73cbc878d..d138b65766 100644
--- a/tests/shell/pipeline/commands/external.rs
+++ b/tests/shell/pipeline/commands/external.rs
@@ -3,7 +3,6 @@ use nu_test_support::nu;
 use nu_test_support::playground::Playground;
 use pretty_assertions::assert_eq;
 
-#[cfg(feature = "which-support")]
 #[test]
 fn shows_error_for_command_not_found() {
     let actual = nu!("ferris_is_not_here.exe");
@@ -11,7 +10,6 @@ fn shows_error_for_command_not_found() {
     assert!(!actual.err.is_empty());
 }
 
-#[cfg(feature = "which-support")]
 #[test]
 fn shows_error_for_command_not_found_in_pipeline() {
     let actual = nu!("ferris_is_not_here.exe | echo done");
@@ -20,7 +18,6 @@ fn shows_error_for_command_not_found_in_pipeline() {
 }
 
 #[ignore] // jt: we can't test this using the -c workaround currently
-#[cfg(feature = "which-support")]
 #[test]
 fn automatically_change_directory() {
     use nu_test_support::playground::Playground;
diff --git a/tests/shell/pipeline/commands/internal.rs b/tests/shell/pipeline/commands/internal.rs
index 98f3fb88c9..84f0bf146f 100644
--- a/tests/shell/pipeline/commands/internal.rs
+++ b/tests/shell/pipeline/commands/internal.rs
@@ -550,7 +550,6 @@ fn dynamic_closure_rest_args() {
     assert_eq!(actual.out, "1, 2, 3");
 }
 
-#[cfg(feature = "which-support")]
 #[test]
 fn argument_subexpression_reports_errors() {
     let actual = nu!("echo (ferris_is_not_here.exe)");

From 323d5457f923c55d1b504ddca5614d283cd421af Mon Sep 17 00:00:00 2001
From: Maxim Zhiburt <zhiburt@gmail.com>
Date: Thu, 13 Jun 2024 04:35:04 +0300
Subject: [PATCH 0106/1072] Improve performance of `explore` - 1 (#13116)

Could be improved further I guess; but not here;

You can test the speed differences using data from #13088

```nu
open data.db | get profiles | explore
```

address: #13062

________

1. Noticed that search does not work anymore (even on `main` branch).
2. Not sure about resolved merged conflicts, seems fine, but maybe
something was lost.

---------

Co-authored-by: Reilly Wood <reilly.wood@icloud.com>
---
 crates/nu-explore/src/commands/nu.rs          |   8 +-
 crates/nu-explore/src/commands/table.rs       |   2 +-
 crates/nu-explore/src/commands/try.rs         |   2 +-
 crates/nu-explore/src/views/record/mod.rs     | 178 ++++++++++--------
 .../src/views/record/table_widget.rs          |  88 ++++-----
 crates/nu-explore/src/views/try.rs            |  20 +-
 crates/nu-table/src/table.rs                  |   9 +-
 7 files changed, 159 insertions(+), 148 deletions(-)

diff --git a/crates/nu-explore/src/commands/nu.rs b/crates/nu-explore/src/commands/nu.rs
index 1310dfbd1f..f8aaf44c24 100644
--- a/crates/nu-explore/src/commands/nu.rs
+++ b/crates/nu-explore/src/commands/nu.rs
@@ -27,7 +27,7 @@ impl NuCmd {
 }
 
 impl ViewCommand for NuCmd {
-    type View = NuView<'static>;
+    type View = NuView;
 
     fn name(&self) -> &'static str {
         Self::NAME
@@ -72,12 +72,12 @@ impl ViewCommand for NuCmd {
     }
 }
 
-pub enum NuView<'a> {
-    Records(RecordView<'a>),
+pub enum NuView {
+    Records(RecordView),
     Preview(Preview),
 }
 
-impl View for NuView<'_> {
+impl View for NuView {
     fn draw(&mut self, f: &mut Frame, area: Rect, cfg: ViewConfig<'_>, layout: &mut Layout) {
         match self {
             NuView::Records(v) => v.draw(f, area, cfg, layout),
diff --git a/crates/nu-explore/src/commands/table.rs b/crates/nu-explore/src/commands/table.rs
index 6bc6268067..e5a3ae5599 100644
--- a/crates/nu-explore/src/commands/table.rs
+++ b/crates/nu-explore/src/commands/table.rs
@@ -30,7 +30,7 @@ impl TableCmd {
 }
 
 impl ViewCommand for TableCmd {
-    type View = RecordView<'static>;
+    type View = RecordView;
 
     fn name(&self) -> &'static str {
         Self::NAME
diff --git a/crates/nu-explore/src/commands/try.rs b/crates/nu-explore/src/commands/try.rs
index a81ce13e21..e70b4237d9 100644
--- a/crates/nu-explore/src/commands/try.rs
+++ b/crates/nu-explore/src/commands/try.rs
@@ -22,7 +22,7 @@ impl TryCmd {
 }
 
 impl ViewCommand for TryCmd {
-    type View = TryView<'static>;
+    type View = TryView;
 
     fn name(&self) -> &'static str {
         Self::NAME
diff --git a/crates/nu-explore/src/views/record/mod.rs b/crates/nu-explore/src/views/record/mod.rs
index 557995c40b..9e67e08120 100644
--- a/crates/nu-explore/src/views/record/mod.rs
+++ b/crates/nu-explore/src/views/record/mod.rs
@@ -23,23 +23,20 @@ use nu_protocol::{
     Config, Record, Span, Value,
 };
 use ratatui::{layout::Rect, widgets::Block};
-use std::{borrow::Cow, collections::HashMap};
+use std::collections::HashMap;
 
 pub use self::table_widget::Orientation;
 
 #[derive(Debug, Clone)]
-pub struct RecordView<'a> {
-    layer_stack: Vec<RecordLayer<'a>>,
+pub struct RecordView {
+    layer_stack: Vec<RecordLayer>,
     mode: UIMode,
     orientation: Orientation,
     cfg: ExploreConfig,
 }
 
-impl<'a> RecordView<'a> {
-    pub fn new(
-        columns: impl Into<Cow<'a, [String]>>,
-        records: impl Into<Cow<'a, [Vec<Value>]>>,
-    ) -> Self {
+impl RecordView {
+    pub fn new(columns: Vec<String>, records: Vec<Vec<Value>>) -> Self {
         Self {
             layer_stack: vec![RecordLayer::new(columns, records)],
             mode: UIMode::View,
@@ -64,13 +61,13 @@ impl<'a> RecordView<'a> {
     }
 
     // todo: rename to get_layer
-    pub fn get_layer_last(&self) -> &RecordLayer<'a> {
+    pub fn get_layer_last(&self) -> &RecordLayer {
         self.layer_stack
             .last()
             .expect("we guarantee that 1 entry is always in a list")
     }
 
-    pub fn get_layer_last_mut(&mut self) -> &mut RecordLayer<'a> {
+    pub fn get_layer_last_mut(&mut self) -> &mut RecordLayer {
         self.layer_stack
             .last_mut()
             .expect("we guarantee that 1 entry is always in a list")
@@ -134,32 +131,39 @@ impl<'a> RecordView<'a> {
             Orientation::Left => (column, row),
         };
 
-        if layer.records.len() > row && layer.records[row].len() > column {
-            layer.records[row][column].clone()
-        } else {
-            Value::nothing(Span::unknown())
+        if row >= layer.count_rows() || column >= layer.count_columns() {
+            // actually must never happen; unless cursor works incorrectly
+            // if being sure about cursor it can be deleted;
+            return Value::nothing(Span::unknown());
         }
+
+        layer.record_values[row][column].clone()
     }
 
-    /// Create a table widget.
-    /// WARNING: this is currently really slow on large data sets.
-    /// It creates a string representation of every cell in the table and looks at every row for lscolorize.
-    fn create_table_widget(&'a self, cfg: ViewConfig<'a>) -> TableWidget<'a> {
-        let layer = self.get_layer_last();
-        let mut data = convert_records_to_string(&layer.records, cfg.nu_config, cfg.style_computer);
-        lscolorize(&layer.columns, &mut data, cfg.lscolors);
-
-        let headers = layer.columns.as_ref();
+    fn create_table_widget<'a>(&'a mut self, cfg: ViewConfig<'a>) -> TableWidget<'a> {
+        let style = self.cfg.table;
         let style_computer = cfg.style_computer;
         let Position { row, column } = self.get_window_origin();
 
+        let layer = self.get_layer_last_mut();
+        if layer.record_text.is_none() {
+            let mut data =
+                convert_records_to_string(&layer.record_values, cfg.nu_config, cfg.style_computer);
+            lscolorize(&layer.column_names, &mut data, cfg.lscolors);
+
+            layer.record_text = Some(data);
+        }
+
+        let headers = &layer.column_names;
+        let data = layer.record_text.as_ref().expect("always ok");
+
         TableWidget::new(
             headers,
             data,
             style_computer,
             row,
             column,
-            self.cfg.table,
+            style,
             layer.orientation,
         )
     }
@@ -197,7 +201,7 @@ impl<'a> RecordView<'a> {
     }
 }
 
-impl View for RecordView<'_> {
+impl View for RecordView {
     fn draw(&mut self, f: &mut Frame, area: Rect, cfg: ViewConfig<'_>, layout: &mut Layout) {
         let mut table_layout = TableWidgetState::default();
         // TODO: creating the table widget is O(N) where N is the number of cells in the grid.
@@ -265,7 +269,7 @@ impl View for RecordView<'_> {
         let style_computer = StyleComputer::new(&dummy_engine_state, &dummy_stack, HashMap::new());
 
         let data = convert_records_to_string(
-            &self.get_layer_last().records,
+            &self.get_layer_last().record_values,
             &nu_protocol::Config::default(),
             &style_computer,
         );
@@ -274,7 +278,7 @@ impl View for RecordView<'_> {
     }
 
     fn show_data(&mut self, pos: usize) -> bool {
-        let data = &self.get_layer_last().records;
+        let data = &self.get_layer_last().record_values;
 
         let mut i = 0;
         for (row, cells) in data.iter().enumerate() {
@@ -332,30 +336,35 @@ enum UIMode {
 }
 
 #[derive(Debug, Clone)]
-pub struct RecordLayer<'a> {
-    columns: Cow<'a, [String]>,
-    records: Cow<'a, [Vec<Value>]>,
+pub struct RecordLayer {
+    column_names: Vec<String>,
+    // These are the raw records in the current layer. The sole reason we keep this around is so we can return the original value
+    // if it's being peeked. Otherwise we could accept an iterator over it.
+    // or if it could be Clonable we could do that anyway;
+    // cause it would keep memory footprint lower while keep everything working
+    // (yee would make return O(n); we would need to traverse iterator once again; but maybe worth it)
+    record_values: Vec<Vec<Value>>,
+    // This is the text representation of the record values (the actual text that will be displayed to users).
+    // It's an Option because we need configuration to set it and we (currently) don't have access to configuration when things are created.
+    record_text: Option<Vec<Vec<NuText>>>,
     orientation: Orientation,
     name: Option<String>,
     was_transposed: bool,
     cursor: WindowCursor2D,
 }
 
-impl<'a> RecordLayer<'a> {
-    fn new(
-        columns: impl Into<Cow<'a, [String]>>,
-        records: impl Into<Cow<'a, [Vec<Value>]>>,
-    ) -> Self {
-        let columns = columns.into();
-        let records = records.into();
-
+impl RecordLayer {
+    fn new(columns: Vec<String>, records: Vec<Vec<Value>>) -> Self {
         // TODO: refactor so this is fallible and returns a Result instead of panicking
         let cursor =
             WindowCursor2D::new(records.len(), columns.len()).expect("Failed to create cursor");
 
+        let column_names = columns.iter().map(|s| strip_string(s)).collect();
+
         Self {
-            columns,
-            records,
+            column_names,
+            record_values: records,
+            record_text: None,
             cursor,
             orientation: Orientation::Top,
             name: None,
@@ -369,21 +378,21 @@ impl<'a> RecordLayer<'a> {
 
     fn count_rows(&self) -> usize {
         match self.orientation {
-            Orientation::Top => self.records.len(),
-            Orientation::Left => self.columns.len(),
+            Orientation::Top => self.record_values.len(),
+            Orientation::Left => self.column_names.len(),
         }
     }
 
     fn count_columns(&self) -> usize {
         match self.orientation {
-            Orientation::Top => self.columns.len(),
-            Orientation::Left => self.records.len(),
+            Orientation::Top => self.column_names.len(),
+            Orientation::Left => self.record_values.len(),
         }
     }
 
     fn get_column_header(&self) -> Option<String> {
         let col = self.cursor.column();
-        self.columns.get(col).map(|header| header.to_string())
+        self.column_names.get(col).map(|header| header.to_string())
     }
 
     fn reset_cursor(&mut self) {
@@ -570,13 +579,13 @@ fn handle_key_event_cursor_mode(
     }
 }
 
-fn create_layer(value: Value) -> Result<RecordLayer<'static>> {
+fn create_layer(value: Value) -> Result<RecordLayer> {
     let (columns, values) = collect_input(value)?;
 
     Ok(RecordLayer::new(columns, values))
 }
 
-fn push_layer(view: &mut RecordView<'_>, mut next_layer: RecordLayer<'static>) {
+fn push_layer(view: &mut RecordView, mut next_layer: RecordLayer) {
     let layer = view.get_layer_last();
     let header = layer.get_column_header();
 
@@ -599,9 +608,9 @@ fn estimate_page_size(area: Rect, show_head: bool) -> u16 {
 }
 
 /// scroll to the end of the data
-fn tail_data(state: &mut RecordView<'_>, page_size: usize) {
+fn tail_data(state: &mut RecordView, page_size: usize) {
     let layer = state.get_layer_last_mut();
-    let count_rows = layer.records.len();
+    let count_rows = layer.count_rows();
     if count_rows > page_size {
         layer
             .cursor
@@ -620,6 +629,7 @@ fn convert_records_to_string(
             row.iter()
                 .map(|value| {
                     let text = value.clone().to_abbreviated_string(cfg);
+                    let text = strip_string(&text);
                     let float_precision = cfg.float_precision as usize;
 
                     make_styled_string(style_computer, text, Some(value), float_precision)
@@ -649,12 +659,16 @@ fn build_last_value(v: &RecordView) -> Value {
 fn build_table_as_list(v: &RecordView) -> Value {
     let layer = v.get_layer_last();
 
-    let cols = &layer.columns;
     let vals = layer
-        .records
+        .record_values
         .iter()
         .map(|vals| {
-            let record = cols.iter().cloned().zip(vals.iter().cloned()).collect();
+            let record = layer
+                .column_names
+                .iter()
+                .cloned()
+                .zip(vals.iter().cloned())
+                .collect();
             Value::record(record, NuSpan::unknown())
         })
         .collect();
@@ -665,16 +679,15 @@ fn build_table_as_list(v: &RecordView) -> Value {
 fn build_table_as_record(v: &RecordView) -> Value {
     let layer = v.get_layer_last();
 
-    let record = if let Some(row) = layer.records.first() {
-        layer
-            .columns
+    let mut record = Record::new();
+    if let Some(row) = layer.record_values.first() {
+        record = layer
+            .column_names
             .iter()
             .cloned()
             .zip(row.iter().cloned())
-            .collect()
-    } else {
-        Record::new()
-    };
+            .collect();
+    }
 
     Value::record(record, NuSpan::unknown())
 }
@@ -708,17 +721,12 @@ fn get_percentage(value: usize, max: usize) -> usize {
     ((value as f32 / max as f32) * 100.0).floor() as usize
 }
 
-fn transpose_table(layer: &mut RecordLayer<'_>) {
-    let count_rows = layer.records.len();
-    let count_columns = layer.columns.len();
+fn transpose_table(layer: &mut RecordLayer) {
+    let count_rows = layer.record_values.len();
+    let count_columns = layer.column_names.len();
 
     if layer.was_transposed {
-        let data = match &mut layer.records {
-            Cow::Owned(data) => data,
-            Cow::Borrowed(_) => unreachable!("must never happen"),
-        };
-
-        let headers = pop_first_column(data);
+        let headers = pop_first_column(&mut layer.record_values);
         let headers = headers
             .into_iter()
             .map(|value| match value {
@@ -727,23 +735,25 @@ fn transpose_table(layer: &mut RecordLayer<'_>) {
             })
             .collect();
 
-        let data = _transpose_table(data, count_rows, count_columns - 1);
+        let data = _transpose_table(&layer.record_values, count_rows, count_columns - 1);
 
-        layer.records = Cow::Owned(data);
-        layer.columns = Cow::Owned(headers);
-    } else {
-        let mut data = _transpose_table(&layer.records, count_rows, count_columns);
+        layer.record_values = data;
+        layer.column_names = headers;
 
-        for (column, column_name) in layer.columns.iter().enumerate() {
-            let value = Value::string(column_name, NuSpan::unknown());
-
-            data[column].insert(0, value);
-        }
-
-        layer.records = Cow::Owned(data);
-        layer.columns = (1..count_rows + 1 + 1).map(|i| i.to_string()).collect();
+        return;
     }
 
+    let mut data = _transpose_table(&layer.record_values, count_rows, count_columns);
+
+    for (column, column_name) in layer.column_names.iter().enumerate() {
+        let value = Value::string(column_name, NuSpan::unknown());
+
+        data[column].insert(0, value);
+    }
+
+    layer.record_values = data;
+    layer.column_names = (1..count_rows + 1 + 1).map(|i| i.to_string()).collect();
+
     layer.was_transposed = !layer.was_transposed;
 }
 
@@ -770,3 +780,9 @@ fn _transpose_table(
 
     data
 }
+
+fn strip_string(text: &str) -> String {
+    String::from_utf8(strip_ansi_escapes::strip(text))
+        .map_err(|_| ())
+        .unwrap_or_else(|_| text.to_owned())
+}
diff --git a/crates/nu-explore/src/views/record/table_widget.rs b/crates/nu-explore/src/views/record/table_widget.rs
index 2410d1bd11..7149a7ce60 100644
--- a/crates/nu-explore/src/views/record/table_widget.rs
+++ b/crates/nu-explore/src/views/record/table_widget.rs
@@ -13,15 +13,12 @@ use ratatui::{
     text::Span,
     widgets::{Block, Borders, Paragraph, StatefulWidget, Widget},
 };
-use std::{
-    borrow::Cow,
-    cmp::{max, Ordering},
-};
+use std::cmp::{max, Ordering};
 
 #[derive(Debug, Clone)]
 pub struct TableWidget<'a> {
-    columns: Cow<'a, [String]>,
-    data: Cow<'a, [Vec<NuText>]>,
+    columns: &'a [String],
+    data: &'a [Vec<NuText>],
     index_row: usize,
     index_column: usize,
     config: TableConfig,
@@ -39,8 +36,8 @@ pub enum Orientation {
 impl<'a> TableWidget<'a> {
     #[allow(clippy::too_many_arguments)]
     pub fn new(
-        columns: impl Into<Cow<'a, [String]>>,
-        data: impl Into<Cow<'a, [Vec<NuText>]>>,
+        columns: &'a [String],
+        data: &'a [Vec<NuText>],
         style_computer: &'a StyleComputer<'a>,
         index_row: usize,
         index_column: usize,
@@ -48,8 +45,8 @@ impl<'a> TableWidget<'a> {
         header_position: Orientation,
     ) -> Self {
         Self {
-            columns: columns.into(),
-            data: data.into(),
+            columns,
+            data,
             style_computer,
             index_row,
             index_column,
@@ -197,22 +194,25 @@ impl<'a> TableWidget<'a> {
             }
 
             if show_head {
-                let mut header = [head_row_text(&head, self.style_computer)];
+                let head_style = head_style(&head, self.style_computer);
                 if head_width > use_space as usize {
-                    truncate_str(&mut header[0].0, use_space as usize)
+                    truncate_str(&mut head, use_space as usize)
                 }
+                let head_iter = [(&head, head_style)].into_iter();
 
                 let mut w = width;
                 w += render_space(buf, w, head_y, 1, padding_l);
-                w += render_column(buf, w, head_y, use_space, &header);
+                w += render_column(buf, w, head_y, use_space, head_iter);
                 w += render_space(buf, w, head_y, 1, padding_r);
 
                 let x = w - padding_r - use_space;
-                state.layout.push(&header[0].0, x, head_y, use_space, 1);
+                state.layout.push(&head, x, head_y, use_space, 1);
             }
 
+            let head_rows = column.iter().map(|(t, s)| (t, *s));
+
             width += render_space(buf, width, data_y, data_height, padding_l);
-            width += render_column(buf, width, data_y, use_space, &column);
+            width += render_column(buf, width, data_y, use_space, head_rows);
             width += render_space(buf, width, data_y, data_height, padding_r);
 
             for (row, (text, _)) in column.iter().enumerate() {
@@ -305,10 +305,9 @@ impl<'a> TableWidget<'a> {
                 return;
             }
 
-            let columns = columns
+            let columns_iter = columns
                 .iter()
-                .map(|s| head_row_text(s, self.style_computer))
-                .collect::<Vec<_>>();
+                .map(|s| (s.clone(), head_style(s, self.style_computer)));
 
             if !show_index {
                 let x = area.x + left_w;
@@ -326,12 +325,12 @@ impl<'a> TableWidget<'a> {
             let x = area.x + left_w;
             left_w += render_space(buf, x, area.y, 1, padding_l);
             let x = area.x + left_w;
-            left_w += render_column(buf, x, area.y, columns_width as u16, &columns);
+            left_w += render_column(buf, x, area.y, columns_width as u16, columns_iter);
             let x = area.x + left_w;
             left_w += render_space(buf, x, area.y, 1, padding_r);
 
             let layout_x = left_w - padding_r - columns_width as u16;
-            for (i, (text, _)) in columns.iter().enumerate() {
+            for (i, text) in columns.iter().enumerate() {
                 state
                     .layout
                     .push(text, layout_x, area.y + i as u16, columns_width as u16, 1);
@@ -377,10 +376,12 @@ impl<'a> TableWidget<'a> {
                 break;
             }
 
+            let head_rows = column.iter().map(|(t, s)| (t, *s));
+
             let x = area.x + left_w;
             left_w += render_space(buf, x, area.y, area.height, padding_l);
             let x = area.x + left_w;
-            left_w += render_column(buf, x, area.y, column_width, &column);
+            left_w += render_column(buf, x, area.y, column_width, head_rows);
             let x = area.x + left_w;
             left_w += render_space(buf, x, area.y, area.height, padding_r);
 
@@ -619,14 +620,14 @@ fn repeat_vertical(
     c: char,
     style: TextStyle,
 ) {
-    let text = std::iter::repeat(c)
-        .take(width as usize)
-        .collect::<String>();
+    let text = String::from(c);
     let style = text_style_to_tui_style(style);
-    let span = Span::styled(text, style);
+    let span = Span::styled(&text, style);
 
     for row in 0..height {
-        buf.set_span(x, y + row, &span, width);
+        for col in 0..width {
+            buf.set_span(x + col, y + row, &span, 1);
+        }
     }
 }
 
@@ -676,35 +677,28 @@ fn calculate_column_width(column: &[NuText]) -> usize {
         .unwrap_or(0)
 }
 
-fn render_column(
+fn render_column<T, S>(
     buf: &mut ratatui::buffer::Buffer,
     x: u16,
     y: u16,
     available_width: u16,
-    rows: &[NuText],
-) -> u16 {
-    for (row, (text, style)) in rows.iter().enumerate() {
-        let style = text_style_to_tui_style(*style);
-        let text = strip_string(text);
-        let span = Span::styled(text, style);
+    rows: impl Iterator<Item = (T, S)>,
+) -> u16
+where
+    T: AsRef<str>,
+    S: Into<TextStyle>,
+{
+    for (row, (text, style)) in rows.enumerate() {
+        let style = text_style_to_tui_style(style.into());
+        let span = Span::styled(text.as_ref(), style);
         buf.set_span(x, y + row as u16, &span, available_width);
     }
 
     available_width
 }
 
-fn strip_string(text: &str) -> String {
-    String::from_utf8(strip_ansi_escapes::strip(text))
-        .map_err(|_| ())
-        .unwrap_or_else(|_| text.to_owned())
-}
-
-fn head_row_text(head: &str, style_computer: &StyleComputer) -> NuText {
-    (
-        String::from(head),
-        TextStyle::with_style(
-            Alignment::Center,
-            style_computer.compute("header", &Value::string(head, nu_protocol::Span::unknown())),
-        ),
-    )
+fn head_style(head: &str, style_computer: &StyleComputer) -> TextStyle {
+    let style =
+        style_computer.compute("header", &Value::string(head, nu_protocol::Span::unknown()));
+    TextStyle::with_style(Alignment::Center, style)
 }
diff --git a/crates/nu-explore/src/views/try.rs b/crates/nu-explore/src/views/try.rs
index 9acbb84208..7ad6d38aef 100644
--- a/crates/nu-explore/src/views/try.rs
+++ b/crates/nu-explore/src/views/try.rs
@@ -16,21 +16,21 @@ use ratatui::{
 };
 use std::cmp::min;
 
-pub struct TryView<'a> {
+pub struct TryView {
     input: Value,
     command: String,
-    reactive: bool,
-    table: Option<RecordView<'a>>,
+    immediate: bool,
+    table: Option<RecordView>,
     view_mode: bool,
     border_color: Style,
 }
 
-impl<'a> TryView<'a> {
+impl TryView {
     pub fn new(input: Value) -> Self {
         Self {
             input,
             table: None,
-            reactive: false,
+            immediate: false,
             border_color: Style::default(),
             view_mode: false,
             command: String::new(),
@@ -48,7 +48,7 @@ impl<'a> TryView<'a> {
     }
 }
 
-impl View for TryView<'_> {
+impl View for TryView {
     fn draw(&mut self, f: &mut Frame, area: Rect, cfg: ViewConfig<'_>, layout: &mut Layout) {
         let border_color = self.border_color;
 
@@ -178,7 +178,7 @@ impl View for TryView<'_> {
                 if !self.command.is_empty() {
                     self.command.pop();
 
-                    if self.reactive {
+                    if self.immediate {
                         match self.try_run(engine_state, stack) {
                             Ok(_) => info.report = Some(Report::default()),
                             Err(err) => info.report = Some(Report::error(format!("Error: {err}"))),
@@ -191,7 +191,7 @@ impl View for TryView<'_> {
             KeyCode::Char(c) => {
                 self.command.push(*c);
 
-                if self.reactive {
+                if self.immediate {
                     match self.try_run(engine_state, stack) {
                         Ok(_) => info.report = Some(Report::default()),
                         Err(err) => info.report = Some(Report::error(format!("Error: {err}"))),
@@ -235,7 +235,7 @@ impl View for TryView<'_> {
 
     fn setup(&mut self, config: ViewConfig<'_>) {
         self.border_color = nu_style_to_tui(config.explore_config.table.separator_style);
-        self.reactive = config.explore_config.try_reactive;
+        self.immediate = config.explore_config.try_reactive;
 
         let mut r = RecordView::new(vec![], vec![]);
         r.setup(config);
@@ -253,7 +253,7 @@ fn run_command(
     input: &Value,
     engine_state: &EngineState,
     stack: &mut Stack,
-) -> Result<RecordView<'static>> {
+) -> Result<RecordView> {
     let pipeline = run_command_with_value(command, input, engine_state, stack)?;
 
     let is_record = matches!(pipeline, PipelineData::Value(Value::Record { .. }, ..));
diff --git a/crates/nu-table/src/table.rs b/crates/nu-table/src/table.rs
index faf47d84cd..bdaf7fb6c3 100644
--- a/crates/nu-table/src/table.rs
+++ b/crates/nu-table/src/table.rs
@@ -259,9 +259,7 @@ fn draw_table(
         table.with(width_ctrl);
     }
 
-    let tablewidth = table.total_width();
-
-    table_to_string(table, tablewidth, termwidth)
+    table_to_string(table, termwidth)
 }
 
 fn set_indent(table: &mut Table, left: usize, right: usize) {
@@ -289,7 +287,9 @@ fn set_border_head(table: &mut Table, with_footer: bool, wctrl: TableWidthCtrl)
     }
 }
 
-fn table_to_string(table: Table, total_width: usize, termwidth: usize) -> Option<String> {
+fn table_to_string(table: Table, termwidth: usize) -> Option<String> {
+    let total_width = table.total_width();
+
     if total_width > termwidth {
         None
     } else {
@@ -318,6 +318,7 @@ impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for
         dim: &mut CompleteDimensionVecRecords<'_>,
     ) {
         let total_width = get_total_width2(&self.width, cfg);
+
         if total_width > self.max {
             TableTrim {
                 max: self.max,

From af6e1cb5a67640fc7b46703c98bdd9aa4c7d43b6 Mon Sep 17 00:00:00 2001
From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Thu, 13 Jun 2024 20:55:17 -0400
Subject: [PATCH 0107/1072] Added search terms to `if` (#13145)

# Description

In this PR, I continue my tradition of trivial but hopefully helpful
`help` tweaks. As mentioned in #13143, I noticed that `help -f else`
oddly didn't return the `if` statement itself. Perhaps not so oddly,
since who the heck is going to go looking for *"else"* in the help?
Well, I did ...

Added *"else"* and *"conditional"* to the search terms for `if`.

I'll work on the meat of #13143 next - That's more substantiative.

# User-Facing Changes

Help only

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
-
# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-cmd-lang/src/core_commands/if_.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crates/nu-cmd-lang/src/core_commands/if_.rs b/crates/nu-cmd-lang/src/core_commands/if_.rs
index 83808c8e06..a2071530ac 100644
--- a/crates/nu-cmd-lang/src/core_commands/if_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/if_.rs
@@ -122,6 +122,10 @@ impl Command for If {
         }
     }
 
+    fn search_terms(&self) -> Vec<&str> {
+        vec!["else", "conditional"]
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {

From b1cf0e258dc103f28b23190e495a2695bb0f9c97 Mon Sep 17 00:00:00 2001
From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Thu, 13 Jun 2024 20:56:11 -0400
Subject: [PATCH 0108/1072] Expand tables in help examples in std (#13146)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

Some command help has example results with nested `table` data which is
displayed as the "non-expanded" form. E.g.:

```nu
╭───┬────────────────╮
│ 0 │ [list 2 items] │
│ 1 │ [list 2 items] │
╰───┴────────────────╯
```

For a good example, see `help zip`.

While we could simply remove the offending Example `result`'s from the
command itself, `std help` is capable of expanding the table properly.
It already formats the output of each example result using `table`, so
simply making it a `table -e` fixes the output.

While I wish we had a way of expanding the tables in the builtin `help`,
that seems to be the same type of problem as in formatting the `cal`
output (see #11954).

I personally think it's better to add this feature to `std help` than to
remove the offending example results, but as long as `std help` is
optional, only a small percentage of users are going to see the
"expected" results.

# User-Facing Changes

Excerpt from `std help zip` before change:

```nu
Zip two lists
> [1 2] | zip [3 4]
╭───┬────────────────╮
│ 0 │ [list 2 items] │
│ 1 │ [list 2 items] │
╰───┴────────────────╯
```

After:

```nu
Zip two lists
> [1 2] | zip [3 4]
╭───┬───────────╮
│ 0 │ ╭───┬───╮ │
│   │ │ 0 │ 1 │ │
│   │ │ 1 │ 3 │ │
│   │ ╰───┴───╯ │
│ 1 │ ╭───┬───╮ │
│   │ │ 0 │ 2 │ │
│   │ │ 1 │ 4 │ │
│   │ ╰───┴───╯ │
╰───┴───────────╯
```

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
-
# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-std/std/help.nu | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-std/std/help.nu b/crates/nu-std/std/help.nu
index df6c4c6ca6..614ec402d1 100644
--- a/crates/nu-std/std/help.nu
+++ b/crates/nu-std/std/help.nu
@@ -658,7 +658,7 @@ def build-command-page [command: record] {
             $"  > ($example.example | nu-highlight)"
             (if not ($example.result | is-empty) {
                 $example.result
-                | table
+                | table -e
                 | to text
                 | if ($example.result | describe) == "binary" { str join } else { lines }
                 | each {|line|

From 3a6d8aac0bce6a70351fcfe860e0aa3694054a99 Mon Sep 17 00:00:00 2001
From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Sat, 15 Jun 2024 13:27:55 -0400
Subject: [PATCH 0109/1072] Return an empty list when no `std help --find`
 results are found (#13160)

# Description

Fixes #13143 by returning an empty list when there are no results found
by `std help --find/-f`

# User-Facing Changes

In addition, prints a message to stderr.

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

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

diff --git a/crates/nu-std/std/help.nu b/crates/nu-std/std/help.nu
index 614ec402d1..16a20504cb 100644
--- a/crates/nu-std/std/help.nu
+++ b/crates/nu-std/std/help.nu
@@ -771,6 +771,11 @@ You can also learn more at (ansi default_italic)(ansi light_cyan_underline)https
 
     let modules = (try { modules $target_item --find $find })
     if not ($modules | is-empty) { return $modules }
+    
+    if ($find | is-not-empty) {
+        print -e $"No help results found mentioning: ($find)"
+        return []
+    }
 
     let span = (metadata $item | get span)
     error make {

From b79a2255d2ab2bb93571df55371290814ca718e5 Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Tue, 18 Jun 2024 01:05:11 +0200
Subject: [PATCH 0110/1072] Add derive macros for `FromValue` and `IntoValue`
 to ease the use of `Value`s in Rust code (#13031)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
After discussing with @sholderbach the cumbersome usage of
`nu_protocol::Value` in Rust, I created a derive macro to simplify it.
I’ve added a new crate called `nu-derive-value`, which includes two
macros, `IntoValue` and `FromValue`. These are re-exported in
`nu-protocol` and should be encouraged to be used via that re-export.

The macros ensure that all types can easily convert from and into
`Value`. For example, as a plugin author, you can define your plugin
configuration using a Rust struct and easily convert it using
`FromValue`. This makes plugin configuration less of a hassle.

I introduced the `IntoValue` trait for a standardized approach to
converting values into `Value` (and a fallible variant `TryIntoValue`).
This trait could potentially replace existing `into_value` methods.
Along with this, I've implemented `FromValue` for several standard types
and refined other implementations to use blanket implementations where
applicable.

I made these design choices with input from @devyn.

There are more improvements possible, but this is a solid start and the
PR is already quite substantial.

# User-Facing Changes

For `nu-protocol` users, these changes simplify the handling of
`Value`s. There are no changes for end-users of nushell itself.

# Tests + Formatting
Documenting the macros itself is not really possible, as they cannot
really reference any other types since they are the root of the
dependency graph. The standard library has the same problem
([std::Debug](https://doc.rust-lang.org/stable/std/fmt/derive.Debug.html)).
However I documented the `FromValue` and `IntoValue` traits completely.

For testing, I made of use `proc-macro2` in the derive macro code. This
would allow testing the generated source code. Instead I just tested
that the derived functionality is correct. This is done in
`nu_protocol::value::test_derive`, as a consumer of `nu-derive-value`
needs to do the testing of the macro usage. I think that these tests
should provide a stable baseline so that users can be sure that the impl
works.

# After Submitting
With these macros available, we can probably use them in some examples
for plugins to showcase the use of them.
---
 Cargo.lock                                    |  22 +
 Cargo.toml                                    |   6 +
 crates/nu-cmd-base/src/hook.rs                |   2 +-
 crates/nu-command/src/charting/histogram.rs   |   2 +-
 .../src/conversions/into/cell_path.rs         |   2 +-
 crates/nu-command/src/filters/split_by.rs     |   2 +-
 crates/nu-command/src/filters/uniq_by.rs      |   2 +-
 crates/nu-command/src/sort_utils.rs           |   2 +-
 crates/nu-derive-value/Cargo.toml             |  21 +
 crates/nu-derive-value/LICENSE                |  21 +
 crates/nu-derive-value/src/attributes.rs      | 116 +++
 crates/nu-derive-value/src/error.rs           |  82 ++
 crates/nu-derive-value/src/from.rs            | 539 ++++++++++++
 crates/nu-derive-value/src/into.rs            | 266 ++++++
 crates/nu-derive-value/src/lib.rs             |  69 ++
 crates/nu-derive-value/src/tests.rs           | 157 ++++
 crates/nu-protocol/Cargo.toml                 |   2 +
 crates/nu-protocol/src/errors/shell_error.rs  |   4 +-
 crates/nu-protocol/src/lib.rs                 |   2 +
 crates/nu-protocol/src/value/from_value.rs    | 822 ++++++++++--------
 crates/nu-protocol/src/value/into_value.rs    | 196 +++++
 crates/nu-protocol/src/value/mod.rs           |  38 +-
 crates/nu-protocol/src/value/test_derive.rs   | 386 ++++++++
 .../src/cool_custom_value.rs                  |   2 +-
 24 files changed, 2378 insertions(+), 385 deletions(-)
 create mode 100644 crates/nu-derive-value/Cargo.toml
 create mode 100644 crates/nu-derive-value/LICENSE
 create mode 100644 crates/nu-derive-value/src/attributes.rs
 create mode 100644 crates/nu-derive-value/src/error.rs
 create mode 100644 crates/nu-derive-value/src/from.rs
 create mode 100644 crates/nu-derive-value/src/into.rs
 create mode 100644 crates/nu-derive-value/src/lib.rs
 create mode 100644 crates/nu-derive-value/src/tests.rs
 create mode 100644 crates/nu-protocol/src/value/into_value.rs
 create mode 100644 crates/nu-protocol/src/value/test_derive.rs

diff --git a/Cargo.lock b/Cargo.lock
index e0c8b048ab..b88af73c25 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -920,6 +920,15 @@ dependencies = [
  "unicode-xid",
 ]
 
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -3020,6 +3029,17 @@ dependencies = [
  "winreg",
 ]
 
+[[package]]
+name = "nu-derive-value"
+version = "0.94.3"
+dependencies = [
+ "convert_case",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
 [[package]]
 name = "nu-engine"
 version = "0.94.3"
@@ -3209,11 +3229,13 @@ dependencies = [
  "byte-unit",
  "chrono",
  "chrono-humanize",
+ "convert_case",
  "fancy-regex",
  "indexmap",
  "lru",
  "miette",
  "nix",
+ "nu-derive-value",
  "nu-path",
  "nu-system",
  "nu-test-support",
diff --git a/Cargo.toml b/Cargo.toml
index d59d7cdbff..18f45987e7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,6 +39,7 @@ members = [
   "crates/nu-lsp",
   "crates/nu-pretty-hex",
   "crates/nu-protocol",
+  "crates/nu-derive-value",
   "crates/nu-plugin",
   "crates/nu-plugin-core",
   "crates/nu-plugin-engine",
@@ -74,6 +75,7 @@ chardetng = "0.1.17"
 chrono = { default-features = false, version = "0.4.34" }
 chrono-humanize = "0.2.3"
 chrono-tz = "0.8"
+convert_case = "0.6"
 crossbeam-channel = "0.5.8"
 crossterm = "0.27"
 csv = "1.3"
@@ -123,11 +125,14 @@ pathdiff = "0.2"
 percent-encoding = "2"
 pretty_assertions = "1.4"
 print-positions = "0.6"
+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"
 quickcheck = "1.0"
 quickcheck_macros = "1.0"
+quote = "1.0"
 rand = "0.8"
 ratatui = "0.26"
 rayon = "1.10"
@@ -147,6 +152,7 @@ serde_urlencoded = "0.7.1"
 serde_yaml = "0.9"
 sha2 = "0.10"
 strip-ansi-escapes = "0.2.0"
+syn = "2.0"
 sysinfo = "0.30"
 tabled = { version = "0.14.0", default-features = false }
 tempfile = "3.10"
diff --git a/crates/nu-cmd-base/src/hook.rs b/crates/nu-cmd-base/src/hook.rs
index 76c13bd5c3..cef5348618 100644
--- a/crates/nu-cmd-base/src/hook.rs
+++ b/crates/nu-cmd-base/src/hook.rs
@@ -194,7 +194,7 @@ pub fn eval_hook(
                 let Some(follow) = val.get("code") else {
                     return Err(ShellError::CantFindColumn {
                         col_name: "code".into(),
-                        span,
+                        span: Some(span),
                         src_span: span,
                     });
                 };
diff --git a/crates/nu-command/src/charting/histogram.rs b/crates/nu-command/src/charting/histogram.rs
index 52964b087d..29515c96c5 100755
--- a/crates/nu-command/src/charting/histogram.rs
+++ b/crates/nu-command/src/charting/histogram.rs
@@ -194,7 +194,7 @@ fn run_histogram(
             if inputs.is_empty() {
                 return Err(ShellError::CantFindColumn {
                     col_name: col_name.clone(),
-                    span: head_span,
+                    span: Some(head_span),
                     src_span: list_span,
                 });
             }
diff --git a/crates/nu-command/src/conversions/into/cell_path.rs b/crates/nu-command/src/conversions/into/cell_path.rs
index c05dad57ba..1342fb14c0 100644
--- a/crates/nu-command/src/conversions/into/cell_path.rs
+++ b/crates/nu-command/src/conversions/into/cell_path.rs
@@ -154,7 +154,7 @@ fn record_to_path_member(
     let Some(value) = record.get("value") else {
         return Err(ShellError::CantFindColumn {
             col_name: "value".into(),
-            span: val_span,
+            span: Some(val_span),
             src_span: span,
         });
     };
diff --git a/crates/nu-command/src/filters/split_by.rs b/crates/nu-command/src/filters/split_by.rs
index 0d3bf1cd30..419119fe0c 100644
--- a/crates/nu-command/src/filters/split_by.rs
+++ b/crates/nu-command/src/filters/split_by.rs
@@ -130,7 +130,7 @@ pub fn split(
                     Some(group_key) => Ok(group_key.coerce_string()?),
                     None => Err(ShellError::CantFindColumn {
                         col_name: column_name.item.to_string(),
-                        span: column_name.span,
+                        span: Some(column_name.span),
                         src_span: row.span(),
                     }),
                 }
diff --git a/crates/nu-command/src/filters/uniq_by.rs b/crates/nu-command/src/filters/uniq_by.rs
index 7bbeb0afe2..e1a502b06b 100644
--- a/crates/nu-command/src/filters/uniq_by.rs
+++ b/crates/nu-command/src/filters/uniq_by.rs
@@ -123,7 +123,7 @@ fn validate(vec: &[Value], columns: &[String], span: Span) -> Result<(), ShellEr
             if let Some(nonexistent) = nonexistent_column(columns, record.columns()) {
                 return Err(ShellError::CantFindColumn {
                     col_name: nonexistent,
-                    span,
+                    span: Some(span),
                     src_span: val_span,
                 });
             }
diff --git a/crates/nu-command/src/sort_utils.rs b/crates/nu-command/src/sort_utils.rs
index 50d8256353..01bb604eac 100644
--- a/crates/nu-command/src/sort_utils.rs
+++ b/crates/nu-command/src/sort_utils.rs
@@ -81,7 +81,7 @@ pub fn sort(
             if let Some(nonexistent) = nonexistent_column(&sort_columns, record.columns()) {
                 return Err(ShellError::CantFindColumn {
                     col_name: nonexistent,
-                    span,
+                    span: Some(span),
                     src_span: val_span,
                 });
             }
diff --git a/crates/nu-derive-value/Cargo.toml b/crates/nu-derive-value/Cargo.toml
new file mode 100644
index 0000000000..45395b2ddb
--- /dev/null
+++ b/crates/nu-derive-value/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+authors = ["The Nushell Project Developers"]
+description = "Macros implementation of #[derive(FromValue, IntoValue)]"
+edition = "2021"
+license = "MIT"
+name = "nu-derive-value"
+repository = "https://github.com/nushell/nushell/tree/main/crates/nu-derive-value"
+version = "0.94.3"
+
+[lib]
+proc-macro = true
+# we can only use exposed macros in doctests really, 
+# so we cannot test anything useful in a doctest
+doctest = false 
+
+[dependencies]
+proc-macro2 = { workspace = true }
+syn = { workspace = true }
+quote = { workspace = true }
+proc-macro-error = { workspace = true }
+convert_case = { workspace = true }
diff --git a/crates/nu-derive-value/LICENSE b/crates/nu-derive-value/LICENSE
new file mode 100644
index 0000000000..ae174e8595
--- /dev/null
+++ b/crates/nu-derive-value/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 - 2023 The Nushell Project Developers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/crates/nu-derive-value/src/attributes.rs b/crates/nu-derive-value/src/attributes.rs
new file mode 100644
index 0000000000..6969b64287
--- /dev/null
+++ b/crates/nu-derive-value/src/attributes.rs
@@ -0,0 +1,116 @@
+use convert_case::Case;
+use syn::{spanned::Spanned, Attribute, Fields, LitStr};
+
+use crate::{error::DeriveError, HELPER_ATTRIBUTE};
+
+#[derive(Debug)]
+pub struct ContainerAttributes {
+    pub rename_all: Case,
+}
+
+impl Default for ContainerAttributes {
+    fn default() -> Self {
+        Self {
+            rename_all: Case::Snake,
+        }
+    }
+}
+
+impl ContainerAttributes {
+    pub fn parse_attrs<'a, M>(
+        iter: impl Iterator<Item = &'a Attribute>,
+    ) -> Result<Self, DeriveError<M>> {
+        let mut container_attrs = ContainerAttributes::default();
+        for attr in filter(iter) {
+            // This is a container to allow returning derive errors inside the parse_nested_meta fn.
+            let mut err = Ok(());
+
+            attr.parse_nested_meta(|meta| {
+                let ident = meta.path.require_ident()?;
+                match ident.to_string().as_str() {
+                    "rename_all" => {
+                        // The matched case are all useful variants from `convert_case` with aliases
+                        // that `serde` uses.
+                        let case: LitStr = meta.value()?.parse()?;
+                        let case = match case.value().as_str() {
+                            "UPPER CASE" | "UPPER WITH SPACES CASE" => Case::Upper,
+                            "lower case" | "lower with spaces case" => Case::Lower,
+                            "Title Case" => Case::Title,
+                            "camelCase" => Case::Camel,
+                            "PascalCase" | "UpperCamelCase" => Case::Pascal,
+                            "snake_case" => Case::Snake,
+                            "UPPER_SNAKE_CASE" | "SCREAMING_SNAKE_CASE" => Case::UpperSnake,
+                            "kebab-case" => Case::Kebab,
+                            "COBOL-CASE" | "UPPER-KEBAB-CASE" | "SCREAMING-KEBAB-CASE" => {
+                                Case::Cobol
+                            }
+                            "Train-Case" => Case::Train,
+                            "flatcase" | "lowercase" => Case::Flat,
+                            "UPPERFLATCASE" | "UPPERCASE" => Case::UpperFlat,
+                            // Although very funny, we don't support `Case::{Toggle, Alternating}`,
+                            // as we see no real benefit.
+                            c => {
+                                err = Err(DeriveError::InvalidAttributeValue {
+                                    value_span: case.span(),
+                                    value: Box::new(c.to_string()),
+                                });
+                                return Ok(()); // We stored the err in `err`.
+                            }
+                        };
+                        container_attrs.rename_all = case;
+                    }
+                    ident => {
+                        err = Err(DeriveError::UnexpectedAttribute {
+                            meta_span: ident.span(),
+                        });
+                    }
+                }
+
+                Ok(())
+            })
+            .map_err(DeriveError::Syn)?;
+
+            err?; // Shortcircuit here if `err` is holding some error.
+        }
+
+        Ok(container_attrs)
+    }
+}
+
+pub fn filter<'a>(
+    iter: impl Iterator<Item = &'a Attribute>,
+) -> impl Iterator<Item = &'a Attribute> {
+    iter.filter(|attr| attr.path().is_ident(HELPER_ATTRIBUTE))
+}
+
+// The deny functions are built to easily deny the use of the helper attribute if used incorrectly.
+// As the usage of it gets more complex, these functions might be discarded or replaced.
+
+/// Deny any attribute that uses the helper attribute.
+pub fn deny<M>(attrs: &[Attribute]) -> Result<(), DeriveError<M>> {
+    match filter(attrs.iter()).next() {
+        Some(attr) => Err(DeriveError::InvalidAttributePosition {
+            attribute_span: attr.span(),
+        }),
+        None => Ok(()),
+    }
+}
+
+/// Deny any attributes that uses the helper attribute on any field.
+pub fn deny_fields<M>(fields: &Fields) -> Result<(), DeriveError<M>> {
+    match fields {
+        Fields::Named(fields) => {
+            for field in fields.named.iter() {
+                deny(&field.attrs)?;
+            }
+        }
+        Fields::Unnamed(fields) => {
+            for field in fields.unnamed.iter() {
+                deny(&field.attrs)?;
+            }
+        }
+        Fields::Unit => (),
+    }
+
+    Ok(())
+}
diff --git a/crates/nu-derive-value/src/error.rs b/crates/nu-derive-value/src/error.rs
new file mode 100644
index 0000000000..b7fd3e2f91
--- /dev/null
+++ b/crates/nu-derive-value/src/error.rs
@@ -0,0 +1,82 @@
+use std::{any, fmt::Debug, marker::PhantomData};
+
+use proc_macro2::Span;
+use proc_macro_error::{Diagnostic, Level};
+
+#[derive(Debug)]
+pub enum DeriveError<M> {
+    /// Marker variant, makes the `M` generic parameter valid.
+    _Marker(PhantomData<M>),
+
+    /// Parsing errors thrown by `syn`.
+    Syn(syn::parse::Error),
+
+    /// `syn::DeriveInput` was a union, currently not supported
+    UnsupportedUnions,
+
+    /// Only plain enums are supported right now.
+    UnsupportedEnums { fields_span: Span },
+
+    /// Found a `#[nu_value(x)]` attribute where `x` is unexpected.
+    UnexpectedAttribute { meta_span: Span },
+
+    /// Found a `#[nu_value(x)]` attribute at a invalid position.
+    InvalidAttributePosition { attribute_span: Span },
+
+    /// Found a valid `#[nu_value(x)]` attribute but the passed values is invalid.
+    InvalidAttributeValue {
+        value_span: Span,
+        value: Box<dyn Debug>,
+    },
+}
+
+impl<M> From<DeriveError<M>> for Diagnostic {
+    fn from(value: DeriveError<M>) -> Self {
+        let derive_name = any::type_name::<M>().split("::").last().expect("not empty");
+        match value {
+            DeriveError::_Marker(_) => panic!("used marker variant"),
+
+            DeriveError::Syn(e) => Diagnostic::spanned(e.span(), Level::Error, e.to_string()),
+
+            DeriveError::UnsupportedUnions => Diagnostic::new(
+                Level::Error,
+                format!("`{derive_name}` cannot be derived from unions"),
+            )
+            .help("consider refactoring to a struct".to_string())
+            .note("if you really need a union, consider opening an issue on Github".to_string()),
+
+            DeriveError::UnsupportedEnums { fields_span } => Diagnostic::spanned(
+                fields_span,
+                Level::Error,
+                format!("`{derive_name}` can only be derived from plain enums"),
+            )
+            .help(
+                "consider refactoring your data type to a struct with a plain enum as a field"
+                    .to_string(),
+            )
+            .note("more complex enums could be implemented in the future".to_string()),
+
+            DeriveError::InvalidAttributePosition { attribute_span } => Diagnostic::spanned(
+                attribute_span,
+                Level::Error,
+                "invalid attribute position".to_string(),
+            )
+            .help(format!(
+                "check documentation for `{derive_name}` for valid placements"
+            )),
+
+            DeriveError::UnexpectedAttribute { meta_span } => {
+                Diagnostic::spanned(meta_span, Level::Error, "unknown attribute".to_string()).help(
+                    format!("check documentation for `{derive_name}` for valid attributes"),
+                )
+            }
+
+            DeriveError::InvalidAttributeValue { value_span, value } => {
+                Diagnostic::spanned(value_span, Level::Error, format!("invalid value {value:?}"))
+                    .help(format!(
+                        "check documentation for `{derive_name}` for valid attribute values"
+                    ))
+            }
+        }
+    }
+}
diff --git a/crates/nu-derive-value/src/from.rs b/crates/nu-derive-value/src/from.rs
new file mode 100644
index 0000000000..033026c149
--- /dev/null
+++ b/crates/nu-derive-value/src/from.rs
@@ -0,0 +1,539 @@
+use convert_case::Casing;
+use proc_macro2::TokenStream as TokenStream2;
+use quote::{quote, ToTokens};
+use syn::{
+    spanned::Spanned, Attribute, Data, DataEnum, DataStruct, DeriveInput, Fields, Generics, Ident,
+};
+
+use crate::attributes::{self, ContainerAttributes};
+
+#[derive(Debug)]
+pub struct FromValue;
+type DeriveError = super::error::DeriveError<FromValue>;
+
+/// Inner implementation of the `#[derive(FromValue)]` macro for structs and enums.
+///
+/// Uses `proc_macro2::TokenStream` for better testing support, unlike `proc_macro::TokenStream`.
+///
+/// This function directs the `FromValue` trait derivation to the correct implementation based on
+/// the input type:
+/// - For structs: [`derive_struct_from_value`]
+/// - For enums: [`derive_enum_from_value`]
+/// - Unions are not supported and will return an error.
+pub fn derive_from_value(input: TokenStream2) -> Result<TokenStream2, DeriveError> {
+    let input: DeriveInput = syn::parse2(input).map_err(DeriveError::Syn)?;
+    match input.data {
+        Data::Struct(data_struct) => Ok(derive_struct_from_value(
+            input.ident,
+            data_struct,
+            input.generics,
+            input.attrs,
+        )?),
+        Data::Enum(data_enum) => Ok(derive_enum_from_value(
+            input.ident,
+            data_enum,
+            input.generics,
+            input.attrs,
+        )?),
+        Data::Union(_) => Err(DeriveError::UnsupportedUnions),
+    }
+}
+
+/// Implements the `#[derive(FromValue)]` macro for structs.
+///
+/// This function ensures that the helper attribute is not used anywhere, as it is not supported for
+/// structs.
+/// Other than this, this function provides the impl signature for `FromValue`.
+/// The implementation for `FromValue::from_value` is handled by [`struct_from_value`] and the
+/// `FromValue::expected_type` is handled by [`struct_expected_type`].
+fn derive_struct_from_value(
+    ident: Ident,
+    data: DataStruct,
+    generics: Generics,
+    attrs: Vec<Attribute>,
+) -> Result<TokenStream2, DeriveError> {
+    attributes::deny(&attrs)?;
+    attributes::deny_fields(&data.fields)?;
+    let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
+    let from_value_impl = struct_from_value(&data);
+    let expected_type_impl = struct_expected_type(&data.fields);
+    Ok(quote! {
+        #[automatically_derived]
+        impl #impl_generics nu_protocol::FromValue for #ident #ty_generics #where_clause {
+            #from_value_impl
+            #expected_type_impl
+        }
+    })
+}
+
+/// Implements `FromValue::from_value` for structs.
+///
+/// This function constructs the `from_value` function for structs.
+/// The implementation is straightforward as most of the heavy lifting is handled by
+/// `parse_value_via_fields`, and this function only needs to construct the signature around it.
+///
+/// For structs with named fields, this constructs a large return type where each field
+/// contains the implementation for that specific field.
+/// In structs with unnamed fields, a [`VecDeque`](std::collections::VecDeque) is used to load each
+/// field one after another, and the result is used to construct the tuple.
+/// For unit structs, this only checks if the input value is `Value::Nothing`.
+///
+/// # Examples
+///
+/// These examples show what the macro would generate.
+///
+/// Struct with named fields:
+/// ```rust
+/// #[derive(IntoValue)]
+/// struct Pet {
+///     name: String,
+///     age: u8,
+///     favorite_toy: Option<String>,
+/// }
+///
+/// impl nu_protocol::FromValue for Pet {
+///     fn from_value(
+///         v: nu_protocol::Value
+///     ) -> std::result::Result<Self, nu_protocol::ShellError> {
+///         let span = v.span();
+///         let mut record = v.into_record()?;
+///         std::result::Result::Ok(Pet {
+///             name: <String as nu_protocol::FromValue>::from_value(
+///                 record
+///                     .remove("name")
+///                     .ok_or_else(|| nu_protocol::ShellError::CantFindColumn {
+///                         col_name: std::string::ToString::to_string("name"),
+///                         span: std::option::Option::None,
+///                         src_span: span
+///                     })?,
+///             )?,
+///             age: <u8 as nu_protocol::FromValue>::from_value(
+///                 record
+///                     .remove("age")
+///                     .ok_or_else(|| nu_protocol::ShellError::CantFindColumn {
+///                         col_name: std::string::ToString::to_string("age"),
+///                         span: std::option::Option::None,
+///                         src_span: span
+///                     })?,
+///             )?,
+///             favorite_toy: <Option<String> as nu_protocol::FromValue>::from_value(
+///                 record
+///                     .remove("favorite_toy")
+///                     .ok_or_else(|| nu_protocol::ShellError::CantFindColumn {
+///                         col_name: std::string::ToString::to_string("favorite_toy"),
+///                         span: std::option::Option::None,
+///                         src_span: span
+///                     })?,
+///             )?,          
+///         })
+///     }
+/// }
+/// ```
+///
+/// Struct with unnamed fields:
+/// ```rust
+/// #[derive(IntoValue)]
+/// struct Color(u8, u8, u8);
+///
+/// impl nu_protocol::FromValue for Color {
+///     fn from_value(
+///         v: nu_protocol::Value
+///     ) -> std::result::Result<Self, nu_protocol::ShellError> {
+///         let span = v.span();
+///         let list = v.into_list()?;
+///         let mut deque: std::collections::VecDeque<_> = std::convert::From::from(list);
+///         std::result::Result::Ok(Self(
+///             {
+///                 <u8 as nu_protocol::FromValue>::from_value(
+///                     deque
+///                         .pop_front()
+///                         .ok_or_else(|| nu_protocol::ShellError::CantFindColumn {
+///                             col_name: std::string::ToString::to_string(&0),
+///                             span: std::option::Option::None,
+///                             src_span: span
+///                         })?,
+///                 )?
+///             },
+///             {
+///                 <u8 as nu_protocol::FromValue>::from_value(
+///                     deque
+///                         .pop_front()
+///                         .ok_or_else(|| nu_protocol::ShellError::CantFindColumn {
+///                             col_name: std::string::ToString::to_string(&1),
+///                             span: std::option::Option::None,
+///                             src_span: span
+///                         })?,
+///                 )?
+///             },
+///             {
+///                 <u8 as nu_protocol::FromValue>::from_value(
+///                     deque
+///                         .pop_front()
+///                         .ok_or_else(|| nu_protocol::ShellError::CantFindColumn {
+///                             col_name: std::string::ToString::to_string(&2),
+///                             span: std::option::Option::None,
+///                             src_span: span
+///                         })?,
+///                 )?
+///             }
+///         ))
+///     }
+/// }
+/// ```
+///
+/// Unit struct:
+/// ```rust
+/// #[derive(IntoValue)]
+/// struct Unicorn;
+///
+/// impl nu_protocol::FromValue for Unicorn {
+///     fn from_value(
+///         v: nu_protocol::Value
+///     ) -> std::result::Result<Self, nu_protocol::ShellError> {
+///         match v {
+///             nu_protocol::Value::Nothing {..} => Ok(Self),
+///             v => std::result::Result::Err(nu_protocol::ShellError::CantConvert {
+///                 to_type: std::string::ToString::to_string(&<Self as nu_protocol::FromValue>::expected_type()),
+///                 from_type: std::string::ToString::to_string(&v.get_type()),
+///                 span: v.span(),
+///                 help: std::option::Option::None
+///             })
+///         }
+///     }
+/// }
+/// ```
+fn struct_from_value(data: &DataStruct) -> TokenStream2 {
+    let body = parse_value_via_fields(&data.fields, quote!(Self));
+    quote! {
+        fn from_value(
+            v: nu_protocol::Value
+        ) -> std::result::Result<Self, nu_protocol::ShellError> {
+            #body
+        }
+    }
+}
+
+/// Implements `FromValue::expected_type` for structs.
+///
+/// This function constructs the `expected_type` function for structs.
+/// The type depends on the `fields`: named fields construct a record type with every key and type
+/// laid out.
+/// Unnamed fields construct a custom type with the name in the format like
+/// `list[type0, type1, type2]`.
+/// No fields expect the `Type::Nothing`.
+///
+/// # Examples
+///
+/// These examples show what the macro would generate.
+///
+/// Struct with named fields:
+/// ```rust
+/// #[derive(IntoValue)]
+/// struct Pet {
+///     name: String,
+///     age: u8,
+///     favorite_toy: Option<String>,
+/// }
+///
+/// impl nu_protocol::FromValue for Pet {
+///     fn expected_type() -> nu_protocol::Type {
+///         nu_protocol::Type::Record(
+///             std::vec![
+///                 (
+///                     std::string::ToString::to_string("name"),
+///                     <String as nu_protocol::FromValue>::expected_type(),
+///                 ),
+///                 (
+///                     std::string::ToString::to_string("age"),
+///                     <u8 as nu_protocol::FromValue>::expected_type(),
+///                 ),
+///                 (
+///                     std::string::ToString::to_string("favorite_toy"),
+///                     <Option<String> as nu_protocol::FromValue>::expected_type(),
+///                 )
+///             ].into_boxed_slice()
+///         )
+///     }
+/// }
+/// ```
+///
+/// Struct with unnamed fields:
+/// ```rust
+/// #[derive(IntoValue)]
+/// struct Color(u8, u8, u8);
+///
+/// impl nu_protocol::FromValue for Color {
+///     fn expected_type() -> nu_protocol::Type {
+///         nu_protocol::Type::Custom(
+///             std::format!(
+///                 "[{}, {}, {}]",
+///                 <u8 as nu_protocol::FromValue>::expected_type(),
+///                 <u8 as nu_protocol::FromValue>::expected_type(),
+///                 <u8 as nu_protocol::FromValue>::expected_type()
+///             )
+///             .into_boxed_str()
+///         )
+///     }
+/// }
+/// ```
+///
+/// Unit struct:
+/// ```rust
+/// #[derive(IntoValue)]
+/// struct Unicorn;
+///
+/// impl nu_protocol::FromValue for Color {
+///     fn expected_type() -> nu_protocol::Type {
+///         nu_protocol::Type::Nothing
+///     }
+/// }
+/// ```
+fn struct_expected_type(fields: &Fields) -> TokenStream2 {
+    let ty = match fields {
+        Fields::Named(fields) => {
+            let fields = fields.named.iter().map(|field| {
+                let ident = field.ident.as_ref().expect("named has idents");
+                let ident_s = ident.to_string();
+                let ty = &field.ty;
+                quote! {(
+                    std::string::ToString::to_string(#ident_s),
+                    <#ty as nu_protocol::FromValue>::expected_type(),
+                )}
+            });
+            quote!(nu_protocol::Type::Record(
+                std::vec![#(#fields),*].into_boxed_slice()
+            ))
+        }
+        Fields::Unnamed(fields) => {
+            let mut iter = fields.unnamed.iter();
+            let fields = fields.unnamed.iter().map(|field| {
+                let ty = &field.ty;
+                quote!(<#ty as nu_protocol::FromValue>::expected_type())
+            });
+            let mut template = String::new();
+            template.push('[');
+            if iter.next().is_some() {
+                template.push_str("{}")
+            }
+            iter.for_each(|_| template.push_str(", {}"));
+            template.push(']');
+            quote! {
+                nu_protocol::Type::Custom(
+                    std::format!(
+                        #template,
+                        #(#fields),*
+                    )
+                    .into_boxed_str()
+                )
+            }
+        }
+        Fields::Unit => quote!(nu_protocol::Type::Nothing),
+    };
+
+    quote! {
+        fn expected_type() -> nu_protocol::Type {
+            #ty
+        }
+    }
+}
+
+/// Implements the `#[derive(FromValue)]` macro for enums.
+///
+/// This function constructs the implementation of the `FromValue` trait for enums.
+/// It is designed to be on the same level as [`derive_struct_from_value`], even though this
+/// function only provides the impl signature for `FromValue`.
+/// The actual implementation for `FromValue::from_value` is handled by [`enum_from_value`].
+///
+/// Since variants are difficult to type with the current type system, this function uses the
+/// default implementation for `expected_type`.
+fn derive_enum_from_value(
+    ident: Ident,
+    data: DataEnum,
+    generics: Generics,
+    attrs: Vec<Attribute>,
+) -> Result<TokenStream2, DeriveError> {
+    let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
+    let from_value_impl = enum_from_value(&data, &attrs)?;
+    Ok(quote! {
+        #[automatically_derived]
+        impl #impl_generics nu_protocol::FromValue for #ident #ty_generics #where_clause {
+            #from_value_impl
+        }
+    })
+}
+
+/// Implements `FromValue::from_value` for enums.
+///
+/// This function constructs the `from_value` implementation for enums.
+/// It only accepts enums with unit variants, as it is currently unclear how other types of enums
+/// should be represented via a `Value`.
+/// This function checks that every field is a unit variant and constructs a match statement over
+/// all possible variants.
+/// The input value is expected to be a `Value::String` containing the name of the variant formatted
+/// as defined by the `#[nu_value(rename_all = "...")]` attribute.
+/// If no attribute is given, [`convert_case::Case::Snake`] is expected.
+///
+/// If no matching variant is found, `ShellError::CantConvert` is returned.
+///
+/// This is how such a derived implementation looks:
+/// ```rust
+/// #[derive(IntoValue)]
+/// enum Weather {
+///     Sunny,
+///     Cloudy,
+///     Raining
+/// }
+///
+/// impl nu_protocol::IntoValue for Weather {
+///     fn into_value(self, span: nu_protocol::Span) -> nu_protocol::Value {
+///         let span = v.span();
+///         let ty = v.get_type();
+///
+///         let s = v.into_string()?;
+///         match s.as_str() {
+///             "sunny" => std::result::Ok(Self::Sunny),
+///             "cloudy" => std::result::Ok(Self::Cloudy),
+///             "raining" => std::result::Ok(Self::Raining),
+///             _ => std::result::Result::Err(nu_protocol::ShellError::CantConvert {
+///                 to_type: std::string::ToString::to_string(
+///                     &<Self as nu_protocol::FromValue>::expected_type()
+///                 ),
+///                 from_type: std::string::ToString::to_string(&ty),
+///                 span: span,help: std::option::Option::None,
+///             }),
+///         }
+///     }
+/// }
+/// ```
+fn enum_from_value(data: &DataEnum, attrs: &[Attribute]) -> Result<TokenStream2, DeriveError> {
+    let container_attrs = ContainerAttributes::parse_attrs(attrs.iter())?;
+    let arms: Vec<TokenStream2> = data
+        .variants
+        .iter()
+        .map(|variant| {
+            attributes::deny(&variant.attrs)?;
+            let ident = &variant.ident;
+            let ident_s = format!("{ident}")
+                .as_str()
+                .to_case(container_attrs.rename_all);
+            match &variant.fields {
+                Fields::Named(fields) => Err(DeriveError::UnsupportedEnums {
+                    fields_span: fields.span(),
+                }),
+                Fields::Unnamed(fields) => Err(DeriveError::UnsupportedEnums {
+                    fields_span: fields.span(),
+                }),
+                Fields::Unit => Ok(quote!(#ident_s => std::result::Result::Ok(Self::#ident))),
+            }
+        })
+        .collect::<Result<_, _>>()?;
+
+    Ok(quote! {
+        fn from_value(
+            v: nu_protocol::Value
+        ) -> std::result::Result<Self, nu_protocol::ShellError> {
+            let span = v.span();
+            let ty = v.get_type();
+
+            let s = v.into_string()?;
+            match s.as_str() {
+                #(#arms,)*
+                _ => std::result::Result::Err(nu_protocol::ShellError::CantConvert {
+                    to_type: std::string::ToString::to_string(
+                        &<Self as nu_protocol::FromValue>::expected_type()
+                    ),
+                    from_type: std::string::ToString::to_string(&ty),
+                    span: span,
+                    help: std::option::Option::None,
+                }),
+            }
+        }
+    })
+}
+
+/// Parses a `Value` into self.
+///
+/// This function handles the actual parsing of a `Value` into self.
+/// It takes two parameters: `fields` and `self_ident`.
+/// The `fields` parameter determines the expected type of `Value`: named fields expect a
+/// `Value::Record`, unnamed fields expect a `Value::List`, and a unit expects `Value::Nothing`.
+///
+/// For named fields, the `fields` parameter indicates which field in the record corresponds to
+/// which struct field.
+/// For both named and unnamed fields, it also helps cast the type into a `FromValue` type.
+/// This approach maintains
+/// [hygiene](https://doc.rust-lang.org/reference/macros-by-example.html#hygiene).
+///
+/// The `self_ident` parameter is used to describe the identifier of the returned value.
+/// For structs, `Self` is usually sufficient, but for enums, `Self::Variant` may be needed in the
+/// future.
+///
+/// This function is more complex than the equivalent for `IntoValue` due to error handling
+/// requirements.
+/// For missing fields, `ShellError::CantFindColumn` is used, and for unit structs,
+/// `ShellError::CantConvert` is used.
+/// The implementation avoids local variables for fields to prevent accidental shadowing, ensuring
+/// that poorly named fields don't cause issues.
+/// While this style is not typically recommended in handwritten Rust, it is acceptable for code
+/// generation.
+fn parse_value_via_fields(fields: &Fields, self_ident: impl ToTokens) -> TokenStream2 {
+    match fields {
+        Fields::Named(fields) => {
+            let fields = fields.named.iter().map(|field| {
+                // TODO: handle missing fields for Options as None
+                let ident = field.ident.as_ref().expect("named has idents");
+                let ident_s = ident.to_string();
+                let ty = &field.ty;
+                quote! {
+                    #ident: <#ty as nu_protocol::FromValue>::from_value(
+                        record
+                            .remove(#ident_s)
+                            .ok_or_else(|| nu_protocol::ShellError::CantFindColumn {
+                                col_name: std::string::ToString::to_string(#ident_s),
+                                span: std::option::Option::None,
+                                src_span: span
+                            })?,
+                    )?
+                }
+            });
+            quote! {
+                let span = v.span();
+                let mut record = v.into_record()?;
+                std::result::Result::Ok(#self_ident {#(#fields),*})
+            }
+        }
+        Fields::Unnamed(fields) => {
+            let fields = fields.unnamed.iter().enumerate().map(|(i, field)| {
+                let ty = &field.ty;
+                quote! {{
+                    <#ty as nu_protocol::FromValue>::from_value(
+                        deque
+                            .pop_front()
+                            .ok_or_else(|| nu_protocol::ShellError::CantFindColumn {
+                                col_name: std::string::ToString::to_string(&#i),
+                                span: std::option::Option::None,
+                                src_span: span
+                            })?,
+                    )?
+                }}
+            });
+            quote! {
+                let span = v.span();
+                let list = v.into_list()?;
+                let mut deque: std::collections::VecDeque<_> = std::convert::From::from(list);
+                std::result::Result::Ok(#self_ident(#(#fields),*))
+            }
+        }
+        Fields::Unit => quote! {
+            match v {
+                nu_protocol::Value::Nothing {..} => Ok(#self_ident),
+                v => std::result::Result::Err(nu_protocol::ShellError::CantConvert {
+                    to_type: std::string::ToString::to_string(&<Self as nu_protocol::FromValue>::expected_type()),
+                    from_type: std::string::ToString::to_string(&v.get_type()),
+                    span: v.span(),
+                    help: std::option::Option::None
+                })
+            }
+        },
+    }
+}
diff --git a/crates/nu-derive-value/src/into.rs b/crates/nu-derive-value/src/into.rs
new file mode 100644
index 0000000000..a7cec06378
--- /dev/null
+++ b/crates/nu-derive-value/src/into.rs
@@ -0,0 +1,266 @@
+use convert_case::Casing;
+use proc_macro2::TokenStream as TokenStream2;
+use quote::{quote, ToTokens};
+use syn::{
+    spanned::Spanned, Attribute, Data, DataEnum, DataStruct, DeriveInput, Fields, Generics, Ident,
+    Index,
+};
+
+use crate::attributes::{self, ContainerAttributes};
+
+#[derive(Debug)]
+pub struct IntoValue;
+type DeriveError = super::error::DeriveError<IntoValue>;
+
+/// Inner implementation of the `#[derive(IntoValue)]` macro for structs and enums.
+///
+/// Uses `proc_macro2::TokenStream` for better testing support, unlike `proc_macro::TokenStream`.
+///
+/// This function directs the `IntoValue` trait derivation to the correct implementation based on
+/// the input type:
+/// - For structs: [`struct_into_value`]
+/// - For enums: [`enum_into_value`]
+/// - Unions are not supported and will return an error.
+pub fn derive_into_value(input: TokenStream2) -> Result<TokenStream2, DeriveError> {
+    let input: DeriveInput = syn::parse2(input).map_err(DeriveError::Syn)?;
+    match input.data {
+        Data::Struct(data_struct) => Ok(struct_into_value(
+            input.ident,
+            data_struct,
+            input.generics,
+            input.attrs,
+        )?),
+        Data::Enum(data_enum) => Ok(enum_into_value(
+            input.ident,
+            data_enum,
+            input.generics,
+            input.attrs,
+        )?),
+        Data::Union(_) => Err(DeriveError::UnsupportedUnions),
+    }
+}
+
+/// Implements the `#[derive(IntoValue)]` macro for structs.
+///
+/// Automatically derives the `IntoValue` trait for any struct where each field implements
+/// `IntoValue`.
+/// For structs with named fields, the derived implementation creates a `Value::Record` using the
+/// struct fields as keys.
+/// Each field value is converted using the `IntoValue::into_value` method.
+/// For structs with unnamed fields, this generates a `Value::List` with each field in the list.
+/// For unit structs, this generates `Value::Nothing`, because there is no data.
+///
+/// Note: The helper attribute `#[nu_value(...)]` is currently not allowed on structs.
+///
+/// # Examples
+///
+/// These examples show what the macro would generate.
+///
+/// Struct with named fields:
+/// ```rust
+/// #[derive(IntoValue)]
+/// struct Pet {
+///     name: String,
+///     age: u8,
+///     favorite_toy: Option<String>,
+/// }
+///
+/// impl nu_protocol::IntoValue for Pet {
+///     fn into_value(self, span: nu_protocol::Span) -> nu_protocol::Value {
+///         nu_protocol::Value::record(nu_protocol::record! {
+///             "name" => nu_protocol::IntoValue::into_value(self.name, span),
+///             "age" => nu_protocol::IntoValue::into_value(self.age, span),
+///             "favorite_toy" => nu_protocol::IntoValue::into_value(self.favorite_toy, span),
+///         }, span)
+///     }
+/// }
+/// ```
+///
+/// Struct with unnamed fields:
+/// ```rust
+/// #[derive(IntoValue)]
+/// struct Color(u8, u8, u8);
+///
+/// impl nu_protocol::IntoValue for Color {
+///     fn into_value(self, span: nu_protocol::Span) -> nu_protocol::Value {
+///         nu_protocol::Value::list(vec![
+///             nu_protocol::IntoValue::into_value(self.0, span),
+///             nu_protocol::IntoValue::into_value(self.1, span),
+///             nu_protocol::IntoValue::into_value(self.2, span),
+///         ], span)
+///     }
+/// }
+/// ```
+///
+/// Unit struct:
+/// ```rust
+/// #[derive(IntoValue)]
+/// struct Unicorn;
+///
+/// impl nu_protocol::IntoValue for Unicorn {
+///     fn into_value(self, span: nu_protocol::Span) -> nu_protocol::Value {
+///         nu_protocol::Value::nothing(span)
+///     }
+/// }
+/// ```
+fn struct_into_value(
+    ident: Ident,
+    data: DataStruct,
+    generics: Generics,
+    attrs: Vec<Attribute>,
+) -> Result<TokenStream2, DeriveError> {
+    attributes::deny(&attrs)?;
+    attributes::deny_fields(&data.fields)?;
+    let record = match &data.fields {
+        Fields::Named(fields) => {
+            let accessor = fields
+                .named
+                .iter()
+                .map(|field| field.ident.as_ref().expect("named has idents"))
+                .map(|ident| quote!(self.#ident));
+            fields_return_value(&data.fields, accessor)
+        }
+        Fields::Unnamed(fields) => {
+            let accessor = fields
+                .unnamed
+                .iter()
+                .enumerate()
+                .map(|(n, _)| Index::from(n))
+                .map(|index| quote!(self.#index));
+            fields_return_value(&data.fields, accessor)
+        }
+        Fields::Unit => quote!(nu_protocol::Value::nothing(span)),
+    };
+    let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
+    Ok(quote! {
+        #[automatically_derived]
+        impl #impl_generics nu_protocol::IntoValue for #ident #ty_generics #where_clause {
+            fn into_value(self, span: nu_protocol::Span) -> nu_protocol::Value {
+                #record
+            }
+        }
+    })
+}
+
+/// Implements the `#[derive(IntoValue)]` macro for enums.
+///
+/// This function implements the derive macro `IntoValue` for enums.
+/// Currently, only unit enum variants are supported as it is not clear how other types of enums
+/// should be represented in a `Value`.
+/// For simple enums, we represent the enum as a `Value::String`. For other types of variants, we return an error.
+/// The variant name will be case-converted as described by the `#[nu_value(rename_all = "...")]` helper attribute.
+/// If no attribute is used, the default is `case_convert::Case::Snake`.
+/// The implementation matches over all variants, uses the appropriate variant name, and constructs a `Value::String`.
+///
+/// This is how such a derived implementation looks:
+/// ```rust
+/// #[derive(IntoValue)]
+/// enum Weather {
+///     Sunny,
+///     Cloudy,
+///     Raining
+/// }
+///
+/// impl nu_protocol::IntoValue for Weather {
+///     fn into_value(self, span: nu_protocol::Span) -> nu_protocol::Value {
+///         match self {
+///             Self::Sunny => nu_protocol::Value::string("sunny", span),
+///             Self::Cloudy => nu_protocol::Value::string("cloudy", span),
+///             Self::Raining => nu_protocol::Value::string("raining", span),
+///         }
+///     }
+/// }
+/// ```
+fn enum_into_value(
+    ident: Ident,
+    data: DataEnum,
+    generics: Generics,
+    attrs: Vec<Attribute>,
+) -> Result<TokenStream2, DeriveError> {
+    let container_attrs = ContainerAttributes::parse_attrs(attrs.iter())?;
+    let arms: Vec<TokenStream2> = data
+        .variants
+        .into_iter()
+        .map(|variant| {
+            attributes::deny(&variant.attrs)?;
+            let ident = variant.ident;
+            let ident_s = format!("{ident}")
+                .as_str()
+                .to_case(container_attrs.rename_all);
+            match &variant.fields {
+                // In the future we can implement more complexe enums here.
+                Fields::Named(fields) => Err(DeriveError::UnsupportedEnums {
+                    fields_span: fields.span(),
+                }),
+                Fields::Unnamed(fields) => Err(DeriveError::UnsupportedEnums {
+                    fields_span: fields.span(),
+                }),
+                Fields::Unit => {
+                    Ok(quote!(Self::#ident => nu_protocol::Value::string(#ident_s, span)))
+                }
+            }
+        })
+        .collect::<Result<_, _>>()?;
+
+    let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
+    Ok(quote! {
+        impl #impl_generics nu_protocol::IntoValue for #ident #ty_generics #where_clause {
+            fn into_value(self, span: nu_protocol::Span) -> nu_protocol::Value {
+                match self {
+                    #(#arms,)*
+                }
+            }
+        }
+    })
+}
+
+/// Constructs the final `Value` that the macro generates.
+///
+/// This function handles the construction of the final `Value` that the macro generates.
+/// It is currently only used for structs but may be used for enums in the future.
+/// The function takes two parameters: the `fields`, which allow iterating over each field of a data
+/// type, and the `accessor`.
+/// The fields determine whether we need to generate a `Value::Record`, `Value::List`, or
+/// `Value::Nothing`.
+/// For named fields, they are also directly used to generate the record key.
+///
+/// The `accessor` parameter generalizes how the data is accessed.
+/// For named fields, this is usually the name of the fields preceded by `self` in a struct, and
+/// maybe something else for enums.
+/// For unnamed fields, this should be an iterator similar to the one with named fields, but
+/// accessing tuple fields, so we get `self.n`.
+/// For unit structs, this parameter is ignored.
+/// By using the accessor like this, we can have the same code for structs and enums with data
+/// variants in the future.
+fn fields_return_value(
+    fields: &Fields,
+    accessor: impl Iterator<Item = impl ToTokens>,
+) -> TokenStream2 {
+    match fields {
+        Fields::Named(fields) => {
+            let items: Vec<TokenStream2> = fields
+                .named
+                .iter()
+                .zip(accessor)
+                .map(|(field, accessor)| {
+                    let ident = field.ident.as_ref().expect("named has idents");
+                    let field = ident.to_string();
+                    quote!(#field => nu_protocol::IntoValue::into_value(#accessor, span))
+                })
+                .collect();
+            quote! {
+                nu_protocol::Value::record(nu_protocol::record! {
+                    #(#items),*
+                }, span)
+            }
+        }
+        Fields::Unnamed(fields) => {
+            let items =
+                fields.unnamed.iter().zip(accessor).map(
+                    |(_, accessor)| quote!(nu_protocol::IntoValue::into_value(#accessor, span)),
+                );
+            quote!(nu_protocol::Value::list(std::vec![#(#items),*], span))
+        }
+        Fields::Unit => quote!(nu_protocol::Value::nothing(span)),
+    }
+}
diff --git a/crates/nu-derive-value/src/lib.rs b/crates/nu-derive-value/src/lib.rs
new file mode 100644
index 0000000000..269566fc88
--- /dev/null
+++ b/crates/nu-derive-value/src/lib.rs
@@ -0,0 +1,69 @@
+//! Macro implementations of `#[derive(FromValue, IntoValue)]`.
+//!
+//! As this crate is a [`proc_macro`] crate, it is only allowed to export
+//! [procedural macros](https://doc.rust-lang.org/reference/procedural-macros.html).
+//! Therefore, it only exports [`IntoValue`] and [`FromValue`].
+//!
+//! To get documentation for other functions and types used in this crate, run
+//! `cargo doc -p nu-derive-value --document-private-items`.
+//!
+//! This crate uses a lot of
+//! [`proc_macro2::TokenStream`](https://docs.rs/proc-macro2/1.0.24/proc_macro2/struct.TokenStream.html)
+//! as `TokenStream2` to allow testing the behavior of the macros directly, including the output
+//! token stream or if the macro errors as expected.
+//! The tests for functionality can be found in `nu_protocol::value::test_derive`.
+//!
+//! This documentation is often less reference-heavy than typical Rust documentation.
+//! This is because this crate is a dependency for `nu_protocol`, and linking to it would create a
+//! cyclic dependency.
+//! Also all examples in the documentation aren't tested as this crate cannot be compiled as a
+//! normal library very easily.
+//! This might change in the future if cargo allows building a proc-macro crate differently for
+//! `cfg(doctest)` as they are already doing for `cfg(test)`.
+//!
+//! The generated code from the derive macros tries to be as
+//! [hygienic](https://doc.rust-lang.org/reference/macros-by-example.html#hygiene) as possible.
+//! This ensures that the macro can be called anywhere without requiring specific imports.
+//! This results in obtuse code, which isn't recommended for manual, handwritten Rust
+//! but ensures that no other code may influence this generated code or vice versa.
+
+use proc_macro::TokenStream;
+use proc_macro2::TokenStream as TokenStream2;
+use proc_macro_error::{proc_macro_error, Diagnostic};
+
+mod attributes;
+mod error;
+mod from;
+mod into;
+#[cfg(test)]
+mod tests;
+
+const HELPER_ATTRIBUTE: &str = "nu_value";
+
+/// Derive macro generating an impl of the trait `IntoValue`.
+///
+/// For further information, see the docs on the trait itself.
+#[proc_macro_derive(IntoValue, attributes(nu_value))]
+#[proc_macro_error]
+pub fn derive_into_value(input: TokenStream) -> TokenStream {
+    let input = TokenStream2::from(input);
+    let output = match into::derive_into_value(input) {
+        Ok(output) => output,
+        Err(e) => Diagnostic::from(e).abort(),
+    };
+    TokenStream::from(output)
+}
+
+/// Derive macro generating an impl of the trait `FromValue`.
+///
+/// For further information, see the docs on the trait itself.
+#[proc_macro_derive(FromValue, attributes(nu_value))]
+#[proc_macro_error]
+pub fn derive_from_value(input: TokenStream) -> TokenStream {
+    let input = TokenStream2::from(input);
+    let output = match from::derive_from_value(input) {
+        Ok(output) => output,
+        Err(e) => Diagnostic::from(e).abort(),
+    };
+    TokenStream::from(output)
+}
diff --git a/crates/nu-derive-value/src/tests.rs b/crates/nu-derive-value/src/tests.rs
new file mode 100644
index 0000000000..b94d12a732
--- /dev/null
+++ b/crates/nu-derive-value/src/tests.rs
@@ -0,0 +1,157 @@
+// These tests only check that the derive macros throw the relevant errors.
+// Functionality of the derived types is tested in nu_protocol::value::test_derive.
+
+use crate::error::DeriveError;
+use crate::from::derive_from_value;
+use crate::into::derive_into_value;
+use quote::quote;
+
+#[test]
+fn unsupported_unions() {
+    let input = quote! {
+        #[nu_value]
+        union SomeUnion {
+            f1: u32,
+            f2: f32,
+        }
+    };
+
+    let from_res = derive_from_value(input.clone());
+    assert!(
+        matches!(from_res, Err(DeriveError::UnsupportedUnions)),
+        "expected `DeriveError::UnsupportedUnions`, got {:?}",
+        from_res
+    );
+
+    let into_res = derive_into_value(input);
+    assert!(
+        matches!(into_res, Err(DeriveError::UnsupportedUnions)),
+        "expected `DeriveError::UnsupportedUnions`, got {:?}",
+        into_res
+    );
+}
+
+#[test]
+fn unsupported_enums() {
+    let input = quote! {
+        #[nu_value(rename_all = "SCREAMING_SNAKE_CASE")]
+        enum ComplexEnum {
+            Unit,
+            Unnamed(u32, f32),
+            Named {
+                u: u32,
+                f: f32,
+            }
+        }
+    };
+
+    let from_res = derive_from_value(input.clone());
+    assert!(
+        matches!(from_res, Err(DeriveError::UnsupportedEnums { .. })),
+        "expected `DeriveError::UnsupportedEnums`, got {:?}",
+        from_res
+    );
+
+    let into_res = derive_into_value(input);
+    assert!(
+        matches!(into_res, Err(DeriveError::UnsupportedEnums { .. })),
+        "expected `DeriveError::UnsupportedEnums`, got {:?}",
+        into_res
+    );
+}
+
+#[test]
+fn unexpected_attribute() {
+    let input = quote! {
+        #[nu_value(what)]
+        enum SimpleEnum {
+            A,
+            B,
+        }
+    };
+
+    let from_res = derive_from_value(input.clone());
+    assert!(
+        matches!(from_res, Err(DeriveError::UnexpectedAttribute { .. })),
+        "expected `DeriveError::UnexpectedAttribute`, got {:?}",
+        from_res
+    );
+
+    let into_res = derive_into_value(input);
+    assert!(
+        matches!(into_res, Err(DeriveError::UnexpectedAttribute { .. })),
+        "expected `DeriveError::UnexpectedAttribute`, got {:?}",
+        into_res
+    );
+}
+
+#[test]
+fn deny_attribute_on_structs() {
+    let input = quote! {
+        #[nu_value]
+        struct SomeStruct;
+    };
+
+    let from_res = derive_from_value(input.clone());
+    assert!(
+        matches!(from_res, Err(DeriveError::InvalidAttributePosition { .. })),
+        "expected `DeriveError::InvalidAttributePosition`, got {:?}",
+        from_res
+    );
+
+    let into_res = derive_into_value(input);
+    assert!(
+        matches!(into_res, Err(DeriveError::InvalidAttributePosition { .. })),
+        "expected `DeriveError::InvalidAttributePosition`, got {:?}",
+        into_res
+    );
+}
+
+#[test]
+fn deny_attribute_on_fields() {
+    let input = quote! {
+        struct SomeStruct {
+            #[nu_value]
+            field: ()
+        }
+    };
+
+    let from_res = derive_from_value(input.clone());
+    assert!(
+        matches!(from_res, Err(DeriveError::InvalidAttributePosition { .. })),
+        "expected `DeriveError::InvalidAttributePosition`, got {:?}",
+        from_res
+    );
+
+    let into_res = derive_into_value(input);
+    assert!(
+        matches!(into_res, Err(DeriveError::InvalidAttributePosition { .. })),
+        "expected `DeriveError::InvalidAttributePosition`, got {:?}",
+        into_res
+    );
+}
+
+#[test]
+fn invalid_attribute_value() {
+    let input = quote! {
+        #[nu_value(rename_all = "CrazY-CasE")]
+        enum SimpleEnum {
+            A,
+            B
+        }
+    };
+
+    let from_res = derive_from_value(input.clone());
+    assert!(
+        matches!(from_res, Err(DeriveError::InvalidAttributeValue { .. })),
+        "expected `DeriveError::InvalidAttributeValue`, got {:?}",
+        from_res
+    );
+
+    let into_res = derive_into_value(input);
+    assert!(
+        matches!(into_res, Err(DeriveError::InvalidAttributeValue { .. })),
+        "expected `DeriveError::InvalidAttributeValue`, got {:?}",
+        into_res
+    );
+}
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index de73ba1a2c..849a968eb8 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -16,11 +16,13 @@ bench = false
 nu-utils = { path = "../nu-utils", version = "0.94.3" }
 nu-path = { path = "../nu-path", version = "0.94.3" }
 nu-system = { path = "../nu-system", version = "0.94.3" }
+nu-derive-value = { path = "../nu-derive-value", version = "0.94.3" }
 
 brotli = { workspace = true, optional = true }
 byte-unit = { version = "5.1", features = [ "serde" ] }
 chrono = { workspace = true, features = [ "serde", "std", "unstable-locales" ], default-features = false }
 chrono-humanize = { workspace = true }
+convert_case = { workspace = true }
 fancy-regex = { workspace = true }
 indexmap = { workspace = true }
 lru = { workspace = true }
diff --git a/crates/nu-protocol/src/errors/shell_error.rs b/crates/nu-protocol/src/errors/shell_error.rs
index e201915fcf..30752d5c9e 100644
--- a/crates/nu-protocol/src/errors/shell_error.rs
+++ b/crates/nu-protocol/src/errors/shell_error.rs
@@ -557,12 +557,12 @@ pub enum ShellError {
     /// ## Resolution
     ///
     /// Check the spelling of your column name. Did you forget to rename a column somewhere?
-    #[error("Cannot find column")]
+    #[error("Cannot find column '{col_name}'")]
     #[diagnostic(code(nu::shell::column_not_found))]
     CantFindColumn {
         col_name: String,
         #[label = "cannot find column '{col_name}'"]
-        span: Span,
+        span: Option<Span>,
         #[label = "value originates here"]
         src_span: Span,
     },
diff --git a/crates/nu-protocol/src/lib.rs b/crates/nu-protocol/src/lib.rs
index d09186cf46..78e7d40680 100644
--- a/crates/nu-protocol/src/lib.rs
+++ b/crates/nu-protocol/src/lib.rs
@@ -39,3 +39,5 @@ pub use span::*;
 pub use syntax_shape::*;
 pub use ty::*;
 pub use value::*;
+
+pub use nu_derive_value::*;
diff --git a/crates/nu-protocol/src/value/from_value.rs b/crates/nu-protocol/src/value/from_value.rs
index 97fb95d482..1033eb03b2 100644
--- a/crates/nu-protocol/src/value/from_value.rs
+++ b/crates/nu-protocol/src/value/from_value.rs
@@ -1,37 +1,188 @@
 use crate::{
     ast::{CellPath, PathMember},
     engine::Closure,
-    NuGlob, Range, Record, ShellError, Spanned, Value,
+    NuGlob, Range, Record, ShellError, Spanned, Type, Value,
 };
 use chrono::{DateTime, FixedOffset};
-use std::path::PathBuf;
+use std::{
+    any,
+    cmp::Ordering,
+    collections::{HashMap, VecDeque},
+    path::PathBuf,
+    str::FromStr,
+};
 
+/// A trait for loading a value from a [`Value`].
+///
+/// # Derivable
+/// This trait can be used with `#[derive]`.
+/// When derived on structs with named fields, it expects a [`Value::Record`] where each field of
+/// the struct maps to a corresponding field in the record.
+/// For structs with unnamed fields, it expects a [`Value::List`], and the fields are populated in
+/// the order they appear in the list.
+/// Unit structs expect  a [`Value::Nothing`], as they contain no data.
+/// Attempting to convert from a non-matching `Value` type will result in an error.
+///
+/// Only enums with no fields may derive this trait.
+/// The expected value representation will be the name of the variant as a [`Value::String`].
+/// By default, variant names will be expected in ["snake_case"](convert_case::Case::Snake).
+/// You can customize the case conversion using `#[nu_value(rename_all = "kebab-case")]` on the enum.
+/// All deterministic and useful case conversions provided by [`convert_case::Case`] are supported
+/// by specifying the case name followed by "case".
+/// Also all values for
+/// [`#[serde(rename_all = "...")]`](https://serde.rs/container-attrs.html#rename_all) are valid
+/// here.
+///
+/// ```
+/// # use nu_protocol::{FromValue, Value, ShellError};
+/// #[derive(FromValue, Debug, PartialEq)]
+/// #[nu_value(rename_all = "COBOL-CASE")]
+/// enum Bird {
+///     MountainEagle,
+///     ForestOwl,
+///     RiverDuck,
+/// }
+///
+/// assert_eq!(
+///     Bird::from_value(Value::test_string("RIVER-DUCK")).unwrap(),
+///     Bird::RiverDuck
+/// );
+/// ```
 pub trait FromValue: Sized {
+    // TODO: instead of ShellError, maybe we could have a FromValueError that implements Into<ShellError>
+    /// Loads a value from a [`Value`].
+    ///
+    /// This method retrieves a value similarly to how strings are parsed using [`FromStr`].
+    /// The operation might fail if the `Value` contains unexpected types or structures.
     fn from_value(v: Value) -> Result<Self, ShellError>;
-}
 
-impl FromValue for Value {
-    fn from_value(v: Value) -> Result<Self, ShellError> {
-        Ok(v)
+    /// Expected `Value` type.
+    ///
+    /// This is used to print out errors of what type of value is expected for conversion.
+    /// Even if not used in [`from_value`](FromValue::from_value) this should still be implemented
+    /// so that other implementations like `Option` or `Vec` can make use of it.
+    /// It is advised to call this method in `from_value` to ensure that expected type in the error
+    /// is consistent.
+    ///
+    /// Unlike the default implementation, derived implementations explicitly reveal the concrete
+    /// type, such as [`Type::Record`] or [`Type::List`], instead of an opaque type.
+    fn expected_type() -> Type {
+        Type::Custom(
+            any::type_name::<Self>()
+                .split(':')
+                .last()
+                .expect("str::split returns an iterator with at least one element")
+                .to_string()
+                .into_boxed_str(),
+        )
     }
 }
 
-impl FromValue for Spanned<i64> {
+// Primitive Types
+
+impl<T, const N: usize> FromValue for [T; N]
+where
+    T: FromValue,
+{
     fn from_value(v: Value) -> Result<Self, ShellError> {
         let span = v.span();
-        match v {
-            Value::Int { val, .. } => Ok(Spanned { item: val, span }),
-            Value::Filesize { val, .. } => Ok(Spanned { item: val, span }),
-            Value::Duration { val, .. } => Ok(Spanned { item: val, span }),
+        let v_ty = v.get_type();
+        let vec = Vec::<T>::from_value(v)?;
+        vec.try_into()
+            .map_err(|err_vec: Vec<T>| ShellError::CantConvert {
+                to_type: Self::expected_type().to_string(),
+                from_type: v_ty.to_string(),
+                span,
+                help: Some(match err_vec.len().cmp(&N) {
+                    Ordering::Less => format!(
+                        "input list too short ({}), expected length of {N}, add missing values",
+                        err_vec.len()
+                    ),
+                    Ordering::Equal => {
+                        unreachable!("conversion would have worked if the length would be the same")
+                    }
+                    Ordering::Greater => format!(
+                        "input list too long ({}), expected length of {N}, remove trailing values",
+                        err_vec.len()
+                    ),
+                }),
+            })
+    }
 
+    fn expected_type() -> Type {
+        Type::Custom(format!("list<{};{N}>", T::expected_type()).into_boxed_str())
+    }
+}
+
+impl FromValue for bool {
+    fn from_value(v: Value) -> Result<Self, ShellError> {
+        match v {
+            Value::Bool { val, .. } => Ok(val),
             v => Err(ShellError::CantConvert {
-                to_type: "int".into(),
+                to_type: Self::expected_type().to_string(),
                 from_type: v.get_type().to_string(),
                 span: v.span(),
                 help: None,
             }),
         }
     }
+
+    fn expected_type() -> Type {
+        Type::Bool
+    }
+}
+
+impl FromValue for char {
+    fn from_value(v: Value) -> Result<Self, ShellError> {
+        let span = v.span();
+        let v_ty = v.get_type();
+        match v {
+            Value::String { ref val, .. } => match char::from_str(val) {
+                Ok(c) => Ok(c),
+                Err(_) => Err(ShellError::CantConvert {
+                    to_type: Self::expected_type().to_string(),
+                    from_type: v_ty.to_string(),
+                    span,
+                    help: Some("make the string only one char long".to_string()),
+                }),
+            },
+            _ => Err(ShellError::CantConvert {
+                to_type: Self::expected_type().to_string(),
+                from_type: v_ty.to_string(),
+                span,
+                help: None,
+            }),
+        }
+    }
+
+    fn expected_type() -> Type {
+        Type::String
+    }
+}
+
+impl FromValue for f32 {
+    fn from_value(v: Value) -> Result<Self, ShellError> {
+        f64::from_value(v).map(|float| float as f32)
+    }
+}
+
+impl FromValue for f64 {
+    fn from_value(v: Value) -> Result<Self, ShellError> {
+        match v {
+            Value::Float { val, .. } => Ok(val),
+            Value::Int { val, .. } => Ok(val as f64),
+            v => Err(ShellError::CantConvert {
+                to_type: Self::expected_type().to_string(),
+                from_type: v.get_type().to_string(),
+                span: v.span(),
+                help: None,
+            }),
+        }
+    }
+
+    fn expected_type() -> Type {
+        Type::Float
+    }
 }
 
 impl FromValue for i64 {
@@ -42,128 +193,207 @@ impl FromValue for i64 {
             Value::Duration { val, .. } => Ok(val),
 
             v => Err(ShellError::CantConvert {
-                to_type: "int".into(),
+                to_type: Self::expected_type().to_string(),
                 from_type: v.get_type().to_string(),
                 span: v.span(),
                 help: None,
             }),
         }
     }
+
+    fn expected_type() -> Type {
+        Type::Int
+    }
 }
 
-impl FromValue for Spanned<f64> {
-    fn from_value(v: Value) -> Result<Self, ShellError> {
-        let span = v.span();
-        match v {
-            Value::Int { val, .. } => Ok(Spanned {
-                item: val as f64,
-                span,
-            }),
-            Value::Float { val, .. } => Ok(Spanned { item: val, span }),
+macro_rules! impl_from_value_for_int {
+    ($type:ty) => {
+        impl FromValue for $type {
+            fn from_value(v: Value) -> Result<Self, ShellError> {
+                let span = v.span();
+                let int = i64::from_value(v)?;
+                const MIN: i64 = <$type>::MIN as i64;
+                const MAX: i64 = <$type>::MAX as i64;
+                #[allow(overlapping_range_endpoints)] // calculating MIN-1 is not possible for i64::MIN
+                #[allow(unreachable_patterns)] // isize might max out i64 number range
+                <$type>::try_from(int).map_err(|_| match int {
+                    MIN..=MAX => unreachable!(
+                        "int should be within the valid range for {}",
+                        stringify!($type)
+                    ),
+                    i64::MIN..=MIN => ShellError::GenericError {
+                        error: "Integer too small".to_string(),
+                        msg: format!("{int} is smaller than {}", <$type>::MIN),
+                        span: Some(span),
+                        help: None,
+                        inner: vec![],
+                    },
+                    MAX..=i64::MAX => ShellError::GenericError {
+                        error: "Integer too large".to_string(),
+                        msg: format!("{int} is larger than {}", <$type>::MAX),
+                        span: Some(span),
+                        help: None,
+                        inner: vec![],
+                    },
+                })
+            }
 
+            fn expected_type() -> Type {
+                i64::expected_type()
+            }
+        }
+    };
+}
+
+impl_from_value_for_int!(i8);
+impl_from_value_for_int!(i16);
+impl_from_value_for_int!(i32);
+impl_from_value_for_int!(isize);
+
+macro_rules! impl_from_value_for_uint {
+    ($type:ty, $max:expr) => {
+        impl FromValue for $type {
+            fn from_value(v: Value) -> Result<Self, ShellError> {
+                let span = v.span();
+                const MAX: i64 = $max;
+                match v {
+                    Value::Int { val, .. }
+                    | Value::Filesize { val, .. }
+                    | Value::Duration { val, .. } => {
+                        match val {
+                            i64::MIN..=-1 => Err(ShellError::NeedsPositiveValue { span }),
+                            0..=MAX => Ok(val as $type),
+                            #[allow(unreachable_patterns)] // u64 will max out the i64 number range
+                            n => Err(ShellError::GenericError {
+                                error: "Integer too large".to_string(),
+                                msg: format!("{n} is larger than {MAX}"),
+                                span: Some(span),
+                                help: None,
+                                inner: vec![],
+                            }),
+                        }
+                    }
+                    v => Err(ShellError::CantConvert {
+                        to_type: Self::expected_type().to_string(),
+                        from_type: v.get_type().to_string(),
+                        span: v.span(),
+                        help: None,
+                    }),
+                }
+            }
+
+            fn expected_type() -> Type {
+                Type::Custom("non-negative int".to_string().into_boxed_str())
+            }
+        }
+    };
+}
+
+// Sadly we cannot implement FromValue for u8 without losing the impl of Vec<u8>,
+// Rust would find two possible implementations then, Vec<u8> and Vec<T = u8>,
+// and wouldn't compile.
+// The blanket implementation for Vec<T> is probably more useful than
+// implementing FromValue for u8.
+
+impl_from_value_for_uint!(u16, u16::MAX as i64);
+impl_from_value_for_uint!(u32, u32::MAX as i64);
+impl_from_value_for_uint!(u64, i64::MAX); // u64::Max would be -1 as i64
+#[cfg(target_pointer_width = "64")]
+impl_from_value_for_uint!(usize, i64::MAX);
+#[cfg(target_pointer_width = "32")]
+impl_from_value_for_uint!(usize, usize::MAX);
+
+impl FromValue for () {
+    fn from_value(v: Value) -> Result<Self, ShellError> {
+        match v {
+            Value::Nothing { .. } => Ok(()),
             v => Err(ShellError::CantConvert {
-                to_type: "float".into(),
+                to_type: Self::expected_type().to_string(),
                 from_type: v.get_type().to_string(),
                 span: v.span(),
                 help: None,
             }),
         }
     }
+
+    fn expected_type() -> Type {
+        Type::Nothing
+    }
 }
 
-impl FromValue for f64 {
+macro_rules! tuple_from_value {
+    ($template:literal, $($t:ident:$n:tt),+) => {
+        impl<$($t),+> FromValue for ($($t,)+) where $($t: FromValue,)+ {
+            fn from_value(v: Value) -> Result<Self, ShellError> {
+                let span = v.span();
+                match v {
+                    Value::List { vals, .. } => {
+                        let mut deque = VecDeque::from(vals);
+
+                        Ok(($(
+                            {
+                                let v = deque.pop_front().ok_or_else(|| ShellError::CantFindColumn {
+                                    col_name: $n.to_string(),
+                                    span: None,
+                                    src_span: span
+                                })?;
+                                $t::from_value(v)?
+                            },
+                        )*))
+                    },
+                    v => Err(ShellError::CantConvert {
+                        to_type: Self::expected_type().to_string(),
+                        from_type: v.get_type().to_string(),
+                        span: v.span(),
+                        help: None,
+                    }),
+                }
+            }
+
+            fn expected_type() -> Type {
+                Type::Custom(
+                    format!(
+                        $template,
+                        $($t::expected_type()),*
+                    )
+                    .into_boxed_str(),
+                )
+            }
+        }
+    };
+}
+
+// Tuples in std are implemented for up to 12 elements, so we do it here too.
+tuple_from_value!("[{}]", T0:0);
+tuple_from_value!("[{}, {}]", T0:0, T1:1);
+tuple_from_value!("[{}, {}, {}]", T0:0, T1:1, T2:2);
+tuple_from_value!("[{}, {}, {}, {}]", T0:0, T1:1, T2:2, T3:3);
+tuple_from_value!("[{}, {}, {}, {}, {}]", T0:0, T1:1, T2:2, T3:3, T4:4);
+tuple_from_value!("[{}, {}, {}, {}, {}, {}]", T0:0, T1:1, T2:2, T3:3, T4:4, T5:5);
+tuple_from_value!("[{}, {}, {}, {}, {}, {}, {}]", T0:0, T1:1, T2:2, T3:3, T4:4, T5:5, T6:6);
+tuple_from_value!("[{}, {}, {}, {}, {}, {}, {}, {}]", T0:0, T1:1, T2:2, T3:3, T4:4, T5:5, T6:6, T7:7);
+tuple_from_value!("[{}, {}, {}, {}, {}, {}, {}, {}, {}]", T0:0, T1:1, T2:2, T3:3, T4:4, T5:5, T6:6, T7:7, T8:8);
+tuple_from_value!("[{}, {}, {}, {}, {}, {}, {}, {}, {}, {}]", T0:0, T1:1, T2:2, T3:3, T4:4, T5:5, T6:6, T7:7, T8:8, T9:9);
+tuple_from_value!("[{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}]", T0:0, T1:1, T2:2, T3:3, T4:4, T5:5, T6:6, T7:7, T8:8, T9:9, T10:10);
+tuple_from_value!("[{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}]", T0:0, T1:1, T2:2, T3:3, T4:4, T5:5, T6:6, T7:7, T8:8, T9:9, T10:10, T11:11);
+
+// Other std Types
+
+impl FromValue for PathBuf {
     fn from_value(v: Value) -> Result<Self, ShellError> {
         match v {
-            Value::Float { val, .. } => Ok(val),
-            Value::Int { val, .. } => Ok(val as f64),
+            Value::String { val, .. } => Ok(val.into()),
             v => Err(ShellError::CantConvert {
-                to_type: "float".into(),
+                to_type: Self::expected_type().to_string(),
                 from_type: v.get_type().to_string(),
                 span: v.span(),
                 help: None,
             }),
         }
     }
-}
 
-impl FromValue for Spanned<usize> {
-    fn from_value(v: Value) -> Result<Self, ShellError> {
-        let span = v.span();
-        match v {
-            Value::Int { val, .. } => {
-                if val.is_negative() {
-                    Err(ShellError::NeedsPositiveValue { span })
-                } else {
-                    Ok(Spanned {
-                        item: val as usize,
-                        span,
-                    })
-                }
-            }
-            Value::Filesize { val, .. } => {
-                if val.is_negative() {
-                    Err(ShellError::NeedsPositiveValue { span })
-                } else {
-                    Ok(Spanned {
-                        item: val as usize,
-                        span,
-                    })
-                }
-            }
-            Value::Duration { val, .. } => {
-                if val.is_negative() {
-                    Err(ShellError::NeedsPositiveValue { span })
-                } else {
-                    Ok(Spanned {
-                        item: val as usize,
-                        span,
-                    })
-                }
-            }
-
-            v => Err(ShellError::CantConvert {
-                to_type: "non-negative int".into(),
-                from_type: v.get_type().to_string(),
-                span: v.span(),
-                help: None,
-            }),
-        }
-    }
-}
-
-impl FromValue for usize {
-    fn from_value(v: Value) -> Result<Self, ShellError> {
-        let span = v.span();
-        match v {
-            Value::Int { val, .. } => {
-                if val.is_negative() {
-                    Err(ShellError::NeedsPositiveValue { span })
-                } else {
-                    Ok(val as usize)
-                }
-            }
-            Value::Filesize { val, .. } => {
-                if val.is_negative() {
-                    Err(ShellError::NeedsPositiveValue { span })
-                } else {
-                    Ok(val as usize)
-                }
-            }
-            Value::Duration { val, .. } => {
-                if val.is_negative() {
-                    Err(ShellError::NeedsPositiveValue { span })
-                } else {
-                    Ok(val as usize)
-                }
-            }
-
-            v => Err(ShellError::CantConvert {
-                to_type: "non-negative int".into(),
-                from_type: v.get_type().to_string(),
-                span: v.span(),
-                help: None,
-            }),
-        }
+    fn expected_type() -> Type {
+        Type::String
     }
 }
 
@@ -174,176 +404,111 @@ impl FromValue for String {
             Value::CellPath { val, .. } => Ok(val.to_string()),
             Value::String { val, .. } => Ok(val),
             v => Err(ShellError::CantConvert {
-                to_type: "string".into(),
+                to_type: Self::expected_type().to_string(),
                 from_type: v.get_type().to_string(),
                 span: v.span(),
                 help: None,
             }),
         }
     }
-}
 
-impl FromValue for Spanned<String> {
-    fn from_value(v: Value) -> Result<Self, ShellError> {
-        let span = v.span();
-        Ok(Spanned {
-            item: match v {
-                Value::CellPath { val, .. } => val.to_string(),
-                Value::String { val, .. } => val,
-                v => {
-                    return Err(ShellError::CantConvert {
-                        to_type: "string".into(),
-                        from_type: v.get_type().to_string(),
-                        span: v.span(),
-                        help: None,
-                    })
-                }
-            },
-            span,
-        })
+    fn expected_type() -> Type {
+        Type::String
     }
 }
 
-impl FromValue for NuGlob {
+// This impl is different from Vec<T> as it reads from Value::Binary and
+// Value::String instead of Value::List.
+// This also denies implementing FromValue for u8.
+impl FromValue for Vec<u8> {
     fn from_value(v: Value) -> Result<Self, ShellError> {
-        // FIXME: we may want to fail a little nicer here
         match v {
-            Value::CellPath { val, .. } => Ok(NuGlob::Expand(val.to_string())),
-            Value::String { val, .. } => Ok(NuGlob::DoNotExpand(val)),
-            Value::Glob {
-                val,
-                no_expand: quoted,
-                ..
-            } => {
-                if quoted {
-                    Ok(NuGlob::DoNotExpand(val))
-                } else {
-                    Ok(NuGlob::Expand(val))
-                }
-            }
+            Value::Binary { val, .. } => Ok(val),
+            Value::String { val, .. } => Ok(val.into_bytes()),
             v => Err(ShellError::CantConvert {
-                to_type: "string".into(),
+                to_type: Self::expected_type().to_string(),
                 from_type: v.get_type().to_string(),
                 span: v.span(),
                 help: None,
             }),
         }
     }
-}
 
-impl FromValue for Spanned<NuGlob> {
-    fn from_value(v: Value) -> Result<Self, ShellError> {
-        let span = v.span();
-        Ok(Spanned {
-            item: match v {
-                Value::CellPath { val, .. } => NuGlob::Expand(val.to_string()),
-                Value::String { val, .. } => NuGlob::DoNotExpand(val),
-                Value::Glob {
-                    val,
-                    no_expand: quoted,
-                    ..
-                } => {
-                    if quoted {
-                        NuGlob::DoNotExpand(val)
-                    } else {
-                        NuGlob::Expand(val)
-                    }
-                }
-                v => {
-                    return Err(ShellError::CantConvert {
-                        to_type: "string".into(),
-                        from_type: v.get_type().to_string(),
-                        span: v.span(),
-                        help: None,
-                    })
-                }
-            },
-            span,
-        })
+    fn expected_type() -> Type {
+        Type::Binary
     }
 }
 
-impl FromValue for Vec<String> {
+// Blanket std Implementations
+
+impl<T> FromValue for Option<T>
+where
+    T: FromValue,
+{
     fn from_value(v: Value) -> Result<Self, ShellError> {
-        // FIXME: we may want to fail a little nicer here
         match v {
-            Value::List { vals, .. } => vals
-                .into_iter()
-                .map(|val| match val {
-                    Value::String { val, .. } => Ok(val),
-                    c => Err(ShellError::CantConvert {
-                        to_type: "string".into(),
-                        from_type: c.get_type().to_string(),
-                        span: c.span(),
-                        help: None,
-                    }),
-                })
-                .collect::<Result<Vec<String>, ShellError>>(),
-            v => Err(ShellError::CantConvert {
-                to_type: "string".into(),
-                from_type: v.get_type().to_string(),
-                span: v.span(),
-                help: None,
-            }),
+            Value::Nothing { .. } => Ok(None),
+            v => T::from_value(v).map(Option::Some),
         }
     }
+
+    fn expected_type() -> Type {
+        T::expected_type()
+    }
 }
 
-impl FromValue for Vec<Spanned<String>> {
+impl<V> FromValue for HashMap<String, V>
+where
+    V: FromValue,
+{
     fn from_value(v: Value) -> Result<Self, ShellError> {
-        // FIXME: we may want to fail a little nicer here
-        match v {
-            Value::List { vals, .. } => vals
-                .into_iter()
-                .map(|val| {
-                    let val_span = val.span();
-                    match val {
-                        Value::String { val, .. } => Ok(Spanned {
-                            item: val,
-                            span: val_span,
-                        }),
-                        c => Err(ShellError::CantConvert {
-                            to_type: "string".into(),
-                            from_type: c.get_type().to_string(),
-                            span: c.span(),
-                            help: None,
-                        }),
-                    }
-                })
-                .collect::<Result<Vec<Spanned<String>>, ShellError>>(),
-            v => Err(ShellError::CantConvert {
-                to_type: "string".into(),
-                from_type: v.get_type().to_string(),
-                span: v.span(),
-                help: None,
-            }),
-        }
+        let record = v.into_record()?;
+        let items: Result<Vec<(String, V)>, ShellError> = record
+            .into_iter()
+            .map(|(k, v)| Ok((k, V::from_value(v)?)))
+            .collect();
+        Ok(HashMap::from_iter(items?))
+    }
+
+    fn expected_type() -> Type {
+        Type::Record(vec![].into_boxed_slice())
     }
 }
 
-impl FromValue for Vec<bool> {
+impl<T> FromValue for Vec<T>
+where
+    T: FromValue,
+{
     fn from_value(v: Value) -> Result<Self, ShellError> {
         match v {
             Value::List { vals, .. } => vals
                 .into_iter()
-                .map(|val| match val {
-                    Value::Bool { val, .. } => Ok(val),
-                    c => Err(ShellError::CantConvert {
-                        to_type: "bool".into(),
-                        from_type: c.get_type().to_string(),
-                        span: c.span(),
-                        help: None,
-                    }),
-                })
-                .collect::<Result<Vec<bool>, ShellError>>(),
+                .map(|v| T::from_value(v))
+                .collect::<Result<Vec<T>, ShellError>>(),
             v => Err(ShellError::CantConvert {
-                to_type: "bool".into(),
+                to_type: Self::expected_type().to_string(),
                 from_type: v.get_type().to_string(),
                 span: v.span(),
                 help: None,
             }),
         }
     }
+
+    fn expected_type() -> Type {
+        Type::List(Box::new(T::expected_type()))
+    }
+}
+
+// Nu Types
+
+impl FromValue for Value {
+    fn from_value(v: Value) -> Result<Self, ShellError> {
+        Ok(v)
+    }
+
+    fn expected_type() -> Type {
+        Type::Any
+    }
 }
 
 impl FromValue for CellPath {
@@ -372,36 +537,25 @@ impl FromValue for CellPath {
                 }
             }
             x => Err(ShellError::CantConvert {
-                to_type: "cell path".into(),
+                to_type: Self::expected_type().to_string(),
                 from_type: x.get_type().to_string(),
                 span,
                 help: None,
             }),
         }
     }
-}
 
-impl FromValue for bool {
-    fn from_value(v: Value) -> Result<Self, ShellError> {
-        match v {
-            Value::Bool { val, .. } => Ok(val),
-            v => Err(ShellError::CantConvert {
-                to_type: "bool".into(),
-                from_type: v.get_type().to_string(),
-                span: v.span(),
-                help: None,
-            }),
-        }
+    fn expected_type() -> Type {
+        Type::CellPath
     }
 }
 
-impl FromValue for Spanned<bool> {
+impl FromValue for Closure {
     fn from_value(v: Value) -> Result<Self, ShellError> {
-        let span = v.span();
         match v {
-            Value::Bool { val, .. } => Ok(Spanned { item: val, span }),
+            Value::Closure { val, .. } => Ok(*val),
             v => Err(ShellError::CantConvert {
-                to_type: "bool".into(),
+                to_type: Self::expected_type().to_string(),
                 from_type: v.get_type().to_string(),
                 span: v.span(),
                 help: None,
@@ -415,28 +569,48 @@ impl FromValue for DateTime<FixedOffset> {
         match v {
             Value::Date { val, .. } => Ok(val),
             v => Err(ShellError::CantConvert {
-                to_type: "date".into(),
+                to_type: Self::expected_type().to_string(),
                 from_type: v.get_type().to_string(),
                 span: v.span(),
                 help: None,
             }),
         }
     }
+
+    fn expected_type() -> Type {
+        Type::Date
+    }
 }
 
-impl FromValue for Spanned<DateTime<FixedOffset>> {
+impl FromValue for NuGlob {
     fn from_value(v: Value) -> Result<Self, ShellError> {
-        let span = v.span();
+        // FIXME: we may want to fail a little nicer here
         match v {
-            Value::Date { val, .. } => Ok(Spanned { item: val, span }),
+            Value::CellPath { val, .. } => Ok(NuGlob::Expand(val.to_string())),
+            Value::String { val, .. } => Ok(NuGlob::DoNotExpand(val)),
+            Value::Glob {
+                val,
+                no_expand: quoted,
+                ..
+            } => {
+                if quoted {
+                    Ok(NuGlob::DoNotExpand(val))
+                } else {
+                    Ok(NuGlob::Expand(val))
+                }
+            }
             v => Err(ShellError::CantConvert {
-                to_type: "date".into(),
+                to_type: Self::expected_type().to_string(),
                 from_type: v.get_type().to_string(),
                 span: v.span(),
                 help: None,
             }),
         }
     }
+
+    fn expected_type() -> Type {
+        Type::String
+    }
 }
 
 impl FromValue for Range {
@@ -444,94 +618,16 @@ impl FromValue for Range {
         match v {
             Value::Range { val, .. } => Ok(*val),
             v => Err(ShellError::CantConvert {
-                to_type: "range".into(),
+                to_type: Self::expected_type().to_string(),
                 from_type: v.get_type().to_string(),
                 span: v.span(),
                 help: None,
             }),
         }
     }
-}
 
-impl FromValue for Spanned<Range> {
-    fn from_value(v: Value) -> Result<Self, ShellError> {
-        let span = v.span();
-        match v {
-            Value::Range { val, .. } => Ok(Spanned { item: *val, span }),
-            v => Err(ShellError::CantConvert {
-                to_type: "range".into(),
-                from_type: v.get_type().to_string(),
-                span: v.span(),
-                help: None,
-            }),
-        }
-    }
-}
-
-impl FromValue for Vec<u8> {
-    fn from_value(v: Value) -> Result<Self, ShellError> {
-        match v {
-            Value::Binary { val, .. } => Ok(val),
-            Value::String { val, .. } => Ok(val.into_bytes()),
-            v => Err(ShellError::CantConvert {
-                to_type: "binary data".into(),
-                from_type: v.get_type().to_string(),
-                span: v.span(),
-                help: None,
-            }),
-        }
-    }
-}
-
-impl FromValue for Spanned<Vec<u8>> {
-    fn from_value(v: Value) -> Result<Self, ShellError> {
-        let span = v.span();
-        match v {
-            Value::Binary { val, .. } => Ok(Spanned { item: val, span }),
-            Value::String { val, .. } => Ok(Spanned {
-                item: val.into_bytes(),
-                span,
-            }),
-            v => Err(ShellError::CantConvert {
-                to_type: "binary data".into(),
-                from_type: v.get_type().to_string(),
-                span: v.span(),
-                help: None,
-            }),
-        }
-    }
-}
-
-impl FromValue for Spanned<PathBuf> {
-    fn from_value(v: Value) -> Result<Self, ShellError> {
-        let span = v.span();
-        match v {
-            Value::String { val, .. } => Ok(Spanned {
-                item: val.into(),
-                span,
-            }),
-            v => Err(ShellError::CantConvert {
-                to_type: "range".into(),
-                from_type: v.get_type().to_string(),
-                span: v.span(),
-                help: None,
-            }),
-        }
-    }
-}
-
-impl FromValue for Vec<Value> {
-    fn from_value(v: Value) -> Result<Self, ShellError> {
-        // FIXME: we may want to fail a little nicer here
-        match v {
-            Value::List { vals, .. } => Ok(vals),
-            v => Err(ShellError::CantConvert {
-                to_type: "Vector of values".into(),
-                from_type: v.get_type().to_string(),
-                span: v.span(),
-                help: None,
-            }),
-        }
+    fn expected_type() -> Type {
+        Type::Range
     }
 }
 
@@ -540,7 +636,7 @@ impl FromValue for Record {
         match v {
             Value::Record { val, .. } => Ok(val.into_owned()),
             v => Err(ShellError::CantConvert {
-                to_type: "Record".into(),
+                to_type: Self::expected_type().to_string(),
                 from_type: v.get_type().to_string(),
                 span: v.span(),
                 help: None,
@@ -549,31 +645,39 @@ impl FromValue for Record {
     }
 }
 
-impl FromValue for Closure {
-    fn from_value(v: Value) -> Result<Self, ShellError> {
-        match v {
-            Value::Closure { val, .. } => Ok(*val),
-            v => Err(ShellError::CantConvert {
-                to_type: "Closure".into(),
-                from_type: v.get_type().to_string(),
-                span: v.span(),
-                help: None,
-            }),
-        }
-    }
-}
+// Blanket Nu Implementations
 
-impl FromValue for Spanned<Closure> {
+impl<T> FromValue for Spanned<T>
+where
+    T: FromValue,
+{
     fn from_value(v: Value) -> Result<Self, ShellError> {
         let span = v.span();
-        match v {
-            Value::Closure { val, .. } => Ok(Spanned { item: *val, span }),
-            v => Err(ShellError::CantConvert {
-                to_type: "Closure".into(),
-                from_type: v.get_type().to_string(),
-                span: v.span(),
-                help: None,
-            }),
-        }
+        Ok(Spanned {
+            item: T::from_value(v)?,
+            span,
+        })
+    }
+
+    fn expected_type() -> Type {
+        T::expected_type()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::{engine::Closure, FromValue, Record, Type};
+
+    #[test]
+    fn expected_type_default_impl() {
+        assert_eq!(
+            Record::expected_type(),
+            Type::Custom("Record".to_string().into_boxed_str())
+        );
+
+        assert_eq!(
+            Closure::expected_type(),
+            Type::Custom("Closure".to_string().into_boxed_str())
+        );
     }
 }
diff --git a/crates/nu-protocol/src/value/into_value.rs b/crates/nu-protocol/src/value/into_value.rs
new file mode 100644
index 0000000000..c27b19b651
--- /dev/null
+++ b/crates/nu-protocol/src/value/into_value.rs
@@ -0,0 +1,196 @@
+use std::collections::HashMap;
+
+use crate::{Record, ShellError, Span, Value};
+
+/// A trait for converting a value into a [`Value`].
+///
+/// This conversion is infallible, for fallible conversions use [`TryIntoValue`].
+///
+/// # Derivable
+/// This trait can be used with `#[derive]`.
+/// When derived on structs with named fields, the resulting value representation will use
+/// [`Value::Record`], where each field of the record corresponds to a field of the struct.
+/// For structs with unnamed fields, the value representation will be [`Value::List`], with all
+/// fields inserted into a list.
+/// Unit structs will be represented as [`Value::Nothing`] since they contain no data.
+///
+/// Only enums with no fields may derive this trait.
+/// The resulting value representation will be the name of the variant as a [`Value::String`].
+/// By default, variant names will be converted to ["snake_case"](convert_case::Case::Snake).
+/// You can customize the case conversion using `#[nu_value(rename_all = "kebab-case")]` on the enum.
+/// All deterministic and useful case conversions provided by [`convert_case::Case`] are supported
+/// by specifying the case name followed by "case".
+/// Also all values for
+/// [`#[serde(rename_all = "...")]`](https://serde.rs/container-attrs.html#rename_all) are valid
+/// here.
+///
+/// ```
+/// # use nu_protocol::{IntoValue, Value, Span};
+/// #[derive(IntoValue)]
+/// #[nu_value(rename_all = "COBOL-CASE")]
+/// enum Bird {
+///     MountainEagle,
+///     ForestOwl,
+///     RiverDuck,
+/// }
+///
+/// assert_eq!(
+///     Bird::RiverDuck.into_value(Span::unknown()),
+///     Value::test_string("RIVER-DUCK")
+/// );
+/// ```
+pub trait IntoValue: Sized {
+    /// Converts the given value to a [`Value`].
+    fn into_value(self, span: Span) -> Value;
+}
+
+// Primitive Types
+
+impl<T, const N: usize> IntoValue for [T; N]
+where
+    T: IntoValue,
+{
+    fn into_value(self, span: Span) -> Value {
+        Vec::from(self).into_value(span)
+    }
+}
+
+macro_rules! primitive_into_value {
+    ($type:ty, $method:ident) => {
+        primitive_into_value!($type => $type, $method);
+    };
+
+    ($type:ty => $as_type:ty, $method:ident) => {
+        impl IntoValue for $type {
+            fn into_value(self, span: Span) -> Value {
+                Value::$method(<$as_type>::from(self), span)
+            }
+        }
+    };
+}
+
+primitive_into_value!(bool, bool);
+primitive_into_value!(char, string);
+primitive_into_value!(f32 => f64, float);
+primitive_into_value!(f64, float);
+primitive_into_value!(i8 => i64, int);
+primitive_into_value!(i16 => i64, int);
+primitive_into_value!(i32 => i64, int);
+primitive_into_value!(i64, int);
+primitive_into_value!(u8 => i64, int);
+primitive_into_value!(u16 => i64, int);
+primitive_into_value!(u32 => i64, int);
+// u64 and usize may be truncated as Value only supports i64.
+
+impl IntoValue for isize {
+    fn into_value(self, span: Span) -> Value {
+        Value::int(self as i64, span)
+    }
+}
+
+impl IntoValue for () {
+    fn into_value(self, span: Span) -> Value {
+        Value::nothing(span)
+    }
+}
+
+macro_rules! tuple_into_value {
+    ($($t:ident:$n:tt),+) => {
+        impl<$($t),+> IntoValue for ($($t,)+) where $($t: IntoValue,)+ {
+            fn into_value(self, span: Span) -> Value {
+                let vals = vec![$(self.$n.into_value(span)),+];
+                Value::list(vals, span)
+            }
+        }
+    }
+}
+
+// Tuples in std are implemented for up to 12 elements, so we do it here too.
+tuple_into_value!(T0:0);
+tuple_into_value!(T0:0, T1:1);
+tuple_into_value!(T0:0, T1:1, T2:2);
+tuple_into_value!(T0:0, T1:1, T2:2, T3:3);
+tuple_into_value!(T0:0, T1:1, T2:2, T3:3, T4:4);
+tuple_into_value!(T0:0, T1:1, T2:2, T3:3, T4:4, T5:5);
+tuple_into_value!(T0:0, T1:1, T2:2, T3:3, T4:4, T5:5, T6:6);
+tuple_into_value!(T0:0, T1:1, T2:2, T3:3, T4:4, T5:5, T6:6, T7:7);
+tuple_into_value!(T0:0, T1:1, T2:2, T3:3, T4:4, T5:5, T6:6, T7:7, T8:8);
+tuple_into_value!(T0:0, T1:1, T2:2, T3:3, T4:4, T5:5, T6:6, T7:7, T8:8, T9:9);
+tuple_into_value!(T0:0, T1:1, T2:2, T3:3, T4:4, T5:5, T6:6, T7:7, T8:8, T9:9, T10:10);
+tuple_into_value!(T0:0, T1:1, T2:2, T3:3, T4:4, T5:5, T6:6, T7:7, T8:8, T9:9, T10:10, T11:11);
+
+// Other std Types
+
+impl IntoValue for String {
+    fn into_value(self, span: Span) -> Value {
+        Value::string(self, span)
+    }
+}
+
+impl<T> IntoValue for Vec<T>
+where
+    T: IntoValue,
+{
+    fn into_value(self, span: Span) -> Value {
+        Value::list(self.into_iter().map(|v| v.into_value(span)).collect(), span)
+    }
+}
+
+impl<T> IntoValue for Option<T>
+where
+    T: IntoValue,
+{
+    fn into_value(self, span: Span) -> Value {
+        match self {
+            Some(v) => v.into_value(span),
+            None => Value::nothing(span),
+        }
+    }
+}
+
+impl<V> IntoValue for HashMap<String, V>
+where
+    V: IntoValue,
+{
+    fn into_value(self, span: Span) -> Value {
+        let mut record = Record::new();
+        for (k, v) in self.into_iter() {
+            // Using `push` is fine as a hashmaps have unique keys.
+            // To ensure this uniqueness, we only allow hashmaps with strings as
+            // keys and not keys which implement `Into<String>` or `ToString`.
+            record.push(k, v.into_value(span));
+        }
+        Value::record(record, span)
+    }
+}
+
+// Nu Types
+
+impl IntoValue for Value {
+    fn into_value(self, span: Span) -> Value {
+        self.with_span(span)
+    }
+}
+
+// TODO: use this type for all the `into_value` methods that types implement but return a Result
+/// A trait for trying to convert a value into a `Value`.
+///
+/// Types like streams may fail while collecting the `Value`,
+/// for these types it is useful to implement a fallible variant.
+///
+/// This conversion is fallible, for infallible conversions use [`IntoValue`].
+/// All types that implement `IntoValue` will automatically implement this trait.
+pub trait TryIntoValue: Sized {
+    // TODO: instead of ShellError, maybe we could have a IntoValueError that implements Into<ShellError>
+    /// Tries to convert the given value into a `Value`.
+    fn try_into_value(self, span: Span) -> Result<Value, ShellError>;
+}
+
+impl<T> TryIntoValue for T
+where
+    T: IntoValue,
+{
+    fn try_into_value(self, span: Span) -> Result<Value, ShellError> {
+        Ok(self.into_value(span))
+    }
+}
diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs
index f924218b79..df030ad3e9 100644
--- a/crates/nu-protocol/src/value/mod.rs
+++ b/crates/nu-protocol/src/value/mod.rs
@@ -4,7 +4,10 @@ mod filesize;
 mod from;
 mod from_value;
 mod glob;
+mod into_value;
 mod range;
+#[cfg(test)]
+mod test_derive;
 
 pub mod record;
 pub use custom_value::CustomValue;
@@ -12,6 +15,7 @@ pub use duration::*;
 pub use filesize::*;
 pub use from_value::FromValue;
 pub use glob::*;
+pub use into_value::{IntoValue, TryIntoValue};
 pub use range::{FloatRange, IntRange, Range};
 pub use record::Record;
 
@@ -1089,7 +1093,7 @@ impl Value {
                             } else {
                                 return Err(ShellError::CantFindColumn {
                                     col_name: column_name.clone(),
-                                    span: *origin_span,
+                                    span: Some(*origin_span),
                                     src_span: span,
                                 });
                             }
@@ -1126,7 +1130,7 @@ impl Value {
                                             } else {
                                                 Err(ShellError::CantFindColumn {
                                                     col_name: column_name.clone(),
-                                                    span: *origin_span,
+                                                    span: Some(*origin_span),
                                                     src_span: val_span,
                                                 })
                                             }
@@ -1136,7 +1140,7 @@ impl Value {
                                         }
                                         _ => Err(ShellError::CantFindColumn {
                                             col_name: column_name.clone(),
-                                            span: *origin_span,
+                                            span: Some(*origin_span),
                                             src_span: val_span,
                                         }),
                                     }
@@ -1237,7 +1241,7 @@ impl Value {
                                 v => {
                                     return Err(ShellError::CantFindColumn {
                                         col_name: col_name.clone(),
-                                        span: *span,
+                                        span: Some(*span),
                                         src_span: v.span(),
                                     });
                                 }
@@ -1262,7 +1266,7 @@ impl Value {
                     v => {
                         return Err(ShellError::CantFindColumn {
                             col_name: col_name.clone(),
-                            span: *span,
+                            span: Some(*span),
                             src_span: v.span(),
                         });
                     }
@@ -1342,7 +1346,7 @@ impl Value {
                                     } else {
                                         return Err(ShellError::CantFindColumn {
                                             col_name: col_name.clone(),
-                                            span: *span,
+                                            span: Some(*span),
                                             src_span: v_span,
                                         });
                                     }
@@ -1351,7 +1355,7 @@ impl Value {
                                 v => {
                                     return Err(ShellError::CantFindColumn {
                                         col_name: col_name.clone(),
-                                        span: *span,
+                                        span: Some(*span),
                                         src_span: v.span(),
                                     });
                                 }
@@ -1364,7 +1368,7 @@ impl Value {
                         } else {
                             return Err(ShellError::CantFindColumn {
                                 col_name: col_name.clone(),
-                                span: *span,
+                                span: Some(*span),
                                 src_span: v_span,
                             });
                         }
@@ -1373,7 +1377,7 @@ impl Value {
                     v => {
                         return Err(ShellError::CantFindColumn {
                             col_name: col_name.clone(),
-                            span: *span,
+                            span: Some(*span),
                             src_span: v.span(),
                         });
                     }
@@ -1427,7 +1431,7 @@ impl Value {
                                         if record.to_mut().remove(col_name).is_none() && !optional {
                                             return Err(ShellError::CantFindColumn {
                                                 col_name: col_name.clone(),
-                                                span: *span,
+                                                span: Some(*span),
                                                 src_span: v_span,
                                             });
                                         }
@@ -1435,7 +1439,7 @@ impl Value {
                                     v => {
                                         return Err(ShellError::CantFindColumn {
                                             col_name: col_name.clone(),
-                                            span: *span,
+                                            span: Some(*span),
                                             src_span: v.span(),
                                         });
                                     }
@@ -1447,7 +1451,7 @@ impl Value {
                             if record.to_mut().remove(col_name).is_none() && !optional {
                                 return Err(ShellError::CantFindColumn {
                                     col_name: col_name.clone(),
-                                    span: *span,
+                                    span: Some(*span),
                                     src_span: v_span,
                                 });
                             }
@@ -1455,7 +1459,7 @@ impl Value {
                         }
                         v => Err(ShellError::CantFindColumn {
                             col_name: col_name.clone(),
-                            span: *span,
+                            span: Some(*span),
                             src_span: v.span(),
                         }),
                     },
@@ -1504,7 +1508,7 @@ impl Value {
                                         } else if !optional {
                                             return Err(ShellError::CantFindColumn {
                                                 col_name: col_name.clone(),
-                                                span: *span,
+                                                span: Some(*span),
                                                 src_span: v_span,
                                             });
                                         }
@@ -1512,7 +1516,7 @@ impl Value {
                                     v => {
                                         return Err(ShellError::CantFindColumn {
                                             col_name: col_name.clone(),
-                                            span: *span,
+                                            span: Some(*span),
                                             src_span: v.span(),
                                         });
                                     }
@@ -1526,7 +1530,7 @@ impl Value {
                             } else if !optional {
                                 return Err(ShellError::CantFindColumn {
                                     col_name: col_name.clone(),
-                                    span: *span,
+                                    span: Some(*span),
                                     src_span: v_span,
                                 });
                             }
@@ -1534,7 +1538,7 @@ impl Value {
                         }
                         v => Err(ShellError::CantFindColumn {
                             col_name: col_name.clone(),
-                            span: *span,
+                            span: Some(*span),
                             src_span: v.span(),
                         }),
                     },
diff --git a/crates/nu-protocol/src/value/test_derive.rs b/crates/nu-protocol/src/value/test_derive.rs
new file mode 100644
index 0000000000..1865a05418
--- /dev/null
+++ b/crates/nu-protocol/src/value/test_derive.rs
@@ -0,0 +1,386 @@
+use crate::{record, FromValue, IntoValue, Record, Span, Value};
+use std::collections::HashMap;
+
+// Make nu_protocol available in this namespace, consumers of this crate will
+// have this without such an export.
+// The derive macro fully qualifies paths to "nu_protocol".
+use crate as nu_protocol;
+
+trait IntoTestValue {
+    fn into_test_value(self) -> Value;
+}
+
+impl<T> IntoTestValue for T
+where
+    T: IntoValue,
+{
+    fn into_test_value(self) -> Value {
+        self.into_value(Span::test_data())
+    }
+}
+
+#[derive(IntoValue, FromValue, Debug, PartialEq)]
+struct NamedFieldsStruct<T>
+where
+    T: IntoValue + FromValue,
+{
+    array: [u16; 4],
+    bool: bool,
+    char: char,
+    f32: f32,
+    f64: f64,
+    i8: i8,
+    i16: i16,
+    i32: i32,
+    i64: i64,
+    isize: isize,
+    u16: u16,
+    u32: u32,
+    unit: (),
+    tuple: (u32, bool),
+    some: Option<u32>,
+    none: Option<u32>,
+    vec: Vec<T>,
+    string: String,
+    hashmap: HashMap<String, u32>,
+    nested: Nestee,
+}
+
+#[derive(IntoValue, FromValue, Debug, PartialEq)]
+struct Nestee {
+    u32: u32,
+    some: Option<u32>,
+    none: Option<u32>,
+}
+
+impl NamedFieldsStruct<u32> {
+    fn make() -> Self {
+        Self {
+            array: [1, 2, 3, 4],
+            bool: true,
+            char: 'a',
+            f32: std::f32::consts::PI,
+            f64: std::f64::consts::E,
+            i8: 127,
+            i16: -32768,
+            i32: 2147483647,
+            i64: -9223372036854775808,
+            isize: 2,
+            u16: 65535,
+            u32: 4294967295,
+            unit: (),
+            tuple: (1, true),
+            some: Some(123),
+            none: None,
+            vec: vec![10, 20, 30],
+            string: "string".to_string(),
+            hashmap: HashMap::from_iter([("a".to_string(), 10), ("b".to_string(), 20)]),
+            nested: Nestee {
+                u32: 3,
+                some: Some(42),
+                none: None,
+            },
+        }
+    }
+
+    fn value() -> Value {
+        Value::test_record(record! {
+            "array" => Value::test_list(vec![
+                Value::test_int(1),
+                Value::test_int(2),
+                Value::test_int(3),
+                Value::test_int(4)
+            ]),
+            "bool" => Value::test_bool(true),
+            "char" => Value::test_string('a'),
+            "f32" => Value::test_float(std::f32::consts::PI.into()),
+            "f64" => Value::test_float(std::f64::consts::E),
+            "i8" => Value::test_int(127),
+            "i16" => Value::test_int(-32768),
+            "i32" => Value::test_int(2147483647),
+            "i64" => Value::test_int(-9223372036854775808),
+            "isize" => Value::test_int(2),
+            "u16" => Value::test_int(65535),
+            "u32" => Value::test_int(4294967295),
+            "unit" => Value::test_nothing(),
+            "tuple" => Value::test_list(vec![
+                Value::test_int(1),
+                Value::test_bool(true)
+            ]),
+            "some" => Value::test_int(123),
+            "none" => Value::test_nothing(),
+            "vec" => Value::test_list(vec![
+                Value::test_int(10),
+                Value::test_int(20),
+                Value::test_int(30)
+            ]),
+            "string" => Value::test_string("string"),
+            "hashmap" => Value::test_record(record! {
+                "a" => Value::test_int(10),
+                "b" => Value::test_int(20)
+            }),
+            "nested" => Value::test_record(record! {
+                "u32" => Value::test_int(3),
+                "some" => Value::test_int(42),
+                "none" => Value::test_nothing(),
+            })
+        })
+    }
+}
+
+#[test]
+fn named_fields_struct_into_value() {
+    let expected = NamedFieldsStruct::value();
+    let actual = NamedFieldsStruct::make().into_test_value();
+    assert_eq!(expected, actual);
+}
+
+#[test]
+fn named_fields_struct_from_value() {
+    let expected = NamedFieldsStruct::make();
+    let actual = NamedFieldsStruct::from_value(NamedFieldsStruct::value()).unwrap();
+    assert_eq!(expected, actual);
+}
+
+#[test]
+fn named_fields_struct_roundtrip() {
+    let expected = NamedFieldsStruct::make();
+    let actual =
+        NamedFieldsStruct::from_value(NamedFieldsStruct::make().into_test_value()).unwrap();
+    assert_eq!(expected, actual);
+
+    let expected = NamedFieldsStruct::value();
+    let actual = NamedFieldsStruct::<u32>::from_value(NamedFieldsStruct::value())
+        .unwrap()
+        .into_test_value();
+    assert_eq!(expected, actual);
+}
+
+#[test]
+fn named_fields_struct_missing_value() {
+    let value = Value::test_record(Record::new());
+    let res: Result<NamedFieldsStruct<u32>, _> = NamedFieldsStruct::from_value(value);
+    assert!(res.is_err());
+}
+
+#[test]
+fn named_fields_struct_incorrect_type() {
+    // Should work for every type that is not a record.
+    let value = Value::test_nothing();
+    let res: Result<NamedFieldsStruct<u32>, _> = NamedFieldsStruct::from_value(value);
+    assert!(res.is_err());
+}
+
+#[derive(IntoValue, FromValue, Debug, PartialEq)]
+struct UnnamedFieldsStruct<T>(u32, String, T)
+where
+    T: IntoValue + FromValue;
+
+impl UnnamedFieldsStruct<f64> {
+    fn make() -> Self {
+        UnnamedFieldsStruct(420, "Hello, tuple!".to_string(), 33.33)
+    }
+
+    fn value() -> Value {
+        Value::test_list(vec![
+            Value::test_int(420),
+            Value::test_string("Hello, tuple!"),
+            Value::test_float(33.33),
+        ])
+    }
+}
+
+#[test]
+fn unnamed_fields_struct_into_value() {
+    let expected = UnnamedFieldsStruct::value();
+    let actual = UnnamedFieldsStruct::make().into_test_value();
+    assert_eq!(expected, actual);
+}
+
+#[test]
+fn unnamed_fields_struct_from_value() {
+    let expected = UnnamedFieldsStruct::make();
+    let value = UnnamedFieldsStruct::value();
+    let actual = UnnamedFieldsStruct::from_value(value).unwrap();
+    assert_eq!(expected, actual);
+}
+
+#[test]
+fn unnamed_fields_struct_roundtrip() {
+    let expected = UnnamedFieldsStruct::make();
+    let actual =
+        UnnamedFieldsStruct::from_value(UnnamedFieldsStruct::make().into_test_value()).unwrap();
+    assert_eq!(expected, actual);
+
+    let expected = UnnamedFieldsStruct::value();
+    let actual = UnnamedFieldsStruct::<f64>::from_value(UnnamedFieldsStruct::value())
+        .unwrap()
+        .into_test_value();
+    assert_eq!(expected, actual);
+}
+
+#[test]
+fn unnamed_fields_struct_missing_value() {
+    let value = Value::test_list(vec![]);
+    let res: Result<UnnamedFieldsStruct<f64>, _> = UnnamedFieldsStruct::from_value(value);
+    assert!(res.is_err());
+}
+
+#[test]
+fn unnamed_fields_struct_incorrect_type() {
+    // Should work for every type that is not a record.
+    let value = Value::test_nothing();
+    let res: Result<UnnamedFieldsStruct<f64>, _> = UnnamedFieldsStruct::from_value(value);
+    assert!(res.is_err());
+}
+
+#[derive(IntoValue, FromValue, Debug, PartialEq)]
+struct UnitStruct;
+
+#[test]
+fn unit_struct_into_value() {
+    let expected = Value::test_nothing();
+    let actual = UnitStruct.into_test_value();
+    assert_eq!(expected, actual);
+}
+
+#[test]
+fn unit_struct_from_value() {
+    let expected = UnitStruct;
+    let actual = UnitStruct::from_value(Value::test_nothing()).unwrap();
+    assert_eq!(expected, actual);
+}
+
+#[test]
+fn unit_struct_roundtrip() {
+    let expected = UnitStruct;
+    let actual = UnitStruct::from_value(UnitStruct.into_test_value()).unwrap();
+    assert_eq!(expected, actual);
+
+    let expected = Value::test_nothing();
+    let actual = UnitStruct::from_value(Value::test_nothing())
+        .unwrap()
+        .into_test_value();
+    assert_eq!(expected, actual);
+}
+
+#[derive(IntoValue, FromValue, Debug, PartialEq)]
+enum Enum {
+    AlphaOne,
+    BetaTwo,
+    CharlieThree,
+}
+
+impl Enum {
+    fn make() -> [Self; 3] {
+        [Enum::AlphaOne, Enum::BetaTwo, Enum::CharlieThree]
+    }
+
+    fn value() -> Value {
+        Value::test_list(vec![
+            Value::test_string("alpha_one"),
+            Value::test_string("beta_two"),
+            Value::test_string("charlie_three"),
+        ])
+    }
+}
+
+#[test]
+fn enum_into_value() {
+    let expected = Enum::value();
+    let actual = Enum::make().into_test_value();
+    assert_eq!(expected, actual);
+}
+
+#[test]
+fn enum_from_value() {
+    let expected = Enum::make();
+    let actual = <[Enum; 3]>::from_value(Enum::value()).unwrap();
+    assert_eq!(expected, actual);
+}
+
+#[test]
+fn enum_roundtrip() {
+    let expected = Enum::make();
+    let actual = <[Enum; 3]>::from_value(Enum::make().into_test_value()).unwrap();
+    assert_eq!(expected, actual);
+
+    let expected = Enum::value();
+    let actual = <[Enum; 3]>::from_value(Enum::value())
+        .unwrap()
+        .into_test_value();
+    assert_eq!(expected, actual);
+}
+
+#[test]
+fn enum_unknown_variant() {
+    let value = Value::test_string("delta_four");
+    let res = Enum::from_value(value);
+    assert!(res.is_err());
+}
+
+#[test]
+fn enum_incorrect_type() {
+    // Should work for every type that is not a record.
+    let value = Value::test_nothing();
+    let res = Enum::from_value(value);
+    assert!(res.is_err());
+}
+
+// Generate the `Enum` from before but with all possible `rename_all` variants.
+macro_rules! enum_rename_all {
+    ($($ident:ident: $case:literal => [$a1:literal, $b2:literal, $c3:literal]),*) => {
+        $(
+            #[derive(Debug, PartialEq, IntoValue, FromValue)]
+            #[nu_value(rename_all = $case)]
+            enum $ident {
+                AlphaOne,
+                BetaTwo,
+                CharlieThree
+            }
+
+            impl $ident {
+                fn make() -> [Self; 3] {
+                    [Self::AlphaOne, Self::BetaTwo, Self::CharlieThree]
+                }
+
+                fn value() -> Value {
+                    Value::test_list(vec![
+                        Value::test_string($a1),
+                        Value::test_string($b2),
+                        Value::test_string($c3),
+                    ])
+                }
+            }
+        )*
+
+        #[test]
+        fn enum_rename_all_into_value() {$({
+            let expected = $ident::value();
+            let actual = $ident::make().into_test_value();
+            assert_eq!(expected, actual);
+        })*}
+
+        #[test]
+        fn enum_rename_all_from_value() {$({
+            let expected = $ident::make();
+            let actual = <[$ident; 3]>::from_value($ident::value()).unwrap();
+            assert_eq!(expected, actual);
+        })*}
+    }
+}
+
+enum_rename_all! {
+    Upper: "UPPER CASE" => ["ALPHA ONE", "BETA TWO", "CHARLIE THREE"],
+    Lower: "lower case" => ["alpha one", "beta two", "charlie three"],
+    Title: "Title Case" => ["Alpha One", "Beta Two", "Charlie Three"],
+    Camel: "camelCase" => ["alphaOne", "betaTwo", "charlieThree"],
+    Pascal: "PascalCase" => ["AlphaOne", "BetaTwo", "CharlieThree"],
+    Snake: "snake_case" => ["alpha_one", "beta_two", "charlie_three"],
+    UpperSnake: "UPPER_SNAKE_CASE" => ["ALPHA_ONE", "BETA_TWO", "CHARLIE_THREE"],
+    Kebab: "kebab-case" => ["alpha-one", "beta-two", "charlie-three"],
+    Cobol: "COBOL-CASE" => ["ALPHA-ONE", "BETA-TWO", "CHARLIE-THREE"],
+    Train: "Train-Case" => ["Alpha-One", "Beta-Two", "Charlie-Three"],
+    Flat: "flatcase" => ["alphaone", "betatwo", "charliethree"],
+    UpperFlat: "UPPERFLATCASE" => ["ALPHAONE", "BETATWO", "CHARLIETHREE"]
+}
diff --git a/crates/nu_plugin_custom_values/src/cool_custom_value.rs b/crates/nu_plugin_custom_values/src/cool_custom_value.rs
index d838aa3f9e..ea0cf8ec92 100644
--- a/crates/nu_plugin_custom_values/src/cool_custom_value.rs
+++ b/crates/nu_plugin_custom_values/src/cool_custom_value.rs
@@ -87,7 +87,7 @@ impl CustomValue for CoolCustomValue {
         } else {
             Err(ShellError::CantFindColumn {
                 col_name: column_name,
-                span: path_span,
+                span: Some(path_span),
                 src_span: self_span,
             })
         }

From 97876fb0b4fd423a67401e395809635f1a571375 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Tue, 18 Jun 2024 05:16:08 -0700
Subject: [PATCH 0111/1072] Fix compilation for
 `nu_protocol::value::from_value` on 32-bit targets (#13169)

# Description

Needed to cast `usize::MAX` to `i64` for it to compile properly

cc @cptpiepmatz
---
 crates/nu-protocol/src/value/from_value.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-protocol/src/value/from_value.rs b/crates/nu-protocol/src/value/from_value.rs
index 1033eb03b2..1c3bc7dfd4 100644
--- a/crates/nu-protocol/src/value/from_value.rs
+++ b/crates/nu-protocol/src/value/from_value.rs
@@ -301,7 +301,7 @@ impl_from_value_for_uint!(u64, i64::MAX); // u64::Max would be -1 as i64
 #[cfg(target_pointer_width = "64")]
 impl_from_value_for_uint!(usize, i64::MAX);
 #[cfg(target_pointer_width = "32")]
-impl_from_value_for_uint!(usize, usize::MAX);
+impl_from_value_for_uint!(usize, usize::MAX as i64);
 
 impl FromValue for () {
     fn from_value(v: Value) -> Result<Self, ShellError> {

From ae6489f04b1cc274ff2566cfa5cfdfecf2003d89 Mon Sep 17 00:00:00 2001
From: "Edwin.JH.Lee" <edwinjhlee@users.noreply.github.com>
Date: Tue, 18 Jun 2024 20:16:42 +0800
Subject: [PATCH 0112/1072] Update README.md (#13157)

Add x-cmd in the support list.

# Description

We like nushell, so we manage to add x-cmd support in the nushell.
Here is our demo.

https://www.x-cmd.com/mod/nu

Thank you.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 0f1114c992..9b88a92528 100644
--- a/README.md
+++ b/README.md
@@ -222,6 +222,7 @@ Please submit an issue or PR to be added to this list.
 -   [clap](https://github.com/clap-rs/clap/tree/master/clap_complete_nushell)
 -   [Dorothy](http://github.com/bevry/dorothy)
 -   [Direnv](https://github.com/direnv/direnv/blob/master/docs/hook.md#nushell)
+-   [x-cmd](https://x-cmd.com/mod/nu)
 
 ## Contributing
 

From 28ed0fe700167e09633ebf49c495d168cd9a7561 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Tue, 18 Jun 2024 20:19:13 +0800
Subject: [PATCH 0113/1072] Improves commands that support range input (#13113)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
Fixes: #13105
Fixes: #13077

This pr makes `str substring`, `bytes at` work better with negative
index.

And it also fixes the false range semantic on `detect columns -c` in
some cases.

# User-Facing Changes
For `str substring`, `bytes at`, it will no-longer return an error if
start index is larger than end index. It makes sense to return an empty
string of empty bytes directly.

### Before
```nushell
# str substring
❯ ("aaa" | str substring 2..-3) == ""
Error: nu::shell::type_mismatch

  × Type mismatch.
   ╭─[entry #23:1:10]
 1 │ ("aaa" | str substring 2..-3) == ""
   ·          ──────┬──────
   ·                ╰── End must be greater than or equal to Start
 2 │ true
   ╰────

# bytes at
❯ ("aaa" | encode utf-8 | bytes at 2..-3) == ("" | encode utf-8)
Error: nu::shell::type_mismatch

  × Type mismatch.
   ╭─[entry #27:1:25]
 1 │ ("aaa" | encode utf-8 | bytes at 2..-3) == ("" | encode utf-8)
   ·                         ────┬───
   ·                             ╰── End must be greater than or equal to Start
   ╰────
```
### After
```nushell
# str substring
❯ ("aaa" | str substring 2..-3) == ""
true

# bytes at
❯  ("aaa" | encode utf-8 | bytes at 2..-3) == ("" | encode utf-8)
true
```
# Tests + Formatting
Added some tests, adjust existing tests
---
 crates/nu-cmd-base/src/util.rs                |  5 +-
 crates/nu-command/src/bytes/at.rs             | 48 +++-------
 .../nu-command/src/strings/str_/substring.rs  | 95 +++++++++----------
 .../tests/commands/detect_columns.rs          | 12 +--
 crates/nu-command/tests/commands/str_/mod.rs  | 23 ++++-
 5 files changed, 85 insertions(+), 98 deletions(-)

diff --git a/crates/nu-cmd-base/src/util.rs b/crates/nu-cmd-base/src/util.rs
index 559161329b..905c990a9e 100644
--- a/crates/nu-cmd-base/src/util.rs
+++ b/crates/nu-cmd-base/src/util.rs
@@ -20,13 +20,14 @@ pub fn get_guaranteed_cwd(engine_state: &EngineState, stack: &Stack) -> PathBuf
 
 type MakeRangeError = fn(&str, Span) -> ShellError;
 
+/// Returns a inclusive pair of boundary in given `range`.
 pub fn process_range(range: &Range) -> Result<(isize, isize), MakeRangeError> {
     match range {
         Range::IntRange(range) => {
             let start = range.start().try_into().unwrap_or(0);
             let end = match range.end() {
-                Bound::Included(v) => (v + 1) as isize,
-                Bound::Excluded(v) => v as isize,
+                Bound::Included(v) => v as isize,
+                Bound::Excluded(v) => (v - 1) as isize,
                 Bound::Unbounded => isize::MAX,
             };
             Ok((start, end))
diff --git a/crates/nu-command/src/bytes/at.rs b/crates/nu-command/src/bytes/at.rs
index e90312603f..c5164c3550 100644
--- a/crates/nu-command/src/bytes/at.rs
+++ b/crates/nu-command/src/bytes/at.rs
@@ -128,48 +128,24 @@ fn action(input: &Value, args: &Arguments, head: Span) -> Value {
     let range = &args.indexes;
     match input {
         Value::Binary { val, .. } => {
-            use std::cmp::{self, Ordering};
             let len = val.len() as isize;
-
             let start = if range.0 < 0 { range.0 + len } else { range.0 };
+            let end = if range.1 < 0 { range.1 + len } else { range.1 };
 
-            let end = if range.1 < 0 {
-                cmp::max(range.1 + len, 0)
-            } else {
-                range.1
-            };
-
-            if start < len && end >= 0 {
-                match start.cmp(&end) {
-                    Ordering::Equal => Value::binary(vec![], head),
-                    Ordering::Greater => Value::error(
-                        ShellError::TypeMismatch {
-                            err_message: "End must be greater than or equal to Start".to_string(),
-                            span: head,
-                        },
-                        head,
-                    ),
-                    Ordering::Less => Value::binary(
-                        if end == isize::MAX {
-                            val.iter()
-                                .skip(start as usize)
-                                .copied()
-                                .collect::<Vec<u8>>()
-                        } else {
-                            val.iter()
-                                .skip(start as usize)
-                                .take((end - start) as usize)
-                                .copied()
-                                .collect()
-                        },
-                        head,
-                    ),
-                }
-            } else {
+            if start > end {
                 Value::binary(vec![], head)
+            } else {
+                let val_iter = val.iter().skip(start as usize);
+                Value::binary(
+                    if end == isize::MAX {
+                        val_iter.copied().collect::<Vec<u8>>()
+                    } else {
+                        val_iter.take((end - start + 1) as usize).copied().collect()
+                    },
+                    head,
+                )
             }
         }
-
         Value::Error { .. } => input.clone(),
 
         other => Value::error(
diff --git a/crates/nu-command/src/strings/str_/substring.rs b/crates/nu-command/src/strings/str_/substring.rs
index 99ba8ede1e..5ad7a967da 100644
--- a/crates/nu-command/src/strings/str_/substring.rs
+++ b/crates/nu-command/src/strings/str_/substring.rs
@@ -5,7 +5,6 @@ use nu_cmd_base::{
 };
 use nu_engine::command_prelude::*;
 use nu_protocol::{engine::StateWorkingSet, Range};
-use std::cmp::Ordering;
 use unicode_segmentation::UnicodeSegmentation;
 
 #[derive(Clone)]
@@ -151,6 +150,11 @@ impl Command for SubCommand {
                 example: " '🇯🇵ほげ ふが ぴよ' | str substring --grapheme-clusters 4..5",
                 result: Some(Value::test_string("ふが")),
             },
+            Example {
+                description: "sub string by negative index",
+                example: " 'good nushell' | str substring 5..-2",
+                result: Some(Value::test_string("nushel")),
+            },
         ]
     }
 }
@@ -167,56 +171,46 @@ fn action(input: &Value, args: &Arguments, head: Span) -> Value {
                 options.0
             };
             let end: isize = if options.1 < 0 {
-                std::cmp::max(len + options.1, 0)
+                options.1 + len
             } else {
                 options.1
             };
 
-            if start < len && end >= 0 {
-                match start.cmp(&end) {
-                    Ordering::Equal => Value::string("", head),
-                    Ordering::Greater => Value::error(
-                        ShellError::TypeMismatch {
-                            err_message: "End must be greater than or equal to Start".to_string(),
-                            span: head,
-                        },
-                        head,
-                    ),
-                    Ordering::Less => Value::string(
-                        {
-                            if end == isize::MAX {
-                                if args.graphemes {
-                                    s.graphemes(true)
-                                        .skip(start as usize)
-                                        .collect::<Vec<&str>>()
-                                        .join("")
-                                } else {
-                                    String::from_utf8_lossy(
-                                        &s.bytes().skip(start as usize).collect::<Vec<_>>(),
-                                    )
-                                    .to_string()
-                                }
-                            } else if args.graphemes {
+            if start > end {
+                Value::string("", head)
+            } else {
+                Value::string(
+                    {
+                        if end == isize::MAX {
+                            if args.graphemes {
                                 s.graphemes(true)
                                     .skip(start as usize)
-                                    .take((end - start) as usize)
                                     .collect::<Vec<&str>>()
                                     .join("")
                             } else {
                                 String::from_utf8_lossy(
-                                    &s.bytes()
-                                        .skip(start as usize)
-                                        .take((end - start) as usize)
-                                        .collect::<Vec<_>>(),
+                                    &s.bytes().skip(start as usize).collect::<Vec<_>>(),
                                 )
                                 .to_string()
                             }
-                        },
-                        head,
-                    ),
-                }
-            } else {
-                Value::string("", head)
+                        } else if args.graphemes {
+                            s.graphemes(true)
+                                .skip(start as usize)
+                                .take((end - start + 1) as usize)
+                                .collect::<Vec<&str>>()
+                                .join("")
+                        } else {
+                            String::from_utf8_lossy(
+                                &s.bytes()
+                                    .skip(start as usize)
+                                    .take((end - start + 1) as usize)
+                                    .collect::<Vec<_>>(),
+                            )
+                            .to_string()
+                        }
+                    },
+                    head,
+                )
             }
         }
         // Propagate errors by explicitly matching them before the final case.
@@ -243,6 +237,7 @@ mod tests {
 
         test_examples(SubCommand {})
     }
+    #[derive(Debug)]
     struct Expectation<'a> {
         options: (isize, isize),
         expected: &'a str,
@@ -266,18 +261,19 @@ mod tests {
         let word = Value::test_string("andres");
 
         let cases = vec![
-            expectation("a", (0, 1)),
-            expectation("an", (0, 2)),
-            expectation("and", (0, 3)),
-            expectation("andr", (0, 4)),
-            expectation("andre", (0, 5)),
+            expectation("a", (0, 0)),
+            expectation("an", (0, 1)),
+            expectation("and", (0, 2)),
+            expectation("andr", (0, 3)),
+            expectation("andre", (0, 4)),
+            expectation("andres", (0, 5)),
             expectation("andres", (0, 6)),
-            expectation("", (0, -6)),
-            expectation("a", (0, -5)),
-            expectation("an", (0, -4)),
-            expectation("and", (0, -3)),
-            expectation("andr", (0, -2)),
-            expectation("andre", (0, -1)),
+            expectation("a", (0, -6)),
+            expectation("an", (0, -5)),
+            expectation("and", (0, -4)),
+            expectation("andr", (0, -3)),
+            expectation("andre", (0, -2)),
+            expectation("andres", (0, -1)),
             // str substring [ -4 , _ ]
             // str substring   -4 ,
             expectation("dres", (-4, isize::MAX)),
@@ -292,6 +288,7 @@ mod tests {
         ];
 
         for expectation in &cases {
+            println!("{:?}", expectation);
             let expected = expectation.expected;
             let actual = action(
                 &word,
diff --git a/crates/nu-command/tests/commands/detect_columns.rs b/crates/nu-command/tests/commands/detect_columns.rs
index 5bc057fa18..296d039b02 100644
--- a/crates/nu-command/tests/commands/detect_columns.rs
+++ b/crates/nu-command/tests/commands/detect_columns.rs
@@ -31,12 +31,12 @@ fn detect_columns_with_legacy_and_flag_c() {
         (
             "$\"c1 c2 c3 c4 c5(char nl)a b c d e\"",
             "[[c1,c3,c4,c5]; ['a b',c,d,e]]",
-            "0..0",
+            "0..1",
         ),
         (
             "$\"c1 c2 c3 c4 c5(char nl)a b c d e\"",
             "[[c1,c2,c3,c4]; [a,b,c,'d e']]",
-            "(-2)..(-2)",
+            "(-2)..(-1)",
         ),
         (
             "$\"c1 c2 c3 c4 c5(char nl)a b c d e\"",
@@ -72,10 +72,10 @@ drwxr-xr-x  2 root root 4.0K Mar 20 08:28 =(char nl)
 drwxr-xr-x  4 root root 4.0K Mar 20 08:18 ~(char nl)
 -rw-r--r--  1 root root 3.0K Mar 20 07:23 ~asdf(char nl)\"";
     let expected = "[
-['column0', 'column1', 'column2', 'column3', 'column4', 'column5', 'column8'];
-['drwxr-xr-x', '2', 'root', 'root', '4.0K', 'Mar 20 08:28', '='],
-['drwxr-xr-x', '4', 'root', 'root', '4.0K', 'Mar 20 08:18', '~'],
-['-rw-r--r--',  '1', 'root', 'root', '3.0K', 'Mar 20 07:23', '~asdf']
+['column0', 'column1', 'column2', 'column3', 'column4', 'column5', 'column7', 'column8'];
+['drwxr-xr-x', '2', 'root', 'root', '4.0K', 'Mar 20', '08:28', '='],
+['drwxr-xr-x', '4', 'root', 'root', '4.0K', 'Mar 20', '08:18', '~'],
+['-rw-r--r--',  '1', 'root', 'root', '3.0K', 'Mar 20', '07:23', '~asdf']
 ]";
     let range = "5..6";
     let cmd = format!(
diff --git a/crates/nu-command/tests/commands/str_/mod.rs b/crates/nu-command/tests/commands/str_/mod.rs
index 43f59b3e10..2aeabfd04a 100644
--- a/crates/nu-command/tests/commands/str_/mod.rs
+++ b/crates/nu-command/tests/commands/str_/mod.rs
@@ -255,7 +255,7 @@ fn substrings_the_input() {
 }
 
 #[test]
-fn substring_errors_if_start_index_is_greater_than_end_index() {
+fn substring_empty_if_start_index_is_greater_than_end_index() {
     Playground::setup("str_test_9", |dirs, sandbox| {
         sandbox.with_files(&[FileWithContent(
             "sample.toml",
@@ -270,12 +270,10 @@ fn substring_errors_if_start_index_is_greater_than_end_index() {
             r#"
                  open sample.toml
                  | str substring 6..4 fortune.teller.phone
+                 | get fortune.teller.phone
              "#
         ));
-
-        assert!(actual
-            .err
-            .contains("End must be greater than or equal to Start"))
+        assert_eq!(actual.out, "")
     })
 }
 
@@ -375,6 +373,21 @@ fn substrings_the_input_and_treats_end_index_as_length_if_blank_end_index_given(
     })
 }
 
+#[test]
+fn substring_by_negative_index() {
+    Playground::setup("str_test_13", |dirs, _| {
+        let actual = nu!(
+            cwd: dirs.test(), "'apples' | str substring 0..-1",
+        );
+        assert_eq!(actual.out, "apples");
+
+        let actual = nu!(
+            cwd: dirs.test(), "'apples' | str substring 0..<-1",
+        );
+        assert_eq!(actual.out, "apple");
+    })
+}
+
 #[test]
 fn str_reverse() {
     let actual = nu!(r#"

From c171a2b8b7253bd0fb9c427a1076c3c548cd8bce Mon Sep 17 00:00:00 2001
From: Bruce Weirdan <weirdan@gmail.com>
Date: Tue, 18 Jun 2024 17:34:18 +0200
Subject: [PATCH 0114/1072] Update `sys users` signature (#13172)

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

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

# Description
Corrects the `sys users` signature to match the returned type.

Before this change `sys users | where name == root` would result in a
type error.

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

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

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/system/sys/users.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-command/src/system/sys/users.rs b/crates/nu-command/src/system/sys/users.rs
index 7d4a43cae5..04d9b9db91 100644
--- a/crates/nu-command/src/system/sys/users.rs
+++ b/crates/nu-command/src/system/sys/users.rs
@@ -13,7 +13,7 @@ impl Command for SysUsers {
     fn signature(&self) -> Signature {
         Signature::build("sys users")
             .category(Category::System)
-            .input_output_types(vec![(Type::Nothing, Type::record())])
+            .input_output_types(vec![(Type::Nothing, Type::table())])
     }
 
     fn usage(&self) -> &str {

From a894e9c2469d998f4d190516cc0510a1f302703b Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Tue, 18 Jun 2024 13:48:06 -0500
Subject: [PATCH 0115/1072] update try command's help (#13173)

# Description

This PR updates the `try` command to show that `catch` is a closure and
can be used as such.

### Before

![image](https://github.com/nushell/nushell/assets/343840/dc330b10-cd68-4d70-9ff8-aa1e7cbda5f3)

### After

![image](https://github.com/nushell/nushell/assets/343840/146a7514-6026-4b53-bdf0-603c77c8a259)


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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-cmd-lang/src/core_commands/try_.rs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/crates/nu-cmd-lang/src/core_commands/try_.rs b/crates/nu-cmd-lang/src/core_commands/try_.rs
index 0b399e368a..1f16f97908 100644
--- a/crates/nu-cmd-lang/src/core_commands/try_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/try_.rs
@@ -10,7 +10,7 @@ impl Command for Try {
     }
 
     fn usage(&self) -> &str {
-        "Try to run a block, if it fails optionally run a catch block."
+        "Try to run a block, if it fails optionally run a catch closure."
     }
 
     fn signature(&self) -> nu_protocol::Signature {
@@ -18,7 +18,7 @@ impl Command for Try {
             .input_output_types(vec![(Type::Any, Type::Any)])
             .required("try_block", SyntaxShape::Block, "Block to run.")
             .optional(
-                "catch_block",
+                "catch_closure",
                 SyntaxShape::Keyword(
                     b"catch".to_vec(),
                     Box::new(SyntaxShape::OneOf(vec![
@@ -26,7 +26,7 @@ impl Command for Try {
                         SyntaxShape::Closure(Some(vec![SyntaxShape::Any])),
                     ])),
                 ),
-                "Block to run if try block fails.",
+                "Closure to run if try block fails.",
             )
             .category(Category::Core)
     }
@@ -85,9 +85,14 @@ impl Command for Try {
             },
             Example {
                 description: "Try to run a missing command",
-                example: "try { asdfasdf } catch { 'missing' } ",
+                example: "try { asdfasdf } catch { 'missing' }",
                 result: Some(Value::test_string("missing")),
             },
+            Example {
+                description: "Try to run a missing command and report the message",
+                example: "try { asdfasdf } catch { |err| $err.msg }",
+                result: None,
+            },
         ]
     }
 }

From 532c0023c24ef44fbad303cf8e0e9a0e32d0e29e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Jun 2024 00:59:03 +0000
Subject: [PATCH 0116/1072] Bump crate-ci/typos from 1.22.4 to 1.22.7 (#13176)

---
 .github/workflows/typos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index f81f5c89a5..d33750e337 100644
--- a/.github/workflows/typos.yml
+++ b/.github/workflows/typos.yml
@@ -10,4 +10,4 @@ jobs:
         uses: actions/checkout@v4.1.6
 
       - name: Check spelling
-        uses: crate-ci/typos@v1.22.4
+        uses: crate-ci/typos@v1.22.7

From 103f59be52eadcb8f478264487e1f4834ce027bf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Jun 2024 01:09:25 +0000
Subject: [PATCH 0117/1072] Bump git2 from 0.18.3 to 0.19.0 (#13179)

---
 Cargo.lock                        | 8 ++++----
 crates/nu_plugin_gstat/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b88af73c25..0db346b785 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1687,9 +1687,9 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
 name = "git2"
-version = "0.18.3"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70"
+checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724"
 dependencies = [
  "bitflags 2.5.0",
  "libc",
@@ -2288,9 +2288,9 @@ dependencies = [
 
 [[package]]
 name = "libgit2-sys"
-version = "0.16.2+1.7.2"
+version = "0.17.0+1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8"
+checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224"
 dependencies = [
  "cc",
  "libc",
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index 01e17fdb54..c356f3d7d3 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -19,4 +19,4 @@ bench = false
 nu-plugin = { path = "../nu-plugin", version = "0.94.3" }
 nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
 
-git2 = "0.18"
+git2 = "0.19"

From 12991cd36feedaac0ccb86be61e78a8ca4ffd261 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Tue, 18 Jun 2024 21:37:24 -0700
Subject: [PATCH 0118/1072] Change the error style during tests to `plain`
 (#13061)

# Description

This fixes issues with trying to run the tests with a terminal that is
small enough to cause errors to wrap around, or in cases where the test
environment might produce strings that are reasonably expected to wrap
around anyway. "Fancy" errors are too fancy for tests to work
predictably :wink:

cc @abusch

# User-Facing Changes

- Added `--error-style` option for use with `--commands` (like
`--table-mode`)

# Tests + Formatting

Surprisingly, all of the tests pass, including in small windows! I only
had to make one change to a test for `error make` which was looking for
the box drawing characters miette uses to determine whether the span
label was showing up - but the plain error style output is even better
and easier to match on, so this test is actually more specific now.
---
 benches/benchmarks.rs                         |  6 ++--
 crates/nu-cli/src/eval_cmds.rs                | 34 +++++++++++++++++--
 crates/nu-cli/src/lib.rs                      |  2 +-
 .../nu-command/tests/commands/error_make.rs   |  5 +--
 crates/nu-test-support/src/macros.rs          |  4 +++
 src/command.rs                                | 16 +++++++--
 src/run.rs                                    |  9 +++--
 7 files changed, 62 insertions(+), 14 deletions(-)

diff --git a/benches/benchmarks.rs b/benches/benchmarks.rs
index 84552daef9..7a23715c8d 100644
--- a/benches/benchmarks.rs
+++ b/benches/benchmarks.rs
@@ -47,8 +47,7 @@ fn setup_stack_and_engine_from_command(command: &str) -> (Stack, EngineState) {
         &mut engine,
         &mut stack,
         PipelineData::empty(),
-        None,
-        false,
+        Default::default(),
     )
     .unwrap();
 
@@ -90,8 +89,7 @@ fn bench_command(
                     &mut engine,
                     &mut stack,
                     PipelineData::empty(),
-                    None,
-                    false,
+                    Default::default(),
                 )
                 .unwrap(),
             );
diff --git a/crates/nu-cli/src/eval_cmds.rs b/crates/nu-cli/src/eval_cmds.rs
index 8fa3bf30e5..13141f6174 100644
--- a/crates/nu-cli/src/eval_cmds.rs
+++ b/crates/nu-cli/src/eval_cmds.rs
@@ -8,15 +8,45 @@ use nu_protocol::{
 };
 use std::sync::Arc;
 
+#[derive(Default)]
+pub struct EvaluateCommandsOpts {
+    pub table_mode: Option<Value>,
+    pub error_style: Option<Value>,
+    pub no_newline: bool,
+}
+
 /// Run a command (or commands) given to us by the user
 pub fn evaluate_commands(
     commands: &Spanned<String>,
     engine_state: &mut EngineState,
     stack: &mut Stack,
     input: PipelineData,
-    table_mode: Option<Value>,
-    no_newline: bool,
+    opts: EvaluateCommandsOpts,
 ) -> Result<(), ShellError> {
+    let EvaluateCommandsOpts {
+        table_mode,
+        error_style,
+        no_newline,
+    } = opts;
+
+    // Handle the configured error style early
+    if let Some(e_style) = error_style {
+        match e_style.coerce_str()?.parse() {
+            Ok(e_style) => {
+                Arc::make_mut(&mut engine_state.config).error_style = e_style;
+            }
+            Err(err) => {
+                return Err(ShellError::GenericError {
+                    error: "Invalid value for `--error-style`".into(),
+                    msg: err.into(),
+                    span: Some(e_style.span()),
+                    help: None,
+                    inner: vec![],
+                });
+            }
+        }
+    }
+
     // Translate environment variables from Strings to Values
     convert_env_values(engine_state, stack)?;
 
diff --git a/crates/nu-cli/src/lib.rs b/crates/nu-cli/src/lib.rs
index c4342dc3a0..6f151adad1 100644
--- a/crates/nu-cli/src/lib.rs
+++ b/crates/nu-cli/src/lib.rs
@@ -17,7 +17,7 @@ mod validation;
 pub use commands::add_cli_context;
 pub use completions::{FileCompletion, NuCompleter, SemanticSuggestion, SuggestionKind};
 pub use config_files::eval_config_contents;
-pub use eval_cmds::evaluate_commands;
+pub use eval_cmds::{evaluate_commands, EvaluateCommandsOpts};
 pub use eval_file::evaluate_file;
 pub use menus::NuHelpCompleter;
 pub use nu_cmd_base::util::get_init_cwd;
diff --git a/crates/nu-command/tests/commands/error_make.rs b/crates/nu-command/tests/commands/error_make.rs
index 0c6908d2aa..f5714c88ac 100644
--- a/crates/nu-command/tests/commands/error_make.rs
+++ b/crates/nu-command/tests/commands/error_make.rs
@@ -4,8 +4,9 @@ use nu_test_support::nu;
 fn error_label_works() {
     let actual = nu!("error make {msg:foo label:{text:unseen}}");
 
-    assert!(actual.err.contains("unseen"));
-    assert!(actual.err.contains("╰──"));
+    assert!(actual
+        .err
+        .contains("label at line 1, columns 1 to 10: unseen"));
 }
 
 #[test]
diff --git a/crates/nu-test-support/src/macros.rs b/crates/nu-test-support/src/macros.rs
index c18dd5ac81..51d743e1a4 100644
--- a/crates/nu-test-support/src/macros.rs
+++ b/crates/nu-test-support/src/macros.rs
@@ -283,6 +283,8 @@ pub fn nu_run_test(opts: NuOpts, commands: impl AsRef<str>, with_std: bool) -> O
     if !with_std {
         command.arg("--no-std-lib");
     }
+    // Use plain errors to help make error text matching more consistent
+    command.args(["--error-style", "plain"]);
     command
         .arg(format!("-c {}", escape_quote_string(&commands)))
         .stdout(Stdio::piped())
@@ -369,6 +371,8 @@ where
         .envs(envs)
         .arg("--commands")
         .arg(command)
+        // Use plain errors to help make error text matching more consistent
+        .args(["--error-style", "plain"])
         .arg("--config")
         .arg(temp_config_file)
         .arg("--env-config")
diff --git a/src/command.rs b/src/command.rs
index 15da0e3e47..5ba8a60996 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -29,8 +29,10 @@ pub(crate) fn gather_commandline_args() -> (Vec<String>, String, Vec<String>) {
         }
 
         let flag_value = match arg.as_ref() {
-            "--commands" | "-c" | "--table-mode" | "-m" | "-e" | "--execute" | "--config"
-            | "--env-config" | "-I" | "ide-ast" => args.next().map(|a| escape_quote_string(&a)),
+            "--commands" | "-c" | "--table-mode" | "-m" | "--error-style" | "-e" | "--execute"
+            | "--config" | "--env-config" | "-I" | "ide-ast" => {
+                args.next().map(|a| escape_quote_string(&a))
+            }
             #[cfg(feature = "plugin")]
             "--plugin-config" => args.next().map(|a| escape_quote_string(&a)),
             "--log-level" | "--log-target" | "--log-include" | "--log-exclude" | "--testbin"
@@ -102,6 +104,8 @@ pub(crate) fn parse_commandline_args(
             let execute = call.get_flag_expr("execute");
             let table_mode: Option<Value> =
                 call.get_flag(engine_state, &mut stack, "table-mode")?;
+            let error_style: Option<Value> =
+                call.get_flag(engine_state, &mut stack, "error-style")?;
             let no_newline = call.get_named_arg("no-newline");
 
             // ide flags
@@ -245,6 +249,7 @@ pub(crate) fn parse_commandline_args(
                 ide_check,
                 ide_ast,
                 table_mode,
+                error_style,
                 no_newline,
             });
         }
@@ -278,6 +283,7 @@ pub(crate) struct NushellCliArgs {
     pub(crate) log_exclude: Option<Vec<Spanned<String>>>,
     pub(crate) execute: Option<Spanned<String>>,
     pub(crate) table_mode: Option<Value>,
+    pub(crate) error_style: Option<Value>,
     pub(crate) no_newline: Option<Spanned<String>>,
     pub(crate) include_path: Option<Spanned<String>>,
     pub(crate) lsp: bool,
@@ -325,6 +331,12 @@ impl Command for Nu {
                 "the table mode to use. rounded is default.",
                 Some('m'),
             )
+            .named(
+                "error-style",
+                SyntaxShape::String,
+                "the error style to use (fancy or plain). default: fancy",
+                None,
+            )
             .switch("no-newline", "print the result for --commands(-c) without a newline", None)
             .switch(
                 "no-config-file",
diff --git a/src/run.rs b/src/run.rs
index 2996bc76f8..db779b0058 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -7,7 +7,7 @@ use crate::{
 use log::trace;
 #[cfg(feature = "plugin")]
 use nu_cli::read_plugin_file;
-use nu_cli::{evaluate_commands, evaluate_file, evaluate_repl};
+use nu_cli::{evaluate_commands, evaluate_file, evaluate_repl, EvaluateCommandsOpts};
 use nu_protocol::{
     engine::{EngineState, Stack},
     report_error_new, PipelineData, Spanned,
@@ -114,8 +114,11 @@ pub(crate) fn run_commands(
         engine_state,
         &mut stack,
         input,
-        parsed_nu_cli_args.table_mode,
-        parsed_nu_cli_args.no_newline.is_some(),
+        EvaluateCommandsOpts {
+            table_mode: parsed_nu_cli_args.table_mode,
+            error_style: parsed_nu_cli_args.error_style,
+            no_newline: parsed_nu_cli_args.no_newline.is_some(),
+        },
     ) {
         report_error_new(engine_state, &err);
         std::process::exit(1);

From 44aa0a2de41295851a035fde3c3d5b7a2e3e7030 Mon Sep 17 00:00:00 2001
From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Wed, 19 Jun 2024 21:12:25 -0400
Subject: [PATCH 0119/1072] Table help rendering (#13182)

# Description

Mostly fixes #13149 with much of the credit to @fdncred.

This PR runs `table --expand` against `help` example results. This is
essentially the same fix that #13146 was for `std help`.

It also changes the shape of the result for the `table --expand`
example, as it was hardcoded wrong.

~Still needed is a fix for the `table --collapse` example.~ Note that
this is also still a bug in `std help` that I didn't noticed before.

# User-Facing Changes

Certain tables are now rendered correctly in the help examples for:

* `table`
* `zip`
* `flatten`
* And almost certainly others

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

---------

Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
---
 crates/nu-command/src/viewers/table.rs | 10 ++++++++--
 crates/nu-engine/src/documentation.rs  | 26 ++++++++++++++++++++++++--
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index 2fe9319821..075a4e31c4 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -170,7 +170,10 @@ impl Command for Table {
                     }),
                     Value::test_record(record! {
                         "a" =>  Value::test_int(3),
-                        "b" =>  Value::test_int(4),
+                        "b" =>  Value::test_list(vec![
+                            Value::test_int(4),
+                            Value::test_int(4),
+                        ])
                     }),
                 ])),
             },
@@ -184,7 +187,10 @@ impl Command for Table {
                     }),
                     Value::test_record(record! {
                         "a" =>  Value::test_int(3),
-                        "b" =>  Value::test_int(4),
+                        "b" =>  Value::test_list(vec![
+                            Value::test_int(4),
+                            Value::test_int(4),
+                        ])
                     }),
                 ])),
             },
diff --git a/crates/nu-engine/src/documentation.rs b/crates/nu-engine/src/documentation.rs
index 94cef3298e..a7d4950036 100644
--- a/crates/nu-engine/src/documentation.rs
+++ b/crates/nu-engine/src/documentation.rs
@@ -3,7 +3,7 @@ use nu_protocol::{
     ast::{Argument, Call, Expr, Expression, RecordItem},
     debugger::WithoutDebug,
     engine::{Command, EngineState, Stack, UNKNOWN_SPAN_ID},
-    record, Category, Example, IntoPipelineData, PipelineData, Signature, Span, SpanId,
+    record, Category, Example, IntoPipelineData, PipelineData, Signature, Span, SpanId, Spanned,
     SyntaxShape, Type, Value,
 };
 use std::{collections::HashMap, fmt::Write};
@@ -296,6 +296,28 @@ fn get_documentation(
         }
 
         if let Some(result) = &example.result {
+            let mut table_call = Call::new(Span::unknown());
+            if example.example.ends_with("--collapse") {
+                // collapse the result
+                table_call.add_named((
+                    Spanned {
+                        item: "collapse".to_string(),
+                        span: Span::unknown(),
+                    },
+                    None,
+                    None,
+                ))
+            } else {
+                // expand the result
+                table_call.add_named((
+                    Spanned {
+                        item: "expand".to_string(),
+                        span: Span::unknown(),
+                    },
+                    None,
+                    None,
+                ))
+            }
             let table = engine_state
                 .find_decl("table".as_bytes(), &[])
                 .and_then(|decl_id| {
@@ -304,7 +326,7 @@ fn get_documentation(
                         .run(
                             engine_state,
                             stack,
-                            &Call::new(Span::new(0, 0)),
+                            &table_call,
                             PipelineData::Value(result.clone(), None),
                         )
                         .ok()

From bdc32345bd6767071c169ffbcd9ffc30ea935791 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Wed, 19 Jun 2024 21:00:03 -0700
Subject: [PATCH 0120/1072] Move most of the peculiar argument handling for
 external calls into the parser (#13089)

# Description

We've had a lot of different issues and PRs related to arg handling with
externals since the rewrite of `run-external` in #12921:

- #12950
- #12955
- #13000
- #13001
- #13021
- #13027
- #13028
- #13073

Many of these are caused by the argument handling of external calls and
`run-external` being very special and involving the parser handing
quoted strings over to `run-external` so that it knows whether to expand
tildes and globs and so on. This is really unusual and also makes it
harder to use `run-external`, and also harder to understand it (and
probably is part of the reason why it was rewritten in the first place).

This PR moves a lot more of that work over to the parser, so that by the
time `run-external` gets it, it's dealing with much more normal Nushell
values. In particular:

- Unquoted strings are handled as globs with no expand
- The unescaped-but-quoted handling of strings was removed, and the
parser constructs normal looking strings instead, removing internal
quotes so that `run-external` doesn't have to do it
- Bare word interpolation is now supported and expansion is done in this
case
- Expressions typed as `Glob` containing `Expr::StringInterpolation` now
produce `Value::Glob` instead, with the quoted status from the expr
passed through so we know if it was a bare word
- Bare word interpolation for values typed as `glob` now possible, but
not implemented
- Because expansion is now triggered by `Value::Glob(_, false)` instead
of looking at the expr, externals now support glob types

# User-Facing Changes

- Bare word interpolation works for external command options, and
otherwise embedded in other strings:
  ```nushell
  ^echo --foo=(2 + 2) # prints --foo=4
  ^echo -foo=$"(2 + 2)" # prints -foo=4
  ^echo foo="(2 + 2)" # prints (no interpolation!) foo=(2 + 2)
  ^echo foo,(2 + 2),bar # prints foo,4,bar
  ```

- Bare word interpolation expands for external command head/args:
  ```nushell
  let name = "exa"
  ~/.cargo/bin/($name) # this works, and expands the tilde
  ^$"~/.cargo/bin/($name)" # this doesn't expand the tilde
  ^echo ~/($name)/* # this glob is expanded
  ^echo $"~/($name)/*" # this isn't expanded
  ```

- Ndots are now supported for the head of an external command
(`^.../foo` works)

- Glob values are now supported for head/args of an external command,
and expanded appropriately:
  ```nushell
  ^("~/.cargo/bin/exa" | into glob) # the tilde is expanded
  ^echo ("*.txt" | into glob) # this glob is expanded
  ```

- `run-external` now works more like any other command, without
expecting a special call convention
  for its args:
  ```nushell
  run-external echo "'foo'"
  # before PR: 'foo'
  # after PR:  foo
  run-external echo "*.txt"
  # before PR: (glob is expanded)
  # after PR:  *.txt
  ```

# Tests + Formatting
Lots of tests added and cleaned up. Some tests that weren't active on
Windows changed to use `nu --testbin cococo` so that they can work.
Added a test for Linux only to make sure tilde expansion of commands
works, because changing `HOME` there causes `~` to reliably change.

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
- [ ] release notes: make sure to mention the new syntaxes that are
supported
---
 crates/nu-cli/src/syntax_highlight.rs         |  21 +-
 crates/nu-color-config/src/shape_color.rs     |   1 +
 crates/nu-command/src/system/run_external.rs  | 317 +++-------
 .../nu-command/tests/commands/run_external.rs | 145 +++--
 crates/nu-parser/src/flatten.rs               |  25 +-
 crates/nu-parser/src/parser.rs                | 251 ++++++--
 crates/nu-parser/tests/test_parser.rs         | 564 +++++++++++++-----
 crates/nu-protocol/src/ast/expr.rs            |   6 +
 crates/nu-protocol/src/ast/expression.rs      |   4 +-
 crates/nu-protocol/src/debugger/profiler.rs   |   1 +
 crates/nu-protocol/src/eval_base.rs           |   9 +
 crates/nu-test-support/src/macros.rs          |   6 +
 crates/nuon/src/from.rs                       |   6 +
 13 files changed, 880 insertions(+), 476 deletions(-)

diff --git a/crates/nu-cli/src/syntax_highlight.rs b/crates/nu-cli/src/syntax_highlight.rs
index e296943af6..41ef168390 100644
--- a/crates/nu-cli/src/syntax_highlight.rs
+++ b/crates/nu-cli/src/syntax_highlight.rs
@@ -138,6 +138,7 @@ impl Highlighter for NuHighlighter {
 
                 FlatShape::Filepath => add_colored_token(&shape.1, next_token),
                 FlatShape::Directory => add_colored_token(&shape.1, next_token),
+                FlatShape::GlobInterpolation => add_colored_token(&shape.1, next_token),
                 FlatShape::GlobPattern => add_colored_token(&shape.1, next_token),
                 FlatShape::Variable(_) | FlatShape::VarDecl(_) => {
                     add_colored_token(&shape.1, next_token)
@@ -452,15 +453,17 @@ fn find_matching_block_end_in_expr(
                 }
             }
 
-            Expr::StringInterpolation(exprs) => exprs.iter().find_map(|expr| {
-                find_matching_block_end_in_expr(
-                    line,
-                    working_set,
-                    expr,
-                    global_span_offset,
-                    global_cursor_offset,
-                )
-            }),
+            Expr::StringInterpolation(exprs) | Expr::GlobInterpolation(exprs, _) => {
+                exprs.iter().find_map(|expr| {
+                    find_matching_block_end_in_expr(
+                        line,
+                        working_set,
+                        expr,
+                        global_span_offset,
+                        global_cursor_offset,
+                    )
+                })
+            }
 
             Expr::List(list) => {
                 if expr_last == global_cursor_offset {
diff --git a/crates/nu-color-config/src/shape_color.rs b/crates/nu-color-config/src/shape_color.rs
index 72cc955e0b..8da397e914 100644
--- a/crates/nu-color-config/src/shape_color.rs
+++ b/crates/nu-color-config/src/shape_color.rs
@@ -20,6 +20,7 @@ pub fn default_shape_color(shape: &str) -> Style {
         "shape_flag" => Style::new().fg(Color::Blue).bold(),
         "shape_float" => Style::new().fg(Color::Purple).bold(),
         "shape_garbage" => Style::new().fg(Color::White).on(Color::Red).bold(),
+        "shape_glob_interpolation" => Style::new().fg(Color::Cyan).bold(),
         "shape_globpattern" => Style::new().fg(Color::Cyan).bold(),
         "shape_int" => Style::new().fg(Color::Purple).bold(),
         "shape_internalcall" => Style::new().fg(Color::Cyan).bold(),
diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index bc6152e7c8..104729a786 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -1,16 +1,15 @@
 use nu_cmd_base::hook::eval_hook;
 use nu_engine::{command_prelude::*, env_to_strings, get_eval_expression};
+use nu_path::{dots::expand_ndots, expand_tilde};
 use nu_protocol::{
-    ast::{Expr, Expression},
-    did_you_mean,
-    process::ChildProcess,
-    ByteStream, NuGlob, OutDest,
+    ast::Expression, did_you_mean, process::ChildProcess, ByteStream, NuGlob, OutDest,
 };
 use nu_system::ForegroundChild;
 use nu_utils::IgnoreCaseExt;
 use pathdiff::diff_paths;
 use std::{
     borrow::Cow,
+    ffi::{OsStr, OsString},
     io::Write,
     path::{Path, PathBuf},
     process::Stdio,
@@ -33,8 +32,16 @@ impl Command for External {
     fn signature(&self) -> nu_protocol::Signature {
         Signature::build(self.name())
             .input_output_types(vec![(Type::Any, Type::Any)])
-            .required("command", SyntaxShape::String, "External command to run.")
-            .rest("args", SyntaxShape::Any, "Arguments for external command.")
+            .required(
+                "command",
+                SyntaxShape::OneOf(vec![SyntaxShape::GlobPattern, SyntaxShape::String]),
+                "External command to run.",
+            )
+            .rest(
+                "args",
+                SyntaxShape::OneOf(vec![SyntaxShape::GlobPattern, SyntaxShape::Any]),
+                "Arguments for external command.",
+            )
             .category(Category::System)
     }
 
@@ -47,42 +54,31 @@ impl Command for External {
     ) -> Result<PipelineData, ShellError> {
         let cwd = engine_state.cwd(Some(stack))?;
 
-        // Evaluate the command name in the same way the arguments are evaluated. Since this isn't
-        // a spread, it should return a one-element vec.
-        let name_expr = call
-            .positional_nth(0)
-            .ok_or_else(|| ShellError::MissingParameter {
-                param_name: "command".into(),
-                span: call.head,
-            })?;
-        let name = eval_argument(engine_state, stack, name_expr, false)?
-            .pop()
-            .expect("eval_argument returned zero-element vec")
-            .into_spanned(name_expr.span);
+        let name: Value = call.req(engine_state, stack, 0)?;
+
+        let name_str: Cow<str> = match &name {
+            Value::Glob { val, .. } => Cow::Borrowed(val),
+            Value::String { val, .. } => Cow::Borrowed(val),
+            _ => Cow::Owned(name.clone().coerce_into_string()?),
+        };
+
+        let expanded_name = match &name {
+            // Expand tilde and ndots on the name if it's a bare string / glob (#13000)
+            Value::Glob { no_expand, .. } if !*no_expand => expand_ndots(expand_tilde(&*name_str)),
+            _ => Path::new(&*name_str).to_owned(),
+        };
 
         // Find the absolute path to the executable. On Windows, set the
         // executable to "cmd.exe" if it's is a CMD internal command. If the
         // command is not found, display a helpful error message.
-        let executable = if cfg!(windows) && is_cmd_internal_command(&name.item) {
+        let executable = if cfg!(windows) && is_cmd_internal_command(&name_str) {
             PathBuf::from("cmd.exe")
         } else {
-            // Expand tilde on the name if it's a bare string (#13000)
-            let expanded_name = if is_bare_string(name_expr) {
-                expand_tilde(&name.item)
-            } else {
-                name.item.clone()
-            };
-
             // Determine the PATH to be used and then use `which` to find it - though this has no
             // effect if it's an absolute path already
             let paths = nu_engine::env::path_str(engine_state, stack, call.head)?;
-            let Some(executable) = which(&expanded_name, &paths, &cwd) else {
-                return Err(command_not_found(
-                    &name.item,
-                    call.head,
-                    engine_state,
-                    stack,
-                ));
+            let Some(executable) = which(expanded_name, &paths, &cwd) else {
+                return Err(command_not_found(&name_str, call.head, engine_state, stack));
             };
             executable
         };
@@ -101,15 +97,15 @@ impl Command for External {
         // Configure args.
         let args = eval_arguments_from_call(engine_state, stack, call)?;
         #[cfg(windows)]
-        if is_cmd_internal_command(&name.item) {
+        if is_cmd_internal_command(&name_str) {
             use std::os::windows::process::CommandExt;
 
             // The /D flag disables execution of AutoRun commands from registry.
             // The /C flag followed by a command name instructs CMD to execute
             // that command and quit.
-            command.args(["/D", "/C", &name.item]);
+            command.args(["/D", "/C", &name_str]);
             for arg in &args {
-                command.raw_arg(escape_cmd_argument(arg)?.as_ref());
+                command.raw_arg(escape_cmd_argument(arg)?);
             }
         } else {
             command.args(args.into_iter().map(|s| s.item));
@@ -217,76 +213,54 @@ impl Command for External {
     }
 }
 
-/// Removes surrounding quotes from a string. Doesn't remove quotes from raw
-/// strings. Returns the original string if it doesn't have matching quotes.
-fn remove_quotes(s: &str) -> Cow<'_, str> {
-    let quoted_by_double_quotes = s.len() >= 2 && s.starts_with('"') && s.ends_with('"');
-    let quoted_by_single_quotes = s.len() >= 2 && s.starts_with('\'') && s.ends_with('\'');
-    let quoted_by_backticks = s.len() >= 2 && s.starts_with('`') && s.ends_with('`');
-    if quoted_by_double_quotes {
-        Cow::Owned(s[1..s.len() - 1].to_string().replace(r#"\""#, "\""))
-    } else if quoted_by_single_quotes || quoted_by_backticks {
-        Cow::Borrowed(&s[1..s.len() - 1])
-    } else {
-        Cow::Borrowed(s)
-    }
-}
-
 /// Evaluate all arguments from a call, performing expansions when necessary.
 pub fn eval_arguments_from_call(
     engine_state: &EngineState,
     stack: &mut Stack,
     call: &Call,
-) -> Result<Vec<Spanned<String>>, ShellError> {
+) -> Result<Vec<Spanned<OsString>>, ShellError> {
     let ctrlc = &engine_state.ctrlc;
     let cwd = engine_state.cwd(Some(stack))?;
-    let mut args: Vec<Spanned<String>> = vec![];
+    let mut args: Vec<Spanned<OsString>> = vec![];
     for (expr, spread) in call.rest_iter(1) {
-        if is_bare_string(expr) {
-            // If `expr` is a bare string, perform tilde-expansion,
-            // glob-expansion, and inner-quotes-removal, in that order.
-            for arg in eval_argument(engine_state, stack, expr, spread)? {
-                let tilde_expanded = expand_tilde(&arg);
-                for glob_expanded in expand_glob(&tilde_expanded, &cwd, expr.span, ctrlc)? {
-                    let inner_quotes_removed = remove_inner_quotes(&glob_expanded);
-                    args.push(inner_quotes_removed.into_owned().into_spanned(expr.span));
+        for arg in eval_argument(engine_state, stack, expr, spread)? {
+            match arg {
+                // Expand globs passed to run-external
+                Value::Glob { val, no_expand, .. } if !no_expand => args.extend(
+                    expand_glob(&val, &cwd, expr.span, ctrlc)?
+                        .into_iter()
+                        .map(|s| s.into_spanned(expr.span)),
+                ),
+                other => {
+                    args.push(OsString::from(coerce_into_string(other)?).into_spanned(expr.span))
                 }
             }
-        } else {
-            for arg in eval_argument(engine_state, stack, expr, spread)? {
-                args.push(arg.into_spanned(expr.span));
-            }
         }
     }
     Ok(args)
 }
 
-/// Evaluates an expression, coercing the values to strings.
-///
-/// Note: The parser currently has a special hack that retains surrounding
-/// quotes for string literals in `Expression`, so that we can decide whether
-/// the expression is considered a bare string. The hack doesn't affect string
-/// literals within lists or records. This function will remove the quotes
-/// before evaluating the expression.
+/// Custom `coerce_into_string()`, including globs, since those are often args to `run-external`
+/// as well
+fn coerce_into_string(val: Value) -> Result<String, ShellError> {
+    match val {
+        Value::Glob { val, .. } => Ok(val),
+        _ => val.coerce_into_string(),
+    }
+}
+
+/// Evaluate an argument, returning more than one value if it was a list to be spread.
 fn eval_argument(
     engine_state: &EngineState,
     stack: &mut Stack,
     expr: &Expression,
     spread: bool,
-) -> Result<Vec<String>, ShellError> {
-    // Remove quotes from string literals.
-    let mut expr = expr.clone();
-    if let Expr::String(s) = &expr.expr {
-        expr.expr = Expr::String(remove_quotes(s).into());
-    }
-
+) -> Result<Vec<Value>, ShellError> {
     let eval = get_eval_expression(engine_state);
-    match eval(engine_state, stack, &expr)? {
+    match eval(engine_state, stack, expr)? {
         Value::List { vals, .. } => {
             if spread {
-                vals.into_iter()
-                    .map(|val| val.coerce_into_string())
-                    .collect()
+                Ok(vals)
             } else {
                 Err(ShellError::CannotPassListToExternal {
                     arg: String::from_utf8_lossy(engine_state.get_span_contents(expr.span)).into(),
@@ -298,31 +272,12 @@ fn eval_argument(
             if spread {
                 Err(ShellError::CannotSpreadAsList { span: expr.span })
             } else {
-                Ok(vec![value.coerce_into_string()?])
+                Ok(vec![value])
             }
         }
     }
 }
 
-/// Returns whether an expression is considered a bare string.
-///
-/// Bare strings are defined as string literals that are either unquoted or
-/// quoted by backticks. Raw strings or string interpolations don't count.
-fn is_bare_string(expr: &Expression) -> bool {
-    let Expr::String(s) = &expr.expr else {
-        return false;
-    };
-    let quoted_by_double_quotes = s.len() >= 2 && s.starts_with('"') && s.ends_with('"');
-    let quoted_by_single_quotes = s.len() >= 2 && s.starts_with('\'') && s.ends_with('\'');
-    !quoted_by_double_quotes && !quoted_by_single_quotes
-}
-
-/// Performs tilde expansion on `arg`. Returns the original string if `arg`
-/// doesn't start with tilde.
-fn expand_tilde(arg: &str) -> String {
-    nu_path::expand_tilde(arg).to_string_lossy().to_string()
-}
-
 /// Performs glob expansion on `arg`. If the expansion found no matches or the pattern
 /// is not a valid glob, then this returns the original string as the expansion result.
 ///
@@ -333,19 +288,21 @@ fn expand_glob(
     cwd: &Path,
     span: Span,
     interrupt: &Option<Arc<AtomicBool>>,
-) -> Result<Vec<String>, ShellError> {
+) -> Result<Vec<OsString>, ShellError> {
     const GLOB_CHARS: &[char] = &['*', '?', '['];
 
-    // Don't expand something that doesn't include the GLOB_CHARS
+    // For an argument that doesn't include the GLOB_CHARS, just do the `expand_tilde`
+    // and `expand_ndots` expansion
     if !arg.contains(GLOB_CHARS) {
-        return Ok(vec![arg.into()]);
+        let path = expand_ndots(expand_tilde(arg));
+        return Ok(vec![path.into()]);
     }
 
     // We must use `nu_engine::glob_from` here, in order to ensure we get paths from the correct
     // dir
     let glob = NuGlob::Expand(arg.to_owned()).into_spanned(span);
     if let Ok((prefix, matches)) = nu_engine::glob_from(&glob, cwd, span, None) {
-        let mut result = vec![];
+        let mut result: Vec<OsString> = vec![];
 
         for m in matches {
             if nu_utils::ctrl_c::was_pressed(interrupt) {
@@ -353,7 +310,7 @@ fn expand_glob(
             }
             if let Ok(arg) = m {
                 let arg = resolve_globbed_path_to_cwd_relative(arg, prefix.as_ref(), cwd);
-                result.push(arg.to_string_lossy().to_string());
+                result.push(arg.into());
             } else {
                 result.push(arg.into());
             }
@@ -392,23 +349,6 @@ fn resolve_globbed_path_to_cwd_relative(
     }
 }
 
-/// Transforms `--option="value"` into `--option=value`. `value` can be quoted
-/// with double quotes, single quotes, or backticks. Only removes the outermost
-/// pair of quotes after the equal sign.
-fn remove_inner_quotes(arg: &str) -> Cow<'_, str> {
-    // Split `arg` on the first `=`.
-    let Some((option, value)) = arg.split_once('=') else {
-        return Cow::Borrowed(arg);
-    };
-    // Check that `option` doesn't contain quotes.
-    if option.contains('"') || option.contains('\'') || option.contains('`') {
-        return Cow::Borrowed(arg);
-    }
-    // Remove the outermost pair of quotes from `value`.
-    let value = remove_quotes(value);
-    Cow::Owned(format!("{option}={value}"))
-}
-
 /// Write `PipelineData` into `writer`. If `PipelineData` is not binary, it is
 /// first rendered using the `table` command.
 ///
@@ -577,7 +517,7 @@ pub fn command_not_found(
 /// Note: the `which.rs` crate always uses PATHEXT from the environment. As
 /// such, changing PATHEXT within Nushell doesn't work without updating the
 /// actual environment of the Nushell process.
-pub fn which(name: &str, paths: &str, cwd: &Path) -> Option<PathBuf> {
+pub fn which(name: impl AsRef<OsStr>, paths: &str, cwd: &Path) -> Option<PathBuf> {
     #[cfg(windows)]
     let paths = format!("{};{}", cwd.display(), paths);
     which::which_in(name, Some(paths), cwd).ok()
@@ -593,17 +533,18 @@ fn is_cmd_internal_command(name: &str) -> bool {
 }
 
 /// Returns true if a string contains CMD special characters.
-#[cfg(windows)]
-fn has_cmd_special_character(s: &str) -> bool {
-    const SPECIAL_CHARS: &[char] = &['<', '>', '&', '|', '^'];
-    SPECIAL_CHARS.iter().any(|c| s.contains(*c))
+fn has_cmd_special_character(s: impl AsRef<[u8]>) -> bool {
+    s.as_ref()
+        .iter()
+        .any(|b| matches!(b, b'<' | b'>' | b'&' | b'|' | b'^'))
 }
 
 /// Escape an argument for CMD internal commands. The result can be safely passed to `raw_arg()`.
-#[cfg(windows)]
-fn escape_cmd_argument(arg: &Spanned<String>) -> Result<Cow<'_, str>, ShellError> {
+#[cfg_attr(not(windows), allow(dead_code))]
+fn escape_cmd_argument(arg: &Spanned<OsString>) -> Result<Cow<'_, OsStr>, ShellError> {
     let Spanned { item: arg, span } = arg;
-    if arg.contains(['\r', '\n', '%']) {
+    let bytes = arg.as_encoded_bytes();
+    if bytes.iter().any(|b| matches!(b, b'\r' | b'\n' | b'%')) {
         // \r and \n trunacte the rest of the arguments and % can expand environment variables
         Err(ShellError::ExternalCommand {
             label:
@@ -612,12 +553,12 @@ fn escape_cmd_argument(arg: &Spanned<String>) -> Result<Cow<'_, str>, ShellError
             help: "some characters currently cannot be securely escaped".into(),
             span: *span,
         })
-    } else if arg.contains('"') {
+    } else if bytes.contains(&b'"') {
         // If `arg` is already quoted by double quotes, confirm there's no
         // embedded double quotes, then leave it as is.
-        if arg.chars().filter(|c| *c == '"').count() == 2
-            && arg.starts_with('"')
-            && arg.ends_with('"')
+        if bytes.iter().filter(|b| **b == b'"').count() == 2
+            && bytes.starts_with(b"\"")
+            && bytes.ends_with(b"\"")
         {
             Ok(Cow::Borrowed(arg))
         } else {
@@ -628,9 +569,13 @@ fn escape_cmd_argument(arg: &Spanned<String>) -> Result<Cow<'_, str>, ShellError
                 span: *span,
             })
         }
-    } else if arg.contains(' ') || has_cmd_special_character(arg) {
+    } else if bytes.contains(&b' ') || has_cmd_special_character(bytes) {
         // If `arg` contains space or special characters, quote the entire argument by double quotes.
-        Ok(Cow::Owned(format!("\"{arg}\"")))
+        let mut new_str = OsString::new();
+        new_str.push("\"");
+        new_str.push(arg);
+        new_str.push("\"");
+        Ok(Cow::Owned(new_str))
     } else {
         // FIXME?: what if `arg.is_empty()`?
         Ok(Cow::Borrowed(arg))
@@ -640,64 +585,8 @@ fn escape_cmd_argument(arg: &Spanned<String>) -> Result<Cow<'_, str>, ShellError
 #[cfg(test)]
 mod test {
     use super::*;
-    use nu_protocol::ast::ListItem;
     use nu_test_support::{fs::Stub, playground::Playground};
 
-    #[test]
-    fn test_remove_quotes() {
-        assert_eq!(remove_quotes(r#""#), r#""#);
-        assert_eq!(remove_quotes(r#"'"#), r#"'"#);
-        assert_eq!(remove_quotes(r#"''"#), r#""#);
-        assert_eq!(remove_quotes(r#""foo""#), r#"foo"#);
-        assert_eq!(remove_quotes(r#"`foo '"' bar`"#), r#"foo '"' bar"#);
-        assert_eq!(remove_quotes(r#"'foo' bar"#), r#"'foo' bar"#);
-        assert_eq!(remove_quotes(r#"r#'foo'#"#), r#"r#'foo'#"#);
-        assert_eq!(remove_quotes(r#""foo\" bar""#), r#"foo" bar"#);
-    }
-
-    #[test]
-    fn test_eval_argument() {
-        fn expression(expr: Expr) -> Expression {
-            Expression::new_unknown(expr, Span::unknown(), Type::Any)
-        }
-
-        fn eval(expr: Expr, spread: bool) -> Result<Vec<String>, ShellError> {
-            let engine_state = EngineState::new();
-            let mut stack = Stack::new();
-            eval_argument(&engine_state, &mut stack, &expression(expr), spread)
-        }
-
-        let actual = eval(Expr::String("".into()), false).unwrap();
-        let expected = &[""];
-        assert_eq!(actual, expected);
-
-        let actual = eval(Expr::String("'foo'".into()), false).unwrap();
-        let expected = &["foo"];
-        assert_eq!(actual, expected);
-
-        let actual = eval(Expr::RawString("'foo'".into()), false).unwrap();
-        let expected = &["'foo'"];
-        assert_eq!(actual, expected);
-
-        let actual = eval(Expr::List(vec![]), true).unwrap();
-        let expected: &[&str] = &[];
-        assert_eq!(actual, expected);
-
-        let actual = eval(
-            Expr::List(vec![
-                ListItem::Item(expression(Expr::String("'foo'".into()))),
-                ListItem::Item(expression(Expr::String("bar".into()))),
-            ]),
-            true,
-        )
-        .unwrap();
-        let expected = &["'foo'", "bar"];
-        assert_eq!(actual, expected);
-
-        eval(Expr::String("".into()), true).unwrap_err();
-        eval(Expr::List(vec![]), false).unwrap_err();
-    }
-
     #[test]
     fn test_expand_glob() {
         Playground::setup("test_expand_glob", |dirs, play| {
@@ -721,46 +610,20 @@ mod test {
             assert_eq!(actual, expected);
 
             let actual = expand_glob("./a.txt", cwd, Span::unknown(), &None).unwrap();
-            let expected = &["./a.txt"];
+            let expected: Vec<OsString> = vec![Path::new(".").join("a.txt").into()];
             assert_eq!(actual, expected);
 
             let actual = expand_glob("[*.txt", cwd, Span::unknown(), &None).unwrap();
             let expected = &["[*.txt"];
             assert_eq!(actual, expected);
+
+            let actual = expand_glob("~/foo.txt", cwd, Span::unknown(), &None).unwrap();
+            let home = dirs_next::home_dir().expect("failed to get home dir");
+            let expected: Vec<OsString> = vec![home.join("foo.txt").into()];
+            assert_eq!(actual, expected);
         })
     }
 
-    #[test]
-    fn test_remove_inner_quotes() {
-        let actual = remove_inner_quotes(r#"--option=value"#);
-        let expected = r#"--option=value"#;
-        assert_eq!(actual, expected);
-
-        let actual = remove_inner_quotes(r#"--option="value""#);
-        let expected = r#"--option=value"#;
-        assert_eq!(actual, expected);
-
-        let actual = remove_inner_quotes(r#"--option='value'"#);
-        let expected = r#"--option=value"#;
-        assert_eq!(actual, expected);
-
-        let actual = remove_inner_quotes(r#"--option "value""#);
-        let expected = r#"--option "value""#;
-        assert_eq!(actual, expected);
-
-        let actual = remove_inner_quotes(r#"-option="value""#);
-        let expected = r#"-option=value"#;
-        assert_eq!(actual, expected);
-
-        let actual = remove_inner_quotes(r#"option="value""#);
-        let expected = r#"option=value"#;
-        assert_eq!(actual, expected);
-
-        let actual = remove_inner_quotes(r#"option="v\"value""#);
-        let expected = r#"option=v"value"#;
-        assert_eq!(actual, expected);
-    }
-
     #[test]
     fn test_write_pipeline_data() {
         let engine_state = EngineState::new();
diff --git a/crates/nu-command/tests/commands/run_external.rs b/crates/nu-command/tests/commands/run_external.rs
index 14428edcbe..daa5abb25b 100644
--- a/crates/nu-command/tests/commands/run_external.rs
+++ b/crates/nu-command/tests/commands/run_external.rs
@@ -1,4 +1,3 @@
-#[cfg(not(windows))]
 use nu_test_support::fs::Stub::EmptyFile;
 use nu_test_support::playground::Playground;
 use nu_test_support::{nu, pipeline};
@@ -17,7 +16,6 @@ fn better_empty_redirection() {
     assert!(!actual.out.contains('2'));
 }
 
-#[cfg(not(windows))]
 #[test]
 fn explicit_glob() {
     Playground::setup("external with explicit glob", |dirs, sandbox| {
@@ -30,15 +28,15 @@ fn explicit_glob() {
         let actual = nu!(
             cwd: dirs.test(), pipeline(
             r#"
-                ^ls | glob '*.txt' | length
+                ^nu --testbin cococo ('*.txt' | into glob)
             "#
         ));
 
-        assert_eq!(actual.out, "2");
+        assert!(actual.out.contains("D&D_volume_1.txt"));
+        assert!(actual.out.contains("D&D_volume_2.txt"));
     })
 }
 
-#[cfg(not(windows))]
 #[test]
 fn bare_word_expand_path_glob() {
     Playground::setup("bare word should do the expansion", |dirs, sandbox| {
@@ -51,7 +49,7 @@ fn bare_word_expand_path_glob() {
         let actual = nu!(
             cwd: dirs.test(), pipeline(
             "
-                ^ls *.txt
+                ^nu --testbin cococo *.txt
             "
         ));
 
@@ -60,7 +58,6 @@ fn bare_word_expand_path_glob() {
     })
 }
 
-#[cfg(not(windows))]
 #[test]
 fn backtick_expand_path_glob() {
     Playground::setup("backtick should do the expansion", |dirs, sandbox| {
@@ -73,7 +70,7 @@ fn backtick_expand_path_glob() {
         let actual = nu!(
             cwd: dirs.test(), pipeline(
             r#"
-                ^ls `*.txt`
+                ^nu --testbin cococo `*.txt`
             "#
         ));
 
@@ -82,7 +79,6 @@ fn backtick_expand_path_glob() {
     })
 }
 
-#[cfg(not(windows))]
 #[test]
 fn single_quote_does_not_expand_path_glob() {
     Playground::setup("single quote do not run the expansion", |dirs, sandbox| {
@@ -95,15 +91,14 @@ fn single_quote_does_not_expand_path_glob() {
         let actual = nu!(
             cwd: dirs.test(), pipeline(
             r#"
-                ^ls '*.txt'
+                ^nu --testbin cococo '*.txt'
             "#
         ));
 
-        assert!(actual.err.contains("No such file or directory"));
+        assert_eq!(actual.out, "*.txt");
     })
 }
 
-#[cfg(not(windows))]
 #[test]
 fn double_quote_does_not_expand_path_glob() {
     Playground::setup("double quote do not run the expansion", |dirs, sandbox| {
@@ -116,22 +111,21 @@ fn double_quote_does_not_expand_path_glob() {
         let actual = nu!(
             cwd: dirs.test(), pipeline(
             r#"
-                ^ls "*.txt"
+                ^nu --testbin cococo "*.txt"
             "#
         ));
 
-        assert!(actual.err.contains("No such file or directory"));
+        assert_eq!(actual.out, "*.txt");
     })
 }
 
-#[cfg(not(windows))]
 #[test]
 fn failed_command_with_semicolon_will_not_execute_following_cmds() {
     Playground::setup("external failed command with semicolon", |dirs, _| {
         let actual = nu!(
             cwd: dirs.test(), pipeline(
             "
-                ^ls *.abc; echo done
+                nu --testbin fail; echo done
             "
         ));
 
@@ -155,16 +149,51 @@ fn external_args_with_quoted() {
 
 #[cfg(not(windows))]
 #[test]
-fn external_arg_with_long_flag_value_quoted() {
-    Playground::setup("external failed command with semicolon", |dirs, _| {
+fn external_arg_with_option_like_embedded_quotes() {
+    // TODO: would be nice to make this work with cococo, but arg parsing interferes
+    Playground::setup(
+        "external arg with option like embedded quotes",
+        |dirs, _| {
+            let actual = nu!(
+                cwd: dirs.test(), pipeline(
+                r#"
+                ^echo --foo='bar' -foo='bar'
+            "#
+            ));
+
+            assert_eq!(actual.out, "--foo=bar -foo=bar");
+        },
+    )
+}
+
+#[test]
+fn external_arg_with_non_option_like_embedded_quotes() {
+    Playground::setup(
+        "external arg with non option like embedded quotes",
+        |dirs, _| {
+            let actual = nu!(
+                cwd: dirs.test(), pipeline(
+                r#"
+                ^nu --testbin cococo foo='bar' 'foo'=bar
+            "#
+            ));
+
+            assert_eq!(actual.out, "foo=bar foo=bar");
+        },
+    )
+}
+
+#[test]
+fn external_arg_with_string_interpolation() {
+    Playground::setup("external arg with string interpolation", |dirs, _| {
         let actual = nu!(
             cwd: dirs.test(), pipeline(
             r#"
-                ^echo --foo='bar'
+                ^nu --testbin cococo foo=(2 + 2) $"foo=(2 + 2)" foo=$"(2 + 2)"
             "#
         ));
 
-        assert_eq!(actual.out, "--foo=bar");
+        assert_eq!(actual.out, "foo=4 foo=4 foo=4");
     })
 }
 
@@ -200,6 +229,67 @@ fn external_command_escape_args() {
     })
 }
 
+#[test]
+#[cfg_attr(
+    not(target_os = "linux"),
+    ignore = "only runs on Linux, where controlling the HOME var is reliable"
+)]
+fn external_command_expand_tilde() {
+    Playground::setup("external command expand tilde", |dirs, _| {
+        // Make a copy of the nu executable that we can use
+        let mut src = std::fs::File::open(nu_test_support::fs::binaries().join("nu"))
+            .expect("failed to open nu");
+        let mut dst = std::fs::File::create_new(dirs.test().join("test_nu"))
+            .expect("failed to create test_nu file");
+        std::io::copy(&mut src, &mut dst).expect("failed to copy data for nu binary");
+
+        // Make test_nu have the same permissions so that it's executable
+        dst.set_permissions(
+            src.metadata()
+                .expect("failed to get nu metadata")
+                .permissions(),
+        )
+        .expect("failed to set permissions on test_nu");
+
+        // Close the files
+        drop(dst);
+        drop(src);
+
+        let actual = nu!(
+            envs: vec![
+                ("HOME".to_string(), dirs.test().to_string_lossy().into_owned()),
+            ],
+            r#"
+                ^~/test_nu --testbin cococo hello
+            "#
+        );
+        assert_eq!(actual.out, "hello");
+    })
+}
+
+#[test]
+fn external_arg_expand_tilde() {
+    Playground::setup("external arg expand tilde", |dirs, _| {
+        let actual = nu!(
+            cwd: dirs.test(), pipeline(
+            r#"
+                ^nu --testbin cococo ~/foo ~/(2 + 2)
+            "#
+        ));
+
+        let home = dirs_next::home_dir().expect("failed to find home dir");
+
+        assert_eq!(
+            actual.out,
+            format!(
+                "{} {}",
+                home.join("foo").display(),
+                home.join("4").display()
+            )
+        );
+    })
+}
+
 #[test]
 fn external_command_not_expand_tilde_with_quotes() {
     Playground::setup(
@@ -231,21 +321,6 @@ fn external_command_receives_raw_binary_data() {
     })
 }
 
-#[cfg(windows)]
-#[test]
-fn failed_command_with_semicolon_will_not_execute_following_cmds_windows() {
-    Playground::setup("external failed command with semicolon", |dirs, _| {
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            "
-                ^cargo asdf; echo done
-            "
-        ));
-
-        assert!(!actual.out.contains("done"));
-    })
-}
-
 #[cfg(windows)]
 #[test]
 fn can_run_batch_files() {
diff --git a/crates/nu-parser/src/flatten.rs b/crates/nu-parser/src/flatten.rs
index 92b424783a..88638b2475 100644
--- a/crates/nu-parser/src/flatten.rs
+++ b/crates/nu-parser/src/flatten.rs
@@ -26,6 +26,7 @@ pub enum FlatShape {
     Flag,
     Float,
     Garbage,
+    GlobInterpolation,
     GlobPattern,
     Int,
     InternalCall(DeclId),
@@ -67,6 +68,7 @@ impl FlatShape {
             FlatShape::Flag => "shape_flag",
             FlatShape::Float => "shape_float",
             FlatShape::Garbage => "shape_garbage",
+            FlatShape::GlobInterpolation => "shape_glob_interpolation",
             FlatShape::GlobPattern => "shape_globpattern",
             FlatShape::Int => "shape_int",
             FlatShape::InternalCall(_) => "shape_internalcall",
@@ -277,7 +279,7 @@ fn flatten_expression_into(
             output[arg_start..].sort();
         }
         Expr::ExternalCall(head, args) => {
-            if let Expr::String(..) = &head.expr {
+            if let Expr::String(..) | Expr::GlobPattern(..) = &head.expr {
                 output.push((head.span, FlatShape::External));
             } else {
                 flatten_expression_into(working_set, head, output);
@@ -286,7 +288,7 @@ fn flatten_expression_into(
             for arg in args.as_ref() {
                 match arg {
                     ExternalArgument::Regular(expr) => {
-                        if let Expr::String(..) = &expr.expr {
+                        if let Expr::String(..) | Expr::GlobPattern(..) = &expr.expr {
                             output.push((expr.span, FlatShape::ExternalArg));
                         } else {
                             flatten_expression_into(working_set, expr, output);
@@ -431,6 +433,25 @@ fn flatten_expression_into(
             }
             output.extend(flattened);
         }
+        Expr::GlobInterpolation(exprs, quoted) => {
+            let mut flattened = vec![];
+            for expr in exprs {
+                flatten_expression_into(working_set, expr, &mut flattened);
+            }
+
+            if *quoted {
+                // If we aren't a bare word interpolation, also highlight the outer quotes
+                output.push((
+                    Span::new(expr.span.start, expr.span.start + 2),
+                    FlatShape::GlobInterpolation,
+                ));
+                flattened.push((
+                    Span::new(expr.span.end - 1, expr.span.end),
+                    FlatShape::GlobInterpolation,
+                ));
+            }
+            output.extend(flattened);
+        }
         Expr::Record(list) => {
             let outer_span = expr.span;
             let mut last_end = outer_span.start;
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 149bce8958..ba718cc771 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -16,7 +16,6 @@ use nu_protocol::{
     IN_VARIABLE_ID,
 };
 use std::{
-    borrow::Cow,
     collections::{HashMap, HashSet},
     num::ParseIntError,
     str,
@@ -222,6 +221,209 @@ pub(crate) fn check_call(
     }
 }
 
+/// Parses a string in the arg or head position of an external call.
+///
+/// If the string begins with `r#`, it is parsed as a raw string. If it doesn't contain any quotes
+/// or parentheses, it is parsed as a glob pattern so that tilde and glob expansion can be handled
+/// by `run-external`. Otherwise, we use a custom state machine to put together an interpolated
+/// string, where each balanced pair of quotes is parsed as a separate part of the string, and then
+/// concatenated together.
+///
+/// For example, `-foo="bar\nbaz"` becomes `$"-foo=bar\nbaz"`
+fn parse_external_string(working_set: &mut StateWorkingSet, span: Span) -> Expression {
+    let contents = &working_set.get_span_contents(span);
+
+    if contents.starts_with(b"r#") {
+        parse_raw_string(working_set, span)
+    } else if contents
+        .iter()
+        .any(|b| matches!(b, b'"' | b'\'' | b'(' | b')'))
+    {
+        enum State {
+            Bare {
+                from: usize,
+            },
+            Quote {
+                from: usize,
+                quote_char: u8,
+                escaped: bool,
+                depth: i32,
+            },
+        }
+        // Find the spans of parts of the string that can be parsed as their own strings for
+        // concatenation.
+        //
+        // By passing each of these parts to `parse_string()`, we can eliminate the quotes and also
+        // handle string interpolation.
+        let make_span = |from: usize, index: usize| Span {
+            start: span.start + from,
+            end: span.start + index,
+        };
+        let mut spans = vec![];
+        let mut state = State::Bare { from: 0 };
+        let mut index = 0;
+        while index < contents.len() {
+            let ch = contents[index];
+            match &mut state {
+                State::Bare { from } => match ch {
+                    b'"' | b'\'' => {
+                        // Push bare string
+                        if index != *from {
+                            spans.push(make_span(*from, index));
+                        }
+                        // then transition to other state
+                        state = State::Quote {
+                            from: index,
+                            quote_char: ch,
+                            escaped: false,
+                            depth: 1,
+                        };
+                    }
+                    b'$' => {
+                        if let Some(&quote_char @ (b'"' | b'\'')) = contents.get(index + 1) {
+                            // Start a dollar quote (interpolated string)
+                            if index != *from {
+                                spans.push(make_span(*from, index));
+                            }
+                            state = State::Quote {
+                                from: index,
+                                quote_char,
+                                escaped: false,
+                                depth: 1,
+                            };
+                            // Skip over two chars (the dollar sign and the quote)
+                            index += 2;
+                            continue;
+                        }
+                    }
+                    // Continue to consume
+                    _ => (),
+                },
+                State::Quote {
+                    from,
+                    quote_char,
+                    escaped,
+                    depth,
+                } => match ch {
+                    ch if ch == *quote_char && !*escaped => {
+                        // Count if there are more than `depth` quotes remaining
+                        if contents[index..]
+                            .iter()
+                            .filter(|b| *b == quote_char)
+                            .count() as i32
+                            > *depth
+                        {
+                            // Increment depth to be greedy
+                            *depth += 1;
+                        } else {
+                            // Decrement depth
+                            *depth -= 1;
+                        }
+                        if *depth == 0 {
+                            // End of string
+                            spans.push(make_span(*from, index + 1));
+                            // go back to Bare state
+                            state = State::Bare { from: index + 1 };
+                        }
+                    }
+                    b'\\' if !*escaped && *quote_char == b'"' => {
+                        // The next token is escaped so it doesn't count (only for double quote)
+                        *escaped = true;
+                    }
+                    _ => {
+                        *escaped = false;
+                    }
+                },
+            }
+            index += 1;
+        }
+
+        // Add the final span
+        match state {
+            State::Bare { from } | State::Quote { from, .. } => {
+                if from < contents.len() {
+                    spans.push(make_span(from, contents.len()));
+                }
+            }
+        }
+
+        // Log the spans that will be parsed
+        if log::log_enabled!(log::Level::Trace) {
+            let contents = spans
+                .iter()
+                .map(|span| String::from_utf8_lossy(working_set.get_span_contents(*span)))
+                .collect::<Vec<_>>();
+
+            trace!("parsing: external string, parts: {contents:?}")
+        }
+
+        // Check if the whole thing is quoted. If not, it should be a glob
+        let quoted =
+            (contents.len() >= 3 && contents.starts_with(b"$\"") && contents.ends_with(b"\""))
+                || is_quoted(contents);
+
+        // Parse each as its own string
+        let exprs: Vec<Expression> = spans
+            .into_iter()
+            .map(|span| parse_string(working_set, span))
+            .collect();
+
+        if exprs
+            .iter()
+            .all(|expr| matches!(expr.expr, Expr::String(..)))
+        {
+            // If the exprs are all strings anyway, just collapse into a single string.
+            let string = exprs
+                .into_iter()
+                .map(|expr| {
+                    let Expr::String(contents) = expr.expr else {
+                        unreachable!("already checked that this was a String")
+                    };
+                    contents
+                })
+                .collect::<String>();
+            if quoted {
+                Expression::new(working_set, Expr::String(string), span, Type::String)
+            } else {
+                Expression::new(
+                    working_set,
+                    Expr::GlobPattern(string, false),
+                    span,
+                    Type::Glob,
+                )
+            }
+        } else {
+            // Flatten any string interpolations contained with the exprs.
+            let exprs = exprs
+                .into_iter()
+                .flat_map(|expr| match expr.expr {
+                    Expr::StringInterpolation(subexprs) => subexprs,
+                    _ => vec![expr],
+                })
+                .collect();
+            // Make an interpolation out of the expressions. Use `GlobInterpolation` if it's a bare
+            // word, so that the unquoted state can get passed through to `run-external`.
+            if quoted {
+                Expression::new(
+                    working_set,
+                    Expr::StringInterpolation(exprs),
+                    span,
+                    Type::String,
+                )
+            } else {
+                Expression::new(
+                    working_set,
+                    Expr::GlobInterpolation(exprs, false),
+                    span,
+                    Type::Glob,
+                )
+            }
+        }
+    } else {
+        parse_glob_pattern(working_set, span)
+    }
+}
+
 fn parse_external_arg(working_set: &mut StateWorkingSet, span: Span) -> ExternalArgument {
     let contents = working_set.get_span_contents(span);
 
@@ -229,8 +431,6 @@ fn parse_external_arg(working_set: &mut StateWorkingSet, span: Span) -> External
         ExternalArgument::Regular(parse_dollar_expr(working_set, span))
     } else if contents.starts_with(b"[") {
         ExternalArgument::Regular(parse_list_expression(working_set, span, &SyntaxShape::Any))
-    } else if contents.starts_with(b"r#") {
-        ExternalArgument::Regular(parse_raw_string(working_set, span))
     } else if contents.len() > 3
         && contents.starts_with(b"...")
         && (contents[3] == b'$' || contents[3] == b'[' || contents[3] == b'(')
@@ -241,18 +441,7 @@ fn parse_external_arg(working_set: &mut StateWorkingSet, span: Span) -> External
             &SyntaxShape::List(Box::new(SyntaxShape::Any)),
         ))
     } else {
-        // Eval stage trims the quotes, so we don't have to do the same thing when parsing.
-        let (contents, err) = unescape_string_preserving_quotes(contents, span);
-        if let Some(err) = err {
-            working_set.error(err);
-        }
-
-        ExternalArgument::Regular(Expression::new(
-            working_set,
-            Expr::String(contents),
-            span,
-            Type::String,
-        ))
+        ExternalArgument::Regular(parse_external_string(working_set, span))
     }
 }
 
@@ -274,18 +463,7 @@ pub fn parse_external_call(working_set: &mut StateWorkingSet, spans: &[Span]) ->
         let arg = parse_expression(working_set, &[head_span]);
         Box::new(arg)
     } else {
-        // Eval stage will unquote the string, so we don't bother with that here
-        let (contents, err) = unescape_string_preserving_quotes(&head_contents, head_span);
-        if let Some(err) = err {
-            working_set.error(err)
-        }
-
-        Box::new(Expression::new(
-            working_set,
-            Expr::String(contents),
-            head_span,
-            Type::String,
-        ))
+        Box::new(parse_external_string(working_set, head_span))
     };
 
     let args = spans[1..]
@@ -2639,23 +2817,6 @@ pub fn unescape_unquote_string(bytes: &[u8], span: Span) -> (String, Option<Pars
     }
 }
 
-/// XXX: This is here temporarily as a patch, but we should replace this with properly representing
-/// the quoted state of a string in the AST
-fn unescape_string_preserving_quotes(bytes: &[u8], span: Span) -> (String, Option<ParseError>) {
-    let (bytes, err) = if bytes.starts_with(b"\"") {
-        let (bytes, err) = unescape_string(bytes, span);
-        (Cow::Owned(bytes), err)
-    } else {
-        (Cow::Borrowed(bytes), None)
-    };
-
-    // The original code for args used lossy conversion here, even though that's not what we
-    // typically use for strings. Revisit whether that's actually desirable later, but don't
-    // want to introduce a breaking change for this patch.
-    let token = String::from_utf8_lossy(&bytes).into_owned();
-    (token, err)
-}
-
 pub fn parse_string(working_set: &mut StateWorkingSet, span: Span) -> Expression {
     trace!("parsing: string");
 
@@ -6012,7 +6173,7 @@ pub fn discover_captures_in_expr(
         }
         Expr::String(_) => {}
         Expr::RawString(_) => {}
-        Expr::StringInterpolation(exprs) => {
+        Expr::StringInterpolation(exprs) | Expr::GlobInterpolation(exprs, _) => {
             for expr in exprs {
                 discover_captures_in_expr(working_set, expr, seen, seen_blocks, output)?;
             }
diff --git a/crates/nu-parser/tests/test_parser.rs b/crates/nu-parser/tests/test_parser.rs
index 2646b3cc90..0784fe69d4 100644
--- a/crates/nu-parser/tests/test_parser.rs
+++ b/crates/nu-parser/tests/test_parser.rs
@@ -1,8 +1,8 @@
 use nu_parser::*;
 use nu_protocol::{
-    ast::{Argument, Call, Expr, ExternalArgument, PathMember, Range},
+    ast::{Argument, Call, Expr, Expression, ExternalArgument, PathMember, Range},
     engine::{Command, EngineState, Stack, StateWorkingSet},
-    ParseError, PipelineData, ShellError, Signature, Span, SyntaxShape,
+    ParseError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
 };
 use rstest::rstest;
 
@@ -182,7 +182,7 @@ pub fn multi_test_parse_int() {
         Test(
             "ranges or relative paths not confused for int",
             b"./a/b",
-            Expr::String("./a/b".into()),
+            Expr::GlobPattern("./a/b".into(), false),
             None,
         ),
         Test(
@@ -694,6 +694,50 @@ pub fn parse_call_missing_req_flag() {
     ));
 }
 
+fn test_external_call(input: &str, tag: &str, f: impl FnOnce(&Expression, &[ExternalArgument])) {
+    let engine_state = EngineState::new();
+    let mut working_set = StateWorkingSet::new(&engine_state);
+    let block = parse(&mut working_set, None, input.as_bytes(), true);
+    assert!(
+        working_set.parse_errors.is_empty(),
+        "{tag}: errors: {:?}",
+        working_set.parse_errors
+    );
+
+    let pipeline = &block.pipelines[0];
+    assert_eq!(1, pipeline.len());
+    let element = &pipeline.elements[0];
+    match &element.expr.expr {
+        Expr::ExternalCall(name, args) => f(name, args),
+        other => {
+            panic!("{tag}: Unexpected expression in pipeline: {other:?}");
+        }
+    }
+}
+
+fn check_external_call_interpolation(
+    tag: &str,
+    subexpr_count: usize,
+    quoted: bool,
+    expr: &Expression,
+) -> bool {
+    match &expr.expr {
+        Expr::StringInterpolation(exprs) => {
+            assert!(quoted, "{tag}: quoted");
+            assert_eq!(expr.ty, Type::String, "{tag}: expr.ty");
+            assert_eq!(subexpr_count, exprs.len(), "{tag}: subexpr_count");
+            true
+        }
+        Expr::GlobInterpolation(exprs, is_quoted) => {
+            assert_eq!(quoted, *is_quoted, "{tag}: quoted");
+            assert_eq!(expr.ty, Type::Glob, "{tag}: expr.ty");
+            assert_eq!(subexpr_count, exprs.len(), "{tag}: subexpr_count");
+            true
+        }
+        _ => false,
+    }
+}
+
 #[rstest]
 #[case("foo-external-call", "foo-external-call", "bare word")]
 #[case("^foo-external-call", "foo-external-call", "bare word with caret")]
@@ -713,200 +757,370 @@ pub fn parse_call_missing_req_flag() {
     r"foo\external-call",
     "bare word with backslash and caret"
 )]
-#[case(
-    "^'foo external call'",
-    "'foo external call'",
-    "single quote with caret"
-)]
-#[case(
-    "^'foo/external call'",
-    "'foo/external call'",
-    "single quote with forward slash and caret"
-)]
-#[case(
-    r"^'foo\external call'",
-    r"'foo\external call'",
-    "single quote with backslash and caret"
-)]
-#[case(
-    r#"^"foo external call""#,
-    r#""foo external call""#,
-    "double quote with caret"
-)]
-#[case(
-    r#"^"foo/external call""#,
-    r#""foo/external call""#,
-    "double quote with forward slash and caret"
-)]
-#[case(
-    r#"^"foo\\external call""#,
-    r#""foo\external call""#,
-    "double quote with backslash and caret"
-)]
-#[case("`foo external call`", "`foo external call`", "backtick quote")]
+#[case("`foo external call`", "foo external call", "backtick quote")]
 #[case(
     "^`foo external call`",
-    "`foo external call`",
+    "foo external call",
     "backtick quote with caret"
 )]
 #[case(
     "`foo/external call`",
-    "`foo/external call`",
+    "foo/external call",
     "backtick quote with forward slash"
 )]
 #[case(
     "^`foo/external call`",
-    "`foo/external call`",
+    "foo/external call",
     "backtick quote with forward slash and caret"
 )]
 #[case(
-    r"^`foo\external call`",
     r"`foo\external call`",
+    r"foo\external call",
     "backtick quote with backslash"
 )]
 #[case(
     r"^`foo\external call`",
-    r"`foo\external call`",
+    r"foo\external call",
     "backtick quote with backslash and caret"
 )]
-fn test_external_call_name(#[case] input: &str, #[case] expected: &str, #[case] tag: &str) {
-    let engine_state = EngineState::new();
-    let mut working_set = StateWorkingSet::new(&engine_state);
-    let block = parse(&mut working_set, None, input.as_bytes(), true);
-    assert!(
-        working_set.parse_errors.is_empty(),
-        "{tag}: errors: {:?}",
-        working_set.parse_errors
-    );
-
-    let pipeline = &block.pipelines[0];
-    assert_eq!(1, pipeline.len());
-    let element = &pipeline.elements[0];
-    match &element.expr.expr {
-        Expr::ExternalCall(name, args) => {
-            match &name.expr {
-                Expr::String(string) => {
-                    assert_eq!(expected, string);
-                }
-                other => {
-                    panic!("{tag}: Unexpected expression in command name position: {other:?}");
-                }
-            }
-            assert_eq!(0, args.len());
-        }
-        other => {
-            panic!("{tag}: Unexpected expression in pipeline: {other:?}");
-        }
-    }
-}
-
-#[rstest]
-#[case("^foo bar-baz", "bar-baz", "bare word")]
-#[case("^foo bar/baz", "bar/baz", "bare word with forward slash")]
-#[case(r"^foo bar\baz", r"bar\baz", "bare word with backslash")]
-#[case("^foo 'bar baz'", "'bar baz'", "single quote")]
-#[case("foo 'bar/baz'", "'bar/baz'", "single quote with forward slash")]
-#[case(r"foo 'bar\baz'", r"'bar\baz'", "single quote with backslash")]
-#[case(r#"^foo "bar baz""#, r#""bar baz""#, "double quote")]
-#[case(r#"^foo "bar/baz""#, r#""bar/baz""#, "double quote with forward slash")]
-#[case(r#"^foo "bar\\baz""#, r#""bar\baz""#, "double quote with backslash")]
-#[case("^foo `bar baz`", "`bar baz`", "backtick quote")]
-#[case("^foo `bar/baz`", "`bar/baz`", "backtick quote with forward slash")]
-#[case(r"^foo `bar\baz`", r"`bar\baz`", "backtick quote with backslash")]
-fn test_external_call_argument_regular(
+pub fn test_external_call_head_glob(
     #[case] input: &str,
     #[case] expected: &str,
     #[case] tag: &str,
 ) {
-    let engine_state = EngineState::new();
-    let mut working_set = StateWorkingSet::new(&engine_state);
-    let block = parse(&mut working_set, None, input.as_bytes(), true);
-    assert!(
-        working_set.parse_errors.is_empty(),
-        "{tag}: errors: {:?}",
-        working_set.parse_errors
-    );
+    test_external_call(input, tag, |name, args| {
+        match &name.expr {
+            Expr::GlobPattern(string, is_quoted) => {
+                assert_eq!(expected, string, "{tag}: incorrect name");
+                assert!(!*is_quoted);
+            }
+            other => {
+                panic!("{tag}: Unexpected expression in command name position: {other:?}");
+            }
+        }
+        assert_eq!(0, args.len());
+    })
+}
 
-    let pipeline = &block.pipelines[0];
-    assert_eq!(1, pipeline.len());
-    let element = &pipeline.elements[0];
-    match &element.expr.expr {
-        Expr::ExternalCall(name, args) => {
-            match &name.expr {
-                Expr::String(string) => {
-                    assert_eq!("foo", string, "{tag}: incorrect name");
+#[rstest]
+#[case(
+    r##"^r#'foo-external-call'#"##,
+    "foo-external-call",
+    "raw string with caret"
+)]
+#[case(
+    r##"^r#'foo/external-call'#"##,
+    "foo/external-call",
+    "raw string with forward slash and caret"
+)]
+#[case(
+    r##"^r#'foo\external-call'#"##,
+    r"foo\external-call",
+    "raw string with backslash and caret"
+)]
+pub fn test_external_call_head_raw_string(
+    #[case] input: &str,
+    #[case] expected: &str,
+    #[case] tag: &str,
+) {
+    test_external_call(input, tag, |name, args| {
+        match &name.expr {
+            Expr::RawString(string) => {
+                assert_eq!(expected, string, "{tag}: incorrect name");
+            }
+            other => {
+                panic!("{tag}: Unexpected expression in command name position: {other:?}");
+            }
+        }
+        assert_eq!(0, args.len());
+    })
+}
+
+#[rstest]
+#[case("^'foo external call'", "foo external call", "single quote with caret")]
+#[case(
+    "^'foo/external call'",
+    "foo/external call",
+    "single quote with forward slash and caret"
+)]
+#[case(
+    r"^'foo\external call'",
+    r"foo\external call",
+    "single quote with backslash and caret"
+)]
+#[case(
+    r#"^"foo external call""#,
+    r#"foo external call"#,
+    "double quote with caret"
+)]
+#[case(
+    r#"^"foo/external call""#,
+    r#"foo/external call"#,
+    "double quote with forward slash and caret"
+)]
+#[case(
+    r#"^"foo\\external call""#,
+    r#"foo\external call"#,
+    "double quote with backslash and caret"
+)]
+pub fn test_external_call_head_string(
+    #[case] input: &str,
+    #[case] expected: &str,
+    #[case] tag: &str,
+) {
+    test_external_call(input, tag, |name, args| {
+        match &name.expr {
+            Expr::String(string) => {
+                assert_eq!(expected, string);
+            }
+            other => {
+                panic!("{tag}: Unexpected expression in command name position: {other:?}");
+            }
+        }
+        assert_eq!(0, args.len());
+    })
+}
+
+#[rstest]
+#[case(r"~/.foo/(1)", 2, false, "unquoted interpolated string")]
+#[case(
+    r"~\.foo(2)\(1)",
+    4,
+    false,
+    "unquoted interpolated string with backslash"
+)]
+#[case(r"^~/.foo/(1)", 2, false, "unquoted interpolated string with caret")]
+#[case(r#"^$"~/.foo/(1)""#, 2, true, "quoted interpolated string with caret")]
+pub fn test_external_call_head_interpolated_string(
+    #[case] input: &str,
+    #[case] subexpr_count: usize,
+    #[case] quoted: bool,
+    #[case] tag: &str,
+) {
+    test_external_call(input, tag, |name, args| {
+        if !check_external_call_interpolation(tag, subexpr_count, quoted, name) {
+            panic!("{tag}: Unexpected expression in command name position: {name:?}");
+        }
+        assert_eq!(0, args.len());
+    })
+}
+
+#[rstest]
+#[case("^foo foo-external-call", "foo-external-call", "bare word")]
+#[case(
+    "^foo foo/external-call",
+    "foo/external-call",
+    "bare word with forward slash"
+)]
+#[case(
+    r"^foo foo\external-call",
+    r"foo\external-call",
+    "bare word with backslash"
+)]
+#[case(
+    "^foo `foo external call`",
+    "foo external call",
+    "backtick quote with caret"
+)]
+#[case(
+    "^foo `foo/external call`",
+    "foo/external call",
+    "backtick quote with forward slash"
+)]
+#[case(
+    r"^foo `foo\external call`",
+    r"foo\external call",
+    "backtick quote with backslash"
+)]
+pub fn test_external_call_arg_glob(#[case] input: &str, #[case] expected: &str, #[case] tag: &str) {
+    test_external_call(input, tag, |name, args| {
+        match &name.expr {
+            Expr::GlobPattern(string, _) => {
+                assert_eq!("foo", string, "{tag}: incorrect name");
+            }
+            other => {
+                panic!("{tag}: Unexpected expression in command name position: {other:?}");
+            }
+        }
+        assert_eq!(1, args.len());
+        match &args[0] {
+            ExternalArgument::Regular(expr) => match &expr.expr {
+                Expr::GlobPattern(string, is_quoted) => {
+                    assert_eq!(expected, string, "{tag}: incorrect arg");
+                    assert!(!*is_quoted);
                 }
                 other => {
-                    panic!("{tag}: Unexpected expression in command name position: {other:?}");
-                }
-            }
-            assert_eq!(1, args.len());
-            match &args[0] {
-                ExternalArgument::Regular(expr) => match &expr.expr {
-                    Expr::String(string) => {
-                        assert_eq!(expected, string, "{tag}: incorrect arg");
-                    }
-                    other => {
-                        panic!("Unexpected expression in command arg position: {other:?}")
-                    }
-                },
-                other @ ExternalArgument::Spread(..) => {
-                    panic!("Unexpected external spread argument in command arg position: {other:?}")
+                    panic!("Unexpected expression in command arg position: {other:?}")
                 }
+            },
+            other @ ExternalArgument::Spread(..) => {
+                panic!("Unexpected external spread argument in command arg position: {other:?}")
             }
         }
-        other => {
-            panic!("{tag}: Unexpected expression in pipeline: {other:?}");
+    })
+}
+
+#[rstest]
+#[case(r##"^foo r#'foo-external-call'#"##, "foo-external-call", "raw string")]
+#[case(
+    r##"^foo r#'foo/external-call'#"##,
+    "foo/external-call",
+    "raw string with forward slash"
+)]
+#[case(
+    r##"^foo r#'foo\external-call'#"##,
+    r"foo\external-call",
+    "raw string with backslash"
+)]
+pub fn test_external_call_arg_raw_string(
+    #[case] input: &str,
+    #[case] expected: &str,
+    #[case] tag: &str,
+) {
+    test_external_call(input, tag, |name, args| {
+        match &name.expr {
+            Expr::GlobPattern(string, _) => {
+                assert_eq!("foo", string, "{tag}: incorrect name");
+            }
+            other => {
+                panic!("{tag}: Unexpected expression in command name position: {other:?}");
+            }
         }
-    }
+        assert_eq!(1, args.len());
+        match &args[0] {
+            ExternalArgument::Regular(expr) => match &expr.expr {
+                Expr::RawString(string) => {
+                    assert_eq!(expected, string, "{tag}: incorrect arg");
+                }
+                other => {
+                    panic!("Unexpected expression in command arg position: {other:?}")
+                }
+            },
+            other @ ExternalArgument::Spread(..) => {
+                panic!("Unexpected external spread argument in command arg position: {other:?}")
+            }
+        }
+    })
+}
+
+#[rstest]
+#[case("^foo 'foo external call'", "foo external call", "single quote")]
+#[case(
+    "^foo 'foo/external call'",
+    "foo/external call",
+    "single quote with forward slash"
+)]
+#[case(
+    r"^foo 'foo\external call'",
+    r"foo\external call",
+    "single quote with backslash"
+)]
+#[case(r#"^foo "foo external call""#, r#"foo external call"#, "double quote")]
+#[case(
+    r#"^foo "foo/external call""#,
+    r#"foo/external call"#,
+    "double quote with forward slash"
+)]
+#[case(
+    r#"^foo "foo\\external call""#,
+    r#"foo\external call"#,
+    "double quote with backslash"
+)]
+pub fn test_external_call_arg_string(
+    #[case] input: &str,
+    #[case] expected: &str,
+    #[case] tag: &str,
+) {
+    test_external_call(input, tag, |name, args| {
+        match &name.expr {
+            Expr::GlobPattern(string, _) => {
+                assert_eq!("foo", string, "{tag}: incorrect name");
+            }
+            other => {
+                panic!("{tag}: Unexpected expression in command name position: {other:?}");
+            }
+        }
+        assert_eq!(1, args.len());
+        match &args[0] {
+            ExternalArgument::Regular(expr) => match &expr.expr {
+                Expr::String(string) => {
+                    assert_eq!(expected, string, "{tag}: incorrect arg");
+                }
+                other => {
+                    panic!("{tag}: Unexpected expression in command arg position: {other:?}")
+                }
+            },
+            other @ ExternalArgument::Spread(..) => {
+                panic!(
+                    "{tag}: Unexpected external spread argument in command arg position: {other:?}"
+                )
+            }
+        }
+    })
+}
+
+#[rstest]
+#[case(r"^foo ~/.foo/(1)", 2, false, "unquoted interpolated string")]
+#[case(r#"^foo $"~/.foo/(1)""#, 2, true, "quoted interpolated string")]
+pub fn test_external_call_arg_interpolated_string(
+    #[case] input: &str,
+    #[case] subexpr_count: usize,
+    #[case] quoted: bool,
+    #[case] tag: &str,
+) {
+    test_external_call(input, tag, |name, args| {
+        match &name.expr {
+            Expr::GlobPattern(string, _) => {
+                assert_eq!("foo", string, "{tag}: incorrect name");
+            }
+            other => {
+                panic!("{tag}: Unexpected expression in command name position: {other:?}");
+            }
+        }
+        assert_eq!(1, args.len());
+        match &args[0] {
+            ExternalArgument::Regular(expr) => {
+                if !check_external_call_interpolation(tag, subexpr_count, quoted, expr) {
+                    panic!("Unexpected expression in command arg position: {expr:?}")
+                }
+            }
+            other @ ExternalArgument::Spread(..) => {
+                panic!("Unexpected external spread argument in command arg position: {other:?}")
+            }
+        }
+    })
 }
 
 #[test]
 fn test_external_call_argument_spread() {
-    let engine_state = EngineState::new();
-    let mut working_set = StateWorkingSet::new(&engine_state);
-    let block = parse(&mut working_set, None, b"^foo ...[a b c]", true);
-    assert!(
-        working_set.parse_errors.is_empty(),
-        "errors: {:?}",
-        working_set.parse_errors
-    );
+    let input = r"^foo ...[a b c]";
+    let tag = "spread";
 
-    let pipeline = &block.pipelines[0];
-    assert_eq!(1, pipeline.len());
-    let element = &pipeline.elements[0];
-    match &element.expr.expr {
-        Expr::ExternalCall(name, args) => {
-            match &name.expr {
-                Expr::String(string) => {
-                    assert_eq!("foo", string, "incorrect name");
+    test_external_call(input, tag, |name, args| {
+        match &name.expr {
+            Expr::GlobPattern(string, _) => {
+                assert_eq!("foo", string, "incorrect name");
+            }
+            other => {
+                panic!("Unexpected expression in command name position: {other:?}");
+            }
+        }
+        assert_eq!(1, args.len());
+        match &args[0] {
+            ExternalArgument::Spread(expr) => match &expr.expr {
+                Expr::List(items) => {
+                    assert_eq!(3, items.len());
+                    // that's good enough, don't really need to go so deep into it...
                 }
                 other => {
-                    panic!("Unexpected expression in command name position: {other:?}");
-                }
-            }
-            assert_eq!(1, args.len());
-            match &args[0] {
-                ExternalArgument::Spread(expr) => match &expr.expr {
-                    Expr::List(items) => {
-                        assert_eq!(3, items.len());
-                        // that's good enough, don't really need to go so deep into it...
-                    }
-                    other => {
-                        panic!("Unexpected expression in command arg position: {other:?}")
-                    }
-                },
-                other @ ExternalArgument::Regular(..) => {
-                    panic!(
-                        "Unexpected external regular argument in command arg position: {other:?}"
-                    )
+                    panic!("Unexpected expression in command arg position: {other:?}")
                 }
+            },
+            other @ ExternalArgument::Regular(..) => {
+                panic!("Unexpected external regular argument in command arg position: {other:?}")
             }
         }
-        other => {
-            panic!("Unexpected expression in pipeline: {other:?}");
-        }
-    }
+    })
 }
 
 #[test]
@@ -1132,6 +1346,44 @@ mod string {
             assert_eq!(subexprs[0], &Expr::String("(1 + 3)(7 - 5)".to_string()));
         }
 
+        #[test]
+        pub fn parse_string_interpolation_bare() {
+            let engine_state = EngineState::new();
+            let mut working_set = StateWorkingSet::new(&engine_state);
+
+            let block = parse(
+                &mut working_set,
+                None,
+                b"\"\" ++ foo(1 + 3)bar(7 - 5)",
+                true,
+            );
+
+            assert!(working_set.parse_errors.is_empty());
+
+            assert_eq!(block.len(), 1);
+            let pipeline = &block.pipelines[0];
+            assert_eq!(pipeline.len(), 1);
+            let element = &pipeline.elements[0];
+            assert!(element.redirection.is_none());
+
+            let subexprs: Vec<&Expr> = match &element.expr.expr {
+                Expr::BinaryOp(_, _, rhs) => match &rhs.expr {
+                    Expr::StringInterpolation(expressions) => {
+                        expressions.iter().map(|e| &e.expr).collect()
+                    }
+                    _ => panic!("Expected an `Expr::StringInterpolation`"),
+                },
+                _ => panic!("Expected an `Expr::BinaryOp`"),
+            };
+
+            assert_eq!(subexprs.len(), 4);
+
+            assert_eq!(subexprs[0], &Expr::String("foo".to_string()));
+            assert!(matches!(subexprs[1], &Expr::FullCellPath(..)));
+            assert_eq!(subexprs[2], &Expr::String("bar".to_string()));
+            assert!(matches!(subexprs[3], &Expr::FullCellPath(..)));
+        }
+
         #[test]
         pub fn parse_nested_expressions() {
             let engine_state = EngineState::new();
diff --git a/crates/nu-protocol/src/ast/expr.rs b/crates/nu-protocol/src/ast/expr.rs
index 13d9e42985..0e561e5c8f 100644
--- a/crates/nu-protocol/src/ast/expr.rs
+++ b/crates/nu-protocol/src/ast/expr.rs
@@ -32,8 +32,11 @@ pub enum Expr {
     Keyword(Box<Keyword>),
     ValueWithUnit(Box<ValueWithUnit>),
     DateTime(chrono::DateTime<FixedOffset>),
+    /// The boolean is `true` if the string is quoted.
     Filepath(String, bool),
+    /// The boolean is `true` if the string is quoted.
     Directory(String, bool),
+    /// The boolean is `true` if the string is quoted.
     GlobPattern(String, bool),
     String(String),
     RawString(String),
@@ -43,6 +46,8 @@ pub enum Expr {
     Overlay(Option<BlockId>), // block ID of the overlay's origin module
     Signature(Box<Signature>),
     StringInterpolation(Vec<Expression>),
+    /// The boolean is `true` if the string is quoted.
+    GlobInterpolation(Vec<Expression>, bool),
     Nothing,
     Garbage,
 }
@@ -84,6 +89,7 @@ impl Expr {
             | Expr::RawString(_)
             | Expr::CellPath(_)
             | Expr::StringInterpolation(_)
+            | Expr::GlobInterpolation(_, _)
             | Expr::Nothing => {
                 // These expressions do not use the output of the pipeline in any meaningful way,
                 // so we can discard the previous output by redirecting it to `Null`.
diff --git a/crates/nu-protocol/src/ast/expression.rs b/crates/nu-protocol/src/ast/expression.rs
index 08ecc59aaf..040e140cab 100644
--- a/crates/nu-protocol/src/ast/expression.rs
+++ b/crates/nu-protocol/src/ast/expression.rs
@@ -232,7 +232,7 @@ impl Expression {
                 }
                 false
             }
-            Expr::StringInterpolation(items) => {
+            Expr::StringInterpolation(items) | Expr::GlobInterpolation(items, _) => {
                 for i in items {
                     if i.has_in_variable(working_set) {
                         return true;
@@ -441,7 +441,7 @@ impl Expression {
             Expr::Signature(_) => {}
             Expr::String(_) => {}
             Expr::RawString(_) => {}
-            Expr::StringInterpolation(items) => {
+            Expr::StringInterpolation(items) | Expr::GlobInterpolation(items, _) => {
                 for i in items {
                     i.replace_span(working_set, replaced, new_span)
                 }
diff --git a/crates/nu-protocol/src/debugger/profiler.rs b/crates/nu-protocol/src/debugger/profiler.rs
index 0fa2d4f3aa..c3066c0a14 100644
--- a/crates/nu-protocol/src/debugger/profiler.rs
+++ b/crates/nu-protocol/src/debugger/profiler.rs
@@ -258,6 +258,7 @@ fn expr_to_string(engine_state: &EngineState, expr: &Expr) -> String {
         Expr::Signature(_) => "signature".to_string(),
         Expr::String(_) | Expr::RawString(_) => "string".to_string(),
         Expr::StringInterpolation(_) => "string interpolation".to_string(),
+        Expr::GlobInterpolation(_, _) => "glob interpolation".to_string(),
         Expr::Subexpression(_) => "subexpression".to_string(),
         Expr::Table(_) => "table".to_string(),
         Expr::UnaryNot(_) => "unary not".to_string(),
diff --git a/crates/nu-protocol/src/eval_base.rs b/crates/nu-protocol/src/eval_base.rs
index 2317149460..7e1e2b0a7c 100644
--- a/crates/nu-protocol/src/eval_base.rs
+++ b/crates/nu-protocol/src/eval_base.rs
@@ -290,6 +290,15 @@ pub trait Eval {
 
                 Ok(Value::string(str, expr_span))
             }
+            Expr::GlobInterpolation(exprs, quoted) => {
+                let config = Self::get_config(state, mut_state);
+                let str = exprs
+                    .iter()
+                    .map(|expr| Self::eval::<D>(state, mut_state, expr).map(|v| v.to_expanded_string(", ", &config)))
+                    .collect::<Result<String, _>>()?;
+
+                Ok(Value::glob(str, *quoted, expr_span))
+            }
             Expr::Overlay(_) => Self::eval_overlay(state, expr_span),
             Expr::GlobPattern(pattern, quoted) => {
                 // GlobPattern is similar to Filepath
diff --git a/crates/nu-test-support/src/macros.rs b/crates/nu-test-support/src/macros.rs
index 51d743e1a4..e83b4354da 100644
--- a/crates/nu-test-support/src/macros.rs
+++ b/crates/nu-test-support/src/macros.rs
@@ -245,6 +245,7 @@ use tempfile::tempdir;
 pub struct NuOpts {
     pub cwd: Option<String>,
     pub locale: Option<String>,
+    pub envs: Option<Vec<(String, String)>>,
     pub collapse_output: Option<bool>,
 }
 
@@ -278,6 +279,11 @@ pub fn nu_run_test(opts: NuOpts, commands: impl AsRef<str>, with_std: bool) -> O
     command
         .env(nu_utils::locale::LOCALE_OVERRIDE_ENV_VAR, locale)
         .env(NATIVE_PATH_ENV_VAR, paths_joined);
+
+    if let Some(envs) = opts.envs {
+        command.envs(envs);
+    }
+
     // Ensure that the user's config doesn't interfere with the tests
     command.arg("--no-config-file");
     if !with_std {
diff --git a/crates/nuon/src/from.rs b/crates/nuon/src/from.rs
index f9230d6140..2cfeaebc61 100644
--- a/crates/nuon/src/from.rs
+++ b/crates/nuon/src/from.rs
@@ -323,6 +323,12 @@ fn convert_to_value(
             msg: "string interpolation not supported in nuon".into(),
             span: expr.span,
         }),
+        Expr::GlobInterpolation(..) => Err(ShellError::OutsideSpannedLabeledError {
+            src: original_text.to_string(),
+            error: "Error when loading".into(),
+            msg: "glob interpolation not supported in nuon".into(),
+            span: expr.span,
+        }),
         Expr::Subexpression(..) => Err(ShellError::OutsideSpannedLabeledError {
             src: original_text.to_string(),
             error: "Error when loading".into(),

From 26bdba206890acb1de87cf0636bbccc9520e9bc4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Jun 2024 16:10:27 +0800
Subject: [PATCH 0121/1072] Bump interprocess from 2.1.0 to 2.2.0 (#13178)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [interprocess](https://github.com/kotauskas/interprocess) from
2.1.0 to 2.2.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/kotauskas/interprocess/releases">interprocess's
releases</a>.</em></p>
<blockquote>
<h2>2.2.0 – Tokio unnamed pipes</h2>
<ul>
<li>Tokio-based unnamed pipes, with subpar performance on Windows due to
OS API limitations</li>
<li>Examples for unnamed pipes, both non-async and Tokio</li>
<li>Impersonation for Windows named pipes</li>
<li>Improvements to the implementation of Windows pipe flushing on
Tokio</li>
</ul>
<h2>2.1.1</h2>
<ul>
<li>Removed async <code>Incoming</code> and <code>futures::Stream</code>
(&quot;<code>AsyncIterator</code>&quot;) implementations on
<code>local_socket::traits::Listener</code> implementors – those were
actually completely broken, so this change is not breaking in practice
and thus does not warrant a bump to 3.0.0</li>
<li>Fixed <code>ListenerOptionsExt::mode()</code> behavior in
<code>umask</code> fallback mode and improved its documentation</li>
<li>Moved examples to their own dedicated files with the help of the <a
href="https://crates.io/crates/doctest-file"><code>doctest-file</code></a>
crate</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/kotauskas/interprocess/commit/050ae2e9dd29268c14340ece35ff4e49b54b6c31"><code>050ae2e</code></a>
Adjust unnamed pipe examples</li>
<li><a
href="https://github.com/kotauskas/interprocess/commit/5bcd6694e97479e7249d9af48162db3a36a80828"><code>5bcd669</code></a>
Add named pipe impersonation</li>
<li><a
href="https://github.com/kotauskas/interprocess/commit/0735668a5ea9672b0c397dd6ad412fea893e4d36"><code>0735668</code></a>
Add <code>peek_msg_len()</code></li>
<li><a
href="https://github.com/kotauskas/interprocess/commit/316d130a8523026422e39756cf45a12278ce6abf"><code>316d130</code></a>
Don't elide flush for from-handle conversion</li>
<li><a
href="https://github.com/kotauskas/interprocess/commit/0b1d1ac8b7be878b7276b3ce9f45cecbaa2cc462"><code>0b1d1ac</code></a>
Crackhead specialization</li>
<li><a
href="https://github.com/kotauskas/interprocess/commit/2315ee1de7667278960e1c4296511400d0df0221"><code>2315ee1</code></a>
Adjust TODOs</li>
<li><a
href="https://github.com/kotauskas/interprocess/commit/cba79cf317ec07e5b2627243cf39cc9365474264"><code>cba79cf</code></a>
Improve <code>Debug</code> of local socket halves</li>
<li><a
href="https://github.com/kotauskas/interprocess/commit/d80e871cd36f88ddb3d40299442771d4e3acd6be"><code>d80e871</code></a>
nah</li>
<li><a
href="https://github.com/kotauskas/interprocess/commit/9a96e58a0ad1cec3d231563d642afe189e5bfc3d"><code>9a96e58</code></a>
Tokio unnamed pipe examples</li>
<li><a
href="https://github.com/kotauskas/interprocess/commit/30fa27afc2645d1db22dd3b76faf551d3f2ad156"><code>30fa27a</code></a>
Handle conversions for Windows Tokio unnamed pipes</li>
<li>Additional commits viewable in <a
href="https://github.com/kotauskas/interprocess/compare/2.1.0...2.2.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=interprocess&package-manager=cargo&previous-version=2.1.0&new-version=2.2.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 11 +++++++++--
 Cargo.toml |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0db346b785..ba1880d9b5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1227,6 +1227,12 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 
+[[package]]
+name = "doctest-file"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aac81fa3e28d21450aa4d2ac065992ba96a1d7303efbce51a95f4fd175b67562"
+
 [[package]]
 name = "downcast-rs"
 version = "1.2.1"
@@ -2026,10 +2032,11 @@ dependencies = [
 
 [[package]]
 name = "interprocess"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4d0250d41da118226e55b3d50ca3f0d9e0a0f6829b92f543ac0054aeea1572"
+checksum = "67bafc2f5dbdad79a6d925649758d5472647b416028099f0b829d1b67fdd47d3"
 dependencies = [
+ "doctest-file",
  "libc",
  "recvmsg",
  "widestring",
diff --git a/Cargo.toml b/Cargo.toml
index 18f45987e7..6fce7d3c01 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -95,7 +95,7 @@ heck = "0.5.0"
 human-date-parser = "0.1.1"
 indexmap = "2.2"
 indicatif = "0.17"
-interprocess = "2.1.0"
+interprocess = "2.2.0"
 is_executable = "1.0"
 itertools = "0.12"
 libc = "0.2"

From bb6cb94e559c2f0a690b468949e5a40ba52b082f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Jun 2024 16:10:39 +0800
Subject: [PATCH 0122/1072] Bump actions/checkout from 4.1.6 to 4.1.7 (#13177)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.6
to 4.1.7.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/actions/checkout/releases">actions/checkout's
releases</a>.</em></p>
<blockquote>
<h2>v4.1.7</h2>
<h2>What's Changed</h2>
<ul>
<li>Bump the minor-npm-dependencies group across 1 directory with 4
updates by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/1739">actions/checkout#1739</a></li>
<li>Bump actions/checkout from 3 to 4 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/1697">actions/checkout#1697</a></li>
<li>Check out other refs/* by commit by <a
href="https://github.com/orhantoy"><code>@​orhantoy</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/1774">actions/checkout#1774</a></li>
<li>Pin actions/checkout's own workflows to a known, good, stable
version. by <a href="https://github.com/jww3"><code>@​jww3</code></a> in
<a
href="https://redirect.github.com/actions/checkout/pull/1776">actions/checkout#1776</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/orhantoy"><code>@​orhantoy</code></a>
made their first contribution in <a
href="https://redirect.github.com/actions/checkout/pull/1774">actions/checkout#1774</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/actions/checkout/compare/v4.1.6...v4.1.7">https://github.com/actions/checkout/compare/v4.1.6...v4.1.7</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/actions/checkout/blob/main/CHANGELOG.md">actions/checkout's
changelog</a>.</em></p>
<blockquote>
<h2>v4.1.7</h2>
<ul>
<li>Bump the minor-npm-dependencies group across 1 directory with 4
updates by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/1739">actions/checkout#1739</a></li>
<li>Bump actions/checkout from 3 to 4 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/1697">actions/checkout#1697</a></li>
<li>Check out other refs/* by commit by <a
href="https://github.com/orhantoy"><code>@​orhantoy</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/1774">actions/checkout#1774</a></li>
<li>Pin actions/checkout's own workflows to a known, good, stable
version. by <a href="https://github.com/jww3"><code>@​jww3</code></a> in
<a
href="https://redirect.github.com/actions/checkout/pull/1776">actions/checkout#1776</a></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/actions/checkout/commit/692973e3d937129bcbf40652eb9f2f61becf3332"><code>692973e</code></a>
Prepare 4.1.7 release (<a
href="https://redirect.github.com/actions/checkout/issues/1775">#1775</a>)</li>
<li><a
href="https://github.com/actions/checkout/commit/6ccd57f4c5d15bdc2fef309bd9fb6cc9db2ef1c6"><code>6ccd57f</code></a>
Pin actions/checkout's own workflows to a known, good, stable version.
(<a
href="https://redirect.github.com/actions/checkout/issues/1776">#1776</a>)</li>
<li><a
href="https://github.com/actions/checkout/commit/b17fe1e4d59a9d1d95a7aead5e6fcd13e50939a5"><code>b17fe1e</code></a>
Handle hidden refs (<a
href="https://redirect.github.com/actions/checkout/issues/1774">#1774</a>)</li>
<li><a
href="https://github.com/actions/checkout/commit/b80ff79f1755d06ba70441c368a6fe801f5f3a62"><code>b80ff79</code></a>
Bump actions/checkout from 3 to 4 (<a
href="https://redirect.github.com/actions/checkout/issues/1697">#1697</a>)</li>
<li><a
href="https://github.com/actions/checkout/commit/b1ec3021b8fa02164da82ca1557d017d83b0e179"><code>b1ec302</code></a>
Bump the minor-npm-dependencies group across 1 directory with 4 updates
(<a
href="https://redirect.github.com/actions/checkout/issues/1739">#1739</a>)</li>
<li>See full diff in <a
href="https://github.com/actions/checkout/compare/v4.1.6...v4.1.7">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/checkout&package-manager=github_actions&previous-version=4.1.6&new-version=4.1.7)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/audit.yml         | 2 +-
 .github/workflows/ci.yml            | 8 ++++----
 .github/workflows/nightly-build.yml | 6 +++---
 .github/workflows/release.yml       | 2 +-
 .github/workflows/typos.yml         | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
index a0295b3b4d..694ff6e1bb 100644
--- a/.github/workflows/audit.yml
+++ b/.github/workflows/audit.yml
@@ -19,7 +19,7 @@ jobs:
     # Prevent sudden announcement of a new advisory from failing ci:
     continue-on-error: true
     steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v4.1.7
       - uses: rustsec/audit-check@v1.4.1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cb94e5fe8b..25fcfde55e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
     runs-on: ${{ matrix.platform }}
 
     steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v4.1.7
 
       - name: Setup Rust toolchain and cache
         uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
@@ -66,7 +66,7 @@ jobs:
     runs-on: ${{ matrix.platform }}
 
     steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v4.1.7
 
       - name: Setup Rust toolchain and cache
         uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
@@ -95,7 +95,7 @@ jobs:
     runs-on: ${{ matrix.platform }}
 
     steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v4.1.7
 
       - name: Setup Rust toolchain and cache
         uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
@@ -146,7 +146,7 @@ jobs:
     runs-on: ${{ matrix.platform }}
 
     steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v4.1.7
 
       - name: Setup Rust toolchain and cache
         uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 4f6dccbcf9..9a30cae614 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -27,7 +27,7 @@ jobs:
     # if: github.repository == 'nushell/nightly'
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
         if: github.repository == 'nushell/nightly'
         with:
           ref: main
@@ -112,7 +112,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     steps:
-    - uses: actions/checkout@v4.1.6
+    - uses: actions/checkout@v4.1.7
       with:
         ref: main
         fetch-depth: 0
@@ -181,7 +181,7 @@ jobs:
       - name: Waiting for Release
         run: sleep 1800
 
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v4.1.7
         with:
           ref: main
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a71792e8c8..31fb1197a3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -62,7 +62,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     steps:
-    - uses: actions/checkout@v4.1.6
+    - uses: actions/checkout@v4.1.7
 
     - name: Update Rust Toolchain Target
       run: |
diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index d33750e337..33e7ac0945 100644
--- a/.github/workflows/typos.yml
+++ b/.github/workflows/typos.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Actions Repository
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
 
       - name: Check spelling
         uses: crate-ci/typos@v1.22.7

From c09a8a5ec954974cf22ae2e4d7f2c99628272116 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 20 Jun 2024 06:30:43 -0500
Subject: [PATCH 0123/1072] add a system level folder for future autoloading
 (#13180)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

This PR adds a directory to the `$nu` constant that shows where the
system level autoload directory is located at. This folder is modifiable
at compile time with environment variables.
```rust
    // Create a system level directory for nushell scripts, modules, completions, etc
    // that can be changed by setting the NU_VENDOR_AUTOLOAD_DIR env var on any platform
    // before nushell is compiled OR if NU_VENDOR_AUTOLOAD_DIR is not set for non-windows
    // systems, the PREFIX env var can be set before compile and used as PREFIX/nushell/vendor/autoload

    // pseudo code
    // if env var NU_VENDOR_AUTOLOAD_DIR is set, in any platform, use it
    // if not, if windows, use ALLUSERPROFILE\nushell\vendor\autoload
    // if not, if non-windows, if env var PREFIX is set, use PREFIX/share/nushell/vendor/autoload
    // if not, use the default /usr/share/nushell/vendor/autoload
```

### Windows default
```nushell
❯ $nu.vendor-autoload-dir
C:\ProgramData\nushell\vendor\autoload
```
### Non-Windows default
```nushell
❯ $nu.vendor-autoload-dir
/usr/local/share/nushell/vendor/autoload
```
### Non-Windows with PREFIX set
```nushell
❯ PREFIX=/usr/bob cargo r
❯ $nu.vendor-autoload-dir
/usr/bob/share/nushell/vendor/autoload
```
### Non-Windows with NU_VENDOR_AUTOLOAD_DIR set
```nushell
❯ NU_VENDOR_AUTOLOAD_DIR=/some/other/path/nushell/stuff cargo r
❯ $nu.vendor-autoload-dir
/some/other/path/nushell/stuff
```

> [!IMPORTANT]
To be clear, this PR does not do the auto-loading, it just sets up the
folder to support that functionality that can be added in a later PR.
The PR also does not create the folder defined. It's just setting the
$nu constant.
 
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-cli/tests/completions/mod.rs |  3 +-
 crates/nu-protocol/src/eval_const.rs   | 40 ++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index 107de98c80..35e9435b41 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -763,7 +763,7 @@ fn variables_completions() {
     // Test completions for $nu
     let suggestions = completer.complete("$nu.", 4);
 
-    assert_eq!(17, suggestions.len());
+    assert_eq!(18, suggestions.len());
 
     let expected: Vec<String> = vec![
         "cache-dir".into(),
@@ -783,6 +783,7 @@ fn variables_completions() {
         "plugin-path".into(),
         "startup-time".into(),
         "temp-path".into(),
+        "vendor-autoload-dir".into(),
     ];
 
     // Match results
diff --git a/crates/nu-protocol/src/eval_const.rs b/crates/nu-protocol/src/eval_const.rs
index 9f81a6f38b..8f6382ae44 100644
--- a/crates/nu-protocol/src/eval_const.rs
+++ b/crates/nu-protocol/src/eval_const.rs
@@ -181,6 +181,46 @@ pub(crate) fn create_nu_constant(engine_state: &EngineState, span: Span) -> Valu
         },
     );
 
+    // Create a system level directory for nushell scripts, modules, completions, etc
+    // that can be changed by setting the NU_VENDOR_AUTOLOAD_DIR env var on any platform
+    // before nushell is compiled OR if NU_VENDOR_AUTOLOAD_DIR is not set for non-windows
+    // systems, the PREFIX env var can be set before compile and used as PREFIX/nushell/vendor/autoload
+    record.push(
+        "vendor-autoload-dir",
+        // pseudo code
+        // if env var NU_VENDOR_AUTOLOAD_DIR is set, in any platform, use it
+        // if not, if windows, use ALLUSERPROFILE\nushell\vendor\autoload
+        // if not, if non-windows, if env var PREFIX is set, use PREFIX/share/nushell/vendor/autoload
+        // if not, use the default /usr/share/nushell/vendor/autoload
+
+        // check to see if NU_VENDOR_AUTOLOAD_DIR env var is set, if not, use the default
+        Value::string(
+            option_env!("NU_VENDOR_AUTOLOAD_DIR")
+                .map(String::from)
+                .unwrap_or_else(|| {
+                    if cfg!(windows) {
+                        let all_user_profile = match engine_state.get_env_var("ALLUSERPROFILE") {
+                            Some(v) => format!(
+                                "{}\\nushell\\vendor\\autoload",
+                                v.coerce_string().unwrap_or("C:\\ProgramData".into())
+                            ),
+                            None => "C:\\ProgramData\\nushell\\vendor\\autoload".into(),
+                        };
+                        all_user_profile
+                    } else {
+                        // In non-Windows environments, if NU_VENDOR_AUTOLOAD_DIR is not set
+                        // check to see if PREFIX env var is set, and use it as PREFIX/nushell/vendor/autoload
+                        // otherwise default to /usr/share/nushell/vendor/autoload
+                        option_env!("PREFIX").map(String::from).map_or_else(
+                            || "/usr/local/share/nushell/vendor/autoload".into(),
+                            |prefix| format!("{}/share/nushell/vendor/autoload", prefix),
+                        )
+                    }
+                }),
+            span,
+        ),
+    );
+
     record.push("temp-path", {
         let canon_temp_path = canonicalize_path(engine_state, &std::env::temp_dir());
         Value::string(canon_temp_path.to_string_lossy(), span)

From 7d2d573eb8bbc14faf37dc3f3bbba658e18e475f Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Thu, 20 Jun 2024 10:55:49 -0700
Subject: [PATCH 0124/1072] Added the ability to open json lines dataframes
 with polars lazy json lines reader. (#13167)

The `--lazy` flag will now use the polars' LazyJsonLinesReader when
opening a json lines file with `polars open`
---
 .../src/dataframe/eager/open.rs               | 78 ++++++++++++-------
 1 file changed, 48 insertions(+), 30 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/eager/open.rs b/crates/nu_plugin_polars/src/dataframe/eager/open.rs
index 13a65074f0..902a4df5a9 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/open.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/open.rs
@@ -19,9 +19,12 @@ use std::{
     sync::Arc,
 };
 
-use polars::prelude::{
-    CsvEncoding, IpcReader, JsonFormat, JsonReader, LazyCsvReader, LazyFileListReader, LazyFrame,
-    ParquetReader, ScanArgsIpc, ScanArgsParquet, SerReader,
+use polars::{
+    lazy::frame::LazyJsonLineReader,
+    prelude::{
+        CsvEncoding, IpcReader, JsonFormat, JsonReader, LazyCsvReader, LazyFileListReader,
+        LazyFrame, ParquetReader, ScanArgsIpc, ScanArgsParquet, SerReader,
+    },
 };
 
 use polars_io::{
@@ -375,36 +378,51 @@ fn from_jsonl(
         .get_flag("schema")?
         .map(|schema| NuSchema::try_from(&schema))
         .transpose()?;
-    let file = File::open(file_path).map_err(|e| ShellError::GenericError {
-        error: "Error opening file".into(),
-        msg: e.to_string(),
-        span: Some(file_span),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let buf_reader = BufReader::new(file);
-    let reader = JsonReader::new(buf_reader)
-        .with_json_format(JsonFormat::JsonLines)
-        .infer_schema_len(infer_schema);
-
-    let reader = match maybe_schema {
-        Some(schema) => reader.with_schema(schema.into()),
-        None => reader,
-    };
-
-    let df: NuDataFrame = reader
-        .finish()
-        .map_err(|e| ShellError::GenericError {
-            error: "Json lines reader error".into(),
-            msg: format!("{e:?}"),
-            span: Some(call.head),
+    if call.has_flag("lazy")? {
+        let df = LazyJsonLineReader::new(file_path)
+            .with_infer_schema_length(infer_schema)
+            .with_schema(maybe_schema.map(|s| s.into()))
+            .finish()
+            .map_err(|e| ShellError::GenericError {
+                error: format!("Json lines reader error: {e}"),
+                msg: "".into(),
+                span: Some(call.head),
+                help: None,
+                inner: vec![],
+            })?;
+        let df = NuLazyFrame::new(false, df);
+        df.cache_and_to_value(plugin, engine, call.head)
+    } else {
+        let file = File::open(file_path).map_err(|e| ShellError::GenericError {
+            error: "Error opening file".into(),
+            msg: e.to_string(),
+            span: Some(file_span),
             help: None,
             inner: vec![],
-        })?
-        .into();
+        })?;
+        let buf_reader = BufReader::new(file);
+        let reader = JsonReader::new(buf_reader)
+            .with_json_format(JsonFormat::JsonLines)
+            .infer_schema_len(infer_schema);
 
-    df.cache_and_to_value(plugin, engine, call.head)
+        let reader = match maybe_schema {
+            Some(schema) => reader.with_schema(schema.into()),
+            None => reader,
+        };
+
+        let df: NuDataFrame = reader
+            .finish()
+            .map_err(|e| ShellError::GenericError {
+                error: "Json lines reader error".into(),
+                msg: format!("{e:?}"),
+                span: Some(call.head),
+                help: None,
+                inner: vec![],
+            })?
+            .into();
+
+        df.cache_and_to_value(plugin, engine, call.head)
+    }
 }
 
 fn from_csv(

From 20834c9d47b25182d944e7db61fc3c944e11b2cc Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Thu, 20 Jun 2024 16:37:38 -0700
Subject: [PATCH 0125/1072] Added the ability to turn on performance debugging
 through and env var for the polars plugin (#13191)

This allows performance debugging to be turned on by setting:

```nushell
$env.POLARS_PLUGIN_PERF = "true"
```

Furthermore, this improves the other plugin debugging by allowing the
env variable for debugging to be set at any time versus having to be
available when nushell is launched:

```nushell
$env.POLARS_PLUGIN_DEBUG = "true"
```

This plugin introduces a `perf` function that will output timing
results. This works very similar to the perf function available in
nu_utils::utils::perf. This version prints everything to std error to
not break the plugin stream and uses the engine interface to see if the
env variable is configured.

This pull requests uses this `perf` function when:
* opening csv files as dataframes
* opening json lines files as dataframes

This will hopefully help provide some more fine grained information on
how long it takes polars to open different dataframes. The `perf` can
also be utilized later for other dataframes use cases.
---
 crates/nu_plugin_polars/src/cache/mod.rs      | 41 ++++----
 crates/nu_plugin_polars/src/cache/rm.rs       |  2 +-
 .../src/dataframe/eager/open.rs               | 46 +++++++++
 crates/nu_plugin_polars/src/lib.rs            | 94 +++++++++++++++++--
 4 files changed, 154 insertions(+), 29 deletions(-)

diff --git a/crates/nu_plugin_polars/src/cache/mod.rs b/crates/nu_plugin_polars/src/cache/mod.rs
index 8862f5bb51..08a7a9d7f7 100644
--- a/crates/nu_plugin_polars/src/cache/mod.rs
+++ b/crates/nu_plugin_polars/src/cache/mod.rs
@@ -13,7 +13,7 @@ use nu_plugin::{EngineInterface, PluginCommand};
 use nu_protocol::{LabeledError, ShellError, Span};
 use uuid::Uuid;
 
-use crate::{plugin_debug, values::PolarsPluginObject, PolarsPlugin};
+use crate::{plugin_debug, values::PolarsPluginObject, EngineWrapper, PolarsPlugin};
 
 #[derive(Debug, Clone)]
 pub struct CacheValue {
@@ -47,7 +47,7 @@ impl Cache {
     /// * `force` - Delete even if there are multiple references
     pub fn remove(
         &self,
-        maybe_engine: Option<&EngineInterface>,
+        engine: impl EngineWrapper,
         key: &Uuid,
         force: bool,
     ) -> Result<Option<CacheValue>, ShellError> {
@@ -60,22 +60,23 @@ impl Cache {
 
         let removed = if force || reference_count.unwrap_or_default() < 1 {
             let removed = lock.remove(key);
-            plugin_debug!("PolarsPlugin: removing {key} from cache: {removed:?}");
+            plugin_debug!(
+                engine,
+                "PolarsPlugin: removing {key} from cache: {removed:?}"
+            );
             removed
         } else {
-            plugin_debug!("PolarsPlugin: decrementing reference count for {key}");
+            plugin_debug!(
+                engine,
+                "PolarsPlugin: decrementing reference count for {key}"
+            );
             None
         };
 
         // Once there are no more entries in the cache
         // we can turn plugin gc back on
-        match maybe_engine {
-            Some(engine) if lock.is_empty() => {
-                plugin_debug!("PolarsPlugin: Cache is empty enabling GC");
-                engine.set_gc_disabled(false).map_err(LabeledError::from)?;
-            }
-            _ => (),
-        };
+        plugin_debug!(engine, "PolarsPlugin: Cache is empty enabling GC");
+        engine.set_gc_disabled(false).map_err(LabeledError::from)?;
         drop(lock);
         Ok(removed)
     }
@@ -84,23 +85,21 @@ impl Cache {
     /// The maybe_engine parameter is required outside of testing
     pub fn insert(
         &self,
-        maybe_engine: Option<&EngineInterface>,
+        engine: impl EngineWrapper,
         uuid: Uuid,
         value: PolarsPluginObject,
         span: Span,
     ) -> Result<Option<CacheValue>, ShellError> {
         let mut lock = self.lock()?;
-        plugin_debug!("PolarsPlugin: Inserting {uuid} into cache: {value:?}");
+        plugin_debug!(
+            engine,
+            "PolarsPlugin: Inserting {uuid} into cache: {value:?}"
+        );
         // turn off plugin gc the first time an entry is added to the cache
         // as we don't want the plugin to be garbage collected if there
         // is any live data
-        match maybe_engine {
-            Some(engine) if lock.is_empty() => {
-                plugin_debug!("PolarsPlugin: Cache has values disabling GC");
-                engine.set_gc_disabled(true).map_err(LabeledError::from)?;
-            }
-            _ => (),
-        };
+        plugin_debug!(engine, "PolarsPlugin: Cache has values disabling GC");
+        engine.set_gc_disabled(true).map_err(LabeledError::from)?;
         let cache_value = CacheValue {
             uuid,
             value,
@@ -154,7 +153,7 @@ pub trait Cacheable: Sized + Clone {
         span: Span,
     ) -> Result<Self, ShellError> {
         plugin.cache.insert(
-            Some(engine),
+            engine,
             self.cache_id().to_owned(),
             self.to_cache_value()?,
             span,
diff --git a/crates/nu_plugin_polars/src/cache/rm.rs b/crates/nu_plugin_polars/src/cache/rm.rs
index 5918209f32..9113f39cec 100644
--- a/crates/nu_plugin_polars/src/cache/rm.rs
+++ b/crates/nu_plugin_polars/src/cache/rm.rs
@@ -63,7 +63,7 @@ fn remove_cache_entry(
     let key = as_uuid(key, span)?;
     let msg = plugin
         .cache
-        .remove(Some(engine), &key, true)?
+        .remove(engine, &key, true)?
         .map(|_| format!("Removed: {key}"))
         .unwrap_or_else(|| format!("No value found for key: {key}"));
     Ok(Value::string(msg, span))
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/open.rs b/crates/nu_plugin_polars/src/dataframe/eager/open.rs
index 902a4df5a9..8842e3c7fb 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/open.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/open.rs
@@ -1,5 +1,6 @@
 use crate::{
     dataframe::values::NuSchema,
+    perf,
     values::{CustomValueSupport, NuLazyFrame},
     PolarsPlugin,
 };
@@ -378,7 +379,10 @@ fn from_jsonl(
         .get_flag("schema")?
         .map(|schema| NuSchema::try_from(&schema))
         .transpose()?;
+
     if call.has_flag("lazy")? {
+        let start_time = std::time::Instant::now();
+
         let df = LazyJsonLineReader::new(file_path)
             .with_infer_schema_length(infer_schema)
             .with_schema(maybe_schema.map(|s| s.into()))
@@ -390,6 +394,16 @@ fn from_jsonl(
                 help: None,
                 inner: vec![],
             })?;
+
+        perf(
+            engine,
+            "Lazy json lines dataframe open",
+            start_time,
+            file!(),
+            line!(),
+            column!(),
+        );
+
         let df = NuLazyFrame::new(false, df);
         df.cache_and_to_value(plugin, engine, call.head)
     } else {
@@ -410,6 +424,8 @@ fn from_jsonl(
             None => reader,
         };
 
+        let start_time = std::time::Instant::now();
+
         let df: NuDataFrame = reader
             .finish()
             .map_err(|e| ShellError::GenericError {
@@ -421,6 +437,15 @@ fn from_jsonl(
             })?
             .into();
 
+        perf(
+            engine,
+            "Eager json lines dataframe open",
+            start_time,
+            file!(),
+            line!(),
+            column!(),
+        );
+
         df.cache_and_to_value(plugin, engine, call.head)
     }
 }
@@ -484,6 +509,7 @@ fn from_csv(
             Some(r) => csv_reader.with_skip_rows(r),
         };
 
+        let start_time = std::time::Instant::now();
         let df: NuLazyFrame = csv_reader
             .finish()
             .map_err(|e| ShellError::GenericError {
@@ -495,8 +521,18 @@ fn from_csv(
             })?
             .into();
 
+        perf(
+            engine,
+            "Lazy CSV dataframe open",
+            start_time,
+            file!(),
+            line!(),
+            column!(),
+        );
+
         df.cache_and_to_value(plugin, engine, call.head)
     } else {
+        let start_time = std::time::Instant::now();
         let df = CsvReadOptions::default()
             .with_has_header(!no_header)
             .with_infer_schema_length(infer_schema)
@@ -529,6 +565,16 @@ fn from_csv(
                 help: None,
                 inner: vec![],
             })?;
+
+        perf(
+            engine,
+            "Eager CSV dataframe open",
+            start_time,
+            file!(),
+            line!(),
+            column!(),
+        );
+
         let df = NuDataFrame::new(false, df);
         df.cache_and_to_value(plugin, engine, call.head)
     }
diff --git a/crates/nu_plugin_polars/src/lib.rs b/crates/nu_plugin_polars/src/lib.rs
index 3baca54ad9..76da2eb039 100644
--- a/crates/nu_plugin_polars/src/lib.rs
+++ b/crates/nu_plugin_polars/src/lib.rs
@@ -8,25 +8,89 @@ use nu_plugin::{EngineInterface, Plugin, PluginCommand};
 mod cache;
 pub mod dataframe;
 pub use dataframe::*;
-use nu_protocol::{ast::Operator, CustomValue, LabeledError, Spanned, Value};
+use nu_protocol::{ast::Operator, CustomValue, LabeledError, ShellError, Span, Spanned, Value};
 
 use crate::{
     eager::eager_commands, expressions::expr_commands, lazy::lazy_commands,
     series::series_commands, values::PolarsPluginCustomValue,
 };
 
+pub trait EngineWrapper {
+    fn get_env_var(&self, key: &str) -> Option<String>;
+    fn use_color(&self) -> bool;
+    fn set_gc_disabled(&self, disabled: bool) -> Result<(), ShellError>;
+}
+
+impl EngineWrapper for &EngineInterface {
+    fn get_env_var(&self, key: &str) -> Option<String> {
+        EngineInterface::get_env_var(self, key)
+            .ok()
+            .flatten()
+            .map(|x| match x {
+                Value::String { val, .. } => val,
+                _ => "".to_string(),
+            })
+    }
+
+    fn use_color(&self) -> bool {
+        self.get_config()
+            .ok()
+            .and_then(|config| config.color_config.get("use_color").cloned())
+            .unwrap_or(Value::bool(false, Span::unknown()))
+            .is_true()
+    }
+
+    fn set_gc_disabled(&self, disabled: bool) -> Result<(), ShellError> {
+        EngineInterface::set_gc_disabled(self, disabled)
+    }
+}
+
 #[macro_export]
 macro_rules! plugin_debug {
-    ($($arg:tt)*) => {{
-        if std::env::var("POLARS_PLUGIN_DEBUG")
-            .ok()
-            .filter(|x| x == "1" || x == "true")
+    ($env_var_provider:tt, $($arg:tt)*) => {{
+        if $env_var_provider.get_env_var("POLARS_PLUGIN_DEBUG")
+            .filter(|s|  s == "1" || s == "true")
             .is_some() {
             eprintln!($($arg)*);
         }
     }};
 }
 
+pub fn perf(
+    env: impl EngineWrapper,
+    msg: &str,
+    dur: std::time::Instant,
+    file: &str,
+    line: u32,
+    column: u32,
+) {
+    if env
+        .get_env_var("POLARS_PLUGIN_PERF")
+        .filter(|s| s == "1" || s == "true")
+        .is_some()
+    {
+        if env.use_color() {
+            eprintln!(
+                "perf: {}:{}:{} \x1b[32m{}\x1b[0m took \x1b[33m{:?}\x1b[0m",
+                file,
+                line,
+                column,
+                msg,
+                dur.elapsed(),
+            );
+        } else {
+            eprintln!(
+                "perf: {}:{}:{} {} took {:?}",
+                file,
+                line,
+                column,
+                msg,
+                dur.elapsed(),
+            );
+        }
+    }
+}
+
 #[derive(Default)]
 pub struct PolarsPlugin {
     pub(crate) cache: Cache,
@@ -52,7 +116,7 @@ impl Plugin for PolarsPlugin {
     ) -> Result<(), LabeledError> {
         if !self.disable_cache_drop {
             let id = CustomValueType::try_from_custom_value(custom_value)?.id();
-            let _ = self.cache.remove(Some(engine), &id, false);
+            let _ = self.cache.remove(engine, &id, false);
         }
         Ok(())
     }
@@ -193,6 +257,22 @@ pub mod test {
         }
     }
 
+    struct TestEngineWrapper;
+
+    impl EngineWrapper for TestEngineWrapper {
+        fn get_env_var(&self, key: &str) -> Option<String> {
+            std::env::var(key).ok()
+        }
+
+        fn use_color(&self) -> bool {
+            false
+        }
+
+        fn set_gc_disabled(&self, _disabled: bool) -> Result<(), ShellError> {
+            Ok(())
+        }
+    }
+
     pub fn test_polars_plugin_command(command: &impl PluginCommand) -> Result<(), ShellError> {
         test_polars_plugin_command_with_decls(command, vec![])
     }
@@ -212,7 +292,7 @@ pub mod test {
                     let id = obj.id();
                     plugin
                         .cache
-                        .insert(None, id, obj, Span::test_data())
+                        .insert(TestEngineWrapper {}, id, obj, Span::test_data())
                         .unwrap();
                 }
             }

From 4c82a748c1c9dd4881bca646720e117658ac9c41 Mon Sep 17 00:00:00 2001
From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Thu, 20 Jun 2024 19:46:56 -0400
Subject: [PATCH 0126/1072] Do example (#13190)

# Description

#12056 added support for default and type-checked arguments in `do`
closures.

This PR adds examples for those features.  It also:

* Fixes the TODO (a closure parameter that wasn't being used) that was
preventing a result from being added
* Removes extraneous commas from the descriptions
* Adds an example demonstrating multiple positional closure arguments

# User-Facing Changes

Help examples only

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-cmd-lang/src/core_commands/do_.rs | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/crates/nu-cmd-lang/src/core_commands/do_.rs b/crates/nu-cmd-lang/src/core_commands/do_.rs
index 8ca3fbac56..4f0bd245d2 100644
--- a/crates/nu-cmd-lang/src/core_commands/do_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/do_.rs
@@ -229,14 +229,24 @@ impl Command for Do {
                 result: None,
             },
             Example {
-                description: "Run the closure, with a positional parameter",
-                example: r#"do {|x| 100 + $x } 77"#,
+                description: "Run the closure with a positional, type-checked parameter",
+                example: r#"do {|x:int| 100 + $x } 77"#,
                 result: Some(Value::test_int(177)),
             },
             Example {
-                description: "Run the closure, with input",
-                example: r#"77 | do {|x| 100 + $in }"#,
-                result: None, // TODO: returns 177
+                description: "Run the closure with pipeline input",
+                example: r#"77 | do { 100 + $in }"#,
+                result: Some(Value::test_int(177)),
+            },
+            Example {
+                description: "Run the closure with a default parameter value",
+                example: r#"77 | do {|x=100| $x + $in }"#,
+                result: Some(Value::test_int(177)),
+            },
+            Example {
+                description: "Run the closure with two positional parameters",
+                example: r#"do {|x,y| $x + $y } 77 100"#,
+                result: Some(Value::test_int(177)),
             },
             Example {
                 description: "Run the closure and keep changes to the environment",

From 9845d13347d6b26bfc157652ea09027203a461a7 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Fri, 21 Jun 2024 03:03:10 -0700
Subject: [PATCH 0127/1072] fix nu-system build on arm64 FreeBSD (#13196)

# Description

Fixes #13194

`ki_stat` is supposed to be a `c_char`, but was defined was `i8`.
Unfortunately, `c_char` is `u8` on Aarch64 (on all platforms), so this
doesn't compile. I fixed it to use `c_char` instead.

Double checked whether NetBSD is affected, but the `libc` code defines
it as `i8` for some reason (erroneously, really) but that doesn't matter
too much. Anyway should be ok there.

Confirmed to be working.
---
 crates/nu-system/src/freebsd.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/crates/nu-system/src/freebsd.rs b/crates/nu-system/src/freebsd.rs
index ff0f67dd10..4a556762e4 100644
--- a/crates/nu-system/src/freebsd.rs
+++ b/crates/nu-system/src/freebsd.rs
@@ -1,6 +1,7 @@
 use itertools::{EitherOrBoth, Itertools};
 use libc::{
-    kinfo_proc, sysctl, CTL_HW, CTL_KERN, KERN_PROC, KERN_PROC_ALL, KERN_PROC_ARGS, TDF_IDLETD,
+    c_char, kinfo_proc, sysctl, CTL_HW, CTL_KERN, KERN_PROC, KERN_PROC_ALL, KERN_PROC_ARGS,
+    TDF_IDLETD,
 };
 use std::{
     ffi::CStr,
@@ -16,7 +17,7 @@ pub struct ProcessInfo {
     pub ppid: i32,
     pub name: String,
     pub argv: Vec<u8>,
-    pub stat: i8,
+    pub stat: c_char,
     pub percent_cpu: f64,
     pub mem_resident: u64, // in bytes
     pub mem_virtual: u64,  // in bytes

From dd8f8861ed25058e05fbdaf18b16fc382d4ae751 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Fri, 21 Jun 2024 04:17:29 -0700
Subject: [PATCH 0128/1072] Add shape_glob_interpolation to default_config.nu
 (#13198)

# Description

Just missed this during #13089. Adds `shape_glob_interpolation` to the
config.

This actually isn't really going to be seen at all yet, so I debated
whether it's really needed at all. It's only used to highlight the
quotes themselves, and we don't have any quoted glob interpolations at
the moment.
---
 crates/nu-utils/src/sample_config/default_config.nu | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index 34418feb16..099adcd065 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -48,6 +48,7 @@ let dark_theme = {
     shape_float: purple_bold
     # shapes are used to change the cli syntax highlighting
     shape_garbage: { fg: white bg: red attr: b}
+    shape_glob_interpolation: cyan_bold
     shape_globpattern: cyan_bold
     shape_int: purple_bold
     shape_internalcall: cyan_bold

From 91d44f15c12005744c94bb883fe4092d6acea1d2 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Fri, 21 Jun 2024 04:27:09 -0700
Subject: [PATCH 0129/1072] Allow plugins to report their own version and store
 it in the registry (#12883)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

This allows plugins to report their version (and potentially other
metadata in the future). The version is shown in `plugin list` and in
`version`.

The metadata is stored in the registry file, and reflects whatever was
retrieved on `plugin add`, not necessarily the running binary. This can
help you to diagnose if there's some kind of mismatch with what you
expect. We could potentially use this functionality to show a warning or
error if a plugin being run does not have the same version as what was
in the cache file, suggesting `plugin add` be run again, but I haven't
done that at this point.

It is optional, and it requires the plugin author to make some code
changes if they want to provide it, since I can't automatically
determine the version of the calling crate or anything tricky like that
to do it.

Example:

```
> plugin list | select name version is_running pid
╭───┬────────────────┬─────────┬────────────┬─────╮
│ # │      name      │ version │ is_running │ pid │
├───┼────────────────┼─────────┼────────────┼─────┤
│ 0 │ example        │ 0.93.1  │ false      │     │
│ 1 │ gstat          │ 0.93.1  │ false      │     │
│ 2 │ inc            │ 0.93.1  │ false      │     │
│ 3 │ python_example │ 0.1.0   │ false      │     │
╰───┴────────────────┴─────────┴────────────┴─────╯
```

cc @maxim-uvarov (he asked for it)

# User-Facing Changes

- `plugin list` gets a `version` column
- `version` shows plugin versions when available
- plugin authors *should* add `fn metadata()` to their `impl Plugin`,
but don't have to

# Tests + Formatting

Tested the low level stuff and also the `plugin list` column.

# After Submitting
- [ ] update plugin guide docs
- [ ] update plugin protocol docs (`Metadata` call & response)
- [ ] update plugin template (`fn metadata()` should be easy)
- [ ] release notes
---
 crates/nu-cli/src/config_files.rs             |  5 ++-
 .../nu-cmd-lang/src/core_commands/version.rs  | 11 +++++-
 .../nu-cmd-plugin/src/commands/plugin/add.rs  |  5 ++-
 .../nu-cmd-plugin/src/commands/plugin/list.rs |  9 +++++
 crates/nu-parser/src/parse_keywords.rs        | 33 ++++++++++------
 crates/nu-plugin-engine/src/init.rs           |  5 ++-
 crates/nu-plugin-engine/src/interface/mod.rs  | 17 ++++++++-
 .../nu-plugin-engine/src/interface/tests.rs   | 21 +++++++++-
 crates/nu-plugin-engine/src/persistent.rs     | 15 +++++++-
 crates/nu-plugin-protocol/src/lib.rs          |  7 +++-
 .../src/fake_persistent_plugin.rs             |  8 +++-
 crates/nu-plugin-test-support/src/lib.rs      |  4 ++
 .../tests/custom_value/mod.rs                 |  4 ++
 .../nu-plugin-test-support/tests/hello/mod.rs |  4 ++
 .../tests/lowercase/mod.rs                    |  4 ++
 crates/nu-plugin/src/lib.rs                   |  4 ++
 crates/nu-plugin/src/plugin/command.rs        |  6 +++
 crates/nu-plugin/src/plugin/interface/mod.rs  | 21 ++++++++--
 .../nu-plugin/src/plugin/interface/tests.rs   | 20 ++++++++++
 crates/nu-plugin/src/plugin/mod.rs            | 31 ++++++++++++++-
 crates/nu-protocol/src/plugin/metadata.rs     | 38 +++++++++++++++++++
 crates/nu-protocol/src/plugin/mod.rs          |  2 +
 crates/nu-protocol/src/plugin/registered.rs   |  8 +++-
 .../src/plugin/registry_file/mod.rs           | 10 +++--
 .../src/plugin/registry_file/tests.rs         |  9 ++++-
 crates/nu_plugin_custom_values/src/main.rs    |  4 ++
 crates/nu_plugin_example/src/lib.rs           |  4 ++
 crates/nu_plugin_formats/src/lib.rs           |  4 ++
 crates/nu_plugin_gstat/src/nu/mod.rs          |  4 ++
 crates/nu_plugin_inc/src/nu/mod.rs            |  4 ++
 .../nu_plugin_nu_example.nu                   |  8 ++++
 crates/nu_plugin_polars/src/lib.rs            |  4 ++
 .../nu_plugin_python_example.py               |  9 ++++-
 crates/nu_plugin_query/src/query.rs           |  4 ++
 crates/nu_plugin_stress_internals/src/main.rs | 16 +++++++-
 src/main.rs                                   | 12 ++++--
 tests/plugin_persistence/mod.rs               | 11 ++++++
 tests/plugins/registry_file.rs                | 21 ++++++----
 38 files changed, 360 insertions(+), 46 deletions(-)
 create mode 100644 crates/nu-protocol/src/plugin/metadata.rs

diff --git a/crates/nu-cli/src/config_files.rs b/crates/nu-cli/src/config_files.rs
index ec7ad2f412..6cf4735c46 100644
--- a/crates/nu-cli/src/config_files.rs
+++ b/crates/nu-cli/src/config_files.rs
@@ -344,7 +344,10 @@ pub fn migrate_old_plugin_file(engine_state: &EngineState, storage_path: &str) -
             name: identity.name().to_owned(),
             filename: identity.filename().to_owned(),
             shell: identity.shell().map(|p| p.to_owned()),
-            data: PluginRegistryItemData::Valid { commands },
+            data: PluginRegistryItemData::Valid {
+                metadata: Default::default(),
+                commands,
+            },
         });
     }
 
diff --git a/crates/nu-cmd-lang/src/core_commands/version.rs b/crates/nu-cmd-lang/src/core_commands/version.rs
index 77283105a9..5491db65fc 100644
--- a/crates/nu-cmd-lang/src/core_commands/version.rs
+++ b/crates/nu-cmd-lang/src/core_commands/version.rs
@@ -116,11 +116,18 @@ pub fn version(engine_state: &EngineState, span: Span) -> Result<PipelineData, S
         Value::string(features_enabled().join(", "), span),
     );
 
-    // Get a list of plugin names
+    // Get a list of plugin names and versions if present
     let installed_plugins = engine_state
         .plugins()
         .iter()
-        .map(|x| x.identity().name())
+        .map(|x| {
+            let name = x.identity().name();
+            if let Some(version) = x.metadata().and_then(|m| m.version) {
+                format!("{name} {version}")
+            } else {
+                name.into()
+            }
+        })
         .collect::<Vec<_>>();
 
     record.push(
diff --git a/crates/nu-cmd-plugin/src/commands/plugin/add.rs b/crates/nu-cmd-plugin/src/commands/plugin/add.rs
index 225941db01..14f3541168 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/add.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/add.rs
@@ -118,11 +118,12 @@ apparent the next time `nu` is next launched with that plugin registry file.
             },
         ));
         let interface = plugin.clone().get_plugin(Some((engine_state, stack)))?;
+        let metadata = interface.get_metadata()?;
         let commands = interface.get_signature()?;
 
         modify_plugin_file(engine_state, stack, call.head, custom_path, |contents| {
-            // Update the file with the received signatures
-            let item = PluginRegistryItem::new(plugin.identity(), commands);
+            // Update the file with the received metadata and signatures
+            let item = PluginRegistryItem::new(plugin.identity(), metadata, commands);
             contents.upsert_plugin(item);
             Ok(())
         })?;
diff --git a/crates/nu-cmd-plugin/src/commands/plugin/list.rs b/crates/nu-cmd-plugin/src/commands/plugin/list.rs
index 6b715a0001..030a3341d6 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/list.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/list.rs
@@ -16,6 +16,7 @@ impl Command for PluginList {
                 Type::Table(
                     [
                         ("name".into(), Type::String),
+                        ("version".into(), Type::String),
                         ("is_running".into(), Type::Bool),
                         ("pid".into(), Type::Int),
                         ("filename".into(), Type::String),
@@ -43,6 +44,7 @@ impl Command for PluginList {
                 description: "List installed plugins.",
                 result: Some(Value::test_list(vec![Value::test_record(record! {
                     "name" => Value::test_string("inc"),
+                    "version" => Value::test_string(env!("CARGO_PKG_VERSION")),
                     "is_running" => Value::test_bool(true),
                     "pid" => Value::test_int(106480),
                     "filename" => if cfg!(windows) {
@@ -98,8 +100,15 @@ impl Command for PluginList {
                 .map(|s| Value::string(s.to_string_lossy(), head))
                 .unwrap_or(Value::nothing(head));
 
+            let metadata = plugin.metadata();
+            let version = metadata
+                .and_then(|m| m.version)
+                .map(|s| Value::string(s, head))
+                .unwrap_or(Value::nothing(head));
+
             let record = record! {
                 "name" => Value::string(plugin.identity().name(), head),
+                "version" => version,
                 "is_running" => Value::bool(plugin.is_running(), head),
                 "pid" => pid,
                 "filename" => Value::string(plugin.identity().filename().to_string_lossy(), head),
diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index 2849b4e39c..673a59fb05 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -3740,28 +3740,37 @@ pub fn parse_register(working_set: &mut StateWorkingSet, lite_command: &LiteComm
                     )
                 })?;
 
-                let signatures = plugin
+                let metadata_and_signatures = plugin
                     .clone()
                     .get(get_envs)
-                    .and_then(|p| p.get_signature())
+                    .and_then(|p| {
+                        let meta = p.get_metadata()?;
+                        let sigs = p.get_signature()?;
+                        Ok((meta, sigs))
+                    })
                     .map_err(|err| {
-                        log::warn!("Error getting signatures: {err:?}");
+                        log::warn!("Error getting metadata and signatures: {err:?}");
                         ParseError::LabeledError(
-                            "Error getting signatures".into(),
+                            "Error getting metadata and signatures".into(),
                             err.to_string(),
                             spans[0],
                         )
                     });
 
-                if let Ok(ref signatures) = signatures {
-                    // Add the loaded plugin to the delta
-                    working_set.update_plugin_registry(PluginRegistryItem::new(
-                        &identity,
-                        signatures.clone(),
-                    ));
+                match metadata_and_signatures {
+                    Ok((meta, sigs)) => {
+                        // Set the metadata on the plugin
+                        plugin.set_metadata(Some(meta.clone()));
+                        // Add the loaded plugin to the delta
+                        working_set.update_plugin_registry(PluginRegistryItem::new(
+                            &identity,
+                            meta,
+                            sigs.clone(),
+                        ));
+                        Ok(sigs)
+                    }
+                    Err(err) => Err(err),
                 }
-
-                signatures
             },
             |sig| sig.map(|sig| vec![sig]),
         )?;
diff --git a/crates/nu-plugin-engine/src/init.rs b/crates/nu-plugin-engine/src/init.rs
index 198a01cd1c..44fa4f031f 100644
--- a/crates/nu-plugin-engine/src/init.rs
+++ b/crates/nu-plugin-engine/src/init.rs
@@ -252,7 +252,7 @@ pub fn load_plugin_registry_item(
         })?;
 
     match &plugin.data {
-        PluginRegistryItemData::Valid { commands } => {
+        PluginRegistryItemData::Valid { metadata, commands } => {
             let plugin = add_plugin_to_working_set(working_set, &identity)?;
 
             // Ensure that the plugin is reset. We're going to load new signatures, so we want to
@@ -260,6 +260,9 @@ pub fn load_plugin_registry_item(
             // doesn't.
             plugin.reset()?;
 
+            // Set the plugin metadata from the file
+            plugin.set_metadata(Some(metadata.clone()));
+
             // Create the declarations from the commands
             for signature in commands {
                 let decl = PluginDeclaration::new(plugin.clone(), signature.clone());
diff --git a/crates/nu-plugin-engine/src/interface/mod.rs b/crates/nu-plugin-engine/src/interface/mod.rs
index adab9dc68d..9a4c72d2c1 100644
--- a/crates/nu-plugin-engine/src/interface/mod.rs
+++ b/crates/nu-plugin-engine/src/interface/mod.rs
@@ -11,8 +11,8 @@ use nu_plugin_protocol::{
     PluginOutput, ProtocolInfo, StreamId, StreamMessage,
 };
 use nu_protocol::{
-    ast::Operator, CustomValue, IntoSpanned, PipelineData, PluginSignature, ShellError, Span,
-    Spanned, Value,
+    ast::Operator, CustomValue, IntoSpanned, PipelineData, PluginMetadata, PluginSignature,
+    ShellError, Span, Spanned, Value,
 };
 use std::{
     collections::{btree_map, BTreeMap},
@@ -716,6 +716,7 @@ impl PluginInterface {
 
         // Convert the call into one with a header and handle the stream, if necessary
         let (call, writer) = match call {
+            PluginCall::Metadata => (PluginCall::Metadata, Default::default()),
             PluginCall::Signature => (PluginCall::Signature, Default::default()),
             PluginCall::CustomValueOp(value, op) => {
                 (PluginCall::CustomValueOp(value, op), Default::default())
@@ -913,6 +914,17 @@ impl PluginInterface {
         self.receive_plugin_call_response(result.receiver, context, result.state)
     }
 
+    /// Get the metadata from the plugin.
+    pub fn get_metadata(&self) -> Result<PluginMetadata, ShellError> {
+        match self.plugin_call(PluginCall::Metadata, None)? {
+            PluginCallResponse::Metadata(meta) => Ok(meta),
+            PluginCallResponse::Error(err) => Err(err.into()),
+            _ => Err(ShellError::PluginFailedToDecode {
+                msg: "Received unexpected response to plugin Metadata call".into(),
+            }),
+        }
+    }
+
     /// Get the command signatures from the plugin.
     pub fn get_signature(&self) -> Result<Vec<PluginSignature>, ShellError> {
         match self.plugin_call(PluginCall::Signature, None)? {
@@ -1206,6 +1218,7 @@ impl CurrentCallState {
         source: &PluginSource,
     ) -> Result<(), ShellError> {
         match call {
+            PluginCall::Metadata => Ok(()),
             PluginCall::Signature => Ok(()),
             PluginCall::Run(CallInfo { call, .. }) => self.prepare_call_args(call, source),
             PluginCall::CustomValueOp(_, op) => {
diff --git a/crates/nu-plugin-engine/src/interface/tests.rs b/crates/nu-plugin-engine/src/interface/tests.rs
index e718886b3b..5665beb92b 100644
--- a/crates/nu-plugin-engine/src/interface/tests.rs
+++ b/crates/nu-plugin-engine/src/interface/tests.rs
@@ -18,7 +18,7 @@ use nu_protocol::{
     ast::{Math, Operator},
     engine::Closure,
     ByteStreamType, CustomValue, IntoInterruptiblePipelineData, IntoSpanned, PipelineData,
-    PluginSignature, ShellError, Span, Spanned, Value,
+    PluginMetadata, PluginSignature, ShellError, Span, Spanned, Value,
 };
 use serde::{Deserialize, Serialize};
 use std::{
@@ -1019,6 +1019,25 @@ fn start_fake_plugin_call_responder(
         .expect("failed to spawn thread");
 }
 
+#[test]
+fn interface_get_metadata() -> Result<(), ShellError> {
+    let test = TestCase::new();
+    let manager = test.plugin("test");
+    let interface = manager.get_interface();
+
+    start_fake_plugin_call_responder(manager, 1, |_| {
+        vec![ReceivedPluginCallMessage::Response(
+            PluginCallResponse::Metadata(PluginMetadata::new().with_version("test")),
+        )]
+    });
+
+    let metadata = interface.get_metadata()?;
+
+    assert_eq!(Some("test"), metadata.version.as_deref());
+    assert!(test.has_unconsumed_write());
+    Ok(())
+}
+
 #[test]
 fn interface_get_signature() -> Result<(), ShellError> {
     let test = TestCase::new();
diff --git a/crates/nu-plugin-engine/src/persistent.rs b/crates/nu-plugin-engine/src/persistent.rs
index 5f01c70ca7..6a87aa1e6b 100644
--- a/crates/nu-plugin-engine/src/persistent.rs
+++ b/crates/nu-plugin-engine/src/persistent.rs
@@ -7,7 +7,7 @@ use super::{PluginInterface, PluginSource};
 use nu_plugin_core::CommunicationMode;
 use nu_protocol::{
     engine::{EngineState, Stack},
-    PluginGcConfig, PluginIdentity, RegisteredPlugin, ShellError,
+    PluginGcConfig, PluginIdentity, PluginMetadata, RegisteredPlugin, ShellError,
 };
 use std::{
     collections::HashMap,
@@ -31,6 +31,8 @@ pub struct PersistentPlugin {
 struct MutableState {
     /// Reference to the plugin if running
     running: Option<RunningPlugin>,
+    /// Metadata for the plugin, e.g. version.
+    metadata: Option<PluginMetadata>,
     /// Plugin's preferred communication mode (if known)
     preferred_mode: Option<PreferredCommunicationMode>,
     /// Garbage collector config
@@ -59,6 +61,7 @@ impl PersistentPlugin {
             identity,
             mutable: Mutex::new(MutableState {
                 running: None,
+                metadata: None,
                 preferred_mode: None,
                 gc_config,
             }),
@@ -268,6 +271,16 @@ impl RegisteredPlugin for PersistentPlugin {
         self.stop_internal(true)
     }
 
+    fn metadata(&self) -> Option<PluginMetadata> {
+        self.mutable.lock().ok().and_then(|m| m.metadata.clone())
+    }
+
+    fn set_metadata(&self, metadata: Option<PluginMetadata>) {
+        if let Ok(mut mutable) = self.mutable.lock() {
+            mutable.metadata = metadata;
+        }
+    }
+
     fn set_gc_config(&self, gc_config: &PluginGcConfig) {
         if let Ok(mut mutable) = self.mutable.lock() {
             // Save the new config for future calls
diff --git a/crates/nu-plugin-protocol/src/lib.rs b/crates/nu-plugin-protocol/src/lib.rs
index db19ee02f6..2f582c3009 100644
--- a/crates/nu-plugin-protocol/src/lib.rs
+++ b/crates/nu-plugin-protocol/src/lib.rs
@@ -23,7 +23,7 @@ pub mod test_util;
 
 use nu_protocol::{
     ast::Operator, engine::Closure, ByteStreamType, Config, LabeledError, PipelineData,
-    PluginSignature, ShellError, Span, Spanned, Value,
+    PluginMetadata, PluginSignature, ShellError, Span, Spanned, Value,
 };
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
@@ -119,6 +119,7 @@ pub struct ByteStreamInfo {
 /// Calls that a plugin can execute. The type parameter determines the input type.
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub enum PluginCall<D> {
+    Metadata,
     Signature,
     Run(CallInfo<D>),
     CustomValueOp(Spanned<PluginCustomValue>, CustomValueOp),
@@ -132,6 +133,7 @@ impl<D> PluginCall<D> {
         f: impl FnOnce(D) -> Result<T, ShellError>,
     ) -> Result<PluginCall<T>, ShellError> {
         Ok(match self {
+            PluginCall::Metadata => PluginCall::Metadata,
             PluginCall::Signature => PluginCall::Signature,
             PluginCall::Run(call) => PluginCall::Run(call.map_data(f)?),
             PluginCall::CustomValueOp(custom_value, op) => {
@@ -143,6 +145,7 @@ impl<D> PluginCall<D> {
     /// The span associated with the call.
     pub fn span(&self) -> Option<Span> {
         match self {
+            PluginCall::Metadata => None,
             PluginCall::Signature => None,
             PluginCall::Run(CallInfo { call, .. }) => Some(call.head),
             PluginCall::CustomValueOp(val, _) => Some(val.span),
@@ -309,6 +312,7 @@ pub enum StreamMessage {
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub enum PluginCallResponse<D> {
     Error(LabeledError),
+    Metadata(PluginMetadata),
     Signature(Vec<PluginSignature>),
     Ordering(Option<Ordering>),
     PipelineData(D),
@@ -323,6 +327,7 @@ impl<D> PluginCallResponse<D> {
     ) -> Result<PluginCallResponse<T>, ShellError> {
         Ok(match self {
             PluginCallResponse::Error(err) => PluginCallResponse::Error(err),
+            PluginCallResponse::Metadata(meta) => PluginCallResponse::Metadata(meta),
             PluginCallResponse::Signature(sigs) => PluginCallResponse::Signature(sigs),
             PluginCallResponse::Ordering(ordering) => PluginCallResponse::Ordering(ordering),
             PluginCallResponse::PipelineData(input) => PluginCallResponse::PipelineData(f(input)?),
diff --git a/crates/nu-plugin-test-support/src/fake_persistent_plugin.rs b/crates/nu-plugin-test-support/src/fake_persistent_plugin.rs
index 617e55c3d1..e316e85147 100644
--- a/crates/nu-plugin-test-support/src/fake_persistent_plugin.rs
+++ b/crates/nu-plugin-test-support/src/fake_persistent_plugin.rs
@@ -6,7 +6,7 @@ use std::{
 use nu_plugin_engine::{GetPlugin, PluginInterface};
 use nu_protocol::{
     engine::{EngineState, Stack},
-    PluginGcConfig, PluginIdentity, RegisteredPlugin, ShellError,
+    PluginGcConfig, PluginIdentity, PluginMetadata, RegisteredPlugin, ShellError,
 };
 
 pub struct FakePersistentPlugin {
@@ -42,6 +42,12 @@ impl RegisteredPlugin for FakePersistentPlugin {
         None
     }
 
+    fn metadata(&self) -> Option<PluginMetadata> {
+        None
+    }
+
+    fn set_metadata(&self, _metadata: Option<PluginMetadata>) {}
+
     fn set_gc_config(&self, _gc_config: &PluginGcConfig) {
         // We don't have a GC
     }
diff --git a/crates/nu-plugin-test-support/src/lib.rs b/crates/nu-plugin-test-support/src/lib.rs
index caa7cbac1a..a53b353981 100644
--- a/crates/nu-plugin-test-support/src/lib.rs
+++ b/crates/nu-plugin-test-support/src/lib.rs
@@ -66,6 +66,10 @@
 //! }
 //!
 //! impl Plugin for LowercasePlugin {
+//!     fn version(&self) -> String {
+//!         env!("CARGO_PKG_VERSION").into()
+//!     }
+//!
 //!     fn commands(&self) -> Vec<Box<dyn PluginCommand<Plugin=Self>>> {
 //!         vec![Box::new(Lowercase)]
 //!     }
diff --git a/crates/nu-plugin-test-support/tests/custom_value/mod.rs b/crates/nu-plugin-test-support/tests/custom_value/mod.rs
index f703a92e33..888f05c1cb 100644
--- a/crates/nu-plugin-test-support/tests/custom_value/mod.rs
+++ b/crates/nu-plugin-test-support/tests/custom_value/mod.rs
@@ -53,6 +53,10 @@ struct IntoU32;
 struct IntoIntFromU32;
 
 impl Plugin for CustomU32Plugin {
+    fn version(&self) -> String {
+        "0.0.0".into()
+    }
+
     fn commands(&self) -> Vec<Box<dyn nu_plugin::PluginCommand<Plugin = Self>>> {
         vec![Box::new(IntoU32), Box::new(IntoIntFromU32)]
     }
diff --git a/crates/nu-plugin-test-support/tests/hello/mod.rs b/crates/nu-plugin-test-support/tests/hello/mod.rs
index 424940f156..a222637a76 100644
--- a/crates/nu-plugin-test-support/tests/hello/mod.rs
+++ b/crates/nu-plugin-test-support/tests/hello/mod.rs
@@ -8,6 +8,10 @@ struct HelloPlugin;
 struct Hello;
 
 impl Plugin for HelloPlugin {
+    fn version(&self) -> String {
+        "0.0.0".into()
+    }
+
     fn commands(&self) -> Vec<Box<dyn PluginCommand<Plugin = Self>>> {
         vec![Box::new(Hello)]
     }
diff --git a/crates/nu-plugin-test-support/tests/lowercase/mod.rs b/crates/nu-plugin-test-support/tests/lowercase/mod.rs
index 0072a08aa2..50271a8cc2 100644
--- a/crates/nu-plugin-test-support/tests/lowercase/mod.rs
+++ b/crates/nu-plugin-test-support/tests/lowercase/mod.rs
@@ -59,6 +59,10 @@ impl PluginCommand for Lowercase {
 }
 
 impl Plugin for LowercasePlugin {
+    fn version(&self) -> String {
+        "0.0.0".into()
+    }
+
     fn commands(&self) -> Vec<Box<dyn PluginCommand<Plugin = Self>>> {
         vec![Box::new(Lowercase)]
     }
diff --git a/crates/nu-plugin/src/lib.rs b/crates/nu-plugin/src/lib.rs
index 915c8d36fe..4c1a033a02 100644
--- a/crates/nu-plugin/src/lib.rs
+++ b/crates/nu-plugin/src/lib.rs
@@ -24,6 +24,10 @@
 //! struct MyCommand;
 //!
 //! impl Plugin for MyPlugin {
+//!     fn version(&self) -> String {
+//!         env!("CARGO_PKG_VERSION").into()
+//!     }
+//!
 //!     fn commands(&self) -> Vec<Box<dyn PluginCommand<Plugin = Self>>> {
 //!         vec![Box::new(MyCommand)]
 //!     }
diff --git a/crates/nu-plugin/src/plugin/command.rs b/crates/nu-plugin/src/plugin/command.rs
index 5def950b0b..7ccedfd4e5 100644
--- a/crates/nu-plugin/src/plugin/command.rs
+++ b/crates/nu-plugin/src/plugin/command.rs
@@ -60,6 +60,9 @@ use crate::{EngineInterface, EvaluatedCall, Plugin};
 /// }
 ///
 /// # impl Plugin for LowercasePlugin {
+/// #     fn version(&self) -> String {
+/// #         "0.0.0".into()
+/// #     }
 /// #     fn commands(&self) -> Vec<Box<dyn PluginCommand<Plugin=Self>>> {
 /// #         vec![Box::new(Lowercase)]
 /// #     }
@@ -195,6 +198,9 @@ pub trait PluginCommand: Sync {
 /// }
 ///
 /// # impl Plugin for HelloPlugin {
+/// #     fn version(&self) -> String {
+/// #         "0.0.0".into()
+/// #     }
 /// #     fn commands(&self) -> Vec<Box<dyn PluginCommand<Plugin=Self>>> {
 /// #         vec![Box::new(Hello)]
 /// #     }
diff --git a/crates/nu-plugin/src/plugin/interface/mod.rs b/crates/nu-plugin/src/plugin/interface/mod.rs
index e3e9679471..fc9c9e85b3 100644
--- a/crates/nu-plugin/src/plugin/interface/mod.rs
+++ b/crates/nu-plugin/src/plugin/interface/mod.rs
@@ -11,8 +11,8 @@ use nu_plugin_protocol::{
     ProtocolInfo,
 };
 use nu_protocol::{
-    engine::Closure, Config, LabeledError, PipelineData, PluginSignature, ShellError, Span,
-    Spanned, Value,
+    engine::Closure, Config, LabeledError, PipelineData, PluginMetadata, PluginSignature,
+    ShellError, Span, Spanned, Value,
 };
 use std::{
     collections::{btree_map, BTreeMap, HashMap},
@@ -29,6 +29,9 @@ use std::{
 #[derive(Debug)]
 #[doc(hidden)]
 pub enum ReceivedPluginCall {
+    Metadata {
+        engine: EngineInterface,
+    },
     Signature {
         engine: EngineInterface,
     },
@@ -280,8 +283,11 @@ impl InterfaceManager for EngineInterfaceManager {
                     }
                 };
                 match call {
-                    // We just let the receiver handle it rather than trying to store signature here
-                    // or something
+                    // Ask the plugin for metadata
+                    PluginCall::Metadata => {
+                        self.send_plugin_call(ReceivedPluginCall::Metadata { engine: interface })
+                    }
+                    // Ask the plugin for signatures
                     PluginCall::Signature => {
                         self.send_plugin_call(ReceivedPluginCall::Signature { engine: interface })
                     }
@@ -416,6 +422,13 @@ impl EngineInterface {
         }
     }
 
+    /// Write a call response of plugin metadata.
+    pub(crate) fn write_metadata(&self, metadata: PluginMetadata) -> Result<(), ShellError> {
+        let response = PluginCallResponse::Metadata(metadata);
+        self.write(PluginOutput::CallResponse(self.context()?, response))?;
+        self.flush()
+    }
+
     /// Write a call response of plugin signatures.
     ///
     /// Any custom values in the examples will be rendered using `to_base_value()`.
diff --git a/crates/nu-plugin/src/plugin/interface/tests.rs b/crates/nu-plugin/src/plugin/interface/tests.rs
index 6c3dfdf6c9..b195b43197 100644
--- a/crates/nu-plugin/src/plugin/interface/tests.rs
+++ b/crates/nu-plugin/src/plugin/interface/tests.rs
@@ -322,6 +322,26 @@ fn manager_consume_goodbye_closes_plugin_call_channel() -> Result<(), ShellError
     Ok(())
 }
 
+#[test]
+fn manager_consume_call_metadata_forwards_to_receiver_with_context() -> Result<(), ShellError> {
+    let mut manager = TestCase::new().engine();
+    set_default_protocol_info(&mut manager)?;
+
+    let rx = manager
+        .take_plugin_call_receiver()
+        .expect("couldn't take receiver");
+
+    manager.consume(PluginInput::Call(0, PluginCall::Metadata))?;
+
+    match rx.try_recv().expect("call was not forwarded to receiver") {
+        ReceivedPluginCall::Metadata { engine } => {
+            assert_eq!(Some(0), engine.context);
+            Ok(())
+        }
+        call => panic!("wrong call type: {call:?}"),
+    }
+}
+
 #[test]
 fn manager_consume_call_signature_forwards_to_receiver_with_context() -> Result<(), ShellError> {
     let mut manager = TestCase::new().engine();
diff --git a/crates/nu-plugin/src/plugin/mod.rs b/crates/nu-plugin/src/plugin/mod.rs
index 85283aadd0..997381f97b 100644
--- a/crates/nu-plugin/src/plugin/mod.rs
+++ b/crates/nu-plugin/src/plugin/mod.rs
@@ -16,7 +16,8 @@ use nu_plugin_core::{
 };
 use nu_plugin_protocol::{CallInfo, CustomValueOp, PluginCustomValue, PluginInput, PluginOutput};
 use nu_protocol::{
-    ast::Operator, CustomValue, IntoSpanned, LabeledError, PipelineData, ShellError, Spanned, Value,
+    ast::Operator, CustomValue, IntoSpanned, LabeledError, PipelineData, PluginMetadata,
+    ShellError, Spanned, Value,
 };
 use thiserror::Error;
 
@@ -52,6 +53,10 @@ pub(crate) const OUTPUT_BUFFER_SIZE: usize = 16384;
 /// struct Hello;
 ///
 /// impl Plugin for HelloPlugin {
+///     fn version(&self) -> String {
+///         env!("CARGO_PKG_VERSION").into()
+///     }
+///
 ///     fn commands(&self) -> Vec<Box<dyn PluginCommand<Plugin=Self>>> {
 ///         vec![Box::new(Hello)]
 ///     }
@@ -89,6 +94,23 @@ pub(crate) const OUTPUT_BUFFER_SIZE: usize = 16384;
 /// # }
 /// ```
 pub trait Plugin: Sync {
+    /// The version of the plugin.
+    ///
+    /// The recommended implementation, which will use the version from your crate's `Cargo.toml`
+    /// file:
+    ///
+    /// ```no_run
+    /// # use nu_plugin::{Plugin, PluginCommand};
+    /// # struct MyPlugin;
+    /// # impl Plugin for MyPlugin {
+    /// fn version(&self) -> String {
+    ///     env!("CARGO_PKG_VERSION").into()
+    /// }
+    /// # fn commands(&self) -> Vec<Box<dyn PluginCommand<Plugin = Self>>> { vec![] }
+    /// # }
+    /// ```
+    fn version(&self) -> String;
+
     /// The commands supported by the plugin
     ///
     /// Each [`PluginCommand`] contains both the signature of the command and the functionality it
@@ -216,6 +238,7 @@ pub trait Plugin: Sync {
 /// # struct MyPlugin;
 /// # impl MyPlugin { fn new() -> Self { Self }}
 /// # impl Plugin for MyPlugin {
+/// #     fn version(&self) -> String { "0.0.0".into() }
 /// #     fn commands(&self) -> Vec<Box<dyn PluginCommand<Plugin=Self>>> {todo!();}
 /// # }
 /// fn main() {
@@ -504,6 +527,12 @@ where
             }
 
             match plugin_call {
+                // Send metadata back to nushell so it can be stored with the plugin signatures
+                ReceivedPluginCall::Metadata { engine } => {
+                    engine
+                        .write_metadata(PluginMetadata::new().with_version(plugin.version()))
+                        .try_to_report(&engine)?;
+                }
                 // Sending the signature back to nushell to create the declaration definition
                 ReceivedPluginCall::Signature { engine } => {
                     let sigs = commands
diff --git a/crates/nu-protocol/src/plugin/metadata.rs b/crates/nu-protocol/src/plugin/metadata.rs
new file mode 100644
index 0000000000..d2fab7a89b
--- /dev/null
+++ b/crates/nu-protocol/src/plugin/metadata.rs
@@ -0,0 +1,38 @@
+use serde::{Deserialize, Serialize};
+
+/// Metadata about the installed plugin. This is cached in the registry file along with the
+/// signatures. None of the metadata fields are required, and more may be added in the future.
+#[derive(Serialize, Deserialize, PartialEq, Debug, Clone)]
+#[non_exhaustive]
+pub struct PluginMetadata {
+    /// The version of the plugin itself, as self-reported.
+    pub version: Option<String>,
+}
+
+impl PluginMetadata {
+    /// Create empty metadata.
+    pub const fn new() -> PluginMetadata {
+        PluginMetadata { version: None }
+    }
+
+    /// Set the version of the plugin on the metadata. A suggested way to construct this is:
+    ///
+    /// ```no_run
+    /// # use nu_protocol::PluginMetadata;
+    /// # fn example() -> PluginMetadata {
+    /// PluginMetadata::new().with_version(env!("CARGO_PKG_VERSION"))
+    /// # }
+    /// ```
+    ///
+    /// which will use the version of your plugin's crate from its `Cargo.toml` file.
+    pub fn with_version(mut self, version: impl Into<String>) -> Self {
+        self.version = Some(version.into());
+        self
+    }
+}
+
+impl Default for PluginMetadata {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff --git a/crates/nu-protocol/src/plugin/mod.rs b/crates/nu-protocol/src/plugin/mod.rs
index b266f8ebac..1678c9c40a 100644
--- a/crates/nu-protocol/src/plugin/mod.rs
+++ b/crates/nu-protocol/src/plugin/mod.rs
@@ -1,9 +1,11 @@
 mod identity;
+mod metadata;
 mod registered;
 mod registry_file;
 mod signature;
 
 pub use identity::*;
+pub use metadata::*;
 pub use registered::*;
 pub use registry_file::*;
 pub use signature::*;
diff --git a/crates/nu-protocol/src/plugin/registered.rs b/crates/nu-protocol/src/plugin/registered.rs
index 46d65b41d1..abd75b4dc6 100644
--- a/crates/nu-protocol/src/plugin/registered.rs
+++ b/crates/nu-protocol/src/plugin/registered.rs
@@ -1,6 +1,6 @@
 use std::{any::Any, sync::Arc};
 
-use crate::{PluginGcConfig, PluginIdentity, ShellError};
+use crate::{PluginGcConfig, PluginIdentity, PluginMetadata, ShellError};
 
 /// Trait for plugins registered in the [`EngineState`](crate::engine::EngineState).
 pub trait RegisteredPlugin: Send + Sync {
@@ -13,6 +13,12 @@ pub trait RegisteredPlugin: Send + Sync {
     /// Process ID of the plugin executable, if running.
     fn pid(&self) -> Option<u32>;
 
+    /// Get metadata for the plugin, if set.
+    fn metadata(&self) -> Option<PluginMetadata>;
+
+    /// Set metadata for the plugin.
+    fn set_metadata(&self, metadata: Option<PluginMetadata>);
+
     /// Set garbage collection config for the plugin.
     fn set_gc_config(&self, gc_config: &PluginGcConfig);
 
diff --git a/crates/nu-protocol/src/plugin/registry_file/mod.rs b/crates/nu-protocol/src/plugin/registry_file/mod.rs
index dcaba26b90..17adec1f4e 100644
--- a/crates/nu-protocol/src/plugin/registry_file/mod.rs
+++ b/crates/nu-protocol/src/plugin/registry_file/mod.rs
@@ -5,7 +5,7 @@ use std::{
 
 use serde::{Deserialize, Serialize};
 
-use crate::{PluginIdentity, PluginSignature, ShellError, Span};
+use crate::{PluginIdentity, PluginMetadata, PluginSignature, ShellError, Span};
 
 // This has a big impact on performance
 const BUFFER_SIZE: usize = 65536;
@@ -121,9 +121,10 @@ pub struct PluginRegistryItem {
 }
 
 impl PluginRegistryItem {
-    /// Create a [`PluginRegistryItem`] from an identity and signatures.
+    /// Create a [`PluginRegistryItem`] from an identity, metadata, and signatures.
     pub fn new(
         identity: &PluginIdentity,
+        metadata: PluginMetadata,
         mut commands: Vec<PluginSignature>,
     ) -> PluginRegistryItem {
         // Sort the commands for consistency
@@ -133,7 +134,7 @@ impl PluginRegistryItem {
             name: identity.name().to_owned(),
             filename: identity.filename().to_owned(),
             shell: identity.shell().map(|p| p.to_owned()),
-            data: PluginRegistryItemData::Valid { commands },
+            data: PluginRegistryItemData::Valid { metadata, commands },
         }
     }
 }
@@ -144,6 +145,9 @@ impl PluginRegistryItem {
 #[serde(untagged)]
 pub enum PluginRegistryItemData {
     Valid {
+        /// Metadata for the plugin, including its version.
+        #[serde(default)]
+        metadata: PluginMetadata,
         /// Signatures and examples for each command provided by the plugin.
         commands: Vec<PluginSignature>,
     },
diff --git a/crates/nu-protocol/src/plugin/registry_file/tests.rs b/crates/nu-protocol/src/plugin/registry_file/tests.rs
index 0d34ecca1c..e264e4463d 100644
--- a/crates/nu-protocol/src/plugin/registry_file/tests.rs
+++ b/crates/nu-protocol/src/plugin/registry_file/tests.rs
@@ -1,6 +1,7 @@
 use super::{PluginRegistryFile, PluginRegistryItem, PluginRegistryItemData};
 use crate::{
-    Category, PluginExample, PluginSignature, ShellError, Signature, SyntaxShape, Type, Value,
+    Category, PluginExample, PluginMetadata, PluginSignature, ShellError, Signature, SyntaxShape,
+    Type, Value,
 };
 use pretty_assertions::assert_eq;
 use std::io::Cursor;
@@ -11,6 +12,9 @@ fn foo_plugin() -> PluginRegistryItem {
         filename: "/path/to/nu_plugin_foo".into(),
         shell: None,
         data: PluginRegistryItemData::Valid {
+            metadata: PluginMetadata {
+                version: Some("0.1.0".into()),
+            },
             commands: vec![PluginSignature {
                 sig: Signature::new("foo")
                     .input_output_type(Type::Int, Type::List(Box::new(Type::Int)))
@@ -36,6 +40,9 @@ fn bar_plugin() -> PluginRegistryItem {
         filename: "/path/to/nu_plugin_bar".into(),
         shell: None,
         data: PluginRegistryItemData::Valid {
+            metadata: PluginMetadata {
+                version: Some("0.2.0".into()),
+            },
             commands: vec![PluginSignature {
                 sig: Signature::new("bar")
                     .usage("overwrites files with random data")
diff --git a/crates/nu_plugin_custom_values/src/main.rs b/crates/nu_plugin_custom_values/src/main.rs
index 9ab69135fb..65cc0b500f 100644
--- a/crates/nu_plugin_custom_values/src/main.rs
+++ b/crates/nu_plugin_custom_values/src/main.rs
@@ -42,6 +42,10 @@ impl CustomValuePlugin {
 }
 
 impl Plugin for CustomValuePlugin {
+    fn version(&self) -> String {
+        env!("CARGO_PKG_VERSION").into()
+    }
+
     fn commands(&self) -> Vec<Box<dyn PluginCommand<Plugin = Self>>> {
         vec![
             Box::new(Generate),
diff --git a/crates/nu_plugin_example/src/lib.rs b/crates/nu_plugin_example/src/lib.rs
index 182bc85121..acbebf9b39 100644
--- a/crates/nu_plugin_example/src/lib.rs
+++ b/crates/nu_plugin_example/src/lib.rs
@@ -7,6 +7,10 @@ pub use commands::*;
 pub use example::ExamplePlugin;
 
 impl Plugin for ExamplePlugin {
+    fn version(&self) -> String {
+        env!("CARGO_PKG_VERSION").into()
+    }
+
     fn commands(&self) -> Vec<Box<dyn PluginCommand<Plugin = Self>>> {
         // This is a list of all of the commands you would like Nu to register when your plugin is
         // loaded.
diff --git a/crates/nu_plugin_formats/src/lib.rs b/crates/nu_plugin_formats/src/lib.rs
index 748d29cd21..2ae24a4971 100644
--- a/crates/nu_plugin_formats/src/lib.rs
+++ b/crates/nu_plugin_formats/src/lib.rs
@@ -10,6 +10,10 @@ pub use from::vcf::FromVcf;
 pub struct FromCmds;
 
 impl Plugin for FromCmds {
+    fn version(&self) -> String {
+        env!("CARGO_PKG_VERSION").into()
+    }
+
     fn commands(&self) -> Vec<Box<dyn PluginCommand<Plugin = Self>>> {
         vec![
             Box::new(FromEml),
diff --git a/crates/nu_plugin_gstat/src/nu/mod.rs b/crates/nu_plugin_gstat/src/nu/mod.rs
index 223e5a49b5..f44894085d 100644
--- a/crates/nu_plugin_gstat/src/nu/mod.rs
+++ b/crates/nu_plugin_gstat/src/nu/mod.rs
@@ -5,6 +5,10 @@ use nu_protocol::{Category, LabeledError, Signature, Spanned, SyntaxShape, Value
 pub struct GStatPlugin;
 
 impl Plugin for GStatPlugin {
+    fn version(&self) -> String {
+        env!("CARGO_PKG_VERSION").into()
+    }
+
     fn commands(&self) -> Vec<Box<dyn PluginCommand<Plugin = Self>>> {
         vec![Box::new(GStat)]
     }
diff --git a/crates/nu_plugin_inc/src/nu/mod.rs b/crates/nu_plugin_inc/src/nu/mod.rs
index 148f1a7002..b7d9c8960f 100644
--- a/crates/nu_plugin_inc/src/nu/mod.rs
+++ b/crates/nu_plugin_inc/src/nu/mod.rs
@@ -5,6 +5,10 @@ use nu_protocol::{ast::CellPath, LabeledError, Signature, SyntaxShape, Value};
 pub struct IncPlugin;
 
 impl Plugin for IncPlugin {
+    fn version(&self) -> String {
+        env!("CARGO_PKG_VERSION").into()
+    }
+
     fn commands(&self) -> Vec<Box<dyn PluginCommand<Plugin = Self>>> {
         vec![Box::new(Inc::new())]
     }
diff --git a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
index 028e9735fd..4bfc066815 100755
--- a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
+++ b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
@@ -7,6 +7,7 @@
 # language without adding any extra dependencies to our tests.
 
 const NUSHELL_VERSION = "0.94.3"
+const PLUGIN_VERSION = "0.1.0" # bump if you change commands!
 
 def main [--stdio] {
   if ($stdio) {
@@ -229,6 +230,13 @@ def handle_input []: any -> nothing {
     }
     { Call: [$id, $plugin_call] } => {
       match $plugin_call {
+        "Metadata" => {
+          write_response $id {
+            Metadata: {
+              version: $PLUGIN_VERSION
+            }
+          }
+        }
         "Signature" => {
           write_response $id { Signature: $SIGNATURES }
         }
diff --git a/crates/nu_plugin_polars/src/lib.rs b/crates/nu_plugin_polars/src/lib.rs
index 76da2eb039..9fc9a7ab2d 100644
--- a/crates/nu_plugin_polars/src/lib.rs
+++ b/crates/nu_plugin_polars/src/lib.rs
@@ -99,6 +99,10 @@ pub struct PolarsPlugin {
 }
 
 impl Plugin for PolarsPlugin {
+    fn version(&self) -> String {
+        env!("CARGO_PKG_VERSION").into()
+    }
+
     fn commands(&self) -> Vec<Box<dyn PluginCommand<Plugin = Self>>> {
         let mut commands: Vec<Box<dyn PluginCommand<Plugin = Self>>> = vec![Box::new(PolarsCmd)];
         commands.append(&mut eager_commands());
diff --git a/crates/nu_plugin_python/nu_plugin_python_example.py b/crates/nu_plugin_python/nu_plugin_python_example.py
index 3db89a0afc..80715abf11 100755
--- a/crates/nu_plugin_python/nu_plugin_python_example.py
+++ b/crates/nu_plugin_python/nu_plugin_python_example.py
@@ -28,6 +28,7 @@ import json
 
 
 NUSHELL_VERSION = "0.94.3"
+PLUGIN_VERSION = "0.1.0" # bump if you change commands!
 
 
 def signatures():
@@ -228,7 +229,13 @@ def handle_input(input):
         exit(0)
     elif "Call" in input:
         [id, plugin_call] = input["Call"]
-        if plugin_call == "Signature":
+        if plugin_call == "Metadata":
+            write_response(id, {
+                "Metadata": {
+                    "version": PLUGIN_VERSION,
+                }
+            })
+        elif plugin_call == "Signature":
             write_response(id, signatures())
         elif "Run" in plugin_call:
             process_call(id, plugin_call["Run"])
diff --git a/crates/nu_plugin_query/src/query.rs b/crates/nu_plugin_query/src/query.rs
index 1e143068c4..c22339ab4a 100644
--- a/crates/nu_plugin_query/src/query.rs
+++ b/crates/nu_plugin_query/src/query.rs
@@ -16,6 +16,10 @@ impl Query {
 }
 
 impl Plugin for Query {
+    fn version(&self) -> String {
+        env!("CARGO_PKG_VERSION").into()
+    }
+
     fn commands(&self) -> Vec<Box<dyn PluginCommand<Plugin = Self>>> {
         vec![
             Box::new(QueryCommand),
diff --git a/crates/nu_plugin_stress_internals/src/main.rs b/crates/nu_plugin_stress_internals/src/main.rs
index bdbe5c8943..96023b44b7 100644
--- a/crates/nu_plugin_stress_internals/src/main.rs
+++ b/crates/nu_plugin_stress_internals/src/main.rs
@@ -136,7 +136,21 @@ fn handle_message(
 ) -> Result<(), Box<dyn Error>> {
     if let Some(plugin_call) = message.get("Call") {
         let (id, plugin_call) = (&plugin_call[0], &plugin_call[1]);
-        if plugin_call.as_str() == Some("Signature") {
+        if plugin_call.as_str() == Some("Metadata") {
+            write(
+                output,
+                &json!({
+                    "CallResponse": [
+                        id,
+                        {
+                            "Metadata": {
+                                "version": env!("CARGO_PKG_VERSION"),
+                            }
+                        }
+                    ]
+                }),
+            )
+        } else if plugin_call.as_str() == Some("Signature") {
             write(
                 output,
                 &json!({
diff --git a/src/main.rs b/src/main.rs
index 41d5534bb0..c74fd7641d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -400,7 +400,7 @@ fn main() -> Result<()> {
     #[cfg(feature = "plugin")]
     if let Some(plugins) = &parsed_nu_cli_args.plugins {
         use nu_plugin_engine::{GetPlugin, PluginDeclaration};
-        use nu_protocol::{engine::StateWorkingSet, ErrSpan, PluginIdentity};
+        use nu_protocol::{engine::StateWorkingSet, ErrSpan, PluginIdentity, RegisteredPlugin};
 
         // Load any plugins specified with --plugins
         start_time = std::time::Instant::now();
@@ -419,8 +419,14 @@ fn main() -> Result<()> {
             // Create the plugin and add it to the working set
             let plugin = nu_plugin_engine::add_plugin_to_working_set(&mut working_set, &identity)?;
 
-            // Spawn the plugin to get its signatures, and then add the commands to the working set
-            for signature in plugin.clone().get_plugin(None)?.get_signature()? {
+            // Spawn the plugin to get the metadata and signatures
+            let interface = plugin.clone().get_plugin(None)?;
+
+            // Set its metadata
+            plugin.set_metadata(Some(interface.get_metadata()?));
+
+            // Add the commands from the signature to the working set
+            for signature in interface.get_signature()? {
                 let decl = PluginDeclaration::new(plugin.clone(), signature);
                 working_set.add_decl(Box::new(decl));
             }
diff --git a/tests/plugin_persistence/mod.rs b/tests/plugin_persistence/mod.rs
index d9925f6bbf..6729c657c7 100644
--- a/tests/plugin_persistence/mod.rs
+++ b/tests/plugin_persistence/mod.rs
@@ -16,6 +16,17 @@ fn plugin_list_shows_installed_plugins() {
     assert!(out.status.success());
 }
 
+#[test]
+fn plugin_list_shows_installed_plugin_version() {
+    let out = nu_with_plugins!(
+        cwd: ".",
+        plugin: ("nu_plugin_inc"),
+        r#"(plugin list).version.0"#
+    );
+    assert_eq!(env!("CARGO_PKG_VERSION"), out.out);
+    assert!(out.status.success());
+}
+
 #[test]
 fn plugin_keeps_running_after_calling_it() {
     let out = nu_with_plugins!(
diff --git a/tests/plugins/registry_file.rs b/tests/plugins/registry_file.rs
index 3f7da6dd03..c0f0fa0724 100644
--- a/tests/plugins/registry_file.rs
+++ b/tests/plugins/registry_file.rs
@@ -18,6 +18,13 @@ fn example_plugin_path() -> PathBuf {
     .expect("nu_plugin_example not found")
 }
 
+fn valid_plugin_item_data() -> PluginRegistryItemData {
+    PluginRegistryItemData::Valid {
+        metadata: Default::default(),
+        commands: vec![],
+    }
+}
+
 #[test]
 fn plugin_add_then_restart_nu() {
     let result = nu_with_plugins!(
@@ -149,7 +156,7 @@ fn plugin_rm_then_restart_nu() {
             name: "example".into(),
             filename: example_plugin_path,
             shell: None,
-            data: PluginRegistryItemData::Valid { commands: vec![] },
+            data: valid_plugin_item_data(),
         });
 
         contents.upsert_plugin(PluginRegistryItem {
@@ -157,7 +164,7 @@ fn plugin_rm_then_restart_nu() {
             // this doesn't exist, but it should be ok
             filename: dirs.test().join("nu_plugin_foo"),
             shell: None,
-            data: PluginRegistryItemData::Valid { commands: vec![] },
+            data: valid_plugin_item_data(),
         });
 
         contents
@@ -225,7 +232,7 @@ fn plugin_rm_from_custom_path() {
             name: "example".into(),
             filename: example_plugin_path,
             shell: None,
-            data: PluginRegistryItemData::Valid { commands: vec![] },
+            data: valid_plugin_item_data(),
         });
 
         contents.upsert_plugin(PluginRegistryItem {
@@ -233,7 +240,7 @@ fn plugin_rm_from_custom_path() {
             // this doesn't exist, but it should be ok
             filename: dirs.test().join("nu_plugin_foo"),
             shell: None,
-            data: PluginRegistryItemData::Valid { commands: vec![] },
+            data: valid_plugin_item_data(),
         });
 
         contents
@@ -273,7 +280,7 @@ fn plugin_rm_using_filename() {
             name: "example".into(),
             filename: example_plugin_path.clone(),
             shell: None,
-            data: PluginRegistryItemData::Valid { commands: vec![] },
+            data: valid_plugin_item_data(),
         });
 
         contents.upsert_plugin(PluginRegistryItem {
@@ -281,7 +288,7 @@ fn plugin_rm_using_filename() {
             // this doesn't exist, but it should be ok
             filename: dirs.test().join("nu_plugin_foo"),
             shell: None,
-            data: PluginRegistryItemData::Valid { commands: vec![] },
+            data: valid_plugin_item_data(),
         });
 
         contents
@@ -331,7 +338,7 @@ fn warning_on_invalid_plugin_item() {
             name: "example".into(),
             filename: example_plugin_path,
             shell: None,
-            data: PluginRegistryItemData::Valid { commands: vec![] },
+            data: valid_plugin_item_data(),
         });
 
         contents.upsert_plugin(PluginRegistryItem {

From 10e84038afe55ba63c9b3187e6d3a1749fa2cc65 Mon Sep 17 00:00:00 2001
From: Maxim Zhiburt <zhiburt@gmail.com>
Date: Fri, 21 Jun 2024 22:07:57 +0300
Subject: [PATCH 0130/1072] nu-explore: Add vertical lines && fix
 index/transpose issue (#13147)

Somehow I believe that split lines were implemented originally; (I
haven't got to find it though; from a quick look)
I mean a long time ago before a lot a changes were made.

Probably adding horizontal lines would make also some sense.

ref #13116
close #13140

Take care

________________

If `explore` is used, frequently, or planned to be so.
I guess it would be a good one to create a test suite for it; to not
break things occasionally :sweat_smile:

I did approached it one time back then using `expectrl` (literally
`expect`), but there was some issues.
Maybe smth. did change.
Or some `clean` mode could be introduced for it, to being able to be
used by outer programs; to control `nu`.

Just thoughts here.
---
 crates/nu-explore/src/views/record/mod.rs     | 76 +++++++++------
 .../src/views/record/table_widget.rs          | 96 ++++++++++++++-----
 2 files changed, 123 insertions(+), 49 deletions(-)

diff --git a/crates/nu-explore/src/views/record/mod.rs b/crates/nu-explore/src/views/record/mod.rs
index 9e67e08120..87b0952a68 100644
--- a/crates/nu-explore/src/views/record/mod.rs
+++ b/crates/nu-explore/src/views/record/mod.rs
@@ -131,7 +131,7 @@ impl RecordView {
             Orientation::Left => (column, row),
         };
 
-        if row >= layer.count_rows() || column >= layer.count_columns() {
+        if row >= layer.record_values.len() || column >= layer.column_names.len() {
             // actually must never happen; unless cursor works incorrectly
             // if being sure about cursor it can be deleted;
             return Value::nothing(Span::unknown());
@@ -610,7 +610,7 @@ fn estimate_page_size(area: Rect, show_head: bool) -> u16 {
 /// scroll to the end of the data
 fn tail_data(state: &mut RecordView, page_size: usize) {
     let layer = state.get_layer_last_mut();
-    let count_rows = layer.count_rows();
+    let count_rows = layer.record_values.len();
     if count_rows > page_size {
         layer
             .cursor
@@ -722,43 +722,66 @@ fn get_percentage(value: usize, max: usize) -> usize {
 }
 
 fn transpose_table(layer: &mut RecordLayer) {
+    if layer.was_transposed {
+        transpose_from(layer);
+    } else {
+        transpose_to(layer);
+    }
+
+    layer.was_transposed = !layer.was_transposed;
+}
+
+fn transpose_from(layer: &mut RecordLayer) {
     let count_rows = layer.record_values.len();
     let count_columns = layer.column_names.len();
 
-    if layer.was_transposed {
-        let headers = pop_first_column(&mut layer.record_values);
-        let headers = headers
-            .into_iter()
-            .map(|value| match value {
-                Value::String { val, .. } => val,
-                _ => unreachable!("must never happen"),
-            })
-            .collect();
+    if let Some(data) = &mut layer.record_text {
+        pop_first_column(data);
+        *data = _transpose_table(data, count_rows, count_columns - 1);
+    }
 
-        let data = _transpose_table(&layer.record_values, count_rows, count_columns - 1);
+    let headers = pop_first_column(&mut layer.record_values);
+    let headers = headers
+        .into_iter()
+        .map(|value| match value {
+            Value::String { val, .. } => val,
+            _ => unreachable!("must never happen"),
+        })
+        .collect();
 
-        layer.record_values = data;
-        layer.column_names = headers;
+    let data = _transpose_table(&layer.record_values, count_rows, count_columns - 1);
 
-        return;
+    layer.record_values = data;
+    layer.column_names = headers;
+}
+
+fn transpose_to(layer: &mut RecordLayer) {
+    let count_rows = layer.record_values.len();
+    let count_columns = layer.column_names.len();
+
+    if let Some(data) = &mut layer.record_text {
+        *data = _transpose_table(data, count_rows, count_columns);
+        for (column, column_name) in layer.column_names.iter().enumerate() {
+            let value = (column_name.to_owned(), Default::default());
+            data[column].insert(0, value);
+        }
     }
 
     let mut data = _transpose_table(&layer.record_values, count_rows, count_columns);
-
     for (column, column_name) in layer.column_names.iter().enumerate() {
         let value = Value::string(column_name, NuSpan::unknown());
-
         data[column].insert(0, value);
     }
 
     layer.record_values = data;
     layer.column_names = (1..count_rows + 1 + 1).map(|i| i.to_string()).collect();
-
-    layer.was_transposed = !layer.was_transposed;
 }
 
-fn pop_first_column(values: &mut [Vec<Value>]) -> Vec<Value> {
-    let mut data = vec![Value::default(); values.len()];
+fn pop_first_column<T>(values: &mut [Vec<T>]) -> Vec<T>
+where
+    T: Default + Clone,
+{
+    let mut data = vec![T::default(); values.len()];
     for (row, values) in values.iter_mut().enumerate() {
         data[row] = values.remove(0);
     }
@@ -766,12 +789,11 @@ fn pop_first_column(values: &mut [Vec<Value>]) -> Vec<Value> {
     data
 }
 
-fn _transpose_table(
-    values: &[Vec<Value>],
-    count_rows: usize,
-    count_columns: usize,
-) -> Vec<Vec<Value>> {
-    let mut data = vec![vec![Value::default(); count_rows]; count_columns];
+fn _transpose_table<T>(values: &[Vec<T>], count_rows: usize, count_columns: usize) -> Vec<Vec<T>>
+where
+    T: Clone + Default,
+{
+    let mut data = vec![vec![T::default(); count_rows]; count_columns];
     for (row, values) in values.iter().enumerate() {
         for (column, value) in values.iter().enumerate() {
             data[column][row].clone_from(value);
diff --git a/crates/nu-explore/src/views/record/table_widget.rs b/crates/nu-explore/src/views/record/table_widget.rs
index 7149a7ce60..ae39d46858 100644
--- a/crates/nu-explore/src/views/record/table_widget.rs
+++ b/crates/nu-explore/src/views/record/table_widget.rs
@@ -88,6 +88,7 @@ impl StatefulWidget for TableWidget<'_> {
 
 // todo: refactoring these to methods as they have quite a bit in common.
 impl<'a> TableWidget<'a> {
+    // header at the top; header is always 1 line
     fn render_table_horizontal(self, area: Rect, buf: &mut Buffer, state: &mut TableWidgetState) {
         let padding_l = self.config.column_padding_left as u16;
         let padding_r = self.config.column_padding_right as u16;
@@ -130,25 +131,16 @@ impl<'a> TableWidget<'a> {
         }
 
         if show_index {
-            let area = Rect::new(width, data_y, area.width, data_height);
             width += render_index(
                 buf,
-                area,
+                Rect::new(width, data_y, area.width, data_height),
                 self.style_computer,
                 self.index_row,
                 padding_l,
                 padding_r,
             );
 
-            width += render_vertical_line_with_split(
-                buf,
-                width,
-                data_y,
-                data_height,
-                show_head,
-                false,
-                separator_s,
-            );
+            width += render_split_line(buf, width, area.y, area.height, show_head, separator_s);
         }
 
         // if there is more data than we can show, add an ellipsis to the column headers to hint at that
@@ -162,6 +154,11 @@ impl<'a> TableWidget<'a> {
         }
 
         for col in self.index_column..self.columns.len() {
+            let need_split_line = state.count_columns > 0 && width < area.width;
+            if need_split_line {
+                width += render_split_line(buf, width, area.y, area.height, show_head, separator_s);
+            }
+
             let mut column = create_column(data, col);
             let column_width = calculate_column_width(&column);
 
@@ -200,6 +197,7 @@ impl<'a> TableWidget<'a> {
                 }
                 let head_iter = [(&head, head_style)].into_iter();
 
+                // we don't change width here cause the whole column have the same width; so we add it when we print data
                 let mut w = width;
                 w += render_space(buf, w, head_y, 1, padding_l);
                 w += render_column(buf, w, head_y, use_space, head_iter);
@@ -209,10 +207,10 @@ impl<'a> TableWidget<'a> {
                 state.layout.push(&head, x, head_y, use_space, 1);
             }
 
-            let head_rows = column.iter().map(|(t, s)| (t, *s));
+            let column_rows = column.iter().map(|(t, s)| (t, *s));
 
             width += render_space(buf, width, data_y, data_height, padding_l);
-            width += render_column(buf, width, data_y, use_space, head_rows);
+            width += render_column(buf, width, data_y, use_space, column_rows);
             width += render_space(buf, width, data_y, data_height, padding_r);
 
             for (row, (text, _)) in column.iter().enumerate() {
@@ -235,15 +233,7 @@ impl<'a> TableWidget<'a> {
         }
 
         if width < area.width {
-            width += render_vertical_line_with_split(
-                buf,
-                width,
-                data_y,
-                data_height,
-                show_head,
-                false,
-                separator_s,
-            );
+            width += render_split_line(buf, width, area.y, area.height, show_head, separator_s);
         }
 
         let rest = area.width.saturating_sub(width);
@@ -255,6 +245,7 @@ impl<'a> TableWidget<'a> {
         }
     }
 
+    // header at the left; header is always 1 line
     fn render_table_vertical(self, area: Rect, buf: &mut Buffer, state: &mut TableWidgetState) {
         if area.width == 0 || area.height == 0 {
             return;
@@ -353,6 +344,9 @@ impl<'a> TableWidget<'a> {
         state.count_rows = columns.len();
         state.count_columns = 0;
 
+        // note: is there a time where we would have more then 1 column?
+        // seems like not really; cause it's literally KV table, or am I wrong?
+
         for col in self.index_column..self.data.len() {
             let mut column =
                 self.data[col][self.index_row..self.index_row + columns.len()].to_vec();
@@ -361,6 +355,13 @@ impl<'a> TableWidget<'a> {
                 break;
             }
 
+            // see KV comment; this block might never got used
+            let need_split_line = state.count_columns > 0 && left_w < area.width;
+            if need_split_line {
+                render_vertical_line(buf, area.x + left_w, area.y, area.height, separator_s);
+                left_w += 1;
+            }
+
             let column_width = column_width as u16;
             let available = area.width - left_w;
             let is_last = col + 1 == self.data.len();
@@ -555,6 +556,51 @@ fn render_index(
     width
 }
 
+fn render_split_line(
+    buf: &mut Buffer,
+    x: u16,
+    y: u16,
+    height: u16,
+    has_head: bool,
+    style: NuStyle,
+) -> u16 {
+    if has_head {
+        render_vertical_split_line(buf, x, y, height, &[0], &[2], &[], style);
+    } else {
+        render_vertical_split_line(buf, x, y, height, &[], &[], &[], style);
+    }
+
+    1
+}
+
+#[allow(clippy::too_many_arguments)]
+fn render_vertical_split_line(
+    buf: &mut Buffer,
+    x: u16,
+    y: u16,
+    height: u16,
+    top_slit: &[u16],
+    inner_slit: &[u16],
+    bottom_slit: &[u16],
+    style: NuStyle,
+) -> u16 {
+    render_vertical_line(buf, x, y, height, style);
+
+    for &y in top_slit {
+        render_top_connector(buf, x, y, style);
+    }
+
+    for &y in inner_slit {
+        render_inner_connector(buf, x, y, style);
+    }
+
+    for &y in bottom_slit {
+        render_bottom_connector(buf, x, y, style);
+    }
+
+    1
+}
+
 fn render_vertical_line_with_split(
     buf: &mut Buffer,
     x: u16,
@@ -668,6 +714,12 @@ fn render_bottom_connector(buf: &mut Buffer, x: u16, y: u16, style: NuStyle) {
     buf.set_span(x, y, &span, 1);
 }
 
+fn render_inner_connector(buf: &mut Buffer, x: u16, y: u16, style: NuStyle) {
+    let style = nu_style_to_tui(style);
+    let span = Span::styled("┼", style);
+    buf.set_span(x, y, &span, 1);
+}
+
 fn calculate_column_width(column: &[NuText]) -> usize {
     column
         .iter()

From db86dd9f267e46a7a8aeff75ab87b3d0832d1e00 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Sat, 22 Jun 2024 05:23:42 -0700
Subject: [PATCH 0131/1072] Polars default infer (#13193)

Addresses performance issues that @maxim-uvarov found with CSV and JSON
lines.

This ensures that the schema inference follows the polars defaults of
100 lines. Recent changes caused the default values to be override and
caused the entire file to be scanned when inferring the schema.
---
 .../src/dataframe/eager/open.rs               | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/eager/open.rs b/crates/nu_plugin_polars/src/dataframe/eager/open.rs
index 8842e3c7fb..f7ee467877 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/open.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/open.rs
@@ -32,6 +32,8 @@ use polars_io::{
     avro::AvroReader, csv::read::CsvReadOptions, prelude::ParallelStrategy, HiveOptions,
 };
 
+const DEFAULT_INFER_SCHEMA: usize = 100;
+
 #[derive(Clone)]
 pub struct OpenDataFrame;
 
@@ -374,7 +376,9 @@ fn from_jsonl(
     file_path: &Path,
     file_span: Span,
 ) -> Result<Value, ShellError> {
-    let infer_schema: Option<usize> = call.get_flag("infer-schema")?;
+    let infer_schema: usize = call
+        .get_flag("infer-schema")?
+        .unwrap_or(DEFAULT_INFER_SCHEMA);
     let maybe_schema = call
         .get_flag("schema")?
         .map(|schema| NuSchema::try_from(&schema))
@@ -384,7 +388,7 @@ fn from_jsonl(
         let start_time = std::time::Instant::now();
 
         let df = LazyJsonLineReader::new(file_path)
-            .with_infer_schema_length(infer_schema)
+            .with_infer_schema_length(Some(infer_schema))
             .with_schema(maybe_schema.map(|s| s.into()))
             .finish()
             .map_err(|e| ShellError::GenericError {
@@ -417,7 +421,7 @@ fn from_jsonl(
         let buf_reader = BufReader::new(file);
         let reader = JsonReader::new(buf_reader)
             .with_json_format(JsonFormat::JsonLines)
-            .infer_schema_len(infer_schema);
+            .infer_schema_len(Some(infer_schema));
 
         let reader = match maybe_schema {
             Some(schema) => reader.with_schema(schema.into()),
@@ -459,7 +463,9 @@ fn from_csv(
 ) -> Result<Value, ShellError> {
     let delimiter: Option<Spanned<String>> = call.get_flag("delimiter")?;
     let no_header: bool = call.has_flag("no-header")?;
-    let infer_schema: Option<usize> = call.get_flag("infer-schema")?;
+    let infer_schema: usize = call
+        .get_flag("infer-schema")?
+        .unwrap_or(DEFAULT_INFER_SCHEMA);
     let skip_rows: Option<usize> = call.get_flag("skip-rows")?;
     let columns: Option<Vec<String>> = call.get_flag("columns")?;
 
@@ -499,10 +505,7 @@ fn from_csv(
             None => csv_reader,
         };
 
-        let csv_reader = match infer_schema {
-            None => csv_reader,
-            Some(r) => csv_reader.with_infer_schema_length(Some(r)),
-        };
+        let csv_reader = csv_reader.with_infer_schema_length(Some(infer_schema));
 
         let csv_reader = match skip_rows {
             None => csv_reader,
@@ -535,7 +538,7 @@ fn from_csv(
         let start_time = std::time::Instant::now();
         let df = CsvReadOptions::default()
             .with_has_header(!no_header)
-            .with_infer_schema_length(infer_schema)
+            .with_infer_schema_length(Some(infer_schema))
             .with_skip_rows(skip_rows.unwrap_or_default())
             .with_schema(maybe_schema.map(|s| s.into()))
             .with_columns(columns.map(Arc::new))

From dcb6ab63703caf8917793fcbce2a39967ab819d5 Mon Sep 17 00:00:00 2001
From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Sat, 22 Jun 2024 08:37:34 -0400
Subject: [PATCH 0132/1072] Fixed `generate` command signature (#13200)

# Description

Removes `list<any>` as an input type for the `generate` command. This
command does not accept pipeline input (and cannot, logically). This can
be seen by the use of `_input` in the command's `run()`.

Also, due to #13199, in order to pass `toolkit check pr`, one of the
examples was changed to remove the `result`. This is probably a better
demonstration of the ability of the command to infinitely generate a
list anyway, and an infinite list can't be represented in a `result`.

# User-Facing Changes

Should only be a change to the help. The input type was never valid and
couldn't have been used.

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
---
 crates/nu-command/src/generators/generate.rs | 29 ++++----------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/crates/nu-command/src/generators/generate.rs b/crates/nu-command/src/generators/generate.rs
index 3549667ff0..aeb375aab0 100644
--- a/crates/nu-command/src/generators/generate.rs
+++ b/crates/nu-command/src/generators/generate.rs
@@ -12,13 +12,7 @@ impl Command for Generate {
 
     fn signature(&self) -> Signature {
         Signature::build("generate")
-            .input_output_types(vec![
-                (Type::Nothing, Type::List(Box::new(Type::Any))),
-                (
-                    Type::List(Box::new(Type::Any)),
-                    Type::List(Box::new(Type::Any)),
-                ),
-            ])
+            .input_output_types(vec![(Type::Nothing, Type::List(Box::new(Type::Any)))])
             .required("initial", SyntaxShape::Any, "Initial value.")
             .required(
                 "closure",
@@ -63,23 +57,10 @@ used as the next argument to the closure, otherwise generation stops.
                 )),
             },
             Example {
-                example: "generate [0, 1] {|fib| {out: $fib.0, next: [$fib.1, ($fib.0 + $fib.1)]} } | first 10",
-                description: "Generate a stream of fibonacci numbers",
-                result: Some(Value::list(
-                    vec![
-                        Value::test_int(0),
-                        Value::test_int(1),
-                        Value::test_int(1),
-                        Value::test_int(2),
-                        Value::test_int(3),
-                        Value::test_int(5),
-                        Value::test_int(8),
-                        Value::test_int(13),
-                        Value::test_int(21),
-                        Value::test_int(34),
-                    ],
-                    Span::test_data(),
-                )),
+                example:
+                    "generate [0, 1] {|fib| {out: $fib.0, next: [$fib.1, ($fib.0 + $fib.1)]} }",
+                description: "Generate a continuous stream of Fibonacci numbers",
+                result: None,
             },
         ]
     }

From b6bdadbc6fdbab4d86826f72fe97bf2fd0ad00a6 Mon Sep 17 00:00:00 2001
From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Sat, 22 Jun 2024 08:41:29 -0400
Subject: [PATCH 0133/1072] Suppress column index for default `cal` output
 (#13188)

# Description

* As discussed in the comments in #11954, this suppresses the index
column on `cal` output. It does that by running `table -i false` on the
results by default.
* Added new `--as-table/-t` flag to revert to the old behavior and
output the calendar as structured data
* Updated existing tests to use `--as-table`
* Added new tests against the string output
* Updated `length` test which also used `cal`
* Added new example for `--as-table`, with result

# User-Facing Changes

## Breaking change

The *default* `cal` output has changed from a `list` to a `string`. To
obtain structured data from `cal`, use the new `--as-table/-t` flag.

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`


# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/generators/cal.rs    | 38 +++++++++++++++--
 crates/nu-command/tests/commands/cal.rs    | 47 +++++++++++++++++++---
 crates/nu-command/tests/commands/length.rs |  2 +-
 3 files changed, 77 insertions(+), 10 deletions(-)

diff --git a/crates/nu-command/src/generators/cal.rs b/crates/nu-command/src/generators/cal.rs
index e1ecc771de..a257f3ab7c 100644
--- a/crates/nu-command/src/generators/cal.rs
+++ b/crates/nu-command/src/generators/cal.rs
@@ -1,6 +1,7 @@
 use chrono::{Datelike, Local, NaiveDate};
 use nu_color_config::StyleComputer;
 use nu_engine::command_prelude::*;
+use nu_protocol::ast::{Expr, Expression};
 
 use std::collections::VecDeque;
 
@@ -14,6 +15,7 @@ struct Arguments {
     month_names: bool,
     full_year: Option<Spanned<i64>>,
     week_start: Option<Spanned<String>>,
+    as_table: bool,
 }
 
 impl Command for Cal {
@@ -26,6 +28,7 @@ impl Command for Cal {
             .switch("year", "Display the year column", Some('y'))
             .switch("quarter", "Display the quarter column", Some('q'))
             .switch("month", "Display the month column", Some('m'))
+            .switch("as-table", "output as a table", Some('t'))
             .named(
                 "full-year",
                 SyntaxShape::Int,
@@ -43,7 +46,10 @@ impl Command for Cal {
                 "Display the month names instead of integers",
                 None,
             )
-            .input_output_types(vec![(Type::Nothing, Type::table())])
+            .input_output_types(vec![
+                (Type::Nothing, Type::table()),
+                (Type::Nothing, Type::String),
+            ])
             .allow_variants_without_examples(true) // TODO: supply exhaustive examples
             .category(Category::Generators)
     }
@@ -75,10 +81,15 @@ impl Command for Cal {
                 result: None,
             },
             Example {
-                description: "This month's calendar with the week starting on monday",
+                description: "This month's calendar with the week starting on Monday",
                 example: "cal --week-start mo",
                 result: None,
             },
+            Example {
+                description: "How many 'Friday the Thirteenths' occurred in 2015?",
+                example: "cal --as-table --full-year 2015 | where fr == 13 | length",
+                result: None,
+            },
         ]
     }
 }
@@ -101,6 +112,7 @@ pub fn cal(
         quarter: call.has_flag(engine_state, stack, "quarter")?,
         full_year: call.get_flag(engine_state, stack, "full-year")?,
         week_start: call.get_flag(engine_state, stack, "week-start")?,
+        as_table: call.has_flag(engine_state, stack, "as-table")?,
     };
 
     let style_computer = &StyleComputer::from_config(engine_state, stack);
@@ -131,7 +143,27 @@ pub fn cal(
         style_computer,
     )?;
 
-    Ok(Value::list(calendar_vec_deque.into_iter().collect(), tag).into_pipeline_data())
+    let mut table_no_index = Call::new(Span::unknown());
+    table_no_index.add_named((
+        Spanned {
+            item: "index".to_string(),
+            span: Span::unknown(),
+        },
+        None,
+        Some(Expression::new_unknown(
+            Expr::Bool(false),
+            Span::unknown(),
+            Type::Bool,
+        )),
+    ));
+
+    let cal_table_output =
+        Value::list(calendar_vec_deque.into_iter().collect(), tag).into_pipeline_data();
+    if !arguments.as_table {
+        crate::Table.run(engine_state, stack, &table_no_index, cal_table_output)
+    } else {
+        Ok(cal_table_output)
+    }
 }
 
 fn get_invalid_year_shell_error(head: Span) -> ShellError {
diff --git a/crates/nu-command/tests/commands/cal.rs b/crates/nu-command/tests/commands/cal.rs
index 651ab8d3cd..65d6306845 100644
--- a/crates/nu-command/tests/commands/cal.rs
+++ b/crates/nu-command/tests/commands/cal.rs
@@ -1,8 +1,9 @@
 use nu_test_support::{nu, pipeline};
 
+// Tests against table/structured data
 #[test]
 fn cal_full_year() {
-    let actual = nu!("cal -y --full-year 2010 | first | to json -r");
+    let actual = nu!("cal -t -y --full-year 2010 | first | to json -r");
 
     let first_week_2010_json =
         r#"{"year":2010,"su":null,"mo":null,"tu":null,"we":null,"th":null,"fr":1,"sa":2}"#;
@@ -14,7 +15,7 @@ fn cal_full_year() {
 fn cal_february_2020_leap_year() {
     let actual = nu!(pipeline(
         r#"
-        cal -ym --full-year 2020 --month-names | where month == "february" | to json -r
+        cal --as-table -ym --full-year 2020 --month-names | where month == "february" | to json -r
         "#
     ));
 
@@ -27,7 +28,7 @@ fn cal_february_2020_leap_year() {
 fn cal_fr_the_thirteenths_in_2015() {
     let actual = nu!(pipeline(
         r#"
-        cal --full-year 2015 | default 0 fr | where fr == 13 | length
+        cal --as-table --full-year 2015 | default 0 fr | where fr == 13 | length
         "#
     ));
 
@@ -38,7 +39,7 @@ fn cal_fr_the_thirteenths_in_2015() {
 fn cal_rows_in_2020() {
     let actual = nu!(pipeline(
         r#"
-        cal --full-year 2020 | length
+        cal --as-table --full-year 2020 | length
         "#
     ));
 
@@ -49,7 +50,7 @@ fn cal_rows_in_2020() {
 fn cal_week_day_start_mo() {
     let actual = nu!(pipeline(
         r#"
-        cal --full-year 2020 -m --month-names --week-start mo | where month == january | to json -r
+        cal --as-table --full-year 2020 -m --month-names --week-start mo | where month == january | to json -r
         "#
     ));
 
@@ -62,9 +63,43 @@ fn cal_week_day_start_mo() {
 fn cal_sees_pipeline_year() {
     let actual = nu!(pipeline(
         r#"
-        cal --full-year 1020 | get mo | first 4 | to json -r
+        cal --as-table --full-year 1020 | get mo | first 4 | to json -r
         "#
     ));
 
     assert_eq!(actual.out, "[null,3,10,17]");
 }
+
+// Tests against default string output
+#[test]
+fn cal_is_string() {
+    let actual = nu!(pipeline(
+        r#"
+        cal | describe
+        "#
+    ));
+
+    assert_eq!(actual.out, "string (stream)");
+}
+
+#[test]
+fn cal_year_num_lines() {
+    let actual = nu!(pipeline(
+        r#"
+        cal --full-year 2024 | lines | length
+        "#
+    ));
+
+    assert_eq!(actual.out, "68");
+}
+
+#[test]
+fn cal_week_start_string() {
+    let actual = nu!(pipeline(
+        r#"
+        cal --week-start fr | lines | get 1 | split row '│' | get 2 | ansi strip | str trim
+        "#
+    ));
+
+    assert_eq!(actual.out, "sa");
+}
diff --git a/crates/nu-command/tests/commands/length.rs b/crates/nu-command/tests/commands/length.rs
index 63318e65db..b67ac452e8 100644
--- a/crates/nu-command/tests/commands/length.rs
+++ b/crates/nu-command/tests/commands/length.rs
@@ -2,7 +2,7 @@ use nu_test_support::nu;
 
 #[test]
 fn length_columns_in_cal_table() {
-    let actual = nu!("cal | columns | length");
+    let actual = nu!("cal --as-table | columns | length");
 
     assert_eq!(actual.out, "7");
 }

From 9b7f899410e0f5bbeddd75d1c431c927c3e610af Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Sat, 22 Jun 2024 22:31:09 +0200
Subject: [PATCH 0134/1072] Allow missing fields in derived
 `FromValue::from_value` calls (#13206)

# Description
In #13031 I added the derive macros for `FromValue` and `IntoValue`. In
that implementation, in particular for structs with named fields, it was
not possible to omit fields while loading them from a value, when the
field is an `Option`. This PR adds extra handling for this behavior, so
if a field is an `Option` and that field is missing in the `Value`, then
the field becomes `None`. This behavior is also tested in
`nu_protocol::value::test_derive::missing_options`.

# User-Facing Changes
When using structs for options or similar, users can now just emit
fields in the record and the derive `from_value` method will be able to
understand this, if the struct has an `Option` type for that field.

# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
A showcase for this feature would be great, I tried to use the current
derive macro in a plugin of mine for a config but without this addition,
they are annoying to use. So, when this is done, I would add an example
for such plugin configs that may be loaded via `FromValue`.
---
 crates/nu-derive-value/src/from.rs          | 66 +++++++++++++++------
 crates/nu-protocol/src/value/test_derive.rs | 56 +++++++++++++++++
 2 files changed, 103 insertions(+), 19 deletions(-)

diff --git a/crates/nu-derive-value/src/from.rs b/crates/nu-derive-value/src/from.rs
index 033026c149..783a22920e 100644
--- a/crates/nu-derive-value/src/from.rs
+++ b/crates/nu-derive-value/src/from.rs
@@ -3,6 +3,7 @@ use proc_macro2::TokenStream as TokenStream2;
 use quote::{quote, ToTokens};
 use syn::{
     spanned::Spanned, Attribute, Data, DataEnum, DataStruct, DeriveInput, Fields, Generics, Ident,
+    Type,
 };
 
 use crate::attributes::{self, ContainerAttributes};
@@ -116,15 +117,11 @@ fn derive_struct_from_value(
 ///                         src_span: span
 ///                     })?,
 ///             )?,
-///             favorite_toy: <Option<String> as nu_protocol::FromValue>::from_value(
-///                 record
-///                     .remove("favorite_toy")
-///                     .ok_or_else(|| nu_protocol::ShellError::CantFindColumn {
-///                         col_name: std::string::ToString::to_string("favorite_toy"),
-///                         span: std::option::Option::None,
-///                         src_span: span
-///                     })?,
-///             )?,          
+///             favorite_toy: record
+///                 .remove("favorite_toy")
+///                 .map(|v| <#ty as nu_protocol::FromValue>::from_value(v))
+///                 .transpose()?
+///                 .flatten(),         
 ///         })
 ///     }
 /// }
@@ -480,20 +477,29 @@ fn parse_value_via_fields(fields: &Fields, self_ident: impl ToTokens) -> TokenSt
     match fields {
         Fields::Named(fields) => {
             let fields = fields.named.iter().map(|field| {
-                // TODO: handle missing fields for Options as None
                 let ident = field.ident.as_ref().expect("named has idents");
                 let ident_s = ident.to_string();
                 let ty = &field.ty;
-                quote! {
-                    #ident: <#ty as nu_protocol::FromValue>::from_value(
-                        record
+                match type_is_option(ty) {
+                    true => quote! {
+                        #ident: record
                             .remove(#ident_s)
-                            .ok_or_else(|| nu_protocol::ShellError::CantFindColumn {
-                                col_name: std::string::ToString::to_string(#ident_s),
-                                span: std::option::Option::None,
-                                src_span: span
-                            })?,
-                    )?
+                            .map(|v| <#ty as nu_protocol::FromValue>::from_value(v))
+                            .transpose()?
+                            .flatten()
+                    },
+
+                    false => quote! {
+                        #ident: <#ty as nu_protocol::FromValue>::from_value(
+                            record
+                                .remove(#ident_s)
+                                .ok_or_else(|| nu_protocol::ShellError::CantFindColumn {
+                                    col_name: std::string::ToString::to_string(#ident_s),
+                                    span: std::option::Option::None,
+                                    src_span: span
+                                })?,
+                        )?
+                    },
                 }
             });
             quote! {
@@ -537,3 +543,25 @@ fn parse_value_via_fields(fields: &Fields, self_ident: impl ToTokens) -> TokenSt
         },
     }
 }
+
+const FULLY_QUALIFIED_OPTION: &str = "std::option::Option";
+const PARTIALLY_QUALIFIED_OPTION: &str = "option::Option";
+const PRELUDE_OPTION: &str = "Option";
+
+/// Check if the field type is an `Option`.
+///
+/// This function checks if a given type is an `Option`.
+/// We assume that an `Option` is [`std::option::Option`] because we can't see the whole code and
+/// can't ask the compiler itself.
+/// If the `Option` type isn't `std::option::Option`, the user will get a compile error due to a
+/// type mismatch.
+/// It's very unusual for people to override `Option`, so this should rarely be an issue.
+///
+/// When [rust#63084](https://github.com/rust-lang/rust/issues/63084) is resolved, we can use
+/// [`std::any::type_name`] for a static assertion check to get a more direct error messages.
+fn type_is_option(ty: &Type) -> bool {
+    let s = ty.to_token_stream().to_string();
+    s.starts_with(PRELUDE_OPTION)
+        || s.starts_with(PARTIALLY_QUALIFIED_OPTION)
+        || s.starts_with(FULLY_QUALIFIED_OPTION)
+}
diff --git a/crates/nu-protocol/src/value/test_derive.rs b/crates/nu-protocol/src/value/test_derive.rs
index 1865a05418..56bccabd2a 100644
--- a/crates/nu-protocol/src/value/test_derive.rs
+++ b/crates/nu-protocol/src/value/test_derive.rs
@@ -171,6 +171,62 @@ fn named_fields_struct_incorrect_type() {
     assert!(res.is_err());
 }
 
+#[derive(IntoValue, FromValue, Debug, PartialEq, Default)]
+struct ALotOfOptions {
+    required: bool,
+    float: Option<f64>,
+    int: Option<i64>,
+    value: Option<Value>,
+    nested: Option<Nestee>,
+}
+
+#[test]
+fn missing_options() {
+    let value = Value::test_record(Record::new());
+    let res: Result<ALotOfOptions, _> = ALotOfOptions::from_value(value);
+    assert!(res.is_err());
+
+    let value = Value::test_record(record! {"required" => Value::test_bool(true)});
+    let expected = ALotOfOptions {
+        required: true,
+        ..Default::default()
+    };
+    let actual = ALotOfOptions::from_value(value).unwrap();
+    assert_eq!(expected, actual);
+
+    let value = Value::test_record(record! {
+        "required" => Value::test_bool(true),
+        "float" => Value::test_float(std::f64::consts::PI),
+    });
+    let expected = ALotOfOptions {
+        required: true,
+        float: Some(std::f64::consts::PI),
+        ..Default::default()
+    };
+    let actual = ALotOfOptions::from_value(value).unwrap();
+    assert_eq!(expected, actual);
+
+    let value = Value::test_record(record! {
+        "required" => Value::test_bool(true),
+        "int" => Value::test_int(12),
+        "nested" => Value::test_record(record! {
+            "u32" => Value::test_int(34),
+        }),
+    });
+    let expected = ALotOfOptions {
+        required: true,
+        int: Some(12),
+        nested: Some(Nestee {
+            u32: 34,
+            some: None,
+            none: None,
+        }),
+        ..Default::default()
+    };
+    let actual = ALotOfOptions::from_value(value).unwrap();
+    assert_eq!(expected, actual);
+}
+
 #[derive(IntoValue, FromValue, Debug, PartialEq)]
 struct UnnamedFieldsStruct<T>(u32, String, T)
 where

From 4509944988fe9607bc5256702afb9a7982c76610 Mon Sep 17 00:00:00 2001
From: Bruce Weirdan <weirdan@gmail.com>
Date: Mon, 24 Jun 2024 01:43:05 +0200
Subject: [PATCH 0135/1072] Fix usage parsing for commands defined in CRLF
 (windows) files (#13212)

Fixes nushell/nushell#13207

# Description
This fixes the parsing of command usage when that command comes from a
file with CRLF line endings.

See nushell/nushell#13207 for more details.

# User-Facing Changes
Users on Windows will get correct autocompletion for `std` commands.
---
 crates/nu-protocol/src/engine/usage.rs |  4 +++-
 tests/repl/test_parser.rs              | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/crates/nu-protocol/src/engine/usage.rs b/crates/nu-protocol/src/engine/usage.rs
index a9cf2c25f1..76f50d2424 100644
--- a/crates/nu-protocol/src/engine/usage.rs
+++ b/crates/nu-protocol/src/engine/usage.rs
@@ -81,7 +81,9 @@ pub(super) fn build_usage(comment_lines: &[&[u8]]) -> (String, String) {
         usage.push_str(&comment_line);
     }
 
-    if let Some((brief_usage, extra_usage)) = usage.split_once("\n\n") {
+    if let Some((brief_usage, extra_usage)) = usage.split_once("\r\n\r\n") {
+        (brief_usage.to_string(), extra_usage.to_string())
+    } else if let Some((brief_usage, extra_usage)) = usage.split_once("\n\n") {
         (brief_usage.to_string(), extra_usage.to_string())
     } else {
         (usage, String::default())
diff --git a/tests/repl/test_parser.rs b/tests/repl/test_parser.rs
index 9d743b175d..0efb1d087a 100644
--- a/tests/repl/test_parser.rs
+++ b/tests/repl/test_parser.rs
@@ -261,6 +261,22 @@ fn commands_have_usage() -> TestResult {
     )
 }
 
+#[test]
+fn commands_from_crlf_source_have_short_usage() -> TestResult {
+    run_test_contains(
+        "# This is a test\r\n#\r\n# To see if I have cool usage\r\ndef foo [] {}\r\nscope commands | where name == foo | get usage.0",
+        "This is a test",
+    )
+}
+
+#[test]
+fn commands_from_crlf_source_have_extra_usage() -> TestResult {
+    run_test_contains(
+        "# This is a test\r\n#\r\n# To see if I have cool usage\r\ndef foo [] {}\r\nscope commands | where name == foo | get extra_usage.0",
+        "To see if I have cool usage",
+    )
+}
+
 #[test]
 fn equals_separates_long_flag() -> TestResult {
     run_test(

From 43e349a274d955185f7a199ddf1db0e4acd6c498 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Mon, 24 Jun 2024 16:39:01 -0700
Subject: [PATCH 0136/1072] Mitigate the poor interaction between ndots
 expansion and non-path strings (#13218)

# Description

@hustcer reported that slashes were disappearing from external args
since #13089:

```
$> ossutil ls oss://abc/b/c
Error: invalid cloud url: "oss:/abc/b/c", please make sure the url starts with: "oss://"

$> ossutil ls 'oss://abc/b/c'
Error: oss: service returned error: StatusCode=403, ErrorCode=UserDisable, ErrorMessage="UserDisable", RequestId=66791EDEFE87B73537120838, Ec=0003-00000801, Bucket=abc, Object=
```

I narrowed this down to the ndots handling, since that does path parsing
and path reconstruction in every case. I decided to change that so that
it only activates if the string contains at least `...`, since that
would be the minimum trigger for ndots, and also to not activate it if
the string contains `://`, since it's probably undesirable for a URL.

Kind of a hack, but I'm not really sure how else we decide whether
someone wants ndots or not.

# User-Facing Changes
- bare strings not containing ndots are not modified
- bare strings containing `://` are not modified

# Tests + Formatting
Added tests to prevent regression.
---
 crates/nu-command/src/system/run_external.rs  | 23 +++++++++++--
 .../nu-command/tests/commands/run_external.rs | 32 +++++++++++++++++++
 2 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index 104729a786..f82c23a0e0 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -64,7 +64,9 @@ impl Command for External {
 
         let expanded_name = match &name {
             // Expand tilde and ndots on the name if it's a bare string / glob (#13000)
-            Value::Glob { no_expand, .. } if !*no_expand => expand_ndots(expand_tilde(&*name_str)),
+            Value::Glob { no_expand, .. } if !*no_expand => {
+                expand_ndots_safe(expand_tilde(&*name_str))
+            }
             _ => Path::new(&*name_str).to_owned(),
         };
 
@@ -294,7 +296,7 @@ fn expand_glob(
     // For an argument that doesn't include the GLOB_CHARS, just do the `expand_tilde`
     // and `expand_ndots` expansion
     if !arg.contains(GLOB_CHARS) {
-        let path = expand_ndots(expand_tilde(arg));
+        let path = expand_ndots_safe(expand_tilde(arg));
         return Ok(vec![path.into()]);
     }
 
@@ -582,6 +584,21 @@ fn escape_cmd_argument(arg: &Spanned<OsString>) -> Result<Cow<'_, OsStr>, ShellE
     }
 }
 
+/// Expand ndots, but only if it looks like it probably contains them, because there is some lossy
+/// path normalization that happens.
+fn expand_ndots_safe(path: impl AsRef<Path>) -> PathBuf {
+    let string = path.as_ref().to_string_lossy();
+
+    // Use ndots if it contains at least `...`, since that's the minimum trigger point, and don't
+    // use it if it contains ://, because that looks like a URL scheme and the path normalization
+    // will mess with that.
+    if string.contains("...") && !string.contains("://") {
+        expand_ndots(path)
+    } else {
+        path.as_ref().to_owned()
+    }
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
@@ -610,7 +627,7 @@ mod test {
             assert_eq!(actual, expected);
 
             let actual = expand_glob("./a.txt", cwd, Span::unknown(), &None).unwrap();
-            let expected: Vec<OsString> = vec![Path::new(".").join("a.txt").into()];
+            let expected = &["./a.txt"];
             assert_eq!(actual, expected);
 
             let actual = expand_glob("[*.txt", cwd, Span::unknown(), &None).unwrap();
diff --git a/crates/nu-command/tests/commands/run_external.rs b/crates/nu-command/tests/commands/run_external.rs
index daa5abb25b..154c31b71c 100644
--- a/crates/nu-command/tests/commands/run_external.rs
+++ b/crates/nu-command/tests/commands/run_external.rs
@@ -229,6 +229,38 @@ fn external_command_escape_args() {
     })
 }
 
+#[test]
+fn external_command_ndots_args() {
+    let actual = nu!(r#"
+        nu --testbin cococo foo/. foo/.. foo/... foo/./bar foo/../bar foo/.../bar ./bar ../bar .../bar
+    "#);
+
+    assert_eq!(
+        actual.out,
+        if cfg!(windows) {
+            // Windows is a bit weird right now, where if ndots has to fix something it's going to
+            // change everything to backslashes too. Would be good to fix that
+            r"foo/. foo/.. foo\..\.. foo/./bar foo/../bar foo\..\..\bar ./bar ../bar ..\..\bar"
+        } else {
+            r"foo/. foo/.. foo/../.. foo/./bar foo/../bar foo/../../bar ./bar ../bar ../../bar"
+        }
+    );
+}
+
+#[test]
+fn external_command_url_args() {
+    // If ndots is not handled correctly, we can lose the double forward slashes that are needed
+    // here
+    let actual = nu!(r#"
+        nu --testbin cococo http://example.com http://example.com/.../foo //foo
+    "#);
+
+    assert_eq!(
+        actual.out,
+        "http://example.com http://example.com/.../foo //foo"
+    );
+}
+
 #[test]
 #[cfg_attr(
     not(target_os = "linux"),

From f93c6680bd5ae158190556eb1afc924b0290b52f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C5=BD=C3=A1dn=C3=ADk?= <kubouch@gmail.com>
Date: Tue, 25 Jun 2024 21:29:47 +0300
Subject: [PATCH 0137/1072] Bump to 0.95.0 (#13221)

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

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

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

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

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock                                    | 74 +++++++++----------
 Cargo.toml                                    | 42 +++++------
 crates/nu-cli/Cargo.toml                      | 26 +++----
 crates/nu-cmd-base/Cargo.toml                 | 12 +--
 crates/nu-cmd-extra/Cargo.toml                | 22 +++---
 crates/nu-cmd-lang/Cargo.toml                 | 12 +--
 crates/nu-cmd-plugin/Cargo.toml               | 12 +--
 crates/nu-color-config/Cargo.toml             | 10 +--
 crates/nu-command/Cargo.toml                  | 36 ++++-----
 crates/nu-derive-value/Cargo.toml             |  4 +-
 crates/nu-engine/Cargo.toml                   | 12 +--
 crates/nu-explore/Cargo.toml                  | 20 ++---
 crates/nu-glob/Cargo.toml                     |  4 +-
 crates/nu-json/Cargo.toml                     |  6 +-
 crates/nu-lsp/Cargo.toml                      | 16 ++--
 crates/nu-parser/Cargo.toml                   | 12 +--
 crates/nu-path/Cargo.toml                     |  4 +-
 crates/nu-plugin-core/Cargo.toml              |  8 +-
 crates/nu-plugin-engine/Cargo.toml            | 14 ++--
 crates/nu-plugin-protocol/Cargo.toml          |  8 +-
 crates/nu-plugin-test-support/Cargo.toml      | 20 ++---
 crates/nu-plugin/Cargo.toml                   | 12 +--
 crates/nu-pretty-hex/Cargo.toml               |  4 +-
 crates/nu-protocol/Cargo.toml                 | 14 ++--
 crates/nu-std/Cargo.toml                      | 10 +--
 crates/nu-system/Cargo.toml                   |  4 +-
 crates/nu-table/Cargo.toml                    | 12 +--
 crates/nu-term-grid/Cargo.toml                |  6 +-
 crates/nu-test-support/Cargo.toml             | 10 +--
 crates/nu-utils/Cargo.toml                    |  4 +-
 .../src/sample_config/default_config.nu       |  4 +-
 .../nu-utils/src/sample_config/default_env.nu |  4 +-
 crates/nu_plugin_custom_values/Cargo.toml     |  6 +-
 crates/nu_plugin_example/Cargo.toml           | 10 +--
 crates/nu_plugin_formats/Cargo.toml           |  8 +-
 crates/nu_plugin_gstat/Cargo.toml             |  8 +-
 crates/nu_plugin_inc/Cargo.toml               |  8 +-
 .../nu_plugin_nu_example.nu                   |  4 +-
 crates/nu_plugin_polars/Cargo.toml            | 20 ++---
 .../nu_plugin_python_example.py               |  4 +-
 crates/nu_plugin_query/Cargo.toml             |  8 +-
 crates/nu_plugin_stress_internals/Cargo.toml  |  4 +-
 crates/nuon/Cargo.toml                        | 10 +--
 43 files changed, 274 insertions(+), 274 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ba1880d9b5..9b8f5273c8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2769,7 +2769,7 @@ dependencies = [
 
 [[package]]
 name = "nu"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "assert_cmd",
  "crossterm",
@@ -2822,7 +2822,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cli"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "chrono",
  "crossterm",
@@ -2857,7 +2857,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-base"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "indexmap",
  "miette",
@@ -2869,7 +2869,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-extra"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "fancy-regex",
  "heck 0.5.0",
@@ -2894,7 +2894,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-lang"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "itertools 0.12.1",
  "nu-engine",
@@ -2906,7 +2906,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-plugin"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "itertools 0.12.1",
  "nu-engine",
@@ -2917,7 +2917,7 @@ dependencies = [
 
 [[package]]
 name = "nu-color-config"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "nu-ansi-term",
  "nu-engine",
@@ -2929,7 +2929,7 @@ dependencies = [
 
 [[package]]
 name = "nu-command"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "alphanumeric-sort",
  "base64 0.22.1",
@@ -3038,7 +3038,7 @@ dependencies = [
 
 [[package]]
 name = "nu-derive-value"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "convert_case",
  "proc-macro-error",
@@ -3049,7 +3049,7 @@ dependencies = [
 
 [[package]]
 name = "nu-engine"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -3059,7 +3059,7 @@ dependencies = [
 
 [[package]]
 name = "nu-explore"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "ansi-str",
  "anyhow",
@@ -3084,14 +3084,14 @@ dependencies = [
 
 [[package]]
 name = "nu-glob"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "doc-comment",
 ]
 
 [[package]]
 name = "nu-json"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "linked-hash-map",
  "num-traits",
@@ -3101,7 +3101,7 @@ dependencies = [
 
 [[package]]
 name = "nu-lsp"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "assert-json-diff",
  "crossbeam-channel",
@@ -3122,7 +3122,7 @@ dependencies = [
 
 [[package]]
 name = "nu-parser"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "bytesize",
  "chrono",
@@ -3138,7 +3138,7 @@ dependencies = [
 
 [[package]]
 name = "nu-path"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "dirs-next",
  "omnipath",
@@ -3147,7 +3147,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "log",
  "nix",
@@ -3162,7 +3162,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-core"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "interprocess",
  "log",
@@ -3176,7 +3176,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-engine"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "log",
  "nu-engine",
@@ -3191,7 +3191,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-protocol"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "bincode",
  "nu-protocol",
@@ -3203,7 +3203,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-test-support"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "nu-ansi-term",
  "nu-cmd-lang",
@@ -3221,7 +3221,7 @@ dependencies = [
 
 [[package]]
 name = "nu-pretty-hex"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "heapless",
  "nu-ansi-term",
@@ -3230,7 +3230,7 @@ dependencies = [
 
 [[package]]
 name = "nu-protocol"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "brotli",
  "byte-unit",
@@ -3263,7 +3263,7 @@ dependencies = [
 
 [[package]]
 name = "nu-std"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "log",
  "miette",
@@ -3274,7 +3274,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "chrono",
  "itertools 0.12.1",
@@ -3292,7 +3292,7 @@ dependencies = [
 
 [[package]]
 name = "nu-table"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "fancy-regex",
  "nu-ansi-term",
@@ -3306,7 +3306,7 @@ dependencies = [
 
 [[package]]
 name = "nu-term-grid"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "nu-utils",
  "unicode-width",
@@ -3314,7 +3314,7 @@ dependencies = [
 
 [[package]]
 name = "nu-test-support"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -3326,7 +3326,7 @@ dependencies = [
 
 [[package]]
 name = "nu-utils"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "crossterm_winapi",
  "log",
@@ -3352,7 +3352,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_example"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "nu-cmd-lang",
  "nu-plugin",
@@ -3362,7 +3362,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_formats"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "eml-parser",
  "ical",
@@ -3375,7 +3375,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_gstat"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "git2",
  "nu-plugin",
@@ -3384,7 +3384,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_inc"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -3393,7 +3393,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_polars"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "chrono",
  "chrono-tz 0.9.0",
@@ -3424,7 +3424,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_query"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "gjson",
  "nu-plugin",
@@ -3436,7 +3436,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_stress_internals"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "interprocess",
  "serde",
@@ -3562,7 +3562,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "nuon"
-version = "0.94.3"
+version = "0.95.0"
 dependencies = [
  "chrono",
  "fancy-regex",
diff --git a/Cargo.toml b/Cargo.toml
index 6fce7d3c01..696c012b80 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
 rust-version = "1.77.2"
-version = "0.94.3"
+version = "0.95.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -180,22 +180,22 @@ windows = "0.54"
 winreg = "0.52"
 
 [dependencies]
-nu-cli = { path = "./crates/nu-cli", version = "0.94.3" }
-nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.94.3" }
-nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.94.3" }
-nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.94.3", optional = true }
-nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.94.3" }
-nu-command = { path = "./crates/nu-command", version = "0.94.3" }
-nu-engine = { path = "./crates/nu-engine", version = "0.94.3" }
-nu-explore = { path = "./crates/nu-explore", version = "0.94.3" }
-nu-lsp = { path = "./crates/nu-lsp/", version = "0.94.3" }
-nu-parser = { path = "./crates/nu-parser", version = "0.94.3" }
-nu-path = { path = "./crates/nu-path", version = "0.94.3" }
-nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.94.3" }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.94.3" }
-nu-std = { path = "./crates/nu-std", version = "0.94.3" }
-nu-system = { path = "./crates/nu-system", version = "0.94.3" }
-nu-utils = { path = "./crates/nu-utils", version = "0.94.3" }
+nu-cli = { path = "./crates/nu-cli", version = "0.95.0" }
+nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.95.0" }
+nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.95.0" }
+nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.95.0", optional = true }
+nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.95.0" }
+nu-command = { path = "./crates/nu-command", version = "0.95.0" }
+nu-engine = { path = "./crates/nu-engine", version = "0.95.0" }
+nu-explore = { path = "./crates/nu-explore", version = "0.95.0" }
+nu-lsp = { path = "./crates/nu-lsp/", version = "0.95.0" }
+nu-parser = { path = "./crates/nu-parser", version = "0.95.0" }
+nu-path = { path = "./crates/nu-path", version = "0.95.0" }
+nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.95.0" }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.95.0" }
+nu-std = { path = "./crates/nu-std", version = "0.95.0" }
+nu-system = { path = "./crates/nu-system", version = "0.95.0" }
+nu-utils = { path = "./crates/nu-utils", version = "0.95.0" }
 
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
@@ -225,9 +225,9 @@ nix = { workspace = true, default-features = false, features = [
 ] }
 
 [dev-dependencies]
-nu-test-support = { path = "./crates/nu-test-support", version = "0.94.3" }
-nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.94.3" }
-nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.94.3" }
+nu-test-support = { path = "./crates/nu-test-support", version = "0.95.0" }
+nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.95.0" }
+nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.95.0" }
 assert_cmd = "2.0"
 dirs-next = { workspace = true }
 tango-bench = "0.5"
@@ -310,4 +310,4 @@ bench = false
 # Run individual benchmarks like `cargo bench -- <regex>` e.g. `cargo bench -- parse`
 [[bench]]
 name = "benchmarks"
-harness = false
+harness = false
\ No newline at end of file
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index c2ca2c9704..8e7c7b5535 100644
--- 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.94.3"
+version = "0.95.0"
 
 [lib]
 bench = false
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.3" }
-nu-command = { path = "../nu-command", version = "0.94.3" }
-nu-test-support = { path = "../nu-test-support", version = "0.94.3" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.0" }
+nu-command = { path = "../nu-command", version = "0.95.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.95.0" }
 rstest = { workspace = true, default-features = false }
 tempfile = { workspace = true }
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.94.3" }
-nu-engine = { path = "../nu-engine", version = "0.94.3" }
-nu-path = { path = "../nu-path", version = "0.94.3" }
-nu-parser = { path = "../nu-parser", version = "0.94.3" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.94.3", optional = true }
-nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
-nu-utils = { path = "../nu-utils", version = "0.94.3" }
-nu-color-config = { path = "../nu-color-config", version = "0.94.3" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.95.0" }
+nu-engine = { path = "../nu-engine", version = "0.95.0" }
+nu-path = { path = "../nu-path", version = "0.95.0" }
+nu-parser = { path = "../nu-parser", version = "0.95.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.95.0", optional = true }
+nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
+nu-utils = { path = "../nu-utils", version = "0.95.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.95.0" }
 nu-ansi-term = { workspace = true }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
@@ -46,4 +46,4 @@ which = { workspace = true }
 
 [features]
 plugin = ["nu-plugin-engine"]
-system-clipboard = ["reedline/system_clipboard"]
+system-clipboard = ["reedline/system_clipboard"]
\ No newline at end of file
diff --git a/crates/nu-cmd-base/Cargo.toml b/crates/nu-cmd-base/Cargo.toml
index fb6a977ab9..773ee05414 100644
--- a/crates/nu-cmd-base/Cargo.toml
+++ b/crates/nu-cmd-base/Cargo.toml
@@ -5,17 +5,17 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-base"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-base"
-version = "0.94.3"
+version = "0.95.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.94.3" }
-nu-parser = { path = "../nu-parser", version = "0.94.3" }
-nu-path = { path = "../nu-path", version = "0.94.3" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
+nu-engine = { path = "../nu-engine", version = "0.95.0" }
+nu-parser = { path = "../nu-parser", version = "0.95.0" }
+nu-path = { path = "../nu-path", version = "0.95.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
 
 indexmap = { workspace = true }
 miette = { workspace = true }
 
-[dev-dependencies]
+[dev-dependencies]
\ No newline at end of file
diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml
index 038c9421e8..30c94420a3 100644
--- 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.94.3"
+version = "0.95.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,13 +13,13 @@ version = "0.94.3"
 bench = false
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.94.3" }
-nu-engine = { path = "../nu-engine", version = "0.94.3" }
-nu-json = { version = "0.94.3", path = "../nu-json" }
-nu-parser = { path = "../nu-parser", version = "0.94.3" }
-nu-pretty-hex = { version = "0.94.3", path = "../nu-pretty-hex" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
-nu-utils = { path = "../nu-utils", version = "0.94.3" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.95.0" }
+nu-engine = { path = "../nu-engine", version = "0.95.0" }
+nu-json = { version = "0.95.0", path = "../nu-json" }
+nu-parser = { path = "../nu-parser", version = "0.95.0" }
+nu-pretty-hex = { version = "0.95.0", path = "../nu-pretty-hex" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
+nu-utils = { path = "../nu-utils", version = "0.95.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.94.3" }
-nu-command = { path = "../nu-command", version = "0.94.3" }
-nu-test-support = { path = "../nu-test-support", version = "0.94.3" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.0" }
+nu-command = { path = "../nu-command", version = "0.95.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.95.0" }
\ No newline at end of file
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index dcd940ba58..6db0d4c096 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -6,16 +6,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-lang"
 edition = "2021"
 license = "MIT"
 name = "nu-cmd-lang"
-version = "0.94.3"
+version = "0.95.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.94.3" }
-nu-parser = { path = "../nu-parser", version = "0.94.3" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
-nu-utils = { path = "../nu-utils", version = "0.94.3" }
+nu-engine = { path = "../nu-engine", version = "0.95.0" }
+nu-parser = { path = "../nu-parser", version = "0.95.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
+nu-utils = { path = "../nu-utils", version = "0.95.0" }
 
 itertools = { workspace = true }
 shadow-rs = { version = "0.28", default-features = false }
@@ -28,4 +28,4 @@ mimalloc = []
 trash-support = []
 sqlite = []
 static-link-openssl = []
-system-clipboard = []
+system-clipboard = []
\ No newline at end of file
diff --git a/crates/nu-cmd-plugin/Cargo.toml b/crates/nu-cmd-plugin/Cargo.toml
index d274f46a6a..f6eccb753e 100644
--- a/crates/nu-cmd-plugin/Cargo.toml
+++ b/crates/nu-cmd-plugin/Cargo.toml
@@ -5,16 +5,16 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-plugin"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-plugin"
-version = "0.94.3"
+version = "0.95.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.94.3" }
-nu-path = { path = "../nu-path", version = "0.94.3" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.3", features = ["plugin"] }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.94.3" }
+nu-engine = { path = "../nu-engine", version = "0.95.0" }
+nu-path = { path = "../nu-path", version = "0.95.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.0", features = ["plugin"] }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.95.0" }
 
 itertools = { workspace = true }
 
-[dev-dependencies]
+[dev-dependencies]
\ No newline at end of file
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index 95b06c1f77..34f15cd74f 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -5,18 +5,18 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-color-confi
 edition = "2021"
 license = "MIT"
 name = "nu-color-config"
-version = "0.94.3"
+version = "0.95.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
-nu-engine = { path = "../nu-engine", version = "0.94.3" }
-nu-json = { path = "../nu-json", version = "0.94.3" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
+nu-engine = { path = "../nu-engine", version = "0.95.0" }
+nu-json = { path = "../nu-json", version = "0.95.0" }
 nu-ansi-term = { workspace = true }
 
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.94.3" }
+nu-test-support = { path = "../nu-test-support", version = "0.95.0" }
\ No newline at end of file
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index f16d62d836..355232b938 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-command"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
-version = "0.94.3"
+version = "0.95.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,21 +13,21 @@ version = "0.94.3"
 bench = false
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.94.3" }
-nu-color-config = { path = "../nu-color-config", version = "0.94.3" }
-nu-engine = { path = "../nu-engine", version = "0.94.3" }
-nu-glob = { path = "../nu-glob", version = "0.94.3" }
-nu-json = { path = "../nu-json", version = "0.94.3" }
-nu-parser = { path = "../nu-parser", version = "0.94.3" }
-nu-path = { path = "../nu-path", version = "0.94.3" }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.94.3" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
-nu-system = { path = "../nu-system", version = "0.94.3" }
-nu-table = { path = "../nu-table", version = "0.94.3" }
-nu-term-grid = { path = "../nu-term-grid", version = "0.94.3" }
-nu-utils = { path = "../nu-utils", version = "0.94.3" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.95.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.95.0" }
+nu-engine = { path = "../nu-engine", version = "0.95.0" }
+nu-glob = { path = "../nu-glob", version = "0.95.0" }
+nu-json = { path = "../nu-json", version = "0.95.0" }
+nu-parser = { path = "../nu-parser", version = "0.95.0" }
+nu-path = { path = "../nu-path", version = "0.95.0" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.95.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
+nu-system = { path = "../nu-system", version = "0.95.0" }
+nu-table = { path = "../nu-table", version = "0.95.0" }
+nu-term-grid = { path = "../nu-term-grid", version = "0.95.0" }
+nu-utils = { path = "../nu-utils", version = "0.95.0" }
 nu-ansi-term = { workspace = true }
-nuon = { path = "../nuon", version = "0.94.3" }
+nuon = { path = "../nuon", version = "0.95.0" }
 
 alphanumeric-sort = { workspace = true }
 base64 = { workspace = true }
@@ -136,8 +136,8 @@ sqlite = ["rusqlite"]
 trash-support = ["trash"]
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.3" }
-nu-test-support = { path = "../nu-test-support", version = "0.94.3" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.95.0" }
 
 dirs-next = { workspace = true }
 mockito = { workspace = true, default-features = false }
@@ -145,4 +145,4 @@ quickcheck = { workspace = true }
 quickcheck_macros = { workspace = true }
 rstest = { workspace = true, default-features = false }
 pretty_assertions = { workspace = true }
-tempfile = { workspace = true }
+tempfile = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-derive-value/Cargo.toml b/crates/nu-derive-value/Cargo.toml
index 45395b2ddb..37698ccaeb 100644
--- a/crates/nu-derive-value/Cargo.toml
+++ b/crates/nu-derive-value/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-derive-value"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-derive-value"
-version = "0.94.3"
+version = "0.95.0"
 
 [lib]
 proc-macro = true
@@ -18,4 +18,4 @@ proc-macro2 = { workspace = true }
 syn = { workspace = true }
 quote = { workspace = true }
 proc-macro-error = { workspace = true }
-convert_case = { workspace = true }
+convert_case = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index fae2b3eff4..7c815d4c72 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-engine"
 edition = "2021"
 license = "MIT"
 name = "nu-engine"
-version = "0.94.3"
+version = "0.95.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.94.3" }
-nu-path = { path = "../nu-path", version = "0.94.3" }
-nu-glob = { path = "../nu-glob", version = "0.94.3" }
-nu-utils = { path = "../nu-utils", version = "0.94.3" }
+nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.95.0" }
+nu-path = { path = "../nu-path", version = "0.95.0" }
+nu-glob = { path = "../nu-glob", version = "0.95.0" }
+nu-utils = { path = "../nu-utils", version = "0.95.0" }
 
 [features]
-plugin = []
+plugin = []
\ No newline at end of file
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index dc17e6087d..ac0fe732da 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -5,21 +5,21 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-explore"
 edition = "2021"
 license = "MIT"
 name = "nu-explore"
-version = "0.94.3"
+version = "0.95.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
-nu-parser = { path = "../nu-parser", version = "0.94.3" }
-nu-color-config = { path = "../nu-color-config", version = "0.94.3" }
-nu-engine = { path = "../nu-engine", version = "0.94.3" }
-nu-table = { path = "../nu-table", version = "0.94.3" }
-nu-json = { path = "../nu-json", version = "0.94.3" }
-nu-utils = { path = "../nu-utils", version = "0.94.3" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
+nu-parser = { path = "../nu-parser", version = "0.95.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.95.0" }
+nu-engine = { path = "../nu-engine", version = "0.95.0" }
+nu-table = { path = "../nu-table", version = "0.95.0" }
+nu-json = { path = "../nu-json", version = "0.95.0" }
+nu-utils = { path = "../nu-utils", version = "0.95.0" }
 nu-ansi-term = { workspace = true }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.94.3" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.95.0" }
 
 anyhow = { workspace = true }
 log = { workspace = true }
@@ -32,4 +32,4 @@ ansi-str = { workspace = true }
 unicode-width = { workspace = true }
 lscolors = { workspace = true, default-features = false, features = [
   "nu-ansi-term",
-] }
+] }
\ No newline at end of file
diff --git a/crates/nu-glob/Cargo.toml b/crates/nu-glob/Cargo.toml
index 3e0dbfbd12..b1386d1f7b 100644
--- a/crates/nu-glob/Cargo.toml
+++ b/crates/nu-glob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-glob"
-version = "0.94.3"
+version = "0.95.0"
 authors = ["The Nushell Project Developers", "The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 description = """
@@ -14,4 +14,4 @@ categories = ["filesystem"]
 bench = false
 
 [dev-dependencies]
-doc-comment = "0.3"
+doc-comment = "0.3"
\ No newline at end of file
diff --git a/crates/nu-json/Cargo.toml b/crates/nu-json/Cargo.toml
index 9d348d00d4..27db574785 100644
--- a/crates/nu-json/Cargo.toml
+++ b/crates/nu-json/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-json"
 edition = "2021"
 license = "MIT"
 name = "nu-json"
-version = "0.94.3"
+version = "0.95.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -23,5 +23,5 @@ serde = { workspace =  true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-# nu-path = { path="../nu-path", version = "0.94.3" }
-# serde_json = "1.0"
+# nu-path = { path="../nu-path", version = "0.95.0" }
+# serde_json = "1.0"
\ No newline at end of file
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index c4e495f040..2384d46116 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -3,14 +3,14 @@ authors = ["The Nushell Project Developers"]
 description = "Nushell's integrated LSP server"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-lsp"
 name = "nu-lsp"
-version = "0.94.3"
+version = "0.95.0"
 edition = "2021"
 license = "MIT"
 
 [dependencies]
-nu-cli = { path = "../nu-cli", version = "0.94.3" }
-nu-parser = { path = "../nu-parser", version = "0.94.3" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
+nu-cli = { path = "../nu-cli", version = "0.95.0" }
+nu-parser = { path = "../nu-parser", version = "0.95.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
 
 reedline = { workspace = true }
 
@@ -23,8 +23,8 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.3" }
-nu-command = { path = "../nu-command", version = "0.94.3" }
-nu-test-support = { path = "../nu-test-support", version = "0.94.3" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.0" }
+nu-command = { path = "../nu-command", version = "0.95.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.95.0" }
 
-assert-json-diff = "2.0"
+assert-json-diff = "2.0"
\ No newline at end of file
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index 742009424a..5ca1a59d0c 100644
--- a/crates/nu-parser/Cargo.toml
+++ b/crates/nu-parser/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-parser"
 edition = "2021"
 license = "MIT"
 name = "nu-parser"
-version = "0.94.3"
+version = "0.95.0"
 exclude = ["/fuzz"]
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.94.3" }
-nu-path = { path = "../nu-path", version = "0.94.3" }
-nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.94.3" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
+nu-engine = { path = "../nu-engine", version = "0.95.0" }
+nu-path = { path = "../nu-path", version = "0.95.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.95.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
 
 bytesize = { workspace = true }
 chrono = { default-features = false, features = ['std'], workspace = true }
@@ -27,4 +27,4 @@ serde_json = { workspace = true }
 rstest = { workspace = true, default-features = false }
 
 [features]
-plugin = ["nu-plugin-engine"]
+plugin = ["nu-plugin-engine"]
\ No newline at end of file
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index e3c84acdb3..cf716b4571 100644
--- a/crates/nu-path/Cargo.toml
+++ b/crates/nu-path/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-path"
 edition = "2021"
 license = "MIT"
 name = "nu-path"
-version = "0.94.3"
+version = "0.95.0"
 exclude = ["/fuzz"]
 
 [lib]
@@ -18,4 +18,4 @@ dirs-next = { workspace = true }
 omnipath = { workspace = true }
 
 [target.'cfg(all(unix, not(target_os = "macos"), not(target_os = "android")))'.dependencies]
-pwd = { workspace = true }
+pwd = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-plugin-core/Cargo.toml b/crates/nu-plugin-core/Cargo.toml
index 965b09d085..3e56d0f8e1 100644
--- a/crates/nu-plugin-core/Cargo.toml
+++ b/crates/nu-plugin-core/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-core
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-core"
-version = "0.94.3"
+version = "0.95.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.3", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.95.0", default-features = false }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true }
@@ -25,4 +25,4 @@ default = ["local-socket"]
 local-socket = ["interprocess", "nu-plugin-protocol/local-socket"]
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows = { workspace = true }
+windows = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-plugin-engine/Cargo.toml b/crates/nu-plugin-engine/Cargo.toml
index 95c0298c09..5de92d1560 100644
--- a/crates/nu-plugin-engine/Cargo.toml
+++ b/crates/nu-plugin-engine/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-engi
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-engine"
-version = "0.94.3"
+version = "0.95.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.94.3" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
-nu-system = { path = "../nu-system", version = "0.94.3" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.3" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.94.3", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.95.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
+nu-system = { path = "../nu-system", version = "0.95.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.95.0" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.95.0", default-features = false }
 
 serde = { workspace = true }
 log = { workspace = true }
@@ -31,4 +31,4 @@ local-socket = ["nu-plugin-core/local-socket"]
 windows = { workspace = true, features = [
   # For setting process creation flags
   "Win32_System_Threading",
-] }
+] }
\ No newline at end of file
diff --git a/crates/nu-plugin-protocol/Cargo.toml b/crates/nu-plugin-protocol/Cargo.toml
index 41c8a7c535..23bd524734 100644
--- a/crates/nu-plugin-protocol/Cargo.toml
+++ b/crates/nu-plugin-protocol/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-prot
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-protocol"
-version = "0.94.3"
+version = "0.95.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.94.3", features = ["plugin"] }
-nu-utils = { path = "../nu-utils", version = "0.94.3" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.0", features = ["plugin"] }
+nu-utils = { path = "../nu-utils", version = "0.95.0" }
 
 bincode = "1.3"
 serde = { workspace = true, features = ["derive"] }
@@ -21,4 +21,4 @@ typetag = "0.2"
 
 [features]
 default = ["local-socket"]
-local-socket = []
+local-socket = []
\ No newline at end of file
diff --git a/crates/nu-plugin-test-support/Cargo.toml b/crates/nu-plugin-test-support/Cargo.toml
index bc390d3994..b7220da898 100644
--- a/crates/nu-plugin-test-support/Cargo.toml
+++ b/crates/nu-plugin-test-support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-plugin-test-support"
-version = "0.94.3"
+version = "0.95.0"
 edition = "2021"
 license = "MIT"
 description = "Testing support for Nushell plugins"
@@ -12,17 +12,17 @@ bench = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.94.3", features = ["plugin"] }
-nu-protocol = { path = "../nu-protocol", version = "0.94.3", features = ["plugin"] }
-nu-parser = { path = "../nu-parser", version = "0.94.3", features = ["plugin"] }
-nu-plugin = { path = "../nu-plugin", version = "0.94.3" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.94.3" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.94.3" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.3" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.3" }
+nu-engine = { path = "../nu-engine", version = "0.95.0", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.95.0", features = ["plugin"] }
+nu-parser = { path = "../nu-parser", version = "0.95.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.95.0" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.95.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.95.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.95.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.0" }
 nu-ansi-term = { workspace = true }
 similar = "2.5"
 
 [dev-dependencies]
 typetag = "0.2"
-serde = "1.0"
+serde = "1.0"
\ No newline at end of file
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index 68b3a7cadd..6f843cf264 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin"
 edition = "2021"
 license = "MIT"
 name = "nu-plugin"
-version = "0.94.3"
+version = "0.95.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.94.3" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.94.3" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.94.3", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.95.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.95.0" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.95.0", default-features = false }
 
 log = { workspace = true }
 thiserror = "1.0"
@@ -29,4 +29,4 @@ local-socket = ["nu-plugin-core/local-socket"]
 
 [target.'cfg(target_family = "unix")'.dependencies]
 # For setting the process group ID (EnterForeground / LeaveForeground)
-nix = { workspace = true, default-features = false, features = ["process"] }
+nix = { workspace = true, default-features = false, features = ["process"] }
\ No newline at end of file
diff --git a/crates/nu-pretty-hex/Cargo.toml b/crates/nu-pretty-hex/Cargo.toml
index ae5be298aa..2b6a683295 100644
--- a/crates/nu-pretty-hex/Cargo.toml
+++ b/crates/nu-pretty-hex/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-pretty-hex"
 edition = "2021"
 license = "MIT"
 name = "nu-pretty-hex"
-version = "0.94.3"
+version = "0.95.0"
 
 [lib]
 doctest = false
@@ -18,4 +18,4 @@ nu-ansi-term = { workspace = true }
 
 [dev-dependencies]
 heapless = { version = "0.8", default-features = false }
-rand = "0.8"
+rand = "0.8"
\ No newline at end of file
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 849a968eb8..73637cf292 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-protocol"
 edition = "2021"
 license = "MIT"
 name = "nu-protocol"
-version = "0.94.3"
+version = "0.95.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,10 +13,10 @@ version = "0.94.3"
 bench = false
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.94.3" }
-nu-path = { path = "../nu-path", version = "0.94.3" }
-nu-system = { path = "../nu-system", version = "0.94.3" }
-nu-derive-value = { path = "../nu-derive-value", version = "0.94.3" }
+nu-utils = { path = "../nu-utils", version = "0.95.0" }
+nu-path = { path = "../nu-path", version = "0.95.0" }
+nu-system = { path = "../nu-system", version = "0.95.0" }
+nu-derive-value = { path = "../nu-derive-value", version = "0.95.0" }
 
 brotli = { workspace = true, optional = true }
 byte-unit = { version = "5.1", features = [ "serde" ] }
@@ -47,11 +47,11 @@ plugin = [
 serde_json = { workspace = true }
 strum = "0.26"
 strum_macros = "0.26"
-nu-test-support = { path = "../nu-test-support", version = "0.94.3" }
+nu-test-support = { path = "../nu-test-support", version = "0.95.0" }
 pretty_assertions = { workspace = true }
 rstest = { workspace = true }
 tempfile = { workspace = true }
 os_pipe = { workspace = true }
 
 [package.metadata.docs.rs]
-all-features = true
+all-features = true
\ No newline at end of file
diff --git a/crates/nu-std/Cargo.toml b/crates/nu-std/Cargo.toml
index 660d418097..2617f4656d 100644
--- a/crates/nu-std/Cargo.toml
+++ b/crates/nu-std/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-std"
 edition = "2021"
 license = "MIT"
 name = "nu-std"
-version = "0.94.3"
+version = "0.95.0"
 
 [dependencies]
-nu-parser = { version = "0.94.3", path = "../nu-parser" }
-nu-protocol = { version = "0.94.3", path = "../nu-protocol" }
-nu-engine = { version = "0.94.3", path = "../nu-engine" }
+nu-parser = { version = "0.95.0", path = "../nu-parser" }
+nu-protocol = { version = "0.95.0", path = "../nu-protocol" }
+nu-engine = { version = "0.95.0", path = "../nu-engine" }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
 
-log = "0.4"
+log = "0.4"
\ No newline at end of file
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index 3e888dba49..b9b23af6c3 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["The Nushell Project Developers", "procs creators"]
 description = "Nushell system querying"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-system"
 name = "nu-system"
-version = "0.94.3"
+version = "0.95.0"
 edition = "2021"
 license = "MIT"
 
@@ -45,4 +45,4 @@ windows = { workspace = true, features = [
   "Win32_System_SystemInformation",
   "Win32_System_Threading",
   "Win32_UI_Shell",
-]}
+]}
\ No newline at end of file
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index af7cf19f36..dcc4c294d6 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -5,20 +5,20 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-table"
 edition = "2021"
 license = "MIT"
 name = "nu-table"
-version = "0.94.3"
+version = "0.95.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
-nu-utils = { path = "../nu-utils", version = "0.94.3" }
-nu-engine = { path = "../nu-engine", version = "0.94.3" }
-nu-color-config = { path = "../nu-color-config", version = "0.94.3" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
+nu-utils = { path = "../nu-utils", version = "0.95.0" }
+nu-engine = { path = "../nu-engine", version = "0.95.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.95.0" }
 nu-ansi-term = { workspace = true }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 tabled = { workspace = true, features = ["color"], default-features = false }
 
 [dev-dependencies]
-# nu-test-support = { path="../nu-test-support", version = "0.94.3"  }
+# nu-test-support = { path="../nu-test-support", version = "0.95.0"  }
\ No newline at end of file
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index 47f6724b53..a577e6cb24 100644
--- a/crates/nu-term-grid/Cargo.toml
+++ b/crates/nu-term-grid/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-term-grid"
 edition = "2021"
 license = "MIT"
 name = "nu-term-grid"
-version = "0.94.3"
+version = "0.95.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.94.3" }
+nu-utils = { path = "../nu-utils", version = "0.95.0" }
 
-unicode-width = { workspace = true }
+unicode-width = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml
index 86a1bf35e7..769ae44d00 100644
--- a/crates/nu-test-support/Cargo.toml
+++ b/crates/nu-test-support/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-test-suppor
 edition = "2021"
 license = "MIT"
 name = "nu-test-support"
-version = "0.94.3"
+version = "0.95.0"
 
 [lib]
 doctest = false
 bench = false
 
 [dependencies]
-nu-path = { path = "../nu-path", version = "0.94.3" }
-nu-glob = { path = "../nu-glob", version = "0.94.3" }
-nu-utils = { path = "../nu-utils", version = "0.94.3" }
+nu-path = { path = "../nu-path", version = "0.95.0" }
+nu-glob = { path = "../nu-glob", version = "0.95.0" }
+nu-utils = { path = "../nu-utils", version = "0.95.0" }
 
 num-format = { workspace = true }
 which = { workspace = true }
-tempfile = { workspace = true }
+tempfile = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index 0677f655d0..54821d0252 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-utils"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-utils"
-version = "0.94.3"
+version = "0.95.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
@@ -29,4 +29,4 @@ unicase = "2.7.0"
 crossterm_winapi = "0.9"
 
 [target.'cfg(unix)'.dependencies]
-nix = { workspace = true, default-features = false, features = ["user", "fs"] }
+nix = { workspace = true, default-features = false, features = ["user", "fs"] }
\ No newline at end of file
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index 099adcd065..0980b487e2 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -1,6 +1,6 @@
 # Nushell Config File
 #
-# version = "0.94.3"
+# version = "0.95.0"
 
 # For more information on defining custom themes, see
 # https://www.nushell.sh/book/coloring_and_theming.html
@@ -888,4 +888,4 @@ $env.config = {
             event: { edit: selectall }
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/crates/nu-utils/src/sample_config/default_env.nu b/crates/nu-utils/src/sample_config/default_env.nu
index effe76c98a..e5c17e40de 100644
--- a/crates/nu-utils/src/sample_config/default_env.nu
+++ b/crates/nu-utils/src/sample_config/default_env.nu
@@ -1,6 +1,6 @@
 # Nushell Environment Config File
 #
-# version = "0.94.3"
+# version = "0.95.0"
 
 def create_left_prompt [] {
     let dir = match (do --ignore-shell-errors { $env.PWD | path relative-to $nu.home-path }) {
@@ -98,4 +98,4 @@ $env.NU_PLUGIN_DIRS = [
 # $env.PATH = ($env.PATH | uniq)
 
 # To load from a custom file you can use:
-# source ($nu.default-config-dir | path join 'custom.nu')
+# source ($nu.default-config-dir | path join 'custom.nu')
\ No newline at end of file
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index 2791cdaa6f..0b8c899bb3 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -10,10 +10,10 @@ name = "nu_plugin_custom_values"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.94.3" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.3", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.95.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.0", features = ["plugin"] }
 serde = { workspace = true, default-features = false }
 typetag = "0.2"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.3" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.95.0" }
\ No newline at end of file
diff --git a/crates/nu_plugin_example/Cargo.toml b/crates/nu_plugin_example/Cargo.toml
index b2fd13abd9..9e5dc917f5 100644
--- a/crates/nu_plugin_example/Cargo.toml
+++ b/crates/nu_plugin_example/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_exam
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_example"
-version = "0.94.3"
+version = "0.95.0"
 
 [[bin]]
 name = "nu_plugin_example"
@@ -15,9 +15,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.94.3" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.3", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.95.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.0", features = ["plugin"] }
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.3" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.3" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.95.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.0" }
\ No newline at end of file
diff --git a/crates/nu_plugin_formats/Cargo.toml b/crates/nu_plugin_formats/Cargo.toml
index a649a5bc5a..a2c198bcb0 100644
--- a/crates/nu_plugin_formats/Cargo.toml
+++ b/crates/nu_plugin_formats/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_form
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_formats"
-version = "0.94.3"
+version = "0.95.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.94.3" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.3", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.95.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.0", features = ["plugin"] }
 
 indexmap = { workspace = true }
 eml-parser = "0.1"
@@ -18,4 +18,4 @@ ical = "0.11"
 rust-ini = "0.21.0"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.3" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.95.0" }
\ No newline at end of file
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index c356f3d7d3..15b601007a 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gsta
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_gstat"
-version = "0.94.3"
+version = "0.95.0"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_gstat"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.94.3" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
+nu-plugin = { path = "../nu-plugin", version = "0.95.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
 
-git2 = "0.19"
+git2 = "0.19"
\ No newline at end of file
diff --git a/crates/nu_plugin_inc/Cargo.toml b/crates/nu_plugin_inc/Cargo.toml
index 3701ad49bd..9f2b0e1122 100644
--- a/crates/nu_plugin_inc/Cargo.toml
+++ b/crates/nu_plugin_inc/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_inc"
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_inc"
-version = "0.94.3"
+version = "0.95.0"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_inc"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.94.3" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.3", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.95.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.0", features = ["plugin"] }
 
-semver = "1.0"
+semver = "1.0"
\ No newline at end of file
diff --git a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
index 4bfc066815..1fcf6d8eb4 100755
--- a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
+++ b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
@@ -6,7 +6,7 @@
 # it also allows us to test the plugin interface with something manually implemented in a scripting
 # language without adding any extra dependencies to our tests.
 
-const NUSHELL_VERSION = "0.94.3"
+const NUSHELL_VERSION = "0.95.0"
 const PLUGIN_VERSION = "0.1.0" # bump if you change commands!
 
 def main [--stdio] {
@@ -265,4 +265,4 @@ def start_plugin [] {
     }) |
     each { from json | handle_input } |
     ignore
-}
+}
\ No newline at end of file
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 98288f3ebf..e5e92822e0 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu_plugin_polars"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_polars"
-version = "0.94.3"
+version = "0.95.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -17,9 +17,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
-nu-plugin = { path = "../nu-plugin", version = "0.94.3" }
-nu-path = { path = "../nu-path", version = "0.94.3" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
+nu-plugin = { path = "../nu-plugin", version = "0.95.0" }
+nu-path = { path = "../nu-path", version = "0.95.0" }
 
 # Potential dependencies for extras
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
@@ -73,9 +73,9 @@ optional = false
 version = "0.40"
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.94.3" }
-nu-engine = { path = "../nu-engine", version = "0.94.3" }
-nu-parser = { path = "../nu-parser", version = "0.94.3" }
-nu-command = { path = "../nu-command", version = "0.94.3" }
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.94.3" }
-tempfile.workspace = true
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.0" }
+nu-engine = { path = "../nu-engine", version = "0.95.0" }
+nu-parser = { path = "../nu-parser", version = "0.95.0" }
+nu-command = { path = "../nu-command", version = "0.95.0" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.95.0" }
+tempfile.workspace = true
\ No newline at end of file
diff --git a/crates/nu_plugin_python/nu_plugin_python_example.py b/crates/nu_plugin_python/nu_plugin_python_example.py
index 80715abf11..14cd28a713 100755
--- a/crates/nu_plugin_python/nu_plugin_python_example.py
+++ b/crates/nu_plugin_python/nu_plugin_python_example.py
@@ -27,7 +27,7 @@ import sys
 import json
 
 
-NUSHELL_VERSION = "0.94.3"
+NUSHELL_VERSION = "0.95.0"
 PLUGIN_VERSION = "0.1.0" # bump if you change commands!
 
 
@@ -258,4 +258,4 @@ if __name__ == "__main__":
     if len(sys.argv) == 2 and sys.argv[1] == "--stdio":
         plugin()
     else:
-        print("Run me from inside nushell!")
+        print("Run me from inside nushell!")
\ No newline at end of file
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index 20a2a2729d..d044aeac42 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_quer
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_query"
-version = "0.94.3"
+version = "0.95.0"
 
 [lib]
 doctest = false
@@ -16,10 +16,10 @@ name = "nu_plugin_query"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.94.3" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
+nu-plugin = { path = "../nu-plugin", version = "0.95.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
 
 gjson = "0.8"
 scraper = { default-features = false, version = "0.19" }
 sxd-document = "0.3"
-sxd-xpath = "0.4"
+sxd-xpath = "0.4"
\ No newline at end of file
diff --git a/crates/nu_plugin_stress_internals/Cargo.toml b/crates/nu_plugin_stress_internals/Cargo.toml
index 7103d99cda..e4e7f88403 100644
--- a/crates/nu_plugin_stress_internals/Cargo.toml
+++ b/crates/nu_plugin_stress_internals/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_stre
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_stress_internals"
-version = "0.94.3"
+version = "0.95.0"
 
 [[bin]]
 name = "nu_plugin_stress_internals"
@@ -16,4 +16,4 @@ bench = false
 # assumptions about the serialized format
 serde = { workspace = true }
 serde_json = { workspace = true }
-interprocess = { workspace = true }
+interprocess = { workspace = true }
\ No newline at end of file
diff --git a/crates/nuon/Cargo.toml b/crates/nuon/Cargo.toml
index 31c0cdd363..f977598450 100644
--- a/crates/nuon/Cargo.toml
+++ b/crates/nuon/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nuon"
 edition = "2021"
 license = "MIT"
 name = "nuon"
-version = "0.94.3"
+version = "0.95.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-parser = { path = "../nu-parser", version = "0.94.3" }
-nu-protocol = { path = "../nu-protocol", version = "0.94.3" }
-nu-engine = { path = "../nu-engine", version = "0.94.3" }
+nu-parser = { path = "../nu-parser", version = "0.95.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
+nu-engine = { path = "../nu-engine", version = "0.95.0" }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 
 [dev-dependencies]
-chrono = { workspace = true }
+chrono = { workspace = true }
\ No newline at end of file

From 0dd35cddcd7d8e45f810ebf2de7ac1eb1c8d0042 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Tue, 25 Jun 2024 18:26:07 -0700
Subject: [PATCH 0138/1072] Bumping version to 0.95.1 (#13231)

Marks development for hotfix
---
 Cargo.toml                                    | 40 +++++++++----------
 crates/nu-cli/Cargo.toml                      | 24 +++++------
 crates/nu-cmd-base/Cargo.toml                 | 10 ++---
 crates/nu-cmd-extra/Cargo.toml                | 22 +++++-----
 crates/nu-cmd-lang/Cargo.toml                 | 10 ++---
 crates/nu-cmd-plugin/Cargo.toml               | 10 ++---
 crates/nu-color-config/Cargo.toml             | 10 ++---
 crates/nu-command/Cargo.toml                  | 34 ++++++++--------
 crates/nu-derive-value/Cargo.toml             |  2 +-
 crates/nu-engine/Cargo.toml                   | 10 ++---
 crates/nu-explore/Cargo.toml                  | 18 ++++-----
 crates/nu-glob/Cargo.toml                     |  2 +-
 crates/nu-json/Cargo.toml                     |  4 +-
 crates/nu-lsp/Cargo.toml                      | 14 +++----
 crates/nu-parser/Cargo.toml                   | 10 ++---
 crates/nu-path/Cargo.toml                     |  2 +-
 crates/nu-plugin-core/Cargo.toml              |  6 +--
 crates/nu-plugin-engine/Cargo.toml            | 12 +++---
 crates/nu-plugin-protocol/Cargo.toml          |  6 +--
 crates/nu-plugin-test-support/Cargo.toml      | 18 ++++-----
 crates/nu-plugin/Cargo.toml                   | 10 ++---
 crates/nu-pretty-hex/Cargo.toml               |  2 +-
 crates/nu-protocol/Cargo.toml                 | 12 +++---
 crates/nu-std/Cargo.toml                      |  8 ++--
 crates/nu-system/Cargo.toml                   |  2 +-
 crates/nu-table/Cargo.toml                    | 12 +++---
 crates/nu-term-grid/Cargo.toml                |  4 +-
 crates/nu-test-support/Cargo.toml             |  8 ++--
 crates/nu-utils/Cargo.toml                    |  2 +-
 .../src/sample_config/default_config.nu       |  2 +-
 .../nu-utils/src/sample_config/default_env.nu |  2 +-
 crates/nu_plugin_custom_values/Cargo.toml     |  6 +--
 crates/nu_plugin_example/Cargo.toml           | 10 ++---
 crates/nu_plugin_formats/Cargo.toml           |  8 ++--
 crates/nu_plugin_gstat/Cargo.toml             |  6 +--
 crates/nu_plugin_inc/Cargo.toml               |  6 +--
 .../nu_plugin_nu_example.nu                   |  2 +-
 crates/nu_plugin_polars/Cargo.toml            | 18 ++++-----
 .../nu_plugin_python_example.py               |  2 +-
 crates/nu_plugin_query/Cargo.toml             |  6 +--
 crates/nu_plugin_stress_internals/Cargo.toml  |  2 +-
 crates/nuon/Cargo.toml                        |  8 ++--
 42 files changed, 201 insertions(+), 201 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 696c012b80..3e02e7e066 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
 rust-version = "1.77.2"
-version = "0.95.0"
+version = "0.95.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -180,22 +180,22 @@ windows = "0.54"
 winreg = "0.52"
 
 [dependencies]
-nu-cli = { path = "./crates/nu-cli", version = "0.95.0" }
-nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.95.0" }
-nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.95.0" }
-nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.95.0", optional = true }
-nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.95.0" }
-nu-command = { path = "./crates/nu-command", version = "0.95.0" }
-nu-engine = { path = "./crates/nu-engine", version = "0.95.0" }
-nu-explore = { path = "./crates/nu-explore", version = "0.95.0" }
-nu-lsp = { path = "./crates/nu-lsp/", version = "0.95.0" }
-nu-parser = { path = "./crates/nu-parser", version = "0.95.0" }
-nu-path = { path = "./crates/nu-path", version = "0.95.0" }
-nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.95.0" }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.95.0" }
-nu-std = { path = "./crates/nu-std", version = "0.95.0" }
-nu-system = { path = "./crates/nu-system", version = "0.95.0" }
-nu-utils = { path = "./crates/nu-utils", version = "0.95.0" }
+nu-cli = { path = "./crates/nu-cli", version = "0.95.1" }
+nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.95.1" }
+nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.95.1" }
+nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.95.1", optional = true }
+nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.95.1" }
+nu-command = { path = "./crates/nu-command", version = "0.95.1" }
+nu-engine = { path = "./crates/nu-engine", version = "0.95.1" }
+nu-explore = { path = "./crates/nu-explore", version = "0.95.1" }
+nu-lsp = { path = "./crates/nu-lsp/", version = "0.95.1" }
+nu-parser = { path = "./crates/nu-parser", version = "0.95.1" }
+nu-path = { path = "./crates/nu-path", version = "0.95.1" }
+nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.95.1" }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.95.1" }
+nu-std = { path = "./crates/nu-std", version = "0.95.1" }
+nu-system = { path = "./crates/nu-system", version = "0.95.1" }
+nu-utils = { path = "./crates/nu-utils", version = "0.95.1" }
 
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
@@ -225,9 +225,9 @@ nix = { workspace = true, default-features = false, features = [
 ] }
 
 [dev-dependencies]
-nu-test-support = { path = "./crates/nu-test-support", version = "0.95.0" }
-nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.95.0" }
-nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.95.0" }
+nu-test-support = { path = "./crates/nu-test-support", version = "0.95.1" }
+nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.95.1" }
+nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.95.1" }
 assert_cmd = "2.0"
 dirs-next = { workspace = true }
 tango-bench = "0.5"
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 8e7c7b5535..2ed504d502 100644
--- 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.95.1"
 
 [lib]
 bench = false
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.0" }
-nu-command = { path = "../nu-command", version = "0.95.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.95.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.1" }
+nu-command = { path = "../nu-command", version = "0.95.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.95.1" }
 rstest = { workspace = true, default-features = false }
 tempfile = { workspace = true }
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.95.0" }
-nu-engine = { path = "../nu-engine", version = "0.95.0" }
-nu-path = { path = "../nu-path", version = "0.95.0" }
-nu-parser = { path = "../nu-parser", version = "0.95.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.95.0", optional = true }
-nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
-nu-utils = { path = "../nu-utils", version = "0.95.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.95.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.95.1" }
+nu-engine = { path = "../nu-engine", version = "0.95.1" }
+nu-path = { path = "../nu-path", version = "0.95.1" }
+nu-parser = { path = "../nu-parser", version = "0.95.1" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.95.1", optional = true }
+nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
+nu-utils = { path = "../nu-utils", version = "0.95.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.95.1" }
 nu-ansi-term = { workspace = true }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
diff --git a/crates/nu-cmd-base/Cargo.toml b/crates/nu-cmd-base/Cargo.toml
index 773ee05414..2fe8610f49 100644
--- 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.95.1"
 
 # 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-parser = { path = "../nu-parser", version = "0.95.0" }
-nu-path = { path = "../nu-path", version = "0.95.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
+nu-engine = { path = "../nu-engine", version = "0.95.1" }
+nu-parser = { path = "../nu-parser", version = "0.95.1" }
+nu-path = { path = "../nu-path", version = "0.95.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
 
 indexmap = { workspace = true }
 miette = { workspace = true }
diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml
index 30c94420a3..8609adb44c 100644
--- 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.95.1"
 
 # 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-engine = { path = "../nu-engine", version = "0.95.0" }
-nu-json = { version = "0.95.0", path = "../nu-json" }
-nu-parser = { path = "../nu-parser", version = "0.95.0" }
-nu-pretty-hex = { version = "0.95.0", path = "../nu-pretty-hex" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
-nu-utils = { path = "../nu-utils", version = "0.95.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.95.1" }
+nu-engine = { path = "../nu-engine", version = "0.95.1" }
+nu-json = { version = "0.95.1", path = "../nu-json" }
+nu-parser = { path = "../nu-parser", version = "0.95.1" }
+nu-pretty-hex = { version = "0.95.1", path = "../nu-pretty-hex" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
+nu-utils = { path = "../nu-utils", version = "0.95.1" }
 
 # 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-command = { path = "../nu-command", version = "0.95.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.95.0" }
\ No newline at end of file
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.1" }
+nu-command = { path = "../nu-command", version = "0.95.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.95.1" }
\ No newline at end of file
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index 6db0d4c096..262248e6d9 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -6,16 +6,16 @@ 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.95.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.95.0" }
-nu-parser = { path = "../nu-parser", version = "0.95.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
-nu-utils = { path = "../nu-utils", version = "0.95.0" }
+nu-engine = { path = "../nu-engine", version = "0.95.1" }
+nu-parser = { path = "../nu-parser", version = "0.95.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
+nu-utils = { path = "../nu-utils", version = "0.95.1" }
 
 itertools = { workspace = true }
 shadow-rs = { version = "0.28", default-features = false }
diff --git a/crates/nu-cmd-plugin/Cargo.toml b/crates/nu-cmd-plugin/Cargo.toml
index f6eccb753e..7d26fe5ddd 100644
--- a/crates/nu-cmd-plugin/Cargo.toml
+++ b/crates/nu-cmd-plugin/Cargo.toml
@@ -5,15 +5,15 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-plugin"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-plugin"
-version = "0.95.0"
+version = "0.95.1"
 
 # 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-path = { path = "../nu-path", version = "0.95.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.0", features = ["plugin"] }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.95.0" }
+nu-engine = { path = "../nu-engine", version = "0.95.1" }
+nu-path = { path = "../nu-path", version = "0.95.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.1", features = ["plugin"] }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.95.1" }
 
 itertools = { workspace = true }
 
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index 34f15cd74f..23af09432c 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -5,18 +5,18 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-color-confi
 edition = "2021"
 license = "MIT"
 name = "nu-color-config"
-version = "0.95.0"
+version = "0.95.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
-nu-engine = { path = "../nu-engine", version = "0.95.0" }
-nu-json = { path = "../nu-json", version = "0.95.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
+nu-engine = { path = "../nu-engine", version = "0.95.1" }
+nu-json = { path = "../nu-json", version = "0.95.1" }
 nu-ansi-term = { workspace = true }
 
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.95.0" }
\ No newline at end of file
+nu-test-support = { path = "../nu-test-support", version = "0.95.1" }
\ No newline at end of file
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 355232b938..474742ae0a 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-command"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
-version = "0.95.0"
+version = "0.95.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,21 +13,21 @@ version = "0.95.0"
 bench = false
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.95.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.95.0" }
-nu-engine = { path = "../nu-engine", version = "0.95.0" }
-nu-glob = { path = "../nu-glob", version = "0.95.0" }
-nu-json = { path = "../nu-json", version = "0.95.0" }
-nu-parser = { path = "../nu-parser", version = "0.95.0" }
-nu-path = { path = "../nu-path", version = "0.95.0" }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.95.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
-nu-system = { path = "../nu-system", version = "0.95.0" }
-nu-table = { path = "../nu-table", version = "0.95.0" }
-nu-term-grid = { path = "../nu-term-grid", version = "0.95.0" }
-nu-utils = { path = "../nu-utils", version = "0.95.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.95.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.95.1" }
+nu-engine = { path = "../nu-engine", version = "0.95.1" }
+nu-glob = { path = "../nu-glob", version = "0.95.1" }
+nu-json = { path = "../nu-json", version = "0.95.1" }
+nu-parser = { path = "../nu-parser", version = "0.95.1" }
+nu-path = { path = "../nu-path", version = "0.95.1" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.95.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
+nu-system = { path = "../nu-system", version = "0.95.1" }
+nu-table = { path = "../nu-table", version = "0.95.1" }
+nu-term-grid = { path = "../nu-term-grid", version = "0.95.1" }
+nu-utils = { path = "../nu-utils", version = "0.95.1" }
 nu-ansi-term = { workspace = true }
-nuon = { path = "../nuon", version = "0.95.0" }
+nuon = { path = "../nuon", version = "0.95.1" }
 
 alphanumeric-sort = { workspace = true }
 base64 = { workspace = true }
@@ -136,8 +136,8 @@ sqlite = ["rusqlite"]
 trash-support = ["trash"]
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.95.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.95.1" }
 
 dirs-next = { workspace = true }
 mockito = { workspace = true, default-features = false }
diff --git a/crates/nu-derive-value/Cargo.toml b/crates/nu-derive-value/Cargo.toml
index 37698ccaeb..50ca5d2407 100644
--- a/crates/nu-derive-value/Cargo.toml
+++ b/crates/nu-derive-value/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-derive-value"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-derive-value"
-version = "0.95.0"
+version = "0.95.1"
 
 [lib]
 proc-macro = true
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index 7c815d4c72..3e6c3f787b 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-engine"
 edition = "2021"
 license = "MIT"
 name = "nu-engine"
-version = "0.95.0"
+version = "0.95.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.95.0" }
-nu-path = { path = "../nu-path", version = "0.95.0" }
-nu-glob = { path = "../nu-glob", version = "0.95.0" }
-nu-utils = { path = "../nu-utils", version = "0.95.0" }
+nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.95.1" }
+nu-path = { path = "../nu-path", version = "0.95.1" }
+nu-glob = { path = "../nu-glob", version = "0.95.1" }
+nu-utils = { path = "../nu-utils", version = "0.95.1" }
 
 [features]
 plugin = []
\ No newline at end of file
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index ac0fe732da..6d0816ee3e 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -5,21 +5,21 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-explore"
 edition = "2021"
 license = "MIT"
 name = "nu-explore"
-version = "0.95.0"
+version = "0.95.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
-nu-parser = { path = "../nu-parser", version = "0.95.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.95.0" }
-nu-engine = { path = "../nu-engine", version = "0.95.0" }
-nu-table = { path = "../nu-table", version = "0.95.0" }
-nu-json = { path = "../nu-json", version = "0.95.0" }
-nu-utils = { path = "../nu-utils", version = "0.95.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
+nu-parser = { path = "../nu-parser", version = "0.95.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.95.1" }
+nu-engine = { path = "../nu-engine", version = "0.95.1" }
+nu-table = { path = "../nu-table", version = "0.95.1" }
+nu-json = { path = "../nu-json", version = "0.95.1" }
+nu-utils = { path = "../nu-utils", version = "0.95.1" }
 nu-ansi-term = { workspace = true }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.95.0" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.95.1" }
 
 anyhow = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-glob/Cargo.toml b/crates/nu-glob/Cargo.toml
index b1386d1f7b..932958910c 100644
--- a/crates/nu-glob/Cargo.toml
+++ b/crates/nu-glob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-glob"
-version = "0.95.0"
+version = "0.95.1"
 authors = ["The Nushell Project Developers", "The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 description = """
diff --git a/crates/nu-json/Cargo.toml b/crates/nu-json/Cargo.toml
index 27db574785..04c39bdac5 100644
--- a/crates/nu-json/Cargo.toml
+++ b/crates/nu-json/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-json"
 edition = "2021"
 license = "MIT"
 name = "nu-json"
-version = "0.95.0"
+version = "0.95.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -23,5 +23,5 @@ serde = { workspace =  true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-# nu-path = { path="../nu-path", version = "0.95.0" }
+# nu-path = { path="../nu-path", version = "0.95.1" }
 # serde_json = "1.0"
\ No newline at end of file
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index 2384d46116..0f9ef01e69 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -3,14 +3,14 @@ authors = ["The Nushell Project Developers"]
 description = "Nushell's integrated LSP server"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-lsp"
 name = "nu-lsp"
-version = "0.95.0"
+version = "0.95.1"
 edition = "2021"
 license = "MIT"
 
 [dependencies]
-nu-cli = { path = "../nu-cli", version = "0.95.0" }
-nu-parser = { path = "../nu-parser", version = "0.95.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
+nu-cli = { path = "../nu-cli", version = "0.95.1" }
+nu-parser = { path = "../nu-parser", version = "0.95.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
 
 reedline = { workspace = true }
 
@@ -23,8 +23,8 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.0" }
-nu-command = { path = "../nu-command", version = "0.95.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.95.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.1" }
+nu-command = { path = "../nu-command", version = "0.95.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.95.1" }
 
 assert-json-diff = "2.0"
\ No newline at end of file
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index 5ca1a59d0c..b06e81387d 100644
--- a/crates/nu-parser/Cargo.toml
+++ b/crates/nu-parser/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-parser"
 edition = "2021"
 license = "MIT"
 name = "nu-parser"
-version = "0.95.0"
+version = "0.95.1"
 exclude = ["/fuzz"]
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.95.0" }
-nu-path = { path = "../nu-path", version = "0.95.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.95.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
+nu-engine = { path = "../nu-engine", version = "0.95.1" }
+nu-path = { path = "../nu-path", version = "0.95.1" }
+nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.95.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
 
 bytesize = { workspace = true }
 chrono = { default-features = false, features = ['std'], workspace = true }
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index cf716b4571..dc2f870a9d 100644
--- a/crates/nu-path/Cargo.toml
+++ b/crates/nu-path/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-path"
 edition = "2021"
 license = "MIT"
 name = "nu-path"
-version = "0.95.0"
+version = "0.95.1"
 exclude = ["/fuzz"]
 
 [lib]
diff --git a/crates/nu-plugin-core/Cargo.toml b/crates/nu-plugin-core/Cargo.toml
index 3e56d0f8e1..48aee13276 100644
--- a/crates/nu-plugin-core/Cargo.toml
+++ b/crates/nu-plugin-core/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-core
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-core"
-version = "0.95.0"
+version = "0.95.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.95.0", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.95.1", default-features = false }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true }
diff --git a/crates/nu-plugin-engine/Cargo.toml b/crates/nu-plugin-engine/Cargo.toml
index 5de92d1560..f86c1ae703 100644
--- a/crates/nu-plugin-engine/Cargo.toml
+++ b/crates/nu-plugin-engine/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-engi
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-engine"
-version = "0.95.0"
+version = "0.95.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.95.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
-nu-system = { path = "../nu-system", version = "0.95.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.95.0" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.95.0", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.95.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
+nu-system = { path = "../nu-system", version = "0.95.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.95.1" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.95.1", default-features = false }
 
 serde = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-plugin-protocol/Cargo.toml b/crates/nu-plugin-protocol/Cargo.toml
index 23bd524734..939f164786 100644
--- a/crates/nu-plugin-protocol/Cargo.toml
+++ b/crates/nu-plugin-protocol/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-prot
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-protocol"
-version = "0.95.0"
+version = "0.95.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.95.0", features = ["plugin"] }
-nu-utils = { path = "../nu-utils", version = "0.95.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.1", features = ["plugin"] }
+nu-utils = { path = "../nu-utils", version = "0.95.1" }
 
 bincode = "1.3"
 serde = { workspace = true, features = ["derive"] }
diff --git a/crates/nu-plugin-test-support/Cargo.toml b/crates/nu-plugin-test-support/Cargo.toml
index b7220da898..efc76c3b93 100644
--- a/crates/nu-plugin-test-support/Cargo.toml
+++ b/crates/nu-plugin-test-support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-plugin-test-support"
-version = "0.95.0"
+version = "0.95.1"
 edition = "2021"
 license = "MIT"
 description = "Testing support for Nushell plugins"
@@ -12,14 +12,14 @@ bench = false
 # 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", features = ["plugin"] }
-nu-protocol = { path = "../nu-protocol", version = "0.95.0", features = ["plugin"] }
-nu-parser = { path = "../nu-parser", version = "0.95.0", features = ["plugin"] }
-nu-plugin = { path = "../nu-plugin", version = "0.95.0" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.95.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.95.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.95.0" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.0" }
+nu-engine = { path = "../nu-engine", version = "0.95.1", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.95.1", features = ["plugin"] }
+nu-parser = { path = "../nu-parser", version = "0.95.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.95.1" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.95.1" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.95.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.95.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.1" }
 nu-ansi-term = { workspace = true }
 similar = "2.5"
 
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index 6f843cf264..a3b4455d15 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin"
 edition = "2021"
 license = "MIT"
 name = "nu-plugin"
-version = "0.95.0"
+version = "0.95.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.95.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.95.0" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.95.0", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.95.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.95.1" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.95.1", default-features = false }
 
 log = { workspace = true }
 thiserror = "1.0"
diff --git a/crates/nu-pretty-hex/Cargo.toml b/crates/nu-pretty-hex/Cargo.toml
index 2b6a683295..cd3c3502a4 100644
--- a/crates/nu-pretty-hex/Cargo.toml
+++ b/crates/nu-pretty-hex/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-pretty-hex"
 edition = "2021"
 license = "MIT"
 name = "nu-pretty-hex"
-version = "0.95.0"
+version = "0.95.1"
 
 [lib]
 doctest = false
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 73637cf292..ee0f5a8221 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-protocol"
 edition = "2021"
 license = "MIT"
 name = "nu-protocol"
-version = "0.95.0"
+version = "0.95.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,10 +13,10 @@ version = "0.95.0"
 bench = false
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.95.0" }
-nu-path = { path = "../nu-path", version = "0.95.0" }
-nu-system = { path = "../nu-system", version = "0.95.0" }
-nu-derive-value = { path = "../nu-derive-value", version = "0.95.0" }
+nu-utils = { path = "../nu-utils", version = "0.95.1" }
+nu-path = { path = "../nu-path", version = "0.95.1" }
+nu-system = { path = "../nu-system", version = "0.95.1" }
+nu-derive-value = { path = "../nu-derive-value", version = "0.95.1" }
 
 brotli = { workspace = true, optional = true }
 byte-unit = { version = "5.1", features = [ "serde" ] }
@@ -47,7 +47,7 @@ plugin = [
 serde_json = { workspace = true }
 strum = "0.26"
 strum_macros = "0.26"
-nu-test-support = { path = "../nu-test-support", version = "0.95.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.95.1" }
 pretty_assertions = { workspace = true }
 rstest = { workspace = true }
 tempfile = { workspace = true }
diff --git a/crates/nu-std/Cargo.toml b/crates/nu-std/Cargo.toml
index 2617f4656d..9ee4113e96 100644
--- a/crates/nu-std/Cargo.toml
+++ b/crates/nu-std/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-std"
 edition = "2021"
 license = "MIT"
 name = "nu-std"
-version = "0.95.0"
+version = "0.95.1"
 
 [dependencies]
-nu-parser = { version = "0.95.0", path = "../nu-parser" }
-nu-protocol = { version = "0.95.0", path = "../nu-protocol" }
-nu-engine = { version = "0.95.0", path = "../nu-engine" }
+nu-parser = { version = "0.95.1", path = "../nu-parser" }
+nu-protocol = { version = "0.95.1", path = "../nu-protocol" }
+nu-engine = { version = "0.95.1", path = "../nu-engine" }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
 
 log = "0.4"
\ No newline at end of file
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index b9b23af6c3..19ab1259fb 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["The Nushell Project Developers", "procs creators"]
 description = "Nushell system querying"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-system"
 name = "nu-system"
-version = "0.95.0"
+version = "0.95.1"
 edition = "2021"
 license = "MIT"
 
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index dcc4c294d6..9f00c4d1fd 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -5,20 +5,20 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-table"
 edition = "2021"
 license = "MIT"
 name = "nu-table"
-version = "0.95.0"
+version = "0.95.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
-nu-utils = { path = "../nu-utils", version = "0.95.0" }
-nu-engine = { path = "../nu-engine", version = "0.95.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.95.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
+nu-utils = { path = "../nu-utils", version = "0.95.1" }
+nu-engine = { path = "../nu-engine", version = "0.95.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.95.1" }
 nu-ansi-term = { workspace = true }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 tabled = { workspace = true, features = ["color"], default-features = false }
 
 [dev-dependencies]
-# nu-test-support = { path="../nu-test-support", version = "0.95.0"  }
\ No newline at end of file
+# nu-test-support = { path="../nu-test-support", version = "0.95.1"  }
\ No newline at end of file
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index a577e6cb24..0229f1f0f0 100644
--- a/crates/nu-term-grid/Cargo.toml
+++ b/crates/nu-term-grid/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-term-grid"
 edition = "2021"
 license = "MIT"
 name = "nu-term-grid"
-version = "0.95.0"
+version = "0.95.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.95.0" }
+nu-utils = { path = "../nu-utils", version = "0.95.1" }
 
 unicode-width = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml
index 769ae44d00..1b5f5df7ba 100644
--- a/crates/nu-test-support/Cargo.toml
+++ b/crates/nu-test-support/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-test-suppor
 edition = "2021"
 license = "MIT"
 name = "nu-test-support"
-version = "0.95.0"
+version = "0.95.1"
 
 [lib]
 doctest = false
 bench = false
 
 [dependencies]
-nu-path = { path = "../nu-path", version = "0.95.0" }
-nu-glob = { path = "../nu-glob", version = "0.95.0" }
-nu-utils = { path = "../nu-utils", version = "0.95.0" }
+nu-path = { path = "../nu-path", version = "0.95.1" }
+nu-glob = { path = "../nu-glob", version = "0.95.1" }
+nu-utils = { path = "../nu-utils", version = "0.95.1" }
 
 num-format = { workspace = true }
 which = { workspace = true }
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index 54821d0252..60b4cb21aa 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-utils"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-utils"
-version = "0.95.0"
+version = "0.95.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index 0980b487e2..5856e385c4 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -1,6 +1,6 @@
 # Nushell Config File
 #
-# version = "0.95.0"
+# version = "0.95.1"
 
 # For more information on defining custom themes, see
 # https://www.nushell.sh/book/coloring_and_theming.html
diff --git a/crates/nu-utils/src/sample_config/default_env.nu b/crates/nu-utils/src/sample_config/default_env.nu
index e5c17e40de..a686f6f99a 100644
--- a/crates/nu-utils/src/sample_config/default_env.nu
+++ b/crates/nu-utils/src/sample_config/default_env.nu
@@ -1,6 +1,6 @@
 # Nushell Environment Config File
 #
-# version = "0.95.0"
+# version = "0.95.1"
 
 def create_left_prompt [] {
     let dir = match (do --ignore-shell-errors { $env.PWD | path relative-to $nu.home-path }) {
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index 0b8c899bb3..e5f8951429 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -10,10 +10,10 @@ name = "nu_plugin_custom_values"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.95.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.95.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.1", features = ["plugin"] }
 serde = { workspace = true, default-features = false }
 typetag = "0.2"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.95.0" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.95.1" }
\ No newline at end of file
diff --git a/crates/nu_plugin_example/Cargo.toml b/crates/nu_plugin_example/Cargo.toml
index 9e5dc917f5..08ba3e1566 100644
--- a/crates/nu_plugin_example/Cargo.toml
+++ b/crates/nu_plugin_example/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_exam
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_example"
-version = "0.95.0"
+version = "0.95.1"
 
 [[bin]]
 name = "nu_plugin_example"
@@ -15,9 +15,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.95.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.95.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.1", features = ["plugin"] }
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.95.0" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.0" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.95.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.1" }
\ No newline at end of file
diff --git a/crates/nu_plugin_formats/Cargo.toml b/crates/nu_plugin_formats/Cargo.toml
index a2c198bcb0..29e8953f24 100644
--- a/crates/nu_plugin_formats/Cargo.toml
+++ b/crates/nu_plugin_formats/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_form
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_formats"
-version = "0.95.0"
+version = "0.95.1"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.95.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.95.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.1", features = ["plugin"] }
 
 indexmap = { workspace = true }
 eml-parser = "0.1"
@@ -18,4 +18,4 @@ ical = "0.11"
 rust-ini = "0.21.0"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.95.0" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.95.1" }
\ No newline at end of file
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index 15b601007a..da1c13a88e 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gsta
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_gstat"
-version = "0.95.0"
+version = "0.95.1"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_gstat"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.95.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
+nu-plugin = { path = "../nu-plugin", version = "0.95.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
 
 git2 = "0.19"
\ No newline at end of file
diff --git a/crates/nu_plugin_inc/Cargo.toml b/crates/nu_plugin_inc/Cargo.toml
index 9f2b0e1122..0479a47843 100644
--- a/crates/nu_plugin_inc/Cargo.toml
+++ b/crates/nu_plugin_inc/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_inc"
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_inc"
-version = "0.95.0"
+version = "0.95.1"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_inc"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.95.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.95.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.1", features = ["plugin"] }
 
 semver = "1.0"
\ No newline at end of file
diff --git a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
index 1fcf6d8eb4..d19cd36c14 100755
--- a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
+++ b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
@@ -6,7 +6,7 @@
 # it also allows us to test the plugin interface with something manually implemented in a scripting
 # language without adding any extra dependencies to our tests.
 
-const NUSHELL_VERSION = "0.95.0"
+const NUSHELL_VERSION = "0.95.1"
 const PLUGIN_VERSION = "0.1.0" # bump if you change commands!
 
 def main [--stdio] {
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index e5e92822e0..77bb84e988 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu_plugin_polars"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_polars"
-version = "0.95.0"
+version = "0.95.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -17,9 +17,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
-nu-plugin = { path = "../nu-plugin", version = "0.95.0" }
-nu-path = { path = "../nu-path", version = "0.95.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.95.1" }
+nu-path = { path = "../nu-path", version = "0.95.1" }
 
 # Potential dependencies for extras
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
@@ -73,9 +73,9 @@ optional = false
 version = "0.40"
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.0" }
-nu-engine = { path = "../nu-engine", version = "0.95.0" }
-nu-parser = { path = "../nu-parser", version = "0.95.0" }
-nu-command = { path = "../nu-command", version = "0.95.0" }
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.95.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.1" }
+nu-engine = { path = "../nu-engine", version = "0.95.1" }
+nu-parser = { path = "../nu-parser", version = "0.95.1" }
+nu-command = { path = "../nu-command", version = "0.95.1" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.95.1" }
 tempfile.workspace = true
\ No newline at end of file
diff --git a/crates/nu_plugin_python/nu_plugin_python_example.py b/crates/nu_plugin_python/nu_plugin_python_example.py
index 14cd28a713..34e54fea71 100755
--- a/crates/nu_plugin_python/nu_plugin_python_example.py
+++ b/crates/nu_plugin_python/nu_plugin_python_example.py
@@ -27,7 +27,7 @@ import sys
 import json
 
 
-NUSHELL_VERSION = "0.95.0"
+NUSHELL_VERSION = "0.95.1"
 PLUGIN_VERSION = "0.1.0" # bump if you change commands!
 
 
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index d044aeac42..4a54e9bf60 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_quer
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_query"
-version = "0.95.0"
+version = "0.95.1"
 
 [lib]
 doctest = false
@@ -16,8 +16,8 @@ name = "nu_plugin_query"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.95.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
+nu-plugin = { path = "../nu-plugin", version = "0.95.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
 
 gjson = "0.8"
 scraper = { default-features = false, version = "0.19" }
diff --git a/crates/nu_plugin_stress_internals/Cargo.toml b/crates/nu_plugin_stress_internals/Cargo.toml
index e4e7f88403..2a53eb6749 100644
--- a/crates/nu_plugin_stress_internals/Cargo.toml
+++ b/crates/nu_plugin_stress_internals/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_stre
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_stress_internals"
-version = "0.95.0"
+version = "0.95.1"
 
 [[bin]]
 name = "nu_plugin_stress_internals"
diff --git a/crates/nuon/Cargo.toml b/crates/nuon/Cargo.toml
index f977598450..bbb2dfe73c 100644
--- a/crates/nuon/Cargo.toml
+++ b/crates/nuon/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nuon"
 edition = "2021"
 license = "MIT"
 name = "nuon"
-version = "0.95.0"
+version = "0.95.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-parser = { path = "../nu-parser", version = "0.95.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
-nu-engine = { path = "../nu-engine", version = "0.95.0" }
+nu-parser = { path = "../nu-parser", version = "0.95.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
+nu-engine = { path = "../nu-engine", version = "0.95.1" }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 

From f241110005006f10e16c6080ebab7abec6f3e5ce Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Tue, 25 Jun 2024 20:31:54 -0500
Subject: [PATCH 0139/1072] implement autoloading (#13217)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

This PR implements script or module autoloading. It does this by finding
the `$nu.vendor-autoload-dir`, lists the contents and sorts them by file
name. These files are evaluated in that order.

To see what's going on, you can use `--log-level warn`
```
❯ cargo r -- --log-level warn
    Finished dev [unoptimized + debuginfo] target(s) in 0.58s
     Running `target\debug\nu.exe --log-level warn`
2024-06-24 09:23:20.494 PM [WARN ] nu::config_files: set_config_path() cwd: "C:\\Users\\fdncred\\source\\repos\\nushell", default_config: config.nu, key: config-path, config_file_specified: None
2024-06-24 09:23:20.495 PM [WARN ] nu::config_files: set_config_path() cwd: "C:\\Users\\fdncred\\source\\repos\\nushell", default_config: env.nu, key: env-path, config_file_specified: None
2024-06-24 09:23:20.629 PM [WARN ] nu::config_files: setup_config() config_file_specified: None, env_file_specified: None, login: false
2024-06-24 09:23:20.660 PM [WARN ] nu::config_files: read_config_file() config_file_specified: None, is_env_config: true
Hello, from env.nu
2024-06-24 09:23:20.679 PM [WARN ] nu::config_files: read_config_file() config_file_specified: None, is_env_config: false
Hello, from config.nu
Hello, from defs.nu
Activating Microsoft Visual Studio environment.
2024-06-24 09:23:21.398 PM [WARN ] nu::config_files: read_vendor_autoload_files() src\config_files.rs:234:9
2024-06-24 09:23:21.399 PM [WARN ] nu::config_files: read_vendor_autoload_files: C:\ProgramData\nushell\vendor\autoload
2024-06-24 09:23:21.399 PM [WARN ] nu::config_files: AutoLoading: "C:\\ProgramData\\nushell\\vendor\\autoload\\01_get-weather.nu"
2024-06-24 09:23:21.675 PM [WARN ] nu::config_files: AutoLoading: "C:\\ProgramData\\nushell\\vendor\\autoload\\02_temp.nu"
2024-06-24 09:23:21.817 PM [WARN ] nu_cli::repl: Terminal doesn't support use_kitty_protocol config
```

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-protocol/src/eval_const.rs | 65 +++++++++++++++++-----------
 src/config_files.rs                  | 45 ++++++++++++++++++-
 2 files changed, 84 insertions(+), 26 deletions(-)

diff --git a/crates/nu-protocol/src/eval_const.rs b/crates/nu-protocol/src/eval_const.rs
index 8f6382ae44..87913e4ee3 100644
--- a/crates/nu-protocol/src/eval_const.rs
+++ b/crates/nu-protocol/src/eval_const.rs
@@ -194,31 +194,11 @@ pub(crate) fn create_nu_constant(engine_state: &EngineState, span: Span) -> Valu
         // if not, use the default /usr/share/nushell/vendor/autoload
 
         // check to see if NU_VENDOR_AUTOLOAD_DIR env var is set, if not, use the default
-        Value::string(
-            option_env!("NU_VENDOR_AUTOLOAD_DIR")
-                .map(String::from)
-                .unwrap_or_else(|| {
-                    if cfg!(windows) {
-                        let all_user_profile = match engine_state.get_env_var("ALLUSERPROFILE") {
-                            Some(v) => format!(
-                                "{}\\nushell\\vendor\\autoload",
-                                v.coerce_string().unwrap_or("C:\\ProgramData".into())
-                            ),
-                            None => "C:\\ProgramData\\nushell\\vendor\\autoload".into(),
-                        };
-                        all_user_profile
-                    } else {
-                        // In non-Windows environments, if NU_VENDOR_AUTOLOAD_DIR is not set
-                        // check to see if PREFIX env var is set, and use it as PREFIX/nushell/vendor/autoload
-                        // otherwise default to /usr/share/nushell/vendor/autoload
-                        option_env!("PREFIX").map(String::from).map_or_else(
-                            || "/usr/local/share/nushell/vendor/autoload".into(),
-                            |prefix| format!("{}/share/nushell/vendor/autoload", prefix),
-                        )
-                    }
-                }),
-            span,
-        ),
+        if let Some(path) = get_vendor_autoload_dir(engine_state) {
+            Value::string(path.to_string_lossy(), span)
+        } else {
+            Value::error(ShellError::ConfigDirNotFound { span: Some(span) }, span)
+        },
     );
 
     record.push("temp-path", {
@@ -275,6 +255,41 @@ pub(crate) fn create_nu_constant(engine_state: &EngineState, span: Span) -> Valu
     Value::record(record, span)
 }
 
+pub fn get_vendor_autoload_dir(engine_state: &EngineState) -> Option<PathBuf> {
+    // pseudo code
+    // if env var NU_VENDOR_AUTOLOAD_DIR is set, in any platform, use it
+    // if not, if windows, use ALLUSERPROFILE\nushell\vendor\autoload
+    // if not, if non-windows, if env var PREFIX is set, use PREFIX/share/nushell/vendor/autoload
+    // if not, use the default /usr/share/nushell/vendor/autoload
+
+    // check to see if NU_VENDOR_AUTOLOAD_DIR env var is set, if not, use the default
+    Some(
+        option_env!("NU_VENDOR_AUTOLOAD_DIR")
+            .map(String::from)
+            .unwrap_or_else(|| {
+                if cfg!(windows) {
+                    let all_user_profile = match engine_state.get_env_var("ALLUSERPROFILE") {
+                        Some(v) => format!(
+                            "{}\\nushell\\vendor\\autoload",
+                            v.coerce_string().unwrap_or("C:\\ProgramData".into())
+                        ),
+                        None => "C:\\ProgramData\\nushell\\vendor\\autoload".into(),
+                    };
+                    all_user_profile
+                } else {
+                    // In non-Windows environments, if NU_VENDOR_AUTOLOAD_DIR is not set
+                    // check to see if PREFIX env var is set, and use it as PREFIX/nushell/vendor/autoload
+                    // otherwise default to /usr/share/nushell/vendor/autoload
+                    option_env!("PREFIX").map(String::from).map_or_else(
+                        || "/usr/local/share/nushell/vendor/autoload".into(),
+                        |prefix| format!("{}/share/nushell/vendor/autoload", prefix),
+                    )
+                }
+            })
+            .into(),
+    )
+}
+
 fn eval_const_call(
     working_set: &StateWorkingSet,
     call: &Call,
diff --git a/src/config_files.rs b/src/config_files.rs
index ec4511860f..30977a6d0e 100644
--- a/src/config_files.rs
+++ b/src/config_files.rs
@@ -9,8 +9,9 @@ use nu_protocol::{
 };
 use nu_utils::{get_default_config, get_default_env};
 use std::{
+    fs,
     fs::File,
-    io::Write,
+    io::{Result, Write},
     panic::{catch_unwind, AssertUnwindSafe},
     path::Path,
     sync::Arc,
@@ -176,6 +177,46 @@ pub(crate) fn read_default_env_file(engine_state: &mut EngineState, stack: &mut
     }
 }
 
+fn read_and_sort_directory(path: &Path) -> Result<Vec<String>> {
+    let mut entries = Vec::new();
+
+    for entry in fs::read_dir(path)? {
+        let entry = entry?;
+        let file_name = entry.file_name();
+        let file_name_str = file_name.into_string().unwrap_or_default();
+        entries.push(file_name_str);
+    }
+
+    entries.sort();
+
+    Ok(entries)
+}
+
+pub(crate) fn read_vendor_autoload_files(engine_state: &mut EngineState, stack: &mut Stack) {
+    warn!(
+        "read_vendor_autoload_files() {}:{}:{}",
+        file!(),
+        line!(),
+        column!()
+    );
+
+    // read and source vendor_autoload_files file if exists
+    if let Some(autoload_dir) = nu_protocol::eval_const::get_vendor_autoload_dir(engine_state) {
+        warn!("read_vendor_autoload_files: {}", autoload_dir.display());
+
+        if autoload_dir.exists() {
+            let entries = read_and_sort_directory(&autoload_dir);
+            if let Ok(entries) = entries {
+                for entry in entries {
+                    let path = autoload_dir.join(entry);
+                    warn!("AutoLoading: {:?}", path);
+                    eval_config_contents(path, engine_state, stack);
+                }
+            }
+        }
+    }
+}
+
 fn eval_default_config(
     engine_state: &mut EngineState,
     stack: &mut Stack,
@@ -236,6 +277,8 @@ pub(crate) fn setup_config(
         if is_login_shell {
             read_loginshell_file(engine_state, stack);
         }
+        // read and auto load vendor autoload files
+        read_vendor_autoload_files(engine_state, stack);
     }));
     if result.is_err() {
         eprintln!(

From 55ee47630639ad6032dc7ba98bd956039595600e Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Wed, 26 Jun 2024 01:32:54 +0000
Subject: [PATCH 0140/1072] Define keywords (#13213)

# Description
Some commands in `nu-cmd-lang` are not classified as keywords even
though they should be.

# User-Facing Changes
In the output of `which`, `scope commands`, and `help commands`, some
commands will now have a `type` of `keyword` instead of `built-in`.
---
 .../nu-cmd-lang/src/core_commands/break_.rs   | 10 +++++
 .../src/core_commands/continue_.rs            |  9 ++++
 crates/nu-cmd-lang/src/core_commands/if_.rs   | 11 ++++-
 crates/nu-cmd-lang/src/core_commands/loop_.rs | 10 +++++
 .../nu-cmd-lang/src/core_commands/match_.rs   | 11 ++++-
 .../src/core_commands/scope/command.rs        |  5 ---
 crates/nu-cmd-lang/src/core_commands/try_.rs  | 11 ++++-
 .../nu-cmd-lang/src/core_commands/while_.rs   | 10 +++++
 crates/nu-command/src/env/export_env.rs       | 10 +++++
 crates/nu-command/src/env/source_env.rs       | 10 +++++
 crates/nu-command/src/filters/where_.rs       |  6 ++-
 crates/nu-parser/src/parse_keywords.rs        | 42 ++++++++++++-------
 crates/nu-parser/src/parser.rs                | 13 +++---
 13 files changed, 126 insertions(+), 32 deletions(-)

diff --git a/crates/nu-cmd-lang/src/core_commands/break_.rs b/crates/nu-cmd-lang/src/core_commands/break_.rs
index 4698f12c34..90cc1a73f2 100644
--- 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,15 @@ 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"#
+    }
+
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
+    }
+
     fn run(
         &self,
         _engine_state: &EngineState,
diff --git a/crates/nu-cmd-lang/src/core_commands/continue_.rs b/crates/nu-cmd-lang/src/core_commands/continue_.rs
index f65a983269..cfa3e38335 100644
--- 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,14 @@ 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"#
+    }
+
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
+    }
     fn run(
         &self,
         _engine_state: &EngineState,
diff --git a/crates/nu-cmd-lang/src/core_commands/if_.rs b/crates/nu-cmd-lang/src/core_commands/if_.rs
index a2071530ac..738d901759 100644
--- 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
     }
diff --git a/crates/nu-cmd-lang/src/core_commands/loop_.rs b/crates/nu-cmd-lang/src/core_commands/loop_.rs
index 9b1e36a057..a9c642ca3c 100644
--- 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,
diff --git a/crates/nu-cmd-lang/src/core_commands/match_.rs b/crates/nu-cmd-lang/src/core_commands/match_.rs
index 41b5c24702..d28a59cbad 100644
--- 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,
diff --git a/crates/nu-cmd-lang/src/core_commands/scope/command.rs b/crates/nu-cmd-lang/src/core_commands/scope/command.rs
index 98439226cf..cc52a8a16f 100644
--- 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,
diff --git a/crates/nu-cmd-lang/src/core_commands/try_.rs b/crates/nu-cmd-lang/src/core_commands/try_.rs
index 1f16f97908..f99825b88d 100644
--- 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,
diff --git a/crates/nu-cmd-lang/src/core_commands/while_.rs b/crates/nu-cmd-lang/src/core_commands/while_.rs
index bf9076aa0c..646b95c82e 100644
--- a/crates/nu-cmd-lang/src/core_commands/while_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/while_.rs
@@ -1,4 +1,5 @@
 use nu_engine::{command_prelude::*, get_eval_block, get_eval_expression};
+use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct While;
@@ -29,6 +30,15 @@ impl Command for While {
         vec!["loop"]
     }
 
+    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,
diff --git a/crates/nu-command/src/env/export_env.rs b/crates/nu-command/src/env/export_env.rs
index 20605a9bb5..00f2c73ef4 100644
--- a/crates/nu-command/src/env/export_env.rs
+++ b/crates/nu-command/src/env/export_env.rs
@@ -1,4 +1,5 @@
 use nu_engine::{command_prelude::*, get_eval_block, redirect_env};
+use nu_protocol::engine::CommandType;
 
 #[derive(Clone)]
 pub struct ExportEnv;
@@ -23,6 +24,15 @@ impl Command for ExportEnv {
         "Run a block and preserve its environment in a current scope."
     }
 
+    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,
diff --git a/crates/nu-command/src/env/source_env.rs b/crates/nu-command/src/env/source_env.rs
index 71c1e6dc3f..0d8b118e8d 100644
--- a/crates/nu-command/src/env/source_env.rs
+++ b/crates/nu-command/src/env/source_env.rs
@@ -2,6 +2,7 @@ use nu_engine::{
     command_prelude::*, find_in_dirs_env, get_dirs_var_from_call, get_eval_block_with_early_return,
     redirect_env,
 };
+use nu_protocol::engine::CommandType;
 use std::path::PathBuf;
 
 /// Source a file for environment variables.
@@ -28,6 +29,15 @@ impl Command for SourceEnv {
         "Source the environment from a source file into the current environment."
     }
 
+    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,
diff --git a/crates/nu-command/src/filters/where_.rs b/crates/nu-command/src/filters/where_.rs
index fe73de354f..922879d09b 100644
--- a/crates/nu-command/src/filters/where_.rs
+++ b/crates/nu-command/src/filters/where_.rs
@@ -1,5 +1,5 @@
 use nu_engine::{command_prelude::*, ClosureEval};
-use nu_protocol::engine::Closure;
+use nu_protocol::engine::{Closure, CommandType};
 
 #[derive(Clone)]
 pub struct Where;
@@ -19,6 +19,10 @@ tables, known as "row conditions". On the other hand, reading the condition from
 not supported."#
     }
 
+    fn command_type(&self) -> CommandType {
+        CommandType::Keyword
+    }
+
     fn signature(&self) -> nu_protocol::Signature {
         Signature::build("where")
             .input_output_types(vec![
diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index 673a59fb05..6d3862db37 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -42,32 +42,44 @@ use crate::{
 };
 
 /// These parser keywords can be aliased
-pub const ALIASABLE_PARSER_KEYWORDS: &[&[u8]] = &[b"overlay hide", b"overlay new", b"overlay use"];
+pub const ALIASABLE_PARSER_KEYWORDS: &[&[u8]] = &[
+    b"if",
+    b"match",
+    b"try",
+    b"overlay",
+    b"overlay hide",
+    b"overlay new",
+    b"overlay use",
+];
 
 pub const RESERVED_VARIABLE_NAMES: [&str; 3] = ["in", "nu", "env"];
 
 /// These parser keywords cannot be aliased (either not possible, or support not yet added)
 pub const UNALIASABLE_PARSER_KEYWORDS: &[&[u8]] = &[
-    b"export",
-    b"def",
-    b"export def",
-    b"for",
-    b"extern",
-    b"export extern",
     b"alias",
-    b"export alias",
-    b"export-env",
+    b"const",
+    b"def",
+    b"extern",
     b"module",
     b"use",
+    b"export",
+    b"export alias",
+    b"export const",
+    b"export def",
+    b"export extern",
+    b"export module",
     b"export use",
-    b"hide",
-    // b"overlay",
-    // b"overlay hide",
-    // b"overlay new",
-    // b"overlay use",
+    b"for",
+    b"loop",
+    b"while",
+    b"return",
+    b"break",
+    b"continue",
     b"let",
-    b"const",
     b"mut",
+    b"hide",
+    b"export-env",
+    b"source-env",
     b"source",
     b"where",
     b"register",
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index ba718cc771..1fef8bc133 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -934,15 +934,12 @@ pub fn parse_internal_call(
     let output = signature.get_output_type();
 
     // storing the var ID for later due to borrowing issues
-    let lib_dirs_var_id = if decl.is_builtin() {
-        match decl.name() {
-            "use" | "overlay use" | "source-env" | "nu-check" => {
-                find_dirs_var(working_set, LIB_DIRS_VAR)
-            }
-            _ => None,
+    let lib_dirs_var_id = match decl.name() {
+        "use" | "overlay use" | "source-env" if decl.is_keyword() => {
+            find_dirs_var(working_set, LIB_DIRS_VAR)
         }
-    } else {
-        None
+        "nu-check" if decl.is_builtin() => find_dirs_var(working_set, LIB_DIRS_VAR),
+        _ => None,
     };
 
     // The index into the positional parameter in the definition

From def36865effde927b919c3221f1ee44b05798770 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Wed, 26 Jun 2024 09:33:37 +0800
Subject: [PATCH 0141/1072] Enable reloading changes to a submodule (#13170)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

Fixes: https://github.com/nushell/nushell/issues/12099

Currently if user run `use voice.nu`, and file is unchanged, then run
`use voice.nu` again. nushell will use the module directly, even if
submodule inside `voice.nu` is changed.

After discussed with @kubouch, I think it's ok to re-parse the module
file when:
1. It exports sub modules which are defined by a file
2. It uses other modules which are defined by a file

## About the change:
To achieve the behavior, we need to add 2 attributes to `Module`:
1. `imported_modules`: it tracks the other modules is imported by the
givem `module`, e.g: `use foo.nu`
2. `file`: the path of a module, if a module is defined by a file, it
will be `Some(path)`, or else it will be `None`.

After the change:

    use voice.nu always read the file and parse it.
    use voice will still use the module which is saved in EngineState.

# User-Facing Changes

use `xxx.nu` will read the file and parse it if it exports submodules or
uses submodules

# Tests + Formatting

Done

---------

Co-authored-by: Jakub Žádník <kubouch@gmail.com>
---
 crates/nu-parser/src/lib.rs                   |   3 +-
 crates/nu-parser/src/parse_keywords.rs        |  71 +++++++-
 crates/nu-parser/src/parser.rs                |   2 +-
 crates/nu-protocol/src/lib.rs                 |   1 +
 crates/nu-protocol/src/module.rs              |  35 +++-
 .../src/parser_path.rs                        |   2 +-
 tests/modules/mod.rs                          | 161 +++++++++++++++++-
 7 files changed, 258 insertions(+), 17 deletions(-)
 rename crates/{nu-parser => nu-protocol}/src/parser_path.rs (98%)

diff --git a/crates/nu-parser/src/lib.rs b/crates/nu-parser/src/lib.rs
index eeb6a590b8..89cba8d243 100644
--- a/crates/nu-parser/src/lib.rs
+++ b/crates/nu-parser/src/lib.rs
@@ -8,7 +8,6 @@ mod parse_keywords;
 mod parse_patterns;
 mod parse_shape_specs;
 mod parser;
-mod parser_path;
 mod type_check;
 
 pub use deparse::{escape_for_script_arg, escape_quote_string};
@@ -18,8 +17,8 @@ pub use flatten::{
 pub use known_external::KnownExternal;
 pub use lex::{lex, lex_signature, Token, TokenContents};
 pub use lite_parser::{lite_parse, LiteBlock, LiteCommand};
+pub use nu_protocol::parser_path::*;
 pub use parse_keywords::*;
-pub use parser_path::*;
 
 pub use parser::{
     is_math_expression_like, parse, parse_block, parse_expression, parse_external_call,
diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index 6d3862db37..70d217c564 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -2,7 +2,6 @@ use crate::{
     exportable::Exportable,
     parse_block,
     parser::{parse_redirection, redirecting_builtin_error},
-    parser_path::ParserPath,
     type_check::{check_block_input_output, type_compatible},
 };
 use itertools::Itertools;
@@ -15,6 +14,7 @@ use nu_protocol::{
     },
     engine::{StateWorkingSet, DEFAULT_OVERLAY_NAME},
     eval_const::eval_constant,
+    parser_path::ParserPath,
     Alias, BlockId, DeclId, Module, ModuleId, ParseError, PositionalArg, ResolvedImportPattern,
     Span, Spanned, SyntaxShape, Type, Value, VarId,
 };
@@ -1204,7 +1204,7 @@ pub fn parse_export_in_block(
         "export alias" => parse_alias(working_set, lite_command, None),
         "export def" => parse_def(working_set, lite_command, None).0,
         "export const" => parse_const(working_set, &lite_command.parts[1..]),
-        "export use" => parse_use(working_set, lite_command).0,
+        "export use" => parse_use(working_set, lite_command, None).0,
         "export module" => parse_module(working_set, lite_command, None).0,
         "export extern" => parse_extern(working_set, lite_command, None),
         _ => {
@@ -1223,6 +1223,7 @@ pub fn parse_export_in_module(
     working_set: &mut StateWorkingSet,
     lite_command: &LiteCommand,
     module_name: &[u8],
+    parent_module: &mut Module,
 ) -> (Pipeline, Vec<Exportable>) {
     let spans = &lite_command.parts[..];
 
@@ -1428,7 +1429,8 @@ pub fn parse_export_in_module(
                     pipe: lite_command.pipe,
                     redirection: lite_command.redirection.clone(),
                 };
-                let (pipeline, exportables) = parse_use(working_set, &lite_command);
+                let (pipeline, exportables) =
+                    parse_use(working_set, &lite_command, Some(parent_module));
 
                 let export_use_decl_id = if let Some(id) = working_set.find_decl(b"export use") {
                     id
@@ -1771,7 +1773,7 @@ pub fn parse_module_block(
                     ))
                 }
                 b"use" => {
-                    let (pipeline, _) = parse_use(working_set, command);
+                    let (pipeline, _) = parse_use(working_set, command, Some(&mut module));
 
                     block.pipelines.push(pipeline)
                 }
@@ -1786,7 +1788,7 @@ pub fn parse_module_block(
                 }
                 b"export" => {
                     let (pipe, exportables) =
-                        parse_export_in_module(working_set, command, module_name);
+                        parse_export_in_module(working_set, command, module_name, &mut module);
 
                     for exportable in exportables {
                         match exportable {
@@ -1896,6 +1898,48 @@ pub fn parse_module_block(
     (block, module, module_comments)
 }
 
+fn module_needs_reloading(working_set: &StateWorkingSet, module_id: ModuleId) -> bool {
+    let module = working_set.get_module(module_id);
+
+    fn submodule_need_reloading(working_set: &StateWorkingSet, submodule_id: ModuleId) -> bool {
+        let submodule = working_set.get_module(submodule_id);
+        let submodule_changed = if let Some((file_path, file_id)) = &submodule.file {
+            let existing_contents = working_set.get_contents_of_file(*file_id);
+            let file_contents = file_path.read(working_set);
+
+            if let (Some(existing), Some(new)) = (existing_contents, file_contents) {
+                existing != new
+            } else {
+                false
+            }
+        } else {
+            false
+        };
+
+        if submodule_changed {
+            true
+        } else {
+            module_needs_reloading(working_set, submodule_id)
+        }
+    }
+
+    let export_submodule_changed = module
+        .submodules
+        .iter()
+        .any(|(_, submodule_id)| submodule_need_reloading(working_set, *submodule_id));
+
+    if export_submodule_changed {
+        return true;
+    }
+
+    let private_submodule_changed = module
+        .imported_modules
+        .iter()
+        .any(|submodule_id| submodule_need_reloading(working_set, *submodule_id));
+
+    private_submodule_changed
+}
+
 /// Parse a module from a file.
 ///
 /// The module name is inferred from the stem of the file, unless specified in `name_override`.
@@ -1934,23 +1978,26 @@ fn parse_module_file(
 
     // Check if we've parsed the module before.
     if let Some(module_id) = working_set.find_module_by_span(new_span) {
-        return Some(module_id);
+        if !module_needs_reloading(working_set, module_id) {
+            return Some(module_id);
+        }
     }
 
     // Add the file to the stack of files being processed.
-    if let Err(e) = working_set.files.push(path.path_buf(), path_span) {
+    if let Err(e) = working_set.files.push(path.clone().path_buf(), path_span) {
         working_set.error(e);
         return None;
     }
 
     // Parse the module
-    let (block, module, module_comments) =
+    let (block, mut module, module_comments) =
         parse_module_block(working_set, new_span, module_name.as_bytes());
 
     // Remove the file from the stack of files being processed.
     working_set.files.pop();
 
     let _ = working_set.add_block(Arc::new(block));
+    module.file = Some((path, file_id));
     let module_id = working_set.add_module(&module_name, module, module_comments);
 
     Some(module_id)
@@ -2240,6 +2287,7 @@ pub fn parse_module(
 pub fn parse_use(
     working_set: &mut StateWorkingSet,
     lite_command: &LiteCommand,
+    parent_module: Option<&mut Module>,
 ) -> (Pipeline, Vec<Exportable>) {
     let spans = &lite_command.parts;
 
@@ -2385,12 +2433,14 @@ pub fn parse_use(
         );
     };
 
+    let mut imported_modules = vec![];
     let (definitions, errors) = module.resolve_import_pattern(
         working_set,
         module_id,
         &import_pattern.members,
         None,
         name_span,
+        &mut imported_modules,
     );
 
     working_set.parse_errors.extend(errors);
@@ -2432,6 +2482,9 @@ pub fn parse_use(
 
     import_pattern.constants = constants.iter().map(|(_, id)| *id).collect();
 
+    if let Some(m) = parent_module {
+        m.track_imported_modules(&imported_modules)
+    }
     // Extend the current scope with the module's exportables
     working_set.use_decls(definitions.decls);
     working_set.use_modules(definitions.modules);
@@ -2865,6 +2918,7 @@ pub fn parse_overlay_use(working_set: &mut StateWorkingSet, call: Box<Call>) ->
                 &[],
                 Some(final_overlay_name.as_bytes()),
                 call.head,
+                &mut vec![],
             )
         } else {
             origin_module.resolve_import_pattern(
@@ -2875,6 +2929,7 @@ pub fn parse_overlay_use(working_set: &mut StateWorkingSet, call: Box<Call>) ->
                 }],
                 Some(final_overlay_name.as_bytes()),
                 call.head,
+                &mut vec![],
             )
         }
     } else {
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 1fef8bc133..f6bbd84f6c 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -5377,7 +5377,7 @@ pub fn parse_builtin_commands(
         }
         b"alias" => parse_alias(working_set, lite_command, None),
         b"module" => parse_module(working_set, lite_command, None).0,
-        b"use" => parse_use(working_set, lite_command).0,
+        b"use" => parse_use(working_set, lite_command, None).0,
         b"overlay" => {
             if let Some(redirection) = lite_command.redirection.as_ref() {
                 working_set.error(redirecting_builtin_error("overlay", redirection));
diff --git a/crates/nu-protocol/src/lib.rs b/crates/nu-protocol/src/lib.rs
index 78e7d40680..9c176953d5 100644
--- a/crates/nu-protocol/src/lib.rs
+++ b/crates/nu-protocol/src/lib.rs
@@ -11,6 +11,7 @@ mod example;
 mod id;
 mod lev_distance;
 mod module;
+pub mod parser_path;
 mod pipeline;
 #[cfg(feature = "plugin")]
 mod plugin;
diff --git a/crates/nu-protocol/src/module.rs b/crates/nu-protocol/src/module.rs
index ebb6f5621e..6b4aec0c60 100644
--- a/crates/nu-protocol/src/module.rs
+++ b/crates/nu-protocol/src/module.rs
@@ -1,8 +1,9 @@
 use crate::{
-    ast::ImportPatternMember, engine::StateWorkingSet, BlockId, DeclId, ModuleId, ParseError, Span,
-    Value, VarId,
+    ast::ImportPatternMember, engine::StateWorkingSet, BlockId, DeclId, FileId, ModuleId,
+    ParseError, Span, Value, VarId,
 };
 
+use crate::parser_path::ParserPath;
 use indexmap::IndexMap;
 
 pub struct ResolvedImportPattern {
@@ -35,6 +36,8 @@ pub struct Module {
     pub env_block: Option<BlockId>, // `export-env { ... }` block
     pub main: Option<DeclId>,       // `export def main`
     pub span: Option<Span>,
+    pub imported_modules: Vec<ModuleId>, // use other_module.nu
+    pub file: Option<(ParserPath, FileId)>,
 }
 
 impl Module {
@@ -47,6 +50,8 @@ impl Module {
             env_block: None,
             main: None,
             span: None,
+            imported_modules: vec![],
+            file: None,
         }
     }
 
@@ -59,6 +64,8 @@ impl Module {
             env_block: None,
             main: None,
             span: Some(span),
+            imported_modules: vec![],
+            file: None,
         }
     }
 
@@ -82,6 +89,12 @@ impl Module {
         self.env_block = Some(block_id);
     }
 
+    pub fn track_imported_modules(&mut self, module_id: &[ModuleId]) {
+        for m in module_id {
+            self.imported_modules.push(*m)
+        }
+    }
+
     pub fn has_decl(&self, name: &[u8]) -> bool {
         if name == self.name && self.main.is_some() {
             return true;
@@ -90,6 +103,9 @@ impl Module {
         self.decls.contains_key(name)
     }
 
+    /// Resolve `members` from given module, which is indicated by `self_id` to import.
+    ///
+    /// When resolving, all modules are recorded in `imported_modules`.
     pub fn resolve_import_pattern(
         &self,
         working_set: &StateWorkingSet,
@@ -97,7 +113,9 @@ impl Module {
         members: &[ImportPatternMember],
         name_override: Option<&[u8]>, // name under the module was stored (doesn't have to be the same as self.name)
         backup_span: Span,
+        imported_modules: &mut Vec<ModuleId>,
     ) -> (ResolvedImportPattern, Vec<ParseError>) {
+        imported_modules.push(self_id);
         let final_name = name_override.unwrap_or(&self.name).to_vec();
 
         let (head, rest) = if let Some((head, rest)) = members.split_first() {
@@ -112,8 +130,14 @@ impl Module {
                 let submodule = working_set.get_module(*id);
                 let span = submodule.span.or(self.span).unwrap_or(backup_span);
 
-                let (sub_results, sub_errors) =
-                    submodule.resolve_import_pattern(working_set, *id, &[], None, span);
+                let (sub_results, sub_errors) = submodule.resolve_import_pattern(
+                    working_set,
+                    *id,
+                    &[],
+                    None,
+                    span,
+                    imported_modules,
+                );
                 errors.extend(sub_errors);
 
                 for (sub_name, sub_decl_id) in sub_results.decls {
@@ -212,6 +236,7 @@ impl Module {
                         rest,
                         None,
                         self.span.unwrap_or(backup_span),
+                        imported_modules,
                     )
                 } else {
                     (
@@ -234,6 +259,7 @@ impl Module {
                         &[],
                         None,
                         self.span.unwrap_or(backup_span),
+                        imported_modules,
                     );
                     decls.extend(sub_results.decls);
 
@@ -287,6 +313,7 @@ impl Module {
                             rest,
                             None,
                             self.span.unwrap_or(backup_span),
+                            imported_modules,
                         );
 
                         decls.extend(sub_results.decls);
diff --git a/crates/nu-parser/src/parser_path.rs b/crates/nu-protocol/src/parser_path.rs
similarity index 98%
rename from crates/nu-parser/src/parser_path.rs
rename to crates/nu-protocol/src/parser_path.rs
index 2d0fbce2a2..4935d9fbe2 100644
--- a/crates/nu-parser/src/parser_path.rs
+++ b/crates/nu-protocol/src/parser_path.rs
@@ -1,4 +1,4 @@
-use nu_protocol::engine::{StateWorkingSet, VirtualPath};
+use crate::engine::{StateWorkingSet, VirtualPath};
 use std::{
     ffi::OsStr,
     path::{Path, PathBuf},
diff --git a/tests/modules/mod.rs b/tests/modules/mod.rs
index c556d6fa7a..9aa1282f21 100644
--- a/tests/modules/mod.rs
+++ b/tests/modules/mod.rs
@@ -1,4 +1,4 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
+use nu_test_support::fs::Stub::{FileWithContent, FileWithContentToBeTrimmed};
 use nu_test_support::playground::Playground;
 use nu_test_support::{nu, nu_repl_code};
 use pretty_assertions::assert_eq;
@@ -760,3 +760,162 @@ fn nested_list_export_works() {
     let actual = nu!(&inp.join("; "));
     assert_eq!(actual.out, "bacon");
 }
+
+#[test]
+fn reload_submodules() {
+    Playground::setup("reload_submodule_changed_file", |dirs, sandbox| {
+        sandbox.with_files(&[
+            FileWithContent("voice.nu", r#"export module animals.nu"#),
+            FileWithContent("animals.nu", "export def cat [] { 'meow'}"),
+        ]);
+
+        let inp = [
+            "use voice.nu",
+            r#""export def cat [] {'woem'}" | save -f animals.nu"#,
+            "use voice.nu",
+            "(voice animals cat) == 'woem'",
+        ];
+        let actual = nu!(cwd: dirs.test(), nu_repl_code(&inp));
+        assert_eq!(actual.out, "true");
+
+        // should also verify something unchanged if `use voice`.
+        let inp = [
+            "use voice.nu",
+            r#""export def cat [] {'meow'}" | save -f animals.nu"#,
+            "use voice",
+            "(voice animals cat) == 'woem'",
+        ];
+        let actual = nu!(cwd: dirs.test(), nu_repl_code(&inp));
+        assert_eq!(actual.out, "true");
+
+        // should also works if we use members directly.
+        sandbox.with_files(&[
+            FileWithContent("voice.nu", r#"export module animals.nu"#),
+            FileWithContent("animals.nu", "export def cat [] { 'meow'}"),
+        ]);
+        let inp = [
+            "use voice.nu animals cat",
+            r#""export def cat [] {'woem'}" | save -f animals.nu"#,
+            "use voice.nu animals cat",
+            "(cat) == 'woem'",
+        ];
+        let actual = nu!(cwd: dirs.test(), nu_repl_code(&inp));
+        assert_eq!(actual.out, "true");
+    });
+}
+
+#[test]
+fn use_submodules() {
+    Playground::setup("use_submodules", |dirs, sandbox| {
+        sandbox.with_files(&[
+            FileWithContent("voice.nu", r#"export use animals.nu"#),
+            FileWithContent("animals.nu", "export def cat [] { 'meow'}"),
+        ]);
+
+        let inp = [
+            "use voice.nu",
+            r#""export def cat [] {'woem'}" | save -f animals.nu"#,
+            "use voice.nu",
+            "(voice animals cat) == 'woem'",
+        ];
+        let actual = nu!(cwd: dirs.test(), nu_repl_code(&inp));
+        assert_eq!(actual.out, "true");
+
+        // should also verify something unchanged if `use voice`.
+        let inp = [
+            "use voice.nu",
+            r#""export def cat [] {'meow'}" | save -f animals.nu"#,
+            "use voice",
+            "(voice animals cat) == 'woem'",
+        ];
+        let actual = nu!(cwd: dirs.test(), nu_repl_code(&inp));
+        assert_eq!(actual.out, "true");
+
+        // also verify something is changed when using members.
+        sandbox.with_files(&[
+            FileWithContent("voice.nu", r#"export use animals.nu cat"#),
+            FileWithContent("animals.nu", "export def cat [] { 'meow'}"),
+        ]);
+        let inp = [
+            "use voice.nu",
+            r#""export def cat [] {'woem'}" | save -f animals.nu"#,
+            "use voice.nu",
+            "(voice cat) == 'woem'",
+        ];
+        let actual = nu!(cwd: dirs.test(), nu_repl_code(&inp));
+        assert_eq!(actual.out, "true");
+
+        sandbox.with_files(&[
+            FileWithContent("voice.nu", r#"export use animals.nu *"#),
+            FileWithContent("animals.nu", "export def cat [] { 'meow'}"),
+        ]);
+        let inp = [
+            "use voice.nu",
+            r#""export def cat [] {'woem'}" | save -f animals.nu"#,
+            "use voice.nu",
+            "(voice cat) == 'woem'",
+        ];
+        let actual = nu!(cwd: dirs.test(), nu_repl_code(&inp));
+        assert_eq!(actual.out, "true");
+
+        sandbox.with_files(&[
+            FileWithContent("voice.nu", r#"export use animals.nu [cat]"#),
+            FileWithContent("animals.nu", "export def cat [] { 'meow'}"),
+        ]);
+        let inp = [
+            "use voice.nu",
+            r#""export def cat [] {'woem'}" | save -f animals.nu"#,
+            "use voice.nu",
+            "(voice cat) == 'woem'",
+        ];
+        let actual = nu!(cwd: dirs.test(), nu_repl_code(&inp));
+        assert_eq!(actual.out, "true");
+    });
+}
+
+#[test]
+fn use_nested_submodules() {
+    Playground::setup("use_submodules", |dirs, sandbox| {
+        sandbox.with_files(&[
+            FileWithContent("voice.nu", r#"export use animals.nu"#),
+            FileWithContent("animals.nu", r#"export use nested_animals.nu"#),
+            FileWithContent("nested_animals.nu", "export def cat [] { 'meow'}"),
+        ]);
+        let inp = [
+            "use voice.nu",
+            r#""export def cat [] {'woem'}" | save -f nested_animals.nu"#,
+            "use voice.nu",
+            "(voice animals nested_animals cat) == 'woem'",
+        ];
+        let actual = nu!(cwd: dirs.test(), nu_repl_code(&inp));
+        assert_eq!(actual.out, "true");
+
+        sandbox.with_files(&[
+            FileWithContent("voice.nu", r#"export use animals.nu"#),
+            FileWithContent("animals.nu", r#"export use nested_animals.nu cat"#),
+            FileWithContent("nested_animals.nu", "export def cat [] { 'meow'}"),
+        ]);
+        let inp = [
+            "use voice.nu",
+            r#""export def cat [] {'woem'}" | save -f nested_animals.nu"#,
+            "use voice.nu",
+            "(voice animals cat) == 'woem'",
+        ];
+        let actual = nu!(cwd: dirs.test(), nu_repl_code(&inp));
+        assert_eq!(actual.out, "true");
+
+        sandbox.with_files(&[
+            FileWithContent("animals.nu", r#"export use nested_animals.nu cat"#),
+            FileWithContent("nested_animals.nu", "export def cat [] { 'meow' }"),
+        ]);
+        let inp = [
+            "module voice { export module animals.nu }",
+            "use voice",
+            r#""export def cat [] {'woem'}" | save -f nested_animals.nu"#,
+            "use voice.nu",
+            "(voice animals cat) == 'woem'",
+        ];
+        let actual = nu!(cwd: dirs.test(), nu_repl_code(&inp));
+        assert_eq!(actual.out, "true");
+    })
+}

From 5a486029dbe2d33a690d325a6cc59639f07eb74f Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Wed, 26 Jun 2024 01:33:57 +0000
Subject: [PATCH 0142/1072] Add typed path forms (#13115)

# Description
This PR adds new types to `nu-path` to enforce path invariants. Namely,
this PR adds:
- `Path` and `PathBuf`. These types are different from, but analogous to
`std::path::Path` and `std::path::PathBuf`.
- `RelativePath` and `RelativePathBuf`. These types must be/contain
strictly relative paths.
- `AbsolutePath` and `AbsolutePathBuf`. These types must be/contain
strictly absolute paths.
- `CanonicalPath` and `CanonicalPathBuf`. These types must be/contain
canonical paths.

Operations are prohibited as necessary to ensure that the invariants of
each type are upheld (needs double-checking).

Only paths that are absolute (or canonical) can be easily used as /
converted to `std::path::Path`s. This is to help force us to account for
the emulated current working directory instead of accidentally using the
current directory of the Nushell process (i.e.,
`std::env::current_dir`). Related to #12975 and #12976.

Note that this PR uses several declarative macros, as the file / this PR
would otherwise be 5000 lines long.

# User-Facing Changes
No major changes yet, just adds types to `nu-path` to be used in the
future.

# After Submitting
Actually use the new path types in all our crates where it makes sense,
removing usages of `std::path` types.
---
 crates/nu-path/src/form.rs |  161 ++
 crates/nu-path/src/lib.rs  |    3 +
 crates/nu-path/src/path.rs | 3095 ++++++++++++++++++++++++++++++++++++
 typos.toml                 |    1 +
 4 files changed, 3260 insertions(+)
 create mode 100644 crates/nu-path/src/form.rs
 create mode 100644 crates/nu-path/src/path.rs

diff --git a/crates/nu-path/src/form.rs b/crates/nu-path/src/form.rs
new file mode 100644
index 0000000000..4266905a20
--- /dev/null
+++ b/crates/nu-path/src/form.rs
@@ -0,0 +1,161 @@
+use std::ffi::OsStr;
+
+mod private {
+    use std::ffi::OsStr;
+
+    // This trait should not be extended by external crates in order to uphold safety guarantees.
+    // As such, this trait is put inside a private module to prevent external impls.
+    // This ensures that all possible [`PathForm`]s can only be defined here and will:
+    // - be zero sized (enforced anyways by the `repr(transparent)` on `Path`)
+    // - have a no-op [`Drop`] implementation
+    pub trait Sealed: 'static {
+        fn invariants_satisfied<P: AsRef<OsStr> + ?Sized>(path: &P) -> bool;
+    }
+}
+
+/// A marker trait for the different kinds of path forms.
+/// Each form has its own invariants that are guaranteed be upheld.
+/// The list of path forms are:
+/// - [`Any`]: a path with no invariants. It may be a relative or an absolute path.
+/// - [`Relative`]: a strictly relative path.
+/// - [`Absolute`]: a strictly absolute path.
+/// - [`Canonical`]: a path that must be in canonicalized form.
+pub trait PathForm: private::Sealed {}
+impl PathForm for Any {}
+impl PathForm for Relative {}
+impl PathForm for Absolute {}
+impl PathForm for Canonical {}
+
+/// A path whose form is unknown. It could be a relative, absolute, or canonical path.
+///
+/// The path is not guaranteed to be normalized. It may contain unresolved symlinks,
+/// trailing slashes, dot components (`..` or `.`), and repeated path separators.
+pub struct Any;
+
+impl private::Sealed for Any {
+    fn invariants_satisfied<P: AsRef<OsStr> + ?Sized>(_: &P) -> bool {
+        true
+    }
+}
+
+/// A strictly relative path.
+///
+/// The path is not guaranteed to be normalized. It may contain unresolved symlinks,
+/// trailing slashes, dot components (`..` or `.`), and repeated path separators.
+pub struct Relative;
+
+impl private::Sealed for Relative {
+    fn invariants_satisfied<P: AsRef<OsStr> + ?Sized>(path: &P) -> bool {
+        std::path::Path::new(path).is_relative()
+    }
+}
+
+/// An absolute path.
+///
+/// The path is not guaranteed to be normalized. It may contain unresolved symlinks,
+/// trailing slashes, dot components (`..` or `.`), and repeated path separators.
+pub struct Absolute;
+
+impl private::Sealed for Absolute {
+    fn invariants_satisfied<P: AsRef<OsStr> + ?Sized>(path: &P) -> bool {
+        std::path::Path::new(path).is_absolute()
+    }
+}
+
+// A canonical path.
+//
+// An absolute path with all intermediate components normalized and symbolic links resolved.
+pub struct Canonical;
+
+impl private::Sealed for Canonical {
+    fn invariants_satisfied<P: AsRef<OsStr> + ?Sized>(_: &P) -> bool {
+        true
+    }
+}
+
+/// A marker trait for [`PathForm`]s that may be relative paths.
+/// This includes only the [`Any`] and [`Relative`] path forms.
+///
+/// [`push`](crate::PathBuf::push) and [`join`](crate::Path::join)
+/// operations only support [`MaybeRelative`] path forms as input.
+pub trait MaybeRelative: PathForm {}
+impl MaybeRelative for Any {}
+impl MaybeRelative for Relative {}
+
+/// A marker trait for [`PathForm`]s that may be absolute paths.
+/// This includes the [`Any`], [`Absolute`], and [`Canonical`] path forms.
+pub trait MaybeAbsolute: PathForm {}
+impl MaybeAbsolute for Any {}
+impl MaybeAbsolute for Absolute {}
+impl MaybeAbsolute for Canonical {}
+
+/// A marker trait for [`PathForm`]s that are absolute paths.
+/// This includes only the [`Absolute`] and [`Canonical`] path forms.
+///
+/// Only [`PathForm`]s that implement this trait can be easily converted to [`std::path::Path`]
+/// or [`std::path::PathBuf`]. This is to encourage/force other Nushell crates to account for
+/// the emulated current working directory, instead of using the [`std::env::current_dir`].
+pub trait IsAbsolute: PathForm {}
+impl IsAbsolute for Absolute {}
+impl IsAbsolute for Canonical {}
+
+/// A marker trait that signifies one [`PathForm`] can be used as or trivially converted to
+/// another [`PathForm`].
+///
+/// The list of possible conversions are:
+/// - [`Relative`], [`Absolute`], or [`Canonical`] into [`Any`].
+/// - [`Canonical`] into [`Absolute`].
+/// - Any form into itself.
+pub trait PathCast<Form: PathForm>: PathForm {}
+impl<Form: PathForm> PathCast<Form> for Form {}
+impl PathCast<Any> for Relative {}
+impl PathCast<Any> for Absolute {}
+impl PathCast<Any> for Canonical {}
+impl PathCast<Absolute> for Canonical {}
+
+/// A trait used to specify the output [`PathForm`] of a path join operation.
+///
+/// The output path forms based on the left hand side path form are as follows:
+///
+/// | Left hand side | Output form  |
+/// | --------------:|:------------ |
+/// | [`Any`]        | [`Any`]      |
+/// | [`Relative`]   | [`Any`]      |
+/// | [`Absolute`]   | [`Absolute`] |
+/// | [`Canonical`]  | [`Absolute`] |
+pub trait PathJoin: PathForm {
+    type Output: PathForm;
+}
+impl PathJoin for Any {
+    type Output = Self;
+}
+impl PathJoin for Relative {
+    type Output = Any;
+}
+impl PathJoin for Absolute {
+    type Output = Self;
+}
+impl PathJoin for Canonical {
+    type Output = Absolute;
+}
+
+/// A marker trait for [`PathForm`]s that support setting the file name or extension.
+///
+/// This includes the [`Any`], [`Relative`], and [`Absolute`] path forms.
+/// [`Canonical`] paths do not support this, since appending file names and extensions that contain
+/// path separators can cause the path to no longer be canonical.
+pub trait PathSet: PathForm {}
+impl PathSet for Any {}
+impl PathSet for Relative {}
+impl PathSet for Absolute {}
+
+/// A marker trait for [`PathForm`]s that support pushing [`MaybeRelative`] paths.
+///
+/// This includes only [`Any`] and [`Absolute`] path forms.
+/// Pushing onto a [`Relative`] path could cause it to become [`Absolute`],
+/// which is why they do not support pushing.
+/// In the future, a `push_rel` and/or a `try_push` method could be added as an alternative.
+/// Similarly, [`Canonical`] paths may become uncanonical if a non-canonical path is pushed onto it.
+pub trait PathPush: PathSet {}
+impl PathPush for Any {}
+impl PathPush for Absolute {}
diff --git a/crates/nu-path/src/lib.rs b/crates/nu-path/src/lib.rs
index 13640acd2f..8553495439 100644
--- a/crates/nu-path/src/lib.rs
+++ b/crates/nu-path/src/lib.rs
@@ -2,12 +2,15 @@ mod assert_path_eq;
 mod components;
 pub mod dots;
 pub mod expansions;
+pub mod form;
 mod helpers;
+mod path;
 mod tilde;
 mod trailing_slash;
 
 pub use components::components;
 pub use expansions::{canonicalize_with, expand_path_with, expand_to_real_path, locate_in_dirs};
 pub use helpers::{cache_dir, config_dir, data_dir, get_canonicalized_path, home_dir};
+pub use path::*;
 pub use tilde::expand_tilde;
 pub use trailing_slash::{has_trailing_slash, strip_trailing_slash};
diff --git a/crates/nu-path/src/path.rs b/crates/nu-path/src/path.rs
new file mode 100644
index 0000000000..916fffdf72
--- /dev/null
+++ b/crates/nu-path/src/path.rs
@@ -0,0 +1,3095 @@
+use crate::form::{
+    Absolute, Any, Canonical, IsAbsolute, MaybeRelative, PathCast, PathForm, PathJoin, PathPush,
+    PathSet, Relative,
+};
+use std::{
+    borrow::{Borrow, Cow},
+    cmp::Ordering,
+    collections::TryReserveError,
+    convert::Infallible,
+    ffi::{OsStr, OsString},
+    fmt, fs,
+    hash::{Hash, Hasher},
+    io,
+    iter::FusedIterator,
+    marker::PhantomData,
+    ops::{Deref, DerefMut},
+    path::StripPrefixError,
+    rc::Rc,
+    str::FromStr,
+    sync::Arc,
+};
+
+/// A wrapper around [`std::path::Path`] with extra invariants determined by its `Form`.
+///
+/// The possible path forms are [`Any`], [`Relative`], [`Absolute`], or [`Canonical`].
+/// To learn more, view the documentation on [`PathForm`] or any of the individual forms.
+///
+/// There are also several type aliases available, corresponding to each [`PathForm`]:
+/// - [`RelativePath`] (same as [`Path<Relative>`])
+/// - [`AbsolutePath`] (same as [`Path<Absolute>`])
+/// - [`CanonicalPath`] (same as [`Path<Canonical>`])
+///
+/// If the `Form` is not specified, then it defaults to [`Any`], so [`Path`] and [`Path<Any>`]
+/// are one in the same.
+///
+/// # Converting to [`std::path`] types
+///
+/// [`Path`]s with form [`Any`] cannot be easily referenced as a [`std::path::Path`] by design.
+/// Other Nushell crates need to account for the emulated current working directory
+/// before passing a path to functions in [`std`] or other third party crates.
+/// You can [`join`](Path::join) a [`Path`] onto an [`AbsolutePath`] or a [`CanonicalPath`].
+/// This will return an [`AbsolutePathBuf`] which can be easily referenced as a [`std::path::Path`].
+/// If you really mean it, you can instead use [`as_relative_std_path`](Path::as_relative_std_path)
+/// to get the underlying [`std::path::Path`] from a [`Path`].
+/// But this may cause third-party code to use [`std::env::current_dir`] to resolve
+/// the path which is almost always incorrect behavior. Extra care is needed to ensure that this
+/// is not the case after using [`as_relative_std_path`](Path::as_relative_std_path).
+#[repr(transparent)]
+pub struct Path<Form: PathForm = Any> {
+    _form: PhantomData<Form>,
+    inner: std::path::Path,
+}
+
+/// A path that is strictly relative.
+///
+/// I.e., this path is guaranteed to never be absolute.
+///
+/// [`RelativePath`]s cannot be easily converted into a [`std::path::Path`] by design.
+/// Other Nushell crates need to account for the emulated current working directory
+/// before passing a path to functions in [`std`] or other third party crates.
+/// You can [`join`](Path::join) a [`RelativePath`] onto an [`AbsolutePath`] or a [`CanonicalPath`].
+/// This will return an [`AbsolutePathBuf`] which can be referenced as a [`std::path::Path`].
+/// If you really mean it, you can use [`as_relative_std_path`](RelativePath::as_relative_std_path)
+/// to get the underlying [`std::path::Path`] from a [`RelativePath`].
+/// But this may cause third-party code to use [`std::env::current_dir`] to resolve
+/// the path which is almost always incorrect behavior. Extra care is needed to ensure that this
+/// is not the case after using [`as_relative_std_path`](RelativePath::as_relative_std_path).
+///
+/// # Examples
+///
+/// [`RelativePath`]s can be created by using [`try_relative`](Path::try_relative)
+/// on a [`Path`], by using [`try_new`](Path::try_new), or by using
+/// [`strip_prefix`](Path::strip_prefix) on a [`Path`] of any form.
+///
+/// ```
+/// use nu_path::{Path, RelativePath};
+///
+/// let path1 = Path::new("foo.txt");
+/// let path1 = path1.try_relative().unwrap();
+///
+/// let path2 = RelativePath::try_new("foo.txt").unwrap();
+///
+/// let path3 = Path::new("/prefix/foo.txt").strip_prefix("/prefix").unwrap();
+///
+/// assert_eq!(path1, path2);
+/// assert_eq!(path2, path3);
+/// ```
+///
+/// You can also use `RelativePath::try_from` or `try_into`.
+/// This supports attempted conversions from [`Path`] as well as types in [`std::path`].
+///
+/// ```
+/// use nu_path::{Path, RelativePath};
+///
+/// let path1 = Path::new("foo.txt");
+/// let path1: &RelativePath = path1.try_into().unwrap();
+///
+/// let path2 = std::path::Path::new("foo.txt");
+/// let path2: &RelativePath = path2.try_into().unwrap();
+///
+/// assert_eq!(path1, path2)
+/// ```
+pub type RelativePath = Path<Relative>;
+
+/// A path that is strictly absolute.
+///
+/// I.e., this path is guaranteed to never be relative.
+///
+/// # Examples
+///
+/// [`AbsolutePath`]s can be created by using [`try_absolute`](Path::try_absolute) on a [`Path`]
+/// or by using [`try_new`](AbsolutePath::try_new).
+///
+#[cfg_attr(not(windows), doc = "```")]
+#[cfg_attr(windows, doc = "```no_run")]
+/// use nu_path::{AbsolutePath, Path};
+///
+/// let path1 = Path::new("/foo").try_absolute().unwrap();
+/// let path2 = AbsolutePath::try_new("/foo").unwrap();
+///
+/// assert_eq!(path1, path2);
+/// ```
+///
+/// You can also use `AbsolutePath::try_from` or `try_into`.
+/// This supports attempted conversions from [`Path`] as well as types in [`std::path`].
+///
+#[cfg_attr(not(windows), doc = "```")]
+#[cfg_attr(windows, doc = "```no_run")]
+/// use nu_path::{AbsolutePath, Path};
+///
+/// let path1 = Path::new("/foo");
+/// let path1: &AbsolutePath = path1.try_into().unwrap();
+///
+/// let path2 = std::path::Path::new("/foo");
+/// let path2: &AbsolutePath = path2.try_into().unwrap();
+///
+/// assert_eq!(path1, path2)
+/// ```
+pub type AbsolutePath = Path<Absolute>;
+
+/// An absolute, canonical path.
+///
+/// # Examples
+///
+/// [`CanonicalPath`]s can only be created by using [`canonicalize`](Path::canonicalize) on
+/// an [`AbsolutePath`]. References to [`CanonicalPath`]s can be converted to
+/// [`AbsolutePath`] references using `as_ref`, [`cast`](Path::cast),
+/// or [`as_absolute`](CanonicalPath::as_absolute).
+///
+/// ```no_run
+/// use nu_path::AbsolutePath;
+///
+/// let path = AbsolutePath::try_new("/foo").unwrap();
+///
+/// let canonical = path.canonicalize().expect("canonicalization failed");
+///
+/// assert_eq!(path, canonical.as_absolute());
+/// ```
+pub type CanonicalPath = Path<Canonical>;
+
+impl<Form: PathForm> Path<Form> {
+    /// Create a new path of any form without validating invariants.
+    #[inline]
+    fn new_unchecked<P: AsRef<OsStr> + ?Sized>(path: &P) -> &Self {
+        debug_assert!(Form::invariants_satisfied(path));
+        // Safety: `Path<Form>` is a repr(transparent) wrapper around `std::path::Path`.
+        let path = std::path::Path::new(path.as_ref());
+        let ptr = std::ptr::from_ref(path) as *const Self;
+        unsafe { &*ptr }
+    }
+
+    /// Attempt to create a new [`Path`] from a reference of another type.
+    ///
+    /// This is a convenience method instead of having to use `try_into` with a type annotation.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::{AbsolutePath, RelativePath};
+    ///
+    /// assert!(AbsolutePath::try_new("foo.txt").is_err());
+    /// assert!(RelativePath::try_new("foo.txt").is_ok());
+    /// ```
+    #[inline]
+    pub fn try_new<'a, T>(path: &'a T) -> Result<&'a Self, <&'a T as TryInto<&'a Self>>::Error>
+    where
+        T: ?Sized,
+        &'a T: TryInto<&'a Self>,
+    {
+        path.try_into()
+    }
+
+    /// Returns the underlying [`OsStr`] slice.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::Path;
+    ///
+    /// let os_str = Path::new("foo.txt").as_os_str();
+    /// assert_eq!(os_str, std::ffi::OsStr::new("foo.txt"));
+    /// ```
+    #[must_use]
+    #[inline]
+    pub fn as_os_str(&self) -> &OsStr {
+        self.inner.as_os_str()
+    }
+
+    /// Returns a [`str`] slice if the [`Path`] is valid unicode.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::Path;
+    ///
+    /// let path = Path::new("foo.txt");
+    /// assert_eq!(path.to_str(), Some("foo.txt"));
+    /// ```
+    #[inline]
+    pub fn to_str(&self) -> Option<&str> {
+        self.inner.to_str()
+    }
+
+    /// Converts a [`Path`] to a `Cow<str>`.
+    ///
+    /// Any non-Unicode sequences are replaced with `U+FFFD REPLACEMENT CHARACTER`.
+    ///
+    /// # Examples
+    ///
+    /// Calling `to_string_lossy` on a [`Path`] with valid unicode:
+    ///
+    /// ```
+    /// use nu_path::Path;
+    ///
+    /// let path = Path::new("foo.txt");
+    /// assert_eq!(path.to_string_lossy(), "foo.txt");
+    /// ```
+    ///
+    /// Had `path` contained invalid unicode, the `to_string_lossy` call might have returned
+    /// `"fo�.txt"`.
+    #[inline]
+    pub fn to_string_lossy(&self) -> Cow<'_, str> {
+        self.inner.to_string_lossy()
+    }
+
+    /// Converts a [`Path`] to an owned [`PathBuf`].
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::{Path, PathBuf};
+    ///
+    /// let path_buf = Path::new("foo.txt").to_path_buf();
+    /// assert_eq!(path_buf, PathBuf::from("foo.txt"));
+    /// ```
+    #[inline]
+    pub fn to_path_buf(&self) -> PathBuf<Form> {
+        PathBuf::new_unchecked(self.inner.to_path_buf())
+    }
+
+    /// Returns the [`Path`] without its final component, if there is one.
+    ///
+    /// This means it returns `Some("")` for relative paths with one component.
+    ///
+    /// Returns [`None`] if the path terminates in a root or prefix, or if it's
+    /// the empty string.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::Path;
+    ///
+    /// let path = Path::new("/foo/bar");
+    /// let parent = path.parent().unwrap();
+    /// assert_eq!(parent, Path::new("/foo"));
+    ///
+    /// let grand_parent = parent.parent().unwrap();
+    /// assert_eq!(grand_parent, Path::new("/"));
+    /// assert_eq!(grand_parent.parent(), None);
+    ///
+    /// let relative_path = Path::new("foo/bar");
+    /// let parent = relative_path.parent();
+    /// assert_eq!(parent, Some(Path::new("foo")));
+    /// let grand_parent = parent.and_then(Path::parent);
+    /// assert_eq!(grand_parent, Some(Path::new("")));
+    /// let great_grand_parent = grand_parent.and_then(Path::parent);
+    /// assert_eq!(great_grand_parent, None);
+    /// ```
+    #[must_use]
+    #[inline]
+    pub fn parent(&self) -> Option<&Self> {
+        self.inner.parent().map(Self::new_unchecked)
+    }
+
+    /// Produces an iterator over a [`Path`] and its ancestors.
+    ///
+    /// The iterator will yield the [`Path`] that is returned if the [`parent`](Path::parent) method
+    /// is used zero or more times. That means, the iterator will yield `&self`,
+    /// `&self.parent().unwrap()`, `&self.parent().unwrap().parent().unwrap()` and so on.
+    /// If the [`parent`](Path::parent) method returns [`None`], the iterator will do likewise.
+    /// The iterator will always yield at least one value, namely `&self`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::Path;
+    ///
+    /// let mut ancestors = Path::new("/foo/bar").ancestors();
+    /// assert_eq!(ancestors.next(), Some(Path::new("/foo/bar")));
+    /// assert_eq!(ancestors.next(), Some(Path::new("/foo")));
+    /// assert_eq!(ancestors.next(), Some(Path::new("/")));
+    /// assert_eq!(ancestors.next(), None);
+    ///
+    /// let mut ancestors = Path::new("../foo/bar").ancestors();
+    /// assert_eq!(ancestors.next(), Some(Path::new("../foo/bar")));
+    /// assert_eq!(ancestors.next(), Some(Path::new("../foo")));
+    /// assert_eq!(ancestors.next(), Some(Path::new("..")));
+    /// assert_eq!(ancestors.next(), Some(Path::new("")));
+    /// assert_eq!(ancestors.next(), None);
+    /// ```
+    #[inline]
+    pub fn ancestors(&self) -> Ancestors<'_, Form> {
+        Ancestors {
+            _form: PhantomData,
+            inner: self.inner.ancestors(),
+        }
+    }
+
+    /// Returns the final component of a [`Path`], if there is one.
+    ///
+    /// If the path is a normal file, this is the file name. If it's the path of a directory, this
+    /// is the directory name.
+    ///
+    /// Returns [`None`] if the path terminates in `..`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::Path;
+    /// use std::ffi::OsStr;
+    ///
+    /// assert_eq!(Some(OsStr::new("bin")), Path::new("/usr/bin/").file_name());
+    /// assert_eq!(Some(OsStr::new("foo.txt")), Path::new("tmp/foo.txt").file_name());
+    /// assert_eq!(Some(OsStr::new("foo.txt")), Path::new("foo.txt/.").file_name());
+    /// assert_eq!(Some(OsStr::new("foo.txt")), Path::new("foo.txt/.//").file_name());
+    /// assert_eq!(None, Path::new("foo.txt/..").file_name());
+    /// assert_eq!(None, Path::new("/").file_name());
+    /// ```
+    #[must_use]
+    #[inline]
+    pub fn file_name(&self) -> Option<&OsStr> {
+        self.inner.file_name()
+    }
+
+    /// Returns a relative path that, when joined onto `base`, yields `self`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::{Path, PathBuf};
+    ///
+    /// let path = Path::new("/test/haha/foo.txt");
+    ///
+    /// assert_eq!(path.strip_prefix("/").unwrap(), Path::new("test/haha/foo.txt"));
+    /// assert_eq!(path.strip_prefix("/test").unwrap(), Path::new("haha/foo.txt"));
+    /// assert_eq!(path.strip_prefix("/test/").unwrap(), Path::new("haha/foo.txt"));
+    /// assert_eq!(path.strip_prefix("/test/haha/foo.txt").unwrap(), Path::new(""));
+    /// assert_eq!(path.strip_prefix("/test/haha/foo.txt/").unwrap(), Path::new(""));
+    ///
+    /// assert!(path.strip_prefix("test").is_err());
+    /// assert!(path.strip_prefix("/haha").is_err());
+    ///
+    /// let prefix = PathBuf::from("/test/");
+    /// assert_eq!(path.strip_prefix(prefix).unwrap(), Path::new("haha/foo.txt"));
+    /// ```
+    #[inline]
+    pub fn strip_prefix(&self, base: impl AsRef<Path>) -> Result<&RelativePath, StripPrefixError> {
+        self.inner
+            .strip_prefix(&base.as_ref().inner)
+            .map(RelativePath::new_unchecked)
+    }
+
+    /// Determines whether `base` is a prefix of `self`.
+    ///
+    /// Only considers whole path components to match.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::Path;
+    ///
+    /// let path = Path::new("/etc/passwd");
+    ///
+    /// assert!(path.starts_with("/etc"));
+    /// assert!(path.starts_with("/etc/"));
+    /// assert!(path.starts_with("/etc/passwd"));
+    /// assert!(path.starts_with("/etc/passwd/")); // extra slash is okay
+    /// assert!(path.starts_with("/etc/passwd///")); // multiple extra slashes are okay
+    ///
+    /// assert!(!path.starts_with("/e"));
+    /// assert!(!path.starts_with("/etc/passwd.txt"));
+    ///
+    /// assert!(!Path::new("/etc/foo.rs").starts_with("/etc/foo"));
+    /// ```
+    #[must_use]
+    #[inline]
+    pub fn starts_with(&self, base: impl AsRef<Path>) -> bool {
+        self.inner.starts_with(&base.as_ref().inner)
+    }
+
+    /// Determines whether `child` is a suffix of `self`.
+    ///
+    /// Only considers whole path components to match.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::Path;
+    ///
+    /// let path = Path::new("/etc/resolv.conf");
+    ///
+    /// assert!(path.ends_with("resolv.conf"));
+    /// assert!(path.ends_with("etc/resolv.conf"));
+    /// assert!(path.ends_with("/etc/resolv.conf"));
+    ///
+    /// assert!(!path.ends_with("/resolv.conf"));
+    /// assert!(!path.ends_with("conf")); // use .extension() instead
+    /// ```
+    #[must_use]
+    #[inline]
+    pub fn ends_with(&self, child: impl AsRef<Path>) -> bool {
+        self.inner.ends_with(&child.as_ref().inner)
+    }
+
+    /// Extracts the stem (non-extension) portion of [`self.file_name`](Path::file_name).
+    ///
+    /// The stem is:
+    ///
+    /// * [`None`], if there is no file name;
+    /// * The entire file name if there is no embedded `.`;
+    /// * The entire file name if the file name begins with `.` and has no other `.`s within;
+    /// * Otherwise, the portion of the file name before the final `.`
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::Path;
+    ///
+    /// assert_eq!("foo", Path::new("foo.rs").file_stem().unwrap());
+    /// assert_eq!("foo.tar", Path::new("foo.tar.gz").file_stem().unwrap());
+    /// ```
+    #[must_use]
+    #[inline]
+    pub fn file_stem(&self) -> Option<&OsStr> {
+        self.inner.file_stem()
+    }
+
+    /// Extracts the extension (without the leading dot) of [`self.file_name`](Path::file_name),
+    /// if possible.
+    ///
+    /// The extension is:
+    ///
+    /// * [`None`], if there is no file name;
+    /// * [`None`], if there is no embedded `.`;
+    /// * [`None`], if the file name begins with `.` and has no other `.`s within;
+    /// * Otherwise, the portion of the file name after the final `.`
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::Path;
+    ///
+    /// assert_eq!("rs", Path::new("foo.rs").extension().unwrap());
+    /// assert_eq!("gz", Path::new("foo.tar.gz").extension().unwrap());
+    /// ```
+    #[must_use]
+    #[inline]
+    pub fn extension(&self) -> Option<&OsStr> {
+        self.inner.extension()
+    }
+
+    /// Produces an iterator over the [`Component`](std::path::Component)s of the path.
+    ///
+    /// When parsing the path, there is a small amount of normalization:
+    ///
+    /// * Repeated separators are ignored, so `a/b` and `a//b` both have
+    ///   `a` and `b` as components.
+    ///
+    /// * Occurrences of `.` are normalized away, except if they are at the
+    ///   beginning of the path. For example, `a/./b`, `a/b/`, `a/b/.` and
+    ///   `a/b` all have `a` and `b` as components, but `./a/b` starts with
+    ///   an additional [`CurDir`](std::path::Component) component.
+    ///
+    /// * A trailing slash is normalized away, `/a/b` and `/a/b/` are equivalent.
+    ///
+    /// Note that no other normalization takes place; in particular, `a/c`
+    /// and `a/b/../c` are distinct, to account for the possibility that `b`
+    /// is a symbolic link (so its parent isn't `a`).
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::Path;
+    /// use std::path::Component;
+    /// use std::ffi::OsStr;
+    ///
+    /// let mut components = Path::new("/tmp/foo.txt").components();
+    ///
+    /// assert_eq!(components.next(), Some(Component::RootDir));
+    /// assert_eq!(components.next(), Some(Component::Normal(OsStr::new("tmp"))));
+    /// assert_eq!(components.next(), Some(Component::Normal(OsStr::new("foo.txt"))));
+    /// assert_eq!(components.next(), None)
+    /// ```
+    #[inline]
+    pub fn components(&self) -> std::path::Components<'_> {
+        self.inner.components()
+    }
+
+    /// Produces an iterator over the path's components viewed as [`OsStr`] slices.
+    ///
+    /// For more information about the particulars of how the path is separated into components,
+    /// see [`components`](Path::components).
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::Path;
+    /// use std::ffi::OsStr;
+    ///
+    /// let mut it = Path::new("/tmp/foo.txt").iter();
+    /// assert_eq!(it.next(), Some(OsStr::new(&std::path::MAIN_SEPARATOR.to_string())));
+    /// assert_eq!(it.next(), Some(OsStr::new("tmp")));
+    /// assert_eq!(it.next(), Some(OsStr::new("foo.txt")));
+    /// assert_eq!(it.next(), None)
+    /// ```
+    #[inline]
+    pub fn iter(&self) -> std::path::Iter<'_> {
+        self.inner.iter()
+    }
+
+    /// Returns an object that implements [`Display`](fmt::Display) for safely printing paths
+    /// that may contain non-Unicode data. This may perform lossy conversion,
+    /// depending on the platform. If you would like an implementation which escapes the path
+    /// please use [`Debug`](fmt::Debug) instead.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::Path;
+    ///
+    /// let path = Path::new("/tmp/foo.rs");
+    ///
+    /// println!("{}", path.display());
+    /// ```
+    #[inline]
+    pub fn display(&self) -> std::path::Display<'_> {
+        self.inner.display()
+    }
+
+    /// Converts a [`Box<Path>`](Box) into a [`PathBuf`] without copying or allocating.
+    #[inline]
+    pub fn into_path_buf(self: Box<Self>) -> PathBuf<Form> {
+        // Safety: `Path<Form>` is a repr(transparent) wrapper around `std::path::Path`.
+        let ptr = Box::into_raw(self) as *mut std::path::Path;
+        let boxed = unsafe { Box::from_raw(ptr) };
+        PathBuf::new_unchecked(boxed.into_path_buf())
+    }
+
+    /// Returns a reference to the same [`Path`] in a different form.
+    ///
+    /// [`PathForm`]s can be converted to one another based on [`PathCast`] implementations.
+    /// Namely, the following form conversions are possible:
+    /// - [`Relative`], [`Absolute`], or [`Canonical`] into [`Any`].
+    /// - [`Canonical`] into [`Absolute`].
+    /// - Any form into itself.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::{Path, RelativePath};
+    ///
+    /// let relative = RelativePath::try_new("test.txt").unwrap();
+    /// let p: &Path = relative.cast();
+    /// assert_eq!(p, relative);
+    /// ```
+    #[inline]
+    pub fn cast<To>(&self) -> &Path<To>
+    where
+        To: PathForm,
+        Form: PathCast<To>,
+    {
+        Path::new_unchecked(self)
+    }
+
+    /// Returns a reference to a path with its form as [`Any`].
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::{Path, RelativePath};
+    ///
+    /// let p = RelativePath::try_new("test.txt").unwrap();
+    /// assert_eq!(Path::new("test.txt"), p.as_any());
+    /// ```
+    #[inline]
+    pub fn as_any(&self) -> &Path {
+        Path::new_unchecked(self)
+    }
+}
+
+impl Path {
+    /// Create a new [`Path`] by wrapping a string slice.
+    ///
+    /// This is a cost-free conversion.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::Path;
+    ///
+    /// Path::new("foo.txt");
+    /// ```
+    ///
+    /// You can create [`Path`]s from [`String`]s, or even other [`Path`]s:
+    ///
+    /// ```
+    /// use nu_path::Path;
+    ///
+    /// let string = String::from("foo.txt");
+    /// let from_string = Path::new(&string);
+    /// let from_path = Path::new(&from_string);
+    /// assert_eq!(from_string, from_path);
+    /// ```
+    #[inline]
+    pub fn new<P: AsRef<OsStr> + ?Sized>(path: &P) -> &Self {
+        Self::new_unchecked(path)
+    }
+
+    /// Returns a mutable reference to the underlying [`OsStr`] slice.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::{Path, PathBuf};
+    ///
+    /// let mut path = PathBuf::from("Foo.TXT");
+    ///
+    /// assert_ne!(path, Path::new("foo.txt"));
+    ///
+    /// path.as_mut_os_str().make_ascii_lowercase();
+    /// assert_eq!(path, Path::new("foo.txt"));
+    /// ```
+    #[must_use]
+    #[inline]
+    pub fn as_mut_os_str(&mut self) -> &mut OsStr {
+        self.inner.as_mut_os_str()
+    }
+
+    /// Returns `true` if the [`Path`] is absolute, i.e., if it is independent of
+    /// the current directory.
+    ///
+    /// * On Unix, a path is absolute if it starts with the root,
+    /// so [`is_absolute`](Path::is_absolute) and [`has_root`](Path::has_root) are equivalent.
+    ///
+    /// * On Windows, a path is absolute if it has a prefix and starts with the root:
+    /// `c:\windows` is absolute, while `c:temp` and `\temp` are not.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::Path;
+    ///
+    /// assert!(!Path::new("foo.txt").is_absolute());
+    /// ```
+    #[must_use]
+    #[inline]
+    pub fn is_absolute(&self) -> bool {
+        self.inner.is_absolute()
+    }
+
+    // Returns `true` if the [`Path`] is relative, i.e., not absolute.
+    ///
+    /// See [`is_absolute`](Path::is_absolute)'s documentation for more details.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::Path;
+    ///
+    /// assert!(Path::new("foo.txt").is_relative());
+    /// ```
+    #[must_use]
+    #[inline]
+    pub fn is_relative(&self) -> bool {
+        self.inner.is_relative()
+    }
+
+    /// Returns an `Ok` [`AbsolutePath`] if the [`Path`] is absolute.
+    /// Otherwise, returns an `Err` [`RelativePath`].
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::Path;
+    ///
+    /// assert!(Path::new("test.txt").try_absolute().is_err());
+    /// ```
+    #[inline]
+    pub fn try_absolute(&self) -> Result<&AbsolutePath, &RelativePath> {
+        if self.is_absolute() {
+            Ok(AbsolutePath::new_unchecked(&self.inner))
+        } else {
+            Err(RelativePath::new_unchecked(&self.inner))
+        }
+    }
+
+    /// Returns an `Ok` [`RelativePath`] if the [`Path`] is relative.
+    /// Otherwise, returns an `Err` [`AbsolutePath`].
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::Path;
+    ///
+    /// assert!(Path::new("test.txt").try_relative().is_ok());
+    /// ```
+    #[inline]
+    pub fn try_relative(&self) -> Result<&RelativePath, &AbsolutePath> {
+        if self.is_relative() {
+            Ok(RelativePath::new_unchecked(&self.inner))
+        } else {
+            Err(AbsolutePath::new_unchecked(&self.inner))
+        }
+    }
+}
+
+impl<Form: PathJoin> Path<Form> {
+    /// Creates an owned [`PathBuf`] with `path` adjoined to `self`.
+    ///
+    /// If `path` is absolute, it replaces the current path.
+    ///
+    /// See [`PathBuf::push`] for more details on what it means to adjoin a path.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::{Path, PathBuf};
+    ///
+    /// assert_eq!(Path::new("/etc").join("passwd"), PathBuf::from("/etc/passwd"));
+    /// assert_eq!(Path::new("/etc").join("/bin/sh"), PathBuf::from("/bin/sh"));
+    /// ```
+    #[must_use]
+    #[inline]
+    pub fn join(&self, path: impl AsRef<Path>) -> PathBuf<Form::Output> {
+        PathBuf::new_unchecked(self.inner.join(&path.as_ref().inner))
+    }
+}
+
+impl<Form: PathSet> Path<Form> {
+    /// Creates an owned [`PathBuf`] like `self` but with the given file name.
+    ///
+    /// See [`PathBuf::set_file_name`] for more details.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::{Path, PathBuf};
+    ///
+    /// let path = Path::new("/tmp/foo.png");
+    /// assert_eq!(path.with_file_name("bar"), PathBuf::from("/tmp/bar"));
+    /// assert_eq!(path.with_file_name("bar.txt"), PathBuf::from("/tmp/bar.txt"));
+    ///
+    /// let path = Path::new("/tmp");
+    /// assert_eq!(path.with_file_name("var"), PathBuf::from("/var"));
+    /// ```
+    #[inline]
+    pub fn with_file_name(&self, file_name: impl AsRef<OsStr>) -> PathBuf<Form> {
+        PathBuf::new_unchecked(self.inner.with_file_name(file_name))
+    }
+
+    /// Creates an owned [`PathBuf`] like `self` but with the given extension.
+    ///
+    /// See [`PathBuf::set_extension`] for more details.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::{Path, PathBuf};
+    ///
+    /// let path = Path::new("foo.rs");
+    /// assert_eq!(path.with_extension("txt"), PathBuf::from("foo.txt"));
+    ///
+    /// let path = Path::new("foo.tar.gz");
+    /// assert_eq!(path.with_extension(""), PathBuf::from("foo.tar"));
+    /// assert_eq!(path.with_extension("xz"), PathBuf::from("foo.tar.xz"));
+    /// assert_eq!(path.with_extension("").with_extension("txt"), PathBuf::from("foo.txt"));
+    /// ```
+    #[inline]
+    pub fn with_extension(&self, extension: impl AsRef<OsStr>) -> PathBuf<Form> {
+        PathBuf::new_unchecked(self.inner.with_extension(extension))
+    }
+}
+
+impl<Form: MaybeRelative> Path<Form> {
+    /// Returns the, potentially relative, underlying [`std::path::Path`].
+    ///
+    /// # Note
+    ///
+    /// Caution should be taken when using this function. Nushell keeps track of an emulated current
+    /// working directory, and using the [`std::path::Path`] returned from this method will likely
+    /// use [`std::env::current_dir`] to resolve the path instead of using the emulated current
+    /// working directory.
+    ///
+    /// Instead, you should probably join this path onto the emulated current working directory.
+    /// Any [`AbsolutePath`] or [`CanonicalPath`] will also suffice.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::Path;
+    ///
+    /// let p = Path::new("test.txt");
+    /// assert_eq!(std::path::Path::new("test.txt"), p.as_relative_std_path());
+    /// ```
+    #[inline]
+    pub fn as_relative_std_path(&self) -> &std::path::Path {
+        &self.inner
+    }
+
+    // Returns `true` if the [`Path`] has a root.
+    ///
+    /// * On Unix, a path has a root if it begins with `/`.
+    ///
+    /// * On Windows, a path has a root if it:
+    ///     * has no prefix and begins with a separator, e.g., `\windows`
+    ///     * has a prefix followed by a separator, e.g., `c:\windows` but not `c:windows`
+    ///     * has any non-disk prefix, e.g., `\\server\share`
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::Path;
+    ///
+    /// assert!(Path::new("/etc/passwd").has_root());
+    /// ```
+    #[must_use]
+    #[inline]
+    pub fn has_root(&self) -> bool {
+        self.inner.has_root()
+    }
+}
+
+impl<Form: IsAbsolute> Path<Form> {
+    /// Returns the underlying [`std::path::Path`].
+    ///
+    /// # Examples
+    ///
+    #[cfg_attr(not(windows), doc = "```")]
+    #[cfg_attr(windows, doc = "```no_run")]
+    /// use nu_path::AbsolutePath;
+    ///
+    /// let p = AbsolutePath::try_new("/test").unwrap();
+    /// assert_eq!(std::path::Path::new("/test"), p.as_std_path());
+    /// ```
+    #[inline]
+    pub fn as_std_path(&self) -> &std::path::Path {
+        &self.inner
+    }
+
+    /// Converts a [`Path`] to an owned [`std::path::PathBuf`].
+    ///
+    /// # Examples
+    ///
+    #[cfg_attr(not(windows), doc = "```")]
+    #[cfg_attr(windows, doc = "```no_run")]
+    /// use nu_path::AbsolutePath;
+    ///
+    /// let path = AbsolutePath::try_new("/foo").unwrap();
+    /// assert_eq!(path.to_std_path_buf(), std::path::PathBuf::from("/foo"));
+    /// ```
+    #[inline]
+    pub fn to_std_path_buf(&self) -> std::path::PathBuf {
+        self.inner.to_path_buf()
+    }
+
+    /// Queries the file system to get information about a file, directory, etc.
+    ///
+    /// This function will traverse symbolic links to query information about the destination file.
+    ///
+    /// This is an alias to [`std::fs::metadata`].
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use nu_path::AbsolutePath;
+    ///
+    /// let path = AbsolutePath::try_new("/Minas/tirith").unwrap();
+    /// let metadata = path.metadata().expect("metadata call failed");
+    /// println!("{:?}", metadata.file_type());
+    /// ```
+    #[inline]
+    pub fn metadata(&self) -> io::Result<fs::Metadata> {
+        self.inner.metadata()
+    }
+
+    /// Returns an iterator over the entries within a directory.
+    ///
+    /// The iterator will yield instances of <code>[io::Result]<[fs::DirEntry]></code>.
+    /// New errors may be encountered after an iterator is initially constructed.
+    ///
+    /// This is an alias to [`std::fs::read_dir`].
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use nu_path::AbsolutePath;
+    ///
+    /// let path = AbsolutePath::try_new("/laputa").unwrap();
+    /// for entry in path.read_dir().expect("read_dir call failed") {
+    ///     if let Ok(entry) = entry {
+    ///         println!("{:?}", entry.path());
+    ///     }
+    /// }
+    /// ```
+    #[inline]
+    pub fn read_dir(&self) -> io::Result<fs::ReadDir> {
+        self.inner.read_dir()
+    }
+
+    /// Returns `true` if the path points at an existing entity.
+    ///
+    /// Warning: this method may be error-prone, consider using [`try_exists`](Path::try_exists)
+    /// instead! It also has a risk of introducing time-of-check to time-of-use (TOCTOU) bugs.
+    ///
+    /// This function will traverse symbolic links to query information about the destination file.
+    ///
+    /// If you cannot access the metadata of the file, e.g. because of a permission error
+    /// or broken symbolic links, this will return `false`.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use nu_path::AbsolutePath;
+    ///
+    /// let path = AbsolutePath::try_new("/does_not_exist").unwrap();
+    /// assert!(!path.exists());
+    /// ```
+    #[must_use]
+    #[inline]
+    pub fn exists(&self) -> bool {
+        self.inner.exists()
+    }
+
+    /// Returns `true` if the path exists on disk and is pointing at a regular file.
+    ///
+    /// This function will traverse symbolic links to query information about the destination file.
+    ///
+    /// If you cannot access the metadata of the file, e.g. because of a permission error
+    /// or broken symbolic links, this will return `false`.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use nu_path::AbsolutePath;
+    ///
+    /// let path = AbsolutePath::try_new("/is_a_directory/").unwrap();
+    /// assert_eq!(path.is_file(), false);
+    ///
+    /// let path = AbsolutePath::try_new("/a_file.txt").unwrap();
+    /// assert_eq!(path.is_file(), true);
+    /// ```
+    ///
+    /// # See Also
+    ///
+    /// When the goal is simply to read from (or write to) the source, the most reliable way
+    /// to test the source can be read (or written to) is to open it. Only using `is_file` can
+    /// break workflows like `diff <( prog_a )` on a Unix-like system for example.
+    /// See [`std::fs::File::open`] or [`std::fs::OpenOptions::open`] for more information.
+    #[must_use]
+    #[inline]
+    pub fn is_file(&self) -> bool {
+        self.inner.is_file()
+    }
+
+    /// Returns `true` if the path exists on disk and is pointing at a directory.
+    ///
+    /// This function will traverse symbolic links to query information about the destination file.
+    ///
+    /// If you cannot access the metadata of the file, e.g. because of a permission error
+    /// or broken symbolic links, this will return `false`.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use nu_path::AbsolutePath;
+    ///
+    /// let path = AbsolutePath::try_new("/is_a_directory/").unwrap();
+    /// assert_eq!(path.is_dir(), true);
+    ///
+    /// let path = AbsolutePath::try_new("/a_file.txt").unwrap();
+    /// assert_eq!(path.is_dir(), false);
+    /// ```
+    #[must_use]
+    #[inline]
+    pub fn is_dir(&self) -> bool {
+        self.inner.is_dir()
+    }
+}
+
+impl AbsolutePath {
+    /// Returns the canonical, absolute form of the path with all intermediate components
+    /// normalized and symbolic links resolved.
+    ///
+    /// On Windows, this will also simplify to a winuser path.
+    ///
+    /// This is an alias to [`std::fs::canonicalize`].
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use nu_path::{AbsolutePath, PathBuf};
+    ///
+    /// let path = AbsolutePath::try_new("/foo/test/../test/bar.rs").unwrap();
+    /// assert_eq!(path.canonicalize().unwrap(), PathBuf::from("/foo/test/bar.rs"));
+    /// ```
+    #[cfg(not(windows))]
+    #[inline]
+    pub fn canonicalize(&self) -> io::Result<CanonicalPathBuf> {
+        self.inner
+            .canonicalize()
+            .map(CanonicalPathBuf::new_unchecked)
+    }
+
+    /// Returns the canonical, absolute form of the path with all intermediate components
+    /// normalized and symbolic links resolved.
+    ///
+    /// On Windows, this will also simplify to a winuser path.
+    ///
+    /// This is an alias to [`std::fs::canonicalize`].
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use nu_path::{AbsolutePath, PathBuf};
+    ///
+    /// let path = AbsolutePath::try_new("/foo/test/../test/bar.rs").unwrap();
+    /// assert_eq!(path.canonicalize().unwrap(), PathBuf::from("/foo/test/bar.rs"));
+    /// ```
+    #[cfg(windows)]
+    pub fn canonicalize(&self) -> io::Result<CanonicalPathBuf> {
+        use omnipath::WinPathExt;
+
+        let path = self.inner.canonicalize()?.to_winuser_path()?;
+        Ok(CanonicalPathBuf::new_unchecked(path))
+    }
+
+    /// Reads a symbolic link, returning the file that the link points to.
+    ///
+    /// This is an alias to [`std::fs::read_link`].
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use nu_path::AbsolutePath;
+    ///
+    /// let path = AbsolutePath::try_new("/laputa/sky_castle.rs").unwrap();
+    /// let path_link = path.read_link().expect("read_link call failed");
+    /// ```
+    #[inline]
+    pub fn read_link(&self) -> io::Result<AbsolutePathBuf> {
+        self.inner.read_link().map(PathBuf::new_unchecked)
+    }
+
+    /// Returns `Ok(true)` if the path points at an existing entity.
+    ///
+    /// This function will traverse symbolic links to query information about the destination file.
+    /// In case of broken symbolic links this will return `Ok(false)`.
+    ///
+    /// [`Path::exists`] only checks whether or not a path was both found and readable.
+    /// By contrast, [`try_exists`](Path::try_exists) will return `Ok(true)` or `Ok(false)`,
+    /// respectively, if the path was _verified_ to exist or not exist.
+    /// If its existence can neither be confirmed nor denied, it will propagate an `Err` instead.
+    /// This can be the case if e.g. listing permission is denied on one of the parent directories.
+    ///
+    /// Note that while this avoids some pitfalls of the [`exists`](Path::exists) method,
+    /// it still can not prevent time-of-check to time-of-use (TOCTOU) bugs.
+    /// You should only use it in scenarios where those bugs are not an issue.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use nu_path::AbsolutePath;
+    ///
+    /// let path = AbsolutePath::try_new("/does_not_exist").unwrap();
+    /// assert!(!path.try_exists().unwrap());
+    ///
+    /// let path = AbsolutePath::try_new("/root/secret_file.txt").unwrap();
+    /// assert!(path.try_exists().is_err());
+    /// ```
+    #[inline]
+    pub fn try_exists(&self) -> io::Result<bool> {
+        self.inner.try_exists()
+    }
+
+    /// Returns `true` if the path exists on disk and is pointing at a symbolic link.
+    ///
+    /// This function will not traverse symbolic links.
+    /// In case of a broken symbolic link this will also return true.
+    ///
+    /// If you cannot access the directory containing the file, e.g., because of a permission error,
+    /// this will return false.
+    ///
+    /// # Examples
+    ///
+    #[cfg_attr(unix, doc = "```no_run")]
+    #[cfg_attr(not(unix), doc = "```ignore")]
+    /// use nu_path::AbsolutePath;
+    /// use std::os::unix::fs::symlink;
+    ///
+    /// let link_path = AbsolutePath::try_new("/link").unwrap();
+    /// symlink("/origin_does_not_exist/", link_path).unwrap();
+    /// assert_eq!(link_path.is_symlink(), true);
+    /// assert_eq!(link_path.exists(), false);
+    /// ```
+    #[must_use]
+    #[inline]
+    pub fn is_symlink(&self) -> bool {
+        self.inner.is_symlink()
+    }
+
+    /// Queries the metadata about a file without following symlinks.
+    ///
+    /// This is an alias to [`std::fs::symlink_metadata`].
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use nu_path::AbsolutePath;
+    ///
+    /// let path = AbsolutePath::try_new("/Minas/tirith").unwrap();
+    /// let metadata = path.symlink_metadata().expect("symlink_metadata call failed");
+    /// println!("{:?}", metadata.file_type());
+    /// ```
+    #[inline]
+    pub fn symlink_metadata(&self) -> io::Result<fs::Metadata> {
+        self.inner.symlink_metadata()
+    }
+}
+
+impl CanonicalPath {
+    /// Returns a [`CanonicalPath`] as a [`AbsolutePath`].
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use nu_path::AbsolutePath;
+    ///
+    /// let absolute = AbsolutePath::try_new("/test").unwrap();
+    /// let p = absolute.canonicalize().unwrap();
+    /// assert_eq!(absolute, p.as_absolute());
+    /// ```
+    #[inline]
+    pub fn as_absolute(&self) -> &AbsolutePath {
+        self.cast()
+    }
+}
+
+impl<Form: PathForm> fmt::Debug for Path<Form> {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&self.inner, fmt)
+    }
+}
+
+impl<Form: PathForm> Clone for Box<Path<Form>> {
+    #[inline]
+    fn clone(&self) -> Self {
+        std_box_to_box(self.inner.into())
+    }
+}
+
+impl<Form: PathForm> ToOwned for Path<Form> {
+    type Owned = PathBuf<Form>;
+
+    #[inline]
+    fn to_owned(&self) -> Self::Owned {
+        self.to_path_buf()
+    }
+
+    #[inline]
+    fn clone_into(&self, target: &mut PathBuf<Form>) {
+        self.inner.clone_into(&mut target.inner);
+    }
+}
+
+impl<'a, Form: PathForm> IntoIterator for &'a Path<Form> {
+    type Item = &'a OsStr;
+
+    type IntoIter = std::path::Iter<'a>;
+
+    #[inline]
+    fn into_iter(self) -> Self::IntoIter {
+        self.iter()
+    }
+}
+
+/// An iterator over [`Path`] and its ancestors.
+///
+/// This `struct` is created by the [`ancestors`](Path::ancestors) method on [`Path`].
+/// See its documentation for more.
+///
+/// # Examples
+///
+/// ```
+/// use nu_path::Path;
+///
+/// let path = Path::new("/foo/bar");
+///
+/// for ancestor in path.ancestors() {
+///     println!("{}", ancestor.display());
+/// }
+/// ```
+#[derive(Clone, Copy)]
+pub struct Ancestors<'a, Form: PathForm> {
+    _form: PhantomData<Form>,
+    inner: std::path::Ancestors<'a>,
+}
+
+impl<Form: PathForm> fmt::Debug for Ancestors<'_, Form> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&self.inner, f)
+    }
+}
+
+impl<'a, Form: PathForm> Iterator for Ancestors<'a, Form> {
+    type Item = &'a Path<Form>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.inner.next().map(Path::new_unchecked)
+    }
+}
+
+impl<Form: PathForm> FusedIterator for Ancestors<'_, Form> {}
+
+/// A wrapper around [`std::path::PathBuf`] with extra invariants determined by its `Form`.
+///
+/// The possible path forms are [`Any`], [`Relative`], [`Absolute`], or [`Canonical`].
+/// To learn more, view the documentation on [`PathForm`] or any of the individual forms.
+///
+/// There are also several type aliases available, corresponding to each [`PathForm`]:
+/// - [`RelativePathBuf`] (same as [`PathBuf<Relative>`])
+/// - [`AbsolutePathBuf`] (same as [`PathBuf<Absolute>`])
+/// - [`CanonicalPathBuf`] (same as [`PathBuf<Canonical>`])
+///
+/// If the `Form` is not specified, then it defaults to [`Any`],
+/// so [`PathBuf`] and [`PathBuf<Any>`] are one in the same.
+///
+/// # Examples
+///
+/// To create a [`PathBuf`] with [`Any`] form, you can use the same techniques as when creating
+/// a [`std::path::PathBuf`].
+///
+/// ```
+/// use nu_path::PathBuf;
+///
+/// let path = PathBuf::from(r"C:\windows\system32.dll");
+///
+/// let mut path1 = PathBuf::new();
+/// path1.push(r"C:\");
+/// path1.push("windows");
+/// path1.push("system32");
+/// path1.set_extension("dll");
+///
+/// let path2: PathBuf = [r"C:\", "windows", "system32.dll"].iter().collect();
+///
+/// assert_eq!(path1, path2);
+/// ```
+///
+/// # Converting to [`std::path`] types
+///
+/// [`PathBuf`]s with form [`Any`] cannot be easily referenced as a [`std::path::Path`]
+/// or converted to a [`std::path::PathBuf`] by design.
+/// Other Nushell crates need to account for the emulated current working directory
+/// before passing a path to functions in [`std`] or other third party crates.
+/// You can [`join`](Path::join) a [`Path`] onto an [`AbsolutePath`] or a [`CanonicalPath`].
+/// This will return an [`AbsolutePathBuf`] which can be easily referenced as a [`std::path::Path`].
+/// If you really mean it, you can instead use [`as_relative_std_path`](Path::as_relative_std_path)
+/// or [`into_relative_std_path_buf`](PathBuf::into_relative_std_path_buf)
+/// to get the underlying [`std::path::Path`] or [`std::path::PathBuf`] from a [`PathBuf`].
+/// But this may cause third-party code to use [`std::env::current_dir`] to resolve
+/// the path which is almost always incorrect behavior. Extra care is needed to ensure that this
+/// is not the case after using [`as_relative_std_path`](Path::as_relative_std_path)
+/// or [`into_relative_std_path_buf`](PathBuf::into_relative_std_path_buf).
+#[repr(transparent)]
+pub struct PathBuf<Form: PathForm = Any> {
+    _form: PhantomData<Form>,
+    inner: std::path::PathBuf,
+}
+
+/// A path buf that is strictly relative.
+///
+/// I.e., this path buf is guaranteed to never be absolute.
+///
+/// [`RelativePathBuf`]s cannot be easily referenced as a [`std::path::Path`]
+/// or converted to a [`std::path::PathBuf`] by design.
+/// Other Nushell crates need to account for the emulated current working directory
+/// before passing a path to functions in [`std`] or other third party crates.
+/// You can [`join`](Path::join) a [`RelativePath`] onto an [`AbsolutePath`] or a [`CanonicalPath`].
+/// This will return an [`AbsolutePathBuf`] which can be easily referenced as a [`std::path::Path`].
+/// If you really mean it, you can instead use
+/// [`as_relative_std_path`](RelativePath::as_relative_std_path)
+/// or [`into_relative_std_path_buf`](RelativePathBuf::into_relative_std_path_buf)
+/// to get the underlying [`std::path::Path`] or [`std::path::PathBuf`] from a [`RelativePathBuf`].
+/// But this may cause third-party code to use [`std::env::current_dir`] to resolve
+/// the path which is almost always incorrect behavior. Extra care is needed to ensure that this
+/// is not the case after using [`as_relative_std_path`](RelativePath::as_relative_std_path)
+/// or [`into_relative_std_path_buf`](RelativePathBuf::into_relative_std_path_buf).
+///
+/// # Examples
+///
+/// [`RelativePathBuf`]s can be created by using [`try_into_relative`](PathBuf::try_into_relative)
+/// on a [`PathBuf`] or by using [`to_path_buf`](Path::to_path_buf) on a [`RelativePath`].
+///
+/// ```
+/// use nu_path::{PathBuf, RelativePath, RelativePathBuf};
+///
+/// let path_buf = PathBuf::from("foo.txt");
+/// let path_buf = path_buf.try_into_relative().unwrap();
+///
+/// let path = RelativePath::try_new("foo.txt").unwrap();
+/// let path_buf2 = path.to_path_buf();
+///
+/// assert_eq!(path_buf, path_buf2);
+/// ```
+///
+/// You can also use `RelativePathBuf::try_from` or `try_into`.
+/// This supports attempted conversions from [`Path`] as well as types in [`std::path`].
+///
+/// ```
+/// use nu_path::{Path, RelativePathBuf};
+///
+/// let path1 = RelativePathBuf::try_from("foo.txt").unwrap();
+///
+/// let path2 = Path::new("foo.txt");
+/// let path2 = RelativePathBuf::try_from(path2).unwrap();
+///
+/// let path3 = std::path::PathBuf::from("foo.txt");
+/// let path3: RelativePathBuf = path3.try_into().unwrap();
+///
+/// assert_eq!(path1, path2);
+/// assert_eq!(path2, path3);
+/// ```
+pub type RelativePathBuf = PathBuf<Relative>;
+
+/// A path buf that is strictly absolute.
+///
+/// I.e., this path buf is guaranteed to never be relative.
+///
+/// # Examples
+///
+/// [`AbsolutePathBuf`]s can be created by using [`try_into_absolute`](PathBuf::try_into_absolute)
+/// on a [`PathBuf`] or by using [`to_path_buf`](Path::to_path_buf) on an [`AbsolutePath`].
+///
+#[cfg_attr(not(windows), doc = "```")]
+#[cfg_attr(windows, doc = "```no_run")]
+/// use nu_path::{AbsolutePath, AbsolutePathBuf, PathBuf};
+///
+/// let path_buf1 = PathBuf::from("/foo");
+/// let path_buf1 = path_buf1.try_into_absolute().unwrap();
+///
+/// let path = AbsolutePath::try_new("/foo").unwrap();
+/// let path_buf2 = path.to_path_buf();
+///
+/// assert_eq!(path_buf1, path_buf2);
+/// ```
+///
+/// You can also use `AbsolutePathBuf::try_from` or `try_into`.
+/// This supports attempted conversions from [`Path`] as well as types in [`std::path`].
+///
+#[cfg_attr(not(windows), doc = "```")]
+#[cfg_attr(windows, doc = "```no_run")]
+/// use nu_path::{AbsolutePathBuf, Path};
+///
+/// let path1 = AbsolutePathBuf::try_from("/foo").unwrap();
+///
+/// let path2 = Path::new("/foo");
+/// let path2 = AbsolutePathBuf::try_from(path2).unwrap();
+///
+/// let path3 = std::path::PathBuf::from("/foo");
+/// let path3: AbsolutePathBuf = path3.try_into().unwrap();
+///
+/// assert_eq!(path1, path2);
+/// assert_eq!(path2, path3);
+/// ```
+pub type AbsolutePathBuf = PathBuf<Absolute>;
+
+/// An absolute, canonical path buf.
+///
+/// # Examples
+///
+/// [`CanonicalPathBuf`]s can only be created by using [`canonicalize`](Path::canonicalize) on
+/// an [`AbsolutePath`]. [`CanonicalPathBuf`]s can be converted back to [`AbsolutePathBuf`]s via
+/// [`into_absolute`](CanonicalPathBuf::into_absolute).
+///
+/// ```no_run
+/// use nu_path::AbsolutePathBuf;
+///
+/// let path = AbsolutePathBuf::try_from("/foo").unwrap();
+///
+/// let canonical = path.canonicalize().expect("canonicalization failed");
+///
+/// assert_eq!(path, canonical.into_absolute());
+/// ```
+pub type CanonicalPathBuf = PathBuf<Canonical>;
+
+impl<Form: PathForm> PathBuf<Form> {
+    /// Create a new [`PathBuf`] of any form without validiting invariants.
+    #[inline]
+    pub(crate) fn new_unchecked(buf: std::path::PathBuf) -> Self {
+        debug_assert!(Form::invariants_satisfied(&buf));
+        Self {
+            _form: PhantomData,
+            inner: buf,
+        }
+    }
+
+    /// Coerces to a [`Path`] slice.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::{Path, PathBuf};
+    ///
+    /// let p = PathBuf::from("/test");
+    /// assert_eq!(Path::new("/test"), p.as_path());
+    /// ```
+    #[must_use]
+    #[inline]
+    pub fn as_path(&self) -> &Path<Form> {
+        Path::new_unchecked(&self.inner)
+    }
+
+    /// Truncates `self` to [`self.parent`](Path::parent).
+    ///
+    /// Returns `false` and does nothing if [`self.parent`](Path::parent) is [`None`].
+    /// Otherwise, returns `true`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::{Path, PathBuf};
+    ///
+    /// let mut p = PathBuf::from("/spirited/away.rs");
+    ///
+    /// p.pop();
+    /// assert_eq!(Path::new("/spirited"), p);
+    /// p.pop();
+    /// assert_eq!(Path::new("/"), p);
+    /// ```
+    #[inline]
+    pub fn pop(&mut self) -> bool {
+        self.inner.pop()
+    }
+
+    /// Consumes the [`PathBuf`], returning its internal [`OsString`] storage.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::PathBuf;
+    ///
+    /// let p = PathBuf::from("/the/head");
+    /// let os_str = p.into_os_string();
+    /// ```
+    #[inline]
+    pub fn into_os_string(self) -> OsString {
+        self.inner.into_os_string()
+    }
+
+    /// Converts this [`PathBuf`] into a [boxed](Box) [`Path`].
+    #[inline]
+    pub fn into_boxed_path(self) -> Box<Path<Form>> {
+        std_box_to_box(self.inner.into_boxed_path())
+    }
+
+    /// Returns the [`capacity`](OsString::capacity) of the underlying [`OsString`].
+    #[must_use]
+    #[inline]
+    pub fn capacity(&self) -> usize {
+        self.inner.capacity()
+    }
+
+    /// Invokes [`reserve`](OsString::reserve) on the underlying [`OsString`].
+    #[inline]
+    pub fn reserve(&mut self, additional: usize) {
+        self.inner.reserve(additional)
+    }
+
+    /// Invokes [`try_reserve`](OsString::try_reserve) on the underlying [`OsString`].
+    #[inline]
+    pub fn try_reserve(&mut self, additional: usize) -> Result<(), TryReserveError> {
+        self.inner.try_reserve(additional)
+    }
+
+    /// Invokes [`reserve_exact`](OsString::reserve_exact) on the underlying [`OsString`].
+    #[inline]
+    pub fn reserve_exact(&mut self, additional: usize) {
+        self.inner.reserve_exact(additional)
+    }
+
+    /// Invokes [`try_reserve_exact`](OsString::try_reserve_exact) on the underlying [`OsString`].
+    #[inline]
+    pub fn try_reserve_exact(&mut self, additional: usize) -> Result<(), TryReserveError> {
+        self.inner.try_reserve_exact(additional)
+    }
+
+    /// Invokes [`shrink_to_fit`](OsString::shrink_to_fit) on the underlying [`OsString`].
+    #[inline]
+    pub fn shrink_to_fit(&mut self) {
+        self.inner.shrink_to_fit()
+    }
+
+    /// Invokes [`shrink_to`](OsString::shrink_to) on the underlying [`OsString`].
+    #[inline]
+    pub fn shrink_to(&mut self, min_capacity: usize) {
+        self.inner.shrink_to(min_capacity)
+    }
+
+    /// Consumes a [`PathBuf`], returning it with a different form.
+    ///
+    /// [`PathForm`]s can be converted to one another based on [`PathCast`] implementations.
+    /// Namely, the following form conversions are possible:
+    /// - [`Relative`], [`Absolute`], or [`Canonical`] into [`Any`].
+    /// - [`Canonical`] into [`Absolute`].
+    /// - Any form into itself.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::{PathBuf, RelativePathBuf};
+    ///
+    /// let p = RelativePathBuf::try_from("test.txt").unwrap();
+    /// let p: PathBuf = p.cast_into();
+    /// assert_eq!(PathBuf::from("test.txt"), p);
+    /// ```
+    #[inline]
+    pub fn cast_into<To>(self) -> PathBuf<To>
+    where
+        To: PathForm,
+        Form: PathCast<To>,
+    {
+        PathBuf::new_unchecked(self.inner)
+    }
+
+    /// Consumes a [`PathBuf`], returning it with form [`Any`].
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::{PathBuf, RelativePathBuf};
+    ///
+    /// let p = RelativePathBuf::try_from("test.txt").unwrap();
+    /// assert_eq!(PathBuf::from("test.txt"), p.into_any());
+    /// ```
+    #[inline]
+    pub fn into_any(self) -> PathBuf {
+        PathBuf::new_unchecked(self.inner)
+    }
+}
+
+impl PathBuf {
+    /// Creates an empty [`PathBuf`].
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::PathBuf;
+    ///
+    /// let path = PathBuf::new();
+    /// ```
+    #[must_use]
+    #[inline]
+    pub fn new() -> Self {
+        Self::new_unchecked(std::path::PathBuf::new())
+    }
+
+    /// Creates a new [`PathBuf`] with a given capacity used to create the internal [`OsString`].
+    /// See [`with_capacity`](OsString::with_capacity) defined on [`OsString`].
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::PathBuf;
+    ///
+    /// let mut path = PathBuf::with_capacity(10);
+    /// let capacity = path.capacity();
+    ///
+    /// // This push is done without reallocating
+    /// path.push(r"C:\");
+    ///
+    /// assert_eq!(capacity, path.capacity());
+    /// ```
+    #[inline]
+    #[must_use]
+    pub fn with_capacity(capacity: usize) -> Self {
+        Self::new_unchecked(std::path::PathBuf::with_capacity(capacity))
+    }
+
+    /// Returns a mutable reference to the underlying [`OsString`].
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::{Path, PathBuf};
+    ///
+    /// let mut path = PathBuf::from("/foo");
+    ///
+    /// path.push("bar");
+    /// assert_eq!(path, Path::new("/foo/bar"));
+    ///
+    /// // OsString's `push` does not add a separator.
+    /// path.as_mut_os_string().push("baz");
+    /// assert_eq!(path, Path::new("/foo/barbaz"));
+    /// ```
+    #[must_use]
+    #[inline]
+    pub fn as_mut_os_string(&mut self) -> &mut OsString {
+        self.inner.as_mut_os_string()
+    }
+
+    /// Invokes [`clear`](OsString::clear) on the underlying [`OsString`].
+    #[inline]
+    pub fn clear(&mut self) {
+        self.inner.clear()
+    }
+
+    /// Consumes a [`PathBuf`], returning an `Ok` [`RelativePathBuf`] if the [`PathBuf`]
+    /// is relative. Otherwise, returns the original [`PathBuf`] as an `Err`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::PathBuf;
+    ///
+    /// assert!(PathBuf::from("test.txt").try_into_relative().is_ok());
+    /// ```
+    #[inline]
+    pub fn try_into_relative(self) -> Result<RelativePathBuf, Self> {
+        if self.inner.is_relative() {
+            Ok(PathBuf::new_unchecked(self.inner))
+        } else {
+            Err(self)
+        }
+    }
+
+    /// Consumes a [`PathBuf`], returning an `Ok` [`AbsolutePathBuf`] if the [`PathBuf`]
+    /// is absolute. Otherwise, returns the original [`PathBuf`] as an `Err`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::PathBuf;
+    ///
+    /// assert!(PathBuf::from("test.txt").try_into_absolute().is_err());
+    /// ```
+    #[inline]
+    pub fn try_into_absolute(self) -> Result<AbsolutePathBuf, Self> {
+        if self.inner.is_absolute() {
+            Ok(PathBuf::new_unchecked(self.inner))
+        } else {
+            Err(self)
+        }
+    }
+}
+
+impl<Form: PathPush> PathBuf<Form> {
+    /// Extends `self` with `path`.
+    ///
+    /// If `path` is absolute, it replaces the current path.
+    ///
+    /// On Windows:
+    ///
+    /// * if `path` has a root but no prefix (e.g., `\windows`), it
+    ///   replaces everything except for the prefix (if any) of `self`.
+    /// * if `path` has a prefix but no root, it replaces `self`.
+    /// * if `self` has a verbatim prefix (e.g. `\\?\C:\windows`)
+    ///   and `path` is not empty, the new path is normalized: all references
+    ///   to `.` and `..` are removed.
+    ///
+    /// Consider using [`Path::join`] if you need a new [`PathBuf`] instead of
+    /// using this function on a cloned [`PathBuf`].
+    ///
+    /// # Examples
+    ///
+    /// Pushing a relative path extends the existing path:
+    ///
+    /// ```
+    /// use nu_path::PathBuf;
+    ///
+    /// let mut path = PathBuf::from("/tmp");
+    /// path.push("file.bk");
+    /// assert_eq!(path, PathBuf::from("/tmp/file.bk"));
+    /// ```
+    ///
+    /// Pushing an absolute path replaces the existing path:
+    ///
+    /// ```
+    /// use nu_path::PathBuf;
+    ///
+    /// let mut path = PathBuf::from("/tmp");
+    /// path.push("/etc");
+    /// assert_eq!(path, PathBuf::from("/etc"));
+    /// ```
+    #[inline]
+    pub fn push(&mut self, path: impl AsRef<Path>) {
+        self.inner.push(&path.as_ref().inner)
+    }
+}
+
+impl<Form: PathSet> PathBuf<Form> {
+    /// Updates [`self.file_name`](Path::file_name) to `file_name`.
+    ///
+    /// If [`self.file_name`](Path::file_name) was [`None`],
+    /// this is equivalent to pushing `file_name`.
+    ///
+    /// Otherwise it is equivalent to calling [`pop`](PathBuf::pop) and then pushing `file_name`.
+    /// The new path will be a sibling of the original path.
+    /// (That is, it will have the same parent.)
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::PathBuf;
+    ///
+    /// let mut buf = PathBuf::from("/");
+    /// assert!(buf.file_name() == None);
+    ///
+    /// buf.set_file_name("foo.txt");
+    /// assert!(buf == PathBuf::from("/foo.txt"));
+    /// assert!(buf.file_name().is_some());
+    ///
+    /// buf.set_file_name("bar.txt");
+    /// assert!(buf == PathBuf::from("/bar.txt"));
+    ///
+    /// buf.set_file_name("baz");
+    /// assert!(buf == PathBuf::from("/baz"));
+    /// ```
+    #[inline]
+    pub fn set_file_name(&mut self, file_name: impl AsRef<OsStr>) {
+        self.inner.set_file_name(file_name)
+    }
+
+    /// Updates [`self.extension`](Path::extension) to `Some(extension)` or to [`None`] if
+    /// `extension` is empty.
+    ///
+    /// Returns `false` and does nothing if [`self.file_name`](Path::file_name) is [`None`],
+    /// returns `true` and updates the extension otherwise.
+    ///
+    /// If [`self.extension`](Path::extension) is [`None`], the extension is added; otherwise
+    /// it is replaced.
+    ///
+    /// If `extension` is the empty string, [`self.extension`](Path::extension) will be [`None`]
+    /// afterwards, not `Some("")`.
+    ///
+    /// # Caveats
+    ///
+    /// The new `extension` may contain dots and will be used in its entirety,
+    /// but only the part after the final dot will be reflected in
+    /// [`self.extension`](Path::extension).
+    ///
+    /// If the file stem contains internal dots and `extension` is empty, part of the
+    /// old file stem will be considered the new [`self.extension`](Path::extension).
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::{Path, PathBuf};
+    ///
+    /// let mut p = PathBuf::from("/feel/the");
+    ///
+    /// p.set_extension("force");
+    /// assert_eq!(Path::new("/feel/the.force"), p.as_path());
+    ///
+    /// p.set_extension("dark.side");
+    /// assert_eq!(Path::new("/feel/the.dark.side"), p.as_path());
+    ///
+    /// p.set_extension("cookie");
+    /// assert_eq!(Path::new("/feel/the.dark.cookie"), p.as_path());
+    ///
+    /// p.set_extension("");
+    /// assert_eq!(Path::new("/feel/the.dark"), p.as_path());
+    ///
+    /// p.set_extension("");
+    /// assert_eq!(Path::new("/feel/the"), p.as_path());
+    ///
+    /// p.set_extension("");
+    /// assert_eq!(Path::new("/feel/the"), p.as_path());
+    /// ```
+    #[inline]
+    pub fn set_extension(&mut self, extension: impl AsRef<OsStr>) -> bool {
+        self.inner.set_extension(extension)
+    }
+}
+
+impl<Form: MaybeRelative> PathBuf<Form> {
+    /// Consumes a [`PathBuf`] and returns the, potentially relative,
+    /// underlying [`std::path::PathBuf`].
+    ///
+    /// # Note
+    ///
+    /// Caution should be taken when using this function. Nushell keeps track of an emulated current
+    /// working directory, and using the [`std::path::PathBuf`] returned from this method
+    /// will likely use [`std::env::current_dir`] to resolve the path instead of
+    /// using the emulated current working directory.
+    ///
+    /// Instead, you should probably join this path onto the emulated current working directory.
+    /// Any [`AbsolutePath`] or [`CanonicalPath`] will also suffice.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use nu_path::PathBuf;
+    ///
+    /// let p = PathBuf::from("test.txt");
+    /// assert_eq!(std::path::PathBuf::from("test.txt"), p.into_relative_std_path_buf());
+    /// ```
+    #[inline]
+    pub fn into_relative_std_path_buf(self) -> std::path::PathBuf {
+        self.inner
+    }
+}
+
+impl<Form: IsAbsolute> PathBuf<Form> {
+    /// Consumes a [`PathBuf`] and returns the underlying [`std::path::PathBuf`].
+    ///
+    /// # Examples
+    ///
+    #[cfg_attr(not(windows), doc = "```")]
+    #[cfg_attr(windows, doc = "```no_run")]
+    /// use nu_path::AbsolutePathBuf;
+    ///
+    /// let p = AbsolutePathBuf::try_from("/test").unwrap();
+    /// assert_eq!(std::path::PathBuf::from("/test"), p.into_std_path_buf());
+    /// ```
+    #[inline]
+    pub fn into_std_path_buf(self) -> std::path::PathBuf {
+        self.inner
+    }
+}
+
+impl CanonicalPathBuf {
+    /// Consumes a [`CanonicalPathBuf`] and returns an [`AbsolutePathBuf`].
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use nu_path::AbsolutePathBuf;
+    ///
+    /// let absolute = AbsolutePathBuf::try_from("/test").unwrap();
+    /// let p = absolute.canonicalize().unwrap();
+    /// assert_eq!(absolute, p.into_absolute());
+    /// ```
+    #[inline]
+    pub fn into_absolute(self) -> AbsolutePathBuf {
+        self.cast_into()
+    }
+}
+
+impl Default for PathBuf {
+    #[inline]
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl<Form: PathForm> Clone for PathBuf<Form> {
+    #[inline]
+    fn clone(&self) -> Self {
+        Self {
+            _form: PhantomData,
+            inner: self.inner.clone(),
+        }
+    }
+}
+
+impl<Form: PathForm> fmt::Debug for PathBuf<Form> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&**self, f)
+    }
+}
+
+impl<Form: PathForm> Deref for PathBuf<Form> {
+    type Target = Path<Form>;
+
+    #[inline]
+    fn deref(&self) -> &Self::Target {
+        self.as_path()
+    }
+}
+
+impl DerefMut for PathBuf {
+    #[inline]
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        // Safety: `Path<Form>` is a repr(transparent) wrapper around `std::path::Path`.
+        let path: &mut std::path::Path = &mut self.inner;
+        let ptr = std::ptr::from_mut(path) as *mut Path;
+        unsafe { &mut *ptr }
+    }
+}
+
+impl<From: PathCast<To>, To: PathForm> Borrow<Path<To>> for PathBuf<From> {
+    #[inline]
+    fn borrow(&self) -> &Path<To> {
+        self.cast()
+    }
+}
+
+impl<Form: IsAbsolute> Borrow<std::path::Path> for PathBuf<Form> {
+    #[inline]
+    fn borrow(&self) -> &std::path::Path {
+        self.as_ref()
+    }
+}
+
+impl Borrow<Path> for std::path::PathBuf {
+    #[inline]
+    fn borrow(&self) -> &Path {
+        self.as_ref()
+    }
+}
+
+impl FromStr for PathBuf {
+    type Err = Infallible;
+
+    #[inline]
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Ok(s.into())
+    }
+}
+
+impl FromStr for RelativePathBuf {
+    type Err = TryRelativeError;
+
+    #[inline]
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        s.try_into()
+    }
+}
+
+impl FromStr for AbsolutePathBuf {
+    type Err = TryAbsoluteError;
+
+    #[inline]
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        s.try_into()
+    }
+}
+
+impl<P: AsRef<Path>> Extend<P> for PathBuf {
+    fn extend<T: IntoIterator<Item = P>>(&mut self, iter: T) {
+        for path in iter {
+            self.push(path);
+        }
+    }
+}
+
+impl<P: AsRef<Path>> FromIterator<P> for PathBuf {
+    fn from_iter<T: IntoIterator<Item = P>>(iter: T) -> Self {
+        let mut buf = Self::new_unchecked(std::path::PathBuf::new());
+        buf.extend(iter);
+        buf
+    }
+}
+
+impl<'a, Form: PathForm> IntoIterator for &'a PathBuf<Form> {
+    type Item = &'a OsStr;
+
+    type IntoIter = std::path::Iter<'a>;
+
+    #[inline]
+    fn into_iter(self) -> Self::IntoIter {
+        self.iter()
+    }
+}
+
+#[inline]
+fn box_to_box_unchecked<From: PathForm, To: PathForm>(path: Box<Path<From>>) -> Box<Path<To>> {
+    // Safety: `Path<From>` and `Path<To>` differ only by PhantomData tag.
+    let ptr = Box::into_raw(path) as *mut Path<To>;
+    unsafe { Box::from_raw(ptr) }
+}
+
+#[inline]
+fn std_box_to_box<Form: PathForm>(path: Box<std::path::Path>) -> Box<Path<Form>> {
+    // Safety: `Path<From>` is a repr(transparent) wrapper around `std::path::Path`.
+    let ptr = Box::into_raw(path) as *mut Path<Form>;
+    unsafe { Box::from_raw(ptr) }
+}
+
+#[inline]
+fn std_arc_to_arc<Form: PathForm>(path: Arc<std::path::Path>) -> Arc<Path<Form>> {
+    // Safety: `Path<From>` is a repr(transparent) wrapper around `std::path::Path`.
+    let ptr = Arc::into_raw(path) as *mut Path<Form>;
+    unsafe { Arc::from_raw(ptr) }
+}
+
+#[inline]
+fn std_rc_to_rc<Form: PathForm>(path: Rc<std::path::Path>) -> Rc<Path<Form>> {
+    // Safety: `Path<From>` is a repr(transparent) wrapper around `std::path::Path`.
+    let ptr = Rc::into_raw(path) as *mut Path<Form>;
+    unsafe { Rc::from_raw(ptr) }
+}
+
+/*
+================================================================================
+  AsRef
+================================================================================
+*/
+
+// Here we match all `AsRef` implementations on `std::path::Path` and `std::path::PathBuf`,
+// adding casting variations where possible.
+
+macro_rules! impl_as_ref {
+    ([$($from:ty),* $(,)?] => $to:ty |$self:ident| $cast:block) => {
+        $(
+            impl AsRef<$to> for $from {
+                #[inline]
+                fn as_ref(&$self) -> &$to $cast
+            }
+        )*
+    };
+}
+
+// === To and from crate types ===
+
+impl<From: PathCast<To>, To: PathForm> AsRef<Path<To>> for Path<From> {
+    #[inline]
+    fn as_ref(&self) -> &Path<To> {
+        self.cast()
+    }
+}
+
+impl<From: PathCast<To>, To: PathForm> AsRef<Path<To>> for PathBuf<From> {
+    #[inline]
+    fn as_ref(&self) -> &Path<To> {
+        self.cast()
+    }
+}
+
+impl_as_ref!(
+    [
+        Box<RelativePath>, Box<AbsolutePath>, Box<CanonicalPath>,
+        Cow<'_, RelativePath>, Cow<'_, AbsolutePath>, Cow<'_, CanonicalPath>,
+        Rc<RelativePath>, Rc<AbsolutePath>, Rc<CanonicalPath>,
+        Arc<RelativePath>, Arc<AbsolutePath>, Arc<CanonicalPath>,
+    ]
+    => Path |self| { self.cast() }
+);
+
+impl_as_ref!(
+    [Box<CanonicalPath>, Cow<'_, CanonicalPath>, Rc<CanonicalPath>, Arc<CanonicalPath>]
+    => AbsolutePath |self| { self.cast() }
+);
+
+// === To and from std::path types ===
+
+impl<Form: IsAbsolute> AsRef<std::path::Path> for Path<Form> {
+    #[inline]
+    fn as_ref(&self) -> &std::path::Path {
+        self.as_std_path()
+    }
+}
+
+impl<Form: IsAbsolute> AsRef<std::path::Path> for PathBuf<Form> {
+    #[inline]
+    fn as_ref(&self) -> &std::path::Path {
+        self.as_std_path()
+    }
+}
+
+impl_as_ref!(
+    [std::path::Path, std::path::PathBuf, std::path::Component<'_>]
+    => Path |self| { Path::new(self) }
+);
+
+impl_as_ref!(
+    [Box<std::path::Path>, Cow<'_, std::path::Path>, Rc<std::path::Path>, Arc<std::path::Path>]
+    => Path |self| { Path::new(self.as_os_str()) }
+);
+
+// === To and from string types ===
+
+impl<Form: PathForm> AsRef<OsStr> for Path<Form> {
+    #[inline]
+    fn as_ref(&self) -> &OsStr {
+        self.as_os_str()
+    }
+}
+
+impl<Form: PathForm> AsRef<OsStr> for PathBuf<Form> {
+    #[inline]
+    fn as_ref(&self) -> &OsStr {
+        self.as_os_str()
+    }
+}
+
+impl_as_ref!([OsStr, OsString, Cow<'_, OsStr>, str, String] => Path |self| { Path::new(self) });
+
+/*
+================================================================================
+  From
+================================================================================
+*/
+
+// Here we match all `From` implementations on `std::path::Path` and `std::path::PathBuf`,
+// adding casting variations where possible.
+
+macro_rules! impl_from {
+    ([$($from:ty),* $(,)?] => $to:ty |$value:ident| $convert:block) => {
+        $(
+            impl From<$from> for $to {
+                #[inline]
+                fn from($value: $from) -> Self $convert
+            }
+        )*
+    };
+    (<$form:ident> $from:ty => $to:ty |$value:ident| $convert:block) => {
+        impl<$form: PathForm> From<$from> for $to {
+            #[inline]
+            fn from($value: $from) -> Self $convert
+        }
+    };
+}
+
+macro_rules! impl_into_std {
+    (<$form:ident> $from:ty => [$($to:ty),* $(,)?] |$value:ident| $convert:block) => {
+        $(
+            impl<$form: IsAbsolute> From<$from> for $to {
+                #[inline]
+                fn from($value: $from) -> Self $convert
+            }
+        )*
+    };
+}
+
+// ===== Owned to Owned =====
+
+// === To and from crate types ===
+
+impl_from!([RelativePathBuf, AbsolutePathBuf, CanonicalPathBuf] => PathBuf
+    |buf| { buf.cast_into() }
+);
+impl_from!([CanonicalPathBuf] => AbsolutePathBuf |buf| { buf.cast_into() });
+
+#[inline]
+fn box_to_box<From: PathCast<To>, To: PathForm>(path: Box<Path<From>>) -> Box<Path<To>> {
+    box_to_box_unchecked(path)
+}
+impl_from!([Box<RelativePath>, Box<AbsolutePath>, Box<CanonicalPath>] => Box<Path>
+    |path| { box_to_box(path) }
+);
+impl_from!([Box<CanonicalPath>] => Box<AbsolutePath> |path| { box_to_box(path) });
+
+impl_from!(<Form> PathBuf<Form> => Box<Path<Form>> |buf| { buf.into_boxed_path() });
+impl_from!([RelativePathBuf, AbsolutePathBuf, CanonicalPathBuf] => Box<Path>
+    |buf| { buf.into_boxed_path().into() }
+);
+impl_from!([CanonicalPathBuf] => Box<AbsolutePath> |buf| { buf.into_boxed_path().into() });
+
+impl_from!(<Form> Box<Path<Form>> => PathBuf<Form> |path| { path.into_path_buf() });
+impl_from!([Box<RelativePath>, Box<AbsolutePath>, Box<CanonicalPath>] => PathBuf
+    |path| { path.into_path_buf().into() }
+);
+impl_from!([Box<CanonicalPath>] => AbsolutePathBuf |path| { path.into_path_buf().into() });
+
+impl_from!(<Form> PathBuf<Form> => Cow<'_, Path<Form>> |buf| { Self::Owned(buf) });
+impl_from!([RelativePathBuf, AbsolutePathBuf, CanonicalPathBuf] => Cow<'_, Path>
+    |buf| { Self::Owned(buf.into()) }
+);
+impl_from!([CanonicalPathBuf] => Cow<'_, AbsolutePath> |buf| { Self::Owned(buf.into()) });
+
+impl_from!(<Form> Cow<'_, Path<Form>> => PathBuf<Form> |cow| { cow.into_owned() });
+impl_from!([Cow<'_, RelativePath>, Cow<'_, AbsolutePath>, Cow<'_, CanonicalPath>] => PathBuf
+    |cow| { cow.into_owned().into() }
+);
+impl_from!([Cow<'_, CanonicalPath>] => AbsolutePathBuf |cow| { cow.into_owned().into() });
+
+#[inline]
+fn cow_to_box<From, To>(cow: Cow<'_, From>) -> Box<To>
+where
+    From: ?Sized + ToOwned,
+    for<'a> &'a From: Into<Box<To>>,
+    From::Owned: Into<Box<To>>,
+    To: ?Sized,
+{
+    match cow {
+        Cow::Borrowed(path) => path.into(),
+        Cow::Owned(path) => path.into(),
+    }
+}
+impl_from!(<Form> Cow<'_, Path<Form>> => Box<Path<Form>> |cow| { cow_to_box(cow) });
+impl_from!([Cow<'_, RelativePath>, Cow<'_, AbsolutePath>, Cow<'_, CanonicalPath>] => Box<Path>
+    |cow| { cow_to_box(cow) }
+);
+impl_from!([Cow<'_, CanonicalPath>] => Box<AbsolutePath> |cow| { cow_to_box(cow) });
+
+#[inline]
+fn buf_to_arc<From: PathCast<To>, To: PathForm>(buf: PathBuf<From>) -> Arc<Path<To>> {
+    std_arc_to_arc(buf.inner.into())
+}
+impl_from!(<Form> PathBuf<Form> => Arc<Path<Form>> |buf| { buf_to_arc(buf) });
+impl_from!([RelativePathBuf, AbsolutePathBuf, CanonicalPathBuf] => Arc<Path>
+    |buf| { buf_to_arc(buf) }
+);
+impl_from!([CanonicalPathBuf] => Arc<AbsolutePath> |buf| { buf_to_arc(buf) });
+
+#[inline]
+fn buf_to_rc<From: PathCast<To>, To: PathForm>(buf: PathBuf<From>) -> Rc<Path<To>> {
+    std_rc_to_rc(buf.inner.into())
+}
+impl_from!(<Form> PathBuf<Form> => Rc<Path<Form>> |buf| { buf_to_rc(buf) });
+impl_from!([RelativePathBuf, AbsolutePathBuf, CanonicalPathBuf] => Rc<Path>
+    |buf| { buf_to_rc(buf) }
+);
+impl_from!([CanonicalPathBuf] => Rc<AbsolutePath> |buf| { buf_to_rc(buf) });
+
+// === To and from std::path types ===
+
+impl_into_std!(<Form> PathBuf<Form> => [std::path::PathBuf] |buf| { buf.inner });
+impl_into_std!(
+    <Form> PathBuf<Form> => [
+        Box<std::path::Path>, Cow<'_, std::path::Path>, Arc<std::path::Path>, Rc<std::path::Path>
+    ]
+    |buf| { buf.inner.into() }
+);
+impl_into_std!(<Form> Box<Path<Form>> => [std::path::PathBuf, Box<std::path::Path>]
+    |path| { path.inner.into() }
+);
+
+impl_from!([std::path::PathBuf] => PathBuf |buf| { Self::new_unchecked(buf) });
+impl_from!([Box<std::path::Path>] => PathBuf |path| { Self::new_unchecked(path.into()) });
+impl_from!([Cow<'_, std::path::Path>] => PathBuf |cow| { Self::new_unchecked(cow.into()) });
+
+impl From<Box<std::path::Path>> for Box<Path> {
+    #[inline]
+    fn from(path: Box<std::path::Path>) -> Self {
+        std_box_to_box(path)
+    }
+}
+impl_from!([std::path::PathBuf] => Box<Path> |buf| { buf.into_boxed_path().into() });
+impl_from!([Cow<'_, std::path::Path>] => Box<Path> |cow| { cow_to_box(cow) });
+
+// === To and from string types ===
+
+impl_from!(<Form> PathBuf<Form> => OsString |buf| { buf.inner.into() });
+impl_from!([OsString, String] => PathBuf |s| { Self::new_unchecked(s.into()) });
+
+// ===== Borrowed to Owned =====
+
+// === To and from crate types ===
+// Here we also add casting conversions from `T: impl AsRef<Path<Form>>` to `PathBuf<Form>`.
+
+impl<Source: PathCast<To>, To: PathForm> From<&Path<Source>> for Box<Path<To>> {
+    #[inline]
+    fn from(path: &Path<Source>) -> Self {
+        std_box_to_box(path.inner.into())
+    }
+}
+
+impl<'a, Source: PathCast<To>, To: PathForm> From<&'a Path<Source>> for Cow<'a, Path<To>> {
+    #[inline]
+    fn from(path: &'a Path<Source>) -> Self {
+        path.cast().into()
+    }
+}
+
+impl<'a, Source: PathCast<To>, To: PathForm> From<&'a PathBuf<Source>> for Cow<'a, Path<To>> {
+    #[inline]
+    fn from(buf: &'a PathBuf<Source>) -> Self {
+        buf.cast().into()
+    }
+}
+
+impl<Source: PathCast<To>, To: PathForm> From<&Path<Source>> for Arc<Path<To>> {
+    #[inline]
+    fn from(path: &Path<Source>) -> Self {
+        std_arc_to_arc(path.inner.into())
+    }
+}
+
+impl<Source: PathCast<To>, To: PathForm> From<&Path<Source>> for Rc<Path<To>> {
+    #[inline]
+    fn from(path: &Path<Source>) -> Self {
+        std_rc_to_rc(path.inner.into())
+    }
+}
+
+impl<T: ?Sized + AsRef<RelativePath>> From<&T> for RelativePathBuf {
+    #[inline]
+    fn from(s: &T) -> Self {
+        Self::new_unchecked(s.as_ref().into())
+    }
+}
+
+impl<T: ?Sized + AsRef<AbsolutePath>> From<&T> for AbsolutePathBuf {
+    #[inline]
+    fn from(s: &T) -> Self {
+        Self::new_unchecked(s.as_ref().into())
+    }
+}
+
+impl<T: ?Sized + AsRef<CanonicalPath>> From<&T> for CanonicalPathBuf {
+    #[inline]
+    fn from(s: &T) -> Self {
+        Self::new_unchecked(s.as_ref().into())
+    }
+}
+
+// === To and from std::path types ===
+
+impl_into_std!(
+    <Form> &Path<Form> => [Box<std::path::Path>, Arc<std::path::Path>, Rc<std::path::Path>]
+    |path| { path.inner.into() }
+);
+
+impl<'a, Form: IsAbsolute> From<&'a Path<Form>> for Cow<'a, std::path::Path> {
+    #[inline]
+    fn from(path: &'a Path<Form>) -> Self {
+        path.inner.into()
+    }
+}
+
+impl<'a, Form: IsAbsolute> From<&'a PathBuf<Form>> for Cow<'a, std::path::Path> {
+    #[inline]
+    fn from(buf: &'a PathBuf<Form>) -> Self {
+        Self::Borrowed(buf.as_ref())
+    }
+}
+
+impl_from!([&std::path::Path] => Box<Path> |path| { Path::new(path).into() });
+
+// === To and from string types ===
+
+impl<T: ?Sized + AsRef<OsStr>> From<&T> for PathBuf {
+    #[inline]
+    fn from(s: &T) -> Self {
+        Self::new_unchecked(s.as_ref().into())
+    }
+}
+
+/*
+================================================================================
+  TryFrom
+================================================================================
+*/
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub struct TryRelativeError;
+
+impl fmt::Display for TryRelativeError {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(fmt, "path was not a relative path")
+    }
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub struct TryAbsoluteError;
+
+impl fmt::Display for TryAbsoluteError {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(fmt, "path was not an absolute path")
+    }
+}
+
+// ===== Borrowed to borrowed =====
+// Here we match all `AsRef` implementations on `std::path::Path`.
+
+macro_rules! impl_try_from_borrowed_to_borrowed {
+    ([$($from:ty),* $(,)?], |$value:ident| $convert:block $(,)?) => {
+        $(
+            impl<'a> TryFrom<&'a $from> for &'a RelativePath {
+                type Error = TryRelativeError;
+
+                #[inline]
+                fn try_from($value: &'a $from) -> Result<Self, Self::Error> $convert
+            }
+
+            impl<'a> TryFrom<&'a $from> for &'a AbsolutePath {
+                type Error = TryAbsoluteError;
+
+                #[inline]
+                fn try_from($value: &'a $from) -> Result<Self, Self::Error> $convert
+            }
+        )*
+    };
+}
+
+// === From crate types ===
+
+impl<'a> TryFrom<&'a Path> for &'a RelativePath {
+    type Error = TryRelativeError;
+
+    #[inline]
+    fn try_from(path: &'a Path) -> Result<Self, Self::Error> {
+        path.try_relative().map_err(|_| TryRelativeError)
+    }
+}
+
+impl<'a> TryFrom<&'a Path> for &'a AbsolutePath {
+    type Error = TryAbsoluteError;
+
+    #[inline]
+    fn try_from(path: &'a Path) -> Result<Self, Self::Error> {
+        path.try_absolute().map_err(|_| TryAbsoluteError)
+    }
+}
+
+impl_try_from_borrowed_to_borrowed!([PathBuf], |buf| { Path::new(buf).try_into() });
+
+// === From std::path types ===
+
+impl_try_from_borrowed_to_borrowed!([std::path::Path], |path| { Path::new(path).try_into() });
+impl_try_from_borrowed_to_borrowed!([std::path::PathBuf], |buf| { Path::new(buf).try_into() });
+impl_try_from_borrowed_to_borrowed!([std::path::Component<'_>], |component| {
+    Path::new(component).try_into()
+});
+impl_try_from_borrowed_to_borrowed!([std::path::Components<'_>], |components| {
+    Path::new(components).try_into()
+});
+impl_try_from_borrowed_to_borrowed!([std::path::Iter<'_>], |iter| { Path::new(iter).try_into() });
+
+// === From string types ===
+
+impl_try_from_borrowed_to_borrowed!(
+    [OsStr, OsString, Cow<'_, OsStr>, str, String],
+    |s| { Path::new(s).try_into() },
+);
+
+// ===== Borrowed to Owned =====
+// Here we match all `From<&T>` implementations on `std::path::Path` and `std::path::PathBuf`.
+// Note that to match `From<&T: AsRef<OsStr>>` on `std::path::PathBuf`,
+// we add string conversions and a few others.
+
+macro_rules! impl_try_from_borrowed_to_owned {
+    ([$($from:ty),* $(,)?] => $rel:ty, $abs:ty $(,)?) => {
+        $(
+            impl TryFrom<&$from> for $rel {
+                type Error = TryRelativeError;
+
+                #[inline]
+                fn try_from(path: &$from) -> Result<Self, Self::Error> {
+                    let path: &RelativePath = path.try_into()?;
+                    Ok(path.into())
+                }
+            }
+
+            impl TryFrom<&$from> for $abs {
+                type Error = TryAbsoluteError;
+
+                #[inline]
+                fn try_from(path: &$from) -> Result<Self, Self::Error> {
+                    let path: &AbsolutePath = path.try_into()?;
+                    Ok(path.into())
+                }
+            }
+        )*
+    };
+    (<$life:lifetime> $from:ty => $rel:ty, $abs:ty $(,)?) => {
+        impl<$life> TryFrom<&$life $from> for $rel {
+            type Error = TryRelativeError;
+
+            #[inline]
+            fn try_from(path: &$life $from) -> Result<Self, Self::Error> {
+                let path: &RelativePath = path.try_into()?;
+                Ok(path.into())
+            }
+        }
+
+        impl<$life> TryFrom<&$life $from> for $abs {
+            type Error = TryAbsoluteError;
+
+            #[inline]
+            fn try_from(path: &$life $from) -> Result<Self, Self::Error> {
+                let path: &AbsolutePath = path.try_into()?;
+                Ok(path.into())
+            }
+        }
+    };
+}
+
+// === From crate types ===
+
+impl_try_from_borrowed_to_owned!([Path] => Box<RelativePath>, Box<AbsolutePath>);
+impl_try_from_borrowed_to_owned!(<'a> Path => Cow<'a, RelativePath>, Cow<'a, AbsolutePath>);
+impl_try_from_borrowed_to_owned!([Path] => Arc<RelativePath>, Arc<AbsolutePath>);
+impl_try_from_borrowed_to_owned!([Path] => Rc<RelativePath>, Rc<AbsolutePath>);
+
+impl_try_from_borrowed_to_owned!([Path, PathBuf] => RelativePathBuf, AbsolutePathBuf);
+impl_try_from_borrowed_to_owned!(<'a> PathBuf => Cow<'a, RelativePath>, Cow<'a, AbsolutePath>);
+
+// === From std::path types ===
+
+impl_try_from_borrowed_to_owned!([std::path::Path] => Box<RelativePath>, Box<AbsolutePath>);
+
+impl_try_from_borrowed_to_owned!(
+    [std::path::Path, std::path::PathBuf, std::path::Component<'_>]
+    => RelativePathBuf, AbsolutePathBuf
+);
+
+// === From string types ===
+
+impl_try_from_borrowed_to_owned!(
+    [OsStr, OsString, Cow<'_, OsStr>, str, String] => RelativePathBuf, AbsolutePathBuf
+);
+
+// ===== Owned to Owned =====
+// Here we match all `From<T>` implementations on `std::path::Path` and `std::path::PathBuf`
+// where `T` is an owned type.
+
+// === From crate types ===
+
+impl TryFrom<PathBuf> for RelativePathBuf {
+    type Error = PathBuf;
+
+    #[inline]
+    fn try_from(buf: PathBuf) -> Result<Self, Self::Error> {
+        buf.try_into_relative()
+    }
+}
+
+impl TryFrom<PathBuf> for AbsolutePathBuf {
+    type Error = PathBuf;
+
+    #[inline]
+    fn try_from(buf: PathBuf) -> Result<Self, Self::Error> {
+        buf.try_into_absolute()
+    }
+}
+
+impl TryFrom<Box<Path>> for RelativePathBuf {
+    type Error = Box<Path>;
+
+    #[inline]
+    fn try_from(path: Box<Path>) -> Result<Self, Self::Error> {
+        if path.is_relative() {
+            Ok(Self::new_unchecked(path.inner.into()))
+        } else {
+            Err(path)
+        }
+    }
+}
+
+impl TryFrom<Box<Path>> for AbsolutePathBuf {
+    type Error = Box<Path>;
+
+    #[inline]
+    fn try_from(path: Box<Path>) -> Result<Self, Self::Error> {
+        if path.is_absolute() {
+            Ok(Self::new_unchecked(path.inner.into()))
+        } else {
+            Err(path)
+        }
+    }
+}
+
+impl TryFrom<Box<Path>> for Box<RelativePath> {
+    type Error = Box<Path>;
+
+    #[inline]
+    fn try_from(path: Box<Path>) -> Result<Self, Self::Error> {
+        if path.is_relative() {
+            Ok(box_to_box_unchecked(path))
+        } else {
+            Err(path)
+        }
+    }
+}
+
+impl TryFrom<Box<Path>> for Box<AbsolutePath> {
+    type Error = Box<Path>;
+
+    #[inline]
+    fn try_from(path: Box<Path>) -> Result<Self, Self::Error> {
+        if path.is_absolute() {
+            Ok(box_to_box_unchecked(path))
+        } else {
+            Err(path)
+        }
+    }
+}
+
+impl TryFrom<PathBuf> for Box<RelativePath> {
+    type Error = PathBuf;
+
+    #[inline]
+    fn try_from(buf: PathBuf) -> Result<Self, Self::Error> {
+        RelativePathBuf::try_from(buf).map(Into::into)
+    }
+}
+
+impl TryFrom<PathBuf> for Box<AbsolutePath> {
+    type Error = PathBuf;
+
+    #[inline]
+    fn try_from(buf: PathBuf) -> Result<Self, Self::Error> {
+        AbsolutePathBuf::try_from(buf).map(Into::into)
+    }
+}
+
+impl<'a> TryFrom<Cow<'a, Path>> for RelativePathBuf {
+    type Error = Cow<'a, Path>;
+
+    #[inline]
+    fn try_from(path: Cow<'a, Path>) -> Result<Self, Self::Error> {
+        match path {
+            Cow::Borrowed(path) => Self::try_from(path).map_err(|_| Cow::Borrowed(path)),
+            Cow::Owned(path) => Self::try_from(path).map_err(Cow::Owned),
+        }
+    }
+}
+
+impl<'a> TryFrom<Cow<'a, Path>> for AbsolutePathBuf {
+    type Error = Cow<'a, Path>;
+
+    #[inline]
+    fn try_from(path: Cow<'a, Path>) -> Result<Self, Self::Error> {
+        match path {
+            Cow::Borrowed(path) => Self::try_from(path).map_err(|_| Cow::Borrowed(path)),
+            Cow::Owned(path) => Self::try_from(path).map_err(Cow::Owned),
+        }
+    }
+}
+
+impl<'a> TryFrom<Cow<'a, Path>> for Box<RelativePath> {
+    type Error = Cow<'a, Path>;
+
+    #[inline]
+    fn try_from(path: Cow<'a, Path>) -> Result<Self, Self::Error> {
+        match path {
+            Cow::Borrowed(path) => Box::try_from(path).map_err(|_| Cow::Borrowed(path)),
+            Cow::Owned(path) => Box::try_from(path).map_err(Cow::Owned),
+        }
+    }
+}
+
+impl<'a> TryFrom<Cow<'a, Path>> for Box<AbsolutePath> {
+    type Error = Cow<'a, Path>;
+
+    #[inline]
+    fn try_from(path: Cow<'a, Path>) -> Result<Self, Self::Error> {
+        match path {
+            Cow::Borrowed(path) => Box::try_from(path).map_err(|_| Cow::Borrowed(path)),
+            Cow::Owned(path) => Box::try_from(path).map_err(Cow::Owned),
+        }
+    }
+}
+
+// === From std::path types ===
+
+impl TryFrom<std::path::PathBuf> for RelativePathBuf {
+    type Error = std::path::PathBuf;
+
+    #[inline]
+    fn try_from(buf: std::path::PathBuf) -> Result<Self, Self::Error> {
+        Self::try_from(PathBuf::from(buf)).map_err(|buf| buf.inner)
+    }
+}
+
+impl TryFrom<std::path::PathBuf> for AbsolutePathBuf {
+    type Error = std::path::PathBuf;
+
+    #[inline]
+    fn try_from(buf: std::path::PathBuf) -> Result<Self, Self::Error> {
+        Self::try_from(PathBuf::from(buf)).map_err(|buf| buf.inner)
+    }
+}
+
+impl TryFrom<Box<std::path::Path>> for RelativePathBuf {
+    type Error = Box<std::path::Path>;
+
+    #[inline]
+    fn try_from(path: Box<std::path::Path>) -> Result<Self, Self::Error> {
+        if path.is_relative() {
+            Ok(Self::new_unchecked(path.into()))
+        } else {
+            Err(path)
+        }
+    }
+}
+
+impl TryFrom<Box<std::path::Path>> for AbsolutePathBuf {
+    type Error = Box<std::path::Path>;
+
+    #[inline]
+    fn try_from(path: Box<std::path::Path>) -> Result<Self, Self::Error> {
+        if path.is_absolute() {
+            Ok(Self::new_unchecked(path.into()))
+        } else {
+            Err(path)
+        }
+    }
+}
+
+impl TryFrom<Box<std::path::Path>> for Box<RelativePath> {
+    type Error = Box<std::path::Path>;
+
+    #[inline]
+    fn try_from(path: Box<std::path::Path>) -> Result<Self, Self::Error> {
+        if path.is_relative() {
+            Ok(std_box_to_box(path))
+        } else {
+            Err(path)
+        }
+    }
+}
+
+impl TryFrom<Box<std::path::Path>> for Box<AbsolutePath> {
+    type Error = Box<std::path::Path>;
+
+    #[inline]
+    fn try_from(path: Box<std::path::Path>) -> Result<Self, Self::Error> {
+        if path.is_absolute() {
+            Ok(std_box_to_box(path))
+        } else {
+            Err(path)
+        }
+    }
+}
+
+impl TryFrom<std::path::PathBuf> for Box<RelativePath> {
+    type Error = std::path::PathBuf;
+
+    #[inline]
+    fn try_from(buf: std::path::PathBuf) -> Result<Self, Self::Error> {
+        RelativePathBuf::try_from(buf).map(Into::into)
+    }
+}
+
+impl TryFrom<std::path::PathBuf> for Box<AbsolutePath> {
+    type Error = std::path::PathBuf;
+
+    #[inline]
+    fn try_from(buf: std::path::PathBuf) -> Result<Self, Self::Error> {
+        AbsolutePathBuf::try_from(buf).map(Into::into)
+    }
+}
+
+impl<'a> TryFrom<Cow<'a, std::path::Path>> for RelativePathBuf {
+    type Error = Cow<'a, std::path::Path>;
+
+    #[inline]
+    fn try_from(path: Cow<'a, std::path::Path>) -> Result<Self, Self::Error> {
+        match path {
+            Cow::Borrowed(path) => Self::try_from(path).map_err(|_| Cow::Borrowed(path)),
+            Cow::Owned(path) => Self::try_from(path).map_err(Cow::Owned),
+        }
+    }
+}
+
+impl<'a> TryFrom<Cow<'a, std::path::Path>> for AbsolutePathBuf {
+    type Error = Cow<'a, std::path::Path>;
+
+    #[inline]
+    fn try_from(path: Cow<'a, std::path::Path>) -> Result<Self, Self::Error> {
+        match path {
+            Cow::Borrowed(path) => Self::try_from(path).map_err(|_| Cow::Borrowed(path)),
+            Cow::Owned(path) => Self::try_from(path).map_err(Cow::Owned),
+        }
+    }
+}
+
+impl<'a> TryFrom<Cow<'a, std::path::Path>> for Box<RelativePath> {
+    type Error = Cow<'a, std::path::Path>;
+
+    #[inline]
+    fn try_from(path: Cow<'a, std::path::Path>) -> Result<Self, Self::Error> {
+        match path {
+            Cow::Borrowed(path) => Box::try_from(path).map_err(|_| Cow::Borrowed(path)),
+            Cow::Owned(path) => Box::try_from(path).map_err(Cow::Owned),
+        }
+    }
+}
+
+impl<'a> TryFrom<Cow<'a, std::path::Path>> for Box<AbsolutePath> {
+    type Error = Cow<'a, std::path::Path>;
+
+    #[inline]
+    fn try_from(path: Cow<'a, std::path::Path>) -> Result<Self, Self::Error> {
+        match path {
+            Cow::Borrowed(path) => Box::try_from(path).map_err(|_| Cow::Borrowed(path)),
+            Cow::Owned(path) => Box::try_from(path).map_err(Cow::Owned),
+        }
+    }
+}
+
+// === From string types ===
+
+impl TryFrom<OsString> for RelativePathBuf {
+    type Error = OsString;
+
+    #[inline]
+    fn try_from(s: OsString) -> Result<Self, Self::Error> {
+        Self::try_from(PathBuf::from(s)).map_err(|buf| buf.into_os_string())
+    }
+}
+
+impl TryFrom<OsString> for AbsolutePathBuf {
+    type Error = OsString;
+
+    #[inline]
+    fn try_from(s: OsString) -> Result<Self, Self::Error> {
+        Self::try_from(PathBuf::from(s)).map_err(|buf| buf.into_os_string())
+    }
+}
+
+impl TryFrom<String> for RelativePathBuf {
+    type Error = String;
+
+    #[inline]
+    fn try_from(s: String) -> Result<Self, Self::Error> {
+        if Path::new(&s).is_relative() {
+            Ok(Self::new_unchecked(s.into()))
+        } else {
+            Err(s)
+        }
+    }
+}
+
+impl TryFrom<String> for AbsolutePathBuf {
+    type Error = String;
+
+    #[inline]
+    fn try_from(s: String) -> Result<Self, Self::Error> {
+        if Path::new(&s).is_absolute() {
+            Ok(Self::new_unchecked(s.into()))
+        } else {
+            Err(s)
+        }
+    }
+}
+
+/*
+================================================================================
+  PartialEq, Eq, PartialOrd, and Ord
+================================================================================
+*/
+
+// Here we match all `PartialEq` and `PartialOrd` implementations on `std::path::Path`
+// and `std::path::PathBuf`, adding casting variations where possible.
+
+// === Between crate types ===
+
+impl<Form: PathForm> PartialEq for Path<Form> {
+    fn eq(&self, other: &Self) -> bool {
+        self.inner == other.inner
+    }
+}
+
+impl<Form: PathForm> Eq for Path<Form> {}
+
+impl<Form: PathForm> PartialOrd for Path<Form> {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.inner.cmp(&other.inner))
+    }
+}
+
+impl<Form: PathForm> Ord for Path<Form> {
+    fn cmp(&self, other: &Self) -> Ordering {
+        self.inner.cmp(&other.inner)
+    }
+}
+
+impl<Form: PathForm> Hash for Path<Form> {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.inner.hash(state);
+    }
+}
+
+impl<Form: PathForm> PartialEq for PathBuf<Form> {
+    fn eq(&self, other: &Self) -> bool {
+        self.inner == other.inner
+    }
+}
+
+impl<Form: PathForm> Eq for PathBuf<Form> {}
+
+impl<Form: PathForm> PartialOrd for PathBuf<Form> {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.inner.cmp(&other.inner))
+    }
+}
+
+impl<Form: PathForm> Ord for PathBuf<Form> {
+    fn cmp(&self, other: &Self) -> Ordering {
+        self.inner.cmp(&other.inner)
+    }
+}
+
+impl<Form: PathForm> Hash for PathBuf<Form> {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.inner.hash(state);
+    }
+}
+
+macro_rules! impl_cmp {
+    (<$($life:lifetime),*> $lhs:ty, $rhs:ty) => {
+        impl<$($life,)* Form: PathForm> PartialEq<$rhs> for $lhs {
+            #[inline]
+            fn eq(&self, other: &$rhs) -> bool {
+                <Path<Form> as PartialEq>::eq(self, other)
+            }
+        }
+
+        impl<$($life,)* Form: PathForm> PartialEq<$lhs> for $rhs {
+            #[inline]
+            fn eq(&self, other: &$lhs) -> bool {
+                <Path<Form> as PartialEq>::eq(self, other)
+            }
+        }
+
+        impl<$($life,)* Form: PathForm> PartialOrd<$rhs> for $lhs {
+            #[inline]
+            fn partial_cmp(&self, other: &$rhs) -> Option<Ordering> {
+                <Path<Form> as PartialOrd>::partial_cmp(self, other)
+            }
+        }
+
+        impl<$($life,)* Form: PathForm> PartialOrd<$lhs> for $rhs {
+            #[inline]
+            fn partial_cmp(&self, other: &$lhs) -> Option<Ordering> {
+                <Path<Form> as PartialOrd>::partial_cmp(self, other)
+            }
+        }
+    };
+}
+
+impl_cmp!(<> PathBuf<Form>, Path<Form>);
+impl_cmp!(<'a> PathBuf<Form>, &'a Path<Form>);
+impl_cmp!(<'a> Cow<'a, Path<Form>>, Path<Form>);
+impl_cmp!(<'a, 'b> Cow<'a, Path<Form>>, &'b Path<Form>);
+impl_cmp!(<'a> Cow<'a, Path<Form>>, PathBuf<Form>);
+
+macro_rules! impl_cmp_cast {
+    (<$($life:lifetime),*> $lhs:ty, $rhs:ty) => {
+        impl<$($life),*> PartialEq<$rhs> for $lhs {
+            #[inline]
+            fn eq(&self, other: &$rhs) -> bool {
+                <Path as PartialEq>::eq(self.cast(), other.cast())
+            }
+        }
+
+        impl<$($life),*> PartialEq<$lhs> for $rhs {
+            #[inline]
+            fn eq(&self, other: &$lhs) -> bool {
+                <Path as PartialEq>::eq(self.cast(), other.cast())
+            }
+        }
+
+        impl<$($life),*> PartialOrd<$rhs> for $lhs {
+            #[inline]
+            fn partial_cmp(&self, other: &$rhs) -> Option<Ordering> {
+                <Path as PartialOrd>::partial_cmp(self.cast(), other.cast())
+            }
+        }
+
+        impl<$($life),*> PartialOrd<$lhs> for $rhs {
+            #[inline]
+            fn partial_cmp(&self, other: &$lhs) -> Option<Ordering> {
+                <Path as PartialOrd>::partial_cmp(self.cast(), other.cast())
+            }
+        }
+    };
+}
+
+impl_cmp_cast!(<> Path, RelativePath);
+impl_cmp_cast!(<> Path, AbsolutePath);
+impl_cmp_cast!(<> Path, CanonicalPath);
+impl_cmp_cast!(<> AbsolutePath, CanonicalPath);
+impl_cmp_cast!(<> PathBuf, RelativePathBuf);
+impl_cmp_cast!(<> PathBuf, AbsolutePathBuf);
+impl_cmp_cast!(<> PathBuf, CanonicalPathBuf);
+impl_cmp_cast!(<> AbsolutePathBuf, CanonicalPathBuf);
+
+impl_cmp_cast!(<'a> &'a Path, RelativePath);
+impl_cmp_cast!(<'a> &'a Path, AbsolutePath);
+impl_cmp_cast!(<'a> &'a Path, CanonicalPath);
+impl_cmp_cast!(<'a> &'a AbsolutePath, CanonicalPath);
+impl_cmp_cast!(<'a> Path, &'a RelativePath);
+impl_cmp_cast!(<'a> Path, &'a AbsolutePath);
+impl_cmp_cast!(<'a> Path, &'a CanonicalPath);
+impl_cmp_cast!(<'a> AbsolutePath, &'a CanonicalPath);
+
+impl_cmp_cast!(<> PathBuf, RelativePath);
+impl_cmp_cast!(<> PathBuf, AbsolutePath);
+impl_cmp_cast!(<> PathBuf, CanonicalPath);
+impl_cmp_cast!(<> AbsolutePathBuf, CanonicalPath);
+impl_cmp_cast!(<> RelativePathBuf, Path);
+impl_cmp_cast!(<> AbsolutePathBuf, Path);
+impl_cmp_cast!(<> CanonicalPathBuf, Path);
+impl_cmp_cast!(<> CanonicalPathBuf, AbsolutePath);
+
+impl_cmp_cast!(<'a> PathBuf, &'a RelativePath);
+impl_cmp_cast!(<'a> PathBuf, &'a AbsolutePath);
+impl_cmp_cast!(<'a> PathBuf, &'a CanonicalPath);
+impl_cmp_cast!(<'a> AbsolutePathBuf, &'a CanonicalPath);
+impl_cmp_cast!(<'a> RelativePathBuf, &'a Path);
+impl_cmp_cast!(<'a> AbsolutePathBuf, &'a Path);
+impl_cmp_cast!(<'a> CanonicalPathBuf, &'a Path);
+impl_cmp_cast!(<'a> CanonicalPathBuf, &'a AbsolutePath);
+
+impl_cmp_cast!(<'a> Cow<'a, Path>, RelativePath);
+impl_cmp_cast!(<'a> Cow<'a, Path>, AbsolutePath);
+impl_cmp_cast!(<'a> Cow<'a, Path>, CanonicalPath);
+impl_cmp_cast!(<'a> Cow<'a, AbsolutePath>, CanonicalPath);
+impl_cmp_cast!(<'a> Cow<'a, RelativePath>, Path);
+impl_cmp_cast!(<'a> Cow<'a, AbsolutePath>, Path);
+impl_cmp_cast!(<'a> Cow<'a, CanonicalPath>, Path);
+impl_cmp_cast!(<'a> Cow<'a, CanonicalPath>, AbsolutePath);
+
+impl_cmp_cast!(<'a, 'b> Cow<'a, Path>, &'b RelativePath);
+impl_cmp_cast!(<'a, 'b> Cow<'a, Path>, &'b AbsolutePath);
+impl_cmp_cast!(<'a, 'b> Cow<'a, Path>, &'b CanonicalPath);
+impl_cmp_cast!(<'a, 'b> Cow<'a, AbsolutePath>, &'b CanonicalPath);
+impl_cmp_cast!(<'a, 'b> Cow<'a, RelativePath>, &'b Path);
+impl_cmp_cast!(<'a, 'b> Cow<'a, AbsolutePath>, &'b Path);
+impl_cmp_cast!(<'a, 'b> Cow<'a, CanonicalPath>, &'b Path);
+impl_cmp_cast!(<'a, 'b> Cow<'a, CanonicalPath>, &'b AbsolutePath);
+
+impl_cmp_cast!(<'a> Cow<'a, Path>, RelativePathBuf);
+impl_cmp_cast!(<'a> Cow<'a, Path>, AbsolutePathBuf);
+impl_cmp_cast!(<'a> Cow<'a, Path>, CanonicalPathBuf);
+impl_cmp_cast!(<'a> Cow<'a, AbsolutePath>, CanonicalPathBuf);
+impl_cmp_cast!(<'a> Cow<'a, RelativePath>, PathBuf);
+impl_cmp_cast!(<'a> Cow<'a, AbsolutePath>, PathBuf);
+impl_cmp_cast!(<'a> Cow<'a, CanonicalPath>, PathBuf);
+impl_cmp_cast!(<'a> Cow<'a, CanonicalPath>, AbsolutePathBuf);
+
+// === Between std::path types ===
+
+macro_rules! impl_cmp_std {
+    (<$($life:lifetime),*> $lhs:ty, $rhs:ty) => {
+        impl<$($life,)* Form: PathForm> PartialEq<$rhs> for $lhs {
+            #[inline]
+            fn eq(&self, other: &$rhs) -> bool {
+                <Path as PartialEq>::eq(self.as_ref(), other.as_any())
+            }
+        }
+
+        impl<$($life,)* Form: PathForm> PartialEq<$lhs> for $rhs {
+            #[inline]
+            fn eq(&self, other: &$lhs) -> bool {
+                <Path as PartialEq>::eq(self.as_any(), other.as_ref())
+            }
+        }
+
+        impl<$($life,)* Form: PathForm> PartialOrd<$rhs> for $lhs {
+            #[inline]
+            fn partial_cmp(&self, other: &$rhs) -> Option<Ordering> {
+                <Path as PartialOrd>::partial_cmp(self.as_ref(), other.as_any())
+            }
+        }
+
+        impl<$($life,)* Form: PathForm> PartialOrd<$lhs> for $rhs {
+            #[inline]
+            fn partial_cmp(&self, other: &$lhs) -> Option<Ordering> {
+                <Path as PartialOrd>::partial_cmp(self.as_any(), other.as_ref())
+            }
+        }
+    };
+}
+
+impl_cmp_std!(<> std::path::Path, Path<Form>);
+impl_cmp_std!(<> std::path::PathBuf, Path<Form>);
+impl_cmp_std!(<'a> std::path::PathBuf, &'a Path<Form>);
+impl_cmp_std!(<'a> Cow<'a, std::path::Path>, Path<Form>);
+impl_cmp_std!(<'a, 'b> Cow<'a, std::path::Path>, &'b Path<Form>);
+
+impl_cmp_std!(<> std::path::Path, PathBuf<Form>);
+impl_cmp_std!(<'a> &'a std::path::Path, PathBuf<Form>);
+impl_cmp_std!(<> std::path::PathBuf, PathBuf<Form>);
+impl_cmp_std!(<'a> Cow<'a, std::path::Path>, PathBuf<Form>);
+
+// === Between string types ===
+
+impl_cmp_std!(<> OsStr, Path<Form>);
+impl_cmp_std!(<'a> OsStr, &'a Path<Form>);
+impl_cmp_std!(<'a> &'a OsStr, Path<Form>);
+impl_cmp_std!(<'a> Cow<'a, OsStr>, Path<Form>);
+impl_cmp_std!(<'a, 'b> Cow<'b, OsStr>, &'a Path<Form>);
+impl_cmp_std!(<> OsString, Path<Form>);
+impl_cmp_std!(<'a> OsString, &'a Path<Form>);
+
+impl_cmp_std!(<> OsStr, PathBuf<Form>);
+impl_cmp_std!(<'a> &'a OsStr, PathBuf<Form>);
+impl_cmp_std!(<'a> Cow<'a, OsStr>, PathBuf<Form>);
+impl_cmp_std!(<> OsString, PathBuf<Form>);
diff --git a/typos.toml b/typos.toml
index 92fecd5cb6..971aef7c15 100644
--- a/typos.toml
+++ b/typos.toml
@@ -17,6 +17,7 @@ extend-ignore-re = [
     "--find ba\\b",
     "0x\\[ba be\\]",
     "\\)BaR'",
+    "fo�.txt",
 ]
 
 [type.rust.extend-words]

From c5a00ca3f1d7457ce607648ebd216197acd992b2 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Tue, 25 Jun 2024 19:14:15 -0700
Subject: [PATCH 0143/1072] update lock via cargo check to fix ci (#13233)

---
 Cargo.lock | 74 +++++++++++++++++++++++++++---------------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9b8f5273c8..9bb1992e02 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2769,7 +2769,7 @@ dependencies = [
 
 [[package]]
 name = "nu"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "assert_cmd",
  "crossterm",
@@ -2822,7 +2822,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cli"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "chrono",
  "crossterm",
@@ -2857,7 +2857,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-base"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "indexmap",
  "miette",
@@ -2869,7 +2869,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-extra"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "fancy-regex",
  "heck 0.5.0",
@@ -2894,7 +2894,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-lang"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "itertools 0.12.1",
  "nu-engine",
@@ -2906,7 +2906,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-plugin"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "itertools 0.12.1",
  "nu-engine",
@@ -2917,7 +2917,7 @@ dependencies = [
 
 [[package]]
 name = "nu-color-config"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "nu-ansi-term",
  "nu-engine",
@@ -2929,7 +2929,7 @@ dependencies = [
 
 [[package]]
 name = "nu-command"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "alphanumeric-sort",
  "base64 0.22.1",
@@ -3038,7 +3038,7 @@ dependencies = [
 
 [[package]]
 name = "nu-derive-value"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "convert_case",
  "proc-macro-error",
@@ -3049,7 +3049,7 @@ dependencies = [
 
 [[package]]
 name = "nu-engine"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -3059,7 +3059,7 @@ dependencies = [
 
 [[package]]
 name = "nu-explore"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "ansi-str",
  "anyhow",
@@ -3084,14 +3084,14 @@ dependencies = [
 
 [[package]]
 name = "nu-glob"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "doc-comment",
 ]
 
 [[package]]
 name = "nu-json"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "linked-hash-map",
  "num-traits",
@@ -3101,7 +3101,7 @@ dependencies = [
 
 [[package]]
 name = "nu-lsp"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "assert-json-diff",
  "crossbeam-channel",
@@ -3122,7 +3122,7 @@ dependencies = [
 
 [[package]]
 name = "nu-parser"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "bytesize",
  "chrono",
@@ -3138,7 +3138,7 @@ dependencies = [
 
 [[package]]
 name = "nu-path"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "dirs-next",
  "omnipath",
@@ -3147,7 +3147,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "log",
  "nix",
@@ -3162,7 +3162,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-core"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "interprocess",
  "log",
@@ -3176,7 +3176,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-engine"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "log",
  "nu-engine",
@@ -3191,7 +3191,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-protocol"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "bincode",
  "nu-protocol",
@@ -3203,7 +3203,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-test-support"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "nu-ansi-term",
  "nu-cmd-lang",
@@ -3221,7 +3221,7 @@ dependencies = [
 
 [[package]]
 name = "nu-pretty-hex"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "heapless",
  "nu-ansi-term",
@@ -3230,7 +3230,7 @@ dependencies = [
 
 [[package]]
 name = "nu-protocol"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "brotli",
  "byte-unit",
@@ -3263,7 +3263,7 @@ dependencies = [
 
 [[package]]
 name = "nu-std"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "log",
  "miette",
@@ -3274,7 +3274,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "chrono",
  "itertools 0.12.1",
@@ -3292,7 +3292,7 @@ dependencies = [
 
 [[package]]
 name = "nu-table"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "fancy-regex",
  "nu-ansi-term",
@@ -3306,7 +3306,7 @@ dependencies = [
 
 [[package]]
 name = "nu-term-grid"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "nu-utils",
  "unicode-width",
@@ -3314,7 +3314,7 @@ dependencies = [
 
 [[package]]
 name = "nu-test-support"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -3326,7 +3326,7 @@ dependencies = [
 
 [[package]]
 name = "nu-utils"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "crossterm_winapi",
  "log",
@@ -3352,7 +3352,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_example"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "nu-cmd-lang",
  "nu-plugin",
@@ -3362,7 +3362,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_formats"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "eml-parser",
  "ical",
@@ -3375,7 +3375,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_gstat"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "git2",
  "nu-plugin",
@@ -3384,7 +3384,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_inc"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -3393,7 +3393,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_polars"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "chrono",
  "chrono-tz 0.9.0",
@@ -3424,7 +3424,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_query"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "gjson",
  "nu-plugin",
@@ -3436,7 +3436,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_stress_internals"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "interprocess",
  "serde",
@@ -3562,7 +3562,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "nuon"
-version = "0.95.0"
+version = "0.95.1"
 dependencies = [
  "chrono",
  "fancy-regex",

From 38ecb6d3805cbfc7750367435ceeb4c19526f4d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Jun 2024 06:43:46 +0000
Subject: [PATCH 0144/1072] Bump uuid from 1.8.0 to 1.9.1 (#13227)

---
 Cargo.lock                         | 4 ++--
 Cargo.toml                         | 2 +-
 crates/nu_plugin_polars/Cargo.toml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9bb1992e02..a6d3457335 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6493,9 +6493,9 @@ checksum = "425a23c7b7145bc7620c9c445817c37b1f78b6790aee9f208133f3c028975b60"
 
 [[package]]
 name = "uuid"
-version = "1.8.0"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
+checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439"
 dependencies = [
  "getrandom",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index 3e02e7e066..c88eee88ea 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -172,7 +172,7 @@ uu_mv = "0.0.26"
 uu_whoami = "0.0.26"
 uu_uname = "0.0.26"
 uucore = "0.0.26"
-uuid = "1.8.0"
+uuid = "1.9.1"
 v_htmlescape = "0.15.0"
 wax = "0.6"
 which = "6.0.0"
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 77bb84e988..09906732b7 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -36,7 +36,7 @@ polars-ops = { version = "0.40"}
 polars-plan = { version = "0.40", features = ["regex"]}
 polars-utils = { version = "0.40"}
 typetag = "0.2"
-uuid = { version = "1.7", features = ["v4", "serde"] }
+uuid = { version = "1.9", features = ["v4", "serde"] }
 
 [dependencies.polars]
 features = [

From 0fd0e36be87e51f298195791b2627a0fcf5a81ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Jun 2024 14:44:31 +0800
Subject: [PATCH 0145/1072] Bump softprops/action-gh-release from 2.0.5 to
 2.0.6 (#13230)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps
[softprops/action-gh-release](https://github.com/softprops/action-gh-release)
from 2.0.5 to 2.0.6.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/softprops/action-gh-release/releases">softprops/action-gh-release's
releases</a>.</em></p>
<blockquote>
<h2>v2.0.6</h2>
<p>maintenance release with updated dependencies</p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md">softprops/action-gh-release's
changelog</a>.</em></p>
<blockquote>
<h2>2.0.6</h2>
<ul>
<li>maintenance release with updated dependencies</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/softprops/action-gh-release/commit/a74c6b72af54cfa997e81df42d94703d6313a2d0"><code>a74c6b7</code></a>
update changelog</li>
<li><a
href="https://github.com/softprops/action-gh-release/commit/b909f761f0367defeee0c2804db31a81c41dd81e"><code>b909f76</code></a>
update dist/index.js</li>
<li><a
href="https://github.com/softprops/action-gh-release/commit/e49d08fa3245e75166ef8eb8bc9d7521d34658eb"><code>e49d08f</code></a>
chore(deps): bump glob from 8.0.3 to 10.4.2</li>
<li><a
href="https://github.com/softprops/action-gh-release/commit/f12ad255e1c9d5cfd57d1ea9dca3e3001392be35"><code>f12ad25</code></a>
chore(deps): bump <code>@​octokit/plugin-throttling</code> from 4.3.2 to
9.3.0</li>
<li><a
href="https://github.com/softprops/action-gh-release/commit/7039a825a7b0413e21c08b679d39690ada00386f"><code>7039a82</code></a>
chore: release 2.0.6</li>
<li><a
href="https://github.com/softprops/action-gh-release/commit/f9c2b6ca3738015453adef1caa20347e8ac0fa6d"><code>f9c2b6c</code></a>
chore: update deps and run build</li>
<li><a
href="https://github.com/softprops/action-gh-release/commit/73738a629386c54e67bc26a1e14437a5d0b686a0"><code>73738a6</code></a>
chore(deps): bump node dep and <code>@types/node</code></li>
<li><a
href="https://github.com/softprops/action-gh-release/commit/a500a35279e4ba77e64279527fb2a91bfc538dbe"><code>a500a35</code></a>
Bump ts-jest from 29.0.3 to 29.1.4 (<a
href="https://redirect.github.com/softprops/action-gh-release/issues/459">#459</a>)</li>
<li>See full diff in <a
href="https://github.com/softprops/action-gh-release/compare/v2.0.5...v2.0.6">compare
view</a></li>
</ul>
</details>
<br />

<details>
<summary>Most Recent Ignore Conditions Applied to This Pull
Request</summary>

| Dependency Name | Ignore Conditions |
| --- | --- |
| softprops/action-gh-release | [< 0.2, > 0.1.13] |
</details>


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=softprops/action-gh-release&package-manager=github_actions&previous-version=2.0.5&new-version=2.0.6)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/nightly-build.yml | 2 +-
 .github/workflows/release.yml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 9a30cae614..31533cc3d8 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -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.6
       if: ${{ startsWith(github.repository, 'nushell/nightly') }}
       with:
         prerelease: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 31fb1197a3..208acd42b5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -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.6
       if: ${{ startsWith(github.ref, 'refs/tags/') }}
       with:
         draft: true

From b679c2bfa255e6153c5d962cbd541d7a63ba3cab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Jun 2024 14:44:50 +0800
Subject: [PATCH 0146/1072] Bump crate-ci/typos from 1.22.7 to 1.22.9 (#13229)

Bumps [crate-ci/typos](https://github.com/crate-ci/typos) from 1.22.7 to
1.22.9.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/crate-ci/typos/releases">crate-ci/typos's
releases</a>.</em></p>
<blockquote>
<h2>v1.22.9</h2>
<h2>[1.22.9] - 2024-06-22</h2>
<h3>Fixes</h3>
<ul>
<li>Stop correcting <code>reoccurrence</code></li>
</ul>
<h2>v1.22.8</h2>
<h2>[1.22.8] - 2024-06-21</h2>
<h3>Features</h3>
<ul>
<li><em>(action)</em> Add Arm, Mac support</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/crate-ci/typos/blob/master/CHANGELOG.md">crate-ci/typos's
changelog</a>.</em></p>
<blockquote>
<h2>[1.22.9] - 2024-06-22</h2>
<h3>Fixes</h3>
<ul>
<li>Stop correcting <code>reoccurrence</code></li>
</ul>
<h2>[1.22.8] - 2024-06-21</h2>
<h3>Features</h3>
<ul>
<li><em>(action)</em> Add Arm, Mac support</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/crate-ci/typos/commit/c16dc8f5b4a7ad6211464ecf136c69c851e8e83c"><code>c16dc8f</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/c7ac1f94761602f7f979bce303196c06f17a7e4f"><code>c7ac1f9</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/b34586cef4d9a969d670aac4660026c970d4653c"><code>b34586c</code></a>
docs: Update changelog</li>
<li><a
href="https://github.com/crate-ci/typos/commit/ceaed5b649461742cfa8b1520a5dbcd57744e084"><code>ceaed5b</code></a>
Merge pull request <a
href="https://redirect.github.com/crate-ci/typos/issues/1044">#1044</a>
from epage/reoccurrence</li>
<li><a
href="https://github.com/crate-ci/typos/commit/038802dc09dc21d58ade804e41a3ca11feb86dea"><code>038802d</code></a>
fix(dict): Don't correct reoccurrence</li>
<li><a
href="https://github.com/crate-ci/typos/commit/dde47868a506acfe1117a6ea9621271439d8c89b"><code>dde4786</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/85d76b5b17b7238ae8b72247d81affd4de324096"><code>85d76b5</code></a>
docs: Update changelog</li>
<li><a
href="https://github.com/crate-ci/typos/commit/ab67cbb94966e5a12badd739f57fcf6e504d3dd9"><code>ab67cbb</code></a>
Merge pull request <a
href="https://redirect.github.com/crate-ci/typos/issues/1040">#1040</a>
from dyc3/action-support-mac-arm</li>
<li><a
href="https://github.com/crate-ci/typos/commit/89fad3115df0604d9f647bf7f2854fd78bd685ad"><code>89fad31</code></a>
feat[ci]: add support for mac and arm systems to the github action</li>
<li><a
href="https://github.com/crate-ci/typos/commit/ff7654294c173c5021add59503ce68f3817d1ae7"><code>ff76542</code></a>
chore(deps): Update Rust Stable to v1.79 (<a
href="https://redirect.github.com/crate-ci/typos/issues/1035">#1035</a>)</li>
<li>See full diff in <a
href="https://github.com/crate-ci/typos/compare/v1.22.7...v1.22.9">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=crate-ci/typos&package-manager=github_actions&previous-version=1.22.7&new-version=1.22.9)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/typos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index 33e7ac0945..95fc51b970 100644
--- 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.22.9

From 8a7a407627d3c1f82f1cbde7fccfef278eae4a04 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Jun 2024 22:48:11 +0000
Subject: [PATCH 0147/1072] Bump ratatui from 0.26.2 to 0.26.3 (#13228)

---
 Cargo.lock | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a6d3457335..f5c20e482d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -377,7 +377,7 @@ dependencies = [
  "bitflags 2.5.0",
  "cexpr",
  "clang-sys",
- "itertools 0.12.1",
+ "itertools 0.11.0",
  "lazy_static",
  "lazycell",
  "proc-macro2",
@@ -1995,12 +1995,6 @@ dependencies = [
  "unicode-width",
 ]
 
-[[package]]
-name = "indoc"
-version = "2.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
-
 [[package]]
 name = "inotify"
 version = "0.9.6"
@@ -4752,21 +4746,21 @@ dependencies = [
 
 [[package]]
 name = "ratatui"
-version = "0.26.2"
+version = "0.26.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a564a852040e82671dc50a37d88f3aa83bbc690dfc6844cfe7a2591620206a80"
+checksum = "f44c9e68fd46eda15c646fbb85e1040b657a58cdc8c98db1d97a55930d991eef"
 dependencies = [
  "bitflags 2.5.0",
  "cassowary",
  "compact_str",
  "crossterm",
- "indoc",
  "itertools 0.12.1",
  "lru",
  "paste",
  "stability",
  "strum",
  "unicode-segmentation",
+ "unicode-truncate",
  "unicode-width",
 ]
 
@@ -6314,6 +6308,16 @@ version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
+[[package]]
+name = "unicode-truncate"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a5fbabedabe362c618c714dbefda9927b5afc8e2a8102f47f081089a9019226"
+dependencies = [
+ "itertools 0.12.1",
+ "unicode-width",
+]
+
 [[package]]
 name = "unicode-width"
 version = "0.1.12"

From 020f4436d95a62003ec10e0ba65d446840b6046a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Jun 2024 22:48:45 +0000
Subject: [PATCH 0148/1072] Bump shadow-rs from 0.28.0 to 0.29.0 (#13226)

---
 Cargo.lock                    | 4 ++--
 crates/nu-cmd-lang/Cargo.toml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f5c20e482d..cd7fe99800 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5435,9 +5435,9 @@ dependencies = [
 
 [[package]]
 name = "shadow-rs"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d75516bdaee8f640543ad1f6e292448c23ce57143f812c3736ab4b0874383df"
+checksum = "0a600f795d0894cda22235b44eea4b85c2a35b405f65523645ac8e35b306817a"
 dependencies = [
  "const_format",
  "is_debug",
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index 262248e6d9..16ac1b893a 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -18,10 +18,10 @@ nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
 nu-utils = { path = "../nu-utils", version = "0.95.1" }
 
 itertools = { workspace = true }
-shadow-rs = { version = "0.28", default-features = false }
+shadow-rs = { version = "0.29", default-features = false }
 
 [build-dependencies]
-shadow-rs = { version = "0.28", default-features = false }
+shadow-rs = { version = "0.29", default-features = false }
 
 [features]
 mimalloc = []

From 58e8ea6084831cdc3247b848a0004a41c1312375 Mon Sep 17 00:00:00 2001
From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Wed, 26 Jun 2024 18:49:52 -0400
Subject: [PATCH 0149/1072] Update and add ls examples (#13222)

# Description

Based on #13219, added several examples to `ls` doc to demonstrate
recursive directory listings. List of changes in this PR:

* Add example for `ls **/*` to demonstrate recursive listing using glob
pattern
* Add example for `ls ...(glob )`... to demonstrate recursive listing
using glob command
* Remove `-s` from an example where it had no use (since it was based on
the current directory and was not recursive)
* Update the description of `ls -a ~ `... to clarify that it lists the
full path of directories
* Update the description of `ls -as ~ `... (the difference being the
`-s`) to clarify that it lists only the filenames, not paths.


# User-Facing Changes

Help only

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

N/A
---
 crates/nu-command/src/filesystem/ls.rs | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/crates/nu-command/src/filesystem/ls.rs b/crates/nu-command/src/filesystem/ls.rs
index a89cf04ed6..7eee57cfb6 100644
--- a/crates/nu-command/src/filesystem/ls.rs
+++ b/crates/nu-command/src/filesystem/ls.rs
@@ -175,20 +175,32 @@ impl Command for Ls {
             },
             Example {
                 description: "List files and directories whose name do not contain 'bar'",
-                example: "ls -s | where name !~ bar",
+                example: "ls | where name !~ bar",
                 result: None,
             },
             Example {
-                description: "List all dirs in your home directory",
+                description: "List the full path of all dirs in your home directory",
                 example: "ls -a ~ | where type == dir",
                 result: None,
             },
             Example {
                 description:
-                    "List all dirs in your home directory which have not been modified in 7 days",
+                    "List only the names (not paths) of all dirs in your home directory which have not been modified in 7 days",
                 example: "ls -as ~ | where type == dir and modified < ((date now) - 7day)",
                 result: None,
             },
+            Example {
+                description:
+                    "Recursively list all files and subdirectories under the current directory using a glob pattern",
+                example: "ls -a **/*",
+                result: None,
+            },
+            Example {
+                description:
+                    "Recursively list *.rs and *.toml files using the glob command",
+                example: "ls ...(glob **/*.{rs,toml})",
+                result: None,
+            },
             Example {
                 description: "List given paths and show directories themselves",
                 example: "['/path/to/directory' '/path/to/file'] | each {|| ls -D $in } | flatten",

From 198aedb6c2bee1a9ba43b3823381d37f5e5bd607 Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Thu, 27 Jun 2024 00:50:14 +0200
Subject: [PATCH 0150/1072] Use `IntoValue` and `FromValue` derive macros in
 `nu_plugin_example` for example usage (#13220)

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

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

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

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
The derive macros provided by #13031 are very useful for plugin authors.
In this PR I made use of these macros for two commands.

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
This Example usage could be highlighted in the changelog for plugin
authors as this is probably very useful for them.
---
 .../nu_plugin_example/src/commands/config.rs  | 35 +++++++++++++++++--
 crates/nu_plugin_example/src/commands/two.rs  | 22 ++++++++----
 tests/plugins/config.rs                       | 35 +++++--------------
 3 files changed, 56 insertions(+), 36 deletions(-)

diff --git a/crates/nu_plugin_example/src/commands/config.rs b/crates/nu_plugin_example/src/commands/config.rs
index f549bd324f..7716e27537 100644
--- a/crates/nu_plugin_example/src/commands/config.rs
+++ b/crates/nu_plugin_example/src/commands/config.rs
@@ -1,10 +1,37 @@
+use std::path::PathBuf;
+
 use nu_plugin::{EngineInterface, EvaluatedCall, SimplePluginCommand};
-use nu_protocol::{Category, LabeledError, Signature, Type, Value};
+use nu_protocol::{Category, FromValue, LabeledError, Signature, Spanned, Type, Value};
 
 use crate::ExamplePlugin;
 
 pub struct Config;
 
+/// Example config struct.
+///
+/// Using the `FromValue` derive macro, structs can be easily loaded from [`Value`]s,
+/// similar to serde's `Deserialize` macro.
+/// This is handy for plugin configs or piped data.
+/// All fields must implement [`FromValue`].
+/// For [`Option`] fields, they can be omitted in the config.
+///
+/// This example shows that nested and spanned data work too, so you can describe nested
+/// structures and get spans of values wrapped in [`Spanned`].
+/// Since this config uses only `Option`s, no field is required in the config.
+#[allow(dead_code)]
+#[derive(Debug, FromValue)]
+struct PluginConfig {
+    path: Option<Spanned<PathBuf>>,
+    nested: Option<SubConfig>,
+}
+
+#[allow(dead_code)]
+#[derive(Debug, FromValue)]
+struct SubConfig {
+    bool: bool,
+    string: String,
+}
+
 impl SimplePluginCommand for Config {
     type Plugin = ExamplePlugin;
 
@@ -39,7 +66,11 @@ impl SimplePluginCommand for Config {
     ) -> Result<Value, LabeledError> {
         let config = engine.get_plugin_config()?;
         match config {
-            Some(config) => Ok(config.clone()),
+            Some(value) => {
+                let config = PluginConfig::from_value(value.clone())?;
+                println!("got config {config:?}");
+                Ok(value)
+            }
             None => Err(LabeledError::new("No config sent").with_label(
                 "configuration for this plugin was not found in `$env.config.plugins.example`",
                 call.head,
diff --git a/crates/nu_plugin_example/src/commands/two.rs b/crates/nu_plugin_example/src/commands/two.rs
index fcf2bf75ff..e02465e8b7 100644
--- a/crates/nu_plugin_example/src/commands/two.rs
+++ b/crates/nu_plugin_example/src/commands/two.rs
@@ -1,5 +1,5 @@
 use nu_plugin::{EngineInterface, EvaluatedCall, SimplePluginCommand};
-use nu_protocol::{record, Category, LabeledError, Signature, SyntaxShape, Value};
+use nu_protocol::{Category, IntoValue, LabeledError, Signature, SyntaxShape, Value};
 
 use crate::ExamplePlugin;
 
@@ -38,14 +38,22 @@ impl SimplePluginCommand for Two {
     ) -> Result<Value, LabeledError> {
         plugin.print_values(2, call, input)?;
 
+        // Use the IntoValue derive macro and trait to easily design output data.
+        #[derive(IntoValue)]
+        struct Output {
+            one: i64,
+            two: i64,
+            three: i64,
+        }
+
         let vals = (0..10i64)
             .map(|i| {
-                let record = record! {
-                    "one" => Value::int(i, call.head),
-                    "two" => Value::int(2 * i, call.head),
-                    "three" => Value::int(3 * i, call.head),
-                };
-                Value::record(record, call.head)
+                Output {
+                    one: i,
+                    two: 2 * i,
+                    three: 3 * i,
+                }
+                .into_value(call.head)
             })
             .collect();
 
diff --git a/tests/plugins/config.rs b/tests/plugins/config.rs
index 44f2797ceb..b110d2a7fd 100644
--- a/tests/plugins/config.rs
+++ b/tests/plugins/config.rs
@@ -1,27 +1,5 @@
 use nu_test_support::nu_with_plugins;
 
-#[test]
-fn closure() {
-    let actual = nu_with_plugins!(
-        cwd: "tests",
-        plugin: ("nu_plugin_example"),
-        r#"
-            $env.env_value = "value from env"
-
-            $env.config = {
-                plugins: {
-                    example: {||
-                        $env.env_value
-                    }
-                }
-            }
-            example config
-        "#
-    );
-
-    assert!(actual.out.contains("value from env"));
-}
-
 #[test]
 fn none() {
     let actual = nu_with_plugins!(
@@ -34,7 +12,7 @@ fn none() {
 }
 
 #[test]
-fn record() {
+fn some() {
     let actual = nu_with_plugins!(
         cwd: "tests",
         plugin: ("nu_plugin_example"),
@@ -42,8 +20,11 @@ fn record() {
             $env.config = {
                 plugins: {
                     example: {
-                        key1: "value"
-                        key2: "other"
+                        path: "some/path",
+                        nested: {
+                            bool: true,
+                            string: "Hello Example!"
+                        }
                     }
                 }
             }
@@ -51,6 +32,6 @@ fn record() {
         "#
     );
 
-    assert!(actual.out.contains("value"));
-    assert!(actual.out.contains("other"));
+    assert!(actual.out.contains("some/path"));
+    assert!(actual.out.contains("Hello Example!"));
 }

From ee74ec742385e0e6608edf3516f6a0cb97ef863e Mon Sep 17 00:00:00 2001
From: goldfish <37319612+ito-hiroki@users.noreply.github.com>
Date: Thu, 27 Jun 2024 07:51:47 +0900
Subject: [PATCH 0151/1072] Make the subcommands (`from {csv, tsv, ssv}`)
 0-based for consistency (#13209)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

fixed #11678

The sub-commands of from command (`from {csv, tsv, ssv}`) name columns
starting from index 0.
This behaviour is inconsistent with other commands such as `detect
columns`.
This PR makes the subcommands index 0-based.

# User-Facing Changes

The subcommands (`from {csv, tsv, ssv}`) return a table with the columns
starting at index 0 if no header data is passed.

```
~/Development/nushell> "foo bar baz" | from ssv -n -m 1
╭───┬─────────┬─────────┬─────────╮
│ # │ column0 │ column1 │ column2 │
├───┼─────────┼─────────┼─────────┤
│ 0 │ foo     │ bar     │ baz     │
╰───┴─────────┴─────────┴─────────╯
~/Development/nushell> "foo,bar,baz" | from csv -n
╭───┬─────────┬─────────┬─────────╮
│ # │ column0 │ column1 │ column2 │
├───┼─────────┼─────────┼─────────┤
│ 0 │ foo     │ bar     │ baz     │
╰───┴─────────┴─────────┴─────────╯
~/Development/nushell> "foo\tbar\tbaz" | from tsv -n
╭───┬─────────┬─────────┬─────────╮
│ # │ column0 │ column1 │ column2 │
├───┼─────────┼─────────┼─────────┤
│ 0 │ foo     │ bar     │ baz     │
╰───┴─────────┴─────────┴─────────╯
```


# Tests + Formatting

When I ran tests, `commands::touch::change_file_mtime_to_reference`
failed with the following error.
The error also occurs in the master branch, so it's probably unrelated
to these changes.
(maybe a problem with my dev environment)

```
$ toolkit check pr

~~~~~~~~

failures:

---- commands::touch::change_file_mtime_to_reference stdout ----
=== stderr

thread 'commands::touch::change_file_mtime_to_reference' panicked at crates/nu-command/tests/commands/touch.rs:298:9:
assertion `left == right` failed
  left: SystemTime { tv_sec: 1719149697, tv_nsec: 57576929 }
 right: SystemTime { tv_sec: 1719149697, tv_nsec: 78219489 }


failures:
    commands::touch::change_file_mtime_to_reference

test result: FAILED. 1533 passed; 1 failed; 32 ignored; 0 measured; 0 filtered out; finished in 10.87s

error: test failed, to rerun pass `-p nu-command --test main`
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :red_circle: `toolkit test`
- :black_circle: `toolkit test stdlib`
```

# After Submitting

nothing
---
 .../nu-command/src/formats/from/delimited.rs  |  2 +-
 crates/nu-command/src/formats/from/ssv.rs     | 44 +++++++++----------
 .../tests/format_conversions/csv.rs           |  2 +-
 .../tests/format_conversions/ssv.rs           |  4 +-
 .../tests/format_conversions/tsv.rs           |  2 +-
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/crates/nu-command/src/formats/from/delimited.rs b/crates/nu-command/src/formats/from/delimited.rs
index 853f3bd83e..8f84890645 100644
--- a/crates/nu-command/src/formats/from/delimited.rs
+++ b/crates/nu-command/src/formats/from/delimited.rs
@@ -39,7 +39,7 @@ fn from_delimited_stream(
         .from_reader(input_reader);
 
     let headers = if noheaders {
-        (1..=reader
+        (0..reader
             .headers()
             .map_err(|err| from_csv_error(err, span))?
             .len())
diff --git a/crates/nu-command/src/formats/from/ssv.rs b/crates/nu-command/src/formats/from/ssv.rs
index 5efb2a6c3b..1d17dfc69d 100644
--- a/crates/nu-command/src/formats/from/ssv.rs
+++ b/crates/nu-command/src/formats/from/ssv.rs
@@ -52,12 +52,12 @@ impl Command for FromSsv {
                 Value::test_list(
                     vec![
                         Value::test_record(record! {
-                            "column1" => Value::test_string("FOO"),
-                            "column2" => Value::test_string("BAR"),
+                            "column0" => Value::test_string("FOO"),
+                            "column1" => Value::test_string("BAR"),
                         }),
                         Value::test_record(record! {
-                            "column1" => Value::test_string("1"),
-                            "column2" => Value::test_string("2"),
+                            "column0" => Value::test_string("1"),
+                            "column1" => Value::test_string("2"),
                         }),
                     ],
                 )
@@ -170,7 +170,7 @@ fn parse_aligned_columns<'a>(
         let headers: Vec<(String, usize)> = indices
             .iter()
             .enumerate()
-            .map(|(i, position)| (format!("column{}", i + 1), *position))
+            .map(|(i, position)| (format!("column{}", i), *position))
             .collect();
 
         construct(ls.iter().map(|s| s.to_owned()), headers)
@@ -215,7 +215,7 @@ fn parse_separated_columns<'a>(
     let parse_without_headers = |ls: Vec<&str>| {
         let num_columns = ls.iter().map(|r| r.len()).max().unwrap_or(0);
 
-        let headers = (1..=num_columns)
+        let headers = (0..=num_columns)
             .map(|i| format!("column{i}"))
             .collect::<Vec<String>>();
         collect(headers, ls.into_iter(), separator)
@@ -370,9 +370,9 @@ mod tests {
         assert_eq!(
             result,
             vec![
-                vec![owned("column1", "a"), owned("column2", "b")],
-                vec![owned("column1", "1"), owned("column2", "2")],
-                vec![owned("column1", "3"), owned("column2", "4")]
+                vec![owned("column0", "a"), owned("column1", "b")],
+                vec![owned("column0", "1"), owned("column1", "2")],
+                vec![owned("column0", "3"), owned("column1", "4")]
             ]
         );
     }
@@ -484,25 +484,25 @@ mod tests {
             result,
             vec![
                 vec![
-                    owned("column1", "a multi-word value"),
-                    owned("column2", "b"),
-                    owned("column3", ""),
-                    owned("column4", "d"),
-                    owned("column5", "")
-                ],
-                vec![
-                    owned("column1", "1"),
+                    owned("column0", "a multi-word value"),
+                    owned("column1", "b"),
                     owned("column2", ""),
-                    owned("column3", "3-3"),
-                    owned("column4", "4"),
-                    owned("column5", "")
+                    owned("column3", "d"),
+                    owned("column4", "")
                 ],
                 vec![
+                    owned("column0", "1"),
+                    owned("column1", ""),
+                    owned("column2", "3-3"),
+                    owned("column3", "4"),
+                    owned("column4", "")
+                ],
+                vec![
+                    owned("column0", ""),
                     owned("column1", ""),
                     owned("column2", ""),
                     owned("column3", ""),
-                    owned("column4", ""),
-                    owned("column5", "last")
+                    owned("column4", "last")
                 ],
             ]
         );
diff --git a/crates/nu-command/tests/format_conversions/csv.rs b/crates/nu-command/tests/format_conversions/csv.rs
index a9be76d5c3..f10a84b672 100644
--- a/crates/nu-command/tests/format_conversions/csv.rs
+++ b/crates/nu-command/tests/format_conversions/csv.rs
@@ -284,7 +284,7 @@ fn from_csv_text_skipping_headers_to_table() {
             r#"
                 open los_tres_amigos.txt
                 | from csv --noheaders
-                | get column3
+                | get column2
                 | length
             "#
         ));
diff --git a/crates/nu-command/tests/format_conversions/ssv.rs b/crates/nu-command/tests/format_conversions/ssv.rs
index a673b122fb..5a62f796f7 100644
--- a/crates/nu-command/tests/format_conversions/ssv.rs
+++ b/crates/nu-command/tests/format_conversions/ssv.rs
@@ -74,7 +74,7 @@ fn from_ssv_text_treating_first_line_as_data_with_flag() {
                 open oc_get_svc.txt
                 | from ssv --noheaders -a
                 | first
-                | get column1
+                | get column0
             "#
         ));
 
@@ -84,7 +84,7 @@ fn from_ssv_text_treating_first_line_as_data_with_flag() {
                 open oc_get_svc.txt
                 | from ssv --noheaders
                 | first
-                | get column1
+                | get column0
 
             "#
         ));
diff --git a/crates/nu-command/tests/format_conversions/tsv.rs b/crates/nu-command/tests/format_conversions/tsv.rs
index be57c60242..31740ef8d9 100644
--- a/crates/nu-command/tests/format_conversions/tsv.rs
+++ b/crates/nu-command/tests/format_conversions/tsv.rs
@@ -207,7 +207,7 @@ fn from_tsv_text_skipping_headers_to_table() {
             r#"
                 open los_tres_amigos.txt
                 | from tsv --noheaders
-                | get column3
+                | get column2
                 | length
             "#
         ));

From 46ed69ab126015375d5163972ae321715f34874b Mon Sep 17 00:00:00 2001
From: Bruce Weirdan <weirdan@gmail.com>
Date: Thu, 27 Jun 2024 01:49:44 +0200
Subject: [PATCH 0152/1072] Add `char nul` (#13241)

# Description

Adds `char nul`, `char null_byte` and `char zero_byte` named characters.
All of them generate 0x00 byte.

# User-Facing Changes
Three new named characters are added:
 * `char nul` - generates 0x00 byte
 * `char null_byte` - generates 0x00 byte
 * `char zero_byte` - generates 0x00 byte
---
 crates/nu-command/src/strings/char_.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/crates/nu-command/src/strings/char_.rs b/crates/nu-command/src/strings/char_.rs
index dd7b5cf39b..6834134b26 100644
--- a/crates/nu-command/src/strings/char_.rs
+++ b/crates/nu-command/src/strings/char_.rs
@@ -19,6 +19,9 @@ static CHAR_MAP: Lazy<IndexMap<&'static str, String>> = Lazy::new(|| {
         // These are some regular characters that either can't be used or
         // it's just easier to use them like this.
 
+        "nul" => '\x00'.to_string(),                                // nul character, 0x00
+        "null_byte" => '\x00'.to_string(),                          // nul character, 0x00
+        "zero_byte" => '\x00'.to_string(),                          // nul character, 0x00
         // This are the "normal" characters section
         "newline" => '\n'.to_string(),
         "enter" => '\n'.to_string(),

From 0d79b637118ac53f27a829fdfbd930f434a6bf0e Mon Sep 17 00:00:00 2001
From: suimong <bennyyjx@gmail.com>
Date: Thu, 27 Jun 2024 22:46:10 +0800
Subject: [PATCH 0153/1072] Fix find command output bug in the case of taking
 ByteStream input. (#13246)

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

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

fixes #13245

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

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

In addition to addressing #13245, this PR also updated one of the doc
example to the `find` command to document that non-regex mode is case
insensitive, which may surprise some users.

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

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

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

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

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

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
-  :green_circle: `toolkit test`
-  :green_circle: `toolkit test stdlib`


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

---------

Co-authored-by: Ben Yang <ben@ya.ng>
Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
---
 crates/nu-command/src/filters/find.rs    | 11 ++++++-----
 crates/nu-command/tests/commands/find.rs | 10 ++++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/crates/nu-command/src/filters/find.rs b/crates/nu-command/src/filters/find.rs
index dfdef66969..af626c1e75 100644
--- a/crates/nu-command/src/filters/find.rs
+++ b/crates/nu-command/src/filters/find.rs
@@ -69,9 +69,9 @@ impl Command for Find {
                 result: None,
             },
             Example {
-                description: "Search and highlight text for a term in a string",
-                example: r#"'Cargo.toml' | find toml"#,
-                result: Some(Value::test_string("\u{1b}[37mCargo.\u{1b}[0m\u{1b}[41;37mtoml\u{1b}[0m\u{1b}[37m\u{1b}[0m".to_owned())),
+                description: "Search and highlight text for a term in a string. Note that regular search is case insensitive",
+                example: r#"'Cargo.toml' | find cargo"#,
+                result: Some(Value::test_string("\u{1b}[37m\u{1b}[0m\u{1b}[41;37mCargo\u{1b}[0m\u{1b}[37m.toml\u{1b}[0m".to_owned())),
             },
             Example {
                 description: "Search a number or a file size in a list of numbers",
@@ -457,9 +457,10 @@ fn find_with_rest_and_highlight(
 
                 let mut output: Vec<Value> = vec![];
                 for line in lines {
-                    let line = line?.to_lowercase();
+                    let line = line?;
+                    let lower_val = line.to_lowercase();
                     for term in &terms {
-                        if line.contains(term) {
+                        if lower_val.contains(term) {
                             output.push(Value::string(
                                 highlight_search_string(
                                     &line,
diff --git a/crates/nu-command/tests/commands/find.rs b/crates/nu-command/tests/commands/find.rs
index ed811f2a57..89bf2d9f39 100644
--- a/crates/nu-command/tests/commands/find.rs
+++ b/crates/nu-command/tests/commands/find.rs
@@ -17,6 +17,16 @@ fn find_with_list_search_with_char() {
     assert_eq!(actual.out, "[\"\\u001b[37m\\u001b[0m\\u001b[41;37ml\\u001b[0m\\u001b[37marry\\u001b[0m\",\"\\u001b[37mcur\\u001b[0m\\u001b[41;37ml\\u001b[0m\\u001b[37my\\u001b[0m\"]");
 }
 
+#[test]
+fn find_with_bytestream_search_with_char() {
+    let actual =
+        nu!("\"ABC\" | save foo.txt; let res = open foo.txt | find abc; rm foo.txt; $res | get 0");
+    assert_eq!(
+        actual.out,
+        "\u{1b}[37m\u{1b}[0m\u{1b}[41;37mABC\u{1b}[0m\u{1b}[37m\u{1b}[0m"
+    )
+}
+
 #[test]
 fn find_with_list_search_with_number() {
     let actual = nu!("[1 2 3 4 5] | find 3 | get 0");

From 1f1f58135712d4d79344a5284c8cb1a71c4e434d Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Thu, 27 Jun 2024 16:56:56 -0700
Subject: [PATCH 0154/1072] Converted perf function to be a macro. Utilized the
 perf macro within the polars plugin. (#13224)

In this pull request, I converted the `perf` function within `nu_utils`
to a macro. This change facilitates easier usage within plugins by
allowing the use of `env_logger` and setting `RUST_LOG=nu_plugin_polars`
(or another plugin). Without this conversion, the `RUST_LOG` variable
would need to be set to `RUST_LOG=nu_utils::utils`, which is less
intuitive and impossible to narrow the perf results to one plugin.
---
 Cargo.lock                                    |  34 ++-
 crates/nu-cli/src/config_files.rs             |  30 +--
 crates/nu-cli/src/repl.rs                     | 241 +++---------------
 crates/nu-cli/src/util.rs                     |   9 +-
 crates/nu-utils/src/utils.rs                  |  51 ++--
 crates/nu_plugin_polars/Cargo.toml            |   5 +-
 crates/nu_plugin_polars/src/cache/mod.rs      |  23 +-
 .../src/dataframe/eager/open.rs               |  36 +--
 crates/nu_plugin_polars/src/lib.rs            |  46 ----
 crates/nu_plugin_polars/src/main.rs           |   1 +
 src/main.rs                                   |  92 +------
 src/run.rs                                    | 110 +-------
 12 files changed, 154 insertions(+), 524 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cd7fe99800..712986b8b6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1330,6 +1330,16 @@ dependencies = [
  "syn 2.0.60",
 ]
 
+[[package]]
+name = "env_filter"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea"
+dependencies = [
+ "log",
+ "regex",
+]
+
 [[package]]
 name = "env_logger"
 version = "0.8.4"
@@ -1340,6 +1350,19 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "env_logger"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "humantime",
+ "log",
+]
+
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -1906,6 +1929,12 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
 [[package]]
 name = "hyper"
 version = "0.14.28"
@@ -3391,8 +3420,10 @@ version = "0.95.1"
 dependencies = [
  "chrono",
  "chrono-tz 0.9.0",
+ "env_logger 0.11.3",
  "fancy-regex",
  "indexmap",
+ "log",
  "mimalloc",
  "nu-cmd-lang",
  "nu-command",
@@ -3402,6 +3433,7 @@ dependencies = [
  "nu-plugin",
  "nu-plugin-test-support",
  "nu-protocol",
+ "nu-utils",
  "num",
  "polars",
  "polars-arrow",
@@ -4667,7 +4699,7 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
 dependencies = [
- "env_logger",
+ "env_logger 0.8.4",
  "log",
  "rand",
 ]
diff --git a/crates/nu-cli/src/config_files.rs b/crates/nu-cli/src/config_files.rs
index 6cf4735c46..3a02f75e86 100644
--- 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!(),
-        line!(),
-        column!(),
-        engine_state.get_config().use_ansi_coloring,
+        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!(),
-            line!(),
-            column!(),
-            engine_state.get_config().use_ansi_coloring,
+            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!(),
-            line!(),
-            column!(),
-            engine_state.get_config().use_ansi_coloring,
+            engine_state.get_config().use_ansi_coloring
         );
     }
 }
@@ -381,13 +372,10 @@ pub fn migrate_old_plugin_file(engine_state: &EngineState, storage_path: &str) -
         );
     }
 
-    perf(
+    perf!(
         "migrate old plugin file",
         start_time,
-        file!(),
-        line!(),
-        column!(),
-        engine_state.get_config().use_ansi_coloring,
+        engine_state.get_config().use_ansi_coloring
     );
     true
 }
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index d9aef32bbb..251876022a 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -31,7 +31,7 @@ use nu_protocol::{
 };
 use nu_utils::{
     filesystem::{have_permission, PermissionResult},
-    utils::perf,
+    perf,
 };
 use reedline::{
     CursorConfig, CwdAwareHinter, DefaultCompleter, EditCommand, Emacs, FileBackedHistory,
@@ -89,14 +89,7 @@ pub fn evaluate_repl(
     if let Err(e) = convert_env_values(engine_state, &unique_stack) {
         report_error_new(engine_state, &e);
     }
-    perf(
-        "translate env vars",
-        start_time,
-        file!(),
-        line!(),
-        column!(),
-        use_color,
-    );
+    perf!("translate env vars", start_time, use_color);
 
     // seed env vars
     unique_stack.add_env_var(
@@ -225,28 +218,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(
-        "setup reedline",
-        start_time,
-        file!(),
-        line!(),
-        column!(),
-        use_color,
-    );
+    perf!("setup reedline", start_time, 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(
-            "setup history",
-            start_time,
-            file!(),
-            line!(),
-            column!(),
-            use_color,
-        );
+        perf!("setup history", start_time, use_color);
     }
     Ok(line_editor)
 }
@@ -289,28 +268,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(
-        "merge env",
-        start_time,
-        file!(),
-        line!(),
-        column!(),
-        use_color,
-    );
+    perf!("merge env", start_time, use_color);
 
     start_time = std::time::Instant::now();
     // Reset the ctrl-c handler
     if let Some(ctrlc) = &mut engine_state.ctrlc {
         ctrlc.store(false, Ordering::SeqCst);
     }
-    perf(
-        "reset ctrlc",
-        start_time,
-        file!(),
-        line!(),
-        column!(),
-        use_color,
-    );
+    perf!("reset ctrlc", start_time, use_color);
 
     start_time = std::time::Instant::now();
     // Right before we start our prompt and take input from the user,
@@ -320,14 +285,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
             report_error_new(engine_state, &err);
         }
     }
-    perf(
-        "pre-prompt hook",
-        start_time,
-        file!(),
-        line!(),
-        column!(),
-        use_color,
-    );
+    perf!("pre-prompt hook", start_time, use_color);
 
     start_time = std::time::Instant::now();
     // Next, check all the environment variables they ask for
@@ -336,14 +294,7 @@ 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(
-        "env-change hook",
-        start_time,
-        file!(),
-        line!(),
-        column!(),
-        use_color,
-    );
+    perf!("env-change hook", start_time, use_color);
 
     let engine_reference = Arc::new(engine_state.clone());
     let config = engine_state.get_config();
@@ -355,14 +306,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(
-        "get config/cursor config",
-        start_time,
-        file!(),
-        line!(),
-        column!(),
-        use_color,
-    );
+    perf!("get config/cursor config", start_time, use_color);
 
     start_time = std::time::Instant::now();
     // at this line we have cloned the state for the completer and the transient prompt
@@ -394,14 +338,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
         .with_ansi_colors(config.use_ansi_coloring)
         .with_cursor_config(cursor_config);
 
-    perf(
-        "reedline builder",
-        start_time,
-        file!(),
-        line!(),
-        column!(),
-        use_color,
-    );
+    perf!("reedline builder", start_time, use_color);
 
     let style_computer = StyleComputer::from_config(engine_state, &stack_arc);
 
@@ -416,14 +353,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
         line_editor.disable_hints()
     };
 
-    perf(
-        "reedline coloring/style_computer",
-        start_time,
-        file!(),
-        line!(),
-        column!(),
-        use_color,
-    );
+    perf!("reedline coloring/style_computer", start_time, use_color);
 
     start_time = std::time::Instant::now();
     trace!("adding menus");
@@ -433,14 +363,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
             Reedline::create()
         });
 
-    perf(
-        "reedline adding menus",
-        start_time,
-        file!(),
-        line!(),
-        column!(),
-        use_color,
-    );
+    perf!("reedline adding menus", start_time, use_color);
 
     start_time = std::time::Instant::now();
     let buffer_editor = get_editor(engine_state, &stack_arc, Span::unknown());
@@ -457,14 +380,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
         line_editor
     };
 
-    perf(
-        "reedline buffer_editor",
-        start_time,
-        file!(),
-        line!(),
-        column!(),
-        use_color,
-    );
+    perf!("reedline buffer_editor", start_time, use_color);
 
     if let Some(history) = engine_state.history_config() {
         start_time = std::time::Instant::now();
@@ -474,28 +390,14 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
             }
         }
 
-        perf(
-            "sync_history",
-            start_time,
-            file!(),
-            line!(),
-            column!(),
-            use_color,
-        );
+        perf!("sync_history", start_time, 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(
-        "keybindings",
-        start_time,
-        file!(),
-        line!(),
-        column!(),
-        use_color,
-    );
+    perf!("keybindings", start_time, use_color);
 
     start_time = std::time::Instant::now();
     let config = &engine_state.get_config().clone();
@@ -512,14 +414,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
         nu_prompt,
     );
 
-    perf(
-        "update_prompt",
-        start_time,
-        file!(),
-        line!(),
-        column!(),
-        use_color,
-    );
+    perf!("update_prompt", start_time, use_color);
 
     *entry_num += 1;
 
@@ -546,14 +441,7 @@ 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(
-        "line_editor setup",
-        start_time,
-        file!(),
-        line!(),
-        column!(),
-        use_color,
-    );
+    perf!("line_editor setup", start_time, use_color);
 
     let line_editor_input_time = std::time::Instant::now();
     match input {
@@ -590,14 +478,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
                 }
             }
 
-            perf(
-                "pre_execution_hook",
-                start_time,
-                file!(),
-                line!(),
-                column!(),
-                use_color,
-            );
+            perf!("pre_execution_hook", start_time, use_color);
 
             let mut repl = engine_state.repl_state.lock().expect("repl state mutex");
             repl.cursor_pos = line_editor.current_insertion_point();
@@ -612,26 +493,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!(),
-                        line!(),
-                        column!(),
-                        use_color,
+                        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!(),
-                        line!(),
-                        column!(),
-                        use_color,
+                        use_color
                     );
                 }
             } else if shell_integration_osc133 {
@@ -639,13 +514,10 @@ 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!(),
-                    line!(),
-                    column!(),
-                    use_color,
+                    use_color
                 );
             }
 
@@ -769,22 +641,16 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
             );
         }
     }
-    perf(
+    perf!(
         "processing line editor input",
         line_editor_input_time,
-        file!(),
-        line!(),
-        column!(),
-        use_color,
+        use_color
     );
 
-    perf(
+    perf!(
         "time between prompts in line editor loop",
         loop_start_time,
-        file!(),
-        line!(),
-        column!(),
-        use_color,
+        use_color
     );
 
     (true, stack, line_editor)
@@ -1061,14 +927,7 @@ fn run_shell_integration_osc2(
         // ESC]2;stringBEL -- Set window title to string
         run_ansi_sequence(&format!("\x1b]2;{title}\x07"));
 
-        perf(
-            "set title with command osc2",
-            start_time,
-            file!(),
-            line!(),
-            column!(),
-            use_color,
-        );
+        perf!("set title with command osc2", start_time, use_color);
     }
 }
 
@@ -1093,13 +952,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!(),
-            line!(),
-            column!(),
-            use_color,
+            use_color
         );
     }
 }
@@ -1116,13 +972,10 @@ 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!(),
-            line!(),
-            column!(),
-            use_color,
+            use_color
         );
     }
 }
@@ -1142,13 +995,10 @@ 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!(),
-                line!(),
-                column!(),
-                use_color,
+                use_color
             );
         }
     }
@@ -1371,13 +1221,10 @@ fn run_finaliziation_ansi_sequence(
                 shell_integration_osc133,
             ));
 
-            perf(
+            perf!(
                 "post_execute_marker (633;D) ansi escape sequences",
                 start_time,
-                file!(),
-                line!(),
-                column!(),
-                use_color,
+                use_color
             );
         } else if shell_integration_osc133 {
             let start_time = Instant::now();
@@ -1389,13 +1236,10 @@ fn run_finaliziation_ansi_sequence(
                 shell_integration_osc133,
             ));
 
-            perf(
+            perf!(
                 "post_execute_marker (133;D) ansi escape sequences",
                 start_time,
-                file!(),
-                line!(),
-                column!(),
-                use_color,
+                use_color
             );
         }
     } else if shell_integration_osc133 {
@@ -1408,13 +1252,10 @@ fn run_finaliziation_ansi_sequence(
             shell_integration_osc133,
         ));
 
-        perf(
+        perf!(
             "post_execute_marker (133;D) ansi escape sequences",
             start_time,
-            file!(),
-            line!(),
-            column!(),
-            use_color,
+            use_color
         );
     }
 }
diff --git a/crates/nu-cli/src/util.rs b/crates/nu-cli/src/util.rs
index e4912e012f..d3cf73056f 100644
--- 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!(),
-        line!(),
-        column!(),
-        engine_state.get_config().use_ansi_coloring,
+        engine_state.get_config().use_ansi_coloring
     );
 
     exit_code
diff --git a/crates/nu-utils/src/utils.rs b/crates/nu-utils/src/utils.rs
index 7a368f5cf7..8baf674075 100644
--- a/crates/nu-utils/src/utils.rs
+++ b/crates/nu-utils/src/utils.rs
@@ -1,4 +1,3 @@
-use log::info;
 use lscolors::LsColors;
 use std::io::{Result, Write};
 
@@ -393,31 +392,27 @@ pub fn get_ls_colors(lscolors_env_string: Option<String>) -> LsColors {
 }
 
 // Log some performance metrics (green text with yellow timings)
-pub fn perf(
-    msg: &str,
-    dur: std::time::Instant,
-    file: &str,
-    line: u32,
-    column: u32,
-    use_color: bool,
-) {
-    if use_color {
-        info!(
-            "perf: {}:{}:{} \x1b[32m{}\x1b[0m took \x1b[33m{:?}\x1b[0m",
-            file,
-            line,
-            column,
-            msg,
-            dur.elapsed(),
-        );
-    } else {
-        info!(
-            "perf: {}:{}:{} {} took {:?}",
-            file,
-            line,
-            column,
-            msg,
-            dur.elapsed(),
-        );
-    }
+#[macro_export]
+macro_rules! perf {
+    ($msg:expr, $dur:expr, $use_color:expr) => {
+        if $use_color {
+            log::info!(
+                "perf: {}:{}:{} \x1b[32m{}\x1b[0m took \x1b[33m{:?}\x1b[0m",
+                file!(),
+                line!(),
+                column!(),
+                $msg,
+                $dur.elapsed(),
+            );
+        } else {
+            log::info!(
+                "perf: {}:{}:{} {} took {:?}",
+                file!(),
+                line!(),
+                column!(),
+                $msg,
+                $dur.elapsed(),
+            );
+        }
+    };
 }
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 09906732b7..285046381e 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -20,6 +20,7 @@ bench = false
 nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
 nu-plugin = { path = "../nu-plugin", version = "0.95.1" }
 nu-path = { path = "../nu-path", version = "0.95.1" }
+nu-utils = { path = "../nu-utils", version = "0.95.1" }
 
 # Potential dependencies for extras
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
@@ -36,6 +37,8 @@ polars-ops = { version = "0.40"}
 polars-plan = { version = "0.40", features = ["regex"]}
 polars-utils = { version = "0.40"}
 typetag = "0.2"
+env_logger = "0.11.3"
+log.workspace = true
 uuid = { version = "1.9", features = ["v4", "serde"] }
 
 [dependencies.polars]
@@ -78,4 +81,4 @@ nu-engine = { path = "../nu-engine", version = "0.95.1" }
 nu-parser = { path = "../nu-parser", version = "0.95.1" }
 nu-command = { path = "../nu-command", version = "0.95.1" }
 nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.95.1" }
-tempfile.workspace = true
\ No newline at end of file
+tempfile.workspace = true
diff --git a/crates/nu_plugin_polars/src/cache/mod.rs b/crates/nu_plugin_polars/src/cache/mod.rs
index 08a7a9d7f7..a7e566d327 100644
--- a/crates/nu_plugin_polars/src/cache/mod.rs
+++ b/crates/nu_plugin_polars/src/cache/mod.rs
@@ -13,7 +13,9 @@ use nu_plugin::{EngineInterface, PluginCommand};
 use nu_protocol::{LabeledError, ShellError, Span};
 use uuid::Uuid;
 
-use crate::{plugin_debug, values::PolarsPluginObject, EngineWrapper, PolarsPlugin};
+use crate::{values::PolarsPluginObject, EngineWrapper, PolarsPlugin};
+
+use log::debug;
 
 #[derive(Debug, Clone)]
 pub struct CacheValue {
@@ -60,22 +62,16 @@ impl Cache {
 
         let removed = if force || reference_count.unwrap_or_default() < 1 {
             let removed = lock.remove(key);
-            plugin_debug!(
-                engine,
-                "PolarsPlugin: removing {key} from cache: {removed:?}"
-            );
+            debug!("PolarsPlugin: removing {key} from cache: {removed:?}");
             removed
         } else {
-            plugin_debug!(
-                engine,
-                "PolarsPlugin: decrementing reference count for {key}"
-            );
+            debug!("PolarsPlugin: decrementing reference count for {key}");
             None
         };
 
         // Once there are no more entries in the cache
         // we can turn plugin gc back on
-        plugin_debug!(engine, "PolarsPlugin: Cache is empty enabling GC");
+        debug!("PolarsPlugin: Cache is empty enabling GC");
         engine.set_gc_disabled(false).map_err(LabeledError::from)?;
         drop(lock);
         Ok(removed)
@@ -91,14 +87,11 @@ impl Cache {
         span: Span,
     ) -> Result<Option<CacheValue>, ShellError> {
         let mut lock = self.lock()?;
-        plugin_debug!(
-            engine,
-            "PolarsPlugin: Inserting {uuid} into cache: {value:?}"
-        );
+        debug!("PolarsPlugin: Inserting {uuid} into cache: {value:?}");
         // turn off plugin gc the first time an entry is added to the cache
         // as we don't want the plugin to be garbage collected if there
         // is any live data
-        plugin_debug!(engine, "PolarsPlugin: Cache has values disabling GC");
+        debug!("PolarsPlugin: Cache has values disabling GC");
         engine.set_gc_disabled(true).map_err(LabeledError::from)?;
         let cache_value = CacheValue {
             uuid,
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/open.rs b/crates/nu_plugin_polars/src/dataframe/eager/open.rs
index f7ee467877..116e6c3b8f 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/open.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/open.rs
@@ -1,10 +1,10 @@
 use crate::{
     dataframe::values::NuSchema,
-    perf,
     values::{CustomValueSupport, NuLazyFrame},
-    PolarsPlugin,
+    EngineWrapper, PolarsPlugin,
 };
 use nu_path::expand_path_with;
+use nu_utils::perf;
 
 use super::super::values::NuDataFrame;
 use nu_plugin::PluginCommand;
@@ -399,13 +399,10 @@ fn from_jsonl(
                 inner: vec![],
             })?;
 
-        perf(
-            engine,
+        perf!(
             "Lazy json lines dataframe open",
             start_time,
-            file!(),
-            line!(),
-            column!(),
+            engine.use_color()
         );
 
         let df = NuLazyFrame::new(false, df);
@@ -441,13 +438,10 @@ fn from_jsonl(
             })?
             .into();
 
-        perf(
-            engine,
+        perf!(
             "Eager json lines dataframe open",
             start_time,
-            file!(),
-            line!(),
-            column!(),
+            engine.use_color()
         );
 
         df.cache_and_to_value(plugin, engine, call.head)
@@ -524,14 +518,7 @@ fn from_csv(
             })?
             .into();
 
-        perf(
-            engine,
-            "Lazy CSV dataframe open",
-            start_time,
-            file!(),
-            line!(),
-            column!(),
-        );
+        perf!("Lazy CSV dataframe open", start_time, engine.use_color());
 
         df.cache_and_to_value(plugin, engine, call.head)
     } else {
@@ -569,14 +556,7 @@ fn from_csv(
                 inner: vec![],
             })?;
 
-        perf(
-            engine,
-            "Eager CSV dataframe open",
-            start_time,
-            file!(),
-            line!(),
-            column!(),
-        );
+        perf!("Eager CSV dataframe open", start_time, engine.use_color());
 
         let df = NuDataFrame::new(false, df);
         df.cache_and_to_value(plugin, engine, call.head)
diff --git a/crates/nu_plugin_polars/src/lib.rs b/crates/nu_plugin_polars/src/lib.rs
index 9fc9a7ab2d..b5868e13d6 100644
--- a/crates/nu_plugin_polars/src/lib.rs
+++ b/crates/nu_plugin_polars/src/lib.rs
@@ -45,52 +45,6 @@ impl EngineWrapper for &EngineInterface {
     }
 }
 
-#[macro_export]
-macro_rules! plugin_debug {
-    ($env_var_provider:tt, $($arg:tt)*) => {{
-        if $env_var_provider.get_env_var("POLARS_PLUGIN_DEBUG")
-            .filter(|s|  s == "1" || s == "true")
-            .is_some() {
-            eprintln!($($arg)*);
-        }
-    }};
-}
-
-pub fn perf(
-    env: impl EngineWrapper,
-    msg: &str,
-    dur: std::time::Instant,
-    file: &str,
-    line: u32,
-    column: u32,
-) {
-    if env
-        .get_env_var("POLARS_PLUGIN_PERF")
-        .filter(|s| s == "1" || s == "true")
-        .is_some()
-    {
-        if env.use_color() {
-            eprintln!(
-                "perf: {}:{}:{} \x1b[32m{}\x1b[0m took \x1b[33m{:?}\x1b[0m",
-                file,
-                line,
-                column,
-                msg,
-                dur.elapsed(),
-            );
-        } else {
-            eprintln!(
-                "perf: {}:{}:{} {} took {:?}",
-                file,
-                line,
-                column,
-                msg,
-                dur.elapsed(),
-            );
-        }
-    }
-}
-
 #[derive(Default)]
 pub struct PolarsPlugin {
     pub(crate) cache: Cache,
diff --git a/crates/nu_plugin_polars/src/main.rs b/crates/nu_plugin_polars/src/main.rs
index 4a757701ad..a930c5caab 100644
--- a/crates/nu_plugin_polars/src/main.rs
+++ b/crates/nu_plugin_polars/src/main.rs
@@ -5,5 +5,6 @@ use nu_plugin_polars::PolarsPlugin;
 static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
 
 fn main() {
+    env_logger::init();
     serve_plugin(&PolarsPlugin::default(), MsgPackSerializer {})
 }
diff --git a/src/main.rs b/src/main.rs
index c74fd7641d..6eb65276b9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -29,7 +29,7 @@ use nu_protocol::{
     Value,
 };
 use nu_std::load_standard_library;
-use nu_utils::utils::perf;
+use nu_utils::perf;
 use run::{run_commands, run_file, run_repl};
 use signals::ctrlc_protection;
 use std::{
@@ -219,14 +219,7 @@ fn main() -> Result<()> {
 
         logger(|builder| configure(&level, &target, filters, builder))?;
         // info!("start logging {}:{}:{}", file!(), line!(), column!());
-        perf(
-            "start logging",
-            start_time,
-            file!(),
-            line!(),
-            column!(),
-            use_color,
-        );
+        perf!("start logging", start_time, use_color);
     }
 
     start_time = std::time::Instant::now();
@@ -245,27 +238,13 @@ fn main() -> Result<()> {
         "env-path",
         parsed_nu_cli_args.env_file.as_ref(),
     );
-    perf(
-        "set_config_path",
-        start_time,
-        file!(),
-        line!(),
-        column!(),
-        use_color,
-    );
+    perf!("set_config_path", start_time, use_color);
 
     #[cfg(unix)]
     {
         start_time = std::time::Instant::now();
         terminal::acquire(engine_state.is_interactive);
-        perf(
-            "acquire_terminal",
-            start_time,
-            file!(),
-            line!(),
-            column!(),
-            use_color,
-        );
+        perf!("acquire_terminal", start_time, use_color);
     }
 
     start_time = std::time::Instant::now();
@@ -279,26 +258,12 @@ fn main() -> Result<()> {
 
         engine_state.add_env_var("NU_LIB_DIRS".into(), Value::list(vals, span));
     }
-    perf(
-        "NU_LIB_DIRS setup",
-        start_time,
-        file!(),
-        line!(),
-        column!(),
-        use_color,
-    );
+    perf!("NU_LIB_DIRS setup", start_time, use_color);
 
     start_time = std::time::Instant::now();
     // First, set up env vars as strings only
     gather_parent_env_vars(&mut engine_state, &init_cwd);
-    perf(
-        "gather env vars",
-        start_time,
-        file!(),
-        line!(),
-        column!(),
-        use_color,
-    );
+    perf!("gather env vars", start_time, use_color);
 
     engine_state.add_env_var(
         "NU_VERSION".to_string(),
@@ -359,14 +324,7 @@ fn main() -> Result<()> {
         }
         std::process::exit(0)
     }
-    perf(
-        "run test_bins",
-        start_time,
-        file!(),
-        line!(),
-        column!(),
-        use_color,
-    );
+    perf!("run test_bins", start_time, use_color);
 
     start_time = std::time::Instant::now();
     let input = if let Some(redirect_stdin) = &parsed_nu_cli_args.redirect_stdin {
@@ -376,26 +334,12 @@ fn main() -> Result<()> {
         trace!("not redirecting stdin");
         PipelineData::empty()
     };
-    perf(
-        "redirect stdin",
-        start_time,
-        file!(),
-        line!(),
-        column!(),
-        use_color,
-    );
+    perf!("redirect stdin", start_time, use_color);
 
     start_time = std::time::Instant::now();
     // Set up the $nu constant before evaluating config files (need to have $nu available in them)
     engine_state.generate_nu_constant();
-    perf(
-        "create_nu_constant",
-        start_time,
-        file!(),
-        line!(),
-        column!(),
-        use_color,
-    );
+    perf!("create_nu_constant", start_time, use_color);
 
     #[cfg(feature = "plugin")]
     if let Some(plugins) = &parsed_nu_cli_args.plugins {
@@ -433,26 +377,12 @@ fn main() -> Result<()> {
         }
         engine_state.merge_delta(working_set.render())?;
 
-        perf(
-            "load plugins specified in --plugins",
-            start_time,
-            file!(),
-            line!(),
-            column!(),
-            use_color,
-        )
+        perf!("load plugins specified in --plugins", start_time, use_color)
     }
 
     start_time = std::time::Instant::now();
     if parsed_nu_cli_args.lsp {
-        perf(
-            "lsp starting",
-            start_time,
-            file!(),
-            line!(),
-            column!(),
-            use_color,
-        );
+        perf!("lsp starting", start_time, use_color);
 
         if parsed_nu_cli_args.no_config_file.is_none() {
             let mut stack = nu_protocol::engine::Stack::new();
diff --git a/src/run.rs b/src/run.rs
index db779b0058..6bb02451b9 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -12,7 +12,7 @@ use nu_protocol::{
     engine::{EngineState, Stack},
     report_error_new, PipelineData, Spanned,
 };
-use nu_utils::utils::perf;
+use nu_utils::perf;
 
 pub(crate) fn run_commands(
     engine_state: &mut EngineState,
@@ -35,14 +35,7 @@ pub(crate) fn run_commands(
         #[cfg(feature = "plugin")]
         read_plugin_file(engine_state, parsed_nu_cli_args.plugin_file, NUSHELL_FOLDER);
 
-        perf(
-            "read plugins",
-            start_time,
-            file!(),
-            line!(),
-            column!(),
-            use_color,
-        );
+        perf!("read plugins", start_time, use_color);
 
         let start_time = std::time::Instant::now();
         // If we have a env file parameter *OR* we have a login shell parameter, read the env file
@@ -57,14 +50,7 @@ pub(crate) fn run_commands(
             config_files::read_default_env_file(engine_state, &mut stack)
         }
 
-        perf(
-            "read env.nu",
-            start_time,
-            file!(),
-            line!(),
-            column!(),
-            use_color,
-        );
+        perf!("read env.nu", start_time, use_color);
 
         let start_time = std::time::Instant::now();
         // If we have a config file parameter *OR* we have a login shell parameter, read the config file
@@ -77,14 +63,7 @@ pub(crate) fn run_commands(
             );
         }
 
-        perf(
-            "read config.nu",
-            start_time,
-            file!(),
-            line!(),
-            column!(),
-            use_color,
-        );
+        perf!("read config.nu", start_time, use_color);
 
         // If we have a login shell parameter, read the login file
         let start_time = std::time::Instant::now();
@@ -92,14 +71,7 @@ pub(crate) fn run_commands(
             config_files::read_loginshell_file(engine_state, &mut stack);
         }
 
-        perf(
-            "read login.nu",
-            start_time,
-            file!(),
-            line!(),
-            column!(),
-            use_color,
-        );
+        perf!("read login.nu", start_time, use_color);
     }
 
     // Before running commands, set up the startup time
@@ -123,14 +95,7 @@ pub(crate) fn run_commands(
         report_error_new(engine_state, &err);
         std::process::exit(1);
     }
-    perf(
-        "evaluate_commands",
-        start_time,
-        file!(),
-        line!(),
-        column!(),
-        use_color,
-    );
+    perf!("evaluate_commands", start_time, use_color);
 }
 
 pub(crate) fn run_file(
@@ -153,14 +118,7 @@ pub(crate) fn run_file(
         let start_time = std::time::Instant::now();
         #[cfg(feature = "plugin")]
         read_plugin_file(engine_state, parsed_nu_cli_args.plugin_file, NUSHELL_FOLDER);
-        perf(
-            "read plugins",
-            start_time,
-            file!(),
-            line!(),
-            column!(),
-            use_color,
-        );
+        perf!("read plugins", start_time, use_color);
 
         let start_time = std::time::Instant::now();
         // only want to load config and env if relative argument is provided.
@@ -174,14 +132,7 @@ pub(crate) fn run_file(
         } else {
             config_files::read_default_env_file(engine_state, &mut stack)
         }
-        perf(
-            "read env.nu",
-            start_time,
-            file!(),
-            line!(),
-            column!(),
-            use_color,
-        );
+        perf!("read env.nu", start_time, use_color);
 
         let start_time = std::time::Instant::now();
         if parsed_nu_cli_args.config_file.is_some() {
@@ -192,14 +143,7 @@ pub(crate) fn run_file(
                 false,
             );
         }
-        perf(
-            "read config.nu",
-            start_time,
-            file!(),
-            line!(),
-            column!(),
-            use_color,
-        );
+        perf!("read config.nu", start_time, use_color);
     }
 
     // Regenerate the $nu constant to contain the startup time and any other potential updates
@@ -216,14 +160,7 @@ pub(crate) fn run_file(
         report_error_new(engine_state, &err);
         std::process::exit(1);
     }
-    perf(
-        "evaluate_file",
-        start_time,
-        file!(),
-        line!(),
-        column!(),
-        use_color,
-    );
+    perf!("evaluate_file", start_time, use_color);
 
     let start_time = std::time::Instant::now();
     let last_exit_code = stack.get_env_var(&*engine_state, "LAST_EXIT_CODE");
@@ -235,14 +172,7 @@ pub(crate) fn run_file(
             }
         }
     }
-    perf(
-        "get exit code",
-        start_time,
-        file!(),
-        line!(),
-        column!(),
-        use_color,
-    );
+    perf!("get exit code", start_time, use_color);
 }
 
 pub(crate) fn run_repl(
@@ -268,14 +198,7 @@ pub(crate) fn run_repl(
 
     // Reload use_color from config in case it's different from the default value
     let use_color = engine_state.get_config().use_ansi_coloring;
-    perf(
-        "setup_config",
-        start_time,
-        file!(),
-        line!(),
-        column!(),
-        use_color,
-    );
+    perf!("setup_config", start_time, use_color);
 
     let start_time = std::time::Instant::now();
     let ret_val = evaluate_repl(
@@ -286,14 +209,7 @@ pub(crate) fn run_repl(
         parsed_nu_cli_args.no_std_lib,
         entire_start_time,
     );
-    perf(
-        "evaluate_repl",
-        start_time,
-        file!(),
-        line!(),
-        column!(),
-        use_color,
-    );
+    perf!("evaluate_repl", start_time, use_color);
 
     ret_val
 }

From 57452337ff4e228102433e99b4c6000700a9b3b2 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Fri, 28 Jun 2024 09:47:12 +0800
Subject: [PATCH 0155/1072] Restrict strings beginning with quote should also
 ending with quote (#13131)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
Closes: #13010

It adds an additional check inside `parse_string`, and returns
`unbalanced quote` if input string is unbalanced

# User-Facing Changes
After this pr, the following is no longer allowed:
```nushell
❯ "asdfasdf"asdfasdf
Error: nu::parser::extra_token_after_closing_delimiter

  × Invaild characters after closing delimiter
   ╭─[entry #1:1:11]
 1 │ "asdfasdf"asdfasdf
   ·           ────┬───
   ·               ╰── invalid characters
   ╰────
  help: Try removing them.
❯ 'asdfasd'adsfadf
Error: nu::parser::extra_token_after_closing_delimiter

  × Invaild characters after closing delimiter
   ╭─[entry #2:1:10]
 1 │ 'asdfasd'adsfadf
   ·          ───┬───
   ·             ╰── invalid characters
   ╰────
  help: Try removing them.
```

# Tests + Formatting
Added 1 test
---
 crates/nu-parser/src/parser.rs               | 30 ++++++++++++++++++++
 crates/nu-protocol/src/errors/parse_error.rs |  8 ++++++
 tests/repl/test_strings.rs                   |  6 ++++
 3 files changed, 44 insertions(+)

diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index f6bbd84f6c..c3d18b55ac 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -2828,6 +2828,36 @@ pub fn parse_string(working_set: &mut StateWorkingSet, span: Span) -> Expression
     if bytes[0] != b'\'' && bytes[0] != b'"' && bytes[0] != b'`' && bytes.contains(&b'(') {
         return parse_string_interpolation(working_set, span);
     }
+    // Check for unbalanced quotes:
+    {
+        if bytes.starts_with(b"\"")
+            && (bytes.iter().filter(|ch| **ch == b'"').count() > 1 && !bytes.ends_with(b"\""))
+        {
+            let close_delimiter_index = bytes
+                .iter()
+                .skip(1)
+                .position(|ch| *ch == b'"')
+                .expect("Already check input bytes contains at least two double quotes");
+            // needs `+2` rather than `+1`, because we have skip 1 to find close_delimiter_index before.
+            let span = Span::new(span.start + close_delimiter_index + 2, span.end);
+            working_set.error(ParseError::ExtraTokensAfterClosingDelimiter(span));
+            return garbage(working_set, span);
+        }
+
+        if bytes.starts_with(b"\'")
+            && (bytes.iter().filter(|ch| **ch == b'\'').count() > 1 && !bytes.ends_with(b"\'"))
+        {
+            let close_delimiter_index = bytes
+                .iter()
+                .skip(1)
+                .position(|ch| *ch == b'\'')
+                .expect("Already check input bytes contains at least two double quotes");
+            // needs `+2` rather than `+1`, because we have skip 1 to find close_delimiter_index before.
+            let span = Span::new(span.start + close_delimiter_index + 2, span.end);
+            working_set.error(ParseError::ExtraTokensAfterClosingDelimiter(span));
+            return garbage(working_set, span);
+        }
+    }
 
     let (s, err) = unescape_unquote_string(bytes, span);
     if let Some(err) = err {
diff --git a/crates/nu-protocol/src/errors/parse_error.rs b/crates/nu-protocol/src/errors/parse_error.rs
index 28c865b841..4d59821f7d 100644
--- a/crates/nu-protocol/src/errors/parse_error.rs
+++ b/crates/nu-protocol/src/errors/parse_error.rs
@@ -17,6 +17,13 @@ pub enum ParseError {
     #[diagnostic(code(nu::parser::extra_tokens), help("Try removing them."))]
     ExtraTokens(#[label = "extra tokens"] Span),
 
+    #[error("Invalid characters after closing delimiter")]
+    #[diagnostic(
+        code(nu::parser::extra_token_after_closing_delimiter),
+        help("Try removing them.")
+    )]
+    ExtraTokensAfterClosingDelimiter(#[label = "invalid characters"] Span),
+
     #[error("Extra positional argument.")]
     #[diagnostic(code(nu::parser::extra_positional), help("Usage: {0}"))]
     ExtraPositional(String, #[label = "extra positional argument"] Span),
@@ -577,6 +584,7 @@ impl ParseError {
             ParseError::LabeledErrorWithHelp { span: s, .. } => *s,
             ParseError::RedirectingBuiltinCommand(_, s, _) => *s,
             ParseError::UnexpectedSpreadArg(_, s) => *s,
+            ParseError::ExtraTokensAfterClosingDelimiter(s) => *s,
         }
     }
 }
diff --git a/tests/repl/test_strings.rs b/tests/repl/test_strings.rs
index 62960fed13..1c573f03ae 100644
--- a/tests/repl/test_strings.rs
+++ b/tests/repl/test_strings.rs
@@ -36,6 +36,12 @@ fn non_string_in_record() -> TestResult {
     )
 }
 
+#[test]
+fn unbalance_string() -> TestResult {
+    fail_test(r#""aaaab"cc"#, "invalid characters")?;
+    fail_test(r#"'aaaab'cc"#, "invalid characters")
+}
+
 #[test]
 fn string_in_valuestream() -> TestResult {
     run_test(

From a71732ba1262220ce7ff866976c5c60d301ba23f Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Thu, 27 Jun 2024 23:49:06 -0700
Subject: [PATCH 0156/1072] Add context to the I/O error messages in
 `nu_cmd_plugin::util::modify_plugin_file()` (#13259)

# Description

This might help @hustcer debug problems with `setup-nu`. The error
messages with the file I/O in `modify_plugin_file()` are not currently
not specific about what file path was involved in the I/O operation.

The spans on those errors have also changed to the span of the custom
path if provided.

# User-Facing Changes

- Slightly better error
---
 crates/nu-cmd-plugin/src/util.rs | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/crates/nu-cmd-plugin/src/util.rs b/crates/nu-cmd-plugin/src/util.rs
index 312ab9e81a..7d5282235f 100644
--- a/crates/nu-cmd-plugin/src/util.rs
+++ b/crates/nu-cmd-plugin/src/util.rs
@@ -31,11 +31,20 @@ pub(crate) fn modify_plugin_file(
             })?
     };
 
+    let file_span = custom_path.as_ref().map(|p| p.span).unwrap_or(span);
+
     // Try to read the plugin file if it exists
     let mut contents = if fs::metadata(&plugin_registry_file_path).is_ok_and(|m| m.len() > 0) {
         PluginRegistryFile::read_from(
-            File::open(&plugin_registry_file_path).err_span(span)?,
-            Some(span),
+            File::open(&plugin_registry_file_path).map_err(|err| ShellError::IOErrorSpanned {
+                msg: format!(
+                    "failed to read `{}`: {}",
+                    plugin_registry_file_path.display(),
+                    err
+                ),
+                span: file_span,
+            })?,
+            Some(file_span),
         )?
     } else {
         PluginRegistryFile::default()
@@ -46,7 +55,14 @@ pub(crate) fn modify_plugin_file(
 
     // Save the modified file on success
     contents.write_to(
-        File::create(&plugin_registry_file_path).err_span(span)?,
+        File::create(&plugin_registry_file_path).map_err(|err| ShellError::IOErrorSpanned {
+            msg: format!(
+                "failed to create `{}`: {}",
+                plugin_registry_file_path.display(),
+                err
+            ),
+            span: file_span,
+        })?,
         Some(span),
     )?;
 

From 720b4cbd01a5e7d31ae42a56d27adb0b06cd5733 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Fri, 28 Jun 2024 04:37:45 -0700
Subject: [PATCH 0157/1072] Polars 0.41 Upgrade (#13238)

# Description
Upgrading to Polars 0.41

# User-Facing Changes
* `polars melt` has been renamed to `polars unpivot` to match the change
in the polars API. Additionally, it now supports lazy dataframes.
Introduced a `--streamable` option to use the polars streaming engine
for lazy frames.
* The parameter `outer` has been replaced with `full` in `polars join`
to match polars change.
* `polars value-count` now supports the column (rename count column),
parallelize (multithread), sort, and normalize options.

The list of polars changes can be found
[here](https://github.com/pola-rs/polars/releases/tag/rs-0.41.2)
---
 Cargo.lock                                    | 108 +++---
 crates/nu_plugin_polars/Cargo.toml            |  12 +-
 .../src/dataframe/eager/melt.rs               | 253 -------------
 .../src/dataframe/eager/mod.rs                |   6 +-
 .../src/dataframe/eager/open.rs               |  11 +-
 .../src/dataframe/eager/schema.rs             |   2 +-
 .../src/dataframe/eager/unpivot.rs            | 358 ++++++++++++++++++
 .../src/dataframe/lazy/aggregate.rs           |   3 +-
 .../src/dataframe/lazy/groupby.rs             |   4 +-
 .../src/dataframe/lazy/join.rs                |   8 +-
 .../src/dataframe/lazy/sort_by_expr.rs        |   2 +-
 .../dataframe/series/indexes/set_with_idx.rs  |   7 +-
 .../src/dataframe/series/value_counts.rs      |  27 +-
 .../values/nu_dataframe/between_values.rs     |  24 +-
 .../src/dataframe/values/nu_expression/mod.rs |  61 ++-
 .../src/dataframe/values/nu_lazyframe/mod.rs  |  19 +-
 16 files changed, 560 insertions(+), 345 deletions(-)
 delete mode 100644 crates/nu_plugin_polars/src/dataframe/eager/melt.rs
 create mode 100644 crates/nu_plugin_polars/src/dataframe/eager/unpivot.rs

diff --git a/Cargo.lock b/Cargo.lock
index 712986b8b6..b82951b2b7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3442,7 +3442,7 @@ dependencies = [
  "polars-plan",
  "polars-utils",
  "serde",
- "sqlparser 0.47.0",
+ "sqlparser",
  "tempfile",
  "typetag",
  "uuid",
@@ -4052,9 +4052,9 @@ dependencies = [
 
 [[package]]
 name = "polars"
-version = "0.40.0"
+version = "0.41.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e148396dca5496566880fa19374f3f789a29db94e3eb458afac1497b4bac5442"
+checksum = "ce49e10a756f68eb99c102c6b2a0cbc0c583a0fa7263536ad0913d94be878d2d"
 dependencies = [
  "getrandom",
  "polars-arrow",
@@ -4072,9 +4072,9 @@ dependencies = [
 
 [[package]]
 name = "polars-arrow"
-version = "0.40.0"
+version = "0.41.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cb5e11cd0752ae022fa6ca3afa50a14b0301b7ce53c0135828fbb0f4fa8303e"
+checksum = "b436f83f62e864f0d91871e26528f2c5552c7cf07c8d77547f1b8e3fde22bd27"
 dependencies = [
  "ahash 0.8.11",
  "atoi",
@@ -4120,9 +4120,9 @@ dependencies = [
 
 [[package]]
 name = "polars-compute"
-version = "0.40.0"
+version = "0.41.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89fc4578f826234cdecb782952aa9c479dc49373f81694a7b439c70b6f609ba0"
+checksum = "f6758f834f07e622a2f859bebb542b2b7f8879b8704dbb2b2bbab460ddcdca4b"
 dependencies = [
  "bytemuck",
  "either",
@@ -4136,9 +4136,9 @@ dependencies = [
 
 [[package]]
 name = "polars-core"
-version = "0.40.0"
+version = "0.41.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e490c6bace1366a558feea33d1846f749a8ca90bd72a6748752bc65bb4710b2a"
+checksum = "7ed262e9bdda15a12a9bfcfc9200bec5253335633dbd86cf5b94fda0194244b3"
 dependencies = [
  "ahash 0.8.11",
  "bitflags 2.5.0",
@@ -4170,9 +4170,9 @@ dependencies = [
 
 [[package]]
 name = "polars-error"
-version = "0.40.0"
+version = "0.41.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08888f58e61599b00f5ea0c2ccdc796b54b9859559cc0d4582733509451fa01a"
+checksum = "53e1707a17475ba5e74c349154b415e3148a1a275e395965427971b5e53ad621"
 dependencies = [
  "avro-schema",
  "polars-arrow-format",
@@ -4183,9 +4183,9 @@ dependencies = [
 
 [[package]]
 name = "polars-expr"
-version = "0.40.0"
+version = "0.41.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4173591920fe56ad55af025f92eb0d08421ca85705c326a640c43856094e3484"
+checksum = "31a9688d5842e7a7fbad88e67a174778794a91d97d3bba1b3c09dd1656fee3b2"
 dependencies = [
  "ahash 0.8.11",
  "bitflags 2.5.0",
@@ -4203,9 +4203,9 @@ dependencies = [
 
 [[package]]
 name = "polars-io"
-version = "0.40.0"
+version = "0.41.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5842896aea46d975b425d63f156f412aed3cfde4c257b64fb1f43ceea288074e"
+checksum = "18798dacd94fb9263f65f63f0feab0908675422646d6f7fc37043b85ff6dca35"
 dependencies = [
  "ahash 0.8.11",
  "async-trait",
@@ -4244,9 +4244,9 @@ dependencies = [
 
 [[package]]
 name = "polars-json"
-version = "0.40.0"
+version = "0.41.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "160cbad0145b93ac6a88639aadfa6f7d7c769d05a8674f9b7e895b398cae9901"
+checksum = "044ea319f667efbf8007c4c38171c2956e0e7f9b078eb66e31e82f80d1e14b51"
 dependencies = [
  "ahash 0.8.11",
  "chrono",
@@ -4265,19 +4265,21 @@ dependencies = [
 
 [[package]]
 name = "polars-lazy"
-version = "0.40.0"
+version = "0.41.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e805ea2ebbc6b7749b0afb31b7fc5d32b42b57ba29b984549d43d3a16114c4a5"
+checksum = "74a11994c2211f2e99d9ac31776fd7c2c0607d5fe62d5b5db9e396f7d663f3d5"
 dependencies = [
  "ahash 0.8.11",
  "bitflags 2.5.0",
  "glob",
+ "memchr",
  "once_cell",
  "polars-arrow",
  "polars-core",
  "polars-expr",
  "polars-io",
  "polars-json",
+ "polars-mem-engine",
  "polars-ops",
  "polars-pipe",
  "polars-plan",
@@ -4289,10 +4291,29 @@ dependencies = [
 ]
 
 [[package]]
-name = "polars-ops"
-version = "0.40.0"
+name = "polars-mem-engine"
+version = "0.41.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0aed7e169c81b98457641cf82b251f52239a668916c2e683abd1f38df00d58"
+checksum = "5acd5fde6fadaddfcae3227ec5b64121007928f8e68870c80653438e20c1c587"
+dependencies = [
+ "polars-arrow",
+ "polars-core",
+ "polars-error",
+ "polars-expr",
+ "polars-io",
+ "polars-json",
+ "polars-ops",
+ "polars-plan",
+ "polars-time",
+ "polars-utils",
+ "rayon",
+]
+
+[[package]]
+name = "polars-ops"
+version = "0.41.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4170c59e974727941edfb722f6d430ed623be9e7f30581ee00832c907f1b9fd"
 dependencies = [
  "ahash 0.8.11",
  "argminmax",
@@ -4326,9 +4347,9 @@ dependencies = [
 
 [[package]]
 name = "polars-parquet"
-version = "0.40.0"
+version = "0.41.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c70670a9e51cac66d0e77fd20b5cc957dbcf9f2660d410633862bb72f846d5b8"
+checksum = "c684638c36c60c691d707d414249fe8af4a19a35a39d418464b140fe23732e5d"
 dependencies = [
  "ahash 0.8.11",
  "async-stream",
@@ -4341,9 +4362,11 @@ dependencies = [
  "num-traits",
  "parquet-format-safe",
  "polars-arrow",
+ "polars-compute",
  "polars-error",
  "polars-utils",
  "seq-macro",
+ "serde",
  "simdutf8",
  "snap",
  "streaming-decompression",
@@ -4352,9 +4375,9 @@ dependencies = [
 
 [[package]]
 name = "polars-pipe"
-version = "0.40.0"
+version = "0.41.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a40ae1b3c74ee07e2d1f7cbf56c5d6e15969e45d9b6f0903bd2acaf783ba436"
+checksum = "832af9fbebc4c074d95fb19e1ef9e1bf37c343641238c2476febff296a7028ea"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-queue",
@@ -4378,9 +4401,9 @@ dependencies = [
 
 [[package]]
 name = "polars-plan"
-version = "0.40.0"
+version = "0.41.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8daa3541ae7e9af311a4389bc2b21f83349c34c723cc67fa524cdefdaa172d90"
+checksum = "801390ea815c05c9cf8337f3148090c9c10c9595a839fa0706b77cc2405b4466"
 dependencies = [
  "ahash 0.8.11",
  "bytemuck",
@@ -4408,9 +4431,9 @@ dependencies = [
 
 [[package]]
 name = "polars-row"
-version = "0.40.0"
+version = "0.41.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deb285f2f3a65b00dd06bef16bb9f712dbb5478f941dab5cf74f9f016d382e40"
+checksum = "dee955e91b605fc91db4d0a8ea02609d3a09ff79256d905214a2a6f758cd6f7b"
 dependencies = [
  "bytemuck",
  "polars-arrow",
@@ -4420,9 +4443,9 @@ dependencies = [
 
 [[package]]
 name = "polars-sql"
-version = "0.40.0"
+version = "0.41.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a724f699d194cb02c25124d3832f7d4d77f387f1a89ee42f6b9e88ec561d4ad9"
+checksum = "d89c00a4b399501d5bd478e8e8022b9391047fe8570324ecba20c4e4833c0e87"
 dependencies = [
  "hex",
  "once_cell",
@@ -4430,18 +4453,20 @@ dependencies = [
  "polars-core",
  "polars-error",
  "polars-lazy",
+ "polars-ops",
  "polars-plan",
+ "polars-time",
  "rand",
  "serde",
  "serde_json",
- "sqlparser 0.39.0",
+ "sqlparser",
 ]
 
 [[package]]
 name = "polars-time"
-version = "0.40.0"
+version = "0.41.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87ebec238d8b6200d9f0c3ce411c8441e950bd5a7df7806b8172d06c1d5a4b97"
+checksum = "9689b3aff99d64befe300495528bdc44c36d2656c3a8b242a790d4f43df027fc"
 dependencies = [
  "atoi",
  "bytemuck",
@@ -4461,9 +4486,9 @@ dependencies = [
 
 [[package]]
 name = "polars-utils"
-version = "0.40.0"
+version = "0.41.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34e1a907c63abf71e5f21467e2e4ff748896c28196746f631c6c25512ec6102c"
+checksum = "12081e346983a91e26f395597e1d53dea1b4ecd694653aee1cc402d2fae01f04"
 dependencies = [
  "ahash 0.8.11",
  "bytemuck",
@@ -5614,15 +5639,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "sqlparser"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "743b4dc2cbde11890ccb254a8fc9d537fa41b36da00de2a1c5e9848c9bc42bd7"
-dependencies = [
- "log",
-]
-
 [[package]]
 name = "sqlparser"
 version = "0.47.0"
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 285046381e..9589c89525 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -31,11 +31,11 @@ mimalloc = { version = "0.1.42" }
 num = {version = "0.4"}
 serde = { version = "1.0", features = ["derive"] }
 sqlparser = { version = "0.47"}
-polars-io = { version = "0.40", features = ["avro"]}
-polars-arrow = { version = "0.40"}
-polars-ops = { version = "0.40"}
-polars-plan = { version = "0.40", features = ["regex"]}
-polars-utils = { version = "0.40"}
+polars-io = { version = "0.41", features = ["avro"]}
+polars-arrow = { version = "0.41"}
+polars-ops = { version = "0.41"}
+polars-plan = { version = "0.41", features = ["regex"]}
+polars-utils = { version = "0.41"}
 typetag = "0.2"
 env_logger = "0.11.3"
 log.workspace = true
@@ -73,7 +73,7 @@ features = [
 	"to_dummies",
 ]
 optional = false
-version = "0.40"
+version = "0.41"
 
 [dev-dependencies]
 nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.1" }
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/melt.rs b/crates/nu_plugin_polars/src/dataframe/eager/melt.rs
deleted file mode 100644
index b69389ed24..0000000000
--- a/crates/nu_plugin_polars/src/dataframe/eager/melt.rs
+++ /dev/null
@@ -1,253 +0,0 @@
-use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
-use nu_protocol::{
-    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Spanned,
-    SyntaxShape, Type, Value,
-};
-
-use crate::{
-    dataframe::values::utils::convert_columns_string, values::CustomValueSupport, PolarsPlugin,
-};
-
-use super::super::values::{Column, NuDataFrame};
-
-#[derive(Clone)]
-pub struct MeltDF;
-
-impl PluginCommand for MeltDF {
-    type Plugin = PolarsPlugin;
-
-    fn name(&self) -> &str {
-        "polars melt"
-    }
-
-    fn usage(&self) -> &str {
-        "Unpivot a DataFrame from wide to long format."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required_named(
-                "columns",
-                SyntaxShape::Table(vec![]),
-                "column names for melting",
-                Some('c'),
-            )
-            .required_named(
-                "values",
-                SyntaxShape::Table(vec![]),
-                "column names used as value columns",
-                Some('v'),
-            )
-            .named(
-                "variable-name",
-                SyntaxShape::String,
-                "optional name for variable column",
-                Some('r'),
-            )
-            .named(
-                "value-name",
-                SyntaxShape::String,
-                "optional name for value column",
-                Some('l'),
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "melt dataframe",
-            example:
-                "[[a b c d]; [x 1 4 a] [y 2 5 b] [z 3 6 c]] | polars into-df | polars melt -c [b c] -v [a d]",
-            result: Some(
-                NuDataFrame::try_from_columns(vec![
-                    Column::new(
-                        "b".to_string(),
-                        vec![
-                            Value::test_int(1),
-                            Value::test_int(2),
-                            Value::test_int(3),
-                            Value::test_int(1),
-                            Value::test_int(2),
-                            Value::test_int(3),
-                        ],
-                    ),
-                    Column::new(
-                        "c".to_string(),
-                        vec![
-                            Value::test_int(4),
-                            Value::test_int(5),
-                            Value::test_int(6),
-                            Value::test_int(4),
-                            Value::test_int(5),
-                            Value::test_int(6),
-                        ],
-                    ),
-                    Column::new(
-                        "variable".to_string(),
-                        vec![
-                            Value::test_string("a"),
-                            Value::test_string("a"),
-                            Value::test_string("a"),
-                            Value::test_string("d"),
-                            Value::test_string("d"),
-                            Value::test_string("d"),
-                        ],
-                    ),
-                    Column::new(
-                        "value".to_string(),
-                        vec![
-                            Value::test_string("x"),
-                            Value::test_string("y"),
-                            Value::test_string("z"),
-                            Value::test_string("a"),
-                            Value::test_string("b"),
-                            Value::test_string("c"),
-                        ],
-                    ),
-                ], None)
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        plugin: &Self::Plugin,
-        engine: &EngineInterface,
-        call: &EvaluatedCall,
-        input: PipelineData,
-    ) -> Result<PipelineData, LabeledError> {
-        command(plugin, engine, call, input).map_err(LabeledError::from)
-    }
-}
-
-fn command(
-    plugin: &PolarsPlugin,
-    engine: &EngineInterface,
-    call: &EvaluatedCall,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let id_col: Vec<Value> = call.get_flag("columns")?.expect("required value");
-    let val_col: Vec<Value> = call.get_flag("values")?.expect("required value");
-
-    let value_name: Option<Spanned<String>> = call.get_flag("value-name")?;
-    let variable_name: Option<Spanned<String>> = call.get_flag("variable-name")?;
-
-    let (id_col_string, id_col_span) = convert_columns_string(id_col, call.head)?;
-    let (val_col_string, val_col_span) = convert_columns_string(val_col, call.head)?;
-
-    let df = NuDataFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
-
-    check_column_datatypes(df.as_ref(), &id_col_string, id_col_span)?;
-    check_column_datatypes(df.as_ref(), &val_col_string, val_col_span)?;
-
-    let mut res = df
-        .as_ref()
-        .melt(&id_col_string, &val_col_string)
-        .map_err(|e| ShellError::GenericError {
-            error: "Error calculating melt".into(),
-            msg: e.to_string(),
-            span: Some(call.head),
-            help: None,
-            inner: vec![],
-        })?;
-
-    if let Some(name) = &variable_name {
-        res.rename("variable", &name.item)
-            .map_err(|e| ShellError::GenericError {
-                error: "Error renaming column".into(),
-                msg: e.to_string(),
-                span: Some(name.span),
-                help: None,
-                inner: vec![],
-            })?;
-    }
-
-    if let Some(name) = &value_name {
-        res.rename("value", &name.item)
-            .map_err(|e| ShellError::GenericError {
-                error: "Error renaming column".into(),
-                msg: e.to_string(),
-                span: Some(name.span),
-                help: None,
-                inner: vec![],
-            })?;
-    }
-
-    let res = NuDataFrame::new(false, res);
-    res.to_pipeline_data(plugin, engine, call.head)
-}
-
-fn check_column_datatypes<T: AsRef<str>>(
-    df: &polars::prelude::DataFrame,
-    cols: &[T],
-    col_span: Span,
-) -> Result<(), ShellError> {
-    if cols.is_empty() {
-        return Err(ShellError::GenericError {
-            error: "Merge error".into(),
-            msg: "empty column list".into(),
-            span: Some(col_span),
-            help: None,
-            inner: vec![],
-        });
-    }
-
-    // Checking if they are same type
-    if cols.len() > 1 {
-        for w in cols.windows(2) {
-            let l_series = df
-                .column(w[0].as_ref())
-                .map_err(|e| ShellError::GenericError {
-                    error: "Error selecting columns".into(),
-                    msg: e.to_string(),
-                    span: Some(col_span),
-                    help: None,
-                    inner: vec![],
-                })?;
-
-            let r_series = df
-                .column(w[1].as_ref())
-                .map_err(|e| ShellError::GenericError {
-                    error: "Error selecting columns".into(),
-                    msg: e.to_string(),
-                    span: Some(col_span),
-                    help: None,
-                    inner: vec![],
-                })?;
-
-            if l_series.dtype() != r_series.dtype() {
-                return Err(ShellError::GenericError {
-                    error: "Merge error".into(),
-                    msg: "found different column types in list".into(),
-                    span: Some(col_span),
-                    help: Some(format!(
-                        "datatypes {} and {} are incompatible",
-                        l_series.dtype(),
-                        r_series.dtype()
-                    )),
-                    inner: vec![],
-                });
-            }
-        }
-    }
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod test {
-    use crate::test::test_polars_plugin_command;
-
-    use super::*;
-
-    #[test]
-    fn test_examples() -> Result<(), ShellError> {
-        test_polars_plugin_command(&MeltDF)
-    }
-}
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/mod.rs b/crates/nu_plugin_polars/src/dataframe/eager/mod.rs
index dc50ba7cd2..509c2b6dc4 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/mod.rs
@@ -9,7 +9,6 @@ mod filter_with;
 mod first;
 mod get;
 mod last;
-mod melt;
 mod open;
 mod query_df;
 mod rename;
@@ -28,6 +27,7 @@ mod to_df;
 mod to_json_lines;
 mod to_nu;
 mod to_parquet;
+mod unpivot;
 mod with_column;
 
 use crate::PolarsPlugin;
@@ -44,7 +44,6 @@ pub use filter_with::FilterWith;
 pub use first::FirstDF;
 pub use get::GetDF;
 pub use last::LastDF;
-pub use melt::MeltDF;
 use nu_plugin::PluginCommand;
 pub use query_df::QueryDf;
 pub use rename::RenameDF;
@@ -62,6 +61,7 @@ pub use to_df::ToDataFrame;
 pub use to_json_lines::ToJsonLines;
 pub use to_nu::ToNu;
 pub use to_parquet::ToParquet;
+pub use unpivot::UnpivotDF;
 pub use with_column::WithColumn;
 
 pub(crate) fn eager_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin>>> {
@@ -76,7 +76,7 @@ pub(crate) fn eager_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugi
         Box::new(FilterWith),
         Box::new(GetDF),
         Box::new(OpenDataFrame),
-        Box::new(MeltDF),
+        Box::new(UnpivotDF),
         Box::new(Summary),
         Box::new(FirstDF),
         Box::new(LastDF),
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/open.rs b/crates/nu_plugin_polars/src/dataframe/eager/open.rs
index 116e6c3b8f..c02e33b566 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/open.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/open.rs
@@ -16,6 +16,7 @@ use nu_protocol::{
 use std::{
     fs::File,
     io::BufReader,
+    num::NonZeroUsize,
     path::{Path, PathBuf},
     sync::Arc,
 };
@@ -376,9 +377,13 @@ fn from_jsonl(
     file_path: &Path,
     file_span: Span,
 ) -> Result<Value, ShellError> {
-    let infer_schema: usize = call
+    let infer_schema: NonZeroUsize = call
         .get_flag("infer-schema")?
-        .unwrap_or(DEFAULT_INFER_SCHEMA);
+        .and_then(NonZeroUsize::new)
+        .unwrap_or(
+            NonZeroUsize::new(DEFAULT_INFER_SCHEMA)
+                .expect("The default infer-schema should be non zero"),
+        );
     let maybe_schema = call
         .get_flag("schema")?
         .map(|schema| NuSchema::try_from(&schema))
@@ -528,7 +533,7 @@ fn from_csv(
             .with_infer_schema_length(Some(infer_schema))
             .with_skip_rows(skip_rows.unwrap_or_default())
             .with_schema(maybe_schema.map(|s| s.into()))
-            .with_columns(columns.map(Arc::new))
+            .with_columns(columns.map(|v| Arc::from(v.into_boxed_slice())))
             .map_parse_options(|options| {
                 options
                     .with_separator(
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/schema.rs b/crates/nu_plugin_polars/src/dataframe/eager/schema.rs
index b55d8ee5e2..e1350289a7 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/schema.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/schema.rs
@@ -70,7 +70,7 @@ fn command(
             let value: Value = schema.into();
             Ok(PipelineData::Value(value, None))
         }
-        PolarsPluginObject::NuLazyFrame(lazy) => {
+        PolarsPluginObject::NuLazyFrame(mut lazy) => {
             let schema = lazy.schema()?;
             let value: Value = schema.into();
             Ok(PipelineData::Value(value, None))
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/unpivot.rs b/crates/nu_plugin_polars/src/dataframe/eager/unpivot.rs
new file mode 100644
index 0000000000..c535b54c0e
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/eager/unpivot.rs
@@ -0,0 +1,358 @@
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{
+    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Spanned,
+    SyntaxShape, Type, Value,
+};
+use polars::frame::explode::UnpivotArgs;
+
+use crate::{
+    dataframe::values::utils::convert_columns_string,
+    values::{CustomValueSupport, NuLazyFrame, PolarsPluginObject},
+    PolarsPlugin,
+};
+
+use super::super::values::{Column, NuDataFrame};
+
+#[derive(Clone)]
+pub struct UnpivotDF;
+
+impl PluginCommand for UnpivotDF {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars unpivot"
+    }
+
+    fn usage(&self) -> &str {
+        "Unpivot a DataFrame from wide to long format."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .required_named(
+                "columns",
+                SyntaxShape::Table(vec![]),
+                "column names for unpivoting",
+                Some('c'),
+            )
+            .required_named(
+                "values",
+                SyntaxShape::Table(vec![]),
+                "column names used as value columns",
+                Some('v'),
+            )
+            .named(
+                "variable-name",
+                SyntaxShape::String,
+                "optional name for variable column",
+                Some('r'),
+            )
+            .named(
+                "value-name",
+                SyntaxShape::String,
+                "optional name for value column",
+                Some('l'),
+            )
+            .input_output_type(
+                Type::Custom("dataframe".into()),
+                Type::Custom("dataframe".into()),
+            )
+            .switch(
+                "streamable",
+                "Whether or not to use the polars streaming engine. Only valid for lazy dataframes",
+                Some('s'),
+            )
+            .category(Category::Custom("dataframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "unpivot on an eager dataframe",
+                example:
+                    "[[a b c d]; [x 1 4 a] [y 2 5 b] [z 3 6 c]] | polars into-df | polars unpivot -c [b c] -v [a d]",
+                result: Some(
+                    NuDataFrame::try_from_columns(vec![
+                        Column::new(
+                            "b".to_string(),
+                            vec![
+                                Value::test_int(1),
+                                Value::test_int(2),
+                                Value::test_int(3),
+                                Value::test_int(1),
+                                Value::test_int(2),
+                                Value::test_int(3),
+                            ],
+                        ),
+                        Column::new(
+                            "c".to_string(),
+                            vec![
+                                Value::test_int(4),
+                                Value::test_int(5),
+                                Value::test_int(6),
+                                Value::test_int(4),
+                                Value::test_int(5),
+                                Value::test_int(6),
+                            ],
+                        ),
+                        Column::new(
+                            "variable".to_string(),
+                            vec![
+                                Value::test_string("a"),
+                                Value::test_string("a"),
+                                Value::test_string("a"),
+                                Value::test_string("d"),
+                                Value::test_string("d"),
+                                Value::test_string("d"),
+                            ],
+                        ),
+                        Column::new(
+                            "value".to_string(),
+                            vec![
+                                Value::test_string("x"),
+                                Value::test_string("y"),
+                                Value::test_string("z"),
+                                Value::test_string("a"),
+                                Value::test_string("b"),
+                                Value::test_string("c"),
+                            ],
+                        ),
+                    ], None)
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+            Example {
+                description: "unpivot on a lazy dataframe",
+                example:
+                    "[[a b c d]; [x 1 4 a] [y 2 5 b] [z 3 6 c]] | polars into-lazy | polars unpivot -c [b c] -v [a d] | polars collect",
+                result: Some(
+                    NuDataFrame::try_from_columns(vec![
+                        Column::new(
+                            "b".to_string(),
+                            vec![
+                                Value::test_int(1),
+                                Value::test_int(2),
+                                Value::test_int(3),
+                                Value::test_int(1),
+                                Value::test_int(2),
+                                Value::test_int(3),
+                            ],
+                        ),
+                        Column::new(
+                            "c".to_string(),
+                            vec![
+                                Value::test_int(4),
+                                Value::test_int(5),
+                                Value::test_int(6),
+                                Value::test_int(4),
+                                Value::test_int(5),
+                                Value::test_int(6),
+                            ],
+                        ),
+                        Column::new(
+                            "variable".to_string(),
+                            vec![
+                                Value::test_string("a"),
+                                Value::test_string("a"),
+                                Value::test_string("a"),
+                                Value::test_string("d"),
+                                Value::test_string("d"),
+                                Value::test_string("d"),
+                            ],
+                        ),
+                        Column::new(
+                            "value".to_string(),
+                            vec![
+                                Value::test_string("x"),
+                                Value::test_string("y"),
+                                Value::test_string("z"),
+                                Value::test_string("a"),
+                                Value::test_string("b"),
+                                Value::test_string("c"),
+                            ],
+                        ),
+                    ], None)
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            }
+        ]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        match PolarsPluginObject::try_from_pipeline(plugin, input, call.head)? {
+            PolarsPluginObject::NuDataFrame(df) => command_eager(plugin, engine, call, df),
+            PolarsPluginObject::NuLazyFrame(lazy) => command_lazy(plugin, engine, call, lazy),
+            _ => Err(ShellError::GenericError {
+                error: "Must be a dataframe or lazy dataframe".into(),
+                msg: "".into(),
+                span: Some(call.head),
+                help: None,
+                inner: vec![],
+            }),
+        }
+        .map_err(LabeledError::from)
+    }
+}
+
+fn command_eager(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    df: NuDataFrame,
+) -> Result<PipelineData, ShellError> {
+    let id_col: Vec<Value> = call.get_flag("columns")?.expect("required value");
+    let val_col: Vec<Value> = call.get_flag("values")?.expect("required value");
+
+    let value_name: Option<Spanned<String>> = call.get_flag("value-name")?;
+    let variable_name: Option<Spanned<String>> = call.get_flag("variable-name")?;
+
+    let (id_col_string, id_col_span) = convert_columns_string(id_col, call.head)?;
+    let (val_col_string, val_col_span) = convert_columns_string(val_col, call.head)?;
+
+    check_column_datatypes(df.as_ref(), &id_col_string, id_col_span)?;
+    check_column_datatypes(df.as_ref(), &val_col_string, val_col_span)?;
+
+    let mut res = df
+        .as_ref()
+        .unpivot(&val_col_string, &id_col_string)
+        .map_err(|e| ShellError::GenericError {
+            error: "Error calculating unpivot".into(),
+            msg: e.to_string(),
+            span: Some(call.head),
+            help: None,
+            inner: vec![],
+        })?;
+
+    if let Some(name) = &variable_name {
+        res.rename("variable", &name.item)
+            .map_err(|e| ShellError::GenericError {
+                error: "Error renaming column".into(),
+                msg: e.to_string(),
+                span: Some(name.span),
+                help: None,
+                inner: vec![],
+            })?;
+    }
+
+    if let Some(name) = &value_name {
+        res.rename("value", &name.item)
+            .map_err(|e| ShellError::GenericError {
+                error: "Error renaming column".into(),
+                msg: e.to_string(),
+                span: Some(name.span),
+                help: None,
+                inner: vec![],
+            })?;
+    }
+
+    let res = NuDataFrame::new(false, res);
+    res.to_pipeline_data(plugin, engine, call.head)
+}
+
+fn command_lazy(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    df: NuLazyFrame,
+) -> Result<PipelineData, ShellError> {
+    let id_col: Vec<Value> = call.get_flag("columns")?.expect("required value");
+    let val_col: Vec<Value> = call.get_flag("values")?.expect("required value");
+
+    let (id_col_string, _id_col_span) = convert_columns_string(id_col, call.head)?;
+    let (val_col_string, _val_col_span) = convert_columns_string(val_col, call.head)?;
+
+    let value_name: Option<String> = call.get_flag("value-name")?;
+    let variable_name: Option<String> = call.get_flag("variable-name")?;
+
+    let streamable = call.has_flag("streamable")?;
+
+    let unpivot_args = UnpivotArgs {
+        on: val_col_string.iter().map(Into::into).collect(),
+        index: id_col_string.iter().map(Into::into).collect(),
+        value_name: value_name.map(Into::into),
+        variable_name: variable_name.map(Into::into),
+        streamable,
+    };
+
+    let polars_df = df.to_polars().unpivot(unpivot_args);
+
+    let res = NuLazyFrame::new(false, polars_df);
+    res.to_pipeline_data(plugin, engine, call.head)
+}
+
+fn check_column_datatypes<T: AsRef<str>>(
+    df: &polars::prelude::DataFrame,
+    cols: &[T],
+    col_span: Span,
+) -> Result<(), ShellError> {
+    if cols.is_empty() {
+        return Err(ShellError::GenericError {
+            error: "Merge error".into(),
+            msg: "empty column list".into(),
+            span: Some(col_span),
+            help: None,
+            inner: vec![],
+        });
+    }
+
+    // Checking if they are same type
+    if cols.len() > 1 {
+        for w in cols.windows(2) {
+            let l_series = df
+                .column(w[0].as_ref())
+                .map_err(|e| ShellError::GenericError {
+                    error: "Error selecting columns".into(),
+                    msg: e.to_string(),
+                    span: Some(col_span),
+                    help: None,
+                    inner: vec![],
+                })?;
+
+            let r_series = df
+                .column(w[1].as_ref())
+                .map_err(|e| ShellError::GenericError {
+                    error: "Error selecting columns".into(),
+                    msg: e.to_string(),
+                    span: Some(col_span),
+                    help: None,
+                    inner: vec![],
+                })?;
+
+            if l_series.dtype() != r_series.dtype() {
+                return Err(ShellError::GenericError {
+                    error: "Merge error".into(),
+                    msg: "found different column types in list".into(),
+                    span: Some(col_span),
+                    help: Some(format!(
+                        "datatypes {} and {} are incompatible",
+                        l_series.dtype(),
+                        r_series.dtype()
+                    )),
+                    inner: vec![],
+                });
+            }
+        }
+    }
+
+    Ok(())
+}
+
+#[cfg(test)]
+mod test {
+    use crate::test::test_polars_plugin_command;
+
+    use super::*;
+
+    #[test]
+    fn test_examples() -> Result<(), ShellError> {
+        test_polars_plugin_command(&UnpivotDF)
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/aggregate.rs b/crates/nu_plugin_polars/src/dataframe/lazy/aggregate.rs
index d2fd92ec87..add72faf88 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/aggregate.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/aggregate.rs
@@ -196,7 +196,8 @@ fn get_col_name(expr: &Expr) -> Option<String> {
         | Expr::Nth(_)
         | Expr::SubPlan(_, _)
         | Expr::IndexColumn(_)
-        | Expr::Selector(_) => None,
+        | Expr::Selector(_)
+        | Expr::Field(_) => None,
     }
 }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/groupby.rs b/crates/nu_plugin_polars/src/dataframe/lazy/groupby.rs
index 9edf8f5e60..b7bd1017a3 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/groupby.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/groupby.rs
@@ -148,11 +148,11 @@ fn command(
     plugin: &PolarsPlugin,
     engine: &EngineInterface,
     call: &EvaluatedCall,
-    lazy: NuLazyFrame,
+    mut lazy: NuLazyFrame,
     expressions: Vec<Expr>,
 ) -> Result<PipelineData, ShellError> {
     let group_by = lazy.to_polars().group_by(expressions);
-    let group_by = NuLazyGroupBy::new(group_by, lazy.from_eager, lazy.schema()?);
+    let group_by = NuLazyGroupBy::new(group_by, lazy.from_eager, lazy.schema().clone()?);
     group_by.to_pipeline_data(plugin, engine, call.head)
 }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/join.rs b/crates/nu_plugin_polars/src/dataframe/lazy/join.rs
index 67f5aee9ba..01fb2ac24d 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/join.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/join.rs
@@ -35,7 +35,7 @@ impl PluginCommand for LazyJoin {
                 Some('i'),
             )
             .switch("left", "left join between lazyframes", Some('l'))
-            .switch("outer", "outer join between lazyframes", Some('o'))
+            .switch("full", "full join between lazyframes", Some('f'))
             .switch("cross", "cross join between lazyframes", Some('c'))
             .named(
                 "suffix",
@@ -183,13 +183,13 @@ impl PluginCommand for LazyJoin {
         input: PipelineData,
     ) -> Result<PipelineData, LabeledError> {
         let left = call.has_flag("left")?;
-        let outer = call.has_flag("outer")?;
+        let full = call.has_flag("full")?;
         let cross = call.has_flag("cross")?;
 
         let how = if left {
             JoinType::Left
-        } else if outer {
-            JoinType::Outer
+        } else if full {
+            JoinType::Full
         } else if cross {
             JoinType::Cross
         } else {
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/sort_by_expr.rs b/crates/nu_plugin_polars/src/dataframe/lazy/sort_by_expr.rs
index b282bd6d04..20251a0ea0 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/sort_by_expr.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/sort_by_expr.rs
@@ -140,7 +140,7 @@ impl PluginCommand for LazySortBy {
 
         let sort_options = SortMultipleOptions {
             descending: reverse,
-            nulls_last,
+            nulls_last: vec![nulls_last],
             multithreaded: true,
             maintain_order,
         };
diff --git a/crates/nu_plugin_polars/src/dataframe/series/indexes/set_with_idx.rs b/crates/nu_plugin_polars/src/dataframe/series/indexes/set_with_idx.rs
index 6b1578ad0e..436ba92f96 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/indexes/set_with_idx.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/indexes/set_with_idx.rs
@@ -7,7 +7,10 @@ use nu_protocol::{
     Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
     Value,
 };
-use polars::prelude::{ChunkSet, DataType, IntoSeries};
+use polars::{
+    chunked_array::cast::CastOptions,
+    prelude::{ChunkSet, DataType, IntoSeries},
+};
 
 #[derive(Clone)]
 pub struct SetWithIndex;
@@ -96,7 +99,7 @@ fn command(
     let casted = match indices.dtype() {
         DataType::UInt32 | DataType::UInt64 | DataType::Int32 | DataType::Int64 => indices
             .as_ref()
-            .cast(&DataType::UInt32)
+            .cast(&DataType::UInt32, CastOptions::default())
             .map_err(|e| ShellError::GenericError {
                 error: "Error casting indices".into(),
                 msg: e.to_string(),
diff --git a/crates/nu_plugin_polars/src/dataframe/series/value_counts.rs b/crates/nu_plugin_polars/src/dataframe/series/value_counts.rs
index 36d8718ff8..16471e7b9f 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/value_counts.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/value_counts.rs
@@ -4,7 +4,8 @@ use super::super::values::{Column, NuDataFrame};
 
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
-    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Type, Value,
+    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
+    Value,
 };
 
 use polars::prelude::SeriesMethods;
@@ -25,6 +26,24 @@ impl PluginCommand for ValueCount {
 
     fn signature(&self) -> Signature {
         Signature::build(self.name())
+            .named(
+                "column",
+                SyntaxShape::String,
+                "Provide a custom name for the coutn column",
+                Some('c'),
+            )
+            .switch("sort", "Whether or not values should be sorted", Some('s'))
+            .switch(
+                "parallel",
+                "Use multiple threads when processing",
+                Some('p'),
+            )
+            .named(
+                "normalize",
+                SyntaxShape::String,
+                "Normalize the counts",
+                Some('n'),
+            )
             .input_output_type(
                 Type::Custom("dataframe".into()),
                 Type::Custom("dataframe".into()),
@@ -73,11 +92,15 @@ fn command(
     call: &EvaluatedCall,
     input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
+    let column = call.get_flag("column")?.unwrap_or("count".to_string());
+    let parallel = call.has_flag("parallel")?;
+    let sort = call.has_flag("sort")?;
+    let normalize = call.has_flag("normalize")?;
     let df = NuDataFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
     let series = df.as_series(call.head)?;
 
     let res = series
-        .value_counts(false, false)
+        .value_counts(sort, parallel, column, normalize)
         .map_err(|e| ShellError::GenericError {
             error: "Error calculating value counts values".into(),
             msg: e.to_string(),
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/between_values.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/between_values.rs
index a47197bde8..c92e657fb9 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/between_values.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/between_values.rs
@@ -41,19 +41,37 @@ pub(super) fn compute_between_series(
     let operation_span = Span::merge(left.span(), right.span());
     match operator.item {
         Operator::Math(Math::Plus) => {
-            let mut res = lhs + rhs;
+            let mut res = (lhs + rhs).map_err(|e| ShellError::GenericError {
+                error: format!("Addition error: {e}"),
+                msg: "".into(),
+                span: Some(operation_span),
+                help: None,
+                inner: vec![],
+            })?;
             let name = format!("sum_{}_{}", lhs.name(), rhs.name());
             res.rename(&name);
             NuDataFrame::try_from_series(res, operation_span)
         }
         Operator::Math(Math::Minus) => {
-            let mut res = lhs - rhs;
+            let mut res = (lhs - rhs).map_err(|e| ShellError::GenericError {
+                error: format!("Subtraction error: {e}"),
+                msg: "".into(),
+                span: Some(operation_span),
+                help: None,
+                inner: vec![],
+            })?;
             let name = format!("sub_{}_{}", lhs.name(), rhs.name());
             res.rename(&name);
             NuDataFrame::try_from_series(res, operation_span)
         }
         Operator::Math(Math::Multiply) => {
-            let mut res = lhs * rhs;
+            let mut res = (lhs * rhs).map_err(|e| ShellError::GenericError {
+                error: format!("Multiplication error: {e}"),
+                msg: "".into(),
+                span: Some(operation_span),
+                help: None,
+                inner: vec![],
+            })?;
             let name = format!("mul_{}_{}", lhs.name(), rhs.name());
             res.rename(&name);
             NuDataFrame::try_from_series(res, operation_span)
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_expression/mod.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_expression/mod.rs
index cead8c4a11..af00ca94a5 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_expression/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_expression/mod.rs
@@ -1,7 +1,10 @@
 mod custom_value;
 
 use nu_protocol::{record, ShellError, Span, Value};
-use polars::prelude::{col, AggExpr, Expr, Literal};
+use polars::{
+    chunked_array::cast::CastOptions,
+    prelude::{col, AggExpr, Expr, Literal},
+};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use uuid::Uuid;
 
@@ -269,15 +272,23 @@ pub fn expr_to_value(expr: &Expr, span: Span) -> Result<Value, ShellError> {
         Expr::Cast {
             expr,
             data_type,
-            strict,
-        } => Ok(Value::record(
-            record! {
-                "expr" => expr_to_value(expr.as_ref(), span)?,
-                "dtype" => Value::string(format!("{data_type:?}"), span),
-                "strict" => Value::bool(*strict, span),
-            },
-            span,
-        )),
+            options,
+        } => {
+            let cast_option_str = match options {
+                CastOptions::Strict => "STRICT",
+                CastOptions::NonStrict => "NON_STRICT",
+                CastOptions::Overflowing => "OVERFLOWING",
+            };
+
+            Ok(Value::record(
+                record! {
+                    "expr" => expr_to_value(expr.as_ref(), span)?,
+                    "dtype" => Value::string(format!("{data_type:?}"), span),
+                    "cast_options" => Value::string(cast_option_str, span)
+                },
+                span,
+            ))
+        }
         Expr::Gather {
             expr,
             idx,
@@ -388,6 +399,7 @@ pub fn expr_to_value(expr: &Expr, span: Span) -> Result<Value, ShellError> {
         Expr::Window {
             function,
             partition_by,
+            order_by,
             options,
         } => {
             let partition_by: Result<Vec<Value>, ShellError> = partition_by
@@ -399,6 +411,23 @@ pub fn expr_to_value(expr: &Expr, span: Span) -> Result<Value, ShellError> {
                 record! {
                     "function" => expr_to_value(function, span)?,
                     "partition_by" => Value::list(partition_by?, span),
+                    "order_by" => {
+                        if let Some((order_expr, sort_options)) = order_by {
+                            Value::record(record! {
+                                "expr" => expr_to_value(order_expr.as_ref(), span)?,
+                                "sort_options" => {
+                                    Value::record(record!(
+                                        "descending" => Value::bool(sort_options.descending, span),
+                                        "nulls_last"=> Value::bool(sort_options.nulls_last, span),
+                                        "multithreaded"=> Value::bool(sort_options.multithreaded, span),
+                                        "maintain_order"=> Value::bool(sort_options.maintain_order, span),
+                                    ), span)
+                                }
+                            }, span)
+                        } else {
+                            Value::nothing(span)
+                        }
+                    },
                     "options" => Value::string(format!("{options:?}"), span),
                 },
                 span,
@@ -424,6 +453,18 @@ pub fn expr_to_value(expr: &Expr, span: Span) -> Result<Value, ShellError> {
             msg_span: span,
             input_span: Span::unknown(),
         }),
+        Expr::Field(column_name) => {
+            let fields: Vec<Value> = column_name
+                .iter()
+                .map(|s| Value::string(s.to_string(), span))
+                .collect();
+            Ok(Value::record(
+                record!(
+                    "fields" => Value::list(fields, span)
+                ),
+                span,
+            ))
+        }
     }
 }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/mod.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/mod.rs
index 4dc231d706..e89f14c316 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/mod.rs
@@ -77,14 +77,17 @@ impl NuLazyFrame {
         Self::new(self.from_eager, new_frame)
     }
 
-    pub fn schema(&self) -> Result<NuSchema, ShellError> {
-        let internal_schema = self.lazy.schema().map_err(|e| ShellError::GenericError {
-            error: "Error getting schema from lazy frame".into(),
-            msg: e.to_string(),
-            span: None,
-            help: None,
-            inner: vec![],
-        })?;
+    pub fn schema(&mut self) -> Result<NuSchema, ShellError> {
+        let internal_schema =
+            Arc::make_mut(&mut self.lazy)
+                .schema()
+                .map_err(|e| ShellError::GenericError {
+                    error: "Error getting schema from lazy frame".into(),
+                    msg: e.to_string(),
+                    span: None,
+                    help: None,
+                    inner: vec![],
+                })?;
         Ok(internal_schema.into())
     }
 

From 4f8d82bb88c40d7edf13c1247985b6ca0b186c26 Mon Sep 17 00:00:00 2001
From: Bruce Weirdan <weirdan@gmail.com>
Date: Fri, 28 Jun 2024 19:50:20 +0200
Subject: [PATCH 0158/1072] Added support for multiple attributes to `query web
 -a` (#13256)

# Description

Allows specifying multiple attributes to retrieve from the selected
nodes. E.g. you may want to select both hrefs and targets from the list
of links:

```nushell
.... | query web --query a --attribute [href target]
```
# User-Facing Changes

`query web --attribute` previously accepted a string. Now it accepts
either a string or a list of strings.

The shape definition for this flag was relaxed temporarily, until
nushell/nushell#13253 is fixed.
---
 crates/nu_plugin_query/src/query_web.rs | 117 +++++++++++++++++++++++-
 1 file changed, 112 insertions(+), 5 deletions(-)

diff --git a/crates/nu_plugin_query/src/query_web.rs b/crates/nu_plugin_query/src/query_web.rs
index b78dccbc63..163b320e16 100644
--- a/crates/nu_plugin_query/src/query_web.rs
+++ b/crates/nu_plugin_query/src/query_web.rs
@@ -24,10 +24,20 @@ impl SimplePluginCommand for QueryWeb {
             .switch("as-html", "return the query output as html", Some('m'))
             .named(
                 "attribute",
-                SyntaxShape::String,
+                SyntaxShape::Any,
                 "downselect based on the given attribute",
                 Some('a'),
             )
+            // TODO: use detailed shape when https://github.com/nushell/nushell/issues/13253 is resolved
+            // .named(
+            //     "attribute",
+            //     SyntaxShape::OneOf(vec![
+            //         SyntaxShape::List(Box::new(SyntaxShape::String)),
+            //         SyntaxShape::String,
+            //     ]),
+            //     "downselect based on the given attribute",
+            //     Some('a'),
+            // )
             .named(
                 "as-table",
                 SyntaxShape::List(Box::new(SyntaxShape::String)),
@@ -79,6 +89,11 @@ pub fn web_examples() -> Vec<Example<'static>> {
             example: "http get https://example.org | query web --query a --attribute href",
             description: "Retrieve a specific html attribute instead of the default text",
             result: None,
+        },
+        Example {
+            example: r#"http get https://www.rust-lang.org | query web --query 'meta[property^="og:"]' --attribute [ property content ]"#,
+            description: r#"Retrieve the OpenGraph properties (`<meta property="og:...">`) from a web page"#,
+            result: None,
         }
     ]
 }
@@ -86,7 +101,7 @@ pub fn web_examples() -> Vec<Example<'static>> {
 pub struct Selector {
     pub query: String,
     pub as_html: bool,
-    pub attribute: String,
+    pub attribute: Value,
     pub as_table: Value,
     pub inspect: bool,
 }
@@ -96,7 +111,7 @@ impl Selector {
         Selector {
             query: String::new(),
             as_html: false,
-            attribute: String::new(),
+            attribute: Value::string("".to_string(), Span::unknown()),
             as_table: Value::string("".to_string(), Span::unknown()),
             inspect: false,
         }
@@ -113,7 +128,9 @@ pub fn parse_selector_params(call: &EvaluatedCall, input: &Value) -> Result<Valu
     let head = call.head;
     let query: Option<Spanned<String>> = call.get_flag("query")?;
     let as_html = call.has_flag("as-html")?;
-    let attribute = call.get_flag("attribute")?.unwrap_or_default();
+    let attribute = call
+        .get_flag("attribute")?
+        .unwrap_or_else(|| Value::nothing(head));
     let as_table: Value = call
         .get_flag("as-table")?
         .unwrap_or_else(|| Value::nothing(head));
@@ -160,11 +177,19 @@ fn begin_selector_query(input_html: String, selector: Selector, span: Span) -> V
             selector.inspect,
             span,
         )
+    } else if let Value::List { .. } = selector.attribute {
+        execute_selector_query_with_attributes(
+            input_html.as_str(),
+            selector.query.as_str(),
+            &selector.attribute,
+            selector.inspect,
+            span,
+        )
     } else {
         execute_selector_query_with_attribute(
             input_html.as_str(),
             selector.query.as_str(),
-            selector.attribute.as_str(),
+            selector.attribute.as_str().unwrap_or(""),
             selector.inspect,
             span,
         )
@@ -317,6 +342,40 @@ fn execute_selector_query_with_attribute(
     Value::list(vals, span)
 }
 
+fn execute_selector_query_with_attributes(
+    input_string: &str,
+    query_string: &str,
+    attributes: &Value,
+    inspect: bool,
+    span: Span,
+) -> Value {
+    let doc = Html::parse_fragment(input_string);
+
+    let mut attrs: Vec<String> = Vec::new();
+    if let Value::List { vals, .. } = &attributes {
+        for x in vals {
+            if let Value::String { val, .. } = x {
+                attrs.push(val.to_string())
+            }
+        }
+    }
+
+    let vals: Vec<Value> = doc
+        .select(&css(query_string, inspect))
+        .map(|selection| {
+            let mut record = Record::new();
+            for attr in &attrs {
+                record.push(
+                    attr.to_string(),
+                    Value::string(selection.value().attr(attr).unwrap_or("").to_string(), span),
+                );
+            }
+            Value::record(record, span)
+        })
+        .collect();
+    Value::list(vals, span)
+}
+
 fn execute_selector_query(
     input_string: &str,
     query_string: &str,
@@ -369,6 +428,10 @@ mod tests {
      "#;
 
     const NESTED_TEXT: &str = r#"<p>Hello there, <span style="color: red;">World</span></p>"#;
+    const MULTIPLE_ATTRIBUTES: &str = r#"
+        <a href="https://example.org" target="_blank">Example</a>
+        <a href="https://example.com" target="_self">Example</a>
+    "#;
 
     #[test]
     fn test_first_child_is_not_empty() {
@@ -424,4 +487,48 @@ mod tests {
             vec![vec!["Hello there, ".to_string(), "World".to_string()]],
         );
     }
+
+    #[test]
+    fn test_multiple_attributes() {
+        let item = execute_selector_query_with_attributes(
+            MULTIPLE_ATTRIBUTES,
+            "a",
+            &Value::list(
+                vec![
+                    Value::string("href".to_string(), Span::unknown()),
+                    Value::string("target".to_string(), Span::unknown()),
+                ],
+                Span::unknown(),
+            ),
+            false,
+            Span::test_data(),
+        );
+        let out = item
+            .into_list()
+            .unwrap()
+            .into_iter()
+            .map(|matches| {
+                matches
+                    .into_record()
+                    .unwrap()
+                    .into_iter()
+                    .map(|(key, value)| (key, value.coerce_into_string().unwrap()))
+                    .collect::<Vec<(String, String)>>()
+            })
+            .collect::<Vec<Vec<(String, String)>>>();
+
+        assert_eq!(
+            out,
+            vec![
+                vec![
+                    ("href".to_string(), "https://example.org".to_string()),
+                    ("target".to_string(), "_blank".to_string())
+                ],
+                vec![
+                    ("href".to_string(), "https://example.com".to_string()),
+                    ("target".to_string(), "_self".to_string())
+                ]
+            ]
+        )
+    }
 }

From 153b45bc63b6b65a34e3efa966a2fb4c8af999ab Mon Sep 17 00:00:00 2001
From: Tim Martin <tim@timmart.in>
Date: Fri, 28 Jun 2024 18:11:48 -0500
Subject: [PATCH 0159/1072] Surprising symlink resolution for std `path add`
 (#13258)

# Description
The standard library's `path add` function has some surprising side
effects that I attempt to address in this PR:

1. Paths added, if they are symbolic links, should not be resolved to
their targets. Currently, resolution happens.

   Imagine the following:

   ```nu
# Some time earlier, perhaps even not by the user, a symlink is created
   mkdir real-dir
   ln -s real-dir link-dir

   # Then, step to now, with link-dir that we want in our PATHS variable
   use std
   path add link-dir
   ```

In the current implementation of `path add`, it is _not_ `link-dir` that
will be added, as has been stated in the command. It is instead
`real-dir`. This is surprising. Users have the agency to do this
resolution if they wish with `path expand` (sans a `--no-symlink` flag):
for example, `path add (link-dir | path expand)`

In particular, when I was trying to set up
[fnm](https://github.com/Schniz/fnm), a Node.js version manager, I was
bitten by this fact when `fnm` told me that an expected path had not
been added to the PATHS variable. It was looking for the non-resolved
link. The user in [this
comment](https://github.com/Schniz/fnm/issues/463#issuecomment-1710050737)
was likely affected by this too.

Shells, such as nushell, can handle path symlinks just fine. Binary
lookup is unaffected. Let resolution be opt-in.

Lastly, there is some convention already in place for **not** resolving
path symlinks in the [default $env.ENV_CONVERSIONS
table](https://github.com/nushell/nushell/blob/57452337ff4e228102433e99b4c6000700a9b3b2/crates/nu-utils/src/sample_config/default_env.nu#L65).

2. All existing paths in the path variable should be left untouched.
Currently, they are `path expand`-ed (including symbolic link
resolution).

   Path add should mean just that: prepend/append this path.

Instead, it currently means that, _plus mutate all other paths in the
variable_.

Again, users have the agency to do this with something like `$env.PATH =
$env.PATH | split row (char esep) | path expand`.

3. Minorly, I update documentation on running tests in
`crates/nu-std/CONTRIBUTING.md`. The offered command to run the standard
library test suite was no longer functional. Thanks to @weirdan in [this
Discord
conversation](https://discord.com/channels/601130461678272522/614593951969574961/1256029201119576147)
for the context.

# User-Facing Changes

(Written from the perspective of release notes)

- The standard library's `path add` function no longer resolves symlinks
in either the newly added paths, nor the other paths already in the
variable.

# Tests + Formatting

A test for the changes working correctly has been added to
`crates/nu-std/tests/test_std.nu` under the test named
`path_add_expand`.

You can quickly verify this new test and the existing `path add` test
with the following command:

```nu
cargo run -- -c 'use crates/nu-std/testing.nu; NU_LOG_LEVEL=INFO testing run-tests --path crates/nu-std --test path_add'
```

All commands suggested in the issue template have been run and complete
without error.

# After Submitting
I'll add a release note to [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged.
---
 crates/nu-std/CONTRIBUTING.md   |  4 ++--
 crates/nu-std/std/mod.nu        |  3 +--
 crates/nu-std/tests/test_std.nu | 28 +++++++++++++++++++++++++++-
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/crates/nu-std/CONTRIBUTING.md b/crates/nu-std/CONTRIBUTING.md
index 1677a31de1..e866cc9206 100644
--- a/crates/nu-std/CONTRIBUTING.md
+++ b/crates/nu-std/CONTRIBUTING.md
@@ -204,7 +204,7 @@ More design guidelines:
 ### Useful Commands
 - Run all unit tests for the standard library:
   ```nushell
-  cargo run -- -c 'use std testing; testing run-tests --path crates/nu-std'
+  cargo run -- -c 'use crates/nu-std/testing.nu; testing run-tests --path crates/nu-std'
   ```
   > **Note**  
   > this uses the debug version of NU interpreter from the same repo, which is
@@ -216,7 +216,7 @@ More design guidelines:
 - Run all tests for a specific test module, e.g,
   `crates/nu-std/tests/test_foo.nu`
   ```nushell
-  cargo run -- -c 'use std testing; testing run-tests --path crates/nu-std --module test_foo'
+  cargo run -- -c 'use crates/nu-std/testing.nu; testing run-tests --path crates/nu-std --module test_foo'
   ```
 - Run a custom command with additional logging (assuming you have instrumented
   the command with `log <level>`, as we recommend.)
diff --git a/crates/nu-std/std/mod.nu b/crates/nu-std/std/mod.nu
index 15bad0e8e5..4d4f2bb0f1 100644
--- a/crates/nu-std/std/mod.nu
+++ b/crates/nu-std/std/mod.nu
@@ -66,7 +66,7 @@ export def --env "path add" [
             "record" => { $p | get --ignore-errors $nu.os-info.name },
         }
 
-        $p | path expand
+        $p | path expand --no-symlink
     }
 
     if null in $paths or ($paths | is-empty) {
@@ -80,7 +80,6 @@ export def --env "path add" [
         $env
             | get $path_name
             | split row (char esep)
-            | path expand
             | if $append { append $paths } else { prepend $paths }
     )}
 
diff --git a/crates/nu-std/tests/test_std.nu b/crates/nu-std/tests/test_std.nu
index 45633719a0..6ac7c6b9e0 100644
--- a/crates/nu-std/tests/test_std.nu
+++ b/crates/nu-std/tests/test_std.nu
@@ -38,12 +38,38 @@ def path_add [] {
         std path add $target_paths
         assert equal (get_path) ([($target_paths | get $nu.os-info.name)] | path expand)
 
-        load-env {$path_name: [$"/foo(char esep)/bar"]}
+        load-env {$path_name: [$"(["/foo", "/bar"] | path expand | str join (char esep))"]}
         std path add "~/foo"
         assert equal (get_path) (["~/foo", "/foo", "/bar"] | path expand)
     }
 }
 
+#[test]
+def path_add_expand [] {
+    use std assert
+
+    # random paths to avoid collision, especially if left dangling on failure
+    let real_dir = $nu.temp-path | path join $"real-dir-(random chars)"
+    let link_dir = $nu.temp-path | path join $"link-dir-(random chars)"
+    mkdir $real_dir
+    let path_name = if $nu.os-info.family == 'windows' {
+        mklink /D $link_dir $real_dir
+        "Path"
+    } else {
+        ln -s $real_dir $link_dir | ignore
+        "PATH"
+    }
+
+    with-env {$path_name: []} {
+        def get_path [] { $env | get $path_name }
+
+        std path add $link_dir
+        assert equal (get_path) ([$link_dir])
+    }
+
+    rm $real_dir $link_dir
+}
+
 #[test]
 def banner [] {
     std assert ((std banner | lines | length) == 15)

From 1b1928c103cef7457a37b1db9f4b010b48e57bc7 Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Sat, 29 Jun 2024 16:10:17 +0800
Subject: [PATCH 0160/1072] Update Nu version to v0.95 and setup-nu for
 workflows (#13265)

Update Nu version to v0.95 and setup-nu to v3.12 for workflows
The change has been tested here:
https://github.com/nushell/nightly/actions/runs/9722586476
---
 .github/workflows/nightly-build.yml | 12 ++++++------
 .github/workflows/release.yml       |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 31533cc3d8..8097b02fe6 100644
--- 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
@@ -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
@@ -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
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 208acd42b5..dd3371e0d3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -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

From 40e629beb103ed3669a1b0765a12bf8292610132 Mon Sep 17 00:00:00 2001
From: alex-tdrn <alex-tdrn@protonmail.com>
Date: Sat, 29 Jun 2024 23:12:17 +0200
Subject: [PATCH 0161/1072] Fix multibyte codepoint handling in `detect columns
 --guess` (#13272)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

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

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
This PR fixes #13269. The splitting code in `guess_width.rs` was
creating slices from char indices, instead of byte indices. This works
perfectly fine for 1-byte code points, but panics or returns wrong
results as soon as multibyte codepoints appear in the input. I
originally discovered this by piping `winget list` into `detect columns
--guess`, since winget sometimes uses the unicode ellipsis symbol (`…`)
which is 3 bytes long when encoded in utf-8.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
`detect columns --guess` should not crash due to multibyte unicode input
anymore

before:

![image](https://github.com/nushell/nushell/assets/20356389/833cd732-be3b-4158-97f7-0ca2616ce23f)

after:

![image](https://github.com/nushell/nushell/assets/20356389/15358b40-4083-4a33-9f2c-87e63f39d985)


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

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

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

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->
- Added tests to `guess_width.rs` for testing handling of multibyte as
well as combining diacritical marks

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/strings/guess_width.rs | 60 ++++++++++++++++----
 1 file changed, 50 insertions(+), 10 deletions(-)

diff --git a/crates/nu-command/src/strings/guess_width.rs b/crates/nu-command/src/strings/guess_width.rs
index 59cfbcb2cf..b214b21bcc 100644
--- a/crates/nu-command/src/strings/guess_width.rs
+++ b/crates/nu-command/src/strings/guess_width.rs
@@ -175,34 +175,34 @@ fn separator_position(lr: &[char], p: usize, pos: &[usize], n: usize) -> usize {
 
 fn split(line: &str, pos: &[usize], trim_space: bool) -> Vec<String> {
     let mut n = 0;
-    let mut start = 0;
+    let mut start_char = 0;
     let mut columns = Vec::with_capacity(pos.len() + 1);
-    let lr: Vec<char> = line.chars().collect();
+    let (line_char_boundaries, line_chars): (Vec<usize>, Vec<char>) = line.char_indices().unzip();
     let mut w = 0;
 
-    for p in 0..lr.len() {
+    for p in 0..line_char_boundaries.len() {
         if pos.is_empty() || n > pos.len() - 1 {
-            start = p;
+            start_char = p;
             break;
         }
 
         if pos[n] <= w {
-            let end = separator_position(&lr, p, pos, n);
-            if start > end {
+            let end_char = separator_position(&line_chars, p, pos, n);
+            if start_char > end_char {
                 break;
             }
-            let col = &line[start..end];
+            let col = &line[line_char_boundaries[start_char]..line_char_boundaries[end_char]];
             let col = if trim_space { col.trim() } else { col };
             columns.push(col.to_string());
             n += 1;
-            start = end;
+            start_char = end_char;
         }
 
-        w += UnicodeWidthStr::width(lr[p].to_string().as_str());
+        w += UnicodeWidthStr::width(line_chars[p].to_string().as_str());
     }
 
     // add last part.
-    let col = &line[start..];
+    let col = &line[line_char_boundaries[start_char]..];
     let col = if trim_space { col.trim() } else { col };
     columns.push(col.to_string());
     columns
@@ -423,6 +423,46 @@ D:             104792064  17042676  87749388  17% /d";
         assert_eq!(got, want);
     }
 
+    #[test]
+    fn test_guess_width_multibyte() {
+        let input = "A… B\nC… D";
+        let r = Box::new(std::io::BufReader::new(input.as_bytes())) as Box<dyn std::io::Read>;
+        let reader = std::io::BufReader::new(r);
+
+        let mut guess_width = GuessWidth {
+            reader,
+            pos: Vec::new(),
+            pre_lines: Vec::new(),
+            pre_count: 0,
+            limit_split: 0,
+        };
+
+        let want = vec![vec!["A…", "B"], vec!["C…", "D"]];
+        let got = guess_width.read_all();
+        assert_eq!(got, want);
+    }
+
+    #[test]
+    fn test_guess_width_combining_diacritical_marks() {
+        let input = "Name        Surname
+Ștefan         Țincu ";
+
+        let r = Box::new(std::io::BufReader::new(input.as_bytes())) as Box<dyn std::io::Read>;
+        let reader = std::io::BufReader::new(r);
+
+        let mut guess_width = GuessWidth {
+            reader,
+            pos: Vec::new(),
+            pre_lines: Vec::new(),
+            pre_count: 0,
+            limit_split: 0,
+        };
+
+        let want = vec![vec!["Name", "Surname"], vec!["Ștefan", "Țincu"]];
+        let got = guess_width.read_all();
+        assert_eq!(got, want);
+    }
+
     #[test]
     fn test_to_table() {
         let lines = vec![

From 33d0537cae506b1cf1454ff3a5c9b15336e0fb6a Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Sat, 29 Jun 2024 16:12:34 -0500
Subject: [PATCH 0162/1072] add `str deunicode` command (#13270)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

Sometimes it's helpful to deal with only ASCII. This command will take a
unicode string as input and convert it to ASCII using the deunicode
crate.

```nushell
❯ "A…B" | str deunicode
A...B
```

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock                                    |  9 +-
 Cargo.toml                                    |  1 +
 crates/nu-command/Cargo.toml                  |  1 +
 crates/nu-command/src/default_context.rs      |  1 +
 .../nu-command/src/strings/str_/deunicode.rs  | 98 +++++++++++++++++++
 crates/nu-command/src/strings/str_/mod.rs     |  2 +
 6 files changed, 111 insertions(+), 1 deletion(-)
 create mode 100644 crates/nu-command/src/strings/str_/deunicode.rs

diff --git a/Cargo.lock b/Cargo.lock
index b82951b2b7..e2652a4178 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -377,7 +377,7 @@ dependencies = [
  "bitflags 2.5.0",
  "cexpr",
  "clang-sys",
- "itertools 0.11.0",
+ "itertools 0.12.1",
  "lazy_static",
  "lazycell",
  "proc-macro2",
@@ -1148,6 +1148,12 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "deunicode"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00"
+
 [[package]]
 name = "dialoguer"
 version = "0.11.0"
@@ -2967,6 +2973,7 @@ dependencies = [
  "chrono-tz 0.8.6",
  "crossterm",
  "csv",
+ "deunicode",
  "dialoguer",
  "digest",
  "dirs-next",
diff --git a/Cargo.toml b/Cargo.toml
index c88eee88ea..f79476e7e6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -80,6 +80,7 @@ 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"
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 474742ae0a..9c49a69ff5 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -42,6 +42,7 @@ chrono-humanize = { workspace = true }
 chrono-tz = { workspace = true }
 crossterm = { workspace = true }
 csv = { workspace = true }
+deunicode = { workspace = true }
 dialoguer = { workspace = true, default-features = false, features = ["fuzzy-select"] }
 digest = { workspace = true, default-features = false }
 dtparse = { workspace = true }
diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index 0901d56588..847d2349ed 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -189,6 +189,7 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             Str,
             StrCapitalize,
             StrContains,
+            StrDeunicode,
             StrDistance,
             StrDowncase,
             StrEndswith,
diff --git a/crates/nu-command/src/strings/str_/deunicode.rs b/crates/nu-command/src/strings/str_/deunicode.rs
new file mode 100644
index 0000000000..0b70cf2003
--- /dev/null
+++ b/crates/nu-command/src/strings/str_/deunicode.rs
@@ -0,0 +1,98 @@
+use deunicode::deunicode;
+use nu_cmd_base::input_handler::{operate, CellPathOnlyArgs};
+use nu_engine::command_prelude::*;
+use nu_protocol::engine::StateWorkingSet;
+
+#[derive(Clone)]
+pub struct SubCommand;
+
+impl Command for SubCommand {
+    fn name(&self) -> &str {
+        "str deunicode"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("str deunicode")
+            .input_output_types(vec![(Type::String, Type::String)])
+            .category(Category::Strings)
+    }
+
+    fn usage(&self) -> &str {
+        "Convert Unicode string to pure ASCII."
+    }
+
+    fn search_terms(&self) -> Vec<&str> {
+        vec!["convert", "ascii"]
+    }
+
+    fn is_const(&self) -> bool {
+        true
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
+        let args = CellPathOnlyArgs::from(cell_paths);
+
+        operate(action, args, input, call.head, engine_state.ctrlc.clone())
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let cell_paths: Vec<CellPath> = call.rest_const(working_set, 0)?;
+        let args = CellPathOnlyArgs::from(cell_paths);
+
+        operate(
+            action,
+            args,
+            input,
+            call.head,
+            working_set.permanent().ctrlc.clone(),
+        )
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![Example {
+            description: "deunicode a string",
+            example: "'A…B' | str deunicode",
+            result: Some(Value::test_string("A...B")),
+        }]
+    }
+}
+
+fn action(input: &Value, _args: &CellPathOnlyArgs, head: Span) -> Value {
+    match input {
+        Value::String { val, .. } => Value::string(deunicode(val), head),
+        Value::Error { .. } => input.clone(),
+        _ => Value::error(
+            ShellError::OnlySupportsThisInputType {
+                exp_input_type: "string".into(),
+                wrong_type: input.get_type().to_string(),
+                dst_span: head,
+                src_span: input.span(),
+            },
+            head,
+        ),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_examples() {
+        use crate::test_examples;
+
+        test_examples(SubCommand {})
+    }
+}
diff --git a/crates/nu-command/src/strings/str_/mod.rs b/crates/nu-command/src/strings/str_/mod.rs
index fb34ace833..b9290ada2c 100644
--- a/crates/nu-command/src/strings/str_/mod.rs
+++ b/crates/nu-command/src/strings/str_/mod.rs
@@ -1,5 +1,6 @@
 mod case;
 mod contains;
+mod deunicode;
 mod distance;
 mod ends_with;
 mod expand;
@@ -15,6 +16,7 @@ mod trim;
 
 pub use case::*;
 pub use contains::SubCommand as StrContains;
+pub use deunicode::SubCommand as StrDeunicode;
 pub use distance::SubCommand as StrDistance;
 pub use ends_with::SubCommand as StrEndswith;
 pub use expand::SubCommand as StrExpand;

From 4fe0f860a8e5aff7b3184d1b3efb24b9851d98fb Mon Sep 17 00:00:00 2001
From: Andy Gayton <andy@thecablelounge.com>
Date: Sat, 29 Jun 2024 17:13:31 -0400
Subject: [PATCH 0163/1072] feat: add `query webpage-info` to `plugin_nu_query`
 (#13252)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

This PR adds a new subcommand `query webpage-info` to `plugin_nu_query`.
The subcommand is a basic wrapper for the
[`webpage`](https://crates.io/crates/webpage) crate.

Usage:

```
http get https://phoronix.com | query webpage-info
```

and it returns a `Record` version of
[`webpage::HTML`](https://docs.rs/webpage/latest/webpage/struct.HTML.html).

The PR also takes a shot at bringing @lily-mara 's
[nu-serde::to_value](https://github.com/nushell/nushell/pull/3878/files)
back to life, updating it for the latest version of nushell. That's not
the main focus of the PR though - I just didn't want to have to
implement a custom converter for `webpage::HTML` 😅. If it looks
reasonable we could move it to `nu_protocol`(?) either in this PR or a
future one (along with adding tests for it).

# User-Facing Changes

no breaking changes
---
 Cargo.lock                                    | 102 +++-
 crates/nu_plugin_query/Cargo.toml             |   5 +-
 crates/nu_plugin_query/src/lib.rs             |   1 +
 crates/nu_plugin_query/src/query.rs           |   6 +-
 .../nu_plugin_query/src/query_webpage_info.rs | 478 ++++++++++++++++++
 5 files changed, 588 insertions(+), 4 deletions(-)
 create mode 100644 crates/nu_plugin_query/src/query_webpage_info.rs

diff --git a/Cargo.lock b/Cargo.lock
index e2652a4178..aad9bdd990 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1117,6 +1117,36 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "curl"
+version = "0.4.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6"
+dependencies = [
+ "curl-sys",
+ "libc",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "socket2",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "curl-sys"
+version = "0.4.73+curl-8.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "450ab250ecf17227c39afb9a2dd9261dc0035cb80f2612472fc0c4aac2dcb84d"
+dependencies = [
+ "cc",
+ "libc",
+ "libz-sys",
+ "openssl-sys",
+ "pkg-config",
+ "vcpkg",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "deranged"
 version = "0.3.11"
@@ -1883,12 +1913,26 @@ checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7"
 dependencies = [
  "log",
  "mac",
- "markup5ever",
+ "markup5ever 0.11.0",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "html5ever"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4"
+dependencies = [
+ "log",
+ "mac",
+ "markup5ever 0.12.1",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
 [[package]]
 name = "http"
 version = "0.2.12"
@@ -2552,6 +2596,32 @@ dependencies = [
  "tendril",
 ]
 
+[[package]]
+name = "markup5ever"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45"
+dependencies = [
+ "log",
+ "phf 0.11.2",
+ "phf_codegen 0.11.2",
+ "string_cache",
+ "string_cache_codegen",
+ "tendril",
+]
+
+[[package]]
+name = "markup5ever_rcdom"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edaa21ab3701bfee5099ade5f7e1f84553fd19228cf332f13cd6e964bf59be18"
+dependencies = [
+ "html5ever 0.27.0",
+ "markup5ever 0.12.1",
+ "tendril",
+ "xml5ever",
+]
+
 [[package]]
 name = "md-5"
 version = "0.10.6"
@@ -3463,8 +3533,11 @@ dependencies = [
  "nu-plugin",
  "nu-protocol",
  "scraper",
+ "serde",
+ "serde_json",
  "sxd-document",
  "sxd-xpath",
+ "webpage",
 ]
 
 [[package]]
@@ -5283,7 +5356,7 @@ dependencies = [
  "ahash 0.8.11",
  "cssparser",
  "ego-tree",
- "html5ever",
+ "html5ever 0.26.0",
  "once_cell",
  "selectors",
  "tendril",
@@ -6797,6 +6870,20 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "webpage"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70862efc041d46e6bbaa82bb9c34ae0596d090e86cbd14bd9e93b36ee6802eac"
+dependencies = [
+ "curl",
+ "html5ever 0.27.0",
+ "markup5ever_rcdom",
+ "serde",
+ "serde_json",
+ "url",
+]
+
 [[package]]
 name = "which"
 version = "6.0.1"
@@ -7209,6 +7296,17 @@ dependencies = [
  "rustix",
 ]
 
+[[package]]
+name = "xml5ever"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bbb26405d8e919bc1547a5aa9abc95cbfa438f04844f5fdd9dc7596b748bf69"
+dependencies = [
+ "log",
+ "mac",
+ "markup5ever 0.12.1",
+]
+
 [[package]]
 name = "xxhash-rust"
 version = "0.8.10"
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index 4a54e9bf60..551610e390 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -22,4 +22,7 @@ nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
 gjson = "0.8"
 scraper = { default-features = false, version = "0.19" }
 sxd-document = "0.3"
-sxd-xpath = "0.4"
\ No newline at end of file
+sxd-xpath = "0.4"
+webpage = { version = "2.0.1", features = ["serde"] }
+serde_json.workspace = true
+serde.workspace = true
diff --git a/crates/nu_plugin_query/src/lib.rs b/crates/nu_plugin_query/src/lib.rs
index 8027c67493..555144d9c7 100644
--- a/crates/nu_plugin_query/src/lib.rs
+++ b/crates/nu_plugin_query/src/lib.rs
@@ -1,6 +1,7 @@
 mod query;
 mod query_json;
 mod query_web;
+mod query_webpage_info;
 mod query_xml;
 mod web_tables;
 
diff --git a/crates/nu_plugin_query/src/query.rs b/crates/nu_plugin_query/src/query.rs
index c22339ab4a..273fc858c6 100644
--- a/crates/nu_plugin_query/src/query.rs
+++ b/crates/nu_plugin_query/src/query.rs
@@ -1,4 +1,7 @@
-use crate::{query_json::QueryJson, query_web::QueryWeb, query_xml::QueryXml};
+use crate::{
+    query_json::QueryJson, query_web::QueryWeb, query_webpage_info::QueryWebpageInfo,
+    query_xml::QueryXml,
+};
 use nu_plugin::{EvaluatedCall, Plugin, PluginCommand, SimplePluginCommand};
 use nu_protocol::{Category, LabeledError, Signature, Value};
 
@@ -26,6 +29,7 @@ impl Plugin for Query {
             Box::new(QueryJson),
             Box::new(QueryXml),
             Box::new(QueryWeb),
+            Box::new(QueryWebpageInfo),
         ]
     }
 }
diff --git a/crates/nu_plugin_query/src/query_webpage_info.rs b/crates/nu_plugin_query/src/query_webpage_info.rs
new file mode 100644
index 0000000000..8fed37dcd3
--- /dev/null
+++ b/crates/nu_plugin_query/src/query_webpage_info.rs
@@ -0,0 +1,478 @@
+use nu_plugin::{EngineInterface, EvaluatedCall, SimplePluginCommand};
+use nu_protocol::{Category, Example, LabeledError, Record, Signature, Span, Type, Value};
+
+use crate::Query;
+
+pub struct QueryWebpageInfo;
+
+impl SimplePluginCommand for QueryWebpageInfo {
+    type Plugin = Query;
+
+    fn name(&self) -> &str {
+        "query webpage-info"
+    }
+
+    fn usage(&self) -> &str {
+        "uses the webpage crate to extract info from html: title, description, language, links, RSS feeds, Opengraph, Schema.org, and more"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .input_output_type(Type::String, Type::record())
+            .category(Category::Network)
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        web_examples()
+    }
+
+    fn run(
+        &self,
+        _plugin: &Query,
+        _engine: &EngineInterface,
+        _call: &EvaluatedCall,
+        input: &Value,
+    ) -> Result<Value, LabeledError> {
+        let span = input.span();
+        match input {
+            Value::String { val, .. } => execute_webpage(val, span),
+            _ => Err(LabeledError::new("Requires text input")
+                .with_label("expected text from pipeline", span)),
+        }
+    }
+}
+
+pub fn web_examples() -> Vec<Example<'static>> {
+    vec![Example {
+        example: "http get https://phoronix.com | query webpage-info",
+        description: "extract detailed info from phoronix.com website",
+        result: None,
+    }]
+}
+
+fn execute_webpage(html: &str, span: Span) -> Result<Value, LabeledError> {
+    let info = webpage::HTML::from_string(html.to_string(), None)
+        .map_err(|e| LabeledError::new(e.to_string()).with_label("error parsing html", span))?;
+
+    let value = to_value(info, span).map_err(|e| {
+        LabeledError::new(e.to_string()).with_label("error convert Value::Record", span)
+    })?;
+
+    Ok(value)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    const HTML: &str = r#"
+         <html><head><meta><title>My Title</title></head></html>
+     "#;
+
+    #[test]
+    fn test_basics() {
+        let info = execute_webpage(HTML, Span::test_data()).unwrap();
+        let record = info.as_record().unwrap();
+        assert_eq!(record.get("title").unwrap().as_str().unwrap(), "My Title");
+    }
+}
+
+// revive nu-serde sketch
+
+use serde::Serialize;
+
+/// Convert any serde:Serialize into a `nu_protocol::Value`
+pub fn to_value<T>(value: T, span: Span) -> Result<Value, Error>
+where
+    T: Serialize,
+{
+    value.serialize(&ValueSerializer { span })
+}
+
+struct ValueSerializer {
+    span: Span,
+}
+
+struct MapSerializer<'a> {
+    record: Record,
+    serializer: &'a ValueSerializer,
+    current_key: Option<String>,
+}
+
+impl<'a> serde::Serializer for &'a ValueSerializer {
+    type Ok = Value;
+    type Error = Error;
+
+    type SerializeSeq = SeqSerializer<'a>;
+    type SerializeTuple = SeqSerializer<'a>;
+    type SerializeTupleStruct = SeqSerializer<'a>;
+    type SerializeTupleVariant = SeqSerializer<'a>;
+
+    type SerializeMap = MapSerializer<'a>;
+    type SerializeStruct = MapSerializer<'a>;
+    type SerializeStructVariant = MapSerializer<'a>;
+
+    fn serialize_bool(self, v: bool) -> Result<Self::Ok, Self::Error> {
+        Ok(Value::bool(v, self.span))
+    }
+
+    fn serialize_i8(self, v: i8) -> Result<Self::Ok, Self::Error> {
+        Ok(Value::int(v.into(), self.span))
+    }
+
+    fn serialize_i16(self, v: i16) -> Result<Self::Ok, Self::Error> {
+        Ok(Value::int(v.into(), self.span))
+    }
+
+    fn serialize_i32(self, v: i32) -> Result<Self::Ok, Self::Error> {
+        Ok(Value::int(v.into(), self.span))
+    }
+
+    fn serialize_i64(self, v: i64) -> Result<Self::Ok, Self::Error> {
+        Ok(Value::int(v, self.span))
+    }
+
+    fn serialize_u8(self, v: u8) -> Result<Self::Ok, Self::Error> {
+        Ok(Value::int(v.into(), self.span))
+    }
+
+    fn serialize_u16(self, v: u16) -> Result<Self::Ok, Self::Error> {
+        Ok(Value::int(v.into(), self.span))
+    }
+
+    fn serialize_u32(self, v: u32) -> Result<Self::Ok, Self::Error> {
+        Ok(Value::int(v.into(), self.span))
+    }
+
+    fn serialize_u64(self, _v: u64) -> Result<Self::Ok, Self::Error> {
+        // TODO: how to represent a u64 value a Value<i64>?
+        Err(Error::new("the numbers are too big"))
+        // Ok(Value::int(v.into(), self.span))
+    }
+
+    fn serialize_f32(self, v: f32) -> Result<Self::Ok, Self::Error> {
+        Ok(Value::float(v.into(), self.span))
+    }
+
+    fn serialize_f64(self, v: f64) -> Result<Self::Ok, Self::Error> {
+        Ok(Value::float(v, self.span))
+    }
+
+    fn serialize_char(self, v: char) -> Result<Self::Ok, Self::Error> {
+        Ok(Value::string(v, self.span))
+    }
+
+    fn serialize_str(self, v: &str) -> Result<Self::Ok, Self::Error> {
+        Ok(Value::string(v, self.span))
+    }
+
+    fn serialize_bytes(self, v: &[u8]) -> Result<Self::Ok, Self::Error> {
+        Ok(Value::binary(v, self.span))
+    }
+
+    fn serialize_none(self) -> Result<Self::Ok, Self::Error> {
+        Ok(Value::nothing(self.span))
+    }
+
+    fn serialize_some<T: ?Sized>(self, value: &T) -> Result<Self::Ok, Self::Error>
+    where
+        T: Serialize,
+    {
+        value.serialize(self)
+    }
+
+    fn serialize_unit(self) -> Result<Self::Ok, Self::Error> {
+        // TODO: is this OK?
+        Ok(Value::nothing(self.span))
+    }
+
+    fn serialize_unit_struct(self, _name: &'static str) -> Result<Self::Ok, Self::Error> {
+        // TODO: is this OK?
+        Ok(Value::nothing(self.span))
+    }
+
+    fn serialize_unit_variant(
+        self,
+        _name: &'static str,
+        _variant_index: u32,
+        _variant: &'static str,
+    ) -> Result<Self::Ok, Self::Error> {
+        // TODO: is this OK?
+        Ok(Value::nothing(self.span))
+    }
+
+    fn serialize_newtype_struct<T: ?Sized>(
+        self,
+        _name: &'static str,
+        value: &T,
+    ) -> Result<Self::Ok, Self::Error>
+    where
+        T: Serialize,
+    {
+        value.serialize(self)
+    }
+
+    fn serialize_newtype_variant<T: ?Sized>(
+        self,
+        _name: &'static str,
+        _variant_index: u32,
+        _variant: &'static str,
+        value: &T,
+    ) -> Result<Self::Ok, Self::Error>
+    where
+        T: Serialize,
+    {
+        value.serialize(self)
+    }
+
+    fn serialize_seq(self, _len: Option<usize>) -> Result<Self::SerializeSeq, Self::Error> {
+        Ok(SeqSerializer::new(self))
+    }
+
+    fn serialize_tuple(self, _len: usize) -> Result<Self::SerializeTuple, Self::Error> {
+        Ok(SeqSerializer::new(self))
+    }
+
+    fn serialize_tuple_struct(
+        self,
+        _name: &'static str,
+        _len: usize,
+    ) -> Result<Self::SerializeTupleStruct, Self::Error> {
+        Ok(SeqSerializer::new(self))
+    }
+
+    fn serialize_tuple_variant(
+        self,
+        _name: &'static str,
+        _variant_index: u32,
+        _variant: &'static str,
+        _len: usize,
+    ) -> Result<Self::SerializeTupleVariant, Self::Error> {
+        Ok(SeqSerializer::new(self))
+    }
+
+    fn serialize_map(self, _len: Option<usize>) -> Result<Self::SerializeMap, Self::Error> {
+        Ok(MapSerializer::new(self))
+    }
+
+    fn serialize_struct(
+        self,
+        _name: &'static str,
+        _len: usize,
+    ) -> Result<Self::SerializeStruct, Self::Error> {
+        Ok(MapSerializer::new(self))
+    }
+
+    fn serialize_struct_variant(
+        self,
+        _name: &'static str,
+        _variant_index: u32,
+        _variant: &'static str,
+        _len: usize,
+    ) -> Result<Self::SerializeStructVariant, Self::Error> {
+        Ok(MapSerializer::new(self))
+    }
+}
+
+pub struct Error {
+    message: String,
+}
+
+impl Error {
+    pub fn new<T: std::fmt::Display>(msg: T) -> Self {
+        Error {
+            message: msg.to_string(),
+        }
+    }
+}
+
+impl serde::ser::Error for Error {
+    fn custom<T: std::fmt::Display>(msg: T) -> Self {
+        Error::new(msg.to_string())
+    }
+}
+
+impl std::fmt::Debug for Error {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.message)
+    }
+}
+
+impl std::fmt::Display for Error {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.message)
+    }
+}
+
+impl std::error::Error for Error {}
+
+//
+// maps
+impl<'a> MapSerializer<'a> {
+    fn new(serializer: &'a ValueSerializer) -> Self {
+        Self {
+            record: Record::new(),
+            current_key: None,
+            serializer,
+        }
+    }
+}
+
+impl<'a> serde::ser::SerializeStruct for MapSerializer<'a> {
+    type Ok = Value;
+    type Error = Error;
+
+    fn serialize_field<T: ?Sized>(
+        &mut self,
+        key: &'static str,
+        value: &T,
+    ) -> Result<(), Self::Error>
+    where
+        T: Serialize,
+    {
+        self.record
+            .insert(key.to_owned(), value.serialize(self.serializer)?);
+        Ok(())
+    }
+
+    fn end(self) -> Result<Self::Ok, Self::Error> {
+        Ok(Value::record(self.record, self.serializer.span))
+    }
+}
+
+impl<'a> serde::ser::SerializeMap for MapSerializer<'a> {
+    type Ok = Value;
+    type Error = Error;
+
+    fn serialize_key<T: ?Sized>(&mut self, key: &T) -> Result<(), Self::Error>
+    where
+        T: Serialize,
+    {
+        let value = serde_json::to_value(key).map_err(Error::new)?;
+        let key = value
+            .as_str()
+            .ok_or(Error::new("key must be a string"))?
+            .to_string();
+        self.current_key = Some(key);
+        Ok(())
+    }
+
+    fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
+    where
+        T: Serialize,
+    {
+        let key = self.current_key.take().ok_or(Error::new("key expected"))?;
+        self.record.insert(key, value.serialize(self.serializer)?);
+        Ok(())
+    }
+
+    fn end(self) -> Result<Self::Ok, Self::Error> {
+        Ok(Value::record(self.record, self.serializer.span))
+    }
+}
+
+impl<'a> serde::ser::SerializeStructVariant for MapSerializer<'a> {
+    type Ok = Value;
+    type Error = Error;
+
+    fn serialize_field<T: ?Sized>(
+        &mut self,
+        key: &'static str,
+        value: &T,
+    ) -> Result<(), Self::Error>
+    where
+        T: Serialize,
+    {
+        self.record
+            .insert(key.to_owned(), value.serialize(self.serializer)?);
+        Ok(())
+    }
+
+    fn end(self) -> Result<Self::Ok, Self::Error> {
+        Ok(Value::record(self.record, self.serializer.span))
+    }
+}
+
+//
+// sequences
+struct SeqSerializer<'a> {
+    seq: Vec<Value>,
+    serializer: &'a ValueSerializer,
+}
+
+impl<'a> SeqSerializer<'a> {
+    fn new(serializer: &'a ValueSerializer) -> Self {
+        Self {
+            seq: Vec::new(),
+            serializer,
+        }
+    }
+}
+
+impl<'a> serde::ser::SerializeSeq for SeqSerializer<'a> {
+    type Ok = Value;
+    type Error = Error;
+
+    fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
+    where
+        T: Serialize,
+    {
+        self.seq.push(value.serialize(self.serializer)?);
+        Ok(())
+    }
+
+    fn end(self) -> Result<Self::Ok, Self::Error> {
+        Ok(Value::list(self.seq, self.serializer.span))
+    }
+}
+
+impl<'a> serde::ser::SerializeTuple for SeqSerializer<'a> {
+    type Ok = Value;
+    type Error = Error;
+
+    fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
+    where
+        T: Serialize,
+    {
+        self.seq.push(value.serialize(self.serializer)?);
+        Ok(())
+    }
+
+    fn end(self) -> Result<Self::Ok, Self::Error> {
+        Ok(Value::list(self.seq, self.serializer.span))
+    }
+}
+
+impl<'a> serde::ser::SerializeTupleStruct for SeqSerializer<'a> {
+    type Ok = Value;
+    type Error = Error;
+
+    fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
+    where
+        T: Serialize,
+    {
+        self.seq.push(value.serialize(self.serializer)?);
+        Ok(())
+    }
+
+    fn end(self) -> Result<Self::Ok, Self::Error> {
+        Ok(Value::list(self.seq, self.serializer.span))
+    }
+}
+
+impl<'a> serde::ser::SerializeTupleVariant for SeqSerializer<'a> {
+    type Ok = Value;
+    type Error = Error;
+
+    fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
+    where
+        T: Serialize,
+    {
+        self.seq.push(value.serialize(self.serializer)?);
+        Ok(())
+    }
+
+    fn end(self) -> Result<Self::Ok, Self::Error> {
+        Ok(Value::list(self.seq, self.serializer.span))
+    }
+}

From a2873336bb81654755b4af8148c9ecbc069aa5a1 Mon Sep 17 00:00:00 2001
From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Sat, 29 Jun 2024 17:17:06 -0400
Subject: [PATCH 0164/1072] Fix `do` signature (#13216)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Recommend holding until after #13125 is fully digested and *possibly*
until 0.96.

# Description

Fixes one of the issues described in #13125

The `do` signature included a `SyntaxShape:Any` as one of the possible
first-positional types. This is incorrect. `do` only takes a closure as
a positional. This had the result of:

1. Moving what should have been a parser error to evaluation-time

   ## Before

   ```nu
   > do 1
   Error: nu::shell::cant_convert

     × Can't convert to Closure.
      ╭─[entry #26:1:4]
    1 │ do 1
      ·    ┬
      ·    ╰── can't convert int to Closure
      ╰────
   ```

   ## After

   ```nu
   > do 1
   Error: nu::parser::parse_mismatch

     × Parse mismatch during operation.
      ╭─[entry #5:1:4]
    1 │ do 1
      ·    ┬
      ·    ╰── expected block, closure or record
      ╰────
   ```

2. Masking a bad test in `std assert`

This is a bit convoluted, but `std assert` tests included testing
`assert error` to make sure it:

* Asserts on bad code
* Doesn't assert on good code

The good-code test was broken, and was essentially bad-code (really
bad-code) that wasn't getting caught due to the bad signature.

Fixing this resulted in *parse time* failures on every call to
`test_asserts` (not something that particular test was designed to
handle.

This PR also fixes the test case to properly evaluate `std assert error`
against a good code path.

# User-Facing Changes

* Error-type returned (possible breaking change?)

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

N/A
---
 crates/nu-cmd-lang/src/core_commands/do_.rs | 6 +-----
 crates/nu-std/tests/test_asserts.nu         | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/crates/nu-cmd-lang/src/core_commands/do_.rs b/crates/nu-cmd-lang/src/core_commands/do_.rs
index 4f0bd245d2..adf13cc0bb 100644
--- 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(
-                "closure",
-                SyntaxShape::OneOf(vec![SyntaxShape::Closure(None), SyntaxShape::Any]),
-                "The closure to run.",
-            )
+            .required("closure", SyntaxShape::Closure(None), "The closure to run.")
             .input_output_types(vec![(Type::Any, Type::Any)])
             .switch(
                 "ignore-errors",
diff --git a/crates/nu-std/tests/test_asserts.nu b/crates/nu-std/tests/test_asserts.nu
index b155022473..2447dfda1e 100644
--- a/crates/nu-std/tests/test_asserts.nu
+++ b/crates/nu-std/tests/test_asserts.nu
@@ -38,8 +38,8 @@ def assert_error [] {
     assert error $failing_code
 
     let good_code = {|| }
-    let assert_error_raised = (try { do assert $good_code; false } catch { true })
-    assert $assert_error_raised "The assert error should raise an error if there is no error in the executed code."
+    let assert_error_raised = (try { assert error $good_code; false } catch { true })
+    assert $assert_error_raised "The assert error should be false if there is no error in the executed code."
 }
 
 #[test]

From 69e4790b00b445ad4c39e67de7ce9021ee3bf28c Mon Sep 17 00:00:00 2001
From: alex-tdrn <alex-tdrn@protonmail.com>
Date: Sun, 30 Jun 2024 14:38:41 +0200
Subject: [PATCH 0165/1072] Skip decoration lines for `detect columns --guess`
 (#13274)

# Description
I introduced a regression in #13272 that resulted in `detect columns
--guess` to panic whenever it had to handle empty, whitespace-only, or
non-whitespace-only lines that go all the way to the last column (and as
such, cannot be considered to be lines that only have entries for the
first colum). I fix this by detecting these cases and skipping them,
since these are usually decoration lines. An example is the second line
output by `winget list`:

![image](https://github.com/nushell/nushell/assets/20356389/06c873fb-0a26-45dd-b020-3bcc737d027f)

What we don't want to skip, however, is lines that contain no
whitespace, and fit into the detected first column, since these lines
represent cases where data is only available for the first column, and
are not just decoration lines. For example (made up example, there are
no such entries in `winget lits`'s output), in this output we would not
want to skip the `Docker Desktop` line :
```
Name                                                        Id                                           Version     Available Source
-------------------------------------------------------------------------------------------------------------------------------------
AMD Software                                                ARPMachineX64AMD Catalyst Install Manager 24.4.1
AMD Ryzen Master                                            ARPMachineX64AMD Ryzen Master             2.13.0.2908
Docker Desktop
Mozilla Firefox (x64 en-US)                                 Mozilla.Firefox                              127.0.2               winget
```

![image](https://github.com/nushell/nushell/assets/20356389/12e31995-a7c1-4759-8c62-fb4fb199fd2e)

NOTE: `winget list | detect columns --guess` does not panic, but sadly
still does not work as expected. I believe this is not a nushell issue
anymore, but a `winget` one. When being piped, `winget` seems to add
extra whitespace and random `\r` symbols at the beginning of the text.
This messes with the column detection, of course.

![image](https://github.com/nushell/nushell/assets/20356389/7d1b7e5f-17d0-41c8-8d2f-7896e0d73d66)

![image](https://github.com/nushell/nushell/assets/20356389/56917954-1231-43e7-bacf-e5760e263054)

![image](https://github.com/nushell/nushell/assets/20356389/630bcfc9-eb78-4a45-9c8f-97efc0c224f4)


# User-Facing Changes
`detect columns --guess` should not panic when receiving output from
`winget list` at all anymore.

A breaking change is the skipping of decoration lines, especially since
scripts probably were doing something like
`winget list | lines | reject 1 | str join "\n" | detect columns
--guess`. This will now cause them to reject a line with valid data.

# Tests + Formatting
Added tests that exercise these edge cases, as well as a single-column
test to make sure that trivial cases keep working.

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/strings/guess_width.rs | 133 ++++++++++++++++++-
 1 file changed, 132 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/strings/guess_width.rs b/crates/nu-command/src/strings/guess_width.rs
index b214b21bcc..8c758516bd 100644
--- a/crates/nu-command/src/strings/guess_width.rs
+++ b/crates/nu-command/src/strings/guess_width.rs
@@ -72,7 +72,9 @@ impl GuessWidth {
 
         let mut rows = Vec::new();
         while let Ok(columns) = self.read() {
-            rows.push(columns);
+            if !columns.is_empty() {
+                rows.push(columns);
+            }
         }
         rows
     }
@@ -180,6 +182,19 @@ fn split(line: &str, pos: &[usize], trim_space: bool) -> Vec<String> {
     let (line_char_boundaries, line_chars): (Vec<usize>, Vec<char>) = line.char_indices().unzip();
     let mut w = 0;
 
+    if line_chars.is_empty() || line_chars.iter().all(|&c| c.is_whitespace()) {
+        // current line is completely empty, or only filled with whitespace
+        return Vec::new();
+    } else if !pos.is_empty()
+        && line_chars.iter().all(|&c| !c.is_whitespace())
+        && pos[0] < UnicodeWidthStr::width(line)
+    {
+        // we have more than 1 column in the input, but the current line has no whitespace,
+        // and it is longer than the first detected column separation position
+        // this indicates some kind of decoration line. let's skip it
+        return Vec::new();
+    }
+
     for p in 0..line_char_boundaries.len() {
         if pos.is_empty() || n > pos.len() - 1 {
             start_char = p;
@@ -463,6 +478,122 @@ Ștefan         Țincu ";
         assert_eq!(got, want);
     }
 
+    #[test]
+    fn test_guess_width_single_column() {
+        let input = "A
+
+B
+
+C";
+
+        let r = Box::new(std::io::BufReader::new(input.as_bytes())) as Box<dyn std::io::Read>;
+        let reader = std::io::BufReader::new(r);
+
+        let mut guess_width = GuessWidth {
+            reader,
+            pos: Vec::new(),
+            pre_lines: Vec::new(),
+            pre_count: 0,
+            limit_split: 0,
+        };
+
+        let want = vec![vec!["A"], vec!["B"], vec!["C"]];
+        let got = guess_width.read_all();
+        assert_eq!(got, want);
+    }
+
+    #[test]
+    fn test_guess_width_row_without_whitespace() {
+        let input = "A B C D
+-------
+E F G H";
+
+        let r = Box::new(std::io::BufReader::new(input.as_bytes())) as Box<dyn std::io::Read>;
+        let reader = std::io::BufReader::new(r);
+
+        let mut guess_width = GuessWidth {
+            reader,
+            pos: Vec::new(),
+            pre_lines: Vec::new(),
+            pre_count: 0,
+            limit_split: 0,
+        };
+
+        let want = vec![vec!["A", "B", "C", "D"], vec!["E", "F", "G", "H"]];
+        let got = guess_width.read_all();
+        assert_eq!(got, want);
+    }
+
+    #[test]
+    fn test_guess_width_row_with_single_column() {
+        let input = "A B C D
+E
+F G H I";
+
+        let r = Box::new(std::io::BufReader::new(input.as_bytes())) as Box<dyn std::io::Read>;
+        let reader = std::io::BufReader::new(r);
+
+        let mut guess_width = GuessWidth {
+            reader,
+            pos: Vec::new(),
+            pre_lines: Vec::new(),
+            pre_count: 0,
+            limit_split: 0,
+        };
+
+        let want = vec![
+            vec!["A", "B", "C", "D"],
+            vec!["E"],
+            vec!["F", "G", "H", "I"],
+        ];
+        let got = guess_width.read_all();
+        assert_eq!(got, want);
+    }
+
+    #[test]
+    fn test_guess_width_empty_row() {
+        let input = "A B C D
+
+E F G H";
+
+        let r = Box::new(std::io::BufReader::new(input.as_bytes())) as Box<dyn std::io::Read>;
+        let reader = std::io::BufReader::new(r);
+
+        let mut guess_width = GuessWidth {
+            reader,
+            pos: Vec::new(),
+            pre_lines: Vec::new(),
+            pre_count: 0,
+            limit_split: 0,
+        };
+
+        let want = vec![vec!["A", "B", "C", "D"], vec!["E", "F", "G", "H"]];
+        let got = guess_width.read_all();
+        assert_eq!(got, want);
+    }
+
+    #[test]
+    fn test_guess_width_row_with_only_whitespace() {
+        let input = "A B C D
+       
+E F G H";
+
+        let r = Box::new(std::io::BufReader::new(input.as_bytes())) as Box<dyn std::io::Read>;
+        let reader = std::io::BufReader::new(r);
+
+        let mut guess_width = GuessWidth {
+            reader,
+            pos: Vec::new(),
+            pre_lines: Vec::new(),
+            pre_count: 0,
+            limit_split: 0,
+        };
+
+        let want = vec![vec!["A", "B", "C", "D"], vec!["E", "F", "G", "H"]];
+        let got = guess_width.read_all();
+        assert_eq!(got, want);
+    }
+
     #[test]
     fn test_to_table() {
         let lines = vec![

From e5cf4863e95126080439479328f55a26b9f65add Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Sun, 30 Jun 2024 23:28:09 +0000
Subject: [PATCH 0166/1072] Fix clippy lint (#13277)

# Description
Fixes `items_after_test_module` lint.
---
 .../nu_plugin_query/src/query_webpage_info.rs | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/crates/nu_plugin_query/src/query_webpage_info.rs b/crates/nu_plugin_query/src/query_webpage_info.rs
index 8fed37dcd3..e61387c8d1 100644
--- a/crates/nu_plugin_query/src/query_webpage_info.rs
+++ b/crates/nu_plugin_query/src/query_webpage_info.rs
@@ -61,22 +61,6 @@ fn execute_webpage(html: &str, span: Span) -> Result<Value, LabeledError> {
     Ok(value)
 }
 
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    const HTML: &str = r#"
-         <html><head><meta><title>My Title</title></head></html>
-     "#;
-
-    #[test]
-    fn test_basics() {
-        let info = execute_webpage(HTML, Span::test_data()).unwrap();
-        let record = info.as_record().unwrap();
-        assert_eq!(record.get("title").unwrap().as_str().unwrap(), "My Title");
-    }
-}
-
 // revive nu-serde sketch
 
 use serde::Serialize;
@@ -476,3 +460,19 @@ impl<'a> serde::ser::SerializeTupleVariant for SeqSerializer<'a> {
         Ok(Value::list(self.seq, self.serializer.span))
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    const HTML: &str = r#"
+         <html><head><meta><title>My Title</title></head></html>
+     "#;
+
+    #[test]
+    fn test_basics() {
+        let info = execute_webpage(HTML, Span::test_data()).unwrap();
+        let record = info.as_record().unwrap();
+        assert_eq!(record.get("title").unwrap().as_str().unwrap(), "My Title");
+    }
+}

From 0d060aeae85ac53baf89f776bc236f7dad0ba3cf Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Mon, 1 Jul 2024 12:34:19 -0700
Subject: [PATCH 0167/1072] Use pipeline data for http post|put|patch|delete
 commands. (#13254)

# Description
Provides the ability to use http commands as part of a pipeline.
Additionally, this pull requests extends the pipeline metadata to add a
content_type field. The content_type metadata field allows commands such
as `to json` to set the metadata in the pipeline allowing the http
commands to use it when making requests.

This pull request also introduces the ability to directly stream http
requests from streaming pipelines.

One other small change is that Content-Type will always be set if it is
passed in to the http commands, either indirectly or throw the content
type flag. Previously it was not preserved with requests that were not
of type json or form data.

# User-Facing Changes
* `http post`, `http put`, `http patch`, `http delete` can be used as
part of a pipeline
* `to text`, `to json`, `from json` all set the content_type metadata
field and the http commands will utilize them when making requests.
---
 .../nu-cmd-extra/src/extra/formats/to/html.rs |   1 +
 .../nu-cmd-lang/src/core_commands/collect.rs  |   1 +
 crates/nu-command/src/debug/metadata.rs       |  14 ++
 crates/nu-command/src/debug/metadata_set.rs   |   2 +
 crates/nu-command/src/filesystem/ls.rs        |   2 +
 crates/nu-command/src/filesystem/open.rs      |   1 +
 crates/nu-command/src/formats/from/json.rs    |  18 +-
 crates/nu-command/src/formats/to/json.rs      |   9 +-
 crates/nu-command/src/formats/to/text.rs      |  26 ++-
 crates/nu-command/src/network/http/client.rs  | 218 ++++++++++++------
 crates/nu-command/src/network/http/delete.rs  |  31 ++-
 crates/nu-command/src/network/http/get.rs     |   4 +-
 crates/nu-command/src/network/http/head.rs    |   4 +-
 crates/nu-command/src/network/http/options.rs |   4 +-
 crates/nu-command/src/network/http/patch.rs   |  45 +++-
 crates/nu-command/src/network/http/post.rs    |  45 +++-
 crates/nu-command/src/network/http/put.rs     |  46 +++-
 crates/nu-command/src/viewers/table.rs        |   2 +
 .../tests/commands/network/http/delete.rs     |  19 ++
 .../tests/commands/network/http/patch.rs      |  23 +-
 .../tests/commands/network/http/post.rs       |  22 +-
 .../tests/commands/network/http/put.rs        |  23 +-
 crates/nu-plugin-core/src/interface/tests.rs  |   3 +-
 crates/nu-protocol/src/pipeline/metadata.rs   |  23 +-
 24 files changed, 466 insertions(+), 120 deletions(-)

diff --git a/crates/nu-cmd-extra/src/extra/formats/to/html.rs b/crates/nu-cmd-extra/src/extra/formats/to/html.rs
index c2ca80e2c6..83d0b58b3f 100644
--- a/crates/nu-cmd-extra/src/extra/formats/to/html.rs
+++ b/crates/nu-cmd-extra/src/extra/formats/to/html.rs
@@ -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,
     })
 }
 
diff --git a/crates/nu-cmd-lang/src/core_commands/collect.rs b/crates/nu-cmd-lang/src/core_commands/collect.rs
index 1c28646548..d6282eec35 100644
--- 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,
         };
diff --git a/crates/nu-command/src/debug/metadata.rs b/crates/nu-command/src/debug/metadata.rs
index 135047a3d9..543e598e28 100644
--- a/crates/nu-command/src/debug/metadata.rs
+++ b/crates/nu-command/src/debug/metadata.rs
@@ -80,16 +80,23 @@ impl Command for Metadata {
                     match x {
                         PipelineMetadata {
                             data_source: DataSource::Ls,
+                            ..
                         } => record.push("source", Value::string("ls", head)),
                         PipelineMetadata {
                             data_source: DataSource::HtmlThemes,
+                            ..
                         } => record.push("source", Value::string("into html --list", head)),
                         PipelineMetadata {
                             data_source: DataSource::FilePath(path),
+                            ..
                         } => record.push(
                             "source",
                             Value::string(path.to_string_lossy().to_string(), head),
                         ),
+                        _ => {}
+                    }
+                    if let Some(ref content_type) = x.content_type {
+                        record.push("content_type", Value::string(content_type, head));
                     }
                 }
 
@@ -133,16 +140,23 @@ fn build_metadata_record(arg: &Value, metadata: Option<&PipelineMetadata>, head:
         match x {
             PipelineMetadata {
                 data_source: DataSource::Ls,
+                ..
             } => record.push("source", Value::string("ls", head)),
             PipelineMetadata {
                 data_source: DataSource::HtmlThemes,
+                ..
             } => record.push("source", Value::string("into html --list", head)),
             PipelineMetadata {
                 data_source: DataSource::FilePath(path),
+                ..
             } => record.push(
                 "source",
                 Value::string(path.to_string_lossy().to_string(), head),
             ),
+            _ => {}
+        }
+        if let Some(ref content_type) = x.content_type {
+            record.push("content_type", Value::string(content_type, head));
         }
     }
 
diff --git a/crates/nu-command/src/debug/metadata_set.rs b/crates/nu-command/src/debug/metadata_set.rs
index 6608827fda..5d6ba63745 100644
--- a/crates/nu-command/src/debug/metadata_set.rs
+++ b/crates/nu-command/src/debug/metadata_set.rs
@@ -46,6 +46,7 @@ impl Command for MetadataSet {
             (Some(path), false) => {
                 let metadata = PipelineMetadata {
                     data_source: DataSource::FilePath(path.into()),
+                    content_type: None,
                 };
                 Ok(input.into_pipeline_data_with_metadata(
                     head,
@@ -56,6 +57,7 @@ impl Command for MetadataSet {
             (None, true) => {
                 let metadata = PipelineMetadata {
                     data_source: DataSource::Ls,
+                    content_type: None,
                 };
                 Ok(input.into_pipeline_data_with_metadata(
                     head,
diff --git a/crates/nu-command/src/filesystem/ls.rs b/crates/nu-command/src/filesystem/ls.rs
index 7eee57cfb6..a3ab1eca54 100644
--- a/crates/nu-command/src/filesystem/ls.rs
+++ b/crates/nu-command/src/filesystem/ls.rs
@@ -122,6 +122,7 @@ impl Command for Ls {
                     ctrl_c,
                     PipelineMetadata {
                         data_source: DataSource::Ls,
+                        content_type: None,
                     },
                 )),
             Some(pattern) => {
@@ -145,6 +146,7 @@ impl Command for Ls {
                         ctrl_c,
                         PipelineMetadata {
                             data_source: DataSource::Ls,
+                            content_type: None,
                         },
                     ))
             }
diff --git a/crates/nu-command/src/filesystem/open.rs b/crates/nu-command/src/filesystem/open.rs
index 842eaa5f4c..9000359450 100644
--- a/crates/nu-command/src/filesystem/open.rs
+++ b/crates/nu-command/src/filesystem/open.rs
@@ -147,6 +147,7 @@ impl Command for Open {
                         ByteStream::file(file, call_span, ctrlc.clone()),
                         Some(PipelineMetadata {
                             data_source: DataSource::FilePath(path.to_path_buf()),
+                            content_type: None,
                         }),
                     );
 
diff --git a/crates/nu-command/src/formats/from/json.rs b/crates/nu-command/src/formats/from/json.rs
index e8b5d58e9e..a1b43abb0a 100644
--- a/crates/nu-command/src/formats/from/json.rs
+++ b/crates/nu-command/src/formats/from/json.rs
@@ -4,7 +4,7 @@ use std::{
 };
 
 use nu_engine::command_prelude::*;
-use nu_protocol::ListStream;
+use nu_protocol::{ListStream, PipelineMetadata};
 
 #[derive(Clone)]
 pub struct FromJson;
@@ -81,7 +81,7 @@ impl Command for FromJson {
                 PipelineData::Value(Value::String { val, .. }, metadata) => {
                     Ok(PipelineData::ListStream(
                         read_json_lines(Cursor::new(val), span, strict, engine_state.ctrlc.clone()),
-                        metadata,
+                        update_metadata(metadata),
                     ))
                 }
                 PipelineData::ByteStream(stream, metadata)
@@ -90,7 +90,7 @@ impl Command for FromJson {
                     if let Some(reader) = stream.reader() {
                         Ok(PipelineData::ListStream(
                             read_json_lines(reader, span, strict, None),
-                            metadata,
+                            update_metadata(metadata),
                         ))
                     } else {
                         Ok(PipelineData::Empty)
@@ -113,10 +113,10 @@ impl Command for FromJson {
 
             if strict {
                 Ok(convert_string_to_value_strict(&string_input, span)?
-                    .into_pipeline_data_with_metadata(metadata))
+                    .into_pipeline_data_with_metadata(update_metadata(metadata)))
             } else {
                 Ok(convert_string_to_value(&string_input, span)?
-                    .into_pipeline_data_with_metadata(metadata))
+                    .into_pipeline_data_with_metadata(update_metadata(metadata)))
             }
         }
     }
@@ -263,6 +263,14 @@ fn convert_string_to_value_strict(string_input: &str, span: Span) -> Result<Valu
     }
 }
 
+fn update_metadata(metadata: Option<PipelineMetadata>) -> Option<PipelineMetadata> {
+    metadata
+        .map(|md| md.with_content_type(Some("application/json".into())))
+        .or_else(|| {
+            Some(PipelineMetadata::default().with_content_type(Some("application/json".into())))
+        })
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/crates/nu-command/src/formats/to/json.rs b/crates/nu-command/src/formats/to/json.rs
index c4c87f804f..5722387e2c 100644
--- a/crates/nu-command/src/formats/to/json.rs
+++ b/crates/nu-command/src/formats/to/json.rs
@@ -1,5 +1,5 @@
 use nu_engine::command_prelude::*;
-use nu_protocol::ast::PathMember;
+use nu_protocol::{ast::PathMember, PipelineMetadata};
 
 #[derive(Clone)]
 pub struct ToJson;
@@ -61,7 +61,12 @@ impl Command for ToJson {
 
         match json_result {
             Ok(serde_json_string) => {
-                Ok(Value::string(serde_json_string, span).into_pipeline_data())
+                let res = Value::string(serde_json_string, span);
+                let metadata = PipelineMetadata {
+                    data_source: nu_protocol::DataSource::None,
+                    content_type: Some("application/json".to_string()),
+                };
+                Ok(PipelineData::Value(res, Some(metadata)))
             }
             _ => Ok(Value::error(
                 ShellError::CantConvert {
diff --git a/crates/nu-command/src/formats/to/text.rs b/crates/nu-command/src/formats/to/text.rs
index fb240654f6..1aa1114bce 100644
--- a/crates/nu-command/src/formats/to/text.rs
+++ b/crates/nu-command/src/formats/to/text.rs
@@ -1,6 +1,8 @@
 use chrono_humanize::HumanTime;
 use nu_engine::command_prelude::*;
-use nu_protocol::{format_duration, format_filesize_from_conf, ByteStream, Config};
+use nu_protocol::{
+    format_duration, format_filesize_from_conf, ByteStream, Config, PipelineMetadata,
+};
 
 const LINE_ENDING: &str = if cfg!(target_os = "windows") {
     "\r\n"
@@ -37,10 +39,14 @@ impl Command for ToText {
         let input = input.try_expand_range()?;
 
         match input {
-            PipelineData::Empty => Ok(Value::string(String::new(), span).into_pipeline_data()),
+            PipelineData::Empty => Ok(Value::string(String::new(), span)
+                .into_pipeline_data_with_metadata(update_metadata(None))),
             PipelineData::Value(value, ..) => {
                 let str = local_into_string(value, LINE_ENDING, engine_state.get_config());
-                Ok(Value::string(str, span).into_pipeline_data())
+                Ok(
+                    Value::string(str, span)
+                        .into_pipeline_data_with_metadata(update_metadata(None)),
+                )
             }
             PipelineData::ListStream(stream, meta) => {
                 let span = stream.span();
@@ -57,10 +63,12 @@ impl Command for ToText {
                         engine_state.ctrlc.clone(),
                         ByteStreamType::String,
                     ),
-                    meta,
+                    update_metadata(meta),
                 ))
             }
-            PipelineData::ByteStream(stream, meta) => Ok(PipelineData::ByteStream(stream, meta)),
+            PipelineData::ByteStream(stream, meta) => {
+                Ok(PipelineData::ByteStream(stream, update_metadata(meta)))
+            }
         }
     }
 
@@ -124,6 +132,14 @@ fn local_into_string(value: Value, separator: &str, config: &Config) -> String {
     }
 }
 
+fn update_metadata(metadata: Option<PipelineMetadata>) -> Option<PipelineMetadata> {
+    metadata
+        .map(|md| md.with_content_type(Some("text/plain".to_string())))
+        .or_else(|| {
+            Some(PipelineMetadata::default().with_content_type(Some("text/plain".to_string())))
+        })
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/crates/nu-command/src/network/http/client.rs b/crates/nu-command/src/network/http/client.rs
index 8317fb50bc..2c02d7be33 100644
--- a/crates/nu-command/src/network/http/client.rs
+++ b/crates/nu-command/src/network/http/client.rs
@@ -180,88 +180,113 @@ impl From<ShellError> for ShellErrorOrRequestError {
     }
 }
 
+#[derive(Debug)]
+pub enum HttpBody {
+    Value(Value),
+    ByteStream(ByteStream),
+    None,
+}
+
+// remove once all commands have been migrated
 pub fn send_request(
     request: Request,
-    body: Option<Value>,
+    http_body: HttpBody,
     content_type: Option<String>,
     ctrl_c: Option<Arc<AtomicBool>>,
 ) -> Result<Response, ShellErrorOrRequestError> {
     let request_url = request.url().to_string();
-    if body.is_none() {
-        return send_cancellable_request(&request_url, Box::new(|| request.call()), ctrl_c);
-    }
-    let body = body.expect("Should never be none.");
 
-    let body_type = match content_type {
-        Some(it) if it == "application/json" => BodyType::Json,
-        Some(it) if it == "application/x-www-form-urlencoded" => BodyType::Form,
-        _ => BodyType::Unknown,
-    };
-    match body {
-        Value::Binary { val, .. } => send_cancellable_request(
-            &request_url,
-            Box::new(move || request.send_bytes(&val)),
-            ctrl_c,
-        ),
-        Value::String { .. } if body_type == BodyType::Json => {
-            let data = value_to_json_value(&body)?;
-            send_cancellable_request(&request_url, Box::new(|| request.send_json(data)), ctrl_c)
+    match http_body {
+        HttpBody::None => {
+            send_cancellable_request(&request_url, Box::new(|| request.call()), ctrl_c)
         }
-        Value::String { val, .. } => send_cancellable_request(
-            &request_url,
-            Box::new(move || request.send_string(&val)),
-            ctrl_c,
-        ),
-        Value::Record { .. } if body_type == BodyType::Json => {
-            let data = value_to_json_value(&body)?;
-            send_cancellable_request(&request_url, Box::new(|| request.send_json(data)), ctrl_c)
-        }
-        Value::Record { val, .. } if body_type == BodyType::Form => {
-            let mut data: Vec<(String, String)> = Vec::with_capacity(val.len());
-
-            for (col, val) in val.into_owned() {
-                data.push((col, val.coerce_into_string()?))
-            }
-
-            let request_fn = move || {
-                // coerce `data` into a shape that send_form() is happy with
-                let data = data
-                    .iter()
-                    .map(|(a, b)| (a.as_str(), b.as_str()))
-                    .collect::<Vec<(&str, &str)>>();
-                request.send_form(&data)
+        HttpBody::ByteStream(byte_stream) => {
+            let req = if let Some(content_type) = content_type {
+                request.set("Content-Type", &content_type)
+            } else {
+                request
             };
-            send_cancellable_request(&request_url, Box::new(request_fn), ctrl_c)
+
+            send_cancellable_request_bytes(&request_url, req, byte_stream, ctrl_c)
         }
-        Value::List { vals, .. } if body_type == BodyType::Form => {
-            if vals.len() % 2 != 0 {
-                return Err(ShellErrorOrRequestError::ShellError(ShellError::IOError {
+        HttpBody::Value(body) => {
+            let (body_type, req) = match content_type {
+                Some(it) if it == "application/json" => (BodyType::Json, request),
+                Some(it) if it == "application/x-www-form-urlencoded" => (BodyType::Form, request),
+                Some(it) => {
+                    let r = request.clone().set("Content-Type", &it);
+                    (BodyType::Unknown, r)
+                }
+                _ => (BodyType::Unknown, request),
+            };
+
+            match body {
+                Value::Binary { val, .. } => send_cancellable_request(
+                    &request_url,
+                    Box::new(move || req.send_bytes(&val)),
+                    ctrl_c,
+                ),
+                Value::String { .. } if body_type == BodyType::Json => {
+                    let data = value_to_json_value(&body)?;
+                    send_cancellable_request(&request_url, Box::new(|| req.send_json(data)), ctrl_c)
+                }
+                Value::String { val, .. } => send_cancellable_request(
+                    &request_url,
+                    Box::new(move || req.send_string(&val)),
+                    ctrl_c,
+                ),
+                Value::Record { .. } if body_type == BodyType::Json => {
+                    let data = value_to_json_value(&body)?;
+                    send_cancellable_request(&request_url, Box::new(|| req.send_json(data)), ctrl_c)
+                }
+                Value::Record { val, .. } if body_type == BodyType::Form => {
+                    let mut data: Vec<(String, String)> = Vec::with_capacity(val.len());
+
+                    for (col, val) in val.into_owned() {
+                        data.push((col, val.coerce_into_string()?))
+                    }
+
+                    let request_fn = move || {
+                        // coerce `data` into a shape that send_form() is happy with
+                        let data = data
+                            .iter()
+                            .map(|(a, b)| (a.as_str(), b.as_str()))
+                            .collect::<Vec<(&str, &str)>>();
+                        req.send_form(&data)
+                    };
+                    send_cancellable_request(&request_url, Box::new(request_fn), ctrl_c)
+                }
+                Value::List { vals, .. } if body_type == BodyType::Form => {
+                    if vals.len() % 2 != 0 {
+                        return Err(ShellErrorOrRequestError::ShellError(ShellError::IOError {
+                            msg: "unsupported body input".into(),
+                        }));
+                    }
+
+                    let data = vals
+                        .chunks(2)
+                        .map(|it| Ok((it[0].coerce_string()?, it[1].coerce_string()?)))
+                        .collect::<Result<Vec<(String, String)>, ShellErrorOrRequestError>>()?;
+
+                    let request_fn = move || {
+                        // coerce `data` into a shape that send_form() is happy with
+                        let data = data
+                            .iter()
+                            .map(|(a, b)| (a.as_str(), b.as_str()))
+                            .collect::<Vec<(&str, &str)>>();
+                        req.send_form(&data)
+                    };
+                    send_cancellable_request(&request_url, Box::new(request_fn), ctrl_c)
+                }
+                Value::List { .. } if body_type == BodyType::Json => {
+                    let data = value_to_json_value(&body)?;
+                    send_cancellable_request(&request_url, Box::new(|| req.send_json(data)), ctrl_c)
+                }
+                _ => Err(ShellErrorOrRequestError::ShellError(ShellError::IOError {
                     msg: "unsupported body input".into(),
-                }));
+                })),
             }
-
-            let data = vals
-                .chunks(2)
-                .map(|it| Ok((it[0].coerce_string()?, it[1].coerce_string()?)))
-                .collect::<Result<Vec<(String, String)>, ShellErrorOrRequestError>>()?;
-
-            let request_fn = move || {
-                // coerce `data` into a shape that send_form() is happy with
-                let data = data
-                    .iter()
-                    .map(|(a, b)| (a.as_str(), b.as_str()))
-                    .collect::<Vec<(&str, &str)>>();
-                request.send_form(&data)
-            };
-            send_cancellable_request(&request_url, Box::new(request_fn), ctrl_c)
         }
-        Value::List { .. } if body_type == BodyType::Json => {
-            let data = value_to_json_value(&body)?;
-            send_cancellable_request(&request_url, Box::new(|| request.send_json(data)), ctrl_c)
-        }
-        _ => Err(ShellErrorOrRequestError::ShellError(ShellError::IOError {
-            msg: "unsupported body input".into(),
-        })),
     }
 }
 
@@ -305,6 +330,61 @@ fn send_cancellable_request(
     }
 }
 
+// Helper method used to make blocking HTTP request calls cancellable with ctrl+c
+// ureq functions can block for a long time (default 30s?) while attempting to make an HTTP connection
+fn send_cancellable_request_bytes(
+    request_url: &str,
+    request: Request,
+    byte_stream: ByteStream,
+    ctrl_c: Option<Arc<AtomicBool>>,
+) -> Result<Response, ShellErrorOrRequestError> {
+    let (tx, rx) = mpsc::channel::<Result<Response, ShellErrorOrRequestError>>();
+    let request_url_string = request_url.to_string();
+
+    // Make the blocking request on a background thread...
+    std::thread::Builder::new()
+        .name("HTTP requester".to_string())
+        .spawn(move || {
+            let ret = byte_stream
+                .reader()
+                .ok_or_else(|| {
+                    ShellErrorOrRequestError::ShellError(ShellError::GenericError {
+                        error: "Could not read byte stream".to_string(),
+                        msg: "".into(),
+                        span: None,
+                        help: None,
+                        inner: vec![],
+                    })
+                })
+                .and_then(|reader| {
+                    request.send(reader).map_err(|e| {
+                        ShellErrorOrRequestError::RequestError(request_url_string, Box::new(e))
+                    })
+                });
+
+            // may fail if the user has cancelled the operation
+            let _ = tx.send(ret);
+        })
+        .map_err(ShellError::from)?;
+
+    // ...and poll the channel for responses
+    loop {
+        if nu_utils::ctrl_c::was_pressed(&ctrl_c) {
+            // Return early and give up on the background thread. The connection will either time out or be disconnected
+            return Err(ShellErrorOrRequestError::ShellError(
+                ShellError::InterruptedByUser { span: None },
+            ));
+        }
+
+        // 100ms wait time chosen arbitrarily
+        match rx.recv_timeout(Duration::from_millis(100)) {
+            Ok(result) => return result,
+            Err(RecvTimeoutError::Timeout) => continue,
+            Err(RecvTimeoutError::Disconnected) => panic!("http response channel disconnected"),
+        }
+    }
+}
+
 pub fn request_set_timeout(
     timeout: Option<Value>,
     mut request: Request,
diff --git a/crates/nu-command/src/network/http/delete.rs b/crates/nu-command/src/network/http/delete.rs
index 77cfa70fb8..c2ef774a01 100644
--- a/crates/nu-command/src/network/http/delete.rs
+++ b/crates/nu-command/src/network/http/delete.rs
@@ -1,7 +1,7 @@
 use crate::network::http::client::{
     check_response_redirection, http_client, http_parse_redirect_mode, http_parse_url,
     request_add_authorization_header, request_add_custom_headers, request_handle_response,
-    request_set_timeout, send_request, RequestFlags,
+    request_set_timeout, send_request, HttpBody, RequestFlags,
 };
 use nu_engine::command_prelude::*;
 
@@ -15,7 +15,7 @@ impl Command for SubCommand {
 
     fn signature(&self) -> Signature {
         Signature::build("http delete")
-            .input_output_types(vec![(Type::Nothing, Type::Any)])
+            .input_output_types(vec![(Type::Any, Type::Any)])
             .allow_variants_without_examples(true)
             .required(
                 "URL",
@@ -132,6 +132,11 @@ impl Command for SubCommand {
                     "http delete --content-type application/json --data { field: value } https://www.example.com",
                 result: None,
             },
+            Example {
+                description: "Perform an HTTP delete with JSON content from a pipeline to example.com",
+                example: "open foo.json | http delete https://www.example.com",
+                result: None,
+            },
         ]
     }
 }
@@ -139,7 +144,7 @@ impl Command for SubCommand {
 struct Arguments {
     url: Value,
     headers: Option<Value>,
-    data: Option<Value>,
+    data: HttpBody,
     content_type: Option<String>,
     raw: bool,
     insecure: bool,
@@ -155,13 +160,27 @@ fn run_delete(
     engine_state: &EngineState,
     stack: &mut Stack,
     call: &Call,
-    _input: PipelineData,
+    input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
+    let (data, maybe_metadata) = call
+        .get_flag::<Value>(engine_state, stack, "data")?
+        .map(|v| (HttpBody::Value(v), None))
+        .unwrap_or_else(|| match input {
+            PipelineData::Value(v, metadata) => (HttpBody::Value(v), metadata),
+            PipelineData::ByteStream(byte_stream, metadata) => {
+                (HttpBody::ByteStream(byte_stream), metadata)
+            }
+            _ => (HttpBody::None, None),
+        });
+    let content_type = call
+        .get_flag(engine_state, stack, "content-type")?
+        .or_else(|| maybe_metadata.and_then(|m| m.content_type));
+
     let args = Arguments {
         url: call.req(engine_state, stack, 0)?,
         headers: call.get_flag(engine_state, stack, "headers")?,
-        data: call.get_flag(engine_state, stack, "data")?,
-        content_type: call.get_flag(engine_state, stack, "content-type")?,
+        data,
+        content_type,
         raw: call.has_flag(engine_state, stack, "raw")?,
         insecure: call.has_flag(engine_state, stack, "insecure")?,
         user: call.get_flag(engine_state, stack, "user")?,
diff --git a/crates/nu-command/src/network/http/get.rs b/crates/nu-command/src/network/http/get.rs
index e86c44e0a1..04582d5f00 100644
--- a/crates/nu-command/src/network/http/get.rs
+++ b/crates/nu-command/src/network/http/get.rs
@@ -5,6 +5,8 @@ use crate::network::http::client::{
 };
 use nu_engine::command_prelude::*;
 
+use super::client::HttpBody;
+
 #[derive(Clone)]
 pub struct SubCommand;
 
@@ -180,7 +182,7 @@ fn helper(
     request = request_add_authorization_header(args.user, args.password, request);
     request = request_add_custom_headers(args.headers, request)?;
 
-    let response = send_request(request.clone(), None, None, ctrl_c);
+    let response = send_request(request.clone(), HttpBody::None, None, ctrl_c);
 
     let request_flags = RequestFlags {
         raw: args.raw,
diff --git a/crates/nu-command/src/network/http/head.rs b/crates/nu-command/src/network/http/head.rs
index 875cdc8d8e..57dfafcba2 100644
--- a/crates/nu-command/src/network/http/head.rs
+++ b/crates/nu-command/src/network/http/head.rs
@@ -7,6 +7,8 @@ use nu_engine::command_prelude::*;
 
 use std::sync::{atomic::AtomicBool, Arc};
 
+use super::client::HttpBody;
+
 #[derive(Clone)]
 pub struct SubCommand;
 
@@ -156,7 +158,7 @@ fn helper(
     request = request_add_authorization_header(args.user, args.password, request);
     request = request_add_custom_headers(args.headers, request)?;
 
-    let response = send_request(request, None, None, ctrlc);
+    let response = send_request(request, HttpBody::None, None, ctrlc);
     check_response_redirection(redirect_mode, span, &response)?;
     request_handle_response_headers(span, response)
 }
diff --git a/crates/nu-command/src/network/http/options.rs b/crates/nu-command/src/network/http/options.rs
index fe4b7dcb1a..91ecac02d5 100644
--- a/crates/nu-command/src/network/http/options.rs
+++ b/crates/nu-command/src/network/http/options.rs
@@ -4,6 +4,8 @@ use crate::network::http::client::{
 };
 use nu_engine::command_prelude::*;
 
+use super::client::HttpBody;
+
 #[derive(Clone)]
 pub struct SubCommand;
 
@@ -159,7 +161,7 @@ fn helper(
     request = request_add_authorization_header(args.user, args.password, request);
     request = request_add_custom_headers(args.headers, request)?;
 
-    let response = send_request(request.clone(), None, None, ctrl_c);
+    let response = send_request(request.clone(), HttpBody::None, None, ctrl_c);
 
     // http options' response always showed in header, so we set full to true.
     // And `raw` is useless too because options method doesn't return body, here we set to true
diff --git a/crates/nu-command/src/network/http/patch.rs b/crates/nu-command/src/network/http/patch.rs
index ca302702ef..2cf66a2a82 100644
--- a/crates/nu-command/src/network/http/patch.rs
+++ b/crates/nu-command/src/network/http/patch.rs
@@ -1,7 +1,7 @@
 use crate::network::http::client::{
     check_response_redirection, http_client, http_parse_redirect_mode, http_parse_url,
     request_add_authorization_header, request_add_custom_headers, request_handle_response,
-    request_set_timeout, send_request, RequestFlags,
+    request_set_timeout, send_request, HttpBody, RequestFlags,
 };
 use nu_engine::command_prelude::*;
 
@@ -15,10 +15,10 @@ impl Command for SubCommand {
 
     fn signature(&self) -> Signature {
         Signature::build("http patch")
-            .input_output_types(vec![(Type::Nothing, Type::Any)])
+            .input_output_types(vec![(Type::Any, Type::Any)])
             .allow_variants_without_examples(true)
             .required("URL", SyntaxShape::String, "The URL to post to.")
-            .required("data", SyntaxShape::Any, "The contents of the post body.")
+            .optional("data", SyntaxShape::Any, "The contents of the post body.")
             .named(
                 "user",
                 SyntaxShape::Any,
@@ -124,6 +124,11 @@ impl Command for SubCommand {
                 example: "http patch --content-type application/json https://www.example.com { field: value }",
                 result: None,
             },
+            Example {
+                description: "Patch JSON content from a pipeline to example.com",
+                example: "open foo.json | http patch https://www.example.com",
+                result: None,
+            },
         ]
     }
 }
@@ -131,7 +136,7 @@ impl Command for SubCommand {
 struct Arguments {
     url: Value,
     headers: Option<Value>,
-    data: Value,
+    data: HttpBody,
     content_type: Option<String>,
     raw: bool,
     insecure: bool,
@@ -147,13 +152,37 @@ fn run_patch(
     engine_state: &EngineState,
     stack: &mut Stack,
     call: &Call,
-    _input: PipelineData,
+    input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
+    let (data, maybe_metadata) = call
+        .opt::<Value>(engine_state, stack, 1)?
+        .map(|v| (HttpBody::Value(v), None))
+        .unwrap_or_else(|| match input {
+            PipelineData::Value(v, metadata) => (HttpBody::Value(v), metadata),
+            PipelineData::ByteStream(byte_stream, metadata) => {
+                (HttpBody::ByteStream(byte_stream), metadata)
+            }
+            _ => (HttpBody::None, None),
+        });
+    let content_type = call
+        .get_flag(engine_state, stack, "content-type")?
+        .or_else(|| maybe_metadata.and_then(|m| m.content_type));
+
+    if let HttpBody::None = data {
+        return Err(ShellError::GenericError {
+            error: "Data must be provided either through pipeline or positional argument".into(),
+            msg: "".into(),
+            span: Some(call.head),
+            help: None,
+            inner: vec![],
+        });
+    }
+
     let args = Arguments {
         url: call.req(engine_state, stack, 0)?,
         headers: call.get_flag(engine_state, stack, "headers")?,
-        data: call.req(engine_state, stack, 1)?,
-        content_type: call.get_flag(engine_state, stack, "content-type")?,
+        data,
+        content_type,
         raw: call.has_flag(engine_state, stack, "raw")?,
         insecure: call.has_flag(engine_state, stack, "insecure")?,
         user: call.get_flag(engine_state, stack, "user")?,
@@ -187,7 +216,7 @@ fn helper(
     request = request_add_authorization_header(args.user, args.password, request);
     request = request_add_custom_headers(args.headers, request)?;
 
-    let response = send_request(request.clone(), Some(args.data), args.content_type, ctrl_c);
+    let response = send_request(request.clone(), args.data, args.content_type, ctrl_c);
 
     let request_flags = RequestFlags {
         raw: args.raw,
diff --git a/crates/nu-command/src/network/http/post.rs b/crates/nu-command/src/network/http/post.rs
index 1f0d7f81b0..d48bbcc9fe 100644
--- a/crates/nu-command/src/network/http/post.rs
+++ b/crates/nu-command/src/network/http/post.rs
@@ -1,7 +1,7 @@
 use crate::network::http::client::{
     check_response_redirection, http_client, http_parse_redirect_mode, http_parse_url,
     request_add_authorization_header, request_add_custom_headers, request_handle_response,
-    request_set_timeout, send_request, RequestFlags,
+    request_set_timeout, send_request, HttpBody, RequestFlags,
 };
 use nu_engine::command_prelude::*;
 
@@ -15,10 +15,10 @@ impl Command for SubCommand {
 
     fn signature(&self) -> Signature {
         Signature::build("http post")
-            .input_output_types(vec![(Type::Nothing, Type::Any)])
+            .input_output_types(vec![(Type::Any, Type::Any)])
             .allow_variants_without_examples(true)
             .required("URL", SyntaxShape::String, "The URL to post to.")
-            .required("data", SyntaxShape::Any, "The contents of the post body.")
+            .optional("data", SyntaxShape::Any, "The contents of the post body. Required unless part of a pipeline.")
             .named(
                 "user",
                 SyntaxShape::Any,
@@ -122,6 +122,11 @@ impl Command for SubCommand {
                 example: "http post --content-type application/json https://www.example.com { field: value }",
                 result: None,
             },
+            Example {
+                description: "Post JSON content from a pipeline to example.com",
+                example: "open foo.json | http post https://www.example.com",
+                result: None,
+            },
         ]
     }
 }
@@ -129,7 +134,7 @@ impl Command for SubCommand {
 struct Arguments {
     url: Value,
     headers: Option<Value>,
-    data: Value,
+    data: HttpBody,
     content_type: Option<String>,
     raw: bool,
     insecure: bool,
@@ -145,13 +150,37 @@ fn run_post(
     engine_state: &EngineState,
     stack: &mut Stack,
     call: &Call,
-    _input: PipelineData,
+    input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
+    let (data, maybe_metadata) = call
+        .opt::<Value>(engine_state, stack, 1)?
+        .map(|v| (HttpBody::Value(v), None))
+        .unwrap_or_else(|| match input {
+            PipelineData::Value(v, metadata) => (HttpBody::Value(v), metadata),
+            PipelineData::ByteStream(byte_stream, metadata) => {
+                (HttpBody::ByteStream(byte_stream), metadata)
+            }
+            _ => (HttpBody::None, None),
+        });
+    let content_type = call
+        .get_flag(engine_state, stack, "content-type")?
+        .or_else(|| maybe_metadata.and_then(|m| m.content_type));
+
+    if let HttpBody::None = data {
+        return Err(ShellError::GenericError {
+            error: "Data must be provided either through pipeline or positional argument".into(),
+            msg: "".into(),
+            span: Some(call.head),
+            help: None,
+            inner: vec![],
+        });
+    }
+
     let args = Arguments {
         url: call.req(engine_state, stack, 0)?,
         headers: call.get_flag(engine_state, stack, "headers")?,
-        data: call.req(engine_state, stack, 1)?,
-        content_type: call.get_flag(engine_state, stack, "content-type")?,
+        data,
+        content_type,
         raw: call.has_flag(engine_state, stack, "raw")?,
         insecure: call.has_flag(engine_state, stack, "insecure")?,
         user: call.get_flag(engine_state, stack, "user")?,
@@ -185,7 +214,7 @@ fn helper(
     request = request_add_authorization_header(args.user, args.password, request);
     request = request_add_custom_headers(args.headers, request)?;
 
-    let response = send_request(request.clone(), Some(args.data), args.content_type, ctrl_c);
+    let response = send_request(request.clone(), args.data, args.content_type, ctrl_c);
 
     let request_flags = RequestFlags {
         raw: args.raw,
diff --git a/crates/nu-command/src/network/http/put.rs b/crates/nu-command/src/network/http/put.rs
index 8abedd2b4c..dbd3b245cb 100644
--- a/crates/nu-command/src/network/http/put.rs
+++ b/crates/nu-command/src/network/http/put.rs
@@ -1,7 +1,7 @@
 use crate::network::http::client::{
     check_response_redirection, http_client, http_parse_redirect_mode, http_parse_url,
     request_add_authorization_header, request_add_custom_headers, request_handle_response,
-    request_set_timeout, send_request, RequestFlags,
+    request_set_timeout, send_request, HttpBody, RequestFlags,
 };
 use nu_engine::command_prelude::*;
 
@@ -15,10 +15,10 @@ impl Command for SubCommand {
 
     fn signature(&self) -> Signature {
         Signature::build("http put")
-            .input_output_types(vec![(Type::Nothing, Type::Any)])
+            .input_output_types(vec![(Type::Any, Type::Any)])
             .allow_variants_without_examples(true)
             .required("URL", SyntaxShape::String, "The URL to post to.")
-            .required("data", SyntaxShape::Any, "The contents of the post body.")
+            .optional("data", SyntaxShape::Any, "The contents of the post body. Required unless part of a pipeline.")
             .named(
                 "user",
                 SyntaxShape::Any,
@@ -122,6 +122,11 @@ impl Command for SubCommand {
                 example: "http put --content-type application/json https://www.example.com { field: value }",
                 result: None,
             },
+            Example {
+                description: "Put JSON content from a pipeline to example.com",
+                example: "open foo.json | http put https://www.example.com",
+                result: None,
+            },
         ]
     }
 }
@@ -129,7 +134,7 @@ impl Command for SubCommand {
 struct Arguments {
     url: Value,
     headers: Option<Value>,
-    data: Value,
+    data: HttpBody,
     content_type: Option<String>,
     raw: bool,
     insecure: bool,
@@ -145,13 +150,38 @@ fn run_put(
     engine_state: &EngineState,
     stack: &mut Stack,
     call: &Call,
-    _input: PipelineData,
+    input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
+    let (data, maybe_metadata) = call
+        .opt::<Value>(engine_state, stack, 1)?
+        .map(|v| (HttpBody::Value(v), None))
+        .unwrap_or_else(|| match input {
+            PipelineData::Value(v, metadata) => (HttpBody::Value(v), metadata),
+            PipelineData::ByteStream(byte_stream, metadata) => {
+                (HttpBody::ByteStream(byte_stream), metadata)
+            }
+            _ => (HttpBody::None, None),
+        });
+
+    if let HttpBody::None = data {
+        return Err(ShellError::GenericError {
+            error: "Data must be provided either through pipeline or positional argument".into(),
+            msg: "".into(),
+            span: Some(call.head),
+            help: None,
+            inner: vec![],
+        });
+    }
+
+    let content_type = call
+        .get_flag(engine_state, stack, "content-type")?
+        .or_else(|| maybe_metadata.and_then(|m| m.content_type));
+
     let args = Arguments {
         url: call.req(engine_state, stack, 0)?,
         headers: call.get_flag(engine_state, stack, "headers")?,
-        data: call.req(engine_state, stack, 1)?,
-        content_type: call.get_flag(engine_state, stack, "content-type")?,
+        data,
+        content_type,
         raw: call.has_flag(engine_state, stack, "raw")?,
         insecure: call.has_flag(engine_state, stack, "insecure")?,
         user: call.get_flag(engine_state, stack, "user")?,
@@ -185,7 +215,7 @@ fn helper(
     request = request_add_authorization_header(args.user, args.password, request);
     request = request_add_custom_headers(args.headers, request)?;
 
-    let response = send_request(request.clone(), Some(args.data), args.content_type, ctrl_c);
+    let response = send_request(request.clone(), args.data, args.content_type, ctrl_c);
 
     let request_flags = RequestFlags {
         raw: args.raw,
diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index 075a4e31c4..f0cc90fa9f 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -605,6 +605,7 @@ fn handle_row_stream(
         // First, `ls` sources:
         Some(PipelineMetadata {
             data_source: DataSource::Ls,
+            ..
         }) => {
             let config = get_config(input.engine_state, input.stack);
             let ls_colors_env_str = match input.stack.get_env_var(input.engine_state, "LS_COLORS") {
@@ -636,6 +637,7 @@ fn handle_row_stream(
         // Next, `to html -l` sources:
         Some(PipelineMetadata {
             data_source: DataSource::HtmlThemes,
+            ..
         }) => {
             stream.map(|mut value| {
                 if let Value::Record { val: record, .. } = &mut value {
diff --git a/crates/nu-command/tests/commands/network/http/delete.rs b/crates/nu-command/tests/commands/network/http/delete.rs
index bc71ed3945..c284c2ccfd 100644
--- a/crates/nu-command/tests/commands/network/http/delete.rs
+++ b/crates/nu-command/tests/commands/network/http/delete.rs
@@ -20,6 +20,25 @@ fn http_delete_is_success() {
     assert!(actual.out.is_empty())
 }
 
+#[test]
+fn http_delete_is_success_pipeline() {
+    let mut server = Server::new();
+
+    let _mock = server.mock("DELETE", "/").create();
+
+    let actual = nu!(pipeline(
+        format!(
+            r#"
+        "foo" | http delete {url}
+        "#,
+            url = server.url()
+        )
+        .as_str()
+    ));
+
+    assert!(actual.out.is_empty())
+}
+
 #[test]
 fn http_delete_failed_due_to_server_error() {
     let mut server = Server::new();
diff --git a/crates/nu-command/tests/commands/network/http/patch.rs b/crates/nu-command/tests/commands/network/http/patch.rs
index 4196b304c6..dc3a755baa 100644
--- a/crates/nu-command/tests/commands/network/http/patch.rs
+++ b/crates/nu-command/tests/commands/network/http/patch.rs
@@ -20,6 +20,25 @@ fn http_patch_is_success() {
     assert!(actual.out.is_empty())
 }
 
+#[test]
+fn http_patch_is_success_pipeline() {
+    let mut server = Server::new();
+
+    let _mock = server.mock("PATCH", "/").match_body("foo").create();
+
+    let actual = nu!(pipeline(
+        format!(
+            r#"
+        "foo" | http patch {url}
+        "#,
+            url = server.url()
+        )
+        .as_str()
+    ));
+
+    assert!(actual.out.is_empty())
+}
+
 #[test]
 fn http_patch_failed_due_to_server_error() {
     let mut server = Server::new();
@@ -55,7 +74,9 @@ fn http_patch_failed_due_to_missing_body() {
         .as_str()
     ));
 
-    assert!(actual.err.contains("Usage: http patch"))
+    assert!(actual
+        .err
+        .contains("Data must be provided either through pipeline or positional argument"))
 }
 
 #[test]
diff --git a/crates/nu-command/tests/commands/network/http/post.rs b/crates/nu-command/tests/commands/network/http/post.rs
index bd13542482..02aa8df23f 100644
--- a/crates/nu-command/tests/commands/network/http/post.rs
+++ b/crates/nu-command/tests/commands/network/http/post.rs
@@ -19,6 +19,24 @@ fn http_post_is_success() {
 
     assert!(actual.out.is_empty())
 }
+#[test]
+fn http_post_is_success_pipeline() {
+    let mut server = Server::new();
+
+    let _mock = server.mock("POST", "/").match_body("foo").create();
+
+    let actual = nu!(pipeline(
+        format!(
+            r#"
+        "foo" | http post {url}
+        "#,
+            url = server.url()
+        )
+        .as_str()
+    ));
+
+    assert!(actual.out.is_empty())
+}
 
 #[test]
 fn http_post_failed_due_to_server_error() {
@@ -55,7 +73,9 @@ fn http_post_failed_due_to_missing_body() {
         .as_str()
     ));
 
-    assert!(actual.err.contains("Usage: http post"))
+    assert!(actual
+        .err
+        .contains("Data must be provided either through pipeline or positional argument"))
 }
 
 #[test]
diff --git a/crates/nu-command/tests/commands/network/http/put.rs b/crates/nu-command/tests/commands/network/http/put.rs
index 002b1f8632..43251cd21a 100644
--- a/crates/nu-command/tests/commands/network/http/put.rs
+++ b/crates/nu-command/tests/commands/network/http/put.rs
@@ -20,6 +20,25 @@ fn http_put_is_success() {
     assert!(actual.out.is_empty())
 }
 
+#[test]
+fn http_put_is_success_pipeline() {
+    let mut server = Server::new();
+
+    let _mock = server.mock("PUT", "/").match_body("foo").create();
+
+    let actual = nu!(pipeline(
+        format!(
+            r#"
+        "foo" | http put {url} 
+        "#,
+            url = server.url()
+        )
+        .as_str()
+    ));
+
+    assert!(actual.out.is_empty())
+}
+
 #[test]
 fn http_put_failed_due_to_server_error() {
     let mut server = Server::new();
@@ -55,7 +74,9 @@ fn http_put_failed_due_to_missing_body() {
         .as_str()
     ));
 
-    assert!(actual.err.contains("Usage: http put"))
+    assert!(actual
+        .err
+        .contains("Data must be provided either through pipeline or positional argument"))
 }
 
 #[test]
diff --git a/crates/nu-plugin-core/src/interface/tests.rs b/crates/nu-plugin-core/src/interface/tests.rs
index e318a2648e..6b86aba97d 100644
--- a/crates/nu-plugin-core/src/interface/tests.rs
+++ b/crates/nu-plugin-core/src/interface/tests.rs
@@ -18,6 +18,7 @@ use std::{path::Path, sync::Arc};
 fn test_metadata() -> PipelineMetadata {
     PipelineMetadata {
         data_source: DataSource::FilePath("/test/path".into()),
+        content_type: None,
     }
 }
 
@@ -258,7 +259,7 @@ fn read_pipeline_data_prepared_properly() -> Result<(), ShellError> {
     });
     match manager.read_pipeline_data(header, None)? {
         PipelineData::ListStream(_, meta) => match meta {
-            Some(PipelineMetadata { data_source }) => match data_source {
+            Some(PipelineMetadata { data_source, .. }) => match data_source {
                 DataSource::FilePath(path) => {
                     assert_eq!(Path::new("/test/path"), path);
                     Ok(())
diff --git a/crates/nu-protocol/src/pipeline/metadata.rs b/crates/nu-protocol/src/pipeline/metadata.rs
index 08aa0fe964..1ed9222f46 100644
--- a/crates/nu-protocol/src/pipeline/metadata.rs
+++ b/crates/nu-protocol/src/pipeline/metadata.rs
@@ -1,18 +1,37 @@
 use std::path::PathBuf;
 
 /// Metadata that is valid for the whole [`PipelineData`](crate::PipelineData)
-#[derive(Debug, Clone)]
+#[derive(Debug, Default, Clone)]
 pub struct PipelineMetadata {
     pub data_source: DataSource,
+    pub content_type: Option<String>,
+}
+
+impl PipelineMetadata {
+    pub fn with_data_source(self, data_source: DataSource) -> Self {
+        Self {
+            data_source,
+            ..self
+        }
+    }
+
+    pub fn with_content_type(self, content_type: Option<String>) -> Self {
+        Self {
+            content_type,
+            ..self
+        }
+    }
 }
 
 /// Describes where the particular [`PipelineMetadata`] originates.
 ///
 /// This can either be a particular family of commands (useful so downstream commands can adjust
 /// the presentation e.g. `Ls`) or the opened file to protect against overwrite-attempts properly.
-#[derive(Debug, Clone)]
+#[derive(Debug, Default, Clone)]
 pub enum DataSource {
     Ls,
     HtmlThemes,
     FilePath(PathBuf),
+    #[default]
+    None,
 }

From 122ff1f19c3b27f546e1606d4190cd669b358771 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Tue, 2 Jul 2024 13:35:55 -0700
Subject: [PATCH 0168/1072] Add the ability to set content-type metadata with
 `metadata set` (#13284)

# Description

With #13254, the content-type pipeline metadata field was added. This
pull request allows it to be manipulated with `metadata set`

# User-Facing Changes
* `metadata set` now has a `--content-type` flag
---
 crates/nu-command/src/debug/metadata_set.rs | 68 +++++++++++----------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/crates/nu-command/src/debug/metadata_set.rs b/crates/nu-command/src/debug/metadata_set.rs
index 5d6ba63745..e4ee97a76b 100644
--- a/crates/nu-command/src/debug/metadata_set.rs
+++ b/crates/nu-command/src/debug/metadata_set.rs
@@ -1,5 +1,5 @@
 use nu_engine::command_prelude::*;
-use nu_protocol::{DataSource, PipelineMetadata};
+use nu_protocol::DataSource;
 
 #[derive(Clone)]
 pub struct MetadataSet;
@@ -27,6 +27,12 @@ impl Command for MetadataSet {
                 "Assign the DataSource::FilePath metadata to the input",
                 Some('f'),
             )
+            .named(
+                "content-type",
+                SyntaxShape::String,
+                "Assign content type metadata to the input",
+                Some('c'),
+            )
             .allow_variants_without_examples(true)
             .category(Category::Debug)
     }
@@ -41,35 +47,30 @@ impl Command for MetadataSet {
         let head = call.head;
         let ds_fp: Option<String> = call.get_flag(engine_state, stack, "datasource-filepath")?;
         let ds_ls = call.has_flag(engine_state, stack, "datasource-ls")?;
+        let content_type: Option<String> = call.get_flag(engine_state, stack, "content-type")?;
+
+        let metadata = input
+            .metadata()
+            .clone()
+            .unwrap_or_default()
+            .with_content_type(content_type);
 
         match (ds_fp, ds_ls) {
-            (Some(path), false) => {
-                let metadata = PipelineMetadata {
-                    data_source: DataSource::FilePath(path.into()),
-                    content_type: None,
-                };
-                Ok(input.into_pipeline_data_with_metadata(
-                    head,
-                    engine_state.ctrlc.clone(),
-                    metadata,
-                ))
-            }
-            (None, true) => {
-                let metadata = PipelineMetadata {
-                    data_source: DataSource::Ls,
-                    content_type: None,
-                };
-                Ok(input.into_pipeline_data_with_metadata(
-                    head,
-                    engine_state.ctrlc.clone(),
-                    metadata,
-                ))
-            }
-            _ => Err(ShellError::IncorrectValue {
-                msg: "Expected either --datasource-ls(-l) or --datasource-filepath(-f)".to_string(),
-                val_span: head,
-                call_span: head,
-            }),
+            (Some(path), false) => Ok(input.into_pipeline_data_with_metadata(
+                head,
+                engine_state.ctrlc.clone(),
+                metadata.with_data_source(DataSource::FilePath(path.into())),
+            )),
+            (None, true) => Ok(input.into_pipeline_data_with_metadata(
+                head,
+                engine_state.ctrlc.clone(),
+                metadata.with_data_source(DataSource::Ls),
+            )),
+            _ => Ok(input.into_pipeline_data_with_metadata(
+                head,
+                engine_state.ctrlc.clone(),
+                metadata,
+            )),
         }
     }
 
@@ -85,18 +86,23 @@ impl Command for MetadataSet {
                 example: "'crates' | metadata set --datasource-filepath $'(pwd)/crates' | metadata",
                 result: None,
             },
+            Example {
+                description: "Set the metadata of a file path",
+                example: "'crates' | metadata set --content-type text/plain | metadata",
+                result: Some(Value::record(record!("content_type" => Value::string("text/plain", Span::test_data())), Span::test_data())),
+            },
         ]
     }
 }
 
 #[cfg(test)]
 mod test {
+    use crate::{test_examples_with_commands, Metadata};
+
     use super::*;
 
     #[test]
     fn test_examples() {
-        use crate::test_examples;
-
-        test_examples(MetadataSet {})
+        test_examples_with_commands(MetadataSet {}, &[&Metadata {}])
     }
 }

From 9b63e17072b4d98633b8c304090385a8986f7b7f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Jul 2024 01:23:11 +0000
Subject: [PATCH 0169/1072] Bump open from 5.1.2 to 5.2.0 (#13288)

---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index aad9bdd990..79c2064f53 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3765,9 +3765,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "open"
-version = "5.1.2"
+version = "5.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "449f0ff855d85ddbf1edd5b646d65249ead3f5e422aaa86b7d2d0b049b103e32"
+checksum = "9d2c909a3fce3bd80efef4cd1c6c056bd9376a8fe06fcfdbebaf32cb485a7e37"
 dependencies = [
  "is-wsl",
  "libc",
diff --git a/Cargo.toml b/Cargo.toml
index f79476e7e6..05244090a4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -120,7 +120,7 @@ num-format = "0.4"
 num-traits = "0.2"
 omnipath = "0.1"
 once_cell = "1.18"
-open = "5.1"
+open = "5.2"
 os_pipe = { version = "1.2", features = ["io_safety"] }
 pathdiff = "0.2"
 percent-encoding = "2"

From 0cfd5fbece6f25b54ab9dc417a9e06af9d83f282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C5=BD=C3=A1dn=C3=ADk?= <kubouch@gmail.com>
Date: Wed, 3 Jul 2024 09:00:52 +0300
Subject: [PATCH 0170/1072] Span ID Refactor (Step 2): Make Call
 SpanId-friendly (#13268)

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

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

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

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

Part of https://github.com/nushell/nushell/issues/12963, step 2.

This PR refactors Call and related argument structures to remove their
dependency on `Expression::span` which will be removed in the future.

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

Should be none. If you see some error messages that look broken, please
report.

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 .../nu-cli/src/commands/keybindings_list.rs   |   2 +-
 .../src/completions/custom_completions.rs     |  29 +--
 crates/nu-cli/src/syntax_highlight.rs         |   2 +-
 crates/nu-command/src/bytes/build_.rs         |   2 +-
 crates/nu-command/src/debug/explain.rs        |   4 +-
 crates/nu-command/src/debug/profile.rs        |   6 +-
 crates/nu-command/src/filesystem/open.rs      |   7 +-
 crates/nu-command/src/filesystem/save.rs      |   2 +-
 crates/nu-command/src/filesystem/util.rs      |   2 +-
 crates/nu-command/src/formats/from/csv.rs     |   2 +-
 crates/nu-command/src/generators/cal.rs       |   4 +-
 crates/nu-command/src/misc/tutor.rs           |   2 +-
 crates/nu-command/src/network/http/client.rs  |   2 +-
 crates/nu-command/src/platform/is_terminal.rs |   7 +-
 crates/nu-command/src/system/run_external.rs  |   8 +-
 crates/nu-command/src/viewers/table.rs        |  17 +-
 crates/nu-engine/src/call_ext.rs              |   2 +-
 crates/nu-engine/src/documentation.rs         |  19 +-
 crates/nu-engine/src/eval.rs                  |  13 +-
 crates/nu-parser/src/flatten.rs               |   2 +-
 crates/nu-parser/src/known_external.rs        |   4 +-
 crates/nu-parser/src/lib.rs                   |   5 +-
 crates/nu-parser/src/parse_keywords.rs        |  65 ++++--
 crates/nu-parser/src/parser.rs                | 202 ++++++++++-------
 crates/nu-parser/tests/test_parser.rs         | 100 ++++++++-
 .../nu-plugin-protocol/src/evaluated_call.rs  |   7 +-
 crates/nu-protocol/src/ast/call.rs            | 203 +++++++-----------
 crates/nu-protocol/src/ast/expression.rs      |   4 +-
 .../src/engine/state_working_set.rs           |  36 +++-
 crates/nu-protocol/src/eval_const.rs          |   2 +-
 .../nu-protocol/src/pipeline/pipeline_data.rs |   2 +-
 31 files changed, 468 insertions(+), 296 deletions(-)

diff --git a/crates/nu-cli/src/commands/keybindings_list.rs b/crates/nu-cli/src/commands/keybindings_list.rs
index f4450c0c23..b6375be8a1 100644
--- a/crates/nu-cli/src/commands/keybindings_list.rs
+++ b/crates/nu-cli/src/commands/keybindings_list.rs
@@ -62,7 +62,7 @@ impl Command for KeybindingsList {
                 .collect()
         } else {
             call.named_iter()
-                .flat_map(|(argument, _, _)| get_records(argument.item.as_str(), call.head))
+                .flat_map(|(argument, _, _, _)| get_records(argument.item.as_str(), call.head))
                 .collect()
         };
 
diff --git a/crates/nu-cli/src/completions/custom_completions.rs b/crates/nu-cli/src/completions/custom_completions.rs
index f14971d466..5d45bb708e 100644
--- a/crates/nu-cli/src/completions/custom_completions.rs
+++ b/crates/nu-cli/src/completions/custom_completions.rs
@@ -7,7 +7,7 @@ use nu_protocol::{
     ast::{Argument, Call, Expr, Expression},
     debugger::WithoutDebug,
     engine::{Stack, StateWorkingSet},
-    PipelineData, Span, Type, Value,
+    PipelineData, Span, Spanned, Type, Value,
 };
 use nu_utils::IgnoreCaseExt;
 use std::collections::HashMap;
@@ -51,18 +51,21 @@ impl Completer for CustomCompletion {
             &Call {
                 decl_id: self.decl_id,
                 head: span,
-                arguments: vec![
-                    Argument::Positional(Expression::new_unknown(
-                        Expr::String(self.line.clone()),
-                        Span::unknown(),
-                        Type::String,
-                    )),
-                    Argument::Positional(Expression::new_unknown(
-                        Expr::Int(line_pos as i64),
-                        Span::unknown(),
-                        Type::Int,
-                    )),
-                ],
+                arguments: Spanned {
+                    item: vec![
+                        Argument::Positional(Expression::new_unknown(
+                            Expr::String(self.line.clone()),
+                            Span::unknown(),
+                            Type::String,
+                        )),
+                        Argument::Positional(Expression::new_unknown(
+                            Expr::Int(line_pos as i64),
+                            Span::unknown(),
+                            Type::Int,
+                        )),
+                    ],
+                    span: Span::unknown(),
+                },
                 parser_info: HashMap::new(),
             },
             PipelineData::empty(),
diff --git a/crates/nu-cli/src/syntax_highlight.rs b/crates/nu-cli/src/syntax_highlight.rs
index 41ef168390..9fccf5e409 100644
--- a/crates/nu-cli/src/syntax_highlight.rs
+++ b/crates/nu-cli/src/syntax_highlight.rs
@@ -400,7 +400,7 @@ fn find_matching_block_end_in_expr(
                 }
             }
 
-            Expr::Call(call) => call.arguments.iter().find_map(|arg| {
+            Expr::Call(call) => call.arguments.item.iter().find_map(|arg| {
                 arg.expr().and_then(|expr| {
                     find_matching_block_end_in_expr(
                         line,
diff --git a/crates/nu-command/src/bytes/build_.rs b/crates/nu-command/src/bytes/build_.rs
index f6b1327621..b6a98d1204 100644
--- a/crates/nu-command/src/bytes/build_.rs
+++ b/crates/nu-command/src/bytes/build_.rs
@@ -49,7 +49,7 @@ impl Command for BytesBuild {
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let mut output = vec![];
-        for val in call.rest_iter_flattened(0, |expr| {
+        for val in call.rest_iter_flattened(&engine_state, 0, |expr| {
             let eval_expression = get_eval_expression(engine_state);
             eval_expression(engine_state, stack, expr)
         })? {
diff --git a/crates/nu-command/src/debug/explain.rs b/crates/nu-command/src/debug/explain.rs
index b451d6916a..d30d41faa8 100644
--- a/crates/nu-command/src/debug/explain.rs
+++ b/crates/nu-command/src/debug/explain.rs
@@ -111,11 +111,11 @@ fn get_arguments(
 ) -> Vec<Value> {
     let mut arg_value = vec![];
     let span = Span::test_data();
-    for arg in &call.arguments {
+    for arg in &call.arguments.item {
         match arg {
             // I think the second argument to Argument::Named is the short name, but I'm not really sure.
             // Please fix it if it's wrong. :)
-            Argument::Named((name, short, opt_expr)) => {
+            Argument::Named((name, short, opt_expr, _)) => {
                 let arg_type = "named";
                 let arg_value_name = name.item.clone();
                 let arg_value_name_span_start = name.span.start as i64;
diff --git a/crates/nu-command/src/debug/profile.rs b/crates/nu-command/src/debug/profile.rs
index 0cef979094..86136279f7 100644
--- a/crates/nu-command/src/debug/profile.rs
+++ b/crates/nu-command/src/debug/profile.rs
@@ -104,7 +104,7 @@ confusing the id/parent_id hierarchy. The --expr flag is helpful for investigati
             collect_values,
             collect_exprs,
             collect_lines,
-            call.span(),
+            call.span(&engine_state),
         );
 
         let lock_err = |_| ShellError::GenericError {
@@ -125,12 +125,12 @@ confusing the id/parent_id hierarchy. The --expr flag is helpful for investigati
         let pipeline_data = result?;
 
         // Collect the output
-        let _ = pipeline_data.into_value(call.span());
+        let _ = pipeline_data.into_value(call.span(&engine_state));
 
         Ok(engine_state
             .deactivate_debugger()
             .map_err(lock_err)?
-            .report(engine_state, call.span())?
+            .report(engine_state, call.span(&engine_state))?
             .into_pipeline_data())
     }
 
diff --git a/crates/nu-command/src/filesystem/open.rs b/crates/nu-command/src/filesystem/open.rs
index 9000359450..59caf283ba 100644
--- a/crates/nu-command/src/filesystem/open.rs
+++ b/crates/nu-command/src/filesystem/open.rs
@@ -177,7 +177,12 @@ impl Command for Open {
                                 let block = engine_state.get_block(block_id);
                                 eval_block(engine_state, stack, block, stream)
                             } else {
-                                decl.run(engine_state, stack, &Call::new(call_span), stream)
+                                decl.run(
+                                    engine_state,
+                                    stack,
+                                    &Call::new(call_span, call.arguments_span()),
+                                    stream,
+                                )
                             };
                             output.push(command_output.map_err(|inner| {
                                     ShellError::GenericError{
diff --git a/crates/nu-command/src/filesystem/save.rs b/crates/nu-command/src/filesystem/save.rs
index ab5257fb01..fa14572987 100644
--- a/crates/nu-command/src/filesystem/save.rs
+++ b/crates/nu-command/src/filesystem/save.rs
@@ -398,7 +398,7 @@ fn convert_to_extension(
             let eval_block = get_eval_block(engine_state);
             eval_block(engine_state, stack, block, input)
         } else {
-            decl.run(engine_state, stack, &Call::new(span), input)
+            decl.run(engine_state, stack, &Call::new(span, span.past()), input)
         }
     } else {
         Ok(input)
diff --git a/crates/nu-command/src/filesystem/util.rs b/crates/nu-command/src/filesystem/util.rs
index 1b755875bd..8c1dfcf85f 100644
--- a/crates/nu-command/src/filesystem/util.rs
+++ b/crates/nu-command/src/filesystem/util.rs
@@ -103,7 +103,7 @@ pub fn get_rest_for_glob_pattern(
     let mut output = vec![];
     let eval_expression = get_eval_expression(engine_state);
 
-    for result in call.rest_iter_flattened(starting_pos, |expr| {
+    for result in call.rest_iter_flattened(&engine_state, starting_pos, |expr| {
         let result = eval_expression(engine_state, stack, expr);
         match result {
             Err(e) => Err(e),
diff --git a/crates/nu-command/src/formats/from/csv.rs b/crates/nu-command/src/formats/from/csv.rs
index b00dd5022b..3db4da62db 100644
--- a/crates/nu-command/src/formats/from/csv.rs
+++ b/crates/nu-command/src/formats/from/csv.rs
@@ -141,7 +141,7 @@ fn from_csv(
             } else {
                 return Err(ShellError::NonUtf8Custom {
                     msg: "separator should be a single char or a 4-byte unicode".into(),
-                    span: call.span(),
+                    span: call.span(&engine_state),
                 });
             }
         }
diff --git a/crates/nu-command/src/generators/cal.rs b/crates/nu-command/src/generators/cal.rs
index a257f3ab7c..215469030f 100644
--- a/crates/nu-command/src/generators/cal.rs
+++ b/crates/nu-command/src/generators/cal.rs
@@ -3,6 +3,7 @@ use nu_color_config::StyleComputer;
 use nu_engine::command_prelude::*;
 use nu_protocol::ast::{Expr, Expression};
 
+use nu_protocol::engine::UNKNOWN_SPAN_ID;
 use std::collections::VecDeque;
 
 #[derive(Clone)]
@@ -143,7 +144,7 @@ pub fn cal(
         style_computer,
     )?;
 
-    let mut table_no_index = Call::new(Span::unknown());
+    let mut table_no_index = Call::new(Span::unknown(), Span::unknown());
     table_no_index.add_named((
         Spanned {
             item: "index".to_string(),
@@ -155,6 +156,7 @@ pub fn cal(
             Span::unknown(),
             Type::Bool,
         )),
+        UNKNOWN_SPAN_ID,
     ));
 
     let cal_table_output =
diff --git a/crates/nu-command/src/misc/tutor.rs b/crates/nu-command/src/misc/tutor.rs
index 6b1c43534b..361b4ada27 100644
--- a/crates/nu-command/src/misc/tutor.rs
+++ b/crates/nu-command/src/misc/tutor.rs
@@ -412,7 +412,7 @@ fn display(help: &str, engine_state: &EngineState, stack: &mut Stack, span: Span
                 let result = decl.run(
                     engine_state,
                     stack,
-                    &Call::new(span),
+                    &Call::new(span, span.past()),
                     Value::string(item, Span::unknown()).into_pipeline_data(),
                 );
 
diff --git a/crates/nu-command/src/network/http/client.rs b/crates/nu-command/src/network/http/client.rs
index 2c02d7be33..f0951a1885 100644
--- a/crates/nu-command/src/network/http/client.rs
+++ b/crates/nu-command/src/network/http/client.rs
@@ -547,7 +547,7 @@ fn transform_response_using_content_type(
             Some(converter_id) => engine_state.get_decl(converter_id).run(
                 engine_state,
                 stack,
-                &Call::new(span),
+                &Call::new(span, span.past()),
                 output,
             ),
             None => Ok(output),
diff --git a/crates/nu-command/src/platform/is_terminal.rs b/crates/nu-command/src/platform/is_terminal.rs
index c67329e839..1d4d1628f9 100644
--- a/crates/nu-command/src/platform/is_terminal.rs
+++ b/crates/nu-command/src/platform/is_terminal.rs
@@ -58,7 +58,12 @@ impl Command for IsTerminal {
             _ => {
                 return Err(ShellError::IncompatibleParametersSingle {
                     msg: "Only one stream may be checked".into(),
-                    span: Span::merge_many(call.arguments.iter().map(|arg| arg.span())),
+                    span: Span::merge_many(
+                        call.arguments
+                            .item
+                            .iter()
+                            .map(|arg| arg.span(&engine_state)),
+                    ),
                 });
             }
         };
diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index f82c23a0e0..398cd4919a 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -375,8 +375,12 @@ fn write_pipeline_data(
         Arc::make_mut(&mut engine_state.config).use_ansi_coloring = false;
 
         // Invoke the `table` command.
-        let output =
-            crate::Table.run(&engine_state, &mut stack, &Call::new(Span::unknown()), data)?;
+        let output = crate::Table.run(
+            &engine_state,
+            &mut stack,
+            &Call::new(Span::unknown(), Span::unknown()),
+            data,
+        )?;
 
         // Write the output.
         for value in output {
diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index f0cc90fa9f..07d761a615 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -127,7 +127,7 @@ impl Command for Table {
             return Ok(val.into_pipeline_data());
         }
 
-        let cfg = parse_table_config(call, engine_state, stack)?;
+        let cfg = parse_table_config(engine_state, call, engine_state, stack)?;
         let input = CmdInput::new(engine_state, stack, call, input);
 
         // reset vt processing, aka ansi because illbehaved externals can break it
@@ -247,6 +247,7 @@ impl TableConfig {
 }
 
 fn parse_table_config(
+    engine_state: &EngineState,
     call: &Call,
     state: &EngineState,
     stack: &mut Stack,
@@ -269,9 +270,9 @@ fn parse_table_config(
             flatten_separator,
         },
     };
-    let theme =
-        get_theme_flag(call, state, stack)?.unwrap_or_else(|| get_config(state, stack).table_mode);
-    let index = get_index_flag(call, state, stack)?;
+    let theme = get_theme_flag(engine_state, call, state, stack)?
+        .unwrap_or_else(|| get_config(state, stack).table_mode);
+    let index = get_index_flag(engine_state, call, state, stack)?;
 
     let term_width = get_width_param(width_param);
 
@@ -285,6 +286,7 @@ fn parse_table_config(
 }
 
 fn get_index_flag(
+    engine_state: &EngineState,
     call: &Call,
     state: &EngineState,
     stack: &mut Stack,
@@ -308,7 +310,7 @@ fn get_index_flag(
                 Err(ShellError::UnsupportedInput {
                     msg: String::from("got a negative integer"),
                     input: val.to_string(),
-                    msg_span: call.span(),
+                    msg_span: call.span(&engine_state),
                     input_span: internal_span,
                 })
             } else {
@@ -319,13 +321,14 @@ fn get_index_flag(
         _ => Err(ShellError::CantConvert {
             to_type: String::from("index"),
             from_type: String::new(),
-            span: call.span(),
+            span: call.span(&engine_state),
             help: Some(String::from("supported values: [bool, int, nothing]")),
         }),
     }
 }
 
 fn get_theme_flag(
+    engine_state: &EngineState,
     call: &Call,
     state: &EngineState,
     stack: &mut Stack,
@@ -335,7 +338,7 @@ fn get_theme_flag(
             TableMode::from_str(&theme).map_err(|err| ShellError::CantConvert {
                 to_type: String::from("theme"),
                 from_type: String::from("string"),
-                span: call.span(),
+                span: call.span(&engine_state),
                 help: Some(format!("{}, but found '{}'.", err, theme)),
             })
         })
diff --git a/crates/nu-engine/src/call_ext.rs b/crates/nu-engine/src/call_ext.rs
index daedb24a1f..4a577a6103 100644
--- a/crates/nu-engine/src/call_ext.rs
+++ b/crates/nu-engine/src/call_ext.rs
@@ -113,7 +113,7 @@ impl CallExt for Call {
         let stack = &mut stack.use_call_arg_out_dest();
         let mut output = vec![];
 
-        for result in self.rest_iter_flattened(starting_pos, |expr| {
+        for result in self.rest_iter_flattened(&engine_state, starting_pos, |expr| {
             eval_expression::<WithoutDebug>(engine_state, stack, expr)
         })? {
             output.push(FromValue::from_value(result)?);
diff --git a/crates/nu-engine/src/documentation.rs b/crates/nu-engine/src/documentation.rs
index a7d4950036..ccc55ce8be 100644
--- a/crates/nu-engine/src/documentation.rs
+++ b/crates/nu-engine/src/documentation.rs
@@ -48,7 +48,7 @@ fn nu_highlight_string(code_string: &str, engine_state: &EngineState, stack: &mu
         if let Ok(output) = decl.run(
             engine_state,
             stack,
-            &Call::new(Span::unknown()),
+            &Call::new(Span::unknown(), Span::unknown()),
             Value::string(code_string, Span::unknown()).into_pipeline_data(),
         ) {
             let result = output.into_value(Span::unknown());
@@ -241,7 +241,10 @@ fn get_documentation(
                 &Call {
                     decl_id,
                     head: span,
-                    arguments: vec![],
+                    arguments: Spanned {
+                        item: vec![],
+                        span: span.past(),
+                    },
                     parser_info: HashMap::new(),
                 },
                 PipelineData::Value(Value::list(vals, span), None),
@@ -273,7 +276,7 @@ fn get_documentation(
             match decl.run(
                 engine_state,
                 stack,
-                &Call::new(Span::unknown()),
+                &Call::new(Span::unknown(), Span::unknown()),
                 Value::string(example.example, Span::unknown()).into_pipeline_data(),
             ) {
                 Ok(output) => {
@@ -296,7 +299,7 @@ fn get_documentation(
         }
 
         if let Some(result) = &example.result {
-            let mut table_call = Call::new(Span::unknown());
+            let mut table_call = Call::new(Span::unknown(), Span::unknown());
             if example.example.ends_with("--collapse") {
                 // collapse the result
                 table_call.add_named((
@@ -306,6 +309,7 @@ fn get_documentation(
                     },
                     None,
                     None,
+                    UNKNOWN_SPAN_ID,
                 ))
             } else {
                 // expand the result
@@ -316,6 +320,7 @@ fn get_documentation(
                     },
                     None,
                     None,
+                    UNKNOWN_SPAN_ID,
                 ))
             }
             let table = engine_state
@@ -368,13 +373,17 @@ fn get_ansi_color_for_component_or_default(
         // Call ansi command using argument
         if let Some(argument) = argument_opt {
             if let Some(decl_id) = engine_state.find_decl(b"ansi", &[]) {
+                let arg_span = argument.span(&engine_state);
                 if let Ok(result) = eval_call::<WithoutDebug>(
                     engine_state,
                     caller_stack,
                     &Call {
                         decl_id,
                         head: span,
-                        arguments: vec![argument],
+                        arguments: Spanned {
+                            item: vec![argument],
+                            span: arg_span,
+                        },
                         parser_info: HashMap::new(),
                     },
                     PipelineData::Empty,
diff --git a/crates/nu-engine/src/eval.rs b/crates/nu-engine/src/eval.rs
index 044bf86980..15bcd61f3e 100644
--- a/crates/nu-engine/src/eval.rs
+++ b/crates/nu-engine/src/eval.rs
@@ -26,7 +26,7 @@ pub fn eval_call<D: DebugContext>(
     }
     let decl = engine_state.get_decl(call.decl_id);
 
-    if !decl.is_known_external() && call.named_iter().any(|(flag, _, _)| flag.item == "help") {
+    if !decl.is_known_external() && call.named_iter().any(|(flag, _, _, _)| flag.item == "help") {
         let help = get_full_help(decl, engine_state, caller_stack);
         Ok(Value::string(help, call.head).into_pipeline_data())
     } else if let Some(block_id) = decl.block_id() {
@@ -100,6 +100,7 @@ pub fn eval_call<D: DebugContext>(
             let mut rest_items = vec![];
 
             for result in call.rest_iter_flattened(
+                &engine_state,
                 decl.signature().required_positional.len()
                     + decl.signature().optional_positional.len(),
                 |expr| eval_expression::<D>(engine_state, caller_stack, expr),
@@ -213,8 +214,16 @@ fn eval_external(
         })?;
 
     let command = engine_state.get_decl(decl_id);
+    let spans: Vec<Span> = args
+        .iter()
+        .map(|arg| match arg {
+            ExternalArgument::Regular(expr) | ExternalArgument::Spread(expr) => {
+                expr.span(&engine_state)
+            }
+        })
+        .collect();
 
-    let mut call = Call::new(head.span(&engine_state));
+    let mut call = Call::new(head.span(&engine_state), Span::concat(&spans));
 
     call.add_positional(head.clone());
 
diff --git a/crates/nu-parser/src/flatten.rs b/crates/nu-parser/src/flatten.rs
index 88638b2475..09b48ccaee 100644
--- a/crates/nu-parser/src/flatten.rs
+++ b/crates/nu-parser/src/flatten.rs
@@ -252,7 +252,7 @@ fn flatten_expression_into(
             }
 
             let arg_start = output.len();
-            for arg in &call.arguments {
+            for arg in &call.arguments.item {
                 match arg {
                     Argument::Positional(positional) | Argument::Unknown(positional) => {
                         flatten_expression_into(working_set, positional, output)
diff --git a/crates/nu-parser/src/known_external.rs b/crates/nu-parser/src/known_external.rs
index 453112aa32..6b3d024d98 100644
--- a/crates/nu-parser/src/known_external.rs
+++ b/crates/nu-parser/src/known_external.rs
@@ -43,7 +43,7 @@ impl Command for KnownExternal {
 
         let command = engine_state.get_decl(decl_id);
 
-        let mut extern_call = Call::new(head_span);
+        let mut extern_call = Call::new(head_span, call.arguments_span());
 
         let extern_name = if let Some(name_bytes) = engine_state.find_decl_name(call.decl_id, &[]) {
             String::from_utf8_lossy(name_bytes)
@@ -78,7 +78,7 @@ impl Command for KnownExternal {
             ));
         }
 
-        for arg in &call.arguments {
+        for arg in &call.arguments.item {
             match arg {
                 Argument::Positional(positional) => extern_call.add_positional(positional.clone()),
                 Argument::Named(named) => {
diff --git a/crates/nu-parser/src/lib.rs b/crates/nu-parser/src/lib.rs
index 89cba8d243..5e3e73987d 100644
--- a/crates/nu-parser/src/lib.rs
+++ b/crates/nu-parser/src/lib.rs
@@ -21,8 +21,9 @@ pub use nu_protocol::parser_path::*;
 pub use parse_keywords::*;
 
 pub use parser::{
-    is_math_expression_like, parse, parse_block, parse_expression, parse_external_call,
-    parse_unit_value, trim_quotes, trim_quotes_str, unescape_unquote_string, DURATION_UNIT_GROUPS,
+    is_math_expression_like, named_arg_span, parse, parse_block, parse_expression,
+    parse_external_call, parse_unit_value, trim_quotes, trim_quotes_str, unescape_unquote_string,
+    DURATION_UNIT_GROUPS,
 };
 
 #[cfg(feature = "plugin")]
diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index 70d217c564..089c0b2fba 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -123,8 +123,8 @@ pub fn parse_keyword(working_set: &mut StateWorkingSet, lite_command: &LiteComma
         // Apply parse keyword side effects
         let cmd = working_set.get_decl(call.decl_id);
         // check help flag first.
-        if call.named_iter().any(|(flag, _, _)| flag.item == "help") {
-            let call_span = call.span();
+        if call.named_iter().any(|(flag, _, _, _)| flag.item == "help") {
+            let call_span = call.span(working_set);
             return Pipeline::from_vec(vec![Expression::new(
                 working_set,
                 Expr::Call(call),
@@ -1056,7 +1056,7 @@ pub fn parse_alias(
                 // First from comments, if any are present
                 false => working_set.build_usage(&lite_command.comments),
                 // Then from the command itself
-                true => match alias_call.arguments.get(1) {
+                true => match alias_call.arguments.item.get(1) {
                     Some(Argument::Positional(Expression {
                         expr: Expr::Keyword(kw),
                         ..
@@ -1258,7 +1258,10 @@ pub fn parse_export_in_module(
     let mut call = Box::new(Call {
         head: spans[0],
         decl_id: export_decl_id,
-        arguments: vec![],
+        arguments: Spanned {
+            item: vec![],
+            span: spans[0].past(),
+        },
         parser_info: HashMap::new(),
     });
 
@@ -2263,13 +2266,21 @@ pub fn parse_module(
         .find_decl(b"module")
         .expect("internal error: missing module command");
 
+    let args_span = Span::concat(&[
+        module_name_or_path_expr.span(working_set),
+        block_expr.span(working_set),
+    ]);
+
     let call = Box::new(Call {
         head: Span::concat(&spans[..split_id]),
         decl_id: module_decl_id,
-        arguments: vec![
-            Argument::Positional(module_name_or_path_expr),
-            Argument::Positional(block_expr),
-        ],
+        arguments: Spanned {
+            item: vec![
+                Argument::Positional(module_name_or_path_expr),
+                Argument::Positional(block_expr),
+            ],
+            span: args_span,
+        },
         parser_info: HashMap::new(),
     });
 
@@ -2701,7 +2712,7 @@ pub fn parse_hide(working_set: &mut StateWorkingSet, lite_command: &LiteCommand)
 }
 
 pub fn parse_overlay_new(working_set: &mut StateWorkingSet, call: Box<Call>) -> Pipeline {
-    let call_span = call.span();
+    let call_span = call.span(working_set);
 
     let (overlay_name, _) = if let Some(expr) = call.positional_nth(0) {
         match eval_constant(working_set, expr) {
@@ -2750,7 +2761,7 @@ pub fn parse_overlay_new(working_set: &mut StateWorkingSet, call: Box<Call>) ->
 }
 
 pub fn parse_overlay_use(working_set: &mut StateWorkingSet, call: Box<Call>) -> Pipeline {
-    let call_span = call.span();
+    let call_span = call.span(working_set);
 
     let (overlay_name, overlay_name_span) = if let Some(expr) = call.positional_nth(0) {
         match eval_constant(working_set, expr) {
@@ -2973,7 +2984,7 @@ pub fn parse_overlay_use(working_set: &mut StateWorkingSet, call: Box<Call>) ->
 }
 
 pub fn parse_overlay_hide(working_set: &mut StateWorkingSet, call: Box<Call>) -> Pipeline {
-    let call_span = call.span();
+    let call_span = call.span(working_set);
 
     let (overlay_name, overlay_name_span) = if let Some(expr) = call.positional_nth(0) {
         match eval_constant(working_set, expr) {
@@ -3113,10 +3124,16 @@ pub fn parse_let(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipeline
                         }
                     }
 
+                    let args_span =
+                        Span::concat(&[lvalue.span(working_set), rvalue.span(working_set)]);
+
                     let call = Box::new(Call {
                         decl_id,
                         head: spans[0],
-                        arguments: vec![Argument::Positional(lvalue), Argument::Positional(rvalue)],
+                        arguments: Spanned {
+                            item: vec![Argument::Positional(lvalue), Argument::Positional(rvalue)],
+                            span: args_span,
+                        },
                         parser_info: HashMap::new(),
                     });
 
@@ -3259,10 +3276,16 @@ pub fn parse_const(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipelin
                         }
                     }
 
+                    let args_span =
+                        Span::concat(&[lvalue.span(working_set), rvalue.span(working_set)]);
+
                     let call = Box::new(Call {
                         decl_id,
                         head: spans[0],
-                        arguments: vec![Argument::Positional(lvalue), Argument::Positional(rvalue)],
+                        arguments: Spanned {
+                            item: vec![Argument::Positional(lvalue), Argument::Positional(rvalue)],
+                            span: args_span,
+                        },
                         parser_info: HashMap::new(),
                     });
 
@@ -3378,10 +3401,16 @@ pub fn parse_mut(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipeline
                         }
                     }
 
+                    let args_span =
+                        Span::concat(&[lvalue.span(working_set), rvalue.span(working_set)]);
+
                     let call = Box::new(Call {
                         decl_id,
                         head: spans[0],
-                        arguments: vec![Argument::Positional(lvalue), Argument::Positional(rvalue)],
+                        arguments: Spanned {
+                            item: vec![Argument::Positional(lvalue), Argument::Positional(rvalue)],
+                            span: args_span,
+                        },
                         parser_info: HashMap::new(),
                     });
 
@@ -3884,8 +3913,8 @@ pub fn parse_plugin_use(working_set: &mut StateWorkingSet, call: Box<Call>) -> P
 
         let plugin_config = call
             .named_iter()
-            .find(|(arg_name, _, _)| arg_name.item == "plugin-config")
-            .map(|(_, _, expr)| {
+            .find(|(arg_name, _, _, _)| arg_name.item == "plugin-config")
+            .map(|(_, _, expr, _)| {
                 let expr = expr
                     .as_ref()
                     .expect("--plugin-config arg should have been checked already");
@@ -3961,7 +3990,7 @@ pub fn parse_plugin_use(working_set: &mut StateWorkingSet, call: Box<Call>) -> P
         working_set.error(err);
     }
 
-    let call_span = call.span();
+    let call_span = call.span(working_set);
 
     Pipeline::from_vec(vec![Expression::new(
         working_set,
@@ -4147,6 +4176,6 @@ fn detect_params_in_name(
 /// Run has_flag_const and push possible error to working_set
 fn has_flag_const(working_set: &mut StateWorkingSet, call: &Call, name: &str) -> Result<bool, ()> {
     call.has_flag_const(working_set, name).map_err(|err| {
-        working_set.error(err.wrap(working_set, call.span()));
+        working_set.error(err.wrap(working_set, call.span(working_set)));
     })
 }
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index c3d18b55ac..d5131d0137 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -160,7 +160,7 @@ pub(crate) fn check_call(
     call: &Call,
 ) {
     // Allow the call to pass if they pass in the help flag
-    if call.named_iter().any(|(n, _, _)| n.item == "help") {
+    if call.named_iter().any(|(n, _, _, _)| n.item == "help") {
         return;
     }
 
@@ -180,7 +180,7 @@ pub(crate) fn check_call(
                 if let Some(last) = call.positional_iter().last() {
                     working_set.error(ParseError::MissingPositional(
                         argument.name.clone(),
-                        Span::new(last.span.end, last.span.end),
+                        Span::new(last.span(working_set).end, last.span(working_set).end),
                         sig.call_signature(),
                     ));
                     return;
@@ -199,7 +199,7 @@ pub(crate) fn check_call(
         if let Some(last) = call.positional_iter().last() {
             working_set.error(ParseError::MissingPositional(
                 missing.name.clone(),
-                Span::new(last.span.end, last.span.end),
+                Span::new(last.span(working_set).end, last.span(working_set).end),
                 sig.call_signature(),
             ))
         } else {
@@ -211,7 +211,10 @@ pub(crate) fn check_call(
         }
     } else {
         for req_flag in sig.named.iter().filter(|x| x.required) {
-            if call.named_iter().all(|(n, _, _)| n.item != req_flag.long) {
+            if call
+                .named_iter()
+                .all(|(n, _, _, _)| n.item != req_flag.long)
+            {
                 working_set.error(ParseError::MissingRequiredFlag(
                     req_flag.long.clone(),
                     command,
@@ -486,18 +489,19 @@ fn ensure_flag_arg_type(
     arg_shape: &SyntaxShape,
     long_name_span: Span,
 ) -> (Spanned<String>, Expression) {
+    let arg_span = arg.span(working_set);
     if !type_compatible(&arg.ty, &arg_shape.to_type()) {
         working_set.error(ParseError::TypeMismatch(
             arg_shape.to_type(),
             arg.ty,
-            arg.span,
+            arg_span,
         ));
         (
             Spanned {
                 item: arg_name,
                 span: long_name_span,
             },
-            Expression::garbage(working_set, arg.span),
+            Expression::garbage(working_set, arg_span),
         )
     } else {
         (
@@ -916,6 +920,25 @@ pub struct ParsedInternalCall {
     pub output: Type,
 }
 
+// moved from call.rs since span creation must be done at parse time now
+pub fn named_arg_span(
+    working_set: &StateWorkingSet,
+    named: &Spanned<String>,
+    short: &Option<Spanned<String>>,
+    expr: &Option<Expression>,
+) -> Span {
+    let start = named.span.start;
+    let end = if let Some(expr) = expr {
+        expr.span(&working_set).end
+    } else if let Some(short) = short {
+        short.span.end
+    } else {
+        named.span.end
+    };
+
+    Span::new(start, end)
+}
+
 pub fn parse_internal_call(
     working_set: &mut StateWorkingSet,
     command_span: Span,
@@ -924,7 +947,7 @@ pub fn parse_internal_call(
 ) -> ParsedInternalCall {
     trace!("parsing: internal call (decl id: {})", decl_id);
 
-    let mut call = Call::new(command_span);
+    let mut call = Call::new(command_span, Span::concat(spans));
     call.decl_id = decl_id;
     call.head = command_span;
     let _ = working_set.add_span(call.head);
@@ -1002,7 +1025,9 @@ pub fn parse_internal_call(
 
                 call.add_unknown(arg);
             } else {
-                call.add_named((long_name, None, arg));
+                let named_span = named_arg_span(working_set, &long_name, &None, &arg);
+                let named_span_id = working_set.add_span(named_span);
+                call.add_named((long_name, None, arg, named_span_id));
             }
 
             spans_idx += 1;
@@ -1053,27 +1078,30 @@ pub fn parse_internal_call(
 
                             if flag.long.is_empty() {
                                 if let Some(short) = flag.short {
-                                    call.add_named((
-                                        Spanned {
-                                            item: String::new(),
-                                            span: spans[spans_idx],
-                                        },
-                                        Some(Spanned {
-                                            item: short.to_string(),
-                                            span: spans[spans_idx],
-                                        }),
-                                        Some(arg),
-                                    ));
+                                    let named = Spanned {
+                                        item: String::new(),
+                                        span: spans[spans_idx],
+                                    };
+                                    let short = Some(Spanned {
+                                        item: short.to_string(),
+                                        span: spans[spans_idx],
+                                    });
+                                    let expr = Some(arg);
+                                    let named_span =
+                                        named_arg_span(working_set, &named, &short, &expr);
+                                    let named_span_id = working_set.add_span(named_span);
+                                    call.add_named((named, short, expr, named_span_id));
                                 }
                             } else {
-                                call.add_named((
-                                    Spanned {
-                                        item: flag.long.clone(),
-                                        span: spans[spans_idx],
-                                    },
-                                    None,
-                                    Some(arg),
-                                ));
+                                let named = Spanned {
+                                    item: flag.long.clone(),
+                                    span: spans[spans_idx],
+                                };
+                                let short = None;
+                                let expr = Some(arg);
+                                let named_span = named_arg_span(working_set, &named, &short, &expr);
+                                let named_span_id = working_set.add_span(named_span);
+                                call.add_named((named, short, expr, named_span_id));
                             }
                             spans_idx += 1;
                         } else {
@@ -1084,27 +1112,29 @@ pub fn parse_internal_call(
                         }
                     } else if flag.long.is_empty() {
                         if let Some(short) = flag.short {
-                            call.add_named((
-                                Spanned {
-                                    item: String::new(),
-                                    span: spans[spans_idx],
-                                },
-                                Some(Spanned {
-                                    item: short.to_string(),
-                                    span: spans[spans_idx],
-                                }),
-                                None,
-                            ));
+                            let named = Spanned {
+                                item: String::new(),
+                                span: spans[spans_idx],
+                            };
+                            let short = Some(Spanned {
+                                item: short.to_string(),
+                                span: spans[spans_idx],
+                            });
+                            let expr = None;
+                            let named_span = named_arg_span(working_set, &named, &short, &expr);
+                            let named_span_id = working_set.add_span(named_span);
+                            call.add_named((named, short, expr, named_span_id));
                         }
                     } else {
-                        call.add_named((
-                            Spanned {
-                                item: flag.long.clone(),
-                                span: spans[spans_idx],
-                            },
-                            None,
-                            None,
-                        ));
+                        let named = Spanned {
+                            item: flag.long.clone(),
+                            span: spans[spans_idx],
+                        };
+                        let short = None;
+                        let expr = None;
+                        let named_span = named_arg_span(working_set, &named, &short, &expr);
+                        let named_span_id = working_set.add_span(named_span);
+                        call.add_named((named, short, expr, named_span_id));
                     }
                 }
             }
@@ -1184,12 +1214,13 @@ pub fn parse_internal_call(
             );
 
             let arg = if !type_compatible(&positional.shape.to_type(), &arg.ty) {
+                let arg_ty = arg.ty.clone();
                 working_set.error(ParseError::TypeMismatch(
                     positional.shape.to_type(),
-                    arg.ty,
-                    arg.span,
+                    arg_ty,
+                    arg.span(working_set),
                 ));
-                Expression::garbage(working_set, arg.span)
+                Expression::garbage(working_set, arg.span(working_set))
             } else {
                 arg
             };
@@ -1311,7 +1342,7 @@ pub fn parse_call(working_set: &mut StateWorkingSet, spans: &[Span], head: Span)
                 trace!("parsing: alias of external call");
 
                 let mut head = head.clone();
-                head.span = spans[0]; // replacing the spans preserves syntax highlighting
+                head.span_id = working_set.add_span(spans[0]); // replacing the spans preserves syntax highlighting
 
                 let mut final_args = args.clone().into_vec();
                 for arg_span in &spans[1..] {
@@ -3006,13 +3037,15 @@ pub fn parse_import_pattern(working_set: &mut StateWorkingSet, spans: &[Span]) -
                     for item in list {
                         match item {
                             ListItem::Item(expr) => {
-                                let contents = working_set.get_span_contents(expr.span);
-                                output.push((trim_quotes(contents).to_vec(), expr.span));
+                                let contents =
+                                    working_set.get_span_contents(expr.span(working_set));
+                                output
+                                    .push((trim_quotes(contents).to_vec(), expr.span(working_set)));
                             }
                             ListItem::Spread(_, spread) => {
                                 working_set.error(ParseError::WrongImportPattern(
                                     "cannot spread in an import pattern".into(),
-                                    spread.span,
+                                    spread.span(working_set),
                                 ))
                             }
                         }
@@ -3022,7 +3055,7 @@ pub fn parse_import_pattern(working_set: &mut StateWorkingSet, spans: &[Span]) -
                         .members
                         .push(ImportPatternMember::List { names: output });
                 } else {
-                    working_set.error(ParseError::ExportNotFound(result.span));
+                    working_set.error(ParseError::ExportNotFound(result.span(working_set)));
                     return Expression::new(
                         working_set,
                         Expr::ImportPattern(Box::new(import_pattern)),
@@ -3779,7 +3812,7 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
                                                             format!(
                                                             "expected default value to be `{var_type}`"
                                                         ),
-                                                            expression.span,
+                                                            expression.span(working_set),
                                                         ),
                                                     )
                                                 }
@@ -3792,7 +3825,7 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
                                             Some(constant)
                                         } else {
                                             working_set.error(ParseError::NonConstantDefaultValue(
-                                                expression.span,
+                                                expression.span(working_set),
                                             ));
                                             None
                                         };
@@ -3806,7 +3839,7 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
                                         working_set.error(ParseError::AssignmentMismatch(
                                             "Rest parameter was given a default value".into(),
                                             "can't have default value".into(),
-                                            expression.span,
+                                            expression.span(working_set),
                                         ))
                                     }
                                     Arg::Flag {
@@ -3819,7 +3852,7 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
                                             },
                                         type_annotated,
                                     } => {
-                                        let expression_span = expression.span;
+                                        let expression_span = expression.span(working_set);
 
                                         *default_value = if let Ok(value) =
                                             eval_constant(working_set, &expression)
@@ -4065,7 +4098,7 @@ fn parse_table_row(
     list.into_iter()
         .map(|item| match item {
             ListItem::Item(expr) => Ok(expr),
-            ListItem::Spread(_, spread) => Err(spread.span),
+            ListItem::Spread(_, spread) => Err(spread.span(working_set)),
         })
         .collect::<Result<_, _>>()
         .map(|exprs| (exprs, span))
@@ -4140,7 +4173,7 @@ fn parse_table_expression(working_set: &mut StateWorkingSet, span: Span) -> Expr
                                     }
                                     Ordering::Greater => {
                                         let span = {
-                                            let start = list[head.len()].span.start;
+                                            let start = list[head.len()].span(working_set).start;
                                             let end = span.end;
                                             Span::new(start, end)
                                         };
@@ -4179,7 +4212,7 @@ fn parse_table_expression(working_set: &mut StateWorkingSet, span: Span) -> Expr
     };
 
     let ty = if working_set.parse_errors.len() == errors {
-        let (ty, errs) = table_type(&head, &rows);
+        let (ty, errs) = table_type(working_set, &head, &rows);
         working_set.parse_errors.extend(errs);
         ty
     } else {
@@ -4194,7 +4227,11 @@ fn parse_table_expression(working_set: &mut StateWorkingSet, span: Span) -> Expr
     Expression::new(working_set, Expr::Table(table), span, ty)
 }
 
-fn table_type(head: &[Expression], rows: &[Vec<Expression>]) -> (Type, Vec<ParseError>) {
+fn table_type(
+    working_set: &StateWorkingSet,
+    head: &[Expression],
+    rows: &[Vec<Expression>],
+) -> (Type, Vec<ParseError>) {
     let mut errors = vec![];
     let mut rows = rows.to_vec();
     let mut mk_ty = || -> Type {
@@ -4224,7 +4261,7 @@ fn table_type(head: &[Expression], rows: &[Vec<Expression>]) -> (Type, Vec<Parse
             if let Some(str) = expr.as_string() {
                 str
             } else {
-                errors.push(mk_error(expr.span));
+                errors.push(mk_error(expr.span(&working_set)));
                 String::from("{ column }")
             }
         })
@@ -5115,7 +5152,7 @@ pub fn parse_math_expression(
                 working_set.error(err);
             }
 
-            let op_span = Span::append(lhs.span, rhs.span);
+            let op_span = Span::append(lhs.span(working_set), rhs.span(working_set));
             expr_stack.push(Expression::new(
                 working_set,
                 Expr::BinaryOp(Box::new(lhs), Box::new(op), Box::new(rhs)),
@@ -5151,7 +5188,7 @@ pub fn parse_math_expression(
             working_set.error(err)
         }
 
-        let binary_op_span = Span::append(lhs.span, rhs.span);
+        let binary_op_span = Span::append(lhs.span(working_set), rhs.span(working_set));
         expr_stack.push(Expression::new(
             working_set,
             Expr::BinaryOp(Box::new(lhs), Box::new(op), Box::new(rhs)),
@@ -5332,7 +5369,10 @@ pub fn parse_expression(working_set: &mut StateWorkingSet, spans: &[Span]) -> Ex
             let expr = Expr::Call(Box::new(Call {
                 head: Span::unknown(),
                 decl_id,
-                arguments,
+                arguments: Spanned {
+                    item: arguments,
+                    span: Span::concat(spans),
+                },
                 parser_info: HashMap::new(),
             }));
 
@@ -6094,7 +6134,7 @@ pub fn discover_captures_in_expr(
                 }
             }
 
-            for arg in &call.arguments {
+            for arg in &call.arguments.item {
                 match arg {
                     Argument::Named(named) => {
                         if let Some(arg) = &named.2 {
@@ -6249,7 +6289,7 @@ pub fn discover_captures_in_expr(
         }
         Expr::Var(var_id) => {
             if (*var_id > ENV_VARIABLE_ID || *var_id == IN_VARIABLE_ID) && !seen.contains(var_id) {
-                output.push((*var_id, expr.span));
+                output.push((*var_id, expr.span(&working_set)));
             }
         }
         Expr::VarDecl(var_id) => {
@@ -6294,7 +6334,7 @@ fn wrap_element_with_collect(
 }
 
 fn wrap_expr_with_collect(working_set: &mut StateWorkingSet, expr: &Expression) -> Expression {
-    let span = expr.span;
+    let span = expr.span(working_set);
 
     if let Some(decl_id) = working_set.find_decl(b"collect") {
         let mut output = vec![];
@@ -6324,14 +6364,15 @@ fn wrap_expr_with_collect(working_set: &mut StateWorkingSet, expr: &Expression)
             Type::Any,
         )));
 
-        output.push(Argument::Named((
-            Spanned {
-                item: "keep-env".to_string(),
-                span: Span::new(0, 0),
-            },
-            None,
-            None,
-        )));
+        let named = Spanned {
+            item: "keep-env".to_string(),
+            span: Span::unknown(),
+        };
+        let short = None;
+        let expr = None;
+        let named_span = named_arg_span(working_set, &named, &short, &expr);
+        let named_span_id = working_set.add_span(named_span);
+        output.push(Argument::Named((named, short, expr, named_span_id)));
 
         // The containing, synthetic call to `collect`.
         // We don't want to have a real span as it will confuse flattening
@@ -6339,8 +6380,11 @@ fn wrap_expr_with_collect(working_set: &mut StateWorkingSet, expr: &Expression)
         Expression::new(
             working_set,
             Expr::Call(Box::new(Call {
-                head: Span::new(0, 0),
-                arguments: output,
+                head: Span::unknown(),
+                arguments: Spanned {
+                    item: output,
+                    span: Span::unknown(),
+                },
                 decl_id,
                 parser_info: HashMap::new(),
             })),
diff --git a/crates/nu-parser/tests/test_parser.rs b/crates/nu-parser/tests/test_parser.rs
index 0784fe69d4..da3cfbf9fd 100644
--- a/crates/nu-parser/tests/test_parser.rs
+++ b/crates/nu-parser/tests/test_parser.rs
@@ -598,9 +598,12 @@ pub fn parse_call_short_flag_batch_arg_allowed() {
 
     if let Expr::Call(call) = &element.expr.expr {
         assert_eq!(call.decl_id, 0);
-        assert_eq!(call.arguments.len(), 2);
-        matches!(call.arguments[0], Argument::Named((_, None, None)));
-        matches!(call.arguments[1], Argument::Named((_, None, Some(_))));
+        assert_eq!(call.arguments.item.len(), 2);
+        matches!(call.arguments.item[0], Argument::Named((_, None, None, _)));
+        matches!(
+            call.arguments.item[1],
+            Argument::Named((_, None, Some(_), _))
+        );
     }
 }
 
@@ -2150,7 +2153,7 @@ mod input_types {
         assert!(pipeline.elements[3].redirection.is_none());
         match &pipeline.elements[3].expr.expr {
             Expr::Call(call) => {
-                let arg = &call.arguments[0];
+                let arg = &call.arguments.item[0];
                 match arg {
                     Argument::Positional(a) => match &a.expr {
                         Expr::FullCellPath(path) => match &path.head.expr {
@@ -2347,3 +2350,92 @@ mod operator {
         );
     }
 }
+
+#[cfg(test)]
+mod test {
+    use nu_parser::named_arg_span;
+    use nu_protocol::ast::{Argument, Call, Expression};
+    use nu_protocol::engine::{EngineState, StateWorkingSet};
+    use nu_protocol::{Span, Spanned};
+
+    #[test]
+    fn argument_span_named() {
+        let engine_state = EngineState::new();
+        let mut working_set = StateWorkingSet::new(&engine_state);
+
+        let named_span = Span::new(2, 3);
+        let short_span = Span::new(5, 7);
+        let expr_span = Span::new(11, 13);
+
+        let _ = working_set.add_span(named_span);
+        let _ = working_set.add_span(short_span);
+        let _ = working_set.add_span(expr_span);
+
+        let named = Spanned {
+            item: "named".to_string(),
+            span: named_span,
+        };
+        let short = Spanned {
+            item: "short".to_string(),
+            span: short_span,
+        };
+        let expr = Expression::garbage(&mut working_set, expr_span);
+
+        let arg_span = named_arg_span(&working_set, &named, &None, &None);
+        assert_eq!(Span::new(2, 3), arg_span);
+
+        let arg_span = named_arg_span(&working_set, &named, &Some(short.clone()), &None);
+        assert_eq!(Span::new(2, 7), arg_span);
+
+        let arg_span = named_arg_span(&working_set, &named, &None, &Some(expr.clone()));
+        assert_eq!(Span::new(2, 13), arg_span);
+
+        let arg_span = named_arg_span(
+            &working_set,
+            &named,
+            &Some(short.clone()),
+            &Some(expr.clone()),
+        );
+        assert_eq!(Span::new(2, 13), arg_span);
+    }
+
+    #[test]
+    fn argument_span_positional() {
+        let engine_state = EngineState::new();
+        let mut working_set = StateWorkingSet::new(&engine_state);
+
+        let span = Span::new(2, 3);
+        let _ = working_set.add_span(span);
+        let expr = Expression::garbage(&mut working_set, span);
+        let arg = Argument::Positional(expr);
+
+        assert_eq!(span, arg.span(&working_set));
+    }
+
+    #[test]
+    fn argument_span_unknown() {
+        let engine_state = EngineState::new();
+        let mut working_set = StateWorkingSet::new(&engine_state);
+
+        let span = Span::new(2, 3);
+        let _ = working_set.add_span(span);
+        let expr = Expression::garbage(&mut working_set, span);
+        let arg = Argument::Unknown(expr);
+
+        assert_eq!(span, arg.span(&working_set));
+    }
+
+    #[test]
+    fn call_arguments_span() {
+        let engine_state = EngineState::new();
+        let mut working_set = StateWorkingSet::new(&engine_state);
+
+        let arg1_span = Span::new(2, 3);
+        let arg2_span = Span::new(5, 7);
+        let mut call = Call::new(Span::new(0, 1), Span::concat(&[arg1_span, arg2_span]));
+        call.add_positional(Expression::garbage(&mut working_set, arg1_span));
+        call.add_positional(Expression::garbage(&mut working_set, arg2_span));
+
+        assert_eq!(Span::new(2, 7), call.arguments_span());
+    }
+}
diff --git a/crates/nu-plugin-protocol/src/evaluated_call.rs b/crates/nu-plugin-protocol/src/evaluated_call.rs
index 19f9049340..1aa0ded2bf 100644
--- a/crates/nu-plugin-protocol/src/evaluated_call.rs
+++ b/crates/nu-plugin-protocol/src/evaluated_call.rs
@@ -34,11 +34,12 @@ impl EvaluatedCall {
         stack: &mut Stack,
         eval_expression_fn: fn(&EngineState, &mut Stack, &Expression) -> Result<Value, ShellError>,
     ) -> Result<Self, ShellError> {
-        let positional =
-            call.rest_iter_flattened(0, |expr| eval_expression_fn(engine_state, stack, expr))?;
+        let positional = call.rest_iter_flattened(&engine_state, 0, |expr| {
+            eval_expression_fn(engine_state, stack, expr)
+        })?;
 
         let mut named = Vec::with_capacity(call.named_len());
-        for (string, _, expr) in call.named_iter() {
+        for (string, _, expr, _) in call.named_iter() {
             let value = match expr {
                 None => None,
                 Some(expr) => Some(eval_expression_fn(engine_state, stack, expr)?),
diff --git a/crates/nu-protocol/src/ast/call.rs b/crates/nu-protocol/src/ast/call.rs
index 6e8cc64a05..bc1c163e4f 100644
--- a/crates/nu-protocol/src/ast/call.rs
+++ b/crates/nu-protocol/src/ast/call.rs
@@ -4,42 +4,47 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     ast::Expression, engine::StateWorkingSet, eval_const::eval_constant, DeclId, FromValue,
-    ShellError, Span, Spanned, Value,
+    GetSpan, ShellError, Span, SpanId, Spanned, Value,
 };
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub enum Argument {
     Positional(Expression),
-    Named((Spanned<String>, Option<Spanned<String>>, Option<Expression>)),
+    Named(
+        (
+            Spanned<String>,
+            Option<Spanned<String>>,
+            Option<Expression>,
+            SpanId,
+        ),
+    ),
     Unknown(Expression), // unknown argument used in "fall-through" signatures
     Spread(Expression),  // a list spread to fill in rest arguments
 }
 
 impl Argument {
-    /// The span for an argument
-    pub fn span(&self) -> Span {
+    pub fn span_id(&self) -> SpanId {
         match self {
-            Argument::Positional(e) => e.span,
-            Argument::Named((named, short, expr)) => {
-                let start = named.span.start;
-                let end = if let Some(expr) = expr {
-                    expr.span.end
-                } else if let Some(short) = short {
-                    short.span.end
-                } else {
-                    named.span.end
-                };
+            Argument::Positional(e) => e.span_id,
+            Argument::Named((_, _, _, span_id)) => *span_id,
+            Argument::Unknown(e) => e.span_id,
+            Argument::Spread(e) => e.span_id,
+        }
+    }
 
-                Span::new(start, end)
-            }
-            Argument::Unknown(e) => e.span,
-            Argument::Spread(e) => e.span,
+    /// The span for an argument
+    pub fn span(&self, state: &impl GetSpan) -> Span {
+        match self {
+            Argument::Positional(e) => e.span(state),
+            Argument::Named((_, _, _, span_id)) => state.get_span(*span_id),
+            Argument::Unknown(e) => e.span(state),
+            Argument::Spread(e) => e.span(state),
         }
     }
 
     pub fn expr(&self) -> Option<&Expression> {
         match self {
-            Argument::Named((_, _, expr)) => expr.as_ref(),
+            Argument::Named((_, _, expr, _)) => expr.as_ref(),
             Argument::Positional(expr) | Argument::Unknown(expr) | Argument::Spread(expr) => {
                 Some(expr)
             }
@@ -58,17 +63,20 @@ pub struct Call {
     /// identifier of the declaration to call
     pub decl_id: DeclId,
     pub head: Span,
-    pub arguments: Vec<Argument>,
+    pub arguments: Spanned<Vec<Argument>>,
     /// this field is used by the parser to pass additional command-specific information
     pub parser_info: HashMap<String, Expression>,
 }
 
 impl Call {
-    pub fn new(head: Span) -> Call {
+    pub fn new(head: Span, args_span: Span) -> Call {
         Self {
             decl_id: 0,
             head,
-            arguments: vec![],
+            arguments: Spanned {
+                item: vec![],
+                span: args_span,
+            },
             parser_info: HashMap::new(),
         }
     }
@@ -80,23 +88,20 @@ impl Call {
     /// If there are one or more arguments the span encompasses the start of the first argument to
     /// end of the last argument
     pub fn arguments_span(&self) -> Span {
-        let past = self.head.past();
-
-        let start = self
-            .arguments
-            .first()
-            .map(|a| a.span())
-            .unwrap_or(past)
-            .start;
-        let end = self.arguments.last().map(|a| a.span()).unwrap_or(past).end;
-
-        Span::new(start, end)
+        self.arguments.span
     }
 
     pub fn named_iter(
         &self,
-    ) -> impl Iterator<Item = &(Spanned<String>, Option<Spanned<String>>, Option<Expression>)> {
-        self.arguments.iter().filter_map(|arg| match arg {
+    ) -> impl Iterator<
+        Item = &(
+            Spanned<String>,
+            Option<Spanned<String>>,
+            Option<Expression>,
+            SpanId,
+        ),
+    > {
+        self.arguments.item.iter().filter_map(|arg| match arg {
             Argument::Named(named) => Some(named),
             Argument::Positional(_) => None,
             Argument::Unknown(_) => None,
@@ -106,9 +111,15 @@ impl Call {
 
     pub fn named_iter_mut(
         &mut self,
-    ) -> impl Iterator<Item = &mut (Spanned<String>, Option<Spanned<String>>, Option<Expression>)>
-    {
-        self.arguments.iter_mut().filter_map(|arg| match arg {
+    ) -> impl Iterator<
+        Item = &mut (
+            Spanned<String>,
+            Option<Spanned<String>>,
+            Option<Expression>,
+            SpanId,
+        ),
+    > {
+        self.arguments.item.iter_mut().filter_map(|arg| match arg {
             Argument::Named(named) => Some(named),
             Argument::Positional(_) => None,
             Argument::Unknown(_) => None,
@@ -122,25 +133,31 @@ impl Call {
 
     pub fn add_named(
         &mut self,
-        named: (Spanned<String>, Option<Spanned<String>>, Option<Expression>),
+        named: (
+            Spanned<String>,
+            Option<Spanned<String>>,
+            Option<Expression>,
+            SpanId,
+        ),
     ) {
-        self.arguments.push(Argument::Named(named));
+        self.arguments.item.push(Argument::Named(named));
     }
 
     pub fn add_positional(&mut self, positional: Expression) {
-        self.arguments.push(Argument::Positional(positional));
+        self.arguments.item.push(Argument::Positional(positional));
     }
 
     pub fn add_unknown(&mut self, unknown: Expression) {
-        self.arguments.push(Argument::Unknown(unknown));
+        self.arguments.item.push(Argument::Unknown(unknown));
     }
 
     pub fn add_spread(&mut self, args: Expression) {
-        self.arguments.push(Argument::Spread(args));
+        self.arguments.item.push(Argument::Spread(args));
     }
 
     pub fn positional_iter(&self) -> impl Iterator<Item = &Expression> {
         self.arguments
+            .item
             .iter()
             .take_while(|arg| match arg {
                 Argument::Spread(_) => false, // Don't include positional arguments given to rest parameter
@@ -168,6 +185,7 @@ impl Call {
         // todo maybe rewrite to be more elegant or something
         let args = self
             .arguments
+            .item
             .iter()
             .filter_map(|arg| match arg {
                 Argument::Named(_) => None,
@@ -258,9 +276,9 @@ impl Call {
     ) -> Result<Vec<T>, ShellError> {
         let mut output = vec![];
 
-        for result in
-            self.rest_iter_flattened(starting_pos, |expr| eval_constant(working_set, expr))?
-        {
+        for result in self.rest_iter_flattened(&working_set, starting_pos, |expr| {
+            eval_constant(working_set, expr)
+        })? {
             output.push(FromValue::from_value(result)?);
         }
 
@@ -269,6 +287,7 @@ impl Call {
 
     pub fn rest_iter_flattened<F>(
         &self,
+        state: &impl GetSpan,
         start: usize,
         mut eval: F,
     ) -> Result<Vec<Value>, ShellError>
@@ -282,7 +301,11 @@ impl Call {
             if spread {
                 match result {
                     Value::List { mut vals, .. } => output.append(&mut vals),
-                    _ => return Err(ShellError::CannotSpreadAsList { span: expr.span }),
+                    _ => {
+                        return Err(ShellError::CannotSpreadAsList {
+                            span: expr.span(state),
+                        })
+                    }
                 }
             } else {
                 output.push(result);
@@ -310,23 +333,23 @@ impl Call {
         }
     }
 
-    pub fn span(&self) -> Span {
+    pub fn span(&self, state: &impl GetSpan) -> Span {
         let mut span = self.head;
 
         for positional in self.positional_iter() {
-            if positional.span.end > span.end {
-                span.end = positional.span.end;
+            if positional.span(state).end > span.end {
+                span.end = positional.span(state).end;
             }
         }
 
-        for (named, _, val) in self.named_iter() {
+        for (named, _, val, _) in self.named_iter() {
             if named.span.end > span.end {
                 span.end = named.span.end;
             }
 
             if let Some(val) = &val {
-                if val.span.end > span.end {
-                    span.end = val.span.end;
+                if val.span(state).end > span.end {
+                    span.end = val.span(state).end;
                 }
             }
         }
@@ -334,77 +357,3 @@ impl Call {
         span
     }
 }
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use crate::engine::EngineState;
-
-    #[test]
-    fn argument_span_named() {
-        let engine_state = EngineState::new();
-        let mut working_set = StateWorkingSet::new(&engine_state);
-
-        let named = Spanned {
-            item: "named".to_string(),
-            span: Span::new(2, 3),
-        };
-        let short = Spanned {
-            item: "short".to_string(),
-            span: Span::new(5, 7),
-        };
-        let expr = Expression::garbage(&mut working_set, Span::new(11, 13));
-
-        let arg = Argument::Named((named.clone(), None, None));
-
-        assert_eq!(Span::new(2, 3), arg.span());
-
-        let arg = Argument::Named((named.clone(), Some(short.clone()), None));
-
-        assert_eq!(Span::new(2, 7), arg.span());
-
-        let arg = Argument::Named((named.clone(), None, Some(expr.clone())));
-
-        assert_eq!(Span::new(2, 13), arg.span());
-
-        let arg = Argument::Named((named.clone(), Some(short.clone()), Some(expr.clone())));
-
-        assert_eq!(Span::new(2, 13), arg.span());
-    }
-
-    #[test]
-    fn argument_span_positional() {
-        let engine_state = EngineState::new();
-        let mut working_set = StateWorkingSet::new(&engine_state);
-
-        let span = Span::new(2, 3);
-        let expr = Expression::garbage(&mut working_set, span);
-        let arg = Argument::Positional(expr);
-
-        assert_eq!(span, arg.span());
-    }
-
-    #[test]
-    fn argument_span_unknown() {
-        let engine_state = EngineState::new();
-        let mut working_set = StateWorkingSet::new(&engine_state);
-
-        let span = Span::new(2, 3);
-        let expr = Expression::garbage(&mut working_set, span);
-        let arg = Argument::Unknown(expr);
-
-        assert_eq!(span, arg.span());
-    }
-
-    #[test]
-    fn call_arguments_span() {
-        let engine_state = EngineState::new();
-        let mut working_set = StateWorkingSet::new(&engine_state);
-
-        let mut call = Call::new(Span::new(0, 1));
-        call.add_positional(Expression::garbage(&mut working_set, Span::new(2, 3)));
-        call.add_positional(Expression::garbage(&mut working_set, Span::new(5, 7)));
-
-        assert_eq!(Span::new(2, 7), call.arguments_span());
-    }
-}
diff --git a/crates/nu-protocol/src/ast/expression.rs b/crates/nu-protocol/src/ast/expression.rs
index 040e140cab..e03f7e81e9 100644
--- a/crates/nu-protocol/src/ast/expression.rs
+++ b/crates/nu-protocol/src/ast/expression.rs
@@ -173,7 +173,7 @@ impl Expression {
             Expr::Binary(_) => false,
             Expr::Bool(_) => false,
             Expr::Call(call) => {
-                for arg in &call.arguments {
+                for arg in &call.arguments.item {
                     match arg {
                         Argument::Positional(expr)
                         | Argument::Unknown(expr)
@@ -366,7 +366,7 @@ impl Expression {
                 if replaced.contains_span(call.head) {
                     call.head = new_span;
                 }
-                for arg in call.arguments.iter_mut() {
+                for arg in call.arguments.item.iter_mut() {
                     match arg {
                         Argument::Positional(expr)
                         | Argument::Unknown(expr)
diff --git a/crates/nu-protocol/src/engine/state_working_set.rs b/crates/nu-protocol/src/engine/state_working_set.rs
index af950b8321..61fd5982a2 100644
--- a/crates/nu-protocol/src/engine/state_working_set.rs
+++ b/crates/nu-protocol/src/engine/state_working_set.rs
@@ -1023,16 +1023,32 @@ impl<'a> StateWorkingSet<'a> {
 
 impl<'a> GetSpan for &'a StateWorkingSet<'a> {
     fn get_span(&self, span_id: SpanId) -> Span {
-        let num_permanent_spans = self.permanent_state.num_spans();
-        if span_id.0 < num_permanent_spans {
-            self.permanent_state.get_span(span_id)
-        } else {
-            *self
-                .delta
-                .spans
-                .get(span_id.0 - num_permanent_spans)
-                .expect("internal error: missing span")
-        }
+        get_span(self, span_id)
+    }
+}
+
+impl<'a> GetSpan for &'a mut StateWorkingSet<'a> {
+    fn get_span(&self, span_id: SpanId) -> Span {
+        get_span(self, span_id)
+    }
+}
+
+impl<'a> GetSpan for StateWorkingSet<'a> {
+    fn get_span(&self, span_id: SpanId) -> Span {
+        get_span(self, span_id)
+    }
+}
+
+fn get_span(working_set: &StateWorkingSet, span_id: SpanId) -> Span {
+    let num_permanent_spans = working_set.permanent_state.num_spans();
+    if span_id.0 < num_permanent_spans {
+        working_set.permanent_state.get_span(span_id)
+    } else {
+        *working_set
+            .delta
+            .spans
+            .get(span_id.0 - num_permanent_spans)
+            .expect("internal error: missing span")
     }
 }
 
diff --git a/crates/nu-protocol/src/eval_const.rs b/crates/nu-protocol/src/eval_const.rs
index 87913e4ee3..0b0859c23b 100644
--- a/crates/nu-protocol/src/eval_const.rs
+++ b/crates/nu-protocol/src/eval_const.rs
@@ -301,7 +301,7 @@ fn eval_const_call(
         return Err(ShellError::NotAConstCommand { span: call.head });
     }
 
-    if !decl.is_known_external() && call.named_iter().any(|(flag, _, _)| flag.item == "help") {
+    if !decl.is_known_external() && call.named_iter().any(|(flag, _, _, _)| flag.item == "help") {
         // It would require re-implementing get_full_help() for const evaluation. Assuming that
         // getting help messages at parse-time is rare enough, we can simply disallow it.
         return Err(ShellError::NotAConstHelp { span: call.head });
diff --git a/crates/nu-protocol/src/pipeline/pipeline_data.rs b/crates/nu-protocol/src/pipeline/pipeline_data.rs
index 03fbc64d21..7d971fb518 100644
--- a/crates/nu-protocol/src/pipeline/pipeline_data.rs
+++ b/crates/nu-protocol/src/pipeline/pipeline_data.rs
@@ -567,7 +567,7 @@ impl PipelineData {
                     if command.block_id().is_some() {
                         self.write_all_and_flush(engine_state, no_newline, to_stderr)
                     } else {
-                        let call = Call::new(Span::new(0, 0));
+                        let call = Call::new(Span::unknown(), Span::unknown());
                         let table = command.run(engine_state, stack, &call, self)?;
                         table.write_all_and_flush(engine_state, no_newline, to_stderr)
                     }

From 8316a1597e12651d86ab85313269dd4fad595fd5 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Wed, 3 Jul 2024 04:44:26 -0700
Subject: [PATCH 0171/1072] Polars: Check to see if the cache is empty before
 enabling GC. More logging (#13286)

There was a bug where anytime the plugin cache remove was called, the
plugin gc was turned back on. This probably happened when I added the
reference counter logic.
---
 crates/nu_plugin_polars/src/cache/list.rs     | 16 +++-
 crates/nu_plugin_polars/src/cache/mod.rs      | 90 ++++++++++++++++++-
 .../src/dataframe/values/mod.rs               |  8 ++
 crates/nu_plugin_polars/src/lib.rs            |  3 +
 4 files changed, 112 insertions(+), 5 deletions(-)

diff --git a/crates/nu_plugin_polars/src/cache/list.rs b/crates/nu_plugin_polars/src/cache/list.rs
index da434901e4..88fc1769ba 100644
--- a/crates/nu_plugin_polars/src/cache/list.rs
+++ b/crates/nu_plugin_polars/src/cache/list.rs
@@ -16,7 +16,7 @@ impl PluginCommand for ListDF {
     }
 
     fn usage(&self) -> &str {
-        "Lists stored dataframes."
+        "Lists stored polars objects."
     }
 
     fn signature(&self) -> Signature {
@@ -119,6 +119,20 @@ impl PluginCommand for ListDF {
                     },
                     call.head,
                 ))),
+                PolarsPluginObject::NuPolarsTestData(_, _) => Ok(Some(Value::record(
+                    record! {
+                        "key" => Value::string(key.to_string(), call.head),
+                        "columns" => Value::nothing(call.head),
+                        "rows" => Value::nothing(call.head),
+                        "type" => Value::string("When", call.head),
+                        "estimated_size" => Value::nothing(call.head),
+                        "span_contents" =>  Value::string(span_contents.to_string(), call.head),
+                        "span_start" => Value::int(call.head.start as i64, call.head),
+                        "span_end" => Value::int(call.head.end as i64, call.head),
+                        "reference_count" => Value::int(value.reference_count as i64, call.head),
+                    },
+                    call.head,
+                )))
             }
         })?;
         let vals = vals.into_iter().flatten().collect();
diff --git a/crates/nu_plugin_polars/src/cache/mod.rs b/crates/nu_plugin_polars/src/cache/mod.rs
index a7e566d327..0fbf49f46f 100644
--- a/crates/nu_plugin_polars/src/cache/mod.rs
+++ b/crates/nu_plugin_polars/src/cache/mod.rs
@@ -69,10 +69,12 @@ impl Cache {
             None
         };
 
-        // Once there are no more entries in the cache
-        // we can turn plugin gc back on
-        debug!("PolarsPlugin: Cache is empty enabling GC");
-        engine.set_gc_disabled(false).map_err(LabeledError::from)?;
+        if lock.is_empty() {
+            // Once there are no more entries in the cache
+            // we can turn plugin gc back on
+            debug!("PolarsPlugin: Cache is empty enabling GC");
+            engine.set_gc_disabled(false).map_err(LabeledError::from)?;
+        }
         drop(lock);
         Ok(removed)
     }
@@ -170,3 +172,83 @@ pub(crate) fn cache_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugi
         Box::new(get::CacheGet),
     ]
 }
+
+#[cfg(test)]
+mod test {
+    use std::{cell::RefCell, rc::Rc};
+
+    use super::*;
+
+    struct MockEngineWrapper {
+        gc_enabled: Rc<RefCell<bool>>,
+    }
+
+    impl MockEngineWrapper {
+        fn new(gc_enabled: bool) -> Self {
+            Self {
+                gc_enabled: Rc::new(RefCell::new(gc_enabled)),
+            }
+        }
+
+        fn gc_enabled(&self) -> bool {
+            *self.gc_enabled.borrow()
+        }
+    }
+
+    impl EngineWrapper for &MockEngineWrapper {
+        fn get_env_var(&self, _key: &str) -> Option<String> {
+            todo!()
+        }
+
+        fn use_color(&self) -> bool {
+            todo!()
+        }
+
+        fn set_gc_disabled(&self, disabled: bool) -> Result<(), ShellError> {
+            let _ = self.gc_enabled.replace(!disabled);
+            Ok(())
+        }
+    }
+
+    #[test]
+    pub fn test_remove_plugin_cache_enable() {
+        let mock_engine = MockEngineWrapper::new(false);
+
+        let cache = Cache::default();
+        let mut lock = cache.cache.lock().expect("should be able to acquire lock");
+        let key0 = Uuid::new_v4();
+        lock.insert(
+            key0,
+            CacheValue {
+                uuid: Uuid::new_v4(),
+                value: PolarsPluginObject::NuPolarsTestData(Uuid::new_v4(), "object_0".into()),
+                created: Local::now().into(),
+                span: Span::unknown(),
+                reference_count: 1,
+            },
+        );
+
+        let key1 = Uuid::new_v4();
+        lock.insert(
+            key1,
+            CacheValue {
+                uuid: Uuid::new_v4(),
+                value: PolarsPluginObject::NuPolarsTestData(Uuid::new_v4(), "object_1".into()),
+                created: Local::now().into(),
+                span: Span::unknown(),
+                reference_count: 1,
+            },
+        );
+        drop(lock);
+
+        let _ = cache
+            .remove(&mock_engine, &key0, false)
+            .expect("should be able to remove key0");
+        assert!(!mock_engine.gc_enabled());
+
+        let _ = cache
+            .remove(&mock_engine, &key1, false)
+            .expect("should be able to remove key1");
+        assert!(mock_engine.gc_enabled());
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/values/mod.rs b/crates/nu_plugin_polars/src/dataframe/values/mod.rs
index d52ee25203..ec59304eab 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/mod.rs
@@ -27,6 +27,7 @@ pub enum PolarsPluginType {
     NuExpression,
     NuLazyGroupBy,
     NuWhen,
+    NuPolarsTestData,
 }
 
 impl fmt::Display for PolarsPluginType {
@@ -37,6 +38,7 @@ impl fmt::Display for PolarsPluginType {
             Self::NuExpression => write!(f, "NuExpression"),
             Self::NuLazyGroupBy => write!(f, "NuLazyGroupBy"),
             Self::NuWhen => write!(f, "NuWhen"),
+            Self::NuPolarsTestData => write!(f, "NuPolarsTestData"),
         }
     }
 }
@@ -48,6 +50,7 @@ pub enum PolarsPluginObject {
     NuExpression(NuExpression),
     NuLazyGroupBy(NuLazyGroupBy),
     NuWhen(NuWhen),
+    NuPolarsTestData(Uuid, String),
 }
 
 impl PolarsPluginObject {
@@ -95,6 +98,7 @@ impl PolarsPluginObject {
             Self::NuExpression(_) => PolarsPluginType::NuExpression,
             Self::NuLazyGroupBy(_) => PolarsPluginType::NuLazyGroupBy,
             Self::NuWhen(_) => PolarsPluginType::NuWhen,
+            Self::NuPolarsTestData(_, _) => PolarsPluginType::NuPolarsTestData,
         }
     }
 
@@ -105,6 +109,7 @@ impl PolarsPluginObject {
             PolarsPluginObject::NuExpression(e) => e.id,
             PolarsPluginObject::NuLazyGroupBy(lg) => lg.id,
             PolarsPluginObject::NuWhen(w) => w.id,
+            PolarsPluginObject::NuPolarsTestData(id, _) => *id,
         }
     }
 
@@ -115,6 +120,9 @@ impl PolarsPluginObject {
             PolarsPluginObject::NuExpression(e) => e.into_value(span),
             PolarsPluginObject::NuLazyGroupBy(lg) => lg.into_value(span),
             PolarsPluginObject::NuWhen(w) => w.into_value(span),
+            PolarsPluginObject::NuPolarsTestData(id, s) => {
+                Value::string(format!("{id}:{s}"), Span::test_data())
+            }
         }
     }
 }
diff --git a/crates/nu_plugin_polars/src/lib.rs b/crates/nu_plugin_polars/src/lib.rs
index b5868e13d6..e4d627e4db 100644
--- a/crates/nu_plugin_polars/src/lib.rs
+++ b/crates/nu_plugin_polars/src/lib.rs
@@ -3,6 +3,7 @@ use std::cmp::Ordering;
 use cache::cache_commands;
 pub use cache::{Cache, Cacheable};
 use dataframe::{stub::PolarsCmd, values::CustomValueType};
+use log::debug;
 use nu_plugin::{EngineInterface, Plugin, PluginCommand};
 
 mod cache;
@@ -41,6 +42,7 @@ impl EngineWrapper for &EngineInterface {
     }
 
     fn set_gc_disabled(&self, disabled: bool) -> Result<(), ShellError> {
+        debug!("set_gc_disabled called with {disabled}");
         EngineInterface::set_gc_disabled(self, disabled)
     }
 }
@@ -72,6 +74,7 @@ impl Plugin for PolarsPlugin {
         engine: &EngineInterface,
         custom_value: Box<dyn CustomValue>,
     ) -> Result<(), LabeledError> {
+        debug!("custom_value_dropped called {:?}", custom_value);
         if !self.disable_cache_drop {
             let id = CustomValueType::try_from_custom_value(custom_value)?.id();
             let _ = self.cache.remove(engine, &id, false);

From 9e738193f3355c04b4c0b2e8340fe273e73572e4 Mon Sep 17 00:00:00 2001
From: Yash Thakur <45539777+ysthakur@users.noreply.github.com>
Date: Wed, 3 Jul 2024 07:48:06 -0400
Subject: [PATCH 0172/1072] Force completers to sort in fetch() (#13242)

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

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

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

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

This PR fixes the problem pointed out in
https://github.com/nushell/nushell/issues/13204, where the Fish-like
completions aren't sorted properly (this PR doesn't close that issue
because the author there wants more than just fixed sort order).

The cause is all of the file/directory completions being fetched first
and then sorted all together while being treated as strings. Instead,
this PR sorts completions within each individual directory, avoiding
treating `/` as part of the path.

To do this, I removed the `sort` method from the completer trait (as
well as `get_sort_by`) and made all completers sort within the `fetch`
method itself. A generic `sort_completions` helper has been added to
sort lists of completions, and a more specific `sort_suggestions` helper
has been added to sort `Vec<Suggestion>`s.

As for the actual change that fixes the sort order for file/directory
completions, the `complete_rec` helper now sorts the children of each
directory before visiting their children. The file and directory
completers don't bother sorting at the end (except to move hidden files
down).

To reviewers: don't let the 29 changed files scare you, most of those
are just the test fixtures :)

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

This is the current behavior with prefix matching:

![image](https://github.com/nushell/nushell/assets/45539777/6a36e003-8405-45b5-8cbe-d771e0592709)

And with fuzzy matching:

![image](https://github.com/nushell/nushell/assets/45539777/f2cbfdb2-b8fd-491b-a378-779147291d2a)

Notice how `partial/hello.txt` is the last suggestion, even though it
should come before `partial-a`. This is because the ASCII code for `/`
is greater than that of `-`, so `partial-` is put before `partial/`.

This is this PR's behavior with prefix matching (`partial/hello.txt` is
at the start):

![image](https://github.com/nushell/nushell/assets/45539777/3fcea7c9-e017-428f-aa9c-1707e3ab32e0)

And with fuzzy matching:

![image](https://github.com/nushell/nushell/assets/45539777/d55635d4-cdb8-440a-84d6-41111499f9f8)

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

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

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

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

- Modified the partial completions test fixture to test whether this PR
even fixed anything
- Modified fixture to test sort order of .nu completions (a previous
version of my changes didn't sort all the completions at the end but
there were no tests catching that)
- Added a test for making sure subcommand completions are sorted by
Levenshtein distance (a previous version of my changes sorted in
alphabetical order but there were no tests catching that)

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-cli/src/completions/base.rs         |  33 +---
 .../src/completions/command_completions.rs    |  20 ++-
 crates/nu-cli/src/completions/completer.rs    |  10 +-
 .../src/completions/completion_common.rs      |  75 +++++++--
 .../src/completions/custom_completions.rs     |  11 +-
 .../src/completions/directory_completions.rs  |  40 +----
 .../src/completions/dotnu_completions.rs      |  10 +-
 .../src/completions/file_completions.rs       |  40 +----
 .../src/completions/flag_completions.rs       |   6 +-
 .../src/completions/variable_completions.rs   |  11 +-
 crates/nu-cli/tests/completions/mod.rs        | 146 ++++++++++++------
 .../support/completions_helpers.rs            |  56 ++++++-
 .../dir_module/mod.nu}                        |   0
 .../have_ext.exe => dotnu_completions/foo.nu} |   0
 .../lib-dir1/bar.nu}                          |   0
 .../lib-dir1/baz.nu}                          |   0
 .../lib-dir1/xyzzy.nu}                        |   0
 .../lib-dir2/asdf.nu}                         |   0
 .../lib-dir2/bat.nu}                          |   0
 .../lib-dir3/spam.nu}                         |   0
 .../partial_completions/partial-a/anotherfile |   0
 .../partial-a/have_ext.exe                    |   0
 .../partial-a/have_ext.txt                    |   0
 .../partial_completions/partial-a/hello       |   0
 .../partial_completions/partial-a/hola        |   0
 .../partial_completions/partial-b/hello_b     |   0
 .../partial_completions/partial-b/hi_b        |   0
 .../partial_completions/partial-c/hello_c     |   0
 .../partial_completions/partial/hello.txt     |   0
 29 files changed, 259 insertions(+), 199 deletions(-)
 rename tests/fixtures/{partial_completions/partial_a/anotherfile => dotnu_completions/dir_module/mod.nu} (100%)
 rename tests/fixtures/{partial_completions/partial_a/have_ext.exe => dotnu_completions/foo.nu} (100%)
 rename tests/fixtures/{partial_completions/partial_a/have_ext.txt => dotnu_completions/lib-dir1/bar.nu} (100%)
 rename tests/fixtures/{partial_completions/partial_a/hello => dotnu_completions/lib-dir1/baz.nu} (100%)
 rename tests/fixtures/{partial_completions/partial_a/hola => dotnu_completions/lib-dir1/xyzzy.nu} (100%)
 rename tests/fixtures/{partial_completions/partial_b/hello_b => dotnu_completions/lib-dir2/asdf.nu} (100%)
 rename tests/fixtures/{partial_completions/partial_b/hi_b => dotnu_completions/lib-dir2/bat.nu} (100%)
 rename tests/fixtures/{partial_completions/partial_c/hello_c => dotnu_completions/lib-dir3/spam.nu} (100%)
 create mode 100644 tests/fixtures/partial_completions/partial-a/anotherfile
 create mode 100644 tests/fixtures/partial_completions/partial-a/have_ext.exe
 create mode 100644 tests/fixtures/partial_completions/partial-a/have_ext.txt
 create mode 100644 tests/fixtures/partial_completions/partial-a/hello
 create mode 100644 tests/fixtures/partial_completions/partial-a/hola
 create mode 100644 tests/fixtures/partial_completions/partial-b/hello_b
 create mode 100644 tests/fixtures/partial_completions/partial-b/hi_b
 create mode 100644 tests/fixtures/partial_completions/partial-c/hello_c
 create mode 100644 tests/fixtures/partial_completions/partial/hello.txt

diff --git a/crates/nu-cli/src/completions/base.rs b/crates/nu-cli/src/completions/base.rs
index 0debabe688..cf13dae68c 100644
--- 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)]
diff --git a/crates/nu-cli/src/completions/command_completions.rs b/crates/nu-cli/src/completions/command_completions.rs
index 2549854540..e37f8b2576 100644
--- a/crates/nu-cli/src/completions/command_completions.rs
+++ b/crates/nu-cli/src/completions/command_completions.rs
@@ -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)>,
@@ -161,7 +161,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 +198,11 @@ impl Completer for CommandCompletion {
         };
 
         if !subcommands.is_empty() {
-            return subcommands;
+            return sort_suggestions(
+                &String::from_utf8_lossy(&prefix),
+                subcommands,
+                SortBy::LevenshteinDistance,
+            );
         }
 
         let config = working_set.get_config();
@@ -223,11 +227,11 @@ impl Completer for CommandCompletion {
             vec![]
         };
 
-        subcommands.into_iter().chain(commands).collect::<Vec<_>>()
-    }
-
-    fn get_sort_by(&self) -> SortBy {
-        SortBy::LevenshteinDistance
+        sort_suggestions(
+            &String::from_utf8_lossy(&prefix),
+            commands,
+            SortBy::LevenshteinDistance,
+        )
     }
 }
 
diff --git a/crates/nu-cli/src/completions/completer.rs b/crates/nu-cli/src/completions/completer.rs
index 007a0e288a..78398b4d19 100644
--- a/crates/nu-cli/src/completions/completer.rs
+++ b/crates/nu-cli/src/completions/completer.rs
@@ -51,8 +51,7 @@ impl NuCompleter {
             ..Default::default()
         };
 
-        // Fetch
-        let mut suggestions = completer.fetch(
+        completer.fetch(
             working_set,
             &self.stack,
             prefix.clone(),
@@ -60,12 +59,7 @@ impl NuCompleter {
             offset,
             pos,
             &options,
-        );
-
-        // Sort
-        suggestions = completer.sort(suggestions, prefix);
-
-        suggestions
+        )
     }
 
     fn external_completion(
diff --git a/crates/nu-cli/src/completions/completion_common.rs b/crates/nu-cli/src/completions/completion_common.rs
index 26d48a8675..b3bca778a9 100644
--- a/crates/nu-cli/src/completions/completion_common.rs
+++ b/crates/nu-cli/src/completions/completion_common.rs
@@ -1,16 +1,21 @@
-use crate::completions::{matches, CompletionOptions};
+use crate::{
+    completions::{matches, CompletionOptions},
+    SemanticSuggestion,
+};
 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,
+    levenshtein_distance, Span,
 };
 use nu_utils::get_ls_colors;
 use std::path::{
     is_separator, Component, Path, PathBuf, MAIN_SEPARATOR as SEP, MAIN_SEPARATOR_STR,
 };
 
+use super::SortBy;
+
 #[derive(Clone, Default)]
 pub struct PathBuiltFromString {
     parts: Vec<String>,
@@ -45,6 +50,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();
@@ -53,20 +59,26 @@ fn complete_rec(
         built.isdir = entry_isdir;
 
         if !dir || entry_isdir {
-            match partial.split_first() {
-                Some((base, rest)) => {
-                    if matches(base, &entry_name, options) {
-                        if !rest.is_empty() || isdir {
-                            completions
-                                .extend(complete_rec(rest, &built, cwd, options, dir, isdir));
-                        } else {
-                            completions.push(built);
-                        }
+            entries.push((entry_name, built));
+        }
+    }
+
+    let prefix = partial.first().unwrap_or(&"");
+    let sorted_entries = sort_completions(prefix, entries, SortBy::Ascending, |(entry, _)| entry);
+
+    for (entry_name, built) in sorted_entries {
+        match partial.split_first() {
+            Some((base, rest)) => {
+                if matches(base, &entry_name, options) {
+                    if !rest.is_empty() || isdir {
+                        completions.extend(complete_rec(rest, &built, cwd, options, dir, isdir));
+                    } else {
+                        completions.push(built);
                     }
                 }
-                None => {
-                    completions.push(built);
-                }
+            }
+            None => {
+                completions.push(built);
             }
         }
     }
@@ -256,3 +268,38 @@ pub fn adjust_if_intermediate(
         readjusted,
     }
 }
+
+/// Convenience function to sort suggestions using [`sort_completions`]
+pub fn sort_suggestions(
+    prefix: &str,
+    items: Vec<SemanticSuggestion>,
+    sort_by: SortBy,
+) -> Vec<SemanticSuggestion> {
+    sort_completions(prefix, items, sort_by, |it| &it.suggestion.value)
+}
+
+/// # Arguments
+/// * `prefix` - What the user's typed, for sorting by Levenshtein distance
+pub fn sort_completions<T>(
+    prefix: &str,
+    mut items: Vec<T>,
+    sort_by: SortBy,
+    get_value: fn(&T) -> &str,
+) -> Vec<T> {
+    // Sort items
+    match sort_by {
+        SortBy::LevenshteinDistance => {
+            items.sort_by(|a, b| {
+                let a_distance = levenshtein_distance(prefix, get_value(a));
+                let b_distance = levenshtein_distance(prefix, get_value(b));
+                a_distance.cmp(&b_distance)
+            });
+        }
+        SortBy::Ascending => {
+            items.sort_by(|a, b| get_value(a).cmp(get_value(b)));
+        }
+        SortBy::None => {}
+    };
+
+    items
+}
diff --git a/crates/nu-cli/src/completions/custom_completions.rs b/crates/nu-cli/src/completions/custom_completions.rs
index 5d45bb708e..5cab0a8fa2 100644
--- a/crates/nu-cli/src/completions/custom_completions.rs
+++ b/crates/nu-cli/src/completions/custom_completions.rs
@@ -12,6 +12,8 @@ use nu_protocol::{
 use nu_utils::IgnoreCaseExt;
 use std::collections::HashMap;
 
+use super::completion_common::sort_suggestions;
+
 pub struct CustomCompletion {
     stack: Stack,
     decl_id: usize,
@@ -125,15 +127,12 @@ impl Completer for CustomCompletion {
             })
             .unwrap_or_default();
 
-        if let Some(custom_completion_options) = custom_completion_options {
+        let suggestions = if let Some(custom_completion_options) = custom_completion_options {
             filter(&prefix, suggestions, &custom_completion_options)
         } else {
             filter(&prefix, suggestions, completion_options)
-        }
-    }
-
-    fn get_sort_by(&self) -> SortBy {
-        self.sort_by
+        };
+        sort_suggestions(&String::from_utf8_lossy(&prefix), suggestions, self.sort_by)
     }
 }
 
diff --git a/crates/nu-cli/src/completions/directory_completions.rs b/crates/nu-cli/src/completions/directory_completions.rs
index 024322f997..61b0439444 100644
--- 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(),
@@ -62,41 +62,11 @@ impl Completer for DirectoryCompletion {
         })
         .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() {
diff --git a/crates/nu-cli/src/completions/dotnu_completions.rs b/crates/nu-cli/src/completions/dotnu_completions.rs
index c939578b41..1b2bbab20c 100644
--- 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, SortBy};
 
 #[derive(Clone, Default)]
 pub struct DotNuCompletion {}
@@ -131,10 +131,6 @@ impl Completer for DotNuCompletion {
             })
             .collect();
 
-        output
-    }
-
-    fn get_sort_by(&self) -> SortBy {
-        SortBy::LevenshteinDistance
+        sort_suggestions(&prefix_str, output, SortBy::Ascending)
     }
 }
diff --git a/crates/nu-cli/src/completions/file_completions.rs b/crates/nu-cli/src/completions/file_completions.rs
index f6205f6792..10a548e7ab 100644
--- 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,
@@ -67,41 +67,13 @@ impl Completer for FileCompletion {
         })
         .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)
-                });
-            }
-            _ => (),
-        }
+        // Sort results prioritizing the non hidden folders
 
         // 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() {
diff --git a/crates/nu-cli/src/completions/flag_completions.rs b/crates/nu-cli/src/completions/flag_completions.rs
index b0dcc0963b..ea4ddd6856 100644
--- a/crates/nu-cli/src/completions/flag_completions.rs
+++ b/crates/nu-cli/src/completions/flag_completions.rs
@@ -1,4 +1,6 @@
-use crate::completions::{Completer, CompletionOptions};
+use crate::completions::{
+    completion_common::sort_suggestions, Completer, CompletionOptions, SortBy,
+};
 use nu_protocol::{
     ast::{Expr, Expression},
     engine::{Stack, StateWorkingSet},
@@ -90,7 +92,7 @@ impl Completer for FlagCompletion {
                 }
             }
 
-            return output;
+            return sort_suggestions(&String::from_utf8_lossy(&prefix), output, SortBy::Ascending);
         }
 
         vec![]
diff --git a/crates/nu-cli/src/completions/variable_completions.rs b/crates/nu-cli/src/completions/variable_completions.rs
index 0572fe93c1..ab04da13ea 100644
--- 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, SortBy};
+
 #[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, SortBy::Ascending);
                     }
                 } else {
                     // No nesting provided, return all env vars
@@ -93,7 +96,7 @@ impl Completer for VariableCompletion {
                         }
                     }
 
-                    return output;
+                    return sort_suggestions(&prefix_str, output, SortBy::Ascending);
                 }
             }
 
@@ -117,7 +120,7 @@ impl Completer for VariableCompletion {
                         }
                     }
 
-                    return output;
+                    return sort_suggestions(&prefix_str, output, SortBy::Ascending);
                 }
             }
 
@@ -139,7 +142,7 @@ impl Completer for VariableCompletion {
                         }
                     }
 
-                    return output;
+                    return sort_suggestions(&prefix_str, output, SortBy::Ascending);
                 }
             }
         }
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index 35e9435b41..03f37925f5 100644
--- 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,
 };
 
@@ -85,6 +85,27 @@ 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();
+
+    // Use fuzzy matching, because subcommands are sorted by Levenshtein distance,
+    // and that's not very useful with prefix matching
+    let commands = r#"
+            $env.config.completions.algorithm = "fuzzy"
+            def foo [] {}
+            def "foo bar" [] {}
+            def "foo abaz" [] {}
+            def "foo aabrr" [] {}
+            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))
+}
+
 #[test]
 fn variables_dollar_sign_with_varialblecompletion() {
     let (_, _, engine, stack) = new_engine();
@@ -138,43 +159,42 @@ fn variables_customcompletion_subcommands_with_customcompletion_2(
 #[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());
-    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);
+    match_suggestions(expected.clone(), suggestions);
 
     // Test use completion
     let completion_str = "use ".to_string();
     let suggestions = completer.complete(&completion_str, completion_str.len());
 
-    assert_eq!(2, suggestions.len());
-    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);
+    match_suggestions(expected.clone(), suggestions);
 
     // 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());
-    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);
+    match_suggestions(expected, suggestions);
 }
 
 #[test]
@@ -276,9 +296,10 @@ fn partial_completions() {
 
     // Create the expected values
     let expected_paths: Vec<String> = vec![
-        folder(dir.join("partial_a")),
-        folder(dir.join("partial_b")),
-        folder(dir.join("partial_c")),
+        folder(dir.join("partial")),
+        folder(dir.join("partial-a")),
+        folder(dir.join("partial-b")),
+        folder(dir.join("partial-c")),
     ];
 
     // Match the results
@@ -292,13 +313,14 @@ 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_a").join("have_ext.txt")),
-        file(dir.join("partial_a").join("hello")),
-        file(dir.join("partial_a").join("hola")),
-        file(dir.join("partial_b").join("hello_b")),
-        file(dir.join("partial_b").join("hi_b")),
-        file(dir.join("partial_c").join("hello_c")),
+        file(dir.join("partial").join("hello.txt")),
+        file(dir.join("partial-a").join("have_ext.exe")),
+        file(dir.join("partial-a").join("have_ext.txt")),
+        file(dir.join("partial-a").join("hello")),
+        file(dir.join("partial-a").join("hola")),
+        file(dir.join("partial-b").join("hello_b")),
+        file(dir.join("partial-b").join("hi_b")),
+        file(dir.join("partial-c").join("hello_c")),
     ];
 
     // Match the results
@@ -311,14 +333,15 @@ fn partial_completions() {
 
     // Create the expected values
     let expected_paths: Vec<String> = vec![
-        file(dir.join("partial_a").join("anotherfile")),
-        file(dir.join("partial_a").join("have_ext.exe")),
-        file(dir.join("partial_a").join("have_ext.txt")),
-        file(dir.join("partial_a").join("hello")),
-        file(dir.join("partial_a").join("hola")),
-        file(dir.join("partial_b").join("hello_b")),
-        file(dir.join("partial_b").join("hi_b")),
-        file(dir.join("partial_c").join("hello_c")),
+        file(dir.join("partial").join("hello.txt")),
+        file(dir.join("partial-a").join("anotherfile")),
+        file(dir.join("partial-a").join("have_ext.exe")),
+        file(dir.join("partial-a").join("have_ext.txt")),
+        file(dir.join("partial-a").join("hello")),
+        file(dir.join("partial-a").join("hola")),
+        file(dir.join("partial-b").join("hello_b")),
+        file(dir.join("partial-b").join("hi_b")),
+        file(dir.join("partial-c").join("hello_c")),
     ];
 
     // Match the results
@@ -343,19 +366,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"),
@@ -366,28 +395,28 @@ fn partial_completions() {
     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.txt")),
+        file(dir.join("partial-a").join("have_ext.exe")),
+        file(dir.join("partial-a").join("have_ext.txt")),
     ];
 
     // Match the results
     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.txt")),
+        file(dir.join("partial-a").join("have_ext.exe")),
+        file(dir.join("partial-a").join("have_ext.txt")),
     ];
 
     // Match the results
@@ -652,6 +681,27 @@ fn command_watch_with_filecompletion() {
     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 aabrr".to_string()],
+        suggestions,
+    );
+
+    let prefix = "foo b";
+    let suggestions = subcommand_completer.complete(prefix, prefix.len());
+    match_suggestions(
+        vec![
+            "foo bar".to_string(),
+            "foo abaz".to_string(),
+            "foo aabrr".to_string(),
+        ],
+        suggestions,
+    );
+}
+
 #[test]
 fn file_completion_quoted() {
     let (_, _, engine, stack) = new_quote_engine();
@@ -662,11 +712,11 @@ 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(),
diff --git a/crates/nu-cli/tests/completions/support/completions_helpers.rs b/crates/nu-cli/tests/completions/support/completions_helpers.rs
index 47f46ab00e..027ac9d997 100644
--- a/crates/nu-cli/tests/completions/support/completions_helpers.rs
+++ b/crates/nu-cli/tests/completions/support/completions_helpers.rs
@@ -68,6 +68,52 @@ pub fn new_engine() -> (PathBuf, String, EngineState, Stack) {
     (dir, dir_str, engine_state, stack)
 }
 
+// creates a new engine with the current path into the completions fixtures folder
+pub fn new_dotnu_engine() -> (PathBuf, 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() -> (PathBuf, String, EngineState, Stack) {
     // Target folder inside assets
     let dir = fs::fixtures().join("quoted_completions");
@@ -149,9 +195,13 @@ 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);
-    });
+    assert_eq!(
+        expected,
+        suggestions
+            .into_iter()
+            .map(|it| it.value)
+            .collect::<Vec<_>>()
+    );
 }
 
 // append the separator to the converted path
diff --git a/tests/fixtures/partial_completions/partial_a/anotherfile b/tests/fixtures/dotnu_completions/dir_module/mod.nu
similarity index 100%
rename from tests/fixtures/partial_completions/partial_a/anotherfile
rename to tests/fixtures/dotnu_completions/dir_module/mod.nu
diff --git a/tests/fixtures/partial_completions/partial_a/have_ext.exe b/tests/fixtures/dotnu_completions/foo.nu
similarity index 100%
rename from tests/fixtures/partial_completions/partial_a/have_ext.exe
rename to tests/fixtures/dotnu_completions/foo.nu
diff --git a/tests/fixtures/partial_completions/partial_a/have_ext.txt b/tests/fixtures/dotnu_completions/lib-dir1/bar.nu
similarity index 100%
rename from tests/fixtures/partial_completions/partial_a/have_ext.txt
rename to tests/fixtures/dotnu_completions/lib-dir1/bar.nu
diff --git a/tests/fixtures/partial_completions/partial_a/hello b/tests/fixtures/dotnu_completions/lib-dir1/baz.nu
similarity index 100%
rename from tests/fixtures/partial_completions/partial_a/hello
rename to tests/fixtures/dotnu_completions/lib-dir1/baz.nu
diff --git a/tests/fixtures/partial_completions/partial_a/hola b/tests/fixtures/dotnu_completions/lib-dir1/xyzzy.nu
similarity index 100%
rename from tests/fixtures/partial_completions/partial_a/hola
rename to tests/fixtures/dotnu_completions/lib-dir1/xyzzy.nu
diff --git a/tests/fixtures/partial_completions/partial_b/hello_b b/tests/fixtures/dotnu_completions/lib-dir2/asdf.nu
similarity index 100%
rename from tests/fixtures/partial_completions/partial_b/hello_b
rename to tests/fixtures/dotnu_completions/lib-dir2/asdf.nu
diff --git a/tests/fixtures/partial_completions/partial_b/hi_b b/tests/fixtures/dotnu_completions/lib-dir2/bat.nu
similarity index 100%
rename from tests/fixtures/partial_completions/partial_b/hi_b
rename to tests/fixtures/dotnu_completions/lib-dir2/bat.nu
diff --git a/tests/fixtures/partial_completions/partial_c/hello_c b/tests/fixtures/dotnu_completions/lib-dir3/spam.nu
similarity index 100%
rename from tests/fixtures/partial_completions/partial_c/hello_c
rename to tests/fixtures/dotnu_completions/lib-dir3/spam.nu
diff --git a/tests/fixtures/partial_completions/partial-a/anotherfile b/tests/fixtures/partial_completions/partial-a/anotherfile
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/fixtures/partial_completions/partial-a/have_ext.exe b/tests/fixtures/partial_completions/partial-a/have_ext.exe
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/fixtures/partial_completions/partial-a/have_ext.txt b/tests/fixtures/partial_completions/partial-a/have_ext.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/fixtures/partial_completions/partial-a/hello b/tests/fixtures/partial_completions/partial-a/hello
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/fixtures/partial_completions/partial-a/hola b/tests/fixtures/partial_completions/partial-a/hola
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/fixtures/partial_completions/partial-b/hello_b b/tests/fixtures/partial_completions/partial-b/hello_b
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/fixtures/partial_completions/partial-b/hi_b b/tests/fixtures/partial_completions/partial-b/hi_b
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/fixtures/partial_completions/partial-c/hello_c b/tests/fixtures/partial_completions/partial-c/hello_c
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/fixtures/partial_completions/partial/hello.txt b/tests/fixtures/partial_completions/partial/hello.txt
new file mode 100644
index 0000000000..e69de29bb2

From f59dfac1302ed8c3ad2c4b8793c247f77cd3ad49 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Wed, 3 Jul 2024 06:49:18 -0500
Subject: [PATCH 0173/1072] update uutils crate versions (#13285)

# Description

This PR updates the uutils crates to version 0.0.27.

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock | 28 ++++++++++++++--------------
 Cargo.toml | 14 +++++++-------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 79c2064f53..72b7f72b3b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6513,9 +6513,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uu_cp"
-version = "0.0.26"
+version = "0.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31fc5c95f7668999e129464a29e9080f69ba01ccf7a0ae43ff2cfdb15baa340"
+checksum = "6fb99d355ccb02e8c514e4a1d93e4aa4eedea9837de24635dfd24c165971444e"
 dependencies = [
  "clap",
  "filetime",
@@ -6529,9 +6529,9 @@ dependencies = [
 
 [[package]]
 name = "uu_mkdir"
-version = "0.0.26"
+version = "0.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "496d95e0e3121e4d424ba62019eb84a6f1102213ca8ca16c0a2f8c652c7236c3"
+checksum = "219588fbc146f18188781208ac4034616c51cf151677b4e1f9caf63ca8a7f2cf"
 dependencies = [
  "clap",
  "uucore",
@@ -6539,9 +6539,9 @@ dependencies = [
 
 [[package]]
 name = "uu_mktemp"
-version = "0.0.26"
+version = "0.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28a0d9744bdc28ceaf13f70b959bacded91aedfd008402d72fa1e3224158653"
+checksum = "b1e79ad2c5911908fce23a6069c52ca82e1997e2ed4bf6abf2d867c79c3dc73f"
 dependencies = [
  "clap",
  "rand",
@@ -6551,9 +6551,9 @@ dependencies = [
 
 [[package]]
 name = "uu_mv"
-version = "0.0.26"
+version = "0.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53680908b01c5ac3cc0ee8a376de3e51a36dde2c5a5227a115a3d0977cc4539b"
+checksum = "cd57c8d02f8a99ed56ed9f6fddab403ee0e2bf9e8f3a5ca8f0f9e4d6e3e392a0"
 dependencies = [
  "clap",
  "fs_extra",
@@ -6563,9 +6563,9 @@ dependencies = [
 
 [[package]]
 name = "uu_uname"
-version = "0.0.26"
+version = "0.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7f4125fb4f286313bca8f222abaefe39db54d65179ea788c91ebd3162345f4e"
+checksum = "ad1ca90f9b292bccaad0de70e6feccac5182c6713a5e1ca72d97bf3555b608b4"
 dependencies = [
  "clap",
  "platform-info",
@@ -6574,9 +6574,9 @@ dependencies = [
 
 [[package]]
 name = "uu_whoami"
-version = "0.0.26"
+version = "0.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7b313901a15cfde2d88f434fcd077903d690f73cc36d1cec20f47906960aec"
+checksum = "bc7c52e42e0425710461700adc1063f468f2ba8a8ff83ee69ba661095ab7b77a"
 dependencies = [
  "clap",
  "libc",
@@ -6586,9 +6586,9 @@ dependencies = [
 
 [[package]]
 name = "uucore"
-version = "0.0.26"
+version = "0.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb2ea2f77699e5ff5c7e001af588ceb34cae8b5f9af5496bea5a6476aaa8e780"
+checksum = "7b54aad02cf7e96f5fafabb6b836efa73eef934783b17530095a29ffd4fdc154"
 dependencies = [
  "clap",
  "dunce",
diff --git a/Cargo.toml b/Cargo.toml
index 05244090a4..573ace795f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -166,13 +166,13 @@ unicode-segmentation = "1.11"
 unicode-width = "0.1"
 ureq = { version = "2.9", default-features = false }
 url = "2.2"
-uu_cp = "0.0.26"
-uu_mkdir = "0.0.26"
-uu_mktemp = "0.0.26"
-uu_mv = "0.0.26"
-uu_whoami = "0.0.26"
-uu_uname = "0.0.26"
-uucore = "0.0.26"
+uu_cp = "0.0.27"
+uu_mkdir = "0.0.27"
+uu_mktemp = "0.0.27"
+uu_mv = "0.0.27"
+uu_whoami = "0.0.27"
+uu_uname = "0.0.27"
+uucore = "0.0.27"
 uuid = "1.9.1"
 v_htmlescape = "0.15.0"
 wax = "0.6"

From ba1d900020e6bac3726d3d163c77afe6960d25cc Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Wed, 3 Jul 2024 07:43:07 -0500
Subject: [PATCH 0174/1072] create a better error message when saving fails
 (#13290)

# Description

This PR just creates a better error message when the `save` command
fails.

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/filesystem/save.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-command/src/filesystem/save.rs b/crates/nu-command/src/filesystem/save.rs
index fa14572987..e52234dfa3 100644
--- a/crates/nu-command/src/filesystem/save.rs
+++ b/crates/nu-command/src/filesystem/save.rs
@@ -461,7 +461,7 @@ fn open_file(path: &Path, span: Span, append: bool) -> Result<File, ShellError>
     };
 
     file.map_err(|e| ShellError::GenericError {
-        error: "Permission denied".into(),
+        error: format!("Problem with [{}], Permission denied", path.display()),
         msg: e.to_string(),
         span: Some(span),
         help: None,

From ca7a2ae1d6d808aa72ff8f25989e20be9e28e1d9 Mon Sep 17 00:00:00 2001
From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Wed, 3 Jul 2024 08:55:41 -0400
Subject: [PATCH 0175/1072] `for` - remove deprecated `--numbered` (#13239)

# Description

Complete the `--numbered` removal that was started with the deprecation
in #13112.

# User-Facing Changes

Breaking change - Use `| enumerate` in place of `--numbered` as shown in
the help example

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

Searched online doc for `--numbered` to ensure no other usage needed to
be updated.
---
 crates/nu-cmd-lang/src/core_commands/for_.rs | 56 ++------------------
 1 file changed, 4 insertions(+), 52 deletions(-)

diff --git a/crates/nu-cmd-lang/src/core_commands/for_.rs b/crates/nu-cmd-lang/src/core_commands/for_.rs
index 0f2434d162..9410be74c7 100644
--- 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::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)
     }
@@ -78,22 +72,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,7 +81,7 @@ 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) {
                         break;
                     }
@@ -112,20 +90,7 @@ impl Command for For {
                     // a different set of environment variables.
                     // Hence, a 'cd' in the first loop won't affect the next loop.
 
-                    stack.add_var(
-                        var_id,
-                        if numbered {
-                            Value::record(
-                                record! {
-                                    "index" => Value::int(idx as i64, head),
-                                    "item" => x,
-                                },
-                                head,
-                            )
-                        } else {
-                            x
-                        },
-                    );
+                    stack.add_var(var_id, x);
 
                     match eval_block(&engine_state, stack, block, PipelineData::empty()) {
                         Err(ShellError::Break { .. }) => {
@@ -151,21 +116,8 @@ impl Command for For {
                 }
             }
             Value::Range { val, .. } => {
-                for (idx, x) in val.into_range_iter(span, ctrlc).enumerate() {
-                    stack.add_var(
-                        var_id,
-                        if numbered {
-                            Value::record(
-                                record! {
-                                    "index" => Value::int(idx as i64, head),
-                                    "item" => x,
-                                },
-                                head,
-                            )
-                        } else {
-                            x
-                        },
-                    );
+                for x in val.into_range_iter(span, ctrlc) {
+                    stack.add_var(var_id, x);
 
                     match eval_block(&engine_state, stack, block, PipelineData::empty()) {
                         Err(ShellError::Break { .. }) => {

From 3fae77209a9fcfff0c9a4726ddd79432a62c3baa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C5=BD=C3=A1dn=C3=ADk?= <kubouch@gmail.com>
Date: Thu, 4 Jul 2024 00:02:13 +0300
Subject: [PATCH 0176/1072] Revert "Span ID Refactor (Step 2): Make Call
 SpanId-friendly (#13268)" (#13292)

This reverts commit 0cfd5fbece6f25b54ab9dc417a9e06af9d83f282.

The original PR messed up syntax higlighting of aliases and causes
panics of completion in the presence of alias.

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

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

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

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

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 .../nu-cli/src/commands/keybindings_list.rs   |   2 +-
 .../src/completions/custom_completions.rs     |  29 ++-
 crates/nu-cli/src/syntax_highlight.rs         |   2 +-
 crates/nu-command/src/bytes/build_.rs         |   2 +-
 crates/nu-command/src/debug/explain.rs        |   4 +-
 crates/nu-command/src/debug/profile.rs        |   6 +-
 crates/nu-command/src/filesystem/open.rs      |   7 +-
 crates/nu-command/src/filesystem/save.rs      |   2 +-
 crates/nu-command/src/filesystem/util.rs      |   2 +-
 crates/nu-command/src/formats/from/csv.rs     |   2 +-
 crates/nu-command/src/generators/cal.rs       |   4 +-
 crates/nu-command/src/misc/tutor.rs           |   2 +-
 crates/nu-command/src/network/http/client.rs  |   2 +-
 crates/nu-command/src/platform/is_terminal.rs |   7 +-
 crates/nu-command/src/system/run_external.rs  |   8 +-
 crates/nu-command/src/viewers/table.rs        |  17 +-
 crates/nu-engine/src/call_ext.rs              |   2 +-
 crates/nu-engine/src/documentation.rs         |  19 +-
 crates/nu-engine/src/eval.rs                  |  13 +-
 crates/nu-parser/src/flatten.rs               |   2 +-
 crates/nu-parser/src/known_external.rs        |   4 +-
 crates/nu-parser/src/lib.rs                   |   5 +-
 crates/nu-parser/src/parse_keywords.rs        |  65 ++----
 crates/nu-parser/src/parser.rs                | 202 +++++++----------
 crates/nu-parser/tests/test_parser.rs         | 100 +--------
 .../nu-plugin-protocol/src/evaluated_call.rs  |   7 +-
 crates/nu-protocol/src/ast/call.rs            | 203 +++++++++++-------
 crates/nu-protocol/src/ast/expression.rs      |   4 +-
 .../src/engine/state_working_set.rs           |  36 +---
 crates/nu-protocol/src/eval_const.rs          |   2 +-
 .../nu-protocol/src/pipeline/pipeline_data.rs |   2 +-
 31 files changed, 296 insertions(+), 468 deletions(-)

diff --git a/crates/nu-cli/src/commands/keybindings_list.rs b/crates/nu-cli/src/commands/keybindings_list.rs
index b6375be8a1..f4450c0c23 100644
--- a/crates/nu-cli/src/commands/keybindings_list.rs
+++ b/crates/nu-cli/src/commands/keybindings_list.rs
@@ -62,7 +62,7 @@ impl Command for KeybindingsList {
                 .collect()
         } else {
             call.named_iter()
-                .flat_map(|(argument, _, _, _)| get_records(argument.item.as_str(), call.head))
+                .flat_map(|(argument, _, _)| get_records(argument.item.as_str(), call.head))
                 .collect()
         };
 
diff --git a/crates/nu-cli/src/completions/custom_completions.rs b/crates/nu-cli/src/completions/custom_completions.rs
index 5cab0a8fa2..0d2c674ef9 100644
--- a/crates/nu-cli/src/completions/custom_completions.rs
+++ b/crates/nu-cli/src/completions/custom_completions.rs
@@ -7,7 +7,7 @@ use nu_protocol::{
     ast::{Argument, Call, Expr, Expression},
     debugger::WithoutDebug,
     engine::{Stack, StateWorkingSet},
-    PipelineData, Span, Spanned, Type, Value,
+    PipelineData, Span, Type, Value,
 };
 use nu_utils::IgnoreCaseExt;
 use std::collections::HashMap;
@@ -53,21 +53,18 @@ impl Completer for CustomCompletion {
             &Call {
                 decl_id: self.decl_id,
                 head: span,
-                arguments: Spanned {
-                    item: vec![
-                        Argument::Positional(Expression::new_unknown(
-                            Expr::String(self.line.clone()),
-                            Span::unknown(),
-                            Type::String,
-                        )),
-                        Argument::Positional(Expression::new_unknown(
-                            Expr::Int(line_pos as i64),
-                            Span::unknown(),
-                            Type::Int,
-                        )),
-                    ],
-                    span: Span::unknown(),
-                },
+                arguments: vec![
+                    Argument::Positional(Expression::new_unknown(
+                        Expr::String(self.line.clone()),
+                        Span::unknown(),
+                        Type::String,
+                    )),
+                    Argument::Positional(Expression::new_unknown(
+                        Expr::Int(line_pos as i64),
+                        Span::unknown(),
+                        Type::Int,
+                    )),
+                ],
                 parser_info: HashMap::new(),
             },
             PipelineData::empty(),
diff --git a/crates/nu-cli/src/syntax_highlight.rs b/crates/nu-cli/src/syntax_highlight.rs
index 9fccf5e409..41ef168390 100644
--- a/crates/nu-cli/src/syntax_highlight.rs
+++ b/crates/nu-cli/src/syntax_highlight.rs
@@ -400,7 +400,7 @@ fn find_matching_block_end_in_expr(
                 }
             }
 
-            Expr::Call(call) => call.arguments.item.iter().find_map(|arg| {
+            Expr::Call(call) => call.arguments.iter().find_map(|arg| {
                 arg.expr().and_then(|expr| {
                     find_matching_block_end_in_expr(
                         line,
diff --git a/crates/nu-command/src/bytes/build_.rs b/crates/nu-command/src/bytes/build_.rs
index b6a98d1204..f6b1327621 100644
--- a/crates/nu-command/src/bytes/build_.rs
+++ b/crates/nu-command/src/bytes/build_.rs
@@ -49,7 +49,7 @@ impl Command for BytesBuild {
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let mut output = vec![];
-        for val in call.rest_iter_flattened(&engine_state, 0, |expr| {
+        for val in call.rest_iter_flattened(0, |expr| {
             let eval_expression = get_eval_expression(engine_state);
             eval_expression(engine_state, stack, expr)
         })? {
diff --git a/crates/nu-command/src/debug/explain.rs b/crates/nu-command/src/debug/explain.rs
index d30d41faa8..b451d6916a 100644
--- a/crates/nu-command/src/debug/explain.rs
+++ b/crates/nu-command/src/debug/explain.rs
@@ -111,11 +111,11 @@ fn get_arguments(
 ) -> Vec<Value> {
     let mut arg_value = vec![];
     let span = Span::test_data();
-    for arg in &call.arguments.item {
+    for arg in &call.arguments {
         match arg {
             // I think the second argument to Argument::Named is the short name, but I'm not really sure.
             // Please fix it if it's wrong. :)
-            Argument::Named((name, short, opt_expr, _)) => {
+            Argument::Named((name, short, opt_expr)) => {
                 let arg_type = "named";
                 let arg_value_name = name.item.clone();
                 let arg_value_name_span_start = name.span.start as i64;
diff --git a/crates/nu-command/src/debug/profile.rs b/crates/nu-command/src/debug/profile.rs
index 86136279f7..0cef979094 100644
--- a/crates/nu-command/src/debug/profile.rs
+++ b/crates/nu-command/src/debug/profile.rs
@@ -104,7 +104,7 @@ confusing the id/parent_id hierarchy. The --expr flag is helpful for investigati
             collect_values,
             collect_exprs,
             collect_lines,
-            call.span(&engine_state),
+            call.span(),
         );
 
         let lock_err = |_| ShellError::GenericError {
@@ -125,12 +125,12 @@ confusing the id/parent_id hierarchy. The --expr flag is helpful for investigati
         let pipeline_data = result?;
 
         // Collect the output
-        let _ = pipeline_data.into_value(call.span(&engine_state));
+        let _ = pipeline_data.into_value(call.span());
 
         Ok(engine_state
             .deactivate_debugger()
             .map_err(lock_err)?
-            .report(engine_state, call.span(&engine_state))?
+            .report(engine_state, call.span())?
             .into_pipeline_data())
     }
 
diff --git a/crates/nu-command/src/filesystem/open.rs b/crates/nu-command/src/filesystem/open.rs
index 59caf283ba..9000359450 100644
--- a/crates/nu-command/src/filesystem/open.rs
+++ b/crates/nu-command/src/filesystem/open.rs
@@ -177,12 +177,7 @@ impl Command for Open {
                                 let block = engine_state.get_block(block_id);
                                 eval_block(engine_state, stack, block, stream)
                             } else {
-                                decl.run(
-                                    engine_state,
-                                    stack,
-                                    &Call::new(call_span, call.arguments_span()),
-                                    stream,
-                                )
+                                decl.run(engine_state, stack, &Call::new(call_span), stream)
                             };
                             output.push(command_output.map_err(|inner| {
                                     ShellError::GenericError{
diff --git a/crates/nu-command/src/filesystem/save.rs b/crates/nu-command/src/filesystem/save.rs
index e52234dfa3..1cfbbc67b4 100644
--- a/crates/nu-command/src/filesystem/save.rs
+++ b/crates/nu-command/src/filesystem/save.rs
@@ -398,7 +398,7 @@ fn convert_to_extension(
             let eval_block = get_eval_block(engine_state);
             eval_block(engine_state, stack, block, input)
         } else {
-            decl.run(engine_state, stack, &Call::new(span, span.past()), input)
+            decl.run(engine_state, stack, &Call::new(span), input)
         }
     } else {
         Ok(input)
diff --git a/crates/nu-command/src/filesystem/util.rs b/crates/nu-command/src/filesystem/util.rs
index 8c1dfcf85f..1b755875bd 100644
--- a/crates/nu-command/src/filesystem/util.rs
+++ b/crates/nu-command/src/filesystem/util.rs
@@ -103,7 +103,7 @@ pub fn get_rest_for_glob_pattern(
     let mut output = vec![];
     let eval_expression = get_eval_expression(engine_state);
 
-    for result in call.rest_iter_flattened(&engine_state, starting_pos, |expr| {
+    for result in call.rest_iter_flattened(starting_pos, |expr| {
         let result = eval_expression(engine_state, stack, expr);
         match result {
             Err(e) => Err(e),
diff --git a/crates/nu-command/src/formats/from/csv.rs b/crates/nu-command/src/formats/from/csv.rs
index 3db4da62db..b00dd5022b 100644
--- a/crates/nu-command/src/formats/from/csv.rs
+++ b/crates/nu-command/src/formats/from/csv.rs
@@ -141,7 +141,7 @@ fn from_csv(
             } else {
                 return Err(ShellError::NonUtf8Custom {
                     msg: "separator should be a single char or a 4-byte unicode".into(),
-                    span: call.span(&engine_state),
+                    span: call.span(),
                 });
             }
         }
diff --git a/crates/nu-command/src/generators/cal.rs b/crates/nu-command/src/generators/cal.rs
index 215469030f..a257f3ab7c 100644
--- a/crates/nu-command/src/generators/cal.rs
+++ b/crates/nu-command/src/generators/cal.rs
@@ -3,7 +3,6 @@ use nu_color_config::StyleComputer;
 use nu_engine::command_prelude::*;
 use nu_protocol::ast::{Expr, Expression};
 
-use nu_protocol::engine::UNKNOWN_SPAN_ID;
 use std::collections::VecDeque;
 
 #[derive(Clone)]
@@ -144,7 +143,7 @@ pub fn cal(
         style_computer,
     )?;
 
-    let mut table_no_index = Call::new(Span::unknown(), Span::unknown());
+    let mut table_no_index = Call::new(Span::unknown());
     table_no_index.add_named((
         Spanned {
             item: "index".to_string(),
@@ -156,7 +155,6 @@ pub fn cal(
             Span::unknown(),
             Type::Bool,
         )),
-        UNKNOWN_SPAN_ID,
     ));
 
     let cal_table_output =
diff --git a/crates/nu-command/src/misc/tutor.rs b/crates/nu-command/src/misc/tutor.rs
index 361b4ada27..6b1c43534b 100644
--- a/crates/nu-command/src/misc/tutor.rs
+++ b/crates/nu-command/src/misc/tutor.rs
@@ -412,7 +412,7 @@ fn display(help: &str, engine_state: &EngineState, stack: &mut Stack, span: Span
                 let result = decl.run(
                     engine_state,
                     stack,
-                    &Call::new(span, span.past()),
+                    &Call::new(span),
                     Value::string(item, Span::unknown()).into_pipeline_data(),
                 );
 
diff --git a/crates/nu-command/src/network/http/client.rs b/crates/nu-command/src/network/http/client.rs
index f0951a1885..2c02d7be33 100644
--- a/crates/nu-command/src/network/http/client.rs
+++ b/crates/nu-command/src/network/http/client.rs
@@ -547,7 +547,7 @@ fn transform_response_using_content_type(
             Some(converter_id) => engine_state.get_decl(converter_id).run(
                 engine_state,
                 stack,
-                &Call::new(span, span.past()),
+                &Call::new(span),
                 output,
             ),
             None => Ok(output),
diff --git a/crates/nu-command/src/platform/is_terminal.rs b/crates/nu-command/src/platform/is_terminal.rs
index 1d4d1628f9..c67329e839 100644
--- a/crates/nu-command/src/platform/is_terminal.rs
+++ b/crates/nu-command/src/platform/is_terminal.rs
@@ -58,12 +58,7 @@ impl Command for IsTerminal {
             _ => {
                 return Err(ShellError::IncompatibleParametersSingle {
                     msg: "Only one stream may be checked".into(),
-                    span: Span::merge_many(
-                        call.arguments
-                            .item
-                            .iter()
-                            .map(|arg| arg.span(&engine_state)),
-                    ),
+                    span: Span::merge_many(call.arguments.iter().map(|arg| arg.span())),
                 });
             }
         };
diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index 398cd4919a..f82c23a0e0 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -375,12 +375,8 @@ fn write_pipeline_data(
         Arc::make_mut(&mut engine_state.config).use_ansi_coloring = false;
 
         // Invoke the `table` command.
-        let output = crate::Table.run(
-            &engine_state,
-            &mut stack,
-            &Call::new(Span::unknown(), Span::unknown()),
-            data,
-        )?;
+        let output =
+            crate::Table.run(&engine_state, &mut stack, &Call::new(Span::unknown()), data)?;
 
         // Write the output.
         for value in output {
diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index 07d761a615..f0cc90fa9f 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -127,7 +127,7 @@ impl Command for Table {
             return Ok(val.into_pipeline_data());
         }
 
-        let cfg = parse_table_config(engine_state, call, engine_state, stack)?;
+        let cfg = parse_table_config(call, engine_state, stack)?;
         let input = CmdInput::new(engine_state, stack, call, input);
 
         // reset vt processing, aka ansi because illbehaved externals can break it
@@ -247,7 +247,6 @@ impl TableConfig {
 }
 
 fn parse_table_config(
-    engine_state: &EngineState,
     call: &Call,
     state: &EngineState,
     stack: &mut Stack,
@@ -270,9 +269,9 @@ fn parse_table_config(
             flatten_separator,
         },
     };
-    let theme = get_theme_flag(engine_state, call, state, stack)?
-        .unwrap_or_else(|| get_config(state, stack).table_mode);
-    let index = get_index_flag(engine_state, call, state, stack)?;
+    let theme =
+        get_theme_flag(call, state, stack)?.unwrap_or_else(|| get_config(state, stack).table_mode);
+    let index = get_index_flag(call, state, stack)?;
 
     let term_width = get_width_param(width_param);
 
@@ -286,7 +285,6 @@ fn parse_table_config(
 }
 
 fn get_index_flag(
-    engine_state: &EngineState,
     call: &Call,
     state: &EngineState,
     stack: &mut Stack,
@@ -310,7 +308,7 @@ fn get_index_flag(
                 Err(ShellError::UnsupportedInput {
                     msg: String::from("got a negative integer"),
                     input: val.to_string(),
-                    msg_span: call.span(&engine_state),
+                    msg_span: call.span(),
                     input_span: internal_span,
                 })
             } else {
@@ -321,14 +319,13 @@ fn get_index_flag(
         _ => Err(ShellError::CantConvert {
             to_type: String::from("index"),
             from_type: String::new(),
-            span: call.span(&engine_state),
+            span: call.span(),
             help: Some(String::from("supported values: [bool, int, nothing]")),
         }),
     }
 }
 
 fn get_theme_flag(
-    engine_state: &EngineState,
     call: &Call,
     state: &EngineState,
     stack: &mut Stack,
@@ -338,7 +335,7 @@ fn get_theme_flag(
             TableMode::from_str(&theme).map_err(|err| ShellError::CantConvert {
                 to_type: String::from("theme"),
                 from_type: String::from("string"),
-                span: call.span(&engine_state),
+                span: call.span(),
                 help: Some(format!("{}, but found '{}'.", err, theme)),
             })
         })
diff --git a/crates/nu-engine/src/call_ext.rs b/crates/nu-engine/src/call_ext.rs
index 4a577a6103..daedb24a1f 100644
--- a/crates/nu-engine/src/call_ext.rs
+++ b/crates/nu-engine/src/call_ext.rs
@@ -113,7 +113,7 @@ impl CallExt for Call {
         let stack = &mut stack.use_call_arg_out_dest();
         let mut output = vec![];
 
-        for result in self.rest_iter_flattened(&engine_state, starting_pos, |expr| {
+        for result in self.rest_iter_flattened(starting_pos, |expr| {
             eval_expression::<WithoutDebug>(engine_state, stack, expr)
         })? {
             output.push(FromValue::from_value(result)?);
diff --git a/crates/nu-engine/src/documentation.rs b/crates/nu-engine/src/documentation.rs
index ccc55ce8be..a7d4950036 100644
--- a/crates/nu-engine/src/documentation.rs
+++ b/crates/nu-engine/src/documentation.rs
@@ -48,7 +48,7 @@ fn nu_highlight_string(code_string: &str, engine_state: &EngineState, stack: &mu
         if let Ok(output) = decl.run(
             engine_state,
             stack,
-            &Call::new(Span::unknown(), Span::unknown()),
+            &Call::new(Span::unknown()),
             Value::string(code_string, Span::unknown()).into_pipeline_data(),
         ) {
             let result = output.into_value(Span::unknown());
@@ -241,10 +241,7 @@ fn get_documentation(
                 &Call {
                     decl_id,
                     head: span,
-                    arguments: Spanned {
-                        item: vec![],
-                        span: span.past(),
-                    },
+                    arguments: vec![],
                     parser_info: HashMap::new(),
                 },
                 PipelineData::Value(Value::list(vals, span), None),
@@ -276,7 +273,7 @@ fn get_documentation(
             match decl.run(
                 engine_state,
                 stack,
-                &Call::new(Span::unknown(), Span::unknown()),
+                &Call::new(Span::unknown()),
                 Value::string(example.example, Span::unknown()).into_pipeline_data(),
             ) {
                 Ok(output) => {
@@ -299,7 +296,7 @@ fn get_documentation(
         }
 
         if let Some(result) = &example.result {
-            let mut table_call = Call::new(Span::unknown(), Span::unknown());
+            let mut table_call = Call::new(Span::unknown());
             if example.example.ends_with("--collapse") {
                 // collapse the result
                 table_call.add_named((
@@ -309,7 +306,6 @@ fn get_documentation(
                     },
                     None,
                     None,
-                    UNKNOWN_SPAN_ID,
                 ))
             } else {
                 // expand the result
@@ -320,7 +316,6 @@ fn get_documentation(
                     },
                     None,
                     None,
-                    UNKNOWN_SPAN_ID,
                 ))
             }
             let table = engine_state
@@ -373,17 +368,13 @@ fn get_ansi_color_for_component_or_default(
         // Call ansi command using argument
         if let Some(argument) = argument_opt {
             if let Some(decl_id) = engine_state.find_decl(b"ansi", &[]) {
-                let arg_span = argument.span(&engine_state);
                 if let Ok(result) = eval_call::<WithoutDebug>(
                     engine_state,
                     caller_stack,
                     &Call {
                         decl_id,
                         head: span,
-                        arguments: Spanned {
-                            item: vec![argument],
-                            span: arg_span,
-                        },
+                        arguments: vec![argument],
                         parser_info: HashMap::new(),
                     },
                     PipelineData::Empty,
diff --git a/crates/nu-engine/src/eval.rs b/crates/nu-engine/src/eval.rs
index 15bcd61f3e..044bf86980 100644
--- a/crates/nu-engine/src/eval.rs
+++ b/crates/nu-engine/src/eval.rs
@@ -26,7 +26,7 @@ pub fn eval_call<D: DebugContext>(
     }
     let decl = engine_state.get_decl(call.decl_id);
 
-    if !decl.is_known_external() && call.named_iter().any(|(flag, _, _, _)| flag.item == "help") {
+    if !decl.is_known_external() && call.named_iter().any(|(flag, _, _)| flag.item == "help") {
         let help = get_full_help(decl, engine_state, caller_stack);
         Ok(Value::string(help, call.head).into_pipeline_data())
     } else if let Some(block_id) = decl.block_id() {
@@ -100,7 +100,6 @@ pub fn eval_call<D: DebugContext>(
             let mut rest_items = vec![];
 
             for result in call.rest_iter_flattened(
-                &engine_state,
                 decl.signature().required_positional.len()
                     + decl.signature().optional_positional.len(),
                 |expr| eval_expression::<D>(engine_state, caller_stack, expr),
@@ -214,16 +213,8 @@ fn eval_external(
         })?;
 
     let command = engine_state.get_decl(decl_id);
-    let spans: Vec<Span> = args
-        .iter()
-        .map(|arg| match arg {
-            ExternalArgument::Regular(expr) | ExternalArgument::Spread(expr) => {
-                expr.span(&engine_state)
-            }
-        })
-        .collect();
 
-    let mut call = Call::new(head.span(&engine_state), Span::concat(&spans));
+    let mut call = Call::new(head.span(&engine_state));
 
     call.add_positional(head.clone());
 
diff --git a/crates/nu-parser/src/flatten.rs b/crates/nu-parser/src/flatten.rs
index 09b48ccaee..88638b2475 100644
--- a/crates/nu-parser/src/flatten.rs
+++ b/crates/nu-parser/src/flatten.rs
@@ -252,7 +252,7 @@ fn flatten_expression_into(
             }
 
             let arg_start = output.len();
-            for arg in &call.arguments.item {
+            for arg in &call.arguments {
                 match arg {
                     Argument::Positional(positional) | Argument::Unknown(positional) => {
                         flatten_expression_into(working_set, positional, output)
diff --git a/crates/nu-parser/src/known_external.rs b/crates/nu-parser/src/known_external.rs
index 6b3d024d98..453112aa32 100644
--- a/crates/nu-parser/src/known_external.rs
+++ b/crates/nu-parser/src/known_external.rs
@@ -43,7 +43,7 @@ impl Command for KnownExternal {
 
         let command = engine_state.get_decl(decl_id);
 
-        let mut extern_call = Call::new(head_span, call.arguments_span());
+        let mut extern_call = Call::new(head_span);
 
         let extern_name = if let Some(name_bytes) = engine_state.find_decl_name(call.decl_id, &[]) {
             String::from_utf8_lossy(name_bytes)
@@ -78,7 +78,7 @@ impl Command for KnownExternal {
             ));
         }
 
-        for arg in &call.arguments.item {
+        for arg in &call.arguments {
             match arg {
                 Argument::Positional(positional) => extern_call.add_positional(positional.clone()),
                 Argument::Named(named) => {
diff --git a/crates/nu-parser/src/lib.rs b/crates/nu-parser/src/lib.rs
index 5e3e73987d..89cba8d243 100644
--- a/crates/nu-parser/src/lib.rs
+++ b/crates/nu-parser/src/lib.rs
@@ -21,9 +21,8 @@ pub use nu_protocol::parser_path::*;
 pub use parse_keywords::*;
 
 pub use parser::{
-    is_math_expression_like, named_arg_span, parse, parse_block, parse_expression,
-    parse_external_call, parse_unit_value, trim_quotes, trim_quotes_str, unescape_unquote_string,
-    DURATION_UNIT_GROUPS,
+    is_math_expression_like, parse, parse_block, parse_expression, parse_external_call,
+    parse_unit_value, trim_quotes, trim_quotes_str, unescape_unquote_string, DURATION_UNIT_GROUPS,
 };
 
 #[cfg(feature = "plugin")]
diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index 089c0b2fba..70d217c564 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -123,8 +123,8 @@ pub fn parse_keyword(working_set: &mut StateWorkingSet, lite_command: &LiteComma
         // Apply parse keyword side effects
         let cmd = working_set.get_decl(call.decl_id);
         // check help flag first.
-        if call.named_iter().any(|(flag, _, _, _)| flag.item == "help") {
-            let call_span = call.span(working_set);
+        if call.named_iter().any(|(flag, _, _)| flag.item == "help") {
+            let call_span = call.span();
             return Pipeline::from_vec(vec![Expression::new(
                 working_set,
                 Expr::Call(call),
@@ -1056,7 +1056,7 @@ pub fn parse_alias(
                 // First from comments, if any are present
                 false => working_set.build_usage(&lite_command.comments),
                 // Then from the command itself
-                true => match alias_call.arguments.item.get(1) {
+                true => match alias_call.arguments.get(1) {
                     Some(Argument::Positional(Expression {
                         expr: Expr::Keyword(kw),
                         ..
@@ -1258,10 +1258,7 @@ pub fn parse_export_in_module(
     let mut call = Box::new(Call {
         head: spans[0],
         decl_id: export_decl_id,
-        arguments: Spanned {
-            item: vec![],
-            span: spans[0].past(),
-        },
+        arguments: vec![],
         parser_info: HashMap::new(),
     });
 
@@ -2266,21 +2263,13 @@ pub fn parse_module(
         .find_decl(b"module")
         .expect("internal error: missing module command");
 
-    let args_span = Span::concat(&[
-        module_name_or_path_expr.span(working_set),
-        block_expr.span(working_set),
-    ]);
-
     let call = Box::new(Call {
         head: Span::concat(&spans[..split_id]),
         decl_id: module_decl_id,
-        arguments: Spanned {
-            item: vec![
-                Argument::Positional(module_name_or_path_expr),
-                Argument::Positional(block_expr),
-            ],
-            span: args_span,
-        },
+        arguments: vec![
+            Argument::Positional(module_name_or_path_expr),
+            Argument::Positional(block_expr),
+        ],
         parser_info: HashMap::new(),
     });
 
@@ -2712,7 +2701,7 @@ pub fn parse_hide(working_set: &mut StateWorkingSet, lite_command: &LiteCommand)
 }
 
 pub fn parse_overlay_new(working_set: &mut StateWorkingSet, call: Box<Call>) -> Pipeline {
-    let call_span = call.span(working_set);
+    let call_span = call.span();
 
     let (overlay_name, _) = if let Some(expr) = call.positional_nth(0) {
         match eval_constant(working_set, expr) {
@@ -2761,7 +2750,7 @@ pub fn parse_overlay_new(working_set: &mut StateWorkingSet, call: Box<Call>) ->
 }
 
 pub fn parse_overlay_use(working_set: &mut StateWorkingSet, call: Box<Call>) -> Pipeline {
-    let call_span = call.span(working_set);
+    let call_span = call.span();
 
     let (overlay_name, overlay_name_span) = if let Some(expr) = call.positional_nth(0) {
         match eval_constant(working_set, expr) {
@@ -2984,7 +2973,7 @@ pub fn parse_overlay_use(working_set: &mut StateWorkingSet, call: Box<Call>) ->
 }
 
 pub fn parse_overlay_hide(working_set: &mut StateWorkingSet, call: Box<Call>) -> Pipeline {
-    let call_span = call.span(working_set);
+    let call_span = call.span();
 
     let (overlay_name, overlay_name_span) = if let Some(expr) = call.positional_nth(0) {
         match eval_constant(working_set, expr) {
@@ -3124,16 +3113,10 @@ pub fn parse_let(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipeline
                         }
                     }
 
-                    let args_span =
-                        Span::concat(&[lvalue.span(working_set), rvalue.span(working_set)]);
-
                     let call = Box::new(Call {
                         decl_id,
                         head: spans[0],
-                        arguments: Spanned {
-                            item: vec![Argument::Positional(lvalue), Argument::Positional(rvalue)],
-                            span: args_span,
-                        },
+                        arguments: vec![Argument::Positional(lvalue), Argument::Positional(rvalue)],
                         parser_info: HashMap::new(),
                     });
 
@@ -3276,16 +3259,10 @@ pub fn parse_const(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipelin
                         }
                     }
 
-                    let args_span =
-                        Span::concat(&[lvalue.span(working_set), rvalue.span(working_set)]);
-
                     let call = Box::new(Call {
                         decl_id,
                         head: spans[0],
-                        arguments: Spanned {
-                            item: vec![Argument::Positional(lvalue), Argument::Positional(rvalue)],
-                            span: args_span,
-                        },
+                        arguments: vec![Argument::Positional(lvalue), Argument::Positional(rvalue)],
                         parser_info: HashMap::new(),
                     });
 
@@ -3401,16 +3378,10 @@ pub fn parse_mut(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipeline
                         }
                     }
 
-                    let args_span =
-                        Span::concat(&[lvalue.span(working_set), rvalue.span(working_set)]);
-
                     let call = Box::new(Call {
                         decl_id,
                         head: spans[0],
-                        arguments: Spanned {
-                            item: vec![Argument::Positional(lvalue), Argument::Positional(rvalue)],
-                            span: args_span,
-                        },
+                        arguments: vec![Argument::Positional(lvalue), Argument::Positional(rvalue)],
                         parser_info: HashMap::new(),
                     });
 
@@ -3913,8 +3884,8 @@ pub fn parse_plugin_use(working_set: &mut StateWorkingSet, call: Box<Call>) -> P
 
         let plugin_config = call
             .named_iter()
-            .find(|(arg_name, _, _, _)| arg_name.item == "plugin-config")
-            .map(|(_, _, expr, _)| {
+            .find(|(arg_name, _, _)| arg_name.item == "plugin-config")
+            .map(|(_, _, expr)| {
                 let expr = expr
                     .as_ref()
                     .expect("--plugin-config arg should have been checked already");
@@ -3990,7 +3961,7 @@ pub fn parse_plugin_use(working_set: &mut StateWorkingSet, call: Box<Call>) -> P
         working_set.error(err);
     }
 
-    let call_span = call.span(working_set);
+    let call_span = call.span();
 
     Pipeline::from_vec(vec![Expression::new(
         working_set,
@@ -4176,6 +4147,6 @@ fn detect_params_in_name(
 /// Run has_flag_const and push possible error to working_set
 fn has_flag_const(working_set: &mut StateWorkingSet, call: &Call, name: &str) -> Result<bool, ()> {
     call.has_flag_const(working_set, name).map_err(|err| {
-        working_set.error(err.wrap(working_set, call.span(working_set)));
+        working_set.error(err.wrap(working_set, call.span()));
     })
 }
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index d5131d0137..c3d18b55ac 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -160,7 +160,7 @@ pub(crate) fn check_call(
     call: &Call,
 ) {
     // Allow the call to pass if they pass in the help flag
-    if call.named_iter().any(|(n, _, _, _)| n.item == "help") {
+    if call.named_iter().any(|(n, _, _)| n.item == "help") {
         return;
     }
 
@@ -180,7 +180,7 @@ pub(crate) fn check_call(
                 if let Some(last) = call.positional_iter().last() {
                     working_set.error(ParseError::MissingPositional(
                         argument.name.clone(),
-                        Span::new(last.span(working_set).end, last.span(working_set).end),
+                        Span::new(last.span.end, last.span.end),
                         sig.call_signature(),
                     ));
                     return;
@@ -199,7 +199,7 @@ pub(crate) fn check_call(
         if let Some(last) = call.positional_iter().last() {
             working_set.error(ParseError::MissingPositional(
                 missing.name.clone(),
-                Span::new(last.span(working_set).end, last.span(working_set).end),
+                Span::new(last.span.end, last.span.end),
                 sig.call_signature(),
             ))
         } else {
@@ -211,10 +211,7 @@ pub(crate) fn check_call(
         }
     } else {
         for req_flag in sig.named.iter().filter(|x| x.required) {
-            if call
-                .named_iter()
-                .all(|(n, _, _, _)| n.item != req_flag.long)
-            {
+            if call.named_iter().all(|(n, _, _)| n.item != req_flag.long) {
                 working_set.error(ParseError::MissingRequiredFlag(
                     req_flag.long.clone(),
                     command,
@@ -489,19 +486,18 @@ fn ensure_flag_arg_type(
     arg_shape: &SyntaxShape,
     long_name_span: Span,
 ) -> (Spanned<String>, Expression) {
-    let arg_span = arg.span(working_set);
     if !type_compatible(&arg.ty, &arg_shape.to_type()) {
         working_set.error(ParseError::TypeMismatch(
             arg_shape.to_type(),
             arg.ty,
-            arg_span,
+            arg.span,
         ));
         (
             Spanned {
                 item: arg_name,
                 span: long_name_span,
             },
-            Expression::garbage(working_set, arg_span),
+            Expression::garbage(working_set, arg.span),
         )
     } else {
         (
@@ -920,25 +916,6 @@ pub struct ParsedInternalCall {
     pub output: Type,
 }
 
-// moved from call.rs since span creation must be done at parse time now
-pub fn named_arg_span(
-    working_set: &StateWorkingSet,
-    named: &Spanned<String>,
-    short: &Option<Spanned<String>>,
-    expr: &Option<Expression>,
-) -> Span {
-    let start = named.span.start;
-    let end = if let Some(expr) = expr {
-        expr.span(&working_set).end
-    } else if let Some(short) = short {
-        short.span.end
-    } else {
-        named.span.end
-    };
-
-    Span::new(start, end)
-}
-
 pub fn parse_internal_call(
     working_set: &mut StateWorkingSet,
     command_span: Span,
@@ -947,7 +924,7 @@ pub fn parse_internal_call(
 ) -> ParsedInternalCall {
     trace!("parsing: internal call (decl id: {})", decl_id);
 
-    let mut call = Call::new(command_span, Span::concat(spans));
+    let mut call = Call::new(command_span);
     call.decl_id = decl_id;
     call.head = command_span;
     let _ = working_set.add_span(call.head);
@@ -1025,9 +1002,7 @@ pub fn parse_internal_call(
 
                 call.add_unknown(arg);
             } else {
-                let named_span = named_arg_span(working_set, &long_name, &None, &arg);
-                let named_span_id = working_set.add_span(named_span);
-                call.add_named((long_name, None, arg, named_span_id));
+                call.add_named((long_name, None, arg));
             }
 
             spans_idx += 1;
@@ -1078,30 +1053,27 @@ pub fn parse_internal_call(
 
                             if flag.long.is_empty() {
                                 if let Some(short) = flag.short {
-                                    let named = Spanned {
-                                        item: String::new(),
-                                        span: spans[spans_idx],
-                                    };
-                                    let short = Some(Spanned {
-                                        item: short.to_string(),
-                                        span: spans[spans_idx],
-                                    });
-                                    let expr = Some(arg);
-                                    let named_span =
-                                        named_arg_span(working_set, &named, &short, &expr);
-                                    let named_span_id = working_set.add_span(named_span);
-                                    call.add_named((named, short, expr, named_span_id));
+                                    call.add_named((
+                                        Spanned {
+                                            item: String::new(),
+                                            span: spans[spans_idx],
+                                        },
+                                        Some(Spanned {
+                                            item: short.to_string(),
+                                            span: spans[spans_idx],
+                                        }),
+                                        Some(arg),
+                                    ));
                                 }
                             } else {
-                                let named = Spanned {
-                                    item: flag.long.clone(),
-                                    span: spans[spans_idx],
-                                };
-                                let short = None;
-                                let expr = Some(arg);
-                                let named_span = named_arg_span(working_set, &named, &short, &expr);
-                                let named_span_id = working_set.add_span(named_span);
-                                call.add_named((named, short, expr, named_span_id));
+                                call.add_named((
+                                    Spanned {
+                                        item: flag.long.clone(),
+                                        span: spans[spans_idx],
+                                    },
+                                    None,
+                                    Some(arg),
+                                ));
                             }
                             spans_idx += 1;
                         } else {
@@ -1112,29 +1084,27 @@ pub fn parse_internal_call(
                         }
                     } else if flag.long.is_empty() {
                         if let Some(short) = flag.short {
-                            let named = Spanned {
-                                item: String::new(),
-                                span: spans[spans_idx],
-                            };
-                            let short = Some(Spanned {
-                                item: short.to_string(),
-                                span: spans[spans_idx],
-                            });
-                            let expr = None;
-                            let named_span = named_arg_span(working_set, &named, &short, &expr);
-                            let named_span_id = working_set.add_span(named_span);
-                            call.add_named((named, short, expr, named_span_id));
+                            call.add_named((
+                                Spanned {
+                                    item: String::new(),
+                                    span: spans[spans_idx],
+                                },
+                                Some(Spanned {
+                                    item: short.to_string(),
+                                    span: spans[spans_idx],
+                                }),
+                                None,
+                            ));
                         }
                     } else {
-                        let named = Spanned {
-                            item: flag.long.clone(),
-                            span: spans[spans_idx],
-                        };
-                        let short = None;
-                        let expr = None;
-                        let named_span = named_arg_span(working_set, &named, &short, &expr);
-                        let named_span_id = working_set.add_span(named_span);
-                        call.add_named((named, short, expr, named_span_id));
+                        call.add_named((
+                            Spanned {
+                                item: flag.long.clone(),
+                                span: spans[spans_idx],
+                            },
+                            None,
+                            None,
+                        ));
                     }
                 }
             }
@@ -1214,13 +1184,12 @@ pub fn parse_internal_call(
             );
 
             let arg = if !type_compatible(&positional.shape.to_type(), &arg.ty) {
-                let arg_ty = arg.ty.clone();
                 working_set.error(ParseError::TypeMismatch(
                     positional.shape.to_type(),
-                    arg_ty,
-                    arg.span(working_set),
+                    arg.ty,
+                    arg.span,
                 ));
-                Expression::garbage(working_set, arg.span(working_set))
+                Expression::garbage(working_set, arg.span)
             } else {
                 arg
             };
@@ -1342,7 +1311,7 @@ pub fn parse_call(working_set: &mut StateWorkingSet, spans: &[Span], head: Span)
                 trace!("parsing: alias of external call");
 
                 let mut head = head.clone();
-                head.span_id = working_set.add_span(spans[0]); // replacing the spans preserves syntax highlighting
+                head.span = spans[0]; // replacing the spans preserves syntax highlighting
 
                 let mut final_args = args.clone().into_vec();
                 for arg_span in &spans[1..] {
@@ -3037,15 +3006,13 @@ pub fn parse_import_pattern(working_set: &mut StateWorkingSet, spans: &[Span]) -
                     for item in list {
                         match item {
                             ListItem::Item(expr) => {
-                                let contents =
-                                    working_set.get_span_contents(expr.span(working_set));
-                                output
-                                    .push((trim_quotes(contents).to_vec(), expr.span(working_set)));
+                                let contents = working_set.get_span_contents(expr.span);
+                                output.push((trim_quotes(contents).to_vec(), expr.span));
                             }
                             ListItem::Spread(_, spread) => {
                                 working_set.error(ParseError::WrongImportPattern(
                                     "cannot spread in an import pattern".into(),
-                                    spread.span(working_set),
+                                    spread.span,
                                 ))
                             }
                         }
@@ -3055,7 +3022,7 @@ pub fn parse_import_pattern(working_set: &mut StateWorkingSet, spans: &[Span]) -
                         .members
                         .push(ImportPatternMember::List { names: output });
                 } else {
-                    working_set.error(ParseError::ExportNotFound(result.span(working_set)));
+                    working_set.error(ParseError::ExportNotFound(result.span));
                     return Expression::new(
                         working_set,
                         Expr::ImportPattern(Box::new(import_pattern)),
@@ -3812,7 +3779,7 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
                                                             format!(
                                                             "expected default value to be `{var_type}`"
                                                         ),
-                                                            expression.span(working_set),
+                                                            expression.span,
                                                         ),
                                                     )
                                                 }
@@ -3825,7 +3792,7 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
                                             Some(constant)
                                         } else {
                                             working_set.error(ParseError::NonConstantDefaultValue(
-                                                expression.span(working_set),
+                                                expression.span,
                                             ));
                                             None
                                         };
@@ -3839,7 +3806,7 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
                                         working_set.error(ParseError::AssignmentMismatch(
                                             "Rest parameter was given a default value".into(),
                                             "can't have default value".into(),
-                                            expression.span(working_set),
+                                            expression.span,
                                         ))
                                     }
                                     Arg::Flag {
@@ -3852,7 +3819,7 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
                                             },
                                         type_annotated,
                                     } => {
-                                        let expression_span = expression.span(working_set);
+                                        let expression_span = expression.span;
 
                                         *default_value = if let Ok(value) =
                                             eval_constant(working_set, &expression)
@@ -4098,7 +4065,7 @@ fn parse_table_row(
     list.into_iter()
         .map(|item| match item {
             ListItem::Item(expr) => Ok(expr),
-            ListItem::Spread(_, spread) => Err(spread.span(working_set)),
+            ListItem::Spread(_, spread) => Err(spread.span),
         })
         .collect::<Result<_, _>>()
         .map(|exprs| (exprs, span))
@@ -4173,7 +4140,7 @@ fn parse_table_expression(working_set: &mut StateWorkingSet, span: Span) -> Expr
                                     }
                                     Ordering::Greater => {
                                         let span = {
-                                            let start = list[head.len()].span(working_set).start;
+                                            let start = list[head.len()].span.start;
                                             let end = span.end;
                                             Span::new(start, end)
                                         };
@@ -4212,7 +4179,7 @@ fn parse_table_expression(working_set: &mut StateWorkingSet, span: Span) -> Expr
     };
 
     let ty = if working_set.parse_errors.len() == errors {
-        let (ty, errs) = table_type(working_set, &head, &rows);
+        let (ty, errs) = table_type(&head, &rows);
         working_set.parse_errors.extend(errs);
         ty
     } else {
@@ -4227,11 +4194,7 @@ fn parse_table_expression(working_set: &mut StateWorkingSet, span: Span) -> Expr
     Expression::new(working_set, Expr::Table(table), span, ty)
 }
 
-fn table_type(
-    working_set: &StateWorkingSet,
-    head: &[Expression],
-    rows: &[Vec<Expression>],
-) -> (Type, Vec<ParseError>) {
+fn table_type(head: &[Expression], rows: &[Vec<Expression>]) -> (Type, Vec<ParseError>) {
     let mut errors = vec![];
     let mut rows = rows.to_vec();
     let mut mk_ty = || -> Type {
@@ -4261,7 +4224,7 @@ fn table_type(
             if let Some(str) = expr.as_string() {
                 str
             } else {
-                errors.push(mk_error(expr.span(&working_set)));
+                errors.push(mk_error(expr.span));
                 String::from("{ column }")
             }
         })
@@ -5152,7 +5115,7 @@ pub fn parse_math_expression(
                 working_set.error(err);
             }
 
-            let op_span = Span::append(lhs.span(working_set), rhs.span(working_set));
+            let op_span = Span::append(lhs.span, rhs.span);
             expr_stack.push(Expression::new(
                 working_set,
                 Expr::BinaryOp(Box::new(lhs), Box::new(op), Box::new(rhs)),
@@ -5188,7 +5151,7 @@ pub fn parse_math_expression(
             working_set.error(err)
         }
 
-        let binary_op_span = Span::append(lhs.span(working_set), rhs.span(working_set));
+        let binary_op_span = Span::append(lhs.span, rhs.span);
         expr_stack.push(Expression::new(
             working_set,
             Expr::BinaryOp(Box::new(lhs), Box::new(op), Box::new(rhs)),
@@ -5369,10 +5332,7 @@ pub fn parse_expression(working_set: &mut StateWorkingSet, spans: &[Span]) -> Ex
             let expr = Expr::Call(Box::new(Call {
                 head: Span::unknown(),
                 decl_id,
-                arguments: Spanned {
-                    item: arguments,
-                    span: Span::concat(spans),
-                },
+                arguments,
                 parser_info: HashMap::new(),
             }));
 
@@ -6134,7 +6094,7 @@ pub fn discover_captures_in_expr(
                 }
             }
 
-            for arg in &call.arguments.item {
+            for arg in &call.arguments {
                 match arg {
                     Argument::Named(named) => {
                         if let Some(arg) = &named.2 {
@@ -6289,7 +6249,7 @@ pub fn discover_captures_in_expr(
         }
         Expr::Var(var_id) => {
             if (*var_id > ENV_VARIABLE_ID || *var_id == IN_VARIABLE_ID) && !seen.contains(var_id) {
-                output.push((*var_id, expr.span(&working_set)));
+                output.push((*var_id, expr.span));
             }
         }
         Expr::VarDecl(var_id) => {
@@ -6334,7 +6294,7 @@ fn wrap_element_with_collect(
 }
 
 fn wrap_expr_with_collect(working_set: &mut StateWorkingSet, expr: &Expression) -> Expression {
-    let span = expr.span(working_set);
+    let span = expr.span;
 
     if let Some(decl_id) = working_set.find_decl(b"collect") {
         let mut output = vec![];
@@ -6364,15 +6324,14 @@ fn wrap_expr_with_collect(working_set: &mut StateWorkingSet, expr: &Expression)
             Type::Any,
         )));
 
-        let named = Spanned {
-            item: "keep-env".to_string(),
-            span: Span::unknown(),
-        };
-        let short = None;
-        let expr = None;
-        let named_span = named_arg_span(working_set, &named, &short, &expr);
-        let named_span_id = working_set.add_span(named_span);
-        output.push(Argument::Named((named, short, expr, named_span_id)));
+        output.push(Argument::Named((
+            Spanned {
+                item: "keep-env".to_string(),
+                span: Span::new(0, 0),
+            },
+            None,
+            None,
+        )));
 
         // The containing, synthetic call to `collect`.
         // We don't want to have a real span as it will confuse flattening
@@ -6380,11 +6339,8 @@ fn wrap_expr_with_collect(working_set: &mut StateWorkingSet, expr: &Expression)
         Expression::new(
             working_set,
             Expr::Call(Box::new(Call {
-                head: Span::unknown(),
-                arguments: Spanned {
-                    item: output,
-                    span: Span::unknown(),
-                },
+                head: Span::new(0, 0),
+                arguments: output,
                 decl_id,
                 parser_info: HashMap::new(),
             })),
diff --git a/crates/nu-parser/tests/test_parser.rs b/crates/nu-parser/tests/test_parser.rs
index da3cfbf9fd..0784fe69d4 100644
--- a/crates/nu-parser/tests/test_parser.rs
+++ b/crates/nu-parser/tests/test_parser.rs
@@ -598,12 +598,9 @@ pub fn parse_call_short_flag_batch_arg_allowed() {
 
     if let Expr::Call(call) = &element.expr.expr {
         assert_eq!(call.decl_id, 0);
-        assert_eq!(call.arguments.item.len(), 2);
-        matches!(call.arguments.item[0], Argument::Named((_, None, None, _)));
-        matches!(
-            call.arguments.item[1],
-            Argument::Named((_, None, Some(_), _))
-        );
+        assert_eq!(call.arguments.len(), 2);
+        matches!(call.arguments[0], Argument::Named((_, None, None)));
+        matches!(call.arguments[1], Argument::Named((_, None, Some(_))));
     }
 }
 
@@ -2153,7 +2150,7 @@ mod input_types {
         assert!(pipeline.elements[3].redirection.is_none());
         match &pipeline.elements[3].expr.expr {
             Expr::Call(call) => {
-                let arg = &call.arguments.item[0];
+                let arg = &call.arguments[0];
                 match arg {
                     Argument::Positional(a) => match &a.expr {
                         Expr::FullCellPath(path) => match &path.head.expr {
@@ -2350,92 +2347,3 @@ mod operator {
         );
     }
 }
-
-#[cfg(test)]
-mod test {
-    use nu_parser::named_arg_span;
-    use nu_protocol::ast::{Argument, Call, Expression};
-    use nu_protocol::engine::{EngineState, StateWorkingSet};
-    use nu_protocol::{Span, Spanned};
-
-    #[test]
-    fn argument_span_named() {
-        let engine_state = EngineState::new();
-        let mut working_set = StateWorkingSet::new(&engine_state);
-
-        let named_span = Span::new(2, 3);
-        let short_span = Span::new(5, 7);
-        let expr_span = Span::new(11, 13);
-
-        let _ = working_set.add_span(named_span);
-        let _ = working_set.add_span(short_span);
-        let _ = working_set.add_span(expr_span);
-
-        let named = Spanned {
-            item: "named".to_string(),
-            span: named_span,
-        };
-        let short = Spanned {
-            item: "short".to_string(),
-            span: short_span,
-        };
-        let expr = Expression::garbage(&mut working_set, expr_span);
-
-        let arg_span = named_arg_span(&working_set, &named, &None, &None);
-        assert_eq!(Span::new(2, 3), arg_span);
-
-        let arg_span = named_arg_span(&working_set, &named, &Some(short.clone()), &None);
-        assert_eq!(Span::new(2, 7), arg_span);
-
-        let arg_span = named_arg_span(&working_set, &named, &None, &Some(expr.clone()));
-        assert_eq!(Span::new(2, 13), arg_span);
-
-        let arg_span = named_arg_span(
-            &working_set,
-            &named,
-            &Some(short.clone()),
-            &Some(expr.clone()),
-        );
-        assert_eq!(Span::new(2, 13), arg_span);
-    }
-
-    #[test]
-    fn argument_span_positional() {
-        let engine_state = EngineState::new();
-        let mut working_set = StateWorkingSet::new(&engine_state);
-
-        let span = Span::new(2, 3);
-        let _ = working_set.add_span(span);
-        let expr = Expression::garbage(&mut working_set, span);
-        let arg = Argument::Positional(expr);
-
-        assert_eq!(span, arg.span(&working_set));
-    }
-
-    #[test]
-    fn argument_span_unknown() {
-        let engine_state = EngineState::new();
-        let mut working_set = StateWorkingSet::new(&engine_state);
-
-        let span = Span::new(2, 3);
-        let _ = working_set.add_span(span);
-        let expr = Expression::garbage(&mut working_set, span);
-        let arg = Argument::Unknown(expr);
-
-        assert_eq!(span, arg.span(&working_set));
-    }
-
-    #[test]
-    fn call_arguments_span() {
-        let engine_state = EngineState::new();
-        let mut working_set = StateWorkingSet::new(&engine_state);
-
-        let arg1_span = Span::new(2, 3);
-        let arg2_span = Span::new(5, 7);
-        let mut call = Call::new(Span::new(0, 1), Span::concat(&[arg1_span, arg2_span]));
-        call.add_positional(Expression::garbage(&mut working_set, arg1_span));
-        call.add_positional(Expression::garbage(&mut working_set, arg2_span));
-
-        assert_eq!(Span::new(2, 7), call.arguments_span());
-    }
-}
diff --git a/crates/nu-plugin-protocol/src/evaluated_call.rs b/crates/nu-plugin-protocol/src/evaluated_call.rs
index 1aa0ded2bf..19f9049340 100644
--- a/crates/nu-plugin-protocol/src/evaluated_call.rs
+++ b/crates/nu-plugin-protocol/src/evaluated_call.rs
@@ -34,12 +34,11 @@ impl EvaluatedCall {
         stack: &mut Stack,
         eval_expression_fn: fn(&EngineState, &mut Stack, &Expression) -> Result<Value, ShellError>,
     ) -> Result<Self, ShellError> {
-        let positional = call.rest_iter_flattened(&engine_state, 0, |expr| {
-            eval_expression_fn(engine_state, stack, expr)
-        })?;
+        let positional =
+            call.rest_iter_flattened(0, |expr| eval_expression_fn(engine_state, stack, expr))?;
 
         let mut named = Vec::with_capacity(call.named_len());
-        for (string, _, expr, _) in call.named_iter() {
+        for (string, _, expr) in call.named_iter() {
             let value = match expr {
                 None => None,
                 Some(expr) => Some(eval_expression_fn(engine_state, stack, expr)?),
diff --git a/crates/nu-protocol/src/ast/call.rs b/crates/nu-protocol/src/ast/call.rs
index bc1c163e4f..6e8cc64a05 100644
--- a/crates/nu-protocol/src/ast/call.rs
+++ b/crates/nu-protocol/src/ast/call.rs
@@ -4,47 +4,42 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     ast::Expression, engine::StateWorkingSet, eval_const::eval_constant, DeclId, FromValue,
-    GetSpan, ShellError, Span, SpanId, Spanned, Value,
+    ShellError, Span, Spanned, Value,
 };
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub enum Argument {
     Positional(Expression),
-    Named(
-        (
-            Spanned<String>,
-            Option<Spanned<String>>,
-            Option<Expression>,
-            SpanId,
-        ),
-    ),
+    Named((Spanned<String>, Option<Spanned<String>>, Option<Expression>)),
     Unknown(Expression), // unknown argument used in "fall-through" signatures
     Spread(Expression),  // a list spread to fill in rest arguments
 }
 
 impl Argument {
-    pub fn span_id(&self) -> SpanId {
-        match self {
-            Argument::Positional(e) => e.span_id,
-            Argument::Named((_, _, _, span_id)) => *span_id,
-            Argument::Unknown(e) => e.span_id,
-            Argument::Spread(e) => e.span_id,
-        }
-    }
-
     /// The span for an argument
-    pub fn span(&self, state: &impl GetSpan) -> Span {
+    pub fn span(&self) -> Span {
         match self {
-            Argument::Positional(e) => e.span(state),
-            Argument::Named((_, _, _, span_id)) => state.get_span(*span_id),
-            Argument::Unknown(e) => e.span(state),
-            Argument::Spread(e) => e.span(state),
+            Argument::Positional(e) => e.span,
+            Argument::Named((named, short, expr)) => {
+                let start = named.span.start;
+                let end = if let Some(expr) = expr {
+                    expr.span.end
+                } else if let Some(short) = short {
+                    short.span.end
+                } else {
+                    named.span.end
+                };
+
+                Span::new(start, end)
+            }
+            Argument::Unknown(e) => e.span,
+            Argument::Spread(e) => e.span,
         }
     }
 
     pub fn expr(&self) -> Option<&Expression> {
         match self {
-            Argument::Named((_, _, expr, _)) => expr.as_ref(),
+            Argument::Named((_, _, expr)) => expr.as_ref(),
             Argument::Positional(expr) | Argument::Unknown(expr) | Argument::Spread(expr) => {
                 Some(expr)
             }
@@ -63,20 +58,17 @@ pub struct Call {
     /// identifier of the declaration to call
     pub decl_id: DeclId,
     pub head: Span,
-    pub arguments: Spanned<Vec<Argument>>,
+    pub arguments: Vec<Argument>,
     /// this field is used by the parser to pass additional command-specific information
     pub parser_info: HashMap<String, Expression>,
 }
 
 impl Call {
-    pub fn new(head: Span, args_span: Span) -> Call {
+    pub fn new(head: Span) -> Call {
         Self {
             decl_id: 0,
             head,
-            arguments: Spanned {
-                item: vec![],
-                span: args_span,
-            },
+            arguments: vec![],
             parser_info: HashMap::new(),
         }
     }
@@ -88,20 +80,23 @@ impl Call {
     /// If there are one or more arguments the span encompasses the start of the first argument to
     /// end of the last argument
     pub fn arguments_span(&self) -> Span {
-        self.arguments.span
+        let past = self.head.past();
+
+        let start = self
+            .arguments
+            .first()
+            .map(|a| a.span())
+            .unwrap_or(past)
+            .start;
+        let end = self.arguments.last().map(|a| a.span()).unwrap_or(past).end;
+
+        Span::new(start, end)
     }
 
     pub fn named_iter(
         &self,
-    ) -> impl Iterator<
-        Item = &(
-            Spanned<String>,
-            Option<Spanned<String>>,
-            Option<Expression>,
-            SpanId,
-        ),
-    > {
-        self.arguments.item.iter().filter_map(|arg| match arg {
+    ) -> impl Iterator<Item = &(Spanned<String>, Option<Spanned<String>>, Option<Expression>)> {
+        self.arguments.iter().filter_map(|arg| match arg {
             Argument::Named(named) => Some(named),
             Argument::Positional(_) => None,
             Argument::Unknown(_) => None,
@@ -111,15 +106,9 @@ impl Call {
 
     pub fn named_iter_mut(
         &mut self,
-    ) -> impl Iterator<
-        Item = &mut (
-            Spanned<String>,
-            Option<Spanned<String>>,
-            Option<Expression>,
-            SpanId,
-        ),
-    > {
-        self.arguments.item.iter_mut().filter_map(|arg| match arg {
+    ) -> impl Iterator<Item = &mut (Spanned<String>, Option<Spanned<String>>, Option<Expression>)>
+    {
+        self.arguments.iter_mut().filter_map(|arg| match arg {
             Argument::Named(named) => Some(named),
             Argument::Positional(_) => None,
             Argument::Unknown(_) => None,
@@ -133,31 +122,25 @@ impl Call {
 
     pub fn add_named(
         &mut self,
-        named: (
-            Spanned<String>,
-            Option<Spanned<String>>,
-            Option<Expression>,
-            SpanId,
-        ),
+        named: (Spanned<String>, Option<Spanned<String>>, Option<Expression>),
     ) {
-        self.arguments.item.push(Argument::Named(named));
+        self.arguments.push(Argument::Named(named));
     }
 
     pub fn add_positional(&mut self, positional: Expression) {
-        self.arguments.item.push(Argument::Positional(positional));
+        self.arguments.push(Argument::Positional(positional));
     }
 
     pub fn add_unknown(&mut self, unknown: Expression) {
-        self.arguments.item.push(Argument::Unknown(unknown));
+        self.arguments.push(Argument::Unknown(unknown));
     }
 
     pub fn add_spread(&mut self, args: Expression) {
-        self.arguments.item.push(Argument::Spread(args));
+        self.arguments.push(Argument::Spread(args));
     }
 
     pub fn positional_iter(&self) -> impl Iterator<Item = &Expression> {
         self.arguments
-            .item
             .iter()
             .take_while(|arg| match arg {
                 Argument::Spread(_) => false, // Don't include positional arguments given to rest parameter
@@ -185,7 +168,6 @@ impl Call {
         // todo maybe rewrite to be more elegant or something
         let args = self
             .arguments
-            .item
             .iter()
             .filter_map(|arg| match arg {
                 Argument::Named(_) => None,
@@ -276,9 +258,9 @@ impl Call {
     ) -> Result<Vec<T>, ShellError> {
         let mut output = vec![];
 
-        for result in self.rest_iter_flattened(&working_set, starting_pos, |expr| {
-            eval_constant(working_set, expr)
-        })? {
+        for result in
+            self.rest_iter_flattened(starting_pos, |expr| eval_constant(working_set, expr))?
+        {
             output.push(FromValue::from_value(result)?);
         }
 
@@ -287,7 +269,6 @@ impl Call {
 
     pub fn rest_iter_flattened<F>(
         &self,
-        state: &impl GetSpan,
         start: usize,
         mut eval: F,
     ) -> Result<Vec<Value>, ShellError>
@@ -301,11 +282,7 @@ impl Call {
             if spread {
                 match result {
                     Value::List { mut vals, .. } => output.append(&mut vals),
-                    _ => {
-                        return Err(ShellError::CannotSpreadAsList {
-                            span: expr.span(state),
-                        })
-                    }
+                    _ => return Err(ShellError::CannotSpreadAsList { span: expr.span }),
                 }
             } else {
                 output.push(result);
@@ -333,23 +310,23 @@ impl Call {
         }
     }
 
-    pub fn span(&self, state: &impl GetSpan) -> Span {
+    pub fn span(&self) -> Span {
         let mut span = self.head;
 
         for positional in self.positional_iter() {
-            if positional.span(state).end > span.end {
-                span.end = positional.span(state).end;
+            if positional.span.end > span.end {
+                span.end = positional.span.end;
             }
         }
 
-        for (named, _, val, _) in self.named_iter() {
+        for (named, _, val) in self.named_iter() {
             if named.span.end > span.end {
                 span.end = named.span.end;
             }
 
             if let Some(val) = &val {
-                if val.span(state).end > span.end {
-                    span.end = val.span(state).end;
+                if val.span.end > span.end {
+                    span.end = val.span.end;
                 }
             }
         }
@@ -357,3 +334,77 @@ impl Call {
         span
     }
 }
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::engine::EngineState;
+
+    #[test]
+    fn argument_span_named() {
+        let engine_state = EngineState::new();
+        let mut working_set = StateWorkingSet::new(&engine_state);
+
+        let named = Spanned {
+            item: "named".to_string(),
+            span: Span::new(2, 3),
+        };
+        let short = Spanned {
+            item: "short".to_string(),
+            span: Span::new(5, 7),
+        };
+        let expr = Expression::garbage(&mut working_set, Span::new(11, 13));
+
+        let arg = Argument::Named((named.clone(), None, None));
+
+        assert_eq!(Span::new(2, 3), arg.span());
+
+        let arg = Argument::Named((named.clone(), Some(short.clone()), None));
+
+        assert_eq!(Span::new(2, 7), arg.span());
+
+        let arg = Argument::Named((named.clone(), None, Some(expr.clone())));
+
+        assert_eq!(Span::new(2, 13), arg.span());
+
+        let arg = Argument::Named((named.clone(), Some(short.clone()), Some(expr.clone())));
+
+        assert_eq!(Span::new(2, 13), arg.span());
+    }
+
+    #[test]
+    fn argument_span_positional() {
+        let engine_state = EngineState::new();
+        let mut working_set = StateWorkingSet::new(&engine_state);
+
+        let span = Span::new(2, 3);
+        let expr = Expression::garbage(&mut working_set, span);
+        let arg = Argument::Positional(expr);
+
+        assert_eq!(span, arg.span());
+    }
+
+    #[test]
+    fn argument_span_unknown() {
+        let engine_state = EngineState::new();
+        let mut working_set = StateWorkingSet::new(&engine_state);
+
+        let span = Span::new(2, 3);
+        let expr = Expression::garbage(&mut working_set, span);
+        let arg = Argument::Unknown(expr);
+
+        assert_eq!(span, arg.span());
+    }
+
+    #[test]
+    fn call_arguments_span() {
+        let engine_state = EngineState::new();
+        let mut working_set = StateWorkingSet::new(&engine_state);
+
+        let mut call = Call::new(Span::new(0, 1));
+        call.add_positional(Expression::garbage(&mut working_set, Span::new(2, 3)));
+        call.add_positional(Expression::garbage(&mut working_set, Span::new(5, 7)));
+
+        assert_eq!(Span::new(2, 7), call.arguments_span());
+    }
+}
diff --git a/crates/nu-protocol/src/ast/expression.rs b/crates/nu-protocol/src/ast/expression.rs
index e03f7e81e9..040e140cab 100644
--- a/crates/nu-protocol/src/ast/expression.rs
+++ b/crates/nu-protocol/src/ast/expression.rs
@@ -173,7 +173,7 @@ impl Expression {
             Expr::Binary(_) => false,
             Expr::Bool(_) => false,
             Expr::Call(call) => {
-                for arg in &call.arguments.item {
+                for arg in &call.arguments {
                     match arg {
                         Argument::Positional(expr)
                         | Argument::Unknown(expr)
@@ -366,7 +366,7 @@ impl Expression {
                 if replaced.contains_span(call.head) {
                     call.head = new_span;
                 }
-                for arg in call.arguments.item.iter_mut() {
+                for arg in call.arguments.iter_mut() {
                     match arg {
                         Argument::Positional(expr)
                         | Argument::Unknown(expr)
diff --git a/crates/nu-protocol/src/engine/state_working_set.rs b/crates/nu-protocol/src/engine/state_working_set.rs
index 61fd5982a2..af950b8321 100644
--- a/crates/nu-protocol/src/engine/state_working_set.rs
+++ b/crates/nu-protocol/src/engine/state_working_set.rs
@@ -1023,32 +1023,16 @@ impl<'a> StateWorkingSet<'a> {
 
 impl<'a> GetSpan for &'a StateWorkingSet<'a> {
     fn get_span(&self, span_id: SpanId) -> Span {
-        get_span(self, span_id)
-    }
-}
-
-impl<'a> GetSpan for &'a mut StateWorkingSet<'a> {
-    fn get_span(&self, span_id: SpanId) -> Span {
-        get_span(self, span_id)
-    }
-}
-
-impl<'a> GetSpan for StateWorkingSet<'a> {
-    fn get_span(&self, span_id: SpanId) -> Span {
-        get_span(self, span_id)
-    }
-}
-
-fn get_span(working_set: &StateWorkingSet, span_id: SpanId) -> Span {
-    let num_permanent_spans = working_set.permanent_state.num_spans();
-    if span_id.0 < num_permanent_spans {
-        working_set.permanent_state.get_span(span_id)
-    } else {
-        *working_set
-            .delta
-            .spans
-            .get(span_id.0 - num_permanent_spans)
-            .expect("internal error: missing span")
+        let num_permanent_spans = self.permanent_state.num_spans();
+        if span_id.0 < num_permanent_spans {
+            self.permanent_state.get_span(span_id)
+        } else {
+            *self
+                .delta
+                .spans
+                .get(span_id.0 - num_permanent_spans)
+                .expect("internal error: missing span")
+        }
     }
 }
 
diff --git a/crates/nu-protocol/src/eval_const.rs b/crates/nu-protocol/src/eval_const.rs
index 0b0859c23b..87913e4ee3 100644
--- a/crates/nu-protocol/src/eval_const.rs
+++ b/crates/nu-protocol/src/eval_const.rs
@@ -301,7 +301,7 @@ fn eval_const_call(
         return Err(ShellError::NotAConstCommand { span: call.head });
     }
 
-    if !decl.is_known_external() && call.named_iter().any(|(flag, _, _, _)| flag.item == "help") {
+    if !decl.is_known_external() && call.named_iter().any(|(flag, _, _)| flag.item == "help") {
         // It would require re-implementing get_full_help() for const evaluation. Assuming that
         // getting help messages at parse-time is rare enough, we can simply disallow it.
         return Err(ShellError::NotAConstHelp { span: call.head });
diff --git a/crates/nu-protocol/src/pipeline/pipeline_data.rs b/crates/nu-protocol/src/pipeline/pipeline_data.rs
index 7d971fb518..03fbc64d21 100644
--- a/crates/nu-protocol/src/pipeline/pipeline_data.rs
+++ b/crates/nu-protocol/src/pipeline/pipeline_data.rs
@@ -567,7 +567,7 @@ impl PipelineData {
                     if command.block_id().is_some() {
                         self.write_all_and_flush(engine_state, no_newline, to_stderr)
                     } else {
-                        let call = Call::new(Span::unknown(), Span::unknown());
+                        let call = Call::new(Span::new(0, 0));
                         let table = command.run(engine_state, stack, &call, self)?;
                         table.write_all_and_flush(engine_state, no_newline, to_stderr)
                     }

From d5e00c0d5d30516d4f43989ceda6325512892b9c Mon Sep 17 00:00:00 2001
From: Sang-Heon Jeon <ekffu200098@gmail.com>
Date: Fri, 5 Jul 2024 00:44:12 +0900
Subject: [PATCH 0177/1072] Support default offset with dateformat option
 (#13289)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
Fixes #13280. After apply this patch, we can use non-timezone string +
format option `into datetime` cmd

# User-Facing Changes
AS-IS (before fixing)
```
$ "09.02.2024 11:06:11" | into datetime --format '%m.%d.%Y %T'
Error: nu::shell::cant_convert

  × Can't convert to could not parse as datetime using format '%m.%d.%Y %T'.
   ╭─[entry #1:1:25]
 1 │ "09.02.2024 11:06:11" | into datetime --format '%m.%d.%Y %T'
   ·                         ──────┬──────
   ·                               ╰── can't convert input is not enough for unique date and time to could not parse as datetime using format '%m.%d.%Y %T'
   ╰────
  help: you can use `into datetime` without a format string to enable flexible parsing

$ "09.02.2024 11:06:11" | into datetime
Mon, 2 Sep 2024 11:06:11 +0900 (in 2 months)
```

TO-BE(After fixing)

```
$ "09.02.2024 11:06:11" | into datetime --format '%m.%d.%Y %T'
Mon, 2 Sep 2024 20:06:11 +0900 (in 2 months)

$ "09.02.2024 11:06:11" | into datetime
Mon, 2 Sep 2024 11:06:11 +0900 (in 2 months)
```


# Tests + Formatting
If there is agreement on the direction, I will add a test.

# After Submitting

---------

Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
---
 .../src/conversions/into/datetime.rs          | 62 ++++++++++++++++---
 1 file changed, 53 insertions(+), 9 deletions(-)

diff --git a/crates/nu-command/src/conversions/into/datetime.rs b/crates/nu-command/src/conversions/into/datetime.rs
index af10732aea..b928bebe23 100644
--- a/crates/nu-command/src/conversions/into/datetime.rs
+++ b/crates/nu-command/src/conversions/into/datetime.rs
@@ -1,5 +1,5 @@
 use crate::{generate_strftime_list, parse_date_from_string};
-use chrono::{DateTime, FixedOffset, Local, NaiveTime, TimeZone, Utc};
+use chrono::{DateTime, FixedOffset, Local, NaiveDateTime, NaiveTime, TimeZone, Utc};
 use human_date_parser::{from_human_time, ParseResult};
 use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
@@ -162,24 +162,37 @@ impl Command for SubCommand {
         };
         vec![
             Example {
-                description: "Convert any standard timestamp string to datetime",
+                description: "Convert timestamp string to datetime with timezone offset",
                 example: "'27.02.2021 1:55 pm +0000' | into datetime",
                 #[allow(clippy::inconsistent_digit_grouping)]
                 result: example_result_1(1614434100_000000000),
             },
             Example {
-                description: "Convert any standard timestamp string to datetime",
+                description: "Convert standard timestamp string to datetime with timezone offset",
                 example: "'2021-02-27T13:55:40.2246+00:00' | into datetime",
                 #[allow(clippy::inconsistent_digit_grouping)]
                 result: example_result_1(1614434140_224600000),
             },
             Example {
                 description:
-                    "Convert non-standard timestamp string to datetime using a custom format",
+                    "Convert non-standard timestamp string, with timezone offset, to datetime using a custom format",
                 example: "'20210227_135540+0000' | into datetime --format '%Y%m%d_%H%M%S%z'",
                 #[allow(clippy::inconsistent_digit_grouping)]
                 result: example_result_1(1614434140_000000000),
             },
+            Example {
+                description: "Convert non-standard timestamp string, without timezone offset, to datetime with custom formatting",
+                example: "'16.11.1984 8:00 am' | into datetime --format '%d.%m.%Y %H:%M %P'",
+                #[allow(clippy::inconsistent_digit_grouping)]
+                result: Some(Value::date(
+                    DateTime::from_naive_utc_and_offset(
+                        NaiveDateTime::parse_from_str("16.11.1984 8:00 am", "%d.%m.%Y %H:%M %P")
+                        .expect("date calculation should not fail in test"),
+                        *Local::now().offset(),
+                    ),
+                    Span::test_data(),
+                )),
+            },
             Example {
                 description:
                     "Convert nanosecond-precision unix timestamp to a datetime with offset from UTC",
@@ -372,10 +385,21 @@ fn action(input: &Value, args: &Arguments, head: Span) -> Value {
                 Some(dt) => match DateTime::parse_from_str(val, &dt.0) {
                     Ok(d) => Value::date ( d, head ),
                     Err(reason) => {
-                        Value::error (
-                            ShellError::CantConvert { to_type: format!("could not parse as datetime using format '{}'", dt.0), from_type: reason.to_string(), span: head, help: Some("you can use `into datetime` without a format string to enable flexible parsing".to_string()) },
-                            head,
-                        )
+                        match NaiveDateTime::parse_from_str(val, &dt.0) {
+                            Ok(d) => Value::date (
+                                DateTime::from_naive_utc_and_offset(
+                                    d,
+                                    *Local::now().offset(),
+                                ),
+                                head,
+                            ),
+                            Err(_) => {
+                                Value::error (
+                                    ShellError::CantConvert { to_type: format!("could not parse as datetime using format '{}'", dt.0), from_type: reason.to_string(), span: head, help: Some("you can use `into datetime` without a format string to enable flexible parsing".to_string()) },
+                                    head,
+                                )
+                            }
+                        }
                     }
                 },
 
@@ -457,7 +481,7 @@ mod tests {
     }
 
     #[test]
-    fn takes_a_date_format() {
+    fn takes_a_date_format_with_timezone() {
         let date_str = Value::test_string("16.11.1984 8:00 am +0000");
         let fmt_options = Some(DatetimeFormat("%d.%m.%Y %H:%M %P %z".to_string()));
         let args = Arguments {
@@ -473,6 +497,26 @@ mod tests {
         assert_eq!(actual, expected)
     }
 
+    #[test]
+    fn takes_a_date_format_without_timezone() {
+        let date_str = Value::test_string("16.11.1984 8:00 am");
+        let fmt_options = Some(DatetimeFormat("%d.%m.%Y %H:%M %P".to_string()));
+        let args = Arguments {
+            zone_options: None,
+            format_options: fmt_options,
+            cell_paths: None,
+        };
+        let actual = action(&date_str, &args, Span::test_data());
+        let expected = Value::date(
+            DateTime::from_naive_utc_and_offset(
+                NaiveDateTime::parse_from_str("16.11.1984 8:00 am", "%d.%m.%Y %H:%M %P").unwrap(),
+                *Local::now().offset(),
+            ),
+            Span::test_data(),
+        );
+        assert_eq!(actual, expected)
+    }
+
     #[test]
     fn takes_iso8601_date_format() {
         let date_str = Value::test_string("2020-08-04T16:39:18+00:00");

From 8833d3f89f114f3fdfaa4022e35153e9d167921c Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Fri, 5 Jul 2024 07:16:03 -0500
Subject: [PATCH 0178/1072] change duration mod duration to duration instead of
 float (#13300)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

closes #13298 so that duration mod duration / duration = duration

### Before
```nushell
(92sec mod 1min) / 1sec
Error: nu::parser::unsupported_operation

  × division is not supported between float and duration.
   ╭─[entry #5:1:1]
 1 │ (92sec mod 1min) / 1sec
   · ────────┬─────── ┬ ──┬─
   ·         │        │   ╰── duration
   ·         │        ╰── doesn't support these values
   ·         ╰── float
   ╰────
```
### After
```nushell
❯ (92sec mod 1min) / 1sec
32
```

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-parser/src/type_check.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-parser/src/type_check.rs b/crates/nu-parser/src/type_check.rs
index 1c76afb621..872bb6a94c 100644
--- a/crates/nu-parser/src/type_check.rs
+++ b/crates/nu-parser/src/type_check.rs
@@ -292,7 +292,7 @@ pub fn math_result_type(
                 (Type::Filesize, Type::Filesize) => (Type::Float, None),
                 (Type::Filesize, Type::Int) => (Type::Filesize, None),
                 (Type::Filesize, Type::Float) => (Type::Filesize, None),
-                (Type::Duration, Type::Duration) => (Type::Float, None),
+                (Type::Duration, Type::Duration) => (Type::Duration, None),
                 (Type::Duration, Type::Int) => (Type::Duration, None),
                 (Type::Duration, Type::Float) => (Type::Duration, None),
 

From afaa019faeb67f7f501b51682dd5551385d68c72 Mon Sep 17 00:00:00 2001
From: Himadri Bhattacharjee <107522312+lavafroth@users.noreply.github.com>
Date: Fri, 5 Jul 2024 17:46:21 +0530
Subject: [PATCH 0179/1072] feat: replace `unfold` with `from_fn` for the
 generate command (#13299)

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


you can also mention related issues, PRs or discussions!
-->
This PR should close #13247

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

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

- The deprecated `itertools::unfold` function is replaced with
`std::iter::from_fn` for the generate command.
- The mutable iterator state is no longer passed as an argument to
`from_fn` but it gets captured with the closure's `move`.

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

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

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

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

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

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

---------

Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
---
 crates/nu-command/src/generators/generate.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/nu-command/src/generators/generate.rs b/crates/nu-command/src/generators/generate.rs
index aeb375aab0..44bca993d0 100644
--- a/crates/nu-command/src/generators/generate.rs
+++ b/crates/nu-command/src/generators/generate.rs
@@ -1,4 +1,3 @@
-use itertools::unfold;
 use nu_engine::{command_prelude::*, ClosureEval};
 use nu_protocol::engine::Closure;
 
@@ -81,7 +80,8 @@ used as the next argument to the closure, otherwise generation stops.
         // A type of Option<S> is used to represent state. Invocation
         // will stop on None. Using Option<S> allows functions to output
         // one final value before stopping.
-        let iter = unfold(Some(initial), move |state| {
+        let mut state = Some(initial);
+        let iter = std::iter::from_fn(move || {
             let arg = state.take()?;
 
             let (output, next_input) = match closure.run_with_value(arg) {
@@ -160,7 +160,7 @@ used as the next argument to the closure, otherwise generation stops.
             // We use `state` to control when to stop, not `output`. By wrapping
             // it in a `Some`, we allow the generator to output `None` as a valid output
             // value.
-            *state = next_input;
+            state = next_input;
             Some(output)
         });
 

From b27cd70fd1875d301c8b577536c6fee46ad02e5c Mon Sep 17 00:00:00 2001
From: Andy Gayton <andy@thecablelounge.com>
Date: Fri, 5 Jul 2024 08:16:50 -0400
Subject: [PATCH 0180/1072] remove the deprecated `register` command (#13297)

# Description

This PR removes the `register` command which has been
[deprecated](https://www.nushell.sh/blog/2024-04-30-nushell_0_93_0.html#register-toc)
in favor of [`plugin
add`](https://www.nushell.sh/blog/2024-04-30-nushell_0_93_0.html#redesigned-plugin-management-commands-toc)

# User-Facing Changes

`register` is no longer available
---
 crates/nu-cmd-plugin/src/commands/mod.rs      |   2 -
 .../nu-cmd-plugin/src/commands/plugin/stop.rs |   2 +-
 crates/nu-cmd-plugin/src/commands/register.rs |  80 ------
 crates/nu-cmd-plugin/src/default_context.rs   |   1 -
 crates/nu-parser/src/lib.rs                   |   3 -
 crates/nu-parser/src/parse_keywords.rs        | 239 ------------------
 crates/nu-parser/src/parser.rs                |  11 -
 crates/nu-plugin-engine/src/context.rs        |   4 +-
 crates/nu-plugin/src/plugin/command.rs        |   2 +-
 crates/nu-plugin/src/plugin/mod.rs            |   2 +-
 crates/nu-protocol/src/config/mod.rs          |   2 +-
 crates/nu-protocol/src/engine/engine_state.rs |   4 +-
 crates/nu-protocol/src/plugin/registered.rs   |   2 +-
 crates/nu_plugin_example/README.md            |   6 +-
 crates/nu_plugin_formats/README.md            |   4 +-
 crates/nu_plugin_gstat/README.md              |   4 +-
 crates/nu_plugin_inc/README.md                |   4 +-
 .../nu_plugin_python_example.py               |   4 +-
 crates/nu_plugin_query/README.md              |   4 +-
 docker/Dockerfile                             |   2 +-
 scripts/README.md                             |   1 -
 scripts/register-plugins.nu                   |  55 ----
 tests/repl/test_parser.rs                     |  33 ---
 23 files changed, 24 insertions(+), 447 deletions(-)
 delete mode 100644 crates/nu-cmd-plugin/src/commands/register.rs
 delete mode 100644 scripts/register-plugins.nu

diff --git a/crates/nu-cmd-plugin/src/commands/mod.rs b/crates/nu-cmd-plugin/src/commands/mod.rs
index 3e927747f1..17ff32faa1 100644
--- a/crates/nu-cmd-plugin/src/commands/mod.rs
+++ b/crates/nu-cmd-plugin/src/commands/mod.rs
@@ -1,5 +1,3 @@
 mod plugin;
-mod register;
 
 pub use plugin::*;
-pub use register::Register;
diff --git a/crates/nu-cmd-plugin/src/commands/plugin/stop.rs b/crates/nu-cmd-plugin/src/commands/plugin/stop.rs
index d74ee59a3f..f90eac8411 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/stop.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/stop.rs
@@ -72,7 +72,7 @@ impl Command for PluginStop {
                 error: format!("Failed to stop the `{}` plugin", name.item),
                 msg: "couldn't find a plugin with this name".into(),
                 span: Some(name.span),
-                help: Some("you may need to `register` the plugin first".into()),
+                help: Some("you may need to `plugin add` the plugin first".into()),
                 inner: vec![],
             })
         }
diff --git a/crates/nu-cmd-plugin/src/commands/register.rs b/crates/nu-cmd-plugin/src/commands/register.rs
deleted file mode 100644
index 2c10456db7..0000000000
--- a/crates/nu-cmd-plugin/src/commands/register.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-use nu_engine::command_prelude::*;
-use nu_protocol::engine::CommandType;
-
-#[derive(Clone)]
-pub struct Register;
-
-impl Command for Register {
-    fn name(&self) -> &str {
-        "register"
-    }
-
-    fn usage(&self) -> &str {
-        "Register a plugin."
-    }
-
-    fn signature(&self) -> nu_protocol::Signature {
-        Signature::build("register")
-            .input_output_types(vec![(Type::Nothing, Type::Nothing)])
-            .required(
-                "plugin",
-                SyntaxShape::Filepath,
-                "Path of executable for plugin.",
-            )
-            .optional(
-                "signature",
-                SyntaxShape::Any,
-                "Block with signature description as json object.",
-            )
-            .named(
-                "shell",
-                SyntaxShape::Filepath,
-                "path of shell used to run plugin (cmd, sh, python, etc)",
-                Some('s'),
-            )
-            .category(Category::Plugin)
-    }
-
-    fn extra_usage(&self) -> &str {
-        r#"
-Deprecated in favor of `plugin add` and `plugin use`.
-
-This command is a parser keyword. For details, check:
-  https://www.nushell.sh/book/thinking_in_nu.html
-"#
-        .trim()
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["add"]
-    }
-
-    fn command_type(&self) -> CommandType {
-        CommandType::Keyword
-    }
-
-    fn run(
-        &self,
-        _engine_state: &EngineState,
-        _stack: &mut Stack,
-        _call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        Ok(PipelineData::empty())
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Register `nu_plugin_query` plugin from ~/.cargo/bin/ dir",
-                example: r#"register ~/.cargo/bin/nu_plugin_query"#,
-                result: None,
-            },
-            Example {
-                description: "Register `nu_plugin_query` plugin from `nu -c` (writes/updates $nu.plugin-path)",
-                example: r#"let plugin = ((which nu).path.0 | path dirname | path join 'nu_plugin_query'); nu -c $'register ($plugin); version'"#,
-                result: None,
-            },
-        ]
-    }
-}
diff --git a/crates/nu-cmd-plugin/src/default_context.rs b/crates/nu-cmd-plugin/src/default_context.rs
index 601dd52cfc..1ef6a905dd 100644
--- a/crates/nu-cmd-plugin/src/default_context.rs
+++ b/crates/nu-cmd-plugin/src/default_context.rs
@@ -18,7 +18,6 @@ pub fn add_plugin_command_context(mut engine_state: EngineState) -> EngineState
             PluginRm,
             PluginStop,
             PluginUse,
-            Register,
         );
 
         working_set.render()
diff --git a/crates/nu-parser/src/lib.rs b/crates/nu-parser/src/lib.rs
index 89cba8d243..3c97012e8a 100644
--- a/crates/nu-parser/src/lib.rs
+++ b/crates/nu-parser/src/lib.rs
@@ -24,6 +24,3 @@ pub use parser::{
     is_math_expression_like, parse, parse_block, parse_expression, parse_external_call,
     parse_unit_value, trim_quotes, trim_quotes_str, unescape_unquote_string, DURATION_UNIT_GROUPS,
 };
-
-#[cfg(feature = "plugin")]
-pub use parse_keywords::parse_register;
diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index 70d217c564..4ac1d20699 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -82,7 +82,6 @@ pub const UNALIASABLE_PARSER_KEYWORDS: &[&[u8]] = &[
     b"source-env",
     b"source",
     b"where",
-    b"register",
     b"plugin use",
 ];
 
@@ -3627,244 +3626,6 @@ pub fn parse_where(working_set: &mut StateWorkingSet, lite_command: &LiteCommand
     }
 }
 
-/// `register` is deprecated and will be removed in 0.94. Use `plugin add` and `plugin use` instead.
-#[cfg(feature = "plugin")]
-pub fn parse_register(working_set: &mut StateWorkingSet, lite_command: &LiteCommand) -> Pipeline {
-    use nu_plugin_engine::PluginDeclaration;
-    use nu_protocol::{
-        engine::Stack, ErrSpan, ParseWarning, PluginIdentity, PluginRegistryItem, PluginSignature,
-        RegisteredPlugin,
-    };
-
-    let spans = &lite_command.parts;
-
-    #[allow(deprecated)]
-    let cwd = working_set.get_cwd();
-
-    // Checking that the function is used with the correct name
-    // Maybe this is not necessary but it is a sanity check
-    if working_set.get_span_contents(spans[0]) != b"register" {
-        working_set.error(ParseError::UnknownState(
-            "internal error: Wrong call name for 'register' function".into(),
-            Span::concat(spans),
-        ));
-        return garbage_pipeline(working_set, spans);
-    }
-    if let Some(redirection) = lite_command.redirection.as_ref() {
-        working_set.error(redirecting_builtin_error("register", redirection));
-        return garbage_pipeline(working_set, spans);
-    }
-
-    // Parsing the spans and checking that they match the register signature
-    // Using a parsed call makes more sense than checking for how many spans are in the call
-    // Also, by creating a call, it can be checked if it matches the declaration signature
-    let (call, call_span) = match working_set.find_decl(b"register") {
-        None => {
-            working_set.error(ParseError::UnknownState(
-                "internal error: Register declaration not found".into(),
-                Span::concat(spans),
-            ));
-            return garbage_pipeline(working_set, spans);
-        }
-        Some(decl_id) => {
-            let ParsedInternalCall { call, output } =
-                parse_internal_call(working_set, spans[0], &spans[1..], decl_id);
-            let decl = working_set.get_decl(decl_id);
-
-            let call_span = Span::concat(spans);
-
-            let starting_error_count = working_set.parse_errors.len();
-            check_call(working_set, call_span, &decl.signature(), &call);
-
-            let Ok(is_help) = has_flag_const(working_set, &call, "help") else {
-                return garbage_pipeline(working_set, spans);
-            };
-
-            if starting_error_count != working_set.parse_errors.len() || is_help {
-                return Pipeline::from_vec(vec![Expression::new(
-                    working_set,
-                    Expr::Call(call),
-                    call_span,
-                    output,
-                )]);
-            }
-
-            (call, call_span)
-        }
-    };
-
-    // Now that the call is parsed, add the deprecation warning
-    working_set
-        .parse_warnings
-        .push(ParseWarning::DeprecatedWarning {
-            old_command: "register".into(),
-            new_suggestion: "use `plugin add` and `plugin use`".into(),
-            span: call.head,
-            url: "https://www.nushell.sh/book/plugins.html".into(),
-        });
-
-    // Extracting the required arguments from the call and keeping them together in a tuple
-    let arguments = call
-        .positional_nth(0)
-        .map(|expr| {
-            let val =
-                eval_constant(working_set, expr).map_err(|err| err.wrap(working_set, call.head))?;
-            let filename = val
-                .coerce_into_string()
-                .map_err(|err| err.wrap(working_set, call.head))?;
-
-            let Some(path) = find_in_dirs(&filename, working_set, &cwd, Some(PLUGIN_DIRS_VAR))
-            else {
-                return Err(ParseError::RegisteredFileNotFound(filename, expr.span));
-            };
-
-            if path.exists() && path.is_file() {
-                Ok((path, expr.span))
-            } else {
-                Err(ParseError::RegisteredFileNotFound(filename, expr.span))
-            }
-        })
-        .expect("required positional has being checked");
-
-    // Signature is an optional value from the call and will be used to decide if
-    // the plugin is called to get the signatures or to use the given signature
-    let signature = call.positional_nth(1).map(|expr| {
-        let signature = working_set.get_span_contents(expr.span);
-        serde_json::from_slice::<PluginSignature>(signature).map_err(|e| {
-            ParseError::LabeledError(
-                "Signature deserialization error".into(),
-                format!("unable to deserialize signature: {e}"),
-                spans[0],
-            )
-        })
-    });
-
-    // Shell is another optional value used as base to call shell to plugins
-    let shell = call.get_flag_expr("shell").map(|expr| {
-        let shell_expr = working_set.get_span_contents(expr.span);
-
-        String::from_utf8(shell_expr.to_vec())
-            .map_err(|_| ParseError::NonUtf8(expr.span))
-            .and_then(|name| {
-                canonicalize_with(&name, cwd)
-                    .map_err(|_| ParseError::RegisteredFileNotFound(name, expr.span))
-            })
-            .and_then(|path| {
-                if path.exists() & path.is_file() {
-                    Ok(path)
-                } else {
-                    Err(ParseError::RegisteredFileNotFound(
-                        format!("{path:?}"),
-                        expr.span,
-                    ))
-                }
-            })
-    });
-
-    let shell = match shell {
-        None => None,
-        Some(path) => match path {
-            Ok(path) => Some(path),
-            Err(err) => {
-                working_set.error(err);
-                return Pipeline::from_vec(vec![Expression::new(
-                    working_set,
-                    Expr::Call(call),
-                    call_span,
-                    Type::Any,
-                )]);
-            }
-        },
-    };
-
-    // We need the current environment variables for `python` based plugins
-    // Or we'll likely have a problem when a plugin is implemented in a virtual Python environment.
-    let get_envs = || {
-        let stack = Stack::new().capture();
-        nu_engine::env::env_to_strings(working_set.permanent_state, &stack)
-    };
-
-    let error = arguments.and_then(|(path, path_span)| {
-        let path = path.path_buf();
-
-        // Create the plugin identity. This validates that the plugin name starts with `nu_plugin_`
-        let identity = PluginIdentity::new(path, shell).err_span(path_span)?;
-
-        let plugin = nu_plugin_engine::add_plugin_to_working_set(working_set, &identity)
-            .map_err(|err| err.wrap(working_set, call.head))?;
-
-        let signatures = signature.map_or_else(
-            || {
-                // It's important that the plugin is restarted if we're going to get signatures
-                //
-                // The user would expect that `register` would always run the binary to get new
-                // signatures, in case it was replaced with an updated binary
-                plugin.reset().map_err(|err| {
-                    ParseError::LabeledError(
-                        "Failed to restart plugin to get new signatures".into(),
-                        err.to_string(),
-                        spans[0],
-                    )
-                })?;
-
-                let metadata_and_signatures = plugin
-                    .clone()
-                    .get(get_envs)
-                    .and_then(|p| {
-                        let meta = p.get_metadata()?;
-                        let sigs = p.get_signature()?;
-                        Ok((meta, sigs))
-                    })
-                    .map_err(|err| {
-                        log::warn!("Error getting metadata and signatures: {err:?}");
-                        ParseError::LabeledError(
-                            "Error getting metadata and signatures".into(),
-                            err.to_string(),
-                            spans[0],
-                        )
-                    });
-
-                match metadata_and_signatures {
-                    Ok((meta, sigs)) => {
-                        // Set the metadata on the plugin
-                        plugin.set_metadata(Some(meta.clone()));
-                        // Add the loaded plugin to the delta
-                        working_set.update_plugin_registry(PluginRegistryItem::new(
-                            &identity,
-                            meta,
-                            sigs.clone(),
-                        ));
-                        Ok(sigs)
-                    }
-                    Err(err) => Err(err),
-                }
-            },
-            |sig| sig.map(|sig| vec![sig]),
-        )?;
-
-        for signature in signatures {
-            // create plugin command declaration (need struct impl Command)
-            // store declaration in working set
-            let plugin_decl = PluginDeclaration::new(plugin.clone(), signature);
-
-            working_set.add_decl(Box::new(plugin_decl));
-        }
-
-        Ok(())
-    });
-
-    if let Err(err) = error {
-        working_set.error(err);
-    }
-
-    Pipeline::from_vec(vec![Expression::new(
-        working_set,
-        Expr::Call(call),
-        call_span,
-        Type::Nothing,
-    )])
-}
-
 #[cfg(feature = "plugin")]
 pub fn parse_plugin_use(working_set: &mut StateWorkingSet, call: Box<Call>) -> Pipeline {
     use nu_protocol::{FromValue, PluginRegistryFile};
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index c3d18b55ac..b274d77404 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -5275,15 +5275,6 @@ pub fn parse_expression(working_set: &mut StateWorkingSet, spans: &[Span]) -> Ex
             }
             b"where" => parse_where_expr(working_set, &spans[pos..]),
             #[cfg(feature = "plugin")]
-            b"register" => {
-                working_set.error(ParseError::BuiltinCommandInPipeline(
-                    "register".into(),
-                    spans[0],
-                ));
-
-                parse_call(working_set, &spans[pos..], spans[0])
-            }
-            #[cfg(feature = "plugin")]
             b"plugin" => {
                 if spans.len() > 1 && working_set.get_span_contents(spans[1]) == b"use" {
                     // only 'plugin use' is banned
@@ -5419,8 +5410,6 @@ pub fn parse_builtin_commands(
         b"export" => parse_export_in_block(working_set, lite_command),
         b"hide" => parse_hide(working_set, lite_command),
         b"where" => parse_where(working_set, lite_command),
-        #[cfg(feature = "plugin")]
-        b"register" => parse_register(working_set, lite_command),
         // Only "plugin use" is a keyword
         #[cfg(feature = "plugin")]
         b"plugin"
diff --git a/crates/nu-plugin-engine/src/context.rs b/crates/nu-plugin-engine/src/context.rs
index d5be6ad4b6..c87e64aa48 100644
--- a/crates/nu-plugin-engine/src/context.rs
+++ b/crates/nu-plugin-engine/src/context.rs
@@ -95,8 +95,8 @@ impl<'a> PluginExecutionContext for PluginExecutionCommandContext<'a> {
     fn get_plugin_config(&self) -> Result<Option<Value>, ShellError> {
         // Fetch the configuration for a plugin
         //
-        // The `plugin` must match the registered name of a plugin.  For
-        // `register nu_plugin_example` the plugin config lookup uses `"example"`
+        // The `plugin` must match the registered name of a plugin.  For `plugin add
+        // nu_plugin_example` the plugin config lookup uses `"example"`
         Ok(self
             .get_config()?
             .plugins
diff --git a/crates/nu-plugin/src/plugin/command.rs b/crates/nu-plugin/src/plugin/command.rs
index 7ccedfd4e5..d33fc445e2 100644
--- a/crates/nu-plugin/src/plugin/command.rs
+++ b/crates/nu-plugin/src/plugin/command.rs
@@ -340,7 +340,7 @@ where
 
 /// Build a [`PluginSignature`] from the signature-related methods on [`PluginCommand`].
 ///
-/// This is sent to the engine on `register`.
+/// This is sent to the engine on `plugin add`.
 ///
 /// This is not a public API.
 #[doc(hidden)]
diff --git a/crates/nu-plugin/src/plugin/mod.rs b/crates/nu-plugin/src/plugin/mod.rs
index 997381f97b..2bf7f9fc07 100644
--- a/crates/nu-plugin/src/plugin/mod.rs
+++ b/crates/nu-plugin/src/plugin/mod.rs
@@ -38,7 +38,7 @@ pub(crate) const OUTPUT_BUFFER_SIZE: usize = 16384;
 /// The API for a Nushell plugin
 ///
 /// A plugin defines multiple commands, which are added to the engine when the user calls
-/// `register`.
+/// `plugin add`.
 ///
 /// The plugin must be able to be safely shared between threads, so that multiple invocations can
 /// be run in parallel. If interior mutability is desired, consider synchronization primitives such
diff --git a/crates/nu-protocol/src/config/mod.rs b/crates/nu-protocol/src/config/mod.rs
index 5aa611937b..e804e3f024 100644
--- a/crates/nu-protocol/src/config/mod.rs
+++ b/crates/nu-protocol/src/config/mod.rs
@@ -104,7 +104,7 @@ pub struct Config {
     /// Configuration for plugins.
     ///
     /// Users can provide configuration for a plugin through this entry.  The entry name must
-    /// match the registered plugin name so `register nu_plugin_example` will be able to place
+    /// match the registered plugin name so `plugin add nu_plugin_example` will be able to place
     /// its configuration under a `nu_plugin_example` column.
     pub plugins: HashMap<String, Value>,
     /// Configuration for plugin garbage collection.
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index 3960f6d9d0..c436621627 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -741,8 +741,8 @@ impl EngineState {
 
     /// Fetch the configuration for a plugin
     ///
-    /// The `plugin` must match the registered name of a plugin.  For `register nu_plugin_example`
-    /// the plugin name to use will be `"example"`
+    /// The `plugin` must match the registered name of a plugin.  For `plugin add
+    /// nu_plugin_example` the plugin name to use will be `"example"`
     pub fn get_plugin_config(&self, plugin: &str) -> Option<&Value> {
         self.config.plugins.get(plugin)
     }
diff --git a/crates/nu-protocol/src/plugin/registered.rs b/crates/nu-protocol/src/plugin/registered.rs
index abd75b4dc6..56d7f4079a 100644
--- a/crates/nu-protocol/src/plugin/registered.rs
+++ b/crates/nu-protocol/src/plugin/registered.rs
@@ -26,7 +26,7 @@ pub trait RegisteredPlugin: Send + Sync {
     fn stop(&self) -> Result<(), ShellError>;
 
     /// Stop the plugin and reset any state so that we don't make any assumptions about the plugin
-    /// next time it launches. This is used on `register`.
+    /// next time it launches. This is used on `plugin add`.
     fn reset(&self) -> Result<(), ShellError>;
 
     /// Cast the pointer to an [`Any`] so that its concrete type can be retrieved.
diff --git a/crates/nu_plugin_example/README.md b/crates/nu_plugin_example/README.md
index d4bc6dbe29..98283e9958 100644
--- a/crates/nu_plugin_example/README.md
+++ b/crates/nu_plugin_example/README.md
@@ -7,10 +7,12 @@ in order to create a binary that can be registered into nushell declaration list
 
 This subcommand demonstrates sending configuration from the nushell `$env.config` to a plugin.
 
-To register from after building `nushell` run:
+To make use of the plugin after building `nushell` run:
 
 ```nushell
-register target/debug/nu_plugin_example
+plugin add target/debug/nu_plugin_example
+# or then either restart your current nushell session or run:
+plugin use target/debug/nu_plugin_example
 ```
 
 The configuration for the plugin lives in `$env.config.plugins.example`:
diff --git a/crates/nu_plugin_formats/README.md b/crates/nu_plugin_formats/README.md
index 2b5fc2d829..a7ee046f99 100644
--- a/crates/nu_plugin_formats/README.md
+++ b/crates/nu_plugin_formats/README.md
@@ -12,7 +12,7 @@ A nushell plugin to convert data to nushell tables.
 
 # Usage
 1. compile the binary: `cargo build`
-2. register plugin(assume it's compiled in ./target/debug/):
+2. plugin add plugin(assume it's compiled in ./target/debug/):
 ```
-register ./target/debug/nu_plugin_formats
+plugin add ./target/debug/nu_plugin_formats
 ```
diff --git a/crates/nu_plugin_gstat/README.md b/crates/nu_plugin_gstat/README.md
index 88db33cbf8..7b9ab158ec 100644
--- a/crates/nu_plugin_gstat/README.md
+++ b/crates/nu_plugin_gstat/README.md
@@ -8,6 +8,6 @@ To install:
 > cargo install --path .
 ```
 
-To register (from inside Nushell):
+To add the plugin (from inside Nushell):
 ```
-> register <path to installed plugin>
+> plugin add <path to installed plugin>
diff --git a/crates/nu_plugin_inc/README.md b/crates/nu_plugin_inc/README.md
index e989aba0b9..d97443a189 100644
--- a/crates/nu_plugin_inc/README.md
+++ b/crates/nu_plugin_inc/README.md
@@ -8,6 +8,6 @@ To install:
 cargo install --path .
 ```
 
-To register (from inside Nushell):
+To add the plugin (from inside Nushell):
 ```
-register <path to installed plugin>
+> plugin add <path to installed plugin>
diff --git a/crates/nu_plugin_python/nu_plugin_python_example.py b/crates/nu_plugin_python/nu_plugin_python_example.py
index 34e54fea71..993e619366 100755
--- a/crates/nu_plugin_python/nu_plugin_python_example.py
+++ b/crates/nu_plugin_python/nu_plugin_python_example.py
@@ -7,7 +7,7 @@
 # decode and encode information that is read and written to stdin and stdout
 #
 # To register the plugin use:
-# 	register <path-to-py-file>
+# 	plugin add <path-to-py-file>
 #
 # Be careful with the spans. Miette will crash if a span is outside the
 # size of the contents vector. We strongly suggest using the span found in the
@@ -258,4 +258,4 @@ if __name__ == "__main__":
     if len(sys.argv) == 2 and sys.argv[1] == "--stdio":
         plugin()
     else:
-        print("Run me from inside nushell!")
\ No newline at end of file
+        print("Run me from inside nushell!")
diff --git a/crates/nu_plugin_query/README.md b/crates/nu_plugin_query/README.md
index a3abd18082..621a004806 100644
--- a/crates/nu_plugin_query/README.md
+++ b/crates/nu_plugin_query/README.md
@@ -8,6 +8,6 @@ To install:
 > cargo install --path .
 ```
 
-To register (from inside Nushell):
+To add the plugin (from inside Nushell):
 ```
-> register <path to installed plugin>
+> plugin add <path to installed plugin>
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 209b17d419..64c37f6230 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -24,7 +24,7 @@ RUN echo '/usr/bin/nu' >> /etc/shells \
     && chmod +x /usr/bin/nu \
     && chown -R nushell:nushell /home/nushell/.config/nushell \
     && ls /usr/bin/nu_plugin* \
-    | xargs -I{} su -c 'register {}' nushell \
+    | xargs -I{} su -c 'plugin add {}' nushell \
     && rm -rf /tmp/*
 
 USER nushell
diff --git a/scripts/README.md b/scripts/README.md
index 366ff76375..37388e74b5 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -23,5 +23,4 @@
 | `coverage-local.sh`     | x            | x    | x        |
 | `install-all.ps1`       | ?            | x    | ?        |
 | `install-all.sh`        | x            | x    | x        |
-| `register-plugins.nu`   | x            | x    | x        |
 | `uninstall-all.sh`      | x            | x    | x        |
diff --git a/scripts/register-plugins.nu b/scripts/register-plugins.nu
deleted file mode 100644
index 0447ffb0c1..0000000000
--- a/scripts/register-plugins.nu
+++ /dev/null
@@ -1,55 +0,0 @@
-use std log warning
-
-warning "./scripts/register-plugin.nu will be deprecated, please use the `toolkit plugin register` command instead"
-
-# are we on windows or not?
-def windows? [] {
-    $nu.os-info.name == windows
-}
-
-# filter out files that end in .d
-def keep-plugin-executables [] {
-    if (windows?) { where name ends-with '.exe' } else { where name !~ '\.d' }
-}
-
-# get list of all plugin files from their installed directory
-let plugins = (ls ((which nu).path.0 | path dirname) | where name =~ nu_plugin | keep-plugin-executables)
-for plugin in $plugins {
-    print -n $"registering ($plugin.name), "
-    nu -c $"register '($plugin.name)'"
-    print "success!"
-}
-
-# print helpful message
-print "\nplugins registered, please restart nushell"
-
-# Plugin Location
-# https://github.com/nushell/nushell/tree/main/crates/nu_plugin_custom_values
-# https://github.com/nushell/nushell/tree/main/crates/nu_plugin_example
-# https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gstat
-# https://github.com/nushell/nushell/tree/main/crates/nu_plugin_inc
-# https://github.com/nushell/nushell/tree/main/crates/nu_plugin_python
-# https://github.com/nushell/nushell/tree/main/crates/nu_plugin_query
-# https://github.com/fdncred/nu_plugin_from_parquet
-# https://github.com/fdncred/nu_plugin_from_regex
-# https://github.com/fdncred/nu_plugin_pnet
-# https://github.com/JosephTLyons/nu_plugin_periodic_table
-# https://github.com/Euphrasiologist/nu_plugin_bio
-# https://github.com/realcundo/nu_plugin_dcm
-# https://github.com/enerdgumen/nu_plugin_dotenv
-# https://github.com/bluk/nu_plugin_from_bencode
-
-# Older plugins
-# https://github.com/notryanb/nu_plugin_id3
-# https://github.com/notryanb/nu_plugin_weather
-# https://github.com/tiffany352/nu-plugins/tree/main/from_nbt
-# https://github.com/tiffany352/nu-plugins/tree/main/file_exists
-# https://github.com/potan/nu_plugin_wifiscan
-# https://github.com/autophagy/nu_plugin_from_dhall
-# https://github.com/yanganto/nu_plugin_s3
-# https://github.com/lukasreuter/nu_plugin_unity
-# https://github.com/filaretov/nu_plugin_path_temp
-# https://github.com/cdecompilador/nu_plugin_bg
-# https://github.com/aJuvan/nu_plugin_kubectl
-# https://github.com/hedonihilist/nu_plugin_df
-
diff --git a/tests/repl/test_parser.rs b/tests/repl/test_parser.rs
index 0efb1d087a..a7a25e1c67 100644
--- a/tests/repl/test_parser.rs
+++ b/tests/repl/test_parser.rs
@@ -572,39 +572,6 @@ fn unbalanced_parens2() -> TestResult {
     fail_test(r#"("("))"#, "unbalanced ( and )")
 }
 
-#[test]
-fn register_with_string_literal() -> TestResult {
-    fail_test(r#"register 'nu-plugin-math'"#, "File not found")
-}
-
-#[test]
-fn register_with_string_constant() -> TestResult {
-    let input = "\
-const file = 'nu-plugin-math'
-register $file
-";
-    // should not fail with `not a constant`
-    fail_test(input, "File not found")
-}
-
-#[test]
-fn register_with_string_variable() -> TestResult {
-    let input = "\
-let file = 'nu-plugin-math'
-register $file
-";
-    fail_test(input, "Value is not a parse-time constant")
-}
-
-#[test]
-fn register_with_non_string_constant() -> TestResult {
-    let input = "\
-const file = 6
-register $file
-";
-    fail_test(input, "expected string, found int")
-}
-
 #[test]
 fn plugin_use_with_string_literal() -> TestResult {
     fail_test(

From 1514b9fbefdea8c6a4d001853b1876f2875fac8d Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Fri, 5 Jul 2024 20:17:07 +0800
Subject: [PATCH 0181/1072] don't show result in error make examples (#13296)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
Fixes: #13189

The issue is caused `error make` returns a `Value::Errror`, and when
nushell pass it to `table -e` in `std help`, it directly stop and render
the error message.
To solve it, I think it's safe to make these examples return None
directly, it doesn't change the reult of `help error make`.

# User-Facing Changes
## Before
```nushell
~> help "error make"
Error: nu::shell::eval_block_with_input

  × Eval block failed with pipeline input
     ╭─[NU_STDLIB_VIRTUAL_DIR/std/help.nu:692:21]
 691 │ ] {
 692 │     let commands = (scope commands | sort-by name)
     ·                     ───────┬──────
     ·                            ╰── source value
 693 │
     ╰────

Error:   × my custom error message
```

## After
```nushell
Create an error.

Search terms: panic, crash, throw

Category: core

This command:
- does not create a scope.
- is a built-in command.
- is a subcommand.
- is not part of a plugin.
- is not a custom command.
- is not a keyword.

Usage:
  > error make {flags} <error_struct>


Flags:

  -u, --unspanned - remove the origin label from the error
  -h, --help - Display the help message for this command

Signatures:

  <nothing> | error make[ <record>] -> <any>

Parameters:

  error_struct: <record> The error to create.


Examples:
  Create a simple custom error
  > error make {msg: "my custom error message"}


  Create a more complex custom error
  > error make {
        msg: "my custom error message"
        label: {
            text: "my custom label text"  # not mandatory unless $.label exists
            # optional
            span: {
                # if $.label.span exists, both start and end must be present
                start: 123
                end: 456
            }
        }
        help: "A help string, suggesting a fix to the user"  # optional
    }


  Create a custom error for a custom command that shows the span of the argument
  > def foo [x] {
        error make {
            msg: "this is fishy"
            label: {
                text: "fish right here"
                span: (metadata $x).span
            }
        }
    }
```
# Tests + Formatting
Added 1 test
---
 .../src/core_commands/error_make.rs           | 22 ++-----------------
 crates/nu-std/tests/test_help.nu              |  5 +++++
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/crates/nu-cmd-lang/src/core_commands/error_make.rs b/crates/nu-cmd-lang/src/core_commands/error_make.rs
index 987e083cbc..07efcd7885 100644
--- 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(
-                    ShellError::GenericError {
-                        error: "my custom error message".into(),
-                        msg: "".into(),
-                        span: None,
-                        help: None,
-                        inner: vec![],
-                    },
-                    Span::unknown(),
-                )),
+                result: None,
             },
             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(
-                    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(),
-                )),
+                result: None,
             },
             Example {
                 description:
diff --git a/crates/nu-std/tests/test_help.nu b/crates/nu-std/tests/test_help.nu
index 1608950886..b82e5072ef 100644
--- a/crates/nu-std/tests/test_help.nu
+++ b/crates/nu-std/tests/test_help.nu
@@ -7,3 +7,8 @@ def show_help_on_commands [] {
     assert ("item not found" not-in $help_result)
 }
 
+#[test]
+def show_help_on_error_make [] {
+    let help_result = (help error make)
+    assert ("Error: nu::shell::eval_block_with_input" not-in $help_result)
+}

From 8707d14f952b51a99449f6ce6946f3ad400e4a04 Mon Sep 17 00:00:00 2001
From: Reilly Wood <26268125+rgwood@users.noreply.github.com>
Date: Fri, 5 Jul 2024 05:18:25 -0700
Subject: [PATCH 0182/1072] Limit drilling down inside `explore` (#13293)

This PR fixes an issue with `explore` where you can "drill down" into
the same value forever. For example:

1. Run `ls | explore`
2. Press Enter to enter cursor mode
3. Press Enter again to open the selected string in a new layer
4. Press Enter again to open that string in a new layer
5. Press Enter again to open that string in a new layer
6. Repeat and eventually you have a bajillion layers open with the same
string

IMO it only makes sense to "drill down" into lists and records.

In a separate commit I also did a little refactoring, cleaning up naming
and comments.
---
 crates/nu-explore/src/commands/nu.rs      |   2 +-
 crates/nu-explore/src/commands/table.rs   |   4 +-
 crates/nu-explore/src/lib.rs              |   2 +-
 crates/nu-explore/src/views/record/mod.rs | 120 +++++++++++-----------
 crates/nu-explore/src/views/try.rs        |   6 +-
 5 files changed, 68 insertions(+), 66 deletions(-)

diff --git a/crates/nu-explore/src/commands/nu.rs b/crates/nu-explore/src/commands/nu.rs
index f8aaf44c24..a0d479fd92 100644
--- a/crates/nu-explore/src/commands/nu.rs
+++ b/crates/nu-explore/src/commands/nu.rs
@@ -65,7 +65,7 @@ impl ViewCommand for NuCmd {
         let mut view = RecordView::new(columns, values);
 
         if is_record {
-            view.set_orientation_current(Orientation::Left);
+            view.set_top_layer_orientation(Orientation::Left);
         }
 
         Ok(NuView::Records(view))
diff --git a/crates/nu-explore/src/commands/table.rs b/crates/nu-explore/src/commands/table.rs
index e5a3ae5599..1079cf6cea 100644
--- a/crates/nu-explore/src/commands/table.rs
+++ b/crates/nu-explore/src/commands/table.rs
@@ -58,11 +58,11 @@ impl ViewCommand for TableCmd {
         let mut view = RecordView::new(columns, data);
 
         if is_record {
-            view.set_orientation_current(Orientation::Left);
+            view.set_top_layer_orientation(Orientation::Left);
         }
 
         if let Some(o) = self.settings.orientation {
-            view.set_orientation_current(o);
+            view.set_top_layer_orientation(o);
         }
 
         if self.settings.turn_on_cursor_mode {
diff --git a/crates/nu-explore/src/lib.rs b/crates/nu-explore/src/lib.rs
index 562602c394..d347321354 100644
--- a/crates/nu-explore/src/lib.rs
+++ b/crates/nu-explore/src/lib.rs
@@ -75,7 +75,7 @@ fn create_record_view(
 ) -> Option<Page> {
     let mut view = RecordView::new(columns, data);
     if is_record {
-        view.set_orientation_current(Orientation::Left);
+        view.set_top_layer_orientation(Orientation::Left);
     }
 
     if config.tail {
diff --git a/crates/nu-explore/src/views/record/mod.rs b/crates/nu-explore/src/views/record/mod.rs
index 87b0952a68..bd3c7e8e0a 100644
--- a/crates/nu-explore/src/views/record/mod.rs
+++ b/crates/nu-explore/src/views/record/mod.rs
@@ -20,7 +20,7 @@ use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
 use nu_color_config::StyleComputer;
 use nu_protocol::{
     engine::{EngineState, Stack},
-    Config, Record, Span, Value,
+    Config, Record, Value,
 };
 use ratatui::{layout::Rect, widgets::Block};
 use std::collections::HashMap;
@@ -54,27 +54,26 @@ impl RecordView {
     }
 
     pub fn transpose(&mut self) {
-        let layer = self.get_layer_last_mut();
+        let layer = self.get_top_layer_mut();
         transpose_table(layer);
 
         layer.reset_cursor();
     }
 
-    // todo: rename to get_layer
-    pub fn get_layer_last(&self) -> &RecordLayer {
+    pub fn get_top_layer(&self) -> &RecordLayer {
         self.layer_stack
             .last()
             .expect("we guarantee that 1 entry is always in a list")
     }
 
-    pub fn get_layer_last_mut(&mut self) -> &mut RecordLayer {
+    pub fn get_top_layer_mut(&mut self) -> &mut RecordLayer {
         self.layer_stack
             .last_mut()
             .expect("we guarantee that 1 entry is always in a list")
     }
 
-    pub fn get_orientation_current(&mut self) -> Orientation {
-        self.get_layer_last().orientation
+    pub fn get_top_layer_orientation(&mut self) -> Orientation {
+        self.get_top_layer().orientation
     }
 
     pub fn set_orientation(&mut self, orientation: Orientation) {
@@ -90,27 +89,27 @@ impl RecordView {
         }
     }
 
-    pub fn set_orientation_current(&mut self, orientation: Orientation) {
-        let layer = self.get_layer_last_mut();
+    pub fn set_top_layer_orientation(&mut self, orientation: Orientation) {
+        let layer = self.get_top_layer_mut();
         layer.orientation = orientation;
         layer.reset_cursor();
     }
 
     /// Get the current position of the cursor in the table as a whole
     pub fn get_cursor_position(&self) -> Position {
-        let layer = self.get_layer_last();
+        let layer = self.get_top_layer();
         layer.cursor.position()
     }
 
     /// Get the current position of the cursor in the window being shown
     pub fn get_cursor_position_in_window(&self) -> Position {
-        let layer = self.get_layer_last();
+        let layer = self.get_top_layer();
         layer.cursor.window_relative_position()
     }
 
     /// Get the origin of the window being shown. (0,0), top left corner.
     pub fn get_window_origin(&self) -> Position {
-        let layer = self.get_layer_last();
+        let layer = self.get_top_layer();
         layer.cursor.window_origin()
     }
 
@@ -122,22 +121,20 @@ impl RecordView {
         self.mode = UIMode::View;
     }
 
-    pub fn get_current_value(&self) -> Value {
+    pub fn get_current_value(&self) -> &Value {
         let Position { row, column } = self.get_cursor_position();
-        let layer = self.get_layer_last();
+        let layer = self.get_top_layer();
 
         let (row, column) = match layer.orientation {
             Orientation::Top => (row, column),
             Orientation::Left => (column, row),
         };
 
-        if row >= layer.record_values.len() || column >= layer.column_names.len() {
-            // actually must never happen; unless cursor works incorrectly
-            // if being sure about cursor it can be deleted;
-            return Value::nothing(Span::unknown());
-        }
+        // These should never happen as long as the cursor is working correctly
+        assert!(row < layer.record_values.len(), "row out of bounds");
+        assert!(column < layer.column_names.len(), "column out of bounds");
 
-        layer.record_values[row][column].clone()
+        &layer.record_values[row][column]
     }
 
     fn create_table_widget<'a>(&'a mut self, cfg: ViewConfig<'a>) -> TableWidget<'a> {
@@ -145,7 +142,7 @@ impl RecordView {
         let style_computer = cfg.style_computer;
         let Position { row, column } = self.get_window_origin();
 
-        let layer = self.get_layer_last_mut();
+        let layer = self.get_top_layer_mut();
         if layer.record_text.is_none() {
             let mut data =
                 convert_records_to_string(&layer.record_values, cfg.nu_config, cfg.style_computer);
@@ -169,17 +166,17 @@ impl RecordView {
     }
 
     fn update_cursors(&mut self, rows: usize, columns: usize) {
-        match self.get_layer_last().orientation {
+        match self.get_top_layer().orientation {
             Orientation::Top => {
                 let _ = self
-                    .get_layer_last_mut()
+                    .get_top_layer_mut()
                     .cursor
                     .set_window_size(rows, columns);
             }
 
             Orientation::Left => {
                 let _ = self
-                    .get_layer_last_mut()
+                    .get_top_layer_mut()
                     .cursor
                     .set_window_size(rows, columns);
             }
@@ -187,7 +184,7 @@ impl RecordView {
     }
 
     fn create_records_report(&self) -> Report {
-        let layer = self.get_layer_last();
+        let layer = self.get_top_layer();
         let covered_percent = report_row_position(layer.cursor);
         let cursor = report_cursor_position(self.mode, layer.cursor);
         let message = layer.name.clone().unwrap_or_default();
@@ -204,9 +201,6 @@ impl RecordView {
 impl View for RecordView {
     fn draw(&mut self, f: &mut Frame, area: Rect, cfg: ViewConfig<'_>, layout: &mut Layout) {
         let mut table_layout = TableWidgetState::default();
-        // TODO: creating the table widget is O(N) where N is the number of cells in the grid.
-        // Way too slow to do on every draw call!
-        // To make explore work for larger data sets, this needs to be improved.
         let table = self.create_table_widget(cfg);
         f.render_stateful_widget(table, area, &mut table_layout);
 
@@ -221,7 +215,7 @@ impl View for RecordView {
                 row,
                 column,
                 table_layout.count_rows,
-                self.get_layer_last().orientation,
+                self.get_top_layer().orientation,
                 self.cfg.table.show_header,
             );
 
@@ -269,7 +263,7 @@ impl View for RecordView {
         let style_computer = StyleComputer::new(&dummy_engine_state, &dummy_stack, HashMap::new());
 
         let data = convert_records_to_string(
-            &self.get_layer_last().record_values,
+            &self.get_top_layer().record_values,
             &nu_protocol::Config::default(),
             &style_computer,
         );
@@ -278,7 +272,7 @@ impl View for RecordView {
     }
 
     fn show_data(&mut self, pos: usize) -> bool {
-        let data = &self.get_layer_last().record_values;
+        let data = &self.get_top_layer().record_values;
 
         let mut i = 0;
         for (row, cells) in data.iter().enumerate() {
@@ -289,7 +283,7 @@ impl View for RecordView {
 
             for (column, _) in cells.iter().enumerate() {
                 if i == pos {
-                    self.get_layer_last_mut()
+                    self.get_top_layer_mut()
                         .cursor
                         .set_window_start_position(row, column);
                     return true;
@@ -413,7 +407,7 @@ fn handle_key_event_view_mode(view: &mut RecordView, key: &KeyEvent) -> Option<T
             code: KeyCode::PageUp,
             ..
         } => {
-            view.get_layer_last_mut().cursor.prev_row_page();
+            view.get_top_layer_mut().cursor.prev_row_page();
 
             return Some(Transition::Ok);
         }
@@ -426,7 +420,7 @@ fn handle_key_event_view_mode(view: &mut RecordView, key: &KeyEvent) -> Option<T
             code: KeyCode::PageDown,
             ..
         } => {
-            view.get_layer_last_mut().cursor.next_row_page();
+            view.get_top_layer_mut().cursor.next_row_page();
 
             return Some(Transition::Ok);
         }
@@ -456,32 +450,32 @@ fn handle_key_event_view_mode(view: &mut RecordView, key: &KeyEvent) -> Option<T
         }
         KeyCode::Char('e') => Some(Transition::Cmd(String::from("expand"))),
         KeyCode::Up | KeyCode::Char('k') => {
-            view.get_layer_last_mut().cursor.prev_row_i();
+            view.get_top_layer_mut().cursor.prev_row_i();
 
             Some(Transition::Ok)
         }
         KeyCode::Down | KeyCode::Char('j') => {
-            view.get_layer_last_mut().cursor.next_row_i();
+            view.get_top_layer_mut().cursor.next_row_i();
 
             Some(Transition::Ok)
         }
         KeyCode::Left | KeyCode::Char('h') => {
-            view.get_layer_last_mut().cursor.prev_column_i();
+            view.get_top_layer_mut().cursor.prev_column_i();
 
             Some(Transition::Ok)
         }
         KeyCode::Right | KeyCode::Char('l') => {
-            view.get_layer_last_mut().cursor.next_column_i();
+            view.get_top_layer_mut().cursor.next_column_i();
 
             Some(Transition::Ok)
         }
         KeyCode::Home | KeyCode::Char('g') => {
-            view.get_layer_last_mut().cursor.row_move_to_start();
+            view.get_top_layer_mut().cursor.row_move_to_start();
 
             Some(Transition::Ok)
         }
         KeyCode::End | KeyCode::Char('G') => {
-            view.get_layer_last_mut().cursor.row_move_to_end();
+            view.get_top_layer_mut().cursor.row_move_to_end();
 
             Some(Transition::Ok)
         }
@@ -503,7 +497,7 @@ fn handle_key_event_cursor_mode(
             code: KeyCode::PageUp,
             ..
         } => {
-            view.get_layer_last_mut().cursor.prev_row_page();
+            view.get_top_layer_mut().cursor.prev_row_page();
 
             return Ok(Some(Transition::Ok));
         }
@@ -516,7 +510,7 @@ fn handle_key_event_cursor_mode(
             code: KeyCode::PageDown,
             ..
         } => {
-            view.get_layer_last_mut().cursor.next_row_page();
+            view.get_top_layer_mut().cursor.next_row_page();
 
             return Ok(Some(Transition::Ok));
         }
@@ -530,47 +524,55 @@ fn handle_key_event_cursor_mode(
             Ok(Some(Transition::Ok))
         }
         KeyCode::Up | KeyCode::Char('k') => {
-            view.get_layer_last_mut().cursor.prev_row();
+            view.get_top_layer_mut().cursor.prev_row();
 
             Ok(Some(Transition::Ok))
         }
         KeyCode::Down | KeyCode::Char('j') => {
-            view.get_layer_last_mut().cursor.next_row();
+            view.get_top_layer_mut().cursor.next_row();
 
             Ok(Some(Transition::Ok))
         }
         KeyCode::Left | KeyCode::Char('h') => {
-            view.get_layer_last_mut().cursor.prev_column();
+            view.get_top_layer_mut().cursor.prev_column();
 
             Ok(Some(Transition::Ok))
         }
         KeyCode::Right | KeyCode::Char('l') => {
-            view.get_layer_last_mut().cursor.next_column();
+            view.get_top_layer_mut().cursor.next_column();
 
             Ok(Some(Transition::Ok))
         }
         KeyCode::Home | KeyCode::Char('g') => {
-            view.get_layer_last_mut().cursor.row_move_to_start();
+            view.get_top_layer_mut().cursor.row_move_to_start();
 
             Ok(Some(Transition::Ok))
         }
         KeyCode::End | KeyCode::Char('G') => {
-            view.get_layer_last_mut().cursor.row_move_to_end();
+            view.get_top_layer_mut().cursor.row_move_to_end();
 
             Ok(Some(Transition::Ok))
         }
+        // Try to "drill down" into the selected value
         KeyCode::Enter => {
             let value = view.get_current_value();
+
+            // ...but it only makes sense to drill down into a few types of values
+            if !matches!(
+                value,
+                Value::Record { .. } | Value::List { .. } | Value::Custom { .. }
+            ) {
+                return Ok(None);
+            }
+
             let is_record = matches!(value, Value::Record { .. });
-            let next_layer = create_layer(value)?;
+            let next_layer = create_layer(value.clone())?;
             push_layer(view, next_layer);
 
             if is_record {
-                view.set_orientation_current(Orientation::Left);
-            } else if view.orientation == view.get_layer_last().orientation {
-                view.get_layer_last_mut().orientation = view.orientation;
+                view.set_top_layer_orientation(Orientation::Left);
             } else {
-                view.set_orientation_current(view.orientation);
+                view.set_top_layer_orientation(view.orientation);
             }
 
             Ok(Some(Transition::Ok))
@@ -586,7 +588,7 @@ fn create_layer(value: Value) -> Result<RecordLayer> {
 }
 
 fn push_layer(view: &mut RecordView, mut next_layer: RecordLayer) {
-    let layer = view.get_layer_last();
+    let layer = view.get_top_layer();
     let header = layer.get_column_header();
 
     if let Some(header) = header {
@@ -609,7 +611,7 @@ fn estimate_page_size(area: Rect, show_head: bool) -> u16 {
 
 /// scroll to the end of the data
 fn tail_data(state: &mut RecordView, page_size: usize) {
-    let layer = state.get_layer_last_mut();
+    let layer = state.get_top_layer_mut();
     let count_rows = layer.record_values.len();
     if count_rows > page_size {
         layer
@@ -648,8 +650,8 @@ fn highlight_selected_cell(f: &mut Frame, info: ElementInfo, cfg: &ExploreConfig
 
 fn build_last_value(v: &RecordView) -> Value {
     if v.mode == UIMode::Cursor {
-        v.get_current_value()
-    } else if v.get_layer_last().count_rows() < 2 {
+        v.get_current_value().clone()
+    } else if v.get_top_layer().count_rows() < 2 {
         build_table_as_record(v)
     } else {
         build_table_as_list(v)
@@ -657,7 +659,7 @@ fn build_last_value(v: &RecordView) -> Value {
 }
 
 fn build_table_as_list(v: &RecordView) -> Value {
-    let layer = v.get_layer_last();
+    let layer = v.get_top_layer();
 
     let vals = layer
         .record_values
@@ -677,7 +679,7 @@ fn build_table_as_list(v: &RecordView) -> Value {
 }
 
 fn build_table_as_record(v: &RecordView) -> Value {
-    let layer = v.get_layer_last();
+    let layer = v.get_top_layer();
 
     let mut record = Record::new();
     if let Some(row) = layer.record_values.first() {
diff --git a/crates/nu-explore/src/views/try.rs b/crates/nu-explore/src/views/try.rs
index 7ad6d38aef..b23ca3e9f4 100644
--- a/crates/nu-explore/src/views/try.rs
+++ b/crates/nu-explore/src/views/try.rs
@@ -242,8 +242,8 @@ impl View for TryView {
 
         if let Some(view) = &mut self.table {
             view.setup(config);
-            view.set_orientation(r.get_orientation_current());
-            view.set_orientation_current(r.get_orientation_current());
+            view.set_orientation(r.get_top_layer_orientation());
+            view.set_top_layer_orientation(r.get_top_layer_orientation());
         }
     }
 }
@@ -262,7 +262,7 @@ fn run_command(
 
     let mut view = RecordView::new(columns, values);
     if is_record {
-        view.set_orientation_current(Orientation::Left);
+        view.set_top_layer_orientation(Orientation::Left);
     }
 
     Ok(view)

From 34da26d039b85581332e58893cd539951a888c4f Mon Sep 17 00:00:00 2001
From: Himadri Bhattacharjee <107522312+lavafroth@users.noreply.github.com>
Date: Fri, 5 Jul 2024 19:31:27 +0530
Subject: [PATCH 0183/1072] fix: exotic types return float on division, self on
 modulo (#13301)

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

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

Related to #13298

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

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

Exotic types like `Duration` and `Filesize` return a float on division
by the same type, i.e., the unit is gone since division results in a
scalar. When using the modulo operator, the output type has the same
unit.

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

Division results in a float like the following:

```sh
~/Public/nushell> 512sec / 3sec
170.66666666666666
```

Modulo results in an output with the same unit:

```sh
~/Public/nushell> 512sec mod 3sec
2sec
```

Type checking isn't confused with output types:

```sh
~/Public/nushell> (512sec mod 3sec) / 0.5sec
4
```

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-parser/src/type_check.rs | 52 ++++++++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 2 deletions(-)

diff --git a/crates/nu-parser/src/type_check.rs b/crates/nu-parser/src/type_check.rs
index 872bb6a94c..6999a0469b 100644
--- a/crates/nu-parser/src/type_check.rs
+++ b/crates/nu-parser/src/type_check.rs
@@ -278,8 +278,7 @@ pub fn math_result_type(
                     )
                 }
             },
-            Operator::Math(Math::Divide) | Operator::Math(Math::Modulo) => match (&lhs.ty, &rhs.ty)
-            {
+            Operator::Math(Math::Divide) => match (&lhs.ty, &rhs.ty) {
                 (Type::Int, Type::Int) => (Type::Int, None),
                 (Type::Float, Type::Int) => (Type::Float, None),
                 (Type::Int, Type::Float) => (Type::Float, None),
@@ -292,6 +291,55 @@ pub fn math_result_type(
                 (Type::Filesize, Type::Filesize) => (Type::Float, None),
                 (Type::Filesize, Type::Int) => (Type::Filesize, None),
                 (Type::Filesize, Type::Float) => (Type::Filesize, None),
+                (Type::Duration, Type::Duration) => (Type::Float, None),
+                (Type::Duration, Type::Int) => (Type::Duration, None),
+                (Type::Duration, Type::Float) => (Type::Duration, None),
+
+                (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
+                (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
+
+                (Type::Any, _) => (Type::Any, None),
+                (_, Type::Any) => (Type::Any, None),
+                (Type::Int | Type::Float | Type::Filesize | Type::Duration, _) => {
+                    *op = Expression::garbage(working_set, op.span);
+                    (
+                        Type::Any,
+                        Some(ParseError::UnsupportedOperationRHS(
+                            "division".into(),
+                            op.span,
+                            lhs.span,
+                            lhs.ty.clone(),
+                            rhs.span,
+                            rhs.ty.clone(),
+                        )),
+                    )
+                }
+                _ => {
+                    *op = Expression::garbage(working_set, op.span);
+                    (
+                        Type::Any,
+                        Some(ParseError::UnsupportedOperationLHS(
+                            "division".into(),
+                            op.span,
+                            lhs.span,
+                            lhs.ty.clone(),
+                        )),
+                    )
+                }
+            },
+            Operator::Math(Math::Modulo) => match (&lhs.ty, &rhs.ty) {
+                (Type::Int, Type::Int) => (Type::Int, None),
+                (Type::Float, Type::Int) => (Type::Float, None),
+                (Type::Int, Type::Float) => (Type::Float, None),
+                (Type::Float, Type::Float) => (Type::Float, None),
+                (Type::Number, Type::Number) => (Type::Number, None),
+                (Type::Number, Type::Int) => (Type::Number, None),
+                (Type::Int, Type::Number) => (Type::Number, None),
+                (Type::Number, Type::Float) => (Type::Number, None),
+                (Type::Float, Type::Number) => (Type::Number, None),
+                (Type::Filesize, Type::Filesize) => (Type::Filesize, None),
+                (Type::Filesize, Type::Int) => (Type::Filesize, None),
+                (Type::Filesize, Type::Float) => (Type::Filesize, None),
                 (Type::Duration, Type::Duration) => (Type::Duration, None),
                 (Type::Duration, Type::Int) => (Type::Duration, None),
                 (Type::Duration, Type::Float) => (Type::Duration, None),

From 948b90299db6db1ef5ea8dcb503af8ee046db211 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Fri, 5 Jul 2024 14:10:41 -0700
Subject: [PATCH 0184/1072] Preserve attributes on external ByteStreams
 (#13305)

# Description

Bug fix: `PipelineData::check_external_failed()` was not preserving the
original `type_` and `known_size` attributes of the stream passed in for
streams that come from children, so `external-command | into binary` did
not work properly and always ended up still being unknown type.

# User-Facing Changes
The following test case now works as expected:

```nushell
> head -c 2 /dev/urandom | into binary
# Expected: pretty hex dump of binary
# Previous behavior: just raw binary in the terminal
```

# Tests + Formatting
Added a test to cover this to `into binary`
---
 .../tests/commands/conversions/into/binary.rs       | 13 +++++++++++++
 .../tests/commands/conversions/into/mod.rs          |  1 +
 crates/nu-protocol/src/pipeline/pipeline_data.rs    |  9 +++++++--
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 crates/nu-command/tests/commands/conversions/into/binary.rs

diff --git a/crates/nu-command/tests/commands/conversions/into/binary.rs b/crates/nu-command/tests/commands/conversions/into/binary.rs
new file mode 100644
index 0000000000..c8fd24df77
--- /dev/null
+++ b/crates/nu-command/tests/commands/conversions/into/binary.rs
@@ -0,0 +1,13 @@
+use nu_test_support::nu;
+
+#[test]
+fn sets_stream_from_internal_command_as_binary() {
+    let result = nu!("seq 1 10 | to text | into binary | describe");
+    assert_eq!("binary (stream)", result.out);
+}
+
+#[test]
+fn sets_stream_from_external_command_as_binary() {
+    let result = nu!("^nu --testbin cococo | into binary | describe");
+    assert_eq!("binary (stream)", result.out);
+}
diff --git a/crates/nu-command/tests/commands/conversions/into/mod.rs b/crates/nu-command/tests/commands/conversions/into/mod.rs
index a7a829445a..ad10199b5c 100644
--- a/crates/nu-command/tests/commands/conversions/into/mod.rs
+++ b/crates/nu-command/tests/commands/conversions/into/mod.rs
@@ -1 +1,2 @@
+mod binary;
 mod int;
diff --git a/crates/nu-protocol/src/pipeline/pipeline_data.rs b/crates/nu-protocol/src/pipeline/pipeline_data.rs
index 03fbc64d21..c0c0bd1c33 100644
--- a/crates/nu-protocol/src/pipeline/pipeline_data.rs
+++ b/crates/nu-protocol/src/pipeline/pipeline_data.rs
@@ -453,7 +453,10 @@ impl PipelineData {
     /// Currently this will consume an external command to completion.
     pub fn check_external_failed(self) -> Result<(Self, bool), ShellError> {
         if let PipelineData::ByteStream(stream, metadata) = self {
+            // Preserve stream attributes
             let span = stream.span();
+            let type_ = stream.type_();
+            let known_size = stream.known_size();
             match stream.into_child() {
                 Ok(mut child) => {
                     // Only check children without stdout. This means that nothing
@@ -485,10 +488,12 @@ impl PipelineData {
                             child.stderr = Some(ChildPipe::Tee(Box::new(Cursor::new(stderr))));
                         }
                         child.set_exit_code(code);
-                        let stream = ByteStream::child(child, span);
+                        let stream = ByteStream::child(child, span).with_type(type_);
                         Ok((PipelineData::ByteStream(stream, metadata), code != 0))
                     } else {
-                        let stream = ByteStream::child(child, span);
+                        let stream = ByteStream::child(child, span)
+                            .with_type(type_)
+                            .with_known_size(known_size);
                         Ok((PipelineData::ByteStream(stream, metadata), false))
                     }
                 }

From de2b752771f5d1d5672983a00a3676a246196295 Mon Sep 17 00:00:00 2001
From: Yash Thakur <45539777+ysthakur@users.noreply.github.com>
Date: Fri, 5 Jul 2024 18:58:35 -0400
Subject: [PATCH 0185/1072] Fix variable completion sort order (#13306)

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

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

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

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

My last PR (https://github.com/nushell/nushell/pull/13242) made it so
that the last branch in the variable completer doesn't sort suggestions.
Sorry about that. This should fix it.

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

Variables will now be sorted properly.

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

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

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

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

Added one test case to verify this won't happen again.

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-cli/src/completions/variable_completions.rs | 2 ++
 crates/nu-cli/tests/completions/mod.rs                | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/crates/nu-cli/src/completions/variable_completions.rs b/crates/nu-cli/src/completions/variable_completions.rs
index ab04da13ea..72a69e942c 100644
--- a/crates/nu-cli/src/completions/variable_completions.rs
+++ b/crates/nu-cli/src/completions/variable_completions.rs
@@ -229,6 +229,8 @@ impl Completer for VariableCompletion {
             }
         }
 
+        output = sort_suggestions(&prefix_str, output, SortBy::Ascending);
+
         output.dedup(); // TODO: Removes only consecutive duplicates, is it intended?
 
         output
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index 03f37925f5..a7f88dc3b0 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -107,7 +107,7 @@ fn subcommand_completer() -> NuCompleter {
 }
 
 #[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));
@@ -907,6 +907,11 @@ fn variables_completions() {
 
     // Match results
     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]

From d2a1f96dbd95ce55dc95c43ad4a65b0dd3f26c58 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Sat, 6 Jul 2024 12:04:19 -0500
Subject: [PATCH 0186/1072] update to latest reedline commit (#13313)

# Description

Update to the latest reedline version.

(don't ask me why libloading changed. `cargo update -p reedline`
sometimes does weird things)

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
/cc @YizhePKU (this include your reedline pwd change)
---
 Cargo.lock | 7 +++----
 Cargo.toml | 3 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 72b7f72b3b..d4f759aed0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2382,9 +2382,9 @@ dependencies = [
 
 [[package]]
 name = "libloading"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
+checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d"
 dependencies = [
  "cfg-if",
  "windows-targets 0.52.5",
@@ -4988,8 +4988,7 @@ dependencies = [
 [[package]]
 name = "reedline"
 version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abf59e4c97b5049ba96b052cdb652368305a2eddcbce9bf1c16f9d003139eeea"
+source = "git+https://github.com/nushell/reedline?branch=main#480059a3f52cf919341cda88e8c544edd846bc73"
 dependencies = [
  "arboard",
  "chrono",
diff --git a/Cargo.toml b/Cargo.toml
index 573ace795f..5701fe3958 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -197,7 +197,6 @@ nu-protocol = { path = "./crates/nu-protocol", version = "0.95.1" }
 nu-std = { path = "./crates/nu-std", version = "0.95.1" }
 nu-system = { path = "./crates/nu-system", version = "0.95.1" }
 nu-utils = { path = "./crates/nu-utils", version = "0.95.1" }
-
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
 crossterm = { workspace = true }
@@ -304,7 +303,7 @@ 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`

From fa183b66699bbd9ed05f6b0a34a129cc981e93e0 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Sat, 6 Jul 2024 18:09:12 +0000
Subject: [PATCH 0187/1072] `help operators` refactor (#13307)

# Description
Refactors `help operators` so that its output is always up to date with
the parser.

# User-Facing Changes
- The order of output rows for `help operators` was changed.
- `not` is now listed as a boolean operator instead of a comparison
operator.
- Edited some of the descriptions for the operators.
---
 crates/nu-command/src/help/help_operators.rs | 401 +++++++------------
 crates/nu-parser/src/parser.rs               |   2 +-
 crates/nu-protocol/src/ast/expression.rs     |  37 +-
 crates/nu-protocol/src/ast/operator.rs       |  40 +-
 4 files changed, 174 insertions(+), 306 deletions(-)

diff --git a/crates/nu-command/src/help/help_operators.rs b/crates/nu-command/src/help/help_operators.rs
index a7beee3dd5..12803fad8e 100644
--- a/crates/nu-command/src/help/help_operators.rs
+++ b/crates/nu-command/src/help/help_operators.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::ast::{Assignment, Bits, Boolean, Comparison, Math, Operator};
 
 #[derive(Clone)]
 pub struct HelpOperators;
@@ -27,282 +28,148 @@ impl Command for HelpOperators {
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
-        let op_info = generate_operator_info();
-        let mut recs = vec![];
-
-        for op in op_info {
-            recs.push(Value::record(
+        let mut operators = [
+            Operator::Assignment(Assignment::Assign),
+            Operator::Assignment(Assignment::PlusAssign),
+            Operator::Assignment(Assignment::AppendAssign),
+            Operator::Assignment(Assignment::MinusAssign),
+            Operator::Assignment(Assignment::MultiplyAssign),
+            Operator::Assignment(Assignment::DivideAssign),
+            Operator::Comparison(Comparison::Equal),
+            Operator::Comparison(Comparison::NotEqual),
+            Operator::Comparison(Comparison::LessThan),
+            Operator::Comparison(Comparison::GreaterThan),
+            Operator::Comparison(Comparison::LessThanOrEqual),
+            Operator::Comparison(Comparison::GreaterThanOrEqual),
+            Operator::Comparison(Comparison::RegexMatch),
+            Operator::Comparison(Comparison::NotRegexMatch),
+            Operator::Comparison(Comparison::In),
+            Operator::Comparison(Comparison::NotIn),
+            Operator::Comparison(Comparison::StartsWith),
+            Operator::Comparison(Comparison::EndsWith),
+            Operator::Math(Math::Plus),
+            Operator::Math(Math::Append),
+            Operator::Math(Math::Minus),
+            Operator::Math(Math::Multiply),
+            Operator::Math(Math::Divide),
+            Operator::Math(Math::Modulo),
+            Operator::Math(Math::FloorDivision),
+            Operator::Math(Math::Pow),
+            Operator::Bits(Bits::BitOr),
+            Operator::Bits(Bits::BitXor),
+            Operator::Bits(Bits::BitAnd),
+            Operator::Bits(Bits::ShiftLeft),
+            Operator::Bits(Bits::ShiftRight),
+            Operator::Boolean(Boolean::And),
+            Operator::Boolean(Boolean::Or),
+            Operator::Boolean(Boolean::Xor),
+        ]
+        .into_iter()
+        .map(|op| {
+            Value::record(
                 record! {
-                    "type" => Value::string(op.op_type, head),
-                    "operator" => Value::string(op.operator, head),
-                    "name" => Value::string(op.name, head),
-                    "description" => Value::string(op.description, head),
-                    "precedence" => Value::int(op.precedence, head),
+                    "type" => Value::string(op_type(&op), head),
+                    "operator" => Value::string(op.to_string(), head),
+                    "name" => Value::string(name(&op), head),
+                    "description" => Value::string(description(&op), head),
+                    "precedence" => Value::int(op.precedence().into(), head),
                 },
                 head,
-            ));
-        }
+            )
+        })
+        .collect::<Vec<_>>();
 
-        Ok(Value::list(recs, head).into_pipeline_data())
+        operators.push(Value::record(
+            record! {
+                "type" => Value::string("Boolean", head),
+                "operator" => Value::string("not", head),
+                "name" => Value::string("Not", head),
+                "description" => Value::string("Negates a value or expression.", head),
+                "precedence" => Value::int(0, head),
+            },
+            head,
+        ));
+
+        Ok(Value::list(operators, head).into_pipeline_data())
     }
 }
 
-struct OperatorInfo {
-    op_type: String,
-    operator: String,
-    name: String,
-    description: String,
-    precedence: i64,
+fn op_type(operator: &Operator) -> &'static str {
+    match operator {
+        Operator::Comparison(_) => "Comparison",
+        Operator::Math(_) => "Math",
+        Operator::Boolean(_) => "Boolean",
+        Operator::Bits(_) => "Bitwise",
+        Operator::Assignment(_) => "Assignment",
+    }
 }
 
-fn generate_operator_info() -> Vec<OperatorInfo> {
-    vec![
-        OperatorInfo {
-            op_type: "Assignment".into(),
-            operator: "=".into(),
-            name: "Assign".into(),
-            description: "Assigns a value to a variable.".into(),
-            precedence: 10,
-        },
-        OperatorInfo {
-            op_type: "Assignment".into(),
-            operator: "+=".into(),
-            name: "PlusAssign".into(),
-            description: "Adds a value to a variable.".into(),
-            precedence: 10,
-        },
-        OperatorInfo {
-            op_type: "Assignment".into(),
-            operator: "++=".into(),
-            name: "AppendAssign".into(),
-            description: "Appends a list or a value to a variable.".into(),
-            precedence: 10,
-        },
-        OperatorInfo {
-            op_type: "Assignment".into(),
-            operator: "-=".into(),
-            name: "MinusAssign".into(),
-            description: "Subtracts a value from a variable.".into(),
-            precedence: 10,
-        },
-        OperatorInfo {
-            op_type: "Assignment".into(),
-            operator: "*=".into(),
-            name: "MultiplyAssign".into(),
-            description: "Multiplies a variable by a value.".into(),
-            precedence: 10,
-        },
-        OperatorInfo {
-            op_type: "Assignment".into(),
-            operator: "/=".into(),
-            name: "DivideAssign".into(),
-            description: "Divides a variable by a value.".into(),
-            precedence: 10,
-        },
-        OperatorInfo {
-            op_type: "Comparison".into(),
-            operator: "==".into(),
-            name: "Equal".into(),
-            description: "Checks if two values are equal.".into(),
-            precedence: 80,
-        },
-        OperatorInfo {
-            op_type: "Comparison".into(),
-            operator: "!=".into(),
-            name: "NotEqual".into(),
-            description: "Checks if two values are not equal.".into(),
-            precedence: 80,
-        },
-        OperatorInfo {
-            op_type: "Comparison".into(),
-            operator: "<".into(),
-            name: "LessThan".into(),
-            description: "Checks if a value is less than another.".into(),
-            precedence: 80,
-        },
-        OperatorInfo {
-            op_type: "Comparison".into(),
-            operator: "<=".into(),
-            name: "LessThanOrEqual".into(),
-            description: "Checks if a value is less than or equal to another.".into(),
-            precedence: 80,
-        },
-        OperatorInfo {
-            op_type: "Comparison".into(),
-            operator: ">".into(),
-            name: "GreaterThan".into(),
-            description: "Checks if a value is greater than another.".into(),
-            precedence: 80,
-        },
-        OperatorInfo {
-            op_type: "Comparison".into(),
-            operator: ">=".into(),
-            name: "GreaterThanOrEqual".into(),
-            description: "Checks if a value is greater than or equal to another.".into(),
-            precedence: 80,
-        },
-        OperatorInfo {
-            op_type: "Comparison".into(),
-            operator: "=~".into(),
-            name: "RegexMatch".into(),
-            description: "Checks if a value matches a regular expression.".into(),
-            precedence: 80,
-        },
-        OperatorInfo {
-            op_type: "Comparison".into(),
-            operator: "!~".into(),
-            name: "NotRegexMatch".into(),
-            description: "Checks if a value does not match a regular expression.".into(),
-            precedence: 80,
-        },
-        OperatorInfo {
-            op_type: "Comparison".into(),
-            operator: "in".into(),
-            name: "In".into(),
-            description: "Checks if a value is in a list or string.".into(),
-            precedence: 80,
-        },
-        OperatorInfo {
-            op_type: "Comparison".into(),
-            operator: "not-in".into(),
-            name: "NotIn".into(),
-            description: "Checks if a value is not in a list or string.".into(),
-            precedence: 80,
-        },
-        OperatorInfo {
-            op_type: "Comparison".into(),
-            operator: "starts-with".into(),
-            name: "StartsWith".into(),
-            description: "Checks if a string starts with another.".into(),
-            precedence: 80,
-        },
-        OperatorInfo {
-            op_type: "Comparison".into(),
-            operator: "ends-with".into(),
-            name: "EndsWith".into(),
-            description: "Checks if a string ends with another.".into(),
-            precedence: 80,
-        },
-        OperatorInfo {
-            op_type: "Comparison".into(),
-            operator: "not".into(),
-            name: "UnaryNot".into(),
-            description: "Negates a value or expression.".into(),
-            precedence: 0,
-        },
-        OperatorInfo {
-            op_type: "Math".into(),
-            operator: "+".into(),
-            name: "Plus".into(),
-            description: "Adds two values.".into(),
-            precedence: 90,
-        },
-        OperatorInfo {
-            op_type: "Math".into(),
-            operator: "++".into(),
-            name: "Append".into(),
-            description: "Appends two lists or a list and a value.".into(),
-            precedence: 80,
-        },
-        OperatorInfo {
-            op_type: "Math".into(),
-            operator: "-".into(),
-            name: "Minus".into(),
-            description: "Subtracts two values.".into(),
-            precedence: 90,
-        },
-        OperatorInfo {
-            op_type: "Math".into(),
-            operator: "*".into(),
-            name: "Multiply".into(),
-            description: "Multiplies two values.".into(),
-            precedence: 95,
-        },
-        OperatorInfo {
-            op_type: "Math".into(),
-            operator: "/".into(),
-            name: "Divide".into(),
-            description: "Divides two values.".into(),
-            precedence: 95,
-        },
-        OperatorInfo {
-            op_type: "Math".into(),
-            operator: "//".into(),
-            name: "FloorDivision".into(),
-            description: "Divides two values and floors the result.".into(),
-            precedence: 95,
-        },
-        OperatorInfo {
-            op_type: "Math".into(),
-            operator: "mod".into(),
-            name: "Modulo".into(),
-            description: "Divides two values and returns the remainder.".into(),
-            precedence: 95,
-        },
-        OperatorInfo {
-            op_type: "Math".into(),
-            operator: "**".into(),
-            name: "Pow ".into(),
-            description: "Raises one value to the power of another.".into(),
-            precedence: 100,
-        },
-        OperatorInfo {
-            op_type: "Bitwise".into(),
-            operator: "bit-or".into(),
-            name: "BitOr".into(),
-            description: "Performs a bitwise OR on two values.".into(),
-            precedence: 60,
-        },
-        OperatorInfo {
-            op_type: "Bitwise".into(),
-            operator: "bit-xor".into(),
-            name: "BitXor".into(),
-            description: "Performs a bitwise XOR on two values.".into(),
-            precedence: 70,
-        },
-        OperatorInfo {
-            op_type: "Bitwise".into(),
-            operator: "bit-and".into(),
-            name: "BitAnd".into(),
-            description: "Performs a bitwise AND on two values.".into(),
-            precedence: 75,
-        },
-        OperatorInfo {
-            op_type: "Bitwise".into(),
-            operator: "bit-shl".into(),
-            name: "ShiftLeft".into(),
-            description: "Shifts a value left by another.".into(),
-            precedence: 85,
-        },
-        OperatorInfo {
-            op_type: "Bitwise".into(),
-            operator: "bit-shr".into(),
-            name: "ShiftRight".into(),
-            description: "Shifts a value right by another.".into(),
-            precedence: 85,
-        },
-        OperatorInfo {
-            op_type: "Boolean".into(),
-            operator: "and".into(),
-            name: "And".into(),
-            description: "Checks if two values are true.".into(),
-            precedence: 50,
-        },
-        OperatorInfo {
-            op_type: "Boolean".into(),
-            operator: "or".into(),
-            name: "Or".into(),
-            description: "Checks if either value is true.".into(),
-            precedence: 40,
-        },
-        OperatorInfo {
-            op_type: "Boolean".into(),
-            operator: "xor".into(),
-            name: "Xor".into(),
-            description: "Checks if one value is true and the other is false.".into(),
-            precedence: 45,
-        },
-    ]
+fn name(operator: &Operator) -> String {
+    match operator {
+        Operator::Comparison(op) => format!("{op:?}"),
+        Operator::Math(op) => format!("{op:?}"),
+        Operator::Boolean(op) => format!("{op:?}"),
+        Operator::Bits(op) => format!("{op:?}"),
+        Operator::Assignment(op) => format!("{op:?}"),
+    }
+}
+
+fn description(operator: &Operator) -> &'static str {
+    // NOTE: if you have to add an operator here, also add it to the operator list above.
+    match operator {
+        Operator::Comparison(Comparison::Equal) => "Checks if two values are equal.",
+        Operator::Comparison(Comparison::NotEqual) => "Checks if two values are not equal.",
+        Operator::Comparison(Comparison::LessThan) => "Checks if a value is less than another.",
+        Operator::Comparison(Comparison::GreaterThan) => {
+            "Checks if a value is greater than another."
+        }
+        Operator::Comparison(Comparison::LessThanOrEqual) => {
+            "Checks if a value is less than or equal to another."
+        }
+        Operator::Comparison(Comparison::GreaterThanOrEqual) => {
+            "Checks if a value is greater than or equal to another."
+        }
+        Operator::Comparison(Comparison::RegexMatch) => {
+            "Checks if a value matches a regular expression."
+        }
+        Operator::Comparison(Comparison::NotRegexMatch) => {
+            "Checks if a value does not match a regular expression."
+        }
+        Operator::Comparison(Comparison::In) => {
+            "Checks if a value is in a list, is part of a string, or is a key in a record."
+        }
+        Operator::Comparison(Comparison::NotIn) => {
+            "Checks if a value is not in a list, is not part of a string, or is not a key in a record."
+        }
+        Operator::Comparison(Comparison::StartsWith) => "Checks if a string starts with another.",
+        Operator::Comparison(Comparison::EndsWith) => "Checks if a string ends with another.",
+        Operator::Math(Math::Plus) => "Adds two values.",
+        Operator::Math(Math::Append) => {
+            "Appends two lists, a list and a value, two strings, or two binary values."
+        }
+        Operator::Math(Math::Minus) => "Subtracts two values.",
+        Operator::Math(Math::Multiply) => "Multiplies two values.",
+        Operator::Math(Math::Divide) => "Divides two values.",
+        Operator::Math(Math::Modulo) => "Divides two values and returns the remainder.",
+        Operator::Math(Math::FloorDivision) => "Divides two values and floors the result.",
+        Operator::Math(Math::Pow) => "Raises one value to the power of another.",
+        Operator::Boolean(Boolean::And) => "Checks if both values are true.",
+        Operator::Boolean(Boolean::Or) => "Checks if either value is true.",
+        Operator::Boolean(Boolean::Xor) => "Checks if one value is true and the other is false.",
+        Operator::Bits(Bits::BitOr) => "Performs a bitwise OR on two values.",
+        Operator::Bits(Bits::BitXor) => "Performs a bitwise XOR on two values.",
+        Operator::Bits(Bits::BitAnd) => "Performs a bitwise AND on two values.",
+        Operator::Bits(Bits::ShiftLeft) => "Bitwise shifts a value left by another.",
+        Operator::Bits(Bits::ShiftRight) => "Bitwise shifts a value right by another.",
+        Operator::Assignment(Assignment::Assign) => "Assigns a value to a variable.",
+        Operator::Assignment(Assignment::PlusAssign) => "Adds a value to a variable.",
+        Operator::Assignment(Assignment::AppendAssign) => {
+            "Appends a list, a value, a string, or a binary value to a variable."
+        }
+        Operator::Assignment(Assignment::MinusAssign) => "Subtracts a value from a variable.",
+        Operator::Assignment(Assignment::MultiplyAssign) => "Multiplies a variable by a value.",
+        Operator::Assignment(Assignment::DivideAssign) => "Divides a variable by a value.",
+    }
 }
 
 #[cfg(test)]
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index b274d77404..51935214f5 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -4950,7 +4950,7 @@ pub fn parse_math_expression(
     let mut expr_stack: Vec<Expression> = vec![];
 
     let mut idx = 0;
-    let mut last_prec = 1000000;
+    let mut last_prec = u8::MAX;
 
     let first_span = working_set.get_span_contents(spans[0]);
 
diff --git a/crates/nu-protocol/src/ast/expression.rs b/crates/nu-protocol/src/ast/expression.rs
index 040e140cab..906fce3fe1 100644
--- a/crates/nu-protocol/src/ast/expression.rs
+++ b/crates/nu-protocol/src/ast/expression.rs
@@ -27,42 +27,9 @@ impl Expression {
         }
     }
 
-    pub fn precedence(&self) -> usize {
+    pub fn precedence(&self) -> u8 {
         match &self.expr {
-            Expr::Operator(operator) => {
-                use super::operator::*;
-                // Higher precedence binds tighter
-
-                match operator {
-                    Operator::Math(Math::Pow) => 100,
-                    Operator::Math(Math::Multiply)
-                    | Operator::Math(Math::Divide)
-                    | Operator::Math(Math::Modulo)
-                    | Operator::Math(Math::FloorDivision) => 95,
-                    Operator::Math(Math::Plus) | Operator::Math(Math::Minus) => 90,
-                    Operator::Bits(Bits::ShiftLeft) | Operator::Bits(Bits::ShiftRight) => 85,
-                    Operator::Comparison(Comparison::NotRegexMatch)
-                    | Operator::Comparison(Comparison::RegexMatch)
-                    | Operator::Comparison(Comparison::StartsWith)
-                    | Operator::Comparison(Comparison::EndsWith)
-                    | Operator::Comparison(Comparison::LessThan)
-                    | Operator::Comparison(Comparison::LessThanOrEqual)
-                    | Operator::Comparison(Comparison::GreaterThan)
-                    | Operator::Comparison(Comparison::GreaterThanOrEqual)
-                    | Operator::Comparison(Comparison::Equal)
-                    | Operator::Comparison(Comparison::NotEqual)
-                    | Operator::Comparison(Comparison::In)
-                    | Operator::Comparison(Comparison::NotIn)
-                    | Operator::Math(Math::Append) => 80,
-                    Operator::Bits(Bits::BitAnd) => 75,
-                    Operator::Bits(Bits::BitXor) => 70,
-                    Operator::Bits(Bits::BitOr) => 60,
-                    Operator::Boolean(Boolean::And) => 50,
-                    Operator::Boolean(Boolean::Xor) => 45,
-                    Operator::Boolean(Boolean::Or) => 40,
-                    Operator::Assignment(_) => 10,
-                }
-            }
+            Expr::Operator(operator) => operator.precedence(),
             _ => 0,
         }
     }
diff --git a/crates/nu-protocol/src/ast/operator.rs b/crates/nu-protocol/src/ast/operator.rs
index 46484761bc..713c6c0060 100644
--- a/crates/nu-protocol/src/ast/operator.rs
+++ b/crates/nu-protocol/src/ast/operator.rs
@@ -68,6 +68,40 @@ pub enum Operator {
     Assignment(Assignment),
 }
 
+impl Operator {
+    pub fn precedence(&self) -> u8 {
+        match self {
+            Self::Math(Math::Pow) => 100,
+            Self::Math(Math::Multiply)
+            | Self::Math(Math::Divide)
+            | Self::Math(Math::Modulo)
+            | Self::Math(Math::FloorDivision) => 95,
+            Self::Math(Math::Plus) | Self::Math(Math::Minus) => 90,
+            Self::Bits(Bits::ShiftLeft) | Self::Bits(Bits::ShiftRight) => 85,
+            Self::Comparison(Comparison::NotRegexMatch)
+            | Self::Comparison(Comparison::RegexMatch)
+            | Self::Comparison(Comparison::StartsWith)
+            | Self::Comparison(Comparison::EndsWith)
+            | Self::Comparison(Comparison::LessThan)
+            | Self::Comparison(Comparison::LessThanOrEqual)
+            | Self::Comparison(Comparison::GreaterThan)
+            | Self::Comparison(Comparison::GreaterThanOrEqual)
+            | Self::Comparison(Comparison::Equal)
+            | Self::Comparison(Comparison::NotEqual)
+            | Self::Comparison(Comparison::In)
+            | Self::Comparison(Comparison::NotIn)
+            | Self::Math(Math::Append) => 80,
+            Self::Bits(Bits::BitAnd) => 75,
+            Self::Bits(Bits::BitXor) => 70,
+            Self::Bits(Bits::BitOr) => 60,
+            Self::Boolean(Boolean::And) => 50,
+            Self::Boolean(Boolean::Xor) => 45,
+            Self::Boolean(Boolean::Or) => 40,
+            Self::Assignment(_) => 10,
+        }
+    }
+}
+
 impl Display for Operator {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
@@ -95,10 +129,10 @@ impl Display for Operator {
             Operator::Math(Math::Multiply) => write!(f, "*"),
             Operator::Math(Math::Divide) => write!(f, "/"),
             Operator::Math(Math::Modulo) => write!(f, "mod"),
-            Operator::Math(Math::FloorDivision) => write!(f, "fdiv"),
+            Operator::Math(Math::FloorDivision) => write!(f, "//"),
             Operator::Math(Math::Pow) => write!(f, "**"),
-            Operator::Boolean(Boolean::And) => write!(f, "&&"),
-            Operator::Boolean(Boolean::Or) => write!(f, "||"),
+            Operator::Boolean(Boolean::And) => write!(f, "and"),
+            Operator::Boolean(Boolean::Or) => write!(f, "or"),
             Operator::Boolean(Boolean::Xor) => write!(f, "xor"),
             Operator::Bits(Bits::BitOr) => write!(f, "bit-or"),
             Operator::Bits(Bits::BitXor) => write!(f, "bit-xor"),

From 32db5d3aa31f7d0ac5494c78086d9ff01b3d2190 Mon Sep 17 00:00:00 2001
From: Maxim Zhiburt <zhiburt@gmail.com>
Date: Sat, 6 Jul 2024 22:47:39 +0300
Subject: [PATCH 0188/1072] Fix issue with head on separation lines (#13291)

Hi there,

Seems to work

Though I haven't done a lot of testing.


![image](https://github.com/nushell/nushell/assets/20165848/c95aa8d4-a8d2-462c-afc9-35c48f8825f4)

![image](https://github.com/nushell/nushell/assets/20165848/1859dfe5-4a76-4776-a4e0-d3f53fc86862)

![image](https://github.com/nushell/nushell/assets/20165848/b46bb62b-a951-412d-b8fa-65cebcfbfed6)

![image](https://github.com/nushell/nushell/assets/20165848/bff0762e-42d4-41bf-b2c2-641c0436ca2e)

![image](https://github.com/nushell/nushell/assets/20165848/2c3c5664-9b90-44e4-befc-c250174cb630)


close #13287
cc: @fdncred

PS: Yessssss I do remember about emojie issue..... :disappointed:
---
 crates/nu-table/src/table.rs | 354 +++++++++++++++++++++++++++++------
 1 file changed, 300 insertions(+), 54 deletions(-)

diff --git a/crates/nu-table/src/table.rs b/crates/nu-table/src/table.rs
index bdaf7fb6c3..e1b1269874 100644
--- a/crates/nu-table/src/table.rs
+++ b/crates/nu-table/src/table.rs
@@ -12,13 +12,17 @@ use tabled::{
         config::{AlignmentHorizontal, ColoredConfig, Entity, EntityMap, Position},
         dimension::CompleteDimensionVecRecords,
         records::{
-            vec_records::{CellInfo, VecRecords},
+            vec_records::{Cell, CellInfo, VecRecords},
             ExactRecords, PeekableRecords, Records, Resizable,
         },
     },
     settings::{
-        formatting::AlignmentStrategy, object::Segment, peaker::Peaker, themes::ColumnNames, Color,
-        Modify, Padding, Settings, TableOption, Width,
+        formatting::AlignmentStrategy,
+        object::{Columns, Segment},
+        peaker::Peaker,
+        themes::ColumnNames,
+        width::Truncate,
+        Color, Modify, Padding, Settings, TableOption, Width,
     },
     Table,
 };
@@ -216,7 +220,7 @@ fn build_table(
     }
 
     let pad = indent.0 + indent.1;
-    let widths = maybe_truncate_columns(&mut data, &cfg.theme, termwidth, pad);
+    let widths = maybe_truncate_columns(&mut data, &cfg, termwidth, pad);
     if widths.is_empty() {
         return None;
     }
@@ -269,20 +273,51 @@ fn set_indent(table: &mut Table, left: usize, right: usize) {
 fn set_border_head(table: &mut Table, with_footer: bool, wctrl: TableWidthCtrl) {
     if with_footer {
         let count_rows = table.count_rows();
+        let last_row_index = count_rows - 1;
+
+        // note: funnily last and row must be equal at this point but we do not rely on it just in case.
+
+        let mut first_row = GetRow(0, Vec::new());
+        let mut head_settings = GetRowSettings(0, AlignmentHorizontal::Left, None);
+        let mut last_row = GetRow(last_row_index, Vec::new());
+
+        table.with(&mut first_row);
+        table.with(&mut head_settings);
+        table.with(&mut last_row);
+
         table.with(
             Settings::default()
                 .with(wctrl)
                 .with(StripColorFromRow(0))
                 .with(StripColorFromRow(count_rows - 1))
-                .with(HeaderMove((0, 0), true))
-                .with(HeaderMove((count_rows - 1 - 1, count_rows - 1), false)),
+                .with(MoveRowNext::new(0, 0))
+                .with(MoveRowPrev::new(last_row_index - 1, last_row_index))
+                .with(SetLineHeaders::new(
+                    0,
+                    first_row.1,
+                    head_settings.1,
+                    head_settings.2.clone(),
+                ))
+                .with(SetLineHeaders::new(
+                    last_row_index - 1,
+                    last_row.1,
+                    head_settings.1,
+                    head_settings.2,
+                )),
         );
     } else {
+        let mut row = GetRow(0, Vec::new());
+        let mut row_opts = GetRowSettings(0, AlignmentHorizontal::Left, None);
+
+        table.with(&mut row);
+        table.with(&mut row_opts);
+
         table.with(
             Settings::default()
                 .with(wctrl)
                 .with(StripColorFromRow(0))
-                .with(HeaderMove((0, 0), true)),
+                .with(MoveRowNext::new(0, 0))
+                .with(SetLineHeaders::new(0, row.1, row_opts.1, row_opts.2)),
         );
     }
 }
@@ -324,11 +359,14 @@ impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for
                 max: self.max,
                 strategy: self.cfg.trim,
                 width: self.width,
+                do_as_head: self.cfg.header_on_border,
             }
             .change(rec, cfg, dim);
         } else if self.cfg.expand && self.max > total_width {
             Settings::new(SetDimensions(self.width), Width::increase(self.max))
                 .change(rec, cfg, dim)
+        } else {
+            SetDimensions(self.width).change(rec, cfg, dim);
         }
     }
 }
@@ -337,6 +375,7 @@ struct TableTrim {
     width: Vec<usize>,
     strategy: TrimStrategy,
     max: usize,
+    do_as_head: bool,
 }
 
 impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for TableTrim {
@@ -346,6 +385,44 @@ impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for
         cfg: &mut ColoredConfig,
         dims: &mut CompleteDimensionVecRecords<'_>,
     ) {
+        // we already must have been estimated that it's safe to do.
+        // and all dims will be suffitient
+        if self.do_as_head {
+            if recs.is_empty() {
+                return;
+            }
+
+            let headers = recs[0].to_owned();
+            for (i, head) in headers.into_iter().enumerate() {
+                let head_width = CellInfo::width(&head);
+
+                match &self.strategy {
+                    TrimStrategy::Wrap { try_to_keep_words } => {
+                        let mut wrap = Width::wrap(head_width);
+                        if *try_to_keep_words {
+                            wrap = wrap.keep_words();
+                        }
+
+                        Modify::new(Columns::single(i))
+                            .with(wrap)
+                            .change(recs, cfg, dims);
+                    }
+                    TrimStrategy::Truncate { suffix } => {
+                        let mut truncate = Width::truncate(self.max);
+                        if let Some(suffix) = suffix {
+                            truncate = truncate.suffix(suffix).suffix_try_color(true);
+                        }
+
+                        Modify::new(Columns::single(i))
+                            .with(truncate)
+                            .change(recs, cfg, dims);
+                    }
+                }
+            }
+
+            return;
+        }
+
         match self.strategy {
             TrimStrategy::Wrap { try_to_keep_words } => {
                 let mut wrap = Width::wrap(self.max).priority::<PriorityMax>();
@@ -460,19 +537,22 @@ fn load_theme(
 
 fn maybe_truncate_columns(
     data: &mut NuRecords,
-    theme: &TableTheme,
+    cfg: &NuTableConfig,
     termwidth: usize,
     pad: usize,
 ) -> Vec<usize> {
     const TERMWIDTH_THRESHOLD: usize = 120;
 
-    let truncate = if termwidth > TERMWIDTH_THRESHOLD {
+    let preserve_content = termwidth > TERMWIDTH_THRESHOLD;
+    let truncate = if cfg.header_on_border {
+        truncate_columns_by_head
+    } else if preserve_content {
         truncate_columns_by_columns
     } else {
         truncate_columns_by_content
     };
 
-    truncate(data, theme, pad, termwidth)
+    truncate(data, &cfg.theme, pad, termwidth)
 }
 
 // VERSION where we are showing AS LITTLE COLUMNS AS POSSIBLE but WITH AS MUCH CONTENT AS POSSIBLE.
@@ -627,6 +707,83 @@ fn truncate_columns_by_columns(
     widths
 }
 
+// VERSION where we are showing AS LITTLE COLUMNS AS POSSIBLE but WITH AS MUCH CONTENT AS POSSIBLE.
+fn truncate_columns_by_head(
+    data: &mut NuRecords,
+    theme: &TableTheme,
+    pad: usize,
+    termwidth: usize,
+) -> Vec<usize> {
+    const TRAILING_COLUMN_WIDTH: usize = 5;
+
+    let config = get_config(theme, false, None);
+    let mut widths = build_width(&*data, pad);
+    let total_width = get_total_width2(&widths, &config);
+    if total_width <= termwidth {
+        return widths;
+    }
+
+    if data.is_empty() {
+        return widths;
+    }
+
+    let head = &data[0];
+
+    let borders = config.get_borders();
+    let has_vertical = borders.has_vertical();
+
+    let mut width = borders.has_left() as usize + borders.has_right() as usize;
+    let mut truncate_pos = 0;
+    for (i, column_header) in head.iter().enumerate() {
+        let column_header_width = Cell::width(column_header);
+        width += column_header_width;
+
+        if i > 0 {
+            width += has_vertical as usize;
+        }
+
+        if width >= termwidth {
+            width -= column_header_width + (i > 0 && has_vertical) as usize;
+            break;
+        }
+
+        truncate_pos += 1;
+    }
+
+    // we don't need any truncation then (is it possible?)
+    if truncate_pos == head.len() {
+        return widths;
+    }
+
+    if truncate_pos == 0 {
+        return vec![];
+    }
+
+    truncate_columns(data, truncate_pos);
+    widths.truncate(truncate_pos);
+
+    // Append columns with a trailing column
+
+    let min_width = width;
+
+    let diff = termwidth - min_width;
+    let can_trailing_column_be_pushed = diff > TRAILING_COLUMN_WIDTH + has_vertical as usize;
+
+    if !can_trailing_column_be_pushed {
+        if data.count_columns() == 1 {
+            return vec![];
+        }
+
+        truncate_columns(data, data.count_columns() - 1);
+        widths.pop();
+    }
+
+    push_empty_column(data);
+    widths.push(3 + pad);
+
+    widths
+}
+
 /// The same as [`tabled::peaker::PriorityMax`] but prioritizes left columns first in case of equal width.
 #[derive(Debug, Default, Clone)]
 pub struct PriorityMax;
@@ -714,9 +871,8 @@ impl<R> TableOption<R, CompleteDimensionVecRecords<'_>, ColoredConfig> for SetDi
 }
 
 // it assumes no spans is used.
+// todo: Could be replaced by Dimension impl usage
 fn build_width(records: &NuRecords, pad: usize) -> Vec<usize> {
-    use tabled::grid::records::vec_records::Cell;
-
     let count_columns = records.count_columns();
     let mut widths = vec![0; count_columns];
     for columns in records.iter_rows() {
@@ -729,50 +885,156 @@ fn build_width(records: &NuRecords, pad: usize) -> Vec<usize> {
     widths
 }
 
-struct HeaderMove((usize, usize), bool);
+struct GetRow(usize, Vec<String>);
 
-impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for HeaderMove {
+impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for &mut GetRow {
+    fn change(
+        self,
+        recs: &mut NuRecords,
+        _: &mut ColoredConfig,
+        _: &mut CompleteDimensionVecRecords<'_>,
+    ) {
+        let row = self.0;
+        self.1 = recs[row].iter().map(|c| c.as_ref().to_owned()).collect();
+    }
+}
+
+struct GetRowSettings(usize, AlignmentHorizontal, Option<Color>);
+
+impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig>
+    for &mut GetRowSettings
+{
+    fn change(
+        self,
+        _: &mut NuRecords,
+        cfg: &mut ColoredConfig,
+        _: &mut CompleteDimensionVecRecords<'_>,
+    ) {
+        let row = self.0;
+        self.1 = *cfg.get_alignment_horizontal(Entity::Row(row));
+        self.2 = cfg
+            .get_colors()
+            .get_color((row, 0))
+            .cloned()
+            .map(Color::from);
+    }
+}
+
+struct SetLineHeaders {
+    line: usize,
+    columns: Vec<String>,
+    alignment: AlignmentHorizontal,
+    color: Option<Color>,
+}
+
+impl SetLineHeaders {
+    fn new(
+        line: usize,
+        columns: Vec<String>,
+        alignment: AlignmentHorizontal,
+        color: Option<Color>,
+    ) -> Self {
+        Self {
+            line,
+            columns,
+            alignment,
+            color,
+        }
+    }
+}
+
+impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for SetLineHeaders {
     fn change(
         self,
         recs: &mut NuRecords,
         cfg: &mut ColoredConfig,
         dims: &mut CompleteDimensionVecRecords<'_>,
     ) {
-        let (row, line) = self.0;
-        if self.1 {
-            move_header_on_next(recs, cfg, dims, row, line);
-        } else {
-            move_header_on_prev(recs, cfg, dims, row, line);
-        }
+        let mut columns = self.columns;
+        match dims.get_widths() {
+            Some(widths) => {
+                columns = columns
+                    .into_iter()
+                    .zip(widths.iter().map(|w| w.checked_sub(2).unwrap_or(*w))) // exclude padding; which is generally 2
+                    .map(|(s, width)| Truncate::truncate_text(&s, width).into_owned())
+                    .collect();
+            }
+            None => {
+                // we don't have widths cached; which means that NO widtds adjustmens were done
+                // which means we are OK to leave columns as they are.
+                //
+                // but we are actually always got to have widths at this point
+            }
+        };
+
+        set_column_names(
+            recs,
+            cfg,
+            dims,
+            columns,
+            self.line,
+            self.alignment,
+            self.color,
+        )
     }
 }
 
-fn move_header_on_next(
-    recs: &mut NuRecords,
-    cfg: &mut ColoredConfig,
-    dims: &mut CompleteDimensionVecRecords<'_>,
+struct MoveRowNext {
     row: usize,
     line: usize,
-) {
+}
+
+impl MoveRowNext {
+    fn new(row: usize, line: usize) -> Self {
+        Self { row, line }
+    }
+}
+
+struct MoveRowPrev {
+    row: usize,
+    line: usize,
+}
+
+impl MoveRowPrev {
+    fn new(row: usize, line: usize) -> Self {
+        Self { row, line }
+    }
+}
+
+impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for MoveRowNext {
+    fn change(
+        self,
+        recs: &mut NuRecords,
+        cfg: &mut ColoredConfig,
+        _: &mut CompleteDimensionVecRecords<'_>,
+    ) {
+        row_shift_next(recs, cfg, self.row, self.line);
+    }
+}
+
+impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for MoveRowPrev {
+    fn change(
+        self,
+        recs: &mut NuRecords,
+        cfg: &mut ColoredConfig,
+        _: &mut CompleteDimensionVecRecords<'_>,
+    ) {
+        row_shift_prev(recs, cfg, self.row, self.line);
+    }
+}
+
+fn row_shift_next(recs: &mut NuRecords, cfg: &mut ColoredConfig, row: usize, line: usize) {
     let count_rows = recs.count_rows();
     let count_columns = recs.count_columns();
     let has_line = cfg.has_horizontal(line, count_rows);
     let has_next_line = cfg.has_horizontal(line + 1, count_rows);
-    let align = *cfg.get_alignment_horizontal(Entity::Row(row));
-    let color = cfg
-        .get_colors()
-        .get_color((row, 0))
-        .cloned()
-        .map(Color::from);
-
     if !has_line && !has_next_line {
         return;
     }
 
     if !has_line {
-        let head = remove_row(recs, row);
+        let _ = remove_row(recs, row);
         let count_rows = recs.count_rows();
-        set_column_names(recs, cfg, dims, head, line, align, color);
         shift_alignments_down(cfg, row, count_rows, count_columns);
         shift_colors_down(cfg, row, count_rows, count_columns);
         shift_lines_up(cfg, count_rows, &[line + 1]);
@@ -780,47 +1042,31 @@ fn move_header_on_next(
         return;
     }
 
-    let head = remove_row(recs, row);
+    let _ = remove_row(recs, row);
     let count_rows = recs.count_rows();
-    set_column_names(recs, cfg, dims, head, line, align, color);
     shift_alignments_down(cfg, row, count_rows, count_columns);
     shift_colors_down(cfg, row, count_rows, count_columns);
     remove_lines(cfg, count_rows, &[line + 1]);
     shift_lines_up(cfg, count_rows, &[count_rows]);
 }
 
-fn move_header_on_prev(
-    recs: &mut NuRecords,
-    cfg: &mut ColoredConfig,
-    dims: &mut CompleteDimensionVecRecords<'_>,
-    row: usize,
-    line: usize,
-) {
+fn row_shift_prev(recs: &mut NuRecords, cfg: &mut ColoredConfig, row: usize, line: usize) {
     let count_rows = recs.count_rows();
     let count_columns = recs.count_columns();
     let has_line = cfg.has_horizontal(line, count_rows);
     let has_prev_line = cfg.has_horizontal(line - 1, count_rows);
-    let align = *cfg.get_alignment_horizontal(Entity::Row(row));
-    let color = cfg
-        .get_colors()
-        .get_color((row, 0))
-        .cloned()
-        .map(Color::from);
-
     if !has_line && !has_prev_line {
         return;
     }
 
     if !has_line {
-        let head = remove_row(recs, row);
+        let _ = remove_row(recs, row);
         // shift_lines_down(table, &[line - 1]);
-        set_column_names(recs, cfg, dims, head, line - 1, align, color);
         return;
     }
 
-    let head = remove_row(recs, row);
+    let _ = remove_row(recs, row);
     let count_rows = count_rows - 1;
-    set_column_names(recs, cfg, dims, head, line - 1, align, color);
     shift_alignments_down(cfg, row, count_rows, count_columns);
     shift_colors_down(cfg, row, count_rows, count_columns);
     remove_lines(cfg, count_rows, &[line - 1]);

From 5af8d6266600ceec4305121afe652a3da2d36f31 Mon Sep 17 00:00:00 2001
From: goldfish <37319612+ito-hiroki@users.noreply.github.com>
Date: Sun, 7 Jul 2024 21:55:06 +0900
Subject: [PATCH 0189/1072] Fix `from toml` to handle toml datetime correctly
 (#13315)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

fixed #12699

When bare dates or naive times are specified in toml files, `from toml`
returns invalid dates or times.
This PR fixes the problem to correctly handle toml datetime.

The current version command returns the default datetime
(`chrono::DateTime::default()`) if the datetime parse fails. However, I
felt that this behavior was a bit unfriendly, so I changed it to return
`Value::string`.

# User-Facing Changes

The command returns a date with default time and timezone if a bare date
is specified.

```
~/Development/nushell> "dob = 2023-05-27" | from toml
╭─────┬────────────╮
│ dob │ a year ago │
╰─────┴────────────╯
~/Development/nushell> "dob = 2023-05-27" | from toml |
Sat, 27 May 2023 00:00:00 +0000 (a year ago)
~/Development/nushell>
```

If a bare time is given, a time string is returned.

```
~/Development/nushell> "tm = 11:00:00" | from toml
╭────┬──────────╮
│ tm │ 11:00:00 │
╰────┴──────────╯
~/Development/nushell> "tm = 11:00:00" | from toml | get tm
11:00:00
~/Development/nushell>
```

# Tests + Formatting

When I ran tests, `commands::touch::change_file_mtime_to_reference`
failed with the following error.
The error also occurs in the master branch, so it's probably unrelated
to these changes.
(maybe a problem with my dev environment)

```
$ ~/Development/nushell> toolkit check pr

~~~~~~~~

test usage_start_uppercase ... ok
test format_conversions::yaml::convert_dict_to_yaml_with_integer_floats_key ... ok
test format_conversions::yaml::convert_dict_to_yaml_with_boolean_key ... ok
test format_conversions::yaml::table_to_yaml_text_and_from_yaml_text_back_into_table ... ok
test quickcheck_parse ... ok
test format_conversions::yaml::convert_dict_to_yaml_with_integer_key ... ok

failures:

---- commands::touch::change_file_mtime_to_reference stdout ----
=== stderr

thread 'commands::touch::change_file_mtime_to_reference' panicked at crates/nu-command/tests/commands/touch.rs:298:9:
assertion `left == right` failed
  left: SystemTime { tv_sec: 1720344745, tv_nsec: 862392750 }
 right: SystemTime { tv_sec: 1720344745, tv_nsec: 887670417 }


failures:
    commands::touch::change_file_mtime_to_reference

test result: FAILED. 1542 passed; 1 failed; 32 ignored; 0 measured; 0 filtered out; finished in 12.04s

error: test failed, to rerun pass `-p nu-command --test main`
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :red_circle: `toolkit test`
- :black_circle: `toolkit test stdlib`

~/Development/nushell> toolkit test stdlib
   Compiling nu v0.95.1 (/Users/hiroki/Development/nushell)
   Compiling nu-cmd-lang v0.95.1 (/Users/hiroki/Development/nushell/crates/nu-cmd-lang)
    Finished dev [unoptimized + debuginfo] target(s) in 6.64s
     Running `target/debug/nu --no-config-file -c '
        use crates/nu-std/testing.nu
        testing run-tests --path crates/nu-std
    '`
2024-07-07T19:00:20.423|INF|Running from_jsonl_invalid_object in module test_formats
2024-07-07T19:00:20.436|INF|Running env_log-prefix in module test_logger_env

~~~~~~~~~~~

2024-07-07T19:00:22.196|INF|Running debug_short in module test_basic_commands
~/Development/nushell>
```

# After Submitting

nothing
---
 crates/nu-command/src/formats/from/toml.rs | 193 +++++++++++++++++----
 1 file changed, 159 insertions(+), 34 deletions(-)

diff --git a/crates/nu-command/src/formats/from/toml.rs b/crates/nu-command/src/formats/from/toml.rs
index e1ddca3164..266911f50a 100644
--- a/crates/nu-command/src/formats/from/toml.rs
+++ b/crates/nu-command/src/formats/from/toml.rs
@@ -1,5 +1,5 @@
 use nu_engine::command_prelude::*;
-use std::str::FromStr;
+use toml::value::{Datetime, Offset};
 
 #[derive(Clone)]
 pub struct FromToml;
@@ -56,6 +56,54 @@ b = [1, 2]' | from toml",
     }
 }
 
+fn convert_toml_datetime_to_value(dt: &Datetime, span: Span) -> Value {
+    match &dt.clone() {
+        toml::value::Datetime {
+            date: Some(_),
+            time: _,
+            offset: _,
+        } => (),
+        _ => return Value::string(dt.to_string(), span),
+    }
+
+    let date = match dt.date {
+        Some(date) => {
+            chrono::NaiveDate::from_ymd_opt(date.year.into(), date.month.into(), date.day.into())
+        }
+        None => Some(chrono::NaiveDate::default()),
+    };
+
+    let time = match dt.time {
+        Some(time) => chrono::NaiveTime::from_hms_nano_opt(
+            time.hour.into(),
+            time.minute.into(),
+            time.second.into(),
+            time.nanosecond,
+        ),
+        None => Some(chrono::NaiveTime::default()),
+    };
+
+    let tz = match dt.offset {
+        Some(offset) => match offset {
+            Offset::Z => chrono::FixedOffset::east_opt(0),
+            Offset::Custom { minutes: min } => chrono::FixedOffset::east_opt(min as i32 * 60),
+        },
+        None => chrono::FixedOffset::east_opt(0),
+    };
+
+    let datetime = match (date, time, tz) {
+        (Some(date), Some(time), Some(tz)) => chrono::NaiveDateTime::new(date, time)
+            .and_local_timezone(tz)
+            .earliest(),
+        _ => None,
+    };
+
+    match datetime {
+        Some(datetime) => Value::date(datetime, span),
+        None => Value::string(dt.to_string(), span),
+    }
+}
+
 fn convert_toml_to_value(value: &toml::Value, span: Span) -> Value {
     match value {
         toml::Value::Array(array) => {
@@ -76,13 +124,7 @@ fn convert_toml_to_value(value: &toml::Value, span: Span) -> Value {
             span,
         ),
         toml::Value::String(s) => Value::string(s.clone(), span),
-        toml::Value::Datetime(d) => match chrono::DateTime::from_str(&d.to_string()) {
-            Ok(nushell_date) => Value::date(nushell_date, span),
-            // in the unlikely event that parsing goes wrong, this function still returns a valid
-            // nushell date (however the default one). This decision was made to make the output of
-            // this function uniform amongst all eventualities
-            Err(_) => Value::date(chrono::DateTime::default(), span),
-        },
+        toml::Value::Datetime(dt) => convert_toml_datetime_to_value(dt, span),
     }
 }
 
@@ -113,32 +155,6 @@ mod tests {
         test_examples(FromToml {})
     }
 
-    #[test]
-    fn from_toml_creates_nushell_date() {
-        let toml_date = toml::Value::Datetime(Datetime {
-            date: Option::from(toml::value::Date {
-                year: 1980,
-                month: 10,
-                day: 12,
-            }),
-            time: Option::from(toml::value::Time {
-                hour: 10,
-                minute: 12,
-                second: 44,
-                nanosecond: 0,
-            }),
-            offset: Option::from(toml::value::Offset::Custom { minutes: 120 }),
-        });
-
-        let span = Span::test_data();
-        let reference_date = Value::date(Default::default(), Span::test_data());
-
-        let result = convert_toml_to_value(&toml_date, span);
-
-        //positive test (from toml returns a nushell date)
-        assert_eq!(result.get_type(), reference_date.get_type());
-    }
-
     #[test]
     fn from_toml_creates_correct_date() {
         let toml_date = toml::Value::Datetime(Datetime {
@@ -206,4 +222,113 @@ mod tests {
 
         assert!(result.is_err());
     }
+
+    #[test]
+    fn convert_toml_datetime_to_value_date_time_offset() {
+        let toml_date = Datetime {
+            date: Option::from(toml::value::Date {
+                year: 2000,
+                month: 1,
+                day: 1,
+            }),
+            time: Option::from(toml::value::Time {
+                hour: 12,
+                minute: 12,
+                second: 12,
+                nanosecond: 0,
+            }),
+            offset: Option::from(toml::value::Offset::Custom { minutes: 120 }),
+        };
+
+        let span = Span::test_data();
+        let reference_date = Value::date(
+            chrono::FixedOffset::east_opt(60 * 120)
+                .unwrap()
+                .with_ymd_and_hms(2000, 1, 1, 12, 12, 12)
+                .unwrap(),
+            span,
+        );
+
+        let result = convert_toml_datetime_to_value(&toml_date, span);
+
+        assert_eq!(result, reference_date);
+    }
+
+    #[test]
+    fn convert_toml_datetime_to_value_date_time() {
+        let toml_date = Datetime {
+            date: Option::from(toml::value::Date {
+                year: 2000,
+                month: 1,
+                day: 1,
+            }),
+            time: Option::from(toml::value::Time {
+                hour: 12,
+                minute: 12,
+                second: 12,
+                nanosecond: 0,
+            }),
+            offset: None,
+        };
+
+        let span = Span::test_data();
+        let reference_date = Value::date(
+            chrono::FixedOffset::east_opt(0)
+                .unwrap()
+                .with_ymd_and_hms(2000, 1, 1, 12, 12, 12)
+                .unwrap(),
+            span,
+        );
+
+        let result = convert_toml_datetime_to_value(&toml_date, span);
+
+        assert_eq!(result, reference_date);
+    }
+
+    #[test]
+    fn convert_toml_datetime_to_value_date() {
+        let toml_date = Datetime {
+            date: Option::from(toml::value::Date {
+                year: 2000,
+                month: 1,
+                day: 1,
+            }),
+            time: None,
+            offset: None,
+        };
+
+        let span = Span::test_data();
+        let reference_date = Value::date(
+            chrono::FixedOffset::east_opt(0)
+                .unwrap()
+                .with_ymd_and_hms(2000, 1, 1, 0, 0, 0)
+                .unwrap(),
+            span,
+        );
+
+        let result = convert_toml_datetime_to_value(&toml_date, span);
+
+        assert_eq!(result, reference_date);
+    }
+
+    #[test]
+    fn convert_toml_datetime_to_value_only_time() {
+        let toml_date = Datetime {
+            date: None,
+            time: Option::from(toml::value::Time {
+                hour: 12,
+                minute: 12,
+                second: 12,
+                nanosecond: 0,
+            }),
+            offset: None,
+        };
+
+        let span = Span::test_data();
+        let reference_date = Value::string(toml_date.to_string(), span);
+
+        let result = convert_toml_datetime_to_value(&toml_date, span);
+
+        assert_eq!(result, reference_date);
+    }
 }

From 6ce5530fc2d6fc746bb32a3e20e1ab5d1b4c0c1b Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Sun, 7 Jul 2024 06:00:57 -0700
Subject: [PATCH 0190/1072] Make `into bits` produce bitstring stream (#13310)

# Description

Fix `into bits` to have consistent behavior when passed a byte stream.

# User-Facing Changes

Previously, it was returning a binary on stream, even though its
input/output types don't describe this possibility. We don't need this
since we have `into binary` anyway.

# Tests + Formatting
Tests added
---
 crates/nu-cmd-extra/src/extra/bits/into.rs    | 34 +++++++++++++++++--
 .../nu-cmd-extra/tests/commands/bits/into.rs  | 13 +++++++
 .../nu-cmd-extra/tests/commands/bits/mod.rs   |  1 +
 crates/nu-cmd-extra/tests/commands/mod.rs     |  1 +
 4 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 crates/nu-cmd-extra/tests/commands/bits/into.rs
 create mode 100644 crates/nu-cmd-extra/tests/commands/bits/mod.rs

diff --git a/crates/nu-cmd-extra/src/extra/bits/into.rs b/crates/nu-cmd-extra/src/extra/bits/into.rs
index cf85f92ac5..9891a971f6 100644
--- a/crates/nu-cmd-extra/src/extra/bits/into.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/into.rs
@@ -1,3 +1,5 @@
+use std::io::{self, Read, Write};
+
 use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
 
@@ -118,15 +120,41 @@ 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 {
-        // TODO: in the future, we may want this to stream out, converting each to bytes
-        Ok(Value::binary(stream.into_bytes()?, head).into_pipeline_data())
+    if let PipelineData::ByteStream(stream, metadata) = input {
+        Ok(PipelineData::ByteStream(
+            byte_stream_to_bits(stream, head),
+            metadata,
+        ))
     } else {
         let args = Arguments { cell_paths };
         operate(action, args, input, call.head, engine_state.ctrlc.clone())
     }
 }
 
+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, None, 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, None, ByteStreamType::String)
+    }
+}
+
 fn convert_to_smallest_number_type(num: i64, span: Span) -> Value {
     if let Some(v) = num.to_i8() {
         let bytes = v.to_ne_bytes();
diff --git a/crates/nu-cmd-extra/tests/commands/bits/into.rs b/crates/nu-cmd-extra/tests/commands/bits/into.rs
new file mode 100644
index 0000000000..b7e7700583
--- /dev/null
+++ 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);
+}
diff --git a/crates/nu-cmd-extra/tests/commands/bits/mod.rs b/crates/nu-cmd-extra/tests/commands/bits/mod.rs
new file mode 100644
index 0000000000..0d4ee04b0d
--- /dev/null
+++ b/crates/nu-cmd-extra/tests/commands/bits/mod.rs
@@ -0,0 +1 @@
+mod into;
diff --git a/crates/nu-cmd-extra/tests/commands/mod.rs b/crates/nu-cmd-extra/tests/commands/mod.rs
index 2354122e35..fd216cecb6 100644
--- 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;

From 83081f9852dfc6f743fb569c084690d325526502 Mon Sep 17 00:00:00 2001
From: Reilly Wood <26268125+rgwood@users.noreply.github.com>
Date: Sun, 7 Jul 2024 06:09:59 -0700
Subject: [PATCH 0191/1072] `explore`: pass config to views at creation time
 (#13312)

cc: @zhiburt

This is an internal refactoring for `explore`.

Previously, views inside `explore` were created with default/incorrect
configuration and then the correct configuration was passed to them
using a function called `setup()`. I believe this was because
configuration was dynamic and could change while `explore` was running.

After https://github.com/nushell/nushell/pull/10259, configuration can
no longer be changed on the fly. So we can clean this up by removing
`setup()` and passing configuration to views when they are created.
---
 crates/nu-explore/src/commands/expand.rs  |   3 +-
 crates/nu-explore/src/commands/help.rs    |  10 ++-
 crates/nu-explore/src/commands/mod.rs     |   3 +
 crates/nu-explore/src/commands/nu.rs      |  10 +--
 crates/nu-explore/src/commands/table.rs   |   5 +-
 crates/nu-explore/src/commands/try.rs     |   5 +-
 crates/nu-explore/src/lib.rs              |   9 +-
 crates/nu-explore/src/pager/mod.rs        | 105 +++++++++-------------
 crates/nu-explore/src/registry/command.rs |   5 +-
 crates/nu-explore/src/views/binary/mod.rs |  19 ++--
 crates/nu-explore/src/views/mod.rs        |   6 --
 crates/nu-explore/src/views/record/mod.rs |  28 +-----
 crates/nu-explore/src/views/try.rs        |  35 ++++----
 13 files changed, 93 insertions(+), 150 deletions(-)

diff --git a/crates/nu-explore/src/commands/expand.rs b/crates/nu-explore/src/commands/expand.rs
index d7d75af6c5..cbb86336af 100644
--- a/crates/nu-explore/src/commands/expand.rs
+++ b/crates/nu-explore/src/commands/expand.rs
@@ -1,7 +1,7 @@
 use super::ViewCommand;
 use crate::{
     nu_common::{self, collect_input},
-    views::Preview,
+    views::{Preview, ViewConfig},
 };
 use anyhow::Result;
 use nu_color_config::StyleComputer;
@@ -43,6 +43,7 @@ impl ViewCommand for ExpandCmd {
         engine_state: &EngineState,
         stack: &mut Stack,
         value: Option<Value>,
+        _: &ViewConfig,
     ) -> Result<Self::View> {
         if let Some(value) = value {
             let value_as_string = convert_value_to_string(value, engine_state, stack)?;
diff --git a/crates/nu-explore/src/commands/help.rs b/crates/nu-explore/src/commands/help.rs
index 8be468383e..684e713939 100644
--- a/crates/nu-explore/src/commands/help.rs
+++ b/crates/nu-explore/src/commands/help.rs
@@ -1,5 +1,5 @@
 use super::ViewCommand;
-use crate::views::Preview;
+use crate::views::{Preview, ViewConfig};
 use anyhow::Result;
 use nu_ansi_term::Color;
 use nu_protocol::{
@@ -99,7 +99,13 @@ impl ViewCommand for HelpCmd {
         Ok(())
     }
 
-    fn spawn(&mut self, _: &EngineState, _: &mut Stack, _: Option<Value>) -> Result<Self::View> {
+    fn spawn(
+        &mut self,
+        _: &EngineState,
+        _: &mut Stack,
+        _: Option<Value>,
+        _: &ViewConfig,
+    ) -> Result<Self::View> {
         Ok(HelpCmd::view())
     }
 }
diff --git a/crates/nu-explore/src/commands/mod.rs b/crates/nu-explore/src/commands/mod.rs
index 141dc25f56..a748ddaaa3 100644
--- a/crates/nu-explore/src/commands/mod.rs
+++ b/crates/nu-explore/src/commands/mod.rs
@@ -1,3 +1,5 @@
+use crate::views::ViewConfig;
+
 use super::pager::{Pager, Transition};
 use anyhow::Result;
 use nu_protocol::{
@@ -49,5 +51,6 @@ pub trait ViewCommand {
         engine_state: &EngineState,
         stack: &mut Stack,
         value: Option<Value>,
+        config: &ViewConfig,
     ) -> Result<Self::View>;
 }
diff --git a/crates/nu-explore/src/commands/nu.rs b/crates/nu-explore/src/commands/nu.rs
index a0d479fd92..84e1fb9706 100644
--- a/crates/nu-explore/src/commands/nu.rs
+++ b/crates/nu-explore/src/commands/nu.rs
@@ -48,6 +48,7 @@ impl ViewCommand for NuCmd {
         engine_state: &EngineState,
         stack: &mut Stack,
         value: Option<Value>,
+        config: &ViewConfig,
     ) -> Result<Self::View> {
         let value = value.unwrap_or_default();
 
@@ -62,7 +63,7 @@ impl ViewCommand for NuCmd {
             return Ok(NuView::Preview(Preview::new(&text)));
         }
 
-        let mut view = RecordView::new(columns, values);
+        let mut view = RecordView::new(columns, values, config.explore_config.clone());
 
         if is_record {
             view.set_top_layer_orientation(Orientation::Left);
@@ -119,11 +120,4 @@ impl View for NuView {
             NuView::Preview(v) => v.exit(),
         }
     }
-
-    fn setup(&mut self, config: ViewConfig<'_>) {
-        match self {
-            NuView::Records(v) => v.setup(config),
-            NuView::Preview(v) => v.setup(config),
-        }
-    }
 }
diff --git a/crates/nu-explore/src/commands/table.rs b/crates/nu-explore/src/commands/table.rs
index 1079cf6cea..9ab1e39b98 100644
--- a/crates/nu-explore/src/commands/table.rs
+++ b/crates/nu-explore/src/commands/table.rs
@@ -1,7 +1,7 @@
 use super::ViewCommand;
 use crate::{
     nu_common::collect_input,
-    views::{Orientation, RecordView},
+    views::{Orientation, RecordView, ViewConfig},
 };
 use anyhow::Result;
 use nu_protocol::{
@@ -49,13 +49,14 @@ impl ViewCommand for TableCmd {
         _: &EngineState,
         _: &mut Stack,
         value: Option<Value>,
+        config: &ViewConfig,
     ) -> Result<Self::View> {
         let value = value.unwrap_or_default();
         let is_record = matches!(value, Value::Record { .. });
 
         let (columns, data) = collect_input(value)?;
 
-        let mut view = RecordView::new(columns, data);
+        let mut view = RecordView::new(columns, data, config.explore_config.clone());
 
         if is_record {
             view.set_top_layer_orientation(Orientation::Left);
diff --git a/crates/nu-explore/src/commands/try.rs b/crates/nu-explore/src/commands/try.rs
index e70b4237d9..e1290651c8 100644
--- a/crates/nu-explore/src/commands/try.rs
+++ b/crates/nu-explore/src/commands/try.rs
@@ -1,5 +1,5 @@
 use super::ViewCommand;
-use crate::views::TryView;
+use crate::views::{TryView, ViewConfig};
 use anyhow::Result;
 use nu_protocol::{
     engine::{EngineState, Stack},
@@ -43,9 +43,10 @@ impl ViewCommand for TryCmd {
         engine_state: &EngineState,
         stack: &mut Stack,
         value: Option<Value>,
+        config: &ViewConfig,
     ) -> Result<Self::View> {
         let value = value.unwrap_or_default();
-        let mut view = TryView::new(value);
+        let mut view = TryView::new(value, config.explore_config.clone());
         view.init(self.command.clone());
         view.try_run(engine_state, stack)?;
 
diff --git a/crates/nu-explore/src/lib.rs b/crates/nu-explore/src/lib.rs
index d347321354..30b3e5cf87 100644
--- a/crates/nu-explore/src/lib.rs
+++ b/crates/nu-explore/src/lib.rs
@@ -10,6 +10,7 @@ use anyhow::Result;
 use commands::{ExpandCmd, HelpCmd, NuCmd, QuitCmd, TableCmd, TryCmd};
 pub use default_context::add_explore_context;
 pub use explore::Explore;
+use explore::ExploreConfig;
 use nu_common::{collect_pipeline, has_simple_value, CtrlC};
 use nu_protocol::{
     engine::{EngineState, Stack},
@@ -43,7 +44,7 @@ fn run_pager(
     if is_binary {
         p.show_message("For help type :help");
 
-        let view = binary_view(input)?;
+        let view = binary_view(input, config.explore_config)?;
         return p.run(engine_state, stack, ctrlc, Some(view), commands);
     }
 
@@ -73,7 +74,7 @@ fn create_record_view(
     is_record: bool,
     config: PagerConfig,
 ) -> Option<Page> {
-    let mut view = RecordView::new(columns, data);
+    let mut view = RecordView::new(columns, data, config.explore_config.clone());
     if is_record {
         view.set_top_layer_orientation(Orientation::Left);
     }
@@ -91,14 +92,14 @@ fn help_view() -> Option<Page> {
     Some(Page::new(HelpCmd::view(), false))
 }
 
-fn binary_view(input: PipelineData) -> Result<Page> {
+fn binary_view(input: PipelineData, config: &ExploreConfig) -> Result<Page> {
     let data = match input {
         PipelineData::Value(Value::Binary { val, .. }, _) => val,
         PipelineData::ByteStream(bs, _) => bs.into_bytes()?,
         _ => unreachable!("checked beforehand"),
     };
 
-    let view = BinaryView::new(data);
+    let view = BinaryView::new(data, config);
 
     Ok(Page::new(view, true))
 }
diff --git a/crates/nu-explore/src/pager/mod.rs b/crates/nu-explore/src/pager/mod.rs
index a56df95bc7..3114543f7c 100644
--- a/crates/nu-explore/src/pager/mod.rs
+++ b/crates/nu-explore/src/pager/mod.rs
@@ -90,19 +90,42 @@ impl<'a> Pager<'a> {
         engine_state: &EngineState,
         stack: &mut Stack,
         ctrlc: CtrlC,
-        mut view: Option<Page>,
+        view: Option<Page>,
         commands: CommandRegistry,
     ) -> Result<Option<Value>> {
-        if let Some(page) = &mut view {
-            page.view.setup(ViewConfig::new(
-                self.config.nu_config,
-                self.config.explore_config,
-                self.config.style_computer,
-                self.config.lscolors,
-            ))
+        // setup terminal
+        enable_raw_mode()?;
+        let mut stdout = io::stdout();
+        execute!(stdout, EnterAlternateScreen, Clear(ClearType::All))?;
+
+        let backend = CrosstermBackend::new(stdout);
+        let mut terminal = Terminal::new(backend)?;
+
+        let mut info = ViewInfo {
+            status: Some(Report::default()),
+            ..Default::default()
+        };
+
+        if let Some(text) = self.message.take() {
+            info.status = Some(Report::message(text, Severity::Info));
         }
 
-        run_pager(engine_state, stack, ctrlc, self, view, commands)
+        let result = render_ui(
+            &mut terminal,
+            engine_state,
+            stack,
+            ctrlc,
+            self,
+            &mut info,
+            view,
+            commands,
+        )?;
+
+        // restore terminal
+        disable_raw_mode()?;
+        execute!(io::stdout(), LeaveAlternateScreen)?;
+
+        Ok(result)
     }
 }
 
@@ -145,49 +168,6 @@ impl<'a> PagerConfig<'a> {
     }
 }
 
-fn run_pager(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    ctrlc: CtrlC,
-    pager: &mut Pager,
-    view: Option<Page>,
-    commands: CommandRegistry,
-) -> Result<Option<Value>> {
-    // setup terminal
-    enable_raw_mode()?;
-    let mut stdout = io::stdout();
-    execute!(stdout, EnterAlternateScreen, Clear(ClearType::All))?;
-
-    let backend = CrosstermBackend::new(stdout);
-    let mut terminal = Terminal::new(backend)?;
-
-    let mut info = ViewInfo {
-        status: Some(Report::default()),
-        ..Default::default()
-    };
-
-    if let Some(text) = pager.message.take() {
-        info.status = Some(Report::message(text, Severity::Info));
-    }
-
-    let result = render_ui(
-        &mut terminal,
-        engine_state,
-        stack,
-        ctrlc,
-        pager,
-        &mut info,
-        view,
-        commands,
-    )?;
-
-    // restore terminal
-    disable_raw_mode()?;
-    execute!(io::stdout(), LeaveAlternateScreen)?;
-
-    Ok(result)
-}
-
 #[allow(clippy::too_many_arguments)]
 fn render_ui(
     term: &mut Terminal,
@@ -440,15 +420,20 @@ fn run_command(
         Command::View { mut cmd, stackable } => {
             // what we do we just replace the view.
             let value = view_stack.curr_view.as_mut().and_then(|p| p.view.exit());
-            let mut new_view = cmd.spawn(engine_state, stack, value)?;
+            let view_cfg = ViewConfig::new(
+                pager.config.nu_config,
+                pager.config.explore_config,
+                pager.config.style_computer,
+                pager.config.lscolors,
+            );
+
+            let new_view = cmd.spawn(engine_state, stack, value, &view_cfg)?;
             if let Some(view) = view_stack.curr_view.take() {
                 if !view.stackable {
                     view_stack.stack.push(view);
                 }
             }
 
-            setup_view(&mut new_view, &pager.config);
-
             view_stack.curr_view = Some(Page::raw(new_view, stackable));
 
             Ok(CmdResult::new(false, true, cmd.name().to_owned()))
@@ -456,16 +441,6 @@ fn run_command(
     }
 }
 
-fn setup_view(view: &mut Box<dyn View>, cfg: &PagerConfig<'_>) {
-    let cfg = ViewConfig::new(
-        cfg.nu_config,
-        cfg.explore_config,
-        cfg.style_computer,
-        cfg.lscolors,
-    );
-    view.setup(cfg);
-}
-
 fn set_cursor_cmd_bar(f: &mut Frame, area: Rect, pager: &Pager) {
     if pager.cmd_buf.is_cmd_input {
         // todo: deal with a situation where we exceed the bar width
diff --git a/crates/nu-explore/src/registry/command.rs b/crates/nu-explore/src/registry/command.rs
index 7e0bc131b5..6a3e9a128f 100644
--- a/crates/nu-explore/src/registry/command.rs
+++ b/crates/nu-explore/src/registry/command.rs
@@ -1,6 +1,6 @@
 use crate::{
     commands::{SimpleCommand, ViewCommand},
-    views::View,
+    views::{View, ViewConfig},
 };
 use anyhow::Result;
 
@@ -78,8 +78,9 @@ where
         engine_state: &nu_protocol::engine::EngineState,
         stack: &mut nu_protocol::engine::Stack,
         value: Option<nu_protocol::Value>,
+        cfg: &ViewConfig,
     ) -> Result<Self::View> {
-        let view = self.0.spawn(engine_state, stack, value)?;
+        let view = self.0.spawn(engine_state, stack, value, cfg)?;
         Ok(Box::new(view) as Box<dyn View>)
     }
 }
diff --git a/crates/nu-explore/src/views/binary/mod.rs b/crates/nu-explore/src/views/binary/mod.rs
index f288861be8..2a35b7c180 100644
--- a/crates/nu-explore/src/views/binary/mod.rs
+++ b/crates/nu-explore/src/views/binary/mod.rs
@@ -40,11 +40,15 @@ struct Settings {
 }
 
 impl BinaryView {
-    pub fn new(data: Vec<u8>) -> Self {
+    pub fn new(data: Vec<u8>, cfg: &ExploreConfig) -> Self {
+        let settings = settings_from_config(cfg);
+        // There's gotta be a nicer way of doing this than creating a widget just to count lines
+        let count_rows = BinaryWidget::new(&data, settings.opts, Default::default()).count_lines();
+
         Self {
             data,
-            cursor: WindowCursor2D::default(),
-            settings: Settings::default(),
+            cursor: WindowCursor2D::new(count_rows, 1).expect("Failed to create XYCursor"),
+            settings,
         }
     }
 }
@@ -87,15 +91,6 @@ impl View for BinaryView {
         // todo: impl Cursor + peek of a value
         None
     }
-
-    fn setup(&mut self, cfg: ViewConfig<'_>) {
-        self.settings = settings_from_config(cfg.explore_config);
-
-        let count_rows =
-            BinaryWidget::new(&self.data, self.settings.opts, Default::default()).count_lines();
-        // TODO: refactor View so setup() is fallible and we don't have to panic here
-        self.cursor = WindowCursor2D::new(count_rows, 1).expect("Failed to create XYCursor");
-    }
 }
 
 fn create_binary_widget(v: &BinaryView) -> BinaryWidget<'_> {
diff --git a/crates/nu-explore/src/views/mod.rs b/crates/nu-explore/src/views/mod.rs
index 7aab197eb5..bdbf3129db 100644
--- a/crates/nu-explore/src/views/mod.rs
+++ b/crates/nu-explore/src/views/mod.rs
@@ -99,8 +99,6 @@ pub trait View {
     fn exit(&mut self) -> Option<Value> {
         None
     }
-
-    fn setup(&mut self, _: ViewConfig<'_>) {}
 }
 
 impl View for Box<dyn View> {
@@ -131,8 +129,4 @@ impl View for Box<dyn View> {
     fn show_data(&mut self, i: usize) -> bool {
         self.as_mut().show_data(i)
     }
-
-    fn setup(&mut self, cfg: ViewConfig<'_>) {
-        self.as_mut().setup(cfg)
-    }
 }
diff --git a/crates/nu-explore/src/views/record/mod.rs b/crates/nu-explore/src/views/record/mod.rs
index bd3c7e8e0a..4f617686f1 100644
--- a/crates/nu-explore/src/views/record/mod.rs
+++ b/crates/nu-explore/src/views/record/mod.rs
@@ -36,14 +36,12 @@ pub struct RecordView {
 }
 
 impl RecordView {
-    pub fn new(columns: Vec<String>, records: Vec<Vec<Value>>) -> Self {
+    pub fn new(columns: Vec<String>, records: Vec<Vec<Value>>, cfg: ExploreConfig) -> Self {
         Self {
             layer_stack: vec![RecordLayer::new(columns, records)],
             mode: UIMode::View,
             orientation: Orientation::Top,
-            // TODO: It's kind of gross how this temporarily has an incorrect/default config.
-            // See if we can pass correct config in through the constructor
-            cfg: ExploreConfig::default(),
+            cfg,
         }
     }
 
@@ -72,23 +70,6 @@ impl RecordView {
             .expect("we guarantee that 1 entry is always in a list")
     }
 
-    pub fn get_top_layer_orientation(&mut self) -> Orientation {
-        self.get_top_layer().orientation
-    }
-
-    pub fn set_orientation(&mut self, orientation: Orientation) {
-        self.orientation = orientation;
-
-        // we need to reset all indexes as we can't no more use them.
-        self.reset_cursors();
-    }
-
-    fn reset_cursors(&mut self) {
-        for layer in &mut self.layer_stack {
-            layer.reset_cursor();
-        }
-    }
-
     pub fn set_top_layer_orientation(&mut self, orientation: Orientation) {
         let layer = self.get_top_layer_mut();
         layer.orientation = orientation;
@@ -299,11 +280,6 @@ impl View for RecordView {
     fn exit(&mut self) -> Option<Value> {
         Some(build_last_value(self))
     }
-
-    // todo: move the method to Command?
-    fn setup(&mut self, cfg: ViewConfig<'_>) {
-        self.cfg = cfg.explore_config.clone();
-    }
 }
 
 fn get_element_info(
diff --git a/crates/nu-explore/src/views/try.rs b/crates/nu-explore/src/views/try.rs
index b23ca3e9f4..099e792e38 100644
--- a/crates/nu-explore/src/views/try.rs
+++ b/crates/nu-explore/src/views/try.rs
@@ -1,5 +1,6 @@
 use super::{record::RecordView, util::nu_style_to_tui, Layout, Orientation, View, ViewConfig};
 use crate::{
+    explore::ExploreConfig,
     nu_common::{collect_pipeline, run_command_with_value},
     pager::{report::Report, Frame, Transition, ViewInfo},
 };
@@ -23,17 +24,19 @@ pub struct TryView {
     table: Option<RecordView>,
     view_mode: bool,
     border_color: Style,
+    config: ExploreConfig,
 }
 
 impl TryView {
-    pub fn new(input: Value) -> Self {
+    pub fn new(input: Value, config: ExploreConfig) -> Self {
         Self {
             input,
             table: None,
-            immediate: false,
-            border_color: Style::default(),
+            immediate: config.try_reactive,
+            border_color: nu_style_to_tui(config.table.separator_style),
             view_mode: false,
             command: String::new(),
+            config,
         }
     }
 
@@ -42,7 +45,13 @@ impl TryView {
     }
 
     pub fn try_run(&mut self, engine_state: &EngineState, stack: &mut Stack) -> Result<()> {
-        let view = run_command(&self.command, &self.input, engine_state, stack)?;
+        let view = run_command(
+            &self.command,
+            &self.input,
+            engine_state,
+            stack,
+            &self.config,
+        )?;
         self.table = Some(view);
         Ok(())
     }
@@ -122,7 +131,6 @@ impl View for TryView {
         f.render_widget(table_block, table_area);
 
         if let Some(table) = &mut self.table {
-            table.setup(cfg);
             let area = Rect::new(
                 area.x + 2,
                 area.y + 4,
@@ -232,20 +240,6 @@ impl View for TryView {
     fn show_data(&mut self, i: usize) -> bool {
         self.table.as_mut().map_or(false, |v| v.show_data(i))
     }
-
-    fn setup(&mut self, config: ViewConfig<'_>) {
-        self.border_color = nu_style_to_tui(config.explore_config.table.separator_style);
-        self.immediate = config.explore_config.try_reactive;
-
-        let mut r = RecordView::new(vec![], vec![]);
-        r.setup(config);
-
-        if let Some(view) = &mut self.table {
-            view.setup(config);
-            view.set_orientation(r.get_top_layer_orientation());
-            view.set_top_layer_orientation(r.get_top_layer_orientation());
-        }
-    }
 }
 
 fn run_command(
@@ -253,6 +247,7 @@ fn run_command(
     input: &Value,
     engine_state: &EngineState,
     stack: &mut Stack,
+    config: &ExploreConfig,
 ) -> Result<RecordView> {
     let pipeline = run_command_with_value(command, input, engine_state, stack)?;
 
@@ -260,7 +255,7 @@ fn run_command(
 
     let (columns, values) = collect_pipeline(pipeline)?;
 
-    let mut view = RecordView::new(columns, values);
+    let mut view = RecordView::new(columns, values, config.clone());
     if is_record {
         view.set_top_layer_orientation(Orientation::Left);
     }

From 152fb5be39dc9e37f3dd5ede2bc7eba11cc6d810 Mon Sep 17 00:00:00 2001
From: YizhePKU <yizhe@pku.edu.cn>
Date: Mon, 8 Jul 2024 00:43:22 +0800
Subject: [PATCH 0192/1072] Fix PWD-aware command hints (#13024)

This PR fixes PWD-aware command hints by sending PWD to the Reedline
state in every REPL loop. This PR should be merged along with
https://github.com/nushell/reedline/pull/796.

Fixes https://github.com/nushell/nushell/issues/12951.
---
 crates/nu-cli/src/repl.rs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 251876022a..d2de8f4bea 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -336,6 +336,13 @@ 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)
+                .unwrap_or_default()
+                .to_string_lossy()
+                .to_string(),
+        ))
         .with_cursor_config(cursor_config);
 
     perf!("reedline builder", start_time, use_color);
@@ -666,13 +673,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 = Some(StateWorkingSet::new(engine_state).get_cwd());
+                c.cwd = engine_state
+                    .cwd(None)
+                    .ok()
+                    .map(|path| path.to_string_lossy().to_string());
                 c
             })
             .into_diagnostic();

From c6b6b1b7a87481305d502d1932a19322bfaaaf0a Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Mon, 8 Jul 2024 06:15:03 +0800
Subject: [PATCH 0193/1072] Upgrade Ubuntu runners to 22.04 to fix nightly
 build errors, fix #13255 (#13273)

# Description
Upgrade Ubuntu runners to 22.04 to fix nightly build errors related to
`GLIBC` versions like:

https://github.com/nushell/nushell/actions/runs/9727979044/job/26848189346
Should close #13255

BTW: The [workflow of
`nushell/nightly`](https://github.com/nushell/nightly/blob/6faf3c3aed728b641701add604cf58f28a87e67f/.github/workflows/nightly-build.yml#L108)
has been upgraded a long time ago

# User-Facing Changes

Older linux system users can download
`*-x86_64-unknown-linux-musl.tar.gz` binaries if any `GLIBC` error found
while starting `nu` binary
---
 .github/workflows/nightly-build.yml | 8 ++++----
 .github/workflows/release.yml       | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 8097b02fe6..9b7f44feba 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -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
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index dd3371e0d3..34cad24fbf 100644
--- 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
 

From 399a7c8836488db9fd2601404eb154fddf55e48a Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Sun, 7 Jul 2024 22:29:01 +0000
Subject: [PATCH 0194/1072] Add and use new `Signals` struct (#13314)

# Description
This PR introduces a new `Signals` struct to replace our adhoc passing
around of `ctrlc: Option<Arc<AtomicBool>>`. Doing so has a few benefits:
- We can better enforce when/where resetting or triggering an interrupt
is allowed.
- Consolidates `nu_utils::ctrl_c::was_pressed` and other ad-hoc
re-implementations into a single place: `Signals::check`.
- This allows us to add other types of signals later if we want. E.g.,
exiting or suspension.
- Similarly, we can more easily change the underlying implementation if
we need to in the future.
- Places that used to have a `ctrlc` of `None` now use
`Signals::empty()`, so we can double check these usages for correctness
in the future.
---
 benches/benchmarks.rs                         |  21 ++-
 .../nu-cli/src/commands/history/history_.rs   |   6 +-
 crates/nu-cli/src/nu_highlight.rs             |   4 +-
 crates/nu-cli/src/repl.rs                     |   9 +-
 crates/nu-cmd-base/src/input_handler.rs       |  10 +-
 crates/nu-cmd-extra/src/extra/bits/and.rs     |   2 +-
 crates/nu-cmd-extra/src/extra/bits/into.rs    |  38 ++--
 crates/nu-cmd-extra/src/extra/bits/not.rs     |   2 +-
 crates/nu-cmd-extra/src/extra/bits/or.rs      |   2 +-
 .../src/extra/bits/rotate_left.rs             |   2 +-
 .../src/extra/bits/rotate_right.rs            |   2 +-
 .../nu-cmd-extra/src/extra/bits/shift_left.rs |   2 +-
 .../src/extra/bits/shift_right.rs             |   2 +-
 crates/nu-cmd-extra/src/extra/bits/xor.rs     |   2 +-
 .../nu-cmd-extra/src/extra/conversions/fmt.rs |   2 +-
 .../src/extra/filters/each_while.rs           |   4 +-
 .../src/extra/filters/update_cells.rs         |   2 +-
 crates/nu-cmd-extra/src/extra/math/arccos.rs  |   2 +-
 crates/nu-cmd-extra/src/extra/math/arccosh.rs |   5 +-
 crates/nu-cmd-extra/src/extra/math/arcsin.rs  |   2 +-
 crates/nu-cmd-extra/src/extra/math/arcsinh.rs |   5 +-
 crates/nu-cmd-extra/src/extra/math/arctan.rs  |   2 +-
 crates/nu-cmd-extra/src/extra/math/arctanh.rs |   5 +-
 crates/nu-cmd-extra/src/extra/math/cos.rs     |   2 +-
 crates/nu-cmd-extra/src/extra/math/cosh.rs    |   5 +-
 crates/nu-cmd-extra/src/extra/math/exp.rs     |   5 +-
 crates/nu-cmd-extra/src/extra/math/ln.rs      |   5 +-
 crates/nu-cmd-extra/src/extra/math/sin.rs     |   2 +-
 crates/nu-cmd-extra/src/extra/math/sinh.rs    |   5 +-
 crates/nu-cmd-extra/src/extra/math/tan.rs     |   2 +-
 crates/nu-cmd-extra/src/extra/math/tanh.rs    |   5 +-
 .../src/extra/platform/ansi/gradient.rs       |   2 +-
 .../src/extra/strings/encode_decode/hex.rs    |   2 +-
 .../src/extra/strings/format/command.rs       |   2 +-
 .../src/extra/strings/str_/case/mod.rs        |   2 +-
 crates/nu-cmd-lang/src/core_commands/for_.rs  |  10 +-
 crates/nu-cmd-lang/src/core_commands/loop_.rs |   5 +-
 .../nu-cmd-lang/src/core_commands/while_.rs   |   5 +-
 crates/nu-command/src/bytes/add.rs            |   2 +-
 crates/nu-command/src/bytes/at.rs             |   2 +-
 crates/nu-command/src/bytes/collect.rs        |   7 +-
 crates/nu-command/src/bytes/ends_with.rs      |   2 +-
 crates/nu-command/src/bytes/index_of.rs       |   2 +-
 crates/nu-command/src/bytes/length.rs         |   2 +-
 crates/nu-command/src/bytes/remove.rs         |   2 +-
 crates/nu-command/src/bytes/replace.rs        |   2 +-
 crates/nu-command/src/bytes/reverse.rs        |   2 +-
 crates/nu-command/src/bytes/starts_with.rs    |   2 +-
 crates/nu-command/src/conversions/fill.rs     |   2 +-
 .../nu-command/src/conversions/into/binary.rs |   2 +-
 .../nu-command/src/conversions/into/bool.rs   |   2 +-
 .../src/conversions/into/datetime.rs          |   2 +-
 .../src/conversions/into/duration.rs          |   2 +-
 .../src/conversions/into/filesize.rs          |   2 +-
 .../nu-command/src/conversions/into/float.rs  |   2 +-
 .../nu-command/src/conversions/into/glob.rs   |   2 +-
 crates/nu-command/src/conversions/into/int.rs |   2 +-
 .../nu-command/src/conversions/into/record.rs |   2 +-
 .../nu-command/src/conversions/into/string.rs |   2 +-
 .../nu-command/src/conversions/into/value.rs  |   8 +-
 .../src/database/commands/into_sqlite.rs      |  46 ++---
 .../nu-command/src/database/values/sqlite.rs  | 149 +++++++--------
 crates/nu-command/src/date/humanize.rs        |   2 +-
 crates/nu-command/src/date/list_timezone.rs   |   2 +-
 crates/nu-command/src/date/to_record.rs       |   2 +-
 crates/nu-command/src/date/to_table.rs        |   2 +-
 crates/nu-command/src/date/to_timezone.rs     |   2 +-
 crates/nu-command/src/debug/debug_.rs         |   2 +-
 crates/nu-command/src/debug/metadata_set.rs   |  12 +-
 crates/nu-command/src/filesystem/du.rs        |  27 ++-
 crates/nu-command/src/filesystem/glob.rs      |  30 ++-
 crates/nu-command/src/filesystem/ls.rs        |  23 +--
 crates/nu-command/src/filesystem/open.rs      |  13 +-
 crates/nu-command/src/filesystem/rm.rs        |   7 +-
 crates/nu-command/src/filesystem/save.rs      |  35 ++--
 crates/nu-command/src/filesystem/watch.rs     |   3 +-
 crates/nu-command/src/filters/append.rs       |   2 +-
 crates/nu-command/src/filters/compact.rs      |   2 +-
 crates/nu-command/src/filters/default.rs      |   6 +-
 crates/nu-command/src/filters/drop/column.rs  |   6 +-
 crates/nu-command/src/filters/drop/nth.rs     |   4 +-
 crates/nu-command/src/filters/each.rs         |   6 +-
 crates/nu-command/src/filters/enumerate.rs    |   3 +-
 crates/nu-command/src/filters/every.rs        |   2 +-
 crates/nu-command/src/filters/filter.rs       |   6 +-
 crates/nu-command/src/filters/find.rs         |  17 +-
 crates/nu-command/src/filters/first.rs        |  14 +-
 crates/nu-command/src/filters/flatten.rs      |   2 +-
 crates/nu-command/src/filters/get.rs          |   5 +-
 crates/nu-command/src/filters/group.rs        |   9 +-
 crates/nu-command/src/filters/insert.rs       |   6 +-
 crates/nu-command/src/filters/interleave.rs   |   2 +-
 crates/nu-command/src/filters/items.rs        |   2 +-
 crates/nu-command/src/filters/last.rs         |   6 +-
 crates/nu-command/src/filters/lines.rs        |   3 +-
 crates/nu-command/src/filters/merge.rs        |   7 +-
 crates/nu-command/src/filters/move_.rs        |   7 +-
 crates/nu-command/src/filters/par_each.rs     |  15 +-
 crates/nu-command/src/filters/prepend.rs      |   2 +-
 crates/nu-command/src/filters/range.rs        |   4 +-
 crates/nu-command/src/filters/reduce.rs       |   5 +-
 crates/nu-command/src/filters/rename.rs       |   2 +-
 crates/nu-command/src/filters/reverse.rs      |   2 +-
 crates/nu-command/src/filters/select.rs       |  10 +-
 crates/nu-command/src/filters/shuffle.rs      |   6 +-
 crates/nu-command/src/filters/skip/skip_.rs   |  16 +-
 .../nu-command/src/filters/skip/skip_until.rs |   2 +-
 .../nu-command/src/filters/skip/skip_while.rs |   2 +-
 crates/nu-command/src/filters/sort.rs         |   2 +-
 crates/nu-command/src/filters/sort_by.rs      |   2 +-
 crates/nu-command/src/filters/take/take_.rs   |  18 +-
 .../nu-command/src/filters/take/take_until.rs |   2 +-
 .../nu-command/src/filters/take/take_while.rs |   2 +-
 crates/nu-command/src/filters/tee.rs          |  40 ++--
 crates/nu-command/src/filters/transpose.rs    |   7 +-
 crates/nu-command/src/filters/uniq.rs         |   4 +-
 crates/nu-command/src/filters/update.rs       |   6 +-
 crates/nu-command/src/filters/upsert.rs       |   6 +-
 crates/nu-command/src/filters/utils.rs        |   5 +-
 crates/nu-command/src/filters/values.rs       |  10 +-
 crates/nu-command/src/filters/where_.rs       |   2 +-
 crates/nu-command/src/filters/window.rs       |   7 +-
 crates/nu-command/src/filters/wrap.rs         |   2 +-
 crates/nu-command/src/filters/zip.rs          |   2 +-
 .../nu-command/src/formats/from/delimited.rs  |   8 +-
 crates/nu-command/src/formats/from/json.rs    |  20 +-
 crates/nu-command/src/formats/from/msgpack.rs |  10 +-
 .../nu-command/src/formats/from/msgpackz.rs   |   2 +-
 crates/nu-command/src/formats/to/delimited.rs |  63 ++++---
 crates/nu-command/src/formats/to/msgpack.rs   |   4 +-
 crates/nu-command/src/formats/to/text.rs      |   2 +-
 crates/nu-command/src/generators/generate.rs  |   2 +-
 crates/nu-command/src/generators/seq.rs       |   4 +-
 crates/nu-command/src/hash/generic_digest.rs  |   2 +-
 crates/nu-command/src/math/abs.rs             |   5 +-
 crates/nu-command/src/math/ceil.rs            |   5 +-
 crates/nu-command/src/math/floor.rs           |   5 +-
 crates/nu-command/src/math/log.rs             |   2 +-
 crates/nu-command/src/math/round.rs           |   2 +-
 crates/nu-command/src/math/sqrt.rs            |   5 +-
 crates/nu-command/src/math/utils.rs           |   4 +-
 crates/nu-command/src/network/http/client.rs  |  68 ++++---
 crates/nu-command/src/network/http/delete.rs  |   9 +-
 crates/nu-command/src/network/http/get.rs     |   9 +-
 crates/nu-command/src/network/http/head.rs    |  13 +-
 crates/nu-command/src/network/http/options.rs |   9 +-
 crates/nu-command/src/network/http/patch.rs   |   9 +-
 crates/nu-command/src/network/http/post.rs    |   9 +-
 crates/nu-command/src/network/http/put.rs     |   9 +-
 crates/nu-command/src/network/url/decode.rs   |   2 +-
 crates/nu-command/src/network/url/encode.rs   |  10 +-
 crates/nu-command/src/path/basename.rs        |   4 +-
 crates/nu-command/src/path/dirname.rs         |   4 +-
 crates/nu-command/src/path/exists.rs          |   4 +-
 crates/nu-command/src/path/expand.rs          |   4 +-
 crates/nu-command/src/path/parse.rs           |   4 +-
 crates/nu-command/src/path/relative_to.rs     |   4 +-
 crates/nu-command/src/path/split.rs           |   4 +-
 crates/nu-command/src/path/type.rs            |   4 +-
 crates/nu-command/src/platform/ansi/ansi_.rs  |  25 +--
 crates/nu-command/src/platform/ansi/link.rs   |   4 +-
 crates/nu-command/src/platform/ansi/strip.rs  |   2 +-
 crates/nu-command/src/platform/dir_info.rs    |  31 ++-
 crates/nu-command/src/platform/sleep.rs       |   7 +-
 crates/nu-command/src/random/dice.rs          |   2 +-
 crates/nu-command/src/stor/create.rs          |  27 ++-
 crates/nu-command/src/stor/delete.rs          |   6 +-
 crates/nu-command/src/stor/export.rs          |   6 +-
 crates/nu-command/src/stor/import.rs          |   6 +-
 crates/nu-command/src/stor/insert.rs          |  36 +++-
 crates/nu-command/src/stor/open.rs            |   6 +-
 crates/nu-command/src/stor/reset.rs           |   6 +-
 crates/nu-command/src/stor/update.rs          |   6 +-
 crates/nu-command/src/strings/char_.rs        |  18 +-
 .../nu-command/src/strings/detect_columns.rs  |   7 +-
 .../src/strings/encode_decode/base64.rs       |   2 +-
 crates/nu-command/src/strings/format/date.rs  |   2 +-
 .../nu-command/src/strings/format/duration.rs |   4 +-
 .../nu-command/src/strings/format/filesize.rs |   4 +-
 crates/nu-command/src/strings/parse.rs        |  23 +--
 crates/nu-command/src/strings/split/chars.rs  |   2 +-
 crates/nu-command/src/strings/split/column.rs |   2 +-
 crates/nu-command/src/strings/split/list.rs   |   4 +-
 crates/nu-command/src/strings/split/row.rs    |   2 +-
 crates/nu-command/src/strings/split/words.rs  |   2 +-
 .../src/strings/str_/case/capitalize.rs       |   2 +-
 .../src/strings/str_/case/downcase.rs         |   2 +-
 .../nu-command/src/strings/str_/case/mod.rs   |   2 +-
 .../src/strings/str_/case/upcase.rs           |   2 +-
 .../nu-command/src/strings/str_/contains.rs   |   4 +-
 .../nu-command/src/strings/str_/deunicode.rs  |   4 +-
 .../nu-command/src/strings/str_/distance.rs   |   4 +-
 .../nu-command/src/strings/str_/ends_with.rs  |   4 +-
 crates/nu-command/src/strings/str_/expand.rs  |   2 +-
 .../nu-command/src/strings/str_/index_of.rs   |   4 +-
 crates/nu-command/src/strings/str_/join.rs    |  50 ++---
 crates/nu-command/src/strings/str_/length.rs  |   2 +-
 crates/nu-command/src/strings/str_/replace.rs |   4 +-
 crates/nu-command/src/strings/str_/reverse.rs |   4 +-
 .../src/strings/str_/starts_with.rs           |   4 +-
 crates/nu-command/src/strings/str_/stats.rs   |   2 +-
 .../nu-command/src/strings/str_/substring.rs  |   4 +-
 .../nu-command/src/strings/str_/trim/trim_.rs |   2 +-
 crates/nu-command/src/system/ps.rs            |   2 +-
 .../nu-command/src/system/registry_query.rs   |   2 +-
 crates/nu-command/src/system/run_external.rs  |  29 ++-
 crates/nu-command/src/system/which_.rs        |   5 +-
 crates/nu-command/src/viewers/table.rs        | 145 +++++++-------
 crates/nu-engine/src/eval.rs                  |   4 +-
 crates/nu-explore/src/commands/expand.rs      |   3 +-
 crates/nu-explore/src/explore.rs              |   3 +-
 crates/nu-explore/src/lib.rs                  |  11 +-
 crates/nu-explore/src/nu_common/mod.rs        |   2 -
 crates/nu-explore/src/nu_common/table.rs      |  17 +-
 crates/nu-explore/src/pager/mod.rs            |  13 +-
 crates/nu-lsp/src/lib.rs                      |  19 +-
 crates/nu-plugin-core/src/interface/mod.rs    |  10 +-
 crates/nu-plugin-core/src/interface/tests.rs  |  20 +-
 crates/nu-plugin-engine/src/context.rs        |  20 +-
 crates/nu-plugin-engine/src/interface/mod.rs  |  28 +--
 .../nu-plugin-engine/src/interface/tests.rs   |  30 +--
 crates/nu-plugin-test-support/src/lib.rs      |   8 +-
 .../nu-plugin-test-support/src/plugin_test.rs |  10 +-
 .../tests/lowercase/mod.rs                    |   9 +-
 crates/nu-plugin/src/plugin/command.rs        |   4 +-
 crates/nu-plugin/src/plugin/interface/mod.rs  |   8 +-
 .../nu-plugin/src/plugin/interface/tests.rs   |  18 +-
 crates/nu-protocol/src/engine/engine_state.rs |  18 +-
 crates/nu-protocol/src/errors/shell_error.rs  |   7 +
 .../nu-protocol/src/pipeline/byte_stream.rs   | 178 ++++++++----------
 .../nu-protocol/src/pipeline/list_stream.rs   |  29 ++-
 crates/nu-protocol/src/pipeline/mod.rs        |   2 +
 .../nu-protocol/src/pipeline/pipeline_data.rs | 112 +++++------
 crates/nu-protocol/src/pipeline/signals.rs    |  76 ++++++++
 crates/nu-protocol/src/value/mod.rs           |   7 +-
 crates/nu-protocol/src/value/range.rs         |  53 ++----
 crates/nu-table/src/types/expanded.rs         |  16 +-
 crates/nu-table/src/types/general.rs          |  12 +-
 crates/nu-table/src/types/mod.rs              |   9 +-
 crates/nu-utils/src/ctrl_c.rs                 |  13 --
 crates/nu-utils/src/lib.rs                    |   1 -
 .../src/commands/collect_bytes.rs             |   6 +-
 .../src/commands/generate.rs                  |   6 +-
 crates/nu_plugin_example/src/commands/seq.rs  |   5 +-
 src/main.rs                                   |  11 +-
 src/signals.rs                                |  13 +-
 246 files changed, 1332 insertions(+), 1234 deletions(-)
 create mode 100644 crates/nu-protocol/src/pipeline/signals.rs
 delete mode 100644 crates/nu-utils/src/ctrl_c.rs

diff --git a/benches/benchmarks.rs b/benches/benchmarks.rs
index 7a23715c8d..ea296f0d06 100644
--- 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;
 
@@ -248,14 +251,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(
-        false,
-    )));
+    engine.set_signals(Signals::new(Arc::new(AtomicBool::new(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 +444,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_ctrlc(1_000),
-    bench_eval_interleave_with_ctrlc(10_000),
+    bench_eval_interleave_with_interrupt(100),
+    bench_eval_interleave_with_interrupt(1_000),
+    bench_eval_interleave_with_interrupt(10_000),
     // For
     bench_eval_for(1),
     bench_eval_for(10),
diff --git a/crates/nu-cli/src/commands/history/history_.rs b/crates/nu-cli/src/commands/history/history_.rs
index 8b0714216e..cdf85eea72 100644
--- 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");
@@ -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 {
diff --git a/crates/nu-cli/src/nu_highlight.rs b/crates/nu-cli/src/nu_highlight.rs
index 07084c6258..f4f38296de 100644
--- a/crates/nu-cli/src/nu_highlight.rs
+++ b/crates/nu-cli/src/nu_highlight.rs
@@ -32,7 +32,7 @@ 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();
 
@@ -50,7 +50,7 @@ impl Command for NuHighlight {
                 }
                 Err(err) => Value::error(err, head),
             },
-            ctrlc,
+            signals,
         )
     }
 
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index d2de8f4bea..5b0db96741 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -43,7 +43,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;
@@ -271,11 +271,8 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
     perf!("merge env", start_time, use_color);
 
     start_time = std::time::Instant::now();
-    // Reset the ctrl-c handler
-    if let Some(ctrlc) = &mut engine_state.ctrlc {
-        ctrlc.store(false, Ordering::SeqCst);
-    }
-    perf!("reset ctrlc", start_time, use_color);
+    engine_state.reset_signals();
+    perf!("reset signals", start_time, use_color);
 
     start_time = std::time::Instant::now();
     // Right before we start our prompt and take input from the user,
diff --git a/crates/nu-cmd-base/src/input_handler.rs b/crates/nu-cmd-base/src/input_handler.rs
index d81193e190..7d61f90cb0 100644
--- 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 std::sync::{atomic::AtomicBool, Arc};
+use nu_protocol::{ast::CellPath, PipelineData, ShellError, Signals, Span, Value};
+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,
             )
         }
     }
diff --git a/crates/nu-cmd-extra/src/extra/bits/and.rs b/crates/nu-cmd-extra/src/extra/bits/and.rs
index 538cf6e60f..234b4e5cc1 100644
--- 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(),
         )
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/bits/into.rs b/crates/nu-cmd-extra/src/extra/bits/into.rs
index 9891a971f6..9ff8bd0a05 100644
--- a/crates/nu-cmd-extra/src/extra/bits/into.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/into.rs
@@ -3,6 +3,7 @@ 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 {
@@ -127,31 +128,36 @@ fn into_bits(
         ))
     } 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, None, 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;
+        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 {
-                    buffer.push(b' ');
+                    // EOF
+                    Ok(false)
                 }
-                write!(buffer, "{:08b}", byte[0]).expect("format failed");
-                Ok(true)
-            } else {
-                // EOF
-                Ok(false)
-            }
-        })
+            },
+        )
     } else {
-        ByteStream::read(io::empty(), head, None, ByteStreamType::String)
+        ByteStream::read(io::empty(), head, Signals::empty(), ByteStreamType::String)
     }
 }
 
diff --git a/crates/nu-cmd-extra/src/extra/bits/not.rs b/crates/nu-cmd-extra/src/extra/bits/not.rs
index e4c344f137..405cc79d7e 100644
--- 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> {
diff --git a/crates/nu-cmd-extra/src/extra/bits/or.rs b/crates/nu-cmd-extra/src/extra/bits/or.rs
index 2352d65c23..a0af2dc8d0 100644
--- 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(),
         )
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/bits/rotate_left.rs b/crates/nu-cmd-extra/src/extra/bits/rotate_left.rs
index cbd9d17eb5..5bb9e42f6b 100644
--- 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> {
diff --git a/crates/nu-cmd-extra/src/extra/bits/rotate_right.rs b/crates/nu-cmd-extra/src/extra/bits/rotate_right.rs
index 0aea603ce1..31e17891a3 100644
--- 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> {
diff --git a/crates/nu-cmd-extra/src/extra/bits/shift_left.rs b/crates/nu-cmd-extra/src/extra/bits/shift_left.rs
index 049408c24a..6a67a45e0e 100644
--- 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> {
diff --git a/crates/nu-cmd-extra/src/extra/bits/shift_right.rs b/crates/nu-cmd-extra/src/extra/bits/shift_right.rs
index d66db68ee5..e45e10ac94 100644
--- 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> {
diff --git a/crates/nu-cmd-extra/src/extra/bits/xor.rs b/crates/nu-cmd-extra/src/extra/bits/xor.rs
index 65c3be4e1a..4a71487137 100644
--- 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(),
         )
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/conversions/fmt.rs b/crates/nu-cmd-extra/src/extra/conversions/fmt.rs
index fec0745dac..3b682291e7 100644
--- 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 {
diff --git a/crates/nu-cmd-extra/src/extra/filters/each_while.rs b/crates/nu-cmd-extra/src/extra/filters/each_while.rs
index 58679c8eea..1f30e5b9b9 100644
--- 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)
                 }
diff --git a/crates/nu-cmd-extra/src/extra/filters/update_cells.rs b/crates/nu-cmd-extra/src/extra/filters/update_cells.rs
index c90e933410..b102c13c0d 100644
--- 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))
     }
 }
diff --git a/crates/nu-cmd-extra/src/extra/math/arccos.rs b/crates/nu-cmd-extra/src/extra/math/arccos.rs
index 120fc4df98..5d0a659380 100644
--- 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(),
         )
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/math/arccosh.rs b/crates/nu-cmd-extra/src/extra/math/arccosh.rs
index 30e0d2cfb6..532a388b3f 100644
--- 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(
-            move |value| operate(value, head),
-            engine_state.ctrlc.clone(),
-        )
+        input.map(move |value| operate(value, head), engine_state.signals())
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-cmd-extra/src/extra/math/arcsin.rs b/crates/nu-cmd-extra/src/extra/math/arcsin.rs
index a68e0648ef..a85c438367 100644
--- 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(),
         )
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/math/arcsinh.rs b/crates/nu-cmd-extra/src/extra/math/arcsinh.rs
index 67addfdba2..91cb814a32 100644
--- 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(
-            move |value| operate(value, head),
-            engine_state.ctrlc.clone(),
-        )
+        input.map(move |value| operate(value, head), engine_state.signals())
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-cmd-extra/src/extra/math/arctan.rs b/crates/nu-cmd-extra/src/extra/math/arctan.rs
index 9c14203312..f52c8bd40c 100644
--- 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(),
         )
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/math/arctanh.rs b/crates/nu-cmd-extra/src/extra/math/arctanh.rs
index 920e56eeb6..7791b56948 100644
--- 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(
-            move |value| operate(value, head),
-            engine_state.ctrlc.clone(),
-        )
+        input.map(move |value| operate(value, head), engine_state.signals())
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-cmd-extra/src/extra/math/cos.rs b/crates/nu-cmd-extra/src/extra/math/cos.rs
index 633c131b8b..252c7dbbd6 100644
--- 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(),
         )
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/math/cosh.rs b/crates/nu-cmd-extra/src/extra/math/cosh.rs
index a772540b5c..e46d3c4df8 100644
--- 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(
-            move |value| operate(value, head),
-            engine_state.ctrlc.clone(),
-        )
+        input.map(move |value| operate(value, head), engine_state.signals())
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-cmd-extra/src/extra/math/exp.rs b/crates/nu-cmd-extra/src/extra/math/exp.rs
index b89d6f553f..d8f6a52899 100644
--- 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(
-            move |value| operate(value, head),
-            engine_state.ctrlc.clone(),
-        )
+        input.map(move |value| operate(value, head), engine_state.signals())
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-cmd-extra/src/extra/math/ln.rs b/crates/nu-cmd-extra/src/extra/math/ln.rs
index dd9782b467..694192bc8e 100644
--- 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(
-            move |value| operate(value, head),
-            engine_state.ctrlc.clone(),
-        )
+        input.map(move |value| operate(value, head), engine_state.signals())
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-cmd-extra/src/extra/math/sin.rs b/crates/nu-cmd-extra/src/extra/math/sin.rs
index 883007d1ed..0caedbabe7 100644
--- 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(),
         )
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/math/sinh.rs b/crates/nu-cmd-extra/src/extra/math/sinh.rs
index c768dba739..d40db3bcb5 100644
--- 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(
-            move |value| operate(value, head),
-            engine_state.ctrlc.clone(),
-        )
+        input.map(move |value| operate(value, head), engine_state.signals())
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-cmd-extra/src/extra/math/tan.rs b/crates/nu-cmd-extra/src/extra/math/tan.rs
index e10807279d..97c5d2ff93 100644
--- 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(),
         )
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/math/tanh.rs b/crates/nu-cmd-extra/src/extra/math/tanh.rs
index 4d09f93cf4..6679d04fe5 100644
--- 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(
-            move |value| operate(value, head),
-            engine_state.ctrlc.clone(),
-        )
+        input.map(move |value| operate(value, head), engine_state.signals())
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-cmd-extra/src/extra/platform/ansi/gradient.rs b/crates/nu-cmd-extra/src/extra/platform/ansi/gradient.rs
index 21c7e42a61..5934b57a5d 100644
--- 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(),
     )
 }
 
diff --git a/crates/nu-cmd-extra/src/extra/strings/encode_decode/hex.rs b/crates/nu-cmd-extra/src/extra/strings/encode_decode/hex.rs
index 7628d6e240..be681b382a 100644
--- 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(
diff --git a/crates/nu-cmd-extra/src/extra/strings/format/command.rs b/crates/nu-cmd-extra/src/extra/strings/format/command.rs
index 50e89e61e3..08df92ef40 100644
--- a/crates/nu-cmd-extra/src/extra/strings/format/command.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/format/command.rs
@@ -220,7 +220,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.
diff --git a/crates/nu-cmd-extra/src/extra/strings/str_/case/mod.rs b/crates/nu-cmd-extra/src/extra/strings/str_/case/mod.rs
index 980a1b83fc..bfa54921e2 100644
--- 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
diff --git a/crates/nu-cmd-lang/src/core_commands/for_.rs b/crates/nu-cmd-lang/src/core_commands/for_.rs
index 9410be74c7..1e90e5f06d 100644
--- a/crates/nu-cmd-lang/src/core_commands/for_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/for_.rs
@@ -1,5 +1,5 @@
 use nu_engine::{command_prelude::*, get_eval_block, get_eval_expression};
-use nu_protocol::engine::CommandType;
+use nu_protocol::{engine::CommandType, Signals};
 
 #[derive(Clone)]
 pub struct For;
@@ -72,7 +72,6 @@ impl Command for For {
 
         let value = eval_expression(engine_state, stack, keyword_expr)?;
 
-        let ctrlc = engine_state.ctrlc.clone();
         let engine_state = engine_state.clone();
         let block = engine_state.get_block(block_id);
 
@@ -82,9 +81,7 @@ impl Command for For {
         match value {
             Value::List { vals, .. } => {
                 for x in vals.into_iter() {
-                    if nu_utils::ctrl_c::was_pressed(&ctrlc) {
-                        break;
-                    }
+                    engine_state.signals().check(head)?;
 
                     // with_env() is used here to ensure that each iteration uses
                     // a different set of environment variables.
@@ -116,7 +113,8 @@ impl Command for For {
                 }
             }
             Value::Range { val, .. } => {
-                for x in val.into_range_iter(span, ctrlc) {
+                for x in val.into_range_iter(span, Signals::empty()) {
+                    engine_state.signals().check(head)?;
                     stack.add_var(var_id, x);
 
                     match eval_block(&engine_state, stack, block, PipelineData::empty()) {
diff --git a/crates/nu-cmd-lang/src/core_commands/loop_.rs b/crates/nu-cmd-lang/src/core_commands/loop_.rs
index a9c642ca3c..86e18389de 100644
--- a/crates/nu-cmd-lang/src/core_commands/loop_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/loop_.rs
@@ -37,6 +37,7 @@ impl Command for Loop {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
+        let head = call.head;
         let block_id = call
             .positional_nth(0)
             .expect("checked through parser")
@@ -49,9 +50,7 @@ impl Command for Loop {
         let stack = &mut stack.push_redirection(None, None);
 
         loop {
-            if nu_utils::ctrl_c::was_pressed(&engine_state.ctrlc) {
-                break;
-            }
+            engine_state.signals().check(head)?;
 
             match eval_block(engine_state, stack, block, PipelineData::empty()) {
                 Err(ShellError::Break { .. }) => {
diff --git a/crates/nu-cmd-lang/src/core_commands/while_.rs b/crates/nu-cmd-lang/src/core_commands/while_.rs
index 646b95c82e..22bb4c5dbd 100644
--- a/crates/nu-cmd-lang/src/core_commands/while_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/while_.rs
@@ -46,6 +46,7 @@ impl Command for While {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
+        let head = call.head;
         let cond = call.positional_nth(0).expect("checked through parser");
         let block_id = call
             .positional_nth(1)
@@ -59,9 +60,7 @@ impl Command for While {
         let stack = &mut stack.push_redirection(None, None);
 
         loop {
-            if nu_utils::ctrl_c::was_pressed(&engine_state.ctrlc) {
-                break;
-            }
+            engine_state.signals().check(head)?;
 
             let result = eval_expression(engine_state, stack, cond)?;
 
diff --git a/crates/nu-command/src/bytes/add.rs b/crates/nu-command/src/bytes/add.rs
index 8514718cfd..ab31f74b12 100644
--- a/crates/nu-command/src/bytes/add.rs
+++ b/crates/nu-command/src/bytes/add.rs
@@ -78,7 +78,7 @@ impl Command for BytesAdd {
             end,
             cell_paths,
         };
-        operate(add, arg, input, call.head, engine_state.ctrlc.clone())
+        operate(add, arg, input, call.head, engine_state.signals())
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/bytes/at.rs b/crates/nu-command/src/bytes/at.rs
index c5164c3550..5e95f4fd62 100644
--- a/crates/nu-command/src/bytes/at.rs
+++ b/crates/nu-command/src/bytes/at.rs
@@ -83,7 +83,7 @@ impl Command for BytesAt {
             cell_paths,
         };
 
-        operate(action, args, input, call.head, engine_state.ctrlc.clone())
+        operate(action, args, input, call.head, engine_state.signals())
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/bytes/collect.rs b/crates/nu-command/src/bytes/collect.rs
index 74ea3e5d14..afb70bfb36 100644
--- a/crates/nu-command/src/bytes/collect.rs
+++ b/crates/nu-command/src/bytes/collect.rs
@@ -60,7 +60,12 @@ impl Command for BytesCollect {
         )
         .flatten();
 
-        let output = ByteStream::from_result_iter(iter, span, None, ByteStreamType::Binary);
+        let output = ByteStream::from_result_iter(
+            iter,
+            span,
+            engine_state.signals().clone(),
+            ByteStreamType::Binary,
+        );
 
         Ok(PipelineData::ByteStream(output, metadata))
     }
diff --git a/crates/nu-command/src/bytes/ends_with.rs b/crates/nu-command/src/bytes/ends_with.rs
index d6174a189c..8e3966716c 100644
--- a/crates/nu-command/src/bytes/ends_with.rs
+++ b/crates/nu-command/src/bytes/ends_with.rs
@@ -102,7 +102,7 @@ impl Command for BytesEndsWith {
                 pattern,
                 cell_paths,
             };
-            operate(ends_with, arg, input, head, engine_state.ctrlc.clone())
+            operate(ends_with, arg, input, head, engine_state.signals())
         }
     }
 
diff --git a/crates/nu-command/src/bytes/index_of.rs b/crates/nu-command/src/bytes/index_of.rs
index bdf51b24d9..e10bd6c200 100644
--- a/crates/nu-command/src/bytes/index_of.rs
+++ b/crates/nu-command/src/bytes/index_of.rs
@@ -71,7 +71,7 @@ impl Command for BytesIndexOf {
             all: call.has_flag(engine_state, stack, "all")?,
             cell_paths,
         };
-        operate(index_of, arg, input, call.head, engine_state.ctrlc.clone())
+        operate(index_of, arg, input, call.head, engine_state.signals())
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/bytes/length.rs b/crates/nu-command/src/bytes/length.rs
index aaaf23e0a5..78b3d31eac 100644
--- a/crates/nu-command/src/bytes/length.rs
+++ b/crates/nu-command/src/bytes/length.rs
@@ -46,7 +46,7 @@ impl Command for BytesLen {
     ) -> Result<PipelineData, ShellError> {
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
         let arg = CellPathOnlyArgs::from(cell_paths);
-        operate(length, arg, input, call.head, engine_state.ctrlc.clone())
+        operate(length, arg, input, call.head, engine_state.signals())
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/bytes/remove.rs b/crates/nu-command/src/bytes/remove.rs
index 9afef07e8b..34d3c427f4 100644
--- a/crates/nu-command/src/bytes/remove.rs
+++ b/crates/nu-command/src/bytes/remove.rs
@@ -73,7 +73,7 @@ impl Command for BytesRemove {
             all: call.has_flag(engine_state, stack, "all")?,
         };
 
-        operate(remove, arg, input, call.head, engine_state.ctrlc.clone())
+        operate(remove, arg, input, call.head, engine_state.signals())
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/bytes/replace.rs b/crates/nu-command/src/bytes/replace.rs
index ab7ede7588..db2b6fb790 100644
--- a/crates/nu-command/src/bytes/replace.rs
+++ b/crates/nu-command/src/bytes/replace.rs
@@ -73,7 +73,7 @@ impl Command for BytesReplace {
             all: call.has_flag(engine_state, stack, "all")?,
         };
 
-        operate(replace, arg, input, call.head, engine_state.ctrlc.clone())
+        operate(replace, arg, input, call.head, engine_state.signals())
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/bytes/reverse.rs b/crates/nu-command/src/bytes/reverse.rs
index 171add213d..fd769eaa40 100644
--- a/crates/nu-command/src/bytes/reverse.rs
+++ b/crates/nu-command/src/bytes/reverse.rs
@@ -42,7 +42,7 @@ impl Command for BytesReverse {
     ) -> Result<PipelineData, ShellError> {
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
         let arg = CellPathOnlyArgs::from(cell_paths);
-        operate(reverse, arg, input, call.head, engine_state.ctrlc.clone())
+        operate(reverse, arg, input, call.head, engine_state.signals())
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/bytes/starts_with.rs b/crates/nu-command/src/bytes/starts_with.rs
index 92cc16f02c..89cc4f7afc 100644
--- a/crates/nu-command/src/bytes/starts_with.rs
+++ b/crates/nu-command/src/bytes/starts_with.rs
@@ -79,7 +79,7 @@ impl Command for BytesStartsWith {
                 pattern,
                 cell_paths,
             };
-            operate(starts_with, arg, input, head, engine_state.ctrlc.clone())
+            operate(starts_with, arg, input, head, engine_state.signals())
         }
     }
 
diff --git a/crates/nu-command/src/conversions/fill.rs b/crates/nu-command/src/conversions/fill.rs
index 6507e4a368..eaf8c05da1 100644
--- a/crates/nu-command/src/conversions/fill.rs
+++ b/crates/nu-command/src/conversions/fill.rs
@@ -165,7 +165,7 @@ fn fill(
         cell_paths,
     };
 
-    operate(action, arg, input, call.head, engine_state.ctrlc.clone())
+    operate(action, arg, input, call.head, engine_state.signals())
 }
 
 fn action(input: &Value, args: &Arguments, span: Span) -> Value {
diff --git a/crates/nu-command/src/conversions/into/binary.rs b/crates/nu-command/src/conversions/into/binary.rs
index 8eb7715754..e5c34ae6bc 100644
--- a/crates/nu-command/src/conversions/into/binary.rs
+++ b/crates/nu-command/src/conversions/into/binary.rs
@@ -138,7 +138,7 @@ fn into_binary(
             cell_paths,
             compact: call.has_flag(engine_state, stack, "compact")?,
         };
-        operate(action, args, input, head, engine_state.ctrlc.clone())
+        operate(action, args, input, head, engine_state.signals())
     }
 }
 
diff --git a/crates/nu-command/src/conversions/into/bool.rs b/crates/nu-command/src/conversions/into/bool.rs
index b1d433cb93..0fcd33b4a3 100644
--- a/crates/nu-command/src/conversions/into/bool.rs
+++ b/crates/nu-command/src/conversions/into/bool.rs
@@ -107,7 +107,7 @@ fn into_bool(
 ) -> 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 string_to_boolean(s: &str, span: Span) -> Result<bool, ShellError> {
diff --git a/crates/nu-command/src/conversions/into/datetime.rs b/crates/nu-command/src/conversions/into/datetime.rs
index b928bebe23..8dc0340ba1 100644
--- a/crates/nu-command/src/conversions/into/datetime.rs
+++ b/crates/nu-command/src/conversions/into/datetime.rs
@@ -141,7 +141,7 @@ impl Command for SubCommand {
                 zone_options,
                 cell_paths,
             };
-            operate(action, args, input, call.head, engine_state.ctrlc.clone())
+            operate(action, args, input, call.head, engine_state.signals())
         }
     }
 
diff --git a/crates/nu-command/src/conversions/into/duration.rs b/crates/nu-command/src/conversions/into/duration.rs
index 21494f3bcc..b459dd04b1 100644
--- a/crates/nu-command/src/conversions/into/duration.rs
+++ b/crates/nu-command/src/conversions/into/duration.rs
@@ -166,7 +166,7 @@ fn into_duration(
                 ret
             }
         },
-        engine_state.ctrlc.clone(),
+        engine_state.signals(),
     )
 }
 
diff --git a/crates/nu-command/src/conversions/into/filesize.rs b/crates/nu-command/src/conversions/into/filesize.rs
index 010c031b2a..5be167e30c 100644
--- a/crates/nu-command/src/conversions/into/filesize.rs
+++ b/crates/nu-command/src/conversions/into/filesize.rs
@@ -68,7 +68,7 @@ impl Command for SubCommand {
     ) -> 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 examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/conversions/into/float.rs b/crates/nu-command/src/conversions/into/float.rs
index 9ccd7ea03f..43556bb5ef 100644
--- a/crates/nu-command/src/conversions/into/float.rs
+++ b/crates/nu-command/src/conversions/into/float.rs
@@ -49,7 +49,7 @@ impl Command for SubCommand {
     ) -> 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 examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/conversions/into/glob.rs b/crates/nu-command/src/conversions/into/glob.rs
index e5d03093f4..ffc3655330 100644
--- a/crates/nu-command/src/conversions/into/glob.rs
+++ b/crates/nu-command/src/conversions/into/glob.rs
@@ -87,7 +87,7 @@ fn glob_helper(
         Ok(Value::glob(stream.into_string()?, false, head).into_pipeline_data())
     } else {
         let args = Arguments { cell_paths };
-        operate(action, args, input, head, engine_state.ctrlc.clone())
+        operate(action, args, input, head, engine_state.signals())
     }
 }
 
diff --git a/crates/nu-command/src/conversions/into/int.rs b/crates/nu-command/src/conversions/into/int.rs
index a3f1c92a4f..d4bfa61639 100644
--- a/crates/nu-command/src/conversions/into/int.rs
+++ b/crates/nu-command/src/conversions/into/int.rs
@@ -158,7 +158,7 @@ impl Command for SubCommand {
             signed,
             cell_paths,
         };
-        operate(action, args, input, call.head, engine_state.ctrlc.clone())
+        operate(action, args, input, call.head, engine_state.signals())
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/conversions/into/record.rs b/crates/nu-command/src/conversions/into/record.rs
index e867f06e15..1f332d9c85 100644
--- a/crates/nu-command/src/conversions/into/record.rs
+++ b/crates/nu-command/src/conversions/into/record.rs
@@ -125,7 +125,7 @@ fn into_record(
             ),
         },
         Value::Range { val, .. } => Value::record(
-            val.into_range_iter(span, engine_state.ctrlc.clone())
+            val.into_range_iter(span, engine_state.signals().clone())
                 .enumerate()
                 .map(|(idx, val)| (format!("{idx}"), val))
                 .collect(),
diff --git a/crates/nu-command/src/conversions/into/string.rs b/crates/nu-command/src/conversions/into/string.rs
index 7c7d69cf4e..c394f9fd21 100644
--- a/crates/nu-command/src/conversions/into/string.rs
+++ b/crates/nu-command/src/conversions/into/string.rs
@@ -180,7 +180,7 @@ fn string_helper(
             cell_paths,
             config,
         };
-        operate(action, args, input, head, engine_state.ctrlc.clone())
+        operate(action, args, input, head, engine_state.signals())
     }
 }
 
diff --git a/crates/nu-command/src/conversions/into/value.rs b/crates/nu-command/src/conversions/into/value.rs
index 4bf7e68f53..e8787e75bb 100644
--- a/crates/nu-command/src/conversions/into/value.rs
+++ b/crates/nu-command/src/conversions/into/value.rs
@@ -57,14 +57,12 @@ impl Command for IntoValue {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let engine_state = engine_state.clone();
         let metadata = input.metadata();
-        let ctrlc = engine_state.ctrlc.clone();
         let span = call.head;
-        let display_as_filesizes = call.has_flag(&engine_state, stack, "prefer-filesizes")?;
+        let display_as_filesizes = call.has_flag(engine_state, stack, "prefer-filesizes")?;
 
         // the columns to update
-        let columns: Option<Value> = call.get_flag(&engine_state, stack, "columns")?;
+        let columns: Option<Value> = call.get_flag(engine_state, stack, "columns")?;
         let columns: Option<HashSet<String>> = match columns {
             Some(val) => Some(
                 val.into_list()?
@@ -81,7 +79,7 @@ impl Command for IntoValue {
             display_as_filesizes,
             span,
         }
-        .into_pipeline_data(span, ctrlc)
+        .into_pipeline_data(span, engine_state.signals().clone())
         .set_metadata(metadata))
     }
 }
diff --git a/crates/nu-command/src/database/commands/into_sqlite.rs b/crates/nu-command/src/database/commands/into_sqlite.rs
index f3a2e3622a..88a6114ab3 100644
--- a/crates/nu-command/src/database/commands/into_sqlite.rs
+++ b/crates/nu-command/src/database/commands/into_sqlite.rs
@@ -2,13 +2,8 @@ use crate::database::values::sqlite::{open_sqlite_db, values_to_sql};
 use nu_engine::command_prelude::*;
 
 use itertools::Itertools;
-use std::{
-    path::Path,
-    sync::{
-        atomic::{AtomicBool, Ordering},
-        Arc,
-    },
-};
+use nu_protocol::Signals;
+use std::path::Path;
 
 pub const DEFAULT_TABLE_NAME: &str = "main";
 
@@ -188,23 +183,18 @@ fn operate(
     let file_name: Spanned<String> = call.req(engine_state, stack, 0)?;
     let table_name: Option<Spanned<String>> = call.get_flag(engine_state, stack, "table-name")?;
     let table = Table::new(&file_name, table_name)?;
-    let ctrl_c = engine_state.ctrlc.clone();
-
-    match action(input, table, span, ctrl_c) {
-        Ok(val) => Ok(val.into_pipeline_data()),
-        Err(e) => Err(e),
-    }
+    Ok(action(input, table, span, engine_state.signals())?.into_pipeline_data())
 }
 
 fn action(
     input: PipelineData,
     table: Table,
     span: Span,
-    ctrl_c: Option<Arc<AtomicBool>>,
+    signals: &Signals,
 ) -> Result<Value, ShellError> {
     match input {
         PipelineData::ListStream(stream, _) => {
-            insert_in_transaction(stream.into_iter(), span, table, ctrl_c)
+            insert_in_transaction(stream.into_iter(), span, table, signals)
         }
         PipelineData::Value(
             Value::List {
@@ -212,9 +202,9 @@ fn action(
                 internal_span,
             },
             _,
-        ) => insert_in_transaction(vals.into_iter(), internal_span, table, ctrl_c),
+        ) => insert_in_transaction(vals.into_iter(), internal_span, table, signals),
         PipelineData::Value(val, _) => {
-            insert_in_transaction(std::iter::once(val), span, table, ctrl_c)
+            insert_in_transaction(std::iter::once(val), span, table, signals)
         }
         _ => Err(ShellError::OnlySupportsThisInputType {
             exp_input_type: "list".into(),
@@ -229,7 +219,7 @@ fn insert_in_transaction(
     stream: impl Iterator<Item = Value>,
     span: Span,
     mut table: Table,
-    ctrl_c: Option<Arc<AtomicBool>>,
+    signals: &Signals,
 ) -> Result<Value, ShellError> {
     let mut stream = stream.peekable();
     let first_val = match stream.peek() {
@@ -251,17 +241,15 @@ fn insert_in_transaction(
     let tx = table.try_init(&first_val)?;
 
     for stream_value in stream {
-        if let Some(ref ctrlc) = ctrl_c {
-            if ctrlc.load(Ordering::Relaxed) {
-                tx.rollback().map_err(|e| ShellError::GenericError {
-                    error: "Failed to rollback SQLite transaction".into(),
-                    msg: e.to_string(),
-                    span: None,
-                    help: None,
-                    inner: Vec::new(),
-                })?;
-                return Err(ShellError::InterruptedByUser { span: None });
-            }
+        if let Err(err) = signals.check(span) {
+            tx.rollback().map_err(|e| ShellError::GenericError {
+                error: "Failed to rollback SQLite transaction".into(),
+                msg: e.to_string(),
+                span: None,
+                help: None,
+                inner: Vec::new(),
+            })?;
+            return Err(err);
         }
 
         let val = stream_value.as_record()?;
diff --git a/crates/nu-command/src/database/values/sqlite.rs b/crates/nu-command/src/database/values/sqlite.rs
index 483da7672e..f253ba1cbd 100644
--- a/crates/nu-command/src/database/values/sqlite.rs
+++ b/crates/nu-command/src/database/values/sqlite.rs
@@ -2,7 +2,7 @@ use super::definitions::{
     db_column::DbColumn, db_constraint::DbConstraint, db_foreignkey::DbForeignKey,
     db_index::DbIndex, db_table::DbTable,
 };
-use nu_protocol::{CustomValue, PipelineData, Record, ShellError, Span, Spanned, Value};
+use nu_protocol::{CustomValue, PipelineData, Record, ShellError, Signals, Span, Spanned, Value};
 use rusqlite::{
     types::ValueRef, Connection, DatabaseName, Error as SqliteError, OpenFlags, Row, Statement,
     ToSql,
@@ -12,7 +12,6 @@ use std::{
     fs::File,
     io::Read,
     path::{Path, PathBuf},
-    sync::{atomic::AtomicBool, Arc},
 };
 
 const SQLITE_MAGIC_BYTES: &[u8] = "SQLite format 3\0".as_bytes();
@@ -24,25 +23,21 @@ pub struct SQLiteDatabase {
     // 1) YAGNI, 2) it's not obvious how cloning a connection could work, 3) state
     // management gets tricky quick. Revisit this approach if we find a compelling use case.
     pub path: PathBuf,
-    #[serde(skip)]
+    #[serde(skip, default = "Signals::empty")]
     // this understandably can't be serialized. think that's OK, I'm not aware of a
     // reason why a CustomValue would be serialized outside of a plugin
-    ctrlc: Option<Arc<AtomicBool>>,
+    signals: Signals,
 }
 
 impl SQLiteDatabase {
-    pub fn new(path: &Path, ctrlc: Option<Arc<AtomicBool>>) -> Self {
+    pub fn new(path: &Path, signals: Signals) -> Self {
         Self {
             path: PathBuf::from(path),
-            ctrlc,
+            signals,
         }
     }
 
-    pub fn try_from_path(
-        path: &Path,
-        span: Span,
-        ctrlc: Option<Arc<AtomicBool>>,
-    ) -> Result<Self, ShellError> {
+    pub fn try_from_path(path: &Path, span: Span, signals: Signals) -> Result<Self, ShellError> {
         let mut file = File::open(path).map_err(|e| ShellError::ReadingFile {
             msg: e.to_string(),
             span,
@@ -56,7 +51,7 @@ impl SQLiteDatabase {
             })
             .and_then(|_| {
                 if buf == SQLITE_MAGIC_BYTES {
-                    Ok(SQLiteDatabase::new(path, ctrlc))
+                    Ok(SQLiteDatabase::new(path, signals))
                 } else {
                     Err(ShellError::ReadingFile {
                         msg: "Not a SQLite file".into(),
@@ -72,7 +67,7 @@ impl SQLiteDatabase {
             Value::Custom { val, .. } => match val.as_any().downcast_ref::<Self>() {
                 Some(db) => Ok(Self {
                     path: db.path.clone(),
-                    ctrlc: db.ctrlc.clone(),
+                    signals: db.signals.clone(),
                 }),
                 None => Err(ShellError::CantConvert {
                     to_type: "database".into(),
@@ -107,16 +102,8 @@ impl SQLiteDatabase {
         call_span: Span,
     ) -> Result<Value, ShellError> {
         let conn = open_sqlite_db(&self.path, call_span)?;
-
-        let stream = run_sql_query(conn, sql, params, self.ctrlc.clone()).map_err(|e| {
-            ShellError::GenericError {
-                error: "Failed to query SQLite database".into(),
-                msg: e.to_string(),
-                span: Some(sql.span),
-                help: None,
-                inner: vec![],
-            }
-        })?;
+        let stream = run_sql_query(conn, sql, params, &self.signals)
+            .map_err(|e| e.into_shell_error(sql.span, "Failed to query SQLite database"))?;
 
         Ok(stream)
     }
@@ -352,12 +339,7 @@ impl SQLiteDatabase {
 
 impl CustomValue for SQLiteDatabase {
     fn clone_value(&self, span: Span) -> Value {
-        let cloned = SQLiteDatabase {
-            path: self.path.clone(),
-            ctrlc: self.ctrlc.clone(),
-        };
-
-        Value::custom(Box::new(cloned), span)
+        Value::custom(Box::new(self.clone()), span)
     }
 
     fn type_name(&self) -> String {
@@ -366,13 +348,8 @@ impl CustomValue for SQLiteDatabase {
 
     fn to_base_value(&self, span: Span) -> Result<Value, ShellError> {
         let db = open_sqlite_db(&self.path, span)?;
-        read_entire_sqlite_db(db, span, self.ctrlc.clone()).map_err(|e| ShellError::GenericError {
-            error: "Failed to read from SQLite database".into(),
-            msg: e.to_string(),
-            span: Some(span),
-            help: None,
-            inner: vec![],
-        })
+        read_entire_sqlite_db(db, span, &self.signals)
+            .map_err(|e| e.into_shell_error(span, "Failed to read from SQLite database"))
     }
 
     fn as_any(&self) -> &dyn std::any::Any {
@@ -396,20 +373,12 @@ impl CustomValue for SQLiteDatabase {
     fn follow_path_string(
         &self,
         _self_span: Span,
-        _column_name: String,
+        column_name: String,
         path_span: Span,
     ) -> Result<Value, ShellError> {
         let db = open_sqlite_db(&self.path, path_span)?;
-
-        read_single_table(db, _column_name, path_span, self.ctrlc.clone()).map_err(|e| {
-            ShellError::GenericError {
-                error: "Failed to read from SQLite database".into(),
-                msg: e.to_string(),
-                span: Some(path_span),
-                help: None,
-                inner: vec![],
-            }
-        })
+        read_single_table(db, column_name, path_span, &self.signals)
+            .map_err(|e| e.into_shell_error(path_span, "Failed to read from SQLite database"))
     }
 
     fn typetag_name(&self) -> &'static str {
@@ -426,12 +395,12 @@ pub fn open_sqlite_db(path: &Path, call_span: Span) -> Result<Connection, ShellE
         open_connection_in_memory_custom()
     } else {
         let path = path.to_string_lossy().to_string();
-        Connection::open(path).map_err(|e| ShellError::GenericError {
+        Connection::open(path).map_err(|err| ShellError::GenericError {
             error: "Failed to open SQLite database".into(),
-            msg: e.to_string(),
+            msg: err.to_string(),
             span: Some(call_span),
             help: None,
-            inner: vec![],
+            inner: Vec::new(),
         })
     }
 }
@@ -440,11 +409,10 @@ fn run_sql_query(
     conn: Connection,
     sql: &Spanned<String>,
     params: NuSqlParams,
-    ctrlc: Option<Arc<AtomicBool>>,
-) -> Result<Value, SqliteError> {
+    signals: &Signals,
+) -> Result<Value, SqliteOrShellError> {
     let stmt = conn.prepare(&sql.item)?;
-
-    prepared_statement_to_nu_list(stmt, params, sql.span, ctrlc)
+    prepared_statement_to_nu_list(stmt, params, sql.span, signals)
 }
 
 // This is taken from to text local_into_string but tweaks it a bit so that certain formatting does not happen
@@ -534,23 +502,56 @@ pub fn nu_value_to_params(value: Value) -> Result<NuSqlParams, ShellError> {
     }
 }
 
+#[derive(Debug)]
+enum SqliteOrShellError {
+    SqliteError(SqliteError),
+    ShellError(ShellError),
+}
+
+impl From<SqliteError> for SqliteOrShellError {
+    fn from(error: SqliteError) -> Self {
+        Self::SqliteError(error)
+    }
+}
+
+impl From<ShellError> for SqliteOrShellError {
+    fn from(error: ShellError) -> Self {
+        Self::ShellError(error)
+    }
+}
+
+impl SqliteOrShellError {
+    fn into_shell_error(self, span: Span, msg: &str) -> ShellError {
+        match self {
+            Self::SqliteError(err) => ShellError::GenericError {
+                error: msg.into(),
+                msg: err.to_string(),
+                span: Some(span),
+                help: None,
+                inner: Vec::new(),
+            },
+            Self::ShellError(err) => err,
+        }
+    }
+}
+
 fn read_single_table(
     conn: Connection,
     table_name: String,
     call_span: Span,
-    ctrlc: Option<Arc<AtomicBool>>,
-) -> Result<Value, SqliteError> {
+    signals: &Signals,
+) -> Result<Value, SqliteOrShellError> {
     // TODO: Should use params here?
     let stmt = conn.prepare(&format!("SELECT * FROM [{table_name}]"))?;
-    prepared_statement_to_nu_list(stmt, NuSqlParams::default(), call_span, ctrlc)
+    prepared_statement_to_nu_list(stmt, NuSqlParams::default(), call_span, signals)
 }
 
 fn prepared_statement_to_nu_list(
     mut stmt: Statement,
     params: NuSqlParams,
     call_span: Span,
-    ctrlc: Option<Arc<AtomicBool>>,
-) -> Result<Value, SqliteError> {
+    signals: &Signals,
+) -> Result<Value, SqliteOrShellError> {
     let column_names = stmt
         .column_names()
         .into_iter()
@@ -576,11 +577,7 @@ fn prepared_statement_to_nu_list(
             let mut row_values = vec![];
 
             for row_result in row_results {
-                if nu_utils::ctrl_c::was_pressed(&ctrlc) {
-                    // return whatever we have so far, let the caller decide whether to use it
-                    return Ok(Value::list(row_values, call_span));
-                }
-
+                signals.check(call_span)?;
                 if let Ok(row_value) = row_result {
                     row_values.push(row_value);
                 }
@@ -606,11 +603,7 @@ fn prepared_statement_to_nu_list(
             let mut row_values = vec![];
 
             for row_result in row_results {
-                if nu_utils::ctrl_c::was_pressed(&ctrlc) {
-                    // return whatever we have so far, let the caller decide whether to use it
-                    return Ok(Value::list(row_values, call_span));
-                }
-
+                signals.check(call_span)?;
                 if let Ok(row_value) = row_result {
                     row_values.push(row_value);
                 }
@@ -626,8 +619,8 @@ fn prepared_statement_to_nu_list(
 fn read_entire_sqlite_db(
     conn: Connection,
     call_span: Span,
-    ctrlc: Option<Arc<AtomicBool>>,
-) -> Result<Value, SqliteError> {
+    signals: &Signals,
+) -> Result<Value, SqliteOrShellError> {
     let mut tables = Record::new();
 
     let mut get_table_names =
@@ -638,12 +631,8 @@ fn read_entire_sqlite_db(
         let table_name: String = row?;
         // TODO: Should use params here?
         let table_stmt = conn.prepare(&format!("select * from [{table_name}]"))?;
-        let rows = prepared_statement_to_nu_list(
-            table_stmt,
-            NuSqlParams::default(),
-            call_span,
-            ctrlc.clone(),
-        )?;
+        let rows =
+            prepared_statement_to_nu_list(table_stmt, NuSqlParams::default(), call_span, signals)?;
         tables.push(table_name, rows);
     }
 
@@ -710,7 +699,7 @@ mod test {
     #[test]
     fn can_read_empty_db() {
         let db = open_connection_in_memory().unwrap();
-        let converted_db = read_entire_sqlite_db(db, Span::test_data(), None).unwrap();
+        let converted_db = read_entire_sqlite_db(db, Span::test_data(), &Signals::empty()).unwrap();
 
         let expected = Value::test_record(Record::new());
 
@@ -730,7 +719,7 @@ mod test {
             [],
         )
         .unwrap();
-        let converted_db = read_entire_sqlite_db(db, Span::test_data(), None).unwrap();
+        let converted_db = read_entire_sqlite_db(db, Span::test_data(), &Signals::empty()).unwrap();
 
         let expected = Value::test_record(record! {
             "person" => Value::test_list(vec![]),
@@ -759,7 +748,7 @@ mod test {
         db.execute("INSERT INTO item (id, name) VALUES (456, 'foo bar')", [])
             .unwrap();
 
-        let converted_db = read_entire_sqlite_db(db, span, None).unwrap();
+        let converted_db = read_entire_sqlite_db(db, span, &Signals::empty()).unwrap();
 
         let expected = Value::test_record(record! {
             "item" => Value::test_list(
diff --git a/crates/nu-command/src/date/humanize.rs b/crates/nu-command/src/date/humanize.rs
index 2815571520..d8542a540c 100644
--- a/crates/nu-command/src/date/humanize.rs
+++ b/crates/nu-command/src/date/humanize.rs
@@ -50,7 +50,7 @@ impl Command for SubCommand {
         if matches!(input, PipelineData::Empty) {
             return Err(ShellError::PipelineEmpty { dst_span: head });
         }
-        input.map(move |value| helper(value, head), engine_state.ctrlc.clone())
+        input.map(move |value| helper(value, head), engine_state.signals())
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/date/list_timezone.rs b/crates/nu-command/src/date/list_timezone.rs
index 6f9267947d..56f7fe5376 100644
--- a/crates/nu-command/src/date/list_timezone.rs
+++ b/crates/nu-command/src/date/list_timezone.rs
@@ -40,7 +40,7 @@ impl Command for SubCommand {
                     head,
                 )
             })
-            .into_pipeline_data(head, engine_state.ctrlc.clone()))
+            .into_pipeline_data(head, engine_state.signals().clone()))
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/date/to_record.rs b/crates/nu-command/src/date/to_record.rs
index f9c0ceff1b..c0b09c040b 100644
--- a/crates/nu-command/src/date/to_record.rs
+++ b/crates/nu-command/src/date/to_record.rs
@@ -40,7 +40,7 @@ impl Command for SubCommand {
         if matches!(input, PipelineData::Empty) {
             return Err(ShellError::PipelineEmpty { dst_span: head });
         }
-        input.map(move |value| helper(value, head), engine_state.ctrlc.clone())
+        input.map(move |value| helper(value, head), engine_state.signals())
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/date/to_table.rs b/crates/nu-command/src/date/to_table.rs
index 36c3f4a94a..7ce8bc171b 100644
--- a/crates/nu-command/src/date/to_table.rs
+++ b/crates/nu-command/src/date/to_table.rs
@@ -40,7 +40,7 @@ impl Command for SubCommand {
         if matches!(input, PipelineData::Empty) {
             return Err(ShellError::PipelineEmpty { dst_span: head });
         }
-        input.map(move |value| helper(value, head), engine_state.ctrlc.clone())
+        input.map(move |value| helper(value, head), engine_state.signals())
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/date/to_timezone.rs b/crates/nu-command/src/date/to_timezone.rs
index 5f41d287ae..3d08d7271b 100644
--- a/crates/nu-command/src/date/to_timezone.rs
+++ b/crates/nu-command/src/date/to_timezone.rs
@@ -55,7 +55,7 @@ impl Command for SubCommand {
         }
         input.map(
             move |value| helper(value, head, &timezone),
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
         )
     }
 
diff --git a/crates/nu-command/src/debug/debug_.rs b/crates/nu-command/src/debug/debug_.rs
index c766081410..f4e5707491 100644
--- a/crates/nu-command/src/debug/debug_.rs
+++ b/crates/nu-command/src/debug/debug_.rs
@@ -46,7 +46,7 @@ impl Command for Debug {
                     Value::string(x.to_expanded_string(", ", &config), head)
                 }
             },
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
         )
     }
 
diff --git a/crates/nu-command/src/debug/metadata_set.rs b/crates/nu-command/src/debug/metadata_set.rs
index e4ee97a76b..96f50cfdba 100644
--- a/crates/nu-command/src/debug/metadata_set.rs
+++ b/crates/nu-command/src/debug/metadata_set.rs
@@ -48,7 +48,7 @@ impl Command for MetadataSet {
         let ds_fp: Option<String> = call.get_flag(engine_state, stack, "datasource-filepath")?;
         let ds_ls = call.has_flag(engine_state, stack, "datasource-ls")?;
         let content_type: Option<String> = call.get_flag(engine_state, stack, "content-type")?;
-
+        let signals = engine_state.signals().clone();
         let metadata = input
             .metadata()
             .clone()
@@ -58,19 +58,15 @@ impl Command for MetadataSet {
         match (ds_fp, ds_ls) {
             (Some(path), false) => Ok(input.into_pipeline_data_with_metadata(
                 head,
-                engine_state.ctrlc.clone(),
+                signals,
                 metadata.with_data_source(DataSource::FilePath(path.into())),
             )),
             (None, true) => Ok(input.into_pipeline_data_with_metadata(
                 head,
-                engine_state.ctrlc.clone(),
+                signals,
                 metadata.with_data_source(DataSource::Ls),
             )),
-            _ => Ok(input.into_pipeline_data_with_metadata(
-                head,
-                engine_state.ctrlc.clone(),
-                metadata,
-            )),
+            _ => Ok(input.into_pipeline_data_with_metadata(head, signals, metadata)),
         }
     }
 
diff --git a/crates/nu-command/src/filesystem/du.rs b/crates/nu-command/src/filesystem/du.rs
index c48a1f7ac1..93f08f7785 100644
--- a/crates/nu-command/src/filesystem/du.rs
+++ b/crates/nu-command/src/filesystem/du.rs
@@ -3,10 +3,9 @@ use crate::{DirBuilder, DirInfo, FileInfo};
 #[allow(deprecated)]
 use nu_engine::{command_prelude::*, current_dir};
 use nu_glob::Pattern;
-use nu_protocol::NuGlob;
+use nu_protocol::{NuGlob, Signals};
 use serde::Deserialize;
 use std::path::Path;
-use std::sync::{atomic::AtomicBool, Arc};
 
 #[derive(Clone)]
 pub struct Du;
@@ -120,8 +119,8 @@ impl Command for Du {
                     min_size,
                 };
                 Ok(
-                    du_for_one_pattern(args, &current_dir, tag, engine_state.ctrlc.clone())?
-                        .into_pipeline_data(tag, engine_state.ctrlc.clone()),
+                    du_for_one_pattern(args, &current_dir, tag, engine_state.signals())?
+                        .into_pipeline_data(tag, engine_state.signals().clone()),
                 )
             }
             Some(paths) => {
@@ -139,7 +138,7 @@ impl Command for Du {
                         args,
                         &current_dir,
                         tag,
-                        engine_state.ctrlc.clone(),
+                        engine_state.signals(),
                     )?)
                 }
 
@@ -147,7 +146,7 @@ impl Command for Du {
                 Ok(result_iters
                     .into_iter()
                     .flatten()
-                    .into_pipeline_data(tag, engine_state.ctrlc.clone()))
+                    .into_pipeline_data(tag, engine_state.signals().clone()))
             }
         }
     }
@@ -164,8 +163,8 @@ impl Command for Du {
 fn du_for_one_pattern(
     args: DuArgs,
     current_dir: &Path,
-    call_span: Span,
-    ctrl_c: Option<Arc<AtomicBool>>,
+    span: Span,
+    signals: &Signals,
 ) -> Result<impl Iterator<Item = Value> + Send, ShellError> {
     let exclude = args.exclude.map_or(Ok(None), move |x| {
         Pattern::new(x.item.as_ref())
@@ -178,7 +177,7 @@ fn du_for_one_pattern(
 
     let include_files = args.all;
     let mut paths = match args.path {
-        Some(p) => nu_engine::glob_from(&p, current_dir, call_span, None),
+        Some(p) => nu_engine::glob_from(&p, current_dir, span, None),
         // The * pattern should never fail.
         None => nu_engine::glob_from(
             &Spanned {
@@ -186,7 +185,7 @@ fn du_for_one_pattern(
                 span: Span::unknown(),
             },
             current_dir,
-            call_span,
+            span,
             None,
         ),
     }
@@ -205,7 +204,7 @@ fn du_for_one_pattern(
     let min_size = args.min_size.map(|f| f.item as u64);
 
     let params = DirBuilder {
-        tag: call_span,
+        tag: span,
         min: min_size,
         deref,
         exclude,
@@ -217,13 +216,13 @@ fn du_for_one_pattern(
         match p {
             Ok(a) => {
                 if a.is_dir() {
-                    output.push(DirInfo::new(a, &params, max_depth, ctrl_c.clone()).into());
-                } else if let Ok(v) = FileInfo::new(a, deref, call_span) {
+                    output.push(DirInfo::new(a, &params, max_depth, span, signals)?.into());
+                } else if let Ok(v) = FileInfo::new(a, deref, span) {
                     output.push(v.into());
                 }
             }
             Err(e) => {
-                output.push(Value::error(e, call_span));
+                output.push(Value::error(e, span));
             }
         }
     }
diff --git a/crates/nu-command/src/filesystem/glob.rs b/crates/nu-command/src/filesystem/glob.rs
index b10e8893a0..212c6ceb92 100644
--- a/crates/nu-command/src/filesystem/glob.rs
+++ b/crates/nu-command/src/filesystem/glob.rs
@@ -1,5 +1,5 @@
 use nu_engine::command_prelude::*;
-use std::sync::{atomic::AtomicBool, Arc};
+use nu_protocol::Signals;
 use wax::{Glob as WaxGlob, WalkBehavior, WalkEntry};
 
 #[derive(Clone)]
@@ -125,7 +125,6 @@ impl Command for Glob {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let ctrlc = engine_state.ctrlc.clone();
         let span = call.head;
         let glob_pattern: Spanned<String> = call.req(engine_state, stack, 0)?;
         let depth = call.get_flag(engine_state, stack, "depth")?;
@@ -216,7 +215,14 @@ impl Command for Glob {
                     inner: vec![],
                 })?
                 .flatten();
-            glob_to_value(ctrlc, glob_results, no_dirs, no_files, no_symlinks, span)
+            glob_to_value(
+                engine_state.signals(),
+                glob_results,
+                no_dirs,
+                no_files,
+                no_symlinks,
+                span,
+            )
         } else {
             let glob_results = glob
                 .walk_with_behavior(
@@ -227,12 +233,19 @@ impl Command for Glob {
                     },
                 )
                 .flatten();
-            glob_to_value(ctrlc, glob_results, no_dirs, no_files, no_symlinks, span)
+            glob_to_value(
+                engine_state.signals(),
+                glob_results,
+                no_dirs,
+                no_files,
+                no_symlinks,
+                span,
+            )
         }?;
 
         Ok(result
             .into_iter()
-            .into_pipeline_data(span, engine_state.ctrlc.clone()))
+            .into_pipeline_data(span, engine_state.signals().clone()))
     }
 }
 
@@ -252,7 +265,7 @@ fn convert_patterns(columns: &[Value]) -> Result<Vec<String>, ShellError> {
 }
 
 fn glob_to_value<'a>(
-    ctrlc: Option<Arc<AtomicBool>>,
+    signals: &Signals,
     glob_results: impl Iterator<Item = WalkEntry<'a>>,
     no_dirs: bool,
     no_files: bool,
@@ -261,10 +274,7 @@ fn glob_to_value<'a>(
 ) -> Result<Vec<Value>, ShellError> {
     let mut result: Vec<Value> = Vec::new();
     for entry in glob_results {
-        if nu_utils::ctrl_c::was_pressed(&ctrlc) {
-            result.clear();
-            return Err(ShellError::InterruptedByUser { span: None });
-        }
+        signals.check(span)?;
         let file_type = entry.file_type();
 
         if !(no_dirs && file_type.is_dir()
diff --git a/crates/nu-command/src/filesystem/ls.rs b/crates/nu-command/src/filesystem/ls.rs
index a3ab1eca54..f465a93dc1 100644
--- a/crates/nu-command/src/filesystem/ls.rs
+++ b/crates/nu-command/src/filesystem/ls.rs
@@ -6,14 +6,13 @@ use nu_engine::glob_from;
 use nu_engine::{command_prelude::*, env::current_dir};
 use nu_glob::MatchOptions;
 use nu_path::expand_to_real_path;
-use nu_protocol::{DataSource, NuGlob, PipelineMetadata};
+use nu_protocol::{DataSource, NuGlob, PipelineMetadata, Signals};
 use pathdiff::diff_paths;
 
 #[cfg(unix)]
 use std::os::unix::fs::PermissionsExt;
 use std::{
     path::PathBuf,
-    sync::Arc,
     time::{SystemTime, UNIX_EPOCH},
 };
 
@@ -93,7 +92,6 @@ impl Command for Ls {
         let du = call.has_flag(engine_state, stack, "du")?;
         let directory = call.has_flag(engine_state, stack, "directory")?;
         let use_mime_type = call.has_flag(engine_state, stack, "mime-type")?;
-        let ctrl_c = engine_state.ctrlc.clone();
         let call_span = call.head;
         #[allow(deprecated)]
         let cwd = current_dir(engine_state, stack)?;
@@ -116,10 +114,10 @@ impl Command for Ls {
             Some(pattern_arg)
         };
         match input_pattern_arg {
-            None => Ok(ls_for_one_pattern(None, args, ctrl_c.clone(), cwd)?
+            None => Ok(ls_for_one_pattern(None, args, engine_state.signals(), cwd)?
                 .into_pipeline_data_with_metadata(
                     call_span,
-                    ctrl_c,
+                    engine_state.signals().clone(),
                     PipelineMetadata {
                         data_source: DataSource::Ls,
                         content_type: None,
@@ -131,7 +129,7 @@ impl Command for Ls {
                     result_iters.push(ls_for_one_pattern(
                         Some(pat),
                         args,
-                        ctrl_c.clone(),
+                        engine_state.signals(),
                         cwd.clone(),
                     )?)
                 }
@@ -143,7 +141,7 @@ impl Command for Ls {
                     .flatten()
                     .into_pipeline_data_with_metadata(
                         call_span,
-                        ctrl_c,
+                        engine_state.signals().clone(),
                         PipelineMetadata {
                             data_source: DataSource::Ls,
                             content_type: None,
@@ -215,7 +213,7 @@ impl Command for Ls {
 fn ls_for_one_pattern(
     pattern_arg: Option<Spanned<NuGlob>>,
     args: Args,
-    ctrl_c: Option<Arc<AtomicBool>>,
+    signals: &Signals,
     cwd: PathBuf,
 ) -> Result<Box<dyn Iterator<Item = Value> + Send>, ShellError> {
     let Args {
@@ -342,7 +340,7 @@ fn ls_for_one_pattern(
 
     let mut hidden_dirs = vec![];
 
-    let one_ctrl_c = ctrl_c.clone();
+    let signals = signals.clone();
     Ok(Box::new(paths_peek.filter_map(move |x| match x {
         Ok(path) => {
             let metadata = match std::fs::symlink_metadata(&path) {
@@ -412,7 +410,7 @@ fn ls_for_one_pattern(
                         call_span,
                         long,
                         du,
-                        one_ctrl_c.clone(),
+                        &signals,
                         use_mime_type,
                     );
                     match entry {
@@ -474,7 +472,6 @@ fn path_contains_hidden_folder(path: &Path, folders: &[PathBuf]) -> bool {
 #[cfg(unix)]
 use std::os::unix::fs::FileTypeExt;
 use std::path::Path;
-use std::sync::atomic::AtomicBool;
 
 pub fn get_file_type(md: &std::fs::Metadata, display_name: &str, use_mime_type: bool) -> String {
     let ft = md.file_type();
@@ -523,7 +520,7 @@ pub(crate) fn dir_entry_dict(
     span: Span,
     long: bool,
     du: bool,
-    ctrl_c: Option<Arc<AtomicBool>>,
+    signals: &Signals,
     use_mime_type: bool,
 ) -> Result<Value, ShellError> {
     #[cfg(windows)]
@@ -618,7 +615,7 @@ pub(crate) fn dir_entry_dict(
             if md.is_dir() {
                 if du {
                     let params = DirBuilder::new(Span::new(0, 2), None, false, None, false);
-                    let dir_size = DirInfo::new(filename, &params, None, ctrl_c).get_size();
+                    let dir_size = DirInfo::new(filename, &params, None, span, signals)?.get_size();
 
                     Value::filesize(dir_size as i64, span)
                 } else {
diff --git a/crates/nu-command/src/filesystem/open.rs b/crates/nu-command/src/filesystem/open.rs
index 9000359450..e654b27f05 100644
--- a/crates/nu-command/src/filesystem/open.rs
+++ b/crates/nu-command/src/filesystem/open.rs
@@ -51,7 +51,6 @@ impl Command for Open {
     ) -> Result<PipelineData, ShellError> {
         let raw = call.has_flag(engine_state, stack, "raw")?;
         let call_span = call.head;
-        let ctrlc = engine_state.ctrlc.clone();
         #[allow(deprecated)]
         let cwd = current_dir(engine_state, stack)?;
         let mut paths = get_rest_for_glob_pattern(engine_state, stack, call, 0)?;
@@ -122,8 +121,12 @@ impl Command for Open {
                 } else {
                     #[cfg(feature = "sqlite")]
                     if !raw {
-                        let res = SQLiteDatabase::try_from_path(path, arg_span, ctrlc.clone())
-                            .map(|db| db.into_value(call.head).into_pipeline_data());
+                        let res = SQLiteDatabase::try_from_path(
+                            path,
+                            arg_span,
+                            engine_state.signals().clone(),
+                        )
+                        .map(|db| db.into_value(call.head).into_pipeline_data());
 
                         if res.is_ok() {
                             return res;
@@ -144,7 +147,7 @@ impl Command for Open {
                     };
 
                     let stream = PipelineData::ByteStream(
-                        ByteStream::file(file, call_span, ctrlc.clone()),
+                        ByteStream::file(file, call_span, engine_state.signals().clone()),
                         Some(PipelineMetadata {
                             data_source: DataSource::FilePath(path.to_path_buf()),
                             content_type: None,
@@ -203,7 +206,7 @@ impl Command for Open {
             Ok(output
                 .into_iter()
                 .flatten()
-                .into_pipeline_data(call_span, ctrlc))
+                .into_pipeline_data(call_span, engine_state.signals().clone()))
         }
     }
 
diff --git a/crates/nu-command/src/filesystem/rm.rs b/crates/nu-command/src/filesystem/rm.rs
index 9696ae0c2f..d67046ffe1 100644
--- a/crates/nu-command/src/filesystem/rm.rs
+++ b/crates/nu-command/src/filesystem/rm.rs
@@ -451,12 +451,7 @@ fn rm(
     });
 
     for result in iter {
-        if nu_utils::ctrl_c::was_pressed(&engine_state.ctrlc) {
-            return Err(ShellError::InterruptedByUser {
-                span: Some(call.head),
-            });
-        }
-
+        engine_state.signals().check(call.head)?;
         match result {
             Ok(None) => {}
             Ok(Some(msg)) => eprintln!("{msg}"),
diff --git a/crates/nu-command/src/filesystem/save.rs b/crates/nu-command/src/filesystem/save.rs
index 1cfbbc67b4..6ca5c09559 100644
--- a/crates/nu-command/src/filesystem/save.rs
+++ b/crates/nu-command/src/filesystem/save.rs
@@ -5,15 +5,14 @@ use nu_engine::{command_prelude::*, current_dir};
 use nu_path::expand_path_with;
 use nu_protocol::{
     ast::{Expr, Expression},
-    byte_stream::copy_with_interrupt,
+    byte_stream::copy_with_signals,
     process::ChildPipe,
-    ByteStreamSource, DataSource, OutDest, PipelineMetadata,
+    ByteStreamSource, DataSource, OutDest, PipelineMetadata, Signals,
 };
 use std::{
     fs::File,
     io::{self, BufRead, BufReader, Read, Write},
     path::{Path, PathBuf},
-    sync::{atomic::AtomicBool, Arc},
     thread,
 };
 
@@ -120,30 +119,30 @@ impl Command for Save {
                 )?;
 
                 let size = stream.known_size();
-                let ctrlc = engine_state.ctrlc.clone();
+                let signals = engine_state.signals();
 
                 match stream.into_source() {
                     ByteStreamSource::Read(read) => {
-                        stream_to_file(read, size, ctrlc, file, span, progress)?;
+                        stream_to_file(read, size, signals, file, span, progress)?;
                     }
                     ByteStreamSource::File(source) => {
-                        stream_to_file(source, size, ctrlc, file, span, progress)?;
+                        stream_to_file(source, size, signals, file, span, progress)?;
                     }
                     ByteStreamSource::Child(mut child) => {
                         fn write_or_consume_stderr(
                             stderr: ChildPipe,
                             file: Option<File>,
                             span: Span,
-                            ctrlc: Option<Arc<AtomicBool>>,
+                            signals: &Signals,
                             progress: bool,
                         ) -> Result<(), ShellError> {
                             if let Some(file) = file {
                                 match stderr {
                                     ChildPipe::Pipe(pipe) => {
-                                        stream_to_file(pipe, None, ctrlc, file, span, progress)
+                                        stream_to_file(pipe, None, signals, file, span, progress)
                                     }
                                     ChildPipe::Tee(tee) => {
-                                        stream_to_file(tee, None, ctrlc, file, span, progress)
+                                        stream_to_file(tee, None, signals, file, span, progress)
                                     }
                                 }?
                             } else {
@@ -163,14 +162,14 @@ impl Command for Save {
                                 // delegate a thread to redirect stderr to result.
                                 let handler = stderr
                                     .map(|stderr| {
-                                        let ctrlc = ctrlc.clone();
+                                        let signals = signals.clone();
                                         thread::Builder::new().name("stderr saver".into()).spawn(
                                             move || {
                                                 write_or_consume_stderr(
                                                     stderr,
                                                     stderr_file,
                                                     span,
-                                                    ctrlc,
+                                                    &signals,
                                                     progress,
                                                 )
                                             },
@@ -181,10 +180,10 @@ impl Command for Save {
 
                                 let res = match stdout {
                                     ChildPipe::Pipe(pipe) => {
-                                        stream_to_file(pipe, None, ctrlc, file, span, progress)
+                                        stream_to_file(pipe, None, signals, file, span, progress)
                                     }
                                     ChildPipe::Tee(tee) => {
-                                        stream_to_file(tee, None, ctrlc, file, span, progress)
+                                        stream_to_file(tee, None, signals, file, span, progress)
                                     }
                                 };
                                 if let Some(h) = handler {
@@ -202,7 +201,7 @@ impl Command for Save {
                                     stderr,
                                     stderr_file,
                                     span,
-                                    ctrlc,
+                                    signals,
                                     progress,
                                 )?;
                             }
@@ -510,7 +509,7 @@ fn get_files(
 fn stream_to_file(
     source: impl Read,
     known_size: Option<u64>,
-    ctrlc: Option<Arc<AtomicBool>>,
+    signals: &Signals,
     mut file: File,
     span: Span,
     progress: bool,
@@ -526,9 +525,9 @@ fn stream_to_file(
         let mut reader = BufReader::new(source);
 
         let res = loop {
-            if nu_utils::ctrl_c::was_pressed(&ctrlc) {
+            if let Err(err) = signals.check(span) {
                 bar.abandoned_msg("# Cancelled #".to_owned());
-                return Ok(());
+                return Err(err);
             }
 
             match reader.fill_buf() {
@@ -555,7 +554,7 @@ fn stream_to_file(
             Ok(())
         }
     } else {
-        copy_with_interrupt(source, file, span, ctrlc.as_deref())?;
+        copy_with_signals(source, file, span, signals)?;
         Ok(())
     }
 }
diff --git a/crates/nu-command/src/filesystem/watch.rs b/crates/nu-command/src/filesystem/watch.rs
index fda542c8a8..c9817de250 100644
--- a/crates/nu-command/src/filesystem/watch.rs
+++ b/crates/nu-command/src/filesystem/watch.rs
@@ -143,7 +143,6 @@ impl Command for Watch {
             None => RecursiveMode::Recursive,
         };
 
-        let ctrlc_ref = &engine_state.ctrlc.clone();
         let (tx, rx) = channel();
 
         let mut debouncer = match new_debouncer(debounce_duration, None, tx) {
@@ -256,7 +255,7 @@ impl Command for Watch {
                 }
                 Err(RecvTimeoutError::Timeout) => {}
             }
-            if nu_utils::ctrl_c::was_pressed(ctrlc_ref) {
+            if engine_state.signals().interrupted() {
                 break;
             }
         }
diff --git a/crates/nu-command/src/filters/append.rs b/crates/nu-command/src/filters/append.rs
index af5bd49283..2064bdf1e8 100644
--- a/crates/nu-command/src/filters/append.rs
+++ b/crates/nu-command/src/filters/append.rs
@@ -116,7 +116,7 @@ only unwrap the outer list, and leave the variable's contents untouched."#
         Ok(input
             .into_iter()
             .chain(other.into_pipeline_data())
-            .into_pipeline_data_with_metadata(call.head, engine_state.ctrlc.clone(), metadata))
+            .into_pipeline_data_with_metadata(call.head, engine_state.signals().clone(), metadata))
     }
 }
 
diff --git a/crates/nu-command/src/filters/compact.rs b/crates/nu-command/src/filters/compact.rs
index 9a4e968e9b..f43d738ed1 100644
--- a/crates/nu-command/src/filters/compact.rs
+++ b/crates/nu-command/src/filters/compact.rs
@@ -140,7 +140,7 @@ pub fn compact(
                     _ => true,
                 }
             },
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
         )
         .map(|m| m.set_metadata(metadata))
 }
diff --git a/crates/nu-command/src/filters/default.rs b/crates/nu-command/src/filters/default.rs
index 3eaa8d342e..a12d78f0b7 100644
--- a/crates/nu-command/src/filters/default.rs
+++ b/crates/nu-command/src/filters/default.rs
@@ -80,8 +80,6 @@ fn default(
     let value: Value = call.req(engine_state, stack, 0)?;
     let column: Option<Spanned<String>> = call.opt(engine_state, stack, 1)?;
 
-    let ctrlc = engine_state.ctrlc.clone();
-
     if let Some(column) = column {
         input
             .map(
@@ -109,7 +107,7 @@ fn default(
                     }
                     _ => item,
                 },
-                ctrlc,
+                engine_state.signals(),
             )
             .map(|x| x.set_metadata(metadata))
     } else if input.is_nothing() {
@@ -121,7 +119,7 @@ fn default(
                     Value::Nothing { .. } => value.clone(),
                     x => x,
                 },
-                ctrlc,
+                engine_state.signals(),
             )
             .map(|x| x.set_metadata(metadata))
     }
diff --git a/crates/nu-command/src/filters/drop/column.rs b/crates/nu-command/src/filters/drop/column.rs
index 94c0308ea8..f168e6c2ca 100644
--- a/crates/nu-command/src/filters/drop/column.rs
+++ b/crates/nu-command/src/filters/drop/column.rs
@@ -102,7 +102,11 @@ fn drop_cols(
                             Err(e) => Value::error(e, head),
                         }
                     }))
-                    .into_pipeline_data_with_metadata(head, engine_state.ctrlc.clone(), metadata))
+                    .into_pipeline_data_with_metadata(
+                        head,
+                        engine_state.signals().clone(),
+                        metadata,
+                    ))
             } else {
                 Ok(PipelineData::Empty)
             }
diff --git a/crates/nu-command/src/filters/drop/nth.rs b/crates/nu-command/src/filters/drop/nth.rs
index a530de5aa1..a76c4f0d92 100644
--- a/crates/nu-command/src/filters/drop/nth.rs
+++ b/crates/nu-command/src/filters/drop/nth.rs
@@ -156,7 +156,7 @@ impl Command for DropNth {
                             .take(start)
                             .into_pipeline_data_with_metadata(
                                 head,
-                                engine_state.ctrlc.clone(),
+                                engine_state.signals().clone(),
                                 metadata,
                             ))
                     }
@@ -177,7 +177,7 @@ impl Command for DropNth {
             rows,
             current: 0,
         }
-        .into_pipeline_data_with_metadata(head, engine_state.ctrlc.clone(), metadata))
+        .into_pipeline_data_with_metadata(head, engine_state.signals().clone(), metadata))
     }
 }
 
diff --git a/crates/nu-command/src/filters/each.rs b/crates/nu-command/src/filters/each.rs
index a074f63abb..fa1bf390b8 100644
--- a/crates/nu-command/src/filters/each.rs
+++ b/crates/nu-command/src/filters/each.rs
@@ -140,7 +140,7 @@ with 'transpose' first."#
                             }
                         }
                     })
-                    .into_pipeline_data(head, engine_state.ctrlc.clone()))
+                    .into_pipeline_data(head, engine_state.signals().clone()))
             }
             PipelineData::ByteStream(stream, ..) => {
                 if let Some(chunks) = stream.chunks() {
@@ -171,7 +171,7 @@ with 'transpose' first."#
                                 }
                             }
                         })
-                        .into_pipeline_data(head, engine_state.ctrlc.clone()))
+                        .into_pipeline_data(head, engine_state.signals().clone()))
                 } else {
                     Ok(PipelineData::Empty)
                 }
@@ -185,7 +185,7 @@ with 'transpose' first."#
         .and_then(|x| {
             x.filter(
                 move |x| if !keep_empty { !x.is_nothing() } else { true },
-                engine_state.ctrlc.clone(),
+                engine_state.signals(),
             )
         })
         .map(|data| data.set_metadata(metadata))
diff --git a/crates/nu-command/src/filters/enumerate.rs b/crates/nu-command/src/filters/enumerate.rs
index 1034780657..df0f4e2fca 100644
--- a/crates/nu-command/src/filters/enumerate.rs
+++ b/crates/nu-command/src/filters/enumerate.rs
@@ -52,7 +52,6 @@ impl Command for Enumerate {
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
         let metadata = input.metadata();
-        let ctrlc = engine_state.ctrlc.clone();
 
         Ok(input
             .into_iter()
@@ -66,7 +65,7 @@ impl Command for Enumerate {
                     head,
                 )
             })
-            .into_pipeline_data_with_metadata(head, ctrlc, metadata))
+            .into_pipeline_data_with_metadata(head, engine_state.signals().clone(), metadata))
     }
 }
 
diff --git a/crates/nu-command/src/filters/every.rs b/crates/nu-command/src/filters/every.rs
index 1202b4f7c9..664be33bed 100644
--- a/crates/nu-command/src/filters/every.rs
+++ b/crates/nu-command/src/filters/every.rs
@@ -78,7 +78,7 @@ impl Command for Every {
                     None
                 }
             })
-            .into_pipeline_data_with_metadata(call.head, engine_state.ctrlc.clone(), metadata))
+            .into_pipeline_data_with_metadata(call.head, engine_state.signals().clone(), metadata))
     }
 }
 
diff --git a/crates/nu-command/src/filters/filter.rs b/crates/nu-command/src/filters/filter.rs
index 1ba1508839..f2efaa3af3 100644
--- a/crates/nu-command/src/filters/filter.rs
+++ b/crates/nu-command/src/filters/filter.rs
@@ -72,7 +72,7 @@ a variable. On the other hand, the "row condition" syntax is not supported."#
                             }
                         }
                     })
-                    .into_pipeline_data(head, engine_state.ctrlc.clone()))
+                    .into_pipeline_data(head, engine_state.signals().clone()))
             }
             PipelineData::ByteStream(stream, ..) => {
                 if let Some(chunks) = stream.chunks() {
@@ -97,7 +97,7 @@ a variable. On the other hand, the "row condition" syntax is not supported."#
                                 }
                             }
                         })
-                        .into_pipeline_data(head, engine_state.ctrlc.clone()))
+                        .into_pipeline_data(head, engine_state.signals().clone()))
                 } else {
                     Ok(PipelineData::Empty)
                 }
@@ -117,7 +117,7 @@ a variable. On the other hand, the "row condition" syntax is not supported."#
                         Some(Value::error(err, span))
                     }
                 }
-                .into_pipeline_data(head, engine_state.ctrlc.clone()))
+                .into_pipeline_data(head, engine_state.signals().clone()))
             }
         }
         .map(|data| data.set_metadata(metadata))
diff --git a/crates/nu-command/src/filters/find.rs b/crates/nu-command/src/filters/find.rs
index af626c1e75..7669190f7e 100644
--- a/crates/nu-command/src/filters/find.rs
+++ b/crates/nu-command/src/filters/find.rs
@@ -213,7 +213,6 @@ fn find_with_regex(
     input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
     let span = call.head;
-    let ctrlc = engine_state.ctrlc.clone();
     let config = engine_state.get_config().clone();
 
     let insensitive = call.has_flag(engine_state, stack, "ignore-case")?;
@@ -246,7 +245,7 @@ fn find_with_regex(
             Value::List { vals, .. } => values_match_find(vals, &re, &config, invert),
             _ => false,
         },
-        ctrlc,
+        engine_state.signals(),
     )
 }
 
@@ -349,18 +348,16 @@ fn find_with_rest_and_highlight(
     input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
     let span = call.head;
-    let ctrlc = engine_state.ctrlc.clone();
-    let engine_state = engine_state.clone();
     let config = engine_state.get_config().clone();
     let filter_config = engine_state.get_config().clone();
-    let invert = call.has_flag(&engine_state, stack, "invert")?;
-    let terms = call.rest::<Value>(&engine_state, stack, 0)?;
+    let invert = call.has_flag(engine_state, stack, "invert")?;
+    let terms = call.rest::<Value>(engine_state, stack, 0)?;
     let lower_terms = terms
         .iter()
         .map(|v| Value::string(v.to_expanded_string("", &config).to_lowercase(), span))
         .collect::<Vec<Value>>();
 
-    let style_computer = StyleComputer::from_config(&engine_state, stack);
+    let style_computer = StyleComputer::from_config(engine_state, stack);
     // Currently, search results all use the same style.
     // Also note that this sample string is passed into user-written code (the closure that may or may not be
     // defined for "string").
@@ -369,7 +366,7 @@ fn find_with_rest_and_highlight(
         style_computer.compute("search_result", &Value::string("search result", span));
 
     let cols_to_search_in_map: Vec<_> = call
-        .get_flag(&engine_state, stack, "columns")?
+        .get_flag(engine_state, stack, "columns")?
         .unwrap_or_default();
 
     let cols_to_search_in_filter = cols_to_search_in_map.clone();
@@ -401,7 +398,7 @@ fn find_with_rest_and_highlight(
                         _ => x,
                     }
                 },
-                ctrlc.clone(),
+                engine_state.signals(),
             )?
             .filter(
                 move |value| {
@@ -414,7 +411,7 @@ fn find_with_rest_and_highlight(
                         invert,
                     )
                 },
-                ctrlc,
+                engine_state.signals(),
             ),
         PipelineData::ListStream(stream, metadata) => {
             let stream = stream.modify(|iter| {
diff --git a/crates/nu-command/src/filters/first.rs b/crates/nu-command/src/filters/first.rs
index 97c5159b97..8f2e8db1b9 100644
--- a/crates/nu-command/src/filters/first.rs
+++ b/crates/nu-command/src/filters/first.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::Signals;
 use std::io::Read;
 
 #[derive(Clone)]
@@ -133,8 +134,7 @@ fn first_helper(
                     }
                 }
                 Value::Range { val, .. } => {
-                    let ctrlc = engine_state.ctrlc.clone();
-                    let mut iter = val.into_range_iter(span, ctrlc.clone());
+                    let mut iter = val.into_range_iter(span, Signals::empty());
                     if return_single_element {
                         if let Some(v) = iter.next() {
                             Ok(v.into_pipeline_data())
@@ -142,9 +142,11 @@ fn first_helper(
                             Err(ShellError::AccessEmptyContent { span: head })
                         }
                     } else {
-                        Ok(iter
-                            .take(rows)
-                            .into_pipeline_data_with_metadata(span, ctrlc, metadata))
+                        Ok(iter.take(rows).into_pipeline_data_with_metadata(
+                            span,
+                            engine_state.signals().clone(),
+                            metadata,
+                        ))
                     }
                 }
                 // Propagate errors by explicitly matching them before the final case.
@@ -189,7 +191,7 @@ fn first_helper(
                             ByteStream::read(
                                 reader.take(rows as u64),
                                 head,
-                                None,
+                                Signals::empty(),
                                 ByteStreamType::Binary,
                             ),
                             metadata,
diff --git a/crates/nu-command/src/filters/flatten.rs b/crates/nu-command/src/filters/flatten.rs
index ec86677af4..b4faec9589 100644
--- a/crates/nu-command/src/filters/flatten.rs
+++ b/crates/nu-command/src/filters/flatten.rs
@@ -127,7 +127,7 @@ fn flatten(
     input
         .flat_map(
             move |item| flat_value(&columns, item, flatten_all),
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
         )
         .map(|x| x.set_metadata(metadata))
 }
diff --git a/crates/nu-command/src/filters/get.rs b/crates/nu-command/src/filters/get.rs
index 07f0ea9440..9f7d76277d 100644
--- a/crates/nu-command/src/filters/get.rs
+++ b/crates/nu-command/src/filters/get.rs
@@ -62,7 +62,6 @@ If multiple cell paths are given, this will produce a list of values."#
         let mut rest: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
         let ignore_errors = call.has_flag(engine_state, stack, "ignore-errors")?;
         let sensitive = call.has_flag(engine_state, stack, "sensitive")?;
-        let ctrlc = engine_state.ctrlc.clone();
         let metadata = input.metadata();
 
         if ignore_errors {
@@ -89,7 +88,9 @@ If multiple cell paths are given, this will produce a list of values."#
                 output.push(val?);
             }
 
-            Ok(output.into_iter().into_pipeline_data(span, ctrlc))
+            Ok(output
+                .into_iter()
+                .into_pipeline_data(span, engine_state.signals().clone()))
         }
         .map(|x| x.set_metadata(metadata))
     }
diff --git a/crates/nu-command/src/filters/group.rs b/crates/nu-command/src/filters/group.rs
index 821f35f34e..13b53850d2 100644
--- a/crates/nu-command/src/filters/group.rs
+++ b/crates/nu-command/src/filters/group.rs
@@ -55,18 +55,19 @@ impl Command for Group {
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
         let group_size: Spanned<usize> = call.req(engine_state, stack, 0)?;
-        let ctrlc = engine_state.ctrlc.clone();
         let metadata = input.metadata();
 
-        //FIXME: add in support for external redirection when engine-q supports it generally
-
         let each_group_iterator = EachGroupIterator {
             group_size: group_size.item,
             input: Box::new(input.into_iter()),
             span: head,
         };
 
-        Ok(each_group_iterator.into_pipeline_data_with_metadata(head, ctrlc, metadata))
+        Ok(each_group_iterator.into_pipeline_data_with_metadata(
+            head,
+            engine_state.signals().clone(),
+            metadata,
+        ))
     }
 }
 
diff --git a/crates/nu-command/src/filters/insert.rs b/crates/nu-command/src/filters/insert.rs
index 5f1380b2ac..3b47c4e6a9 100644
--- a/crates/nu-command/src/filters/insert.rs
+++ b/crates/nu-command/src/filters/insert.rs
@@ -222,7 +222,11 @@ fn insert(
                 Ok(pre_elems
                     .into_iter()
                     .chain(stream)
-                    .into_pipeline_data_with_metadata(head, engine_state.ctrlc.clone(), metadata))
+                    .into_pipeline_data_with_metadata(
+                        head,
+                        engine_state.signals().clone(),
+                        metadata,
+                    ))
             } else if let Value::Closure { val, .. } = replacement {
                 let mut closure = ClosureEval::new(engine_state, stack, *val);
                 let stream = stream.map(move |mut value| {
diff --git a/crates/nu-command/src/filters/interleave.rs b/crates/nu-command/src/filters/interleave.rs
index 85a92741a1..9890fede1e 100644
--- a/crates/nu-command/src/filters/interleave.rs
+++ b/crates/nu-command/src/filters/interleave.rs
@@ -147,7 +147,7 @@ interleave
         // Now that threads are writing to the channel, we just return it as a stream
         Ok(rx
             .into_iter()
-            .into_pipeline_data(head, engine_state.ctrlc.clone()))
+            .into_pipeline_data(head, engine_state.signals().clone()))
     }
 }
 
diff --git a/crates/nu-command/src/filters/items.rs b/crates/nu-command/src/filters/items.rs
index ed30486bee..04a4c6d672 100644
--- a/crates/nu-command/src/filters/items.rs
+++ b/crates/nu-command/src/filters/items.rs
@@ -67,7 +67,7 @@ impl Command for Items {
                                     }
                                 }
                             })
-                            .into_pipeline_data(head, engine_state.ctrlc.clone()))
+                            .into_pipeline_data(head, engine_state.signals().clone()))
                     }
                     Value::Error { error, .. } => Err(*error),
                     other => Err(ShellError::OnlySupportsThisInputType {
diff --git a/crates/nu-command/src/filters/last.rs b/crates/nu-command/src/filters/last.rs
index efb300db01..bb5a75fecd 100644
--- a/crates/nu-command/src/filters/last.rs
+++ b/crates/nu-command/src/filters/last.rs
@@ -99,14 +99,10 @@ impl Command for Last {
                 let mut buf = VecDeque::new();
 
                 for row in iterator {
-                    if nu_utils::ctrl_c::was_pressed(&engine_state.ctrlc) {
-                        return Err(ShellError::InterruptedByUser { span: Some(head) });
-                    }
-
+                    engine_state.signals().check(head)?;
                     if buf.len() == rows {
                         buf.pop_front();
                     }
-
                     buf.push_back(row);
                 }
 
diff --git a/crates/nu-command/src/filters/lines.rs b/crates/nu-command/src/filters/lines.rs
index 0b037dcaac..fc957e1c0e 100644
--- a/crates/nu-command/src/filters/lines.rs
+++ b/crates/nu-command/src/filters/lines.rs
@@ -26,7 +26,6 @@ impl Command for Lines {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
-        let ctrlc = engine_state.ctrlc.clone();
         let skip_empty = call.has_flag(engine_state, stack, "skip-empty")?;
 
         let span = input.span().unwrap_or(call.head);
@@ -91,7 +90,7 @@ impl Command for Lines {
                             Ok(line) => Value::string(line, head),
                             Err(err) => Value::error(err, head),
                         })
-                        .into_pipeline_data(head, ctrlc))
+                        .into_pipeline_data(head, engine_state.signals().clone()))
                 } else {
                     Ok(PipelineData::empty())
                 }
diff --git a/crates/nu-command/src/filters/merge.rs b/crates/nu-command/src/filters/merge.rs
index 8a3e613c56..191ed1706c 100644
--- a/crates/nu-command/src/filters/merge.rs
+++ b/crates/nu-command/src/filters/merge.rs
@@ -88,7 +88,6 @@ repeating this process with row 1, and so on."#
         let head = call.head;
         let merge_value: Value = call.req(engine_state, stack, 0)?;
         let metadata = input.metadata();
-        let ctrlc = engine_state.ctrlc.clone();
 
         match (&input, merge_value) {
             // table (list of records)
@@ -110,7 +109,11 @@ repeating this process with row 1, and so on."#
                             (Err(error), _) => Value::error(error, head),
                         });
 
-                Ok(res.into_pipeline_data_with_metadata(head, ctrlc, metadata))
+                Ok(res.into_pipeline_data_with_metadata(
+                    head,
+                    engine_state.signals().clone(),
+                    metadata,
+                ))
             }
             // record
             (
diff --git a/crates/nu-command/src/filters/move_.rs b/crates/nu-command/src/filters/move_.rs
index d93368f291..6e826af050 100644
--- a/crates/nu-command/src/filters/move_.rs
+++ b/crates/nu-command/src/filters/move_.rs
@@ -144,7 +144,6 @@ impl Command for Move {
         };
 
         let metadata = input.metadata();
-        let ctrlc = engine_state.ctrlc.clone();
 
         match input {
             PipelineData::Value(Value::List { .. }, ..) | PipelineData::ListStream { .. } => {
@@ -158,7 +157,11 @@ impl Command for Move {
                     Err(error) => Value::error(error, head),
                 });
 
-                Ok(res.into_pipeline_data_with_metadata(head, ctrlc, metadata))
+                Ok(res.into_pipeline_data_with_metadata(
+                    head,
+                    engine_state.signals().clone(),
+                    metadata,
+                ))
             }
             PipelineData::Value(Value::Record { val, .. }, ..) => {
                 Ok(move_record_columns(&val, &columns, &before_or_after, head)?
diff --git a/crates/nu-command/src/filters/par_each.rs b/crates/nu-command/src/filters/par_each.rs
index af72895df6..958a7fbc76 100644
--- a/crates/nu-command/src/filters/par_each.rs
+++ b/crates/nu-command/src/filters/par_each.rs
@@ -1,6 +1,6 @@
 use super::utils::chain_error_with_input;
 use nu_engine::{command_prelude::*, ClosureEvalOnce};
-use nu_protocol::engine::Closure;
+use nu_protocol::{engine::Closure, Signals};
 use rayon::prelude::*;
 
 #[derive(Clone)]
@@ -158,12 +158,11 @@ impl Command for ParEach {
                             })
                             .collect::<Vec<_>>();
 
-                        apply_order(vec).into_pipeline_data(span, engine_state.ctrlc.clone())
+                        apply_order(vec).into_pipeline_data(span, engine_state.signals().clone())
                     })),
                     Value::Range { val, .. } => Ok(create_pool(max_threads)?.install(|| {
-                        let ctrlc = engine_state.ctrlc.clone();
                         let vec = val
-                            .into_range_iter(span, ctrlc.clone())
+                            .into_range_iter(span, Signals::empty())
                             .enumerate()
                             .par_bridge()
                             .map(move |(index, value)| {
@@ -184,7 +183,7 @@ impl Command for ParEach {
                             })
                             .collect::<Vec<_>>();
 
-                        apply_order(vec).into_pipeline_data(span, ctrlc)
+                        apply_order(vec).into_pipeline_data(span, engine_state.signals().clone())
                     })),
                     // This match allows non-iterables to be accepted,
                     // which is currently considered undesirable (Nov 2022).
@@ -212,7 +211,7 @@ impl Command for ParEach {
                     })
                     .collect::<Vec<_>>();
 
-                apply_order(vec).into_pipeline_data(head, engine_state.ctrlc.clone())
+                apply_order(vec).into_pipeline_data(head, engine_state.signals().clone())
             })),
             PipelineData::ByteStream(stream, ..) => {
                 if let Some(chunks) = stream.chunks() {
@@ -236,14 +235,14 @@ impl Command for ParEach {
                             })
                             .collect::<Vec<_>>();
 
-                        apply_order(vec).into_pipeline_data(head, engine_state.ctrlc.clone())
+                        apply_order(vec).into_pipeline_data(head, engine_state.signals().clone())
                     }))
                 } else {
                     Ok(PipelineData::empty())
                 }
             }
         }
-        .and_then(|x| x.filter(|v| !v.is_nothing(), engine_state.ctrlc.clone()))
+        .and_then(|x| x.filter(|v| !v.is_nothing(), engine_state.signals()))
         .map(|data| data.set_metadata(metadata))
     }
 }
diff --git a/crates/nu-command/src/filters/prepend.rs b/crates/nu-command/src/filters/prepend.rs
index f017420595..eeae0ef656 100644
--- a/crates/nu-command/src/filters/prepend.rs
+++ b/crates/nu-command/src/filters/prepend.rs
@@ -117,7 +117,7 @@ only unwrap the outer list, and leave the variable's contents untouched."#
             .into_pipeline_data()
             .into_iter()
             .chain(input)
-            .into_pipeline_data_with_metadata(call.head, engine_state.ctrlc.clone(), metadata))
+            .into_pipeline_data_with_metadata(call.head, engine_state.signals().clone(), metadata))
     }
 }
 
diff --git a/crates/nu-command/src/filters/range.rs b/crates/nu-command/src/filters/range.rs
index c89a0b11f2..0d4e703bb1 100644
--- a/crates/nu-command/src/filters/range.rs
+++ b/crates/nu-command/src/filters/range.rs
@@ -106,7 +106,7 @@ impl Command for Range {
                         Ok(PipelineData::Value(Value::nothing(head), None))
                     } else {
                         let iter = v.into_iter().skip(from).take(to - from + 1);
-                        Ok(iter.into_pipeline_data(head, engine_state.ctrlc.clone()))
+                        Ok(iter.into_pipeline_data(head, engine_state.signals().clone()))
                     }
                 } else {
                     let from = start as usize;
@@ -116,7 +116,7 @@ impl Command for Range {
                         Ok(PipelineData::Value(Value::nothing(head), None))
                     } else {
                         let iter = input.into_iter().skip(from).take(to - from + 1);
-                        Ok(iter.into_pipeline_data(head, engine_state.ctrlc.clone()))
+                        Ok(iter.into_pipeline_data(head, engine_state.signals().clone()))
                     }
                 }
                 .map(|x| x.set_metadata(metadata))
diff --git a/crates/nu-command/src/filters/reduce.rs b/crates/nu-command/src/filters/reduce.rs
index fc808ca9af..87fbe3b23e 100644
--- a/crates/nu-command/src/filters/reduce.rs
+++ b/crates/nu-command/src/filters/reduce.rs
@@ -107,10 +107,7 @@ impl Command for Reduce {
         let mut closure = ClosureEval::new(engine_state, stack, closure);
 
         for value in iter {
-            if nu_utils::ctrl_c::was_pressed(&engine_state.ctrlc) {
-                break;
-            }
-
+            engine_state.signals().check(head)?;
             acc = closure
                 .add_arg(value)
                 .add_arg(acc)
diff --git a/crates/nu-command/src/filters/rename.rs b/crates/nu-command/src/filters/rename.rs
index b803bd8567..1e7ce34028 100644
--- a/crates/nu-command/src/filters/rename.rs
+++ b/crates/nu-command/src/filters/rename.rs
@@ -221,7 +221,7 @@ fn rename(
                     ),
                 }
             },
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
         )
         .map(|data| data.set_metadata(metadata))
 }
diff --git a/crates/nu-command/src/filters/reverse.rs b/crates/nu-command/src/filters/reverse.rs
index f40e5f3be4..18891637ab 100644
--- a/crates/nu-command/src/filters/reverse.rs
+++ b/crates/nu-command/src/filters/reverse.rs
@@ -63,7 +63,7 @@ impl Command for Reverse {
         let metadata = input.metadata();
         let values = input.into_iter_strict(head)?.collect::<Vec<_>>();
         let iter = values.into_iter().rev();
-        Ok(iter.into_pipeline_data_with_metadata(head, engine_state.ctrlc.clone(), metadata))
+        Ok(iter.into_pipeline_data_with_metadata(head, engine_state.signals().clone(), metadata))
     }
 }
 
diff --git a/crates/nu-command/src/filters/select.rs b/crates/nu-command/src/filters/select.rs
index 3514ac6be7..2ca04b3999 100644
--- a/crates/nu-command/src/filters/select.rs
+++ b/crates/nu-command/src/filters/select.rs
@@ -215,7 +215,11 @@ fn select(
             rows: unique_rows.into_iter().peekable(),
             current: 0,
         }
-        .into_pipeline_data_with_metadata(call_span, engine_state.ctrlc.clone(), metadata)
+        .into_pipeline_data_with_metadata(
+            call_span,
+            engine_state.signals().clone(),
+            metadata,
+        )
     } else {
         input
     };
@@ -255,7 +259,7 @@ fn select(
 
                     Ok(output.into_iter().into_pipeline_data_with_metadata(
                         call_span,
-                        engine_state.ctrlc.clone(),
+                        engine_state.signals().clone(),
                         metadata,
                     ))
                 }
@@ -304,7 +308,7 @@ fn select(
 
             Ok(values.into_pipeline_data_with_metadata(
                 call_span,
-                engine_state.ctrlc.clone(),
+                engine_state.signals().clone(),
                 metadata,
             ))
         }
diff --git a/crates/nu-command/src/filters/shuffle.rs b/crates/nu-command/src/filters/shuffle.rs
index 9e023b86c6..ec4bf8c454 100644
--- a/crates/nu-command/src/filters/shuffle.rs
+++ b/crates/nu-command/src/filters/shuffle.rs
@@ -33,7 +33,11 @@ impl Command for Shuffle {
         let mut values = input.into_iter_strict(call.head)?.collect::<Vec<_>>();
         values.shuffle(&mut thread_rng());
         let iter = values.into_iter();
-        Ok(iter.into_pipeline_data_with_metadata(call.head, engine_state.ctrlc.clone(), metadata))
+        Ok(iter.into_pipeline_data_with_metadata(
+            call.head,
+            engine_state.signals().clone(),
+            metadata,
+        ))
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/filters/skip/skip_.rs b/crates/nu-command/src/filters/skip/skip_.rs
index d293a743da..b64f438858 100644
--- a/crates/nu-command/src/filters/skip/skip_.rs
+++ b/crates/nu-command/src/filters/skip/skip_.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::Signals;
 use std::io::{self, Read};
 
 #[derive(Clone)]
@@ -90,8 +91,6 @@ impl Command for Skip {
             }
             None => 1,
         };
-
-        let ctrlc = engine_state.ctrlc.clone();
         let input_span = input.span().unwrap_or(call.head);
         match input {
             PipelineData::ByteStream(stream, metadata) => {
@@ -102,7 +101,12 @@ impl Command for Skip {
                         io::copy(&mut (&mut reader).take(n as u64), &mut io::sink())
                             .err_span(span)?;
                         Ok(PipelineData::ByteStream(
-                            ByteStream::read(reader, call.head, None, ByteStreamType::Binary),
+                            ByteStream::read(
+                                reader,
+                                call.head,
+                                Signals::empty(),
+                                ByteStreamType::Binary,
+                            ),
                             metadata,
                         ))
                     } else {
@@ -124,7 +128,11 @@ impl Command for Skip {
             _ => Ok(input
                 .into_iter_strict(call.head)?
                 .skip(n)
-                .into_pipeline_data_with_metadata(input_span, ctrlc, metadata)),
+                .into_pipeline_data_with_metadata(
+                    input_span,
+                    engine_state.signals().clone(),
+                    metadata,
+                )),
         }
     }
 }
diff --git a/crates/nu-command/src/filters/skip/skip_until.rs b/crates/nu-command/src/filters/skip/skip_until.rs
index bb36785e00..72cae739af 100644
--- a/crates/nu-command/src/filters/skip/skip_until.rs
+++ b/crates/nu-command/src/filters/skip/skip_until.rs
@@ -89,7 +89,7 @@ impl Command for SkipUntil {
                     .map(|cond| cond.is_false())
                     .unwrap_or(false)
             })
-            .into_pipeline_data_with_metadata(head, engine_state.ctrlc.clone(), metadata))
+            .into_pipeline_data_with_metadata(head, engine_state.signals().clone(), metadata))
     }
 }
 
diff --git a/crates/nu-command/src/filters/skip/skip_while.rs b/crates/nu-command/src/filters/skip/skip_while.rs
index 2747ea6f97..ea9c12bf6a 100644
--- a/crates/nu-command/src/filters/skip/skip_while.rs
+++ b/crates/nu-command/src/filters/skip/skip_while.rs
@@ -94,7 +94,7 @@ impl Command for SkipWhile {
                     .map(|cond| cond.is_true())
                     .unwrap_or(false)
             })
-            .into_pipeline_data_with_metadata(head, engine_state.ctrlc.clone(), metadata))
+            .into_pipeline_data_with_metadata(head, engine_state.signals().clone(), metadata))
     }
 }
 
diff --git a/crates/nu-command/src/filters/sort.rs b/crates/nu-command/src/filters/sort.rs
index 965b997355..179235302d 100644
--- a/crates/nu-command/src/filters/sort.rs
+++ b/crates/nu-command/src/filters/sort.rs
@@ -173,7 +173,7 @@ impl Command for Sort {
                 let iter = vec.into_iter();
                 Ok(iter.into_pipeline_data_with_metadata(
                     head,
-                    engine_state.ctrlc.clone(),
+                    engine_state.signals().clone(),
                     metadata,
                 ))
             }
diff --git a/crates/nu-command/src/filters/sort_by.rs b/crates/nu-command/src/filters/sort_by.rs
index f3f715bc9d..e832255a26 100644
--- a/crates/nu-command/src/filters/sort_by.rs
+++ b/crates/nu-command/src/filters/sort_by.rs
@@ -100,7 +100,7 @@ impl Command for SortBy {
         }
 
         let iter = vec.into_iter();
-        Ok(iter.into_pipeline_data_with_metadata(head, engine_state.ctrlc.clone(), metadata))
+        Ok(iter.into_pipeline_data_with_metadata(head, engine_state.signals().clone(), metadata))
     }
 }
 
diff --git a/crates/nu-command/src/filters/take/take_.rs b/crates/nu-command/src/filters/take/take_.rs
index 7ebe22f914..1876244bdd 100644
--- a/crates/nu-command/src/filters/take/take_.rs
+++ b/crates/nu-command/src/filters/take/take_.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::Signals;
 use std::io::Read;
 
 #[derive(Clone)]
@@ -46,7 +47,6 @@ impl Command for Take {
         let head = call.head;
         let rows_desired: usize = call.req(engine_state, stack, 0)?;
 
-        let ctrlc = engine_state.ctrlc.clone();
         let metadata = input.metadata();
 
         match input {
@@ -56,15 +56,23 @@ impl Command for Take {
                     Value::List { vals, .. } => Ok(vals
                         .into_iter()
                         .take(rows_desired)
-                        .into_pipeline_data_with_metadata(head, ctrlc, metadata)),
+                        .into_pipeline_data_with_metadata(
+                            head,
+                            engine_state.signals().clone(),
+                            metadata,
+                        )),
                     Value::Binary { val, .. } => {
                         let slice: Vec<u8> = val.into_iter().take(rows_desired).collect();
                         Ok(PipelineData::Value(Value::binary(slice, span), metadata))
                     }
                     Value::Range { val, .. } => Ok(val
-                        .into_range_iter(span, ctrlc.clone())
+                        .into_range_iter(span, Signals::empty())
                         .take(rows_desired)
-                        .into_pipeline_data_with_metadata(head, ctrlc, metadata)),
+                        .into_pipeline_data_with_metadata(
+                            head,
+                            engine_state.signals().clone(),
+                            metadata,
+                        )),
                     // Propagate errors by explicitly matching them before the final case.
                     Value::Error { error, .. } => Err(*error),
                     other => Err(ShellError::OnlySupportsThisInputType {
@@ -87,7 +95,7 @@ impl Command for Take {
                             ByteStream::read(
                                 reader.take(rows_desired as u64),
                                 head,
-                                None,
+                                Signals::empty(),
                                 ByteStreamType::Binary,
                             ),
                             metadata,
diff --git a/crates/nu-command/src/filters/take/take_until.rs b/crates/nu-command/src/filters/take/take_until.rs
index 0df2407cb1..c7debf5dee 100644
--- a/crates/nu-command/src/filters/take/take_until.rs
+++ b/crates/nu-command/src/filters/take/take_until.rs
@@ -85,7 +85,7 @@ impl Command for TakeUntil {
                     .map(|cond| cond.is_false())
                     .unwrap_or(false)
             })
-            .into_pipeline_data_with_metadata(head, engine_state.ctrlc.clone(), metadata))
+            .into_pipeline_data_with_metadata(head, engine_state.signals().clone(), metadata))
     }
 }
 
diff --git a/crates/nu-command/src/filters/take/take_while.rs b/crates/nu-command/src/filters/take/take_while.rs
index 7c282ac38a..b8045080ea 100644
--- a/crates/nu-command/src/filters/take/take_while.rs
+++ b/crates/nu-command/src/filters/take/take_while.rs
@@ -85,7 +85,7 @@ impl Command for TakeWhile {
                     .map(|cond| cond.is_true())
                     .unwrap_or(false)
             })
-            .into_pipeline_data_with_metadata(head, engine_state.ctrlc.clone(), metadata))
+            .into_pipeline_data_with_metadata(head, engine_state.signals().clone(), metadata))
     }
 }
 
diff --git a/crates/nu-command/src/filters/tee.rs b/crates/nu-command/src/filters/tee.rs
index 2251f6646a..663b2f19af 100644
--- a/crates/nu-command/src/filters/tee.rs
+++ b/crates/nu-command/src/filters/tee.rs
@@ -1,15 +1,11 @@
 use nu_engine::{command_prelude::*, get_eval_block_with_early_return};
 use nu_protocol::{
-    byte_stream::copy_with_interrupt, engine::Closure, process::ChildPipe, ByteStream,
-    ByteStreamSource, OutDest, PipelineMetadata,
+    byte_stream::copy_with_signals, engine::Closure, process::ChildPipe, ByteStream,
+    ByteStreamSource, OutDest, PipelineMetadata, Signals,
 };
 use std::{
     io::{self, Read, Write},
-    sync::{
-        atomic::AtomicBool,
-        mpsc::{self, Sender},
-        Arc,
-    },
+    sync::mpsc::{self, Sender},
     thread::{self, JoinHandle},
 };
 
@@ -103,12 +99,11 @@ use it in your pipeline."#
 
         if let PipelineData::ByteStream(stream, metadata) = input {
             let span = stream.span();
-            let ctrlc = engine_state.ctrlc.clone();
             let type_ = stream.type_();
 
             let info = StreamInfo {
                 span,
-                ctrlc: ctrlc.clone(),
+                signals: engine_state.signals().clone(),
                 type_,
                 metadata: metadata.clone(),
             };
@@ -123,7 +118,7 @@ use it in your pipeline."#
                     let tee = IoTee::new(read, tee_thread);
 
                     Ok(PipelineData::ByteStream(
-                        ByteStream::read(tee, span, ctrlc, type_),
+                        ByteStream::read(tee, span, engine_state.signals().clone(), type_),
                         metadata,
                     ))
                 }
@@ -136,7 +131,7 @@ use it in your pipeline."#
                     let tee = IoTee::new(file, tee_thread);
 
                     Ok(PipelineData::ByteStream(
-                        ByteStream::read(tee, span, ctrlc, type_),
+                        ByteStream::read(tee, span, engine_state.signals().clone(), type_),
                         metadata,
                     ))
                 }
@@ -234,19 +229,19 @@ use it in your pipeline."#
             }
 
             let span = input.span().unwrap_or(head);
-            let ctrlc = engine_state.ctrlc.clone();
             let metadata = input.metadata();
             let metadata_clone = metadata.clone();
+            let signals = engine_state.signals().clone();
 
             Ok(tee(input.into_iter(), move |rx| {
-                let input = rx.into_pipeline_data_with_metadata(span, ctrlc, metadata_clone);
+                let input = rx.into_pipeline_data_with_metadata(span, signals, metadata_clone);
                 eval_block(input)
             })
             .err_span(call.head)?
             .map(move |result| result.unwrap_or_else(|err| Value::error(err, closure_span)))
             .into_pipeline_data_with_metadata(
                 span,
-                engine_state.ctrlc.clone(),
+                engine_state.signals().clone(),
                 metadata,
             ))
         }
@@ -386,8 +381,13 @@ fn spawn_tee(
     let thread = thread::Builder::new()
         .name("tee".into())
         .spawn(move || {
-            // We don't use ctrlc here because we assume it already has it on the other side
-            let stream = ByteStream::from_iter(receiver.into_iter(), info.span, None, info.type_);
+            // We use Signals::empty() here because we assume there already is a Signals on the other side
+            let stream = ByteStream::from_iter(
+                receiver.into_iter(),
+                info.span,
+                Signals::empty(),
+                info.type_,
+            );
             eval_block(PipelineData::ByteStream(stream, info.metadata))
         })
         .err_span(info.span)?;
@@ -398,13 +398,13 @@ fn spawn_tee(
 #[derive(Clone)]
 struct StreamInfo {
     span: Span,
-    ctrlc: Option<Arc<AtomicBool>>,
+    signals: Signals,
     type_: ByteStreamType,
     metadata: Option<PipelineMetadata>,
 }
 
 fn copy(src: impl Read, dest: impl Write, info: &StreamInfo) -> Result<(), ShellError> {
-    copy_with_interrupt(src, dest, info.span, info.ctrlc.as_deref())?;
+    copy_with_signals(src, dest, info.span, &info.signals)?;
     Ok(())
 }
 
@@ -421,11 +421,11 @@ fn copy_on_thread(
     info: &StreamInfo,
 ) -> Result<JoinHandle<Result<(), ShellError>>, ShellError> {
     let span = info.span;
-    let ctrlc = info.ctrlc.clone();
+    let signals = info.signals.clone();
     thread::Builder::new()
         .name("stderr copier".into())
         .spawn(move || {
-            copy_with_interrupt(src, dest, span, ctrlc.as_deref())?;
+            copy_with_signals(src, dest, span, &signals)?;
             Ok(())
         })
         .map_err(|e| e.into_spanned(span).into())
diff --git a/crates/nu-command/src/filters/transpose.rs b/crates/nu-command/src/filters/transpose.rs
index 49caa56d18..95aa382e4f 100644
--- a/crates/nu-command/src/filters/transpose.rs
+++ b/crates/nu-command/src/filters/transpose.rs
@@ -173,7 +173,6 @@ pub fn transpose(
         });
     }
 
-    let ctrlc = engine_state.ctrlc.clone();
     let metadata = input.metadata();
     let input: Vec<_> = input.into_iter().collect();
 
@@ -284,7 +283,11 @@ pub fn transpose(
             metadata,
         ))
     } else {
-        Ok(result_data.into_pipeline_data_with_metadata(name, ctrlc, metadata))
+        Ok(result_data.into_pipeline_data_with_metadata(
+            name,
+            engine_state.signals().clone(),
+            metadata,
+        ))
     }
 }
 
diff --git a/crates/nu-command/src/filters/uniq.rs b/crates/nu-command/src/filters/uniq.rs
index 7d71d868f0..99abb4e152 100644
--- a/crates/nu-command/src/filters/uniq.rs
+++ b/crates/nu-command/src/filters/uniq.rs
@@ -241,18 +241,18 @@ pub fn uniq(
     item_mapper: Box<dyn Fn(ItemMapperState) -> ValueCounter>,
     metadata: Option<PipelineMetadata>,
 ) -> Result<PipelineData, ShellError> {
-    let ctrlc = engine_state.ctrlc.clone();
     let head = call.head;
     let flag_show_count = call.has_flag(engine_state, stack, "count")?;
     let flag_show_repeated = call.has_flag(engine_state, stack, "repeated")?;
     let flag_ignore_case = call.has_flag(engine_state, stack, "ignore-case")?;
     let flag_only_uniques = call.has_flag(engine_state, stack, "unique")?;
 
+    let signals = engine_state.signals().clone();
     let uniq_values = input
         .into_iter()
         .enumerate()
         .map_while(|(index, item)| {
-            if nu_utils::ctrl_c::was_pressed(&ctrlc) {
+            if signals.interrupted() {
                 return None;
             }
             Some(item_mapper(ItemMapperState {
diff --git a/crates/nu-command/src/filters/update.rs b/crates/nu-command/src/filters/update.rs
index e724ae77ad..d5ef0825ec 100644
--- a/crates/nu-command/src/filters/update.rs
+++ b/crates/nu-command/src/filters/update.rs
@@ -187,7 +187,11 @@ fn update(
                 Ok(pre_elems
                     .into_iter()
                     .chain(stream)
-                    .into_pipeline_data_with_metadata(head, engine_state.ctrlc.clone(), metadata))
+                    .into_pipeline_data_with_metadata(
+                        head,
+                        engine_state.signals().clone(),
+                        metadata,
+                    ))
             } else if let Value::Closure { val, .. } = replacement {
                 let mut closure = ClosureEval::new(engine_state, stack, *val);
                 let stream = stream.map(move |mut value| {
diff --git a/crates/nu-command/src/filters/upsert.rs b/crates/nu-command/src/filters/upsert.rs
index e3678972fb..af2e6c74b1 100644
--- a/crates/nu-command/src/filters/upsert.rs
+++ b/crates/nu-command/src/filters/upsert.rs
@@ -247,7 +247,11 @@ fn upsert(
                 Ok(pre_elems
                     .into_iter()
                     .chain(stream)
-                    .into_pipeline_data_with_metadata(head, engine_state.ctrlc.clone(), metadata))
+                    .into_pipeline_data_with_metadata(
+                        head,
+                        engine_state.signals().clone(),
+                        metadata,
+                    ))
             } else if let Value::Closure { val, .. } = replacement {
                 let mut closure = ClosureEval::new(engine_state, stack, *val);
                 let stream = stream.map(move |mut value| {
diff --git a/crates/nu-command/src/filters/utils.rs b/crates/nu-command/src/filters/utils.rs
index 8d9b1300f6..3ebd4bafbd 100644
--- a/crates/nu-command/src/filters/utils.rs
+++ b/crates/nu-command/src/filters/utils.rs
@@ -32,10 +32,7 @@ pub fn boolean_fold(
     let mut closure = ClosureEval::new(engine_state, stack, closure);
 
     for value in input {
-        if nu_utils::ctrl_c::was_pressed(&engine_state.ctrlc) {
-            break;
-        }
-
+        engine_state.signals().check(head)?;
         let pred = closure.run_with_value(value)?.into_value(head)?.is_true();
 
         if pred == accumulator {
diff --git a/crates/nu-command/src/filters/values.rs b/crates/nu-command/src/filters/values.rs
index f6ff8cda2e..9a08f1168c 100644
--- a/crates/nu-command/src/filters/values.rs
+++ b/crates/nu-command/src/filters/values.rs
@@ -134,7 +134,7 @@ fn values(
     head: Span,
     input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
-    let ctrlc = engine_state.ctrlc.clone();
+    let signals = engine_state.signals().clone();
     let metadata = input.metadata();
     match input {
         PipelineData::Empty => Ok(PipelineData::Empty),
@@ -144,7 +144,7 @@ fn values(
                 Value::List { vals, .. } => match get_values(&vals, head, span) {
                     Ok(cols) => Ok(cols
                         .into_iter()
-                        .into_pipeline_data_with_metadata(head, ctrlc, metadata)),
+                        .into_pipeline_data_with_metadata(head, signals, metadata)),
                     Err(err) => Err(err),
                 },
                 Value::Custom { val, .. } => {
@@ -152,7 +152,7 @@ fn values(
                     match get_values(&[input_as_base_value], head, span) {
                         Ok(cols) => Ok(cols
                             .into_iter()
-                            .into_pipeline_data_with_metadata(head, ctrlc, metadata)),
+                            .into_pipeline_data_with_metadata(head, signals, metadata)),
                         Err(err) => Err(err),
                     }
                 }
@@ -160,7 +160,7 @@ fn values(
                     .values()
                     .cloned()
                     .collect::<Vec<_>>()
-                    .into_pipeline_data_with_metadata(head, ctrlc, metadata)),
+                    .into_pipeline_data_with_metadata(head, signals, metadata)),
                 // Propagate errors
                 Value::Error { error, .. } => Err(*error),
                 other => Err(ShellError::OnlySupportsThisInputType {
@@ -176,7 +176,7 @@ fn values(
             match get_values(&vals, head, head) {
                 Ok(cols) => Ok(cols
                     .into_iter()
-                    .into_pipeline_data_with_metadata(head, ctrlc, metadata)),
+                    .into_pipeline_data_with_metadata(head, signals, metadata)),
                 Err(err) => Err(err),
             }
         }
diff --git a/crates/nu-command/src/filters/where_.rs b/crates/nu-command/src/filters/where_.rs
index 922879d09b..0a8c8c9ef3 100644
--- a/crates/nu-command/src/filters/where_.rs
+++ b/crates/nu-command/src/filters/where_.rs
@@ -70,7 +70,7 @@ not supported."#
                     Err(err) => Some(Value::error(err, head)),
                 }
             })
-            .into_pipeline_data_with_metadata(head, engine_state.ctrlc.clone(), metadata))
+            .into_pipeline_data_with_metadata(head, engine_state.signals().clone(), metadata))
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/filters/window.rs b/crates/nu-command/src/filters/window.rs
index 5b386b9f84..3c470f478d 100644
--- a/crates/nu-command/src/filters/window.rs
+++ b/crates/nu-command/src/filters/window.rs
@@ -113,7 +113,6 @@ impl Command for Window {
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
         let group_size: Spanned<usize> = call.req(engine_state, stack, 0)?;
-        let ctrlc = engine_state.ctrlc.clone();
         let metadata = input.metadata();
         let stride: Option<usize> = call.get_flag(engine_state, stack, "stride")?;
         let remainder = call.has_flag(engine_state, stack, "remainder")?;
@@ -131,7 +130,11 @@ impl Command for Window {
             remainder,
         };
 
-        Ok(each_group_iterator.into_pipeline_data_with_metadata(head, ctrlc, metadata))
+        Ok(each_group_iterator.into_pipeline_data_with_metadata(
+            head,
+            engine_state.signals().clone(),
+            metadata,
+        ))
     }
 }
 
diff --git a/crates/nu-command/src/filters/wrap.rs b/crates/nu-command/src/filters/wrap.rs
index 52a0fb22c3..dfe1c11d03 100644
--- a/crates/nu-command/src/filters/wrap.rs
+++ b/crates/nu-command/src/filters/wrap.rs
@@ -42,7 +42,7 @@ impl Command for Wrap {
             | PipelineData::ListStream { .. } => Ok(input
                 .into_iter()
                 .map(move |x| Value::record(record! { name.clone() => x }, span))
-                .into_pipeline_data_with_metadata(span, engine_state.ctrlc.clone(), metadata)),
+                .into_pipeline_data_with_metadata(span, engine_state.signals().clone(), metadata)),
             PipelineData::ByteStream(stream, ..) => Ok(Value::record(
                 record! { name => stream.into_value()? },
                 span,
diff --git a/crates/nu-command/src/filters/zip.rs b/crates/nu-command/src/filters/zip.rs
index 9d81451ed4..59e2b4ac98 100644
--- a/crates/nu-command/src/filters/zip.rs
+++ b/crates/nu-command/src/filters/zip.rs
@@ -112,7 +112,7 @@ impl Command for Zip {
             .into_iter()
             .zip(other)
             .map(move |(x, y)| Value::list(vec![x, y], head))
-            .into_pipeline_data_with_metadata(head, engine_state.ctrlc.clone(), metadata))
+            .into_pipeline_data_with_metadata(head, engine_state.signals().clone(), metadata))
     }
 }
 
diff --git a/crates/nu-command/src/formats/from/delimited.rs b/crates/nu-command/src/formats/from/delimited.rs
index 8f84890645..0fea7e082b 100644
--- a/crates/nu-command/src/formats/from/delimited.rs
+++ b/crates/nu-command/src/formats/from/delimited.rs
@@ -1,5 +1,5 @@
 use csv::{ReaderBuilder, Trim};
-use nu_protocol::{ByteStream, ListStream, PipelineData, ShellError, Span, Value};
+use nu_protocol::{ByteStream, ListStream, PipelineData, ShellError, Signals, Span, Value};
 
 fn from_csv_error(err: csv::Error, span: Span) -> ShellError {
     ShellError::DelimiterError {
@@ -25,7 +25,7 @@ fn from_delimited_stream(
     let input_reader = if let Some(stream) = input.reader() {
         stream
     } else {
-        return Ok(ListStream::new(std::iter::empty(), span, None));
+        return Ok(ListStream::new(std::iter::empty(), span, Signals::empty()));
     };
 
     let mut reader = ReaderBuilder::new()
@@ -83,7 +83,7 @@ fn from_delimited_stream(
         Value::record(columns.zip(values).collect(), span)
     });
 
-    Ok(ListStream::new(iter, span, None))
+    Ok(ListStream::new(iter, span, Signals::empty()))
 }
 
 pub(super) struct DelimitedReaderConfig {
@@ -106,7 +106,7 @@ pub(super) fn from_delimited_data(
         PipelineData::Empty => Ok(PipelineData::Empty),
         PipelineData::Value(value, metadata) => {
             let string = value.into_string()?;
-            let byte_stream = ByteStream::read_string(string, name, None);
+            let byte_stream = ByteStream::read_string(string, name, Signals::empty());
             Ok(PipelineData::ListStream(
                 from_delimited_stream(config, byte_stream, name)?,
                 metadata,
diff --git a/crates/nu-command/src/formats/from/json.rs b/crates/nu-command/src/formats/from/json.rs
index a1b43abb0a..6252afff4c 100644
--- a/crates/nu-command/src/formats/from/json.rs
+++ b/crates/nu-command/src/formats/from/json.rs
@@ -1,10 +1,7 @@
-use std::{
-    io::{BufRead, Cursor},
-    sync::{atomic::AtomicBool, Arc},
-};
+use std::io::{BufRead, Cursor};
 
 use nu_engine::command_prelude::*;
-use nu_protocol::{ListStream, PipelineMetadata};
+use nu_protocol::{ListStream, PipelineMetadata, Signals};
 
 #[derive(Clone)]
 pub struct FromJson;
@@ -80,7 +77,12 @@ impl Command for FromJson {
             match input {
                 PipelineData::Value(Value::String { val, .. }, metadata) => {
                     Ok(PipelineData::ListStream(
-                        read_json_lines(Cursor::new(val), span, strict, engine_state.ctrlc.clone()),
+                        read_json_lines(
+                            Cursor::new(val),
+                            span,
+                            strict,
+                            engine_state.signals().clone(),
+                        ),
                         update_metadata(metadata),
                     ))
                 }
@@ -89,7 +91,7 @@ impl Command for FromJson {
                 {
                     if let Some(reader) = stream.reader() {
                         Ok(PipelineData::ListStream(
-                            read_json_lines(reader, span, strict, None),
+                            read_json_lines(reader, span, strict, Signals::empty()),
                             update_metadata(metadata),
                         ))
                     } else {
@@ -127,7 +129,7 @@ fn read_json_lines(
     input: impl BufRead + Send + 'static,
     span: Span,
     strict: bool,
-    interrupt: Option<Arc<AtomicBool>>,
+    signals: Signals,
 ) -> ListStream {
     let iter = input
         .lines()
@@ -142,7 +144,7 @@ fn read_json_lines(
         })
         .map(move |result| result.unwrap_or_else(|err| Value::error(err, span)));
 
-    ListStream::new(iter, span, interrupt)
+    ListStream::new(iter, span, signals)
 }
 
 fn convert_nujson_to_value(value: nu_json::Value, span: Span) -> Value {
diff --git a/crates/nu-command/src/formats/from/msgpack.rs b/crates/nu-command/src/formats/from/msgpack.rs
index 4d8ea5e320..d3d0d710f1 100644
--- a/crates/nu-command/src/formats/from/msgpack.rs
+++ b/crates/nu-command/src/formats/from/msgpack.rs
@@ -5,12 +5,12 @@ use std::{
     error::Error,
     io::{self, Cursor, ErrorKind},
     string::FromUtf8Error,
-    sync::{atomic::AtomicBool, Arc},
 };
 
 use byteorder::{BigEndian, ReadBytesExt};
 use chrono::{TimeZone, Utc};
 use nu_engine::command_prelude::*;
+use nu_protocol::Signals;
 use rmp::decode::{self as mp, ValueReadError};
 
 /// Max recursion depth
@@ -111,7 +111,7 @@ MessagePack: https://msgpack.org/
         let opts = Opts {
             span: call.head,
             objects,
-            ctrlc: engine_state.ctrlc.clone(),
+            signals: engine_state.signals().clone(),
         };
         match input {
             // Deserialize from a byte buffer
@@ -227,7 +227,7 @@ impl From<ReadError> for ShellError {
 pub(crate) struct Opts {
     pub span: Span,
     pub objects: bool,
-    pub ctrlc: Option<Arc<AtomicBool>>,
+    pub signals: Signals,
 }
 
 /// Read single or multiple values into PipelineData
@@ -238,7 +238,7 @@ pub(crate) fn read_msgpack(
     let Opts {
         span,
         objects,
-        ctrlc,
+        signals,
     } = opts;
     if objects {
         // Make an iterator that reads multiple values from the reader
@@ -262,7 +262,7 @@ pub(crate) fn read_msgpack(
                 None
             }
         })
-        .into_pipeline_data(span, ctrlc))
+        .into_pipeline_data(span, signals))
     } else {
         // Read a single value and then make sure it's EOF
         let result = read_value(&mut input, span, 0)?;
diff --git a/crates/nu-command/src/formats/from/msgpackz.rs b/crates/nu-command/src/formats/from/msgpackz.rs
index 7960f3f97a..c98b72cdd6 100644
--- a/crates/nu-command/src/formats/from/msgpackz.rs
+++ b/crates/nu-command/src/formats/from/msgpackz.rs
@@ -41,7 +41,7 @@ impl Command for FromMsgpackz {
         let opts = Opts {
             span,
             objects,
-            ctrlc: engine_state.ctrlc.clone(),
+            signals: engine_state.signals().clone(),
         };
         match input {
             // Deserialize from a byte buffer
diff --git a/crates/nu-command/src/formats/to/delimited.rs b/crates/nu-command/src/formats/to/delimited.rs
index a7a2480a34..34bb06b8a2 100644
--- a/crates/nu-command/src/formats/to/delimited.rs
+++ b/crates/nu-command/src/formats/to/delimited.rs
@@ -1,7 +1,7 @@
 use csv::WriterBuilder;
 use nu_cmd_base::formats::to::delimited::merge_descriptors;
 use nu_protocol::{
-    ByteStream, ByteStreamType, Config, PipelineData, ShellError, Span, Spanned, Value,
+    ByteStream, ByteStreamType, Config, PipelineData, ShellError, Signals, Span, Spanned, Value,
 };
 use std::{iter, sync::Arc};
 
@@ -128,37 +128,42 @@ pub fn to_delimited_data(
     // If we're configured to generate a header, we generate it first, then set this false
     let mut is_header = !noheaders;
 
-    let stream = ByteStream::from_fn(head, None, ByteStreamType::String, move |buffer| {
-        let mut wtr = WriterBuilder::new()
-            .delimiter(separator)
-            .from_writer(buffer);
+    let stream = ByteStream::from_fn(
+        head,
+        Signals::empty(),
+        ByteStreamType::String,
+        move |buffer| {
+            let mut wtr = WriterBuilder::new()
+                .delimiter(separator)
+                .from_writer(buffer);
 
-        if is_header {
-            // Unless we are configured not to write a header, we write the header row now, once,
-            // before everything else.
-            wtr.write_record(&columns)
-                .map_err(|err| make_csv_error(err, format_name, head))?;
-            is_header = false;
-            Ok(true)
-        } else if let Some(row) = iter.next() {
-            // Write each column of a normal row, in order
-            let record = row.into_record()?;
-            for column in &columns {
-                let field = record
-                    .get(column)
-                    .map(|v| to_string_tagged_value(v, &config, format_name))
-                    .unwrap_or(Ok(String::new()))?;
-                wtr.write_field(field)
+            if is_header {
+                // Unless we are configured not to write a header, we write the header row now, once,
+                // before everything else.
+                wtr.write_record(&columns)
                     .map_err(|err| make_csv_error(err, format_name, head))?;
+                is_header = false;
+                Ok(true)
+            } else if let Some(row) = iter.next() {
+                // Write each column of a normal row, in order
+                let record = row.into_record()?;
+                for column in &columns {
+                    let field = record
+                        .get(column)
+                        .map(|v| to_string_tagged_value(v, &config, format_name))
+                        .unwrap_or(Ok(String::new()))?;
+                    wtr.write_field(field)
+                        .map_err(|err| make_csv_error(err, format_name, head))?;
+                }
+                // End the row
+                wtr.write_record(iter::empty::<String>())
+                    .map_err(|err| make_csv_error(err, format_name, head))?;
+                Ok(true)
+            } else {
+                Ok(false)
             }
-            // End the row
-            wtr.write_record(iter::empty::<String>())
-                .map_err(|err| make_csv_error(err, format_name, head))?;
-            Ok(true)
-        } else {
-            Ok(false)
-        }
-    });
+        },
+    );
 
     Ok(PipelineData::ByteStream(stream, metadata))
 }
diff --git a/crates/nu-command/src/formats/to/msgpack.rs b/crates/nu-command/src/formats/to/msgpack.rs
index bfeb428e3e..02515e26fe 100644
--- a/crates/nu-command/src/formats/to/msgpack.rs
+++ b/crates/nu-command/src/formats/to/msgpack.rs
@@ -5,7 +5,7 @@ use std::io;
 
 use byteorder::{BigEndian, WriteBytesExt};
 use nu_engine::command_prelude::*;
-use nu_protocol::{ast::PathMember, Spanned};
+use nu_protocol::{ast::PathMember, Signals, Spanned};
 use rmp::encode as mp;
 
 /// Max recursion depth
@@ -189,7 +189,7 @@ pub(crate) fn write_value(
             // Convert range to list
             write_value(
                 out,
-                &Value::list(val.into_range_iter(span, None).collect(), span),
+                &Value::list(val.into_range_iter(span, Signals::empty()).collect(), span),
                 depth,
             )?;
         }
diff --git a/crates/nu-command/src/formats/to/text.rs b/crates/nu-command/src/formats/to/text.rs
index 1aa1114bce..82b853248c 100644
--- a/crates/nu-command/src/formats/to/text.rs
+++ b/crates/nu-command/src/formats/to/text.rs
@@ -60,7 +60,7 @@ impl Command for ToText {
                     ByteStream::from_iter(
                         iter,
                         span,
-                        engine_state.ctrlc.clone(),
+                        engine_state.signals().clone(),
                         ByteStreamType::String,
                     ),
                     update_metadata(meta),
diff --git a/crates/nu-command/src/generators/generate.rs b/crates/nu-command/src/generators/generate.rs
index 44bca993d0..8d4f48d3fb 100644
--- a/crates/nu-command/src/generators/generate.rs
+++ b/crates/nu-command/src/generators/generate.rs
@@ -166,7 +166,7 @@ used as the next argument to the closure, otherwise generation stops.
 
         Ok(iter
             .flatten()
-            .into_pipeline_data(call.head, engine_state.ctrlc.clone()))
+            .into_pipeline_data(call.head, engine_state.signals().clone()))
     }
 }
 
diff --git a/crates/nu-command/src/generators/seq.rs b/crates/nu-command/src/generators/seq.rs
index 359d479ca0..3636d89d4c 100644
--- a/crates/nu-command/src/generators/seq.rs
+++ b/crates/nu-command/src/generators/seq.rs
@@ -129,7 +129,7 @@ pub fn run_seq(
                 span,
             },
             span,
-            engine_state.ctrlc.clone(),
+            engine_state.signals().clone(),
         )
     } else {
         ListStream::new(
@@ -141,7 +141,7 @@ pub fn run_seq(
                 span,
             },
             span,
-            engine_state.ctrlc.clone(),
+            engine_state.signals().clone(),
         )
     };
 
diff --git a/crates/nu-command/src/hash/generic_digest.rs b/crates/nu-command/src/hash/generic_digest.rs
index ab15ccae7a..f098f8a0cb 100644
--- a/crates/nu-command/src/hash/generic_digest.rs
+++ b/crates/nu-command/src/hash/generic_digest.rs
@@ -96,7 +96,7 @@ where
             }
         } else {
             let args = Arguments { binary, cell_paths };
-            operate(action::<D>, args, input, head, engine_state.ctrlc.clone())
+            operate(action::<D>, args, input, head, engine_state.signals())
         }
     }
 }
diff --git a/crates/nu-command/src/math/abs.rs b/crates/nu-command/src/math/abs.rs
index 8f653142fa..b16097ba8d 100644
--- a/crates/nu-command/src/math/abs.rs
+++ b/crates/nu-command/src/math/abs.rs
@@ -42,10 +42,7 @@ impl Command for SubCommand {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
-        input.map(
-            move |value| abs_helper(value, head),
-            engine_state.ctrlc.clone(),
-        )
+        input.map(move |value| abs_helper(value, head), engine_state.signals())
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/math/ceil.rs b/crates/nu-command/src/math/ceil.rs
index 0b0f6d1696..0886ff0bc5 100644
--- a/crates/nu-command/src/math/ceil.rs
+++ b/crates/nu-command/src/math/ceil.rs
@@ -41,10 +41,7 @@ impl Command for SubCommand {
         if matches!(input, PipelineData::Empty) {
             return Err(ShellError::PipelineEmpty { dst_span: head });
         }
-        input.map(
-            move |value| operate(value, head),
-            engine_state.ctrlc.clone(),
-        )
+        input.map(move |value| operate(value, head), engine_state.signals())
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/math/floor.rs b/crates/nu-command/src/math/floor.rs
index e85e3ca674..c2b34c2cf9 100644
--- a/crates/nu-command/src/math/floor.rs
+++ b/crates/nu-command/src/math/floor.rs
@@ -41,10 +41,7 @@ impl Command for SubCommand {
         if matches!(input, PipelineData::Empty) {
             return Err(ShellError::PipelineEmpty { dst_span: head });
         }
-        input.map(
-            move |value| operate(value, head),
-            engine_state.ctrlc.clone(),
-        )
+        input.map(move |value| operate(value, head), engine_state.signals())
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/math/log.rs b/crates/nu-command/src/math/log.rs
index 90fad17daf..7a7e4bd27b 100644
--- a/crates/nu-command/src/math/log.rs
+++ b/crates/nu-command/src/math/log.rs
@@ -59,7 +59,7 @@ impl Command for SubCommand {
         let base = base.item;
         input.map(
             move |value| operate(value, head, base),
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
         )
     }
 
diff --git a/crates/nu-command/src/math/round.rs b/crates/nu-command/src/math/round.rs
index 7693c9a316..eafe669cf1 100644
--- a/crates/nu-command/src/math/round.rs
+++ b/crates/nu-command/src/math/round.rs
@@ -50,7 +50,7 @@ impl Command for SubCommand {
         }
         input.map(
             move |value| operate(value, head, precision_param),
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
         )
     }
 
diff --git a/crates/nu-command/src/math/sqrt.rs b/crates/nu-command/src/math/sqrt.rs
index c9c9765912..a3ab5fbbd8 100644
--- a/crates/nu-command/src/math/sqrt.rs
+++ b/crates/nu-command/src/math/sqrt.rs
@@ -41,10 +41,7 @@ impl Command for SubCommand {
         if matches!(input, PipelineData::Empty) {
             return Err(ShellError::PipelineEmpty { dst_span: head });
         }
-        input.map(
-            move |value| operate(value, head),
-            engine_state.ctrlc.clone(),
-        )
+        input.map(move |value| operate(value, head), engine_state.signals())
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/math/utils.rs b/crates/nu-command/src/math/utils.rs
index 9d2c15e15f..765c1f42fb 100644
--- a/crates/nu-command/src/math/utils.rs
+++ b/crates/nu-command/src/math/utils.rs
@@ -1,6 +1,6 @@
 use core::slice;
 use indexmap::IndexMap;
-use nu_protocol::{ast::Call, IntoPipelineData, PipelineData, ShellError, Span, Value};
+use nu_protocol::{ast::Call, IntoPipelineData, PipelineData, ShellError, Signals, Span, Value};
 
 pub fn run_with_function(
     call: &Call,
@@ -92,7 +92,7 @@ pub fn calculate(
         }
         PipelineData::Value(Value::Range { val, .. }, ..) => {
             let new_vals: Result<Vec<Value>, ShellError> = val
-                .into_range_iter(span, None)
+                .into_range_iter(span, Signals::empty())
                 .map(|val| mf(&[val], span, name))
                 .collect();
 
diff --git a/crates/nu-command/src/network/http/client.rs b/crates/nu-command/src/network/http/client.rs
index 2c02d7be33..deeb768eea 100644
--- a/crates/nu-command/src/network/http/client.rs
+++ b/crates/nu-command/src/network/http/client.rs
@@ -5,16 +5,12 @@ use base64::{
     Engine,
 };
 use nu_engine::command_prelude::*;
-use nu_protocol::ByteStream;
+use nu_protocol::{ByteStream, Signals};
 use std::{
     collections::HashMap,
     path::PathBuf,
     str::FromStr,
-    sync::{
-        atomic::AtomicBool,
-        mpsc::{self, RecvTimeoutError},
-        Arc,
-    },
+    sync::mpsc::{self, RecvTimeoutError},
     time::Duration,
 };
 use ureq::{Error, ErrorKind, Request, Response};
@@ -129,7 +125,7 @@ pub fn response_to_buffer(
     let reader = response.into_reader();
 
     PipelineData::ByteStream(
-        ByteStream::read(reader, span, engine_state.ctrlc.clone(), response_type)
+        ByteStream::read(reader, span, engine_state.signals().clone(), response_type)
             .with_known_size(buffer_size),
         None,
     )
@@ -192,13 +188,14 @@ pub fn send_request(
     request: Request,
     http_body: HttpBody,
     content_type: Option<String>,
-    ctrl_c: Option<Arc<AtomicBool>>,
+    span: Span,
+    signals: &Signals,
 ) -> Result<Response, ShellErrorOrRequestError> {
     let request_url = request.url().to_string();
 
     match http_body {
         HttpBody::None => {
-            send_cancellable_request(&request_url, Box::new(|| request.call()), ctrl_c)
+            send_cancellable_request(&request_url, Box::new(|| request.call()), span, signals)
         }
         HttpBody::ByteStream(byte_stream) => {
             let req = if let Some(content_type) = content_type {
@@ -207,7 +204,7 @@ pub fn send_request(
                 request
             };
 
-            send_cancellable_request_bytes(&request_url, req, byte_stream, ctrl_c)
+            send_cancellable_request_bytes(&request_url, req, byte_stream, span, signals)
         }
         HttpBody::Value(body) => {
             let (body_type, req) = match content_type {
@@ -224,20 +221,32 @@ pub fn send_request(
                 Value::Binary { val, .. } => send_cancellable_request(
                     &request_url,
                     Box::new(move || req.send_bytes(&val)),
-                    ctrl_c,
+                    span,
+                    signals,
                 ),
                 Value::String { .. } if body_type == BodyType::Json => {
                     let data = value_to_json_value(&body)?;
-                    send_cancellable_request(&request_url, Box::new(|| req.send_json(data)), ctrl_c)
+                    send_cancellable_request(
+                        &request_url,
+                        Box::new(|| req.send_json(data)),
+                        span,
+                        signals,
+                    )
                 }
                 Value::String { val, .. } => send_cancellable_request(
                     &request_url,
                     Box::new(move || req.send_string(&val)),
-                    ctrl_c,
+                    span,
+                    signals,
                 ),
                 Value::Record { .. } if body_type == BodyType::Json => {
                     let data = value_to_json_value(&body)?;
-                    send_cancellable_request(&request_url, Box::new(|| req.send_json(data)), ctrl_c)
+                    send_cancellable_request(
+                        &request_url,
+                        Box::new(|| req.send_json(data)),
+                        span,
+                        signals,
+                    )
                 }
                 Value::Record { val, .. } if body_type == BodyType::Form => {
                     let mut data: Vec<(String, String)> = Vec::with_capacity(val.len());
@@ -254,7 +263,7 @@ pub fn send_request(
                             .collect::<Vec<(&str, &str)>>();
                         req.send_form(&data)
                     };
-                    send_cancellable_request(&request_url, Box::new(request_fn), ctrl_c)
+                    send_cancellable_request(&request_url, Box::new(request_fn), span, signals)
                 }
                 Value::List { vals, .. } if body_type == BodyType::Form => {
                     if vals.len() % 2 != 0 {
@@ -276,11 +285,16 @@ pub fn send_request(
                             .collect::<Vec<(&str, &str)>>();
                         req.send_form(&data)
                     };
-                    send_cancellable_request(&request_url, Box::new(request_fn), ctrl_c)
+                    send_cancellable_request(&request_url, Box::new(request_fn), span, signals)
                 }
                 Value::List { .. } if body_type == BodyType::Json => {
                     let data = value_to_json_value(&body)?;
-                    send_cancellable_request(&request_url, Box::new(|| req.send_json(data)), ctrl_c)
+                    send_cancellable_request(
+                        &request_url,
+                        Box::new(|| req.send_json(data)),
+                        span,
+                        signals,
+                    )
                 }
                 _ => Err(ShellErrorOrRequestError::ShellError(ShellError::IOError {
                     msg: "unsupported body input".into(),
@@ -295,7 +309,8 @@ pub fn send_request(
 fn send_cancellable_request(
     request_url: &str,
     request_fn: Box<dyn FnOnce() -> Result<Response, Error> + Sync + Send>,
-    ctrl_c: Option<Arc<AtomicBool>>,
+    span: Span,
+    signals: &Signals,
 ) -> Result<Response, ShellErrorOrRequestError> {
     let (tx, rx) = mpsc::channel::<Result<Response, Error>>();
 
@@ -310,12 +325,7 @@ fn send_cancellable_request(
 
     // ...and poll the channel for responses
     loop {
-        if nu_utils::ctrl_c::was_pressed(&ctrl_c) {
-            // Return early and give up on the background thread. The connection will either time out or be disconnected
-            return Err(ShellErrorOrRequestError::ShellError(
-                ShellError::InterruptedByUser { span: None },
-            ));
-        }
+        signals.check(span)?;
 
         // 100ms wait time chosen arbitrarily
         match rx.recv_timeout(Duration::from_millis(100)) {
@@ -336,7 +346,8 @@ fn send_cancellable_request_bytes(
     request_url: &str,
     request: Request,
     byte_stream: ByteStream,
-    ctrl_c: Option<Arc<AtomicBool>>,
+    span: Span,
+    signals: &Signals,
 ) -> Result<Response, ShellErrorOrRequestError> {
     let (tx, rx) = mpsc::channel::<Result<Response, ShellErrorOrRequestError>>();
     let request_url_string = request_url.to_string();
@@ -369,12 +380,7 @@ fn send_cancellable_request_bytes(
 
     // ...and poll the channel for responses
     loop {
-        if nu_utils::ctrl_c::was_pressed(&ctrl_c) {
-            // Return early and give up on the background thread. The connection will either time out or be disconnected
-            return Err(ShellErrorOrRequestError::ShellError(
-                ShellError::InterruptedByUser { span: None },
-            ));
-        }
+        signals.check(span)?;
 
         // 100ms wait time chosen arbitrarily
         match rx.recv_timeout(Duration::from_millis(100)) {
diff --git a/crates/nu-command/src/network/http/delete.rs b/crates/nu-command/src/network/http/delete.rs
index c2ef774a01..f32c9d15bb 100644
--- a/crates/nu-command/src/network/http/delete.rs
+++ b/crates/nu-command/src/network/http/delete.rs
@@ -203,7 +203,6 @@ fn helper(
     args: Arguments,
 ) -> Result<PipelineData, ShellError> {
     let span = args.url.span();
-    let ctrl_c = engine_state.ctrlc.clone();
     let (requested_url, _) = http_parse_url(call, span, args.url)?;
     let redirect_mode = http_parse_redirect_mode(args.redirect)?;
 
@@ -214,7 +213,13 @@ fn helper(
     request = request_add_authorization_header(args.user, args.password, request);
     request = request_add_custom_headers(args.headers, request)?;
 
-    let response = send_request(request.clone(), args.data, args.content_type, ctrl_c);
+    let response = send_request(
+        request.clone(),
+        args.data,
+        args.content_type,
+        call.head,
+        engine_state.signals(),
+    );
 
     let request_flags = RequestFlags {
         raw: args.raw,
diff --git a/crates/nu-command/src/network/http/get.rs b/crates/nu-command/src/network/http/get.rs
index 04582d5f00..3b702404f4 100644
--- a/crates/nu-command/src/network/http/get.rs
+++ b/crates/nu-command/src/network/http/get.rs
@@ -171,7 +171,6 @@ fn helper(
     args: Arguments,
 ) -> Result<PipelineData, ShellError> {
     let span = args.url.span();
-    let ctrl_c = engine_state.ctrlc.clone();
     let (requested_url, _) = http_parse_url(call, span, args.url)?;
     let redirect_mode = http_parse_redirect_mode(args.redirect)?;
 
@@ -182,7 +181,13 @@ fn helper(
     request = request_add_authorization_header(args.user, args.password, request);
     request = request_add_custom_headers(args.headers, request)?;
 
-    let response = send_request(request.clone(), HttpBody::None, None, ctrl_c);
+    let response = send_request(
+        request.clone(),
+        HttpBody::None,
+        None,
+        call.head,
+        engine_state.signals(),
+    );
 
     let request_flags = RequestFlags {
         raw: args.raw,
diff --git a/crates/nu-command/src/network/http/head.rs b/crates/nu-command/src/network/http/head.rs
index 57dfafcba2..797fa138e3 100644
--- a/crates/nu-command/src/network/http/head.rs
+++ b/crates/nu-command/src/network/http/head.rs
@@ -1,13 +1,11 @@
+use super::client::HttpBody;
 use crate::network::http::client::{
     check_response_redirection, http_client, http_parse_redirect_mode, http_parse_url,
     request_add_authorization_header, request_add_custom_headers, request_handle_response_headers,
     request_set_timeout, send_request,
 };
 use nu_engine::command_prelude::*;
-
-use std::sync::{atomic::AtomicBool, Arc};
-
-use super::client::HttpBody;
+use nu_protocol::Signals;
 
 #[derive(Clone)]
 pub struct SubCommand;
@@ -133,9 +131,8 @@ fn run_head(
         timeout: call.get_flag(engine_state, stack, "max-time")?,
         redirect: call.get_flag(engine_state, stack, "redirect-mode")?,
     };
-    let ctrl_c = engine_state.ctrlc.clone();
 
-    helper(engine_state, stack, call, args, ctrl_c)
+    helper(engine_state, stack, call, args, engine_state.signals())
 }
 
 // Helper function that actually goes to retrieve the resource from the url given
@@ -145,7 +142,7 @@ fn helper(
     stack: &mut Stack,
     call: &Call,
     args: Arguments,
-    ctrlc: Option<Arc<AtomicBool>>,
+    signals: &Signals,
 ) -> Result<PipelineData, ShellError> {
     let span = args.url.span();
     let (requested_url, _) = http_parse_url(call, span, args.url)?;
@@ -158,7 +155,7 @@ fn helper(
     request = request_add_authorization_header(args.user, args.password, request);
     request = request_add_custom_headers(args.headers, request)?;
 
-    let response = send_request(request, HttpBody::None, None, ctrlc);
+    let response = send_request(request, HttpBody::None, None, call.head, signals);
     check_response_redirection(redirect_mode, span, &response)?;
     request_handle_response_headers(span, response)
 }
diff --git a/crates/nu-command/src/network/http/options.rs b/crates/nu-command/src/network/http/options.rs
index 91ecac02d5..cd9a1f79c1 100644
--- a/crates/nu-command/src/network/http/options.rs
+++ b/crates/nu-command/src/network/http/options.rs
@@ -151,7 +151,6 @@ fn helper(
     args: Arguments,
 ) -> Result<PipelineData, ShellError> {
     let span = args.url.span();
-    let ctrl_c = engine_state.ctrlc.clone();
     let (requested_url, _) = http_parse_url(call, span, args.url)?;
 
     let client = http_client(args.insecure, RedirectMode::Follow, engine_state, stack)?;
@@ -161,7 +160,13 @@ fn helper(
     request = request_add_authorization_header(args.user, args.password, request);
     request = request_add_custom_headers(args.headers, request)?;
 
-    let response = send_request(request.clone(), HttpBody::None, None, ctrl_c);
+    let response = send_request(
+        request.clone(),
+        HttpBody::None,
+        None,
+        call.head,
+        engine_state.signals(),
+    );
 
     // http options' response always showed in header, so we set full to true.
     // And `raw` is useless too because options method doesn't return body, here we set to true
diff --git a/crates/nu-command/src/network/http/patch.rs b/crates/nu-command/src/network/http/patch.rs
index 2cf66a2a82..7f49781284 100644
--- a/crates/nu-command/src/network/http/patch.rs
+++ b/crates/nu-command/src/network/http/patch.rs
@@ -205,7 +205,6 @@ fn helper(
     args: Arguments,
 ) -> Result<PipelineData, ShellError> {
     let span = args.url.span();
-    let ctrl_c = engine_state.ctrlc.clone();
     let (requested_url, _) = http_parse_url(call, span, args.url)?;
     let redirect_mode = http_parse_redirect_mode(args.redirect)?;
 
@@ -216,7 +215,13 @@ fn helper(
     request = request_add_authorization_header(args.user, args.password, request);
     request = request_add_custom_headers(args.headers, request)?;
 
-    let response = send_request(request.clone(), args.data, args.content_type, ctrl_c);
+    let response = send_request(
+        request.clone(),
+        args.data,
+        args.content_type,
+        call.head,
+        engine_state.signals(),
+    );
 
     let request_flags = RequestFlags {
         raw: args.raw,
diff --git a/crates/nu-command/src/network/http/post.rs b/crates/nu-command/src/network/http/post.rs
index d48bbcc9fe..ea4ec093f3 100644
--- a/crates/nu-command/src/network/http/post.rs
+++ b/crates/nu-command/src/network/http/post.rs
@@ -203,7 +203,6 @@ fn helper(
     args: Arguments,
 ) -> Result<PipelineData, ShellError> {
     let span = args.url.span();
-    let ctrl_c = engine_state.ctrlc.clone();
     let (requested_url, _) = http_parse_url(call, span, args.url)?;
     let redirect_mode = http_parse_redirect_mode(args.redirect)?;
 
@@ -214,7 +213,13 @@ fn helper(
     request = request_add_authorization_header(args.user, args.password, request);
     request = request_add_custom_headers(args.headers, request)?;
 
-    let response = send_request(request.clone(), args.data, args.content_type, ctrl_c);
+    let response = send_request(
+        request.clone(),
+        args.data,
+        args.content_type,
+        call.head,
+        engine_state.signals(),
+    );
 
     let request_flags = RequestFlags {
         raw: args.raw,
diff --git a/crates/nu-command/src/network/http/put.rs b/crates/nu-command/src/network/http/put.rs
index dbd3b245cb..e2118ea359 100644
--- a/crates/nu-command/src/network/http/put.rs
+++ b/crates/nu-command/src/network/http/put.rs
@@ -204,7 +204,6 @@ fn helper(
     args: Arguments,
 ) -> Result<PipelineData, ShellError> {
     let span = args.url.span();
-    let ctrl_c = engine_state.ctrlc.clone();
     let (requested_url, _) = http_parse_url(call, span, args.url)?;
     let redirect_mode = http_parse_redirect_mode(args.redirect)?;
 
@@ -215,7 +214,13 @@ fn helper(
     request = request_add_authorization_header(args.user, args.password, request);
     request = request_add_custom_headers(args.headers, request)?;
 
-    let response = send_request(request.clone(), args.data, args.content_type, ctrl_c);
+    let response = send_request(
+        request.clone(),
+        args.data,
+        args.content_type,
+        call.head,
+        engine_state.signals(),
+    );
 
     let request_flags = RequestFlags {
         raw: args.raw,
diff --git a/crates/nu-command/src/network/url/decode.rs b/crates/nu-command/src/network/url/decode.rs
index 8789eb13ca..b98e50a56e 100644
--- a/crates/nu-command/src/network/url/decode.rs
+++ b/crates/nu-command/src/network/url/decode.rs
@@ -48,7 +48,7 @@ impl Command for SubCommand {
     ) -> 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 examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/network/url/encode.rs b/crates/nu-command/src/network/url/encode.rs
index 845487963b..96e0289903 100644
--- a/crates/nu-command/src/network/url/encode.rs
+++ b/crates/nu-command/src/network/url/encode.rs
@@ -50,15 +50,9 @@ impl Command for SubCommand {
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
         let args = CellPathOnlyArgs::from(cell_paths);
         if call.has_flag(engine_state, stack, "all")? {
-            operate(
-                action_all,
-                args,
-                input,
-                call.head,
-                engine_state.ctrlc.clone(),
-            )
+            operate(action_all, args, input, call.head, engine_state.signals())
         } else {
-            operate(action, args, input, call.head, engine_state.ctrlc.clone())
+            operate(action, args, input, call.head, engine_state.signals())
         }
     }
 
diff --git a/crates/nu-command/src/path/basename.rs b/crates/nu-command/src/path/basename.rs
index 04f7cf380e..8b7082048e 100644
--- a/crates/nu-command/src/path/basename.rs
+++ b/crates/nu-command/src/path/basename.rs
@@ -61,7 +61,7 @@ impl Command for SubCommand {
         }
         input.map(
             move |value| super::operate(&get_basename, &args, value, head),
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
         )
     }
 
@@ -82,7 +82,7 @@ impl Command for SubCommand {
         }
         input.map(
             move |value| super::operate(&get_basename, &args, value, head),
-            working_set.permanent().ctrlc.clone(),
+            working_set.permanent().signals(),
         )
     }
 
diff --git a/crates/nu-command/src/path/dirname.rs b/crates/nu-command/src/path/dirname.rs
index 2eb864215e..218091ee34 100644
--- a/crates/nu-command/src/path/dirname.rs
+++ b/crates/nu-command/src/path/dirname.rs
@@ -69,7 +69,7 @@ impl Command for SubCommand {
         }
         input.map(
             move |value| super::operate(&get_dirname, &args, value, head),
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
         )
     }
 
@@ -91,7 +91,7 @@ impl Command for SubCommand {
         }
         input.map(
             move |value| super::operate(&get_dirname, &args, value, head),
-            working_set.permanent().ctrlc.clone(),
+            working_set.permanent().signals(),
         )
     }
 
diff --git a/crates/nu-command/src/path/exists.rs b/crates/nu-command/src/path/exists.rs
index a99f04113e..86b00c6024 100644
--- a/crates/nu-command/src/path/exists.rs
+++ b/crates/nu-command/src/path/exists.rs
@@ -65,7 +65,7 @@ If you need to distinguish dirs and files, please use `path type`."#
         }
         input.map(
             move |value| super::operate(&exists, &args, value, head),
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
         )
     }
 
@@ -87,7 +87,7 @@ If you need to distinguish dirs and files, please use `path type`."#
         }
         input.map(
             move |value| super::operate(&exists, &args, value, head),
-            working_set.permanent().ctrlc.clone(),
+            working_set.permanent().signals(),
         )
     }
 
diff --git a/crates/nu-command/src/path/expand.rs b/crates/nu-command/src/path/expand.rs
index 18497c6426..ac51978810 100644
--- a/crates/nu-command/src/path/expand.rs
+++ b/crates/nu-command/src/path/expand.rs
@@ -70,7 +70,7 @@ impl Command for SubCommand {
         }
         input.map(
             move |value| super::operate(&expand, &args, value, head),
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
         )
     }
 
@@ -93,7 +93,7 @@ impl Command for SubCommand {
         }
         input.map(
             move |value| super::operate(&expand, &args, value, head),
-            working_set.permanent().ctrlc.clone(),
+            working_set.permanent().signals(),
         )
     }
 
diff --git a/crates/nu-command/src/path/parse.rs b/crates/nu-command/src/path/parse.rs
index 039f1012ed..cec2f5c6ac 100644
--- a/crates/nu-command/src/path/parse.rs
+++ b/crates/nu-command/src/path/parse.rs
@@ -63,7 +63,7 @@ On Windows, an extra 'prefix' column is added."#
         }
         input.map(
             move |value| super::operate(&parse, &args, value, head),
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
         )
     }
 
@@ -84,7 +84,7 @@ On Windows, an extra 'prefix' column is added."#
         }
         input.map(
             move |value| super::operate(&parse, &args, value, head),
-            working_set.permanent().ctrlc.clone(),
+            working_set.permanent().signals(),
         )
     }
 
diff --git a/crates/nu-command/src/path/relative_to.rs b/crates/nu-command/src/path/relative_to.rs
index 6533f6fa79..35df385d74 100644
--- a/crates/nu-command/src/path/relative_to.rs
+++ b/crates/nu-command/src/path/relative_to.rs
@@ -67,7 +67,7 @@ path."#
         }
         input.map(
             move |value| super::operate(&relative_to, &args, value, head),
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
         )
     }
 
@@ -88,7 +88,7 @@ path."#
         }
         input.map(
             move |value| super::operate(&relative_to, &args, value, head),
-            working_set.permanent().ctrlc.clone(),
+            working_set.permanent().signals(),
         )
     }
 
diff --git a/crates/nu-command/src/path/split.rs b/crates/nu-command/src/path/split.rs
index ea8e7e1b1f..80d86fb998 100644
--- a/crates/nu-command/src/path/split.rs
+++ b/crates/nu-command/src/path/split.rs
@@ -51,7 +51,7 @@ impl Command for SubCommand {
         }
         input.map(
             move |value| super::operate(&split, &args, value, head),
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
         )
     }
 
@@ -70,7 +70,7 @@ impl Command for SubCommand {
         }
         input.map(
             move |value| super::operate(&split, &args, value, head),
-            working_set.permanent().ctrlc.clone(),
+            working_set.permanent().signals(),
         )
     }
 
diff --git a/crates/nu-command/src/path/type.rs b/crates/nu-command/src/path/type.rs
index e58e697604..bf66c8cb3b 100644
--- a/crates/nu-command/src/path/type.rs
+++ b/crates/nu-command/src/path/type.rs
@@ -64,7 +64,7 @@ If the path does not exist, null will be returned."#
         }
         input.map(
             move |value| super::operate(&path_type, &args, value, head),
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
         )
     }
 
@@ -85,7 +85,7 @@ If the path does not exist, null will be returned."#
         }
         input.map(
             move |value| super::operate(&path_type, &args, value, head),
-            working_set.permanent().ctrlc.clone(),
+            working_set.permanent().signals(),
         )
     }
 
diff --git a/crates/nu-command/src/platform/ansi/ansi_.rs b/crates/nu-command/src/platform/ansi/ansi_.rs
index 9e0b0bba66..29603be9e7 100644
--- a/crates/nu-command/src/platform/ansi/ansi_.rs
+++ b/crates/nu-command/src/platform/ansi/ansi_.rs
@@ -1,11 +1,8 @@
 use nu_ansi_term::*;
 use nu_engine::command_prelude::*;
-use nu_protocol::engine::StateWorkingSet;
+use nu_protocol::{engine::StateWorkingSet, Signals};
 use once_cell::sync::Lazy;
-use std::{
-    collections::HashMap,
-    sync::{atomic::AtomicBool, Arc},
-};
+use std::collections::HashMap;
 
 #[derive(Clone)]
 pub struct AnsiCommand;
@@ -657,10 +654,13 @@ Operating system commands:
         let escape: bool = call.has_flag(engine_state, stack, "escape")?;
         let osc: bool = call.has_flag(engine_state, stack, "osc")?;
         let use_ansi_coloring = engine_state.get_config().use_ansi_coloring;
-        let ctrlc = engine_state.ctrlc.clone();
 
         if list {
-            return Ok(generate_ansi_code_list(ctrlc, call.head, use_ansi_coloring));
+            return Ok(generate_ansi_code_list(
+                engine_state.signals().clone(),
+                call.head,
+                use_ansi_coloring,
+            ));
         }
 
         // The code can now be one of the ansi abbreviations like green_bold
@@ -691,10 +691,13 @@ Operating system commands:
         let escape: bool = call.has_flag_const(working_set, "escape")?;
         let osc: bool = call.has_flag_const(working_set, "osc")?;
         let use_ansi_coloring = working_set.get_config().use_ansi_coloring;
-        let ctrlc = working_set.permanent().ctrlc.clone();
 
         if list {
-            return Ok(generate_ansi_code_list(ctrlc, call.head, use_ansi_coloring));
+            return Ok(generate_ansi_code_list(
+                working_set.permanent().signals().clone(),
+                call.head,
+                use_ansi_coloring,
+            ));
         }
 
         // The code can now be one of the ansi abbreviations like green_bold
@@ -827,7 +830,7 @@ pub fn str_to_ansi(s: &str) -> Option<String> {
 }
 
 fn generate_ansi_code_list(
-    ctrlc: Option<Arc<AtomicBool>>,
+    signals: Signals,
     call_span: Span,
     use_ansi_coloring: bool,
 ) -> PipelineData {
@@ -862,7 +865,7 @@ fn generate_ansi_code_list(
 
             Value::record(record, call_span)
         })
-        .into_pipeline_data(call_span, ctrlc)
+        .into_pipeline_data(call_span, signals.clone())
 }
 
 fn build_ansi_hashmap(v: &[AnsiCode]) -> HashMap<&str, &str> {
diff --git a/crates/nu-command/src/platform/ansi/link.rs b/crates/nu-command/src/platform/ansi/link.rs
index 68fc17977b..b45b365d3f 100644
--- a/crates/nu-command/src/platform/ansi/link.rs
+++ b/crates/nu-command/src/platform/ansi/link.rs
@@ -91,12 +91,12 @@ fn operate(
     if column_paths.is_empty() {
         input.map(
             move |v| process_value(&v, text.as_deref()),
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
         )
     } else {
         input.map(
             move |v| process_each_path(v, &column_paths, text.as_deref(), command_span),
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
         )
     }
 }
diff --git a/crates/nu-command/src/platform/ansi/strip.rs b/crates/nu-command/src/platform/ansi/strip.rs
index 35d410161c..3d59da6a10 100644
--- a/crates/nu-command/src/platform/ansi/strip.rs
+++ b/crates/nu-command/src/platform/ansi/strip.rs
@@ -56,7 +56,7 @@ impl Command for SubCommand {
             cell_paths,
             config: config.clone(),
         };
-        operate(action, args, input, call.head, engine_state.ctrlc.clone())
+        operate(action, args, input, call.head, engine_state.signals())
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/platform/dir_info.rs b/crates/nu-command/src/platform/dir_info.rs
index e4a3039672..10ce4f5420 100644
--- a/crates/nu-command/src/platform/dir_info.rs
+++ b/crates/nu-command/src/platform/dir_info.rs
@@ -1,10 +1,7 @@
 use filesize::file_real_size_fast;
 use nu_glob::Pattern;
-use nu_protocol::{record, ShellError, Span, Value};
-use std::{
-    path::PathBuf,
-    sync::{atomic::AtomicBool, Arc},
-};
+use nu_protocol::{record, ShellError, Signals, Span, Value};
+use std::path::PathBuf;
 
 #[derive(Debug, Clone)]
 pub struct DirBuilder {
@@ -82,8 +79,9 @@ impl DirInfo {
         path: impl Into<PathBuf>,
         params: &DirBuilder,
         depth: Option<u64>,
-        ctrl_c: Option<Arc<AtomicBool>>,
-    ) -> Self {
+        span: Span,
+        signals: &Signals,
+    ) -> Result<Self, ShellError> {
         let path = path.into();
 
         let mut s = Self {
@@ -107,14 +105,12 @@ impl DirInfo {
         match std::fs::read_dir(&s.path) {
             Ok(d) => {
                 for f in d {
-                    if nu_utils::ctrl_c::was_pressed(&ctrl_c) {
-                        break;
-                    }
+                    signals.check(span)?;
 
                     match f {
                         Ok(i) => match i.file_type() {
                             Ok(t) if t.is_dir() => {
-                                s = s.add_dir(i.path(), depth, params, ctrl_c.clone())
+                                s = s.add_dir(i.path(), depth, params, span, signals)?
                             }
                             Ok(_t) => s = s.add_file(i.path(), params),
                             Err(e) => s = s.add_error(e.into()),
@@ -125,7 +121,7 @@ impl DirInfo {
             }
             Err(e) => s = s.add_error(e.into()),
         }
-        s
+        Ok(s)
     }
 
     fn add_dir(
@@ -133,21 +129,22 @@ impl DirInfo {
         path: impl Into<PathBuf>,
         mut depth: Option<u64>,
         params: &DirBuilder,
-        ctrl_c: Option<Arc<AtomicBool>>,
-    ) -> Self {
+        span: Span,
+        signals: &Signals,
+    ) -> Result<Self, ShellError> {
         if let Some(current) = depth {
             if let Some(new) = current.checked_sub(1) {
                 depth = Some(new);
             } else {
-                return self;
+                return Ok(self);
             }
         }
 
-        let d = DirInfo::new(path, params, depth, ctrl_c);
+        let d = DirInfo::new(path, params, depth, span, signals)?;
         self.size += d.size;
         self.blocks += d.blocks;
         self.dirs.push(d);
-        self
+        Ok(self)
     }
 
     fn add_file(mut self, f: impl Into<PathBuf>, params: &DirBuilder) -> Self {
diff --git a/crates/nu-command/src/platform/sleep.rs b/crates/nu-command/src/platform/sleep.rs
index ddf429509c..4d5f6ec827 100644
--- a/crates/nu-command/src/platform/sleep.rs
+++ b/crates/nu-command/src/platform/sleep.rs
@@ -56,12 +56,7 @@ impl Command for Sleep {
                 break;
             }
             thread::sleep(CTRL_C_CHECK_INTERVAL.min(time_until_deadline));
-            // exit early if Ctrl+C was pressed
-            if nu_utils::ctrl_c::was_pressed(&engine_state.ctrlc) {
-                return Err(ShellError::InterruptedByUser {
-                    span: Some(call.head),
-                });
-            }
+            engine_state.signals().check(call.head)?;
         }
 
         Ok(Value::nothing(call.head).into_pipeline_data())
diff --git a/crates/nu-command/src/random/dice.rs b/crates/nu-command/src/random/dice.rs
index 2fb659ad1e..5e3a1b98b6 100644
--- a/crates/nu-command/src/random/dice.rs
+++ b/crates/nu-command/src/random/dice.rs
@@ -78,7 +78,7 @@ fn dice(
         Value::int(thread_rng.gen_range(1..sides + 1) as i64, span)
     });
 
-    Ok(ListStream::new(iter, span, engine_state.ctrlc.clone()).into())
+    Ok(ListStream::new(iter, span, engine_state.signals().clone()).into())
 }
 
 #[cfg(test)]
diff --git a/crates/nu-command/src/stor/create.rs b/crates/nu-command/src/stor/create.rs
index 630718489b..1e1219889d 100644
--- a/crates/nu-command/src/stor/create.rs
+++ b/crates/nu-command/src/stor/create.rs
@@ -54,7 +54,10 @@ impl Command for StorCreate {
         let span = call.head;
         let table_name: Option<String> = call.get_flag(engine_state, stack, "table-name")?;
         let columns: Option<Record> = call.get_flag(engine_state, stack, "columns")?;
-        let db = Box::new(SQLiteDatabase::new(std::path::Path::new(MEMORY_DB), None));
+        let db = Box::new(SQLiteDatabase::new(
+            std::path::Path::new(MEMORY_DB),
+            engine_state.signals().clone(),
+        ));
 
         process(table_name, span, &db, columns)?;
         // dbg!(db.clone());
@@ -141,6 +144,8 @@ fn process(
 
 #[cfg(test)]
 mod test {
+    use nu_protocol::Signals;
+
     use super::*;
 
     #[test]
@@ -154,7 +159,10 @@ mod test {
     fn test_process_with_valid_parameters() {
         let table_name = Some("test_table".to_string());
         let span = Span::unknown();
-        let db = Box::new(SQLiteDatabase::new(std::path::Path::new(MEMORY_DB), None));
+        let db = Box::new(SQLiteDatabase::new(
+            std::path::Path::new(MEMORY_DB),
+            Signals::empty(),
+        ));
         let mut columns = Record::new();
         columns.insert(
             "int_column".to_string(),
@@ -170,7 +178,10 @@ mod test {
     fn test_process_with_missing_table_name() {
         let table_name = None;
         let span = Span::unknown();
-        let db = Box::new(SQLiteDatabase::new(std::path::Path::new(MEMORY_DB), None));
+        let db = Box::new(SQLiteDatabase::new(
+            std::path::Path::new(MEMORY_DB),
+            Signals::empty(),
+        ));
         let mut columns = Record::new();
         columns.insert(
             "int_column".to_string(),
@@ -190,7 +201,10 @@ mod test {
     fn test_process_with_missing_columns() {
         let table_name = Some("test_table".to_string());
         let span = Span::unknown();
-        let db = Box::new(SQLiteDatabase::new(std::path::Path::new(MEMORY_DB), None));
+        let db = Box::new(SQLiteDatabase::new(
+            std::path::Path::new(MEMORY_DB),
+            Signals::empty(),
+        ));
 
         let result = process(table_name, span, &db, None);
 
@@ -205,7 +219,10 @@ mod test {
     fn test_process_with_unsupported_column_data_type() {
         let table_name = Some("test_table".to_string());
         let span = Span::unknown();
-        let db = Box::new(SQLiteDatabase::new(std::path::Path::new(MEMORY_DB), None));
+        let db = Box::new(SQLiteDatabase::new(
+            std::path::Path::new(MEMORY_DB),
+            Signals::empty(),
+        ));
         let mut columns = Record::new();
         let column_datatype = "bogus_data_type".to_string();
         columns.insert(
diff --git a/crates/nu-command/src/stor/delete.rs b/crates/nu-command/src/stor/delete.rs
index 4de4874140..676e0490b0 100644
--- a/crates/nu-command/src/stor/delete.rs
+++ b/crates/nu-command/src/stor/delete.rs
@@ -1,5 +1,6 @@
 use crate::database::{SQLiteDatabase, MEMORY_DB};
 use nu_engine::command_prelude::*;
+use nu_protocol::Signals;
 
 #[derive(Clone)]
 pub struct StorDelete;
@@ -82,7 +83,10 @@ impl Command for StorDelete {
         }
 
         // Open the in-mem database
-        let db = Box::new(SQLiteDatabase::new(std::path::Path::new(MEMORY_DB), None));
+        let db = Box::new(SQLiteDatabase::new(
+            std::path::Path::new(MEMORY_DB),
+            Signals::empty(),
+        ));
 
         if let Some(new_table_name) = table_name_opt {
             if let Ok(conn) = db.open_connection() {
diff --git a/crates/nu-command/src/stor/export.rs b/crates/nu-command/src/stor/export.rs
index 95c5ee9f35..f8255eec49 100644
--- a/crates/nu-command/src/stor/export.rs
+++ b/crates/nu-command/src/stor/export.rs
@@ -1,5 +1,6 @@
 use crate::database::{SQLiteDatabase, MEMORY_DB};
 use nu_engine::command_prelude::*;
+use nu_protocol::Signals;
 
 #[derive(Clone)]
 pub struct StorExport;
@@ -58,7 +59,10 @@ impl Command for StorExport {
         };
 
         // Open the in-mem database
-        let db = Box::new(SQLiteDatabase::new(std::path::Path::new(MEMORY_DB), None));
+        let db = Box::new(SQLiteDatabase::new(
+            std::path::Path::new(MEMORY_DB),
+            Signals::empty(),
+        ));
 
         if let Ok(conn) = db.open_connection() {
             // This uses vacuum. I'm not really sure if this is the best way to do this.
diff --git a/crates/nu-command/src/stor/import.rs b/crates/nu-command/src/stor/import.rs
index 682694e8bb..20b5b64f2d 100644
--- a/crates/nu-command/src/stor/import.rs
+++ b/crates/nu-command/src/stor/import.rs
@@ -1,5 +1,6 @@
 use crate::database::{SQLiteDatabase, MEMORY_DB};
 use nu_engine::command_prelude::*;
+use nu_protocol::Signals;
 
 #[derive(Clone)]
 pub struct StorImport;
@@ -58,7 +59,10 @@ impl Command for StorImport {
         };
 
         // Open the in-mem database
-        let db = Box::new(SQLiteDatabase::new(std::path::Path::new(MEMORY_DB), None));
+        let db = Box::new(SQLiteDatabase::new(
+            std::path::Path::new(MEMORY_DB),
+            Signals::empty(),
+        ));
 
         if let Ok(mut conn) = db.open_connection() {
             db.restore_database_from_file(&mut conn, file_name)
diff --git a/crates/nu-command/src/stor/insert.rs b/crates/nu-command/src/stor/insert.rs
index 4b9677941b..b6b8d50906 100644
--- a/crates/nu-command/src/stor/insert.rs
+++ b/crates/nu-command/src/stor/insert.rs
@@ -1,5 +1,6 @@
 use crate::database::{values_to_sql, SQLiteDatabase, MEMORY_DB};
 use nu_engine::command_prelude::*;
+use nu_protocol::Signals;
 use rusqlite::params_from_iter;
 
 #[derive(Clone)]
@@ -65,7 +66,10 @@ impl Command for StorInsert {
         let table_name: Option<String> = call.get_flag(engine_state, stack, "table-name")?;
         let data_record: Option<Record> = call.get_flag(engine_state, stack, "data-record")?;
         // let config = engine_state.get_config();
-        let db = Box::new(SQLiteDatabase::new(std::path::Path::new(MEMORY_DB), None));
+        let db = Box::new(SQLiteDatabase::new(
+            std::path::Path::new(MEMORY_DB),
+            Signals::empty(),
+        ));
 
         // Check if the record is being passed as input or using the data record parameter
         let columns = handle(span, data_record, input)?;
@@ -198,7 +202,10 @@ mod test {
 
     #[test]
     fn test_process_with_simple_parameters() {
-        let db = Box::new(SQLiteDatabase::new(std::path::Path::new(MEMORY_DB), None));
+        let db = Box::new(SQLiteDatabase::new(
+            std::path::Path::new(MEMORY_DB),
+            Signals::empty(),
+        ));
         let create_stmt = "CREATE TABLE test_process_with_simple_parameters (
             int_column INTEGER,
             real_column REAL,
@@ -237,7 +244,10 @@ mod test {
 
     #[test]
     fn test_process_string_with_space() {
-        let db = Box::new(SQLiteDatabase::new(std::path::Path::new(MEMORY_DB), None));
+        let db = Box::new(SQLiteDatabase::new(
+            std::path::Path::new(MEMORY_DB),
+            Signals::empty(),
+        ));
         let create_stmt = "CREATE TABLE test_process_string_with_space (
             str_column VARCHAR(255)
         )";
@@ -262,7 +272,10 @@ mod test {
 
     #[test]
     fn test_no_errors_when_string_too_long() {
-        let db = Box::new(SQLiteDatabase::new(std::path::Path::new(MEMORY_DB), None));
+        let db = Box::new(SQLiteDatabase::new(
+            std::path::Path::new(MEMORY_DB),
+            Signals::empty(),
+        ));
         let create_stmt = "CREATE TABLE test_errors_when_string_too_long (
             str_column VARCHAR(8)
         )";
@@ -287,7 +300,10 @@ mod test {
 
     #[test]
     fn test_no_errors_when_param_is_wrong_type() {
-        let db = Box::new(SQLiteDatabase::new(std::path::Path::new(MEMORY_DB), None));
+        let db = Box::new(SQLiteDatabase::new(
+            std::path::Path::new(MEMORY_DB),
+            Signals::empty(),
+        ));
         let create_stmt = "CREATE TABLE test_errors_when_param_is_wrong_type (
             int_column INT
         )";
@@ -312,7 +328,10 @@ mod test {
 
     #[test]
     fn test_errors_when_column_doesnt_exist() {
-        let db = Box::new(SQLiteDatabase::new(std::path::Path::new(MEMORY_DB), None));
+        let db = Box::new(SQLiteDatabase::new(
+            std::path::Path::new(MEMORY_DB),
+            Signals::empty(),
+        ));
         let create_stmt = "CREATE TABLE test_errors_when_column_doesnt_exist (
             int_column INT
         )";
@@ -337,7 +356,10 @@ mod test {
 
     #[test]
     fn test_errors_when_table_doesnt_exist() {
-        let db = Box::new(SQLiteDatabase::new(std::path::Path::new(MEMORY_DB), None));
+        let db = Box::new(SQLiteDatabase::new(
+            std::path::Path::new(MEMORY_DB),
+            Signals::empty(),
+        ));
 
         let table_name = Some("test_errors_when_table_doesnt_exist".to_string());
         let span = Span::unknown();
diff --git a/crates/nu-command/src/stor/open.rs b/crates/nu-command/src/stor/open.rs
index c7f6f9f746..ba0f17c2af 100644
--- a/crates/nu-command/src/stor/open.rs
+++ b/crates/nu-command/src/stor/open.rs
@@ -1,5 +1,6 @@
 use crate::database::{SQLiteDatabase, MEMORY_DB};
 use nu_engine::command_prelude::*;
+use nu_protocol::Signals;
 
 #[derive(Clone)]
 pub struct StorOpen;
@@ -54,7 +55,10 @@ impl Command for StorOpen {
         //   It returns the output of `select * from my_table_name`
 
         // Just create an empty database with MEMORY_DB and nothing else
-        let db = Box::new(SQLiteDatabase::new(std::path::Path::new(MEMORY_DB), None));
+        let db = Box::new(SQLiteDatabase::new(
+            std::path::Path::new(MEMORY_DB),
+            Signals::empty(),
+        ));
 
         // dbg!(db.clone());
         Ok(db.into_value(call.head).into_pipeline_data())
diff --git a/crates/nu-command/src/stor/reset.rs b/crates/nu-command/src/stor/reset.rs
index d4489fb702..ba9e2a9681 100644
--- a/crates/nu-command/src/stor/reset.rs
+++ b/crates/nu-command/src/stor/reset.rs
@@ -1,5 +1,6 @@
 use crate::database::{SQLiteDatabase, MEMORY_DB};
 use nu_engine::command_prelude::*;
+use nu_protocol::Signals;
 
 #[derive(Clone)]
 pub struct StorReset;
@@ -42,7 +43,10 @@ impl Command for StorReset {
         let span = call.head;
 
         // Open the in-mem database
-        let db = Box::new(SQLiteDatabase::new(std::path::Path::new(MEMORY_DB), None));
+        let db = Box::new(SQLiteDatabase::new(
+            std::path::Path::new(MEMORY_DB),
+            Signals::empty(),
+        ));
 
         if let Ok(conn) = db.open_connection() {
             db.drop_all_tables(&conn)
diff --git a/crates/nu-command/src/stor/update.rs b/crates/nu-command/src/stor/update.rs
index d731207a3f..18cf6f9f0f 100644
--- a/crates/nu-command/src/stor/update.rs
+++ b/crates/nu-command/src/stor/update.rs
@@ -1,5 +1,6 @@
 use crate::database::{SQLiteDatabase, MEMORY_DB};
 use nu_engine::command_prelude::*;
+use nu_protocol::Signals;
 
 #[derive(Clone)]
 pub struct StorUpdate;
@@ -79,7 +80,10 @@ impl Command for StorUpdate {
             call.get_flag(engine_state, stack, "where-clause")?;
 
         // Open the in-mem database
-        let db = Box::new(SQLiteDatabase::new(std::path::Path::new(MEMORY_DB), None));
+        let db = Box::new(SQLiteDatabase::new(
+            std::path::Path::new(MEMORY_DB),
+            Signals::empty(),
+        ));
 
         // Check if the record is being passed as input or using the update record parameter
         let columns = handle(span, update_record, input)?;
diff --git a/crates/nu-command/src/strings/char_.rs b/crates/nu-command/src/strings/char_.rs
index 6834134b26..7737210254 100644
--- a/crates/nu-command/src/strings/char_.rs
+++ b/crates/nu-command/src/strings/char_.rs
@@ -1,8 +1,8 @@
 use indexmap::{indexmap, IndexMap};
 use nu_engine::command_prelude::*;
 
+use nu_protocol::Signals;
 use once_cell::sync::Lazy;
-use std::sync::{atomic::AtomicBool, Arc};
 
 // Character used to separate directories in a Path Environment variable on windows is ";"
 #[cfg(target_family = "windows")]
@@ -229,11 +229,13 @@ impl Command for Char {
         let list = call.has_flag_const(working_set, "list")?;
         let integer = call.has_flag_const(working_set, "integer")?;
         let unicode = call.has_flag_const(working_set, "unicode")?;
-        let ctrlc = working_set.permanent().ctrlc.clone();
 
         // handle -l flag
         if list {
-            return Ok(generate_character_list(ctrlc, call.head));
+            return Ok(generate_character_list(
+                working_set.permanent().signals().clone(),
+                call.head,
+            ));
         }
 
         // handle -i flag
@@ -264,11 +266,13 @@ impl Command for Char {
         let list = call.has_flag(engine_state, stack, "list")?;
         let integer = call.has_flag(engine_state, stack, "integer")?;
         let unicode = call.has_flag(engine_state, stack, "unicode")?;
-        let ctrlc = engine_state.ctrlc.clone();
 
         // handle -l flag
         if list {
-            return Ok(generate_character_list(ctrlc, call_span));
+            return Ok(generate_character_list(
+                engine_state.signals().clone(),
+                call_span,
+            ));
         }
 
         // handle -i flag
@@ -289,7 +293,7 @@ impl Command for Char {
     }
 }
 
-fn generate_character_list(ctrlc: Option<Arc<AtomicBool>>, call_span: Span) -> PipelineData {
+fn generate_character_list(signals: Signals, call_span: Span) -> PipelineData {
     CHAR_MAP
         .iter()
         .map(move |(name, s)| {
@@ -308,7 +312,7 @@ fn generate_character_list(ctrlc: Option<Arc<AtomicBool>>, call_span: Span) -> P
 
             Value::record(record, call_span)
         })
-        .into_pipeline_data(call_span, ctrlc)
+        .into_pipeline_data(call_span, signals)
 }
 
 fn handle_integer_flag(
diff --git a/crates/nu-command/src/strings/detect_columns.rs b/crates/nu-command/src/strings/detect_columns.rs
index 62a2d8bbcc..2f1f713b33 100644
--- a/crates/nu-command/src/strings/detect_columns.rs
+++ b/crates/nu-command/src/strings/detect_columns.rs
@@ -199,7 +199,7 @@ fn guess_width(
                     Err(e) => Value::error(e, input_span),
                 }
             })
-            .into_pipeline_data(input_span, engine_state.ctrlc.clone()))
+            .into_pipeline_data(input_span, engine_state.signals().clone()))
     } else {
         let length = result[0].len();
         let columns: Vec<String> = (0..length).map(|n| format!("column{n}")).collect();
@@ -224,7 +224,7 @@ fn guess_width(
                     Err(e) => Value::error(e, input_span),
                 }
             })
-            .into_pipeline_data(input_span, engine_state.ctrlc.clone()))
+            .into_pipeline_data(input_span, engine_state.signals().clone()))
     }
 }
 
@@ -235,7 +235,6 @@ fn detect_columns(
     args: Arguments,
 ) -> Result<PipelineData, ShellError> {
     let name_span = call.head;
-    let ctrlc = engine_state.ctrlc.clone();
     let config = engine_state.get_config();
     let input = input.collect_string("", config)?;
 
@@ -316,7 +315,7 @@ fn detect_columns(
                     None => Value::record(record, name_span),
                 }
             })
-            .into_pipeline_data(call.head, ctrlc))
+            .into_pipeline_data(call.head, engine_state.signals().clone()))
     } else {
         Ok(PipelineData::empty())
     }
diff --git a/crates/nu-command/src/strings/encode_decode/base64.rs b/crates/nu-command/src/strings/encode_decode/base64.rs
index 8050193212..afc143983e 100644
--- a/crates/nu-command/src/strings/encode_decode/base64.rs
+++ b/crates/nu-command/src/strings/encode_decode/base64.rs
@@ -75,7 +75,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(
diff --git a/crates/nu-command/src/strings/format/date.rs b/crates/nu-command/src/strings/format/date.rs
index 1aaf1fb851..dd005b9216 100644
--- a/crates/nu-command/src/strings/format/date.rs
+++ b/crates/nu-command/src/strings/format/date.rs
@@ -127,7 +127,7 @@ fn run(
             Some(format) => format_helper(value, format.item.as_str(), format.span, head),
             None => format_helper_rfc2822(value, head),
         },
-        engine_state.ctrlc.clone(),
+        engine_state.signals(),
     )
 }
 
diff --git a/crates/nu-command/src/strings/format/duration.rs b/crates/nu-command/src/strings/format/duration.rs
index 281542f49a..fbbe192048 100644
--- a/crates/nu-command/src/strings/format/duration.rs
+++ b/crates/nu-command/src/strings/format/duration.rs
@@ -81,7 +81,7 @@ impl Command for FormatDuration {
             arg,
             input,
             call.head,
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
         )
     }
 
@@ -108,7 +108,7 @@ impl Command for FormatDuration {
             arg,
             input,
             call.head,
-            working_set.permanent().ctrlc.clone(),
+            working_set.permanent().signals(),
         )
     }
 
diff --git a/crates/nu-command/src/strings/format/filesize.rs b/crates/nu-command/src/strings/format/filesize.rs
index ebd43d90b1..63865ac2ac 100644
--- a/crates/nu-command/src/strings/format/filesize.rs
+++ b/crates/nu-command/src/strings/format/filesize.rs
@@ -76,7 +76,7 @@ impl Command for FormatFilesize {
             arg,
             input,
             call.head,
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
         )
     }
 
@@ -101,7 +101,7 @@ impl Command for FormatFilesize {
             arg,
             input,
             call.head,
-            working_set.permanent().ctrlc.clone(),
+            working_set.permanent().signals(),
         )
     }
 
diff --git a/crates/nu-command/src/strings/parse.rs b/crates/nu-command/src/strings/parse.rs
index 4318b3da8b..9bf31de73c 100644
--- a/crates/nu-command/src/strings/parse.rs
+++ b/crates/nu-command/src/strings/parse.rs
@@ -1,10 +1,7 @@
 use fancy_regex::{Captures, Regex};
 use nu_engine::command_prelude::*;
-use nu_protocol::{engine::StateWorkingSet, ListStream};
-use std::{
-    collections::VecDeque,
-    sync::{atomic::AtomicBool, Arc},
-};
+use nu_protocol::{engine::StateWorkingSet, ListStream, Signals};
+use std::collections::VecDeque;
 
 #[derive(Clone)]
 pub struct Parse;
@@ -163,8 +160,6 @@ fn operate(
         })
         .collect::<Vec<_>>();
 
-    let ctrlc = engine_state.ctrlc.clone();
-
     match input {
         PipelineData::Empty => Ok(PipelineData::Empty),
         PipelineData::Value(value, ..) => match value {
@@ -192,10 +187,10 @@ fn operate(
                     columns,
                     iter,
                     span: head,
-                    ctrlc,
+                    signals: engine_state.signals().clone(),
                 };
 
-                Ok(ListStream::new(iter, head, None).into())
+                Ok(ListStream::new(iter, head, Signals::empty()).into())
             }
             value => Err(ShellError::PipelineMismatch {
                 exp_input_type: "string".into(),
@@ -220,7 +215,7 @@ fn operate(
                     columns,
                     iter,
                     span: head,
-                    ctrlc,
+                    signals: engine_state.signals().clone(),
                 }
             })
             .into()),
@@ -232,10 +227,10 @@ fn operate(
                     columns,
                     iter: lines,
                     span: head,
-                    ctrlc,
+                    signals: engine_state.signals().clone(),
                 };
 
-                Ok(ListStream::new(iter, head, None).into())
+                Ok(ListStream::new(iter, head, Signals::empty()).into())
             } else {
                 Ok(PipelineData::Empty)
             }
@@ -302,7 +297,7 @@ struct ParseIter<I: Iterator<Item = Result<String, ShellError>>> {
     columns: Vec<String>,
     iter: I,
     span: Span,
-    ctrlc: Option<Arc<AtomicBool>>,
+    signals: Signals,
 }
 
 impl<I: Iterator<Item = Result<String, ShellError>>> ParseIter<I> {
@@ -320,7 +315,7 @@ impl<I: Iterator<Item = Result<String, ShellError>>> Iterator for ParseIter<I> {
 
     fn next(&mut self) -> Option<Value> {
         loop {
-            if nu_utils::ctrl_c::was_pressed(&self.ctrlc) {
+            if self.signals.interrupted() {
                 return None;
             }
 
diff --git a/crates/nu-command/src/strings/split/chars.rs b/crates/nu-command/src/strings/split/chars.rs
index 08e73b9830..370df262ea 100644
--- a/crates/nu-command/src/strings/split/chars.rs
+++ b/crates/nu-command/src/strings/split/chars.rs
@@ -124,7 +124,7 @@ fn split_chars(
     let span = call.head;
     input.map(
         move |x| split_chars_helper(&x, span, graphemes),
-        engine_state.ctrlc.clone(),
+        engine_state.signals(),
     )
 }
 
diff --git a/crates/nu-command/src/strings/split/column.rs b/crates/nu-command/src/strings/split/column.rs
index 02eff7845f..540cfabe54 100644
--- a/crates/nu-command/src/strings/split/column.rs
+++ b/crates/nu-command/src/strings/split/column.rs
@@ -170,7 +170,7 @@ fn split_column(
 
     input.flat_map(
         move |x| split_column_helper(&x, &regex, &args.rest, args.collapse_empty, name_span),
-        engine_state.ctrlc.clone(),
+        engine_state.signals(),
     )
 }
 
diff --git a/crates/nu-command/src/strings/split/list.rs b/crates/nu-command/src/strings/split/list.rs
index d52bb5401a..eb874841a2 100644
--- a/crates/nu-command/src/strings/split/list.rs
+++ b/crates/nu-command/src/strings/split/list.rs
@@ -215,9 +215,7 @@ fn split_list(
 
     let matcher = Matcher::new(has_regex, separator)?;
     for val in input {
-        if nu_utils::ctrl_c::was_pressed(&engine_state.ctrlc) {
-            break;
-        }
+        engine_state.signals().check(call.head)?;
 
         if matcher.compare(&val)? {
             if !temp_list.is_empty() {
diff --git a/crates/nu-command/src/strings/split/row.rs b/crates/nu-command/src/strings/split/row.rs
index 8bc0003cb6..1f427a06e0 100644
--- a/crates/nu-command/src/strings/split/row.rs
+++ b/crates/nu-command/src/strings/split/row.rs
@@ -170,7 +170,7 @@ fn split_row(
     })?;
     input.flat_map(
         move |x| split_row_helper(&x, &regex, args.max_split, name_span),
-        engine_state.ctrlc.clone(),
+        engine_state.signals(),
     )
 }
 
diff --git a/crates/nu-command/src/strings/split/words.rs b/crates/nu-command/src/strings/split/words.rs
index 0dd5dc9383..6cb5562a70 100644
--- a/crates/nu-command/src/strings/split/words.rs
+++ b/crates/nu-command/src/strings/split/words.rs
@@ -177,7 +177,7 @@ fn split_words(
 
     input.map(
         move |x| split_words_helper(&x, args.word_length, span, args.graphemes),
-        engine_state.ctrlc.clone(),
+        engine_state.signals(),
     )
 }
 
diff --git a/crates/nu-command/src/strings/str_/case/capitalize.rs b/crates/nu-command/src/strings/str_/case/capitalize.rs
index 20f334976c..862ca127c2 100644
--- a/crates/nu-command/src/strings/str_/case/capitalize.rs
+++ b/crates/nu-command/src/strings/str_/case/capitalize.rs
@@ -108,7 +108,7 @@ fn operate(
                 ret
             }
         },
-        engine_state.ctrlc.clone(),
+        engine_state.signals(),
     )
 }
 
diff --git a/crates/nu-command/src/strings/str_/case/downcase.rs b/crates/nu-command/src/strings/str_/case/downcase.rs
index 316050d501..0493a663aa 100644
--- a/crates/nu-command/src/strings/str_/case/downcase.rs
+++ b/crates/nu-command/src/strings/str_/case/downcase.rs
@@ -116,7 +116,7 @@ fn operate(
                 ret
             }
         },
-        engine_state.ctrlc.clone(),
+        engine_state.signals(),
     )
 }
 
diff --git a/crates/nu-command/src/strings/str_/case/mod.rs b/crates/nu-command/src/strings/str_/case/mod.rs
index 32b50c4bc6..3390ff097e 100644
--- a/crates/nu-command/src/strings/str_/case/mod.rs
+++ b/crates/nu-command/src/strings/str_/case/mod.rs
@@ -38,7 +38,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
diff --git a/crates/nu-command/src/strings/str_/case/upcase.rs b/crates/nu-command/src/strings/str_/case/upcase.rs
index 9e55f25f64..557239ec91 100644
--- a/crates/nu-command/src/strings/str_/case/upcase.rs
+++ b/crates/nu-command/src/strings/str_/case/upcase.rs
@@ -93,7 +93,7 @@ fn operate(
                 ret
             }
         },
-        engine_state.ctrlc.clone(),
+        engine_state.signals(),
     )
 }
 
diff --git a/crates/nu-command/src/strings/str_/contains.rs b/crates/nu-command/src/strings/str_/contains.rs
index ff9cb85fcb..27d8a8e313 100644
--- a/crates/nu-command/src/strings/str_/contains.rs
+++ b/crates/nu-command/src/strings/str_/contains.rs
@@ -68,7 +68,7 @@ impl Command for SubCommand {
             cell_paths,
             case_insensitive: call.has_flag(engine_state, stack, "ignore-case")?,
         };
-        operate(action, args, input, call.head, engine_state.ctrlc.clone())
+        operate(action, args, input, call.head, engine_state.signals())
     }
 
     fn run_const(
@@ -103,7 +103,7 @@ impl Command for SubCommand {
             args,
             input,
             call.head,
-            working_set.permanent().ctrlc.clone(),
+            working_set.permanent().signals(),
         )
     }
 
diff --git a/crates/nu-command/src/strings/str_/deunicode.rs b/crates/nu-command/src/strings/str_/deunicode.rs
index 0b70cf2003..ef732571f9 100644
--- a/crates/nu-command/src/strings/str_/deunicode.rs
+++ b/crates/nu-command/src/strings/str_/deunicode.rs
@@ -39,7 +39,7 @@ impl Command for SubCommand {
         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 run_const(
@@ -56,7 +56,7 @@ impl Command for SubCommand {
             args,
             input,
             call.head,
-            working_set.permanent().ctrlc.clone(),
+            working_set.permanent().signals(),
         )
     }
 
diff --git a/crates/nu-command/src/strings/str_/distance.rs b/crates/nu-command/src/strings/str_/distance.rs
index bd666e53f5..9b88f8e3e0 100644
--- a/crates/nu-command/src/strings/str_/distance.rs
+++ b/crates/nu-command/src/strings/str_/distance.rs
@@ -67,7 +67,7 @@ impl Command for SubCommand {
             compare_string,
             cell_paths,
         };
-        operate(action, args, input, call.head, engine_state.ctrlc.clone())
+        operate(action, args, input, call.head, engine_state.signals())
     }
 
     fn run_const(
@@ -88,7 +88,7 @@ impl Command for SubCommand {
             args,
             input,
             call.head,
-            working_set.permanent().ctrlc.clone(),
+            working_set.permanent().signals(),
         )
     }
 
diff --git a/crates/nu-command/src/strings/str_/ends_with.rs b/crates/nu-command/src/strings/str_/ends_with.rs
index 40f643ea8e..d4841b74e0 100644
--- a/crates/nu-command/src/strings/str_/ends_with.rs
+++ b/crates/nu-command/src/strings/str_/ends_with.rs
@@ -68,7 +68,7 @@ impl Command for SubCommand {
             cell_paths,
             case_insensitive: call.has_flag(engine_state, stack, "ignore-case")?,
         };
-        operate(action, args, input, call.head, engine_state.ctrlc.clone())
+        operate(action, args, input, call.head, engine_state.signals())
     }
 
     fn run_const(
@@ -89,7 +89,7 @@ impl Command for SubCommand {
             args,
             input,
             call.head,
-            working_set.permanent().ctrlc.clone(),
+            working_set.permanent().signals(),
         )
     }
 
diff --git a/crates/nu-command/src/strings/str_/expand.rs b/crates/nu-command/src/strings/str_/expand.rs
index 70fb51ec4c..b9759ef6a1 100644
--- a/crates/nu-command/src/strings/str_/expand.rs
+++ b/crates/nu-command/src/strings/str_/expand.rs
@@ -233,7 +233,7 @@ fn run(
                 ),
             }
         },
-        engine_state.ctrlc.clone(),
+        engine_state.signals(),
     )
 }
 
diff --git a/crates/nu-command/src/strings/str_/index_of.rs b/crates/nu-command/src/strings/str_/index_of.rs
index 5b40f80d3d..a6b06ef9b7 100644
--- a/crates/nu-command/src/strings/str_/index_of.rs
+++ b/crates/nu-command/src/strings/str_/index_of.rs
@@ -93,7 +93,7 @@ impl Command for SubCommand {
             cell_paths,
             graphemes: grapheme_flags(engine_state, stack, call)?,
         };
-        operate(action, args, input, call.head, engine_state.ctrlc.clone())
+        operate(action, args, input, call.head, engine_state.signals())
     }
 
     fn run_const(
@@ -117,7 +117,7 @@ impl Command for SubCommand {
             args,
             input,
             call.head,
-            working_set.permanent().ctrlc.clone(),
+            working_set.permanent().signals(),
         )
     }
 
diff --git a/crates/nu-command/src/strings/str_/join.rs b/crates/nu-command/src/strings/str_/join.rs
index 1d36f216d0..d297ea4cbc 100644
--- a/crates/nu-command/src/strings/str_/join.rs
+++ b/crates/nu-command/src/strings/str_/join.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::Signals;
 
 use std::io::Write;
 
@@ -88,30 +89,35 @@ fn run(
     let mut iter = input.into_iter();
     let mut first = true;
 
-    let output = ByteStream::from_fn(span, None, ByteStreamType::String, move |buffer| {
-        // Write each input to the buffer
-        if let Some(value) = iter.next() {
-            // Write the separator if this is not the first
-            if first {
-                first = false;
-            } else if let Some(separator) = &separator {
-                write!(buffer, "{}", separator)?;
-            }
-
-            match value {
-                Value::Error { error, .. } => {
-                    return Err(*error);
+    let output = ByteStream::from_fn(
+        span,
+        Signals::empty(),
+        ByteStreamType::String,
+        move |buffer| {
+            // Write each input to the buffer
+            if let Some(value) = iter.next() {
+                // Write the separator if this is not the first
+                if first {
+                    first = false;
+                } else if let Some(separator) = &separator {
+                    write!(buffer, "{}", separator)?;
                 }
-                // Hmm, not sure what we actually want.
-                // `to_expanded_string` formats dates as human readable which feels funny.
-                Value::Date { val, .. } => write!(buffer, "{val:?}")?,
-                value => write!(buffer, "{}", value.to_expanded_string("\n", &config))?,
+
+                match value {
+                    Value::Error { error, .. } => {
+                        return Err(*error);
+                    }
+                    // Hmm, not sure what we actually want.
+                    // `to_expanded_string` formats dates as human readable which feels funny.
+                    Value::Date { val, .. } => write!(buffer, "{val:?}")?,
+                    value => write!(buffer, "{}", value.to_expanded_string("\n", &config))?,
+                }
+                Ok(true)
+            } else {
+                Ok(false)
             }
-            Ok(true)
-        } else {
-            Ok(false)
-        }
-    });
+        },
+    );
 
     Ok(PipelineData::ByteStream(output, metadata))
 }
diff --git a/crates/nu-command/src/strings/str_/length.rs b/crates/nu-command/src/strings/str_/length.rs
index f456fe9467..ab0ba8db49 100644
--- a/crates/nu-command/src/strings/str_/length.rs
+++ b/crates/nu-command/src/strings/str_/length.rs
@@ -130,7 +130,7 @@ fn run(
         cell_paths: (!cell_paths.is_empty()).then_some(cell_paths),
         graphemes,
     };
-    operate(action, args, input, call.head, engine_state.ctrlc.clone())
+    operate(action, args, input, call.head, engine_state.signals())
 }
 
 fn action(input: &Value, arg: &Arguments, head: Span) -> Value {
diff --git a/crates/nu-command/src/strings/str_/replace.rs b/crates/nu-command/src/strings/str_/replace.rs
index 58e2574681..342dd0693e 100644
--- a/crates/nu-command/src/strings/str_/replace.rs
+++ b/crates/nu-command/src/strings/str_/replace.rs
@@ -102,7 +102,7 @@ impl Command for SubCommand {
             no_regex,
             multiline,
         };
-        operate(action, args, input, call.head, engine_state.ctrlc.clone())
+        operate(action, args, input, call.head, engine_state.signals())
     }
 
     fn run_const(
@@ -134,7 +134,7 @@ impl Command for SubCommand {
             args,
             input,
             call.head,
-            working_set.permanent().ctrlc.clone(),
+            working_set.permanent().signals(),
         )
     }
 
diff --git a/crates/nu-command/src/strings/str_/reverse.rs b/crates/nu-command/src/strings/str_/reverse.rs
index cc3772db7c..9a339f7bcc 100644
--- a/crates/nu-command/src/strings/str_/reverse.rs
+++ b/crates/nu-command/src/strings/str_/reverse.rs
@@ -50,7 +50,7 @@ impl Command for SubCommand {
     ) -> 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 run_const(
@@ -66,7 +66,7 @@ impl Command for SubCommand {
             args,
             input,
             call.head,
-            working_set.permanent().ctrlc.clone(),
+            working_set.permanent().signals(),
         )
     }
 
diff --git a/crates/nu-command/src/strings/str_/starts_with.rs b/crates/nu-command/src/strings/str_/starts_with.rs
index aec12f6f77..bac451466c 100644
--- a/crates/nu-command/src/strings/str_/starts_with.rs
+++ b/crates/nu-command/src/strings/str_/starts_with.rs
@@ -70,7 +70,7 @@ impl Command for SubCommand {
             cell_paths,
             case_insensitive: call.has_flag(engine_state, stack, "ignore-case")?,
         };
-        operate(action, args, input, call.head, engine_state.ctrlc.clone())
+        operate(action, args, input, call.head, engine_state.signals())
     }
 
     fn run_const(
@@ -92,7 +92,7 @@ impl Command for SubCommand {
             args,
             input,
             call.head,
-            working_set.permanent().ctrlc.clone(),
+            working_set.permanent().signals(),
         )
     }
 
diff --git a/crates/nu-command/src/strings/str_/stats.rs b/crates/nu-command/src/strings/str_/stats.rs
index 28c65afe2b..eb091ae4f6 100644
--- a/crates/nu-command/src/strings/str_/stats.rs
+++ b/crates/nu-command/src/strings/str_/stats.rs
@@ -122,7 +122,7 @@ fn stats(
                 ),
             }
         },
-        engine_state.ctrlc.clone(),
+        engine_state.signals(),
     )
 }
 
diff --git a/crates/nu-command/src/strings/str_/substring.rs b/crates/nu-command/src/strings/str_/substring.rs
index 5ad7a967da..10464580c7 100644
--- a/crates/nu-command/src/strings/str_/substring.rs
+++ b/crates/nu-command/src/strings/str_/substring.rs
@@ -103,7 +103,7 @@ impl Command for SubCommand {
             cell_paths,
             graphemes: grapheme_flags(engine_state, stack, call)?,
         };
-        operate(action, args, input, call.head, engine_state.ctrlc.clone())
+        operate(action, args, input, call.head, engine_state.signals())
     }
 
     fn run_const(
@@ -133,7 +133,7 @@ impl Command for SubCommand {
             args,
             input,
             call.head,
-            working_set.permanent().ctrlc.clone(),
+            working_set.permanent().signals(),
         )
     }
 
diff --git a/crates/nu-command/src/strings/str_/trim/trim_.rs b/crates/nu-command/src/strings/str_/trim/trim_.rs
index 52c4017cda..76d886a010 100644
--- a/crates/nu-command/src/strings/str_/trim/trim_.rs
+++ b/crates/nu-command/src/strings/str_/trim/trim_.rs
@@ -190,7 +190,7 @@ fn run(
         cell_paths,
         mode,
     };
-    operate(action, args, input, call.head, engine_state.ctrlc.clone())
+    operate(action, args, input, call.head, engine_state.signals())
 }
 
 #[derive(Debug, Copy, Clone)]
diff --git a/crates/nu-command/src/system/ps.rs b/crates/nu-command/src/system/ps.rs
index c64549a44d..859575abbd 100644
--- a/crates/nu-command/src/system/ps.rs
+++ b/crates/nu-command/src/system/ps.rs
@@ -182,5 +182,5 @@ fn run_ps(
 
     Ok(output
         .into_iter()
-        .into_pipeline_data(span, engine_state.ctrlc.clone()))
+        .into_pipeline_data(span, engine_state.signals().clone()))
 }
diff --git a/crates/nu-command/src/system/registry_query.rs b/crates/nu-command/src/system/registry_query.rs
index 1e2a328356..9b68059ffa 100644
--- a/crates/nu-command/src/system/registry_query.rs
+++ b/crates/nu-command/src/system/registry_query.rs
@@ -106,7 +106,7 @@ fn registry_query(
                 *registry_key_span,
             ))
         }
-        Ok(reg_values.into_pipeline_data(call_span, engine_state.ctrlc.clone()))
+        Ok(reg_values.into_pipeline_data(call_span, engine_state.signals().clone()))
     } else {
         match registry_value {
             Some(value) => {
diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index f82c23a0e0..e475833747 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -2,7 +2,7 @@ use nu_cmd_base::hook::eval_hook;
 use nu_engine::{command_prelude::*, env_to_strings, get_eval_expression};
 use nu_path::{dots::expand_ndots, expand_tilde};
 use nu_protocol::{
-    ast::Expression, did_you_mean, process::ChildProcess, ByteStream, NuGlob, OutDest,
+    ast::Expression, did_you_mean, process::ChildProcess, ByteStream, NuGlob, OutDest, Signals,
 };
 use nu_system::ForegroundChild;
 use nu_utils::IgnoreCaseExt;
@@ -13,7 +13,7 @@ use std::{
     io::Write,
     path::{Path, PathBuf},
     process::Stdio,
-    sync::{atomic::AtomicBool, Arc},
+    sync::Arc,
     thread,
 };
 
@@ -221,7 +221,6 @@ pub fn eval_arguments_from_call(
     stack: &mut Stack,
     call: &Call,
 ) -> Result<Vec<Spanned<OsString>>, ShellError> {
-    let ctrlc = &engine_state.ctrlc;
     let cwd = engine_state.cwd(Some(stack))?;
     let mut args: Vec<Spanned<OsString>> = vec![];
     for (expr, spread) in call.rest_iter(1) {
@@ -229,7 +228,7 @@ pub fn eval_arguments_from_call(
             match arg {
                 // Expand globs passed to run-external
                 Value::Glob { val, no_expand, .. } if !no_expand => args.extend(
-                    expand_glob(&val, &cwd, expr.span, ctrlc)?
+                    expand_glob(&val, &cwd, expr.span, engine_state.signals())?
                         .into_iter()
                         .map(|s| s.into_spanned(expr.span)),
                 ),
@@ -289,7 +288,7 @@ fn expand_glob(
     arg: &str,
     cwd: &Path,
     span: Span,
-    interrupt: &Option<Arc<AtomicBool>>,
+    signals: &Signals,
 ) -> Result<Vec<OsString>, ShellError> {
     const GLOB_CHARS: &[char] = &['*', '?', '['];
 
@@ -307,9 +306,7 @@ fn expand_glob(
         let mut result: Vec<OsString> = vec![];
 
         for m in matches {
-            if nu_utils::ctrl_c::was_pressed(interrupt) {
-                return Err(ShellError::InterruptedByUser { span: Some(span) });
-            }
+            signals.check(span)?;
             if let Ok(arg) = m {
                 let arg = resolve_globbed_path_to_cwd_relative(arg, prefix.as_ref(), cwd);
                 result.push(arg.into());
@@ -611,30 +608,30 @@ mod test {
 
             let cwd = dirs.test();
 
-            let actual = expand_glob("*.txt", cwd, Span::unknown(), &None).unwrap();
+            let actual = expand_glob("*.txt", cwd, Span::unknown(), &Signals::empty()).unwrap();
             let expected = &["a.txt", "b.txt"];
             assert_eq!(actual, expected);
 
-            let actual = expand_glob("./*.txt", cwd, Span::unknown(), &None).unwrap();
+            let actual = expand_glob("./*.txt", cwd, Span::unknown(), &Signals::empty()).unwrap();
             assert_eq!(actual, expected);
 
-            let actual = expand_glob("'*.txt'", cwd, Span::unknown(), &None).unwrap();
+            let actual = expand_glob("'*.txt'", cwd, Span::unknown(), &Signals::empty()).unwrap();
             let expected = &["'*.txt'"];
             assert_eq!(actual, expected);
 
-            let actual = expand_glob(".", cwd, Span::unknown(), &None).unwrap();
+            let actual = expand_glob(".", cwd, Span::unknown(), &Signals::empty()).unwrap();
             let expected = &["."];
             assert_eq!(actual, expected);
 
-            let actual = expand_glob("./a.txt", cwd, Span::unknown(), &None).unwrap();
+            let actual = expand_glob("./a.txt", cwd, Span::unknown(), &Signals::empty()).unwrap();
             let expected = &["./a.txt"];
             assert_eq!(actual, expected);
 
-            let actual = expand_glob("[*.txt", cwd, Span::unknown(), &None).unwrap();
+            let actual = expand_glob("[*.txt", cwd, Span::unknown(), &Signals::empty()).unwrap();
             let expected = &["[*.txt"];
             assert_eq!(actual, expected);
 
-            let actual = expand_glob("~/foo.txt", cwd, Span::unknown(), &None).unwrap();
+            let actual = expand_glob("~/foo.txt", cwd, Span::unknown(), &Signals::empty()).unwrap();
             let home = dirs_next::home_dir().expect("failed to get home dir");
             let expected: Vec<OsString> = vec![home.join("foo.txt").into()];
             assert_eq!(actual, expected);
@@ -666,7 +663,7 @@ mod test {
             ByteStream::read(
                 b"foo".as_slice(),
                 Span::unknown(),
-                None,
+                Signals::empty(),
                 ByteStreamType::Unknown,
             ),
             None,
diff --git a/crates/nu-command/src/system/which_.rs b/crates/nu-command/src/system/which_.rs
index f0cf4ece39..fd5b0beb18 100644
--- a/crates/nu-command/src/system/which_.rs
+++ b/crates/nu-command/src/system/which_.rs
@@ -188,7 +188,6 @@ fn which(
         applications: call.rest(engine_state, stack, 0)?,
         all: call.has_flag(engine_state, stack, "all")?,
     };
-    let ctrlc = engine_state.ctrlc.clone();
 
     if which_args.applications.is_empty() {
         return Err(ShellError::MissingParameter {
@@ -214,7 +213,9 @@ fn which(
         output.extend(values);
     }
 
-    Ok(output.into_iter().into_pipeline_data(head, ctrlc))
+    Ok(output
+        .into_iter()
+        .into_pipeline_data(head, engine_state.signals().clone()))
 }
 
 #[cfg(test)]
diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index f0cc90fa9f..e3738a3952 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -7,7 +7,7 @@ use nu_color_config::{color_from_hex, StyleComputer, TextStyle};
 use nu_engine::{command_prelude::*, env::get_config, env_to_string};
 use nu_pretty_hex::HexConfig;
 use nu_protocol::{
-    ByteStream, Config, DataSource, ListStream, PipelineMetadata, TableMode, ValueIterator,
+    ByteStream, Config, DataSource, ListStream, PipelineMetadata, Signals, TableMode, ValueIterator,
 };
 use nu_table::{
     common::create_nu_table_config, CollapsedTable, ExpandedTable, JustTable, NuTable, NuTableCell,
@@ -19,7 +19,6 @@ use std::{
     io::{IsTerminal, Read},
     path::PathBuf,
     str::FromStr,
-    sync::{atomic::AtomicBool, Arc},
     time::Instant,
 };
 use terminal_size::{Height, Width};
@@ -377,8 +376,8 @@ fn handle_table_command(
         ),
         PipelineData::ByteStream(..) => Ok(input.data),
         PipelineData::Value(Value::Binary { val, .. }, ..) => {
-            let ctrlc = input.engine_state.ctrlc.clone();
-            let stream = ByteStream::read_binary(val, input.call.head, ctrlc);
+            let signals = input.engine_state.signals().clone();
+            let stream = ByteStream::read_binary(val, input.call.head, signals);
             Ok(PipelineData::ByteStream(
                 pretty_hex_stream(stream, input.call.head),
                 None,
@@ -386,8 +385,8 @@ fn handle_table_command(
         }
         // None of these two receive a StyleComputer because handle_row_stream() can produce it by itself using engine_state and stack.
         PipelineData::Value(Value::List { vals, .. }, metadata) => {
-            let ctrlc = input.engine_state.ctrlc.clone();
-            let stream = ListStream::new(vals.into_iter(), span, ctrlc);
+            let signals = input.engine_state.signals().clone();
+            let stream = ListStream::new(vals.into_iter(), span, signals);
             input.data = PipelineData::Empty;
 
             handle_row_stream(input, cfg, stream, metadata)
@@ -410,8 +409,9 @@ fn handle_table_command(
             Table.run(input.engine_state, input.stack, input.call, base_pipeline)
         }
         PipelineData::Value(Value::Range { val, .. }, metadata) => {
-            let ctrlc = input.engine_state.ctrlc.clone();
-            let stream = ListStream::new(val.into_range_iter(span, ctrlc), span, None);
+            let signals = input.engine_state.signals().clone();
+            let stream =
+                ListStream::new(val.into_range_iter(span, Signals::empty()), span, signals);
             input.data = PipelineData::Empty;
             handle_row_stream(input, cfg, stream, metadata)
         }
@@ -437,50 +437,55 @@ fn pretty_hex_stream(stream: ByteStream, span: Span) -> ByteStream {
         reader
     } else {
         // No stream to read from
-        return ByteStream::read_string("".into(), span, None);
+        return ByteStream::read_string("".into(), span, Signals::empty());
     };
 
-    ByteStream::from_fn(span, None, ByteStreamType::String, move |buffer| {
-        // Turn the buffer into a String we can write to
-        let mut write_buf = std::mem::take(buffer);
-        write_buf.clear();
-        // SAFETY: we just truncated it empty
-        let mut write_buf = unsafe { String::from_utf8_unchecked(write_buf) };
+    ByteStream::from_fn(
+        span,
+        Signals::empty(),
+        ByteStreamType::String,
+        move |buffer| {
+            // Turn the buffer into a String we can write to
+            let mut write_buf = std::mem::take(buffer);
+            write_buf.clear();
+            // SAFETY: we just truncated it empty
+            let mut write_buf = unsafe { String::from_utf8_unchecked(write_buf) };
 
-        // Write the title at the beginning
-        if cfg.title {
-            nu_pretty_hex::write_title(&mut write_buf, cfg, true).expect("format error");
-            cfg.title = false;
-
-            // Put the write_buf back into buffer
-            *buffer = write_buf.into_bytes();
-
-            Ok(true)
-        } else {
-            // Read up to `cfg.width` bytes
-            read_buf.clear();
-            (&mut reader)
-                .take(cfg.width as u64)
-                .read_to_end(&mut read_buf)
-                .err_span(span)?;
-
-            if !read_buf.is_empty() {
-                nu_pretty_hex::hex_write(&mut write_buf, &read_buf, cfg, Some(true))
-                    .expect("format error");
-                write_buf.push('\n');
-
-                // Advance the address offset for next time
-                cfg.address_offset += read_buf.len();
+            // Write the title at the beginning
+            if cfg.title {
+                nu_pretty_hex::write_title(&mut write_buf, cfg, true).expect("format error");
+                cfg.title = false;
 
                 // Put the write_buf back into buffer
                 *buffer = write_buf.into_bytes();
 
                 Ok(true)
             } else {
-                Ok(false)
+                // Read up to `cfg.width` bytes
+                read_buf.clear();
+                (&mut reader)
+                    .take(cfg.width as u64)
+                    .read_to_end(&mut read_buf)
+                    .err_span(span)?;
+
+                if !read_buf.is_empty() {
+                    nu_pretty_hex::hex_write(&mut write_buf, &read_buf, cfg, Some(true))
+                        .expect("format error");
+                    write_buf.push('\n');
+
+                    // Advance the address offset for next time
+                    cfg.address_offset += read_buf.len();
+
+                    // Put the write_buf back into buffer
+                    *buffer = write_buf.into_bytes();
+
+                    Ok(true)
+                } else {
+                    Ok(false)
+                }
             }
-        }
-    })
+        },
+    )
 }
 
 fn handle_record(
@@ -491,8 +496,6 @@ fn handle_record(
     let config = get_config(input.engine_state, input.stack);
     let span = input.data.span().unwrap_or(input.call.head);
     let styles = &StyleComputer::from_config(input.engine_state, input.stack);
-    let ctrlc = input.engine_state.ctrlc.clone();
-    let ctrlc1 = ctrlc.clone();
 
     if record.is_empty() {
         let value =
@@ -517,7 +520,7 @@ fn handle_record(
     let opts = TableOpts::new(
         &config,
         styles,
-        ctrlc,
+        input.engine_state.signals(),
         span,
         cfg.term_width,
         indent,
@@ -529,7 +532,7 @@ fn handle_record(
 
     let result = match result {
         Some(output) => maybe_strip_color(output, &config),
-        None => report_unsuccessful_output(ctrlc1, cfg.term_width),
+        None => report_unsuccessful_output(input.engine_state.signals(), cfg.term_width),
     };
 
     let val = Value::string(result, span);
@@ -537,8 +540,8 @@ fn handle_record(
     Ok(val.into_pipeline_data())
 }
 
-fn report_unsuccessful_output(ctrlc1: Option<Arc<AtomicBool>>, term_width: usize) -> String {
-    if nu_utils::ctrl_c::was_pressed(&ctrlc1) {
+fn report_unsuccessful_output(signals: &Signals, term_width: usize) -> String {
+    if signals.interrupted() {
         "".into()
     } else {
         // assume this failed because the table was too wide
@@ -599,8 +602,6 @@ fn handle_row_stream(
     stream: ListStream,
     metadata: Option<PipelineMetadata>,
 ) -> Result<PipelineData, ShellError> {
-    let ctrlc = input.engine_state.ctrlc.clone();
-
     let stream = match metadata.as_ref() {
         // First, `ls` sources:
         Some(PipelineMetadata {
@@ -680,11 +681,14 @@ fn handle_row_stream(
         // for the values it outputs. Because engine_state is passed in, config doesn't need to.
         input.engine_state.clone(),
         input.stack.clone(),
-        ctrlc.clone(),
         cfg,
     );
-    let stream =
-        ByteStream::from_result_iter(paginator, input.call.head, None, ByteStreamType::String);
+    let stream = ByteStream::from_result_iter(
+        paginator,
+        input.call.head,
+        Signals::empty(),
+        ByteStreamType::String,
+    );
     Ok(PipelineData::ByteStream(stream, None))
 }
 
@@ -717,7 +721,6 @@ struct PagingTableCreator {
     stream: ValueIterator,
     engine_state: EngineState,
     stack: Stack,
-    ctrlc: Option<Arc<AtomicBool>>,
     elements_displayed: usize,
     reached_end: bool,
     cfg: TableConfig,
@@ -730,7 +733,6 @@ impl PagingTableCreator {
         stream: ListStream,
         engine_state: EngineState,
         stack: Stack,
-        ctrlc: Option<Arc<AtomicBool>>,
         cfg: TableConfig,
     ) -> Self {
         PagingTableCreator {
@@ -738,7 +740,6 @@ impl PagingTableCreator {
             stream: stream.into_inner(),
             engine_state,
             stack,
-            ctrlc,
             cfg,
             elements_displayed: 0,
             reached_end: false,
@@ -790,14 +791,14 @@ impl PagingTableCreator {
     }
 
     fn create_table_opts<'a>(
-        &self,
+        &'a self,
         cfg: &'a Config,
         style_comp: &'a StyleComputer<'a>,
     ) -> TableOpts<'a> {
         TableOpts::new(
             cfg,
             style_comp,
-            self.ctrlc.clone(),
+            self.engine_state.signals(),
             self.head,
             self.cfg.term_width,
             (cfg.table_indent.left, cfg.table_indent.right),
@@ -830,12 +831,15 @@ impl Iterator for PagingTableCreator {
         match self.cfg.abbreviation {
             Some(abbr) => {
                 (batch, _, end) =
-                    stream_collect_abbriviated(&mut self.stream, abbr, self.ctrlc.clone());
+                    stream_collect_abbriviated(&mut self.stream, abbr, self.engine_state.signals());
             }
             None => {
                 // Pull from stream until time runs out or we have enough items
-                (batch, end) =
-                    stream_collect(&mut self.stream, STREAM_PAGE_SIZE, self.ctrlc.clone());
+                (batch, end) = stream_collect(
+                    &mut self.stream,
+                    STREAM_PAGE_SIZE,
+                    self.engine_state.signals(),
+                );
             }
         }
 
@@ -869,14 +873,19 @@ impl Iterator for PagingTableCreator {
         self.row_offset += batch_size;
 
         let config = get_config(&self.engine_state, &self.stack);
-        convert_table_to_output(table, &config, &self.ctrlc, self.cfg.term_width)
+        convert_table_to_output(
+            table,
+            &config,
+            self.engine_state.signals(),
+            self.cfg.term_width,
+        )
     }
 }
 
 fn stream_collect(
     stream: impl Iterator<Item = Value>,
     size: usize,
-    ctrlc: Option<Arc<AtomicBool>>,
+    signals: &Signals,
 ) -> (Vec<Value>, bool) {
     let start_time = Instant::now();
     let mut end = true;
@@ -896,7 +905,7 @@ fn stream_collect(
             break;
         }
 
-        if nu_utils::ctrl_c::was_pressed(&ctrlc) {
+        if signals.interrupted() {
             break;
         }
     }
@@ -907,7 +916,7 @@ fn stream_collect(
 fn stream_collect_abbriviated(
     stream: impl Iterator<Item = Value>,
     size: usize,
-    ctrlc: Option<Arc<AtomicBool>>,
+    signals: &Signals,
 ) -> (Vec<Value>, usize, bool) {
     let mut end = true;
     let mut read = 0;
@@ -930,7 +939,7 @@ fn stream_collect_abbriviated(
             tail.push_back(item);
         }
 
-        if nu_utils::ctrl_c::was_pressed(&ctrlc) {
+        if signals.interrupted() {
             end = false;
             break;
         }
@@ -1062,7 +1071,7 @@ fn create_empty_placeholder(
 fn convert_table_to_output(
     table: Result<Option<String>, ShellError>,
     config: &Config,
-    ctrlc: &Option<Arc<AtomicBool>>,
+    signals: &Signals,
     term_width: usize,
 ) -> Option<Result<Vec<u8>, ShellError>> {
     match table {
@@ -1075,7 +1084,7 @@ fn convert_table_to_output(
             Some(Ok(bytes))
         }
         Ok(None) => {
-            let msg = if nu_utils::ctrl_c::was_pressed(ctrlc) {
+            let msg = if signals.interrupted() {
                 String::from("")
             } else {
                 // assume this failed because the table was too wide
diff --git a/crates/nu-engine/src/eval.rs b/crates/nu-engine/src/eval.rs
index 044bf86980..1460dec464 100644
--- a/crates/nu-engine/src/eval.rs
+++ b/crates/nu-engine/src/eval.rs
@@ -21,9 +21,7 @@ pub fn eval_call<D: DebugContext>(
     call: &Call,
     input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
-    if nu_utils::ctrl_c::was_pressed(&engine_state.ctrlc) {
-        return Ok(Value::nothing(call.head).into_pipeline_data());
-    }
+    engine_state.signals().check(call.head)?;
     let decl = engine_state.get_decl(call.decl_id);
 
     if !decl.is_known_external() && call.named_iter().any(|(flag, _, _)| flag.item == "help") {
diff --git a/crates/nu-explore/src/commands/expand.rs b/crates/nu-explore/src/commands/expand.rs
index cbb86336af..b748ce2b89 100644
--- a/crates/nu-explore/src/commands/expand.rs
+++ b/crates/nu-explore/src/commands/expand.rs
@@ -67,12 +67,11 @@ fn convert_value_to_string(
         let config = engine_state.get_config();
         Ok(vals[0][0].to_abbreviated_string(config))
     } else {
-        let ctrlc = engine_state.ctrlc.clone();
         let config = engine_state.get_config();
         let style_computer = StyleComputer::from_config(engine_state, stack);
 
         Ok(nu_common::try_build_table(
-            ctrlc,
+            engine_state.signals(),
             config,
             &style_computer,
             value,
diff --git a/crates/nu-explore/src/explore.rs b/crates/nu-explore/src/explore.rs
index e5498ce5b3..8d59591beb 100644
--- a/crates/nu-explore/src/explore.rs
+++ b/crates/nu-explore/src/explore.rs
@@ -63,7 +63,6 @@ impl Command for Explore {
         let tail: bool = call.has_flag(engine_state, stack, "tail")?;
         let peek_value: bool = call.has_flag(engine_state, stack, "peek")?;
 
-        let ctrlc = engine_state.ctrlc.clone();
         let nu_config = engine_state.get_config();
         let style_computer = StyleComputer::from_config(engine_state, stack);
 
@@ -83,7 +82,7 @@ impl Command for Explore {
             tail,
         );
 
-        let result = run_pager(engine_state, &mut stack.clone(), ctrlc, input, config);
+        let result = run_pager(engine_state, &mut stack.clone(), input, config);
 
         match result {
             Ok(Some(value)) => Ok(PipelineData::Value(value, None)),
diff --git a/crates/nu-explore/src/lib.rs b/crates/nu-explore/src/lib.rs
index 30b3e5cf87..043c85eb02 100644
--- a/crates/nu-explore/src/lib.rs
+++ b/crates/nu-explore/src/lib.rs
@@ -11,7 +11,7 @@ use commands::{ExpandCmd, HelpCmd, NuCmd, QuitCmd, TableCmd, TryCmd};
 pub use default_context::add_explore_context;
 pub use explore::Explore;
 use explore::ExploreConfig;
-use nu_common::{collect_pipeline, has_simple_value, CtrlC};
+use nu_common::{collect_pipeline, has_simple_value};
 use nu_protocol::{
     engine::{EngineState, Stack},
     PipelineData, Value,
@@ -28,7 +28,6 @@ mod util {
 fn run_pager(
     engine_state: &EngineState,
     stack: &mut Stack,
-    ctrlc: CtrlC,
     input: PipelineData,
     config: PagerConfig,
 ) -> Result<Option<Value>> {
@@ -45,14 +44,14 @@ fn run_pager(
         p.show_message("For help type :help");
 
         let view = binary_view(input, config.explore_config)?;
-        return p.run(engine_state, stack, ctrlc, Some(view), commands);
+        return p.run(engine_state, stack, Some(view), commands);
     }
 
     let (columns, data) = collect_pipeline(input)?;
 
     let has_no_input = columns.is_empty() && data.is_empty();
     if has_no_input {
-        return p.run(engine_state, stack, ctrlc, help_view(), commands);
+        return p.run(engine_state, stack, help_view(), commands);
     }
 
     p.show_message("For help type :help");
@@ -60,11 +59,11 @@ fn run_pager(
     if let Some(value) = has_simple_value(&data) {
         let text = value.to_abbreviated_string(config.nu_config);
         let view = Some(Page::new(Preview::new(&text), false));
-        return p.run(engine_state, stack, ctrlc, view, commands);
+        return p.run(engine_state, stack, view, commands);
     }
 
     let view = create_record_view(columns, data, is_record, config);
-    p.run(engine_state, stack, ctrlc, view, commands)
+    p.run(engine_state, stack, view, commands)
 }
 
 fn create_record_view(
diff --git a/crates/nu-explore/src/nu_common/mod.rs b/crates/nu-explore/src/nu_common/mod.rs
index 091a7d6f36..42ba2f0896 100644
--- a/crates/nu-explore/src/nu_common/mod.rs
+++ b/crates/nu-explore/src/nu_common/mod.rs
@@ -6,13 +6,11 @@ mod value;
 
 use nu_color_config::TextStyle;
 use nu_protocol::Value;
-use std::sync::{atomic::AtomicBool, Arc};
 
 pub use nu_ansi_term::{Color as NuColor, Style as NuStyle};
 pub use nu_protocol::{Config as NuConfig, Span as NuSpan};
 
 pub type NuText = (String, TextStyle);
-pub type CtrlC = Option<Arc<AtomicBool>>;
 
 pub use command::run_command_with_value;
 pub use lscolor::{create_lscolors, lscolorize};
diff --git a/crates/nu-explore/src/nu_common/table.rs b/crates/nu-explore/src/nu_common/table.rs
index cb580e404b..164c837bf9 100644
--- a/crates/nu-explore/src/nu_common/table.rs
+++ b/crates/nu-explore/src/nu_common/table.rs
@@ -1,22 +1,21 @@
 use crate::nu_common::NuConfig;
 use nu_color_config::StyleComputer;
-use nu_protocol::{Record, Span, Value};
+use nu_protocol::{Record, Signals, Span, Value};
 use nu_table::{
     common::{nu_value_to_string, nu_value_to_string_clean},
     ExpandedTable, TableOpts,
 };
-use std::sync::{atomic::AtomicBool, Arc};
 
 pub fn try_build_table(
-    ctrlc: Option<Arc<AtomicBool>>,
+    signals: &Signals,
     config: &NuConfig,
     style_computer: &StyleComputer,
     value: Value,
 ) -> String {
     let span = value.span();
     match value {
-        Value::List { vals, .. } => try_build_list(vals, ctrlc, config, span, style_computer),
-        Value::Record { val, .. } => try_build_map(&val, span, style_computer, ctrlc, config),
+        Value::List { vals, .. } => try_build_list(vals, signals, config, span, style_computer),
+        Value::Record { val, .. } => try_build_map(&val, span, style_computer, signals, config),
         val if matches!(val, Value::String { .. }) => {
             nu_value_to_string_clean(&val, config, style_computer).0
         }
@@ -28,13 +27,13 @@ fn try_build_map(
     record: &Record,
     span: Span,
     style_computer: &StyleComputer,
-    ctrlc: Option<Arc<AtomicBool>>,
+    signals: &Signals,
     config: &NuConfig,
 ) -> String {
     let opts = TableOpts::new(
         config,
         style_computer,
-        ctrlc,
+        signals,
         Span::unknown(),
         usize::MAX,
         (config.table_indent.left, config.table_indent.right),
@@ -53,7 +52,7 @@ fn try_build_map(
 
 fn try_build_list(
     vals: Vec<Value>,
-    ctrlc: Option<Arc<AtomicBool>>,
+    signals: &Signals,
     config: &NuConfig,
     span: Span,
     style_computer: &StyleComputer,
@@ -61,7 +60,7 @@ fn try_build_list(
     let opts = TableOpts::new(
         config,
         style_computer,
-        ctrlc,
+        signals,
         Span::unknown(),
         usize::MAX,
         (config.table_indent.left, config.table_indent.right),
diff --git a/crates/nu-explore/src/pager/mod.rs b/crates/nu-explore/src/pager/mod.rs
index 3114543f7c..4a043476bb 100644
--- a/crates/nu-explore/src/pager/mod.rs
+++ b/crates/nu-explore/src/pager/mod.rs
@@ -11,7 +11,7 @@ use self::{
 use super::views::{Layout, View};
 use crate::{
     explore::ExploreConfig,
-    nu_common::{CtrlC, NuColor, NuConfig, NuStyle},
+    nu_common::{NuColor, NuConfig, NuStyle},
     registry::{Command, CommandRegistry},
     views::{util::nu_style_to_tui, ViewConfig},
 };
@@ -36,7 +36,6 @@ use std::{
     cmp::min,
     io::{self, Stdout},
     result,
-    sync::atomic::Ordering,
 };
 
 pub type Frame<'a> = ratatui::Frame<'a>;
@@ -89,7 +88,6 @@ impl<'a> Pager<'a> {
         &mut self,
         engine_state: &EngineState,
         stack: &mut Stack,
-        ctrlc: CtrlC,
         view: Option<Page>,
         commands: CommandRegistry,
     ) -> Result<Option<Value>> {
@@ -114,7 +112,6 @@ impl<'a> Pager<'a> {
             &mut terminal,
             engine_state,
             stack,
-            ctrlc,
             self,
             &mut info,
             view,
@@ -173,7 +170,6 @@ fn render_ui(
     term: &mut Terminal,
     engine_state: &EngineState,
     stack: &mut Stack,
-    ctrlc: CtrlC,
     pager: &mut Pager<'_>,
     info: &mut ViewInfo,
     view: Option<Page>,
@@ -183,11 +179,8 @@ fn render_ui(
     let mut view_stack = ViewStack::new(view, Vec::new());
 
     loop {
-        // handle CTRLC event
-        if let Some(ctrlc) = ctrlc.clone() {
-            if ctrlc.load(Ordering::SeqCst) {
-                break Ok(None);
-            }
+        if engine_state.signals().interrupted() {
+            break Ok(None);
         }
 
         let mut layout = Layout::default();
diff --git a/crates/nu-lsp/src/lib.rs b/crates/nu-lsp/src/lib.rs
index 44eeeb5756..fdeededac5 100644
--- a/crates/nu-lsp/src/lib.rs
+++ b/crates/nu-lsp/src/lib.rs
@@ -17,10 +17,7 @@ use ropey::Rope;
 use std::{
     collections::BTreeMap,
     path::{Path, PathBuf},
-    sync::{
-        atomic::{AtomicBool, Ordering},
-        Arc,
-    },
+    sync::Arc,
     time::Duration,
 };
 
@@ -57,11 +54,7 @@ impl LanguageServer {
         })
     }
 
-    pub fn serve_requests(
-        mut self,
-        engine_state: EngineState,
-        ctrlc: Arc<AtomicBool>,
-    ) -> Result<()> {
+    pub fn serve_requests(mut self, engine_state: EngineState) -> Result<()> {
         let server_capabilities = serde_json::to_value(ServerCapabilities {
             text_document_sync: Some(lsp_types::TextDocumentSyncCapability::Kind(
                 TextDocumentSyncKind::INCREMENTAL,
@@ -75,10 +68,12 @@ impl LanguageServer {
 
         let _initialization_params = self
             .connection
-            .initialize_while(server_capabilities, || !ctrlc.load(Ordering::SeqCst))
+            .initialize_while(server_capabilities, || {
+                !engine_state.signals().interrupted()
+            })
             .into_diagnostic()?;
 
-        while !ctrlc.load(Ordering::SeqCst) {
+        while !engine_state.signals().interrupted() {
             let msg = match self
                 .connection
                 .receiver
@@ -631,7 +626,7 @@ mod tests {
         std::thread::spawn(move || {
             let engine_state = nu_cmd_lang::create_default_context();
             let engine_state = nu_command::add_shell_command_context(engine_state);
-            send.send(lsp_server.serve_requests(engine_state, Arc::new(AtomicBool::new(false))))
+            send.send(lsp_server.serve_requests(engine_state))
         });
 
         client_connection
diff --git a/crates/nu-plugin-core/src/interface/mod.rs b/crates/nu-plugin-core/src/interface/mod.rs
index 4f287f39c0..89aa2b15e5 100644
--- a/crates/nu-plugin-core/src/interface/mod.rs
+++ b/crates/nu-plugin-core/src/interface/mod.rs
@@ -1,10 +1,10 @@
 //! Implements the stream multiplexing interface for both the plugin side and the engine side.
 
 use nu_plugin_protocol::{ByteStreamInfo, ListStreamInfo, PipelineDataHeader, StreamMessage};
-use nu_protocol::{ByteStream, IntoSpanned, ListStream, PipelineData, Reader, ShellError};
+use nu_protocol::{ByteStream, IntoSpanned, ListStream, PipelineData, Reader, ShellError, Signals};
 use std::{
     io::{Read, Write},
-    sync::{atomic::AtomicBool, Arc, Mutex},
+    sync::Mutex,
     thread,
 };
 
@@ -170,7 +170,7 @@ pub trait InterfaceManager {
     fn read_pipeline_data(
         &self,
         header: PipelineDataHeader,
-        ctrlc: Option<&Arc<AtomicBool>>,
+        signals: &Signals,
     ) -> Result<PipelineData, ShellError> {
         self.prepare_pipeline_data(match header {
             PipelineDataHeader::Empty => PipelineData::Empty,
@@ -178,12 +178,12 @@ pub trait InterfaceManager {
             PipelineDataHeader::ListStream(info) => {
                 let handle = self.stream_manager().get_handle();
                 let reader = handle.read_stream(info.id, self.get_interface())?;
-                ListStream::new(reader, info.span, ctrlc.cloned()).into()
+                ListStream::new(reader, info.span, signals.clone()).into()
             }
             PipelineDataHeader::ByteStream(info) => {
                 let handle = self.stream_manager().get_handle();
                 let reader = handle.read_stream(info.id, self.get_interface())?;
-                ByteStream::from_result_iter(reader, info.span, ctrlc.cloned(), info.type_).into()
+                ByteStream::from_result_iter(reader, info.span, signals.clone(), info.type_).into()
             }
         })
     }
diff --git a/crates/nu-plugin-core/src/interface/tests.rs b/crates/nu-plugin-core/src/interface/tests.rs
index 6b86aba97d..456eb547b5 100644
--- a/crates/nu-plugin-core/src/interface/tests.rs
+++ b/crates/nu-plugin-core/src/interface/tests.rs
@@ -11,7 +11,7 @@ use nu_plugin_protocol::{
 };
 use nu_protocol::{
     ByteStream, ByteStreamSource, ByteStreamType, DataSource, ListStream, PipelineData,
-    PipelineMetadata, ShellError, Span, Value,
+    PipelineMetadata, ShellError, Signals, Span, Value,
 };
 use std::{path::Path, sync::Arc};
 
@@ -129,7 +129,7 @@ fn read_pipeline_data_empty() -> Result<(), ShellError> {
     let header = PipelineDataHeader::Empty;
 
     assert!(matches!(
-        manager.read_pipeline_data(header, None)?,
+        manager.read_pipeline_data(header, &Signals::empty())?,
         PipelineData::Empty
     ));
     Ok(())
@@ -141,7 +141,7 @@ fn read_pipeline_data_value() -> Result<(), ShellError> {
     let value = Value::test_int(4);
     let header = PipelineDataHeader::Value(value.clone());
 
-    match manager.read_pipeline_data(header, None)? {
+    match manager.read_pipeline_data(header, &Signals::empty())? {
         PipelineData::Value(read_value, ..) => assert_eq!(value, read_value),
         PipelineData::ListStream(..) => panic!("unexpected ListStream"),
         PipelineData::ByteStream(..) => panic!("unexpected ByteStream"),
@@ -168,7 +168,7 @@ fn read_pipeline_data_list_stream() -> Result<(), ShellError> {
         span: Span::test_data(),
     });
 
-    let pipe = manager.read_pipeline_data(header, None)?;
+    let pipe = manager.read_pipeline_data(header, &Signals::empty())?;
     assert!(
         matches!(pipe, PipelineData::ListStream(..)),
         "unexpected PipelineData: {pipe:?}"
@@ -212,7 +212,7 @@ fn read_pipeline_data_byte_stream() -> Result<(), ShellError> {
         type_: ByteStreamType::Unknown,
     });
 
-    let pipe = manager.read_pipeline_data(header, None)?;
+    let pipe = manager.read_pipeline_data(header, &Signals::empty())?;
 
     // need to consume input
     manager.consume_all()?;
@@ -257,7 +257,7 @@ fn read_pipeline_data_prepared_properly() -> Result<(), ShellError> {
         id: 0,
         span: Span::test_data(),
     });
-    match manager.read_pipeline_data(header, None)? {
+    match manager.read_pipeline_data(header, &Signals::empty())? {
         PipelineData::ListStream(_, meta) => match meta {
             Some(PipelineMetadata { data_source, .. }) => match data_source {
                 DataSource::FilePath(path) => {
@@ -353,7 +353,11 @@ fn write_pipeline_data_list_stream() -> Result<(), ShellError> {
 
     // Set up pipeline data for a list stream
     let pipe = PipelineData::ListStream(
-        ListStream::new(values.clone().into_iter(), Span::test_data(), None),
+        ListStream::new(
+            values.clone().into_iter(),
+            Span::test_data(),
+            Signals::empty(),
+        ),
         None,
     );
 
@@ -406,7 +410,7 @@ fn write_pipeline_data_byte_stream() -> Result<(), ShellError> {
         ByteStream::read(
             std::io::Cursor::new(expected),
             span,
-            None,
+            Signals::empty(),
             ByteStreamType::Unknown,
         ),
         None,
diff --git a/crates/nu-plugin-engine/src/context.rs b/crates/nu-plugin-engine/src/context.rs
index c87e64aa48..b026d21b23 100644
--- a/crates/nu-plugin-engine/src/context.rs
+++ b/crates/nu-plugin-engine/src/context.rs
@@ -3,23 +3,21 @@ use nu_engine::{get_eval_block_with_early_return, get_full_help, ClosureEvalOnce
 use nu_protocol::{
     ast::Call,
     engine::{Closure, EngineState, Redirection, Stack},
-    Config, IntoSpanned, OutDest, PipelineData, PluginIdentity, ShellError, Span, Spanned, Value,
+    Config, IntoSpanned, OutDest, PipelineData, PluginIdentity, ShellError, Signals, Span, Spanned,
+    Value,
 };
 use std::{
     borrow::Cow,
     collections::HashMap,
-    sync::{
-        atomic::{AtomicBool, AtomicU32},
-        Arc,
-    },
+    sync::{atomic::AtomicU32, Arc},
 };
 
 /// Object safe trait for abstracting operations required of the plugin context.
 pub trait PluginExecutionContext: Send + Sync {
     /// A span pointing to the command being executed
     fn span(&self) -> Span;
-    /// The interrupt signal, if present
-    fn ctrlc(&self) -> Option<&Arc<AtomicBool>>;
+    /// The [`Signals`] struct, if present
+    fn signals(&self) -> &Signals;
     /// The pipeline externals state, for tracking the foreground process group, if present
     fn pipeline_externals_state(&self) -> Option<&Arc<(AtomicU32, AtomicU32)>>;
     /// Get engine configuration
@@ -80,8 +78,8 @@ impl<'a> PluginExecutionContext for PluginExecutionCommandContext<'a> {
         self.call.head
     }
 
-    fn ctrlc(&self) -> Option<&Arc<AtomicBool>> {
-        self.engine_state.ctrlc.as_ref()
+    fn signals(&self) -> &Signals {
+        self.engine_state.signals()
     }
 
     fn pipeline_externals_state(&self) -> Option<&Arc<(AtomicU32, AtomicU32)>> {
@@ -234,8 +232,8 @@ impl PluginExecutionContext for PluginExecutionBogusContext {
         Span::test_data()
     }
 
-    fn ctrlc(&self) -> Option<&Arc<AtomicBool>> {
-        None
+    fn signals(&self) -> &Signals {
+        &Signals::EMPTY
     }
 
     fn pipeline_externals_state(&self) -> Option<&Arc<(AtomicU32, AtomicU32)>> {
diff --git a/crates/nu-plugin-engine/src/interface/mod.rs b/crates/nu-plugin-engine/src/interface/mod.rs
index 9a4c72d2c1..79ab7f7720 100644
--- a/crates/nu-plugin-engine/src/interface/mod.rs
+++ b/crates/nu-plugin-engine/src/interface/mod.rs
@@ -12,11 +12,11 @@ use nu_plugin_protocol::{
 };
 use nu_protocol::{
     ast::Operator, CustomValue, IntoSpanned, PipelineData, PluginMetadata, PluginSignature,
-    ShellError, Span, Spanned, Value,
+    ShellError, Signals, Span, Spanned, Value,
 };
 use std::{
     collections::{btree_map, BTreeMap},
-    sync::{atomic::AtomicBool, mpsc, Arc, OnceLock},
+    sync::{mpsc, Arc, OnceLock},
 };
 
 use crate::{
@@ -103,8 +103,8 @@ struct PluginCallState {
     /// Don't try to send the plugin call response. This is only used for `Dropped` to avoid an
     /// error
     dont_send_response: bool,
-    /// Interrupt signal to be used for stream iterators
-    ctrlc: Option<Arc<AtomicBool>>,
+    /// Signals to be used for stream iterators
+    signals: Signals,
     /// Channel to receive context on to be used if needed
     context_rx: Option<mpsc::Receiver<Context>>,
     /// Span associated with the call, if any
@@ -231,14 +231,14 @@ impl PluginInterfaceManager {
         }
     }
 
-    /// Find the ctrlc signal corresponding to the given plugin call id
-    fn get_ctrlc(&mut self, id: PluginCallId) -> Result<Option<Arc<AtomicBool>>, ShellError> {
+    /// Find the [`Signals`] struct corresponding to the given plugin call id
+    fn get_signals(&mut self, id: PluginCallId) -> Result<Signals, ShellError> {
         // Make sure we're up to date
         self.receive_plugin_call_subscriptions();
         // Find the subscription and return the context
         self.plugin_call_states
             .get(&id)
-            .map(|state| state.ctrlc.clone())
+            .map(|state| state.signals.clone())
             .ok_or_else(|| ShellError::PluginFailedToDecode {
                 msg: format!("Unknown plugin call ID: {id}"),
             })
@@ -517,14 +517,14 @@ impl InterfaceManager for PluginInterfaceManager {
                 // Handle reading the pipeline data, if any
                 let response = response
                     .map_data(|data| {
-                        let ctrlc = self.get_ctrlc(id)?;
+                        let signals = self.get_signals(id)?;
 
                         // Register the stream in the response
                         if let Some(stream_id) = data.stream_id() {
                             self.recv_stream_started(id, stream_id);
                         }
 
-                        self.read_pipeline_data(data, ctrlc.as_ref())
+                        self.read_pipeline_data(data, &signals)
                     })
                     .unwrap_or_else(|err| {
                         // If there's an error with initializing this stream, change it to a plugin
@@ -544,8 +544,8 @@ impl InterfaceManager for PluginInterfaceManager {
                 let call = call
                     // Handle reading the pipeline data, if any
                     .map_data(|input| {
-                        let ctrlc = self.get_ctrlc(context)?;
-                        self.read_pipeline_data(input, ctrlc.as_ref())
+                        let signals = self.get_signals(context)?;
+                        self.read_pipeline_data(input, &signals)
                     })
                     // Do anything extra needed for each engine call setup
                     .and_then(|mut engine_call| {
@@ -698,7 +698,9 @@ impl PluginInterface {
         context: Option<&dyn PluginExecutionContext>,
     ) -> Result<WritePluginCallResult, ShellError> {
         let id = self.state.plugin_call_id_sequence.next()?;
-        let ctrlc = context.and_then(|c| c.ctrlc().cloned());
+        let signals = context
+            .map(|c| c.signals().clone())
+            .unwrap_or_else(Signals::empty);
         let (tx, rx) = mpsc::channel();
         let (context_tx, context_rx) = mpsc::channel();
         let keep_plugin_custom_values = mpsc::channel();
@@ -746,7 +748,7 @@ impl PluginInterface {
                 PluginCallState {
                     sender: Some(tx).filter(|_| !dont_send_response),
                     dont_send_response,
-                    ctrlc,
+                    signals,
                     context_rx: Some(context_rx),
                     span: call.span(),
                     keep_plugin_custom_values,
diff --git a/crates/nu-plugin-engine/src/interface/tests.rs b/crates/nu-plugin-engine/src/interface/tests.rs
index 5665beb92b..2bab67f25f 100644
--- a/crates/nu-plugin-engine/src/interface/tests.rs
+++ b/crates/nu-plugin-engine/src/interface/tests.rs
@@ -18,7 +18,7 @@ use nu_protocol::{
     ast::{Math, Operator},
     engine::Closure,
     ByteStreamType, CustomValue, IntoInterruptiblePipelineData, IntoSpanned, PipelineData,
-    PluginMetadata, PluginSignature, ShellError, Span, Spanned, Value,
+    PluginMetadata, PluginSignature, ShellError, Signals, Span, Spanned, Value,
 };
 use serde::{Deserialize, Serialize};
 use std::{
@@ -56,7 +56,7 @@ fn manager_consume_all_exits_after_streams_and_interfaces_are_dropped() -> Resul
             id: 0,
             span: Span::test_data(),
         }),
-        None,
+        &Signals::empty(),
     )?;
 
     // and an interface...
@@ -112,7 +112,7 @@ fn manager_consume_all_propagates_io_error_to_readers() -> Result<(), ShellError
             id: 0,
             span: Span::test_data(),
         }),
-        None,
+        &Signals::empty(),
     )?;
 
     manager
@@ -159,7 +159,7 @@ fn manager_consume_all_propagates_message_error_to_readers() -> Result<(), Shell
             span: Span::test_data(),
             type_: ByteStreamType::Unknown,
         }),
-        None,
+        &Signals::empty(),
     )?;
 
     manager
@@ -190,7 +190,7 @@ fn fake_plugin_call(
         PluginCallState {
             sender: Some(tx),
             dont_send_response: false,
-            ctrlc: None,
+            signals: Signals::empty(),
             context_rx: None,
             span: None,
             keep_plugin_custom_values: mpsc::channel(),
@@ -493,7 +493,7 @@ fn manager_handle_engine_call_after_response_received() -> Result<(), ShellError
         PluginCallState {
             sender: None,
             dont_send_response: false,
-            ctrlc: None,
+            signals: Signals::empty(),
             context_rx: Some(context_rx),
             span: None,
             keep_plugin_custom_values: mpsc::channel(),
@@ -559,7 +559,7 @@ fn manager_send_plugin_call_response_removes_context_only_if_no_streams_to_read(
             PluginCallState {
                 sender: None,
                 dont_send_response: false,
-                ctrlc: None,
+                signals: Signals::empty(),
                 context_rx: None,
                 span: None,
                 keep_plugin_custom_values: mpsc::channel(),
@@ -595,7 +595,7 @@ fn manager_consume_stream_end_removes_context_only_if_last_stream() -> Result<()
             PluginCallState {
                 sender: None,
                 dont_send_response: false,
-                ctrlc: None,
+                signals: Signals::empty(),
                 context_rx: None,
                 span: None,
                 keep_plugin_custom_values: mpsc::channel(),
@@ -678,7 +678,7 @@ fn manager_prepare_pipeline_data_adds_source_to_list_streams() -> Result<(), She
         [Value::test_custom_value(Box::new(
             test_plugin_custom_value(),
         ))]
-        .into_pipeline_data(Span::test_data(), None),
+        .into_pipeline_data(Span::test_data(), Signals::empty()),
     )?;
 
     let value = data
@@ -852,7 +852,9 @@ fn interface_write_plugin_call_writes_run_with_stream_input() -> Result<(), Shel
                 positional: vec![],
                 named: vec![],
             },
-            input: values.clone().into_pipeline_data(Span::test_data(), None),
+            input: values
+                .clone()
+                .into_pipeline_data(Span::test_data(), Signals::empty()),
         }),
         None,
     )?;
@@ -1148,7 +1150,9 @@ fn interface_prepare_pipeline_data_accepts_normal_streams() -> Result<(), ShellE
     let values = normal_values(&interface);
     let state = CurrentCallState::default();
     let data = interface.prepare_pipeline_data(
-        values.clone().into_pipeline_data(Span::test_data(), None),
+        values
+            .clone()
+            .into_pipeline_data(Span::test_data(), Signals::empty()),
         &state,
     )?;
 
@@ -1211,7 +1215,9 @@ fn interface_prepare_pipeline_data_rejects_bad_custom_value_in_a_stream() -> Res
     let values = bad_custom_values();
     let state = CurrentCallState::default();
     let data = interface.prepare_pipeline_data(
-        values.clone().into_pipeline_data(Span::test_data(), None),
+        values
+            .clone()
+            .into_pipeline_data(Span::test_data(), Signals::empty()),
         &state,
     )?;
 
diff --git a/crates/nu-plugin-test-support/src/lib.rs b/crates/nu-plugin-test-support/src/lib.rs
index a53b353981..998c31ac0d 100644
--- a/crates/nu-plugin-test-support/src/lib.rs
+++ b/crates/nu-plugin-test-support/src/lib.rs
@@ -8,8 +8,8 @@
 //! use nu_plugin::*;
 //! use nu_plugin_test_support::PluginTest;
 //! use nu_protocol::{
-//!     Example, IntoInterruptiblePipelineData, LabeledError, PipelineData, ShellError, Signature,
-//!     Span, Type, Value,
+//!     Example, IntoInterruptiblePipelineData, LabeledError, PipelineData, ShellError, Signals,
+//!     Signature, Span, Type, Value,
 //! };
 //!
 //! struct LowercasePlugin;
@@ -60,7 +60,7 @@
 //!                     // Errors in a stream should be returned as values.
 //!                     .unwrap_or_else(|err| Value::error(err, span))
 //!             },
-//!             None,
+//!             &Signals::empty(),
 //!         )?)
 //!     }
 //! }
@@ -83,7 +83,7 @@
 //!
 //! // #[test]
 //! fn test_lowercase() -> Result<(), ShellError> {
-//!     let input = vec![Value::test_string("FooBar")].into_pipeline_data(Span::test_data(), None);
+//!     let input = vec![Value::test_string("FooBar")].into_pipeline_data(Span::test_data(), Signals::empty());
 //!     let output = PluginTest::new("lowercase", LowercasePlugin.into())?
 //!         .eval_with("lowercase", input)?
 //!         .into_value(Span::test_data())?;
diff --git a/crates/nu-plugin-test-support/src/plugin_test.rs b/crates/nu-plugin-test-support/src/plugin_test.rs
index 3d6b3eec23..5e3334c78b 100644
--- a/crates/nu-plugin-test-support/src/plugin_test.rs
+++ b/crates/nu-plugin-test-support/src/plugin_test.rs
@@ -11,7 +11,7 @@ use nu_protocol::{
     debugger::WithoutDebug,
     engine::{EngineState, Stack, StateWorkingSet},
     report_error_new, CustomValue, Example, IntoSpanned as _, LabeledError, PipelineData,
-    ShellError, Span, Value,
+    ShellError, Signals, Span, Value,
 };
 
 use crate::{diff::diff_by_line, fake_register::fake_register};
@@ -85,13 +85,13 @@ impl PluginTest {
     ///
     /// ```rust,no_run
     /// # use nu_plugin_test_support::PluginTest;
-    /// # use nu_protocol::{ShellError, Span, Value, IntoInterruptiblePipelineData};
+    /// # use nu_protocol::{IntoInterruptiblePipelineData, ShellError, Signals, Span, Value};
     /// # use nu_plugin::*;
     /// # fn test(MyPlugin: impl Plugin + Send + 'static) -> Result<(), ShellError> {
     /// let result = PluginTest::new("my_plugin", MyPlugin.into())?
     ///     .eval_with(
     ///         "my-command",
-    ///         vec![Value::test_int(42)].into_pipeline_data(Span::test_data(), None)
+    ///         vec![Value::test_int(42)].into_pipeline_data(Span::test_data(), Signals::empty())
     ///     )?
     ///     .into_value(Span::test_data())?;
     /// assert_eq!(Value::test_string("42"), result);
@@ -151,7 +151,7 @@ impl PluginTest {
                         Err(err) => Value::error(err, value.span()),
                     }
                 },
-                None,
+                &Signals::empty(),
             )?
         };
 
@@ -171,7 +171,7 @@ impl PluginTest {
                         Err(err) => Value::error(err, value.span()),
                     }
                 },
-                None,
+                &Signals::empty(),
             )
         }
     }
diff --git a/crates/nu-plugin-test-support/tests/lowercase/mod.rs b/crates/nu-plugin-test-support/tests/lowercase/mod.rs
index 50271a8cc2..5be127e7f5 100644
--- a/crates/nu-plugin-test-support/tests/lowercase/mod.rs
+++ b/crates/nu-plugin-test-support/tests/lowercase/mod.rs
@@ -1,8 +1,8 @@
 use nu_plugin::*;
 use nu_plugin_test_support::PluginTest;
 use nu_protocol::{
-    Example, IntoInterruptiblePipelineData, LabeledError, PipelineData, ShellError, Signature,
-    Span, Type, Value,
+    Example, IntoInterruptiblePipelineData, LabeledError, PipelineData, ShellError, Signals,
+    Signature, Span, Type, Value,
 };
 
 struct LowercasePlugin;
@@ -53,7 +53,7 @@ impl PluginCommand for Lowercase {
                     // Errors in a stream should be returned as values.
                     .unwrap_or_else(|err| Value::error(err, span))
             },
-            None,
+            &Signals::empty(),
         )?)
     }
 }
@@ -72,7 +72,8 @@ impl Plugin for LowercasePlugin {
 fn test_lowercase_using_eval_with() -> Result<(), ShellError> {
     let result = PluginTest::new("lowercase", LowercasePlugin.into())?.eval_with(
         "lowercase",
-        vec![Value::test_string("HeLlO wOrLd")].into_pipeline_data(Span::test_data(), None),
+        vec![Value::test_string("HeLlO wOrLd")]
+            .into_pipeline_data(Span::test_data(), Signals::empty()),
     )?;
 
     assert_eq!(
diff --git a/crates/nu-plugin/src/plugin/command.rs b/crates/nu-plugin/src/plugin/command.rs
index d33fc445e2..a90555ac40 100644
--- a/crates/nu-plugin/src/plugin/command.rs
+++ b/crates/nu-plugin/src/plugin/command.rs
@@ -22,7 +22,7 @@ use crate::{EngineInterface, EvaluatedCall, Plugin};
 /// Basic usage:
 /// ```
 /// # use nu_plugin::*;
-/// # use nu_protocol::{Signature, PipelineData, Type, Value, LabeledError};
+/// # use nu_protocol::{LabeledError, PipelineData, Signals, Signature, Type, Value};
 /// struct LowercasePlugin;
 /// struct Lowercase;
 ///
@@ -55,7 +55,7 @@ use crate::{EngineInterface, EvaluatedCall, Plugin};
 ///                 .map(|string| Value::string(string.to_lowercase(), span))
 ///                 // Errors in a stream should be returned as values.
 ///                 .unwrap_or_else(|err| Value::error(err, span))
-///         }, None)?)
+///         }, &Signals::empty())?)
 ///     }
 /// }
 ///
diff --git a/crates/nu-plugin/src/plugin/interface/mod.rs b/crates/nu-plugin/src/plugin/interface/mod.rs
index fc9c9e85b3..dcb4119dba 100644
--- a/crates/nu-plugin/src/plugin/interface/mod.rs
+++ b/crates/nu-plugin/src/plugin/interface/mod.rs
@@ -12,7 +12,7 @@ use nu_plugin_protocol::{
 };
 use nu_protocol::{
     engine::Closure, Config, LabeledError, PipelineData, PluginMetadata, PluginSignature,
-    ShellError, Span, Spanned, Value,
+    ShellError, Signals, Span, Spanned, Value,
 };
 use std::{
     collections::{btree_map, BTreeMap, HashMap},
@@ -274,7 +274,9 @@ impl InterfaceManager for EngineInterfaceManager {
             PluginInput::Call(id, call) => {
                 let interface = self.interface_for_context(id);
                 // Read streams in the input
-                let call = match call.map_data(|input| self.read_pipeline_data(input, None)) {
+                let call = match call
+                    .map_data(|input| self.read_pipeline_data(input, &Signals::empty()))
+                {
                     Ok(call) => call,
                     Err(err) => {
                         // If there's an error with initialization of the input stream, just send
@@ -320,7 +322,7 @@ impl InterfaceManager for EngineInterfaceManager {
             }
             PluginInput::EngineCallResponse(id, response) => {
                 let response = response
-                    .map_data(|header| self.read_pipeline_data(header, None))
+                    .map_data(|header| self.read_pipeline_data(header, &Signals::empty()))
                     .unwrap_or_else(|err| {
                         // If there's an error with initializing this stream, change it to an engine
                         // call error response, but send it anyway
diff --git a/crates/nu-plugin/src/plugin/interface/tests.rs b/crates/nu-plugin/src/plugin/interface/tests.rs
index b195b43197..7065c6f64d 100644
--- a/crates/nu-plugin/src/plugin/interface/tests.rs
+++ b/crates/nu-plugin/src/plugin/interface/tests.rs
@@ -10,7 +10,7 @@ use nu_plugin_protocol::{
 };
 use nu_protocol::{
     engine::Closure, ByteStreamType, Config, CustomValue, IntoInterruptiblePipelineData,
-    LabeledError, PipelineData, PluginSignature, ShellError, Span, Spanned, Value,
+    LabeledError, PipelineData, PluginSignature, ShellError, Signals, Span, Spanned, Value,
 };
 use std::{
     collections::HashMap,
@@ -59,7 +59,7 @@ fn manager_consume_all_exits_after_streams_and_interfaces_are_dropped() -> Resul
             id: 0,
             span: Span::test_data(),
         }),
-        None,
+        &Signals::empty(),
     )?;
 
     // and an interface...
@@ -115,7 +115,7 @@ fn manager_consume_all_propagates_io_error_to_readers() -> Result<(), ShellError
             id: 0,
             span: Span::test_data(),
         }),
-        None,
+        &Signals::empty(),
     )?;
 
     manager
@@ -162,7 +162,7 @@ fn manager_consume_all_propagates_message_error_to_readers() -> Result<(), Shell
             span: Span::test_data(),
             type_: ByteStreamType::Unknown,
         }),
-        None,
+        &Signals::empty(),
     )?;
 
     manager
@@ -615,7 +615,7 @@ fn manager_prepare_pipeline_data_deserializes_custom_values_in_streams() -> Resu
         [Value::test_custom_value(Box::new(
             test_plugin_custom_value(),
         ))]
-        .into_pipeline_data(Span::test_data(), None),
+        .into_pipeline_data(Span::test_data(), Signals::empty()),
     )?;
 
     let value = data
@@ -647,7 +647,7 @@ fn manager_prepare_pipeline_data_embeds_deserialization_errors_in_streams() -> R
     let span = Span::new(20, 30);
     let data = manager.prepare_pipeline_data(
         [Value::custom(Box::new(invalid_custom_value), span)]
-            .into_pipeline_data(Span::test_data(), None),
+            .into_pipeline_data(Span::test_data(), Signals::empty()),
     )?;
 
     let value = data
@@ -730,7 +730,7 @@ fn interface_write_response_with_stream() -> Result<(), ShellError> {
     interface
         .write_response(Ok::<_, ShellError>(
             [Value::test_int(3), Value::test_int(4), Value::test_int(5)]
-                .into_pipeline_data(Span::test_data(), None),
+                .into_pipeline_data(Span::test_data(), Signals::empty()),
         ))?
         .write()?;
 
@@ -1132,7 +1132,7 @@ fn interface_prepare_pipeline_data_serializes_custom_values_in_streams() -> Resu
         [Value::test_custom_value(Box::new(
             expected_test_custom_value(),
         ))]
-        .into_pipeline_data(Span::test_data(), None),
+        .into_pipeline_data(Span::test_data(), Signals::empty()),
         &(),
     )?;
 
@@ -1191,7 +1191,7 @@ fn interface_prepare_pipeline_data_embeds_serialization_errors_in_streams() -> R
     let span = Span::new(40, 60);
     let data = interface.prepare_pipeline_data(
         [Value::custom(Box::new(CantSerialize::BadVariant), span)]
-            .into_pipeline_data(Span::test_data(), None),
+            .into_pipeline_data(Span::test_data(), Signals::empty()),
         &(),
     )?;
 
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index c436621627..e393d78d41 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -8,7 +8,7 @@ use crate::{
     },
     eval_const::create_nu_constant,
     BlockId, Category, Config, DeclId, FileId, GetSpan, HistoryConfig, Module, ModuleId, OverlayId,
-    ShellError, Signature, Span, SpanId, Type, Value, VarId, VirtualPathId,
+    ShellError, Signals, Signature, Span, SpanId, Type, Value, VarId, VirtualPathId,
 };
 use fancy_regex::Regex;
 use lru::LruCache;
@@ -84,7 +84,7 @@ pub struct EngineState {
     pub spans: Vec<Span>,
     usage: Usage,
     pub scope: ScopeFrame,
-    pub ctrlc: Option<Arc<AtomicBool>>,
+    signals: Signals,
     pub env_vars: Arc<EnvVars>,
     pub previous_env_vars: Arc<HashMap<String, Value>>,
     pub config: Arc<Config>,
@@ -144,7 +144,7 @@ impl EngineState {
                 0,
                 false,
             ),
-            ctrlc: None,
+            signals: Signals::empty(),
             env_vars: Arc::new(
                 [(DEFAULT_OVERLAY_NAME.to_string(), HashMap::new())]
                     .into_iter()
@@ -177,6 +177,18 @@ impl EngineState {
         }
     }
 
+    pub fn signals(&self) -> &Signals {
+        &self.signals
+    }
+
+    pub fn reset_signals(&mut self) {
+        self.signals.reset()
+    }
+
+    pub fn set_signals(&mut self, signals: Signals) {
+        self.signals = signals;
+    }
+
     /// Merges a `StateDelta` onto the current state. These deltas come from a system, like the parser, that
     /// creates a new set of definitions and visible symbols in the current scope. We make this transactional
     /// as there are times when we want to run the parser and immediately throw away the results (namely:
diff --git a/crates/nu-protocol/src/errors/shell_error.rs b/crates/nu-protocol/src/errors/shell_error.rs
index 30752d5c9e..be24fd093e 100644
--- a/crates/nu-protocol/src/errors/shell_error.rs
+++ b/crates/nu-protocol/src/errors/shell_error.rs
@@ -1187,6 +1187,13 @@ pub enum ShellError {
         span: Option<Span>,
     },
 
+    /// Operation interrupted
+    #[error("Operation interrupted")]
+    Interrupted {
+        #[label("This operation was interrupted")]
+        span: Span,
+    },
+
     /// Operation interrupted by user
     #[error("Operation interrupted by user")]
     InterruptedByUser {
diff --git a/crates/nu-protocol/src/pipeline/byte_stream.rs b/crates/nu-protocol/src/pipeline/byte_stream.rs
index babd195a9e..6226f1d8db 100644
--- a/crates/nu-protocol/src/pipeline/byte_stream.rs
+++ b/crates/nu-protocol/src/pipeline/byte_stream.rs
@@ -1,9 +1,8 @@
-use serde::{Deserialize, Serialize};
-
 use crate::{
     process::{ChildPipe, ChildProcess, ExitStatus},
-    ErrSpan, IntoSpanned, OutDest, PipelineData, ShellError, Span, Type, Value,
+    ErrSpan, IntoSpanned, OutDest, PipelineData, ShellError, Signals, Span, Type, Value,
 };
+use serde::{Deserialize, Serialize};
 #[cfg(unix)]
 use std::os::fd::OwnedFd;
 #[cfg(windows)]
@@ -13,10 +12,6 @@ use std::{
     fs::File,
     io::{self, BufRead, BufReader, Cursor, ErrorKind, Read, Write},
     process::Stdio,
-    sync::{
-        atomic::{AtomicBool, Ordering},
-        Arc,
-    },
     thread,
 };
 
@@ -182,7 +177,7 @@ impl From<ByteStreamType> for Type {
 pub struct ByteStream {
     stream: ByteStreamSource,
     span: Span,
-    ctrlc: Option<Arc<AtomicBool>>,
+    signals: Signals,
     type_: ByteStreamType,
     known_size: Option<u64>,
 }
@@ -192,13 +187,13 @@ impl ByteStream {
     pub fn new(
         stream: ByteStreamSource,
         span: Span,
-        interrupt: Option<Arc<AtomicBool>>,
+        signals: Signals,
         type_: ByteStreamType,
     ) -> Self {
         Self {
             stream,
             span,
-            ctrlc: interrupt,
+            signals,
             type_,
             known_size: None,
         }
@@ -208,33 +203,33 @@ impl ByteStream {
     pub fn read(
         reader: impl Read + Send + 'static,
         span: Span,
-        interrupt: Option<Arc<AtomicBool>>,
+        signals: Signals,
         type_: ByteStreamType,
     ) -> Self {
         Self::new(
             ByteStreamSource::Read(Box::new(reader)),
             span,
-            interrupt,
+            signals,
             type_,
         )
     }
 
     /// Create a [`ByteStream`] from a string. The type of the stream is always `String`.
-    pub fn read_string(string: String, span: Span, interrupt: Option<Arc<AtomicBool>>) -> Self {
+    pub fn read_string(string: String, span: Span, signals: Signals) -> Self {
         let len = string.len();
         ByteStream::read(
             Cursor::new(string.into_bytes()),
             span,
-            interrupt,
+            signals,
             ByteStreamType::String,
         )
         .with_known_size(Some(len as u64))
     }
 
     /// Create a [`ByteStream`] from a byte vector. The type of the stream is always `Binary`.
-    pub fn read_binary(bytes: Vec<u8>, span: Span, interrupt: Option<Arc<AtomicBool>>) -> Self {
+    pub fn read_binary(bytes: Vec<u8>, span: Span, signals: Signals) -> Self {
         let len = bytes.len();
-        ByteStream::read(Cursor::new(bytes), span, interrupt, ByteStreamType::Binary)
+        ByteStream::read(Cursor::new(bytes), span, signals, ByteStreamType::Binary)
             .with_known_size(Some(len as u64))
     }
 
@@ -242,11 +237,11 @@ impl ByteStream {
     ///
     /// The type is implicitly `Unknown`, as it's not typically known whether files will
     /// return text or binary.
-    pub fn file(file: File, span: Span, interrupt: Option<Arc<AtomicBool>>) -> Self {
+    pub fn file(file: File, span: Span, signals: Signals) -> Self {
         Self::new(
             ByteStreamSource::File(file),
             span,
-            interrupt,
+            signals,
             ByteStreamType::Unknown,
         )
     }
@@ -259,7 +254,7 @@ impl ByteStream {
         Self::new(
             ByteStreamSource::Child(Box::new(child)),
             span,
-            None,
+            Signals::empty(),
             ByteStreamType::Unknown,
         )
     }
@@ -271,14 +266,19 @@ impl ByteStream {
     pub fn stdin(span: Span) -> Result<Self, ShellError> {
         let stdin = os_pipe::dup_stdin().err_span(span)?;
         let source = ByteStreamSource::File(convert_file(stdin));
-        Ok(Self::new(source, span, None, ByteStreamType::Unknown))
+        Ok(Self::new(
+            source,
+            span,
+            Signals::empty(),
+            ByteStreamType::Unknown,
+        ))
     }
 
     /// Create a [`ByteStream`] from a generator function that writes data to the given buffer
     /// when called, and returns `Ok(false)` on end of stream.
     pub fn from_fn(
         span: Span,
-        interrupt: Option<Arc<AtomicBool>>,
+        signals: Signals,
         type_: ByteStreamType,
         generator: impl FnMut(&mut Vec<u8>) -> Result<bool, ShellError> + Send + 'static,
     ) -> Self {
@@ -288,7 +288,7 @@ impl ByteStream {
                 generator,
             },
             span,
-            interrupt,
+            signals,
             type_,
         )
     }
@@ -301,12 +301,7 @@ impl ByteStream {
     /// Create a new [`ByteStream`] from an [`Iterator`] of bytes slices.
     ///
     /// The returned [`ByteStream`] will have a [`ByteStreamSource`] of `Read`.
-    pub fn from_iter<I>(
-        iter: I,
-        span: Span,
-        interrupt: Option<Arc<AtomicBool>>,
-        type_: ByteStreamType,
-    ) -> Self
+    pub fn from_iter<I>(iter: I, span: Span, signals: Signals, type_: ByteStreamType) -> Self
     where
         I: IntoIterator,
         I::IntoIter: Send + 'static,
@@ -314,7 +309,7 @@ impl ByteStream {
     {
         let iter = iter.into_iter();
         let cursor = Some(Cursor::new(I::Item::default()));
-        Self::read(ReadIterator { iter, cursor }, span, interrupt, type_)
+        Self::read(ReadIterator { iter, cursor }, span, signals, type_)
     }
 
     /// Create a new [`ByteStream`] from an [`Iterator`] of [`Result`] bytes slices.
@@ -323,7 +318,7 @@ impl ByteStream {
     pub fn from_result_iter<I, T>(
         iter: I,
         span: Span,
-        interrupt: Option<Arc<AtomicBool>>,
+        signals: Signals,
         type_: ByteStreamType,
     ) -> Self
     where
@@ -333,7 +328,7 @@ impl ByteStream {
     {
         let iter = iter.into_iter();
         let cursor = Some(Cursor::new(T::default()));
-        Self::read(ReadResultIterator { iter, cursor }, span, interrupt, type_)
+        Self::read(ReadResultIterator { iter, cursor }, span, signals, type_)
     }
 
     /// Set the known size, in number of bytes, of the [`ByteStream`].
@@ -378,7 +373,7 @@ impl ByteStream {
         Some(Reader {
             reader: BufReader::new(reader),
             span: self.span,
-            ctrlc: self.ctrlc,
+            signals: self.signals,
         })
     }
 
@@ -394,7 +389,7 @@ impl ByteStream {
         Some(Lines {
             reader: BufReader::new(reader),
             span: self.span,
-            ctrlc: self.ctrlc,
+            signals: self.signals,
         })
     }
 
@@ -415,7 +410,7 @@ impl ByteStream {
     /// then the stream is considered empty and `None` will be returned.
     pub fn chunks(self) -> Option<Chunks> {
         let reader = self.stream.reader()?;
-        Some(Chunks::new(reader, self.span, self.ctrlc, self.type_))
+        Some(Chunks::new(reader, self.span, self.signals, self.type_))
     }
 
     /// Convert the [`ByteStream`] into its inner [`ByteStreamSource`].
@@ -552,7 +547,7 @@ impl ByteStream {
     pub fn drain(self) -> Result<Option<ExitStatus>, ShellError> {
         match self.stream {
             ByteStreamSource::Read(read) => {
-                copy_with_interrupt(read, io::sink(), self.span, self.ctrlc.as_deref())?;
+                copy_with_signals(read, io::sink(), self.span, &self.signals)?;
                 Ok(None)
             }
             ByteStreamSource::File(_) => Ok(None),
@@ -578,14 +573,14 @@ impl ByteStream {
     /// then the [`ExitStatus`] of the [`ChildProcess`] is returned.
     pub fn write_to(self, dest: impl Write) -> Result<Option<ExitStatus>, ShellError> {
         let span = self.span;
-        let ctrlc = self.ctrlc.as_deref();
+        let signals = &self.signals;
         match self.stream {
             ByteStreamSource::Read(read) => {
-                copy_with_interrupt(read, dest, span, ctrlc)?;
+                copy_with_signals(read, dest, span, signals)?;
                 Ok(None)
             }
             ByteStreamSource::File(file) => {
-                copy_with_interrupt(file, dest, span, ctrlc)?;
+                copy_with_signals(file, dest, span, signals)?;
                 Ok(None)
             }
             ByteStreamSource::Child(mut child) => {
@@ -597,10 +592,10 @@ impl ByteStream {
                 if let Some(stdout) = child.stdout.take() {
                     match stdout {
                         ChildPipe::Pipe(pipe) => {
-                            copy_with_interrupt(pipe, dest, span, ctrlc)?;
+                            copy_with_signals(pipe, dest, span, signals)?;
                         }
                         ChildPipe::Tee(tee) => {
-                            copy_with_interrupt(tee, dest, span, ctrlc)?;
+                            copy_with_signals(tee, dest, span, signals)?;
                         }
                     }
                 }
@@ -615,21 +610,21 @@ impl ByteStream {
         stderr: &OutDest,
     ) -> Result<Option<ExitStatus>, ShellError> {
         let span = self.span;
-        let ctrlc = self.ctrlc.as_deref();
+        let signals = &self.signals;
 
         match self.stream {
             ByteStreamSource::Read(read) => {
-                write_to_out_dest(read, stdout, true, span, ctrlc)?;
+                write_to_out_dest(read, stdout, true, span, signals)?;
                 Ok(None)
             }
             ByteStreamSource::File(file) => {
                 match stdout {
                     OutDest::Pipe | OutDest::Capture | OutDest::Null => {}
                     OutDest::Inherit => {
-                        copy_with_interrupt(file, io::stdout(), span, ctrlc)?;
+                        copy_with_signals(file, io::stdout(), span, signals)?;
                     }
                     OutDest::File(f) => {
-                        copy_with_interrupt(file, f.as_ref(), span, ctrlc)?;
+                        copy_with_signals(file, f.as_ref(), span, signals)?;
                     }
                 }
                 Ok(None)
@@ -643,20 +638,20 @@ impl ByteStream {
                                 .name("stderr writer".into())
                                 .spawn_scoped(s, || match err {
                                     ChildPipe::Pipe(pipe) => {
-                                        write_to_out_dest(pipe, stderr, false, span, ctrlc)
+                                        write_to_out_dest(pipe, stderr, false, span, signals)
                                     }
                                     ChildPipe::Tee(tee) => {
-                                        write_to_out_dest(tee, stderr, false, span, ctrlc)
+                                        write_to_out_dest(tee, stderr, false, span, signals)
                                     }
                                 })
                                 .err_span(span);
 
                             match out {
                                 ChildPipe::Pipe(pipe) => {
-                                    write_to_out_dest(pipe, stdout, true, span, ctrlc)
+                                    write_to_out_dest(pipe, stdout, true, span, signals)
                                 }
                                 ChildPipe::Tee(tee) => {
-                                    write_to_out_dest(tee, stdout, true, span, ctrlc)
+                                    write_to_out_dest(tee, stdout, true, span, signals)
                                 }
                             }?;
 
@@ -672,11 +667,11 @@ impl ByteStream {
                     }
                     (Some(out), None) => {
                         // single output stream, we can consume directly
-                        write_to_out_dest(out, stdout, true, span, ctrlc)?;
+                        write_to_out_dest(out, stdout, true, span, signals)?;
                     }
                     (None, Some(err)) => {
                         // single output stream, we can consume directly
-                        write_to_out_dest(err, stderr, false, span, ctrlc)?;
+                        write_to_out_dest(err, stderr, false, span, signals)?;
                     }
                     (None, None) => {}
                 }
@@ -749,7 +744,7 @@ where
 pub struct Reader {
     reader: BufReader<SourceReader>,
     span: Span,
-    ctrlc: Option<Arc<AtomicBool>>,
+    signals: Signals,
 }
 
 impl Reader {
@@ -760,14 +755,8 @@ impl Reader {
 
 impl Read for Reader {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        if nu_utils::ctrl_c::was_pressed(&self.ctrlc) {
-            Err(ShellError::InterruptedByUser {
-                span: Some(self.span),
-            }
-            .into())
-        } else {
-            self.reader.read(buf)
-        }
+        self.signals.check(self.span)?;
+        self.reader.read(buf)
     }
 }
 
@@ -784,7 +773,7 @@ impl BufRead for Reader {
 pub struct Lines {
     reader: BufReader<SourceReader>,
     span: Span,
-    ctrlc: Option<Arc<AtomicBool>>,
+    signals: Signals,
 }
 
 impl Lines {
@@ -797,7 +786,7 @@ impl Iterator for Lines {
     type Item = Result<String, ShellError>;
 
     fn next(&mut self) -> Option<Self::Item> {
-        if nu_utils::ctrl_c::was_pressed(&self.ctrlc) {
+        if self.signals.interrupted() {
             None
         } else {
             let mut buf = Vec::new();
@@ -826,23 +815,18 @@ pub struct Chunks {
     pos: u64,
     error: bool,
     span: Span,
-    ctrlc: Option<Arc<AtomicBool>>,
+    signals: Signals,
     type_: ByteStreamType,
 }
 
 impl Chunks {
-    fn new(
-        reader: SourceReader,
-        span: Span,
-        ctrlc: Option<Arc<AtomicBool>>,
-        type_: ByteStreamType,
-    ) -> Self {
+    fn new(reader: SourceReader, span: Span, signals: Signals, type_: ByteStreamType) -> Self {
         Self {
             reader: BufReader::new(reader),
             pos: 0,
             error: false,
             span,
-            ctrlc,
+            signals,
             type_,
         }
     }
@@ -922,7 +906,7 @@ impl Iterator for Chunks {
     type Item = Result<Value, ShellError>;
 
     fn next(&mut self) -> Option<Self::Item> {
-        if self.error || nu_utils::ctrl_c::was_pressed(&self.ctrlc) {
+        if self.error || self.signals.interrupted() {
             None
         } else {
             match self.type_ {
@@ -988,14 +972,14 @@ fn write_to_out_dest(
     stream: &OutDest,
     stdout: bool,
     span: Span,
-    ctrlc: Option<&AtomicBool>,
+    signals: &Signals,
 ) -> Result<(), ShellError> {
     match stream {
         OutDest::Pipe | OutDest::Capture => return Ok(()),
-        OutDest::Null => copy_with_interrupt(read, io::sink(), span, ctrlc),
-        OutDest::Inherit if stdout => copy_with_interrupt(read, io::stdout(), span, ctrlc),
-        OutDest::Inherit => copy_with_interrupt(read, io::stderr(), span, ctrlc),
-        OutDest::File(file) => copy_with_interrupt(read, file.as_ref(), span, ctrlc),
+        OutDest::Null => copy_with_signals(read, io::sink(), span, signals),
+        OutDest::Inherit if stdout => copy_with_signals(read, io::stdout(), span, signals),
+        OutDest::Inherit => copy_with_signals(read, io::stderr(), span, signals),
+        OutDest::File(file) => copy_with_signals(read, file.as_ref(), span, signals),
     }?;
     Ok(())
 }
@@ -1012,28 +996,13 @@ pub(crate) fn convert_file<T: From<OwnedHandle>>(file: impl Into<OwnedHandle>) -
 
 const DEFAULT_BUF_SIZE: usize = 8192;
 
-pub fn copy_with_interrupt(
+pub fn copy_with_signals(
     mut reader: impl Read,
     mut writer: impl Write,
     span: Span,
-    interrupt: Option<&AtomicBool>,
+    signals: &Signals,
 ) -> Result<u64, ShellError> {
-    if let Some(interrupt) = interrupt {
-        // #[cfg(any(target_os = "linux", target_os = "android"))]
-        // {
-        //     return crate::sys::kernel_copy::copy_spec(reader, writer);
-        // }
-        match generic_copy(&mut reader, &mut writer, span, interrupt) {
-            Ok(len) => {
-                writer.flush().err_span(span)?;
-                Ok(len)
-            }
-            Err(err) => {
-                let _ = writer.flush();
-                Err(err)
-            }
-        }
-    } else {
+    if signals.is_empty() {
         match io::copy(&mut reader, &mut writer) {
             Ok(n) => {
                 writer.flush().err_span(span)?;
@@ -1044,6 +1013,21 @@ pub fn copy_with_interrupt(
                 Err(err.into_spanned(span).into())
             }
         }
+    } else {
+        // #[cfg(any(target_os = "linux", target_os = "android"))]
+        // {
+        //     return crate::sys::kernel_copy::copy_spec(reader, writer);
+        // }
+        match generic_copy(&mut reader, &mut writer, span, signals) {
+            Ok(len) => {
+                writer.flush().err_span(span)?;
+                Ok(len)
+            }
+            Err(err) => {
+                let _ = writer.flush();
+                Err(err)
+            }
+        }
     }
 }
 
@@ -1052,14 +1036,12 @@ fn generic_copy(
     mut reader: impl Read,
     mut writer: impl Write,
     span: Span,
-    interrupt: &AtomicBool,
+    signals: &Signals,
 ) -> Result<u64, ShellError> {
     let buf = &mut [0; DEFAULT_BUF_SIZE];
     let mut len = 0;
     loop {
-        if interrupt.load(Ordering::Relaxed) {
-            return Err(ShellError::InterruptedByUser { span: Some(span) });
-        }
+        signals.check(span)?;
         let n = match reader.read(buf) {
             Ok(0) => break,
             Ok(n) => n,
@@ -1134,7 +1116,7 @@ mod tests {
         Chunks::new(
             SourceReader::Read(Box::new(reader)),
             Span::test_data(),
-            None,
+            Signals::empty(),
             type_,
         )
     }
diff --git a/crates/nu-protocol/src/pipeline/list_stream.rs b/crates/nu-protocol/src/pipeline/list_stream.rs
index 117c264219..997cc3f77b 100644
--- a/crates/nu-protocol/src/pipeline/list_stream.rs
+++ b/crates/nu-protocol/src/pipeline/list_stream.rs
@@ -1,8 +1,5 @@
-use crate::{Config, PipelineData, ShellError, Span, Value};
-use std::{
-    fmt::Debug,
-    sync::{atomic::AtomicBool, Arc},
-};
+use crate::{Config, PipelineData, ShellError, Signals, Span, Value};
+use std::fmt::Debug;
 
 pub type ValueIterator = Box<dyn Iterator<Item = Value> + Send + 'static>;
 
@@ -21,10 +18,10 @@ impl ListStream {
     pub fn new(
         iter: impl Iterator<Item = Value> + Send + 'static,
         span: Span,
-        interrupt: Option<Arc<AtomicBool>>,
+        signals: Signals,
     ) -> Self {
         Self {
-            stream: Box::new(Interrupt::new(iter, interrupt)),
+            stream: Box::new(InterruptIter::new(iter, signals)),
             span,
         }
     }
@@ -69,10 +66,10 @@ impl ListStream {
     /// E.g., `take`, `filter`, `step_by`, and more.
     ///
     /// ```
-    /// use nu_protocol::{ListStream, Span, Value};
+    /// use nu_protocol::{ListStream, Signals, Span, Value};
     ///
     /// let span = Span::unknown();
-    /// let stream = ListStream::new(std::iter::repeat(Value::int(0, span)), span, None);
+    /// let stream = ListStream::new(std::iter::repeat(Value::int(0, span)), span, Signals::empty());
     /// let new_stream = stream.modify(|iter| iter.take(100));
     /// ```
     pub fn modify<I>(self, f: impl FnOnce(ValueIterator) -> I) -> Self
@@ -128,22 +125,22 @@ impl Iterator for IntoIter {
     }
 }
 
-struct Interrupt<I: Iterator> {
+struct InterruptIter<I: Iterator> {
     iter: I,
-    interrupt: Option<Arc<AtomicBool>>,
+    signals: Signals,
 }
 
-impl<I: Iterator> Interrupt<I> {
-    fn new(iter: I, interrupt: Option<Arc<AtomicBool>>) -> Self {
-        Self { iter, interrupt }
+impl<I: Iterator> InterruptIter<I> {
+    fn new(iter: I, signals: Signals) -> Self {
+        Self { iter, signals }
     }
 }
 
-impl<I: Iterator> Iterator for Interrupt<I> {
+impl<I: Iterator> Iterator for InterruptIter<I> {
     type Item = <I as Iterator>::Item;
 
     fn next(&mut self) -> Option<Self::Item> {
-        if nu_utils::ctrl_c::was_pressed(&self.interrupt) {
+        if self.signals.interrupted() {
             None
         } else {
             self.iter.next()
diff --git a/crates/nu-protocol/src/pipeline/mod.rs b/crates/nu-protocol/src/pipeline/mod.rs
index a018a084ed..525806425d 100644
--- a/crates/nu-protocol/src/pipeline/mod.rs
+++ b/crates/nu-protocol/src/pipeline/mod.rs
@@ -3,9 +3,11 @@ pub mod list_stream;
 mod metadata;
 mod out_dest;
 mod pipeline_data;
+mod signals;
 
 pub use byte_stream::*;
 pub use list_stream::*;
 pub use metadata::*;
 pub use out_dest::*;
 pub use pipeline_data::*;
+pub use signals::*;
diff --git a/crates/nu-protocol/src/pipeline/pipeline_data.rs b/crates/nu-protocol/src/pipeline/pipeline_data.rs
index c0c0bd1c33..a546e90191 100644
--- a/crates/nu-protocol/src/pipeline/pipeline_data.rs
+++ b/crates/nu-protocol/src/pipeline/pipeline_data.rs
@@ -3,13 +3,10 @@ use crate::{
     engine::{EngineState, Stack},
     process::{ChildPipe, ChildProcess, ExitStatus},
     ByteStream, ByteStreamType, Config, ErrSpan, ListStream, OutDest, PipelineMetadata, Range,
-    ShellError, Span, Type, Value,
+    ShellError, Signals, Span, Type, Value,
 };
 use nu_utils::{stderr_write_all_and_flush, stdout_write_all_and_flush};
-use std::{
-    io::{Cursor, Read, Write},
-    sync::{atomic::AtomicBool, Arc},
-};
+use std::io::{Cursor, Read, Write};
 
 const LINE_ENDING_PATTERN: &[char] = &['\r', '\n'];
 
@@ -196,19 +193,23 @@ impl PipelineData {
                 let val_span = value.span();
                 match value {
                     Value::List { vals, .. } => PipelineIteratorInner::ListStream(
-                        ListStream::new(vals.into_iter(), val_span, None).into_iter(),
+                        ListStream::new(vals.into_iter(), val_span, Signals::empty()).into_iter(),
                     ),
                     Value::Binary { val, .. } => PipelineIteratorInner::ListStream(
                         ListStream::new(
                             val.into_iter().map(move |x| Value::int(x as i64, val_span)),
                             val_span,
-                            None,
+                            Signals::empty(),
                         )
                         .into_iter(),
                     ),
                     Value::Range { val, .. } => PipelineIteratorInner::ListStream(
-                        ListStream::new(val.into_range_iter(val_span, None), val_span, None)
-                            .into_iter(),
+                        ListStream::new(
+                            val.into_range_iter(val_span, Signals::empty()),
+                            val_span,
+                            Signals::empty(),
+                        )
+                        .into_iter(),
                     ),
                     // Propagate errors by explicitly matching them before the final case.
                     Value::Error { error, .. } => return Err(*error),
@@ -301,11 +302,7 @@ impl PipelineData {
     }
 
     /// Simplified mapper to help with simple values also. For full iterator support use `.into_iter()` instead
-    pub fn map<F>(
-        self,
-        mut f: F,
-        ctrlc: Option<Arc<AtomicBool>>,
-    ) -> Result<PipelineData, ShellError>
+    pub fn map<F>(self, mut f: F, signals: &Signals) -> Result<PipelineData, ShellError>
     where
         Self: Sized,
         F: FnMut(Value) -> Value + 'static + Send,
@@ -314,13 +311,14 @@ impl PipelineData {
             PipelineData::Value(value, metadata) => {
                 let span = value.span();
                 let pipeline = match value {
-                    Value::List { vals, .. } => {
-                        vals.into_iter().map(f).into_pipeline_data(span, ctrlc)
-                    }
-                    Value::Range { val, .. } => val
-                        .into_range_iter(span, ctrlc.clone())
+                    Value::List { vals, .. } => vals
+                        .into_iter()
                         .map(f)
-                        .into_pipeline_data(span, ctrlc),
+                        .into_pipeline_data(span, signals.clone()),
+                    Value::Range { val, .. } => val
+                        .into_range_iter(span, Signals::empty())
+                        .map(f)
+                        .into_pipeline_data(span, signals.clone()),
                     value => match f(value) {
                         Value::Error { error, .. } => return Err(*error),
                         v => v.into_pipeline_data(),
@@ -339,11 +337,7 @@ impl PipelineData {
     }
 
     /// Simplified flatmapper. For full iterator support use `.into_iter()` instead
-    pub fn flat_map<U, F>(
-        self,
-        mut f: F,
-        ctrlc: Option<Arc<AtomicBool>>,
-    ) -> Result<PipelineData, ShellError>
+    pub fn flat_map<U, F>(self, mut f: F, signals: &Signals) -> Result<PipelineData, ShellError>
     where
         Self: Sized,
         U: IntoIterator<Item = Value> + 'static,
@@ -355,14 +349,17 @@ impl PipelineData {
             PipelineData::Value(value, metadata) => {
                 let span = value.span();
                 let pipeline = match value {
-                    Value::List { vals, .. } => {
-                        vals.into_iter().flat_map(f).into_pipeline_data(span, ctrlc)
-                    }
-                    Value::Range { val, .. } => val
-                        .into_range_iter(span, ctrlc.clone())
+                    Value::List { vals, .. } => vals
+                        .into_iter()
                         .flat_map(f)
-                        .into_pipeline_data(span, ctrlc),
-                    value => f(value).into_iter().into_pipeline_data(span, ctrlc),
+                        .into_pipeline_data(span, signals.clone()),
+                    Value::Range { val, .. } => val
+                        .into_range_iter(span, Signals::empty())
+                        .flat_map(f)
+                        .into_pipeline_data(span, signals.clone()),
+                    value => f(value)
+                        .into_iter()
+                        .into_pipeline_data(span, signals.clone()),
                 };
                 Ok(pipeline.set_metadata(metadata))
             }
@@ -380,18 +377,16 @@ impl PipelineData {
                     }
                     Err(err) => f(Value::binary(err.into_bytes(), span)),
                 };
-                Ok(iter
-                    .into_iter()
-                    .into_pipeline_data_with_metadata(span, ctrlc, metadata))
+                Ok(iter.into_iter().into_pipeline_data_with_metadata(
+                    span,
+                    signals.clone(),
+                    metadata,
+                ))
             }
         }
     }
 
-    pub fn filter<F>(
-        self,
-        mut f: F,
-        ctrlc: Option<Arc<AtomicBool>>,
-    ) -> Result<PipelineData, ShellError>
+    pub fn filter<F>(self, mut f: F, signals: &Signals) -> Result<PipelineData, ShellError>
     where
         Self: Sized,
         F: FnMut(&Value) -> bool + 'static + Send,
@@ -401,13 +396,14 @@ impl PipelineData {
             PipelineData::Value(value, metadata) => {
                 let span = value.span();
                 let pipeline = match value {
-                    Value::List { vals, .. } => {
-                        vals.into_iter().filter(f).into_pipeline_data(span, ctrlc)
-                    }
-                    Value::Range { val, .. } => val
-                        .into_range_iter(span, ctrlc.clone())
+                    Value::List { vals, .. } => vals
+                        .into_iter()
                         .filter(f)
-                        .into_pipeline_data(span, ctrlc),
+                        .into_pipeline_data(span, signals.clone()),
+                    Value::Range { val, .. } => val
+                        .into_range_iter(span, Signals::empty())
+                        .filter(f)
+                        .into_pipeline_data(span, signals.clone()),
                     value => {
                         if f(&value) {
                             value.into_pipeline_data()
@@ -538,7 +534,8 @@ impl PipelineData {
                                 }
                             }
                         }
-                        let range_values: Vec<Value> = val.into_range_iter(span, None).collect();
+                        let range_values: Vec<Value> =
+                            val.into_range_iter(span, Signals::empty()).collect();
                         Ok(PipelineData::Value(Value::list(range_values, span), None))
                     }
                     x => Ok(PipelineData::Value(x, metadata)),
@@ -638,10 +635,15 @@ impl IntoIterator for PipelineData {
                 let span = value.span();
                 match value {
                     Value::List { vals, .. } => PipelineIteratorInner::ListStream(
-                        ListStream::new(vals.into_iter(), span, None).into_iter(),
+                        ListStream::new(vals.into_iter(), span, Signals::empty()).into_iter(),
                     ),
                     Value::Range { val, .. } => PipelineIteratorInner::ListStream(
-                        ListStream::new(val.into_range_iter(span, None), span, None).into_iter(),
+                        ListStream::new(
+                            val.into_range_iter(span, Signals::empty()),
+                            span,
+                            Signals::empty(),
+                        )
+                        .into_iter(),
                     ),
                     x => PipelineIteratorInner::Value(x),
                 }
@@ -703,11 +705,11 @@ where
 }
 
 pub trait IntoInterruptiblePipelineData {
-    fn into_pipeline_data(self, span: Span, ctrlc: Option<Arc<AtomicBool>>) -> PipelineData;
+    fn into_pipeline_data(self, span: Span, signals: Signals) -> PipelineData;
     fn into_pipeline_data_with_metadata(
         self,
         span: Span,
-        ctrlc: Option<Arc<AtomicBool>>,
+        signals: Signals,
         metadata: impl Into<Option<PipelineMetadata>>,
     ) -> PipelineData;
 }
@@ -718,18 +720,18 @@ where
     I::IntoIter: Send + 'static,
     <I::IntoIter as Iterator>::Item: Into<Value>,
 {
-    fn into_pipeline_data(self, span: Span, ctrlc: Option<Arc<AtomicBool>>) -> PipelineData {
-        ListStream::new(self.into_iter().map(Into::into), span, ctrlc).into()
+    fn into_pipeline_data(self, span: Span, signals: Signals) -> PipelineData {
+        ListStream::new(self.into_iter().map(Into::into), span, signals).into()
     }
 
     fn into_pipeline_data_with_metadata(
         self,
         span: Span,
-        ctrlc: Option<Arc<AtomicBool>>,
+        signals: Signals,
         metadata: impl Into<Option<PipelineMetadata>>,
     ) -> PipelineData {
         PipelineData::ListStream(
-            ListStream::new(self.into_iter().map(Into::into), span, ctrlc),
+            ListStream::new(self.into_iter().map(Into::into), span, signals),
             metadata.into(),
         )
     }
diff --git a/crates/nu-protocol/src/pipeline/signals.rs b/crates/nu-protocol/src/pipeline/signals.rs
new file mode 100644
index 0000000000..06ce583c82
--- /dev/null
+++ b/crates/nu-protocol/src/pipeline/signals.rs
@@ -0,0 +1,76 @@
+use crate::{ShellError, Span};
+use std::sync::{
+    atomic::{AtomicBool, Ordering},
+    Arc,
+};
+
+/// Used to check for signals to suspend or terminate the execution of Nushell code.
+///
+/// For now, this struct only supports interruption (ctrl+c or SIGINT).
+#[derive(Debug, Clone)]
+pub struct Signals {
+    signals: Option<Arc<AtomicBool>>,
+}
+
+impl Signals {
+    /// A [`Signals`] that is not hooked up to any event/signals source.
+    ///
+    /// So, this [`Signals`] will never be interrupted.
+    pub const EMPTY: Self = Signals { signals: None };
+
+    /// Create a new [`Signals`] with `ctrlc` as the interrupt source.
+    ///
+    /// Once `ctrlc` is set to `true`, [`check`](Self::check) will error
+    /// and [`interrupted`](Self::interrupted) will return `true`.
+    pub fn new(ctrlc: Arc<AtomicBool>) -> Self {
+        Self {
+            signals: Some(ctrlc),
+        }
+    }
+
+    /// Create a [`Signals`] that is not hooked up to any event/signals source.
+    ///
+    /// So, the returned [`Signals`] will never be interrupted.
+    ///
+    /// This should only be used in test code, or if the stream/iterator being created
+    /// already has an underlying [`Signals`].
+    pub const fn empty() -> Self {
+        Self::EMPTY
+    }
+
+    /// Returns an `Err` if an interrupt has been triggered.
+    ///
+    /// Otherwise, returns `Ok`.
+    #[inline]
+    pub fn check(&self, span: Span) -> Result<(), ShellError> {
+        #[inline]
+        #[cold]
+        fn interrupt_error(span: Span) -> Result<(), ShellError> {
+            Err(ShellError::Interrupted { span })
+        }
+
+        if self.interrupted() {
+            interrupt_error(span)
+        } else {
+            Ok(())
+        }
+    }
+
+    /// Returns whether an interrupt has been triggered.
+    #[inline]
+    pub fn interrupted(&self) -> bool {
+        self.signals
+            .as_deref()
+            .is_some_and(|b| b.load(Ordering::Relaxed))
+    }
+
+    pub(crate) fn is_empty(&self) -> bool {
+        self.signals.is_none()
+    }
+
+    pub(crate) fn reset(&self) {
+        if let Some(signals) = &self.signals {
+            signals.store(false, Ordering::Relaxed);
+        }
+    }
+}
diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs
index df030ad3e9..fc618d6341 100644
--- a/crates/nu-protocol/src/value/mod.rs
+++ b/crates/nu-protocol/src/value/mod.rs
@@ -23,7 +23,7 @@ use crate::{
     ast::{Bits, Boolean, CellPath, Comparison, Math, Operator, PathMember},
     did_you_mean,
     engine::{Closure, EngineState},
-    Config, ShellError, Span, Type,
+    Config, ShellError, Signals, Span, Type,
 };
 use chrono::{DateTime, Datelike, FixedOffset, Locale, TimeZone};
 use chrono_humanize::HumanTime;
@@ -1017,8 +1017,9 @@ impl Value {
                             }
                         }
                         Value::Range { ref val, .. } => {
-                            if let Some(item) =
-                                val.into_range_iter(current.span(), None).nth(*count)
+                            if let Some(item) = val
+                                .into_range_iter(current.span(), Signals::empty())
+                                .nth(*count)
                             {
                                 current = item;
                             } else if *optional {
diff --git a/crates/nu-protocol/src/value/range.rs b/crates/nu-protocol/src/value/range.rs
index 5b1fa32ec7..6ec7ce16ad 100644
--- a/crates/nu-protocol/src/value/range.rs
+++ b/crates/nu-protocol/src/value/range.rs
@@ -1,25 +1,13 @@
 //! A Range is an iterator over integers or floats.
 
+use crate::{ast::RangeInclusion, ShellError, Signals, Span, Value};
 use serde::{Deserialize, Serialize};
-use std::{
-    cmp::Ordering,
-    fmt::Display,
-    sync::{atomic::AtomicBool, Arc},
-};
-
-use crate::{ast::RangeInclusion, ShellError, Span, Value};
+use std::{cmp::Ordering, fmt::Display};
 
 mod int_range {
-    use std::{
-        cmp::Ordering,
-        fmt::Display,
-        ops::Bound,
-        sync::{atomic::AtomicBool, Arc},
-    };
-
+    use crate::{ast::RangeInclusion, ShellError, Signals, Span, Value};
     use serde::{Deserialize, Serialize};
-
-    use crate::{ast::RangeInclusion, ShellError, Span, Value};
+    use std::{cmp::Ordering, fmt::Display, ops::Bound};
 
     #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
     pub struct IntRange {
@@ -123,12 +111,12 @@ mod int_range {
             }
         }
 
-        pub fn into_range_iter(self, ctrlc: Option<Arc<AtomicBool>>) -> Iter {
+        pub fn into_range_iter(self, signals: Signals) -> Iter {
             Iter {
                 current: Some(self.start),
                 step: self.step,
                 end: self.end,
-                ctrlc,
+                signals,
             }
         }
     }
@@ -202,7 +190,7 @@ mod int_range {
         current: Option<i64>,
         step: i64,
         end: Bound<i64>,
-        ctrlc: Option<Arc<AtomicBool>>,
+        signals: Signals,
     }
 
     impl Iterator for Iter {
@@ -218,7 +206,7 @@ mod int_range {
                     (_, Bound::Unbounded) => true, // will stop once integer overflows
                 };
 
-                if not_end && !nu_utils::ctrl_c::was_pressed(&self.ctrlc) {
+                if not_end && !self.signals.interrupted() {
                     self.current = current.checked_add(self.step);
                     Some(current)
                 } else {
@@ -233,16 +221,9 @@ mod int_range {
 }
 
 mod float_range {
-    use std::{
-        cmp::Ordering,
-        fmt::Display,
-        ops::Bound,
-        sync::{atomic::AtomicBool, Arc},
-    };
-
+    use crate::{ast::RangeInclusion, IntRange, Range, ShellError, Signals, Span, Value};
     use serde::{Deserialize, Serialize};
-
-    use crate::{ast::RangeInclusion, IntRange, Range, ShellError, Span, Value};
+    use std::{cmp::Ordering, fmt::Display, ops::Bound};
 
     #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
     pub struct FloatRange {
@@ -365,13 +346,13 @@ mod float_range {
             }
         }
 
-        pub fn into_range_iter(self, ctrlc: Option<Arc<AtomicBool>>) -> Iter {
+        pub fn into_range_iter(self, signals: Signals) -> Iter {
             Iter {
                 start: self.start,
                 step: self.step,
                 end: self.end,
                 iter: Some(0),
-                ctrlc,
+                signals,
             }
         }
     }
@@ -477,7 +458,7 @@ mod float_range {
         step: f64,
         end: Bound<f64>,
         iter: Option<u64>,
-        ctrlc: Option<Arc<AtomicBool>>,
+        signals: Signals,
     }
 
     impl Iterator for Iter {
@@ -495,7 +476,7 @@ mod float_range {
                     (_, Bound::Unbounded) => current.is_finite(),
                 };
 
-                if not_end && !nu_utils::ctrl_c::was_pressed(&self.ctrlc) {
+                if not_end && !self.signals.interrupted() {
                     self.iter = iter.checked_add(1);
                     Some(current)
                 } else {
@@ -549,10 +530,10 @@ impl Range {
         }
     }
 
-    pub fn into_range_iter(self, span: Span, ctrlc: Option<Arc<AtomicBool>>) -> Iter {
+    pub fn into_range_iter(self, span: Span, signals: Signals) -> Iter {
         match self {
-            Range::IntRange(range) => Iter::IntIter(range.into_range_iter(ctrlc), span),
-            Range::FloatRange(range) => Iter::FloatIter(range.into_range_iter(ctrlc), span),
+            Range::IntRange(range) => Iter::IntIter(range.into_range_iter(signals), span),
+            Range::FloatRange(range) => Iter::FloatIter(range.into_range_iter(signals), span),
         }
     }
 }
diff --git a/crates/nu-table/src/types/expanded.rs b/crates/nu-table/src/types/expanded.rs
index 9472cc2846..668e5ea25c 100644
--- a/crates/nu-table/src/types/expanded.rs
+++ b/crates/nu-table/src/types/expanded.rs
@@ -102,9 +102,7 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
         }
 
         for (row, item) in input.iter().enumerate() {
-            if nu_utils::ctrl_c::was_pressed(&cfg.opts.ctrlc) {
-                return Ok(None);
-            }
+            cfg.opts.signals.check(cfg.opts.span)?;
 
             if let Value::Error { error, .. } = item {
                 return Err(*error.clone());
@@ -143,9 +141,7 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
         }
 
         for (row, item) in input.iter().enumerate() {
-            if nu_utils::ctrl_c::was_pressed(&cfg.opts.ctrlc) {
-                return Ok(None);
-            }
+            cfg.opts.signals.check(cfg.opts.span)?;
 
             if let Value::Error { error, .. } = item {
                 return Err(*error.clone());
@@ -230,9 +226,7 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
         }
 
         for (row, item) in input.iter().enumerate() {
-            if nu_utils::ctrl_c::was_pressed(&cfg.opts.ctrlc) {
-                return Ok(None);
-            }
+            cfg.opts.signals.check(cfg.opts.span)?;
 
             if let Value::Error { error, .. } = item {
                 return Err(*error.clone());
@@ -353,9 +347,7 @@ fn expanded_table_kv(record: &Record, cfg: Cfg<'_>) -> StringResult {
 
     let mut data = Vec::with_capacity(record.len());
     for (key, value) in record {
-        if nu_utils::ctrl_c::was_pressed(&cfg.opts.ctrlc) {
-            return Ok(None);
-        }
+        cfg.opts.signals.check(cfg.opts.span)?;
 
         let (value, is_expanded) = match expand_table_value(value, value_width, &cfg)? {
             Some(val) => val,
diff --git a/crates/nu-table/src/types/general.rs b/crates/nu-table/src/types/general.rs
index 4a6cd302e8..66048267d7 100644
--- a/crates/nu-table/src/types/general.rs
+++ b/crates/nu-table/src/types/general.rs
@@ -43,9 +43,7 @@ fn create_table(input: &[Value], opts: TableOpts<'_>) -> Result<Option<String>,
 fn kv_table(record: &Record, opts: TableOpts<'_>) -> StringResult {
     let mut data = vec![Vec::with_capacity(2); record.len()];
     for ((column, value), row) in record.iter().zip(data.iter_mut()) {
-        if nu_utils::ctrl_c::was_pressed(&opts.ctrlc) {
-            return Ok(None);
-        }
+        opts.signals.check(opts.span)?;
 
         let value = nu_value_to_string_colored(value, opts.config, opts.style_computer);
 
@@ -123,9 +121,7 @@ fn to_table_with_header(
     }
 
     for (row, item) in input.iter().enumerate() {
-        if nu_utils::ctrl_c::was_pressed(&opts.ctrlc) {
-            return Ok(None);
-        }
+        opts.signals.check(opts.span)?;
 
         if let Value::Error { error, .. } = item {
             return Err(*error.clone());
@@ -158,9 +154,7 @@ fn to_table_with_no_header(
     table.set_index_style(get_index_style(opts.style_computer));
 
     for (row, item) in input.iter().enumerate() {
-        if nu_utils::ctrl_c::was_pressed(&opts.ctrlc) {
-            return Ok(None);
-        }
+        opts.signals.check(opts.span)?;
 
         if let Value::Error { error, .. } = item {
             return Err(*error.clone());
diff --git a/crates/nu-table/src/types/mod.rs b/crates/nu-table/src/types/mod.rs
index 10289c3b81..163e4b0c81 100644
--- a/crates/nu-table/src/types/mod.rs
+++ b/crates/nu-table/src/types/mod.rs
@@ -8,8 +8,7 @@ pub use general::JustTable;
 
 use crate::{common::INDEX_COLUMN_NAME, NuTable};
 use nu_color_config::StyleComputer;
-use nu_protocol::{Config, Span, TableIndexMode, TableMode};
-use std::sync::{atomic::AtomicBool, Arc};
+use nu_protocol::{Config, Signals, Span, TableIndexMode, TableMode};
 
 pub struct TableOutput {
     pub table: NuTable,
@@ -29,7 +28,7 @@ impl TableOutput {
 
 #[derive(Debug, Clone)]
 pub struct TableOpts<'a> {
-    ctrlc: Option<Arc<AtomicBool>>,
+    signals: &'a Signals,
     config: &'a Config,
     style_computer: &'a StyleComputer<'a>,
     span: Span,
@@ -45,7 +44,7 @@ impl<'a> TableOpts<'a> {
     pub fn new(
         config: &'a Config,
         style_computer: &'a StyleComputer<'a>,
-        ctrlc: Option<Arc<AtomicBool>>,
+        signals: &'a Signals,
         span: Span,
         width: usize,
         indent: (usize, usize),
@@ -54,7 +53,7 @@ impl<'a> TableOpts<'a> {
         index_remove: bool,
     ) -> Self {
         Self {
-            ctrlc,
+            signals,
             config,
             style_computer,
             span,
diff --git a/crates/nu-utils/src/ctrl_c.rs b/crates/nu-utils/src/ctrl_c.rs
deleted file mode 100644
index 72719139ad..0000000000
--- a/crates/nu-utils/src/ctrl_c.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-use std::sync::{
-    atomic::{AtomicBool, Ordering},
-    Arc,
-};
-
-/// Returns true if Nu has received a SIGINT signal / ctrl+c event
-pub fn was_pressed(ctrlc: &Option<Arc<AtomicBool>>) -> bool {
-    if let Some(ctrlc) = ctrlc {
-        ctrlc.load(Ordering::SeqCst)
-    } else {
-        false
-    }
-}
diff --git a/crates/nu-utils/src/lib.rs b/crates/nu-utils/src/lib.rs
index f1a915290b..cb834e5e0f 100644
--- a/crates/nu-utils/src/lib.rs
+++ b/crates/nu-utils/src/lib.rs
@@ -1,5 +1,4 @@
 mod casing;
-pub mod ctrl_c;
 mod deansi;
 pub mod emoji;
 pub mod filesystem;
diff --git a/crates/nu_plugin_example/src/commands/collect_bytes.rs b/crates/nu_plugin_example/src/commands/collect_bytes.rs
index 398a1de4b1..e716493785 100644
--- a/crates/nu_plugin_example/src/commands/collect_bytes.rs
+++ b/crates/nu_plugin_example/src/commands/collect_bytes.rs
@@ -1,7 +1,7 @@
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
-    ByteStream, ByteStreamType, Category, Example, LabeledError, PipelineData, Signature, Type,
-    Value,
+    ByteStream, ByteStreamType, Category, Example, LabeledError, PipelineData, Signals, Signature,
+    Type, Value,
 };
 
 use crate::ExamplePlugin;
@@ -52,7 +52,7 @@ impl PluginCommand for CollectBytes {
             ByteStream::from_result_iter(
                 input.into_iter().map(Value::coerce_into_binary),
                 call.head,
-                None,
+                Signals::empty(),
                 ByteStreamType::Unknown,
             ),
             None,
diff --git a/crates/nu_plugin_example/src/commands/generate.rs b/crates/nu_plugin_example/src/commands/generate.rs
index 9938518f4c..c039cc23d5 100644
--- a/crates/nu_plugin_example/src/commands/generate.rs
+++ b/crates/nu_plugin_example/src/commands/generate.rs
@@ -1,7 +1,7 @@
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
-    Category, Example, IntoInterruptiblePipelineData, LabeledError, PipelineData, Signature,
-    SyntaxShape, Type, Value,
+    Category, Example, IntoInterruptiblePipelineData, LabeledError, PipelineData, Signals,
+    Signature, SyntaxShape, Type, Value,
 };
 
 use crate::ExamplePlugin;
@@ -85,7 +85,7 @@ impl PluginCommand for Generate {
                 })
                 .map(|result| result.unwrap_or_else(|err| Value::error(err, head)))
         })
-        .into_pipeline_data(head, None))
+        .into_pipeline_data(head, Signals::empty()))
     }
 }
 
diff --git a/crates/nu_plugin_example/src/commands/seq.rs b/crates/nu_plugin_example/src/commands/seq.rs
index 5652b3ef9a..88254394c1 100644
--- a/crates/nu_plugin_example/src/commands/seq.rs
+++ b/crates/nu_plugin_example/src/commands/seq.rs
@@ -1,6 +1,7 @@
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
-    Category, Example, LabeledError, ListStream, PipelineData, Signature, SyntaxShape, Type, Value,
+    Category, Example, LabeledError, ListStream, PipelineData, Signals, Signature, SyntaxShape,
+    Type, Value,
 };
 
 use crate::ExamplePlugin;
@@ -54,7 +55,7 @@ impl PluginCommand for Seq {
         let first: i64 = call.req(0)?;
         let last: i64 = call.req(1)?;
         let iter = (first..=last).map(move |number| Value::int(number, head));
-        Ok(ListStream::new(iter, head, None).into())
+        Ok(ListStream::new(iter, head, Signals::empty()).into())
     }
 }
 
diff --git a/src/main.rs b/src/main.rs
index 6eb65276b9..2c0c4d5e4b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -32,11 +32,7 @@ use nu_std::load_standard_library;
 use nu_utils::perf;
 use run::{run_commands, run_file, run_repl};
 use signals::ctrlc_protection;
-use std::{
-    path::PathBuf,
-    str::FromStr,
-    sync::{atomic::AtomicBool, Arc},
-};
+use std::{path::PathBuf, str::FromStr, sync::Arc};
 
 fn get_engine_state() -> EngineState {
     let engine_state = nu_cmd_lang::create_default_context();
@@ -74,9 +70,8 @@ fn main() -> Result<()> {
         report_error_new(&engine_state, &err);
     }
 
-    let ctrlc = Arc::new(AtomicBool::new(false));
     // TODO: make this conditional in the future
-    ctrlc_protection(&mut engine_state, &ctrlc);
+    ctrlc_protection(&mut engine_state);
 
     // Begin: Default NU_LIB_DIRS, NU_PLUGIN_DIRS
     // Set default NU_LIB_DIRS and NU_PLUGIN_DIRS here before the env.nu is processed. If
@@ -397,7 +392,7 @@ fn main() -> Result<()> {
             );
         }
 
-        LanguageServer::initialize_stdio_connection()?.serve_requests(engine_state, ctrlc)?
+        LanguageServer::initialize_stdio_connection()?.serve_requests(engine_state)?
     } else if let Some(commands) = parsed_nu_cli_args.commands.clone() {
         run_commands(
             &mut engine_state,
diff --git a/src/signals.rs b/src/signals.rs
index 9247ccb095..bb3539b95e 100644
--- a/src/signals.rs
+++ b/src/signals.rs
@@ -1,17 +1,14 @@
-use nu_protocol::engine::EngineState;
+use nu_protocol::{engine::EngineState, Signals};
 use std::sync::{
     atomic::{AtomicBool, Ordering},
     Arc,
 };
 
-pub(crate) fn ctrlc_protection(engine_state: &mut EngineState, ctrlc: &Arc<AtomicBool>) {
-    let handler_ctrlc = ctrlc.clone();
-    let engine_state_ctrlc = ctrlc.clone();
-
+pub(crate) fn ctrlc_protection(engine_state: &mut EngineState) {
+    let interrupt = Arc::new(AtomicBool::new(false));
+    engine_state.set_signals(Signals::new(interrupt.clone()));
     ctrlc::set_handler(move || {
-        handler_ctrlc.store(true, Ordering::SeqCst);
+        interrupt.store(true, Ordering::Relaxed);
     })
     .expect("Error setting Ctrl-C handler");
-
-    engine_state.ctrlc = Some(engine_state_ctrlc);
 }

From e98b2ceb8c668fed6073373a445456a29115a206 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Tue, 9 Jul 2024 09:25:23 +0000
Subject: [PATCH 0195/1072] Path migration 1 (#13309)

# Description
Part 1 of replacing `std::path` types with `nu_path` types added in
#13115.
---
 crates/nu-cli/src/repl.rs                     |  1 +
 crates/nu-cmd-base/src/util.rs                |  2 +
 .../nu-command/src/env/config/config_env.rs   |  7 ++-
 crates/nu-command/src/env/config/config_nu.rs |  7 ++-
 crates/nu-command/src/filesystem/cd.rs        |  6 +-
 crates/nu-command/src/path/type.rs            |  8 +--
 crates/nu-command/src/system/exec.rs          |  2 +-
 crates/nu-command/src/system/run_external.rs  |  4 +-
 crates/nu-command/src/viewers/griddle.rs      |  6 +-
 crates/nu-engine/src/eval.rs                  |  7 ++-
 crates/nu-protocol/src/engine/engine_state.rs | 55 +++++++------------
 11 files changed, 51 insertions(+), 54 deletions(-)

diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 5b0db96741..7099b70ba8 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -336,6 +336,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
         .with_cwd(Some(
             engine_state
                 .cwd(None)
+                .map(|cwd| cwd.into_std_path_buf())
                 .unwrap_or_default()
                 .to_string_lossy()
                 .to_string(),
diff --git a/crates/nu-cmd-base/src/util.rs b/crates/nu-cmd-base/src/util.rs
index 905c990a9e..e485243877 100644
--- a/crates/nu-cmd-base/src/util.rs
+++ b/crates/nu-cmd-base/src/util.rs
@@ -1,3 +1,4 @@
+use nu_path::AbsolutePathBuf;
 use nu_protocol::{
     engine::{EngineState, Stack},
     Range, ShellError, Span, Value,
@@ -15,6 +16,7 @@ pub fn get_init_cwd() -> PathBuf {
 pub fn get_guaranteed_cwd(engine_state: &EngineState, stack: &Stack) -> PathBuf {
     engine_state
         .cwd(Some(stack))
+        .map(AbsolutePathBuf::into_std_path_buf)
         .unwrap_or(crate::util::get_init_cwd())
 }
 
diff --git a/crates/nu-command/src/env/config/config_env.rs b/crates/nu-command/src/env/config/config_env.rs
index 32bd7bba90..777b6f3aac 100644
--- a/crates/nu-command/src/env/config/config_env.rs
+++ b/crates/nu-command/src/env/config/config_env.rs
@@ -60,12 +60,13 @@ impl Command for ConfigEnv {
         let (editor_name, editor_args) = get_editor(engine_state, stack, call.head)?;
         let paths = nu_engine::env::path_str(engine_state, stack, call.head)?;
         let cwd = engine_state.cwd(Some(stack))?;
-        let editor_executable =
-            crate::which(&editor_name, &paths, &cwd).ok_or(ShellError::ExternalCommand {
+        let editor_executable = crate::which(&editor_name, &paths, cwd.as_ref()).ok_or(
+            ShellError::ExternalCommand {
                 label: format!("`{editor_name}` not found"),
                 help: "Failed to find the editor executable".into(),
                 span: call.head,
-            })?;
+            },
+        )?;
 
         let Some(env_path) = engine_state.get_config_path("env-path") else {
             return Err(ShellError::GenericError {
diff --git a/crates/nu-command/src/env/config/config_nu.rs b/crates/nu-command/src/env/config/config_nu.rs
index 08695ca5bb..80f0bbc012 100644
--- a/crates/nu-command/src/env/config/config_nu.rs
+++ b/crates/nu-command/src/env/config/config_nu.rs
@@ -64,12 +64,13 @@ impl Command for ConfigNu {
         let (editor_name, editor_args) = get_editor(engine_state, stack, call.head)?;
         let paths = nu_engine::env::path_str(engine_state, stack, call.head)?;
         let cwd = engine_state.cwd(Some(stack))?;
-        let editor_executable =
-            crate::which(&editor_name, &paths, &cwd).ok_or(ShellError::ExternalCommand {
+        let editor_executable = crate::which(&editor_name, &paths, cwd.as_ref()).ok_or(
+            ShellError::ExternalCommand {
                 label: format!("`{editor_name}` not found"),
                 help: "Failed to find the editor executable".into(),
                 span: call.head,
-            })?;
+            },
+        )?;
 
         let Some(config_path) = engine_state.get_config_path("config-path") else {
             return Err(ShellError::GenericError {
diff --git a/crates/nu-command/src/filesystem/cd.rs b/crates/nu-command/src/filesystem/cd.rs
index 4e09d900d2..23faf6f67b 100644
--- a/crates/nu-command/src/filesystem/cd.rs
+++ b/crates/nu-command/src/filesystem/cd.rs
@@ -1,5 +1,6 @@
 use nu_cmd_base::util::get_init_cwd;
 use nu_engine::command_prelude::*;
+use nu_path::AbsolutePathBuf;
 use nu_utils::filesystem::{have_permission, PermissionResult};
 
 #[derive(Clone)]
@@ -43,7 +44,10 @@ impl Command for Cd {
 
         // If getting PWD failed, default to the initial directory. This way, the
         // user can use `cd` to recover PWD to a good state.
-        let cwd = engine_state.cwd(Some(stack)).unwrap_or(get_init_cwd());
+        let cwd = engine_state
+            .cwd(Some(stack))
+            .map(AbsolutePathBuf::into_std_path_buf)
+            .unwrap_or(get_init_cwd());
 
         let path_val = {
             if let Some(path) = path_val {
diff --git a/crates/nu-command/src/path/type.rs b/crates/nu-command/src/path/type.rs
index bf66c8cb3b..010fd295ad 100644
--- a/crates/nu-command/src/path/type.rs
+++ b/crates/nu-command/src/path/type.rs
@@ -1,13 +1,11 @@
 use super::PathSubcommandArguments;
 use nu_engine::command_prelude::*;
+use nu_path::AbsolutePathBuf;
 use nu_protocol::engine::StateWorkingSet;
-use std::{
-    io,
-    path::{Path, PathBuf},
-};
+use std::{io, path::Path};
 
 struct Arguments {
-    pwd: PathBuf,
+    pwd: AbsolutePathBuf,
 }
 
 impl PathSubcommandArguments for Arguments {}
diff --git a/crates/nu-command/src/system/exec.rs b/crates/nu-command/src/system/exec.rs
index 35ab9428be..018017cfb2 100644
--- a/crates/nu-command/src/system/exec.rs
+++ b/crates/nu-command/src/system/exec.rs
@@ -39,7 +39,7 @@ On Windows based systems, Nushell will wait for the command to finish and then e
         let name: Spanned<String> = call.req(engine_state, stack, 0)?;
         let executable = {
             let paths = nu_engine::env::path_str(engine_state, stack, call.head)?;
-            let Some(executable) = crate::which(&name.item, &paths, &cwd) else {
+            let Some(executable) = crate::which(&name.item, &paths, cwd.as_ref()) else {
                 return Err(crate::command_not_found(
                     &name.item,
                     call.head,
diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index e475833747..06bc5a69ca 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -79,7 +79,7 @@ impl Command for External {
             // Determine the PATH to be used and then use `which` to find it - though this has no
             // effect if it's an absolute path already
             let paths = nu_engine::env::path_str(engine_state, stack, call.head)?;
-            let Some(executable) = which(expanded_name, &paths, &cwd) else {
+            let Some(executable) = which(expanded_name, &paths, cwd.as_ref()) else {
                 return Err(command_not_found(&name_str, call.head, engine_state, stack));
             };
             executable
@@ -228,7 +228,7 @@ pub fn eval_arguments_from_call(
             match arg {
                 // Expand globs passed to run-external
                 Value::Glob { val, no_expand, .. } if !no_expand => args.extend(
-                    expand_glob(&val, &cwd, expr.span, engine_state.signals())?
+                    expand_glob(&val, cwd.as_ref(), expr.span, engine_state.signals())?
                         .into_iter()
                         .map(|s| s.into_spanned(expr.span)),
                 ),
diff --git a/crates/nu-command/src/viewers/griddle.rs b/crates/nu-command/src/viewers/griddle.rs
index 8b39bf5649..cd73c1ca71 100644
--- a/crates/nu-command/src/viewers/griddle.rs
+++ b/crates/nu-command/src/viewers/griddle.rs
@@ -83,7 +83,7 @@ prints out the list properly."#
                         separator_param,
                         env_str,
                         use_grid_icons,
-                        &cwd,
+                        cwd.as_ref(),
                     )?)
                 } else {
                     Ok(PipelineData::empty())
@@ -101,7 +101,7 @@ prints out the list properly."#
                         separator_param,
                         env_str,
                         use_grid_icons,
-                        &cwd,
+                        cwd.as_ref(),
                     )?)
                 } else {
                     // dbg!(data);
@@ -124,7 +124,7 @@ prints out the list properly."#
                     separator_param,
                     env_str,
                     use_grid_icons,
-                    &cwd,
+                    cwd.as_ref(),
                 )?)
             }
             x => {
diff --git a/crates/nu-engine/src/eval.rs b/crates/nu-engine/src/eval.rs
index 1460dec464..b495589011 100644
--- a/crates/nu-engine/src/eval.rs
+++ b/crates/nu-engine/src/eval.rs
@@ -1,6 +1,6 @@
 #[allow(deprecated)]
 use crate::{current_dir, get_config, get_full_help};
-use nu_path::expand_path_with;
+use nu_path::{expand_path_with, AbsolutePathBuf};
 use nu_protocol::{
     ast::{
         Assignment, Block, Call, Expr, Expression, ExternalArgument, PathMember, PipelineElement,
@@ -679,7 +679,10 @@ impl Eval for EvalRuntime {
         } else if quoted {
             Ok(Value::string(path, span))
         } else {
-            let cwd = engine_state.cwd(Some(stack)).unwrap_or_default();
+            let cwd = engine_state
+                .cwd(Some(stack))
+                .map(AbsolutePathBuf::into_std_path_buf)
+                .unwrap_or_default();
             let path = expand_path_with(path, cwd, true);
 
             Ok(Value::string(path.to_string_lossy(), span))
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index e393d78d41..d45fbafb88 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -12,6 +12,7 @@ use crate::{
 };
 use fancy_regex::Regex;
 use lru::LruCache;
+use nu_path::AbsolutePathBuf;
 use std::{
     collections::HashMap,
     num::NonZeroUsize,
@@ -922,58 +923,44 @@ impl EngineState {
     ///
     /// If `stack` is supplied, also considers modifications to the working
     /// directory on the stack that have yet to be merged into the engine state.
-    pub fn cwd(&self, stack: Option<&Stack>) -> Result<PathBuf, ShellError> {
+    pub fn cwd(&self, stack: Option<&Stack>) -> Result<AbsolutePathBuf, ShellError> {
         // Helper function to create a simple generic error.
-        fn error(msg: &str, cwd: impl AsRef<Path>) -> Result<PathBuf, ShellError> {
-            Err(ShellError::GenericError {
+        fn error(msg: &str, cwd: impl AsRef<nu_path::Path>) -> ShellError {
+            ShellError::GenericError {
                 error: msg.into(),
                 msg: format!("$env.PWD = {}", cwd.as_ref().display()),
                 span: None,
                 help: Some("Use `cd` to reset $env.PWD into a good state".into()),
                 inner: vec![],
-            })
-        }
-
-        // Helper function to check if a path is a root path.
-        fn is_root(path: &Path) -> bool {
-            path.parent().is_none()
-        }
-
-        // Helper function to check if a path has trailing slashes.
-        fn has_trailing_slash(path: &Path) -> bool {
-            nu_path::components(path).last()
-                == Some(std::path::Component::Normal(std::ffi::OsStr::new("")))
+            }
         }
 
         // Retrieve $env.PWD from the stack or the engine state.
         let pwd = if let Some(stack) = stack {
             stack.get_env_var(self, "PWD")
         } else {
-            self.get_env_var("PWD").map(ToOwned::to_owned)
+            self.get_env_var("PWD").cloned()
         };
 
-        if let Some(pwd) = pwd {
-            if let Value::String { val, .. } = pwd {
-                let path = PathBuf::from(val);
+        let pwd = pwd.ok_or_else(|| error("$env.PWD not found", ""))?;
 
-                // Technically, a root path counts as "having trailing slashes", but
-                // for the purpose of PWD, a root path is acceptable.
-                if !is_root(&path) && has_trailing_slash(&path) {
-                    error("$env.PWD contains trailing slashes", path)
-                } else if !path.is_absolute() {
-                    error("$env.PWD is not an absolute path", path)
-                } else if !path.exists() {
-                    error("$env.PWD points to a non-existent directory", path)
-                } else if !path.is_dir() {
-                    error("$env.PWD points to a non-directory", path)
-                } else {
-                    Ok(path)
-                }
+        if let Value::String { val, .. } = pwd {
+            let path = AbsolutePathBuf::try_from(val)
+                .map_err(|path| error("$env.PWD is not an absolute path", path))?;
+
+            // Technically, a root path counts as "having trailing slashes", but
+            // for the purpose of PWD, a root path is acceptable.
+            if path.parent().is_some() && nu_path::has_trailing_slash(path.as_ref()) {
+                Err(error("$env.PWD contains trailing slashes", &path))
+            } else if !path.exists() {
+                Err(error("$env.PWD points to a non-existent directory", &path))
+            } else if !path.is_dir() {
+                Err(error("$env.PWD points to a non-directory", &path))
             } else {
-                error("$env.PWD is not a string", format!("{pwd:?}"))
+                Ok(path)
             }
         } else {
-            error("$env.PWD not found", "")
+            Err(error("$env.PWD is not a string", format!("{pwd:?}")))
         }
     }
 

From 1964dacaefefdf99e6c2ea8e5f907e625f872727 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Tue, 9 Jul 2024 20:11:25 +0800
Subject: [PATCH 0196/1072] Raise error when using `o>|` pipe (#13323)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
From the feedbacks from @amtoine , it's good to make nushell shows error
for `o>|` syntax.

# User-Facing Changes
## Before
```nushell
'foo' o>| print                                                                                                                                                                                                                     07/09/2024 06:44:23 AM
Error: nu::parser::parse_mismatch

  × Parse mismatch during operation.
   ╭─[entry #6:1:9]
 1 │ 'foo' o>| print
   ·         ┬
   ·         ╰── expected redirection target
```

## After
```nushell
'foo' o>| print                                                                                                                                                                                                                     07/09/2024 06:47:26 AM
Error: nu::parser::parse_mismatch

  × Parse mismatch during operation.
   ╭─[entry #1:1:7]
 1 │ 'foo' o>| print
   ·       ─┬─
   ·        ╰── expected `|`.  Redirection stdout to pipe is the same as piping directly.
   ╰────
```

# Tests + Formatting
Added one test

---------

Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
---
 crates/nu-parser/src/lex.rs               | 53 ++++++++++++++++-------
 tests/shell/pipeline/commands/internal.rs |  8 ++++
 2 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/crates/nu-parser/src/lex.rs b/crates/nu-parser/src/lex.rs
index 4639cae25d..9b52467ef4 100644
--- a/crates/nu-parser/src/lex.rs
+++ b/crates/nu-parser/src/lex.rs
@@ -580,7 +580,10 @@ fn lex_internal(
             // If the next character is non-newline whitespace, skip it.
             curr_offset += 1;
         } else {
-            let token = try_lex_special_piped_item(input, &mut curr_offset, span_offset);
+            let (token, err) = try_lex_special_piped_item(input, &mut curr_offset, span_offset);
+            if error.is_none() {
+                error = err;
+            }
             if let Some(token) = token {
                 output.push(token);
                 is_complete = false;
@@ -614,40 +617,60 @@ fn try_lex_special_piped_item(
     input: &[u8],
     curr_offset: &mut usize,
     span_offset: usize,
-) -> Option<Token> {
+) -> (Option<Token>, Option<ParseError>) {
     let c = input[*curr_offset];
     let e_pipe_len = 3;
     let eo_pipe_len = 5;
+    let o_pipe_len = 3;
     let offset = *curr_offset;
     if c == b'e' {
         // expect `e>|`
         if (offset + e_pipe_len <= input.len()) && (&input[offset..offset + e_pipe_len] == b"e>|") {
             *curr_offset += e_pipe_len;
-            return Some(Token::new(
-                TokenContents::ErrGreaterPipe,
-                Span::new(span_offset + offset, span_offset + offset + e_pipe_len),
-            ));
+            return (
+                Some(Token::new(
+                    TokenContents::ErrGreaterPipe,
+                    Span::new(span_offset + offset, span_offset + offset + e_pipe_len),
+                )),
+                None,
+            );
         }
         if (offset + eo_pipe_len <= input.len())
             && (&input[offset..offset + eo_pipe_len] == b"e+o>|")
         {
             *curr_offset += eo_pipe_len;
-            return Some(Token::new(
-                TokenContents::OutErrGreaterPipe,
-                Span::new(span_offset + offset, span_offset + offset + eo_pipe_len),
-            ));
+            return (
+                Some(Token::new(
+                    TokenContents::OutErrGreaterPipe,
+                    Span::new(span_offset + offset, span_offset + offset + eo_pipe_len),
+                )),
+                None,
+            );
         }
     } else if c == b'o' {
+        // indicates an error if user happened to type `o>|`
+        if offset + o_pipe_len <= input.len() && (&input[offset..offset + o_pipe_len] == b"o>|") {
+            return (
+                None,
+                Some(ParseError::Expected(
+                    "`|`.  Redirecting stdout to a pipe is the same as normal piping.",
+                    Span::new(span_offset + offset, span_offset + offset + o_pipe_len),
+                )),
+            );
+        }
         // it can be the following case: `o+e>|`
         if (offset + eo_pipe_len <= input.len())
             && (&input[offset..offset + eo_pipe_len] == b"o+e>|")
         {
             *curr_offset += eo_pipe_len;
-            return Some(Token::new(
-                TokenContents::OutErrGreaterPipe,
-                Span::new(span_offset + offset, span_offset + offset + eo_pipe_len),
-            ));
+            return (
+                Some(Token::new(
+                    TokenContents::OutErrGreaterPipe,
+                    Span::new(span_offset + offset, span_offset + offset + eo_pipe_len),
+                )),
+                None,
+            );
         }
     }
-    None
+    (None, None)
 }
diff --git a/tests/shell/pipeline/commands/internal.rs b/tests/shell/pipeline/commands/internal.rs
index 84f0bf146f..59c9f31fce 100644
--- a/tests/shell/pipeline/commands/internal.rs
+++ b/tests/shell/pipeline/commands/internal.rs
@@ -1161,3 +1161,11 @@ fn command_not_found_error_shows_not_found_2() {
             && actual.err.contains("Did you mean `for`?")
     );
 }
+
+#[test]
+fn error_on_out_greater_pipe() {
+    let actual = nu!(r#""foo" o>| print"#);
+    assert!(actual
+        .err
+        .contains("Redirecting stdout to a pipe is the same as normal piping"))
+}

From 4cdceca1f716d4c7d8a815365f6052ecbe3f7d19 Mon Sep 17 00:00:00 2001
From: Maxim Zhiburt <zhiburt@gmail.com>
Date: Tue, 9 Jul 2024 17:49:04 +0300
Subject: [PATCH 0197/1072] Fix kv table width issue with header_on_border
 configuration (#13325)

GOOD CATCH.............................................................
SORRY

I've added a test to catch regression just in case.

close #13319

cc: @fdncred
---
 crates/nu-command/tests/commands/table.rs |  6 ++++++
 crates/nu-table/src/table.rs              | 14 ++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/crates/nu-command/tests/commands/table.rs b/crates/nu-command/tests/commands/table.rs
index 9c4f34ebfd..16d5eb54ab 100644
--- a/crates/nu-command/tests/commands/table.rs
+++ b/crates/nu-command/tests/commands/table.rs
@@ -2889,3 +2889,9 @@ fn table_list() {
     let actual = nu!("table --list --theme basic");
     assert_eq!(actual.out, "╭────┬────────────────╮│  0 │ basic          ││  1 │ compact        ││  2 │ compact_double ││  3 │ default        ││  4 │ heavy          ││  5 │ light          ││  6 │ none           ││  7 │ reinforced     ││  8 │ rounded        ││  9 │ thin           ││ 10 │ with_love      ││ 11 │ psql           ││ 12 │ markdown       ││ 13 │ dots           ││ 14 │ restructured   ││ 15 │ ascii_rounded  ││ 16 │ basic_compact  │╰────┴────────────────╯");
 }
+
+#[test]
+fn table_kv_header_on_separator_trim_algorithm() {
+    let actual = nu!("$env.config.table.header_on_separator = true; {key1: '111111111111111111111111111111111111111111111111111111111111'} | table --width=60 --theme basic");
+    assert_eq!(actual.out, "+------+---------------------------------------------------+| key1 | 1111111111111111111111111111111111111111111111111 ||      | 11111111111                                       |+------+---------------------------------------------------+");
+}
diff --git a/crates/nu-table/src/table.rs b/crates/nu-table/src/table.rs
index e1b1269874..e39284c2ea 100644
--- a/crates/nu-table/src/table.rs
+++ b/crates/nu-table/src/table.rs
@@ -355,11 +355,14 @@ impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for
         let total_width = get_total_width2(&self.width, cfg);
 
         if total_width > self.max {
+            let has_header = self.cfg.with_header && rec.count_rows() > 1;
+            let trim_as_head = has_header && self.cfg.header_on_border;
+
             TableTrim {
                 max: self.max,
                 strategy: self.cfg.trim,
                 width: self.width,
-                do_as_head: self.cfg.header_on_border,
+                trim_as_head,
             }
             .change(rec, cfg, dim);
         } else if self.cfg.expand && self.max > total_width {
@@ -375,7 +378,7 @@ struct TableTrim {
     width: Vec<usize>,
     strategy: TrimStrategy,
     max: usize,
-    do_as_head: bool,
+    trim_as_head: bool,
 }
 
 impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for TableTrim {
@@ -387,7 +390,7 @@ impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for
     ) {
         // we already must have been estimated that it's safe to do.
         // and all dims will be suffitient
-        if self.do_as_head {
+        if self.trim_as_head {
             if recs.is_empty() {
                 return;
             }
@@ -544,7 +547,10 @@ fn maybe_truncate_columns(
     const TERMWIDTH_THRESHOLD: usize = 120;
 
     let preserve_content = termwidth > TERMWIDTH_THRESHOLD;
-    let truncate = if cfg.header_on_border {
+    let has_header = cfg.with_header && data.count_rows() > 1;
+    let is_header_on_border = has_header && cfg.header_on_border;
+
+    let truncate = if is_header_on_border {
         truncate_columns_by_head
     } else if preserve_content {
         truncate_columns_by_columns

From ff27d6a18eaa0d98db792abe048b1c5052e6c6dd Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Tue, 9 Jul 2024 10:17:20 -0700
Subject: [PATCH 0198/1072] Implemented a command to expose polar's pivot
 functionality (#13282)

# Description
Implementing pivot support

The example below is a port of the [python API
example](https://docs.pola.rs/api/python/stable/reference/dataframe/api/polars.DataFrame.pivot.html)

<img width="1079" alt="Screenshot 2024-07-01 at 14 29 27"
src="https://github.com/nushell/nushell/assets/56345/277eb7a2-233b-4070-9d24-c2183805c1b8">

# User-Facing Changes
* Introduction of the `polars pivot` command
---
 crates/nu_plugin_polars/Cargo.toml            |   2 +-
 .../src/dataframe/eager/mod.rs                |   2 +
 .../src/dataframe/eager/pivot.rs              | 265 ++++++++++++++++++
 3 files changed, 268 insertions(+), 1 deletion(-)
 create mode 100644 crates/nu_plugin_polars/src/dataframe/eager/pivot.rs

diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 9589c89525..f9b4295cb9 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -33,7 +33,7 @@ serde = { version = "1.0", features = ["derive"] }
 sqlparser = { version = "0.47"}
 polars-io = { version = "0.41", features = ["avro"]}
 polars-arrow = { version = "0.41"}
-polars-ops = { version = "0.41"}
+polars-ops = { version = "0.41", features = ["pivot"]}
 polars-plan = { version = "0.41", features = ["regex"]}
 polars-utils = { version = "0.41"}
 typetag = "0.2"
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/mod.rs b/crates/nu_plugin_polars/src/dataframe/eager/mod.rs
index 509c2b6dc4..6aa37d1ed1 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/mod.rs
@@ -10,6 +10,7 @@ mod first;
 mod get;
 mod last;
 mod open;
+mod pivot;
 mod query_df;
 mod rename;
 mod sample;
@@ -76,6 +77,7 @@ pub(crate) fn eager_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugi
         Box::new(FilterWith),
         Box::new(GetDF),
         Box::new(OpenDataFrame),
+        Box::new(pivot::PivotDF),
         Box::new(UnpivotDF),
         Box::new(Summary),
         Box::new(FirstDF),
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/pivot.rs b/crates/nu_plugin_polars/src/dataframe/eager/pivot.rs
new file mode 100644
index 0000000000..b72210d011
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/eager/pivot.rs
@@ -0,0 +1,265 @@
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{
+    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
+    Value,
+};
+
+use polars_ops::pivot::{pivot, PivotAgg};
+
+use crate::{
+    dataframe::values::utils::convert_columns_string,
+    values::{Column, CustomValueSupport, PolarsPluginObject},
+    PolarsPlugin,
+};
+
+use super::super::values::NuDataFrame;
+
+#[derive(Clone)]
+pub struct PivotDF;
+
+impl PluginCommand for PivotDF {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars pivot"
+    }
+
+    fn usage(&self) -> &str {
+        "Pivot a DataFrame from wide to long format."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .required_named(
+                "on",
+                SyntaxShape::List(Box::new(SyntaxShape::String)),
+                "column names for pivoting",
+                Some('o'),
+            )
+            .required_named(
+                "index",
+                SyntaxShape::List(Box::new(SyntaxShape::String)),
+                "column names for indexes",
+                Some('i'),
+            )
+            .required_named(
+                "values",
+                SyntaxShape::List(Box::new(SyntaxShape::String)),
+                "column names used as value columns",
+                Some('v'),
+            )
+            .named(
+                "aggregate",
+                SyntaxShape::String,
+                "Aggregation to apply when pivoting. The following are supported: first, sum, min, max, mean, median, count, last",
+                Some('a'),
+            )
+            .switch(
+                "sort",
+                "Sort columns",
+                Some('s'),
+            )
+            .switch(
+                "streamable",
+                "Whether or not to use the polars streaming engine. Only valid for lazy dataframes",
+                Some('t'),
+            )
+            .input_output_type(
+                Type::Custom("dataframe".into()),
+                Type::Custom("dataframe".into()),
+            )
+            .category(Category::Custom("dataframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                example: "[[name subject test_1 test_2]; [Cady maths 98 100] [Cady physics 99 100] [Karen maths 61 60] [Karen physics 58 60]] | polars into-df |  polars pivot --on [subject] --index [name] --values [test_1]",
+                description: "Perform a pivot in order to show individuals test score by subject", 
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![
+                            Column::new(
+                                "name".to_string(),
+                                vec![Value::string("Cady", Span::test_data()), Value::string("Karen", Span::test_data())],
+                            ),
+                            Column::new(
+                                "maths".to_string(),
+                                vec![Value::int(98, Span::test_data()), Value::int(61, Span::test_data())],
+                            ),
+                            Column::new(
+                                "physics".to_string(),
+                                vec![Value::int(99, Span::test_data()), Value::int(58, Span::test_data())],
+                            ),
+                        ],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::unknown())
+                )
+            }
+        ]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        match PolarsPluginObject::try_from_pipeline(plugin, input, call.head)? {
+            PolarsPluginObject::NuDataFrame(df) => command_eager(plugin, engine, call, df),
+            PolarsPluginObject::NuLazyFrame(lazy) => {
+                command_eager(plugin, engine, call, lazy.collect(call.head)?)
+            }
+            _ => Err(ShellError::GenericError {
+                error: "Must be a dataframe or lazy dataframe".into(),
+                msg: "".into(),
+                span: Some(call.head),
+                help: None,
+                inner: vec![],
+            }),
+        }
+        .map_err(LabeledError::from)
+    }
+}
+
+fn command_eager(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    df: NuDataFrame,
+) -> Result<PipelineData, ShellError> {
+    let on_col: Vec<Value> = call.get_flag("on")?.expect("required value");
+    let index_col: Vec<Value> = call.get_flag("index")?.expect("required value");
+    let val_col: Vec<Value> = call.get_flag("values")?.expect("required value");
+
+    let (on_col_string, id_col_span) = convert_columns_string(on_col, call.head)?;
+    let (index_col_string, index_col_span) = convert_columns_string(index_col, call.head)?;
+    let (val_col_string, val_col_span) = convert_columns_string(val_col, call.head)?;
+
+    check_column_datatypes(df.as_ref(), &on_col_string, id_col_span)?;
+    check_column_datatypes(df.as_ref(), &index_col_string, index_col_span)?;
+    check_column_datatypes(df.as_ref(), &val_col_string, val_col_span)?;
+
+    let aggregate: Option<PivotAgg> = call
+        .get_flag::<String>("aggregate")?
+        .map(pivot_agg_for_str)
+        .transpose()?;
+
+    let sort = call.has_flag("sort")?;
+
+    let polars_df = df.to_polars();
+    // todo add other args
+    let pivoted = pivot(
+        &polars_df,
+        &on_col_string,
+        Some(&index_col_string),
+        Some(&val_col_string),
+        sort,
+        aggregate,
+        None,
+    )
+    .map_err(|e| ShellError::GenericError {
+        error: format!("Pivot error: {e}"),
+        msg: "".into(),
+        span: Some(call.head),
+        help: None,
+        inner: vec![],
+    })?;
+
+    let res = NuDataFrame::new(false, pivoted);
+    res.to_pipeline_data(plugin, engine, call.head)
+}
+
+fn check_column_datatypes<T: AsRef<str>>(
+    df: &polars::prelude::DataFrame,
+    cols: &[T],
+    col_span: Span,
+) -> Result<(), ShellError> {
+    if cols.is_empty() {
+        return Err(ShellError::GenericError {
+            error: "Merge error".into(),
+            msg: "empty column list".into(),
+            span: Some(col_span),
+            help: None,
+            inner: vec![],
+        });
+    }
+
+    // Checking if they are same type
+    if cols.len() > 1 {
+        for w in cols.windows(2) {
+            let l_series = df
+                .column(w[0].as_ref())
+                .map_err(|e| ShellError::GenericError {
+                    error: "Error selecting columns".into(),
+                    msg: e.to_string(),
+                    span: Some(col_span),
+                    help: None,
+                    inner: vec![],
+                })?;
+
+            let r_series = df
+                .column(w[1].as_ref())
+                .map_err(|e| ShellError::GenericError {
+                    error: "Error selecting columns".into(),
+                    msg: e.to_string(),
+                    span: Some(col_span),
+                    help: None,
+                    inner: vec![],
+                })?;
+
+            if l_series.dtype() != r_series.dtype() {
+                return Err(ShellError::GenericError {
+                    error: "Merge error".into(),
+                    msg: "found different column types in list".into(),
+                    span: Some(col_span),
+                    help: Some(format!(
+                        "datatypes {} and {} are incompatible",
+                        l_series.dtype(),
+                        r_series.dtype()
+                    )),
+                    inner: vec![],
+                });
+            }
+        }
+    }
+
+    Ok(())
+}
+
+fn pivot_agg_for_str(agg: impl AsRef<str>) -> Result<PivotAgg, ShellError> {
+    match agg.as_ref() {
+        "first" => Ok(PivotAgg::First),
+        "sum" => Ok(PivotAgg::Sum),
+        "min" => Ok(PivotAgg::Min),
+        "max" => Ok(PivotAgg::Max),
+        "mean" => Ok(PivotAgg::Mean),
+        "median" => Ok(PivotAgg::Median),
+        "count" => Ok(PivotAgg::Count),
+        "last" => Ok(PivotAgg::Last),
+        s => Err(ShellError::GenericError {
+            error: format!("{s} is not a valid aggregation"),
+            msg: "".into(),
+            span: None,
+            help: Some(
+                "Use one of the following: first, sum, min, max, mean, median, count, last".into(),
+            ),
+            inner: vec![],
+        }),
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use crate::test::test_polars_plugin_command;
+
+    use super::*;
+
+    #[test]
+    fn test_examples() -> Result<(), ShellError> {
+        test_polars_plugin_command(&PivotDF)
+    }
+}

From ad8054ebed7db1bbfbfcf15a85b00f96fc0f8325 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Tue, 9 Jul 2024 19:52:57 -0500
Subject: [PATCH 0199/1072] update table comments

---
 crates/nu-table/src/table.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/nu-table/src/table.rs b/crates/nu-table/src/table.rs
index e39284c2ea..d2cf8f4d63 100644
--- a/crates/nu-table/src/table.rs
+++ b/crates/nu-table/src/table.rs
@@ -966,10 +966,10 @@ impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for
                     .collect();
             }
             None => {
-                // we don't have widths cached; which means that NO widtds adjustmens were done
+                // we don't have widths cached; which means that NO width adjustments were done
                 // which means we are OK to leave columns as they are.
                 //
-                // but we are actually always got to have widths at this point
+                // but we actually always have to have widths at this point
             }
         };
 

From 0178295363fb00a455a9ad403c2aca20093e4ee5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jul 2024 19:53:46 -0500
Subject: [PATCH 0200/1072] Bump crate-ci/typos from 1.22.9 to 1.23.1 (#13328)

Bumps [crate-ci/typos](https://github.com/crate-ci/typos) from 1.22.9 to
1.23.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/crate-ci/typos/releases">crate-ci/typos's
releases</a>.</em></p>
<blockquote>
<h2>v1.23.1</h2>
<h2>[1.23.1] - 2024-07-05</h2>
<h3>Fixes</h3>
<ul>
<li>Add missing <a
href="https://redirect.github.com/crate-ci/typos/issues/1024">June
2024</a> changes</li>
</ul>
<h2>v1.23.0</h2>
<h2>[1.23.0] - 2024-07-05</h2>
<h3>Fixes</h3>
<ul>
<li>Updated the dictionary with the <a
href="https://redirect.github.com/crate-ci/typos/issues/1024">June
2024</a> changes</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/crate-ci/typos/blob/master/CHANGELOG.md">crate-ci/typos's
changelog</a>.</em></p>
<blockquote>
<h2>[1.23.1] - 2024-07-05</h2>
<h3>Fixes</h3>
<ul>
<li>Add missing <a
href="https://redirect.github.com/crate-ci/typos/issues/1024">June
2024</a> changes</li>
</ul>
<h2>[1.23.0] - 2024-07-05</h2>
<h3>Fixes</h3>
<ul>
<li>Updated the dictionary with the <a
href="https://redirect.github.com/crate-ci/typos/issues/1024">June
2024</a> changes</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/crate-ci/typos/commit/81a34f1ca2d0bfdcc3470c0f279a20333cb94878"><code>81a34f1</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/1aa7c985e447515aa398840d93f66e278fbe7a0c"><code>1aa7c98</code></a>
docs: Update changelog</li>
<li><a
href="https://github.com/crate-ci/typos/commit/4d4121ea86c9405451c2af45a47dbd0600ec5202"><code>4d4121e</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/4edcc6aa957ce6fe18d1f5002a7708347aaf7680"><code>4edcc6a</code></a>
Merge pull request <a
href="https://redirect.github.com/crate-ci/typos/issues/1053">#1053</a>
from epage/june</li>
<li><a
href="https://github.com/crate-ci/typos/commit/fa7786ec6925488ce16e40434fae32e16505bb9e"><code>fa7786e</code></a>
fix(dict): Add more june typos</li>
<li><a
href="https://github.com/crate-ci/typos/commit/04eea796957ae6d88a06fd00dc942132fda7fc09"><code>04eea79</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/d3b2a6eb90c82dcb6e6b802b1c3ef92592beca20"><code>d3b2a6e</code></a>
docs: Update changelog</li>
<li><a
href="https://github.com/crate-ci/typos/commit/494a98f93e9600d4e4be8346394d5902c03602c5"><code>494a98f</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/bdc571d921a5dc929502e94f8cbad131bc6bfb87"><code>bdc571d</code></a>
Merge pull request <a
href="https://redirect.github.com/crate-ci/typos/issues/1052">#1052</a>
from epage/june</li>
<li><a
href="https://github.com/crate-ci/typos/commit/eac884cf3bae9fef64587b1e0f4305cc8b0c12f2"><code>eac884c</code></a>
fix(dict): June updates</li>
<li>Additional commits viewable in <a
href="https://github.com/crate-ci/typos/compare/v1.22.9...v1.23.1">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=crate-ci/typos&package-manager=github_actions&previous-version=1.22.9&new-version=1.23.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
Dependabot will merge this PR once CI passes on it, as requested by
@fdncred.

[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/typos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index 95fc51b970..0f1e4cb5d9 100644
--- 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.9
+        uses: crate-ci/typos@v1.23.1

From b68c7cf3fac9b5510c600e08ff70b6af0ec6adb3 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Wed, 10 Jul 2024 14:36:38 -0700
Subject: [PATCH 0201/1072] Make `polars unpivot` consistent with `polars
 pivot` (#13335)

# Description
Makes `polars unpivot` use the same arguments as `polars pivot` and
makes it consistent with the polars' rust api. Additionally, support for
the polar's streaming engine has been exposed on eager dataframes.
Previously, it would only work with lazy dataframes.


# User-Facing Changes
* `polars unpivot` argument `--columns`|`-c` has been renamed to
`--index`|`-i`
* `polars unpivot` argument `--values`|`-v` has been renamed to
`--on`|`-o`
* `polars unpivot` short argument for `--streamable` is now `-t` to make
it consistent with `polars pivot`. It was made `-t` for `polars pivot`
because `-s` is short for `--short`
---
 .../src/dataframe/eager/unpivot.rs            | 74 ++++++++-----------
 1 file changed, 31 insertions(+), 43 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/eager/unpivot.rs b/crates/nu_plugin_polars/src/dataframe/eager/unpivot.rs
index c535b54c0e..dafdc65ab4 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/unpivot.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/unpivot.rs
@@ -30,16 +30,16 @@ impl PluginCommand for UnpivotDF {
     fn signature(&self) -> Signature {
         Signature::build(self.name())
             .required_named(
-                "columns",
+                "index",
                 SyntaxShape::Table(vec![]),
                 "column names for unpivoting",
-                Some('c'),
+                Some('i'),
             )
             .required_named(
-                "values",
+                "on",
                 SyntaxShape::Table(vec![]),
                 "column names used as value columns",
-                Some('v'),
+                Some('o'),
             )
             .named(
                 "variable-name",
@@ -60,7 +60,7 @@ impl PluginCommand for UnpivotDF {
             .switch(
                 "streamable",
                 "Whether or not to use the polars streaming engine. Only valid for lazy dataframes",
-                Some('s'),
+                Some('t'),
             )
             .category(Category::Custom("dataframe".into()))
     }
@@ -70,7 +70,7 @@ impl PluginCommand for UnpivotDF {
             Example {
                 description: "unpivot on an eager dataframe",
                 example:
-                    "[[a b c d]; [x 1 4 a] [y 2 5 b] [z 3 6 c]] | polars into-df | polars unpivot -c [b c] -v [a d]",
+                    "[[a b c d]; [x 1 4 a] [y 2 5 b] [z 3 6 c]] | polars into-df | polars unpivot -i [b c] -o [a d]",
                 result: Some(
                     NuDataFrame::try_from_columns(vec![
                         Column::new(
@@ -125,7 +125,7 @@ impl PluginCommand for UnpivotDF {
             Example {
                 description: "unpivot on a lazy dataframe",
                 example:
-                    "[[a b c d]; [x 1 4 a] [y 2 5 b] [z 3 6 c]] | polars into-lazy | polars unpivot -c [b c] -v [a d] | polars collect",
+                    "[[a b c d]; [x 1 4 a] [y 2 5 b] [z 3 6 c]] | polars into-lazy | polars unpivot -i [b c] -o [a d] | polars collect",
                 result: Some(
                     NuDataFrame::try_from_columns(vec![
                         Column::new(
@@ -208,21 +208,31 @@ fn command_eager(
     call: &EvaluatedCall,
     df: NuDataFrame,
 ) -> Result<PipelineData, ShellError> {
-    let id_col: Vec<Value> = call.get_flag("columns")?.expect("required value");
-    let val_col: Vec<Value> = call.get_flag("values")?.expect("required value");
+    let index_col: Vec<Value> = call.get_flag("index")?.expect("required value");
+    let on_col: Vec<Value> = call.get_flag("on")?.expect("required value");
 
     let value_name: Option<Spanned<String>> = call.get_flag("value-name")?;
     let variable_name: Option<Spanned<String>> = call.get_flag("variable-name")?;
 
-    let (id_col_string, id_col_span) = convert_columns_string(id_col, call.head)?;
-    let (val_col_string, val_col_span) = convert_columns_string(val_col, call.head)?;
+    let (index_col_string, index_col_span) = convert_columns_string(index_col, call.head)?;
+    let (on_col_string, on_col_span) = convert_columns_string(on_col, call.head)?;
 
-    check_column_datatypes(df.as_ref(), &id_col_string, id_col_span)?;
-    check_column_datatypes(df.as_ref(), &val_col_string, val_col_span)?;
+    check_column_datatypes(df.as_ref(), &index_col_string, index_col_span)?;
+    check_column_datatypes(df.as_ref(), &on_col_string, on_col_span)?;
 
-    let mut res = df
+    let streamable = call.has_flag("streamable")?;
+
+    let args = UnpivotArgs {
+        on: on_col_string.iter().map(Into::into).collect(),
+        index: index_col_string.iter().map(Into::into).collect(),
+        variable_name: variable_name.map(|s| s.item.into()),
+        value_name: value_name.map(|s| s.item.into()),
+        streamable,
+    };
+
+    let res = df
         .as_ref()
-        .unpivot(&val_col_string, &id_col_string)
+        .unpivot2(args)
         .map_err(|e| ShellError::GenericError {
             error: "Error calculating unpivot".into(),
             msg: e.to_string(),
@@ -231,28 +241,6 @@ fn command_eager(
             inner: vec![],
         })?;
 
-    if let Some(name) = &variable_name {
-        res.rename("variable", &name.item)
-            .map_err(|e| ShellError::GenericError {
-                error: "Error renaming column".into(),
-                msg: e.to_string(),
-                span: Some(name.span),
-                help: None,
-                inner: vec![],
-            })?;
-    }
-
-    if let Some(name) = &value_name {
-        res.rename("value", &name.item)
-            .map_err(|e| ShellError::GenericError {
-                error: "Error renaming column".into(),
-                msg: e.to_string(),
-                span: Some(name.span),
-                help: None,
-                inner: vec![],
-            })?;
-    }
-
     let res = NuDataFrame::new(false, res);
     res.to_pipeline_data(plugin, engine, call.head)
 }
@@ -263,11 +251,11 @@ fn command_lazy(
     call: &EvaluatedCall,
     df: NuLazyFrame,
 ) -> Result<PipelineData, ShellError> {
-    let id_col: Vec<Value> = call.get_flag("columns")?.expect("required value");
-    let val_col: Vec<Value> = call.get_flag("values")?.expect("required value");
+    let index_col: Vec<Value> = call.get_flag("index")?.expect("required value");
+    let on_col: Vec<Value> = call.get_flag("on")?.expect("required value");
 
-    let (id_col_string, _id_col_span) = convert_columns_string(id_col, call.head)?;
-    let (val_col_string, _val_col_span) = convert_columns_string(val_col, call.head)?;
+    let (index_col_string, _index_col_span) = convert_columns_string(index_col, call.head)?;
+    let (on_col_string, _on_col_span) = convert_columns_string(on_col, call.head)?;
 
     let value_name: Option<String> = call.get_flag("value-name")?;
     let variable_name: Option<String> = call.get_flag("variable-name")?;
@@ -275,8 +263,8 @@ fn command_lazy(
     let streamable = call.has_flag("streamable")?;
 
     let unpivot_args = UnpivotArgs {
-        on: val_col_string.iter().map(Into::into).collect(),
-        index: id_col_string.iter().map(Into::into).collect(),
+        on: on_col_string.iter().map(Into::into).collect(),
+        index: index_col_string.iter().map(Into::into).collect(),
         value_name: value_name.map(Into::into),
         variable_name: variable_name.map(Into::into),
         streamable,

From 616e9faaf13ccd90fb898008b5921c235893357e Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Wed, 10 Jul 2024 19:05:24 -0400
Subject: [PATCH 0202/1072] Fix main binary being rebuilt when nothing has
 changed (#13337)

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

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

The build script is currently re-run on each `cargo build` even when it
has not changed. The `rerun-if-changed` line points to `/build.rs`, but
`build.rs` is actually located at `/scripts/build.rs`. This updates that
path.

# User-Facing Changes
N/A

# Tests + Formatting
N/A
---
 scripts/build.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build.rs b/scripts/build.rs
index beabba80dc..e366b4998c 100644
--- a/scripts/build.rs
+++ b/scripts/build.rs
@@ -14,5 +14,5 @@ fn main() {
     // Tango uses dynamic linking, to allow us to dynamically change between two bench suit at runtime.
     // This is currently not supported on non nightly rust, on windows.
     println!("cargo:rustc-link-arg-benches=-rdynamic");
-    println!("cargo:rerun-if-changed=build.rs");
+    println!("cargo:rerun-if-changed=scripts/build.rs");
 }

From ea8c4e3af28d778d98fd570800c74a3e19cddf29 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Wed, 10 Jul 2024 16:16:22 -0700
Subject: [PATCH 0203/1072] Make pipe redirections consistent, add `err>|` etc.
 forms (#13334)

# Description

Fixes the lexer to recognize `out>|`, `err>|`, `out+err>|`, etc.

Previously only the short-style forms were recognized, which was
inconsistent with normal file redirections.

I also integrated it all more into the normal lex path by checking `|`
in a special way, which should be more performant and consistent, and
cleans up the code a bunch.

Closes #13331.

# User-Facing Changes
- Adds `out>|` (error), `err>|`, `out+err>|`, `err+out>|` as recognized
forms of the pipe redirection.

# Tests + Formatting
All passing. Added tests for the new forms.

# After Submitting
- [ ] release notes
---
 crates/nu-parser/src/lex.rs               | 103 ++++++----------------
 tests/shell/pipeline/commands/external.rs |  23 +++--
 2 files changed, 44 insertions(+), 82 deletions(-)

diff --git a/crates/nu-parser/src/lex.rs b/crates/nu-parser/src/lex.rs
index 9b52467ef4..3290a774f4 100644
--- a/crates/nu-parser/src/lex.rs
+++ b/crates/nu-parser/src/lex.rs
@@ -238,6 +238,10 @@ pub fn lex_item(
                     Some(e),
                 );
             }
+        } else if c == b'|' && is_redirection(&input[token_start..*curr_offset]) {
+            // matches err>| etc.
+            *curr_offset += 1;
+            break;
         } else if is_item_terminator(&block_level, c, additional_whitespace, special_tokens) {
             break;
         }
@@ -301,6 +305,16 @@ pub fn lex_item(
             contents: TokenContents::OutGreaterGreaterThan,
             span,
         },
+        b"out>|" | b"o>|" => {
+            err = Some(ParseError::Expected(
+                "`|`.  Redirecting stdout to a pipe is the same as normal piping.",
+                span,
+            ));
+            Token {
+                contents: TokenContents::Item,
+                span,
+            }
+        }
         b"err>" | b"e>" => Token {
             contents: TokenContents::ErrGreaterThan,
             span,
@@ -309,6 +323,10 @@ pub fn lex_item(
             contents: TokenContents::ErrGreaterGreaterThan,
             span,
         },
+        b"err>|" | b"e>|" => Token {
+            contents: TokenContents::ErrGreaterPipe,
+            span,
+        },
         b"out+err>" | b"err+out>" | b"o+e>" | b"e+o>" => Token {
             contents: TokenContents::OutErrGreaterThan,
             span,
@@ -317,6 +335,10 @@ pub fn lex_item(
             contents: TokenContents::OutErrGreaterGreaterThan,
             span,
         },
+        b"out+err>|" | b"err+out>|" | b"o+e>|" | b"e+o>|" => Token {
+            contents: TokenContents::OutErrGreaterPipe,
+            span,
+        },
         b"&&" => {
             err = Some(ParseError::ShellAndAnd(span));
             Token {
@@ -580,17 +602,6 @@ fn lex_internal(
             // If the next character is non-newline whitespace, skip it.
             curr_offset += 1;
         } else {
-            let (token, err) = try_lex_special_piped_item(input, &mut curr_offset, span_offset);
-            if error.is_none() {
-                error = err;
-            }
-            if let Some(token) = token {
-                output.push(token);
-                is_complete = false;
-                continue;
-            }
-
-            // Otherwise, try to consume an unclassified token.
             let (token, err) = lex_item(
                 input,
                 &mut curr_offset,
@@ -609,68 +620,10 @@ fn lex_internal(
     (output, error)
 }
 
-/// trying to lex for the following item:
-/// e>|, e+o>|, o+e>|
-///
-/// It returns Some(token) if we find the item, or else return None.
-fn try_lex_special_piped_item(
-    input: &[u8],
-    curr_offset: &mut usize,
-    span_offset: usize,
-) -> (Option<Token>, Option<ParseError>) {
-    let c = input[*curr_offset];
-    let e_pipe_len = 3;
-    let eo_pipe_len = 5;
-    let o_pipe_len = 3;
-    let offset = *curr_offset;
-    if c == b'e' {
-        // expect `e>|`
-        if (offset + e_pipe_len <= input.len()) && (&input[offset..offset + e_pipe_len] == b"e>|") {
-            *curr_offset += e_pipe_len;
-            return (
-                Some(Token::new(
-                    TokenContents::ErrGreaterPipe,
-                    Span::new(span_offset + offset, span_offset + offset + e_pipe_len),
-                )),
-                None,
-            );
-        }
-        if (offset + eo_pipe_len <= input.len())
-            && (&input[offset..offset + eo_pipe_len] == b"e+o>|")
-        {
-            *curr_offset += eo_pipe_len;
-            return (
-                Some(Token::new(
-                    TokenContents::OutErrGreaterPipe,
-                    Span::new(span_offset + offset, span_offset + offset + eo_pipe_len),
-                )),
-                None,
-            );
-        }
-    } else if c == b'o' {
-        // indicates an error if user happened to type `o>|`
-        if offset + o_pipe_len <= input.len() && (&input[offset..offset + o_pipe_len] == b"o>|") {
-            return (
-                None,
-                Some(ParseError::Expected(
-                    "`|`.  Redirecting stdout to a pipe is the same as normal piping.",
-                    Span::new(span_offset + offset, span_offset + offset + o_pipe_len),
-                )),
-            );
-        }
-        // it can be the following case: `o+e>|`
-        if (offset + eo_pipe_len <= input.len())
-            && (&input[offset..offset + eo_pipe_len] == b"o+e>|")
-        {
-            *curr_offset += eo_pipe_len;
-            return (
-                Some(Token::new(
-                    TokenContents::OutErrGreaterPipe,
-                    Span::new(span_offset + offset, span_offset + offset + eo_pipe_len),
-                )),
-                None,
-            );
-        }
-    }
-    (None, None)
+/// True if this the start of a redirection. Does not match `>>` or `>|` forms.
+fn is_redirection(token: &[u8]) -> bool {
+    matches!(
+        token,
+        b"o>" | b"out>" | b"e>" | b"err>" | b"o+e>" | b"e+o>" | b"out+err>" | b"err+out>"
+    )
 }
diff --git a/tests/shell/pipeline/commands/external.rs b/tests/shell/pipeline/commands/external.rs
index d138b65766..a6efe2b6c9 100644
--- a/tests/shell/pipeline/commands/external.rs
+++ b/tests/shell/pipeline/commands/external.rs
@@ -149,17 +149,26 @@ fn command_substitution_wont_output_extra_newline() {
     assert_eq!(actual.out, "bar");
 }
 
-#[test]
-fn basic_err_pipe_works() {
-    let actual =
-        nu!(r#"with-env { FOO: "bar" } { nu --testbin echo_env_stderr FOO e>| str length }"#);
+#[rstest::rstest]
+#[case("err>|")]
+#[case("e>|")]
+fn basic_err_pipe_works(#[case] redirection: &str) {
+    let actual = nu!(
+        r#"with-env { FOO: "bar" } { nu --testbin echo_env_stderr FOO {redirection} str length }"#
+            .replace("{redirection}", redirection)
+    );
     assert_eq!(actual.out, "3");
 }
 
-#[test]
-fn basic_outerr_pipe_works() {
+#[rstest::rstest]
+#[case("out+err>|")]
+#[case("err+out>|")]
+#[case("o+e>|")]
+#[case("e+o>|")]
+fn basic_outerr_pipe_works(#[case] redirection: &str) {
     let actual = nu!(
-        r#"with-env { FOO: "bar" } { nu --testbin echo_env_mixed out-err FOO FOO o+e>| str length }"#
+        r#"with-env { FOO: "bar" } { nu --testbin echo_env_mixed out-err FOO FOO {redirection} str length }"#
+            .replace("{redirection}", redirection)
     );
     assert_eq!(actual.out, "7");
 }

From d7392f1f3b9b8ffb58bc5f6f00d4de02b149a23d Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Wed, 10 Jul 2024 17:33:59 -0700
Subject: [PATCH 0204/1072] Internal representation (IR) compiler and evaluator
 (#13330)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

This PR adds an internal representation language to Nushell, offering an
alternative evaluator based on simple instructions, stream-containing
registers, and indexed control flow. The number of registers required is
determined statically at compile-time, and the fixed size required is
allocated upon entering the block.

Each instruction is associated with a span, which makes going backwards
from IR instructions to source code very easy.

Motivations for IR:

1. **Performance.** By simplifying the evaluation path and making it
more cache-friendly and branch predictor-friendly, code that does a lot
of computation in Nushell itself can be sped up a decent bit. Because
the IR is fairly easy to reason about, we can also implement
optimization passes in the future to eliminate and simplify code.
2. **Correctness.** The instructions mostly have very simple and
easily-specified behavior, so hopefully engine changes are a little bit
easier to reason about, and they can be specified in a more formal way
at some point. I have made an effort to document each of the
instructions in the docs for the enum itself in a reasonably specific
way. Some of the errors that would have happened during evaluation
before are now moved to the compilation step instead, because they don't
make sense to check during evaluation.
3. **As an intermediate target.** This is a good step for us to bring
the [`new-nu-parser`](https://github.com/nushell/new-nu-parser) in at
some point, as code generated from new AST can be directly compared to
code generated from old AST. If the IR code is functionally equivalent,
it will behave the exact same way.
4. **Debugging.** With a little bit more work, we can probably give
control over advancing the virtual machine that `IrBlock`s run on to
some sort of external driver, making things like breakpoints and single
stepping possible. Tools like `view ir` and [`explore
ir`](https://github.com/devyn/nu_plugin_explore_ir) make it easier than
before to see what exactly is going on with your Nushell code.

The goal is to eventually replace the AST evaluator entirely, once we're
sure it's working just as well. You can help dogfood this by running
Nushell with `$env.NU_USE_IR` set to some value. The environment
variable is checked when Nushell starts, so config runs with IR, or it
can also be set on a line at the REPL to change it dynamically. It is
also checked when running `do` in case within a script you want to just
run a specific piece of code with or without IR.

# Example

```nushell
view ir { |data|
  mut sum = 0
  for n in $data {
    $sum += $n
  }
  $sum
}
```

```gas
# 3 registers, 19 instructions, 0 bytes of data
   0: load-literal           %0, int(0)
   1: store-variable         var 904, %0 # let
   2: drain                  %0
   3: drop                   %0
   4: load-variable          %1, var 903
   5: iterate                %0, %1, end 15 # for, label(1), from(14:)
   6: store-variable         var 905, %0
   7: load-variable          %0, var 904
   8: load-variable          %2, var 905
   9: binary-op              %0, Math(Plus), %2
  10: span                   %0
  11: store-variable         var 904, %0
  12: load-literal           %0, nothing
  13: drain                  %0
  14: jump                   5
  15: drop                   %0          # label(0), from(5:)
  16: drain                  %0
  17: load-variable          %0, var 904
  18: return                 %0
```

# Benchmarks

All benchmarks run on a base model Mac Mini M1.

## Iterative Fibonacci sequence

This is about as best case as possible, making use of the much faster
control flow. Most code will not experience a speed improvement nearly
this large.

```nushell
def fib [n: int] {
  mut a = 0
  mut b = 1
  for _ in 2..=$n {
    let c = $a + $b
    $a = $b
    $b = $c
  }
  $b
}
use std bench
bench { 0..50 | each { |n| fib $n } }
```

IR disabled:

```
╭───────┬─────────────────╮
│ mean  │ 1ms 924µs 665ns │
│ min   │ 1ms 700µs 83ns  │
│ max   │ 3ms 450µs 125ns │
│ std   │ 395µs 759ns     │
│ times │ [list 50 items] │
╰───────┴─────────────────╯
```

IR enabled:

```
╭───────┬─────────────────╮
│ mean  │ 452µs 820ns     │
│ min   │ 427µs 417ns     │
│ max   │ 540µs 167ns     │
│ std   │ 17µs 158ns      │
│ times │ [list 50 items] │
╰───────┴─────────────────╯
```

![explore ir
view](https://github.com/nushell/nushell/assets/10729/d7bccc03-5222-461c-9200-0dce71b83b83)

##
[gradient_benchmark_no_check.nu](https://github.com/nushell/nu_scripts/blob/main/benchmarks/gradient_benchmark_no_check.nu)

IR disabled:

```
╭───┬──────────────────╮
│ 0 │ 27ms 929µs 958ns │
│ 1 │ 21ms 153µs 459ns │
│ 2 │ 18ms 639µs 666ns │
│ 3 │ 19ms 554µs 583ns │
│ 4 │ 13ms 383µs 375ns │
│ 5 │ 11ms 328µs 208ns │
│ 6 │  5ms 659µs 542ns │
╰───┴──────────────────╯
```

IR enabled:

```
╭───┬──────────────────╮
│ 0 │       22ms 662µs │
│ 1 │ 17ms 221µs 792ns │
│ 2 │ 14ms 786µs 708ns │
│ 3 │ 13ms 876µs 834ns │
│ 4 │  13ms 52µs 875ns │
│ 5 │ 11ms 269µs 666ns │
│ 6 │  6ms 942µs 500ns │
╰───┴──────────────────╯
```

##
[random-bytes.nu](https://github.com/nushell/nu_scripts/blob/main/benchmarks/random-bytes.nu)

I got pretty random results out of this benchmark so I decided not to
include it. Not clear why.

# User-Facing Changes
- IR compilation errors may appear even if the user isn't evaluating
with IR.
- IR evaluation can be enabled by setting the `NU_USE_IR` environment
variable to any value.
- New command `view ir` pretty-prints the IR for a block, and `view ir
--json` can be piped into an external tool like [`explore
ir`](https://github.com/devyn/nu_plugin_explore_ir).

# Tests + Formatting
All tests are passing with `NU_USE_IR=1`, and I've added some more eval
tests to compare the results for some very core operations. I will
probably want to add some more so we don't have to always check
`NU_USE_IR=1 toolkit test --workspace` on a regular basis.

# After Submitting
- [ ] release notes
- [ ] further documentation of instructions?
- [ ] post-release: publish `nu_plugin_explore_ir`
---
 Cargo.lock                                    |    3 +
 Cargo.toml                                    |    3 +-
 benches/benchmarks.rs                         |    4 +
 .../nu-cli/src/commands/keybindings_list.rs   |   28 +-
 crates/nu-cli/src/eval_cmds.rs                |    5 +
 crates/nu-cli/src/repl.rs                     |    3 +
 crates/nu-cli/src/util.rs                     |    5 +
 .../nu-cmd-lang/src/core_commands/const_.rs   |    3 +
 crates/nu-cmd-lang/src/core_commands/do_.rs   |    4 +
 crates/nu-cmd-lang/src/core_commands/for_.rs  |    3 +
 crates/nu-cmd-lang/src/core_commands/if_.rs   |    6 +
 crates/nu-cmd-lang/src/core_commands/let_.rs  |    3 +
 crates/nu-cmd-lang/src/core_commands/loop_.rs |    3 +
 .../nu-cmd-lang/src/core_commands/match_.rs   |    3 +
 crates/nu-cmd-lang/src/core_commands/mut_.rs  |    3 +
 .../src/core_commands/overlay/use_.rs         |    8 +-
 crates/nu-cmd-lang/src/core_commands/try_.rs  |    3 +
 crates/nu-cmd-lang/src/core_commands/use_.rs  |    7 +-
 .../nu-cmd-lang/src/core_commands/while_.rs   |    3 +
 crates/nu-command/src/bytes/build_.rs         |    6 +-
 crates/nu-command/src/debug/explain.rs        |    4 +-
 crates/nu-command/src/debug/metadata.rs       |    6 +-
 crates/nu-command/src/debug/mod.rs            |    2 +
 crates/nu-command/src/debug/timeit.rs         |   14 +-
 crates/nu-command/src/debug/view_ir.rs        |   83 +
 crates/nu-command/src/default_context.rs      |    1 +
 crates/nu-command/src/env/export_env.rs       |    6 +-
 crates/nu-command/src/env/source_env.rs       |    2 +-
 crates/nu-command/src/filesystem/du.rs        |    2 +-
 crates/nu-command/src/filesystem/ls.rs        |    2 +-
 crates/nu-command/src/filesystem/open.rs      |    7 +-
 crates/nu-command/src/filesystem/save.rs      |   64 +-
 crates/nu-command/src/filesystem/util.rs      |   39 +-
 crates/nu-command/src/filters/transpose.rs    |   10 +-
 crates/nu-command/src/filters/utils.rs        |    3 +-
 crates/nu-command/src/generators/cal.rs       |   11 +-
 crates/nu-command/src/math/utils.rs           |    2 +-
 crates/nu-command/src/platform/ansi/ansi_.rs  |   27 +-
 crates/nu-command/src/platform/is_terminal.rs |    2 +-
 crates/nu-command/src/platform/kill.rs        |   17 +-
 .../src/strings/encode_decode/base64.rs       |    4 +-
 crates/nu-command/src/strings/mod.rs          |    3 +-
 crates/nu-command/src/system/nu_check.rs      |    2 +-
 crates/nu-command/src/system/run_external.rs  |   68 +-
 crates/nu-command/src/system/uname.rs         |    9 +-
 crates/nu-command/src/viewers/table.rs        |    4 +-
 crates/nu-engine/Cargo.toml                   |    3 +-
 crates/nu-engine/src/call_ext.rs              |  219 ++-
 crates/nu-engine/src/command_prelude.rs       |    4 +-
 crates/nu-engine/src/compile/builder.rs       |  575 +++++++
 crates/nu-engine/src/compile/call.rs          |  270 +++
 crates/nu-engine/src/compile/expression.rs    |  535 ++++++
 crates/nu-engine/src/compile/keyword.rs       |  902 ++++++++++
 crates/nu-engine/src/compile/mod.rs           |  204 +++
 crates/nu-engine/src/compile/operator.rs      |  378 +++++
 crates/nu-engine/src/compile/redirect.rs      |  157 ++
 crates/nu-engine/src/documentation.rs         |    9 +-
 crates/nu-engine/src/env.rs                   |   21 +-
 crates/nu-engine/src/eval.rs                  |   16 +-
 crates/nu-engine/src/eval_helpers.rs          |   16 +-
 crates/nu-engine/src/eval_ir.rs               | 1462 +++++++++++++++++
 crates/nu-engine/src/lib.rs                   |    4 +
 crates/nu-parser/src/known_external.rs        |  204 ++-
 crates/nu-parser/src/parse_patterns.rs        |    2 +-
 crates/nu-parser/src/parser.rs                |   26 +-
 crates/nu-parser/tests/test_parser.rs         |    9 +-
 crates/nu-plugin-engine/src/context.rs        |   11 +-
 .../nu-plugin-protocol/src/evaluated_call.rs  |   40 +-
 crates/nu-protocol/Cargo.toml                 |    3 +-
 crates/nu-protocol/src/alias.rs               |    4 +-
 crates/nu-protocol/src/ast/block.rs           |   11 +-
 crates/nu-protocol/src/ast/expr.rs            |   14 +-
 crates/nu-protocol/src/ast/match_pattern.rs   |    6 +-
 crates/nu-protocol/src/ast/pipeline.rs        |   14 +-
 crates/nu-protocol/src/engine/argument.rs     |  124 ++
 crates/nu-protocol/src/engine/call.rs         |  223 +++
 crates/nu-protocol/src/engine/command.rs      |    8 +-
 .../nu-protocol/src/engine/error_handler.rs   |   55 +
 crates/nu-protocol/src/engine/mod.rs          |    6 +
 crates/nu-protocol/src/engine/stack.rs        |   22 +-
 .../src/engine/state_working_set.rs           |   12 +-
 crates/nu-protocol/src/errors/cli_error.rs    |    4 +
 .../nu-protocol/src/errors/compile_error.rs   |  238 +++
 crates/nu-protocol/src/errors/mod.rs          |    2 +
 crates/nu-protocol/src/errors/shell_error.rs  |   17 +
 crates/nu-protocol/src/eval_const.rs          |    2 +-
 crates/nu-protocol/src/id.rs                  |   14 +
 crates/nu-protocol/src/ir/call.rs             |  351 ++++
 crates/nu-protocol/src/ir/display.rs          |  452 +++++
 crates/nu-protocol/src/ir/mod.rs              |  419 +++++
 crates/nu-protocol/src/lib.rs                 |    1 +
 .../nu-protocol/src/pipeline/byte_stream.rs   |    6 +
 .../nu-protocol/src/pipeline/list_stream.rs   |   11 +
 .../nu-protocol/src/pipeline/pipeline_data.rs |   29 +-
 crates/nu-protocol/src/signature.rs           |    3 +-
 crates/nu-protocol/src/span.rs                |   16 +
 crates/nu-test-support/src/macros.rs          |   11 +
 src/run.rs                                    |   12 +
 tests/eval/mod.rs                             |  457 +++++-
 99 files changed, 7768 insertions(+), 346 deletions(-)
 create mode 100644 crates/nu-command/src/debug/view_ir.rs
 create mode 100644 crates/nu-engine/src/compile/builder.rs
 create mode 100644 crates/nu-engine/src/compile/call.rs
 create mode 100644 crates/nu-engine/src/compile/expression.rs
 create mode 100644 crates/nu-engine/src/compile/keyword.rs
 create mode 100644 crates/nu-engine/src/compile/mod.rs
 create mode 100644 crates/nu-engine/src/compile/operator.rs
 create mode 100644 crates/nu-engine/src/compile/redirect.rs
 create mode 100644 crates/nu-engine/src/eval_ir.rs
 create mode 100644 crates/nu-protocol/src/engine/argument.rs
 create mode 100644 crates/nu-protocol/src/engine/call.rs
 create mode 100644 crates/nu-protocol/src/engine/error_handler.rs
 create mode 100644 crates/nu-protocol/src/errors/compile_error.rs
 create mode 100644 crates/nu-protocol/src/ir/call.rs
 create mode 100644 crates/nu-protocol/src/ir/display.rs
 create mode 100644 crates/nu-protocol/src/ir/mod.rs

diff --git a/Cargo.lock b/Cargo.lock
index d4f759aed0..7243a801fc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2900,6 +2900,7 @@ dependencies = [
  "openssl",
  "pretty_assertions",
  "reedline",
+ "regex",
  "rstest",
  "serde_json",
  "serial_test",
@@ -3151,6 +3152,7 @@ dependencies = [
 name = "nu-engine"
 version = "0.95.1"
 dependencies = [
+ "log",
  "nu-glob",
  "nu-path",
  "nu-protocol",
@@ -3339,6 +3341,7 @@ dependencies = [
  "convert_case",
  "fancy-regex",
  "indexmap",
+ "log",
  "lru",
  "miette",
  "nix",
diff --git a/Cargo.toml b/Cargo.toml
index 5701fe3958..eb8a92c630 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -232,6 +232,7 @@ assert_cmd = "2.0"
 dirs-next = { 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 }
@@ -310,4 +311,4 @@ reedline = { git = "https://github.com/nushell/reedline", branch = "main" }
 # Run individual benchmarks like `cargo bench -- <regex>` e.g. `cargo bench -- parse`
 [[bench]]
 name = "benchmarks"
-harness = false
\ No newline at end of file
+harness = false
diff --git a/benches/benchmarks.rs b/benches/benchmarks.rs
index ea296f0d06..4efb666507 100644
--- a/benches/benchmarks.rs
+++ b/benches/benchmarks.rs
@@ -45,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,
diff --git a/crates/nu-cli/src/commands/keybindings_list.rs b/crates/nu-cli/src/commands/keybindings_list.rs
index f4450c0c23..350df7b820 100644
--- a/crates/nu-cli/src/commands/keybindings_list.rs
+++ b/crates/nu-cli/src/commands/keybindings_list.rs
@@ -49,22 +49,24 @@ impl Command for KeybindingsList {
 
     fn run(
         &self,
-        _engine_state: &EngineState,
-        _stack: &mut Stack,
+        engine_state: &EngineState,
+        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"];
-            all_options
-                .iter()
-                .flat_map(|argument| get_records(argument, call.head))
-                .collect()
-        } else {
-            call.named_iter()
-                .flat_map(|(argument, _, _)| get_records(argument.item.as_str(), call.head))
-                .collect()
-        };
+        let all_options = ["modifiers", "keycodes", "edits", "modes", "events"];
+
+        let presence = all_options
+            .iter()
+            .map(|option| call.has_flag(engine_state, stack, option))
+            .collect::<Result<Vec<_>, ShellError>>()?;
+
+        let records = all_options
+            .iter()
+            .zip(presence)
+            .filter(|(_, present)| *present)
+            .flat_map(|(option, _)| get_records(option, call.head))
+            .collect();
 
         Ok(Value::list(records, call.head).into_pipeline_data())
     }
diff --git a/crates/nu-cli/src/eval_cmds.rs b/crates/nu-cli/src/eval_cmds.rs
index 13141f6174..ad3a15304d 100644
--- a/crates/nu-cli/src/eval_cmds.rs
+++ b/crates/nu-cli/src/eval_cmds.rs
@@ -70,6 +70,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())
     };
 
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 7099b70ba8..07272701f3 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -268,6 +268,9 @@ 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);
     }
+    // Check whether $env.NU_USE_IR is set, so that the user can change it in the REPL
+    // Temporary while IR eval is optional
+    stack.use_ir = stack.has_env_var(engine_state, "NU_USE_IR");
     perf!("merge env", start_time, use_color);
 
     start_time = std::time::Instant::now();
diff --git a/crates/nu-cli/src/util.rs b/crates/nu-cli/src/util.rs
index d3cf73056f..bcee53c9b0 100644
--- a/crates/nu-cli/src/util.rs
+++ b/crates/nu-cli/src/util.rs
@@ -262,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())
     };
 
diff --git a/crates/nu-cmd-lang/src/core_commands/const_.rs b/crates/nu-cmd-lang/src/core_commands/const_.rs
index f780c5ada9..5b3d03443a 100644
--- 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 {
diff --git a/crates/nu-cmd-lang/src/core_commands/do_.rs b/crates/nu-cmd-lang/src/core_commands/do_.rs
index adf13cc0bb..bf29a2159a 100644
--- a/crates/nu-cmd-lang/src/core_commands/do_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/do_.rs
@@ -81,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 {
diff --git a/crates/nu-cmd-lang/src/core_commands/for_.rs b/crates/nu-cmd-lang/src/core_commands/for_.rs
index 1e90e5f06d..36df743e5f 100644
--- a/crates/nu-cmd-lang/src/core_commands/for_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/for_.rs
@@ -48,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)
diff --git a/crates/nu-cmd-lang/src/core_commands/if_.rs b/crates/nu-cmd-lang/src/core_commands/if_.rs
index 738d901759..8667843770 100644
--- a/crates/nu-cmd-lang/src/core_commands/if_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/if_.rs
@@ -60,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)
@@ -99,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)
diff --git a/crates/nu-cmd-lang/src/core_commands/let_.rs b/crates/nu-cmd-lang/src/core_commands/let_.rs
index f2da628c31..46324ef39e 100644
--- 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")
diff --git a/crates/nu-cmd-lang/src/core_commands/loop_.rs b/crates/nu-cmd-lang/src/core_commands/loop_.rs
index 86e18389de..f495c8d3ae 100644
--- a/crates/nu-cmd-lang/src/core_commands/loop_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/loop_.rs
@@ -37,6 +37,9 @@ 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)
diff --git a/crates/nu-cmd-lang/src/core_commands/match_.rs b/crates/nu-cmd-lang/src/core_commands/match_.rs
index d28a59cbad..c3a3d61216 100644
--- a/crates/nu-cmd-lang/src/core_commands/match_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/match_.rs
@@ -43,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)
diff --git a/crates/nu-cmd-lang/src/core_commands/mut_.rs b/crates/nu-cmd-lang/src/core_commands/mut_.rs
index 5db3c929af..b729590027 100644
--- 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")
diff --git a/crates/nu-cmd-lang/src/core_commands/overlay/use_.rs b/crates/nu-cmd-lang/src/core_commands/overlay/use_.rs
index e8b51fb59b..d6d3ae745a 100644
--- 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);
diff --git a/crates/nu-cmd-lang/src/core_commands/try_.rs b/crates/nu-cmd-lang/src/core_commands/try_.rs
index f99825b88d..2309897a1b 100644
--- a/crates/nu-cmd-lang/src/core_commands/try_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/try_.rs
@@ -47,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")
diff --git a/crates/nu-cmd-lang/src/core_commands/use_.rs b/crates/nu-cmd-lang/src/core_commands/use_.rs
index b0f3648304..7f544fa5d4 100644
--- a/crates/nu-cmd-lang/src/core_commands/use_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/use_.rs
@@ -57,7 +57,7 @@ This command is a parser keyword. For details, check:
         let Some(Expression {
             expr: Expr::ImportPattern(import_pattern),
             ..
-        }) = call.get_parser_info("import_pattern")
+        }) = call.get_parser_info(caller_stack, "import_pattern")
         else {
             return Err(ShellError::GenericError {
                 error: "Unexpected import".into(),
@@ -68,6 +68,9 @@ This command is a parser keyword. For details, check:
             });
         };
 
+        // Necessary so that we can modify the stack.
+        let import_pattern = import_pattern.clone();
+
         if let Some(module_id) = import_pattern.head.id {
             // Add constants
             for var_id in &import_pattern.constants {
@@ -99,7 +102,7 @@ This command is a parser keyword. For details, check:
                     &module_arg_str,
                     engine_state,
                     caller_stack,
-                    get_dirs_var_from_call(call),
+                    get_dirs_var_from_call(caller_stack, call),
                 )?;
                 let maybe_parent = maybe_file_path
                     .as_ref()
diff --git a/crates/nu-cmd-lang/src/core_commands/while_.rs b/crates/nu-cmd-lang/src/core_commands/while_.rs
index 22bb4c5dbd..a67c47fcab 100644
--- a/crates/nu-cmd-lang/src/core_commands/while_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/while_.rs
@@ -46,6 +46,9 @@ impl Command for While {
         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 cond = call.positional_nth(0).expect("checked through parser");
         let block_id = call
diff --git a/crates/nu-command/src/bytes/build_.rs b/crates/nu-command/src/bytes/build_.rs
index f6b1327621..9a3599a071 100644
--- a/crates/nu-command/src/bytes/build_.rs
+++ b/crates/nu-command/src/bytes/build_.rs
@@ -49,10 +49,8 @@ impl Command for BytesBuild {
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let mut output = vec![];
-        for val in call.rest_iter_flattened(0, |expr| {
-            let eval_expression = get_eval_expression(engine_state);
-            eval_expression(engine_state, stack, expr)
-        })? {
+        let eval_expression = get_eval_expression(engine_state);
+        for val in call.rest_iter_flattened(engine_state, stack, eval_expression, 0)? {
             let val_span = val.span();
             match val {
                 Value::Binary { mut val, .. } => output.append(&mut val),
diff --git a/crates/nu-command/src/debug/explain.rs b/crates/nu-command/src/debug/explain.rs
index b451d6916a..710e37935a 100644
--- a/crates/nu-command/src/debug/explain.rs
+++ b/crates/nu-command/src/debug/explain.rs
@@ -1,6 +1,6 @@
 use nu_engine::{command_prelude::*, get_eval_expression};
 use nu_protocol::{
-    ast::{Argument, Block, Expr, Expression},
+    ast::{self, Argument, Block, Expr, Expression},
     engine::Closure,
 };
 
@@ -106,7 +106,7 @@ pub fn get_pipeline_elements(
 fn get_arguments(
     engine_state: &EngineState,
     stack: &mut Stack,
-    call: &Call,
+    call: &ast::Call,
     eval_expression_fn: fn(&EngineState, &mut Stack, &Expression) -> Result<Value, ShellError>,
 ) -> Vec<Value> {
     let mut arg_value = vec![];
diff --git a/crates/nu-command/src/debug/metadata.rs b/crates/nu-command/src/debug/metadata.rs
index 543e598e28..245c150cea 100644
--- a/crates/nu-command/src/debug/metadata.rs
+++ b/crates/nu-command/src/debug/metadata.rs
@@ -28,6 +28,10 @@ impl Command for Metadata {
             .category(Category::Debug)
     }
 
+    fn requires_ast_for_arguments(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -35,7 +39,7 @@ impl Command for Metadata {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let arg = call.positional_nth(0);
+        let arg = call.positional_nth(stack, 0);
         let head = call.head;
 
         match arg {
diff --git a/crates/nu-command/src/debug/mod.rs b/crates/nu-command/src/debug/mod.rs
index f19ddab916..ec18c2be87 100644
--- a/crates/nu-command/src/debug/mod.rs
+++ b/crates/nu-command/src/debug/mod.rs
@@ -10,6 +10,7 @@ mod profile;
 mod timeit;
 mod view;
 mod view_files;
+mod view_ir;
 mod view_source;
 mod view_span;
 
@@ -25,5 +26,6 @@ pub use profile::DebugProfile;
 pub use timeit::TimeIt;
 pub use view::View;
 pub use view_files::ViewFiles;
+pub use view_ir::ViewIr;
 pub use view_source::ViewSource;
 pub use view_span::ViewSpan;
diff --git a/crates/nu-command/src/debug/timeit.rs b/crates/nu-command/src/debug/timeit.rs
index a445679b81..7a48644a6d 100644
--- a/crates/nu-command/src/debug/timeit.rs
+++ b/crates/nu-command/src/debug/timeit.rs
@@ -32,6 +32,10 @@ impl Command for TimeIt {
         vec!["timing", "timer", "benchmark", "measure"]
     }
 
+    fn requires_ast_for_arguments(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -39,13 +43,14 @@ impl Command for TimeIt {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let command_to_run = call.positional_nth(0);
+        // reset outdest, so the command can write to stdout and stderr.
+        let stack = &mut stack.push_redirection(None, None);
+
+        let command_to_run = call.positional_nth(stack, 0);
 
         // Get the start time after all other computation has been done.
         let start_time = Instant::now();
 
-        // reset outdest, so the command can write to stdout and stderr.
-        let stack = &mut stack.push_redirection(None, None);
         if let Some(command_to_run) = command_to_run {
             if let Some(block_id) = command_to_run.as_block() {
                 let eval_block = get_eval_block(engine_state);
@@ -53,7 +58,8 @@ impl Command for TimeIt {
                 eval_block(engine_state, stack, block, input)?
             } else {
                 let eval_expression_with_input = get_eval_expression_with_input(engine_state);
-                eval_expression_with_input(engine_state, stack, command_to_run, input)?.0
+                let expression = &command_to_run.clone();
+                eval_expression_with_input(engine_state, stack, expression, input)?.0
             }
         } else {
             PipelineData::empty()
diff --git a/crates/nu-command/src/debug/view_ir.rs b/crates/nu-command/src/debug/view_ir.rs
new file mode 100644
index 0000000000..df4f6cad6b
--- /dev/null
+++ b/crates/nu-command/src/debug/view_ir.rs
@@ -0,0 +1,83 @@
+use nu_engine::command_prelude::*;
+use nu_protocol::engine::Closure;
+
+#[derive(Clone)]
+pub struct ViewIr;
+
+impl Command for ViewIr {
+    fn name(&self) -> &str {
+        "view ir"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::new(self.name())
+            .required(
+                "closure",
+                SyntaxShape::Closure(None),
+                "The closure to see compiled code for.",
+            )
+            .switch(
+                "json",
+                "Dump the raw block data as JSON (unstable).",
+                Some('j'),
+            )
+            .input_output_type(Type::Nothing, Type::String)
+    }
+
+    fn usage(&self) -> &str {
+        "View the compiled IR code for a block of code."
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let closure: Closure = call.req(engine_state, stack, 0)?;
+        let json = call.has_flag(engine_state, stack, "json")?;
+
+        let block = engine_state.get_block(closure.block_id);
+        let ir_block = block
+            .ir_block
+            .as_ref()
+            .ok_or_else(|| ShellError::GenericError {
+                error: "Can't view IR for this block".into(),
+                msg: "block is missing compiled representation".into(),
+                span: block.span,
+                help: Some("the IrBlock is probably missing due to a compilation error".into()),
+                inner: vec![],
+            })?;
+
+        let formatted = if json {
+            let formatted_instructions = ir_block
+                .instructions
+                .iter()
+                .map(|instruction| {
+                    instruction
+                        .display(engine_state, &ir_block.data)
+                        .to_string()
+                })
+                .collect::<Vec<_>>();
+
+            serde_json::to_string_pretty(&serde_json::json!({
+                "block_id": closure.block_id,
+                "span": block.span,
+                "ir_block": ir_block,
+                "formatted_instructions": formatted_instructions,
+            }))
+            .map_err(|err| ShellError::GenericError {
+                error: "JSON serialization failed".into(),
+                msg: err.to_string(),
+                span: Some(call.head),
+                help: None,
+                inner: vec![],
+            })?
+        } else {
+            format!("{}", ir_block.display(engine_state))
+        };
+
+        Ok(Value::string(formatted, call.head).into_pipeline_data())
+    }
+}
diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index 847d2349ed..b270a78dce 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -154,6 +154,7 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             TimeIt,
             View,
             ViewFiles,
+            ViewIr,
             ViewSource,
             ViewSpan,
         };
diff --git a/crates/nu-command/src/env/export_env.rs b/crates/nu-command/src/env/export_env.rs
index 00f2c73ef4..7b583c9959 100644
--- a/crates/nu-command/src/env/export_env.rs
+++ b/crates/nu-command/src/env/export_env.rs
@@ -33,6 +33,10 @@ impl Command for ExportEnv {
         CommandType::Keyword
     }
 
+    fn requires_ast_for_arguments(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -41,7 +45,7 @@ impl Command for ExportEnv {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let block_id = call
-            .positional_nth(0)
+            .positional_nth(caller_stack, 0)
             .expect("checked through parser")
             .as_block()
             .expect("internal error: missing block");
diff --git a/crates/nu-command/src/env/source_env.rs b/crates/nu-command/src/env/source_env.rs
index 0d8b118e8d..1813a92f1f 100644
--- a/crates/nu-command/src/env/source_env.rs
+++ b/crates/nu-command/src/env/source_env.rs
@@ -56,7 +56,7 @@ impl Command for SourceEnv {
             &source_filename.item,
             engine_state,
             caller_stack,
-            get_dirs_var_from_call(call),
+            get_dirs_var_from_call(caller_stack, call),
         )? {
             PathBuf::from(&path)
         } else {
diff --git a/crates/nu-command/src/filesystem/du.rs b/crates/nu-command/src/filesystem/du.rs
index 93f08f7785..d34892ace9 100644
--- a/crates/nu-command/src/filesystem/du.rs
+++ b/crates/nu-command/src/filesystem/du.rs
@@ -102,7 +102,7 @@ impl Command for Du {
         let current_dir = current_dir(engine_state, stack)?;
 
         let paths = get_rest_for_glob_pattern(engine_state, stack, call, 0)?;
-        let paths = if call.rest_iter(0).count() == 0 {
+        let paths = if !call.has_positional_args(stack, 0) {
             None
         } else {
             Some(paths)
diff --git a/crates/nu-command/src/filesystem/ls.rs b/crates/nu-command/src/filesystem/ls.rs
index f465a93dc1..807e4f3409 100644
--- a/crates/nu-command/src/filesystem/ls.rs
+++ b/crates/nu-command/src/filesystem/ls.rs
@@ -108,7 +108,7 @@ impl Command for Ls {
         };
 
         let pattern_arg = get_rest_for_glob_pattern(engine_state, stack, call, 0)?;
-        let input_pattern_arg = if call.rest_iter(0).count() == 0 {
+        let input_pattern_arg = if !call.has_positional_args(stack, 0) {
             None
         } else {
             Some(pattern_arg)
diff --git a/crates/nu-command/src/filesystem/open.rs b/crates/nu-command/src/filesystem/open.rs
index e654b27f05..0351d1d9b2 100644
--- a/crates/nu-command/src/filesystem/open.rs
+++ b/crates/nu-command/src/filesystem/open.rs
@@ -1,7 +1,7 @@
 use super::util::get_rest_for_glob_pattern;
 #[allow(deprecated)]
 use nu_engine::{command_prelude::*, current_dir, get_eval_block};
-use nu_protocol::{ByteStream, DataSource, NuGlob, PipelineMetadata};
+use nu_protocol::{ast, ByteStream, DataSource, NuGlob, PipelineMetadata};
 use std::path::Path;
 
 #[cfg(feature = "sqlite")]
@@ -56,7 +56,7 @@ impl Command for Open {
         let mut paths = get_rest_for_glob_pattern(engine_state, stack, call, 0)?;
         let eval_block = get_eval_block(engine_state);
 
-        if paths.is_empty() && call.rest_iter(0).next().is_none() {
+        if paths.is_empty() && !call.has_positional_args(stack, 0) {
             // try to use path from pipeline input if there were no positional or spread args
             let (filename, span) = match input {
                 PipelineData::Value(val, ..) => {
@@ -180,7 +180,8 @@ impl Command for Open {
                                 let block = engine_state.get_block(block_id);
                                 eval_block(engine_state, stack, block, stream)
                             } else {
-                                decl.run(engine_state, stack, &Call::new(call_span), stream)
+                                let call = ast::Call::new(call_span);
+                                decl.run(engine_state, stack, &(&call).into(), stream)
                             };
                             output.push(command_output.map_err(|inner| {
                                     ShellError::GenericError{
diff --git a/crates/nu-command/src/filesystem/save.rs b/crates/nu-command/src/filesystem/save.rs
index 6ca5c09559..be5073ef20 100644
--- a/crates/nu-command/src/filesystem/save.rs
+++ b/crates/nu-command/src/filesystem/save.rs
@@ -4,10 +4,8 @@ use nu_engine::get_eval_block;
 use nu_engine::{command_prelude::*, current_dir};
 use nu_path::expand_path_with;
 use nu_protocol::{
-    ast::{Expr, Expression},
-    byte_stream::copy_with_signals,
-    process::ChildPipe,
-    ByteStreamSource, DataSource, OutDest, PipelineMetadata, Signals,
+    ast, byte_stream::copy_with_signals, process::ChildPipe, ByteStreamSource, DataSource, OutDest,
+    PipelineMetadata, Signals,
 };
 use std::{
     fs::File,
@@ -69,24 +67,6 @@ impl Command for Save {
         let append = call.has_flag(engine_state, stack, "append")?;
         let force = call.has_flag(engine_state, stack, "force")?;
         let progress = call.has_flag(engine_state, stack, "progress")?;
-        let out_append = if let Some(Expression {
-            expr: Expr::Bool(out_append),
-            ..
-        }) = call.get_parser_info("out-append")
-        {
-            *out_append
-        } else {
-            false
-        };
-        let err_append = if let Some(Expression {
-            expr: Expr::Bool(err_append),
-            ..
-        }) = call.get_parser_info("err-append")
-        {
-            *err_append
-        } else {
-            false
-        };
 
         let span = call.head;
         #[allow(deprecated)]
@@ -109,14 +89,7 @@ impl Command for Save {
             PipelineData::ByteStream(stream, metadata) => {
                 check_saving_to_source_file(metadata.as_ref(), &path, stderr_path.as_ref())?;
 
-                let (file, stderr_file) = get_files(
-                    &path,
-                    stderr_path.as_ref(),
-                    append,
-                    out_append,
-                    err_append,
-                    force,
-                )?;
+                let (file, stderr_file) = get_files(&path, stderr_path.as_ref(), append, force)?;
 
                 let size = stream.known_size();
                 let signals = engine_state.signals();
@@ -221,14 +194,7 @@ impl Command for Save {
                     stderr_path.as_ref(),
                 )?;
 
-                let (mut file, _) = get_files(
-                    &path,
-                    stderr_path.as_ref(),
-                    append,
-                    out_append,
-                    err_append,
-                    force,
-                )?;
+                let (mut file, _) = get_files(&path, stderr_path.as_ref(), append, force)?;
                 for val in ls {
                     file.write_all(&value_to_bytes(val)?)
                         .map_err(|err| ShellError::IOError {
@@ -258,14 +224,7 @@ impl Command for Save {
                     input_to_bytes(input, Path::new(&path.item), raw, engine_state, stack, span)?;
 
                 // Only open file after successful conversion
-                let (mut file, _) = get_files(
-                    &path,
-                    stderr_path.as_ref(),
-                    append,
-                    out_append,
-                    err_append,
-                    force,
-                )?;
+                let (mut file, _) = get_files(&path, stderr_path.as_ref(), append, force)?;
 
                 file.write_all(&bytes).map_err(|err| ShellError::IOError {
                     msg: err.to_string(),
@@ -397,7 +356,8 @@ fn convert_to_extension(
             let eval_block = get_eval_block(engine_state);
             eval_block(engine_state, stack, block, input)
         } else {
-            decl.run(engine_state, stack, &Call::new(span), input)
+            let call = ast::Call::new(span);
+            decl.run(engine_state, stack, &(&call).into(), input)
         }
     } else {
         Ok(input)
@@ -473,19 +433,17 @@ fn get_files(
     path: &Spanned<PathBuf>,
     stderr_path: Option<&Spanned<PathBuf>>,
     append: bool,
-    out_append: bool,
-    err_append: bool,
     force: bool,
 ) -> Result<(File, Option<File>), ShellError> {
     // First check both paths
-    let (path, path_span) = prepare_path(path, append || out_append, force)?;
+    let (path, path_span) = prepare_path(path, append, force)?;
     let stderr_path_and_span = stderr_path
         .as_ref()
-        .map(|stderr_path| prepare_path(stderr_path, append || err_append, force))
+        .map(|stderr_path| prepare_path(stderr_path, append, force))
         .transpose()?;
 
     // Only if both files can be used open and possibly truncate them
-    let file = open_file(path, path_span, append || out_append)?;
+    let file = open_file(path, path_span, append)?;
 
     let stderr_file = stderr_path_and_span
         .map(|(stderr_path, stderr_path_span)| {
@@ -498,7 +456,7 @@ fn get_files(
                     inner: vec![],
                 })
             } else {
-                open_file(stderr_path, stderr_path_span, append || err_append)
+                open_file(stderr_path, stderr_path_span, append)
             }
         })
         .transpose()?;
diff --git a/crates/nu-command/src/filesystem/util.rs b/crates/nu-command/src/filesystem/util.rs
index 1b755875bd..de32d204a0 100644
--- a/crates/nu-command/src/filesystem/util.rs
+++ b/crates/nu-command/src/filesystem/util.rs
@@ -1,6 +1,6 @@
 use dialoguer::Input;
 use nu_engine::{command_prelude::*, get_eval_expression};
-use nu_protocol::{ast::Expr, FromValue, NuGlob};
+use nu_protocol::{FromValue, NuGlob};
 use std::{
     error::Error,
     path::{Path, PathBuf},
@@ -92,42 +92,19 @@ pub fn is_older(src: &Path, dst: &Path) -> Option<bool> {
 
 /// Get rest arguments from given `call`, starts with `starting_pos`.
 ///
-/// It's similar to `call.rest`, except that it always returns NuGlob.  And if input argument has
-/// Type::Glob, the NuGlob is unquoted, which means it's required to expand.
+/// It's similar to `call.rest`, except that it always returns NuGlob.
 pub fn get_rest_for_glob_pattern(
     engine_state: &EngineState,
     stack: &mut Stack,
     call: &Call,
     starting_pos: usize,
 ) -> Result<Vec<Spanned<NuGlob>>, ShellError> {
-    let mut output = vec![];
     let eval_expression = get_eval_expression(engine_state);
 
-    for result in call.rest_iter_flattened(starting_pos, |expr| {
-        let result = eval_expression(engine_state, stack, expr);
-        match result {
-            Err(e) => Err(e),
-            Ok(result) => {
-                let span = result.span();
-                // convert from string to quoted string if expr is a variable
-                // or string interpolation
-                match result {
-                    Value::String { val, .. }
-                        if matches!(
-                            &expr.expr,
-                            Expr::FullCellPath(_) | Expr::StringInterpolation(_)
-                        ) =>
-                    {
-                        // should not expand if given input type is not glob.
-                        Ok(Value::glob(val, expr.ty != Type::Glob, span))
-                    }
-                    other => Ok(other),
-                }
-            }
-        }
-    })? {
-        output.push(FromValue::from_value(result)?);
-    }
-
-    Ok(output)
+    call.rest_iter_flattened(engine_state, stack, eval_expression, starting_pos)?
+        .into_iter()
+        // This used to be much more complex, but I think `FromValue` should be able to handle the
+        // nuance here.
+        .map(FromValue::from_value)
+        .collect()
 }
diff --git a/crates/nu-command/src/filters/transpose.rs b/crates/nu-command/src/filters/transpose.rs
index 95aa382e4f..4a14c1aea2 100644
--- a/crates/nu-command/src/filters/transpose.rs
+++ b/crates/nu-command/src/filters/transpose.rs
@@ -149,27 +149,27 @@ pub fn transpose(
     if !args.rest.is_empty() && args.header_row {
         return Err(ShellError::IncompatibleParametersSingle {
             msg: "Can not provide header names and use `--header-row`".into(),
-            span: call.get_named_arg("header-row").expect("has flag").span,
+            span: call.get_flag_span(stack, "header-row").expect("has flag"),
         });
     }
     if !args.header_row && args.keep_all {
         return Err(ShellError::IncompatibleParametersSingle {
             msg: "Can only be used with `--header-row`(`-r`)".into(),
-            span: call.get_named_arg("keep-all").expect("has flag").span,
+            span: call.get_flag_span(stack, "keep-all").expect("has flag"),
         });
     }
     if !args.header_row && args.keep_last {
         return Err(ShellError::IncompatibleParametersSingle {
             msg: "Can only be used with `--header-row`(`-r`)".into(),
-            span: call.get_named_arg("keep-last").expect("has flag").span,
+            span: call.get_flag_span(stack, "keep-last").expect("has flag"),
         });
     }
     if args.keep_all && args.keep_last {
         return Err(ShellError::IncompatibleParameters {
             left_message: "can't use `--keep-last` at the same time".into(),
-            left_span: call.get_named_arg("keep-last").expect("has flag").span,
+            left_span: call.get_flag_span(stack, "keep-last").expect("has flag"),
             right_message: "because of `--keep-all`".into(),
-            right_span: call.get_named_arg("keep-all").expect("has flag").span,
+            right_span: call.get_flag_span(stack, "keep-all").expect("has flag"),
         });
     }
 
diff --git a/crates/nu-command/src/filters/utils.rs b/crates/nu-command/src/filters/utils.rs
index 3ebd4bafbd..4c67667e8e 100644
--- a/crates/nu-command/src/filters/utils.rs
+++ b/crates/nu-command/src/filters/utils.rs
@@ -1,7 +1,6 @@
 use nu_engine::{CallExt, ClosureEval};
 use nu_protocol::{
-    ast::Call,
-    engine::{Closure, EngineState, Stack},
+    engine::{Call, Closure, EngineState, Stack},
     IntoPipelineData, PipelineData, ShellError, Span, Value,
 };
 
diff --git a/crates/nu-command/src/generators/cal.rs b/crates/nu-command/src/generators/cal.rs
index a257f3ab7c..018d9370dd 100644
--- a/crates/nu-command/src/generators/cal.rs
+++ b/crates/nu-command/src/generators/cal.rs
@@ -1,7 +1,7 @@
 use chrono::{Datelike, Local, NaiveDate};
 use nu_color_config::StyleComputer;
 use nu_engine::command_prelude::*;
-use nu_protocol::ast::{Expr, Expression};
+use nu_protocol::ast::{self, Expr, Expression};
 
 use std::collections::VecDeque;
 
@@ -143,7 +143,7 @@ pub fn cal(
         style_computer,
     )?;
 
-    let mut table_no_index = Call::new(Span::unknown());
+    let mut table_no_index = ast::Call::new(Span::unknown());
     table_no_index.add_named((
         Spanned {
             item: "index".to_string(),
@@ -160,7 +160,12 @@ pub fn cal(
     let cal_table_output =
         Value::list(calendar_vec_deque.into_iter().collect(), tag).into_pipeline_data();
     if !arguments.as_table {
-        crate::Table.run(engine_state, stack, &table_no_index, cal_table_output)
+        crate::Table.run(
+            engine_state,
+            stack,
+            &(&table_no_index).into(),
+            cal_table_output,
+        )
     } else {
         Ok(cal_table_output)
     }
diff --git a/crates/nu-command/src/math/utils.rs b/crates/nu-command/src/math/utils.rs
index 765c1f42fb..62f96ea073 100644
--- a/crates/nu-command/src/math/utils.rs
+++ b/crates/nu-command/src/math/utils.rs
@@ -1,6 +1,6 @@
 use core::slice;
 use indexmap::IndexMap;
-use nu_protocol::{ast::Call, IntoPipelineData, PipelineData, ShellError, Signals, Span, Value};
+use nu_protocol::{engine::Call, IntoPipelineData, PipelineData, ShellError, Signals, Span, Value};
 
 pub fn run_with_function(
     call: &Call,
diff --git a/crates/nu-command/src/platform/ansi/ansi_.rs b/crates/nu-command/src/platform/ansi/ansi_.rs
index 29603be9e7..23161eb7bf 100644
--- a/crates/nu-command/src/platform/ansi/ansi_.rs
+++ b/crates/nu-command/src/platform/ansi/ansi_.rs
@@ -676,7 +676,7 @@ Operating system commands:
             }
         };
 
-        let output = heavy_lifting(code, escape, osc, call)?;
+        let output = heavy_lifting(code, escape, osc, stack, call)?;
 
         Ok(Value::string(output, call.head).into_pipeline_data())
     }
@@ -713,26 +713,30 @@ Operating system commands:
             }
         };
 
-        let output = heavy_lifting(code, escape, osc, call)?;
+        let output = heavy_lifting(code, escape, osc, &Stack::new(), call)?;
 
         Ok(Value::string(output, call.head).into_pipeline_data())
     }
 }
 
-fn heavy_lifting(code: Value, escape: bool, osc: bool, call: &Call) -> Result<String, ShellError> {
+fn heavy_lifting(
+    code: Value,
+    escape: bool,
+    osc: bool,
+    stack: &Stack,
+    call: &Call,
+) -> Result<String, ShellError> {
     let param_is_string = matches!(code, Value::String { .. });
     if escape && osc {
         return Err(ShellError::IncompatibleParameters {
             left_message: "escape".into(),
             left_span: call
-                .get_named_arg("escape")
-                .expect("Unexpected missing argument")
-                .span,
+                .get_flag_span(stack, "escape")
+                .expect("Unexpected missing argument"),
             right_message: "osc".into(),
             right_span: call
-                .get_named_arg("osc")
-                .expect("Unexpected missing argument")
-                .span,
+                .get_flag_span(stack, "osc")
+                .expect("Unexpected missing argument"),
         });
     }
     let code_string = if param_is_string {
@@ -744,10 +748,7 @@ fn heavy_lifting(code: Value, escape: bool, osc: bool, call: &Call) -> Result<St
     if (escape || osc) && (param_is_valid_string) {
         let code_vec: Vec<char> = code_string.chars().collect();
         if code_vec[0] == '\\' {
-            let span = match call.get_flag_expr("escape") {
-                Some(expr) => expr.span,
-                None => call.head,
-            };
+            let span = call.get_flag_span(stack, "escape").unwrap_or(call.head);
 
             return Err(ShellError::TypeMismatch {
                 err_message: "no need for escape characters".into(),
diff --git a/crates/nu-command/src/platform/is_terminal.rs b/crates/nu-command/src/platform/is_terminal.rs
index c67329e839..2195f3ff8a 100644
--- a/crates/nu-command/src/platform/is_terminal.rs
+++ b/crates/nu-command/src/platform/is_terminal.rs
@@ -58,7 +58,7 @@ impl Command for IsTerminal {
             _ => {
                 return Err(ShellError::IncompatibleParametersSingle {
                     msg: "Only one stream may be checked".into(),
-                    span: Span::merge_many(call.arguments.iter().map(|arg| arg.span())),
+                    span: call.arguments_span(),
                 });
             }
         };
diff --git a/crates/nu-command/src/platform/kill.rs b/crates/nu-command/src/platform/kill.rs
index 2e47ee8c78..1cf6f15f01 100644
--- a/crates/nu-command/src/platform/kill.rs
+++ b/crates/nu-command/src/platform/kill.rs
@@ -84,27 +84,26 @@ impl Command for Kill {
                 {
                     return Err(ShellError::IncompatibleParameters {
                         left_message: "force".to_string(),
-                        left_span: call
-                            .get_named_arg("force")
-                            .ok_or_else(|| ShellError::GenericError {
+                        left_span: call.get_flag_span(stack, "force").ok_or_else(|| {
+                            ShellError::GenericError {
                                 error: "Flag error".into(),
                                 msg: "flag force not found".into(),
                                 span: Some(call.head),
                                 help: None,
                                 inner: vec![],
-                            })?
-                            .span,
+                            }
+                        })?,
                         right_message: "signal".to_string(),
                         right_span: Span::merge(
-                            call.get_named_arg("signal")
-                                .ok_or_else(|| ShellError::GenericError {
+                            call.get_flag_span(stack, "signal").ok_or_else(|| {
+                                ShellError::GenericError {
                                     error: "Flag error".into(),
                                     msg: "flag signal not found".into(),
                                     span: Some(call.head),
                                     help: None,
                                     inner: vec![],
-                                })?
-                                .span,
+                                }
+                            })?,
                             signal_span,
                         ),
                     });
diff --git a/crates/nu-command/src/strings/encode_decode/base64.rs b/crates/nu-command/src/strings/encode_decode/base64.rs
index afc143983e..dd9289a141 100644
--- a/crates/nu-command/src/strings/encode_decode/base64.rs
+++ b/crates/nu-command/src/strings/encode_decode/base64.rs
@@ -8,8 +8,8 @@ use base64::{
 };
 use nu_cmd_base::input_handler::{operate as general_operate, CmdArgument};
 use nu_protocol::{
-    ast::{Call, CellPath},
-    engine::EngineState,
+    ast::CellPath,
+    engine::{Call, EngineState},
     PipelineData, ShellError, Span, Spanned, Value,
 };
 
diff --git a/crates/nu-command/src/strings/mod.rs b/crates/nu-command/src/strings/mod.rs
index d1ebf540e5..8b5af2dec4 100644
--- a/crates/nu-command/src/strings/mod.rs
+++ b/crates/nu-command/src/strings/mod.rs
@@ -17,8 +17,7 @@ pub use str_::*;
 
 use nu_engine::CallExt;
 use nu_protocol::{
-    ast::Call,
-    engine::{EngineState, Stack, StateWorkingSet},
+    engine::{Call, EngineState, Stack, StateWorkingSet},
     ShellError,
 };
 
diff --git a/crates/nu-command/src/system/nu_check.rs b/crates/nu-command/src/system/nu_check.rs
index f9e0879c00..334569c79e 100644
--- a/crates/nu-command/src/system/nu_check.rs
+++ b/crates/nu-command/src/system/nu_check.rs
@@ -87,7 +87,7 @@ impl Command for NuCheck {
                         &path_str.item,
                         engine_state,
                         stack,
-                        get_dirs_var_from_call(call),
+                        get_dirs_var_from_call(stack, call),
                     ) {
                         Ok(path) => {
                             if let Some(path) = path {
diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index 06bc5a69ca..a5cf343970 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -1,9 +1,7 @@
 use nu_cmd_base::hook::eval_hook;
 use nu_engine::{command_prelude::*, env_to_strings, get_eval_expression};
 use nu_path::{dots::expand_ndots, expand_tilde};
-use nu_protocol::{
-    ast::Expression, did_you_mean, process::ChildProcess, ByteStream, NuGlob, OutDest, Signals,
-};
+use nu_protocol::{did_you_mean, process::ChildProcess, ByteStream, NuGlob, OutDest, Signals};
 use nu_system::ForegroundChild;
 use nu_utils::IgnoreCaseExt;
 use pathdiff::diff_paths;
@@ -222,20 +220,21 @@ pub fn eval_arguments_from_call(
     call: &Call,
 ) -> Result<Vec<Spanned<OsString>>, ShellError> {
     let cwd = engine_state.cwd(Some(stack))?;
-    let mut args: Vec<Spanned<OsString>> = vec![];
-    for (expr, spread) in call.rest_iter(1) {
-        for arg in eval_argument(engine_state, stack, expr, spread)? {
-            match arg {
-                // Expand globs passed to run-external
-                Value::Glob { val, no_expand, .. } if !no_expand => args.extend(
-                    expand_glob(&val, cwd.as_ref(), expr.span, engine_state.signals())?
-                        .into_iter()
-                        .map(|s| s.into_spanned(expr.span)),
-                ),
-                other => {
-                    args.push(OsString::from(coerce_into_string(other)?).into_spanned(expr.span))
-                }
-            }
+    let eval_expression = get_eval_expression(engine_state);
+    let call_args = call.rest_iter_flattened(engine_state, stack, eval_expression, 1)?;
+    let mut args: Vec<Spanned<OsString>> = Vec::with_capacity(call_args.len());
+
+    for arg in call_args {
+        let span = arg.span();
+        match arg {
+            // Expand globs passed to run-external
+            Value::Glob { val, no_expand, .. } if !no_expand => args.extend(
+                expand_glob(&val, cwd.as_std_path(), span, engine_state.signals())?
+                    .into_iter()
+                    .map(|s| s.into_spanned(span)),
+            ),
+            other => args
+                .push(OsString::from(coerce_into_string(engine_state, other)?).into_spanned(span)),
         }
     }
     Ok(args)
@@ -243,42 +242,17 @@ pub fn eval_arguments_from_call(
 
 /// Custom `coerce_into_string()`, including globs, since those are often args to `run-external`
 /// as well
-fn coerce_into_string(val: Value) -> Result<String, ShellError> {
+fn coerce_into_string(engine_state: &EngineState, val: Value) -> Result<String, ShellError> {
     match val {
+        Value::List { .. } => Err(ShellError::CannotPassListToExternal {
+            arg: String::from_utf8_lossy(engine_state.get_span_contents(val.span())).into_owned(),
+            span: val.span(),
+        }),
         Value::Glob { val, .. } => Ok(val),
         _ => val.coerce_into_string(),
     }
 }
 
-/// Evaluate an argument, returning more than one value if it was a list to be spread.
-fn eval_argument(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    expr: &Expression,
-    spread: bool,
-) -> Result<Vec<Value>, ShellError> {
-    let eval = get_eval_expression(engine_state);
-    match eval(engine_state, stack, expr)? {
-        Value::List { vals, .. } => {
-            if spread {
-                Ok(vals)
-            } else {
-                Err(ShellError::CannotPassListToExternal {
-                    arg: String::from_utf8_lossy(engine_state.get_span_contents(expr.span)).into(),
-                    span: expr.span,
-                })
-            }
-        }
-        value => {
-            if spread {
-                Err(ShellError::CannotSpreadAsList { span: expr.span })
-            } else {
-                Ok(vec![value])
-            }
-        }
-    }
-}
-
 /// Performs glob expansion on `arg`. If the expansion found no matches or the pattern
 /// is not a valid glob, then this returns the original string as the expansion result.
 ///
diff --git a/crates/nu-command/src/system/uname.rs b/crates/nu-command/src/system/uname.rs
index e267fcaeb2..0bcb749f02 100644
--- a/crates/nu-command/src/system/uname.rs
+++ b/crates/nu-command/src/system/uname.rs
@@ -1,10 +1,5 @@
-use nu_protocol::record;
-use nu_protocol::Value;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, Example, PipelineData, ShellError, Signature, Type,
-};
+use nu_engine::command_prelude::*;
+use nu_protocol::{record, Value};
 
 #[derive(Clone)]
 pub struct UName;
diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index e3738a3952..190c3659af 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -344,7 +344,7 @@ fn get_theme_flag(
 struct CmdInput<'a> {
     engine_state: &'a EngineState,
     stack: &'a mut Stack,
-    call: &'a Call,
+    call: &'a Call<'a>,
     data: PipelineData,
 }
 
@@ -352,7 +352,7 @@ impl<'a> CmdInput<'a> {
     fn new(
         engine_state: &'a EngineState,
         stack: &'a mut Stack,
-        call: &'a Call,
+        call: &'a Call<'a>,
         data: PipelineData,
     ) -> Self {
         Self {
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index 3e6c3f787b..c416a2f590 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -15,6 +15,7 @@ nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.95.
 nu-path = { path = "../nu-path", version = "0.95.1" }
 nu-glob = { path = "../nu-glob", version = "0.95.1" }
 nu-utils = { path = "../nu-utils", version = "0.95.1" }
+log = { workspace = true }
 
 [features]
-plugin = []
\ No newline at end of file
+plugin = []
diff --git a/crates/nu-engine/src/call_ext.rs b/crates/nu-engine/src/call_ext.rs
index daedb24a1f..d3f36215e6 100644
--- a/crates/nu-engine/src/call_ext.rs
+++ b/crates/nu-engine/src/call_ext.rs
@@ -1,10 +1,10 @@
 use crate::eval_expression;
 use nu_protocol::{
-    ast::Call,
+    ast,
     debugger::WithoutDebug,
-    engine::{EngineState, Stack, StateWorkingSet},
+    engine::{self, EngineState, Stack, StateWorkingSet},
     eval_const::eval_constant,
-    FromValue, ShellError, Value,
+    ir, FromValue, ShellError, Span, Value,
 };
 
 pub trait CallExt {
@@ -23,6 +23,9 @@ pub trait CallExt {
         name: &str,
     ) -> Result<Option<T>, ShellError>;
 
+    /// Efficiently get the span of a flag argument
+    fn get_flag_span(&self, stack: &Stack, name: &str) -> Option<Span>;
+
     fn rest<T: FromValue>(
         &self,
         engine_state: &EngineState,
@@ -56,9 +59,12 @@ pub trait CallExt {
         stack: &mut Stack,
         name: &str,
     ) -> Result<T, ShellError>;
+
+    /// True if the command has any positional or rest arguments, excluding before the given index.
+    fn has_positional_args(&self, stack: &Stack, starting_pos: usize) -> bool;
 }
 
-impl CallExt for Call {
+impl CallExt for ast::Call {
     fn has_flag(
         &self,
         engine_state: &EngineState,
@@ -104,6 +110,10 @@ impl CallExt for Call {
         }
     }
 
+    fn get_flag_span(&self, _stack: &Stack, name: &str) -> Option<Span> {
+        self.get_named_arg(name).map(|arg| arg.span)
+    }
+
     fn rest<T: FromValue>(
         &self,
         engine_state: &EngineState,
@@ -189,4 +199,205 @@ impl CallExt for Call {
             })
         }
     }
+
+    fn has_positional_args(&self, _stack: &Stack, starting_pos: usize) -> bool {
+        self.rest_iter(starting_pos).next().is_some()
+    }
+}
+
+impl CallExt for ir::Call {
+    fn has_flag(
+        &self,
+        _engine_state: &EngineState,
+        stack: &mut Stack,
+        flag_name: &str,
+    ) -> Result<bool, ShellError> {
+        Ok(self
+            .named_iter(stack)
+            .find(|(name, _)| name.item == flag_name)
+            .is_some_and(|(_, value)| {
+                // Handle --flag=false
+                !matches!(value, Some(Value::Bool { val: false, .. }))
+            }))
+    }
+
+    fn get_flag<T: FromValue>(
+        &self,
+        _engine_state: &EngineState,
+        stack: &mut Stack,
+        name: &str,
+    ) -> Result<Option<T>, ShellError> {
+        if let Some(val) = self.get_named_arg(stack, name) {
+            T::from_value(val.clone()).map(Some)
+        } else {
+            Ok(None)
+        }
+    }
+
+    fn get_flag_span(&self, stack: &Stack, name: &str) -> Option<Span> {
+        self.named_iter(stack)
+            .find_map(|(i_name, _)| (i_name.item == name).then_some(i_name.span))
+    }
+
+    fn rest<T: FromValue>(
+        &self,
+        _engine_state: &EngineState,
+        stack: &mut Stack,
+        starting_pos: usize,
+    ) -> Result<Vec<T>, ShellError> {
+        self.rest_iter_flattened(stack, starting_pos)?
+            .into_iter()
+            .map(T::from_value)
+            .collect()
+    }
+
+    fn opt<T: FromValue>(
+        &self,
+        _engine_state: &EngineState,
+        stack: &mut Stack,
+        pos: usize,
+    ) -> Result<Option<T>, ShellError> {
+        self.positional_iter(stack)
+            .nth(pos)
+            .cloned()
+            .map(T::from_value)
+            .transpose()
+    }
+
+    fn opt_const<T: FromValue>(
+        &self,
+        _working_set: &StateWorkingSet,
+        _pos: usize,
+    ) -> Result<Option<T>, ShellError> {
+        Err(ShellError::IrEvalError {
+            msg: "const evaluation is not yet implemented on ir::Call".into(),
+            span: Some(self.head),
+        })
+    }
+
+    fn req<T: FromValue>(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        pos: usize,
+    ) -> Result<T, ShellError> {
+        if let Some(val) = self.opt(engine_state, stack, pos)? {
+            Ok(val)
+        } else if self.positional_len(stack) == 0 {
+            Err(ShellError::AccessEmptyContent { span: self.head })
+        } else {
+            Err(ShellError::AccessBeyondEnd {
+                max_idx: self.positional_len(stack) - 1,
+                span: self.head,
+            })
+        }
+    }
+
+    fn req_parser_info<T: FromValue>(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        name: &str,
+    ) -> Result<T, ShellError> {
+        // FIXME: this depends on the AST evaluator. We can fix this by making the parser info an
+        // enum rather than using expressions. It's not clear that evaluation of this is ever really
+        // needed.
+        if let Some(expr) = self.get_parser_info(stack, name) {
+            let expr = expr.clone();
+            let stack = &mut stack.use_call_arg_out_dest();
+            let result = eval_expression::<WithoutDebug>(engine_state, stack, &expr)?;
+            FromValue::from_value(result)
+        } else {
+            Err(ShellError::CantFindColumn {
+                col_name: name.into(),
+                span: None,
+                src_span: self.head,
+            })
+        }
+    }
+
+    fn has_positional_args(&self, stack: &Stack, starting_pos: usize) -> bool {
+        self.rest_iter(stack, starting_pos).next().is_some()
+    }
+}
+
+macro_rules! proxy {
+    ($self:ident . $method:ident ($($param:expr),*)) => (match &$self.inner {
+        engine::CallImpl::AstRef(call) => call.$method($($param),*),
+        engine::CallImpl::AstBox(call) => call.$method($($param),*),
+        engine::CallImpl::IrRef(call) => call.$method($($param),*),
+        engine::CallImpl::IrBox(call) => call.$method($($param),*),
+    })
+}
+
+impl CallExt for engine::Call<'_> {
+    fn has_flag(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        flag_name: &str,
+    ) -> Result<bool, ShellError> {
+        proxy!(self.has_flag(engine_state, stack, flag_name))
+    }
+
+    fn get_flag<T: FromValue>(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        name: &str,
+    ) -> Result<Option<T>, ShellError> {
+        proxy!(self.get_flag(engine_state, stack, name))
+    }
+
+    fn get_flag_span(&self, stack: &Stack, name: &str) -> Option<Span> {
+        proxy!(self.get_flag_span(stack, name))
+    }
+
+    fn rest<T: FromValue>(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        starting_pos: usize,
+    ) -> Result<Vec<T>, ShellError> {
+        proxy!(self.rest(engine_state, stack, starting_pos))
+    }
+
+    fn opt<T: FromValue>(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        pos: usize,
+    ) -> Result<Option<T>, ShellError> {
+        proxy!(self.opt(engine_state, stack, pos))
+    }
+
+    fn opt_const<T: FromValue>(
+        &self,
+        working_set: &StateWorkingSet,
+        pos: usize,
+    ) -> Result<Option<T>, ShellError> {
+        proxy!(self.opt_const(working_set, pos))
+    }
+
+    fn req<T: FromValue>(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        pos: usize,
+    ) -> Result<T, ShellError> {
+        proxy!(self.req(engine_state, stack, pos))
+    }
+
+    fn req_parser_info<T: FromValue>(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        name: &str,
+    ) -> Result<T, ShellError> {
+        proxy!(self.req_parser_info(engine_state, stack, name))
+    }
+
+    fn has_positional_args(&self, stack: &Stack, starting_pos: usize) -> bool {
+        proxy!(self.has_positional_args(stack, starting_pos))
+    }
 }
diff --git a/crates/nu-engine/src/command_prelude.rs b/crates/nu-engine/src/command_prelude.rs
index 5c21af27e0..e6ddb5fb91 100644
--- a/crates/nu-engine/src/command_prelude.rs
+++ b/crates/nu-engine/src/command_prelude.rs
@@ -1,7 +1,7 @@
 pub use crate::CallExt;
 pub use nu_protocol::{
-    ast::{Call, CellPath},
-    engine::{Command, EngineState, Stack, StateWorkingSet},
+    ast::CellPath,
+    engine::{Call, Command, EngineState, Stack, StateWorkingSet},
     record, ByteStream, ByteStreamType, Category, ErrSpan, Example, IntoInterruptiblePipelineData,
     IntoPipelineData, IntoSpanned, PipelineData, Record, ShellError, Signature, Span, Spanned,
     SyntaxShape, Type, Value,
diff --git a/crates/nu-engine/src/compile/builder.rs b/crates/nu-engine/src/compile/builder.rs
new file mode 100644
index 0000000000..d77075cc3f
--- /dev/null
+++ b/crates/nu-engine/src/compile/builder.rs
@@ -0,0 +1,575 @@
+use nu_protocol::{
+    ir::{DataSlice, Instruction, IrAstRef, IrBlock, Literal},
+    CompileError, IntoSpanned, RegId, Span, Spanned,
+};
+
+/// A label identifier. Only exists while building code. Replaced with the actual target.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub(crate) struct LabelId(pub usize);
+
+/// Builds [`IrBlock`]s progressively by consuming instructions and handles register allocation.
+#[derive(Debug)]
+pub(crate) struct BlockBuilder {
+    pub(crate) block_span: Option<Span>,
+    pub(crate) instructions: Vec<Instruction>,
+    pub(crate) spans: Vec<Span>,
+    /// The actual instruction index that a label refers to. While building IR, branch targets are
+    /// specified as indices into this array rather than the true instruction index. This makes it
+    /// easier to make modifications to code, as just this array needs to be changed, and it's also
+    /// less error prone as during `finish()` we check to make sure all of the used labels have had
+    /// an index actually set.
+    pub(crate) labels: Vec<Option<usize>>,
+    pub(crate) data: Vec<u8>,
+    pub(crate) ast: Vec<Option<IrAstRef>>,
+    pub(crate) comments: Vec<String>,
+    pub(crate) register_allocation_state: Vec<bool>,
+    pub(crate) file_count: u32,
+    pub(crate) loop_stack: Vec<Loop>,
+}
+
+impl BlockBuilder {
+    /// Starts a new block, with the first register (`%0`) allocated as input.
+    pub(crate) fn new(block_span: Option<Span>) -> Self {
+        BlockBuilder {
+            block_span,
+            instructions: vec![],
+            spans: vec![],
+            labels: vec![],
+            data: vec![],
+            ast: vec![],
+            comments: vec![],
+            register_allocation_state: vec![true],
+            file_count: 0,
+            loop_stack: vec![],
+        }
+    }
+
+    /// Get the next unused register for code generation.
+    pub(crate) fn next_register(&mut self) -> Result<RegId, CompileError> {
+        if let Some(index) = self
+            .register_allocation_state
+            .iter_mut()
+            .position(|is_allocated| {
+                if !*is_allocated {
+                    *is_allocated = true;
+                    true
+                } else {
+                    false
+                }
+            })
+        {
+            Ok(RegId(index as u32))
+        } else if self.register_allocation_state.len() < (u32::MAX as usize - 2) {
+            let reg_id = RegId(self.register_allocation_state.len() as u32);
+            self.register_allocation_state.push(true);
+            Ok(reg_id)
+        } else {
+            Err(CompileError::RegisterOverflow {
+                block_span: self.block_span,
+            })
+        }
+    }
+
+    /// Check if a register is initialized with a value.
+    pub(crate) fn is_allocated(&self, reg_id: RegId) -> bool {
+        self.register_allocation_state
+            .get(reg_id.0 as usize)
+            .is_some_and(|state| *state)
+    }
+
+    /// Mark a register as initialized.
+    pub(crate) fn mark_register(&mut self, reg_id: RegId) -> Result<(), CompileError> {
+        if let Some(is_allocated) = self.register_allocation_state.get_mut(reg_id.0 as usize) {
+            *is_allocated = true;
+            Ok(())
+        } else {
+            Err(CompileError::RegisterOverflow {
+                block_span: self.block_span,
+            })
+        }
+    }
+
+    /// Mark a register as empty, so that it can be used again by something else.
+    #[track_caller]
+    pub(crate) fn free_register(&mut self, reg_id: RegId) -> Result<(), CompileError> {
+        let index = reg_id.0 as usize;
+
+        if self
+            .register_allocation_state
+            .get(index)
+            .is_some_and(|is_allocated| *is_allocated)
+        {
+            self.register_allocation_state[index] = false;
+            Ok(())
+        } else {
+            log::warn!("register {reg_id} uninitialized, builder = {self:#?}");
+            Err(CompileError::RegisterUninitialized {
+                reg_id,
+                caller: std::panic::Location::caller().to_string(),
+            })
+        }
+    }
+
+    /// Define a label, which can be used by branch instructions. The target can optionally be
+    /// specified now.
+    pub(crate) fn label(&mut self, target_index: Option<usize>) -> LabelId {
+        let label_id = self.labels.len();
+        self.labels.push(target_index);
+        LabelId(label_id)
+    }
+
+    /// Change the target of a label.
+    pub(crate) fn set_label(
+        &mut self,
+        label_id: LabelId,
+        target_index: usize,
+    ) -> Result<(), CompileError> {
+        *self
+            .labels
+            .get_mut(label_id.0)
+            .ok_or(CompileError::UndefinedLabel {
+                label_id: label_id.0,
+                span: None,
+            })? = Some(target_index);
+        Ok(())
+    }
+
+    /// Insert an instruction into the block, automatically marking any registers populated by
+    /// the instruction, and freeing any registers consumed by the instruction.
+    #[track_caller]
+    pub(crate) fn push(&mut self, instruction: Spanned<Instruction>) -> Result<(), CompileError> {
+        // Free read registers, and mark write registers.
+        //
+        // If a register is both read and written, it should be on both sides, so that we can verify
+        // that the register was in the right state beforehand.
+        let mut allocate = |read: &[RegId], write: &[RegId]| -> Result<(), CompileError> {
+            for reg in read {
+                self.free_register(*reg)?;
+            }
+            for reg in write {
+                self.mark_register(*reg)?;
+            }
+            Ok(())
+        };
+
+        let allocate_result = match &instruction.item {
+            Instruction::Unreachable => Ok(()),
+            Instruction::LoadLiteral { dst, lit } => {
+                allocate(&[], &[*dst]).and(
+                    // Free any registers on the literal
+                    match lit {
+                        Literal::Range {
+                            start,
+                            step,
+                            end,
+                            inclusion: _,
+                        } => allocate(&[*start, *step, *end], &[]),
+                        Literal::Bool(_)
+                        | Literal::Int(_)
+                        | Literal::Float(_)
+                        | Literal::Filesize(_)
+                        | Literal::Duration(_)
+                        | Literal::Binary(_)
+                        | Literal::Block(_)
+                        | Literal::Closure(_)
+                        | Literal::RowCondition(_)
+                        | Literal::List { capacity: _ }
+                        | Literal::Record { capacity: _ }
+                        | Literal::Filepath {
+                            val: _,
+                            no_expand: _,
+                        }
+                        | Literal::Directory {
+                            val: _,
+                            no_expand: _,
+                        }
+                        | Literal::GlobPattern {
+                            val: _,
+                            no_expand: _,
+                        }
+                        | Literal::String(_)
+                        | Literal::RawString(_)
+                        | Literal::CellPath(_)
+                        | Literal::Date(_)
+                        | Literal::Nothing => Ok(()),
+                    },
+                )
+            }
+            Instruction::LoadValue { dst, val: _ } => allocate(&[], &[*dst]),
+            Instruction::Move { dst, src } => allocate(&[*src], &[*dst]),
+            Instruction::Clone { dst, src } => allocate(&[*src], &[*dst, *src]),
+            Instruction::Collect { src_dst } => allocate(&[*src_dst], &[*src_dst]),
+            Instruction::Span { src_dst } => allocate(&[*src_dst], &[*src_dst]),
+            Instruction::Drop { src } => allocate(&[*src], &[]),
+            Instruction::Drain { src } => allocate(&[*src], &[]),
+            Instruction::LoadVariable { dst, var_id: _ } => allocate(&[], &[*dst]),
+            Instruction::StoreVariable { var_id: _, src } => allocate(&[*src], &[]),
+            Instruction::LoadEnv { dst, key: _ } => allocate(&[], &[*dst]),
+            Instruction::LoadEnvOpt { dst, key: _ } => allocate(&[], &[*dst]),
+            Instruction::StoreEnv { key: _, src } => allocate(&[*src], &[]),
+            Instruction::PushPositional { src } => allocate(&[*src], &[]),
+            Instruction::AppendRest { src } => allocate(&[*src], &[]),
+            Instruction::PushFlag { name: _ } => Ok(()),
+            Instruction::PushShortFlag { short: _ } => Ok(()),
+            Instruction::PushNamed { name: _, src } => allocate(&[*src], &[]),
+            Instruction::PushShortNamed { short: _, src } => allocate(&[*src], &[]),
+            Instruction::PushParserInfo { name: _, info: _ } => Ok(()),
+            Instruction::RedirectOut { mode: _ } => Ok(()),
+            Instruction::RedirectErr { mode: _ } => Ok(()),
+            Instruction::CheckErrRedirected { src } => allocate(&[*src], &[*src]),
+            Instruction::OpenFile {
+                file_num: _,
+                path,
+                append: _,
+            } => allocate(&[*path], &[]),
+            Instruction::WriteFile { file_num: _, src } => allocate(&[*src], &[]),
+            Instruction::CloseFile { file_num: _ } => Ok(()),
+            Instruction::Call {
+                decl_id: _,
+                src_dst,
+            } => allocate(&[*src_dst], &[*src_dst]),
+            Instruction::StringAppend { src_dst, val } => allocate(&[*src_dst, *val], &[*src_dst]),
+            Instruction::GlobFrom {
+                src_dst,
+                no_expand: _,
+            } => allocate(&[*src_dst], &[*src_dst]),
+            Instruction::ListPush { src_dst, item } => allocate(&[*src_dst, *item], &[*src_dst]),
+            Instruction::ListSpread { src_dst, items } => {
+                allocate(&[*src_dst, *items], &[*src_dst])
+            }
+            Instruction::RecordInsert { src_dst, key, val } => {
+                allocate(&[*src_dst, *key, *val], &[*src_dst])
+            }
+            Instruction::RecordSpread { src_dst, items } => {
+                allocate(&[*src_dst, *items], &[*src_dst])
+            }
+            Instruction::Not { src_dst } => allocate(&[*src_dst], &[*src_dst]),
+            Instruction::BinaryOp {
+                lhs_dst,
+                op: _,
+                rhs,
+            } => allocate(&[*lhs_dst, *rhs], &[*lhs_dst]),
+            Instruction::FollowCellPath { src_dst, path } => {
+                allocate(&[*src_dst, *path], &[*src_dst])
+            }
+            Instruction::CloneCellPath { dst, src, path } => {
+                allocate(&[*src, *path], &[*src, *dst])
+            }
+            Instruction::UpsertCellPath {
+                src_dst,
+                path,
+                new_value,
+            } => allocate(&[*src_dst, *path, *new_value], &[*src_dst]),
+            Instruction::Jump { index: _ } => Ok(()),
+            Instruction::BranchIf { cond, index: _ } => allocate(&[*cond], &[]),
+            Instruction::BranchIfEmpty { src, index: _ } => allocate(&[*src], &[*src]),
+            Instruction::Match {
+                pattern: _,
+                src,
+                index: _,
+            } => allocate(&[*src], &[*src]),
+            Instruction::CheckMatchGuard { src } => allocate(&[*src], &[*src]),
+            Instruction::Iterate {
+                dst,
+                stream,
+                end_index: _,
+            } => allocate(&[*stream], &[*dst, *stream]),
+            Instruction::OnError { index: _ } => Ok(()),
+            Instruction::OnErrorInto { index: _, dst } => allocate(&[], &[*dst]),
+            Instruction::PopErrorHandler => Ok(()),
+            Instruction::CheckExternalFailed { dst, src } => allocate(&[*src], &[*dst, *src]),
+            Instruction::ReturnEarly { src } => allocate(&[*src], &[]),
+            Instruction::Return { src } => allocate(&[*src], &[]),
+        };
+
+        // Add more context to the error
+        match allocate_result {
+            Ok(()) => (),
+            Err(CompileError::RegisterUninitialized { reg_id, caller }) => {
+                return Err(CompileError::RegisterUninitializedWhilePushingInstruction {
+                    reg_id,
+                    caller,
+                    instruction: format!("{:?}", instruction.item),
+                    span: instruction.span,
+                });
+            }
+            Err(err) => return Err(err),
+        }
+
+        self.instructions.push(instruction.item);
+        self.spans.push(instruction.span);
+        self.ast.push(None);
+        self.comments.push(String::new());
+        Ok(())
+    }
+
+    /// Set the AST of the last instruction. Separate method because it's rarely used.
+    pub(crate) fn set_last_ast(&mut self, ast_ref: Option<IrAstRef>) {
+        *self.ast.last_mut().expect("no last instruction") = ast_ref;
+    }
+
+    /// Add a comment to the last instruction.
+    pub(crate) fn add_comment(&mut self, comment: impl std::fmt::Display) {
+        add_comment(
+            self.comments.last_mut().expect("no last instruction"),
+            comment,
+        )
+    }
+
+    /// Load a register with a literal.
+    pub(crate) fn load_literal(
+        &mut self,
+        reg_id: RegId,
+        literal: Spanned<Literal>,
+    ) -> Result<(), CompileError> {
+        self.push(
+            Instruction::LoadLiteral {
+                dst: reg_id,
+                lit: literal.item,
+            }
+            .into_spanned(literal.span),
+        )?;
+        Ok(())
+    }
+
+    /// Allocate a new register and load a literal into it.
+    pub(crate) fn literal(&mut self, literal: Spanned<Literal>) -> Result<RegId, CompileError> {
+        let reg_id = self.next_register()?;
+        self.load_literal(reg_id, literal)?;
+        Ok(reg_id)
+    }
+
+    /// Deallocate a register and set it to `Empty`, if it is allocated
+    pub(crate) fn drop_reg(&mut self, reg_id: RegId) -> Result<(), CompileError> {
+        if self.is_allocated(reg_id) {
+            self.push(Instruction::Drop { src: reg_id }.into_spanned(Span::unknown()))?;
+        }
+        Ok(())
+    }
+
+    /// Set a register to `Empty`, but mark it as in-use, e.g. for input
+    pub(crate) fn load_empty(&mut self, reg_id: RegId) -> Result<(), CompileError> {
+        self.drop_reg(reg_id)?;
+        self.mark_register(reg_id)
+    }
+
+    /// Drain the stream in a register (fully consuming it)
+    pub(crate) fn drain(&mut self, src: RegId, span: Span) -> Result<(), CompileError> {
+        self.push(Instruction::Drain { src }.into_spanned(span))
+    }
+
+    /// Add data to the `data` array and return a [`DataSlice`] referencing it.
+    pub(crate) fn data(&mut self, data: impl AsRef<[u8]>) -> Result<DataSlice, CompileError> {
+        let data = data.as_ref();
+        let start = self.data.len();
+        if data.is_empty() {
+            Ok(DataSlice::empty())
+        } else if start + data.len() < u32::MAX as usize {
+            let slice = DataSlice {
+                start: start as u32,
+                len: data.len() as u32,
+            };
+            self.data.extend_from_slice(data);
+            Ok(slice)
+        } else {
+            Err(CompileError::DataOverflow {
+                block_span: self.block_span,
+            })
+        }
+    }
+
+    /// Clone a register with a `clone` instruction.
+    pub(crate) fn clone_reg(&mut self, src: RegId, span: Span) -> Result<RegId, CompileError> {
+        let dst = self.next_register()?;
+        self.push(Instruction::Clone { dst, src }.into_spanned(span))?;
+        Ok(dst)
+    }
+
+    /// Add a `branch-if` instruction
+    pub(crate) fn branch_if(
+        &mut self,
+        cond: RegId,
+        label_id: LabelId,
+        span: Span,
+    ) -> Result<(), CompileError> {
+        self.push(
+            Instruction::BranchIf {
+                cond,
+                index: label_id.0,
+            }
+            .into_spanned(span),
+        )
+    }
+
+    /// Add a `branch-if-empty` instruction
+    pub(crate) fn branch_if_empty(
+        &mut self,
+        src: RegId,
+        label_id: LabelId,
+        span: Span,
+    ) -> Result<(), CompileError> {
+        self.push(
+            Instruction::BranchIfEmpty {
+                src,
+                index: label_id.0,
+            }
+            .into_spanned(span),
+        )
+    }
+
+    /// Add a `jump` instruction
+    pub(crate) fn jump(&mut self, label_id: LabelId, span: Span) -> Result<(), CompileError> {
+        self.push(Instruction::Jump { index: label_id.0 }.into_spanned(span))
+    }
+
+    /// The index that the next instruction [`.push()`]ed will have.
+    pub(crate) fn here(&self) -> usize {
+        self.instructions.len()
+    }
+
+    /// Allocate a new file number, for redirection.
+    pub(crate) fn next_file_num(&mut self) -> Result<u32, CompileError> {
+        let next = self.file_count;
+        self.file_count = self
+            .file_count
+            .checked_add(1)
+            .ok_or(CompileError::FileOverflow {
+                block_span: self.block_span,
+            })?;
+        Ok(next)
+    }
+
+    /// Push a new loop state onto the builder. Creates new labels that must be set.
+    pub(crate) fn begin_loop(&mut self) -> Loop {
+        let loop_ = Loop {
+            break_label: self.label(None),
+            continue_label: self.label(None),
+        };
+        self.loop_stack.push(loop_);
+        loop_
+    }
+
+    /// True if we are currently in a loop.
+    pub(crate) fn is_in_loop(&self) -> bool {
+        !self.loop_stack.is_empty()
+    }
+
+    /// Add a loop breaking jump instruction.
+    pub(crate) fn push_break(&mut self, span: Span) -> Result<(), CompileError> {
+        let loop_ = self
+            .loop_stack
+            .last()
+            .ok_or_else(|| CompileError::NotInALoop {
+                msg: "`break` called from outside of a loop".into(),
+                span: Some(span),
+            })?;
+        self.jump(loop_.break_label, span)
+    }
+
+    /// Add a loop continuing jump instruction.
+    pub(crate) fn push_continue(&mut self, span: Span) -> Result<(), CompileError> {
+        let loop_ = self
+            .loop_stack
+            .last()
+            .ok_or_else(|| CompileError::NotInALoop {
+                msg: "`continue` called from outside of a loop".into(),
+                span: Some(span),
+            })?;
+        self.jump(loop_.continue_label, span)
+    }
+
+    /// Pop the loop state. Checks that the loop being ended is the same one that was expected.
+    pub(crate) fn end_loop(&mut self, loop_: Loop) -> Result<(), CompileError> {
+        let ended_loop = self
+            .loop_stack
+            .pop()
+            .ok_or_else(|| CompileError::NotInALoop {
+                msg: "end_loop() called outside of a loop".into(),
+                span: None,
+            })?;
+
+        if ended_loop == loop_ {
+            Ok(())
+        } else {
+            Err(CompileError::IncoherentLoopState {
+                block_span: self.block_span,
+            })
+        }
+    }
+
+    /// Mark an unreachable code path. Produces an error at runtime if executed.
+    pub(crate) fn unreachable(&mut self, span: Span) -> Result<(), CompileError> {
+        self.push(Instruction::Unreachable.into_spanned(span))
+    }
+
+    /// Consume the builder and produce the final [`IrBlock`].
+    pub(crate) fn finish(mut self) -> Result<IrBlock, CompileError> {
+        // Add comments to label targets
+        for (index, label_target) in self.labels.iter().enumerate() {
+            if let Some(label_target) = label_target {
+                add_comment(
+                    &mut self.comments[*label_target],
+                    format_args!("label({index})"),
+                );
+            }
+        }
+
+        // Populate the actual target indices of labels into the instructions
+        for ((index, instruction), span) in
+            self.instructions.iter_mut().enumerate().zip(&self.spans)
+        {
+            if let Some(label_id) = instruction.branch_target() {
+                let target_index = self.labels.get(label_id).cloned().flatten().ok_or(
+                    CompileError::UndefinedLabel {
+                        label_id,
+                        span: Some(*span),
+                    },
+                )?;
+                // Add a comment to the target index that we come from here
+                add_comment(
+                    &mut self.comments[target_index],
+                    format_args!("from({index}:)"),
+                );
+                instruction.set_branch_target(target_index).map_err(|_| {
+                    CompileError::SetBranchTargetOfNonBranchInstruction {
+                        instruction: format!("{:?}", instruction),
+                        span: *span,
+                    }
+                })?;
+            }
+        }
+
+        Ok(IrBlock {
+            instructions: self.instructions,
+            spans: self.spans,
+            data: self.data.into(),
+            ast: self.ast,
+            comments: self.comments.into_iter().map(|s| s.into()).collect(),
+            register_count: self
+                .register_allocation_state
+                .len()
+                .try_into()
+                .expect("register count overflowed in finish() despite previous checks"),
+            file_count: self.file_count,
+        })
+    }
+}
+
+/// Keeps track of the `break` and `continue` target labels for a loop.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub(crate) struct Loop {
+    pub(crate) break_label: LabelId,
+    pub(crate) continue_label: LabelId,
+}
+
+/// Add a new comment to an existing one
+fn add_comment(comment: &mut String, new_comment: impl std::fmt::Display) {
+    use std::fmt::Write;
+    write!(
+        comment,
+        "{}{}",
+        if comment.is_empty() { "" } else { ", " },
+        new_comment
+    )
+    .expect("formatting failed");
+}
diff --git a/crates/nu-engine/src/compile/call.rs b/crates/nu-engine/src/compile/call.rs
new file mode 100644
index 0000000000..d9f1b8e581
--- /dev/null
+++ b/crates/nu-engine/src/compile/call.rs
@@ -0,0 +1,270 @@
+use std::sync::Arc;
+
+use nu_protocol::{
+    ast::{Argument, Call, Expression, ExternalArgument},
+    engine::StateWorkingSet,
+    ir::{Instruction, IrAstRef, Literal},
+    IntoSpanned, RegId, Span, Spanned,
+};
+
+use super::{compile_expression, keyword::*, BlockBuilder, CompileError, RedirectModes};
+
+pub(crate) fn compile_call(
+    working_set: &StateWorkingSet,
+    builder: &mut BlockBuilder,
+    call: &Call,
+    redirect_modes: RedirectModes,
+    io_reg: RegId,
+) -> Result<(), CompileError> {
+    let decl = working_set.get_decl(call.decl_id);
+
+    // Check if this call has --help - if so, just redirect to `help`
+    if call.named_iter().any(|(name, _, _)| name.item == "help") {
+        return compile_help(
+            working_set,
+            builder,
+            decl.name().into_spanned(call.head),
+            io_reg,
+        );
+    }
+
+    // Try to figure out if this is a keyword call like `if`, and handle those specially
+    if decl.is_keyword() {
+        match decl.name() {
+            "if" => {
+                return compile_if(working_set, builder, call, redirect_modes, io_reg);
+            }
+            "match" => {
+                return compile_match(working_set, builder, call, redirect_modes, io_reg);
+            }
+            "const" => {
+                // This differs from the behavior of the const command, which adds the const value
+                // to the stack. Since `load-variable` also checks `engine_state` for the variable
+                // and will get a const value though, is it really necessary to do that?
+                return builder.load_empty(io_reg);
+            }
+            "alias" => {
+                // Alias does nothing
+                return builder.load_empty(io_reg);
+            }
+            "let" | "mut" => {
+                return compile_let(working_set, builder, call, redirect_modes, io_reg);
+            }
+            "try" => {
+                return compile_try(working_set, builder, call, redirect_modes, io_reg);
+            }
+            "loop" => {
+                return compile_loop(working_set, builder, call, redirect_modes, io_reg);
+            }
+            "while" => {
+                return compile_while(working_set, builder, call, redirect_modes, io_reg);
+            }
+            "for" => {
+                return compile_for(working_set, builder, call, redirect_modes, io_reg);
+            }
+            "break" => {
+                return compile_break(working_set, builder, call, redirect_modes, io_reg);
+            }
+            "continue" => {
+                return compile_continue(working_set, builder, call, redirect_modes, io_reg);
+            }
+            "return" => {
+                return compile_return(working_set, builder, call, redirect_modes, io_reg);
+            }
+            _ => (),
+        }
+    }
+
+    // Keep AST if the decl needs it.
+    let requires_ast = decl.requires_ast_for_arguments();
+
+    // It's important that we evaluate the args first before trying to set up the argument
+    // state for the call.
+    //
+    // We could technically compile anything that isn't another call safely without worrying about
+    // the argument state, but we'd have to check all of that first and it just isn't really worth
+    // it.
+    enum CompiledArg<'a> {
+        Positional(RegId, Span, Option<IrAstRef>),
+        Named(
+            &'a str,
+            Option<&'a str>,
+            Option<RegId>,
+            Span,
+            Option<IrAstRef>,
+        ),
+        Spread(RegId, Span, Option<IrAstRef>),
+    }
+
+    let mut compiled_args = vec![];
+
+    for arg in &call.arguments {
+        let arg_reg = arg
+            .expr()
+            .map(|expr| {
+                let arg_reg = builder.next_register()?;
+
+                compile_expression(
+                    working_set,
+                    builder,
+                    expr,
+                    RedirectModes::capture_out(arg.span()),
+                    None,
+                    arg_reg,
+                )?;
+
+                Ok(arg_reg)
+            })
+            .transpose()?;
+
+        let ast_ref = arg
+            .expr()
+            .filter(|_| requires_ast)
+            .map(|expr| IrAstRef(Arc::new(expr.clone())));
+
+        match arg {
+            Argument::Positional(_) | Argument::Unknown(_) => {
+                compiled_args.push(CompiledArg::Positional(
+                    arg_reg.expect("expr() None in non-Named"),
+                    arg.span(),
+                    ast_ref,
+                ))
+            }
+            Argument::Named((name, short, _)) => compiled_args.push(CompiledArg::Named(
+                &name.item,
+                short.as_ref().map(|spanned| spanned.item.as_str()),
+                arg_reg,
+                arg.span(),
+                ast_ref,
+            )),
+            Argument::Spread(_) => compiled_args.push(CompiledArg::Spread(
+                arg_reg.expect("expr() None in non-Named"),
+                arg.span(),
+                ast_ref,
+            )),
+        }
+    }
+
+    // Now that the args are all compiled, set up the call state (argument stack and redirections)
+    for arg in compiled_args {
+        match arg {
+            CompiledArg::Positional(reg, span, ast_ref) => {
+                builder.push(Instruction::PushPositional { src: reg }.into_spanned(span))?;
+                builder.set_last_ast(ast_ref);
+            }
+            CompiledArg::Named(name, short, Some(reg), span, ast_ref) => {
+                if !name.is_empty() {
+                    let name = builder.data(name)?;
+                    builder.push(Instruction::PushNamed { name, src: reg }.into_spanned(span))?;
+                } else {
+                    let short = builder.data(short.unwrap_or(""))?;
+                    builder
+                        .push(Instruction::PushShortNamed { short, src: reg }.into_spanned(span))?;
+                }
+                builder.set_last_ast(ast_ref);
+            }
+            CompiledArg::Named(name, short, None, span, ast_ref) => {
+                if !name.is_empty() {
+                    let name = builder.data(name)?;
+                    builder.push(Instruction::PushFlag { name }.into_spanned(span))?;
+                } else {
+                    let short = builder.data(short.unwrap_or(""))?;
+                    builder.push(Instruction::PushShortFlag { short }.into_spanned(span))?;
+                }
+                builder.set_last_ast(ast_ref);
+            }
+            CompiledArg::Spread(reg, span, ast_ref) => {
+                builder.push(Instruction::AppendRest { src: reg }.into_spanned(span))?;
+                builder.set_last_ast(ast_ref);
+            }
+        }
+    }
+
+    // Add any parser info from the call
+    for (name, info) in &call.parser_info {
+        let name = builder.data(name)?;
+        let info = Box::new(info.clone());
+        builder.push(Instruction::PushParserInfo { name, info }.into_spanned(call.head))?;
+    }
+
+    if let Some(mode) = redirect_modes.out {
+        builder.push(mode.map(|mode| Instruction::RedirectOut { mode }))?;
+    }
+
+    if let Some(mode) = redirect_modes.err {
+        builder.push(mode.map(|mode| Instruction::RedirectErr { mode }))?;
+    }
+
+    // The state is set up, so we can do the call into io_reg
+    builder.push(
+        Instruction::Call {
+            decl_id: call.decl_id,
+            src_dst: io_reg,
+        }
+        .into_spanned(call.head),
+    )?;
+
+    Ok(())
+}
+
+pub(crate) fn compile_help(
+    working_set: &StateWorkingSet<'_>,
+    builder: &mut BlockBuilder,
+    decl_name: Spanned<&str>,
+    io_reg: RegId,
+) -> Result<(), CompileError> {
+    let help_command_id =
+        working_set
+            .find_decl(b"help")
+            .ok_or_else(|| CompileError::MissingRequiredDeclaration {
+                decl_name: "help".into(),
+                span: decl_name.span,
+            })?;
+
+    let name_data = builder.data(decl_name.item)?;
+    let name_literal = builder.literal(decl_name.map(|_| Literal::String(name_data)))?;
+
+    builder.push(Instruction::PushPositional { src: name_literal }.into_spanned(decl_name.span))?;
+
+    builder.push(
+        Instruction::Call {
+            decl_id: help_command_id,
+            src_dst: io_reg,
+        }
+        .into_spanned(decl_name.span),
+    )?;
+
+    Ok(())
+}
+
+pub(crate) fn compile_external_call(
+    working_set: &StateWorkingSet,
+    builder: &mut BlockBuilder,
+    head: &Expression,
+    args: &[ExternalArgument],
+    redirect_modes: RedirectModes,
+    io_reg: RegId,
+) -> Result<(), CompileError> {
+    // Pass everything to run-external
+    let run_external_id = working_set
+        .find_decl(b"run-external")
+        .ok_or(CompileError::RunExternalNotFound { span: head.span })?;
+
+    let mut call = Call::new(head.span);
+    call.decl_id = run_external_id;
+
+    call.arguments.push(Argument::Positional(head.clone()));
+
+    for arg in args {
+        match arg {
+            ExternalArgument::Regular(expr) => {
+                call.arguments.push(Argument::Positional(expr.clone()));
+            }
+            ExternalArgument::Spread(expr) => {
+                call.arguments.push(Argument::Spread(expr.clone()));
+            }
+        }
+    }
+
+    compile_call(working_set, builder, &call, redirect_modes, io_reg)
+}
diff --git a/crates/nu-engine/src/compile/expression.rs b/crates/nu-engine/src/compile/expression.rs
new file mode 100644
index 0000000000..38ee58ea26
--- /dev/null
+++ b/crates/nu-engine/src/compile/expression.rs
@@ -0,0 +1,535 @@
+use super::{
+    compile_binary_op, compile_block, compile_call, compile_external_call, compile_load_env,
+    BlockBuilder, CompileError, RedirectModes,
+};
+
+use nu_protocol::{
+    ast::{CellPath, Expr, Expression, ListItem, RecordItem, ValueWithUnit},
+    engine::StateWorkingSet,
+    ir::{DataSlice, Instruction, Literal},
+    IntoSpanned, RegId, Span, Value, ENV_VARIABLE_ID,
+};
+
+pub(crate) fn compile_expression(
+    working_set: &StateWorkingSet,
+    builder: &mut BlockBuilder,
+    expr: &Expression,
+    redirect_modes: RedirectModes,
+    in_reg: Option<RegId>,
+    out_reg: RegId,
+) -> Result<(), CompileError> {
+    let drop_input = |builder: &mut BlockBuilder| {
+        if let Some(in_reg) = in_reg {
+            if in_reg != out_reg {
+                builder.drop_reg(in_reg)?;
+            }
+        }
+        Ok(())
+    };
+
+    let lit = |builder: &mut BlockBuilder, literal: Literal| {
+        drop_input(builder)?;
+
+        builder
+            .push(
+                Instruction::LoadLiteral {
+                    dst: out_reg,
+                    lit: literal,
+                }
+                .into_spanned(expr.span),
+            )
+            .map(|_| ())
+    };
+
+    let ignore = |builder: &mut BlockBuilder| {
+        drop_input(builder)?;
+        builder.load_empty(out_reg)
+    };
+
+    let unexpected = |expr_name: &str| CompileError::UnexpectedExpression {
+        expr_name: expr_name.into(),
+        span: expr.span,
+    };
+
+    let move_in_reg_to_out_reg = |builder: &mut BlockBuilder| {
+        // Ensure that out_reg contains the input value, because a call only uses one register
+        if let Some(in_reg) = in_reg {
+            if in_reg != out_reg {
+                // Have to move in_reg to out_reg so it can be used
+                builder.push(
+                    Instruction::Move {
+                        dst: out_reg,
+                        src: in_reg,
+                    }
+                    .into_spanned(expr.span),
+                )?;
+            }
+        } else {
+            // Will have to initialize out_reg with Empty first
+            builder.load_empty(out_reg)?;
+        }
+        Ok(())
+    };
+
+    match &expr.expr {
+        Expr::Bool(b) => lit(builder, Literal::Bool(*b)),
+        Expr::Int(i) => lit(builder, Literal::Int(*i)),
+        Expr::Float(f) => lit(builder, Literal::Float(*f)),
+        Expr::Binary(bin) => {
+            let data_slice = builder.data(bin)?;
+            lit(builder, Literal::Binary(data_slice))
+        }
+        Expr::Range(range) => {
+            // Compile the subexpressions of the range
+            let compile_part = |builder: &mut BlockBuilder,
+                                part_expr: Option<&Expression>|
+             -> Result<RegId, CompileError> {
+                let reg = builder.next_register()?;
+                if let Some(part_expr) = part_expr {
+                    compile_expression(
+                        working_set,
+                        builder,
+                        part_expr,
+                        RedirectModes::capture_out(part_expr.span),
+                        None,
+                        reg,
+                    )?;
+                } else {
+                    builder.load_literal(reg, Literal::Nothing.into_spanned(expr.span))?;
+                }
+                Ok(reg)
+            };
+
+            drop_input(builder)?;
+
+            let start = compile_part(builder, range.from.as_ref())?;
+            let step = compile_part(builder, range.next.as_ref())?;
+            let end = compile_part(builder, range.to.as_ref())?;
+
+            // Assemble the range
+            builder.load_literal(
+                out_reg,
+                Literal::Range {
+                    start,
+                    step,
+                    end,
+                    inclusion: range.operator.inclusion,
+                }
+                .into_spanned(expr.span),
+            )
+        }
+        Expr::Var(var_id) => {
+            drop_input(builder)?;
+            builder.push(
+                Instruction::LoadVariable {
+                    dst: out_reg,
+                    var_id: *var_id,
+                }
+                .into_spanned(expr.span),
+            )?;
+            Ok(())
+        }
+        Expr::VarDecl(_) => Err(unexpected("VarDecl")),
+        Expr::Call(call) => {
+            move_in_reg_to_out_reg(builder)?;
+
+            compile_call(working_set, builder, call, redirect_modes, out_reg)
+        }
+        Expr::ExternalCall(head, args) => {
+            move_in_reg_to_out_reg(builder)?;
+
+            compile_external_call(working_set, builder, head, args, redirect_modes, out_reg)
+        }
+        Expr::Operator(_) => Err(unexpected("Operator")),
+        Expr::RowCondition(block_id) => lit(builder, Literal::RowCondition(*block_id)),
+        Expr::UnaryNot(subexpr) => {
+            drop_input(builder)?;
+            compile_expression(
+                working_set,
+                builder,
+                subexpr,
+                RedirectModes::capture_out(subexpr.span),
+                None,
+                out_reg,
+            )?;
+            builder.push(Instruction::Not { src_dst: out_reg }.into_spanned(expr.span))?;
+            Ok(())
+        }
+        Expr::BinaryOp(lhs, op, rhs) => {
+            if let Expr::Operator(ref operator) = op.expr {
+                drop_input(builder)?;
+                compile_binary_op(
+                    working_set,
+                    builder,
+                    lhs,
+                    operator.clone().into_spanned(op.span),
+                    rhs,
+                    expr.span,
+                    out_reg,
+                )
+            } else {
+                Err(CompileError::UnsupportedOperatorExpression { span: op.span })
+            }
+        }
+        Expr::Subexpression(block_id) => {
+            let block = working_set.get_block(*block_id);
+            compile_block(working_set, builder, block, redirect_modes, in_reg, out_reg)
+        }
+        Expr::Block(block_id) => lit(builder, Literal::Block(*block_id)),
+        Expr::Closure(block_id) => lit(builder, Literal::Closure(*block_id)),
+        Expr::MatchBlock(_) => Err(unexpected("MatchBlock")), // only for `match` keyword
+        Expr::List(items) => {
+            // Guess capacity based on items (does not consider spread as more than 1)
+            lit(
+                builder,
+                Literal::List {
+                    capacity: items.len(),
+                },
+            )?;
+            for item in items {
+                // Compile the expression of the item / spread
+                let reg = builder.next_register()?;
+                let expr = match item {
+                    ListItem::Item(expr) | ListItem::Spread(_, expr) => expr,
+                };
+                compile_expression(
+                    working_set,
+                    builder,
+                    expr,
+                    RedirectModes::capture_out(expr.span),
+                    None,
+                    reg,
+                )?;
+
+                match item {
+                    ListItem::Item(_) => {
+                        // Add each item using list-push
+                        builder.push(
+                            Instruction::ListPush {
+                                src_dst: out_reg,
+                                item: reg,
+                            }
+                            .into_spanned(expr.span),
+                        )?;
+                    }
+                    ListItem::Spread(spread_span, _) => {
+                        // Spread the list using list-spread
+                        builder.push(
+                            Instruction::ListSpread {
+                                src_dst: out_reg,
+                                items: reg,
+                            }
+                            .into_spanned(*spread_span),
+                        )?;
+                    }
+                }
+            }
+            Ok(())
+        }
+        Expr::Table(table) => {
+            lit(
+                builder,
+                Literal::List {
+                    capacity: table.rows.len(),
+                },
+            )?;
+
+            // Evaluate the columns
+            let column_registers = table
+                .columns
+                .iter()
+                .map(|column| {
+                    let reg = builder.next_register()?;
+                    compile_expression(
+                        working_set,
+                        builder,
+                        column,
+                        RedirectModes::capture_out(column.span),
+                        None,
+                        reg,
+                    )?;
+                    Ok(reg)
+                })
+                .collect::<Result<Vec<RegId>, CompileError>>()?;
+
+            // Build records for each row
+            for row in table.rows.iter() {
+                let row_reg = builder.next_register()?;
+                builder.load_literal(
+                    row_reg,
+                    Literal::Record {
+                        capacity: table.columns.len(),
+                    }
+                    .into_spanned(expr.span),
+                )?;
+                for (column_reg, item) in column_registers.iter().zip(row.iter()) {
+                    let column_reg = builder.clone_reg(*column_reg, item.span)?;
+                    let item_reg = builder.next_register()?;
+                    compile_expression(
+                        working_set,
+                        builder,
+                        item,
+                        RedirectModes::capture_out(item.span),
+                        None,
+                        item_reg,
+                    )?;
+                    builder.push(
+                        Instruction::RecordInsert {
+                            src_dst: row_reg,
+                            key: column_reg,
+                            val: item_reg,
+                        }
+                        .into_spanned(item.span),
+                    )?;
+                }
+                builder.push(
+                    Instruction::ListPush {
+                        src_dst: out_reg,
+                        item: row_reg,
+                    }
+                    .into_spanned(expr.span),
+                )?;
+            }
+
+            // Free the column registers, since they aren't needed anymore
+            for reg in column_registers {
+                builder.drop_reg(reg)?;
+            }
+
+            Ok(())
+        }
+        Expr::Record(items) => {
+            lit(
+                builder,
+                Literal::Record {
+                    capacity: items.len(),
+                },
+            )?;
+
+            for item in items {
+                match item {
+                    RecordItem::Pair(key, val) => {
+                        // Add each item using record-insert
+                        let key_reg = builder.next_register()?;
+                        let val_reg = builder.next_register()?;
+                        compile_expression(
+                            working_set,
+                            builder,
+                            key,
+                            RedirectModes::capture_out(key.span),
+                            None,
+                            key_reg,
+                        )?;
+                        compile_expression(
+                            working_set,
+                            builder,
+                            val,
+                            RedirectModes::capture_out(val.span),
+                            None,
+                            val_reg,
+                        )?;
+                        builder.push(
+                            Instruction::RecordInsert {
+                                src_dst: out_reg,
+                                key: key_reg,
+                                val: val_reg,
+                            }
+                            .into_spanned(expr.span),
+                        )?;
+                    }
+                    RecordItem::Spread(spread_span, expr) => {
+                        // Spread the expression using record-spread
+                        let reg = builder.next_register()?;
+                        compile_expression(
+                            working_set,
+                            builder,
+                            expr,
+                            RedirectModes::capture_out(expr.span),
+                            None,
+                            reg,
+                        )?;
+                        builder.push(
+                            Instruction::RecordSpread {
+                                src_dst: out_reg,
+                                items: reg,
+                            }
+                            .into_spanned(*spread_span),
+                        )?;
+                    }
+                }
+            }
+            Ok(())
+        }
+        Expr::Keyword(kw) => {
+            // keyword: just pass through expr, since commands that use it and are not being
+            // specially handled already are often just positional anyway
+            compile_expression(
+                working_set,
+                builder,
+                &kw.expr,
+                redirect_modes,
+                in_reg,
+                out_reg,
+            )
+        }
+        Expr::ValueWithUnit(value_with_unit) => {
+            lit(builder, literal_from_value_with_unit(value_with_unit)?)
+        }
+        Expr::DateTime(dt) => lit(builder, Literal::Date(Box::new(*dt))),
+        Expr::Filepath(path, no_expand) => {
+            let val = builder.data(path)?;
+            lit(
+                builder,
+                Literal::Filepath {
+                    val,
+                    no_expand: *no_expand,
+                },
+            )
+        }
+        Expr::Directory(path, no_expand) => {
+            let val = builder.data(path)?;
+            lit(
+                builder,
+                Literal::Directory {
+                    val,
+                    no_expand: *no_expand,
+                },
+            )
+        }
+        Expr::GlobPattern(path, no_expand) => {
+            let val = builder.data(path)?;
+            lit(
+                builder,
+                Literal::GlobPattern {
+                    val,
+                    no_expand: *no_expand,
+                },
+            )
+        }
+        Expr::String(s) => {
+            let data_slice = builder.data(s)?;
+            lit(builder, Literal::String(data_slice))
+        }
+        Expr::RawString(rs) => {
+            let data_slice = builder.data(rs)?;
+            lit(builder, Literal::RawString(data_slice))
+        }
+        Expr::CellPath(path) => lit(builder, Literal::CellPath(Box::new(path.clone()))),
+        Expr::FullCellPath(full_cell_path) => {
+            if matches!(full_cell_path.head.expr, Expr::Var(ENV_VARIABLE_ID)) {
+                compile_load_env(builder, expr.span, &full_cell_path.tail, out_reg)
+            } else {
+                compile_expression(
+                    working_set,
+                    builder,
+                    &full_cell_path.head,
+                    RedirectModes::capture_out(expr.span),
+                    in_reg,
+                    out_reg,
+                )?;
+                // Only do the follow if this is actually needed
+                if !full_cell_path.tail.is_empty() {
+                    let cell_path_reg = builder.literal(
+                        Literal::CellPath(Box::new(CellPath {
+                            members: full_cell_path.tail.clone(),
+                        }))
+                        .into_spanned(expr.span),
+                    )?;
+                    builder.push(
+                        Instruction::FollowCellPath {
+                            src_dst: out_reg,
+                            path: cell_path_reg,
+                        }
+                        .into_spanned(expr.span),
+                    )?;
+                }
+                Ok(())
+            }
+        }
+        Expr::ImportPattern(_) => Err(unexpected("ImportPattern")),
+        Expr::Overlay(_) => Err(unexpected("Overlay")),
+        Expr::Signature(_) => ignore(builder), // no effect
+        Expr::StringInterpolation(exprs) | Expr::GlobInterpolation(exprs, _) => {
+            let mut exprs_iter = exprs.iter().peekable();
+
+            if exprs_iter
+                .peek()
+                .is_some_and(|e| matches!(e.expr, Expr::String(..) | Expr::RawString(..)))
+            {
+                // If the first expression is a string or raw string literal, just take it and build
+                // from that
+                compile_expression(
+                    working_set,
+                    builder,
+                    exprs_iter.next().expect("peek() was Some"),
+                    RedirectModes::capture_out(expr.span),
+                    None,
+                    out_reg,
+                )?;
+            } else {
+                // Start with an empty string
+                lit(builder, Literal::String(DataSlice::empty()))?;
+            }
+
+            // Compile each expression and append to out_reg
+            for expr in exprs_iter {
+                let scratch_reg = builder.next_register()?;
+                compile_expression(
+                    working_set,
+                    builder,
+                    expr,
+                    RedirectModes::capture_out(expr.span),
+                    None,
+                    scratch_reg,
+                )?;
+                builder.push(
+                    Instruction::StringAppend {
+                        src_dst: out_reg,
+                        val: scratch_reg,
+                    }
+                    .into_spanned(expr.span),
+                )?;
+            }
+
+            // If it's a glob interpolation, change it to a glob
+            if let Expr::GlobInterpolation(_, no_expand) = expr.expr {
+                builder.push(
+                    Instruction::GlobFrom {
+                        src_dst: out_reg,
+                        no_expand,
+                    }
+                    .into_spanned(expr.span),
+                )?;
+            }
+
+            Ok(())
+        }
+        Expr::Nothing => lit(builder, Literal::Nothing),
+        Expr::Garbage => Err(CompileError::Garbage { span: expr.span }),
+    }
+}
+
+fn literal_from_value_with_unit(value_with_unit: &ValueWithUnit) -> Result<Literal, CompileError> {
+    let Expr::Int(int_value) = value_with_unit.expr.expr else {
+        return Err(CompileError::UnexpectedExpression {
+            expr_name: format!("{:?}", value_with_unit.expr),
+            span: value_with_unit.expr.span,
+        });
+    };
+
+    match value_with_unit
+        .unit
+        .item
+        .build_value(int_value, Span::unknown())
+        .map_err(|err| CompileError::InvalidLiteral {
+            msg: err.to_string(),
+            span: value_with_unit.expr.span,
+        })? {
+        Value::Filesize { val, .. } => Ok(Literal::Filesize(val)),
+        Value::Duration { val, .. } => Ok(Literal::Duration(val)),
+        other => Err(CompileError::InvalidLiteral {
+            msg: format!("bad value returned by Unit::build_value(): {other:?}"),
+            span: value_with_unit.unit.span,
+        }),
+    }
+}
diff --git a/crates/nu-engine/src/compile/keyword.rs b/crates/nu-engine/src/compile/keyword.rs
new file mode 100644
index 0000000000..12f4a54c10
--- /dev/null
+++ b/crates/nu-engine/src/compile/keyword.rs
@@ -0,0 +1,902 @@
+use nu_protocol::{
+    ast::{Block, Call, Expr, Expression},
+    engine::StateWorkingSet,
+    ir::Instruction,
+    IntoSpanned, RegId, Type, VarId,
+};
+
+use super::{compile_block, compile_expression, BlockBuilder, CompileError, RedirectModes};
+
+/// Compile a call to `if` as a branch-if
+pub(crate) fn compile_if(
+    working_set: &StateWorkingSet,
+    builder: &mut BlockBuilder,
+    call: &Call,
+    redirect_modes: RedirectModes,
+    io_reg: RegId,
+) -> Result<(), CompileError> {
+    // Pseudocode:
+    //
+    //        %io_reg <- <condition>
+    //        not %io_reg
+    //        branch-if %io_reg, FALSE
+    // TRUE:  ...<true_block>...
+    //        jump END
+    // FALSE: ...<else_expr>... OR drop %io_reg
+    // END:
+    let invalid = || CompileError::InvalidKeywordCall {
+        keyword: "if".into(),
+        span: call.head,
+    };
+
+    let condition = call.positional_nth(0).ok_or_else(invalid)?;
+    let true_block_arg = call.positional_nth(1).ok_or_else(invalid)?;
+    let else_arg = call.positional_nth(2);
+
+    let true_block_id = true_block_arg.as_block().ok_or_else(invalid)?;
+    let true_block = working_set.get_block(true_block_id);
+
+    let true_label = builder.label(None);
+    let false_label = builder.label(None);
+    let end_label = builder.label(None);
+
+    let not_condition_reg = {
+        // Compile the condition first
+        let condition_reg = builder.next_register()?;
+        compile_expression(
+            working_set,
+            builder,
+            condition,
+            RedirectModes::capture_out(condition.span),
+            None,
+            condition_reg,
+        )?;
+
+        // Negate the condition - we basically only want to jump if the condition is false
+        builder.push(
+            Instruction::Not {
+                src_dst: condition_reg,
+            }
+            .into_spanned(call.head),
+        )?;
+
+        condition_reg
+    };
+
+    // Set up a branch if the condition is false.
+    builder.branch_if(not_condition_reg, false_label, call.head)?;
+    builder.add_comment("if false");
+
+    // Compile the true case
+    builder.set_label(true_label, builder.here())?;
+    compile_block(
+        working_set,
+        builder,
+        true_block,
+        redirect_modes.clone(),
+        Some(io_reg),
+        io_reg,
+    )?;
+
+    // Add a jump over the false case
+    builder.jump(end_label, else_arg.map(|e| e.span).unwrap_or(call.head))?;
+    builder.add_comment("end if");
+
+    // On the else side now, assert that io_reg is still valid
+    builder.set_label(false_label, builder.here())?;
+    builder.mark_register(io_reg)?;
+
+    if let Some(else_arg) = else_arg {
+        let Expression {
+            expr: Expr::Keyword(else_keyword),
+            ..
+        } = else_arg
+        else {
+            return Err(invalid());
+        };
+
+        if else_keyword.keyword.as_ref() != b"else" {
+            return Err(invalid());
+        }
+
+        let else_expr = &else_keyword.expr;
+
+        match &else_expr.expr {
+            Expr::Block(block_id) => {
+                let false_block = working_set.get_block(*block_id);
+                compile_block(
+                    working_set,
+                    builder,
+                    false_block,
+                    redirect_modes,
+                    Some(io_reg),
+                    io_reg,
+                )?;
+            }
+            _ => {
+                // The else case supports bare expressions too, not only blocks
+                compile_expression(
+                    working_set,
+                    builder,
+                    else_expr,
+                    redirect_modes,
+                    Some(io_reg),
+                    io_reg,
+                )?;
+            }
+        }
+    } else {
+        // We don't have an else expression/block, so just set io_reg = Empty
+        builder.load_empty(io_reg)?;
+    }
+
+    // Set the end label
+    builder.set_label(end_label, builder.here())?;
+
+    Ok(())
+}
+
+/// Compile a call to `match`
+pub(crate) fn compile_match(
+    working_set: &StateWorkingSet,
+    builder: &mut BlockBuilder,
+    call: &Call,
+    redirect_modes: RedirectModes,
+    io_reg: RegId,
+) -> Result<(), CompileError> {
+    // Pseudocode:
+    //
+    //         %match_reg <- <match_expr>
+    //         collect %match_reg
+    //         match (pat1), %match_reg, PAT1
+    // MATCH2: match (pat2), %match_reg, PAT2
+    // FAIL:   drop %io_reg
+    //         drop %match_reg
+    //         jump END
+    // PAT1:   %guard_reg <- <guard_expr>
+    //         check-match-guard %guard_reg
+    //         not %guard_reg
+    //         branch-if %guard_reg, MATCH2
+    //         drop %match_reg
+    //         <...expr...>
+    //         jump END
+    // PAT2:   drop %match_reg
+    //         <...expr...>
+    //         jump END
+    // END:
+    let invalid = || CompileError::InvalidKeywordCall {
+        keyword: "match".into(),
+        span: call.head,
+    };
+
+    let match_expr = call.positional_nth(0).ok_or_else(invalid)?;
+
+    let match_block_arg = call.positional_nth(1).ok_or_else(invalid)?;
+    let match_block = match_block_arg.as_match_block().ok_or_else(invalid)?;
+
+    let match_reg = builder.next_register()?;
+
+    // Evaluate the match expression (patterns will be checked against this).
+    compile_expression(
+        working_set,
+        builder,
+        match_expr,
+        RedirectModes::capture_out(match_expr.span),
+        None,
+        match_reg,
+    )?;
+
+    // Important to collect it first
+    builder.push(Instruction::Collect { src_dst: match_reg }.into_spanned(match_expr.span))?;
+
+    // Generate the `match` instructions. Guards are not used at this stage.
+    let mut match_labels = Vec::with_capacity(match_block.len());
+    let mut next_labels = Vec::with_capacity(match_block.len());
+    let end_label = builder.label(None);
+
+    for (pattern, _) in match_block {
+        let match_label = builder.label(None);
+        match_labels.push(match_label);
+        builder.push(
+            Instruction::Match {
+                pattern: Box::new(pattern.pattern.clone()),
+                src: match_reg,
+                index: match_label.0,
+            }
+            .into_spanned(pattern.span),
+        )?;
+        // Also add a label for the next match instruction or failure case
+        next_labels.push(builder.label(Some(builder.here())));
+    }
+
+    // Match fall-through to jump to the end, if no match
+    builder.load_empty(io_reg)?;
+    builder.drop_reg(match_reg)?;
+    builder.jump(end_label, call.head)?;
+
+    // Generate each of the match expressions. Handle guards here, if present.
+    for (index, (pattern, expr)) in match_block.iter().enumerate() {
+        let match_label = match_labels[index];
+        let next_label = next_labels[index];
+
+        // `io_reg` and `match_reg` are still valid at each of these branch targets
+        builder.mark_register(io_reg)?;
+        builder.mark_register(match_reg)?;
+
+        // Set the original match instruction target here
+        builder.set_label(match_label, builder.here())?;
+
+        // Handle guard, if present
+        if let Some(guard) = &pattern.guard {
+            let guard_reg = builder.next_register()?;
+            compile_expression(
+                working_set,
+                builder,
+                guard,
+                RedirectModes::capture_out(guard.span),
+                None,
+                guard_reg,
+            )?;
+            builder
+                .push(Instruction::CheckMatchGuard { src: guard_reg }.into_spanned(guard.span))?;
+            builder.push(Instruction::Not { src_dst: guard_reg }.into_spanned(guard.span))?;
+            // Branch to the next match instruction if the branch fails to match
+            builder.branch_if(
+                guard_reg,
+                next_label,
+                // Span the branch with the next pattern, or the head if this is the end
+                match_block
+                    .get(index + 1)
+                    .map(|b| b.0.span)
+                    .unwrap_or(call.head),
+            )?;
+            builder.add_comment("if match guard false");
+        }
+
+        // match_reg no longer needed, successful match
+        builder.drop_reg(match_reg)?;
+
+        // Execute match right hand side expression
+        if let Some(block_id) = expr.as_block() {
+            let block = working_set.get_block(block_id);
+            compile_block(
+                working_set,
+                builder,
+                block,
+                redirect_modes.clone(),
+                Some(io_reg),
+                io_reg,
+            )?;
+        } else {
+            compile_expression(
+                working_set,
+                builder,
+                expr,
+                redirect_modes.clone(),
+                Some(io_reg),
+                io_reg,
+            )?;
+        }
+
+        // Jump to the end after the match logic is done
+        builder.jump(end_label, call.head)?;
+        builder.add_comment("end match");
+    }
+
+    // Set the end destination
+    builder.set_label(end_label, builder.here())?;
+
+    Ok(())
+}
+
+/// Compile a call to `let` or `mut` (just do store-variable)
+pub(crate) fn compile_let(
+    working_set: &StateWorkingSet,
+    builder: &mut BlockBuilder,
+    call: &Call,
+    _redirect_modes: RedirectModes,
+    io_reg: RegId,
+) -> Result<(), CompileError> {
+    // Pseudocode:
+    //
+    // %io_reg <- ...<block>... <- %io_reg
+    // store-variable $var, %io_reg
+    let invalid = || CompileError::InvalidKeywordCall {
+        keyword: "let".into(),
+        span: call.head,
+    };
+
+    let var_decl_arg = call.positional_nth(0).ok_or_else(invalid)?;
+    let block_arg = call.positional_nth(1).ok_or_else(invalid)?;
+
+    let var_id = var_decl_arg.as_var().ok_or_else(invalid)?;
+    let block_id = block_arg.as_block().ok_or_else(invalid)?;
+    let block = working_set.get_block(block_id);
+
+    let variable = working_set.get_variable(var_id);
+
+    compile_block(
+        working_set,
+        builder,
+        block,
+        RedirectModes::capture_out(call.head),
+        Some(io_reg),
+        io_reg,
+    )?;
+
+    // If the variable is a glob type variable, we should cast it with GlobFrom
+    if variable.ty == Type::Glob {
+        builder.push(
+            Instruction::GlobFrom {
+                src_dst: io_reg,
+                no_expand: true,
+            }
+            .into_spanned(call.head),
+        )?;
+    }
+
+    builder.push(
+        Instruction::StoreVariable {
+            var_id,
+            src: io_reg,
+        }
+        .into_spanned(call.head),
+    )?;
+    builder.add_comment("let");
+
+    // Don't forget to set io_reg to Empty afterward, as that's the result of an assignment
+    builder.load_empty(io_reg)?;
+
+    Ok(())
+}
+
+/// Compile a call to `try`, setting an error handler over the evaluated block
+pub(crate) fn compile_try(
+    working_set: &StateWorkingSet,
+    builder: &mut BlockBuilder,
+    call: &Call,
+    redirect_modes: RedirectModes,
+    io_reg: RegId,
+) -> Result<(), CompileError> {
+    // Pseudocode (literal block):
+    //
+    //       on-error-into ERR, %io_reg           // or without
+    //       %io_reg <- <...block...> <- %io_reg
+    //       check-external-failed %failed_reg, %io_reg
+    //       branch-if %failed_reg, FAIL
+    //       pop-error-handler
+    //       jump END
+    // FAIL: drain %io_reg
+    //       unreachable
+    // ERR:  clone %err_reg, %io_reg
+    //       store-variable $err_var, %err_reg         // or without
+    //       %io_reg <- <...catch block...> <- %io_reg // set to empty if no catch block
+    // END:
+    //
+    // with expression that can't be inlined:
+    //
+    //       %closure_reg <- <catch_expr>
+    //       on-error-into ERR, %io_reg
+    //       %io_reg <- <...block...> <- %io_reg
+    //       check-external-failed %failed_reg, %io_reg
+    //       branch-if %failed_reg, FAIL
+    //       pop-error-handler
+    //       jump END
+    // FAIL: drain %io_reg
+    //       unreachable
+    // ERR:  clone %err_reg, %io_reg
+    //       push-positional %closure_reg
+    //       push-positional %err_reg
+    //       call "do", %io_reg
+    // END:
+    let invalid = || CompileError::InvalidKeywordCall {
+        keyword: "try".into(),
+        span: call.head,
+    };
+
+    let block_arg = call.positional_nth(0).ok_or_else(invalid)?;
+    let block_id = block_arg.as_block().ok_or_else(invalid)?;
+    let block = working_set.get_block(block_id);
+
+    let catch_expr = match call.positional_nth(1) {
+        Some(kw_expr) => Some(kw_expr.as_keyword().ok_or_else(invalid)?),
+        None => None,
+    };
+    let catch_span = catch_expr.map(|e| e.span).unwrap_or(call.head);
+
+    let err_label = builder.label(None);
+    let failed_label = builder.label(None);
+    let end_label = builder.label(None);
+
+    // We have two ways of executing `catch`: if it was provided as a literal, we can inline it.
+    // Otherwise, we have to evaluate the expression and keep it as a register, and then call `do`.
+    enum CatchType<'a> {
+        Block {
+            block: &'a Block,
+            var_id: Option<VarId>,
+        },
+        Closure {
+            closure_reg: RegId,
+        },
+    }
+
+    let catch_type = catch_expr
+        .map(|catch_expr| match catch_expr.as_block() {
+            Some(block_id) => {
+                let block = working_set.get_block(block_id);
+                let var_id = block.signature.get_positional(0).and_then(|v| v.var_id);
+                Ok(CatchType::Block { block, var_id })
+            }
+            None => {
+                // We have to compile the catch_expr and use it as a closure
+                let closure_reg = builder.next_register()?;
+                compile_expression(
+                    working_set,
+                    builder,
+                    catch_expr,
+                    RedirectModes::capture_out(catch_expr.span),
+                    None,
+                    closure_reg,
+                )?;
+                Ok(CatchType::Closure { closure_reg })
+            }
+        })
+        .transpose()?;
+
+    // Put the error handler instruction. If we have a catch expression then we should capture the
+    // error.
+    if catch_type.is_some() {
+        builder.push(
+            Instruction::OnErrorInto {
+                index: err_label.0,
+                dst: io_reg,
+            }
+            .into_spanned(call.head),
+        )?
+    } else {
+        // Otherwise, we don't need the error value.
+        builder.push(Instruction::OnError { index: err_label.0 }.into_spanned(call.head))?
+    };
+
+    builder.add_comment("try");
+
+    // Compile the block
+    compile_block(
+        working_set,
+        builder,
+        block,
+        redirect_modes.clone(),
+        Some(io_reg),
+        io_reg,
+    )?;
+
+    // Check for external command exit code failure, and also redirect that to the catch handler
+    let failed_reg = builder.next_register()?;
+    builder.push(
+        Instruction::CheckExternalFailed {
+            dst: failed_reg,
+            src: io_reg,
+        }
+        .into_spanned(catch_span),
+    )?;
+    builder.branch_if(failed_reg, failed_label, catch_span)?;
+
+    // Successful case: pop the error handler
+    builder.push(Instruction::PopErrorHandler.into_spanned(call.head))?;
+
+    // Jump over the failure case
+    builder.jump(end_label, catch_span)?;
+
+    // Set up an error handler preamble for failed external.
+    // Draining the %io_reg results in the error handler being called with Empty, and sets
+    // $env.LAST_EXIT_CODE
+    builder.set_label(failed_label, builder.here())?;
+    builder.drain(io_reg, catch_span)?;
+    builder.add_comment("branches to err");
+    builder.unreachable(catch_span)?;
+
+    // This is the real error handler
+    builder.set_label(err_label, builder.here())?;
+
+    // Mark out register as likely not clean - state in error handler is not well defined
+    builder.mark_register(io_reg)?;
+
+    // Now compile whatever is necessary for the error handler
+    match catch_type {
+        Some(CatchType::Block { block, var_id }) => {
+            // Error will be in io_reg
+            builder.mark_register(io_reg)?;
+            if let Some(var_id) = var_id {
+                // Take a copy of the error as $err, since it will also be input
+                let err_reg = builder.next_register()?;
+                builder.push(
+                    Instruction::Clone {
+                        dst: err_reg,
+                        src: io_reg,
+                    }
+                    .into_spanned(catch_span),
+                )?;
+                builder.push(
+                    Instruction::StoreVariable {
+                        var_id,
+                        src: err_reg,
+                    }
+                    .into_spanned(catch_span),
+                )?;
+            }
+            // Compile the block, now that the variable is set
+            compile_block(
+                working_set,
+                builder,
+                block,
+                redirect_modes,
+                Some(io_reg),
+                io_reg,
+            )?;
+        }
+        Some(CatchType::Closure { closure_reg }) => {
+            // We should call `do`. Error will be in io_reg
+            let do_decl_id = working_set.find_decl(b"do").ok_or_else(|| {
+                CompileError::MissingRequiredDeclaration {
+                    decl_name: "do".into(),
+                    span: call.head,
+                }
+            })?;
+
+            // Take a copy of io_reg, because we pass it both as an argument and input
+            builder.mark_register(io_reg)?;
+            let err_reg = builder.next_register()?;
+            builder.push(
+                Instruction::Clone {
+                    dst: err_reg,
+                    src: io_reg,
+                }
+                .into_spanned(catch_span),
+            )?;
+
+            // Push the closure and the error
+            builder
+                .push(Instruction::PushPositional { src: closure_reg }.into_spanned(catch_span))?;
+            builder.push(Instruction::PushPositional { src: err_reg }.into_spanned(catch_span))?;
+
+            // Call `$err | do $closure $err`
+            builder.push(
+                Instruction::Call {
+                    decl_id: do_decl_id,
+                    src_dst: io_reg,
+                }
+                .into_spanned(catch_span),
+            )?;
+        }
+        None => {
+            // Just set out to empty.
+            builder.load_empty(io_reg)?;
+        }
+    }
+
+    // This is the end - if we succeeded, should jump here
+    builder.set_label(end_label, builder.here())?;
+
+    Ok(())
+}
+
+/// Compile a call to `loop` (via `jump`)
+pub(crate) fn compile_loop(
+    working_set: &StateWorkingSet,
+    builder: &mut BlockBuilder,
+    call: &Call,
+    _redirect_modes: RedirectModes,
+    io_reg: RegId,
+) -> Result<(), CompileError> {
+    // Pseudocode:
+    //
+    //       drop %io_reg
+    // LOOP: %io_reg <- ...<block>...
+    //       drain %io_reg
+    //       jump %LOOP
+    // END:  drop %io_reg
+    let invalid = || CompileError::InvalidKeywordCall {
+        keyword: "loop".into(),
+        span: call.head,
+    };
+
+    let block_arg = call.positional_nth(0).ok_or_else(invalid)?;
+    let block_id = block_arg.as_block().ok_or_else(invalid)?;
+    let block = working_set.get_block(block_id);
+
+    let loop_ = builder.begin_loop();
+    builder.load_empty(io_reg)?;
+
+    builder.set_label(loop_.continue_label, builder.here())?;
+
+    compile_block(
+        working_set,
+        builder,
+        block,
+        RedirectModes::default(),
+        None,
+        io_reg,
+    )?;
+
+    // Drain the output, just like for a semicolon
+    builder.drain(io_reg, call.head)?;
+
+    builder.jump(loop_.continue_label, call.head)?;
+    builder.add_comment("loop");
+
+    builder.set_label(loop_.break_label, builder.here())?;
+    builder.end_loop(loop_)?;
+
+    // State of %io_reg is not necessarily well defined here due to control flow, so make sure it's
+    // empty.
+    builder.mark_register(io_reg)?;
+    builder.load_empty(io_reg)?;
+
+    Ok(())
+}
+
+/// Compile a call to `while`, via branch instructions
+pub(crate) fn compile_while(
+    working_set: &StateWorkingSet,
+    builder: &mut BlockBuilder,
+    call: &Call,
+    _redirect_modes: RedirectModes,
+    io_reg: RegId,
+) -> Result<(), CompileError> {
+    // Pseudocode:
+    //
+    // LOOP:  %io_reg <- <condition>
+    //        branch-if %io_reg, TRUE
+    //        jump FALSE
+    // TRUE:  %io_reg <- ...<block>...
+    //        drain %io_reg
+    //        jump LOOP
+    // FALSE: drop %io_reg
+    let invalid = || CompileError::InvalidKeywordCall {
+        keyword: "while".into(),
+        span: call.head,
+    };
+
+    let cond_arg = call.positional_nth(0).ok_or_else(invalid)?;
+    let block_arg = call.positional_nth(1).ok_or_else(invalid)?;
+    let block_id = block_arg.as_block().ok_or_else(invalid)?;
+    let block = working_set.get_block(block_id);
+
+    let loop_ = builder.begin_loop();
+    builder.set_label(loop_.continue_label, builder.here())?;
+
+    let true_label = builder.label(None);
+
+    compile_expression(
+        working_set,
+        builder,
+        cond_arg,
+        RedirectModes::capture_out(call.head),
+        None,
+        io_reg,
+    )?;
+
+    builder.branch_if(io_reg, true_label, call.head)?;
+    builder.add_comment("while");
+    builder.jump(loop_.break_label, call.head)?;
+    builder.add_comment("end while");
+
+    builder.set_label(true_label, builder.here())?;
+
+    compile_block(
+        working_set,
+        builder,
+        block,
+        RedirectModes::default(),
+        None,
+        io_reg,
+    )?;
+
+    // Drain the result, just like for a semicolon
+    builder.drain(io_reg, call.head)?;
+
+    builder.jump(loop_.continue_label, call.head)?;
+    builder.add_comment("while");
+
+    builder.set_label(loop_.break_label, builder.here())?;
+    builder.end_loop(loop_)?;
+
+    // State of %io_reg is not necessarily well defined here due to control flow, so make sure it's
+    // empty.
+    builder.mark_register(io_reg)?;
+    builder.load_empty(io_reg)?;
+
+    Ok(())
+}
+
+/// Compile a call to `for` (via `iterate`)
+pub(crate) fn compile_for(
+    working_set: &StateWorkingSet,
+    builder: &mut BlockBuilder,
+    call: &Call,
+    _redirect_modes: RedirectModes,
+    io_reg: RegId,
+) -> Result<(), CompileError> {
+    // Pseudocode:
+    //
+    //       %stream_reg <- <in_expr>
+    // LOOP: iterate %io_reg, %stream_reg, END
+    //       store-variable $var, %io_reg
+    //       %io_reg <- <...block...>
+    //       drain %io_reg
+    //       jump LOOP
+    // END:  drop %io_reg
+    let invalid = || CompileError::InvalidKeywordCall {
+        keyword: "for".into(),
+        span: call.head,
+    };
+
+    if call.get_named_arg("numbered").is_some() {
+        // This is deprecated and we don't support it.
+        return Err(invalid());
+    }
+
+    let var_decl_arg = call.positional_nth(0).ok_or_else(invalid)?;
+    let var_id = var_decl_arg.as_var().ok_or_else(invalid)?;
+
+    let in_arg = call.positional_nth(1).ok_or_else(invalid)?;
+    let in_expr = in_arg.as_keyword().ok_or_else(invalid)?;
+
+    let block_arg = call.positional_nth(2).ok_or_else(invalid)?;
+    let block_id = block_arg.as_block().ok_or_else(invalid)?;
+    let block = working_set.get_block(block_id);
+
+    // Ensure io_reg is marked so we don't use it
+    builder.mark_register(io_reg)?;
+
+    let stream_reg = builder.next_register()?;
+
+    compile_expression(
+        working_set,
+        builder,
+        in_expr,
+        RedirectModes::capture_out(in_expr.span),
+        None,
+        stream_reg,
+    )?;
+
+    // Set up loop state
+    let loop_ = builder.begin_loop();
+    builder.set_label(loop_.continue_label, builder.here())?;
+
+    // This gets a value from the stream each time it's executed
+    // io_reg basically will act as our scratch register here
+    builder.push(
+        Instruction::Iterate {
+            dst: io_reg,
+            stream: stream_reg,
+            end_index: loop_.break_label.0,
+        }
+        .into_spanned(call.head),
+    )?;
+    builder.add_comment("for");
+
+    // Put the received value in the variable
+    builder.push(
+        Instruction::StoreVariable {
+            var_id,
+            src: io_reg,
+        }
+        .into_spanned(var_decl_arg.span),
+    )?;
+
+    // Do the body of the block
+    compile_block(
+        working_set,
+        builder,
+        block,
+        RedirectModes::default(),
+        None,
+        io_reg,
+    )?;
+
+    // Drain the output, just like for a semicolon
+    builder.drain(io_reg, call.head)?;
+
+    // Loop back to iterate to get the next value
+    builder.jump(loop_.continue_label, call.head)?;
+
+    // Set the end of the loop
+    builder.set_label(loop_.break_label, builder.here())?;
+    builder.end_loop(loop_)?;
+
+    // We don't need stream_reg anymore, after the loop
+    // io_reg may or may not be empty, so be sure it is
+    builder.free_register(stream_reg)?;
+    builder.mark_register(io_reg)?;
+    builder.load_empty(io_reg)?;
+
+    Ok(())
+}
+
+/// Compile a call to `break`.
+pub(crate) fn compile_break(
+    _working_set: &StateWorkingSet,
+    builder: &mut BlockBuilder,
+    call: &Call,
+    _redirect_modes: RedirectModes,
+    io_reg: RegId,
+) -> Result<(), CompileError> {
+    if builder.is_in_loop() {
+        builder.load_empty(io_reg)?;
+        builder.push_break(call.head)?;
+        builder.add_comment("break");
+    } else {
+        // Fall back to calling the command if we can't find the loop target statically
+        builder.push(
+            Instruction::Call {
+                decl_id: call.decl_id,
+                src_dst: io_reg,
+            }
+            .into_spanned(call.head),
+        )?;
+    }
+    Ok(())
+}
+
+/// Compile a call to `continue`.
+pub(crate) fn compile_continue(
+    _working_set: &StateWorkingSet,
+    builder: &mut BlockBuilder,
+    call: &Call,
+    _redirect_modes: RedirectModes,
+    io_reg: RegId,
+) -> Result<(), CompileError> {
+    if builder.is_in_loop() {
+        builder.load_empty(io_reg)?;
+        builder.push_continue(call.head)?;
+        builder.add_comment("continue");
+    } else {
+        // Fall back to calling the command if we can't find the loop target statically
+        builder.push(
+            Instruction::Call {
+                decl_id: call.decl_id,
+                src_dst: io_reg,
+            }
+            .into_spanned(call.head),
+        )?;
+    }
+    Ok(())
+}
+
+/// Compile a call to `return` as a `return-early` instruction.
+///
+/// This is not strictly necessary, but it is more efficient.
+pub(crate) fn compile_return(
+    working_set: &StateWorkingSet,
+    builder: &mut BlockBuilder,
+    call: &Call,
+    _redirect_modes: RedirectModes,
+    io_reg: RegId,
+) -> Result<(), CompileError> {
+    // Pseudocode:
+    //
+    // %io_reg <- <arg_expr>
+    // return-early %io_reg
+    if let Some(arg_expr) = call.positional_nth(0) {
+        compile_expression(
+            working_set,
+            builder,
+            arg_expr,
+            RedirectModes::capture_out(arg_expr.span),
+            None,
+            io_reg,
+        )?;
+    } else {
+        builder.load_empty(io_reg)?;
+    }
+
+    // TODO: It would be nice if this could be `return` instead, but there is a little bit of
+    // behaviour remaining that still depends on `ShellError::Return`
+    builder.push(Instruction::ReturnEarly { src: io_reg }.into_spanned(call.head))?;
+
+    // io_reg is supposed to remain allocated
+    builder.load_empty(io_reg)?;
+
+    Ok(())
+}
diff --git a/crates/nu-engine/src/compile/mod.rs b/crates/nu-engine/src/compile/mod.rs
new file mode 100644
index 0000000000..8f6ae22682
--- /dev/null
+++ b/crates/nu-engine/src/compile/mod.rs
@@ -0,0 +1,204 @@
+use nu_protocol::{
+    ast::{Block, Pipeline, PipelineRedirection, RedirectionSource, RedirectionTarget},
+    engine::StateWorkingSet,
+    ir::{Instruction, IrBlock, RedirectMode},
+    CompileError, IntoSpanned, RegId, Span,
+};
+
+mod builder;
+mod call;
+mod expression;
+mod keyword;
+mod operator;
+mod redirect;
+
+use builder::BlockBuilder;
+use call::*;
+use expression::compile_expression;
+use operator::*;
+use redirect::*;
+
+const BLOCK_INPUT: RegId = RegId(0);
+
+/// Compile Nushell pipeline abstract syntax tree (AST) to internal representation (IR) instructions
+/// for evaluation.
+pub fn compile(working_set: &StateWorkingSet, block: &Block) -> Result<IrBlock, CompileError> {
+    let mut builder = BlockBuilder::new(block.span);
+
+    let span = block.span.unwrap_or(Span::unknown());
+
+    compile_block(
+        working_set,
+        &mut builder,
+        block,
+        RedirectModes::caller(span),
+        Some(BLOCK_INPUT),
+        BLOCK_INPUT,
+    )?;
+
+    // A complete block has to end with a `return`
+    builder.push(Instruction::Return { src: BLOCK_INPUT }.into_spanned(span))?;
+
+    builder.finish()
+}
+
+/// Compiles a [`Block`] in-place into an IR block. This can be used in a nested manner, for example
+/// by [`compile_if()`], where the instructions for the blocks for the if/else are inlined into the
+/// top-level IR block.
+fn compile_block(
+    working_set: &StateWorkingSet,
+    builder: &mut BlockBuilder,
+    block: &Block,
+    redirect_modes: RedirectModes,
+    in_reg: Option<RegId>,
+    out_reg: RegId,
+) -> Result<(), CompileError> {
+    let span = block.span.unwrap_or(Span::unknown());
+    let mut redirect_modes = Some(redirect_modes);
+    if !block.pipelines.is_empty() {
+        let last_index = block.pipelines.len() - 1;
+        for (index, pipeline) in block.pipelines.iter().enumerate() {
+            compile_pipeline(
+                working_set,
+                builder,
+                pipeline,
+                span,
+                // the redirect mode only applies to the last pipeline.
+                if index == last_index {
+                    redirect_modes
+                        .take()
+                        .expect("should only take redirect_modes once")
+                } else {
+                    RedirectModes::default()
+                },
+                // input is only passed to the first pipeline.
+                if index == 0 { in_reg } else { None },
+                out_reg,
+            )?;
+
+            if index != last_index {
+                // Explicitly drain the out reg after each non-final pipeline, because that's how
+                // the semicolon functions.
+                if builder.is_allocated(out_reg) {
+                    builder.push(Instruction::Drain { src: out_reg }.into_spanned(span))?;
+                }
+                builder.load_empty(out_reg)?;
+            }
+        }
+        Ok(())
+    } else if in_reg.is_none() {
+        builder.load_empty(out_reg)
+    } else {
+        Ok(())
+    }
+}
+
+fn compile_pipeline(
+    working_set: &StateWorkingSet,
+    builder: &mut BlockBuilder,
+    pipeline: &Pipeline,
+    fallback_span: Span,
+    redirect_modes: RedirectModes,
+    in_reg: Option<RegId>,
+    out_reg: RegId,
+) -> Result<(), CompileError> {
+    let mut iter = pipeline.elements.iter().peekable();
+    let mut in_reg = in_reg;
+    let mut redirect_modes = Some(redirect_modes);
+    while let Some(element) = iter.next() {
+        let span = element.pipe.unwrap_or(fallback_span);
+
+        // We have to get the redirection mode from either the explicit redirection in the pipeline
+        // element, or from the next expression if it's specified there. If this is the last
+        // element, then it's from whatever is passed in as the mode to use.
+
+        let next_redirect_modes = if let Some(next_element) = iter.peek() {
+            let mut modes = redirect_modes_of_expression(working_set, &next_element.expr, span)?;
+
+            // If there's a next element with no inherent redirection we always pipe out *unless*
+            // this is a single redirection of stderr to pipe (e>|)
+            if modes.out.is_none()
+                && !matches!(
+                    element.redirection,
+                    Some(PipelineRedirection::Single {
+                        source: RedirectionSource::Stderr,
+                        target: RedirectionTarget::Pipe { .. }
+                    })
+                )
+            {
+                let pipe_span = next_element.pipe.unwrap_or(next_element.expr.span);
+                modes.out = Some(RedirectMode::Pipe.into_spanned(pipe_span));
+            }
+
+            modes
+        } else {
+            redirect_modes
+                .take()
+                .expect("should only take redirect_modes once")
+        };
+
+        let spec_redirect_modes = match &element.redirection {
+            Some(PipelineRedirection::Single { source, target }) => {
+                let mode = redirection_target_to_mode(working_set, builder, target)?;
+                match source {
+                    RedirectionSource::Stdout => RedirectModes {
+                        out: Some(mode),
+                        err: None,
+                    },
+                    RedirectionSource::Stderr => RedirectModes {
+                        out: None,
+                        err: Some(mode),
+                    },
+                    RedirectionSource::StdoutAndStderr => RedirectModes {
+                        out: Some(mode),
+                        err: Some(mode),
+                    },
+                }
+            }
+            Some(PipelineRedirection::Separate { out, err }) => {
+                // In this case, out and err must not both be Pipe
+                assert!(
+                    !matches!(
+                        (out, err),
+                        (
+                            RedirectionTarget::Pipe { .. },
+                            RedirectionTarget::Pipe { .. }
+                        )
+                    ),
+                    "for Separate redirection, out and err targets must not both be Pipe"
+                );
+                let out = redirection_target_to_mode(working_set, builder, out)?;
+                let err = redirection_target_to_mode(working_set, builder, err)?;
+                RedirectModes {
+                    out: Some(out),
+                    err: Some(err),
+                }
+            }
+            None => RedirectModes {
+                out: None,
+                err: None,
+            },
+        };
+
+        let redirect_modes = RedirectModes {
+            out: spec_redirect_modes.out.or(next_redirect_modes.out),
+            err: spec_redirect_modes.err.or(next_redirect_modes.err),
+        };
+
+        compile_expression(
+            working_set,
+            builder,
+            &element.expr,
+            redirect_modes.clone(),
+            in_reg,
+            out_reg,
+        )?;
+
+        // Clean up the redirection
+        finish_redirection(builder, redirect_modes, out_reg)?;
+
+        // The next pipeline element takes input from this output
+        in_reg = Some(out_reg);
+    }
+    Ok(())
+}
diff --git a/crates/nu-engine/src/compile/operator.rs b/crates/nu-engine/src/compile/operator.rs
new file mode 100644
index 0000000000..a1ed3f66df
--- /dev/null
+++ b/crates/nu-engine/src/compile/operator.rs
@@ -0,0 +1,378 @@
+use nu_protocol::{
+    ast::{Assignment, Boolean, CellPath, Expr, Expression, Math, Operator, PathMember},
+    engine::StateWorkingSet,
+    ir::{Instruction, Literal},
+    IntoSpanned, RegId, Span, Spanned, ENV_VARIABLE_ID,
+};
+use nu_utils::IgnoreCaseExt;
+
+use super::{compile_expression, BlockBuilder, CompileError, RedirectModes};
+
+pub(crate) fn compile_binary_op(
+    working_set: &StateWorkingSet,
+    builder: &mut BlockBuilder,
+    lhs: &Expression,
+    op: Spanned<Operator>,
+    rhs: &Expression,
+    span: Span,
+    out_reg: RegId,
+) -> Result<(), CompileError> {
+    if let Operator::Assignment(assign_op) = op.item {
+        if let Some(decomposed_op) = decompose_assignment(assign_op) {
+            // Compiling an assignment that uses a binary op with the existing value
+            compile_binary_op(
+                working_set,
+                builder,
+                lhs,
+                decomposed_op.into_spanned(op.span),
+                rhs,
+                span,
+                out_reg,
+            )?;
+        } else {
+            // Compiling a plain assignment, where the current left-hand side value doesn't matter
+            compile_expression(
+                working_set,
+                builder,
+                rhs,
+                RedirectModes::capture_out(rhs.span),
+                None,
+                out_reg,
+            )?;
+        }
+
+        compile_assignment(working_set, builder, lhs, op.span, out_reg)?;
+
+        // Load out_reg with Nothing, as that's the result of an assignment
+        builder.load_literal(out_reg, Literal::Nothing.into_spanned(op.span))
+    } else {
+        // Not an assignment: just do the binary op
+        let lhs_reg = out_reg;
+
+        compile_expression(
+            working_set,
+            builder,
+            lhs,
+            RedirectModes::capture_out(lhs.span),
+            None,
+            lhs_reg,
+        )?;
+
+        match op.item {
+            // `and` / `or` are short-circuiting, and we can get by with one register and a branch
+            Operator::Boolean(Boolean::And) => {
+                let true_label = builder.label(None);
+                builder.branch_if(lhs_reg, true_label, op.span)?;
+
+                // If the branch was not taken it's false, so short circuit to load false
+                let false_label = builder.label(None);
+                builder.jump(false_label, op.span)?;
+
+                builder.set_label(true_label, builder.here())?;
+                compile_expression(
+                    working_set,
+                    builder,
+                    rhs,
+                    RedirectModes::capture_out(rhs.span),
+                    None,
+                    lhs_reg,
+                )?;
+
+                let end_label = builder.label(None);
+                builder.jump(end_label, op.span)?;
+
+                // Consumed by `branch-if`, so we have to set it false again
+                builder.set_label(false_label, builder.here())?;
+                builder.load_literal(lhs_reg, Literal::Bool(false).into_spanned(lhs.span))?;
+
+                builder.set_label(end_label, builder.here())?;
+            }
+            Operator::Boolean(Boolean::Or) => {
+                let true_label = builder.label(None);
+                builder.branch_if(lhs_reg, true_label, op.span)?;
+
+                // If the branch was not taken it's false, so do the right-side expression
+                compile_expression(
+                    working_set,
+                    builder,
+                    rhs,
+                    RedirectModes::capture_out(rhs.span),
+                    None,
+                    lhs_reg,
+                )?;
+
+                let end_label = builder.label(None);
+                builder.jump(end_label, op.span)?;
+
+                // Consumed by `branch-if`, so we have to set it true again
+                builder.set_label(true_label, builder.here())?;
+                builder.load_literal(lhs_reg, Literal::Bool(true).into_spanned(lhs.span))?;
+
+                builder.set_label(end_label, builder.here())?;
+            }
+            _ => {
+                // Any other operator, via `binary-op`
+                let rhs_reg = builder.next_register()?;
+
+                compile_expression(
+                    working_set,
+                    builder,
+                    rhs,
+                    RedirectModes::capture_out(rhs.span),
+                    None,
+                    rhs_reg,
+                )?;
+
+                builder.push(
+                    Instruction::BinaryOp {
+                        lhs_dst: lhs_reg,
+                        op: op.item,
+                        rhs: rhs_reg,
+                    }
+                    .into_spanned(op.span),
+                )?;
+            }
+        }
+
+        if lhs_reg != out_reg {
+            builder.push(
+                Instruction::Move {
+                    dst: out_reg,
+                    src: lhs_reg,
+                }
+                .into_spanned(op.span),
+            )?;
+        }
+
+        builder.push(Instruction::Span { src_dst: out_reg }.into_spanned(span))?;
+
+        Ok(())
+    }
+}
+
+/// The equivalent plain operator to use for an assignment, if any
+pub(crate) fn decompose_assignment(assignment: Assignment) -> Option<Operator> {
+    match assignment {
+        Assignment::Assign => None,
+        Assignment::PlusAssign => Some(Operator::Math(Math::Plus)),
+        Assignment::AppendAssign => Some(Operator::Math(Math::Append)),
+        Assignment::MinusAssign => Some(Operator::Math(Math::Minus)),
+        Assignment::MultiplyAssign => Some(Operator::Math(Math::Multiply)),
+        Assignment::DivideAssign => Some(Operator::Math(Math::Divide)),
+    }
+}
+
+/// Compile assignment of the value in a register to a left-hand expression
+pub(crate) fn compile_assignment(
+    working_set: &StateWorkingSet,
+    builder: &mut BlockBuilder,
+    lhs: &Expression,
+    assignment_span: Span,
+    rhs_reg: RegId,
+) -> Result<(), CompileError> {
+    match lhs.expr {
+        Expr::Var(var_id) => {
+            // Double check that the variable is supposed to be mutable
+            if !working_set.get_variable(var_id).mutable {
+                return Err(CompileError::AssignmentRequiresMutableVar { span: lhs.span });
+            }
+
+            builder.push(
+                Instruction::StoreVariable {
+                    var_id,
+                    src: rhs_reg,
+                }
+                .into_spanned(assignment_span),
+            )?;
+            Ok(())
+        }
+        Expr::FullCellPath(ref path) => match (&path.head, &path.tail) {
+            (
+                Expression {
+                    expr: Expr::Var(var_id),
+                    ..
+                },
+                _,
+            ) if *var_id == ENV_VARIABLE_ID => {
+                // This will be an assignment to an environment variable.
+                let Some(PathMember::String { val: key, .. }) = path.tail.first() else {
+                    return Err(CompileError::CannotReplaceEnv { span: lhs.span });
+                };
+
+                // Some env vars can't be set by Nushell code.
+                const AUTOMATIC_NAMES: &[&str] = &["PWD", "FILE_PWD", "CURRENT_FILE"];
+                if AUTOMATIC_NAMES.iter().any(|name| key.eq_ignore_case(name)) {
+                    return Err(CompileError::AutomaticEnvVarSetManually {
+                        envvar_name: "PWD".into(),
+                        span: lhs.span,
+                    });
+                }
+
+                let key_data = builder.data(key)?;
+
+                let val_reg = if path.tail.len() > 1 {
+                    // Get the current value of the head and first tail of the path, from env
+                    let head_reg = builder.next_register()?;
+
+                    // We could use compile_load_env, but this shares the key data...
+                    // Always use optional, because it doesn't matter if it's already there
+                    builder.push(
+                        Instruction::LoadEnvOpt {
+                            dst: head_reg,
+                            key: key_data,
+                        }
+                        .into_spanned(lhs.span),
+                    )?;
+
+                    // Default to empty record so we can do further upserts
+                    let default_label = builder.label(None);
+                    let upsert_label = builder.label(None);
+                    builder.branch_if_empty(head_reg, default_label, assignment_span)?;
+                    builder.jump(upsert_label, assignment_span)?;
+
+                    builder.set_label(default_label, builder.here())?;
+                    builder.load_literal(
+                        head_reg,
+                        Literal::Record { capacity: 0 }.into_spanned(lhs.span),
+                    )?;
+
+                    // Do the upsert on the current value to incorporate rhs
+                    builder.set_label(upsert_label, builder.here())?;
+                    compile_upsert_cell_path(
+                        builder,
+                        (&path.tail[1..]).into_spanned(lhs.span),
+                        head_reg,
+                        rhs_reg,
+                        assignment_span,
+                    )?;
+
+                    head_reg
+                } else {
+                    // Path has only one tail, so we don't need the current value to do an upsert,
+                    // just set it directly to rhs
+                    rhs_reg
+                };
+
+                // Finally, store the modified env variable
+                builder.push(
+                    Instruction::StoreEnv {
+                        key: key_data,
+                        src: val_reg,
+                    }
+                    .into_spanned(assignment_span),
+                )?;
+                Ok(())
+            }
+            (_, tail) if tail.is_empty() => {
+                // If the path tail is empty, we can really just treat this as if it were an
+                // assignment to the head
+                compile_assignment(working_set, builder, &path.head, assignment_span, rhs_reg)
+            }
+            _ => {
+                // Just a normal assignment to some path
+                let head_reg = builder.next_register()?;
+
+                // Compile getting current value of the head expression
+                compile_expression(
+                    working_set,
+                    builder,
+                    &path.head,
+                    RedirectModes::capture_out(path.head.span),
+                    None,
+                    head_reg,
+                )?;
+
+                // Upsert the tail of the path into the old value of the head expression
+                compile_upsert_cell_path(
+                    builder,
+                    path.tail.as_slice().into_spanned(lhs.span),
+                    head_reg,
+                    rhs_reg,
+                    assignment_span,
+                )?;
+
+                // Now compile the assignment of the updated value to the head
+                compile_assignment(working_set, builder, &path.head, assignment_span, head_reg)
+            }
+        },
+        Expr::Garbage => Err(CompileError::Garbage { span: lhs.span }),
+        _ => Err(CompileError::AssignmentRequiresVar { span: lhs.span }),
+    }
+}
+
+/// Compile an upsert-cell-path instruction, with known literal members
+pub(crate) fn compile_upsert_cell_path(
+    builder: &mut BlockBuilder,
+    members: Spanned<&[PathMember]>,
+    src_dst: RegId,
+    new_value: RegId,
+    span: Span,
+) -> Result<(), CompileError> {
+    let path_reg = builder.literal(
+        Literal::CellPath(
+            CellPath {
+                members: members.item.to_vec(),
+            }
+            .into(),
+        )
+        .into_spanned(members.span),
+    )?;
+    builder.push(
+        Instruction::UpsertCellPath {
+            src_dst,
+            path: path_reg,
+            new_value,
+        }
+        .into_spanned(span),
+    )?;
+    Ok(())
+}
+
+/// Compile the correct sequence to get an environment variable + follow a path on it
+pub(crate) fn compile_load_env(
+    builder: &mut BlockBuilder,
+    span: Span,
+    path: &[PathMember],
+    out_reg: RegId,
+) -> Result<(), CompileError> {
+    if path.is_empty() {
+        builder.push(
+            Instruction::LoadVariable {
+                dst: out_reg,
+                var_id: ENV_VARIABLE_ID,
+            }
+            .into_spanned(span),
+        )?;
+    } else {
+        let (key, optional) = match &path[0] {
+            PathMember::String { val, optional, .. } => (builder.data(val)?, *optional),
+            PathMember::Int { span, .. } => {
+                return Err(CompileError::AccessEnvByInt { span: *span })
+            }
+        };
+        let tail = &path[1..];
+
+        if optional {
+            builder.push(Instruction::LoadEnvOpt { dst: out_reg, key }.into_spanned(span))?;
+        } else {
+            builder.push(Instruction::LoadEnv { dst: out_reg, key }.into_spanned(span))?;
+        }
+
+        if !tail.is_empty() {
+            let path = builder.literal(
+                Literal::CellPath(Box::new(CellPath {
+                    members: tail.to_vec(),
+                }))
+                .into_spanned(span),
+            )?;
+            builder.push(
+                Instruction::FollowCellPath {
+                    src_dst: out_reg,
+                    path,
+                }
+                .into_spanned(span),
+            )?;
+        }
+    }
+    Ok(())
+}
diff --git a/crates/nu-engine/src/compile/redirect.rs b/crates/nu-engine/src/compile/redirect.rs
new file mode 100644
index 0000000000..15af1a9f8c
--- /dev/null
+++ b/crates/nu-engine/src/compile/redirect.rs
@@ -0,0 +1,157 @@
+use nu_protocol::{
+    ast::{Expression, RedirectionTarget},
+    engine::StateWorkingSet,
+    ir::{Instruction, RedirectMode},
+    IntoSpanned, OutDest, RegId, Span, Spanned,
+};
+
+use super::{compile_expression, BlockBuilder, CompileError};
+
+#[derive(Default, Clone)]
+pub(crate) struct RedirectModes {
+    pub(crate) out: Option<Spanned<RedirectMode>>,
+    pub(crate) err: Option<Spanned<RedirectMode>>,
+}
+
+impl RedirectModes {
+    pub(crate) fn capture_out(span: Span) -> Self {
+        RedirectModes {
+            out: Some(RedirectMode::Capture.into_spanned(span)),
+            err: None,
+        }
+    }
+
+    pub(crate) fn caller(span: Span) -> RedirectModes {
+        RedirectModes {
+            out: Some(RedirectMode::Caller.into_spanned(span)),
+            err: Some(RedirectMode::Caller.into_spanned(span)),
+        }
+    }
+}
+
+pub(crate) fn redirection_target_to_mode(
+    working_set: &StateWorkingSet,
+    builder: &mut BlockBuilder,
+    target: &RedirectionTarget,
+) -> Result<Spanned<RedirectMode>, CompileError> {
+    Ok(match target {
+        RedirectionTarget::File {
+            expr,
+            append,
+            span: redir_span,
+        } => {
+            let file_num = builder.next_file_num()?;
+            let path_reg = builder.next_register()?;
+            compile_expression(
+                working_set,
+                builder,
+                expr,
+                RedirectModes::capture_out(*redir_span),
+                None,
+                path_reg,
+            )?;
+            builder.push(
+                Instruction::OpenFile {
+                    file_num,
+                    path: path_reg,
+                    append: *append,
+                }
+                .into_spanned(*redir_span),
+            )?;
+            RedirectMode::File { file_num }.into_spanned(*redir_span)
+        }
+        RedirectionTarget::Pipe { span } => RedirectMode::Pipe.into_spanned(*span),
+    })
+}
+
+pub(crate) fn redirect_modes_of_expression(
+    working_set: &StateWorkingSet,
+    expression: &Expression,
+    redir_span: Span,
+) -> Result<RedirectModes, CompileError> {
+    let (out, err) = expression.expr.pipe_redirection(working_set);
+    Ok(RedirectModes {
+        out: out
+            .map(|r| r.into_spanned(redir_span))
+            .map(out_dest_to_redirect_mode)
+            .transpose()?,
+        err: err
+            .map(|r| r.into_spanned(redir_span))
+            .map(out_dest_to_redirect_mode)
+            .transpose()?,
+    })
+}
+
+/// Finish the redirection for an expression, writing to and closing files as necessary
+pub(crate) fn finish_redirection(
+    builder: &mut BlockBuilder,
+    modes: RedirectModes,
+    out_reg: RegId,
+) -> Result<(), CompileError> {
+    if let Some(Spanned {
+        item: RedirectMode::File { file_num },
+        span,
+    }) = modes.out
+    {
+        // If out is a file and err is a pipe, we must not consume the expression result -
+        // that is actually the err, in that case.
+        if !matches!(
+            modes.err,
+            Some(Spanned {
+                item: RedirectMode::Pipe { .. },
+                ..
+            })
+        ) {
+            builder.push(
+                Instruction::WriteFile {
+                    file_num,
+                    src: out_reg,
+                }
+                .into_spanned(span),
+            )?;
+            builder.load_empty(out_reg)?;
+        }
+        builder.push(Instruction::CloseFile { file_num }.into_spanned(span))?;
+    }
+
+    match modes.err {
+        Some(Spanned {
+            item: RedirectMode::File { file_num },
+            span,
+        }) => {
+            // Close the file, unless it's the same as out (in which case it was already closed)
+            if !modes.out.is_some_and(|out_mode| match out_mode.item {
+                RedirectMode::File {
+                    file_num: out_file_num,
+                } => file_num == out_file_num,
+                _ => false,
+            }) {
+                builder.push(Instruction::CloseFile { file_num }.into_spanned(span))?;
+            }
+        }
+        Some(Spanned {
+            item: RedirectMode::Pipe,
+            span,
+        }) => {
+            builder.push(Instruction::CheckErrRedirected { src: out_reg }.into_spanned(span))?;
+        }
+        _ => (),
+    }
+
+    Ok(())
+}
+
+pub(crate) fn out_dest_to_redirect_mode(
+    out_dest: Spanned<OutDest>,
+) -> Result<Spanned<RedirectMode>, CompileError> {
+    let span = out_dest.span;
+    out_dest
+        .map(|out_dest| match out_dest {
+            OutDest::Pipe => Ok(RedirectMode::Pipe),
+            OutDest::Capture => Ok(RedirectMode::Capture),
+            OutDest::Null => Ok(RedirectMode::Null),
+            OutDest::Inherit => Ok(RedirectMode::Inherit),
+            OutDest::File(_) => Err(CompileError::InvalidRedirectMode { span }),
+        })
+        .transpose()
+}
diff --git a/crates/nu-engine/src/documentation.rs b/crates/nu-engine/src/documentation.rs
index a7d4950036..7840d03c47 100644
--- a/crates/nu-engine/src/documentation.rs
+++ b/crates/nu-engine/src/documentation.rs
@@ -45,10 +45,12 @@ fn nu_highlight_string(code_string: &str, engine_state: &EngineState, stack: &mu
     if let Some(highlighter) = engine_state.find_decl(b"nu-highlight", &[]) {
         let decl = engine_state.get_decl(highlighter);
 
+        let call = Call::new(Span::unknown());
+
         if let Ok(output) = decl.run(
             engine_state,
             stack,
-            &Call::new(Span::unknown()),
+            &(&call).into(),
             Value::string(code_string, Span::unknown()).into_pipeline_data(),
         ) {
             let result = output.into_value(Span::unknown());
@@ -269,11 +271,12 @@ fn get_documentation(
             let _ = write!(long_desc, "\n  > {}\n", example.example);
         } else if let Some(highlighter) = engine_state.find_decl(b"nu-highlight", &[]) {
             let decl = engine_state.get_decl(highlighter);
+            let call = Call::new(Span::unknown());
 
             match decl.run(
                 engine_state,
                 stack,
-                &Call::new(Span::unknown()),
+                &(&call).into(),
                 Value::string(example.example, Span::unknown()).into_pipeline_data(),
             ) {
                 Ok(output) => {
@@ -326,7 +329,7 @@ fn get_documentation(
                         .run(
                             engine_state,
                             stack,
-                            &table_call,
+                            &(&table_call).into(),
                             PipelineData::Value(result.clone(), None),
                         )
                         .ok()
diff --git a/crates/nu-engine/src/env.rs b/crates/nu-engine/src/env.rs
index 048d9bfb99..ab3a4bc50c 100644
--- a/crates/nu-engine/src/env.rs
+++ b/crates/nu-engine/src/env.rs
@@ -1,8 +1,8 @@
 use crate::ClosureEvalOnce;
 use nu_path::canonicalize_with;
 use nu_protocol::{
-    ast::{Call, Expr},
-    engine::{EngineState, Stack, StateWorkingSet},
+    ast::Expr,
+    engine::{Call, EngineState, Stack, StateWorkingSet},
     Config, ShellError, Span, Value, VarId,
 };
 use std::{
@@ -244,14 +244,15 @@ pub fn path_str(
 }
 
 pub const DIR_VAR_PARSER_INFO: &str = "dirs_var";
-pub fn get_dirs_var_from_call(call: &Call) -> Option<VarId> {
-    call.get_parser_info(DIR_VAR_PARSER_INFO).and_then(|x| {
-        if let Expr::Var(id) = x.expr {
-            Some(id)
-        } else {
-            None
-        }
-    })
+pub fn get_dirs_var_from_call(stack: &Stack, call: &Call) -> Option<VarId> {
+    call.get_parser_info(stack, DIR_VAR_PARSER_INFO)
+        .and_then(|x| {
+            if let Expr::Var(id) = x.expr {
+                Some(id)
+            } else {
+                None
+            }
+        })
 }
 
 /// This helper function is used to find files during eval
diff --git a/crates/nu-engine/src/eval.rs b/crates/nu-engine/src/eval.rs
index b495589011..6e171eb46c 100644
--- a/crates/nu-engine/src/eval.rs
+++ b/crates/nu-engine/src/eval.rs
@@ -1,3 +1,4 @@
+use crate::eval_ir_block;
 #[allow(deprecated)]
 use crate::{current_dir, get_config, get_full_help};
 use nu_path::{expand_path_with, AbsolutePathBuf};
@@ -7,7 +8,7 @@ use nu_protocol::{
         PipelineRedirection, RedirectionSource, RedirectionTarget,
     },
     debugger::DebugContext,
-    engine::{Closure, EngineState, Redirection, Stack},
+    engine::{Closure, EngineState, Redirection, Stack, StateWorkingSet},
     eval_base::Eval,
     ByteStreamSource, Config, FromValue, IntoPipelineData, OutDest, PipelineData, ShellError, Span,
     Spanned, Type, Value, VarId, ENV_VARIABLE_ID,
@@ -174,7 +175,7 @@ pub fn eval_call<D: DebugContext>(
         // We pass caller_stack here with the knowledge that internal commands
         // are going to be specifically looking for global state in the stack
         // rather than any local state.
-        decl.run(engine_state, caller_stack, call, input)
+        decl.run(engine_state, caller_stack, &call.into(), input)
     }
 }
 
@@ -223,7 +224,7 @@ fn eval_external(
         }
     }
 
-    command.run(engine_state, stack, &call, input)
+    command.run(engine_state, stack, &(&call).into(), input)
 }
 
 pub fn eval_expression<D: DebugContext>(
@@ -507,6 +508,11 @@ pub fn eval_block<D: DebugContext>(
     block: &Block,
     mut input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
+    // Remove once IR is the default.
+    if stack.use_ir {
+        return eval_ir_block::<D>(engine_state, stack, block, input);
+    }
+
     D::enter_block(engine_state, block);
 
     let num_pipelines = block.len();
@@ -521,7 +527,7 @@ pub fn eval_block<D: DebugContext>(
 
         for (i, element) in elements.iter().enumerate() {
             let next = elements.get(i + 1).unwrap_or(last);
-            let (next_out, next_err) = next.pipe_redirection(engine_state);
+            let (next_out, next_err) = next.pipe_redirection(&StateWorkingSet::new(engine_state));
             let (stdout, stderr) = eval_element_redirection::<D>(
                 engine_state,
                 stack,
@@ -903,7 +909,7 @@ impl Eval for EvalRuntime {
 ///
 /// An automatic environment variable cannot be assigned to by user code.
 /// Current there are three of them: $env.PWD, $env.FILE_PWD, $env.CURRENT_FILE
-fn is_automatic_env_var(var: &str) -> bool {
+pub(crate) fn is_automatic_env_var(var: &str) -> bool {
     let names = ["PWD", "FILE_PWD", "CURRENT_FILE"];
     names.iter().any(|&name| {
         if cfg!(windows) {
diff --git a/crates/nu-engine/src/eval_helpers.rs b/crates/nu-engine/src/eval_helpers.rs
index 66bda3e0eb..65ebc6b61d 100644
--- a/crates/nu-engine/src/eval_helpers.rs
+++ b/crates/nu-engine/src/eval_helpers.rs
@@ -1,6 +1,6 @@
 use crate::{
     eval_block, eval_block_with_early_return, eval_expression, eval_expression_with_input,
-    eval_subexpression,
+    eval_ir_block, eval_subexpression,
 };
 use nu_protocol::{
     ast::{Block, Expression},
@@ -13,6 +13,10 @@ use nu_protocol::{
 pub type EvalBlockFn =
     fn(&EngineState, &mut Stack, &Block, PipelineData) -> Result<PipelineData, ShellError>;
 
+/// Type of eval_ir_block() function
+pub type EvalIrBlockFn =
+    fn(&EngineState, &mut Stack, &Block, PipelineData) -> Result<PipelineData, ShellError>;
+
 /// Type of eval_block_with_early_return() function
 pub type EvalBlockWithEarlyReturnFn =
     fn(&EngineState, &mut Stack, &Block, PipelineData) -> Result<PipelineData, ShellError>;
@@ -42,6 +46,16 @@ pub fn get_eval_block(engine_state: &EngineState) -> EvalBlockFn {
     }
 }
 
+/// Helper function to fetch `eval_ir_block()` with the correct type parameter based on whether
+/// engine_state is configured with or without a debugger.
+pub fn get_eval_ir_block(engine_state: &EngineState) -> EvalIrBlockFn {
+    if engine_state.is_debugging() {
+        eval_ir_block::<WithDebug>
+    } else {
+        eval_ir_block::<WithoutDebug>
+    }
+}
+
 /// Helper function to fetch `eval_block_with_early_return()` with the correct type parameter based
 /// on whether engine_state is configured with or without a debugger.
 pub fn get_eval_block_with_early_return(engine_state: &EngineState) -> EvalBlockWithEarlyReturnFn {
diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
new file mode 100644
index 0000000000..a505c9be34
--- /dev/null
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -0,0 +1,1462 @@
+use std::{borrow::Cow, fs::File, sync::Arc};
+
+use nu_path::{expand_path_with, AbsolutePathBuf};
+use nu_protocol::{
+    ast::{Bits, Block, Boolean, CellPath, Comparison, Math, Operator},
+    debugger::DebugContext,
+    engine::{Argument, Closure, EngineState, ErrorHandler, Matcher, Redirection, Stack},
+    ir::{Call, DataSlice, Instruction, IrAstRef, IrBlock, Literal, RedirectMode},
+    record, ByteStreamSource, DeclId, ErrSpan, Flag, IntoPipelineData, IntoSpanned, ListStream,
+    OutDest, PipelineData, PositionalArg, Range, Record, RegId, ShellError, Signals, Signature,
+    Span, Spanned, Type, Value, VarId, ENV_VARIABLE_ID,
+};
+use nu_utils::IgnoreCaseExt;
+
+use crate::{eval::is_automatic_env_var, eval_block_with_early_return};
+
+/// Evaluate the compiled representation of a [`Block`].
+pub fn eval_ir_block<D: DebugContext>(
+    engine_state: &EngineState,
+    stack: &mut Stack,
+    block: &Block,
+    input: PipelineData,
+) -> Result<PipelineData, ShellError> {
+    // Rust does not check recursion limits outside of const evaluation.
+    // But nu programs run in the same process as the shell.
+    // To prevent a stack overflow in user code from crashing the shell,
+    // we limit the recursion depth of function calls.
+    let maximum_call_stack_depth: u64 = engine_state.config.recursion_limit as u64;
+    if stack.recursion_count > maximum_call_stack_depth {
+        return Err(ShellError::RecursionLimitReached {
+            recursion_limit: maximum_call_stack_depth,
+            span: block.span,
+        });
+    }
+
+    if let Some(ir_block) = &block.ir_block {
+        D::enter_block(engine_state, block);
+
+        let args_base = stack.arguments.get_base();
+        let error_handler_base = stack.error_handlers.get_base();
+
+        // Allocate and initialize registers. I've found that it's not really worth trying to avoid
+        // the heap allocation here by reusing buffers - our allocator is fast enough
+        let mut registers = Vec::with_capacity(ir_block.register_count as usize);
+        for _ in 0..ir_block.register_count {
+            registers.push(PipelineData::Empty);
+        }
+
+        // Initialize file storage.
+        let mut files = vec![None; ir_block.file_count as usize];
+
+        let result = eval_ir_block_impl::<D>(
+            &mut EvalContext {
+                engine_state,
+                stack,
+                data: &ir_block.data,
+                block_span: &block.span,
+                args_base,
+                error_handler_base,
+                redirect_out: None,
+                redirect_err: None,
+                matches: vec![],
+                registers: &mut registers[..],
+                files: &mut files[..],
+            },
+            ir_block,
+            input,
+        );
+
+        stack.error_handlers.leave_frame(error_handler_base);
+        stack.arguments.leave_frame(args_base);
+
+        D::leave_block(engine_state, block);
+
+        result
+    } else {
+        // FIXME blocks having IR should not be optional
+        Err(ShellError::GenericError {
+            error: "Can't evaluate block in IR mode".into(),
+            msg: "block is missing compiled representation".into(),
+            span: block.span,
+            help: Some("the IrBlock is probably missing due to a compilation error".into()),
+            inner: vec![],
+        })
+    }
+}
+
+/// All of the pointers necessary for evaluation
+struct EvalContext<'a> {
+    engine_state: &'a EngineState,
+    stack: &'a mut Stack,
+    data: &'a Arc<[u8]>,
+    /// The span of the block
+    block_span: &'a Option<Span>,
+    /// Base index on the argument stack to reset to after a call
+    args_base: usize,
+    /// Base index on the error handler stack to reset to after a call
+    error_handler_base: usize,
+    /// State set by redirect-out
+    redirect_out: Option<Redirection>,
+    /// State set by redirect-err
+    redirect_err: Option<Redirection>,
+    /// Scratch space to use for `match`
+    matches: Vec<(VarId, Value)>,
+    /// Intermediate pipeline data storage used by instructions, indexed by RegId
+    registers: &'a mut [PipelineData],
+    /// Holds open files used by redirections
+    files: &'a mut [Option<Arc<File>>],
+}
+
+impl<'a> EvalContext<'a> {
+    /// Replace the contents of a register with a new value
+    #[inline]
+    fn put_reg(&mut self, reg_id: RegId, new_value: PipelineData) {
+        // log::trace!("{reg_id} <- {new_value:?}");
+        self.registers[reg_id.0 as usize] = new_value;
+    }
+
+    /// Borrow the contents of a register.
+    #[inline]
+    fn borrow_reg(&self, reg_id: RegId) -> &PipelineData {
+        &self.registers[reg_id.0 as usize]
+    }
+
+    /// Replace the contents of a register with `Empty` and then return the value that it contained
+    #[inline]
+    fn take_reg(&mut self, reg_id: RegId) -> PipelineData {
+        // log::trace!("<- {reg_id}");
+        std::mem::replace(&mut self.registers[reg_id.0 as usize], PipelineData::Empty)
+    }
+
+    /// Clone data from a register. Must be collected first.
+    fn clone_reg(&mut self, reg_id: RegId, error_span: Span) -> Result<PipelineData, ShellError> {
+        match &self.registers[reg_id.0 as usize] {
+            PipelineData::Empty => Ok(PipelineData::Empty),
+            PipelineData::Value(val, meta) => Ok(PipelineData::Value(val.clone(), meta.clone())),
+            _ => Err(ShellError::IrEvalError {
+                msg: "Must collect to value before using instruction that clones from a register"
+                    .into(),
+                span: Some(error_span),
+            }),
+        }
+    }
+
+    /// Clone a value from a register. Must be collected first.
+    fn clone_reg_value(&mut self, reg_id: RegId, fallback_span: Span) -> Result<Value, ShellError> {
+        match self.clone_reg(reg_id, fallback_span)? {
+            PipelineData::Empty => Ok(Value::nothing(fallback_span)),
+            PipelineData::Value(val, _) => Ok(val),
+            _ => unreachable!("clone_reg should never return stream data"),
+        }
+    }
+
+    /// Take and implicitly collect a register to a value
+    fn collect_reg(&mut self, reg_id: RegId, fallback_span: Span) -> Result<Value, ShellError> {
+        let data = self.take_reg(reg_id);
+        let span = data.span().unwrap_or(fallback_span);
+        data.into_value(span)
+    }
+
+    /// Get a string from data or produce evaluation error if it's invalid UTF-8
+    fn get_str(&self, slice: DataSlice, error_span: Span) -> Result<&'a str, ShellError> {
+        std::str::from_utf8(&self.data[slice]).map_err(|_| ShellError::IrEvalError {
+            msg: format!("data slice does not refer to valid UTF-8: {slice:?}"),
+            span: Some(error_span),
+        })
+    }
+}
+
+/// Eval an IR block on the provided slice of registers.
+fn eval_ir_block_impl<D: DebugContext>(
+    ctx: &mut EvalContext<'_>,
+    ir_block: &IrBlock,
+    input: PipelineData,
+) -> Result<PipelineData, ShellError> {
+    if !ctx.registers.is_empty() {
+        ctx.registers[0] = input;
+    }
+
+    // Program counter, starts at zero.
+    let mut pc = 0;
+
+    while pc < ir_block.instructions.len() {
+        let instruction = &ir_block.instructions[pc];
+        let span = &ir_block.spans[pc];
+        let ast = &ir_block.ast[pc];
+        log::trace!(
+            "{pc:-4}: {}",
+            instruction.display(ctx.engine_state, ctx.data)
+        );
+        match eval_instruction::<D>(ctx, instruction, span, ast) {
+            Ok(InstructionResult::Continue) => {
+                pc += 1;
+            }
+            Ok(InstructionResult::Branch(next_pc)) => {
+                pc = next_pc;
+            }
+            Ok(InstructionResult::Return(reg_id)) => {
+                return Ok(ctx.take_reg(reg_id));
+            }
+            Ok(InstructionResult::ExitCode(exit_code)) => {
+                if let Some(error_handler) = ctx.stack.error_handlers.pop(ctx.error_handler_base) {
+                    // If an error handler is set, branch there
+                    prepare_error_handler(ctx, error_handler, None);
+                    pc = error_handler.handler_index;
+                } else {
+                    // If not, exit the block with the exit code
+                    return Ok(PipelineData::new_external_stream_with_only_exit_code(
+                        exit_code,
+                    ));
+                }
+            }
+            Err(
+                err @ (ShellError::Return { .. }
+                | ShellError::Continue { .. }
+                | ShellError::Break { .. }),
+            ) => {
+                // These block control related errors should be passed through
+                return Err(err);
+            }
+            Err(err) => {
+                if let Some(error_handler) = ctx.stack.error_handlers.pop(ctx.error_handler_base) {
+                    // If an error handler is set, branch there
+                    prepare_error_handler(ctx, error_handler, Some(err.into_spanned(*span)));
+                    pc = error_handler.handler_index;
+                } else {
+                    // If not, exit the block with the error
+                    return Err(err);
+                }
+            }
+        }
+    }
+
+    // Fell out of the loop, without encountering a Return.
+    Err(ShellError::IrEvalError {
+        msg: format!(
+            "Program counter out of range (pc={pc}, len={len})",
+            len = ir_block.instructions.len(),
+        ),
+        span: *ctx.block_span,
+    })
+}
+
+/// Prepare the context for an error handler
+fn prepare_error_handler(
+    ctx: &mut EvalContext<'_>,
+    error_handler: ErrorHandler,
+    error: Option<Spanned<ShellError>>,
+) {
+    if let Some(reg_id) = error_handler.error_register {
+        if let Some(error) = error {
+            // Create the error value and put it in the register
+            let value = Value::record(
+                record! {
+                    "msg" => Value::string(format!("{}", error.item), error.span),
+                    "debug" => Value::string(format!("{:?}", error.item), error.span),
+                    "raw" => Value::error(error.item, error.span),
+                },
+                error.span,
+            );
+            ctx.put_reg(reg_id, PipelineData::Value(value, None));
+        } else {
+            // Set the register to empty
+            ctx.put_reg(reg_id, PipelineData::Empty);
+        }
+    }
+}
+
+/// The result of performing an instruction. Describes what should happen next
+#[derive(Debug)]
+enum InstructionResult {
+    Continue,
+    Branch(usize),
+    Return(RegId),
+    ExitCode(i32),
+}
+
+/// Perform an instruction
+fn eval_instruction<D: DebugContext>(
+    ctx: &mut EvalContext<'_>,
+    instruction: &Instruction,
+    span: &Span,
+    ast: &Option<IrAstRef>,
+) -> Result<InstructionResult, ShellError> {
+    use self::InstructionResult::*;
+
+    // See the docs for `Instruction` for more information on what these instructions are supposed
+    // to do.
+    match instruction {
+        Instruction::Unreachable => Err(ShellError::IrEvalError {
+            msg: "Reached unreachable code".into(),
+            span: Some(*span),
+        }),
+        Instruction::LoadLiteral { dst, lit } => load_literal(ctx, *dst, lit, *span),
+        Instruction::LoadValue { dst, val } => {
+            ctx.put_reg(*dst, Value::clone(val).into_pipeline_data());
+            Ok(Continue)
+        }
+        Instruction::Move { dst, src } => {
+            let val = ctx.take_reg(*src);
+            ctx.put_reg(*dst, val);
+            Ok(Continue)
+        }
+        Instruction::Clone { dst, src } => {
+            let data = ctx.clone_reg(*src, *span)?;
+            ctx.put_reg(*dst, data);
+            Ok(Continue)
+        }
+        Instruction::Collect { src_dst } => {
+            let data = ctx.take_reg(*src_dst);
+            let value = collect(data, *span)?;
+            ctx.put_reg(*src_dst, value);
+            Ok(Continue)
+        }
+        Instruction::Span { src_dst } => {
+            let data = ctx.take_reg(*src_dst);
+            let spanned = data.with_span(*span);
+            ctx.put_reg(*src_dst, spanned);
+            Ok(Continue)
+        }
+        Instruction::Drop { src } => {
+            ctx.take_reg(*src);
+            Ok(Continue)
+        }
+        Instruction::Drain { src } => {
+            let data = ctx.take_reg(*src);
+            drain(ctx, data)
+        }
+        Instruction::LoadVariable { dst, var_id } => {
+            let value = get_var(ctx, *var_id, *span)?;
+            ctx.put_reg(*dst, value.into_pipeline_data());
+            Ok(Continue)
+        }
+        Instruction::StoreVariable { var_id, src } => {
+            let value = ctx.collect_reg(*src, *span)?;
+            ctx.stack.add_var(*var_id, value);
+            Ok(Continue)
+        }
+        Instruction::LoadEnv { dst, key } => {
+            let key = ctx.get_str(*key, *span)?;
+            if let Some(value) = get_env_var_case_insensitive(ctx, key) {
+                let new_value = value.clone().into_pipeline_data();
+                ctx.put_reg(*dst, new_value);
+                Ok(Continue)
+            } else {
+                // FIXME: using the same span twice, shouldn't this really be
+                // EnvVarNotFoundAtRuntime? There are tests that depend on CantFindColumn though...
+                Err(ShellError::CantFindColumn {
+                    col_name: key.into(),
+                    span: Some(*span),
+                    src_span: *span,
+                })
+            }
+        }
+        Instruction::LoadEnvOpt { dst, key } => {
+            let key = ctx.get_str(*key, *span)?;
+            let value = get_env_var_case_insensitive(ctx, key)
+                .cloned()
+                .unwrap_or(Value::nothing(*span));
+            ctx.put_reg(*dst, value.into_pipeline_data());
+            Ok(Continue)
+        }
+        Instruction::StoreEnv { key, src } => {
+            let key = ctx.get_str(*key, *span)?;
+            let value = ctx.collect_reg(*src, *span)?;
+
+            let key = get_env_var_name_case_insensitive(ctx, key);
+
+            if !is_automatic_env_var(&key) {
+                ctx.stack.add_env_var(key.into_owned(), value);
+                Ok(Continue)
+            } else {
+                Err(ShellError::AutomaticEnvVarSetManually {
+                    envvar_name: key.into(),
+                    span: *span,
+                })
+            }
+        }
+        Instruction::PushPositional { src } => {
+            let val = ctx.collect_reg(*src, *span)?.with_span(*span);
+            ctx.stack.arguments.push(Argument::Positional {
+                span: *span,
+                val,
+                ast: ast.clone().map(|ast_ref| ast_ref.0),
+            });
+            Ok(Continue)
+        }
+        Instruction::AppendRest { src } => {
+            let vals = ctx.collect_reg(*src, *span)?.with_span(*span);
+            ctx.stack.arguments.push(Argument::Spread {
+                span: *span,
+                vals,
+                ast: ast.clone().map(|ast_ref| ast_ref.0),
+            });
+            Ok(Continue)
+        }
+        Instruction::PushFlag { name } => {
+            let data = ctx.data.clone();
+            ctx.stack.arguments.push(Argument::Flag {
+                data,
+                name: *name,
+                short: DataSlice::empty(),
+                span: *span,
+            });
+            Ok(Continue)
+        }
+        Instruction::PushShortFlag { short } => {
+            let data = ctx.data.clone();
+            ctx.stack.arguments.push(Argument::Flag {
+                data,
+                name: DataSlice::empty(),
+                short: *short,
+                span: *span,
+            });
+            Ok(Continue)
+        }
+        Instruction::PushNamed { name, src } => {
+            let val = ctx.collect_reg(*src, *span)?.with_span(*span);
+            let data = ctx.data.clone();
+            ctx.stack.arguments.push(Argument::Named {
+                data,
+                name: *name,
+                short: DataSlice::empty(),
+                span: *span,
+                val,
+                ast: ast.clone().map(|ast_ref| ast_ref.0),
+            });
+            Ok(Continue)
+        }
+        Instruction::PushShortNamed { short, src } => {
+            let val = ctx.collect_reg(*src, *span)?.with_span(*span);
+            let data = ctx.data.clone();
+            ctx.stack.arguments.push(Argument::Named {
+                data,
+                name: DataSlice::empty(),
+                short: *short,
+                span: *span,
+                val,
+                ast: ast.clone().map(|ast_ref| ast_ref.0),
+            });
+            Ok(Continue)
+        }
+        Instruction::PushParserInfo { name, info } => {
+            let data = ctx.data.clone();
+            ctx.stack.arguments.push(Argument::ParserInfo {
+                data,
+                name: *name,
+                info: info.clone(),
+            });
+            Ok(Continue)
+        }
+        Instruction::RedirectOut { mode } => {
+            ctx.redirect_out = eval_redirection(ctx, mode, *span, RedirectionStream::Out)?;
+            Ok(Continue)
+        }
+        Instruction::RedirectErr { mode } => {
+            ctx.redirect_err = eval_redirection(ctx, mode, *span, RedirectionStream::Err)?;
+            Ok(Continue)
+        }
+        Instruction::CheckErrRedirected { src } => match ctx.borrow_reg(*src) {
+            PipelineData::ByteStream(stream, _)
+                if matches!(stream.source(), ByteStreamSource::Child(_)) =>
+            {
+                Ok(Continue)
+            }
+            _ => Err(ShellError::GenericError {
+                error: "Can't redirect stderr of internal command output".into(),
+                msg: "piping stderr only works on external commands".into(),
+                span: Some(*span),
+                help: None,
+                inner: vec![],
+            }),
+        },
+        Instruction::OpenFile {
+            file_num,
+            path,
+            append,
+        } => {
+            let path = ctx.collect_reg(*path, *span)?;
+            let file = open_file(ctx, &path, *append)?;
+            ctx.files[*file_num as usize] = Some(file);
+            Ok(Continue)
+        }
+        Instruction::WriteFile { file_num, src } => {
+            let src = ctx.take_reg(*src);
+            let file = ctx
+                .files
+                .get(*file_num as usize)
+                .cloned()
+                .flatten()
+                .ok_or_else(|| ShellError::IrEvalError {
+                    msg: format!("Tried to write to file #{file_num}, but it is not open"),
+                    span: Some(*span),
+                })?;
+            let result = {
+                let mut stack = ctx
+                    .stack
+                    .push_redirection(Some(Redirection::File(file)), None);
+                src.write_to_out_dests(ctx.engine_state, &mut stack)?
+            };
+            // Abort execution if there's an exit code from a failed external
+            drain(ctx, result)
+        }
+        Instruction::CloseFile { file_num } => {
+            if ctx.files[*file_num as usize].take().is_some() {
+                Ok(Continue)
+            } else {
+                Err(ShellError::IrEvalError {
+                    msg: format!("Tried to close file #{file_num}, but it is not open"),
+                    span: Some(*span),
+                })
+            }
+        }
+        Instruction::Call { decl_id, src_dst } => {
+            let input = ctx.take_reg(*src_dst);
+            let result = eval_call::<D>(ctx, *decl_id, *span, input)?;
+            ctx.put_reg(*src_dst, result);
+            Ok(Continue)
+        }
+        Instruction::StringAppend { src_dst, val } => {
+            let string_value = ctx.collect_reg(*src_dst, *span)?;
+            let operand_value = ctx.collect_reg(*val, *span)?;
+            let string_span = string_value.span();
+
+            let mut string = string_value.into_string()?;
+            let operand = if let Value::String { val, .. } = operand_value {
+                // Small optimization, so we don't have to copy the string *again*
+                val
+            } else {
+                operand_value.to_expanded_string(", ", ctx.engine_state.get_config())
+            };
+            string.push_str(&operand);
+
+            let new_string_value = Value::string(string, string_span);
+            ctx.put_reg(*src_dst, new_string_value.into_pipeline_data());
+            Ok(Continue)
+        }
+        Instruction::GlobFrom { src_dst, no_expand } => {
+            let string_value = ctx.collect_reg(*src_dst, *span)?;
+            let glob_value = if matches!(string_value, Value::Glob { .. }) {
+                // It already is a glob, so don't touch it.
+                string_value
+            } else {
+                // Treat it as a string, then cast
+                let string = string_value.into_string()?;
+                Value::glob(string, *no_expand, *span)
+            };
+            ctx.put_reg(*src_dst, glob_value.into_pipeline_data());
+            Ok(Continue)
+        }
+        Instruction::ListPush { src_dst, item } => {
+            let list_value = ctx.collect_reg(*src_dst, *span)?;
+            let item = ctx.collect_reg(*item, *span)?;
+            let list_span = list_value.span();
+            let mut list = list_value.into_list()?;
+            list.push(item);
+            ctx.put_reg(*src_dst, Value::list(list, list_span).into_pipeline_data());
+            Ok(Continue)
+        }
+        Instruction::ListSpread { src_dst, items } => {
+            let list_value = ctx.collect_reg(*src_dst, *span)?;
+            let items = ctx.collect_reg(*items, *span)?;
+            let list_span = list_value.span();
+            let items_span = items.span();
+            let mut list = list_value.into_list()?;
+            list.extend(
+                items
+                    .into_list()
+                    .map_err(|_| ShellError::CannotSpreadAsList { span: items_span })?,
+            );
+            ctx.put_reg(*src_dst, Value::list(list, list_span).into_pipeline_data());
+            Ok(Continue)
+        }
+        Instruction::RecordInsert { src_dst, key, val } => {
+            let record_value = ctx.collect_reg(*src_dst, *span)?;
+            let key = ctx.collect_reg(*key, *span)?;
+            let val = ctx.collect_reg(*val, *span)?;
+            let record_span = record_value.span();
+            let mut record = record_value.into_record()?;
+
+            let key = key.coerce_into_string()?;
+            if let Some(old_value) = record.insert(&key, val) {
+                return Err(ShellError::ColumnDefinedTwice {
+                    col_name: key,
+                    second_use: *span,
+                    first_use: old_value.span(),
+                });
+            }
+
+            ctx.put_reg(
+                *src_dst,
+                Value::record(record, record_span).into_pipeline_data(),
+            );
+            Ok(Continue)
+        }
+        Instruction::RecordSpread { src_dst, items } => {
+            let record_value = ctx.collect_reg(*src_dst, *span)?;
+            let items = ctx.collect_reg(*items, *span)?;
+            let record_span = record_value.span();
+            let items_span = items.span();
+            let mut record = record_value.into_record()?;
+            // Not using .extend() here because it doesn't handle duplicates
+            for (key, val) in items
+                .into_record()
+                .map_err(|_| ShellError::CannotSpreadAsRecord { span: items_span })?
+            {
+                if let Some(first_value) = record.insert(&key, val) {
+                    return Err(ShellError::ColumnDefinedTwice {
+                        col_name: key,
+                        second_use: *span,
+                        first_use: first_value.span(),
+                    });
+                }
+            }
+            ctx.put_reg(
+                *src_dst,
+                Value::record(record, record_span).into_pipeline_data(),
+            );
+            Ok(Continue)
+        }
+        Instruction::Not { src_dst } => {
+            let bool = ctx.collect_reg(*src_dst, *span)?;
+            let negated = !bool.as_bool()?;
+            ctx.put_reg(
+                *src_dst,
+                Value::bool(negated, bool.span()).into_pipeline_data(),
+            );
+            Ok(Continue)
+        }
+        Instruction::BinaryOp { lhs_dst, op, rhs } => binary_op(ctx, *lhs_dst, op, *rhs, *span),
+        Instruction::FollowCellPath { src_dst, path } => {
+            let data = ctx.take_reg(*src_dst);
+            let path = ctx.take_reg(*path);
+            if let PipelineData::Value(Value::CellPath { val: path, .. }, _) = path {
+                let value = data.follow_cell_path(&path.members, *span, true)?;
+                ctx.put_reg(*src_dst, value.into_pipeline_data());
+                Ok(Continue)
+            } else if let PipelineData::Value(Value::Error { error, .. }, _) = path {
+                Err(*error)
+            } else {
+                Err(ShellError::TypeMismatch {
+                    err_message: "expected cell path".into(),
+                    span: path.span().unwrap_or(*span),
+                })
+            }
+        }
+        Instruction::CloneCellPath { dst, src, path } => {
+            let value = ctx.clone_reg_value(*src, *span)?;
+            let path = ctx.take_reg(*path);
+            if let PipelineData::Value(Value::CellPath { val: path, .. }, _) = path {
+                // TODO: make follow_cell_path() not have to take ownership, probably using Cow
+                let value = value.follow_cell_path(&path.members, true)?;
+                ctx.put_reg(*dst, value.into_pipeline_data());
+                Ok(Continue)
+            } else if let PipelineData::Value(Value::Error { error, .. }, _) = path {
+                Err(*error)
+            } else {
+                Err(ShellError::TypeMismatch {
+                    err_message: "expected cell path".into(),
+                    span: path.span().unwrap_or(*span),
+                })
+            }
+        }
+        Instruction::UpsertCellPath {
+            src_dst,
+            path,
+            new_value,
+        } => {
+            let data = ctx.take_reg(*src_dst);
+            let metadata = data.metadata();
+            // Change the span because we're modifying it
+            let mut value = data.into_value(*span)?;
+            let path = ctx.take_reg(*path);
+            let new_value = ctx.collect_reg(*new_value, *span)?;
+            if let PipelineData::Value(Value::CellPath { val: path, .. }, _) = path {
+                value.upsert_data_at_cell_path(&path.members, new_value)?;
+                ctx.put_reg(*src_dst, value.into_pipeline_data_with_metadata(metadata));
+                Ok(Continue)
+            } else if let PipelineData::Value(Value::Error { error, .. }, _) = path {
+                Err(*error)
+            } else {
+                Err(ShellError::TypeMismatch {
+                    err_message: "expected cell path".into(),
+                    span: path.span().unwrap_or(*span),
+                })
+            }
+        }
+        Instruction::Jump { index } => Ok(Branch(*index)),
+        Instruction::BranchIf { cond, index } => {
+            let data = ctx.take_reg(*cond);
+            let data_span = data.span();
+            let val = match data {
+                PipelineData::Value(Value::Bool { val, .. }, _) => val,
+                PipelineData::Value(Value::Error { error, .. }, _) => {
+                    return Err(*error);
+                }
+                _ => {
+                    return Err(ShellError::TypeMismatch {
+                        err_message: "expected bool".into(),
+                        span: data_span.unwrap_or(*span),
+                    });
+                }
+            };
+            if val {
+                Ok(Branch(*index))
+            } else {
+                Ok(Continue)
+            }
+        }
+        Instruction::BranchIfEmpty { src, index } => {
+            let is_empty = matches!(
+                ctx.borrow_reg(*src),
+                PipelineData::Empty | PipelineData::Value(Value::Nothing { .. }, _)
+            );
+
+            if is_empty {
+                Ok(Branch(*index))
+            } else {
+                Ok(Continue)
+            }
+        }
+        Instruction::Match {
+            pattern,
+            src,
+            index,
+        } => {
+            let value = ctx.clone_reg_value(*src, *span)?;
+            ctx.matches.clear();
+            if pattern.match_value(&value, &mut ctx.matches) {
+                // Match succeeded: set variables and branch
+                for (var_id, match_value) in ctx.matches.drain(..) {
+                    ctx.stack.add_var(var_id, match_value);
+                }
+                Ok(Branch(*index))
+            } else {
+                // Failed to match, put back original value
+                ctx.matches.clear();
+                Ok(Continue)
+            }
+        }
+        Instruction::CheckMatchGuard { src } => {
+            if matches!(
+                ctx.borrow_reg(*src),
+                PipelineData::Value(Value::Bool { .. }, _)
+            ) {
+                Ok(Continue)
+            } else {
+                Err(ShellError::MatchGuardNotBool { span: *span })
+            }
+        }
+        Instruction::Iterate {
+            dst,
+            stream,
+            end_index,
+        } => eval_iterate(ctx, *dst, *stream, *end_index),
+        Instruction::OnError { index } => {
+            ctx.stack.error_handlers.push(ErrorHandler {
+                handler_index: *index,
+                error_register: None,
+            });
+            Ok(Continue)
+        }
+        Instruction::OnErrorInto { index, dst } => {
+            ctx.stack.error_handlers.push(ErrorHandler {
+                handler_index: *index,
+                error_register: Some(*dst),
+            });
+            Ok(Continue)
+        }
+        Instruction::PopErrorHandler => {
+            ctx.stack.error_handlers.pop(ctx.error_handler_base);
+            Ok(Continue)
+        }
+        Instruction::CheckExternalFailed { dst, src } => {
+            let data = ctx.take_reg(*src);
+            let (data, failed) = data.check_external_failed()?;
+            ctx.put_reg(*src, data);
+            ctx.put_reg(*dst, Value::bool(failed, *span).into_pipeline_data());
+            Ok(Continue)
+        }
+        Instruction::ReturnEarly { src } => {
+            let val = ctx.collect_reg(*src, *span)?;
+            Err(ShellError::Return {
+                span: *span,
+                value: Box::new(val),
+            })
+        }
+        Instruction::Return { src } => Ok(Return(*src)),
+    }
+}
+
+/// Load a literal value into a register
+fn load_literal(
+    ctx: &mut EvalContext<'_>,
+    dst: RegId,
+    lit: &Literal,
+    span: Span,
+) -> Result<InstructionResult, ShellError> {
+    let value = literal_value(ctx, lit, span)?;
+    ctx.put_reg(dst, PipelineData::Value(value, None));
+    Ok(InstructionResult::Continue)
+}
+
+fn literal_value(
+    ctx: &mut EvalContext<'_>,
+    lit: &Literal,
+    span: Span,
+) -> Result<Value, ShellError> {
+    Ok(match lit {
+        Literal::Bool(b) => Value::bool(*b, span),
+        Literal::Int(i) => Value::int(*i, span),
+        Literal::Float(f) => Value::float(*f, span),
+        Literal::Filesize(q) => Value::filesize(*q, span),
+        Literal::Duration(q) => Value::duration(*q, span),
+        Literal::Binary(bin) => Value::binary(&ctx.data[*bin], span),
+        Literal::Block(block_id) | Literal::RowCondition(block_id) | Literal::Closure(block_id) => {
+            let block = ctx.engine_state.get_block(*block_id);
+            let captures = block
+                .captures
+                .iter()
+                .map(|var_id| get_var(ctx, *var_id, span).map(|val| (*var_id, val)))
+                .collect::<Result<Vec<_>, ShellError>>()?;
+            Value::closure(
+                Closure {
+                    block_id: *block_id,
+                    captures,
+                },
+                span,
+            )
+        }
+        Literal::Range {
+            start,
+            step,
+            end,
+            inclusion,
+        } => {
+            let start = ctx.collect_reg(*start, span)?;
+            let step = ctx.collect_reg(*step, span)?;
+            let end = ctx.collect_reg(*end, span)?;
+            let range = Range::new(start, step, end, *inclusion, span)?;
+            Value::range(range, span)
+        }
+        Literal::List { capacity } => Value::list(Vec::with_capacity(*capacity), span),
+        Literal::Record { capacity } => Value::record(Record::with_capacity(*capacity), span),
+        Literal::Filepath {
+            val: path,
+            no_expand,
+        } => {
+            let path = ctx.get_str(*path, span)?;
+            if *no_expand {
+                Value::string(path, span)
+            } else {
+                let cwd = ctx.engine_state.cwd(Some(ctx.stack))?;
+                let path = expand_path_with(path, cwd, true);
+
+                Value::string(path.to_string_lossy(), span)
+            }
+        }
+        Literal::Directory {
+            val: path,
+            no_expand,
+        } => {
+            let path = ctx.get_str(*path, span)?;
+            if path == "-" {
+                Value::string("-", span)
+            } else if *no_expand {
+                Value::string(path, span)
+            } else {
+                let cwd = ctx
+                    .engine_state
+                    .cwd(Some(ctx.stack))
+                    .map(AbsolutePathBuf::into_std_path_buf)
+                    .unwrap_or_default();
+                let path = expand_path_with(path, cwd, true);
+
+                Value::string(path.to_string_lossy(), span)
+            }
+        }
+        Literal::GlobPattern { val, no_expand } => {
+            Value::glob(ctx.get_str(*val, span)?, *no_expand, span)
+        }
+        Literal::String(s) => Value::string(ctx.get_str(*s, span)?, span),
+        Literal::RawString(s) => Value::string(ctx.get_str(*s, span)?, span),
+        Literal::CellPath(path) => Value::cell_path(CellPath::clone(path), span),
+        Literal::Date(dt) => Value::date(**dt, span),
+        Literal::Nothing => Value::nothing(span),
+    })
+}
+
+fn binary_op(
+    ctx: &mut EvalContext<'_>,
+    lhs_dst: RegId,
+    op: &Operator,
+    rhs: RegId,
+    span: Span,
+) -> Result<InstructionResult, ShellError> {
+    let lhs_val = ctx.collect_reg(lhs_dst, span)?;
+    let rhs_val = ctx.collect_reg(rhs, span)?;
+
+    // Handle binary op errors early
+    if let Value::Error { error, .. } = lhs_val {
+        return Err(*error);
+    }
+    if let Value::Error { error, .. } = rhs_val {
+        return Err(*error);
+    }
+
+    // We only have access to one span here, but the generated code usually adds a `span`
+    // instruction to set the output span to the right span.
+    let op_span = span;
+
+    let result = match op {
+        Operator::Comparison(cmp) => match cmp {
+            Comparison::Equal => lhs_val.eq(op_span, &rhs_val, span)?,
+            Comparison::NotEqual => lhs_val.ne(op_span, &rhs_val, span)?,
+            Comparison::LessThan => lhs_val.lt(op_span, &rhs_val, span)?,
+            Comparison::GreaterThan => lhs_val.gt(op_span, &rhs_val, span)?,
+            Comparison::LessThanOrEqual => lhs_val.lte(op_span, &rhs_val, span)?,
+            Comparison::GreaterThanOrEqual => lhs_val.gte(op_span, &rhs_val, span)?,
+            Comparison::RegexMatch => {
+                lhs_val.regex_match(ctx.engine_state, op_span, &rhs_val, false, span)?
+            }
+            Comparison::NotRegexMatch => {
+                lhs_val.regex_match(ctx.engine_state, op_span, &rhs_val, true, span)?
+            }
+            Comparison::In => lhs_val.r#in(op_span, &rhs_val, span)?,
+            Comparison::NotIn => lhs_val.not_in(op_span, &rhs_val, span)?,
+            Comparison::StartsWith => lhs_val.starts_with(op_span, &rhs_val, span)?,
+            Comparison::EndsWith => lhs_val.ends_with(op_span, &rhs_val, span)?,
+        },
+        Operator::Math(mat) => match mat {
+            Math::Plus => lhs_val.add(op_span, &rhs_val, span)?,
+            Math::Append => lhs_val.append(op_span, &rhs_val, span)?,
+            Math::Minus => lhs_val.sub(op_span, &rhs_val, span)?,
+            Math::Multiply => lhs_val.mul(op_span, &rhs_val, span)?,
+            Math::Divide => lhs_val.div(op_span, &rhs_val, span)?,
+            Math::Modulo => lhs_val.modulo(op_span, &rhs_val, span)?,
+            Math::FloorDivision => lhs_val.floor_div(op_span, &rhs_val, span)?,
+            Math::Pow => lhs_val.pow(op_span, &rhs_val, span)?,
+        },
+        Operator::Boolean(bl) => match bl {
+            Boolean::And => lhs_val.and(op_span, &rhs_val, span)?,
+            Boolean::Or => lhs_val.or(op_span, &rhs_val, span)?,
+            Boolean::Xor => lhs_val.xor(op_span, &rhs_val, span)?,
+        },
+        Operator::Bits(bit) => match bit {
+            Bits::BitOr => lhs_val.bit_or(op_span, &rhs_val, span)?,
+            Bits::BitXor => lhs_val.bit_xor(op_span, &rhs_val, span)?,
+            Bits::BitAnd => lhs_val.bit_and(op_span, &rhs_val, span)?,
+            Bits::ShiftLeft => lhs_val.bit_shl(op_span, &rhs_val, span)?,
+            Bits::ShiftRight => lhs_val.bit_shr(op_span, &rhs_val, span)?,
+        },
+        Operator::Assignment(_asg) => {
+            return Err(ShellError::IrEvalError {
+                msg: "can't eval assignment with the `binary-op` instruction".into(),
+                span: Some(span),
+            })
+        }
+    };
+
+    ctx.put_reg(lhs_dst, PipelineData::Value(result, None));
+
+    Ok(InstructionResult::Continue)
+}
+
+/// Evaluate a call
+fn eval_call<D: DebugContext>(
+    ctx: &mut EvalContext<'_>,
+    decl_id: DeclId,
+    head: Span,
+    input: PipelineData,
+) -> Result<PipelineData, ShellError> {
+    let EvalContext {
+        engine_state,
+        stack: caller_stack,
+        args_base,
+        redirect_out,
+        redirect_err,
+        ..
+    } = ctx;
+
+    let args_len = caller_stack.arguments.get_len(*args_base);
+    let decl = engine_state.get_decl(decl_id);
+
+    // Set up redirect modes
+    let mut caller_stack = caller_stack.push_redirection(redirect_out.take(), redirect_err.take());
+
+    let result;
+
+    if let Some(block_id) = decl.block_id() {
+        // If the decl is a custom command
+        let block = engine_state.get_block(block_id);
+
+        // Set up a callee stack with the captures and move arguments from the stack into variables
+        let mut callee_stack = caller_stack.gather_captures(engine_state, &block.captures);
+
+        gather_arguments(
+            engine_state,
+            block,
+            &mut caller_stack,
+            &mut callee_stack,
+            *args_base,
+            args_len,
+            head,
+        )?;
+
+        // Add one to the recursion count, so we don't recurse too deep. Stack overflows are not
+        // recoverable in Rust.
+        callee_stack.recursion_count += 1;
+
+        result = eval_block_with_early_return::<D>(engine_state, &mut callee_stack, block, input);
+
+        // Move environment variables back into the caller stack scope if requested to do so
+        if block.redirect_env {
+            redirect_env(engine_state, &mut caller_stack, &callee_stack);
+        }
+    } else {
+        // FIXME: precalculate this and save it somewhere
+        let span = Span::merge_many(
+            std::iter::once(head).chain(
+                caller_stack
+                    .arguments
+                    .get_args(*args_base, args_len)
+                    .iter()
+                    .flat_map(|arg| arg.span()),
+            ),
+        );
+
+        let call = Call {
+            decl_id,
+            head,
+            span,
+            args_base: *args_base,
+            args_len,
+        };
+
+        // Run the call
+        result = decl.run(engine_state, &mut caller_stack, &(&call).into(), input);
+    };
+
+    drop(caller_stack);
+
+    // Important that this runs, to reset state post-call:
+    ctx.stack.arguments.leave_frame(ctx.args_base);
+    ctx.redirect_out = None;
+    ctx.redirect_err = None;
+
+    result
+}
+
+fn find_named_var_id(
+    sig: &Signature,
+    name: &[u8],
+    short: &[u8],
+    span: Span,
+) -> Result<VarId, ShellError> {
+    sig.named
+        .iter()
+        .find(|n| {
+            if !n.long.is_empty() {
+                n.long.as_bytes() == name
+            } else {
+                // It's possible to only have a short name and no long name
+                n.short
+                    .is_some_and(|s| s.encode_utf8(&mut [0; 4]).as_bytes() == short)
+            }
+        })
+        .ok_or_else(|| ShellError::IrEvalError {
+            msg: format!(
+                "block does not have an argument named `{}`",
+                String::from_utf8_lossy(name)
+            ),
+            span: Some(span),
+        })
+        .and_then(|flag| expect_named_var_id(flag, span))
+}
+
+fn expect_named_var_id(arg: &Flag, span: Span) -> Result<VarId, ShellError> {
+    arg.var_id.ok_or_else(|| ShellError::IrEvalError {
+        msg: format!(
+            "block signature is missing var id for named arg `{}`",
+            arg.long
+        ),
+        span: Some(span),
+    })
+}
+
+fn expect_positional_var_id(arg: &PositionalArg, span: Span) -> Result<VarId, ShellError> {
+    arg.var_id.ok_or_else(|| ShellError::IrEvalError {
+        msg: format!(
+            "block signature is missing var id for positional arg `{}`",
+            arg.name
+        ),
+        span: Some(span),
+    })
+}
+
+/// Move arguments from the stack into variables for a custom command
+fn gather_arguments(
+    engine_state: &EngineState,
+    block: &Block,
+    caller_stack: &mut Stack,
+    callee_stack: &mut Stack,
+    args_base: usize,
+    args_len: usize,
+    call_head: Span,
+) -> Result<(), ShellError> {
+    let mut positional_iter = block
+        .signature
+        .required_positional
+        .iter()
+        .map(|p| (p, true))
+        .chain(
+            block
+                .signature
+                .optional_positional
+                .iter()
+                .map(|p| (p, false)),
+        );
+
+    // Arguments that didn't get consumed by required/optional
+    let mut rest = vec![];
+
+    // If we encounter a spread, all further positionals should go to rest
+    let mut always_spread = false;
+
+    for arg in caller_stack.arguments.drain_args(args_base, args_len) {
+        match arg {
+            Argument::Positional { span, val, .. } => {
+                // Don't check next positional arg if we encountered a spread previously
+                let next = (!always_spread).then(|| positional_iter.next()).flatten();
+                if let Some((positional_arg, required)) = next {
+                    let var_id = expect_positional_var_id(positional_arg, span)?;
+                    if required {
+                        // By checking the type of the bound variable rather than converting the
+                        // SyntaxShape here, we might be able to save some allocations and effort
+                        let variable = engine_state.get_var(var_id);
+                        check_type(&val, &variable.ty)?;
+                    }
+                    callee_stack.add_var(var_id, val);
+                } else {
+                    rest.push(val);
+                }
+            }
+            Argument::Spread { vals, .. } => {
+                if let Value::List { vals, .. } = vals {
+                    rest.extend(vals);
+                    // All further positional args should go to spread
+                    always_spread = true;
+                } else if let Value::Error { error, .. } = vals {
+                    return Err(*error);
+                } else {
+                    return Err(ShellError::CannotSpreadAsList { span: vals.span() });
+                }
+            }
+            Argument::Flag {
+                data,
+                name,
+                short,
+                span,
+            } => {
+                let var_id = find_named_var_id(&block.signature, &data[name], &data[short], span)?;
+                callee_stack.add_var(var_id, Value::bool(true, span))
+            }
+            Argument::Named {
+                data,
+                name,
+                short,
+                span,
+                val,
+                ..
+            } => {
+                let var_id = find_named_var_id(&block.signature, &data[name], &data[short], span)?;
+                callee_stack.add_var(var_id, val)
+            }
+            Argument::ParserInfo { .. } => (),
+        }
+    }
+
+    // Add the collected rest of the arguments if a spread argument exists
+    if let Some(rest_arg) = &block.signature.rest_positional {
+        let rest_span = rest.first().map(|v| v.span()).unwrap_or(call_head);
+        let var_id = expect_positional_var_id(rest_arg, rest_span)?;
+        callee_stack.add_var(var_id, Value::list(rest, rest_span));
+    }
+
+    // Check for arguments that haven't yet been set and set them to their defaults
+    for (positional_arg, _) in positional_iter {
+        let var_id = expect_positional_var_id(positional_arg, call_head)?;
+        callee_stack.add_var(
+            var_id,
+            positional_arg
+                .default_value
+                .clone()
+                .unwrap_or(Value::nothing(call_head)),
+        );
+    }
+
+    for named_arg in &block.signature.named {
+        if let Some(var_id) = named_arg.var_id {
+            // For named arguments, we do this check by looking to see if the variable was set yet on
+            // the stack. This assumes that the stack's variables was previously empty, but that's a
+            // fair assumption for a brand new callee stack.
+            if !callee_stack.vars.iter().any(|(id, _)| *id == var_id) {
+                let val = if named_arg.arg.is_none() {
+                    Value::bool(false, call_head)
+                } else if let Some(value) = &named_arg.default_value {
+                    value.clone()
+                } else {
+                    Value::nothing(call_head)
+                };
+                callee_stack.add_var(var_id, val);
+            }
+        }
+    }
+
+    Ok(())
+}
+
+/// Type check helper. Produces `CantConvert` error if `val` is not compatible with `ty`.
+fn check_type(val: &Value, ty: &Type) -> Result<(), ShellError> {
+    if match val {
+        // An empty list is compatible with any list or table type
+        Value::List { vals, .. } if vals.is_empty() => {
+            matches!(ty, Type::Any | Type::List(_) | Type::Table(_))
+        }
+        // FIXME: the allocation that might be required here is not great, it would be nice to be
+        // able to just directly check whether a value is compatible with a type
+        _ => val.get_type().is_subtype(ty),
+    } {
+        Ok(())
+    } else {
+        Err(ShellError::CantConvert {
+            to_type: ty.to_string(),
+            from_type: val.get_type().to_string(),
+            span: val.span(),
+            help: None,
+        })
+    }
+}
+
+/// Get variable from [`Stack`] or [`EngineState`]
+fn get_var(ctx: &EvalContext<'_>, var_id: VarId, span: Span) -> Result<Value, ShellError> {
+    match var_id {
+        // $env
+        ENV_VARIABLE_ID => {
+            let env_vars = ctx.stack.get_env_vars(ctx.engine_state);
+            let env_columns = env_vars.keys();
+            let env_values = env_vars.values();
+
+            let mut pairs = env_columns
+                .map(|x| x.to_string())
+                .zip(env_values.cloned())
+                .collect::<Vec<(String, Value)>>();
+
+            pairs.sort_by(|a, b| a.0.cmp(&b.0));
+
+            Ok(Value::record(pairs.into_iter().collect(), span))
+        }
+        _ => ctx.stack.get_var(var_id, span).or_else(|err| {
+            // $nu is handled by getting constant
+            if let Some(const_val) = ctx.engine_state.get_constant(var_id).cloned() {
+                Ok(const_val.with_span(span))
+            } else {
+                Err(err)
+            }
+        }),
+    }
+}
+
+/// Get an environment variable, case-insensitively
+fn get_env_var_case_insensitive<'a>(ctx: &'a mut EvalContext<'_>, key: &str) -> Option<&'a Value> {
+    // Read scopes in order
+    ctx.stack
+        .env_vars
+        .iter()
+        .rev()
+        .chain(std::iter::once(ctx.engine_state.env_vars.as_ref()))
+        .flat_map(|overlays| {
+            // Read overlays in order
+            ctx.stack
+                .active_overlays
+                .iter()
+                .rev()
+                .filter_map(|name| overlays.get(name))
+        })
+        .find_map(|map| {
+            // Use the hashmap first to try to be faster?
+            map.get(key).or_else(|| {
+                // Check to see if it exists at all in the map
+                map.iter()
+                    .find_map(|(k, v)| k.eq_ignore_case(key).then_some(v))
+            })
+        })
+}
+
+/// Get the existing name of an environment variable, case-insensitively. This is used to implement
+/// case preservation of environment variables, so that changing an environment variable that
+/// already exists always uses the same case.
+fn get_env_var_name_case_insensitive<'a>(ctx: &mut EvalContext<'_>, key: &'a str) -> Cow<'a, str> {
+    // Read scopes in order
+    ctx.stack
+        .env_vars
+        .iter()
+        .rev()
+        .chain(std::iter::once(ctx.engine_state.env_vars.as_ref()))
+        .flat_map(|overlays| {
+            // Read overlays in order
+            ctx.stack
+                .active_overlays
+                .iter()
+                .rev()
+                .filter_map(|name| overlays.get(name))
+        })
+        .find_map(|map| {
+            // Use the hashmap first to try to be faster?
+            if map.contains_key(key) {
+                Some(Cow::Borrowed(key))
+            } else {
+                map.keys().find(|k| k.eq_ignore_case(key)).map(|k| {
+                    // it exists, but with a different case
+                    Cow::Owned(k.to_owned())
+                })
+            }
+        })
+        // didn't exist.
+        .unwrap_or(Cow::Borrowed(key))
+}
+
+/// Helper to collect values into [`PipelineData`], preserving original span and metadata
+fn collect(data: PipelineData, fallback_span: Span) -> Result<PipelineData, ShellError> {
+    let span = data.span().unwrap_or(fallback_span);
+    let metadata = data.metadata();
+    let value = data.into_value(span)?;
+    Ok(PipelineData::Value(value, metadata))
+}
+
+/// Helper for drain behavior. Returns `Ok(ExitCode)` on failed external.
+fn drain(ctx: &mut EvalContext<'_>, data: PipelineData) -> Result<InstructionResult, ShellError> {
+    use self::InstructionResult::*;
+    let span = data.span().unwrap_or(Span::unknown());
+    if let Some(exit_status) = data.drain()? {
+        ctx.stack.add_env_var(
+            "LAST_EXIT_CODE".into(),
+            Value::int(exit_status.code() as i64, span),
+        );
+        if exit_status.code() == 0 {
+            Ok(Continue)
+        } else {
+            Ok(ExitCode(exit_status.code()))
+        }
+    } else {
+        Ok(Continue)
+    }
+}
+
+enum RedirectionStream {
+    Out,
+    Err,
+}
+
+/// Open a file for redirection
+fn open_file(ctx: &EvalContext<'_>, path: &Value, append: bool) -> Result<Arc<File>, ShellError> {
+    let path_expanded =
+        expand_path_with(path.as_str()?, ctx.engine_state.cwd(Some(ctx.stack))?, true);
+    let mut options = File::options();
+    if append {
+        options.append(true);
+    } else {
+        options.write(true).truncate(true);
+    }
+    let file = options
+        .create(true)
+        .open(path_expanded)
+        .err_span(path.span())?;
+    Ok(Arc::new(file))
+}
+
+/// Set up a [`Redirection`] from a [`RedirectMode`]
+fn eval_redirection(
+    ctx: &mut EvalContext<'_>,
+    mode: &RedirectMode,
+    span: Span,
+    which: RedirectionStream,
+) -> Result<Option<Redirection>, ShellError> {
+    match mode {
+        RedirectMode::Pipe => Ok(Some(Redirection::Pipe(OutDest::Pipe))),
+        RedirectMode::Capture => Ok(Some(Redirection::Pipe(OutDest::Capture))),
+        RedirectMode::Null => Ok(Some(Redirection::Pipe(OutDest::Null))),
+        RedirectMode::Inherit => Ok(Some(Redirection::Pipe(OutDest::Inherit))),
+        RedirectMode::File { file_num } => {
+            let file = ctx
+                .files
+                .get(*file_num as usize)
+                .cloned()
+                .flatten()
+                .ok_or_else(|| ShellError::IrEvalError {
+                    msg: format!("Tried to redirect to file #{file_num}, but it is not open"),
+                    span: Some(span),
+                })?;
+            Ok(Some(Redirection::File(file)))
+        }
+        RedirectMode::Caller => Ok(match which {
+            RedirectionStream::Out => ctx.stack.pipe_stdout().cloned().map(Redirection::Pipe),
+            RedirectionStream::Err => ctx.stack.pipe_stderr().cloned().map(Redirection::Pipe),
+        }),
+    }
+}
+
+/// Do an `iterate` instruction. This can be called repeatedly to get more values from an iterable
+fn eval_iterate(
+    ctx: &mut EvalContext<'_>,
+    dst: RegId,
+    stream: RegId,
+    end_index: usize,
+) -> Result<InstructionResult, ShellError> {
+    let mut data = ctx.take_reg(stream);
+    if let PipelineData::ListStream(list_stream, _) = &mut data {
+        // Modify the stream, taking one value off, and branching if it's empty
+        if let Some(val) = list_stream.next_value() {
+            ctx.put_reg(dst, val.into_pipeline_data());
+            ctx.put_reg(stream, data); // put the stream back so it can be iterated on again
+            Ok(InstructionResult::Continue)
+        } else {
+            ctx.put_reg(dst, PipelineData::Empty);
+            Ok(InstructionResult::Branch(end_index))
+        }
+    } else {
+        // Convert the PipelineData to an iterator, and wrap it in a ListStream so it can be
+        // iterated on
+        let metadata = data.metadata();
+        let span = data.span().unwrap_or(Span::unknown());
+        ctx.put_reg(
+            stream,
+            PipelineData::ListStream(
+                ListStream::new(data.into_iter(), span, Signals::EMPTY),
+                metadata,
+            ),
+        );
+        eval_iterate(ctx, dst, stream, end_index)
+    }
+}
+
+/// Redirect environment from the callee stack to the caller stack
+fn redirect_env(engine_state: &EngineState, caller_stack: &mut Stack, callee_stack: &Stack) {
+    // TODO: make this more efficient
+    // Grab all environment variables from the callee
+    let caller_env_vars = caller_stack.get_env_var_names(engine_state);
+
+    // remove env vars that are present in the caller but not in the callee
+    // (the callee hid them)
+    for var in caller_env_vars.iter() {
+        if !callee_stack.has_env_var(engine_state, var) {
+            caller_stack.remove_env_var(engine_state, var);
+        }
+    }
+
+    // add new env vars from callee to caller
+    for (var, value) in callee_stack.get_stack_env_vars() {
+        caller_stack.add_env_var(var, value);
+    }
+}
diff --git a/crates/nu-engine/src/lib.rs b/crates/nu-engine/src/lib.rs
index e3c8f8eede..7ed246e975 100644
--- a/crates/nu-engine/src/lib.rs
+++ b/crates/nu-engine/src/lib.rs
@@ -2,16 +2,19 @@ mod call_ext;
 mod closure_eval;
 pub mod column;
 pub mod command_prelude;
+mod compile;
 pub mod documentation;
 pub mod env;
 mod eval;
 mod eval_helpers;
+mod eval_ir;
 mod glob_from;
 pub mod scope;
 
 pub use call_ext::CallExt;
 pub use closure_eval::*;
 pub use column::get_columns;
+pub use compile::compile;
 pub use documentation::get_full_help;
 pub use env::*;
 pub use eval::{
@@ -19,4 +22,5 @@ pub use eval::{
     eval_expression_with_input, eval_subexpression, eval_variable, redirect_env,
 };
 pub use eval_helpers::*;
+pub use eval_ir::eval_ir_block;
 pub use glob_from::glob_from;
diff --git a/crates/nu-parser/src/known_external.rs b/crates/nu-parser/src/known_external.rs
index 453112aa32..a41cf3a4e8 100644
--- a/crates/nu-parser/src/known_external.rs
+++ b/crates/nu-parser/src/known_external.rs
@@ -1,7 +1,8 @@
 use nu_engine::command_prelude::*;
 use nu_protocol::{
-    ast::{Argument, Expr, Expression},
-    engine::{CommandType, UNKNOWN_SPAN_ID},
+    ast::{self, Expr, Expression},
+    engine::{self, CallImpl, CommandType, UNKNOWN_SPAN_ID},
+    ir::{self, DataSlice},
 };
 
 #[derive(Clone)]
@@ -43,8 +44,6 @@ impl Command for KnownExternal {
 
         let command = engine_state.get_decl(decl_id);
 
-        let mut extern_call = Call::new(head_span);
-
         let extern_name = if let Some(name_bytes) = engine_state.find_decl_name(call.decl_id, &[]) {
             String::from_utf8_lossy(name_bytes)
         } else {
@@ -56,59 +55,166 @@ impl Command for KnownExternal {
         };
 
         let extern_name: Vec<_> = extern_name.split(' ').collect();
-        let call_head_id = engine_state
-            .find_span_id(call.head)
-            .unwrap_or(UNKNOWN_SPAN_ID);
 
-        let arg_extern_name = Expression::new_existing(
-            Expr::String(extern_name[0].to_string()),
+        match &call.inner {
+            CallImpl::AstRef(call) => {
+                let extern_call = ast_call_to_extern_call(engine_state, call, &extern_name)?;
+                command.run(engine_state, stack, &(&extern_call).into(), input)
+            }
+            CallImpl::AstBox(call) => {
+                let extern_call = ast_call_to_extern_call(engine_state, call, &extern_name)?;
+                command.run(engine_state, stack, &(&extern_call).into(), input)
+            }
+            CallImpl::IrRef(call) => {
+                let extern_call = ir_call_to_extern_call(stack, call, &extern_name)?;
+                command.run(engine_state, stack, &(&extern_call).into(), input)
+            }
+            CallImpl::IrBox(call) => {
+                let extern_call = ir_call_to_extern_call(stack, call, &extern_name)?;
+                command.run(engine_state, stack, &(&extern_call).into(), input)
+            }
+        }
+    }
+}
+
+/// Transform the args from an `ast::Call` onto a `run-external` call
+fn ast_call_to_extern_call(
+    engine_state: &EngineState,
+    call: &ast::Call,
+    extern_name: &[&str],
+) -> Result<ast::Call, ShellError> {
+    let head_span = call.head;
+
+    let mut extern_call = ast::Call::new(head_span);
+
+    let call_head_id = engine_state
+        .find_span_id(call.head)
+        .unwrap_or(UNKNOWN_SPAN_ID);
+
+    let arg_extern_name = Expression::new_existing(
+        Expr::String(extern_name[0].to_string()),
+        call.head,
+        call_head_id,
+        Type::String,
+    );
+
+    extern_call.add_positional(arg_extern_name);
+
+    for subcommand in extern_name.iter().skip(1) {
+        extern_call.add_positional(Expression::new_existing(
+            Expr::String(subcommand.to_string()),
             call.head,
             call_head_id,
             Type::String,
-        );
+        ));
+    }
 
-        extern_call.add_positional(arg_extern_name);
-
-        for subcommand in extern_name.into_iter().skip(1) {
-            extern_call.add_positional(Expression::new_existing(
-                Expr::String(subcommand.to_string()),
-                call.head,
-                call_head_id,
-                Type::String,
-            ));
-        }
-
-        for arg in &call.arguments {
-            match arg {
-                Argument::Positional(positional) => extern_call.add_positional(positional.clone()),
-                Argument::Named(named) => {
-                    let named_span_id = engine_state
-                        .find_span_id(named.0.span)
-                        .unwrap_or(UNKNOWN_SPAN_ID);
-                    if let Some(short) = &named.1 {
-                        extern_call.add_positional(Expression::new_existing(
-                            Expr::String(format!("-{}", short.item)),
-                            named.0.span,
-                            named_span_id,
-                            Type::String,
-                        ));
-                    } else {
-                        extern_call.add_positional(Expression::new_existing(
-                            Expr::String(format!("--{}", named.0.item)),
-                            named.0.span,
-                            named_span_id,
-                            Type::String,
-                        ));
-                    }
-                    if let Some(arg) = &named.2 {
-                        extern_call.add_positional(arg.clone());
-                    }
+    for arg in &call.arguments {
+        match arg {
+            ast::Argument::Positional(positional) => extern_call.add_positional(positional.clone()),
+            ast::Argument::Named(named) => {
+                let named_span_id = engine_state
+                    .find_span_id(named.0.span)
+                    .unwrap_or(UNKNOWN_SPAN_ID);
+                if let Some(short) = &named.1 {
+                    extern_call.add_positional(Expression::new_existing(
+                        Expr::String(format!("-{}", short.item)),
+                        named.0.span,
+                        named_span_id,
+                        Type::String,
+                    ));
+                } else {
+                    extern_call.add_positional(Expression::new_existing(
+                        Expr::String(format!("--{}", named.0.item)),
+                        named.0.span,
+                        named_span_id,
+                        Type::String,
+                    ));
                 }
-                Argument::Unknown(unknown) => extern_call.add_unknown(unknown.clone()),
-                Argument::Spread(args) => extern_call.add_spread(args.clone()),
+                if let Some(arg) = &named.2 {
+                    extern_call.add_positional(arg.clone());
+                }
+            }
+            ast::Argument::Unknown(unknown) => extern_call.add_unknown(unknown.clone()),
+            ast::Argument::Spread(args) => extern_call.add_spread(args.clone()),
+        }
+    }
+
+    Ok(extern_call)
+}
+
+/// Transform the args from an `ir::Call` onto a `run-external` call
+fn ir_call_to_extern_call(
+    stack: &mut Stack,
+    call: &ir::Call,
+    extern_name: &[&str],
+) -> Result<ir::Call, ShellError> {
+    let mut extern_call = ir::Call::build(call.decl_id, call.head);
+
+    // Add the command and subcommands
+    for name in extern_name {
+        extern_call.add_positional(stack, call.head, Value::string(*name, call.head));
+    }
+
+    // Add the arguments, reformatting named arguments into string positionals
+    for index in 0..call.args_len {
+        match &call.arguments(stack)[index] {
+            engine::Argument::Flag {
+                data,
+                name,
+                short,
+                span,
+            } => {
+                let name_arg = engine::Argument::Positional {
+                    span: *span,
+                    val: Value::string(known_external_option_name(data, *name, *short), *span),
+                    ast: None,
+                };
+                extern_call.add_argument(stack, name_arg);
+            }
+            engine::Argument::Named {
+                data,
+                name,
+                short,
+                span,
+                val,
+                ..
+            } => {
+                let name_arg = engine::Argument::Positional {
+                    span: *span,
+                    val: Value::string(known_external_option_name(data, *name, *short), *span),
+                    ast: None,
+                };
+                let val_arg = engine::Argument::Positional {
+                    span: *span,
+                    val: val.clone(),
+                    ast: None,
+                };
+                extern_call.add_argument(stack, name_arg);
+                extern_call.add_argument(stack, val_arg);
+            }
+            a @ (engine::Argument::Positional { .. }
+            | engine::Argument::Spread { .. }
+            | engine::Argument::ParserInfo { .. }) => {
+                let argument = a.clone();
+                extern_call.add_argument(stack, argument);
             }
         }
+    }
 
-        command.run(engine_state, stack, &extern_call, input)
+    Ok(extern_call.finish())
+}
+
+fn known_external_option_name(data: &[u8], name: DataSlice, short: DataSlice) -> String {
+    if !data[name].is_empty() {
+        format!(
+            "--{}",
+            std::str::from_utf8(&data[name]).expect("invalid utf-8 in flag name")
+        )
+    } else {
+        format!(
+            "-{}",
+            std::str::from_utf8(&data[short]).expect("invalid utf-8 in flag short name")
+        )
     }
 }
diff --git a/crates/nu-parser/src/parse_patterns.rs b/crates/nu-parser/src/parse_patterns.rs
index 73668b7d04..dc4a64ce37 100644
--- a/crates/nu-parser/src/parse_patterns.rs
+++ b/crates/nu-parser/src/parse_patterns.rs
@@ -39,7 +39,7 @@ pub fn parse_pattern(working_set: &mut StateWorkingSet, span: Span) -> MatchPatt
         let value = parse_value(working_set, span, &SyntaxShape::Any);
 
         MatchPattern {
-            pattern: Pattern::Value(value),
+            pattern: Pattern::Value(Box::new(value)),
             guard: None,
             span,
         }
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 51935214f5..fc2131aad7 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -3302,6 +3302,8 @@ pub fn parse_row_condition(working_set: &mut StateWorkingSet, spans: &[Span]) ->
                 default_value: None,
             });
 
+            compile_block(working_set, &mut block);
+
             working_set.add_block(Arc::new(block))
         }
     };
@@ -4445,7 +4447,7 @@ pub fn parse_match_block_expression(working_set: &mut StateWorkingSet, span: Spa
                 &SyntaxShape::MathExpression,
             );
 
-            pattern.guard = Some(guard);
+            pattern.guard = Some(Box::new(guard));
             position += if found { start + 1 } else { start };
             connector = working_set.get_span_contents(output[position].span);
         }
@@ -5298,6 +5300,8 @@ pub fn parse_expression(working_set: &mut StateWorkingSet, spans: &[Span]) -> Ex
             let ty = output.ty.clone();
             block.pipelines = vec![Pipeline::from_vec(vec![output])];
 
+            compile_block(working_set, &mut block);
+
             let block_id = working_set.add_block(Arc::new(block));
 
             let mut env_vars = vec![];
@@ -5853,9 +5857,25 @@ pub fn parse_block(
         working_set.parse_errors.extend_from_slice(&errors);
     }
 
+    // Do not try to compile blocks that are subexpressions, or when we've already had a parse
+    // failure as that definitely will fail to compile
+    if !is_subexpression && working_set.parse_errors.is_empty() {
+        compile_block(working_set, &mut block);
+    }
+
     block
 }
 
+/// Compile an IR block for the `Block`, adding a compile error on failure
+fn compile_block(working_set: &mut StateWorkingSet<'_>, block: &mut Block) {
+    match nu_engine::compile(working_set, block) {
+        Ok(ir_block) => {
+            block.ir_block = Some(ir_block);
+        }
+        Err(err) => working_set.compile_errors.push(err),
+    }
+}
+
 pub fn discover_captures_in_closure(
     working_set: &StateWorkingSet,
     block: &Block,
@@ -6298,12 +6318,14 @@ fn wrap_expr_with_collect(working_set: &mut StateWorkingSet, expr: &Expression)
             default_value: None,
         });
 
-        let block = Block {
+        let mut block = Block {
             pipelines: vec![Pipeline::from_vec(vec![expr.clone()])],
             signature: Box::new(signature),
             ..Default::default()
         };
 
+        compile_block(working_set, &mut block);
+
         let block_id = working_set.add_block(Arc::new(block));
 
         output.push(Argument::Positional(Expression::new(
diff --git a/crates/nu-parser/tests/test_parser.rs b/crates/nu-parser/tests/test_parser.rs
index 0784fe69d4..7762863ba1 100644
--- a/crates/nu-parser/tests/test_parser.rs
+++ b/crates/nu-parser/tests/test_parser.rs
@@ -1,7 +1,7 @@
 use nu_parser::*;
 use nu_protocol::{
-    ast::{Argument, Call, Expr, Expression, ExternalArgument, PathMember, Range},
-    engine::{Command, EngineState, Stack, StateWorkingSet},
+    ast::{Argument, Expr, Expression, ExternalArgument, PathMember, Range},
+    engine::{Call, Command, EngineState, Stack, StateWorkingSet},
     ParseError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
 };
 use rstest::rstest;
@@ -1759,10 +1759,7 @@ mod range {
 #[cfg(test)]
 mod input_types {
     use super::*;
-    use nu_protocol::{
-        ast::{Argument, Call},
-        Category, PipelineData, ShellError, Type,
-    };
+    use nu_protocol::{ast::Argument, engine::Call, Category, PipelineData, ShellError, Type};
 
     #[derive(Clone)]
     pub struct LsTest;
diff --git a/crates/nu-plugin-engine/src/context.rs b/crates/nu-plugin-engine/src/context.rs
index b026d21b23..0df533a11e 100644
--- a/crates/nu-plugin-engine/src/context.rs
+++ b/crates/nu-plugin-engine/src/context.rs
@@ -1,8 +1,7 @@
 use crate::util::MutableCow;
 use nu_engine::{get_eval_block_with_early_return, get_full_help, ClosureEvalOnce};
 use nu_protocol::{
-    ast::Call,
-    engine::{Closure, EngineState, Redirection, Stack},
+    engine::{Call, Closure, EngineState, Redirection, Stack},
     Config, IntoSpanned, OutDest, PipelineData, PluginIdentity, ShellError, Signals, Span, Spanned,
     Value,
 };
@@ -54,7 +53,7 @@ pub struct PluginExecutionCommandContext<'a> {
     identity: Arc<PluginIdentity>,
     engine_state: Cow<'a, EngineState>,
     stack: MutableCow<'a, Stack>,
-    call: Cow<'a, Call>,
+    call: Call<'a>,
 }
 
 impl<'a> PluginExecutionCommandContext<'a> {
@@ -62,13 +61,13 @@ impl<'a> PluginExecutionCommandContext<'a> {
         identity: Arc<PluginIdentity>,
         engine_state: &'a EngineState,
         stack: &'a mut Stack,
-        call: &'a Call,
+        call: &'a Call<'a>,
     ) -> PluginExecutionCommandContext<'a> {
         PluginExecutionCommandContext {
             identity,
             engine_state: Cow::Borrowed(engine_state),
             stack: MutableCow::Borrowed(stack),
-            call: Cow::Borrowed(call),
+            call: call.clone(),
         }
     }
 }
@@ -217,7 +216,7 @@ impl<'a> PluginExecutionContext for PluginExecutionCommandContext<'a> {
             identity: self.identity.clone(),
             engine_state: Cow::Owned(self.engine_state.clone().into_owned()),
             stack: self.stack.owned(),
-            call: Cow::Owned(self.call.clone().into_owned()),
+            call: self.call.to_owned(),
         })
     }
 }
diff --git a/crates/nu-plugin-protocol/src/evaluated_call.rs b/crates/nu-plugin-protocol/src/evaluated_call.rs
index 19f9049340..58f8987865 100644
--- a/crates/nu-plugin-protocol/src/evaluated_call.rs
+++ b/crates/nu-plugin-protocol/src/evaluated_call.rs
@@ -1,7 +1,7 @@
 use nu_protocol::{
-    ast::{Call, Expression},
-    engine::{EngineState, Stack},
-    FromValue, ShellError, Span, Spanned, Value,
+    ast::{self, Expression},
+    engine::{Call, CallImpl, EngineState, Stack},
+    ir, FromValue, ShellError, Span, Spanned, Value,
 };
 use serde::{Deserialize, Serialize};
 
@@ -33,6 +33,24 @@ impl EvaluatedCall {
         engine_state: &EngineState,
         stack: &mut Stack,
         eval_expression_fn: fn(&EngineState, &mut Stack, &Expression) -> Result<Value, ShellError>,
+    ) -> Result<Self, ShellError> {
+        match &call.inner {
+            CallImpl::AstRef(call) => {
+                Self::try_from_ast_call(call, engine_state, stack, eval_expression_fn)
+            }
+            CallImpl::AstBox(call) => {
+                Self::try_from_ast_call(call, engine_state, stack, eval_expression_fn)
+            }
+            CallImpl::IrRef(call) => Self::try_from_ir_call(call, stack),
+            CallImpl::IrBox(call) => Self::try_from_ir_call(call, stack),
+        }
+    }
+
+    fn try_from_ast_call(
+        call: &ast::Call,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        eval_expression_fn: fn(&EngineState, &mut Stack, &Expression) -> Result<Value, ShellError>,
     ) -> Result<Self, ShellError> {
         let positional =
             call.rest_iter_flattened(0, |expr| eval_expression_fn(engine_state, stack, expr))?;
@@ -54,6 +72,22 @@ impl EvaluatedCall {
         })
     }
 
+    fn try_from_ir_call(call: &ir::Call, stack: &Stack) -> Result<Self, ShellError> {
+        let positional = call.rest_iter_flattened(stack, 0)?;
+
+        let mut named = Vec::with_capacity(call.named_len(stack));
+        named.extend(
+            call.named_iter(stack)
+                .map(|(name, value)| (name.map(|s| s.to_owned()), value.cloned())),
+        );
+
+        Ok(Self {
+            head: call.head,
+            positional,
+            named,
+        })
+    }
+
     /// Check if a flag (named parameter that does not take a value) is set
     /// Returns Ok(true) if flag is set or passed true value
     /// Returns Ok(false) if flag is not set or passed false value
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index ee0f5a8221..eaa861a073 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -33,6 +33,7 @@ serde = { workspace = true, default-features = false }
 thiserror = "1.0"
 typetag = "0.2"
 os_pipe = { workspace = true, features = ["io_safety"] }
+log = { workspace = true }
 
 [target.'cfg(unix)'.dependencies]
 nix = { workspace = true, default-features = false, features = ["signal"] }
@@ -54,4 +55,4 @@ tempfile = { workspace = true }
 os_pipe = { workspace = true }
 
 [package.metadata.docs.rs]
-all-features = true
\ No newline at end of file
+all-features = true
diff --git a/crates/nu-protocol/src/alias.rs b/crates/nu-protocol/src/alias.rs
index 24448225d4..8f5ea43934 100644
--- a/crates/nu-protocol/src/alias.rs
+++ b/crates/nu-protocol/src/alias.rs
@@ -1,6 +1,6 @@
 use crate::{
-    ast::{Call, Expression},
-    engine::{Command, CommandType, EngineState, Stack},
+    ast::Expression,
+    engine::{Call, Command, CommandType, EngineState, Stack},
     PipelineData, ShellError, Signature,
 };
 
diff --git a/crates/nu-protocol/src/ast/block.rs b/crates/nu-protocol/src/ast/block.rs
index 6e3449af26..8f62ff99ba 100644
--- a/crates/nu-protocol/src/ast/block.rs
+++ b/crates/nu-protocol/src/ast/block.rs
@@ -1,5 +1,5 @@
 use super::Pipeline;
-use crate::{engine::EngineState, OutDest, Signature, Span, Type, VarId};
+use crate::{engine::StateWorkingSet, ir::IrBlock, OutDest, Signature, Span, Type, VarId};
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -8,6 +8,8 @@ pub struct Block {
     pub pipelines: Vec<Pipeline>,
     pub captures: Vec<VarId>,
     pub redirect_env: bool,
+    /// The block compiled to IR instructions. Not available for subexpressions.
+    pub ir_block: Option<IrBlock>,
     pub span: Option<Span>, // None option encodes no span to avoid using test_span()
 }
 
@@ -22,10 +24,10 @@ impl Block {
 
     pub fn pipe_redirection(
         &self,
-        engine_state: &EngineState,
+        working_set: &StateWorkingSet,
     ) -> (Option<OutDest>, Option<OutDest>) {
         if let Some(first) = self.pipelines.first() {
-            first.pipe_redirection(engine_state)
+            first.pipe_redirection(working_set)
         } else {
             (None, None)
         }
@@ -45,6 +47,7 @@ impl Block {
             pipelines: vec![],
             captures: vec![],
             redirect_env: false,
+            ir_block: None,
             span: None,
         }
     }
@@ -55,6 +58,7 @@ impl Block {
             pipelines: Vec::with_capacity(capacity),
             captures: vec![],
             redirect_env: false,
+            ir_block: None,
             span: None,
         }
     }
@@ -86,6 +90,7 @@ where
             pipelines: pipelines.collect(),
             captures: vec![],
             redirect_env: false,
+            ir_block: None,
             span: None,
         }
     }
diff --git a/crates/nu-protocol/src/ast/expr.rs b/crates/nu-protocol/src/ast/expr.rs
index 0e561e5c8f..43548d39e4 100644
--- a/crates/nu-protocol/src/ast/expr.rs
+++ b/crates/nu-protocol/src/ast/expr.rs
@@ -5,7 +5,9 @@ use super::{
     Call, CellPath, Expression, ExternalArgument, FullCellPath, Keyword, MatchPattern, Operator,
     Range, Table, ValueWithUnit,
 };
-use crate::{ast::ImportPattern, engine::EngineState, BlockId, OutDest, Signature, Span, VarId};
+use crate::{
+    ast::ImportPattern, engine::StateWorkingSet, BlockId, OutDest, Signature, Span, VarId,
+};
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub enum Expr {
@@ -60,17 +62,17 @@ const _: () = assert!(std::mem::size_of::<Expr>() <= 40);
 impl Expr {
     pub fn pipe_redirection(
         &self,
-        engine_state: &EngineState,
+        working_set: &StateWorkingSet,
     ) -> (Option<OutDest>, Option<OutDest>) {
         // Usages of `$in` will be wrapped by a `collect` call by the parser,
         // so we do not have to worry about that when considering
         // which of the expressions below may consume pipeline output.
         match self {
-            Expr::Call(call) => engine_state.get_decl(call.decl_id).pipe_redirection(),
-            Expr::Subexpression(block_id) | Expr::Block(block_id) => engine_state
+            Expr::Call(call) => working_set.get_decl(call.decl_id).pipe_redirection(),
+            Expr::Subexpression(block_id) | Expr::Block(block_id) => working_set
                 .get_block(*block_id)
-                .pipe_redirection(engine_state),
-            Expr::FullCellPath(cell_path) => cell_path.head.expr.pipe_redirection(engine_state),
+                .pipe_redirection(working_set),
+            Expr::FullCellPath(cell_path) => cell_path.head.expr.pipe_redirection(working_set),
             Expr::Bool(_)
             | Expr::Int(_)
             | Expr::Float(_)
diff --git a/crates/nu-protocol/src/ast/match_pattern.rs b/crates/nu-protocol/src/ast/match_pattern.rs
index b8f87c3f63..1aafe84701 100644
--- a/crates/nu-protocol/src/ast/match_pattern.rs
+++ b/crates/nu-protocol/src/ast/match_pattern.rs
@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct MatchPattern {
     pub pattern: Pattern,
-    pub guard: Option<Expression>,
+    pub guard: Option<Box<Expression>>,
     pub span: Span,
 }
 
@@ -19,7 +19,9 @@ impl MatchPattern {
 pub enum Pattern {
     Record(Vec<(String, MatchPattern)>),
     List(Vec<MatchPattern>),
-    Value(Expression),
+    // TODO: it would be nice if this didn't depend on AST
+    // maybe const evaluation can get us to a Value instead?
+    Value(Box<Expression>),
     Variable(VarId),
     Or(Vec<MatchPattern>),
     Rest(VarId), // the ..$foo pattern
diff --git a/crates/nu-protocol/src/ast/pipeline.rs b/crates/nu-protocol/src/ast/pipeline.rs
index f03c016daf..3f2a216485 100644
--- a/crates/nu-protocol/src/ast/pipeline.rs
+++ b/crates/nu-protocol/src/ast/pipeline.rs
@@ -1,8 +1,4 @@
-use crate::{
-    ast::Expression,
-    engine::{EngineState, StateWorkingSet},
-    OutDest, Span,
-};
+use crate::{ast::Expression, engine::StateWorkingSet, OutDest, Span};
 use serde::{Deserialize, Serialize};
 use std::fmt::Display;
 
@@ -120,9 +116,9 @@ impl PipelineElement {
 
     pub fn pipe_redirection(
         &self,
-        engine_state: &EngineState,
+        working_set: &StateWorkingSet,
     ) -> (Option<OutDest>, Option<OutDest>) {
-        self.expr.expr.pipe_redirection(engine_state)
+        self.expr.expr.pipe_redirection(working_set)
     }
 }
 
@@ -166,10 +162,10 @@ impl Pipeline {
 
     pub fn pipe_redirection(
         &self,
-        engine_state: &EngineState,
+        working_set: &StateWorkingSet,
     ) -> (Option<OutDest>, Option<OutDest>) {
         if let Some(first) = self.elements.first() {
-            first.pipe_redirection(engine_state)
+            first.pipe_redirection(working_set)
         } else {
             (None, None)
         }
diff --git a/crates/nu-protocol/src/engine/argument.rs b/crates/nu-protocol/src/engine/argument.rs
new file mode 100644
index 0000000000..043654b761
--- /dev/null
+++ b/crates/nu-protocol/src/engine/argument.rs
@@ -0,0 +1,124 @@
+use std::sync::Arc;
+
+use crate::{ast::Expression, ir::DataSlice, Span, Value};
+
+/// Represents a fully evaluated argument to a call.
+#[derive(Debug, Clone)]
+pub enum Argument {
+    /// A positional argument
+    Positional {
+        span: Span,
+        val: Value,
+        ast: Option<Arc<Expression>>,
+    },
+    /// A spread argument, e.g. `...$args`
+    Spread {
+        span: Span,
+        vals: Value,
+        ast: Option<Arc<Expression>>,
+    },
+    /// A named argument with no value, e.g. `--flag`
+    Flag {
+        data: Arc<[u8]>,
+        name: DataSlice,
+        short: DataSlice,
+        span: Span,
+    },
+    /// A named argument with a value, e.g. `--flag value` or `--flag=`
+    Named {
+        data: Arc<[u8]>,
+        name: DataSlice,
+        short: DataSlice,
+        span: Span,
+        val: Value,
+        ast: Option<Arc<Expression>>,
+    },
+    /// Information generated by the parser for use by certain keyword commands
+    ParserInfo {
+        data: Arc<[u8]>,
+        name: DataSlice,
+        // TODO: rather than `Expression`, this would probably be best served by a specific enum
+        // type for this purpose.
+        info: Box<Expression>,
+    },
+}
+
+impl Argument {
+    /// The span encompassing the argument's usage within the call, distinct from the span of the
+    /// actual value of the argument.
+    pub fn span(&self) -> Option<Span> {
+        match self {
+            Argument::Positional { span, .. } => Some(*span),
+            Argument::Spread { span, .. } => Some(*span),
+            Argument::Flag { span, .. } => Some(*span),
+            Argument::Named { span, .. } => Some(*span),
+            // Because `ParserInfo` is generated, its span shouldn't be used
+            Argument::ParserInfo { .. } => None,
+        }
+    }
+
+    /// The original AST [`Expression`] for the argument's value. This is not usually available;
+    /// declarations have to opt-in if they require this.
+    pub fn ast_expression(&self) -> Option<&Arc<Expression>> {
+        match self {
+            Argument::Positional { ast, .. } => ast.as_ref(),
+            Argument::Spread { ast, .. } => ast.as_ref(),
+            Argument::Flag { .. } => None,
+            Argument::Named { ast, .. } => ast.as_ref(),
+            Argument::ParserInfo { .. } => None,
+        }
+    }
+}
+
+/// Stores the argument context for calls in IR evaluation.
+#[derive(Debug, Clone)]
+pub struct ArgumentStack {
+    arguments: Vec<Argument>,
+}
+
+impl ArgumentStack {
+    /// Create a new, empty argument stack.
+    pub const fn new() -> Self {
+        ArgumentStack { arguments: vec![] }
+    }
+
+    /// Returns the index of the end of the argument stack. Call and save this before adding
+    /// arguments.
+    pub fn get_base(&self) -> usize {
+        self.arguments.len()
+    }
+
+    /// Calculates the number of arguments past the given [previously retrieved](.get_base) base
+    /// pointer.
+    pub fn get_len(&self, base: usize) -> usize {
+        self.arguments.len().checked_sub(base).unwrap_or_else(|| {
+            panic!(
+                "base ({}) is beyond the end of the arguments stack ({})",
+                base,
+                self.arguments.len()
+            );
+        })
+    }
+
+    /// Push an argument onto the end of the argument stack.
+    pub fn push(&mut self, argument: Argument) {
+        self.arguments.push(argument);
+    }
+
+    /// Clear all of the arguments after the given base index, to prepare for the next frame.
+    pub fn leave_frame(&mut self, base: usize) {
+        self.arguments.truncate(base);
+    }
+
+    /// Get arguments for the frame based on the given [`base`](`.get_base()`) and
+    /// [`len`](`.get_len()`) parameters.
+    pub fn get_args(&self, base: usize, len: usize) -> &[Argument] {
+        &self.arguments[base..(base + len)]
+    }
+
+    /// Move arguments for the frame based on the given [`base`](`.get_base()`) and
+    /// [`len`](`.get_len()`) parameters.
+    pub fn drain_args(&mut self, base: usize, len: usize) -> impl Iterator<Item = Argument> + '_ {
+        self.arguments.drain(base..(base + len))
+    }
+}
diff --git a/crates/nu-protocol/src/engine/call.rs b/crates/nu-protocol/src/engine/call.rs
new file mode 100644
index 0000000000..741e2bd87a
--- /dev/null
+++ b/crates/nu-protocol/src/engine/call.rs
@@ -0,0 +1,223 @@
+use crate::{
+    ast::{self, Expression},
+    ir, DeclId, FromValue, ShellError, Span, Value,
+};
+
+use super::{EngineState, Stack, StateWorkingSet};
+
+/// This is a HACK to help [`Command`](super::Command) support both the old AST evaluator and the
+/// new IR evaluator at the same time. It should be removed once we are satisfied with the new
+/// evaluator.
+#[derive(Debug, Clone)]
+pub struct Call<'a> {
+    pub head: Span,
+    pub decl_id: DeclId,
+    pub inner: CallImpl<'a>,
+}
+
+#[derive(Debug, Clone)]
+pub enum CallImpl<'a> {
+    AstRef(&'a ast::Call),
+    AstBox(Box<ast::Call>),
+    IrRef(&'a ir::Call),
+    IrBox(Box<ir::Call>),
+}
+
+impl Call<'_> {
+    /// Returns a new AST call with the given span. This is often used by commands that need an
+    /// empty call to pass to a command. It's not easily possible to add anything to this.
+    pub fn new(span: Span) -> Self {
+        // this is using the boxed variant, which isn't so efficient... but this is only temporary
+        // anyway.
+        Call {
+            head: span,
+            decl_id: 0,
+            inner: CallImpl::AstBox(Box::new(ast::Call::new(span))),
+        }
+    }
+
+    /// Convert the `Call` from any lifetime into `'static`, by cloning the data within onto the
+    /// heap.
+    pub fn to_owned(&self) -> Call<'static> {
+        Call {
+            head: self.head,
+            decl_id: self.decl_id,
+            inner: self.inner.to_owned(),
+        }
+    }
+
+    /// Assert that the call is `ast::Call`, and fail with an error if it isn't.
+    ///
+    /// Provided as a stop-gap for commands that can't work with `ir::Call`, or just haven't been
+    /// implemented yet. Eventually these issues should be resolved and then this can be removed.
+    pub fn assert_ast_call(&self) -> Result<&ast::Call, ShellError> {
+        match &self.inner {
+            CallImpl::AstRef(call) => Ok(call),
+            CallImpl::AstBox(call) => Ok(call),
+            _ => Err(ShellError::NushellFailedSpanned {
+                msg: "Can't be used in IR context".into(),
+                label: "this command is not yet supported by IR evaluation".into(),
+                span: self.head,
+            }),
+        }
+    }
+
+    /// FIXME: implementation asserts `ast::Call` and proxies to that
+    pub fn has_flag_const(
+        &self,
+        working_set: &StateWorkingSet,
+        flag_name: &str,
+    ) -> Result<bool, ShellError> {
+        self.assert_ast_call()?
+            .has_flag_const(working_set, flag_name)
+    }
+
+    /// FIXME: implementation asserts `ast::Call` and proxies to that
+    pub fn get_flag_const<T: FromValue>(
+        &self,
+        working_set: &StateWorkingSet,
+        name: &str,
+    ) -> Result<Option<T>, ShellError> {
+        self.assert_ast_call()?.get_flag_const(working_set, name)
+    }
+
+    /// FIXME: implementation asserts `ast::Call` and proxies to that
+    pub fn req_const<T: FromValue>(
+        &self,
+        working_set: &StateWorkingSet,
+        pos: usize,
+    ) -> Result<T, ShellError> {
+        self.assert_ast_call()?.req_const(working_set, pos)
+    }
+
+    /// FIXME: implementation asserts `ast::Call` and proxies to that
+    pub fn rest_const<T: FromValue>(
+        &self,
+        working_set: &StateWorkingSet,
+        starting_pos: usize,
+    ) -> Result<Vec<T>, ShellError> {
+        self.assert_ast_call()?
+            .rest_const(working_set, starting_pos)
+    }
+
+    /// Returns a span covering the call's arguments.
+    pub fn arguments_span(&self) -> Span {
+        match &self.inner {
+            CallImpl::AstRef(call) => call.arguments_span(),
+            CallImpl::AstBox(call) => call.arguments_span(),
+            CallImpl::IrRef(call) => call.arguments_span(),
+            CallImpl::IrBox(call) => call.arguments_span(),
+        }
+    }
+
+    /// Returns a span covering the whole call.
+    pub fn span(&self) -> Span {
+        match &self.inner {
+            CallImpl::AstRef(call) => call.span(),
+            CallImpl::AstBox(call) => call.span(),
+            CallImpl::IrRef(call) => call.span(),
+            CallImpl::IrBox(call) => call.span(),
+        }
+    }
+
+    /// Get a parser info argument by name.
+    pub fn get_parser_info<'a>(&'a self, stack: &'a Stack, name: &str) -> Option<&'a Expression> {
+        match &self.inner {
+            CallImpl::AstRef(call) => call.get_parser_info(name),
+            CallImpl::AstBox(call) => call.get_parser_info(name),
+            CallImpl::IrRef(call) => call.get_parser_info(stack, name),
+            CallImpl::IrBox(call) => call.get_parser_info(stack, name),
+        }
+    }
+
+    /// Evaluator-agnostic implementation of `rest_iter_flattened()`. Evaluates or gets all of the
+    /// positional and spread arguments, flattens spreads, and then returns one list of values.
+    pub fn rest_iter_flattened(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        eval_expression: fn(
+            &EngineState,
+            &mut Stack,
+            &ast::Expression,
+        ) -> Result<Value, ShellError>,
+        starting_pos: usize,
+    ) -> Result<Vec<Value>, ShellError> {
+        fn by_ast(
+            call: &ast::Call,
+            engine_state: &EngineState,
+            stack: &mut Stack,
+            eval_expression: fn(
+                &EngineState,
+                &mut Stack,
+                &ast::Expression,
+            ) -> Result<Value, ShellError>,
+            starting_pos: usize,
+        ) -> Result<Vec<Value>, ShellError> {
+            call.rest_iter_flattened(starting_pos, |expr| {
+                eval_expression(engine_state, stack, expr)
+            })
+        }
+
+        fn by_ir(
+            call: &ir::Call,
+            stack: &Stack,
+            starting_pos: usize,
+        ) -> Result<Vec<Value>, ShellError> {
+            call.rest_iter_flattened(stack, starting_pos)
+        }
+
+        match &self.inner {
+            CallImpl::AstRef(call) => {
+                by_ast(call, engine_state, stack, eval_expression, starting_pos)
+            }
+            CallImpl::AstBox(call) => {
+                by_ast(call, engine_state, stack, eval_expression, starting_pos)
+            }
+            CallImpl::IrRef(call) => by_ir(call, stack, starting_pos),
+            CallImpl::IrBox(call) => by_ir(call, stack, starting_pos),
+        }
+    }
+
+    /// Get the original AST expression for a positional argument. Does not usually work for IR
+    /// unless the decl specified `requires_ast_for_arguments()`
+    pub fn positional_nth<'a>(&'a self, stack: &'a Stack, index: usize) -> Option<&'a Expression> {
+        match &self.inner {
+            CallImpl::AstRef(call) => call.positional_nth(index),
+            CallImpl::AstBox(call) => call.positional_nth(index),
+            CallImpl::IrRef(call) => call.positional_ast(stack, index).map(|arc| arc.as_ref()),
+            CallImpl::IrBox(call) => call.positional_ast(stack, index).map(|arc| arc.as_ref()),
+        }
+    }
+}
+
+impl CallImpl<'_> {
+    pub fn to_owned(&self) -> CallImpl<'static> {
+        match self {
+            CallImpl::AstRef(call) => CallImpl::AstBox(Box::new((*call).clone())),
+            CallImpl::AstBox(call) => CallImpl::AstBox(call.clone()),
+            CallImpl::IrRef(call) => CallImpl::IrBox(Box::new((*call).clone())),
+            CallImpl::IrBox(call) => CallImpl::IrBox(call.clone()),
+        }
+    }
+}
+
+impl<'a> From<&'a ast::Call> for Call<'a> {
+    fn from(call: &'a ast::Call) -> Self {
+        Call {
+            head: call.head,
+            decl_id: call.decl_id,
+            inner: CallImpl::AstRef(call),
+        }
+    }
+}
+
+impl<'a> From<&'a ir::Call> for Call<'a> {
+    fn from(call: &'a ir::Call) -> Self {
+        Call {
+            head: call.head,
+            decl_id: call.decl_id,
+            inner: CallImpl::IrRef(call),
+        }
+    }
+}
diff --git a/crates/nu-protocol/src/engine/command.rs b/crates/nu-protocol/src/engine/command.rs
index 043d2a66c7..48cdc4440d 100644
--- a/crates/nu-protocol/src/engine/command.rs
+++ b/crates/nu-protocol/src/engine/command.rs
@@ -1,5 +1,5 @@
 use super::{EngineState, Stack, StateWorkingSet};
-use crate::{ast::Call, Alias, BlockId, Example, OutDest, PipelineData, ShellError, Signature};
+use crate::{engine::Call, Alias, BlockId, Example, OutDest, PipelineData, ShellError, Signature};
 use std::fmt::Display;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -124,6 +124,12 @@ pub trait Command: Send + Sync + CommandClone {
     fn pipe_redirection(&self) -> (Option<OutDest>, Option<OutDest>) {
         (None, None)
     }
+
+    /// Return true if the AST nodes for the arguments are required for IR evaluation. This is
+    /// currently inefficient so is not generally done.
+    fn requires_ast_for_arguments(&self) -> bool {
+        false
+    }
 }
 
 pub trait CommandClone {
diff --git a/crates/nu-protocol/src/engine/error_handler.rs b/crates/nu-protocol/src/engine/error_handler.rs
new file mode 100644
index 0000000000..076678be20
--- /dev/null
+++ b/crates/nu-protocol/src/engine/error_handler.rs
@@ -0,0 +1,55 @@
+use crate::RegId;
+
+/// Describes an error handler stored during IR evaluation.
+#[derive(Debug, Clone, Copy)]
+pub struct ErrorHandler {
+    /// Instruction index within the block that will handle the error
+    pub handler_index: usize,
+    /// Register to put the error information into, when an error occurs
+    pub error_register: Option<RegId>,
+}
+
+/// Keeps track of error handlers pushed during evaluation of an IR block.
+#[derive(Debug, Clone)]
+pub struct ErrorHandlerStack {
+    handlers: Vec<ErrorHandler>,
+}
+
+impl ErrorHandlerStack {
+    pub const fn new() -> ErrorHandlerStack {
+        ErrorHandlerStack { handlers: vec![] }
+    }
+
+    /// Get the current base of the stack, which establishes a frame.
+    pub fn get_base(&self) -> usize {
+        self.handlers.len()
+    }
+
+    /// Push a new error handler onto the stack.
+    pub fn push(&mut self, handler: ErrorHandler) {
+        self.handlers.push(handler);
+    }
+
+    /// Try to pop an error handler from the stack. Won't go below `base`, to avoid retrieving a
+    /// handler belonging to a parent frame.
+    pub fn pop(&mut self, base: usize) -> Option<ErrorHandler> {
+        if self.handlers.len() > base {
+            self.handlers.pop()
+        } else {
+            None
+        }
+    }
+
+    /// Reset the stack to the state it was in at the beginning of the frame, in preparation to
+    /// return control to the parent frame.
+    pub fn leave_frame(&mut self, base: usize) {
+        if self.handlers.len() >= base {
+            self.handlers.truncate(base);
+        } else {
+            panic!(
+                "ErrorHandlerStack bug: tried to leave frame at {base}, but current base is {}",
+                self.get_base()
+            )
+        }
+    }
+}
diff --git a/crates/nu-protocol/src/engine/mod.rs b/crates/nu-protocol/src/engine/mod.rs
index c6e71afb37..1b1762fe3c 100644
--- a/crates/nu-protocol/src/engine/mod.rs
+++ b/crates/nu-protocol/src/engine/mod.rs
@@ -1,8 +1,11 @@
+mod argument;
 mod cached_file;
+mod call;
 mod call_info;
 mod capture_block;
 mod command;
 mod engine_state;
+mod error_handler;
 mod overlay;
 mod pattern_match;
 mod stack;
@@ -14,10 +17,13 @@ mod variable;
 
 pub use cached_file::CachedFile;
 
+pub use argument::*;
+pub use call::*;
 pub use call_info::*;
 pub use capture_block::*;
 pub use command::*;
 pub use engine_state::*;
+pub use error_handler::*;
 pub use overlay::*;
 pub use pattern_match::*;
 pub use stack::*;
diff --git a/crates/nu-protocol/src/engine/stack.rs b/crates/nu-protocol/src/engine/stack.rs
index 19726db9c0..b289c1ae8b 100644
--- a/crates/nu-protocol/src/engine/stack.rs
+++ b/crates/nu-protocol/src/engine/stack.rs
@@ -1,7 +1,7 @@
 use crate::{
     engine::{
-        EngineState, Redirection, StackCallArgGuard, StackCaptureGuard, StackIoGuard, StackOutDest,
-        DEFAULT_OVERLAY_NAME,
+        ArgumentStack, EngineState, ErrorHandlerStack, Redirection, StackCallArgGuard,
+        StackCaptureGuard, StackIoGuard, StackOutDest, DEFAULT_OVERLAY_NAME,
     },
     OutDest, ShellError, Span, Value, VarId, ENV_VARIABLE_ID, NU_VARIABLE_ID,
 };
@@ -41,6 +41,12 @@ pub struct Stack {
     pub env_hidden: HashMap<String, HashSet<String>>,
     /// List of active overlays
     pub active_overlays: Vec<String>,
+    /// Argument stack for IR evaluation
+    pub arguments: ArgumentStack,
+    /// Error handler stack for IR evaluation
+    pub error_handlers: ErrorHandlerStack,
+    /// Set true to always use IR mode
+    pub use_ir: bool,
     pub recursion_count: u64,
     pub parent_stack: Option<Arc<Stack>>,
     /// Variables that have been deleted (this is used to hide values from parent stack lookups)
@@ -68,6 +74,9 @@ impl Stack {
             env_vars: Vec::new(),
             env_hidden: HashMap::new(),
             active_overlays: vec![DEFAULT_OVERLAY_NAME.to_string()],
+            arguments: ArgumentStack::new(),
+            error_handlers: ErrorHandlerStack::new(),
+            use_ir: false,
             recursion_count: 0,
             parent_stack: None,
             parent_deletions: vec![],
@@ -85,6 +94,9 @@ impl Stack {
             env_vars: parent.env_vars.clone(),
             env_hidden: parent.env_hidden.clone(),
             active_overlays: parent.active_overlays.clone(),
+            arguments: ArgumentStack::new(),
+            error_handlers: ErrorHandlerStack::new(),
+            use_ir: parent.use_ir,
             recursion_count: parent.recursion_count,
             vars: vec![],
             parent_deletions: vec![],
@@ -254,6 +266,9 @@ impl Stack {
             env_vars,
             env_hidden: self.env_hidden.clone(),
             active_overlays: self.active_overlays.clone(),
+            arguments: ArgumentStack::new(),
+            error_handlers: ErrorHandlerStack::new(),
+            use_ir: self.use_ir,
             recursion_count: self.recursion_count,
             parent_stack: None,
             parent_deletions: vec![],
@@ -284,6 +299,9 @@ impl Stack {
             env_vars,
             env_hidden: self.env_hidden.clone(),
             active_overlays: self.active_overlays.clone(),
+            arguments: ArgumentStack::new(),
+            error_handlers: ErrorHandlerStack::new(),
+            use_ir: self.use_ir,
             recursion_count: self.recursion_count,
             parent_stack: None,
             parent_deletions: vec![],
diff --git a/crates/nu-protocol/src/engine/state_working_set.rs b/crates/nu-protocol/src/engine/state_working_set.rs
index af950b8321..8c3968a824 100644
--- a/crates/nu-protocol/src/engine/state_working_set.rs
+++ b/crates/nu-protocol/src/engine/state_working_set.rs
@@ -4,8 +4,8 @@ use crate::{
         usage::build_usage, CachedFile, Command, CommandType, EngineState, OverlayFrame,
         StateDelta, Variable, VirtualPath, Visibility,
     },
-    BlockId, Category, Config, DeclId, FileId, GetSpan, Module, ModuleId, ParseError, ParseWarning,
-    Span, SpanId, Type, Value, VarId, VirtualPathId,
+    BlockId, Category, CompileError, Config, DeclId, FileId, GetSpan, Module, ModuleId, ParseError,
+    ParseWarning, Span, SpanId, Type, Value, VarId, VirtualPathId,
 };
 use core::panic;
 use std::{
@@ -31,6 +31,7 @@ pub struct StateWorkingSet<'a> {
     pub search_predecls: bool,
     pub parse_errors: Vec<ParseError>,
     pub parse_warnings: Vec<ParseWarning>,
+    pub compile_errors: Vec<CompileError>,
 }
 
 impl<'a> StateWorkingSet<'a> {
@@ -50,6 +51,7 @@ impl<'a> StateWorkingSet<'a> {
             search_predecls: true,
             parse_errors: vec![],
             parse_warnings: vec![],
+            compile_errors: vec![],
         }
     }
 
@@ -260,6 +262,12 @@ impl<'a> StateWorkingSet<'a> {
     }
 
     pub fn add_block(&mut self, block: Arc<Block>) -> BlockId {
+        log::trace!(
+            "block id={} added, has IR = {:?}",
+            self.num_blocks(),
+            block.ir_block.is_some()
+        );
+
         self.delta.blocks.push(block);
 
         self.num_blocks() - 1
diff --git a/crates/nu-protocol/src/errors/cli_error.rs b/crates/nu-protocol/src/errors/cli_error.rs
index 003564f933..181839b948 100644
--- a/crates/nu-protocol/src/errors/cli_error.rs
+++ b/crates/nu-protocol/src/errors/cli_error.rs
@@ -107,4 +107,8 @@ impl<'src> miette::Diagnostic for CliError<'src> {
     fn related<'a>(&'a self) -> Option<Box<dyn Iterator<Item = &'a dyn miette::Diagnostic> + 'a>> {
         self.0.related()
     }
+
+    fn diagnostic_source(&self) -> Option<&dyn miette::Diagnostic> {
+        self.0.diagnostic_source()
+    }
 }
diff --git a/crates/nu-protocol/src/errors/compile_error.rs b/crates/nu-protocol/src/errors/compile_error.rs
new file mode 100644
index 0000000000..cc805a73ed
--- /dev/null
+++ b/crates/nu-protocol/src/errors/compile_error.rs
@@ -0,0 +1,238 @@
+use crate::{RegId, Span};
+use miette::Diagnostic;
+use serde::{Deserialize, Serialize};
+use thiserror::Error;
+
+/// An internal compiler error, generally means a Nushell bug rather than an issue with user error
+/// since parsing and typechecking has already passed.
+#[derive(Debug, Clone, Error, Diagnostic, PartialEq, Serialize, Deserialize)]
+pub enum CompileError {
+    #[error("Register overflow.")]
+    #[diagnostic(code(nu::compile::register_overflow))]
+    RegisterOverflow {
+        #[label("the code being compiled is probably too large")]
+        block_span: Option<Span>,
+    },
+
+    #[error("Register {reg_id} was uninitialized when used, possibly reused.")]
+    #[diagnostic(
+        code(nu::compile::register_uninitialized),
+        help("this is a compiler bug. Please report it at https://github.com/nushell/nushell/issues/new\nfrom: {caller}"),
+    )]
+    RegisterUninitialized { reg_id: RegId, caller: String },
+
+    #[error("Register {reg_id} was uninitialized when used, possibly reused.")]
+    #[diagnostic(
+        code(nu::compile::register_uninitialized),
+        help("this is a compiler bug. Please report it at https://github.com/nushell/nushell/issues/new\nfrom: {caller}"),
+    )]
+    RegisterUninitializedWhilePushingInstruction {
+        reg_id: RegId,
+        caller: String,
+        instruction: String,
+        #[label("while adding this instruction: {instruction}")]
+        span: Span,
+    },
+
+    #[error("Block contains too much string data: maximum 4 GiB exceeded.")]
+    #[diagnostic(
+        code(nu::compile::data_overflow),
+        help("try loading the string data from a file instead")
+    )]
+    DataOverflow {
+        #[label("while compiling this block")]
+        block_span: Option<Span>,
+    },
+
+    #[error("Block contains too many files.")]
+    #[diagnostic(
+        code(nu::compile::register_overflow),
+        help("try using fewer file redirections")
+    )]
+    FileOverflow {
+        #[label("while compiling this block")]
+        block_span: Option<Span>,
+    },
+
+    #[error("Invalid redirect mode: File should not be specified by commands.")]
+    #[diagnostic(
+        code(nu::compile::invalid_redirect_mode),
+        help("this is a command bug. Please report it at https://github.com/nushell/nushell/issues/new")
+    )]
+    InvalidRedirectMode {
+        #[label("while compiling this expression")]
+        span: Span,
+    },
+
+    #[error("Encountered garbage, likely due to parse error.")]
+    #[diagnostic(code(nu::compile::garbage))]
+    Garbage {
+        #[label("garbage found here")]
+        span: Span,
+    },
+
+    #[error("Unsupported operator expression.")]
+    #[diagnostic(code(nu::compile::unsupported_operator_expression))]
+    UnsupportedOperatorExpression {
+        #[label("this expression is in operator position but is not an operator")]
+        span: Span,
+    },
+
+    #[error("Attempted access of $env by integer path.")]
+    #[diagnostic(code(nu::compile::access_env_by_int))]
+    AccessEnvByInt {
+        #[label("$env keys should be strings")]
+        span: Span,
+    },
+
+    #[error("Encountered invalid `{keyword}` keyword call.")]
+    #[diagnostic(code(nu::compile::invalid_keyword_call))]
+    InvalidKeywordCall {
+        keyword: String,
+        #[label("this call is not properly formed")]
+        span: Span,
+    },
+
+    #[error("Attempted to set branch target of non-branch instruction.")]
+    #[diagnostic(
+        code(nu::compile::set_branch_target_of_non_branch_instruction),
+        help("this is a compiler bug. Please report it at https://github.com/nushell/nushell/issues/new"),
+    )]
+    SetBranchTargetOfNonBranchInstruction {
+        instruction: String,
+        #[label("tried to modify: {instruction}")]
+        span: Span,
+    },
+
+    /// You're trying to run an unsupported external command.
+    ///
+    /// ## Resolution
+    ///
+    /// Make sure there's an appropriate `run-external` declaration for this external command.
+    #[error("External calls are not supported.")]
+    #[diagnostic(
+        code(nu::compile::run_external_not_found),
+        help("`run-external` was not found in scope")
+    )]
+    RunExternalNotFound {
+        #[label("can't be run in this context")]
+        span: Span,
+    },
+
+    /// Invalid assignment left-hand side
+    ///
+    /// ## Resolution
+    ///
+    /// Assignment requires that you assign to a variable or variable cell path.
+    #[error("Assignment operations require a variable.")]
+    #[diagnostic(
+        code(nu::compile::assignment_requires_variable),
+        help("try assigning to a variable or a cell path of a variable")
+    )]
+    AssignmentRequiresVar {
+        #[label("needs to be a variable")]
+        span: Span,
+    },
+
+    /// Invalid assignment left-hand side
+    ///
+    /// ## Resolution
+    ///
+    /// Assignment requires that you assign to a mutable variable or cell path.
+    #[error("Assignment to an immutable variable.")]
+    #[diagnostic(
+        code(nu::compile::assignment_requires_mutable_variable),
+        help("declare the variable with `mut`, or shadow it again with `let`")
+    )]
+    AssignmentRequiresMutableVar {
+        #[label("needs to be a mutable variable")]
+        span: Span,
+    },
+
+    /// This environment variable cannot be set manually.
+    ///
+    /// ## Resolution
+    ///
+    /// This environment variable is set automatically by Nushell and cannot not be set manually.
+    #[error("{envvar_name} cannot be set manually.")]
+    #[diagnostic(
+        code(nu::compile::automatic_env_var_set_manually),
+        help(
+            r#"The environment variable '{envvar_name}' is set automatically by Nushell and cannot be set manually."#
+        )
+    )]
+    AutomaticEnvVarSetManually {
+        envvar_name: String,
+        #[label("cannot set '{envvar_name}' manually")]
+        span: Span,
+    },
+
+    /// It is not possible to replace the entire environment at once
+    ///
+    /// ## Resolution
+    ///
+    /// Setting the entire environment is not allowed. Change environment variables individually
+    /// instead.
+    #[error("Cannot replace environment.")]
+    #[diagnostic(
+        code(nu::compile::cannot_replace_env),
+        help("Assigning a value to '$env' is not allowed.")
+    )]
+    CannotReplaceEnv {
+        #[label("setting '$env' not allowed")]
+        span: Span,
+    },
+
+    #[error("Unexpected expression.")]
+    #[diagnostic(code(nu::compile::unexpected_expression))]
+    UnexpectedExpression {
+        expr_name: String,
+        #[label("{expr_name} is not allowed in this context")]
+        span: Span,
+    },
+
+    #[error("Missing required declaration: `{decl_name}`")]
+    #[diagnostic(code(nu::compile::missing_required_declaration))]
+    MissingRequiredDeclaration {
+        decl_name: String,
+        #[label("`{decl_name}` must be in scope to compile this expression")]
+        span: Span,
+    },
+
+    #[error("Invalid literal")]
+    #[diagnostic(code(nu::compile::invalid_literal))]
+    InvalidLiteral {
+        msg: String,
+        #[label("{msg}")]
+        span: Span,
+    },
+
+    #[error("{msg}")]
+    #[diagnostic(code(nu::compile::not_in_a_loop))]
+    NotInALoop {
+        msg: String,
+        #[label("can't be used outside of a loop")]
+        span: Option<Span>,
+    },
+
+    #[error("Incoherent loop state: the loop that ended was not the one we were expecting.")]
+    #[diagnostic(
+        code(nu::compile::incoherent_loop_state),
+        help("this is a compiler bug. Please report it at https://github.com/nushell/nushell/issues/new"),
+    )]
+    IncoherentLoopState {
+        #[label("while compiling this block")]
+        block_span: Option<Span>,
+    },
+
+    #[error("Undefined label `{label_id}`.")]
+    #[diagnostic(
+        code(nu::compile::undefined_label),
+        help("this is a compiler bug. Please report it at https://github.com/nushell/nushell/issues/new"),
+    )]
+    UndefinedLabel {
+        label_id: usize,
+        #[label("label was used while compiling this code")]
+        span: Option<Span>,
+    },
+}
diff --git a/crates/nu-protocol/src/errors/mod.rs b/crates/nu-protocol/src/errors/mod.rs
index 23006ab684..3f895cd65f 100644
--- a/crates/nu-protocol/src/errors/mod.rs
+++ b/crates/nu-protocol/src/errors/mod.rs
@@ -1,10 +1,12 @@
 pub mod cli_error;
+mod compile_error;
 mod labeled_error;
 mod parse_error;
 mod parse_warning;
 mod shell_error;
 
 pub use cli_error::{format_error, report_error, report_error_new};
+pub use compile_error::CompileError;
 pub use labeled_error::{ErrorLabel, LabeledError};
 pub use parse_error::{DidYouMean, ParseError};
 pub use parse_warning::ParseWarning;
diff --git a/crates/nu-protocol/src/errors/shell_error.rs b/crates/nu-protocol/src/errors/shell_error.rs
index be24fd093e..ab01ccfa54 100644
--- a/crates/nu-protocol/src/errors/shell_error.rs
+++ b/crates/nu-protocol/src/errors/shell_error.rs
@@ -1376,6 +1376,23 @@ On Windows, this would be %USERPROFILE%\AppData\Roaming"#
         help("Set XDG_CONFIG_HOME to an absolute path, or set it to an empty string to ignore it")
     )]
     InvalidXdgConfig { xdg: String, default: String },
+
+    /// An unexpected error occurred during IR evaluation.
+    ///
+    /// ## Resolution
+    ///
+    /// This is most likely a correctness issue with the IR compiler or evaluator. Please file a
+    /// bug with the minimum code needed to reproduce the issue, if possible.
+    #[error("IR evaluation error: {msg}")]
+    #[diagnostic(
+        code(nu::shell::ir_eval_error),
+        help("this is a bug, please report it at https://github.com/nushell/nushell/issues/new along with the code you were running if able")
+    )]
+    IrEvalError {
+        msg: String,
+        #[label = "while running this code"]
+        span: Option<Span>,
+    },
 }
 
 // TODO: Implement as From trait
diff --git a/crates/nu-protocol/src/eval_const.rs b/crates/nu-protocol/src/eval_const.rs
index 87913e4ee3..5393e35e59 100644
--- a/crates/nu-protocol/src/eval_const.rs
+++ b/crates/nu-protocol/src/eval_const.rs
@@ -307,7 +307,7 @@ fn eval_const_call(
         return Err(ShellError::NotAConstHelp { span: call.head });
     }
 
-    decl.run_const(working_set, call, input)
+    decl.run_const(working_set, &call.into(), input)
 }
 
 pub fn eval_const_subexpression(
diff --git a/crates/nu-protocol/src/id.rs b/crates/nu-protocol/src/id.rs
index 73c4f52e70..829ee8f36d 100644
--- a/crates/nu-protocol/src/id.rs
+++ b/crates/nu-protocol/src/id.rs
@@ -7,5 +7,19 @@ pub type ModuleId = usize;
 pub type OverlayId = usize;
 pub type FileId = usize;
 pub type VirtualPathId = usize;
+
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
 pub struct SpanId(pub usize); // more robust ID style used in the new parser
+
+/// An ID for an [IR](crate::ir) register. `%n` is a common shorthand for `RegId(n)`.
+///
+/// Note: `%0` is allocated with the block input at the beginning of a compiled block.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
+#[repr(transparent)]
+pub struct RegId(pub u32);
+
+impl std::fmt::Display for RegId {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "%{}", self.0)
+    }
+}
diff --git a/crates/nu-protocol/src/ir/call.rs b/crates/nu-protocol/src/ir/call.rs
new file mode 100644
index 0000000000..3d16f82eb6
--- /dev/null
+++ b/crates/nu-protocol/src/ir/call.rs
@@ -0,0 +1,351 @@
+use std::sync::Arc;
+
+use crate::{
+    ast::Expression,
+    engine::{self, Argument, Stack},
+    DeclId, ShellError, Span, Spanned, Value,
+};
+
+use super::DataSlice;
+
+/// Contains the information for a call being made to a declared command.
+#[derive(Debug, Clone)]
+pub struct Call {
+    /// The declaration ID of the command to be invoked.
+    pub decl_id: DeclId,
+    /// The span encompassing the command name, before the arguments.
+    pub head: Span,
+    /// The span encompassing the command name and all arguments.
+    pub span: Span,
+    /// The base index of the arguments for this call within the
+    /// [argument stack](crate::engine::ArgumentStack).
+    pub args_base: usize,
+    /// The number of [`Argument`]s for the call. Note that this just counts the number of
+    /// `Argument` entries on the stack, and has nothing to do with the actual number of positional
+    /// or spread arguments.
+    pub args_len: usize,
+}
+
+impl Call {
+    /// Build a new call with arguments.
+    pub fn build(decl_id: DeclId, head: Span) -> CallBuilder {
+        CallBuilder {
+            inner: Call {
+                decl_id,
+                head,
+                span: head,
+                args_base: 0,
+                args_len: 0,
+            },
+        }
+    }
+
+    /// Get the arguments for this call from the arguments stack.
+    pub fn arguments<'a>(&self, stack: &'a Stack) -> &'a [Argument] {
+        stack.arguments.get_args(self.args_base, self.args_len)
+    }
+
+    /// The span encompassing the arguments
+    ///
+    /// If there are no arguments the span covers where the first argument would exist
+    ///
+    /// If there are one or more arguments the span encompasses the start of the first argument to
+    /// end of the last argument
+    pub fn arguments_span(&self) -> Span {
+        let past = self.head.past();
+        Span::new(past.start, self.span.end)
+    }
+
+    /// The number of named arguments, with or without values.
+    pub fn named_len(&self, stack: &Stack) -> usize {
+        self.arguments(stack)
+            .iter()
+            .filter(|arg| matches!(arg, Argument::Named { .. } | Argument::Flag { .. }))
+            .count()
+    }
+
+    /// Iterate through named arguments, with or without values.
+    pub fn named_iter<'a>(
+        &'a self,
+        stack: &'a Stack,
+    ) -> impl Iterator<Item = (Spanned<&'a str>, Option<&'a Value>)> + 'a {
+        self.arguments(stack).iter().filter_map(
+            |arg: &Argument| -> Option<(Spanned<&str>, Option<&Value>)> {
+                match arg {
+                    Argument::Flag {
+                        data, name, span, ..
+                    } => Some((
+                        Spanned {
+                            item: std::str::from_utf8(&data[*name]).expect("invalid arg name"),
+                            span: *span,
+                        },
+                        None,
+                    )),
+                    Argument::Named {
+                        data,
+                        name,
+                        span,
+                        val,
+                        ..
+                    } => Some((
+                        Spanned {
+                            item: std::str::from_utf8(&data[*name]).expect("invalid arg name"),
+                            span: *span,
+                        },
+                        Some(val),
+                    )),
+                    _ => None,
+                }
+            },
+        )
+    }
+
+    /// Get a named argument's value by name. Returns [`None`] for named arguments with no value as
+    /// well.
+    pub fn get_named_arg<'a>(&self, stack: &'a Stack, flag_name: &str) -> Option<&'a Value> {
+        // Optimized to avoid str::from_utf8()
+        self.arguments(stack)
+            .iter()
+            .find_map(|arg: &Argument| -> Option<Option<&Value>> {
+                match arg {
+                    Argument::Flag { data, name, .. } if &data[*name] == flag_name.as_bytes() => {
+                        Some(None)
+                    }
+                    Argument::Named {
+                        data, name, val, ..
+                    } if &data[*name] == flag_name.as_bytes() => Some(Some(val)),
+                    _ => None,
+                }
+            })
+            .flatten()
+    }
+
+    /// The number of positional arguments, excluding spread arguments.
+    pub fn positional_len(&self, stack: &Stack) -> usize {
+        self.arguments(stack)
+            .iter()
+            .filter(|arg| matches!(arg, Argument::Positional { .. }))
+            .count()
+    }
+
+    /// Iterate through positional arguments. Does not include spread arguments.
+    pub fn positional_iter<'a>(&self, stack: &'a Stack) -> impl Iterator<Item = &'a Value> {
+        self.arguments(stack).iter().filter_map(|arg| match arg {
+            Argument::Positional { val, .. } => Some(val),
+            _ => None,
+        })
+    }
+
+    /// Get a positional argument by index. Does not include spread arguments.
+    pub fn positional_nth<'a>(&self, stack: &'a Stack, index: usize) -> Option<&'a Value> {
+        self.positional_iter(stack).nth(index)
+    }
+
+    /// Get the AST node for a positional argument by index. Not usually available unless the decl
+    /// required it.
+    pub fn positional_ast<'a>(
+        &self,
+        stack: &'a Stack,
+        index: usize,
+    ) -> Option<&'a Arc<Expression>> {
+        self.arguments(stack)
+            .iter()
+            .filter_map(|arg| match arg {
+                Argument::Positional { ast, .. } => Some(ast),
+                _ => None,
+            })
+            .nth(index)
+            .and_then(|option| option.as_ref())
+    }
+
+    /// Returns every argument to the rest parameter, as well as whether each argument
+    /// is spread or a normal positional argument (true for spread, false for normal)
+    pub fn rest_iter<'a>(
+        &self,
+        stack: &'a Stack,
+        start: usize,
+    ) -> impl Iterator<Item = (&'a Value, bool)> + 'a {
+        self.arguments(stack)
+            .iter()
+            .filter_map(|arg| match arg {
+                Argument::Positional { val, .. } => Some((val, false)),
+                Argument::Spread { vals, .. } => Some((vals, true)),
+                _ => None,
+            })
+            .skip(start)
+    }
+
+    /// Returns all of the positional arguments including and after `start`, with spread arguments
+    /// flattened into a single `Vec`.
+    pub fn rest_iter_flattened(
+        &self,
+        stack: &Stack,
+        start: usize,
+    ) -> Result<Vec<Value>, ShellError> {
+        let mut acc = vec![];
+        for (rest_val, spread) in self.rest_iter(stack, start) {
+            if spread {
+                match rest_val {
+                    Value::List { vals, .. } => acc.extend(vals.iter().cloned()),
+                    Value::Error { error, .. } => return Err(ShellError::clone(error)),
+                    _ => {
+                        return Err(ShellError::CannotSpreadAsList {
+                            span: rest_val.span(),
+                        })
+                    }
+                }
+            } else {
+                acc.push(rest_val.clone());
+            }
+        }
+        Ok(acc)
+    }
+
+    /// Get a parser info argument by name.
+    pub fn get_parser_info<'a>(&self, stack: &'a Stack, name: &str) -> Option<&'a Expression> {
+        self.arguments(stack)
+            .iter()
+            .find_map(|argument| match argument {
+                Argument::ParserInfo {
+                    data,
+                    name: name_slice,
+                    info: expr,
+                } if &data[*name_slice] == name.as_bytes() => Some(expr.as_ref()),
+                _ => None,
+            })
+    }
+
+    /// Returns a span encompassing the entire call.
+    pub fn span(&self) -> Span {
+        self.span
+    }
+
+    /// Resets the [`Stack`] to its state before the call was made.
+    pub fn leave(&self, stack: &mut Stack) {
+        stack.arguments.leave_frame(self.args_base);
+    }
+}
+
+/// Utility struct for building a [`Call`] with arguments on the [`Stack`].
+pub struct CallBuilder {
+    inner: Call,
+}
+
+impl CallBuilder {
+    /// Add an argument to the [`Stack`] and reference it from the [`Call`].
+    pub fn add_argument(&mut self, stack: &mut Stack, argument: Argument) -> &mut Self {
+        if self.inner.args_len == 0 {
+            self.inner.args_base = stack.arguments.get_base();
+        }
+        self.inner.args_len += 1;
+        if let Some(span) = argument.span() {
+            self.inner.span = self.inner.span.append(span);
+        }
+        stack.arguments.push(argument);
+        self
+    }
+
+    /// Add a positional argument to the [`Stack`] and reference it from the [`Call`].
+    pub fn add_positional(&mut self, stack: &mut Stack, span: Span, val: Value) -> &mut Self {
+        self.add_argument(
+            stack,
+            Argument::Positional {
+                span,
+                val,
+                ast: None,
+            },
+        )
+    }
+
+    /// Add a spread argument to the [`Stack`] and reference it from the [`Call`].
+    pub fn add_spread(&mut self, stack: &mut Stack, span: Span, vals: Value) -> &mut Self {
+        self.add_argument(
+            stack,
+            Argument::Spread {
+                span,
+                vals,
+                ast: None,
+            },
+        )
+    }
+
+    /// Add a flag (no-value named) argument to the [`Stack`] and reference it from the [`Call`].
+    pub fn add_flag(
+        &mut self,
+        stack: &mut Stack,
+        name: impl AsRef<str>,
+        short: impl AsRef<str>,
+        span: Span,
+    ) -> &mut Self {
+        let (data, name, short) = data_from_name_and_short(name.as_ref(), short.as_ref());
+        self.add_argument(
+            stack,
+            Argument::Flag {
+                data,
+                name,
+                short,
+                span,
+            },
+        )
+    }
+
+    /// Add a named argument to the [`Stack`] and reference it from the [`Call`].
+    pub fn add_named(
+        &mut self,
+        stack: &mut Stack,
+        name: impl AsRef<str>,
+        short: impl AsRef<str>,
+        span: Span,
+        val: Value,
+    ) -> &mut Self {
+        let (data, name, short) = data_from_name_and_short(name.as_ref(), short.as_ref());
+        self.add_argument(
+            stack,
+            Argument::Named {
+                data,
+                name,
+                short,
+                span,
+                val,
+                ast: None,
+            },
+        )
+    }
+
+    /// Produce the finished [`Call`] from the builder.
+    ///
+    /// The call should be entered / run before any other calls are constructed, because the
+    /// argument stack will be reset when they exit.
+    pub fn finish(&self) -> Call {
+        self.inner.clone()
+    }
+
+    /// Run a closure with the [`Call`] as an [`engine::Call`] reference, and then clean up the
+    /// arguments that were added to the [`Stack`] after.
+    ///
+    /// For convenience. Calls [`Call::leave`] after the closure ends.
+    pub fn with<T>(
+        self,
+        stack: &mut Stack,
+        f: impl FnOnce(&mut Stack, &engine::Call<'_>) -> T,
+    ) -> T {
+        let call = engine::Call::from(&self.inner);
+        let result = f(stack, &call);
+        self.inner.leave(stack);
+        result
+    }
+}
+
+fn data_from_name_and_short(name: &str, short: &str) -> (Arc<[u8]>, DataSlice, DataSlice) {
+    let data: Vec<u8> = name.bytes().chain(short.bytes()).collect();
+    let data: Arc<[u8]> = data.into();
+    let name = DataSlice {
+        start: 0,
+        len: name.len().try_into().expect("flag name too big"),
+    };
+    let short = DataSlice {
+        start: name.start.checked_add(name.len).expect("flag name too big"),
+        len: short.len().try_into().expect("flag short name too big"),
+    };
+    (data, name, short)
+}
diff --git a/crates/nu-protocol/src/ir/display.rs b/crates/nu-protocol/src/ir/display.rs
new file mode 100644
index 0000000000..c28323cca4
--- /dev/null
+++ b/crates/nu-protocol/src/ir/display.rs
@@ -0,0 +1,452 @@
+use std::fmt;
+
+use crate::{ast::Pattern, engine::EngineState, DeclId, VarId};
+
+use super::{DataSlice, Instruction, IrBlock, Literal, RedirectMode};
+
+pub struct FmtIrBlock<'a> {
+    pub(super) engine_state: &'a EngineState,
+    pub(super) ir_block: &'a IrBlock,
+}
+
+impl<'a> fmt::Display for FmtIrBlock<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let plural = |count| if count == 1 { "" } else { "s" };
+        writeln!(
+            f,
+            "# {} register{}, {} instruction{}, {} byte{} of data",
+            self.ir_block.register_count,
+            plural(self.ir_block.register_count as usize),
+            self.ir_block.instructions.len(),
+            plural(self.ir_block.instructions.len()),
+            self.ir_block.data.len(),
+            plural(self.ir_block.data.len()),
+        )?;
+        if self.ir_block.file_count > 0 {
+            writeln!(
+                f,
+                "# {} file{} used for redirection",
+                self.ir_block.file_count,
+                plural(self.ir_block.file_count as usize)
+            )?;
+        }
+        for (index, instruction) in self.ir_block.instructions.iter().enumerate() {
+            let formatted = format!(
+                "{:-4}: {}",
+                index,
+                FmtInstruction {
+                    engine_state: self.engine_state,
+                    instruction,
+                    data: &self.ir_block.data,
+                }
+            );
+            let comment = &self.ir_block.comments[index];
+            if comment.is_empty() {
+                writeln!(f, "{formatted}")?;
+            } else {
+                writeln!(f, "{formatted:40} # {comment}")?;
+            }
+        }
+        Ok(())
+    }
+}
+
+pub struct FmtInstruction<'a> {
+    pub(super) engine_state: &'a EngineState,
+    pub(super) instruction: &'a Instruction,
+    pub(super) data: &'a [u8],
+}
+
+impl<'a> fmt::Display for FmtInstruction<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        const WIDTH: usize = 22;
+
+        match self.instruction {
+            Instruction::Unreachable => {
+                write!(f, "{:WIDTH$}", "unreachable")
+            }
+            Instruction::LoadLiteral { dst, lit } => {
+                let lit = FmtLiteral {
+                    literal: lit,
+                    data: self.data,
+                };
+                write!(f, "{:WIDTH$} {dst}, {lit}", "load-literal")
+            }
+            Instruction::LoadValue { dst, val } => {
+                let val = val.to_debug_string();
+                write!(f, "{:WIDTH$} {dst}, {val}", "load-value")
+            }
+            Instruction::Move { dst, src } => {
+                write!(f, "{:WIDTH$} {dst}, {src}", "move")
+            }
+            Instruction::Clone { dst, src } => {
+                write!(f, "{:WIDTH$} {dst}, {src}", "clone")
+            }
+            Instruction::Collect { src_dst } => {
+                write!(f, "{:WIDTH$} {src_dst}", "collect")
+            }
+            Instruction::Span { src_dst } => {
+                write!(f, "{:WIDTH$} {src_dst}", "span")
+            }
+            Instruction::Drop { src } => {
+                write!(f, "{:WIDTH$} {src}", "drop")
+            }
+            Instruction::Drain { src } => {
+                write!(f, "{:WIDTH$} {src}", "drain")
+            }
+            Instruction::LoadVariable { dst, var_id } => {
+                let var = FmtVar::new(self.engine_state, *var_id);
+                write!(f, "{:WIDTH$} {dst}, {var}", "load-variable")
+            }
+            Instruction::StoreVariable { var_id, src } => {
+                let var = FmtVar::new(self.engine_state, *var_id);
+                write!(f, "{:WIDTH$} {var}, {src}", "store-variable")
+            }
+            Instruction::LoadEnv { dst, key } => {
+                let key = FmtData(self.data, *key);
+                write!(f, "{:WIDTH$} {dst}, {key}", "load-env")
+            }
+            Instruction::LoadEnvOpt { dst, key } => {
+                let key = FmtData(self.data, *key);
+                write!(f, "{:WIDTH$} {dst}, {key}", "load-env-opt")
+            }
+            Instruction::StoreEnv { key, src } => {
+                let key = FmtData(self.data, *key);
+                write!(f, "{:WIDTH$} {key}, {src}", "store-env")
+            }
+            Instruction::PushPositional { src } => {
+                write!(f, "{:WIDTH$} {src}", "push-positional")
+            }
+            Instruction::AppendRest { src } => {
+                write!(f, "{:WIDTH$} {src}", "append-rest")
+            }
+            Instruction::PushFlag { name } => {
+                let name = FmtData(self.data, *name);
+                write!(f, "{:WIDTH$} {name}", "push-flag")
+            }
+            Instruction::PushShortFlag { short } => {
+                let short = FmtData(self.data, *short);
+                write!(f, "{:WIDTH$} {short}", "push-short-flag")
+            }
+            Instruction::PushNamed { name, src } => {
+                let name = FmtData(self.data, *name);
+                write!(f, "{:WIDTH$} {name}, {src}", "push-named")
+            }
+            Instruction::PushShortNamed { short, src } => {
+                let short = FmtData(self.data, *short);
+                write!(f, "{:WIDTH$} {short}, {src}", "push-short-named")
+            }
+            Instruction::PushParserInfo { name, info } => {
+                let name = FmtData(self.data, *name);
+                write!(f, "{:WIDTH$} {name}, {info:?}", "push-parser-info")
+            }
+            Instruction::RedirectOut { mode } => {
+                write!(f, "{:WIDTH$} {mode}", "redirect-out")
+            }
+            Instruction::RedirectErr { mode } => {
+                write!(f, "{:WIDTH$} {mode}", "redirect-err")
+            }
+            Instruction::CheckErrRedirected { src } => {
+                write!(f, "{:WIDTH$} {src}", "check-err-redirected")
+            }
+            Instruction::OpenFile {
+                file_num,
+                path,
+                append,
+            } => {
+                write!(
+                    f,
+                    "{:WIDTH$} file({file_num}), {path}, append = {append:?}",
+                    "open-file"
+                )
+            }
+            Instruction::WriteFile { file_num, src } => {
+                write!(f, "{:WIDTH$} file({file_num}), {src}", "write-file")
+            }
+            Instruction::CloseFile { file_num } => {
+                write!(f, "{:WIDTH$} file({file_num})", "close-file")
+            }
+            Instruction::Call { decl_id, src_dst } => {
+                let decl = FmtDecl::new(self.engine_state, *decl_id);
+                write!(f, "{:WIDTH$} {decl}, {src_dst}", "call")
+            }
+            Instruction::StringAppend { src_dst, val } => {
+                write!(f, "{:WIDTH$} {src_dst}, {val}", "string-append")
+            }
+            Instruction::GlobFrom { src_dst, no_expand } => {
+                let no_expand = if *no_expand { "no-expand" } else { "expand" };
+                write!(f, "{:WIDTH$} {src_dst}, {no_expand}", "glob-from",)
+            }
+            Instruction::ListPush { src_dst, item } => {
+                write!(f, "{:WIDTH$} {src_dst}, {item}", "list-push")
+            }
+            Instruction::ListSpread { src_dst, items } => {
+                write!(f, "{:WIDTH$} {src_dst}, {items}", "list-spread")
+            }
+            Instruction::RecordInsert { src_dst, key, val } => {
+                write!(f, "{:WIDTH$} {src_dst}, {key}, {val}", "record-insert")
+            }
+            Instruction::RecordSpread { src_dst, items } => {
+                write!(f, "{:WIDTH$} {src_dst}, {items}", "record-spread")
+            }
+            Instruction::Not { src_dst } => {
+                write!(f, "{:WIDTH$} {src_dst}", "not")
+            }
+            Instruction::BinaryOp { lhs_dst, op, rhs } => {
+                write!(f, "{:WIDTH$} {lhs_dst}, {op:?}, {rhs}", "binary-op")
+            }
+            Instruction::FollowCellPath { src_dst, path } => {
+                write!(f, "{:WIDTH$} {src_dst}, {path}", "follow-cell-path")
+            }
+            Instruction::CloneCellPath { dst, src, path } => {
+                write!(f, "{:WIDTH$} {dst}, {src}, {path}", "clone-cell-path")
+            }
+            Instruction::UpsertCellPath {
+                src_dst,
+                path,
+                new_value,
+            } => {
+                write!(
+                    f,
+                    "{:WIDTH$} {src_dst}, {path}, {new_value}",
+                    "upsert-cell-path"
+                )
+            }
+            Instruction::Jump { index } => {
+                write!(f, "{:WIDTH$} {index}", "jump")
+            }
+            Instruction::BranchIf { cond, index } => {
+                write!(f, "{:WIDTH$} {cond}, {index}", "branch-if")
+            }
+            Instruction::BranchIfEmpty { src, index } => {
+                write!(f, "{:WIDTH$} {src}, {index}", "branch-if-empty")
+            }
+            Instruction::Match {
+                pattern,
+                src,
+                index,
+            } => {
+                let pattern = FmtPattern {
+                    engine_state: self.engine_state,
+                    pattern,
+                };
+                write!(f, "{:WIDTH$} ({pattern}), {src}, {index}", "match")
+            }
+            Instruction::CheckMatchGuard { src } => {
+                write!(f, "{:WIDTH$} {src}", "check-match-guard")
+            }
+            Instruction::Iterate {
+                dst,
+                stream,
+                end_index,
+            } => {
+                write!(f, "{:WIDTH$} {dst}, {stream}, end {end_index}", "iterate")
+            }
+            Instruction::OnError { index } => {
+                write!(f, "{:WIDTH$} {index}", "on-error")
+            }
+            Instruction::OnErrorInto { index, dst } => {
+                write!(f, "{:WIDTH$} {index}, {dst}", "on-error-into")
+            }
+            Instruction::PopErrorHandler => {
+                write!(f, "{:WIDTH$}", "pop-error-handler")
+            }
+            Instruction::CheckExternalFailed { dst, src } => {
+                write!(f, "{:WIDTH$} {dst}, {src}", "check-external-failed")
+            }
+            Instruction::ReturnEarly { src } => {
+                write!(f, "{:WIDTH$} {src}", "return-early")
+            }
+            Instruction::Return { src } => {
+                write!(f, "{:WIDTH$} {src}", "return")
+            }
+        }
+    }
+}
+
+struct FmtDecl<'a>(DeclId, &'a str);
+
+impl<'a> FmtDecl<'a> {
+    fn new(engine_state: &'a EngineState, decl_id: DeclId) -> Self {
+        FmtDecl(decl_id, engine_state.get_decl(decl_id).name())
+    }
+}
+
+impl fmt::Display for FmtDecl<'_> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "decl {} {:?}", self.0, self.1)
+    }
+}
+
+struct FmtVar<'a>(DeclId, Option<&'a str>);
+
+impl<'a> FmtVar<'a> {
+    fn new(engine_state: &'a EngineState, var_id: VarId) -> Self {
+        // Search for the name of the variable
+        let name: Option<&str> = engine_state
+            .active_overlays(&[])
+            .flat_map(|overlay| overlay.vars.iter())
+            .find(|(_, v)| **v == var_id)
+            .map(|(k, _)| std::str::from_utf8(k).unwrap_or("<utf-8 error>"));
+        FmtVar(var_id, name)
+    }
+}
+
+impl fmt::Display for FmtVar<'_> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        if let Some(name) = self.1 {
+            write!(f, "var {} {:?}", self.0, name)
+        } else {
+            write!(f, "var {}", self.0)
+        }
+    }
+}
+
+impl fmt::Display for RedirectMode {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            RedirectMode::Pipe => write!(f, "pipe"),
+            RedirectMode::Capture => write!(f, "capture"),
+            RedirectMode::Null => write!(f, "null"),
+            RedirectMode::Inherit => write!(f, "inherit"),
+            RedirectMode::File { file_num } => write!(f, "file({file_num})"),
+            RedirectMode::Caller => write!(f, "caller"),
+        }
+    }
+}
+
+struct FmtData<'a>(&'a [u8], DataSlice);
+
+impl<'a> fmt::Display for FmtData<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        if let Ok(s) = std::str::from_utf8(&self.0[self.1]) {
+            // Write as string
+            write!(f, "{s:?}")
+        } else {
+            // Write as byte array
+            write!(f, "0x{:x?}", self.0)
+        }
+    }
+}
+
+struct FmtLiteral<'a> {
+    literal: &'a Literal,
+    data: &'a [u8],
+}
+
+impl<'a> fmt::Display for FmtLiteral<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self.literal {
+            Literal::Bool(b) => write!(f, "bool({b:?})"),
+            Literal::Int(i) => write!(f, "int({i:?})"),
+            Literal::Float(fl) => write!(f, "float({fl:?})"),
+            Literal::Filesize(q) => write!(f, "filesize({q}b)"),
+            Literal::Duration(q) => write!(f, "duration({q}ns)"),
+            Literal::Binary(b) => write!(f, "binary({})", FmtData(self.data, *b)),
+            Literal::Block(id) => write!(f, "block({id})"),
+            Literal::Closure(id) => write!(f, "closure({id})"),
+            Literal::RowCondition(id) => write!(f, "row_condition({id})"),
+            Literal::Range {
+                start,
+                step,
+                end,
+                inclusion,
+            } => write!(f, "range({start}, {step}, {end}, {inclusion:?})"),
+            Literal::List { capacity } => write!(f, "list(capacity = {capacity})"),
+            Literal::Record { capacity } => write!(f, "record(capacity = {capacity})"),
+            Literal::Filepath { val, no_expand } => write!(
+                f,
+                "filepath({}, no_expand = {no_expand:?})",
+                FmtData(self.data, *val)
+            ),
+            Literal::Directory { val, no_expand } => write!(
+                f,
+                "directory({}, no_expand = {no_expand:?})",
+                FmtData(self.data, *val)
+            ),
+            Literal::GlobPattern { val, no_expand } => write!(
+                f,
+                "glob-pattern({}, no_expand = {no_expand:?})",
+                FmtData(self.data, *val)
+            ),
+            Literal::String(s) => write!(f, "string({})", FmtData(self.data, *s)),
+            Literal::RawString(rs) => write!(f, "raw-string({})", FmtData(self.data, *rs)),
+            Literal::CellPath(p) => write!(f, "cell-path({p})"),
+            Literal::Date(dt) => write!(f, "date({dt})"),
+            Literal::Nothing => write!(f, "nothing"),
+        }
+    }
+}
+
+struct FmtPattern<'a> {
+    engine_state: &'a EngineState,
+    pattern: &'a Pattern,
+}
+
+impl<'a> fmt::Display for FmtPattern<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self.pattern {
+            Pattern::Record(bindings) => {
+                f.write_str("{")?;
+                for (name, pattern) in bindings {
+                    write!(
+                        f,
+                        "{}: {}",
+                        name,
+                        FmtPattern {
+                            engine_state: self.engine_state,
+                            pattern: &pattern.pattern,
+                        }
+                    )?;
+                }
+                f.write_str("}")
+            }
+            Pattern::List(bindings) => {
+                f.write_str("[")?;
+                for pattern in bindings {
+                    write!(
+                        f,
+                        "{}",
+                        FmtPattern {
+                            engine_state: self.engine_state,
+                            pattern: &pattern.pattern
+                        }
+                    )?;
+                }
+                f.write_str("]")
+            }
+            Pattern::Value(expr) => {
+                let string =
+                    String::from_utf8_lossy(self.engine_state.get_span_contents(expr.span));
+                f.write_str(&string)
+            }
+            Pattern::Variable(var_id) => {
+                let variable = FmtVar::new(self.engine_state, *var_id);
+                write!(f, "{}", variable)
+            }
+            Pattern::Or(patterns) => {
+                for (index, pattern) in patterns.iter().enumerate() {
+                    if index > 0 {
+                        f.write_str(" | ")?;
+                    }
+                    write!(
+                        f,
+                        "{}",
+                        FmtPattern {
+                            engine_state: self.engine_state,
+                            pattern: &pattern.pattern
+                        }
+                    )?;
+                }
+                Ok(())
+            }
+            Pattern::Rest(var_id) => {
+                let variable = FmtVar::new(self.engine_state, *var_id);
+                write!(f, "..{}", variable)
+            }
+            Pattern::IgnoreRest => f.write_str(".."),
+            Pattern::IgnoreValue => f.write_str("_"),
+            Pattern::Garbage => f.write_str("<garbage>"),
+        }
+    }
+}
diff --git a/crates/nu-protocol/src/ir/mod.rs b/crates/nu-protocol/src/ir/mod.rs
new file mode 100644
index 0000000000..28677b743c
--- /dev/null
+++ b/crates/nu-protocol/src/ir/mod.rs
@@ -0,0 +1,419 @@
+use std::{fmt, sync::Arc};
+
+use crate::{
+    ast::{CellPath, Expression, Operator, Pattern, RangeInclusion},
+    engine::EngineState,
+    BlockId, DeclId, RegId, Span, Value, VarId,
+};
+
+use chrono::{DateTime, FixedOffset};
+use serde::{Deserialize, Serialize};
+
+mod call;
+mod display;
+
+pub use call::*;
+pub use display::{FmtInstruction, FmtIrBlock};
+
+#[derive(Clone, Serialize, Deserialize)]
+pub struct IrBlock {
+    pub instructions: Vec<Instruction>,
+    pub spans: Vec<Span>,
+    #[serde(with = "serde_arc_u8_array")]
+    pub data: Arc<[u8]>,
+    pub ast: Vec<Option<IrAstRef>>,
+    /// Additional information that can be added to help with debugging
+    pub comments: Vec<Box<str>>,
+    pub register_count: u32,
+    pub file_count: u32,
+}
+
+impl fmt::Debug for IrBlock {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        // the ast field is too verbose and doesn't add much
+        f.debug_struct("IrBlock")
+            .field("instructions", &self.instructions)
+            .field("spans", &self.spans)
+            .field("data", &self.data)
+            .field("comments", &self.comments)
+            .field("register_count", &self.register_count)
+            .field("file_count", &self.register_count)
+            .finish_non_exhaustive()
+    }
+}
+
+impl IrBlock {
+    /// Returns a value that can be formatted with [`Display`](std::fmt::Display) to show a detailed
+    /// listing of the instructions contained within this [`IrBlock`].
+    pub fn display<'a>(&'a self, engine_state: &'a EngineState) -> FmtIrBlock<'a> {
+        FmtIrBlock {
+            engine_state,
+            ir_block: self,
+        }
+    }
+}
+
+/// A slice into the `data` array of a block. This is a compact and cache-friendly way to store
+/// string data that a block uses.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
+pub struct DataSlice {
+    pub start: u32,
+    pub len: u32,
+}
+
+impl DataSlice {
+    /// A data slice that contains no data. This slice is always valid.
+    pub const fn empty() -> DataSlice {
+        DataSlice { start: 0, len: 0 }
+    }
+}
+
+impl std::ops::Index<DataSlice> for [u8] {
+    type Output = [u8];
+
+    fn index(&self, index: DataSlice) -> &Self::Output {
+        &self[index.start as usize..(index.start as usize + index.len as usize)]
+    }
+}
+
+/// A possible reference into the abstract syntax tree for an instruction. This is not present for
+/// most instructions and is just added when needed.
+#[derive(Debug, Clone)]
+pub struct IrAstRef(pub Arc<Expression>);
+
+impl Serialize for IrAstRef {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        self.0.as_ref().serialize(serializer)
+    }
+}
+
+impl<'de> Deserialize<'de> for IrAstRef {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        Expression::deserialize(deserializer).map(|expr| IrAstRef(Arc::new(expr)))
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum Instruction {
+    /// Unreachable code path (error)
+    Unreachable,
+    /// Load a literal value into the `dst` register
+    LoadLiteral { dst: RegId, lit: Literal },
+    /// Load a clone of a boxed value into the `dst` register (e.g. from const evaluation)
+    LoadValue { dst: RegId, val: Box<Value> },
+    /// Move a register. Value is taken from `src` (used by this instruction).
+    Move { dst: RegId, src: RegId },
+    /// Copy a register (must be a collected value). Value is still in `src` after this instruction.
+    Clone { dst: RegId, src: RegId },
+    /// Collect a stream in a register to a value
+    Collect { src_dst: RegId },
+    /// Change the span of the contents of a register to the span of this instruction.
+    Span { src_dst: RegId },
+    /// Drop the value/stream in a register, without draining
+    Drop { src: RegId },
+    /// Drain the value/stream in a register and discard (e.g. semicolon).
+    ///
+    /// If passed a stream from an external command, sets $env.LAST_EXIT_CODE to the resulting exit
+    /// code, and invokes any available error handler with Empty, or if not available, returns an
+    /// exit-code-only stream, leaving the block.
+    Drain { src: RegId },
+    /// Load the value of a variable into the `dst` register
+    LoadVariable { dst: RegId, var_id: VarId },
+    /// Store the value of a variable from the `src` register
+    StoreVariable { var_id: VarId, src: RegId },
+    /// Load the value of an environment variable into the `dst` register
+    LoadEnv { dst: RegId, key: DataSlice },
+    /// Load the value of an environment variable into the `dst` register, or `Nothing` if it
+    /// doesn't exist
+    LoadEnvOpt { dst: RegId, key: DataSlice },
+    /// Store the value of an environment variable from the `src` register
+    StoreEnv { key: DataSlice, src: RegId },
+    /// Add a positional arg to the next (internal) call.
+    PushPositional { src: RegId },
+    /// Add a list of args to the next (internal) call (spread/rest).
+    AppendRest { src: RegId },
+    /// Add a named arg with no value to the next (internal) call.
+    PushFlag { name: DataSlice },
+    /// Add a short named arg with no value to the next (internal) call.
+    PushShortFlag { short: DataSlice },
+    /// Add a named arg with a value to the next (internal) call.
+    PushNamed { name: DataSlice, src: RegId },
+    /// Add a short named arg with a value to the next (internal) call.
+    PushShortNamed { short: DataSlice, src: RegId },
+    /// Add parser info to the next (internal) call.
+    PushParserInfo {
+        name: DataSlice,
+        info: Box<Expression>,
+    },
+    /// Set the redirection for stdout for the next call (only).
+    ///
+    /// The register for a file redirection is not consumed.
+    RedirectOut { mode: RedirectMode },
+    /// Set the redirection for stderr for the next call (only).
+    ///
+    /// The register for a file redirection is not consumed.
+    RedirectErr { mode: RedirectMode },
+    /// Throw an error if stderr wasn't redirected in the given stream. `src` is preserved.
+    CheckErrRedirected { src: RegId },
+    /// Open a file for redirection, pushing it onto the file stack.
+    OpenFile {
+        file_num: u32,
+        path: RegId,
+        append: bool,
+    },
+    /// Write data from the register to a file. This is done to finish a file redirection, in case
+    /// an internal command or expression was evaluated rather than an external one.
+    WriteFile { file_num: u32, src: RegId },
+    /// Pop a file used for redirection from the file stack.
+    CloseFile { file_num: u32 },
+    /// Make a call. The input is taken from `src_dst`, and the output is placed in `src_dst`,
+    /// overwriting it. The argument stack is used implicitly and cleared when the call ends.
+    Call { decl_id: DeclId, src_dst: RegId },
+    /// Append a value onto the end of a string. Uses `to_expanded_string(", ", ...)` on the value.
+    /// Used for string interpolation literals. Not the same thing as the `++` operator.
+    StringAppend { src_dst: RegId, val: RegId },
+    /// Convert a string into a glob. Used for glob interpolation and setting glob variables. If the
+    /// value is already a glob, it won't be modified (`no_expand` will have no effect).
+    GlobFrom { src_dst: RegId, no_expand: bool },
+    /// Push a value onto the end of a list. Used to construct list literals.
+    ListPush { src_dst: RegId, item: RegId },
+    /// Spread a value onto the end of a list. Used to construct list literals.
+    ListSpread { src_dst: RegId, items: RegId },
+    /// Insert a key-value pair into a record. Used to construct record literals. Raises an error if
+    /// the key already existed in the record.
+    RecordInsert {
+        src_dst: RegId,
+        key: RegId,
+        val: RegId,
+    },
+    /// Spread a record onto a record. Used to construct record literals. Any existing value for the
+    /// key is overwritten.
+    RecordSpread { src_dst: RegId, items: RegId },
+    /// Negate a boolean.
+    Not { src_dst: RegId },
+    /// Do a binary operation on `lhs_dst` (left) and `rhs` (right) and write the result to
+    /// `lhs_dst`.
+    BinaryOp {
+        lhs_dst: RegId,
+        op: Operator,
+        rhs: RegId,
+    },
+    /// Follow a cell path on the value in `src_dst`, storing the result back to `src_dst`
+    FollowCellPath { src_dst: RegId, path: RegId },
+    /// Clone the value at a cell path in `src`, storing the result to `dst`. The original value
+    /// remains in `src`. Must be a collected value.
+    CloneCellPath { dst: RegId, src: RegId, path: RegId },
+    /// Update/insert a cell path to `new_value` on the value in `src_dst`, storing the modified
+    /// value back to `src_dst`
+    UpsertCellPath {
+        src_dst: RegId,
+        path: RegId,
+        new_value: RegId,
+    },
+    /// Jump to an offset in this block
+    Jump { index: usize },
+    /// Branch to an offset in this block if the value of the `cond` register is a true boolean,
+    /// otherwise continue execution
+    BranchIf { cond: RegId, index: usize },
+    /// Branch to an offset in this block if the value of the `src` register is Empty or Nothing,
+    /// otherwise continue execution. The original value in `src` is preserved.
+    BranchIfEmpty { src: RegId, index: usize },
+    /// Match a pattern on `src`. If the pattern matches, branch to `index` after having set any
+    /// variables captured by the pattern. If the pattern doesn't match, continue execution. The
+    /// original value is preserved in `src` through this instruction.
+    Match {
+        pattern: Box<Pattern>,
+        src: RegId,
+        index: usize,
+    },
+    /// Check that a match guard is a boolean, throwing
+    /// [`MatchGuardNotBool`](crate::ShellError::MatchGuardNotBool) if it isn't. Preserves `src`.
+    CheckMatchGuard { src: RegId },
+    /// Iterate on register `stream`, putting the next value in `dst` if present, or jumping to
+    /// `end_index` if the iterator is finished
+    Iterate {
+        dst: RegId,
+        stream: RegId,
+        end_index: usize,
+    },
+    /// Push an error handler, without capturing the error value
+    OnError { index: usize },
+    /// Push an error handler, capturing the error value into `dst`. If the error handler is not
+    /// called, the register should be freed manually.
+    OnErrorInto { index: usize, dst: RegId },
+    /// Pop an error handler. This is not necessary when control flow is directed to the error
+    /// handler due to an error.
+    PopErrorHandler,
+    /// Check if an external command failed. Boolean value into `dst`. `src` is preserved, but it
+    /// does require waiting for the command to exit.
+    CheckExternalFailed { dst: RegId, src: RegId },
+    /// Return early from the block, raising a `ShellError::Return` instead.
+    ///
+    /// Collecting the value is unavoidable.
+    ReturnEarly { src: RegId },
+    /// Return from the block with the value in the register
+    Return { src: RegId },
+}
+
+impl Instruction {
+    /// Returns a value that can be formatted with [`Display`](std::fmt::Display) to show a detailed
+    /// listing of the instruction.
+    pub fn display<'a>(
+        &'a self,
+        engine_state: &'a EngineState,
+        data: &'a [u8],
+    ) -> FmtInstruction<'a> {
+        FmtInstruction {
+            engine_state,
+            instruction: self,
+            data,
+        }
+    }
+
+    /// Returns the branch target index of the instruction if this is a branching instruction.
+    pub fn branch_target(&self) -> Option<usize> {
+        match self {
+            Instruction::Jump { index } => Some(*index),
+            Instruction::BranchIf { cond: _, index } => Some(*index),
+            Instruction::BranchIfEmpty { src: _, index } => Some(*index),
+            Instruction::Match {
+                pattern: _,
+                src: _,
+                index,
+            } => Some(*index),
+
+            Instruction::Iterate {
+                dst: _,
+                stream: _,
+                end_index,
+            } => Some(*end_index),
+            Instruction::OnError { index } => Some(*index),
+            Instruction::OnErrorInto { index, dst: _ } => Some(*index),
+            _ => None,
+        }
+    }
+
+    /// Sets the branch target of the instruction if this is a branching instruction.
+    ///
+    /// Returns `Err(target_index)` if it isn't a branching instruction.
+    pub fn set_branch_target(&mut self, target_index: usize) -> Result<(), usize> {
+        match self {
+            Instruction::Jump { index } => *index = target_index,
+            Instruction::BranchIf { cond: _, index } => *index = target_index,
+            Instruction::BranchIfEmpty { src: _, index } => *index = target_index,
+            Instruction::Match {
+                pattern: _,
+                src: _,
+                index,
+            } => *index = target_index,
+
+            Instruction::Iterate {
+                dst: _,
+                stream: _,
+                end_index,
+            } => *end_index = target_index,
+            Instruction::OnError { index } => *index = target_index,
+            Instruction::OnErrorInto { index, dst: _ } => *index = target_index,
+            _ => return Err(target_index),
+        }
+        Ok(())
+    }
+}
+
+// This is to document/enforce the size of `Instruction` in bytes.
+// We should try to avoid increasing the size of `Instruction`,
+// and PRs that do so will have to change the number below so that it's noted in review.
+const _: () = assert!(std::mem::size_of::<Instruction>() <= 24);
+
+/// A literal value that can be embedded in an instruction.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum Literal {
+    Bool(bool),
+    Int(i64),
+    Float(f64),
+    Filesize(i64),
+    Duration(i64),
+    Binary(DataSlice),
+    Block(BlockId),
+    Closure(BlockId),
+    RowCondition(BlockId),
+    Range {
+        start: RegId,
+        step: RegId,
+        end: RegId,
+        inclusion: RangeInclusion,
+    },
+    List {
+        capacity: usize,
+    },
+    Record {
+        capacity: usize,
+    },
+    Filepath {
+        val: DataSlice,
+        no_expand: bool,
+    },
+    Directory {
+        val: DataSlice,
+        no_expand: bool,
+    },
+    GlobPattern {
+        val: DataSlice,
+        no_expand: bool,
+    },
+    String(DataSlice),
+    RawString(DataSlice),
+    CellPath(Box<CellPath>),
+    Date(Box<DateTime<FixedOffset>>),
+    Nothing,
+}
+
+/// A redirection mode for the next call. See [`OutDest`](crate::OutDest).
+///
+/// This is generated by:
+///
+/// 1. Explicit redirection in a [`PipelineElement`](crate::ast::PipelineElement), or
+/// 2. The [`pipe_redirection()`](crate::engine::Command::pipe_redirection) of the command being
+///    piped into.
+///
+/// Not setting it uses the default, determined by [`Stack`](crate::engine::Stack).
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
+pub enum RedirectMode {
+    Pipe,
+    Capture,
+    Null,
+    Inherit,
+    /// Use the given numbered file.
+    File {
+        file_num: u32,
+    },
+    /// Use the redirection mode requested by the caller, for a pre-return call.
+    Caller,
+}
+
+/// Just a hack to allow `Arc<[u8]>` to be serialized and deserialized
+mod serde_arc_u8_array {
+    use serde::{Deserialize, Serialize};
+    use std::sync::Arc;
+
+    pub fn serialize<S>(data: &Arc<[u8]>, ser: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        data.as_ref().serialize(ser)
+    }
+
+    pub fn deserialize<'de, D>(de: D) -> Result<Arc<[u8]>, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        let data: Vec<u8> = Deserialize::deserialize(de)?;
+        Ok(data.into())
+    }
+}
diff --git a/crates/nu-protocol/src/lib.rs b/crates/nu-protocol/src/lib.rs
index 9c176953d5..cae5d3fd0a 100644
--- a/crates/nu-protocol/src/lib.rs
+++ b/crates/nu-protocol/src/lib.rs
@@ -9,6 +9,7 @@ pub mod eval_base;
 pub mod eval_const;
 mod example;
 mod id;
+pub mod ir;
 mod lev_distance;
 mod module;
 pub mod parser_path;
diff --git a/crates/nu-protocol/src/pipeline/byte_stream.rs b/crates/nu-protocol/src/pipeline/byte_stream.rs
index 6226f1d8db..cd62b70801 100644
--- a/crates/nu-protocol/src/pipeline/byte_stream.rs
+++ b/crates/nu-protocol/src/pipeline/byte_stream.rs
@@ -352,6 +352,12 @@ impl ByteStream {
         self.span
     }
 
+    /// Changes the [`Span`] associated with the [`ByteStream`].
+    pub fn with_span(mut self, span: Span) -> Self {
+        self.span = span;
+        self
+    }
+
     /// Returns the [`ByteStreamType`] associated with the [`ByteStream`].
     pub fn type_(&self) -> ByteStreamType {
         self.type_
diff --git a/crates/nu-protocol/src/pipeline/list_stream.rs b/crates/nu-protocol/src/pipeline/list_stream.rs
index 997cc3f77b..104bab6bcc 100644
--- a/crates/nu-protocol/src/pipeline/list_stream.rs
+++ b/crates/nu-protocol/src/pipeline/list_stream.rs
@@ -31,11 +31,22 @@ impl ListStream {
         self.span
     }
 
+    /// Changes the [`Span`] associated with this [`ListStream`].
+    pub fn with_span(mut self, span: Span) -> Self {
+        self.span = span;
+        self
+    }
+
     /// Convert a [`ListStream`] into its inner [`Value`] `Iterator`.
     pub fn into_inner(self) -> ValueIterator {
         self.stream
     }
 
+    /// Take a single value from the inner `Iterator`, modifying the stream.
+    pub fn next_value(&mut self) -> Option<Value> {
+        self.stream.next()
+    }
+
     /// Converts each value in a [`ListStream`] into a string and then joins the strings together
     /// using the given separator.
     pub fn into_string(self, separator: &str, config: &Config) -> String {
diff --git a/crates/nu-protocol/src/pipeline/pipeline_data.rs b/crates/nu-protocol/src/pipeline/pipeline_data.rs
index a546e90191..a89337a6c2 100644
--- a/crates/nu-protocol/src/pipeline/pipeline_data.rs
+++ b/crates/nu-protocol/src/pipeline/pipeline_data.rs
@@ -96,6 +96,24 @@ impl PipelineData {
         }
     }
 
+    /// Change the span of the [`PipelineData`].
+    ///
+    /// Returns `Value(Nothing)` with the given span if it was [`PipelineData::Empty`].
+    pub fn with_span(self, span: Span) -> Self {
+        match self {
+            PipelineData::Empty => PipelineData::Value(Value::nothing(span), None),
+            PipelineData::Value(value, metadata) => {
+                PipelineData::Value(value.with_span(span), metadata)
+            }
+            PipelineData::ListStream(stream, metadata) => {
+                PipelineData::ListStream(stream.with_span(span), metadata)
+            }
+            PipelineData::ByteStream(stream, metadata) => {
+                PipelineData::ByteStream(stream.with_span(span), metadata)
+            }
+        }
+    }
+
     /// Get a type that is representative of the `PipelineData`.
     ///
     /// The type returned here makes no effort to collect a stream, so it may be a different type
@@ -129,7 +147,8 @@ impl PipelineData {
     /// without consuming input and without writing anything.
     ///
     /// For the other [`OutDest`]s, the given `PipelineData` will be completely consumed
-    /// and `PipelineData::Empty` will be returned.
+    /// and `PipelineData::Empty` will be returned, unless the data is from an external stream,
+    /// in which case an external stream containing only that exit code will be returned.
     pub fn write_to_out_dests(
         self,
         engine_state: &EngineState,
@@ -137,7 +156,11 @@ impl PipelineData {
     ) -> Result<PipelineData, ShellError> {
         match (self, stack.stdout()) {
             (PipelineData::ByteStream(stream, ..), stdout) => {
-                stream.write_to_out_dests(stdout, stack.stderr())?;
+                if let Some(exit_status) = stream.write_to_out_dests(stdout, stack.stderr())? {
+                    return Ok(PipelineData::new_external_stream_with_only_exit_code(
+                        exit_status.code(),
+                    ));
+                }
             }
             (data, OutDest::Pipe | OutDest::Capture) => return Ok(data),
             (PipelineData::Empty, ..) => {}
@@ -570,7 +593,7 @@ impl PipelineData {
                         self.write_all_and_flush(engine_state, no_newline, to_stderr)
                     } else {
                         let call = Call::new(Span::new(0, 0));
-                        let table = command.run(engine_state, stack, &call, self)?;
+                        let table = command.run(engine_state, stack, &(&call).into(), self)?;
                         table.write_all_and_flush(engine_state, no_newline, to_stderr)
                     }
                 } else {
diff --git a/crates/nu-protocol/src/signature.rs b/crates/nu-protocol/src/signature.rs
index 70e94b35f1..5928ce0c0c 100644
--- a/crates/nu-protocol/src/signature.rs
+++ b/crates/nu-protocol/src/signature.rs
@@ -1,6 +1,5 @@
 use crate::{
-    ast::Call,
-    engine::{Command, CommandType, EngineState, Stack},
+    engine::{Call, Command, CommandType, EngineState, Stack},
     BlockId, PipelineData, ShellError, SyntaxShape, Type, Value, VarId,
 };
 use serde::{Deserialize, Serialize};
diff --git a/crates/nu-protocol/src/span.rs b/crates/nu-protocol/src/span.rs
index 0d280eaa9d..f5bcebc543 100644
--- a/crates/nu-protocol/src/span.rs
+++ b/crates/nu-protocol/src/span.rs
@@ -53,6 +53,22 @@ impl<T> Spanned<T> {
     }
 }
 
+impl<T, E> Spanned<Result<T, E>> {
+    /// Move the `Result` to the outside, resulting in a spanned `Ok` or unspanned `Err`.
+    pub fn transpose(self) -> Result<Spanned<T>, E> {
+        match self {
+            Spanned {
+                item: Ok(item),
+                span,
+            } => Ok(Spanned { item, span }),
+            Spanned {
+                item: Err(err),
+                span: _,
+            } => Err(err),
+        }
+    }
+}
+
 /// Helper trait to create [`Spanned`] more ergonomically.
 pub trait IntoSpanned: Sized {
     /// Wrap items together with a span into [`Spanned`].
diff --git a/crates/nu-test-support/src/macros.rs b/crates/nu-test-support/src/macros.rs
index e83b4354da..958a2453f5 100644
--- a/crates/nu-test-support/src/macros.rs
+++ b/crates/nu-test-support/src/macros.rs
@@ -247,6 +247,7 @@ pub struct NuOpts {
     pub locale: Option<String>,
     pub envs: Option<Vec<(String, String)>>,
     pub collapse_output: Option<bool>,
+    pub use_ir: Option<bool>,
 }
 
 pub fn nu_run_test(opts: NuOpts, commands: impl AsRef<str>, with_std: bool) -> Outcome {
@@ -296,6 +297,15 @@ pub fn nu_run_test(opts: NuOpts, commands: impl AsRef<str>, with_std: bool) -> O
         .stdout(Stdio::piped())
         .stderr(Stdio::piped());
 
+    // Explicitly set NU_USE_IR
+    if let Some(use_ir) = opts.use_ir {
+        if use_ir {
+            command.env("NU_USE_IR", "1");
+        } else {
+            command.env_remove("NU_USE_IR");
+        }
+    }
+
     // Uncomment to debug the command being run:
     // println!("=== command\n{command:?}\n");
 
@@ -373,6 +383,7 @@ where
     if !executable_path.exists() {
         executable_path = crate::fs::installed_nu_path();
     }
+
     let process = match setup_command(&executable_path, &target_cwd)
         .envs(envs)
         .arg("--commands")
diff --git a/src/run.rs b/src/run.rs
index 6bb02451b9..10a5043b25 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -26,6 +26,10 @@ pub(crate) fn run_commands(
     let mut stack = Stack::new();
     let start_time = std::time::Instant::now();
 
+    if stack.has_env_var(engine_state, "NU_USE_IR") {
+        stack.use_ir = true;
+    }
+
     // if the --no-config-file(-n) option is NOT passed, load the plugin file,
     // load the default env file or custom (depending on parsed_nu_cli_args.env_file),
     // and maybe a custom config file (depending on parsed_nu_cli_args.config_file)
@@ -109,6 +113,10 @@ pub(crate) fn run_file(
     trace!("run_file");
     let mut stack = Stack::new();
 
+    if stack.has_env_var(engine_state, "NU_USE_IR") {
+        stack.use_ir = true;
+    }
+
     // if the --no-config-file(-n) option is NOT passed, load the plugin file,
     // load the default env file or custom (depending on parsed_nu_cli_args.env_file),
     // and maybe a custom config file (depending on parsed_nu_cli_args.config_file)
@@ -184,6 +192,10 @@ pub(crate) fn run_repl(
     let mut stack = Stack::new();
     let start_time = std::time::Instant::now();
 
+    if stack.has_env_var(engine_state, "NU_USE_IR") {
+        stack.use_ir = true;
+    }
+
     if parsed_nu_cli_args.no_config_file.is_none() {
         setup_config(
             engine_state,
diff --git a/tests/eval/mod.rs b/tests/eval/mod.rs
index f3af92376a..e9afd401e9 100644
--- a/tests/eval/mod.rs
+++ b/tests/eval/mod.rs
@@ -1,7 +1,8 @@
-use nu_test_support::nu;
+use nu_test_support::{nu, playground::Playground};
+use regex::Regex;
 
 #[test]
-fn source_file_relative_to_file() {
+fn record_with_redefined_key() {
     let actual = nu!("{x: 1, x: 2}");
 
     assert!(actual.err.contains("redefined"));
@@ -16,3 +17,455 @@ fn run_file_parse_error() {
 
     assert!(actual.err.contains("unknown type"));
 }
+
+enum ExpectedOut<'a> {
+    /// Equals a string exactly
+    Eq(&'a str),
+    /// Matches a regex
+    Matches(&'a str),
+    /// Produces an error (match regex)
+    Error(&'a str),
+    /// Drops a file that contains these contents
+    FileEq(&'a str, &'a str),
+}
+use self::ExpectedOut::*;
+
+fn test_eval(source: &str, expected_out: ExpectedOut) {
+    Playground::setup("test_eval_ast", |ast_dirs, _playground| {
+        Playground::setup("test_eval_ir", |ir_dirs, _playground| {
+            let actual_ast = nu!(
+                cwd: ast_dirs.test(),
+                use_ir: false,
+                source,
+            );
+            let actual_ir = nu!(
+                cwd: ir_dirs.test(),
+                use_ir: true,
+                source,
+            );
+
+            match expected_out {
+                Eq(eq) => {
+                    assert_eq!(actual_ast.out, eq);
+                    assert_eq!(actual_ir.out, eq);
+                    assert!(actual_ast.status.success());
+                    assert!(actual_ir.status.success());
+                }
+                Matches(regex) => {
+                    let compiled_regex = Regex::new(regex).expect("regex failed to compile");
+                    assert!(
+                        compiled_regex.is_match(&actual_ast.out),
+                        "AST eval out does not match: {}\n{}",
+                        regex,
+                        actual_ast.out
+                    );
+                    assert!(
+                        compiled_regex.is_match(&actual_ir.out),
+                        "IR eval out does not match: {}\n{}",
+                        regex,
+                        actual_ir.out,
+                    );
+                    assert!(actual_ast.status.success());
+                    assert!(actual_ir.status.success());
+                }
+                Error(regex) => {
+                    let compiled_regex = Regex::new(regex).expect("regex failed to compile");
+                    assert!(
+                        compiled_regex.is_match(&actual_ast.err),
+                        "AST eval err does not match: {}",
+                        regex
+                    );
+                    assert!(
+                        compiled_regex.is_match(&actual_ir.err),
+                        "IR eval err does not match: {}",
+                        regex
+                    );
+                    assert!(!actual_ast.status.success());
+                    assert!(!actual_ir.status.success());
+                }
+                FileEq(path, contents) => {
+                    let ast_contents = std::fs::read_to_string(ast_dirs.test().join(path))
+                        .expect("failed to read AST file");
+                    let ir_contents = std::fs::read_to_string(ir_dirs.test().join(path))
+                        .expect("failed to read IR file");
+                    assert_eq!(ast_contents.trim(), contents);
+                    assert_eq!(ir_contents.trim(), contents);
+                    assert!(actual_ast.status.success());
+                    assert!(actual_ir.status.success());
+                }
+            }
+            assert_eq!(actual_ast.out, actual_ir.out);
+        })
+    });
+}
+
+#[test]
+fn literal_bool() {
+    test_eval("true", Eq("true"))
+}
+
+#[test]
+fn literal_int() {
+    test_eval("1", Eq("1"))
+}
+
+#[test]
+fn literal_float() {
+    test_eval("1.5", Eq("1.5"))
+}
+
+#[test]
+fn literal_filesize() {
+    test_eval("30MiB", Eq("30.0 MiB"))
+}
+
+#[test]
+fn literal_duration() {
+    test_eval("30ms", Eq("30ms"))
+}
+
+#[test]
+fn literal_binary() {
+    test_eval("0x[1f 2f f0]", Matches("Length.*1f.*2f.*f0"))
+}
+
+#[test]
+fn literal_closure() {
+    test_eval("{||}", Matches("<Closure"))
+}
+
+#[test]
+fn literal_range() {
+    test_eval("0..2..10", Matches("10"))
+}
+
+#[test]
+fn literal_list() {
+    test_eval("[foo bar baz]", Matches("foo.*bar.*baz"))
+}
+
+#[test]
+fn literal_record() {
+    test_eval("{foo: bar, baz: quux}", Matches("foo.*bar.*baz.*quux"))
+}
+
+#[test]
+fn literal_table() {
+    test_eval("[[a b]; [1 2] [3 4]]", Matches("a.*b.*1.*2.*3.*4"))
+}
+
+#[test]
+fn literal_string() {
+    test_eval(r#""foobar""#, Eq("foobar"))
+}
+
+#[test]
+fn literal_raw_string() {
+    test_eval(r#"r#'bazquux'#"#, Eq("bazquux"))
+}
+
+#[test]
+fn literal_date() {
+    test_eval("2020-01-01T00:00:00Z", Matches("2020"))
+}
+
+#[test]
+fn literal_nothing() {
+    test_eval("null", Eq(""))
+}
+
+#[test]
+fn list_spread() {
+    test_eval("[foo bar ...[baz quux]] | length", Eq("4"))
+}
+
+#[test]
+fn record_spread() {
+    test_eval("{foo: bar ...{baz: quux}} | columns | length", Eq("2"))
+}
+
+#[test]
+fn binary_op_example() {
+    test_eval(
+        "(([1 2] ++ [3 4]) == [1 2 3 4]) and (([1 2 3] ++ 4) == ([1] ++ [2 3 4]))",
+        Eq("true"),
+    )
+}
+
+#[test]
+fn range_from_expressions() {
+    test_eval("(1 + 1)..(2 + 2)", Matches("2.*3.*4"))
+}
+
+#[test]
+fn list_from_expressions() {
+    test_eval(
+        "[('foo' | str upcase) ('BAR' | str downcase)]",
+        Matches("FOO.*bar"),
+    )
+}
+
+#[test]
+fn record_from_expressions() {
+    test_eval("{('foo' | str upcase): 42}", Matches("FOO.*42"))
+}
+
+#[test]
+fn call_spread() {
+    test_eval(
+        "echo foo bar ...[baz quux nushell]",
+        Matches("foo.*bar.*baz.*quux.*nushell"),
+    )
+}
+
+#[test]
+fn call_flag() {
+    test_eval("print -e message", Eq("")) // should not be visible on stdout
+}
+
+#[test]
+fn call_named() {
+    test_eval("10.123 | into string --decimals 1", Eq("10.1"))
+}
+
+#[test]
+fn external_call() {
+    test_eval("nu --testbin cococo foo=bar baz", Eq("foo=bar baz"))
+}
+
+#[test]
+fn external_call_redirect_pipe() {
+    test_eval(
+        "nu --testbin cococo foo=bar baz | str upcase",
+        Eq("FOO=BAR BAZ"),
+    )
+}
+
+#[test]
+fn external_call_redirect_capture() {
+    test_eval(
+        "echo (nu --testbin cococo foo=bar baz) | str upcase",
+        Eq("FOO=BAR BAZ"),
+    )
+}
+
+#[test]
+fn external_call_redirect_file() {
+    test_eval(
+        "nu --testbin cococo hello out> hello.txt",
+        FileEq("hello.txt", "hello"),
+    )
+}
+
+#[test]
+fn let_variable() {
+    test_eval("let foo = 'test'; print $foo", Eq("test"))
+}
+
+#[test]
+fn let_variable_mutate_error() {
+    test_eval(
+        "let foo = 'test'; $foo = 'bar'; print $foo",
+        Error("immutable"),
+    )
+}
+
+#[test]
+fn constant() {
+    test_eval("const foo = 1 + 2; print $foo", Eq("3"))
+}
+
+#[test]
+fn constant_assign_error() {
+    test_eval(
+        "const foo = 1 + 2; $foo = 4; print $foo",
+        Error("immutable"),
+    )
+}
+
+#[test]
+fn mut_variable() {
+    test_eval("mut foo = 'test'; $foo = 'bar'; print $foo", Eq("bar"))
+}
+
+#[test]
+fn mut_variable_append_assign() {
+    test_eval(
+        "mut foo = 'test'; $foo ++= 'bar'; print $foo",
+        Eq("testbar"),
+    )
+}
+
+#[test]
+fn bind_in_variable_to_input() {
+    test_eval("3 | (4 + $in)", Eq("7"))
+}
+
+#[test]
+fn if_true() {
+    test_eval("if true { 'foo' }", Eq("foo"))
+}
+
+#[test]
+fn if_false() {
+    test_eval("if false { 'foo' } | describe", Eq("nothing"))
+}
+
+#[test]
+fn if_else_true() {
+    test_eval("if 5 > 3 { 'foo' } else { 'bar' }", Eq("foo"))
+}
+
+#[test]
+fn if_else_false() {
+    test_eval("if 5 < 3 { 'foo' } else { 'bar' }", Eq("bar"))
+}
+
+#[test]
+fn match_empty_fallthrough() {
+    test_eval("match 42 { }; 'pass'", Eq("pass"))
+}
+
+#[test]
+fn match_value() {
+    test_eval("match 1 { 1 => 'pass', 2 => 'fail' }", Eq("pass"))
+}
+
+#[test]
+fn match_value_default() {
+    test_eval(
+        "match 3 { 1 => 'fail1', 2 => 'fail2', _ => 'pass' }",
+        Eq("pass"),
+    )
+}
+
+#[test]
+fn match_value_fallthrough() {
+    test_eval("match 3 { 1 => 'fail1', 2 => 'fail2' }", Eq(""))
+}
+
+#[test]
+fn match_variable() {
+    test_eval(
+        "match 'pass' { $s => { print $s }, _ => { print 'fail' } }",
+        Eq("pass"),
+    )
+}
+
+#[test]
+fn match_variable_in_list() {
+    test_eval("match [fail pass] { [$f, $p] => { print $p } }", Eq("pass"))
+}
+
+#[test]
+fn match_passthrough_input() {
+    test_eval(
+        "'yes' | match [pass fail] { [$p, ..] => (collect { |y| $y ++ $p }) }",
+        Eq("yespass"),
+    )
+}
+
+#[test]
+fn while_mutate_var() {
+    test_eval("mut x = 2; while $x > 0 { print $x; $x -= 1 }", Eq("21"))
+}
+
+#[test]
+fn for_list() {
+    test_eval("for v in [1 2 3] { print ($v * 2) }", Eq(r"246"))
+}
+
+#[test]
+fn for_seq() {
+    test_eval("for v in (seq 1 4) { print ($v * 2) }", Eq("2468"))
+}
+
+#[test]
+fn early_return() {
+    test_eval("do { return 'foo'; 'bar' }", Eq("foo"))
+}
+
+#[test]
+fn early_return_from_if() {
+    test_eval("do { if true { return 'pass' }; 'fail' }", Eq("pass"))
+}
+
+#[test]
+fn early_return_from_loop() {
+    test_eval("do { loop { return 'pass' } }", Eq("pass"))
+}
+
+#[test]
+fn early_return_from_while() {
+    test_eval(
+        "do { let x = true; while $x { return 'pass' } }",
+        Eq("pass"),
+    )
+}
+
+#[test]
+fn early_return_from_for() {
+    test_eval("do { for x in [pass fail] { return $x } }", Eq("pass"))
+}
+
+#[test]
+fn try_no_catch() {
+    test_eval("try { error make { msg: foo } }; 'pass'", Eq("pass"))
+}
+
+#[test]
+fn try_catch_no_var() {
+    test_eval(
+        "try { error make { msg: foo } } catch { 'pass' }",
+        Eq("pass"),
+    )
+}
+
+#[test]
+fn try_catch_var() {
+    test_eval(
+        "try { error make { msg: foo } } catch { |err| $err.msg }",
+        Eq("foo"),
+    )
+}
+
+#[test]
+fn try_catch_with_non_literal_closure_no_var() {
+    test_eval(
+        r#"
+            let error_handler = { || "pass" }
+            try { error make { msg: foobar } } catch $error_handler
+        "#,
+        Eq("pass"),
+    )
+}
+
+#[test]
+fn try_catch_with_non_literal_closure() {
+    test_eval(
+        r#"
+            let error_handler = { |err| $err.msg }
+            try { error make { msg: foobar } } catch $error_handler
+        "#,
+        Eq("foobar"),
+    )
+}
+
+#[test]
+fn row_condition() {
+    test_eval(
+        "[[a b]; [1 2] [3 4]] | where a < 3 | to nuon",
+        Eq("[[a, b]; [1, 2]]"),
+    )
+}
+
+#[test]
+fn custom_command() {
+    test_eval(
+        r#"
+            def cmd [a: int, b: string = 'fail', ...c: string, --x: int] { $"($a)($b)($c)($x)" }
+            cmd 42 pass foo --x 30
+        "#,
+        Eq("42pass[foo]30"),
+    )
+}

From 1a5bf2447a9a46f83b8cc86c5cac0ea1bc6f1122 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Wed, 10 Jul 2024 17:34:50 -0700
Subject: [PATCH 0205/1072] Use Arc for environment variables on the stack
 (#13333)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

This is another easy performance lift that just changes `env_vars` and
`env_hidden` on `Stack` to use `Arc`. I noticed that these were being
cloned on essentially every closure invocation during captures
gathering, so we're paying the cost for all of that even when we don't
change anything. On top of that, for `env_vars`, there's actually an
entirely fresh `HashMap` created for each child scope, so it's highly
unlikely that we'll modify the parent ones.

Uses `Arc::make_mut` instead to take care of things when we need to
mutate something, and most of the time nothing has to be cloned at all.

# Benchmarks

The benefits are greater the more calls there are to env-cloning
functions like `captures_to_stack()`. Calling custom commands in a loop
is basically best case for a performance improvement. Plain `each` with
a literal block isn't so badly affected because the stack is set up
once.

## random_bytes.nu

```nushell
use std bench
do {
  const SCRIPT = ../nu_scripts/benchmarks/random-bytes.nu
  let before_change = bench { nu $SCRIPT }
  let after_change = bench { target/release/nu $SCRIPT }
  {
    before: ($before_change | reject times),
    after: ($after_change | reject times)
  }
}
```

```
╭────────┬──────────────────────────────╮
│        │ ╭──────┬───────────────────╮ │
│ before │ │ mean │ 603ms 759µs 727ns │ │
│        │ │ min  │ 593ms 298µs 167ns │ │
│        │ │ max  │ 648ms 612µs 291ns │ │
│        │ │ std  │ 9ms 335µs 251ns   │ │
│        │ ╰──────┴───────────────────╯ │
│        │ ╭──────┬───────────────────╮ │
│ after  │ │ mean │ 518ms 400µs 557ns │ │
│        │ │ min  │ 507ms 762µs 583ns │ │
│        │ │ max  │ 566ms 695µs 166ns │ │
│        │ │ std  │ 9ms 554µs 767ns   │ │
│        │ ╰──────┴───────────────────╯ │
╰────────┴──────────────────────────────╯
```

## gradient_benchmark_no_check.nu

```nushell
use std bench
do {
  const SCRIPT = ../nu_scripts/benchmarks/gradient_benchmark_no_check.nu
  let before_change = bench { nu $SCRIPT }
  let after_change = bench { target/release/nu $SCRIPT }
  {
    before: ($before_change | reject times),
    after: ($after_change | reject times)
  }
}
```

```
╭────────┬──────────────────────────────╮
│        │ ╭──────┬───────────────────╮ │
│ before │ │ mean │ 146ms 543µs 380ns │ │
│        │ │ min  │ 142ms 416µs 166ns │ │
│        │ │ max  │ 189ms 595µs       │ │
│        │ │ std  │ 7ms 140µs 342ns   │ │
│        │ ╰──────┴───────────────────╯ │
│        │ ╭──────┬───────────────────╮ │
│ after  │ │ mean │ 134ms 211µs 678ns │ │
│        │ │ min  │ 132ms 433µs 125ns │ │
│        │ │ max  │ 135ms 722µs 583ns │ │
│        │ │ std  │ 793µs 134ns       │ │
│        │ ╰──────┴───────────────────╯ │
╰────────┴──────────────────────────────╯
```

# User-Facing Changes
Better performance, particularly for custom commands, especially if
there are a lot of environment variables. Nothing else.

# Tests + Formatting
All passing.
---
 crates/nu-engine/src/closure_eval.rs          |  4 +--
 crates/nu-protocol/src/engine/engine_state.rs |  2 +-
 crates/nu-protocol/src/engine/stack.rs        | 30 ++++++++++---------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/crates/nu-engine/src/closure_eval.rs b/crates/nu-engine/src/closure_eval.rs
index f4bc40658b..b271d90cbe 100644
--- a/crates/nu-engine/src/closure_eval.rs
+++ b/crates/nu-engine/src/closure_eval.rs
@@ -62,8 +62,8 @@ pub struct ClosureEval {
     stack: Stack,
     block: Arc<Block>,
     arg_index: usize,
-    env_vars: Vec<EnvVars>,
-    env_hidden: HashMap<String, HashSet<String>>,
+    env_vars: Vec<Arc<EnvVars>>,
+    env_hidden: Arc<HashMap<String, HashSet<String>>>,
     eval: EvalBlockWithEarlyReturnFn,
 }
 
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index d45fbafb88..f48fde663b 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -304,7 +304,7 @@ impl EngineState {
         let mut config_updated = false;
 
         for mut scope in stack.env_vars.drain(..) {
-            for (overlay_name, mut env) in scope.drain() {
+            for (overlay_name, mut env) in Arc::make_mut(&mut scope).drain() {
                 if let Some(env_vars) = Arc::make_mut(&mut self.env_vars).get_mut(&overlay_name) {
                     // Updating existing overlay
                     for (k, v) in env.drain() {
diff --git a/crates/nu-protocol/src/engine/stack.rs b/crates/nu-protocol/src/engine/stack.rs
index b289c1ae8b..9315744dfb 100644
--- a/crates/nu-protocol/src/engine/stack.rs
+++ b/crates/nu-protocol/src/engine/stack.rs
@@ -36,9 +36,9 @@ pub struct Stack {
     /// Variables
     pub vars: Vec<(VarId, Value)>,
     /// Environment variables arranged as a stack to be able to recover values from parent scopes
-    pub env_vars: Vec<EnvVars>,
+    pub env_vars: Vec<Arc<EnvVars>>,
     /// Tells which environment variables from engine state are hidden, per overlay.
-    pub env_hidden: HashMap<String, HashSet<String>>,
+    pub env_hidden: Arc<HashMap<String, HashSet<String>>>,
     /// List of active overlays
     pub active_overlays: Vec<String>,
     /// Argument stack for IR evaluation
@@ -72,7 +72,7 @@ impl Stack {
         Self {
             vars: Vec::new(),
             env_vars: Vec::new(),
-            env_hidden: HashMap::new(),
+            env_hidden: Arc::new(HashMap::new()),
             active_overlays: vec![DEFAULT_OVERLAY_NAME.to_string()],
             arguments: ArgumentStack::new(),
             error_handlers: ErrorHandlerStack::new(),
@@ -131,8 +131,8 @@ impl Stack {
 
     pub fn with_env(
         &mut self,
-        env_vars: &[EnvVars],
-        env_hidden: &HashMap<String, HashSet<String>>,
+        env_vars: &[Arc<EnvVars>],
+        env_hidden: &Arc<HashMap<String, HashSet<String>>>,
     ) {
         // Do not clone the environment if it hasn't changed
         if self.env_vars.iter().any(|scope| !scope.is_empty()) {
@@ -219,23 +219,24 @@ impl Stack {
 
     pub fn add_env_var(&mut self, var: String, value: Value) {
         if let Some(last_overlay) = self.active_overlays.last() {
-            if let Some(env_hidden) = self.env_hidden.get_mut(last_overlay) {
+            if let Some(env_hidden) = Arc::make_mut(&mut self.env_hidden).get_mut(last_overlay) {
                 // if the env var was hidden, let's activate it again
                 env_hidden.remove(&var);
             }
 
             if let Some(scope) = self.env_vars.last_mut() {
+                let scope = Arc::make_mut(scope);
                 if let Some(env_vars) = scope.get_mut(last_overlay) {
                     env_vars.insert(var, value);
                 } else {
                     scope.insert(last_overlay.into(), [(var, value)].into_iter().collect());
                 }
             } else {
-                self.env_vars.push(
+                self.env_vars.push(Arc::new(
                     [(last_overlay.into(), [(var, value)].into_iter().collect())]
                         .into_iter()
                         .collect(),
-                );
+                ));
             }
         } else {
             // TODO: Remove panic
@@ -257,9 +258,8 @@ impl Stack {
     }
 
     pub fn captures_to_stack_preserve_out_dest(&self, captures: Vec<(VarId, Value)>) -> Stack {
-        // FIXME: this is probably slow
         let mut env_vars = self.env_vars.clone();
-        env_vars.push(HashMap::new());
+        env_vars.push(Arc::new(HashMap::new()));
 
         Stack {
             vars: captures,
@@ -292,7 +292,7 @@ impl Stack {
         }
 
         let mut env_vars = self.env_vars.clone();
-        env_vars.push(HashMap::new());
+        env_vars.push(Arc::new(HashMap::new()));
 
         Stack {
             vars,
@@ -462,6 +462,7 @@ impl Stack {
 
     pub fn remove_env_var(&mut self, engine_state: &EngineState, name: &str) -> bool {
         for scope in self.env_vars.iter_mut().rev() {
+            let scope = Arc::make_mut(scope);
             for active_overlay in self.active_overlays.iter().rev() {
                 if let Some(env_vars) = scope.get_mut(active_overlay) {
                     if env_vars.remove(name).is_some() {
@@ -474,10 +475,11 @@ impl Stack {
         for active_overlay in self.active_overlays.iter().rev() {
             if let Some(env_vars) = engine_state.env_vars.get(active_overlay) {
                 if env_vars.get(name).is_some() {
-                    if let Some(env_hidden) = self.env_hidden.get_mut(active_overlay) {
-                        env_hidden.insert(name.into());
+                    let env_hidden = Arc::make_mut(&mut self.env_hidden);
+                    if let Some(env_hidden_in_overlay) = env_hidden.get_mut(active_overlay) {
+                        env_hidden_in_overlay.insert(name.into());
                     } else {
-                        self.env_hidden
+                        env_hidden
                             .insert(active_overlay.into(), [name.into()].into_iter().collect());
                     }
 

From ac561b1b0e65e9fd6ee6e682a08abb919983b0da Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Wed, 10 Jul 2024 20:19:06 -0500
Subject: [PATCH 0206/1072] quick fix up for ir pr as_refs (#13340)

# Description

Was having an issue compiling main after the IR pr. Talked to devyn and
he led me to change a couple things real quick and we're compiling once
again.
---
 crates/nu-engine/src/eval_ir.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index a505c9be34..e2ec7ccdac 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -1275,7 +1275,7 @@ fn get_env_var_case_insensitive<'a>(ctx: &'a mut EvalContext<'_>, key: &str) ->
         .env_vars
         .iter()
         .rev()
-        .chain(std::iter::once(ctx.engine_state.env_vars.as_ref()))
+        .chain(std::iter::once(&ctx.engine_state.env_vars))
         .flat_map(|overlays| {
             // Read overlays in order
             ctx.stack
@@ -1303,7 +1303,7 @@ fn get_env_var_name_case_insensitive<'a>(ctx: &mut EvalContext<'_>, key: &'a str
         .env_vars
         .iter()
         .rev()
-        .chain(std::iter::once(ctx.engine_state.env_vars.as_ref()))
+        .chain(std::iter::once(&ctx.engine_state.env_vars))
         .flat_map(|overlays| {
             // Read overlays in order
             ctx.stack

From f87cf895c2062cb5d71e97cd3221d101c825c8af Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Wed, 10 Jul 2024 19:13:35 -0700
Subject: [PATCH 0207/1072] Set the capacity of the Vec used in
 `gather_captures()` to the number of captures expected (#13339)

# Description

Just more efficient allocation during `Stack::gather_captures()` so that
we don't have to grow the `Vec` needlessly.

# User-Facing Changes
Slightly better performance.
---
 crates/nu-protocol/src/engine/stack.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-protocol/src/engine/stack.rs b/crates/nu-protocol/src/engine/stack.rs
index 9315744dfb..e963227ca8 100644
--- a/crates/nu-protocol/src/engine/stack.rs
+++ b/crates/nu-protocol/src/engine/stack.rs
@@ -277,7 +277,7 @@ impl Stack {
     }
 
     pub fn gather_captures(&self, engine_state: &EngineState, captures: &[VarId]) -> Stack {
-        let mut vars = vec![];
+        let mut vars = Vec::with_capacity(captures.len());
 
         let fake_span = Span::new(0, 0);
 

From 801cfae279cb384ecef137caab0b77d899a26b44 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Wed, 10 Jul 2024 19:14:05 -0700
Subject: [PATCH 0208/1072] Avoid clone in `Signature::get_positional()`
 (#13338)

# Description
`Signature::get_positional()` was returning an owned `PositionalArg`,
which contains a bunch of strings. `ClosureEval` uses this in
`try_add_arg`, making all of that unnecessary cloning a little bit hot.

# User-Facing Changes
Slightly better performance
---
 crates/nu-protocol/src/signature.rs        | 7 +++----
 crates/nu-protocol/tests/test_signature.rs | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/crates/nu-protocol/src/signature.rs b/crates/nu-protocol/src/signature.rs
index 5928ce0c0c..3241b0df22 100644
--- a/crates/nu-protocol/src/signature.rs
+++ b/crates/nu-protocol/src/signature.rs
@@ -485,15 +485,14 @@ impl Signature {
         (name, s)
     }
 
-    pub fn get_positional(&self, position: usize) -> Option<PositionalArg> {
+    pub fn get_positional(&self, position: usize) -> Option<&PositionalArg> {
         if position < self.required_positional.len() {
-            self.required_positional.get(position).cloned()
+            self.required_positional.get(position)
         } else if position < (self.required_positional.len() + self.optional_positional.len()) {
             self.optional_positional
                 .get(position - self.required_positional.len())
-                .cloned()
         } else {
-            self.rest_positional.clone()
+            self.rest_positional.as_ref()
         }
     }
 
diff --git a/crates/nu-protocol/tests/test_signature.rs b/crates/nu-protocol/tests/test_signature.rs
index e22029bab9..8faf772c38 100644
--- a/crates/nu-protocol/tests/test_signature.rs
+++ b/crates/nu-protocol/tests/test_signature.rs
@@ -39,7 +39,7 @@ fn test_signature_chained() {
 
     assert_eq!(
         signature.get_positional(0),
-        Some(PositionalArg {
+        Some(&PositionalArg {
             name: "required".to_string(),
             desc: "required description".to_string(),
             shape: SyntaxShape::String,
@@ -49,7 +49,7 @@ fn test_signature_chained() {
     );
     assert_eq!(
         signature.get_positional(1),
-        Some(PositionalArg {
+        Some(&PositionalArg {
             name: "optional".to_string(),
             desc: "optional description".to_string(),
             shape: SyntaxShape::String,
@@ -59,7 +59,7 @@ fn test_signature_chained() {
     );
     assert_eq!(
         signature.get_positional(2),
-        Some(PositionalArg {
+        Some(&PositionalArg {
             name: "rest".to_string(),
             desc: "rest description".to_string(),
             shape: SyntaxShape::String,

From d97512df8ed4277ade59dd49fc94ee32b8c5cf62 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Thu, 11 Jul 2024 04:00:59 -0700
Subject: [PATCH 0209/1072] Fix the signature of `view ir` (#13342)

# Description

Fix `view ir` to use `Signature::build()` rather than `new()`, which is
required for `--help` to work. Also add `Category::Debug`, as that's
most appropriate.
---
 crates/nu-command/src/debug/view_ir.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/debug/view_ir.rs b/crates/nu-command/src/debug/view_ir.rs
index df4f6cad6b..2bbe0db020 100644
--- a/crates/nu-command/src/debug/view_ir.rs
+++ b/crates/nu-command/src/debug/view_ir.rs
@@ -10,7 +10,7 @@ impl Command for ViewIr {
     }
 
     fn signature(&self) -> Signature {
-        Signature::new(self.name())
+        Signature::build(self.name())
             .required(
                 "closure",
                 SyntaxShape::Closure(None),
@@ -22,6 +22,7 @@ impl Command for ViewIr {
                 Some('j'),
             )
             .input_output_type(Type::Nothing, Type::String)
+            .category(Category::Debug)
     }
 
     fn usage(&self) -> &str {

From 9de7f931c006498817d8cb67cd21d5acfe7fabed Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Thu, 11 Jul 2024 04:05:06 -0700
Subject: [PATCH 0210/1072] Add more argument types to `view ir` (#13343)

# Description

Add a few more options to `view ir` for finding blocks, which I found
myself wanting while trying to trace through the generated code.

If we end up adding support for plugins to call commands that are in
scope by name, this will also make it possible for
`nu_plugin_explore_ir` to just step through IR automatically (by passing
the block/decl ids) without exposing too many internals. With that I
could potentially add keys that allow you to step in to closures or
decls with the press of a button, just by calling `view ir --json`
appropriately.

# User-Facing Changes

- `view ir` can now take names of custom commands that are in scope.
- integer arguments are treated as block IDs, which sometimes show up in
IR (closure, block, row condition literals).
- `--decl-id` provided to treat the argument as a decl ID instead, which
is also sometimes necessary to access something that isn't in scope.
---
 crates/nu-command/src/debug/view_ir.rs | 101 +++++++++++++++++++++++--
 1 file changed, 94 insertions(+), 7 deletions(-)

diff --git a/crates/nu-command/src/debug/view_ir.rs b/crates/nu-command/src/debug/view_ir.rs
index 2bbe0db020..72136079fd 100644
--- a/crates/nu-command/src/debug/view_ir.rs
+++ b/crates/nu-command/src/debug/view_ir.rs
@@ -1,5 +1,4 @@
 use nu_engine::command_prelude::*;
-use nu_protocol::engine::Closure;
 
 #[derive(Clone)]
 pub struct ViewIr;
@@ -12,15 +11,20 @@ impl Command for ViewIr {
     fn signature(&self) -> Signature {
         Signature::build(self.name())
             .required(
-                "closure",
-                SyntaxShape::Closure(None),
-                "The closure to see compiled code for.",
+                "target",
+                SyntaxShape::Any,
+                "The name or block to view compiled code for.",
             )
             .switch(
                 "json",
                 "Dump the raw block data as JSON (unstable).",
                 Some('j'),
             )
+            .switch(
+                "decl-id",
+                "Integer is a declaration ID rather than a block ID.",
+                Some('d'),
+            )
             .input_output_type(Type::Nothing, Type::String)
             .category(Category::Debug)
     }
@@ -29,6 +33,20 @@ impl Command for ViewIr {
         "View the compiled IR code for a block of code."
     }
 
+    fn extra_usage(&self) -> &str {
+        "
+The target can be a closure, the name of a custom command, or an internal block
+ID. Closure literals within IR dumps often reference the block by ID (e.g.
+`closure(3231)`), so this provides an easy way to read the IR of any embedded
+closures.
+
+The --decl-id option is provided to use a declaration ID instead, which can be
+found on `call` instructions. This is sometimes better than using the name, as
+the declaration may not be in scope.
+"
+        .trim()
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -36,10 +54,79 @@ impl Command for ViewIr {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let closure: Closure = call.req(engine_state, stack, 0)?;
+        let target: Value = call.req(engine_state, stack, 0)?;
         let json = call.has_flag(engine_state, stack, "json")?;
+        let is_decl_id = call.has_flag(engine_state, stack, "decl-id")?;
+
+        let block_id = match target {
+            Value::Closure { ref val, .. } => val.block_id,
+            // Decl by name
+            Value::String { ref val, .. } => {
+                if let Some(decl_id) = engine_state.find_decl(val.as_bytes(), &[]) {
+                    let decl = engine_state.get_decl(decl_id);
+                    decl.block_id().ok_or_else(|| ShellError::GenericError {
+                        error: format!("Can't view IR for `{val}`"),
+                        msg: "not a custom command".into(),
+                        span: Some(target.span()),
+                        help: Some("internal commands don't have Nushell source code".into()),
+                        inner: vec![],
+                    })?
+                } else {
+                    return Err(ShellError::GenericError {
+                        error: format!("Can't view IR for `{val}`"),
+                        msg: "can't find a command with this name".into(),
+                        span: Some(target.span()),
+                        help: None,
+                        inner: vec![],
+                    });
+                }
+            }
+            // Decl by ID - IR dump always shows name of decl, but sometimes it isn't in scope
+            Value::Int { val, .. } if is_decl_id => {
+                let decl_id = val
+                    .try_into()
+                    .ok()
+                    .filter(|id| *id < engine_state.num_decls())
+                    .ok_or_else(|| ShellError::IncorrectValue {
+                        msg: "not a valid decl id".into(),
+                        val_span: target.span(),
+                        call_span: call.head,
+                    })?;
+                let decl = engine_state.get_decl(decl_id);
+                decl.block_id().ok_or_else(|| ShellError::GenericError {
+                    error: format!("Can't view IR for `{}`", decl.name()),
+                    msg: "not a custom command".into(),
+                    span: Some(target.span()),
+                    help: Some("internal commands don't have Nushell source code".into()),
+                    inner: vec![],
+                })?
+            }
+            // Block by ID - often shows up in IR
+            Value::Int { val, .. } => val.try_into().map_err(|_| ShellError::IncorrectValue {
+                msg: "not a valid block id".into(),
+                val_span: target.span(),
+                call_span: call.head,
+            })?,
+            // Pass through errors
+            Value::Error { error, .. } => return Err(*error),
+            _ => {
+                return Err(ShellError::TypeMismatch {
+                    err_message: "expected closure, string, or int".into(),
+                    span: call.head,
+                })
+            }
+        };
+
+        let Some(block) = engine_state.try_get_block(block_id) else {
+            return Err(ShellError::GenericError {
+                error: format!("Unknown block ID: {block_id}"),
+                msg: "ensure the block ID is correct and try again".into(),
+                span: Some(target.span()),
+                help: None,
+                inner: vec![],
+            });
+        };
 
-        let block = engine_state.get_block(closure.block_id);
         let ir_block = block
             .ir_block
             .as_ref()
@@ -63,7 +150,7 @@ impl Command for ViewIr {
                 .collect::<Vec<_>>();
 
             serde_json::to_string_pretty(&serde_json::json!({
-                "block_id": closure.block_id,
+                "block_id": block_id,
                 "span": block.span,
                 "ir_block": ir_block,
                 "formatted_instructions": formatted_instructions,

From 076a29ae19b8b982061c27bdd93782b898b33898 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Thu, 11 Jul 2024 13:30:12 +0200
Subject: [PATCH 0211/1072] Document public types in `nu-protocol` (#12906)

- **Doc-comment public `nu-protocol` modules**
- **Doccomment argument/signature/call stuff**
- **Doccomment cell path types**
- **Doccomment expression stuff**
- **Doccomment import patterns**
- **Doccomment pattern matching AST nodes**
---
 crates/nu-protocol/src/alias.rs               |  8 ++++-
 crates/nu-protocol/src/ast/call.rs            | 34 +++++++++++++++++--
 crates/nu-protocol/src/ast/cell_path.rs       | 19 +++++++++++
 crates/nu-protocol/src/ast/expr.rs            |  3 ++
 crates/nu-protocol/src/ast/expression.rs      |  1 +
 crates/nu-protocol/src/ast/import_pattern.rs  |  6 ++++
 crates/nu-protocol/src/ast/match_pattern.rs   | 17 ++++++++--
 crates/nu-protocol/src/ast/mod.rs             |  3 +-
 crates/nu-protocol/src/config/mod.rs          |  1 +
 crates/nu-protocol/src/debugger/mod.rs        |  1 +
 crates/nu-protocol/src/engine/mod.rs          |  1 +
 crates/nu-protocol/src/errors/cli_error.rs    |  3 ++
 crates/nu-protocol/src/eval_base.rs           |  1 +
 crates/nu-protocol/src/eval_const.rs          |  4 +++
 .../nu-protocol/src/pipeline/byte_stream.rs   |  1 +
 .../nu-protocol/src/pipeline/list_stream.rs   |  4 +++
 crates/nu-protocol/src/process/mod.rs         |  1 +
 crates/nu-protocol/src/signature.rs           |  4 +++
 crates/nu-protocol/src/span.rs                |  1 +
 crates/nu-protocol/src/value/record.rs        |  1 +
 20 files changed, 107 insertions(+), 7 deletions(-)

diff --git a/crates/nu-protocol/src/alias.rs b/crates/nu-protocol/src/alias.rs
index 8f5ea43934..701543c57b 100644
--- a/crates/nu-protocol/src/alias.rs
+++ b/crates/nu-protocol/src/alias.rs
@@ -4,10 +4,16 @@ use crate::{
     PipelineData, ShellError, Signature,
 };
 
+/// Command wrapper of an alias.
+///
+/// Our current aliases are implemented as wrapping commands
+/// This has some limitations compared to text-substitution macro aliases but can reliably use more
+/// of our machinery
 #[derive(Clone)]
 pub struct Alias {
     pub name: String,
-    pub command: Option<Box<dyn Command>>, // None if external call
+    /// Wrapped inner [`Command`]. `None` if alias of external call
+    pub command: Option<Box<dyn Command>>,
     pub wrapped_call: Expression,
     pub usage: String,
     pub extra_usage: String,
diff --git a/crates/nu-protocol/src/ast/call.rs b/crates/nu-protocol/src/ast/call.rs
index 6e8cc64a05..d26d0af300 100644
--- a/crates/nu-protocol/src/ast/call.rs
+++ b/crates/nu-protocol/src/ast/call.rs
@@ -7,12 +7,30 @@ use crate::{
     ShellError, Span, Spanned, Value,
 };
 
+/// Parsed command arguments
+///
+/// Primarily for internal commands
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub enum Argument {
+    /// A positional argument (that is not [`Argument::Spread`])
+    ///
+    /// ```nushell
+    /// my_cmd positional
+    /// ```
     Positional(Expression),
+    /// A named/flag argument that can optionally receive a [`Value`] as an [`Expression`]
+    ///
+    /// The optional second `Spanned<String>` refers to the short-flag version if used
+    /// ```nushell
+    /// my_cmd --flag
+    /// my_cmd -f
+    /// my_cmd --flag-with-value <expr>
+    /// ```
     Named((Spanned<String>, Option<Spanned<String>>, Option<Expression>)),
-    Unknown(Expression), // unknown argument used in "fall-through" signatures
-    Spread(Expression),  // a list spread to fill in rest arguments
+    /// unknown argument used in "fall-through" signatures
+    Unknown(Expression),
+    /// a list spread to fill in rest arguments
+    Spread(Expression),
 }
 
 impl Argument {
@@ -47,12 +65,24 @@ impl Argument {
     }
 }
 
+/// Argument passed to an external command
+///
+/// Here the parsing rules slightly differ to directly pass strings to the external process
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub enum ExternalArgument {
+    /// Expression that needs to be evaluated to turn into an external process argument
     Regular(Expression),
+    /// Occurrence of a `...` spread operator that needs to be expanded
     Spread(Expression),
 }
 
+/// Parsed call of a `Command`
+///
+/// As we also implement some internal keywords in terms of the `Command` trait, this type stores the passed arguments as [`Expression`].
+/// Some of its methods lazily evaluate those to [`Value`] while others return the underlying
+/// [`Expression`].
+///
+/// For further utilities check the `nu_engine::CallExt` trait that extends [`Call`]
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Call {
     /// identifier of the declaration to call
diff --git a/crates/nu-protocol/src/ast/cell_path.rs b/crates/nu-protocol/src/ast/cell_path.rs
index 3de37f3992..0880537557 100644
--- a/crates/nu-protocol/src/ast/cell_path.rs
+++ b/crates/nu-protocol/src/ast/cell_path.rs
@@ -3,16 +3,23 @@ use crate::Span;
 use serde::{Deserialize, Serialize};
 use std::{cmp::Ordering, fmt::Display};
 
+/// One level of access of a [`CellPath`]
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub enum PathMember {
+    /// Accessing a member by string (i.e. columns of a table or [`Record`](crate::Record))
     String {
         val: String,
         span: Span,
+        /// If marked as optional don't throw an error if not found but perform default handling
+        /// (e.g. return `Value::Nothing`)
         optional: bool,
     },
+    /// Accessing a member by index (i.e. row of a table or item in a list)
     Int {
         val: usize,
         span: Span,
+        /// If marked as optional don't throw an error if not found but perform default handling
+        /// (e.g. return `Value::Nothing`)
         optional: bool,
     },
 }
@@ -143,6 +150,18 @@ impl PartialOrd for PathMember {
     }
 }
 
+/// Represents the potentially nested access to fields/cells of a container type
+///
+/// In our current implementation for table access the order of row/column is commutative.
+/// This limits the number of possible rows to select in one [`CellPath`] to 1 as it could
+/// otherwise be ambiguous
+///
+/// ```nushell
+/// col1.0
+/// 0.col1
+/// col2
+/// 42
+/// ```
 #[derive(Debug, Clone, PartialEq, PartialOrd, Serialize, Deserialize)]
 pub struct CellPath {
     pub members: Vec<PathMember>,
diff --git a/crates/nu-protocol/src/ast/expr.rs b/crates/nu-protocol/src/ast/expr.rs
index 43548d39e4..fadbffc51f 100644
--- a/crates/nu-protocol/src/ast/expr.rs
+++ b/crates/nu-protocol/src/ast/expr.rs
@@ -9,6 +9,7 @@ use crate::{
     ast::ImportPattern, engine::StateWorkingSet, BlockId, OutDest, Signature, Span, VarId,
 };
 
+/// An [`Expression`] AST node
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub enum Expr {
     Bool(bool),
@@ -127,6 +128,7 @@ impl Expr {
     }
 }
 
+/// Expressions permitted inside a record expression/literal
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub enum RecordItem {
     /// A key: val mapping
@@ -135,6 +137,7 @@ pub enum RecordItem {
     Spread(Span, Expression),
 }
 
+/// Expressions permitted inside a list expression/literal
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub enum ListItem {
     /// A normal expression
diff --git a/crates/nu-protocol/src/ast/expression.rs b/crates/nu-protocol/src/ast/expression.rs
index 906fce3fe1..dfd4187a90 100644
--- a/crates/nu-protocol/src/ast/expression.rs
+++ b/crates/nu-protocol/src/ast/expression.rs
@@ -6,6 +6,7 @@ use crate::{
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 
+/// Wrapper around [`Expr`]
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Expression {
     pub expr: Expr,
diff --git a/crates/nu-protocol/src/ast/import_pattern.rs b/crates/nu-protocol/src/ast/import_pattern.rs
index 893dd9897b..ad08bfb2d1 100644
--- a/crates/nu-protocol/src/ast/import_pattern.rs
+++ b/crates/nu-protocol/src/ast/import_pattern.rs
@@ -3,10 +3,14 @@ use serde::{Deserialize, Serialize};
 use crate::{ModuleId, Span, VarId};
 use std::collections::HashSet;
 
+/// possible patterns after the first module level in an [`ImportPattern`].
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub enum ImportPatternMember {
+    /// Wildcard import of items
     Glob { span: Span },
+    /// single specific module or item
     Name { name: Vec<u8>, span: Span },
+    /// list of items
     List { names: Vec<(Vec<u8>, Span)> },
 }
 
@@ -31,6 +35,7 @@ impl ImportPatternMember {
     }
 }
 
+/// The first item of a `use` statement needs to specify an explicit module
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct ImportPatternHead {
     pub name: Vec<u8>,
@@ -38,6 +43,7 @@ pub struct ImportPatternHead {
     pub span: Span,
 }
 
+/// The pattern specifying modules in a `use` statement
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct ImportPattern {
     pub head: ImportPatternHead,
diff --git a/crates/nu-protocol/src/ast/match_pattern.rs b/crates/nu-protocol/src/ast/match_pattern.rs
index 1aafe84701..ca639270aa 100644
--- a/crates/nu-protocol/src/ast/match_pattern.rs
+++ b/crates/nu-protocol/src/ast/match_pattern.rs
@@ -2,6 +2,7 @@ use super::Expression;
 use crate::{Span, VarId};
 use serde::{Deserialize, Serialize};
 
+/// AST Node for match arm with optional match guard
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct MatchPattern {
     pub pattern: Pattern,
@@ -15,18 +16,28 @@ impl MatchPattern {
     }
 }
 
+/// AST Node for pattern matching rules
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub enum Pattern {
+    /// Destructuring of records
     Record(Vec<(String, MatchPattern)>),
+    /// List destructuring
     List(Vec<MatchPattern>),
+    /// Matching against a literal
     // TODO: it would be nice if this didn't depend on AST
     // maybe const evaluation can get us to a Value instead?
     Value(Box<Expression>),
+    /// binding to a variable
     Variable(VarId),
+    /// the `pattern1 \ pattern2` or-pattern
     Or(Vec<MatchPattern>),
-    Rest(VarId), // the ..$foo pattern
-    IgnoreRest,  // the .. pattern
-    IgnoreValue, // the _ pattern
+    /// the `..$foo` pattern
+    Rest(VarId),
+    /// the `..` pattern
+    IgnoreRest,
+    /// the `_` pattern
+    IgnoreValue,
+    /// Failed parsing of a pattern
     Garbage,
 }
 
diff --git a/crates/nu-protocol/src/ast/mod.rs b/crates/nu-protocol/src/ast/mod.rs
index 7c627997fe..cb09168805 100644
--- a/crates/nu-protocol/src/ast/mod.rs
+++ b/crates/nu-protocol/src/ast/mod.rs
@@ -1,3 +1,4 @@
+//! Types representing parsed Nushell code (the Abstract Syntax Tree)
 mod block;
 mod call;
 mod cell_path;
@@ -9,7 +10,7 @@ mod match_pattern;
 mod operator;
 mod pipeline;
 mod range;
-pub mod table;
+mod table;
 mod unit;
 mod value_with_unit;
 
diff --git a/crates/nu-protocol/src/config/mod.rs b/crates/nu-protocol/src/config/mod.rs
index e804e3f024..eda3d9a15e 100644
--- a/crates/nu-protocol/src/config/mod.rs
+++ b/crates/nu-protocol/src/config/mod.rs
@@ -1,3 +1,4 @@
+//! Module containing the internal representation of user configuration
 use self::completer::*;
 use self::helper::*;
 use self::hooks::*;
diff --git a/crates/nu-protocol/src/debugger/mod.rs b/crates/nu-protocol/src/debugger/mod.rs
index 03208fb3c7..86768a0a34 100644
--- a/crates/nu-protocol/src/debugger/mod.rs
+++ b/crates/nu-protocol/src/debugger/mod.rs
@@ -1,3 +1,4 @@
+//! Module containing the trait to instrument the engine for debugging and profiling
 pub mod debugger_trait;
 pub mod profiler;
 
diff --git a/crates/nu-protocol/src/engine/mod.rs b/crates/nu-protocol/src/engine/mod.rs
index 1b1762fe3c..39bb5a7ae3 100644
--- a/crates/nu-protocol/src/engine/mod.rs
+++ b/crates/nu-protocol/src/engine/mod.rs
@@ -1,3 +1,4 @@
+//! Representation of the engine state and many of the details that implement the scoping
 mod argument;
 mod cached_file;
 mod call;
diff --git a/crates/nu-protocol/src/errors/cli_error.rs b/crates/nu-protocol/src/errors/cli_error.rs
index 181839b948..c12c601c4d 100644
--- a/crates/nu-protocol/src/errors/cli_error.rs
+++ b/crates/nu-protocol/src/errors/cli_error.rs
@@ -1,3 +1,6 @@
+//! This module manages the step of turning error types into printed error messages
+//!
+//! Relies on the `miette` crate for pretty layout
 use crate::{
     engine::{EngineState, StateWorkingSet},
     ErrorStyle,
diff --git a/crates/nu-protocol/src/eval_base.rs b/crates/nu-protocol/src/eval_base.rs
index 7e1e2b0a7c..9c5878ee87 100644
--- a/crates/nu-protocol/src/eval_base.rs
+++ b/crates/nu-protocol/src/eval_base.rs
@@ -1,3 +1,4 @@
+//! Foundational [`Eval`] trait allowing dispatch between const-eval and regular evaluation
 use crate::{
     ast::{
         eval_operator, Assignment, Bits, Boolean, Call, Comparison, Expr, Expression,
diff --git a/crates/nu-protocol/src/eval_const.rs b/crates/nu-protocol/src/eval_const.rs
index 5393e35e59..da7570b43c 100644
--- a/crates/nu-protocol/src/eval_const.rs
+++ b/crates/nu-protocol/src/eval_const.rs
@@ -1,3 +1,7 @@
+//! Implementation of const-evaluation
+//!
+//! This enables you to assign `const`-constants and execute parse-time code dependent on this.
+//! e.g. `source $my_const`
 use crate::{
     ast::{Assignment, Block, Call, Expr, Expression, ExternalArgument},
     debugger::{DebugContext, WithoutDebug},
diff --git a/crates/nu-protocol/src/pipeline/byte_stream.rs b/crates/nu-protocol/src/pipeline/byte_stream.rs
index cd62b70801..69391b39a9 100644
--- a/crates/nu-protocol/src/pipeline/byte_stream.rs
+++ b/crates/nu-protocol/src/pipeline/byte_stream.rs
@@ -1,3 +1,4 @@
+//! Module managing the streaming of raw bytes between pipeline elements
 use crate::{
     process::{ChildPipe, ChildProcess, ExitStatus},
     ErrSpan, IntoSpanned, OutDest, PipelineData, ShellError, Signals, Span, Type, Value,
diff --git a/crates/nu-protocol/src/pipeline/list_stream.rs b/crates/nu-protocol/src/pipeline/list_stream.rs
index 104bab6bcc..55ae4bfee0 100644
--- a/crates/nu-protocol/src/pipeline/list_stream.rs
+++ b/crates/nu-protocol/src/pipeline/list_stream.rs
@@ -1,3 +1,7 @@
+//! Module managing the streaming of individual [`Value`]s as a [`ListStream`] between pipeline
+//! elements
+//!
+//! For more general infos regarding our pipelining model refer to [`PipelineData`]
 use crate::{Config, PipelineData, ShellError, Signals, Span, Value};
 use std::fmt::Debug;
 
diff --git a/crates/nu-protocol/src/process/mod.rs b/crates/nu-protocol/src/process/mod.rs
index 2fcf65f56e..6e10fdd620 100644
--- a/crates/nu-protocol/src/process/mod.rs
+++ b/crates/nu-protocol/src/process/mod.rs
@@ -1,3 +1,4 @@
+//! Handling of external subprocesses
 mod child;
 mod exit_status;
 
diff --git a/crates/nu-protocol/src/signature.rs b/crates/nu-protocol/src/signature.rs
index 3241b0df22..f8b83063d7 100644
--- a/crates/nu-protocol/src/signature.rs
+++ b/crates/nu-protocol/src/signature.rs
@@ -5,6 +5,7 @@ use crate::{
 use serde::{Deserialize, Serialize};
 use std::fmt::Write;
 
+/// The signature definition of a named flag that either accepts a value or acts as a toggle flag
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Flag {
     pub long: String,
@@ -18,6 +19,7 @@ pub struct Flag {
     pub default_value: Option<Value>,
 }
 
+/// The signature definition for a positional argument
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct PositionalArg {
     pub name: String,
@@ -29,6 +31,7 @@ pub struct PositionalArg {
     pub default_value: Option<Value>,
 }
 
+/// Command categories
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Category {
     Bits,
@@ -102,6 +105,7 @@ impl std::fmt::Display for Category {
     }
 }
 
+/// Signature information of a [`Command`]
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct Signature {
     pub name: String,
diff --git a/crates/nu-protocol/src/span.rs b/crates/nu-protocol/src/span.rs
index f5bcebc543..cb6d96421c 100644
--- a/crates/nu-protocol/src/span.rs
+++ b/crates/nu-protocol/src/span.rs
@@ -1,3 +1,4 @@
+//! [`Span`] to point to sections of source code and the [`Spanned`] wrapper type
 use crate::SpanId;
 use miette::SourceSpan;
 use serde::{Deserialize, Serialize};
diff --git a/crates/nu-protocol/src/value/record.rs b/crates/nu-protocol/src/value/record.rs
index 8b61e61f7f..f4e963737f 100644
--- a/crates/nu-protocol/src/value/record.rs
+++ b/crates/nu-protocol/src/value/record.rs
@@ -1,3 +1,4 @@
+//! Our insertion ordered map-type [`Record`]
 use std::{iter::FusedIterator, ops::RangeBounds};
 
 use crate::{ShellError, Span, Value};

From deaa711ca62150351ec89d47d373a6cc6e0a36f7 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Thu, 11 Jul 2024 14:20:28 +0200
Subject: [PATCH 0212/1072] Bump yanked `libc` version (#13344)

Fixes #13244
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7243a801fc..3820ff26d1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2342,9 +2342,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.154"
+version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "libflate"

From f65bc97a545264e0fc0ca4ccb953a73a1cc1b07a Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Thu, 11 Jul 2024 06:09:33 -0700
Subject: [PATCH 0213/1072] Update config directly at assignment (#13332)

# Description

Allows `Stack` to have a modified local `Config`, which is updated
immediately when `$env.config` is assigned to. This means that even
within a script, commands that come after `$env.config` changes will
always see those changes in `Stack::get_config()`.

Also fixed a lot of cases where `engine_state.get_config()` was used
even when `Stack` was available.

Closes #13324.

# User-Facing Changes
- Config changes apply immediately after the assignment is executed,
rather than whenever config is read by a command that needs it.
- Potentially slower performance when executing a lot of lines that
change `$env.config` one after another. Recommended to get `$env.config`
into a `mut` variable first and do modifications, then assign it back.
- Much faster performance when executing a script that made
modifications to `$env.config`, as the changes are only parsed once.

# Tests + Formatting
All passing.

# After Submitting
- [ ] release notes
---
 Cargo.lock                                    |  2 +
 crates/nu-cli/src/eval_cmds.rs                |  5 +-
 crates/nu-cli/src/menus/help_completions.rs   | 32 ++++---
 crates/nu-cli/src/nu_highlight.rs             |  9 +-
 crates/nu-cli/src/reedline_config.rs          | 54 ++++++-----
 crates/nu-cli/src/repl.rs                     |  3 +-
 crates/nu-cli/src/syntax_highlight.rs         | 13 ++-
 .../nu-cmd-extra/src/extra/formats/to/html.rs |  2 +-
 .../src/extra/strings/format/command.rs       | 36 ++++----
 crates/nu-color-config/src/style_computer.rs  |  4 +-
 .../nu-command/src/conversions/into/string.rs |  6 +-
 crates/nu-command/src/debug/debug_.rs         |  2 +-
 crates/nu-command/src/filesystem/rm.rs        |  2 +-
 crates/nu-command/src/filters/find.rs         |  6 +-
 crates/nu-command/src/formats/to/md.rs        |  4 +-
 crates/nu-command/src/formats/to/text.rs      |  6 +-
 crates/nu-command/src/help/help_aliases.rs    |  2 +-
 crates/nu-command/src/help/help_modules.rs    |  2 +-
 crates/nu-command/src/network/url/parse.rs    | 17 ++--
 crates/nu-command/src/platform/ansi/ansi_.rs  |  2 +-
 crates/nu-command/src/platform/ansi/strip.rs  | 11 +--
 crates/nu-command/src/platform/input/list.rs  |  5 +-
 crates/nu-command/src/stor/insert.rs          |  2 +-
 .../nu-command/src/strings/detect_columns.rs  | 14 ++-
 crates/nu-command/src/system/nu_check.rs      |  4 +-
 crates/nu-command/src/system/run_external.rs  |  2 +-
 crates/nu-command/src/viewers/griddle.rs      |  2 +-
 crates/nu-command/src/viewers/table.rs        | 44 +++++++--
 crates/nu-engine/src/documentation.rs         | 92 ++++++++++++-------
 crates/nu-engine/src/env.rs                   | 14 +--
 crates/nu-engine/src/eval.rs                  | 18 +++-
 crates/nu-explore/src/commands/expand.rs      |  4 +-
 crates/nu-explore/src/explore.rs              |  6 +-
 crates/nu-plugin-engine/Cargo.toml            |  3 +-
 crates/nu-plugin-engine/src/context.rs        |  8 +-
 crates/nu-plugin-engine/src/declaration.rs    |  2 +-
 crates/nu-plugin-engine/src/interface/mod.rs  |  3 +-
 crates/nu-plugin-protocol/src/lib.rs          |  3 +-
 crates/nu-plugin/Cargo.toml                   |  3 +-
 crates/nu-plugin/src/plugin/interface/mod.rs  |  5 +-
 crates/nu-plugin/src/plugin/mod.rs            |  2 +-
 crates/nu-protocol/src/engine/engine_state.rs | 38 +++-----
 crates/nu-protocol/src/engine/stack.rs        | 39 +++++++-
 .../src/engine/state_working_set.rs           |  6 +-
 crates/nu-protocol/src/eval_base.rs           |  4 +-
 crates/nu-protocol/src/eval_const.rs          |  6 +-
 46 files changed, 327 insertions(+), 222 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3820ff26d1..c7608643dc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3257,6 +3257,7 @@ dependencies = [
  "nu-plugin-core",
  "nu-plugin-protocol",
  "nu-protocol",
+ "nu-utils",
  "serde",
  "thiserror",
  "typetag",
@@ -3286,6 +3287,7 @@ dependencies = [
  "nu-plugin-protocol",
  "nu-protocol",
  "nu-system",
+ "nu-utils",
  "serde",
  "typetag",
  "windows 0.54.0",
diff --git a/crates/nu-cli/src/eval_cmds.rs b/crates/nu-cli/src/eval_cmds.rs
index ad3a15304d..1459f1ef0d 100644
--- 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();
-            config.table_mode = t_mode.coerce_str()?.parse().unwrap_or_default();
-            engine_state.set_config(config);
+            Arc::make_mut(&mut engine_state.config).table_mode =
+                t_mode.coerce_str()?.parse().unwrap_or_default();
         }
 
         let mut working_set = StateWorkingSet::new(engine_state);
diff --git a/crates/nu-cli/src/menus/help_completions.rs b/crates/nu-cli/src/menus/help_completions.rs
index c9c1b7bf94..ebe3fe616b 100644
--- a/crates/nu-cli/src/menus/help_completions.rs
+++ b/crates/nu-cli/src/menus/help_completions.rs
@@ -1,25 +1,31 @@
 use nu_engine::documentation::get_flags_section;
-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 {
-        Self(engine_state)
+    pub fn new(engine_state: Arc<EngineState>, config: Arc<Config>) -> Self {
+        Self {
+            engine_state,
+            config,
+        }
     }
 
     fn completion_helper(&self, line: &str, pos: usize) -> Vec<Suggestion> {
         let folded_line = line.to_folded_case();
 
         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,9 +60,12 @@ 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| {
-                        v.to_parsable_string(", ", &self.0.config)
-                    }))
+                    long_desc.push_str(&get_flags_section(
+                        Some(&self.engine_state),
+                        Some(&self.config),
+                        &sig,
+                        |v| v.to_parsable_string(", ", &self.config),
+                    ))
                 }
 
                 if !sig.required_positional.is_empty()
@@ -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()
@@ -138,7 +147,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!(
diff --git a/crates/nu-cli/src/nu_highlight.rs b/crates/nu-cli/src/nu_highlight.rs
index f4f38296de..0b5f211838 100644
--- 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};
 
@@ -33,13 +35,10 @@ impl Command for NuHighlight {
         let head = call.head;
 
         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,
-            stack: std::sync::Arc::new(stack.clone()),
-            config,
+            engine_state: Arc::new(engine_state.clone()),
+            stack: Arc::new(stack.clone()),
         };
 
         input.map(
diff --git a/crates/nu-cli/src/reedline_config.rs b/crates/nu-cli/src/reedline_config.rs
index dd5a3199dc..d5d3272bc1 100644
--- 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(),
         })
     }
@@ -282,9 +288,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();
@@ -311,7 +317,7 @@ pub(crate) fn add_list_menu(
         }
     }
 
-    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 +343,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 +355,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 +423,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 +447,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(),
                     });
                 }
@@ -509,7 +515,7 @@ pub(crate) fn add_ide_menu(
         }
     }
 
-    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 +541,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 +553,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();
@@ -608,7 +614,7 @@ pub(crate) fn add_description_menu(
         }
     }
 
-    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 +623,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 +644,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(),
         }),
     }
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 07272701f3..817950a445 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -297,7 +297,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
     perf!("env-change hook", start_time, 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
@@ -323,7 +323,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(),
diff --git a/crates/nu-cli/src/syntax_highlight.rs b/crates/nu-cli/src/syntax_highlight.rs
index 41ef168390..08dcbb1346 100644
--- 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 =
-            self.engine_state.get_config().highlight_resolved_externals;
+        let config = self.stack.get_config(&self.engine_state);
+        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));
                     }
diff --git a/crates/nu-cmd-extra/src/extra/formats/to/html.rs b/crates/nu-cmd-extra/src/extra/formats/to/html.rs
index 83d0b58b3f..f02f11cf84 100644
--- 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);
diff --git a/crates/nu-cmd-extra/src/extra/strings/format/command.rs b/crates/nu-cmd-extra/src/extra/strings/format/command.rs
index 08df92ef40..ef9b6f2baf 100644
--- 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 { .. } => {
-            match format_record(format_operations, &data_as_value, engine_state) {
-                Ok(value) => Ok(PipelineData::Value(Value::string(value, head_span), None)),
-                Err(value) => Err(value),
-            }
-        }
+        Value::Record { .. } => match format_record(format_operations, &data_as_value, config) {
+            Ok(value) => Ok(PipelineData::Value(Value::string(value, head_span), None)),
+            Err(value) => Err(value),
+        },
 
         Value::List { vals, .. } => {
             let mut list = vec![];
             for val in vals.iter() {
                 match val {
-                    Value::Record { .. } => {
-                        match format_record(format_operations, val, engine_state) {
-                            Ok(value) => {
-                                list.push(Value::string(value, head_span));
-                            }
-                            Err(value) => {
-                                return Err(value);
-                            }
+                    Value::Record { .. } => match format_record(format_operations, val, config) {
+                        Ok(value) => {
+                            list.push(Value::string(value, head_span));
                         }
-                    }
+                        Err(value) => {
+                            return Err(value);
+                        }
+                    },
                     Value::Error { error, .. } => return Err(*error.clone()),
                     _ => {
                         return Err(ShellError::OnlySupportsThisInputType {
@@ -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 {
diff --git a/crates/nu-color-config/src/style_computer.rs b/crates/nu-color-config/src/style_computer.rs
index 91907c1428..edc8786a53 100644
--- a/crates/nu-color-config/src/style_computer.rs
+++ b/crates/nu-color-config/src/style_computer.rs
@@ -1,6 +1,6 @@
 use crate::{color_record_to_nustyle, lookup_ansi_color_style, text_style::Alignment, TextStyle};
 use nu_ansi_term::{Color, Style};
-use nu_engine::{env::get_config, ClosureEvalOnce};
+use nu_engine::ClosureEvalOnce;
 use nu_protocol::{
     cli_error::CliError,
     engine::{Closure, EngineState, Stack, StateWorkingSet},
@@ -114,7 +114,7 @@ impl<'a> StyleComputer<'a> {
 
     // The main constructor.
     pub fn from_config(engine_state: &'a EngineState, stack: &'a Stack) -> StyleComputer<'a> {
-        let config = get_config(engine_state, stack);
+        let config = stack.get_config(engine_state);
 
         // Create the hashmap
         #[rustfmt::skip]
diff --git a/crates/nu-command/src/conversions/into/string.rs b/crates/nu-command/src/conversions/into/string.rs
index c394f9fd21..2b35272b3e 100644
--- a/crates/nu-command/src/conversions/into/string.rs
+++ b/crates/nu-command/src/conversions/into/string.rs
@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
 use nu_protocol::{into_code, Config};
@@ -7,7 +9,7 @@ use num_format::ToFormattedString;
 struct Arguments {
     decimals_value: Option<i64>,
     cell_paths: Option<Vec<CellPath>>,
-    config: Config,
+    config: Arc<Config>,
 }
 
 impl CmdArgument for Arguments {
@@ -174,7 +176,7 @@ fn string_helper(
             })
         }
     } else {
-        let config = engine_state.get_config().clone();
+        let config = stack.get_config(engine_state);
         let args = Arguments {
             decimals_value,
             cell_paths,
diff --git a/crates/nu-command/src/debug/debug_.rs b/crates/nu-command/src/debug/debug_.rs
index f4e5707491..80a9067e49 100644
--- a/crates/nu-command/src/debug/debug_.rs
+++ b/crates/nu-command/src/debug/debug_.rs
@@ -33,7 +33,7 @@ impl Command for Debug {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
-        let config = engine_state.get_config().clone();
+        let config = stack.get_config(engine_state);
         let raw = call.has_flag(engine_state, stack, "raw")?;
 
         // Should PipelineData::Empty result in an error here?
diff --git a/crates/nu-command/src/filesystem/rm.rs b/crates/nu-command/src/filesystem/rm.rs
index d67046ffe1..9eb4fabace 100644
--- a/crates/nu-command/src/filesystem/rm.rs
+++ b/crates/nu-command/src/filesystem/rm.rs
@@ -170,7 +170,7 @@ fn rm(
     }
 
     let span = call.head;
-    let rm_always_trash = engine_state.get_config().rm_always_trash;
+    let rm_always_trash = stack.get_config(engine_state).rm_always_trash;
 
     if !TRASH_SUPPORTED {
         if rm_always_trash {
diff --git a/crates/nu-command/src/filters/find.rs b/crates/nu-command/src/filters/find.rs
index 7669190f7e..9ed0c28a3c 100644
--- a/crates/nu-command/src/filters/find.rs
+++ b/crates/nu-command/src/filters/find.rs
@@ -213,7 +213,7 @@ fn find_with_regex(
     input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
     let span = call.head;
-    let config = engine_state.get_config().clone();
+    let config = stack.get_config(engine_state);
 
     let insensitive = call.has_flag(engine_state, stack, "ignore-case")?;
     let multiline = call.has_flag(engine_state, stack, "multiline")?;
@@ -348,8 +348,8 @@ fn find_with_rest_and_highlight(
     input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
     let span = call.head;
-    let config = engine_state.get_config().clone();
-    let filter_config = engine_state.get_config().clone();
+    let config = stack.get_config(engine_state);
+    let filter_config = config.clone();
     let invert = call.has_flag(engine_state, stack, "invert")?;
     let terms = call.rest::<Value>(engine_state, stack, 0)?;
     let lower_terms = terms
diff --git a/crates/nu-command/src/formats/to/md.rs b/crates/nu-command/src/formats/to/md.rs
index e2acdd703e..737a328cd3 100644
--- a/crates/nu-command/src/formats/to/md.rs
+++ b/crates/nu-command/src/formats/to/md.rs
@@ -70,8 +70,8 @@ impl Command for ToMd {
         let head = call.head;
         let pretty = call.has_flag(engine_state, stack, "pretty")?;
         let per_element = call.has_flag(engine_state, stack, "per-element")?;
-        let config = engine_state.get_config();
-        to_md(input, pretty, per_element, config, head)
+        let config = stack.get_config(engine_state);
+        to_md(input, pretty, per_element, &config, head)
     }
 }
 
diff --git a/crates/nu-command/src/formats/to/text.rs b/crates/nu-command/src/formats/to/text.rs
index 82b853248c..33ca19f8f2 100644
--- a/crates/nu-command/src/formats/to/text.rs
+++ b/crates/nu-command/src/formats/to/text.rs
@@ -31,18 +31,19 @@ impl Command for ToText {
     fn run(
         &self,
         engine_state: &EngineState,
-        _stack: &mut Stack,
+        stack: &mut Stack,
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let span = call.head;
         let input = input.try_expand_range()?;
+        let config = stack.get_config(engine_state);
 
         match input {
             PipelineData::Empty => Ok(Value::string(String::new(), span)
                 .into_pipeline_data_with_metadata(update_metadata(None))),
             PipelineData::Value(value, ..) => {
-                let str = local_into_string(value, LINE_ENDING, engine_state.get_config());
+                let str = local_into_string(value, LINE_ENDING, &config);
                 Ok(
                     Value::string(str, span)
                         .into_pipeline_data_with_metadata(update_metadata(None)),
@@ -50,7 +51,6 @@ impl Command for ToText {
             }
             PipelineData::ListStream(stream, meta) => {
                 let span = stream.span();
-                let config = engine_state.get_config().clone();
                 let iter = stream.into_inner().map(move |value| {
                     let mut str = local_into_string(value, LINE_ENDING, &config);
                     str.push_str(LINE_ENDING);
diff --git a/crates/nu-command/src/help/help_aliases.rs b/crates/nu-command/src/help/help_aliases.rs
index da03fa6398..41af9da0b3 100644
--- a/crates/nu-command/src/help/help_aliases.rs
+++ b/crates/nu-command/src/help/help_aliases.rs
@@ -143,7 +143,7 @@ pub fn help_aliases(
         long_desc.push_str("\n\n");
         long_desc.push_str(&format!("{G}Expansion{RESET}:\n  {alias_expansion}"));
 
-        let config = engine_state.get_config();
+        let config = stack.get_config(engine_state);
         if !config.use_ansi_coloring {
             long_desc = nu_utils::strip_ansi_string_likely(long_desc);
         }
diff --git a/crates/nu-command/src/help/help_modules.rs b/crates/nu-command/src/help/help_modules.rs
index 5b39133a6d..c2c00cf400 100644
--- a/crates/nu-command/src/help/help_modules.rs
+++ b/crates/nu-command/src/help/help_modules.rs
@@ -230,7 +230,7 @@ pub fn help_modules(
             ));
         }
 
-        let config = engine_state.get_config();
+        let config = stack.get_config(engine_state);
         if !config.use_ansi_coloring {
             long_desc = nu_utils::strip_ansi_string_likely(long_desc);
         }
diff --git a/crates/nu-command/src/network/url/parse.rs b/crates/nu-command/src/network/url/parse.rs
index e71c8d472a..287c64c7b9 100644
--- a/crates/nu-command/src/network/url/parse.rs
+++ b/crates/nu-command/src/network/url/parse.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::Config;
 use url::Url;
 
 #[derive(Clone)]
@@ -38,11 +39,15 @@ impl Command for SubCommand {
     fn run(
         &self,
         engine_state: &EngineState,
-        _: &mut Stack,
+        stack: &mut Stack,
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        parse(input.into_value(call.head)?, call.head, engine_state)
+        parse(
+            input.into_value(call.head)?,
+            call.head,
+            &stack.get_config(engine_state),
+        )
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -68,12 +73,12 @@ impl Command for SubCommand {
     }
 }
 
-fn get_url_string(value: &Value, engine_state: &EngineState) -> String {
-    value.to_expanded_string("", engine_state.get_config())
+fn get_url_string(value: &Value, config: &Config) -> String {
+    value.to_expanded_string("", config)
 }
 
-fn parse(value: Value, head: Span, engine_state: &EngineState) -> Result<PipelineData, ShellError> {
-    let url_string = get_url_string(&value, engine_state);
+fn parse(value: Value, head: Span, config: &Config) -> Result<PipelineData, ShellError> {
+    let url_string = get_url_string(&value, config);
 
     let result_url = Url::parse(url_string.as_str());
 
diff --git a/crates/nu-command/src/platform/ansi/ansi_.rs b/crates/nu-command/src/platform/ansi/ansi_.rs
index 23161eb7bf..3daed5e157 100644
--- a/crates/nu-command/src/platform/ansi/ansi_.rs
+++ b/crates/nu-command/src/platform/ansi/ansi_.rs
@@ -653,7 +653,7 @@ Operating system commands:
         let list: bool = call.has_flag(engine_state, stack, "list")?;
         let escape: bool = call.has_flag(engine_state, stack, "escape")?;
         let osc: bool = call.has_flag(engine_state, stack, "osc")?;
-        let use_ansi_coloring = engine_state.get_config().use_ansi_coloring;
+        let use_ansi_coloring = stack.get_config(engine_state).use_ansi_coloring;
 
         if list {
             return Ok(generate_ansi_code_list(
diff --git a/crates/nu-command/src/platform/ansi/strip.rs b/crates/nu-command/src/platform/ansi/strip.rs
index 3d59da6a10..4f7f8ea596 100644
--- a/crates/nu-command/src/platform/ansi/strip.rs
+++ b/crates/nu-command/src/platform/ansi/strip.rs
@@ -1,10 +1,12 @@
+use std::sync::Arc;
+
 use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
 use nu_protocol::Config;
 
 pub struct Arguments {
     cell_paths: Option<Vec<CellPath>>,
-    config: Config,
+    config: Arc<Config>,
 }
 
 impl CmdArgument for Arguments {
@@ -51,11 +53,8 @@ impl Command for SubCommand {
     ) -> Result<PipelineData, ShellError> {
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
         let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
-        let config = engine_state.get_config();
-        let args = Arguments {
-            cell_paths,
-            config: config.clone(),
-        };
+        let config = stack.get_config(engine_state);
+        let args = Arguments { cell_paths, config };
         operate(action, args, input, call.head, engine_state.signals())
     }
 
diff --git a/crates/nu-command/src/platform/input/list.rs b/crates/nu-command/src/platform/input/list.rs
index 44b21a8da4..37f16e75d7 100644
--- a/crates/nu-command/src/platform/input/list.rs
+++ b/crates/nu-command/src/platform/input/list.rs
@@ -79,6 +79,7 @@ impl Command for InputList {
         let fuzzy = call.has_flag(engine_state, stack, "fuzzy")?;
         let index = call.has_flag(engine_state, stack, "index")?;
         let display_path: Option<CellPath> = call.get_flag(engine_state, stack, "display")?;
+        let config = stack.get_config(engine_state);
 
         let options: Vec<Options> = match input {
             PipelineData::Value(Value::Range { .. }, ..)
@@ -89,9 +90,9 @@ impl Command for InputList {
                     let display_value = if let Some(ref cellpath) = display_path {
                         val.clone()
                             .follow_cell_path(&cellpath.members, false)?
-                            .to_expanded_string(", ", engine_state.get_config())
+                            .to_expanded_string(", ", &config)
                     } else {
-                        val.to_expanded_string(", ", engine_state.get_config())
+                        val.to_expanded_string(", ", &config)
                     };
                     Ok(Options {
                         name: display_value,
diff --git a/crates/nu-command/src/stor/insert.rs b/crates/nu-command/src/stor/insert.rs
index b6b8d50906..0e5c9ec6af 100644
--- a/crates/nu-command/src/stor/insert.rs
+++ b/crates/nu-command/src/stor/insert.rs
@@ -65,7 +65,7 @@ impl Command for StorInsert {
         let span = call.head;
         let table_name: Option<String> = call.get_flag(engine_state, stack, "table-name")?;
         let data_record: Option<Record> = call.get_flag(engine_state, stack, "data-record")?;
-        // let config = engine_state.get_config();
+        // let config = stack.get_config(engine_state);
         let db = Box::new(SQLiteDatabase::new(
             std::path::Path::new(MEMORY_DB),
             Signals::empty(),
diff --git a/crates/nu-command/src/strings/detect_columns.rs b/crates/nu-command/src/strings/detect_columns.rs
index 2f1f713b33..37a7cfe303 100644
--- a/crates/nu-command/src/strings/detect_columns.rs
+++ b/crates/nu-command/src/strings/detect_columns.rs
@@ -1,7 +1,7 @@
 use itertools::Itertools;
 use nu_engine::command_prelude::*;
-use nu_protocol::Range;
-use std::{io::Cursor, iter::Peekable, str::CharIndices};
+use nu_protocol::{Config, Range};
+use std::{io::Cursor, iter::Peekable, str::CharIndices, sync::Arc};
 
 type Input<'t> = Peekable<CharIndices<'t>>;
 
@@ -110,11 +110,13 @@ none             8150224         4   8150220   1% /mnt/c' | detect columns --gue
         let num_rows_to_skip: Option<usize> = call.get_flag(engine_state, stack, "skip")?;
         let noheader = call.has_flag(engine_state, stack, "no-headers")?;
         let range: Option<Range> = call.get_flag(engine_state, stack, "combine-columns")?;
+        let config = stack.get_config(engine_state);
 
         let args = Arguments {
             noheader,
             num_rows_to_skip,
             range,
+            config,
         };
 
         if call.has_flag(engine_state, stack, "guess")? {
@@ -133,11 +135,13 @@ none             8150224         4   8150220   1% /mnt/c' | detect columns --gue
         let num_rows_to_skip: Option<usize> = call.get_flag_const(working_set, "skip")?;
         let noheader = call.has_flag_const(working_set, "no-headers")?;
         let range: Option<Range> = call.get_flag_const(working_set, "combine-columns")?;
+        let config = working_set.get_config().clone();
 
         let args = Arguments {
             noheader,
             num_rows_to_skip,
             range,
+            config,
         };
 
         if call.has_flag_const(working_set, "guess")? {
@@ -152,6 +156,7 @@ struct Arguments {
     num_rows_to_skip: Option<usize>,
     noheader: bool,
     range: Option<Range>,
+    config: Arc<Config>,
 }
 
 fn guess_width(
@@ -163,7 +168,7 @@ fn guess_width(
     use super::guess_width::GuessWidth;
     let input_span = input.span().unwrap_or(call.head);
 
-    let mut input = input.collect_string("", engine_state.get_config())?;
+    let mut input = input.collect_string("", &args.config)?;
     if let Some(rows) = args.num_rows_to_skip {
         input = input.lines().skip(rows).map(|x| x.to_string()).join("\n");
     }
@@ -235,8 +240,7 @@ fn detect_columns(
     args: Arguments,
 ) -> Result<PipelineData, ShellError> {
     let name_span = call.head;
-    let config = engine_state.get_config();
-    let input = input.collect_string("", config)?;
+    let input = input.collect_string("", &args.config)?;
 
     let input: Vec<_> = input
         .lines()
diff --git a/crates/nu-command/src/system/nu_check.rs b/crates/nu-command/src/system/nu_check.rs
index 334569c79e..c0c29858d5 100644
--- a/crates/nu-command/src/system/nu_check.rs
+++ b/crates/nu-command/src/system/nu_check.rs
@@ -1,4 +1,4 @@
-use nu_engine::{command_prelude::*, env::get_config, find_in_dirs_env, get_dirs_var_from_call};
+use nu_engine::{command_prelude::*, find_in_dirs_env, get_dirs_var_from_call};
 use nu_parser::{parse, parse_module_block, parse_module_file_or_dir, unescape_unquote_string};
 use nu_protocol::engine::{FileStack, StateWorkingSet};
 use std::path::Path;
@@ -59,7 +59,7 @@ impl Command for NuCheck {
                 }
             }
             PipelineData::ListStream(stream, ..) => {
-                let config = get_config(engine_state, stack);
+                let config = stack.get_config(engine_state);
                 let list_stream = stream.into_string("\n", &config);
                 let contents = Vec::from(list_stream);
 
diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index a5cf343970..a7ca822011 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -366,7 +366,7 @@ pub fn command_not_found(
     stack: &mut Stack,
 ) -> ShellError {
     // Run the `command_not_found` hook if there is one.
-    if let Some(hook) = &engine_state.config.hooks.command_not_found {
+    if let Some(hook) = &stack.get_config(engine_state).hooks.command_not_found {
         let mut stack = stack.start_capture();
         // Set a special environment variable to avoid infinite loops when the
         // `command_not_found` hook triggers itself.
diff --git a/crates/nu-command/src/viewers/griddle.rs b/crates/nu-command/src/viewers/griddle.rs
index cd73c1ca71..c3e003be39 100644
--- a/crates/nu-command/src/viewers/griddle.rs
+++ b/crates/nu-command/src/viewers/griddle.rs
@@ -61,7 +61,7 @@ prints out the list properly."#
         let width_param: Option<i64> = call.get_flag(engine_state, stack, "width")?;
         let color_param: bool = call.has_flag(engine_state, stack, "color")?;
         let separator_param: Option<String> = call.get_flag(engine_state, stack, "separator")?;
-        let config = engine_state.get_config();
+        let config = &stack.get_config(engine_state);
         let env_str = match stack.get_env_var(engine_state, "LS_COLORS") {
             Some(v) => Some(env_to_string("LS_COLORS", &v, engine_state, stack)?),
             None => None,
diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index 190c3659af..e5fdf681f7 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -4,7 +4,7 @@
 
 use lscolors::{LsColors, Style};
 use nu_color_config::{color_from_hex, StyleComputer, TextStyle};
-use nu_engine::{command_prelude::*, env::get_config, env_to_string};
+use nu_engine::{command_prelude::*, env_to_string};
 use nu_pretty_hex::HexConfig;
 use nu_protocol::{
     ByteStream, Config, DataSource, ListStream, PipelineMetadata, Signals, TableMode, ValueIterator,
@@ -258,7 +258,7 @@ fn parse_table_config(
     let flatten_separator: Option<String> = call.get_flag(state, stack, "flatten-separator")?;
     let abbrivation: Option<usize> = call
         .get_flag(state, stack, "abbreviated")?
-        .or_else(|| get_config(state, stack).table_abbreviation_threshold);
+        .or_else(|| stack.get_config(state).table_abbreviation_threshold);
     let table_view = match (expand, collapse) {
         (false, false) => TableView::General,
         (_, true) => TableView::Collapsed,
@@ -269,7 +269,7 @@ fn parse_table_config(
         },
     };
     let theme =
-        get_theme_flag(call, state, stack)?.unwrap_or_else(|| get_config(state, stack).table_mode);
+        get_theme_flag(call, state, stack)?.unwrap_or_else(|| stack.get_config(state).table_mode);
     let index = get_index_flag(call, state, stack)?;
 
     let term_width = get_width_param(width_param);
@@ -493,7 +493,11 @@ fn handle_record(
     cfg: TableConfig,
     mut record: Record,
 ) -> Result<PipelineData, ShellError> {
-    let config = get_config(input.engine_state, input.stack);
+    let config = {
+        let state = input.engine_state;
+        let stack: &Stack = input.stack;
+        stack.get_config(state)
+    };
     let span = input.data.span().unwrap_or(input.call.head);
     let styles = &StyleComputer::from_config(input.engine_state, input.stack);
 
@@ -608,7 +612,11 @@ fn handle_row_stream(
             data_source: DataSource::Ls,
             ..
         }) => {
-            let config = get_config(input.engine_state, input.stack);
+            let config = {
+                let state = input.engine_state;
+                let stack: &Stack = input.stack;
+                stack.get_config(state)
+            };
             let ls_colors_env_str = match input.stack.get_env_var(input.engine_state, "LS_COLORS") {
                 Some(v) => Some(env_to_string(
                     "LS_COLORS",
@@ -758,7 +766,11 @@ impl PagingTableCreator {
             return Ok(None);
         }
 
-        let cfg = get_config(&self.engine_state, &self.stack);
+        let cfg = {
+            let state = &self.engine_state;
+            let stack = &self.stack;
+            stack.get_config(state)
+        };
         let style_comp = StyleComputer::from_config(&self.engine_state, &self.stack);
         let opts = self.create_table_opts(&cfg, &style_comp);
         let view = TableView::Expanded {
@@ -775,7 +787,11 @@ impl PagingTableCreator {
             return Ok(None);
         }
 
-        let cfg = get_config(&self.engine_state, &self.stack);
+        let cfg = {
+            let state = &self.engine_state;
+            let stack = &self.stack;
+            stack.get_config(state)
+        };
         let style_comp = StyleComputer::from_config(&self.engine_state, &self.stack);
         let opts = self.create_table_opts(&cfg, &style_comp);
 
@@ -783,7 +799,11 @@ impl PagingTableCreator {
     }
 
     fn build_general(&mut self, batch: Vec<Value>) -> StringResult {
-        let cfg = get_config(&self.engine_state, &self.stack);
+        let cfg = {
+            let state = &self.engine_state;
+            let stack = &self.stack;
+            stack.get_config(state)
+        };
         let style_comp = StyleComputer::from_config(&self.engine_state, &self.stack);
         let opts = self.create_table_opts(&cfg, &style_comp);
 
@@ -872,7 +892,11 @@ impl Iterator for PagingTableCreator {
 
         self.row_offset += batch_size;
 
-        let config = get_config(&self.engine_state, &self.stack);
+        let config = {
+            let state = &self.engine_state;
+            let stack = &self.stack;
+            stack.get_config(state)
+        };
         convert_table_to_output(
             table,
             &config,
@@ -1049,7 +1073,7 @@ fn create_empty_placeholder(
     engine_state: &EngineState,
     stack: &Stack,
 ) -> String {
-    let config = get_config(engine_state, stack);
+    let config = stack.get_config(engine_state);
     if !config.table_show_empty {
         return String::new();
     }
diff --git a/crates/nu-engine/src/documentation.rs b/crates/nu-engine/src/documentation.rs
index 7840d03c47..a0dee3d343 100644
--- a/crates/nu-engine/src/documentation.rs
+++ b/crates/nu-engine/src/documentation.rs
@@ -3,8 +3,8 @@ use nu_protocol::{
     ast::{Argument, Call, Expr, Expression, RecordItem},
     debugger::WithoutDebug,
     engine::{Command, EngineState, Stack, UNKNOWN_SPAN_ID},
-    record, Category, Example, IntoPipelineData, PipelineData, Signature, Span, SpanId, Spanned,
-    SyntaxShape, Type, Value,
+    record, Category, Config, Example, IntoPipelineData, PipelineData, Signature, Span, SpanId,
+    Spanned, SyntaxShape, Type, Value,
 };
 use std::{collections::HashMap, fmt::Write};
 
@@ -13,7 +13,7 @@ pub fn get_full_help(
     engine_state: &EngineState,
     stack: &mut Stack,
 ) -> String {
-    let config = engine_state.get_config();
+    let config = stack.get_config(engine_state);
     let doc_config = DocumentationConfig {
         no_subcommands: false,
         no_color: !config.use_ansi_coloring,
@@ -70,16 +70,30 @@ fn get_documentation(
     config: &DocumentationConfig,
     is_parser_keyword: bool,
 ) -> String {
+    let nu_config = stack.get_config(engine_state);
+
     // Create ansi colors
     //todo make these configurable -- pull from enginestate.config
-    let help_section_name: String =
-        get_ansi_color_for_component_or_default(engine_state, "shape_string", "\x1b[32m"); // default: green
+    let help_section_name: String = get_ansi_color_for_component_or_default(
+        engine_state,
+        &nu_config,
+        "shape_string",
+        "\x1b[32m",
+    ); // default: green
 
-    let help_subcolor_one: String =
-        get_ansi_color_for_component_or_default(engine_state, "shape_external", "\x1b[36m"); // default: cyan
-                                                                                             // was const bb: &str = "\x1b[1;34m"; // bold blue
-    let help_subcolor_two: String =
-        get_ansi_color_for_component_or_default(engine_state, "shape_block", "\x1b[94m"); // default: light blue (nobold, should be bolding the *names*)
+    let help_subcolor_one: String = get_ansi_color_for_component_or_default(
+        engine_state,
+        &nu_config,
+        "shape_external",
+        "\x1b[36m",
+    ); // default: cyan
+       // was const bb: &str = "\x1b[1;34m"; // bold blue
+    let help_subcolor_two: String = get_ansi_color_for_component_or_default(
+        engine_state,
+        &nu_config,
+        "shape_block",
+        "\x1b[94m",
+    ); // default: light blue (nobold, should be bolding the *names*)
 
     const RESET: &str = "\x1b[0m"; // reset
 
@@ -139,13 +153,12 @@ fn get_documentation(
     }
 
     if !sig.named.is_empty() {
-        long_desc.push_str(&get_flags_section(Some(engine_state), sig, |v| {
-            nu_highlight_string(
-                &v.to_parsable_string(", ", &engine_state.config),
-                engine_state,
-                stack,
-            )
-        }))
+        long_desc.push_str(&get_flags_section(
+            Some(engine_state),
+            Some(&nu_config),
+            sig,
+            |v| nu_highlight_string(&v.to_parsable_string(", ", &nu_config), engine_state, stack),
+        ))
     }
 
     if !sig.required_positional.is_empty()
@@ -189,7 +202,7 @@ fn get_documentation(
                         format!(
                             " (optional, default: {})",
                             nu_highlight_string(
-                                &value.to_parsable_string(", ", &engine_state.config),
+                                &value.to_parsable_string(", ", &nu_config),
                                 engine_state,
                                 stack
                             )
@@ -339,7 +352,7 @@ fn get_documentation(
                 let _ = writeln!(
                     long_desc,
                     "  {}",
-                    item.to_expanded_string("", engine_state.get_config())
+                    item.to_expanded_string("", &nu_config)
                         .replace('\n', "\n  ")
                         .trim()
                 );
@@ -358,15 +371,16 @@ fn get_documentation(
 
 fn get_ansi_color_for_component_or_default(
     engine_state: &EngineState,
+    nu_config: &Config,
     theme_component: &str,
     default: &str,
 ) -> String {
-    if let Some(color) = &engine_state.get_config().color_config.get(theme_component) {
+    if let Some(color) = &nu_config.color_config.get(theme_component) {
         let caller_stack = &mut Stack::new().capture();
         let span = Span::unknown();
         let span_id = UNKNOWN_SPAN_ID;
 
-        let argument_opt = get_argument_for_color_value(engine_state, color, span, span_id);
+        let argument_opt = get_argument_for_color_value(nu_config, color, span, span_id);
 
         // Call ansi command using argument
         if let Some(argument) = argument_opt {
@@ -394,8 +408,8 @@ fn get_ansi_color_for_component_or_default(
 }
 
 fn get_argument_for_color_value(
-    engine_state: &EngineState,
-    color: &&Value,
+    nu_config: &Config,
+    color: &Value,
     span: Span,
     span_id: SpanId,
 ) -> Option<Argument> {
@@ -412,9 +426,7 @@ fn get_argument_for_color_value(
                             Type::String,
                         ),
                         Expression::new_existing(
-                            Expr::String(
-                                v.clone().to_expanded_string("", engine_state.get_config()),
-                            ),
+                            Expr::String(v.clone().to_expanded_string("", nu_config)),
                             span,
                             span_id,
                             Type::String,
@@ -456,6 +468,7 @@ pub fn document_shape(shape: SyntaxShape) -> SyntaxShape {
 
 pub fn get_flags_section<F>(
     engine_state_opt: Option<&EngineState>,
+    nu_config_opt: Option<&Config>,
     signature: &Signature,
     mut value_formatter: F, // format default Value (because some calls cant access config or nu-highlight)
 ) -> String
@@ -470,13 +483,26 @@ where
     // Sometimes we want to get the flags without engine_state
     // For example, in nu-plugin. In that case, we fall back on default values
     if let Some(engine_state) = engine_state_opt {
-        help_section_name =
-            get_ansi_color_for_component_or_default(engine_state, "shape_string", "\x1b[32m"); // default: green
-        help_subcolor_one =
-            get_ansi_color_for_component_or_default(engine_state, "shape_external", "\x1b[36m"); // default: cyan
-                                                                                                 // was const bb: &str = "\x1b[1;34m"; // bold blue
-        help_subcolor_two =
-            get_ansi_color_for_component_or_default(engine_state, "shape_block", "\x1b[94m");
+        let nu_config = nu_config_opt.unwrap_or_else(|| engine_state.get_config());
+        help_section_name = get_ansi_color_for_component_or_default(
+            engine_state,
+            nu_config,
+            "shape_string",
+            "\x1b[32m",
+        ); // default: green
+        help_subcolor_one = get_ansi_color_for_component_or_default(
+            engine_state,
+            nu_config,
+            "shape_external",
+            "\x1b[36m",
+        ); // default: cyan
+           // was const bb: &str = "\x1b[1;34m"; // bold blue
+        help_subcolor_two = get_ansi_color_for_component_or_default(
+            engine_state,
+            nu_config,
+            "shape_block",
+            "\x1b[94m",
+        );
     // default: light blue (nobold, should be bolding the *names*)
     } else {
         help_section_name = "\x1b[32m".to_string();
diff --git a/crates/nu-engine/src/env.rs b/crates/nu-engine/src/env.rs
index ab3a4bc50c..f93e78af88 100644
--- a/crates/nu-engine/src/env.rs
+++ b/crates/nu-engine/src/env.rs
@@ -3,7 +3,7 @@ use nu_path::canonicalize_with;
 use nu_protocol::{
     ast::Expr,
     engine::{Call, EngineState, Stack, StateWorkingSet},
-    Config, ShellError, Span, Value, VarId,
+    ShellError, Span, Value, VarId,
 };
 use std::{
     collections::HashMap,
@@ -323,18 +323,6 @@ pub fn find_in_dirs_env(
     Ok(check_dir(lib_dirs).or_else(|| check_dir(lib_dirs_fallback)))
 }
 
-/// Get config
-///
-/// This combines config stored in permanent state and any runtime updates to the environment. This
-/// is the canonical way to fetch config at runtime when you have Stack available.
-pub fn get_config(engine_state: &EngineState, stack: &Stack) -> Config {
-    if let Some(mut config_record) = stack.get_env_var(engine_state, "config") {
-        config_record.parse_as_config(engine_state.get_config()).0
-    } else {
-        engine_state.get_config().clone()
-    }
-}
-
 fn get_converted_value(
     engine_state: &EngineState,
     stack: &Stack,
diff --git a/crates/nu-engine/src/eval.rs b/crates/nu-engine/src/eval.rs
index 6e171eb46c..42d0aed288 100644
--- a/crates/nu-engine/src/eval.rs
+++ b/crates/nu-engine/src/eval.rs
@@ -1,6 +1,6 @@
 use crate::eval_ir_block;
 #[allow(deprecated)]
-use crate::{current_dir, get_config, get_full_help};
+use crate::{current_dir, get_full_help};
 use nu_path::{expand_path_with, AbsolutePathBuf};
 use nu_protocol::{
     ast::{
@@ -14,7 +14,7 @@ use nu_protocol::{
     Spanned, Type, Value, VarId, ENV_VARIABLE_ID,
 };
 use nu_utils::IgnoreCaseExt;
-use std::{borrow::Cow, fs::OpenOptions, path::PathBuf};
+use std::{fs::OpenOptions, path::PathBuf, sync::Arc};
 
 pub fn eval_call<D: DebugContext>(
     engine_state: &EngineState,
@@ -196,6 +196,9 @@ pub fn redirect_env(engine_state: &EngineState, caller_stack: &mut Stack, callee
     for (var, value) in callee_stack.get_stack_env_vars() {
         caller_stack.add_env_var(var, value);
     }
+
+    // set config to callee config, to capture any updates to that
+    caller_stack.config = callee_stack.config.clone();
 }
 
 fn eval_external(
@@ -652,8 +655,8 @@ impl Eval for EvalRuntime {
 
     type MutState = Stack;
 
-    fn get_config<'a>(engine_state: Self::State<'a>, stack: &mut Stack) -> Cow<'a, Config> {
-        Cow::Owned(get_config(engine_state, stack))
+    fn get_config(engine_state: Self::State<'_>, stack: &mut Stack) -> Arc<Config> {
+        stack.get_config(engine_state)
     }
 
     fn eval_filepath(
@@ -843,7 +846,14 @@ impl Eval for EvalRuntime {
                                     });
                                 }
 
+                                let is_config = original_key == "config";
+
                                 stack.add_env_var(original_key, value);
+
+                                // Trigger the update to config, if we modified that.
+                                if is_config {
+                                    stack.update_config(engine_state)?;
+                                }
                             } else {
                                 lhs.upsert_data_at_cell_path(&cell_path.tail, rhs)?;
                                 stack.add_var(*var_id, lhs);
diff --git a/crates/nu-explore/src/commands/expand.rs b/crates/nu-explore/src/commands/expand.rs
index b748ce2b89..38f92c0b50 100644
--- a/crates/nu-explore/src/commands/expand.rs
+++ b/crates/nu-explore/src/commands/expand.rs
@@ -64,8 +64,8 @@ fn convert_value_to_string(
     let has_no_head = cols.is_empty() || (cols.len() == 1 && cols[0].is_empty());
     let has_single_value = vals.len() == 1 && vals[0].len() == 1;
     if !has_no_head && has_single_value {
-        let config = engine_state.get_config();
-        Ok(vals[0][0].to_abbreviated_string(config))
+        let config = stack.get_config(engine_state);
+        Ok(vals[0][0].to_abbreviated_string(&config))
     } else {
         let config = engine_state.get_config();
         let style_computer = StyleComputer::from_config(engine_state, stack);
diff --git a/crates/nu-explore/src/explore.rs b/crates/nu-explore/src/explore.rs
index 8d59591beb..28a3f04a30 100644
--- a/crates/nu-explore/src/explore.rs
+++ b/crates/nu-explore/src/explore.rs
@@ -63,10 +63,10 @@ impl Command for Explore {
         let tail: bool = call.has_flag(engine_state, stack, "tail")?;
         let peek_value: bool = call.has_flag(engine_state, stack, "peek")?;
 
-        let nu_config = engine_state.get_config();
+        let nu_config = stack.get_config(engine_state);
         let style_computer = StyleComputer::from_config(engine_state, stack);
 
-        let mut explore_config = ExploreConfig::from_nu_config(nu_config);
+        let mut explore_config = ExploreConfig::from_nu_config(&nu_config);
         explore_config.table.show_header = show_head;
         explore_config.table.show_index = show_index;
         explore_config.table.separator_style = lookup_color(&style_computer, "separator");
@@ -74,7 +74,7 @@ impl Command for Explore {
         let lscolors = create_lscolors(engine_state, stack);
 
         let config = PagerConfig::new(
-            nu_config,
+            &nu_config,
             &explore_config,
             &style_computer,
             &lscolors,
diff --git a/crates/nu-plugin-engine/Cargo.toml b/crates/nu-plugin-engine/Cargo.toml
index f86c1ae703..a6dfa471b8 100644
--- a/crates/nu-plugin-engine/Cargo.toml
+++ b/crates/nu-plugin-engine/Cargo.toml
@@ -16,6 +16,7 @@ nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
 nu-system = { path = "../nu-system", version = "0.95.1" }
 nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.95.1" }
 nu-plugin-core = { path = "../nu-plugin-core", version = "0.95.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.95.1" }
 
 serde = { workspace = true }
 log = { workspace = true }
@@ -31,4 +32,4 @@ local-socket = ["nu-plugin-core/local-socket"]
 windows = { workspace = true, features = [
   # For setting process creation flags
   "Win32_System_Threading",
-] }
\ No newline at end of file
+] }
diff --git a/crates/nu-plugin-engine/src/context.rs b/crates/nu-plugin-engine/src/context.rs
index 0df533a11e..aa504a246a 100644
--- a/crates/nu-plugin-engine/src/context.rs
+++ b/crates/nu-plugin-engine/src/context.rs
@@ -20,7 +20,7 @@ pub trait PluginExecutionContext: Send + Sync {
     /// The pipeline externals state, for tracking the foreground process group, if present
     fn pipeline_externals_state(&self) -> Option<&Arc<(AtomicU32, AtomicU32)>>;
     /// Get engine configuration
-    fn get_config(&self) -> Result<Config, ShellError>;
+    fn get_config(&self) -> Result<Arc<Config>, ShellError>;
     /// Get plugin configuration
     fn get_plugin_config(&self) -> Result<Option<Value>, ShellError>;
     /// Get an environment variable from `$env`
@@ -85,8 +85,8 @@ impl<'a> PluginExecutionContext for PluginExecutionCommandContext<'a> {
         Some(&self.engine_state.pipeline_externals_state)
     }
 
-    fn get_config(&self) -> Result<Config, ShellError> {
-        Ok(nu_engine::get_config(&self.engine_state, &self.stack))
+    fn get_config(&self) -> Result<Arc<Config>, ShellError> {
+        Ok(self.stack.get_config(&self.engine_state))
     }
 
     fn get_plugin_config(&self) -> Result<Option<Value>, ShellError> {
@@ -239,7 +239,7 @@ impl PluginExecutionContext for PluginExecutionBogusContext {
         None
     }
 
-    fn get_config(&self) -> Result<Config, ShellError> {
+    fn get_config(&self) -> Result<Arc<Config>, ShellError> {
         Err(ShellError::NushellFailed {
             msg: "get_config not implemented on bogus".into(),
         })
diff --git a/crates/nu-plugin-engine/src/declaration.rs b/crates/nu-plugin-engine/src/declaration.rs
index d48fa39b85..745ba9a998 100644
--- a/crates/nu-plugin-engine/src/declaration.rs
+++ b/crates/nu-plugin-engine/src/declaration.rs
@@ -76,7 +76,7 @@ impl Command for PluginDeclaration {
             EvaluatedCall::try_from_call(call, engine_state, stack, eval_expression)?;
 
         // Get the engine config
-        let engine_config = nu_engine::get_config(engine_state, stack);
+        let engine_config = stack.get_config(engine_state);
 
         // Get, or start, the plugin.
         let plugin = self
diff --git a/crates/nu-plugin-engine/src/interface/mod.rs b/crates/nu-plugin-engine/src/interface/mod.rs
index 79ab7f7720..d1b722dedf 100644
--- a/crates/nu-plugin-engine/src/interface/mod.rs
+++ b/crates/nu-plugin-engine/src/interface/mod.rs
@@ -14,6 +14,7 @@ use nu_protocol::{
     ast::Operator, CustomValue, IntoSpanned, PipelineData, PluginMetadata, PluginSignature,
     ShellError, Signals, Span, Spanned, Value,
 };
+use nu_utils::SharedCow;
 use std::{
     collections::{btree_map, BTreeMap},
     sync::{mpsc, Arc, OnceLock},
@@ -1260,7 +1261,7 @@ pub(crate) fn handle_engine_call(
 
     match call {
         EngineCall::GetConfig => {
-            let config = Box::new(context.get_config()?);
+            let config = SharedCow::from(context.get_config()?);
             Ok(EngineCallResponse::Config(config))
         }
         EngineCall::GetPluginConfig => {
diff --git a/crates/nu-plugin-protocol/src/lib.rs b/crates/nu-plugin-protocol/src/lib.rs
index 2f582c3009..739366d910 100644
--- a/crates/nu-plugin-protocol/src/lib.rs
+++ b/crates/nu-plugin-protocol/src/lib.rs
@@ -25,6 +25,7 @@ use nu_protocol::{
     ast::Operator, engine::Closure, ByteStreamType, Config, LabeledError, PipelineData,
     PluginMetadata, PluginSignature, ShellError, Span, Spanned, Value,
 };
+use nu_utils::SharedCow;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
@@ -553,7 +554,7 @@ impl<D> EngineCall<D> {
 pub enum EngineCallResponse<D> {
     Error(ShellError),
     PipelineData(D),
-    Config(Box<Config>),
+    Config(SharedCow<Config>),
     ValueMap(HashMap<String, Value>),
 }
 
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index a3b4455d15..d46a3cc9cb 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -15,6 +15,7 @@ nu-engine = { path = "../nu-engine", version = "0.95.1" }
 nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
 nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.95.1" }
 nu-plugin-core = { path = "../nu-plugin-core", version = "0.95.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.95.1" }
 
 log = { workspace = true }
 thiserror = "1.0"
@@ -29,4 +30,4 @@ local-socket = ["nu-plugin-core/local-socket"]
 
 [target.'cfg(target_family = "unix")'.dependencies]
 # For setting the process group ID (EnterForeground / LeaveForeground)
-nix = { workspace = true, default-features = false, features = ["process"] }
\ No newline at end of file
+nix = { workspace = true, default-features = false, features = ["process"] }
diff --git a/crates/nu-plugin/src/plugin/interface/mod.rs b/crates/nu-plugin/src/plugin/interface/mod.rs
index dcb4119dba..60c5964f26 100644
--- a/crates/nu-plugin/src/plugin/interface/mod.rs
+++ b/crates/nu-plugin/src/plugin/interface/mod.rs
@@ -14,6 +14,7 @@ use nu_protocol::{
     engine::Closure, Config, LabeledError, PipelineData, PluginMetadata, PluginSignature,
     ShellError, Signals, Span, Spanned, Value,
 };
+use nu_utils::SharedCow;
 use std::{
     collections::{btree_map, BTreeMap, HashMap},
     sync::{mpsc, Arc},
@@ -525,9 +526,9 @@ impl EngineInterface {
     /// # Ok(())
     /// # }
     /// ```
-    pub fn get_config(&self) -> Result<Box<Config>, ShellError> {
+    pub fn get_config(&self) -> Result<Arc<Config>, ShellError> {
         match self.engine_call(EngineCall::GetConfig)? {
-            EngineCallResponse::Config(config) => Ok(config),
+            EngineCallResponse::Config(config) => Ok(SharedCow::into_arc(config)),
             EngineCallResponse::Error(err) => Err(err),
             _ => Err(ShellError::PluginFailedToDecode {
                 msg: "Received unexpected response for EngineCall::GetConfig".into(),
diff --git a/crates/nu-plugin/src/plugin/mod.rs b/crates/nu-plugin/src/plugin/mod.rs
index 2bf7f9fc07..d809318d68 100644
--- a/crates/nu-plugin/src/plugin/mod.rs
+++ b/crates/nu-plugin/src/plugin/mod.rs
@@ -670,7 +670,7 @@ fn print_help(plugin: &impl Plugin, encoder: impl PluginEncoder) {
                 }
             })
             .and_then(|_| {
-                let flags = get_flags_section(None, &signature, |v| format!("{:#?}", v));
+                let flags = get_flags_section(None, None, &signature, |v| format!("{:#?}", v));
                 write!(help, "{flags}")
             })
             .and_then(|_| writeln!(help, "\nParameters:"))
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index f48fde663b..fce24cebbd 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -301,28 +301,11 @@ impl EngineState {
         stack: &mut Stack,
         cwd: impl AsRef<Path>,
     ) -> Result<(), ShellError> {
-        let mut config_updated = false;
-
         for mut scope in stack.env_vars.drain(..) {
             for (overlay_name, mut env) in Arc::make_mut(&mut scope).drain() {
                 if let Some(env_vars) = Arc::make_mut(&mut self.env_vars).get_mut(&overlay_name) {
                     // Updating existing overlay
-                    for (k, v) in env.drain() {
-                        if k == "config" {
-                            // Don't insert the record as the "config" env var as-is.
-                            // Instead, mutate a clone of it with into_config(), and put THAT in env_vars.
-                            let mut new_record = v.clone();
-                            let (config, error) = new_record.parse_as_config(&self.config);
-                            self.config = Arc::new(config);
-                            config_updated = true;
-                            env_vars.insert(k, new_record);
-                            if let Some(e) = error {
-                                return Err(e);
-                            }
-                        } else {
-                            env_vars.insert(k, v);
-                        }
-                    }
+                    env_vars.extend(env.drain());
                 } else {
                     // Pushing a new overlay
                     Arc::make_mut(&mut self.env_vars).insert(overlay_name, env);
@@ -333,7 +316,10 @@ impl EngineState {
         // TODO: better error
         std::env::set_current_dir(cwd)?;
 
-        if config_updated {
+        if let Some(config) = stack.config.take() {
+            // If config was updated in the stack, replace it.
+            self.config = config;
+
             // Make plugin GC config changes take effect immediately.
             #[cfg(feature = "plugin")]
             self.update_plugin_gc_configs(&self.config.plugin_gc);
@@ -738,18 +724,24 @@ impl EngineState {
         &[0u8; 0]
     }
 
-    pub fn get_config(&self) -> &Config {
+    /// Get the global config from the engine state.
+    ///
+    /// Use [`Stack::get_config()`] instead whenever the `Stack` is available, as it takes into
+    /// account local changes to `$env.config`.
+    pub fn get_config(&self) -> &Arc<Config> {
         &self.config
     }
 
-    pub fn set_config(&mut self, conf: Config) {
+    pub fn set_config(&mut self, conf: impl Into<Arc<Config>>) {
+        let conf = conf.into();
+
         #[cfg(feature = "plugin")]
         if conf.plugin_gc != self.config.plugin_gc {
             // Make plugin GC config changes take effect immediately.
             self.update_plugin_gc_configs(&conf.plugin_gc);
         }
 
-        self.config = Arc::new(conf);
+        self.config = conf;
     }
 
     /// Fetch the configuration for a plugin
@@ -1137,7 +1129,7 @@ mod engine_state_tests {
         let mut plugins = HashMap::new();
         plugins.insert("example".into(), Value::string("value", Span::test_data()));
 
-        let mut config = engine_state.get_config().clone();
+        let mut config = Config::clone(engine_state.get_config());
         config.plugins = plugins;
 
         engine_state.set_config(config);
diff --git a/crates/nu-protocol/src/engine/stack.rs b/crates/nu-protocol/src/engine/stack.rs
index e963227ca8..fbfb586762 100644
--- a/crates/nu-protocol/src/engine/stack.rs
+++ b/crates/nu-protocol/src/engine/stack.rs
@@ -3,7 +3,7 @@ use crate::{
         ArgumentStack, EngineState, ErrorHandlerStack, Redirection, StackCallArgGuard,
         StackCaptureGuard, StackIoGuard, StackOutDest, DEFAULT_OVERLAY_NAME,
     },
-    OutDest, ShellError, Span, Value, VarId, ENV_VARIABLE_ID, NU_VARIABLE_ID,
+    Config, OutDest, ShellError, Span, Value, VarId, ENV_VARIABLE_ID, NU_VARIABLE_ID,
 };
 use std::{
     collections::{HashMap, HashSet},
@@ -51,6 +51,8 @@ pub struct Stack {
     pub parent_stack: Option<Arc<Stack>>,
     /// Variables that have been deleted (this is used to hide values from parent stack lookups)
     pub parent_deletions: Vec<VarId>,
+    /// Locally updated config. Use [`.get_config()`] to access correctly.
+    pub config: Option<Arc<Config>>,
     pub(crate) out_dest: StackOutDest,
 }
 
@@ -80,6 +82,7 @@ impl Stack {
             recursion_count: 0,
             parent_stack: None,
             parent_deletions: vec![],
+            config: None,
             out_dest: StackOutDest::new(),
         }
     }
@@ -100,6 +103,7 @@ impl Stack {
             recursion_count: parent.recursion_count,
             vars: vec![],
             parent_deletions: vec![],
+            config: parent.config.clone(),
             out_dest: parent.out_dest.clone(),
             parent_stack: Some(parent),
         }
@@ -126,6 +130,7 @@ impl Stack {
         unique_stack.env_vars = child.env_vars;
         unique_stack.env_hidden = child.env_hidden;
         unique_stack.active_overlays = child.active_overlays;
+        unique_stack.config = child.config;
         unique_stack
     }
 
@@ -192,6 +197,36 @@ impl Stack {
         }
     }
 
+    /// Get the local config if set, otherwise the config from the engine state.
+    ///
+    /// This is the canonical way to get [`Config`] when [`Stack`] is available.
+    pub fn get_config(&self, engine_state: &EngineState) -> Arc<Config> {
+        self.config
+            .clone()
+            .unwrap_or_else(|| engine_state.config.clone())
+    }
+
+    /// Update the local config with the config stored in the `config` environment variable. Run
+    /// this after assigning to `$env.config`.
+    ///
+    /// The config will be updated with successfully parsed values even if an error occurs.
+    pub fn update_config(&mut self, engine_state: &EngineState) -> Result<(), ShellError> {
+        if let Some(mut config) = self.get_env_var(engine_state, "config") {
+            let existing_config = self.get_config(engine_state);
+            let (new_config, error) = config.parse_as_config(&existing_config);
+            self.config = Some(new_config.into());
+            // The config value is modified by the update, so we should add it again
+            self.add_env_var("config".into(), config);
+            match error {
+                None => Ok(()),
+                Some(err) => Err(err),
+            }
+        } else {
+            self.config = None;
+            Ok(())
+        }
+    }
+
     pub fn add_var(&mut self, var_id: VarId, value: Value) {
         //self.vars.insert(var_id, value);
         for (id, val) in &mut self.vars {
@@ -272,6 +307,7 @@ impl Stack {
             recursion_count: self.recursion_count,
             parent_stack: None,
             parent_deletions: vec![],
+            config: self.config.clone(),
             out_dest: self.out_dest.clone(),
         }
     }
@@ -305,6 +341,7 @@ impl Stack {
             recursion_count: self.recursion_count,
             parent_stack: None,
             parent_deletions: vec![],
+            config: self.config.clone(),
             out_dest: self.out_dest.clone(),
         }
     }
diff --git a/crates/nu-protocol/src/engine/state_working_set.rs b/crates/nu-protocol/src/engine/state_working_set.rs
index 8c3968a824..af1085c1ee 100644
--- a/crates/nu-protocol/src/engine/state_working_set.rs
+++ b/crates/nu-protocol/src/engine/state_working_set.rs
@@ -627,9 +627,9 @@ impl<'a> StateWorkingSet<'a> {
 
     /// Returns a reference to the config stored at permanent state
     ///
-    /// At runtime, you most likely want to call nu_engine::env::get_config because this method
-    /// does not capture environment updates during runtime.
-    pub fn get_config(&self) -> &Config {
+    /// At runtime, you most likely want to call [`Stack::get_config()`][super::Stack::get_config()]
+    /// because this method does not capture environment updates during runtime.
+    pub fn get_config(&self) -> &Arc<Config> {
         &self.permanent_state.config
     }
 
diff --git a/crates/nu-protocol/src/eval_base.rs b/crates/nu-protocol/src/eval_base.rs
index 9c5878ee87..f49d235482 100644
--- a/crates/nu-protocol/src/eval_base.rs
+++ b/crates/nu-protocol/src/eval_base.rs
@@ -7,7 +7,7 @@ use crate::{
     debugger::DebugContext,
     Config, GetSpan, Range, Record, ShellError, Span, Value, VarId, ENV_VARIABLE_ID,
 };
-use std::{borrow::Cow, collections::HashMap};
+use std::{collections::HashMap, sync::Arc};
 
 /// To share implementations for regular eval and const eval
 pub trait Eval {
@@ -316,7 +316,7 @@ pub trait Eval {
         }
     }
 
-    fn get_config<'a>(state: Self::State<'a>, mut_state: &mut Self::MutState) -> Cow<'a, Config>;
+    fn get_config(state: Self::State<'_>, mut_state: &mut Self::MutState) -> Arc<Config>;
 
     fn eval_filepath(
         state: Self::State<'_>,
diff --git a/crates/nu-protocol/src/eval_const.rs b/crates/nu-protocol/src/eval_const.rs
index da7570b43c..cba2392338 100644
--- a/crates/nu-protocol/src/eval_const.rs
+++ b/crates/nu-protocol/src/eval_const.rs
@@ -11,8 +11,8 @@ use crate::{
 };
 use nu_system::os_info::{get_kernel_version, get_os_arch, get_os_family, get_os_name};
 use std::{
-    borrow::Cow,
     path::{Path, PathBuf},
+    sync::Arc,
 };
 
 /// Create a Value for `$nu`.
@@ -364,8 +364,8 @@ impl Eval for EvalConst {
 
     type MutState = ();
 
-    fn get_config<'a>(state: Self::State<'a>, _: &mut ()) -> Cow<'a, Config> {
-        Cow::Borrowed(state.get_config())
+    fn get_config(state: Self::State<'_>, _: &mut ()) -> Arc<Config> {
+        state.get_config().clone()
     }
 
     fn eval_filepath(

From 9fec5883c0650836a625b69538dec92f14d450ec Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Thu, 11 Jul 2024 15:18:58 +0200
Subject: [PATCH 0214/1072] Group dependabot bumps for uutils/coreutils
 (#13346)

Similar to #13084 for polars. This familiy of crates has shared
versioning and tends to at least depend on the same `uucore` crate.
---
 .github/dependabot.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 2193598686..07e0b2b891 100644
--- 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:

From a7a5315638cdf34a0b0b5f27d7d95f492fa0b9d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Jul 2024 13:29:34 +0000
Subject: [PATCH 0215/1072] Bump crate-ci/typos from 1.23.1 to 1.23.2 (#13347)

---
 .github/workflows/typos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index 0f1e4cb5d9..c7c153983d 100644
--- 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.23.1
+        uses: crate-ci/typos@v1.23.2

From acd4cb83e8c9d89eefd63f82b9c0d7ce1e3c9214 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Jul 2024 14:08:42 +0000
Subject: [PATCH 0216/1072] Bump ureq from 2.9.7 to 2.10.0 (#13348)

---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c7608643dc..c8bfe4ab4e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6470,9 +6470,9 @@ checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
 
 [[package]]
 name = "ureq"
-version = "2.9.7"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd"
+checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea"
 dependencies = [
  "base64 0.22.1",
  "encoding_rs",
diff --git a/Cargo.toml b/Cargo.toml
index eb8a92c630..a0b3ef27f5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -164,7 +164,7 @@ 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.27"
 uu_mkdir = "0.0.27"

From ccd0160c328941e895be3f01c8d06768065312b3 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Thu, 11 Jul 2024 10:49:46 -0700
Subject: [PATCH 0217/1072] Make the `store-env` IR instruction also update
 config (#13351)

# Description

Follow up fix to #13332, so that changes to config when running under IR
actually happen as well. Since I merged them around the same time, I
forgot about this.
---
 crates/nu-engine/src/eval_ir.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index e2ec7ccdac..56bbccee25 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -367,7 +367,11 @@ fn eval_instruction<D: DebugContext>(
             let key = get_env_var_name_case_insensitive(ctx, key);
 
             if !is_automatic_env_var(&key) {
+                let is_config = key == "config";
                 ctx.stack.add_env_var(key.into_owned(), value);
+                if is_config {
+                    ctx.stack.update_config(ctx.engine_state)?;
+                }
                 Ok(Continue)
             } else {
                 Err(ShellError::AutomaticEnvVarSetManually {

From 4bd87d04962989f47636be9b8279b98ac85fcd5e Mon Sep 17 00:00:00 2001
From: Maxim Zhiburt <zhiburt@gmail.com>
Date: Thu, 11 Jul 2024 23:13:16 +0300
Subject: [PATCH 0218/1072] Fix unused space when truncation is used and header
 on border is configured (#13353)

Somehow this logic was missed on my end. ( I mean I was not even
thinking about it in original patch :smile: )

Please recheck

Added a regression test too.

close #13336

cc: @fdncred
---
 crates/nu-command/tests/commands/table.rs |  6 ++
 crates/nu-table/src/table.rs              | 89 ++++++++++++++++++-----
 2 files changed, 76 insertions(+), 19 deletions(-)

diff --git a/crates/nu-command/tests/commands/table.rs b/crates/nu-command/tests/commands/table.rs
index 16d5eb54ab..a4869f6bfa 100644
--- a/crates/nu-command/tests/commands/table.rs
+++ b/crates/nu-command/tests/commands/table.rs
@@ -2895,3 +2895,9 @@ fn table_kv_header_on_separator_trim_algorithm() {
     let actual = nu!("$env.config.table.header_on_separator = true; {key1: '111111111111111111111111111111111111111111111111111111111111'} | table --width=60 --theme basic");
     assert_eq!(actual.out, "+------+---------------------------------------------------+| key1 | 1111111111111111111111111111111111111111111111111 ||      | 11111111111                                       |+------+---------------------------------------------------+");
 }
+
+#[test]
+fn table_general_header_on_separator_trim_algorithm() {
+    let actual = nu!("$env.config.table.header_on_separator = true; [[a b]; ['11111111111111111111111111111111111111' 2] ] | table --width=20 --theme basic");
+    assert_eq!(actual.out, "+-#-+----a-----+-b-+| 0 | 11111111 | 2 ||   | 11111111 |   ||   | 11111111 |   ||   | 11111111 |   ||   | 111111   |   |+---+----------+---+");
+}
diff --git a/crates/nu-table/src/table.rs b/crates/nu-table/src/table.rs
index d2cf8f4d63..0dbf1bda7e 100644
--- a/crates/nu-table/src/table.rs
+++ b/crates/nu-table/src/table.rs
@@ -255,7 +255,8 @@ fn draw_table(
     align_table(&mut table, alignments, with_index, with_header, with_footer);
     colorize_table(&mut table, styles, with_index, with_header, with_footer);
 
-    let width_ctrl = TableWidthCtrl::new(widths, cfg, termwidth);
+    let pad = indent.0 + indent.1;
+    let width_ctrl = TableWidthCtrl::new(widths, cfg, termwidth, pad);
 
     if with_header && border_header {
         set_border_head(&mut table, with_footer, width_ctrl);
@@ -336,12 +337,18 @@ fn table_to_string(table: Table, termwidth: usize) -> Option<String> {
 struct TableWidthCtrl {
     width: Vec<usize>,
     cfg: NuTableConfig,
-    max: usize,
+    width_max: usize,
+    pad: usize,
 }
 
 impl TableWidthCtrl {
-    fn new(width: Vec<usize>, cfg: NuTableConfig, max: usize) -> Self {
-        Self { width, cfg, max }
+    fn new(width: Vec<usize>, cfg: NuTableConfig, max: usize, pad: usize) -> Self {
+        Self {
+            width,
+            cfg,
+            width_max: max,
+            pad,
+        }
     }
 }
 
@@ -354,19 +361,20 @@ impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for
     ) {
         let total_width = get_total_width2(&self.width, cfg);
 
-        if total_width > self.max {
+        if total_width > self.width_max {
             let has_header = self.cfg.with_header && rec.count_rows() > 1;
             let trim_as_head = has_header && self.cfg.header_on_border;
 
-            TableTrim {
-                max: self.max,
-                strategy: self.cfg.trim,
-                width: self.width,
+            TableTrim::new(
+                self.width,
+                self.width_max,
+                self.cfg.trim,
                 trim_as_head,
-            }
+                self.pad,
+            )
             .change(rec, cfg, dim);
-        } else if self.cfg.expand && self.max > total_width {
-            Settings::new(SetDimensions(self.width), Width::increase(self.max))
+        } else if self.cfg.expand && self.width_max > total_width {
+            Settings::new(SetDimensions(self.width), Width::increase(self.width_max))
                 .change(rec, cfg, dim)
         } else {
             SetDimensions(self.width).change(rec, cfg, dim);
@@ -376,9 +384,28 @@ impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for
 
 struct TableTrim {
     width: Vec<usize>,
+    width_max: usize,
     strategy: TrimStrategy,
-    max: usize,
     trim_as_head: bool,
+    pad: usize,
+}
+
+impl TableTrim {
+    fn new(
+        width: Vec<usize>,
+        width_max: usize,
+        strategy: TrimStrategy,
+        trim_as_head: bool,
+        pad: usize,
+    ) -> Self {
+        Self {
+            width,
+            strategy,
+            pad,
+            width_max,
+            trim_as_head,
+        }
+    }
 }
 
 impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for TableTrim {
@@ -395,13 +422,37 @@ impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for
                 return;
             }
 
+            // even though it's safe to trim columns by header there might be left unused space
+            // so we do use it if possible prioritizing left columns
+
             let headers = recs[0].to_owned();
-            for (i, head) in headers.into_iter().enumerate() {
-                let head_width = CellInfo::width(&head);
+            let headers_widths = headers
+                .iter()
+                .map(CellInfo::width)
+                .map(|v| v + self.pad)
+                .collect::<Vec<_>>();
+
+            let min_width_use = get_total_width2(&headers_widths, cfg);
+
+            let mut free_width = self.width_max.saturating_sub(min_width_use);
+
+            for (i, head_width) in headers_widths.into_iter().enumerate() {
+                let head_width = head_width - self.pad;
+                let column_width = self.width[i] - self.pad; // safe to assume width is bigger then paddding
+
+                let mut use_width = head_width;
+                if free_width > 0 {
+                    // it's safe to assume that column_width is always bigger or equal to head_width
+                    debug_assert!(column_width >= head_width);
+
+                    let additional_width = min(free_width, column_width - head_width);
+                    free_width -= additional_width;
+                    use_width += additional_width;
+                }
 
                 match &self.strategy {
                     TrimStrategy::Wrap { try_to_keep_words } => {
-                        let mut wrap = Width::wrap(head_width);
+                        let mut wrap = Width::wrap(use_width);
                         if *try_to_keep_words {
                             wrap = wrap.keep_words();
                         }
@@ -411,7 +462,7 @@ impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for
                             .change(recs, cfg, dims);
                     }
                     TrimStrategy::Truncate { suffix } => {
-                        let mut truncate = Width::truncate(self.max);
+                        let mut truncate = Width::truncate(use_width);
                         if let Some(suffix) = suffix {
                             truncate = truncate.suffix(suffix).suffix_try_color(true);
                         }
@@ -428,7 +479,7 @@ impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for
 
         match self.strategy {
             TrimStrategy::Wrap { try_to_keep_words } => {
-                let mut wrap = Width::wrap(self.max).priority::<PriorityMax>();
+                let mut wrap = Width::wrap(self.width_max).priority::<PriorityMax>();
                 if try_to_keep_words {
                     wrap = wrap.keep_words();
                 }
@@ -436,7 +487,7 @@ impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for
                 Settings::new(SetDimensions(self.width), wrap).change(recs, cfg, dims);
             }
             TrimStrategy::Truncate { suffix } => {
-                let mut truncate = Width::truncate(self.max).priority::<PriorityMax>();
+                let mut truncate = Width::truncate(self.width_max).priority::<PriorityMax>();
                 if let Some(suffix) = suffix {
                     truncate = truncate.suffix(suffix).suffix_try_color(true);
                 }

From d56457d63e7d053e93175ca352f18d4e6eec7301 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Fri, 12 Jul 2024 02:43:10 +0000
Subject: [PATCH 0219/1072] Path migration part 2: `nu-test-support` (#13329)

# Description
Part 2 of replacing `std::path` types with `nu_path` types added in
#13115. This PR targets `nu-test-support`.
---
 crates/nu-cli/tests/completions/mod.rs        |   2 +-
 .../support/completions_helpers.rs            |  20 +-
 crates/nu-command/src/system/run_external.rs  |   2 +-
 .../tests/commands/database/into_sqlite.rs    |   2 +-
 crates/nu-command/tests/commands/rm.rs        |   5 +-
 .../nu-command/tests/commands/source_env.rs   |  12 +-
 crates/nu-command/tests/commands/ucp.rs       |   8 +-
 crates/nu-command/tests/commands/use_.rs      |   9 +-
 crates/nu-test-support/src/fs.rs              | 227 +++---------------
 crates/nu-test-support/src/macros.rs          |  25 +-
 crates/nu-test-support/src/playground.rs      |   2 +-
 .../src/playground/director.rs                |   2 +-
 .../src/playground/nu_process.rs              |  19 +-
 crates/nu-test-support/src/playground/play.rs | 124 ++++------
 .../nu-test-support/src/playground/tests.rs   |  11 +-
 tests/plugins/nu_plugin_nu_example.rs         |   2 +-
 tests/plugins/registry_file.rs                |   8 +-
 17 files changed, 142 insertions(+), 338 deletions(-)

diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index a7f88dc3b0..590979251e 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -721,7 +721,7 @@ fn file_completion_quoted() {
         "`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);
diff --git a/crates/nu-cli/tests/completions/support/completions_helpers.rs b/crates/nu-cli/tests/completions/support/completions_helpers.rs
index 027ac9d997..623d6fbc5a 100644
--- 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
@@ -69,7 +70,7 @@ pub fn new_engine() -> (PathBuf, String, EngineState, Stack) {
 }
 
 // creates a new engine with the current path into the completions fixtures folder
-pub fn new_dotnu_engine() -> (PathBuf, String, EngineState, Stack) {
+pub fn new_dotnu_engine() -> (AbsolutePathBuf, String, EngineState, Stack) {
     // Target folder inside assets
     let dir = fs::fixtures().join("dotnu_completions");
     let dir_str = dir
@@ -114,7 +115,7 @@ pub fn new_dotnu_engine() -> (PathBuf, String, EngineState, Stack) {
     (dir, dir_str, engine_state, stack)
 }
 
-pub fn new_quote_engine() -> (PathBuf, String, EngineState, 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
@@ -149,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
@@ -205,16 +206,15 @@ pub fn match_suggestions(expected: Vec<String>, suggestions: Vec<Suggestion>) {
 }
 
 // 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 {
-    path.into_os_string().into_string().unwrap_or_default()
+pub fn file(path: impl Into<PathBuf>) -> String {
+    path.into().into_os_string().into_string().unwrap()
 }
 
 // merge_input executes the given input into the engine
@@ -223,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);
diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index a7ca822011..5e8527b45e 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -580,7 +580,7 @@ mod test {
         Playground::setup("test_expand_glob", |dirs, play| {
             play.with_files(&[Stub::EmptyFile("a.txt"), Stub::EmptyFile("b.txt")]);
 
-            let cwd = dirs.test();
+            let cwd = dirs.test().as_std_path();
 
             let actual = expand_glob("*.txt", cwd, Span::unknown(), &Signals::empty()).unwrap();
             let expected = &["a.txt", "b.txt"];
diff --git a/crates/nu-command/tests/commands/database/into_sqlite.rs b/crates/nu-command/tests/commands/database/into_sqlite.rs
index 595c88dc38..faa45040b3 100644
--- a/crates/nu-command/tests/commands/database/into_sqlite.rs
+++ b/crates/nu-command/tests/commands/database/into_sqlite.rs
@@ -465,7 +465,7 @@ fn make_sqlite_db(dirs: &Dirs, nu_table: &str) -> PathBuf {
     );
 
     assert!(nucmd.status.success());
-    testdb_path
+    testdb_path.into()
 }
 
 fn insert_test_rows(dirs: &Dirs, nu_table: &str, sql_query: Option<&str>, expected: Vec<TestRow>) {
diff --git a/crates/nu-command/tests/commands/rm.rs b/crates/nu-command/tests/commands/rm.rs
index b3a273ea86..e6cbf88cda 100644
--- a/crates/nu-command/tests/commands/rm.rs
+++ b/crates/nu-command/tests/commands/rm.rs
@@ -1,3 +1,4 @@
+use nu_path::AbsolutePath;
 use nu_test_support::fs::{files_exist_at, Stub::EmptyFile};
 use nu_test_support::nu;
 use nu_test_support::playground::Playground;
@@ -405,10 +406,10 @@ fn removes_file_after_cd() {
 }
 
 struct Cleanup<'a> {
-    dir_to_clean: &'a Path,
+    dir_to_clean: &'a AbsolutePath,
 }
 
-fn set_dir_read_only(directory: &Path, read_only: bool) {
+fn set_dir_read_only(directory: &AbsolutePath, read_only: bool) {
     let mut permissions = fs::metadata(directory).unwrap().permissions();
     permissions.set_readonly(read_only);
     fs::set_permissions(directory, permissions).expect("failed to set directory permissions");
diff --git a/crates/nu-command/tests/commands/source_env.rs b/crates/nu-command/tests/commands/source_env.rs
index 9dd0320a45..f9cc3fbc1c 100644
--- a/crates/nu-command/tests/commands/source_env.rs
+++ b/crates/nu-command/tests/commands/source_env.rs
@@ -1,4 +1,3 @@
-use nu_test_support::fs::AbsolutePath;
 use nu_test_support::fs::Stub::{FileWithContent, FileWithContentToBeTrimmed};
 use nu_test_support::nu;
 use nu_test_support::pipeline;
@@ -8,17 +7,18 @@ use nu_test_support::playground::Playground;
 #[test]
 fn sources_also_files_under_custom_lib_dirs_path() {
     Playground::setup("source_test_1", |dirs, nu| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-        let library_path = AbsolutePath::new(dirs.test().join("lib"));
+        let file = dirs.test().join("config.toml");
+        let library_path = dirs.test().join("lib");
 
-        nu.with_config(&file);
+        nu.with_config(file);
         nu.with_files(&[FileWithContent(
             "config.toml",
             &format!(
                 r#"
-                lib_dirs = ["{library_path}"]
+                lib_dirs = ["{}"]
                 skip_welcome_message = true
-            "#
+            "#,
+                library_path.as_os_str().to_str().unwrap(),
             ),
         )]);
 
diff --git a/crates/nu-command/tests/commands/ucp.rs b/crates/nu-command/tests/commands/ucp.rs
index 728cf1dcb2..2c2b30f252 100644
--- a/crates/nu-command/tests/commands/ucp.rs
+++ b/crates/nu-command/tests/commands/ucp.rs
@@ -1,6 +1,6 @@
 use nu_test_support::fs::file_contents;
 use nu_test_support::fs::{
-    files_exist_at, AbsoluteFile,
+    files_exist_at,
     Stub::{EmptyFile, FileWithContent, FileWithPermission},
 };
 use nu_test_support::nu;
@@ -55,7 +55,7 @@ fn copies_the_file_inside_directory_if_path_to_copy_is_directory() {
 
 fn copies_the_file_inside_directory_if_path_to_copy_is_directory_impl(progress: bool) {
     Playground::setup("ucp_test_2", |dirs, _| {
-        let expected_file = AbsoluteFile::new(dirs.test().join("sample.ini"));
+        let expected_file = dirs.test().join("sample.ini");
         let progress_flag = if progress { "-p" } else { "" };
 
         // Get the hash of the file content to check integrity after copy.
@@ -64,13 +64,13 @@ fn copies_the_file_inside_directory_if_path_to_copy_is_directory_impl(progress:
             cwd: dirs.formats(),
             "cp {} ../formats/sample.ini {}",
             progress_flag,
-            expected_file.dir()
+            expected_file.parent().unwrap().as_os_str().to_str().unwrap(),
         );
 
         assert!(dirs.test().join("sample.ini").exists());
 
         // Check the integrity of the file.
-        let after_cp_hash = get_file_hash(expected_file);
+        let after_cp_hash = get_file_hash(expected_file.display());
         assert_eq!(first_hash, after_cp_hash);
     })
 }
diff --git a/crates/nu-command/tests/commands/use_.rs b/crates/nu-command/tests/commands/use_.rs
index 63b1f8391a..2895e1635f 100644
--- a/crates/nu-command/tests/commands/use_.rs
+++ b/crates/nu-command/tests/commands/use_.rs
@@ -1,4 +1,3 @@
-use nu_test_support::fs::AbsolutePath;
 use nu_test_support::fs::Stub::{FileWithContent, FileWithContentToBeTrimmed};
 use nu_test_support::nu;
 use nu_test_support::pipeline;
@@ -7,10 +6,10 @@ use nu_test_support::playground::Playground;
 #[test]
 fn use_module_file_within_block() {
     Playground::setup("use_test_1", |dirs, nu| {
-        let file = AbsolutePath::new(dirs.test().join("spam.nu"));
+        let file = dirs.test().join("spam.nu");
 
         nu.with_files(&[FileWithContent(
-            &file.to_string(),
+            file.as_os_str().to_str().unwrap(),
             r#"
                 export def foo [] {
                     echo "hello world"
@@ -37,10 +36,10 @@ fn use_module_file_within_block() {
 #[test]
 fn use_keeps_doc_comments() {
     Playground::setup("use_doc_comments", |dirs, nu| {
-        let file = AbsolutePath::new(dirs.test().join("spam.nu"));
+        let file = dirs.test().join("spam.nu");
 
         nu.with_files(&[FileWithContent(
-            &file.to_string(),
+            file.as_os_str().to_str().unwrap(),
             r#"
                 # this is my foo command
                 export def foo [
diff --git a/crates/nu-test-support/src/fs.rs b/crates/nu-test-support/src/fs.rs
index 00321e6590..eb90e16ab2 100644
--- a/crates/nu-test-support/src/fs.rs
+++ b/crates/nu-test-support/src/fs.rs
@@ -1,137 +1,5 @@
-use std::fmt::Display;
+use nu_path::{AbsolutePath, AbsolutePathBuf, Path};
 use std::io::Read;
-use std::ops::Div;
-use std::path::{Path, PathBuf};
-
-pub struct AbsoluteFile {
-    inner: PathBuf,
-}
-
-impl AbsoluteFile {
-    pub fn new(path: impl AsRef<Path>) -> AbsoluteFile {
-        let path = path.as_ref();
-
-        if !path.is_absolute() {
-            panic!(
-                "AbsoluteFile::new must take an absolute path :: {}",
-                path.display()
-            )
-        } else if path.is_dir() {
-            // At the moment, this is not an invariant, but rather a way to catch bugs
-            // in tests.
-            panic!(
-                "AbsoluteFile::new must not take a directory :: {}",
-                path.display()
-            )
-        } else {
-            AbsoluteFile {
-                inner: path.to_path_buf(),
-            }
-        }
-    }
-
-    pub fn dir(&self) -> AbsolutePath {
-        AbsolutePath::new(if let Some(parent) = self.inner.parent() {
-            parent
-        } else {
-            unreachable!("Internal error: could not get parent in dir")
-        })
-    }
-}
-
-impl From<AbsoluteFile> for PathBuf {
-    fn from(file: AbsoluteFile) -> Self {
-        file.inner
-    }
-}
-
-pub struct AbsolutePath {
-    pub inner: PathBuf,
-}
-
-impl AbsolutePath {
-    pub fn new(path: impl AsRef<Path>) -> AbsolutePath {
-        let path = path.as_ref();
-
-        if path.is_absolute() {
-            AbsolutePath {
-                inner: path.to_path_buf(),
-            }
-        } else {
-            panic!("AbsolutePath::new must take an absolute path")
-        }
-    }
-}
-
-impl Div<&str> for &AbsolutePath {
-    type Output = AbsolutePath;
-
-    fn div(self, rhs: &str) -> Self::Output {
-        let parts = rhs.split('/');
-        let mut result = self.inner.clone();
-
-        for part in parts {
-            result = result.join(part);
-        }
-
-        AbsolutePath::new(result)
-    }
-}
-
-impl AsRef<Path> for AbsolutePath {
-    fn as_ref(&self) -> &Path {
-        self.inner.as_path()
-    }
-}
-
-pub struct RelativePath {
-    inner: PathBuf,
-}
-
-impl RelativePath {
-    pub fn new(path: impl Into<PathBuf>) -> RelativePath {
-        let path = path.into();
-
-        if path.is_relative() {
-            RelativePath { inner: path }
-        } else {
-            panic!("RelativePath::new must take a relative path")
-        }
-    }
-}
-
-impl<T: AsRef<str>> Div<T> for &RelativePath {
-    type Output = RelativePath;
-
-    fn div(self, rhs: T) -> Self::Output {
-        let parts = rhs.as_ref().split('/');
-        let mut result = self.inner.clone();
-
-        for part in parts {
-            result = result.join(part);
-        }
-
-        RelativePath::new(result)
-    }
-}
-
-impl Display for AbsoluteFile {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.inner.display())
-    }
-}
-
-impl Display for AbsolutePath {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.inner.display())
-    }
-}
-
-impl Display for RelativePath {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.inner.display())
-    }
-}
 
 pub enum Stub<'a> {
     FileWithContent(&'a str, &'a str),
@@ -140,7 +8,7 @@ pub enum Stub<'a> {
     FileWithPermission(&'a str, bool),
 }
 
-pub fn file_contents(full_path: impl AsRef<Path>) -> String {
+pub fn file_contents(full_path: impl AsRef<AbsolutePath>) -> String {
     let mut file = std::fs::File::open(full_path.as_ref()).expect("can not open file");
     let mut contents = String::new();
     file.read_to_string(&mut contents)
@@ -148,7 +16,7 @@ pub fn file_contents(full_path: impl AsRef<Path>) -> String {
     contents
 }
 
-pub fn file_contents_binary(full_path: impl AsRef<Path>) -> Vec<u8> {
+pub fn file_contents_binary(full_path: impl AsRef<AbsolutePath>) -> Vec<u8> {
     let mut file = std::fs::File::open(full_path.as_ref()).expect("can not open file");
     let mut contents = Vec::new();
     file.read_to_end(&mut contents).expect("can not read file");
@@ -167,56 +35,32 @@ pub fn line_ending() -> String {
     }
 }
 
-pub fn delete_file_at(full_path: impl AsRef<Path>) {
-    let full_path = full_path.as_ref();
-
-    if full_path.exists() {
-        std::fs::remove_file(full_path).expect("can not delete file");
-    }
+pub fn files_exist_at(files: Vec<impl AsRef<Path>>, path: impl AsRef<AbsolutePath>) -> bool {
+    let path = path.as_ref();
+    files.iter().all(|f| path.join(f.as_ref()).exists())
 }
 
-pub fn create_file_at(full_path: impl AsRef<Path>) -> Result<(), std::io::Error> {
-    let full_path = full_path.as_ref();
-
-    if full_path.parent().is_some() {
-        panic!("path exists");
-    }
-
-    std::fs::write(full_path, b"fake data")
-}
-
-pub fn copy_file_to(source: &str, destination: &str) {
-    std::fs::copy(source, destination).expect("can not copy file");
-}
-
-pub fn files_exist_at(files: Vec<impl AsRef<Path>>, path: impl AsRef<Path>) -> bool {
-    files.iter().all(|f| {
-        let mut loc = PathBuf::from(path.as_ref());
-        loc.push(f);
-        loc.exists()
-    })
-}
-
-pub fn delete_directory_at(full_path: &str) {
-    std::fs::remove_dir_all(PathBuf::from(full_path)).expect("can not remove directory");
-}
-
-pub fn executable_path() -> PathBuf {
+pub fn executable_path() -> AbsolutePathBuf {
     let mut path = binaries();
     path.push("nu");
     path
 }
 
-pub fn installed_nu_path() -> PathBuf {
+pub fn installed_nu_path() -> AbsolutePathBuf {
     let path = std::env::var_os(crate::NATIVE_PATH_ENV_VAR);
-    which::which_in("nu", path, ".").unwrap_or_else(|_| executable_path())
+    if let Ok(path) = which::which_in("nu", path, ".") {
+        AbsolutePathBuf::try_from(path).expect("installed nushell path is absolute")
+    } else {
+        executable_path()
+    }
 }
 
-pub fn root() -> PathBuf {
+pub fn root() -> AbsolutePathBuf {
     let manifest_dir = if let Ok(manifest_dir) = std::env::var("CARGO_MANIFEST_DIR") {
-        PathBuf::from(manifest_dir)
+        AbsolutePathBuf::try_from(manifest_dir).expect("CARGO_MANIFEST_DIR is not an absolute path")
     } else {
-        PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+        AbsolutePathBuf::try_from(env!("CARGO_MANIFEST_DIR"))
+            .expect("CARGO_MANIFEST_DIR is not an absolute path")
     };
 
     let test_path = manifest_dir.join("Cargo.lock");
@@ -228,11 +72,11 @@ pub fn root() -> PathBuf {
             .expect("Couldn't find the debug binaries directory")
             .parent()
             .expect("Couldn't find the debug binaries directory")
-            .to_path_buf()
+            .into()
     }
 }
 
-pub fn binaries() -> PathBuf {
+pub fn binaries() -> AbsolutePathBuf {
     let build_target = std::env::var("CARGO_BUILD_TARGET").unwrap_or_default();
 
     let profile = if let Ok(env_profile) = std::env::var("NUSHELL_CARGO_PROFILE") {
@@ -244,27 +88,28 @@ pub fn binaries() -> PathBuf {
     };
 
     std::env::var("CARGO_TARGET_DIR")
-        .map(PathBuf::from)
-        .unwrap_or_else(|_| root().join("target"))
+        .ok()
+        .and_then(|p| AbsolutePathBuf::try_from(p).ok())
+        .unwrap_or_else(|| root().join("target"))
         .join(build_target)
         .join(profile)
 }
 
-pub fn fixtures() -> PathBuf {
-    root().join("tests").join("fixtures")
+pub fn fixtures() -> AbsolutePathBuf {
+    let mut path = root();
+    path.push("tests");
+    path.push("fixtures");
+    path
 }
 
-pub fn assets() -> PathBuf {
-    root().join("tests/assets")
-}
+// FIXME: re-enable nu_json tests
+// pub fn assets() -> AbsolutePathBuf {
+//     let mut path = root();
+//     path.push("tests");
+//     path.push("assets");
+//     path
+// }
 
-pub fn in_directory(str: impl AsRef<Path>) -> String {
-    let path = str.as_ref();
-    let path = if path.is_relative() {
-        root().join(path)
-    } else {
-        path.to_path_buf()
-    };
-
-    path.display().to_string()
+pub fn in_directory(path: impl AsRef<nu_path::Path>) -> AbsolutePathBuf {
+    root().join(path)
 }
diff --git a/crates/nu-test-support/src/macros.rs b/crates/nu-test-support/src/macros.rs
index 958a2453f5..6fd3a8c307 100644
--- a/crates/nu-test-support/src/macros.rs
+++ b/crates/nu-test-support/src/macros.rs
@@ -234,16 +234,16 @@ macro_rules! nu_with_plugins {
 }
 
 use crate::{Outcome, NATIVE_PATH_ENV_VAR};
-use std::ffi::OsStr;
+use nu_path::{AbsolutePath, AbsolutePathBuf, Path};
 use std::{
-    path::Path,
+    ffi::OsStr,
     process::{Command, Stdio},
 };
 use tempfile::tempdir;
 
 #[derive(Default)]
 pub struct NuOpts {
-    pub cwd: Option<String>,
+    pub cwd: Option<AbsolutePathBuf>,
     pub locale: Option<String>,
     pub envs: Option<Vec<(String, String)>>,
     pub collapse_output: Option<bool>,
@@ -251,19 +251,12 @@ pub struct NuOpts {
 }
 
 pub fn nu_run_test(opts: NuOpts, commands: impl AsRef<str>, with_std: bool) -> Outcome {
-    let test_bins = crate::fs::binaries();
-
-    let cwd = std::env::current_dir().expect("Could not get current working directory.");
-    let test_bins = nu_path::canonicalize_with(&test_bins, cwd).unwrap_or_else(|e| {
-        panic!(
-            "Couldn't canonicalize dummy binaries path {}: {:?}",
-            test_bins.display(),
-            e
-        )
-    });
+    let test_bins = crate::fs::binaries()
+        .canonicalize()
+        .expect("Could not canonicalize dummy binaries path");
 
     let mut paths = crate::shell_os_paths();
-    paths.insert(0, test_bins);
+    paths.insert(0, test_bins.into());
 
     let commands = commands.as_ref().lines().collect::<Vec<_>>().join("; ");
 
@@ -272,7 +265,7 @@ pub fn nu_run_test(opts: NuOpts, commands: impl AsRef<str>, with_std: bool) -> O
         Err(_) => panic!("Couldn't join paths for PATH var."),
     };
 
-    let target_cwd = opts.cwd.unwrap_or(".".to_string());
+    let target_cwd = opts.cwd.unwrap_or_else(crate::fs::root);
     let locale = opts.locale.unwrap_or("en_US.UTF-8".to_string());
     let executable_path = crate::fs::executable_path();
 
@@ -450,7 +443,7 @@ fn collapse_output(out: &str) -> String {
     out.replace('\n', "")
 }
 
-fn setup_command(executable_path: &Path, target_cwd: &str) -> Command {
+fn setup_command(executable_path: &AbsolutePath, target_cwd: &AbsolutePath) -> Command {
     let mut command = Command::new(executable_path);
 
     command
diff --git a/crates/nu-test-support/src/playground.rs b/crates/nu-test-support/src/playground.rs
index 375f192983..4d33dcebe5 100644
--- a/crates/nu-test-support/src/playground.rs
+++ b/crates/nu-test-support/src/playground.rs
@@ -6,5 +6,5 @@ mod play;
 mod tests;
 
 pub use director::Director;
-pub use nu_process::{Executable, NuProcess, NuResult, Outcome};
+pub use nu_process::{Executable, NuProcess, Outcome};
 pub use play::{Dirs, EnvironmentVariable, Playground};
diff --git a/crates/nu-test-support/src/playground/director.rs b/crates/nu-test-support/src/playground/director.rs
index 3d04155c25..a361342495 100644
--- a/crates/nu-test-support/src/playground/director.rs
+++ b/crates/nu-test-support/src/playground/director.rs
@@ -83,7 +83,7 @@ impl Director {
 }
 
 impl Executable for Director {
-    fn execute(&mut self) -> NuResult {
+    fn execute(&mut self) -> Result<Outcome, NuError> {
         use std::process::Stdio;
 
         match self.executable() {
diff --git a/crates/nu-test-support/src/playground/nu_process.rs b/crates/nu-test-support/src/playground/nu_process.rs
index 0031a173e8..2eeac703c6 100644
--- a/crates/nu-test-support/src/playground/nu_process.rs
+++ b/crates/nu-test-support/src/playground/nu_process.rs
@@ -1,12 +1,13 @@
 use super::EnvironmentVariable;
 use crate::fs::{binaries as test_bins_path, executable_path};
-use std::ffi::{OsStr, OsString};
-use std::fmt;
-use std::path::Path;
-use std::process::{Command, ExitStatus};
+use std::{
+    ffi::{OsStr, OsString},
+    fmt,
+    process::{Command, ExitStatus},
+};
 
 pub trait Executable {
-    fn execute(&mut self) -> NuResult;
+    fn execute(&mut self) -> Result<Outcome, NuError>;
 }
 
 #[derive(Clone, Debug)]
@@ -24,8 +25,6 @@ impl Outcome {
     }
 }
 
-pub type NuResult = Result<Outcome, NuError>;
-
 #[derive(Debug)]
 pub struct NuError {
     pub desc: String,
@@ -69,14 +68,10 @@ impl NuProcess {
         self
     }
 
-    pub fn get_cwd(&self) -> Option<&Path> {
-        self.cwd.as_ref().map(Path::new)
-    }
-
     pub fn construct(&self) -> Command {
         let mut command = Command::new(executable_path());
 
-        if let Some(cwd) = self.get_cwd() {
+        if let Some(cwd) = &self.cwd {
             command.current_dir(cwd);
         }
 
diff --git a/crates/nu-test-support/src/playground/play.rs b/crates/nu-test-support/src/playground/play.rs
index 902997200e..12295c2690 100644
--- a/crates/nu-test-support/src/playground/play.rs
+++ b/crates/nu-test-support/src/playground/play.rs
@@ -1,8 +1,9 @@
 use super::Director;
-use crate::fs;
-use crate::fs::Stub;
+use crate::fs::{self, Stub};
 use nu_glob::glob;
-use std::path::{Path, PathBuf};
+#[cfg(not(target_arch = "wasm32"))]
+use nu_path::Path;
+use nu_path::{AbsolutePath, AbsolutePathBuf};
 use std::str;
 use tempfile::{tempdir, TempDir};
 
@@ -22,46 +23,46 @@ impl EnvironmentVariable {
 }
 
 pub struct Playground<'a> {
-    root: TempDir,
+    _root: TempDir,
     tests: String,
-    cwd: PathBuf,
-    config: Option<PathBuf>,
+    cwd: AbsolutePathBuf,
+    config: Option<AbsolutePathBuf>,
     environment_vars: Vec<EnvironmentVariable>,
     dirs: &'a Dirs,
 }
 
-#[derive(Default, Clone)]
+#[derive(Clone)]
 pub struct Dirs {
-    pub root: PathBuf,
-    pub test: PathBuf,
-    pub fixtures: PathBuf,
+    pub root: AbsolutePathBuf,
+    pub test: AbsolutePathBuf,
+    pub fixtures: AbsolutePathBuf,
 }
 
 impl Dirs {
-    pub fn formats(&self) -> PathBuf {
+    pub fn formats(&self) -> AbsolutePathBuf {
         self.fixtures.join("formats")
     }
 
-    pub fn root(&self) -> &Path {
-        self.root.as_path()
+    pub fn root(&self) -> &AbsolutePath {
+        &self.root
     }
 
-    pub fn test(&self) -> &Path {
-        self.test.as_path()
+    pub fn test(&self) -> &AbsolutePath {
+        &self.test
     }
 }
 
 impl<'a> Playground<'a> {
-    pub fn root(&self) -> &Path {
-        self.root.path()
+    pub fn root(&self) -> &AbsolutePath {
+        &self.dirs.root
     }
 
-    pub fn cwd(&self) -> &Path {
+    pub fn cwd(&self) -> &AbsolutePath {
         &self.cwd
     }
 
     pub fn back_to_playground(&mut self) -> &mut Self {
-        self.cwd = PathBuf::from(self.root()).join(self.tests.clone());
+        self.cwd = self.root().join(&self.tests);
         self
     }
 
@@ -70,68 +71,46 @@ impl<'a> Playground<'a> {
     }
 
     pub fn setup(topic: &str, block: impl FnOnce(Dirs, &mut Playground)) {
-        let root = tempdir().expect("Couldn't create a tempdir");
-        let nuplay_dir = root.path().join(topic);
+        let temp = tempdir().expect("Could not create a tempdir");
 
-        if PathBuf::from(&nuplay_dir).exists() {
-            std::fs::remove_dir_all(PathBuf::from(&nuplay_dir)).expect("can not remove directory");
+        let root = AbsolutePathBuf::try_from(temp.path())
+            .expect("Tempdir is not an absolute path")
+            .canonicalize()
+            .expect("Could not canonicalize tempdir");
+
+        let test = root.join(topic);
+        if test.exists() {
+            std::fs::remove_dir_all(&test).expect("Could not remove directory");
         }
+        std::fs::create_dir(&test).expect("Could not create directory");
+        let test = test
+            .canonicalize()
+            .expect("Could not canonicalize test path");
 
-        std::fs::create_dir(PathBuf::from(&nuplay_dir)).expect("can not create directory");
-
-        let fixtures = fs::fixtures();
-        let cwd = std::env::current_dir().expect("Could not get current working directory.");
-        let fixtures = nu_path::canonicalize_with(fixtures.clone(), cwd).unwrap_or_else(|e| {
-            panic!(
-                "Couldn't canonicalize fixtures path {}: {:?}",
-                fixtures.display(),
-                e
-            )
-        });
-
-        let mut playground = Playground {
-            root,
-            tests: topic.to_string(),
-            cwd: nuplay_dir,
-            config: None,
-            environment_vars: Vec::default(),
-            dirs: &Dirs::default(),
-        };
-
-        let playground_root = playground.root.path();
-
-        let cwd = std::env::current_dir().expect("Could not get current working directory.");
-        let test =
-            nu_path::canonicalize_with(playground_root.join(topic), cwd).unwrap_or_else(|e| {
-                panic!(
-                    "Couldn't canonicalize test path {}: {:?}",
-                    playground_root.join(topic).display(),
-                    e
-                )
-            });
-
-        let cwd = std::env::current_dir().expect("Could not get current working directory.");
-        let root = nu_path::canonicalize_with(playground_root, cwd).unwrap_or_else(|e| {
-            panic!(
-                "Couldn't canonicalize tests root path {}: {:?}",
-                playground_root.display(),
-                e
-            )
-        });
+        let fixtures = fs::fixtures()
+            .canonicalize()
+            .expect("Could not canonicalize fixtures path");
 
         let dirs = Dirs {
-            root,
-            test,
-            fixtures,
+            root: root.into(),
+            test: test.as_path().into(),
+            fixtures: fixtures.into(),
         };
 
-        playground.dirs = &dirs;
+        let mut playground = Playground {
+            _root: temp,
+            tests: topic.to_string(),
+            cwd: test.into(),
+            config: None,
+            environment_vars: Vec::default(),
+            dirs: &dirs,
+        };
 
         block(dirs.clone(), &mut playground);
     }
 
-    pub fn with_config(&mut self, source_file: impl AsRef<Path>) -> &mut Self {
-        self.config = Some(source_file.as_ref().to_path_buf());
+    pub fn with_config(&mut self, source_file: AbsolutePathBuf) -> &mut Self {
+        self.config = Some(source_file);
         self
     }
 
@@ -205,7 +184,6 @@ impl<'a> Playground<'a> {
         files
             .iter()
             .map(|f| {
-                let mut path = PathBuf::from(&self.cwd);
                 let mut permission_set = false;
                 let mut write_able = true;
                 let (file_name, contents) = match *f {
@@ -227,7 +205,7 @@ impl<'a> Playground<'a> {
                     }
                 };
 
-                path.push(file_name);
+                let path = self.cwd.join(file_name);
 
                 std::fs::write(&path, contents.as_bytes()).expect("can not create file");
                 if permission_set {
@@ -252,7 +230,7 @@ impl<'a> Playground<'a> {
         self
     }
 
-    pub fn glob_vec(pattern: &str) -> Vec<PathBuf> {
+    pub fn glob_vec(pattern: &str) -> Vec<std::path::PathBuf> {
         let glob = glob(pattern);
 
         glob.expect("invalid pattern")
diff --git a/crates/nu-test-support/src/playground/tests.rs b/crates/nu-test-support/src/playground/tests.rs
index cc4daa597b..7c2be0237e 100644
--- a/crates/nu-test-support/src/playground/tests.rs
+++ b/crates/nu-test-support/src/playground/tests.rs
@@ -1,11 +1,4 @@
 use crate::playground::Playground;
-use std::path::{Path, PathBuf};
-
-fn path(p: &Path) -> PathBuf {
-    let cwd = std::env::current_dir().expect("Could not get current working directory.");
-    nu_path::canonicalize_with(p, cwd)
-        .unwrap_or_else(|e| panic!("Couldn't canonicalize path {}: {:?}", p.display(), e))
-}
 
 #[test]
 fn current_working_directory_in_sandbox_directory_created() {
@@ -13,7 +6,7 @@ fn current_working_directory_in_sandbox_directory_created() {
         let original_cwd = dirs.test();
         nu.within("some_directory_within");
 
-        assert_eq!(path(nu.cwd()), original_cwd.join("some_directory_within"));
+        assert_eq!(nu.cwd(), original_cwd.join("some_directory_within"));
     })
 }
 
@@ -25,6 +18,6 @@ fn current_working_directory_back_to_root_from_anywhere() {
         nu.within("some_directory_within");
         nu.back_to_playground();
 
-        assert_eq!(path(nu.cwd()), *original_cwd);
+        assert_eq!(nu.cwd(), original_cwd);
     })
 }
diff --git a/tests/plugins/nu_plugin_nu_example.rs b/tests/plugins/nu_plugin_nu_example.rs
index f178c64316..afeb487b60 100644
--- a/tests/plugins/nu_plugin_nu_example.rs
+++ b/tests/plugins/nu_plugin_nu_example.rs
@@ -4,7 +4,7 @@ use assert_cmd::Command;
 fn call() {
     // Add the `nu` binaries to the path env
     let path_env = std::env::join_paths(
-        std::iter::once(nu_test_support::fs::binaries()).chain(
+        std::iter::once(nu_test_support::fs::binaries().into()).chain(
             std::env::var_os(nu_test_support::NATIVE_PATH_ENV_VAR)
                 .as_deref()
                 .map(std::env::split_paths)
diff --git a/tests/plugins/registry_file.rs b/tests/plugins/registry_file.rs
index c0f0fa0724..2cb1473b6f 100644
--- a/tests/plugins/registry_file.rs
+++ b/tests/plugins/registry_file.rs
@@ -162,7 +162,7 @@ fn plugin_rm_then_restart_nu() {
         contents.upsert_plugin(PluginRegistryItem {
             name: "foo".into(),
             // this doesn't exist, but it should be ok
-            filename: dirs.test().join("nu_plugin_foo"),
+            filename: dirs.test().join("nu_plugin_foo").into(),
             shell: None,
             data: valid_plugin_item_data(),
         });
@@ -238,7 +238,7 @@ fn plugin_rm_from_custom_path() {
         contents.upsert_plugin(PluginRegistryItem {
             name: "foo".into(),
             // this doesn't exist, but it should be ok
-            filename: dirs.test().join("nu_plugin_foo"),
+            filename: dirs.test().join("nu_plugin_foo").into(),
             shell: None,
             data: valid_plugin_item_data(),
         });
@@ -286,7 +286,7 @@ fn plugin_rm_using_filename() {
         contents.upsert_plugin(PluginRegistryItem {
             name: "foo".into(),
             // this doesn't exist, but it should be ok
-            filename: dirs.test().join("nu_plugin_foo"),
+            filename: dirs.test().join("nu_plugin_foo").into(),
             shell: None,
             data: valid_plugin_item_data(),
         });
@@ -344,7 +344,7 @@ fn warning_on_invalid_plugin_item() {
         contents.upsert_plugin(PluginRegistryItem {
             name: "badtest".into(),
             // this doesn't exist, but it should be ok
-            filename: dirs.test().join("nu_plugin_badtest"),
+            filename: dirs.test().join("nu_plugin_badtest").into(),
             shell: None,
             data: PluginRegistryItemData::Invalid,
         });

From ee875bb8a3106ec445be9a36f44dd7a0e82e6e12 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Fri, 12 Jul 2024 08:23:51 +0000
Subject: [PATCH 0220/1072] Edit path form doc comments (#13358)

# Description
Fixes outdated/inaccurate doc comments for `PathForm`s in `nu_path`.
---
 crates/nu-path/src/form.rs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/crates/nu-path/src/form.rs b/crates/nu-path/src/form.rs
index 4266905a20..edec72c08c 100644
--- a/crates/nu-path/src/form.rs
+++ b/crates/nu-path/src/form.rs
@@ -75,9 +75,6 @@ impl private::Sealed for Canonical {
 
 /// A marker trait for [`PathForm`]s that may be relative paths.
 /// This includes only the [`Any`] and [`Relative`] path forms.
-///
-/// [`push`](crate::PathBuf::push) and [`join`](crate::Path::join)
-/// operations only support [`MaybeRelative`] path forms as input.
 pub trait MaybeRelative: PathForm {}
 impl MaybeRelative for Any {}
 impl MaybeRelative for Relative {}
@@ -149,13 +146,13 @@ impl PathSet for Any {}
 impl PathSet for Relative {}
 impl PathSet for Absolute {}
 
-/// A marker trait for [`PathForm`]s that support pushing [`MaybeRelative`] paths.
+/// A marker trait for [`PathForm`]s that support pushing paths.
 ///
 /// This includes only [`Any`] and [`Absolute`] path forms.
 /// Pushing onto a [`Relative`] path could cause it to become [`Absolute`],
 /// which is why they do not support pushing.
 /// In the future, a `push_rel` and/or a `try_push` method could be added as an alternative.
-/// Similarly, [`Canonical`] paths may become uncanonical if a non-canonical path is pushed onto it.
+/// Similarly, [`Canonical`] paths may become uncanonical if a path is pushed onto it.
 pub trait PathPush: PathSet {}
 impl PathPush for Any {}
 impl PathPush for Absolute {}

From 0b8d0bcd7aedd4a518eb1789b0537808aaa1c61a Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Fri, 12 Jul 2024 01:25:44 -0700
Subject: [PATCH 0221/1072] Fix order of I/O types in `take until` (#13356)

# Description
Just a quick one, but `List(Any)` has to come before `Table`, because
`List(Any)` is a valid match for `Table`, so it will choose `Table`
output even if the input was actually `List(Any)`. I ended up removing
`Table` because it's just not needed at all anyway.

Though, I'm not really totally sure this is correct - I think the parser
should probably actually just have some idea of what the more specific
type is, and choose the most specific type match, rather than just doing
it in order. I guess this will result in the output just always being
`List(Any)` for now. Still better than a bad typecheck error

# User-Facing Changes

Fixes the following contrived example:

```nushell
def foo []: nothing -> list<int> {
  seq 1 10 | # list<int>
    each { |n| $n * 20 } | # this causes the type to become list<any>
    take until { |x| $x < 10 } } # table is first, so now this is type table
    # ...but table is not compatible with list<int>
}
```

# After Submitting
- [ ] make typechecker type choice more robust
- [ ] release notes
---
 crates/nu-command/src/filters/take/take_until.rs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/crates/nu-command/src/filters/take/take_until.rs b/crates/nu-command/src/filters/take/take_until.rs
index c7debf5dee..c8544d364a 100644
--- a/crates/nu-command/src/filters/take/take_until.rs
+++ b/crates/nu-command/src/filters/take/take_until.rs
@@ -11,13 +11,10 @@ impl Command for TakeUntil {
 
     fn signature(&self) -> Signature {
         Signature::build(self.name())
-            .input_output_types(vec![
-                (Type::table(), Type::table()),
-                (
-                    Type::List(Box::new(Type::Any)),
-                    Type::List(Box::new(Type::Any)),
-                ),
-            ])
+            .input_output_types(vec![(
+                Type::List(Box::new(Type::Any)),
+                Type::List(Box::new(Type::Any)),
+            )])
             .required(
                 "predicate",
                 SyntaxShape::Closure(Some(vec![SyntaxShape::Any, SyntaxShape::Int])),

From 8f981c1eb4a648d82d08bfd97f22e54daf1402f2 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Fri, 12 Jul 2024 11:13:07 +0200
Subject: [PATCH 0222/1072] Use conventional generic bounds (#13360)

https://rust-lang.github.io/rust-clippy/master/index.html#/multiple_bound_locations
---
 .../nu_plugin_query/src/query_webpage_info.rs | 52 ++++++++-----------
 1 file changed, 22 insertions(+), 30 deletions(-)

diff --git a/crates/nu_plugin_query/src/query_webpage_info.rs b/crates/nu_plugin_query/src/query_webpage_info.rs
index e61387c8d1..f38f7241f5 100644
--- a/crates/nu_plugin_query/src/query_webpage_info.rs
+++ b/crates/nu_plugin_query/src/query_webpage_info.rs
@@ -158,9 +158,9 @@ impl<'a> serde::Serializer for &'a ValueSerializer {
         Ok(Value::nothing(self.span))
     }
 
-    fn serialize_some<T: ?Sized>(self, value: &T) -> Result<Self::Ok, Self::Error>
+    fn serialize_some<T>(self, value: &T) -> Result<Self::Ok, Self::Error>
     where
-        T: Serialize,
+        T: Serialize + ?Sized,
     {
         value.serialize(self)
     }
@@ -185,18 +185,18 @@ impl<'a> serde::Serializer for &'a ValueSerializer {
         Ok(Value::nothing(self.span))
     }
 
-    fn serialize_newtype_struct<T: ?Sized>(
+    fn serialize_newtype_struct<T>(
         self,
         _name: &'static str,
         value: &T,
     ) -> Result<Self::Ok, Self::Error>
     where
-        T: Serialize,
+        T: Serialize + ?Sized,
     {
         value.serialize(self)
     }
 
-    fn serialize_newtype_variant<T: ?Sized>(
+    fn serialize_newtype_variant<T>(
         self,
         _name: &'static str,
         _variant_index: u32,
@@ -204,7 +204,7 @@ impl<'a> serde::Serializer for &'a ValueSerializer {
         value: &T,
     ) -> Result<Self::Ok, Self::Error>
     where
-        T: Serialize,
+        T: Serialize + ?Sized,
     {
         value.serialize(self)
     }
@@ -306,13 +306,9 @@ impl<'a> serde::ser::SerializeStruct for MapSerializer<'a> {
     type Ok = Value;
     type Error = Error;
 
-    fn serialize_field<T: ?Sized>(
-        &mut self,
-        key: &'static str,
-        value: &T,
-    ) -> Result<(), Self::Error>
+    fn serialize_field<T>(&mut self, key: &'static str, value: &T) -> Result<(), Self::Error>
     where
-        T: Serialize,
+        T: Serialize + ?Sized,
     {
         self.record
             .insert(key.to_owned(), value.serialize(self.serializer)?);
@@ -328,9 +324,9 @@ impl<'a> serde::ser::SerializeMap for MapSerializer<'a> {
     type Ok = Value;
     type Error = Error;
 
-    fn serialize_key<T: ?Sized>(&mut self, key: &T) -> Result<(), Self::Error>
+    fn serialize_key<T>(&mut self, key: &T) -> Result<(), Self::Error>
     where
-        T: Serialize,
+        T: Serialize + ?Sized,
     {
         let value = serde_json::to_value(key).map_err(Error::new)?;
         let key = value
@@ -341,9 +337,9 @@ impl<'a> serde::ser::SerializeMap for MapSerializer<'a> {
         Ok(())
     }
 
-    fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
+    fn serialize_value<T>(&mut self, value: &T) -> Result<(), Self::Error>
     where
-        T: Serialize,
+        T: Serialize + ?Sized,
     {
         let key = self.current_key.take().ok_or(Error::new("key expected"))?;
         self.record.insert(key, value.serialize(self.serializer)?);
@@ -359,13 +355,9 @@ impl<'a> serde::ser::SerializeStructVariant for MapSerializer<'a> {
     type Ok = Value;
     type Error = Error;
 
-    fn serialize_field<T: ?Sized>(
-        &mut self,
-        key: &'static str,
-        value: &T,
-    ) -> Result<(), Self::Error>
+    fn serialize_field<T>(&mut self, key: &'static str, value: &T) -> Result<(), Self::Error>
     where
-        T: Serialize,
+        T: Serialize + ?Sized,
     {
         self.record
             .insert(key.to_owned(), value.serialize(self.serializer)?);
@@ -397,9 +389,9 @@ impl<'a> serde::ser::SerializeSeq for SeqSerializer<'a> {
     type Ok = Value;
     type Error = Error;
 
-    fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
+    fn serialize_element<T>(&mut self, value: &T) -> Result<(), Self::Error>
     where
-        T: Serialize,
+        T: Serialize + ?Sized,
     {
         self.seq.push(value.serialize(self.serializer)?);
         Ok(())
@@ -414,9 +406,9 @@ impl<'a> serde::ser::SerializeTuple for SeqSerializer<'a> {
     type Ok = Value;
     type Error = Error;
 
-    fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
+    fn serialize_element<T>(&mut self, value: &T) -> Result<(), Self::Error>
     where
-        T: Serialize,
+        T: Serialize + ?Sized,
     {
         self.seq.push(value.serialize(self.serializer)?);
         Ok(())
@@ -431,9 +423,9 @@ impl<'a> serde::ser::SerializeTupleStruct for SeqSerializer<'a> {
     type Ok = Value;
     type Error = Error;
 
-    fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
+    fn serialize_field<T>(&mut self, value: &T) -> Result<(), Self::Error>
     where
-        T: Serialize,
+        T: Serialize + ?Sized,
     {
         self.seq.push(value.serialize(self.serializer)?);
         Ok(())
@@ -448,9 +440,9 @@ impl<'a> serde::ser::SerializeTupleVariant for SeqSerializer<'a> {
     type Ok = Value;
     type Error = Error;
 
-    fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
+    fn serialize_field<T>(&mut self, value: &T) -> Result<(), Self::Error>
     where
-        T: Serialize,
+        T: Serialize + ?Sized,
     {
         self.seq.push(value.serialize(self.serializer)?);
         Ok(())

From 02659b1c8a3b0703bfdce4ad94fa04b9638cba41 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Fri, 12 Jul 2024 02:45:53 -0700
Subject: [PATCH 0223/1072] Mention the actual output type on an OutputMismatch
 error (#13355)

# Description

This improves the error when the determined output of a custom command
doesn't match the specified output type by adding the actual determined
output type.

# User-Facing Changes

Previous: `command doesn't output {0}`

New: `expected {0}, but command outputs {1}`

# Tests + Formatting
Passing.

# After Submitting
- [ ] release notes? (minor change, but helpful)
---
 crates/nu-parser/src/type_check.rs           | 6 +++++-
 crates/nu-protocol/src/errors/parse_error.rs | 8 ++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/crates/nu-parser/src/type_check.rs b/crates/nu-parser/src/type_check.rs
index 6999a0469b..6cfe8f64b3 100644
--- a/crates/nu-parser/src/type_check.rs
+++ b/crates/nu-parser/src/type_check.rs
@@ -1055,7 +1055,11 @@ pub fn check_block_input_output(working_set: &StateWorkingSet, block: &Block) ->
                     .span
             };
 
-            output_errors.push(ParseError::OutputMismatch(output_type.clone(), span))
+            output_errors.push(ParseError::OutputMismatch(
+                output_type.clone(),
+                current_output_type.clone(),
+                span,
+            ))
         }
     }
 
diff --git a/crates/nu-protocol/src/errors/parse_error.rs b/crates/nu-protocol/src/errors/parse_error.rs
index 4d59821f7d..0e20f0dcba 100644
--- a/crates/nu-protocol/src/errors/parse_error.rs
+++ b/crates/nu-protocol/src/errors/parse_error.rs
@@ -61,7 +61,11 @@ pub enum ParseError {
 
     #[error("Command output doesn't match {0}.")]
     #[diagnostic(code(nu::parser::output_type_mismatch))]
-    OutputMismatch(Type, #[label("command doesn't output {0}")] Span),
+    OutputMismatch(
+        Type,
+        Type,
+        #[label("expected {0}, but command outputs {1}")] Span,
+    ),
 
     #[error("Type mismatch during operation.")]
     #[diagnostic(code(nu::parser::type_mismatch))]
@@ -554,7 +558,7 @@ impl ParseError {
             ParseError::TypeMismatch(_, _, s) => *s,
             ParseError::TypeMismatchHelp(_, _, s, _) => *s,
             ParseError::InputMismatch(_, s) => *s,
-            ParseError::OutputMismatch(_, s) => *s,
+            ParseError::OutputMismatch(_, _, s) => *s,
             ParseError::MissingRequiredFlag(_, s) => *s,
             ParseError::IncompleteMathExpression(s) => *s,
             ParseError::UnknownState(_, s) => *s,

From 46b5e510ac32fbb746c3b8259b2e0ac4c27cb961 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Fri, 12 Jul 2024 09:48:27 -0500
Subject: [PATCH 0224/1072] tweak `parse` usage and examples to be more clear
 (#13363)

# Description

This PR just tweaks the `parse` command's usage and examples to make it
clearer what's going on "under the hood".

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/strings/parse.rs | 27 ++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/crates/nu-command/src/strings/parse.rs b/crates/nu-command/src/strings/parse.rs
index 9bf31de73c..86b27aecbc 100644
--- a/crates/nu-command/src/strings/parse.rs
+++ b/crates/nu-command/src/strings/parse.rs
@@ -12,13 +12,17 @@ impl Command for Parse {
     }
 
     fn usage(&self) -> &str {
-        "Parse columns from string data using a simple pattern."
+        "Parse columns from string data using a simple pattern or a supplied regular expression."
     }
 
     fn search_terms(&self) -> Vec<&str> {
         vec!["pattern", "match", "regex", "str extract"]
     }
 
+    fn extra_usage(&self) -> &str {
+        "The parse command always uses regular expressions even when you use a simple pattern. If a simple pattern is supplied, parse will transform that pattern into a regular expression."
+    }
+
     fn signature(&self) -> nu_protocol::Signature {
         Signature::build("parse")
             .required("pattern", SyntaxShape::String, "The pattern to match.")
@@ -32,21 +36,24 @@ impl Command for Parse {
     }
 
     fn examples(&self) -> Vec<Example> {
-        let result = Value::test_list(vec![Value::test_record(record! {
-            "foo" => Value::test_string("hi"),
-            "bar" => Value::test_string("there"),
-        })]);
-
         vec![
             Example {
                 description: "Parse a string into two named columns",
                 example: "\"hi there\" | parse \"{foo} {bar}\"",
-                result: Some(result.clone()),
+                result: Some(Value::test_list(
+                    vec![Value::test_record(record! {
+                        "foo" => Value::test_string("hi"),
+                        "bar" => Value::test_string("there"),
+                    })])),
             },
             Example {
-                description: "Parse a string using regex pattern",
-                example: "\"hi there\" | parse --regex '(?P<foo>\\w+) (?P<bar>\\w+)'",
-                result: Some(result),
+                description: "This is how the first example is interpreted in the source code",
+                example: "\"hi there\" | parse --regex '(?s)\\A(?P<foo>.*?) (?P<bar>.*?)\\z'",
+                result: Some(Value::test_list(
+                    vec![Value::test_record(record! {
+                        "foo" => Value::test_string("hi"),
+                        "bar" => Value::test_string("there"),
+                    })])),
             },
             Example {
                 description: "Parse a string using fancy-regex named capture group pattern",

From d42cf554313955095051e5e110ac388c2b3f01c9 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Fri, 12 Jul 2024 19:27:23 -0700
Subject: [PATCH 0225/1072] fix file_count in `Debug` implementation of
 `IrBlock` (#13367)

# Description

Oops.
---
 crates/nu-protocol/src/ir/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-protocol/src/ir/mod.rs b/crates/nu-protocol/src/ir/mod.rs
index 28677b743c..a1b2439768 100644
--- a/crates/nu-protocol/src/ir/mod.rs
+++ b/crates/nu-protocol/src/ir/mod.rs
@@ -37,7 +37,7 @@ impl fmt::Debug for IrBlock {
             .field("data", &self.data)
             .field("comments", &self.comments)
             .field("register_count", &self.register_count)
-            .field("file_count", &self.register_count)
+            .field("file_count", &self.file_count)
             .finish_non_exhaustive()
     }
 }

From a2758e6c40fee2039215be72a776602ac0ae69a1 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Sat, 13 Jul 2024 01:58:21 -0700
Subject: [PATCH 0226/1072] Add IR support to the debugger (#13345)

# Description

This adds tracing for each individual instruction to the `Debugger`
trait. Register contents can be inspected both when entering and leaving
an instruction, and if an instruction produced an error, a reference to
the error is also available. It's not the full `EvalContext` but it's
most of the important parts for getting an idea of what's going on.

Added support for all of this to the `Profiler` / `debug profile` as
well, and the output is quite incredible - super verbose, but you can
see every instruction that's executed and also what the result was if
it's an instruction that has a clearly defined output (many do).

# User-Facing Changes

- Added `--instructions` to `debug profile`, which adds the `pc` and
`instruction` columns to the output.
- `--expr` only works in AST mode, and `--instructions` only works in IR
mode. In the wrong mode, the output for those columns is just blank.

# Tests + Formatting

All passing.

# After Submitting

- [ ] release notes
---
 crates/nu-command/src/debug/profile.rs        |  24 ++-
 crates/nu-engine/src/eval_ir.rs               |  17 +-
 .../src/debugger/debugger_trait.rs            |  87 ++++++++-
 crates/nu-protocol/src/debugger/profiler.rs   | 178 ++++++++++++++----
 crates/nu-protocol/src/ir/mod.rs              |  57 ++++++
 5 files changed, 313 insertions(+), 50 deletions(-)

diff --git a/crates/nu-command/src/debug/profile.rs b/crates/nu-command/src/debug/profile.rs
index 0cef979094..e8254563df 100644
--- a/crates/nu-command/src/debug/profile.rs
+++ b/crates/nu-command/src/debug/profile.rs
@@ -1,5 +1,8 @@
 use nu_engine::{command_prelude::*, ClosureEvalOnce};
-use nu_protocol::{debugger::Profiler, engine::Closure};
+use nu_protocol::{
+    debugger::{Profiler, ProfilerOptions},
+    engine::Closure,
+};
 
 #[derive(Clone)]
 pub struct DebugProfile;
@@ -28,6 +31,7 @@ impl Command for DebugProfile {
                 Some('v'),
             )
             .switch("expr", "Collect expression types", Some('x'))
+            .switch("instructions", "Collect IR instructions", Some('i'))
             .switch("lines", "Collect line numbers", Some('l'))
             .named(
                 "max-depth",
@@ -91,19 +95,23 @@ confusing the id/parent_id hierarchy. The --expr flag is helpful for investigati
         let collect_expanded_source = call.has_flag(engine_state, stack, "expanded-source")?;
         let collect_values = call.has_flag(engine_state, stack, "values")?;
         let collect_exprs = call.has_flag(engine_state, stack, "expr")?;
+        let collect_instructions = call.has_flag(engine_state, stack, "instructions")?;
         let collect_lines = call.has_flag(engine_state, stack, "lines")?;
         let max_depth = call
             .get_flag(engine_state, stack, "max-depth")?
             .unwrap_or(2);
 
         let profiler = Profiler::new(
-            max_depth,
-            collect_spans,
-            true,
-            collect_expanded_source,
-            collect_values,
-            collect_exprs,
-            collect_lines,
+            ProfilerOptions {
+                max_depth,
+                collect_spans,
+                collect_source: true,
+                collect_expanded_source,
+                collect_values,
+                collect_exprs,
+                collect_instructions,
+                collect_lines,
+            },
             call.span(),
         );
 
diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index 56bbccee25..29a677bd69 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -184,11 +184,20 @@ fn eval_ir_block_impl<D: DebugContext>(
         let instruction = &ir_block.instructions[pc];
         let span = &ir_block.spans[pc];
         let ast = &ir_block.ast[pc];
-        log::trace!(
-            "{pc:-4}: {}",
-            instruction.display(ctx.engine_state, ctx.data)
+
+        D::enter_instruction(ctx.engine_state, ir_block, pc, ctx.registers);
+
+        let result = eval_instruction::<D>(ctx, instruction, span, ast);
+
+        D::leave_instruction(
+            ctx.engine_state,
+            ir_block,
+            pc,
+            ctx.registers,
+            result.as_ref().err(),
         );
-        match eval_instruction::<D>(ctx, instruction, span, ast) {
+
+        match result {
             Ok(InstructionResult::Continue) => {
                 pc += 1;
             }
diff --git a/crates/nu-protocol/src/debugger/debugger_trait.rs b/crates/nu-protocol/src/debugger/debugger_trait.rs
index 69d395fb98..88cc753548 100644
--- a/crates/nu-protocol/src/debugger/debugger_trait.rs
+++ b/crates/nu-protocol/src/debugger/debugger_trait.rs
@@ -16,6 +16,7 @@
 use crate::{
     ast::{Block, PipelineElement},
     engine::EngineState,
+    ir::IrBlock,
     PipelineData, ShellError, Span, Value,
 };
 use std::{fmt::Debug, ops::DerefMut};
@@ -35,11 +36,11 @@ pub trait DebugContext: Clone + Copy + Debug {
     #[allow(unused_variables)]
     fn leave_block(engine_state: &EngineState, block: &Block) {}
 
-    /// Called when the evaluator enters a pipeline element
+    /// Called when the AST evaluator enters a pipeline element
     #[allow(unused_variables)]
     fn enter_element(engine_state: &EngineState, element: &PipelineElement) {}
 
-    /// Called when the evaluator leaves a pipeline element
+    /// Called when the AST evaluator leaves a pipeline element
     #[allow(unused_variables)]
     fn leave_element(
         engine_state: &EngineState,
@@ -47,6 +48,27 @@ pub trait DebugContext: Clone + Copy + Debug {
         result: &Result<PipelineData, ShellError>,
     ) {
     }
+
+    /// Called before the IR evaluator runs an instruction
+    #[allow(unused_variables)]
+    fn enter_instruction(
+        engine_state: &EngineState,
+        ir_block: &IrBlock,
+        instruction_index: usize,
+        registers: &[PipelineData],
+    ) {
+    }
+
+    /// Called after the IR evaluator runs an instruction
+    #[allow(unused_variables)]
+    fn leave_instruction(
+        engine_state: &EngineState,
+        ir_block: &IrBlock,
+        instruction_index: usize,
+        registers: &[PipelineData],
+        error: Option<&ShellError>,
+    ) {
+    }
 }
 
 /// Marker struct signalizing that evaluation should use a Debugger
@@ -85,6 +107,40 @@ impl DebugContext for WithDebug {
                 .leave_element(engine_state, element, result);
         }
     }
+
+    fn enter_instruction(
+        engine_state: &EngineState,
+        ir_block: &IrBlock,
+        instruction_index: usize,
+        registers: &[PipelineData],
+    ) {
+        if let Ok(mut debugger) = engine_state.debugger.lock() {
+            debugger.deref_mut().enter_instruction(
+                engine_state,
+                ir_block,
+                instruction_index,
+                registers,
+            )
+        }
+    }
+
+    fn leave_instruction(
+        engine_state: &EngineState,
+        ir_block: &IrBlock,
+        instruction_index: usize,
+        registers: &[PipelineData],
+        error: Option<&ShellError>,
+    ) {
+        if let Ok(mut debugger) = engine_state.debugger.lock() {
+            debugger.deref_mut().leave_instruction(
+                engine_state,
+                ir_block,
+                instruction_index,
+                registers,
+                error,
+            )
+        }
+    }
 }
 
 /// Marker struct signalizing that evaluation should NOT use a Debugger
@@ -118,11 +174,11 @@ pub trait Debugger: Send + Debug {
     #[allow(unused_variables)]
     fn leave_block(&mut self, engine_state: &EngineState, block: &Block) {}
 
-    /// Called when the evaluator enters a pipeline element
+    /// Called when the AST evaluator enters a pipeline element
     #[allow(unused_variables)]
     fn enter_element(&mut self, engine_state: &EngineState, pipeline_element: &PipelineElement) {}
 
-    /// Called when the evaluator leaves a pipeline element
+    /// Called when the AST evaluator leaves a pipeline element
     #[allow(unused_variables)]
     fn leave_element(
         &mut self,
@@ -132,6 +188,29 @@ pub trait Debugger: Send + Debug {
     ) {
     }
 
+    /// Called before the IR evaluator runs an instruction
+    #[allow(unused_variables)]
+    fn enter_instruction(
+        &mut self,
+        engine_state: &EngineState,
+        ir_block: &IrBlock,
+        instruction_index: usize,
+        registers: &[PipelineData],
+    ) {
+    }
+
+    /// Called after the IR evaluator runs an instruction
+    #[allow(unused_variables)]
+    fn leave_instruction(
+        &mut self,
+        engine_state: &EngineState,
+        ir_block: &IrBlock,
+        instruction_index: usize,
+        registers: &[PipelineData],
+        error: Option<&ShellError>,
+    ) {
+    }
+
     /// Create a final report as a Value
     ///
     /// Intended to be called after deactivate()
diff --git a/crates/nu-protocol/src/debugger/profiler.rs b/crates/nu-protocol/src/debugger/profiler.rs
index c3066c0a14..c61ee04d12 100644
--- a/crates/nu-protocol/src/debugger/profiler.rs
+++ b/crates/nu-protocol/src/debugger/profiler.rs
@@ -7,10 +7,11 @@ use crate::{
     ast::{Block, Expr, PipelineElement},
     debugger::Debugger,
     engine::EngineState,
+    ir::IrBlock,
     record, PipelineData, ShellError, Span, Value,
 };
-use std::io::BufRead;
 use std::time::Instant;
+use std::{borrow::Borrow, io::BufRead};
 
 #[derive(Debug, Clone, Copy)]
 struct ElementId(usize);
@@ -24,6 +25,7 @@ struct ElementInfo {
     element_span: Span,
     element_output: Option<Value>,
     expr: Option<String>,
+    instruction: Option<(usize, String)>,
     children: Vec<ElementId>,
 }
 
@@ -36,57 +38,53 @@ impl ElementInfo {
             element_span,
             element_output: None,
             expr: None,
+            instruction: None,
             children: vec![],
         }
     }
 }
 
+/// Options for [`Profiler`]
+#[derive(Debug, Clone)]
+pub struct ProfilerOptions {
+    pub max_depth: i64,
+    pub collect_spans: bool,
+    pub collect_source: bool,
+    pub collect_expanded_source: bool,
+    pub collect_values: bool,
+    pub collect_exprs: bool,
+    pub collect_instructions: bool,
+    pub collect_lines: bool,
+}
+
 /// Basic profiler, used in `debug profile`
 #[derive(Debug, Clone)]
 pub struct Profiler {
     depth: i64,
-    max_depth: i64,
-    collect_spans: bool,
-    collect_source: bool,
-    collect_expanded_source: bool,
-    collect_values: bool,
-    collect_exprs: bool,
-    collect_lines: bool,
+    opts: ProfilerOptions,
     elements: Vec<ElementInfo>,
     element_stack: Vec<ElementId>,
 }
 
 impl Profiler {
     #[allow(clippy::too_many_arguments)]
-    pub fn new(
-        max_depth: i64,
-        collect_spans: bool,
-        collect_source: bool,
-        collect_expanded_source: bool,
-        collect_values: bool,
-        collect_exprs: bool,
-        collect_lines: bool,
-        span: Span,
-    ) -> Self {
+    pub fn new(opts: ProfilerOptions, span: Span) -> Self {
         let first = ElementInfo {
             start: Instant::now(),
             duration_sec: 0.0,
             depth: 0,
             element_span: span,
-            element_output: collect_values.then(|| Value::nothing(span)),
-            expr: collect_exprs.then(|| "call".to_string()),
+            element_output: opts.collect_values.then(|| Value::nothing(span)),
+            expr: opts.collect_exprs.then(|| "call".to_string()),
+            instruction: opts
+                .collect_instructions
+                .then(|| (0, "<start>".to_string())),
             children: vec![],
         };
 
         Profiler {
             depth: 0,
-            max_depth,
-            collect_spans,
-            collect_source,
-            collect_expanded_source,
-            collect_values,
-            collect_exprs,
-            collect_lines,
+            opts,
             elements: vec![first],
             element_stack: vec![ElementId(0)],
         }
@@ -130,7 +128,7 @@ impl Debugger for Profiler {
     }
 
     fn enter_element(&mut self, engine_state: &EngineState, element: &PipelineElement) {
-        if self.depth > self.max_depth {
+        if self.depth > self.opts.max_depth {
             return;
         }
 
@@ -140,6 +138,7 @@ impl Debugger for Profiler {
         };
 
         let expr_opt = self
+            .opts
             .collect_exprs
             .then(|| expr_to_string(engine_state, &element.expr.expr));
 
@@ -165,13 +164,13 @@ impl Debugger for Profiler {
         element: &PipelineElement,
         result: &Result<PipelineData, ShellError>,
     ) {
-        if self.depth > self.max_depth {
+        if self.depth > self.opts.max_depth {
             return;
         }
 
         let element_span = element.expr.span;
 
-        let out_opt = self.collect_values.then(|| match result {
+        let out_opt = self.opts.collect_values.then(|| match result {
             Ok(pipeline_data) => match pipeline_data {
                 PipelineData::Value(val, ..) => val.clone(),
                 PipelineData::ListStream(..) => Value::string("list stream", element_span),
@@ -192,6 +191,91 @@ impl Debugger for Profiler {
         self.element_stack.pop();
     }
 
+    fn enter_instruction(
+        &mut self,
+        engine_state: &EngineState,
+        ir_block: &IrBlock,
+        instruction_index: usize,
+        _registers: &[PipelineData],
+    ) {
+        if self.depth > self.opts.max_depth {
+            return;
+        }
+
+        let Some(parent_id) = self.last_element_id() else {
+            eprintln!("Profiler Error: Missing parent element ID.");
+            return;
+        };
+
+        let instruction = &ir_block.instructions[instruction_index];
+        let span = ir_block.spans[instruction_index];
+
+        let instruction_opt = self.opts.collect_instructions.then(|| {
+            (
+                instruction_index,
+                instruction
+                    .display(engine_state, &ir_block.data)
+                    .to_string(),
+            )
+        });
+
+        let new_id = ElementId(self.elements.len());
+
+        let mut new_element = ElementInfo::new(self.depth, span);
+        new_element.instruction = instruction_opt;
+
+        self.elements.push(new_element);
+
+        let Some(parent) = self.elements.get_mut(parent_id.0) else {
+            eprintln!("Profiler Error: Missing parent element.");
+            return;
+        };
+
+        parent.children.push(new_id);
+        self.element_stack.push(new_id);
+    }
+
+    fn leave_instruction(
+        &mut self,
+        _engine_state: &EngineState,
+        ir_block: &IrBlock,
+        instruction_index: usize,
+        registers: &[PipelineData],
+        error: Option<&ShellError>,
+    ) {
+        if self.depth > self.opts.max_depth {
+            return;
+        }
+
+        let instruction = &ir_block.instructions[instruction_index];
+        let span = ir_block.spans[instruction_index];
+
+        let out_opt = self
+            .opts
+            .collect_values
+            .then(|| {
+                error
+                    .map(Err)
+                    .or_else(|| {
+                        instruction
+                            .output_register()
+                            .map(|register| Ok(&registers[register.0 as usize]))
+                    })
+                    .map(|result| format_result(&result, span))
+            })
+            .flatten();
+
+        let Some(last_element) = self.last_element_mut() else {
+            eprintln!("Profiler Error: Missing last element.");
+            return;
+        };
+
+        last_element.duration_sec = last_element.start.elapsed().as_secs_f64();
+        last_element.element_output = out_opt;
+
+        self.element_stack.pop();
+    }
+
     fn report(&self, engine_state: &EngineState, profiler_span: Span) -> Result<Value, ShellError> {
         Ok(Value::list(
             collect_data(
@@ -268,6 +352,21 @@ fn expr_to_string(engine_state: &EngineState, expr: &Expr) -> String {
     }
 }
 
+fn format_result(
+    result: &Result<impl Borrow<PipelineData>, impl Borrow<ShellError>>,
+    element_span: Span,
+) -> Value {
+    match result {
+        Ok(pipeline_data) => match pipeline_data.borrow() {
+            PipelineData::Value(val, ..) => val.clone(),
+            PipelineData::ListStream(..) => Value::string("list stream", element_span),
+            PipelineData::ByteStream(..) => Value::string("byte stream", element_span),
+            _ => Value::nothing(element_span),
+        },
+        Err(e) => Value::error(e.borrow().clone(), element_span),
+    }
+}
+
 // Find a file name and a line number (indexed from 1) of a span
 fn find_file_of_span(engine_state: &EngineState, span: Span) -> Option<(&str, usize)> {
     for file in engine_state.files() {
@@ -308,7 +407,7 @@ fn collect_data(
         "parent_id" => Value::int(parent_id.0 as i64, profiler_span),
     };
 
-    if profiler.collect_lines {
+    if profiler.opts.collect_lines {
         if let Some((fname, line_num)) = find_file_of_span(engine_state, element.element_span) {
             row.push("file", Value::string(fname, profiler_span));
             row.push("line", Value::int(line_num as i64, profiler_span));
@@ -318,7 +417,7 @@ fn collect_data(
         }
     }
 
-    if profiler.collect_spans {
+    if profiler.opts.collect_spans {
         let span_start = i64::try_from(element.element_span.start)
             .map_err(|_| profiler_error("error converting span start to i64", profiler_span))?;
         let span_end = i64::try_from(element.element_span.end)
@@ -336,12 +435,12 @@ fn collect_data(
         );
     }
 
-    if profiler.collect_source {
+    if profiler.opts.collect_source {
         let val = String::from_utf8_lossy(engine_state.get_span_contents(element.element_span));
         let val = val.trim();
         let nlines = val.lines().count();
 
-        let fragment = if profiler.collect_expanded_source {
+        let fragment = if profiler.opts.collect_expanded_source {
             val.to_string()
         } else {
             let mut first_line = val.lines().next().unwrap_or("").to_string();
@@ -360,6 +459,17 @@ fn collect_data(
         row.push("expr", Value::string(expr_string.clone(), profiler_span));
     }
 
+    if let Some((instruction_index, instruction)) = &element.instruction {
+        row.push(
+            "pc",
+            (*instruction_index)
+                .try_into()
+                .map(|index| Value::int(index, profiler_span))
+                .unwrap_or(Value::nothing(profiler_span)),
+        );
+        row.push("instruction", Value::string(instruction, profiler_span));
+    }
+
     if let Some(val) = &element.element_output {
         row.push("output", val.clone());
     }
diff --git a/crates/nu-protocol/src/ir/mod.rs b/crates/nu-protocol/src/ir/mod.rs
index a1b2439768..aff5f42c8c 100644
--- a/crates/nu-protocol/src/ir/mod.rs
+++ b/crates/nu-protocol/src/ir/mod.rs
@@ -276,6 +276,63 @@ impl Instruction {
         }
     }
 
+    /// Get the output register, for instructions that produce some kind of immediate result.
+    pub fn output_register(&self) -> Option<RegId> {
+        match *self {
+            Instruction::Unreachable => None,
+            Instruction::LoadLiteral { dst, .. } => Some(dst),
+            Instruction::LoadValue { dst, .. } => Some(dst),
+            Instruction::Move { dst, .. } => Some(dst),
+            Instruction::Clone { dst, .. } => Some(dst),
+            Instruction::Collect { src_dst } => Some(src_dst),
+            Instruction::Span { src_dst } => Some(src_dst),
+            Instruction::Drop { .. } => None,
+            Instruction::Drain { .. } => None,
+            Instruction::LoadVariable { dst, .. } => Some(dst),
+            Instruction::StoreVariable { .. } => None,
+            Instruction::LoadEnv { dst, .. } => Some(dst),
+            Instruction::LoadEnvOpt { dst, .. } => Some(dst),
+            Instruction::StoreEnv { .. } => None,
+            Instruction::PushPositional { .. } => None,
+            Instruction::AppendRest { .. } => None,
+            Instruction::PushFlag { .. } => None,
+            Instruction::PushShortFlag { .. } => None,
+            Instruction::PushNamed { .. } => None,
+            Instruction::PushShortNamed { .. } => None,
+            Instruction::PushParserInfo { .. } => None,
+            Instruction::RedirectOut { .. } => None,
+            Instruction::RedirectErr { .. } => None,
+            Instruction::CheckErrRedirected { .. } => None,
+            Instruction::OpenFile { .. } => None,
+            Instruction::WriteFile { .. } => None,
+            Instruction::CloseFile { .. } => None,
+            Instruction::Call { src_dst, .. } => Some(src_dst),
+            Instruction::StringAppend { src_dst, .. } => Some(src_dst),
+            Instruction::GlobFrom { src_dst, .. } => Some(src_dst),
+            Instruction::ListPush { src_dst, .. } => Some(src_dst),
+            Instruction::ListSpread { src_dst, .. } => Some(src_dst),
+            Instruction::RecordInsert { src_dst, .. } => Some(src_dst),
+            Instruction::RecordSpread { src_dst, .. } => Some(src_dst),
+            Instruction::Not { src_dst } => Some(src_dst),
+            Instruction::BinaryOp { lhs_dst, .. } => Some(lhs_dst),
+            Instruction::FollowCellPath { src_dst, .. } => Some(src_dst),
+            Instruction::CloneCellPath { dst, .. } => Some(dst),
+            Instruction::UpsertCellPath { src_dst, .. } => Some(src_dst),
+            Instruction::Jump { .. } => None,
+            Instruction::BranchIf { .. } => None,
+            Instruction::BranchIfEmpty { .. } => None,
+            Instruction::Match { .. } => None,
+            Instruction::CheckMatchGuard { .. } => None,
+            Instruction::Iterate { dst, .. } => Some(dst),
+            Instruction::OnError { .. } => None,
+            Instruction::OnErrorInto { .. } => None,
+            Instruction::PopErrorHandler => None,
+            Instruction::CheckExternalFailed { dst, .. } => Some(dst),
+            Instruction::ReturnEarly { .. } => None,
+            Instruction::Return { .. } => None,
+        }
+    }
+
     /// Returns the branch target index of the instruction if this is a branching instruction.
     pub fn branch_target(&self) -> Option<usize> {
         match self {

From b0bf54614f7f7fe3ef7637243eda49618d30f7e3 Mon Sep 17 00:00:00 2001
From: Yash Thakur <45539777+ysthakur@users.noreply.github.com>
Date: Sat, 13 Jul 2024 10:52:39 -0400
Subject: [PATCH 0227/1072] Don't add touch command to default context twice
 (#13371)

# Description

Touch was added to the shell command context twice, once with the other
filesystem commands and once with the format commands. I removed that
second occurrence of touch, because I'm assuming it was only added there
because "Touch" starts with "To."

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

None
---
 crates/nu-command/src/default_context.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index b270a78dce..4f35a1c711 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -290,7 +290,6 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             ToText,
             ToToml,
             ToTsv,
-            Touch,
             Upsert,
             Where,
             ToXml,

From f5bff8c9c80802d3b45b88a012e30a41bfbf7f27 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Sat, 13 Jul 2024 16:54:34 +0200
Subject: [PATCH 0228/1072] Fix `select` cell path renaming behavior (#13361)

# Description

Fixes #13359

In an attempt to generate names for flat columns resulting from a nested
accesses #3016 generated new column names on nested selection, out of
convenience, that composed the cell path as a string (including `.`) and
then simply replaced all `.` with `_`. As we permit `.` in column names
as long as you quote this surprisingly alters `select`ed columns.


# User-Facing Changes
New columns generated by selection with nested cell paths will for now
be named with a string containing the keys separated by `.` instead of
`_`. We may want to reconsider the semantics for nested access.

# Tests + Formatting
- Alter test to breaking change on nested `select`
---
 crates/nu-command/src/filters/select.rs    | 6 +++---
 crates/nu-command/tests/commands/select.rs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/nu-command/src/filters/select.rs b/crates/nu-command/src/filters/select.rs
index 2ca04b3999..2fe4da3c36 100644
--- a/crates/nu-command/src/filters/select.rs
+++ b/crates/nu-command/src/filters/select.rs
@@ -240,7 +240,7 @@ fn select(
                                 //FIXME: improve implementation to not clone
                                 match input_val.clone().follow_cell_path(&path.members, false) {
                                     Ok(fetcher) => {
-                                        record.push(path.to_string().replace('.', "_"), fetcher);
+                                        record.push(path.to_string(), fetcher);
                                         if !columns_with_value.contains(&path) {
                                             columns_with_value.push(path);
                                         }
@@ -271,7 +271,7 @@ fn select(
                             // FIXME: remove clone
                             match v.clone().follow_cell_path(&cell_path.members, false) {
                                 Ok(result) => {
-                                    record.push(cell_path.to_string().replace('.', "_"), result);
+                                    record.push(cell_path.to_string(), result);
                                 }
                                 Err(e) => return Err(e),
                             }
@@ -295,7 +295,7 @@ fn select(
                         //FIXME: improve implementation to not clone
                         match x.clone().follow_cell_path(&path.members, false) {
                             Ok(value) => {
-                                record.push(path.to_string().replace('.', "_"), value);
+                                record.push(path.to_string(), value);
                             }
                             Err(e) => return Err(e),
                         }
diff --git a/crates/nu-command/tests/commands/select.rs b/crates/nu-command/tests/commands/select.rs
index 741386998a..004aa16d6b 100644
--- a/crates/nu-command/tests/commands/select.rs
+++ b/crates/nu-command/tests/commands/select.rs
@@ -50,7 +50,7 @@ fn complex_nested_columns() {
         r#"
                 {sample}
                 | select nu."0xATYKARNU" nu.committers.name nu.releases.version
-                | get nu_releases_version
+                | get "nu.releases.version"
                 | where $it > "0.8"
                 | get 0
             "#

From c5aa15c7f6b3e44b6c211d5e83617ced33424aec Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Sun, 14 Jul 2024 10:10:41 +0200
Subject: [PATCH 0229/1072] Add top-level crate documentation/READMEs (#12907)

# Description
Add `README.md` files to each crate in our workspace (-plugins) and also
include it in the `lib.rs` documentation for <docs.rs> (if there is no
existing `lib.rs` crate documentation)

In all new README I added the defensive comment that the crates are not
considered stable for public consumption. If necessary we can adjust
this if we deem a crate useful for plugin authors.
---
 crates/nu-cli/README.md                        |  7 +++++++
 crates/nu-cli/src/lib.rs                       |  1 +
 crates/nu-cmd-base/README.md                   |  5 +++++
 crates/nu-cmd-base/src/lib.rs                  |  1 +
 crates/nu-cmd-extra/src/lib.rs                 |  1 +
 crates/nu-cmd-lang/src/lib.rs                  |  1 +
 crates/nu-color-config/README.md               |  5 +++++
 crates/nu-color-config/src/lib.rs              |  1 +
 crates/nu-command/README.md                    |  7 +++++++
 crates/nu-command/src/lib.rs                   |  1 +
 crates/nu-engine/README.md                     |  9 +++++++++
 crates/nu-engine/src/lib.rs                    |  1 +
 crates/nu-explore/README.md                    |  5 +++++
 crates/nu-explore/src/lib.rs                   |  1 +
 crates/nu-json/README.md                       |  4 ++--
 crates/nu-json/src/lib.rs                      |  1 +
 crates/nu-lsp/README.md                        |  7 +++++++
 crates/nu-lsp/src/lib.rs                       |  1 +
 crates/nu-parser/README.md                     | 14 +++++++-------
 crates/nu-parser/src/lib.rs                    |  1 +
 crates/nu-path/src/lib.rs                      |  1 +
 crates/nu-protocol/src/lib.rs                  |  1 +
 crates/nu-protocol/src/pipeline/byte_stream.rs |  4 ++--
 crates/nu-std/README.md                        |  2 +-
 crates/nu-std/src/lib.rs                       |  1 +
 crates/nu-system/README.md                     |  7 +++++++
 crates/nu-system/src/lib.rs                    |  1 +
 crates/nu-table/README.md                      |  7 +++++++
 crates/nu-table/src/lib.rs                     |  1 +
 crates/nu-term-grid/README.md                  |  5 +++++
 crates/nu-term-grid/src/lib.rs                 |  1 +
 crates/nu-test-support/README.md               |  7 +++++++
 crates/nu-test-support/src/lib.rs              |  1 +
 crates/nu-utils/README.md                      |  6 ++++++
 crates/nu-utils/src/lib.rs                     |  1 +
 crates/nuon/README.md                          |  2 +-
 36 files changed, 109 insertions(+), 13 deletions(-)
 create mode 100644 crates/nu-cli/README.md
 create mode 100644 crates/nu-cmd-base/README.md
 create mode 100644 crates/nu-color-config/README.md
 create mode 100644 crates/nu-command/README.md
 create mode 100644 crates/nu-engine/README.md
 create mode 100644 crates/nu-explore/README.md
 create mode 100644 crates/nu-lsp/README.md
 create mode 100644 crates/nu-system/README.md
 create mode 100644 crates/nu-table/README.md
 create mode 100644 crates/nu-term-grid/README.md
 create mode 100644 crates/nu-test-support/README.md
 create mode 100644 crates/nu-utils/README.md

diff --git a/crates/nu-cli/README.md b/crates/nu-cli/README.md
new file mode 100644
index 0000000000..e0eca3c9bd
--- /dev/null
+++ 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.
diff --git a/crates/nu-cli/src/lib.rs b/crates/nu-cli/src/lib.rs
index 6f151adad1..d584802cfb 100644
--- 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;
diff --git a/crates/nu-cmd-base/README.md b/crates/nu-cmd-base/README.md
new file mode 100644
index 0000000000..28d299928a
--- /dev/null
+++ 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.
diff --git a/crates/nu-cmd-base/src/lib.rs b/crates/nu-cmd-base/src/lib.rs
index 250a57d741..c2608f8466 100644
--- 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;
diff --git a/crates/nu-cmd-extra/src/lib.rs b/crates/nu-cmd-extra/src/lib.rs
index 2a3d70e6cd..f6f97c2f96 100644
--- 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::*;
diff --git a/crates/nu-cmd-lang/src/lib.rs b/crates/nu-cmd-lang/src/lib.rs
index 427a535d5d..41022cc231 100644
--- a/crates/nu-cmd-lang/src/lib.rs
+++ b/crates/nu-cmd-lang/src/lib.rs
@@ -1,3 +1,4 @@
+#![doc = include_str!("../README.md")]
 mod core_commands;
 mod default_context;
 pub mod example_support;
diff --git a/crates/nu-color-config/README.md b/crates/nu-color-config/README.md
new file mode 100644
index 0000000000..f03753685c
--- /dev/null
+++ b/crates/nu-color-config/README.md
@@ -0,0 +1,5 @@
+Logic to resolve colors for syntax highlighting and output formatting
+
+## Internal Nushell crate
+
+This crate implements components of Nushell and is not designed to support plugin authors or other users directly.
diff --git a/crates/nu-color-config/src/lib.rs b/crates/nu-color-config/src/lib.rs
index 3bd4dc9e4d..77ec9d0e79 100644
--- a/crates/nu-color-config/src/lib.rs
+++ b/crates/nu-color-config/src/lib.rs
@@ -1,3 +1,4 @@
+#![doc = include_str!("../README.md")]
 mod color_config;
 mod matching_brackets_style;
 mod nu_style;
diff --git a/crates/nu-command/README.md b/crates/nu-command/README.md
new file mode 100644
index 0000000000..1cbb8cd9f2
--- /dev/null
+++ b/crates/nu-command/README.md
@@ -0,0 +1,7 @@
+This crate contains the majority of our commands
+
+We allow ourselves to move some of the commands in `nu-command` to `nu-cmd-*` crates as needed.
+
+## Internal Nushell crate
+
+This crate implements components of Nushell and is not designed to support plugin authors or other users directly.
diff --git a/crates/nu-command/src/lib.rs b/crates/nu-command/src/lib.rs
index a854fe3507..55c4974325 100644
--- a/crates/nu-command/src/lib.rs
+++ b/crates/nu-command/src/lib.rs
@@ -1,3 +1,4 @@
+#![doc = include_str!("../README.md")]
 mod bytes;
 mod charting;
 mod conversions;
diff --git a/crates/nu-engine/README.md b/crates/nu-engine/README.md
new file mode 100644
index 0000000000..d5198cfc3f
--- /dev/null
+++ b/crates/nu-engine/README.md
@@ -0,0 +1,9 @@
+This crate primarily drives the evaluation of expressions.
+
+(Some overlap with nu-protocol)
+
+- Provides `CallExt`
+
+## Internal Nushell crate
+
+This crate implements components of Nushell and is not designed to support plugin authors or other users directly.
diff --git a/crates/nu-engine/src/lib.rs b/crates/nu-engine/src/lib.rs
index 7ed246e975..5a5bb9a5d0 100644
--- a/crates/nu-engine/src/lib.rs
+++ b/crates/nu-engine/src/lib.rs
@@ -1,3 +1,4 @@
+#![doc = include_str!("../README.md")]
 mod call_ext;
 mod closure_eval;
 pub mod column;
diff --git a/crates/nu-explore/README.md b/crates/nu-explore/README.md
new file mode 100644
index 0000000000..d18a576c43
--- /dev/null
+++ b/crates/nu-explore/README.md
@@ -0,0 +1,5 @@
+Implementation of the interactive `explore` command pager.
+
+## Internal Nushell crate
+
+This crate implements components of Nushell and is not designed to support plugin authors or other users directly.
diff --git a/crates/nu-explore/src/lib.rs b/crates/nu-explore/src/lib.rs
index 043c85eb02..d645572c89 100644
--- a/crates/nu-explore/src/lib.rs
+++ b/crates/nu-explore/src/lib.rs
@@ -1,3 +1,4 @@
+#![doc = include_str!("../README.md")]
 mod commands;
 mod default_context;
 mod explore;
diff --git a/crates/nu-json/README.md b/crates/nu-json/README.md
index acf3c6b296..c982f1a818 100644
--- a/crates/nu-json/README.md
+++ b/crates/nu-json/README.md
@@ -24,7 +24,7 @@ nu-json = "0.76"
 ## From the Commandline
 
 Add with:
-```
+```sh
  cargo add serde
  cargo add nu-json
 ```
@@ -43,7 +43,7 @@ fn main() {
 
     let sample_text=r#"
     {
-        # specify rate in requests/second
+        ## specify rate in requests/second
         rate: 1000
         array:
         [
diff --git a/crates/nu-json/src/lib.rs b/crates/nu-json/src/lib.rs
index eead282786..1cf2c0a9fd 100644
--- a/crates/nu-json/src/lib.rs
+++ b/crates/nu-json/src/lib.rs
@@ -1,3 +1,4 @@
+#![doc = include_str!("../README.md")]
 pub use self::de::{
     from_iter, from_reader, from_slice, from_str, Deserializer, StreamDeserializer,
 };
diff --git a/crates/nu-lsp/README.md b/crates/nu-lsp/README.md
new file mode 100644
index 0000000000..d9e666d6c2
--- /dev/null
+++ b/crates/nu-lsp/README.md
@@ -0,0 +1,7 @@
+Implementation of the Nushell language server.
+
+See [the Language Server Protocol specification](https://microsoft.github.io/language-server-protocol/)
+
+## Internal Nushell crate
+
+This crate implements components of Nushell and is not designed to support plugin authors or other users directly.
diff --git a/crates/nu-lsp/src/lib.rs b/crates/nu-lsp/src/lib.rs
index fdeededac5..aee2ab240d 100644
--- a/crates/nu-lsp/src/lib.rs
+++ b/crates/nu-lsp/src/lib.rs
@@ -1,3 +1,4 @@
+#![doc = include_str!("../README.md")]
 use lsp_server::{Connection, IoThreads, Message, Response, ResponseError};
 use lsp_types::{
     request::{Completion, GotoDefinition, HoverRequest, Request},
diff --git a/crates/nu-parser/README.md b/crates/nu-parser/README.md
index 02f61a31a6..cbb7729e4d 100644
--- a/crates/nu-parser/README.md
+++ b/crates/nu-parser/README.md
@@ -4,7 +4,7 @@ Nushell's parser is a type-directed parser, meaning that the parser will use typ
 
 Nushell's base language is whitespace-separated tokens with the command (Nushell's term for a function) name in the head position:
 
-```
+```nushell
 head1 arg1 arg2 | head2
 ```
 
@@ -12,7 +12,7 @@ head1 arg1 arg2 | head2
 
 The first job of the parser is to a lexical analysis to find where the tokens start and end in the input. This turns the above into:
 
-```
+```text
 <item: "head1">, <item: "arg1">, <item: "arg2">, <pipe>, <item: "head2">
 ```
 
@@ -24,7 +24,7 @@ As Nushell is a language of pipelines, pipes form a key role in both separating
 
 The above tokens are converted the following during the lite parse phase:
 
-```
+```text
 Pipeline:
   Command #1:
     <item: "head1">, <item: "arg1">, <item: "arg2">
@@ -45,7 +45,7 @@ Each command has a shape assigned to each of the arguments it reads in. These sh
 
 For example, if the command is written as:
 
-```sql
+```text
 where $x > 10
 ```
 
@@ -53,7 +53,7 @@ When the parsing happens, the parser will look up the `where` command and find i
 
 In the above example, if the Signature of `where` said that it took three String values, the result would be:
 
-```
+```text
 CallInfo:
   Name: `where`
   Args:
@@ -64,7 +64,7 @@ CallInfo:
 
 Or, the Signature could state that it takes in three positional arguments: a Variable, an Operator, and a Number, which would give:
 
-```
+```text
 CallInfo:
   Name: `where`
   Args:
@@ -77,7 +77,7 @@ Note that in this case, each would be checked at compile time to confirm that th
 
 Finally, some Shapes can consume more than one token. In the above, if the `where` command stated it took in a single required argument, and that the Shape of this argument was a MathExpression, then the parser would treat the remaining tokens as part of the math expression.
 
-```
+```text
 CallInfo:
   Name: `where`
   Args:
diff --git a/crates/nu-parser/src/lib.rs b/crates/nu-parser/src/lib.rs
index 3c97012e8a..8f871aa815 100644
--- a/crates/nu-parser/src/lib.rs
+++ b/crates/nu-parser/src/lib.rs
@@ -1,3 +1,4 @@
+#![doc = include_str!("../README.md")]
 mod deparse;
 mod exportable;
 mod flatten;
diff --git a/crates/nu-path/src/lib.rs b/crates/nu-path/src/lib.rs
index 8553495439..2cb415264a 100644
--- a/crates/nu-path/src/lib.rs
+++ b/crates/nu-path/src/lib.rs
@@ -1,3 +1,4 @@
+#![doc = include_str!("../README.md")]
 mod assert_path_eq;
 mod components;
 pub mod dots;
diff --git a/crates/nu-protocol/src/lib.rs b/crates/nu-protocol/src/lib.rs
index cae5d3fd0a..e143a19819 100644
--- a/crates/nu-protocol/src/lib.rs
+++ b/crates/nu-protocol/src/lib.rs
@@ -1,3 +1,4 @@
+#![doc = include_str!("../README.md")]
 mod alias;
 pub mod ast;
 pub mod config;
diff --git a/crates/nu-protocol/src/pipeline/byte_stream.rs b/crates/nu-protocol/src/pipeline/byte_stream.rs
index 69391b39a9..bd384e88c2 100644
--- a/crates/nu-protocol/src/pipeline/byte_stream.rs
+++ b/crates/nu-protocol/src/pipeline/byte_stream.rs
@@ -159,14 +159,14 @@ impl From<ByteStreamType> for Type {
 ///   Try not to use this method if possible. Rather, please use [`reader`](ByteStream::reader)
 ///   (or [`lines`](ByteStream::lines) if it matches the situation).
 ///
-/// Additionally, there are few methods to collect a [`Bytestream`] into memory:
+/// Additionally, there are few methods to collect a [`ByteStream`] into memory:
 /// - [`into_bytes`](ByteStream::into_bytes): collects all bytes into a [`Vec<u8>`].
 /// - [`into_string`](ByteStream::into_string): collects all bytes into a [`String`], erroring if utf-8 decoding failed.
 /// - [`into_value`](ByteStream::into_value): collects all bytes into a value typed appropriately
 ///   for the [type](.type_()) of this stream. If the type is [`Unknown`](ByteStreamType::Unknown),
 ///   it will produce a string value if the data is valid UTF-8, or a binary value otherwise.
 ///
-/// There are also a few other methods to consume all the data of a [`Bytestream`]:
+/// There are also a few other methods to consume all the data of a [`ByteStream`]:
 /// - [`drain`](ByteStream::drain): consumes all bytes and outputs nothing.
 /// - [`write_to`](ByteStream::write_to): writes all bytes to the given [`Write`] destination.
 /// - [`print`](ByteStream::print): a convenience wrapper around [`write_to`](ByteStream::write_to).
diff --git a/crates/nu-std/README.md b/crates/nu-std/README.md
index d6e4d6e9f6..23bd684a50 100644
--- a/crates/nu-std/README.md
+++ b/crates/nu-std/README.md
@@ -7,7 +7,7 @@ The standard library is a pure-`nushell` collection of custom commands which
 provide interactive utilities and building blocks for users writing casual scripts or complex applications.
 
 To see what's here:
-```
+```text
 > use std
 > scope commands | select name usage | where name =~ "std "
 #┬───────────name────────────┬──────────────────────usage──────────────────────
diff --git a/crates/nu-std/src/lib.rs b/crates/nu-std/src/lib.rs
index a20e3fc5da..ff6910e4ba 100644
--- a/crates/nu-std/src/lib.rs
+++ b/crates/nu-std/src/lib.rs
@@ -1,3 +1,4 @@
+#![doc = include_str!("../README.md")]
 use log::trace;
 use nu_engine::eval_block;
 use nu_parser::parse;
diff --git a/crates/nu-system/README.md b/crates/nu-system/README.md
new file mode 100644
index 0000000000..d847bf4e0f
--- /dev/null
+++ b/crates/nu-system/README.md
@@ -0,0 +1,7 @@
+Operating system specific bindings used by Nushell.
+
+Currently primarily wrappers around processes and ways to gather process info from the system
+
+## Internal Nushell crate
+
+This crate implements components of Nushell and is not designed to support plugin authors or other users directly.
diff --git a/crates/nu-system/src/lib.rs b/crates/nu-system/src/lib.rs
index 2fc97d2e7e..3633d62990 100644
--- a/crates/nu-system/src/lib.rs
+++ b/crates/nu-system/src/lib.rs
@@ -1,3 +1,4 @@
+#![doc = include_str!("../README.md")]
 mod foreground;
 
 #[cfg(target_os = "freebsd")]
diff --git a/crates/nu-table/README.md b/crates/nu-table/README.md
new file mode 100644
index 0000000000..945d515e62
--- /dev/null
+++ b/crates/nu-table/README.md
@@ -0,0 +1,7 @@
+The layout logic for Nushell's table viewer.
+
+See also the separate `table` command implementation
+
+## Internal Nushell crate
+
+This crate implements components of Nushell and is not designed to support plugin authors or other users directly.
diff --git a/crates/nu-table/src/lib.rs b/crates/nu-table/src/lib.rs
index 66cc2a3a82..182585f193 100644
--- a/crates/nu-table/src/lib.rs
+++ b/crates/nu-table/src/lib.rs
@@ -1,3 +1,4 @@
+#![doc = include_str!("../README.md")]
 mod table;
 mod table_theme;
 mod types;
diff --git a/crates/nu-term-grid/README.md b/crates/nu-term-grid/README.md
new file mode 100644
index 0000000000..5bdd32077d
--- /dev/null
+++ b/crates/nu-term-grid/README.md
@@ -0,0 +1,5 @@
+Implementation of the layout engine for the `grid` command.
+
+## Internal Nushell crate
+
+This crate implements components of Nushell and is not designed to support plugin authors or other users directly.
diff --git a/crates/nu-term-grid/src/lib.rs b/crates/nu-term-grid/src/lib.rs
index 79b146593f..ca8ccd4e23 100644
--- a/crates/nu-term-grid/src/lib.rs
+++ b/crates/nu-term-grid/src/lib.rs
@@ -1,3 +1,4 @@
+#![doc = include_str!("../README.md")]
 pub mod grid;
 
 pub use grid::Grid;
diff --git a/crates/nu-test-support/README.md b/crates/nu-test-support/README.md
new file mode 100644
index 0000000000..f384b15067
--- /dev/null
+++ b/crates/nu-test-support/README.md
@@ -0,0 +1,7 @@
+This crate provides utilities for testing of Nushell
+
+Plugin authors should instead refer to `nu-plugin-test-support`
+
+## Internal Nushell crate
+
+This crate implements components of Nushell and is not designed to support plugin authors or other users directly.
diff --git a/crates/nu-test-support/src/lib.rs b/crates/nu-test-support/src/lib.rs
index 5319830920..c6cadbcbd8 100644
--- a/crates/nu-test-support/src/lib.rs
+++ b/crates/nu-test-support/src/lib.rs
@@ -1,3 +1,4 @@
+#![doc = include_str!("../README.md")]
 pub mod commands;
 pub mod fs;
 pub mod locale_override;
diff --git a/crates/nu-utils/README.md b/crates/nu-utils/README.md
new file mode 100644
index 0000000000..de50a8ae93
--- /dev/null
+++ b/crates/nu-utils/README.md
@@ -0,0 +1,6 @@
+Collection of small utilities that are shared across Nushell crates.
+
+This crate should compile early in the crate graph and thus not depend on major dependencies or core-nushell crates itself.
+## Internal Nushell crate
+
+This crate implements components of Nushell and is not designed to support plugin authors or other users directly.
diff --git a/crates/nu-utils/src/lib.rs b/crates/nu-utils/src/lib.rs
index cb834e5e0f..0c021f1dc9 100644
--- a/crates/nu-utils/src/lib.rs
+++ b/crates/nu-utils/src/lib.rs
@@ -1,3 +1,4 @@
+#![doc = include_str!("../README.md")]
 mod casing;
 mod deansi;
 pub mod emoji;
diff --git a/crates/nuon/README.md b/crates/nuon/README.md
index d11aa8104c..158a9d2e7d 100644
--- a/crates/nuon/README.md
+++ b/crates/nuon/README.md
@@ -4,7 +4,7 @@ The NUON format is a superset of JSON designed to fit the feel of Nushell.
 Some of its extra features are
 - trailing commas are allowed
 - commas are optional in lists
-- quotes are not required around keys or any _bare_ string that do not contain spaces
+- quotes are not required around keys or any _bare_ string that do not contain spaces or special characters
 - comments are allowed, though not preserved when using [`from_nuon`]
 
 ## Example

From ae40d56fc59565588ec1f004f70e5445cf54c727 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Sun, 14 Jul 2024 01:12:55 -0700
Subject: [PATCH 0230/1072] Report parse warns and compile errs when running
 script files (#13369)

# Description

Report parse warnings and compile errors when running script files.

It's useful to report this information to script authors and users so
they can know if they need to update something in the near future.

I also found that moving some errors from eval to compile time meant
some error tests can fail (in `tests/repl`) so this is a good idea to
keep those passing.

# User-Facing Changes
- Report parse warnings when running script files
- Report compile errors when running script files
---
 crates/nu-cli/src/eval_file.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/crates/nu-cli/src/eval_file.rs b/crates/nu-cli/src/eval_file.rs
index ff6ba36fe3..bac4378d1b 100644
--- 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" {

From cf4864a9cd4e0d840fef429d45b2f724b187c233 Mon Sep 17 00:00:00 2001
From: David <drmason13@users.noreply.github.com>
Date: Sun, 14 Jul 2024 09:19:09 +0100
Subject: [PATCH 0231/1072] JSON format output keeps braces on same line (issue
 #13326) (#13352)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
This is a minor breaking change to JSON output syntax/style of the `to
json` command.

This fixes #13326 by setting `braces_same_line` to true when creating a
new `HjsonFormatter`.
This then simply tells `HjsonFormatter` to keep the braces on the same
line when outputting which is what I expected nu's `to json` command to
do.
There are almost no changes to nushell itself, all changes are contained
within `nu-json` crate (minus any documentation updates).

Oh, almost forgot to mention, to get the tests compiling, I added
fancy_regex as a _dev_ dependency to nu-json. I could look into
eliminating that if desirable.

# User-Facing Changes

**Breaking Change**
nushell now outputs the desired result using the reproduction command
from the issue:
```
echo '{"version": "v0.4.4","notes": "blablabla","pub_date": "2024-05-04T16:05:00Z","platforms":{"windows-x86_64":{"signature": "blablabla","url": "https://blablabla"}}}' | from json | to json
```

outputs:
```
{
  "version": "v0.4.4",
  "notes": "blablabla",
  "pub_date": "2024-05-04T16:05:00Z",
  "platforms": {
    "windows-x86_64": {
      "signature": "blablabla",
      "url": "https://blablabla"
    }
  }
}
```

whereas previously it would push the opening braces onto a new line:
```
{
  "version": "v0.4.4",
  "notes": "blablabla",
  "pub_date": "2024-05-04T16:05:00Z",
  "platforms":
  {
    "windows-x86_64":
    {
      "signature": "blablabla",
      "url": "https://blablabla"
    }
  }
}
```

# Tests + Formatting

toolkit check pr mostly passes - there are regrettably some tests not
passing on my windows machine _before making any changes_ (I may look
into this as a separate issue)

I have re-enabled the [hjson
tests](https://github.com/nushell/nushell/blob/main/crates/nu-json/tests/main.rs).
This is done in the second commit 🙂
They have a crucial difference to what they were previously asserting:
  * nu-json outputs in json syntax, not hjson syntax
I think this is desirable, but I'm not aware of the history of these
tests.

# After Submitting

I suspect there `to json` command examples will need updating to match,
haven't checked yet!
---
 Cargo.lock                   |  3 +++
 crates/nu-json/Cargo.toml    | 13 +++++++++----
 crates/nu-json/src/ser.rs    |  2 +-
 crates/nu-json/tests/main.rs | 27 ++++++++-------------------
 4 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c8bfe4ab4e..2247e462fa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3195,7 +3195,10 @@ dependencies = [
 name = "nu-json"
 version = "0.95.1"
 dependencies = [
+ "fancy-regex",
  "linked-hash-map",
+ "nu-path",
+ "nu-test-support",
  "num-traits",
  "serde",
  "serde_json",
diff --git a/crates/nu-json/Cargo.toml b/crates/nu-json/Cargo.toml
index 04c39bdac5..a3b61042b1 100644
--- a/crates/nu-json/Cargo.toml
+++ b/crates/nu-json/Cargo.toml
@@ -1,5 +1,8 @@
 [package]
-authors = ["The Nushell Project Developers", "Christian Zangl <laktak@cdak.net>"]
+authors = [
+    "The Nushell Project Developers",
+    "Christian Zangl <laktak@cdak.net>",
+]
 description = "Fork of serde-hjson"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-json"
 edition = "2021"
@@ -19,9 +22,11 @@ default = ["preserve_order"]
 [dependencies]
 linked-hash-map = { version = "0.5", optional = true }
 num-traits = { workspace = true }
-serde = { workspace =  true }
+serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-# nu-path = { path="../nu-path", version = "0.95.1" }
-# serde_json = "1.0"
\ No newline at end of file
+nu-test-support = { path = "../nu-test-support", version = "0.95.1" }
+nu-path = { path = "../nu-path", version = "0.95.1" }
+serde_json = "1.0"
+fancy-regex = "0.13.0"
diff --git a/crates/nu-json/src/ser.rs b/crates/nu-json/src/ser.rs
index d9df1aea56..4b15740602 100644
--- a/crates/nu-json/src/ser.rs
+++ b/crates/nu-json/src/ser.rs
@@ -714,7 +714,7 @@ impl<'a> HjsonFormatter<'a> {
             stack: Vec::new(),
             at_colon: false,
             indent,
-            braces_same_line: false,
+            braces_same_line: true,
         }
     }
 }
diff --git a/crates/nu-json/tests/main.rs b/crates/nu-json/tests/main.rs
index c209bc0a52..0ac3e403e2 100644
--- a/crates/nu-json/tests/main.rs
+++ b/crates/nu-json/tests/main.rs
@@ -1,7 +1,5 @@
-// FIXME: re-enable tests
-/*
-use nu_json::Value;
 use fancy_regex::Regex;
+use nu_json::Value;
 use std::fs;
 use std::io;
 use std::path::{Path, PathBuf};
@@ -11,7 +9,7 @@ fn txt(text: &str) -> String {
 
     #[cfg(windows)]
     {
-        out.replace("\r\n", "").replace("\n", "")
+        out.replace("\r\n", "").replace('\n', "")
     }
 
     #[cfg(not(windows))]
@@ -21,15 +19,7 @@ fn txt(text: &str) -> String {
 }
 
 fn hjson_expectations() -> PathBuf {
-    let assets = nu_test_support::fs::assets().join("nu_json");
-
-    nu_path::canonicalize(assets.clone()).unwrap_or_else(|e| {
-        panic!(
-            "Couldn't canonicalize hjson assets path {}: {:?}",
-            assets.display(),
-            e
-        )
-    })
+    nu_test_support::fs::assets().join("nu_json")
 }
 
 fn get_test_content(name: &str) -> io::Result<String> {
@@ -50,7 +40,7 @@ fn get_result_content(name: &str) -> io::Result<(String, String)> {
     let p1 = format!("{}/{}_result.json", expectations.display(), name);
     let p2 = format!("{}/{}_result.hjson", expectations.display(), name);
 
-    Ok((fs::read_to_string(&p1)?, fs::read_to_string(&p2)?))
+    Ok((fs::read_to_string(p1)?, fs::read_to_string(p2)?))
 }
 
 macro_rules! run_test {
@@ -73,7 +63,8 @@ macro_rules! run_test {
             let actual_hjson = txt(&actual_hjson);
             let actual_json = $fix(serde_json::to_string_pretty(&udata).unwrap());
             let actual_json = txt(&actual_json);
-            if rhjson != actual_hjson {
+            // nu_json::to_string now outputs json instead of hjson!
+            if rjson != actual_hjson {
                 println!(
                     "{:?}\n---hjson expected\n{}\n---hjson actual\n{}\n---\n",
                     name, rhjson, actual_hjson
@@ -85,7 +76,7 @@ macro_rules! run_test {
                     name, rjson, actual_json
                 );
             }
-            assert!(rhjson == actual_hjson && rjson == actual_json);
+            assert!(rjson == actual_hjson && rjson == actual_json);
         }
     }};
 }
@@ -198,7 +189,7 @@ fn test_hjson() {
 
     let missing = all
         .into_iter()
-        .filter(|x| done.iter().find(|y| &x == y) == None)
+        .filter(|x| !done.iter().any(|y| x == y))
         .collect::<Vec<String>>();
 
     if !missing.is_empty() {
@@ -208,5 +199,3 @@ fn test_hjson() {
         panic!();
     }
 }
-
-*/

From 3d1145e75983de00354edda0ea8dfd2629bba06f Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Sun, 14 Jul 2024 10:37:57 +0200
Subject: [PATCH 0232/1072] Fix CI test failure on main (nu-json) (#13374)

Conflict resulting from #13329 and #13326
---
 crates/nu-json/tests/main.rs     |  2 +-
 crates/nu-test-support/src/fs.rs | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/crates/nu-json/tests/main.rs b/crates/nu-json/tests/main.rs
index 0ac3e403e2..73c68f3d8e 100644
--- a/crates/nu-json/tests/main.rs
+++ b/crates/nu-json/tests/main.rs
@@ -19,7 +19,7 @@ fn txt(text: &str) -> String {
 }
 
 fn hjson_expectations() -> PathBuf {
-    nu_test_support::fs::assets().join("nu_json")
+    nu_test_support::fs::assets().join("nu_json").into()
 }
 
 fn get_test_content(name: &str) -> io::Result<String> {
diff --git a/crates/nu-test-support/src/fs.rs b/crates/nu-test-support/src/fs.rs
index eb90e16ab2..230e5eafe3 100644
--- a/crates/nu-test-support/src/fs.rs
+++ b/crates/nu-test-support/src/fs.rs
@@ -102,13 +102,12 @@ pub fn fixtures() -> AbsolutePathBuf {
     path
 }
 
-// FIXME: re-enable nu_json tests
-// pub fn assets() -> AbsolutePathBuf {
-//     let mut path = root();
-//     path.push("tests");
-//     path.push("assets");
-//     path
-// }
+pub fn assets() -> AbsolutePathBuf {
+    let mut path = root();
+    path.push("tests");
+    path.push("assets");
+    path
+}
 
 pub fn in_directory(path: impl AsRef<nu_path::Path>) -> AbsolutePathBuf {
     root().join(path)

From 0918050ac84145900f556c9c1bb4d3e98dfe9e48 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Tue, 16 Jul 2024 03:49:00 +0000
Subject: [PATCH 0233/1072] Deprecate  `group` in favor of `chunks` (#13377)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
The name of the `group` command is a little unclear/ambiguous.
Everything I look at it, I think of `group-by`. I think `chunks` more
clearly conveys what the `group` command does. Namely, it divides the
input list into chunks of a certain size. For example,
[`slice::chunks`](https://doc.rust-lang.org/std/primitive.slice.html#method.chunks)
has the same name. So, this PR adds a new `chunks` command to replace
the now deprecated `group` command.

The `chunks` command is a refactored version of `group`. As such, there
is a small performance improvement:
```nushell
# $data is a very large list
> bench { $data | chunks 2 } --rounds 30 | get mean
474ms 921µs 190ns

# deprecation warning was disabled here for fairness
> bench { $data | group 2 } --rounds 30 | get mean
592ms 702µs 440ns



> bench { $data | chunks 200 } --rounds 30 | get mean
374ms 188µs 318ns

> bench { $data | group 200 } --rounds 30 | get mean
481ms 264µs 869ns



> bench { $data | chunks 1 } --rounds 30 | get mean
642ms 574µs 42ns

> bench { $data | group 1 } --rounds 30 | get mean
981ms 602µs 513ns
```

# User-Facing Changes
- `group` command has been deprecated in favor of new `chunks` command.
- `chunks` errors when given a chunk size of `0` whereas `group` returns
chunks with one element.

# Tests + Formatting
Added tests for `chunks`, since `group` did not have any tests.

# After Submitting
Update book if necessary.
---
 crates/nu-command/src/default_context.rs      |   1 +
 crates/nu-command/src/filters/chunks.rs       | 153 ++++++++++++++++++
 crates/nu-command/src/filters/group.rs        |  13 +-
 crates/nu-command/src/filters/mod.rs          |   2 +
 crates/nu-command/tests/commands/chunks.rs    |  43 +++++
 crates/nu-command/tests/commands/mod.rs       |   1 +
 crates/nu-protocol/src/errors/cli_error.rs    |  20 +++
 crates/nu-protocol/src/errors/mod.rs          |   4 +-
 .../nu-protocol/src/errors/parse_warning.rs   |   4 +-
 .../nu-protocol/src/pipeline/pipeline_data.rs |  28 ++++
 crates/nu-protocol/src/ty.rs                  |   4 +
 11 files changed, 269 insertions(+), 4 deletions(-)
 create mode 100644 crates/nu-command/src/filters/chunks.rs
 create mode 100644 crates/nu-command/tests/commands/chunks.rs

diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index 4f35a1c711..4adcfe9214 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -31,6 +31,7 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             All,
             Any,
             Append,
+            Chunks,
             Columns,
             Compact,
             Default,
diff --git a/crates/nu-command/src/filters/chunks.rs b/crates/nu-command/src/filters/chunks.rs
new file mode 100644
index 0000000000..11a59c2aa9
--- /dev/null
+++ b/crates/nu-command/src/filters/chunks.rs
@@ -0,0 +1,153 @@
+use nu_engine::command_prelude::*;
+use nu_protocol::ListStream;
+
+#[derive(Clone)]
+pub struct Chunks;
+
+impl Command for Chunks {
+    fn name(&self) -> &str {
+        "chunks"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("chunks")
+            .input_output_types(vec![
+                (Type::table(), Type::list(Type::table())),
+                (Type::list(Type::Any), Type::list(Type::list(Type::Any))),
+            ])
+            .required("chunk_size", SyntaxShape::Int, "The size of each chunk.")
+            .category(Category::Filters)
+    }
+
+    fn usage(&self) -> &str {
+        "Divide a list or table into chunks of `chunk_size`."
+    }
+
+    fn extra_usage(&self) -> &str {
+        "This command will error if `chunk_size` is negative or zero."
+    }
+
+    fn search_terms(&self) -> Vec<&str> {
+        vec!["batch", "group"]
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                example: "[1 2 3 4] | chunks 2",
+                description: "Chunk a list into pairs",
+                result: Some(Value::test_list(vec![
+                    Value::test_list(vec![Value::test_int(1), Value::test_int(2)]),
+                    Value::test_list(vec![Value::test_int(3), Value::test_int(4)]),
+                ])),
+            },
+            Example {
+                example: "[[foo bar]; [0 1] [2 3] [4 5] [6 7] [8 9]] | chunks 3",
+                description: "Chunk the rows of a table into triplets",
+                result: Some(Value::test_list(vec![
+                    Value::test_list(vec![
+                        Value::test_record(record! {
+                            "foo" => Value::test_int(0),
+                            "bar" => Value::test_int(1),
+                        }),
+                        Value::test_record(record! {
+                            "foo" => Value::test_int(2),
+                            "bar" => Value::test_int(3),
+                        }),
+                        Value::test_record(record! {
+                            "foo" => Value::test_int(4),
+                            "bar" => Value::test_int(5),
+                        }),
+                    ]),
+                    Value::test_list(vec![
+                        Value::test_record(record! {
+                            "foo" => Value::test_int(6),
+                            "bar" => Value::test_int(7),
+                        }),
+                        Value::test_record(record! {
+                            "foo" => Value::test_int(8),
+                            "bar" => Value::test_int(9),
+                        }),
+                    ]),
+                ])),
+            },
+        ]
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let head = call.head;
+        let chunk_size: Value = call.req(engine_state, stack, 0)?;
+
+        let size =
+            usize::try_from(chunk_size.as_int()?).map_err(|_| ShellError::NeedsPositiveValue {
+                span: chunk_size.span(),
+            })?;
+
+        if size == 0 {
+            return Err(ShellError::IncorrectValue {
+                msg: "`chunk_size` cannot be zero".into(),
+                val_span: chunk_size.span(),
+                call_span: head,
+            });
+        }
+
+        match input {
+            PipelineData::Value(Value::List { vals, .. }, metadata) => {
+                let chunks = ChunksIter::new(vals, size, head);
+                let stream = ListStream::new(chunks, head, engine_state.signals().clone());
+                Ok(PipelineData::ListStream(stream, metadata))
+            }
+            PipelineData::ListStream(stream, metadata) => {
+                let stream = stream.modify(|iter| ChunksIter::new(iter, size, head));
+                Ok(PipelineData::ListStream(stream, metadata))
+            }
+            input => Err(input.unsupported_input_error("list", head)),
+        }
+    }
+}
+
+struct ChunksIter<I: Iterator<Item = Value>> {
+    iter: I,
+    size: usize,
+    span: Span,
+}
+
+impl<I: Iterator<Item = Value>> ChunksIter<I> {
+    fn new(iter: impl IntoIterator<IntoIter = I>, size: usize, span: Span) -> Self {
+        Self {
+            iter: iter.into_iter(),
+            size,
+            span,
+        }
+    }
+}
+
+impl<I: Iterator<Item = Value>> Iterator for ChunksIter<I> {
+    type Item = Value;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        let first = self.iter.next()?;
+        let mut chunk = Vec::with_capacity(self.size); // delay allocation to optimize for empty iter
+        chunk.push(first);
+        chunk.extend((&mut self.iter).take(self.size - 1));
+        Some(Value::list(chunk, self.span))
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_examples() {
+        use crate::test_examples;
+
+        test_examples(Chunks {})
+    }
+}
diff --git a/crates/nu-command/src/filters/group.rs b/crates/nu-command/src/filters/group.rs
index 13b53850d2..60c720e325 100644
--- a/crates/nu-command/src/filters/group.rs
+++ b/crates/nu-command/src/filters/group.rs
@@ -1,5 +1,5 @@
 use nu_engine::command_prelude::*;
-use nu_protocol::ValueIterator;
+use nu_protocol::{report_warning_new, ParseWarning, ValueIterator};
 
 #[derive(Clone)]
 pub struct Group;
@@ -54,6 +54,17 @@ impl Command for Group {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
+
+        report_warning_new(
+            engine_state,
+            &ParseWarning::DeprecatedWarning {
+                old_command: "group".into(),
+                new_suggestion: "the new `chunks` command".into(),
+                span: head,
+                url: "`help chunks`".into(),
+            },
+        );
+
         let group_size: Spanned<usize> = call.req(engine_state, stack, 0)?;
         let metadata = input.metadata();
 
diff --git a/crates/nu-command/src/filters/mod.rs b/crates/nu-command/src/filters/mod.rs
index f43bdb10b2..4ffb0fc6db 100644
--- a/crates/nu-command/src/filters/mod.rs
+++ b/crates/nu-command/src/filters/mod.rs
@@ -1,6 +1,7 @@
 mod all;
 mod any;
 mod append;
+mod chunks;
 mod columns;
 mod compact;
 mod default;
@@ -58,6 +59,7 @@ mod zip;
 pub use all::All;
 pub use any::Any;
 pub use append::Append;
+pub use chunks::Chunks;
 pub use columns::Columns;
 pub use compact::Compact;
 pub use default::Default;
diff --git a/crates/nu-command/tests/commands/chunks.rs b/crates/nu-command/tests/commands/chunks.rs
new file mode 100644
index 0000000000..eb0c580f15
--- /dev/null
+++ b/crates/nu-command/tests/commands/chunks.rs
@@ -0,0 +1,43 @@
+use nu_test_support::nu;
+
+#[test]
+fn chunk_size_negative() {
+    let actual = nu!("[0 1 2] | chunks -1");
+    assert!(actual.err.contains("positive"));
+}
+
+#[test]
+fn chunk_size_zero() {
+    let actual = nu!("[0 1 2] | chunks 0");
+    assert!(actual.err.contains("zero"));
+}
+
+#[test]
+fn chunk_size_not_int() {
+    let actual = nu!("[0 1 2] | chunks (if true { 1sec })");
+    assert!(actual.err.contains("can't convert"));
+}
+
+#[test]
+fn empty() {
+    let actual = nu!("[] | chunks 2 | is-empty");
+    assert_eq!(actual.out, "true");
+}
+
+#[test]
+fn list_stream() {
+    let actual = nu!("([0 1 2] | every 1 | chunks 2) == ([0 1 2] | chunks 2)");
+    assert_eq!(actual.out, "true");
+}
+
+#[test]
+fn table_stream() {
+    let actual = nu!("([[foo bar]; [0 1] [2 3] [4 5]] | every 1 | chunks 2) == ([[foo bar]; [0 1] [2 3] [4 5]] | chunks 2)");
+    assert_eq!(actual.out, "true");
+}
+
+#[test]
+fn no_empty_chunks() {
+    let actual = nu!("([0 1 2 3 4 5] | chunks 3 | length) == 2");
+    assert_eq!(actual.out, "true");
+}
diff --git a/crates/nu-command/tests/commands/mod.rs b/crates/nu-command/tests/commands/mod.rs
index a1cb82a4b4..4c9f8e86f8 100644
--- a/crates/nu-command/tests/commands/mod.rs
+++ b/crates/nu-command/tests/commands/mod.rs
@@ -7,6 +7,7 @@ mod break_;
 mod bytes;
 mod cal;
 mod cd;
+mod chunks;
 mod compact;
 mod complete;
 mod config_env_default;
diff --git a/crates/nu-protocol/src/errors/cli_error.rs b/crates/nu-protocol/src/errors/cli_error.rs
index c12c601c4d..9ce6829b7b 100644
--- a/crates/nu-protocol/src/errors/cli_error.rs
+++ b/crates/nu-protocol/src/errors/cli_error.rs
@@ -47,6 +47,26 @@ pub fn report_error_new(
     report_error(&working_set, error);
 }
 
+pub fn report_warning(
+    working_set: &StateWorkingSet,
+    error: &(dyn miette::Diagnostic + Send + Sync + 'static),
+) {
+    eprintln!("Warning: {:?}", CliError(error, working_set));
+    // reset vt processing, aka ansi because illbehaved externals can break it
+    #[cfg(windows)]
+    {
+        let _ = nu_utils::enable_vt_processing();
+    }
+}
+
+pub fn report_warning_new(
+    engine_state: &EngineState,
+    error: &(dyn miette::Diagnostic + Send + Sync + 'static),
+) {
+    let working_set = StateWorkingSet::new(engine_state);
+    report_error(&working_set, error);
+}
+
 impl std::fmt::Debug for CliError<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let config = self.1.get_config();
diff --git a/crates/nu-protocol/src/errors/mod.rs b/crates/nu-protocol/src/errors/mod.rs
index 3f895cd65f..59369cd54f 100644
--- a/crates/nu-protocol/src/errors/mod.rs
+++ b/crates/nu-protocol/src/errors/mod.rs
@@ -5,7 +5,9 @@ mod parse_error;
 mod parse_warning;
 mod shell_error;
 
-pub use cli_error::{format_error, report_error, report_error_new};
+pub use cli_error::{
+    format_error, report_error, report_error_new, report_warning, report_warning_new,
+};
 pub use compile_error::CompileError;
 pub use labeled_error::{ErrorLabel, LabeledError};
 pub use parse_error::{DidYouMean, ParseError};
diff --git a/crates/nu-protocol/src/errors/parse_warning.rs b/crates/nu-protocol/src/errors/parse_warning.rs
index a30bc731d8..5f34deb20c 100644
--- a/crates/nu-protocol/src/errors/parse_warning.rs
+++ b/crates/nu-protocol/src/errors/parse_warning.rs
@@ -6,11 +6,11 @@ use thiserror::Error;
 #[derive(Clone, Debug, Error, Diagnostic, Serialize, Deserialize)]
 pub enum ParseWarning {
     #[error("Deprecated: {old_command}")]
-    #[diagnostic(help("for more info: {url}"))]
+    #[diagnostic(help("for more info see {url}"))]
     DeprecatedWarning {
         old_command: String,
         new_suggestion: String,
-        #[label("`{old_command}` is deprecated and will be removed in a future release. Please {new_suggestion} instead")]
+        #[label("`{old_command}` is deprecated and will be removed in a future release. Please {new_suggestion} instead.")]
         span: Span,
         url: String,
     },
diff --git a/crates/nu-protocol/src/pipeline/pipeline_data.rs b/crates/nu-protocol/src/pipeline/pipeline_data.rs
index a89337a6c2..0d1c0b3092 100644
--- a/crates/nu-protocol/src/pipeline/pipeline_data.rs
+++ b/crates/nu-protocol/src/pipeline/pipeline_data.rs
@@ -635,6 +635,34 @@ impl PipelineData {
             Ok(None)
         }
     }
+
+    pub fn unsupported_input_error(
+        self,
+        expected_type: impl Into<String>,
+        span: Span,
+    ) -> ShellError {
+        match self {
+            PipelineData::Empty => ShellError::PipelineEmpty { dst_span: span },
+            PipelineData::Value(value, ..) => ShellError::OnlySupportsThisInputType {
+                exp_input_type: expected_type.into(),
+                wrong_type: value.get_type().get_non_specified_string(),
+                dst_span: span,
+                src_span: value.span(),
+            },
+            PipelineData::ListStream(stream, ..) => ShellError::OnlySupportsThisInputType {
+                exp_input_type: expected_type.into(),
+                wrong_type: "list (stream)".into(),
+                dst_span: span,
+                src_span: stream.span(),
+            },
+            PipelineData::ByteStream(stream, ..) => ShellError::OnlySupportsThisInputType {
+                exp_input_type: expected_type.into(),
+                wrong_type: stream.type_().describe().into(),
+                dst_span: span,
+                src_span: stream.span(),
+            },
+        }
+    }
 }
 
 enum PipelineIteratorInner {
diff --git a/crates/nu-protocol/src/ty.rs b/crates/nu-protocol/src/ty.rs
index d5ea8c1554..7c004d81de 100644
--- a/crates/nu-protocol/src/ty.rs
+++ b/crates/nu-protocol/src/ty.rs
@@ -36,6 +36,10 @@ pub enum Type {
 }
 
 impl Type {
+    pub fn list(inner: Type) -> Self {
+        Self::List(Box::new(inner))
+    }
+
     pub fn record() -> Self {
         Self::Record([].into())
     }

From fcb8e36caa7551313e55640884bab4190a6adea6 Mon Sep 17 00:00:00 2001
From: Bruce Weirdan <weirdan@gmail.com>
Date: Tue, 16 Jul 2024 05:54:24 +0200
Subject: [PATCH 0234/1072] Remove `default` list-diving behaviour (#13386)

# Description

Before this change `default` would dive into lists and replace `null`
elements with the default value.
Therefore there was no easy way to process `null|list<null|string>`
input and receive `list<null|string>`
(IOW to apply the default on the top level only).

However it's trivially easy to apply default values to list elements
with the `each` command:
```nushell
[null, "a", null] | each { default "b" }
```

So there's no need to have this behavior in `default` command.

# User-Facing Changes

* `default` no longer dives into lists to replace `null` elements with
the default value.

# Tests + Formatting

Added a couple of tests for the new (and old) behavior.

# After Submitting

* Update docs.
---
 crates/nu-command/src/filters/default.rs    | 14 +++-----------
 crates/nu-command/tests/commands/default.rs | 12 ++++++++++++
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/crates/nu-command/src/filters/default.rs b/crates/nu-command/src/filters/default.rs
index a12d78f0b7..9b08ce6331 100644
--- a/crates/nu-command/src/filters/default.rs
+++ b/crates/nu-command/src/filters/default.rs
@@ -51,11 +51,11 @@ impl Command for Default {
                 description:
                     "Get the env value of `MY_ENV` with a default value 'abc' if not present",
                 example: "$env | get --ignore-errors MY_ENV | default 'abc'",
-                result: None, // Some(Value::test_string("abc")),
+                result: Some(Value::test_string("abc")),
             },
             Example {
                 description: "Replace the `null` value in a list",
-                example: "[1, 2, null, 4] | default 3",
+                example: "[1, 2, null, 4] | each { default 3 }",
                 result: Some(Value::list(
                     vec![
                         Value::test_int(1),
@@ -113,15 +113,7 @@ fn default(
     } else if input.is_nothing() {
         Ok(value.into_pipeline_data())
     } else {
-        input
-            .map(
-                move |item| match item {
-                    Value::Nothing { .. } => value.clone(),
-                    x => x,
-                },
-                engine_state.signals(),
-            )
-            .map(|x| x.set_metadata(metadata))
+        Ok(input)
     }
 }
 
diff --git a/crates/nu-command/tests/commands/default.rs b/crates/nu-command/tests/commands/default.rs
index 4fd41d7ec0..6ecd14960a 100644
--- a/crates/nu-command/tests/commands/default.rs
+++ b/crates/nu-command/tests/commands/default.rs
@@ -32,3 +32,15 @@ fn default_after_empty_filter() {
 
     assert_eq!(actual.out, "d");
 }
+
+#[test]
+fn keeps_nulls_in_lists() {
+    let actual = nu!(r#"[null, 2, 3] | default [] | to json -r"#);
+    assert_eq!(actual.out, "[null,2,3]");
+}
+
+#[test]
+fn replaces_null() {
+    let actual = nu!(r#"null | default 1"#);
+    assert_eq!(actual.out, "1");
+}

From 1981c50c8fbef4f2fdb6f8d8d8a570394d3b8581 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Tue, 16 Jul 2024 09:28:31 +0000
Subject: [PATCH 0235/1072] Remove unused field in `StateWorkingSet` (#13387)

# Description
Removes the unused `external_commands` field from `StateWorkingSet`.
---
 crates/nu-protocol/src/engine/state_working_set.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/crates/nu-protocol/src/engine/state_working_set.rs b/crates/nu-protocol/src/engine/state_working_set.rs
index af1085c1ee..822bf35e3a 100644
--- a/crates/nu-protocol/src/engine/state_working_set.rs
+++ b/crates/nu-protocol/src/engine/state_working_set.rs
@@ -25,7 +25,6 @@ use crate::{PluginIdentity, PluginRegistryItem, RegisteredPlugin};
 pub struct StateWorkingSet<'a> {
     pub permanent_state: &'a EngineState,
     pub delta: StateDelta,
-    pub external_commands: Vec<Vec<u8>>,
     pub files: FileStack,
     /// Whether or not predeclarations are searched when looking up a command (used with aliases)
     pub search_predecls: bool,
@@ -46,7 +45,6 @@ impl<'a> StateWorkingSet<'a> {
         Self {
             delta: StateDelta::new(permanent_state),
             permanent_state,
-            external_commands: vec![],
             files,
             search_predecls: true,
             parse_errors: vec![],

From b66671d339325dc34f96af4d893f9f94cafc4f0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Tue, 16 Jul 2024 14:16:26 +0200
Subject: [PATCH 0236/1072] Switch from dirs_next 2.0 to dirs 5.0 (#13384)

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

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

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

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
Replaces the `dirs_next` family of crates with `dirs`. `dirs_next` was
born when the `dirs` crates were abandoned three years ago, but they're
being maintained again and most projects depend on `dirs` nowadays.
`dirs_next` has been abandoned since.

This came up while working on
https://github.com/nushell/nushell/pull/13382.

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock                                    | 30 +++++++++++--------
 Cargo.toml                                    |  6 ++--
 crates/nu-command/Cargo.toml                  |  4 +--
 crates/nu-command/src/system/run_external.rs  |  2 +-
 crates/nu-command/tests/commands/cd.rs        |  2 +-
 .../nu-command/tests/commands/run_external.rs |  2 +-
 crates/nu-path/Cargo.toml                     |  4 +--
 crates/nu-path/src/helpers.rs                 |  8 ++---
 crates/nu-path/src/tilde.rs                   |  4 +--
 src/main.rs                                   |  2 +-
 tests/repl/test_config_path.rs                |  4 +--
 11 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2247e462fa..0e63b83844 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1219,24 +1219,24 @@ dependencies = [
 ]
 
 [[package]]
-name = "dirs-next"
-version = "2.0.0"
+name = "dirs"
+version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
 dependencies = [
- "cfg-if",
- "dirs-sys-next",
+ "dirs-sys",
 ]
 
 [[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
+name = "dirs-sys"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
 dependencies = [
  "libc",
+ "option-ext",
  "redox_users",
- "winapi",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -2873,7 +2873,7 @@ dependencies = [
  "assert_cmd",
  "crossterm",
  "ctrlc",
- "dirs-next",
+ "dirs",
  "log",
  "miette",
  "mimalloc",
@@ -3047,7 +3047,7 @@ dependencies = [
  "deunicode",
  "dialoguer",
  "digest",
- "dirs-next",
+ "dirs",
  "dtparse",
  "encoding_rs",
  "fancy-regex",
@@ -3245,7 +3245,7 @@ dependencies = [
 name = "nu-path"
 version = "0.95.1"
 dependencies = [
- "dirs-next",
+ "dirs",
  "omnipath",
  "pwd",
 ]
@@ -3836,6 +3836,12 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
 [[package]]
 name = "ordered-multimap"
 version = "0.7.3"
diff --git a/Cargo.toml b/Cargo.toml
index a0b3ef27f5..20f41f1b49 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -83,7 +83,7 @@ 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"
 dtparse = "2.0"
 encoding_rs = "0.8"
 fancy-regex = "0.13"
@@ -201,7 +201,7 @@ 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 }
@@ -229,7 +229,7 @@ nu-test-support = { path = "./crates/nu-test-support", version = "0.95.1" }
 nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.95.1" }
 nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.95.1" }
 assert_cmd = "2.0"
-dirs-next = { workspace = true }
+dirs = { workspace = true }
 tango-bench = "0.5"
 pretty_assertions = { workspace = true }
 regex = { workspace = true }
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 9c49a69ff5..ea501578b6 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -140,10 +140,10 @@ trash-support = ["trash"]
 nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.1" }
 nu-test-support = { path = "../nu-test-support", version = "0.95.1" }
 
-dirs-next = { workspace = true }
+dirs = { workspace = true }
 mockito = { workspace = true, default-features = false }
 quickcheck = { workspace = true }
 quickcheck_macros = { workspace = true }
 rstest = { workspace = true, default-features = false }
 pretty_assertions = { workspace = true }
-tempfile = { workspace = true }
\ No newline at end of file
+tempfile = { workspace = true }
diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index 5e8527b45e..0b9f1950ea 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -606,7 +606,7 @@ mod test {
             assert_eq!(actual, expected);
 
             let actual = expand_glob("~/foo.txt", cwd, Span::unknown(), &Signals::empty()).unwrap();
-            let home = dirs_next::home_dir().expect("failed to get home dir");
+            let home = dirs::home_dir().expect("failed to get home dir");
             let expected: Vec<OsString> = vec![home.join("foo.txt").into()];
             assert_eq!(actual, expected);
         })
diff --git a/crates/nu-command/tests/commands/cd.rs b/crates/nu-command/tests/commands/cd.rs
index 87af52aa4d..f58638cc35 100644
--- a/crates/nu-command/tests/commands/cd.rs
+++ b/crates/nu-command/tests/commands/cd.rs
@@ -151,7 +151,7 @@ fn filesystem_change_to_home_directory() {
             "
         );
 
-        assert_eq!(Some(PathBuf::from(actual.out)), dirs_next::home_dir());
+        assert_eq!(Some(PathBuf::from(actual.out)), dirs::home_dir());
     })
 }
 
diff --git a/crates/nu-command/tests/commands/run_external.rs b/crates/nu-command/tests/commands/run_external.rs
index 154c31b71c..17667c9bb3 100644
--- a/crates/nu-command/tests/commands/run_external.rs
+++ b/crates/nu-command/tests/commands/run_external.rs
@@ -309,7 +309,7 @@ fn external_arg_expand_tilde() {
             "#
         ));
 
-        let home = dirs_next::home_dir().expect("failed to find home dir");
+        let home = dirs::home_dir().expect("failed to find home dir");
 
         assert_eq!(
             actual.out,
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index dc2f870a9d..62908e7cb7 100644
--- a/crates/nu-path/Cargo.toml
+++ b/crates/nu-path/Cargo.toml
@@ -12,10 +12,10 @@ exclude = ["/fuzz"]
 bench = false
 
 [dependencies]
-dirs-next = { workspace = true }
+dirs = { workspace = true }
 
 [target.'cfg(windows)'.dependencies]
 omnipath = { workspace = true }
 
 [target.'cfg(all(unix, not(target_os = "macos"), not(target_os = "android")))'.dependencies]
-pwd = { workspace = true }
\ No newline at end of file
+pwd = { workspace = true }
diff --git a/crates/nu-path/src/helpers.rs b/crates/nu-path/src/helpers.rs
index 5b389410e4..a6e35bddfe 100644
--- a/crates/nu-path/src/helpers.rs
+++ b/crates/nu-path/src/helpers.rs
@@ -3,14 +3,14 @@ use omnipath::WinPathExt;
 use std::path::PathBuf;
 
 pub fn home_dir() -> Option<PathBuf> {
-    dirs_next::home_dir()
+    dirs::home_dir()
 }
 
 /// Return the data directory for the current platform or XDG_DATA_HOME if specified.
 pub fn data_dir() -> Option<PathBuf> {
     match std::env::var("XDG_DATA_HOME").map(PathBuf::from) {
         Ok(xdg_data) if xdg_data.is_absolute() => Some(canonicalize(&xdg_data).unwrap_or(xdg_data)),
-        _ => get_canonicalized_path(dirs_next::data_dir()),
+        _ => get_canonicalized_path(dirs::data_dir()),
     }
 }
 
@@ -20,7 +20,7 @@ pub fn cache_dir() -> Option<PathBuf> {
         Ok(xdg_cache) if xdg_cache.is_absolute() => {
             Some(canonicalize(&xdg_cache).unwrap_or(xdg_cache))
         }
-        _ => get_canonicalized_path(dirs_next::cache_dir()),
+        _ => get_canonicalized_path(dirs::cache_dir()),
     }
 }
 
@@ -30,7 +30,7 @@ pub fn config_dir() -> Option<PathBuf> {
         Ok(xdg_config) if xdg_config.is_absolute() => {
             Some(canonicalize(&xdg_config).unwrap_or(xdg_config))
         }
-        _ => get_canonicalized_path(dirs_next::config_dir()),
+        _ => get_canonicalized_path(dirs::config_dir()),
     }
 }
 
diff --git a/crates/nu-path/src/tilde.rs b/crates/nu-path/src/tilde.rs
index 60cc7d11eb..95c91addf8 100644
--- a/crates/nu-path/src/tilde.rs
+++ b/crates/nu-path/src/tilde.rs
@@ -77,7 +77,7 @@ fn user_home_dir(username: &str) -> PathBuf {
 fn user_home_dir(username: &str) -> PathBuf {
     use std::path::Component;
 
-    match dirs_next::home_dir() {
+    match dirs::home_dir() {
         None => {
             // Termux always has the same home directory
             #[cfg(target_os = "android")]
@@ -145,7 +145,7 @@ fn expand_tilde_with_another_user_home(path: &Path) -> PathBuf {
 /// Expand tilde ("~") into a home directory if it is the first path component
 pub fn expand_tilde(path: impl AsRef<Path>) -> PathBuf {
     // TODO: Extend this to work with "~user" style of home paths
-    expand_tilde_with_home(path, dirs_next::home_dir())
+    expand_tilde_with_home(path, dirs::home_dir())
 }
 
 #[cfg(test)]
diff --git a/src/main.rs b/src/main.rs
index 2c0c4d5e4b..f220731d1d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -100,7 +100,7 @@ fn main() -> Result<()> {
                     },
                 );
             } else if let Some(old_config) =
-                nu_path::get_canonicalized_path(dirs_next::config_dir()).map(|p| p.join("nushell"))
+                nu_path::get_canonicalized_path(dirs::config_dir()).map(|p| p.join("nushell"))
             {
                 let xdg_config_empty = nushell_config_path
                     .read_dir()
diff --git a/tests/repl/test_config_path.rs b/tests/repl/test_config_path.rs
index 534ac38a27..895b1bd8bf 100644
--- a/tests/repl/test_config_path.rs
+++ b/tests/repl/test_config_path.rs
@@ -235,7 +235,7 @@ fn test_xdg_config_empty() {
         playground.with_env("XDG_CONFIG_HOME", "");
 
         let actual = run(playground, "$nu.default-config-dir");
-        let expected = dirs_next::config_dir().unwrap().join("nushell");
+        let expected = dirs::config_dir().unwrap().join("nushell");
         assert_eq!(
             actual,
             adjust_canonicalization(expected.canonicalize().unwrap_or(expected))
@@ -250,7 +250,7 @@ fn test_xdg_config_bad() {
         playground.with_env("XDG_CONFIG_HOME", xdg_config_home);
 
         let actual = run(playground, "$nu.default-config-dir");
-        let expected = dirs_next::config_dir().unwrap().join("nushell");
+        let expected = dirs::config_dir().unwrap().join("nushell");
         assert_eq!(
             actual,
             adjust_canonicalization(expected.canonicalize().unwrap_or(expected))

From 5417c89387b67c3192ae9043473b556cd669ee15 Mon Sep 17 00:00:00 2001
From: Maxim Zhiburt <zhiburt@gmail.com>
Date: Wed, 17 Jul 2024 00:21:42 +0300
Subject: [PATCH 0237/1072] Fix issue with truncation when head on border is
 used (#13389)

close #13365

@fdncred thanks for reproducible

hopefully there won't be issues with it after this one :sweat_smile:
---
 crates/nu-command/tests/commands/table.rs |   6 ++
 crates/nu-table/src/table.rs              | 122 ++++++++++++----------
 2 files changed, 70 insertions(+), 58 deletions(-)

diff --git a/crates/nu-command/tests/commands/table.rs b/crates/nu-command/tests/commands/table.rs
index a4869f6bfa..272369a1c9 100644
--- a/crates/nu-command/tests/commands/table.rs
+++ b/crates/nu-command/tests/commands/table.rs
@@ -2901,3 +2901,9 @@ fn table_general_header_on_separator_trim_algorithm() {
     let actual = nu!("$env.config.table.header_on_separator = true; [[a b]; ['11111111111111111111111111111111111111' 2] ] | table --width=20 --theme basic");
     assert_eq!(actual.out, "+-#-+----a-----+-b-+| 0 | 11111111 | 2 ||   | 11111111 |   ||   | 11111111 |   ||   | 11111111 |   ||   | 111111   |   |+---+----------+---+");
 }
+
+#[test]
+fn table_general_header_on_separator_issue1() {
+    let actual = nu!("$env.config.table.header_on_separator = true; [['Llll oo Bbbbbbbb' 'Bbbbbbbb Aaaa' Nnnnnn Ggggg 'Xxxxx Llllllll #' Bbb 'Pppp Ccccc' 'Rrrrrrrr Dddd' Rrrrrr 'Rrrrrr Ccccc II' 'Rrrrrr Ccccc Ppppppp II' 'Pppppp Dddddddd Tttt' 'Pppppp Dddddddd Dddd' 'Rrrrrrrrr Trrrrrr' 'Pppppp Ppppp Dddd' 'Ppppp Dddd' Hhhh]; [RRRRRRR FFFFFFFF UUUU VV 202407160001 BBB 1 '7/16/2024' '' AAA-1111 AAA-1111-11 '7 YEARS' 2555 'RRRRRRRR DDDD' '7/16/2031' '7/16/2031' NN]] | table --width=87 --theme basic");
+    assert_eq!(actual.out, "+-#-+-Llll oo Bbbbbbbb-+-Bbbbbbbb Aaaa-+-Nnnnnn-+-Ggggg-+-Xxxxx Llllllll #-+-...-+| 0 | RRRRRRR          | FFFFFFFF      | UUUU   | VV    |     202407160001 | ... |+---+------------------+---------------+--------+-------+------------------+-----+");
+}
diff --git a/crates/nu-table/src/table.rs b/crates/nu-table/src/table.rs
index 0dbf1bda7e..bc23e48248 100644
--- a/crates/nu-table/src/table.rs
+++ b/crates/nu-table/src/table.rs
@@ -418,62 +418,7 @@ impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for
         // we already must have been estimated that it's safe to do.
         // and all dims will be suffitient
         if self.trim_as_head {
-            if recs.is_empty() {
-                return;
-            }
-
-            // even though it's safe to trim columns by header there might be left unused space
-            // so we do use it if possible prioritizing left columns
-
-            let headers = recs[0].to_owned();
-            let headers_widths = headers
-                .iter()
-                .map(CellInfo::width)
-                .map(|v| v + self.pad)
-                .collect::<Vec<_>>();
-
-            let min_width_use = get_total_width2(&headers_widths, cfg);
-
-            let mut free_width = self.width_max.saturating_sub(min_width_use);
-
-            for (i, head_width) in headers_widths.into_iter().enumerate() {
-                let head_width = head_width - self.pad;
-                let column_width = self.width[i] - self.pad; // safe to assume width is bigger then paddding
-
-                let mut use_width = head_width;
-                if free_width > 0 {
-                    // it's safe to assume that column_width is always bigger or equal to head_width
-                    debug_assert!(column_width >= head_width);
-
-                    let additional_width = min(free_width, column_width - head_width);
-                    free_width -= additional_width;
-                    use_width += additional_width;
-                }
-
-                match &self.strategy {
-                    TrimStrategy::Wrap { try_to_keep_words } => {
-                        let mut wrap = Width::wrap(use_width);
-                        if *try_to_keep_words {
-                            wrap = wrap.keep_words();
-                        }
-
-                        Modify::new(Columns::single(i))
-                            .with(wrap)
-                            .change(recs, cfg, dims);
-                    }
-                    TrimStrategy::Truncate { suffix } => {
-                        let mut truncate = Width::truncate(use_width);
-                        if let Some(suffix) = suffix {
-                            truncate = truncate.suffix(suffix).suffix_try_color(true);
-                        }
-
-                        Modify::new(Columns::single(i))
-                            .with(truncate)
-                            .change(recs, cfg, dims);
-                    }
-                }
-            }
-
+            trim_as_header(recs, cfg, dims, self);
             return;
         }
 
@@ -498,6 +443,67 @@ impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for
     }
 }
 
+fn trim_as_header(
+    recs: &mut VecRecords<CellInfo<String>>,
+    cfg: &mut ColoredConfig,
+    dims: &mut CompleteDimensionVecRecords,
+    trim: TableTrim,
+) {
+    if recs.is_empty() {
+        return;
+    }
+
+    let headers = recs[0].to_owned();
+    let headers_widths = headers
+        .iter()
+        .map(CellInfo::width)
+        .map(|v| v + trim.pad)
+        .collect::<Vec<_>>();
+    let min_width_use = get_total_width2(&headers_widths, cfg);
+    let mut free_width = trim.width_max.saturating_sub(min_width_use);
+
+    // even though it's safe to trim columns by header there might be left unused space
+    // so we do use it if possible prioritizing left columns
+
+    for (i, head_width) in headers_widths.into_iter().enumerate() {
+        let head_width = head_width - trim.pad;
+        let column_width = trim.width[i] - trim.pad; // safe to assume width is bigger then paddding
+
+        let mut use_width = head_width;
+        if free_width > 0 {
+            // it's safe to assume that column_width is always bigger or equal to head_width
+            debug_assert!(column_width >= head_width);
+
+            let additional_width = min(free_width, column_width - head_width);
+            free_width -= additional_width;
+            use_width += additional_width;
+        }
+
+        match &trim.strategy {
+            TrimStrategy::Wrap { try_to_keep_words } => {
+                let mut wrap = Width::wrap(use_width);
+                if *try_to_keep_words {
+                    wrap = wrap.keep_words();
+                }
+
+                Modify::new(Columns::single(i))
+                    .with(wrap)
+                    .change(recs, cfg, dims);
+            }
+            TrimStrategy::Truncate { suffix } => {
+                let mut truncate = Width::truncate(use_width);
+                if let Some(suffix) = suffix {
+                    truncate = truncate.suffix(suffix).suffix_try_color(true);
+                }
+
+                Modify::new(Columns::single(i))
+                    .with(truncate)
+                    .change(recs, cfg, dims);
+            }
+        }
+    }
+}
+
 fn align_table(
     table: &mut Table,
     alignments: Alignments,
@@ -793,14 +799,14 @@ fn truncate_columns_by_head(
     let mut truncate_pos = 0;
     for (i, column_header) in head.iter().enumerate() {
         let column_header_width = Cell::width(column_header);
-        width += column_header_width;
+        width += column_header_width + pad;
 
         if i > 0 {
             width += has_vertical as usize;
         }
 
         if width >= termwidth {
-            width -= column_header_width + (i > 0 && has_vertical) as usize;
+            width -= column_header_width + (i > 0 && has_vertical) as usize + pad;
             break;
         }
 

From 63cea4413041f8821b235d730c61588b36cd7f14 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Jul 2024 09:46:59 +0800
Subject: [PATCH 0238/1072] Bump uuid from 1.9.1 to 1.10.0 (#13390)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.9.1 to 1.10.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/uuid-rs/uuid/releases">uuid's
releases</a>.</em></p>
<blockquote>
<h2>1.10.0</h2>
<h2>Deprecations</h2>
<p>This release deprecates and renames the following functions:</p>
<ul>
<li><code>Builder::from_rfc4122_timestamp</code> -&gt;
<code>Builder::from_gregorian_timestamp</code></li>
<li><code>Builder::from_sorted_rfc4122_timestamp</code> -&gt;
<code>Builder::from_sorted_gregorian_timestamp</code></li>
<li><code>Timestamp::from_rfc4122</code> -&gt;
<code>Timestamp::from_gregorian</code></li>
<li><code>Timestamp::to_rfc4122</code> -&gt;
<code>Timestamp::to_gregorian</code></li>
</ul>
<h2>What's Changed</h2>
<ul>
<li>Use const identifier in uuid macro by <a
href="https://github.com/Vrajs16"><code>@​Vrajs16</code></a> in <a
href="https://redirect.github.com/uuid-rs/uuid/pull/764">uuid-rs/uuid#764</a></li>
<li>Rename most methods referring to RFC4122 by <a
href="https://github.com/Mikopet"><code>@​Mikopet</code></a> / <a
href="https://github.com/KodrAus"><code>@​KodrAus</code></a> in <a
href="https://redirect.github.com/uuid-rs/uuid/pull/765">uuid-rs/uuid#765</a></li>
<li>prepare for 1.10.0 release by <a
href="https://github.com/KodrAus"><code>@​KodrAus</code></a> in <a
href="https://redirect.github.com/uuid-rs/uuid/pull/766">uuid-rs/uuid#766</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/Vrajs16"><code>@​Vrajs16</code></a> made
their first contribution in <a
href="https://redirect.github.com/uuid-rs/uuid/pull/764">uuid-rs/uuid#764</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/uuid-rs/uuid/compare/1.9.1...1.10.0">https://github.com/uuid-rs/uuid/compare/1.9.1...1.10.0</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/uuid-rs/uuid/commit/4b4c590ae323b683a7ba80f05c83d3002ddc2fc5"><code>4b4c590</code></a>
Merge pull request <a
href="https://redirect.github.com/uuid-rs/uuid/issues/766">#766</a> from
uuid-rs/cargo/1.10.0</li>
<li><a
href="https://github.com/uuid-rs/uuid/commit/68eff326408ea269253aa0ba8f6cb3ac4099f894"><code>68eff32</code></a>
Merge pull request <a
href="https://redirect.github.com/uuid-rs/uuid/issues/765">#765</a> from
uuid-rs/chore/time-fn-deprecations</li>
<li><a
href="https://github.com/uuid-rs/uuid/commit/3d5384da4bfb2f35ad4426440d285e4a13c8c011"><code>3d5384d</code></a>
update docs and deprecation messages for timestamp fns</li>
<li><a
href="https://github.com/uuid-rs/uuid/commit/de50f2091f05a973b4e8ca2f7eddd03459b1b680"><code>de50f20</code></a>
renaming rfc4122 functions</li>
<li><a
href="https://github.com/uuid-rs/uuid/commit/4a8841792a8bb7007d23a54fa866adc5cec79425"><code>4a88417</code></a>
prepare for 1.10.0 release</li>
<li><a
href="https://github.com/uuid-rs/uuid/commit/66b4fcef14862bc5d8d45acb9f6683a37fa5ecb4"><code>66b4fce</code></a>
Merge pull request <a
href="https://redirect.github.com/uuid-rs/uuid/issues/764">#764</a> from
Vrajs16/main</li>
<li><a
href="https://github.com/uuid-rs/uuid/commit/8896e26c421a8b9a7a935acf83d291df40256de9"><code>8896e26</code></a>
Use expr instead of ident</li>
<li><a
href="https://github.com/uuid-rs/uuid/commit/09973d6aff62b61ec35f577a757148007deb5f05"><code>09973d6</code></a>
Added changes</li>
<li><a
href="https://github.com/uuid-rs/uuid/commit/6edf3e8cd59351589622daf1f2634870d90896e3"><code>6edf3e8</code></a>
Use const identifer in uuid macro</li>
<li>See full diff in <a
href="https://github.com/uuid-rs/uuid/compare/1.9.1...1.10.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=uuid&package-manager=cargo&previous-version=1.9.1&new-version=1.10.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                         | 4 ++--
 Cargo.toml                         | 2 +-
 crates/nu_plugin_polars/Cargo.toml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0e63b83844..3006f933f3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6638,9 +6638,9 @@ checksum = "425a23c7b7145bc7620c9c445817c37b1f78b6790aee9f208133f3c028975b60"
 
 [[package]]
 name = "uuid"
-version = "1.9.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439"
+checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
 dependencies = [
  "getrandom",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index 20f41f1b49..9941d495f9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -173,7 +173,7 @@ uu_mv = "0.0.27"
 uu_whoami = "0.0.27"
 uu_uname = "0.0.27"
 uucore = "0.0.27"
-uuid = "1.9.1"
+uuid = "1.10.0"
 v_htmlescape = "0.15.0"
 wax = "0.6"
 which = "6.0.0"
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index f9b4295cb9..99c88e47d6 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -39,7 +39,7 @@ polars-utils = { version = "0.41"}
 typetag = "0.2"
 env_logger = "0.11.3"
 log.workspace = true
-uuid = { version = "1.9", features = ["v4", "serde"] }
+uuid = { version = "1.10", features = ["v4", "serde"] }
 
 [dependencies.polars]
 features = [

From ac18e436035b9d1319d23432d728ad9f0711ed2c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Jul 2024 09:47:09 +0800
Subject: [PATCH 0239/1072] Bump rust-embed from 8.4.0 to 8.5.0 (#13392)

Bumps [rust-embed](https://github.com/pyros2097/rust-embed) from 8.4.0
to 8.5.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/pyrossh/rust-embed/blob/master/changelog.md">rust-embed's
changelog</a>.</em></p>
<blockquote>
<h2>[8.5.0] - 2024-07-09</h2>
<ul>
<li>Re-export RustEmbed as Embed <a
href="https://redirect.github.com/pyrossh/rust-embed/pull/246">#246</a>.
Thanks to <a href="https://github.com/krant">krant</a></li>
<li>Allow users to specify a custom path to the rust_embed crate in
generated code<a
href="https://redirect.github.com/pyrossh/rust-embed/pull/232">#232</a>.
Thanks to <a href="https://github.com/Wulf">Wulf</a></li>
<li>Increase minimum rust-version to v1.7.0.0</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a
href="https://github.com/pyros2097/rust-embed/commits">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=rust-embed&package-manager=cargo&previous-version=8.4.0&new-version=8.5.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3006f933f3..2506c6bc67 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5216,9 +5216,9 @@ dependencies = [
 
 [[package]]
 name = "rust-embed"
-version = "8.4.0"
+version = "8.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a"
+checksum = "fa66af4a4fdd5e7ebc276f115e895611a34739a9c1c01028383d612d550953c0"
 dependencies = [
  "rust-embed-impl",
  "rust-embed-utils",
diff --git a/Cargo.toml b/Cargo.toml
index 9941d495f9..8ce82c274a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -145,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"

From f976c318870730a1674376ff33141626faf67a07 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Jul 2024 09:47:17 +0800
Subject: [PATCH 0240/1072] Bump open from 5.2.0 to 5.3.0 (#13391)

Bumps [open](https://github.com/Byron/open-rs) from 5.2.0 to 5.3.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/Byron/open-rs/releases">open's
releases</a>.</em></p>
<blockquote>
<h2>v5.3.0</h2>
<h3>New Features</h3>
<ul>
<li>add GNU/Hurd support
Handle it like most of the other Unix platforms (e.g. Linux, BSDs,
etc).</li>
</ul>
<h3>Commit Statistics</h3>
<ul>
<li>2 commits contributed to the release.</li>
<li>7 days passed between releases.</li>
<li>1 commit was understood as <a
href="https://www.conventionalcommits.org">conventional</a>.</li>
<li>0 issues like '(#ID)' were seen in commit messages</li>
</ul>
<h3>Commit Details</h3>
<!-- raw HTML omitted -->
<!-- raw HTML omitted -->
<ul>
<li><strong>Uncategorized</strong>
<ul>
<li>Merge pull request <a
href="https://redirect.github.com/Byron/open-rs/issues/101">#101</a>
from pinotree/hurd (a060608)</li>
<li>Add GNU/Hurd support (58142a6)</li>
</ul>
</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/Byron/open-rs/blob/main/changelog.md">open's
changelog</a>.</em></p>
<blockquote>
<h2>5.3.0 (2024-07-10)</h2>
<h3>New Features</h3>
<ul>
<li><!-- raw HTML omitted --> add GNU/Hurd support
Handle it like most of the other Unix platforms (e.g. Linux, BSDs,
etc).</li>
</ul>
<h3>Commit Statistics</h3>
<!-- raw HTML omitted -->
<ul>
<li>2 commits contributed to the release.</li>
<li>7 days passed between releases.</li>
<li>1 commit was understood as <a
href="https://www.conventionalcommits.org">conventional</a>.</li>
<li>0 issues like '(#ID)' were seen in commit messages</li>
</ul>
<h3>Commit Details</h3>
<!-- raw HTML omitted -->
<!-- raw HTML omitted -->
<ul>
<li><strong>Uncategorized</strong>
<ul>
<li>Merge pull request <a
href="https://redirect.github.com/Byron/open-rs/issues/101">#101</a>
from pinotree/hurd (<a
href="https://github.com/Byron/open-rs/commit/a0606084dd4a18ca67bef84fa217529cb858ded5"><code>a060608</code></a>)</li>
<li>Add GNU/Hurd support (<a
href="https://github.com/Byron/open-rs/commit/58142a695d50460e439f85be3f0bc010936520e6"><code>58142a6</code></a>)</li>
</ul>
</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/Byron/open-rs/commit/c26d98cc66979f153682690201a4748026012224"><code>c26d98c</code></a>
Release open v5.3.0</li>
<li><a
href="https://github.com/Byron/open-rs/commit/a0606084dd4a18ca67bef84fa217529cb858ded5"><code>a060608</code></a>
Merge pull request <a
href="https://redirect.github.com/Byron/open-rs/issues/101">#101</a>
from pinotree/hurd</li>
<li><a
href="https://github.com/Byron/open-rs/commit/58142a695d50460e439f85be3f0bc010936520e6"><code>58142a6</code></a>
feat: add GNU/Hurd support</li>
<li>See full diff in <a
href="https://github.com/Byron/open-rs/compare/v5.2.0...v5.3.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=open&package-manager=cargo&previous-version=5.2.0&new-version=5.3.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2506c6bc67..49770a9a0d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3773,9 +3773,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "open"
-version = "5.2.0"
+version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d2c909a3fce3bd80efef4cd1c6c056bd9376a8fe06fcfdbebaf32cb485a7e37"
+checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3"
 dependencies = [
  "is-wsl",
  "libc",
diff --git a/Cargo.toml b/Cargo.toml
index 8ce82c274a..335e2f0384 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -120,7 +120,7 @@ num-format = "0.4"
 num-traits = "0.2"
 omnipath = "0.1"
 once_cell = "1.18"
-open = "5.2"
+open = "5.3"
 os_pipe = { version = "1.2", features = ["io_safety"] }
 pathdiff = "0.2"
 percent-encoding = "2"

From aa7d7d0cc3bffcf4323291a7a4163e41dfbee6dd Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Wed, 17 Jul 2024 14:02:42 -0700
Subject: [PATCH 0241/1072] Overhaul `$in` expressions (#13357)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

This grew quite a bit beyond its original scope, but I've tried to make
`$in` a bit more consistent and easier to work with.

Instead of the parser generating calls to `collect` and creating
closures, this adds `Expr::Collect` which just evaluates in the same
scope and doesn't require any closure.

When `$in` is detected in an expression, it is replaced with a new
variable (also called `$in`) and wrapped in `Expr::Collect`. During
eval, this expression is evaluated directly, with the input and with
that new variable set to the collected value.

Other than being faster and less prone to gotchas, it also makes it
possible to typecheck the output of an expression containing `$in`,
which is nice. This is a breaking change though, because of the lack of
the closure and because now typechecking will actually happen. Also, I
haven't attempted to typecheck the input yet.

The IR generated now just looks like this:

```gas
collect        %in
clone          %tmp, %in
store-variable $in, %tmp
# %out <- ...expression... <- %in
drop-variable  $in
```

(where `$in` is the local variable created for this collection, and not
`IN_VARIABLE_ID`)

which is a lot better than having to create a closure and call `collect
--keep-env`, dealing with all of the capture gathering and allocation
that entails. Ideally we can also detect whether that input is actually
needed, so maybe we don't have to clone, but I haven't tried to do that
yet. Theoretically now that the variable is a unique one every time, it
should be possible to give it a type - I just don't know how to
determine that yet.

On top of that, I've also reworked how `$in` works in pipeline-initial
position. Previously, it was a little bit inconsistent. For example,
this worked:

```nushell
> 3 | do { let x = $in; let y = $in; print $x $y }
3
3
```

However, this causes a runtime variable not found error on the second
`$in`:

```nushell
> def foo [] { let x = $in; let y = $in; print $x $y }; 3 | foo
Error: nu::shell::variable_not_found

  × Variable not found
   ╭─[entry #115:1:35]
 1 │ def foo [] { let x = $in; let y = $in; print $x $y }; 3 | foo
   ·                                   ─┬─
   ·                                    ╰── variable not found
   ╰────
```

I've fixed this by making the first element `$in` detection *always*
happen at the block level, so if you use `$in` in pipeline-initial
position anywhere in a block, it will collect with an implicit
subexpression around the whole thing, and you can then use that `$in`
more than once. In doing this I also rewrote `parse_pipeline()` and
hopefully it's a bit more straightforward and possibly more efficient
too now.

Finally, I've tried to make `let` and `mut` a lot more straightforward
with how they handle the rest of the pipeline, and using a redirection
with `let`/`mut` now does what you'd expect if you assume that they
consume the whole pipeline - the redirection is just processed as
normal. These both work now:

```nushell
let x = ^foo err> err.txt
let y = ^foo out+err>| str length
```

It was previously possible to accomplish this with a subexpression, but
it just seemed like a weird gotcha that you couldn't do it. Intuitively,
`let` and `mut` just seem to take the whole line.

- closes #13137

# User-Facing Changes
- `$in` will behave more consistently with blocks and closures, since
the entire block is now just wrapped to handle it if it appears in the
first pipeline element
- `$in` no longer creates a closure, so what can be done within an
expression containing `$in` is less restrictive
- `$in` containing expressions are now type checked, rather than just
resulting in `any`. However, `$in` itself is still `any`, so this isn't
quite perfect yet
- Redirections are now allowed in `let` and `mut` and behave pretty much
how you'd expect

# Tests + Formatting
Added tests to cover the new behaviour.

# After Submitting
- [ ] release notes (definitely breaking change)
---
 crates/nu-cli/src/syntax_highlight.rs         |   8 +
 crates/nu-cmd-lang/src/example_support.rs     |   7 +-
 crates/nu-command/src/example_test.rs         |   3 +-
 .../nu-command/tests/commands/redirection.rs  |  34 ++
 crates/nu-engine/src/compile/builder.rs       |   1 +
 crates/nu-engine/src/compile/expression.rs    |  21 ++
 crates/nu-engine/src/eval.rs                  |  58 ++-
 crates/nu-engine/src/eval_ir.rs               |  22 +-
 crates/nu-parser/src/flatten.rs               |   3 +
 crates/nu-parser/src/lite_parser.rs           |  29 ++
 crates/nu-parser/src/parser.rs                | 355 +++++++-----------
 crates/nu-parser/tests/test_parser.rs         |  63 +++-
 crates/nu-protocol/src/ast/block.rs           |  13 +
 crates/nu-protocol/src/ast/expr.rs            |   9 +-
 crates/nu-protocol/src/ast/expression.rs      | 166 ++++++--
 crates/nu-protocol/src/ast/pipeline.rs        |  43 ++-
 crates/nu-protocol/src/debugger/profiler.rs   |   1 +
 crates/nu-protocol/src/eval_base.rs           |  10 +
 crates/nu-protocol/src/eval_const.rs          |   9 +
 crates/nu-protocol/src/ir/display.rs          |   4 +
 crates/nu-protocol/src/ir/mod.rs              |   3 +
 crates/nuon/src/from.rs                       |   6 +
 tests/repl/test_engine.rs                     |  23 ++
 tests/repl/test_type_check.rs                 |  13 +
 24 files changed, 631 insertions(+), 273 deletions(-)

diff --git a/crates/nu-cli/src/syntax_highlight.rs b/crates/nu-cli/src/syntax_highlight.rs
index 08dcbb1346..ebd8315190 100644
--- a/crates/nu-cli/src/syntax_highlight.rs
+++ b/crates/nu-cli/src/syntax_highlight.rs
@@ -429,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)
diff --git a/crates/nu-cmd-lang/src/example_support.rs b/crates/nu-cmd-lang/src/example_support.rs
index bb03bbaf8c..72ea36972f 100644
--- a/crates/nu-cmd-lang/src/example_support.rs
+++ b/crates/nu-cmd-lang/src/example_support.rs
@@ -4,7 +4,7 @@ use nu_protocol::{
     ast::Block,
     debugger::WithoutDebug,
     engine::{StateDelta, StateWorkingSet},
-    Range,
+    report_error_new, Range,
 };
 use std::{
     sync::Arc,
@@ -124,7 +124,10 @@ pub fn eval_block(
 
     nu_engine::eval_block::<WithoutDebug>(engine_state, &mut stack, &block, input)
         .and_then(|data| data.into_value(Span::test_data()))
-        .unwrap_or_else(|err| panic!("test eval error in `{}`: {:?}", "TODO", err))
+        .unwrap_or_else(|err| {
+            report_error_new(engine_state, &err);
+            panic!("test eval error in `{}`: {:?}", "TODO", err)
+        })
 }
 
 pub fn check_example_evaluates_to_expected_output(
diff --git a/crates/nu-command/src/example_test.rs b/crates/nu-command/src/example_test.rs
index 476113aa2d..4879cab0a9 100644
--- a/crates/nu-command/src/example_test.rs
+++ b/crates/nu-command/src/example_test.rs
@@ -31,7 +31,7 @@ mod test_examples {
         check_example_evaluates_to_expected_output,
         check_example_input_and_output_types_match_command_signature,
     };
-    use nu_cmd_lang::{Break, Echo, If, Let, Mut};
+    use nu_cmd_lang::{Break, Describe, Echo, If, Let, Mut};
     use nu_protocol::{
         engine::{Command, EngineState, StateWorkingSet},
         Type,
@@ -81,6 +81,7 @@ mod test_examples {
             working_set.add_decl(Box::new(Break));
             working_set.add_decl(Box::new(Date));
             working_set.add_decl(Box::new(Default));
+            working_set.add_decl(Box::new(Describe));
             working_set.add_decl(Box::new(Each));
             working_set.add_decl(Box::new(Echo));
             working_set.add_decl(Box::new(Enumerate));
diff --git a/crates/nu-command/tests/commands/redirection.rs b/crates/nu-command/tests/commands/redirection.rs
index 1eb57077b9..02f85a90f8 100644
--- a/crates/nu-command/tests/commands/redirection.rs
+++ b/crates/nu-command/tests/commands/redirection.rs
@@ -439,3 +439,37 @@ fn no_duplicate_redirection() {
         );
     });
 }
+
+#[rstest::rstest]
+#[case("let", "out>")]
+#[case("let", "err>")]
+#[case("let", "out+err>")]
+#[case("mut", "out>")]
+#[case("mut", "err>")]
+#[case("mut", "out+err>")]
+fn file_redirection_in_let_and_mut(#[case] keyword: &str, #[case] redir: &str) {
+    Playground::setup("file redirection in let and mut", |dirs, _| {
+        let actual = nu!(
+            cwd: dirs.test(),
+            format!("$env.BAZ = 'foo'; {keyword} v = nu --testbin echo_env_mixed out-err BAZ BAZ {redir} result.txt")
+        );
+        assert!(actual.status.success());
+        assert!(file_contents(dirs.test().join("result.txt")).contains("foo"));
+    })
+}
+
+#[rstest::rstest]
+#[case("let", "err>|", "foo3")]
+#[case("let", "out+err>|", "7")]
+#[case("mut", "err>|", "foo3")]
+#[case("mut", "out+err>|", "7")]
+fn pipe_redirection_in_let_and_mut(
+    #[case] keyword: &str,
+    #[case] redir: &str,
+    #[case] output: &str,
+) {
+    let actual = nu!(
+        format!("$env.BAZ = 'foo'; {keyword} v = nu --testbin echo_env_mixed out-err BAZ BAZ {redir} str length; $v")
+    );
+    assert_eq!(actual.out, output);
+}
diff --git a/crates/nu-engine/src/compile/builder.rs b/crates/nu-engine/src/compile/builder.rs
index d77075cc3f..4294b2bd61 100644
--- a/crates/nu-engine/src/compile/builder.rs
+++ b/crates/nu-engine/src/compile/builder.rs
@@ -204,6 +204,7 @@ impl BlockBuilder {
             Instruction::Drain { src } => allocate(&[*src], &[]),
             Instruction::LoadVariable { dst, var_id: _ } => allocate(&[], &[*dst]),
             Instruction::StoreVariable { var_id: _, src } => allocate(&[*src], &[]),
+            Instruction::DropVariable { var_id: _ } => Ok(()),
             Instruction::LoadEnv { dst, key: _ } => allocate(&[], &[*dst]),
             Instruction::LoadEnvOpt { dst, key: _ } => allocate(&[], &[*dst]),
             Instruction::StoreEnv { key: _, src } => allocate(&[*src], &[]),
diff --git a/crates/nu-engine/src/compile/expression.rs b/crates/nu-engine/src/compile/expression.rs
index 38ee58ea26..948eb5c238 100644
--- a/crates/nu-engine/src/compile/expression.rs
+++ b/crates/nu-engine/src/compile/expression.rs
@@ -171,6 +171,27 @@ pub(crate) fn compile_expression(
                 Err(CompileError::UnsupportedOperatorExpression { span: op.span })
             }
         }
+        Expr::Collect(var_id, expr) => {
+            let store_reg = if let Some(in_reg) = in_reg {
+                // Collect, clone, store
+                builder.push(Instruction::Collect { src_dst: in_reg }.into_spanned(expr.span))?;
+                builder.clone_reg(in_reg, expr.span)?
+            } else {
+                // Just store nothing in the variable
+                builder.literal(Literal::Nothing.into_spanned(Span::unknown()))?
+            };
+            builder.push(
+                Instruction::StoreVariable {
+                    var_id: *var_id,
+                    src: store_reg,
+                }
+                .into_spanned(expr.span),
+            )?;
+            compile_expression(working_set, builder, expr, redirect_modes, in_reg, out_reg)?;
+            // Clean it up afterward
+            builder.push(Instruction::DropVariable { var_id: *var_id }.into_spanned(expr.span))?;
+            Ok(())
+        }
         Expr::Subexpression(block_id) => {
             let block = working_set.get_block(*block_id);
             compile_block(working_set, builder, block, redirect_modes, in_reg, out_reg)
diff --git a/crates/nu-engine/src/eval.rs b/crates/nu-engine/src/eval.rs
index 42d0aed288..84fa700934 100644
--- a/crates/nu-engine/src/eval.rs
+++ b/crates/nu-engine/src/eval.rs
@@ -10,8 +10,8 @@ use nu_protocol::{
     debugger::DebugContext,
     engine::{Closure, EngineState, Redirection, Stack, StateWorkingSet},
     eval_base::Eval,
-    ByteStreamSource, Config, FromValue, IntoPipelineData, OutDest, PipelineData, ShellError, Span,
-    Spanned, Type, Value, VarId, ENV_VARIABLE_ID,
+    ByteStreamSource, Config, DataSource, FromValue, IntoPipelineData, OutDest, PipelineData,
+    PipelineMetadata, ShellError, Span, Spanned, Type, Value, VarId, ENV_VARIABLE_ID,
 };
 use nu_utils::IgnoreCaseExt;
 use std::{fs::OpenOptions, path::PathBuf, sync::Arc};
@@ -259,6 +259,10 @@ pub fn eval_expression_with_input<D: DebugContext>(
             input = eval_external(engine_state, stack, head, args, input)?;
         }
 
+        Expr::Collect(var_id, expr) => {
+            input = eval_collect::<D>(engine_state, stack, *var_id, expr, input)?;
+        }
+
         Expr::Subexpression(block_id) => {
             let block = engine_state.get_block(*block_id);
             // FIXME: protect this collect with ctrl-c
@@ -605,6 +609,44 @@ pub fn eval_block<D: DebugContext>(
     Ok(input)
 }
 
+pub fn eval_collect<D: DebugContext>(
+    engine_state: &EngineState,
+    stack: &mut Stack,
+    var_id: VarId,
+    expr: &Expression,
+    input: PipelineData,
+) -> Result<PipelineData, ShellError> {
+    // Evaluate the expression with the variable set to the collected input
+    let span = input.span().unwrap_or(Span::unknown());
+
+    let metadata = match input.metadata() {
+        // Remove the `FilePath` metadata, because after `collect` it's no longer necessary to
+        // check where some input came from.
+        Some(PipelineMetadata {
+            data_source: DataSource::FilePath(_),
+            content_type: None,
+        }) => None,
+        other => other,
+    };
+
+    let input = input.into_value(span)?;
+
+    stack.add_var(var_id, input.clone());
+
+    let result = eval_expression_with_input::<D>(
+        engine_state,
+        stack,
+        expr,
+        // We still have to pass it as input
+        input.into_pipeline_data_with_metadata(metadata),
+    )
+    .map(|(result, _failed)| result);
+
+    stack.remove_var(var_id);
+
+    result
+}
+
 pub fn eval_subexpression<D: DebugContext>(
     engine_state: &EngineState,
     stack: &mut Stack,
@@ -729,6 +771,18 @@ impl Eval for EvalRuntime {
         eval_external(engine_state, stack, head, args, PipelineData::empty())?.into_value(span)
     }
 
+    fn eval_collect<D: DebugContext>(
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        var_id: VarId,
+        expr: &Expression,
+    ) -> Result<Value, ShellError> {
+        // It's a little bizarre, but the expression can still have some kind of result even with
+        // nothing input
+        eval_collect::<D>(engine_state, stack, var_id, expr, PipelineData::empty())?
+            .into_value(expr.span)
+    }
+
     fn eval_subexpression<D: DebugContext>(
         engine_state: &EngineState,
         stack: &mut Stack,
diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index 29a677bd69..8550cbab99 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -6,9 +6,9 @@ use nu_protocol::{
     debugger::DebugContext,
     engine::{Argument, Closure, EngineState, ErrorHandler, Matcher, Redirection, Stack},
     ir::{Call, DataSlice, Instruction, IrAstRef, IrBlock, Literal, RedirectMode},
-    record, ByteStreamSource, DeclId, ErrSpan, Flag, IntoPipelineData, IntoSpanned, ListStream,
-    OutDest, PipelineData, PositionalArg, Range, Record, RegId, ShellError, Signals, Signature,
-    Span, Spanned, Type, Value, VarId, ENV_VARIABLE_ID,
+    record, ByteStreamSource, DataSource, DeclId, ErrSpan, Flag, IntoPipelineData, IntoSpanned,
+    ListStream, OutDest, PipelineData, PipelineMetadata, PositionalArg, Range, Record, RegId,
+    ShellError, Signals, Signature, Span, Spanned, Type, Value, VarId, ENV_VARIABLE_ID,
 };
 use nu_utils::IgnoreCaseExt;
 
@@ -345,6 +345,10 @@ fn eval_instruction<D: DebugContext>(
             ctx.stack.add_var(*var_id, value);
             Ok(Continue)
         }
+        Instruction::DropVariable { var_id } => {
+            ctx.stack.remove_var(*var_id);
+            Ok(Continue)
+        }
         Instruction::LoadEnv { dst, key } => {
             let key = ctx.get_str(*key, *span)?;
             if let Some(value) = get_env_var_case_insensitive(ctx, key) {
@@ -1341,9 +1345,19 @@ fn get_env_var_name_case_insensitive<'a>(ctx: &mut EvalContext<'_>, key: &'a str
 }
 
 /// Helper to collect values into [`PipelineData`], preserving original span and metadata
+///
+/// The metadata is removed if it is the file data source, as that's just meant to mark streams.
 fn collect(data: PipelineData, fallback_span: Span) -> Result<PipelineData, ShellError> {
     let span = data.span().unwrap_or(fallback_span);
-    let metadata = data.metadata();
+    let metadata = match data.metadata() {
+        // Remove the `FilePath` metadata, because after `collect` it's no longer necessary to
+        // check where some input came from.
+        Some(PipelineMetadata {
+            data_source: DataSource::FilePath(_),
+            content_type: None,
+        }) => None,
+        other => other,
+    };
     let value = data.into_value(span)?;
     Ok(PipelineData::Value(value, metadata))
 }
diff --git a/crates/nu-parser/src/flatten.rs b/crates/nu-parser/src/flatten.rs
index 88638b2475..8a05edaef4 100644
--- a/crates/nu-parser/src/flatten.rs
+++ b/crates/nu-parser/src/flatten.rs
@@ -189,6 +189,9 @@ fn flatten_expression_into(
             ));
             flatten_expression_into(working_set, not, output);
         }
+        Expr::Collect(_, expr) => {
+            flatten_expression_into(working_set, expr, output);
+        }
         Expr::Closure(block_id) => {
             let outer_span = expr.span;
 
diff --git a/crates/nu-parser/src/lite_parser.rs b/crates/nu-parser/src/lite_parser.rs
index f04b8befdc..c9e9578698 100644
--- a/crates/nu-parser/src/lite_parser.rs
+++ b/crates/nu-parser/src/lite_parser.rs
@@ -2,6 +2,7 @@
 //! can be parsed.
 
 use crate::{Token, TokenContents};
+use itertools::{Either, Itertools};
 use nu_protocol::{ast::RedirectionSource, ParseError, Span};
 use std::mem;
 
@@ -24,6 +25,15 @@ impl LiteRedirectionTarget {
             | LiteRedirectionTarget::Pipe { connector } => *connector,
         }
     }
+
+    pub fn spans(&self) -> impl Iterator<Item = Span> {
+        match *self {
+            LiteRedirectionTarget::File {
+                connector, file, ..
+            } => Either::Left([connector, file].into_iter()),
+            LiteRedirectionTarget::Pipe { connector } => Either::Right(std::iter::once(connector)),
+        }
+    }
 }
 
 #[derive(Debug, Clone)]
@@ -38,6 +48,17 @@ pub enum LiteRedirection {
     },
 }
 
+impl LiteRedirection {
+    pub fn spans(&self) -> impl Iterator<Item = Span> {
+        match self {
+            LiteRedirection::Single { target, .. } => Either::Left(target.spans()),
+            LiteRedirection::Separate { out, err } => {
+                Either::Right(out.spans().chain(err.spans()).sorted())
+            }
+        }
+    }
+}
+
 #[derive(Debug, Clone, Default)]
 pub struct LiteCommand {
     pub pipe: Option<Span>,
@@ -113,6 +134,14 @@ impl LiteCommand {
 
         Ok(())
     }
+
+    pub fn parts_including_redirection(&self) -> impl Iterator<Item = Span> + '_ {
+        self.parts.iter().copied().chain(
+            self.redirection
+                .iter()
+                .flat_map(|redirection| redirection.spans()),
+        )
+    }
 }
 
 #[derive(Debug, Clone, Default)]
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index fc2131aad7..bc48b9bd0c 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -5299,6 +5299,7 @@ pub fn parse_expression(working_set: &mut StateWorkingSet, spans: &[Span]) -> Ex
             let mut block = Block::default();
             let ty = output.ty.clone();
             block.pipelines = vec![Pipeline::from_vec(vec![output])];
+            block.span = Some(Span::concat(spans));
 
             compile_block(working_set, &mut block);
 
@@ -5393,9 +5394,19 @@ pub fn parse_builtin_commands(
     match name {
         b"def" => parse_def(working_set, lite_command, None).0,
         b"extern" => parse_extern(working_set, lite_command, None),
-        b"let" => parse_let(working_set, &lite_command.parts),
+        b"let" => parse_let(
+            working_set,
+            &lite_command
+                .parts_including_redirection()
+                .collect::<Vec<Span>>(),
+        ),
         b"const" => parse_const(working_set, &lite_command.parts),
-        b"mut" => parse_mut(working_set, &lite_command.parts),
+        b"mut" => parse_mut(
+            working_set,
+            &lite_command
+                .parts_including_redirection()
+                .collect::<Vec<Span>>(),
+        ),
         b"for" => {
             let expr = parse_for(working_set, lite_command);
             Pipeline::from_vec(vec![expr])
@@ -5647,169 +5658,73 @@ pub(crate) fn redirecting_builtin_error(
     }
 }
 
-pub fn parse_pipeline(
-    working_set: &mut StateWorkingSet,
-    pipeline: &LitePipeline,
-    is_subexpression: bool,
-    pipeline_index: usize,
-) -> Pipeline {
+pub fn parse_pipeline(working_set: &mut StateWorkingSet, pipeline: &LitePipeline) -> Pipeline {
+    let first_command = pipeline.commands.first();
+    let first_command_name = first_command
+        .and_then(|command| command.parts.first())
+        .map(|span| working_set.get_span_contents(*span));
+
     if pipeline.commands.len() > 1 {
-        // Special case: allow `let` and `mut` to consume the whole pipeline, eg) `let abc = "foo" | str length`
-        if let Some(&first) = pipeline.commands[0].parts.first() {
-            let first = working_set.get_span_contents(first);
-            if first == b"let" || first == b"mut" {
-                let name = if first == b"let" { "let" } else { "mut" };
-                let mut new_command = LiteCommand {
-                    comments: vec![],
-                    parts: pipeline.commands[0].parts.clone(),
-                    pipe: None,
-                    redirection: None,
-                };
+        // Special case: allow "let" or "mut" to consume the whole pipeline, if this is a pipeline
+        // with multiple commands
+        if matches!(first_command_name, Some(b"let" | b"mut")) {
+            // Merge the pipeline into one command
+            let first_command = first_command.expect("must be Some");
 
-                if let Some(redirection) = pipeline.commands[0].redirection.as_ref() {
-                    working_set.error(redirecting_builtin_error(name, redirection));
-                }
+            let remainder_span = first_command
+                .parts_including_redirection()
+                .skip(3)
+                .chain(
+                    pipeline.commands[1..]
+                        .iter()
+                        .flat_map(|command| command.parts_including_redirection()),
+                )
+                .reduce(Span::append);
 
-                for element in &pipeline.commands[1..] {
-                    if let Some(redirection) = pipeline.commands[0].redirection.as_ref() {
-                        working_set.error(redirecting_builtin_error(name, redirection));
-                    } else {
-                        new_command.parts.push(element.pipe.expect("pipe span"));
-                        new_command.comments.extend_from_slice(&element.comments);
-                        new_command.parts.extend_from_slice(&element.parts);
-                    }
-                }
+            let parts = first_command
+                .parts
+                .iter()
+                .take(3) // the let/mut start itself
+                .copied()
+                .chain(remainder_span) // everything else
+                .collect();
 
-                // if the 'let' is complete enough, use it, if not, fall through for now
-                if new_command.parts.len() > 3 {
-                    let rhs_span = Span::concat(&new_command.parts[3..]);
+            let comments = pipeline
+                .commands
+                .iter()
+                .flat_map(|command| command.comments.iter())
+                .copied()
+                .collect();
 
-                    new_command.parts.truncate(3);
-                    new_command.parts.push(rhs_span);
-
-                    let mut pipeline = parse_builtin_commands(working_set, &new_command);
-
-                    if pipeline_index == 0 {
-                        let let_decl_id = working_set.find_decl(b"let");
-                        let mut_decl_id = working_set.find_decl(b"mut");
-                        for element in pipeline.elements.iter_mut() {
-                            if let Expr::Call(call) = &element.expr.expr {
-                                if Some(call.decl_id) == let_decl_id
-                                    || Some(call.decl_id) == mut_decl_id
-                                {
-                                    // Do an expansion
-                                    if let Some(Expression {
-                                        expr: Expr::Block(block_id),
-                                        ..
-                                    }) = call.positional_iter().nth(1)
-                                    {
-                                        let block = working_set.get_block(*block_id);
-
-                                        if let Some(element) = block
-                                            .pipelines
-                                            .first()
-                                            .and_then(|p| p.elements.first())
-                                            .cloned()
-                                        {
-                                            if element.has_in_variable(working_set) {
-                                                let element = wrap_element_with_collect(
-                                                    working_set,
-                                                    &element,
-                                                );
-                                                let block = working_set.get_block_mut(*block_id);
-                                                block.pipelines[0].elements[0] = element;
-                                            }
-                                        }
-                                    }
-                                    continue;
-                                } else if element.has_in_variable(working_set) && !is_subexpression
-                                {
-                                    *element = wrap_element_with_collect(working_set, element);
-                                }
-                            } else if element.has_in_variable(working_set) && !is_subexpression {
-                                *element = wrap_element_with_collect(working_set, element);
-                            }
-                        }
-                    }
-
-                    return pipeline;
-                }
-            }
-        }
-
-        let mut elements = pipeline
-            .commands
-            .iter()
-            .map(|element| parse_pipeline_element(working_set, element))
-            .collect::<Vec<_>>();
-
-        if is_subexpression {
-            for element in elements.iter_mut().skip(1) {
-                if element.has_in_variable(working_set) {
-                    *element = wrap_element_with_collect(working_set, element);
-                }
-            }
+            let new_command = LiteCommand {
+                pipe: None,
+                comments,
+                parts,
+                redirection: None,
+            };
+            parse_builtin_commands(working_set, &new_command)
         } else {
-            for element in elements.iter_mut() {
-                if element.has_in_variable(working_set) {
-                    *element = wrap_element_with_collect(working_set, element);
-                }
-            }
-        }
-
-        Pipeline { elements }
-    } else {
-        if let Some(&first) = pipeline.commands[0].parts.first() {
-            let first = working_set.get_span_contents(first);
-            if first == b"let" || first == b"mut" {
-                if let Some(redirection) = pipeline.commands[0].redirection.as_ref() {
-                    let name = if first == b"let" { "let" } else { "mut" };
-                    working_set.error(redirecting_builtin_error(name, redirection));
-                }
-            }
-        }
-
-        let mut pipeline = parse_builtin_commands(working_set, &pipeline.commands[0]);
-
-        let let_decl_id = working_set.find_decl(b"let");
-        let mut_decl_id = working_set.find_decl(b"mut");
-
-        if pipeline_index == 0 {
-            for element in pipeline.elements.iter_mut() {
-                if let Expr::Call(call) = &element.expr.expr {
-                    if Some(call.decl_id) == let_decl_id || Some(call.decl_id) == mut_decl_id {
-                        // Do an expansion
-                        if let Some(Expression {
-                            expr: Expr::Block(block_id),
-                            ..
-                        }) = call.positional_iter().nth(1)
-                        {
-                            let block = working_set.get_block(*block_id);
-
-                            if let Some(element) = block
-                                .pipelines
-                                .first()
-                                .and_then(|p| p.elements.first())
-                                .cloned()
-                            {
-                                if element.has_in_variable(working_set) {
-                                    let element = wrap_element_with_collect(working_set, &element);
-                                    let block = working_set.get_block_mut(*block_id);
-                                    block.pipelines[0].elements[0] = element;
-                                }
-                            }
-                        }
-                        continue;
-                    } else if element.has_in_variable(working_set) && !is_subexpression {
-                        *element = wrap_element_with_collect(working_set, element);
+            // Parse a normal multi command pipeline
+            let elements: Vec<_> = pipeline
+                .commands
+                .iter()
+                .enumerate()
+                .map(|(index, element)| {
+                    let element = parse_pipeline_element(working_set, element);
+                    // Handle $in for pipeline elements beyond the first one
+                    if index > 0 && element.has_in_variable(working_set) {
+                        wrap_element_with_collect(working_set, element.clone())
+                    } else {
+                        element
                     }
-                } else if element.has_in_variable(working_set) && !is_subexpression {
-                    *element = wrap_element_with_collect(working_set, element);
-                }
-            }
-        }
+                })
+                .collect();
 
-        pipeline
+            Pipeline { elements }
+        }
+    } else {
+        // If there's only one command in the pipeline, this could be a builtin command
+        parse_builtin_commands(working_set, &pipeline.commands[0])
     }
 }
 
@@ -5840,18 +5755,45 @@ pub fn parse_block(
     }
 
     let mut block = Block::new_with_capacity(lite_block.block.len());
+    block.span = Some(span);
 
-    for (idx, lite_pipeline) in lite_block.block.iter().enumerate() {
-        let pipeline = parse_pipeline(working_set, lite_pipeline, is_subexpression, idx);
+    for lite_pipeline in &lite_block.block {
+        let pipeline = parse_pipeline(working_set, lite_pipeline);
         block.pipelines.push(pipeline);
     }
 
+    // If this is not a subexpression and there are any pipelines where the first element has $in,
+    // we can wrap the whole block in collect so that they all reference the same $in
+    if !is_subexpression
+        && block
+            .pipelines
+            .iter()
+            .flat_map(|pipeline| pipeline.elements.first())
+            .any(|element| element.has_in_variable(working_set))
+    {
+        // Move the block out to prepare it to become a subexpression
+        let inner_block = std::mem::take(&mut block);
+        block.span = inner_block.span;
+        let ty = inner_block.output_type();
+        let block_id = working_set.add_block(Arc::new(inner_block));
+
+        // Now wrap it in a Collect expression, and put it in the block as the only pipeline
+        let subexpression = Expression::new(working_set, Expr::Subexpression(block_id), span, ty);
+        let collect = wrap_expr_with_collect(working_set, subexpression);
+
+        block.pipelines.push(Pipeline {
+            elements: vec![PipelineElement {
+                pipe: None,
+                expr: collect,
+                redirection: None,
+            }],
+        });
+    }
+
     if scoped {
         working_set.exit_scope();
     }
 
-    block.span = Some(span);
-
     let errors = type_check::check_block_input_output(working_set, &block);
     if !errors.is_empty() {
         working_set.parse_errors.extend_from_slice(&errors);
@@ -6220,6 +6162,10 @@ pub fn discover_captures_in_expr(
                 discover_captures_in_expr(working_set, &match_.1, seen, seen_blocks, output)?;
             }
         }
+        Expr::Collect(var_id, expr) => {
+            seen.push(*var_id);
+            discover_captures_in_expr(working_set, expr, seen, seen_blocks, output)?
+        }
         Expr::RowCondition(block_id) | Expr::Subexpression(block_id) => {
             let block = working_set.get_block(*block_id);
 
@@ -6270,28 +6216,28 @@ pub fn discover_captures_in_expr(
 
 fn wrap_redirection_with_collect(
     working_set: &mut StateWorkingSet,
-    target: &RedirectionTarget,
+    target: RedirectionTarget,
 ) -> RedirectionTarget {
     match target {
         RedirectionTarget::File { expr, append, span } => RedirectionTarget::File {
             expr: wrap_expr_with_collect(working_set, expr),
-            span: *span,
-            append: *append,
+            span,
+            append,
         },
-        RedirectionTarget::Pipe { span } => RedirectionTarget::Pipe { span: *span },
+        RedirectionTarget::Pipe { span } => RedirectionTarget::Pipe { span },
     }
 }
 
 fn wrap_element_with_collect(
     working_set: &mut StateWorkingSet,
-    element: &PipelineElement,
+    element: PipelineElement,
 ) -> PipelineElement {
     PipelineElement {
         pipe: element.pipe,
-        expr: wrap_expr_with_collect(working_set, &element.expr),
-        redirection: element.redirection.as_ref().map(|r| match r {
+        expr: wrap_expr_with_collect(working_set, element.expr),
+        redirection: element.redirection.map(|r| match r {
             PipelineRedirection::Single { source, target } => PipelineRedirection::Single {
-                source: *source,
+                source,
                 target: wrap_redirection_with_collect(working_set, target),
             },
             PipelineRedirection::Separate { out, err } => PipelineRedirection::Separate {
@@ -6302,65 +6248,24 @@ fn wrap_element_with_collect(
     }
 }
 
-fn wrap_expr_with_collect(working_set: &mut StateWorkingSet, expr: &Expression) -> Expression {
+fn wrap_expr_with_collect(working_set: &mut StateWorkingSet, expr: Expression) -> Expression {
     let span = expr.span;
 
-    if let Some(decl_id) = working_set.find_decl(b"collect") {
-        let mut output = vec![];
+    // IN_VARIABLE_ID should get replaced with a unique variable, so that we don't have to
+    // execute as a closure
+    let var_id = working_set.add_variable(b"$in".into(), expr.span, Type::Any, false);
+    let mut expr = expr.clone();
+    expr.replace_in_variable(working_set, var_id);
 
-        let var_id = IN_VARIABLE_ID;
-        let mut signature = Signature::new("");
-        signature.required_positional.push(PositionalArg {
-            var_id: Some(var_id),
-            name: "$in".into(),
-            desc: String::new(),
-            shape: SyntaxShape::Any,
-            default_value: None,
-        });
-
-        let mut block = Block {
-            pipelines: vec![Pipeline::from_vec(vec![expr.clone()])],
-            signature: Box::new(signature),
-            ..Default::default()
-        };
-
-        compile_block(working_set, &mut block);
-
-        let block_id = working_set.add_block(Arc::new(block));
-
-        output.push(Argument::Positional(Expression::new(
-            working_set,
-            Expr::Closure(block_id),
-            span,
-            Type::Any,
-        )));
-
-        output.push(Argument::Named((
-            Spanned {
-                item: "keep-env".to_string(),
-                span: Span::new(0, 0),
-            },
-            None,
-            None,
-        )));
-
-        // The containing, synthetic call to `collect`.
-        // We don't want to have a real span as it will confuse flattening
-        // The args are where we'll get the real info
-        Expression::new(
-            working_set,
-            Expr::Call(Box::new(Call {
-                head: Span::new(0, 0),
-                arguments: output,
-                decl_id,
-                parser_info: HashMap::new(),
-            })),
-            span,
-            Type::Any,
-        )
-    } else {
-        Expression::garbage(working_set, span)
-    }
+    // Bind the custom `$in` variable for that particular expression
+    let ty = expr.ty.clone();
+    Expression::new(
+        working_set,
+        Expr::Collect(var_id, Box::new(expr)),
+        span,
+        // We can expect it to have the same result type
+        ty,
+    )
 }
 
 // Parses a vector of u8 to create an AST Block. If a file name is given, then
diff --git a/crates/nu-parser/tests/test_parser.rs b/crates/nu-parser/tests/test_parser.rs
index 7762863ba1..4d6778d201 100644
--- a/crates/nu-parser/tests/test_parser.rs
+++ b/crates/nu-parser/tests/test_parser.rs
@@ -41,6 +41,41 @@ impl Command for Let {
     }
 }
 
+#[cfg(test)]
+#[derive(Clone)]
+pub struct Mut;
+
+#[cfg(test)]
+impl Command for Mut {
+    fn name(&self) -> &str {
+        "mut"
+    }
+
+    fn usage(&self) -> &str {
+        "Mock mut command."
+    }
+
+    fn signature(&self) -> nu_protocol::Signature {
+        Signature::build("mut")
+            .required("var_name", SyntaxShape::VarWithOptType, "variable name")
+            .required(
+                "initial_value",
+                SyntaxShape::Keyword(b"=".to_vec(), Box::new(SyntaxShape::MathExpression)),
+                "equals sign followed by value",
+            )
+    }
+
+    fn run(
+        &self,
+        _engine_state: &EngineState,
+        _stack: &mut Stack,
+        _call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        todo!()
+    }
+}
+
 fn test_int(
     test_tag: &str,     // name of sub-test
     test: &[u8],        // input expression
@@ -1149,11 +1184,29 @@ fn test_nothing_comparison_eq() {
 fn test_redirection_with_letmut(#[case] phase: &[u8]) {
     let engine_state = EngineState::new();
     let mut working_set = StateWorkingSet::new(&engine_state);
-    let _block = parse(&mut working_set, None, phase, true);
-    assert!(matches!(
-        working_set.parse_errors.first(),
-        Some(ParseError::RedirectingBuiltinCommand(_, _, _))
-    ));
+    working_set.add_decl(Box::new(Let));
+    working_set.add_decl(Box::new(Mut));
+
+    let block = parse(&mut working_set, None, phase, true);
+    assert!(
+        working_set.parse_errors.is_empty(),
+        "parse errors: {:?}",
+        working_set.parse_errors
+    );
+    assert_eq!(1, block.pipelines[0].elements.len());
+
+    let element = &block.pipelines[0].elements[0];
+    assert!(element.redirection.is_none()); // it should be in the let block, not here
+
+    if let Expr::Call(call) = &element.expr.expr {
+        let arg = call.positional_nth(1).expect("no positional args");
+        let block_id = arg.as_block().expect("arg 1 is not a block");
+        let block = working_set.get_block(block_id);
+        let inner_element = &block.pipelines[0].elements[0];
+        assert!(inner_element.redirection.is_some());
+    } else {
+        panic!("expected Call: {:?}", block.pipelines[0].elements[0])
+    }
 }
 
 #[rstest]
diff --git a/crates/nu-protocol/src/ast/block.rs b/crates/nu-protocol/src/ast/block.rs
index 8f62ff99ba..a6e640cc15 100644
--- a/crates/nu-protocol/src/ast/block.rs
+++ b/crates/nu-protocol/src/ast/block.rs
@@ -78,6 +78,19 @@ impl Block {
             Type::Nothing
         }
     }
+
+    /// Replace any `$in` variables in the initial element of pipelines within the block
+    pub fn replace_in_variable(
+        &mut self,
+        working_set: &mut StateWorkingSet<'_>,
+        new_var_id: VarId,
+    ) {
+        for pipeline in self.pipelines.iter_mut() {
+            if let Some(element) = pipeline.elements.first_mut() {
+                element.replace_in_variable(working_set, new_var_id);
+            }
+        }
+    }
 }
 
 impl<T> From<T> for Block
diff --git a/crates/nu-protocol/src/ast/expr.rs b/crates/nu-protocol/src/ast/expr.rs
index fadbffc51f..d6386f92dc 100644
--- a/crates/nu-protocol/src/ast/expr.rs
+++ b/crates/nu-protocol/src/ast/expr.rs
@@ -25,6 +25,7 @@ pub enum Expr {
     RowCondition(BlockId),
     UnaryNot(Box<Expression>),
     BinaryOp(Box<Expression>, Box<Expression>, Box<Expression>), //lhs, op, rhs
+    Collect(VarId, Box<Expression>),
     Subexpression(BlockId),
     Block(BlockId),
     Closure(BlockId),
@@ -65,11 +66,13 @@ impl Expr {
         &self,
         working_set: &StateWorkingSet,
     ) -> (Option<OutDest>, Option<OutDest>) {
-        // Usages of `$in` will be wrapped by a `collect` call by the parser,
-        // so we do not have to worry about that when considering
-        // which of the expressions below may consume pipeline output.
         match self {
             Expr::Call(call) => working_set.get_decl(call.decl_id).pipe_redirection(),
+            Expr::Collect(_, _) => {
+                // A collect expression always has default redirection, it's just going to collect
+                // stdout unless another type of redirection is specified
+                (None, None)
+            },
             Expr::Subexpression(block_id) | Expr::Block(block_id) => working_set
                 .get_block(*block_id)
                 .pipe_redirection(working_set),
diff --git a/crates/nu-protocol/src/ast/expression.rs b/crates/nu-protocol/src/ast/expression.rs
index dfd4187a90..4818aa2db2 100644
--- a/crates/nu-protocol/src/ast/expression.rs
+++ b/crates/nu-protocol/src/ast/expression.rs
@@ -6,6 +6,8 @@ use crate::{
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 
+use super::ListItem;
+
 /// Wrapper around [`Expr`]
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Expression {
@@ -106,37 +108,14 @@ impl Expression {
                 left.has_in_variable(working_set) || right.has_in_variable(working_set)
             }
             Expr::UnaryNot(expr) => expr.has_in_variable(working_set),
-            Expr::Block(block_id) => {
+            Expr::Block(block_id) | Expr::Closure(block_id) => {
                 let block = working_set.get_block(*block_id);
-
-                if block.captures.contains(&IN_VARIABLE_ID) {
-                    return true;
-                }
-
-                if let Some(pipeline) = block.pipelines.first() {
-                    match pipeline.elements.first() {
-                        Some(element) => element.has_in_variable(working_set),
-                        None => false,
-                    }
-                } else {
-                    false
-                }
-            }
-            Expr::Closure(block_id) => {
-                let block = working_set.get_block(*block_id);
-
-                if block.captures.contains(&IN_VARIABLE_ID) {
-                    return true;
-                }
-
-                if let Some(pipeline) = block.pipelines.first() {
-                    match pipeline.elements.first() {
-                        Some(element) => element.has_in_variable(working_set),
-                        None => false,
-                    }
-                } else {
-                    false
-                }
+                block.captures.contains(&IN_VARIABLE_ID)
+                    || block
+                        .pipelines
+                        .iter()
+                        .flat_map(|pipeline| pipeline.elements.first())
+                        .any(|element| element.has_in_variable(working_set))
             }
             Expr::Binary(_) => false,
             Expr::Bool(_) => false,
@@ -251,6 +230,9 @@ impl Expression {
             Expr::Signature(_) => false,
             Expr::String(_) => false,
             Expr::RawString(_) => false,
+            // A `$in` variable found within a `Collect` is local, as it's already been wrapped
+            // This is probably unlikely to happen anyway - the expressions are wrapped depth-first
+            Expr::Collect(_, _) => false,
             Expr::RowCondition(block_id) | Expr::Subexpression(block_id) => {
                 let block = working_set.get_block(*block_id);
 
@@ -414,6 +396,7 @@ impl Expression {
                     i.replace_span(working_set, replaced, new_span)
                 }
             }
+            Expr::Collect(_, expr) => expr.replace_span(working_set, replaced, new_span),
             Expr::RowCondition(block_id) | Expr::Subexpression(block_id) => {
                 let mut block = (**working_set.get_block(*block_id)).clone();
 
@@ -443,6 +426,129 @@ impl Expression {
         }
     }
 
+    pub fn replace_in_variable(&mut self, working_set: &mut StateWorkingSet, new_var_id: VarId) {
+        match &mut self.expr {
+            Expr::Bool(_) => {}
+            Expr::Int(_) => {}
+            Expr::Float(_) => {}
+            Expr::Binary(_) => {}
+            Expr::Range(_) => {}
+            Expr::Var(var_id) | Expr::VarDecl(var_id) => {
+                if *var_id == IN_VARIABLE_ID {
+                    *var_id = new_var_id;
+                }
+            }
+            Expr::Call(call) => {
+                for arg in call.arguments.iter_mut() {
+                    match arg {
+                        Argument::Positional(expr)
+                        | Argument::Unknown(expr)
+                        | Argument::Named((_, _, Some(expr)))
+                        | Argument::Spread(expr) => {
+                            expr.replace_in_variable(working_set, new_var_id)
+                        }
+                        Argument::Named((_, _, None)) => {}
+                    }
+                }
+                for expr in call.parser_info.values_mut() {
+                    expr.replace_in_variable(working_set, new_var_id)
+                }
+            }
+            Expr::ExternalCall(head, args) => {
+                head.replace_in_variable(working_set, new_var_id);
+                for arg in args.iter_mut() {
+                    match arg {
+                        ExternalArgument::Regular(expr) | ExternalArgument::Spread(expr) => {
+                            expr.replace_in_variable(working_set, new_var_id)
+                        }
+                    }
+                }
+            }
+            Expr::Operator(_) => {}
+            // `$in` in `Collect` has already been handled, so we don't need to check further
+            Expr::Collect(_, _) => {}
+            Expr::Block(block_id)
+            | Expr::Closure(block_id)
+            | Expr::RowCondition(block_id)
+            | Expr::Subexpression(block_id) => {
+                let mut block = Block::clone(working_set.get_block(*block_id));
+                block.replace_in_variable(working_set, new_var_id);
+                *working_set.get_block_mut(*block_id) = block;
+            }
+            Expr::UnaryNot(expr) => {
+                expr.replace_in_variable(working_set, new_var_id);
+            }
+            Expr::BinaryOp(lhs, op, rhs) => {
+                for expr in [lhs, op, rhs] {
+                    expr.replace_in_variable(working_set, new_var_id);
+                }
+            }
+            Expr::MatchBlock(match_patterns) => {
+                for (_, expr) in match_patterns.iter_mut() {
+                    expr.replace_in_variable(working_set, new_var_id);
+                }
+            }
+            Expr::List(items) => {
+                for item in items.iter_mut() {
+                    match item {
+                        ListItem::Item(expr) | ListItem::Spread(_, expr) => {
+                            expr.replace_in_variable(working_set, new_var_id)
+                        }
+                    }
+                }
+            }
+            Expr::Table(table) => {
+                for col_expr in table.columns.iter_mut() {
+                    col_expr.replace_in_variable(working_set, new_var_id);
+                }
+                for row in table.rows.iter_mut() {
+                    for row_expr in row.iter_mut() {
+                        row_expr.replace_in_variable(working_set, new_var_id);
+                    }
+                }
+            }
+            Expr::Record(items) => {
+                for item in items.iter_mut() {
+                    match item {
+                        RecordItem::Pair(key, val) => {
+                            key.replace_in_variable(working_set, new_var_id);
+                            val.replace_in_variable(working_set, new_var_id);
+                        }
+                        RecordItem::Spread(_, expr) => {
+                            expr.replace_in_variable(working_set, new_var_id)
+                        }
+                    }
+                }
+            }
+            Expr::Keyword(kw) => kw.expr.replace_in_variable(working_set, new_var_id),
+            Expr::ValueWithUnit(value_with_unit) => value_with_unit
+                .expr
+                .replace_in_variable(working_set, new_var_id),
+            Expr::DateTime(_) => {}
+            Expr::Filepath(_, _) => {}
+            Expr::Directory(_, _) => {}
+            Expr::GlobPattern(_, _) => {}
+            Expr::String(_) => {}
+            Expr::RawString(_) => {}
+            Expr::CellPath(_) => {}
+            Expr::FullCellPath(full_cell_path) => {
+                full_cell_path
+                    .head
+                    .replace_in_variable(working_set, new_var_id);
+            }
+            Expr::ImportPattern(_) => {}
+            Expr::Overlay(_) => {}
+            Expr::Signature(_) => {}
+            Expr::StringInterpolation(exprs) | Expr::GlobInterpolation(exprs, _) => {
+                for expr in exprs.iter_mut() {
+                    expr.replace_in_variable(working_set, new_var_id);
+                }
+            }
+            Expr::Nothing => {}
+            Expr::Garbage => {}
+        }
+    }
+
     pub fn new(working_set: &mut StateWorkingSet, expr: Expr, span: Span, ty: Type) -> Expression {
         let span_id = working_set.add_span(span);
         Expression {
diff --git a/crates/nu-protocol/src/ast/pipeline.rs b/crates/nu-protocol/src/ast/pipeline.rs
index 3f2a216485..0ed02c700b 100644
--- a/crates/nu-protocol/src/ast/pipeline.rs
+++ b/crates/nu-protocol/src/ast/pipeline.rs
@@ -1,4 +1,4 @@
-use crate::{ast::Expression, engine::StateWorkingSet, OutDest, Span};
+use crate::{ast::Expression, engine::StateWorkingSet, OutDest, Span, VarId};
 use serde::{Deserialize, Serialize};
 use std::fmt::Display;
 
@@ -62,6 +62,19 @@ impl RedirectionTarget {
             RedirectionTarget::Pipe { .. } => {}
         }
     }
+
+    pub fn replace_in_variable(
+        &mut self,
+        working_set: &mut StateWorkingSet<'_>,
+        new_var_id: VarId,
+    ) {
+        match self {
+            RedirectionTarget::File { expr, .. } => {
+                expr.replace_in_variable(working_set, new_var_id)
+            }
+            RedirectionTarget::Pipe { .. } => {}
+        }
+    }
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
@@ -75,6 +88,23 @@ pub enum PipelineRedirection {
         err: RedirectionTarget,
     },
 }
+impl PipelineRedirection {
+    pub fn replace_in_variable(
+        &mut self,
+        working_set: &mut StateWorkingSet<'_>,
+        new_var_id: VarId,
+    ) {
+        match self {
+            PipelineRedirection::Single { source: _, target } => {
+                target.replace_in_variable(working_set, new_var_id)
+            }
+            PipelineRedirection::Separate { out, err } => {
+                out.replace_in_variable(working_set, new_var_id);
+                err.replace_in_variable(working_set, new_var_id);
+            }
+        }
+    }
+}
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct PipelineElement {
@@ -120,6 +150,17 @@ impl PipelineElement {
     ) -> (Option<OutDest>, Option<OutDest>) {
         self.expr.expr.pipe_redirection(working_set)
     }
+
+    pub fn replace_in_variable(
+        &mut self,
+        working_set: &mut StateWorkingSet<'_>,
+        new_var_id: VarId,
+    ) {
+        self.expr.replace_in_variable(working_set, new_var_id);
+        if let Some(redirection) = &mut self.redirection {
+            redirection.replace_in_variable(working_set, new_var_id);
+        }
+    }
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
diff --git a/crates/nu-protocol/src/debugger/profiler.rs b/crates/nu-protocol/src/debugger/profiler.rs
index c61ee04d12..ea81a1b814 100644
--- a/crates/nu-protocol/src/debugger/profiler.rs
+++ b/crates/nu-protocol/src/debugger/profiler.rs
@@ -343,6 +343,7 @@ fn expr_to_string(engine_state: &EngineState, expr: &Expr) -> String {
         Expr::String(_) | Expr::RawString(_) => "string".to_string(),
         Expr::StringInterpolation(_) => "string interpolation".to_string(),
         Expr::GlobInterpolation(_, _) => "glob interpolation".to_string(),
+        Expr::Collect(_, _) => "collect".to_string(),
         Expr::Subexpression(_) => "subexpression".to_string(),
         Expr::Table(_) => "table".to_string(),
         Expr::UnaryNot(_) => "unary not".to_string(),
diff --git a/crates/nu-protocol/src/eval_base.rs b/crates/nu-protocol/src/eval_base.rs
index f49d235482..933342f577 100644
--- a/crates/nu-protocol/src/eval_base.rs
+++ b/crates/nu-protocol/src/eval_base.rs
@@ -159,6 +159,9 @@ pub trait Eval {
             Expr::ExternalCall(head, args) => {
                 Self::eval_external_call(state, mut_state, head, args, expr_span)
             }
+            Expr::Collect(var_id, expr) => {
+                Self::eval_collect::<D>(state, mut_state, *var_id, expr)
+            }
             Expr::Subexpression(block_id) => {
                 Self::eval_subexpression::<D>(state, mut_state, *block_id, expr_span)
             }
@@ -356,6 +359,13 @@ pub trait Eval {
         span: Span,
     ) -> Result<Value, ShellError>;
 
+    fn eval_collect<D: DebugContext>(
+        state: Self::State<'_>,
+        mut_state: &mut Self::MutState,
+        var_id: VarId,
+        expr: &Expression,
+    ) -> Result<Value, ShellError>;
+
     fn eval_subexpression<D: DebugContext>(
         state: Self::State<'_>,
         mut_state: &mut Self::MutState,
diff --git a/crates/nu-protocol/src/eval_const.rs b/crates/nu-protocol/src/eval_const.rs
index cba2392338..cd4780773f 100644
--- a/crates/nu-protocol/src/eval_const.rs
+++ b/crates/nu-protocol/src/eval_const.rs
@@ -422,6 +422,15 @@ impl Eval for EvalConst {
         Err(ShellError::NotAConstant { span })
     }
 
+    fn eval_collect<D: DebugContext>(
+        _: &StateWorkingSet,
+        _: &mut (),
+        _var_id: VarId,
+        expr: &Expression,
+    ) -> Result<Value, ShellError> {
+        Err(ShellError::NotAConstant { span: expr.span })
+    }
+
     fn eval_subexpression<D: DebugContext>(
         working_set: &StateWorkingSet,
         _: &mut (),
diff --git a/crates/nu-protocol/src/ir/display.rs b/crates/nu-protocol/src/ir/display.rs
index c28323cca4..0026e15eab 100644
--- a/crates/nu-protocol/src/ir/display.rs
+++ b/crates/nu-protocol/src/ir/display.rs
@@ -102,6 +102,10 @@ impl<'a> fmt::Display for FmtInstruction<'a> {
                 let var = FmtVar::new(self.engine_state, *var_id);
                 write!(f, "{:WIDTH$} {var}, {src}", "store-variable")
             }
+            Instruction::DropVariable { var_id } => {
+                let var = FmtVar::new(self.engine_state, *var_id);
+                write!(f, "{:WIDTH$} {var}", "drop-variable")
+            }
             Instruction::LoadEnv { dst, key } => {
                 let key = FmtData(self.data, *key);
                 write!(f, "{:WIDTH$} {dst}, {key}", "load-env")
diff --git a/crates/nu-protocol/src/ir/mod.rs b/crates/nu-protocol/src/ir/mod.rs
index aff5f42c8c..bdded28c0e 100644
--- a/crates/nu-protocol/src/ir/mod.rs
+++ b/crates/nu-protocol/src/ir/mod.rs
@@ -127,6 +127,8 @@ pub enum Instruction {
     LoadVariable { dst: RegId, var_id: VarId },
     /// Store the value of a variable from the `src` register
     StoreVariable { var_id: VarId, src: RegId },
+    /// Remove a variable from the stack, freeing up whatever resources were associated with it
+    DropVariable { var_id: VarId },
     /// Load the value of an environment variable into the `dst` register
     LoadEnv { dst: RegId, key: DataSlice },
     /// Load the value of an environment variable into the `dst` register, or `Nothing` if it
@@ -290,6 +292,7 @@ impl Instruction {
             Instruction::Drain { .. } => None,
             Instruction::LoadVariable { dst, .. } => Some(dst),
             Instruction::StoreVariable { .. } => None,
+            Instruction::DropVariable { .. } => None,
             Instruction::LoadEnv { dst, .. } => Some(dst),
             Instruction::LoadEnvOpt { dst, .. } => Some(dst),
             Instruction::StoreEnv { .. } => None,
diff --git a/crates/nuon/src/from.rs b/crates/nuon/src/from.rs
index 2cfeaebc61..2138e50ac5 100644
--- a/crates/nuon/src/from.rs
+++ b/crates/nuon/src/from.rs
@@ -329,6 +329,12 @@ fn convert_to_value(
             msg: "glob interpolation not supported in nuon".into(),
             span: expr.span,
         }),
+        Expr::Collect(..) => Err(ShellError::OutsideSpannedLabeledError {
+            src: original_text.to_string(),
+            error: "Error when loading".into(),
+            msg: "`$in` not supported in nuon".into(),
+            span: expr.span,
+        }),
         Expr::Subexpression(..) => Err(ShellError::OutsideSpannedLabeledError {
             src: original_text.to_string(),
             error: "Error when loading".into(),
diff --git a/tests/repl/test_engine.rs b/tests/repl/test_engine.rs
index e452295f42..1b74e741f7 100644
--- a/tests/repl/test_engine.rs
+++ b/tests/repl/test_engine.rs
@@ -52,6 +52,29 @@ fn in_and_if_else() -> TestResult {
     )
 }
 
+#[test]
+fn in_with_closure() -> TestResult {
+    // Can use $in twice
+    run_test(r#"3 | do { let x = $in; let y = $in; $x + $y }"#, "6")
+}
+
+#[test]
+fn in_with_custom_command() -> TestResult {
+    // Can use $in twice
+    run_test(
+        r#"def foo [] { let x = $in; let y = $in; $x + $y }; 3 | foo"#,
+        "6",
+    )
+}
+
+#[test]
+fn in_used_twice_and_also_in_pipeline() -> TestResult {
+    run_test(
+        r#"3 | do { let x = $in; let y = $in; $x + $y | $in * 4 }"#,
+        "24",
+    )
+}
+
 #[test]
 fn help_works_with_missing_requirements() -> TestResult {
     run_test(r#"each --help | lines | length"#, "72")
diff --git a/tests/repl/test_type_check.rs b/tests/repl/test_type_check.rs
index 87216e6672..8a00f2f486 100644
--- a/tests/repl/test_type_check.rs
+++ b/tests/repl/test_type_check.rs
@@ -129,3 +129,16 @@ fn transpose_into_load_env() -> TestResult {
         "10",
     )
 }
+
+#[test]
+fn in_variable_expression_correct_output_type() -> TestResult {
+    run_test(r#"def foo []: nothing -> string { 'foo' | $"($in)" }"#, "")
+}
+
+#[test]
+fn in_variable_expression_wrong_output_type() -> TestResult {
+    fail_test(
+        r#"def foo []: nothing -> int { 'foo' | $"($in)" }"#,
+        "expected int",
+    )
+}

From 22379c9846713c3905bc3e4ef5f9187113f5a689 Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Wed, 17 Jul 2024 19:52:47 -0400
Subject: [PATCH 0242/1072] Make default config more consistent (#13399)

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

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

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

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

Fixes some minor config inconsistencies:
- Add default value for `shape_glob_interpolation` to light theme, as it
is missing
- Add right padding space to `shape_garbage` options
- Use a integer value for `footer_mode` instead of a string
- Set `buffer_editor` to null instead of empty string

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

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

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

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

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->
N/A
# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
N/A
---
 crates/nu-utils/src/sample_config/default_config.nu | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index 5856e385c4..3c3e57fa95 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -47,7 +47,7 @@ let dark_theme = {
     shape_flag: blue_bold
     shape_float: purple_bold
     # shapes are used to change the cli syntax highlighting
-    shape_garbage: { fg: white bg: red attr: b}
+    shape_garbage: { fg: white bg: red attr: b }
     shape_glob_interpolation: cyan_bold
     shape_globpattern: cyan_bold
     shape_int: purple_bold
@@ -114,7 +114,8 @@ let light_theme = {
     shape_flag: blue_bold
     shape_float: purple_bold
     # shapes are used to change the cli syntax highlighting
-    shape_garbage: { fg: white bg: red attr: b}
+    shape_garbage: { fg: white bg: red attr: b }
+    shape_glob_interpolation: cyan_bold
     shape_globpattern: cyan_bold
     shape_int: purple_bold
     shape_internalcall: cyan_bold
@@ -226,9 +227,9 @@ $env.config = {
 
     color_config: $dark_theme # if you want a more interesting theme, you can replace the empty record with `$dark_theme`, `$light_theme` or another custom record
     use_grid_icons: true
-    footer_mode: "25" # always, never, number_of_rows, auto
+    footer_mode: 25 # always, never, number_of_rows, auto
     float_precision: 2 # the precision for displaying floats in tables
-    buffer_editor: "" # command that will be used to edit the current line buffer with ctrl+o, if unset fallback to $env.EDITOR and $env.VISUAL
+    buffer_editor: null # command that will be used to edit the current line buffer with ctrl+o, if unset fallback to $env.EDITOR and $env.VISUAL
     use_ansi_coloring: true
     bracketed_paste: true # enable bracketed paste, currently useless on windows
     edit_mode: emacs # emacs, vi
@@ -888,4 +889,4 @@ $env.config = {
             event: { edit: selectall }
         }
     ]
-}
\ No newline at end of file
+}

From c19944f2916e023ef2325331ebedd4d36be5a46e Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Fri, 19 Jul 2024 04:16:09 +0000
Subject: [PATCH 0243/1072] Refactor `window` (#13401)

# Description
Following from #13377, this PR refactors the related `window` command.
In the case where `window` should behave exactly like `chunks`, it now
reuses the same code that `chunks` does. Otherwise, the other cases have
been rewritten and have resulted in a performance increase:

| window size | stride | old time (ms) | new time (ms) |
| -----------:| ------:| -------------:| -------------:|
| 20          | 1      | 757           | 722           |
| 2           | 1      | 364           | 333           |
| 1           | 1      | 343           | 293           |
| 20          | 20     | 90            | 63            |
| 2           | 2      | 215           | 175           |
| 20          | 30     | 74            | 60            |
| 2           | 4      | 141           | 110           |


# User-Facing Changes
`window` will now error if the window size or stride is 0, which is
technically a breaking change.
---
 crates/nu-command/src/filters/chunks.rs    |  48 ++--
 crates/nu-command/src/filters/window.rs    | 307 +++++++++++----------
 crates/nu-command/tests/commands/mod.rs    |   1 +
 crates/nu-command/tests/commands/window.rs | 103 +++++++
 4 files changed, 297 insertions(+), 162 deletions(-)
 create mode 100644 crates/nu-command/tests/commands/window.rs

diff --git a/crates/nu-command/src/filters/chunks.rs b/crates/nu-command/src/filters/chunks.rs
index 11a59c2aa9..68d682ecd1 100644
--- a/crates/nu-command/src/filters/chunks.rs
+++ b/crates/nu-command/src/filters/chunks.rs
@@ -1,5 +1,6 @@
 use nu_engine::command_prelude::*;
 use nu_protocol::ListStream;
+use std::num::NonZeroUsize;
 
 #[derive(Clone)]
 pub struct Chunks;
@@ -89,26 +90,33 @@ impl Command for Chunks {
                 span: chunk_size.span(),
             })?;
 
-        if size == 0 {
-            return Err(ShellError::IncorrectValue {
-                msg: "`chunk_size` cannot be zero".into(),
-                val_span: chunk_size.span(),
-                call_span: head,
-            });
-        }
+        let size = NonZeroUsize::try_from(size).map_err(|_| ShellError::IncorrectValue {
+            msg: "`chunk_size` cannot be zero".into(),
+            val_span: chunk_size.span(),
+            call_span: head,
+        })?;
 
-        match input {
-            PipelineData::Value(Value::List { vals, .. }, metadata) => {
-                let chunks = ChunksIter::new(vals, size, head);
-                let stream = ListStream::new(chunks, head, engine_state.signals().clone());
-                Ok(PipelineData::ListStream(stream, metadata))
-            }
-            PipelineData::ListStream(stream, metadata) => {
-                let stream = stream.modify(|iter| ChunksIter::new(iter, size, head));
-                Ok(PipelineData::ListStream(stream, metadata))
-            }
-            input => Err(input.unsupported_input_error("list", head)),
+        chunks(engine_state, input, size, head)
+    }
+}
+
+pub fn chunks(
+    engine_state: &EngineState,
+    input: PipelineData,
+    chunk_size: NonZeroUsize,
+    span: Span,
+) -> Result<PipelineData, ShellError> {
+    match input {
+        PipelineData::Value(Value::List { vals, .. }, metadata) => {
+            let chunks = ChunksIter::new(vals, chunk_size, span);
+            let stream = ListStream::new(chunks, span, engine_state.signals().clone());
+            Ok(PipelineData::ListStream(stream, metadata))
         }
+        PipelineData::ListStream(stream, metadata) => {
+            let stream = stream.modify(|iter| ChunksIter::new(iter, chunk_size, span));
+            Ok(PipelineData::ListStream(stream, metadata))
+        }
+        input => Err(input.unsupported_input_error("list", span)),
     }
 }
 
@@ -119,10 +127,10 @@ struct ChunksIter<I: Iterator<Item = Value>> {
 }
 
 impl<I: Iterator<Item = Value>> ChunksIter<I> {
-    fn new(iter: impl IntoIterator<IntoIter = I>, size: usize, span: Span) -> Self {
+    fn new(iter: impl IntoIterator<IntoIter = I>, size: NonZeroUsize, span: Span) -> Self {
         Self {
             iter: iter.into_iter(),
-            size,
+            size: size.into(),
             span,
         }
     }
diff --git a/crates/nu-command/src/filters/window.rs b/crates/nu-command/src/filters/window.rs
index 3c470f478d..556543118b 100644
--- a/crates/nu-command/src/filters/window.rs
+++ b/crates/nu-command/src/filters/window.rs
@@ -1,5 +1,6 @@
 use nu_engine::command_prelude::*;
-use nu_protocol::ValueIterator;
+use nu_protocol::ListStream;
+use std::num::NonZeroUsize;
 
 #[derive(Clone)]
 pub struct Window;
@@ -12,8 +13,8 @@ impl Command for Window {
     fn signature(&self) -> Signature {
         Signature::build("window")
             .input_output_types(vec![(
-                Type::List(Box::new(Type::Any)),
-                Type::List(Box::new(Type::List(Box::new(Type::Any)))),
+                Type::list(Type::Any),
+                Type::list(Type::list(Type::Any)),
             )])
             .required("window_size", SyntaxShape::Int, "The size of each window.")
             .named(
@@ -34,72 +35,41 @@ impl Command for Window {
         "Creates a sliding window of `window_size` that slide by n rows/elements across input."
     }
 
+    fn extra_usage(&self) -> &str {
+        "This command will error if `window_size` or `stride` are negative or zero."
+    }
+
     fn examples(&self) -> Vec<Example> {
-        let stream_test_1 = vec![
-            Value::list(
-                vec![Value::test_int(1), Value::test_int(2)],
-                Span::test_data(),
-            ),
-            Value::list(
-                vec![Value::test_int(2), Value::test_int(3)],
-                Span::test_data(),
-            ),
-            Value::list(
-                vec![Value::test_int(3), Value::test_int(4)],
-                Span::test_data(),
-            ),
-        ];
-
-        let stream_test_2 = vec![
-            Value::list(
-                vec![Value::test_int(1), Value::test_int(2)],
-                Span::test_data(),
-            ),
-            Value::list(
-                vec![Value::test_int(4), Value::test_int(5)],
-                Span::test_data(),
-            ),
-            Value::list(
-                vec![Value::test_int(7), Value::test_int(8)],
-                Span::test_data(),
-            ),
-        ];
-
-        let stream_test_3 = vec![
-            Value::list(
-                vec![Value::test_int(1), Value::test_int(2), Value::test_int(3)],
-                Span::test_data(),
-            ),
-            Value::list(
-                vec![Value::test_int(4), Value::test_int(5)],
-                Span::test_data(),
-            ),
-        ];
-
         vec![
             Example {
                 example: "[1 2 3 4] | window 2",
                 description: "A sliding window of two elements",
-                result: Some(Value::list(
-                    stream_test_1,
-                    Span::test_data(),
-                )),
+                result: Some(Value::test_list(vec![
+                    Value::test_list(vec![Value::test_int(1), Value::test_int(2)]),
+                    Value::test_list(vec![Value::test_int(2), Value::test_int(3)]),
+                    Value::test_list(vec![Value::test_int(3), Value::test_int(4)]),
+                ])),
             },
             Example {
                 example: "[1, 2, 3, 4, 5, 6, 7, 8] | window 2 --stride 3",
                 description: "A sliding window of two elements, with a stride of 3",
-                result: Some(Value::list(
-                    stream_test_2,
-                    Span::test_data(),
-                )),
+                result: Some(Value::test_list(vec![
+                    Value::test_list(vec![Value::test_int(1), Value::test_int(2)]),
+                    Value::test_list(vec![Value::test_int(4), Value::test_int(5)]),
+                    Value::test_list(vec![Value::test_int(7), Value::test_int(8)]),
+                ])),
             },
             Example {
                 example: "[1, 2, 3, 4, 5] | window 3 --stride 3 --remainder",
                 description: "A sliding window of equal stride that includes remainder. Equivalent to chunking",
-                result: Some(Value::list(
-                    stream_test_3,
-                    Span::test_data(),
-                )),
+                result: Some(Value::test_list(vec![
+                    Value::test_list(vec![
+                        Value::test_int(1),
+                        Value::test_int(2),
+                        Value::test_int(3),
+                    ]),
+                    Value::test_list(vec![Value::test_int(4), Value::test_int(5)]),
+                ])),
             },
         ]
     }
@@ -112,116 +82,169 @@ impl Command for Window {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
-        let group_size: Spanned<usize> = call.req(engine_state, stack, 0)?;
-        let metadata = input.metadata();
-        let stride: Option<usize> = call.get_flag(engine_state, stack, "stride")?;
+        let window_size: Value = call.req(engine_state, stack, 0)?;
+        let stride: Option<Value> = call.get_flag(engine_state, stack, "stride")?;
         let remainder = call.has_flag(engine_state, stack, "remainder")?;
 
-        let stride = stride.unwrap_or(1);
+        let size =
+            usize::try_from(window_size.as_int()?).map_err(|_| ShellError::NeedsPositiveValue {
+                span: window_size.span(),
+            })?;
 
-        //FIXME: add in support for external redirection when engine-q supports it generally
+        let size = NonZeroUsize::try_from(size).map_err(|_| ShellError::IncorrectValue {
+            msg: "`window_size` cannot be zero".into(),
+            val_span: window_size.span(),
+            call_span: head,
+        })?;
 
-        let each_group_iterator = EachWindowIterator {
-            group_size: group_size.item,
-            input: Box::new(input.into_iter()),
-            span: head,
-            previous: None,
-            stride,
-            remainder,
+        let stride = if let Some(stride_val) = stride {
+            let stride = usize::try_from(stride_val.as_int()?).map_err(|_| {
+                ShellError::NeedsPositiveValue {
+                    span: stride_val.span(),
+                }
+            })?;
+
+            NonZeroUsize::try_from(stride).map_err(|_| ShellError::IncorrectValue {
+                msg: "`stride` cannot be zero".into(),
+                val_span: stride_val.span(),
+                call_span: head,
+            })?
+        } else {
+            NonZeroUsize::MIN
         };
 
-        Ok(each_group_iterator.into_pipeline_data_with_metadata(
-            head,
-            engine_state.signals().clone(),
-            metadata,
-        ))
+        if remainder && size == stride {
+            super::chunks::chunks(engine_state, input, size, head)
+        } else if stride >= size {
+            match input {
+                PipelineData::Value(Value::List { vals, .. }, metadata) => {
+                    let chunks = WindowGapIter::new(vals, size, stride, remainder, head);
+                    let stream = ListStream::new(chunks, head, engine_state.signals().clone());
+                    Ok(PipelineData::ListStream(stream, metadata))
+                }
+                PipelineData::ListStream(stream, metadata) => {
+                    let stream = stream
+                        .modify(|iter| WindowGapIter::new(iter, size, stride, remainder, head));
+                    Ok(PipelineData::ListStream(stream, metadata))
+                }
+                input => Err(input.unsupported_input_error("list", head)),
+            }
+        } else {
+            match input {
+                PipelineData::Value(Value::List { vals, .. }, metadata) => {
+                    let chunks = WindowOverlapIter::new(vals, size, stride, remainder, head);
+                    let stream = ListStream::new(chunks, head, engine_state.signals().clone());
+                    Ok(PipelineData::ListStream(stream, metadata))
+                }
+                PipelineData::ListStream(stream, metadata) => {
+                    let stream = stream
+                        .modify(|iter| WindowOverlapIter::new(iter, size, stride, remainder, head));
+                    Ok(PipelineData::ListStream(stream, metadata))
+                }
+                input => Err(input.unsupported_input_error("list", head)),
+            }
+        }
     }
 }
 
-struct EachWindowIterator {
-    group_size: usize,
-    input: ValueIterator,
-    span: Span,
-    previous: Option<Vec<Value>>,
+struct WindowOverlapIter<I: Iterator<Item = Value>> {
+    iter: I,
+    window: Vec<Value>,
     stride: usize,
     remainder: bool,
+    span: Span,
 }
 
-impl Iterator for EachWindowIterator {
+impl<I: Iterator<Item = Value>> WindowOverlapIter<I> {
+    fn new(
+        iter: impl IntoIterator<IntoIter = I>,
+        size: NonZeroUsize,
+        stride: NonZeroUsize,
+        remainder: bool,
+        span: Span,
+    ) -> Self {
+        Self {
+            iter: iter.into_iter(),
+            window: Vec::with_capacity(size.into()),
+            stride: stride.into(),
+            remainder,
+            span,
+        }
+    }
+}
+
+impl<I: Iterator<Item = Value>> Iterator for WindowOverlapIter<I> {
     type Item = Value;
 
     fn next(&mut self) -> Option<Self::Item> {
-        let mut group = self.previous.take().unwrap_or_else(|| {
-            let mut vec = Vec::new();
-
-            // We default to a Vec of capacity size + stride as striding pushes n extra elements to the end
-            vec.try_reserve(self.group_size + self.stride).ok();
-
-            vec
-        });
-        let mut current_count = 0;
-
-        if group.is_empty() {
-            loop {
-                let item = self.input.next();
-
-                match item {
-                    Some(v) => {
-                        group.push(v);
-
-                        current_count += 1;
-                        if current_count >= self.group_size {
-                            break;
-                        }
-                    }
-                    None => {
-                        if self.remainder {
-                            break;
-                        } else {
-                            return None;
-                        }
-                    }
-                }
-            }
+        let len = if self.window.is_empty() {
+            self.window.capacity()
         } else {
-            // our historic buffer is already full, so stride instead
+            self.stride
+        };
 
-            loop {
-                let item = self.input.next();
+        self.window.extend((&mut self.iter).take(len));
 
-                match item {
-                    Some(v) => {
-                        group.push(v);
-
-                        current_count += 1;
-                        if current_count >= self.stride {
-                            break;
-                        }
-                    }
-                    None => {
-                        if self.remainder {
-                            break;
-                        } else {
-                            return None;
-                        }
-                    }
-                }
-            }
-
-            // We now have elements + stride in our group, and need to
-            // drop the skipped elements. Drain to preserve allocation and capacity
-            // Dropping this iterator consumes it.
-            group.drain(..self.stride.min(group.len()));
+        if self.window.len() == self.window.capacity()
+            || (self.remainder && !self.window.is_empty())
+        {
+            let mut next = Vec::with_capacity(self.window.len());
+            next.extend(self.window.iter().skip(self.stride).cloned());
+            let window = std::mem::replace(&mut self.window, next);
+            Some(Value::list(window, self.span))
+        } else {
+            None
         }
+    }
+}
 
-        if group.is_empty() {
-            return None;
+struct WindowGapIter<I: Iterator<Item = Value>> {
+    iter: I,
+    size: usize,
+    skip: usize,
+    first: bool,
+    remainder: bool,
+    span: Span,
+}
+
+impl<I: Iterator<Item = Value>> WindowGapIter<I> {
+    fn new(
+        iter: impl IntoIterator<IntoIter = I>,
+        size: NonZeroUsize,
+        stride: NonZeroUsize,
+        remainder: bool,
+        span: Span,
+    ) -> Self {
+        let size = size.into();
+        Self {
+            iter: iter.into_iter(),
+            size,
+            skip: stride.get() - size,
+            first: true,
+            remainder,
+            span,
         }
+    }
+}
 
-        let return_group = group.clone();
-        self.previous = Some(group);
+impl<I: Iterator<Item = Value>> Iterator for WindowGapIter<I> {
+    type Item = Value;
 
-        Some(Value::list(return_group, self.span))
+    fn next(&mut self) -> Option<Self::Item> {
+        let mut window = Vec::with_capacity(self.size);
+        window.extend(
+            (&mut self.iter)
+                .skip(if self.first { 0 } else { self.skip })
+                .take(self.size),
+        );
+
+        self.first = false;
+
+        if window.len() == self.size || (self.remainder && !window.is_empty()) {
+            Some(Value::list(window, self.span))
+        } else {
+            None
+        }
     }
 }
 
diff --git a/crates/nu-command/tests/commands/mod.rs b/crates/nu-command/tests/commands/mod.rs
index 4c9f8e86f8..3cb468ad30 100644
--- a/crates/nu-command/tests/commands/mod.rs
+++ b/crates/nu-command/tests/commands/mod.rs
@@ -115,6 +115,7 @@ mod try_;
 mod ucp;
 #[cfg(unix)]
 mod ulimit;
+mod window;
 
 mod debug;
 mod umkdir;
diff --git a/crates/nu-command/tests/commands/window.rs b/crates/nu-command/tests/commands/window.rs
new file mode 100644
index 0000000000..6e4addc6c0
--- /dev/null
+++ b/crates/nu-command/tests/commands/window.rs
@@ -0,0 +1,103 @@
+use nu_test_support::nu;
+
+#[test]
+fn window_size_negative() {
+    let actual = nu!("[0 1 2] | window -1");
+    assert!(actual.err.contains("positive"));
+}
+
+#[test]
+fn window_size_zero() {
+    let actual = nu!("[0 1 2] | window 0");
+    assert!(actual.err.contains("zero"));
+}
+
+#[test]
+fn window_size_not_int() {
+    let actual = nu!("[0 1 2] | window (if true { 1sec })");
+    assert!(actual.err.contains("can't convert"));
+}
+
+#[test]
+fn stride_negative() {
+    let actual = nu!("[0 1 2] | window 1 -s -1");
+    assert!(actual.err.contains("positive"));
+}
+
+#[test]
+fn stride_zero() {
+    let actual = nu!("[0 1 2] | window 1 -s 0");
+    assert!(actual.err.contains("zero"));
+}
+
+#[test]
+fn stride_not_int() {
+    let actual = nu!("[0 1 2] | window 1 -s (if true { 1sec })");
+    assert!(actual.err.contains("can't convert"));
+}
+
+#[test]
+fn empty() {
+    let actual = nu!("[] | window 2 | is-empty");
+    assert_eq!(actual.out, "true");
+}
+
+#[test]
+fn list_stream() {
+    let actual = nu!("([0 1 2] | every 1 | window 2) == ([0 1 2] | window 2)");
+    assert_eq!(actual.out, "true");
+}
+
+#[test]
+fn table_stream() {
+    let actual = nu!("([[foo bar]; [0 1] [2 3] [4 5]] | every 1 | window 2) == ([[foo bar]; [0 1] [2 3] [4 5]] | window 2)");
+    assert_eq!(actual.out, "true");
+}
+
+#[test]
+fn no_empty_chunks() {
+    let actual = nu!("([0 1 2 3 4 5] | window 3 -s 3 -r | length) == 2");
+    assert_eq!(actual.out, "true");
+}
+
+#[test]
+fn same_as_chunks() {
+    let actual = nu!("([0 1 2 3 4] | window 2 -s 2 -r) == ([0 1 2 3 4 ] | chunks 2)");
+    assert_eq!(actual.out, "true");
+}
+
+#[test]
+fn stride_equal_to_window_size() {
+    let actual = nu!("([0 1 2 3] | window 2 -s 2 | flatten) == [0 1 2 3]");
+    assert_eq!(actual.out, "true");
+}
+
+#[test]
+fn stride_greater_than_window_size() {
+    let actual = nu!("([0 1 2 3 4] | window 2 -s 3 | flatten) == [0 1 3 4]");
+    assert_eq!(actual.out, "true");
+}
+
+#[test]
+fn stride_less_than_window_size() {
+    let actual = nu!("([0 1 2 3 4 5] | window 3 -s 2 | length) == 2");
+    assert_eq!(actual.out, "true");
+}
+
+#[test]
+fn stride_equal_to_window_size_remainder() {
+    let actual = nu!("([0 1 2 3 4] | window 2 -s 2 -r | flatten) == [0 1 2 3 4]");
+    assert_eq!(actual.out, "true");
+}
+
+#[test]
+fn stride_greater_than_window_size_remainder() {
+    let actual = nu!("([0 1 2 3 4] | window 2 -s 3 -r | flatten) == [0 1 3 4]");
+    assert_eq!(actual.out, "true");
+}
+
+#[test]
+fn stride_less_than_window_size_remainder() {
+    let actual = nu!("([0 1 2 3 4 5] | window 3 -s 2 -r | length) == 3");
+    assert_eq!(actual.out, "true");
+}

From f3843a61762ab4054608b2b0393a322ee01dc78d Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Thu, 18 Jul 2024 22:54:21 -0700
Subject: [PATCH 0244/1072] Make plugins able to find and call other commands
 (#13407)

# Description

Adds functionality to the plugin interface to support calling internal
commands from plugins. For example, using `view ir --json`:

```rust
let closure: Value = call.req(0)?;

let Some(decl_id) = engine.find_decl("view ir")? else {
    return Err(LabeledError::new("`view ir` not found"));
};

let ir_json = engine.call_decl(
    decl_id,
    EvaluatedCall::new(call.head)
        .with_named("json".into_spanned(call.head), Value::bool(true, call.head))
        .with_positional(closure),
    PipelineData::Empty,
    true,
    false,
)?.into_value()?.into_string()?;

let ir = serde_json::from_value(&ir_json);

// ...
```

# User-Facing Changes

Plugin developers can now use `EngineInterface::find_decl()` and
`call_decl()` to call internal commands, which could be handy for
formatters like `to csv` or `to nuon`, or for reflection commands that
help gain insight into the engine.

# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
- [ ] release notes
- [ ] update plugin protocol documentation: `FindDecl`, `CallDecl`
engine calls; `Identifier` engine call response
---
 crates/nu-plugin-engine/src/context.rs        | 103 +++++++++++++++---
 crates/nu-plugin-engine/src/interface/mod.rs  |  16 +++
 .../nu-plugin-protocol/src/evaluated_call.rs  |  86 +++++++++++++++
 crates/nu-plugin-protocol/src/lib.rs          |  35 +++++-
 crates/nu-plugin/src/plugin/interface/mod.rs  |  73 ++++++++++++-
 crates/nu-protocol/src/ir/call.rs             |   2 +-
 .../src/commands/call_decl.rs                 |  78 +++++++++++++
 crates/nu_plugin_example/src/commands/mod.rs  |   2 +
 crates/nu_plugin_example/src/lib.rs           |   1 +
 tests/plugins/call_decl.rs                    |  42 +++++++
 tests/plugins/mod.rs                          |   1 +
 11 files changed, 418 insertions(+), 21 deletions(-)
 create mode 100644 crates/nu_plugin_example/src/commands/call_decl.rs
 create mode 100644 tests/plugins/call_decl.rs

diff --git a/crates/nu-plugin-engine/src/context.rs b/crates/nu-plugin-engine/src/context.rs
index aa504a246a..d9023cde35 100644
--- a/crates/nu-plugin-engine/src/context.rs
+++ b/crates/nu-plugin-engine/src/context.rs
@@ -1,9 +1,10 @@
 use crate::util::MutableCow;
 use nu_engine::{get_eval_block_with_early_return, get_full_help, ClosureEvalOnce};
+use nu_plugin_protocol::EvaluatedCall;
 use nu_protocol::{
     engine::{Call, Closure, EngineState, Redirection, Stack},
-    Config, IntoSpanned, OutDest, PipelineData, PluginIdentity, ShellError, Signals, Span, Spanned,
-    Value,
+    ir, Config, DeclId, IntoSpanned, OutDest, PipelineData, PluginIdentity, ShellError, Signals,
+    Span, Spanned, Value,
 };
 use std::{
     borrow::Cow,
@@ -44,6 +45,17 @@ pub trait PluginExecutionContext: Send + Sync {
         redirect_stdout: bool,
         redirect_stderr: bool,
     ) -> Result<PipelineData, ShellError>;
+    /// Find a declaration by name
+    fn find_decl(&self, name: &str) -> Result<Option<DeclId>, ShellError>;
+    /// Call a declaration with arguments and input
+    fn call_decl(
+        &mut self,
+        decl_id: DeclId,
+        call: EvaluatedCall,
+        input: PipelineData,
+        redirect_stdout: bool,
+        redirect_stderr: bool,
+    ) -> Result<PipelineData, ShellError>;
     /// Create an owned version of the context with `'static` lifetime
     fn boxed(&self) -> Box<dyn PluginExecutionContext>;
 }
@@ -177,19 +189,10 @@ impl<'a> PluginExecutionContext for PluginExecutionCommandContext<'a> {
             .captures_to_stack(closure.item.captures)
             .reset_pipes();
 
-        let stdout = if redirect_stdout {
-            Some(Redirection::Pipe(OutDest::Capture))
-        } else {
-            None
-        };
-
-        let stderr = if redirect_stderr {
-            Some(Redirection::Pipe(OutDest::Capture))
-        } else {
-            None
-        };
-
-        let stack = &mut stack.push_redirection(stdout, stderr);
+        let stack = &mut stack.push_redirection(
+            redirect_stdout.then_some(Redirection::Pipe(OutDest::Capture)),
+            redirect_stderr.then_some(Redirection::Pipe(OutDest::Capture)),
+        );
 
         // Set up the positional arguments
         for (idx, value) in positional.into_iter().enumerate() {
@@ -211,6 +214,57 @@ impl<'a> PluginExecutionContext for PluginExecutionCommandContext<'a> {
         eval_block_with_early_return(&self.engine_state, stack, block, input)
     }
 
+    fn find_decl(&self, name: &str) -> Result<Option<DeclId>, ShellError> {
+        Ok(self.engine_state.find_decl(name.as_bytes(), &[]))
+    }
+
+    fn call_decl(
+        &mut self,
+        decl_id: DeclId,
+        call: EvaluatedCall,
+        input: PipelineData,
+        redirect_stdout: bool,
+        redirect_stderr: bool,
+    ) -> Result<PipelineData, ShellError> {
+        if decl_id >= self.engine_state.num_decls() {
+            return Err(ShellError::GenericError {
+                error: "Plugin misbehaving".into(),
+                msg: format!("Tried to call unknown decl id: {}", decl_id),
+                span: Some(call.head),
+                help: None,
+                inner: vec![],
+            });
+        }
+
+        let decl = self.engine_state.get_decl(decl_id);
+
+        let stack = &mut self.stack.push_redirection(
+            redirect_stdout.then_some(Redirection::Pipe(OutDest::Capture)),
+            redirect_stderr.then_some(Redirection::Pipe(OutDest::Capture)),
+        );
+
+        let mut call_builder = ir::Call::build(decl_id, call.head);
+
+        for positional in call.positional {
+            call_builder.add_positional(stack, positional.span(), positional);
+        }
+
+        for (name, value) in call.named {
+            if let Some(value) = value {
+                call_builder.add_named(stack, &name.item, "", name.span, value);
+            } else {
+                call_builder.add_flag(stack, &name.item, "", name.span);
+            }
+        }
+
+        decl.run(
+            &self.engine_state,
+            stack,
+            &(&call_builder.finish()).into(),
+            input,
+        )
+    }
+
     fn boxed(&self) -> Box<dyn PluginExecutionContext + 'static> {
         Box::new(PluginExecutionCommandContext {
             identity: self.identity.clone(),
@@ -298,6 +352,25 @@ impl PluginExecutionContext for PluginExecutionBogusContext {
         })
     }
 
+    fn find_decl(&self, _name: &str) -> Result<Option<DeclId>, ShellError> {
+        Err(ShellError::NushellFailed {
+            msg: "find_decl not implemented on bogus".into(),
+        })
+    }
+
+    fn call_decl(
+        &mut self,
+        _decl_id: DeclId,
+        _call: EvaluatedCall,
+        _input: PipelineData,
+        _redirect_stdout: bool,
+        _redirect_stderr: bool,
+    ) -> Result<PipelineData, ShellError> {
+        Err(ShellError::NushellFailed {
+            msg: "call_decl not implemented on bogus".into(),
+        })
+    }
+
     fn boxed(&self) -> Box<dyn PluginExecutionContext + 'static> {
         Box::new(PluginExecutionBogusContext)
     }
diff --git a/crates/nu-plugin-engine/src/interface/mod.rs b/crates/nu-plugin-engine/src/interface/mod.rs
index d1b722dedf..680b3b123f 100644
--- a/crates/nu-plugin-engine/src/interface/mod.rs
+++ b/crates/nu-plugin-engine/src/interface/mod.rs
@@ -1316,6 +1316,22 @@ pub(crate) fn handle_engine_call(
         } => context
             .eval_closure(closure, positional, input, redirect_stdout, redirect_stderr)
             .map(EngineCallResponse::PipelineData),
+        EngineCall::FindDecl(name) => context.find_decl(&name).map(|decl_id| {
+            if let Some(decl_id) = decl_id {
+                EngineCallResponse::Identifier(decl_id)
+            } else {
+                EngineCallResponse::empty()
+            }
+        }),
+        EngineCall::CallDecl {
+            decl_id,
+            call,
+            input,
+            redirect_stdout,
+            redirect_stderr,
+        } => context
+            .call_decl(decl_id, call, input, redirect_stdout, redirect_stderr)
+            .map(EngineCallResponse::PipelineData),
     }
 }
 
diff --git a/crates/nu-plugin-protocol/src/evaluated_call.rs b/crates/nu-plugin-protocol/src/evaluated_call.rs
index 58f8987865..5e760693a5 100644
--- a/crates/nu-plugin-protocol/src/evaluated_call.rs
+++ b/crates/nu-plugin-protocol/src/evaluated_call.rs
@@ -27,6 +27,82 @@ pub struct EvaluatedCall {
 }
 
 impl EvaluatedCall {
+    /// Create a new [`EvaluatedCall`] with the given head span.
+    pub fn new(head: Span) -> EvaluatedCall {
+        EvaluatedCall {
+            head,
+            positional: vec![],
+            named: vec![],
+        }
+    }
+
+    /// Add a positional argument to an [`EvaluatedCall`].
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// # use nu_protocol::{Value, Span, IntoSpanned};
+    /// # use nu_plugin_protocol::EvaluatedCall;
+    /// # let head = Span::test_data();
+    /// let mut call = EvaluatedCall::new(head);
+    /// call.add_positional(Value::test_int(1337));
+    /// ```
+    pub fn add_positional(&mut self, value: Value) -> &mut Self {
+        self.positional.push(value);
+        self
+    }
+
+    /// Add a named argument to an [`EvaluatedCall`].
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// # use nu_protocol::{Value, Span, IntoSpanned};
+    /// # use nu_plugin_protocol::EvaluatedCall;
+    /// # let head = Span::test_data();
+    /// let mut call = EvaluatedCall::new(head);
+    /// call.add_named("foo".into_spanned(head), Value::test_string("bar"));
+    /// ```
+    pub fn add_named(&mut self, name: Spanned<impl Into<String>>, value: Value) -> &mut Self {
+        self.named.push((name.map(Into::into), Some(value)));
+        self
+    }
+
+    /// Add a flag argument to an [`EvaluatedCall`]. A flag argument is a named argument with no
+    /// value.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// # use nu_protocol::{Value, Span, IntoSpanned};
+    /// # use nu_plugin_protocol::EvaluatedCall;
+    /// # let head = Span::test_data();
+    /// let mut call = EvaluatedCall::new(head);
+    /// call.add_flag("pretty".into_spanned(head));
+    /// ```
+    pub fn add_flag(&mut self, name: Spanned<impl Into<String>>) -> &mut Self {
+        self.named.push((name.map(Into::into), None));
+        self
+    }
+
+    /// Builder variant of [`.add_positional()`].
+    pub fn with_positional(mut self, value: Value) -> Self {
+        self.add_positional(value);
+        self
+    }
+
+    /// Builder variant of [`.add_named()`].
+    pub fn with_named(mut self, name: Spanned<impl Into<String>>, value: Value) -> Self {
+        self.add_named(name, value);
+        self
+    }
+
+    /// Builder variant of [`.add_flag()`].
+    pub fn with_flag(mut self, name: Spanned<impl Into<String>>) -> Self {
+        self.add_flag(name);
+        self
+    }
+
     /// Try to create an [`EvaluatedCall`] from a command `Call`.
     pub fn try_from_call(
         call: &Call,
@@ -192,6 +268,16 @@ impl EvaluatedCall {
         Ok(false)
     }
 
+    /// Returns the [`Span`] of the name of an optional named argument.
+    ///
+    /// This can be used in errors for named arguments that don't take values.
+    pub fn get_flag_span(&self, flag_name: &str) -> Option<Span> {
+        self.named
+            .iter()
+            .find(|(name, _)| name.item == flag_name)
+            .map(|(name, _)| name.span)
+    }
+
     /// Returns the [`Value`] of an optional named argument
     ///
     /// # Examples
diff --git a/crates/nu-plugin-protocol/src/lib.rs b/crates/nu-plugin-protocol/src/lib.rs
index 739366d910..a9196a2d8d 100644
--- a/crates/nu-plugin-protocol/src/lib.rs
+++ b/crates/nu-plugin-protocol/src/lib.rs
@@ -22,7 +22,7 @@ mod tests;
 pub mod test_util;
 
 use nu_protocol::{
-    ast::Operator, engine::Closure, ByteStreamType, Config, LabeledError, PipelineData,
+    ast::Operator, engine::Closure, ByteStreamType, Config, DeclId, LabeledError, PipelineData,
     PluginMetadata, PluginSignature, ShellError, Span, Spanned, Value,
 };
 use nu_utils::SharedCow;
@@ -494,6 +494,21 @@ pub enum EngineCall<D> {
         /// Whether to redirect stderr from external commands
         redirect_stderr: bool,
     },
+    /// Find a declaration by name
+    FindDecl(String),
+    /// Call a declaration with args
+    CallDecl {
+        /// The id of the declaration to be called (can be found with `FindDecl`)
+        decl_id: DeclId,
+        /// Information about the call (head span, arguments, etc.)
+        call: EvaluatedCall,
+        /// Pipeline input to the call
+        input: D,
+        /// Whether to redirect stdout from external commands
+        redirect_stdout: bool,
+        /// Whether to redirect stderr from external commands
+        redirect_stderr: bool,
+    },
 }
 
 impl<D> EngineCall<D> {
@@ -511,6 +526,8 @@ impl<D> EngineCall<D> {
             EngineCall::LeaveForeground => "LeaveForeground",
             EngineCall::GetSpanContents(_) => "GetSpanContents",
             EngineCall::EvalClosure { .. } => "EvalClosure",
+            EngineCall::FindDecl(_) => "FindDecl",
+            EngineCall::CallDecl { .. } => "CallDecl",
         }
     }
 
@@ -544,6 +561,20 @@ impl<D> EngineCall<D> {
                 redirect_stdout,
                 redirect_stderr,
             },
+            EngineCall::FindDecl(name) => EngineCall::FindDecl(name),
+            EngineCall::CallDecl {
+                decl_id,
+                call,
+                input,
+                redirect_stdout,
+                redirect_stderr,
+            } => EngineCall::CallDecl {
+                decl_id,
+                call,
+                input: f(input)?,
+                redirect_stdout,
+                redirect_stderr,
+            },
         })
     }
 }
@@ -556,6 +587,7 @@ pub enum EngineCallResponse<D> {
     PipelineData(D),
     Config(SharedCow<Config>),
     ValueMap(HashMap<String, Value>),
+    Identifier(usize),
 }
 
 impl<D> EngineCallResponse<D> {
@@ -570,6 +602,7 @@ impl<D> EngineCallResponse<D> {
             EngineCallResponse::PipelineData(data) => EngineCallResponse::PipelineData(f(data)?),
             EngineCallResponse::Config(config) => EngineCallResponse::Config(config),
             EngineCallResponse::ValueMap(map) => EngineCallResponse::ValueMap(map),
+            EngineCallResponse::Identifier(id) => EngineCallResponse::Identifier(id),
         })
     }
 }
diff --git a/crates/nu-plugin/src/plugin/interface/mod.rs b/crates/nu-plugin/src/plugin/interface/mod.rs
index 60c5964f26..c20e2adc39 100644
--- a/crates/nu-plugin/src/plugin/interface/mod.rs
+++ b/crates/nu-plugin/src/plugin/interface/mod.rs
@@ -6,12 +6,12 @@ use nu_plugin_core::{
     StreamManagerHandle,
 };
 use nu_plugin_protocol::{
-    CallInfo, CustomValueOp, EngineCall, EngineCallId, EngineCallResponse, Ordering, PluginCall,
-    PluginCallId, PluginCallResponse, PluginCustomValue, PluginInput, PluginOption, PluginOutput,
-    ProtocolInfo,
+    CallInfo, CustomValueOp, EngineCall, EngineCallId, EngineCallResponse, EvaluatedCall, Ordering,
+    PluginCall, PluginCallId, PluginCallResponse, PluginCustomValue, PluginInput, PluginOption,
+    PluginOutput, ProtocolInfo,
 };
 use nu_protocol::{
-    engine::Closure, Config, LabeledError, PipelineData, PluginMetadata, PluginSignature,
+    engine::Closure, Config, DeclId, LabeledError, PipelineData, PluginMetadata, PluginSignature,
     ShellError, Signals, Span, Spanned, Value,
 };
 use nu_utils::SharedCow;
@@ -872,6 +872,71 @@ impl EngineInterface {
         }
     }
 
+    /// Ask the engine for the identifier for a declaration. If found, the result can then be passed
+    /// to [`.call_decl()`] to call other internal commands.
+    ///
+    /// See [`.call_decl()`] for an example.
+    pub fn find_decl(&self, name: impl Into<String>) -> Result<Option<DeclId>, ShellError> {
+        let call = EngineCall::FindDecl(name.into());
+
+        match self.engine_call(call)? {
+            EngineCallResponse::Error(err) => Err(err),
+            EngineCallResponse::Identifier(id) => Ok(Some(id)),
+            EngineCallResponse::PipelineData(PipelineData::Empty) => Ok(None),
+            _ => Err(ShellError::PluginFailedToDecode {
+                msg: "Received unexpected response type for EngineCall::FindDecl".into(),
+            }),
+        }
+    }
+
+    /// Ask the engine to call an internal command, using the declaration ID previously looked up
+    /// with [`.find_decl()`].
+    ///
+    /// # Example
+    ///
+    /// ```rust,no_run
+    /// # use nu_protocol::{Value, ShellError, PipelineData};
+    /// # use nu_plugin::{EngineInterface, EvaluatedCall};
+    /// # fn example(engine: &EngineInterface, call: &EvaluatedCall) -> Result<Value, ShellError> {
+    /// if let Some(decl_id) = engine.find_decl("scope commands")? {
+    ///     let commands = engine.call_decl(
+    ///         decl_id,
+    ///         EvaluatedCall::new(call.head),
+    ///         PipelineData::Empty,
+    ///         true,
+    ///         false,
+    ///     )?;
+    ///     commands.into_value(call.head)
+    /// } else {
+    ///     Ok(Value::list(vec![], call.head))
+    /// }
+    /// # }
+    /// ```
+    pub fn call_decl(
+        &self,
+        decl_id: DeclId,
+        call: EvaluatedCall,
+        input: PipelineData,
+        redirect_stdout: bool,
+        redirect_stderr: bool,
+    ) -> Result<PipelineData, ShellError> {
+        let call = EngineCall::CallDecl {
+            decl_id,
+            call,
+            input,
+            redirect_stdout,
+            redirect_stderr,
+        };
+
+        match self.engine_call(call)? {
+            EngineCallResponse::Error(err) => Err(err),
+            EngineCallResponse::PipelineData(data) => Ok(data),
+            _ => Err(ShellError::PluginFailedToDecode {
+                msg: "Received unexpected response type for EngineCall::CallDecl".into(),
+            }),
+        }
+    }
+
     /// Tell the engine whether to disable garbage collection for this plugin.
     ///
     /// The garbage collector is enabled by default, but plugins can turn it off (ideally
diff --git a/crates/nu-protocol/src/ir/call.rs b/crates/nu-protocol/src/ir/call.rs
index 3d16f82eb6..b931373017 100644
--- a/crates/nu-protocol/src/ir/call.rs
+++ b/crates/nu-protocol/src/ir/call.rs
@@ -239,7 +239,7 @@ impl CallBuilder {
         }
         self.inner.args_len += 1;
         if let Some(span) = argument.span() {
-            self.inner.span = self.inner.span.append(span);
+            self.inner.span = self.inner.span.merge(span);
         }
         stack.arguments.push(argument);
         self
diff --git a/crates/nu_plugin_example/src/commands/call_decl.rs b/crates/nu_plugin_example/src/commands/call_decl.rs
new file mode 100644
index 0000000000..d8c8206d90
--- /dev/null
+++ b/crates/nu_plugin_example/src/commands/call_decl.rs
@@ -0,0 +1,78 @@
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{
+    IntoSpanned, LabeledError, PipelineData, Record, Signature, Spanned, SyntaxShape, Value,
+};
+
+use crate::ExamplePlugin;
+
+pub struct CallDecl;
+
+impl PluginCommand for CallDecl {
+    type Plugin = ExamplePlugin;
+
+    fn name(&self) -> &str {
+        "example call-decl"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .required(
+                "name",
+                SyntaxShape::String,
+                "the name of the command to call",
+            )
+            .optional(
+                "named_args",
+                SyntaxShape::Record(vec![]),
+                "named arguments to pass to the command",
+            )
+            .rest(
+                "positional_args",
+                SyntaxShape::Any,
+                "positional arguments to pass to the command",
+            )
+    }
+
+    fn usage(&self) -> &str {
+        "Demonstrates calling other commands from plugins using `call_decl()`."
+    }
+
+    fn extra_usage(&self) -> &str {
+        "
+The arguments will not be typechecked at parse time. This command is for
+demonstration only, and should not be used for anything real.
+"
+        .trim()
+    }
+
+    fn run(
+        &self,
+        _plugin: &ExamplePlugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        let name: Spanned<String> = call.req(0)?;
+        let named_args: Option<Record> = call.opt(1)?;
+        let positional_args: Vec<Value> = call.rest(2)?;
+
+        let decl_id = engine.find_decl(&name.item)?.ok_or_else(|| {
+            LabeledError::new(format!("Can't find `{}`", name.item))
+                .with_label("not in scope", name.span)
+        })?;
+
+        let mut new_call = EvaluatedCall::new(call.head);
+
+        for (key, val) in named_args.into_iter().flatten() {
+            new_call.add_named(key.into_spanned(val.span()), val);
+        }
+
+        for val in positional_args {
+            new_call.add_positional(val);
+        }
+
+        let result = engine.call_decl(decl_id, new_call, input, true, false)?;
+
+        Ok(result)
+    }
+}
diff --git a/crates/nu_plugin_example/src/commands/mod.rs b/crates/nu_plugin_example/src/commands/mod.rs
index dd808616a9..b1703a3a47 100644
--- a/crates/nu_plugin_example/src/commands/mod.rs
+++ b/crates/nu_plugin_example/src/commands/mod.rs
@@ -13,11 +13,13 @@ pub use three::Three;
 pub use two::Two;
 
 // Engine interface demos
+mod call_decl;
 mod config;
 mod disable_gc;
 mod env;
 mod view_span;
 
+pub use call_decl::CallDecl;
 pub use config::Config;
 pub use disable_gc::DisableGc;
 pub use env::Env;
diff --git a/crates/nu_plugin_example/src/lib.rs b/crates/nu_plugin_example/src/lib.rs
index acbebf9b39..3db97659bf 100644
--- a/crates/nu_plugin_example/src/lib.rs
+++ b/crates/nu_plugin_example/src/lib.rs
@@ -27,6 +27,7 @@ impl Plugin for ExamplePlugin {
             Box::new(Env),
             Box::new(ViewSpan),
             Box::new(DisableGc),
+            Box::new(CallDecl),
             // Stream demos
             Box::new(CollectBytes),
             Box::new(Echo),
diff --git a/tests/plugins/call_decl.rs b/tests/plugins/call_decl.rs
new file mode 100644
index 0000000000..06aded3f42
--- /dev/null
+++ b/tests/plugins/call_decl.rs
@@ -0,0 +1,42 @@
+use nu_test_support::nu_with_plugins;
+
+#[test]
+fn call_to_json() {
+    let result = nu_with_plugins!(
+        cwd: ".",
+        plugin: ("nu_plugin_example"),
+        r#"
+            [42] | example call-decl 'to json' {indent: 4}
+        "#
+    );
+    assert!(result.status.success());
+    // newlines are removed from test output
+    assert_eq!("[    42]", result.out);
+}
+
+#[test]
+fn call_reduce() {
+    let result = nu_with_plugins!(
+        cwd: ".",
+        plugin: ("nu_plugin_example"),
+        r#"
+            [1 2 3] | example call-decl 'reduce' {fold: 10} { |it, acc| $it + $acc }
+        "#
+    );
+    assert!(result.status.success());
+    assert_eq!("16", result.out);
+}
+
+#[test]
+fn call_scope_variables() {
+    let result = nu_with_plugins!(
+        cwd: ".",
+        plugin: ("nu_plugin_example"),
+        r#"
+            let test_var = 10
+            example call-decl 'scope variables' | where name == '$test_var' | length
+        "#
+    );
+    assert!(result.status.success());
+    assert_eq!("1", result.out);
+}
diff --git a/tests/plugins/mod.rs b/tests/plugins/mod.rs
index 605f78b564..cdcf3a9c94 100644
--- a/tests/plugins/mod.rs
+++ b/tests/plugins/mod.rs
@@ -1,3 +1,4 @@
+mod call_decl;
 mod config;
 mod core_inc;
 mod custom_values;

From e8764de3c67281a513a36457656de80c652e8b06 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Fri, 19 Jul 2024 15:21:02 +0800
Subject: [PATCH 0245/1072] don't allow break/continue in `each` and `items`
 command (#13398)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
Fixes: #11451

# User-Facing Changes
### Before
```nushell
❯ [1 2 3] | each {|e| break; print $e }
╭────────────╮
│ empty list │
╰────────────╯
```

### After
```
❯ [1 2 3] | each {|e| break; print $e }
Error: nu::shell::eval_block_with_input

  × Eval block failed with pipeline input
   ╭─[entry #9:1:2]
 1 │ [1 2 3] | each {|e| break; print $e }
   ·  ┬
   ·  ╰── source value
   ╰────

Error:   × Break used outside of loop
   ╭─[entry #9:1:21]
 1 │ [1 2 3] | each {|e| break; print $e }
   ·                     ──┬──
   ·                       ╰── used outside of loop
   ╰────
```

# Tests + Formatting
Removes some tests.
---
 crates/nu-cmd-lang/src/core_commands/break_.rs   |  4 +++-
 .../nu-cmd-lang/src/core_commands/continue_.rs   |  4 +++-
 crates/nu-command/src/filters/each.rs            |  8 --------
 crates/nu-command/src/filters/items.rs           |  1 -
 crates/nu-command/tests/commands/break_.rs       |  9 ---------
 crates/nu-command/tests/commands/each.rs         | 16 ----------------
 6 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/crates/nu-cmd-lang/src/core_commands/break_.rs b/crates/nu-cmd-lang/src/core_commands/break_.rs
index 90cc1a73f2..943e32a531 100644
--- a/crates/nu-cmd-lang/src/core_commands/break_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/break_.rs
@@ -21,7 +21,9 @@ impl Command for Break {
 
     fn extra_usage(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
-  https://www.nushell.sh/book/thinking_in_nu.html"#
+  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 {
diff --git a/crates/nu-cmd-lang/src/core_commands/continue_.rs b/crates/nu-cmd-lang/src/core_commands/continue_.rs
index cfa3e38335..b795456c1d 100644
--- a/crates/nu-cmd-lang/src/core_commands/continue_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/continue_.rs
@@ -21,7 +21,9 @@ impl Command for Continue {
 
     fn extra_usage(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
-  https://www.nushell.sh/book/thinking_in_nu.html"#
+  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 {
diff --git a/crates/nu-command/src/filters/each.rs b/crates/nu-command/src/filters/each.rs
index fa1bf390b8..a7035917b3 100644
--- a/crates/nu-command/src/filters/each.rs
+++ b/crates/nu-command/src/filters/each.rs
@@ -132,8 +132,6 @@ with 'transpose' first."#
                             Ok(data) => Some(data.into_value(head).unwrap_or_else(|err| {
                                 Value::error(chain_error_with_input(err, is_error, span), span)
                             })),
-                            Err(ShellError::Continue { span }) => Some(Value::nothing(span)),
-                            Err(ShellError::Break { .. }) => None,
                             Err(error) => {
                                 let error = chain_error_with_input(error, is_error, span);
                                 Some(Value::error(error, span))
@@ -149,10 +147,6 @@ with 'transpose' first."#
                         .map_while(move |value| {
                             let value = match value {
                                 Ok(value) => value,
-                                Err(ShellError::Continue { span }) => {
-                                    return Some(Value::nothing(span))
-                                }
-                                Err(ShellError::Break { .. }) => return None,
                                 Err(err) => return Some(Value::error(err, head)),
                             };
 
@@ -163,8 +157,6 @@ with 'transpose' first."#
                                 .and_then(|data| data.into_value(head))
                             {
                                 Ok(value) => Some(value),
-                                Err(ShellError::Continue { span }) => Some(Value::nothing(span)),
-                                Err(ShellError::Break { .. }) => None,
                                 Err(error) => {
                                     let error = chain_error_with_input(error, is_error, span);
                                     Some(Value::error(error, span))
diff --git a/crates/nu-command/src/filters/items.rs b/crates/nu-command/src/filters/items.rs
index 04a4c6d672..fa7b680afd 100644
--- a/crates/nu-command/src/filters/items.rs
+++ b/crates/nu-command/src/filters/items.rs
@@ -60,7 +60,6 @@ impl Command for Items {
 
                                 match result {
                                     Ok(value) => Some(value),
-                                    Err(ShellError::Break { .. }) => None,
                                     Err(err) => {
                                         let err = chain_error_with_input(err, false, span);
                                         Some(Value::error(err, head))
diff --git a/crates/nu-command/tests/commands/break_.rs b/crates/nu-command/tests/commands/break_.rs
index 92a6564658..7398ac62e5 100644
--- a/crates/nu-command/tests/commands/break_.rs
+++ b/crates/nu-command/tests/commands/break_.rs
@@ -15,12 +15,3 @@ fn break_while_loop() {
 
     assert_eq!(actual.out, "hello");
 }
-
-#[test]
-fn break_each() {
-    let actual = nu!("
-        [1, 2, 3, 4, 5] | each {|x| if $x > 3 { break }; $x} | math sum
-        ");
-
-    assert_eq!(actual.out, "6");
-}
diff --git a/crates/nu-command/tests/commands/each.rs b/crates/nu-command/tests/commands/each.rs
index f8e87d5537..65b922bb6e 100644
--- a/crates/nu-command/tests/commands/each.rs
+++ b/crates/nu-command/tests/commands/each.rs
@@ -58,22 +58,6 @@ fn each_while_uses_enumerate_index() {
     assert_eq!(actual.out, "[0, 1, 2, 3]");
 }
 
-#[test]
-fn each_element_continue_command() {
-    let actual =
-        nu!("[1,2,3,4,6,7] | each { |x| if ($x mod 2 == 0) {continue} else { $x }} | to nuon");
-
-    assert_eq!(actual.out, "[1, 3, 7]");
-}
-
-#[test]
-fn each_element_break_command() {
-    let actual =
-        nu!("[1,2,5,4,6,7] | each { |x| if ($x mod 3 == 0) {break} else { $x }} | to nuon");
-
-    assert_eq!(actual.out, "[1, 2, 5, 4]");
-}
-
 #[test]
 fn errors_in_nested_each_show() {
     let actual = nu!("[[1,2]] | each {|x| $x | each {|y| error make {msg: \"oh noes\"} } }");

From e281c03403aaf71de3cf3090bb12011dd578090d Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Fri, 19 Jul 2024 15:22:28 +0800
Subject: [PATCH 0246/1072] generate: switch the position of <initial> and
 <closure>, so the closure can have default parameters  (#13393)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
Close: #12083
Close: #12084

# User-Facing Changes
It's a breaking change because we have switched the position of
`<initial>` and `<closure>`, after the change, initial value will be
optional. So it's possible to do something like this:

```nushell
> let f = {|fib = [0, 1]| {out: $fib.0, next: [$fib.1, ($fib.0 + $fib.1)]} }
> generate $f | first 5
╭───┬───╮
│ 0 │ 0 │
│ 1 │ 1 │
│ 2 │ 1 │
│ 3 │ 2 │
│ 4 │ 3 │
╰───┴───╯
```

It will also raise error if user don't give initial value, and the
closure don't have default parameter.
```nushell
❯ let f = {|fib| {out: $fib.0, next: [$fib.1, ($fib.0 + $fib.1)]} }
❯ generate $f
Error:   × The initial value is missing
   ╭─[entry #5:1:1]
 1 │ generate $f
   · ────┬───
   ·     ╰── Missing intial value
   ╰────
  help: Provide <initial> value in generate, or assigning default value to closure parameter

```

# Tests + Formatting
Added some test cases.

---------

Co-authored-by: Stefan Holderbach <sholderbach@users.noreply.github.com>
---
 crates/nu-command/src/generators/generate.rs | 53 +++++++++--
 crates/nu-command/tests/commands/generate.rs | 95 +++++++++++++++-----
 2 files changed, 117 insertions(+), 31 deletions(-)

diff --git a/crates/nu-command/src/generators/generate.rs b/crates/nu-command/src/generators/generate.rs
index 8d4f48d3fb..2b2cf838f4 100644
--- a/crates/nu-command/src/generators/generate.rs
+++ b/crates/nu-command/src/generators/generate.rs
@@ -12,12 +12,12 @@ impl Command for Generate {
     fn signature(&self) -> Signature {
         Signature::build("generate")
             .input_output_types(vec![(Type::Nothing, Type::List(Box::new(Type::Any)))])
-            .required("initial", SyntaxShape::Any, "Initial value.")
             .required(
                 "closure",
                 SyntaxShape::Closure(Some(vec![SyntaxShape::Any])),
                 "Generator function.",
             )
+            .optional("initial", SyntaxShape::Any, "Initial value.")
             .allow_variants_without_examples(true)
             .category(Category::Generators)
     }
@@ -41,7 +41,7 @@ used as the next argument to the closure, otherwise generation stops.
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
-                example: "generate 0 {|i| if $i <= 10 { {out: $i, next: ($i + 2)} }}",
+                example: "generate {|i| if $i <= 10 { {out: $i, next: ($i + 2)} }} 0",
                 description: "Generate a sequence of numbers",
                 result: Some(Value::list(
                     vec![
@@ -57,10 +57,17 @@ used as the next argument to the closure, otherwise generation stops.
             },
             Example {
                 example:
-                    "generate [0, 1] {|fib| {out: $fib.0, next: [$fib.1, ($fib.0 + $fib.1)]} }",
+                    "generate {|fib| {out: $fib.0, next: [$fib.1, ($fib.0 + $fib.1)]} } [0, 1]",
                 description: "Generate a continuous stream of Fibonacci numbers",
                 result: None,
             },
+            Example {
+                example:
+                    "generate {|fib=[0, 1]| {out: $fib.0, next: [$fib.1, ($fib.0 + $fib.1)]} }",
+                description:
+                    "Generate a continuous stream of Fibonacci numbers, using default parameters",
+                result: None,
+            },
         ]
     }
 
@@ -72,15 +79,15 @@ used as the next argument to the closure, otherwise generation stops.
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
-        let initial: Value = call.req(engine_state, stack, 0)?;
-        let closure: Closure = call.req(engine_state, stack, 1)?;
-
+        let closure: Closure = call.req(engine_state, stack, 0)?;
+        let initial: Option<Value> = call.opt(engine_state, stack, 1)?;
+        let block = engine_state.get_block(closure.block_id);
         let mut closure = ClosureEval::new(engine_state, stack, closure);
 
         // A type of Option<S> is used to represent state. Invocation
         // will stop on None. Using Option<S> allows functions to output
         // one final value before stopping.
-        let mut state = Some(initial);
+        let mut state = Some(get_initial_state(initial, &block.signature, call.head)?);
         let iter = std::iter::from_fn(move || {
             let arg = state.take()?;
 
@@ -170,6 +177,38 @@ used as the next argument to the closure, otherwise generation stops.
     }
 }
 
+fn get_initial_state(
+    initial: Option<Value>,
+    signature: &Signature,
+    span: Span,
+) -> Result<Value, ShellError> {
+    match initial {
+        Some(v) => Ok(v),
+        None => {
+            // the initial state should be referred from signature
+            if !signature.optional_positional.is_empty()
+                && signature.optional_positional[0].default_value.is_some()
+            {
+                Ok(signature.optional_positional[0]
+                    .default_value
+                    .clone()
+                    .expect("Already checked default value"))
+            } else {
+                Err(ShellError::GenericError {
+                    error: "The initial value is missing".to_string(),
+                    msg: "Missing initial value".to_string(),
+                    span: Some(span),
+                    help: Some(
+                        "Provide an <initial> value as an argument to generate, or assign a default value to the closure parameter"
+                            .to_string(),
+                    ),
+                    inner: vec![],
+                })
+            }
+        }
+    }
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/crates/nu-command/tests/commands/generate.rs b/crates/nu-command/tests/commands/generate.rs
index 9dc2142515..9ae3b8823e 100644
--- a/crates/nu-command/tests/commands/generate.rs
+++ b/crates/nu-command/tests/commands/generate.rs
@@ -3,7 +3,7 @@ use nu_test_support::{nu, pipeline};
 #[test]
 fn generate_no_next_break() {
     let actual = nu!(
-        "generate 1 {|x| if $x == 3 { {out: $x}} else { {out: $x, next: ($x + 1)} }} | to nuon"
+        "generate {|x| if $x == 3 { {out: $x}} else { {out: $x, next: ($x + 1)} }} 1 | to nuon"
     );
 
     assert_eq!(actual.out, "[1, 2, 3]");
@@ -11,7 +11,7 @@ fn generate_no_next_break() {
 
 #[test]
 fn generate_null_break() {
-    let actual = nu!("generate 1 {|x| if $x <= 3 { {out: $x, next: ($x + 1)} }} | to nuon");
+    let actual = nu!("generate {|x| if $x <= 3 { {out: $x, next: ($x + 1)} }} 1 | to nuon");
 
     assert_eq!(actual.out, "[1, 2, 3]");
 }
@@ -20,13 +20,13 @@ fn generate_null_break() {
 fn generate_allows_empty_output() {
     let actual = nu!(pipeline(
         r#"
-        generate 0 {|x|
+        generate {|x|
           if $x == 1 {
             {next: ($x + 1)}
           } else if $x < 3 {
             {out: $x, next: ($x + 1)}
           }
-        } | to nuon
+        } 0 | to nuon
       "#
     ));
 
@@ -37,11 +37,11 @@ fn generate_allows_empty_output() {
 fn generate_allows_no_output() {
     let actual = nu!(pipeline(
         r#"
-        generate 0 {|x|
+        generate {|x|
           if $x < 3 {
             {next: ($x + 1)}
           }
-        } | to nuon
+        } 0 | to nuon
       "#
     ));
 
@@ -52,7 +52,7 @@ fn generate_allows_no_output() {
 fn generate_allows_null_state() {
     let actual = nu!(pipeline(
         r#"
-        generate 0 {|x|
+        generate {|x|
           if $x == null {
             {out: "done"}
           } else if $x < 1 {
@@ -60,7 +60,7 @@ fn generate_allows_null_state() {
           } else {
             {out: "stopping", next: null}
           }
-        } | to nuon
+        } 0 | to nuon
       "#
     ));
 
@@ -71,7 +71,42 @@ fn generate_allows_null_state() {
 fn generate_allows_null_output() {
     let actual = nu!(pipeline(
         r#"
-        generate 0 {|x|
+        generate {|x|
+          if $x == 3 {
+            {out: "done"}
+          } else {
+            {out: null, next: ($x + 1)}
+          }
+        } 0 | to nuon
+      "#
+    ));
+
+    assert_eq!(actual.out, "[null, null, null, done]");
+}
+
+#[test]
+fn generate_disallows_extra_keys() {
+    let actual = nu!("generate {|x| {foo: bar, out: $x}} 0 ");
+    assert!(actual.err.contains("Invalid block return"));
+}
+
+#[test]
+fn generate_disallows_list() {
+    let actual = nu!("generate {|x| [$x, ($x + 1)]} 0 ");
+    assert!(actual.err.contains("Invalid block return"));
+}
+
+#[test]
+fn generate_disallows_primitive() {
+    let actual = nu!("generate {|x| 1} 0");
+    assert!(actual.err.contains("Invalid block return"));
+}
+
+#[test]
+fn generate_allow_default_parameter() {
+    let actual = nu!(pipeline(
+        r#"
+        generate {|x = 0|
           if $x == 3 {
             {out: "done"}
           } else {
@@ -82,22 +117,34 @@ fn generate_allows_null_output() {
     ));
 
     assert_eq!(actual.out, "[null, null, null, done]");
+
+    // if initial is given, use initial value
+    let actual = nu!(pipeline(
+        r#"
+        generate {|x = 0|
+          if $x == 3 {
+            {out: "done"}
+          } else {
+            {out: null, next: ($x + 1)}
+          }
+        } 1 | to nuon
+      "#
+    ));
+    assert_eq!(actual.out, "[null, null, done]");
 }
 
 #[test]
-fn generate_disallows_extra_keys() {
-    let actual = nu!("generate 0 {|x| {foo: bar, out: $x}}");
-    assert!(actual.err.contains("Invalid block return"));
-}
-
-#[test]
-fn generate_disallows_list() {
-    let actual = nu!("generate 0 {|x| [$x, ($x + 1)]}");
-    assert!(actual.err.contains("Invalid block return"));
-}
-
-#[test]
-fn generate_disallows_primitive() {
-    let actual = nu!("generate 0 {|x| 1}");
-    assert!(actual.err.contains("Invalid block return"));
+fn generate_raise_error_on_no_default_parameter_closure_and_init_val() {
+    let actual = nu!(pipeline(
+        r#"
+        generate {|x|
+          if $x == 3 {
+            {out: "done"}
+          } else {
+            {out: null, next: ($x + 1)}
+          }
+        } | to nuon
+      "#
+    ));
+    assert!(actual.err.contains("The initial value is missing"));
 }

From 4665323bb4ba0931c690bf743b54a27ec493822a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 19 Jul 2024 12:47:07 +0200
Subject: [PATCH 0247/1072] Use directories for autoloading (#13382)

fixes https://github.com/nushell/nushell/issues/13378

# Description

This PR tries to improve usage of system APIs to determine the location
of vendored autoload files.

# User-Facing Changes
The paths listed in #13180 and #13217 are changing. This has not been
part of a release yet, so arguably the user facing changes are only to
unreleased features anyway.

# Tests + Formatting
Haven't done, but if someone wants to help me here, I'm open to doing
it. I just don't know how to properly test this.

# After Submitting
---
 Cargo.lock                             |   3 +
 Cargo.toml                             |   2 +
 crates/nu-cli/tests/completions/mod.rs |   2 +-
 crates/nu-protocol/Cargo.toml          |   5 +
 crates/nu-protocol/src/eval_const.rs   | 143 ++++++++++++++++---------
 src/config_files.rs                    |   3 +-
 6 files changed, 107 insertions(+), 51 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 49770a9a0d..97f81d5185 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3344,6 +3344,8 @@ dependencies = [
  "chrono",
  "chrono-humanize",
  "convert_case",
+ "dirs",
+ "dirs-sys",
  "fancy-regex",
  "indexmap",
  "log",
@@ -3367,6 +3369,7 @@ dependencies = [
  "tempfile",
  "thiserror",
  "typetag",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 335e2f0384..81602fb4b1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -84,6 +84,7 @@ deunicode = "1.6.0"
 dialoguer = { default-features = false, version = "0.11" }
 digest = { default-features = false, version = "0.10" }
 dirs = "5.0"
+dirs-sys = "0.4"
 dtparse = "2.0"
 encoding_rs = "0.8"
 fancy-regex = "0.13"
@@ -178,6 +179,7 @@ v_htmlescape = "0.15.0"
 wax = "0.6"
 which = "6.0.0"
 windows = "0.54"
+windows-sys = "0.48"
 winreg = "0.52"
 
 [dependencies]
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index 590979251e..aa51e5c9bb 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -833,7 +833,7 @@ fn variables_completions() {
         "plugin-path".into(),
         "startup-time".into(),
         "temp-path".into(),
-        "vendor-autoload-dir".into(),
+        "vendor-autoload-dirs".into(),
     ];
 
     // Match results
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index eaa861a073..ea900bf08d 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -23,6 +23,7 @@ byte-unit = { version = "5.1", features = [ "serde" ] }
 chrono = { workspace = true, features = [ "serde", "std", "unstable-locales" ], default-features = false }
 chrono-humanize = { workspace = true }
 convert_case = { workspace = true }
+dirs = { workspace = true }
 fancy-regex = { workspace = true }
 indexmap = { workspace = true }
 lru = { workspace = true }
@@ -38,6 +39,10 @@ log = { workspace = true }
 [target.'cfg(unix)'.dependencies]
 nix = { workspace = true, default-features = false, features = ["signal"] }
 
+[target.'cfg(windows)'.dependencies]
+dirs-sys = { workspace = true }
+windows-sys = { workspace = true }
+
 [features]
 plugin = [
   "brotli",
diff --git a/crates/nu-protocol/src/eval_const.rs b/crates/nu-protocol/src/eval_const.rs
index cd4780773f..4cb5ccc0f5 100644
--- a/crates/nu-protocol/src/eval_const.rs
+++ b/crates/nu-protocol/src/eval_const.rs
@@ -185,24 +185,15 @@ pub(crate) fn create_nu_constant(engine_state: &EngineState, span: Span) -> Valu
         },
     );
 
-    // Create a system level directory for nushell scripts, modules, completions, etc
-    // that can be changed by setting the NU_VENDOR_AUTOLOAD_DIR env var on any platform
-    // before nushell is compiled OR if NU_VENDOR_AUTOLOAD_DIR is not set for non-windows
-    // systems, the PREFIX env var can be set before compile and used as PREFIX/nushell/vendor/autoload
     record.push(
-        "vendor-autoload-dir",
-        // pseudo code
-        // if env var NU_VENDOR_AUTOLOAD_DIR is set, in any platform, use it
-        // if not, if windows, use ALLUSERPROFILE\nushell\vendor\autoload
-        // if not, if non-windows, if env var PREFIX is set, use PREFIX/share/nushell/vendor/autoload
-        // if not, use the default /usr/share/nushell/vendor/autoload
-
-        // check to see if NU_VENDOR_AUTOLOAD_DIR env var is set, if not, use the default
-        if let Some(path) = get_vendor_autoload_dir(engine_state) {
-            Value::string(path.to_string_lossy(), span)
-        } else {
-            Value::error(ShellError::ConfigDirNotFound { span: Some(span) }, span)
-        },
+        "vendor-autoload-dirs",
+        Value::list(
+            get_vendor_autoload_dirs(engine_state)
+                .iter()
+                .map(|path| Value::string(path.to_string_lossy(), span))
+                .collect(),
+            span,
+        ),
     );
 
     record.push("temp-path", {
@@ -259,39 +250,95 @@ pub(crate) fn create_nu_constant(engine_state: &EngineState, span: Span) -> Valu
     Value::record(record, span)
 }
 
-pub fn get_vendor_autoload_dir(engine_state: &EngineState) -> Option<PathBuf> {
-    // pseudo code
-    // if env var NU_VENDOR_AUTOLOAD_DIR is set, in any platform, use it
-    // if not, if windows, use ALLUSERPROFILE\nushell\vendor\autoload
-    // if not, if non-windows, if env var PREFIX is set, use PREFIX/share/nushell/vendor/autoload
-    // if not, use the default /usr/share/nushell/vendor/autoload
+pub fn get_vendor_autoload_dirs(_engine_state: &EngineState) -> Vec<PathBuf> {
+    // load order for autoload dirs
+    // /Library/Application Support/nushell/vendor/autoload on macOS
+    // <dir>/nushell/vendor/autoload for every dir in XDG_DATA_DIRS in reverse order on platforms other than windows. If XDG_DATA_DIRS is not set, it falls back to <PREFIX>/share if PREFIX ends in local, or <PREFIX>/local/share:<PREFIX>/share otherwise. If PREFIX is not set, fall back to /usr/local/share:/usr/share.
+    // %ProgramData%\nushell\vendor\autoload on windows
+    // NU_VENDOR_AUTOLOAD_DIR from compile time, if env var is set at compile time
+    // if on macOS, additionally check XDG_DATA_HOME, which `dirs` is only doing on Linux
+    // <data_dir>/nushell/vendor/autoload of the current user according to the `dirs` crate
+    // NU_VENDOR_AUTOLOAD_DIR at runtime, if env var is set
 
-    // check to see if NU_VENDOR_AUTOLOAD_DIR env var is set, if not, use the default
-    Some(
-        option_env!("NU_VENDOR_AUTOLOAD_DIR")
-            .map(String::from)
-            .unwrap_or_else(|| {
-                if cfg!(windows) {
-                    let all_user_profile = match engine_state.get_env_var("ALLUSERPROFILE") {
-                        Some(v) => format!(
-                            "{}\\nushell\\vendor\\autoload",
-                            v.coerce_string().unwrap_or("C:\\ProgramData".into())
-                        ),
-                        None => "C:\\ProgramData\\nushell\\vendor\\autoload".into(),
-                    };
-                    all_user_profile
-                } else {
-                    // In non-Windows environments, if NU_VENDOR_AUTOLOAD_DIR is not set
-                    // check to see if PREFIX env var is set, and use it as PREFIX/nushell/vendor/autoload
-                    // otherwise default to /usr/share/nushell/vendor/autoload
-                    option_env!("PREFIX").map(String::from).map_or_else(
-                        || "/usr/local/share/nushell/vendor/autoload".into(),
-                        |prefix| format!("{}/share/nushell/vendor/autoload", prefix),
-                    )
-                }
+    let into_autoload_path_fn = |mut path: PathBuf| {
+        path.push("nushell");
+        path.push("vendor");
+        path.push("autoload");
+        path
+    };
+
+    let mut dirs = Vec::new();
+
+    let mut append_fn = |path: PathBuf| {
+        if !dirs.contains(&path) {
+            dirs.push(path)
+        }
+    };
+
+    #[cfg(target_os = "macos")]
+    std::iter::once("/Library/Application Support")
+        .map(PathBuf::from)
+        .map(into_autoload_path_fn)
+        .for_each(&mut append_fn);
+    #[cfg(unix)]
+    {
+        use std::os::unix::ffi::OsStrExt;
+
+        std::env::var_os("XDG_DATA_DIRS")
+            .or_else(|| {
+                option_env!("PREFIX").map(|prefix| {
+                    if prefix.ends_with("local") {
+                        std::ffi::OsString::from(format!("{prefix}/share"))
+                    } else {
+                        std::ffi::OsString::from(format!("{prefix}/local/share:{prefix}/share"))
+                    }
+                })
             })
-            .into(),
-    )
+            .unwrap_or_else(|| std::ffi::OsString::from("/usr/local/share/:/usr/share/"))
+            .as_encoded_bytes()
+            .split(|b| *b == b':')
+            .map(|split| into_autoload_path_fn(PathBuf::from(std::ffi::OsStr::from_bytes(split))))
+            .rev()
+            .for_each(&mut append_fn);
+    }
+
+    #[cfg(target_os = "windows")]
+    dirs_sys::known_folder(windows_sys::Win32::UI::Shell::FOLDERID_ProgramData)
+        .into_iter()
+        .map(into_autoload_path_fn)
+        .for_each(&mut append_fn);
+
+    option_env!("NU_VENDOR_AUTOLOAD_DIR")
+        .into_iter()
+        .map(PathBuf::from)
+        .for_each(&mut append_fn);
+
+    #[cfg(target_os = "macos")]
+    std::env::var("XDG_DATA_HOME")
+        .ok()
+        .map(PathBuf::from)
+        .or_else(|| {
+            dirs::home_dir().map(|mut home| {
+                home.push(".local");
+                home.push("share");
+                home
+            })
+        })
+        .map(into_autoload_path_fn)
+        .into_iter()
+        .for_each(&mut append_fn);
+
+    dirs::data_dir()
+        .into_iter()
+        .map(into_autoload_path_fn)
+        .for_each(&mut append_fn);
+
+    std::env::var_os("NU_VENDOR_AUTOLOAD_DIR")
+        .into_iter()
+        .map(PathBuf::from)
+        .for_each(&mut append_fn);
+
+    dirs
 }
 
 fn eval_const_call(
diff --git a/src/config_files.rs b/src/config_files.rs
index 30977a6d0e..cf72819600 100644
--- a/src/config_files.rs
+++ b/src/config_files.rs
@@ -200,8 +200,7 @@ pub(crate) fn read_vendor_autoload_files(engine_state: &mut EngineState, stack:
         column!()
     );
 
-    // read and source vendor_autoload_files file if exists
-    if let Some(autoload_dir) = nu_protocol::eval_const::get_vendor_autoload_dir(engine_state) {
+    for autoload_dir in nu_protocol::eval_const::get_vendor_autoload_dirs(engine_state) {
         warn!("read_vendor_autoload_files: {}", autoload_dir.display());
 
         if autoload_dir.exists() {

From aa9a42776bd647c513815a23aa08a1693cdf0f41 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Fri, 19 Jul 2024 05:12:19 -0700
Subject: [PATCH 0248/1072] Make `ast::Call::span()` and `arguments_span()`
 more robust (#13412)

# Description

Trying to help @amtoine out here - the spans calculated by `ast::Call`
by `span()` and `argument_span()` are suspicious and are not properly
guarding against `end` that might be before `start`. Just using
`Span::merge()` / `merge_many()` instead to try to make the behaviour as
simple and consistent as possible. Hopefully then even if the arguments
have some crazy spans, we don't have spans that are just totally
invalid.

# Tests + Formatting
I did check that everything passes with this.
---
 crates/nu-protocol/src/ast/call.rs | 38 +++++-------------------------
 1 file changed, 6 insertions(+), 32 deletions(-)

diff --git a/crates/nu-protocol/src/ast/call.rs b/crates/nu-protocol/src/ast/call.rs
index d26d0af300..0f7b25e21f 100644
--- a/crates/nu-protocol/src/ast/call.rs
+++ b/crates/nu-protocol/src/ast/call.rs
@@ -110,17 +110,11 @@ impl Call {
     /// If there are one or more arguments the span encompasses the start of the first argument to
     /// end of the last argument
     pub fn arguments_span(&self) -> Span {
-        let past = self.head.past();
-
-        let start = self
-            .arguments
-            .first()
-            .map(|a| a.span())
-            .unwrap_or(past)
-            .start;
-        let end = self.arguments.last().map(|a| a.span()).unwrap_or(past).end;
-
-        Span::new(start, end)
+        if self.arguments.is_empty() {
+            self.head.past()
+        } else {
+            Span::merge_many(self.arguments.iter().map(|a| a.span()))
+        }
     }
 
     pub fn named_iter(
@@ -341,27 +335,7 @@ impl Call {
     }
 
     pub fn span(&self) -> Span {
-        let mut span = self.head;
-
-        for positional in self.positional_iter() {
-            if positional.span.end > span.end {
-                span.end = positional.span.end;
-            }
-        }
-
-        for (named, _, val) in self.named_iter() {
-            if named.span.end > span.end {
-                span.end = named.span.end;
-            }
-
-            if let Some(val) = &val {
-                if val.span.end > span.end {
-                    span.end = val.span.end;
-                }
-            }
-        }
-
-        span
+        self.head.merge(self.arguments_span())
     }
 }
 

From dbd60ed4f46fd4abbb675aac83195f8668978b72 Mon Sep 17 00:00:00 2001
From: suimong <bennyyjx@gmail.com>
Date: Sat, 20 Jul 2024 01:55:38 +0800
Subject: [PATCH 0249/1072] Tiny make up to the documentation of `reduce`
 (#13408)

This tiny PR improves the documentation of the `reduce` command by
explicitly stating the direction of reduction, i.e. from left to right,
and adds an example for demonstration.


---------

Co-authored-by: Ben Yang <ben@ya.ng>
---
 crates/nu-command/src/filters/reduce.rs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/filters/reduce.rs b/crates/nu-command/src/filters/reduce.rs
index 87fbe3b23e..824e7709e5 100644
--- a/crates/nu-command/src/filters/reduce.rs
+++ b/crates/nu-command/src/filters/reduce.rs
@@ -36,7 +36,7 @@ impl Command for Reduce {
     }
 
     fn usage(&self) -> &str {
-        "Aggregate a list to a single value using an accumulator closure."
+        "Aggregate a list (starting from the left) to a single value using an accumulator closure."
     }
 
     fn search_terms(&self) -> Vec<&str> {
@@ -50,6 +50,11 @@ impl Command for Reduce {
                 description: "Sum values of a list (same as 'math sum')",
                 result: Some(Value::test_int(10)),
             },
+            Example {
+                example: "[ 1 2 3 4 ] | reduce {|it, acc| $acc - $it }",
+                description: r#"`reduce` accumulates value from left to right, equivalent to (((1 - 2) - 3) - 4)."#,
+                result: Some(Value::test_int(-8)),
+            },
             Example {
                 example:
                     "[ 8 7 6 ] | enumerate | reduce --fold 0 {|it, acc| $acc + $it.item + $it.index }",
@@ -61,6 +66,11 @@ impl Command for Reduce {
                 description: "Sum values with a starting value (fold)",
                 result: Some(Value::test_int(20)),
             },
+            Example {
+                example: r#"[[foo baz] [baz quux]] | reduce --fold "foobar" {|it, acc| $acc | str replace $it.0 $it.1}"#,
+                description: "Iteratively perform string replace (from left to right): 'foobar' -> 'bazbar' -> 'quuxbar'",
+                result: Some(Value::test_string("quuxbar")),
+            },
             Example {
                 example: r#"[ i o t ] | reduce --fold "Arthur, King of the Britons" {|it, acc| $acc | str replace --all $it "X" }"#,
                 description: "Replace selected characters in a string with 'X'",

From 5db57abc7d813c7b0bb56709379ea82a4b85b4eb Mon Sep 17 00:00:00 2001
From: Zoey Hewll <Zoybean@users.noreply.github.com>
Date: Sat, 20 Jul 2024 18:34:27 +0800
Subject: [PATCH 0250/1072] add --quiet flag to `watch` command (#13415)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
Adds a `--quiet` flag to the `watch` command, silencing the message
usually shown when invoking `watch`.

Resolves #13411

As implemented, `--quiet` is orthogonal to `--verbose`. I'm open to
improving the flag's name, behaviour and/or documentation to make it
more user-friendly, as I realise this may be surprising as-is.

```
> watch path {|a b c| echo $a $b $c}
Now watching files at "/home/user/path". Press ctrl+c to abort.
───┬───────────────────────
 0 │ Remove
 1 │ /home/user/path
 2 │
───┴───────────────────────
^C
> watch --quiet path {|a b c| echo $a $b $c}
───┬───────────────────────
 0 │ Remove
 1 │ /home/user/path
 2 │
───┴───────────────────────
^C
```

# User-Facing Changes

Adds `--quiet`/`-q` flag to `watch`, which removes the initial status
message.
---
 crates/nu-command/src/filesystem/watch.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/filesystem/watch.rs b/crates/nu-command/src/filesystem/watch.rs
index c9817de250..e6d86357b8 100644
--- a/crates/nu-command/src/filesystem/watch.rs
+++ b/crates/nu-command/src/filesystem/watch.rs
@@ -61,6 +61,7 @@ impl Command for Watch {
                 "Watch all directories under `<path>` recursively. Will be ignored if `<path>` is a file (default: true)",
                 Some('r'),
             )
+            .switch("quiet", "Hide the initial status message (default: false)", Some('q'))
             .switch("verbose", "Operate in verbose mode (default: false)", Some('v'))
             .category(Category::FileSystem)
     }
@@ -94,6 +95,8 @@ impl Command for Watch {
 
         let verbose = call.has_flag(engine_state, stack, "verbose")?;
 
+        let quiet = call.has_flag(engine_state, stack, "quiet")?;
+
         let debounce_duration_flag: Option<Spanned<i64>> =
             call.get_flag(engine_state, stack, "debounce-ms")?;
         let debounce_duration = match debounce_duration_flag {
@@ -161,7 +164,9 @@ impl Command for Watch {
         // need to cache to make sure that rename event works.
         debouncer.cache().add_root(&path, recursive_mode);
 
-        eprintln!("Now watching files at {path:?}. Press ctrl+c to abort.");
+        if !quiet {
+            eprintln!("Now watching files at {path:?}. Press ctrl+c to abort.");
+        }
 
         let mut closure = ClosureEval::new(engine_state, stack, closure);
 

From 01891d637d7b28cff1985bc3211dc4f544996c64 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Sun, 21 Jul 2024 01:32:36 -0700
Subject: [PATCH 0251/1072] Make parsing for unknown args in known externals
 like normal external calls (#13414)

# Description

This corrects the parsing of unknown arguments provided to known
externals to behave exactly like external arguments passed to normal
external calls.

I've done this by adding a `SyntaxShape::ExternalArgument` which
triggers the same parsing rules.

Because I didn't like how the highlighting looked, I modified the
flattener to emit `ExternalArg` flat shapes for arguments that have that
syntax shape and are plain strings/globs. This is the same behavior that
external calls have.

Aside from passing the tests, I've also checked manually that the
completer seems to work adequately. I can confirm that specified
positional arguments get completion according to their specified type
(including custom completions), and then anything remaining gets
filepath style completion, as you'd expect from an external command.

Thanks to @OJarrisonn for originally finding this issue.

# User-Facing Changes

- Unknown args are now parsed according to their specified syntax shape,
rather than `Any`. This may be a breaking change, though I think it's
extremely unlikely in practice.
- The unspecified arguments of known externals are now highlighted /
flattened identically to normal external arguments, which makes it more
clear how they're being interpreted, and should help the completer
function properly.
- Known externals now have an implicit rest arg if not specified named
`args`, with a syntax shape of `ExternalArgument`.

# Tests + Formatting
Tests added for the new behaviour. Some old tests had to be corrected to
match.

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
- [ ] release notes (bugfix, and debatable whether it's a breaking
change)
---
 crates/nu-parser/src/flatten.rs        | 46 +++++++++++++++++++++--
 crates/nu-parser/src/parse_keywords.rs | 10 +++++
 crates/nu-parser/src/parser.rs         | 51 +++++++++++++++++++++-----
 crates/nu-protocol/src/syntax_shape.rs |  8 ++++
 tests/repl/test_custom_commands.rs     |  8 +++-
 tests/repl/test_known_external.rs      | 36 ++++++++++++++++++
 6 files changed, 144 insertions(+), 15 deletions(-)

diff --git a/crates/nu-parser/src/flatten.rs b/crates/nu-parser/src/flatten.rs
index 8a05edaef4..2f71ccea28 100644
--- a/crates/nu-parser/src/flatten.rs
+++ b/crates/nu-parser/src/flatten.rs
@@ -5,7 +5,7 @@ use nu_protocol::{
         RecordItem,
     },
     engine::StateWorkingSet,
-    DeclId, Span, VarId,
+    DeclId, Span, SyntaxShape, VarId,
 };
 use std::fmt::{Display, Formatter, Result};
 
@@ -166,6 +166,22 @@ fn flatten_pipeline_element_into(
     }
 }
 
+fn flatten_positional_arg_into(
+    working_set: &StateWorkingSet,
+    positional: &Expression,
+    shape: &SyntaxShape,
+    output: &mut Vec<(Span, FlatShape)>,
+) {
+    if matches!(shape, SyntaxShape::ExternalArgument)
+        && matches!(positional.expr, Expr::String(..) | Expr::GlobPattern(..))
+    {
+        // Make known external arguments look more like external arguments
+        output.push((positional.span, FlatShape::ExternalArg));
+    } else {
+        flatten_expression_into(working_set, positional, output)
+    }
+}
+
 fn flatten_expression_into(
     working_set: &StateWorkingSet,
     expr: &Expression,
@@ -249,16 +265,40 @@ fn flatten_expression_into(
             }
         }
         Expr::Call(call) => {
+            let decl = working_set.get_decl(call.decl_id);
+
             if call.head.end != 0 {
                 // Make sure we don't push synthetic calls
                 output.push((call.head, FlatShape::InternalCall(call.decl_id)));
             }
 
+            // Follow positional arguments from the signature.
+            let signature = decl.signature();
+            let mut positional_args = signature
+                .required_positional
+                .iter()
+                .chain(&signature.optional_positional);
+
             let arg_start = output.len();
             for arg in &call.arguments {
                 match arg {
-                    Argument::Positional(positional) | Argument::Unknown(positional) => {
-                        flatten_expression_into(working_set, positional, output)
+                    Argument::Positional(positional) => {
+                        let positional_arg = positional_args.next();
+                        let shape = positional_arg
+                            .or(signature.rest_positional.as_ref())
+                            .map(|arg| &arg.shape)
+                            .unwrap_or(&SyntaxShape::Any);
+
+                        flatten_positional_arg_into(working_set, positional, shape, output)
+                    }
+                    Argument::Unknown(positional) => {
+                        let shape = signature
+                            .rest_positional
+                            .as_ref()
+                            .map(|arg| &arg.shape)
+                            .unwrap_or(&SyntaxShape::Any);
+
+                        flatten_positional_arg_into(working_set, positional, shape, output)
                     }
                     Argument::Named(named) => {
                         if named.0.span.end != 0 {
diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index 4ac1d20699..7c41f8a78d 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -783,6 +783,16 @@ pub fn parse_extern(
                         working_set.get_block_mut(block_id).signature = signature;
                     }
                 } else {
+                    if signature.rest_positional.is_none() {
+                        // Make sure that a known external takes rest args with ExternalArgument
+                        // shape
+                        *signature = signature.rest(
+                            "args",
+                            SyntaxShape::ExternalArgument,
+                            "all other arguments to the command",
+                        );
+                    }
+
                     let decl = KnownExternal {
                         name: external_name,
                         usage,
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index bc48b9bd0c..1fb0aee01d 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -221,6 +221,22 @@ pub(crate) fn check_call(
     }
 }
 
+/// Parses an unknown argument for the given signature. This handles the parsing as appropriate to
+/// the rest type of the command.
+fn parse_unknown_arg(
+    working_set: &mut StateWorkingSet,
+    span: Span,
+    signature: &Signature,
+) -> Expression {
+    let shape = signature
+        .rest_positional
+        .as_ref()
+        .map(|arg| arg.shape.clone())
+        .unwrap_or(SyntaxShape::Any);
+
+    parse_value(working_set, span, &shape)
+}
+
 /// Parses a string in the arg or head position of an external call.
 ///
 /// If the string begins with `r#`, it is parsed as a raw string. If it doesn't contain any quotes
@@ -427,11 +443,7 @@ fn parse_external_string(working_set: &mut StateWorkingSet, span: Span) -> Expre
 fn parse_external_arg(working_set: &mut StateWorkingSet, span: Span) -> ExternalArgument {
     let contents = working_set.get_span_contents(span);
 
-    if contents.starts_with(b"$") || contents.starts_with(b"(") {
-        ExternalArgument::Regular(parse_dollar_expr(working_set, span))
-    } else if contents.starts_with(b"[") {
-        ExternalArgument::Regular(parse_list_expression(working_set, span, &SyntaxShape::Any))
-    } else if contents.len() > 3
+    if contents.len() > 3
         && contents.starts_with(b"...")
         && (contents[3] == b'$' || contents[3] == b'[' || contents[3] == b'(')
     {
@@ -441,7 +453,19 @@ fn parse_external_arg(working_set: &mut StateWorkingSet, span: Span) -> External
             &SyntaxShape::List(Box::new(SyntaxShape::Any)),
         ))
     } else {
-        ExternalArgument::Regular(parse_external_string(working_set, span))
+        ExternalArgument::Regular(parse_regular_external_arg(working_set, span))
+    }
+}
+
+fn parse_regular_external_arg(working_set: &mut StateWorkingSet, span: Span) -> Expression {
+    let contents = working_set.get_span_contents(span);
+
+    if contents.starts_with(b"$") || contents.starts_with(b"(") {
+        parse_dollar_expr(working_set, span)
+    } else if contents.starts_with(b"[") {
+        parse_list_expression(working_set, span, &SyntaxShape::Any)
+    } else {
+        parse_external_string(working_set, span)
     }
 }
 
@@ -998,7 +1022,7 @@ pub fn parse_internal_call(
                 && signature.allows_unknown_args
             {
                 working_set.parse_errors.truncate(starting_error_count);
-                let arg = parse_value(working_set, arg_span, &SyntaxShape::Any);
+                let arg = parse_unknown_arg(working_set, arg_span, &signature);
 
                 call.add_unknown(arg);
             } else {
@@ -1040,7 +1064,7 @@ pub fn parse_internal_call(
                 && signature.allows_unknown_args
             {
                 working_set.parse_errors.truncate(starting_error_count);
-                let arg = parse_value(working_set, arg_span, &SyntaxShape::Any);
+                let arg = parse_unknown_arg(working_set, arg_span, &signature);
 
                 call.add_unknown(arg);
             } else {
@@ -1135,6 +1159,10 @@ pub fn parse_internal_call(
                     call.add_positional(Expression::garbage(working_set, arg_span));
                 } else {
                     let rest_shape = match &signature.rest_positional {
+                        Some(arg) if matches!(arg.shape, SyntaxShape::ExternalArgument) => {
+                            // External args aren't parsed inside lists in spread position.
+                            SyntaxShape::Any
+                        }
                         Some(arg) => arg.shape.clone(),
                         None => SyntaxShape::Any,
                     };
@@ -1196,7 +1224,7 @@ pub fn parse_internal_call(
             call.add_positional(arg);
             positional_idx += 1;
         } else if signature.allows_unknown_args {
-            let arg = parse_value(working_set, arg_span, &SyntaxShape::Any);
+            let arg = parse_unknown_arg(working_set, arg_span, &signature);
 
             call.add_unknown(arg);
         } else {
@@ -4670,7 +4698,8 @@ pub fn parse_value(
             | SyntaxShape::Signature
             | SyntaxShape::Filepath
             | SyntaxShape::String
-            | SyntaxShape::GlobPattern => {}
+            | SyntaxShape::GlobPattern
+            | SyntaxShape::ExternalArgument => {}
             _ => {
                 working_set.error(ParseError::Expected("non-[] value", span));
                 return Expression::garbage(working_set, span);
@@ -4747,6 +4776,8 @@ pub fn parse_value(
             Expression::garbage(working_set, span)
         }
 
+        SyntaxShape::ExternalArgument => parse_regular_external_arg(working_set, span),
+
         SyntaxShape::Any => {
             if bytes.starts_with(b"[") {
                 //parse_value(working_set, span, &SyntaxShape::Table)
diff --git a/crates/nu-protocol/src/syntax_shape.rs b/crates/nu-protocol/src/syntax_shape.rs
index bece58d59a..66bd77ddca 100644
--- a/crates/nu-protocol/src/syntax_shape.rs
+++ b/crates/nu-protocol/src/syntax_shape.rs
@@ -47,6 +47,12 @@ pub enum SyntaxShape {
     /// A general expression, eg `1 + 2` or `foo --bar`
     Expression,
 
+    /// A (typically) string argument that follows external command argument parsing rules.
+    ///
+    /// Filepaths are expanded if unquoted, globs are allowed, and quotes embedded within unknown
+    /// args are unquoted.
+    ExternalArgument,
+
     /// A filepath is allowed
     Filepath,
 
@@ -145,6 +151,7 @@ impl SyntaxShape {
             SyntaxShape::DateTime => Type::Date,
             SyntaxShape::Duration => Type::Duration,
             SyntaxShape::Expression => Type::Any,
+            SyntaxShape::ExternalArgument => Type::Any,
             SyntaxShape::Filepath => Type::String,
             SyntaxShape::Directory => Type::String,
             SyntaxShape::Float => Type::Float,
@@ -238,6 +245,7 @@ impl Display for SyntaxShape {
             SyntaxShape::Signature => write!(f, "signature"),
             SyntaxShape::MatchBlock => write!(f, "match-block"),
             SyntaxShape::Expression => write!(f, "expression"),
+            SyntaxShape::ExternalArgument => write!(f, "external-argument"),
             SyntaxShape::Boolean => write!(f, "bool"),
             SyntaxShape::Error => write!(f, "error"),
             SyntaxShape::CompleterWrapper(x, _) => write!(f, "completable<{x}>"),
diff --git a/tests/repl/test_custom_commands.rs b/tests/repl/test_custom_commands.rs
index 1f36b0e90c..1710b35913 100644
--- a/tests/repl/test_custom_commands.rs
+++ b/tests/repl/test_custom_commands.rs
@@ -186,8 +186,12 @@ fn help_present_in_def() -> TestResult {
 #[test]
 fn help_not_present_in_extern() -> TestResult {
     run_test(
-        "module test {export extern \"git fetch\" []}; use test `git fetch`; help git fetch | ansi strip",
-        "Usage:\n  > git fetch",
+        r#"
+            module test {export extern "git fetch" []};
+            use test `git fetch`;
+            help git fetch | find help | to text | ansi strip
+        "#,
+        "",
     )
 }
 
diff --git a/tests/repl/test_known_external.rs b/tests/repl/test_known_external.rs
index 96ea677d37..c0278cc863 100644
--- a/tests/repl/test_known_external.rs
+++ b/tests/repl/test_known_external.rs
@@ -137,3 +137,39 @@ fn known_external_aliased_subcommand_from_module() -> TestResult {
         String::from_utf8(output.stdout)?.trim(),
     )
 }
+
+#[test]
+fn known_external_arg_expansion() -> TestResult {
+    run_test(
+        r#"
+            extern echo [];
+            echo ~/foo
+        "#,
+        &dirs::home_dir()
+            .expect("can't find home dir")
+            .join("foo")
+            .to_string_lossy(),
+    )
+}
+
+#[test]
+fn known_external_arg_quoted_no_expand() -> TestResult {
+    run_test(
+        r#"
+            extern echo [];
+            echo "~/foo"
+        "#,
+        "~/foo",
+    )
+}
+
+#[test]
+fn known_external_arg_internally_quoted_options() -> TestResult {
+    run_test(
+        r#"
+            extern echo [];
+            echo --option="test"
+        "#,
+        "--option=test",
+    )
+}

From 9ab706db627df18b19eee727c39d6473892de7dd Mon Sep 17 00:00:00 2001
From: Wenbo Chen <wenbo.chen86@gmail.com>
Date: Sun, 21 Jul 2024 20:30:14 +0900
Subject: [PATCH 0252/1072] Fix output format borken in `char --list` (#13417)

# Description

Resolve #13395

When we use the `char --list` command, it also outputs the characters
*bel* and *backspace*, which breaks the table's alignment.
![Screenshot from 2024-07-21
16-10-03](https://github.com/user-attachments/assets/54561cbc-f1a1-4ccd-9561-65dccc939280)
I also found that the behaviour at the beginning of the table is not
correct because of some line change characters, as I mentioned in the
issue discussion.

So, the solution is to create a list containing the characters that do
not need to be output. When the name is in the list, we output the
character as an empty string. Here is the behaviour after fixing.
![Screenshot from 2024-07-21
16-16-08](https://github.com/user-attachments/assets/dd3345a3-6a72-4c90-b331-bc95dc6db66a)
![Screenshot from 2024-07-21
16-16-39](https://github.com/user-attachments/assets/57dc5073-7f8d-40c4-9830-36eba23075e6)
---
 crates/nu-command/src/strings/char_.rs | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/strings/char_.rs b/crates/nu-command/src/strings/char_.rs
index 7737210254..aa987438d2 100644
--- a/crates/nu-command/src/strings/char_.rs
+++ b/crates/nu-command/src/strings/char_.rs
@@ -3,6 +3,7 @@ use nu_engine::command_prelude::*;
 
 use nu_protocol::Signals;
 use once_cell::sync::Lazy;
+use std::collections::HashSet;
 
 // Character used to separate directories in a Path Environment variable on windows is ";"
 #[cfg(target_family = "windows")]
@@ -149,6 +150,24 @@ static CHAR_MAP: Lazy<IndexMap<&'static str, String>> = Lazy::new(|| {
     }
 });
 
+static NO_OUTPUT_CHARS: Lazy<HashSet<&'static str>> = Lazy::new(|| {
+    [
+        // If the character is in the this set, we don't output it to prevent
+        // the broken of `char --list` command table format and alignment.
+        "newline",
+        "enter",
+        "nl",
+        "line_feed",
+        "lf",
+        "cr",
+        "crlf",
+        "bel",
+        "backspace",
+    ]
+    .into_iter()
+    .collect()
+});
+
 impl Command for Char {
     fn name(&self) -> &str {
         "char"
@@ -297,6 +316,11 @@ fn generate_character_list(signals: Signals, call_span: Span) -> PipelineData {
     CHAR_MAP
         .iter()
         .map(move |(name, s)| {
+            let character = if NO_OUTPUT_CHARS.contains(name) {
+                Value::string("", call_span)
+            } else {
+                Value::string(s, call_span)
+            };
             let unicode = Value::string(
                 s.chars()
                     .map(|c| format!("{:x}", c as u32))
@@ -306,7 +330,7 @@ fn generate_character_list(signals: Signals, call_span: Span) -> PipelineData {
             );
             let record = record! {
                 "name" => Value::string(*name, call_span),
-                "character" => Value::string(s, call_span),
+                "character" => character,
                 "unicode" => unicode,
             };
 

From 6fcd09682cbaa1e2b2077e023c5ea351ab3a6f00 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Sun, 21 Jul 2024 21:15:36 +0000
Subject: [PATCH 0253/1072] Fix setting metadata on byte streams (#13416)

# Description
Setting metadata on a byte stream converts it to a list stream. This PR
makes it so that `metadata set` does not alter its input besides the
metadata.

```nushell
open --raw test.json
| metadata set --content-type application/json
| http post https://httpbin.org/post
```
---
 crates/nu-command/src/debug/metadata_set.rs | 40 +++++++++++----------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/crates/nu-command/src/debug/metadata_set.rs b/crates/nu-command/src/debug/metadata_set.rs
index 96f50cfdba..c78a5df5c3 100644
--- a/crates/nu-command/src/debug/metadata_set.rs
+++ b/crates/nu-command/src/debug/metadata_set.rs
@@ -42,32 +42,32 @@ impl Command for MetadataSet {
         engine_state: &EngineState,
         stack: &mut Stack,
         call: &Call,
-        input: PipelineData,
+        mut input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
         let ds_fp: Option<String> = call.get_flag(engine_state, stack, "datasource-filepath")?;
         let ds_ls = call.has_flag(engine_state, stack, "datasource-ls")?;
         let content_type: Option<String> = call.get_flag(engine_state, stack, "content-type")?;
-        let signals = engine_state.signals().clone();
-        let metadata = input
-            .metadata()
-            .clone()
-            .unwrap_or_default()
-            .with_content_type(content_type);
+
+        let mut metadata = match &mut input {
+            PipelineData::Value(_, metadata)
+            | PipelineData::ListStream(_, metadata)
+            | PipelineData::ByteStream(_, metadata) => metadata.take().unwrap_or_default(),
+            PipelineData::Empty => return Err(ShellError::PipelineEmpty { dst_span: head }),
+        };
+
+        if let Some(content_type) = content_type {
+            metadata.content_type = Some(content_type);
+        }
 
         match (ds_fp, ds_ls) {
-            (Some(path), false) => Ok(input.into_pipeline_data_with_metadata(
-                head,
-                signals,
-                metadata.with_data_source(DataSource::FilePath(path.into())),
-            )),
-            (None, true) => Ok(input.into_pipeline_data_with_metadata(
-                head,
-                signals,
-                metadata.with_data_source(DataSource::Ls),
-            )),
-            _ => Ok(input.into_pipeline_data_with_metadata(head, signals, metadata)),
+            (Some(path), false) => metadata.data_source = DataSource::FilePath(path.into()),
+            (None, true) => metadata.data_source = DataSource::Ls,
+            (Some(_), true) => (), // TODO: error here
+            (None, false) => (),
         }
+
+        Ok(input.set_metadata(Some(metadata)))
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -85,7 +85,9 @@ impl Command for MetadataSet {
             Example {
                 description: "Set the metadata of a file path",
                 example: "'crates' | metadata set --content-type text/plain | metadata",
-                result: Some(Value::record(record!("content_type" => Value::string("text/plain", Span::test_data())), Span::test_data())),
+                result: Some(Value::test_record(record! {
+                    "content_type" => Value::test_string("text/plain"),
+                })),
             },
         ]
     }

From 366e52b76dfda146dbc2bbdfda2d710169786d9b Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Sun, 21 Jul 2024 18:42:11 -0500
Subject: [PATCH 0254/1072] Update query web example since wikipedia keeps
 changing (#13421)

# Description

Every so ofter wikipedia changes the column names which breaks the query
example. It would be good to make query web's table extraction to be
smart enough to find tables that are close. This PR fixes the example.

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu_plugin_query/src/query_web.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu_plugin_query/src/query_web.rs b/crates/nu_plugin_query/src/query_web.rs
index 163b320e16..39f50e51af 100644
--- a/crates/nu_plugin_query/src/query_web.rs
+++ b/crates/nu_plugin_query/src/query_web.rs
@@ -76,7 +76,7 @@ pub fn web_examples() -> Vec<Example<'static>> {
         },
         Example {
             example: "http get https://en.wikipedia.org/wiki/List_of_cities_in_India_by_population |
-        query web --as-table [City 'Population(2011)[3]' 'Population(2001)[3][a]' 'State or unionterritory' 'Ref']",
+        query web --as-table [City 'Population(2011)[3]' 'Population(2001)[3][a]' 'State or unionterritory' 'Reference']",
             description: "Retrieve a html table from Wikipedia and parse it into a nushell table using table headers as guides",
             result: None
         },

From 6a62ced645598301d69d6a7c7fd32dd239b8ad9d Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Tue, 23 Jul 2024 15:54:54 -0700
Subject: [PATCH 0255/1072] Updating version for nu-ansi-term and reedline
 (#13432)

Updating nu-answer-term to 0.50.1 and reedline to 0.33
---
 Cargo.lock | 11 ++++++-----
 Cargo.toml |  8 ++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 97f81d5185..ee3faef06d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2913,11 +2913,11 @@ dependencies = [
 
 [[package]]
 name = "nu-ansi-term"
-version = "0.50.0"
+version = "0.50.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd2800e1520bdc966782168a627aa5d1ad92e33b984bf7c7615d31280c83ff14"
+checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5004,8 +5004,9 @@ dependencies = [
 
 [[package]]
 name = "reedline"
-version = "0.32.0"
-source = "git+https://github.com/nushell/reedline?branch=main#480059a3f52cf919341cda88e8c544edd846bc73"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f8c676a3f3814a23c6a0fc9dff6b6c35b2e04df8134aae6f3929cc34de21a53"
 dependencies = [
  "arboard",
  "chrono",
diff --git a/Cargo.toml b/Cargo.toml
index 81602fb4b1..32274816f1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -116,7 +116,7 @@ mockito = { version = "1.4", default-features = false }
 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"
@@ -138,7 +138,7 @@ quote = "1.0"
 rand = "0.8"
 ratatui = "0.26"
 rayon = "1.10"
-reedline = "0.32.0"
+reedline = "0.33.0"
 regex = "1.9.5"
 rmp = "0.8"
 rmp-serde = "1.3"
@@ -305,8 +305,8 @@ 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" }
+# [patch.crates-io]
+# 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`

From a80dfe8e807035ad8d5bb751b385315982e7aad6 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Tue, 23 Jul 2024 16:10:35 -0700
Subject: [PATCH 0256/1072] Bump version to `0.96.0` (#13433)

---
 Cargo.lock                                    | 74 +++++++++----------
 Cargo.toml                                    | 42 +++++------
 crates/nu-cli/Cargo.toml                      | 24 +++---
 crates/nu-cmd-base/Cargo.toml                 | 10 +--
 crates/nu-cmd-extra/Cargo.toml                | 22 +++---
 crates/nu-cmd-lang/Cargo.toml                 | 10 +--
 crates/nu-cmd-plugin/Cargo.toml               | 10 +--
 crates/nu-color-config/Cargo.toml             | 10 +--
 crates/nu-command/Cargo.toml                  | 36 ++++-----
 crates/nu-derive-value/Cargo.toml             |  2 +-
 crates/nu-engine/Cargo.toml                   | 12 +--
 crates/nu-explore/Cargo.toml                  | 18 ++---
 crates/nu-glob/Cargo.toml                     |  2 +-
 crates/nu-json/Cargo.toml                     |  8 +-
 crates/nu-lsp/Cargo.toml                      | 14 ++--
 crates/nu-parser/Cargo.toml                   | 10 +--
 crates/nu-path/Cargo.toml                     |  4 +-
 crates/nu-plugin-core/Cargo.toml              |  6 +-
 crates/nu-plugin-engine/Cargo.toml            | 16 ++--
 crates/nu-plugin-protocol/Cargo.toml          |  6 +-
 crates/nu-plugin-test-support/Cargo.toml      | 18 ++---
 crates/nu-plugin/Cargo.toml                   | 14 ++--
 crates/nu-pretty-hex/Cargo.toml               |  2 +-
 crates/nu-protocol/Cargo.toml                 | 14 ++--
 crates/nu-std/Cargo.toml                      |  8 +-
 crates/nu-system/Cargo.toml                   |  2 +-
 crates/nu-table/Cargo.toml                    | 12 +--
 crates/nu-term-grid/Cargo.toml                |  4 +-
 crates/nu-test-support/Cargo.toml             |  8 +-
 crates/nu-utils/Cargo.toml                    |  2 +-
 .../src/sample_config/default_config.nu       |  4 +-
 .../nu-utils/src/sample_config/default_env.nu |  2 +-
 crates/nu_plugin_custom_values/Cargo.toml     |  6 +-
 crates/nu_plugin_example/Cargo.toml           | 10 +--
 crates/nu_plugin_formats/Cargo.toml           |  8 +-
 crates/nu_plugin_gstat/Cargo.toml             |  6 +-
 crates/nu_plugin_inc/Cargo.toml               |  6 +-
 .../nu_plugin_nu_example.nu                   |  2 +-
 crates/nu_plugin_polars/Cargo.toml            | 22 +++---
 .../nu_plugin_python_example.py               |  4 +-
 crates/nu_plugin_query/Cargo.toml             |  8 +-
 crates/nu_plugin_stress_internals/Cargo.toml  |  2 +-
 crates/nuon/Cargo.toml                        |  8 +-
 43 files changed, 254 insertions(+), 254 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ee3faef06d..6390b32ee3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2868,7 +2868,7 @@ dependencies = [
 
 [[package]]
 name = "nu"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "assert_cmd",
  "crossterm",
@@ -2922,7 +2922,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cli"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "chrono",
  "crossterm",
@@ -2957,7 +2957,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-base"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "indexmap",
  "miette",
@@ -2969,7 +2969,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-extra"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "fancy-regex",
  "heck 0.5.0",
@@ -2994,7 +2994,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-lang"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "itertools 0.12.1",
  "nu-engine",
@@ -3006,7 +3006,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-plugin"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "itertools 0.12.1",
  "nu-engine",
@@ -3017,7 +3017,7 @@ dependencies = [
 
 [[package]]
 name = "nu-color-config"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "nu-ansi-term",
  "nu-engine",
@@ -3029,7 +3029,7 @@ dependencies = [
 
 [[package]]
 name = "nu-command"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "alphanumeric-sort",
  "base64 0.22.1",
@@ -3139,7 +3139,7 @@ dependencies = [
 
 [[package]]
 name = "nu-derive-value"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "convert_case",
  "proc-macro-error",
@@ -3150,7 +3150,7 @@ dependencies = [
 
 [[package]]
 name = "nu-engine"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "log",
  "nu-glob",
@@ -3161,7 +3161,7 @@ dependencies = [
 
 [[package]]
 name = "nu-explore"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "ansi-str",
  "anyhow",
@@ -3186,14 +3186,14 @@ dependencies = [
 
 [[package]]
 name = "nu-glob"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "doc-comment",
 ]
 
 [[package]]
 name = "nu-json"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "fancy-regex",
  "linked-hash-map",
@@ -3206,7 +3206,7 @@ dependencies = [
 
 [[package]]
 name = "nu-lsp"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "assert-json-diff",
  "crossbeam-channel",
@@ -3227,7 +3227,7 @@ dependencies = [
 
 [[package]]
 name = "nu-parser"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "bytesize",
  "chrono",
@@ -3243,7 +3243,7 @@ dependencies = [
 
 [[package]]
 name = "nu-path"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "dirs",
  "omnipath",
@@ -3252,7 +3252,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "log",
  "nix",
@@ -3268,7 +3268,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-core"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "interprocess",
  "log",
@@ -3282,7 +3282,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-engine"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "log",
  "nu-engine",
@@ -3298,7 +3298,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-protocol"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "bincode",
  "nu-protocol",
@@ -3310,7 +3310,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-test-support"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "nu-ansi-term",
  "nu-cmd-lang",
@@ -3328,7 +3328,7 @@ dependencies = [
 
 [[package]]
 name = "nu-pretty-hex"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "heapless",
  "nu-ansi-term",
@@ -3337,7 +3337,7 @@ dependencies = [
 
 [[package]]
 name = "nu-protocol"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "brotli",
  "byte-unit",
@@ -3374,7 +3374,7 @@ dependencies = [
 
 [[package]]
 name = "nu-std"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "log",
  "miette",
@@ -3385,7 +3385,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "chrono",
  "itertools 0.12.1",
@@ -3403,7 +3403,7 @@ dependencies = [
 
 [[package]]
 name = "nu-table"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "fancy-regex",
  "nu-ansi-term",
@@ -3417,7 +3417,7 @@ dependencies = [
 
 [[package]]
 name = "nu-term-grid"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "nu-utils",
  "unicode-width",
@@ -3425,7 +3425,7 @@ dependencies = [
 
 [[package]]
 name = "nu-test-support"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -3437,7 +3437,7 @@ dependencies = [
 
 [[package]]
 name = "nu-utils"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "crossterm_winapi",
  "log",
@@ -3463,7 +3463,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_example"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "nu-cmd-lang",
  "nu-plugin",
@@ -3473,7 +3473,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_formats"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "eml-parser",
  "ical",
@@ -3486,7 +3486,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_gstat"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "git2",
  "nu-plugin",
@@ -3495,7 +3495,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_inc"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -3504,7 +3504,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_polars"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "chrono",
  "chrono-tz 0.9.0",
@@ -3538,7 +3538,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_query"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "gjson",
  "nu-plugin",
@@ -3553,7 +3553,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_stress_internals"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "interprocess",
  "serde",
@@ -3679,7 +3679,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "nuon"
-version = "0.95.1"
+version = "0.96.0"
 dependencies = [
  "chrono",
  "fancy-regex",
diff --git a/Cargo.toml b/Cargo.toml
index 32274816f1..8397c2ca46 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
 rust-version = "1.77.2"
-version = "0.95.1"
+version = "0.96.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -183,22 +183,22 @@ windows-sys = "0.48"
 winreg = "0.52"
 
 [dependencies]
-nu-cli = { path = "./crates/nu-cli", version = "0.95.1" }
-nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.95.1" }
-nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.95.1" }
-nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.95.1", optional = true }
-nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.95.1" }
-nu-command = { path = "./crates/nu-command", version = "0.95.1" }
-nu-engine = { path = "./crates/nu-engine", version = "0.95.1" }
-nu-explore = { path = "./crates/nu-explore", version = "0.95.1" }
-nu-lsp = { path = "./crates/nu-lsp/", version = "0.95.1" }
-nu-parser = { path = "./crates/nu-parser", version = "0.95.1" }
-nu-path = { path = "./crates/nu-path", version = "0.95.1" }
-nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.95.1" }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.95.1" }
-nu-std = { path = "./crates/nu-std", version = "0.95.1" }
-nu-system = { path = "./crates/nu-system", version = "0.95.1" }
-nu-utils = { path = "./crates/nu-utils", version = "0.95.1" }
+nu-cli = { path = "./crates/nu-cli", version = "0.96.0" }
+nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.96.0" }
+nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.96.0" }
+nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.96.0", optional = true }
+nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.96.0" }
+nu-command = { path = "./crates/nu-command", version = "0.96.0" }
+nu-engine = { path = "./crates/nu-engine", version = "0.96.0" }
+nu-explore = { path = "./crates/nu-explore", version = "0.96.0" }
+nu-lsp = { path = "./crates/nu-lsp/", version = "0.96.0" }
+nu-parser = { path = "./crates/nu-parser", version = "0.96.0" }
+nu-path = { path = "./crates/nu-path", version = "0.96.0" }
+nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.96.0" }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.96.0" }
+nu-std = { path = "./crates/nu-std", version = "0.96.0" }
+nu-system = { path = "./crates/nu-system", version = "0.96.0" }
+nu-utils = { path = "./crates/nu-utils", version = "0.96.0" }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
 crossterm = { workspace = true }
@@ -227,9 +227,9 @@ nix = { workspace = true, default-features = false, features = [
 ] }
 
 [dev-dependencies]
-nu-test-support = { path = "./crates/nu-test-support", version = "0.95.1" }
-nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.95.1" }
-nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.95.1" }
+nu-test-support = { path = "./crates/nu-test-support", version = "0.96.0" }
+nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.96.0" }
+nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.96.0" }
 assert_cmd = "2.0"
 dirs = { workspace = true }
 tango-bench = "0.5"
@@ -313,4 +313,4 @@ bench = false
 # Run individual benchmarks like `cargo bench -- <regex>` e.g. `cargo bench -- parse`
 [[bench]]
 name = "benchmarks"
-harness = false
+harness = false
\ No newline at end of file
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 2ed504d502..6baafda789 100644
--- 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.1"
+version = "0.96.0"
 
 [lib]
 bench = false
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.1" }
-nu-command = { path = "../nu-command", version = "0.95.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.95.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.0" }
+nu-command = { path = "../nu-command", version = "0.96.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.96.0" }
 rstest = { workspace = true, default-features = false }
 tempfile = { workspace = true }
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.95.1" }
-nu-engine = { path = "../nu-engine", version = "0.95.1" }
-nu-path = { path = "../nu-path", version = "0.95.1" }
-nu-parser = { path = "../nu-parser", version = "0.95.1" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.95.1", optional = true }
-nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
-nu-utils = { path = "../nu-utils", version = "0.95.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.95.1" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.96.0" }
+nu-engine = { path = "../nu-engine", version = "0.96.0" }
+nu-path = { path = "../nu-path", version = "0.96.0" }
+nu-parser = { path = "../nu-parser", version = "0.96.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.96.0", optional = true }
+nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
+nu-utils = { path = "../nu-utils", version = "0.96.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.96.0" }
 nu-ansi-term = { workspace = true }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
diff --git a/crates/nu-cmd-base/Cargo.toml b/crates/nu-cmd-base/Cargo.toml
index 2fe8610f49..031636adfc 100644
--- 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.1"
+version = "0.96.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.1" }
-nu-parser = { path = "../nu-parser", version = "0.95.1" }
-nu-path = { path = "../nu-path", version = "0.95.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
+nu-engine = { path = "../nu-engine", version = "0.96.0" }
+nu-parser = { path = "../nu-parser", version = "0.96.0" }
+nu-path = { path = "../nu-path", version = "0.96.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
 
 indexmap = { workspace = true }
 miette = { workspace = true }
diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml
index 8609adb44c..2b26a962de 100644
--- 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.1"
+version = "0.96.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,13 +13,13 @@ version = "0.95.1"
 bench = false
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.95.1" }
-nu-engine = { path = "../nu-engine", version = "0.95.1" }
-nu-json = { version = "0.95.1", path = "../nu-json" }
-nu-parser = { path = "../nu-parser", version = "0.95.1" }
-nu-pretty-hex = { version = "0.95.1", path = "../nu-pretty-hex" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
-nu-utils = { path = "../nu-utils", version = "0.95.1" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.96.0" }
+nu-engine = { path = "../nu-engine", version = "0.96.0" }
+nu-json = { version = "0.96.0", path = "../nu-json" }
+nu-parser = { path = "../nu-parser", version = "0.96.0" }
+nu-pretty-hex = { version = "0.96.0", path = "../nu-pretty-hex" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
+nu-utils = { path = "../nu-utils", version = "0.96.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.1" }
-nu-command = { path = "../nu-command", version = "0.95.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.95.1" }
\ No newline at end of file
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.0" }
+nu-command = { path = "../nu-command", version = "0.96.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.96.0" }
\ No newline at end of file
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index 16ac1b893a..5a9d552cba 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -6,16 +6,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-lang"
 edition = "2021"
 license = "MIT"
 name = "nu-cmd-lang"
-version = "0.95.1"
+version = "0.96.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.95.1" }
-nu-parser = { path = "../nu-parser", version = "0.95.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
-nu-utils = { path = "../nu-utils", version = "0.95.1" }
+nu-engine = { path = "../nu-engine", version = "0.96.0" }
+nu-parser = { path = "../nu-parser", version = "0.96.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
+nu-utils = { path = "../nu-utils", version = "0.96.0" }
 
 itertools = { workspace = true }
 shadow-rs = { version = "0.29", default-features = false }
diff --git a/crates/nu-cmd-plugin/Cargo.toml b/crates/nu-cmd-plugin/Cargo.toml
index 7d26fe5ddd..a73d4eef89 100644
--- a/crates/nu-cmd-plugin/Cargo.toml
+++ b/crates/nu-cmd-plugin/Cargo.toml
@@ -5,15 +5,15 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-plugin"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-plugin"
-version = "0.95.1"
+version = "0.96.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.1" }
-nu-path = { path = "../nu-path", version = "0.95.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.1", features = ["plugin"] }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.95.1" }
+nu-engine = { path = "../nu-engine", version = "0.96.0" }
+nu-path = { path = "../nu-path", version = "0.96.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.0", features = ["plugin"] }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.96.0" }
 
 itertools = { workspace = true }
 
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index 23af09432c..f3e977f3ab 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -5,18 +5,18 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-color-confi
 edition = "2021"
 license = "MIT"
 name = "nu-color-config"
-version = "0.95.1"
+version = "0.96.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
-nu-engine = { path = "../nu-engine", version = "0.95.1" }
-nu-json = { path = "../nu-json", version = "0.95.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
+nu-engine = { path = "../nu-engine", version = "0.96.0" }
+nu-json = { path = "../nu-json", version = "0.96.0" }
 nu-ansi-term = { workspace = true }
 
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.95.1" }
\ No newline at end of file
+nu-test-support = { path = "../nu-test-support", version = "0.96.0" }
\ No newline at end of file
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index ea501578b6..f3805dac5a 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-command"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
-version = "0.95.1"
+version = "0.96.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,21 +13,21 @@ version = "0.95.1"
 bench = false
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.95.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.95.1" }
-nu-engine = { path = "../nu-engine", version = "0.95.1" }
-nu-glob = { path = "../nu-glob", version = "0.95.1" }
-nu-json = { path = "../nu-json", version = "0.95.1" }
-nu-parser = { path = "../nu-parser", version = "0.95.1" }
-nu-path = { path = "../nu-path", version = "0.95.1" }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.95.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
-nu-system = { path = "../nu-system", version = "0.95.1" }
-nu-table = { path = "../nu-table", version = "0.95.1" }
-nu-term-grid = { path = "../nu-term-grid", version = "0.95.1" }
-nu-utils = { path = "../nu-utils", version = "0.95.1" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.96.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.96.0" }
+nu-engine = { path = "../nu-engine", version = "0.96.0" }
+nu-glob = { path = "../nu-glob", version = "0.96.0" }
+nu-json = { path = "../nu-json", version = "0.96.0" }
+nu-parser = { path = "../nu-parser", version = "0.96.0" }
+nu-path = { path = "../nu-path", version = "0.96.0" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.96.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
+nu-system = { path = "../nu-system", version = "0.96.0" }
+nu-table = { path = "../nu-table", version = "0.96.0" }
+nu-term-grid = { path = "../nu-term-grid", version = "0.96.0" }
+nu-utils = { path = "../nu-utils", version = "0.96.0" }
 nu-ansi-term = { workspace = true }
-nuon = { path = "../nuon", version = "0.95.1" }
+nuon = { path = "../nuon", version = "0.96.0" }
 
 alphanumeric-sort = { workspace = true }
 base64 = { workspace = true }
@@ -137,8 +137,8 @@ sqlite = ["rusqlite"]
 trash-support = ["trash"]
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.95.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.96.0" }
 
 dirs = { workspace = true }
 mockito = { workspace = true, default-features = false }
@@ -146,4 +146,4 @@ quickcheck = { workspace = true }
 quickcheck_macros = { workspace = true }
 rstest = { workspace = true, default-features = false }
 pretty_assertions = { workspace = true }
-tempfile = { workspace = true }
+tempfile = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-derive-value/Cargo.toml b/crates/nu-derive-value/Cargo.toml
index 50ca5d2407..3ce0f00ed5 100644
--- a/crates/nu-derive-value/Cargo.toml
+++ b/crates/nu-derive-value/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-derive-value"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-derive-value"
-version = "0.95.1"
+version = "0.96.0"
 
 [lib]
 proc-macro = true
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index c416a2f590..89ff80cf80 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-engine"
 edition = "2021"
 license = "MIT"
 name = "nu-engine"
-version = "0.95.1"
+version = "0.96.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.95.1" }
-nu-path = { path = "../nu-path", version = "0.95.1" }
-nu-glob = { path = "../nu-glob", version = "0.95.1" }
-nu-utils = { path = "../nu-utils", version = "0.95.1" }
+nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.96.0" }
+nu-path = { path = "../nu-path", version = "0.96.0" }
+nu-glob = { path = "../nu-glob", version = "0.96.0" }
+nu-utils = { path = "../nu-utils", version = "0.96.0" }
 log = { workspace = true }
 
 [features]
-plugin = []
+plugin = []
\ No newline at end of file
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index 6d0816ee3e..df728365a7 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -5,21 +5,21 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-explore"
 edition = "2021"
 license = "MIT"
 name = "nu-explore"
-version = "0.95.1"
+version = "0.96.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
-nu-parser = { path = "../nu-parser", version = "0.95.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.95.1" }
-nu-engine = { path = "../nu-engine", version = "0.95.1" }
-nu-table = { path = "../nu-table", version = "0.95.1" }
-nu-json = { path = "../nu-json", version = "0.95.1" }
-nu-utils = { path = "../nu-utils", version = "0.95.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
+nu-parser = { path = "../nu-parser", version = "0.96.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.96.0" }
+nu-engine = { path = "../nu-engine", version = "0.96.0" }
+nu-table = { path = "../nu-table", version = "0.96.0" }
+nu-json = { path = "../nu-json", version = "0.96.0" }
+nu-utils = { path = "../nu-utils", version = "0.96.0" }
 nu-ansi-term = { workspace = true }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.95.1" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.96.0" }
 
 anyhow = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-glob/Cargo.toml b/crates/nu-glob/Cargo.toml
index 932958910c..242affbdcc 100644
--- a/crates/nu-glob/Cargo.toml
+++ b/crates/nu-glob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-glob"
-version = "0.95.1"
+version = "0.96.0"
 authors = ["The Nushell Project Developers", "The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 description = """
diff --git a/crates/nu-json/Cargo.toml b/crates/nu-json/Cargo.toml
index a3b61042b1..bd73655ae5 100644
--- a/crates/nu-json/Cargo.toml
+++ b/crates/nu-json/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-json"
 edition = "2021"
 license = "MIT"
 name = "nu-json"
-version = "0.95.1"
+version = "0.96.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -26,7 +26,7 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.95.1" }
-nu-path = { path = "../nu-path", version = "0.95.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.96.0" }
+nu-path = { path = "../nu-path", version = "0.96.0" }
 serde_json = "1.0"
-fancy-regex = "0.13.0"
+fancy-regex = "0.13.0"
\ No newline at end of file
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index 0f9ef01e69..4ebe937960 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -3,14 +3,14 @@ authors = ["The Nushell Project Developers"]
 description = "Nushell's integrated LSP server"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-lsp"
 name = "nu-lsp"
-version = "0.95.1"
+version = "0.96.0"
 edition = "2021"
 license = "MIT"
 
 [dependencies]
-nu-cli = { path = "../nu-cli", version = "0.95.1" }
-nu-parser = { path = "../nu-parser", version = "0.95.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
+nu-cli = { path = "../nu-cli", version = "0.96.0" }
+nu-parser = { path = "../nu-parser", version = "0.96.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
 
 reedline = { workspace = true }
 
@@ -23,8 +23,8 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.1" }
-nu-command = { path = "../nu-command", version = "0.95.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.95.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.0" }
+nu-command = { path = "../nu-command", version = "0.96.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.96.0" }
 
 assert-json-diff = "2.0"
\ No newline at end of file
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index b06e81387d..d8f978620d 100644
--- a/crates/nu-parser/Cargo.toml
+++ b/crates/nu-parser/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-parser"
 edition = "2021"
 license = "MIT"
 name = "nu-parser"
-version = "0.95.1"
+version = "0.96.0"
 exclude = ["/fuzz"]
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.95.1" }
-nu-path = { path = "../nu-path", version = "0.95.1" }
-nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.95.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
+nu-engine = { path = "../nu-engine", version = "0.96.0" }
+nu-path = { path = "../nu-path", version = "0.96.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.96.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
 
 bytesize = { workspace = true }
 chrono = { default-features = false, features = ['std'], workspace = true }
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index 62908e7cb7..7bddfd309f 100644
--- a/crates/nu-path/Cargo.toml
+++ b/crates/nu-path/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-path"
 edition = "2021"
 license = "MIT"
 name = "nu-path"
-version = "0.95.1"
+version = "0.96.0"
 exclude = ["/fuzz"]
 
 [lib]
@@ -18,4 +18,4 @@ dirs = { workspace = true }
 omnipath = { workspace = true }
 
 [target.'cfg(all(unix, not(target_os = "macos"), not(target_os = "android")))'.dependencies]
-pwd = { workspace = true }
+pwd = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-plugin-core/Cargo.toml b/crates/nu-plugin-core/Cargo.toml
index 48aee13276..3b9e8b63ca 100644
--- a/crates/nu-plugin-core/Cargo.toml
+++ b/crates/nu-plugin-core/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-core
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-core"
-version = "0.95.1"
+version = "0.96.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.95.1", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.96.0", default-features = false }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true }
diff --git a/crates/nu-plugin-engine/Cargo.toml b/crates/nu-plugin-engine/Cargo.toml
index a6dfa471b8..585e28de47 100644
--- a/crates/nu-plugin-engine/Cargo.toml
+++ b/crates/nu-plugin-engine/Cargo.toml
@@ -5,18 +5,18 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-engi
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-engine"
-version = "0.95.1"
+version = "0.96.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.95.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
-nu-system = { path = "../nu-system", version = "0.95.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.95.1" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.95.1", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.95.1" }
+nu-engine = { path = "../nu-engine", version = "0.96.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
+nu-system = { path = "../nu-system", version = "0.96.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.96.0" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.96.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.96.0" }
 
 serde = { workspace = true }
 log = { workspace = true }
@@ -32,4 +32,4 @@ local-socket = ["nu-plugin-core/local-socket"]
 windows = { workspace = true, features = [
   # For setting process creation flags
   "Win32_System_Threading",
-] }
+] }
\ No newline at end of file
diff --git a/crates/nu-plugin-protocol/Cargo.toml b/crates/nu-plugin-protocol/Cargo.toml
index 939f164786..feb6c51b64 100644
--- a/crates/nu-plugin-protocol/Cargo.toml
+++ b/crates/nu-plugin-protocol/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-prot
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-protocol"
-version = "0.95.1"
+version = "0.96.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.95.1", features = ["plugin"] }
-nu-utils = { path = "../nu-utils", version = "0.95.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.0", features = ["plugin"] }
+nu-utils = { path = "../nu-utils", version = "0.96.0" }
 
 bincode = "1.3"
 serde = { workspace = true, features = ["derive"] }
diff --git a/crates/nu-plugin-test-support/Cargo.toml b/crates/nu-plugin-test-support/Cargo.toml
index efc76c3b93..e12fc28823 100644
--- a/crates/nu-plugin-test-support/Cargo.toml
+++ b/crates/nu-plugin-test-support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-plugin-test-support"
-version = "0.95.1"
+version = "0.96.0"
 edition = "2021"
 license = "MIT"
 description = "Testing support for Nushell plugins"
@@ -12,14 +12,14 @@ bench = false
 # 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.1", features = ["plugin"] }
-nu-protocol = { path = "../nu-protocol", version = "0.95.1", features = ["plugin"] }
-nu-parser = { path = "../nu-parser", version = "0.95.1", features = ["plugin"] }
-nu-plugin = { path = "../nu-plugin", version = "0.95.1" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.95.1" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.95.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.95.1" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.1" }
+nu-engine = { path = "../nu-engine", version = "0.96.0", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.96.0", features = ["plugin"] }
+nu-parser = { path = "../nu-parser", version = "0.96.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.96.0" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.96.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.96.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.96.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.0" }
 nu-ansi-term = { workspace = true }
 similar = "2.5"
 
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index d46a3cc9cb..3b06f37fae 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin"
 edition = "2021"
 license = "MIT"
 name = "nu-plugin"
-version = "0.95.1"
+version = "0.96.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.95.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.95.1" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.95.1", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.95.1" }
+nu-engine = { path = "../nu-engine", version = "0.96.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.96.0" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.96.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.96.0" }
 
 log = { workspace = true }
 thiserror = "1.0"
@@ -30,4 +30,4 @@ local-socket = ["nu-plugin-core/local-socket"]
 
 [target.'cfg(target_family = "unix")'.dependencies]
 # For setting the process group ID (EnterForeground / LeaveForeground)
-nix = { workspace = true, default-features = false, features = ["process"] }
+nix = { workspace = true, default-features = false, features = ["process"] }
\ No newline at end of file
diff --git a/crates/nu-pretty-hex/Cargo.toml b/crates/nu-pretty-hex/Cargo.toml
index cd3c3502a4..e2f21d322b 100644
--- a/crates/nu-pretty-hex/Cargo.toml
+++ b/crates/nu-pretty-hex/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-pretty-hex"
 edition = "2021"
 license = "MIT"
 name = "nu-pretty-hex"
-version = "0.95.1"
+version = "0.96.0"
 
 [lib]
 doctest = false
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index ea900bf08d..467c4a21f7 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-protocol"
 edition = "2021"
 license = "MIT"
 name = "nu-protocol"
-version = "0.95.1"
+version = "0.96.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,10 +13,10 @@ version = "0.95.1"
 bench = false
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.95.1" }
-nu-path = { path = "../nu-path", version = "0.95.1" }
-nu-system = { path = "../nu-system", version = "0.95.1" }
-nu-derive-value = { path = "../nu-derive-value", version = "0.95.1" }
+nu-utils = { path = "../nu-utils", version = "0.96.0" }
+nu-path = { path = "../nu-path", version = "0.96.0" }
+nu-system = { path = "../nu-system", version = "0.96.0" }
+nu-derive-value = { path = "../nu-derive-value", version = "0.96.0" }
 
 brotli = { workspace = true, optional = true }
 byte-unit = { version = "5.1", features = [ "serde" ] }
@@ -53,11 +53,11 @@ plugin = [
 serde_json = { workspace = true }
 strum = "0.26"
 strum_macros = "0.26"
-nu-test-support = { path = "../nu-test-support", version = "0.95.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.96.0" }
 pretty_assertions = { workspace = true }
 rstest = { workspace = true }
 tempfile = { workspace = true }
 os_pipe = { workspace = true }
 
 [package.metadata.docs.rs]
-all-features = true
+all-features = true
\ No newline at end of file
diff --git a/crates/nu-std/Cargo.toml b/crates/nu-std/Cargo.toml
index 9ee4113e96..408b1e0303 100644
--- a/crates/nu-std/Cargo.toml
+++ b/crates/nu-std/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-std"
 edition = "2021"
 license = "MIT"
 name = "nu-std"
-version = "0.95.1"
+version = "0.96.0"
 
 [dependencies]
-nu-parser = { version = "0.95.1", path = "../nu-parser" }
-nu-protocol = { version = "0.95.1", path = "../nu-protocol" }
-nu-engine = { version = "0.95.1", path = "../nu-engine" }
+nu-parser = { version = "0.96.0", path = "../nu-parser" }
+nu-protocol = { version = "0.96.0", path = "../nu-protocol" }
+nu-engine = { version = "0.96.0", path = "../nu-engine" }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
 
 log = "0.4"
\ No newline at end of file
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index 19ab1259fb..d4d6f77e9b 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["The Nushell Project Developers", "procs creators"]
 description = "Nushell system querying"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-system"
 name = "nu-system"
-version = "0.95.1"
+version = "0.96.0"
 edition = "2021"
 license = "MIT"
 
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index 9f00c4d1fd..982fd08369 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -5,20 +5,20 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-table"
 edition = "2021"
 license = "MIT"
 name = "nu-table"
-version = "0.95.1"
+version = "0.96.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
-nu-utils = { path = "../nu-utils", version = "0.95.1" }
-nu-engine = { path = "../nu-engine", version = "0.95.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.95.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
+nu-utils = { path = "../nu-utils", version = "0.96.0" }
+nu-engine = { path = "../nu-engine", version = "0.96.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.96.0" }
 nu-ansi-term = { workspace = true }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 tabled = { workspace = true, features = ["color"], default-features = false }
 
 [dev-dependencies]
-# nu-test-support = { path="../nu-test-support", version = "0.95.1"  }
\ No newline at end of file
+# nu-test-support = { path="../nu-test-support", version = "0.96.0"  }
\ No newline at end of file
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index 0229f1f0f0..0be10b4ef1 100644
--- a/crates/nu-term-grid/Cargo.toml
+++ b/crates/nu-term-grid/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-term-grid"
 edition = "2021"
 license = "MIT"
 name = "nu-term-grid"
-version = "0.95.1"
+version = "0.96.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.95.1" }
+nu-utils = { path = "../nu-utils", version = "0.96.0" }
 
 unicode-width = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml
index 1b5f5df7ba..c41bf6b8a2 100644
--- a/crates/nu-test-support/Cargo.toml
+++ b/crates/nu-test-support/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-test-suppor
 edition = "2021"
 license = "MIT"
 name = "nu-test-support"
-version = "0.95.1"
+version = "0.96.0"
 
 [lib]
 doctest = false
 bench = false
 
 [dependencies]
-nu-path = { path = "../nu-path", version = "0.95.1" }
-nu-glob = { path = "../nu-glob", version = "0.95.1" }
-nu-utils = { path = "../nu-utils", version = "0.95.1" }
+nu-path = { path = "../nu-path", version = "0.96.0" }
+nu-glob = { path = "../nu-glob", version = "0.96.0" }
+nu-utils = { path = "../nu-utils", version = "0.96.0" }
 
 num-format = { workspace = true }
 which = { workspace = true }
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index 60b4cb21aa..aa9f591a2d 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-utils"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-utils"
-version = "0.95.1"
+version = "0.96.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index 3c3e57fa95..dda33cace0 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -1,6 +1,6 @@
 # Nushell Config File
 #
-# version = "0.95.1"
+# version = "0.96.0"
 
 # For more information on defining custom themes, see
 # https://www.nushell.sh/book/coloring_and_theming.html
@@ -889,4 +889,4 @@ $env.config = {
             event: { edit: selectall }
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/crates/nu-utils/src/sample_config/default_env.nu b/crates/nu-utils/src/sample_config/default_env.nu
index a686f6f99a..5d6cab2687 100644
--- a/crates/nu-utils/src/sample_config/default_env.nu
+++ b/crates/nu-utils/src/sample_config/default_env.nu
@@ -1,6 +1,6 @@
 # Nushell Environment Config File
 #
-# version = "0.95.1"
+# version = "0.96.0"
 
 def create_left_prompt [] {
     let dir = match (do --ignore-shell-errors { $env.PWD | path relative-to $nu.home-path }) {
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index e5f8951429..c3f3a7cec1 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -10,10 +10,10 @@ name = "nu_plugin_custom_values"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.95.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.96.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.0", features = ["plugin"] }
 serde = { workspace = true, default-features = false }
 typetag = "0.2"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.95.1" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.96.0" }
\ No newline at end of file
diff --git a/crates/nu_plugin_example/Cargo.toml b/crates/nu_plugin_example/Cargo.toml
index 08ba3e1566..9df31e46b6 100644
--- a/crates/nu_plugin_example/Cargo.toml
+++ b/crates/nu_plugin_example/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_exam
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_example"
-version = "0.95.1"
+version = "0.96.0"
 
 [[bin]]
 name = "nu_plugin_example"
@@ -15,9 +15,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.95.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.96.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.0", features = ["plugin"] }
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.95.1" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.1" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.96.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.0" }
\ No newline at end of file
diff --git a/crates/nu_plugin_formats/Cargo.toml b/crates/nu_plugin_formats/Cargo.toml
index 29e8953f24..535cd69c17 100644
--- a/crates/nu_plugin_formats/Cargo.toml
+++ b/crates/nu_plugin_formats/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_form
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_formats"
-version = "0.95.1"
+version = "0.96.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.95.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.96.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.0", features = ["plugin"] }
 
 indexmap = { workspace = true }
 eml-parser = "0.1"
@@ -18,4 +18,4 @@ ical = "0.11"
 rust-ini = "0.21.0"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.95.1" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.96.0" }
\ No newline at end of file
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index da1c13a88e..6a7d6411c8 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gsta
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_gstat"
-version = "0.95.1"
+version = "0.96.0"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_gstat"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.95.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.96.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
 
 git2 = "0.19"
\ No newline at end of file
diff --git a/crates/nu_plugin_inc/Cargo.toml b/crates/nu_plugin_inc/Cargo.toml
index 0479a47843..4b3f63345b 100644
--- a/crates/nu_plugin_inc/Cargo.toml
+++ b/crates/nu_plugin_inc/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_inc"
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_inc"
-version = "0.95.1"
+version = "0.96.0"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_inc"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.95.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.96.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.0", features = ["plugin"] }
 
 semver = "1.0"
\ No newline at end of file
diff --git a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
index d19cd36c14..75069e27e3 100755
--- a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
+++ b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
@@ -6,7 +6,7 @@
 # it also allows us to test the plugin interface with something manually implemented in a scripting
 # language without adding any extra dependencies to our tests.
 
-const NUSHELL_VERSION = "0.95.1"
+const NUSHELL_VERSION = "0.96.0"
 const PLUGIN_VERSION = "0.1.0" # bump if you change commands!
 
 def main [--stdio] {
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 99c88e47d6..40ce054ecd 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu_plugin_polars"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_polars"
-version = "0.95.1"
+version = "0.96.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -17,10 +17,10 @@ bench = false
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
-nu-plugin = { path = "../nu-plugin", version = "0.95.1" }
-nu-path = { path = "../nu-path", version = "0.95.1" }
-nu-utils = { path = "../nu-utils", version = "0.95.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
+nu-plugin = { path = "../nu-plugin", version = "0.96.0" }
+nu-path = { path = "../nu-path", version = "0.96.0" }
+nu-utils = { path = "../nu-utils", version = "0.96.0" }
 
 # Potential dependencies for extras
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
@@ -76,9 +76,9 @@ optional = false
 version = "0.41"
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.1" }
-nu-engine = { path = "../nu-engine", version = "0.95.1" }
-nu-parser = { path = "../nu-parser", version = "0.95.1" }
-nu-command = { path = "../nu-command", version = "0.95.1" }
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.95.1" }
-tempfile.workspace = true
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.0" }
+nu-engine = { path = "../nu-engine", version = "0.96.0" }
+nu-parser = { path = "../nu-parser", version = "0.96.0" }
+nu-command = { path = "../nu-command", version = "0.96.0" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.96.0" }
+tempfile.workspace = true
\ No newline at end of file
diff --git a/crates/nu_plugin_python/nu_plugin_python_example.py b/crates/nu_plugin_python/nu_plugin_python_example.py
index 993e619366..ad128704f6 100755
--- a/crates/nu_plugin_python/nu_plugin_python_example.py
+++ b/crates/nu_plugin_python/nu_plugin_python_example.py
@@ -27,7 +27,7 @@ import sys
 import json
 
 
-NUSHELL_VERSION = "0.95.1"
+NUSHELL_VERSION = "0.96.0"
 PLUGIN_VERSION = "0.1.0" # bump if you change commands!
 
 
@@ -258,4 +258,4 @@ if __name__ == "__main__":
     if len(sys.argv) == 2 and sys.argv[1] == "--stdio":
         plugin()
     else:
-        print("Run me from inside nushell!")
+        print("Run me from inside nushell!")
\ No newline at end of file
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index 551610e390..29e99b28f8 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_quer
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_query"
-version = "0.95.1"
+version = "0.96.0"
 
 [lib]
 doctest = false
@@ -16,8 +16,8 @@ name = "nu_plugin_query"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.95.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.96.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
 
 gjson = "0.8"
 scraper = { default-features = false, version = "0.19" }
@@ -25,4 +25,4 @@ sxd-document = "0.3"
 sxd-xpath = "0.4"
 webpage = { version = "2.0.1", features = ["serde"] }
 serde_json.workspace = true
-serde.workspace = true
+serde.workspace = true
\ No newline at end of file
diff --git a/crates/nu_plugin_stress_internals/Cargo.toml b/crates/nu_plugin_stress_internals/Cargo.toml
index 2a53eb6749..9be71d55ca 100644
--- a/crates/nu_plugin_stress_internals/Cargo.toml
+++ b/crates/nu_plugin_stress_internals/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_stre
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_stress_internals"
-version = "0.95.1"
+version = "0.96.0"
 
 [[bin]]
 name = "nu_plugin_stress_internals"
diff --git a/crates/nuon/Cargo.toml b/crates/nuon/Cargo.toml
index bbb2dfe73c..33dd5e6b7d 100644
--- a/crates/nuon/Cargo.toml
+++ b/crates/nuon/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nuon"
 edition = "2021"
 license = "MIT"
 name = "nuon"
-version = "0.95.1"
+version = "0.96.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-parser = { path = "../nu-parser", version = "0.95.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.1" }
-nu-engine = { path = "../nu-engine", version = "0.95.1" }
+nu-parser = { path = "../nu-parser", version = "0.96.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
+nu-engine = { path = "../nu-engine", version = "0.96.0" }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 

From 5c2439abc07c845a6c15ff74e2bef07e600c30d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Jul 2024 13:11:50 +0800
Subject: [PATCH 0257/1072] Bump softprops/action-gh-release from 2.0.6 to
 2.0.8 (#13438)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps
[softprops/action-gh-release](https://github.com/softprops/action-gh-release)
from 2.0.6 to 2.0.8.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/softprops/action-gh-release/releases">softprops/action-gh-release's
releases</a>.</em></p>
<blockquote>
<h2>v2.0.8</h2>
<!-- raw HTML omitted -->
<h2>What's Changed</h2>
<h3>Other Changes 🔄</h3>
<ul>
<li>chore(deps): bump prettier from 2.8.0 to 3.3.3 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/480">softprops/action-gh-release#480</a></li>
<li>chore(deps): bump <code>@​types/node</code> from 20.14.9 to 20.14.11
by <a href="https://github.com/dependabot"><code>@​dependabot</code></a>
in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/483">softprops/action-gh-release#483</a></li>
<li>chore(deps): bump <code>@​octokit/plugin-throttling</code> from
9.3.0 to 9.3.1 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/484">softprops/action-gh-release#484</a></li>
<li>chore(deps): bump glob from 10.4.2 to 11.0.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/477">softprops/action-gh-release#477</a></li>
<li>refactor: write jest config in ts by <a
href="https://github.com/chenrui333"><code>@​chenrui333</code></a> in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/485">softprops/action-gh-release#485</a></li>
<li>chore(deps): bump <code>@​actions/github</code> from 5.1.1 to 6.0.0
by <a href="https://github.com/dependabot"><code>@​dependabot</code></a>
in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/470">softprops/action-gh-release#470</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/softprops/action-gh-release/compare/v2...v2.0.8">https://github.com/softprops/action-gh-release/compare/v2...v2.0.8</a></p>
<h2>v2.0.7</h2>
<!-- raw HTML omitted -->
<h2>What's Changed</h2>
<h3>Bug fixes 🐛</h3>
<ul>
<li>Fix missing update release body by <a
href="https://github.com/FirelightFlagboy"><code>@​FirelightFlagboy</code></a>
in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/365">softprops/action-gh-release#365</a></li>
</ul>
<h3>Other Changes 🔄</h3>
<ul>
<li>Bump <code>@​octokit/plugin-retry</code> from 4.0.3 to 7.1.1 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/443">softprops/action-gh-release#443</a></li>
<li>Bump typescript from 4.9.5 to 5.5.2 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/467">softprops/action-gh-release#467</a></li>
<li>Bump <code>@​types/node</code> from 20.14.6 to 20.14.8 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/469">softprops/action-gh-release#469</a></li>
<li>Bump <code>@​types/node</code> from 20.14.8 to 20.14.9 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/473">softprops/action-gh-release#473</a></li>
<li>Bump typescript from 5.5.2 to 5.5.3 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/472">softprops/action-gh-release#472</a></li>
<li>Bump ts-jest from 29.1.5 to 29.2.2 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/479">softprops/action-gh-release#479</a></li>
<li>docs: document that existing releases are updated by <a
href="https://github.com/jvanbruegge"><code>@​jvanbruegge</code></a> in
<a
href="https://redirect.github.com/softprops/action-gh-release/pull/474">softprops/action-gh-release#474</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a
href="https://github.com/jvanbruegge"><code>@​jvanbruegge</code></a>
made their first contribution in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/474">softprops/action-gh-release#474</a></li>
<li><a
href="https://github.com/FirelightFlagboy"><code>@​FirelightFlagboy</code></a>
made their first contribution in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/365">softprops/action-gh-release#365</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/softprops/action-gh-release/compare/v2.0.6...v2.0.7">https://github.com/softprops/action-gh-release/compare/v2.0.6...v2.0.7</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md">softprops/action-gh-release's
changelog</a>.</em></p>
<blockquote>
<h2>2.0.8</h2>
<h3>Other Changes 🔄</h3>
<ul>
<li>chore(deps): bump prettier from 2.8.0 to 3.3.3 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/480">softprops/action-gh-release#480</a></li>
<li>chore(deps): bump <code>@​types/node</code> from 20.14.9 to 20.14.11
by <a href="https://github.com/dependabot"><code>@​dependabot</code></a>
in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/483">softprops/action-gh-release#483</a></li>
<li>chore(deps): bump <code>@​octokit/plugin-throttling</code> from
9.3.0 to 9.3.1 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/484">softprops/action-gh-release#484</a></li>
<li>chore(deps): bump glob from 10.4.2 to 11.0.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/477">softprops/action-gh-release#477</a></li>
<li>refactor: write jest config in ts by <a
href="https://github.com/chenrui333"><code>@​chenrui333</code></a> in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/485">softprops/action-gh-release#485</a></li>
<li>chore(deps): bump <code>@​actions/github</code> from 5.1.1 to 6.0.0
by <a href="https://github.com/dependabot"><code>@​dependabot</code></a>
in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/470">softprops/action-gh-release#470</a></li>
</ul>
<h2>2.0.7</h2>
<h3>Bug fixes 🐛</h3>
<ul>
<li>Fix missing update release body by <a
href="https://github.com/FirelightFlagboy"><code>@​FirelightFlagboy</code></a>
in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/365">softprops/action-gh-release#365</a></li>
</ul>
<h3>Other Changes 🔄</h3>
<ul>
<li>Bump <code>@​octokit/plugin-retry</code> from 4.0.3 to 7.1.1 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/443">softprops/action-gh-release#443</a></li>
<li>Bump typescript from 4.9.5 to 5.5.2 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/467">softprops/action-gh-release#467</a></li>
<li>Bump <code>@​types/node</code> from 20.14.6 to 20.14.8 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/469">softprops/action-gh-release#469</a></li>
<li>Bump <code>@​types/node</code> from 20.14.8 to 20.14.9 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/473">softprops/action-gh-release#473</a></li>
<li>Bump typescript from 5.5.2 to 5.5.3 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/472">softprops/action-gh-release#472</a></li>
<li>Bump ts-jest from 29.1.5 to 29.2.2 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/479">softprops/action-gh-release#479</a></li>
<li>docs: document that existing releases are updated by <a
href="https://github.com/jvanbruegge"><code>@​jvanbruegge</code></a> in
<a
href="https://redirect.github.com/softprops/action-gh-release/pull/474">softprops/action-gh-release#474</a></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/softprops/action-gh-release/commit/c062e08bd532815e2082a85e87e3ef29c3e6d191"><code>c062e08</code></a>
release 2.0.8</li>
<li><a
href="https://github.com/softprops/action-gh-release/commit/380635c4add9f3686733a9aee43912f1f16604d3"><code>380635c</code></a>
chore(deps): bump <code>@​actions/github</code> from 5.1.1 to 6.0.0 (<a
href="https://redirect.github.com/softprops/action-gh-release/issues/470">#470</a>)</li>
<li><a
href="https://github.com/softprops/action-gh-release/commit/20adb4259cc911c7d3ef4d10da2f13ca8ca2834c"><code>20adb42</code></a>
refactor: write jest config in ts (<a
href="https://redirect.github.com/softprops/action-gh-release/issues/485">#485</a>)</li>
<li><a
href="https://github.com/softprops/action-gh-release/commit/f808f15ba8f7c201fa6f1f90fd6bb18127b9ddb0"><code>f808f15</code></a>
chore(deps): bump glob from 10.4.2 to 11.0.0 (<a
href="https://redirect.github.com/softprops/action-gh-release/issues/477">#477</a>)</li>
<li><a
href="https://github.com/softprops/action-gh-release/commit/61452410498f83c1b46c544ed23ed73f060138c4"><code>6145241</code></a>
chore(deps): bump <code>@​octokit/plugin-throttling</code> from 9.3.0 to
9.3.1 (<a
href="https://redirect.github.com/softprops/action-gh-release/issues/484">#484</a>)</li>
<li><a
href="https://github.com/softprops/action-gh-release/commit/4ac522d0bd78af302662418619bc832457bdd0b9"><code>4ac522d</code></a>
chore(deps): bump <code>@​types/node</code> from 20.14.9 to 20.14.11 (<a
href="https://redirect.github.com/softprops/action-gh-release/issues/483">#483</a>)</li>
<li><a
href="https://github.com/softprops/action-gh-release/commit/25849b132669d3a5d6adf884362acdb69262f262"><code>25849b1</code></a>
chore(deps): bump prettier from 2.8.0 to 3.3.3 (<a
href="https://redirect.github.com/softprops/action-gh-release/issues/480">#480</a>)</li>
<li><a
href="https://github.com/softprops/action-gh-release/commit/62060560e321d3dcfb1ae338d2512fbd98ab3f24"><code>6206056</code></a>
chore: update dependabot commit msg</li>
<li><a
href="https://github.com/softprops/action-gh-release/commit/39aadf190d216edf1be66954a199b7c8983f1d09"><code>39aadf1</code></a>
chore: run <code>frizbee actions .github/workflows/</code></li>
<li><a
href="https://github.com/softprops/action-gh-release/commit/6f3ab653231297c6e8410125a22784df62214f4e"><code>6f3ab65</code></a>
chore: update dist file</li>
<li>Additional commits viewable in <a
href="https://github.com/softprops/action-gh-release/compare/v2.0.6...v2.0.8">compare
view</a></li>
</ul>
</details>
<br />

<details>
<summary>Most Recent Ignore Conditions Applied to This Pull
Request</summary>

| Dependency Name | Ignore Conditions |
| --- | --- |
| softprops/action-gh-release | [< 0.2, > 0.1.13] |
</details>


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=softprops/action-gh-release&package-manager=github_actions&previous-version=2.0.6&new-version=2.0.8)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/nightly-build.yml | 2 +-
 .github/workflows/release.yml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 9b7f44feba..c581e4a274 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -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.6
+      uses: softprops/action-gh-release@v2.0.8
       if: ${{ startsWith(github.repository, 'nushell/nightly') }}
       with:
         prerelease: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 34cad24fbf..53f22cec66 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -91,7 +91,7 @@ jobs:
 
     # REF: https://github.com/marketplace/actions/gh-release
     - name: Publish Archive
-      uses: softprops/action-gh-release@v2.0.6
+      uses: softprops/action-gh-release@v2.0.8
       if: ${{ startsWith(github.ref, 'refs/tags/') }}
       with:
         draft: true

From a88c3f48e281ce50dd2a0518ff8e899314e427b5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Jul 2024 13:12:17 +0800
Subject: [PATCH 0258/1072] Bump crate-ci/typos from 1.23.2 to 1.23.3 (#13437)

Bumps [crate-ci/typos](https://github.com/crate-ci/typos) from 1.23.2 to
1.23.3.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/crate-ci/typos/releases">crate-ci/typos's
releases</a>.</em></p>
<blockquote>
<h2>v1.23.3</h2>
<h2>[1.23.3] - 2024-07-22</h2>
<h3>Fixes</h3>
<ul>
<li>Fix <code>Dockerfile</code></li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/crate-ci/typos/blob/master/CHANGELOG.md">crate-ci/typos's
changelog</a>.</em></p>
<blockquote>
<h2>[1.23.3] - 2024-07-22</h2>
<h3>Fixes</h3>
<ul>
<li>Fix <code>Dockerfile</code></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/crate-ci/typos/commit/3ddcf00482aad5eb418a6cd1955ea2125d0785c1"><code>3ddcf00</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/394f8dc60e9a69fc71d590d709fdbb9f79f9de96"><code>394f8dc</code></a>
docs: Update changelog</li>
<li><a
href="https://github.com/crate-ci/typos/commit/82ff712782528e4f52bbd1a337991ec0fa5aa5cc"><code>82ff712</code></a>
Merge pull request <a
href="https://redirect.github.com/crate-ci/typos/issues/1059">#1059</a>
from huuff/master</li>
<li><a
href="https://github.com/crate-ci/typos/commit/d7bacc4dc60548d56864275cac6cd474b4ff011a"><code>d7bacc4</code></a>
fixed the crate install path</li>
<li>See full diff in <a
href="https://github.com/crate-ci/typos/compare/v1.23.2...v1.23.3">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=crate-ci/typos&package-manager=github_actions&previous-version=1.23.2&new-version=1.23.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/typos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index c7c153983d..2484787cb5 100644
--- 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.23.2
+        uses: crate-ci/typos@v1.23.3

From 9f90d611e167d020d9e3b7767916cfda0e869317 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Thu, 25 Jul 2024 03:28:18 -0700
Subject: [PATCH 0259/1072] Bump version to `0.96.1` (#13439)

(Post-release bump.)
---
 Cargo.lock                                    | 74 +++++++++----------
 Cargo.toml                                    | 40 +++++-----
 crates/nu-cli/Cargo.toml                      | 24 +++---
 crates/nu-cmd-base/Cargo.toml                 | 10 +--
 crates/nu-cmd-extra/Cargo.toml                | 22 +++---
 crates/nu-cmd-lang/Cargo.toml                 | 10 +--
 crates/nu-cmd-plugin/Cargo.toml               | 10 +--
 crates/nu-color-config/Cargo.toml             | 10 +--
 crates/nu-command/Cargo.toml                  | 34 ++++-----
 crates/nu-derive-value/Cargo.toml             |  2 +-
 crates/nu-engine/Cargo.toml                   | 10 +--
 crates/nu-explore/Cargo.toml                  | 18 ++---
 crates/nu-glob/Cargo.toml                     |  2 +-
 crates/nu-json/Cargo.toml                     |  6 +-
 crates/nu-lsp/Cargo.toml                      | 14 ++--
 crates/nu-parser/Cargo.toml                   | 10 +--
 crates/nu-path/Cargo.toml                     |  2 +-
 crates/nu-plugin-core/Cargo.toml              |  6 +-
 crates/nu-plugin-engine/Cargo.toml            | 14 ++--
 crates/nu-plugin-protocol/Cargo.toml          |  6 +-
 crates/nu-plugin-test-support/Cargo.toml      | 18 ++---
 crates/nu-plugin/Cargo.toml                   | 12 +--
 crates/nu-pretty-hex/Cargo.toml               |  2 +-
 crates/nu-protocol/Cargo.toml                 | 12 +--
 crates/nu-std/Cargo.toml                      |  8 +-
 crates/nu-system/Cargo.toml                   |  2 +-
 crates/nu-table/Cargo.toml                    | 12 +--
 crates/nu-term-grid/Cargo.toml                |  4 +-
 crates/nu-test-support/Cargo.toml             |  8 +-
 crates/nu-utils/Cargo.toml                    |  2 +-
 .../src/sample_config/default_config.nu       |  2 +-
 .../nu-utils/src/sample_config/default_env.nu |  2 +-
 crates/nu_plugin_custom_values/Cargo.toml     |  6 +-
 crates/nu_plugin_example/Cargo.toml           | 10 +--
 crates/nu_plugin_formats/Cargo.toml           |  8 +-
 crates/nu_plugin_gstat/Cargo.toml             |  6 +-
 crates/nu_plugin_inc/Cargo.toml               |  6 +-
 .../nu_plugin_nu_example.nu                   |  2 +-
 crates/nu_plugin_polars/Cargo.toml            | 20 ++---
 .../nu_plugin_python_example.py               |  2 +-
 crates/nu_plugin_query/Cargo.toml             |  6 +-
 crates/nu_plugin_stress_internals/Cargo.toml  |  2 +-
 crates/nuon/Cargo.toml                        |  8 +-
 43 files changed, 242 insertions(+), 242 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6390b32ee3..5a8de1b4ac 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2868,7 +2868,7 @@ dependencies = [
 
 [[package]]
 name = "nu"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "assert_cmd",
  "crossterm",
@@ -2922,7 +2922,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cli"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "chrono",
  "crossterm",
@@ -2957,7 +2957,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-base"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "indexmap",
  "miette",
@@ -2969,7 +2969,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-extra"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "fancy-regex",
  "heck 0.5.0",
@@ -2994,7 +2994,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-lang"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "itertools 0.12.1",
  "nu-engine",
@@ -3006,7 +3006,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-plugin"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "itertools 0.12.1",
  "nu-engine",
@@ -3017,7 +3017,7 @@ dependencies = [
 
 [[package]]
 name = "nu-color-config"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "nu-ansi-term",
  "nu-engine",
@@ -3029,7 +3029,7 @@ dependencies = [
 
 [[package]]
 name = "nu-command"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "alphanumeric-sort",
  "base64 0.22.1",
@@ -3139,7 +3139,7 @@ dependencies = [
 
 [[package]]
 name = "nu-derive-value"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "convert_case",
  "proc-macro-error",
@@ -3150,7 +3150,7 @@ dependencies = [
 
 [[package]]
 name = "nu-engine"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "log",
  "nu-glob",
@@ -3161,7 +3161,7 @@ dependencies = [
 
 [[package]]
 name = "nu-explore"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "ansi-str",
  "anyhow",
@@ -3186,14 +3186,14 @@ dependencies = [
 
 [[package]]
 name = "nu-glob"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "doc-comment",
 ]
 
 [[package]]
 name = "nu-json"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "fancy-regex",
  "linked-hash-map",
@@ -3206,7 +3206,7 @@ dependencies = [
 
 [[package]]
 name = "nu-lsp"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "assert-json-diff",
  "crossbeam-channel",
@@ -3227,7 +3227,7 @@ dependencies = [
 
 [[package]]
 name = "nu-parser"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "bytesize",
  "chrono",
@@ -3243,7 +3243,7 @@ dependencies = [
 
 [[package]]
 name = "nu-path"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "dirs",
  "omnipath",
@@ -3252,7 +3252,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "log",
  "nix",
@@ -3268,7 +3268,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-core"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "interprocess",
  "log",
@@ -3282,7 +3282,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-engine"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "log",
  "nu-engine",
@@ -3298,7 +3298,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-protocol"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "bincode",
  "nu-protocol",
@@ -3310,7 +3310,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-test-support"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "nu-ansi-term",
  "nu-cmd-lang",
@@ -3328,7 +3328,7 @@ dependencies = [
 
 [[package]]
 name = "nu-pretty-hex"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "heapless",
  "nu-ansi-term",
@@ -3337,7 +3337,7 @@ dependencies = [
 
 [[package]]
 name = "nu-protocol"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "brotli",
  "byte-unit",
@@ -3374,7 +3374,7 @@ dependencies = [
 
 [[package]]
 name = "nu-std"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "log",
  "miette",
@@ -3385,7 +3385,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "chrono",
  "itertools 0.12.1",
@@ -3403,7 +3403,7 @@ dependencies = [
 
 [[package]]
 name = "nu-table"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "fancy-regex",
  "nu-ansi-term",
@@ -3417,7 +3417,7 @@ dependencies = [
 
 [[package]]
 name = "nu-term-grid"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "nu-utils",
  "unicode-width",
@@ -3425,7 +3425,7 @@ dependencies = [
 
 [[package]]
 name = "nu-test-support"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -3437,7 +3437,7 @@ dependencies = [
 
 [[package]]
 name = "nu-utils"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "crossterm_winapi",
  "log",
@@ -3463,7 +3463,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_example"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "nu-cmd-lang",
  "nu-plugin",
@@ -3473,7 +3473,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_formats"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "eml-parser",
  "ical",
@@ -3486,7 +3486,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_gstat"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "git2",
  "nu-plugin",
@@ -3495,7 +3495,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_inc"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -3504,7 +3504,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_polars"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "chrono",
  "chrono-tz 0.9.0",
@@ -3538,7 +3538,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_query"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "gjson",
  "nu-plugin",
@@ -3553,7 +3553,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_stress_internals"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "interprocess",
  "serde",
@@ -3679,7 +3679,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "nuon"
-version = "0.96.0"
+version = "0.96.1"
 dependencies = [
  "chrono",
  "fancy-regex",
diff --git a/Cargo.toml b/Cargo.toml
index 8397c2ca46..3d8e3a9385 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
 rust-version = "1.77.2"
-version = "0.96.0"
+version = "0.96.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -183,22 +183,22 @@ windows-sys = "0.48"
 winreg = "0.52"
 
 [dependencies]
-nu-cli = { path = "./crates/nu-cli", version = "0.96.0" }
-nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.96.0" }
-nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.96.0" }
-nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.96.0", optional = true }
-nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.96.0" }
-nu-command = { path = "./crates/nu-command", version = "0.96.0" }
-nu-engine = { path = "./crates/nu-engine", version = "0.96.0" }
-nu-explore = { path = "./crates/nu-explore", version = "0.96.0" }
-nu-lsp = { path = "./crates/nu-lsp/", version = "0.96.0" }
-nu-parser = { path = "./crates/nu-parser", version = "0.96.0" }
-nu-path = { path = "./crates/nu-path", version = "0.96.0" }
-nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.96.0" }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.96.0" }
-nu-std = { path = "./crates/nu-std", version = "0.96.0" }
-nu-system = { path = "./crates/nu-system", version = "0.96.0" }
-nu-utils = { path = "./crates/nu-utils", version = "0.96.0" }
+nu-cli = { path = "./crates/nu-cli", version = "0.96.1" }
+nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.96.1" }
+nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.96.1" }
+nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.96.1", optional = true }
+nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.96.1" }
+nu-command = { path = "./crates/nu-command", version = "0.96.1" }
+nu-engine = { path = "./crates/nu-engine", version = "0.96.1" }
+nu-explore = { path = "./crates/nu-explore", version = "0.96.1" }
+nu-lsp = { path = "./crates/nu-lsp/", version = "0.96.1" }
+nu-parser = { path = "./crates/nu-parser", version = "0.96.1" }
+nu-path = { path = "./crates/nu-path", version = "0.96.1" }
+nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.96.1" }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.96.1" }
+nu-std = { path = "./crates/nu-std", version = "0.96.1" }
+nu-system = { path = "./crates/nu-system", version = "0.96.1" }
+nu-utils = { path = "./crates/nu-utils", version = "0.96.1" }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
 crossterm = { workspace = true }
@@ -227,9 +227,9 @@ nix = { workspace = true, default-features = false, features = [
 ] }
 
 [dev-dependencies]
-nu-test-support = { path = "./crates/nu-test-support", version = "0.96.0" }
-nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.96.0" }
-nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.96.0" }
+nu-test-support = { path = "./crates/nu-test-support", version = "0.96.1" }
+nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.96.1" }
+nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.96.1" }
 assert_cmd = "2.0"
 dirs = { workspace = true }
 tango-bench = "0.5"
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 6baafda789..1be1470daf 100644
--- 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.96.0"
+version = "0.96.1"
 
 [lib]
 bench = false
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.0" }
-nu-command = { path = "../nu-command", version = "0.96.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.96.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.1" }
+nu-command = { path = "../nu-command", version = "0.96.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.96.1" }
 rstest = { workspace = true, default-features = false }
 tempfile = { workspace = true }
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.96.0" }
-nu-engine = { path = "../nu-engine", version = "0.96.0" }
-nu-path = { path = "../nu-path", version = "0.96.0" }
-nu-parser = { path = "../nu-parser", version = "0.96.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.96.0", optional = true }
-nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
-nu-utils = { path = "../nu-utils", version = "0.96.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.96.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.96.1" }
+nu-engine = { path = "../nu-engine", version = "0.96.1" }
+nu-path = { path = "../nu-path", version = "0.96.1" }
+nu-parser = { path = "../nu-parser", version = "0.96.1" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.96.1", optional = true }
+nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
+nu-utils = { path = "../nu-utils", version = "0.96.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.96.1" }
 nu-ansi-term = { workspace = true }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
diff --git a/crates/nu-cmd-base/Cargo.toml b/crates/nu-cmd-base/Cargo.toml
index 031636adfc..0fdb51eca8 100644
--- 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.96.0"
+version = "0.96.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.96.0" }
-nu-parser = { path = "../nu-parser", version = "0.96.0" }
-nu-path = { path = "../nu-path", version = "0.96.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
+nu-engine = { path = "../nu-engine", version = "0.96.1" }
+nu-parser = { path = "../nu-parser", version = "0.96.1" }
+nu-path = { path = "../nu-path", version = "0.96.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
 
 indexmap = { workspace = true }
 miette = { workspace = true }
diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml
index 2b26a962de..f9cc539c92 100644
--- 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.96.0"
+version = "0.96.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,13 +13,13 @@ version = "0.96.0"
 bench = false
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.96.0" }
-nu-engine = { path = "../nu-engine", version = "0.96.0" }
-nu-json = { version = "0.96.0", path = "../nu-json" }
-nu-parser = { path = "../nu-parser", version = "0.96.0" }
-nu-pretty-hex = { version = "0.96.0", path = "../nu-pretty-hex" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
-nu-utils = { path = "../nu-utils", version = "0.96.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.96.1" }
+nu-engine = { path = "../nu-engine", version = "0.96.1" }
+nu-json = { version = "0.96.1", path = "../nu-json" }
+nu-parser = { path = "../nu-parser", version = "0.96.1" }
+nu-pretty-hex = { version = "0.96.1", path = "../nu-pretty-hex" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
+nu-utils = { path = "../nu-utils", version = "0.96.1" }
 
 # 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.96.0" }
-nu-command = { path = "../nu-command", version = "0.96.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.96.0" }
\ No newline at end of file
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.1" }
+nu-command = { path = "../nu-command", version = "0.96.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.96.1" }
\ No newline at end of file
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index 5a9d552cba..7a92894f54 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -6,16 +6,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-lang"
 edition = "2021"
 license = "MIT"
 name = "nu-cmd-lang"
-version = "0.96.0"
+version = "0.96.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.96.0" }
-nu-parser = { path = "../nu-parser", version = "0.96.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
-nu-utils = { path = "../nu-utils", version = "0.96.0" }
+nu-engine = { path = "../nu-engine", version = "0.96.1" }
+nu-parser = { path = "../nu-parser", version = "0.96.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
+nu-utils = { path = "../nu-utils", version = "0.96.1" }
 
 itertools = { workspace = true }
 shadow-rs = { version = "0.29", default-features = false }
diff --git a/crates/nu-cmd-plugin/Cargo.toml b/crates/nu-cmd-plugin/Cargo.toml
index a73d4eef89..7a2c28e69f 100644
--- a/crates/nu-cmd-plugin/Cargo.toml
+++ b/crates/nu-cmd-plugin/Cargo.toml
@@ -5,15 +5,15 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-plugin"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-plugin"
-version = "0.96.0"
+version = "0.96.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.96.0" }
-nu-path = { path = "../nu-path", version = "0.96.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.0", features = ["plugin"] }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.96.0" }
+nu-engine = { path = "../nu-engine", version = "0.96.1" }
+nu-path = { path = "../nu-path", version = "0.96.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.1", features = ["plugin"] }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.96.1" }
 
 itertools = { workspace = true }
 
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index f3e977f3ab..7dd1edf899 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -5,18 +5,18 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-color-confi
 edition = "2021"
 license = "MIT"
 name = "nu-color-config"
-version = "0.96.0"
+version = "0.96.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
-nu-engine = { path = "../nu-engine", version = "0.96.0" }
-nu-json = { path = "../nu-json", version = "0.96.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
+nu-engine = { path = "../nu-engine", version = "0.96.1" }
+nu-json = { path = "../nu-json", version = "0.96.1" }
 nu-ansi-term = { workspace = true }
 
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.96.0" }
\ No newline at end of file
+nu-test-support = { path = "../nu-test-support", version = "0.96.1" }
\ No newline at end of file
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index f3805dac5a..61ae01d69b 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-command"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
-version = "0.96.0"
+version = "0.96.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,21 +13,21 @@ version = "0.96.0"
 bench = false
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.96.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.96.0" }
-nu-engine = { path = "../nu-engine", version = "0.96.0" }
-nu-glob = { path = "../nu-glob", version = "0.96.0" }
-nu-json = { path = "../nu-json", version = "0.96.0" }
-nu-parser = { path = "../nu-parser", version = "0.96.0" }
-nu-path = { path = "../nu-path", version = "0.96.0" }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.96.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
-nu-system = { path = "../nu-system", version = "0.96.0" }
-nu-table = { path = "../nu-table", version = "0.96.0" }
-nu-term-grid = { path = "../nu-term-grid", version = "0.96.0" }
-nu-utils = { path = "../nu-utils", version = "0.96.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.96.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.96.1" }
+nu-engine = { path = "../nu-engine", version = "0.96.1" }
+nu-glob = { path = "../nu-glob", version = "0.96.1" }
+nu-json = { path = "../nu-json", version = "0.96.1" }
+nu-parser = { path = "../nu-parser", version = "0.96.1" }
+nu-path = { path = "../nu-path", version = "0.96.1" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.96.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
+nu-system = { path = "../nu-system", version = "0.96.1" }
+nu-table = { path = "../nu-table", version = "0.96.1" }
+nu-term-grid = { path = "../nu-term-grid", version = "0.96.1" }
+nu-utils = { path = "../nu-utils", version = "0.96.1" }
 nu-ansi-term = { workspace = true }
-nuon = { path = "../nuon", version = "0.96.0" }
+nuon = { path = "../nuon", version = "0.96.1" }
 
 alphanumeric-sort = { workspace = true }
 base64 = { workspace = true }
@@ -137,8 +137,8 @@ sqlite = ["rusqlite"]
 trash-support = ["trash"]
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.96.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.96.1" }
 
 dirs = { workspace = true }
 mockito = { workspace = true, default-features = false }
diff --git a/crates/nu-derive-value/Cargo.toml b/crates/nu-derive-value/Cargo.toml
index 3ce0f00ed5..b4d9fe341f 100644
--- a/crates/nu-derive-value/Cargo.toml
+++ b/crates/nu-derive-value/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-derive-value"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-derive-value"
-version = "0.96.0"
+version = "0.96.1"
 
 [lib]
 proc-macro = true
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index 89ff80cf80..44b049f38a 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-engine"
 edition = "2021"
 license = "MIT"
 name = "nu-engine"
-version = "0.96.0"
+version = "0.96.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.96.0" }
-nu-path = { path = "../nu-path", version = "0.96.0" }
-nu-glob = { path = "../nu-glob", version = "0.96.0" }
-nu-utils = { path = "../nu-utils", version = "0.96.0" }
+nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.96.1" }
+nu-path = { path = "../nu-path", version = "0.96.1" }
+nu-glob = { path = "../nu-glob", version = "0.96.1" }
+nu-utils = { path = "../nu-utils", version = "0.96.1" }
 log = { workspace = true }
 
 [features]
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index df728365a7..26087b98ec 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -5,21 +5,21 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-explore"
 edition = "2021"
 license = "MIT"
 name = "nu-explore"
-version = "0.96.0"
+version = "0.96.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
-nu-parser = { path = "../nu-parser", version = "0.96.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.96.0" }
-nu-engine = { path = "../nu-engine", version = "0.96.0" }
-nu-table = { path = "../nu-table", version = "0.96.0" }
-nu-json = { path = "../nu-json", version = "0.96.0" }
-nu-utils = { path = "../nu-utils", version = "0.96.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
+nu-parser = { path = "../nu-parser", version = "0.96.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.96.1" }
+nu-engine = { path = "../nu-engine", version = "0.96.1" }
+nu-table = { path = "../nu-table", version = "0.96.1" }
+nu-json = { path = "../nu-json", version = "0.96.1" }
+nu-utils = { path = "../nu-utils", version = "0.96.1" }
 nu-ansi-term = { workspace = true }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.96.0" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.96.1" }
 
 anyhow = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-glob/Cargo.toml b/crates/nu-glob/Cargo.toml
index 242affbdcc..acfaf2fbb3 100644
--- a/crates/nu-glob/Cargo.toml
+++ b/crates/nu-glob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-glob"
-version = "0.96.0"
+version = "0.96.1"
 authors = ["The Nushell Project Developers", "The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 description = """
diff --git a/crates/nu-json/Cargo.toml b/crates/nu-json/Cargo.toml
index bd73655ae5..d4d64a26e3 100644
--- a/crates/nu-json/Cargo.toml
+++ b/crates/nu-json/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-json"
 edition = "2021"
 license = "MIT"
 name = "nu-json"
-version = "0.96.0"
+version = "0.96.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -26,7 +26,7 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.96.0" }
-nu-path = { path = "../nu-path", version = "0.96.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.96.1" }
+nu-path = { path = "../nu-path", version = "0.96.1" }
 serde_json = "1.0"
 fancy-regex = "0.13.0"
\ No newline at end of file
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index 4ebe937960..fc2b1d76fa 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -3,14 +3,14 @@ authors = ["The Nushell Project Developers"]
 description = "Nushell's integrated LSP server"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-lsp"
 name = "nu-lsp"
-version = "0.96.0"
+version = "0.96.1"
 edition = "2021"
 license = "MIT"
 
 [dependencies]
-nu-cli = { path = "../nu-cli", version = "0.96.0" }
-nu-parser = { path = "../nu-parser", version = "0.96.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
+nu-cli = { path = "../nu-cli", version = "0.96.1" }
+nu-parser = { path = "../nu-parser", version = "0.96.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
 
 reedline = { workspace = true }
 
@@ -23,8 +23,8 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.0" }
-nu-command = { path = "../nu-command", version = "0.96.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.96.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.1" }
+nu-command = { path = "../nu-command", version = "0.96.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.96.1" }
 
 assert-json-diff = "2.0"
\ No newline at end of file
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index d8f978620d..da8f63d42b 100644
--- a/crates/nu-parser/Cargo.toml
+++ b/crates/nu-parser/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-parser"
 edition = "2021"
 license = "MIT"
 name = "nu-parser"
-version = "0.96.0"
+version = "0.96.1"
 exclude = ["/fuzz"]
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.96.0" }
-nu-path = { path = "../nu-path", version = "0.96.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.96.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
+nu-engine = { path = "../nu-engine", version = "0.96.1" }
+nu-path = { path = "../nu-path", version = "0.96.1" }
+nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.96.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
 
 bytesize = { workspace = true }
 chrono = { default-features = false, features = ['std'], workspace = true }
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index 7bddfd309f..ff49140bd2 100644
--- a/crates/nu-path/Cargo.toml
+++ b/crates/nu-path/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-path"
 edition = "2021"
 license = "MIT"
 name = "nu-path"
-version = "0.96.0"
+version = "0.96.1"
 exclude = ["/fuzz"]
 
 [lib]
diff --git a/crates/nu-plugin-core/Cargo.toml b/crates/nu-plugin-core/Cargo.toml
index 3b9e8b63ca..21119a442c 100644
--- a/crates/nu-plugin-core/Cargo.toml
+++ b/crates/nu-plugin-core/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-core
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-core"
-version = "0.96.0"
+version = "0.96.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.96.0", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.96.1", default-features = false }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true }
diff --git a/crates/nu-plugin-engine/Cargo.toml b/crates/nu-plugin-engine/Cargo.toml
index 585e28de47..189b9b0713 100644
--- a/crates/nu-plugin-engine/Cargo.toml
+++ b/crates/nu-plugin-engine/Cargo.toml
@@ -5,18 +5,18 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-engi
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-engine"
-version = "0.96.0"
+version = "0.96.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.96.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
-nu-system = { path = "../nu-system", version = "0.96.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.96.0" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.96.0", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.96.0" }
+nu-engine = { path = "../nu-engine", version = "0.96.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
+nu-system = { path = "../nu-system", version = "0.96.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.96.1" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.96.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.96.1" }
 
 serde = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-plugin-protocol/Cargo.toml b/crates/nu-plugin-protocol/Cargo.toml
index feb6c51b64..68b859f213 100644
--- a/crates/nu-plugin-protocol/Cargo.toml
+++ b/crates/nu-plugin-protocol/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-prot
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-protocol"
-version = "0.96.0"
+version = "0.96.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.96.0", features = ["plugin"] }
-nu-utils = { path = "../nu-utils", version = "0.96.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.1", features = ["plugin"] }
+nu-utils = { path = "../nu-utils", version = "0.96.1" }
 
 bincode = "1.3"
 serde = { workspace = true, features = ["derive"] }
diff --git a/crates/nu-plugin-test-support/Cargo.toml b/crates/nu-plugin-test-support/Cargo.toml
index e12fc28823..f33d997939 100644
--- a/crates/nu-plugin-test-support/Cargo.toml
+++ b/crates/nu-plugin-test-support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-plugin-test-support"
-version = "0.96.0"
+version = "0.96.1"
 edition = "2021"
 license = "MIT"
 description = "Testing support for Nushell plugins"
@@ -12,14 +12,14 @@ bench = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.96.0", features = ["plugin"] }
-nu-protocol = { path = "../nu-protocol", version = "0.96.0", features = ["plugin"] }
-nu-parser = { path = "../nu-parser", version = "0.96.0", features = ["plugin"] }
-nu-plugin = { path = "../nu-plugin", version = "0.96.0" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.96.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.96.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.96.0" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.0" }
+nu-engine = { path = "../nu-engine", version = "0.96.1", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.96.1", features = ["plugin"] }
+nu-parser = { path = "../nu-parser", version = "0.96.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.96.1" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.96.1" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.96.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.96.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.1" }
 nu-ansi-term = { workspace = true }
 similar = "2.5"
 
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index 3b06f37fae..b7fff9bf72 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin"
 edition = "2021"
 license = "MIT"
 name = "nu-plugin"
-version = "0.96.0"
+version = "0.96.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.96.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.96.0" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.96.0", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.96.0" }
+nu-engine = { path = "../nu-engine", version = "0.96.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.96.1" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.96.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.96.1" }
 
 log = { workspace = true }
 thiserror = "1.0"
diff --git a/crates/nu-pretty-hex/Cargo.toml b/crates/nu-pretty-hex/Cargo.toml
index e2f21d322b..7db01ca2cc 100644
--- a/crates/nu-pretty-hex/Cargo.toml
+++ b/crates/nu-pretty-hex/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-pretty-hex"
 edition = "2021"
 license = "MIT"
 name = "nu-pretty-hex"
-version = "0.96.0"
+version = "0.96.1"
 
 [lib]
 doctest = false
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 467c4a21f7..ff8ef86c9e 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-protocol"
 edition = "2021"
 license = "MIT"
 name = "nu-protocol"
-version = "0.96.0"
+version = "0.96.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,10 +13,10 @@ version = "0.96.0"
 bench = false
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.96.0" }
-nu-path = { path = "../nu-path", version = "0.96.0" }
-nu-system = { path = "../nu-system", version = "0.96.0" }
-nu-derive-value = { path = "../nu-derive-value", version = "0.96.0" }
+nu-utils = { path = "../nu-utils", version = "0.96.1" }
+nu-path = { path = "../nu-path", version = "0.96.1" }
+nu-system = { path = "../nu-system", version = "0.96.1" }
+nu-derive-value = { path = "../nu-derive-value", version = "0.96.1" }
 
 brotli = { workspace = true, optional = true }
 byte-unit = { version = "5.1", features = [ "serde" ] }
@@ -53,7 +53,7 @@ plugin = [
 serde_json = { workspace = true }
 strum = "0.26"
 strum_macros = "0.26"
-nu-test-support = { path = "../nu-test-support", version = "0.96.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.96.1" }
 pretty_assertions = { workspace = true }
 rstest = { workspace = true }
 tempfile = { workspace = true }
diff --git a/crates/nu-std/Cargo.toml b/crates/nu-std/Cargo.toml
index 408b1e0303..d52ab617c1 100644
--- a/crates/nu-std/Cargo.toml
+++ b/crates/nu-std/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-std"
 edition = "2021"
 license = "MIT"
 name = "nu-std"
-version = "0.96.0"
+version = "0.96.1"
 
 [dependencies]
-nu-parser = { version = "0.96.0", path = "../nu-parser" }
-nu-protocol = { version = "0.96.0", path = "../nu-protocol" }
-nu-engine = { version = "0.96.0", path = "../nu-engine" }
+nu-parser = { version = "0.96.1", path = "../nu-parser" }
+nu-protocol = { version = "0.96.1", path = "../nu-protocol" }
+nu-engine = { version = "0.96.1", path = "../nu-engine" }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
 
 log = "0.4"
\ No newline at end of file
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index d4d6f77e9b..1e1efba651 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["The Nushell Project Developers", "procs creators"]
 description = "Nushell system querying"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-system"
 name = "nu-system"
-version = "0.96.0"
+version = "0.96.1"
 edition = "2021"
 license = "MIT"
 
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index 982fd08369..1f02ccb1c3 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -5,20 +5,20 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-table"
 edition = "2021"
 license = "MIT"
 name = "nu-table"
-version = "0.96.0"
+version = "0.96.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
-nu-utils = { path = "../nu-utils", version = "0.96.0" }
-nu-engine = { path = "../nu-engine", version = "0.96.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.96.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
+nu-utils = { path = "../nu-utils", version = "0.96.1" }
+nu-engine = { path = "../nu-engine", version = "0.96.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.96.1" }
 nu-ansi-term = { workspace = true }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 tabled = { workspace = true, features = ["color"], default-features = false }
 
 [dev-dependencies]
-# nu-test-support = { path="../nu-test-support", version = "0.96.0"  }
\ No newline at end of file
+# nu-test-support = { path="../nu-test-support", version = "0.96.1"  }
\ No newline at end of file
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index 0be10b4ef1..348adb03af 100644
--- a/crates/nu-term-grid/Cargo.toml
+++ b/crates/nu-term-grid/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-term-grid"
 edition = "2021"
 license = "MIT"
 name = "nu-term-grid"
-version = "0.96.0"
+version = "0.96.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.96.0" }
+nu-utils = { path = "../nu-utils", version = "0.96.1" }
 
 unicode-width = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml
index c41bf6b8a2..4a43d6b933 100644
--- a/crates/nu-test-support/Cargo.toml
+++ b/crates/nu-test-support/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-test-suppor
 edition = "2021"
 license = "MIT"
 name = "nu-test-support"
-version = "0.96.0"
+version = "0.96.1"
 
 [lib]
 doctest = false
 bench = false
 
 [dependencies]
-nu-path = { path = "../nu-path", version = "0.96.0" }
-nu-glob = { path = "../nu-glob", version = "0.96.0" }
-nu-utils = { path = "../nu-utils", version = "0.96.0" }
+nu-path = { path = "../nu-path", version = "0.96.1" }
+nu-glob = { path = "../nu-glob", version = "0.96.1" }
+nu-utils = { path = "../nu-utils", version = "0.96.1" }
 
 num-format = { workspace = true }
 which = { workspace = true }
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index aa9f591a2d..4c1caddbbd 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-utils"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-utils"
-version = "0.96.0"
+version = "0.96.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index dda33cace0..779c2e900c 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -1,6 +1,6 @@
 # Nushell Config File
 #
-# version = "0.96.0"
+# version = "0.96.1"
 
 # For more information on defining custom themes, see
 # https://www.nushell.sh/book/coloring_and_theming.html
diff --git a/crates/nu-utils/src/sample_config/default_env.nu b/crates/nu-utils/src/sample_config/default_env.nu
index 5d6cab2687..5d5cc46190 100644
--- a/crates/nu-utils/src/sample_config/default_env.nu
+++ b/crates/nu-utils/src/sample_config/default_env.nu
@@ -1,6 +1,6 @@
 # Nushell Environment Config File
 #
-# version = "0.96.0"
+# version = "0.96.1"
 
 def create_left_prompt [] {
     let dir = match (do --ignore-shell-errors { $env.PWD | path relative-to $nu.home-path }) {
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index c3f3a7cec1..9643bf337e 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -10,10 +10,10 @@ name = "nu_plugin_custom_values"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.96.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.96.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.1", features = ["plugin"] }
 serde = { workspace = true, default-features = false }
 typetag = "0.2"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.96.0" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.96.1" }
\ No newline at end of file
diff --git a/crates/nu_plugin_example/Cargo.toml b/crates/nu_plugin_example/Cargo.toml
index 9df31e46b6..8b24911026 100644
--- a/crates/nu_plugin_example/Cargo.toml
+++ b/crates/nu_plugin_example/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_exam
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_example"
-version = "0.96.0"
+version = "0.96.1"
 
 [[bin]]
 name = "nu_plugin_example"
@@ -15,9 +15,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.96.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.96.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.1", features = ["plugin"] }
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.96.0" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.0" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.96.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.1" }
\ No newline at end of file
diff --git a/crates/nu_plugin_formats/Cargo.toml b/crates/nu_plugin_formats/Cargo.toml
index 535cd69c17..ac65f05080 100644
--- a/crates/nu_plugin_formats/Cargo.toml
+++ b/crates/nu_plugin_formats/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_form
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_formats"
-version = "0.96.0"
+version = "0.96.1"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.96.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.96.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.1", features = ["plugin"] }
 
 indexmap = { workspace = true }
 eml-parser = "0.1"
@@ -18,4 +18,4 @@ ical = "0.11"
 rust-ini = "0.21.0"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.96.0" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.96.1" }
\ No newline at end of file
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index 6a7d6411c8..9bc09fc6c0 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gsta
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_gstat"
-version = "0.96.0"
+version = "0.96.1"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_gstat"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.96.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
+nu-plugin = { path = "../nu-plugin", version = "0.96.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
 
 git2 = "0.19"
\ No newline at end of file
diff --git a/crates/nu_plugin_inc/Cargo.toml b/crates/nu_plugin_inc/Cargo.toml
index 4b3f63345b..e82168463c 100644
--- a/crates/nu_plugin_inc/Cargo.toml
+++ b/crates/nu_plugin_inc/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_inc"
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_inc"
-version = "0.96.0"
+version = "0.96.1"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_inc"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.96.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.96.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.1", features = ["plugin"] }
 
 semver = "1.0"
\ No newline at end of file
diff --git a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
index 75069e27e3..e7c4f77365 100755
--- a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
+++ b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
@@ -6,7 +6,7 @@
 # it also allows us to test the plugin interface with something manually implemented in a scripting
 # language without adding any extra dependencies to our tests.
 
-const NUSHELL_VERSION = "0.96.0"
+const NUSHELL_VERSION = "0.96.1"
 const PLUGIN_VERSION = "0.1.0" # bump if you change commands!
 
 def main [--stdio] {
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 40ce054ecd..ad1181f2fe 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu_plugin_polars"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_polars"
-version = "0.96.0"
+version = "0.96.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -17,10 +17,10 @@ bench = false
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
-nu-plugin = { path = "../nu-plugin", version = "0.96.0" }
-nu-path = { path = "../nu-path", version = "0.96.0" }
-nu-utils = { path = "../nu-utils", version = "0.96.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.96.1" }
+nu-path = { path = "../nu-path", version = "0.96.1" }
+nu-utils = { path = "../nu-utils", version = "0.96.1" }
 
 # Potential dependencies for extras
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
@@ -76,9 +76,9 @@ optional = false
 version = "0.41"
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.0" }
-nu-engine = { path = "../nu-engine", version = "0.96.0" }
-nu-parser = { path = "../nu-parser", version = "0.96.0" }
-nu-command = { path = "../nu-command", version = "0.96.0" }
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.96.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.1" }
+nu-engine = { path = "../nu-engine", version = "0.96.1" }
+nu-parser = { path = "../nu-parser", version = "0.96.1" }
+nu-command = { path = "../nu-command", version = "0.96.1" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.96.1" }
 tempfile.workspace = true
\ No newline at end of file
diff --git a/crates/nu_plugin_python/nu_plugin_python_example.py b/crates/nu_plugin_python/nu_plugin_python_example.py
index ad128704f6..c0c530219f 100755
--- a/crates/nu_plugin_python/nu_plugin_python_example.py
+++ b/crates/nu_plugin_python/nu_plugin_python_example.py
@@ -27,7 +27,7 @@ import sys
 import json
 
 
-NUSHELL_VERSION = "0.96.0"
+NUSHELL_VERSION = "0.96.1"
 PLUGIN_VERSION = "0.1.0" # bump if you change commands!
 
 
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index 29e99b28f8..bb7e0f6bec 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_quer
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_query"
-version = "0.96.0"
+version = "0.96.1"
 
 [lib]
 doctest = false
@@ -16,8 +16,8 @@ name = "nu_plugin_query"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.96.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
+nu-plugin = { path = "../nu-plugin", version = "0.96.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
 
 gjson = "0.8"
 scraper = { default-features = false, version = "0.19" }
diff --git a/crates/nu_plugin_stress_internals/Cargo.toml b/crates/nu_plugin_stress_internals/Cargo.toml
index 9be71d55ca..872623f4ba 100644
--- a/crates/nu_plugin_stress_internals/Cargo.toml
+++ b/crates/nu_plugin_stress_internals/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_stre
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_stress_internals"
-version = "0.96.0"
+version = "0.96.1"
 
 [[bin]]
 name = "nu_plugin_stress_internals"
diff --git a/crates/nuon/Cargo.toml b/crates/nuon/Cargo.toml
index 33dd5e6b7d..b1ec4a2a69 100644
--- a/crates/nuon/Cargo.toml
+++ b/crates/nuon/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nuon"
 edition = "2021"
 license = "MIT"
 name = "nuon"
-version = "0.96.0"
+version = "0.96.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-parser = { path = "../nu-parser", version = "0.96.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.0" }
-nu-engine = { path = "../nu-engine", version = "0.96.0" }
+nu-parser = { path = "../nu-parser", version = "0.96.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
+nu-engine = { path = "../nu-engine", version = "0.96.1" }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 

From 6446f26283e574898d90da4a91f77cc0ea210de9 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Thu, 25 Jul 2024 03:28:44 -0700
Subject: [PATCH 0260/1072] Fix `$in` in range expressions (#13447)

# Description

Fixes #13441.

I must have forgotten that `Expr::Range` can contain other expressions,
so I wasn't searching for `$in` to replace within it. Easy fix.

# User-Facing Changes
Bug fix, ranges like `6 | 3..$in` work as expected now.

# Tests + Formatting
Added regression test.
---
 crates/nu-protocol/src/ast/expression.rs | 12 +++++++++++-
 tests/repl/test_engine.rs                | 10 ++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/crates/nu-protocol/src/ast/expression.rs b/crates/nu-protocol/src/ast/expression.rs
index 4818aa2db2..faf47d42ec 100644
--- a/crates/nu-protocol/src/ast/expression.rs
+++ b/crates/nu-protocol/src/ast/expression.rs
@@ -432,7 +432,17 @@ impl Expression {
             Expr::Int(_) => {}
             Expr::Float(_) => {}
             Expr::Binary(_) => {}
-            Expr::Range(_) => {}
+            Expr::Range(range) => {
+                if let Some(from) = &mut range.from {
+                    from.replace_in_variable(working_set, new_var_id);
+                }
+                if let Some(next) = &mut range.next {
+                    next.replace_in_variable(working_set, new_var_id);
+                }
+                if let Some(to) = &mut range.to {
+                    to.replace_in_variable(working_set, new_var_id);
+                }
+            }
             Expr::Var(var_id) | Expr::VarDecl(var_id) => {
                 if *var_id == IN_VARIABLE_ID {
                     *var_id = new_var_id;
diff --git a/tests/repl/test_engine.rs b/tests/repl/test_engine.rs
index 1b74e741f7..90dd1e86b0 100644
--- a/tests/repl/test_engine.rs
+++ b/tests/repl/test_engine.rs
@@ -75,6 +75,16 @@ fn in_used_twice_and_also_in_pipeline() -> TestResult {
     )
 }
 
+// #13441
+#[test]
+fn in_used_in_range_from() -> TestResult {
+    run_test(r#"6 | $in..10 | math sum"#, "40")
+}
+#[test]
+fn in_used_in_range_to() -> TestResult {
+    run_test(r#"6 | 3..$in | math sum"#, "18")
+}
+
 #[test]
 fn help_works_with_missing_requirements() -> TestResult {
     run_test(r#"each --help | lines | length"#, "72")

From 4a7d4401b86e77170a71325089746c8f3d65c81f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 11:35:19 +0000
Subject: [PATCH 0261/1072] Bump openssl from 0.10.64 to 0.10.66 (#13426)

---
 Cargo.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5a8de1b4ac..bf665fc8b9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3787,9 +3787,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.64"
+version = "0.10.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
+checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
 dependencies = [
  "bitflags 2.5.0",
  "cfg-if",
@@ -3828,9 +3828,9 @@ dependencies = [
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.102"
+version = "0.9.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
+checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
 dependencies = [
  "cc",
  "libc",

From e2d0514bb57ae0b071631d880acbcb695858f67c Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 25 Jul 2024 08:50:59 -0500
Subject: [PATCH 0262/1072] update release-pkg.nu with working url for less
 license (#13451)

# Description

When running a wix/msi build, I ran into a problem where the less
license would not download. The fix for that is in this PR along with
some further comments.

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 .github/workflows/release-pkg.nu | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release-pkg.nu b/.github/workflows/release-pkg.nu
index da2779f6d1..562f42b4a4 100755
--- 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' {

From e68f744dda0a13c496a5de0a52716709a630a402 Mon Sep 17 00:00:00 2001
From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Thu, 25 Jul 2024 16:01:46 -0400
Subject: [PATCH 0263/1072] Update query-web example to use new chunks (#13429)

# Description

A `query web` example uses the (soon to be deprecated) `group` command.
Updated it to use `chunks` replacement.
---
 crates/nu_plugin_query/src/query_web.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu_plugin_query/src/query_web.rs b/crates/nu_plugin_query/src/query_web.rs
index 39f50e51af..2d8b9e4aac 100644
--- a/crates/nu_plugin_query/src/query_web.rs
+++ b/crates/nu_plugin_query/src/query_web.rs
@@ -81,7 +81,7 @@ pub fn web_examples() -> Vec<Example<'static>> {
             result: None
         },
         Example {
-            example: "http get https://www.nushell.sh | query web --query 'h2, h2 + p' | each {str join} | group 2 | each {rotate --ccw tagline description} | flatten",
+            example: "http get https://www.nushell.sh | query web --query 'h2, h2 + p' | each {str join} | chunks 2 | each {rotate --ccw tagline description} | flatten",
             description: "Pass multiple css selectors to extract several elements within single query, group the query results together and rotate them to create a table",
             result: None,
         },

From 53fbf624934916a9527737305d410794d1472a48 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Fri, 26 Jul 2024 01:03:05 -0700
Subject: [PATCH 0264/1072] Fix `keybindings list` being empty by default
 (#13456)

# Description

Made a mistake when fixing this for IR. The default behavior with no
options set is to list everything. Restored that.

This should go in the 0.96.1 patch release.

# Tests + Formatting
Added regression test.
---
 crates/nu-cli/src/commands/keybindings_list.rs   | 4 +++-
 crates/nu-cli/tests/commands/keybindings_list.rs | 7 +++++++
 crates/nu-cli/tests/commands/mod.rs              | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 crates/nu-cli/tests/commands/keybindings_list.rs

diff --git a/crates/nu-cli/src/commands/keybindings_list.rs b/crates/nu-cli/src/commands/keybindings_list.rs
index 350df7b820..abb5909a97 100644
--- a/crates/nu-cli/src/commands/keybindings_list.rs
+++ b/crates/nu-cli/src/commands/keybindings_list.rs
@@ -61,10 +61,12 @@ impl Command for KeybindingsList {
             .map(|option| call.has_flag(engine_state, stack, option))
             .collect::<Result<Vec<_>, ShellError>>()?;
 
+        let no_option_specified = presence.iter().all(|present| !*present);
+
         let records = all_options
             .iter()
             .zip(presence)
-            .filter(|(_, present)| *present)
+            .filter(|(_, present)| no_option_specified || *present)
             .flat_map(|(option, _)| get_records(option, call.head))
             .collect();
 
diff --git a/crates/nu-cli/tests/commands/keybindings_list.rs b/crates/nu-cli/tests/commands/keybindings_list.rs
new file mode 100644
index 0000000000..4ab9f3bacf
--- /dev/null
+++ 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");
+}
diff --git a/crates/nu-cli/tests/commands/mod.rs b/crates/nu-cli/tests/commands/mod.rs
index 00488f0b9e..087791302e 100644
--- 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;

From 5f7afafe51727b08996b27d1b9eb68e82bc019b4 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Sat, 27 Jul 2024 19:38:57 -0700
Subject: [PATCH 0265/1072] IR: fix incorrect capturing of subexpressions
 (#13467)

# Description


[Discovered](https://discord.com/channels/601130461678272522/614593951969574961/1266503282554179604)
by `@warp` on Discord.

The IR compiler was not properly setting redirect modes for
subexpressions because `FullCellPath` was always being compiled with
capture-out redirection. This is the correct behavior if there is a tail
to the `FullCellPath`, as we need the value in order to try to extract
anything from it (although this is unlikely to work) - however, the
parser also generates `FullCellPath`s with an empty tail quite often,
including for bare subexpressions.

Because of this, the following did not behave as expected:

```nushell
(docker run -it --rm alpine)
```

Capturing the output meant that `docker` didn't have direct access to
the terminal as a TTY.

As this is a minor bug fix, it should be okay to include in the 0.96.1
patch release.

# User-Facing Changes

- Fixes the bug as described when running with IR evaluation enabled.

# Tests + Formatting

I added a test for this, though we're not currently running all tests
with IR on the CI, but it should ensure this behaviour is consistent.
The equivalent minimum repro I could find was:

```nushell
(nu --testbin cococo); null
```

as this should cause the `cococo` message to appear on stdout, and if
Nushell is capturing the output, it would be discarded instead.
---
 crates/nu-engine/src/compile/expression.rs | 10 +++++++++-
 tests/shell/pipeline/commands/external.rs  |  6 ++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/crates/nu-engine/src/compile/expression.rs b/crates/nu-engine/src/compile/expression.rs
index 948eb5c238..80fc4fb3fb 100644
--- a/crates/nu-engine/src/compile/expression.rs
+++ b/crates/nu-engine/src/compile/expression.rs
@@ -444,7 +444,15 @@ pub(crate) fn compile_expression(
                     working_set,
                     builder,
                     &full_cell_path.head,
-                    RedirectModes::capture_out(expr.span),
+                    // Only capture the output if there is a tail. This was a bit of a headscratcher
+                    // as the parser emits a FullCellPath with no tail for subexpressions in
+                    // general, which shouldn't be captured any differently than they otherwise
+                    // would be.
+                    if !full_cell_path.tail.is_empty() {
+                        RedirectModes::capture_out(expr.span)
+                    } else {
+                        redirect_modes
+                    },
                     in_reg,
                     out_reg,
                 )?;
diff --git a/tests/shell/pipeline/commands/external.rs b/tests/shell/pipeline/commands/external.rs
index a6efe2b6c9..ff851a3293 100644
--- a/tests/shell/pipeline/commands/external.rs
+++ b/tests/shell/pipeline/commands/external.rs
@@ -209,6 +209,12 @@ fn run_glob_if_pass_variable_to_external() {
     })
 }
 
+#[test]
+fn subexpression_does_not_implicitly_capture() {
+    let actual = nu!("(nu --testbin cococo); null");
+    assert_eq!(actual.out, "cococo");
+}
+
 mod it_evaluation {
     use super::nu;
     use nu_test_support::fs::Stub::{EmptyFile, FileWithContent, FileWithContentToBeTrimmed};

From d80de68665f9c779e17a113bbe2be271c94bc92b Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Sat, 27 Jul 2024 19:39:17 -0700
Subject: [PATCH 0266/1072] Clean up arguments added to stack after `CallDecl`
 engine call (#13469)

# Description

Just realized I hadn't been cleaning up the arguments added to the
`Stack` after the `CallDecl` engine call was finished, so there could be
a bit of a memory leak if a plugin made many calls during the duration
of a single plugin call. This is a quick patch to that.

I'm probably going to revise how this all works at some point soon
because I think it is a bit of a pitfall. It would be good to make it
much more difficult to make a mistake with it, perhaps with a guard like
Ian did for the redirection stuff.

# After Submitting
- [ ] release with 0.96.1
---
 crates/nu-plugin-engine/src/context.rs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/crates/nu-plugin-engine/src/context.rs b/crates/nu-plugin-engine/src/context.rs
index d9023cde35..160ce802b2 100644
--- a/crates/nu-plugin-engine/src/context.rs
+++ b/crates/nu-plugin-engine/src/context.rs
@@ -257,12 +257,9 @@ impl<'a> PluginExecutionContext for PluginExecutionCommandContext<'a> {
             }
         }
 
-        decl.run(
-            &self.engine_state,
-            stack,
-            &(&call_builder.finish()).into(),
-            input,
-        )
+        call_builder.with(stack, |stack, call| {
+            decl.run(&self.engine_state, stack, call, input)
+        })
     }
 
     fn boxed(&self) -> Box<dyn PluginExecutionContext + 'static> {

From d618fd0527c589ca66ea4c8af813e2bbca32ee88 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Sat, 27 Jul 2024 19:39:29 -0700
Subject: [PATCH 0267/1072] Fix bad method links in docstrings (#13471)

# Description

Seems like I developed a bit of a bad habit of trying to link

```rust
/// [`.foo()`]
```

in docstrings, and this just doesn't work automatically; you have to do

```rust
/// [`.foo()`](Self::foo)
```

if you want it to actually link. I think I found and replaced all of
these.

# User-Facing Changes

Just docs.
---
 crates/nu-engine/src/compile/builder.rs             |  2 +-
 crates/nu-plugin-core/src/communication_mode/mod.rs |  4 ++--
 crates/nu-plugin-core/src/interface/mod.rs          |  2 +-
 crates/nu-plugin-core/src/interface/stream/mod.rs   | 10 +++++-----
 crates/nu-plugin-core/src/util/waitable.rs          |  2 +-
 crates/nu-plugin-engine/src/gc.rs                   |  4 ++--
 crates/nu-plugin-engine/src/source.rs               |  2 +-
 crates/nu-plugin-protocol/src/evaluated_call.rs     |  6 +++---
 crates/nu-plugin/src/plugin/command.rs              | 10 +++++-----
 crates/nu-plugin/src/plugin/interface/mod.rs        | 13 +++++++------
 crates/nu-protocol/src/engine/engine_state.rs       |  6 +++---
 crates/nu-protocol/src/engine/stack.rs              |  2 +-
 crates/nu-protocol/src/errors/labeled_error.rs      |  3 ++-
 crates/nu-protocol/src/pipeline/pipeline_data.rs    |  3 ++-
 crates/nu-system/src/foreground.rs                  |  8 ++++----
 15 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/crates/nu-engine/src/compile/builder.rs b/crates/nu-engine/src/compile/builder.rs
index 4294b2bd61..2a443b7bde 100644
--- a/crates/nu-engine/src/compile/builder.rs
+++ b/crates/nu-engine/src/compile/builder.rs
@@ -423,7 +423,7 @@ impl BlockBuilder {
         self.push(Instruction::Jump { index: label_id.0 }.into_spanned(span))
     }
 
-    /// The index that the next instruction [`.push()`]ed will have.
+    /// The index that the next instruction [`.push()`](Self::push)ed will have.
     pub(crate) fn here(&self) -> usize {
         self.instructions.len()
     }
diff --git a/crates/nu-plugin-core/src/communication_mode/mod.rs b/crates/nu-plugin-core/src/communication_mode/mod.rs
index 1eb72d6ac8..576cfe866c 100644
--- a/crates/nu-plugin-core/src/communication_mode/mod.rs
+++ b/crates/nu-plugin-core/src/communication_mode/mod.rs
@@ -122,11 +122,11 @@ impl CommunicationMode {
 
 /// The result of [`CommunicationMode::serve()`], which acts as an intermediate stage for
 /// communication modes that require some kind of socket binding to occur before the client process
-/// can be started. Call [`.connect()`] once the client process has been started.
+/// can be started. Call [`.connect()`](Self::connect) once the client process has been started.
 ///
 /// The socket may be cleaned up on `Drop` if applicable.
 pub enum PreparedServerCommunication {
-    /// Will take stdin and stdout from the process on [`.connect()`].
+    /// Will take stdin and stdout from the process on [`.connect()`](Self::connect).
     Stdio,
     /// Contains the listener to accept connections on. On Unix, the socket is unlinked on `Drop`.
     #[cfg(feature = "local-socket")]
diff --git a/crates/nu-plugin-core/src/interface/mod.rs b/crates/nu-plugin-core/src/interface/mod.rs
index 89aa2b15e5..d282eddd8b 100644
--- a/crates/nu-plugin-core/src/interface/mod.rs
+++ b/crates/nu-plugin-core/src/interface/mod.rs
@@ -145,7 +145,7 @@ pub trait InterfaceManager {
 
     /// Consume an input message.
     ///
-    /// When implementing, call [`.consume_stream_message()`] for any encapsulated
+    /// When implementing, call [`.consume_stream_message()`](Self::consume_stream_message) for any encapsulated
     /// [`StreamMessage`]s received.
     fn consume(&mut self, input: Self::Input) -> Result<(), ShellError>;
 
diff --git a/crates/nu-plugin-core/src/interface/stream/mod.rs b/crates/nu-plugin-core/src/interface/stream/mod.rs
index 541e1176a0..cfe44fabb4 100644
--- a/crates/nu-plugin-core/src/interface/stream/mod.rs
+++ b/crates/nu-plugin-core/src/interface/stream/mod.rs
@@ -189,14 +189,14 @@ where
     }
 
     /// Check if the stream was dropped from the other end. Recommended to do this before calling
-    /// [`.write()`], especially in a loop.
+    /// [`.write()`](Self::write), especially in a loop.
     pub fn is_dropped(&self) -> Result<bool, ShellError> {
         self.signal.is_dropped()
     }
 
     /// Write a single piece of data to the stream.
     ///
-    /// Error if something failed with the write, or if [`.end()`] was already called
+    /// Error if something failed with the write, or if [`.end()`](Self::end) was already called
     /// previously.
     pub fn write(&mut self, data: impl Into<StreamData>) -> Result<(), ShellError> {
         if !self.ended {
@@ -228,7 +228,7 @@ where
     }
 
     /// Write a full iterator to the stream. Note that this doesn't end the stream, so you should
-    /// still call [`.end()`].
+    /// still call [`.end()`](Self::end).
     ///
     /// If the stream is dropped from the other end, the iterator will not be fully consumed, and
     /// writing will terminate.
@@ -341,8 +341,8 @@ impl StreamWriterSignal {
     }
 
     /// Track that a message has been sent. Returns `Ok(true)` if more messages can be sent,
-    /// or `Ok(false)` if the high pressure mark has been reached and [`.wait_for_drain()`] should
-    /// be called to block.
+    /// or `Ok(false)` if the high pressure mark has been reached and
+    /// [`.wait_for_drain()`](Self::wait_for_drain) should be called to block.
     pub fn notify_sent(&self) -> Result<bool, ShellError> {
         let mut state = self.lock()?;
         state.unacknowledged =
diff --git a/crates/nu-plugin-core/src/util/waitable.rs b/crates/nu-plugin-core/src/util/waitable.rs
index aaefa6f1b5..0f4cb30de3 100644
--- a/crates/nu-plugin-core/src/util/waitable.rs
+++ b/crates/nu-plugin-core/src/util/waitable.rs
@@ -45,7 +45,7 @@ fn fail_if_poisoned<'a, T>(
 }
 
 impl<T: Clone + Send> WaitableMut<T> {
-    /// Create a new empty `WaitableMut`. Call [`.reader()`] to get [`Waitable`].
+    /// Create a new empty `WaitableMut`. Call [`.reader()`](Self::reader) to get [`Waitable`].
     pub fn new() -> WaitableMut<T> {
         WaitableMut {
             shared: Arc::new(WaitableShared {
diff --git a/crates/nu-plugin-engine/src/gc.rs b/crates/nu-plugin-engine/src/gc.rs
index bd9c8de06f..555c57e47d 100644
--- a/crates/nu-plugin-engine/src/gc.rs
+++ b/crates/nu-plugin-engine/src/gc.rs
@@ -80,8 +80,8 @@ impl PluginGc {
     ///
     /// The reason the plugin tells the GC rather than just stopping itself via `source` is that
     /// it can't guarantee that the plugin currently pointed to by `source` is itself, but if the
-    /// GC is still running, it hasn't received [`.stop_tracking()`] yet, which means it should be
-    /// the right plugin.
+    /// GC is still running, it hasn't received [`.stop_tracking()`](Self::stop_tracking) yet, which
+    /// means it should be the right plugin.
     pub fn exited(&self) {
         let _ = self.sender.send(PluginGcMsg::Exited);
     }
diff --git a/crates/nu-plugin-engine/src/source.rs b/crates/nu-plugin-engine/src/source.rs
index 9b388576c5..56043eccf5 100644
--- a/crates/nu-plugin-engine/src/source.rs
+++ b/crates/nu-plugin-engine/src/source.rs
@@ -26,7 +26,7 @@ impl PluginSource {
 
     /// Create a new fake source with a fake identity, for testing
     ///
-    /// Warning: [`.persistent()`] will always return an error.
+    /// Warning: [`.persistent()`](Self::persistent) will always return an error.
     pub fn new_fake(name: &str) -> PluginSource {
         PluginSource {
             identity: PluginIdentity::new_fake(name).into(),
diff --git a/crates/nu-plugin-protocol/src/evaluated_call.rs b/crates/nu-plugin-protocol/src/evaluated_call.rs
index 5e760693a5..c5cbcc5ba0 100644
--- a/crates/nu-plugin-protocol/src/evaluated_call.rs
+++ b/crates/nu-plugin-protocol/src/evaluated_call.rs
@@ -85,19 +85,19 @@ impl EvaluatedCall {
         self
     }
 
-    /// Builder variant of [`.add_positional()`].
+    /// Builder variant of [`.add_positional()`](Self::add_positional).
     pub fn with_positional(mut self, value: Value) -> Self {
         self.add_positional(value);
         self
     }
 
-    /// Builder variant of [`.add_named()`].
+    /// Builder variant of [`.add_named()`](Self::add_named).
     pub fn with_named(mut self, name: Spanned<impl Into<String>>, value: Value) -> Self {
         self.add_named(name, value);
         self
     }
 
-    /// Builder variant of [`.add_flag()`].
+    /// Builder variant of [`.add_flag()`](Self::add_flag).
     pub fn with_flag(mut self, name: Spanned<impl Into<String>>) -> Self {
         self.add_flag(name);
         self
diff --git a/crates/nu-plugin/src/plugin/command.rs b/crates/nu-plugin/src/plugin/command.rs
index a90555ac40..8e8adc9578 100644
--- a/crates/nu-plugin/src/plugin/command.rs
+++ b/crates/nu-plugin/src/plugin/command.rs
@@ -75,8 +75,8 @@ use crate::{EngineInterface, EvaluatedCall, Plugin};
 pub trait PluginCommand: Sync {
     /// The type of plugin this command runs on.
     ///
-    /// Since [`.run()`] takes a reference to the plugin, it is necessary to define the type of
-    /// plugin that the command expects here.
+    /// Since [`.run()`](Self::run) takes a reference to the plugin, it is necessary to define the
+    /// type of plugin that the command expects here.
     type Plugin: Plugin;
 
     /// The name of the command from within Nu.
@@ -96,9 +96,9 @@ pub trait PluginCommand: Sync {
 
     /// Additional documentation for usage of the command.
     ///
-    /// This is optional - any arguments documented by [`.signature()`] will be shown in the help
-    /// page automatically. However, this can be useful for explaining things that would be too
-    /// brief to include in [`.usage()`] and may span multiple lines.
+    /// This is optional - any arguments documented by [`.signature()`](Self::signature) will be
+    /// shown in the help page automatically. However, this can be useful for explaining things that
+    /// would be too brief to include in [`.usage()`](Self::usage) and may span multiple lines.
     fn extra_usage(&self) -> &str {
         ""
     }
diff --git a/crates/nu-plugin/src/plugin/interface/mod.rs b/crates/nu-plugin/src/plugin/interface/mod.rs
index c20e2adc39..10f787b222 100644
--- a/crates/nu-plugin/src/plugin/interface/mod.rs
+++ b/crates/nu-plugin/src/plugin/interface/mod.rs
@@ -618,8 +618,9 @@ impl EngineInterface {
 
     /// Get all environment variables from the engine.
     ///
-    /// Since this is quite a large map that has to be sent, prefer to use [`.get_env_var()`] if
-    /// the variables needed are known ahead of time and there are only a small number needed.
+    /// Since this is quite a large map that has to be sent, prefer to use
+    /// [`.get_env_var()`] (Self::get_env_var) if the variables needed are known ahead of time
+    /// and there are only a small number needed.
     ///
     /// # Example
     /// ```rust,no_run
@@ -873,9 +874,9 @@ impl EngineInterface {
     }
 
     /// Ask the engine for the identifier for a declaration. If found, the result can then be passed
-    /// to [`.call_decl()`] to call other internal commands.
+    /// to [`.call_decl()`](Self::call_decl) to call other internal commands.
     ///
-    /// See [`.call_decl()`] for an example.
+    /// See [`.call_decl()`](Self::call_decl) for an example.
     pub fn find_decl(&self, name: impl Into<String>) -> Result<Option<DeclId>, ShellError> {
         let call = EngineCall::FindDecl(name.into());
 
@@ -890,7 +891,7 @@ impl EngineInterface {
     }
 
     /// Ask the engine to call an internal command, using the declaration ID previously looked up
-    /// with [`.find_decl()`].
+    /// with [`.find_decl()`](Self::find_decl).
     ///
     /// # Example
     ///
@@ -1008,7 +1009,7 @@ impl Interface for EngineInterface {
 
 /// Keeps the plugin in the foreground as long as it is alive.
 ///
-/// Use [`.leave()`] to leave the foreground without ignoring the error.
+/// Use [`.leave()`](Self::leave) to leave the foreground without ignoring the error.
 pub struct ForegroundGuard(Option<EngineInterface>);
 
 impl ForegroundGuard {
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index fce24cebbd..8579295c32 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -832,9 +832,9 @@ impl EngineState {
 
     /// Optionally get a block by id, if it exists
     ///
-    /// Prefer to use [`.get_block()`] in most cases - `BlockId`s that don't exist are normally a
-    /// compiler error. This only exists to stop plugins from crashing the engine if they send us
-    /// something invalid.
+    /// Prefer to use [`.get_block()`](Self::get_block) in most cases - `BlockId`s that don't exist
+    /// are normally a compiler error. This only exists to stop plugins from crashing the engine if
+    /// they send us something invalid.
     pub fn try_get_block(&self, block_id: BlockId) -> Option<&Arc<Block>> {
         self.blocks.get(block_id)
     }
diff --git a/crates/nu-protocol/src/engine/stack.rs b/crates/nu-protocol/src/engine/stack.rs
index fbfb586762..7ba8268985 100644
--- a/crates/nu-protocol/src/engine/stack.rs
+++ b/crates/nu-protocol/src/engine/stack.rs
@@ -51,7 +51,7 @@ pub struct Stack {
     pub parent_stack: Option<Arc<Stack>>,
     /// Variables that have been deleted (this is used to hide values from parent stack lookups)
     pub parent_deletions: Vec<VarId>,
-    /// Locally updated config. Use [`.get_config()`] to access correctly.
+    /// Locally updated config. Use [`.get_config()`](Self::get_config) to access correctly.
     pub config: Option<Arc<Config>>,
     pub(crate) out_dest: StackOutDest,
 }
diff --git a/crates/nu-protocol/src/errors/labeled_error.rs b/crates/nu-protocol/src/errors/labeled_error.rs
index 20ac9cff71..c76a6c78dd 100644
--- a/crates/nu-protocol/src/errors/labeled_error.rs
+++ b/crates/nu-protocol/src/errors/labeled_error.rs
@@ -37,7 +37,8 @@ pub struct LabeledError {
 impl LabeledError {
     /// Create a new plain [`LabeledError`] with the given message.
     ///
-    /// This is usually used builder-style with methods like [`.with_label()`] to build an error.
+    /// This is usually used builder-style with methods like [`.with_label()`](Self::with_label) to
+    /// build an error.
     ///
     /// # Example
     ///
diff --git a/crates/nu-protocol/src/pipeline/pipeline_data.rs b/crates/nu-protocol/src/pipeline/pipeline_data.rs
index 0d1c0b3092..2ae8027f06 100644
--- a/crates/nu-protocol/src/pipeline/pipeline_data.rs
+++ b/crates/nu-protocol/src/pipeline/pipeline_data.rs
@@ -117,7 +117,8 @@ impl PipelineData {
     /// Get a type that is representative of the `PipelineData`.
     ///
     /// The type returned here makes no effort to collect a stream, so it may be a different type
-    /// than would be returned by [`Value::get_type()`] on the result of [`.into_value()`].
+    /// than would be returned by [`Value::get_type()`] on the result of
+    /// [`.into_value()`](Self::into_value).
     ///
     /// Specifically, a `ListStream` results in [`list stream`](Type::ListStream) rather than
     /// the fully complete [`list`](Type::List) type (which would require knowing the contents),
diff --git a/crates/nu-system/src/foreground.rs b/crates/nu-system/src/foreground.rs
index 2fe3c4fb29..bd78f616aa 100644
--- a/crates/nu-system/src/foreground.rs
+++ b/crates/nu-system/src/foreground.rs
@@ -105,10 +105,10 @@ impl Drop for ForegroundChild {
 ///
 /// If there is already a foreground external process running, spawned with [`ForegroundChild`],
 /// this expects the process ID to remain in the process group created by the [`ForegroundChild`]
-/// for the lifetime of the guard, and keeps the terminal controlling process group set to that. If
-/// there is no foreground external process running, this sets the foreground process group to the
-/// plugin's process ID. The process group that is expected can be retrieved with [`.pgrp()`] if
-/// different from the plugin process ID.
+/// for the lifetime of the guard, and keeps the terminal controlling process group set to that.
+/// If there is no foreground external process running, this sets the foreground process group to
+/// the plugin's process ID. The process group that is expected can be retrieved with
+/// [`.pgrp()`](Self::pgrp) if different from the plugin process ID.
 ///
 /// ## Other systems
 ///

From f7d6c28a001f94f224e459e21df0da2ab5bdc923 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Mon, 29 Jul 2024 16:31:36 -0700
Subject: [PATCH 0268/1072] Release 0.96.1


From c31291753c0ab5383edcd2d3f93bc7d9eab69658 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Mon, 29 Jul 2024 17:20:55 -0700
Subject: [PATCH 0269/1072] Bump version to `0.96.2` (#13485)

This should be the new development version. We most likely don't need a
0.96.2 patch release. Should be free to merge PRs after this.
---
 Cargo.lock                                    | 74 +++++++++----------
 Cargo.toml                                    | 40 +++++-----
 crates/nu-cli/Cargo.toml                      | 24 +++---
 crates/nu-cmd-base/Cargo.toml                 | 10 +--
 crates/nu-cmd-extra/Cargo.toml                | 22 +++---
 crates/nu-cmd-lang/Cargo.toml                 | 10 +--
 crates/nu-cmd-plugin/Cargo.toml               | 10 +--
 crates/nu-color-config/Cargo.toml             | 10 +--
 crates/nu-command/Cargo.toml                  | 34 ++++-----
 crates/nu-derive-value/Cargo.toml             |  2 +-
 crates/nu-engine/Cargo.toml                   | 10 +--
 crates/nu-explore/Cargo.toml                  | 18 ++---
 crates/nu-glob/Cargo.toml                     |  2 +-
 crates/nu-json/Cargo.toml                     |  6 +-
 crates/nu-lsp/Cargo.toml                      | 14 ++--
 crates/nu-parser/Cargo.toml                   | 10 +--
 crates/nu-path/Cargo.toml                     |  2 +-
 crates/nu-plugin-core/Cargo.toml              |  6 +-
 crates/nu-plugin-engine/Cargo.toml            | 14 ++--
 crates/nu-plugin-protocol/Cargo.toml          |  6 +-
 crates/nu-plugin-test-support/Cargo.toml      | 18 ++---
 crates/nu-plugin/Cargo.toml                   | 12 +--
 crates/nu-pretty-hex/Cargo.toml               |  2 +-
 crates/nu-protocol/Cargo.toml                 | 12 +--
 crates/nu-std/Cargo.toml                      |  8 +-
 crates/nu-system/Cargo.toml                   |  2 +-
 crates/nu-table/Cargo.toml                    | 12 +--
 crates/nu-term-grid/Cargo.toml                |  4 +-
 crates/nu-test-support/Cargo.toml             |  8 +-
 crates/nu-utils/Cargo.toml                    |  2 +-
 .../src/sample_config/default_config.nu       |  2 +-
 .../nu-utils/src/sample_config/default_env.nu |  2 +-
 crates/nu_plugin_custom_values/Cargo.toml     |  6 +-
 crates/nu_plugin_example/Cargo.toml           | 10 +--
 crates/nu_plugin_formats/Cargo.toml           |  8 +-
 crates/nu_plugin_gstat/Cargo.toml             |  6 +-
 crates/nu_plugin_inc/Cargo.toml               |  6 +-
 .../nu_plugin_nu_example.nu                   |  2 +-
 crates/nu_plugin_polars/Cargo.toml            | 20 ++---
 .../nu_plugin_python_example.py               |  2 +-
 crates/nu_plugin_query/Cargo.toml             |  6 +-
 crates/nu_plugin_stress_internals/Cargo.toml  |  2 +-
 crates/nuon/Cargo.toml                        |  8 +-
 43 files changed, 242 insertions(+), 242 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bf665fc8b9..576cb960a4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2868,7 +2868,7 @@ dependencies = [
 
 [[package]]
 name = "nu"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "assert_cmd",
  "crossterm",
@@ -2922,7 +2922,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cli"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "chrono",
  "crossterm",
@@ -2957,7 +2957,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-base"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "indexmap",
  "miette",
@@ -2969,7 +2969,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-extra"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "fancy-regex",
  "heck 0.5.0",
@@ -2994,7 +2994,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-lang"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "itertools 0.12.1",
  "nu-engine",
@@ -3006,7 +3006,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-plugin"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "itertools 0.12.1",
  "nu-engine",
@@ -3017,7 +3017,7 @@ dependencies = [
 
 [[package]]
 name = "nu-color-config"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "nu-ansi-term",
  "nu-engine",
@@ -3029,7 +3029,7 @@ dependencies = [
 
 [[package]]
 name = "nu-command"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "alphanumeric-sort",
  "base64 0.22.1",
@@ -3139,7 +3139,7 @@ dependencies = [
 
 [[package]]
 name = "nu-derive-value"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "convert_case",
  "proc-macro-error",
@@ -3150,7 +3150,7 @@ dependencies = [
 
 [[package]]
 name = "nu-engine"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "log",
  "nu-glob",
@@ -3161,7 +3161,7 @@ dependencies = [
 
 [[package]]
 name = "nu-explore"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "ansi-str",
  "anyhow",
@@ -3186,14 +3186,14 @@ dependencies = [
 
 [[package]]
 name = "nu-glob"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "doc-comment",
 ]
 
 [[package]]
 name = "nu-json"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "fancy-regex",
  "linked-hash-map",
@@ -3206,7 +3206,7 @@ dependencies = [
 
 [[package]]
 name = "nu-lsp"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "assert-json-diff",
  "crossbeam-channel",
@@ -3227,7 +3227,7 @@ dependencies = [
 
 [[package]]
 name = "nu-parser"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "bytesize",
  "chrono",
@@ -3243,7 +3243,7 @@ dependencies = [
 
 [[package]]
 name = "nu-path"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "dirs",
  "omnipath",
@@ -3252,7 +3252,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "log",
  "nix",
@@ -3268,7 +3268,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-core"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "interprocess",
  "log",
@@ -3282,7 +3282,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-engine"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "log",
  "nu-engine",
@@ -3298,7 +3298,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-protocol"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "bincode",
  "nu-protocol",
@@ -3310,7 +3310,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-test-support"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "nu-ansi-term",
  "nu-cmd-lang",
@@ -3328,7 +3328,7 @@ dependencies = [
 
 [[package]]
 name = "nu-pretty-hex"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "heapless",
  "nu-ansi-term",
@@ -3337,7 +3337,7 @@ dependencies = [
 
 [[package]]
 name = "nu-protocol"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "brotli",
  "byte-unit",
@@ -3374,7 +3374,7 @@ dependencies = [
 
 [[package]]
 name = "nu-std"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "log",
  "miette",
@@ -3385,7 +3385,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "chrono",
  "itertools 0.12.1",
@@ -3403,7 +3403,7 @@ dependencies = [
 
 [[package]]
 name = "nu-table"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "fancy-regex",
  "nu-ansi-term",
@@ -3417,7 +3417,7 @@ dependencies = [
 
 [[package]]
 name = "nu-term-grid"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "nu-utils",
  "unicode-width",
@@ -3425,7 +3425,7 @@ dependencies = [
 
 [[package]]
 name = "nu-test-support"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -3437,7 +3437,7 @@ dependencies = [
 
 [[package]]
 name = "nu-utils"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "crossterm_winapi",
  "log",
@@ -3463,7 +3463,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_example"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "nu-cmd-lang",
  "nu-plugin",
@@ -3473,7 +3473,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_formats"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "eml-parser",
  "ical",
@@ -3486,7 +3486,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_gstat"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "git2",
  "nu-plugin",
@@ -3495,7 +3495,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_inc"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -3504,7 +3504,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_polars"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "chrono",
  "chrono-tz 0.9.0",
@@ -3538,7 +3538,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_query"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "gjson",
  "nu-plugin",
@@ -3553,7 +3553,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_stress_internals"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "interprocess",
  "serde",
@@ -3679,7 +3679,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "nuon"
-version = "0.96.1"
+version = "0.96.2"
 dependencies = [
  "chrono",
  "fancy-regex",
diff --git a/Cargo.toml b/Cargo.toml
index 3d8e3a9385..ce3624d873 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
 rust-version = "1.77.2"
-version = "0.96.1"
+version = "0.96.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -183,22 +183,22 @@ windows-sys = "0.48"
 winreg = "0.52"
 
 [dependencies]
-nu-cli = { path = "./crates/nu-cli", version = "0.96.1" }
-nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.96.1" }
-nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.96.1" }
-nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.96.1", optional = true }
-nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.96.1" }
-nu-command = { path = "./crates/nu-command", version = "0.96.1" }
-nu-engine = { path = "./crates/nu-engine", version = "0.96.1" }
-nu-explore = { path = "./crates/nu-explore", version = "0.96.1" }
-nu-lsp = { path = "./crates/nu-lsp/", version = "0.96.1" }
-nu-parser = { path = "./crates/nu-parser", version = "0.96.1" }
-nu-path = { path = "./crates/nu-path", version = "0.96.1" }
-nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.96.1" }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.96.1" }
-nu-std = { path = "./crates/nu-std", version = "0.96.1" }
-nu-system = { path = "./crates/nu-system", version = "0.96.1" }
-nu-utils = { path = "./crates/nu-utils", version = "0.96.1" }
+nu-cli = { path = "./crates/nu-cli", version = "0.96.2" }
+nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.96.2" }
+nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.96.2" }
+nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.96.2", optional = true }
+nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.96.2" }
+nu-command = { path = "./crates/nu-command", version = "0.96.2" }
+nu-engine = { path = "./crates/nu-engine", version = "0.96.2" }
+nu-explore = { path = "./crates/nu-explore", version = "0.96.2" }
+nu-lsp = { path = "./crates/nu-lsp/", version = "0.96.2" }
+nu-parser = { path = "./crates/nu-parser", version = "0.96.2" }
+nu-path = { path = "./crates/nu-path", version = "0.96.2" }
+nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.96.2" }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.96.2" }
+nu-std = { path = "./crates/nu-std", version = "0.96.2" }
+nu-system = { path = "./crates/nu-system", version = "0.96.2" }
+nu-utils = { path = "./crates/nu-utils", version = "0.96.2" }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
 crossterm = { workspace = true }
@@ -227,9 +227,9 @@ nix = { workspace = true, default-features = false, features = [
 ] }
 
 [dev-dependencies]
-nu-test-support = { path = "./crates/nu-test-support", version = "0.96.1" }
-nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.96.1" }
-nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.96.1" }
+nu-test-support = { path = "./crates/nu-test-support", version = "0.96.2" }
+nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.96.2" }
+nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.96.2" }
 assert_cmd = "2.0"
 dirs = { workspace = true }
 tango-bench = "0.5"
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 1be1470daf..54af510916 100644
--- 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.96.1"
+version = "0.96.2"
 
 [lib]
 bench = false
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.1" }
-nu-command = { path = "../nu-command", version = "0.96.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.96.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.2" }
+nu-command = { path = "../nu-command", version = "0.96.2" }
+nu-test-support = { path = "../nu-test-support", version = "0.96.2" }
 rstest = { workspace = true, default-features = false }
 tempfile = { workspace = true }
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.96.1" }
-nu-engine = { path = "../nu-engine", version = "0.96.1" }
-nu-path = { path = "../nu-path", version = "0.96.1" }
-nu-parser = { path = "../nu-parser", version = "0.96.1" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.96.1", optional = true }
-nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
-nu-utils = { path = "../nu-utils", version = "0.96.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.96.1" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.96.2" }
+nu-engine = { path = "../nu-engine", version = "0.96.2" }
+nu-path = { path = "../nu-path", version = "0.96.2" }
+nu-parser = { path = "../nu-parser", version = "0.96.2" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.96.2", optional = true }
+nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
+nu-utils = { path = "../nu-utils", version = "0.96.2" }
+nu-color-config = { path = "../nu-color-config", version = "0.96.2" }
 nu-ansi-term = { workspace = true }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
diff --git a/crates/nu-cmd-base/Cargo.toml b/crates/nu-cmd-base/Cargo.toml
index 0fdb51eca8..568633d481 100644
--- 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.96.1"
+version = "0.96.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.96.1" }
-nu-parser = { path = "../nu-parser", version = "0.96.1" }
-nu-path = { path = "../nu-path", version = "0.96.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
+nu-engine = { path = "../nu-engine", version = "0.96.2" }
+nu-parser = { path = "../nu-parser", version = "0.96.2" }
+nu-path = { path = "../nu-path", version = "0.96.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
 
 indexmap = { workspace = true }
 miette = { workspace = true }
diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml
index f9cc539c92..4e76ea679b 100644
--- 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.96.1"
+version = "0.96.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,13 +13,13 @@ version = "0.96.1"
 bench = false
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.96.1" }
-nu-engine = { path = "../nu-engine", version = "0.96.1" }
-nu-json = { version = "0.96.1", path = "../nu-json" }
-nu-parser = { path = "../nu-parser", version = "0.96.1" }
-nu-pretty-hex = { version = "0.96.1", path = "../nu-pretty-hex" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
-nu-utils = { path = "../nu-utils", version = "0.96.1" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.96.2" }
+nu-engine = { path = "../nu-engine", version = "0.96.2" }
+nu-json = { version = "0.96.2", path = "../nu-json" }
+nu-parser = { path = "../nu-parser", version = "0.96.2" }
+nu-pretty-hex = { version = "0.96.2", path = "../nu-pretty-hex" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
+nu-utils = { path = "../nu-utils", version = "0.96.2" }
 
 # 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.96.1" }
-nu-command = { path = "../nu-command", version = "0.96.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.96.1" }
\ No newline at end of file
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.2" }
+nu-command = { path = "../nu-command", version = "0.96.2" }
+nu-test-support = { path = "../nu-test-support", version = "0.96.2" }
\ No newline at end of file
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index 7a92894f54..e6a15f7bf9 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -6,16 +6,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-lang"
 edition = "2021"
 license = "MIT"
 name = "nu-cmd-lang"
-version = "0.96.1"
+version = "0.96.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.96.1" }
-nu-parser = { path = "../nu-parser", version = "0.96.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
-nu-utils = { path = "../nu-utils", version = "0.96.1" }
+nu-engine = { path = "../nu-engine", version = "0.96.2" }
+nu-parser = { path = "../nu-parser", version = "0.96.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
+nu-utils = { path = "../nu-utils", version = "0.96.2" }
 
 itertools = { workspace = true }
 shadow-rs = { version = "0.29", default-features = false }
diff --git a/crates/nu-cmd-plugin/Cargo.toml b/crates/nu-cmd-plugin/Cargo.toml
index 7a2c28e69f..490e61a755 100644
--- a/crates/nu-cmd-plugin/Cargo.toml
+++ b/crates/nu-cmd-plugin/Cargo.toml
@@ -5,15 +5,15 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-plugin"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-plugin"
-version = "0.96.1"
+version = "0.96.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.96.1" }
-nu-path = { path = "../nu-path", version = "0.96.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.1", features = ["plugin"] }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.96.1" }
+nu-engine = { path = "../nu-engine", version = "0.96.2" }
+nu-path = { path = "../nu-path", version = "0.96.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.2", features = ["plugin"] }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.96.2" }
 
 itertools = { workspace = true }
 
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index 7dd1edf899..87f282e752 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -5,18 +5,18 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-color-confi
 edition = "2021"
 license = "MIT"
 name = "nu-color-config"
-version = "0.96.1"
+version = "0.96.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
-nu-engine = { path = "../nu-engine", version = "0.96.1" }
-nu-json = { path = "../nu-json", version = "0.96.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
+nu-engine = { path = "../nu-engine", version = "0.96.2" }
+nu-json = { path = "../nu-json", version = "0.96.2" }
 nu-ansi-term = { workspace = true }
 
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.96.1" }
\ No newline at end of file
+nu-test-support = { path = "../nu-test-support", version = "0.96.2" }
\ No newline at end of file
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 61ae01d69b..d1defd4327 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-command"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
-version = "0.96.1"
+version = "0.96.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,21 +13,21 @@ version = "0.96.1"
 bench = false
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.96.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.96.1" }
-nu-engine = { path = "../nu-engine", version = "0.96.1" }
-nu-glob = { path = "../nu-glob", version = "0.96.1" }
-nu-json = { path = "../nu-json", version = "0.96.1" }
-nu-parser = { path = "../nu-parser", version = "0.96.1" }
-nu-path = { path = "../nu-path", version = "0.96.1" }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.96.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
-nu-system = { path = "../nu-system", version = "0.96.1" }
-nu-table = { path = "../nu-table", version = "0.96.1" }
-nu-term-grid = { path = "../nu-term-grid", version = "0.96.1" }
-nu-utils = { path = "../nu-utils", version = "0.96.1" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.96.2" }
+nu-color-config = { path = "../nu-color-config", version = "0.96.2" }
+nu-engine = { path = "../nu-engine", version = "0.96.2" }
+nu-glob = { path = "../nu-glob", version = "0.96.2" }
+nu-json = { path = "../nu-json", version = "0.96.2" }
+nu-parser = { path = "../nu-parser", version = "0.96.2" }
+nu-path = { path = "../nu-path", version = "0.96.2" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.96.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
+nu-system = { path = "../nu-system", version = "0.96.2" }
+nu-table = { path = "../nu-table", version = "0.96.2" }
+nu-term-grid = { path = "../nu-term-grid", version = "0.96.2" }
+nu-utils = { path = "../nu-utils", version = "0.96.2" }
 nu-ansi-term = { workspace = true }
-nuon = { path = "../nuon", version = "0.96.1" }
+nuon = { path = "../nuon", version = "0.96.2" }
 
 alphanumeric-sort = { workspace = true }
 base64 = { workspace = true }
@@ -137,8 +137,8 @@ sqlite = ["rusqlite"]
 trash-support = ["trash"]
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.96.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.2" }
+nu-test-support = { path = "../nu-test-support", version = "0.96.2" }
 
 dirs = { workspace = true }
 mockito = { workspace = true, default-features = false }
diff --git a/crates/nu-derive-value/Cargo.toml b/crates/nu-derive-value/Cargo.toml
index b4d9fe341f..0e76564308 100644
--- a/crates/nu-derive-value/Cargo.toml
+++ b/crates/nu-derive-value/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-derive-value"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-derive-value"
-version = "0.96.1"
+version = "0.96.2"
 
 [lib]
 proc-macro = true
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index 44b049f38a..be544265fe 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-engine"
 edition = "2021"
 license = "MIT"
 name = "nu-engine"
-version = "0.96.1"
+version = "0.96.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.96.1" }
-nu-path = { path = "../nu-path", version = "0.96.1" }
-nu-glob = { path = "../nu-glob", version = "0.96.1" }
-nu-utils = { path = "../nu-utils", version = "0.96.1" }
+nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.96.2" }
+nu-path = { path = "../nu-path", version = "0.96.2" }
+nu-glob = { path = "../nu-glob", version = "0.96.2" }
+nu-utils = { path = "../nu-utils", version = "0.96.2" }
 log = { workspace = true }
 
 [features]
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index 26087b98ec..1d0c081760 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -5,21 +5,21 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-explore"
 edition = "2021"
 license = "MIT"
 name = "nu-explore"
-version = "0.96.1"
+version = "0.96.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
-nu-parser = { path = "../nu-parser", version = "0.96.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.96.1" }
-nu-engine = { path = "../nu-engine", version = "0.96.1" }
-nu-table = { path = "../nu-table", version = "0.96.1" }
-nu-json = { path = "../nu-json", version = "0.96.1" }
-nu-utils = { path = "../nu-utils", version = "0.96.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
+nu-parser = { path = "../nu-parser", version = "0.96.2" }
+nu-color-config = { path = "../nu-color-config", version = "0.96.2" }
+nu-engine = { path = "../nu-engine", version = "0.96.2" }
+nu-table = { path = "../nu-table", version = "0.96.2" }
+nu-json = { path = "../nu-json", version = "0.96.2" }
+nu-utils = { path = "../nu-utils", version = "0.96.2" }
 nu-ansi-term = { workspace = true }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.96.1" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.96.2" }
 
 anyhow = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-glob/Cargo.toml b/crates/nu-glob/Cargo.toml
index acfaf2fbb3..31d88e841e 100644
--- a/crates/nu-glob/Cargo.toml
+++ b/crates/nu-glob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-glob"
-version = "0.96.1"
+version = "0.96.2"
 authors = ["The Nushell Project Developers", "The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 description = """
diff --git a/crates/nu-json/Cargo.toml b/crates/nu-json/Cargo.toml
index d4d64a26e3..9cfc35a1c8 100644
--- a/crates/nu-json/Cargo.toml
+++ b/crates/nu-json/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-json"
 edition = "2021"
 license = "MIT"
 name = "nu-json"
-version = "0.96.1"
+version = "0.96.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -26,7 +26,7 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.96.1" }
-nu-path = { path = "../nu-path", version = "0.96.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.96.2" }
+nu-path = { path = "../nu-path", version = "0.96.2" }
 serde_json = "1.0"
 fancy-regex = "0.13.0"
\ No newline at end of file
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index fc2b1d76fa..46a9276126 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -3,14 +3,14 @@ authors = ["The Nushell Project Developers"]
 description = "Nushell's integrated LSP server"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-lsp"
 name = "nu-lsp"
-version = "0.96.1"
+version = "0.96.2"
 edition = "2021"
 license = "MIT"
 
 [dependencies]
-nu-cli = { path = "../nu-cli", version = "0.96.1" }
-nu-parser = { path = "../nu-parser", version = "0.96.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
+nu-cli = { path = "../nu-cli", version = "0.96.2" }
+nu-parser = { path = "../nu-parser", version = "0.96.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
 
 reedline = { workspace = true }
 
@@ -23,8 +23,8 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.1" }
-nu-command = { path = "../nu-command", version = "0.96.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.96.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.2" }
+nu-command = { path = "../nu-command", version = "0.96.2" }
+nu-test-support = { path = "../nu-test-support", version = "0.96.2" }
 
 assert-json-diff = "2.0"
\ No newline at end of file
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index da8f63d42b..d929deef08 100644
--- a/crates/nu-parser/Cargo.toml
+++ b/crates/nu-parser/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-parser"
 edition = "2021"
 license = "MIT"
 name = "nu-parser"
-version = "0.96.1"
+version = "0.96.2"
 exclude = ["/fuzz"]
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.96.1" }
-nu-path = { path = "../nu-path", version = "0.96.1" }
-nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.96.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
+nu-engine = { path = "../nu-engine", version = "0.96.2" }
+nu-path = { path = "../nu-path", version = "0.96.2" }
+nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.96.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
 
 bytesize = { workspace = true }
 chrono = { default-features = false, features = ['std'], workspace = true }
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index ff49140bd2..c1e368aa7e 100644
--- a/crates/nu-path/Cargo.toml
+++ b/crates/nu-path/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-path"
 edition = "2021"
 license = "MIT"
 name = "nu-path"
-version = "0.96.1"
+version = "0.96.2"
 exclude = ["/fuzz"]
 
 [lib]
diff --git a/crates/nu-plugin-core/Cargo.toml b/crates/nu-plugin-core/Cargo.toml
index 21119a442c..0bdafbbdf5 100644
--- a/crates/nu-plugin-core/Cargo.toml
+++ b/crates/nu-plugin-core/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-core
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-core"
-version = "0.96.1"
+version = "0.96.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.96.1", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.96.2", default-features = false }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true }
diff --git a/crates/nu-plugin-engine/Cargo.toml b/crates/nu-plugin-engine/Cargo.toml
index 189b9b0713..0a58c1af72 100644
--- a/crates/nu-plugin-engine/Cargo.toml
+++ b/crates/nu-plugin-engine/Cargo.toml
@@ -5,18 +5,18 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-engi
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-engine"
-version = "0.96.1"
+version = "0.96.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.96.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
-nu-system = { path = "../nu-system", version = "0.96.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.96.1" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.96.1", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.96.1" }
+nu-engine = { path = "../nu-engine", version = "0.96.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
+nu-system = { path = "../nu-system", version = "0.96.2" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.96.2" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.96.2", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.96.2" }
 
 serde = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-plugin-protocol/Cargo.toml b/crates/nu-plugin-protocol/Cargo.toml
index 68b859f213..60226f3674 100644
--- a/crates/nu-plugin-protocol/Cargo.toml
+++ b/crates/nu-plugin-protocol/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-prot
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-protocol"
-version = "0.96.1"
+version = "0.96.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.96.1", features = ["plugin"] }
-nu-utils = { path = "../nu-utils", version = "0.96.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.2", features = ["plugin"] }
+nu-utils = { path = "../nu-utils", version = "0.96.2" }
 
 bincode = "1.3"
 serde = { workspace = true, features = ["derive"] }
diff --git a/crates/nu-plugin-test-support/Cargo.toml b/crates/nu-plugin-test-support/Cargo.toml
index f33d997939..344ccb1c2d 100644
--- a/crates/nu-plugin-test-support/Cargo.toml
+++ b/crates/nu-plugin-test-support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-plugin-test-support"
-version = "0.96.1"
+version = "0.96.2"
 edition = "2021"
 license = "MIT"
 description = "Testing support for Nushell plugins"
@@ -12,14 +12,14 @@ bench = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.96.1", features = ["plugin"] }
-nu-protocol = { path = "../nu-protocol", version = "0.96.1", features = ["plugin"] }
-nu-parser = { path = "../nu-parser", version = "0.96.1", features = ["plugin"] }
-nu-plugin = { path = "../nu-plugin", version = "0.96.1" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.96.1" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.96.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.96.1" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.1" }
+nu-engine = { path = "../nu-engine", version = "0.96.2", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.96.2", features = ["plugin"] }
+nu-parser = { path = "../nu-parser", version = "0.96.2", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.96.2" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.96.2" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.96.2" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.96.2" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.2" }
 nu-ansi-term = { workspace = true }
 similar = "2.5"
 
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index b7fff9bf72..80c9f74471 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin"
 edition = "2021"
 license = "MIT"
 name = "nu-plugin"
-version = "0.96.1"
+version = "0.96.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.96.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.96.1" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.96.1", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.96.1" }
+nu-engine = { path = "../nu-engine", version = "0.96.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.96.2" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.96.2", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.96.2" }
 
 log = { workspace = true }
 thiserror = "1.0"
diff --git a/crates/nu-pretty-hex/Cargo.toml b/crates/nu-pretty-hex/Cargo.toml
index 7db01ca2cc..bf018dcf38 100644
--- a/crates/nu-pretty-hex/Cargo.toml
+++ b/crates/nu-pretty-hex/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-pretty-hex"
 edition = "2021"
 license = "MIT"
 name = "nu-pretty-hex"
-version = "0.96.1"
+version = "0.96.2"
 
 [lib]
 doctest = false
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index ff8ef86c9e..197131b3f4 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-protocol"
 edition = "2021"
 license = "MIT"
 name = "nu-protocol"
-version = "0.96.1"
+version = "0.96.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,10 +13,10 @@ version = "0.96.1"
 bench = false
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.96.1" }
-nu-path = { path = "../nu-path", version = "0.96.1" }
-nu-system = { path = "../nu-system", version = "0.96.1" }
-nu-derive-value = { path = "../nu-derive-value", version = "0.96.1" }
+nu-utils = { path = "../nu-utils", version = "0.96.2" }
+nu-path = { path = "../nu-path", version = "0.96.2" }
+nu-system = { path = "../nu-system", version = "0.96.2" }
+nu-derive-value = { path = "../nu-derive-value", version = "0.96.2" }
 
 brotli = { workspace = true, optional = true }
 byte-unit = { version = "5.1", features = [ "serde" ] }
@@ -53,7 +53,7 @@ plugin = [
 serde_json = { workspace = true }
 strum = "0.26"
 strum_macros = "0.26"
-nu-test-support = { path = "../nu-test-support", version = "0.96.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.96.2" }
 pretty_assertions = { workspace = true }
 rstest = { workspace = true }
 tempfile = { workspace = true }
diff --git a/crates/nu-std/Cargo.toml b/crates/nu-std/Cargo.toml
index d52ab617c1..f69cdc9180 100644
--- a/crates/nu-std/Cargo.toml
+++ b/crates/nu-std/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-std"
 edition = "2021"
 license = "MIT"
 name = "nu-std"
-version = "0.96.1"
+version = "0.96.2"
 
 [dependencies]
-nu-parser = { version = "0.96.1", path = "../nu-parser" }
-nu-protocol = { version = "0.96.1", path = "../nu-protocol" }
-nu-engine = { version = "0.96.1", path = "../nu-engine" }
+nu-parser = { version = "0.96.2", path = "../nu-parser" }
+nu-protocol = { version = "0.96.2", path = "../nu-protocol" }
+nu-engine = { version = "0.96.2", path = "../nu-engine" }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
 
 log = "0.4"
\ No newline at end of file
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index 1e1efba651..2059eb1c8c 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["The Nushell Project Developers", "procs creators"]
 description = "Nushell system querying"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-system"
 name = "nu-system"
-version = "0.96.1"
+version = "0.96.2"
 edition = "2021"
 license = "MIT"
 
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index 1f02ccb1c3..eafff13e81 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -5,20 +5,20 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-table"
 edition = "2021"
 license = "MIT"
 name = "nu-table"
-version = "0.96.1"
+version = "0.96.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
-nu-utils = { path = "../nu-utils", version = "0.96.1" }
-nu-engine = { path = "../nu-engine", version = "0.96.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.96.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
+nu-utils = { path = "../nu-utils", version = "0.96.2" }
+nu-engine = { path = "../nu-engine", version = "0.96.2" }
+nu-color-config = { path = "../nu-color-config", version = "0.96.2" }
 nu-ansi-term = { workspace = true }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 tabled = { workspace = true, features = ["color"], default-features = false }
 
 [dev-dependencies]
-# nu-test-support = { path="../nu-test-support", version = "0.96.1"  }
\ No newline at end of file
+# nu-test-support = { path="../nu-test-support", version = "0.96.2"  }
\ No newline at end of file
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index 348adb03af..a07740905c 100644
--- a/crates/nu-term-grid/Cargo.toml
+++ b/crates/nu-term-grid/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-term-grid"
 edition = "2021"
 license = "MIT"
 name = "nu-term-grid"
-version = "0.96.1"
+version = "0.96.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.96.1" }
+nu-utils = { path = "../nu-utils", version = "0.96.2" }
 
 unicode-width = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml
index 4a43d6b933..25328f7c25 100644
--- a/crates/nu-test-support/Cargo.toml
+++ b/crates/nu-test-support/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-test-suppor
 edition = "2021"
 license = "MIT"
 name = "nu-test-support"
-version = "0.96.1"
+version = "0.96.2"
 
 [lib]
 doctest = false
 bench = false
 
 [dependencies]
-nu-path = { path = "../nu-path", version = "0.96.1" }
-nu-glob = { path = "../nu-glob", version = "0.96.1" }
-nu-utils = { path = "../nu-utils", version = "0.96.1" }
+nu-path = { path = "../nu-path", version = "0.96.2" }
+nu-glob = { path = "../nu-glob", version = "0.96.2" }
+nu-utils = { path = "../nu-utils", version = "0.96.2" }
 
 num-format = { workspace = true }
 which = { workspace = true }
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index 4c1caddbbd..72c02fb538 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-utils"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-utils"
-version = "0.96.1"
+version = "0.96.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index 779c2e900c..0c78cf9ca1 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -1,6 +1,6 @@
 # Nushell Config File
 #
-# version = "0.96.1"
+# version = "0.96.2"
 
 # For more information on defining custom themes, see
 # https://www.nushell.sh/book/coloring_and_theming.html
diff --git a/crates/nu-utils/src/sample_config/default_env.nu b/crates/nu-utils/src/sample_config/default_env.nu
index 5d5cc46190..68e1a4006b 100644
--- a/crates/nu-utils/src/sample_config/default_env.nu
+++ b/crates/nu-utils/src/sample_config/default_env.nu
@@ -1,6 +1,6 @@
 # Nushell Environment Config File
 #
-# version = "0.96.1"
+# version = "0.96.2"
 
 def create_left_prompt [] {
     let dir = match (do --ignore-shell-errors { $env.PWD | path relative-to $nu.home-path }) {
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index 9643bf337e..03811f7fca 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -10,10 +10,10 @@ name = "nu_plugin_custom_values"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.96.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.96.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.2", features = ["plugin"] }
 serde = { workspace = true, default-features = false }
 typetag = "0.2"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.96.1" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.96.2" }
\ No newline at end of file
diff --git a/crates/nu_plugin_example/Cargo.toml b/crates/nu_plugin_example/Cargo.toml
index 8b24911026..cdb5a727c9 100644
--- a/crates/nu_plugin_example/Cargo.toml
+++ b/crates/nu_plugin_example/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_exam
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_example"
-version = "0.96.1"
+version = "0.96.2"
 
 [[bin]]
 name = "nu_plugin_example"
@@ -15,9 +15,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.96.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.96.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.2", features = ["plugin"] }
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.96.1" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.1" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.96.2" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.2" }
\ No newline at end of file
diff --git a/crates/nu_plugin_formats/Cargo.toml b/crates/nu_plugin_formats/Cargo.toml
index ac65f05080..dbf1b43657 100644
--- a/crates/nu_plugin_formats/Cargo.toml
+++ b/crates/nu_plugin_formats/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_form
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_formats"
-version = "0.96.1"
+version = "0.96.2"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.96.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.96.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.2", features = ["plugin"] }
 
 indexmap = { workspace = true }
 eml-parser = "0.1"
@@ -18,4 +18,4 @@ ical = "0.11"
 rust-ini = "0.21.0"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.96.1" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.96.2" }
\ No newline at end of file
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index 9bc09fc6c0..b53560473e 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gsta
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_gstat"
-version = "0.96.1"
+version = "0.96.2"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_gstat"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.96.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.96.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
 
 git2 = "0.19"
\ No newline at end of file
diff --git a/crates/nu_plugin_inc/Cargo.toml b/crates/nu_plugin_inc/Cargo.toml
index e82168463c..6462f96c0c 100644
--- a/crates/nu_plugin_inc/Cargo.toml
+++ b/crates/nu_plugin_inc/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_inc"
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_inc"
-version = "0.96.1"
+version = "0.96.2"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_inc"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.96.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.96.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.2", features = ["plugin"] }
 
 semver = "1.0"
\ No newline at end of file
diff --git a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
index e7c4f77365..68f87eaca0 100755
--- a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
+++ b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
@@ -6,7 +6,7 @@
 # it also allows us to test the plugin interface with something manually implemented in a scripting
 # language without adding any extra dependencies to our tests.
 
-const NUSHELL_VERSION = "0.96.1"
+const NUSHELL_VERSION = "0.96.2"
 const PLUGIN_VERSION = "0.1.0" # bump if you change commands!
 
 def main [--stdio] {
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index ad1181f2fe..095f33915a 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu_plugin_polars"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_polars"
-version = "0.96.1"
+version = "0.96.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -17,10 +17,10 @@ bench = false
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
-nu-plugin = { path = "../nu-plugin", version = "0.96.1" }
-nu-path = { path = "../nu-path", version = "0.96.1" }
-nu-utils = { path = "../nu-utils", version = "0.96.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
+nu-plugin = { path = "../nu-plugin", version = "0.96.2" }
+nu-path = { path = "../nu-path", version = "0.96.2" }
+nu-utils = { path = "../nu-utils", version = "0.96.2" }
 
 # Potential dependencies for extras
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
@@ -76,9 +76,9 @@ optional = false
 version = "0.41"
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.1" }
-nu-engine = { path = "../nu-engine", version = "0.96.1" }
-nu-parser = { path = "../nu-parser", version = "0.96.1" }
-nu-command = { path = "../nu-command", version = "0.96.1" }
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.96.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.2" }
+nu-engine = { path = "../nu-engine", version = "0.96.2" }
+nu-parser = { path = "../nu-parser", version = "0.96.2" }
+nu-command = { path = "../nu-command", version = "0.96.2" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.96.2" }
 tempfile.workspace = true
\ No newline at end of file
diff --git a/crates/nu_plugin_python/nu_plugin_python_example.py b/crates/nu_plugin_python/nu_plugin_python_example.py
index c0c530219f..5a0357e9ca 100755
--- a/crates/nu_plugin_python/nu_plugin_python_example.py
+++ b/crates/nu_plugin_python/nu_plugin_python_example.py
@@ -27,7 +27,7 @@ import sys
 import json
 
 
-NUSHELL_VERSION = "0.96.1"
+NUSHELL_VERSION = "0.96.2"
 PLUGIN_VERSION = "0.1.0" # bump if you change commands!
 
 
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index bb7e0f6bec..e3ed5ca2eb 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_quer
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_query"
-version = "0.96.1"
+version = "0.96.2"
 
 [lib]
 doctest = false
@@ -16,8 +16,8 @@ name = "nu_plugin_query"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.96.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.96.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
 
 gjson = "0.8"
 scraper = { default-features = false, version = "0.19" }
diff --git a/crates/nu_plugin_stress_internals/Cargo.toml b/crates/nu_plugin_stress_internals/Cargo.toml
index 872623f4ba..5871246587 100644
--- a/crates/nu_plugin_stress_internals/Cargo.toml
+++ b/crates/nu_plugin_stress_internals/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_stre
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_stress_internals"
-version = "0.96.1"
+version = "0.96.2"
 
 [[bin]]
 name = "nu_plugin_stress_internals"
diff --git a/crates/nuon/Cargo.toml b/crates/nuon/Cargo.toml
index b1ec4a2a69..296f3cc962 100644
--- a/crates/nuon/Cargo.toml
+++ b/crates/nuon/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nuon"
 edition = "2021"
 license = "MIT"
 name = "nuon"
-version = "0.96.1"
+version = "0.96.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-parser = { path = "../nu-parser", version = "0.96.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.1" }
-nu-engine = { path = "../nu-engine", version = "0.96.1" }
+nu-parser = { path = "../nu-parser", version = "0.96.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
+nu-engine = { path = "../nu-engine", version = "0.96.2" }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 

From e3f78b87937df2f16f32a905358f13a18785faaa Mon Sep 17 00:00:00 2001
From: Lee Wonjoon <lyuha@users.noreply.github.com>
Date: Tue, 30 Jul 2024 13:28:41 +0000
Subject: [PATCH 0270/1072] Keep forward slash when autocomplete on Windows
 (#13321)

Related #7044

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

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

When autocomplete path with `/` on Windows, paths keep with slash
instead of backslash(`\`).

If mixed both, path completion uses a last path seperator.


![image](https://github.com/nushell/nushell/assets/4014016/b09633fd-0e4a-4cd9-9c14-2bca30625804)


![image](https://github.com/nushell/nushell/assets/4014016/e1f228f8-4cce-43eb-a34a-dfa54efd2ebb)


![image](https://github.com/nushell/nushell/assets/4014016/0694443a-3017-4828-be60-5f39ffd96440)

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


![completion](https://github.com/nushell/nushell/assets/4014016/03626544-6a14-4d8b-a607-21a4472f8037)

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 .../src/completions/completion_common.rs      |  20 +-
 crates/nu-cli/tests/completions/mod.rs        | 229 +++++++++++++-----
 .../support/completions_helpers.rs            |  16 +-
 3 files changed, 186 insertions(+), 79 deletions(-)

diff --git a/crates/nu-cli/src/completions/completion_common.rs b/crates/nu-cli/src/completions/completion_common.rs
index b3bca778a9..d6882da57b 100644
--- a/crates/nu-cli/src/completions/completion_common.rs
+++ b/crates/nu-cli/src/completions/completion_common.rs
@@ -10,9 +10,7 @@ use nu_protocol::{
     levenshtein_distance, Span,
 };
 use nu_utils::get_ls_colors;
-use std::path::{
-    is_separator, Component, Path, PathBuf, MAIN_SEPARATOR as SEP, MAIN_SEPARATOR_STR,
-};
+use std::path::{is_separator, Component, Path, PathBuf, MAIN_SEPARATOR as SEP};
 
 use super::SortBy;
 
@@ -93,16 +91,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
     }
@@ -133,6 +131,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)
@@ -195,7 +201,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,
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index aa51e5c9bb..ad5dcaa70e 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -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 }"#;
@@ -123,28 +122,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]
@@ -153,7 +152,7 @@ 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]
@@ -182,19 +181,19 @@ fn dotnu_completions() {
     let completion_str = "source-env ".to_string();
     let suggestions = completer.complete(&completion_str, completion_str.len());
 
-    match_suggestions(expected.clone(), suggestions);
+    match_suggestions(&expected, &suggestions);
 
     // Test use completion
     let completion_str = "use ".to_string();
     let suggestions = completer.complete(&completion_str, completion_str.len());
 
-    match_suggestions(expected.clone(), suggestions);
+    match_suggestions(&expected, &suggestions);
 
     // Test overlay use completion
     let completion_str = "overlay use ".to_string();
     let suggestions = completer.complete(&completion_str, completion_str.len());
 
-    match_suggestions(expected, suggestions);
+    match_suggestions(&expected, &suggestions);
 }
 
 #[test]
@@ -258,8 +257,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")));
@@ -269,17 +282,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]
@@ -303,7 +390,7 @@ fn partial_completions() {
     ];
 
     // 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"
@@ -324,7 +411,7 @@ 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 dir_str = folder(dir.join("pa"));
@@ -345,7 +432,7 @@ fn partial_completions() {
     ];
 
     // 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"));
@@ -356,7 +443,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"));
@@ -392,7 +479,7 @@ 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"));
@@ -406,7 +493,7 @@ 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_ext."));
@@ -420,7 +507,7 @@ fn partial_completions() {
     ];
 
     // Match the results
-    match_suggestions(expected_paths, suggestions);
+    match_suggestions(&expected_paths, &suggestions);
 }
 
 #[test]
@@ -455,15 +542,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();
@@ -496,14 +584,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]
@@ -538,7 +626,7 @@ fn command_rm_with_globcompletion() {
         ".hidden_folder/".to_string(),
     ];
 
-    match_suggestions(expected_paths, suggestions)
+    match_suggestions(&expected_paths, &suggestions)
 }
 
 #[test]
@@ -573,7 +661,7 @@ fn command_cp_with_globcompletion() {
         ".hidden_folder/".to_string(),
     ];
 
-    match_suggestions(expected_paths, suggestions)
+    match_suggestions(&expected_paths, &suggestions)
 }
 
 #[test]
@@ -608,7 +696,7 @@ fn command_save_with_filecompletion() {
         ".hidden_folder/".to_string(),
     ];
 
-    match_suggestions(expected_paths, suggestions)
+    match_suggestions(&expected_paths, &suggestions)
 }
 
 #[test]
@@ -643,7 +731,7 @@ fn command_touch_with_filecompletion() {
         ".hidden_folder/".to_string(),
     ];
 
-    match_suggestions(expected_paths, suggestions)
+    match_suggestions(&expected_paths, &suggestions)
 }
 
 #[test]
@@ -678,7 +766,7 @@ fn command_watch_with_filecompletion() {
         ".hidden_folder/".to_string(),
     ];
 
-    match_suggestions(expected_paths, suggestions)
+    match_suggestions(&expected_paths, &suggestions)
 }
 
 #[rstest]
@@ -686,19 +774,19 @@ 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 aabrr".to_string()],
-        suggestions,
+        &vec!["foo bar".to_string(), "foo aabrr".to_string()],
+        &suggestions,
     );
 
     let prefix = "foo b";
     let suggestions = subcommand_completer.complete(prefix, prefix.len());
     match_suggestions(
-        vec![
+        &vec![
             "foo bar".to_string(),
             "foo abaz".to_string(),
             "foo aabrr".to_string(),
         ],
-        suggestions,
+        &suggestions,
     );
 }
 
@@ -724,7 +812,7 @@ fn file_completion_quoted() {
         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()));
@@ -735,7 +823,7 @@ fn file_completion_quoted() {
         format!("`{}`", file(dir.join("single quote"))),
     ];
 
-    match_suggestions(expected_paths, suggestions)
+    match_suggestions(&expected_paths, &suggestions)
 }
 
 #[test]
@@ -770,7 +858,7 @@ fn flag_completions() {
     ];
 
     // Match results
-    match_suggestions(expected, suggestions);
+    match_suggestions(&expected, &suggestions);
 }
 
 #[test]
@@ -794,8 +882,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]
@@ -837,7 +938,7 @@ fn variables_completions() {
     ];
 
     // Match results
-    match_suggestions(expected, suggestions);
+    match_suggestions(&expected, &suggestions);
 
     // Test completions for $nu.h (filter)
     let suggestions = completer.complete("$nu.h", 5);
@@ -851,7 +952,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);
@@ -863,7 +964,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);
@@ -873,7 +974,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);
@@ -883,7 +984,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);
@@ -896,7 +997,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);
@@ -906,12 +1007,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);
+    match_suggestions(&expected, &suggestions);
 }
 
 #[test]
@@ -930,7 +1031,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]
@@ -949,7 +1050,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]
@@ -971,7 +1072,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> {
@@ -1034,35 +1135,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]
@@ -1096,77 +1197,77 @@ 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);
 }
 
 #[ignore = "was reverted, still needs fixing"]
diff --git a/crates/nu-cli/tests/completions/support/completions_helpers.rs b/crates/nu-cli/tests/completions/support/completions_helpers.rs
index 623d6fbc5a..c6c2cba2a8 100644
--- a/crates/nu-cli/tests/completions/support/completions_helpers.rs
+++ b/crates/nu-cli/tests/completions/support/completions_helpers.rs
@@ -186,7 +186,7 @@ pub fn new_partial_engine() -> (AbsolutePathBuf, 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 {
@@ -196,13 +196,13 @@ pub fn match_suggestions(expected: Vec<String>, suggestions: Vec<Suggestion>) {
             Expected: {expected:#?}\n"
         )
     }
-    assert_eq!(
-        expected,
-        suggestions
-            .into_iter()
-            .map(|it| it.value)
-            .collect::<Vec<_>>()
-    );
+
+    let suggestoins_str = suggestions
+        .iter()
+        .map(|it| it.value.clone())
+        .collect::<Vec<_>>();
+
+    assert_eq!(expected, &suggestoins_str);
 }
 
 // append the separator to the converted path

From 7b82c6b4824f31ade80c57a104d92844438ad72a Mon Sep 17 00:00:00 2001
From: Andy Gayton <andy@thecablelounge.com>
Date: Tue, 30 Jul 2024 09:29:18 -0400
Subject: [PATCH 0271/1072] feat: make ctrlc available to plugins (#13181)

# Description

This PR adds a new method to `EngineInterface`: `register_ctrlc_handler`
which takes a closure to run when the plugin's driving engine receives a
ctrlc-signal. It also adds a mirror of the `signals` attribute from the
main shell `EngineState`.

This is an example of how a plugin which makes a long poll http request
can end the request on ctrlc:
https://github.com/cablehead/nu_plugin_http/blob/main/src/commands/request.rs#L68-L77

To facilitate the feature, a new attribute has been added to
`EngineState`: `ctrlc_handlers`. This is a Vec of closures that will be
run when the engine's process receives a ctrlc signal.

When plugins are added to an `engine_state` during a `merge_delta`, the
engine passes the ctrlc_handlers to the plugin's
`.configure_ctrlc_handler` method, which gives the plugin a chance to
register a handler that sends a ctrlc packet through the
`PluginInterface`, if an instance of the plugin is currently running.

On the plugin side: `EngineInterface` also has a ctrlc_handlers Vec of
closures. Plugin calls can use `register_ctrlc_handler` to register a
closure that will be called in the plugin process when the
PluginInput::Ctrlc command is received.

For future reference these are some alternate places that were
investigated for tying the ctrlc trigger to transmitting a Ctrlc packet
through the `PluginInterface`:

- Directly from `src/signals.rs`: the handler there would need a
reference to the Vec<Arc<RegisteredPlugins>>, which would require us to
wrap the plugins in a Mutex, which we don't want to do.

- have `PersistentPlugin.get_plugin` pass down the engine's
CtrlcHandlers to .get and then to .spawn (if the plugin isn't already
running). Once we have CtrlcHandlers in spawn, we can register a handler
to write directly to PluginInterface. We don't want to double down on
passing engine_state to spawn this way though, as it's unpredictable
because it would depend on whether the plugin has already been spawned
or not.

- pass `ctrlc_handlers` to PersistentPlugin::new so it can store it on
itself so it's available to spawn.

- in `PersistentPlugin.spawn`, create a handler that sends to a clone of
the GC event loop's tx. this has the same issues with regards to how to
get CtrlcHandlers to the spawn method, and is more complicated than a
handler that writes directly to PluginInterface

# User-Facing Changes

No breaking changes

---------

Co-authored-by: Ian Manske <ian.manske@pm.me>
---
 crates/nu-plugin-core/src/interface/mod.rs    |   7 +-
 crates/nu-plugin-core/src/interface/tests.rs  |   6 +-
 crates/nu-plugin-core/src/util/mod.rs         |   2 -
 crates/nu-plugin-engine/src/interface/mod.rs  |  12 +-
 crates/nu-plugin-engine/src/persistent.rs     |  33 ++++-
 crates/nu-plugin-protocol/src/lib.rs          |   2 +
 crates/nu-plugin/src/plugin/interface/mod.rs  |  34 ++++-
 crates/nu-protocol/src/engine/ctrlc.rs        | 139 ++++++++++++++++++
 crates/nu-protocol/src/engine/engine_state.rs |  10 +-
 crates/nu-protocol/src/engine/mod.rs          |   4 +
 .../src/engine}/sequence.rs                   |   2 +-
 crates/nu-protocol/src/pipeline/signals.rs    |   7 +
 crates/nu-protocol/src/plugin/registered.rs   |  10 +-
 .../nu_plugin_example/src/commands/ctrlc.rs   |  50 +++++++
 crates/nu_plugin_example/src/commands/mod.rs  |   2 +
 crates/nu_plugin_example/src/lib.rs           |   1 +
 src/signals.rs                                |  10 +-
 17 files changed, 310 insertions(+), 21 deletions(-)
 create mode 100644 crates/nu-protocol/src/engine/ctrlc.rs
 rename crates/{nu-plugin-core/src/util => nu-protocol/src/engine}/sequence.rs (98%)
 create mode 100644 crates/nu_plugin_example/src/commands/ctrlc.rs

diff --git a/crates/nu-plugin-core/src/interface/mod.rs b/crates/nu-plugin-core/src/interface/mod.rs
index d282eddd8b..6ce33cae4c 100644
--- a/crates/nu-plugin-core/src/interface/mod.rs
+++ b/crates/nu-plugin-core/src/interface/mod.rs
@@ -1,7 +1,10 @@
 //! Implements the stream multiplexing interface for both the plugin side and the engine side.
 
 use nu_plugin_protocol::{ByteStreamInfo, ListStreamInfo, PipelineDataHeader, StreamMessage};
-use nu_protocol::{ByteStream, IntoSpanned, ListStream, PipelineData, Reader, ShellError, Signals};
+use nu_protocol::{
+    engine::Sequence, ByteStream, IntoSpanned, ListStream, PipelineData, Reader, ShellError,
+    Signals,
+};
 use std::{
     io::{Read, Write},
     sync::Mutex,
@@ -10,7 +13,7 @@ use std::{
 
 pub mod stream;
 
-use crate::{util::Sequence, Encoder};
+use crate::Encoder;
 
 use self::stream::{StreamManager, StreamManagerHandle, StreamWriter, WriteStreamMessage};
 
diff --git a/crates/nu-plugin-core/src/interface/tests.rs b/crates/nu-plugin-core/src/interface/tests.rs
index 456eb547b5..cb28692706 100644
--- a/crates/nu-plugin-core/src/interface/tests.rs
+++ b/crates/nu-plugin-core/src/interface/tests.rs
@@ -1,5 +1,3 @@
-use crate::util::Sequence;
-
 use super::{
     stream::{StreamManager, StreamManagerHandle},
     test_util::TestCase,
@@ -10,8 +8,8 @@ use nu_plugin_protocol::{
     StreamMessage,
 };
 use nu_protocol::{
-    ByteStream, ByteStreamSource, ByteStreamType, DataSource, ListStream, PipelineData,
-    PipelineMetadata, ShellError, Signals, Span, Value,
+    engine::Sequence, ByteStream, ByteStreamSource, ByteStreamType, DataSource, ListStream,
+    PipelineData, PipelineMetadata, ShellError, Signals, Span, Value,
 };
 use std::{path::Path, sync::Arc};
 
diff --git a/crates/nu-plugin-core/src/util/mod.rs b/crates/nu-plugin-core/src/util/mod.rs
index e88b945831..1be1cfbef5 100644
--- a/crates/nu-plugin-core/src/util/mod.rs
+++ b/crates/nu-plugin-core/src/util/mod.rs
@@ -1,7 +1,5 @@
-mod sequence;
 mod waitable;
 mod with_custom_values_in;
 
-pub use sequence::Sequence;
 pub use waitable::*;
 pub use with_custom_values_in::with_custom_values_in;
diff --git a/crates/nu-plugin-engine/src/interface/mod.rs b/crates/nu-plugin-engine/src/interface/mod.rs
index 680b3b123f..78ed966dd6 100644
--- a/crates/nu-plugin-engine/src/interface/mod.rs
+++ b/crates/nu-plugin-engine/src/interface/mod.rs
@@ -1,7 +1,7 @@
 //! Interface used by the engine to communicate with the plugin.
 
 use nu_plugin_core::{
-    util::{with_custom_values_in, Sequence, Waitable, WaitableMut},
+    util::{with_custom_values_in, Waitable, WaitableMut},
     Interface, InterfaceManager, PipelineDataWriter, PluginRead, PluginWrite, StreamManager,
     StreamManagerHandle,
 };
@@ -11,8 +11,8 @@ use nu_plugin_protocol::{
     PluginOutput, ProtocolInfo, StreamId, StreamMessage,
 };
 use nu_protocol::{
-    ast::Operator, CustomValue, IntoSpanned, PipelineData, PluginMetadata, PluginSignature,
-    ShellError, Signals, Span, Spanned, Value,
+    ast::Operator, engine::Sequence, CustomValue, IntoSpanned, PipelineData, PluginMetadata,
+    PluginSignature, ShellError, Signals, Span, Spanned, Value,
 };
 use nu_utils::SharedCow;
 use std::{
@@ -664,6 +664,12 @@ impl PluginInterface {
         self.flush()
     }
 
+    /// Send the plugin a ctrl-c signal.
+    pub fn ctrlc(&self) -> Result<(), ShellError> {
+        self.write(PluginInput::Ctrlc)?;
+        self.flush()
+    }
+
     /// Write an [`EngineCallResponse`]. Writes the full stream contained in any [`PipelineData`]
     /// before returning.
     pub fn write_engine_call_response(
diff --git a/crates/nu-plugin-engine/src/persistent.rs b/crates/nu-plugin-engine/src/persistent.rs
index 6a87aa1e6b..69f5c7f7a8 100644
--- a/crates/nu-plugin-engine/src/persistent.rs
+++ b/crates/nu-plugin-engine/src/persistent.rs
@@ -6,7 +6,7 @@ use crate::{
 use super::{PluginInterface, PluginSource};
 use nu_plugin_core::CommunicationMode;
 use nu_protocol::{
-    engine::{EngineState, Stack},
+    engine::{ctrlc, EngineState, Stack},
     PluginGcConfig, PluginIdentity, PluginMetadata, RegisteredPlugin, ShellError,
 };
 use std::{
@@ -37,6 +37,8 @@ struct MutableState {
     preferred_mode: Option<PreferredCommunicationMode>,
     /// Garbage collector config
     gc_config: PluginGcConfig,
+    /// RAII guard for this plugin's ctrl-c handler
+    ctrlc_guard: Option<ctrlc::Guard>,
 }
 
 #[derive(Debug, Clone, Copy)]
@@ -64,6 +66,7 @@ impl PersistentPlugin {
                 metadata: None,
                 preferred_mode: None,
                 gc_config,
+                ctrlc_guard: None,
             }),
         }
     }
@@ -299,6 +302,34 @@ impl RegisteredPlugin for PersistentPlugin {
     fn as_any(self: Arc<Self>) -> Arc<dyn std::any::Any + Send + Sync> {
         self
     }
+
+    fn configure_ctrlc_handler(
+        self: Arc<Self>,
+        handlers: &ctrlc::Handlers,
+    ) -> Result<(), ShellError> {
+        let guard = {
+            // We take a weakref to the plugin so that we don't create a cycle to the
+            // RAII guard that will be stored on the plugin.
+            let plugin = Arc::downgrade(&self);
+            handlers.register(Box::new(move || {
+                // write a Ctrl-C packet through the PluginInterface if the plugin is alive and
+                // running
+                if let Some(plugin) = plugin.upgrade() {
+                    if let Ok(mutable) = plugin.mutable.lock() {
+                        if let Some(ref running) = mutable.running {
+                            let _ = running.interface.ctrlc();
+                        }
+                    }
+                }
+            }))?
+        };
+
+        if let Ok(mut mutable) = self.mutable.lock() {
+            mutable.ctrlc_guard = Some(guard);
+        }
+
+        Ok(())
+    }
 }
 
 /// Anything that can produce a plugin interface.
diff --git a/crates/nu-plugin-protocol/src/lib.rs b/crates/nu-plugin-protocol/src/lib.rs
index a9196a2d8d..1a2bbd99ff 100644
--- a/crates/nu-plugin-protocol/src/lib.rs
+++ b/crates/nu-plugin-protocol/src/lib.rs
@@ -208,6 +208,8 @@ pub enum PluginInput {
     Drop(StreamId),
     /// See [`StreamMessage::Ack`].
     Ack(StreamId),
+    /// Signal a ctrlc event
+    Ctrlc,
 }
 
 impl TryFrom<PluginInput> for StreamMessage {
diff --git a/crates/nu-plugin/src/plugin/interface/mod.rs b/crates/nu-plugin/src/plugin/interface/mod.rs
index 10f787b222..daf2d5b783 100644
--- a/crates/nu-plugin/src/plugin/interface/mod.rs
+++ b/crates/nu-plugin/src/plugin/interface/mod.rs
@@ -1,7 +1,7 @@
 //! Interface used by the plugin to communicate with the engine.
 
 use nu_plugin_core::{
-    util::{Sequence, Waitable, WaitableMut},
+    util::{Waitable, WaitableMut},
     Interface, InterfaceManager, PipelineDataWriter, PluginRead, PluginWrite, StreamManager,
     StreamManagerHandle,
 };
@@ -11,13 +11,14 @@ use nu_plugin_protocol::{
     PluginOutput, ProtocolInfo,
 };
 use nu_protocol::{
-    engine::Closure, Config, DeclId, LabeledError, PipelineData, PluginMetadata, PluginSignature,
-    ShellError, Signals, Span, Spanned, Value,
+    engine::{ctrlc, Closure, Sequence},
+    Config, DeclId, LabeledError, PipelineData, PluginMetadata, PluginSignature, ShellError,
+    Signals, Span, Spanned, Value,
 };
 use nu_utils::SharedCow;
 use std::{
     collections::{btree_map, BTreeMap, HashMap},
-    sync::{mpsc, Arc},
+    sync::{atomic::AtomicBool, mpsc, Arc},
 };
 
 /// Plugin calls that are received by the [`EngineInterfaceManager`] for handling.
@@ -63,6 +64,10 @@ struct EngineInterfaceState {
         mpsc::Sender<(EngineCallId, mpsc::Sender<EngineCallResponse<PipelineData>>)>,
     /// The synchronized output writer
     writer: Box<dyn PluginWrite<PluginOutput>>,
+    // Mirror signals from `EngineState`
+    signals: Signals,
+    /// Registered Ctrl-C handlers
+    ctrlc_handlers: ctrlc::Handlers,
 }
 
 impl std::fmt::Debug for EngineInterfaceState {
@@ -116,6 +121,8 @@ impl EngineInterfaceManager {
                 stream_id_sequence: Sequence::default(),
                 engine_call_subscription_sender: subscription_tx,
                 writer: Box::new(writer),
+                signals: Signals::new(Arc::new(AtomicBool::new(false))),
+                ctrlc_handlers: ctrlc::Handlers::new(),
             }),
             protocol_info_mut,
             plugin_call_sender: Some(plug_tx),
@@ -235,7 +242,6 @@ impl InterfaceManager for EngineInterfaceManager {
 
     fn consume(&mut self, input: Self::Input) -> Result<(), ShellError> {
         log::trace!("from engine: {:?}", input);
-
         match input {
             PluginInput::Hello(info) => {
                 let info = Arc::new(info);
@@ -331,6 +337,11 @@ impl InterfaceManager for EngineInterfaceManager {
                     });
                 self.send_engine_call_response(id, response)
             }
+            PluginInput::Ctrlc => {
+                self.state.signals.trigger();
+                self.state.ctrlc_handlers.run();
+                Ok(())
+            }
         }
     }
 
@@ -510,6 +521,15 @@ impl EngineInterface {
         self.state.writer.is_stdout()
     }
 
+    /// Register a closure which will be called when the engine receives a Ctrl-C signal. Returns a
+    /// RAII guard that will keep the closure alive until it is dropped.
+    pub fn register_ctrlc_handler(
+        &self,
+        handler: ctrlc::Handler,
+    ) -> Result<ctrlc::Guard, ShellError> {
+        self.state.ctrlc_handlers.register(handler)
+    }
+
     /// Get the full shell configuration from the engine. As this is quite a large object, it is
     /// provided on request only.
     ///
@@ -959,6 +979,10 @@ impl EngineInterface {
         self.write(PluginOutput::CallResponse(self.context()?, response))?;
         self.flush()
     }
+
+    pub fn signals(&self) -> &Signals {
+        &self.state.signals
+    }
 }
 
 impl Interface for EngineInterface {
diff --git a/crates/nu-protocol/src/engine/ctrlc.rs b/crates/nu-protocol/src/engine/ctrlc.rs
new file mode 100644
index 0000000000..11121f7c9c
--- /dev/null
+++ b/crates/nu-protocol/src/engine/ctrlc.rs
@@ -0,0 +1,139 @@
+use std::fmt::Debug;
+use std::sync::{Arc, Mutex};
+
+use crate::{engine::Sequence, ShellError};
+
+/// Handler is a closure that can be sent across threads and shared.
+pub type Handler = Box<dyn Fn() + Send + Sync>;
+
+/// Manages a collection of handlers.
+#[derive(Clone)]
+pub struct Handlers {
+    /// List of handler tuples containing an ID and the handler itself.
+    handlers: Arc<Mutex<Vec<(usize, Handler)>>>,
+    /// Sequence generator for unique IDs.
+    next_id: Arc<Sequence>,
+}
+
+impl Debug for Handlers {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Handlers")
+            .field("next_id", &self.next_id)
+            .finish()
+    }
+}
+
+/// Guard that unregisters a handler when dropped.
+#[derive(Clone)]
+pub struct Guard {
+    /// Unique ID of the handler.
+    id: usize,
+    /// Reference to the handlers list.
+    handlers: Arc<Mutex<Vec<(usize, Handler)>>>,
+}
+
+impl Drop for Guard {
+    /// Drops the `Guard`, removing the associated handler from the list.
+    fn drop(&mut self) {
+        if let Ok(mut handlers) = self.handlers.lock() {
+            handlers.retain(|(id, _)| *id != self.id);
+        }
+    }
+}
+
+impl Debug for Guard {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Guard").field("id", &self.id).finish()
+    }
+}
+
+impl Handlers {
+    pub fn new() -> Handlers {
+        let handlers = Arc::new(Mutex::new(vec![]));
+        let next_id = Arc::new(Sequence::default());
+        Handlers { handlers, next_id }
+    }
+
+    /// Registers a new handler and returns an RAII guard which will unregister the handler when
+    /// dropped.
+    pub fn register(&self, handler: Handler) -> Result<Guard, ShellError> {
+        let id = self.next_id.next()?;
+        if let Ok(mut handlers) = self.handlers.lock() {
+            handlers.push((id, handler));
+        }
+
+        Ok(Guard {
+            id,
+            handlers: Arc::clone(&self.handlers),
+        })
+    }
+
+    /// Runs all registered handlers.
+    pub fn run(&self) {
+        if let Ok(handlers) = self.handlers.lock() {
+            for (_, handler) in handlers.iter() {
+                handler();
+            }
+        }
+    }
+}
+
+impl Default for Handlers {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::sync::atomic::{AtomicBool, Ordering};
+
+    #[test]
+    /// Tests registering and running multiple handlers.
+    fn test_multiple_handlers() {
+        let handlers = Handlers::new();
+        let called1 = Arc::new(AtomicBool::new(false));
+        let called2 = Arc::new(AtomicBool::new(false));
+
+        let called1_clone = Arc::clone(&called1);
+        let called2_clone = Arc::clone(&called2);
+
+        let _guard1 = handlers.register(Box::new(move || {
+            called1_clone.store(true, Ordering::SeqCst);
+        }));
+        let _guard2 = handlers.register(Box::new(move || {
+            called2_clone.store(true, Ordering::SeqCst);
+        }));
+
+        handlers.run();
+
+        assert!(called1.load(Ordering::SeqCst));
+        assert!(called2.load(Ordering::SeqCst));
+    }
+
+    #[test]
+    /// Tests the dropping of a guard and ensuring the handler is unregistered.
+    fn test_guard_drop() {
+        let handlers = Handlers::new();
+        let called = Arc::new(AtomicBool::new(false));
+        let called_clone = Arc::clone(&called);
+
+        let guard = handlers.register(Box::new(move || {
+            called_clone.store(true, Ordering::Relaxed);
+        }));
+
+        // Ensure the handler is registered
+        assert_eq!(handlers.handlers.lock().unwrap().len(), 1);
+
+        drop(guard);
+
+        // Ensure the handler is removed after dropping the guard
+        assert_eq!(handlers.handlers.lock().unwrap().len(), 0);
+
+        handlers.run();
+
+        // Ensure the handler is not called after being dropped
+        assert!(!called.load(Ordering::Relaxed));
+    }
+}
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index 8579295c32..e2409debe3 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -2,6 +2,7 @@ use crate::{
     ast::Block,
     debugger::{Debugger, NoopDebugger},
     engine::{
+        ctrlc,
         usage::{build_usage, Usage},
         CachedFile, Command, CommandType, EnvVars, OverlayFrame, ScopeFrame, Stack, StateDelta,
         Variable, Visibility, DEFAULT_OVERLAY_NAME,
@@ -85,6 +86,7 @@ pub struct EngineState {
     pub spans: Vec<Span>,
     usage: Usage,
     pub scope: ScopeFrame,
+    pub ctrlc_handlers: Option<ctrlc::Handlers>,
     signals: Signals,
     pub env_vars: Arc<EnvVars>,
     pub previous_env_vars: Arc<HashMap<String, Value>>,
@@ -145,6 +147,7 @@ impl EngineState {
                 0,
                 false,
             ),
+            ctrlc_handlers: None,
             signals: Signals::empty(),
             env_vars: Arc::new(
                 [(DEFAULT_OVERLAY_NAME.to_string(), HashMap::new())]
@@ -268,8 +271,13 @@ impl EngineState {
 
         #[cfg(feature = "plugin")]
         if !delta.plugins.is_empty() {
-            // Replace plugins that overlap in identity.
             for plugin in std::mem::take(&mut delta.plugins) {
+                // Connect plugins to the ctrlc handlers
+                if let Some(handlers) = &self.ctrlc_handlers {
+                    plugin.clone().configure_ctrlc_handler(handlers)?;
+                }
+
+                // Replace plugins that overlap in identity.
                 if let Some(existing) = self
                     .plugins
                     .iter_mut()
diff --git a/crates/nu-protocol/src/engine/mod.rs b/crates/nu-protocol/src/engine/mod.rs
index 39bb5a7ae3..24e4b15094 100644
--- a/crates/nu-protocol/src/engine/mod.rs
+++ b/crates/nu-protocol/src/engine/mod.rs
@@ -9,6 +9,7 @@ mod engine_state;
 mod error_handler;
 mod overlay;
 mod pattern_match;
+mod sequence;
 mod stack;
 mod stack_out_dest;
 mod state_delta;
@@ -27,8 +28,11 @@ pub use engine_state::*;
 pub use error_handler::*;
 pub use overlay::*;
 pub use pattern_match::*;
+pub use sequence::*;
 pub use stack::*;
 pub use stack_out_dest::*;
 pub use state_delta::*;
 pub use state_working_set::*;
 pub use variable::*;
+
+pub mod ctrlc;
diff --git a/crates/nu-plugin-core/src/util/sequence.rs b/crates/nu-protocol/src/engine/sequence.rs
similarity index 98%
rename from crates/nu-plugin-core/src/util/sequence.rs
rename to crates/nu-protocol/src/engine/sequence.rs
index 4f5c288c8f..34af8fc574 100644
--- a/crates/nu-plugin-core/src/util/sequence.rs
+++ b/crates/nu-protocol/src/engine/sequence.rs
@@ -1,4 +1,4 @@
-use nu_protocol::ShellError;
+use crate::ShellError;
 use std::sync::atomic::{AtomicUsize, Ordering::Relaxed};
 
 /// Implements an atomically incrementing sequential series of numbers
diff --git a/crates/nu-protocol/src/pipeline/signals.rs b/crates/nu-protocol/src/pipeline/signals.rs
index 06ce583c82..2057e27fe0 100644
--- a/crates/nu-protocol/src/pipeline/signals.rs
+++ b/crates/nu-protocol/src/pipeline/signals.rs
@@ -56,6 +56,13 @@ impl Signals {
         }
     }
 
+    /// Triggers an interrupt.
+    pub fn trigger(&self) {
+        if let Some(signals) = &self.signals {
+            signals.store(true, Ordering::Relaxed);
+        }
+    }
+
     /// Returns whether an interrupt has been triggered.
     #[inline]
     pub fn interrupted(&self) -> bool {
diff --git a/crates/nu-protocol/src/plugin/registered.rs b/crates/nu-protocol/src/plugin/registered.rs
index 56d7f4079a..8749c24af9 100644
--- a/crates/nu-protocol/src/plugin/registered.rs
+++ b/crates/nu-protocol/src/plugin/registered.rs
@@ -1,6 +1,6 @@
 use std::{any::Any, sync::Arc};
 
-use crate::{PluginGcConfig, PluginIdentity, PluginMetadata, ShellError};
+use crate::{engine::ctrlc, PluginGcConfig, PluginIdentity, PluginMetadata, ShellError};
 
 /// Trait for plugins registered in the [`EngineState`](crate::engine::EngineState).
 pub trait RegisteredPlugin: Send + Sync {
@@ -34,4 +34,12 @@ pub trait RegisteredPlugin: Send + Sync {
     /// This is necessary in order to allow `nu_plugin` to handle the implementation details of
     /// plugins.
     fn as_any(self: Arc<Self>) -> Arc<dyn Any + Send + Sync>;
+
+    /// Give this plugin a chance to register for Ctrl-C signals.
+    fn configure_ctrlc_handler(
+        self: Arc<Self>,
+        _handler: &ctrlc::Handlers,
+    ) -> Result<(), ShellError> {
+        Ok(())
+    }
 }
diff --git a/crates/nu_plugin_example/src/commands/ctrlc.rs b/crates/nu_plugin_example/src/commands/ctrlc.rs
new file mode 100644
index 0000000000..f9851a451a
--- /dev/null
+++ b/crates/nu_plugin_example/src/commands/ctrlc.rs
@@ -0,0 +1,50 @@
+use std::sync::mpsc;
+
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{Category, LabeledError, PipelineData, Signature};
+
+use crate::ExamplePlugin;
+
+/// `example ctrlc`
+pub struct Ctrlc;
+
+impl PluginCommand for Ctrlc {
+    type Plugin = ExamplePlugin;
+
+    fn name(&self) -> &str {
+        "example ctrlc"
+    }
+
+    fn usage(&self) -> &str {
+        "Example command that demonstrates registering a ctrl-c handler"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name()).category(Category::Experimental)
+    }
+
+    fn search_terms(&self) -> Vec<&str> {
+        vec!["example"]
+    }
+
+    fn run(
+        &self,
+        _plugin: &ExamplePlugin,
+        engine: &EngineInterface,
+        _call: &EvaluatedCall,
+        _input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        let (sender, receiver) = mpsc::channel::<()>();
+        let _guard = engine.register_ctrlc_handler(Box::new(move || {
+            let _ = sender.send(());
+        }));
+
+        eprintln!("interrupt status: {:?}", engine.signals().interrupted());
+        eprintln!("waiting for ctrl-c signal...");
+        receiver.recv().expect("handler went away");
+        eprintln!("interrupt status: {:?}", engine.signals().interrupted());
+        eprintln!("peace.");
+
+        Ok(PipelineData::Empty)
+    }
+}
diff --git a/crates/nu_plugin_example/src/commands/mod.rs b/crates/nu_plugin_example/src/commands/mod.rs
index b1703a3a47..48000677b8 100644
--- a/crates/nu_plugin_example/src/commands/mod.rs
+++ b/crates/nu_plugin_example/src/commands/mod.rs
@@ -15,12 +15,14 @@ pub use two::Two;
 // Engine interface demos
 mod call_decl;
 mod config;
+mod ctrlc;
 mod disable_gc;
 mod env;
 mod view_span;
 
 pub use call_decl::CallDecl;
 pub use config::Config;
+pub use ctrlc::Ctrlc;
 pub use disable_gc::DisableGc;
 pub use env::Env;
 pub use view_span::ViewSpan;
diff --git a/crates/nu_plugin_example/src/lib.rs b/crates/nu_plugin_example/src/lib.rs
index 3db97659bf..f0f4c71541 100644
--- a/crates/nu_plugin_example/src/lib.rs
+++ b/crates/nu_plugin_example/src/lib.rs
@@ -27,6 +27,7 @@ impl Plugin for ExamplePlugin {
             Box::new(Env),
             Box::new(ViewSpan),
             Box::new(DisableGc),
+            Box::new(Ctrlc),
             Box::new(CallDecl),
             // Stream demos
             Box::new(CollectBytes),
diff --git a/src/signals.rs b/src/signals.rs
index bb3539b95e..857f639843 100644
--- a/src/signals.rs
+++ b/src/signals.rs
@@ -1,4 +1,7 @@
-use nu_protocol::{engine::EngineState, Signals};
+use nu_protocol::{
+    engine::{ctrlc::Handlers, EngineState},
+    Signals,
+};
 use std::sync::{
     atomic::{AtomicBool, Ordering},
     Arc,
@@ -7,8 +10,13 @@ use std::sync::{
 pub(crate) fn ctrlc_protection(engine_state: &mut EngineState) {
     let interrupt = Arc::new(AtomicBool::new(false));
     engine_state.set_signals(Signals::new(interrupt.clone()));
+
+    let ctrlc_handlers = Handlers::new();
+    engine_state.ctrlc_handlers = Some(ctrlc_handlers.clone());
+
     ctrlc::set_handler(move || {
         interrupt.store(true, Ordering::Relaxed);
+        ctrlc_handlers.run();
     })
     .expect("Error setting Ctrl-C handler");
 }

From 466b3899e09271fe59344763158c7ab13a8d0105 Mon Sep 17 00:00:00 2001
From: Piotr Kufel <qfel@users.noreply.github.com>
Date: Tue, 30 Jul 2024 06:32:40 -0700
Subject: [PATCH 0272/1072] Use the Default implementation of Suggestion
 (#13409)

# Description

Take advantage of the `Default` implementation of `Suggestion`. This in
particular should make code compatible forward-compatible with
https://github.com/nushell/reedline/pull/798.

# User-Facing Changes
None

# Tests + Formatting

Existing coverage.
---
 .../src/completions/command_completions.rs    | 11 ++-----
 crates/nu-cli/src/completions/completer.rs    | 10 ++-----
 .../src/completions/directory_completions.rs  |  4 +--
 .../src/completions/dotnu_completions.rs      |  3 +-
 .../src/completions/file_completions.rs       |  4 +--
 .../src/completions/flag_completions.rs       |  6 ++--
 .../src/completions/variable_completions.rs   | 30 ++++---------------
 crates/nu-cli/src/menus/help_completions.rs   |  3 +-
 crates/nu-cli/src/menus/menu_completions.rs   |  8 ++---
 9 files changed, 19 insertions(+), 60 deletions(-)

diff --git a/crates/nu-cli/src/completions/command_completions.rs b/crates/nu-cli/src/completions/command_completions.rs
index e37f8b2576..f594e3d667 100644
--- a/crates/nu-cli/src/completions/command_completions.rs
+++ b/crates/nu-cli/src/completions/command_completions.rs
@@ -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,
                     })
diff --git a/crates/nu-cli/src/completions/completer.rs b/crates/nu-cli/src/completions/completer.rs
index 78398b4d19..e794354f09 100644
--- a/crates/nu-cli/src/completions/completer.rs
+++ b/crates/nu-cli/src/completions/completer.rs
@@ -443,14 +443,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())),
             });
@@ -460,14 +457,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`
diff --git a/crates/nu-cli/src/completions/directory_completions.rs b/crates/nu-cli/src/completions/directory_completions.rs
index 61b0439444..342cf42f4e 100644
--- a/crates/nu-cli/src/completions/directory_completions.rs
+++ b/crates/nu-cli/src/completions/directory_completions.rs
@@ -48,14 +48,12 @@ 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,
diff --git a/crates/nu-cli/src/completions/dotnu_completions.rs b/crates/nu-cli/src/completions/dotnu_completions.rs
index 1b2bbab20c..6b4be16769 100644
--- a/crates/nu-cli/src/completions/dotnu_completions.rs
+++ b/crates/nu-cli/src/completions/dotnu_completions.rs
@@ -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,
diff --git a/crates/nu-cli/src/completions/file_completions.rs b/crates/nu-cli/src/completions/file_completions.rs
index 10a548e7ab..16e0c09b5c 100644
--- a/crates/nu-cli/src/completions/file_completions.rs
+++ b/crates/nu-cli/src/completions/file_completions.rs
@@ -53,14 +53,12 @@ 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,
diff --git a/crates/nu-cli/src/completions/flag_completions.rs b/crates/nu-cli/src/completions/flag_completions.rs
index ea4ddd6856..c4ccfd6048 100644
--- a/crates/nu-cli/src/completions/flag_completions.rs
+++ b/crates/nu-cli/src/completions/flag_completions.rs
@@ -51,13 +51,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,
@@ -78,13 +77,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,
diff --git a/crates/nu-cli/src/completions/variable_completions.rs b/crates/nu-cli/src/completions/variable_completions.rs
index 72a69e942c..418dcec064 100644
--- a/crates/nu-cli/src/completions/variable_completions.rs
+++ b/crates/nu-cli/src/completions/variable_completions.rs
@@ -85,11 +85,8 @@ 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())),
                             });
@@ -157,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,
@@ -184,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(),
@@ -215,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(),
@@ -255,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()),
                 });
@@ -272,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()),
                 });
diff --git a/crates/nu-cli/src/menus/help_completions.rs b/crates/nu-cli/src/menus/help_completions.rs
index ebe3fe616b..6d9cbb4cb5 100644
--- a/crates/nu-cli/src/menus/help_completions.rs
+++ b/crates/nu-cli/src/menus/help_completions.rs
@@ -110,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()
diff --git a/crates/nu-cli/src/menus/menu_completions.rs b/crates/nu-cli/src/menus/menu_completions.rs
index c65f0bd100..af653843f0 100644
--- 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()
         }],
     }
 }

From 18161e570799e4a7018549d2f3af6447188c3df7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Jul 2024 13:33:21 +0000
Subject: [PATCH 0273/1072] Bump shadow-rs from 0.29.0 to 0.30.0 (#13436)

---
 Cargo.lock                    | 4 ++--
 crates/nu-cmd-lang/Cargo.toml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 576cb960a4..f30d77f007 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5589,9 +5589,9 @@ dependencies = [
 
 [[package]]
 name = "shadow-rs"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a600f795d0894cda22235b44eea4b85c2a35b405f65523645ac8e35b306817a"
+checksum = "d253e54681d4be0161e965db57974ae642a0b6aaeb18a999424c4dab062be8c5"
 dependencies = [
  "const_format",
  "is_debug",
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index e6a15f7bf9..c5ae7b8c61 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -18,10 +18,10 @@ nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
 nu-utils = { path = "../nu-utils", version = "0.96.2" }
 
 itertools = { workspace = true }
-shadow-rs = { version = "0.29", default-features = false }
+shadow-rs = { version = "0.30", default-features = false }
 
 [build-dependencies]
-shadow-rs = { version = "0.29", default-features = false }
+shadow-rs = { version = "0.30", default-features = false }
 
 [features]
 mimalloc = []

From fe57c5c22efbe9868c89942daa9a2a45463e2f57 Mon Sep 17 00:00:00 2001
From: Bark <32035685+userwiths@users.noreply.github.com>
Date: Tue, 30 Jul 2024 16:34:11 +0300
Subject: [PATCH 0274/1072] fix: Make `log` respect `use_ansi_coloring`
 setting. (#13442)

# Very briefly
Fixes: #13317
- Ignore ansi coloring on logs if this setting is true.
- Add a reset after the default left prompt (before prompt character)
which fixes all-red text when `use_ansi_coloring` is false.

# Description

## Firstly,
argumentation about the changes to `crates/nu-std/std/log.nu`

Previous behavior colored the output of all log, even when the setting
`use_ansi_coloring` was false.

![image](https://github.com/user-attachments/assets/a82991c4-ff46-455d-8dac-248de2456d78)

Current behavior honors the setting.

![image](https://github.com/user-attachments/assets/6d5365db-e05d-4d2a-8981-f22303dff081)

## Second,
While testing different scenarios, I found out that the default setting
on both (`0.95`, arch linux) and the source (`0.96`) all text was
displayed in red (the color used for the present-working-directory part
of the prompt) after setting `use_ansi_coloring` to `false` ([comment
with picture of the issue and reproduction
steps](https://github.com/nushell/nushell/issues/13317#issuecomment-2247439894)).
To which my response was adding a `(ansi reset)` at the end of the
directory part of the prompt in the default config
(`crates/nu-utils/src/sample_config/default_env.nu`) file. All later
parts follow the `use_ansi_coloring` setting and their assigned colors.

# User-Facing Changes
I would say the color, but don't know if that counts as "user-facing".

# Tests + Formatting
- Formatting was applied as advised.
- 1314 tests passed and 24 ignored, none failed.
- Clippy  did not pass due to an error on the following files:
`crates/nu-protocol/src/engine/argument.rs:81:5` and
`crates/nu-protocol/src/engine/error_handler.rs:19:5`
throwing the error `you should consider adding a 'Default'
implementation for 'ErrorHandlerStack'`.
As those files are out of the scope of the current issue, they have
**not** been changed.
---
 crates/nu-std/std/log.nu                         | 5 ++++-
 crates/nu-utils/src/sample_config/default_env.nu | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/crates/nu-std/std/log.nu b/crates/nu-std/std/log.nu
index 88df43309a..e53d95a15a 100644
--- a/crates/nu-std/std/log.nu
+++ b/crates/nu-std/std/log.nu
@@ -282,7 +282,10 @@ export def custom [
         $level_prefix
     }
 
-    let ansi = if ($ansi | is-empty) {
+    let use_color = ($env | get config? | get use_ansi_coloring? | $in != false)
+    let ansi = if not $use_color {
+        ""
+    } else if ($ansi | is-empty) {
         if ($log_level not-in $valid_levels_for_defaulting) {
             log-level-deduction-error "ansi" (metadata $log_level).span $log_level
         }
diff --git a/crates/nu-utils/src/sample_config/default_env.nu b/crates/nu-utils/src/sample_config/default_env.nu
index 68e1a4006b..b43ab981cd 100644
--- a/crates/nu-utils/src/sample_config/default_env.nu
+++ b/crates/nu-utils/src/sample_config/default_env.nu
@@ -11,7 +11,7 @@ def create_left_prompt [] {
 
     let path_color = (if (is-admin) { ansi red_bold } else { ansi green_bold })
     let separator_color = (if (is-admin) { ansi light_red_bold } else { ansi light_green_bold })
-    let path_segment = $"($path_color)($dir)"
+    let path_segment = $"($path_color)($dir)(ansi reset)"
 
     $path_segment | str replace --all (char path_sep) $"($separator_color)(char path_sep)($path_color)"
 }
@@ -98,4 +98,4 @@ $env.NU_PLUGIN_DIRS = [
 # $env.PATH = ($env.PATH | uniq)
 
 # To load from a custom file you can use:
-# source ($nu.default-config-dir | path join 'custom.nu')
\ No newline at end of file
+# source ($nu.default-config-dir | path join 'custom.nu')

From 12f57dbc624fd75c7ba45be87a2a53e20bef2439 Mon Sep 17 00:00:00 2001
From: suimong <bennyyjx@gmail.com>
Date: Tue, 30 Jul 2024 21:50:50 +0800
Subject: [PATCH 0275/1072] Add "--as-columns" flag to `polars into-df`
 (#13449)

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

you can also mention related issues, PRs or discussions!
-->
Per discussion on
[Discord](https://discord.com/channels/601130461678272522/864228801851949077/1265718178927870045)
# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

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

To facilitate column-oriented dataframe construction, this PR added a
`--as-columns` flag to `polars into-df` command so that when specified,
and when input shape is record of lists, each list will be treated as a
column rather than a cell value, i.e. `{a: [1 3], b: [2 4]} | polars
into-df --as-columns` returns the same dataframe as `[[a b];[1 2] [3 4]]
| polars into-df`


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

A new flag `--as-columns`, no change of semantics if this flag is
unspecified.

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

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

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

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

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

---------

Co-authored-by: Ben Yang <ben@ya.ng>
---
 .../src/dataframe/eager/to_df.rs              | 60 ++++++++++++++++++-
 .../src/dataframe/eager/to_nu.rs              |  2 +-
 2 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/eager/to_df.rs b/crates/nu_plugin_polars/src/dataframe/eager/to_df.rs
index 62f662e2a8..0747f16613 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/to_df.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/to_df.rs
@@ -37,6 +37,11 @@ impl PluginCommand for ToDataFrame {
                 r#"Polars Schema in format [{name: str}]. CSV, JSON, and JSONL files"#,
                 Some('s'),
             )
+            .switch(
+                "as-columns",
+                r#"When input shape is record of lists, treat each list as column values."#,
+                Some('c'),
+            )
             .input_output_type(Type::Any, Type::Custom("dataframe".into()))
             .category(Category::Custom("dataframe".into()))
     }
@@ -64,6 +69,27 @@ impl PluginCommand for ToDataFrame {
                     .into_value(Span::test_data()),
                 ),
             },
+            Example {
+                description: "Takes a record of lists and creates a dataframe",
+                example: "{a: [1 3], b: [2 4]} | polars into-df --as-columns",
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![
+                            Column::new(
+                                "a".to_string(),
+                                vec![Value::test_int(1), Value::test_int(3)],
+                            ),
+                            Column::new(
+                                "b".to_string(),
+                                vec![Value::test_int(2), Value::test_int(4)],
+                            ),
+                        ],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
             Example {
                 description: "Takes a list of tables and creates a dataframe",
                 example: "[[1 2 a] [3 4 b] [5 6 c]] | polars into-df",
@@ -182,7 +208,39 @@ impl PluginCommand for ToDataFrame {
             .map(|schema| NuSchema::try_from(&schema))
             .transpose()?;
 
-        let df = NuDataFrame::try_from_iter(plugin, input.into_iter(), maybe_schema.clone())?;
+        let maybe_as_columns = call.has_flag("as-columns")?;
+
+        let df = if !maybe_as_columns {
+            NuDataFrame::try_from_iter(plugin, input.into_iter(), maybe_schema.clone())?
+        } else {
+            match &input {
+                PipelineData::Value(Value::Record { val, .. }, _) => {
+                    let items: Result<Vec<(String, Vec<Value>)>, &str> = val
+                        .iter()
+                        .map(|(k, v)| match v.to_owned().into_list() {
+                            Ok(v) => Ok((k.to_owned(), v)),
+                            _ => Err("error"),
+                        })
+                        .collect();
+                    match items {
+                        Ok(items) => {
+                            let columns = items
+                                .iter()
+                                .map(|(k, v)| Column::new(k.to_owned(), v.to_owned()))
+                                .collect::<Vec<Column>>();
+                            NuDataFrame::try_from_columns(columns, maybe_schema)?
+                        }
+                        Err(_) => NuDataFrame::try_from_iter(
+                            plugin,
+                            input.into_iter(),
+                            maybe_schema.clone(),
+                        )?,
+                    }
+                }
+                _ => NuDataFrame::try_from_iter(plugin, input.into_iter(), maybe_schema.clone())?,
+            }
+        };
+
         df.to_pipeline_data(plugin, engine, call.head)
             .map_err(LabeledError::from)
     }
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/to_nu.rs b/crates/nu_plugin_polars/src/dataframe/eager/to_nu.rs
index 72aff7a728..0647b8d4e3 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/to_nu.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/to_nu.rs
@@ -23,7 +23,7 @@ impl PluginCommand for ToNu {
     }
 
     fn usage(&self) -> &str {
-        "Converts a dataframe or an expression into into nushell value for access and exploration."
+        "Converts a dataframe or an expression into nushell value for access and exploration."
     }
 
     fn signature(&self) -> Signature {

From 0576794e749519c2e36e76f01a29d928b1bad24d Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Tue, 30 Jul 2024 16:51:51 +0300
Subject: [PATCH 0276/1072] reduce: supply <acc> to the closure as pipeline
 input as well (#13461)

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

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

resolve #13459

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

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

Make `reduce` supply the accumulator value to closure as pipeline input.

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

Mostly described in #13459

- Should not be a breaking change.
- Allows cleaner patterns like `... | reduce {|it| merge $it}`

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

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

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

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->
`cargo test --package nu-cli --test main -- commands::reduce` and
`toolkit test stdlib` report no issues
---
 crates/nu-command/src/filters/reduce.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/crates/nu-command/src/filters/reduce.rs b/crates/nu-command/src/filters/reduce.rs
index 824e7709e5..4fca1df3a4 100644
--- a/crates/nu-command/src/filters/reduce.rs
+++ b/crates/nu-command/src/filters/reduce.rs
@@ -120,8 +120,7 @@ impl Command for Reduce {
             engine_state.signals().check(head)?;
             acc = closure
                 .add_arg(value)
-                .add_arg(acc)
-                .run_with_input(PipelineData::Empty)?
+                .run_with_value(acc)?
                 .into_value(head)?;
         }
 

From 7432e67da13041145556190984031779e2b29aa6 Mon Sep 17 00:00:00 2001
From: Maxim Uvarov <maxim-uvarov@users.noreply.github.com>
Date: Tue, 30 Jul 2024 21:52:28 +0800
Subject: [PATCH 0277/1072] don't force stripping ansi codes from strings in
 `stor` (#13464)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

The current version of `stor` forces stripping ansi code coloring from
all the strings.
In this PR, I propose to keep strings unchanged.

The logic behind the proposed changes was best described in the
[discord](https://discord.com/channels/601130461678272522/601130461678272524/1266387441074442272):
<img width="773" alt="image"
src="https://github.com/user-attachments/assets/063cdebd-684f-46f1-aca1-faeb4827723d">

with proposed changes we can store colored output:
```
stor reset; stor create --table-name test --columns {a: str};
ls | table | {a: $in} | stor insert --table-name test | null;
stor open | query db 'select a from test' | get a.0
```

<img width="704" alt="image"
src="https://github.com/user-attachments/assets/8f062808-18fc-498b-a77e-a118f6b9953a">


# User-Facing Changes

If one was using `stor` together with ansi colored input, and then was
querying `stor` with search operations, they might break. But I don't
think that it is a big problem, as one will just need to use `ansi
reset` before storing data.

# Tests + Formatting

Tests are okay.

Thanks to @fdncred for spending time to help me write these changes 🙏
---
 crates/nu-command/src/database/values/sqlite.rs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/crates/nu-command/src/database/values/sqlite.rs b/crates/nu-command/src/database/values/sqlite.rs
index f253ba1cbd..5d0f7d1fe3 100644
--- a/crates/nu-command/src/database/values/sqlite.rs
+++ b/crates/nu-command/src/database/values/sqlite.rs
@@ -424,11 +424,7 @@ pub fn value_to_sql(value: Value) -> Result<Box<dyn rusqlite::ToSql>, ShellError
         Value::Filesize { val, .. } => Box::new(val),
         Value::Duration { val, .. } => Box::new(val),
         Value::Date { val, .. } => Box::new(val),
-        Value::String { val, .. } => {
-            // don't store ansi escape sequences in the database
-            // escape single quotes
-            Box::new(nu_utils::strip_ansi_unlikely(&val).into_owned())
-        }
+        Value::String { val, .. } => Box::new(val),
         Value::Binary { val, .. } => Box::new(val),
         Value::Nothing { .. } => Box::new(rusqlite::types::Null),
         val => {

From ea22c319b6a98fefc310c26495c8264989448820 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Tue, 30 Jul 2024 08:53:41 -0500
Subject: [PATCH 0278/1072] make `math sqrt` const (#13487)

# Description

Just a quick PR to demonstrate one way to make commands const.
related to https://github.com/nushell/nushell/issues/13482

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/math/sqrt.rs | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/crates/nu-command/src/math/sqrt.rs b/crates/nu-command/src/math/sqrt.rs
index a3ab5fbbd8..d20978222c 100644
--- a/crates/nu-command/src/math/sqrt.rs
+++ b/crates/nu-command/src/math/sqrt.rs
@@ -29,6 +29,10 @@ impl Command for SubCommand {
         vec!["square", "root"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -44,6 +48,23 @@ impl Command for SubCommand {
         input.map(move |value| operate(value, head), engine_state.signals())
     }
 
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let head = call.head;
+        // This doesn't match explicit nulls
+        if matches!(input, PipelineData::Empty) {
+            return Err(ShellError::PipelineEmpty { dst_span: head });
+        }
+        input.map(
+            move |value| operate(value, head),
+            working_set.permanent().signals(),
+        )
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![Example {
             description: "Compute the square root of each number in a list",

From 6b839c3c325b980a476665bd55ff35973815d667 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Tue, 30 Jul 2024 16:08:24 +0200
Subject: [PATCH 0279/1072] Create security policy (#13486)

---
 SECURITY.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 SECURITY.md

diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 0000000000..bfd4f5bcd9
--- /dev/null
+++ 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 to arrange a private channel or use the GitHub vulnerability reporting form.
+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.

From 3c3ec7891ca2b7fa09ef1c6639c133d481c53cb2 Mon Sep 17 00:00:00 2001
From: Bruce Weirdan <weirdan@gmail.com>
Date: Tue, 30 Jul 2024 17:05:56 +0200
Subject: [PATCH 0280/1072] Links to security contacts (#13488)

# Description
Added links to the Discord server and the GitHub vulnerability report
form
---
 SECURITY.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SECURITY.md b/SECURITY.md
index bfd4f5bcd9..3f161a77f9 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -12,7 +12,7 @@ Only if you provide a strong reasoning and the necessary resources, will we cons
 ## 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 to arrange a private channel or use the GitHub vulnerability reporting form.
+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?

From 8e2917b9ae31cf7ae2bef9ddf1e4747c9ad42880 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Tue, 30 Jul 2024 16:55:22 -0700
Subject: [PATCH 0281/1072] Make assignment and `const` consistent with
 `let`/`mut` (#13385)

# Description

This makes assignment operations and `const` behave the same way `let`
and `mut` do, absorbing the rest of the pipeline.

Changes the lexer to be able to recognize assignment operators as a
separate token, and then makes the lite parser continue to push spans
into the same command regardless of any redirections or pipes if an
assignment operator is encountered. Because the pipeline is no longer
split up by the lite parser at this point, it's trivial to just parse
the right hand side as if it were a subexpression not contained within
parentheses.

# User-Facing Changes
Big breaking change. These are all now possible:

```nushell
const path = 'a' | path join 'b'

mut x = 2
$x = random int
$x = [1 2 3] | math sum

$env.FOO = random chars
```

In the past, these would have led to (an attempt at) bare word string
parsing. So while `$env.FOO = bar` would have previously set the
environment variable `FOO` to the string `"bar"`, it now tries to run
the command named `bar`, hence the major breaking change.

However, this is desirable because it is very consistent - if you see
the `=`, you can just assume it absorbs everything else to the right of
it.

# Tests + Formatting
Added tests for the new behaviour. Adjusted some existing tests that
depended on the right hand side of assignments being parsed as
barewords.

# After Submitting
- [ ] release notes (breaking change!)
---
 crates/nu-command/tests/commands/complete.rs |   4 +-
 crates/nu-command/tests/commands/let_.rs     |  14 ++
 crates/nu-command/tests/commands/rm.rs       |   2 +-
 crates/nu-command/tests/commands/table.rs    |   2 +-
 crates/nu-parser/src/lex.rs                  |  11 ++
 crates/nu-parser/src/lite_parser.rs          |  49 ++++-
 crates/nu-parser/src/parse_keywords.rs       |  38 ++--
 crates/nu-parser/src/parser.rs               | 186 ++++++++++++-------
 crates/nu-parser/tests/test_parser.rs        |   2 +-
 tests/const_/mod.rs                          |   6 +
 tests/plugins/env.rs                         |   6 +-
 tests/repl/test_config.rs                    |   2 +-
 tests/repl/test_parser.rs                    |  16 ++
 13 files changed, 247 insertions(+), 91 deletions(-)

diff --git a/crates/nu-command/tests/commands/complete.rs b/crates/nu-command/tests/commands/complete.rs
index 329e95ad71..5426d4e8bb 100644
--- a/crates/nu-command/tests/commands/complete.rs
+++ b/crates/nu-command/tests/commands/complete.rs
@@ -95,13 +95,13 @@ fn capture_error_with_both_stdout_stderr_messages_not_hang_nushell() {
 
 #[test]
 fn combined_pipe_redirection() {
-    let actual = nu!("$env.FOO = hello; $env.BAR = world; nu --testbin echo_env_mixed out-err FOO BAR o+e>| complete | get stdout");
+    let actual = nu!("$env.FOO = 'hello'; $env.BAR = 'world'; nu --testbin echo_env_mixed out-err FOO BAR o+e>| complete | get stdout");
     assert_eq!(actual.out, "helloworld");
 }
 
 #[test]
 fn err_pipe_redirection() {
     let actual =
-        nu!("$env.FOO = hello; nu --testbin echo_env_stderr FOO e>| complete | get stdout");
+        nu!("$env.FOO = 'hello'; nu --testbin echo_env_stderr FOO e>| complete | get stdout");
     assert_eq!(actual.out, "hello");
 }
diff --git a/crates/nu-command/tests/commands/let_.rs b/crates/nu-command/tests/commands/let_.rs
index 4bedf31104..e05d34d258 100644
--- a/crates/nu-command/tests/commands/let_.rs
+++ b/crates/nu-command/tests/commands/let_.rs
@@ -23,6 +23,13 @@ fn let_takes_pipeline() {
     assert_eq!(actual.out, "11");
 }
 
+#[test]
+fn let_takes_pipeline_with_declared_type() {
+    let actual = nu!(r#"let x: list<string> = [] | append "hello world"; print $x.0"#);
+
+    assert_eq!(actual.out, "hello world");
+}
+
 #[test]
 fn let_pipeline_allows_in() {
     let actual =
@@ -38,6 +45,13 @@ fn mut_takes_pipeline() {
     assert_eq!(actual.out, "11");
 }
 
+#[test]
+fn mut_takes_pipeline_with_declared_type() {
+    let actual = nu!(r#"mut x: list<string> = [] | append "hello world"; print $x.0"#);
+
+    assert_eq!(actual.out, "hello world");
+}
+
 #[test]
 fn mut_pipeline_allows_in() {
     let actual =
diff --git a/crates/nu-command/tests/commands/rm.rs b/crates/nu-command/tests/commands/rm.rs
index e6cbf88cda..6baefd5420 100644
--- a/crates/nu-command/tests/commands/rm.rs
+++ b/crates/nu-command/tests/commands/rm.rs
@@ -144,7 +144,7 @@ fn errors_if_attempting_to_delete_home() {
     Playground::setup("rm_test_8", |dirs, _| {
         let actual = nu!(
             cwd: dirs.root(),
-            "$env.HOME = myhome ; rm -rf ~"
+            "$env.HOME = 'myhome' ; rm -rf ~"
         );
 
         assert!(actual.err.contains("please use -I or -i"));
diff --git a/crates/nu-command/tests/commands/table.rs b/crates/nu-command/tests/commands/table.rs
index 272369a1c9..f73cce6540 100644
--- a/crates/nu-command/tests/commands/table.rs
+++ b/crates/nu-command/tests/commands/table.rs
@@ -2567,7 +2567,7 @@ fn theme_cmd(theme: &str, footer: bool, then: &str) -> String {
         with_footer = "$env.config.footer_mode = \"always\"".to_string();
     }
 
-    format!("$env.config.table.mode = {theme}; $env.config.table.header_on_separator = true; {with_footer}; {then}")
+    format!("$env.config.table.mode = \"{theme}\"; $env.config.table.header_on_separator = true; {with_footer}; {then}")
 }
 
 #[test]
diff --git a/crates/nu-parser/src/lex.rs b/crates/nu-parser/src/lex.rs
index 3290a774f4..bad9e94a10 100644
--- a/crates/nu-parser/src/lex.rs
+++ b/crates/nu-parser/src/lex.rs
@@ -6,6 +6,7 @@ pub enum TokenContents {
     Comment,
     Pipe,
     PipePipe,
+    AssignmentOperator,
     ErrGreaterPipe,
     OutErrGreaterPipe,
     Semicolon,
@@ -69,6 +70,12 @@ fn is_item_terminator(
             || special_tokens.contains(&c))
 }
 
+/// Assignment operators have special handling distinct from math expressions, as they cause the
+/// rest of the pipeline to be consumed.
+pub fn is_assignment_operator(bytes: &[u8]) -> bool {
+    matches!(bytes, b"=" | b"+=" | b"++=" | b"-=" | b"*=" | b"/=")
+}
+
 // A special token is one that is a byte that stands alone as its own token. For example
 // when parsing a signature you may want to have `:` be able to separate tokens and also
 // to be handled as its own token to notify you you're about to parse a type in the example
@@ -297,6 +304,10 @@ pub fn lex_item(
 
     let mut err = None;
     let output = match &input[(span.start - span_offset)..(span.end - span_offset)] {
+        bytes if is_assignment_operator(bytes) => Token {
+            contents: TokenContents::AssignmentOperator,
+            span,
+        },
         b"out>" | b"o>" => Token {
             contents: TokenContents::OutGreaterThan,
             span,
diff --git a/crates/nu-parser/src/lite_parser.rs b/crates/nu-parser/src/lite_parser.rs
index c9e9578698..0be57a7c9a 100644
--- a/crates/nu-parser/src/lite_parser.rs
+++ b/crates/nu-parser/src/lite_parser.rs
@@ -196,10 +196,43 @@ pub fn lite_parse(tokens: &[Token]) -> (LiteBlock, Option<ParseError>) {
     let mut last_token = TokenContents::Eol;
     let mut file_redirection = None;
     let mut curr_comment: Option<Vec<Span>> = None;
+    let mut is_assignment = false;
     let mut error = None;
 
     for (idx, token) in tokens.iter().enumerate() {
-        if let Some((source, append, span)) = file_redirection.take() {
+        if is_assignment {
+            match &token.contents {
+                // Consume until semicolon or terminating EOL. Assignments absorb pipelines and
+                // redirections.
+                TokenContents::Eol => {
+                    // Handle `[Command] [Pipe] ([Comment] | [Eol])+ [Command]`
+                    //
+                    // `[Eol]` branch checks if previous token is `[Pipe]` to construct pipeline
+                    // and so `[Comment] | [Eol]` should be ignore to make it work
+                    let actual_token = last_non_comment_token(tokens, idx);
+                    if actual_token != Some(TokenContents::Pipe) {
+                        is_assignment = false;
+                        pipeline.push(&mut command);
+                        block.push(&mut pipeline);
+                    }
+
+                    if last_token == TokenContents::Eol {
+                        // Clear out the comment as we're entering a new comment
+                        curr_comment = None;
+                    }
+                }
+                TokenContents::Semicolon => {
+                    is_assignment = false;
+                    pipeline.push(&mut command);
+                    block.push(&mut pipeline);
+                }
+                TokenContents::Comment => {
+                    command.comments.push(token.span);
+                    curr_comment = None;
+                }
+                _ => command.push(token.span),
+            }
+        } else if let Some((source, append, span)) = file_redirection.take() {
             match &token.contents {
                 TokenContents::PipePipe => {
                     error = error.or(Some(ParseError::ShellOrOr(token.span)));
@@ -218,6 +251,11 @@ pub fn lite_parse(tokens: &[Token]) -> (LiteBlock, Option<ParseError>) {
                         command.push(token.span)
                     }
                 }
+                TokenContents::AssignmentOperator => {
+                    error = error.or(Some(ParseError::Expected("redirection target", token.span)));
+                    command.push(span);
+                    command.push(token.span);
+                }
                 TokenContents::OutGreaterThan
                 | TokenContents::OutGreaterGreaterThan
                 | TokenContents::ErrGreaterThan
@@ -280,6 +318,15 @@ pub fn lite_parse(tokens: &[Token]) -> (LiteBlock, Option<ParseError>) {
                     }
                     command.push(token.span);
                 }
+                TokenContents::AssignmentOperator => {
+                    // When in assignment mode, we'll just consume pipes or redirections as part of
+                    // the command.
+                    is_assignment = true;
+                    if let Some(curr_comment) = curr_comment.take() {
+                        command.comments = curr_comment;
+                    }
+                    command.push(token.span);
+                }
                 TokenContents::OutGreaterThan => {
                     error = error.or(command.check_accepts_redirection(token.span));
                     file_redirection = Some((RedirectionSource::Stdout, false, token.span));
diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index 7c41f8a78d..3e2b1827b2 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -35,8 +35,8 @@ use crate::{
     lite_parser::{lite_parse, LiteCommand},
     parser::{
         check_call, garbage, garbage_pipeline, parse, parse_call, parse_expression,
-        parse_full_signature, parse_import_pattern, parse_internal_call, parse_multispan_value,
-        parse_string, parse_value, parse_var_with_opt_type, trim_quotes, ParsedInternalCall,
+        parse_full_signature, parse_import_pattern, parse_internal_call, parse_string, parse_value,
+        parse_var_with_opt_type, trim_quotes, ParsedInternalCall,
     },
     unescape_unquote_string, Token, TokenContents,
 };
@@ -3171,9 +3171,6 @@ pub fn parse_const(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipelin
     // }
 
     if let Some(decl_id) = working_set.find_decl(b"const") {
-        let cmd = working_set.get_decl(decl_id);
-        let call_signature = cmd.signature().call_signature();
-
         if spans.len() >= 4 {
             // This is a bit of by-hand parsing to get around the issue where we want to parse in the reverse order
             // so that the var-id created by the variable isn't visible in the expression that init it
@@ -3181,18 +3178,29 @@ pub fn parse_const(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipelin
                 let item = working_set.get_span_contents(*span.1);
                 // const x = 'f', = at least start from index 2
                 if item == b"=" && spans.len() > (span.0 + 1) && span.0 > 1 {
-                    let mut idx = span.0;
+                    // Parse the rvalue as a subexpression
+                    let rvalue_span = Span::concat(&spans[(span.0 + 1)..]);
 
-                    let rvalue = parse_multispan_value(
-                        working_set,
-                        spans,
-                        &mut idx,
-                        &SyntaxShape::Keyword(b"=".to_vec(), Box::new(SyntaxShape::MathExpression)),
+                    let (rvalue_tokens, rvalue_error) = lex(
+                        working_set.get_span_contents(rvalue_span),
+                        rvalue_span.start,
+                        &[],
+                        &[],
+                        false,
+                    );
+                    working_set.parse_errors.extend(rvalue_error);
+
+                    trace!("parsing: const right-hand side subexpression");
+                    let rvalue_block =
+                        parse_block(working_set, &rvalue_tokens, rvalue_span, false, true);
+                    let rvalue_ty = rvalue_block.output_type();
+                    let rvalue_block_id = working_set.add_block(Arc::new(rvalue_block));
+                    let rvalue = Expression::new(
+                        working_set,
+                        Expr::Subexpression(rvalue_block_id),
+                        rvalue_span,
+                        rvalue_ty,
                     );
-                    if idx < (spans.len() - 1) {
-                        working_set
-                            .error(ParseError::ExtraPositional(call_signature, spans[idx + 1]));
-                    }
 
                     let mut idx = 0;
 
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 1fb0aee01d..a5559f5c52 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -1,5 +1,5 @@
 use crate::{
-    lex::{lex, lex_signature},
+    lex::{is_assignment_operator, lex, lex_signature},
     lite_parser::{lite_parse, LiteCommand, LitePipeline, LiteRedirection, LiteRedirectionTarget},
     parse_keywords::*,
     parse_patterns::parse_pattern,
@@ -1458,7 +1458,8 @@ fn parse_binary_with_base(
                     | TokenContents::ErrGreaterThan
                     | TokenContents::ErrGreaterGreaterThan
                     | TokenContents::OutErrGreaterThan
-                    | TokenContents::OutErrGreaterGreaterThan => {
+                    | TokenContents::OutErrGreaterGreaterThan
+                    | TokenContents::AssignmentOperator => {
                         working_set.error(ParseError::Expected("binary", span));
                         return garbage(working_set, span);
                     }
@@ -3409,7 +3410,7 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
     for token in &output {
         match token {
             Token {
-                contents: crate::TokenContents::Item,
+                contents: crate::TokenContents::Item | crate::TokenContents::AssignmentOperator,
                 span,
             } => {
                 let span = *span;
@@ -4829,7 +4830,7 @@ pub fn parse_value(
     }
 }
 
-pub fn parse_operator(working_set: &mut StateWorkingSet, span: Span) -> Expression {
+pub fn parse_assignment_operator(working_set: &mut StateWorkingSet, span: Span) -> Expression {
     let contents = working_set.get_span_contents(span);
 
     let operator = match contents {
@@ -4839,6 +4840,95 @@ pub fn parse_operator(working_set: &mut StateWorkingSet, span: Span) -> Expressi
         b"-=" => Operator::Assignment(Assignment::MinusAssign),
         b"*=" => Operator::Assignment(Assignment::MultiplyAssign),
         b"/=" => Operator::Assignment(Assignment::DivideAssign),
+        _ => {
+            working_set.error(ParseError::Expected("assignment operator", span));
+            return garbage(working_set, span);
+        }
+    };
+
+    Expression::new(working_set, Expr::Operator(operator), span, Type::Any)
+}
+
+pub fn parse_assignment_expression(
+    working_set: &mut StateWorkingSet,
+    spans: &[Span],
+) -> Expression {
+    trace!("parsing: assignment expression");
+    let expr_span = Span::concat(spans);
+
+    // Assignment always has the most precedence, and its right-hand side can be a pipeline
+    let Some(op_index) = spans
+        .iter()
+        .position(|span| is_assignment_operator(working_set.get_span_contents(*span)))
+    else {
+        working_set.error(ParseError::Expected("assignment expression", expr_span));
+        return garbage(working_set, expr_span);
+    };
+
+    let lhs_spans = &spans[0..op_index];
+    let op_span = spans[op_index];
+    let rhs_spans = &spans[(op_index + 1)..];
+
+    if lhs_spans.is_empty() {
+        working_set.error(ParseError::Expected(
+            "left hand side of assignment",
+            op_span,
+        ));
+        return garbage(working_set, expr_span);
+    }
+
+    if rhs_spans.is_empty() {
+        working_set.error(ParseError::Expected(
+            "right hand side of assignment",
+            op_span,
+        ));
+        return garbage(working_set, expr_span);
+    }
+
+    // Parse the lhs and operator as usual for a math expression
+    let mut lhs = parse_expression(working_set, lhs_spans);
+    let mut operator = parse_assignment_operator(working_set, op_span);
+
+    // Re-parse the right-hand side as a subexpression
+    let rhs_span = Span::concat(rhs_spans);
+
+    let (rhs_tokens, rhs_error) = lex(
+        working_set.get_span_contents(rhs_span),
+        rhs_span.start,
+        &[],
+        &[],
+        true,
+    );
+    working_set.parse_errors.extend(rhs_error);
+
+    trace!("parsing: assignment right-hand side subexpression");
+    let rhs_block = parse_block(working_set, &rhs_tokens, rhs_span, false, true);
+    let rhs_ty = rhs_block.output_type();
+    let rhs_block_id = working_set.add_block(Arc::new(rhs_block));
+    let mut rhs = Expression::new(
+        working_set,
+        Expr::Subexpression(rhs_block_id),
+        rhs_span,
+        rhs_ty,
+    );
+
+    let (result_ty, err) = math_result_type(working_set, &mut lhs, &mut operator, &mut rhs);
+    if let Some(err) = err {
+        working_set.parse_errors.push(err);
+    }
+
+    Expression::new(
+        working_set,
+        Expr::BinaryOp(Box::new(lhs), Box::new(operator), Box::new(rhs)),
+        expr_span,
+        result_ty,
+    )
+}
+
+pub fn parse_operator(working_set: &mut StateWorkingSet, span: Span) -> Expression {
+    let contents = working_set.get_span_contents(span);
+
+    let operator = match contents {
         b"==" => Operator::Comparison(Comparison::Equal),
         b"!=" => Operator::Comparison(Comparison::NotEqual),
         b"<" => Operator::Comparison(Comparison::LessThan),
@@ -4954,6 +5044,10 @@ pub fn parse_operator(working_set: &mut StateWorkingSet, span: Span) -> Expressi
             ));
             return garbage(working_set, span);
         }
+        op if is_assignment_operator(op) => {
+            working_set.error(ParseError::Expected("a non-assignment operator", span));
+            return garbage(working_set, span);
+        }
         _ => {
             working_set.error(ParseError::Expected("operator", span));
             return garbage(working_set, span);
@@ -5258,7 +5352,12 @@ pub fn parse_expression(working_set: &mut StateWorkingSet, spans: &[Span]) -> Ex
         return garbage(working_set, Span::concat(spans));
     }
 
-    let output = if is_math_expression_like(working_set, spans[pos]) {
+    let output = if spans[pos..]
+        .iter()
+        .any(|span| is_assignment_operator(working_set.get_span_contents(*span)))
+    {
+        parse_assignment_expression(working_set, &spans[pos..])
+    } else if is_math_expression_like(working_set, spans[pos]) {
         parse_math_expression(working_set, &spans[pos..], None)
     } else {
         let bytes = working_set.get_span_contents(spans[pos]).to_vec();
@@ -5690,69 +5789,24 @@ pub(crate) fn redirecting_builtin_error(
 }
 
 pub fn parse_pipeline(working_set: &mut StateWorkingSet, pipeline: &LitePipeline) -> Pipeline {
-    let first_command = pipeline.commands.first();
-    let first_command_name = first_command
-        .and_then(|command| command.parts.first())
-        .map(|span| working_set.get_span_contents(*span));
-
     if pipeline.commands.len() > 1 {
-        // Special case: allow "let" or "mut" to consume the whole pipeline, if this is a pipeline
-        // with multiple commands
-        if matches!(first_command_name, Some(b"let" | b"mut")) {
-            // Merge the pipeline into one command
-            let first_command = first_command.expect("must be Some");
+        // Parse a normal multi command pipeline
+        let elements: Vec<_> = pipeline
+            .commands
+            .iter()
+            .enumerate()
+            .map(|(index, element)| {
+                let element = parse_pipeline_element(working_set, element);
+                // Handle $in for pipeline elements beyond the first one
+                if index > 0 && element.has_in_variable(working_set) {
+                    wrap_element_with_collect(working_set, element.clone())
+                } else {
+                    element
+                }
+            })
+            .collect();
 
-            let remainder_span = first_command
-                .parts_including_redirection()
-                .skip(3)
-                .chain(
-                    pipeline.commands[1..]
-                        .iter()
-                        .flat_map(|command| command.parts_including_redirection()),
-                )
-                .reduce(Span::append);
-
-            let parts = first_command
-                .parts
-                .iter()
-                .take(3) // the let/mut start itself
-                .copied()
-                .chain(remainder_span) // everything else
-                .collect();
-
-            let comments = pipeline
-                .commands
-                .iter()
-                .flat_map(|command| command.comments.iter())
-                .copied()
-                .collect();
-
-            let new_command = LiteCommand {
-                pipe: None,
-                comments,
-                parts,
-                redirection: None,
-            };
-            parse_builtin_commands(working_set, &new_command)
-        } else {
-            // Parse a normal multi command pipeline
-            let elements: Vec<_> = pipeline
-                .commands
-                .iter()
-                .enumerate()
-                .map(|(index, element)| {
-                    let element = parse_pipeline_element(working_set, element);
-                    // Handle $in for pipeline elements beyond the first one
-                    if index > 0 && element.has_in_variable(working_set) {
-                        wrap_element_with_collect(working_set, element.clone())
-                    } else {
-                        element
-                    }
-                })
-                .collect();
-
-            Pipeline { elements }
-        }
+        Pipeline { elements }
     } else {
         // If there's only one command in the pipeline, this could be a builtin command
         parse_builtin_commands(working_set, &pipeline.commands[0])
diff --git a/crates/nu-parser/tests/test_parser.rs b/crates/nu-parser/tests/test_parser.rs
index 4d6778d201..44cd79a04a 100644
--- a/crates/nu-parser/tests/test_parser.rs
+++ b/crates/nu-parser/tests/test_parser.rs
@@ -1177,9 +1177,9 @@ fn test_nothing_comparison_eq() {
 #[rstest]
 #[case(b"let a = 1 err> /dev/null")]
 #[case(b"let a = 1 out> /dev/null")]
+#[case(b"let a = 1 out+err> /dev/null")]
 #[case(b"mut a = 1 err> /dev/null")]
 #[case(b"mut a = 1 out> /dev/null")]
-#[case(b"let a = 1 out+err> /dev/null")]
 #[case(b"mut a = 1 out+err> /dev/null")]
 fn test_redirection_with_letmut(#[case] phase: &[u8]) {
     let engine_state = EngineState::new();
diff --git a/tests/const_/mod.rs b/tests/const_/mod.rs
index 04db29d3dd..f736b785ca 100644
--- a/tests/const_/mod.rs
+++ b/tests/const_/mod.rs
@@ -415,3 +415,9 @@ fn const_raw_string() {
     let actual = nu!(r#"const x = r#'abc'#; $x"#);
     assert_eq!(actual.out, "abc");
 }
+
+#[test]
+fn const_takes_pipeline() {
+    let actual = nu!(r#"const list = 'bar_baz_quux' | split row '_'; $list | length"#);
+    assert_eq!(actual.out, "3");
+}
diff --git a/tests/plugins/env.rs b/tests/plugins/env.rs
index c5a2ccc7af..8b307999b3 100644
--- a/tests/plugins/env.rs
+++ b/tests/plugins/env.rs
@@ -6,9 +6,9 @@ fn get_env_by_name() {
         cwd: ".",
         plugin: ("nu_plugin_example"),
         r#"
-            $env.FOO = bar
+            $env.FOO = 'bar'
             example env FOO | print
-            $env.FOO = baz
+            $env.FOO = 'baz'
             example env FOO | print
         "#
     );
@@ -21,7 +21,7 @@ fn get_envs() {
     let result = nu_with_plugins!(
         cwd: ".",
         plugin: ("nu_plugin_example"),
-        "$env.BAZ = foo; example env | get BAZ"
+        "$env.BAZ = 'foo'; example env | get BAZ"
     );
     assert!(result.status.success());
     assert_eq!("foo", result.out);
diff --git a/tests/repl/test_config.rs b/tests/repl/test_config.rs
index 005ae63171..6c0ba6180f 100644
--- a/tests/repl/test_config.rs
+++ b/tests/repl/test_config.rs
@@ -20,7 +20,7 @@ fn mutate_nu_config_nested_ls() -> TestResult {
 fn mutate_nu_config_nested_table() -> TestResult {
     run_test_std(
         r#"
-            $env.config.table.trim.methodology = wrapping
+            $env.config.table.trim.methodology = 'wrapping'
             $env.config.table.trim.wrapping_try_keep_words = false
             $env.config.table.trim.wrapping_try_keep_words
         "#,
diff --git a/tests/repl/test_parser.rs b/tests/repl/test_parser.rs
index a7a25e1c67..ea983ff82c 100644
--- a/tests/repl/test_parser.rs
+++ b/tests/repl/test_parser.rs
@@ -295,6 +295,22 @@ fn assign_expressions() -> TestResult {
     )
 }
 
+#[test]
+fn assign_takes_pipeline() -> TestResult {
+    run_test(
+        r#"mut foo = 'bar'; $foo = $foo | str upcase | str reverse; $foo"#,
+        "RAB",
+    )
+}
+
+#[test]
+fn append_assign_takes_pipeline() -> TestResult {
+    run_test(
+        r#"mut foo = 'bar'; $foo ++= $foo | str upcase; $foo"#,
+        "barBAR",
+    )
+}
+
 #[test]
 fn string_interpolation_paren_test() -> TestResult {
     run_test(r#"$"('(')(')')""#, "()")

From 3f12b14053988d7c6d8aeecc856b5056c559cd91 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Jul 2024 02:12:50 +0000
Subject: [PATCH 0282/1072] Bump crate-ci/typos from 1.23.3 to 1.23.5 (#13491)

---
 .github/workflows/typos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index 2484787cb5..98ace3be57 100644
--- 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.23.3
+        uses: crate-ci/typos@v1.23.5

From d2bf82d22b35d77509f71ebefefb3e3e61c3e278 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Jul 2024 08:10:33 +0000
Subject: [PATCH 0283/1072] Bump similar from 2.5.0 to 2.6.0 (#13492)

---
 Cargo.lock                               | 4 ++--
 crates/nu-plugin-test-support/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f30d77f007..1c0fd9a954 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5666,9 +5666,9 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
 
 [[package]]
 name = "similar"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640"
+checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e"
 
 [[package]]
 name = "simplelog"
diff --git a/crates/nu-plugin-test-support/Cargo.toml b/crates/nu-plugin-test-support/Cargo.toml
index 344ccb1c2d..66c5146e6e 100644
--- a/crates/nu-plugin-test-support/Cargo.toml
+++ b/crates/nu-plugin-test-support/Cargo.toml
@@ -21,7 +21,7 @@ nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.96.2" }
 nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.96.2" }
 nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.2" }
 nu-ansi-term = { workspace = true }
-similar = "2.5"
+similar = "2.6"
 
 [dev-dependencies]
 typetag = "0.2"

From 813aac89bdad7b3a0f8360c84fb966afab9710eb Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Wed, 31 Jul 2024 14:49:22 +0200
Subject: [PATCH 0284/1072] Clippy fixes for toolchain bump (#13497)

- **Suggested default impl for the new `*Stack`s**
- **Change a hashmap to make clippy happy**
- **Clone from fix**
- **Fix conditional unused in test**
- then **Bump rust toolchain**
---
 crates/nu-cli/src/util.rs                      | 14 ++++----------
 crates/nu-command/tests/commands/rm.rs         |  5 +++++
 crates/nu-engine/src/eval.rs                   |  2 +-
 crates/nu-protocol/src/engine/argument.rs      |  2 +-
 crates/nu-protocol/src/engine/engine_state.rs  |  6 +++---
 crates/nu-protocol/src/engine/error_handler.rs |  2 +-
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/crates/nu-cli/src/util.rs b/crates/nu-cli/src/util.rs
index bcee53c9b0..e912bceb5f 100644
--- a/crates/nu-cli/src/util.rs
+++ b/crates/nu-cli/src/util.rs
@@ -321,16 +321,10 @@ mod test {
 
         let env = engine_state.render_env_vars();
 
-        assert!(
-            matches!(env.get(&"FOO".to_string()), Some(&Value::String { val, .. }) if val == "foo")
-        );
-        assert!(
-            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!(matches!(env.get("FOO"), 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!(env.contains_key("PWD"));
         assert_eq!(env.len(), 4);
     }
 }
diff --git a/crates/nu-command/tests/commands/rm.rs b/crates/nu-command/tests/commands/rm.rs
index 6baefd5420..fbea7edaf1 100644
--- a/crates/nu-command/tests/commands/rm.rs
+++ b/crates/nu-command/tests/commands/rm.rs
@@ -1,8 +1,10 @@
+#[cfg(not(windows))]
 use nu_path::AbsolutePath;
 use nu_test_support::fs::{files_exist_at, Stub::EmptyFile};
 use nu_test_support::nu;
 use nu_test_support::playground::Playground;
 use rstest::rstest;
+#[cfg(not(windows))]
 use std::fs;
 use std::path::Path;
 
@@ -405,16 +407,19 @@ fn removes_file_after_cd() {
     })
 }
 
+#[cfg(not(windows))]
 struct Cleanup<'a> {
     dir_to_clean: &'a AbsolutePath,
 }
 
+#[cfg(not(windows))]
 fn set_dir_read_only(directory: &AbsolutePath, read_only: bool) {
     let mut permissions = fs::metadata(directory).unwrap().permissions();
     permissions.set_readonly(read_only);
     fs::set_permissions(directory, permissions).expect("failed to set directory permissions");
 }
 
+#[cfg(not(windows))]
 impl<'a> Drop for Cleanup<'a> {
     /// Restores write permissions to the given directory so that the Playground can be successfully
     /// cleaned up.
diff --git a/crates/nu-engine/src/eval.rs b/crates/nu-engine/src/eval.rs
index 84fa700934..56a85e91e7 100644
--- a/crates/nu-engine/src/eval.rs
+++ b/crates/nu-engine/src/eval.rs
@@ -198,7 +198,7 @@ pub fn redirect_env(engine_state: &EngineState, caller_stack: &mut Stack, callee
     }
 
     // set config to callee config, to capture any updates to that
-    caller_stack.config = callee_stack.config.clone();
+    caller_stack.config.clone_from(&callee_stack.config);
 }
 
 fn eval_external(
diff --git a/crates/nu-protocol/src/engine/argument.rs b/crates/nu-protocol/src/engine/argument.rs
index 043654b761..178e5fd22d 100644
--- a/crates/nu-protocol/src/engine/argument.rs
+++ b/crates/nu-protocol/src/engine/argument.rs
@@ -71,7 +71,7 @@ impl Argument {
 }
 
 /// Stores the argument context for calls in IR evaluation.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Default)]
 pub struct ArgumentStack {
     arguments: Vec<Argument>,
 }
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index e2409debe3..7c7cfb9bb5 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -428,13 +428,13 @@ impl EngineState {
             .1
     }
 
-    pub fn render_env_vars(&self) -> HashMap<&String, &Value> {
-        let mut result = HashMap::new();
+    pub fn render_env_vars(&self) -> HashMap<&str, &Value> {
+        let mut result: HashMap<&str, &Value> = HashMap::new();
 
         for overlay_name in self.active_overlay_names(&[]) {
             let name = String::from_utf8_lossy(overlay_name);
             if let Some(env_vars) = self.env_vars.get(name.as_ref()) {
-                result.extend(env_vars);
+                result.extend(env_vars.iter().map(|(k, v)| (k.as_str(), v)));
             }
         }
 
diff --git a/crates/nu-protocol/src/engine/error_handler.rs b/crates/nu-protocol/src/engine/error_handler.rs
index 076678be20..0fb82c7d69 100644
--- a/crates/nu-protocol/src/engine/error_handler.rs
+++ b/crates/nu-protocol/src/engine/error_handler.rs
@@ -10,7 +10,7 @@ pub struct ErrorHandler {
 }
 
 /// Keeps track of error handlers pushed during evaluation of an IR block.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Default)]
 pub struct ErrorHandlerStack {
     handlers: Vec<ErrorHandler>,
 }

From d8802411026792ef9ea10715f6e3b26c7cb92685 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Wed, 31 Jul 2024 18:14:50 +0200
Subject: [PATCH 0285/1072] Bump rust toolchain (#13499)

Following the Rust 1.80 release update our supported Rust version to
1.78.0

Necessary clippy fixes in #13497
---
 Cargo.toml          | 4 ++--
 rust-toolchain.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ce3624d873..e60acd2548 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ 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.96.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -313,4 +313,4 @@ bench = false
 # Run individual benchmarks like `cargo bench -- <regex>` e.g. `cargo bench -- parse`
 [[bench]]
 name = "benchmarks"
-harness = false
\ No newline at end of file
+harness = false
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 0682514ccf..b8ca48435b 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -16,4 +16,4 @@ profile = "default"
 # use in nushell, we may opt to use the bleeding edge stable version of rust.
 # I believe rust is on a 6 week release cycle and nushell is on a 4 week release cycle.
 # So, every two nushell releases, this version number should be bumped by one.
-channel = "1.77.2"
+channel = "1.78.0"

From 928c57db41dd0d980ff62fb1c75fed08be23747c Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Thu, 1 Aug 2024 00:19:35 +0800
Subject: [PATCH 0286/1072] save: print to stderr for bytestream (#13422)

# Description
Fixes: #13260

When user run a command like this:
```nushell
$env.FOO = " New";
$env.BAZ = " New Err";
do -i {nu -n -c 'nu --testbin echo_env FOO; nu --testbin echo_env_stderr BAZ'} | save -a -r save_test_22/log.txt
```

`save` command sinks the output of previous commands' stderr output. I
think it should be `stderr`.

# User-Facing Changes
```nushell
$env.FOO = " New";
$env.BAZ = " New Err";
do -i {nu -n -c 'nu --testbin echo_env FOO; nu --testbin echo_env_stderr BAZ'} | save -a -r save_test_22/log.txt
```
The command will output ` New Err` to stderr.

# Tests + Formatting
Added 2 cases.
---
 crates/nu-command/src/filesystem/save.rs |  6 ++-
 crates/nu-command/tests/commands/save.rs | 62 ++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/crates/nu-command/src/filesystem/save.rs b/crates/nu-command/src/filesystem/save.rs
index be5073ef20..619e7d0b2b 100644
--- a/crates/nu-command/src/filesystem/save.rs
+++ b/crates/nu-command/src/filesystem/save.rs
@@ -121,9 +121,11 @@ impl Command for Save {
                             } else {
                                 match stderr {
                                     ChildPipe::Pipe(mut pipe) => {
-                                        io::copy(&mut pipe, &mut io::sink())
+                                        io::copy(&mut pipe, &mut io::stderr())
+                                    }
+                                    ChildPipe::Tee(mut tee) => {
+                                        io::copy(&mut tee, &mut io::stderr())
                                     }
-                                    ChildPipe::Tee(mut tee) => io::copy(&mut tee, &mut io::sink()),
                                 }
                                 .err_span(span)?;
                             }
diff --git a/crates/nu-command/tests/commands/save.rs b/crates/nu-command/tests/commands/save.rs
index 8a2332afdf..85076099bf 100644
--- a/crates/nu-command/tests/commands/save.rs
+++ b/crates/nu-command/tests/commands/save.rs
@@ -463,3 +463,65 @@ fn save_same_file_with_collect_and_filter() {
         assert_eq!("helloworld", actual.out);
     })
 }
+
+#[test]
+fn save_from_child_process_dont_sink_stderr() {
+    Playground::setup("save_test_22", |dirs, sandbox| {
+        sandbox.with_files(&[
+            Stub::FileWithContent("log.txt", "Old"),
+            Stub::FileWithContent("err.txt", "Old Err"),
+        ]);
+
+        let expected_file = dirs.test().join("log.txt");
+        let expected_stderr_file = dirs.test().join("err.txt");
+
+        let actual = nu!(
+            cwd: dirs.root(),
+            r#"
+            $env.FOO = " New";
+            $env.BAZ = " New Err";
+            do -i {nu -n -c 'nu --testbin echo_env FOO; nu --testbin echo_env_stderr BAZ'} | save -a -r save_test_22/log.txt"#,
+        );
+        assert_eq!(actual.err.trim_end(), " New Err");
+
+        let actual = file_contents(expected_file);
+        assert_eq!(actual.trim_end(), "Old New");
+
+        let actual = file_contents(expected_stderr_file);
+        assert_eq!(actual.trim_end(), "Old Err");
+    })
+}
+
+#[test]
+fn parent_redirection_doesnt_affect_save() {
+    Playground::setup("save_test_23", |dirs, sandbox| {
+        sandbox.with_files(&[
+            Stub::FileWithContent("log.txt", "Old"),
+            Stub::FileWithContent("err.txt", "Old Err"),
+        ]);
+
+        let expected_file = dirs.test().join("log.txt");
+        let expected_stderr_file = dirs.test().join("err.txt");
+
+        let actual = nu!(
+            cwd: dirs.root(),
+            r#"
+            $env.FOO = " New";
+            $env.BAZ = " New Err";
+            def tttt [] {
+                do -i {nu -n -c 'nu --testbin echo_env FOO; nu --testbin echo_env_stderr BAZ'} | save -a -r save_test_23/log.txt
+            };
+            tttt e> ("save_test_23" | path join empty_file)"#
+        );
+        assert_eq!(actual.err.trim_end(), " New Err");
+
+        let actual = file_contents(expected_file);
+        assert_eq!(actual.trim_end(), "Old New");
+
+        let actual = file_contents(expected_stderr_file);
+        assert_eq!(actual.trim_end(), "Old Err");
+
+        let actual = file_contents(dirs.test().join("empty_file"));
+        assert_eq!(actual.trim_end(), "");
+    })
+}

From 42531e017c62650486d8457aed83604bb3bc2b70 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Wed, 31 Jul 2024 20:37:40 +0200
Subject: [PATCH 0287/1072] Clippy fixes from stable and nightly (#13455)

- **Doccomment style fixes**
- **Forgotten stuff in `nu-pretty-hex`**
- **Don't `for` around an `Option`**
- and more

I think the suggestions here are a net positive, some of the suggestions
moved into #13498 feel somewhat arbitrary, I also raised
https://github.com/rust-lang/rust-clippy/issues/13188 as the nightly
`byte_char_slices` would require either a global allow or otherwise a
ton of granular allows or possibly confusing bytestring literals.
---
 .../nu-cli/src/commands/history/history_.rs   |  60 ++--
 crates/nu-command/src/conversions/fill.rs     |   8 +-
 crates/nu-command/src/network/http/client.rs  |   6 +-
 .../nu-command/tests/commands/random/mod.rs   |   1 -
 .../nu-command/tests/commands/random/uuid.rs  |   2 +-
 crates/nu-parser/src/parse_keywords.rs        |  18 +-
 crates/nu-parser/src/parser.rs                |   2 +-
 crates/nu-path/src/path.rs                    |   4 +-
 crates/nu-path/src/tilde.rs                   |   2 +-
 crates/nu-pretty-hex/src/lib.rs               |   5 -
 crates/nu-pretty-hex/tests/tests.rs           | 295 +++++++++---------
 .../nu-protocol/src/pipeline/pipeline_data.rs |  12 +-
 crates/nu-protocol/src/signature.rs           |   5 +-
 crates/nu-system/src/foreground.rs            |   3 +-
 crates/nuon/src/from.rs                       |   2 +-
 15 files changed, 185 insertions(+), 240 deletions(-)

diff --git a/crates/nu-cli/src/commands/history/history_.rs b/crates/nu-cli/src/commands/history/history_.rs
index cdf85eea72..1f3d1082fa 100644
--- a/crates/nu-cli/src/commands/history/history_.rs
+++ b/crates/nu-cli/src/commands/history/history_.rs
@@ -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 {
-            Some(id) => {
-                let ids = id.to_string();
-                match ids.parse::<i64>() {
-                    Ok(i) => i,
-                    _ => 0i64,
-                }
-            }
-            None => 0i64,
-        },
+        entry
+            .id
+            .and_then(|id| id.to_string().parse::<i64>().ok())
+            .unwrap_or_default(),
         head,
     );
     let start_timestamp_value = Value::string(
-        match entry.start_timestamp {
-            Some(time) => time.to_string(),
-            None => "".into(),
-        },
+        entry
+            .start_timestamp
+            .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 {
-            Some(sid) => {
-                let sids = sid.to_string();
-                match sids.parse::<i64>() {
-                    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(),
-        },
+        entry
+            .session_id
+            .and_then(|id| id.to_string().parse::<i64>().ok())
+            .unwrap_or_default(),
         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 {
-            Some(d) => d.as_nanos().try_into().unwrap_or(0),
-            None => 0,
-        },
+        entry
+            .duration
+            .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);
diff --git a/crates/nu-command/src/conversions/fill.rs b/crates/nu-command/src/conversions/fill.rs
index eaf8c05da1..3bd205814a 100644
--- a/crates/nu-command/src/conversions/fill.rs
+++ b/crates/nu-command/src/conversions/fill.rs
@@ -150,13 +150,9 @@ fn fill(
         FillAlignment::Left
     };
 
-    let width = if let Some(arg) = width_arg { arg } else { 1 };
+    let width = width_arg.unwrap_or(1);
 
-    let character = if let Some(arg) = character_arg {
-        arg
-    } else {
-        " ".to_string()
-    };
+    let character = character_arg.unwrap_or_else(|| " ".to_string());
 
     let arg = Arguments {
         width,
diff --git a/crates/nu-command/src/network/http/client.rs b/crates/nu-command/src/network/http/client.rs
index deeb768eea..e348bedc25 100644
--- a/crates/nu-command/src/network/http/client.rs
+++ b/crates/nu-command/src/network/http/client.rs
@@ -141,17 +141,17 @@ pub fn request_add_authorization_header(
     let login = match (user, password) {
         (Some(user), Some(password)) => {
             let mut enc_str = String::new();
-            base64_engine.encode_string(&format!("{user}:{password}"), &mut enc_str);
+            base64_engine.encode_string(format!("{user}:{password}"), &mut enc_str);
             Some(enc_str)
         }
         (Some(user), _) => {
             let mut enc_str = String::new();
-            base64_engine.encode_string(&format!("{user}:"), &mut enc_str);
+            base64_engine.encode_string(format!("{user}:"), &mut enc_str);
             Some(enc_str)
         }
         (_, Some(password)) => {
             let mut enc_str = String::new();
-            base64_engine.encode_string(&format!(":{password}"), &mut enc_str);
+            base64_engine.encode_string(format!(":{password}"), &mut enc_str);
             Some(enc_str)
         }
         _ => None,
diff --git a/crates/nu-command/tests/commands/random/mod.rs b/crates/nu-command/tests/commands/random/mod.rs
index 5a6b4c4b4a..a879b524b8 100644
--- a/crates/nu-command/tests/commands/random/mod.rs
+++ b/crates/nu-command/tests/commands/random/mod.rs
@@ -3,5 +3,4 @@ mod chars;
 mod dice;
 mod float;
 mod int;
-#[cfg(feature = "uuid_crate")]
 mod uuid;
diff --git a/crates/nu-command/tests/commands/random/uuid.rs b/crates/nu-command/tests/commands/random/uuid.rs
index c38db6da27..4182824cab 100644
--- a/crates/nu-command/tests/commands/random/uuid.rs
+++ b/crates/nu-command/tests/commands/random/uuid.rs
@@ -1,5 +1,5 @@
 use nu_test_support::nu;
-use uuid_crate::Uuid;
+use uuid::Uuid;
 
 #[test]
 fn generates_valid_uuid4() {
diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index 3e2b1827b2..6b7245f1ce 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -169,11 +169,7 @@ pub fn parse_def_predecl(working_set: &mut StateWorkingSet, spans: &[Span]) {
 
     // Now, pos should point at the next span after the def-like call.
     // Skip all potential flags, like --env, --wrapped or --help:
-    while pos < spans.len()
-        && working_set
-            .get_span_contents(spans[pos])
-            .starts_with(&[b'-'])
-    {
+    while pos < spans.len() && working_set.get_span_contents(spans[pos]).starts_with(b"-") {
         pos += 1;
     }
 
@@ -202,12 +198,8 @@ pub fn parse_def_predecl(working_set: &mut StateWorkingSet, spans: &[Span]) {
     let mut signature_pos = None;
 
     while pos < spans.len() {
-        if working_set
-            .get_span_contents(spans[pos])
-            .starts_with(&[b'['])
-            || working_set
-                .get_span_contents(spans[pos])
-                .starts_with(&[b'('])
+        if working_set.get_span_contents(spans[pos]).starts_with(b"[")
+            || working_set.get_span_contents(spans[pos]).starts_with(b"(")
         {
             signature_pos = Some(pos);
             break;
@@ -424,7 +416,7 @@ pub fn parse_def(
             let mut decl_name_span = None;
 
             for span in rest_spans {
-                if !working_set.get_span_contents(*span).starts_with(&[b'-']) {
+                if !working_set.get_span_contents(*span).starts_with(b"-") {
                     decl_name_span = Some(*span);
                     break;
                 }
@@ -554,7 +546,7 @@ pub fn parse_def(
         for arg_name in &signature.optional_positional {
             verify_not_reserved_variable_name(working_set, &arg_name.name, sig.span);
         }
-        for arg_name in &signature.rest_positional {
+        if let Some(arg_name) = &signature.rest_positional {
             verify_not_reserved_variable_name(working_set, &arg_name.name, sig.span);
         }
         for flag_name in &signature.get_names() {
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index a5559f5c52..8332d2f383 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -5926,7 +5926,7 @@ pub fn discover_captures_in_closure(
             seen.push(var_id);
         }
     }
-    for positional in &block.signature.rest_positional {
+    if let Some(positional) = &block.signature.rest_positional {
         if let Some(var_id) = positional.var_id {
             seen.push(var_id);
         }
diff --git a/crates/nu-path/src/path.rs b/crates/nu-path/src/path.rs
index 916fffdf72..9d7b64af27 100644
--- a/crates/nu-path/src/path.rs
+++ b/crates/nu-path/src/path.rs
@@ -660,10 +660,10 @@ impl Path {
     /// the current directory.
     ///
     /// * On Unix, a path is absolute if it starts with the root,
-    /// so [`is_absolute`](Path::is_absolute) and [`has_root`](Path::has_root) are equivalent.
+    ///   so [`is_absolute`](Path::is_absolute) and [`has_root`](Path::has_root) are equivalent.
     ///
     /// * On Windows, a path is absolute if it has a prefix and starts with the root:
-    /// `c:\windows` is absolute, while `c:temp` and `\temp` are not.
+    ///   `c:\windows` is absolute, while `c:temp` and `\temp` are not.
     ///
     /// # Examples
     ///
diff --git a/crates/nu-path/src/tilde.rs b/crates/nu-path/src/tilde.rs
index 95c91addf8..ac48bdfc3f 100644
--- a/crates/nu-path/src/tilde.rs
+++ b/crates/nu-path/src/tilde.rs
@@ -121,7 +121,7 @@ fn expand_tilde_with_another_user_home(path: &Path) -> PathBuf {
     return match path.to_str() {
         Some(file_path) => {
             let mut file = file_path.to_string();
-            match file_path.find(|c| c == '/' || c == '\\') {
+            match file_path.find(['/', '\\']) {
                 None => {
                     file.remove(0);
                     user_home_dir(&file)
diff --git a/crates/nu-pretty-hex/src/lib.rs b/crates/nu-pretty-hex/src/lib.rs
index 02a8d553f3..201f586f75 100644
--- a/crates/nu-pretty-hex/src/lib.rs
+++ b/crates/nu-pretty-hex/src/lib.rs
@@ -1,5 +1,3 @@
-// #![no_std]
-
 //! A Rust library providing pretty hex dump.
 //!
 //! A `simple_hex()` way renders one-line hex dump, and a `pretty_hex()` way renders
@@ -59,8 +57,5 @@
 //! 0018:   db b1 bc 35 bf ee         ...5..
 //! ```
 
-#[cfg(feature = "alloc")]
-extern crate alloc;
-
 mod pretty_hex;
 pub use pretty_hex::*;
diff --git a/crates/nu-pretty-hex/tests/tests.rs b/crates/nu-pretty-hex/tests/tests.rs
index b59362a077..8c481f6fb0 100644
--- a/crates/nu-pretty-hex/tests/tests.rs
+++ b/crates/nu-pretty-hex/tests/tests.rs
@@ -1,158 +1,147 @@
-// #![no_std]
-
-#[cfg(feature = "alloc")]
-extern crate alloc;
-extern crate nu_pretty_hex;
-
-#[cfg(feature = "alloc")]
-use alloc::{format, string::String, vec, vec::Vec};
 use nu_pretty_hex::*;
 
-#[cfg(feature = "alloc")]
-#[test]
-fn test_simple() {
-    let bytes: Vec<u8> = (0..16).collect();
-    let expected = "00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f";
-    assert_eq!(expected, simple_hex(&bytes));
-    assert_eq!(expected, bytes.hex_dump().to_string());
-    assert_eq!(simple_hex(&bytes), config_hex(&bytes, HexConfig::simple()));
-
-    let mut have = String::new();
-    simple_hex_write(&mut have, &bytes).unwrap();
-    assert_eq!(expected, have);
-
-    let str = "string";
-    let string: String = String::from("string");
-    let slice: &[u8] = &[0x73, 0x74, 0x72, 0x69, 0x6e, 0x67];
-    assert_eq!(simple_hex(&str), "73 74 72 69  6e 67");
-    assert_eq!(simple_hex(&str), simple_hex(&string));
-    assert_eq!(simple_hex(&str), simple_hex(&slice));
-
-    assert!(simple_hex(&vec![]).is_empty());
-}
-
-#[cfg(feature = "alloc")]
-#[test]
-fn test_pretty() {
-    let bytes: Vec<u8> = (0..256).map(|x| x as u8).collect();
-    let want = include_str!("256.txt");
-
-    let mut hex = String::new();
-    pretty_hex_write(&mut hex, &bytes).unwrap();
-    assert_eq!(want, hex);
-    assert_eq!(want, format!("{:?}", bytes.hex_dump()));
-    assert_eq!(want, pretty_hex(&bytes));
-    assert_eq!(want, config_hex(&bytes, HexConfig::default()));
-
-    assert_eq!("Length: 0 (0x0) bytes\n", pretty_hex(&vec![]));
-}
-
-#[cfg(feature = "alloc")]
-#[test]
-fn test_config() {
-    let cfg = HexConfig {
-        title: false,
-        ascii: false,
-        width: 0,
-        group: 0,
-        chunk: 0,
-    };
-    assert!(config_hex(&vec![], cfg).is_empty());
-    assert_eq!("2425262728", config_hex(&"$%&'(", cfg));
-
-    let v = include_bytes!("data");
-    let cfg = HexConfig {
-        title: false,
-        group: 8,
-        ..HexConfig::default()
-    };
-    let hex = "0000:   6b 4e 1a c3 af 03 d2 1e  7e 73 ba c8 bd 84 0f 83   kN......~s......\n\
-         0010:   89 d5 cf 90 23 67 4b 48  db b1 bc 35 bf ee         ....#gKH...5..";
-    assert_eq!(hex, config_hex(&v, cfg));
-    assert_eq!(hex, format!("{:?}", v.hex_conf(cfg)));
-    let mut str = String::new();
-    hex_write(&mut str, v, cfg).unwrap();
-    assert_eq!(hex, str);
-
-    assert_eq!(
-        config_hex(
-            &v,
-            HexConfig {
-                ascii: false,
-                ..cfg
-            }
-        ),
-        "0000:   6b 4e 1a c3 af 03 d2 1e  7e 73 ba c8 bd 84 0f 83\n\
-         0010:   89 d5 cf 90 23 67 4b 48  db b1 bc 35 bf ee"
-    );
-
-    assert_eq!(
-        config_hex(
-            &v,
-            HexConfig {
-                ascii: false,
-                group: 4,
-                chunk: 2,
-                ..cfg
-            }
-        ),
-        "0000:   6b4e 1ac3 af03 d21e  7e73 bac8 bd84 0f83\n\
-         0010:   89d5 cf90 2367 4b48  dbb1 bc35 bfee"
-    );
-
-    let v: Vec<u8> = (0..21).collect();
-    let want = r##"Length: 21 (0x15) bytes
-0000:   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
-0010:   10 11 12 13  14                                      ....."##;
-    assert_eq!(want, pretty_hex(&v));
-
-    let v: Vec<u8> = (0..13).collect();
-    assert_eq!(
-        config_hex(
-            &v,
-            HexConfig {
-                title: false,
-                ascii: true,
-                width: 11,
-                group: 2,
-                chunk: 3
-            }
-        ),
-        "0000:   000102 030405  060708 090a   ...........\n\
-         000b:   0b0c                         .."
-    );
-
-    let v: Vec<u8> = (0..19).collect();
-    assert_eq!(
-        config_hex(
-            &v,
-            HexConfig {
-                title: false,
-                ascii: true,
-                width: 16,
-                group: 3,
-                chunk: 3
-            }
-        ),
-        "0000:   000102 030405 060708  090a0b 0c0d0e 0f   ................\n\
-         0010:   101112                                   ..."
-    );
-
-    let cfg = HexConfig {
-        title: false,
-        group: 0,
-        ..HexConfig::default()
-    };
-    assert_eq!(
-        format!("{:?}", v.hex_conf(cfg)),
-        "0000:   00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f   ................\n\
-         0010:   10 11 12                                          ..."
-    );
-    assert_eq!(
-        v.hex_conf(cfg).to_string(),
-        "00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12"
-    );
-}
+// #[test]
+// fn test_simple() {
+//     let bytes: Vec<u8> = (0..16).collect();
+//     let expected = "00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f";
+//     assert_eq!(expected, simple_hex(&bytes));
+//     assert_eq!(expected, bytes.hex_dump().to_string());
+//     assert_eq!(simple_hex(&bytes), config_hex(&bytes, HexConfig::simple()));
+//
+//     let mut have = String::new();
+//     simple_hex_write(&mut have, &bytes).unwrap();
+//     assert_eq!(expected, have);
+//
+//     let str = "string";
+//     let string: String = String::from("string");
+//     let slice: &[u8] = &[0x73, 0x74, 0x72, 0x69, 0x6e, 0x67];
+//     assert_eq!(simple_hex(&str), "73 74 72 69  6e 67");
+//     assert_eq!(simple_hex(&str), simple_hex(&string));
+//     assert_eq!(simple_hex(&str), simple_hex(&slice));
+//
+//     assert!(simple_hex(&vec![]).is_empty());
+// }
+//
+// #[test]
+// fn test_pretty() {
+//     let bytes: Vec<u8> = (0..256).map(|x| x as u8).collect();
+//     let want = include_str!("256.txt");
+//
+//     let mut hex = String::new();
+//     pretty_hex_write(&mut hex, &bytes).unwrap();
+//     assert_eq!(want, hex);
+//     assert_eq!(want, format!("{:?}", bytes.hex_dump()));
+//     assert_eq!(want, pretty_hex(&bytes));
+//     assert_eq!(want, config_hex(&bytes, HexConfig::default()));
+//
+//     assert_eq!("Length: 0 (0x0) bytes\n", pretty_hex(&vec![]));
+// }
+//
+// #[test]
+// fn test_config() {
+//     let cfg = HexConfig {
+//         title: false,
+//         ascii: false,
+//         width: 0,
+//         group: 0,
+//         chunk: 0,
+//     };
+//     assert!(config_hex(&vec![], cfg).is_empty());
+//     assert_eq!("2425262728", config_hex(&"$%&'(", cfg));
+//
+//     let v = include_bytes!("data");
+//     let cfg = HexConfig {
+//         title: false,
+//         group: 8,
+//         ..HexConfig::default()
+//     };
+//     let hex = "0000:   6b 4e 1a c3 af 03 d2 1e  7e 73 ba c8 bd 84 0f 83   kN......~s......\n\
+//          0010:   89 d5 cf 90 23 67 4b 48  db b1 bc 35 bf ee         ....#gKH...5..";
+//     assert_eq!(hex, config_hex(&v, cfg));
+//     assert_eq!(hex, format!("{:?}", v.hex_conf(cfg)));
+//     let mut str = String::new();
+//     hex_write(&mut str, v, cfg).unwrap();
+//     assert_eq!(hex, str);
+//
+//     assert_eq!(
+//         config_hex(
+//             &v,
+//             HexConfig {
+//                 ascii: false,
+//                 ..cfg
+//             }
+//         ),
+//         "0000:   6b 4e 1a c3 af 03 d2 1e  7e 73 ba c8 bd 84 0f 83\n\
+//          0010:   89 d5 cf 90 23 67 4b 48  db b1 bc 35 bf ee"
+//     );
+//
+//     assert_eq!(
+//         config_hex(
+//             &v,
+//             HexConfig {
+//                 ascii: false,
+//                 group: 4,
+//                 chunk: 2,
+//                 ..cfg
+//             }
+//         ),
+//         "0000:   6b4e 1ac3 af03 d21e  7e73 bac8 bd84 0f83\n\
+//          0010:   89d5 cf90 2367 4b48  dbb1 bc35 bfee"
+//     );
+//
+//     let v: Vec<u8> = (0..21).collect();
+//     let want = r##"Length: 21 (0x15) bytes
+// 0000:   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
+// 0010:   10 11 12 13  14                                      ....."##;
+//     assert_eq!(want, pretty_hex(&v));
+//
+//     let v: Vec<u8> = (0..13).collect();
+//     assert_eq!(
+//         config_hex(
+//             &v,
+//             HexConfig {
+//                 title: false,
+//                 ascii: true,
+//                 width: 11,
+//                 group: 2,
+//                 chunk: 3
+//             }
+//         ),
+//         "0000:   000102 030405  060708 090a   ...........\n\
+//          000b:   0b0c                         .."
+//     );
+//
+//     let v: Vec<u8> = (0..19).collect();
+//     assert_eq!(
+//         config_hex(
+//             &v,
+//             HexConfig {
+//                 title: false,
+//                 ascii: true,
+//                 width: 16,
+//                 group: 3,
+//                 chunk: 3
+//             }
+//         ),
+//         "0000:   000102 030405 060708  090a0b 0c0d0e 0f   ................\n\
+//          0010:   101112                                   ..."
+//     );
+//
+//     let cfg = HexConfig {
+//         title: false,
+//         group: 0,
+//         ..HexConfig::default()
+//     };
+//     assert_eq!(
+//         format!("{:?}", v.hex_conf(cfg)),
+//         "0000:   00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f   ................\n\
+//          0010:   10 11 12                                          ..."
+//     );
+//     assert_eq!(
+//         v.hex_conf(cfg).to_string(),
+//         "00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12"
+//     );
+// }
 
 // This test case checks that hex_write works even without the alloc crate.
 // Decorators to this function like simple_hex_write or PrettyHex::hex_dump()
diff --git a/crates/nu-protocol/src/pipeline/pipeline_data.rs b/crates/nu-protocol/src/pipeline/pipeline_data.rs
index 2ae8027f06..91fd0e1315 100644
--- a/crates/nu-protocol/src/pipeline/pipeline_data.rs
+++ b/crates/nu-protocol/src/pipeline/pipeline_data.rs
@@ -19,12 +19,12 @@ const LINE_ENDING_PATTERN: &[char] = &['\r', '\n'];
 /// We've tried a few variations of this structure. Listing these below so we have a record.
 ///
 /// * We tried always assuming a stream in Nushell. This was a great 80% solution, but it had some rough edges.
-/// Namely, how do you know the difference between a single string and a list of one string. How do you know
-/// when to flatten the data given to you from a data source into the stream or to keep it as an unflattened
-/// list?
+///   Namely, how do you know the difference between a single string and a list of one string. How do you know
+///   when to flatten the data given to you from a data source into the stream or to keep it as an unflattened
+///   list?
 ///
 /// * We tried putting the stream into Value. This had some interesting properties as now commands "just worked
-/// on values", but lead to a few unfortunate issues.
+///   on values", but lead to a few unfortunate issues.
 ///
 /// The first is that you can't easily clone Values in a way that felt largely immutable. For example, if
 /// you cloned a Value which contained a stream, and in one variable drained some part of it, then the second
@@ -37,8 +37,8 @@ const LINE_ENDING_PATTERN: &[char] = &['\r', '\n'];
 /// concrete list values rather than streams, and be able to view them without non-local effects.
 ///
 /// * A balance of the two approaches is what we've landed on: Values are thread-safe to pass, and we can stream
-/// them into any sources. Streams are still available to model the infinite streams approach of original
-/// Nushell.
+///   them into any sources. Streams are still available to model the infinite streams approach of original
+///   Nushell.
 #[derive(Debug)]
 pub enum PipelineData {
     Empty,
diff --git a/crates/nu-protocol/src/signature.rs b/crates/nu-protocol/src/signature.rs
index f8b83063d7..c67e8a604e 100644
--- a/crates/nu-protocol/src/signature.rs
+++ b/crates/nu-protocol/src/signature.rs
@@ -467,13 +467,12 @@ impl Signature {
     /// Checks if short or long are already present
     /// Panics if one of them is found
     fn check_names(&self, name: impl Into<String>, short: Option<char>) -> (String, Option<char>) {
-        let s = short.map(|c| {
+        let s = short.inspect(|c| {
             assert!(
-                !self.get_shorts().contains(&c),
+                !self.get_shorts().contains(c),
                 "There may be duplicate short flags for '-{}'",
                 c
             );
-            c
         });
 
         let name = {
diff --git a/crates/nu-system/src/foreground.rs b/crates/nu-system/src/foreground.rs
index bd78f616aa..93f7dd35c0 100644
--- a/crates/nu-system/src/foreground.rs
+++ b/crates/nu-system/src/foreground.rs
@@ -61,9 +61,8 @@ impl ForegroundChild {
                         pipeline_state: Some(pipeline_state.clone()),
                     }
                 })
-                .map_err(|e| {
+                .inspect_err(|_e| {
                     foreground_pgroup::reset();
-                    e
                 })
         } else {
             command.spawn().map(|child| Self {
diff --git a/crates/nuon/src/from.rs b/crates/nuon/src/from.rs
index 2138e50ac5..ded1512a6a 100644
--- a/crates/nuon/src/from.rs
+++ b/crates/nuon/src/from.rs
@@ -12,7 +12,7 @@ use std::sync::Arc;
 /// > **Note**  
 /// > [`Span`] can be passed to [`from_nuon`] if there is context available to the caller, e.g. when
 /// > using this function in a command implementation such as
-/// [`from nuon`](https://www.nushell.sh/commands/docs/from_nuon.html).
+/// > [`from nuon`](https://www.nushell.sh/commands/docs/from_nuon.html).
 ///
 /// also see [`super::to_nuon`] for the inverse operation
 pub fn from_nuon(input: &str, span: Option<Span>) -> Result<Value, ShellError> {

From 3dc9691aaadf9833392a2b993d94544817051ef2 Mon Sep 17 00:00:00 2001
From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Wed, 31 Jul 2024 17:34:38 -0400
Subject: [PATCH 0288/1072] Clarify `random int` help (#13503)

# Description

Minor nitpicks, but the `random int` help and examples were a bit
ambiguous in several aspects. Updated to clarify that:

* An unconstrained `random int` returns a non-negative integer. That is,
the smallest potential value is 0. Technically integers include negative
numbers as well, and `random int` will never return one unless you pass
it a range with a negative lower-bound.

* To that end, changed the final example to demonstrate a negative
lower-bound.

* The range is inclusive. While most people would probably assume this,
the changes make this explicit in the examples and argument description.

# User-Facing Changes

Help only

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib

# After Submitting

N/A
---
 crates/nu-command/src/random/int.rs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/crates/nu-command/src/random/int.rs b/crates/nu-command/src/random/int.rs
index 6a5467b010..c04e957bf4 100644
--- a/crates/nu-command/src/random/int.rs
+++ b/crates/nu-command/src/random/int.rs
@@ -15,7 +15,11 @@ impl Command for SubCommand {
         Signature::build("random int")
             .input_output_types(vec![(Type::Nothing, Type::Int)])
             .allow_variants_without_examples(true)
-            .optional("range", SyntaxShape::Range, "Range of values.")
+            .optional(
+                "range",
+                SyntaxShape::Range,
+                "Range of potential values, inclusive of both start and end values.",
+            )
             .category(Category::Random)
     }
 
@@ -40,12 +44,12 @@ impl Command for SubCommand {
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
-                description: "Generate an unconstrained random integer",
+                description: "Generate a non-negative random integer",
                 example: "random int",
                 result: None,
             },
             Example {
-                description: "Generate a random integer less than or equal to 500",
+                description: "Generate a random integer between 0 (inclusive) and 500 (inclusive)",
                 example: "random int ..500",
                 result: None,
             },
@@ -55,8 +59,8 @@ impl Command for SubCommand {
                 result: None,
             },
             Example {
-                description: "Generate a random integer between 1 and 10",
-                example: "random int 1..10",
+                description: "Generate a random integer between -10 (inclusive) and 10 (inclusive)",
+                example: "random int (-10)..10",
                 result: None,
             },
         ]

From f82c43f850e966d826facb74ca25210dd51292a6 Mon Sep 17 00:00:00 2001
From: Bruce Weirdan <weirdan@gmail.com>
Date: Wed, 31 Jul 2024 23:35:41 +0200
Subject: [PATCH 0289/1072] Consider numbers to be part of a word in `split
 words` (#13502)

# Description

Before this change, `"hash sha256 123 ok" | split words` would return
`[hash sha ok]` - which is surprising to say the least.

Now it will return `[hash sha256 123 ok]`.

Refs:
https://discord.com/channels/601130461678272522/615253963645911060/1268151658572025856

# User-Facing Changes
`split words` will no longer remove digits.

# Tests + Formatting
Added a test for this specific case.

# After Submitting
---
 crates/nu-command/src/strings/split/words.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/strings/split/words.rs b/crates/nu-command/src/strings/split/words.rs
index 6cb5562a70..b95a06f65c 100644
--- a/crates/nu-command/src/strings/split/words.rs
+++ b/crates/nu-command/src/strings/split/words.rs
@@ -187,7 +187,7 @@ fn split_words_helper(v: &Value, word_length: Option<usize>, span: Span, graphem
     // [^[:alpha:]\'] = do not match any uppercase or lowercase letters or apostrophes
     // [^\p{L}\'] = do not match any unicode uppercase or lowercase letters or apostrophes
     // Let's go with the unicode one in hopes that it works on more than just ascii characters
-    let regex_replace = Regex::new(r"[^\p{L}\']").expect("regular expression error");
+    let regex_replace = Regex::new(r"[^\p{L}\p{N}\']").expect("regular expression error");
     let v_span = v.span();
 
     match v {
@@ -422,4 +422,9 @@ mod test {
 
         test_examples(SubCommand {})
     }
+    #[test]
+    fn mixed_letter_number() {
+        let actual = nu!(r#"echo "a1 b2 c3" | split words | str join ','"#);
+        assert_eq!(actual.out, "a1,b2,c3");
+    }
 }

From ca73d85c09d868519b68bc4b8917765a5cb03f3d Mon Sep 17 00:00:00 2001
From: Embers-of-the-Fire <stellarishs@163.com>
Date: Thu, 1 Aug 2024 09:43:06 +0800
Subject: [PATCH 0290/1072] Add `--upgrade` switch for `mv` command (#13505)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

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

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
Add `--upgrade, -u` switch for `mv` command, corresponding to `cp`.

Closes #13458.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
```plain
❯ help mv | find update
╭──────────┬───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│        0 │   -u, --update - move and overwite only when the SOURCE file is newer than the destination file or when the destination file is missing       │
╰──────────┴───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
```

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

Make sure you've run and fixed any issues with these commands:
-->
- [x] `cargo fmt --all -- --check` to check standard code formatting
(`cargo fmt --all` applies these changes)
- [x] `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used`
to check that you're using the standard code style
- [x] `cargo test --workspace` to check that all tests pass (on Windows
make sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- [x] `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library
<!--
> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

P.S.
The standard test kit (`nu-test-support`) doesn't provide utility to
create file with modification timestamp, and I didn't find any test for
this in `cp` command. I had tested on my local machine but I'm not sure
how to integrate it into ci. If unit testing is required, I may need
your guidance.

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
- [x] Command docs are auto generated.
---
 crates/nu-command/src/filesystem/umv.rs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/filesystem/umv.rs b/crates/nu-command/src/filesystem/umv.rs
index d5c58f30e4..0c10df9ab2 100644
--- a/crates/nu-command/src/filesystem/umv.rs
+++ b/crates/nu-command/src/filesystem/umv.rs
@@ -30,6 +30,11 @@ impl Command for UMv {
                 example: "mv test.txt my/subdirectory",
                 result: None,
             },
+            Example {
+                description: "Move only if source file is newer than target file",
+                example: "mv -u new/test.txt old/",
+                result: None,
+            },
             Example {
                 description: "Move many files into a directory",
                 example: "mv *.txt my/subdirectory",
@@ -49,6 +54,11 @@ impl Command for UMv {
             .switch("verbose", "explain what is being done.", Some('v'))
             .switch("progress", "display a progress bar", Some('p'))
             .switch("interactive", "prompt before overwriting", Some('i'))
+            .switch(
+                "update",
+                "move and overwrite only when the SOURCE file is newer than the destination file or when the destination file is missing",
+                Some('u')
+            )
             .switch("no-clobber", "do not overwrite an existing file", Some('n'))
             .rest(
                 "paths",
@@ -77,6 +87,11 @@ impl Command for UMv {
         } else {
             uu_mv::OverwriteMode::Force
         };
+        let update = if call.has_flag(engine_state, stack, "update")? {
+            UpdateMode::ReplaceIfOlder
+        } else {
+            UpdateMode::ReplaceAll
+        };
 
         #[allow(deprecated)]
         let cwd = current_dir(engine_state, stack)?;
@@ -164,7 +179,7 @@ impl Command for UMv {
             verbose,
             suffix: String::from("~"),
             backup: BackupMode::NoBackup,
-            update: UpdateMode::ReplaceAll,
+            update,
             target_dir: None,
             no_target_dir: false,
             strip_slashes: false,

From ae5fed41ed73defcaf67aa316abe50af1728e770 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Thu, 1 Aug 2024 08:16:31 +0000
Subject: [PATCH 0291/1072] Path migration part 3: `$nu` paths (#13368)

# Description
Part 3 of replacing `std::path` types with `nu_path` types added in
#13115. This PR targets the paths listed in `$nu`. That is, the home,
config, data, and cache directories.
---
 .../nu-cli/src/commands/history/history_.rs   |  4 +-
 .../src/completions/completion_common.rs      |  2 +-
 crates/nu-cli/src/config_files.rs             |  5 +-
 crates/nu-cmd-base/src/util.rs                | 25 ++++---
 crates/nu-command/src/filesystem/cd.rs        |  7 +-
 crates/nu-command/src/filesystem/rm.rs        |  7 +-
 crates/nu-path/src/dots.rs                    | 16 ++++-
 crates/nu-path/src/expansions.rs              | 14 +++-
 crates/nu-path/src/helpers.rs                 | 69 ++++++-------------
 crates/nu-path/src/lib.rs                     |  2 +-
 crates/nu-protocol/src/eval_const.rs          |  8 +--
 src/config_files.rs                           |  6 +-
 src/main.rs                                   | 15 ++--
 tests/repl/test_config_path.rs                |  2 +-
 14 files changed, 90 insertions(+), 92 deletions(-)

diff --git a/crates/nu-cli/src/commands/history/history_.rs b/crates/nu-cli/src/commands/history/history_.rs
index 1f3d1082fa..c270cef003 100644
--- a/crates/nu-cli/src/commands/history/history_.rs
+++ b/crates/nu-cli/src/commands/history/history_.rs
@@ -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);
diff --git a/crates/nu-cli/src/completions/completion_common.rs b/crates/nu-cli/src/completions/completion_common.rs
index d6882da57b..5469ba1326 100644
--- a/crates/nu-cli/src/completions/completion_common.rs
+++ b/crates/nu-cli/src/completions/completion_common.rs
@@ -176,7 +176,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;
         }
diff --git a/crates/nu-cli/src/config_files.rs b/crates/nu-cli/src/config_files.rs
index 3a02f75e86..0a1226c304 100644
--- a/crates/nu-cli/src/config_files.rs
+++ b/crates/nu-cli/src/config_files.rs
@@ -192,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);
@@ -247,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()
     })
 }
 
diff --git a/crates/nu-cmd-base/src/util.rs b/crates/nu-cmd-base/src/util.rs
index e485243877..f778fe4679 100644
--- a/crates/nu-cmd-base/src/util.rs
+++ b/crates/nu-cmd-base/src/util.rs
@@ -3,21 +3,26 @@ 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 {
-    std::env::current_dir().unwrap_or_else(|_| {
-        std::env::var("PWD")
-            .map(Into::into)
-            .unwrap_or_else(|_| nu_path::home_dir().unwrap_or_default())
-    })
+pub fn get_init_cwd() -> AbsolutePathBuf {
+    std::env::current_dir()
+        .ok()
+        .and_then(|path| AbsolutePathBuf::try_from(path).ok())
+        .or_else(|| {
+            std::env::var("PWD")
+                .ok()
+                .and_then(|path| AbsolutePathBuf::try_from(path).ok())
+        })
+        .or_else(nu_path::home_dir)
+        .expect("Failed to get current working directory")
 }
 
-pub fn get_guaranteed_cwd(engine_state: &EngineState, stack: &Stack) -> PathBuf {
+pub fn get_guaranteed_cwd(engine_state: &EngineState, stack: &Stack) -> AbsolutePathBuf {
     engine_state
         .cwd(Some(stack))
-        .map(AbsolutePathBuf::into_std_path_buf)
-        .unwrap_or(crate::util::get_init_cwd())
+        .ok()
+        .unwrap_or_else(get_init_cwd)
 }
 
 type MakeRangeError = fn(&str, Span) -> ShellError;
diff --git a/crates/nu-command/src/filesystem/cd.rs b/crates/nu-command/src/filesystem/cd.rs
index 23faf6f67b..ba91e6d0ca 100644
--- a/crates/nu-command/src/filesystem/cd.rs
+++ b/crates/nu-command/src/filesystem/cd.rs
@@ -1,6 +1,5 @@
 use nu_cmd_base::util::get_init_cwd;
 use nu_engine::command_prelude::*;
-use nu_path::AbsolutePathBuf;
 use nu_utils::filesystem::{have_permission, PermissionResult};
 
 #[derive(Clone)]
@@ -46,8 +45,8 @@ impl Command for Cd {
         // user can use `cd` to recover PWD to a good state.
         let cwd = engine_state
             .cwd(Some(stack))
-            .map(AbsolutePathBuf::into_std_path_buf)
-            .unwrap_or(get_init_cwd());
+            .ok()
+            .unwrap_or_else(get_init_cwd);
 
         let path_val = {
             if let Some(path) = path_val {
@@ -66,7 +65,7 @@ impl Command for Cd {
                     if let Some(oldpwd) = stack.get_env_var(engine_state, "OLDPWD") {
                         oldpwd.to_path()?
                     } else {
-                        cwd
+                        cwd.into()
                     }
                 } else {
                     // Trim whitespace from the end of path.
diff --git a/crates/nu-command/src/filesystem/rm.rs b/crates/nu-command/src/filesystem/rm.rs
index 9eb4fabace..9e879cb2ad 100644
--- a/crates/nu-command/src/filesystem/rm.rs
+++ b/crates/nu-command/src/filesystem/rm.rs
@@ -135,12 +135,9 @@ fn rm(
     let home: Option<String> = nu_path::home_dir().map(|path| {
         {
             if path.exists() {
-                match nu_path::canonicalize_with(&path, &currentdir_path) {
-                    Ok(canon_path) => canon_path,
-                    Err(_) => path,
-                }
+                nu_path::canonicalize_with(&path, &currentdir_path).unwrap_or(path.into())
             } else {
-                path
+                path.into()
             }
         }
         .to_string_lossy()
diff --git a/crates/nu-path/src/dots.rs b/crates/nu-path/src/dots.rs
index 53330eec1d..6f46bb09c3 100644
--- a/crates/nu-path/src/dots.rs
+++ b/crates/nu-path/src/dots.rs
@@ -1,4 +1,5 @@
-use super::helpers;
+#[cfg(windows)]
+use omnipath::WinPathExt;
 use std::path::{Component, Path, PathBuf};
 
 /// Normalize the path, expanding occurrences of n-dots.
@@ -63,7 +64,18 @@ pub fn expand_dots(path: impl AsRef<Path>) -> PathBuf {
         }
     }
 
-    helpers::simiplified(&result)
+    simiplified(&result)
+}
+
+#[cfg(windows)]
+fn simiplified(path: &std::path::Path) -> PathBuf {
+    path.to_winuser_path()
+        .unwrap_or_else(|_| path.to_path_buf())
+}
+
+#[cfg(not(windows))]
+fn simiplified(path: &std::path::Path) -> PathBuf {
+    path.to_path_buf()
 }
 
 #[cfg(test)]
diff --git a/crates/nu-path/src/expansions.rs b/crates/nu-path/src/expansions.rs
index 8e99b84092..44e2d12503 100644
--- a/crates/nu-path/src/expansions.rs
+++ b/crates/nu-path/src/expansions.rs
@@ -1,8 +1,9 @@
+#[cfg(windows)]
+use omnipath::WinPathExt;
 use std::io;
 use std::path::{Path, PathBuf};
 
 use super::dots::{expand_dots, expand_ndots};
-use super::helpers;
 use super::tilde::expand_tilde;
 
 // Join a path relative to another path. Paths starting with tilde are considered as absolute.
@@ -30,8 +31,17 @@ where
 fn canonicalize(path: impl AsRef<Path>) -> io::Result<PathBuf> {
     let path = expand_tilde(path);
     let path = expand_ndots(path);
+    canonicalize_path(&path)
+}
 
-    helpers::canonicalize(&path)
+#[cfg(windows)]
+fn canonicalize_path(path: &std::path::Path) -> std::io::Result<std::path::PathBuf> {
+    path.canonicalize()?.to_winuser_path()
+}
+
+#[cfg(not(windows))]
+fn canonicalize_path(path: &std::path::Path) -> std::io::Result<std::path::PathBuf> {
+    path.canonicalize()
 }
 
 /// Resolve all symbolic links and all components (tilde, ., .., ...+) and return the path in its
diff --git a/crates/nu-path/src/helpers.rs b/crates/nu-path/src/helpers.rs
index a6e35bddfe..b36d59971e 100644
--- a/crates/nu-path/src/helpers.rs
+++ b/crates/nu-path/src/helpers.rs
@@ -1,59 +1,32 @@
-#[cfg(windows)]
-use omnipath::WinPathExt;
-use std::path::PathBuf;
+use crate::AbsolutePathBuf;
 
-pub fn home_dir() -> Option<PathBuf> {
-    dirs::home_dir()
+pub fn home_dir() -> Option<AbsolutePathBuf> {
+    dirs::home_dir().and_then(|home| AbsolutePathBuf::try_from(home).ok())
 }
 
 /// Return the data directory for the current platform or XDG_DATA_HOME if specified.
-pub fn data_dir() -> Option<PathBuf> {
-    match std::env::var("XDG_DATA_HOME").map(PathBuf::from) {
-        Ok(xdg_data) if xdg_data.is_absolute() => Some(canonicalize(&xdg_data).unwrap_or(xdg_data)),
-        _ => get_canonicalized_path(dirs::data_dir()),
-    }
+pub fn data_dir() -> Option<AbsolutePathBuf> {
+    std::env::var("XDG_DATA_HOME")
+        .ok()
+        .and_then(|path| AbsolutePathBuf::try_from(path).ok())
+        .or_else(|| dirs::data_dir().and_then(|path| AbsolutePathBuf::try_from(path).ok()))
+        .map(|path| path.canonicalize().map(Into::into).unwrap_or(path))
 }
 
 /// Return the cache directory for the current platform or XDG_CACHE_HOME if specified.
-pub fn cache_dir() -> Option<PathBuf> {
-    match std::env::var("XDG_CACHE_HOME").map(PathBuf::from) {
-        Ok(xdg_cache) if xdg_cache.is_absolute() => {
-            Some(canonicalize(&xdg_cache).unwrap_or(xdg_cache))
-        }
-        _ => get_canonicalized_path(dirs::cache_dir()),
-    }
+pub fn cache_dir() -> Option<AbsolutePathBuf> {
+    std::env::var("XDG_CACHE_HOME")
+        .ok()
+        .and_then(|path| AbsolutePathBuf::try_from(path).ok())
+        .or_else(|| dirs::cache_dir().and_then(|path| AbsolutePathBuf::try_from(path).ok()))
+        .map(|path| path.canonicalize().map(Into::into).unwrap_or(path))
 }
 
 /// Return the config directory for the current platform or XDG_CONFIG_HOME if specified.
-pub fn config_dir() -> Option<PathBuf> {
-    match std::env::var("XDG_CONFIG_HOME").map(PathBuf::from) {
-        Ok(xdg_config) if xdg_config.is_absolute() => {
-            Some(canonicalize(&xdg_config).unwrap_or(xdg_config))
-        }
-        _ => get_canonicalized_path(dirs::config_dir()),
-    }
-}
-
-pub fn get_canonicalized_path(path: Option<PathBuf>) -> Option<PathBuf> {
-    let path = path?;
-    Some(canonicalize(&path).unwrap_or(path))
-}
-
-#[cfg(windows)]
-pub fn canonicalize(path: &std::path::Path) -> std::io::Result<std::path::PathBuf> {
-    path.canonicalize()?.to_winuser_path()
-}
-#[cfg(not(windows))]
-pub fn canonicalize(path: &std::path::Path) -> std::io::Result<std::path::PathBuf> {
-    path.canonicalize()
-}
-
-#[cfg(windows)]
-pub fn simiplified(path: &std::path::Path) -> PathBuf {
-    path.to_winuser_path()
-        .unwrap_or_else(|_| path.to_path_buf())
-}
-#[cfg(not(windows))]
-pub fn simiplified(path: &std::path::Path) -> PathBuf {
-    path.to_path_buf()
+pub fn config_dir() -> Option<AbsolutePathBuf> {
+    std::env::var("XDG_CONFIG_HOME")
+        .ok()
+        .and_then(|path| AbsolutePathBuf::try_from(path).ok())
+        .or_else(|| dirs::config_dir().and_then(|path| AbsolutePathBuf::try_from(path).ok()))
+        .map(|path| path.canonicalize().map(Into::into).unwrap_or(path))
 }
diff --git a/crates/nu-path/src/lib.rs b/crates/nu-path/src/lib.rs
index 2cb415264a..524a6aed4e 100644
--- a/crates/nu-path/src/lib.rs
+++ b/crates/nu-path/src/lib.rs
@@ -11,7 +11,7 @@ mod trailing_slash;
 
 pub use components::components;
 pub use expansions::{canonicalize_with, expand_path_with, expand_to_real_path, locate_in_dirs};
-pub use helpers::{cache_dir, config_dir, data_dir, get_canonicalized_path, home_dir};
+pub use helpers::{cache_dir, config_dir, data_dir, home_dir};
 pub use path::*;
 pub use tilde::expand_tilde;
 pub use trailing_slash::{has_trailing_slash, strip_trailing_slash};
diff --git a/crates/nu-protocol/src/eval_const.rs b/crates/nu-protocol/src/eval_const.rs
index 4cb5ccc0f5..1ee7802799 100644
--- a/crates/nu-protocol/src/eval_const.rs
+++ b/crates/nu-protocol/src/eval_const.rs
@@ -36,7 +36,7 @@ pub(crate) fn create_nu_constant(engine_state: &EngineState, span: Span) -> Valu
     let config_path = match nu_path::config_dir() {
         Some(mut path) => {
             path.push("nushell");
-            Ok(canonicalize_path(engine_state, &path))
+            Ok(canonicalize_path(engine_state, path.as_ref()))
         }
         None => Err(Value::error(
             ShellError::ConfigDirNotFound { span: Some(span) },
@@ -141,7 +141,7 @@ pub(crate) fn create_nu_constant(engine_state: &EngineState, span: Span) -> Valu
     record.push(
         "home-path",
         if let Some(path) = nu_path::home_dir() {
-            let canon_home_path = canonicalize_path(engine_state, &path);
+            let canon_home_path = canonicalize_path(engine_state, path.as_ref());
             Value::string(canon_home_path.to_string_lossy(), span)
         } else {
             Value::error(
@@ -156,7 +156,7 @@ pub(crate) fn create_nu_constant(engine_state: &EngineState, span: Span) -> Valu
     record.push(
         "data-dir",
         if let Some(path) = nu_path::data_dir() {
-            let mut canon_data_path = canonicalize_path(engine_state, &path);
+            let mut canon_data_path = canonicalize_path(engine_state, path.as_ref());
             canon_data_path.push("nushell");
             Value::string(canon_data_path.to_string_lossy(), span)
         } else {
@@ -172,7 +172,7 @@ pub(crate) fn create_nu_constant(engine_state: &EngineState, span: Span) -> Valu
     record.push(
         "cache-dir",
         if let Some(path) = nu_path::cache_dir() {
-            let mut canon_cache_path = canonicalize_path(engine_state, &path);
+            let mut canon_cache_path = canonicalize_path(engine_state, path.as_ref());
             canon_cache_path.push("nushell");
             Value::string(canon_cache_path.to_string_lossy(), span)
         } else {
diff --git a/src/config_files.rs b/src/config_files.rs
index cf72819600..1f9e4e9433 100644
--- a/src/config_files.rs
+++ b/src/config_files.rs
@@ -121,7 +121,7 @@ pub(crate) fn read_config_file(
             }
         }
 
-        eval_config_contents(config_path, engine_state, stack);
+        eval_config_contents(config_path.into(), engine_state, stack);
     }
 }
 
@@ -141,7 +141,7 @@ pub(crate) fn read_loginshell_file(engine_state: &mut EngineState, stack: &mut S
         warn!("loginshell_file: {}", config_path.display());
 
         if config_path.exists() {
-            eval_config_contents(config_path, engine_state, stack);
+            eval_config_contents(config_path.into(), engine_state, stack);
         }
     }
 }
@@ -302,7 +302,7 @@ pub(crate) fn set_config_path(
         Some(s) => canonicalize_with(&s.item, cwd).ok(),
         None => nu_path::config_dir().map(|mut p| {
             p.push(NUSHELL_FOLDER);
-            let mut p = canonicalize_with(&p, cwd).unwrap_or(p);
+            let mut p = canonicalize_with(&p, cwd).unwrap_or(p.into());
             p.push(default_config_name);
             canonicalize_with(&p, cwd).unwrap_or(p)
         }),
diff --git a/src/main.rs b/src/main.rs
index f220731d1d..a5c5c5d8ef 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -79,7 +79,7 @@ fn main() -> Result<()> {
     // there is an error reading it, these values will be used.
     let nushell_config_path = if let Some(mut path) = nu_path::config_dir() {
         path.push("nushell");
-        path
+        path.into()
     } else {
         // Not really sure what to default this to if nu_path::config_dir() returns None
         std::path::PathBuf::new()
@@ -99,8 +99,9 @@ fn main() -> Result<()> {
                         default: nushell_config_path.display().to_string(),
                     },
                 );
-            } else if let Some(old_config) =
-                nu_path::get_canonicalized_path(dirs::config_dir()).map(|p| p.join("nushell"))
+            } else if let Some(old_config) = dirs::config_dir()
+                .and_then(|p| p.canonicalize().ok())
+                .map(|p| p.join("nushell"))
             {
                 let xdg_config_empty = nushell_config_path
                     .read_dir()
@@ -125,7 +126,7 @@ fn main() -> Result<()> {
     let default_nushell_completions_path = if let Some(mut path) = nu_path::data_dir() {
         path.push("nushell");
         path.push("completions");
-        path
+        path.into()
     } else {
         std::path::PathBuf::new()
     };
@@ -220,7 +221,7 @@ fn main() -> Result<()> {
     start_time = std::time::Instant::now();
     set_config_path(
         &mut engine_state,
-        &init_cwd,
+        init_cwd.as_ref(),
         "config.nu",
         "config-path",
         parsed_nu_cli_args.config_file.as_ref(),
@@ -228,7 +229,7 @@ fn main() -> Result<()> {
 
     set_config_path(
         &mut engine_state,
-        &init_cwd,
+        init_cwd.as_ref(),
         "env.nu",
         "env-path",
         parsed_nu_cli_args.env_file.as_ref(),
@@ -257,7 +258,7 @@ fn main() -> Result<()> {
 
     start_time = std::time::Instant::now();
     // First, set up env vars as strings only
-    gather_parent_env_vars(&mut engine_state, &init_cwd);
+    gather_parent_env_vars(&mut engine_state, init_cwd.as_ref());
     perf!("gather env vars", start_time, use_color);
 
     engine_state.add_env_var(
diff --git a/tests/repl/test_config_path.rs b/tests/repl/test_config_path.rs
index 895b1bd8bf..b66633c879 100644
--- a/tests/repl/test_config_path.rs
+++ b/tests/repl/test_config_path.rs
@@ -129,7 +129,7 @@ fn test_config_path_helper(playground: &mut Playground, config_dir_nushell: Path
 fn test_default_config_path() {
     Playground::setup("default_config_path", |_, playground| {
         let config_dir = nu_path::config_dir().expect("Could not get config directory");
-        test_config_path_helper(playground, config_dir.join("nushell"));
+        test_config_path_helper(playground, config_dir.join("nushell").into());
     });
 }
 

From 2c6b1471e1e44e7ddc4b230bb0b99aad0f8551e3 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Thu, 1 Aug 2024 11:02:55 +0200
Subject: [PATCH 0292/1072] Contentious clippy fixes (#13498)

Lints from stable or nightly toolchain that may have questionable added
value.

- **Contentious lint to contract into single `if let`**
- **Potential false positive around `AsRef`/`Deref` fun**
---
 crates/nu-command/src/filesystem/ucp.rs |  2 +-
 crates/nu-command/src/filesystem/umv.rs |  2 +-
 crates/nu-parser/src/parse_keywords.rs  | 28 ++++++++++++-------------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/crates/nu-command/src/filesystem/ucp.rs b/crates/nu-command/src/filesystem/ucp.rs
index d73413d721..447751220d 100644
--- a/crates/nu-command/src/filesystem/ucp.rs
+++ b/crates/nu-command/src/filesystem/ucp.rs
@@ -235,7 +235,7 @@ impl Command for UCp {
         for (sources, need_expand_tilde) in sources.iter_mut() {
             for src in sources.iter_mut() {
                 if !src.is_absolute() {
-                    *src = nu_path::expand_path_with(&src, &cwd, *need_expand_tilde);
+                    *src = nu_path::expand_path_with(&*src, &cwd, *need_expand_tilde);
                 }
             }
         }
diff --git a/crates/nu-command/src/filesystem/umv.rs b/crates/nu-command/src/filesystem/umv.rs
index 0c10df9ab2..12d95e015b 100644
--- a/crates/nu-command/src/filesystem/umv.rs
+++ b/crates/nu-command/src/filesystem/umv.rs
@@ -156,7 +156,7 @@ impl Command for UMv {
         for (files, need_expand_tilde) in files.iter_mut() {
             for src in files.iter_mut() {
                 if !src.is_absolute() {
-                    *src = nu_path::expand_path_with(&src, &cwd, *need_expand_tilde);
+                    *src = nu_path::expand_path_with(&*src, &cwd, *need_expand_tilde);
                 }
             }
         }
diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index 6b7245f1ce..b4506e7f7d 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -300,21 +300,21 @@ pub fn parse_for(working_set: &mut StateWorkingSet, lite_command: &LiteCommand)
             }
 
             // Let's get our block and make sure it has the right signature
-            if let Some(arg) = call.positional_nth(2) {
-                match arg {
-                    Expression {
-                        expr: Expr::Block(block_id),
-                        ..
-                    }
-                    | Expression {
-                        expr: Expr::RowCondition(block_id),
-                        ..
-                    } => {
-                        let block = working_set.get_block_mut(*block_id);
+            if let Some(
+                Expression {
+                    expr: Expr::Block(block_id),
+                    ..
+                }
+                | Expression {
+                    expr: Expr::RowCondition(block_id),
+                    ..
+                },
+            ) = call.positional_nth(2)
+            {
+                {
+                    let block = working_set.get_block_mut(*block_id);
 
-                        block.signature = Box::new(sig);
-                    }
-                    _ => {}
+                    block.signature = Box::new(sig);
                 }
             }
 

From d34a24db333126f11db81ef6f58fcffe1cd07785 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Thu, 1 Aug 2024 02:10:52 -0700
Subject: [PATCH 0293/1072] setting content type metadata on all core `to *`
 commands (#13506)

# Description

All core `to *` set content type pipeline metadata.

# User-Facing Changes
- For consistency, `from json` no longer sets the content type metadata

# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib
---
 crates/nu-cmd-lang/src/example_support.rs     |  2 +-
 crates/nu-command/src/formats/from/json.rs    | 18 ++-----
 crates/nu-command/src/formats/to/csv.rs       | 51 ++++++++++++++++++-
 crates/nu-command/src/formats/to/delimited.rs | 32 +++++++++---
 crates/nu-command/src/formats/to/json.rs      | 36 ++++++++++++-
 crates/nu-command/src/formats/to/md.rs        | 45 +++++++++++++++-
 crates/nu-command/src/formats/to/msgpack.rs   | 43 +++++++++++++++-
 crates/nu-command/src/formats/to/nuon.rs      | 47 +++++++++++++++--
 crates/nu-command/src/formats/to/text.rs      | 38 +++++++++++++-
 crates/nu-command/src/formats/to/tsv.rs       | 51 ++++++++++++++++++-
 crates/nu-command/src/formats/to/xml.rs       | 40 ++++++++++++++-
 crates/nu-command/src/formats/to/yaml.rs      | 45 +++++++++++++++-
 12 files changed, 411 insertions(+), 37 deletions(-)

diff --git a/crates/nu-cmd-lang/src/example_support.rs b/crates/nu-cmd-lang/src/example_support.rs
index 72ea36972f..70ee7a9b0f 100644
--- a/crates/nu-cmd-lang/src/example_support.rs
+++ b/crates/nu-cmd-lang/src/example_support.rs
@@ -72,7 +72,7 @@ pub fn check_example_input_and_output_types_match_command_signature(
     witnessed_type_transformations
 }
 
-fn eval_pipeline_without_terminal_expression(
+pub fn eval_pipeline_without_terminal_expression(
     src: &str,
     cwd: &std::path::Path,
     engine_state: &mut Box<EngineState>,
diff --git a/crates/nu-command/src/formats/from/json.rs b/crates/nu-command/src/formats/from/json.rs
index 6252afff4c..6d46df78a3 100644
--- a/crates/nu-command/src/formats/from/json.rs
+++ b/crates/nu-command/src/formats/from/json.rs
@@ -1,7 +1,7 @@
 use std::io::{BufRead, Cursor};
 
 use nu_engine::command_prelude::*;
-use nu_protocol::{ListStream, PipelineMetadata, Signals};
+use nu_protocol::{ListStream, Signals};
 
 #[derive(Clone)]
 pub struct FromJson;
@@ -83,7 +83,7 @@ impl Command for FromJson {
                             strict,
                             engine_state.signals().clone(),
                         ),
-                        update_metadata(metadata),
+                        metadata,
                     ))
                 }
                 PipelineData::ByteStream(stream, metadata)
@@ -92,7 +92,7 @@ impl Command for FromJson {
                     if let Some(reader) = stream.reader() {
                         Ok(PipelineData::ListStream(
                             read_json_lines(reader, span, strict, Signals::empty()),
-                            update_metadata(metadata),
+                            metadata,
                         ))
                     } else {
                         Ok(PipelineData::Empty)
@@ -115,10 +115,10 @@ impl Command for FromJson {
 
             if strict {
                 Ok(convert_string_to_value_strict(&string_input, span)?
-                    .into_pipeline_data_with_metadata(update_metadata(metadata)))
+                    .into_pipeline_data_with_metadata(metadata))
             } else {
                 Ok(convert_string_to_value(&string_input, span)?
-                    .into_pipeline_data_with_metadata(update_metadata(metadata)))
+                    .into_pipeline_data_with_metadata(metadata))
             }
         }
     }
@@ -265,14 +265,6 @@ fn convert_string_to_value_strict(string_input: &str, span: Span) -> Result<Valu
     }
 }
 
-fn update_metadata(metadata: Option<PipelineMetadata>) -> Option<PipelineMetadata> {
-    metadata
-        .map(|md| md.with_content_type(Some("application/json".into())))
-        .or_else(|| {
-            Some(PipelineMetadata::default().with_content_type(Some("application/json".into())))
-        })
-}
-
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/crates/nu-command/src/formats/to/csv.rs b/crates/nu-command/src/formats/to/csv.rs
index e7786e60cc..c5847abd6a 100644
--- a/crates/nu-command/src/formats/to/csv.rs
+++ b/crates/nu-command/src/formats/to/csv.rs
@@ -4,6 +4,8 @@ use crate::formats::to::delimited::to_delimited_data;
 use nu_engine::command_prelude::*;
 use nu_protocol::Config;
 
+use super::delimited::ToDelimitedDataArgs;
+
 #[derive(Clone)]
 pub struct ToCsv;
 
@@ -116,17 +118,62 @@ fn to_csv(
         },
     };
 
-    to_delimited_data(noheaders, sep, columns, "CSV", input, head, config)
+    to_delimited_data(
+        ToDelimitedDataArgs {
+            noheaders,
+            separator: sep,
+            columns,
+            format_name: "CSV",
+            input,
+            head,
+            content_type: Some(mime::TEXT_CSV.to_string()),
+        },
+        config,
+    )
 }
 
 #[cfg(test)]
 mod test {
+
+    use nu_cmd_lang::eval_pipeline_without_terminal_expression;
+
+    use crate::Metadata;
+
     use super::*;
 
     #[test]
     fn test_examples() {
         use crate::test_examples;
-
         test_examples(ToCsv {})
     }
+
+    #[test]
+    fn test_content_type_metadata() {
+        let mut engine_state = Box::new(EngineState::new());
+        let delta = {
+            // Base functions that are needed for testing
+            // Try to keep this working set small to keep tests running as fast as possible
+            let mut working_set = StateWorkingSet::new(&engine_state);
+
+            working_set.add_decl(Box::new(ToCsv {}));
+            working_set.add_decl(Box::new(Metadata {}));
+
+            working_set.render()
+        };
+
+        engine_state
+            .merge_delta(delta)
+            .expect("Error merging delta");
+
+        let cmd = "{a: 1 b: 2} | to csv  | metadata | get content_type";
+        let result = eval_pipeline_without_terminal_expression(
+            cmd,
+            std::env::temp_dir().as_ref(),
+            &mut engine_state,
+        );
+        assert_eq!(
+            Value::test_record(record!("content_type" => Value::test_string("text/csv"))),
+            result.expect("There should be a result")
+        );
+    }
 }
diff --git a/crates/nu-command/src/formats/to/delimited.rs b/crates/nu-command/src/formats/to/delimited.rs
index 34bb06b8a2..ac04739a3d 100644
--- a/crates/nu-command/src/formats/to/delimited.rs
+++ b/crates/nu-command/src/formats/to/delimited.rs
@@ -69,18 +69,36 @@ fn make_cant_convert_error(value: &Value, format_name: &'static str) -> ShellErr
     }
 }
 
+pub struct ToDelimitedDataArgs {
+    pub noheaders: bool,
+    pub separator: Spanned<char>,
+    pub columns: Option<Vec<String>>,
+    pub format_name: &'static str,
+    pub input: PipelineData,
+    pub head: Span,
+    pub content_type: Option<String>,
+}
+
 pub fn to_delimited_data(
-    noheaders: bool,
-    separator: Spanned<char>,
-    columns: Option<Vec<String>>,
-    format_name: &'static str,
-    input: PipelineData,
-    head: Span,
+    ToDelimitedDataArgs {
+        noheaders,
+        separator,
+        columns,
+        format_name,
+        input,
+        head,
+        content_type,
+    }: ToDelimitedDataArgs,
     config: Arc<Config>,
 ) -> Result<PipelineData, ShellError> {
     let mut input = input;
     let span = input.span().unwrap_or(head);
-    let metadata = input.metadata();
+    let metadata = Some(
+        input
+            .metadata()
+            .unwrap_or_default()
+            .with_content_type(content_type),
+    );
 
     let separator = u8::try_from(separator.item).map_err(|_| ShellError::IncorrectValue {
         msg: "separator must be an ASCII character".into(),
diff --git a/crates/nu-command/src/formats/to/json.rs b/crates/nu-command/src/formats/to/json.rs
index 5722387e2c..729fe2293f 100644
--- a/crates/nu-command/src/formats/to/json.rs
+++ b/crates/nu-command/src/formats/to/json.rs
@@ -64,7 +64,7 @@ impl Command for ToJson {
                 let res = Value::string(serde_json_string, span);
                 let metadata = PipelineMetadata {
                     data_source: nu_protocol::DataSource::None,
-                    content_type: Some("application/json".to_string()),
+                    content_type: Some(mime::APPLICATION_JSON.to_string()),
                 };
                 Ok(PipelineData::Value(res, Some(metadata)))
             }
@@ -159,6 +159,10 @@ fn json_list(input: &[Value]) -> Result<Vec<nu_json::Value>, ShellError> {
 
 #[cfg(test)]
 mod test {
+    use nu_cmd_lang::eval_pipeline_without_terminal_expression;
+
+    use crate::Metadata;
+
     use super::*;
 
     #[test]
@@ -167,4 +171,34 @@ mod test {
 
         test_examples(ToJson {})
     }
+
+    #[test]
+    fn test_content_type_metadata() {
+        let mut engine_state = Box::new(EngineState::new());
+        let delta = {
+            // Base functions that are needed for testing
+            // Try to keep this working set small to keep tests running as fast as possible
+            let mut working_set = StateWorkingSet::new(&engine_state);
+
+            working_set.add_decl(Box::new(ToJson {}));
+            working_set.add_decl(Box::new(Metadata {}));
+
+            working_set.render()
+        };
+
+        engine_state
+            .merge_delta(delta)
+            .expect("Error merging delta");
+
+        let cmd = "{a: 1 b: 2} | to json  | metadata | get content_type";
+        let result = eval_pipeline_without_terminal_expression(
+            cmd,
+            std::env::temp_dir().as_ref(),
+            &mut engine_state,
+        );
+        assert_eq!(
+            Value::test_record(record!("content_type" => Value::test_string("application/json"))),
+            result.expect("There should be a result")
+        );
+    }
 }
diff --git a/crates/nu-command/src/formats/to/md.rs b/crates/nu-command/src/formats/to/md.rs
index 737a328cd3..7f86c5eb06 100644
--- a/crates/nu-command/src/formats/to/md.rs
+++ b/crates/nu-command/src/formats/to/md.rs
@@ -82,6 +82,12 @@ fn to_md(
     config: &Config,
     head: Span,
 ) -> Result<PipelineData, ShellError> {
+    // text/markdown became a valid mimetype with rfc7763
+    let metadata = input
+        .metadata()
+        .unwrap_or_default()
+        .with_content_type(Some("text/markdown".into()));
+
     let (grouped_input, single_list) = group_by(input, head, config);
     if per_element || single_list {
         return Ok(Value::string(
@@ -95,9 +101,10 @@ fn to_md(
                 .join(""),
             head,
         )
-        .into_pipeline_data());
+        .into_pipeline_data_with_metadata(Some(metadata)));
     }
-    Ok(Value::string(table(grouped_input, pretty, config), head).into_pipeline_data())
+    Ok(Value::string(table(grouped_input, pretty, config), head)
+        .into_pipeline_data_with_metadata(Some(metadata)))
 }
 
 fn fragment(input: Value, pretty: bool, config: &Config) -> String {
@@ -328,7 +335,10 @@ fn get_padded_string(text: String, desired_length: usize, padding_character: cha
 
 #[cfg(test)]
 mod tests {
+    use crate::Metadata;
+
     use super::*;
+    use nu_cmd_lang::eval_pipeline_without_terminal_expression;
     use nu_protocol::{record, Config, IntoPipelineData, Value};
 
     fn one(string: &str) -> String {
@@ -453,4 +463,35 @@ mod tests {
         "#)
         );
     }
+
+    #[test]
+    fn test_content_type_metadata() {
+        let mut engine_state = Box::new(EngineState::new());
+        let state_delta = {
+            // Base functions that are needed for testing
+            // Try to keep this working set small to keep tests running as fast as possible
+            let mut working_set = StateWorkingSet::new(&engine_state);
+
+            working_set.add_decl(Box::new(ToMd {}));
+            working_set.add_decl(Box::new(Metadata {}));
+
+            working_set.render()
+        };
+        let delta = state_delta;
+
+        engine_state
+            .merge_delta(delta)
+            .expect("Error merging delta");
+
+        let cmd = "{a: 1 b: 2} | to md  | metadata | get content_type";
+        let result = eval_pipeline_without_terminal_expression(
+            cmd,
+            std::env::temp_dir().as_ref(),
+            &mut engine_state,
+        );
+        assert_eq!(
+            Value::test_record(record!("content_type" => Value::test_string("text/markdown"))),
+            result.expect("There should be a result")
+        );
+    }
 }
diff --git a/crates/nu-command/src/formats/to/msgpack.rs b/crates/nu-command/src/formats/to/msgpack.rs
index 02515e26fe..049b4de86d 100644
--- a/crates/nu-command/src/formats/to/msgpack.rs
+++ b/crates/nu-command/src/formats/to/msgpack.rs
@@ -74,13 +74,18 @@ MessagePack: https://msgpack.org/
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
+        let metadata = input
+            .metadata()
+            .unwrap_or_default()
+            .with_content_type(Some("application/x-msgpack".into()));
+
         let value_span = input.span().unwrap_or(call.head);
         let value = input.into_value(value_span)?;
         let mut out = vec![];
 
         write_value(&mut out, &value, 0)?;
 
-        Ok(Value::binary(out, call.head).into_pipeline_data())
+        Ok(Value::binary(out, call.head).into_pipeline_data_with_metadata(Some(metadata)))
     }
 }
 
@@ -268,6 +273,10 @@ where
 
 #[cfg(test)]
 mod test {
+    use nu_cmd_lang::eval_pipeline_without_terminal_expression;
+
+    use crate::Metadata;
+
     use super::*;
 
     #[test]
@@ -276,4 +285,36 @@ mod test {
 
         test_examples(ToMsgpack {})
     }
+
+    #[test]
+    fn test_content_type_metadata() {
+        let mut engine_state = Box::new(EngineState::new());
+        let delta = {
+            // Base functions that are needed for testing
+            // Try to keep this working set small to keep tests running as fast as possible
+            let mut working_set = StateWorkingSet::new(&engine_state);
+
+            working_set.add_decl(Box::new(ToMsgpack {}));
+            working_set.add_decl(Box::new(Metadata {}));
+
+            working_set.render()
+        };
+
+        engine_state
+            .merge_delta(delta)
+            .expect("Error merging delta");
+
+        let cmd = "{a: 1 b: 2} | to msgpack | metadata | get content_type";
+        let result = eval_pipeline_without_terminal_expression(
+            cmd,
+            std::env::temp_dir().as_ref(),
+            &mut engine_state,
+        );
+        assert_eq!(
+            Value::test_record(
+                record!("content_type" => Value::test_string("application/x-msgpack"))
+            ),
+            result.expect("There should be a result")
+        );
+    }
 }
diff --git a/crates/nu-command/src/formats/to/nuon.rs b/crates/nu-command/src/formats/to/nuon.rs
index f40b7b5c1d..809ddc01ad 100644
--- a/crates/nu-command/src/formats/to/nuon.rs
+++ b/crates/nu-command/src/formats/to/nuon.rs
@@ -42,6 +42,11 @@ impl Command for ToNuon {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
+        let metadata = input
+            .metadata()
+            .unwrap_or_default()
+            .with_content_type(Some("application/x-nuon".into()));
+
         let style = if call.has_flag(engine_state, stack, "raw")? {
             nuon::ToStyle::Raw
         } else if let Some(t) = call.get_flag(engine_state, stack, "tabs")? {
@@ -56,9 +61,8 @@ impl Command for ToNuon {
         let value = input.into_value(span)?;
 
         match nuon::to_nuon(&value, style, Some(span)) {
-            Ok(serde_nuon_string) => {
-                Ok(Value::string(serde_nuon_string, span).into_pipeline_data())
-            }
+            Ok(serde_nuon_string) => Ok(Value::string(serde_nuon_string, span)
+                .into_pipeline_data_with_metadata(Some(metadata))),
             _ => Ok(Value::error(
                 ShellError::CantConvert {
                     to_type: "NUON".into(),
@@ -68,7 +72,7 @@ impl Command for ToNuon {
                 },
                 span,
             )
-            .into_pipeline_data()),
+            .into_pipeline_data_with_metadata(Some(metadata))),
         }
     }
 
@@ -100,10 +104,45 @@ impl Command for ToNuon {
 
 #[cfg(test)]
 mod test {
+    use super::*;
+    use nu_cmd_lang::eval_pipeline_without_terminal_expression;
+
+    use crate::Metadata;
+
     #[test]
     fn test_examples() {
         use super::ToNuon;
         use crate::test_examples;
         test_examples(ToNuon {})
     }
+
+    #[test]
+    fn test_content_type_metadata() {
+        let mut engine_state = Box::new(EngineState::new());
+        let delta = {
+            // Base functions that are needed for testing
+            // Try to keep this working set small to keep tests running as fast as possible
+            let mut working_set = StateWorkingSet::new(&engine_state);
+
+            working_set.add_decl(Box::new(ToNuon {}));
+            working_set.add_decl(Box::new(Metadata {}));
+
+            working_set.render()
+        };
+
+        engine_state
+            .merge_delta(delta)
+            .expect("Error merging delta");
+
+        let cmd = "{a: 1 b: 2} | to nuon | metadata | get content_type";
+        let result = eval_pipeline_without_terminal_expression(
+            cmd,
+            std::env::temp_dir().as_ref(),
+            &mut engine_state,
+        );
+        assert_eq!(
+            Value::test_record(record!("content_type" => Value::test_string("application/x-nuon"))),
+            result.expect("There should be a result")
+        );
+    }
 }
diff --git a/crates/nu-command/src/formats/to/text.rs b/crates/nu-command/src/formats/to/text.rs
index 33ca19f8f2..111c42cdff 100644
--- a/crates/nu-command/src/formats/to/text.rs
+++ b/crates/nu-command/src/formats/to/text.rs
@@ -134,14 +134,18 @@ fn local_into_string(value: Value, separator: &str, config: &Config) -> String {
 
 fn update_metadata(metadata: Option<PipelineMetadata>) -> Option<PipelineMetadata> {
     metadata
-        .map(|md| md.with_content_type(Some("text/plain".to_string())))
+        .map(|md| md.with_content_type(Some(mime::TEXT_PLAIN.to_string())))
         .or_else(|| {
-            Some(PipelineMetadata::default().with_content_type(Some("text/plain".to_string())))
+            Some(PipelineMetadata::default().with_content_type(Some(mime::TEXT_PLAIN.to_string())))
         })
 }
 
 #[cfg(test)]
 mod test {
+    use nu_cmd_lang::eval_pipeline_without_terminal_expression;
+
+    use crate::Metadata;
+
     use super::*;
 
     #[test]
@@ -150,4 +154,34 @@ mod test {
 
         test_examples(ToText {})
     }
+
+    #[test]
+    fn test_content_type_metadata() {
+        let mut engine_state = Box::new(EngineState::new());
+        let delta = {
+            // Base functions that are needed for testing
+            // Try to keep this working set small to keep tests running as fast as possible
+            let mut working_set = StateWorkingSet::new(&engine_state);
+
+            working_set.add_decl(Box::new(ToText {}));
+            working_set.add_decl(Box::new(Metadata {}));
+
+            working_set.render()
+        };
+
+        engine_state
+            .merge_delta(delta)
+            .expect("Error merging delta");
+
+        let cmd = "{a: 1 b: 2} | to text  | metadata | get content_type";
+        let result = eval_pipeline_without_terminal_expression(
+            cmd,
+            std::env::temp_dir().as_ref(),
+            &mut engine_state,
+        );
+        assert_eq!(
+            Value::test_record(record!("content_type" => Value::test_string("text/plain"))),
+            result.expect("There should be a result")
+        );
+    }
 }
diff --git a/crates/nu-command/src/formats/to/tsv.rs b/crates/nu-command/src/formats/to/tsv.rs
index edc9592409..63f72f4584 100644
--- a/crates/nu-command/src/formats/to/tsv.rs
+++ b/crates/nu-command/src/formats/to/tsv.rs
@@ -4,6 +4,8 @@ use crate::formats::to::delimited::to_delimited_data;
 use nu_engine::command_prelude::*;
 use nu_protocol::Config;
 
+use super::delimited::ToDelimitedDataArgs;
+
 #[derive(Clone)]
 pub struct ToTsv;
 
@@ -82,11 +84,26 @@ fn to_tsv(
         item: '\t',
         span: head,
     };
-    to_delimited_data(noheaders, sep, columns, "TSV", input, head, config)
+    to_delimited_data(
+        ToDelimitedDataArgs {
+            noheaders,
+            separator: sep,
+            columns,
+            format_name: "TSV",
+            input,
+            head,
+            content_type: Some(mime::TEXT_TAB_SEPARATED_VALUES.to_string()),
+        },
+        config,
+    )
 }
 
 #[cfg(test)]
 mod test {
+    use nu_cmd_lang::eval_pipeline_without_terminal_expression;
+
+    use crate::Metadata;
+
     use super::*;
 
     #[test]
@@ -95,4 +112,36 @@ mod test {
 
         test_examples(ToTsv {})
     }
+
+    #[test]
+    fn test_content_type_metadata() {
+        let mut engine_state = Box::new(EngineState::new());
+        let delta = {
+            // Base functions that are needed for testing
+            // Try to keep this working set small to keep tests running as fast as possible
+            let mut working_set = StateWorkingSet::new(&engine_state);
+
+            working_set.add_decl(Box::new(ToTsv {}));
+            working_set.add_decl(Box::new(Metadata {}));
+
+            working_set.render()
+        };
+
+        engine_state
+            .merge_delta(delta)
+            .expect("Error merging delta");
+
+        let cmd = "{a: 1 b: 2} | to tsv | metadata | get content_type";
+        let result = eval_pipeline_without_terminal_expression(
+            cmd,
+            std::env::temp_dir().as_ref(),
+            &mut engine_state,
+        );
+        assert_eq!(
+            Value::test_record(
+                record!("content_type" => Value::test_string("text/tab-separated-values"))
+            ),
+            result.expect("There should be a result")
+        );
+    }
 }
diff --git a/crates/nu-command/src/formats/to/xml.rs b/crates/nu-command/src/formats/to/xml.rs
index 648094318b..1285c558ee 100644
--- a/crates/nu-command/src/formats/to/xml.rs
+++ b/crates/nu-command/src/formats/to/xml.rs
@@ -132,6 +132,10 @@ impl Job {
     }
 
     fn run(mut self, input: PipelineData, head: Span) -> Result<PipelineData, ShellError> {
+        let metadata = input
+            .metadata()
+            .unwrap_or_default()
+            .with_content_type(Some("application/xml".into()));
         let value = input.into_value(head)?;
 
         self.write_xml_entry(value, true).and_then(|_| {
@@ -141,7 +145,7 @@ impl Job {
             } else {
                 return Err(ShellError::NonUtf8 { span: head });
             };
-            Ok(Value::string(s, head).into_pipeline_data())
+            Ok(Value::string(s, head).into_pipeline_data_with_metadata(Some(metadata)))
         })
     }
 
@@ -508,6 +512,10 @@ impl Job {
 
 #[cfg(test)]
 mod test {
+    use nu_cmd_lang::eval_pipeline_without_terminal_expression;
+
+    use crate::Metadata;
+
     use super::*;
 
     #[test]
@@ -516,4 +524,34 @@ mod test {
 
         test_examples(ToXml {})
     }
+
+    #[test]
+    fn test_content_type_metadata() {
+        let mut engine_state = Box::new(EngineState::new());
+        let delta = {
+            // Base functions that are needed for testing
+            // Try to keep this working set small to keep tests running as fast as possible
+            let mut working_set = StateWorkingSet::new(&engine_state);
+
+            working_set.add_decl(Box::new(ToXml {}));
+            working_set.add_decl(Box::new(Metadata {}));
+
+            working_set.render()
+        };
+
+        engine_state
+            .merge_delta(delta)
+            .expect("Error merging delta");
+
+        let cmd = "{tag: note attributes: {} content : [{tag: remember attributes: {} content : [{tag: null attributes: null content : Event}]}]} | to xml | metadata | get content_type";
+        let result = eval_pipeline_without_terminal_expression(
+            cmd,
+            std::env::temp_dir().as_ref(),
+            &mut engine_state,
+        );
+        assert_eq!(
+            Value::test_record(record!("content_type" => Value::test_string("application/xml"))),
+            result.expect("There should be a result")
+        );
+    }
 }
diff --git a/crates/nu-command/src/formats/to/yaml.rs b/crates/nu-command/src/formats/to/yaml.rs
index bea2dd3381..c1693cda7d 100644
--- a/crates/nu-command/src/formats/to/yaml.rs
+++ b/crates/nu-command/src/formats/to/yaml.rs
@@ -95,11 +95,18 @@ pub fn value_to_yaml_value(v: &Value) -> Result<serde_yaml::Value, ShellError> {
 }
 
 fn to_yaml(input: PipelineData, head: Span) -> Result<PipelineData, ShellError> {
+    let metadata = input
+        .metadata()
+        .unwrap_or_default()
+        .with_content_type(Some("application/yaml".into()));
     let value = input.into_value(head)?;
 
     let yaml_value = value_to_yaml_value(&value)?;
     match serde_yaml::to_string(&yaml_value) {
-        Ok(serde_yaml_string) => Ok(Value::string(serde_yaml_string, head).into_pipeline_data()),
+        Ok(serde_yaml_string) => {
+            Ok(Value::string(serde_yaml_string, head)
+                .into_pipeline_data_with_metadata(Some(metadata)))
+        }
         _ => Ok(Value::error(
             ShellError::CantConvert {
                 to_type: "YAML".into(),
@@ -109,12 +116,16 @@ fn to_yaml(input: PipelineData, head: Span) -> Result<PipelineData, ShellError>
             },
             head,
         )
-        .into_pipeline_data()),
+        .into_pipeline_data_with_metadata(Some(metadata))),
     }
 }
 
 #[cfg(test)]
 mod test {
+    use nu_cmd_lang::eval_pipeline_without_terminal_expression;
+
+    use crate::Metadata;
+
     use super::*;
 
     #[test]
@@ -123,4 +134,34 @@ mod test {
 
         test_examples(ToYaml {})
     }
+
+    #[test]
+    fn test_content_type_metadata() {
+        let mut engine_state = Box::new(EngineState::new());
+        let delta = {
+            // Base functions that are needed for testing
+            // Try to keep this working set small to keep tests running as fast as possible
+            let mut working_set = StateWorkingSet::new(&engine_state);
+
+            working_set.add_decl(Box::new(ToYaml {}));
+            working_set.add_decl(Box::new(Metadata {}));
+
+            working_set.render()
+        };
+
+        engine_state
+            .merge_delta(delta)
+            .expect("Error merging delta");
+
+        let cmd = "{a: 1 b: 2} | to yaml  | metadata | get content_type";
+        let result = eval_pipeline_without_terminal_expression(
+            cmd,
+            std::env::temp_dir().as_ref(),
+            &mut engine_state,
+        );
+        assert_eq!(
+            Value::test_record(record!("content_type" => Value::test_string("application/yaml"))),
+            result.expect("There should be a result")
+        );
+    }
 }

From 4157ca711da6d125d21826cc463f8ad73102cd25 Mon Sep 17 00:00:00 2001
From: Piotr Kufel <qfel@users.noreply.github.com>
Date: Thu, 1 Aug 2024 02:17:58 -0700
Subject: [PATCH 0294/1072] Factor out style-setting code (#13406)

# Description
This is mainly cleanup, but introduces a slight (positive, if anything)
behavior change:

Some menu layouts support only a subset of styles, but with this change
the user will still be able to configure them. This seems strictly
better - if reedline starts supporting one of the existing styles for a
particular layout, there won't be any need to update nushell code.


# User-Facing Changes
None

# Tests + Formatting
This is simply factoring out existing code, old tests should still cover
it.

---------

Co-authored-by: sholderbach <sholderbach@users.noreply.github.com>
---
 crates/nu-cli/src/reedline_config.rs | 87 +++++++++-------------------
 1 file changed, 27 insertions(+), 60 deletions(-)

diff --git a/crates/nu-cli/src/reedline_config.rs b/crates/nu-cli/src/reedline_config.rs
index d5d3272bc1..63d88316df 100644
--- a/crates/nu-cli/src/reedline_config.rs
+++ b/crates/nu-cli/src/reedline_config.rs
@@ -193,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,
@@ -231,24 +254,7 @@ pub(crate) fn add_columnar_menu(
         };
     }
 
-    let span = menu.style.span();
-    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);
-        }
-    }
+    columnar_menu = set_menu_style(columnar_menu, &menu.style);
 
     let marker = menu.marker.to_expanded_string("", config);
     columnar_menu = columnar_menu.with_marker(&marker);
@@ -304,18 +310,7 @@ pub(crate) fn add_list_menu(
         };
     }
 
-    let span = menu.style.span();
-    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);
-        }
-    }
+    list_menu = set_menu_style(list_menu, &menu.style);
 
     let marker = menu.marker.to_expanded_string("", &config);
     list_menu = list_menu.with_marker(&marker);
@@ -496,24 +491,7 @@ pub(crate) fn add_ide_menu(
         };
     }
 
-    let span = menu.style.span();
-    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);
-        }
-    }
+    ide_menu = set_menu_style(ide_menu, &menu.style);
 
     let marker = menu.marker.to_expanded_string("", &config);
     ide_menu = ide_menu.with_marker(&marker);
@@ -601,18 +579,7 @@ pub(crate) fn add_description_menu(
         };
     }
 
-    let span = menu.style.span();
-    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);
-        }
-    }
+    description_menu = set_menu_style(description_menu, &menu.style);
 
     let marker = menu.marker.to_expanded_string("", &config);
     description_menu = description_menu.with_marker(&marker);

From 168835ecd2a44362b47b6165ec4bc843fe57fddc Mon Sep 17 00:00:00 2001
From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Thu, 1 Aug 2024 15:21:39 -0400
Subject: [PATCH 0295/1072] `random chars` doc clarifications (#13511)

# Description

Clarified `random chars` help/doc:

* Default string length in absence of a `--length` arg is 25
* Characters are *"uniformly distributed over ASCII letters and numbers:
a-z, A-Z and 0-9"* (copied from the [`rand` crate
doc](https://docs.rs/rand/latest/rand/distributions/struct.Alphanumeric.html).

# User-Facing Changes

Help/Doc only
---
 crates/nu-command/src/random/chars.rs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/crates/nu-command/src/random/chars.rs b/crates/nu-command/src/random/chars.rs
index fe1e6bcdc4..aea27129b9 100644
--- a/crates/nu-command/src/random/chars.rs
+++ b/crates/nu-command/src/random/chars.rs
@@ -19,12 +19,17 @@ impl Command for SubCommand {
         Signature::build("random chars")
             .input_output_types(vec![(Type::Nothing, Type::String)])
             .allow_variants_without_examples(true)
-            .named("length", SyntaxShape::Int, "Number of chars", Some('l'))
+            .named(
+                "length",
+                SyntaxShape::Int,
+                "Number of chars (default 25)",
+                Some('l'),
+            )
             .category(Category::Random)
     }
 
     fn usage(&self) -> &str {
-        "Generate random chars."
+        "Generate random chars uniformly distributed over ASCII letters and numbers: a-z, A-Z and 0-9."
     }
 
     fn search_terms(&self) -> Vec<&str> {
@@ -44,7 +49,7 @@ impl Command for SubCommand {
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
-                description: "Generate random chars",
+                description: "Generate a string with 25 random chars",
                 example: "random chars",
                 result: None,
             },

From ca8eb856e85b4a0e7a84dd6f835b6ef6737139c5 Mon Sep 17 00:00:00 2001
From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Thu, 1 Aug 2024 16:22:25 -0400
Subject: [PATCH 0296/1072] Doc and examples for multi-dot directory traversal
 (#13513)

# Description

With this PR, we should be able to close
https://github.com/nushell/nushell.github.io/issues/1225

Help/doc/examples updated for:

* `cd` to show multi-dot traversal
* `cd` to show implicit `cd` with bare directory path
* Fixed/clarified another example that mentioned `$OLDPATH` while I was
in there
* `mv` and `cp` examples for multi-dot traversal
* Updated `cp` examples to use more consistent (and clear) filenames

# User-Facing Changes

Help/doc only

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

N/A
---
 crates/nu-command/src/filesystem/cd.rs  | 12 +++++++++++-
 crates/nu-command/src/filesystem/ucp.rs | 11 ++++++++---
 crates/nu-command/src/filesystem/umv.rs |  5 +++++
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/crates/nu-command/src/filesystem/cd.rs b/crates/nu-command/src/filesystem/cd.rs
index ba91e6d0ca..87071d2888 100644
--- a/crates/nu-command/src/filesystem/cd.rs
+++ b/crates/nu-command/src/filesystem/cd.rs
@@ -134,7 +134,7 @@ impl Command for Cd {
                 result: None,
             },
             Example {
-                description: "Change to the previous working directory ($OLDPWD)",
+                description: r#"Change to the previous working directory (same as "cd $env.OLDPWD")"#,
                 example: r#"cd -"#,
                 result: None,
             },
@@ -143,6 +143,16 @@ impl Command for Cd {
                 example: r#"def --env gohome [] { cd ~ }"#,
                 result: None,
             },
+            Example {
+                description: "Move two directories up in the tree (the parent directory's parent). Additional dots can be added for additional levels.",
+                example: r#"cd ..."#,
+                result: None,
+            },
+            Example {
+                description: "The cd command itself is often optional. Simply entering a path to a directory will cd to it.",
+                example: r#"/home"#,
+                result: None,
+            },
         ]
     }
 }
diff --git a/crates/nu-command/src/filesystem/ucp.rs b/crates/nu-command/src/filesystem/ucp.rs
index 447751220d..6077278c18 100644
--- a/crates/nu-command/src/filesystem/ucp.rs
+++ b/crates/nu-command/src/filesystem/ucp.rs
@@ -86,17 +86,22 @@ impl Command for UCp {
             },
             Example {
                 description: "Copy only if source file is newer than target file",
-                example: "cp -u a b",
+                example: "cp -u myfile newfile",
                 result: None,
             },
             Example {
                 description: "Copy file preserving mode and timestamps attributes",
-                example: "cp --preserve [ mode timestamps ] a b",
+                example: "cp --preserve [ mode timestamps ] myfile newfile",
                 result: None,
             },
             Example {
                 description: "Copy file erasing all attributes",
-                example: "cp --preserve [] a b",
+                example: "cp --preserve [] myfile newfile",
+                result: None,
+            },
+            Example {
+                description: "Copy file to a directory three levels above its current location",
+                example: "cp myfile ....",
                 result: None,
             },
         ]
diff --git a/crates/nu-command/src/filesystem/umv.rs b/crates/nu-command/src/filesystem/umv.rs
index 12d95e015b..9f68a6697f 100644
--- a/crates/nu-command/src/filesystem/umv.rs
+++ b/crates/nu-command/src/filesystem/umv.rs
@@ -40,6 +40,11 @@ impl Command for UMv {
                 example: "mv *.txt my/subdirectory",
                 result: None,
             },
+            Example {
+                description: r#"Move a file into the "my" directory two levels up in the directory tree"#,
+                example: "mv test.txt .../my/",
+                result: None,
+            },
         ]
     }
 

From d081e3386f2f741f4ec88b107ee208f9a5b52b3f Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Fri, 2 Aug 2024 11:01:20 -0700
Subject: [PATCH 0297/1072] Make pipeline metadata available to plugins
 (#13495)

# Description
Fixes an issue with pipeline metadata not being passed to plugins.
---
 crates/nu-plugin-core/src/interface/mod.rs    | 28 ++++--
 crates/nu-plugin-core/src/interface/tests.rs  | 33 ++++++-
 .../nu-plugin-core/src/serializers/tests.rs   | 18 ++--
 .../nu-plugin-engine/src/interface/tests.rs   | 68 ++++++-------
 crates/nu-plugin-protocol/src/lib.rs          | 45 ++++++++-
 .../nu-plugin/src/plugin/interface/tests.rs   | 35 +++----
 crates/nu-protocol/src/pipeline/metadata.rs   |  6 +-
 .../nu_plugin_nu_example.nu                   |  8 +-
 .../nu_plugin_python_example.py               | 95 ++++++++++---------
 crates/nu_plugin_stress_internals/src/main.rs |  2 +-
 10 files changed, 208 insertions(+), 130 deletions(-)

diff --git a/crates/nu-plugin-core/src/interface/mod.rs b/crates/nu-plugin-core/src/interface/mod.rs
index 6ce33cae4c..de04bd6387 100644
--- a/crates/nu-plugin-core/src/interface/mod.rs
+++ b/crates/nu-plugin-core/src/interface/mod.rs
@@ -177,16 +177,19 @@ pub trait InterfaceManager {
     ) -> Result<PipelineData, ShellError> {
         self.prepare_pipeline_data(match header {
             PipelineDataHeader::Empty => PipelineData::Empty,
-            PipelineDataHeader::Value(value) => PipelineData::Value(value, None),
+            PipelineDataHeader::Value(value, metadata) => PipelineData::Value(value, metadata),
             PipelineDataHeader::ListStream(info) => {
                 let handle = self.stream_manager().get_handle();
                 let reader = handle.read_stream(info.id, self.get_interface())?;
-                ListStream::new(reader, info.span, signals.clone()).into()
+                let ls = ListStream::new(reader, info.span, signals.clone());
+                PipelineData::ListStream(ls, info.metadata)
             }
             PipelineDataHeader::ByteStream(info) => {
                 let handle = self.stream_manager().get_handle();
                 let reader = handle.read_stream(info.id, self.get_interface())?;
-                ByteStream::from_result_iter(reader, info.span, signals.clone(), info.type_).into()
+                let bs =
+                    ByteStream::from_result_iter(reader, info.span, signals.clone(), info.type_);
+                PipelineData::ByteStream(bs, info.metadata)
             }
         })
     }
@@ -248,26 +251,33 @@ pub trait Interface: Clone + Send {
             Ok::<_, ShellError>((id, writer))
         };
         match self.prepare_pipeline_data(data, context)? {
-            PipelineData::Value(value, ..) => {
-                Ok((PipelineDataHeader::Value(value), PipelineDataWriter::None))
-            }
+            PipelineData::Value(value, metadata) => Ok((
+                PipelineDataHeader::Value(value, metadata),
+                PipelineDataWriter::None,
+            )),
             PipelineData::Empty => Ok((PipelineDataHeader::Empty, PipelineDataWriter::None)),
-            PipelineData::ListStream(stream, ..) => {
+            PipelineData::ListStream(stream, metadata) => {
                 let (id, writer) = new_stream(LIST_STREAM_HIGH_PRESSURE)?;
                 Ok((
                     PipelineDataHeader::ListStream(ListStreamInfo {
                         id,
                         span: stream.span(),
+                        metadata,
                     }),
                     PipelineDataWriter::ListStream(writer, stream),
                 ))
             }
-            PipelineData::ByteStream(stream, ..) => {
+            PipelineData::ByteStream(stream, metadata) => {
                 let span = stream.span();
                 let type_ = stream.type_();
                 if let Some(reader) = stream.reader() {
                     let (id, writer) = new_stream(RAW_STREAM_HIGH_PRESSURE)?;
-                    let header = PipelineDataHeader::ByteStream(ByteStreamInfo { id, span, type_ });
+                    let header = PipelineDataHeader::ByteStream(ByteStreamInfo {
+                        id,
+                        span,
+                        type_,
+                        metadata,
+                    });
                     Ok((header, PipelineDataWriter::ByteStream(writer, reader)))
                 } else {
                     Ok((PipelineDataHeader::Empty, PipelineDataWriter::None))
diff --git a/crates/nu-plugin-core/src/interface/tests.rs b/crates/nu-plugin-core/src/interface/tests.rs
index cb28692706..6b4ad85d7f 100644
--- a/crates/nu-plugin-core/src/interface/tests.rs
+++ b/crates/nu-plugin-core/src/interface/tests.rs
@@ -137,10 +137,16 @@ fn read_pipeline_data_empty() -> Result<(), ShellError> {
 fn read_pipeline_data_value() -> Result<(), ShellError> {
     let manager = TestInterfaceManager::new(&TestCase::new());
     let value = Value::test_int(4);
-    let header = PipelineDataHeader::Value(value.clone());
-
+    let metadata = Some(PipelineMetadata {
+        data_source: DataSource::FilePath("/test/path".into()),
+        content_type: None,
+    });
+    let header = PipelineDataHeader::Value(value.clone(), metadata.clone());
     match manager.read_pipeline_data(header, &Signals::empty())? {
-        PipelineData::Value(read_value, ..) => assert_eq!(value, read_value),
+        PipelineData::Value(read_value, read_metadata) => {
+            assert_eq!(value, read_value);
+            assert_eq!(metadata, read_metadata);
+        }
         PipelineData::ListStream(..) => panic!("unexpected ListStream"),
         PipelineData::ByteStream(..) => panic!("unexpected ByteStream"),
         PipelineData::Empty => panic!("unexpected Empty"),
@@ -161,9 +167,15 @@ fn read_pipeline_data_list_stream() -> Result<(), ShellError> {
     }
     test.add(StreamMessage::End(7));
 
+    let metadata = Some(PipelineMetadata {
+        data_source: DataSource::None,
+        content_type: Some("foobar".into()),
+    });
+
     let header = PipelineDataHeader::ListStream(ListStreamInfo {
         id: 7,
         span: Span::test_data(),
+        metadata,
     });
 
     let pipe = manager.read_pipeline_data(header, &Signals::empty())?;
@@ -204,10 +216,17 @@ fn read_pipeline_data_byte_stream() -> Result<(), ShellError> {
     test.add(StreamMessage::End(12));
 
     let test_span = Span::new(10, 13);
+
+    let metadata = Some(PipelineMetadata {
+        data_source: DataSource::None,
+        content_type: Some("foobar".into()),
+    });
+
     let header = PipelineDataHeader::ByteStream(ByteStreamInfo {
         id: 12,
         span: test_span,
         type_: ByteStreamType::Unknown,
+        metadata,
     });
 
     let pipe = manager.read_pipeline_data(header, &Signals::empty())?;
@@ -251,9 +270,15 @@ fn read_pipeline_data_byte_stream() -> Result<(), ShellError> {
 #[test]
 fn read_pipeline_data_prepared_properly() -> Result<(), ShellError> {
     let manager = TestInterfaceManager::new(&TestCase::new());
+    let metadata = Some(PipelineMetadata {
+        data_source: DataSource::None,
+        content_type: Some("foobar".into()),
+    });
+
     let header = PipelineDataHeader::ListStream(ListStreamInfo {
         id: 0,
         span: Span::test_data(),
+        metadata,
     });
     match manager.read_pipeline_data(header, &Signals::empty())? {
         PipelineData::ListStream(_, meta) => match meta {
@@ -301,7 +326,7 @@ fn write_pipeline_data_value() -> Result<(), ShellError> {
         interface.init_write_pipeline_data(PipelineData::Value(value.clone(), None), &())?;
 
     match header {
-        PipelineDataHeader::Value(read_value) => assert_eq!(value, read_value),
+        PipelineDataHeader::Value(read_value, _) => assert_eq!(value, read_value),
         _ => panic!("unexpected header: {header:?}"),
     }
 
diff --git a/crates/nu-plugin-core/src/serializers/tests.rs b/crates/nu-plugin-core/src/serializers/tests.rs
index 06d47ffc14..5d0c07cceb 100644
--- a/crates/nu-plugin-core/src/serializers/tests.rs
+++ b/crates/nu-plugin-core/src/serializers/tests.rs
@@ -6,7 +6,8 @@ macro_rules! generate_tests {
             StreamData,
         };
         use nu_protocol::{
-            LabeledError, PluginSignature, Signature, Span, Spanned, SyntaxShape, Value,
+            DataSource, LabeledError, PipelineMetadata, PluginSignature, Signature, Span, Spanned,
+            SyntaxShape, Value,
         };
 
         #[test]
@@ -123,10 +124,15 @@ macro_rules! generate_tests {
                 )],
             };
 
+            let metadata = Some(PipelineMetadata {
+                data_source: DataSource::None,
+                content_type: Some("foobar".into()),
+            });
+
             let plugin_call = PluginCall::Run(CallInfo {
                 name: name.clone(),
                 call: call.clone(),
-                input: PipelineDataHeader::Value(input.clone()),
+                input: PipelineDataHeader::Value(input.clone(), metadata.clone()),
             });
 
             let plugin_input = PluginInput::Call(1, plugin_call);
@@ -144,7 +150,7 @@ macro_rules! generate_tests {
             match returned {
                 PluginInput::Call(1, PluginCall::Run(call_info)) => {
                     assert_eq!(name, call_info.name);
-                    assert_eq!(PipelineDataHeader::Value(input), call_info.input);
+                    assert_eq!(PipelineDataHeader::Value(input, metadata), call_info.input);
                     assert_eq!(call.head, call_info.call.head);
                     assert_eq!(call.positional.len(), call_info.call.positional.len());
 
@@ -305,7 +311,7 @@ macro_rules! generate_tests {
             match returned {
                 PluginOutput::CallResponse(
                     4,
-                    PluginCallResponse::PipelineData(PipelineDataHeader::Value(returned_value)),
+                    PluginCallResponse::PipelineData(PipelineDataHeader::Value(returned_value, _)),
                 ) => {
                     assert_eq!(value, returned_value)
                 }
@@ -325,7 +331,7 @@ macro_rules! generate_tests {
                 span,
             );
 
-            let response = PluginCallResponse::PipelineData(PipelineDataHeader::Value(value));
+            let response = PluginCallResponse::PipelineData(PipelineDataHeader::value(value));
             let output = PluginOutput::CallResponse(5, response);
 
             let encoder = $encoder;
@@ -341,7 +347,7 @@ macro_rules! generate_tests {
             match returned {
                 PluginOutput::CallResponse(
                     5,
-                    PluginCallResponse::PipelineData(PipelineDataHeader::Value(returned_value)),
+                    PluginCallResponse::PipelineData(PipelineDataHeader::Value(returned_value, _)),
                 ) => {
                     assert_eq!(span, returned_value.span());
 
diff --git a/crates/nu-plugin-engine/src/interface/tests.rs b/crates/nu-plugin-engine/src/interface/tests.rs
index 2bab67f25f..31828973d3 100644
--- a/crates/nu-plugin-engine/src/interface/tests.rs
+++ b/crates/nu-plugin-engine/src/interface/tests.rs
@@ -17,8 +17,9 @@ use nu_plugin_protocol::{
 use nu_protocol::{
     ast::{Math, Operator},
     engine::Closure,
-    ByteStreamType, CustomValue, IntoInterruptiblePipelineData, IntoSpanned, PipelineData,
-    PluginMetadata, PluginSignature, ShellError, Signals, Span, Spanned, Value,
+    ByteStreamType, CustomValue, DataSource, IntoInterruptiblePipelineData, IntoSpanned,
+    PipelineData, PipelineMetadata, PluginMetadata, PluginSignature, ShellError, Signals, Span,
+    Spanned, Value,
 };
 use serde::{Deserialize, Serialize};
 use std::{
@@ -52,10 +53,7 @@ fn manager_consume_all_exits_after_streams_and_interfaces_are_dropped() -> Resul
 
     // Create a stream...
     let stream = manager.read_pipeline_data(
-        PipelineDataHeader::ListStream(ListStreamInfo {
-            id: 0,
-            span: Span::test_data(),
-        }),
+        PipelineDataHeader::list_stream(ListStreamInfo::new(0, Span::test_data())),
         &Signals::empty(),
     )?;
 
@@ -108,10 +106,7 @@ fn manager_consume_all_propagates_io_error_to_readers() -> Result<(), ShellError
     test.set_read_error(test_io_error());
 
     let stream = manager.read_pipeline_data(
-        PipelineDataHeader::ListStream(ListStreamInfo {
-            id: 0,
-            span: Span::test_data(),
-        }),
+        PipelineDataHeader::list_stream(ListStreamInfo::new(0, Span::test_data())),
         &Signals::empty(),
     )?;
 
@@ -154,11 +149,11 @@ fn manager_consume_all_propagates_message_error_to_readers() -> Result<(), Shell
     test.add(invalid_output());
 
     let stream = manager.read_pipeline_data(
-        PipelineDataHeader::ByteStream(ByteStreamInfo {
-            id: 0,
-            span: Span::test_data(),
-            type_: ByteStreamType::Unknown,
-        }),
+        PipelineDataHeader::byte_stream(ByteStreamInfo::new(
+            0,
+            Span::test_data(),
+            ByteStreamType::Unknown,
+        )),
         &Signals::empty(),
     )?;
 
@@ -331,10 +326,10 @@ fn manager_consume_call_response_forwards_to_subscriber_with_pipeline_data(
 
     manager.consume(PluginOutput::CallResponse(
         0,
-        PluginCallResponse::PipelineData(PipelineDataHeader::ListStream(ListStreamInfo {
-            id: 0,
-            span: Span::test_data(),
-        })),
+        PluginCallResponse::PipelineData(PipelineDataHeader::list_stream(ListStreamInfo::new(
+            0,
+            Span::test_data(),
+        ))),
     ))?;
 
     for i in 0..2 {
@@ -375,18 +370,18 @@ fn manager_consume_call_response_registers_streams() -> Result<(), ShellError> {
     // Check list streams, byte streams
     manager.consume(PluginOutput::CallResponse(
         0,
-        PluginCallResponse::PipelineData(PipelineDataHeader::ListStream(ListStreamInfo {
-            id: 0,
-            span: Span::test_data(),
-        })),
+        PluginCallResponse::PipelineData(PipelineDataHeader::list_stream(ListStreamInfo::new(
+            0,
+            Span::test_data(),
+        ))),
     ))?;
     manager.consume(PluginOutput::CallResponse(
         1,
-        PluginCallResponse::PipelineData(PipelineDataHeader::ByteStream(ByteStreamInfo {
-            id: 1,
-            span: Span::test_data(),
-            type_: ByteStreamType::Unknown,
-        })),
+        PluginCallResponse::PipelineData(PipelineDataHeader::byte_stream(ByteStreamInfo::new(
+            1,
+            Span::test_data(),
+            ByteStreamType::Unknown,
+        ))),
     ))?;
 
     // ListStream should have one
@@ -442,10 +437,7 @@ fn manager_consume_engine_call_forwards_to_subscriber_with_pipeline_data() -> Re
                 span: Span::test_data(),
             },
             positional: vec![],
-            input: PipelineDataHeader::ListStream(ListStreamInfo {
-                id: 2,
-                span: Span::test_data(),
-            }),
+            input: PipelineDataHeader::list_stream(ListStreamInfo::new(2, Span::test_data())),
             redirect_stdout: false,
             redirect_stderr: false,
         },
@@ -806,6 +798,11 @@ fn interface_write_plugin_call_writes_run_with_value_input() -> Result<(), Shell
     let manager = test.plugin("test");
     let interface = manager.get_interface();
 
+    let metadata0 = PipelineMetadata {
+        data_source: DataSource::None,
+        content_type: Some("baz".into()),
+    };
+
     let result = interface.write_plugin_call(
         PluginCall::Run(CallInfo {
             name: "foo".into(),
@@ -814,7 +811,7 @@ fn interface_write_plugin_call_writes_run_with_value_input() -> Result<(), Shell
                 positional: vec![],
                 named: vec![],
             },
-            input: PipelineData::Value(Value::test_int(-1), None),
+            input: PipelineData::Value(Value::test_int(-1), Some(metadata0.clone())),
         }),
         None,
     )?;
@@ -826,7 +823,10 @@ fn interface_write_plugin_call_writes_run_with_value_input() -> Result<(), Shell
             PluginCall::Run(CallInfo { name, input, .. }) => {
                 assert_eq!("foo", name);
                 match input {
-                    PipelineDataHeader::Value(value) => assert_eq!(-1, value.as_int()?),
+                    PipelineDataHeader::Value(value, metadata) => {
+                        assert_eq!(-1, value.as_int()?);
+                        assert_eq!(metadata0, metadata.expect("there should be metadata"));
+                    }
                     _ => panic!("unexpected input header: {input:?}"),
                 }
             }
diff --git a/crates/nu-plugin-protocol/src/lib.rs b/crates/nu-plugin-protocol/src/lib.rs
index 1a2bbd99ff..00a18beca9 100644
--- a/crates/nu-plugin-protocol/src/lib.rs
+++ b/crates/nu-plugin-protocol/src/lib.rs
@@ -23,7 +23,7 @@ pub mod test_util;
 
 use nu_protocol::{
     ast::Operator, engine::Closure, ByteStreamType, Config, DeclId, LabeledError, PipelineData,
-    PluginMetadata, PluginSignature, ShellError, Span, Spanned, Value,
+    PipelineMetadata, PluginMetadata, PluginSignature, ShellError, Span, Spanned, Value,
 };
 use nu_utils::SharedCow;
 use serde::{Deserialize, Serialize};
@@ -78,7 +78,7 @@ pub enum PipelineDataHeader {
     /// No input
     Empty,
     /// A single value
-    Value(Value),
+    Value(Value, Option<PipelineMetadata>),
     /// Initiate [`nu_protocol::PipelineData::ListStream`].
     ///
     /// Items are sent via [`StreamData`]
@@ -94,11 +94,23 @@ impl PipelineDataHeader {
     pub fn stream_id(&self) -> Option<StreamId> {
         match self {
             PipelineDataHeader::Empty => None,
-            PipelineDataHeader::Value(_) => None,
+            PipelineDataHeader::Value(_, _) => None,
             PipelineDataHeader::ListStream(info) => Some(info.id),
             PipelineDataHeader::ByteStream(info) => Some(info.id),
         }
     }
+
+    pub fn value(value: Value) -> Self {
+        PipelineDataHeader::Value(value, None)
+    }
+
+    pub fn list_stream(info: ListStreamInfo) -> Self {
+        PipelineDataHeader::ListStream(info)
+    }
+
+    pub fn byte_stream(info: ByteStreamInfo) -> Self {
+        PipelineDataHeader::ByteStream(info)
+    }
 }
 
 /// Additional information about list (value) streams
@@ -106,6 +118,18 @@ impl PipelineDataHeader {
 pub struct ListStreamInfo {
     pub id: StreamId,
     pub span: Span,
+    pub metadata: Option<PipelineMetadata>,
+}
+
+impl ListStreamInfo {
+    /// Create a new `ListStreamInfo` with a unique ID
+    pub fn new(id: StreamId, span: Span) -> Self {
+        ListStreamInfo {
+            id,
+            span,
+            metadata: None,
+        }
+    }
 }
 
 /// Additional information about byte streams
@@ -115,6 +139,19 @@ pub struct ByteStreamInfo {
     pub span: Span,
     #[serde(rename = "type")]
     pub type_: ByteStreamType,
+    pub metadata: Option<PipelineMetadata>,
+}
+
+impl ByteStreamInfo {
+    /// Create a new `ByteStreamInfo` with a unique ID
+    pub fn new(id: StreamId, span: Span, type_: ByteStreamType) -> Self {
+        ByteStreamInfo {
+            id,
+            span,
+            type_,
+            metadata: None,
+        }
+    }
 }
 
 /// Calls that a plugin can execute. The type parameter determines the input type.
@@ -344,7 +381,7 @@ impl PluginCallResponse<PipelineDataHeader> {
         if value.is_nothing() {
             PluginCallResponse::PipelineData(PipelineDataHeader::Empty)
         } else {
-            PluginCallResponse::PipelineData(PipelineDataHeader::Value(value))
+            PluginCallResponse::PipelineData(PipelineDataHeader::value(value))
         }
     }
 }
diff --git a/crates/nu-plugin/src/plugin/interface/tests.rs b/crates/nu-plugin/src/plugin/interface/tests.rs
index 7065c6f64d..f8002b2c6d 100644
--- a/crates/nu-plugin/src/plugin/interface/tests.rs
+++ b/crates/nu-plugin/src/plugin/interface/tests.rs
@@ -55,10 +55,7 @@ fn manager_consume_all_exits_after_streams_and_interfaces_are_dropped() -> Resul
 
     // Create a stream...
     let stream = manager.read_pipeline_data(
-        PipelineDataHeader::ListStream(ListStreamInfo {
-            id: 0,
-            span: Span::test_data(),
-        }),
+        PipelineDataHeader::list_stream(ListStreamInfo::new(0, Span::test_data())),
         &Signals::empty(),
     )?;
 
@@ -111,10 +108,7 @@ fn manager_consume_all_propagates_io_error_to_readers() -> Result<(), ShellError
     test.set_read_error(test_io_error());
 
     let stream = manager.read_pipeline_data(
-        PipelineDataHeader::ListStream(ListStreamInfo {
-            id: 0,
-            span: Span::test_data(),
-        }),
+        PipelineDataHeader::list_stream(ListStreamInfo::new(0, Span::test_data())),
         &Signals::empty(),
     )?;
 
@@ -157,11 +151,11 @@ fn manager_consume_all_propagates_message_error_to_readers() -> Result<(), Shell
     test.add(invalid_input());
 
     let stream = manager.read_pipeline_data(
-        PipelineDataHeader::ByteStream(ByteStreamInfo {
-            id: 0,
-            span: Span::test_data(),
-            type_: ByteStreamType::Unknown,
-        }),
+        PipelineDataHeader::byte_stream(ByteStreamInfo::new(
+            0,
+            Span::test_data(),
+            ByteStreamType::Unknown,
+        )),
         &Signals::empty(),
     )?;
 
@@ -414,10 +408,7 @@ fn manager_consume_call_run_forwards_to_receiver_with_pipeline_data() -> Result<
                 positional: vec![],
                 named: vec![],
             },
-            input: PipelineDataHeader::ListStream(ListStreamInfo {
-                id: 6,
-                span: Span::test_data(),
-            }),
+            input: PipelineDataHeader::list_stream(ListStreamInfo::new(6, Span::test_data())),
         }),
     ))?;
 
@@ -556,10 +547,10 @@ fn manager_consume_engine_call_response_forwards_to_subscriber_with_pipeline_dat
 
     manager.consume(PluginInput::EngineCallResponse(
         0,
-        EngineCallResponse::PipelineData(PipelineDataHeader::ListStream(ListStreamInfo {
-            id: 0,
-            span: Span::test_data(),
-        })),
+        EngineCallResponse::PipelineData(PipelineDataHeader::list_stream(ListStreamInfo::new(
+            0,
+            Span::test_data(),
+        ))),
     ))?;
 
     for i in 0..2 {
@@ -707,7 +698,7 @@ fn interface_write_response_with_value() -> Result<(), ShellError> {
             assert_eq!(33, id, "id");
             match response {
                 PluginCallResponse::PipelineData(header) => match header {
-                    PipelineDataHeader::Value(value) => assert_eq!(6, value.as_int()?),
+                    PipelineDataHeader::Value(value, _) => assert_eq!(6, value.as_int()?),
                     _ => panic!("unexpected pipeline data header: {header:?}"),
                 },
                 _ => panic!("unexpected response: {response:?}"),
diff --git a/crates/nu-protocol/src/pipeline/metadata.rs b/crates/nu-protocol/src/pipeline/metadata.rs
index 1ed9222f46..c1f00769b3 100644
--- a/crates/nu-protocol/src/pipeline/metadata.rs
+++ b/crates/nu-protocol/src/pipeline/metadata.rs
@@ -1,7 +1,9 @@
 use std::path::PathBuf;
 
+use serde::{Deserialize, Serialize};
+
 /// Metadata that is valid for the whole [`PipelineData`](crate::PipelineData)
-#[derive(Debug, Default, Clone)]
+#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
 pub struct PipelineMetadata {
     pub data_source: DataSource,
     pub content_type: Option<String>,
@@ -27,7 +29,7 @@ impl PipelineMetadata {
 ///
 /// This can either be a particular family of commands (useful so downstream commands can adjust
 /// the presentation e.g. `Ls`) or the opened file to protect against overwrite-attempts properly.
-#[derive(Debug, Default, Clone)]
+#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
 pub enum DataSource {
     Ls,
     HtmlThemes,
diff --git a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
index 68f87eaca0..3bbf5b965c 100755
--- a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
+++ b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
@@ -7,7 +7,7 @@
 # language without adding any extra dependencies to our tests.
 
 const NUSHELL_VERSION = "0.96.2"
-const PLUGIN_VERSION = "0.1.0" # bump if you change commands!
+const PLUGIN_VERSION = "0.1.1" # bump if you change commands!
 
 def main [--stdio] {
   if ($stdio) {
@@ -133,7 +133,7 @@ def process_call [
 
   # Create a Value of type List that will be encoded and sent to Nushell
   let value = {
-    Value: {
+    Value: [{
       List: {
         vals: (0..9 | each { |x|
           {
@@ -157,7 +157,7 @@ def process_call [
         }),
         span: $span
       }
-    }
+    }, null]
   }
 
   write_response $id { PipelineData: $value }
@@ -265,4 +265,4 @@ def start_plugin [] {
     }) |
     each { from json | handle_input } |
     ignore
-}
\ No newline at end of file
+}
diff --git a/crates/nu_plugin_python/nu_plugin_python_example.py b/crates/nu_plugin_python/nu_plugin_python_example.py
index 5a0357e9ca..55d3204a34 100755
--- a/crates/nu_plugin_python/nu_plugin_python_example.py
+++ b/crates/nu_plugin_python/nu_plugin_python_example.py
@@ -28,7 +28,7 @@ import json
 
 
 NUSHELL_VERSION = "0.96.2"
-PLUGIN_VERSION = "0.1.0" # bump if you change commands!
+PLUGIN_VERSION = "0.1.1"  # bump if you change commands!
 
 
 def signatures():
@@ -125,31 +125,31 @@ def process_call(id, plugin_call):
     span = plugin_call["call"]["head"]
 
     # Creates a Value of type List that will be encoded and sent to Nushell
-    def f(x, y): return {
-        "Int": {
-            "val": x * y,
-            "span": span
-        }
-    }
+    def f(x, y):
+        return {"Int": {"val": x * y, "span": span}}
 
     value = {
-        "Value": {
-            "List": {
-                "vals": [
-                    {
-                        "Record": {
-                            "val": {
-                                "one": f(x, 0),
-                                "two": f(x, 1),
-                                "three": f(x, 2),
-                            },
-                            "span": span
+        "Value": [
+            {
+                "List": {
+                    "vals": [
+                        {
+                            "Record": {
+                                "val": {
+                                    "one": f(x, 0),
+                                    "two": f(x, 1),
+                                    "three": f(x, 2),
+                                },
+                                "span": span,
+                            }
                         }
-                    } for x in range(0, 10)
-                ],
-                "span": span
-            }
-        }
+                        for x in range(0, 10)
+                    ],
+                    "span": span,
+                }
+            },
+            None,
+        ]
     }
 
     write_response(id, {"PipelineData": value})
@@ -172,7 +172,7 @@ def tell_nushell_hello():
         "Hello": {
             "protocol": "nu-plugin",  # always this value
             "version": NUSHELL_VERSION,
-            "features": []
+            "features": [],
         }
     }
     sys.stdout.write(json.dumps(hello))
@@ -200,22 +200,26 @@ def write_error(id, text, span=None):
     Use this error format to send errors to nushell in response to a plugin call. The ID of the
     plugin call is required.
     """
-    error = {
-        "Error": {
-            "msg": "ERROR from plugin",
-            "labels": [
-                {
-                    "text": text,
-                    "span": span,
-                }
-            ],
+    error = (
+        {
+            "Error": {
+                "msg": "ERROR from plugin",
+                "labels": [
+                    {
+                        "text": text,
+                        "span": span,
+                    }
+                ],
+            }
         }
-    } if span is not None else {
-        "Error": {
-            "msg": "ERROR from plugin",
-            "help": text,
+        if span is not None
+        else {
+            "Error": {
+                "msg": "ERROR from plugin",
+                "help": text,
+            }
         }
-    }
+    )
     write_response(id, error)
 
 
@@ -230,11 +234,14 @@ def handle_input(input):
     elif "Call" in input:
         [id, plugin_call] = input["Call"]
         if plugin_call == "Metadata":
-            write_response(id, {
-                "Metadata": {
-                    "version": PLUGIN_VERSION,
-                }
-            })
+            write_response(
+                id,
+                {
+                    "Metadata": {
+                        "version": PLUGIN_VERSION,
+                    }
+                },
+            )
         elif plugin_call == "Signature":
             write_response(id, signatures())
         elif "Run" in plugin_call:
@@ -258,4 +265,4 @@ if __name__ == "__main__":
     if len(sys.argv) == 2 and sys.argv[1] == "--stdio":
         plugin()
     else:
-        print("Run me from inside nushell!")
\ No newline at end of file
+        print("Run me from inside nushell!")
diff --git a/crates/nu_plugin_stress_internals/src/main.rs b/crates/nu_plugin_stress_internals/src/main.rs
index 96023b44b7..79cbb92549 100644
--- a/crates/nu_plugin_stress_internals/src/main.rs
+++ b/crates/nu_plugin_stress_internals/src/main.rs
@@ -178,7 +178,7 @@ fn handle_message(
                             id,
                             {
                                 "PipelineData": {
-                                    "Value": return_value
+                                    "Value": [return_value, null]
                                 }
                             }
                         ]

From ed82f9ee18f382557135336459b1d098e0406d39 Mon Sep 17 00:00:00 2001
From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Fri, 2 Aug 2024 15:23:25 -0400
Subject: [PATCH 0298/1072] Clarify `default` command help (#13519)

# Description

Updates `default` command description to be more clear and adds an
example for a missing values in a list-of-records.

# User-Facing Changes

Help/doc only

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

- Update `nothing` doc in Book to reference `default` per
https://github.com/nushell/nushell.github.io/issues/1073 - This was a
bit of a rabbit trail on the path to that update. ;-)

---------

Co-authored-by: Stefan Holderbach <sholderbach@users.noreply.github.com>
---
 crates/nu-command/src/filters/default.rs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/filters/default.rs b/crates/nu-command/src/filters/default.rs
index 9b08ce6331..3f7f93c3f6 100644
--- a/crates/nu-command/src/filters/default.rs
+++ b/crates/nu-command/src/filters/default.rs
@@ -27,7 +27,7 @@ impl Command for Default {
     }
 
     fn usage(&self) -> &str {
-        "Sets a default row's column if missing."
+        "Sets a default value if a row's column is missing or null."
     }
 
     fn run(
@@ -66,6 +66,20 @@ impl Command for Default {
                     Span::test_data(),
                 )),
             },
+            Example {
+                description: r#"Replace the missing value in the "a" column of a list"#,
+                example: "[{a:1 b:2} {b:1}] | default 'N/A' a",
+                result: Some(Value::test_list(vec![
+                    Value::test_record(record! {
+                        "a" => Value::test_int(1),
+                        "b" => Value::test_int(2),
+                    }),
+                    Value::test_record(record! {
+                        "a" => Value::test_string("N/A"),
+                        "b" => Value::test_int(1),
+                    }),
+                ])),
+            },
         ]
     }
 }

From af34d5c062bc8fc9d6169ce4457c05d951bbd771 Mon Sep 17 00:00:00 2001
From: Embers-of-the-Fire <stellarishs@163.com>
Date: Sat, 3 Aug 2024 03:47:18 +0800
Subject: [PATCH 0299/1072] Fix internal panic for `query web` (#13507)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

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

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
Original implementation contains multiple `expect` which can cause
internal runtime panic.

This pr forks the `css` selector impl and make it return an error that
nushell can recognize.

**Note:** The original impl is still used in pre-defined selector
implementations, but they
should never fail, so the `css` fn is preserved.

Closes #13496.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
Now `query web` will not panic when the `query` parameter is not given
or has syntax error.

```plain
❯ .\target\debug\nu.exe -c "http get https://www.rust-lang.org | query web"
Error:   × CSS query parse error
   ╭─[source:1:38]
 1 │ http get https://www.rust-lang.org | query web
   ·                                      ────┬────
   ·                                          ╰─┤ Unexpected error occurred. Please report this to the developer
   ·                                            │ EmptySelector
   ╰────
  help: cannot parse query as a valid CSS selector
```

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

Make sure you've run and fixed any issues with these commands:
-->
- [x] `cargo fmt --all -- --check` to check standard code formatting
(`cargo fmt --all` applies these changes)
- [x] `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used`
to check that you're using the standard code style
- [x] `cargo test --workspace` to check that all tests pass (on Windows
make sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- [x] `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library
<!--
> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

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

---------

Co-authored-by: Stefan Holderbach <sholderbach@users.noreply.github.com>
---
 crates/nu_plugin_query/src/query_web.rs | 161 +++++++++++++-----------
 1 file changed, 91 insertions(+), 70 deletions(-)

diff --git a/crates/nu_plugin_query/src/query_web.rs b/crates/nu_plugin_query/src/query_web.rs
index 2d8b9e4aac..2d57af6021 100644
--- a/crates/nu_plugin_query/src/query_web.rs
+++ b/crates/nu_plugin_query/src/query_web.rs
@@ -99,29 +99,11 @@ pub fn web_examples() -> Vec<Example<'static>> {
 }
 
 pub struct Selector {
-    pub query: String,
+    pub query: Spanned<String>,
     pub as_html: bool,
     pub attribute: Value,
     pub as_table: Value,
-    pub inspect: bool,
-}
-
-impl Selector {
-    pub fn new() -> Selector {
-        Selector {
-            query: String::new(),
-            as_html: false,
-            attribute: Value::string("".to_string(), Span::unknown()),
-            as_table: Value::string("".to_string(), Span::unknown()),
-            inspect: false,
-        }
-    }
-}
-
-impl Default for Selector {
-    fn default() -> Self {
-        Self::new()
-    }
+    pub inspect: Spanned<bool>,
 }
 
 pub fn parse_selector_params(call: &EvaluatedCall, input: &Value) -> Result<Value, LabeledError> {
@@ -136,43 +118,46 @@ pub fn parse_selector_params(call: &EvaluatedCall, input: &Value) -> Result<Valu
         .unwrap_or_else(|| Value::nothing(head));
 
     let inspect = call.has_flag("inspect")?;
-
-    if let Some(query) = &query {
-        if let Err(err) = ScraperSelector::parse(&query.item) {
-            return Err(LabeledError::new("CSS query parse error")
-                .with_label(err.to_string(), query.span)
-                .with_help("cannot parse this query as a valid CSS selector"));
-        }
-    }
+    let inspect_span = call.get_flag_span("inspect").unwrap_or(call.head);
 
     let selector = Selector {
-        query: query.map(|q| q.item).unwrap_or_default(),
+        query: query.unwrap_or(Spanned {
+            span: call.head,
+            item: "".to_owned(),
+        }),
         as_html,
         attribute,
         as_table,
-        inspect,
+        inspect: Spanned {
+            item: inspect,
+            span: inspect_span,
+        },
     };
 
     let span = input.span();
     match input {
-        Value::String { val, .. } => Ok(begin_selector_query(val.to_string(), selector, span)),
+        Value::String { val, .. } => begin_selector_query(val.to_string(), selector, span),
         _ => Err(LabeledError::new("Requires text input")
             .with_label("expected text from pipeline", span)),
     }
 }
 
-fn begin_selector_query(input_html: String, selector: Selector, span: Span) -> Value {
+fn begin_selector_query(
+    input_html: String,
+    selector: Selector,
+    span: Span,
+) -> Result<Value, LabeledError> {
     if let Value::List { .. } = selector.as_table {
-        return retrieve_tables(
+        retrieve_tables(
             input_html.as_str(),
             &selector.as_table,
-            selector.inspect,
+            selector.inspect.item,
             span,
-        );
+        )
     } else if selector.attribute.is_empty() {
         execute_selector_query(
             input_html.as_str(),
-            selector.query.as_str(),
+            selector.query,
             selector.as_html,
             selector.inspect,
             span,
@@ -180,7 +165,7 @@ fn begin_selector_query(input_html: String, selector: Selector, span: Span) -> V
     } else if let Value::List { .. } = selector.attribute {
         execute_selector_query_with_attributes(
             input_html.as_str(),
-            selector.query.as_str(),
+            selector.query,
             &selector.attribute,
             selector.inspect,
             span,
@@ -188,7 +173,7 @@ fn begin_selector_query(input_html: String, selector: Selector, span: Span) -> V
     } else {
         execute_selector_query_with_attribute(
             input_html.as_str(),
-            selector.query.as_str(),
+            selector.query,
             selector.attribute.as_str().unwrap_or(""),
             selector.inspect,
             span,
@@ -201,7 +186,7 @@ pub fn retrieve_tables(
     columns: &Value,
     inspect_mode: bool,
     span: Span,
-) -> Value {
+) -> Result<Value, LabeledError> {
     let html = input_string;
     let mut cols: Vec<String> = Vec::new();
     if let Value::List { vals, .. } = &columns {
@@ -228,11 +213,15 @@ pub fn retrieve_tables(
     };
 
     if tables.len() == 1 {
-        return retrieve_table(
-            tables.into_iter().next().expect("Error retrieving table"),
+        return Ok(retrieve_table(
+            tables.into_iter().next().ok_or_else(|| {
+                LabeledError::new("Cannot retrieve table")
+                    .with_label("Error retrieving table.", span)
+                    .with_help("No table found.")
+            })?,
             columns,
             span,
-        );
+        ));
     }
 
     let vals = tables
@@ -240,7 +229,7 @@ pub fn retrieve_tables(
         .map(move |table| retrieve_table(table, columns, span))
         .collect();
 
-    Value::list(vals, span)
+    Ok(Value::list(vals, span))
 }
 
 fn retrieve_table(mut table: WebTable, columns: &Value, span: Span) -> Value {
@@ -323,15 +312,15 @@ fn retrieve_table(mut table: WebTable, columns: &Value, span: Span) -> Value {
 
 fn execute_selector_query_with_attribute(
     input_string: &str,
-    query_string: &str,
+    query_string: Spanned<String>,
     attribute: &str,
-    inspect: bool,
+    inspect: Spanned<bool>,
     span: Span,
-) -> Value {
+) -> Result<Value, LabeledError> {
     let doc = Html::parse_fragment(input_string);
 
     let vals: Vec<Value> = doc
-        .select(&css(query_string, inspect))
+        .select(&fallible_css(query_string, inspect)?)
         .map(|selection| {
             Value::string(
                 selection.value().attr(attribute).unwrap_or("").to_string(),
@@ -339,16 +328,16 @@ fn execute_selector_query_with_attribute(
             )
         })
         .collect();
-    Value::list(vals, span)
+    Ok(Value::list(vals, span))
 }
 
 fn execute_selector_query_with_attributes(
     input_string: &str,
-    query_string: &str,
+    query_string: Spanned<String>,
     attributes: &Value,
-    inspect: bool,
+    inspect: Spanned<bool>,
     span: Span,
-) -> Value {
+) -> Result<Value, LabeledError> {
     let doc = Html::parse_fragment(input_string);
 
     let mut attrs: Vec<String> = Vec::new();
@@ -361,7 +350,7 @@ fn execute_selector_query_with_attributes(
     }
 
     let vals: Vec<Value> = doc
-        .select(&css(query_string, inspect))
+        .select(&fallible_css(query_string, inspect)?)
         .map(|selection| {
             let mut record = Record::new();
             for attr in &attrs {
@@ -373,25 +362,25 @@ fn execute_selector_query_with_attributes(
             Value::record(record, span)
         })
         .collect();
-    Value::list(vals, span)
+    Ok(Value::list(vals, span))
 }
 
 fn execute_selector_query(
     input_string: &str,
-    query_string: &str,
+    query_string: Spanned<String>,
     as_html: bool,
-    inspect: bool,
+    inspect: Spanned<bool>,
     span: Span,
-) -> Value {
+) -> Result<Value, LabeledError> {
     let doc = Html::parse_fragment(input_string);
 
     let vals: Vec<Value> = match as_html {
         true => doc
-            .select(&css(query_string, inspect))
+            .select(&fallible_css(query_string, inspect)?)
             .map(|selection| Value::string(selection.html(), span))
             .collect(),
         false => doc
-            .select(&css(query_string, inspect))
+            .select(&fallible_css(query_string, inspect)?)
             .map(|selection| {
                 Value::list(
                     selection
@@ -404,7 +393,28 @@ fn execute_selector_query(
             .collect(),
     };
 
-    Value::list(vals, span)
+    Ok(Value::list(vals, span))
+}
+
+fn fallible_css(
+    selector: Spanned<String>,
+    inspect: Spanned<bool>,
+) -> Result<ScraperSelector, LabeledError> {
+    if inspect.item {
+        ScraperSelector::parse("html").map_err(|e| {
+            LabeledError::new("CSS query parse error")
+                .with_label(e.to_string(), inspect.span)
+                .with_help(
+                    "cannot parse query `html` as a valid CSS selector, possibly an internal error",
+                )
+        })
+    } else {
+        ScraperSelector::parse(&selector.item).map_err(|e| {
+            LabeledError::new("CSS query parse error")
+                .with_label(e.to_string(), selector.span)
+                .with_help("cannot parse query as a valid CSS selector")
+        })
+    }
 }
 
 pub fn css(selector: &str, inspect: bool) -> ScraperSelector {
@@ -433,15 +443,23 @@ mod tests {
         <a href="https://example.com" target="_self">Example</a>
     "#;
 
+    fn null_spanned<T: ToOwned + ?Sized>(input: &T) -> Spanned<T::Owned> {
+        Spanned {
+            item: input.to_owned(),
+            span: Span::unknown(),
+        }
+    }
+
     #[test]
     fn test_first_child_is_not_empty() {
         assert!(!execute_selector_query(
             SIMPLE_LIST,
-            "li:first-child",
-            false,
+            null_spanned("li:first-child"),
             false,
+            null_spanned(&false),
             Span::test_data()
         )
+        .unwrap()
         .is_empty())
     }
 
@@ -449,11 +467,12 @@ mod tests {
     fn test_first_child() {
         let item = execute_selector_query(
             SIMPLE_LIST,
-            "li:first-child",
-            false,
+            null_spanned("li:first-child"),
             false,
+            null_spanned(&false),
             Span::test_data(),
-        );
+        )
+        .unwrap();
         let config = nu_protocol::Config::default();
         let out = item.to_expanded_string("\n", &config);
         assert_eq!("[[Coffee]]".to_string(), out)
@@ -463,11 +482,12 @@ mod tests {
     fn test_nested_text_nodes() {
         let item = execute_selector_query(
             NESTED_TEXT,
-            "p:first-child",
-            false,
+            null_spanned("p:first-child"),
             false,
+            null_spanned(&false),
             Span::test_data(),
-        );
+        )
+        .unwrap();
         let out = item
             .into_list()
             .unwrap()
@@ -492,7 +512,7 @@ mod tests {
     fn test_multiple_attributes() {
         let item = execute_selector_query_with_attributes(
             MULTIPLE_ATTRIBUTES,
-            "a",
+            null_spanned("a"),
             &Value::list(
                 vec![
                     Value::string("href".to_string(), Span::unknown()),
@@ -500,9 +520,10 @@ mod tests {
                 ],
                 Span::unknown(),
             ),
-            false,
+            null_spanned(&false),
             Span::test_data(),
-        );
+        )
+        .unwrap();
         let out = item
             .into_list()
             .unwrap()

From ff1ad77130b4a5baa6bbc6728e99023340f8842a Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Sat, 3 Aug 2024 00:26:35 +0200
Subject: [PATCH 0300/1072] Simplify column look-up in `default` (#13522)

# Description
Since we make the promise that record keys/columns are exclusice we
don't have to go through all columns after we have found the first one.
Should permit some short-circuiting if the column is found early.

# User-Facing Changes
(-)

# Tests + Formatting
(-)
---
 crates/nu-command/src/filters/default.rs | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/crates/nu-command/src/filters/default.rs b/crates/nu-command/src/filters/default.rs
index 3f7f93c3f6..e269c58ccd 100644
--- a/crates/nu-command/src/filters/default.rs
+++ b/crates/nu-command/src/filters/default.rs
@@ -102,19 +102,13 @@ fn default(
                         val: ref mut record,
                         ..
                     } => {
-                        let mut found = false;
-
-                        for (col, val) in record.to_mut().iter_mut() {
-                            if *col == column.item {
-                                found = true;
-                                if matches!(val, Value::Nothing { .. }) {
-                                    *val = value.clone();
-                                }
+                        let record = record.to_mut();
+                        if let Some(val) = record.get_mut(&column.item) {
+                            if matches!(val, Value::Nothing { .. }) {
+                                *val = value.clone();
                             }
-                        }
-
-                        if !found {
-                            record.to_mut().push(column.item.clone(), value.clone());
+                        } else {
+                            record.push(column.item.clone(), value.clone());
                         }
 
                         item

From 63f00e78d1ad5b75afbc3c7c883cd1e0e9084632 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Sat, 3 Aug 2024 00:26:48 +0200
Subject: [PATCH 0301/1072] Lift `SharedCow::to_mut` out of if let branches
 (#13524)

In some `if let`s we ran the `SharedCow::to_mut` for the test and to get
access to a mutable reference in the happy path. Internally
`Arc::into_mut` has to read atomics and if necessary clone.
For else branches, where we still want to modify the record we
previously called this again (not just in rust, confirmed in the asm).

This would have introduced a `call` instruction and its cost (even if it
would be guaranteed to take the short path in `Arc::into_mut`).
Lifting it get's rid of this.
---
 crates/nu-protocol/src/value/mod.rs | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs
index fc618d6341..edd51d70a6 100644
--- a/crates/nu-protocol/src/value/mod.rs
+++ b/crates/nu-protocol/src/value/mod.rs
@@ -1223,7 +1223,8 @@ impl Value {
                         for val in vals.iter_mut() {
                             match val {
                                 Value::Record { val: record, .. } => {
-                                    if let Some(val) = record.to_mut().get_mut(col_name) {
+                                    let record = record.to_mut();
+                                    if let Some(val) = record.get_mut(col_name) {
                                         val.upsert_data_at_cell_path(path, new_val.clone())?;
                                     } else {
                                         let new_col = if path.is_empty() {
@@ -1235,7 +1236,7 @@ impl Value {
                                                 .upsert_data_at_cell_path(path, new_val.clone())?;
                                             new_col
                                         };
-                                        record.to_mut().push(col_name, new_col);
+                                        record.push(col_name, new_col);
                                     }
                                 }
                                 Value::Error { error, .. } => return Err(*error.clone()),
@@ -1250,7 +1251,8 @@ impl Value {
                         }
                     }
                     Value::Record { val: record, .. } => {
-                        if let Some(val) = record.to_mut().get_mut(col_name) {
+                        let record = record.to_mut();
+                        if let Some(val) = record.get_mut(col_name) {
                             val.upsert_data_at_cell_path(path, new_val)?;
                         } else {
                             let new_col = if path.is_empty() {
@@ -1260,7 +1262,7 @@ impl Value {
                                 new_col.upsert_data_at_cell_path(path, new_val)?;
                                 new_col
                             };
-                            record.to_mut().push(col_name, new_col);
+                            record.push(col_name, new_col);
                         }
                     }
                     Value::Error { error, .. } => return Err(*error.clone()),
@@ -1591,7 +1593,8 @@ impl Value {
                             let v_span = val.span();
                             match val {
                                 Value::Record { val: record, .. } => {
-                                    if let Some(val) = record.to_mut().get_mut(col_name) {
+                                    let record = record.to_mut();
+                                    if let Some(val) = record.get_mut(col_name) {
                                         if path.is_empty() {
                                             return Err(ShellError::ColumnAlreadyExists {
                                                 col_name: col_name.clone(),
@@ -1618,7 +1621,7 @@ impl Value {
                                             )?;
                                             new_col
                                         };
-                                        record.to_mut().push(col_name, new_col);
+                                        record.push(col_name, new_col);
                                     }
                                 }
                                 Value::Error { error, .. } => return Err(*error.clone()),
@@ -1634,7 +1637,8 @@ impl Value {
                         }
                     }
                     Value::Record { val: record, .. } => {
-                        if let Some(val) = record.to_mut().get_mut(col_name) {
+                        let record = record.to_mut();
+                        if let Some(val) = record.get_mut(col_name) {
                             if path.is_empty() {
                                 return Err(ShellError::ColumnAlreadyExists {
                                     col_name: col_name.clone(),
@@ -1652,7 +1656,7 @@ impl Value {
                                 new_col.insert_data_at_cell_path(path, new_val, head_span)?;
                                 new_col
                             };
-                            record.to_mut().push(col_name, new_col);
+                            record.push(col_name, new_col);
                         }
                     }
                     other => {

From 85b06b22d99942062f1dccd201616396211721a4 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Sat, 3 Aug 2024 01:14:44 +0200
Subject: [PATCH 0302/1072] Replace manual `Record::get` implementation
 (#13525)

Let's simplify here
---
 crates/nu-command/src/charting/histogram.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/crates/nu-command/src/charting/histogram.rs b/crates/nu-command/src/charting/histogram.rs
index 29515c96c5..1162259409 100755
--- a/crates/nu-command/src/charting/histogram.rs
+++ b/crates/nu-command/src/charting/histogram.rs
@@ -177,11 +177,9 @@ fn run_histogram(
                 match v {
                     // parse record, and fill valid value to actual input.
                     Value::Record { val, .. } => {
-                        for (c, v) in val.iter() {
-                            if c == col_name {
-                                if let Ok(v) = HashableValue::from_value(v.clone(), head_span) {
-                                    inputs.push(v);
-                                }
+                        if let Some(v) = val.get(col_name) {
+                            if let Ok(v) = HashableValue::from_value(v.clone(), head_span) {
+                                inputs.push(v);
                             }
                         }
                     }

From f4c0d9d45b14c3eb0c02339fae1f04aaf2305953 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Sat, 3 Aug 2024 08:09:13 +0000
Subject: [PATCH 0303/1072] Path migration part 4: various tests (#13373)

# Description
Part 4 of replacing std::path types with nu_path types added in
https://github.com/nushell/nushell/pull/13115. This PR migrates various
tests throughout the code base.
---
 crates/nu-cli/src/repl.rs                     | 75 ++++++++++++-------
 crates/nu-command/tests/commands/cd.rs        | 29 ++++---
 .../tests/commands/database/into_sqlite.rs    |  8 +-
 crates/nu-command/tests/commands/mktemp.rs    |  9 +--
 crates/nu-command/tests/commands/move_/umv.rs | 36 ++++-----
 .../nu-command/tests/commands/path/expand.rs  | 17 ++---
 crates/nu-command/tests/commands/rm.rs        | 31 +++-----
 crates/nu-command/tests/commands/touch.rs     |  5 +-
 crates/nu-command/tests/commands/ucp.rs       | 72 +++++++-----------
 crates/nu-command/tests/commands/umkdir.rs    | 15 +---
 crates/nu-protocol/src/engine/engine_state.rs | 55 ++++++++------
 crates/nu-test-support/src/fs.rs              |  2 +-
 tests/repl/test_config_path.rs                | 71 +++++++++++-------
 13 files changed, 213 insertions(+), 212 deletions(-)

diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 817950a445..28a3e2cec7 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -1337,20 +1337,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)
@@ -1362,11 +1368,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();
@@ -1382,54 +1388,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 { "/" };
-        check(&tempdir, root, root);
+        let tempdir = AbsolutePath::try_new(tempdir.path()).unwrap();
+
+        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 bar = tempdir.path().join("bar");
+        let tempdir = AbsolutePath::try_new(tempdir.path()).unwrap();
+
+        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);
     }
@@ -1437,32 +1455,35 @@ mod test_auto_cd {
     #[test]
     fn auto_cd_trailing_slash() {
         let tempdir = tempdir().unwrap();
-        let dir = tempdir.path().join("foo");
-        std::fs::create_dir_all(&dir).unwrap();
+        let tempdir = AbsolutePath::try_new(tempdir.path()).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");
-        std::fs::create_dir_all(&dir).unwrap();
-        let link = tempdir.path().join("link");
-        symlink(&dir, &link).unwrap();
+        let tempdir = AbsolutePath::try_new(tempdir.path()).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);
     }
 }
diff --git a/crates/nu-command/tests/commands/cd.rs b/crates/nu-command/tests/commands/cd.rs
index f58638cc35..1b8e2dad5a 100644
--- a/crates/nu-command/tests/commands/cd.rs
+++ b/crates/nu-command/tests/commands/cd.rs
@@ -1,7 +1,7 @@
+use nu_path::Path;
 use nu_test_support::fs::Stub::EmptyFile;
 use nu_test_support::nu;
 use nu_test_support::playground::Playground;
-use std::path::PathBuf;
 
 #[test]
 fn cd_works_with_in_var() {
@@ -22,7 +22,7 @@ fn filesystem_change_from_current_directory_using_relative_path() {
     Playground::setup("cd_test_1", |dirs, _| {
         let actual = nu!( cwd: dirs.root(), "cd cd_test_1; $env.PWD");
 
-        assert_eq!(PathBuf::from(actual.out), *dirs.test());
+        assert_eq!(Path::new(&actual.out), dirs.test());
     })
 }
 
@@ -32,7 +32,7 @@ fn filesystem_change_from_current_directory_using_relative_path_with_trailing_sl
         // Intentionally not using correct path sep because this should work on Windows
         let actual = nu!( cwd: dirs.root(), "cd cd_test_1_slash/; $env.PWD");
 
-        assert_eq!(PathBuf::from(actual.out), *dirs.test());
+        assert_eq!(Path::new(&actual.out), *dirs.test());
     })
 }
 
@@ -48,7 +48,7 @@ fn filesystem_change_from_current_directory_using_absolute_path() {
             dirs.formats().display()
         );
 
-        assert_eq!(PathBuf::from(actual.out), dirs.formats());
+        assert_eq!(Path::new(&actual.out), dirs.formats());
     })
 }
 
@@ -65,7 +65,7 @@ fn filesystem_change_from_current_directory_using_absolute_path_with_trailing_sl
             std::path::MAIN_SEPARATOR_STR,
         );
 
-        assert_eq!(PathBuf::from(actual.out), dirs.formats());
+        assert_eq!(Path::new(&actual.out), dirs.formats());
     })
 }
 
@@ -84,7 +84,7 @@ fn filesystem_switch_back_to_previous_working_directory() {
             dirs.test().display()
         );
 
-        assert_eq!(PathBuf::from(actual.out), dirs.test().join("odin"));
+        assert_eq!(Path::new(&actual.out), dirs.test().join("odin"));
     })
 }
 
@@ -101,10 +101,7 @@ fn filesystem_change_from_current_directory_using_relative_path_and_dash() {
             "
         );
 
-        assert_eq!(
-            PathBuf::from(actual.out),
-            dirs.test().join("odin").join("-")
-        );
+        assert_eq!(Path::new(&actual.out), dirs.test().join("odin").join("-"));
     })
 }
 
@@ -119,7 +116,7 @@ fn filesystem_change_current_directory_to_parent_directory() {
             "
         );
 
-        assert_eq!(PathBuf::from(actual.out), *dirs.root());
+        assert_eq!(Path::new(&actual.out), *dirs.root());
     })
 }
 
@@ -136,7 +133,7 @@ fn filesystem_change_current_directory_to_two_parents_up_using_multiple_dots() {
             "
         );
 
-        assert_eq!(PathBuf::from(actual.out), *dirs.test());
+        assert_eq!(Path::new(&actual.out), *dirs.test());
     })
 }
 
@@ -151,7 +148,7 @@ fn filesystem_change_to_home_directory() {
             "
         );
 
-        assert_eq!(Some(PathBuf::from(actual.out)), dirs::home_dir());
+        assert_eq!(Path::new(&actual.out), dirs::home_dir().unwrap());
     })
 }
 
@@ -169,7 +166,7 @@ fn filesystem_change_to_a_directory_containing_spaces() {
         );
 
         assert_eq!(
-            PathBuf::from(actual.out),
+            Path::new(&actual.out),
             dirs.test().join("robalino turner katz")
         );
     })
@@ -234,7 +231,7 @@ fn filesystem_change_directory_to_symlink_relative() {
                 $env.PWD
             "
         );
-        assert_eq!(PathBuf::from(actual.out), dirs.test().join("foo_link"));
+        assert_eq!(Path::new(&actual.out), dirs.test().join("foo_link"));
 
         let actual = nu!(
             cwd: dirs.test().join("boo"),
@@ -243,7 +240,7 @@ fn filesystem_change_directory_to_symlink_relative() {
                 $env.PWD
             "
         );
-        assert_eq!(PathBuf::from(actual.out), dirs.test().join("foo"));
+        assert_eq!(Path::new(&actual.out), dirs.test().join("foo"));
     })
 }
 
diff --git a/crates/nu-command/tests/commands/database/into_sqlite.rs b/crates/nu-command/tests/commands/database/into_sqlite.rs
index faa45040b3..3de7973588 100644
--- a/crates/nu-command/tests/commands/database/into_sqlite.rs
+++ b/crates/nu-command/tests/commands/database/into_sqlite.rs
@@ -1,6 +1,5 @@
-use std::{io::Write, path::PathBuf};
-
 use chrono::{DateTime, FixedOffset};
+use nu_path::AbsolutePathBuf;
 use nu_protocol::{ast::PathMember, record, Span, Value};
 use nu_test_support::{
     fs::{line_ending, Stub},
@@ -13,6 +12,7 @@ use rand::{
     rngs::StdRng,
     Rng, SeedableRng,
 };
+use std::io::Write;
 
 #[test]
 fn into_sqlite_schema() {
@@ -453,7 +453,7 @@ impl Distribution<TestRow> for Standard {
     }
 }
 
-fn make_sqlite_db(dirs: &Dirs, nu_table: &str) -> PathBuf {
+fn make_sqlite_db(dirs: &Dirs, nu_table: &str) -> AbsolutePathBuf {
     let testdir = dirs.test();
     let testdb_path =
         testdir.join(testdir.file_name().unwrap().to_str().unwrap().to_owned() + ".db");
@@ -465,7 +465,7 @@ fn make_sqlite_db(dirs: &Dirs, nu_table: &str) -> PathBuf {
     );
 
     assert!(nucmd.status.success());
-    testdb_path.into()
+    testdb_path
 }
 
 fn insert_test_rows(dirs: &Dirs, nu_table: &str, sql_query: Option<&str>, expected: Vec<TestRow>) {
diff --git a/crates/nu-command/tests/commands/mktemp.rs b/crates/nu-command/tests/commands/mktemp.rs
index cda3f59978..30de3beb33 100644
--- a/crates/nu-command/tests/commands/mktemp.rs
+++ b/crates/nu-command/tests/commands/mktemp.rs
@@ -1,6 +1,6 @@
+use nu_path::AbsolutePath;
 use nu_test_support::nu;
 use nu_test_support::playground::Playground;
-use std::path::PathBuf;
 
 #[test]
 fn creates_temp_file() {
@@ -9,7 +9,7 @@ fn creates_temp_file() {
             cwd: dirs.test(),
             "mktemp"
         );
-        let loc = PathBuf::from(output.out.clone());
+        let loc = AbsolutePath::try_new(&output.out).unwrap();
         println!("{:?}", loc);
         assert!(loc.exists());
     })
@@ -22,7 +22,7 @@ fn creates_temp_file_with_suffix() {
             cwd: dirs.test(),
             "mktemp --suffix .txt tempfileXXX"
         );
-        let loc = PathBuf::from(output.out.clone());
+        let loc = AbsolutePath::try_new(&output.out).unwrap();
         assert!(loc.exists());
         assert!(loc.is_file());
         assert!(output.out.ends_with(".txt"));
@@ -37,8 +37,7 @@ fn creates_temp_directory() {
             cwd: dirs.test(),
             "mktemp -d"
         );
-
-        let loc = PathBuf::from(output.out);
+        let loc = AbsolutePath::try_new(&output.out).unwrap();
         assert!(loc.exists());
         assert!(loc.is_dir());
     })
diff --git a/crates/nu-command/tests/commands/move_/umv.rs b/crates/nu-command/tests/commands/move_/umv.rs
index 0c96c88a36..b193d5b7cb 100644
--- a/crates/nu-command/tests/commands/move_/umv.rs
+++ b/crates/nu-command/tests/commands/move_/umv.rs
@@ -2,7 +2,6 @@ use nu_test_support::fs::{files_exist_at, Stub::EmptyFile, Stub::FileWithContent
 use nu_test_support::nu;
 use nu_test_support::playground::Playground;
 use rstest::rstest;
-use std::path::Path;
 
 #[test]
 fn moves_a_file() {
@@ -96,7 +95,7 @@ fn moves_the_directory_inside_directory_if_path_to_move_is_existing_directory()
 
         assert!(!original_dir.exists());
         assert!(expected.exists());
-        assert!(files_exist_at(vec!["jttxt"], expected))
+        assert!(files_exist_at(&["jttxt"], expected))
     })
 }
 
@@ -125,7 +124,7 @@ fn moves_using_path_with_wildcard() {
         nu!(cwd: work_dir, "mv ../originals/*.ini ../expected");
 
         assert!(files_exist_at(
-            vec!["yehuda.ini", "jt.ini", "sample.ini", "andres.ini",],
+            &["yehuda.ini", "jt.ini", "sample.ini", "andres.ini",],
             expected
         ));
     })
@@ -152,7 +151,7 @@ fn moves_using_a_glob() {
 
         assert!(meal_dir.exists());
         assert!(files_exist_at(
-            vec!["arepa.txt", "empanada.txt", "taquiza.txt",],
+            &["arepa.txt", "empanada.txt", "taquiza.txt",],
             expected
         ));
     })
@@ -184,7 +183,7 @@ fn moves_a_directory_with_files() {
         assert!(!original_dir.exists());
         assert!(expected_dir.exists());
         assert!(files_exist_at(
-            vec![
+            &[
                 "car/car1.txt",
                 "car/car2.txt",
                 "bicycle/bicycle1.txt",
@@ -322,7 +321,7 @@ fn move_files_using_glob_two_parents_up_using_multiple_dots() {
             "#
         );
 
-        let files = vec![
+        let files = &[
             "yehuda.yaml",
             "jtjson",
             "andres.xml",
@@ -333,7 +332,7 @@ fn move_files_using_glob_two_parents_up_using_multiple_dots() {
         let original_dir = dirs.test().join("foo/bar");
         let destination_dir = dirs.test();
 
-        assert!(files_exist_at(files.clone(), destination_dir));
+        assert!(files_exist_at(files, destination_dir));
         assert!(!files_exist_at(files, original_dir))
     })
 }
@@ -440,10 +439,7 @@ fn mv_change_case_of_directory() {
         );
 
         #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-        assert!(files_exist_at(
-            vec!["somefile.txt",],
-            dirs.test().join(new_dir)
-        ));
+        assert!(files_exist_at(&["somefile.txt"], dirs.test().join(new_dir)));
 
         #[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
         _actual.err.contains("to a subdirectory of itself");
@@ -647,10 +643,10 @@ fn test_cp_inside_glob_metachars_dir() {
 
         assert!(actual.err.is_empty());
         assert!(!files_exist_at(
-            vec!["test_file.txt"],
+            &["test_file.txt"],
             dirs.test().join(sub_dir)
         ));
-        assert!(files_exist_at(vec!["test_file.txt"], dirs.test()));
+        assert!(files_exist_at(&["test_file.txt"], dirs.test()));
     });
 }
 
@@ -667,19 +663,13 @@ fn mv_with_tilde() {
         // mv file
         let actual = nu!(cwd: dirs.test(), "mv '~tilde/f1.txt' ./");
         assert!(actual.err.is_empty());
-        assert!(!files_exist_at(
-            vec![Path::new("f1.txt")],
-            dirs.test().join("~tilde")
-        ));
-        assert!(files_exist_at(vec![Path::new("f1.txt")], dirs.test()));
+        assert!(!files_exist_at(&["f1.txt"], dirs.test().join("~tilde")));
+        assert!(files_exist_at(&["f1.txt"], dirs.test()));
 
         // pass variable
         let actual = nu!(cwd: dirs.test(), "let f = '~tilde/f2.txt'; mv $f ./");
         assert!(actual.err.is_empty());
-        assert!(!files_exist_at(
-            vec![Path::new("f2.txt")],
-            dirs.test().join("~tilde")
-        ));
-        assert!(files_exist_at(vec![Path::new("f1.txt")], dirs.test()));
+        assert!(!files_exist_at(&["f2.txt"], dirs.test().join("~tilde")));
+        assert!(files_exist_at(&["f1.txt"], dirs.test()));
     })
 }
diff --git a/crates/nu-command/tests/commands/path/expand.rs b/crates/nu-command/tests/commands/path/expand.rs
index 71f2e03284..4c18c5fd4e 100644
--- a/crates/nu-command/tests/commands/path/expand.rs
+++ b/crates/nu-command/tests/commands/path/expand.rs
@@ -1,9 +1,8 @@
+use nu_path::Path;
 use nu_test_support::fs::Stub::EmptyFile;
 use nu_test_support::playground::Playground;
 use nu_test_support::{nu, pipeline};
 
-use std::path::PathBuf;
-
 #[test]
 fn expands_path_with_dot() {
     Playground::setup("path_expand_1", |dirs, sandbox| {
@@ -18,7 +17,7 @@ fn expands_path_with_dot() {
         ));
 
         let expected = dirs.test.join("menu").join("spam.txt");
-        assert_eq!(PathBuf::from(actual.out), expected);
+        assert_eq!(Path::new(&actual.out), expected);
     })
 }
 
@@ -38,7 +37,7 @@ fn expands_path_without_follow_symlink() {
         ));
 
         let expected = dirs.test.join("menu").join("spam_link.ln");
-        assert_eq!(PathBuf::from(actual.out), expected);
+        assert_eq!(Path::new(&actual.out), expected);
     })
 }
 
@@ -56,7 +55,7 @@ fn expands_path_with_double_dot() {
         ));
 
         let expected = dirs.test.join("menu").join("spam.txt");
-        assert_eq!(PathBuf::from(actual.out), expected);
+        assert_eq!(Path::new(&actual.out), expected);
     })
 }
 
@@ -74,7 +73,7 @@ fn const_path_expand() {
         ));
 
         let expected = dirs.test.join("menu").join("spam.txt");
-        assert_eq!(PathBuf::from(actual.out), expected);
+        assert_eq!(Path::new(&actual.out), expected);
     })
 }
 
@@ -92,7 +91,7 @@ mod windows {
                 "#
             ));
 
-            assert!(!PathBuf::from(actual.out).starts_with("~"));
+            assert!(!Path::new(&actual.out).starts_with("~"));
         })
     }
 
@@ -106,7 +105,7 @@ mod windows {
                 "#
             ));
 
-            assert!(!PathBuf::from(actual.out).starts_with("~"));
+            assert!(!Path::new(&actual.out).starts_with("~"));
         })
     }
 
@@ -131,7 +130,7 @@ mod windows {
             ));
 
             let expected = dirs.test.join("menu").join("spam_link.ln");
-            assert_eq!(PathBuf::from(actual.out), expected);
+            assert_eq!(Path::new(&actual.out), expected);
         })
     }
 }
diff --git a/crates/nu-command/tests/commands/rm.rs b/crates/nu-command/tests/commands/rm.rs
index fbea7edaf1..fdd7258bd4 100644
--- a/crates/nu-command/tests/commands/rm.rs
+++ b/crates/nu-command/tests/commands/rm.rs
@@ -6,7 +6,6 @@ use nu_test_support::playground::Playground;
 use rstest::rstest;
 #[cfg(not(windows))]
 use std::fs;
-use std::path::Path;
 
 #[test]
 fn removes_a_file() {
@@ -50,7 +49,7 @@ fn removes_files_with_wildcard() {
         );
 
         assert!(!files_exist_at(
-            vec![
+            &[
                 "src/parser/parse/token_tree.rs",
                 "src/parser/hir/baseline_parse.rs",
                 "src/parser/hir/baseline_parse_tokens.rs"
@@ -91,7 +90,7 @@ fn removes_deeply_nested_directories_with_wildcard_and_recursive_flag() {
         );
 
         assert!(!files_exist_at(
-            vec!["src/parser/parse", "src/parser/hir"],
+            &["src/parser/parse", "src/parser/hir"],
             dirs.test()
         ));
     })
@@ -277,7 +276,7 @@ fn remove_files_from_two_parents_up_using_multiple_dots_and_glob() {
         );
 
         assert!(!files_exist_at(
-            vec!["yehuda.txt", "jttxt", "kevin.txt"],
+            &["yehuda.txt", "jttxt", "kevin.txt"],
             dirs.test()
         ));
     })
@@ -305,8 +304,8 @@ fn rm_wildcard_keeps_dotfiles() {
             r#"rm *"#
         );
 
-        assert!(!files_exist_at(vec!["foo"], dirs.test()));
-        assert!(files_exist_at(vec![".bar"], dirs.test()));
+        assert!(!files_exist_at(&["foo"], dirs.test()));
+        assert!(files_exist_at(&[".bar"], dirs.test()));
     })
 }
 
@@ -320,8 +319,8 @@ fn rm_wildcard_leading_dot_deletes_dotfiles() {
             "rm .*"
         );
 
-        assert!(files_exist_at(vec!["foo"], dirs.test()));
-        assert!(!files_exist_at(vec![".bar"], dirs.test()));
+        assert!(files_exist_at(&["foo"], dirs.test()));
+        assert!(!files_exist_at(&[".bar"], dirs.test()));
     })
 }
 
@@ -453,7 +452,7 @@ fn rm_prints_filenames_on_error() {
         // This rm is expected to fail, and stderr output indicating so is also expected.
         let actual = nu!(cwd: test_dir, "rm test*.txt");
 
-        assert!(files_exist_at(file_names.clone(), test_dir));
+        assert!(files_exist_at(&file_names, test_dir));
         for file_name in file_names {
             let path = test_dir.join(file_name);
             let substr = format!("Could not delete {}", path.to_string_lossy());
@@ -482,7 +481,7 @@ fn rm_files_inside_glob_metachars_dir() {
 
         assert!(actual.err.is_empty());
         assert!(!files_exist_at(
-            vec!["test_file.txt"],
+            &["test_file.txt"],
             dirs.test().join(sub_dir)
         ));
     });
@@ -556,22 +555,16 @@ fn rm_with_tilde() {
 
         let actual = nu!(cwd: dirs.test(), "rm '~tilde/f1.txt'");
         assert!(actual.err.is_empty());
-        assert!(!files_exist_at(
-            vec![Path::new("f1.txt")],
-            dirs.test().join("~tilde")
-        ));
+        assert!(!files_exist_at(&["f1.txt"], dirs.test().join("~tilde")));
 
         // pass variable
         let actual = nu!(cwd: dirs.test(), "let f = '~tilde/f2.txt'; rm $f");
         assert!(actual.err.is_empty());
-        assert!(!files_exist_at(
-            vec![Path::new("f2.txt")],
-            dirs.test().join("~tilde")
-        ));
+        assert!(!files_exist_at(&["f2.txt"], dirs.test().join("~tilde")));
 
         // remove directory
         let actual = nu!(cwd: dirs.test(), "let f = '~tilde'; rm -r $f");
         assert!(actual.err.is_empty());
-        assert!(!files_exist_at(vec![Path::new("~tilde")], dirs.test()));
+        assert!(!files_exist_at(&["~tilde"], dirs.test()));
     })
 }
diff --git a/crates/nu-command/tests/commands/touch.rs b/crates/nu-command/tests/commands/touch.rs
index 5f454cdec4..10ae299a0f 100644
--- a/crates/nu-command/tests/commands/touch.rs
+++ b/crates/nu-command/tests/commands/touch.rs
@@ -2,7 +2,6 @@ use chrono::{DateTime, Local};
 use nu_test_support::fs::{files_exist_at, Stub};
 use nu_test_support::nu;
 use nu_test_support::playground::Playground;
-use std::path::Path;
 
 // Use 1 instead of 0 because 0 has a special meaning in Windows
 const TIME_ONE: filetime::FileTime = filetime::FileTime::from_unix_time(1, 0);
@@ -494,12 +493,12 @@ fn create_a_file_with_tilde() {
     Playground::setup("touch with tilde", |dirs, _| {
         let actual = nu!(cwd: dirs.test(), "touch '~tilde'");
         assert!(actual.err.is_empty());
-        assert!(files_exist_at(vec![Path::new("~tilde")], dirs.test()));
+        assert!(files_exist_at(&["~tilde"], dirs.test()));
 
         // pass variable
         let actual = nu!(cwd: dirs.test(), "let f = '~tilde2'; touch $f");
         assert!(actual.err.is_empty());
-        assert!(files_exist_at(vec![Path::new("~tilde2")], dirs.test()));
+        assert!(files_exist_at(&["~tilde2"], dirs.test()));
     })
 }
 
diff --git a/crates/nu-command/tests/commands/ucp.rs b/crates/nu-command/tests/commands/ucp.rs
index 2c2b30f252..eb2363e68c 100644
--- a/crates/nu-command/tests/commands/ucp.rs
+++ b/crates/nu-command/tests/commands/ucp.rs
@@ -7,7 +7,6 @@ use nu_test_support::nu;
 use nu_test_support::playground::Playground;
 
 use rstest::rstest;
-use std::path::Path;
 
 #[cfg(not(target_os = "windows"))]
 const PATH_SEPARATOR: &str = "/";
@@ -131,11 +130,7 @@ fn copies_the_directory_inside_directory_if_path_to_copy_is_directory_and_with_r
 
         assert!(expected_dir.exists());
         assert!(files_exist_at(
-            vec![
-                Path::new("yehuda.txt"),
-                Path::new("jttxt"),
-                Path::new("andres.txt")
-            ],
+            &["yehuda.txt", "jttxt", "andres.txt"],
             &expected_dir
         ));
     })
@@ -181,15 +176,15 @@ fn deep_copies_with_recursive_flag_impl(progress: bool) {
 
         assert!(expected_dir.exists());
         assert!(files_exist_at(
-            vec![Path::new("errors.txt"), Path::new("multishells.txt")],
+            &["errors.txt", "multishells.txt"],
             jts_expected_copied_dir
         ));
         assert!(files_exist_at(
-            vec![Path::new("coverage.txt"), Path::new("commands.txt")],
+            &["coverage.txt", "commands.txt"],
             andres_expected_copied_dir
         ));
         assert!(files_exist_at(
-            vec![Path::new("defer-evaluation.txt")],
+            &["defer-evaluation.txt"],
             yehudas_expected_copied_dir
         ));
     })
@@ -220,13 +215,13 @@ fn copies_using_path_with_wildcard_impl(progress: bool) {
         );
 
         assert!(files_exist_at(
-            vec![
-                Path::new("caco3_plastics.csv"),
-                Path::new("cargo_sample.toml"),
-                Path::new("jt.xml"),
-                Path::new("sample.ini"),
-                Path::new("sgml_description.json"),
-                Path::new("utf16.ini"),
+            &[
+                "caco3_plastics.csv",
+                "cargo_sample.toml",
+                "jt.xml",
+                "sample.ini",
+                "sgml_description.json",
+                "utf16.ini",
             ],
             dirs.test()
         ));
@@ -265,13 +260,13 @@ fn copies_using_a_glob_impl(progress: bool) {
         );
 
         assert!(files_exist_at(
-            vec![
-                Path::new("caco3_plastics.csv"),
-                Path::new("cargo_sample.toml"),
-                Path::new("jt.xml"),
-                Path::new("sample.ini"),
-                Path::new("sgml_description.json"),
-                Path::new("utf16.ini"),
+            &[
+                "caco3_plastics.csv",
+                "cargo_sample.toml",
+                "jt.xml",
+                "sample.ini",
+                "sgml_description.json",
+                "utf16.ini",
             ],
             dirs.test()
         ));
@@ -341,7 +336,7 @@ fn copy_files_using_glob_two_parents_up_using_multiple_dots_imp(progress: bool)
         );
 
         assert!(files_exist_at(
-            vec![
+            &[
                 "yehuda.yaml",
                 "jtjson",
                 "andres.xml",
@@ -377,7 +372,7 @@ fn copy_file_and_dir_from_two_parents_up_using_multiple_dots_to_current_dir_recu
 
         let expected = dirs.test().join("foo/bar");
 
-        assert!(files_exist_at(vec!["hello_there", "hello_again"], expected));
+        assert!(files_exist_at(&["hello_there", "hello_again"], expected));
     })
 }
 
@@ -428,7 +423,7 @@ fn copy_dir_contains_symlink_ignored_impl(progress: bool) {
 
         // check hello_there exists inside `tmp_dir_2`, and `dangle_symlink` don't exists inside `tmp_dir_2`.
         let expected = sandbox.cwd().join("tmp_dir_2");
-        assert!(files_exist_at(vec!["hello_there"], expected));
+        assert!(files_exist_at(&["hello_there"], expected));
         // GNU cp will copy the broken symlink, so following their behavior
         // thus commenting out below
         // let path = expected.join("dangle_symlink");
@@ -461,7 +456,7 @@ fn copy_dir_contains_symlink_impl(progress: bool) {
 
         // check hello_there exists inside `tmp_dir_2`, and `dangle_symlink` also exists inside `tmp_dir_2`.
         let expected = sandbox.cwd().join("tmp_dir_2");
-        assert!(files_exist_at(vec!["hello_there"], expected.clone()));
+        assert!(files_exist_at(&["hello_there"], expected.clone()));
         let path = expected.join("dangle_symlink");
         assert!(path.is_symlink());
     });
@@ -1151,10 +1146,10 @@ fn test_cp_inside_glob_metachars_dir() {
 
         assert!(actual.err.is_empty());
         assert!(files_exist_at(
-            vec!["test_file.txt"],
+            &["test_file.txt"],
             dirs.test().join(sub_dir)
         ));
-        assert!(files_exist_at(vec!["test_file.txt"], dirs.test()));
+        assert!(files_exist_at(&["test_file.txt"], dirs.test()));
     });
 }
 
@@ -1167,10 +1162,7 @@ fn test_cp_to_customized_home_directory() {
         let actual = nu!(cwd: dirs.test(), "mkdir test; cp test_file.txt ~/test/");
 
         assert!(actual.err.is_empty());
-        assert!(files_exist_at(
-            vec!["test_file.txt"],
-            dirs.test().join("test")
-        ));
+        assert!(files_exist_at(&["test_file.txt"], dirs.test().join("test")));
     })
 }
 
@@ -1193,20 +1185,14 @@ fn cp_with_tilde() {
         // cp file
         let actual = nu!(cwd: dirs.test(), "cp '~tilde/f1.txt' ./");
         assert!(actual.err.is_empty());
-        assert!(files_exist_at(
-            vec![Path::new("f1.txt")],
-            dirs.test().join("~tilde")
-        ));
-        assert!(files_exist_at(vec![Path::new("f1.txt")], dirs.test()));
+        assert!(files_exist_at(&["f1.txt"], dirs.test().join("~tilde")));
+        assert!(files_exist_at(&["f1.txt"], dirs.test()));
 
         // pass variable
         let actual = nu!(cwd: dirs.test(), "let f = '~tilde/f2.txt'; cp $f ./");
         assert!(actual.err.is_empty());
-        assert!(files_exist_at(
-            vec![Path::new("f2.txt")],
-            dirs.test().join("~tilde")
-        ));
-        assert!(files_exist_at(vec![Path::new("f1.txt")], dirs.test()));
+        assert!(files_exist_at(&["f2.txt"], dirs.test().join("~tilde")));
+        assert!(files_exist_at(&["f1.txt"], dirs.test()));
     })
 }
 
diff --git a/crates/nu-command/tests/commands/umkdir.rs b/crates/nu-command/tests/commands/umkdir.rs
index 3ca1b3bdfb..fdaaf4f721 100644
--- a/crates/nu-command/tests/commands/umkdir.rs
+++ b/crates/nu-command/tests/commands/umkdir.rs
@@ -1,7 +1,6 @@
 use nu_test_support::fs::files_exist_at;
 use nu_test_support::playground::Playground;
 use nu_test_support::{nu, pipeline};
-use std::path::Path;
 
 #[test]
 fn creates_directory() {
@@ -25,10 +24,7 @@ fn accepts_and_creates_directories() {
             "mkdir dir_1 dir_2 dir_3"
         );
 
-        assert!(files_exist_at(
-            vec![Path::new("dir_1"), Path::new("dir_2"), Path::new("dir_3")],
-            dirs.test()
-        ));
+        assert!(files_exist_at(&["dir_1", "dir_2", "dir_3"], dirs.test()));
     })
 }
 
@@ -70,10 +66,7 @@ fn print_created_paths() {
             pipeline("mkdir -v dir_1 dir_2 dir_3")
         );
 
-        assert!(files_exist_at(
-            vec![Path::new("dir_1"), Path::new("dir_2"), Path::new("dir_3")],
-            dirs.test()
-        ));
+        assert!(files_exist_at(&["dir_1", "dir_2", "dir_3"], dirs.test()));
 
         assert!(actual.out.contains("dir_1"));
         assert!(actual.out.contains("dir_2"));
@@ -165,11 +158,11 @@ fn mkdir_with_tilde() {
     Playground::setup("mkdir with tilde", |dirs, _| {
         let actual = nu!(cwd: dirs.test(), "mkdir '~tilde'");
         assert!(actual.err.is_empty());
-        assert!(files_exist_at(vec![Path::new("~tilde")], dirs.test()));
+        assert!(files_exist_at(&["~tilde"], dirs.test()));
 
         // pass variable
         let actual = nu!(cwd: dirs.test(), "let f = '~tilde2'; mkdir $f");
         assert!(actual.err.is_empty());
-        assert!(files_exist_at(vec![Path::new("~tilde2")], dirs.test()));
+        assert!(files_exist_at(&["~tilde2"], dirs.test()));
     })
 }
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index 7c7cfb9bb5..bd049bbb2d 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -1169,20 +1169,25 @@ mod test_cwd {
         engine::{EngineState, Stack},
         Span, Value,
     };
-    use nu_path::assert_path_eq;
-    use std::path::Path;
+    use nu_path::{assert_path_eq, AbsolutePath, Path};
     use tempfile::{NamedTempFile, TempDir};
 
     /// Creates 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)
@@ -1195,10 +1200,7 @@ mod test_cwd {
         let mut engine_state = EngineState::new();
         engine_state.add_env_var(
             "PWD".into(),
-            Value::String {
-                val: path.as_ref().to_string_lossy().to_string(),
-                internal_span: Span::unknown(),
-            },
+            Value::test_string(path.as_ref().to_str().unwrap()),
         );
         engine_state
     }
@@ -1208,10 +1210,7 @@ mod test_cwd {
         let mut stack = Stack::new();
         stack.add_env_var(
             "PWD".into(),
-            Value::String {
-                val: path.as_ref().to_string_lossy().to_string(),
-                internal_span: Span::unknown(),
-            },
+            Value::test_string(path.as_ref().to_str().unwrap()),
         );
         stack
     }
@@ -1289,9 +1288,12 @@ mod test_cwd {
     #[test]
     fn pwd_points_to_symlink_to_file() {
         let file = NamedTempFile::new().unwrap();
+        let temp_file = AbsolutePath::try_new(file.path()).unwrap();
         let dir = TempDir::new().unwrap();
-        let link = dir.path().join("link");
-        symlink(file.path(), &link).unwrap();
+        let temp = AbsolutePath::try_new(dir.path()).unwrap();
+
+        let link = temp.join("link");
+        symlink(temp_file, &link).unwrap();
         let engine_state = engine_state_with_pwd(&link);
 
         engine_state.cwd(None).unwrap_err();
@@ -1300,8 +1302,10 @@ mod test_cwd {
     #[test]
     fn pwd_points_to_symlink_to_directory() {
         let dir = TempDir::new().unwrap();
-        let link = dir.path().join("link");
-        symlink(dir.path(), &link).unwrap();
+        let temp = AbsolutePath::try_new(dir.path()).unwrap();
+
+        let link = temp.join("link");
+        symlink(temp, &link).unwrap();
         let engine_state = engine_state_with_pwd(&link);
 
         let cwd = engine_state.cwd(None).unwrap();
@@ -1311,10 +1315,15 @@ mod test_cwd {
     #[test]
     fn pwd_points_to_broken_symlink() {
         let dir = TempDir::new().unwrap();
-        let link = dir.path().join("link");
-        symlink(TempDir::new().unwrap().path(), &link).unwrap();
+        let temp = AbsolutePath::try_new(dir.path()).unwrap();
+        let other_dir = TempDir::new().unwrap();
+        let other_temp = AbsolutePath::try_new(other_dir.path()).unwrap();
+
+        let link = temp.join("link");
+        symlink(other_temp, &link).unwrap();
         let engine_state = engine_state_with_pwd(&link);
 
+        drop(other_dir);
         engine_state.cwd(None).unwrap_err();
     }
 
@@ -1357,12 +1366,14 @@ mod test_cwd {
 
     #[test]
     fn stack_pwd_points_to_normal_directory_with_symlink_components() {
-        // `/tmp/dir/link` points to `/tmp/dir`, then we set PWD to `/tmp/dir/link/foo`
         let dir = TempDir::new().unwrap();
-        let link = dir.path().join("link");
-        symlink(dir.path(), &link).unwrap();
+        let temp = AbsolutePath::try_new(dir.path()).unwrap();
+
+        // `/tmp/dir/link` points to `/tmp/dir`, then we set PWD to `/tmp/dir/link/foo`
+        let link = temp.join("link");
+        symlink(temp, &link).unwrap();
         let foo = link.join("foo");
-        std::fs::create_dir(dir.path().join("foo")).unwrap();
+        std::fs::create_dir(temp.join("foo")).unwrap();
         let engine_state = EngineState::new();
         let stack = stack_with_pwd(&foo);
 
diff --git a/crates/nu-test-support/src/fs.rs b/crates/nu-test-support/src/fs.rs
index 230e5eafe3..d591a7de18 100644
--- a/crates/nu-test-support/src/fs.rs
+++ b/crates/nu-test-support/src/fs.rs
@@ -35,7 +35,7 @@ pub fn line_ending() -> String {
     }
 }
 
-pub fn files_exist_at(files: Vec<impl AsRef<Path>>, path: impl AsRef<AbsolutePath>) -> bool {
+pub fn files_exist_at(files: &[impl AsRef<Path>], path: impl AsRef<AbsolutePath>) -> bool {
     let path = path.as_ref();
     files.iter().all(|f| path.join(f.as_ref()).exists())
 }
diff --git a/tests/repl/test_config_path.rs b/tests/repl/test_config_path.rs
index b66633c879..6bee043765 100644
--- a/tests/repl/test_config_path.rs
+++ b/tests/repl/test_config_path.rs
@@ -1,9 +1,8 @@
-use nu_path::canonicalize_with;
+use nu_path::{AbsolutePath, AbsolutePathBuf, Path};
 use nu_test_support::nu;
 use nu_test_support::playground::{Executable, Playground};
 use pretty_assertions::assert_eq;
 use std::fs::{self, File};
-use std::path::{Path, PathBuf};
 
 #[cfg(not(target_os = "windows"))]
 fn adjust_canonicalization<P: AsRef<Path>>(p: P) -> String {
@@ -24,21 +23,26 @@ fn adjust_canonicalization<P: AsRef<Path>>(p: P) -> String {
 /// Make the config directory a symlink that points to a temporary folder, and also makes
 /// the nushell directory inside a symlink.
 /// Returns the path to the `nushell` config folder inside, via the symlink.
-fn setup_fake_config(playground: &mut Playground) -> PathBuf {
-    let config_dir = "config_real";
+fn setup_fake_config(playground: &mut Playground) -> AbsolutePathBuf {
+    let config_real = "config_real";
     let config_link = "config_link";
     let nushell_real = "nushell_real";
-    let nushell_config_dir = Path::new(config_dir).join("nushell").display().to_string();
+    let nushell_link = Path::new(config_real)
+        .join("nushell")
+        .into_os_string()
+        .into_string()
+        .unwrap();
+
+    let config_home = playground.cwd().join(config_link);
+
     playground.mkdir(nushell_real);
-    playground.mkdir(config_dir);
-    playground.symlink(nushell_real, &nushell_config_dir);
-    playground.symlink(config_dir, config_link);
-    playground.with_env(
-        "XDG_CONFIG_HOME",
-        &playground.cwd().join(config_link).display().to_string(),
-    );
-    let path = Path::new(config_link).join("nushell");
-    canonicalize_with(&path, playground.cwd()).unwrap_or(path)
+    playground.mkdir(config_real);
+    playground.symlink(nushell_real, &nushell_link);
+    playground.symlink(config_real, config_link);
+    playground.with_env("XDG_CONFIG_HOME", config_home.to_str().unwrap());
+
+    let path = config_home.join("nushell");
+    path.canonicalize().map(Into::into).unwrap_or(path)
 }
 
 fn run(playground: &mut Playground, command: &str) -> String {
@@ -79,47 +83,55 @@ fn run_interactive_stderr(xdg_config_home: impl AsRef<Path>) -> String {
         .to_string();
 }
 
-fn test_config_path_helper(playground: &mut Playground, config_dir_nushell: PathBuf) {
+fn test_config_path_helper(
+    playground: &mut Playground,
+    config_dir_nushell: impl AsRef<AbsolutePath>,
+) {
+    let config_dir_nushell = config_dir_nushell.as_ref();
+
     // Create the config dir folder structure if it does not already exist
     if !config_dir_nushell.exists() {
-        let _ = fs::create_dir_all(&config_dir_nushell);
+        let _ = fs::create_dir_all(config_dir_nushell);
     }
 
-    let config_dir_nushell =
-        std::fs::canonicalize(&config_dir_nushell).expect("canonicalize config dir failed");
+    let config_dir_nushell = config_dir_nushell
+        .canonicalize()
+        .expect("canonicalize config dir failed");
     let actual = run(playground, "$nu.default-config-dir");
     assert_eq!(actual, adjust_canonicalization(&config_dir_nushell));
 
     let config_path = config_dir_nushell.join("config.nu");
     // We use canonicalize here in case the config or env is symlinked since $nu.config-path is returning the canonicalized path in #8653
     let canon_config_path =
-        adjust_canonicalization(std::fs::canonicalize(&config_path).unwrap_or(config_path));
+        adjust_canonicalization(std::fs::canonicalize(&config_path).unwrap_or(config_path.into()));
     let actual = run(playground, "$nu.config-path");
     assert_eq!(actual, canon_config_path);
 
     let env_path = config_dir_nushell.join("env.nu");
     let canon_env_path =
-        adjust_canonicalization(std::fs::canonicalize(&env_path).unwrap_or(env_path));
+        adjust_canonicalization(std::fs::canonicalize(&env_path).unwrap_or(env_path.into()));
     let actual = run(playground, "$nu.env-path");
     assert_eq!(actual, canon_env_path);
 
     let history_path = config_dir_nushell.join("history.txt");
-    let canon_history_path =
-        adjust_canonicalization(std::fs::canonicalize(&history_path).unwrap_or(history_path));
+    let canon_history_path = adjust_canonicalization(
+        std::fs::canonicalize(&history_path).unwrap_or(history_path.into()),
+    );
     let actual = run(playground, "$nu.history-path");
     assert_eq!(actual, canon_history_path);
 
     let login_path = config_dir_nushell.join("login.nu");
     let canon_login_path =
-        adjust_canonicalization(std::fs::canonicalize(&login_path).unwrap_or(login_path));
+        adjust_canonicalization(std::fs::canonicalize(&login_path).unwrap_or(login_path.into()));
     let actual = run(playground, "$nu.loginshell-path");
     assert_eq!(actual, canon_login_path);
 
     #[cfg(feature = "plugin")]
     {
         let plugin_path = config_dir_nushell.join("plugin.msgpackz");
-        let canon_plugin_path =
-            adjust_canonicalization(std::fs::canonicalize(&plugin_path).unwrap_or(plugin_path));
+        let canon_plugin_path = adjust_canonicalization(
+            std::fs::canonicalize(&plugin_path).unwrap_or(plugin_path.into()),
+        );
         let actual = run(playground, "$nu.plugin-path");
         assert_eq!(actual, canon_plugin_path);
     }
@@ -129,7 +141,7 @@ fn test_config_path_helper(playground: &mut Playground, config_dir_nushell: Path
 fn test_default_config_path() {
     Playground::setup("default_config_path", |_, playground| {
         let config_dir = nu_path::config_dir().expect("Could not get config directory");
-        test_config_path_helper(playground, config_dir.join("nushell").into());
+        test_config_path_helper(playground, config_dir.join("nushell"));
     });
 }
 
@@ -152,8 +164,9 @@ fn test_default_symlink_config_path_broken_symlink_config_files() {
         |_, playground| {
             let fake_config_dir_nushell = setup_fake_config(playground);
 
-            let fake_dir = PathBuf::from("fake");
-            playground.mkdir(&fake_dir.display().to_string());
+            let fake_dir = "fake";
+            playground.mkdir(fake_dir);
+            let fake_dir = Path::new(fake_dir);
 
             for config_file in [
                 "config.nu",
@@ -172,7 +185,7 @@ fn test_default_symlink_config_path_broken_symlink_config_files() {
             // Windows doesn't allow creating a symlink without the file existing,
             // so we first create original files for the symlinks, then delete them
             // to break the symlinks
-            std::fs::remove_dir_all(playground.cwd().join(&fake_dir)).unwrap();
+            std::fs::remove_dir_all(playground.cwd().join(fake_dir)).unwrap();
 
             test_config_path_helper(playground, fake_config_dir_nushell);
         },

From 20b53067cd3f8da2af930370659172e11db81161 Mon Sep 17 00:00:00 2001
From: Embers-of-the-Fire <stellarishs@163.com>
Date: Sat, 3 Aug 2024 16:55:35 +0800
Subject: [PATCH 0304/1072] Fix overflow table display in command documentation
 (#13526)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

Check and set table width beforehand.

Closes #13520.

# User-Facing Changes
Before:
```plain
❯ help net cmd1
network

Usage:
  > net cmd1

Flags:
  -h, --help - Display the help message for this command

Input/output types:
  ╭───┬─────────┬─────────────────────────────────────────────────────────╮
  │ # │  input  │                         output                          │
  ├───┼─────────┼─────────────────────────────────────────────────────────┤
  │ 0 │ nothing │ table<name: string, description: string, mac: string,   │
  │   │         │ ips: table<type: string, addr: string, prefix: int>,
 │
  │   │         │ flags: record<is_up: bool, is_broadcast: bool,
 │
  │   │         │ is_loopback: bool, is_point_to_point: bool,
 │
  │   │         │ is_multicast: bool>>
 │
  ╰───┴─────────┴─────────────────────────────────────────────────────────╯
```

After:
```plain
❯ help net cmd1
network

Usage:
  > net cmd1

Flags:
  -h, --help - Display the help message for this command

Input/output types:
  ╭───┬─────────┬───────────────────────────────────────────────────────╮
  │ # │  input  │                        output                         │
  ├───┼─────────┼───────────────────────────────────────────────────────┤
  │ 0 │ nothing │ table<name: string, description: string, mac: string, │
  │   │         │  ips: table<type: string, addr: string, prefix: int>, │
  │   │         │  flags: record<is_up: bool, is_broadcast: bool,       │
  │   │         │ is_loopback: bool, is_point_to_point: bool,           │
  │   │         │ is_multicast: bool>>                                  │
  ╰───┴─────────┴───────────────────────────────────────────────────────╯
```

# Tests + Formatting

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


# After Submitting
- [x] Bug fix, no doc update.
---
 Cargo.lock                            |  1 +
 crates/nu-engine/Cargo.toml           |  3 ++-
 crates/nu-engine/src/documentation.rs | 35 ++++++++++++++++++++++++++-
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1c0fd9a954..f4495d6bfa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3157,6 +3157,7 @@ dependencies = [
  "nu-path",
  "nu-protocol",
  "nu-utils",
+ "terminal_size",
 ]
 
 [[package]]
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index be544265fe..2324eb5676 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -16,6 +16,7 @@ nu-path = { path = "../nu-path", version = "0.96.2" }
 nu-glob = { path = "../nu-glob", version = "0.96.2" }
 nu-utils = { path = "../nu-utils", version = "0.96.2" }
 log = { workspace = true }
+terminal_size = { workspace = true }
 
 [features]
-plugin = []
\ No newline at end of file
+plugin = []
diff --git a/crates/nu-engine/src/documentation.rs b/crates/nu-engine/src/documentation.rs
index a0dee3d343..0a7d742d57 100644
--- a/crates/nu-engine/src/documentation.rs
+++ b/crates/nu-engine/src/documentation.rs
@@ -7,6 +7,7 @@ use nu_protocol::{
     Spanned, SyntaxShape, Type, Value,
 };
 use std::{collections::HashMap, fmt::Write};
+use terminal_size::{Height, Width};
 
 pub fn get_full_help(
     command: &dyn Command,
@@ -234,6 +235,14 @@ fn get_documentation(
         }
     }
 
+    fn get_term_width() -> usize {
+        if let Some((Width(w), Height(_))) = terminal_size::terminal_size() {
+            w as usize
+        } else {
+            80
+        }
+    }
+
     if !is_parser_keyword && !sig.input_output_types.is_empty() {
         if let Some(decl_id) = engine_state.find_decl(b"table", &[]) {
             // FIXME: we may want to make this the span of the help command in the future
@@ -256,7 +265,18 @@ fn get_documentation(
                 &Call {
                     decl_id,
                     head: span,
-                    arguments: vec![],
+                    arguments: vec![Argument::Named((
+                        Spanned {
+                            item: "width".to_string(),
+                            span: Span::unknown(),
+                        },
+                        None,
+                        Some(Expression::new_unknown(
+                            Expr::Int(get_term_width() as i64 - 2), // padding, see below
+                            Span::unknown(),
+                            Type::Int,
+                        )),
+                    ))],
                     parser_info: HashMap::new(),
                 },
                 PipelineData::Value(Value::list(vals, span), None),
@@ -334,6 +354,19 @@ fn get_documentation(
                     None,
                 ))
             }
+            table_call.add_named((
+                Spanned {
+                    item: "expand".to_string(),
+                    span: Span::unknown(),
+                },
+                None,
+                Some(Expression::new_unknown(
+                    Expr::Int(get_term_width() as i64 - 2),
+                    Span::unknown(),
+                    Type::Int,
+                )),
+            ));
+
             let table = engine_state
                 .find_decl("table".as_bytes(), &[])
                 .and_then(|decl_id| {

From 07e7c8c81f32481b44c0a55b9b0fc37c56f5fa16 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Sat, 3 Aug 2024 16:42:30 +0200
Subject: [PATCH 0305/1072] Fixup #13526 width flag for example (#13529)

# Description
This seems to be a minor copy paste mistake. cc @Embers-of-the-Fire

Followup to #13526

# User-Facing Changes
(-)

# Tests + Formatting
(-)
---
 crates/nu-engine/src/documentation.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-engine/src/documentation.rs b/crates/nu-engine/src/documentation.rs
index 0a7d742d57..ed432d848f 100644
--- a/crates/nu-engine/src/documentation.rs
+++ b/crates/nu-engine/src/documentation.rs
@@ -356,7 +356,7 @@ fn get_documentation(
             }
             table_call.add_named((
                 Spanned {
-                    item: "expand".to_string(),
+                    item: "width".to_string(),
                     span: Span::unknown(),
                 },
                 None,

From 802bfed173bd3adbcd8838cf0d1aa1ccb5c170da Mon Sep 17 00:00:00 2001
From: Himadri Bhattacharjee <107522312+lavafroth@users.noreply.github.com>
Date: Sun, 4 Aug 2024 16:36:10 +0530
Subject: [PATCH 0306/1072] feat: prefer exact match when completion mode is
 prefix (#13302)

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

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

Fixes #13204

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

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

When the completion mode is set to `prefix`, path completions explicitly
check for and prefer an exact match for a basename instead of longer or
similar names.

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

Exact match is inactive since there's no trailing slash

```
~/Public/nushell| ls crates/nu-plugin<tab>
crates/nu-plugin/               crates/nu-plugin-core/          crates/nu-plugin-engine/        crates/nu-plugin-protocol/
crates/nu-plugin-test-support/
```

Exact match is active

```
~/Public/nushell| ls crates/nu-plugin/<tab>
crates/nu-plugin/Cargo.toml  crates/nu-plugin/LICENSE     crates/nu-plugin/README.md   crates/nu-plugin/src/
```

Fuzzy matching persists its behavior

```
~/Public/nushell> $env.config.completions.algorithm = "fuzzy";
~/Public/nushell| ls crates/nu-plugin/car
crates/nu-cmd-plugin/Cargo.toml           crates/nu-plugin/Cargo.toml               crates/nu-plugin-core/Cargo.toml          crates/nu-plugin-engine/Cargo.toml
crates/nu-plugin-protocol/Cargo.toml      crates/nu-plugin-test-support/Cargo.toml
```

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 .../src/completions/completion_common.rs      | 38 ++++++++++++++++---
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/crates/nu-cli/src/completions/completion_common.rs b/crates/nu-cli/src/completions/completion_common.rs
index 5469ba1326..2b85f6091e 100644
--- a/crates/nu-cli/src/completions/completion_common.rs
+++ b/crates/nu-cli/src/completions/completion_common.rs
@@ -12,7 +12,7 @@ use nu_protocol::{
 use nu_utils::get_ls_colors;
 use std::path::{is_separator, Component, Path, PathBuf, MAIN_SEPARATOR as SEP};
 
-use super::SortBy;
+use super::{MatchAlgorithm, SortBy};
 
 #[derive(Clone, Default)]
 pub struct PathBuiltFromString {
@@ -20,12 +20,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![];
@@ -35,7 +44,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);
         }
     }
 
@@ -56,7 +65,7 @@ fn complete_rec(
         built.parts.push(entry_name.clone());
         built.isdir = entry_isdir;
 
-        if !dir || entry_isdir {
+        if !want_directory || entry_isdir {
             entries.push((entry_name, built));
         }
     }
@@ -68,12 +77,29 @@ fn complete_rec(
         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, dir, isdir));
+                        completions.extend(complete_rec(
+                            rest,
+                            &built,
+                            cwd,
+                            options,
+                            want_directory,
+                            isdir,
+                        ));
                     } else {
                         completions.push(built);
                     }
                 }
+                if entry_name.eq(base)
+                    && matches!(options.match_algorithm, MatchAlgorithm::Prefix)
+                    && isdir
+                {
+                    break;
+                }
             }
             None => {
                 completions.push(built);

From b974f8f7e36413cd91108876d9f83e8768e1d3f5 Mon Sep 17 00:00:00 2001
From: James Chen-Smith <james@chen-smith.net>
Date: Mon, 5 Aug 2024 06:20:14 -0500
Subject: [PATCH 0307/1072] Include empty table data cells in `query web`
 tables (#13538)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

Empty cells were being skipped, causing data to appear in the wrong
columns. By including the cells, data should appear in the correct
columns now. Fixes #10194.

Before:

```
$ [[a b c]; [1 null 3] [4 5 6]] | to html --partial | query web --as-table [a b c]
╭───┬───┬───┬─────────────────────╮
│ # │ a │ b │          c          │
├───┼───┼───┼─────────────────────┤
│ 0 │ 1 │ 3 │ Missing column: 'c' │
│ 1 │ 4 │ 5 │ 6                   │
╰───┴───┴───┴─────────────────────╯
```

After:

```
$ [[a b c]; [1 null 3] [4 5 6]] | to html --partial | query web --as-table [a b c]
╭───┬───┬───┬───╮
│ # │ a │ b │ c │
├───┼───┼───┼───┤
│ 0 │ 1 │   │ 3 │
│ 1 │ 4 │ 5 │ 6 │
╰───┴───┴───┴───╯
```

Co-authored-by: James Chen-Smith <jameschensmith@gmail.com>
---
 crates/nu_plugin_query/src/web_tables.rs | 54 +++++++++++++++++++++---
 1 file changed, 49 insertions(+), 5 deletions(-)

diff --git a/crates/nu_plugin_query/src/web_tables.rs b/crates/nu_plugin_query/src/web_tables.rs
index 1f69342a3e..fef8f6c37e 100644
--- a/crates/nu_plugin_query/src/web_tables.rs
+++ b/crates/nu_plugin_query/src/web_tables.rs
@@ -281,6 +281,10 @@ fn select_cells(
         let scraped = element.select(selector).map(cell_content);
         let mut dehtmlized: Vec<String> = Vec::new();
         for item in scraped {
+            if item.is_empty() {
+                dehtmlized.push(item);
+                continue;
+            }
             let frag = Html::parse_fragment(&item);
             for node in frag.tree {
                 if let scraper::node::Node::Text(text) = node {
@@ -411,6 +415,7 @@ mod tests {
     <tr><td>John</td><td>20</td></tr>
     <tr><td>May</td><td>30</td><td>foo</td></tr>
     <tr></tr>
+    <tr><td></td><td></td><td></td></tr>
     <tr><td>a</td><td>b</td><td>c</td><td>d</td></tr>
 </table>
 "#;
@@ -425,6 +430,7 @@ mod tests {
             <tr><td>John</td><td>20</td></tr>
             <tr><td>May</td><td>30</td><td>foo</td></tr>
             <tr></tr>
+            <tr><td></td><td></td><td></td></tr>
             <tr><td>a</td><td>b</td><td>c</td><td>d</td></tr>
         </table>
         <table>
@@ -432,6 +438,7 @@ mod tests {
             <tr><td>Carpenter</td><td>Single</td></tr>
             <tr><td>Mechanic</td><td>Married</td><td>bar</td></tr>
             <tr></tr>
+            <tr><td></td><td></td><td></td></tr>
             <tr><td>e</td><td>f</td><td>g</td><td>h</td></tr>
         </table>
     </body>
@@ -808,7 +815,7 @@ mod tests {
         assert_eq!(2, WebTable::find_first(TABLE_TD_TD).unwrap().iter().count());
         assert_eq!(1, WebTable::find_first(TABLE_TH_TH).unwrap().iter().count());
         assert_eq!(
-            4,
+            5,
             WebTable::find_first(TABLE_COMPLEX).unwrap().iter().count()
         );
     }
@@ -823,7 +830,7 @@ mod tests {
 
         let table = WebTable::find_first(TABLE_COMPLEX).unwrap();
         assert_eq!(
-            vec![false, false, true, false],
+            vec![false, false, true, false, false],
             table.iter().map(|r| r.is_empty()).collect::<Vec<_>>()
         );
     }
@@ -835,7 +842,7 @@ mod tests {
 
         let table = WebTable::find_first(TABLE_COMPLEX).unwrap();
         assert_eq!(
-            vec![2, 3, 0, 4],
+            vec![2, 3, 0, 3, 4],
             table.iter().map(|r| r.len()).collect::<Vec<_>>()
         );
     }
@@ -854,11 +861,11 @@ mod tests {
         let table_1 = tables_iter.next().unwrap();
         let table_2 = tables_iter.next().unwrap();
         assert_eq!(
-            vec![2, 3, 0, 4],
+            vec![2, 3, 0, 3, 4],
             table_1.iter().map(|r| r.len()).collect::<Vec<_>>()
         );
         assert_eq!(
-            vec![2, 3, 0, 4],
+            vec![2, 3, 0, 3, 4],
             table_2.iter().map(|r| r.len()).collect::<Vec<_>>()
         );
     }
@@ -911,6 +918,11 @@ mod tests {
         assert_eq!(None, row.get("Age"));
         assert_eq!(None, row.get("Extra"));
 
+        let row = iter.next().unwrap();
+        assert_eq!(Some(""), row.get("Name"));
+        assert_eq!(Some(""), row.get("Age"));
+        assert_eq!(Some(""), row.get("Extra"));
+
         let row = iter.next().unwrap();
         assert_eq!(Some("a"), row.get("Name"));
         assert_eq!(Some("b"), row.get("Age"));
@@ -955,6 +967,15 @@ mod tests {
         assert_eq!(None, row_table_2.get("Age"));
         assert_eq!(None, row_table_2.get("Extra"));
 
+        let row_table_1 = iter_1.next().unwrap();
+        let row_table_2 = iter_2.next().unwrap();
+        assert_eq!(Some(""), row_table_1.get("Name"));
+        assert_eq!(Some(""), row_table_1.get("Age"));
+        assert_eq!(Some(""), row_table_1.get("Extra"));
+        assert_eq!(Some(""), row_table_2.get("Profession"));
+        assert_eq!(Some(""), row_table_2.get("Civil State"));
+        assert_eq!(Some(""), row_table_2.get("Extra"));
+
         let row_table_1 = iter_1.next().unwrap();
         let row_table_2 = iter_2.next().unwrap();
         assert_eq!(Some("a"), row_table_1.get("Name"));
@@ -1028,6 +1049,7 @@ mod tests {
         assert_eq!(&["John", "20"], iter.next().unwrap().as_slice());
         assert_eq!(&["May", "30", "foo"], iter.next().unwrap().as_slice());
         assert_eq!(&empty, iter.next().unwrap().as_slice());
+        assert_eq!(&["", "", ""], iter.next().unwrap().as_slice());
         assert_eq!(&["a", "b", "c", "d"], iter.next().unwrap().as_slice());
         assert_eq!(None, iter.next());
     }
@@ -1045,6 +1067,7 @@ mod tests {
         assert_eq!(&["John", "20"], iter_1.next().unwrap().as_slice());
         assert_eq!(&["May", "30", "foo"], iter_1.next().unwrap().as_slice());
         assert_eq!(&empty, iter_1.next().unwrap().as_slice());
+        assert_eq!(&["", "", ""], iter_1.next().unwrap().as_slice());
         assert_eq!(&["a", "b", "c", "d"], iter_1.next().unwrap().as_slice());
         assert_eq!(None, iter_1.next());
         assert_eq!(&["Carpenter", "Single"], iter_2.next().unwrap().as_slice());
@@ -1053,6 +1076,7 @@ mod tests {
             iter_2.next().unwrap().as_slice()
         );
         assert_eq!(&empty, iter_2.next().unwrap().as_slice());
+        assert_eq!(&["", "", ""], iter_2.next().unwrap().as_slice());
         assert_eq!(&["e", "f", "g", "h"], iter_2.next().unwrap().as_slice());
         assert_eq!(None, iter_2.next());
     }
@@ -1109,6 +1133,13 @@ mod tests {
         let mut iter = row.iter();
         assert_eq!(None, iter.next());
 
+        let row = table_iter.next().unwrap();
+        let mut iter = row.iter();
+        assert_eq!(Some(""), iter.next().map(String::as_str));
+        assert_eq!(Some(""), iter.next().map(String::as_str));
+        assert_eq!(Some(""), iter.next().map(String::as_str));
+        assert_eq!(None, iter.next());
+
         let row = table_iter.next().unwrap();
         let mut iter = row.iter();
         assert_eq!(Some("a"), iter.next().map(String::as_str));
@@ -1156,6 +1187,19 @@ mod tests {
         assert_eq!(None, iter_1.next());
         assert_eq!(None, iter_2.next());
 
+        let row_1 = table_1.next().unwrap();
+        let row_2 = table_2.next().unwrap();
+        let mut iter_1 = row_1.iter();
+        let mut iter_2 = row_2.iter();
+        assert_eq!(Some(""), iter_1.next().map(String::as_str));
+        assert_eq!(Some(""), iter_1.next().map(String::as_str));
+        assert_eq!(Some(""), iter_1.next().map(String::as_str));
+        assert_eq!(None, iter_1.next());
+        assert_eq!(Some(""), iter_2.next().map(String::as_str));
+        assert_eq!(Some(""), iter_2.next().map(String::as_str));
+        assert_eq!(Some(""), iter_2.next().map(String::as_str));
+        assert_eq!(None, iter_2.next());
+
         let row_1 = table_1.next().unwrap();
         let row_2 = table_2.next().unwrap();
         let mut iter_1 = row_1.iter();

From 56ed532038b0464a53ecb66c7512a271317d8855 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Mon, 5 Aug 2024 07:59:34 -0500
Subject: [PATCH 0308/1072] update to latest reedline commit 919292e (#13540)

# Description

This PR updates nushell to the latest reedline commit which has some vi
keyboard mode changes.

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock | 3 +--
 Cargo.toml | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f4495d6bfa..89e5127356 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5006,8 +5006,7 @@ dependencies = [
 [[package]]
 name = "reedline"
 version = "0.33.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f8c676a3f3814a23c6a0fc9dff6b6c35b2e04df8134aae6f3929cc34de21a53"
+source = "git+https://github.com/nushell/reedline?branch=main#919292e40fd417e3da882692021961b444150c59"
 dependencies = [
  "arboard",
  "chrono",
diff --git a/Cargo.toml b/Cargo.toml
index e60acd2548..ce62fa745e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -305,8 +305,8 @@ 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" }
+[patch.crates-io]
+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`

From 1c37f4b95822b331cb391559c523e0ca3430b8bc Mon Sep 17 00:00:00 2001
From: Andrej Kolchin <KAAtheWise@protonmail.com>
Date: Mon, 5 Aug 2024 22:07:12 +0300
Subject: [PATCH 0309/1072] Create `random binary` command (#13542)

# Description/User-Facing Changes

Creates a new `random binary <LENGTH>` command, which returns random
bytes.

Resolve #13500
---
 crates/nu-command/src/default_context.rs |  1 +
 crates/nu-command/src/random/binary.rs   | 64 ++++++++++++++++++++++++
 crates/nu-command/src/random/mod.rs      |  2 +
 3 files changed, 67 insertions(+)
 create mode 100644 crates/nu-command/src/random/binary.rs

diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index 4adcfe9214..6ef188d571 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -397,6 +397,7 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             RandomFloat,
             RandomInt,
             RandomUuid,
+            RandomBinary
         };
 
         // Generators
diff --git a/crates/nu-command/src/random/binary.rs b/crates/nu-command/src/random/binary.rs
new file mode 100644
index 0000000000..57fd8b01a7
--- /dev/null
+++ b/crates/nu-command/src/random/binary.rs
@@ -0,0 +1,64 @@
+use nu_engine::command_prelude::*;
+
+use rand::{thread_rng, RngCore};
+
+#[derive(Clone)]
+pub struct SubCommand;
+
+impl Command for SubCommand {
+    fn name(&self) -> &str {
+        "random binary"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("random binary")
+            .input_output_types(vec![(Type::Nothing, Type::Binary)])
+            .allow_variants_without_examples(true)
+            .required("length", SyntaxShape::Int, "Length of the output binary.")
+            .category(Category::Random)
+    }
+
+    fn usage(&self) -> &str {
+        "Generate random bytes."
+    }
+
+    fn search_terms(&self) -> Vec<&str> {
+        vec!["generate", "bytes"]
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let length = call.req(engine_state, stack, 0)?;
+        let mut rng = thread_rng();
+
+        let mut out = vec![0u8; length];
+        rng.fill_bytes(&mut out);
+
+        Ok(Value::binary(out, call.head).into_pipeline_data())
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![Example {
+            description: "Generate 16 random bytes",
+            example: "random bytes 16",
+            result: None,
+        }]
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_examples() {
+        use crate::test_examples;
+
+        test_examples(SubCommand {})
+    }
+}
diff --git a/crates/nu-command/src/random/mod.rs b/crates/nu-command/src/random/mod.rs
index 5a1fb06cf8..4c05376c88 100644
--- a/crates/nu-command/src/random/mod.rs
+++ b/crates/nu-command/src/random/mod.rs
@@ -1,3 +1,4 @@
+mod binary;
 mod bool;
 mod chars;
 mod dice;
@@ -6,6 +7,7 @@ mod int;
 mod random_;
 mod uuid;
 
+pub use self::binary::SubCommand as RandomBinary;
 pub use self::bool::SubCommand as RandomBool;
 pub use self::chars::SubCommand as RandomChars;
 pub use self::dice::SubCommand as RandomDice;

From 9172b22985c819d423754d36a218ea7d08c804e6 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Mon, 5 Aug 2024 22:44:24 +0200
Subject: [PATCH 0310/1072] Rework `help` generation internals (#13531)

Reworking some of the sprawling code we use to generate the `help cmd`
or `cmd --help` output.

This touches mainly the rendering and not the gathering of the necessary
data (see open bugs under
[label:help-system](https://github.com/nushell/nushell/issues?q=sort%3Aupdated-desc+is%3Aopen+label%3Ahelp-system))

Fixes #9076
Fixes the syntax shape output on flags to be consistent.

## Example
```nushell
def test [
  positional: int,
  documented: float, # this has documentation
  default = 50,
  optional?,
  --a = "bla",
  --bla (-b) = "bla", # named with default
] {}
```

### before

![grafik](https://github.com/user-attachments/assets/1867984f-1289-4ad0-bdf5-c49ec56dfddb)


### after


![grafik](https://github.com/user-attachments/assets/8fca526f-d878-4d52-b970-fc41c7e8859c)
---
 crates/nu-cli/src/menus/help_completions.rs |  14 +-
 crates/nu-engine/src/documentation.rs       | 529 +++++++++-----------
 crates/nu-plugin/src/plugin/mod.rs          |   5 +-
 3 files changed, 244 insertions(+), 304 deletions(-)

diff --git a/crates/nu-cli/src/menus/help_completions.rs b/crates/nu-cli/src/menus/help_completions.rs
index 6d9cbb4cb5..7dc157748e 100644
--- a/crates/nu-cli/src/menus/help_completions.rs
+++ b/crates/nu-cli/src/menus/help_completions.rs
@@ -1,4 +1,4 @@
-use nu_engine::documentation::get_flags_section;
+use nu_engine::documentation::{get_flags_section, HelpStyle};
 use nu_protocol::{engine::EngineState, levenshtein_distance, Config};
 use nu_utils::IgnoreCaseExt;
 use reedline::{Completer, Suggestion};
@@ -20,6 +20,9 @@ impl NuHelpCompleter {
     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
             .engine_state
             .get_decls_sorted(false)
@@ -60,12 +63,9 @@ 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.engine_state),
-                        Some(&self.config),
-                        &sig,
-                        |v| v.to_parsable_string(", ", &self.config),
-                    ))
+                    long_desc.push_str(&get_flags_section(&sig, &help_style, |v| {
+                        v.to_parsable_string(", ", &self.config)
+                    }))
                 }
 
                 if !sig.required_positional.is_empty()
diff --git a/crates/nu-engine/src/documentation.rs b/crates/nu-engine/src/documentation.rs
index ed432d848f..3d5381dd9d 100644
--- a/crates/nu-engine/src/documentation.rs
+++ b/crates/nu-engine/src/documentation.rs
@@ -3,25 +3,28 @@ use nu_protocol::{
     ast::{Argument, Call, Expr, Expression, RecordItem},
     debugger::WithoutDebug,
     engine::{Command, EngineState, Stack, UNKNOWN_SPAN_ID},
-    record, Category, Config, Example, IntoPipelineData, PipelineData, Signature, Span, SpanId,
-    Spanned, SyntaxShape, Type, Value,
+    record, Category, Config, Example, IntoPipelineData, PipelineData, PositionalArg, Signature,
+    Span, SpanId, Spanned, SyntaxShape, Type, Value,
 };
 use std::{collections::HashMap, fmt::Write};
 use terminal_size::{Height, Width};
 
+/// ANSI style reset
+const RESET: &str = "\x1b[0m";
+/// ANSI set default color (as set in the terminal)
+const DEFAULT_COLOR: &str = "\x1b[39m";
+
 pub fn get_full_help(
     command: &dyn Command,
     engine_state: &EngineState,
     stack: &mut Stack,
 ) -> String {
-    let config = stack.get_config(engine_state);
-    let doc_config = DocumentationConfig {
-        no_subcommands: false,
-        no_color: !config.use_ansi_coloring,
-        brief: false,
-    };
-
+    // Precautionary step to capture any command output generated during this operation. We
+    // internally call several commands (`table`, `ansi`, `nu-highlight`) and get their
+    // `PipelineData` using this `Stack`, any other output should not be redirected like the main
+    // execution.
     let stack = &mut stack.start_capture();
+
     let signature = command.signature().update_from_command(command);
 
     get_documentation(
@@ -29,19 +32,11 @@ pub fn get_full_help(
         &command.examples(),
         engine_state,
         stack,
-        &doc_config,
         command.is_keyword(),
     )
 }
 
-#[derive(Default)]
-struct DocumentationConfig {
-    no_subcommands: bool,
-    no_color: bool,
-    brief: bool,
-}
-
-// Utility returns nu-highlighted string
+/// Syntax highlight code using the `nu-highlight` command if available
 fn nu_highlight_string(code_string: &str, engine_state: &EngineState, stack: &mut Stack) -> String {
     if let Some(highlighter) = engine_state.find_decl(b"nu-highlight", &[]) {
         let decl = engine_state.get_decl(highlighter);
@@ -68,35 +63,15 @@ fn get_documentation(
     examples: &[Example],
     engine_state: &EngineState,
     stack: &mut Stack,
-    config: &DocumentationConfig,
     is_parser_keyword: bool,
 ) -> String {
     let nu_config = stack.get_config(engine_state);
 
     // Create ansi colors
-    //todo make these configurable -- pull from enginestate.config
-    let help_section_name: String = get_ansi_color_for_component_or_default(
-        engine_state,
-        &nu_config,
-        "shape_string",
-        "\x1b[32m",
-    ); // default: green
-
-    let help_subcolor_one: String = get_ansi_color_for_component_or_default(
-        engine_state,
-        &nu_config,
-        "shape_external",
-        "\x1b[36m",
-    ); // default: cyan
-       // was const bb: &str = "\x1b[1;34m"; // bold blue
-    let help_subcolor_two: String = get_ansi_color_for_component_or_default(
-        engine_state,
-        &nu_config,
-        "shape_block",
-        "\x1b[94m",
-    ); // default: light blue (nobold, should be bolding the *names*)
-
-    const RESET: &str = "\x1b[0m"; // reset
+    let mut help_style = HelpStyle::default();
+    help_style.update_from_config(engine_state, &nu_config);
+    let help_section_name = &help_style.section_name;
+    let help_subcolor_one = &help_style.subcolor_one;
 
     let cmd_name = &sig.name;
     let mut long_desc = String::new();
@@ -107,44 +82,46 @@ fn get_documentation(
         long_desc.push_str("\n\n");
     }
 
-    let extra_usage = if config.brief { "" } else { &sig.extra_usage };
+    let extra_usage = &sig.extra_usage;
     if !extra_usage.is_empty() {
         long_desc.push_str(extra_usage);
         long_desc.push_str("\n\n");
     }
 
-    let mut subcommands = vec![];
-    if !config.no_subcommands {
-        let signatures = engine_state.get_signatures(true);
-        for sig in signatures {
-            if sig.name.starts_with(&format!("{cmd_name} "))
-                // Don't display removed/deprecated commands in the Subcommands list
-                    && !matches!(sig.category, Category::Removed)
-            {
-                subcommands.push(format!(
-                    "  {help_subcolor_one}{}{RESET} - {}",
-                    sig.name, sig.usage
-                ));
-            }
-        }
-    }
-
     if !sig.search_terms.is_empty() {
-        let text = format!(
-            "{help_section_name}Search terms{RESET}: {help_subcolor_one}{}{}\n\n",
+        let _ = write!(
+            long_desc,
+            "{help_section_name}Search terms{RESET}: {help_subcolor_one}{}{RESET}\n\n",
             sig.search_terms.join(", "),
-            RESET
         );
-        let _ = write!(long_desc, "{text}");
     }
 
-    let text = format!(
-        "{}Usage{}:\n  > {}\n",
-        help_section_name,
-        RESET,
+    let _ = write!(
+        long_desc,
+        "{help_section_name}Usage{RESET}:\n  > {}\n",
         sig.call_signature()
     );
-    let _ = write!(long_desc, "{text}");
+
+    // TODO: improve the subcommand name resolution
+    // issues:
+    // - Aliases are included
+    //   - https://github.com/nushell/nushell/issues/11657
+    // - Subcommands are included violating module scoping
+    //   - https://github.com/nushell/nushell/issues/11447
+    //   - https://github.com/nushell/nushell/issues/11625
+    let mut subcommands = vec![];
+    let signatures = engine_state.get_signatures(true);
+    for sig in signatures {
+        // Don't display removed/deprecated commands in the Subcommands list
+        if sig.name.starts_with(&format!("{cmd_name} "))
+            && !matches!(sig.category, Category::Removed)
+        {
+            subcommands.push(format!(
+                "  {help_subcolor_one}{}{RESET} - {}",
+                sig.name, sig.usage
+            ));
+        }
+    }
 
     if !subcommands.is_empty() {
         let _ = write!(long_desc, "\n{help_section_name}Subcommands{RESET}:\n");
@@ -154,12 +131,9 @@ fn get_documentation(
     }
 
     if !sig.named.is_empty() {
-        long_desc.push_str(&get_flags_section(
-            Some(engine_state),
-            Some(&nu_config),
-            sig,
-            |v| nu_highlight_string(&v.to_parsable_string(", ", &nu_config), engine_state, stack),
-        ))
+        long_desc.push_str(&get_flags_section(sig, &help_style, |v| {
+            nu_highlight_string(&v.to_parsable_string(", ", &nu_config), engine_state, stack)
+        }))
     }
 
     if !sig.required_positional.is_empty()
@@ -168,70 +142,38 @@ fn get_documentation(
     {
         let _ = write!(long_desc, "\n{help_section_name}Parameters{RESET}:\n");
         for positional in &sig.required_positional {
-            let text = match &positional.shape {
-                SyntaxShape::Keyword(kw, shape) => {
-                    format!(
-                        "  {help_subcolor_one}\"{}\" + {RESET}<{help_subcolor_two}{}{RESET}>: {}",
-                        String::from_utf8_lossy(kw),
-                        document_shape(*shape.clone()),
-                        positional.desc
-                    )
-                }
-                _ => {
-                    format!(
-                        "  {help_subcolor_one}{}{RESET} <{help_subcolor_two}{}{RESET}>: {}",
-                        positional.name,
-                        document_shape(positional.shape.clone()),
-                        positional.desc
-                    )
-                }
-            };
-            let _ = writeln!(long_desc, "{text}");
+            write_positional(
+                &mut long_desc,
+                positional,
+                PositionalKind::Required,
+                &help_style,
+                &nu_config,
+                engine_state,
+                stack,
+            );
         }
         for positional in &sig.optional_positional {
-            let text = match &positional.shape {
-                SyntaxShape::Keyword(kw, shape) => {
-                    format!(
-                        "  {help_subcolor_one}\"{}\" + {RESET}<{help_subcolor_two}{}{RESET}>: {} (optional)",
-                        String::from_utf8_lossy(kw),
-                        document_shape(*shape.clone()),
-                        positional.desc
-                    )
-                }
-                _ => {
-                    let opt_suffix = if let Some(value) = &positional.default_value {
-                        format!(
-                            " (optional, default: {})",
-                            nu_highlight_string(
-                                &value.to_parsable_string(", ", &nu_config),
-                                engine_state,
-                                stack
-                            )
-                        )
-                    } else {
-                        (" (optional)").to_string()
-                    };
-
-                    format!(
-                        "  {help_subcolor_one}{}{RESET} <{help_subcolor_two}{}{RESET}>: {}{}",
-                        positional.name,
-                        document_shape(positional.shape.clone()),
-                        positional.desc,
-                        opt_suffix,
-                    )
-                }
-            };
-            let _ = writeln!(long_desc, "{text}");
+            write_positional(
+                &mut long_desc,
+                positional,
+                PositionalKind::Optional,
+                &help_style,
+                &nu_config,
+                engine_state,
+                stack,
+            );
         }
 
         if let Some(rest_positional) = &sig.rest_positional {
-            let text = format!(
-                "  ...{help_subcolor_one}{}{RESET} <{help_subcolor_two}{}{RESET}>: {}",
-                rest_positional.name,
-                document_shape(rest_positional.shape.clone()),
-                rest_positional.desc
+            write_positional(
+                &mut long_desc,
+                rest_positional,
+                PositionalKind::Rest,
+                &help_style,
+                &nu_config,
+                engine_state,
+                stack,
             );
-            let _ = writeln!(long_desc, "{text}");
         }
     }
 
@@ -300,36 +242,12 @@ fn get_documentation(
         long_desc.push_str("  ");
         long_desc.push_str(example.description);
 
-        if config.no_color {
+        if !nu_config.use_ansi_coloring {
             let _ = write!(long_desc, "\n  > {}\n", example.example);
-        } else if let Some(highlighter) = engine_state.find_decl(b"nu-highlight", &[]) {
-            let decl = engine_state.get_decl(highlighter);
-            let call = Call::new(Span::unknown());
-
-            match decl.run(
-                engine_state,
-                stack,
-                &(&call).into(),
-                Value::string(example.example, Span::unknown()).into_pipeline_data(),
-            ) {
-                Ok(output) => {
-                    let result = output.into_value(Span::unknown());
-                    match result.and_then(Value::coerce_into_string) {
-                        Ok(s) => {
-                            let _ = write!(long_desc, "\n  > {s}\n");
-                        }
-                        _ => {
-                            let _ = write!(long_desc, "\n  > {}\n", example.example);
-                        }
-                    }
-                }
-                Err(_) => {
-                    let _ = write!(long_desc, "\n  > {}\n", example.example);
-                }
-            }
         } else {
-            let _ = write!(long_desc, "\n  > {}\n", example.example);
-        }
+            let code_string = nu_highlight_string(example.example, engine_state, stack);
+            let _ = write!(long_desc, "\n  > {code_string}\n");
+        };
 
         if let Some(result) = &example.result {
             let mut table_call = Call::new(Span::unknown());
@@ -395,19 +313,19 @@ fn get_documentation(
 
     long_desc.push('\n');
 
-    if config.no_color {
+    if !nu_config.use_ansi_coloring {
         nu_utils::strip_ansi_string_likely(long_desc)
     } else {
         long_desc
     }
 }
 
-fn get_ansi_color_for_component_or_default(
+fn update_ansi_from_config(
+    ansi_code: &mut String,
     engine_state: &EngineState,
     nu_config: &Config,
     theme_component: &str,
-    default: &str,
-) -> String {
+) {
     if let Some(color) = &nu_config.color_config.get(theme_component) {
         let caller_stack = &mut Stack::new().capture();
         let span = Span::unknown();
@@ -430,14 +348,12 @@ fn get_ansi_color_for_component_or_default(
                     PipelineData::Empty,
                 ) {
                     if let Ok((str, ..)) = result.collect_string_strict(span) {
-                        return str;
+                        *ansi_code = str;
                     }
                 }
             }
         }
     }
-
-    default.to_string()
 }
 
 fn get_argument_for_color_value(
@@ -491,151 +407,174 @@ fn get_argument_for_color_value(
     }
 }
 
-// document shape helps showing more useful information
-pub fn document_shape(shape: SyntaxShape) -> SyntaxShape {
+/// Contains the settings for ANSI colors in help output
+///
+/// By default contains a fixed set of (4-bit) colors
+///
+/// Can reflect configuration using [`HelpStyle::update_from_config`]
+pub struct HelpStyle {
+    section_name: String,
+    subcolor_one: String,
+    subcolor_two: String,
+}
+
+impl Default for HelpStyle {
+    fn default() -> Self {
+        HelpStyle {
+            // default: green
+            section_name: "\x1b[32m".to_string(),
+            // default: cyan
+            subcolor_one: "\x1b[36m".to_string(),
+            // default: light blue
+            subcolor_two: "\x1b[94m".to_string(),
+        }
+    }
+}
+
+impl HelpStyle {
+    /// Pull colors from the [`Config`]
+    ///
+    /// Uses some arbitrary `shape_*` settings, assuming they are well visible in the terminal theme.
+    ///
+    /// Implementation detail: currently executes `ansi` command internally thus requiring the
+    /// [`EngineState`] for execution.
+    /// See <https://github.com/nushell/nushell/pull/10623> for details
+    pub fn update_from_config(&mut self, engine_state: &EngineState, nu_config: &Config) {
+        update_ansi_from_config(
+            &mut self.section_name,
+            engine_state,
+            nu_config,
+            "shape_string",
+        );
+        update_ansi_from_config(
+            &mut self.subcolor_one,
+            engine_state,
+            nu_config,
+            "shape_external",
+        );
+        update_ansi_from_config(
+            &mut self.subcolor_two,
+            engine_state,
+            nu_config,
+            "shape_block",
+        );
+    }
+}
+
+/// Make syntax shape presentable by stripping custom completer info
+fn document_shape(shape: &SyntaxShape) -> &SyntaxShape {
     match shape {
-        SyntaxShape::CompleterWrapper(inner_shape, _) => *inner_shape,
+        SyntaxShape::CompleterWrapper(inner_shape, _) => inner_shape,
         _ => shape,
     }
 }
 
+#[derive(PartialEq)]
+enum PositionalKind {
+    Required,
+    Optional,
+    Rest,
+}
+
+fn write_positional(
+    long_desc: &mut String,
+    positional: &PositionalArg,
+    arg_kind: PositionalKind,
+    help_style: &HelpStyle,
+    nu_config: &Config,
+    engine_state: &EngineState,
+    stack: &mut Stack,
+) {
+    let help_subcolor_one = &help_style.subcolor_one;
+    let help_subcolor_two = &help_style.subcolor_two;
+
+    // Indentation
+    long_desc.push_str("  ");
+    if arg_kind == PositionalKind::Rest {
+        long_desc.push_str("...");
+    }
+    match &positional.shape {
+        SyntaxShape::Keyword(kw, shape) => {
+            let _ = write!(
+                long_desc,
+                "{help_subcolor_one}\"{}\" + {RESET}<{help_subcolor_two}{}{RESET}>",
+                String::from_utf8_lossy(kw),
+                document_shape(shape),
+            );
+        }
+        _ => {
+            let _ = write!(
+                long_desc,
+                "{help_subcolor_one}{}{RESET} <{help_subcolor_two}{}{RESET}>",
+                positional.name,
+                document_shape(&positional.shape),
+            );
+        }
+    };
+    if !positional.desc.is_empty() || arg_kind == PositionalKind::Optional {
+        let _ = write!(long_desc, ": {}", positional.desc);
+    }
+    if arg_kind == PositionalKind::Optional {
+        if let Some(value) = &positional.default_value {
+            let _ = write!(
+                long_desc,
+                " (optional, default: {})",
+                nu_highlight_string(
+                    &value.to_parsable_string(", ", nu_config),
+                    engine_state,
+                    stack
+                )
+            );
+        } else {
+            long_desc.push_str(" (optional)");
+        };
+    }
+    long_desc.push('\n');
+}
+
 pub fn get_flags_section<F>(
-    engine_state_opt: Option<&EngineState>,
-    nu_config_opt: Option<&Config>,
     signature: &Signature,
+    help_style: &HelpStyle,
     mut value_formatter: F, // format default Value (because some calls cant access config or nu-highlight)
 ) -> String
 where
     F: FnMut(&nu_protocol::Value) -> String,
 {
-    //todo make these configurable -- pull from enginestate.config
-    let help_section_name: String;
-    let help_subcolor_one: String;
-    let help_subcolor_two: String;
-
-    // Sometimes we want to get the flags without engine_state
-    // For example, in nu-plugin. In that case, we fall back on default values
-    if let Some(engine_state) = engine_state_opt {
-        let nu_config = nu_config_opt.unwrap_or_else(|| engine_state.get_config());
-        help_section_name = get_ansi_color_for_component_or_default(
-            engine_state,
-            nu_config,
-            "shape_string",
-            "\x1b[32m",
-        ); // default: green
-        help_subcolor_one = get_ansi_color_for_component_or_default(
-            engine_state,
-            nu_config,
-            "shape_external",
-            "\x1b[36m",
-        ); // default: cyan
-           // was const bb: &str = "\x1b[1;34m"; // bold blue
-        help_subcolor_two = get_ansi_color_for_component_or_default(
-            engine_state,
-            nu_config,
-            "shape_block",
-            "\x1b[94m",
-        );
-    // default: light blue (nobold, should be bolding the *names*)
-    } else {
-        help_section_name = "\x1b[32m".to_string();
-        help_subcolor_one = "\x1b[36m".to_string();
-        help_subcolor_two = "\x1b[94m".to_string();
-    }
-
-    const RESET: &str = "\x1b[0m"; // reset
-    const D: &str = "\x1b[39m"; // default
+    let help_section_name = &help_style.section_name;
+    let help_subcolor_one = &help_style.subcolor_one;
+    let help_subcolor_two = &help_style.subcolor_two;
 
     let mut long_desc = String::new();
     let _ = write!(long_desc, "\n{help_section_name}Flags{RESET}:\n");
     for flag in &signature.named {
-        let default_str = if let Some(value) = &flag.default_value {
-            format!(
-                " (default: {help_subcolor_two}{}{RESET})",
-                &value_formatter(value)
-            )
-        } else {
-            "".to_string()
-        };
-
-        let msg = if let Some(arg) = &flag.arg {
-            if let Some(short) = flag.short {
-                if flag.required {
-                    format!(
-                        "  {help_subcolor_one}-{}{}{RESET} (required parameter) {:?} - {}{}\n",
-                        short,
-                        if !flag.long.is_empty() {
-                            format!("{D},{RESET} {help_subcolor_one}--{}", flag.long)
-                        } else {
-                            "".into()
-                        },
-                        arg,
-                        flag.desc,
-                        default_str,
-                    )
-                } else {
-                    format!(
-                        "  {help_subcolor_one}-{}{}{RESET} <{help_subcolor_two}{:?}{RESET}> - {}{}\n",
-                        short,
-                        if !flag.long.is_empty() {
-                            format!("{D},{RESET} {help_subcolor_one}--{}", flag.long)
-                        } else {
-                            "".into()
-                        },
-                        arg,
-                        flag.desc,
-                        default_str,
-                    )
-                }
-            } else if flag.required {
-                format!(
-                    "  {help_subcolor_one}--{}{RESET} (required parameter) <{help_subcolor_two}{:?}{RESET}> - {}{}\n",
-                    flag.long, arg, flag.desc, default_str,
-                )
-            } else {
-                format!(
-                    "  {help_subcolor_one}--{}{RESET} <{help_subcolor_two}{:?}{RESET}> - {}{}\n",
-                    flag.long, arg, flag.desc, default_str,
-                )
+        // Indentation
+        long_desc.push_str("  ");
+        // Short flag shown before long flag
+        if let Some(short) = flag.short {
+            let _ = write!(long_desc, "{help_subcolor_one}-{}{RESET}", short);
+            if !flag.long.is_empty() {
+                let _ = write!(long_desc, "{DEFAULT_COLOR},{RESET} ");
             }
-        } else if let Some(short) = flag.short {
-            if flag.required {
-                format!(
-                    "  {help_subcolor_one}-{}{}{RESET} (required parameter) - {}{}\n",
-                    short,
-                    if !flag.long.is_empty() {
-                        format!("{D},{RESET} {help_subcolor_one}--{}", flag.long)
-                    } else {
-                        "".into()
-                    },
-                    flag.desc,
-                    default_str,
-                )
-            } else {
-                format!(
-                    "  {help_subcolor_one}-{}{}{RESET} - {}{}\n",
-                    short,
-                    if !flag.long.is_empty() {
-                        format!("{D},{RESET} {help_subcolor_one}--{}", flag.long)
-                    } else {
-                        "".into()
-                    },
-                    flag.desc,
-                    default_str
-                )
-            }
-        } else if flag.required {
-            format!(
-                "  {help_subcolor_one}--{}{RESET} (required parameter) - {}{}\n",
-                flag.long, flag.desc, default_str,
-            )
-        } else {
-            format!(
-                "  {help_subcolor_one}--{}{RESET} - {}\n",
-                flag.long, flag.desc
-            )
-        };
-        long_desc.push_str(&msg);
+        }
+        if !flag.long.is_empty() {
+            let _ = write!(long_desc, "{help_subcolor_one}--{}{RESET}", flag.long);
+        }
+        if flag.required {
+            long_desc.push_str(" (required parameter)")
+        }
+        // Type/Syntax shape info
+        if let Some(arg) = &flag.arg {
+            let _ = write!(
+                long_desc,
+                " <{help_subcolor_two}{}{RESET}>",
+                document_shape(arg)
+            );
+        }
+        let _ = write!(long_desc, " - {}", flag.desc);
+        if let Some(value) = &flag.default_value {
+            let _ = write!(long_desc, " (default: {})", &value_formatter(value));
+        }
+        long_desc.push('\n');
     }
     long_desc
 }
diff --git a/crates/nu-plugin/src/plugin/mod.rs b/crates/nu-plugin/src/plugin/mod.rs
index d809318d68..87f95cf7d4 100644
--- a/crates/nu-plugin/src/plugin/mod.rs
+++ b/crates/nu-plugin/src/plugin/mod.rs
@@ -9,7 +9,7 @@ use std::{
     thread,
 };
 
-use nu_engine::documentation::get_flags_section;
+use nu_engine::documentation::{get_flags_section, HelpStyle};
 use nu_plugin_core::{
     ClientCommunicationIo, CommunicationMode, InterfaceManager, PluginEncoder, PluginRead,
     PluginWrite,
@@ -657,6 +657,7 @@ fn print_help(plugin: &impl Plugin, encoder: impl PluginEncoder) {
     println!("Encoder: {}", encoder.name());
 
     let mut help = String::new();
+    let help_style = HelpStyle::default();
 
     plugin.commands().into_iter().for_each(|command| {
         let signature = command.signature();
@@ -670,7 +671,7 @@ fn print_help(plugin: &impl Plugin, encoder: impl PluginEncoder) {
                 }
             })
             .and_then(|_| {
-                let flags = get_flags_section(None, None, &signature, |v| format!("{:#?}", v));
+                let flags = get_flags_section(&signature, &help_style, |v| format!("{:#?}", v));
                 write!(help, "{flags}")
             })
             .and_then(|_| writeln!(help, "\nParameters:"))

From 2f4480141428f70611e1c0f149929e4ce5b4a8f2 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Mon, 5 Aug 2024 14:07:15 -0700
Subject: [PATCH 0311/1072] Adding plist support (#13545)

# Description
Provides the ability convert from and to plist format.

<img width="1250" alt="Screenshot 2024-08-05 at 10 21 26"
src="https://github.com/user-attachments/assets/970f3366-eb70-4d74-a396-649374556f66">

<img width="730" alt="Screenshot 2024-08-05 at 10 22 38"
src="https://github.com/user-attachments/assets/6ec317d0-686e-47c6-bf35-8ab6e5d802db">

# User-Facing Changes
- Introduction of `from plist` command
- Introduction of `to plist`command

---------

Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
---
 Cargo.lock                                 |  30 ++-
 crates/nu_plugin_formats/Cargo.toml        |   4 +-
 crates/nu_plugin_formats/src/from/eml.rs   |   8 +-
 crates/nu_plugin_formats/src/from/ics.rs   |   8 +-
 crates/nu_plugin_formats/src/from/ini.rs   |   8 +-
 crates/nu_plugin_formats/src/from/mod.rs   |   9 +-
 crates/nu_plugin_formats/src/from/plist.rs | 240 +++++++++++++++++++++
 crates/nu_plugin_formats/src/from/vcf.rs   |   8 +-
 crates/nu_plugin_formats/src/lib.rs        |  17 +-
 crates/nu_plugin_formats/src/main.rs       |   4 +-
 crates/nu_plugin_formats/src/to/mod.rs     |   1 +
 crates/nu_plugin_formats/src/to/plist.rs   | 113 ++++++++++
 12 files changed, 418 insertions(+), 32 deletions(-)
 create mode 100644 crates/nu_plugin_formats/src/from/plist.rs
 create mode 100644 crates/nu_plugin_formats/src/to/mod.rs
 create mode 100644 crates/nu_plugin_formats/src/to/plist.rs

diff --git a/Cargo.lock b/Cargo.lock
index 89e5127356..902210ffbc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -605,7 +605,7 @@ dependencies = [
  "encoding_rs",
  "log",
  "once_cell",
- "quick-xml",
+ "quick-xml 0.31.0",
  "serde",
  "zip",
 ]
@@ -3094,7 +3094,7 @@ dependencies = [
  "pretty_assertions",
  "print-positions",
  "procfs",
- "quick-xml",
+ "quick-xml 0.31.0",
  "quickcheck",
  "quickcheck_macros",
  "rand",
@@ -3476,12 +3476,14 @@ dependencies = [
 name = "nu_plugin_formats"
 version = "0.96.2"
 dependencies = [
+ "chrono",
  "eml-parser",
  "ical",
  "indexmap",
  "nu-plugin",
  "nu-plugin-test-support",
  "nu-protocol",
+ "plist",
  "rust-ini",
 ]
 
@@ -4148,6 +4150,19 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "plist"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016"
+dependencies = [
+ "base64 0.22.1",
+ "indexmap",
+ "quick-xml 0.32.0",
+ "serde",
+ "time",
+]
+
 [[package]]
 name = "polars"
 version = "0.41.2"
@@ -4816,6 +4831,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "quick-xml"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "quickcheck"
 version = "1.0.3"
@@ -6872,7 +6896,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283"
 dependencies = [
  "proc-macro2",
- "quick-xml",
+ "quick-xml 0.31.0",
  "quote",
 ]
 
diff --git a/crates/nu_plugin_formats/Cargo.toml b/crates/nu_plugin_formats/Cargo.toml
index dbf1b43657..f6ad84758f 100644
--- a/crates/nu_plugin_formats/Cargo.toml
+++ b/crates/nu_plugin_formats/Cargo.toml
@@ -16,6 +16,8 @@ indexmap = { workspace = true }
 eml-parser = "0.1"
 ical = "0.11"
 rust-ini = "0.21.0"
+plist = "1.7"
+chrono = "0.4"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.96.2" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.96.2" }
diff --git a/crates/nu_plugin_formats/src/from/eml.rs b/crates/nu_plugin_formats/src/from/eml.rs
index 2630e3b1c2..2b4c33a814 100644
--- a/crates/nu_plugin_formats/src/from/eml.rs
+++ b/crates/nu_plugin_formats/src/from/eml.rs
@@ -1,4 +1,4 @@
-use crate::FromCmds;
+use crate::FormatCmdsPlugin;
 use eml_parser::eml::*;
 use eml_parser::EmlParser;
 use indexmap::IndexMap;
@@ -12,7 +12,7 @@ const DEFAULT_BODY_PREVIEW: usize = 50;
 pub struct FromEml;
 
 impl SimplePluginCommand for FromEml {
-    type Plugin = FromCmds;
+    type Plugin = FormatCmdsPlugin;
 
     fn name(&self) -> &str {
         "from eml"
@@ -40,7 +40,7 @@ impl SimplePluginCommand for FromEml {
 
     fn run(
         &self,
-        _plugin: &FromCmds,
+        _plugin: &FormatCmdsPlugin,
         _engine: &EngineInterface,
         call: &EvaluatedCall,
         input: &Value,
@@ -176,5 +176,5 @@ fn from_eml(input: &Value, body_preview: usize, head: Span) -> Result<Value, Lab
 fn test_examples() -> Result<(), nu_protocol::ShellError> {
     use nu_plugin_test_support::PluginTest;
 
-    PluginTest::new("formats", crate::FromCmds.into())?.test_command_examples(&FromEml)
+    PluginTest::new("formats", crate::FormatCmdsPlugin.into())?.test_command_examples(&FromEml)
 }
diff --git a/crates/nu_plugin_formats/src/from/ics.rs b/crates/nu_plugin_formats/src/from/ics.rs
index 099b3431fe..bcd7311f8a 100644
--- a/crates/nu_plugin_formats/src/from/ics.rs
+++ b/crates/nu_plugin_formats/src/from/ics.rs
@@ -1,4 +1,4 @@
-use crate::FromCmds;
+use crate::FormatCmdsPlugin;
 
 use ical::{parser::ical::component::*, property::Property};
 use indexmap::IndexMap;
@@ -11,7 +11,7 @@ use std::io::BufReader;
 pub struct FromIcs;
 
 impl SimplePluginCommand for FromIcs {
-    type Plugin = FromCmds;
+    type Plugin = FormatCmdsPlugin;
 
     fn name(&self) -> &str {
         "from ics"
@@ -33,7 +33,7 @@ impl SimplePluginCommand for FromIcs {
 
     fn run(
         &self,
-        _plugin: &FromCmds,
+        _plugin: &FormatCmdsPlugin,
         _engine: &EngineInterface,
         call: &EvaluatedCall,
         input: &Value,
@@ -274,5 +274,5 @@ fn params_to_value(params: Vec<(String, Vec<String>)>, span: Span) -> Value {
 fn test_examples() -> Result<(), nu_protocol::ShellError> {
     use nu_plugin_test_support::PluginTest;
 
-    PluginTest::new("formats", crate::FromCmds.into())?.test_command_examples(&FromIcs)
+    PluginTest::new("formats", crate::FormatCmdsPlugin.into())?.test_command_examples(&FromIcs)
 }
diff --git a/crates/nu_plugin_formats/src/from/ini.rs b/crates/nu_plugin_formats/src/from/ini.rs
index cf37ffc3d7..bb44ce1398 100644
--- a/crates/nu_plugin_formats/src/from/ini.rs
+++ b/crates/nu_plugin_formats/src/from/ini.rs
@@ -1,4 +1,4 @@
-use crate::FromCmds;
+use crate::FormatCmdsPlugin;
 
 use nu_plugin::{EngineInterface, EvaluatedCall, SimplePluginCommand};
 use nu_protocol::{
@@ -8,7 +8,7 @@ use nu_protocol::{
 pub struct FromIni;
 
 impl SimplePluginCommand for FromIni {
-    type Plugin = FromCmds;
+    type Plugin = FormatCmdsPlugin;
 
     fn name(&self) -> &str {
         "from ini"
@@ -30,7 +30,7 @@ impl SimplePluginCommand for FromIni {
 
     fn run(
         &self,
-        _plugin: &FromCmds,
+        _plugin: &FormatCmdsPlugin,
         _engine: &EngineInterface,
         call: &EvaluatedCall,
         input: &Value,
@@ -101,5 +101,5 @@ b=2' | from ini",
 fn test_examples() -> Result<(), nu_protocol::ShellError> {
     use nu_plugin_test_support::PluginTest;
 
-    PluginTest::new("formats", crate::FromCmds.into())?.test_command_examples(&FromIni)
+    PluginTest::new("formats", crate::FormatCmdsPlugin.into())?.test_command_examples(&FromIni)
 }
diff --git a/crates/nu_plugin_formats/src/from/mod.rs b/crates/nu_plugin_formats/src/from/mod.rs
index 4b4976f391..232dde7d6d 100644
--- a/crates/nu_plugin_formats/src/from/mod.rs
+++ b/crates/nu_plugin_formats/src/from/mod.rs
@@ -1,4 +1,5 @@
-pub mod eml;
-pub mod ics;
-pub mod ini;
-pub mod vcf;
+pub(crate) mod eml;
+pub(crate) mod ics;
+pub(crate) mod ini;
+pub(crate) mod plist;
+pub(crate) mod vcf;
diff --git a/crates/nu_plugin_formats/src/from/plist.rs b/crates/nu_plugin_formats/src/from/plist.rs
new file mode 100644
index 0000000000..9894879955
--- /dev/null
+++ b/crates/nu_plugin_formats/src/from/plist.rs
@@ -0,0 +1,240 @@
+use std::time::SystemTime;
+
+use chrono::{DateTime, FixedOffset, Offset, Utc};
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand, SimplePluginCommand};
+use nu_protocol::{
+    record, Category, Example, LabeledError, Record, Signature, Span, Value as NuValue,
+};
+use plist::{Date as PlistDate, Dictionary, Value as PlistValue};
+
+use crate::FormatCmdsPlugin;
+
+pub struct FromPlist;
+
+impl SimplePluginCommand for FromPlist {
+    type Plugin = FormatCmdsPlugin;
+
+    fn name(&self) -> &str {
+        "from plist"
+    }
+
+    fn usage(&self) -> &str {
+        "Convert plist to Nushell values"
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![Example {
+            example: r#"'<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>a</key>
+        <integer>3</integer>
+</dict>
+</plist>' | from plist"#,
+            description: "Convert a table into a plist file",
+            result: Some(NuValue::test_record(record!( "a" => NuValue::test_int(3)))),
+        }]
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(PluginCommand::name(self)).category(Category::Formats)
+    }
+
+    fn run(
+        &self,
+        _plugin: &FormatCmdsPlugin,
+        _engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: &NuValue,
+    ) -> Result<NuValue, LabeledError> {
+        match input {
+            NuValue::String { val, .. } => {
+                let plist = plist::from_bytes(val.as_bytes())
+                    .map_err(|e| build_label_error(format!("{}", e), input.span()))?;
+                let converted = convert_plist_value(&plist, call.head)?;
+                Ok(converted)
+            }
+            NuValue::Binary { val, .. } => {
+                let plist = plist::from_bytes(val)
+                    .map_err(|e| build_label_error(format!("{}", e), input.span()))?;
+                let converted = convert_plist_value(&plist, call.head)?;
+                Ok(converted)
+            }
+            _ => Err(build_label_error(
+                format!("Invalid input, must be string not: {:?}", input),
+                call.head,
+            )),
+        }
+    }
+}
+
+fn build_label_error(msg: impl Into<String>, span: Span) -> LabeledError {
+    LabeledError::new("Could not load plist").with_label(msg, span)
+}
+
+fn convert_plist_value(plist_val: &PlistValue, span: Span) -> Result<NuValue, LabeledError> {
+    match plist_val {
+        PlistValue::String(s) => Ok(NuValue::string(s.to_owned(), span)),
+        PlistValue::Boolean(b) => Ok(NuValue::bool(*b, span)),
+        PlistValue::Real(r) => Ok(NuValue::float(*r, span)),
+        PlistValue::Date(d) => Ok(NuValue::date(convert_date(d), span)),
+        PlistValue::Integer(i) => {
+            let signed = i
+                .as_signed()
+                .ok_or_else(|| build_label_error(format!("Cannot convert {i} to i64"), span))?;
+            Ok(NuValue::int(signed, span))
+        }
+        PlistValue::Uid(uid) => Ok(NuValue::float(uid.get() as f64, span)),
+        PlistValue::Data(data) => Ok(NuValue::binary(data.to_owned(), span)),
+        PlistValue::Array(arr) => Ok(NuValue::list(convert_array(arr, span)?, span)),
+        PlistValue::Dictionary(dict) => Ok(convert_dict(dict, span)?),
+        _ => Ok(NuValue::nothing(span)),
+    }
+}
+
+fn convert_dict(dict: &Dictionary, span: Span) -> Result<NuValue, LabeledError> {
+    let cols: Vec<String> = dict.keys().cloned().collect();
+    let vals: Result<Vec<NuValue>, LabeledError> = dict
+        .values()
+        .map(|v| convert_plist_value(v, span))
+        .collect();
+    Ok(NuValue::record(
+        Record::from_raw_cols_vals(cols, vals?, span, span)?,
+        span,
+    ))
+}
+
+fn convert_array(plist_array: &[PlistValue], span: Span) -> Result<Vec<NuValue>, LabeledError> {
+    plist_array
+        .iter()
+        .map(|v| convert_plist_value(v, span))
+        .collect()
+}
+
+pub fn convert_date(plist_date: &PlistDate) -> DateTime<FixedOffset> {
+    // In the docs the plist date object is listed as a utc timestamp, so this
+    // conversion should be fine
+    let plist_sys_time: SystemTime = plist_date.to_owned().into();
+    let utc_date: DateTime<Utc> = plist_sys_time.into();
+    let utc_offset = utc_date.offset().fix();
+    utc_date.with_timezone(&utc_offset)
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use chrono::Datelike;
+    use plist::Uid;
+    use std::time::SystemTime;
+
+    use nu_plugin_test_support::PluginTest;
+    use nu_protocol::ShellError;
+
+    #[test]
+    fn test_convert_string() {
+        let plist_val = PlistValue::String("hello".to_owned());
+        let result = convert_plist_value(&plist_val, Span::test_data());
+        assert_eq!(
+            result,
+            Ok(NuValue::string("hello".to_owned(), Span::test_data()))
+        );
+    }
+
+    #[test]
+    fn test_convert_boolean() {
+        let plist_val = PlistValue::Boolean(true);
+        let result = convert_plist_value(&plist_val, Span::test_data());
+        assert_eq!(result, Ok(NuValue::bool(true, Span::test_data())));
+    }
+
+    #[test]
+    fn test_convert_real() {
+        let plist_val = PlistValue::Real(3.14);
+        let result = convert_plist_value(&plist_val, Span::test_data());
+        assert_eq!(result, Ok(NuValue::float(3.14, Span::test_data())));
+    }
+
+    #[test]
+    fn test_convert_integer() {
+        let plist_val = PlistValue::Integer(42.into());
+        let result = convert_plist_value(&plist_val, Span::test_data());
+        assert_eq!(result, Ok(NuValue::int(42, Span::test_data())));
+    }
+
+    #[test]
+    fn test_convert_uid() {
+        let v = 12345678_u64;
+        let uid = Uid::new(v);
+        let plist_val = PlistValue::Uid(uid);
+        let result = convert_plist_value(&plist_val, Span::test_data());
+        assert_eq!(result, Ok(NuValue::float(v as f64, Span::test_data())));
+    }
+
+    #[test]
+    fn test_convert_data() {
+        let data = vec![0x41, 0x42, 0x43];
+        let plist_val = PlistValue::Data(data.clone());
+        let result = convert_plist_value(&plist_val, Span::test_data());
+        assert_eq!(result, Ok(NuValue::binary(data, Span::test_data())));
+    }
+
+    #[test]
+    fn test_convert_date() {
+        let epoch = SystemTime::UNIX_EPOCH;
+        let plist_date = epoch.into();
+
+        let datetime = convert_date(&plist_date);
+        assert_eq!(1970, datetime.year());
+        assert_eq!(1, datetime.month());
+        assert_eq!(1, datetime.day());
+    }
+
+    #[test]
+    fn test_convert_dict() {
+        let mut dict = Dictionary::new();
+        dict.insert("a".to_string(), PlistValue::String("c".to_string()));
+        dict.insert("b".to_string(), PlistValue::String("d".to_string()));
+        let nu_dict = convert_dict(&dict, Span::test_data()).unwrap();
+        assert_eq!(
+            nu_dict,
+            NuValue::record(
+                Record::from_raw_cols_vals(
+                    vec!["a".to_string(), "b".to_string()],
+                    vec![
+                        NuValue::string("c".to_string(), Span::test_data()),
+                        NuValue::string("d".to_string(), Span::test_data())
+                    ],
+                    Span::test_data(),
+                    Span::test_data(),
+                )
+                .expect("failed to create record"),
+                Span::test_data(),
+            )
+        );
+    }
+
+    #[test]
+    fn test_convert_array() {
+        let mut arr = Vec::new();
+        arr.push(PlistValue::String("a".to_string()));
+        arr.push(PlistValue::String("b".to_string()));
+        let nu_arr = convert_array(&arr, Span::test_data()).unwrap();
+        assert_eq!(
+            nu_arr,
+            vec![
+                NuValue::string("a".to_string(), Span::test_data()),
+                NuValue::string("b".to_string(), Span::test_data())
+            ]
+        );
+    }
+
+    #[test]
+    fn test_examples() -> Result<(), ShellError> {
+        let plugin = FormatCmdsPlugin {};
+        let cmd = FromPlist {};
+
+        let mut plugin_test = PluginTest::new("polars", plugin.into())?;
+        plugin_test.test_command_examples(&cmd)
+    }
+}
diff --git a/crates/nu_plugin_formats/src/from/vcf.rs b/crates/nu_plugin_formats/src/from/vcf.rs
index 4de20154d7..a751a774d3 100644
--- a/crates/nu_plugin_formats/src/from/vcf.rs
+++ b/crates/nu_plugin_formats/src/from/vcf.rs
@@ -1,4 +1,4 @@
-use crate::FromCmds;
+use crate::FormatCmdsPlugin;
 
 use ical::{parser::vcard::component::*, property::Property};
 use indexmap::IndexMap;
@@ -10,7 +10,7 @@ use nu_protocol::{
 pub struct FromVcf;
 
 impl SimplePluginCommand for FromVcf {
-    type Plugin = FromCmds;
+    type Plugin = FormatCmdsPlugin;
 
     fn name(&self) -> &str {
         "from vcf"
@@ -32,7 +32,7 @@ impl SimplePluginCommand for FromVcf {
 
     fn run(
         &self,
-        _plugin: &FromCmds,
+        _plugin: &FormatCmdsPlugin,
         _engine: &EngineInterface,
         call: &EvaluatedCall,
         input: &Value,
@@ -164,5 +164,5 @@ fn params_to_value(params: Vec<(String, Vec<String>)>, span: Span) -> Value {
 fn test_examples() -> Result<(), nu_protocol::ShellError> {
     use nu_plugin_test_support::PluginTest;
 
-    PluginTest::new("formats", crate::FromCmds.into())?.test_command_examples(&FromVcf)
+    PluginTest::new("formats", crate::FormatCmdsPlugin.into())?.test_command_examples(&FromVcf)
 }
diff --git a/crates/nu_plugin_formats/src/lib.rs b/crates/nu_plugin_formats/src/lib.rs
index 2ae24a4971..ce95fcf8c9 100644
--- a/crates/nu_plugin_formats/src/lib.rs
+++ b/crates/nu_plugin_formats/src/lib.rs
@@ -1,15 +1,18 @@
 mod from;
+mod to;
 
 use nu_plugin::{Plugin, PluginCommand};
 
-pub use from::eml::FromEml;
-pub use from::ics::FromIcs;
-pub use from::ini::FromIni;
-pub use from::vcf::FromVcf;
+use from::eml::FromEml;
+use from::ics::FromIcs;
+use from::ini::FromIni;
+use from::plist::FromPlist;
+use from::vcf::FromVcf;
+use to::plist::IntoPlist;
 
-pub struct FromCmds;
+pub struct FormatCmdsPlugin;
 
-impl Plugin for FromCmds {
+impl Plugin for FormatCmdsPlugin {
     fn version(&self) -> String {
         env!("CARGO_PKG_VERSION").into()
     }
@@ -20,6 +23,8 @@ impl Plugin for FromCmds {
             Box::new(FromIcs),
             Box::new(FromIni),
             Box::new(FromVcf),
+            Box::new(FromPlist),
+            Box::new(IntoPlist),
         ]
     }
 }
diff --git a/crates/nu_plugin_formats/src/main.rs b/crates/nu_plugin_formats/src/main.rs
index e6c7179781..f36ba3364a 100644
--- a/crates/nu_plugin_formats/src/main.rs
+++ b/crates/nu_plugin_formats/src/main.rs
@@ -1,6 +1,6 @@
 use nu_plugin::{serve_plugin, MsgPackSerializer};
-use nu_plugin_formats::FromCmds;
+use nu_plugin_formats::FormatCmdsPlugin;
 
 fn main() {
-    serve_plugin(&FromCmds, MsgPackSerializer {})
+    serve_plugin(&FormatCmdsPlugin, MsgPackSerializer {})
 }
diff --git a/crates/nu_plugin_formats/src/to/mod.rs b/crates/nu_plugin_formats/src/to/mod.rs
new file mode 100644
index 0000000000..2f804de5d6
--- /dev/null
+++ b/crates/nu_plugin_formats/src/to/mod.rs
@@ -0,0 +1 @@
+pub(crate) mod plist;
diff --git a/crates/nu_plugin_formats/src/to/plist.rs b/crates/nu_plugin_formats/src/to/plist.rs
new file mode 100644
index 0000000000..94368c184a
--- /dev/null
+++ b/crates/nu_plugin_formats/src/to/plist.rs
@@ -0,0 +1,113 @@
+use std::time::SystemTime;
+
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand, SimplePluginCommand};
+use nu_protocol::{Category, Example, LabeledError, Record, Signature, Span, Value as NuValue};
+use plist::{Integer, Value as PlistValue};
+
+use crate::FormatCmdsPlugin;
+
+pub(crate) struct IntoPlist;
+
+impl SimplePluginCommand for IntoPlist {
+    type Plugin = FormatCmdsPlugin;
+
+    fn name(&self) -> &str {
+        "to plist"
+    }
+
+    fn usage(&self) -> &str {
+        "Convert Nu values into plist"
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![Example {
+            example: "{ a: 3 } | to plist",
+            description: "Convert a table into a plist file",
+            result: None,
+        }]
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(PluginCommand::name(self))
+            .switch("binary", "Output plist in binary format", Some('b'))
+            .category(Category::Formats)
+    }
+
+    fn run(
+        &self,
+        _plugin: &FormatCmdsPlugin,
+        _engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: &NuValue,
+    ) -> Result<NuValue, LabeledError> {
+        let plist_val = convert_nu_value(input)?;
+        let mut out = Vec::new();
+        if call.has_flag("binary")? {
+            plist::to_writer_binary(&mut out, &plist_val)
+                .map_err(|e| build_label_error(format!("{}", e), input.span()))?;
+            Ok(NuValue::binary(out, input.span()))
+        } else {
+            plist::to_writer_xml(&mut out, &plist_val)
+                .map_err(|e| build_label_error(format!("{}", e), input.span()))?;
+            Ok(NuValue::string(
+                String::from_utf8(out)
+                    .map_err(|e| build_label_error(format!("{}", e), input.span()))?,
+                input.span(),
+            ))
+        }
+    }
+}
+
+fn build_label_error(msg: String, span: Span) -> LabeledError {
+    LabeledError::new("Cannot convert plist").with_label(msg, span)
+}
+
+fn convert_nu_value(nu_val: &NuValue) -> Result<PlistValue, LabeledError> {
+    let span = Span::test_data();
+    match nu_val {
+        NuValue::String { val, .. } => Ok(PlistValue::String(val.to_owned())),
+        NuValue::Bool { val, .. } => Ok(PlistValue::Boolean(*val)),
+        NuValue::Float { val, .. } => Ok(PlistValue::Real(*val)),
+        NuValue::Int { val, .. } => Ok(PlistValue::Integer(Into::<Integer>::into(*val))),
+        NuValue::Binary { val, .. } => Ok(PlistValue::Data(val.to_owned())),
+        NuValue::Record { val, .. } => convert_nu_dict(val),
+        NuValue::List { vals, .. } => Ok(PlistValue::Array(
+            vals.iter()
+                .map(convert_nu_value)
+                .collect::<Result<_, _>>()?,
+        )),
+        NuValue::Date { val, .. } => Ok(PlistValue::Date(SystemTime::from(val.to_owned()).into())),
+        NuValue::Filesize { val, .. } => Ok(PlistValue::Integer(Into::<Integer>::into(*val))),
+        _ => Err(build_label_error(
+            format!("{:?} is not convertible", nu_val),
+            span,
+        )),
+    }
+}
+
+fn convert_nu_dict(record: &Record) -> Result<PlistValue, LabeledError> {
+    Ok(PlistValue::Dictionary(
+        record
+            .iter()
+            .map(|(k, v)| convert_nu_value(v).map(|v| (k.to_owned(), v)))
+            .collect::<Result<_, _>>()?,
+    ))
+}
+
+#[cfg(test)]
+mod test {
+
+    use nu_plugin_test_support::PluginTest;
+    use nu_protocol::ShellError;
+
+    use super::*;
+
+    #[test]
+    fn test_examples() -> Result<(), ShellError> {
+        let plugin = FormatCmdsPlugin {};
+        let cmd = IntoPlist {};
+
+        let mut plugin_test = PluginTest::new("polars", plugin.into())?;
+        plugin_test.test_command_examples(&cmd)
+    }
+}

From 6d36941e5525898a8281a5503dc02160e88b8eee Mon Sep 17 00:00:00 2001
From: Yash Thakur <45539777+ysthakur@users.noreply.github.com>
Date: Mon, 5 Aug 2024 20:30:10 -0400
Subject: [PATCH 0312/1072] Add completions.sort option (#13311)

---
 .../src/completions/command_completions.rs    | 14 ++----
 crates/nu-cli/src/completions/completer.rs    |  1 +
 .../src/completions/completion_common.rs      | 45 ++++++++++---------
 .../src/completions/completion_options.rs     | 13 ++----
 .../src/completions/custom_completions.rs     | 26 +++++------
 .../src/completions/dotnu_completions.rs      |  4 +-
 .../src/completions/flag_completions.rs       |  6 +--
 crates/nu-cli/src/completions/mod.rs          |  2 +-
 .../src/completions/variable_completions.rs   | 12 ++---
 crates/nu-cli/tests/completions/mod.rs        | 35 ++++++++++++---
 crates/nu-lsp/src/lib.rs                      | 22 ++++-----
 crates/nu-protocol/src/config/completer.rs    | 29 ++++++++++++
 crates/nu-protocol/src/config/mod.rs          | 12 ++++-
 .../src/sample_config/default_config.nu       |  1 +
 tests/fixtures/lsp/completion/keyword.nu      |  2 +-
 15 files changed, 139 insertions(+), 85 deletions(-)

diff --git a/crates/nu-cli/src/completions/command_completions.rs b/crates/nu-cli/src/completions/command_completions.rs
index f594e3d667..f8107f8ed7 100644
--- 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;
@@ -193,11 +193,7 @@ impl Completer for CommandCompletion {
         };
 
         if !subcommands.is_empty() {
-            return sort_suggestions(
-                &String::from_utf8_lossy(&prefix),
-                subcommands,
-                SortBy::LevenshteinDistance,
-            );
+            return sort_suggestions(&String::from_utf8_lossy(&prefix), subcommands, options);
         }
 
         let config = working_set.get_config();
@@ -222,11 +218,7 @@ impl Completer for CommandCompletion {
             vec![]
         };
 
-        sort_suggestions(
-            &String::from_utf8_lossy(&prefix),
-            commands,
-            SortBy::LevenshteinDistance,
-        )
+        sort_suggestions(&String::from_utf8_lossy(&prefix), commands, options)
     }
 }
 
diff --git a/crates/nu-cli/src/completions/completer.rs b/crates/nu-cli/src/completions/completer.rs
index e794354f09..91fc1132a5 100644
--- a/crates/nu-cli/src/completions/completer.rs
+++ b/crates/nu-cli/src/completions/completer.rs
@@ -48,6 +48,7 @@ impl NuCompleter {
         let options = CompletionOptions {
             case_sensitive: config.case_sensitive_completions,
             match_algorithm: config.completion_algorithm.into(),
+            sort: config.completion_sort,
             ..Default::default()
         };
 
diff --git a/crates/nu-cli/src/completions/completion_common.rs b/crates/nu-cli/src/completions/completion_common.rs
index 2b85f6091e..a5d07be57e 100644
--- a/crates/nu-cli/src/completions/completion_common.rs
+++ b/crates/nu-cli/src/completions/completion_common.rs
@@ -2,17 +2,18 @@ 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},
-    levenshtein_distance, Span,
+    CompletionSort, Span,
 };
 use nu_utils::get_ls_colors;
 use std::path::{is_separator, Component, Path, PathBuf, MAIN_SEPARATOR as SEP};
 
-use super::{MatchAlgorithm, SortBy};
+use super::MatchAlgorithm;
 
 #[derive(Clone, Default)]
 pub struct PathBuiltFromString {
@@ -71,7 +72,7 @@ pub fn complete_rec(
     }
 
     let prefix = partial.first().unwrap_or(&"");
-    let sorted_entries = sort_completions(prefix, entries, SortBy::Ascending, |(entry, _)| entry);
+    let sorted_entries = sort_completions(prefix, entries, options, |(entry, _)| entry);
 
     for (entry_name, built) in sorted_entries {
         match partial.split_first() {
@@ -305,33 +306,37 @@ pub fn adjust_if_intermediate(
 pub fn sort_suggestions(
     prefix: &str,
     items: Vec<SemanticSuggestion>,
-    sort_by: SortBy,
+    options: &CompletionOptions,
 ) -> Vec<SemanticSuggestion> {
-    sort_completions(prefix, items, sort_by, |it| &it.suggestion.value)
+    sort_completions(prefix, items, options, |it| &it.suggestion.value)
 }
 
 /// # Arguments
-/// * `prefix` - What the user's typed, for sorting by Levenshtein distance
+/// * `prefix` - What the user's typed, for sorting by fuzzy matcher score
 pub fn sort_completions<T>(
     prefix: &str,
     mut items: Vec<T>,
-    sort_by: SortBy,
+    options: &CompletionOptions,
     get_value: fn(&T) -> &str,
 ) -> Vec<T> {
     // Sort items
-    match sort_by {
-        SortBy::LevenshteinDistance => {
-            items.sort_by(|a, b| {
-                let a_distance = levenshtein_distance(prefix, get_value(a));
-                let b_distance = levenshtein_distance(prefix, get_value(b));
-                a_distance.cmp(&b_distance)
-            });
-        }
-        SortBy::Ascending => {
-            items.sort_by(|a, b| get_value(a).cmp(get_value(b)));
-        }
-        SortBy::None => {}
-    };
+    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
 }
diff --git a/crates/nu-cli/src/completions/completion_options.rs b/crates/nu-cli/src/completions/completion_options.rs
index a414aafedf..880aa54fb1 100644
--- 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(),
         }
     }
 }
diff --git a/crates/nu-cli/src/completions/custom_completions.rs b/crates/nu-cli/src/completions/custom_completions.rs
index 0d2c674ef9..f21f942501 100644
--- a/crates/nu-cli/src/completions/custom_completions.rs
+++ b/crates/nu-cli/src/completions/custom_completions.rs
@@ -1,13 +1,13 @@
 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;
@@ -18,7 +18,6 @@ pub struct CustomCompletion {
     stack: Stack,
     decl_id: usize,
     line: String,
-    sort_by: SortBy,
 }
 
 impl CustomCompletion {
@@ -27,7 +26,6 @@ impl CustomCompletion {
             stack,
             decl_id,
             line,
-            sort_by: SortBy::None,
         }
     }
 }
@@ -93,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")
@@ -114,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
+                            },
                         });
                     }
 
@@ -124,12 +123,11 @@ impl Completer for CustomCompletion {
             })
             .unwrap_or_default();
 
-        let suggestions = if let Some(custom_completion_options) = custom_completion_options {
-            filter(&prefix, suggestions, &custom_completion_options)
-        } else {
-            filter(&prefix, suggestions, completion_options)
-        };
-        sort_suggestions(&String::from_utf8_lossy(&prefix), suggestions, self.sort_by)
+        let options = custom_completion_options
+            .as_ref()
+            .unwrap_or(completion_options);
+        let suggestions = filter(&prefix, suggestions, completion_options);
+        sort_suggestions(&String::from_utf8_lossy(&prefix), suggestions, options)
     }
 }
 
diff --git a/crates/nu-cli/src/completions/dotnu_completions.rs b/crates/nu-cli/src/completions/dotnu_completions.rs
index 6b4be16769..4a241a57b9 100644
--- a/crates/nu-cli/src/completions/dotnu_completions.rs
+++ b/crates/nu-cli/src/completions/dotnu_completions.rs
@@ -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::{completion_common::sort_suggestions, SemanticSuggestion, SortBy};
+use super::{completion_common::sort_suggestions, SemanticSuggestion};
 
 #[derive(Clone, Default)]
 pub struct DotNuCompletion {}
@@ -130,6 +130,6 @@ impl Completer for DotNuCompletion {
             })
             .collect();
 
-        sort_suggestions(&prefix_str, output, SortBy::Ascending)
+        sort_suggestions(&prefix_str, output, options)
     }
 }
diff --git a/crates/nu-cli/src/completions/flag_completions.rs b/crates/nu-cli/src/completions/flag_completions.rs
index c4ccfd6048..590929d5a0 100644
--- a/crates/nu-cli/src/completions/flag_completions.rs
+++ b/crates/nu-cli/src/completions/flag_completions.rs
@@ -1,6 +1,4 @@
-use crate::completions::{
-    completion_common::sort_suggestions, Completer, CompletionOptions, SortBy,
-};
+use crate::completions::{completion_common::sort_suggestions, Completer, CompletionOptions};
 use nu_protocol::{
     ast::{Expr, Expression},
     engine::{Stack, StateWorkingSet},
@@ -90,7 +88,7 @@ impl Completer for FlagCompletion {
                 }
             }
 
-            return sort_suggestions(&String::from_utf8_lossy(&prefix), output, SortBy::Ascending);
+            return sort_suggestions(&String::from_utf8_lossy(&prefix), output, options);
         }
 
         vec![]
diff --git a/crates/nu-cli/src/completions/mod.rs b/crates/nu-cli/src/completions/mod.rs
index 20a61ee6d9..ed1510cdfb 100644
--- 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;
diff --git a/crates/nu-cli/src/completions/variable_completions.rs b/crates/nu-cli/src/completions/variable_completions.rs
index 418dcec064..5e8f117810 100644
--- a/crates/nu-cli/src/completions/variable_completions.rs
+++ b/crates/nu-cli/src/completions/variable_completions.rs
@@ -9,7 +9,7 @@ use nu_protocol::{
 use reedline::Suggestion;
 use std::str;
 
-use super::{completion_common::sort_suggestions, SortBy};
+use super::completion_common::sort_suggestions;
 
 #[derive(Clone)]
 pub struct VariableCompletion {
@@ -72,7 +72,7 @@ impl Completer for VariableCompletion {
                             }
                         }
 
-                        return sort_suggestions(&prefix_str, output, SortBy::Ascending);
+                        return sort_suggestions(&prefix_str, output, options);
                     }
                 } else {
                     // No nesting provided, return all env vars
@@ -93,7 +93,7 @@ impl Completer for VariableCompletion {
                         }
                     }
 
-                    return sort_suggestions(&prefix_str, output, SortBy::Ascending);
+                    return sort_suggestions(&prefix_str, output, options);
                 }
             }
 
@@ -117,7 +117,7 @@ impl Completer for VariableCompletion {
                         }
                     }
 
-                    return sort_suggestions(&prefix_str, output, SortBy::Ascending);
+                    return sort_suggestions(&prefix_str, output, options);
                 }
             }
 
@@ -139,7 +139,7 @@ impl Completer for VariableCompletion {
                         }
                     }
 
-                    return sort_suggestions(&prefix_str, output, SortBy::Ascending);
+                    return sort_suggestions(&prefix_str, output, options);
                 }
             }
         }
@@ -217,7 +217,7 @@ impl Completer for VariableCompletion {
             }
         }
 
-        output = sort_suggestions(&prefix_str, output, SortBy::Ascending);
+        output = sort_suggestions(&prefix_str, output, options);
 
         output.dedup(); // TODO: Removes only consecutive duplicates, is it intended?
 
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index ad5dcaa70e..e1714f78e2 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -89,14 +89,12 @@ fn subcommand_completer() -> NuCompleter {
     // Create a new engine
     let (dir, _, mut engine, mut stack) = new_engine();
 
-    // Use fuzzy matching, because subcommands are sorted by Levenshtein distance,
-    // and that's not very useful with prefix matching
     let commands = r#"
             $env.config.completions.algorithm = "fuzzy"
             def foo [] {}
             def "foo bar" [] {}
             def "foo abaz" [] {}
-            def "foo aabrr" [] {}
+            def "foo aabcrr" [] {}
             def food [] {}
         "#;
     assert!(support::merge_input(commands.as_bytes(), &mut engine, &mut stack, dir).is_ok());
@@ -105,6 +103,22 @@ fn subcommand_completer() -> NuCompleter {
     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_variablecompletion() {
     let (_, _, engine, stack) = new_engine();
@@ -774,7 +788,7 @@ 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 aabrr".to_string()],
+        &vec!["foo bar".to_string(), "foo aabcrr".to_string()],
         &suggestions,
     );
 
@@ -783,8 +797,8 @@ fn subcommand_completions(mut subcommand_completer: NuCompleter) {
     match_suggestions(
         &vec![
             "foo bar".to_string(),
+            "foo aabcrr".to_string(),
             "foo abaz".to_string(),
-            "foo aabrr".to_string(),
         ],
         &suggestions,
     );
@@ -1270,6 +1284,17 @@ fn custom_completer_triggers_cursor_after_word(mut custom_completer: NuCompleter
     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"]
 #[rstest]
 fn alias_offset_bug_7648() {
diff --git a/crates/nu-lsp/src/lib.rs b/crates/nu-lsp/src/lib.rs
index aee2ab240d..6841749fc9 100644
--- a/crates/nu-lsp/src/lib.rs
+++ b/crates/nu-lsp/src/lib.rs
@@ -1195,17 +1195,17 @@ mod tests {
         assert_json_include!(
             actual: result,
             expected: serde_json::json!([
-               {
-                  "label": "def",
-                  "textEdit": {
-                     "newText": "def",
-                     "range": {
-                        "start": { "character": 0, "line": 0 },
-                        "end": { "character": 2, "line": 0 }
-                     }
-                  },
-                  "kind": 14
-               }
+                {
+                    "label": "overlay",
+                    "textEdit": {
+                        "newText": "overlay",
+                        "range": {
+                            "start": { "character": 0, "line": 0 },
+                            "end": { "character": 2, "line": 0 }
+                        }
+                    },
+                    "kind": 14
+                },
             ])
         );
     }
diff --git a/crates/nu-protocol/src/config/completer.rs b/crates/nu-protocol/src/config/completer.rs
index 67bde52e27..921057c082 100644
--- a/crates/nu-protocol/src/config/completer.rs
+++ b/crates/nu-protocol/src/config/completer.rs
@@ -35,6 +35,35 @@ impl ReconstructVal for CompletionAlgorithm {
     }
 }
 
+#[derive(Serialize, Deserialize, Clone, Copy, Debug, Default, PartialEq)]
+pub enum CompletionSort {
+    #[default]
+    Smart,
+    Alphabetical,
+}
+
+impl FromStr for CompletionSort {
+    type Err = &'static str;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s.to_ascii_lowercase().as_str() {
+            "smart" => Ok(Self::Smart),
+            "alphabetical" => Ok(Self::Alphabetical),
+            _ => Err("expected either 'smart' or 'alphabetical'"),
+        }
+    }
+}
+
+impl ReconstructVal for CompletionSort {
+    fn reconstruct_value(&self, span: Span) -> Value {
+        let str = match self {
+            Self::Smart => "smart",
+            Self::Alphabetical => "alphabetical",
+        };
+        Value::string(str, span)
+    }
+}
+
 pub(super) fn reconstruct_external_completer(config: &Config, span: Span) -> Value {
     if let Some(closure) = config.external_completer.as_ref() {
         Value::closure(closure.clone(), span)
diff --git a/crates/nu-protocol/src/config/mod.rs b/crates/nu-protocol/src/config/mod.rs
index eda3d9a15e..59cc70fb79 100644
--- a/crates/nu-protocol/src/config/mod.rs
+++ b/crates/nu-protocol/src/config/mod.rs
@@ -11,7 +11,7 @@ use crate::{record, ShellError, Span, Value};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
-pub use self::completer::CompletionAlgorithm;
+pub use self::completer::{CompletionAlgorithm, CompletionSort};
 pub use self::helper::extract_value;
 pub use self::hooks::Hooks;
 pub use self::output::ErrorStyle;
@@ -69,6 +69,7 @@ pub struct Config {
     pub quick_completions: bool,
     pub partial_completions: bool,
     pub completion_algorithm: CompletionAlgorithm,
+    pub completion_sort: CompletionSort,
     pub edit_mode: EditBindings,
     pub history: HistoryConfig,
     pub keybindings: Vec<ParsedKeybinding>,
@@ -141,6 +142,7 @@ impl Default for Config {
             quick_completions: true,
             partial_completions: true,
             completion_algorithm: CompletionAlgorithm::default(),
+            completion_sort: CompletionSort::default(),
             enable_external_completion: true,
             max_external_completion_results: 100,
             recursion_limit: 50,
@@ -341,6 +343,13 @@ impl Value {
                                     "case_sensitive" => {
                                         process_bool_config(value, &mut errors, &mut config.case_sensitive_completions);
                                     }
+                                    "sort" => {
+                                        process_string_enum(
+                                            &mut config.completion_sort,
+                                            &[key, key2],
+                                            value,
+                                            &mut errors);
+                                    }
                                     "external" => {
                                         if let Value::Record { val, .. } = value {
                                             val.to_mut().retain_mut(|key3, value|
@@ -401,6 +410,7 @@ impl Value {
                                     "partial" => Value::bool(config.partial_completions, span),
                                     "algorithm" => config.completion_algorithm.reconstruct_value(span),
                                     "case_sensitive" => Value::bool(config.case_sensitive_completions, span),
+                                    "sort" => config.completion_sort.reconstruct_value(span),
                                     "external" => reconstruct_external(&config, span),
                                     "use_ls_colors" => Value::bool(config.use_ls_colors_completions, span),
                                 },
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index 0c78cf9ca1..b807244cee 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -206,6 +206,7 @@ $env.config = {
         quick: true    # set this to false to prevent auto-selecting completions when only one remains
         partial: true    # set this to false to prevent partial filling of the prompt
         algorithm: "prefix"    # prefix or fuzzy
+        sort: "smart" # "smart" (alphabetical for prefix matching, fuzzy score for fuzzy matching) or "alphabetical"
         external: {
             enable: true # set to false to prevent nushell looking into $env.PATH to find more suggestions, `false` recommended for WSL users as this look up may be very slow
             max_results: 100 # setting it lower can improve completion performance at the cost of omitting some options
diff --git a/tests/fixtures/lsp/completion/keyword.nu b/tests/fixtures/lsp/completion/keyword.nu
index 7673daa944..b4226322e1 100644
--- a/tests/fixtures/lsp/completion/keyword.nu
+++ b/tests/fixtures/lsp/completion/keyword.nu
@@ -1 +1 @@
-de
+ov

From 4e83ccdf86c71811f54919ab0eb4c2d38eba4005 Mon Sep 17 00:00:00 2001
From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Mon, 5 Aug 2024 21:05:32 -0400
Subject: [PATCH 0313/1072] Allow `int` input when using a formatstring in
 `into datetime` (#13541)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

When using a format string, `into datetime` would disallow an `int` even
when it logically made sense. This was mainly a problem when attempting
to convert a Unix epoch to Nushell `datetime`. Unix epochs are often
stored or returned as `int` in external data sources.

```nu
1722821463 | into datetime -f '%s'
Error: nu::shell::only_supports_this_input_type

  × Input type not supported.
   ╭─[entry #3:1:1]
 1 │ 1722821463 | into datetime -f '%s'
   · ─────┬────   ──────┬──────
   ·      │             ╰── only string input data is supported
   ·      ╰── input type: int
   ╰────
```

While the solution was simply to `| to text` the `int`, this PR handles
the use-case automatically.

Essentially a ~5 line change that just moves the current parsing to a
closure that is called for both Strings and Ints-converted-to-Strings.

# User-Facing Changes

After the change:

```nu
[
  1722821463
  "1722821463"
  0
] | each { into datetime -f '%s' }
╭───┬──────────────╮
│ 0 │ 10 hours ago │
│ 1 │ 10 hours ago │
│ 2 │ 54 years ago │
╰───┴──────────────╯
```

# Tests + Formatting

Test case added.

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
---
 .../src/conversions/into/datetime.rs          | 85 ++++++++++++-------
 1 file changed, 54 insertions(+), 31 deletions(-)

diff --git a/crates/nu-command/src/conversions/into/datetime.rs b/crates/nu-command/src/conversions/into/datetime.rs
index 8dc0340ba1..9dd6ad9335 100644
--- a/crates/nu-command/src/conversions/into/datetime.rs
+++ b/crates/nu-command/src/conversions/into/datetime.rs
@@ -379,42 +379,47 @@ fn action(input: &Value, args: &Arguments, head: Span) -> Value {
 
     // If input is not a timestamp, try parsing it as a string
     let span = input.span();
-    match input {
-        Value::String { val, .. } => {
-            match dateformat {
-                Some(dt) => match DateTime::parse_from_str(val, &dt.0) {
-                    Ok(d) => Value::date ( d, head ),
-                    Err(reason) => {
-                        match NaiveDateTime::parse_from_str(val, &dt.0) {
-                            Ok(d) => Value::date (
-                                DateTime::from_naive_utc_and_offset(
-                                    d,
-                                    *Local::now().offset(),
-                                ),
-                                head,
+
+    let parse_as_string = |val: &str| {
+        match dateformat {
+            Some(dt) => match DateTime::parse_from_str(val, &dt.0) {
+                Ok(d) => Value::date ( d, head ),
+                Err(reason) => {
+                    match NaiveDateTime::parse_from_str(val, &dt.0) {
+                        Ok(d) => Value::date (
+                            DateTime::from_naive_utc_and_offset(
+                                d,
+                                *Local::now().offset(),
                             ),
-                            Err(_) => {
-                                Value::error (
-                                    ShellError::CantConvert { to_type: format!("could not parse as datetime using format '{}'", dt.0), from_type: reason.to_string(), span: head, help: Some("you can use `into datetime` without a format string to enable flexible parsing".to_string()) },
-                                    head,
-                                )
-                            }
+                            head,
+                        ),
+                        Err(_) => {
+                            Value::error (
+                                ShellError::CantConvert { to_type: format!("could not parse as datetime using format '{}'", dt.0), from_type: reason.to_string(), span: head, help: Some("you can use `into datetime` without a format string to enable flexible parsing".to_string()) },
+                                head,
+                            )
                         }
                     }
-                },
+                }
+            },
 
-                // Tries to automatically parse the date
-                // (i.e. without a format string)
-                // and assumes the system's local timezone if none is specified
-                None => match parse_date_from_string(val, span) {
-                    Ok(date) => Value::date (
-                        date,
-                        span,
-                    ),
-                    Err(err) => err,
-                },
-            }
+            // Tries to automatically parse the date
+            // (i.e. without a format string)
+            // and assumes the system's local timezone if none is specified
+            None => match parse_date_from_string(val, span) {
+                Ok(date) => Value::date (
+                    date,
+                    span,
+                ),
+                Err(err) => err,
+            },
         }
+    };
+
+    match input {
+        Value::String { val, .. } => parse_as_string(val),
+        Value::Int { val, .. } => parse_as_string(&val.to_string()),
+
         // Propagate errors by explicitly matching them before the final case.
         Value::Error { .. } => input.clone(),
         other => Value::error(
@@ -575,6 +580,24 @@ mod tests {
         assert_eq!(actual, expected)
     }
 
+    #[test]
+    fn takes_int_with_formatstring() {
+        let date_int = Value::test_int(1_614_434_140);
+        let fmt_options = Some(DatetimeFormat("%s".to_string()));
+        let args = Arguments {
+            zone_options: None,
+            format_options: fmt_options,
+            cell_paths: None,
+        };
+        let actual = action(&date_int, &args, Span::test_data());
+        let expected = Value::date(
+            DateTime::parse_from_str("2021-02-27 21:55:40 +08:00", "%Y-%m-%d %H:%M:%S %z").unwrap(),
+            Span::test_data(),
+        );
+
+        assert_eq!(actual, expected)
+    }
+
     #[test]
     fn takes_timestamp() {
         let date_str = Value::test_string("1614434140000000000");

From 73e8de9753b11e297633d2483bb2711f2d7a5cf2 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Tue, 6 Aug 2024 02:36:24 -0700
Subject: [PATCH 0314/1072] Attempt to guess the content type of a file when
 opening with --raw (#13521)

# Description
Attempt to guess the content type of a file when opening with --raw and
set it in the pipeline metadata.

<img width="644" alt="Screenshot 2024-08-02 at 11 30 10"
src="https://github.com/user-attachments/assets/071f0967-c4dd-405a-b8c8-f7aa073efa98">


# User-Facing Changes
- Content of files can be directly piped into commands like `http post`
with the content type set appropriately when using `--raw`.
---
 crates/nu-command/src/filesystem/open.rs | 29 +++++++++++++++++++++++-
 crates/nu-command/src/formats/to/toml.rs | 21 +++++++++++++----
 crates/nu-command/src/formats/to/yaml.rs |  1 +
 crates/nu-command/tests/commands/open.rs | 24 ++++++++++++++++++++
 crates/nu-test-support/src/lib.rs        |  1 +
 5 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/crates/nu-command/src/filesystem/open.rs b/crates/nu-command/src/filesystem/open.rs
index 0351d1d9b2..23e95d1aed 100644
--- a/crates/nu-command/src/filesystem/open.rs
+++ b/crates/nu-command/src/filesystem/open.rs
@@ -146,11 +146,19 @@ impl Command for Open {
                         }
                     };
 
+                    let content_type = if raw {
+                        path.extension()
+                            .map(|ext| ext.to_string_lossy().to_string())
+                            .and_then(|ref s| detect_content_type(s))
+                    } else {
+                        None
+                    };
+
                     let stream = PipelineData::ByteStream(
                         ByteStream::file(file, call_span, engine_state.signals().clone()),
                         Some(PipelineMetadata {
                             data_source: DataSource::FilePath(path.to_path_buf()),
-                            content_type: None,
+                            content_type,
                         }),
                     );
 
@@ -268,3 +276,22 @@ fn extract_extensions(filename: &str) -> Vec<String> {
 
     extensions
 }
+
+fn detect_content_type(extension: &str) -> Option<String> {
+    // This will allow the overriding of metadata to be consistent with
+    // the content type
+    match extension {
+        // Per RFC-9512, application/yaml should be used
+        "yaml" | "yml" => Some("application/yaml".to_string()),
+        _ => mime_guess::from_ext(extension)
+            .first()
+            .map(|mime| mime.to_string()),
+    }
+}
+
+#[cfg(test)]
+mod test {
+
+    #[test]
+    fn test_content_type() {}
+}
diff --git a/crates/nu-command/src/formats/to/toml.rs b/crates/nu-command/src/formats/to/toml.rs
index ed1490231c..c70864b7f8 100644
--- a/crates/nu-command/src/formats/to/toml.rs
+++ b/crates/nu-command/src/formats/to/toml.rs
@@ -1,6 +1,6 @@
 use chrono::{DateTime, Datelike, FixedOffset, Timelike};
 use nu_engine::command_prelude::*;
-use nu_protocol::ast::PathMember;
+use nu_protocol::{ast::PathMember, PipelineMetadata};
 
 #[derive(Clone)]
 pub struct ToToml;
@@ -100,9 +100,18 @@ fn toml_into_pipeline_data(
     toml_value: &toml::Value,
     value_type: Type,
     span: Span,
+    metadata: Option<PipelineMetadata>,
 ) -> Result<PipelineData, ShellError> {
+    let new_md = Some(
+        metadata
+            .unwrap_or_default()
+            .with_content_type(Some("text/x-toml".into())),
+    );
+
     match toml::to_string_pretty(&toml_value) {
-        Ok(serde_toml_string) => Ok(Value::string(serde_toml_string, span).into_pipeline_data()),
+        Ok(serde_toml_string) => {
+            Ok(Value::string(serde_toml_string, span).into_pipeline_data_with_metadata(new_md))
+        }
         _ => Ok(Value::error(
             ShellError::CantConvert {
                 to_type: "TOML".into(),
@@ -112,7 +121,7 @@ fn toml_into_pipeline_data(
             },
             span,
         )
-        .into_pipeline_data()),
+        .into_pipeline_data_with_metadata(new_md)),
     }
 }
 
@@ -139,6 +148,7 @@ fn to_toml(
     input: PipelineData,
     span: Span,
 ) -> Result<PipelineData, ShellError> {
+    let metadata = input.metadata();
     let value = input.into_value(span)?;
 
     let toml_value = value_to_toml_value(engine_state, &value, span)?;
@@ -148,10 +158,11 @@ fn to_toml(
                 vec.iter().next().expect("this should never trigger"),
                 value.get_type(),
                 span,
+                metadata,
             ),
-            _ => toml_into_pipeline_data(&toml_value, value.get_type(), span),
+            _ => toml_into_pipeline_data(&toml_value, value.get_type(), span, metadata),
         },
-        _ => toml_into_pipeline_data(&toml_value, value.get_type(), span),
+        _ => toml_into_pipeline_data(&toml_value, value.get_type(), span, metadata),
     }
 }
 
diff --git a/crates/nu-command/src/formats/to/yaml.rs b/crates/nu-command/src/formats/to/yaml.rs
index c1693cda7d..ae923c1fc8 100644
--- a/crates/nu-command/src/formats/to/yaml.rs
+++ b/crates/nu-command/src/formats/to/yaml.rs
@@ -98,6 +98,7 @@ fn to_yaml(input: PipelineData, head: Span) -> Result<PipelineData, ShellError>
     let metadata = input
         .metadata()
         .unwrap_or_default()
+        // Per RFC-9512, application/yaml should be used
         .with_content_type(Some("application/yaml".into()));
     let value = input.into_value(head)?;
 
diff --git a/crates/nu-command/tests/commands/open.rs b/crates/nu-command/tests/commands/open.rs
index ac5e2f99e5..b50c6c9e6c 100644
--- a/crates/nu-command/tests/commands/open.rs
+++ b/crates/nu-command/tests/commands/open.rs
@@ -379,3 +379,27 @@ fn open_files_inside_glob_metachars_dir() {
         assert!(actual.out.contains("hello"));
     });
 }
+
+#[test]
+fn test_content_types_with_open_raw() {
+    Playground::setup("open_files_content_type_test", |dirs, _| {
+        let result = nu!(cwd: dirs.formats(), "open --raw random_numbers.csv | metadata");
+        assert!(result.out.contains("text/csv"));
+        let result = nu!(cwd: dirs.formats(), "open --raw caco3_plastics.tsv | metadata");
+        assert!(result.out.contains("text/tab-separated-values"));
+        let result = nu!(cwd: dirs.formats(), "open --raw sample-simple.json | metadata");
+        assert!(result.out.contains("application/json"));
+        let result = nu!(cwd: dirs.formats(), "open --raw sample.ini | metadata");
+        assert!(result.out.contains("text/plain"));
+        let result = nu!(cwd: dirs.formats(), "open --raw sample_data.xlsx | metadata");
+        assert!(result.out.contains("vnd.openxmlformats-officedocument"));
+        let result = nu!(cwd: dirs.formats(), "open --raw sample_def.nu | metadata");
+        assert!(!result.out.contains("content_type"));
+        let result = nu!(cwd: dirs.formats(), "open --raw sample.eml | metadata");
+        assert!(result.out.contains("message/rfc822"));
+        let result = nu!(cwd: dirs.formats(), "open --raw cargo_sample.toml | metadata");
+        assert!(result.out.contains("text/x-toml"));
+        let result = nu!(cwd: dirs.formats(), "open --raw appveyor.yml | metadata");
+        assert!(result.out.contains("application/yaml"));
+    })
+}
diff --git a/crates/nu-test-support/src/lib.rs b/crates/nu-test-support/src/lib.rs
index c6cadbcbd8..930e3792dc 100644
--- a/crates/nu-test-support/src/lib.rs
+++ b/crates/nu-test-support/src/lib.rs
@@ -9,6 +9,7 @@ use std::process::ExitStatus;
 // Needs to be reexported for `nu!` macro
 pub use nu_path;
 
+#[derive(Debug)]
 pub struct Outcome {
     pub out: String,
     pub err: String,

From 1cd0544a3f76ec8b26b136e9f824fbfa1ca1266d Mon Sep 17 00:00:00 2001
From: Andy Gayton <andy@thecablelounge.com>
Date: Tue, 6 Aug 2024 06:35:40 -0400
Subject: [PATCH 0315/1072] fix: relay Signals reset to plugins (#13510)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR will close #13501

# Description

This PR expands on [the relay of signals to running plugin
processes](https://github.com/nushell/nushell/pull/13181). The Ctrlc
relay has been generalized to SignalAction::Interrupt and when
reset_signal is called on the main EngineState, a SignalAction::Reset is
now relayed to running plugins.

# User-Facing Changes

The signal handler closure now takes a `signals::SignalAction`, while
previously it took no arguments. The handler will now be called on both
interrupt and reset. The method to register a handler on the plugin side
is now called `register_signal_handler` instead of
`register_ctrlc_handler`
[example](https://github.com/nushell/nushell/pull/13510/files#diff-3e04dff88fd0780a49778a3d1eede092ec729a1264b4ef07ca0d2baa859dad05L38).
This will only affect plugin authors who have started making use of
https://github.com/nushell/nushell/pull/13181, which isn't currently
part of an official release.

The change will also require all of user's plugins to be recompiled in
order that they don't error when a signal is received on the
PluginInterface.

# Testing

```
: example ctrlc
interrupt status: false
waiting for interrupt signal...
^Cinterrupt status: true
peace.
Error:   × Operation interrupted
   ╭─[display_output hook:1:1]
 1 │ if (term size).columns >= 100 { table -e } else { table }
   · ─┬
   ·  ╰── This operation was interrupted
   ╰────

: example ctrlc
interrupt status: false   <-- NOTE status is false
waiting for interrupt signal...
^Cinterrupt status: true
peace.
Error:   × Operation interrupted
   ╭─[display_output hook:1:1]
 1 │ if (term size).columns >= 100 { table -e } else { table }
   · ─┬
   ·  ╰── This operation was interrupted
   ╰────
   ```
---
 crates/nu-plugin-engine/src/interface/mod.rs  |  8 ++---
 crates/nu-plugin-engine/src/persistent.rs     | 24 ++++++-------
 crates/nu-plugin-protocol/src/lib.rs          |  7 ++--
 crates/nu-plugin/src/plugin/interface/mod.rs  | 35 ++++++++++---------
 crates/nu-protocol/src/engine/engine_state.rs | 21 ++++++-----
 crates/nu-protocol/src/engine/mod.rs          |  2 --
 .../{engine/ctrlc.rs => pipeline/handlers.rs} | 30 ++++++++--------
 crates/nu-protocol/src/pipeline/mod.rs        |  2 ++
 crates/nu-protocol/src/pipeline/signals.rs    | 12 ++++++-
 crates/nu-protocol/src/plugin/registered.rs   |  7 ++--
 .../nu_plugin_example/src/commands/ctrlc.rs   |  6 ++--
 src/signals.rs                                | 11 +++---
 12 files changed, 86 insertions(+), 79 deletions(-)
 rename crates/nu-protocol/src/{engine/ctrlc.rs => pipeline/handlers.rs} (83%)

diff --git a/crates/nu-plugin-engine/src/interface/mod.rs b/crates/nu-plugin-engine/src/interface/mod.rs
index 78ed966dd6..b27ea0be3d 100644
--- a/crates/nu-plugin-engine/src/interface/mod.rs
+++ b/crates/nu-plugin-engine/src/interface/mod.rs
@@ -12,7 +12,7 @@ use nu_plugin_protocol::{
 };
 use nu_protocol::{
     ast::Operator, engine::Sequence, CustomValue, IntoSpanned, PipelineData, PluginMetadata,
-    PluginSignature, ShellError, Signals, Span, Spanned, Value,
+    PluginSignature, ShellError, SignalAction, Signals, Span, Spanned, Value,
 };
 use nu_utils::SharedCow;
 use std::{
@@ -664,9 +664,9 @@ impl PluginInterface {
         self.flush()
     }
 
-    /// Send the plugin a ctrl-c signal.
-    pub fn ctrlc(&self) -> Result<(), ShellError> {
-        self.write(PluginInput::Ctrlc)?;
+    /// Send the plugin a signal.
+    pub fn signal(&self, action: SignalAction) -> Result<(), ShellError> {
+        self.write(PluginInput::Signal(action))?;
         self.flush()
     }
 
diff --git a/crates/nu-plugin-engine/src/persistent.rs b/crates/nu-plugin-engine/src/persistent.rs
index 69f5c7f7a8..f9dcc5143b 100644
--- a/crates/nu-plugin-engine/src/persistent.rs
+++ b/crates/nu-plugin-engine/src/persistent.rs
@@ -6,8 +6,9 @@ use crate::{
 use super::{PluginInterface, PluginSource};
 use nu_plugin_core::CommunicationMode;
 use nu_protocol::{
-    engine::{ctrlc, EngineState, Stack},
-    PluginGcConfig, PluginIdentity, PluginMetadata, RegisteredPlugin, ShellError,
+    engine::{EngineState, Stack},
+    HandlerGuard, Handlers, PluginGcConfig, PluginIdentity, PluginMetadata, RegisteredPlugin,
+    ShellError,
 };
 use std::{
     collections::HashMap,
@@ -37,8 +38,8 @@ struct MutableState {
     preferred_mode: Option<PreferredCommunicationMode>,
     /// Garbage collector config
     gc_config: PluginGcConfig,
-    /// RAII guard for this plugin's ctrl-c handler
-    ctrlc_guard: Option<ctrlc::Guard>,
+    /// RAII guard for this plugin's signal handler
+    signal_guard: Option<HandlerGuard>,
 }
 
 #[derive(Debug, Clone, Copy)]
@@ -66,7 +67,7 @@ impl PersistentPlugin {
                 metadata: None,
                 preferred_mode: None,
                 gc_config,
-                ctrlc_guard: None,
+                signal_guard: None,
             }),
         }
     }
@@ -303,21 +304,18 @@ impl RegisteredPlugin for PersistentPlugin {
         self
     }
 
-    fn configure_ctrlc_handler(
-        self: Arc<Self>,
-        handlers: &ctrlc::Handlers,
-    ) -> Result<(), ShellError> {
+    fn configure_signal_handler(self: Arc<Self>, handlers: &Handlers) -> Result<(), ShellError> {
         let guard = {
             // We take a weakref to the plugin so that we don't create a cycle to the
             // RAII guard that will be stored on the plugin.
             let plugin = Arc::downgrade(&self);
-            handlers.register(Box::new(move || {
-                // write a Ctrl-C packet through the PluginInterface if the plugin is alive and
+            handlers.register(Box::new(move |action| {
+                // write a signal packet through the PluginInterface if the plugin is alive and
                 // running
                 if let Some(plugin) = plugin.upgrade() {
                     if let Ok(mutable) = plugin.mutable.lock() {
                         if let Some(ref running) = mutable.running {
-                            let _ = running.interface.ctrlc();
+                            let _ = running.interface.signal(action);
                         }
                     }
                 }
@@ -325,7 +323,7 @@ impl RegisteredPlugin for PersistentPlugin {
         };
 
         if let Ok(mut mutable) = self.mutable.lock() {
-            mutable.ctrlc_guard = Some(guard);
+            mutable.signal_guard = Some(guard);
         }
 
         Ok(())
diff --git a/crates/nu-plugin-protocol/src/lib.rs b/crates/nu-plugin-protocol/src/lib.rs
index 00a18beca9..0473b2c499 100644
--- a/crates/nu-plugin-protocol/src/lib.rs
+++ b/crates/nu-plugin-protocol/src/lib.rs
@@ -23,7 +23,8 @@ pub mod test_util;
 
 use nu_protocol::{
     ast::Operator, engine::Closure, ByteStreamType, Config, DeclId, LabeledError, PipelineData,
-    PipelineMetadata, PluginMetadata, PluginSignature, ShellError, Span, Spanned, Value,
+    PipelineMetadata, PluginMetadata, PluginSignature, ShellError, SignalAction, Span, Spanned,
+    Value,
 };
 use nu_utils::SharedCow;
 use serde::{Deserialize, Serialize};
@@ -245,8 +246,8 @@ pub enum PluginInput {
     Drop(StreamId),
     /// See [`StreamMessage::Ack`].
     Ack(StreamId),
-    /// Signal a ctrlc event
-    Ctrlc,
+    /// Relay signals to the plugin
+    Signal(SignalAction),
 }
 
 impl TryFrom<PluginInput> for StreamMessage {
diff --git a/crates/nu-plugin/src/plugin/interface/mod.rs b/crates/nu-plugin/src/plugin/interface/mod.rs
index daf2d5b783..fc40b9c732 100644
--- a/crates/nu-plugin/src/plugin/interface/mod.rs
+++ b/crates/nu-plugin/src/plugin/interface/mod.rs
@@ -11,9 +11,9 @@ use nu_plugin_protocol::{
     PluginOutput, ProtocolInfo,
 };
 use nu_protocol::{
-    engine::{ctrlc, Closure, Sequence},
-    Config, DeclId, LabeledError, PipelineData, PluginMetadata, PluginSignature, ShellError,
-    Signals, Span, Spanned, Value,
+    engine::{Closure, Sequence},
+    Config, DeclId, Handler, HandlerGuard, Handlers, LabeledError, PipelineData, PluginMetadata,
+    PluginSignature, ShellError, SignalAction, Signals, Span, Spanned, Value,
 };
 use nu_utils::SharedCow;
 use std::{
@@ -64,10 +64,11 @@ struct EngineInterfaceState {
         mpsc::Sender<(EngineCallId, mpsc::Sender<EngineCallResponse<PipelineData>>)>,
     /// The synchronized output writer
     writer: Box<dyn PluginWrite<PluginOutput>>,
-    // Mirror signals from `EngineState`
+    /// Mirror signals from `EngineState`. You can make use of this with
+    /// `engine_interface.signals()` when constructing a Stream that requires signals
     signals: Signals,
-    /// Registered Ctrl-C handlers
-    ctrlc_handlers: ctrlc::Handlers,
+    /// Registered signal handlers
+    signal_handlers: Handlers,
 }
 
 impl std::fmt::Debug for EngineInterfaceState {
@@ -122,7 +123,7 @@ impl EngineInterfaceManager {
                 engine_call_subscription_sender: subscription_tx,
                 writer: Box::new(writer),
                 signals: Signals::new(Arc::new(AtomicBool::new(false))),
-                ctrlc_handlers: ctrlc::Handlers::new(),
+                signal_handlers: Handlers::new(),
             }),
             protocol_info_mut,
             plugin_call_sender: Some(plug_tx),
@@ -337,9 +338,12 @@ impl InterfaceManager for EngineInterfaceManager {
                     });
                 self.send_engine_call_response(id, response)
             }
-            PluginInput::Ctrlc => {
-                self.state.signals.trigger();
-                self.state.ctrlc_handlers.run();
+            PluginInput::Signal(action) => {
+                match action {
+                    SignalAction::Interrupt => self.state.signals.trigger(),
+                    SignalAction::Reset => self.state.signals.reset(),
+                }
+                self.state.signal_handlers.run(action);
                 Ok(())
             }
         }
@@ -521,13 +525,10 @@ impl EngineInterface {
         self.state.writer.is_stdout()
     }
 
-    /// Register a closure which will be called when the engine receives a Ctrl-C signal. Returns a
-    /// RAII guard that will keep the closure alive until it is dropped.
-    pub fn register_ctrlc_handler(
-        &self,
-        handler: ctrlc::Handler,
-    ) -> Result<ctrlc::Guard, ShellError> {
-        self.state.ctrlc_handlers.register(handler)
+    /// Register a closure which will be called when the engine receives an interrupt signal.
+    /// Returns a RAII guard that will keep the closure alive until it is dropped.
+    pub fn register_signal_handler(&self, handler: Handler) -> Result<HandlerGuard, ShellError> {
+        self.state.signal_handlers.register(handler)
     }
 
     /// Get the full shell configuration from the engine. As this is quite a large object, it is
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index bd049bbb2d..405b702c12 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -2,14 +2,14 @@ use crate::{
     ast::Block,
     debugger::{Debugger, NoopDebugger},
     engine::{
-        ctrlc,
         usage::{build_usage, Usage},
         CachedFile, Command, CommandType, EnvVars, OverlayFrame, ScopeFrame, Stack, StateDelta,
         Variable, Visibility, DEFAULT_OVERLAY_NAME,
     },
     eval_const::create_nu_constant,
-    BlockId, Category, Config, DeclId, FileId, GetSpan, HistoryConfig, Module, ModuleId, OverlayId,
-    ShellError, Signals, Signature, Span, SpanId, Type, Value, VarId, VirtualPathId,
+    BlockId, Category, Config, DeclId, FileId, GetSpan, Handlers, HistoryConfig, Module, ModuleId,
+    OverlayId, ShellError, SignalAction, Signals, Signature, Span, SpanId, Type, Value, VarId,
+    VirtualPathId,
 };
 use fancy_regex::Regex;
 use lru::LruCache;
@@ -86,8 +86,8 @@ pub struct EngineState {
     pub spans: Vec<Span>,
     usage: Usage,
     pub scope: ScopeFrame,
-    pub ctrlc_handlers: Option<ctrlc::Handlers>,
     signals: Signals,
+    pub signal_handlers: Option<Handlers>,
     pub env_vars: Arc<EnvVars>,
     pub previous_env_vars: Arc<HashMap<String, Value>>,
     pub config: Arc<Config>,
@@ -147,7 +147,7 @@ impl EngineState {
                 0,
                 false,
             ),
-            ctrlc_handlers: None,
+            signal_handlers: None,
             signals: Signals::empty(),
             env_vars: Arc::new(
                 [(DEFAULT_OVERLAY_NAME.to_string(), HashMap::new())]
@@ -186,7 +186,10 @@ impl EngineState {
     }
 
     pub fn reset_signals(&mut self) {
-        self.signals.reset()
+        self.signals.reset();
+        if let Some(ref handlers) = self.signal_handlers {
+            handlers.run(SignalAction::Reset);
+        }
     }
 
     pub fn set_signals(&mut self, signals: Signals) {
@@ -272,9 +275,9 @@ impl EngineState {
         #[cfg(feature = "plugin")]
         if !delta.plugins.is_empty() {
             for plugin in std::mem::take(&mut delta.plugins) {
-                // Connect plugins to the ctrlc handlers
-                if let Some(handlers) = &self.ctrlc_handlers {
-                    plugin.clone().configure_ctrlc_handler(handlers)?;
+                // Connect plugins to the signal handlers
+                if let Some(handlers) = &self.signal_handlers {
+                    plugin.clone().configure_signal_handler(handlers)?;
                 }
 
                 // Replace plugins that overlap in identity.
diff --git a/crates/nu-protocol/src/engine/mod.rs b/crates/nu-protocol/src/engine/mod.rs
index 24e4b15094..0cf45217ea 100644
--- a/crates/nu-protocol/src/engine/mod.rs
+++ b/crates/nu-protocol/src/engine/mod.rs
@@ -34,5 +34,3 @@ pub use stack_out_dest::*;
 pub use state_delta::*;
 pub use state_working_set::*;
 pub use variable::*;
-
-pub mod ctrlc;
diff --git a/crates/nu-protocol/src/engine/ctrlc.rs b/crates/nu-protocol/src/pipeline/handlers.rs
similarity index 83%
rename from crates/nu-protocol/src/engine/ctrlc.rs
rename to crates/nu-protocol/src/pipeline/handlers.rs
index 11121f7c9c..3c1b1b820a 100644
--- a/crates/nu-protocol/src/engine/ctrlc.rs
+++ b/crates/nu-protocol/src/pipeline/handlers.rs
@@ -1,10 +1,10 @@
 use std::fmt::Debug;
 use std::sync::{Arc, Mutex};
 
-use crate::{engine::Sequence, ShellError};
+use crate::{engine::Sequence, ShellError, SignalAction};
 
 /// Handler is a closure that can be sent across threads and shared.
-pub type Handler = Box<dyn Fn() + Send + Sync>;
+pub type Handler = Box<dyn Fn(SignalAction) + Send + Sync>;
 
 /// Manages a collection of handlers.
 #[derive(Clone)]
@@ -23,16 +23,16 @@ impl Debug for Handlers {
     }
 }
 
-/// Guard that unregisters a handler when dropped.
+/// HandlerGuard that unregisters a handler when dropped.
 #[derive(Clone)]
-pub struct Guard {
+pub struct HandlerGuard {
     /// Unique ID of the handler.
     id: usize,
     /// Reference to the handlers list.
     handlers: Arc<Mutex<Vec<(usize, Handler)>>>,
 }
 
-impl Drop for Guard {
+impl Drop for HandlerGuard {
     /// Drops the `Guard`, removing the associated handler from the list.
     fn drop(&mut self) {
         if let Ok(mut handlers) = self.handlers.lock() {
@@ -41,7 +41,7 @@ impl Drop for Guard {
     }
 }
 
-impl Debug for Guard {
+impl Debug for HandlerGuard {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("Guard").field("id", &self.id).finish()
     }
@@ -56,23 +56,23 @@ impl Handlers {
 
     /// Registers a new handler and returns an RAII guard which will unregister the handler when
     /// dropped.
-    pub fn register(&self, handler: Handler) -> Result<Guard, ShellError> {
+    pub fn register(&self, handler: Handler) -> Result<HandlerGuard, ShellError> {
         let id = self.next_id.next()?;
         if let Ok(mut handlers) = self.handlers.lock() {
             handlers.push((id, handler));
         }
 
-        Ok(Guard {
+        Ok(HandlerGuard {
             id,
             handlers: Arc::clone(&self.handlers),
         })
     }
 
     /// Runs all registered handlers.
-    pub fn run(&self) {
+    pub fn run(&self, action: SignalAction) {
         if let Ok(handlers) = self.handlers.lock() {
             for (_, handler) in handlers.iter() {
-                handler();
+                handler(action);
             }
         }
     }
@@ -99,14 +99,14 @@ mod tests {
         let called1_clone = Arc::clone(&called1);
         let called2_clone = Arc::clone(&called2);
 
-        let _guard1 = handlers.register(Box::new(move || {
+        let _guard1 = handlers.register(Box::new(move |_| {
             called1_clone.store(true, Ordering::SeqCst);
         }));
-        let _guard2 = handlers.register(Box::new(move || {
+        let _guard2 = handlers.register(Box::new(move |_| {
             called2_clone.store(true, Ordering::SeqCst);
         }));
 
-        handlers.run();
+        handlers.run(SignalAction::Interrupt);
 
         assert!(called1.load(Ordering::SeqCst));
         assert!(called2.load(Ordering::SeqCst));
@@ -119,7 +119,7 @@ mod tests {
         let called = Arc::new(AtomicBool::new(false));
         let called_clone = Arc::clone(&called);
 
-        let guard = handlers.register(Box::new(move || {
+        let guard = handlers.register(Box::new(move |_| {
             called_clone.store(true, Ordering::Relaxed);
         }));
 
@@ -131,7 +131,7 @@ mod tests {
         // Ensure the handler is removed after dropping the guard
         assert_eq!(handlers.handlers.lock().unwrap().len(), 0);
 
-        handlers.run();
+        handlers.run(SignalAction::Interrupt);
 
         // Ensure the handler is not called after being dropped
         assert!(!called.load(Ordering::Relaxed));
diff --git a/crates/nu-protocol/src/pipeline/mod.rs b/crates/nu-protocol/src/pipeline/mod.rs
index 525806425d..0d0931c396 100644
--- a/crates/nu-protocol/src/pipeline/mod.rs
+++ b/crates/nu-protocol/src/pipeline/mod.rs
@@ -1,4 +1,5 @@
 pub mod byte_stream;
+mod handlers;
 pub mod list_stream;
 mod metadata;
 mod out_dest;
@@ -6,6 +7,7 @@ mod pipeline_data;
 mod signals;
 
 pub use byte_stream::*;
+pub use handlers::*;
 pub use list_stream::*;
 pub use metadata::*;
 pub use out_dest::*;
diff --git a/crates/nu-protocol/src/pipeline/signals.rs b/crates/nu-protocol/src/pipeline/signals.rs
index 2057e27fe0..f712f1e7a8 100644
--- a/crates/nu-protocol/src/pipeline/signals.rs
+++ b/crates/nu-protocol/src/pipeline/signals.rs
@@ -4,6 +4,8 @@ use std::sync::{
     Arc,
 };
 
+use serde::{Deserialize, Serialize};
+
 /// Used to check for signals to suspend or terminate the execution of Nushell code.
 ///
 /// For now, this struct only supports interruption (ctrl+c or SIGINT).
@@ -75,9 +77,17 @@ impl Signals {
         self.signals.is_none()
     }
 
-    pub(crate) fn reset(&self) {
+    pub fn reset(&self) {
         if let Some(signals) = &self.signals {
             signals.store(false, Ordering::Relaxed);
         }
     }
 }
+
+/// The types of things that can be signaled. It's anticipated this will change as we learn more
+/// about how we'd like signals to be handled.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+pub enum SignalAction {
+    Interrupt,
+    Reset,
+}
diff --git a/crates/nu-protocol/src/plugin/registered.rs b/crates/nu-protocol/src/plugin/registered.rs
index 8749c24af9..7f3906310a 100644
--- a/crates/nu-protocol/src/plugin/registered.rs
+++ b/crates/nu-protocol/src/plugin/registered.rs
@@ -1,6 +1,6 @@
 use std::{any::Any, sync::Arc};
 
-use crate::{engine::ctrlc, PluginGcConfig, PluginIdentity, PluginMetadata, ShellError};
+use crate::{Handlers, PluginGcConfig, PluginIdentity, PluginMetadata, ShellError};
 
 /// Trait for plugins registered in the [`EngineState`](crate::engine::EngineState).
 pub trait RegisteredPlugin: Send + Sync {
@@ -36,10 +36,7 @@ pub trait RegisteredPlugin: Send + Sync {
     fn as_any(self: Arc<Self>) -> Arc<dyn Any + Send + Sync>;
 
     /// Give this plugin a chance to register for Ctrl-C signals.
-    fn configure_ctrlc_handler(
-        self: Arc<Self>,
-        _handler: &ctrlc::Handlers,
-    ) -> Result<(), ShellError> {
+    fn configure_signal_handler(self: Arc<Self>, _handler: &Handlers) -> Result<(), ShellError> {
         Ok(())
     }
 }
diff --git a/crates/nu_plugin_example/src/commands/ctrlc.rs b/crates/nu_plugin_example/src/commands/ctrlc.rs
index f9851a451a..50da9d24da 100644
--- a/crates/nu_plugin_example/src/commands/ctrlc.rs
+++ b/crates/nu_plugin_example/src/commands/ctrlc.rs
@@ -16,7 +16,7 @@ impl PluginCommand for Ctrlc {
     }
 
     fn usage(&self) -> &str {
-        "Example command that demonstrates registering a ctrl-c handler"
+        "Example command that demonstrates registering an interrupt signal handler"
     }
 
     fn signature(&self) -> Signature {
@@ -35,12 +35,12 @@ impl PluginCommand for Ctrlc {
         _input: PipelineData,
     ) -> Result<PipelineData, LabeledError> {
         let (sender, receiver) = mpsc::channel::<()>();
-        let _guard = engine.register_ctrlc_handler(Box::new(move || {
+        let _guard = engine.register_signal_handler(Box::new(move |_| {
             let _ = sender.send(());
         }));
 
         eprintln!("interrupt status: {:?}", engine.signals().interrupted());
-        eprintln!("waiting for ctrl-c signal...");
+        eprintln!("waiting for interrupt signal...");
         receiver.recv().expect("handler went away");
         eprintln!("interrupt status: {:?}", engine.signals().interrupted());
         eprintln!("peace.");
diff --git a/src/signals.rs b/src/signals.rs
index 857f639843..ca22eef255 100644
--- a/src/signals.rs
+++ b/src/signals.rs
@@ -1,7 +1,4 @@
-use nu_protocol::{
-    engine::{ctrlc::Handlers, EngineState},
-    Signals,
-};
+use nu_protocol::{engine::EngineState, Handlers, SignalAction, Signals};
 use std::sync::{
     atomic::{AtomicBool, Ordering},
     Arc,
@@ -11,12 +8,12 @@ pub(crate) fn ctrlc_protection(engine_state: &mut EngineState) {
     let interrupt = Arc::new(AtomicBool::new(false));
     engine_state.set_signals(Signals::new(interrupt.clone()));
 
-    let ctrlc_handlers = Handlers::new();
-    engine_state.ctrlc_handlers = Some(ctrlc_handlers.clone());
+    let signal_handlers = Handlers::new();
+    engine_state.signal_handlers = Some(signal_handlers.clone());
 
     ctrlc::set_handler(move || {
         interrupt.store(true, Ordering::Relaxed);
-        ctrlc_handlers.run();
+        signal_handlers.run(SignalAction::Interrupt);
     })
     .expect("Error setting Ctrl-C handler");
 }

From eca2975b3dba3f6226b7df9ae0fafb7509cc9c8f Mon Sep 17 00:00:00 2001
From: Andrej Kolchin <KAAtheWise@protonmail.com>
Date: Tue, 6 Aug 2024 14:18:49 +0300
Subject: [PATCH 0316/1072] Fix a typo in an example (#13548)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Accidentally used the old name of the command, `random bytes`, instead
of the correct one.

Co-authored-by: Andrej Kolčin <self@kaathewise.net>
---
 crates/nu-command/src/random/binary.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-command/src/random/binary.rs b/crates/nu-command/src/random/binary.rs
index 57fd8b01a7..aacab071a8 100644
--- a/crates/nu-command/src/random/binary.rs
+++ b/crates/nu-command/src/random/binary.rs
@@ -45,7 +45,7 @@ impl Command for SubCommand {
     fn examples(&self) -> Vec<Example> {
         vec![Example {
             description: "Generate 16 random bytes",
-            example: "random bytes 16",
+            example: "random binary 16",
             result: None,
         }]
     }

From 926331dbfb7c06b8b5df8ef4a912f0161849d1fa Mon Sep 17 00:00:00 2001
From: kurokirasama <kurokirasama@gmail.com>
Date: Tue, 6 Aug 2024 16:23:56 -0400
Subject: [PATCH 0317/1072] chore: Add nu_plugin_polars to build and install
 scripts (#13550)

- Add `nu_plugin_polars` to the list of plugins in
`build-all-maclin.sh`.
- Add `nu_plugin_polars` to the list of plugins in `build-all.nu`.
- Add `nu_plugin_polars` to the list of plugins in `install-all.ps1`.
- Add `nu_plugin_polars` to the list of plugins in `install-all.sh`.
- Add `nu_plugin_polars` to the list of plugins in `uninstall-all.sh`.

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

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

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

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

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 scripts/build-all-maclin.sh | 1 +
 scripts/build-all.nu        | 1 +
 scripts/install-all.ps1     | 1 +
 scripts/install-all.sh      | 1 +
 scripts/uninstall-all.sh    | 1 +
 5 files changed, 5 insertions(+)

diff --git a/scripts/build-all-maclin.sh b/scripts/build-all-maclin.sh
index 4658161874..16fbb6736c 100755
--- a/scripts/build-all-maclin.sh
+++ b/scripts/build-all-maclin.sh
@@ -16,6 +16,7 @@ NU_PLUGINS=(
     'nu_plugin_inc'
     'nu_plugin_query'
     'nu_plugin_custom_values'
+    'nu_plugin_polars'
 )
 
 echo "Building nushell"
diff --git a/scripts/build-all.nu b/scripts/build-all.nu
index 92fcc64635..a340dbae70 100644
--- a/scripts/build-all.nu
+++ b/scripts/build-all.nu
@@ -33,6 +33,7 @@ let plugins = [
     nu_plugin_example,
     nu_plugin_custom_values,
     nu_plugin_formats,
+    nu_plugin_polars
 ]
 
 for plugin in $plugins {
diff --git a/scripts/install-all.ps1 b/scripts/install-all.ps1
index 1dfc3b2dfd..2ae6d529e1 100644
--- a/scripts/install-all.ps1
+++ b/scripts/install-all.ps1
@@ -17,6 +17,7 @@ $NU_PLUGINS = @(
     'nu_plugin_query',
     'nu_plugin_custom_values',
     'nu_plugin_formats'
+    'nu_plugin_polars'
 )
 
 foreach ( $plugin in $NU_PLUGINS) {
diff --git a/scripts/install-all.sh b/scripts/install-all.sh
index b6c0f1fbfb..5429adb8a3 100755
--- a/scripts/install-all.sh
+++ b/scripts/install-all.sh
@@ -21,6 +21,7 @@ NU_PLUGINS=(
     'nu_plugin_example'
     'nu_plugin_custom_values'
     'nu_plugin_formats'
+    'nu_plugin_polars'
 )
 
 for plugin in "${NU_PLUGINS[@]}"
diff --git a/scripts/uninstall-all.sh b/scripts/uninstall-all.sh
index 509f9af3f2..4e2502901f 100755
--- a/scripts/uninstall-all.sh
+++ b/scripts/uninstall-all.sh
@@ -14,6 +14,7 @@ NU_PLUGINS=(
     'nu_plugin_example'
     'nu_plugin_formats'
     'nu_plugin_custom_values'
+    'nu_plugin_polars'
 )
 
 cargo uninstall nu

From 2ced9e4d1910ba2182b85a6168429c0332ca25b3 Mon Sep 17 00:00:00 2001
From: Bruce Weirdan <weirdan@gmail.com>
Date: Tue, 6 Aug 2024 22:28:38 +0200
Subject: [PATCH 0318/1072] Add multipart/form-data uploads (#13532)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes nushell/nushell#11046

# Description
This adds support for `multipart/form-data` (RFC 7578) uploads to
nushell.

Binary data is uploaded as files (`application/octet-stream`),
everything else is uploaded as plain text.

```console
$ http post https://echo.free.beeceptor.com --content-type multipart/form-data {cargo: (open -r Cargo.toml | into binary ), description: "It's some TOML"} | upsert ip "<redacted>"
╭───────────────────┬─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ method            │ POST                                                                                                                                                                    │
│ protocol          │ https                                                                                                                                                                   │
│ host              │ echo.free.beeceptor.com                                                                                                                                                 │
│ path              │ /                                                                                                                                                                       │
│ ip                │ <redacted>                                                                                                                                                              │
│                   │ ╭─────────────────┬────────────────────────────────────────────────────────────────────╮                                                                                │
│ headers           │ │ Host            │ echo.free.beeceptor.com                                            │                                                                                │
│                   │ │ User-Agent      │ nushell                                                            │                                                                                │
│                   │ │ Content-Length  │ 9453                                                               │                                                                                │
│                   │ │ Accept          │ */*                                                                │                                                                                │
│                   │ │ Accept-Encoding │ gzip                                                               │                                                                                │
│                   │ │ Content-Type    │ multipart/form-data; boundary=a15f6a14-5768-4a6a-b3a4-686a112d9e27 │                                                                                │
│                   │ ╰─────────────────┴────────────────────────────────────────────────────────────────────╯                                                                                │
│ parsedQueryParams │ {record 0 fields}                                                                                                                                                       │
│                   │ ╭─────────────────┬───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │
│ parsedBody        │ │                 │ ╭─────────────┬────────────────╮                                                                                                                  │ │
│                   │ │ textFields      │ │ description │ It's some TOML │                                                                                                                  │ │
│                   │ │                 │ ╰─────────────┴────────────────╯                                                                                                                  │ │
│                   │ │                 │ ╭───┬───────┬──────────┬──────────────────────────┬───────────────────────────┬───────────────────────────────────────────┬────────────────╮      │ │
│                   │ │ files           │ │ # │ name  │ fileName │       Content-Type       │ Content-Transfer-Encoding │            Content-Disposition            │ Content-Length │      │ │
│                   │ │                 │ ├───┼───────┼──────────┼──────────────────────────┼───────────────────────────┼───────────────────────────────────────────┼────────────────┤      │ │
│                   │ │                 │ │ 0 │ cargo │ cargo    │ application/octet-stream │ binary                    │ form-data; name="cargo"; filename="cargo" │ 9101           │      │ │
│                   │ │                 │ ╰───┴───────┴──────────┴──────────────────────────┴───────────────────────────┴───────────────────────────────────────────┴────────────────╯      │ │
│                   │ ╰─────────────────┴───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ │
╰───────────────────┴─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
```
# User-Facing Changes
`http post --content-type multipart/form-data` now accepts a record
which is uploaded as `multipart/form-data`.
Binary data is uploaded as files (`application/octet-stream`),
everything else is uploaded as plain text.

Previously `http post --content-type multipart/form-data` rejected
records, so there's no BC break.

# Tests + Formatting

Added.

# After Submitting
- [ ] update docs to showcase new functionality
---
 Cargo.lock                                    | 16 +++++++
 Cargo.toml                                    |  2 +
 crates/nu-command/Cargo.toml                  |  3 +-
 crates/nu-command/src/network/http/client.rs  | 46 +++++++++++++++++++
 crates/nu-command/src/network/http/post.rs    |  5 ++
 .../tests/commands/network/http/post.rs       | 33 ++++++++++++-
 6 files changed, 103 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 902210ffbc..ddf5c566f2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2748,6 +2748,20 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "multipart-rs"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ea34e5c0fa65ba84707cfaf5bf43d500f1c5a4c6c36327bf5541c5bcd17e98"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "memchr",
+ "mime",
+ "uuid",
+]
+
 [[package]]
 name = "multiversion"
 version = "0.7.4"
@@ -2877,6 +2891,7 @@ dependencies = [
  "log",
  "miette",
  "mimalloc",
+ "multipart-rs",
  "nix",
  "nu-cli",
  "nu-cmd-base",
@@ -3064,6 +3079,7 @@ dependencies = [
  "mime",
  "mime_guess",
  "mockito",
+ "multipart-rs",
  "native-tls",
  "nix",
  "notify-debouncer-full",
diff --git a/Cargo.toml b/Cargo.toml
index ce62fa745e..225834de70 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -113,6 +113,7 @@ miette = "7.2"
 mime = "0.3"
 mime_guess = "2.0"
 mockito = { version = "1.4", 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 }
@@ -207,6 +208,7 @@ 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"
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index d1defd4327..2459d74ad9 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -60,6 +60,7 @@ lscolors = { workspace = true, default-features = false, features = ["nu-ansi-te
 md5 = { workspace = true }
 mime = { workspace = true }
 mime_guess = { workspace = true }
+multipart-rs = { workspace = true }
 native-tls = { workspace = true }
 notify-debouncer-full = { workspace = true, default-features = false }
 num-format = { workspace = true }
@@ -146,4 +147,4 @@ quickcheck = { workspace = true }
 quickcheck_macros = { workspace = true }
 rstest = { workspace = true, default-features = false }
 pretty_assertions = { workspace = true }
-tempfile = { workspace = true }
\ No newline at end of file
+tempfile = { workspace = true }
diff --git a/crates/nu-command/src/network/http/client.rs b/crates/nu-command/src/network/http/client.rs
index e348bedc25..7bb63a8fbd 100644
--- a/crates/nu-command/src/network/http/client.rs
+++ b/crates/nu-command/src/network/http/client.rs
@@ -4,10 +4,12 @@ use base64::{
     engine::{general_purpose::PAD, GeneralPurpose},
     Engine,
 };
+use multipart_rs::MultipartWriter;
 use nu_engine::command_prelude::*;
 use nu_protocol::{ByteStream, Signals};
 use std::{
     collections::HashMap,
+    io::Cursor,
     path::PathBuf,
     str::FromStr,
     sync::mpsc::{self, RecvTimeoutError},
@@ -20,6 +22,7 @@ use url::Url;
 pub enum BodyType {
     Json,
     Form,
+    Multipart,
     Unknown,
 }
 
@@ -210,6 +213,7 @@ pub fn send_request(
             let (body_type, req) = match content_type {
                 Some(it) if it == "application/json" => (BodyType::Json, request),
                 Some(it) if it == "application/x-www-form-urlencoded" => (BodyType::Form, request),
+                Some(it) if it == "multipart/form-data" => (BodyType::Multipart, request),
                 Some(it) => {
                     let r = request.clone().set("Content-Type", &it);
                     (BodyType::Unknown, r)
@@ -265,6 +269,48 @@ pub fn send_request(
                     };
                     send_cancellable_request(&request_url, Box::new(request_fn), span, signals)
                 }
+                // multipart form upload
+                Value::Record { val, .. } if body_type == BodyType::Multipart => {
+                    let mut builder = MultipartWriter::new();
+
+                    let err = |e| {
+                        ShellErrorOrRequestError::ShellError(ShellError::IOError {
+                            msg: format!("failed to build multipart data: {}", e),
+                        })
+                    };
+
+                    for (col, val) in val.into_owned() {
+                        if let Value::Binary { val, .. } = val {
+                            let headers = [
+                                "Content-Type: application/octet-stream".to_string(),
+                                "Content-Transfer-Encoding: binary".to_string(),
+                                format!(
+                                    "Content-Disposition: form-data; name=\"{}\"; filename=\"{}\"",
+                                    col, col
+                                ),
+                                format!("Content-Length: {}", val.len()),
+                            ];
+                            builder
+                                .add(&mut Cursor::new(val), &headers.join("\n"))
+                                .map_err(err)?;
+                        } else {
+                            let headers =
+                                format!(r#"Content-Disposition: form-data; name="{}""#, col);
+                            builder
+                                .add(val.coerce_into_string()?.as_bytes(), &headers)
+                                .map_err(err)?;
+                        }
+                    }
+                    builder.finish();
+
+                    let (boundary, data) = (builder.boundary, builder.data);
+                    let content_type = format!("multipart/form-data; boundary={}", boundary);
+
+                    let request_fn =
+                        move || req.set("Content-Type", &content_type).send_bytes(&data);
+
+                    send_cancellable_request(&request_url, Box::new(request_fn), span, signals)
+                }
                 Value::List { vals, .. } if body_type == BodyType::Form => {
                     if vals.len() % 2 != 0 {
                         return Err(ShellErrorOrRequestError::ShellError(ShellError::IOError {
diff --git a/crates/nu-command/src/network/http/post.rs b/crates/nu-command/src/network/http/post.rs
index ea4ec093f3..a593c5489c 100644
--- a/crates/nu-command/src/network/http/post.rs
+++ b/crates/nu-command/src/network/http/post.rs
@@ -127,6 +127,11 @@ impl Command for SubCommand {
                 example: "open foo.json | http post https://www.example.com",
                 result: None,
             },
+            Example {
+                description: "Upload a file to example.com",
+                example: "http post --content-type multipart/form-data https://www.example.com { audio: (open -r file.mp3) }",
+                result: None,
+            },
         ]
     }
 }
diff --git a/crates/nu-command/tests/commands/network/http/post.rs b/crates/nu-command/tests/commands/network/http/post.rs
index 02aa8df23f..11db87168e 100644
--- a/crates/nu-command/tests/commands/network/http/post.rs
+++ b/crates/nu-command/tests/commands/network/http/post.rs
@@ -1,4 +1,4 @@
-use mockito::Server;
+use mockito::{Matcher, Server, ServerOpts};
 use nu_test_support::{nu, pipeline};
 
 #[test]
@@ -197,3 +197,34 @@ fn http_post_redirect_mode_error() {
         "Redirect encountered when redirect handling mode was 'error' (301 Moved Permanently)"
     ));
 }
+#[test]
+fn http_post_multipart_is_success() {
+    let mut server = Server::new_with_opts(ServerOpts {
+        assert_on_drop: true,
+        ..Default::default()
+    });
+    let _mock = server
+        .mock("POST", "/")
+        .match_header(
+            "content-type",
+            Matcher::Regex("multipart/form-data; boundary=.*".to_string()),
+        )
+        .match_body(Matcher::AllOf(vec![
+            Matcher::Regex(r#"(?m)^Content-Disposition: form-data; name="foo""#.to_string()),
+            Matcher::Regex(r#"(?m)^Content-Type: application/octet-stream"#.to_string()),
+            Matcher::Regex(r#"(?m)^Content-Length: 3"#.to_string()),
+            Matcher::Regex(r#"(?m)^bar"#.to_string()),
+        ]))
+        .with_status(200)
+        .create();
+
+    let actual = nu!(pipeline(
+        format!(
+            "http post --content-type multipart/form-data {url} {{foo: ('bar' | into binary) }}",
+            url = server.url()
+        )
+        .as_str()
+    ));
+
+    assert!(actual.out.is_empty())
+}

From edee2a3c158b24b0e82c4f09fdaf62cd66810049 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 09:02:56 +0800
Subject: [PATCH 0319/1072] Bump indexmap from 2.2.6 to 2.3.0 (#13557)

Bumps [indexmap](https://github.com/indexmap-rs/indexmap) from 2.2.6 to
2.3.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/indexmap-rs/indexmap/blob/master/RELEASES.md">indexmap's
changelog</a>.</em></p>
<blockquote>
<h2>2.3.0</h2>
<ul>
<li>Added trait <code>MutableEntryKey</code> for opt-in mutable access
to map entry keys.</li>
<li>Added method <code>MutableKeys::iter_mut2</code> for opt-in mutable
iteration of map
keys and values.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/22c0b4e0f324f398bb9c4a4f7c9ea9f41fb7eb56"><code>22c0b4e</code></a>
Merge pull request <a
href="https://redirect.github.com/indexmap-rs/indexmap/issues/335">#335</a>
from epage/mut</li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/39f7cc097ac49ef4b47e99440644f11bc3d2b24c"><code>39f7cc0</code></a>
Release 2.3.0</li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/6049d518a04f92fb3e29392f929600de7b41f47f"><code>6049d51</code></a>
feat(map): Add MutableKeys::iter_mut2</li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/65c3c46e37f0f82893285d94b52347c7c64ca4ef"><code>65c3c46</code></a>
feat(map): Add MutableEntryKey</li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/7f7d39f734af3e142653973e2887200319f81236"><code>7f7d39f</code></a>
Merge pull request <a
href="https://redirect.github.com/indexmap-rs/indexmap/issues/332">#332</a>
from waywardmonkeys/missing-indentation-in-doc-comment</li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/8222a59a857ee57d5f3cc616d9ba287d766d5661"><code>8222a59</code></a>
Fix missing indentation in doc comment.</li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/1a71dde63d6e83b796fad0212da8f94c66c8ace7"><code>1a71dde</code></a>
Merge pull request <a
href="https://redirect.github.com/indexmap-rs/indexmap/issues/327">#327</a>
from waywardmonkeys/dep-update-dev-dep-itertools</li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/ac2a8a5a403b8e0956ff765bac1fb0b2a1a70f2b"><code>ac2a8a5</code></a>
deps(dev): Update <code>itertools</code></li>
<li>See full diff in <a
href="https://github.com/indexmap-rs/indexmap/compare/2.2.6...2.3.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=indexmap&package-manager=cargo&previous-version=2.2.6&new-version=2.3.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                         | 4 ++--
 Cargo.toml                         | 2 +-
 crates/nu_plugin_polars/Cargo.toml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ddf5c566f2..b5424685af 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2052,9 +2052,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.5",
diff --git a/Cargo.toml b/Cargo.toml
index 225834de70..bfc454d56d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -95,7 +95,7 @@ fuzzy-matcher = "0.3"
 hamcrest2 = "0.3"
 heck = "0.5.0"
 human-date-parser = "0.1.1"
-indexmap = "2.2"
+indexmap = "2.3"
 indicatif = "0.17"
 interprocess = "2.2.0"
 is_executable = "1.0"
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 095f33915a..3c916286af 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -26,7 +26,7 @@ nu-utils = { path = "../nu-utils", version = "0.96.2" }
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
 chrono-tz = "0.9"
 fancy-regex = { workspace = true }
-indexmap = { version = "2.2" }
+indexmap = { version = "2.3" }
 mimalloc = { version = "0.1.42" }
 num = {version = "0.4"}
 serde = { version = "1.0", features = ["derive"] }

From faaa12838e7afa60a14717a8c2d2e8a7bba0d0e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 09:07:19 +0800
Subject: [PATCH 0320/1072] Bump scraper from 0.19.0 to 0.20.0 (#13559)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [scraper](https://github.com/causal-agent/scraper) from 0.19.0 to
0.20.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/causal-agent/scraper/releases">scraper's
releases</a>.</em></p>
<blockquote>
<h2>0.20.0</h2>
<h2>What's Changed</h2>
<ul>
<li><code>is</code> and <code>has</code> support by <a
href="https://github.com/cfvescovo"><code>@​cfvescovo</code></a> in <a
href="https://redirect.github.com/causal-agent/scraper/pull/187">causal-agent/scraper#187</a></li>
<li>Make ElementRef Debug impl use Element by <a
href="https://github.com/gfaster"><code>@​gfaster</code></a> in <a
href="https://redirect.github.com/causal-agent/scraper/pull/190">causal-agent/scraper#190</a></li>
<li>Bump indexmap from 2.2.6 to 2.3.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/causal-agent/scraper/pull/194">causal-agent/scraper#194</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/gfaster"><code>@​gfaster</code></a> made
their first contribution in <a
href="https://redirect.github.com/causal-agent/scraper/pull/190">causal-agent/scraper#190</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/causal-agent/scraper/compare/v0.19.1...v0.20.0">https://github.com/causal-agent/scraper/compare/v0.19.1...v0.20.0</a></p>
<h2>0.19.1</h2>
<h2>What's Changed</h2>
<ul>
<li>Bump ahash from 0.8.9 to 0.8.11 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/causal-agent/scraper/pull/174">causal-agent/scraper#174</a></li>
<li>Bump indexmap from 2.2.3 to 2.2.5 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/causal-agent/scraper/pull/173">causal-agent/scraper#173</a></li>
<li>Bump html5ever from 0.26.0 to 0.27.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/causal-agent/scraper/pull/176">causal-agent/scraper#176</a></li>
<li>Bump indexmap from 2.2.5 to 2.2.6 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/causal-agent/scraper/pull/177">causal-agent/scraper#177</a></li>
<li>Select and Text are not fused iterators by <a
href="https://github.com/Noname-Official"><code>@​Noname-Official</code></a>
in <a
href="https://redirect.github.com/causal-agent/scraper/pull/184">causal-agent/scraper#184</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a
href="https://github.com/Noname-Official"><code>@​Noname-Official</code></a>
made their first contribution in <a
href="https://redirect.github.com/causal-agent/scraper/pull/184">causal-agent/scraper#184</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/causal-agent/scraper/compare/v0.19.0...v0.19.1">https://github.com/causal-agent/scraper/compare/v0.19.0...v0.19.1</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/causal-agent/scraper/commit/4d33a55f59c945663b732f6ab2cb0d5dae351e69"><code>4d33a55</code></a>
Version 0.20.0</li>
<li><a
href="https://github.com/causal-agent/scraper/commit/5b6703e83ac9810e063775ebc62303bf77b87090"><code>5b6703e</code></a>
Merge pull request <a
href="https://redirect.github.com/causal-agent/scraper/issues/194">#194</a>
from causal-agent/dependabot/cargo/indexmap-2.3.0</li>
<li><a
href="https://github.com/causal-agent/scraper/commit/fd01b100ead0fbfc7d5819b8c9c28bd443b3ba09"><code>fd01b10</code></a>
Bump indexmap from 2.2.6 to 2.3.0</li>
<li><a
href="https://github.com/causal-agent/scraper/commit/9242d09e7d97870a40077d380d66adcb624aae85"><code>9242d09</code></a>
Merge pull request <a
href="https://redirect.github.com/causal-agent/scraper/issues/190">#190</a>
from gfaster/master</li>
<li><a
href="https://github.com/causal-agent/scraper/commit/f5cc684a0648a11891d2fa86d501b4f41d65da6a"><code>f5cc684</code></a>
Make ElementRef Debug impl use Element</li>
<li><a
href="https://github.com/causal-agent/scraper/commit/27dd786c066e68aa5c538dc5db7a94ebc906e2a8"><code>27dd786</code></a>
Merge pull request <a
href="https://redirect.github.com/causal-agent/scraper/issues/187">#187</a>
from causal-agent/support-has-selector</li>
<li><a
href="https://github.com/causal-agent/scraper/commit/b3570f31e1e3346de9a13ee9fa054101e82bf429"><code>b3570f3</code></a>
<code>is</code> and <code>has</code> support</li>
<li><a
href="https://github.com/causal-agent/scraper/commit/e8e3cc4edbdc64c07a396804aa137a37fb4c7b74"><code>e8e3cc4</code></a>
Version 0.19.1</li>
<li><a
href="https://github.com/causal-agent/scraper/commit/37b062ec655b6896535921006fee2fd922cc1598"><code>37b062e</code></a>
Merge pull request <a
href="https://redirect.github.com/causal-agent/scraper/issues/184">#184</a>
from Noname-Official/patch-1</li>
<li><a
href="https://github.com/causal-agent/scraper/commit/3b8383dcc571dc59d1b5963fb4eaac056f3a1963"><code>3b8383d</code></a>
Text isn't a fused iterator</li>
<li>Additional commits viewable in <a
href="https://github.com/causal-agent/scraper/compare/v0.19.0...v0.20.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=scraper&package-manager=cargo&previous-version=0.19.0&new-version=0.20.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                        | 44 ++++++-------------------------
 crates/nu_plugin_query/Cargo.toml |  2 +-
 2 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b5424685af..eec323bb18 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1905,20 +1905,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "html5ever"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7"
-dependencies = [
- "log",
- "mac",
- "markup5ever 0.11.0",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "html5ever"
 version = "0.27.0"
@@ -1927,7 +1913,7 @@ checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4"
 dependencies = [
  "log",
  "mac",
- "markup5ever 0.12.1",
+ "markup5ever",
  "proc-macro2",
  "quote",
  "syn 2.0.60",
@@ -2582,20 +2568,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "markup5ever"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016"
-dependencies = [
- "log",
- "phf 0.10.1",
- "phf_codegen 0.10.0",
- "string_cache",
- "string_cache_codegen",
- "tendril",
-]
-
 [[package]]
 name = "markup5ever"
 version = "0.12.1"
@@ -2616,8 +2588,8 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edaa21ab3701bfee5099ade5f7e1f84553fd19228cf332f13cd6e964bf59be18"
 dependencies = [
- "html5ever 0.27.0",
- "markup5ever 0.12.1",
+ "html5ever",
+ "markup5ever",
  "tendril",
  "xml5ever",
 ]
@@ -5406,14 +5378,14 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "scraper"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b80b33679ff7a0ea53d37f3b39de77ea0c75b12c5805ac43ec0c33b3051af1b"
+checksum = "b90460b31bfe1fc07be8262e42c665ad97118d4585869de9345a84d501a9eaf0"
 dependencies = [
  "ahash 0.8.11",
  "cssparser",
  "ego-tree",
- "html5ever 0.26.0",
+ "html5ever",
  "once_cell",
  "selectors",
  "tendril",
@@ -6934,7 +6906,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70862efc041d46e6bbaa82bb9c34ae0596d090e86cbd14bd9e93b36ee6802eac"
 dependencies = [
  "curl",
- "html5ever 0.27.0",
+ "html5ever",
  "markup5ever_rcdom",
  "serde",
  "serde_json",
@@ -7361,7 +7333,7 @@ checksum = "9bbb26405d8e919bc1547a5aa9abc95cbfa438f04844f5fdd9dc7596b748bf69"
 dependencies = [
  "log",
  "mac",
- "markup5ever 0.12.1",
+ "markup5ever",
 ]
 
 [[package]]
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index e3ed5ca2eb..23adaa74ee 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -20,7 +20,7 @@ nu-plugin = { path = "../nu-plugin", version = "0.96.2" }
 nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
 
 gjson = "0.8"
-scraper = { default-features = false, version = "0.19" }
+scraper = { default-features = false, version = "0.20" }
 sxd-document = "0.3"
 sxd-xpath = "0.4"
 webpage = { version = "2.0.1", features = ["serde"] }

From bc6947cd09ecb301c71d4352b6e4b31dd3f5e418 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 09:16:03 +0800
Subject: [PATCH 0321/1072] Bump quick-xml from 0.31.0 to 0.32.0 (#13560)

Bumps [quick-xml](https://github.com/tafia/quick-xml) from 0.31.0 to
0.32.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/tafia/quick-xml/releases">quick-xml's
releases</a>.</em></p>
<blockquote>
<h2>v0.32.0</h2>
<h2>Significant Changes</h2>
<p>The method of reporting positions of errors has changed - use
<code>error_position()</code> to get an offset of the error position.
For <code>SyntaxError</code>s the range
<code>error_position()..buffer_position()</code> also will represent a
span of error.</p>
<h3>:warning: Breaking Changes</h3>
<p>The way to configure parser has changed. Now all configuration is
contained in the <code>Config</code> struct and can be applied at once.
When <code>serde-types</code> feature is enabled, configuration is
serializable.</p>
<p>The way of resolve entities with <code>unescape_with</code> has
changed. Those methods no longer resolve predefined entities
(<code>lt</code>, <code>gt</code>, <code>apos</code>, <code>quot</code>,
<code>amp</code>). <code>NoEntityResolver</code> renamed to
<code>PredefinedEntityResolver</code>.</p>
<p><code>Writer::create_element</code> now accepts <code>impl
Into&lt;Cow&lt;str&gt;&gt;</code> instead of <code>&amp;impl
AsRef&lt;str&gt;</code>.</p>
<p>Minimum supported version of serde raised to 1.0.139</p>
<p>The full changelog is below.</p>
<h2>What's Changed</h2>
<h3>New Features</h3>
<ul>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/513">#513</a>:
Allow to continue parsing after getting new
<code>Error::IllFormed</code>.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/677">#677</a>:
Added methods <code>config()</code> and <code>config_mut()</code> to
inspect and change the parser configuration. Previous builder methods on
<code>Reader</code> / <code>NsReader</code> was replaced by direct
access to fields of config using
<code>reader.config_mut().&lt;...&gt;</code>.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/684">#684</a>:
Added a method <code>Config::enable_all_checks</code> to turn on or off
all well-formedness checks.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/362">#362</a>:
Added <code>escape::minimal_escape()</code> which escapes only
<code>&amp;</code> and <code>&lt;</code>.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/362">#362</a>:
Added <code>BytesCData::minimal_escape()</code> which escapes only
<code>&amp;</code> and <code>&lt;</code>.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/362">#362</a>:
Added <code>Serializer::set_quote_level()</code> which allow to set
desired level of escaping.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/705">#705</a>:
Added <code>NsReader::prefixes()</code> to list all the prefixes
currently declared.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/629">#629</a>:
Added a default case to
<code>impl_deserialize_for_internally_tagged_enum</code> macro so that
it can handle every attribute that does not match existing cases within
an enum variant.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/722">#722</a>:
Allow to pass owned strings to <code>Writer::create_element</code>. This
is breaking change!</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/275">#275</a>:
Added <code>ElementWriter::new_line()</code> which enables pretty
printing elements with multiple attributes.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/743">#743</a>:
Added <code>Deserializer::get_ref()</code> to get XML Reader from serde
Deserializer</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/734">#734</a>:
Added helper functions to resolve predefined XML and HTML5 entities:
<ul>
<li><code>quick_xml::escape::resolve_predefined_entity</code></li>
<li><code>quick_xml::escape::resolve_xml_entity</code></li>
<li><code>quick_xml::escape::resolve_html5_entity</code></li>
</ul>
</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/753">#753</a>:
Added parser for processing instructions:
<code>quick_xml::reader::PiParser</code>.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/754">#754</a>:
Added parser for elements:
<code>quick_xml::reader::ElementParser</code>.</li>
</ul>
<h3>Bug Fixes</h3>
<ul>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/622">#622</a>:
Fix wrong disregarding of not closed markup, such as lone
<code>&lt;</code>.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/684">#684</a>:
Fix incorrect position reported for
<code>Error::IllFormed(DoubleHyphenInComment)</code>.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/684">#684</a>:
Fix incorrect position reported for
<code>Error::IllFormed(MissingDoctypeName)</code>.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/704">#704</a>:
Fix empty tags with attributes not being expanded when
<code>expand_empty_elements</code> is set to true.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/683">#683</a>:
Use local tag name when check tag name against possible names for
field.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/753">#753</a>:
Correctly determine end of processing instructions and XML
declaration.</li>
</ul>
<h3>Misc Changes</h3>
<ul>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/675">#675</a>:
Minimum supported version of serde raised to 1.0.139</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/675">#675</a>:
Rework the <code>quick_xml::Error</code> type to provide more accurate
information:</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/tafia/quick-xml/blob/master/Changelog.md">quick-xml's
changelog</a>.</em></p>
<blockquote>
<h2>0.32.0 -- 2024-06-10</h2>
<p>The way to configure parser is changed. Now all configuration is
contained in the
<code>Config</code> struct and can be applied at once. When
<code>serde-types</code> feature is enabled,
configuration is serializable.</p>
<p>The method of reporting positions of errors has changed - use
<code>error_position()</code>
to get an offset of the error position. For <code>SyntaxError</code>s
the range
<code>error_position()..buffer_position()</code> also will represent a
span of error.</p>
<p>The way of resolve entities with <code>unescape_with</code> are
changed. Those methods no longer
resolve predefined entities.</p>
<h3>New Features</h3>
<ul>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/513">#513</a>:
Allow to continue parsing after getting new
<code>Error::IllFormed</code>.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/677">#677</a>:
Added methods <code>config()</code> and <code>config_mut()</code> to
inspect and change the parser
configuration. Previous builder methods on <code>Reader</code> /
<code>NsReader</code> was replaced by
direct access to fields of config using
<code>reader.config_mut().&lt;...&gt;</code>.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/684">#684</a>:
Added a method <code>Config::enable_all_checks</code> to turn on or off
all
well-formedness checks.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/362">#362</a>:
Added <code>escape::minimal_escape()</code> which escapes only
<code>&amp;</code> and <code>&lt;</code>.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/362">#362</a>:
Added <code>BytesCData::minimal_escape()</code> which escapes only
<code>&amp;</code> and <code>&lt;</code>.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/362">#362</a>:
Added <code>Serializer::set_quote_level()</code> which allow to set
desired level of escaping.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/705">#705</a>:
Added <code>NsReader::prefixes()</code> to list all the prefixes
currently declared.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/629">#629</a>:
Added a default case to
<code>impl_deserialize_for_internally_tagged_enum</code> macro so that
it can handle every attribute that does not match existing cases within
an enum variant.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/722">#722</a>:
Allow to pass owned strings to <code>Writer::create_element</code>. This
is breaking change!</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/275">#275</a>:
Added <code>ElementWriter::new_line()</code> which enables pretty
printing elements with multiple attributes.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/743">#743</a>:
Added <code>Deserializer::get_ref()</code> to get XML Reader from serde
Deserializer</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/734">#734</a>:
Added helper functions to resolve predefined XML and HTML5 entities:
<ul>
<li><code>quick_xml::escape::resolve_predefined_entity</code></li>
<li><code>quick_xml::escape::resolve_xml_entity</code></li>
<li><code>quick_xml::escape::resolve_html5_entity</code></li>
</ul>
</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/753">#753</a>:
Added parser for processing instructions:
<code>quick_xml::reader::PiParser</code>.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/754">#754</a>:
Added parser for elements:
<code>quick_xml::reader::ElementParser</code>.</li>
</ul>
<h3>Bug Fixes</h3>
<ul>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/622">#622</a>:
Fix wrong disregarding of not closed markup, such as lone
<code>&lt;</code>.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/684">#684</a>:
Fix incorrect position reported for
<code>Error::IllFormed(DoubleHyphenInComment)</code>.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/684">#684</a>:
Fix incorrect position reported for
<code>Error::IllFormed(MissingDoctypeName)</code>.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/704">#704</a>:
Fix empty tags with attributes not being expanded when
<code>expand_empty_elements</code> is set to true.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/683">#683</a>:
Use local tag name when check tag name against possible names for
field.</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/753">#753</a>:
Correctly determine end of processing instructions and XML
declaration.</li>
</ul>
<h3>Misc Changes</h3>
<ul>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/675">#675</a>:
Minimum supported version of serde raised to 1.0.139</li>
<li><a
href="https://redirect.github.com/tafia/quick-xml/issues/675">#675</a>:
Rework the <code>quick_xml::Error</code> type to provide more accurate
information:</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/tafia/quick-xml/commit/8d38e4cc145b1911d67690a9e076c056ff2e6efe"><code>8d38e4c</code></a>
Release 0.32.0</li>
<li><a
href="https://github.com/tafia/quick-xml/commit/e6f7be47a7adfbd1e1936a6e7eb5654120b8d0a7"><code>e6f7be4</code></a>
Add #[inline] to methods implementing XmlSource</li>
<li><a
href="https://github.com/tafia/quick-xml/commit/33b9dc59c7c88614c2451e320ccaa9bebce25364"><code>33b9dc5</code></a>
Increase position outside of XmlSource::skip_one</li>
<li><a
href="https://github.com/tafia/quick-xml/commit/704ce89239e9fb341c5cd91d2262e11ffa175cbd"><code>704ce89</code></a>
Generalize reading methods of PI and element</li>
<li><a
href="https://github.com/tafia/quick-xml/commit/6f1a644dcc55d7c7d9b70853c277025d6b3a2f01"><code>6f1a644</code></a>
Rewrite read_element like read_pi</li>
<li><a
href="https://github.com/tafia/quick-xml/commit/0a6ecd649848007d4c9222f69bae0f7dc0ae40fc"><code>0a6ecd6</code></a>
Add reusable parser for XML element and use it internally</li>
<li><a
href="https://github.com/tafia/quick-xml/commit/02de8a51bf6deb1c251778bbe1b8a54908f03904"><code>02de8a5</code></a>
Remove unnecessary block</li>
<li><a
href="https://github.com/tafia/quick-xml/commit/0cb09fbda928e9328ff926c1c4661ae1fda27d0f"><code>0cb09fb</code></a>
Use <code>if let</code> instead of <code>match</code></li>
<li><a
href="https://github.com/tafia/quick-xml/commit/6c58bef3ab12edd0dbbfe30a41a86b4b04530d2d"><code>6c58bef</code></a>
Implement XmlSource::read_pi like XmlSource::read_element</li>
<li><a
href="https://github.com/tafia/quick-xml/commit/79b2fda9fe3d352a38cad5d8f6dbc1034ef7a196"><code>79b2fda</code></a>
Stop at the <code>&gt;</code> in PiParser which is consistent with other
search functions</li>
<li>Additional commits viewable in <a
href="https://github.com/tafia/quick-xml/compare/v0.31.0...v0.32.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=quick-xml&package-manager=cargo&previous-version=0.31.0&new-version=0.32.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 2 +-
 Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index eec323bb18..42ff20f30c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3082,7 +3082,7 @@ dependencies = [
  "pretty_assertions",
  "print-positions",
  "procfs",
- "quick-xml 0.31.0",
+ "quick-xml 0.32.0",
  "quickcheck",
  "quickcheck_macros",
  "rand",
diff --git a/Cargo.toml b/Cargo.toml
index bfc454d56d..239a8ee748 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -132,7 +132,7 @@ 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"

From c18e6bfca01dac00f089458aa766fb3c8d3e317b Mon Sep 17 00:00:00 2001
From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Tue, 6 Aug 2024 22:40:30 -0400
Subject: [PATCH 0322/1072] Add type signature example for def command (#13561)

# Description

By popular demand (a.k.a.
https://github.com/nushell/nushell.github.io/issues/1035), provide an
example of a type signature in the `def` help.

# User-Facing Changes

Help/Doc

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib

# After Submitting

N/A
---
 crates/nu-cmd-lang/src/core_commands/def.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/crates/nu-cmd-lang/src/core_commands/def.rs b/crates/nu-cmd-lang/src/core_commands/def.rs
index 913f74803c..7f8613f315 100644
--- 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)),
+            },
         ]
     }
 }

From ce13ecfd10500ba4bfbd2c51aa894b273fb0e659 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 11:09:23 +0800
Subject: [PATCH 0323/1072] Bump mockito from 1.4.0 to 1.5.0 (#13558)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [mockito](https://github.com/lipanski/mockito) from 1.4.0 to
1.5.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/lipanski/mockito/releases">mockito's
releases</a>.</em></p>
<blockquote>
<h2>1.5.0</h2>
<ul>
<li><strong>[Breaking]</strong> <a
href="https://redirect.github.com/lipanski/mockito/pull/198">Upgrade</a>
to hyper v1</li>
</ul>
<p>Thanks to <a
href="https://github.com/tottoto"><code>@​tottoto</code></a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/lipanski/mockito/commit/f1c3fe1b7ff1f0f2c1de07bf8251a39f5befa777"><code>f1c3fe1</code></a>
Bump to 1.5.0</li>
<li><a
href="https://github.com/lipanski/mockito/commit/08f2fa322d91442f8928647bb7e99af433e134f5"><code>08f2fa3</code></a>
Merge pull request <a
href="https://redirect.github.com/lipanski/mockito/issues/199">#199</a>
from tottoto/refactor-response-body</li>
<li><a
href="https://github.com/lipanski/mockito/commit/42e3efe7340158b0bd210b97bdd9bffbed5b46a2"><code>42e3efe</code></a>
Refactor response body</li>
<li><a
href="https://github.com/lipanski/mockito/commit/f477e54857936cea7f1d4acf263f9860ec3808f8"><code>f477e54</code></a>
Merge pull request <a
href="https://redirect.github.com/lipanski/mockito/issues/198">#198</a>
from tottoto/update-to-hyper-1</li>
<li><a
href="https://github.com/lipanski/mockito/commit/e8694ae991f84266fbb1b9d0f27f3f288b4ee8cc"><code>e8694ae</code></a>
Update to hyper 1</li>
<li><a
href="https://github.com/lipanski/mockito/commit/b152b76130ac65e6472d8d7da65f4dd9fbf941ae"><code>b152b76</code></a>
Depend on some crate directly</li>
<li>See full diff in <a
href="https://github.com/lipanski/mockito/compare/1.4.0...1.5.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=mockito&package-manager=cargo&previous-version=1.4.0&new-version=1.5.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 88 +++++++++++++++++++++++++++++++-----------------------
 Cargo.toml |  2 +-
 2 files changed, 52 insertions(+), 38 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 42ff20f30c..d6b1054bed 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -297,6 +297,12 @@ version = "0.15.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ae037714f313c1353189ead58ef9eec30a8e8dc101b2622d461418fd59e28a9"
 
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
 [[package]]
 name = "autocfg"
 version = "1.2.0"
@@ -1796,15 +1802,15 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.26"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
+checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
 dependencies = [
+ "atomic-waker",
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
- "futures-util",
  "http",
  "indexmap",
  "slab",
@@ -1921,9 +1927,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.12"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
 dependencies = [
  "bytes",
  "fnv",
@@ -1932,12 +1938,24 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "0.4.6"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes",
  "http",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
  "pin-project-lite",
 ]
 
@@ -1973,13 +1991,12 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.28"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
+checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
 dependencies = [
  "bytes",
  "futures-channel",
- "futures-core",
  "futures-util",
  "h2",
  "http",
@@ -1988,10 +2005,23 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
+ "smallvec",
+ "tokio",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "hyper",
+ "pin-project-lite",
  "tokio",
- "tower-service",
- "tracing",
- "want",
 ]
 
 [[package]]
@@ -2704,13 +2734,18 @@ dependencies = [
 
 [[package]]
 name = "mockito"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2f6e023aa5bdf392aa06c78e4a4e6d498baab5138d0c993503350ebbc37bf1e"
+checksum = "09b34bd91b9e5c5b06338d392463e1318d683cf82ec3d3af4014609be6e2108d"
 dependencies = [
  "assert-json-diff",
- "futures-core",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
  "hyper",
+ "hyper-util",
  "log",
  "rand",
  "regex",
@@ -6296,12 +6331,6 @@ dependencies = [
  "winnow 0.6.7",
 ]
 
-[[package]]
-name = "tower-service"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
-
 [[package]]
 name = "tracing"
 version = "0.1.40"
@@ -6357,12 +6386,6 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc"
 
-[[package]]
-name = "try-lock"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
-
 [[package]]
 name = "typed-arena"
 version = "1.7.0"
@@ -6742,15 +6765,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "want"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
-dependencies = [
- "try-lock",
-]
-
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
diff --git a/Cargo.toml b/Cargo.toml
index 239a8ee748..91daf6ccf0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -112,7 +112,7 @@ md5 = { version = "0.10", package = "md-5" }
 miette = "7.2"
 mime = "0.3"
 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 }

From ff09c7964e14ca13846c29392a685f841edb9cd6 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Wed, 7 Aug 2024 04:36:08 -0700
Subject: [PATCH 0324/1072] `polars open` will now open a lazy frame by default
 (#13556)

# Description
When opening a dataframe the default operation will be to create a lazy
frame if possible. This works much better with large datasets and
supports hive format.

# User-Facing Changes
- `--lazy` is nolonger a valid option. `--eager` must be used to
explicitly open an eager dataframe.
---
 crates/nu_plugin_polars/src/dataframe/eager/open.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/eager/open.rs b/crates/nu_plugin_polars/src/dataframe/eager/open.rs
index c02e33b566..6c4246497c 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/open.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/open.rs
@@ -46,7 +46,7 @@ impl PluginCommand for OpenDataFrame {
     }
 
     fn usage(&self) -> &str {
-        "Opens CSV, JSON, JSON lines, arrow, avro, or parquet file to create dataframe."
+        "Opens CSV, JSON, JSON lines, arrow, avro, or parquet file to create dataframe. A lazy dataframe will be created by default, if supported."
     }
 
     fn signature(&self) -> Signature {
@@ -56,7 +56,7 @@ impl PluginCommand for OpenDataFrame {
                 SyntaxShape::Filepath,
                 "file path to load values from",
             )
-            .switch("lazy", "creates a lazy dataframe", Some('l'))
+            .switch("eager", "Open dataframe as an eager dataframe", None)
             .named(
                 "type",
                 SyntaxShape::String,
@@ -173,7 +173,7 @@ fn from_parquet(
     file_path: &Path,
     file_span: Span,
 ) -> Result<Value, ShellError> {
-    if call.has_flag("lazy")? {
+    if !call.has_flag("eager")? {
         let file: String = call.req(0)?;
         let args = ScanArgsParquet {
             n_rows: None,
@@ -275,7 +275,7 @@ fn from_ipc(
     file_path: &Path,
     file_span: Span,
 ) -> Result<Value, ShellError> {
-    if call.has_flag("lazy")? {
+    if !call.has_flag("eager")? {
         let file: String = call.req(0)?;
         let args = ScanArgsIpc {
             n_rows: None,
@@ -389,7 +389,7 @@ fn from_jsonl(
         .map(|schema| NuSchema::try_from(&schema))
         .transpose()?;
 
-    if call.has_flag("lazy")? {
+    if !call.has_flag("eager")? {
         let start_time = std::time::Instant::now();
 
         let df = LazyJsonLineReader::new(file_path)
@@ -473,7 +473,7 @@ fn from_csv(
         .map(|schema| NuSchema::try_from(&schema))
         .transpose()?;
 
-    if call.has_flag("lazy")? {
+    if !call.has_flag("eager")? {
         let csv_reader = LazyCsvReader::new(file_path);
 
         let csv_reader = match delimiter {

From ec3e0e593dd86a760374d4a69f005715214c8b20 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Wed, 7 Aug 2024 04:36:52 -0700
Subject: [PATCH 0325/1072] `polars first` and `polars last` will now handle
 lazy frames natively (#13555)

# Description
Prior this pull request `polars first` and `polars last` would collect a
lazy frame into an eager frame before performing operations. Now `polars
first` will to a `LazyFrame::limit` and `polars last` will perform a
`LazyFrame::tail`. This is really useful in working with very large
datasets.
---
 .../src/dataframe/eager/first.rs              | 38 +++++++++++++-----
 .../src/dataframe/eager/last.rs               | 39 ++++++++++++++-----
 2 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/eager/first.rs b/crates/nu_plugin_polars/src/dataframe/eager/first.rs
index a35ea7dd16..b874c257cb 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/first.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/first.rs
@@ -1,5 +1,5 @@
 use crate::{
-    values::{Column, CustomValueSupport, NuLazyFrame},
+    values::{Column, CustomValueSupport, NuLazyFrame, PolarsPluginObject},
     PolarsPlugin,
 };
 
@@ -98,20 +98,25 @@ impl PluginCommand for FirstDF {
         input: PipelineData,
     ) -> Result<PipelineData, LabeledError> {
         let value = input.into_value(call.head)?;
-        if NuDataFrame::can_downcast(&value) || NuLazyFrame::can_downcast(&value) {
-            let df = NuDataFrame::try_from_value_coerce(plugin, &value, call.head)?;
-            command(plugin, engine, call, df).map_err(|e| e.into())
-        } else {
-            let expr = NuExpression::try_from_value(plugin, &value)?;
-            let expr: NuExpression = expr.into_polars().first().into();
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuDataFrame(df) => {
+                command_eager(plugin, engine, call, df).map_err(|e| e.into())
+            }
+            PolarsPluginObject::NuLazyFrame(lazy) => {
+                command_lazy(plugin, engine, call, lazy).map_err(|e| e.into())
+            }
+            _ => {
+                let expr = NuExpression::try_from_value(plugin, &value)?;
+                let expr: NuExpression = expr.into_polars().first().into();
 
-            expr.to_pipeline_data(plugin, engine, call.head)
-                .map_err(LabeledError::from)
+                expr.to_pipeline_data(plugin, engine, call.head)
+                    .map_err(LabeledError::from)
+            }
         }
     }
 }
 
-fn command(
+fn command_eager(
     plugin: &PolarsPlugin,
     engine: &EngineInterface,
     call: &EvaluatedCall,
@@ -126,6 +131,19 @@ fn command(
     res.to_pipeline_data(plugin, engine, call.head)
 }
 
+fn command_lazy(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    lazy: NuLazyFrame,
+) -> Result<PipelineData, ShellError> {
+    let rows: Option<u32> = call.opt(0)?;
+    let rows = rows.unwrap_or(1);
+
+    let res: NuLazyFrame = lazy.to_polars().limit(rows).into();
+    res.to_pipeline_data(plugin, engine, call.head)
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/last.rs b/crates/nu_plugin_polars/src/dataframe/eager/last.rs
index 23b44eb473..316d346085 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/last.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/last.rs
@@ -1,5 +1,5 @@
 use crate::{
-    values::{Column, CustomValueSupport, NuLazyFrame},
+    values::{Column, CustomValueSupport, NuLazyFrame, PolarsPluginObject},
     PolarsPlugin,
 };
 
@@ -73,20 +73,25 @@ impl PluginCommand for LastDF {
         input: PipelineData,
     ) -> Result<PipelineData, LabeledError> {
         let value = input.into_value(call.head)?;
-        if NuDataFrame::can_downcast(&value) || NuLazyFrame::can_downcast(&value) {
-            let df = NuDataFrame::try_from_value_coerce(plugin, &value, call.head)?;
-            command(plugin, engine, call, df).map_err(|e| e.into())
-        } else {
-            let expr = NuExpression::try_from_value(plugin, &value)?;
-            let expr: NuExpression = expr.into_polars().last().into();
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuDataFrame(df) => {
+                command_eager(plugin, engine, call, df).map_err(|e| e.into())
+            }
+            PolarsPluginObject::NuLazyFrame(lazy) => {
+                command_lazy(plugin, engine, call, lazy).map_err(|e| e.into())
+            }
+            _ => {
+                let expr = NuExpression::try_from_value(plugin, &value)?;
+                let expr: NuExpression = expr.into_polars().last().into();
 
-            expr.to_pipeline_data(plugin, engine, call.head)
-                .map_err(LabeledError::from)
+                expr.to_pipeline_data(plugin, engine, call.head)
+                    .map_err(LabeledError::from)
+            }
         }
     }
 }
 
-fn command(
+fn command_eager(
     plugin: &PolarsPlugin,
     engine: &EngineInterface,
     call: &EvaluatedCall,
@@ -100,6 +105,20 @@ fn command(
     res.to_pipeline_data(plugin, engine, call.head)
 }
 
+fn command_lazy(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    lazy: NuLazyFrame,
+) -> Result<PipelineData, ShellError> {
+    let rows: Option<u32> = call.opt(0)?;
+    let rows = rows.unwrap_or(DEFAULT_ROWS as u32);
+
+    let res: NuLazyFrame = lazy.to_polars().tail(rows).into();
+
+    res.to_pipeline_data(plugin, engine, call.head)
+}
+
 #[cfg(test)]
 mod test {
     use crate::test::test_polars_plugin_command;

From 7d4449f021b8ddb6f2d696c6e6a6a30888005cd8 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Wed, 7 Aug 2024 08:59:49 -0700
Subject: [PATCH 0326/1072] =?UTF-8?q?Added=20`polars=20sink`=20command,=20?=
 =?UTF-8?q?that=20performs=20and=20streaming=20collect=20to=20t=E2=80=A6?=
 =?UTF-8?q?=20(#13562)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
This exposes the `LazyFrame::sink_*` functionality to allow a streaming
collect directly to the filesystem. This useful when working with data
that is too large to fit into memory.

# User-Facing Changes
- Introduction of the `polars sink` command
---
 crates/nu_plugin_polars/Cargo.toml            |   3 +-
 .../src/dataframe/lazy/mod.rs                 |   2 +
 .../src/dataframe/lazy/sink.rs                | 205 ++++++++++++++++++
 3 files changed, 209 insertions(+), 1 deletion(-)
 create mode 100644 crates/nu_plugin_polars/src/dataframe/lazy/sink.rs

diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 3c916286af..9636ce98a4 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -70,6 +70,7 @@ features = [
 	"serde",
 	"serde-lazy",
 	"strings",
+    "streaming",
 	"to_dummies",
 ]
 optional = false
@@ -81,4 +82,4 @@ nu-engine = { path = "../nu-engine", version = "0.96.2" }
 nu-parser = { path = "../nu-parser", version = "0.96.2" }
 nu-command = { path = "../nu-command", version = "0.96.2" }
 nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.96.2" }
-tempfile.workspace = true
\ No newline at end of file
+tempfile.workspace = true
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/mod.rs b/crates/nu_plugin_polars/src/dataframe/lazy/mod.rs
index e70143e6ce..e1944e06a1 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/mod.rs
@@ -12,6 +12,7 @@ mod macro_commands;
 mod median;
 mod quantile;
 mod select;
+mod sink;
 mod sort_by_expr;
 mod to_lazy;
 
@@ -53,5 +54,6 @@ pub(crate) fn lazy_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin
         Box::new(LazyQuantile),
         Box::new(ToLazyFrame),
         Box::new(ToLazyGroupBy),
+        Box::new(sink::Sink),
     ]
 }
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/sink.rs b/crates/nu_plugin_polars/src/dataframe/lazy/sink.rs
new file mode 100644
index 0000000000..0fdf0200f6
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/sink.rs
@@ -0,0 +1,205 @@
+use std::path::PathBuf;
+
+use crate::{
+    values::{cant_convert_err, PolarsPluginObject, PolarsPluginType},
+    PolarsPlugin,
+};
+
+use super::super::values::NuLazyFrame;
+
+use nu_path::expand_path_with;
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{
+    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Spanned,
+    SyntaxShape, Type, Value,
+};
+use polars::error::PolarsError;
+use polars_io::{
+    csv::write::CsvWriterOptions, ipc::IpcWriterOptions, json::JsonWriterOptions,
+    parquet::write::ParquetWriteOptions,
+};
+
+#[derive(Clone)]
+pub struct Sink;
+
+impl PluginCommand for Sink {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars sink"
+    }
+
+    fn usage(&self) -> &str {
+        "Streams a collect result to a file. This is useful if the result is too large for memory. Supports parquet, ipc/arrow, csv, and json formats."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .required("path", SyntaxShape::Filepath, "Path to write to.")
+            .named(
+                "type",
+                SyntaxShape::String,
+                "File type: csv, json, parquet, arrow/ipc. If omitted, derive from file extension",
+                Some('t'),
+            )
+            .input_output_type(Type::Any, Type::String)
+            .category(Category::Custom("lazyframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![Example {
+            description: "Collect and save the output to the specified file",
+            example: "[[a b];[1 2] [3 4]] | polars into-lazy | polars sink /tmp/foo.parquet",
+            result: None,
+        }]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        let value = input.into_value(call.head)?;
+
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuDataFrame(df) => command(plugin, engine, call, df.lazy()),
+            PolarsPluginObject::NuLazyFrame(lazy) => command(plugin, engine, call, lazy),
+            _ => Err(cant_convert_err(
+                &value,
+                &[PolarsPluginType::NuDataFrame, PolarsPluginType::NuLazyFrame],
+            )),
+        }
+        .map_err(LabeledError::from)
+    }
+}
+
+fn command(
+    _plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    lazy: NuLazyFrame,
+) -> Result<PipelineData, ShellError> {
+    let spanned_file: Spanned<PathBuf> = call.req(0)?;
+    let file_path = expand_path_with(&spanned_file.item, engine.get_current_dir()?, true);
+    let file_span = spanned_file.span;
+    let type_option: Option<Spanned<String>> = call.get_flag("type")?;
+    let type_id = match &type_option {
+        Some(ref t) => Some((t.item.to_owned(), "Invalid type", t.span)),
+        None => file_path.extension().map(|e| {
+            (
+                e.to_string_lossy().into_owned(),
+                "Invalid extension",
+                spanned_file.span,
+            )
+        }),
+    };
+
+    let polars_df = lazy.to_polars();
+
+    match type_id {
+        Some((e, msg, blamed)) => match e.as_str() {
+            "parquet" | "parq" => polars_df
+                .sink_parquet(&file_path, ParquetWriteOptions::default())
+                .map_err(|e| file_save_error(e, file_span))?,
+            "csv" => polars_df
+                .sink_csv(&file_path, CsvWriterOptions::default())
+                .map_err(|e| file_save_error(e, file_span))?,
+            "ipc" | "arrow" => polars_df
+                .sink_ipc(&file_path, IpcWriterOptions::default())
+                .map_err(|e| file_save_error(e, file_span))?,
+            "json" | "jsonl" | "ndjson" => polars_df
+                .sink_json(&file_path, JsonWriterOptions::default())
+                .map_err(|e| file_save_error(e, file_span))?,
+            _ => Err(ShellError::FileNotFoundCustom {
+                msg: format!("{msg}. Supported values: csv, tsv, parquet, ipc, arrow, json, jsonl"),
+                span: blamed,
+            })?,
+        },
+        None => Err(ShellError::FileNotFoundCustom {
+            msg: "File without extension".into(),
+            span: spanned_file.span,
+        })?,
+    };
+    let file_value = Value::string(format!("saved {:?}", &file_path), file_span);
+
+    Ok(PipelineData::Value(
+        Value::list(vec![file_value], call.head),
+        None,
+    ))
+}
+
+fn file_save_error(e: PolarsError, span: Span) -> ShellError {
+    ShellError::GenericError {
+        error: "Error saving file".into(),
+        msg: e.to_string(),
+        span: Some(span),
+        help: None,
+        inner: vec![],
+    }
+}
+
+#[cfg(test)]
+pub mod test {
+    use nu_plugin_test_support::PluginTest;
+    use nu_protocol::{Span, Value};
+    use uuid::Uuid;
+
+    use crate::PolarsPlugin;
+
+    pub fn test_sink(extension: &str) -> Result<(), Box<dyn std::error::Error>> {
+        let tmp_dir = tempfile::tempdir()?;
+        let mut tmp_file = tmp_dir.path().to_owned();
+        tmp_file.push(format!("{}.{}", Uuid::new_v4(), extension));
+        let tmp_file_str = tmp_file.to_str().expect("should be able to get file path");
+
+        let cmd = format!(
+            "[[a b]; [1 2] [3 4]] | polars into-lazy | polars sink {}",
+            tmp_file_str
+        );
+        let mut plugin_test = PluginTest::new("polars", PolarsPlugin::default().into())?;
+        plugin_test.engine_state_mut().add_env_var(
+            "PWD".to_string(),
+            Value::string(
+                tmp_dir
+                    .path()
+                    .to_str()
+                    .expect("should be able to get path")
+                    .to_owned(),
+                Span::test_data(),
+            ),
+        );
+        let pipeline_data = plugin_test.eval(&cmd)?;
+
+        assert!(tmp_file.exists());
+
+        let value = pipeline_data.into_value(Span::test_data())?;
+        let list = value.as_list()?;
+        assert_eq!(list.len(), 1);
+        let msg = list.first().expect("should have a value").as_str()?;
+        assert!(msg.contains("saved"));
+
+        Ok(())
+    }
+
+    #[test]
+    pub fn test_to_parquet() -> Result<(), Box<dyn std::error::Error>> {
+        test_sink("parquet")
+    }
+
+    #[test]
+    pub fn test_to_ipc() -> Result<(), Box<dyn std::error::Error>> {
+        test_sink("ipc")
+    }
+
+    #[test]
+    pub fn test_to_csv() -> Result<(), Box<dyn std::error::Error>> {
+        test_sink("csv")
+    }
+
+    #[test]
+    pub fn test_to_json() -> Result<(), Box<dyn std::error::Error>> {
+        test_sink("ndjson")
+    }
+}

From e530e7d654e9a8175fec10cdba8a698dffb54390 Mon Sep 17 00:00:00 2001
From: Qnbie <39221504+Qnbie@users.noreply.github.com>
Date: Wed, 7 Aug 2024 22:20:33 +0200
Subject: [PATCH 0327/1072] Make the math commands const (#13566)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR closes [Issue
#13482](https://github.com/nushell/nushell/issues/13482)

# Description
This PR tend to make all math function to be constant.

# User-Facing Changes
The math commands now can be used as constant methods.

### Some Example
```
> const MODE = [3 3 9 12 12 15] | math mode
> $MODE
╭───┬────╮
│ 0 │  3 │
│ 1 │ 12 │
╰───┴────╯

> const LOG = [16 8 4] | math log 2
> $LOG
╭───┬──────╮
│ 0 │ 4.00 │
│ 1 │ 3.00 │
│ 2 │ 2.00 │
╰───┴──────╯

> const VAR = [1 3 5] | math variance
> $VAR
2.6666666666666665
```

# Tests + Formatting
Tests are added for all of the math command to test there constant
behavior.

I mostly focused on the actual user experience, not the correctness of
the methods and algorithms.

# After Submitting
I think this change don't require any additional documentation. Feel
free to correct me in this topic please.
---
 crates/nu-command/src/math/abs.rs             | 17 ++++++++++
 crates/nu-command/src/math/avg.rs             | 13 ++++++++
 crates/nu-command/src/math/ceil.rs            | 21 ++++++++++++
 crates/nu-command/src/math/floor.rs           | 21 ++++++++++++
 crates/nu-command/src/math/log.rs             | 32 +++++++++++++++++++
 crates/nu-command/src/math/max.rs             | 13 ++++++++
 crates/nu-command/src/math/median.rs          | 13 ++++++++
 crates/nu-command/src/math/min.rs             | 13 ++++++++
 crates/nu-command/src/math/mode.rs            | 13 ++++++++
 crates/nu-command/src/math/product.rs         | 13 ++++++++
 crates/nu-command/src/math/round.rs           | 22 +++++++++++++
 crates/nu-command/src/math/stddev.rs          | 14 ++++++++
 crates/nu-command/src/math/sum.rs             | 13 ++++++++
 crates/nu-command/src/math/variance.rs        | 14 ++++++++
 crates/nu-command/tests/commands/math/abs.rs  |  7 ++++
 crates/nu-command/tests/commands/math/avg.rs  |  6 ++++
 crates/nu-command/tests/commands/math/ceil.rs |  7 ++++
 .../nu-command/tests/commands/math/floor.rs   |  7 ++++
 crates/nu-command/tests/commands/math/log.rs  |  7 ++++
 crates/nu-command/tests/commands/math/max.rs  |  7 ++++
 .../nu-command/tests/commands/math/median.rs  |  6 ++++
 crates/nu-command/tests/commands/math/min.rs  |  7 ++++
 crates/nu-command/tests/commands/math/mod.rs  | 10 ++++++
 crates/nu-command/tests/commands/math/mode.rs |  7 ++++
 .../nu-command/tests/commands/math/product.rs |  7 ++++
 .../nu-command/tests/commands/math/round.rs   |  6 ++++
 crates/nu-command/tests/commands/math/sqrt.rs |  6 ++++
 .../nu-command/tests/commands/math/stddev.rs  |  7 ++++
 crates/nu-command/tests/commands/math/sum.rs  |  6 ++++
 .../tests/commands/math/variance.rs           |  7 ++++
 30 files changed, 342 insertions(+)
 create mode 100644 crates/nu-command/tests/commands/math/abs.rs
 create mode 100644 crates/nu-command/tests/commands/math/ceil.rs
 create mode 100644 crates/nu-command/tests/commands/math/floor.rs
 create mode 100644 crates/nu-command/tests/commands/math/log.rs
 create mode 100644 crates/nu-command/tests/commands/math/max.rs
 create mode 100644 crates/nu-command/tests/commands/math/min.rs
 create mode 100644 crates/nu-command/tests/commands/math/mode.rs
 create mode 100644 crates/nu-command/tests/commands/math/product.rs
 create mode 100644 crates/nu-command/tests/commands/math/stddev.rs
 create mode 100644 crates/nu-command/tests/commands/math/variance.rs

diff --git a/crates/nu-command/src/math/abs.rs b/crates/nu-command/src/math/abs.rs
index b16097ba8d..86e913e3ee 100644
--- a/crates/nu-command/src/math/abs.rs
+++ b/crates/nu-command/src/math/abs.rs
@@ -34,6 +34,10 @@ impl Command for SubCommand {
         vec!["absolute", "modulus", "positive", "distance"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -45,6 +49,19 @@ impl Command for SubCommand {
         input.map(move |value| abs_helper(value, head), engine_state.signals())
     }
 
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let head = call.head;
+        input.map(
+            move |value| abs_helper(value, head),
+            working_set.permanent().signals(),
+        )
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![Example {
             description: "Compute absolute value of each number in a list of numbers",
diff --git a/crates/nu-command/src/math/avg.rs b/crates/nu-command/src/math/avg.rs
index 8b1b1640f0..fbc2aa327c 100644
--- a/crates/nu-command/src/math/avg.rs
+++ b/crates/nu-command/src/math/avg.rs
@@ -38,6 +38,10 @@ impl Command for SubCommand {
         vec!["average", "mean", "statistics"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         _engine_state: &EngineState,
@@ -48,6 +52,15 @@ impl Command for SubCommand {
         run_with_function(call, input, average)
     }
 
+    fn run_const(
+        &self,
+        _working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        run_with_function(call, input, average)
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
diff --git a/crates/nu-command/src/math/ceil.rs b/crates/nu-command/src/math/ceil.rs
index 0886ff0bc5..6a98e6da91 100644
--- a/crates/nu-command/src/math/ceil.rs
+++ b/crates/nu-command/src/math/ceil.rs
@@ -29,6 +29,10 @@ impl Command for SubCommand {
         vec!["ceiling", "round up", "rounding", "integer"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -44,6 +48,23 @@ impl Command for SubCommand {
         input.map(move |value| operate(value, head), engine_state.signals())
     }
 
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let head = call.head;
+        // This doesn't match explicit nulls
+        if matches!(input, PipelineData::Empty) {
+            return Err(ShellError::PipelineEmpty { dst_span: head });
+        }
+        input.map(
+            move |value| operate(value, head),
+            working_set.permanent().signals(),
+        )
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![Example {
             description: "Apply the ceil function to a list of numbers",
diff --git a/crates/nu-command/src/math/floor.rs b/crates/nu-command/src/math/floor.rs
index c2b34c2cf9..cfd7a60981 100644
--- a/crates/nu-command/src/math/floor.rs
+++ b/crates/nu-command/src/math/floor.rs
@@ -29,6 +29,10 @@ impl Command for SubCommand {
         vec!["round down", "rounding", "integer"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -44,6 +48,23 @@ impl Command for SubCommand {
         input.map(move |value| operate(value, head), engine_state.signals())
     }
 
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let head = call.head;
+        // This doesn't match explicit nulls
+        if matches!(input, PipelineData::Empty) {
+            return Err(ShellError::PipelineEmpty { dst_span: head });
+        }
+        input.map(
+            move |value| operate(value, head),
+            working_set.permanent().signals(),
+        )
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![Example {
             description: "Apply the floor function to a list of numbers",
diff --git a/crates/nu-command/src/math/log.rs b/crates/nu-command/src/math/log.rs
index 7a7e4bd27b..0ac967b3b2 100644
--- a/crates/nu-command/src/math/log.rs
+++ b/crates/nu-command/src/math/log.rs
@@ -34,6 +34,10 @@ impl Command for SubCommand {
         vec!["base", "exponent", "inverse", "euler"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -63,6 +67,34 @@ impl Command for SubCommand {
         )
     }
 
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let head = call.head;
+        let base: Spanned<f64> = call.req_const(working_set, 0)?;
+
+        if base.item <= 0.0f64 {
+            return Err(ShellError::UnsupportedInput {
+                msg: "Base has to be greater 0".into(),
+                input: "value originates from here".into(),
+                msg_span: head,
+                input_span: base.span,
+            });
+        }
+        // This doesn't match explicit nulls
+        if matches!(input, PipelineData::Empty) {
+            return Err(ShellError::PipelineEmpty { dst_span: head });
+        }
+        let base = base.item;
+        input.map(
+            move |value| operate(value, head, base),
+            working_set.permanent().signals(),
+        )
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
diff --git a/crates/nu-command/src/math/max.rs b/crates/nu-command/src/math/max.rs
index edda0526ed..ce88f4d244 100644
--- a/crates/nu-command/src/math/max.rs
+++ b/crates/nu-command/src/math/max.rs
@@ -35,6 +35,10 @@ impl Command for SubCommand {
         vec!["maximum", "largest"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         _engine_state: &EngineState,
@@ -45,6 +49,15 @@ impl Command for SubCommand {
         run_with_function(call, input, maximum)
     }
 
+    fn run_const(
+        &self,
+        _working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        run_with_function(call, input, maximum)
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
diff --git a/crates/nu-command/src/math/median.rs b/crates/nu-command/src/math/median.rs
index 32c4fd04a8..eeb3b4a199 100644
--- a/crates/nu-command/src/math/median.rs
+++ b/crates/nu-command/src/math/median.rs
@@ -32,6 +32,10 @@ impl Command for SubCommand {
         vec!["middle", "statistics"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         _engine_state: &EngineState,
@@ -42,6 +46,15 @@ impl Command for SubCommand {
         run_with_function(call, input, median)
     }
 
+    fn run_const(
+        &self,
+        _working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        run_with_function(call, input, median)
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
diff --git a/crates/nu-command/src/math/min.rs b/crates/nu-command/src/math/min.rs
index 5c7d43d4d8..4998a93a15 100644
--- a/crates/nu-command/src/math/min.rs
+++ b/crates/nu-command/src/math/min.rs
@@ -35,6 +35,10 @@ impl Command for SubCommand {
         vec!["minimum", "smallest"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         _engine_state: &EngineState,
@@ -45,6 +49,15 @@ impl Command for SubCommand {
         run_with_function(call, input, minimum)
     }
 
+    fn run_const(
+        &self,
+        _working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        run_with_function(call, input, minimum)
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
diff --git a/crates/nu-command/src/math/mode.rs b/crates/nu-command/src/math/mode.rs
index 7ce87ad842..6890e3f5b4 100644
--- a/crates/nu-command/src/math/mode.rs
+++ b/crates/nu-command/src/math/mode.rs
@@ -62,6 +62,10 @@ impl Command for SubCommand {
         vec!["common", "often"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         _engine_state: &EngineState,
@@ -72,6 +76,15 @@ impl Command for SubCommand {
         run_with_function(call, input, mode)
     }
 
+    fn run_const(
+        &self,
+        _working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        run_with_function(call, input, mode)
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
diff --git a/crates/nu-command/src/math/product.rs b/crates/nu-command/src/math/product.rs
index d42ede8150..2e457767bd 100644
--- a/crates/nu-command/src/math/product.rs
+++ b/crates/nu-command/src/math/product.rs
@@ -32,6 +32,10 @@ impl Command for SubCommand {
         vec!["times", "multiply", "x", "*"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         _engine_state: &EngineState,
@@ -42,6 +46,15 @@ impl Command for SubCommand {
         run_with_function(call, input, product)
     }
 
+    fn run_const(
+        &self,
+        _working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        run_with_function(call, input, product)
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
diff --git a/crates/nu-command/src/math/round.rs b/crates/nu-command/src/math/round.rs
index eafe669cf1..2faf7842d9 100644
--- a/crates/nu-command/src/math/round.rs
+++ b/crates/nu-command/src/math/round.rs
@@ -35,6 +35,10 @@ impl Command for SubCommand {
         vec!["approx", "closest", "nearest"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -54,6 +58,24 @@ impl Command for SubCommand {
         )
     }
 
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let precision_param: Option<i64> = call.get_flag_const(working_set, "precision")?;
+        let head = call.head;
+        // This doesn't match explicit nulls
+        if matches!(input, PipelineData::Empty) {
+            return Err(ShellError::PipelineEmpty { dst_span: head });
+        }
+        input.map(
+            move |value| operate(value, head, precision_param),
+            working_set.permanent().signals(),
+        )
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
diff --git a/crates/nu-command/src/math/stddev.rs b/crates/nu-command/src/math/stddev.rs
index d200275aa9..2e221e3b1f 100644
--- a/crates/nu-command/src/math/stddev.rs
+++ b/crates/nu-command/src/math/stddev.rs
@@ -41,6 +41,10 @@ impl Command for SubCommand {
         ]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -52,6 +56,16 @@ impl Command for SubCommand {
         run_with_function(call, input, compute_stddev(sample))
     }
 
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let sample = call.has_flag_const(working_set, "sample")?;
+        run_with_function(call, input, compute_stddev(sample))
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
diff --git a/crates/nu-command/src/math/sum.rs b/crates/nu-command/src/math/sum.rs
index 9a8285c6c5..cd4b6b4540 100644
--- a/crates/nu-command/src/math/sum.rs
+++ b/crates/nu-command/src/math/sum.rs
@@ -34,6 +34,10 @@ impl Command for SubCommand {
         vec!["plus", "add", "total", "+"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         _engine_state: &EngineState,
@@ -44,6 +48,15 @@ impl Command for SubCommand {
         run_with_function(call, input, summation)
     }
 
+    fn run_const(
+        &self,
+        _working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        run_with_function(call, input, summation)
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
diff --git a/crates/nu-command/src/math/variance.rs b/crates/nu-command/src/math/variance.rs
index a20a3f262a..7def47bb19 100644
--- a/crates/nu-command/src/math/variance.rs
+++ b/crates/nu-command/src/math/variance.rs
@@ -33,6 +33,10 @@ impl Command for SubCommand {
         vec!["deviation", "dispersion", "variation", "statistics"]
     }
 
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -44,6 +48,16 @@ impl Command for SubCommand {
         run_with_function(call, input, compute_variance(sample))
     }
 
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let sample = call.has_flag_const(working_set, "sample")?;
+        run_with_function(call, input, compute_variance(sample))
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
diff --git a/crates/nu-command/tests/commands/math/abs.rs b/crates/nu-command/tests/commands/math/abs.rs
new file mode 100644
index 0000000000..4d61c8ed11
--- /dev/null
+++ b/crates/nu-command/tests/commands/math/abs.rs
@@ -0,0 +1,7 @@
+use nu_test_support::nu;
+
+#[test]
+fn const_abs() {
+    let actual = nu!("const ABS = -5.5 | math abs; $ABS");
+    assert_eq!(actual.out, "5.5");
+}
diff --git a/crates/nu-command/tests/commands/math/avg.rs b/crates/nu-command/tests/commands/math/avg.rs
index 8e2f545071..744b2f6067 100644
--- a/crates/nu-command/tests/commands/math/avg.rs
+++ b/crates/nu-command/tests/commands/math/avg.rs
@@ -20,3 +20,9 @@ fn can_average_bytes() {
 
     assert_eq!(actual.out, "34985870");
 }
+
+#[test]
+fn const_avg() {
+    let actual = nu!("const AVG = [1 3 5] | math avg; $AVG");
+    assert_eq!(actual.out, "3");
+}
diff --git a/crates/nu-command/tests/commands/math/ceil.rs b/crates/nu-command/tests/commands/math/ceil.rs
new file mode 100644
index 0000000000..760fb0a503
--- /dev/null
+++ b/crates/nu-command/tests/commands/math/ceil.rs
@@ -0,0 +1,7 @@
+use nu_test_support::nu;
+
+#[test]
+fn const_ceil() {
+    let actual = nu!("const CEIL = 1.5 | math ceil; $CEIL");
+    assert_eq!(actual.out, "2");
+}
diff --git a/crates/nu-command/tests/commands/math/floor.rs b/crates/nu-command/tests/commands/math/floor.rs
new file mode 100644
index 0000000000..91184c8f58
--- /dev/null
+++ b/crates/nu-command/tests/commands/math/floor.rs
@@ -0,0 +1,7 @@
+use nu_test_support::nu;
+
+#[test]
+fn const_floor() {
+    let actual = nu!("const FLOOR = 15.5 | math floor; $FLOOR");
+    assert_eq!(actual.out, "15");
+}
diff --git a/crates/nu-command/tests/commands/math/log.rs b/crates/nu-command/tests/commands/math/log.rs
new file mode 100644
index 0000000000..a8e54689b5
--- /dev/null
+++ b/crates/nu-command/tests/commands/math/log.rs
@@ -0,0 +1,7 @@
+use nu_test_support::nu;
+
+#[test]
+fn const_log() {
+    let actual = nu!("const LOG = 16 | math log 2; $LOG");
+    assert_eq!(actual.out, "4");
+}
diff --git a/crates/nu-command/tests/commands/math/max.rs b/crates/nu-command/tests/commands/math/max.rs
new file mode 100644
index 0000000000..cd940d3811
--- /dev/null
+++ b/crates/nu-command/tests/commands/math/max.rs
@@ -0,0 +1,7 @@
+use nu_test_support::nu;
+
+#[test]
+fn const_max() {
+    let actual = nu!("const MAX = [1 3 5] | math max; $MAX");
+    assert_eq!(actual.out, "5");
+}
diff --git a/crates/nu-command/tests/commands/math/median.rs b/crates/nu-command/tests/commands/math/median.rs
index a84adec686..5e118e3b06 100644
--- a/crates/nu-command/tests/commands/math/median.rs
+++ b/crates/nu-command/tests/commands/math/median.rs
@@ -35,3 +35,9 @@ fn median_mixed_numbers() {
 
     assert_eq!(actual.out, "-11.5")
 }
+
+#[test]
+fn const_median() {
+    let actual = nu!("const MEDIAN = [1 3 5] | math median; $MEDIAN");
+    assert_eq!(actual.out, "3");
+}
diff --git a/crates/nu-command/tests/commands/math/min.rs b/crates/nu-command/tests/commands/math/min.rs
new file mode 100644
index 0000000000..1384562c08
--- /dev/null
+++ b/crates/nu-command/tests/commands/math/min.rs
@@ -0,0 +1,7 @@
+use nu_test_support::nu;
+
+#[test]
+fn const_min() {
+    let actual = nu!("const MIN = [1 3 5] | math min; $MIN");
+    assert_eq!(actual.out, "1");
+}
diff --git a/crates/nu-command/tests/commands/math/mod.rs b/crates/nu-command/tests/commands/math/mod.rs
index 3b120f730a..7918b3262a 100644
--- a/crates/nu-command/tests/commands/math/mod.rs
+++ b/crates/nu-command/tests/commands/math/mod.rs
@@ -1,8 +1,18 @@
+mod abs;
 mod avg;
+mod ceil;
+mod floor;
+mod log;
+mod max;
 mod median;
+mod min;
+mod mode;
+mod product;
 mod round;
 mod sqrt;
+mod stddev;
 mod sum;
+mod variance;
 
 use nu_test_support::{nu, pipeline};
 
diff --git a/crates/nu-command/tests/commands/math/mode.rs b/crates/nu-command/tests/commands/math/mode.rs
new file mode 100644
index 0000000000..160d2b6897
--- /dev/null
+++ b/crates/nu-command/tests/commands/math/mode.rs
@@ -0,0 +1,7 @@
+use nu_test_support::nu;
+
+#[test]
+fn const_avg() {
+    let actual = nu!("const MODE = [1 3 3 5] | math mode; $MODE");
+    assert_eq!(actual.out, "╭───┬───╮│ 0 │ 3 │╰───┴───╯");
+}
diff --git a/crates/nu-command/tests/commands/math/product.rs b/crates/nu-command/tests/commands/math/product.rs
new file mode 100644
index 0000000000..f31ba9c6bc
--- /dev/null
+++ b/crates/nu-command/tests/commands/math/product.rs
@@ -0,0 +1,7 @@
+use nu_test_support::nu;
+
+#[test]
+fn const_product() {
+    let actual = nu!("const PROD = [1 3 5] | math product; $PROD");
+    assert_eq!(actual.out, "15");
+}
diff --git a/crates/nu-command/tests/commands/math/round.rs b/crates/nu-command/tests/commands/math/round.rs
index b05bcf2d13..61a3199701 100644
--- a/crates/nu-command/tests/commands/math/round.rs
+++ b/crates/nu-command/tests/commands/math/round.rs
@@ -34,3 +34,9 @@ fn fails_with_wrong_input_type() {
 
     assert!(actual.err.contains("command doesn't support"))
 }
+
+#[test]
+fn const_round() {
+    let actual = nu!("const ROUND = 18.345 | math round; $ROUND");
+    assert_eq!(actual.out, "18");
+}
diff --git a/crates/nu-command/tests/commands/math/sqrt.rs b/crates/nu-command/tests/commands/math/sqrt.rs
index 655e0125d5..a0ba35b233 100644
--- a/crates/nu-command/tests/commands/math/sqrt.rs
+++ b/crates/nu-command/tests/commands/math/sqrt.rs
@@ -20,3 +20,9 @@ fn can_sqrt_perfect_square() {
 
     assert_eq!(actual.out, "2");
 }
+
+#[test]
+fn const_sqrt() {
+    let actual = nu!("const SQRT = 4 | math sqrt; $SQRT");
+    assert_eq!(actual.out, "2");
+}
diff --git a/crates/nu-command/tests/commands/math/stddev.rs b/crates/nu-command/tests/commands/math/stddev.rs
new file mode 100644
index 0000000000..83fc472396
--- /dev/null
+++ b/crates/nu-command/tests/commands/math/stddev.rs
@@ -0,0 +1,7 @@
+use nu_test_support::nu;
+
+#[test]
+fn const_avg() {
+    let actual = nu!("const SDEV = [1 2] | math stddev; $SDEV");
+    assert_eq!(actual.out, "0.5");
+}
diff --git a/crates/nu-command/tests/commands/math/sum.rs b/crates/nu-command/tests/commands/math/sum.rs
index 327eadee11..048a12e9e3 100644
--- a/crates/nu-command/tests/commands/math/sum.rs
+++ b/crates/nu-command/tests/commands/math/sum.rs
@@ -77,3 +77,9 @@ fn sum_of_a_row_containing_a_table_is_an_error() {
         .err
         .contains("Attempted to compute the sum of a value that cannot be summed"));
 }
+
+#[test]
+fn const_sum() {
+    let actual = nu!("const SUM = [1 3] | math sum; $SUM");
+    assert_eq!(actual.out, "4");
+}
diff --git a/crates/nu-command/tests/commands/math/variance.rs b/crates/nu-command/tests/commands/math/variance.rs
new file mode 100644
index 0000000000..1e27484bf0
--- /dev/null
+++ b/crates/nu-command/tests/commands/math/variance.rs
@@ -0,0 +1,7 @@
+use nu_test_support::nu;
+
+#[test]
+fn const_variance() {
+    let actual = nu!("const VAR = [1 2 3 4 5] | math variance; $VAR");
+    assert_eq!(actual.out, "2");
+}

From 035308bb1df550fb1a651642e271cb7a196154e7 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Thu, 8 Aug 2024 00:50:28 +0200
Subject: [PATCH 0328/1072] Bump typo with new ignore (#13563)

Supersedes #13554

(not sure how to narrow the word ignore to a file, maybe the better
course of action would be to mark this file as an ignore with all the
cryptic fileendings)
---
 .github/workflows/typos.yml | 2 +-
 typos.toml                  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index 98ace3be57..fb363cad64 100644
--- 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.23.5
+        uses: crate-ci/typos@v1.23.6
diff --git a/typos.toml b/typos.toml
index 971aef7c15..4f44aea6d4 100644
--- a/typos.toml
+++ b/typos.toml
@@ -23,6 +23,7 @@ extend-ignore-re = [
 [type.rust.extend-words]
 nd = "nd"
 numer = "numer"
+styl = "styl"
 
 [default.extend-identifiers]
 ratatui = "ratatui"

From 4ff33933dd7701240c37e4eee24929ebc8dccd92 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Thu, 8 Aug 2024 09:46:45 -0700
Subject: [PATCH 0329/1072] Merge `polars sink` and `polars to-*` to `polars
 save` (#13568)

# Description
This pull request merges `polars sink` and `polars to-*` into one
command `polars save`.


# User-Facing Changes
- `polars to-*` commands have all been replaced with `polars save`. When
saving a lazy frame to a type that supports a polars sink operation, a
sink operation will be performed. Sink operations are much more
performant, performing a collect while streaming to the file system.
---
 .../src/dataframe/eager/mod.rs                |  17 +-
 .../src/dataframe/eager/open.rs               |  74 ++---
 .../src/dataframe/eager/save/arrow.rs         |  62 ++++
 .../src/dataframe/eager/save/avro.rs          |  74 +++++
 .../src/dataframe/eager/save/csv.rs           | 111 +++++++
 .../src/dataframe/eager/save/mod.rs           | 308 ++++++++++++++++++
 .../src/dataframe/eager/save/ndjson.rs        |  63 ++++
 .../src/dataframe/eager/save/parquet.rs       |  62 ++++
 .../src/dataframe/eager/to_arrow.rs           | 134 --------
 .../src/dataframe/eager/to_avro.rs            | 163 ---------
 .../src/dataframe/eager/to_csv.rs             | 181 ----------
 .../src/dataframe/eager/to_json_lines.rs      | 135 --------
 .../src/dataframe/eager/to_parquet.rs         | 135 --------
 .../src/dataframe/lazy/mod.rs                 |   2 -
 .../src/dataframe/lazy/sink.rs                | 205 ------------
 .../src/dataframe/values/file_type.rs         |  59 ++++
 .../src/dataframe/values/mod.rs               |  16 +
 17 files changed, 794 insertions(+), 1007 deletions(-)
 create mode 100644 crates/nu_plugin_polars/src/dataframe/eager/save/arrow.rs
 create mode 100644 crates/nu_plugin_polars/src/dataframe/eager/save/avro.rs
 create mode 100644 crates/nu_plugin_polars/src/dataframe/eager/save/csv.rs
 create mode 100644 crates/nu_plugin_polars/src/dataframe/eager/save/mod.rs
 create mode 100644 crates/nu_plugin_polars/src/dataframe/eager/save/ndjson.rs
 create mode 100644 crates/nu_plugin_polars/src/dataframe/eager/save/parquet.rs
 delete mode 100644 crates/nu_plugin_polars/src/dataframe/eager/to_arrow.rs
 delete mode 100644 crates/nu_plugin_polars/src/dataframe/eager/to_avro.rs
 delete mode 100644 crates/nu_plugin_polars/src/dataframe/eager/to_csv.rs
 delete mode 100644 crates/nu_plugin_polars/src/dataframe/eager/to_json_lines.rs
 delete mode 100644 crates/nu_plugin_polars/src/dataframe/eager/to_parquet.rs
 delete mode 100644 crates/nu_plugin_polars/src/dataframe/lazy/sink.rs
 create mode 100644 crates/nu_plugin_polars/src/dataframe/values/file_type.rs

diff --git a/crates/nu_plugin_polars/src/dataframe/eager/mod.rs b/crates/nu_plugin_polars/src/dataframe/eager/mod.rs
index 6aa37d1ed1..1dea968efe 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/mod.rs
@@ -14,6 +14,7 @@ mod pivot;
 mod query_df;
 mod rename;
 mod sample;
+mod save;
 mod schema;
 mod shape;
 mod slice;
@@ -21,13 +22,8 @@ mod sql_context;
 mod sql_expr;
 mod summary;
 mod take;
-mod to_arrow;
-mod to_avro;
-mod to_csv;
 mod to_df;
-mod to_json_lines;
 mod to_nu;
-mod to_parquet;
 mod unpivot;
 mod with_column;
 
@@ -55,13 +51,8 @@ pub use slice::SliceDF;
 pub use sql_context::SQLContext;
 pub use summary::Summary;
 pub use take::TakeDF;
-pub use to_arrow::ToArrow;
-pub use to_avro::ToAvro;
-pub use to_csv::ToCSV;
 pub use to_df::ToDataFrame;
-pub use to_json_lines::ToJsonLines;
 pub use to_nu::ToNu;
-pub use to_parquet::ToParquet;
 pub use unpivot::UnpivotDF;
 pub use with_column::WithColumn;
 
@@ -89,13 +80,9 @@ pub(crate) fn eager_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugi
         Box::new(SchemaCmd),
         Box::new(TakeDF),
         Box::new(ToNu),
-        Box::new(ToArrow),
-        Box::new(ToAvro),
         Box::new(ToDataFrame),
-        Box::new(ToCSV),
-        Box::new(ToJsonLines),
-        Box::new(ToParquet),
         Box::new(QueryDf),
         Box::new(WithColumn),
+        Box::new(save::SaveDF),
     ]
 }
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/open.rs b/crates/nu_plugin_polars/src/dataframe/eager/open.rs
index 6c4246497c..77fbe583aa 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/open.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/open.rs
@@ -1,6 +1,6 @@
 use crate::{
     dataframe::values::NuSchema,
-    values::{CustomValueSupport, NuLazyFrame},
+    values::{CustomValueSupport, NuLazyFrame, PolarsFileType},
     EngineWrapper, PolarsPlugin,
 };
 use nu_path::expand_path_with;
@@ -46,7 +46,7 @@ impl PluginCommand for OpenDataFrame {
     }
 
     fn usage(&self) -> &str {
-        "Opens CSV, JSON, JSON lines, arrow, avro, or parquet file to create dataframe. A lazy dataframe will be created by default, if supported."
+        "Opens CSV, JSON, NDJSON/JSON lines, arrow, avro, or parquet file to create dataframe. A lazy dataframe will be created by default, if supported."
     }
 
     fn signature(&self) -> Signature {
@@ -130,33 +130,37 @@ fn command(
     let file_path = expand_path_with(&spanned_file.item, engine.get_current_dir()?, true);
     let file_span = spanned_file.span;
 
-    let type_option: Option<Spanned<String>> = call.get_flag("type")?;
+    let type_option: Option<(String, Span)> = call
+        .get_flag("type")?
+        .map(|t: Spanned<String>| (t.item, t.span))
+        .or_else(|| {
+            file_path
+                .extension()
+                .map(|e| (e.to_string_lossy().into_owned(), spanned_file.span))
+        });
 
-    let type_id = match &type_option {
-        Some(ref t) => Some((t.item.to_owned(), "Invalid type", t.span)),
-        None => file_path.extension().map(|e| {
-            (
-                e.to_string_lossy().into_owned(),
-                "Invalid extension",
-                spanned_file.span,
-            )
-        }),
-    };
-
-    match type_id {
-        Some((e, msg, blamed)) => match e.as_str() {
-            "csv" | "tsv" => from_csv(plugin, engine, call, &file_path, file_span),
-            "parquet" | "parq" => from_parquet(plugin, engine, call, &file_path, file_span),
-            "ipc" | "arrow" => from_ipc(plugin, engine, call, &file_path, file_span),
-            "json" => from_json(plugin, engine, call, &file_path, file_span),
-            "jsonl" => from_jsonl(plugin, engine, call, &file_path, file_span),
-            "avro" => from_avro(plugin, engine, call, &file_path, file_span),
-            _ => Err(ShellError::FileNotFoundCustom {
-                msg: format!(
-                    "{msg}. Supported values: csv, tsv, parquet, ipc, arrow, json, jsonl, avro"
-                ),
-                span: blamed,
-            }),
+    match type_option {
+        Some((ext, blamed)) => match PolarsFileType::from(ext.as_str()) {
+            PolarsFileType::Csv | PolarsFileType::Tsv => {
+                from_csv(plugin, engine, call, &file_path, file_span)
+            }
+            PolarsFileType::Parquet => from_parquet(plugin, engine, call, &file_path, file_span),
+            PolarsFileType::Arrow => from_arrow(plugin, engine, call, &file_path, file_span),
+            PolarsFileType::Json => from_json(plugin, engine, call, &file_path, file_span),
+            PolarsFileType::NdJson => from_ndjson(plugin, engine, call, &file_path, file_span),
+            PolarsFileType::Avro => from_avro(plugin, engine, call, &file_path, file_span),
+            _ => Err(PolarsFileType::build_unsupported_error(
+                &ext,
+                &[
+                    PolarsFileType::Csv,
+                    PolarsFileType::Tsv,
+                    PolarsFileType::Parquet,
+                    PolarsFileType::Arrow,
+                    PolarsFileType::NdJson,
+                    PolarsFileType::Avro,
+                ],
+                blamed,
+            )),
         },
         None => Err(ShellError::FileNotFoundCustom {
             msg: "File without extension".into(),
@@ -268,7 +272,7 @@ fn from_avro(
     df.cache_and_to_value(plugin, engine, call.head)
 }
 
-fn from_ipc(
+fn from_arrow(
     plugin: &PolarsPlugin,
     engine: &nu_plugin::EngineInterface,
     call: &nu_plugin::EvaluatedCall,
@@ -370,7 +374,7 @@ fn from_json(
     df.cache_and_to_value(plugin, engine, call.head)
 }
 
-fn from_jsonl(
+fn from_ndjson(
     plugin: &PolarsPlugin,
     engine: &nu_plugin::EngineInterface,
     call: &nu_plugin::EvaluatedCall,
@@ -397,18 +401,14 @@ fn from_jsonl(
             .with_schema(maybe_schema.map(|s| s.into()))
             .finish()
             .map_err(|e| ShellError::GenericError {
-                error: format!("Json lines reader error: {e}"),
+                error: format!("NDJSON reader error: {e}"),
                 msg: "".into(),
                 span: Some(call.head),
                 help: None,
                 inner: vec![],
             })?;
 
-        perf!(
-            "Lazy json lines dataframe open",
-            start_time,
-            engine.use_color()
-        );
+        perf!("Lazy NDJSON dataframe open", start_time, engine.use_color());
 
         let df = NuLazyFrame::new(false, df);
         df.cache_and_to_value(plugin, engine, call.head)
@@ -444,7 +444,7 @@ fn from_jsonl(
             .into();
 
         perf!(
-            "Eager json lines dataframe open",
+            "Eager NDJSON dataframe open",
             start_time,
             engine.use_color()
         );
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/save/arrow.rs b/crates/nu_plugin_polars/src/dataframe/eager/save/arrow.rs
new file mode 100644
index 0000000000..2c972c4d4f
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/eager/save/arrow.rs
@@ -0,0 +1,62 @@
+use std::{fs::File, path::Path};
+
+use nu_plugin::EvaluatedCall;
+use nu_protocol::{ShellError, Span};
+use polars::prelude::{IpcWriter, SerWriter};
+use polars_io::ipc::IpcWriterOptions;
+
+use crate::values::{NuDataFrame, NuLazyFrame};
+
+use super::polars_file_save_error;
+
+pub(crate) fn command_lazy(
+    _call: &EvaluatedCall,
+    lazy: &NuLazyFrame,
+    file_path: &Path,
+    file_span: Span,
+) -> Result<(), ShellError> {
+    lazy.to_polars()
+        .sink_ipc(file_path, IpcWriterOptions::default())
+        .map_err(|e| polars_file_save_error(e, file_span))
+}
+
+pub(crate) fn command_eager(
+    df: &NuDataFrame,
+    file_path: &Path,
+    file_span: Span,
+) -> Result<(), ShellError> {
+    let mut file = File::create(file_path).map_err(|e| ShellError::GenericError {
+        error: format!("Error with file name: {e}"),
+        msg: "".into(),
+        span: Some(file_span),
+        help: None,
+        inner: vec![],
+    })?;
+
+    IpcWriter::new(&mut file)
+        .finish(&mut df.to_polars())
+        .map_err(|e| ShellError::GenericError {
+            error: "Error saving file".into(),
+            msg: e.to_string(),
+            span: Some(file_span),
+            help: None,
+            inner: vec![],
+        })?;
+    Ok(())
+}
+
+#[cfg(test)]
+pub mod test {
+
+    use crate::eager::save::test::{test_eager_save, test_lazy_save};
+
+    #[test]
+    pub fn test_arrow_eager_save() -> Result<(), Box<dyn std::error::Error>> {
+        test_eager_save("arrow")
+    }
+
+    #[test]
+    pub fn test_arrow_lazy_save() -> Result<(), Box<dyn std::error::Error>> {
+        test_lazy_save("arrow")
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/save/avro.rs b/crates/nu_plugin_polars/src/dataframe/eager/save/avro.rs
new file mode 100644
index 0000000000..58463ec36c
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/eager/save/avro.rs
@@ -0,0 +1,74 @@
+use std::fs::File;
+use std::path::Path;
+
+use nu_plugin::EvaluatedCall;
+use nu_protocol::{ShellError, Span};
+use polars_io::avro::{AvroCompression, AvroWriter};
+use polars_io::SerWriter;
+
+use crate::values::NuDataFrame;
+
+fn get_compression(call: &EvaluatedCall) -> Result<Option<AvroCompression>, ShellError> {
+    if let Some((compression, span)) = call
+        .get_flag_value("avro-compression")
+        .map(|e| e.as_str().map(|s| (s.to_owned(), e.span())))
+        .transpose()?
+    {
+        match compression.as_ref() {
+            "snappy" => Ok(Some(AvroCompression::Snappy)),
+            "deflate" => Ok(Some(AvroCompression::Deflate)),
+            _ => Err(ShellError::IncorrectValue {
+                msg: "compression must be one of deflate or snappy".to_string(),
+                val_span: span,
+                call_span: span,
+            }),
+        }
+    } else {
+        Ok(None)
+    }
+}
+
+pub(crate) fn command_eager(
+    call: &EvaluatedCall,
+    df: &NuDataFrame,
+    file_path: &Path,
+    file_span: Span,
+) -> Result<(), ShellError> {
+    let compression = get_compression(call)?;
+
+    let file = File::create(file_path).map_err(|e| ShellError::GenericError {
+        error: format!("Error with file name: {e}"),
+        msg: "".into(),
+        span: Some(file_span),
+        help: None,
+        inner: vec![],
+    })?;
+
+    AvroWriter::new(file)
+        .with_compression(compression)
+        .finish(&mut df.to_polars())
+        .map_err(|e| ShellError::GenericError {
+            error: "Error saving file".into(),
+            msg: e.to_string(),
+            span: Some(file_span),
+            help: None,
+            inner: vec![],
+        })?;
+
+    Ok(())
+}
+
+#[cfg(test)]
+pub mod test {
+    use crate::eager::save::test::{test_eager_save, test_lazy_save};
+
+    #[test]
+    pub fn test_avro_eager_save() -> Result<(), Box<dyn std::error::Error>> {
+        test_eager_save("avro")
+    }
+
+    #[test]
+    pub fn test_avro_lazy_save() -> Result<(), Box<dyn std::error::Error>> {
+        test_lazy_save("avro")
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/save/csv.rs b/crates/nu_plugin_polars/src/dataframe/eager/save/csv.rs
new file mode 100644
index 0000000000..f43b1b023b
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/eager/save/csv.rs
@@ -0,0 +1,111 @@
+use std::{fs::File, path::Path};
+
+use nu_plugin::EvaluatedCall;
+use nu_protocol::{ShellError, Span, Spanned};
+use polars::prelude::{CsvWriter, SerWriter};
+use polars_io::csv::write::{CsvWriterOptions, SerializeOptions};
+
+use crate::values::{NuDataFrame, NuLazyFrame};
+
+use super::polars_file_save_error;
+
+pub(crate) fn command_lazy(
+    call: &EvaluatedCall,
+    lazy: &NuLazyFrame,
+    file_path: &Path,
+    file_span: Span,
+) -> Result<(), ShellError> {
+    let delimiter: Option<Spanned<String>> = call.get_flag("csv-delimiter")?;
+    let separator = delimiter
+        .and_then(|d| d.item.chars().next().map(|c| c as u8))
+        .unwrap_or(b',');
+
+    let no_header: bool = call.has_flag("csv-no-header")?;
+
+    let options = CsvWriterOptions {
+        include_header: !no_header,
+        serialize_options: SerializeOptions {
+            separator,
+            ..SerializeOptions::default()
+        },
+        ..CsvWriterOptions::default()
+    };
+
+    lazy.to_polars()
+        .sink_csv(file_path, options)
+        .map_err(|e| polars_file_save_error(e, file_span))
+}
+
+pub(crate) fn command_eager(
+    call: &EvaluatedCall,
+    df: &NuDataFrame,
+    file_path: &Path,
+    file_span: Span,
+) -> Result<(), ShellError> {
+    let delimiter: Option<Spanned<String>> = call.get_flag("csv-delimiter")?;
+    let no_header: bool = call.has_flag("csv-no-header")?;
+
+    let mut file = File::create(file_path).map_err(|e| ShellError::GenericError {
+        error: format!("Error with file name: {e}"),
+        msg: "".into(),
+        span: Some(file_span),
+        help: None,
+        inner: vec![],
+    })?;
+
+    let writer = CsvWriter::new(&mut file);
+
+    let writer = if no_header {
+        writer.include_header(false)
+    } else {
+        writer.include_header(true)
+    };
+
+    let mut writer = match delimiter {
+        None => writer,
+        Some(d) => {
+            if d.item.len() != 1 {
+                return Err(ShellError::GenericError {
+                    error: "Incorrect delimiter".into(),
+                    msg: "Delimiter has to be one char".into(),
+                    span: Some(d.span),
+                    help: None,
+                    inner: vec![],
+                });
+            } else {
+                let delimiter = match d.item.chars().next() {
+                    Some(d) => d as u8,
+                    None => unreachable!(),
+                };
+
+                writer.with_separator(delimiter)
+            }
+        }
+    };
+
+    writer
+        .finish(&mut df.to_polars())
+        .map_err(|e| ShellError::GenericError {
+            error: format!("Error writing to file: {e}"),
+            msg: e.to_string(),
+            span: Some(file_span),
+            help: None,
+            inner: vec![],
+        })?;
+    Ok(())
+}
+
+#[cfg(test)]
+pub mod test {
+    use crate::eager::save::test::{test_eager_save, test_lazy_save};
+
+    #[test]
+    pub fn test_csv_eager_save() -> Result<(), Box<dyn std::error::Error>> {
+        test_eager_save("csv")
+    }
+
+    #[test]
+    pub fn test_csv_lazy_save() -> Result<(), Box<dyn std::error::Error>> {
+        test_lazy_save("csv")
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/save/mod.rs b/crates/nu_plugin_polars/src/dataframe/eager/save/mod.rs
new file mode 100644
index 0000000000..ce49fc54da
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/eager/save/mod.rs
@@ -0,0 +1,308 @@
+mod arrow;
+mod avro;
+mod csv;
+mod ndjson;
+mod parquet;
+
+use std::path::PathBuf;
+
+use crate::{
+    values::{cant_convert_err, PolarsFileType, PolarsPluginObject, PolarsPluginType},
+    PolarsPlugin,
+};
+
+use nu_path::expand_path_with;
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{
+    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Spanned,
+    SyntaxShape, Type, Value,
+};
+use polars::error::PolarsError;
+
+#[derive(Clone)]
+pub struct SaveDF;
+
+impl PluginCommand for SaveDF {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars save"
+    }
+
+    fn usage(&self) -> &str {
+        "Saves a dataframe to disk. For lazy dataframes a sink operation will be used if the file type supports it (parquet, ipc/arrow, csv, and ndjson)."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .required("path", SyntaxShape::Filepath, "Path to write to.")
+            .named(
+                "type",
+                SyntaxShape::String,
+                "File type: csv, json, parquet, arrow/ipc. If omitted, derive from file extension",
+                Some('t'),
+            )
+            .named(
+                "avro-compression",
+                SyntaxShape::String,
+                "Compression for avro supports deflate or snappy",
+                None,
+            )
+            .named(
+                "csv-delimiter",
+                SyntaxShape::String,
+                "file delimiter character",
+                None,
+            )
+            .switch(
+                "csv-no-header",
+                "Indicates to exclude a header row for CSV files.",
+                None,
+            )
+            .input_output_type(Type::Any, Type::String)
+            .category(Category::Custom("lazyframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description:
+                    "Performs a streaming collect and save the output to the specified file",
+                example: "[[a b];[1 2] [3 4]] | polars into-lazy | polars save test.parquet",
+                result: None,
+            },
+            Example {
+                description: "Saves dataframe to parquet file",
+                example: "[[a b]; [1 2] [3 4]] | polars into-df | polars save test.parquet",
+                result: None,
+            },
+            Example {
+                description: "Saves dataframe to arrow file",
+                example: "[[a b]; [1 2] [3 4]] | polars into-df | polars save test.arrow",
+                result: None,
+            },
+            Example {
+                description: "Saves dataframe to NDJSON file",
+                example: "[[a b]; [1 2] [3 4]] | polars into-df | polars save test.ndjson",
+                result: None,
+            },
+            Example {
+                description: "Saves dataframe to avro file",
+                example: "[[a b]; [1 2] [3 4]] | polars into-df | polars save test.avro",
+                result: None,
+            },
+            Example {
+                description: "Saves dataframe to CSV file",
+                example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr save test.csv",
+                result: None,
+            },
+            Example {
+                description: "Saves dataframe to CSV file using other delimiter",
+                example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr save test.csv --delimiter '|'",
+                result: None,
+            },
+        ]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        let value = input.into_value(call.head)?;
+
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            po @ PolarsPluginObject::NuDataFrame(_) | po @ PolarsPluginObject::NuLazyFrame(_) => {
+                command(plugin, engine, call, po)
+            }
+            _ => Err(cant_convert_err(
+                &value,
+                &[PolarsPluginType::NuDataFrame, PolarsPluginType::NuLazyFrame],
+            )),
+        }
+        .map_err(LabeledError::from)
+    }
+}
+
+fn command(
+    _plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    polars_object: PolarsPluginObject,
+) -> Result<PipelineData, ShellError> {
+    let spanned_file: Spanned<PathBuf> = call.req(0)?;
+    let file_path = expand_path_with(&spanned_file.item, engine.get_current_dir()?, true);
+    let file_span = spanned_file.span;
+    let type_option: Option<(String, Span)> = call
+        .get_flag("type")?
+        .map(|t: Spanned<String>| (t.item, t.span))
+        .or_else(|| {
+            file_path
+                .extension()
+                .map(|e| (e.to_string_lossy().into_owned(), spanned_file.span))
+        });
+
+    match type_option {
+        Some((ext, blamed)) => match PolarsFileType::from(ext.as_str()) {
+            PolarsFileType::Parquet => match polars_object {
+                PolarsPluginObject::NuLazyFrame(ref lazy) => {
+                    parquet::command_lazy(call, lazy, &file_path, file_span)
+                }
+                PolarsPluginObject::NuDataFrame(ref df) => {
+                    parquet::command_eager(df, &file_path, file_span)
+                }
+                _ => Err(unknown_file_save_error(file_span)),
+            },
+            PolarsFileType::Arrow => match polars_object {
+                PolarsPluginObject::NuLazyFrame(ref lazy) => {
+                    arrow::command_lazy(call, lazy, &file_path, file_span)
+                }
+                PolarsPluginObject::NuDataFrame(ref df) => {
+                    arrow::command_eager(df, &file_path, file_span)
+                }
+                _ => Err(unknown_file_save_error(file_span)),
+            },
+            PolarsFileType::NdJson => match polars_object {
+                PolarsPluginObject::NuLazyFrame(ref lazy) => {
+                    ndjson::command_lazy(call, lazy, &file_path, file_span)
+                }
+                PolarsPluginObject::NuDataFrame(ref df) => {
+                    ndjson::command_eager(df, &file_path, file_span)
+                }
+                _ => Err(unknown_file_save_error(file_span)),
+            },
+            PolarsFileType::Avro => match polars_object {
+                PolarsPluginObject::NuLazyFrame(lazy) => {
+                    let df = lazy.collect(call.head)?;
+                    avro::command_eager(call, &df, &file_path, file_span)
+                }
+                PolarsPluginObject::NuDataFrame(ref df) => {
+                    avro::command_eager(call, df, &file_path, file_span)
+                }
+                _ => Err(unknown_file_save_error(file_span)),
+            },
+            PolarsFileType::Csv => match polars_object {
+                PolarsPluginObject::NuLazyFrame(ref lazy) => {
+                    csv::command_lazy(call, lazy, &file_path, file_span)
+                }
+                PolarsPluginObject::NuDataFrame(ref df) => {
+                    csv::command_eager(call, df, &file_path, file_span)
+                }
+                _ => Err(unknown_file_save_error(file_span)),
+            },
+            _ => Err(PolarsFileType::build_unsupported_error(
+                &ext,
+                &[
+                    PolarsFileType::Parquet,
+                    PolarsFileType::Csv,
+                    PolarsFileType::Arrow,
+                    PolarsFileType::NdJson,
+                    PolarsFileType::Avro,
+                ],
+                blamed,
+            )),
+        },
+        None => Err(ShellError::FileNotFoundCustom {
+            msg: "File without extension".into(),
+            span: spanned_file.span,
+        }),
+    }?;
+    let file_value = Value::string(format!("saved {:?}", &file_path), file_span);
+
+    Ok(PipelineData::Value(
+        Value::list(vec![file_value], call.head),
+        None,
+    ))
+}
+
+pub(crate) fn polars_file_save_error(e: PolarsError, span: Span) -> ShellError {
+    ShellError::GenericError {
+        error: format!("Error saving file: {e}"),
+        msg: "".into(),
+        span: Some(span),
+        help: None,
+        inner: vec![],
+    }
+}
+
+pub fn unknown_file_save_error(span: Span) -> ShellError {
+    ShellError::GenericError {
+        error: "Could not save file for unknown reason".into(),
+        msg: "".into(),
+        span: Some(span),
+        help: None,
+        inner: vec![],
+    }
+}
+
+#[cfg(test)]
+pub(crate) mod test {
+    use nu_plugin_test_support::PluginTest;
+    use nu_protocol::{Span, Value};
+    use uuid::Uuid;
+
+    use crate::PolarsPlugin;
+
+    fn test_save(cmd: &'static str, extension: &str) -> Result<(), Box<dyn std::error::Error>> {
+        let tmp_dir = tempfile::tempdir()?;
+        let mut tmp_file = tmp_dir.path().to_owned();
+        tmp_file.push(format!("{}.{}", Uuid::new_v4(), extension));
+        let tmp_file_str = tmp_file.to_str().expect("should be able to get file path");
+
+        let cmd = format!("{cmd} {tmp_file_str}");
+        let mut plugin_test = PluginTest::new("polars", PolarsPlugin::default().into())?;
+        plugin_test.engine_state_mut().add_env_var(
+            "PWD".to_string(),
+            Value::string(
+                tmp_dir
+                    .path()
+                    .to_str()
+                    .expect("should be able to get path")
+                    .to_owned(),
+                Span::test_data(),
+            ),
+        );
+        let pipeline_data = plugin_test.eval(&cmd)?;
+
+        assert!(tmp_file.exists());
+
+        let value = pipeline_data.into_value(Span::test_data())?;
+        let list = value.as_list()?;
+        assert_eq!(list.len(), 1);
+        let msg = list.first().expect("should have a value").as_str()?;
+        assert!(msg.contains("saved"));
+
+        Ok(())
+    }
+
+    pub fn test_lazy_save(extension: &str) -> Result<(), Box<dyn std::error::Error>> {
+        test_save(
+            "[[a b]; [1 2] [3 4]] | polars into-lazy | polars save",
+            extension,
+        )
+    }
+
+    pub fn test_eager_save(extension: &str) -> Result<(), Box<dyn std::error::Error>> {
+        test_save(
+            "[[a b]; [1 2] [3 4]] | polars into-df | polars save",
+            extension,
+        )
+    }
+
+    //     #[test]
+    //     pub fn test_to_ipc() -> Result<(), Box<dyn std::error::Error>> {
+    //         test_sink("ipc")
+    //     }
+    //
+    //     #[test]
+    //     pub fn test_to_csv() -> Result<(), Box<dyn std::error::Error>> {
+    //         test_sink("csv")
+    //     }
+    //
+    //     #[test]
+    //     pub fn test_to_json() -> Result<(), Box<dyn std::error::Error>> {
+    //         test_sink("ndjson")
+    //     }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/save/ndjson.rs b/crates/nu_plugin_polars/src/dataframe/eager/save/ndjson.rs
new file mode 100644
index 0000000000..7840103079
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/eager/save/ndjson.rs
@@ -0,0 +1,63 @@
+use std::{fs::File, io::BufWriter, path::Path};
+
+use nu_plugin::EvaluatedCall;
+use nu_protocol::{ShellError, Span};
+use polars::prelude::{JsonWriter, SerWriter};
+use polars_io::json::JsonWriterOptions;
+
+use crate::values::{NuDataFrame, NuLazyFrame};
+
+use super::polars_file_save_error;
+
+pub(crate) fn command_lazy(
+    _call: &EvaluatedCall,
+    lazy: &NuLazyFrame,
+    file_path: &Path,
+    file_span: Span,
+) -> Result<(), ShellError> {
+    lazy.to_polars()
+        .sink_json(file_path, JsonWriterOptions::default())
+        .map_err(|e| polars_file_save_error(e, file_span))
+}
+
+pub(crate) fn command_eager(
+    df: &NuDataFrame,
+    file_path: &Path,
+    file_span: Span,
+) -> Result<(), ShellError> {
+    let file = File::create(file_path).map_err(|e| ShellError::GenericError {
+        error: format!("Error with file name: {e}"),
+        msg: "".into(),
+        span: Some(file_span),
+        help: None,
+        inner: vec![],
+    })?;
+    let buf_writer = BufWriter::new(file);
+
+    JsonWriter::new(buf_writer)
+        .finish(&mut df.to_polars())
+        .map_err(|e| ShellError::GenericError {
+            error: "Error saving file".into(),
+            msg: e.to_string(),
+            span: Some(file_span),
+            help: None,
+            inner: vec![],
+        })?;
+
+    Ok(())
+}
+
+#[cfg(test)]
+pub mod test {
+    use crate::eager::save::test::{test_eager_save, test_lazy_save};
+
+    #[test]
+    pub fn test_arrow_eager_save() -> Result<(), Box<dyn std::error::Error>> {
+        test_eager_save("ndjson")
+    }
+
+    #[test]
+    pub fn test_arrow_lazy_save() -> Result<(), Box<dyn std::error::Error>> {
+        test_lazy_save("ndjson")
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/save/parquet.rs b/crates/nu_plugin_polars/src/dataframe/eager/save/parquet.rs
new file mode 100644
index 0000000000..7200e23500
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/eager/save/parquet.rs
@@ -0,0 +1,62 @@
+use std::{fs::File, path::Path};
+
+use nu_plugin::EvaluatedCall;
+use nu_protocol::{ShellError, Span};
+use polars::prelude::ParquetWriter;
+use polars_io::parquet::write::ParquetWriteOptions;
+
+use crate::values::{NuDataFrame, NuLazyFrame};
+
+use super::polars_file_save_error;
+
+pub(crate) fn command_lazy(
+    _call: &EvaluatedCall,
+    lazy: &NuLazyFrame,
+    file_path: &Path,
+    file_span: Span,
+) -> Result<(), ShellError> {
+    lazy.to_polars()
+        .sink_parquet(file_path, ParquetWriteOptions::default())
+        .map_err(|e| polars_file_save_error(e, file_span))
+}
+
+pub(crate) fn command_eager(
+    df: &NuDataFrame,
+    file_path: &Path,
+    file_span: Span,
+) -> Result<(), ShellError> {
+    let file = File::create(file_path).map_err(|e| ShellError::GenericError {
+        error: "Error with file name".into(),
+        msg: e.to_string(),
+        span: Some(file_span),
+        help: None,
+        inner: vec![],
+    })?;
+    let mut polars_df = df.to_polars();
+    ParquetWriter::new(file)
+        .finish(&mut polars_df)
+        .map_err(|e| ShellError::GenericError {
+            error: "Error saving file".into(),
+            msg: e.to_string(),
+            span: Some(file_span),
+            help: None,
+            inner: vec![],
+        })?;
+    Ok(())
+}
+
+#[cfg(test)]
+pub(crate) mod test {
+
+    use crate::eager::save::test::{test_eager_save, test_lazy_save};
+
+    #[test]
+    pub fn test_parquet_eager_save() -> Result<(), Box<dyn std::error::Error>> {
+        test_eager_save("parquet")
+    }
+
+    #[test]
+    pub fn test_parquet_lazy_save() -> Result<(), Box<dyn std::error::Error>> {
+        test_lazy_save("parquet")
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/to_arrow.rs b/crates/nu_plugin_polars/src/dataframe/eager/to_arrow.rs
deleted file mode 100644
index dfb331ac46..0000000000
--- a/crates/nu_plugin_polars/src/dataframe/eager/to_arrow.rs
+++ /dev/null
@@ -1,134 +0,0 @@
-use std::{fs::File, path::PathBuf};
-
-use nu_path::expand_path_with;
-use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
-use nu_protocol::{
-    Category, Example, LabeledError, PipelineData, ShellError, Signature, Spanned, SyntaxShape,
-    Type, Value,
-};
-use polars::prelude::{IpcWriter, SerWriter};
-
-use crate::PolarsPlugin;
-
-use super::super::values::NuDataFrame;
-
-#[derive(Clone)]
-pub struct ToArrow;
-
-impl PluginCommand for ToArrow {
-    type Plugin = PolarsPlugin;
-
-    fn name(&self) -> &str {
-        "polars to-arrow"
-    }
-
-    fn usage(&self) -> &str {
-        "Saves dataframe to arrow file."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required("file", SyntaxShape::Filepath, "file path to save dataframe")
-            .input_output_type(Type::Custom("dataframe".into()), Type::Any)
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Saves dataframe to arrow file",
-            example: "[[a b]; [1 2] [3 4]] | polars into-df | polars to-arrow test.arrow",
-            result: None,
-        }]
-    }
-
-    fn run(
-        &self,
-        plugin: &Self::Plugin,
-        engine: &EngineInterface,
-        call: &EvaluatedCall,
-        input: PipelineData,
-    ) -> Result<PipelineData, LabeledError> {
-        command(plugin, engine, call, input).map_err(|e| e.into())
-    }
-}
-
-fn command(
-    plugin: &PolarsPlugin,
-    engine: &EngineInterface,
-    call: &EvaluatedCall,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let file_name: Spanned<PathBuf> = call.req(0)?;
-    let file_path = expand_path_with(&file_name.item, engine.get_current_dir()?, true);
-
-    let df = NuDataFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
-
-    let mut file = File::create(file_path).map_err(|e| ShellError::GenericError {
-        error: "Error with file name".into(),
-        msg: e.to_string(),
-        span: Some(file_name.span),
-        help: None,
-        inner: vec![],
-    })?;
-
-    IpcWriter::new(&mut file)
-        .finish(&mut df.to_polars())
-        .map_err(|e| ShellError::GenericError {
-            error: "Error saving file".into(),
-            msg: e.to_string(),
-            span: Some(file_name.span),
-            help: None,
-            inner: vec![],
-        })?;
-
-    let file_value = Value::string(format!("saved {:?}", &file_name.item), file_name.span);
-
-    Ok(PipelineData::Value(
-        Value::list(vec![file_value], call.head),
-        None,
-    ))
-}
-
-#[cfg(test)]
-pub mod test {
-    use nu_plugin_test_support::PluginTest;
-    use nu_protocol::{Span, Value};
-    use uuid::Uuid;
-
-    use crate::PolarsPlugin;
-
-    #[test]
-    pub fn test_to_arrow() -> Result<(), Box<dyn std::error::Error>> {
-        let tmp_dir = tempfile::tempdir()?;
-        let mut tmp_file = tmp_dir.path().to_owned();
-        tmp_file.push(format!("{}.arrow", Uuid::new_v4()));
-        let tmp_file_str = tmp_file.to_str().expect("should be able to get file path");
-
-        let cmd = format!(
-            "[[a b]; [1 2] [3 4]] | polars into-df | polars to-arrow {}",
-            tmp_file_str
-        );
-        let mut plugin_test = PluginTest::new("polars", PolarsPlugin::default().into())?;
-        plugin_test.engine_state_mut().add_env_var(
-            "PWD".to_string(),
-            Value::string(
-                tmp_dir
-                    .path()
-                    .to_str()
-                    .expect("should be able to get path")
-                    .to_owned(),
-                Span::test_data(),
-            ),
-        );
-        let pipeline_data = plugin_test.eval(&cmd)?;
-
-        assert!(tmp_file.exists());
-
-        let value = pipeline_data.into_value(Span::test_data())?;
-        let list = value.as_list()?;
-        assert_eq!(list.len(), 1);
-        let msg = list.first().expect("should have a value").as_str()?;
-        assert!(msg.contains("saved"));
-        Ok(())
-    }
-}
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/to_avro.rs b/crates/nu_plugin_polars/src/dataframe/eager/to_avro.rs
deleted file mode 100644
index 3a5dc317e7..0000000000
--- a/crates/nu_plugin_polars/src/dataframe/eager/to_avro.rs
+++ /dev/null
@@ -1,163 +0,0 @@
-use std::{fs::File, path::PathBuf};
-
-use nu_path::expand_path_with;
-use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
-use nu_protocol::{
-    Category, Example, LabeledError, PipelineData, ShellError, Signature, Spanned, SyntaxShape,
-    Type, Value,
-};
-use polars_io::avro::{AvroCompression, AvroWriter};
-use polars_io::SerWriter;
-
-use crate::PolarsPlugin;
-
-use super::super::values::NuDataFrame;
-
-#[derive(Clone)]
-pub struct ToAvro;
-
-impl PluginCommand for ToAvro {
-    type Plugin = PolarsPlugin;
-
-    fn name(&self) -> &str {
-        "polars to-avro"
-    }
-
-    fn usage(&self) -> &str {
-        "Saves dataframe to avro file."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .named(
-                "compression",
-                SyntaxShape::String,
-                "use compression, supports deflate or snappy",
-                Some('c'),
-            )
-            .required("file", SyntaxShape::Filepath, "file path to save dataframe")
-            .input_output_type(Type::Custom("dataframe".into()), Type::Any)
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Saves dataframe to avro file",
-            example: "[[a b]; [1 2] [3 4]] | polars into-df | polars to-avro test.avro",
-            result: None,
-        }]
-    }
-
-    fn run(
-        &self,
-        plugin: &Self::Plugin,
-        engine: &EngineInterface,
-        call: &EvaluatedCall,
-        input: PipelineData,
-    ) -> Result<PipelineData, LabeledError> {
-        command(plugin, engine, call, input).map_err(LabeledError::from)
-    }
-}
-
-fn get_compression(call: &EvaluatedCall) -> Result<Option<AvroCompression>, ShellError> {
-    if let Some((compression, span)) = call
-        .get_flag_value("compression")
-        .map(|e| e.as_str().map(|s| (s.to_owned(), e.span())))
-        .transpose()?
-    {
-        match compression.as_ref() {
-            "snappy" => Ok(Some(AvroCompression::Snappy)),
-            "deflate" => Ok(Some(AvroCompression::Deflate)),
-            _ => Err(ShellError::IncorrectValue {
-                msg: "compression must be one of deflate or snappy".to_string(),
-                val_span: span,
-                call_span: span,
-            }),
-        }
-    } else {
-        Ok(None)
-    }
-}
-
-fn command(
-    plugin: &PolarsPlugin,
-    engine: &EngineInterface,
-    call: &EvaluatedCall,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let file_name: Spanned<PathBuf> = call.req(0)?;
-    let file_path = expand_path_with(&file_name.item, engine.get_current_dir()?, true);
-    let compression = get_compression(call)?;
-
-    let df = NuDataFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
-
-    let file = File::create(file_path).map_err(|e| ShellError::GenericError {
-        error: "Error with file name".into(),
-        msg: e.to_string(),
-        span: Some(file_name.span),
-        help: None,
-        inner: vec![],
-    })?;
-
-    AvroWriter::new(file)
-        .with_compression(compression)
-        .finish(&mut df.to_polars())
-        .map_err(|e| ShellError::GenericError {
-            error: "Error saving file".into(),
-            msg: e.to_string(),
-            span: Some(file_name.span),
-            help: None,
-            inner: vec![],
-        })?;
-
-    let file_value = Value::string(format!("saved {:?}", &file_name.item), file_name.span);
-
-    Ok(PipelineData::Value(
-        Value::list(vec![file_value], call.head),
-        None,
-    ))
-}
-
-#[cfg(test)]
-pub mod test {
-    use nu_plugin_test_support::PluginTest;
-    use nu_protocol::{Span, Value};
-    use uuid::Uuid;
-
-    use crate::PolarsPlugin;
-
-    #[test]
-    pub fn test_to_avro() -> Result<(), Box<dyn std::error::Error>> {
-        let tmp_dir = tempfile::tempdir()?;
-        let mut tmp_file = tmp_dir.path().to_owned();
-        tmp_file.push(format!("{}.avro", Uuid::new_v4()));
-        let tmp_file_str = tmp_file.to_str().expect("should be able to get file path");
-
-        let cmd = format!(
-            "[[a b]; [1 2] [3 4]] | polars into-df | polars to-avro {}",
-            tmp_file_str
-        );
-        let mut plugin_test = PluginTest::new("polars", PolarsPlugin::default().into())?;
-        plugin_test.engine_state_mut().add_env_var(
-            "PWD".to_string(),
-            Value::string(
-                tmp_dir
-                    .path()
-                    .to_str()
-                    .expect("should be able to get path")
-                    .to_owned(),
-                Span::test_data(),
-            ),
-        );
-        let pipeline_data = plugin_test.eval(&cmd)?;
-
-        assert!(tmp_file.exists());
-
-        let value = pipeline_data.into_value(Span::test_data())?;
-        let list = value.as_list()?;
-        assert_eq!(list.len(), 1);
-        let msg = list.first().expect("should have a value").as_str()?;
-        assert!(msg.contains("saved"));
-        Ok(())
-    }
-}
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/to_csv.rs b/crates/nu_plugin_polars/src/dataframe/eager/to_csv.rs
deleted file mode 100644
index d55a53f1fc..0000000000
--- a/crates/nu_plugin_polars/src/dataframe/eager/to_csv.rs
+++ /dev/null
@@ -1,181 +0,0 @@
-use std::{fs::File, path::PathBuf};
-
-use nu_path::expand_path_with;
-use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
-use nu_protocol::{
-    Category, Example, LabeledError, PipelineData, ShellError, Signature, Spanned, SyntaxShape,
-    Type, Value,
-};
-use polars::prelude::{CsvWriter, SerWriter};
-
-use crate::PolarsPlugin;
-
-use super::super::values::NuDataFrame;
-
-#[derive(Clone)]
-pub struct ToCSV;
-
-impl PluginCommand for ToCSV {
-    type Plugin = PolarsPlugin;
-
-    fn name(&self) -> &str {
-        "polars to-csv"
-    }
-
-    fn usage(&self) -> &str {
-        "Saves dataframe to CSV file."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required("file", SyntaxShape::Filepath, "file path to save dataframe")
-            .named(
-                "delimiter",
-                SyntaxShape::String,
-                "file delimiter character",
-                Some('d'),
-            )
-            .switch("no-header", "Indicates if file doesn't have header", None)
-            .input_output_type(Type::Custom("dataframe".into()), Type::Any)
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Saves dataframe to CSV file",
-                example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr to-csv test.csv",
-                result: None,
-            },
-            Example {
-                description: "Saves dataframe to CSV file using other delimiter",
-                example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr to-csv test.csv --delimiter '|'",
-                result: None,
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        plugin: &Self::Plugin,
-        engine: &EngineInterface,
-        call: &EvaluatedCall,
-        input: PipelineData,
-    ) -> Result<PipelineData, LabeledError> {
-        command(plugin, engine, call, input).map_err(|e| e.into())
-    }
-}
-
-fn command(
-    plugin: &PolarsPlugin,
-    engine: &EngineInterface,
-    call: &EvaluatedCall,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let file_name: Spanned<PathBuf> = call.req(0)?;
-    let file_path = expand_path_with(&file_name.item, engine.get_current_dir()?, true);
-    let delimiter: Option<Spanned<String>> = call.get_flag("delimiter")?;
-    let no_header: bool = call.has_flag("no-header")?;
-
-    let df = NuDataFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
-
-    let mut file = File::create(file_path).map_err(|e| ShellError::GenericError {
-        error: "Error with file name".into(),
-        msg: e.to_string(),
-        span: Some(file_name.span),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let writer = CsvWriter::new(&mut file);
-
-    let writer = if no_header {
-        writer.include_header(false)
-    } else {
-        writer.include_header(true)
-    };
-
-    let mut writer = match delimiter {
-        None => writer,
-        Some(d) => {
-            if d.item.len() != 1 {
-                return Err(ShellError::GenericError {
-                    error: "Incorrect delimiter".into(),
-                    msg: "Delimiter has to be one char".into(),
-                    span: Some(d.span),
-                    help: None,
-                    inner: vec![],
-                });
-            } else {
-                let delimiter = match d.item.chars().next() {
-                    Some(d) => d as u8,
-                    None => unreachable!(),
-                };
-
-                writer.with_separator(delimiter)
-            }
-        }
-    };
-
-    writer
-        .finish(&mut df.to_polars())
-        .map_err(|e| ShellError::GenericError {
-            error: "Error writing to file".into(),
-            msg: e.to_string(),
-            span: Some(file_name.span),
-            help: None,
-            inner: vec![],
-        })?;
-
-    let file_value = Value::string(format!("saved {:?}", &file_name.item), file_name.span);
-
-    Ok(PipelineData::Value(
-        Value::list(vec![file_value], call.head),
-        None,
-    ))
-}
-
-#[cfg(test)]
-pub mod test {
-    use nu_plugin_test_support::PluginTest;
-    use nu_protocol::{Span, Value};
-    use uuid::Uuid;
-
-    use crate::PolarsPlugin;
-
-    #[test]
-    pub fn test_to_csv() -> Result<(), Box<dyn std::error::Error>> {
-        let tmp_dir = tempfile::tempdir()?;
-        let mut tmp_file = tmp_dir.path().to_owned();
-        tmp_file.push(format!("{}.csv", Uuid::new_v4()));
-        let tmp_file_str = tmp_file.to_str().expect("should be able to get file path");
-
-        let cmd = format!(
-            "[[a b]; [1 2] [3 4]] | polars into-df | polars to-csv {}",
-            tmp_file_str
-        );
-        println!("cmd: {}", cmd);
-        let mut plugin_test = PluginTest::new("polars", PolarsPlugin::default().into())?;
-        plugin_test.engine_state_mut().add_env_var(
-            "PWD".to_string(),
-            Value::string(
-                tmp_dir
-                    .path()
-                    .to_str()
-                    .expect("should be able to get path")
-                    .to_owned(),
-                Span::test_data(),
-            ),
-        );
-        let pipeline_data = plugin_test.eval(&cmd)?;
-
-        assert!(tmp_file.exists());
-
-        let value = pipeline_data.into_value(Span::test_data())?;
-        let list = value.as_list()?;
-        assert_eq!(list.len(), 1);
-        let msg = list.first().expect("should have a value").as_str()?;
-        assert!(msg.contains("saved"));
-        Ok(())
-    }
-}
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/to_json_lines.rs b/crates/nu_plugin_polars/src/dataframe/eager/to_json_lines.rs
deleted file mode 100644
index 88b4a61bbf..0000000000
--- a/crates/nu_plugin_polars/src/dataframe/eager/to_json_lines.rs
+++ /dev/null
@@ -1,135 +0,0 @@
-use std::{fs::File, io::BufWriter, path::PathBuf};
-
-use nu_path::expand_path_with;
-use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
-use nu_protocol::{
-    Category, Example, LabeledError, PipelineData, ShellError, Signature, Spanned, SyntaxShape,
-    Type, Value,
-};
-use polars::prelude::{JsonWriter, SerWriter};
-
-use crate::PolarsPlugin;
-
-use super::super::values::NuDataFrame;
-
-#[derive(Clone)]
-pub struct ToJsonLines;
-
-impl PluginCommand for ToJsonLines {
-    type Plugin = PolarsPlugin;
-
-    fn name(&self) -> &str {
-        "polars to-jsonl"
-    }
-
-    fn usage(&self) -> &str {
-        "Saves dataframe to a JSON lines file."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required("file", SyntaxShape::Filepath, "file path to save dataframe")
-            .input_output_type(Type::Custom("dataframe".into()), Type::Any)
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Saves dataframe to JSON lines file",
-            example: "[[a b]; [1 2] [3 4]] | polars into-df | polars to-jsonl test.jsonl",
-            result: None,
-        }]
-    }
-
-    fn run(
-        &self,
-        plugin: &Self::Plugin,
-        engine: &EngineInterface,
-        call: &EvaluatedCall,
-        input: PipelineData,
-    ) -> Result<PipelineData, LabeledError> {
-        command(plugin, engine, call, input).map_err(LabeledError::from)
-    }
-}
-
-fn command(
-    plugin: &PolarsPlugin,
-    engine: &EngineInterface,
-    call: &EvaluatedCall,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let file_name: Spanned<PathBuf> = call.req(0)?;
-    let file_path = expand_path_with(&file_name.item, engine.get_current_dir()?, true);
-
-    let df = NuDataFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
-
-    let file = File::create(file_path).map_err(|e| ShellError::GenericError {
-        error: "Error with file name".into(),
-        msg: e.to_string(),
-        span: Some(file_name.span),
-        help: None,
-        inner: vec![],
-    })?;
-    let buf_writer = BufWriter::new(file);
-
-    JsonWriter::new(buf_writer)
-        .finish(&mut df.to_polars())
-        .map_err(|e| ShellError::GenericError {
-            error: "Error saving file".into(),
-            msg: e.to_string(),
-            span: Some(file_name.span),
-            help: None,
-            inner: vec![],
-        })?;
-
-    let file_value = Value::string(format!("saved {:?}", &file_name.item), file_name.span);
-
-    Ok(PipelineData::Value(
-        Value::list(vec![file_value], call.head),
-        None,
-    ))
-}
-
-#[cfg(test)]
-pub mod test {
-    use nu_plugin_test_support::PluginTest;
-    use nu_protocol::{Span, Value};
-    use uuid::Uuid;
-
-    use crate::PolarsPlugin;
-
-    #[test]
-    pub fn test_to_jsonl() -> Result<(), Box<dyn std::error::Error>> {
-        let tmp_dir = tempfile::tempdir()?;
-        let mut tmp_file = tmp_dir.path().to_owned();
-        tmp_file.push(format!("{}.jsonl", Uuid::new_v4()));
-        let tmp_file_str = tmp_file.to_str().expect("should be able to get file path");
-
-        let cmd = format!(
-            "[[a b]; [1 2] [3 4]] | polars into-df | polars to-jsonl {}",
-            tmp_file_str
-        );
-        let mut plugin_test = PluginTest::new("polars", PolarsPlugin::default().into())?;
-        plugin_test.engine_state_mut().add_env_var(
-            "PWD".to_string(),
-            Value::string(
-                tmp_dir
-                    .path()
-                    .to_str()
-                    .expect("should be able to get path")
-                    .to_owned(),
-                Span::test_data(),
-            ),
-        );
-        let pipeline_data = plugin_test.eval(&cmd)?;
-
-        assert!(tmp_file.exists());
-
-        let value = pipeline_data.into_value(Span::test_data())?;
-        let list = value.as_list()?;
-        assert_eq!(list.len(), 1);
-        let msg = list.first().expect("should have a value").as_str()?;
-        assert!(msg.contains("saved"));
-        Ok(())
-    }
-}
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/to_parquet.rs b/crates/nu_plugin_polars/src/dataframe/eager/to_parquet.rs
deleted file mode 100644
index 4a8208ae12..0000000000
--- a/crates/nu_plugin_polars/src/dataframe/eager/to_parquet.rs
+++ /dev/null
@@ -1,135 +0,0 @@
-use std::{fs::File, path::PathBuf};
-
-use nu_path::expand_path_with;
-use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
-use nu_protocol::{
-    Category, Example, LabeledError, PipelineData, ShellError, Signature, Spanned, SyntaxShape,
-    Type, Value,
-};
-use polars::prelude::ParquetWriter;
-
-use crate::PolarsPlugin;
-
-use super::super::values::NuDataFrame;
-
-#[derive(Clone)]
-pub struct ToParquet;
-
-impl PluginCommand for ToParquet {
-    type Plugin = PolarsPlugin;
-
-    fn name(&self) -> &str {
-        "polars to-parquet"
-    }
-
-    fn usage(&self) -> &str {
-        "Saves dataframe to parquet file."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required("file", SyntaxShape::Filepath, "file path to save dataframe")
-            .input_output_type(Type::Custom("dataframe".into()), Type::Any)
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Saves dataframe to parquet file",
-            example: "[[a b]; [1 2] [3 4]] | polars into-df | polars to-parquet test.parquet",
-            result: None,
-        }]
-    }
-
-    fn run(
-        &self,
-        plugin: &Self::Plugin,
-        engine: &EngineInterface,
-        call: &EvaluatedCall,
-        input: PipelineData,
-    ) -> Result<PipelineData, LabeledError> {
-        command(plugin, engine, call, input).map_err(LabeledError::from)
-    }
-}
-
-fn command(
-    plugin: &PolarsPlugin,
-    engine: &EngineInterface,
-    call: &EvaluatedCall,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let file_name: Spanned<PathBuf> = call.req(0)?;
-    let file_path = expand_path_with(&file_name.item, engine.get_current_dir()?, true);
-
-    let df = NuDataFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
-
-    let file = File::create(file_path).map_err(|e| ShellError::GenericError {
-        error: "Error with file name".into(),
-        msg: e.to_string(),
-        span: Some(file_name.span),
-        help: None,
-        inner: vec![],
-    })?;
-    let mut polars_df = df.to_polars();
-    ParquetWriter::new(file)
-        .finish(&mut polars_df)
-        .map_err(|e| ShellError::GenericError {
-            error: "Error saving file".into(),
-            msg: e.to_string(),
-            span: Some(file_name.span),
-            help: None,
-            inner: vec![],
-        })?;
-
-    let file_value = Value::string(format!("saved {:?}", &file_name.item), file_name.span);
-
-    Ok(PipelineData::Value(
-        Value::list(vec![file_value], call.head),
-        None,
-    ))
-}
-
-#[cfg(test)]
-pub mod test {
-    use nu_plugin_test_support::PluginTest;
-    use nu_protocol::{Span, Value};
-    use uuid::Uuid;
-
-    use crate::PolarsPlugin;
-
-    #[test]
-    pub fn test_to_parquet() -> Result<(), Box<dyn std::error::Error>> {
-        let tmp_dir = tempfile::tempdir()?;
-        let mut tmp_file = tmp_dir.path().to_owned();
-        tmp_file.push(format!("{}.parquet", Uuid::new_v4()));
-        let tmp_file_str = tmp_file.to_str().expect("should be able to get file path");
-
-        let cmd = format!(
-            "[[a b]; [1 2] [3 4]] | polars into-df | polars to-parquet {}",
-            tmp_file_str
-        );
-        let mut plugin_test = PluginTest::new("polars", PolarsPlugin::default().into())?;
-        plugin_test.engine_state_mut().add_env_var(
-            "PWD".to_string(),
-            Value::string(
-                tmp_dir
-                    .path()
-                    .to_str()
-                    .expect("should be able to get path")
-                    .to_owned(),
-                Span::test_data(),
-            ),
-        );
-        let pipeline_data = plugin_test.eval(&cmd)?;
-
-        assert!(tmp_file.exists());
-
-        let value = pipeline_data.into_value(Span::test_data())?;
-        let list = value.as_list()?;
-        assert_eq!(list.len(), 1);
-        let msg = list.first().expect("should have a value").as_str()?;
-        assert!(msg.contains("saved"));
-
-        Ok(())
-    }
-}
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/mod.rs b/crates/nu_plugin_polars/src/dataframe/lazy/mod.rs
index e1944e06a1..e70143e6ce 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/mod.rs
@@ -12,7 +12,6 @@ mod macro_commands;
 mod median;
 mod quantile;
 mod select;
-mod sink;
 mod sort_by_expr;
 mod to_lazy;
 
@@ -54,6 +53,5 @@ pub(crate) fn lazy_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin
         Box::new(LazyQuantile),
         Box::new(ToLazyFrame),
         Box::new(ToLazyGroupBy),
-        Box::new(sink::Sink),
     ]
 }
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/sink.rs b/crates/nu_plugin_polars/src/dataframe/lazy/sink.rs
deleted file mode 100644
index 0fdf0200f6..0000000000
--- a/crates/nu_plugin_polars/src/dataframe/lazy/sink.rs
+++ /dev/null
@@ -1,205 +0,0 @@
-use std::path::PathBuf;
-
-use crate::{
-    values::{cant_convert_err, PolarsPluginObject, PolarsPluginType},
-    PolarsPlugin,
-};
-
-use super::super::values::NuLazyFrame;
-
-use nu_path::expand_path_with;
-use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
-use nu_protocol::{
-    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Spanned,
-    SyntaxShape, Type, Value,
-};
-use polars::error::PolarsError;
-use polars_io::{
-    csv::write::CsvWriterOptions, ipc::IpcWriterOptions, json::JsonWriterOptions,
-    parquet::write::ParquetWriteOptions,
-};
-
-#[derive(Clone)]
-pub struct Sink;
-
-impl PluginCommand for Sink {
-    type Plugin = PolarsPlugin;
-
-    fn name(&self) -> &str {
-        "polars sink"
-    }
-
-    fn usage(&self) -> &str {
-        "Streams a collect result to a file. This is useful if the result is too large for memory. Supports parquet, ipc/arrow, csv, and json formats."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required("path", SyntaxShape::Filepath, "Path to write to.")
-            .named(
-                "type",
-                SyntaxShape::String,
-                "File type: csv, json, parquet, arrow/ipc. If omitted, derive from file extension",
-                Some('t'),
-            )
-            .input_output_type(Type::Any, Type::String)
-            .category(Category::Custom("lazyframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Collect and save the output to the specified file",
-            example: "[[a b];[1 2] [3 4]] | polars into-lazy | polars sink /tmp/foo.parquet",
-            result: None,
-        }]
-    }
-
-    fn run(
-        &self,
-        plugin: &Self::Plugin,
-        engine: &EngineInterface,
-        call: &EvaluatedCall,
-        input: PipelineData,
-    ) -> Result<PipelineData, LabeledError> {
-        let value = input.into_value(call.head)?;
-
-        match PolarsPluginObject::try_from_value(plugin, &value)? {
-            PolarsPluginObject::NuDataFrame(df) => command(plugin, engine, call, df.lazy()),
-            PolarsPluginObject::NuLazyFrame(lazy) => command(plugin, engine, call, lazy),
-            _ => Err(cant_convert_err(
-                &value,
-                &[PolarsPluginType::NuDataFrame, PolarsPluginType::NuLazyFrame],
-            )),
-        }
-        .map_err(LabeledError::from)
-    }
-}
-
-fn command(
-    _plugin: &PolarsPlugin,
-    engine: &EngineInterface,
-    call: &EvaluatedCall,
-    lazy: NuLazyFrame,
-) -> Result<PipelineData, ShellError> {
-    let spanned_file: Spanned<PathBuf> = call.req(0)?;
-    let file_path = expand_path_with(&spanned_file.item, engine.get_current_dir()?, true);
-    let file_span = spanned_file.span;
-    let type_option: Option<Spanned<String>> = call.get_flag("type")?;
-    let type_id = match &type_option {
-        Some(ref t) => Some((t.item.to_owned(), "Invalid type", t.span)),
-        None => file_path.extension().map(|e| {
-            (
-                e.to_string_lossy().into_owned(),
-                "Invalid extension",
-                spanned_file.span,
-            )
-        }),
-    };
-
-    let polars_df = lazy.to_polars();
-
-    match type_id {
-        Some((e, msg, blamed)) => match e.as_str() {
-            "parquet" | "parq" => polars_df
-                .sink_parquet(&file_path, ParquetWriteOptions::default())
-                .map_err(|e| file_save_error(e, file_span))?,
-            "csv" => polars_df
-                .sink_csv(&file_path, CsvWriterOptions::default())
-                .map_err(|e| file_save_error(e, file_span))?,
-            "ipc" | "arrow" => polars_df
-                .sink_ipc(&file_path, IpcWriterOptions::default())
-                .map_err(|e| file_save_error(e, file_span))?,
-            "json" | "jsonl" | "ndjson" => polars_df
-                .sink_json(&file_path, JsonWriterOptions::default())
-                .map_err(|e| file_save_error(e, file_span))?,
-            _ => Err(ShellError::FileNotFoundCustom {
-                msg: format!("{msg}. Supported values: csv, tsv, parquet, ipc, arrow, json, jsonl"),
-                span: blamed,
-            })?,
-        },
-        None => Err(ShellError::FileNotFoundCustom {
-            msg: "File without extension".into(),
-            span: spanned_file.span,
-        })?,
-    };
-    let file_value = Value::string(format!("saved {:?}", &file_path), file_span);
-
-    Ok(PipelineData::Value(
-        Value::list(vec![file_value], call.head),
-        None,
-    ))
-}
-
-fn file_save_error(e: PolarsError, span: Span) -> ShellError {
-    ShellError::GenericError {
-        error: "Error saving file".into(),
-        msg: e.to_string(),
-        span: Some(span),
-        help: None,
-        inner: vec![],
-    }
-}
-
-#[cfg(test)]
-pub mod test {
-    use nu_plugin_test_support::PluginTest;
-    use nu_protocol::{Span, Value};
-    use uuid::Uuid;
-
-    use crate::PolarsPlugin;
-
-    pub fn test_sink(extension: &str) -> Result<(), Box<dyn std::error::Error>> {
-        let tmp_dir = tempfile::tempdir()?;
-        let mut tmp_file = tmp_dir.path().to_owned();
-        tmp_file.push(format!("{}.{}", Uuid::new_v4(), extension));
-        let tmp_file_str = tmp_file.to_str().expect("should be able to get file path");
-
-        let cmd = format!(
-            "[[a b]; [1 2] [3 4]] | polars into-lazy | polars sink {}",
-            tmp_file_str
-        );
-        let mut plugin_test = PluginTest::new("polars", PolarsPlugin::default().into())?;
-        plugin_test.engine_state_mut().add_env_var(
-            "PWD".to_string(),
-            Value::string(
-                tmp_dir
-                    .path()
-                    .to_str()
-                    .expect("should be able to get path")
-                    .to_owned(),
-                Span::test_data(),
-            ),
-        );
-        let pipeline_data = plugin_test.eval(&cmd)?;
-
-        assert!(tmp_file.exists());
-
-        let value = pipeline_data.into_value(Span::test_data())?;
-        let list = value.as_list()?;
-        assert_eq!(list.len(), 1);
-        let msg = list.first().expect("should have a value").as_str()?;
-        assert!(msg.contains("saved"));
-
-        Ok(())
-    }
-
-    #[test]
-    pub fn test_to_parquet() -> Result<(), Box<dyn std::error::Error>> {
-        test_sink("parquet")
-    }
-
-    #[test]
-    pub fn test_to_ipc() -> Result<(), Box<dyn std::error::Error>> {
-        test_sink("ipc")
-    }
-
-    #[test]
-    pub fn test_to_csv() -> Result<(), Box<dyn std::error::Error>> {
-        test_sink("csv")
-    }
-
-    #[test]
-    pub fn test_to_json() -> Result<(), Box<dyn std::error::Error>> {
-        test_sink("ndjson")
-    }
-}
diff --git a/crates/nu_plugin_polars/src/dataframe/values/file_type.rs b/crates/nu_plugin_polars/src/dataframe/values/file_type.rs
new file mode 100644
index 0000000000..c46fcd7113
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/values/file_type.rs
@@ -0,0 +1,59 @@
+use nu_protocol::{ShellError, Span};
+
+pub enum PolarsFileType {
+    Csv,
+    Tsv,
+    Parquet,
+    Arrow,
+    Json,
+    Avro,
+    NdJson,
+    Unknown,
+}
+
+impl PolarsFileType {
+    pub fn build_unsupported_error(
+        extension: &str,
+        supported_types: &[PolarsFileType],
+        span: Span,
+    ) -> ShellError {
+        let type_string = supported_types
+            .iter()
+            .map(|ft| ft.to_str())
+            .collect::<Vec<&'static str>>()
+            .join(", ");
+
+        ShellError::FileNotFoundCustom {
+            msg: format!("Unsupported type {extension} expected {type_string}"),
+            span,
+        }
+    }
+
+    pub fn to_str(&self) -> &'static str {
+        match self {
+            PolarsFileType::Csv => "csv",
+            PolarsFileType::Tsv => "tsv",
+            PolarsFileType::Parquet => "parquet",
+            PolarsFileType::Arrow => "arrow",
+            PolarsFileType::Json => "json",
+            PolarsFileType::Avro => "avro",
+            PolarsFileType::NdJson => "ndjson",
+            PolarsFileType::Unknown => "unknown",
+        }
+    }
+}
+
+impl From<&str> for PolarsFileType {
+    fn from(file_type: &str) -> Self {
+        match file_type {
+            "csv" => PolarsFileType::Csv,
+            "tsv" => PolarsFileType::Tsv,
+            "parquet" | "parq" => PolarsFileType::Parquet,
+            "ipc" | "arrow" => PolarsFileType::Arrow,
+            "json" => PolarsFileType::Json,
+            "avro" => PolarsFileType::Avro,
+            "jsonl" | "ndjson" => PolarsFileType::NdJson,
+            _ => PolarsFileType::Unknown,
+        }
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/values/mod.rs b/crates/nu_plugin_polars/src/dataframe/values/mod.rs
index ec59304eab..41a119cddc 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/mod.rs
@@ -1,3 +1,4 @@
+mod file_type;
 mod nu_dataframe;
 mod nu_expression;
 mod nu_lazyframe;
@@ -8,6 +9,7 @@ pub mod utils;
 
 use std::{cmp::Ordering, fmt};
 
+pub use file_type::PolarsFileType;
 pub use nu_dataframe::{Axis, Column, NuDataFrame, NuDataFrameCustomValue};
 pub use nu_expression::{NuExpression, NuExpressionCustomValue};
 pub use nu_lazyframe::{NuLazyFrame, NuLazyFrameCustomValue};
@@ -125,6 +127,20 @@ impl PolarsPluginObject {
             }
         }
     }
+
+    pub fn dataframe(&self) -> Option<&NuDataFrame> {
+        match self {
+            PolarsPluginObject::NuDataFrame(df) => Some(df),
+            _ => None,
+        }
+    }
+
+    pub fn lazyframe(&self) -> Option<&NuLazyFrame> {
+        match self {
+            PolarsPluginObject::NuLazyFrame(lf) => Some(lf),
+            _ => None,
+        }
+    }
 }
 
 #[derive(Debug, Clone)]

From 983014cc40e6a96548c731b7de26e3a1a70d6426 Mon Sep 17 00:00:00 2001
From: Piotr Kufel <qfel@users.noreply.github.com>
Date: Fri, 9 Aug 2024 18:07:50 -0700
Subject: [PATCH 0330/1072] Clean up key event handling (#13574)

# Description
Cleanups:
 - Add "key_press" to event reading function names to match reality
- Move the relevant comment about why only key press events are
interesting one layer up
 - Remove code duplication in handle_events
- Make `try_next` try harder (instead of bail on a boring event); I
think that was the original intention
- Remove recursion from `next` (I think that's clearer? but maybe just
what I'm used to)

# User-Facing Changes
None

# Tests + Formatting
This cleans up existing code, no new test coverage.
---
 crates/nu-explore/src/pager/events.rs | 53 +++++++++++++--------------
 crates/nu-explore/src/pager/mod.rs    | 47 +++++++++++++-----------
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/crates/nu-explore/src/pager/events.rs b/crates/nu-explore/src/pager/events.rs
index b408b10f1d..6023ddd8e3 100644
--- a/crates/nu-explore/src/pager/events.rs
+++ b/crates/nu-explore/src/pager/events.rs
@@ -32,38 +32,35 @@ impl UIEvents {
         }
     }
 
-    pub fn next(&self) -> Result<Option<KeyEvent>> {
-        let now = Instant::now();
-        match poll(self.tick_rate) {
-            Ok(true) => {
-                if let Event::Key(event) = read()? {
-                    // We are only interested in Pressed events;
-                    // It's crucial because there are cases where terminal MIGHT produce false events;
-                    // 2 events 1 for release 1 for press.
-                    // Want to react only on 1 of them so we do.
-                    if event.kind == KeyEventKind::Press {
-                        return Ok(Some(event));
-                    }
-                }
-
-                let time_spent = now.elapsed();
-                let rest = self.tick_rate.saturating_sub(time_spent);
-
-                Self { tick_rate: rest }.next()
+    /// Read the next key press event, dropping any other preceding events. Returns None if no
+    /// relevant event is found within the configured tick_rate.
+    pub fn next_key_press(&self) -> Result<Option<KeyEvent>> {
+        let deadline = Instant::now() + self.tick_rate;
+        loop {
+            let timeout = deadline.saturating_duration_since(Instant::now());
+            if !poll(timeout)? {
+                return Ok(None);
+            }
+            if let Event::Key(event) = read()? {
+                if event.kind == KeyEventKind::Press {
+                    return Ok(Some(event));
+                }
             }
-            Ok(false) => Ok(None),
-            Err(err) => Err(err),
         }
     }
 
-    pub fn try_next(&self) -> Result<Option<KeyEvent>> {
-        match poll(Duration::default()) {
-            Ok(true) => match read()? {
-                Event::Key(event) if event.kind == KeyEventKind::Press => Ok(Some(event)),
-                _ => Ok(None),
-            },
-            Ok(false) => Ok(None),
-            Err(err) => Err(err),
+    /// Read the next key press event, dropping any other preceding events. If no key event is
+    /// available, returns immediately.
+    pub fn try_next_key_press(&self) -> Result<Option<KeyEvent>> {
+        loop {
+            if !poll(Duration::ZERO)? {
+                return Ok(None);
+            }
+            if let Event::Key(event) = read()? {
+                if event.kind == KeyEventKind::Press {
+                    return Ok(Some(event));
+                }
+            }
         }
     }
 }
diff --git a/crates/nu-explore/src/pager/mod.rs b/crates/nu-explore/src/pager/mod.rs
index 4a043476bb..5ea560093d 100644
--- a/crates/nu-explore/src/pager/mod.rs
+++ b/crates/nu-explore/src/pager/mod.rs
@@ -191,6 +191,12 @@ fn render_ui(
             })?;
         }
 
+        // Note that this will return within the configured tick_rate of events. In particular this
+        // means this loop keeps redrawing the UI about 4 times a second, whether it needs to or
+        // not. That's OK-ish because ratatui will detect real changes and not send unnecessary
+        // output to the terminal (something that may especially be important with ssh). While not
+        // needed at the moment, the idea is that this behavior allows for some degree of
+        // animation (so that the UI can update over time, even without user input).
         let transition = handle_events(
             engine_state,
             stack,
@@ -612,33 +618,25 @@ fn handle_events<V: View>(
     command: &mut CommandBuf,
     mut view: Option<&mut V>,
 ) -> Option<Transition> {
-    let key = match events.next() {
+    // We are only interested in Pressed events;
+    // It's crucial because there are cases where terminal MIGHT produce false events;
+    // 2 events 1 for release 1 for press.
+    // Want to react only on 1 of them so we do.
+    let mut key = match events.next_key_press() {
         Ok(Some(key)) => key,
-        _ => return None,
+        Ok(None) => return None,
+        Err(e) => {
+            log::error!("Failed to read key event: {e}");
+            return None;
+        }
     };
 
-    let result = handle_event(
-        engine_state,
-        stack,
-        layout,
-        info,
-        search,
-        command,
-        view.as_deref_mut(),
-        key,
-    );
-
-    if result.is_some() {
-        return result;
-    }
-
     // Sometimes we get a BIG list of events;
     // for example when someone scrolls via a mouse either UP or DOWN.
     // This MIGHT cause freezes as we have a 400 delay for a next command read.
     //
     // To eliminate that we are trying to read all possible commands which we should act upon.
-
-    while let Ok(Some(key)) = events.try_next() {
+    loop {
         let result = handle_event(
             engine_state,
             stack,
@@ -649,13 +647,18 @@ fn handle_events<V: View>(
             view.as_deref_mut(),
             key,
         );
-
         if result.is_some() {
             return result;
         }
+        match events.try_next_key_press() {
+            Ok(Some(next_key)) => key = next_key,
+            Ok(None) => return None,
+            Err(e) => {
+                log::error!("Failed to peek key event: {e}");
+                return None;
+            }
+        }
     }
-
-    result
 }
 
 #[allow(clippy::too_many_arguments)]

From 18772b73b3e5e384a7a225ec8d3dd1773fefc444 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Mon, 12 Aug 2024 01:24:23 -0700
Subject: [PATCH 0331/1072] Add parse error for external commands used in
 assignment without caret (#13585)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

As per our Wednesday meeting, this adds a parse error when something
that would be parsed as an external call is present at the top level,
unless the head of the external call begins with a caret (to make it
explicit).

I tried to make the error quite descriptive about what should be done.

# User-Facing Changes
These now cause a parse error:

```nushell
$foo = bar
$foo = `bar`
```

These would have been interpreted as strings before this version, but
now they'd be interpreted as external calls. This behavior is consistent
with `let`/`mut` (which is unaffected by this change).

Here is an example of the error:

```
Error:   × External command calls must be explicit in assignments
   ╭─[entry #3:1:8]
 1 │ $foo = bar
   ·        ─┬─
   ·         ╰── add a caret (^) before the command name if you intended to run and capture its output
   ╰────
  help: the parsing of assignments was changed in 0.97.0, and this would have previously been treated as a string.
        Alternatively, quote the string with single or double quotes to avoid it being interpreted as a command name. This
        restriction may be removed in a future release.
```

# Tests + Formatting

Tests added to cover the change. Note made about it being temporary.
---
 crates/nu-parser/src/parser.rs | 24 ++++++++++++++++++++++++
 tests/repl/test_parser.rs      | 26 ++++++++++++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 8332d2f383..3470b07e14 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -4904,6 +4904,30 @@ pub fn parse_assignment_expression(
     trace!("parsing: assignment right-hand side subexpression");
     let rhs_block = parse_block(working_set, &rhs_tokens, rhs_span, false, true);
     let rhs_ty = rhs_block.output_type();
+
+    // TEMP: double-check that if the RHS block starts with an external call, it must start with a
+    // caret. This is to mitigate the change in assignment parsing introduced in 0.97.0 which could
+    // result in unintentional execution of commands.
+    if let Some(Expr::ExternalCall(head, ..)) = rhs_block
+        .pipelines
+        .first()
+        .and_then(|pipeline| pipeline.elements.first())
+        .map(|element| &element.expr.expr)
+    {
+        let contents = working_set.get_span_contents(Span {
+            start: head.span.start - 1,
+            end: head.span.end,
+        });
+        if !contents.starts_with(b"^") {
+            working_set.parse_errors.push(ParseError::LabeledErrorWithHelp {
+                error: "External command calls must be explicit in assignments".into(),
+                label: "add a caret (^) before the command name if you intended to run and capture its output".into(),
+                help: "the parsing of assignments was changed in 0.97.0, and this would have previously been treated as a string. Alternatively, quote the string with single or double quotes to avoid it being interpreted as a command name. This restriction may be removed in a future release.".into(),
+                span: head.span,
+            });
+        }
+    }
+
     let rhs_block_id = working_set.add_block(Arc::new(rhs_block));
     let mut rhs = Expression::new(
         working_set,
diff --git a/tests/repl/test_parser.rs b/tests/repl/test_parser.rs
index ea983ff82c..a65e2c9a0f 100644
--- a/tests/repl/test_parser.rs
+++ b/tests/repl/test_parser.rs
@@ -311,6 +311,32 @@ fn append_assign_takes_pipeline() -> TestResult {
     )
 }
 
+#[test]
+fn assign_bare_external_fails() {
+    let result = nu!("$env.FOO = nu --testbin cococo");
+    assert!(!result.status.success());
+    assert!(result.err.contains("must be explicit"));
+}
+
+#[test]
+fn assign_bare_external_with_caret() {
+    let result = nu!("$env.FOO = ^nu --testbin cococo");
+    assert!(result.status.success());
+}
+
+#[test]
+fn assign_backtick_quoted_external_fails() {
+    let result = nu!("$env.FOO = `nu` --testbin cococo");
+    assert!(!result.status.success());
+    assert!(result.err.contains("must be explicit"));
+}
+
+#[test]
+fn assign_backtick_quoted_external_with_caret() {
+    let result = nu!("$env.FOO = ^`nu` --testbin cococo");
+    assert!(result.status.success());
+}
+
 #[test]
 fn string_interpolation_paren_test() -> TestResult {
     run_test(r#"$"('(')(')')""#, "()")

From 4e205cd9a799e367e775cfa6d68112332fd99526 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Mon, 12 Aug 2024 02:29:25 -0700
Subject: [PATCH 0332/1072] Add `--raw` switch to `print` for binary data
 (#13597)

# Description

Something I meant to add a long time ago. We currently don't have a
convenient way to print raw binary data intentionally. You can pipe it
through `cat` to turn it into an unknown stream, or write it to a file
and read it again, but we can't really just e.g. generate msgpack and
write it to stdout without this. For example:

```nushell
[abc def] | to msgpack | print --raw
```

This is useful for nushell scripts that will be piped into something
else. It also means that `nu_plugin_nu_example` probably doesn't need to
do this anymore, but I haven't adjusted it yet:

```nushell
def tell_nushell_encoding [] {
  print -n "\u{0004}json"
}
```

This happens to work because 0x04 is a valid UTF-8 character, but it
wouldn't be possible if it were something above 0x80.

`--raw` also formats other things without `table`, I figured the two
things kind of go together. The output is kind of like `to text`.
Debatable whether that should share the same flag, but it was easier
that way and seemed reasonable.

# User-Facing Changes
- `print` new flag: `--raw`

# Tests + Formatting
Added tests.

# After Submitting
- [ ] release notes (command modified)
---
 crates/nu-cli/src/print.rs                    | 26 ++++++++++++++++---
 crates/nu-command/tests/commands/print.rs     | 12 +++++++++
 .../nu-protocol/src/pipeline/pipeline_data.rs | 25 ++++++++++++++++++
 3 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/crates/nu-cli/src/print.rs b/crates/nu-cli/src/print.rs
index 2e58114d8b..e84c9d5e8f 100644
--- 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()
-                    .print(engine_state, stack, no_newline, to_stderr)?;
+                if raw {
+                    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,
+            },
         ]
     }
 }
diff --git a/crates/nu-command/tests/commands/print.rs b/crates/nu-command/tests/commands/print.rs
index da5a61904d..e3fbd63d69 100644
--- a/crates/nu-command/tests/commands/print.rs
+++ b/crates/nu-command/tests/commands/print.rs
@@ -13,3 +13,15 @@ fn print_to_stderr() {
     assert!(actual.out.is_empty());
     assert!(actual.err.contains("hello world"));
 }
+
+#[test]
+fn print_raw() {
+    let actual = nu!("0x[41 42 43] | print --raw");
+    assert_eq!(actual.out, "ABC");
+}
+
+#[test]
+fn print_raw_stream() {
+    let actual = nu!("[0x[66] 0x[6f 6f]] | bytes collect | print --raw");
+    assert_eq!(actual.out, "foo");
+}
diff --git a/crates/nu-protocol/src/pipeline/pipeline_data.rs b/crates/nu-protocol/src/pipeline/pipeline_data.rs
index 91fd0e1315..33e932ecaf 100644
--- a/crates/nu-protocol/src/pipeline/pipeline_data.rs
+++ b/crates/nu-protocol/src/pipeline/pipeline_data.rs
@@ -604,6 +604,31 @@ impl PipelineData {
         }
     }
 
+    /// Consume and print self data without any extra formatting.
+    ///
+    /// This does not use the `table` command to format data, and also prints binary values and
+    /// streams in their raw format without generating a hexdump first.
+    ///
+    /// `no_newline` controls if we need to attach newline character to output.
+    /// `to_stderr` controls if data is output to stderr, when the value is false, the data is output to stdout.
+    pub fn print_raw(
+        self,
+        engine_state: &EngineState,
+        no_newline: bool,
+        to_stderr: bool,
+    ) -> Result<Option<ExitStatus>, ShellError> {
+        if let PipelineData::Value(Value::Binary { val: bytes, .. }, _) = self {
+            if to_stderr {
+                stderr_write_all_and_flush(bytes)?;
+            } else {
+                stdout_write_all_and_flush(bytes)?;
+            }
+            Ok(None)
+        } else {
+            self.write_all_and_flush(engine_state, no_newline, to_stderr)
+        }
+    }
+
     fn write_all_and_flush(
         self,
         engine_state: &EngineState,

From 059167ac96e3864a9e47aa95ad60245fa5df2a8a Mon Sep 17 00:00:00 2001
From: playdohface <110300169+playdohface@users.noreply.github.com>
Date: Mon, 12 Aug 2024 14:21:08 +0200
Subject: [PATCH 0333/1072] Make error-message more helpful when user invokes a
 non-executable file (#13589)

# Description

Fixes Issue #13477
This adds a check to see if a user is trying to invoke a
(non-executable) file as a command and returns a helpful error if so.
EDIT: this will not work on Windows, and is arguably not relevant there,
because of the different semantics of executables. I think the
equivalent on Windows would be if a user tries to invoke `./foo`, we
should look for `foo.exe` or `foo.bat` in the directory and recommend
that if it exists.

# User-Facing Changes

When a user invokes an unrecognized command that is the path to an
existing file, the error used to say:
`{name} is neither a Nushell built-in or a known external command`
This PR proposes to change the message to:
`{name} refers to a file that is not executable. Did you forget to to
set execute permissions?`

# Tests + Formatting
Ran cargo fmt, clippy and test on the workspace.
EDIT: added test asserting the new behavior
---
 crates/nu-command/src/system/run_external.rs | 9 +++++++++
 tests/shell/pipeline/commands/external.rs    | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index 0b9f1950ea..c812280b62 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -473,6 +473,15 @@ pub fn command_not_found(
         };
     }
 
+    // If we find a file, it's likely that the user forgot to set permissions
+    if Path::new(name).is_file() {
+        return ShellError::ExternalCommand {
+                        label: format!("Command `{name}` not found"),
+                        help: format!("`{name}` refers to a file that is not executable. Did you forget to to set execute permissions?"),
+                        span,
+                    };
+    }
+
     // We found nothing useful. Give up and return a generic error message.
     ShellError::ExternalCommand {
         label: format!("Command `{name}` not found"),
diff --git a/tests/shell/pipeline/commands/external.rs b/tests/shell/pipeline/commands/external.rs
index ff851a3293..5b9f116626 100644
--- a/tests/shell/pipeline/commands/external.rs
+++ b/tests/shell/pipeline/commands/external.rs
@@ -127,6 +127,15 @@ fn command_not_found_error_suggests_typo_fix() {
     assert!(actual.err.contains("timeit"));
 }
 
+#[cfg(not(windows))]
+#[test]
+fn command_not_found_error_recognizes_non_executable_file() {
+    let actual = nu!("./Cargo.toml");
+    assert!(actual.err.contains(
+        "refers to a file that is not executable. Did you forget to to set execute permissions?"
+    ));
+}
+
 #[test]
 fn command_not_found_error_shows_not_found_1() {
     let actual = nu!(r#"

From 80c8edcfb4eac6a63d832eb595c04021ddd2809a Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Mon, 12 Aug 2024 16:02:57 +0200
Subject: [PATCH 0334/1072] Include only `*.nu` files in the vendor autoload
 (#13599)

# Description
Fixes #13587

# User-Facing Changes
Files without ending or non-`*.nu` files will not be loaded as
vendor/configuration files.

# Tests + Formatting
So far we don't have any tests for that..
---
 src/config_files.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/config_files.rs b/src/config_files.rs
index 1f9e4e9433..565cd0579a 100644
--- a/src/config_files.rs
+++ b/src/config_files.rs
@@ -177,6 +177,9 @@ pub(crate) fn read_default_env_file(engine_state: &mut EngineState, stack: &mut
     }
 }
 
+/// Get files sorted lexicographically
+///
+/// uses `impl Ord for String`
 fn read_and_sort_directory(path: &Path) -> Result<Vec<String>> {
     let mut entries = Vec::new();
 
@@ -200,13 +203,19 @@ pub(crate) fn read_vendor_autoload_files(engine_state: &mut EngineState, stack:
         column!()
     );
 
+    // The evaluation order is first determined by the semantics of `get_vendor_autoload_dirs`
+    // to determine the order of directories to evaluate
     for autoload_dir in nu_protocol::eval_const::get_vendor_autoload_dirs(engine_state) {
         warn!("read_vendor_autoload_files: {}", autoload_dir.display());
 
         if autoload_dir.exists() {
+            // on a second levels files are lexicographically sorted by the string of the filename
             let entries = read_and_sort_directory(&autoload_dir);
             if let Ok(entries) = entries {
                 for entry in entries {
+                    if !entry.ends_with(".nu") {
+                        continue;
+                    }
                     let path = autoload_dir.join(entry);
                     warn!("AutoLoading: {:?}", path);
                     eval_config_contents(path, engine_state, stack);

From 0eabbb88dd3ec6fc2a82228f42a0d88678e8ff19 Mon Sep 17 00:00:00 2001
From: Aakash parmar <94752702+Aakash788@users.noreply.github.com>
Date: Mon, 12 Aug 2024 20:13:59 +0530
Subject: [PATCH 0335/1072] Replace only leading home path with `~` in the
 title (#13600)

# Description :
- This pull request addresses issue #13594 where any substring of the
path that matches the home directory is replaced with `~` in the title
bar. This was problematic because partial matches within the path were
also being replaced.


---------

Signed-off-by: Aakash788 <aakashparmar788@gmail.com>
Co-authored-by: sholderbach <sholderbach@users.noreply.github.com>
---
 crates/nu-cli/src/repl.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 28a3e2cec7..1cb6f005ef 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -911,7 +911,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
         };

From a432bf94ec5cd44f836fac6f5aecccdc7a02d39a Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Tue, 13 Aug 2024 06:50:12 +0800
Subject: [PATCH 0336/1072] support SyntaxShape::OneOf in named args (#13553)

# Description
Fixes: #13253

The issue is because nushell use `parse_value` to parse named args, but
`parse_value` doesn't parse `OneOf` syntax shape.

# User-Facing Changes
`OneOf` in named args should works again.

# Tests + Formatting
I think it's hard to add a test, because nushell doesn't support `oneof`
syntax in custom command yet.

# After Submitting
NaN
---
 crates/nu-parser/src/parser.rs | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 3470b07e14..a47873c392 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -4701,6 +4701,15 @@ pub fn parse_value(
             | SyntaxShape::String
             | SyntaxShape::GlobPattern
             | SyntaxShape::ExternalArgument => {}
+            SyntaxShape::OneOf(possible_shapes) => {
+                if !possible_shapes
+                    .iter()
+                    .any(|s| matches!(s, SyntaxShape::List(_)))
+                {
+                    working_set.error(ParseError::Expected("non-[] value", span));
+                    return Expression::garbage(working_set, span);
+                }
+            }
             _ => {
                 working_set.error(ParseError::Expected("non-[] value", span));
                 return Expression::garbage(working_set, span);
@@ -4778,6 +4787,31 @@ pub fn parse_value(
         }
 
         SyntaxShape::ExternalArgument => parse_regular_external_arg(working_set, span),
+        SyntaxShape::OneOf(possible_shapes) => {
+            for s in possible_shapes {
+                let starting_error_count = working_set.parse_errors.len();
+                let value = parse_value(working_set, span, s);
+
+                if starting_error_count == working_set.parse_errors.len() {
+                    return value;
+                } else if let Some(
+                    ParseError::Expected(..) | ParseError::ExpectedWithStringMsg(..),
+                ) = working_set.parse_errors.last()
+                {
+                    working_set.parse_errors.truncate(starting_error_count);
+                    continue;
+                }
+            }
+
+            if working_set.parse_errors.is_empty() {
+                working_set.error(ParseError::ExpectedWithStringMsg(
+                    format!("one of a list of accepted shapes: {possible_shapes:?}"),
+                    span,
+                ));
+            }
+
+            Expression::garbage(working_set, span)
+        }
 
         SyntaxShape::Any => {
             if bytes.starts_with(b"[") {

From d5946a9667d181ddeafd7d18a7c5a909d52c6a5c Mon Sep 17 00:00:00 2001
From: Yash Thakur <45539777+ysthakur@users.noreply.github.com>
Date: Tue, 13 Aug 2024 03:05:34 -0400
Subject: [PATCH 0337/1072] Parse time type checking for range (#13595)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

As part of fixing https://github.com/nushell/nushell/issues/13586, this
PR checks the types of the operands when creating a range. Stuff like
`0..(glob .)` will be rejected at parse time. Additionally, `0..$x` will
be treated as a range and rejected if `x` is not defined, rather than
being treated as a string. A separate PR will need to be made to do
reject streams at runtime, so that stuff like `0..(open /dev/random)`
doesn't hang.

Internally, this PR adds a `ParseError::UnsupportedOperationTernary`
variant, for when you have a range like `1..2..(glob .)`.

# User-Facing Changes

Users will now receive an error if any of the operands in the ranges
they construct have types that aren't compatible with `Type::Number`.

Additionally, if a piece of code looks like a range but some parse error
is encountered while parsing it, that piece of code will still be
treated as a range and the user will be shown the parse error. This
means that a piece of code like `0..$x` will be treated as a range no
matter what. Previously, if `x` weren't the expression would've been
treated as a string `"0..$x"`. I feel like it makes the language less
complicated if we make it less context-sensitive.

Here's an example of the error you get:
```
> 0..(glob .)
Error: nu::parser::unsupported_operation

  × range is not supported between int and any.
   ╭─[entry #1:1:1]
 1 │ 0..(glob .)
   · ─────┬─────┬┬
   ·      │     │╰── any
   ·      │     ╰── int
   ·      ╰── doesn't support these values
   ╰────
```

And as an image:

![image](https://github.com/user-attachments/assets/5c76168d-27db-481b-b541-861dac899dbf)

Note: I made the operands themselves (above, `(glob .)`) be garbage,
rather than the `..` operator itself. This doesn't match the behavior of
the math operators (if you do `1 + "foo"`, `+` gets highlighted red).
This is because with ranges, the range operators aren't `Expression`s
themselves, so they can't be turned into garbage. I felt like here, it
makes more sense to highlight the individual operand anyway.
---
 crates/nu-parser/src/parser.rs               |  58 +++++-----
 crates/nu-parser/src/type_check.rs           |  61 +++++++++++
 crates/nu-parser/tests/test_parser.rs        | 106 +++++++++++++------
 crates/nu-protocol/src/errors/parse_error.rs |  14 +++
 4 files changed, 182 insertions(+), 57 deletions(-)

diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index a47873c392..742bd22644 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -4,7 +4,7 @@ use crate::{
     parse_keywords::*,
     parse_patterns::parse_pattern,
     parse_shape_specs::{parse_shape_name, parse_type, ShapeDescriptorUse},
-    type_check::{self, math_result_type, type_compatible},
+    type_check::{self, check_range_types, math_result_type, type_compatible},
     Token, TokenContents,
 };
 use itertools::Itertools;
@@ -109,14 +109,9 @@ pub fn is_math_expression_like(working_set: &mut StateWorkingSet, span: Span) ->
     }
     working_set.parse_errors.truncate(starting_error_count);
 
-    parse_range(working_set, span);
-
-    if working_set.parse_errors.len() == starting_error_count {
-        return true;
-    }
+    let is_range = parse_range(working_set, span).is_some();
     working_set.parse_errors.truncate(starting_error_count);
-
-    false
+    is_range
 }
 
 fn is_identifier(bytes: &[u8]) -> bool {
@@ -1389,8 +1384,7 @@ pub fn parse_call(working_set: &mut StateWorkingSet, spans: &[Span], head: Span)
             trace!("-- found leading range indicator");
             let starting_error_count = working_set.parse_errors.len();
 
-            let range_expr = parse_range(working_set, spans[0]);
-            if working_set.parse_errors.len() == starting_error_count {
+            if let Some(range_expr) = parse_range(working_set, spans[0]) {
                 trace!("-- successfully parsed range");
                 return range_expr;
             }
@@ -1598,7 +1592,7 @@ pub fn parse_number(working_set: &mut StateWorkingSet, span: Span) -> Expression
     garbage(working_set, span)
 }
 
-pub fn parse_range(working_set: &mut StateWorkingSet, span: Span) -> Expression {
+pub fn parse_range(working_set: &mut StateWorkingSet, span: Span) -> Option<Expression> {
     trace!("parsing: range");
 
     // Range follows the following syntax: [<from>][<next_operator><next>]<range_operator>[<to>]
@@ -1614,12 +1608,20 @@ pub fn parse_range(working_set: &mut StateWorkingSet, span: Span) -> Expression
         s
     } else {
         working_set.error(ParseError::NonUtf8(span));
-        return garbage(working_set, span);
+        return None;
     };
 
+    if token.starts_with("...") {
+        working_set.error(ParseError::Expected(
+            "range operator ('..'), got spread ('...')",
+            span,
+        ));
+        return None;
+    }
+
     if !token.contains("..") {
         working_set.error(ParseError::Expected("at least one range bound set", span));
-        return garbage(working_set, span);
+        return None;
     }
 
     // First, figure out what exact operators are used and determine their positions
@@ -1633,7 +1635,7 @@ pub fn parse_range(working_set: &mut StateWorkingSet, span: Span) -> Expression
                 "one range operator ('..' or '..<') and optionally one next operator ('..')",
                 span,
             ));
-            return garbage(working_set, span);
+            return None;
         }
     };
     // Avoid calling sub-parsers on unmatched parens, to prevent quadratic time on things like ((((1..2))))
@@ -1648,7 +1650,7 @@ pub fn parse_range(working_set: &mut StateWorkingSet, span: Span) -> Expression
         );
         if let Some(_err) = err {
             working_set.error(ParseError::Expected("Valid expression before ..", span));
-            return garbage(working_set, span);
+            return None;
         }
     }
 
@@ -1665,7 +1667,7 @@ pub fn parse_range(working_set: &mut StateWorkingSet, span: Span) -> Expression
                 "inclusive operator preceding second range bound",
                 span,
             ));
-            return garbage(working_set, span);
+            return None;
         }
     } else {
         let op_str = if token.contains("..=") { "..=" } else { ".." };
@@ -1698,7 +1700,7 @@ pub fn parse_range(working_set: &mut StateWorkingSet, span: Span) -> Expression
 
     if let (None, None) = (&from, &to) {
         working_set.error(ParseError::Expected("at least one range bound set", span));
-        return garbage(working_set, span);
+        return None;
     }
 
     let (next, next_op_span) = if let Some(pos) = next_op_pos {
@@ -1719,14 +1721,21 @@ pub fn parse_range(working_set: &mut StateWorkingSet, span: Span) -> Expression
         next_op_span,
     };
 
-    let range = Range {
+    let mut range = Range {
         from,
         next,
         to,
         operator,
     };
 
-    Expression::new(working_set, Expr::Range(Box::new(range)), span, Type::Range)
+    check_range_types(working_set, &mut range);
+
+    Some(Expression::new(
+        working_set,
+        Expr::Range(Box::new(range)),
+        span,
+        Type::Range,
+    ))
 }
 
 pub(crate) fn parse_dollar_expr(working_set: &mut StateWorkingSet, span: Span) -> Expression {
@@ -1740,8 +1749,7 @@ pub(crate) fn parse_dollar_expr(working_set: &mut StateWorkingSet, span: Span) -
     } else {
         let starting_error_count = working_set.parse_errors.len();
 
-        let expr = parse_range(working_set, span);
-        if starting_error_count == working_set.parse_errors.len() {
+        if let Some(expr) = parse_range(working_set, span) {
             expr
         } else {
             working_set.parse_errors.truncate(starting_error_count);
@@ -1812,9 +1820,7 @@ pub fn parse_paren_expr(
 ) -> Expression {
     let starting_error_count = working_set.parse_errors.len();
 
-    let expr = parse_range(working_set, span);
-
-    if starting_error_count == working_set.parse_errors.len() {
+    if let Some(expr) = parse_range(working_set, span) {
         expr
     } else {
         working_set.parse_errors.truncate(starting_error_count);
@@ -4733,7 +4739,9 @@ pub fn parse_value(
         SyntaxShape::Duration => parse_duration(working_set, span),
         SyntaxShape::DateTime => parse_datetime(working_set, span),
         SyntaxShape::Filesize => parse_filesize(working_set, span),
-        SyntaxShape::Range => parse_range(working_set, span),
+        SyntaxShape::Range => {
+            parse_range(working_set, span).unwrap_or_else(|| garbage(working_set, span))
+        }
         SyntaxShape::Filepath => parse_filepath(working_set, span),
         SyntaxShape::Directory => parse_directory(working_set, span),
         SyntaxShape::GlobPattern => parse_glob_pattern(working_set, span),
diff --git a/crates/nu-parser/src/type_check.rs b/crates/nu-parser/src/type_check.rs
index 6cfe8f64b3..6a99aef247 100644
--- a/crates/nu-parser/src/type_check.rs
+++ b/crates/nu-parser/src/type_check.rs
@@ -1,6 +1,7 @@
 use nu_protocol::{
     ast::{
         Assignment, Bits, Block, Boolean, Comparison, Expr, Expression, Math, Operator, Pipeline,
+        Range,
     },
     engine::StateWorkingSet,
     ParseError, Type,
@@ -1132,3 +1133,63 @@ fn check_append(
         }
     }
 }
+
+/// If one of the parts of the range isn't a number, a parse error is added to the working set
+pub fn check_range_types(working_set: &mut StateWorkingSet, range: &mut Range) {
+    let next_op_span = if range.next.is_some() {
+        range.operator.next_op_span
+    } else {
+        range.operator.span
+    };
+    match (&mut range.from, &mut range.next, &mut range.to) {
+        (Some(expr), _, _) | (None, Some(expr), Some(_)) | (None, None, Some(expr))
+            if !type_compatible(&Type::Number, &expr.ty) =>
+        {
+            working_set.error(ParseError::UnsupportedOperationLHS(
+                String::from("range"),
+                next_op_span,
+                expr.span,
+                expr.ty.clone(),
+            ));
+            *expr = Expression::garbage(working_set, expr.span);
+        }
+        (Some(lhs), Some(rhs), _) if !type_compatible(&Type::Number, &rhs.ty) => {
+            working_set.error(ParseError::UnsupportedOperationRHS(
+                String::from("range"),
+                next_op_span,
+                lhs.span,
+                lhs.ty.clone(),
+                rhs.span,
+                rhs.ty.clone(),
+            ));
+            *rhs = Expression::garbage(working_set, rhs.span);
+        }
+        (Some(lhs), Some(rhs), _) | (Some(lhs), None, Some(rhs)) | (None, Some(lhs), Some(rhs))
+            if !type_compatible(&Type::Number, &rhs.ty) =>
+        {
+            working_set.error(ParseError::UnsupportedOperationRHS(
+                String::from("range"),
+                range.operator.span,
+                lhs.span,
+                lhs.ty.clone(),
+                rhs.span,
+                rhs.ty.clone(),
+            ));
+            *rhs = Expression::garbage(working_set, rhs.span);
+        }
+        (Some(from), Some(next), Some(to)) if !type_compatible(&Type::Number, &to.ty) => {
+            working_set.error(ParseError::UnsupportedOperationTernary(
+                String::from("range"),
+                range.operator.span,
+                from.span,
+                from.ty.clone(),
+                next.span,
+                next.ty.clone(),
+                to.span,
+                to.ty.clone(),
+            ));
+            *to = Expression::garbage(working_set, to.span);
+        }
+        _ => (),
+    }
+}
diff --git a/crates/nu-parser/tests/test_parser.rs b/crates/nu-parser/tests/test_parser.rs
index 44cd79a04a..48ee9a7d9a 100644
--- a/crates/nu-parser/tests/test_parser.rs
+++ b/crates/nu-parser/tests/test_parser.rs
@@ -2,7 +2,7 @@ use nu_parser::*;
 use nu_protocol::{
     ast::{Argument, Expr, Expression, ExternalArgument, PathMember, Range},
     engine::{Call, Command, EngineState, Stack, StateWorkingSet},
-    ParseError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
+    Category, ParseError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
 };
 use rstest::rstest;
 
@@ -76,6 +76,35 @@ impl Command for Mut {
     }
 }
 
+#[derive(Clone)]
+pub struct ToCustom;
+
+impl Command for ToCustom {
+    fn name(&self) -> &str {
+        "to-custom"
+    }
+
+    fn usage(&self) -> &str {
+        "Mock converter command."
+    }
+
+    fn signature(&self) -> nu_protocol::Signature {
+        Signature::build(self.name())
+            .input_output_type(Type::Any, Type::Custom("custom".into()))
+            .category(Category::Custom("custom".into()))
+    }
+
+    fn run(
+        &self,
+        _engine_state: &EngineState,
+        _stack: &mut Stack,
+        _call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        todo!()
+    }
+}
+
 fn test_int(
     test_tag: &str,     // name of sub-test
     test: &[u8],        // input expression
@@ -1799,13 +1828,55 @@ mod range {
     }
 
     #[test]
-    fn vars_not_read_as_units() {
+    fn vars_read_as_units() {
         let engine_state = EngineState::new();
         let mut working_set = StateWorkingSet::new(&engine_state);
 
         let _ = parse(&mut working_set, None, b"0..<$day", true);
 
-        assert!(working_set.parse_errors.is_empty());
+        assert!(
+            working_set.parse_errors.len() == 1,
+            "Errors: {:?}",
+            working_set.parse_errors
+        );
+        let err = &working_set.parse_errors[0].to_string();
+        assert!(
+            err.contains("Variable not found"),
+            "Expected variable not found error, got {}",
+            err
+        );
+    }
+
+    #[rstest]
+    #[case("(to-custom)..")]
+    #[case("..(to-custom)")]
+    #[case("(to-custom)..0")]
+    #[case("..(to-custom)..0")]
+    #[case("(to-custom)..0..")]
+    #[case("(to-custom)..0..1")]
+    #[case("0..(to-custom)")]
+    #[case("0..(to-custom)..")]
+    #[case("0..(to-custom)..1")]
+    #[case("..1..(to-custom)")]
+    #[case("0..1..(to-custom)")]
+    fn type_mismatch_errors(#[case] code: &str) {
+        let engine_state = EngineState::new();
+        let mut working_set = StateWorkingSet::new(&engine_state);
+        working_set.add_decl(Box::new(ToCustom));
+
+        let _ = parse(&mut working_set, None, code.as_bytes(), true);
+
+        assert!(
+            working_set.parse_errors.len() == 1,
+            "Errors: {:?}",
+            working_set.parse_errors
+        );
+        let err = &working_set.parse_errors[0].to_string();
+        assert!(
+            err.contains("range is not supported"),
+            "Expected unsupported operation error, got {}",
+            err
+        );
     }
 }
 
@@ -1902,35 +1973,6 @@ mod input_types {
         }
     }
 
-    #[derive(Clone)]
-    pub struct ToCustom;
-
-    impl Command for ToCustom {
-        fn name(&self) -> &str {
-            "to-custom"
-        }
-
-        fn usage(&self) -> &str {
-            "Mock converter command."
-        }
-
-        fn signature(&self) -> nu_protocol::Signature {
-            Signature::build(self.name())
-                .input_output_type(Type::Any, Type::Custom("custom".into()))
-                .category(Category::Custom("custom".into()))
-        }
-
-        fn run(
-            &self,
-            _engine_state: &EngineState,
-            _stack: &mut Stack,
-            _call: &Call,
-            _input: PipelineData,
-        ) -> Result<PipelineData, ShellError> {
-            todo!()
-        }
-    }
-
     #[derive(Clone)]
     pub struct GroupByCustom;
 
diff --git a/crates/nu-protocol/src/errors/parse_error.rs b/crates/nu-protocol/src/errors/parse_error.rs
index 0e20f0dcba..ce8522daa1 100644
--- a/crates/nu-protocol/src/errors/parse_error.rs
+++ b/crates/nu-protocol/src/errors/parse_error.rs
@@ -131,6 +131,19 @@ pub enum ParseError {
         Type,
     ),
 
+    #[error("{0} is not supported between {3}, {5}, and {7}.")]
+    #[diagnostic(code(nu::parser::unsupported_operation))]
+    UnsupportedOperationTernary(
+        String,
+        #[label = "doesn't support these values"] Span,
+        #[label("{3}")] Span,
+        Type,
+        #[label("{5}")] Span,
+        Type,
+        #[label("{7}")] Span,
+        Type,
+    ),
+
     #[error("Capture of mutable variable.")]
     #[diagnostic(code(nu::parser::expected_keyword))]
     CaptureOfMutableVar(#[label("capture of mutable variable")] Span),
@@ -517,6 +530,7 @@ impl ParseError {
             ParseError::Mismatch(_, _, s) => *s,
             ParseError::UnsupportedOperationLHS(_, _, s, _) => *s,
             ParseError::UnsupportedOperationRHS(_, _, _, _, s, _) => *s,
+            ParseError::UnsupportedOperationTernary(_, _, _, _, _, _, s, _) => *s,
             ParseError::ExpectedKeyword(_, s) => *s,
             ParseError::UnexpectedKeyword(_, s) => *s,
             ParseError::CantAliasKeyword(_, s) => *s,

From 48e401834d604563106a6ef3738a996d38c790ca Mon Sep 17 00:00:00 2001
From: Piotr Kufel <qfel@users.noreply.github.com>
Date: Tue, 13 Aug 2024 04:29:40 -0700
Subject: [PATCH 0338/1072] Fix handling of spaces in executable names (#13596)

# Description
The original code assumed a full single-string command line could be
split by space to get the original argv.

# User-Facing Changes
Fixes an issue where `ps` would display incomplete process name if it
contained space(s).

# Tests + Formatting
Fixes existing code, no new coverage. Existing code doesn't seem to be
covered, we could be it would be somewhat involved and the fix was
simple, so didn't bother..
---
 crates/nu-system/src/linux.rs | 38 ++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/crates/nu-system/src/linux.rs b/crates/nu-system/src/linux.rs
index 238c386959..1523584537 100644
--- a/crates/nu-system/src/linux.rs
+++ b/crates/nu-system/src/linux.rs
@@ -142,31 +142,29 @@ impl ProcessInfo {
 
     /// Name of command
     pub fn name(&self) -> String {
-        self.command()
-            .split(' ')
-            .collect::<Vec<_>>()
-            .first()
-            .map(|x| x.to_string())
-            .unwrap_or_default()
+        if let Ok(mut cmd) = self.curr_proc.cmdline() {
+            if let Some(name) = cmd.first_mut() {
+                // Take over the first element and return it without extra allocations
+                // (String::default() is allocation-free).
+                return std::mem::take(name);
+            }
+        }
+        self.comm()
     }
 
     /// Full name of command, with arguments
+    ///
+    /// WARNING: As this does no escaping, this function is lossy. It's OK-ish for display purposes
+    /// but nothing else.
+    // TODO: Maybe rename this to display_command and add escaping compatible with nushell?
     pub fn command(&self) -> String {
-        if let Ok(cmd) = &self.curr_proc.cmdline() {
+        if let Ok(cmd) = self.curr_proc.cmdline() {
+            // TODO: When can it successfully return empty?
             if !cmd.is_empty() {
-                cmd.join(" ").replace(['\n', '\t'], " ")
-            } else {
-                match self.curr_proc.stat() {
-                    Ok(p) => p.comm,
-                    Err(_) => "".to_string(),
-                }
-            }
-        } else {
-            match self.curr_proc.stat() {
-                Ok(p) => p.comm,
-                Err(_) => "".to_string(),
+                return cmd.join(" ").replace(['\n', '\t'], " ");
             }
         }
+        self.comm()
     }
 
     pub fn cwd(&self) -> String {
@@ -228,4 +226,8 @@ impl ProcessInfo {
     pub fn virtual_size(&self) -> u64 {
         self.curr_proc.stat().map(|p| p.vsize).unwrap_or_default()
     }
+
+    fn comm(&self) -> String {
+        self.curr_proc.stat().map(|st| st.comm).unwrap_or_default()
+    }
 }

From a55d172e527786735add014705f2849dd413de30 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Tue, 13 Aug 2024 19:34:10 +0800
Subject: [PATCH 0339/1072] make `ls -lf` outputs full path in symbolic target
 (#13605)

# Description
Fixes: #13479

# User-Facing Changes
Given the following setup:
```
cd /tmp
touch src_file.txt
ln -s src_file.txt link1
```
### Before
```
ls -lf link1 | get target.0  # It outputs src_file.txt
```
### After
```
ls -lf link1 | get target.0  # It outputs /tmp/src_file.txt
```
# Tests + Formatting
Added a test for the change
---
 crates/nu-command/src/filesystem/ls.rs | 22 ++++++++++++++++++++--
 crates/nu-command/tests/commands/ls.rs | 25 +++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/crates/nu-command/src/filesystem/ls.rs b/crates/nu-command/src/filesystem/ls.rs
index 807e4f3409..445bf0f425 100644
--- a/crates/nu-command/src/filesystem/ls.rs
+++ b/crates/nu-command/src/filesystem/ls.rs
@@ -5,7 +5,7 @@ use nu_engine::glob_from;
 #[allow(deprecated)]
 use nu_engine::{command_prelude::*, env::current_dir};
 use nu_glob::MatchOptions;
-use nu_path::expand_to_real_path;
+use nu_path::{expand_path_with, expand_to_real_path};
 use nu_protocol::{DataSource, NuGlob, PipelineMetadata, Signals};
 use pathdiff::diff_paths;
 
@@ -412,6 +412,7 @@ fn ls_for_one_pattern(
                         du,
                         &signals,
                         use_mime_type,
+                        args.full_paths,
                     );
                     match entry {
                         Ok(value) => Some(value),
@@ -522,6 +523,7 @@ pub(crate) fn dir_entry_dict(
     du: bool,
     signals: &Signals,
     use_mime_type: bool,
+    full_symlink_target: bool,
 ) -> Result<Value, ShellError> {
     #[cfg(windows)]
     if metadata.is_none() {
@@ -551,7 +553,23 @@ pub(crate) fn dir_entry_dict(
                 "target",
                 if md.file_type().is_symlink() {
                     if let Ok(path_to_link) = filename.read_link() {
-                        Value::string(path_to_link.to_string_lossy(), span)
+                        // Actually `filename` should always have a parent because it's a symlink.
+                        // But for safety, we check `filename.parent().is_some()` first.
+                        if full_symlink_target && filename.parent().is_some() {
+                            Value::string(
+                                expand_path_with(
+                                    path_to_link,
+                                    filename
+                                        .parent()
+                                        .expect("already check the filename have a parent"),
+                                    true,
+                                )
+                                .to_string_lossy(),
+                                span,
+                            )
+                        } else {
+                            Value::string(path_to_link.to_string_lossy(), span)
+                        }
                     } else {
                         Value::string("Could not obtain target file's path", span)
                     }
diff --git a/crates/nu-command/tests/commands/ls.rs b/crates/nu-command/tests/commands/ls.rs
index 5354c9ccba..7ac0063741 100644
--- a/crates/nu-command/tests/commands/ls.rs
+++ b/crates/nu-command/tests/commands/ls.rs
@@ -808,3 +808,28 @@ fn list_inside_tilde_glob_metachars_dir() {
         },
     );
 }
+
+#[test]
+fn list_symlink_with_full_path() {
+    Playground::setup("list_symlink_with_full_path", |dirs, sandbox| {
+        sandbox.with_files(&[EmptyFile("test_file.txt")]);
+
+        #[cfg(unix)]
+        let _ = std::os::unix::fs::symlink("test_file.txt", dirs.test().join("test_link1"));
+        #[cfg(windows)]
+        let _ = std::os::windows::fs::symlink_file("test_file.txt", dirs.test().join("test_link1"));
+        let actual = nu!(
+            cwd: dirs.test(),
+            "ls -l test_link1 | get target.0"
+        );
+        assert_eq!(actual.out, "test_file.txt");
+        let actual = nu!(
+            cwd: dirs.test(),
+            "ls -lf test_link1 | get target.0"
+        );
+        assert_eq!(
+            actual.out,
+            dirs.test().join("test_file.txt").to_string_lossy()
+        );
+    })
+}

From 5f45f6c22381b78190cd2de6c66af1385a1c63f5 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Tue, 13 Aug 2024 14:27:28 -0500
Subject: [PATCH 0340/1072] add more helpful error with text/xml (#13609)

# Description

This PR is meant to provide a more helpful error message when using http
get and the content type can't be parsed.

### Before

![image](https://github.com/user-attachments/assets/4e6176e2-ec35-48d8-acb3-af5d1cda4327)

### After

![image](https://github.com/user-attachments/assets/aa498ef7-f1ca-495b-8790-484593f02e35)
The span isn't perfect but there's no way to get the span of the content
type that I can see.

In the middle of fixing this error, I also discovered how to fix the
problem in general. Since you can now see the error message complaining
about double quotes (char 22 at position 0. 22 hex is `"`). The fix is
just to remove all the double quotes from the content_type and then you
get this.

### After After

![image](https://github.com/user-attachments/assets/2223d34f-4563-4dea-90eb-83326e808af1)

The discussion on Discord about this is that `--raw` or
`--ignore-errors` should eat this error and it "just work" as well as
default to text or binary when the mime parsing fails. I agree but this
PR does not implement that.

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.toml                                   |  2 +-
 crates/nu-command/Cargo.toml                 |  4 +--
 crates/nu-command/src/network/http/client.rs | 33 +++++++++++---------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 91daf6ccf0..07ad13cec0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -110,7 +110,7 @@ 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.5", default-features = false }
 multipart-rs = "0.1.11"
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 2459d74ad9..475f595ef5 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -50,7 +50,7 @@ encoding_rs = { workspace = true }
 fancy-regex = { workspace = true }
 filesize = { workspace = true }
 filetime = { workspace = true }
-fs_extra = { workspace =  true }
+fs_extra = { workspace = true }
 human-date-parser = { workspace = true }
 indexmap = { workspace = true }
 indicatif = { workspace = true }
@@ -88,7 +88,7 @@ sysinfo = { workspace = true }
 tabled = { workspace = true, features = ["color"], default-features = false }
 terminal_size = { workspace = true }
 titlecase = { workspace = true }
-toml = { workspace = true, features = ["preserve_order"]}
+toml = { workspace = true, features = ["preserve_order"] }
 unicode-segmentation = { workspace = true }
 ureq = { workspace = true, default-features = false, features = ["charset", "gzip", "json", "native-tls"] }
 url = { workspace = true }
diff --git a/crates/nu-command/src/network/http/client.rs b/crates/nu-command/src/network/http/client.rs
index 7bb63a8fbd..0027101528 100644
--- a/crates/nu-command/src/network/http/client.rs
+++ b/crates/nu-command/src/network/http/client.rs
@@ -4,9 +4,10 @@ use base64::{
     engine::{general_purpose::PAD, GeneralPurpose},
     Engine,
 };
+use fancy_regex::Regex;
 use multipart_rs::MultipartWriter;
 use nu_engine::command_prelude::*;
-use nu_protocol::{ByteStream, Signals};
+use nu_protocol::{ByteStream, LabeledError, Signals};
 use std::{
     collections::HashMap,
     io::Cursor,
@@ -560,23 +561,25 @@ fn transform_response_using_content_type(
     resp: Response,
     content_type: &str,
 ) -> Result<PipelineData, ShellError> {
-    let content_type =
-        mime::Mime::from_str(content_type).map_err(|_| ShellError::GenericError {
-            error: format!("MIME type unknown: {content_type}"),
-            msg: "".into(),
-            span: None,
-            help: Some("given unknown MIME type".into()),
-            inner: vec![],
-        })?;
+    let regex = Regex::new("\"").expect("Failed to create regex");
+    let content_type_trim = regex.replace_all(content_type, "").to_string();
+
+    let content_type = mime::Mime::from_str(&content_type_trim).map_err(|err| {
+        LabeledError::new(err.to_string())
+            .with_help("given unknown MIME type, or error parsing MIME type")
+            .with_label(format!("MIME type unknown: {content_type_trim}"), span)
+    })?;
+
     let ext = match (content_type.type_(), content_type.subtype()) {
         (mime::TEXT, mime::PLAIN) => {
             let path_extension = url::Url::parse(requested_url)
-                .map_err(|_| ShellError::GenericError {
-                    error: format!("Cannot parse URL: {requested_url}"),
-                    msg: "".into(),
-                    span: None,
-                    help: Some("cannot parse".into()),
-                    inner: vec![],
+                .map_err(|err| {
+                    LabeledError::new(err.to_string())
+                        .with_help("cannot parse")
+                        .with_label(
+                            format!("Cannot parse URL: {requested_url}"),
+                            Span::unknown(),
+                        )
                 })?
                 .path_segments()
                 .and_then(|segments| segments.last())

From 4732507f46f61a34bc0a2cc74f3c564ac555ace0 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Tue, 13 Aug 2024 14:27:42 -0500
Subject: [PATCH 0341/1072] allow glob to take a glob or a string as the input
 (#13612)

# Description

This PR changes glob to take either a string or a glob as a parameter.

Closes #13611

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/filesystem/glob.rs | 55 +++++++++++++++++-------
 1 file changed, 40 insertions(+), 15 deletions(-)

diff --git a/crates/nu-command/src/filesystem/glob.rs b/crates/nu-command/src/filesystem/glob.rs
index 212c6ceb92..8d910e15d5 100644
--- a/crates/nu-command/src/filesystem/glob.rs
+++ b/crates/nu-command/src/filesystem/glob.rs
@@ -13,7 +13,7 @@ impl Command for Glob {
     fn signature(&self) -> Signature {
         Signature::build("glob")
             .input_output_types(vec![(Type::Nothing, Type::List(Box::new(Type::String)))])
-            .required("glob", SyntaxShape::String, "The glob expression.")
+            .required("glob", SyntaxShape::OneOf(vec![SyntaxShape::String, SyntaxShape::GlobPattern]), "The glob expression.")
             .named(
                 "depth",
                 SyntaxShape::Int,
@@ -126,12 +126,12 @@ impl Command for Glob {
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let span = call.head;
-        let glob_pattern: Spanned<String> = call.req(engine_state, stack, 0)?;
+        let glob_pattern_input: Value = call.req(engine_state, stack, 0)?;
+        let glob_span = glob_pattern_input.span();
         let depth = call.get_flag(engine_state, stack, "depth")?;
         let no_dirs = call.has_flag(engine_state, stack, "no-dir")?;
         let no_files = call.has_flag(engine_state, stack, "no-file")?;
         let no_symlinks = call.has_flag(engine_state, stack, "no-symlink")?;
-
         let paths_to_exclude: Option<Value> = call.get_flag(engine_state, stack, "exclude")?;
 
         let (not_patterns, not_pattern_span): (Vec<String>, Span) = match paths_to_exclude {
@@ -148,15 +148,40 @@ impl Command for Glob {
             }
         };
 
-        if glob_pattern.item.is_empty() {
-            return Err(ShellError::GenericError {
-                error: "glob pattern must not be empty".into(),
-                msg: "glob pattern is empty".into(),
-                span: Some(glob_pattern.span),
-                help: Some("add characters to the glob pattern".into()),
-                inner: vec![],
-            });
-        }
+        let glob_pattern = match glob_pattern_input {
+            Value::String { val, .. } => {
+                if val.is_empty() {
+                    return Err(ShellError::GenericError {
+                        error: "glob pattern must not be empty".into(),
+                        msg: "glob pattern is empty".into(),
+                        span: Some(glob_span),
+                        help: Some("add characters to the glob pattern".into()),
+                        inner: vec![],
+                    });
+                } else {
+                    val
+                }
+            }
+            Value::Glob { val, .. } => {
+                if val.is_empty() {
+                    return Err(ShellError::GenericError {
+                        error: "glob pattern must not be empty".into(),
+                        msg: "glob pattern is empty".into(),
+                        span: Some(glob_span),
+                        help: Some("add characters to the glob pattern".into()),
+                        inner: vec![],
+                    });
+                } else {
+                    val
+                }
+            }
+            _ => {
+                return Err(ShellError::IncompatibleParametersSingle {
+                    msg: "Incorrect parameter type".to_string(),
+                    span: glob_span,
+                })
+            }
+        };
 
         let folder_depth = if let Some(depth) = depth {
             depth
@@ -164,13 +189,13 @@ impl Command for Glob {
             usize::MAX
         };
 
-        let (prefix, glob) = match WaxGlob::new(&glob_pattern.item) {
+        let (prefix, glob) = match WaxGlob::new(&glob_pattern) {
             Ok(p) => p.partition(),
             Err(e) => {
                 return Err(ShellError::GenericError {
                     error: "error with glob pattern".into(),
                     msg: format!("{e}"),
-                    span: Some(glob_pattern.span),
+                    span: Some(glob_span),
                     help: None,
                     inner: vec![],
                 })
@@ -189,7 +214,7 @@ impl Command for Glob {
                 return Err(ShellError::GenericError {
                     error: "error in canonicalize".into(),
                     msg: format!("{e}"),
-                    span: Some(glob_pattern.span),
+                    span: Some(glob_span),
                     help: None,
                     inner: vec![],
                 })

From f122065772946b69fc4c6f31a266ac8a65be18e6 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Tue, 13 Aug 2024 18:40:17 -0500
Subject: [PATCH 0342/1072] create a better error message for bad glob patterns
 (#13613)

# Description

@sholderbach pointed out that I could've made this error message better.
So, here's my attempt to make it better.

This should work. I had a hard time figuring out how to trigger the
error anyway because the type checker doesn't allow "bad" parameters to
begin with.

### Before

![image](https://github.com/user-attachments/assets/ac60ce27-4b9a-49ca-910c-74422ae31bc4)


### After

![image](https://github.com/user-attachments/assets/fe939339-67df-4d30-a8dd-5ce3fe623a95)


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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/filesystem/glob.rs | 65 ++++++++++++------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/crates/nu-command/src/filesystem/glob.rs b/crates/nu-command/src/filesystem/glob.rs
index 8d910e15d5..2976c765a2 100644
--- a/crates/nu-command/src/filesystem/glob.rs
+++ b/crates/nu-command/src/filesystem/glob.rs
@@ -148,40 +148,41 @@ impl Command for Glob {
             }
         };
 
-        let glob_pattern = match glob_pattern_input {
-            Value::String { val, .. } => {
-                if val.is_empty() {
-                    return Err(ShellError::GenericError {
-                        error: "glob pattern must not be empty".into(),
-                        msg: "glob pattern is empty".into(),
-                        span: Some(glob_span),
-                        help: Some("add characters to the glob pattern".into()),
-                        inner: vec![],
-                    });
-                } else {
-                    val
+        let glob_pattern =
+            match glob_pattern_input {
+                Value::String { val, .. } => {
+                    if val.is_empty() {
+                        return Err(ShellError::GenericError {
+                            error: "glob pattern must not be empty".into(),
+                            msg: "glob pattern is empty".into(),
+                            span: Some(glob_span),
+                            help: Some("add characters to the glob pattern".into()),
+                            inner: vec![],
+                        });
+                    } else {
+                        val
+                    }
                 }
-            }
-            Value::Glob { val, .. } => {
-                if val.is_empty() {
-                    return Err(ShellError::GenericError {
-                        error: "glob pattern must not be empty".into(),
-                        msg: "glob pattern is empty".into(),
-                        span: Some(glob_span),
-                        help: Some("add characters to the glob pattern".into()),
-                        inner: vec![],
-                    });
-                } else {
-                    val
+                Value::Glob { val, .. } => {
+                    if val.is_empty() {
+                        return Err(ShellError::GenericError {
+                            error: "glob pattern must not be empty".into(),
+                            msg: "glob pattern is empty".into(),
+                            span: Some(glob_span),
+                            help: Some("add characters to the glob pattern".into()),
+                            inner: vec![],
+                        });
+                    } else {
+                        val
+                    }
                 }
-            }
-            _ => {
-                return Err(ShellError::IncompatibleParametersSingle {
-                    msg: "Incorrect parameter type".to_string(),
-                    span: glob_span,
-                })
-            }
-        };
+                _ => return Err(ShellError::IncorrectValue {
+                    msg: "Incorrect glob pattern supplied to glob. Please use string or glob only."
+                        .to_string(),
+                    val_span: call.head,
+                    call_span: glob_span,
+                }),
+            };
 
         let folder_depth = if let Some(depth) = depth {
             depth

From 5627c9591625408ec12480d2ef636266744591ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2024 14:41:00 +0800
Subject: [PATCH 0343/1072] Bump sysinfo from 0.30.11 to 0.30.13 (#13615)

Bumps [sysinfo](https://github.com/GuillaumeGomez/sysinfo) from 0.30.11
to 0.30.13.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/GuillaumeGomez/sysinfo/blob/master/CHANGELOG.md">sysinfo's
changelog</a>.</em></p>
<blockquote>
<h1>0.30.13</h1>
<ul>
<li>macOS: Fix segfault when calling
<code>Components::refresh_list</code> multiple times.</li>
<li>Windows: Fix CPU arch retrieval.</li>
</ul>
<h1>0.30.12</h1>
<ul>
<li>FreeBSD: Fix network interfaces retrieval (one was always
missing).</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/GuillaumeGomez/sysinfo/commit/1639d7476538b7a4d2f5dd1abf2d116c8e756a43"><code>1639d74</code></a>
Merge pull request <a
href="https://redirect.github.com/GuillaumeGomez/sysinfo/issues/1306">#1306</a>
from GuillaumeGomez/update</li>
<li><a
href="https://github.com/GuillaumeGomez/sysinfo/commit/4bcded7fa7f496301426c75d1062b1474e8448a0"><code>4bcded7</code></a>
Update crate version to 0.30.13</li>
<li><a
href="https://github.com/GuillaumeGomez/sysinfo/commit/9feeff00a3e5a21a5dc0fd1161d9165b5a52ad24"><code>9feeff0</code></a>
Add CHANGELOG for 0.30.13</li>
<li><a
href="https://github.com/GuillaumeGomez/sysinfo/commit/3e7c8f23d2882379e4c48ee3e80a41d3c7d5e0db"><code>3e7c8f2</code></a>
Merge pull request <a
href="https://redirect.github.com/GuillaumeGomez/sysinfo/issues/1305">#1305</a>
from GuillaumeGomez/backport</li>
<li><a
href="https://github.com/GuillaumeGomez/sysinfo/commit/5ec06633a0f97b06da99d5e0d6697858ea1ec89f"><code>5ec0663</code></a>
Fix new clippy lints</li>
<li><a
href="https://github.com/GuillaumeGomez/sysinfo/commit/53d066ebf130b71ef06277fb4dbcc63bd38f359e"><code>53d066e</code></a>
Fix fmt</li>
<li><a
href="https://github.com/GuillaumeGomez/sysinfo/commit/6a6838bc81fb735e0416cb6255060472a3bd12e6"><code>6a6838b</code></a>
Fix minor typo in a doc comment</li>
<li><a
href="https://github.com/GuillaumeGomez/sysinfo/commit/0662e60ac405ead253c58be56df148d398a3bd65"><code>0662e60</code></a>
Fix CPU arch retrieval on Windows (<a
href="https://redirect.github.com/GuillaumeGomez/sysinfo/issues/1296">#1296</a>)</li>
<li><a
href="https://github.com/GuillaumeGomez/sysinfo/commit/57ea114d10c50af245f4f85aaac6820c56146ad8"><code>57ea114</code></a>
Fix segfault when call calling Components::refresh_list multiple times
on M-...</li>
<li><a
href="https://github.com/GuillaumeGomez/sysinfo/commit/57d6b323004d0f71a00a872f2fa6fbc3b7c9a4da"><code>57d6b32</code></a>
Merge pull request <a
href="https://redirect.github.com/GuillaumeGomez/sysinfo/issues/1271">#1271</a>
from GuillaumeGomez/update</li>
<li>Additional commits viewable in <a
href="https://github.com/GuillaumeGomez/sysinfo/compare/v0.30.11...v0.30.13">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=sysinfo&package-manager=cargo&previous-version=0.30.11&new-version=0.30.13)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d6b1054bed..9852b1be66 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2403,7 +2403,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.5",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -6014,9 +6014,9 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.30.11"
+version = "0.30.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87341a165d73787554941cd5ef55ad728011566fe714e987d1b976c15dbc3a83"
+checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3"
 dependencies = [
  "cfg-if",
  "core-foundation-sys",

From d7b0dc1275b1db7553ae46926b4d8f0650c9fdb7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2024 14:41:12 +0800
Subject: [PATCH 0344/1072] Bump shadow-rs from 0.30.0 to 0.31.1 (#13616)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [shadow-rs](https://github.com/baoyachi/shadow-rs) from 0.30.0 to
0.31.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/baoyachi/shadow-rs/releases">shadow-rs's
releases</a>.</em></p>
<blockquote>
<h2>[Improvement] Correct git command directory</h2>
<p>ref: <a
href="https://redirect.github.com/baoyachi/shadow-rs/issues/170">#170</a></p>
<p>Thx <a
href="https://github.com/MichaelScofield"><code>@​MichaelScofield</code></a></p>
<h2>Make build_with function public</h2>
<p>ref:<a
href="https://redirect.github.com/baoyachi/shadow-rs/issues/169">#169</a></p>
<p>Thx <a
href="https://github.com/MichaelScofield"><code>@​MichaelScofield</code></a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/aa804ec8a2370621122092c25fc561b5fbc0f673"><code>aa804ec</code></a>
Update Cargo.toml</li>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/b3fbe36403c6e94897b1bdaefd048fc15b92a7cd"><code>b3fbe36</code></a>
Merge pull request <a
href="https://redirect.github.com/baoyachi/shadow-rs/issues/170">#170</a>
from MichaelScofield/find-right-branch</li>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/fe6f940f8b96446c4b796d9740c2d0b5a51fc1f8"><code>fe6f940</code></a>
execute &quot;git&quot; command in the right path</li>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/458be25e74dc687e8ac90fdc70d17c2337c72c16"><code>458be25</code></a>
Merge pull request <a
href="https://redirect.github.com/baoyachi/shadow-rs/issues/169">#169</a>
from MichaelScofield/flexible-for-submodule</li>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/1521a288b46861cd7ad79e48471adadcc67d2ac3"><code>1521a28</code></a>
Expose the &quot;build&quot; function to let projects with submodules
control where to ...</li>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/ee12741fa064b944e2aaa6c9cb678eb52f4fabc5"><code>ee12741</code></a>
Merge pull request <a
href="https://redirect.github.com/baoyachi/shadow-rs/issues/168">#168</a>
from baoyachi/issue/149</li>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/dfb8b24adbbb6adc961ad033eab1ac29e7dbfd19"><code>dfb8b24</code></a>
cargo fmt</li>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/a3be8680aaf61a8a45024b178bb965c637c1c12e"><code>a3be868</code></a>
fix clippy</li>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/c8e7cd5704f2ddb5ea61d79b36f44ebeabe476d3"><code>c8e7cd5</code></a>
Fix compilation failures caused by unwrap</li>
<li>See full diff in <a
href="https://github.com/baoyachi/shadow-rs/compare/v0.30.0...v0.31.1">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=shadow-rs&package-manager=cargo&previous-version=0.30.0&new-version=0.31.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                    | 4 ++--
 crates/nu-cmd-lang/Cargo.toml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9852b1be66..591c07b056 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5636,9 +5636,9 @@ dependencies = [
 
 [[package]]
 name = "shadow-rs"
-version = "0.30.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d253e54681d4be0161e965db57974ae642a0b6aaeb18a999424c4dab062be8c5"
+checksum = "02c282402d25101f9c893e9cd7e4cae535fe7db18b81291de973026c219ddf1e"
 dependencies = [
  "const_format",
  "is_debug",
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index c5ae7b8c61..a48869231d 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -18,10 +18,10 @@ nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
 nu-utils = { path = "../nu-utils", version = "0.96.2" }
 
 itertools = { workspace = true }
-shadow-rs = { version = "0.30", default-features = false }
+shadow-rs = { version = "0.31", default-features = false }
 
 [build-dependencies]
-shadow-rs = { version = "0.30", default-features = false }
+shadow-rs = { version = "0.31", default-features = false }
 
 [features]
 mimalloc = []

From e841fce0f97d9c04a6e91ba0a5761530b1ad5ad5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2024 15:21:39 +0800
Subject: [PATCH 0345/1072] Bump indexmap from 2.3.0 to 2.4.0 (#13617)

Bumps [indexmap](https://github.com/indexmap-rs/indexmap) from 2.3.0 to
2.4.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/indexmap-rs/indexmap/blob/master/RELEASES.md">indexmap's
changelog</a>.</em></p>
<blockquote>
<h2>2.4.0</h2>
<ul>
<li>Added methods <code>IndexMap::append</code> and
<code>IndexSet::append</code>, moving all items from
one map or set into another, and leaving the original capacity for
reuse.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/b66bbfe2826ff13556ae9ba4e60acf23c77799c6"><code>b66bbfe</code></a>
Merge pull request <a
href="https://redirect.github.com/indexmap-rs/indexmap/issues/337">#337</a>
from cuviper/append</li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/a288bf3b3a14ecc5f05006dd15f43759548b1469"><code>a288bf3</code></a>
Add a README note for <code>ordermap</code></li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/0b2b4b9a7829905292378cb99c392c44a0931850"><code>0b2b4b9</code></a>
Release 2.4.0</li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/8c0a1cd4be7de02bee713433c449bcb251dcd994"><code>8c0a1cd</code></a>
Add <code>append</code> methods</li>
<li>See full diff in <a
href="https://github.com/indexmap-rs/indexmap/compare/2.3.0...2.4.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=indexmap&package-manager=cargo&previous-version=2.3.0&new-version=2.4.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                         | 4 ++--
 Cargo.toml                         | 2 +-
 crates/nu_plugin_polars/Cargo.toml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 591c07b056..b3fba6ee32 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2068,9 +2068,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0"
+checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.5",
diff --git a/Cargo.toml b/Cargo.toml
index 07ad13cec0..9dd7e88236 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -95,7 +95,7 @@ fuzzy-matcher = "0.3"
 hamcrest2 = "0.3"
 heck = "0.5.0"
 human-date-parser = "0.1.1"
-indexmap = "2.3"
+indexmap = "2.4"
 indicatif = "0.17"
 interprocess = "2.2.0"
 is_executable = "1.0"
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 9636ce98a4..936fa59896 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -26,7 +26,7 @@ nu-utils = { path = "../nu-utils", version = "0.96.2" }
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
 chrono-tz = "0.9"
 fancy-regex = { workspace = true }
-indexmap = { version = "2.3" }
+indexmap = { version = "2.4" }
 mimalloc = { version = "0.1.42" }
 num = {version = "0.4"}
 serde = { version = "1.0", features = ["derive"] }

From e690e7aac03f80394a444606a45da3bb8ae90dd0 Mon Sep 17 00:00:00 2001
From: Bruce Weirdan <weirdan@gmail.com>
Date: Wed, 14 Aug 2024 16:47:01 +0200
Subject: [PATCH 0346/1072] Fallback to extension-based content type detection
 when parsing `Content-Type` header fails (#13610)

# Description

Previously when nushell failed to parse the content type header, it
would emit an error instead of returning the response. Now it will fall
back to `text/plain` (which, in turn, will trigger type detection based
on file extension).

May fix (potentially) nushell/nushell#11927

Refs:
https://discord.com/channels/601130461678272522/614593951969574961/1272895236489613366

Supercedes: #13609

# User-Facing Changes

It's now possible to fetch content even if the server returns an invalid
content type header. Users may need to parse the response manually, but
it's still better than not getting the response at all.

# Tests + Formatting

Added a test for the new behaviour.

# After Submitting
---
 crates/nu-command/src/network/http/client.rs  | 15 +++----
 .../tests/commands/network/http/get.rs        | 43 +++++++++++++++++++
 2 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/crates/nu-command/src/network/http/client.rs b/crates/nu-command/src/network/http/client.rs
index 0027101528..75ef8c4897 100644
--- a/crates/nu-command/src/network/http/client.rs
+++ b/crates/nu-command/src/network/http/client.rs
@@ -4,7 +4,6 @@ use base64::{
     engine::{general_purpose::PAD, GeneralPurpose},
     Engine,
 };
-use fancy_regex::Regex;
 use multipart_rs::MultipartWriter;
 use nu_engine::command_prelude::*;
 use nu_protocol::{ByteStream, LabeledError, Signals};
@@ -561,14 +560,12 @@ fn transform_response_using_content_type(
     resp: Response,
     content_type: &str,
 ) -> Result<PipelineData, ShellError> {
-    let regex = Regex::new("\"").expect("Failed to create regex");
-    let content_type_trim = regex.replace_all(content_type, "").to_string();
-
-    let content_type = mime::Mime::from_str(&content_type_trim).map_err(|err| {
-        LabeledError::new(err.to_string())
-            .with_help("given unknown MIME type, or error parsing MIME type")
-            .with_label(format!("MIME type unknown: {content_type_trim}"), span)
-    })?;
+    let content_type = mime::Mime::from_str(content_type)
+        // there are invalid content types in the wild, so we try to recover
+        // Example: `Content-Type: "text/plain"; charset="utf8"` (note the quotes)
+        .or_else(|_| mime::Mime::from_str(&content_type.replace('"', "")))
+        .or_else(|_| mime::Mime::from_str("text/plain"))
+        .expect("Failed to parse content type, and failed to default to text/plain");
 
     let ext = match (content_type.type_(), content_type.subtype()) {
         (mime::TEXT, mime::PLAIN) => {
diff --git a/crates/nu-command/tests/commands/network/http/get.rs b/crates/nu-command/tests/commands/network/http/get.rs
index bb7a8a4661..e1f1132efa 100644
--- a/crates/nu-command/tests/commands/network/http/get.rs
+++ b/crates/nu-command/tests/commands/network/http/get.rs
@@ -273,3 +273,46 @@ fn http_get_self_signed_override() {
     let actual = nu!("http get --insecure https://self-signed.badssl.com/");
     assert!(actual.out.contains("<html>"));
 }
+
+#[test]
+fn http_get_with_invalid_mime_type() {
+    let mut server = Server::new();
+
+    let _mock = server
+        .mock("GET", "/foo.nuon")
+        .with_status(200)
+        // `what&ever` is not a parseable MIME type
+        .with_header("content-type", "what&ever")
+        .with_body("[1 2 3]")
+        .create();
+
+    // but `from nuon` is a known command in nu, so we take `foo.{ext}` and pass it to `from {ext}`
+    let actual = nu!(pipeline(
+        format!(
+            r#"http get {url}/foo.nuon | to json --raw"#,
+            url = server.url()
+        )
+        .as_str()
+    ));
+
+    assert_eq!(actual.out, "[1,2,3]");
+}
+
+#[test]
+fn http_get_with_unknown_mime_type() {
+    let mut server = Server::new();
+    let _mock = server
+        .mock("GET", "/foo")
+        .with_status(200)
+        // `application/nuon` is not an IANA-registered MIME type
+        .with_header("content-type", "application/nuon")
+        .with_body("[1 2 3]")
+        .create();
+
+    // but `from nuon` is a known command in nu, so we take `{garbage}/{whatever}` and pass it to `from {whatever}`
+    let actual = nu!(pipeline(
+        format!(r#"http get {url}/foo | to json --raw"#, url = server.url()).as_str()
+    ));
+
+    assert_eq!(actual.out, "[1,2,3]");
+}

From 803bc9c63f3f30f6a252940ca7c40c163fad9a52 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Wed, 14 Aug 2024 13:38:46 -0700
Subject: [PATCH 0347/1072] Incrementing the eager dataframe cache value before
 returning it (#13624)

# Description

Fixes issue [12828](https://github.com/nushell/nushell/issues/12828).

When attempting a `polars collect` on an eager dataframe, we return
dataframe as is. However, before this fix I failed to increment the
internal cache reference count. This caused the value to be dropped from
the internal cache when the references were decremented again.

This fix adds a call to cache.get to increment the value before
returning.
---
 crates/nu_plugin_polars/src/dataframe/lazy/collect.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/collect.rs b/crates/nu_plugin_polars/src/dataframe/lazy/collect.rs
index 91adc4f713..4a48680c58 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/collect.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/collect.rs
@@ -75,6 +75,11 @@ impl PluginCommand for LazyCollect {
                 ))
             }
             PolarsPluginObject::NuDataFrame(df) => {
+                // This should just increment the cache value.
+                // We can return a value back without incrementing the
+                // cache value or the value will be dropped (issue #12828)
+                let _ = plugin.cache.get(&df.id, true)?;
+
                 // just return the dataframe, add to cache again to be safe
                 Ok(PipelineData::Value(
                     df.cache(plugin, engine, call.head)?.into_value(call.head),

From 31b3104af7144011ffd2bc5da4e1318c37b02420 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Wed, 14 Aug 2024 23:11:00 +0200
Subject: [PATCH 0348/1072] Remove code duplication in glob (#13626)

---
 crates/nu-command/src/filesystem/glob.rs | 37 +++++++-----------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/crates/nu-command/src/filesystem/glob.rs b/crates/nu-command/src/filesystem/glob.rs
index 2976c765a2..faba600c94 100644
--- a/crates/nu-command/src/filesystem/glob.rs
+++ b/crates/nu-command/src/filesystem/glob.rs
@@ -150,32 +150,7 @@ impl Command for Glob {
 
         let glob_pattern =
             match glob_pattern_input {
-                Value::String { val, .. } => {
-                    if val.is_empty() {
-                        return Err(ShellError::GenericError {
-                            error: "glob pattern must not be empty".into(),
-                            msg: "glob pattern is empty".into(),
-                            span: Some(glob_span),
-                            help: Some("add characters to the glob pattern".into()),
-                            inner: vec![],
-                        });
-                    } else {
-                        val
-                    }
-                }
-                Value::Glob { val, .. } => {
-                    if val.is_empty() {
-                        return Err(ShellError::GenericError {
-                            error: "glob pattern must not be empty".into(),
-                            msg: "glob pattern is empty".into(),
-                            span: Some(glob_span),
-                            help: Some("add characters to the glob pattern".into()),
-                            inner: vec![],
-                        });
-                    } else {
-                        val
-                    }
-                }
+                Value::String { val, .. } | Value::Glob { val, .. } => val,
                 _ => return Err(ShellError::IncorrectValue {
                     msg: "Incorrect glob pattern supplied to glob. Please use string or glob only."
                         .to_string(),
@@ -184,6 +159,16 @@ impl Command for Glob {
                 }),
             };
 
+        if glob_pattern.is_empty() {
+            return Err(ShellError::GenericError {
+                error: "glob pattern must not be empty".into(),
+                msg: "glob pattern is empty".into(),
+                span: Some(glob_span),
+                help: Some("add characters to the glob pattern".into()),
+                inner: vec![],
+            });
+        }
+
         let folder_depth = if let Some(depth) = depth {
             depth
         } else {

From 04746b8e2dde1de5fa6402a6f1a89881c5aeab01 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 15 Aug 2024 00:40:34 -0500
Subject: [PATCH 0349/1072] add osc633e (#13625)

# Description

This PR adds OSC 633E for vscode users to enable `Terminal: Run Recent
Command` with ctrl-shift-p.


![image](https://github.com/user-attachments/assets/21b92206-3c44-4060-aa0b-78718c099336)
---
 crates/nu-cli/src/prompt_update.rs            |  5 +-
 crates/nu-cli/src/repl.rs                     | 74 ++++++++++++++++---
 .../src/sample_config/default_config.nu       |  2 +-
 3 files changed, 70 insertions(+), 11 deletions(-)

diff --git a/crates/nu-cli/src/prompt_update.rs b/crates/nu-cli/src/prompt_update.rs
index 0c24b8282a..5765755ac4 100644
--- 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=";
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 1cb6f005ef..0fd23b76d0 100644
--- 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,
 };
@@ -131,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);
@@ -452,14 +472,19 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
 
     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
@@ -470,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(
@@ -531,7 +556,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
             // 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);
@@ -577,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,
@@ -597,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();
@@ -993,7 +1023,12 @@ fn run_shell_integration_osc9_9(engine_state: &EngineState, stack: &mut Stack, u
     }
 }
 
-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)
@@ -1013,6 +1048,27 @@ fn run_shell_integration_osc633(engine_state: &EngineState, stack: &mut Stack, u
                 start_time,
                 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
+            ));
         }
     }
 }
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index b807244cee..469fcd91ba 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -255,7 +255,7 @@ $env.config = {
         # 633;B - Mark prompt end
         # 633;C - Mark pre-execution
         # 633;D;exit - Mark execution finished with exit code
-        # 633;E - NOT IMPLEMENTED - Explicitly set the command line with an optional nonce
+        # 633;E - Explicitly set the command line with an optional nonce
         # 633;P;Cwd=<path> - Mark the current working directory and communicate it to the terminal
         # and also helps with the run recent menu in vscode
         osc633: true

From 5473def7ef525ab4cca0daaded7578a7fd9e6134 Mon Sep 17 00:00:00 2001
From: Piotr Kufel <qfel@users.noreply.github.com>
Date: Wed, 14 Aug 2024 22:44:01 -0700
Subject: [PATCH 0350/1072] Prefer process name over executable path (#13618)

# Description
Prefer process name over executable path. This in practice causes the
`name` column to use just the base executable name.

Also set start_time to nothing on error, because why not.

# User-Facing Changes

Before:

> /opt/google/chrome/chrome

After:

> chrome

Also picks up changes due to `echo test-proc > /proc/$$/comm`.

# Tests + Formatting

No new coverage.
---
 crates/nu-command/src/system/ps.rs | 17 ++++++++---------
 crates/nu-system/src/linux.rs      | 14 +++++++++-----
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/crates/nu-command/src/system/ps.rs b/crates/nu-command/src/system/ps.rs
index 859575abbd..02bcabe130 100644
--- a/crates/nu-command/src/system/ps.rs
+++ b/crates/nu-command/src/system/ps.rs
@@ -115,12 +115,13 @@ fn run_ps(
                         help: None,
                         inner: vec![],
                     })?;
-                // If we can't get the start time, just use the current time
-                let proc_start = proc_stat
-                    .starttime()
-                    .get()
-                    .unwrap_or_else(|_| chrono::Local::now());
-                record.push("start_time", Value::date(proc_start.into(), span));
+                record.push(
+                    "start_time",
+                    match proc_stat.starttime().get() {
+                        Ok(ts) => Value::date(ts.into(), span),
+                        Err(_) => Value::nothing(span),
+                    },
+                );
                 record.push("user_id", Value::int(proc.curr_proc.owner() as i64, span));
                 // These work and may be helpful, but it just seemed crowded
                 // record.push("group_id", Value::int(proc_stat.pgrp as i64, span));
@@ -180,7 +181,5 @@ fn run_ps(
         output.push(Value::record(record, span));
     }
 
-    Ok(output
-        .into_iter()
-        .into_pipeline_data(span, engine_state.signals().clone()))
+    Ok(output.into_pipeline_data(span, engine_state.signals().clone()))
 }
diff --git a/crates/nu-system/src/linux.rs b/crates/nu-system/src/linux.rs
index 1523584537..14229b8fac 100644
--- a/crates/nu-system/src/linux.rs
+++ b/crates/nu-system/src/linux.rs
@@ -142,6 +142,10 @@ impl ProcessInfo {
 
     /// Name of command
     pub fn name(&self) -> String {
+        if let Some(name) = self.comm() {
+            return name;
+        }
+        // Fall back in case /proc/<pid>/stat source is not available.
         if let Ok(mut cmd) = self.curr_proc.cmdline() {
             if let Some(name) = cmd.first_mut() {
                 // Take over the first element and return it without extra allocations
@@ -149,7 +153,7 @@ impl ProcessInfo {
                 return std::mem::take(name);
             }
         }
-        self.comm()
+        String::new()
     }
 
     /// Full name of command, with arguments
@@ -159,12 +163,12 @@ impl ProcessInfo {
     // TODO: Maybe rename this to display_command and add escaping compatible with nushell?
     pub fn command(&self) -> String {
         if let Ok(cmd) = self.curr_proc.cmdline() {
-            // TODO: When can it successfully return empty?
+            // Things like kworker/0:0 still have the cmdline file in proc, even though it's empty.
             if !cmd.is_empty() {
                 return cmd.join(" ").replace(['\n', '\t'], " ");
             }
         }
-        self.comm()
+        self.comm().unwrap_or_default()
     }
 
     pub fn cwd(&self) -> String {
@@ -227,7 +231,7 @@ impl ProcessInfo {
         self.curr_proc.stat().map(|p| p.vsize).unwrap_or_default()
     }
 
-    fn comm(&self) -> String {
-        self.curr_proc.stat().map(|st| st.comm).unwrap_or_default()
+    fn comm(&self) -> Option<String> {
+        self.curr_proc.stat().map(|st| st.comm).ok()
     }
 }

From a80273bd7b47b57ccee836c9a5ab924337765300 Mon Sep 17 00:00:00 2001
From: Bruce Weirdan <weirdan@gmail.com>
Date: Thu, 15 Aug 2024 19:25:50 +0200
Subject: [PATCH 0351/1072] Drop unused `fs_extra` and `hamcrest2` dependencies
 (#13628)

Fixes nushell/nushell#7995

# Description

This dependency is no longer used by nushell itself.

# User-Facing Changes

None.

# Tests + Formatting

Pased.

# After Submitting

None.
---
 Cargo.lock                   | 1 -
 Cargo.toml                   | 2 --
 crates/nu-command/Cargo.toml | 1 -
 3 files changed, 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b3fba6ee32..dcb6e609a5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3075,7 +3075,6 @@ dependencies = [
  "fancy-regex",
  "filesize",
  "filetime",
- "fs_extra",
  "human-date-parser",
  "indexmap",
  "indicatif",
diff --git a/Cargo.toml b/Cargo.toml
index 9dd7e88236..8b1a971b76 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -90,9 +90,7 @@ 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.4"
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 475f595ef5..ac9bada555 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -50,7 +50,6 @@ encoding_rs = { workspace = true }
 fancy-regex = { workspace = true }
 filesize = { workspace = true }
 filetime = { workspace = true }
-fs_extra = { workspace = true }
 human-date-parser = { workspace = true }
 indexmap = { workspace = true }
 indicatif = { workspace = true }

From 621fb25670746c2666db6be11f141c533d532a4b Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 15 Aug 2024 14:03:13 -0500
Subject: [PATCH 0352/1072] update to latest reedline f2b4 (#13629)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

Update to the latest reedline comment. BTW `f2b4` sounds like a new star
wars droid. 😆
---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index dcb6e609a5..2aff1856e8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5052,7 +5052,7 @@ dependencies = [
 [[package]]
 name = "reedline"
 version = "0.33.0"
-source = "git+https://github.com/nushell/reedline?branch=main#919292e40fd417e3da882692021961b444150c59"
+source = "git+https://github.com/nushell/reedline?branch=main#f2b414c678c54c02b2e8ecd9351aa6cd108beded"
 dependencies = [
  "arboard",
  "chrono",

From 7e9d32d64e1de72246eb3236ba2ef8353112f5f0 Mon Sep 17 00:00:00 2001
From: Bruce Weirdan <weirdan@gmail.com>
Date: Thu, 15 Aug 2024 23:57:25 +0200
Subject: [PATCH 0353/1072] Drop outdated `touch -d` example (#13631)

Fixes nushell/nushell#8723

# Description

The example was showing the flag that no longer exists.

# User-Facing Changes

Help no longer shows the example with `-d` flag.

# Tests + Formatting

I trust in CI.

# After Submitting

Nothing.
---
 crates/nu-command/src/filesystem/touch.rs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/crates/nu-command/src/filesystem/touch.rs b/crates/nu-command/src/filesystem/touch.rs
index 2a1e128b04..a3e5bc40f1 100644
--- a/crates/nu-command/src/filesystem/touch.rs
+++ b/crates/nu-command/src/filesystem/touch.rs
@@ -179,11 +179,6 @@ impl Command for Touch {
                 example: "touch -m fixture.json",
                 result: None,
             },
-            Example {
-                description: "Changes the last modified time of files a, b and c to a date",
-                example: r#"touch -m -d "yesterday" a b c"#,
-                result: None,
-            },
             Example {
                 description: r#"Changes the last modified time of file d and e to "fixture.json"'s last modified time"#,
                 example: r#"touch -m -r fixture.json d e"#,

From b63c3514c4a49503d19ca7b7bfda401f4ac8689f Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Mon, 19 Aug 2024 02:12:45 -0700
Subject: [PATCH 0354/1072] Fix clippy lints (#13645)

---
 crates/nu_plugin_formats/src/from/plist.rs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/crates/nu_plugin_formats/src/from/plist.rs b/crates/nu_plugin_formats/src/from/plist.rs
index 9894879955..c98b6ea58d 100644
--- a/crates/nu_plugin_formats/src/from/plist.rs
+++ b/crates/nu_plugin_formats/src/from/plist.rs
@@ -150,9 +150,9 @@ mod test {
 
     #[test]
     fn test_convert_real() {
-        let plist_val = PlistValue::Real(3.14);
+        let plist_val = PlistValue::Real(3.5);
         let result = convert_plist_value(&plist_val, Span::test_data());
-        assert_eq!(result, Ok(NuValue::float(3.14, Span::test_data())));
+        assert_eq!(result, Ok(NuValue::float(3.5, Span::test_data())));
     }
 
     #[test]
@@ -216,9 +216,10 @@ mod test {
 
     #[test]
     fn test_convert_array() {
-        let mut arr = Vec::new();
-        arr.push(PlistValue::String("a".to_string()));
-        arr.push(PlistValue::String("b".to_string()));
+        let arr = vec![
+            PlistValue::String("a".into()),
+            PlistValue::String("b".into()),
+        ];
         let nu_arr = convert_array(&arr, Span::test_data()).unwrap();
         assert_eq!(
             nu_arr,

From d667b3c0bcbdf90d28324a231b034a4939d6499b Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Tue, 20 Aug 2024 16:28:19 -0700
Subject: [PATCH 0355/1072] bumped version number to 0.97 (#13655)

---
 Cargo.lock                                    | 86 ++++++++++---------
 Cargo.toml                                    | 42 ++++-----
 crates/nu-cli/Cargo.toml                      | 24 +++---
 crates/nu-cmd-base/Cargo.toml                 | 10 +--
 crates/nu-cmd-extra/Cargo.toml                | 22 ++---
 crates/nu-cmd-lang/Cargo.toml                 | 10 +--
 crates/nu-cmd-plugin/Cargo.toml               | 10 +--
 crates/nu-color-config/Cargo.toml             | 10 +--
 crates/nu-command/Cargo.toml                  | 36 ++++----
 crates/nu-derive-value/Cargo.toml             |  2 +-
 crates/nu-engine/Cargo.toml                   | 12 +--
 crates/nu-explore/Cargo.toml                  | 18 ++--
 crates/nu-glob/Cargo.toml                     |  2 +-
 crates/nu-json/Cargo.toml                     |  6 +-
 crates/nu-lsp/Cargo.toml                      | 14 +--
 crates/nu-parser/Cargo.toml                   | 10 +--
 crates/nu-path/Cargo.toml                     |  2 +-
 crates/nu-plugin-core/Cargo.toml              |  6 +-
 crates/nu-plugin-engine/Cargo.toml            | 14 +--
 crates/nu-plugin-protocol/Cargo.toml          |  6 +-
 crates/nu-plugin-test-support/Cargo.toml      | 18 ++--
 crates/nu-plugin/Cargo.toml                   | 12 +--
 crates/nu-pretty-hex/Cargo.toml               |  2 +-
 crates/nu-protocol/Cargo.toml                 | 12 +--
 crates/nu-std/Cargo.toml                      |  8 +-
 crates/nu-system/Cargo.toml                   |  2 +-
 crates/nu-table/Cargo.toml                    | 12 +--
 crates/nu-term-grid/Cargo.toml                |  4 +-
 crates/nu-test-support/Cargo.toml             |  8 +-
 crates/nu-utils/Cargo.toml                    |  2 +-
 .../src/sample_config/default_config.nu       |  4 +-
 .../nu-utils/src/sample_config/default_env.nu |  2 +-
 crates/nu_plugin_custom_values/Cargo.toml     |  6 +-
 crates/nu_plugin_example/Cargo.toml           | 10 +--
 crates/nu_plugin_formats/Cargo.toml           |  8 +-
 crates/nu_plugin_gstat/Cargo.toml             |  6 +-
 crates/nu_plugin_inc/Cargo.toml               |  6 +-
 .../nu_plugin_nu_example.nu                   |  2 +-
 crates/nu_plugin_polars/Cargo.toml            | 22 ++---
 .../nu_plugin_python_example.py               |  2 +-
 crates/nu_plugin_query/Cargo.toml             |  6 +-
 crates/nu_plugin_stress_internals/Cargo.toml  |  2 +-
 crates/nuon/Cargo.toml                        |  8 +-
 43 files changed, 256 insertions(+), 250 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2aff1856e8..f7499346a1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2403,7 +2403,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d"
 dependencies = [
  "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
@@ -2889,7 +2889,7 @@ dependencies = [
 
 [[package]]
 name = "nu"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "assert_cmd",
  "crossterm",
@@ -2944,7 +2944,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cli"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "chrono",
  "crossterm",
@@ -2979,7 +2979,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-base"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "indexmap",
  "miette",
@@ -2991,7 +2991,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-extra"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "fancy-regex",
  "heck 0.5.0",
@@ -3016,7 +3016,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-lang"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "itertools 0.12.1",
  "nu-engine",
@@ -3028,7 +3028,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-plugin"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "itertools 0.12.1",
  "nu-engine",
@@ -3039,7 +3039,7 @@ dependencies = [
 
 [[package]]
 name = "nu-color-config"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "nu-ansi-term",
  "nu-engine",
@@ -3051,7 +3051,7 @@ dependencies = [
 
 [[package]]
 name = "nu-command"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "alphanumeric-sort",
  "base64 0.22.1",
@@ -3161,7 +3161,7 @@ dependencies = [
 
 [[package]]
 name = "nu-derive-value"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "convert_case",
  "proc-macro-error",
@@ -3172,7 +3172,7 @@ dependencies = [
 
 [[package]]
 name = "nu-engine"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "log",
  "nu-glob",
@@ -3184,7 +3184,7 @@ dependencies = [
 
 [[package]]
 name = "nu-explore"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "ansi-str",
  "anyhow",
@@ -3209,14 +3209,14 @@ dependencies = [
 
 [[package]]
 name = "nu-glob"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "doc-comment",
 ]
 
 [[package]]
 name = "nu-json"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "fancy-regex",
  "linked-hash-map",
@@ -3229,7 +3229,7 @@ dependencies = [
 
 [[package]]
 name = "nu-lsp"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "assert-json-diff",
  "crossbeam-channel",
@@ -3250,7 +3250,7 @@ dependencies = [
 
 [[package]]
 name = "nu-parser"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "bytesize",
  "chrono",
@@ -3266,7 +3266,7 @@ dependencies = [
 
 [[package]]
 name = "nu-path"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "dirs",
  "omnipath",
@@ -3275,7 +3275,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "log",
  "nix",
@@ -3291,7 +3291,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-core"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "interprocess",
  "log",
@@ -3305,7 +3305,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-engine"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "log",
  "nu-engine",
@@ -3321,7 +3321,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-protocol"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "bincode",
  "nu-protocol",
@@ -3333,7 +3333,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-test-support"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "nu-ansi-term",
  "nu-cmd-lang",
@@ -3351,7 +3351,7 @@ dependencies = [
 
 [[package]]
 name = "nu-pretty-hex"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "heapless",
  "nu-ansi-term",
@@ -3360,7 +3360,7 @@ dependencies = [
 
 [[package]]
 name = "nu-protocol"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "brotli",
  "byte-unit",
@@ -3397,7 +3397,7 @@ dependencies = [
 
 [[package]]
 name = "nu-std"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "log",
  "miette",
@@ -3408,7 +3408,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "chrono",
  "itertools 0.12.1",
@@ -3426,7 +3426,7 @@ dependencies = [
 
 [[package]]
 name = "nu-table"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "fancy-regex",
  "nu-ansi-term",
@@ -3440,7 +3440,7 @@ dependencies = [
 
 [[package]]
 name = "nu-term-grid"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "nu-utils",
  "unicode-width",
@@ -3448,7 +3448,7 @@ dependencies = [
 
 [[package]]
 name = "nu-test-support"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -3460,7 +3460,7 @@ dependencies = [
 
 [[package]]
 name = "nu-utils"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "crossterm_winapi",
  "log",
@@ -3486,7 +3486,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_example"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "nu-cmd-lang",
  "nu-plugin",
@@ -3496,7 +3496,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_formats"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "chrono",
  "eml-parser",
@@ -3511,7 +3511,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_gstat"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "git2",
  "nu-plugin",
@@ -3520,7 +3520,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_inc"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -3529,7 +3529,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_polars"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "chrono",
  "chrono-tz 0.9.0",
@@ -3563,7 +3563,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_query"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "gjson",
  "nu-plugin",
@@ -3578,7 +3578,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_stress_internals"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "interprocess",
  "serde",
@@ -3704,7 +3704,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "nuon"
-version = "0.96.2"
+version = "0.97.0"
 dependencies = [
  "chrono",
  "fancy-regex",
@@ -5051,8 +5051,9 @@ dependencies = [
 
 [[package]]
 name = "reedline"
-version = "0.33.0"
-source = "git+https://github.com/nushell/reedline?branch=main#f2b414c678c54c02b2e8ecd9351aa6cd108beded"
+version = "0.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc271368d0d3f395745b40fababc0c9061f3fc2978189a8bc76f889e47255b01"
 dependencies = [
  "arboard",
  "chrono",
@@ -7420,3 +7421,8 @@ dependencies = [
  "cc",
  "pkg-config",
 ]
+
+[[patch.unused]]
+name = "reedline"
+version = "0.33.0"
+source = "git+https://github.com/nushell/reedline?branch=main#f2b414c678c54c02b2e8ecd9351aa6cd108beded"
diff --git a/Cargo.toml b/Cargo.toml
index 8b1a971b76..f0093b443d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
 rust-version = "1.78.0"
-version = "0.96.2"
+version = "0.97.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -137,7 +137,7 @@ quote = "1.0"
 rand = "0.8"
 ratatui = "0.26"
 rayon = "1.10"
-reedline = "0.33.0"
+reedline = "0.34.0"
 regex = "1.9.5"
 rmp = "0.8"
 rmp-serde = "1.3"
@@ -182,22 +182,22 @@ windows-sys = "0.48"
 winreg = "0.52"
 
 [dependencies]
-nu-cli = { path = "./crates/nu-cli", version = "0.96.2" }
-nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.96.2" }
-nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.96.2" }
-nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.96.2", optional = true }
-nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.96.2" }
-nu-command = { path = "./crates/nu-command", version = "0.96.2" }
-nu-engine = { path = "./crates/nu-engine", version = "0.96.2" }
-nu-explore = { path = "./crates/nu-explore", version = "0.96.2" }
-nu-lsp = { path = "./crates/nu-lsp/", version = "0.96.2" }
-nu-parser = { path = "./crates/nu-parser", version = "0.96.2" }
-nu-path = { path = "./crates/nu-path", version = "0.96.2" }
-nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.96.2" }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.96.2" }
-nu-std = { path = "./crates/nu-std", version = "0.96.2" }
-nu-system = { path = "./crates/nu-system", version = "0.96.2" }
-nu-utils = { path = "./crates/nu-utils", version = "0.96.2" }
+nu-cli = { path = "./crates/nu-cli", version = "0.97.0" }
+nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.97.0" }
+nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.97.0" }
+nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.97.0", optional = true }
+nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.97.0" }
+nu-command = { path = "./crates/nu-command", version = "0.97.0" }
+nu-engine = { path = "./crates/nu-engine", version = "0.97.0" }
+nu-explore = { path = "./crates/nu-explore", version = "0.97.0" }
+nu-lsp = { path = "./crates/nu-lsp/", version = "0.97.0" }
+nu-parser = { path = "./crates/nu-parser", version = "0.97.0" }
+nu-path = { path = "./crates/nu-path", version = "0.97.0" }
+nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.97.0" }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.97.0" }
+nu-std = { path = "./crates/nu-std", version = "0.97.0" }
+nu-system = { path = "./crates/nu-system", version = "0.97.0" }
+nu-utils = { path = "./crates/nu-utils", version = "0.97.0" }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
 crossterm = { workspace = true }
@@ -227,9 +227,9 @@ nix = { workspace = true, default-features = false, features = [
 ] }
 
 [dev-dependencies]
-nu-test-support = { path = "./crates/nu-test-support", version = "0.96.2" }
-nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.96.2" }
-nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.96.2" }
+nu-test-support = { path = "./crates/nu-test-support", version = "0.97.0" }
+nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.97.0" }
+nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.97.0" }
 assert_cmd = "2.0"
 dirs = { workspace = true }
 tango-bench = "0.5"
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 54af510916..1beeee70b1 100644
--- 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.96.2"
+version = "0.97.0"
 
 [lib]
 bench = false
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.2" }
-nu-command = { path = "../nu-command", version = "0.96.2" }
-nu-test-support = { path = "../nu-test-support", version = "0.96.2" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.0" }
+nu-command = { path = "../nu-command", version = "0.97.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.96.2" }
-nu-engine = { path = "../nu-engine", version = "0.96.2" }
-nu-path = { path = "../nu-path", version = "0.96.2" }
-nu-parser = { path = "../nu-parser", version = "0.96.2" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.96.2", optional = true }
-nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
-nu-utils = { path = "../nu-utils", version = "0.96.2" }
-nu-color-config = { path = "../nu-color-config", version = "0.96.2" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.97.0" }
+nu-engine = { path = "../nu-engine", version = "0.97.0" }
+nu-path = { path = "../nu-path", version = "0.97.0" }
+nu-parser = { path = "../nu-parser", version = "0.97.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.97.0", optional = true }
+nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
+nu-utils = { path = "../nu-utils", version = "0.97.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.97.0" }
 nu-ansi-term = { workspace = true }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
diff --git a/crates/nu-cmd-base/Cargo.toml b/crates/nu-cmd-base/Cargo.toml
index 568633d481..bfecccdf69 100644
--- 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.96.2"
+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.96.2" }
-nu-parser = { path = "../nu-parser", version = "0.96.2" }
-nu-path = { path = "../nu-path", version = "0.96.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
+nu-engine = { path = "../nu-engine", version = "0.97.0" }
+nu-parser = { path = "../nu-parser", version = "0.97.0" }
+nu-path = { path = "../nu-path", version = "0.97.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
 
 indexmap = { workspace = true }
 miette = { workspace = true }
diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml
index 4e76ea679b..f4b488f19a 100644
--- 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.96.2"
+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.96.2"
 bench = false
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.96.2" }
-nu-engine = { path = "../nu-engine", version = "0.96.2" }
-nu-json = { version = "0.96.2", path = "../nu-json" }
-nu-parser = { path = "../nu-parser", version = "0.96.2" }
-nu-pretty-hex = { version = "0.96.2", path = "../nu-pretty-hex" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
-nu-utils = { path = "../nu-utils", version = "0.96.2" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.97.0" }
+nu-engine = { path = "../nu-engine", version = "0.97.0" }
+nu-json = { version = "0.97.0", path = "../nu-json" }
+nu-parser = { path = "../nu-parser", version = "0.97.0" }
+nu-pretty-hex = { version = "0.97.0", path = "../nu-pretty-hex" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.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.96.2" }
-nu-command = { path = "../nu-command", version = "0.96.2" }
-nu-test-support = { path = "../nu-test-support", version = "0.96.2" }
\ No newline at end of file
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.0" }
+nu-command = { path = "../nu-command", version = "0.97.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.97.0" }
\ No newline at end of file
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index a48869231d..cc2da71a78 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -6,16 +6,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-lang"
 edition = "2021"
 license = "MIT"
 name = "nu-cmd-lang"
-version = "0.96.2"
+version = "0.97.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.96.2" }
-nu-parser = { path = "../nu-parser", version = "0.96.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
-nu-utils = { path = "../nu-utils", version = "0.96.2" }
+nu-engine = { path = "../nu-engine", version = "0.97.0" }
+nu-parser = { path = "../nu-parser", version = "0.97.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
+nu-utils = { path = "../nu-utils", version = "0.97.0" }
 
 itertools = { workspace = true }
 shadow-rs = { version = "0.31", default-features = false }
diff --git a/crates/nu-cmd-plugin/Cargo.toml b/crates/nu-cmd-plugin/Cargo.toml
index 490e61a755..e7f078f487 100644
--- a/crates/nu-cmd-plugin/Cargo.toml
+++ b/crates/nu-cmd-plugin/Cargo.toml
@@ -5,15 +5,15 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-plugin"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-plugin"
-version = "0.96.2"
+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.96.2" }
-nu-path = { path = "../nu-path", version = "0.96.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.2", features = ["plugin"] }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.96.2" }
+nu-engine = { path = "../nu-engine", version = "0.97.0" }
+nu-path = { path = "../nu-path", version = "0.97.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.0", features = ["plugin"] }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.97.0" }
 
 itertools = { workspace = true }
 
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index 87f282e752..8083f4c42b 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -5,18 +5,18 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-color-confi
 edition = "2021"
 license = "MIT"
 name = "nu-color-config"
-version = "0.96.2"
+version = "0.97.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
-nu-engine = { path = "../nu-engine", version = "0.96.2" }
-nu-json = { path = "../nu-json", version = "0.96.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
+nu-engine = { path = "../nu-engine", version = "0.97.0" }
+nu-json = { path = "../nu-json", version = "0.97.0" }
 nu-ansi-term = { workspace = true }
 
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.96.2" }
\ No newline at end of file
+nu-test-support = { path = "../nu-test-support", version = "0.97.0" }
\ No newline at end of file
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index ac9bada555..602fbf21ef 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-command"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
-version = "0.96.2"
+version = "0.97.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,21 +13,21 @@ version = "0.96.2"
 bench = false
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.96.2" }
-nu-color-config = { path = "../nu-color-config", version = "0.96.2" }
-nu-engine = { path = "../nu-engine", version = "0.96.2" }
-nu-glob = { path = "../nu-glob", version = "0.96.2" }
-nu-json = { path = "../nu-json", version = "0.96.2" }
-nu-parser = { path = "../nu-parser", version = "0.96.2" }
-nu-path = { path = "../nu-path", version = "0.96.2" }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.96.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
-nu-system = { path = "../nu-system", version = "0.96.2" }
-nu-table = { path = "../nu-table", version = "0.96.2" }
-nu-term-grid = { path = "../nu-term-grid", version = "0.96.2" }
-nu-utils = { path = "../nu-utils", version = "0.96.2" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.97.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.97.0" }
+nu-engine = { path = "../nu-engine", version = "0.97.0" }
+nu-glob = { path = "../nu-glob", version = "0.97.0" }
+nu-json = { path = "../nu-json", version = "0.97.0" }
+nu-parser = { path = "../nu-parser", version = "0.97.0" }
+nu-path = { path = "../nu-path", version = "0.97.0" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.97.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
+nu-system = { path = "../nu-system", version = "0.97.0" }
+nu-table = { path = "../nu-table", version = "0.97.0" }
+nu-term-grid = { path = "../nu-term-grid", version = "0.97.0" }
+nu-utils = { path = "../nu-utils", version = "0.97.0" }
 nu-ansi-term = { workspace = true }
-nuon = { path = "../nuon", version = "0.96.2" }
+nuon = { path = "../nuon", version = "0.97.0" }
 
 alphanumeric-sort = { workspace = true }
 base64 = { workspace = true }
@@ -137,8 +137,8 @@ sqlite = ["rusqlite"]
 trash-support = ["trash"]
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.2" }
-nu-test-support = { path = "../nu-test-support", version = "0.96.2" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.97.0" }
 
 dirs = { workspace = true }
 mockito = { workspace = true, default-features = false }
@@ -146,4 +146,4 @@ quickcheck = { workspace = true }
 quickcheck_macros = { workspace = true }
 rstest = { workspace = true, default-features = false }
 pretty_assertions = { workspace = true }
-tempfile = { workspace = true }
+tempfile = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-derive-value/Cargo.toml b/crates/nu-derive-value/Cargo.toml
index 0e76564308..e1d45205c2 100644
--- a/crates/nu-derive-value/Cargo.toml
+++ b/crates/nu-derive-value/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-derive-value"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-derive-value"
-version = "0.96.2"
+version = "0.97.0"
 
 [lib]
 proc-macro = true
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index 2324eb5676..c63c476d51 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -5,18 +5,18 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-engine"
 edition = "2021"
 license = "MIT"
 name = "nu-engine"
-version = "0.96.2"
+version = "0.97.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.96.2" }
-nu-path = { path = "../nu-path", version = "0.96.2" }
-nu-glob = { path = "../nu-glob", version = "0.96.2" }
-nu-utils = { path = "../nu-utils", version = "0.96.2" }
+nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.97.0" }
+nu-path = { path = "../nu-path", version = "0.97.0" }
+nu-glob = { path = "../nu-glob", version = "0.97.0" }
+nu-utils = { path = "../nu-utils", version = "0.97.0" }
 log = { workspace = true }
 terminal_size = { workspace = true }
 
 [features]
-plugin = []
+plugin = []
\ No newline at end of file
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index 1d0c081760..e285fbb3dc 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -5,21 +5,21 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-explore"
 edition = "2021"
 license = "MIT"
 name = "nu-explore"
-version = "0.96.2"
+version = "0.97.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
-nu-parser = { path = "../nu-parser", version = "0.96.2" }
-nu-color-config = { path = "../nu-color-config", version = "0.96.2" }
-nu-engine = { path = "../nu-engine", version = "0.96.2" }
-nu-table = { path = "../nu-table", version = "0.96.2" }
-nu-json = { path = "../nu-json", version = "0.96.2" }
-nu-utils = { path = "../nu-utils", version = "0.96.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
+nu-parser = { path = "../nu-parser", version = "0.97.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.97.0" }
+nu-engine = { path = "../nu-engine", version = "0.97.0" }
+nu-table = { path = "../nu-table", version = "0.97.0" }
+nu-json = { path = "../nu-json", version = "0.97.0" }
+nu-utils = { path = "../nu-utils", version = "0.97.0" }
 nu-ansi-term = { workspace = true }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.96.2" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.97.0" }
 
 anyhow = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-glob/Cargo.toml b/crates/nu-glob/Cargo.toml
index 31d88e841e..a73acfb124 100644
--- a/crates/nu-glob/Cargo.toml
+++ b/crates/nu-glob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-glob"
-version = "0.96.2"
+version = "0.97.0"
 authors = ["The Nushell Project Developers", "The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 description = """
diff --git a/crates/nu-json/Cargo.toml b/crates/nu-json/Cargo.toml
index 9cfc35a1c8..672791ceb4 100644
--- a/crates/nu-json/Cargo.toml
+++ b/crates/nu-json/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-json"
 edition = "2021"
 license = "MIT"
 name = "nu-json"
-version = "0.96.2"
+version = "0.97.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -26,7 +26,7 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.96.2" }
-nu-path = { path = "../nu-path", version = "0.96.2" }
+nu-test-support = { path = "../nu-test-support", version = "0.97.0" }
+nu-path = { path = "../nu-path", version = "0.97.0" }
 serde_json = "1.0"
 fancy-regex = "0.13.0"
\ No newline at end of file
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index 46a9276126..700b2f7b7d 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -3,14 +3,14 @@ authors = ["The Nushell Project Developers"]
 description = "Nushell's integrated LSP server"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-lsp"
 name = "nu-lsp"
-version = "0.96.2"
+version = "0.97.0"
 edition = "2021"
 license = "MIT"
 
 [dependencies]
-nu-cli = { path = "../nu-cli", version = "0.96.2" }
-nu-parser = { path = "../nu-parser", version = "0.96.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
+nu-cli = { path = "../nu-cli", version = "0.97.0" }
+nu-parser = { path = "../nu-parser", version = "0.97.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
 
 reedline = { workspace = true }
 
@@ -23,8 +23,8 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.2" }
-nu-command = { path = "../nu-command", version = "0.96.2" }
-nu-test-support = { path = "../nu-test-support", version = "0.96.2" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.0" }
+nu-command = { path = "../nu-command", version = "0.97.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.97.0" }
 
 assert-json-diff = "2.0"
\ No newline at end of file
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index d929deef08..eea0dbf9b9 100644
--- a/crates/nu-parser/Cargo.toml
+++ b/crates/nu-parser/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-parser"
 edition = "2021"
 license = "MIT"
 name = "nu-parser"
-version = "0.96.2"
+version = "0.97.0"
 exclude = ["/fuzz"]
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.96.2" }
-nu-path = { path = "../nu-path", version = "0.96.2" }
-nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.96.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
+nu-engine = { path = "../nu-engine", version = "0.97.0" }
+nu-path = { path = "../nu-path", version = "0.97.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.97.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
 
 bytesize = { workspace = true }
 chrono = { default-features = false, features = ['std'], workspace = true }
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index c1e368aa7e..928d7c6094 100644
--- a/crates/nu-path/Cargo.toml
+++ b/crates/nu-path/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-path"
 edition = "2021"
 license = "MIT"
 name = "nu-path"
-version = "0.96.2"
+version = "0.97.0"
 exclude = ["/fuzz"]
 
 [lib]
diff --git a/crates/nu-plugin-core/Cargo.toml b/crates/nu-plugin-core/Cargo.toml
index 0bdafbbdf5..4094364906 100644
--- a/crates/nu-plugin-core/Cargo.toml
+++ b/crates/nu-plugin-core/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-core
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-core"
-version = "0.96.2"
+version = "0.97.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.96.2", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.97.0", default-features = false }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true }
diff --git a/crates/nu-plugin-engine/Cargo.toml b/crates/nu-plugin-engine/Cargo.toml
index 0a58c1af72..46d10f481b 100644
--- a/crates/nu-plugin-engine/Cargo.toml
+++ b/crates/nu-plugin-engine/Cargo.toml
@@ -5,18 +5,18 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-engi
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-engine"
-version = "0.96.2"
+version = "0.97.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.96.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
-nu-system = { path = "../nu-system", version = "0.96.2" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.96.2" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.96.2", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.96.2" }
+nu-engine = { path = "../nu-engine", version = "0.97.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
+nu-system = { path = "../nu-system", version = "0.97.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.97.0" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.97.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.97.0" }
 
 serde = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-plugin-protocol/Cargo.toml b/crates/nu-plugin-protocol/Cargo.toml
index 60226f3674..d0b171852e 100644
--- a/crates/nu-plugin-protocol/Cargo.toml
+++ b/crates/nu-plugin-protocol/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-prot
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-protocol"
-version = "0.96.2"
+version = "0.97.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.96.2", features = ["plugin"] }
-nu-utils = { path = "../nu-utils", version = "0.96.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.0", features = ["plugin"] }
+nu-utils = { path = "../nu-utils", version = "0.97.0" }
 
 bincode = "1.3"
 serde = { workspace = true, features = ["derive"] }
diff --git a/crates/nu-plugin-test-support/Cargo.toml b/crates/nu-plugin-test-support/Cargo.toml
index 66c5146e6e..d9a0019d97 100644
--- a/crates/nu-plugin-test-support/Cargo.toml
+++ b/crates/nu-plugin-test-support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-plugin-test-support"
-version = "0.96.2"
+version = "0.97.0"
 edition = "2021"
 license = "MIT"
 description = "Testing support for Nushell plugins"
@@ -12,14 +12,14 @@ bench = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.96.2", features = ["plugin"] }
-nu-protocol = { path = "../nu-protocol", version = "0.96.2", features = ["plugin"] }
-nu-parser = { path = "../nu-parser", version = "0.96.2", features = ["plugin"] }
-nu-plugin = { path = "../nu-plugin", version = "0.96.2" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.96.2" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.96.2" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.96.2" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.2" }
+nu-engine = { path = "../nu-engine", version = "0.97.0", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.97.0", features = ["plugin"] }
+nu-parser = { path = "../nu-parser", version = "0.97.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.97.0" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.97.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.97.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.97.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.0" }
 nu-ansi-term = { workspace = true }
 similar = "2.6"
 
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index 80c9f74471..365d018f93 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin"
 edition = "2021"
 license = "MIT"
 name = "nu-plugin"
-version = "0.96.2"
+version = "0.97.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.96.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.96.2" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.96.2", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.96.2" }
+nu-engine = { path = "../nu-engine", version = "0.97.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.97.0" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.97.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.97.0" }
 
 log = { workspace = true }
 thiserror = "1.0"
diff --git a/crates/nu-pretty-hex/Cargo.toml b/crates/nu-pretty-hex/Cargo.toml
index bf018dcf38..da3431eac3 100644
--- a/crates/nu-pretty-hex/Cargo.toml
+++ b/crates/nu-pretty-hex/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-pretty-hex"
 edition = "2021"
 license = "MIT"
 name = "nu-pretty-hex"
-version = "0.96.2"
+version = "0.97.0"
 
 [lib]
 doctest = false
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 197131b3f4..78f2e6ce4a 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-protocol"
 edition = "2021"
 license = "MIT"
 name = "nu-protocol"
-version = "0.96.2"
+version = "0.97.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,10 +13,10 @@ version = "0.96.2"
 bench = false
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.96.2" }
-nu-path = { path = "../nu-path", version = "0.96.2" }
-nu-system = { path = "../nu-system", version = "0.96.2" }
-nu-derive-value = { path = "../nu-derive-value", version = "0.96.2" }
+nu-utils = { path = "../nu-utils", version = "0.97.0" }
+nu-path = { path = "../nu-path", version = "0.97.0" }
+nu-system = { path = "../nu-system", version = "0.97.0" }
+nu-derive-value = { path = "../nu-derive-value", version = "0.97.0" }
 
 brotli = { workspace = true, optional = true }
 byte-unit = { version = "5.1", features = [ "serde" ] }
@@ -53,7 +53,7 @@ plugin = [
 serde_json = { workspace = true }
 strum = "0.26"
 strum_macros = "0.26"
-nu-test-support = { path = "../nu-test-support", version = "0.96.2" }
+nu-test-support = { path = "../nu-test-support", version = "0.97.0" }
 pretty_assertions = { workspace = true }
 rstest = { workspace = true }
 tempfile = { workspace = true }
diff --git a/crates/nu-std/Cargo.toml b/crates/nu-std/Cargo.toml
index f69cdc9180..2650568d65 100644
--- a/crates/nu-std/Cargo.toml
+++ b/crates/nu-std/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-std"
 edition = "2021"
 license = "MIT"
 name = "nu-std"
-version = "0.96.2"
+version = "0.97.0"
 
 [dependencies]
-nu-parser = { version = "0.96.2", path = "../nu-parser" }
-nu-protocol = { version = "0.96.2", path = "../nu-protocol" }
-nu-engine = { version = "0.96.2", path = "../nu-engine" }
+nu-parser = { version = "0.97.0", path = "../nu-parser" }
+nu-protocol = { version = "0.97.0", path = "../nu-protocol" }
+nu-engine = { version = "0.97.0", path = "../nu-engine" }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
 
 log = "0.4"
\ No newline at end of file
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index 2059eb1c8c..3f6344252b 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["The Nushell Project Developers", "procs creators"]
 description = "Nushell system querying"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-system"
 name = "nu-system"
-version = "0.96.2"
+version = "0.97.0"
 edition = "2021"
 license = "MIT"
 
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index eafff13e81..79abb35db1 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -5,20 +5,20 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-table"
 edition = "2021"
 license = "MIT"
 name = "nu-table"
-version = "0.96.2"
+version = "0.97.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
-nu-utils = { path = "../nu-utils", version = "0.96.2" }
-nu-engine = { path = "../nu-engine", version = "0.96.2" }
-nu-color-config = { path = "../nu-color-config", version = "0.96.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
+nu-utils = { path = "../nu-utils", version = "0.97.0" }
+nu-engine = { path = "../nu-engine", version = "0.97.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.97.0" }
 nu-ansi-term = { workspace = true }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 tabled = { workspace = true, features = ["color"], default-features = false }
 
 [dev-dependencies]
-# nu-test-support = { path="../nu-test-support", version = "0.96.2"  }
\ No newline at end of file
+# nu-test-support = { path="../nu-test-support", version = "0.97.0"  }
\ No newline at end of file
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index a07740905c..2f0a0ff6b9 100644
--- a/crates/nu-term-grid/Cargo.toml
+++ b/crates/nu-term-grid/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-term-grid"
 edition = "2021"
 license = "MIT"
 name = "nu-term-grid"
-version = "0.96.2"
+version = "0.97.0"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.96.2" }
+nu-utils = { path = "../nu-utils", version = "0.97.0" }
 
 unicode-width = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml
index 25328f7c25..514d4dff60 100644
--- a/crates/nu-test-support/Cargo.toml
+++ b/crates/nu-test-support/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-test-suppor
 edition = "2021"
 license = "MIT"
 name = "nu-test-support"
-version = "0.96.2"
+version = "0.97.0"
 
 [lib]
 doctest = false
 bench = false
 
 [dependencies]
-nu-path = { path = "../nu-path", version = "0.96.2" }
-nu-glob = { path = "../nu-glob", version = "0.96.2" }
-nu-utils = { path = "../nu-utils", version = "0.96.2" }
+nu-path = { path = "../nu-path", version = "0.97.0" }
+nu-glob = { path = "../nu-glob", version = "0.97.0" }
+nu-utils = { path = "../nu-utils", version = "0.97.0" }
 
 num-format = { workspace = true }
 which = { workspace = true }
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index 72c02fb538..006fa12a3c 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-utils"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-utils"
-version = "0.96.2"
+version = "0.97.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index 469fcd91ba..fe8a278ffe 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -1,6 +1,6 @@
 # Nushell Config File
 #
-# version = "0.96.2"
+# version = "0.97.0"
 
 # For more information on defining custom themes, see
 # https://www.nushell.sh/book/coloring_and_theming.html
@@ -890,4 +890,4 @@ $env.config = {
             event: { edit: selectall }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/crates/nu-utils/src/sample_config/default_env.nu b/crates/nu-utils/src/sample_config/default_env.nu
index b43ab981cd..4b10e63cd6 100644
--- a/crates/nu-utils/src/sample_config/default_env.nu
+++ b/crates/nu-utils/src/sample_config/default_env.nu
@@ -1,6 +1,6 @@
 # Nushell Environment Config File
 #
-# version = "0.96.2"
+# version = "0.97.0"
 
 def create_left_prompt [] {
     let dir = match (do --ignore-shell-errors { $env.PWD | path relative-to $nu.home-path }) {
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index 03811f7fca..9f487a3c64 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -10,10 +10,10 @@ name = "nu_plugin_custom_values"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.96.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.2", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.97.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.0", features = ["plugin"] }
 serde = { workspace = true, default-features = false }
 typetag = "0.2"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.96.2" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.97.0" }
\ No newline at end of file
diff --git a/crates/nu_plugin_example/Cargo.toml b/crates/nu_plugin_example/Cargo.toml
index cdb5a727c9..2e7563bb69 100644
--- a/crates/nu_plugin_example/Cargo.toml
+++ b/crates/nu_plugin_example/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_exam
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_example"
-version = "0.96.2"
+version = "0.97.0"
 
 [[bin]]
 name = "nu_plugin_example"
@@ -15,9 +15,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.96.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.2", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.97.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.0", features = ["plugin"] }
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.96.2" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.2" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.97.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.0" }
\ No newline at end of file
diff --git a/crates/nu_plugin_formats/Cargo.toml b/crates/nu_plugin_formats/Cargo.toml
index f6ad84758f..dd2678d4a9 100644
--- a/crates/nu_plugin_formats/Cargo.toml
+++ b/crates/nu_plugin_formats/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_form
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_formats"
-version = "0.96.2"
+version = "0.97.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.96.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.2", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.97.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.0", features = ["plugin"] }
 
 indexmap = { workspace = true }
 eml-parser = "0.1"
@@ -20,4 +20,4 @@ plist = "1.7"
 chrono = "0.4"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.96.2" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.97.0" }
\ No newline at end of file
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index b53560473e..17c12fdc4c 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gsta
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_gstat"
-version = "0.96.2"
+version = "0.97.0"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_gstat"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.96.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
+nu-plugin = { path = "../nu-plugin", version = "0.97.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
 
 git2 = "0.19"
\ No newline at end of file
diff --git a/crates/nu_plugin_inc/Cargo.toml b/crates/nu_plugin_inc/Cargo.toml
index 6462f96c0c..ee0ce6e86f 100644
--- a/crates/nu_plugin_inc/Cargo.toml
+++ b/crates/nu_plugin_inc/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_inc"
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_inc"
-version = "0.96.2"
+version = "0.97.0"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_inc"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.96.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.2", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.97.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.0", features = ["plugin"] }
 
 semver = "1.0"
\ No newline at end of file
diff --git a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
index 3bbf5b965c..49593050e2 100755
--- a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
+++ b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
@@ -6,7 +6,7 @@
 # it also allows us to test the plugin interface with something manually implemented in a scripting
 # language without adding any extra dependencies to our tests.
 
-const NUSHELL_VERSION = "0.96.2"
+const NUSHELL_VERSION = "0.97.0"
 const PLUGIN_VERSION = "0.1.1" # bump if you change commands!
 
 def main [--stdio] {
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 936fa59896..bcdc45590b 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu_plugin_polars"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_polars"
-version = "0.96.2"
+version = "0.97.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -17,10 +17,10 @@ bench = false
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
-nu-plugin = { path = "../nu-plugin", version = "0.96.2" }
-nu-path = { path = "../nu-path", version = "0.96.2" }
-nu-utils = { path = "../nu-utils", version = "0.96.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
+nu-plugin = { path = "../nu-plugin", version = "0.97.0" }
+nu-path = { path = "../nu-path", version = "0.97.0" }
+nu-utils = { path = "../nu-utils", version = "0.97.0" }
 
 # Potential dependencies for extras
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
@@ -77,9 +77,9 @@ optional = false
 version = "0.41"
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.96.2" }
-nu-engine = { path = "../nu-engine", version = "0.96.2" }
-nu-parser = { path = "../nu-parser", version = "0.96.2" }
-nu-command = { path = "../nu-command", version = "0.96.2" }
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.96.2" }
-tempfile.workspace = true
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.0" }
+nu-engine = { path = "../nu-engine", version = "0.97.0" }
+nu-parser = { path = "../nu-parser", version = "0.97.0" }
+nu-command = { path = "../nu-command", version = "0.97.0" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.97.0" }
+tempfile.workspace = true
\ No newline at end of file
diff --git a/crates/nu_plugin_python/nu_plugin_python_example.py b/crates/nu_plugin_python/nu_plugin_python_example.py
index 55d3204a34..4a4b2a6632 100755
--- a/crates/nu_plugin_python/nu_plugin_python_example.py
+++ b/crates/nu_plugin_python/nu_plugin_python_example.py
@@ -27,7 +27,7 @@ import sys
 import json
 
 
-NUSHELL_VERSION = "0.96.2"
+NUSHELL_VERSION = "0.97.0"
 PLUGIN_VERSION = "0.1.1"  # bump if you change commands!
 
 
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index 23adaa74ee..f6f76e2c53 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_quer
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_query"
-version = "0.96.2"
+version = "0.97.0"
 
 [lib]
 doctest = false
@@ -16,8 +16,8 @@ name = "nu_plugin_query"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.96.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
+nu-plugin = { path = "../nu-plugin", version = "0.97.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
 
 gjson = "0.8"
 scraper = { default-features = false, version = "0.20" }
diff --git a/crates/nu_plugin_stress_internals/Cargo.toml b/crates/nu_plugin_stress_internals/Cargo.toml
index 5871246587..05ac139326 100644
--- a/crates/nu_plugin_stress_internals/Cargo.toml
+++ b/crates/nu_plugin_stress_internals/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_stre
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_stress_internals"
-version = "0.96.2"
+version = "0.97.0"
 
 [[bin]]
 name = "nu_plugin_stress_internals"
diff --git a/crates/nuon/Cargo.toml b/crates/nuon/Cargo.toml
index 296f3cc962..8fff48bb6b 100644
--- a/crates/nuon/Cargo.toml
+++ b/crates/nuon/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nuon"
 edition = "2021"
 license = "MIT"
 name = "nuon"
-version = "0.96.2"
+version = "0.97.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-parser = { path = "../nu-parser", version = "0.96.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.96.2" }
-nu-engine = { path = "../nu-engine", version = "0.96.2" }
+nu-parser = { path = "../nu-parser", version = "0.97.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
+nu-engine = { path = "../nu-engine", version = "0.97.0" }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 

From 34e7bd861ce3976c17e8d11010e13eccaec5ca45 Mon Sep 17 00:00:00 2001
From: Yash Thakur <45539777+ysthakur@users.noreply.github.com>
Date: Tue, 20 Aug 2024 22:35:13 -0400
Subject: [PATCH 0356/1072] Fix bug introduced by #13595 (#13658)

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

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

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

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

@devyn found that https://github.com/nushell/nushell/pull/13595, which
made ranges be type-checked at parse time, introduced a bug that caused
`../foo` to be parsed as a string rather than a command call. This was
caused by `parse_range` returning a `Some` despite there being parse
errors (`/foo` doesn't match `SyntaxShape::Number`). To go back to the
old behavior, `parse_range` now returns `None` anytime there's any parse
errors met while parsing the range.

Unfortunately, this means that something like `..$foo` will be parsed as
a string if `$foo` isn't defined and as a range if it is defined. That
was the behavior before #13595, and it should probably be fixed at some
point, but I'm just trying to quickly fix the bug.

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

Things should go back to the way they were before #13595, except the
type-checking stuff from that PR is still here.

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

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

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

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

Added a test. Reverted another test that tests that `0..<$day` is parsed
successfully as a string if the variable isn't defined.

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-parser/src/parser.rs        |  5 ++++
 crates/nu-parser/tests/test_parser.rs | 34 +++++++++++++++++----------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 742bd22644..33ecdadd3a 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -1594,6 +1594,7 @@ pub fn parse_number(working_set: &mut StateWorkingSet, span: Span) -> Expression
 
 pub fn parse_range(working_set: &mut StateWorkingSet, span: Span) -> Option<Expression> {
     trace!("parsing: range");
+    let starting_error_count = working_set.parse_errors.len();
 
     // Range follows the following syntax: [<from>][<next_operator><next>]<range_operator>[<to>]
     //   where <next_operator> is ".."
@@ -1715,6 +1716,10 @@ pub fn parse_range(working_set: &mut StateWorkingSet, span: Span) -> Option<Expr
         (None, span)
     };
 
+    if working_set.parse_errors.len() != starting_error_count {
+        return None;
+    }
+
     let operator = RangeOperator {
         inclusion,
         span: range_op_span,
diff --git a/crates/nu-parser/tests/test_parser.rs b/crates/nu-parser/tests/test_parser.rs
index 48ee9a7d9a..f72b52b433 100644
--- a/crates/nu-parser/tests/test_parser.rs
+++ b/crates/nu-parser/tests/test_parser.rs
@@ -1828,23 +1828,13 @@ mod range {
     }
 
     #[test]
-    fn vars_read_as_units() {
+    fn vars_not_read_as_units() {
         let engine_state = EngineState::new();
         let mut working_set = StateWorkingSet::new(&engine_state);
 
         let _ = parse(&mut working_set, None, b"0..<$day", true);
 
-        assert!(
-            working_set.parse_errors.len() == 1,
-            "Errors: {:?}",
-            working_set.parse_errors
-        );
-        let err = &working_set.parse_errors[0].to_string();
-        assert!(
-            err.contains("Variable not found"),
-            "Expected variable not found error, got {}",
-            err
-        );
+        assert!(working_set.parse_errors.is_empty());
     }
 
     #[rstest]
@@ -1878,6 +1868,26 @@ mod range {
             err
         );
     }
+
+    #[test]
+    fn dont_mess_with_external_calls() {
+        let engine_state = EngineState::new();
+        let mut working_set = StateWorkingSet::new(&engine_state);
+        working_set.add_decl(Box::new(ToCustom));
+
+        let result = parse(&mut working_set, None, b"../foo", true);
+
+        assert!(
+            working_set.parse_errors.is_empty(),
+            "Errors: {:?}",
+            working_set.parse_errors
+        );
+        let expr = &result.pipelines[0].elements[0].expr.expr;
+        assert!(
+            matches!(expr, Expr::ExternalCall(..)),
+            "Should've been parsed as a call"
+        );
+    }
 }
 
 #[cfg(test)]

From 60769ac1ba3ea036d889f140095d855e5597840c Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Tue, 20 Aug 2024 20:21:12 -0700
Subject: [PATCH 0357/1072] Bump version to `0.97.1` (#13659)

# Description

Bump version to `0.97.1`, which will be the actual next major release.
(`0.97.0` had a bug.)
---
 Cargo.lock                                    | 79 +++++++++----------
 Cargo.toml                                    | 42 +++++-----
 crates/nu-cli/Cargo.toml                      | 24 +++---
 crates/nu-cmd-base/Cargo.toml                 | 10 +--
 crates/nu-cmd-extra/Cargo.toml                | 22 +++---
 crates/nu-cmd-lang/Cargo.toml                 | 10 +--
 crates/nu-cmd-plugin/Cargo.toml               | 10 +--
 crates/nu-color-config/Cargo.toml             | 10 +--
 crates/nu-command/Cargo.toml                  | 34 ++++----
 crates/nu-derive-value/Cargo.toml             |  2 +-
 crates/nu-engine/Cargo.toml                   | 10 +--
 crates/nu-explore/Cargo.toml                  | 18 ++---
 crates/nu-glob/Cargo.toml                     |  2 +-
 crates/nu-json/Cargo.toml                     |  6 +-
 crates/nu-lsp/Cargo.toml                      | 14 ++--
 crates/nu-parser/Cargo.toml                   | 10 +--
 crates/nu-path/Cargo.toml                     |  2 +-
 crates/nu-plugin-core/Cargo.toml              |  6 +-
 crates/nu-plugin-engine/Cargo.toml            | 14 ++--
 crates/nu-plugin-protocol/Cargo.toml          |  6 +-
 crates/nu-plugin-test-support/Cargo.toml      | 18 ++---
 crates/nu-plugin/Cargo.toml                   | 12 +--
 crates/nu-pretty-hex/Cargo.toml               |  2 +-
 crates/nu-protocol/Cargo.toml                 | 12 +--
 crates/nu-std/Cargo.toml                      |  8 +-
 crates/nu-system/Cargo.toml                   |  2 +-
 crates/nu-table/Cargo.toml                    | 12 +--
 crates/nu-term-grid/Cargo.toml                |  4 +-
 crates/nu-test-support/Cargo.toml             |  8 +-
 crates/nu-utils/Cargo.toml                    |  2 +-
 .../src/sample_config/default_config.nu       |  4 +-
 .../nu-utils/src/sample_config/default_env.nu |  4 +-
 crates/nu_plugin_custom_values/Cargo.toml     |  6 +-
 crates/nu_plugin_example/Cargo.toml           | 10 +--
 crates/nu_plugin_formats/Cargo.toml           |  8 +-
 crates/nu_plugin_gstat/Cargo.toml             |  6 +-
 crates/nu_plugin_inc/Cargo.toml               |  6 +-
 .../nu_plugin_nu_example.nu                   |  4 +-
 crates/nu_plugin_polars/Cargo.toml            | 20 ++---
 .../nu_plugin_python_example.py               |  4 +-
 crates/nu_plugin_query/Cargo.toml             |  6 +-
 crates/nu_plugin_stress_internals/Cargo.toml  |  2 +-
 crates/nuon/Cargo.toml                        |  8 +-
 43 files changed, 247 insertions(+), 252 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f7499346a1..17cd47e039 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2889,7 +2889,7 @@ dependencies = [
 
 [[package]]
 name = "nu"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "assert_cmd",
  "crossterm",
@@ -2944,7 +2944,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cli"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "chrono",
  "crossterm",
@@ -2979,7 +2979,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-base"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "indexmap",
  "miette",
@@ -2991,7 +2991,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-extra"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "fancy-regex",
  "heck 0.5.0",
@@ -3016,7 +3016,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-lang"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "itertools 0.12.1",
  "nu-engine",
@@ -3028,7 +3028,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-plugin"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "itertools 0.12.1",
  "nu-engine",
@@ -3039,7 +3039,7 @@ dependencies = [
 
 [[package]]
 name = "nu-color-config"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "nu-ansi-term",
  "nu-engine",
@@ -3051,7 +3051,7 @@ dependencies = [
 
 [[package]]
 name = "nu-command"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "alphanumeric-sort",
  "base64 0.22.1",
@@ -3161,7 +3161,7 @@ dependencies = [
 
 [[package]]
 name = "nu-derive-value"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "convert_case",
  "proc-macro-error",
@@ -3172,7 +3172,7 @@ dependencies = [
 
 [[package]]
 name = "nu-engine"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "log",
  "nu-glob",
@@ -3184,7 +3184,7 @@ dependencies = [
 
 [[package]]
 name = "nu-explore"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "ansi-str",
  "anyhow",
@@ -3209,14 +3209,14 @@ dependencies = [
 
 [[package]]
 name = "nu-glob"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "doc-comment",
 ]
 
 [[package]]
 name = "nu-json"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "fancy-regex",
  "linked-hash-map",
@@ -3229,7 +3229,7 @@ dependencies = [
 
 [[package]]
 name = "nu-lsp"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "assert-json-diff",
  "crossbeam-channel",
@@ -3250,7 +3250,7 @@ dependencies = [
 
 [[package]]
 name = "nu-parser"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "bytesize",
  "chrono",
@@ -3266,7 +3266,7 @@ dependencies = [
 
 [[package]]
 name = "nu-path"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "dirs",
  "omnipath",
@@ -3275,7 +3275,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "log",
  "nix",
@@ -3291,7 +3291,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-core"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "interprocess",
  "log",
@@ -3305,7 +3305,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-engine"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "log",
  "nu-engine",
@@ -3321,7 +3321,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-protocol"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "bincode",
  "nu-protocol",
@@ -3333,7 +3333,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-test-support"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "nu-ansi-term",
  "nu-cmd-lang",
@@ -3351,7 +3351,7 @@ dependencies = [
 
 [[package]]
 name = "nu-pretty-hex"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "heapless",
  "nu-ansi-term",
@@ -3360,7 +3360,7 @@ dependencies = [
 
 [[package]]
 name = "nu-protocol"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "brotli",
  "byte-unit",
@@ -3397,7 +3397,7 @@ dependencies = [
 
 [[package]]
 name = "nu-std"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "log",
  "miette",
@@ -3408,7 +3408,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "chrono",
  "itertools 0.12.1",
@@ -3426,7 +3426,7 @@ dependencies = [
 
 [[package]]
 name = "nu-table"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "fancy-regex",
  "nu-ansi-term",
@@ -3440,7 +3440,7 @@ dependencies = [
 
 [[package]]
 name = "nu-term-grid"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "nu-utils",
  "unicode-width",
@@ -3448,7 +3448,7 @@ dependencies = [
 
 [[package]]
 name = "nu-test-support"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -3460,7 +3460,7 @@ dependencies = [
 
 [[package]]
 name = "nu-utils"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "crossterm_winapi",
  "log",
@@ -3486,7 +3486,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_example"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "nu-cmd-lang",
  "nu-plugin",
@@ -3496,7 +3496,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_formats"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "chrono",
  "eml-parser",
@@ -3511,7 +3511,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_gstat"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "git2",
  "nu-plugin",
@@ -3520,7 +3520,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_inc"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -3529,7 +3529,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_polars"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "chrono",
  "chrono-tz 0.9.0",
@@ -3563,7 +3563,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_query"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "gjson",
  "nu-plugin",
@@ -3578,7 +3578,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_stress_internals"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "interprocess",
  "serde",
@@ -3704,7 +3704,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "nuon"
-version = "0.97.0"
+version = "0.97.1"
 dependencies = [
  "chrono",
  "fancy-regex",
@@ -7421,8 +7421,3 @@ dependencies = [
  "cc",
  "pkg-config",
 ]
-
-[[patch.unused]]
-name = "reedline"
-version = "0.33.0"
-source = "git+https://github.com/nushell/reedline?branch=main#f2b414c678c54c02b2e8ecd9351aa6cd108beded"
diff --git a/Cargo.toml b/Cargo.toml
index f0093b443d..f8253ea561 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
 rust-version = "1.78.0"
-version = "0.97.0"
+version = "0.97.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -182,22 +182,22 @@ windows-sys = "0.48"
 winreg = "0.52"
 
 [dependencies]
-nu-cli = { path = "./crates/nu-cli", version = "0.97.0" }
-nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.97.0" }
-nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.97.0" }
-nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.97.0", optional = true }
-nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.97.0" }
-nu-command = { path = "./crates/nu-command", version = "0.97.0" }
-nu-engine = { path = "./crates/nu-engine", version = "0.97.0" }
-nu-explore = { path = "./crates/nu-explore", version = "0.97.0" }
-nu-lsp = { path = "./crates/nu-lsp/", version = "0.97.0" }
-nu-parser = { path = "./crates/nu-parser", version = "0.97.0" }
-nu-path = { path = "./crates/nu-path", version = "0.97.0" }
-nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.97.0" }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.97.0" }
-nu-std = { path = "./crates/nu-std", version = "0.97.0" }
-nu-system = { path = "./crates/nu-system", version = "0.97.0" }
-nu-utils = { path = "./crates/nu-utils", version = "0.97.0" }
+nu-cli = { path = "./crates/nu-cli", version = "0.97.1" }
+nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.97.1" }
+nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.97.1" }
+nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.97.1", optional = true }
+nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.97.1" }
+nu-command = { path = "./crates/nu-command", version = "0.97.1" }
+nu-engine = { path = "./crates/nu-engine", version = "0.97.1" }
+nu-explore = { path = "./crates/nu-explore", version = "0.97.1" }
+nu-lsp = { path = "./crates/nu-lsp/", version = "0.97.1" }
+nu-parser = { path = "./crates/nu-parser", version = "0.97.1" }
+nu-path = { path = "./crates/nu-path", version = "0.97.1" }
+nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.97.1" }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.97.1" }
+nu-std = { path = "./crates/nu-std", version = "0.97.1" }
+nu-system = { path = "./crates/nu-system", version = "0.97.1" }
+nu-utils = { path = "./crates/nu-utils", version = "0.97.1" }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
 crossterm = { workspace = true }
@@ -227,9 +227,9 @@ nix = { workspace = true, default-features = false, features = [
 ] }
 
 [dev-dependencies]
-nu-test-support = { path = "./crates/nu-test-support", version = "0.97.0" }
-nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.97.0" }
-nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.97.0" }
+nu-test-support = { path = "./crates/nu-test-support", version = "0.97.1" }
+nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.97.1" }
+nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.97.1" }
 assert_cmd = "2.0"
 dirs = { workspace = true }
 tango-bench = "0.5"
@@ -306,7 +306,7 @@ 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`
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 1beeee70b1..36d3d330c0 100644
--- 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.97.0"
+version = "0.97.1"
 
 [lib]
 bench = false
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.0" }
-nu-command = { path = "../nu-command", version = "0.97.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.97.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.1" }
+nu-command = { path = "../nu-command", version = "0.97.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.97.1" }
 rstest = { workspace = true, default-features = false }
 tempfile = { workspace = true }
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.97.0" }
-nu-engine = { path = "../nu-engine", version = "0.97.0" }
-nu-path = { path = "../nu-path", version = "0.97.0" }
-nu-parser = { path = "../nu-parser", version = "0.97.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.97.0", optional = true }
-nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
-nu-utils = { path = "../nu-utils", version = "0.97.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.97.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.97.1" }
+nu-engine = { path = "../nu-engine", version = "0.97.1" }
+nu-path = { path = "../nu-path", version = "0.97.1" }
+nu-parser = { path = "../nu-parser", version = "0.97.1" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.97.1", optional = true }
+nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
+nu-utils = { path = "../nu-utils", version = "0.97.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.97.1" }
 nu-ansi-term = { workspace = true }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
diff --git a/crates/nu-cmd-base/Cargo.toml b/crates/nu-cmd-base/Cargo.toml
index bfecccdf69..6d980a732f 100644
--- 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.97.0"
+version = "0.97.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.97.0" }
-nu-parser = { path = "../nu-parser", version = "0.97.0" }
-nu-path = { path = "../nu-path", version = "0.97.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
+nu-engine = { path = "../nu-engine", version = "0.97.1" }
+nu-parser = { path = "../nu-parser", version = "0.97.1" }
+nu-path = { path = "../nu-path", version = "0.97.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
 
 indexmap = { workspace = true }
 miette = { workspace = true }
diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml
index f4b488f19a..877c6aaf74 100644
--- 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.97.0"
+version = "0.97.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,13 +13,13 @@ version = "0.97.0"
 bench = false
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.97.0" }
-nu-engine = { path = "../nu-engine", version = "0.97.0" }
-nu-json = { version = "0.97.0", path = "../nu-json" }
-nu-parser = { path = "../nu-parser", version = "0.97.0" }
-nu-pretty-hex = { version = "0.97.0", path = "../nu-pretty-hex" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
-nu-utils = { path = "../nu-utils", version = "0.97.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.97.1" }
+nu-engine = { path = "../nu-engine", version = "0.97.1" }
+nu-json = { version = "0.97.1", path = "../nu-json" }
+nu-parser = { path = "../nu-parser", version = "0.97.1" }
+nu-pretty-hex = { version = "0.97.1", path = "../nu-pretty-hex" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
+nu-utils = { path = "../nu-utils", version = "0.97.1" }
 
 # 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.97.0" }
-nu-command = { path = "../nu-command", version = "0.97.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.97.0" }
\ No newline at end of file
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.1" }
+nu-command = { path = "../nu-command", version = "0.97.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.97.1" }
\ No newline at end of file
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index cc2da71a78..bedc0aef3f 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -6,16 +6,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-lang"
 edition = "2021"
 license = "MIT"
 name = "nu-cmd-lang"
-version = "0.97.0"
+version = "0.97.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.97.0" }
-nu-parser = { path = "../nu-parser", version = "0.97.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
-nu-utils = { path = "../nu-utils", version = "0.97.0" }
+nu-engine = { path = "../nu-engine", version = "0.97.1" }
+nu-parser = { path = "../nu-parser", version = "0.97.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
+nu-utils = { path = "../nu-utils", version = "0.97.1" }
 
 itertools = { workspace = true }
 shadow-rs = { version = "0.31", default-features = false }
diff --git a/crates/nu-cmd-plugin/Cargo.toml b/crates/nu-cmd-plugin/Cargo.toml
index e7f078f487..591e0c2d3c 100644
--- a/crates/nu-cmd-plugin/Cargo.toml
+++ b/crates/nu-cmd-plugin/Cargo.toml
@@ -5,15 +5,15 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-plugin"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-plugin"
-version = "0.97.0"
+version = "0.97.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.97.0" }
-nu-path = { path = "../nu-path", version = "0.97.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.0", features = ["plugin"] }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.97.0" }
+nu-engine = { path = "../nu-engine", version = "0.97.1" }
+nu-path = { path = "../nu-path", version = "0.97.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.1", features = ["plugin"] }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.97.1" }
 
 itertools = { workspace = true }
 
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index 8083f4c42b..9fe63f61b5 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -5,18 +5,18 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-color-confi
 edition = "2021"
 license = "MIT"
 name = "nu-color-config"
-version = "0.97.0"
+version = "0.97.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
-nu-engine = { path = "../nu-engine", version = "0.97.0" }
-nu-json = { path = "../nu-json", version = "0.97.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
+nu-engine = { path = "../nu-engine", version = "0.97.1" }
+nu-json = { path = "../nu-json", version = "0.97.1" }
 nu-ansi-term = { workspace = true }
 
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.97.0" }
\ No newline at end of file
+nu-test-support = { path = "../nu-test-support", version = "0.97.1" }
\ No newline at end of file
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 602fbf21ef..82637dbc80 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-command"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
-version = "0.97.0"
+version = "0.97.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,21 +13,21 @@ version = "0.97.0"
 bench = false
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.97.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.97.0" }
-nu-engine = { path = "../nu-engine", version = "0.97.0" }
-nu-glob = { path = "../nu-glob", version = "0.97.0" }
-nu-json = { path = "../nu-json", version = "0.97.0" }
-nu-parser = { path = "../nu-parser", version = "0.97.0" }
-nu-path = { path = "../nu-path", version = "0.97.0" }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.97.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
-nu-system = { path = "../nu-system", version = "0.97.0" }
-nu-table = { path = "../nu-table", version = "0.97.0" }
-nu-term-grid = { path = "../nu-term-grid", version = "0.97.0" }
-nu-utils = { path = "../nu-utils", version = "0.97.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.97.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.97.1" }
+nu-engine = { path = "../nu-engine", version = "0.97.1" }
+nu-glob = { path = "../nu-glob", version = "0.97.1" }
+nu-json = { path = "../nu-json", version = "0.97.1" }
+nu-parser = { path = "../nu-parser", version = "0.97.1" }
+nu-path = { path = "../nu-path", version = "0.97.1" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.97.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
+nu-system = { path = "../nu-system", version = "0.97.1" }
+nu-table = { path = "../nu-table", version = "0.97.1" }
+nu-term-grid = { path = "../nu-term-grid", version = "0.97.1" }
+nu-utils = { path = "../nu-utils", version = "0.97.1" }
 nu-ansi-term = { workspace = true }
-nuon = { path = "../nuon", version = "0.97.0" }
+nuon = { path = "../nuon", version = "0.97.1" }
 
 alphanumeric-sort = { workspace = true }
 base64 = { workspace = true }
@@ -137,8 +137,8 @@ sqlite = ["rusqlite"]
 trash-support = ["trash"]
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.97.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.97.1" }
 
 dirs = { workspace = true }
 mockito = { workspace = true, default-features = false }
diff --git a/crates/nu-derive-value/Cargo.toml b/crates/nu-derive-value/Cargo.toml
index e1d45205c2..2790a953d4 100644
--- a/crates/nu-derive-value/Cargo.toml
+++ b/crates/nu-derive-value/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-derive-value"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-derive-value"
-version = "0.97.0"
+version = "0.97.1"
 
 [lib]
 proc-macro = true
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index c63c476d51..1b8533bb33 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-engine"
 edition = "2021"
 license = "MIT"
 name = "nu-engine"
-version = "0.97.0"
+version = "0.97.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.97.0" }
-nu-path = { path = "../nu-path", version = "0.97.0" }
-nu-glob = { path = "../nu-glob", version = "0.97.0" }
-nu-utils = { path = "../nu-utils", version = "0.97.0" }
+nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.97.1" }
+nu-path = { path = "../nu-path", version = "0.97.1" }
+nu-glob = { path = "../nu-glob", version = "0.97.1" }
+nu-utils = { path = "../nu-utils", version = "0.97.1" }
 log = { workspace = true }
 terminal_size = { workspace = true }
 
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index e285fbb3dc..362f5f8e8a 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -5,21 +5,21 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-explore"
 edition = "2021"
 license = "MIT"
 name = "nu-explore"
-version = "0.97.0"
+version = "0.97.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
-nu-parser = { path = "../nu-parser", version = "0.97.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.97.0" }
-nu-engine = { path = "../nu-engine", version = "0.97.0" }
-nu-table = { path = "../nu-table", version = "0.97.0" }
-nu-json = { path = "../nu-json", version = "0.97.0" }
-nu-utils = { path = "../nu-utils", version = "0.97.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
+nu-parser = { path = "../nu-parser", version = "0.97.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.97.1" }
+nu-engine = { path = "../nu-engine", version = "0.97.1" }
+nu-table = { path = "../nu-table", version = "0.97.1" }
+nu-json = { path = "../nu-json", version = "0.97.1" }
+nu-utils = { path = "../nu-utils", version = "0.97.1" }
 nu-ansi-term = { workspace = true }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.97.0" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.97.1" }
 
 anyhow = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-glob/Cargo.toml b/crates/nu-glob/Cargo.toml
index a73acfb124..9c84829189 100644
--- a/crates/nu-glob/Cargo.toml
+++ b/crates/nu-glob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-glob"
-version = "0.97.0"
+version = "0.97.1"
 authors = ["The Nushell Project Developers", "The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 description = """
diff --git a/crates/nu-json/Cargo.toml b/crates/nu-json/Cargo.toml
index 672791ceb4..b9368243bd 100644
--- a/crates/nu-json/Cargo.toml
+++ b/crates/nu-json/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-json"
 edition = "2021"
 license = "MIT"
 name = "nu-json"
-version = "0.97.0"
+version = "0.97.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -26,7 +26,7 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.97.0" }
-nu-path = { path = "../nu-path", version = "0.97.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.97.1" }
+nu-path = { path = "../nu-path", version = "0.97.1" }
 serde_json = "1.0"
 fancy-regex = "0.13.0"
\ No newline at end of file
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index 700b2f7b7d..e002c21063 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -3,14 +3,14 @@ authors = ["The Nushell Project Developers"]
 description = "Nushell's integrated LSP server"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-lsp"
 name = "nu-lsp"
-version = "0.97.0"
+version = "0.97.1"
 edition = "2021"
 license = "MIT"
 
 [dependencies]
-nu-cli = { path = "../nu-cli", version = "0.97.0" }
-nu-parser = { path = "../nu-parser", version = "0.97.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
+nu-cli = { path = "../nu-cli", version = "0.97.1" }
+nu-parser = { path = "../nu-parser", version = "0.97.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
 
 reedline = { workspace = true }
 
@@ -23,8 +23,8 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.0" }
-nu-command = { path = "../nu-command", version = "0.97.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.97.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.1" }
+nu-command = { path = "../nu-command", version = "0.97.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.97.1" }
 
 assert-json-diff = "2.0"
\ No newline at end of file
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index eea0dbf9b9..bb4d1a62f4 100644
--- a/crates/nu-parser/Cargo.toml
+++ b/crates/nu-parser/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-parser"
 edition = "2021"
 license = "MIT"
 name = "nu-parser"
-version = "0.97.0"
+version = "0.97.1"
 exclude = ["/fuzz"]
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.97.0" }
-nu-path = { path = "../nu-path", version = "0.97.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.97.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
+nu-engine = { path = "../nu-engine", version = "0.97.1" }
+nu-path = { path = "../nu-path", version = "0.97.1" }
+nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.97.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
 
 bytesize = { workspace = true }
 chrono = { default-features = false, features = ['std'], workspace = true }
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index 928d7c6094..a65a25054e 100644
--- a/crates/nu-path/Cargo.toml
+++ b/crates/nu-path/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-path"
 edition = "2021"
 license = "MIT"
 name = "nu-path"
-version = "0.97.0"
+version = "0.97.1"
 exclude = ["/fuzz"]
 
 [lib]
diff --git a/crates/nu-plugin-core/Cargo.toml b/crates/nu-plugin-core/Cargo.toml
index 4094364906..855fc07d10 100644
--- a/crates/nu-plugin-core/Cargo.toml
+++ b/crates/nu-plugin-core/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-core
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-core"
-version = "0.97.0"
+version = "0.97.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.97.0", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.97.1", default-features = false }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true }
diff --git a/crates/nu-plugin-engine/Cargo.toml b/crates/nu-plugin-engine/Cargo.toml
index 46d10f481b..c84f9714bc 100644
--- a/crates/nu-plugin-engine/Cargo.toml
+++ b/crates/nu-plugin-engine/Cargo.toml
@@ -5,18 +5,18 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-engi
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-engine"
-version = "0.97.0"
+version = "0.97.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.97.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
-nu-system = { path = "../nu-system", version = "0.97.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.97.0" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.97.0", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.97.0" }
+nu-engine = { path = "../nu-engine", version = "0.97.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
+nu-system = { path = "../nu-system", version = "0.97.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.97.1" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.97.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.97.1" }
 
 serde = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-plugin-protocol/Cargo.toml b/crates/nu-plugin-protocol/Cargo.toml
index d0b171852e..421470417f 100644
--- a/crates/nu-plugin-protocol/Cargo.toml
+++ b/crates/nu-plugin-protocol/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-prot
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-protocol"
-version = "0.97.0"
+version = "0.97.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.97.0", features = ["plugin"] }
-nu-utils = { path = "../nu-utils", version = "0.97.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.1", features = ["plugin"] }
+nu-utils = { path = "../nu-utils", version = "0.97.1" }
 
 bincode = "1.3"
 serde = { workspace = true, features = ["derive"] }
diff --git a/crates/nu-plugin-test-support/Cargo.toml b/crates/nu-plugin-test-support/Cargo.toml
index d9a0019d97..9d0c56736c 100644
--- a/crates/nu-plugin-test-support/Cargo.toml
+++ b/crates/nu-plugin-test-support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-plugin-test-support"
-version = "0.97.0"
+version = "0.97.1"
 edition = "2021"
 license = "MIT"
 description = "Testing support for Nushell plugins"
@@ -12,14 +12,14 @@ bench = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.97.0", features = ["plugin"] }
-nu-protocol = { path = "../nu-protocol", version = "0.97.0", features = ["plugin"] }
-nu-parser = { path = "../nu-parser", version = "0.97.0", features = ["plugin"] }
-nu-plugin = { path = "../nu-plugin", version = "0.97.0" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.97.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.97.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.97.0" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.0" }
+nu-engine = { path = "../nu-engine", version = "0.97.1", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.97.1", features = ["plugin"] }
+nu-parser = { path = "../nu-parser", version = "0.97.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.97.1" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.97.1" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.97.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.97.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.1" }
 nu-ansi-term = { workspace = true }
 similar = "2.6"
 
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index 365d018f93..139a432a47 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin"
 edition = "2021"
 license = "MIT"
 name = "nu-plugin"
-version = "0.97.0"
+version = "0.97.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.97.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.97.0" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.97.0", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.97.0" }
+nu-engine = { path = "../nu-engine", version = "0.97.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.97.1" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.97.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.97.1" }
 
 log = { workspace = true }
 thiserror = "1.0"
diff --git a/crates/nu-pretty-hex/Cargo.toml b/crates/nu-pretty-hex/Cargo.toml
index da3431eac3..573464adf3 100644
--- a/crates/nu-pretty-hex/Cargo.toml
+++ b/crates/nu-pretty-hex/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-pretty-hex"
 edition = "2021"
 license = "MIT"
 name = "nu-pretty-hex"
-version = "0.97.0"
+version = "0.97.1"
 
 [lib]
 doctest = false
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 78f2e6ce4a..51cae765ef 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-protocol"
 edition = "2021"
 license = "MIT"
 name = "nu-protocol"
-version = "0.97.0"
+version = "0.97.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,10 +13,10 @@ version = "0.97.0"
 bench = false
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.97.0" }
-nu-path = { path = "../nu-path", version = "0.97.0" }
-nu-system = { path = "../nu-system", version = "0.97.0" }
-nu-derive-value = { path = "../nu-derive-value", version = "0.97.0" }
+nu-utils = { path = "../nu-utils", version = "0.97.1" }
+nu-path = { path = "../nu-path", version = "0.97.1" }
+nu-system = { path = "../nu-system", version = "0.97.1" }
+nu-derive-value = { path = "../nu-derive-value", version = "0.97.1" }
 
 brotli = { workspace = true, optional = true }
 byte-unit = { version = "5.1", features = [ "serde" ] }
@@ -53,7 +53,7 @@ plugin = [
 serde_json = { workspace = true }
 strum = "0.26"
 strum_macros = "0.26"
-nu-test-support = { path = "../nu-test-support", version = "0.97.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.97.1" }
 pretty_assertions = { workspace = true }
 rstest = { workspace = true }
 tempfile = { workspace = true }
diff --git a/crates/nu-std/Cargo.toml b/crates/nu-std/Cargo.toml
index 2650568d65..5ec6f0b76b 100644
--- a/crates/nu-std/Cargo.toml
+++ b/crates/nu-std/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-std"
 edition = "2021"
 license = "MIT"
 name = "nu-std"
-version = "0.97.0"
+version = "0.97.1"
 
 [dependencies]
-nu-parser = { version = "0.97.0", path = "../nu-parser" }
-nu-protocol = { version = "0.97.0", path = "../nu-protocol" }
-nu-engine = { version = "0.97.0", path = "../nu-engine" }
+nu-parser = { version = "0.97.1", path = "../nu-parser" }
+nu-protocol = { version = "0.97.1", path = "../nu-protocol" }
+nu-engine = { version = "0.97.1", path = "../nu-engine" }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
 
 log = "0.4"
\ No newline at end of file
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index 3f6344252b..67bf2bf21f 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["The Nushell Project Developers", "procs creators"]
 description = "Nushell system querying"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-system"
 name = "nu-system"
-version = "0.97.0"
+version = "0.97.1"
 edition = "2021"
 license = "MIT"
 
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index 79abb35db1..908124f52d 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -5,20 +5,20 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-table"
 edition = "2021"
 license = "MIT"
 name = "nu-table"
-version = "0.97.0"
+version = "0.97.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
-nu-utils = { path = "../nu-utils", version = "0.97.0" }
-nu-engine = { path = "../nu-engine", version = "0.97.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.97.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
+nu-utils = { path = "../nu-utils", version = "0.97.1" }
+nu-engine = { path = "../nu-engine", version = "0.97.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.97.1" }
 nu-ansi-term = { workspace = true }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 tabled = { workspace = true, features = ["color"], default-features = false }
 
 [dev-dependencies]
-# nu-test-support = { path="../nu-test-support", version = "0.97.0"  }
\ No newline at end of file
+# nu-test-support = { path="../nu-test-support", version = "0.97.1"  }
\ No newline at end of file
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index 2f0a0ff6b9..2dc6182c9f 100644
--- a/crates/nu-term-grid/Cargo.toml
+++ b/crates/nu-term-grid/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-term-grid"
 edition = "2021"
 license = "MIT"
 name = "nu-term-grid"
-version = "0.97.0"
+version = "0.97.1"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.97.0" }
+nu-utils = { path = "../nu-utils", version = "0.97.1" }
 
 unicode-width = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml
index 514d4dff60..16ad9491ea 100644
--- a/crates/nu-test-support/Cargo.toml
+++ b/crates/nu-test-support/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-test-suppor
 edition = "2021"
 license = "MIT"
 name = "nu-test-support"
-version = "0.97.0"
+version = "0.97.1"
 
 [lib]
 doctest = false
 bench = false
 
 [dependencies]
-nu-path = { path = "../nu-path", version = "0.97.0" }
-nu-glob = { path = "../nu-glob", version = "0.97.0" }
-nu-utils = { path = "../nu-utils", version = "0.97.0" }
+nu-path = { path = "../nu-path", version = "0.97.1" }
+nu-glob = { path = "../nu-glob", version = "0.97.1" }
+nu-utils = { path = "../nu-utils", version = "0.97.1" }
 
 num-format = { workspace = true }
 which = { workspace = true }
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index 006fa12a3c..1941f848e0 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-utils"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-utils"
-version = "0.97.0"
+version = "0.97.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index fe8a278ffe..830a56a558 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -1,6 +1,6 @@
 # Nushell Config File
 #
-# version = "0.97.0"
+# version = "0.97.1"
 
 # For more information on defining custom themes, see
 # https://www.nushell.sh/book/coloring_and_theming.html
@@ -890,4 +890,4 @@ $env.config = {
             event: { edit: selectall }
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/crates/nu-utils/src/sample_config/default_env.nu b/crates/nu-utils/src/sample_config/default_env.nu
index 4b10e63cd6..bfbd1e7109 100644
--- a/crates/nu-utils/src/sample_config/default_env.nu
+++ b/crates/nu-utils/src/sample_config/default_env.nu
@@ -1,6 +1,6 @@
 # Nushell Environment Config File
 #
-# version = "0.97.0"
+# version = "0.97.1"
 
 def create_left_prompt [] {
     let dir = match (do --ignore-shell-errors { $env.PWD | path relative-to $nu.home-path }) {
@@ -98,4 +98,4 @@ $env.NU_PLUGIN_DIRS = [
 # $env.PATH = ($env.PATH | uniq)
 
 # To load from a custom file you can use:
-# source ($nu.default-config-dir | path join 'custom.nu')
+# source ($nu.default-config-dir | path join 'custom.nu')
\ No newline at end of file
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index 9f487a3c64..aae80b47cb 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -10,10 +10,10 @@ name = "nu_plugin_custom_values"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.97.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.97.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.1", features = ["plugin"] }
 serde = { workspace = true, default-features = false }
 typetag = "0.2"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.97.0" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.97.1" }
\ No newline at end of file
diff --git a/crates/nu_plugin_example/Cargo.toml b/crates/nu_plugin_example/Cargo.toml
index 2e7563bb69..cc6de792c9 100644
--- a/crates/nu_plugin_example/Cargo.toml
+++ b/crates/nu_plugin_example/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_exam
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_example"
-version = "0.97.0"
+version = "0.97.1"
 
 [[bin]]
 name = "nu_plugin_example"
@@ -15,9 +15,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.97.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.97.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.1", features = ["plugin"] }
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.97.0" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.0" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.97.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.1" }
\ No newline at end of file
diff --git a/crates/nu_plugin_formats/Cargo.toml b/crates/nu_plugin_formats/Cargo.toml
index dd2678d4a9..5b373b731c 100644
--- a/crates/nu_plugin_formats/Cargo.toml
+++ b/crates/nu_plugin_formats/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_form
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_formats"
-version = "0.97.0"
+version = "0.97.1"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.97.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.97.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.1", features = ["plugin"] }
 
 indexmap = { workspace = true }
 eml-parser = "0.1"
@@ -20,4 +20,4 @@ plist = "1.7"
 chrono = "0.4"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.97.0" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.97.1" }
\ No newline at end of file
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index 17c12fdc4c..a480271b0f 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gsta
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_gstat"
-version = "0.97.0"
+version = "0.97.1"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_gstat"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.97.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
+nu-plugin = { path = "../nu-plugin", version = "0.97.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
 
 git2 = "0.19"
\ No newline at end of file
diff --git a/crates/nu_plugin_inc/Cargo.toml b/crates/nu_plugin_inc/Cargo.toml
index ee0ce6e86f..5593b03de5 100644
--- a/crates/nu_plugin_inc/Cargo.toml
+++ b/crates/nu_plugin_inc/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_inc"
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_inc"
-version = "0.97.0"
+version = "0.97.1"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_inc"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.97.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.97.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.1", features = ["plugin"] }
 
 semver = "1.0"
\ No newline at end of file
diff --git a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
index 49593050e2..33c379c2ea 100755
--- a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
+++ b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
@@ -6,7 +6,7 @@
 # it also allows us to test the plugin interface with something manually implemented in a scripting
 # language without adding any extra dependencies to our tests.
 
-const NUSHELL_VERSION = "0.97.0"
+const NUSHELL_VERSION = "0.97.1"
 const PLUGIN_VERSION = "0.1.1" # bump if you change commands!
 
 def main [--stdio] {
@@ -265,4 +265,4 @@ def start_plugin [] {
     }) |
     each { from json | handle_input } |
     ignore
-}
+}
\ No newline at end of file
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index bcdc45590b..f85bdda0bd 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu_plugin_polars"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_polars"
-version = "0.97.0"
+version = "0.97.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -17,10 +17,10 @@ bench = false
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
-nu-plugin = { path = "../nu-plugin", version = "0.97.0" }
-nu-path = { path = "../nu-path", version = "0.97.0" }
-nu-utils = { path = "../nu-utils", version = "0.97.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.97.1" }
+nu-path = { path = "../nu-path", version = "0.97.1" }
+nu-utils = { path = "../nu-utils", version = "0.97.1" }
 
 # Potential dependencies for extras
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
@@ -77,9 +77,9 @@ optional = false
 version = "0.41"
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.0" }
-nu-engine = { path = "../nu-engine", version = "0.97.0" }
-nu-parser = { path = "../nu-parser", version = "0.97.0" }
-nu-command = { path = "../nu-command", version = "0.97.0" }
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.97.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.1" }
+nu-engine = { path = "../nu-engine", version = "0.97.1" }
+nu-parser = { path = "../nu-parser", version = "0.97.1" }
+nu-command = { path = "../nu-command", version = "0.97.1" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.97.1" }
 tempfile.workspace = true
\ No newline at end of file
diff --git a/crates/nu_plugin_python/nu_plugin_python_example.py b/crates/nu_plugin_python/nu_plugin_python_example.py
index 4a4b2a6632..e5dc59c871 100755
--- a/crates/nu_plugin_python/nu_plugin_python_example.py
+++ b/crates/nu_plugin_python/nu_plugin_python_example.py
@@ -27,7 +27,7 @@ import sys
 import json
 
 
-NUSHELL_VERSION = "0.97.0"
+NUSHELL_VERSION = "0.97.1"
 PLUGIN_VERSION = "0.1.1"  # bump if you change commands!
 
 
@@ -265,4 +265,4 @@ if __name__ == "__main__":
     if len(sys.argv) == 2 and sys.argv[1] == "--stdio":
         plugin()
     else:
-        print("Run me from inside nushell!")
+        print("Run me from inside nushell!")
\ No newline at end of file
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index f6f76e2c53..07b109d140 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_quer
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_query"
-version = "0.97.0"
+version = "0.97.1"
 
 [lib]
 doctest = false
@@ -16,8 +16,8 @@ name = "nu_plugin_query"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.97.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
+nu-plugin = { path = "../nu-plugin", version = "0.97.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
 
 gjson = "0.8"
 scraper = { default-features = false, version = "0.20" }
diff --git a/crates/nu_plugin_stress_internals/Cargo.toml b/crates/nu_plugin_stress_internals/Cargo.toml
index 05ac139326..0e50679e66 100644
--- a/crates/nu_plugin_stress_internals/Cargo.toml
+++ b/crates/nu_plugin_stress_internals/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_stre
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_stress_internals"
-version = "0.97.0"
+version = "0.97.1"
 
 [[bin]]
 name = "nu_plugin_stress_internals"
diff --git a/crates/nuon/Cargo.toml b/crates/nuon/Cargo.toml
index 8fff48bb6b..0ab09fafac 100644
--- a/crates/nuon/Cargo.toml
+++ b/crates/nuon/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nuon"
 edition = "2021"
 license = "MIT"
 name = "nuon"
-version = "0.97.0"
+version = "0.97.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-parser = { path = "../nu-parser", version = "0.97.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
-nu-engine = { path = "../nu-engine", version = "0.97.0" }
+nu-parser = { path = "../nu-parser", version = "0.97.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
+nu-engine = { path = "../nu-engine", version = "0.97.1" }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 

From e211b7ba53b1d8409689c7d1ce2bc5d4178b3446 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Thu, 22 Aug 2024 11:36:32 +0200
Subject: [PATCH 0358/1072] Bump version to 0.97.2 (#13666)

---
 Cargo.lock                                    | 74 +++++++++----------
 Cargo.toml                                    | 40 +++++-----
 crates/nu-cli/Cargo.toml                      | 24 +++---
 crates/nu-cmd-base/Cargo.toml                 | 10 +--
 crates/nu-cmd-extra/Cargo.toml                | 22 +++---
 crates/nu-cmd-lang/Cargo.toml                 | 10 +--
 crates/nu-cmd-plugin/Cargo.toml               | 10 +--
 crates/nu-color-config/Cargo.toml             | 10 +--
 crates/nu-command/Cargo.toml                  | 34 ++++-----
 crates/nu-derive-value/Cargo.toml             |  2 +-
 crates/nu-engine/Cargo.toml                   | 10 +--
 crates/nu-explore/Cargo.toml                  | 18 ++---
 crates/nu-glob/Cargo.toml                     |  2 +-
 crates/nu-json/Cargo.toml                     |  6 +-
 crates/nu-lsp/Cargo.toml                      | 14 ++--
 crates/nu-parser/Cargo.toml                   | 10 +--
 crates/nu-path/Cargo.toml                     |  2 +-
 crates/nu-plugin-core/Cargo.toml              |  6 +-
 crates/nu-plugin-engine/Cargo.toml            | 14 ++--
 crates/nu-plugin-protocol/Cargo.toml          |  6 +-
 crates/nu-plugin-test-support/Cargo.toml      | 18 ++---
 crates/nu-plugin/Cargo.toml                   | 12 +--
 crates/nu-pretty-hex/Cargo.toml               |  2 +-
 crates/nu-protocol/Cargo.toml                 | 12 +--
 crates/nu-std/Cargo.toml                      |  8 +-
 crates/nu-system/Cargo.toml                   |  2 +-
 crates/nu-table/Cargo.toml                    | 12 +--
 crates/nu-term-grid/Cargo.toml                |  4 +-
 crates/nu-test-support/Cargo.toml             |  8 +-
 crates/nu-utils/Cargo.toml                    |  2 +-
 .../src/sample_config/default_config.nu       |  2 +-
 .../nu-utils/src/sample_config/default_env.nu |  2 +-
 crates/nu_plugin_custom_values/Cargo.toml     |  6 +-
 crates/nu_plugin_example/Cargo.toml           | 10 +--
 crates/nu_plugin_formats/Cargo.toml           |  8 +-
 crates/nu_plugin_gstat/Cargo.toml             |  6 +-
 crates/nu_plugin_inc/Cargo.toml               |  6 +-
 .../nu_plugin_nu_example.nu                   |  2 +-
 crates/nu_plugin_polars/Cargo.toml            | 20 ++---
 .../nu_plugin_python_example.py               |  2 +-
 crates/nu_plugin_query/Cargo.toml             |  6 +-
 crates/nu_plugin_stress_internals/Cargo.toml  |  2 +-
 crates/nuon/Cargo.toml                        |  8 +-
 43 files changed, 242 insertions(+), 242 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 17cd47e039..dd631a7e56 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2889,7 +2889,7 @@ dependencies = [
 
 [[package]]
 name = "nu"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "assert_cmd",
  "crossterm",
@@ -2944,7 +2944,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cli"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "chrono",
  "crossterm",
@@ -2979,7 +2979,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-base"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "indexmap",
  "miette",
@@ -2991,7 +2991,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-extra"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "fancy-regex",
  "heck 0.5.0",
@@ -3016,7 +3016,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-lang"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "itertools 0.12.1",
  "nu-engine",
@@ -3028,7 +3028,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-plugin"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "itertools 0.12.1",
  "nu-engine",
@@ -3039,7 +3039,7 @@ dependencies = [
 
 [[package]]
 name = "nu-color-config"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "nu-ansi-term",
  "nu-engine",
@@ -3051,7 +3051,7 @@ dependencies = [
 
 [[package]]
 name = "nu-command"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "alphanumeric-sort",
  "base64 0.22.1",
@@ -3161,7 +3161,7 @@ dependencies = [
 
 [[package]]
 name = "nu-derive-value"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "convert_case",
  "proc-macro-error",
@@ -3172,7 +3172,7 @@ dependencies = [
 
 [[package]]
 name = "nu-engine"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "log",
  "nu-glob",
@@ -3184,7 +3184,7 @@ dependencies = [
 
 [[package]]
 name = "nu-explore"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "ansi-str",
  "anyhow",
@@ -3209,14 +3209,14 @@ dependencies = [
 
 [[package]]
 name = "nu-glob"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "doc-comment",
 ]
 
 [[package]]
 name = "nu-json"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "fancy-regex",
  "linked-hash-map",
@@ -3229,7 +3229,7 @@ dependencies = [
 
 [[package]]
 name = "nu-lsp"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "assert-json-diff",
  "crossbeam-channel",
@@ -3250,7 +3250,7 @@ dependencies = [
 
 [[package]]
 name = "nu-parser"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "bytesize",
  "chrono",
@@ -3266,7 +3266,7 @@ dependencies = [
 
 [[package]]
 name = "nu-path"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "dirs",
  "omnipath",
@@ -3275,7 +3275,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "log",
  "nix",
@@ -3291,7 +3291,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-core"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "interprocess",
  "log",
@@ -3305,7 +3305,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-engine"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "log",
  "nu-engine",
@@ -3321,7 +3321,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-protocol"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "bincode",
  "nu-protocol",
@@ -3333,7 +3333,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-test-support"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "nu-ansi-term",
  "nu-cmd-lang",
@@ -3351,7 +3351,7 @@ dependencies = [
 
 [[package]]
 name = "nu-pretty-hex"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "heapless",
  "nu-ansi-term",
@@ -3360,7 +3360,7 @@ dependencies = [
 
 [[package]]
 name = "nu-protocol"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "brotli",
  "byte-unit",
@@ -3397,7 +3397,7 @@ dependencies = [
 
 [[package]]
 name = "nu-std"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "log",
  "miette",
@@ -3408,7 +3408,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "chrono",
  "itertools 0.12.1",
@@ -3426,7 +3426,7 @@ dependencies = [
 
 [[package]]
 name = "nu-table"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "fancy-regex",
  "nu-ansi-term",
@@ -3440,7 +3440,7 @@ dependencies = [
 
 [[package]]
 name = "nu-term-grid"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "nu-utils",
  "unicode-width",
@@ -3448,7 +3448,7 @@ dependencies = [
 
 [[package]]
 name = "nu-test-support"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -3460,7 +3460,7 @@ dependencies = [
 
 [[package]]
 name = "nu-utils"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "crossterm_winapi",
  "log",
@@ -3486,7 +3486,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_example"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "nu-cmd-lang",
  "nu-plugin",
@@ -3496,7 +3496,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_formats"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "chrono",
  "eml-parser",
@@ -3511,7 +3511,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_gstat"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "git2",
  "nu-plugin",
@@ -3520,7 +3520,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_inc"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -3529,7 +3529,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_polars"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "chrono",
  "chrono-tz 0.9.0",
@@ -3563,7 +3563,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_query"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "gjson",
  "nu-plugin",
@@ -3578,7 +3578,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_stress_internals"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "interprocess",
  "serde",
@@ -3704,7 +3704,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "nuon"
-version = "0.97.1"
+version = "0.97.2"
 dependencies = [
  "chrono",
  "fancy-regex",
diff --git a/Cargo.toml b/Cargo.toml
index f8253ea561..1350a8d217 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
 rust-version = "1.78.0"
-version = "0.97.1"
+version = "0.97.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -182,22 +182,22 @@ windows-sys = "0.48"
 winreg = "0.52"
 
 [dependencies]
-nu-cli = { path = "./crates/nu-cli", version = "0.97.1" }
-nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.97.1" }
-nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.97.1" }
-nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.97.1", optional = true }
-nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.97.1" }
-nu-command = { path = "./crates/nu-command", version = "0.97.1" }
-nu-engine = { path = "./crates/nu-engine", version = "0.97.1" }
-nu-explore = { path = "./crates/nu-explore", version = "0.97.1" }
-nu-lsp = { path = "./crates/nu-lsp/", version = "0.97.1" }
-nu-parser = { path = "./crates/nu-parser", version = "0.97.1" }
-nu-path = { path = "./crates/nu-path", version = "0.97.1" }
-nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.97.1" }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.97.1" }
-nu-std = { path = "./crates/nu-std", version = "0.97.1" }
-nu-system = { path = "./crates/nu-system", version = "0.97.1" }
-nu-utils = { path = "./crates/nu-utils", version = "0.97.1" }
+nu-cli = { path = "./crates/nu-cli", version = "0.97.2" }
+nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.97.2" }
+nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.97.2" }
+nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.97.2", optional = true }
+nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.97.2" }
+nu-command = { path = "./crates/nu-command", version = "0.97.2" }
+nu-engine = { path = "./crates/nu-engine", version = "0.97.2" }
+nu-explore = { path = "./crates/nu-explore", version = "0.97.2" }
+nu-lsp = { path = "./crates/nu-lsp/", version = "0.97.2" }
+nu-parser = { path = "./crates/nu-parser", version = "0.97.2" }
+nu-path = { path = "./crates/nu-path", version = "0.97.2" }
+nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.97.2" }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.97.2" }
+nu-std = { path = "./crates/nu-std", version = "0.97.2" }
+nu-system = { path = "./crates/nu-system", version = "0.97.2" }
+nu-utils = { path = "./crates/nu-utils", version = "0.97.2" }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
 crossterm = { workspace = true }
@@ -227,9 +227,9 @@ nix = { workspace = true, default-features = false, features = [
 ] }
 
 [dev-dependencies]
-nu-test-support = { path = "./crates/nu-test-support", version = "0.97.1" }
-nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.97.1" }
-nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.97.1" }
+nu-test-support = { path = "./crates/nu-test-support", version = "0.97.2" }
+nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.97.2" }
+nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.97.2" }
 assert_cmd = "2.0"
 dirs = { workspace = true }
 tango-bench = "0.5"
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 36d3d330c0..f392d3b9d9 100644
--- 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.97.1"
+version = "0.97.2"
 
 [lib]
 bench = false
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.1" }
-nu-command = { path = "../nu-command", version = "0.97.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.97.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.2" }
+nu-command = { path = "../nu-command", version = "0.97.2" }
+nu-test-support = { path = "../nu-test-support", version = "0.97.2" }
 rstest = { workspace = true, default-features = false }
 tempfile = { workspace = true }
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.97.1" }
-nu-engine = { path = "../nu-engine", version = "0.97.1" }
-nu-path = { path = "../nu-path", version = "0.97.1" }
-nu-parser = { path = "../nu-parser", version = "0.97.1" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.97.1", optional = true }
-nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
-nu-utils = { path = "../nu-utils", version = "0.97.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.97.1" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.97.2" }
+nu-engine = { path = "../nu-engine", version = "0.97.2" }
+nu-path = { path = "../nu-path", version = "0.97.2" }
+nu-parser = { path = "../nu-parser", version = "0.97.2" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.97.2", optional = true }
+nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
+nu-utils = { path = "../nu-utils", version = "0.97.2" }
+nu-color-config = { path = "../nu-color-config", version = "0.97.2" }
 nu-ansi-term = { workspace = true }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
diff --git a/crates/nu-cmd-base/Cargo.toml b/crates/nu-cmd-base/Cargo.toml
index 6d980a732f..89ea225f28 100644
--- 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.97.1"
+version = "0.97.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.97.1" }
-nu-parser = { path = "../nu-parser", version = "0.97.1" }
-nu-path = { path = "../nu-path", version = "0.97.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
+nu-engine = { path = "../nu-engine", version = "0.97.2" }
+nu-parser = { path = "../nu-parser", version = "0.97.2" }
+nu-path = { path = "../nu-path", version = "0.97.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
 
 indexmap = { workspace = true }
 miette = { workspace = true }
diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml
index 877c6aaf74..fae6568eaf 100644
--- 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.97.1"
+version = "0.97.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,13 +13,13 @@ version = "0.97.1"
 bench = false
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.97.1" }
-nu-engine = { path = "../nu-engine", version = "0.97.1" }
-nu-json = { version = "0.97.1", path = "../nu-json" }
-nu-parser = { path = "../nu-parser", version = "0.97.1" }
-nu-pretty-hex = { version = "0.97.1", path = "../nu-pretty-hex" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
-nu-utils = { path = "../nu-utils", version = "0.97.1" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.97.2" }
+nu-engine = { path = "../nu-engine", version = "0.97.2" }
+nu-json = { version = "0.97.2", path = "../nu-json" }
+nu-parser = { path = "../nu-parser", version = "0.97.2" }
+nu-pretty-hex = { version = "0.97.2", path = "../nu-pretty-hex" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
+nu-utils = { path = "../nu-utils", version = "0.97.2" }
 
 # 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.97.1" }
-nu-command = { path = "../nu-command", version = "0.97.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.97.1" }
\ No newline at end of file
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.2" }
+nu-command = { path = "../nu-command", version = "0.97.2" }
+nu-test-support = { path = "../nu-test-support", version = "0.97.2" }
\ No newline at end of file
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index bedc0aef3f..5ddc67b801 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -6,16 +6,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-lang"
 edition = "2021"
 license = "MIT"
 name = "nu-cmd-lang"
-version = "0.97.1"
+version = "0.97.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.97.1" }
-nu-parser = { path = "../nu-parser", version = "0.97.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
-nu-utils = { path = "../nu-utils", version = "0.97.1" }
+nu-engine = { path = "../nu-engine", version = "0.97.2" }
+nu-parser = { path = "../nu-parser", version = "0.97.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
+nu-utils = { path = "../nu-utils", version = "0.97.2" }
 
 itertools = { workspace = true }
 shadow-rs = { version = "0.31", default-features = false }
diff --git a/crates/nu-cmd-plugin/Cargo.toml b/crates/nu-cmd-plugin/Cargo.toml
index 591e0c2d3c..28c6abf8bc 100644
--- a/crates/nu-cmd-plugin/Cargo.toml
+++ b/crates/nu-cmd-plugin/Cargo.toml
@@ -5,15 +5,15 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-plugin"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-plugin"
-version = "0.97.1"
+version = "0.97.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.97.1" }
-nu-path = { path = "../nu-path", version = "0.97.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.1", features = ["plugin"] }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.97.1" }
+nu-engine = { path = "../nu-engine", version = "0.97.2" }
+nu-path = { path = "../nu-path", version = "0.97.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.2", features = ["plugin"] }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.97.2" }
 
 itertools = { workspace = true }
 
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index 9fe63f61b5..2a7b1e9c6c 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -5,18 +5,18 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-color-confi
 edition = "2021"
 license = "MIT"
 name = "nu-color-config"
-version = "0.97.1"
+version = "0.97.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
-nu-engine = { path = "../nu-engine", version = "0.97.1" }
-nu-json = { path = "../nu-json", version = "0.97.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
+nu-engine = { path = "../nu-engine", version = "0.97.2" }
+nu-json = { path = "../nu-json", version = "0.97.2" }
 nu-ansi-term = { workspace = true }
 
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.97.1" }
\ No newline at end of file
+nu-test-support = { path = "../nu-test-support", version = "0.97.2" }
\ No newline at end of file
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 82637dbc80..f905f804fd 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-command"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
-version = "0.97.1"
+version = "0.97.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,21 +13,21 @@ version = "0.97.1"
 bench = false
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.97.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.97.1" }
-nu-engine = { path = "../nu-engine", version = "0.97.1" }
-nu-glob = { path = "../nu-glob", version = "0.97.1" }
-nu-json = { path = "../nu-json", version = "0.97.1" }
-nu-parser = { path = "../nu-parser", version = "0.97.1" }
-nu-path = { path = "../nu-path", version = "0.97.1" }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.97.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
-nu-system = { path = "../nu-system", version = "0.97.1" }
-nu-table = { path = "../nu-table", version = "0.97.1" }
-nu-term-grid = { path = "../nu-term-grid", version = "0.97.1" }
-nu-utils = { path = "../nu-utils", version = "0.97.1" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.97.2" }
+nu-color-config = { path = "../nu-color-config", version = "0.97.2" }
+nu-engine = { path = "../nu-engine", version = "0.97.2" }
+nu-glob = { path = "../nu-glob", version = "0.97.2" }
+nu-json = { path = "../nu-json", version = "0.97.2" }
+nu-parser = { path = "../nu-parser", version = "0.97.2" }
+nu-path = { path = "../nu-path", version = "0.97.2" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.97.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
+nu-system = { path = "../nu-system", version = "0.97.2" }
+nu-table = { path = "../nu-table", version = "0.97.2" }
+nu-term-grid = { path = "../nu-term-grid", version = "0.97.2" }
+nu-utils = { path = "../nu-utils", version = "0.97.2" }
 nu-ansi-term = { workspace = true }
-nuon = { path = "../nuon", version = "0.97.1" }
+nuon = { path = "../nuon", version = "0.97.2" }
 
 alphanumeric-sort = { workspace = true }
 base64 = { workspace = true }
@@ -137,8 +137,8 @@ sqlite = ["rusqlite"]
 trash-support = ["trash"]
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.97.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.2" }
+nu-test-support = { path = "../nu-test-support", version = "0.97.2" }
 
 dirs = { workspace = true }
 mockito = { workspace = true, default-features = false }
diff --git a/crates/nu-derive-value/Cargo.toml b/crates/nu-derive-value/Cargo.toml
index 2790a953d4..d7d1ff6e4c 100644
--- a/crates/nu-derive-value/Cargo.toml
+++ b/crates/nu-derive-value/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-derive-value"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-derive-value"
-version = "0.97.1"
+version = "0.97.2"
 
 [lib]
 proc-macro = true
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index 1b8533bb33..42e5a0e07b 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-engine"
 edition = "2021"
 license = "MIT"
 name = "nu-engine"
-version = "0.97.1"
+version = "0.97.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.97.1" }
-nu-path = { path = "../nu-path", version = "0.97.1" }
-nu-glob = { path = "../nu-glob", version = "0.97.1" }
-nu-utils = { path = "../nu-utils", version = "0.97.1" }
+nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.97.2" }
+nu-path = { path = "../nu-path", version = "0.97.2" }
+nu-glob = { path = "../nu-glob", version = "0.97.2" }
+nu-utils = { path = "../nu-utils", version = "0.97.2" }
 log = { workspace = true }
 terminal_size = { workspace = true }
 
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index 362f5f8e8a..b1acd89bf1 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -5,21 +5,21 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-explore"
 edition = "2021"
 license = "MIT"
 name = "nu-explore"
-version = "0.97.1"
+version = "0.97.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
-nu-parser = { path = "../nu-parser", version = "0.97.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.97.1" }
-nu-engine = { path = "../nu-engine", version = "0.97.1" }
-nu-table = { path = "../nu-table", version = "0.97.1" }
-nu-json = { path = "../nu-json", version = "0.97.1" }
-nu-utils = { path = "../nu-utils", version = "0.97.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
+nu-parser = { path = "../nu-parser", version = "0.97.2" }
+nu-color-config = { path = "../nu-color-config", version = "0.97.2" }
+nu-engine = { path = "../nu-engine", version = "0.97.2" }
+nu-table = { path = "../nu-table", version = "0.97.2" }
+nu-json = { path = "../nu-json", version = "0.97.2" }
+nu-utils = { path = "../nu-utils", version = "0.97.2" }
 nu-ansi-term = { workspace = true }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.97.1" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.97.2" }
 
 anyhow = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-glob/Cargo.toml b/crates/nu-glob/Cargo.toml
index 9c84829189..4206fe85ad 100644
--- a/crates/nu-glob/Cargo.toml
+++ b/crates/nu-glob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-glob"
-version = "0.97.1"
+version = "0.97.2"
 authors = ["The Nushell Project Developers", "The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 description = """
diff --git a/crates/nu-json/Cargo.toml b/crates/nu-json/Cargo.toml
index b9368243bd..139436d95b 100644
--- a/crates/nu-json/Cargo.toml
+++ b/crates/nu-json/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-json"
 edition = "2021"
 license = "MIT"
 name = "nu-json"
-version = "0.97.1"
+version = "0.97.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -26,7 +26,7 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.97.1" }
-nu-path = { path = "../nu-path", version = "0.97.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.97.2" }
+nu-path = { path = "../nu-path", version = "0.97.2" }
 serde_json = "1.0"
 fancy-regex = "0.13.0"
\ No newline at end of file
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index e002c21063..255dc58253 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -3,14 +3,14 @@ authors = ["The Nushell Project Developers"]
 description = "Nushell's integrated LSP server"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-lsp"
 name = "nu-lsp"
-version = "0.97.1"
+version = "0.97.2"
 edition = "2021"
 license = "MIT"
 
 [dependencies]
-nu-cli = { path = "../nu-cli", version = "0.97.1" }
-nu-parser = { path = "../nu-parser", version = "0.97.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
+nu-cli = { path = "../nu-cli", version = "0.97.2" }
+nu-parser = { path = "../nu-parser", version = "0.97.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
 
 reedline = { workspace = true }
 
@@ -23,8 +23,8 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.1" }
-nu-command = { path = "../nu-command", version = "0.97.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.97.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.2" }
+nu-command = { path = "../nu-command", version = "0.97.2" }
+nu-test-support = { path = "../nu-test-support", version = "0.97.2" }
 
 assert-json-diff = "2.0"
\ No newline at end of file
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index bb4d1a62f4..49a0dbc0a7 100644
--- a/crates/nu-parser/Cargo.toml
+++ b/crates/nu-parser/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-parser"
 edition = "2021"
 license = "MIT"
 name = "nu-parser"
-version = "0.97.1"
+version = "0.97.2"
 exclude = ["/fuzz"]
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.97.1" }
-nu-path = { path = "../nu-path", version = "0.97.1" }
-nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.97.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
+nu-engine = { path = "../nu-engine", version = "0.97.2" }
+nu-path = { path = "../nu-path", version = "0.97.2" }
+nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.97.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
 
 bytesize = { workspace = true }
 chrono = { default-features = false, features = ['std'], workspace = true }
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index a65a25054e..af219d58e0 100644
--- a/crates/nu-path/Cargo.toml
+++ b/crates/nu-path/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-path"
 edition = "2021"
 license = "MIT"
 name = "nu-path"
-version = "0.97.1"
+version = "0.97.2"
 exclude = ["/fuzz"]
 
 [lib]
diff --git a/crates/nu-plugin-core/Cargo.toml b/crates/nu-plugin-core/Cargo.toml
index 855fc07d10..018f7d1f08 100644
--- a/crates/nu-plugin-core/Cargo.toml
+++ b/crates/nu-plugin-core/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-core
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-core"
-version = "0.97.1"
+version = "0.97.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.97.1", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.97.2", default-features = false }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true }
diff --git a/crates/nu-plugin-engine/Cargo.toml b/crates/nu-plugin-engine/Cargo.toml
index c84f9714bc..cd01707da8 100644
--- a/crates/nu-plugin-engine/Cargo.toml
+++ b/crates/nu-plugin-engine/Cargo.toml
@@ -5,18 +5,18 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-engi
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-engine"
-version = "0.97.1"
+version = "0.97.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.97.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
-nu-system = { path = "../nu-system", version = "0.97.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.97.1" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.97.1", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.97.1" }
+nu-engine = { path = "../nu-engine", version = "0.97.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
+nu-system = { path = "../nu-system", version = "0.97.2" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.97.2" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.97.2", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.97.2" }
 
 serde = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-plugin-protocol/Cargo.toml b/crates/nu-plugin-protocol/Cargo.toml
index 421470417f..bfd2dcbc28 100644
--- a/crates/nu-plugin-protocol/Cargo.toml
+++ b/crates/nu-plugin-protocol/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-prot
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-protocol"
-version = "0.97.1"
+version = "0.97.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.97.1", features = ["plugin"] }
-nu-utils = { path = "../nu-utils", version = "0.97.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.2", features = ["plugin"] }
+nu-utils = { path = "../nu-utils", version = "0.97.2" }
 
 bincode = "1.3"
 serde = { workspace = true, features = ["derive"] }
diff --git a/crates/nu-plugin-test-support/Cargo.toml b/crates/nu-plugin-test-support/Cargo.toml
index 9d0c56736c..5e44966f8c 100644
--- a/crates/nu-plugin-test-support/Cargo.toml
+++ b/crates/nu-plugin-test-support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-plugin-test-support"
-version = "0.97.1"
+version = "0.97.2"
 edition = "2021"
 license = "MIT"
 description = "Testing support for Nushell plugins"
@@ -12,14 +12,14 @@ bench = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.97.1", features = ["plugin"] }
-nu-protocol = { path = "../nu-protocol", version = "0.97.1", features = ["plugin"] }
-nu-parser = { path = "../nu-parser", version = "0.97.1", features = ["plugin"] }
-nu-plugin = { path = "../nu-plugin", version = "0.97.1" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.97.1" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.97.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.97.1" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.1" }
+nu-engine = { path = "../nu-engine", version = "0.97.2", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.97.2", features = ["plugin"] }
+nu-parser = { path = "../nu-parser", version = "0.97.2", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.97.2" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.97.2" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.97.2" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.97.2" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.2" }
 nu-ansi-term = { workspace = true }
 similar = "2.6"
 
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index 139a432a47..94d749de2c 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -5,17 +5,17 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin"
 edition = "2021"
 license = "MIT"
 name = "nu-plugin"
-version = "0.97.1"
+version = "0.97.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.97.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.97.1" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.97.1", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.97.1" }
+nu-engine = { path = "../nu-engine", version = "0.97.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.97.2" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.97.2", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.97.2" }
 
 log = { workspace = true }
 thiserror = "1.0"
diff --git a/crates/nu-pretty-hex/Cargo.toml b/crates/nu-pretty-hex/Cargo.toml
index 573464adf3..1f58d53340 100644
--- a/crates/nu-pretty-hex/Cargo.toml
+++ b/crates/nu-pretty-hex/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-pretty-hex"
 edition = "2021"
 license = "MIT"
 name = "nu-pretty-hex"
-version = "0.97.1"
+version = "0.97.2"
 
 [lib]
 doctest = false
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 51cae765ef..e48f96a213 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-protocol"
 edition = "2021"
 license = "MIT"
 name = "nu-protocol"
-version = "0.97.1"
+version = "0.97.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,10 +13,10 @@ version = "0.97.1"
 bench = false
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.97.1" }
-nu-path = { path = "../nu-path", version = "0.97.1" }
-nu-system = { path = "../nu-system", version = "0.97.1" }
-nu-derive-value = { path = "../nu-derive-value", version = "0.97.1" }
+nu-utils = { path = "../nu-utils", version = "0.97.2" }
+nu-path = { path = "../nu-path", version = "0.97.2" }
+nu-system = { path = "../nu-system", version = "0.97.2" }
+nu-derive-value = { path = "../nu-derive-value", version = "0.97.2" }
 
 brotli = { workspace = true, optional = true }
 byte-unit = { version = "5.1", features = [ "serde" ] }
@@ -53,7 +53,7 @@ plugin = [
 serde_json = { workspace = true }
 strum = "0.26"
 strum_macros = "0.26"
-nu-test-support = { path = "../nu-test-support", version = "0.97.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.97.2" }
 pretty_assertions = { workspace = true }
 rstest = { workspace = true }
 tempfile = { workspace = true }
diff --git a/crates/nu-std/Cargo.toml b/crates/nu-std/Cargo.toml
index 5ec6f0b76b..1ecbd5280a 100644
--- a/crates/nu-std/Cargo.toml
+++ b/crates/nu-std/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-std"
 edition = "2021"
 license = "MIT"
 name = "nu-std"
-version = "0.97.1"
+version = "0.97.2"
 
 [dependencies]
-nu-parser = { version = "0.97.1", path = "../nu-parser" }
-nu-protocol = { version = "0.97.1", path = "../nu-protocol" }
-nu-engine = { version = "0.97.1", path = "../nu-engine" }
+nu-parser = { version = "0.97.2", path = "../nu-parser" }
+nu-protocol = { version = "0.97.2", path = "../nu-protocol" }
+nu-engine = { version = "0.97.2", path = "../nu-engine" }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
 
 log = "0.4"
\ No newline at end of file
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index 67bf2bf21f..be7a36b3c6 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["The Nushell Project Developers", "procs creators"]
 description = "Nushell system querying"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-system"
 name = "nu-system"
-version = "0.97.1"
+version = "0.97.2"
 edition = "2021"
 license = "MIT"
 
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index 908124f52d..7ed9de41e1 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -5,20 +5,20 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-table"
 edition = "2021"
 license = "MIT"
 name = "nu-table"
-version = "0.97.1"
+version = "0.97.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
-nu-utils = { path = "../nu-utils", version = "0.97.1" }
-nu-engine = { path = "../nu-engine", version = "0.97.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.97.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
+nu-utils = { path = "../nu-utils", version = "0.97.2" }
+nu-engine = { path = "../nu-engine", version = "0.97.2" }
+nu-color-config = { path = "../nu-color-config", version = "0.97.2" }
 nu-ansi-term = { workspace = true }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 tabled = { workspace = true, features = ["color"], default-features = false }
 
 [dev-dependencies]
-# nu-test-support = { path="../nu-test-support", version = "0.97.1"  }
\ No newline at end of file
+# nu-test-support = { path="../nu-test-support", version = "0.97.2"  }
\ No newline at end of file
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index 2dc6182c9f..b8a4328da3 100644
--- a/crates/nu-term-grid/Cargo.toml
+++ b/crates/nu-term-grid/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-term-grid"
 edition = "2021"
 license = "MIT"
 name = "nu-term-grid"
-version = "0.97.1"
+version = "0.97.2"
 
 [lib]
 bench = false
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.97.1" }
+nu-utils = { path = "../nu-utils", version = "0.97.2" }
 
 unicode-width = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml
index 16ad9491ea..fa6f818561 100644
--- a/crates/nu-test-support/Cargo.toml
+++ b/crates/nu-test-support/Cargo.toml
@@ -5,16 +5,16 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-test-suppor
 edition = "2021"
 license = "MIT"
 name = "nu-test-support"
-version = "0.97.1"
+version = "0.97.2"
 
 [lib]
 doctest = false
 bench = false
 
 [dependencies]
-nu-path = { path = "../nu-path", version = "0.97.1" }
-nu-glob = { path = "../nu-glob", version = "0.97.1" }
-nu-utils = { path = "../nu-utils", version = "0.97.1" }
+nu-path = { path = "../nu-path", version = "0.97.2" }
+nu-glob = { path = "../nu-glob", version = "0.97.2" }
+nu-utils = { path = "../nu-utils", version = "0.97.2" }
 
 num-format = { workspace = true }
 which = { workspace = true }
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index 1941f848e0..a5b3e42d4c 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-utils"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-utils"
-version = "0.97.1"
+version = "0.97.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index 830a56a558..5345613d3b 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -1,6 +1,6 @@
 # Nushell Config File
 #
-# version = "0.97.1"
+# version = "0.97.2"
 
 # For more information on defining custom themes, see
 # https://www.nushell.sh/book/coloring_and_theming.html
diff --git a/crates/nu-utils/src/sample_config/default_env.nu b/crates/nu-utils/src/sample_config/default_env.nu
index bfbd1e7109..2988e1f100 100644
--- a/crates/nu-utils/src/sample_config/default_env.nu
+++ b/crates/nu-utils/src/sample_config/default_env.nu
@@ -1,6 +1,6 @@
 # Nushell Environment Config File
 #
-# version = "0.97.1"
+# version = "0.97.2"
 
 def create_left_prompt [] {
     let dir = match (do --ignore-shell-errors { $env.PWD | path relative-to $nu.home-path }) {
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index aae80b47cb..90e00b1feb 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -10,10 +10,10 @@ name = "nu_plugin_custom_values"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.97.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.97.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.2", features = ["plugin"] }
 serde = { workspace = true, default-features = false }
 typetag = "0.2"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.97.1" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.97.2" }
\ No newline at end of file
diff --git a/crates/nu_plugin_example/Cargo.toml b/crates/nu_plugin_example/Cargo.toml
index cc6de792c9..c16f6c2573 100644
--- a/crates/nu_plugin_example/Cargo.toml
+++ b/crates/nu_plugin_example/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_exam
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_example"
-version = "0.97.1"
+version = "0.97.2"
 
 [[bin]]
 name = "nu_plugin_example"
@@ -15,9 +15,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.97.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.97.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.2", features = ["plugin"] }
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.97.1" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.1" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.97.2" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.2" }
\ No newline at end of file
diff --git a/crates/nu_plugin_formats/Cargo.toml b/crates/nu_plugin_formats/Cargo.toml
index 5b373b731c..157c75a847 100644
--- a/crates/nu_plugin_formats/Cargo.toml
+++ b/crates/nu_plugin_formats/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_form
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_formats"
-version = "0.97.1"
+version = "0.97.2"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.97.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.97.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.2", features = ["plugin"] }
 
 indexmap = { workspace = true }
 eml-parser = "0.1"
@@ -20,4 +20,4 @@ plist = "1.7"
 chrono = "0.4"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.97.1" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.97.2" }
\ No newline at end of file
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index a480271b0f..368f13529b 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gsta
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_gstat"
-version = "0.97.1"
+version = "0.97.2"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_gstat"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.97.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.97.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
 
 git2 = "0.19"
\ No newline at end of file
diff --git a/crates/nu_plugin_inc/Cargo.toml b/crates/nu_plugin_inc/Cargo.toml
index 5593b03de5..09904bb1a5 100644
--- a/crates/nu_plugin_inc/Cargo.toml
+++ b/crates/nu_plugin_inc/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_inc"
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_inc"
-version = "0.97.1"
+version = "0.97.2"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_inc"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.97.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.97.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.2", features = ["plugin"] }
 
 semver = "1.0"
\ No newline at end of file
diff --git a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
index 33c379c2ea..578f0dc5f3 100755
--- a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
+++ b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
@@ -6,7 +6,7 @@
 # it also allows us to test the plugin interface with something manually implemented in a scripting
 # language without adding any extra dependencies to our tests.
 
-const NUSHELL_VERSION = "0.97.1"
+const NUSHELL_VERSION = "0.97.2"
 const PLUGIN_VERSION = "0.1.1" # bump if you change commands!
 
 def main [--stdio] {
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index f85bdda0bd..70c901c4ce 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu_plugin_polars"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_polars"
-version = "0.97.1"
+version = "0.97.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -17,10 +17,10 @@ bench = false
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
-nu-plugin = { path = "../nu-plugin", version = "0.97.1" }
-nu-path = { path = "../nu-path", version = "0.97.1" }
-nu-utils = { path = "../nu-utils", version = "0.97.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
+nu-plugin = { path = "../nu-plugin", version = "0.97.2" }
+nu-path = { path = "../nu-path", version = "0.97.2" }
+nu-utils = { path = "../nu-utils", version = "0.97.2" }
 
 # Potential dependencies for extras
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
@@ -77,9 +77,9 @@ optional = false
 version = "0.41"
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.1" }
-nu-engine = { path = "../nu-engine", version = "0.97.1" }
-nu-parser = { path = "../nu-parser", version = "0.97.1" }
-nu-command = { path = "../nu-command", version = "0.97.1" }
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.97.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.2" }
+nu-engine = { path = "../nu-engine", version = "0.97.2" }
+nu-parser = { path = "../nu-parser", version = "0.97.2" }
+nu-command = { path = "../nu-command", version = "0.97.2" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.97.2" }
 tempfile.workspace = true
\ No newline at end of file
diff --git a/crates/nu_plugin_python/nu_plugin_python_example.py b/crates/nu_plugin_python/nu_plugin_python_example.py
index e5dc59c871..a47ce46997 100755
--- a/crates/nu_plugin_python/nu_plugin_python_example.py
+++ b/crates/nu_plugin_python/nu_plugin_python_example.py
@@ -27,7 +27,7 @@ import sys
 import json
 
 
-NUSHELL_VERSION = "0.97.1"
+NUSHELL_VERSION = "0.97.2"
 PLUGIN_VERSION = "0.1.1"  # bump if you change commands!
 
 
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index 07b109d140..f6bc2b5918 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_quer
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_query"
-version = "0.97.1"
+version = "0.97.2"
 
 [lib]
 doctest = false
@@ -16,8 +16,8 @@ name = "nu_plugin_query"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.97.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.97.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
 
 gjson = "0.8"
 scraper = { default-features = false, version = "0.20" }
diff --git a/crates/nu_plugin_stress_internals/Cargo.toml b/crates/nu_plugin_stress_internals/Cargo.toml
index 0e50679e66..7d4050bfa3 100644
--- a/crates/nu_plugin_stress_internals/Cargo.toml
+++ b/crates/nu_plugin_stress_internals/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_stre
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_stress_internals"
-version = "0.97.1"
+version = "0.97.2"
 
 [[bin]]
 name = "nu_plugin_stress_internals"
diff --git a/crates/nuon/Cargo.toml b/crates/nuon/Cargo.toml
index 0ab09fafac..1f91935e48 100644
--- a/crates/nuon/Cargo.toml
+++ b/crates/nuon/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nuon"
 edition = "2021"
 license = "MIT"
 name = "nuon"
-version = "0.97.1"
+version = "0.97.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-parser = { path = "../nu-parser", version = "0.97.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.1" }
-nu-engine = { path = "../nu-engine", version = "0.97.1" }
+nu-parser = { path = "../nu-parser", version = "0.97.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
+nu-engine = { path = "../nu-engine", version = "0.97.2" }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 

From 7a888c9e9bb16d3410ddabb4149e3873ef2a239c Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Thu, 22 Aug 2024 02:38:43 -0700
Subject: [PATCH 0359/1072] Change behavior of `into record` on lists to be
 more useful (#13637)

# Description

The previous behaviour of `into record` on lists was to create a new
record with each list index as the key. This was not very useful for
creating meaningful records, though, and most people would end up using
commands like `headers` or `transpose` to turn a list of keys and values
into a record.

This PR changes that instead to do what I think the most ergonomic thing
is, and instead:

- A list of records is merged into one record.
- A list of pairs (two element lists) is folded into a record with the
first element of each pair being the key, and the second being the
value.

The former is just generally more useful than having to use `reduce`
with `merge` for such a common operation, and the latter is useful
because it means that `$a | zip $b | into record` *just works* in the
way that seems most obvious.

Example:

```nushell
[[foo bar] [baz quux]] | into record # => {foo: bar, baz: quux}
[{foo: bar} {baz: quux}] | into record # => {foo: bar, baz: quux}
[foo baz] | zip [bar quux] | into record # => {foo: bar, baz: quux}
```

The support for range input has been removed, as it would no longer
reflect the treatment of an equivalent list.

The following is equivalent to the old behavior, in case that's desired:

```
0.. | zip [a b c] | into record # => {0: a, 1: b, 2: c}
```

# User-Facing Changes
- `into record` changed as described above (breaking)
- `into record` no longer supports range input (breaking)

# Tests + Formatting
Examples changed to match, everything works. Some usage in stdlib and
`nu_plugin_nu_example` had to be changed.

# After Submitting
- [ ] release notes (commands, breaking change)
---
 .../nu-command/src/conversions/into/record.rs | 136 +++++++++++-------
 .../tests/commands/conversions/into/mod.rs    |   1 +
 .../tests/commands/conversions/into/record.rs |   8 ++
 crates/nu-std/std/iter.nu                     |   6 +-
 .../nu_plugin_nu_example.nu                   |   3 +-
 5 files changed, 98 insertions(+), 56 deletions(-)
 create mode 100644 crates/nu-command/tests/commands/conversions/into/record.rs

diff --git a/crates/nu-command/src/conversions/into/record.rs b/crates/nu-command/src/conversions/into/record.rs
index 1f332d9c85..ed86c5848e 100644
--- a/crates/nu-command/src/conversions/into/record.rs
+++ b/crates/nu-command/src/conversions/into/record.rs
@@ -16,7 +16,6 @@ impl Command for SubCommand {
                 (Type::Date, Type::record()),
                 (Type::Duration, Type::record()),
                 (Type::List(Box::new(Type::Any)), Type::record()),
-                (Type::Range, Type::record()),
                 (Type::record(), Type::record()),
             ])
             .category(Category::Conversions)
@@ -32,12 +31,12 @@ impl Command for SubCommand {
 
     fn run(
         &self,
-        engine_state: &EngineState,
+        _engine_state: &EngineState,
         _stack: &mut Stack,
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        into_record(engine_state, call, input)
+        into_record(call, input)
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -50,21 +49,19 @@ impl Command for SubCommand {
                 })),
             },
             Example {
-                description: "Convert from list to record",
-                example: "[1 2 3] | into record",
+                description: "Convert from list of records to record",
+                example: "[{foo: bar} {baz: quux}] | into record",
                 result: Some(Value::test_record(record! {
-                    "0" => Value::test_int(1),
-                    "1" => Value::test_int(2),
-                    "2" => Value::test_int(3),
+                    "foo" => Value::test_string("bar"),
+                    "baz" => Value::test_string("quux"),
                 })),
             },
             Example {
-                description: "Convert from range to record",
-                example: "0..2 | into record",
+                description: "Convert from list of pairs into record",
+                example: "[[foo bar] [baz quux]] | into record",
                 result: Some(Value::test_record(record! {
-                    "0" => Value::test_int(0),
-                    "1" => Value::test_int(1),
-                    "2" => Value::test_int(2),
+                    "foo" => Value::test_string("bar"),
+                    "baz" => Value::test_string("quux"),
                 })),
             },
             Example {
@@ -103,45 +100,82 @@ impl Command for SubCommand {
     }
 }
 
-fn into_record(
-    engine_state: &EngineState,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let input = input.into_value(call.head)?;
-    let input_type = input.get_type();
-    let span = input.span();
-    let res = match input {
-        Value::Date { val, .. } => parse_date_into_record(val, span),
-        Value::Duration { val, .. } => parse_duration_into_record(val, span),
-        Value::List { mut vals, .. } => match input_type {
-            Type::Table(..) if vals.len() == 1 => vals.pop().expect("already checked 1 item"),
-            _ => Value::record(
-                vals.into_iter()
-                    .enumerate()
-                    .map(|(idx, val)| (format!("{idx}"), val))
-                    .collect(),
-                span,
-            ),
-        },
-        Value::Range { val, .. } => Value::record(
-            val.into_range_iter(span, engine_state.signals().clone())
-                .enumerate()
-                .map(|(idx, val)| (format!("{idx}"), val))
-                .collect(),
+fn into_record(call: &Call, input: PipelineData) -> Result<PipelineData, ShellError> {
+    let span = input.span().unwrap_or(call.head);
+    match input {
+        PipelineData::Value(Value::Date { val, .. }, _) => {
+            Ok(parse_date_into_record(val, span).into_pipeline_data())
+        }
+        PipelineData::Value(Value::Duration { val, .. }, _) => {
+            Ok(parse_duration_into_record(val, span).into_pipeline_data())
+        }
+        PipelineData::Value(Value::List { .. }, _) | PipelineData::ListStream(..) => {
+            let mut record = Record::new();
+            let metadata = input.metadata();
+
+            enum ExpectedType {
+                Record,
+                Pair,
+            }
+            let mut expected_type = None;
+
+            for item in input.into_iter() {
+                let span = item.span();
+                match item {
+                    Value::Record { val, .. }
+                        if matches!(expected_type, None | Some(ExpectedType::Record)) =>
+                    {
+                        // Don't use .extend() unless that gets changed to check for duplicate keys
+                        for (key, val) in val.into_owned() {
+                            record.insert(key, val);
+                        }
+                        expected_type = Some(ExpectedType::Record);
+                    }
+                    Value::List { mut vals, .. }
+                        if matches!(expected_type, None | Some(ExpectedType::Pair)) =>
+                    {
+                        if vals.len() == 2 {
+                            let (val, key) = vals.pop().zip(vals.pop()).expect("length is < 2");
+                            record.insert(key.coerce_into_string()?, val);
+                        } else {
+                            return Err(ShellError::IncorrectValue {
+                                msg: format!(
+                                    "expected inner list with two elements, but found {} element(s)",
+                                    vals.len()
+                                ),
+                                val_span: span,
+                                call_span: call.head,
+                            });
+                        }
+                        expected_type = Some(ExpectedType::Pair);
+                    }
+                    Value::Nothing { .. } => {}
+                    Value::Error { error, .. } => return Err(*error),
+                    _ => {
+                        return Err(ShellError::TypeMismatch {
+                            err_message: format!(
+                                "expected {}, found {} (while building record from list)",
+                                match expected_type {
+                                    Some(ExpectedType::Record) => "record",
+                                    Some(ExpectedType::Pair) => "list with two elements",
+                                    None => "record or list with two elements",
+                                },
+                                item.get_type(),
+                            ),
+                            span,
+                        })
+                    }
+                }
+            }
+            Ok(Value::record(record, span).into_pipeline_data_with_metadata(metadata))
+        }
+        PipelineData::Value(Value::Record { .. }, _) => Ok(input),
+        PipelineData::Value(Value::Error { error, .. }, _) => Err(*error),
+        other => Err(ShellError::TypeMismatch {
+            err_message: format!("Can't convert {} to record", other.get_type()),
             span,
-        ),
-        Value::Record { .. } => input,
-        Value::Error { .. } => input,
-        other => Value::error(
-            ShellError::TypeMismatch {
-                err_message: format!("Can't convert {} to record", other.get_type()),
-                span: other.span(),
-            },
-            call.head,
-        ),
-    };
-    Ok(res.into_pipeline_data())
+        }),
+    }
 }
 
 fn parse_date_into_record(date: DateTime<FixedOffset>, span: Span) -> Value {
diff --git a/crates/nu-command/tests/commands/conversions/into/mod.rs b/crates/nu-command/tests/commands/conversions/into/mod.rs
index ad10199b5c..2d959033af 100644
--- a/crates/nu-command/tests/commands/conversions/into/mod.rs
+++ b/crates/nu-command/tests/commands/conversions/into/mod.rs
@@ -1,2 +1,3 @@
 mod binary;
 mod int;
+mod record;
diff --git a/crates/nu-command/tests/commands/conversions/into/record.rs b/crates/nu-command/tests/commands/conversions/into/record.rs
new file mode 100644
index 0000000000..d446ec22f3
--- /dev/null
+++ b/crates/nu-command/tests/commands/conversions/into/record.rs
@@ -0,0 +1,8 @@
+use nu_test_support::nu;
+
+#[test]
+fn doesnt_accept_mixed_type_list_as_input() {
+    let actual = nu!("[{foo: bar} [quux baz]] | into record");
+    assert!(!actual.status.success());
+    assert!(actual.err.contains("type_mismatch"));
+}
diff --git a/crates/nu-std/std/iter.nu b/crates/nu-std/std/iter.nu
index b64659bcc4..8c25269690 100644
--- a/crates/nu-std/std/iter.nu
+++ b/crates/nu-std/std/iter.nu
@@ -216,7 +216,7 @@ export def zip-with [ # -> list<any>
 export def zip-into-record [ # -> table<any>
     other: list                     # the values to zip with
 ] {
-    into record
-    | append ($other | into record)
-    | headers
+    zip $other
+    | into record
+    | [$in]
 }
diff --git a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
index 578f0dc5f3..51e2ef1ac8 100755
--- a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
+++ b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
@@ -148,8 +148,7 @@ def process_call [
                       }
                     }
                   }) |
-                  each { into record } |
-                  transpose --as-record --header-row
+                  into record
               ),
               span: $span
             }

From 9261c0c55aa21510d7f6b95327b76fa2178f3dfa Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Thu, 22 Aug 2024 02:39:21 -0700
Subject: [PATCH 0360/1072] Be explicit about `reduce` args and input (#13646)

# Description

`run_with_value` is meant for running simple closures with one arg.
Using `run_with_value` after `add_arg` is slightly confusing.
---
 crates/nu-command/src/filters/reduce.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/filters/reduce.rs b/crates/nu-command/src/filters/reduce.rs
index 4fca1df3a4..ffd2e850d9 100644
--- a/crates/nu-command/src/filters/reduce.rs
+++ b/crates/nu-command/src/filters/reduce.rs
@@ -120,7 +120,8 @@ impl Command for Reduce {
             engine_state.signals().check(head)?;
             acc = closure
                 .add_arg(value)
-                .run_with_value(acc)?
+                .add_arg(acc.clone())
+                .run_with_input(PipelineData::Value(acc, None))?
                 .into_value(head)?;
         }
 

From 3ab9f0b90a00e2ff56f2939529c42c239cf49561 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Thu, 22 Aug 2024 11:54:27 +0200
Subject: [PATCH 0361/1072] Fix bugs and UB in bit shifting ops (#13663)

# Description
Fixes #11267

Shifting by a `shift >= num_bits` is undefined in the underlying
operation. Previously we also had an overflow on negative shifts for the
operators `bit-shl` and `bit-shr`
Furthermore I found a severe bug in the implementation of shifting of
`binary` data with the commands `bits shl` and `bits shr`, this
categorically produced incorrect results with shifts that were not
`shift % 4 == 0`. `bits shr` also was able to produce outputs with
different size to the input if the shift was exceeding the length of the
input data by more than a byte.

# User-Facing Changes
It is now an error trying to shift by more than the available bits with:
- `bit-shl` operator
- `bit-shr` operator
- command `bits shl`
- command `bits shr`

# Tests + Formatting
Added testing for all relevant cases
---
 crates/nu-cmd-extra/src/extra/bits/mod.rs     |  19 +++
 .../nu-cmd-extra/src/extra/bits/shift_left.rs |  87 ++++++++---
 .../src/extra/bits/shift_right.rs             |  89 ++++++++---
 crates/nu-protocol/src/value/mod.rs           |  26 +++-
 tests/repl/test_bits.rs                       | 138 +++++++++++++++++-
 tests/repl/test_math.rs                       |  25 ++++
 6 files changed, 343 insertions(+), 41 deletions(-)

diff --git a/crates/nu-cmd-extra/src/extra/bits/mod.rs b/crates/nu-cmd-extra/src/extra/bits/mod.rs
index 6d1200a6bf..145d66d777 100644
--- a/crates/nu-cmd-extra/src/extra/bits/mod.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/mod.rs
@@ -44,6 +44,25 @@ enum InputNumType {
     SignedEight,
 }
 
+impl InputNumType {
+    fn num_bits(self) -> u32 {
+        match self {
+            InputNumType::One => 8,
+            InputNumType::Two => 16,
+            InputNumType::Four => 32,
+            InputNumType::Eight => 64,
+            InputNumType::SignedOne => 8,
+            InputNumType::SignedTwo => 16,
+            InputNumType::SignedFour => 32,
+            InputNumType::SignedEight => 64,
+        }
+    }
+
+    fn is_permitted_bit_shift(self, bits: u32) -> bool {
+        bits < self.num_bits()
+    }
+}
+
 fn get_number_bytes(
     number_bytes: Option<Spanned<usize>>,
     head: Span,
diff --git a/crates/nu-cmd-extra/src/extra/bits/shift_left.rs b/crates/nu-cmd-extra/src/extra/bits/shift_left.rs
index 6a67a45e0e..e3b484a7d4 100644
--- a/crates/nu-cmd-extra/src/extra/bits/shift_left.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/shift_left.rs
@@ -7,7 +7,7 @@ use std::iter;
 
 struct Arguments {
     signed: bool,
-    bits: usize,
+    bits: Spanned<usize>,
     number_size: NumberBytes,
 }
 
@@ -71,7 +71,9 @@ impl Command for BitsShl {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
-        let bits: usize = call.req(engine_state, stack, 0)?;
+        // This restricts to a positive shift value (our underlying operations do not
+        // permit them)
+        let bits: Spanned<usize> = call.req(engine_state, stack, 0)?;
         let signed = call.has_flag(engine_state, stack, "signed")?;
         let number_bytes: Option<Spanned<usize>> =
             call.get_flag(engine_state, stack, "number-bytes")?;
@@ -131,14 +133,29 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
         number_size,
         bits,
     } = *args;
+    let bits_span = bits.span;
+    let bits = bits.item;
 
     match input {
         Value::Int { val, .. } => {
             use InputNumType::*;
             let val = *val;
-            let bits = bits as u64;
+            let bits = bits as u32;
 
             let input_num_type = get_input_num_type(val, signed, number_size);
+            if !input_num_type.is_permitted_bit_shift(bits) {
+                return Value::error(
+                    ShellError::IncorrectValue {
+                        msg: format!(
+                            "Trying to shift by more than the available bits (permitted < {})",
+                            input_num_type.num_bits()
+                        ),
+                        val_span: bits_span,
+                        call_span: span,
+                    },
+                    span,
+                );
+            }
             let int = match input_num_type {
                 One => ((val as u8) << bits) as i64,
                 Two => ((val as u16) << bits) as i64,
@@ -147,12 +164,14 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
                     let Ok(i) = i64::try_from((val as u64) << bits) else {
                         return Value::error(
                             ShellError::GenericError {
-                                error: "result out of range for specified number".into(),
+                                error: "result out of range for int".into(),
                                 msg: format!(
                                     "shifting left by {bits} is out of range for the value {val}"
                                 ),
                                 span: Some(span),
-                                help: None,
+                                help: Some(
+                                    "Ensure the result fits in a 64-bit signed integer.".into(),
+                                ),
                                 inner: vec![],
                             },
                             span,
@@ -172,19 +191,26 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
             let byte_shift = bits / 8;
             let bit_shift = bits % 8;
 
-            use itertools::Position::*;
-            let bytes = val
-                .iter()
-                .copied()
-                .skip(byte_shift)
-                .circular_tuple_windows::<(u8, u8)>()
-                .with_position()
-                .map(|(pos, (lhs, rhs))| match pos {
-                    Last | Only => lhs << bit_shift,
-                    _ => (lhs << bit_shift) | (rhs >> bit_shift),
-                })
-                .chain(iter::repeat(0).take(byte_shift))
-                .collect::<Vec<u8>>();
+            // This is purely for symmetry with the int case and the fact that the
+            // shift right implementation in its current form panicked with an overflow
+            if bits > val.len() * 8 {
+                return Value::error(
+                    ShellError::IncorrectValue {
+                        msg: format!(
+                            "Trying to shift by more than the available bits ({})",
+                            val.len() * 8
+                        ),
+                        val_span: bits_span,
+                        call_span: span,
+                    },
+                    span,
+                );
+            }
+            let bytes = if bit_shift == 0 {
+                shift_bytes_left(val, byte_shift)
+            } else {
+                shift_bytes_and_bits_left(val, byte_shift, bit_shift)
+            };
 
             Value::binary(bytes, span)
         }
@@ -202,6 +228,31 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
     }
 }
 
+fn shift_bytes_left(data: &[u8], byte_shift: usize) -> Vec<u8> {
+    let len = data.len();
+    let mut output = vec![0; len];
+    output[..len - byte_shift].copy_from_slice(&data[byte_shift..]);
+    output
+}
+
+fn shift_bytes_and_bits_left(data: &[u8], byte_shift: usize, bit_shift: usize) -> Vec<u8> {
+    use itertools::Position::*;
+    debug_assert!((1..8).contains(&bit_shift),
+        "Bit shifts of 0 can't be handled by this impl and everything else should be part of the byteshift"
+    );
+    data.iter()
+        .copied()
+        .skip(byte_shift)
+        .circular_tuple_windows::<(u8, u8)>()
+        .with_position()
+        .map(|(pos, (lhs, rhs))| match pos {
+            Last | Only => lhs << bit_shift,
+            _ => (lhs << bit_shift) | (rhs >> (8 - bit_shift)),
+        })
+        .chain(iter::repeat(0).take(byte_shift))
+        .collect::<Vec<u8>>()
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/crates/nu-cmd-extra/src/extra/bits/shift_right.rs b/crates/nu-cmd-extra/src/extra/bits/shift_right.rs
index e45e10ac94..9bb5b1563a 100644
--- a/crates/nu-cmd-extra/src/extra/bits/shift_right.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/shift_right.rs
@@ -1,13 +1,10 @@
 use super::{get_input_num_type, get_number_bytes, InputNumType, NumberBytes};
-use itertools::Itertools;
 use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
 
-use std::iter;
-
 struct Arguments {
     signed: bool,
-    bits: usize,
+    bits: Spanned<usize>,
     number_size: NumberBytes,
 }
 
@@ -71,7 +68,9 @@ impl Command for BitsShr {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
-        let bits: usize = call.req(engine_state, stack, 0)?;
+        // This restricts to a positive shift value (our underlying operations do not
+        // permit them)
+        let bits: Spanned<usize> = call.req(engine_state, stack, 0)?;
         let signed = call.has_flag(engine_state, stack, "signed")?;
         let number_bytes: Option<Spanned<usize>> =
             call.get_flag(engine_state, stack, "number-bytes")?;
@@ -121,6 +120,8 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
         number_size,
         bits,
     } = *args;
+    let bits_span = bits.span;
+    let bits = bits.item;
 
     match input {
         Value::Int { val, .. } => {
@@ -129,6 +130,19 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
             let bits = bits as u32;
             let input_num_type = get_input_num_type(val, signed, number_size);
 
+            if !input_num_type.is_permitted_bit_shift(bits) {
+                return Value::error(
+                    ShellError::IncorrectValue {
+                        msg: format!(
+                            "Trying to shift by more than the available bits (permitted < {})",
+                            input_num_type.num_bits()
+                        ),
+                        val_span: bits_span,
+                        call_span: span,
+                    },
+                    span,
+                );
+            }
             let int = match input_num_type {
                 One => ((val as u8) >> bits) as i64,
                 Two => ((val as u16) >> bits) as i64,
@@ -147,21 +161,27 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
             let bit_shift = bits % 8;
 
             let len = val.len();
-            use itertools::Position::*;
-            let bytes = iter::repeat(0)
-                .take(byte_shift)
-                .chain(
-                    val.iter()
-                        .copied()
-                        .circular_tuple_windows::<(u8, u8)>()
-                        .with_position()
-                        .map(|(pos, (lhs, rhs))| match pos {
-                            First | Only => lhs >> bit_shift,
-                            _ => (lhs >> bit_shift) | (rhs << bit_shift),
-                        })
-                        .take(len - byte_shift),
-                )
-                .collect::<Vec<u8>>();
+            // This check is done for symmetry with the int case and the previous
+            // implementation would overflow byte indices leading to unexpected output
+            // lengths
+            if bits > len * 8 {
+                return Value::error(
+                    ShellError::IncorrectValue {
+                        msg: format!(
+                            "Trying to shift by more than the available bits ({})",
+                            len * 8
+                        ),
+                        val_span: bits_span,
+                        call_span: span,
+                    },
+                    span,
+                );
+            }
+            let bytes = if bit_shift == 0 {
+                shift_bytes_right(val, byte_shift)
+            } else {
+                shift_bytes_and_bits_right(val, byte_shift, bit_shift)
+            };
 
             Value::binary(bytes, span)
         }
@@ -178,6 +198,35 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
         ),
     }
 }
+fn shift_bytes_right(data: &[u8], byte_shift: usize) -> Vec<u8> {
+    let len = data.len();
+    let mut output = vec![0; len];
+    output[byte_shift..].copy_from_slice(&data[..len - byte_shift]);
+    output
+}
+
+fn shift_bytes_and_bits_right(data: &[u8], byte_shift: usize, bit_shift: usize) -> Vec<u8> {
+    debug_assert!(
+        bit_shift > 0 && bit_shift < 8,
+        "bit_shift should be in the range (0, 8)"
+    );
+    let len = data.len();
+    let mut output = vec![0; len];
+
+    for i in byte_shift..len {
+        let shifted_bits = data[i - byte_shift] >> bit_shift;
+        let carried_bits = if i > byte_shift {
+            data[i - byte_shift - 1] << (8 - bit_shift)
+        } else {
+            0
+        };
+        let shifted_byte = shifted_bits | carried_bits;
+
+        output[i] = shifted_byte;
+    }
+
+    output
+}
 
 #[cfg(test)]
 mod test {
diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs
index edd51d70a6..3620be698c 100644
--- a/crates/nu-protocol/src/value/mod.rs
+++ b/crates/nu-protocol/src/value/mod.rs
@@ -3317,7 +3317,18 @@ impl Value {
     pub fn bit_shl(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
         match (self, rhs) {
             (Value::Int { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
-                Ok(Value::int(*lhs << rhs, span))
+                // Currently we disallow negative operands like Rust's `Shl`
+                // Cheap guarding with TryInto<u32>
+                if let Some(val) = (*rhs).try_into().ok().and_then(|rhs| lhs.checked_shl(rhs)) {
+                    Ok(Value::int(val, span))
+                } else {
+                    Err(ShellError::OperatorOverflow {
+                        msg: "right operand to bit-shl exceeds available bits in underlying data"
+                            .into(),
+                        span,
+                        help: format!("Limit operand to 0 <= rhs < {}", i64::BITS),
+                    })
+                }
             }
             (Value::Custom { val: lhs, .. }, rhs) => {
                 lhs.operation(span, Operator::Bits(Bits::ShiftLeft), op, rhs)
@@ -3335,7 +3346,18 @@ impl Value {
     pub fn bit_shr(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
         match (self, rhs) {
             (Value::Int { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
-                Ok(Value::int(*lhs >> rhs, span))
+                // Currently we disallow negative operands like Rust's `Shr`
+                // Cheap guarding with TryInto<u32>
+                if let Some(val) = (*rhs).try_into().ok().and_then(|rhs| lhs.checked_shr(rhs)) {
+                    Ok(Value::int(val, span))
+                } else {
+                    Err(ShellError::OperatorOverflow {
+                        msg: "right operand to bit-shr exceeds available bits in underlying data"
+                            .into(),
+                        span,
+                        help: format!("Limit operand to 0 <= rhs < {}", i64::BITS),
+                    })
+                }
             }
             (Value::Custom { val: lhs, .. }, rhs) => {
                 lhs.operation(span, Operator::Bits(Bits::ShiftRight), op, rhs)
diff --git a/tests/repl/test_bits.rs b/tests/repl/test_bits.rs
index 410f48d83b..8848ea9f98 100644
--- a/tests/repl/test_bits.rs
+++ b/tests/repl/test_bits.rs
@@ -1,4 +1,4 @@
-use crate::repl::tests::{run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
 
 #[test]
 fn bits_and() -> TestResult {
@@ -56,6 +56,33 @@ fn bits_shift_left() -> TestResult {
     run_test("2 | bits shl 3", "16")
 }
 
+#[test]
+fn bits_shift_left_negative_operand() -> TestResult {
+    fail_test("8 | bits shl -2", "positive value")
+}
+
+#[test]
+fn bits_shift_left_exceeding1() -> TestResult {
+    // We have no type accepting more than 64 bits so guaranteed fail
+    fail_test("8 | bits shl 65", "more than the available bits")
+}
+
+#[test]
+fn bits_shift_left_exceeding2() -> TestResult {
+    // Explicitly specifying 2 bytes, but 16 is already the max
+    fail_test(
+        "8 | bits shl --number-bytes 2 16",
+        "more than the available bits",
+    )
+}
+
+#[test]
+fn bits_shift_left_exceeding3() -> TestResult {
+    // This is purely down to the current autodetect feature limiting to the smallest integer
+    // type thus assuming a u8
+    fail_test("8 | bits shl 9", "more than the available bits")
+}
+
 #[test]
 fn bits_shift_left_negative() -> TestResult {
     run_test("-3 | bits shl 5", "-96")
@@ -69,11 +96,79 @@ fn bits_shift_left_list() -> TestResult {
     )
 }
 
+#[test]
+fn bits_shift_left_binary1() -> TestResult {
+    run_test(
+        "0x[01 30 80] | bits shl 3 | into bits",
+        "00001001 10000100 00000000",
+    )
+}
+
+#[test]
+fn bits_shift_left_binary2() -> TestResult {
+    // Whole byte case
+    run_test(
+        "0x[01 30 80] | bits shl 8 | into bits",
+        "00110000 10000000 00000000",
+    )
+}
+
+#[test]
+fn bits_shift_left_binary3() -> TestResult {
+    // Compared to the int case this is made inclusive of the bit count
+    run_test(
+        "0x[01 30 80] | bits shl 24 | into bits",
+        "00000000 00000000 00000000",
+    )
+}
+
+#[test]
+fn bits_shift_left_binary4() -> TestResult {
+    // Shifting by both bytes and bits
+    run_test(
+        "0x[01 30 80] | bits shl 15 | into bits",
+        "01000000 00000000 00000000",
+    )
+}
+
+#[test]
+fn bits_shift_left_binary_exceeding() -> TestResult {
+    // Compared to the int case this is made inclusive of the bit count
+    fail_test("0x[01 30] | bits shl 17 | into bits", "")
+}
+
 #[test]
 fn bits_shift_right() -> TestResult {
     run_test("8 | bits shr 2", "2")
 }
 
+#[test]
+fn bits_shift_right_negative_operand() -> TestResult {
+    fail_test("8 | bits shr -2", "positive value")
+}
+
+#[test]
+fn bits_shift_right_exceeding1() -> TestResult {
+    // We have no type accepting more than 64 bits so guaranteed fail
+    fail_test("8 | bits shr 65", "more than the available bits")
+}
+
+#[test]
+fn bits_shift_right_exceeding2() -> TestResult {
+    // Explicitly specifying 2 bytes, but 16 is already the max
+    fail_test(
+        "8 | bits shr --number-bytes 2 16",
+        "more than the available bits",
+    )
+}
+
+#[test]
+fn bits_shift_right_exceeding3() -> TestResult {
+    // This is purely down to the current autodetect feature limiting to the smallest integer
+    // type thus assuming a u8
+    fail_test("8 | bits shr 9", "more than the available bits")
+}
+
 #[test]
 fn bits_shift_right_negative() -> TestResult {
     run_test("-32 | bits shr 2", "-8")
@@ -87,6 +182,47 @@ fn bits_shift_right_list() -> TestResult {
     )
 }
 
+#[test]
+fn bits_shift_right_binary1() -> TestResult {
+    run_test(
+        "0x[01 30 80] | bits shr 3 | into bits",
+        "00000000 00100110 00010000",
+    )
+}
+
+#[test]
+fn bits_shift_right_binary2() -> TestResult {
+    // Whole byte case
+    run_test(
+        "0x[01 30 80] | bits shr 8 | into bits",
+        "00000000 00000001 00110000",
+    )
+}
+
+#[test]
+fn bits_shift_right_binary3() -> TestResult {
+    // Compared to the int case this is made inclusive of the bit count
+    run_test(
+        "0x[01 30 80] | bits shr 24 | into bits",
+        "00000000 00000000 00000000",
+    )
+}
+
+#[test]
+fn bits_shift_right_binary4() -> TestResult {
+    // Shifting by both bytes and bits
+    run_test(
+        "0x[01 30 80] | bits shr 15 | into bits",
+        "00000000 00000000 00000010",
+    )
+}
+
+#[test]
+fn bits_shift_right_binary_exceeding() -> TestResult {
+    // Compared to the int case this is made inclusive of the bit count
+    fail_test("0x[01 30] | bits shr 17 | into bits", "available bits (16)")
+}
+
 #[test]
 fn bits_rotate_left() -> TestResult {
     run_test("2 | bits rol 3", "16")
diff --git a/tests/repl/test_math.rs b/tests/repl/test_math.rs
index af44f8a857..7ad23e1968 100644
--- a/tests/repl/test_math.rs
+++ b/tests/repl/test_math.rs
@@ -35,6 +35,31 @@ fn bit_shl() -> TestResult {
     run_test("5 bit-shl 1", "10")
 }
 
+#[test]
+fn bit_shr_overflow() -> TestResult {
+    fail_test("16 bit-shr 10000", "exceeds available bits")
+}
+
+#[test]
+fn bit_shl_overflow() -> TestResult {
+    fail_test("5 bit-shl 10000000", "exceeds available bits")
+}
+
+#[test]
+fn bit_shl_neg_operand() -> TestResult {
+    // This would overflow the `u32` in the right hand side to 2
+    fail_test(
+        "9 bit-shl -9_223_372_036_854_775_806",
+        "exceeds available bits",
+    )
+}
+
+#[test]
+fn bit_shr_neg_operand() -> TestResult {
+    // This would overflow the `u32` in the right hand side
+    fail_test("9 bit-shr -2", "exceeds available bits")
+}
+
 #[test]
 fn bit_shl_add() -> TestResult {
     run_test("2 bit-shl 1 + 2", "16")

From 95b78eee25a876f425b22ecb05686896c7828a36 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Thu, 22 Aug 2024 12:02:08 +0200
Subject: [PATCH 0362/1072] Change the usage misnomer to "description" (#13598)

# Description

The meaning of the word usage is specific to describing how a command
function is *used* and not a synonym for general description. Usage can
be used to describe the SYNOPSIS or EXAMPLES sections of a man page
where the permitted argument combinations are shown or example *uses*
are given.
Let's not confuse people and call it what it is a description.

Our `help` command already creates its own *Usage* section based on the
available arguments and doesn't refer to the description with usage.

# User-Facing Changes

`help commands` and `scope commands` will now use `description` or
`extra_description`
`usage`-> `description`
`extra_usage` -> `extra_description`

Breaking change in the plugin protocol:

In the signature record communicated with the engine.
`usage`-> `description`
`extra_usage` -> `extra_description`

The same rename also takes place for the methods on
`SimplePluginCommand` and `PluginCommand`

# Tests + Formatting
- Updated plugin protocol specific changes
# After Submitting
- [ ] update plugin protocol doc
---
 .../src/commands/commandline/commandline_.rs  |   2 +-
 .../nu-cli/src/commands/commandline/edit.rs   |   2 +-
 .../src/commands/commandline/get_cursor.rs    |   2 +-
 .../src/commands/commandline/set_cursor.rs    |   2 +-
 .../nu-cli/src/commands/history/history_.rs   |   2 +-
 .../src/commands/history/history_session.rs   |   2 +-
 crates/nu-cli/src/commands/keybindings.rs     |   4 +-
 .../src/commands/keybindings_default.rs       |   2 +-
 .../nu-cli/src/commands/keybindings_list.rs   |   2 +-
 .../nu-cli/src/commands/keybindings_listen.rs |   4 +-
 crates/nu-cli/src/menus/help_completions.rs   |  19 +--
 crates/nu-cli/src/nu_highlight.rs             |   2 +-
 crates/nu-cli/src/print.rs                    |   4 +-
 crates/nu-cmd-extra/src/extra/bits/and.rs     |   2 +-
 crates/nu-cmd-extra/src/extra/bits/bits_.rs   |   4 +-
 crates/nu-cmd-extra/src/extra/bits/into.rs    |   2 +-
 crates/nu-cmd-extra/src/extra/bits/not.rs     |   2 +-
 crates/nu-cmd-extra/src/extra/bits/or.rs      |   2 +-
 .../src/extra/bits/rotate_left.rs             |   2 +-
 .../src/extra/bits/rotate_right.rs            |   2 +-
 .../nu-cmd-extra/src/extra/bits/shift_left.rs |   2 +-
 .../src/extra/bits/shift_right.rs             |   2 +-
 crates/nu-cmd-extra/src/extra/bits/xor.rs     |   2 +-
 .../nu-cmd-extra/src/extra/conversions/fmt.rs |   2 +-
 .../src/extra/filters/each_while.rs           |   2 +-
 .../src/extra/filters/roll/roll_.rs           |   4 +-
 .../src/extra/filters/roll/roll_down.rs       |   2 +-
 .../src/extra/filters/roll/roll_left.rs       |   2 +-
 .../src/extra/filters/roll/roll_right.rs      |   2 +-
 .../src/extra/filters/roll/roll_up.rs         |   2 +-
 .../nu-cmd-extra/src/extra/filters/rotate.rs  |   2 +-
 .../src/extra/filters/update_cells.rs         |   2 +-
 .../src/extra/formats/from/url.rs             |   2 +-
 .../nu-cmd-extra/src/extra/formats/to/html.rs |   4 +-
 crates/nu-cmd-extra/src/extra/math/arccos.rs  |   2 +-
 crates/nu-cmd-extra/src/extra/math/arccosh.rs |   2 +-
 crates/nu-cmd-extra/src/extra/math/arcsin.rs  |   2 +-
 crates/nu-cmd-extra/src/extra/math/arcsinh.rs |   2 +-
 crates/nu-cmd-extra/src/extra/math/arctan.rs  |   2 +-
 crates/nu-cmd-extra/src/extra/math/arctanh.rs |   2 +-
 crates/nu-cmd-extra/src/extra/math/cos.rs     |   2 +-
 crates/nu-cmd-extra/src/extra/math/cosh.rs    |   2 +-
 crates/nu-cmd-extra/src/extra/math/exp.rs     |   2 +-
 crates/nu-cmd-extra/src/extra/math/ln.rs      |   2 +-
 crates/nu-cmd-extra/src/extra/math/sin.rs     |   2 +-
 crates/nu-cmd-extra/src/extra/math/sinh.rs    |   2 +-
 crates/nu-cmd-extra/src/extra/math/tan.rs     |   2 +-
 crates/nu-cmd-extra/src/extra/math/tanh.rs    |   2 +-
 .../src/extra/platform/ansi/gradient.rs       |   2 +-
 .../extra/strings/encode_decode/decode_hex.rs |   2 +-
 .../extra/strings/encode_decode/encode_hex.rs |   2 +-
 .../src/extra/strings/format/command.rs       |   2 +-
 .../src/extra/strings/str_/case/camel_case.rs |   2 +-
 .../src/extra/strings/str_/case/kebab_case.rs |   2 +-
 .../extra/strings/str_/case/pascal_case.rs    |   2 +-
 .../strings/str_/case/screaming_snake_case.rs |   2 +-
 .../src/extra/strings/str_/case/snake_case.rs |   2 +-
 .../src/extra/strings/str_/case/str_.rs       |   4 +-
 .../src/extra/strings/str_/case/title_case.rs |   2 +-
 crates/nu-cmd-lang/src/core_commands/alias.rs |   4 +-
 .../nu-cmd-lang/src/core_commands/break_.rs   |   4 +-
 .../nu-cmd-lang/src/core_commands/collect.rs  |   4 +-
 .../nu-cmd-lang/src/core_commands/const_.rs   |   4 +-
 .../src/core_commands/continue_.rs            |   4 +-
 crates/nu-cmd-lang/src/core_commands/def.rs   |   4 +-
 .../nu-cmd-lang/src/core_commands/describe.rs |   2 +-
 crates/nu-cmd-lang/src/core_commands/do_.rs   |   2 +-
 crates/nu-cmd-lang/src/core_commands/echo.rs  |   4 +-
 .../src/core_commands/error_make.rs           |   2 +-
 .../nu-cmd-lang/src/core_commands/export.rs   |   4 +-
 .../src/core_commands/export_alias.rs         |   4 +-
 .../src/core_commands/export_const.rs         |   4 +-
 .../src/core_commands/export_def.rs           |   4 +-
 .../src/core_commands/export_extern.rs        |   4 +-
 .../src/core_commands/export_module.rs        |   4 +-
 .../src/core_commands/export_use.rs           |   4 +-
 .../nu-cmd-lang/src/core_commands/extern_.rs  |   4 +-
 crates/nu-cmd-lang/src/core_commands/for_.rs  |   4 +-
 crates/nu-cmd-lang/src/core_commands/hide.rs  |   4 +-
 .../nu-cmd-lang/src/core_commands/hide_env.rs |   2 +-
 crates/nu-cmd-lang/src/core_commands/if_.rs   |   4 +-
 .../nu-cmd-lang/src/core_commands/ignore.rs   |   2 +-
 crates/nu-cmd-lang/src/core_commands/let_.rs  |   4 +-
 crates/nu-cmd-lang/src/core_commands/loop_.rs |   4 +-
 .../nu-cmd-lang/src/core_commands/match_.rs   |   4 +-
 .../nu-cmd-lang/src/core_commands/module.rs   |   4 +-
 crates/nu-cmd-lang/src/core_commands/mut_.rs  |   4 +-
 .../src/core_commands/overlay/command.rs      |   4 +-
 .../src/core_commands/overlay/hide.rs         |   4 +-
 .../src/core_commands/overlay/list.rs         |   4 +-
 .../src/core_commands/overlay/new.rs          |   4 +-
 .../src/core_commands/overlay/use_.rs         |   4 +-
 .../nu-cmd-lang/src/core_commands/return_.rs  |   4 +-
 .../src/core_commands/scope/aliases.rs        |   2 +-
 .../src/core_commands/scope/command.rs        |   2 +-
 .../src/core_commands/scope/commands.rs       |   2 +-
 .../src/core_commands/scope/engine_stats.rs   |   2 +-
 .../src/core_commands/scope/externs.rs        |   2 +-
 .../src/core_commands/scope/modules.rs        |   2 +-
 .../src/core_commands/scope/variables.rs      |   2 +-
 crates/nu-cmd-lang/src/core_commands/try_.rs  |   4 +-
 crates/nu-cmd-lang/src/core_commands/use_.rs  |   4 +-
 .../nu-cmd-lang/src/core_commands/version.rs  |   2 +-
 .../nu-cmd-lang/src/core_commands/while_.rs   |   4 +-
 .../nu-cmd-plugin/src/commands/plugin/add.rs  |   4 +-
 .../nu-cmd-plugin/src/commands/plugin/list.rs |   2 +-
 .../nu-cmd-plugin/src/commands/plugin/mod.rs  |   2 +-
 .../nu-cmd-plugin/src/commands/plugin/rm.rs   |   4 +-
 .../nu-cmd-plugin/src/commands/plugin/stop.rs |   2 +-
 .../nu-cmd-plugin/src/commands/plugin/use_.rs |   4 +-
 crates/nu-command/src/bytes/add.rs            |   2 +-
 crates/nu-command/src/bytes/at.rs             |   2 +-
 crates/nu-command/src/bytes/build_.rs         |   2 +-
 crates/nu-command/src/bytes/bytes_.rs         |   4 +-
 crates/nu-command/src/bytes/collect.rs        |   2 +-
 crates/nu-command/src/bytes/ends_with.rs      |   2 +-
 crates/nu-command/src/bytes/index_of.rs       |   2 +-
 crates/nu-command/src/bytes/length.rs         |   2 +-
 crates/nu-command/src/bytes/remove.rs         |   2 +-
 crates/nu-command/src/bytes/replace.rs        |   2 +-
 crates/nu-command/src/bytes/reverse.rs        |   2 +-
 crates/nu-command/src/bytes/starts_with.rs    |   2 +-
 crates/nu-command/src/charting/histogram.rs   |   2 +-
 crates/nu-command/src/conversions/fill.rs     |   2 +-
 .../nu-command/src/conversions/into/binary.rs |   2 +-
 .../nu-command/src/conversions/into/bool.rs   |   2 +-
 .../src/conversions/into/cell_path.rs         |   4 +-
 .../src/conversions/into/command.rs           |   4 +-
 .../src/conversions/into/datetime.rs          |   2 +-
 .../src/conversions/into/duration.rs          |   4 +-
 .../src/conversions/into/filesize.rs          |   2 +-
 .../nu-command/src/conversions/into/float.rs  |   2 +-
 .../nu-command/src/conversions/into/glob.rs   |   2 +-
 crates/nu-command/src/conversions/into/int.rs |   2 +-
 .../nu-command/src/conversions/into/record.rs |   2 +-
 .../nu-command/src/conversions/into/string.rs |   2 +-
 .../nu-command/src/conversions/into/value.rs  |   2 +-
 .../src/database/commands/into_sqlite.rs      |   2 +-
 .../src/database/commands/query_db.rs         |   2 +-
 .../src/database/commands/schema.rs           |   2 +-
 crates/nu-command/src/date/date_.rs           |   4 +-
 crates/nu-command/src/date/humanize.rs        |   2 +-
 crates/nu-command/src/date/list_timezone.rs   |   2 +-
 crates/nu-command/src/date/now.rs             |   2 +-
 crates/nu-command/src/date/to_record.rs       |   2 +-
 crates/nu-command/src/date/to_table.rs        |   2 +-
 crates/nu-command/src/date/to_timezone.rs     |   4 +-
 crates/nu-command/src/debug/ast.rs            |   2 +-
 crates/nu-command/src/debug/debug_.rs         |   2 +-
 crates/nu-command/src/debug/explain.rs        |   2 +-
 crates/nu-command/src/debug/info.rs           |   4 +-
 crates/nu-command/src/debug/inspect.rs        |   2 +-
 crates/nu-command/src/debug/metadata.rs       |   2 +-
 crates/nu-command/src/debug/metadata_set.rs   |   2 +-
 crates/nu-command/src/debug/profile.rs        |   4 +-
 crates/nu-command/src/debug/timeit.rs         |   2 +-
 crates/nu-command/src/debug/view.rs           |   4 +-
 crates/nu-command/src/debug/view_files.rs     |   4 +-
 crates/nu-command/src/debug/view_ir.rs        |   4 +-
 crates/nu-command/src/debug/view_source.rs    |   2 +-
 crates/nu-command/src/debug/view_span.rs      |   4 +-
 crates/nu-command/src/env/config/config_.rs   |   4 +-
 .../nu-command/src/env/config/config_env.rs   |   2 +-
 crates/nu-command/src/env/config/config_nu.rs |   2 +-
 .../nu-command/src/env/config/config_reset.rs |   2 +-
 crates/nu-command/src/env/export_env.rs       |   4 +-
 crates/nu-command/src/env/load_env.rs         |   2 +-
 crates/nu-command/src/env/source_env.rs       |   4 +-
 crates/nu-command/src/env/with_env.rs         |   2 +-
 .../nu-command/src/experimental/is_admin.rs   |   2 +-
 crates/nu-command/src/filesystem/cd.rs        |   2 +-
 crates/nu-command/src/filesystem/du.rs        |   2 +-
 crates/nu-command/src/filesystem/glob.rs      |   4 +-
 crates/nu-command/src/filesystem/ls.rs        |   2 +-
 crates/nu-command/src/filesystem/mktemp.rs    |   2 +-
 crates/nu-command/src/filesystem/open.rs      |   4 +-
 crates/nu-command/src/filesystem/rm.rs        |   2 +-
 crates/nu-command/src/filesystem/save.rs      |   2 +-
 crates/nu-command/src/filesystem/start.rs     |   2 +-
 crates/nu-command/src/filesystem/touch.rs     |   2 +-
 crates/nu-command/src/filesystem/ucp.rs       |   2 +-
 crates/nu-command/src/filesystem/umkdir.rs    |   2 +-
 crates/nu-command/src/filesystem/umv.rs       |   2 +-
 crates/nu-command/src/filesystem/watch.rs     |   2 +-
 crates/nu-command/src/filters/all.rs          |   2 +-
 crates/nu-command/src/filters/any.rs          |   2 +-
 crates/nu-command/src/filters/append.rs       |   4 +-
 crates/nu-command/src/filters/chunks.rs       |   4 +-
 crates/nu-command/src/filters/columns.rs      |   4 +-
 crates/nu-command/src/filters/compact.rs      |   2 +-
 crates/nu-command/src/filters/default.rs      |   2 +-
 crates/nu-command/src/filters/drop/column.rs  |   2 +-
 crates/nu-command/src/filters/drop/drop_.rs   |   2 +-
 crates/nu-command/src/filters/drop/nth.rs     |   2 +-
 crates/nu-command/src/filters/each.rs         |   4 +-
 crates/nu-command/src/filters/enumerate.rs    |   2 +-
 crates/nu-command/src/filters/every.rs        |   2 +-
 crates/nu-command/src/filters/filter.rs       |   4 +-
 crates/nu-command/src/filters/find.rs         |   2 +-
 crates/nu-command/src/filters/first.rs        |   2 +-
 crates/nu-command/src/filters/flatten.rs      |   2 +-
 crates/nu-command/src/filters/get.rs          |   4 +-
 crates/nu-command/src/filters/group.rs        |   2 +-
 crates/nu-command/src/filters/group_by.rs     |   2 +-
 crates/nu-command/src/filters/headers.rs      |   2 +-
 crates/nu-command/src/filters/insert.rs       |   4 +-
 crates/nu-command/src/filters/interleave.rs   |   4 +-
 crates/nu-command/src/filters/is_empty.rs     |   2 +-
 crates/nu-command/src/filters/is_not_empty.rs |   2 +-
 crates/nu-command/src/filters/items.rs        |   4 +-
 crates/nu-command/src/filters/join.rs         |   2 +-
 crates/nu-command/src/filters/last.rs         |   2 +-
 crates/nu-command/src/filters/length.rs       |   2 +-
 crates/nu-command/src/filters/lines.rs        |   2 +-
 crates/nu-command/src/filters/merge.rs        |   4 +-
 crates/nu-command/src/filters/move_.rs        |   2 +-
 crates/nu-command/src/filters/par_each.rs     |   2 +-
 crates/nu-command/src/filters/prepend.rs      |   4 +-
 crates/nu-command/src/filters/range.rs        |   2 +-
 crates/nu-command/src/filters/reduce.rs       |   2 +-
 crates/nu-command/src/filters/reject.rs       |   4 +-
 crates/nu-command/src/filters/rename.rs       |   2 +-
 crates/nu-command/src/filters/reverse.rs      |   2 +-
 crates/nu-command/src/filters/select.rs       |   4 +-
 crates/nu-command/src/filters/shuffle.rs      |   2 +-
 crates/nu-command/src/filters/skip/skip_.rs   |   4 +-
 .../nu-command/src/filters/skip/skip_until.rs |   2 +-
 .../nu-command/src/filters/skip/skip_while.rs |   2 +-
 crates/nu-command/src/filters/sort.rs         |   2 +-
 crates/nu-command/src/filters/sort_by.rs      |   2 +-
 crates/nu-command/src/filters/split_by.rs     |   2 +-
 crates/nu-command/src/filters/take/take_.rs   |   2 +-
 .../nu-command/src/filters/take/take_until.rs |   2 +-
 .../nu-command/src/filters/take/take_while.rs |   2 +-
 crates/nu-command/src/filters/tee.rs          |   4 +-
 crates/nu-command/src/filters/transpose.rs    |   2 +-
 crates/nu-command/src/filters/uniq.rs         |   2 +-
 crates/nu-command/src/filters/uniq_by.rs      |   2 +-
 crates/nu-command/src/filters/update.rs       |   4 +-
 crates/nu-command/src/filters/upsert.rs       |   4 +-
 crates/nu-command/src/filters/values.rs       |   4 +-
 crates/nu-command/src/filters/where_.rs       |   4 +-
 crates/nu-command/src/filters/window.rs       |   4 +-
 crates/nu-command/src/filters/wrap.rs         |   2 +-
 crates/nu-command/src/filters/zip.rs          |   2 +-
 crates/nu-command/src/formats/from/command.rs |   4 +-
 crates/nu-command/src/formats/from/csv.rs     |   2 +-
 crates/nu-command/src/formats/from/json.rs    |   2 +-
 crates/nu-command/src/formats/from/msgpack.rs |   4 +-
 .../nu-command/src/formats/from/msgpackz.rs   |   4 +-
 crates/nu-command/src/formats/from/nuon.rs    |   2 +-
 crates/nu-command/src/formats/from/ods.rs     |   2 +-
 crates/nu-command/src/formats/from/ssv.rs     |   2 +-
 crates/nu-command/src/formats/from/toml.rs    |   2 +-
 crates/nu-command/src/formats/from/tsv.rs     |   2 +-
 crates/nu-command/src/formats/from/xlsx.rs    |   2 +-
 crates/nu-command/src/formats/from/xml.rs     |   4 +-
 crates/nu-command/src/formats/from/yaml.rs    |   4 +-
 crates/nu-command/src/formats/to/command.rs   |   4 +-
 crates/nu-command/src/formats/to/csv.rs       |   2 +-
 crates/nu-command/src/formats/to/json.rs      |   2 +-
 crates/nu-command/src/formats/to/md.rs        |   2 +-
 crates/nu-command/src/formats/to/msgpack.rs   |   4 +-
 crates/nu-command/src/formats/to/msgpackz.rs  |   4 +-
 crates/nu-command/src/formats/to/nuon.rs      |   2 +-
 crates/nu-command/src/formats/to/text.rs      |   2 +-
 crates/nu-command/src/formats/to/toml.rs      |   2 +-
 crates/nu-command/src/formats/to/tsv.rs       |   2 +-
 crates/nu-command/src/formats/to/xml.rs       |   4 +-
 crates/nu-command/src/formats/to/yaml.rs      |   2 +-
 crates/nu-command/src/generators/cal.rs       |   2 +-
 crates/nu-command/src/generators/generate.rs  |   4 +-
 crates/nu-command/src/generators/seq.rs       |   2 +-
 crates/nu-command/src/generators/seq_char.rs  |   2 +-
 crates/nu-command/src/generators/seq_date.rs  |   2 +-
 crates/nu-command/src/hash/generic_digest.rs  |   8 +-
 crates/nu-command/src/hash/hash_.rs           |   4 +-
 crates/nu-command/src/help/help_.rs           |   8 +-
 crates/nu-command/src/help/help_aliases.rs    |  18 +--
 crates/nu-command/src/help/help_commands.rs   |  10 +-
 crates/nu-command/src/help/help_escapes.rs    |   2 +-
 crates/nu-command/src/help/help_externs.rs    |   8 +-
 crates/nu-command/src/help/help_modules.rs    |  20 +--
 crates/nu-command/src/help/help_operators.rs  |   2 +-
 crates/nu-command/src/math/abs.rs             |   2 +-
 crates/nu-command/src/math/avg.rs             |   2 +-
 crates/nu-command/src/math/ceil.rs            |   2 +-
 crates/nu-command/src/math/floor.rs           |   2 +-
 crates/nu-command/src/math/log.rs             |   2 +-
 crates/nu-command/src/math/math_.rs           |   4 +-
 crates/nu-command/src/math/max.rs             |   2 +-
 crates/nu-command/src/math/median.rs          |   2 +-
 crates/nu-command/src/math/min.rs             |   2 +-
 crates/nu-command/src/math/mode.rs            |   2 +-
 crates/nu-command/src/math/product.rs         |   2 +-
 crates/nu-command/src/math/round.rs           |   2 +-
 crates/nu-command/src/math/sqrt.rs            |   2 +-
 crates/nu-command/src/math/stddev.rs          |   2 +-
 crates/nu-command/src/math/sum.rs             |   2 +-
 crates/nu-command/src/math/variance.rs        |   2 +-
 crates/nu-command/src/misc/panic.rs           |   2 +-
 crates/nu-command/src/misc/source.rs          |   4 +-
 crates/nu-command/src/misc/tutor.rs           |   2 +-
 crates/nu-command/src/network/http/delete.rs  |   4 +-
 crates/nu-command/src/network/http/get.rs     |   4 +-
 crates/nu-command/src/network/http/head.rs    |   4 +-
 crates/nu-command/src/network/http/http_.rs   |   4 +-
 crates/nu-command/src/network/http/options.rs |   4 +-
 crates/nu-command/src/network/http/patch.rs   |   4 +-
 crates/nu-command/src/network/http/post.rs    |   4 +-
 crates/nu-command/src/network/http/put.rs     |   4 +-
 crates/nu-command/src/network/port.rs         |   2 +-
 .../nu-command/src/network/url/build_query.rs |   2 +-
 crates/nu-command/src/network/url/decode.rs   |   2 +-
 crates/nu-command/src/network/url/encode.rs   |   2 +-
 crates/nu-command/src/network/url/join.rs     |   2 +-
 crates/nu-command/src/network/url/parse.rs    |   2 +-
 crates/nu-command/src/network/url/url_.rs     |   4 +-
 crates/nu-command/src/path/basename.rs        |   2 +-
 crates/nu-command/src/path/dirname.rs         |   2 +-
 crates/nu-command/src/path/exists.rs          |   4 +-
 crates/nu-command/src/path/expand.rs          |   2 +-
 crates/nu-command/src/path/join.rs            |   4 +-
 crates/nu-command/src/path/parse.rs           |   4 +-
 crates/nu-command/src/path/path_.rs           |   4 +-
 crates/nu-command/src/path/relative_to.rs     |   4 +-
 crates/nu-command/src/path/split.rs           |   2 +-
 crates/nu-command/src/path/type.rs            |   4 +-
 crates/nu-command/src/platform/ansi/ansi_.rs  |   4 +-
 crates/nu-command/src/platform/ansi/link.rs   |   2 +-
 crates/nu-command/src/platform/ansi/strip.rs  |   2 +-
 crates/nu-command/src/platform/clear.rs       |   2 +-
 .../nu-command/src/platform/input/input_.rs   |   2 +-
 .../src/platform/input/input_listen.rs        |   4 +-
 crates/nu-command/src/platform/input/list.rs  |   4 +-
 crates/nu-command/src/platform/is_terminal.rs |   2 +-
 crates/nu-command/src/platform/kill.rs        |   2 +-
 crates/nu-command/src/platform/sleep.rs       |   2 +-
 crates/nu-command/src/platform/term_size.rs   |   2 +-
 crates/nu-command/src/platform/ulimit.rs      |   2 +-
 crates/nu-command/src/platform/whoami.rs      |   2 +-
 crates/nu-command/src/random/binary.rs        |   2 +-
 crates/nu-command/src/random/bool.rs          |   2 +-
 crates/nu-command/src/random/chars.rs         |   2 +-
 crates/nu-command/src/random/dice.rs          |   2 +-
 crates/nu-command/src/random/float.rs         |   2 +-
 crates/nu-command/src/random/int.rs           |   2 +-
 crates/nu-command/src/random/random_.rs       |   4 +-
 crates/nu-command/src/random/uuid.rs          |   2 +-
 crates/nu-command/src/removed/format.rs       |   2 +-
 crates/nu-command/src/removed/let_env.rs      |   2 +-
 crates/nu-command/src/shells/exit.rs          |   2 +-
 crates/nu-command/src/stor/create.rs          |   2 +-
 crates/nu-command/src/stor/delete.rs          |   2 +-
 crates/nu-command/src/stor/export.rs          |   2 +-
 crates/nu-command/src/stor/import.rs          |   2 +-
 crates/nu-command/src/stor/insert.rs          |   2 +-
 crates/nu-command/src/stor/open.rs            |   2 +-
 crates/nu-command/src/stor/reset.rs           |   2 +-
 crates/nu-command/src/stor/stor_.rs           |   4 +-
 crates/nu-command/src/stor/update.rs          |   2 +-
 crates/nu-command/src/strings/char_.rs        |   2 +-
 .../nu-command/src/strings/detect_columns.rs  |   2 +-
 .../src/strings/encode_decode/decode.rs       |   4 +-
 .../strings/encode_decode/decode_base64.rs    |   4 +-
 .../src/strings/encode_decode/encode.rs       |   4 +-
 .../strings/encode_decode/encode_base64.rs    |   2 +-
 crates/nu-command/src/strings/format/date.rs  |   2 +-
 .../nu-command/src/strings/format/duration.rs |   2 +-
 .../nu-command/src/strings/format/filesize.rs |   2 +-
 .../nu-command/src/strings/format/format_.rs  |   4 +-
 crates/nu-command/src/strings/parse.rs        |   4 +-
 crates/nu-command/src/strings/split/chars.rs  |   2 +-
 crates/nu-command/src/strings/split/column.rs |   2 +-
 .../nu-command/src/strings/split/command.rs   |   4 +-
 crates/nu-command/src/strings/split/list.rs   |   2 +-
 crates/nu-command/src/strings/split/row.rs    |   2 +-
 crates/nu-command/src/strings/split/words.rs  |   2 +-
 .../src/strings/str_/case/capitalize.rs       |   2 +-
 .../src/strings/str_/case/downcase.rs         |   2 +-
 .../nu-command/src/strings/str_/case/str_.rs  |   4 +-
 .../src/strings/str_/case/upcase.rs           |   2 +-
 .../nu-command/src/strings/str_/contains.rs   |   2 +-
 .../nu-command/src/strings/str_/deunicode.rs  |   2 +-
 .../nu-command/src/strings/str_/distance.rs   |   2 +-
 .../nu-command/src/strings/str_/ends_with.rs  |   2 +-
 crates/nu-command/src/strings/str_/expand.rs  |   4 +-
 .../nu-command/src/strings/str_/index_of.rs   |   2 +-
 crates/nu-command/src/strings/str_/join.rs    |   2 +-
 crates/nu-command/src/strings/str_/length.rs  |   2 +-
 crates/nu-command/src/strings/str_/replace.rs |   2 +-
 crates/nu-command/src/strings/str_/reverse.rs |   2 +-
 .../src/strings/str_/starts_with.rs           |   2 +-
 crates/nu-command/src/strings/str_/stats.rs   |   2 +-
 .../nu-command/src/strings/str_/substring.rs  |   2 +-
 .../nu-command/src/strings/str_/trim/trim_.rs |   2 +-
 crates/nu-command/src/system/complete.rs      |   4 +-
 crates/nu-command/src/system/exec.rs          |   4 +-
 crates/nu-command/src/system/nu_check.rs      |   2 +-
 crates/nu-command/src/system/ps.rs            |   2 +-
 .../nu-command/src/system/registry_query.rs   |   4 +-
 crates/nu-command/src/system/run_external.rs  |   2 +-
 crates/nu-command/src/system/sys/cpu.rs       |   2 +-
 crates/nu-command/src/system/sys/disks.rs     |   2 +-
 crates/nu-command/src/system/sys/host.rs      |   2 +-
 crates/nu-command/src/system/sys/mem.rs       |   2 +-
 crates/nu-command/src/system/sys/net.rs       |   2 +-
 crates/nu-command/src/system/sys/sys_.rs      |   4 +-
 crates/nu-command/src/system/sys/temp.rs      |   4 +-
 crates/nu-command/src/system/sys/users.rs     |   2 +-
 crates/nu-command/src/system/uname.rs         |   2 +-
 crates/nu-command/src/system/which_.rs        |   2 +-
 crates/nu-command/src/viewers/griddle.rs      |   4 +-
 crates/nu-command/src/viewers/table.rs        |   4 +-
 crates/nu-command/tests/commands/help.rs      | 114 +++++++++---------
 crates/nu-command/tests/main.rs               |  22 ++--
 crates/nu-engine/src/documentation.rs         |  14 +--
 crates/nu-engine/src/scope.rs                 |  16 +--
 crates/nu-explore/src/commands/expand.rs      |   2 +-
 crates/nu-explore/src/commands/help.rs        |   2 +-
 crates/nu-explore/src/commands/mod.rs         |   4 +-
 crates/nu-explore/src/commands/nu.rs          |   2 +-
 crates/nu-explore/src/commands/quit.rs        |   2 +-
 crates/nu-explore/src/commands/table.rs       |   2 +-
 crates/nu-explore/src/commands/try.rs         |   2 +-
 crates/nu-explore/src/explore.rs              |   4 +-
 crates/nu-explore/src/registry/command.rs     |   4 +-
 crates/nu-lsp/src/lib.rs                      |   6 +-
 crates/nu-parser/src/known_external.rs        |   8 +-
 crates/nu-parser/src/parse_keywords.rs        |  26 ++--
 crates/nu-parser/tests/test_parser.rs         |  53 ++++++--
 .../nu-plugin-core/src/serializers/tests.rs   |   9 +-
 crates/nu-plugin-engine/src/declaration.rs    |   8 +-
 crates/nu-plugin-test-support/src/lib.rs      |   2 +-
 .../tests/custom_value/mod.rs                 |   4 +-
 .../nu-plugin-test-support/tests/hello/mod.rs |   2 +-
 .../tests/lowercase/mod.rs                    |   2 +-
 crates/nu-plugin/src/lib.rs                   |   2 +-
 crates/nu-plugin/src/plugin/command.rs        |  28 ++---
 crates/nu-plugin/src/plugin/mod.rs            |  12 +-
 crates/nu-protocol/src/alias.rs               |  12 +-
 crates/nu-protocol/src/engine/command.rs      |  10 +-
 .../src/engine/{usage.rs => description.rs}   |  36 +++---
 crates/nu-protocol/src/engine/engine_state.rs |  20 +--
 crates/nu-protocol/src/engine/mod.rs          |   2 +-
 crates/nu-protocol/src/engine/state_delta.rs  |   8 +-
 .../src/engine/state_working_set.rs           |  14 ++-
 .../src/plugin/registry_file/tests.rs         |   2 +-
 crates/nu-protocol/src/signature.rs           |  45 ++++---
 crates/nu-protocol/tests/test_signature.rs    |  12 +-
 crates/nu-std/README.md                       |   4 +-
 crates/nu-std/std/help.nu                     |  68 +++++------
 .../nu_plugin_custom_values/src/drop_check.rs |   2 +-
 .../nu_plugin_custom_values/src/generate.rs   |   2 +-
 .../nu_plugin_custom_values/src/generate2.rs  |   2 +-
 .../nu_plugin_custom_values/src/handle_get.rs |   2 +-
 .../src/handle_make.rs                        |   2 +-
 .../src/handle_update.rs                      |   2 +-
 crates/nu_plugin_custom_values/src/update.rs  |   2 +-
 .../nu_plugin_custom_values/src/update_arg.rs |   2 +-
 .../src/commands/call_decl.rs                 |   4 +-
 .../src/commands/collect_bytes.rs             |   2 +-
 .../nu_plugin_example/src/commands/config.rs  |   4 +-
 .../nu_plugin_example/src/commands/ctrlc.rs   |   2 +-
 .../src/commands/disable_gc.rs                |   4 +-
 crates/nu_plugin_example/src/commands/echo.rs |   2 +-
 crates/nu_plugin_example/src/commands/env.rs  |   4 +-
 .../src/commands/for_each.rs                  |   4 +-
 .../src/commands/generate.rs                  |   4 +-
 crates/nu_plugin_example/src/commands/main.rs |   4 +-
 crates/nu_plugin_example/src/commands/one.rs  |   6 +-
 crates/nu_plugin_example/src/commands/seq.rs  |   2 +-
 crates/nu_plugin_example/src/commands/sum.rs  |   2 +-
 .../nu_plugin_example/src/commands/three.rs   |   2 +-
 crates/nu_plugin_example/src/commands/two.rs  |   2 +-
 .../src/commands/view_span.rs                 |   4 +-
 crates/nu_plugin_formats/src/from/eml.rs      |   2 +-
 crates/nu_plugin_formats/src/from/ics.rs      |   2 +-
 crates/nu_plugin_formats/src/from/ini.rs      |   2 +-
 crates/nu_plugin_formats/src/from/plist.rs    |   2 +-
 crates/nu_plugin_formats/src/from/vcf.rs      |   2 +-
 crates/nu_plugin_formats/src/to/plist.rs      |   2 +-
 crates/nu_plugin_gstat/src/gstat.rs           |   4 -
 crates/nu_plugin_gstat/src/nu/mod.rs          |   2 +-
 crates/nu_plugin_inc/src/inc.rs               |   4 -
 crates/nu_plugin_inc/src/nu/mod.rs            |   2 +-
 .../nu_plugin_nu_example.nu                   |   4 +-
 crates/nu_plugin_polars/src/cache/get.rs      |   2 +-
 crates/nu_plugin_polars/src/cache/list.rs     |   2 +-
 crates/nu_plugin_polars/src/cache/rm.rs       |   2 +-
 .../src/dataframe/eager/append.rs             |   2 +-
 .../src/dataframe/eager/cast.rs               |   2 +-
 .../src/dataframe/eager/columns.rs            |   2 +-
 .../src/dataframe/eager/drop.rs               |   2 +-
 .../src/dataframe/eager/drop_duplicates.rs    |   2 +-
 .../src/dataframe/eager/drop_nulls.rs         |   2 +-
 .../src/dataframe/eager/dummies.rs            |   2 +-
 .../src/dataframe/eager/filter_with.rs        |   2 +-
 .../src/dataframe/eager/first.rs              |   2 +-
 .../src/dataframe/eager/get.rs                |   2 +-
 .../src/dataframe/eager/last.rs               |   2 +-
 .../src/dataframe/eager/open.rs               |   2 +-
 .../src/dataframe/eager/pivot.rs              |   2 +-
 .../src/dataframe/eager/query_df.rs           |   2 +-
 .../src/dataframe/eager/rename.rs             |   2 +-
 .../src/dataframe/eager/sample.rs             |   2 +-
 .../src/dataframe/eager/save/mod.rs           |   2 +-
 .../src/dataframe/eager/schema.rs             |   2 +-
 .../src/dataframe/eager/shape.rs              |   2 +-
 .../src/dataframe/eager/slice.rs              |   2 +-
 .../src/dataframe/eager/summary.rs            |   2 +-
 .../src/dataframe/eager/take.rs               |   2 +-
 .../src/dataframe/eager/to_df.rs              |   2 +-
 .../src/dataframe/eager/to_nu.rs              |   2 +-
 .../src/dataframe/eager/unpivot.rs            |   2 +-
 .../src/dataframe/eager/with_column.rs        |   2 +-
 .../src/dataframe/expressions/alias.rs        |   2 +-
 .../src/dataframe/expressions/arg_where.rs    |   2 +-
 .../src/dataframe/expressions/col.rs          |   2 +-
 .../src/dataframe/expressions/concat_str.rs   |   2 +-
 .../src/dataframe/expressions/datepart.rs     |   2 +-
 .../expressions/expressions_macro.rs          |  12 +-
 .../src/dataframe/expressions/is_in.rs        |   2 +-
 .../src/dataframe/expressions/lit.rs          |   2 +-
 .../src/dataframe/expressions/otherwise.rs    |   2 +-
 .../src/dataframe/expressions/when.rs         |   2 +-
 .../src/dataframe/lazy/aggregate.rs           |   2 +-
 .../src/dataframe/lazy/collect.rs             |   2 +-
 .../src/dataframe/lazy/explode.rs             |   2 +-
 .../src/dataframe/lazy/fetch.rs               |   2 +-
 .../src/dataframe/lazy/fill_nan.rs            |   2 +-
 .../src/dataframe/lazy/fill_null.rs           |   2 +-
 .../src/dataframe/lazy/filter.rs              |   2 +-
 .../src/dataframe/lazy/flatten.rs             |   2 +-
 .../src/dataframe/lazy/groupby.rs             |   2 +-
 .../src/dataframe/lazy/join.rs                |   2 +-
 .../src/dataframe/lazy/macro_commands.rs      |   8 +-
 .../src/dataframe/lazy/median.rs              |   2 +-
 .../src/dataframe/lazy/quantile.rs            |   2 +-
 .../src/dataframe/lazy/select.rs              |   2 +-
 .../src/dataframe/lazy/sort_by_expr.rs        |   2 +-
 .../src/dataframe/lazy/to_lazy.rs             |   2 +-
 .../src/dataframe/series/all_false.rs         |   2 +-
 .../src/dataframe/series/all_true.rs          |   2 +-
 .../src/dataframe/series/arg_max.rs           |   2 +-
 .../src/dataframe/series/arg_min.rs           |   2 +-
 .../src/dataframe/series/cumulative.rs        |   2 +-
 .../src/dataframe/series/date/as_date.rs      |   4 +-
 .../src/dataframe/series/date/as_datetime.rs  |   4 +-
 .../src/dataframe/series/date/get_day.rs      |   4 +-
 .../src/dataframe/series/date/get_hour.rs     |   2 +-
 .../src/dataframe/series/date/get_minute.rs   |   2 +-
 .../src/dataframe/series/date/get_month.rs    |   2 +-
 .../dataframe/series/date/get_nanosecond.rs   |   2 +-
 .../src/dataframe/series/date/get_ordinal.rs  |   2 +-
 .../src/dataframe/series/date/get_second.rs   |   2 +-
 .../src/dataframe/series/date/get_week.rs     |   2 +-
 .../src/dataframe/series/date/get_weekday.rs  |   2 +-
 .../src/dataframe/series/date/get_year.rs     |   2 +-
 .../src/dataframe/series/indexes/arg_sort.rs  |   2 +-
 .../src/dataframe/series/indexes/arg_true.rs  |   2 +-
 .../dataframe/series/indexes/arg_unique.rs    |   2 +-
 .../dataframe/series/indexes/set_with_idx.rs  |   2 +-
 .../dataframe/series/masks/is_duplicated.rs   |   2 +-
 .../src/dataframe/series/masks/is_not_null.rs |   2 +-
 .../src/dataframe/series/masks/is_null.rs     |   2 +-
 .../src/dataframe/series/masks/is_unique.rs   |   2 +-
 .../src/dataframe/series/masks/not.rs         |   2 +-
 .../src/dataframe/series/masks/set.rs         |   2 +-
 .../src/dataframe/series/n_null.rs            |   2 +-
 .../src/dataframe/series/n_unique.rs          |   2 +-
 .../src/dataframe/series/rolling.rs           |   2 +-
 .../src/dataframe/series/shift.rs             |   2 +-
 .../dataframe/series/string/concatenate.rs    |   2 +-
 .../src/dataframe/series/string/contains.rs   |   2 +-
 .../src/dataframe/series/string/replace.rs    |   2 +-
 .../dataframe/series/string/replace_all.rs    |   2 +-
 .../dataframe/series/string/str_lengths.rs    |   2 +-
 .../src/dataframe/series/string/str_slice.rs  |   2 +-
 .../src/dataframe/series/string/strftime.rs   |   2 +-
 .../dataframe/series/string/to_lowercase.rs   |   2 +-
 .../dataframe/series/string/to_uppercase.rs   |   2 +-
 .../src/dataframe/series/unique.rs            |   2 +-
 .../src/dataframe/series/value_counts.rs      |   2 +-
 crates/nu_plugin_polars/src/dataframe/stub.rs |   4 +-
 .../nu_plugin_python_example.py               |   4 +-
 crates/nu_plugin_query/src/query.rs           |   6 +-
 crates/nu_plugin_query/src/query_json.rs      |   2 +-
 crates/nu_plugin_query/src/query_web.rs       |   2 +-
 .../nu_plugin_query/src/query_webpage_info.rs |   2 +-
 crates/nu_plugin_query/src/query_xml.rs       |   2 +-
 crates/nu_plugin_stress_internals/src/main.rs |   4 +-
 src/command.rs                                |   4 +-
 src/ide.rs                                    |   6 +-
 tests/plugins/register.rs                     |   2 +-
 tests/repl/test_parser.rs                     |  16 +--
 tests/scope/mod.rs                            |  14 +--
 597 files changed, 1085 insertions(+), 1039 deletions(-)
 rename crates/nu-protocol/src/engine/{usage.rs => description.rs} (66%)

diff --git a/crates/nu-cli/src/commands/commandline/commandline_.rs b/crates/nu-cli/src/commands/commandline/commandline_.rs
index 569de37d65..909c2cc761 100644
--- a/crates/nu-cli/src/commands/commandline/commandline_.rs
+++ b/crates/nu-cli/src/commands/commandline/commandline_.rs
@@ -14,7 +14,7 @@ impl Command for Commandline {
             .category(Category::Core)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "View the current command line input buffer."
     }
 
diff --git a/crates/nu-cli/src/commands/commandline/edit.rs b/crates/nu-cli/src/commands/commandline/edit.rs
index f5048d7172..64f3ae2a08 100644
--- a/crates/nu-cli/src/commands/commandline/edit.rs
+++ b/crates/nu-cli/src/commands/commandline/edit.rs
@@ -34,7 +34,7 @@ impl Command for SubCommand {
             .category(Category::Core)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Modify the current command line input buffer."
     }
 
diff --git a/crates/nu-cli/src/commands/commandline/get_cursor.rs b/crates/nu-cli/src/commands/commandline/get_cursor.rs
index a50f7e564e..7c49309702 100644
--- a/crates/nu-cli/src/commands/commandline/get_cursor.rs
+++ b/crates/nu-cli/src/commands/commandline/get_cursor.rs
@@ -16,7 +16,7 @@ impl Command for SubCommand {
             .category(Category::Core)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Get the current cursor position."
     }
 
diff --git a/crates/nu-cli/src/commands/commandline/set_cursor.rs b/crates/nu-cli/src/commands/commandline/set_cursor.rs
index ddb18dcde3..411d42de57 100644
--- a/crates/nu-cli/src/commands/commandline/set_cursor.rs
+++ b/crates/nu-cli/src/commands/commandline/set_cursor.rs
@@ -22,7 +22,7 @@ impl Command for SubCommand {
             .category(Category::Core)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Set the current cursor position."
     }
 
diff --git a/crates/nu-cli/src/commands/history/history_.rs b/crates/nu-cli/src/commands/history/history_.rs
index c270cef003..cf6e0f390f 100644
--- a/crates/nu-cli/src/commands/history/history_.rs
+++ b/crates/nu-cli/src/commands/history/history_.rs
@@ -13,7 +13,7 @@ impl Command for History {
         "history"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Get the command history."
     }
 
diff --git a/crates/nu-cli/src/commands/history/history_session.rs b/crates/nu-cli/src/commands/history/history_session.rs
index 5e68e47865..d6e0d0d96f 100644
--- a/crates/nu-cli/src/commands/history/history_session.rs
+++ b/crates/nu-cli/src/commands/history/history_session.rs
@@ -8,7 +8,7 @@ impl Command for HistorySession {
         "history session"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Get the command history session."
     }
 
diff --git a/crates/nu-cli/src/commands/keybindings.rs b/crates/nu-cli/src/commands/keybindings.rs
index 347ce983ea..34ae0fa9f3 100644
--- a/crates/nu-cli/src/commands/keybindings.rs
+++ b/crates/nu-cli/src/commands/keybindings.rs
@@ -14,11 +14,11 @@ impl Command for Keybindings {
             .input_output_types(vec![(Type::Nothing, Type::String)])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Keybindings related commands."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"You must use one of the following subcommands. Using this command as-is will only produce this help message.
 
 For more information on input and keybindings, check:
diff --git a/crates/nu-cli/src/commands/keybindings_default.rs b/crates/nu-cli/src/commands/keybindings_default.rs
index 1a62942b15..c5ca29dfed 100644
--- a/crates/nu-cli/src/commands/keybindings_default.rs
+++ b/crates/nu-cli/src/commands/keybindings_default.rs
@@ -15,7 +15,7 @@ impl Command for KeybindingsDefault {
             .input_output_types(vec![(Type::Nothing, Type::table())])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "List default keybindings."
     }
 
diff --git a/crates/nu-cli/src/commands/keybindings_list.rs b/crates/nu-cli/src/commands/keybindings_list.rs
index abb5909a97..6332ec31f0 100644
--- a/crates/nu-cli/src/commands/keybindings_list.rs
+++ b/crates/nu-cli/src/commands/keybindings_list.rs
@@ -23,7 +23,7 @@ impl Command for KeybindingsList {
             .category(Category::Platform)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "List available options that can be used to create keybindings."
     }
 
diff --git a/crates/nu-cli/src/commands/keybindings_listen.rs b/crates/nu-cli/src/commands/keybindings_listen.rs
index 1cb443e360..40cda5652d 100644
--- a/crates/nu-cli/src/commands/keybindings_listen.rs
+++ b/crates/nu-cli/src/commands/keybindings_listen.rs
@@ -12,11 +12,11 @@ impl Command for KeybindingsListen {
         "keybindings listen"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Get input from the user."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "This is an internal debugging tool. For better output, try `input listen --types [key]`"
     }
 
diff --git a/crates/nu-cli/src/menus/help_completions.rs b/crates/nu-cli/src/menus/help_completions.rs
index 7dc157748e..ed60579f81 100644
--- a/crates/nu-cli/src/menus/help_completions.rs
+++ b/crates/nu-cli/src/menus/help_completions.rs
@@ -30,12 +30,15 @@ impl NuHelpCompleter {
             .filter_map(|(_, decl_id)| {
                 let decl = self.engine_state.get_decl(decl_id);
                 (decl.name().to_folded_case().contains(&folded_line)
-                    || decl.usage().to_folded_case().contains(&folded_line)
+                    || decl.description().to_folded_case().contains(&folded_line)
                     || decl
                         .search_terms()
                         .into_iter()
                         .any(|term| term.to_folded_case().contains(&folded_line))
-                    || decl.extra_usage().to_folded_case().contains(&folded_line))
+                    || decl
+                        .extra_description()
+                        .to_folded_case()
+                        .contains(&folded_line))
                 .then_some(decl)
             })
             .collect::<Vec<_>>();
@@ -47,15 +50,15 @@ impl NuHelpCompleter {
             .map(|decl| {
                 let mut long_desc = String::new();
 
-                let usage = decl.usage();
-                if !usage.is_empty() {
-                    long_desc.push_str(usage);
+                let description = decl.description();
+                if !description.is_empty() {
+                    long_desc.push_str(description);
                     long_desc.push_str("\r\n\r\n");
                 }
 
-                let extra_usage = decl.extra_usage();
-                if !extra_usage.is_empty() {
-                    long_desc.push_str(extra_usage);
+                let extra_desc = decl.extra_description();
+                if !extra_desc.is_empty() {
+                    long_desc.push_str(extra_desc);
                     long_desc.push_str("\r\n\r\n");
                 }
 
diff --git a/crates/nu-cli/src/nu_highlight.rs b/crates/nu-cli/src/nu_highlight.rs
index 0b5f211838..dd202cc061 100644
--- a/crates/nu-cli/src/nu_highlight.rs
+++ b/crates/nu-cli/src/nu_highlight.rs
@@ -17,7 +17,7 @@ impl Command for NuHighlight {
             .input_output_types(vec![(Type::String, Type::String)])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Syntax highlight the input string."
     }
 
diff --git a/crates/nu-cli/src/print.rs b/crates/nu-cli/src/print.rs
index e84c9d5e8f..66e736ca4f 100644
--- a/crates/nu-cli/src/print.rs
+++ b/crates/nu-cli/src/print.rs
@@ -30,11 +30,11 @@ impl Command for Print {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Print the given values to stdout."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"Unlike `echo`, this command does not return any value (`print | describe` will return "nothing").
 Since this command has no output, there is no point in piping it with other commands.
 
diff --git a/crates/nu-cmd-extra/src/extra/bits/and.rs b/crates/nu-cmd-extra/src/extra/bits/and.rs
index 234b4e5cc1..a87508732d 100644
--- a/crates/nu-cmd-extra/src/extra/bits/and.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/and.rs
@@ -37,7 +37,7 @@ impl Command for BitsAnd {
             .category(Category::Bits)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Performs bitwise and for ints or binary values."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/bits/bits_.rs b/crates/nu-cmd-extra/src/extra/bits/bits_.rs
index 1190c01b4d..cb07a6420a 100644
--- a/crates/nu-cmd-extra/src/extra/bits/bits_.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/bits_.rs
@@ -14,11 +14,11 @@ impl Command for Bits {
             .input_output_types(vec![(Type::Nothing, Type::String)])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Various commands for working with bits."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "You must use one of the following subcommands. Using this command as-is will only produce this help message."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/bits/into.rs b/crates/nu-cmd-extra/src/extra/bits/into.rs
index 9ff8bd0a05..7edc8d3584 100644
--- a/crates/nu-cmd-extra/src/extra/bits/into.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/into.rs
@@ -45,7 +45,7 @@ impl Command for BitsInto {
             .category(Category::Conversions)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert value to a binary primitive."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/bits/not.rs b/crates/nu-cmd-extra/src/extra/bits/not.rs
index 405cc79d7e..d014d21abe 100644
--- a/crates/nu-cmd-extra/src/extra/bits/not.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/not.rs
@@ -51,7 +51,7 @@ impl Command for BitsNot {
             .category(Category::Bits)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Performs logical negation on each bit."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/bits/or.rs b/crates/nu-cmd-extra/src/extra/bits/or.rs
index a0af2dc8d0..287b841750 100644
--- a/crates/nu-cmd-extra/src/extra/bits/or.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/or.rs
@@ -38,7 +38,7 @@ impl Command for BitsOr {
             .category(Category::Bits)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Performs bitwise or for ints or binary values."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/bits/rotate_left.rs b/crates/nu-cmd-extra/src/extra/bits/rotate_left.rs
index 5bb9e42f6b..e1560fb157 100644
--- a/crates/nu-cmd-extra/src/extra/bits/rotate_left.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/rotate_left.rs
@@ -53,7 +53,7 @@ impl Command for BitsRol {
             .category(Category::Bits)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Bitwise rotate left for ints or binary values."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/bits/rotate_right.rs b/crates/nu-cmd-extra/src/extra/bits/rotate_right.rs
index 31e17891a3..ed5fc49bd8 100644
--- a/crates/nu-cmd-extra/src/extra/bits/rotate_right.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/rotate_right.rs
@@ -53,7 +53,7 @@ impl Command for BitsRor {
             .category(Category::Bits)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Bitwise rotate right for ints or binary values."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/bits/shift_left.rs b/crates/nu-cmd-extra/src/extra/bits/shift_left.rs
index e3b484a7d4..155e20a429 100644
--- a/crates/nu-cmd-extra/src/extra/bits/shift_left.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/shift_left.rs
@@ -55,7 +55,7 @@ impl Command for BitsShl {
             .category(Category::Bits)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Bitwise shift left for ints or binary values."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/bits/shift_right.rs b/crates/nu-cmd-extra/src/extra/bits/shift_right.rs
index 9bb5b1563a..bc4f165d61 100644
--- a/crates/nu-cmd-extra/src/extra/bits/shift_right.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/shift_right.rs
@@ -52,7 +52,7 @@ impl Command for BitsShr {
             .category(Category::Bits)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Bitwise shift right for ints or binary values."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/bits/xor.rs b/crates/nu-cmd-extra/src/extra/bits/xor.rs
index 4a71487137..2474bf27f1 100644
--- a/crates/nu-cmd-extra/src/extra/bits/xor.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/xor.rs
@@ -38,7 +38,7 @@ impl Command for BitsXor {
             .category(Category::Bits)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Performs bitwise xor for ints or binary values."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/conversions/fmt.rs b/crates/nu-cmd-extra/src/extra/conversions/fmt.rs
index 3b682291e7..15ca742c76 100644
--- a/crates/nu-cmd-extra/src/extra/conversions/fmt.rs
+++ b/crates/nu-cmd-extra/src/extra/conversions/fmt.rs
@@ -9,7 +9,7 @@ impl Command for Fmt {
         "fmt"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Format a number."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/filters/each_while.rs b/crates/nu-cmd-extra/src/extra/filters/each_while.rs
index 1f30e5b9b9..67f0cc9482 100644
--- a/crates/nu-cmd-extra/src/extra/filters/each_while.rs
+++ b/crates/nu-cmd-extra/src/extra/filters/each_while.rs
@@ -9,7 +9,7 @@ impl Command for EachWhile {
         "each while"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Run a closure on each row of the input list until a null is found, then create a new list with the results."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/filters/roll/roll_.rs b/crates/nu-cmd-extra/src/extra/filters/roll/roll_.rs
index 867bc2706e..60db022fde 100644
--- a/crates/nu-cmd-extra/src/extra/filters/roll/roll_.rs
+++ b/crates/nu-cmd-extra/src/extra/filters/roll/roll_.rs
@@ -18,11 +18,11 @@ impl Command for Roll {
             .input_output_types(vec![(Type::Nothing, Type::String)])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Rolling commands for tables."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "You must use one of the following subcommands. Using this command as-is will only produce this help message."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/filters/roll/roll_down.rs b/crates/nu-cmd-extra/src/extra/filters/roll/roll_down.rs
index 24ea1bc309..a7a1cc6be5 100644
--- a/crates/nu-cmd-extra/src/extra/filters/roll/roll_down.rs
+++ b/crates/nu-cmd-extra/src/extra/filters/roll/roll_down.rs
@@ -21,7 +21,7 @@ impl Command for RollDown {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Roll table rows down."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/filters/roll/roll_left.rs b/crates/nu-cmd-extra/src/extra/filters/roll/roll_left.rs
index 789b70830d..8d6616156b 100644
--- a/crates/nu-cmd-extra/src/extra/filters/roll/roll_left.rs
+++ b/crates/nu-cmd-extra/src/extra/filters/roll/roll_left.rs
@@ -33,7 +33,7 @@ impl Command for RollLeft {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Roll record or table columns left."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/filters/roll/roll_right.rs b/crates/nu-cmd-extra/src/extra/filters/roll/roll_right.rs
index 55a1e42158..7657e73dc7 100644
--- a/crates/nu-cmd-extra/src/extra/filters/roll/roll_right.rs
+++ b/crates/nu-cmd-extra/src/extra/filters/roll/roll_right.rs
@@ -33,7 +33,7 @@ impl Command for RollRight {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Roll table columns right."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/filters/roll/roll_up.rs b/crates/nu-cmd-extra/src/extra/filters/roll/roll_up.rs
index 7b9480599d..ffdabca8eb 100644
--- a/crates/nu-cmd-extra/src/extra/filters/roll/roll_up.rs
+++ b/crates/nu-cmd-extra/src/extra/filters/roll/roll_up.rs
@@ -21,7 +21,7 @@ impl Command for RollUp {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Roll table rows up."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/filters/rotate.rs b/crates/nu-cmd-extra/src/extra/filters/rotate.rs
index 1d93109604..2ebe6478e4 100644
--- a/crates/nu-cmd-extra/src/extra/filters/rotate.rs
+++ b/crates/nu-cmd-extra/src/extra/filters/rotate.rs
@@ -23,7 +23,7 @@ impl Command for Rotate {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Rotates a table or record clockwise (default) or counter-clockwise (use --ccw flag)."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/filters/update_cells.rs b/crates/nu-cmd-extra/src/extra/filters/update_cells.rs
index b102c13c0d..7cfc20de23 100644
--- a/crates/nu-cmd-extra/src/extra/filters/update_cells.rs
+++ b/crates/nu-cmd-extra/src/extra/filters/update_cells.rs
@@ -27,7 +27,7 @@ impl Command for UpdateCells {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Update the table cells."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/formats/from/url.rs b/crates/nu-cmd-extra/src/extra/formats/from/url.rs
index c8e21aa703..b1e8329020 100644
--- a/crates/nu-cmd-extra/src/extra/formats/from/url.rs
+++ b/crates/nu-cmd-extra/src/extra/formats/from/url.rs
@@ -14,7 +14,7 @@ impl Command for FromUrl {
             .category(Category::Formats)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Parse url-encoded string as a record."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/formats/to/html.rs b/crates/nu-cmd-extra/src/extra/formats/to/html.rs
index f02f11cf84..b047b386f1 100644
--- a/crates/nu-cmd-extra/src/extra/formats/to/html.rs
+++ b/crates/nu-cmd-extra/src/extra/formats/to/html.rs
@@ -138,11 +138,11 @@ impl Command for ToHtml {
         ]
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert table into simple HTML."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "Screenshots of the themes can be browsed here: https://github.com/mbadolato/iTerm2-Color-Schemes."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/math/arccos.rs b/crates/nu-cmd-extra/src/extra/math/arccos.rs
index 5d0a659380..229e7e4520 100644
--- a/crates/nu-cmd-extra/src/extra/math/arccos.rs
+++ b/crates/nu-cmd-extra/src/extra/math/arccos.rs
@@ -22,7 +22,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the arccosine of the number."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/math/arccosh.rs b/crates/nu-cmd-extra/src/extra/math/arccosh.rs
index 532a388b3f..c15c72dc36 100644
--- a/crates/nu-cmd-extra/src/extra/math/arccosh.rs
+++ b/crates/nu-cmd-extra/src/extra/math/arccosh.rs
@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the inverse of the hyperbolic cosine function."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/math/arcsin.rs b/crates/nu-cmd-extra/src/extra/math/arcsin.rs
index a85c438367..b1f4438e2b 100644
--- a/crates/nu-cmd-extra/src/extra/math/arcsin.rs
+++ b/crates/nu-cmd-extra/src/extra/math/arcsin.rs
@@ -22,7 +22,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the arcsine of the number."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/math/arcsinh.rs b/crates/nu-cmd-extra/src/extra/math/arcsinh.rs
index 91cb814a32..a2fce1f057 100644
--- a/crates/nu-cmd-extra/src/extra/math/arcsinh.rs
+++ b/crates/nu-cmd-extra/src/extra/math/arcsinh.rs
@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the inverse of the hyperbolic sine function."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/math/arctan.rs b/crates/nu-cmd-extra/src/extra/math/arctan.rs
index f52c8bd40c..f3bcc74150 100644
--- a/crates/nu-cmd-extra/src/extra/math/arctan.rs
+++ b/crates/nu-cmd-extra/src/extra/math/arctan.rs
@@ -22,7 +22,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the arctangent of the number."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/math/arctanh.rs b/crates/nu-cmd-extra/src/extra/math/arctanh.rs
index 7791b56948..bd01e7f101 100644
--- a/crates/nu-cmd-extra/src/extra/math/arctanh.rs
+++ b/crates/nu-cmd-extra/src/extra/math/arctanh.rs
@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the inverse of the hyperbolic tangent function."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/math/cos.rs b/crates/nu-cmd-extra/src/extra/math/cos.rs
index 252c7dbbd6..5ec0777edf 100644
--- a/crates/nu-cmd-extra/src/extra/math/cos.rs
+++ b/crates/nu-cmd-extra/src/extra/math/cos.rs
@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the cosine of the number."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/math/cosh.rs b/crates/nu-cmd-extra/src/extra/math/cosh.rs
index e46d3c4df8..68bdc6094a 100644
--- a/crates/nu-cmd-extra/src/extra/math/cosh.rs
+++ b/crates/nu-cmd-extra/src/extra/math/cosh.rs
@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the hyperbolic cosine of the number."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/math/exp.rs b/crates/nu-cmd-extra/src/extra/math/exp.rs
index d8f6a52899..0b28274dae 100644
--- a/crates/nu-cmd-extra/src/extra/math/exp.rs
+++ b/crates/nu-cmd-extra/src/extra/math/exp.rs
@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns e raised to the power of x."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/math/ln.rs b/crates/nu-cmd-extra/src/extra/math/ln.rs
index 694192bc8e..147f536028 100644
--- a/crates/nu-cmd-extra/src/extra/math/ln.rs
+++ b/crates/nu-cmd-extra/src/extra/math/ln.rs
@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the natural logarithm. Base: (math e)."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/math/sin.rs b/crates/nu-cmd-extra/src/extra/math/sin.rs
index 0caedbabe7..fcaa693b8d 100644
--- a/crates/nu-cmd-extra/src/extra/math/sin.rs
+++ b/crates/nu-cmd-extra/src/extra/math/sin.rs
@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the sine of the number."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/math/sinh.rs b/crates/nu-cmd-extra/src/extra/math/sinh.rs
index d40db3bcb5..2e852e42f1 100644
--- a/crates/nu-cmd-extra/src/extra/math/sinh.rs
+++ b/crates/nu-cmd-extra/src/extra/math/sinh.rs
@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the hyperbolic sine of the number."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/math/tan.rs b/crates/nu-cmd-extra/src/extra/math/tan.rs
index 97c5d2ff93..025b9817c5 100644
--- a/crates/nu-cmd-extra/src/extra/math/tan.rs
+++ b/crates/nu-cmd-extra/src/extra/math/tan.rs
@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the tangent of the number."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/math/tanh.rs b/crates/nu-cmd-extra/src/extra/math/tanh.rs
index 6679d04fe5..9ac10444d9 100644
--- a/crates/nu-cmd-extra/src/extra/math/tanh.rs
+++ b/crates/nu-cmd-extra/src/extra/math/tanh.rs
@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the hyperbolic tangent of the number."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/platform/ansi/gradient.rs b/crates/nu-cmd-extra/src/extra/platform/ansi/gradient.rs
index 5934b57a5d..433757e6c7 100644
--- a/crates/nu-cmd-extra/src/extra/platform/ansi/gradient.rs
+++ b/crates/nu-cmd-extra/src/extra/platform/ansi/gradient.rs
@@ -53,7 +53,7 @@ impl Command for SubCommand {
             .category(Category::Platform)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Add a color gradient (using ANSI color codes) to the given string."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/strings/encode_decode/decode_hex.rs b/crates/nu-cmd-extra/src/extra/strings/encode_decode/decode_hex.rs
index 7be007d1c7..f846afed71 100644
--- a/crates/nu-cmd-extra/src/extra/strings/encode_decode/decode_hex.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/encode_decode/decode_hex.rs
@@ -29,7 +29,7 @@ impl Command for DecodeHex {
             .category(Category::Formats)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Hex decode a value."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/strings/encode_decode/encode_hex.rs b/crates/nu-cmd-extra/src/extra/strings/encode_decode/encode_hex.rs
index d261f7fe1f..c3a5467ca8 100644
--- a/crates/nu-cmd-extra/src/extra/strings/encode_decode/encode_hex.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/encode_decode/encode_hex.rs
@@ -29,7 +29,7 @@ impl Command for EncodeHex {
             .category(Category::Formats)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Encode a binary value using hex."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/strings/format/command.rs b/crates/nu-cmd-extra/src/extra/strings/format/command.rs
index ef9b6f2baf..522fc6b05d 100644
--- a/crates/nu-cmd-extra/src/extra/strings/format/command.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/format/command.rs
@@ -24,7 +24,7 @@ impl Command for FormatPattern {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Format columns into a string using a simple pattern."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/strings/str_/case/camel_case.rs b/crates/nu-cmd-extra/src/extra/strings/str_/case/camel_case.rs
index e48bc10e1e..781848d7d8 100644
--- a/crates/nu-cmd-extra/src/extra/strings/str_/case/camel_case.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/str_/case/camel_case.rs
@@ -30,7 +30,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert a string to camelCase."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/strings/str_/case/kebab_case.rs b/crates/nu-cmd-extra/src/extra/strings/str_/case/kebab_case.rs
index 7e1accffaf..74c2d031e5 100644
--- a/crates/nu-cmd-extra/src/extra/strings/str_/case/kebab_case.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/str_/case/kebab_case.rs
@@ -30,7 +30,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert a string to kebab-case."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/strings/str_/case/pascal_case.rs b/crates/nu-cmd-extra/src/extra/strings/str_/case/pascal_case.rs
index a38c3715c9..1372537ed5 100644
--- a/crates/nu-cmd-extra/src/extra/strings/str_/case/pascal_case.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/str_/case/pascal_case.rs
@@ -30,7 +30,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert a string to PascalCase."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/strings/str_/case/screaming_snake_case.rs b/crates/nu-cmd-extra/src/extra/strings/str_/case/screaming_snake_case.rs
index d67b72f1b7..c8b918b37f 100644
--- a/crates/nu-cmd-extra/src/extra/strings/str_/case/screaming_snake_case.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/str_/case/screaming_snake_case.rs
@@ -30,7 +30,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert a string to SCREAMING_SNAKE_CASE."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/strings/str_/case/snake_case.rs b/crates/nu-cmd-extra/src/extra/strings/str_/case/snake_case.rs
index 84338295c3..56a9b8b754 100644
--- a/crates/nu-cmd-extra/src/extra/strings/str_/case/snake_case.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/str_/case/snake_case.rs
@@ -30,7 +30,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert a string to snake_case."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/strings/str_/case/str_.rs b/crates/nu-cmd-extra/src/extra/strings/str_/case/str_.rs
index fe6cb86324..4ee04ec1e4 100644
--- a/crates/nu-cmd-extra/src/extra/strings/str_/case/str_.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/str_/case/str_.rs
@@ -14,11 +14,11 @@ impl Command for Str {
             .input_output_types(vec![(Type::Nothing, Type::String)])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Various commands for working with string data."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "You must use one of the following subcommands. Using this command as-is will only produce this help message."
     }
 
diff --git a/crates/nu-cmd-extra/src/extra/strings/str_/case/title_case.rs b/crates/nu-cmd-extra/src/extra/strings/str_/case/title_case.rs
index ffcfd8d8d4..02d7efcb2e 100644
--- a/crates/nu-cmd-extra/src/extra/strings/str_/case/title_case.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/str_/case/title_case.rs
@@ -30,7 +30,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert a string to Title Case."
     }
 
diff --git a/crates/nu-cmd-lang/src/core_commands/alias.rs b/crates/nu-cmd-lang/src/core_commands/alias.rs
index f14f4d5827..07f41bb73c 100644
--- a/crates/nu-cmd-lang/src/core_commands/alias.rs
+++ b/crates/nu-cmd-lang/src/core_commands/alias.rs
@@ -9,7 +9,7 @@ impl Command for Alias {
         "alias"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Alias a command (with optional flags) to a new name."
     }
 
@@ -25,7 +25,7 @@ impl Command for Alias {
             .category(Category::Core)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
diff --git a/crates/nu-cmd-lang/src/core_commands/break_.rs b/crates/nu-cmd-lang/src/core_commands/break_.rs
index 943e32a531..69c8089370 100644
--- a/crates/nu-cmd-lang/src/core_commands/break_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/break_.rs
@@ -9,7 +9,7 @@ impl Command for Break {
         "break"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Break a loop."
     }
 
@@ -19,7 +19,7 @@ impl Command for Break {
             .category(Category::Core)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html
 
diff --git a/crates/nu-cmd-lang/src/core_commands/collect.rs b/crates/nu-cmd-lang/src/core_commands/collect.rs
index d6282eec35..709904de84 100644
--- a/crates/nu-cmd-lang/src/core_commands/collect.rs
+++ b/crates/nu-cmd-lang/src/core_commands/collect.rs
@@ -25,11 +25,11 @@ impl Command for Collect {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Collect a stream into a value."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"If provided, run a closure with the collected value as input.
 
 The entire stream will be collected into one value in memory, so if the stream
diff --git a/crates/nu-cmd-lang/src/core_commands/const_.rs b/crates/nu-cmd-lang/src/core_commands/const_.rs
index 5b3d03443a..67182faedd 100644
--- a/crates/nu-cmd-lang/src/core_commands/const_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/const_.rs
@@ -9,7 +9,7 @@ impl Command for Const {
         "const"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Create a parse-time constant."
     }
 
@@ -26,7 +26,7 @@ impl Command for Const {
             .category(Category::Core)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
diff --git a/crates/nu-cmd-lang/src/core_commands/continue_.rs b/crates/nu-cmd-lang/src/core_commands/continue_.rs
index b795456c1d..1c070286d2 100644
--- a/crates/nu-cmd-lang/src/core_commands/continue_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/continue_.rs
@@ -9,7 +9,7 @@ impl Command for Continue {
         "continue"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Continue a loop from the next iteration."
     }
 
@@ -19,7 +19,7 @@ impl Command for Continue {
             .category(Category::Core)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html
 
diff --git a/crates/nu-cmd-lang/src/core_commands/def.rs b/crates/nu-cmd-lang/src/core_commands/def.rs
index 7f8613f315..efb5bdfae2 100644
--- a/crates/nu-cmd-lang/src/core_commands/def.rs
+++ b/crates/nu-cmd-lang/src/core_commands/def.rs
@@ -9,7 +9,7 @@ impl Command for Def {
         "def"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Define a custom command."
     }
 
@@ -24,7 +24,7 @@ impl Command for Def {
             .category(Category::Core)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
diff --git a/crates/nu-cmd-lang/src/core_commands/describe.rs b/crates/nu-cmd-lang/src/core_commands/describe.rs
index 3d992f3f33..5df62e6793 100644
--- a/crates/nu-cmd-lang/src/core_commands/describe.rs
+++ b/crates/nu-cmd-lang/src/core_commands/describe.rs
@@ -9,7 +9,7 @@ impl Command for Describe {
         "describe"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Describe the type and structure of the value(s) piped in."
     }
 
diff --git a/crates/nu-cmd-lang/src/core_commands/do_.rs b/crates/nu-cmd-lang/src/core_commands/do_.rs
index bf29a2159a..61c9cf09a0 100644
--- a/crates/nu-cmd-lang/src/core_commands/do_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/do_.rs
@@ -17,7 +17,7 @@ impl Command for Do {
         "do"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Run a closure, providing it with the pipeline input."
     }
 
diff --git a/crates/nu-cmd-lang/src/core_commands/echo.rs b/crates/nu-cmd-lang/src/core_commands/echo.rs
index 00c8b1329c..d4ebeb2aa8 100644
--- a/crates/nu-cmd-lang/src/core_commands/echo.rs
+++ b/crates/nu-cmd-lang/src/core_commands/echo.rs
@@ -8,7 +8,7 @@ impl Command for Echo {
         "echo"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns its arguments, ignoring the piped-in value."
     }
 
@@ -19,7 +19,7 @@ impl Command for Echo {
             .category(Category::Core)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"Unlike `print`, which prints unstructured text to stdout, `echo` is like an
 identity function and simply returns its arguments. When given no arguments,
 it returns an empty string. When given one argument, it returns it as a
diff --git a/crates/nu-cmd-lang/src/core_commands/error_make.rs b/crates/nu-cmd-lang/src/core_commands/error_make.rs
index 07efcd7885..97bead75ff 100644
--- a/crates/nu-cmd-lang/src/core_commands/error_make.rs
+++ b/crates/nu-cmd-lang/src/core_commands/error_make.rs
@@ -25,7 +25,7 @@ impl Command for ErrorMake {
             .category(Category::Core)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Create an error."
     }
 
diff --git a/crates/nu-cmd-lang/src/core_commands/export.rs b/crates/nu-cmd-lang/src/core_commands/export.rs
index 565e7895dc..d7e923da7f 100644
--- a/crates/nu-cmd-lang/src/core_commands/export.rs
+++ b/crates/nu-cmd-lang/src/core_commands/export.rs
@@ -15,11 +15,11 @@ impl Command for ExportCommand {
             .category(Category::Core)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Export definitions or environment variables from a module."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
diff --git a/crates/nu-cmd-lang/src/core_commands/export_alias.rs b/crates/nu-cmd-lang/src/core_commands/export_alias.rs
index 4df335da44..a3001cd83a 100644
--- a/crates/nu-cmd-lang/src/core_commands/export_alias.rs
+++ b/crates/nu-cmd-lang/src/core_commands/export_alias.rs
@@ -9,7 +9,7 @@ impl Command for ExportAlias {
         "export alias"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Alias a command (with optional flags) to a new name and export it from a module."
     }
 
@@ -25,7 +25,7 @@ impl Command for ExportAlias {
             .category(Category::Core)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
diff --git a/crates/nu-cmd-lang/src/core_commands/export_const.rs b/crates/nu-cmd-lang/src/core_commands/export_const.rs
index 631d85ad89..59e93850c4 100644
--- a/crates/nu-cmd-lang/src/core_commands/export_const.rs
+++ b/crates/nu-cmd-lang/src/core_commands/export_const.rs
@@ -9,7 +9,7 @@ impl Command for ExportConst {
         "export const"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Use parse-time constant from a module and export them from this module."
     }
 
@@ -26,7 +26,7 @@ impl Command for ExportConst {
             .category(Category::Core)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
diff --git a/crates/nu-cmd-lang/src/core_commands/export_def.rs b/crates/nu-cmd-lang/src/core_commands/export_def.rs
index 7a2d3949e1..51c4c871a2 100644
--- a/crates/nu-cmd-lang/src/core_commands/export_def.rs
+++ b/crates/nu-cmd-lang/src/core_commands/export_def.rs
@@ -9,7 +9,7 @@ impl Command for ExportDef {
         "export def"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Define a custom command and export it from a module."
     }
 
@@ -24,7 +24,7 @@ impl Command for ExportDef {
             .category(Category::Core)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
diff --git a/crates/nu-cmd-lang/src/core_commands/export_extern.rs b/crates/nu-cmd-lang/src/core_commands/export_extern.rs
index 1a2ba4e5cb..580e503e20 100644
--- a/crates/nu-cmd-lang/src/core_commands/export_extern.rs
+++ b/crates/nu-cmd-lang/src/core_commands/export_extern.rs
@@ -9,7 +9,7 @@ impl Command for ExportExtern {
         "export extern"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Define an extern and export it from a module."
     }
 
@@ -21,7 +21,7 @@ impl Command for ExportExtern {
             .category(Category::Core)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
diff --git a/crates/nu-cmd-lang/src/core_commands/export_module.rs b/crates/nu-cmd-lang/src/core_commands/export_module.rs
index 53a6ca750c..c749c1a43f 100644
--- a/crates/nu-cmd-lang/src/core_commands/export_module.rs
+++ b/crates/nu-cmd-lang/src/core_commands/export_module.rs
@@ -9,7 +9,7 @@ impl Command for ExportModule {
         "export module"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Export a custom module from a module."
     }
 
@@ -26,7 +26,7 @@ impl Command for ExportModule {
             .category(Category::Core)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
diff --git a/crates/nu-cmd-lang/src/core_commands/export_use.rs b/crates/nu-cmd-lang/src/core_commands/export_use.rs
index 5ca96a899e..4d2c3bf5e4 100644
--- a/crates/nu-cmd-lang/src/core_commands/export_use.rs
+++ b/crates/nu-cmd-lang/src/core_commands/export_use.rs
@@ -9,7 +9,7 @@ impl Command for ExportUse {
         "export use"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Use definitions from a module and export them from this module."
     }
 
@@ -25,7 +25,7 @@ impl Command for ExportUse {
             .category(Category::Core)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
diff --git a/crates/nu-cmd-lang/src/core_commands/extern_.rs b/crates/nu-cmd-lang/src/core_commands/extern_.rs
index 496f104650..c0afcdf74b 100644
--- a/crates/nu-cmd-lang/src/core_commands/extern_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/extern_.rs
@@ -9,7 +9,7 @@ impl Command for Extern {
         "extern"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Define a signature for an external command."
     }
 
@@ -21,7 +21,7 @@ impl Command for Extern {
             .category(Category::Core)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
diff --git a/crates/nu-cmd-lang/src/core_commands/for_.rs b/crates/nu-cmd-lang/src/core_commands/for_.rs
index 36df743e5f..16e1364225 100644
--- a/crates/nu-cmd-lang/src/core_commands/for_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/for_.rs
@@ -9,7 +9,7 @@ impl Command for For {
         "for"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Loop over a range."
     }
 
@@ -32,7 +32,7 @@ impl Command for For {
             .category(Category::Core)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
diff --git a/crates/nu-cmd-lang/src/core_commands/hide.rs b/crates/nu-cmd-lang/src/core_commands/hide.rs
index d52d2131c9..b51a21e979 100644
--- a/crates/nu-cmd-lang/src/core_commands/hide.rs
+++ b/crates/nu-cmd-lang/src/core_commands/hide.rs
@@ -21,11 +21,11 @@ impl Command for Hide {
             .category(Category::Core)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Hide definitions in the current scope."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"Definitions are hidden by priority: First aliases, then custom commands.
 
 This command is a parser keyword. For details, check:
diff --git a/crates/nu-cmd-lang/src/core_commands/hide_env.rs b/crates/nu-cmd-lang/src/core_commands/hide_env.rs
index 43ed830629..adc430b168 100644
--- a/crates/nu-cmd-lang/src/core_commands/hide_env.rs
+++ b/crates/nu-cmd-lang/src/core_commands/hide_env.rs
@@ -25,7 +25,7 @@ impl Command for HideEnv {
             .category(Category::Core)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Hide environment variables in the current scope."
     }
 
diff --git a/crates/nu-cmd-lang/src/core_commands/if_.rs b/crates/nu-cmd-lang/src/core_commands/if_.rs
index 8667843770..3b18b23879 100644
--- a/crates/nu-cmd-lang/src/core_commands/if_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/if_.rs
@@ -14,7 +14,7 @@ impl Command for If {
         "if"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Conditionally run a block."
     }
 
@@ -41,7 +41,7 @@ impl Command for If {
             .category(Category::Core)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
diff --git a/crates/nu-cmd-lang/src/core_commands/ignore.rs b/crates/nu-cmd-lang/src/core_commands/ignore.rs
index bca7f84a1a..2b3d31ba9f 100644
--- a/crates/nu-cmd-lang/src/core_commands/ignore.rs
+++ b/crates/nu-cmd-lang/src/core_commands/ignore.rs
@@ -9,7 +9,7 @@ impl Command for Ignore {
         "ignore"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Ignore the output of the previous command in the pipeline."
     }
 
diff --git a/crates/nu-cmd-lang/src/core_commands/let_.rs b/crates/nu-cmd-lang/src/core_commands/let_.rs
index 46324ef39e..3e0b2f97eb 100644
--- a/crates/nu-cmd-lang/src/core_commands/let_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/let_.rs
@@ -9,7 +9,7 @@ impl Command for Let {
         "let"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Create a variable and give it a value."
     }
 
@@ -26,7 +26,7 @@ impl Command for Let {
             .category(Category::Core)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
diff --git a/crates/nu-cmd-lang/src/core_commands/loop_.rs b/crates/nu-cmd-lang/src/core_commands/loop_.rs
index f495c8d3ae..1ef3706a6e 100644
--- a/crates/nu-cmd-lang/src/core_commands/loop_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/loop_.rs
@@ -9,7 +9,7 @@ impl Command for Loop {
         "loop"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Run a block in a loop."
     }
 
@@ -21,7 +21,7 @@ impl Command for Loop {
             .category(Category::Core)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
diff --git a/crates/nu-cmd-lang/src/core_commands/match_.rs b/crates/nu-cmd-lang/src/core_commands/match_.rs
index c3a3d61216..71ec8ebaec 100644
--- a/crates/nu-cmd-lang/src/core_commands/match_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/match_.rs
@@ -11,7 +11,7 @@ impl Command for Match {
         "match"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Conditionally run a block on a matched value."
     }
 
@@ -27,7 +27,7 @@ impl Command for Match {
             .category(Category::Core)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
diff --git a/crates/nu-cmd-lang/src/core_commands/module.rs b/crates/nu-cmd-lang/src/core_commands/module.rs
index 908c0764e5..4ed2d5c599 100644
--- a/crates/nu-cmd-lang/src/core_commands/module.rs
+++ b/crates/nu-cmd-lang/src/core_commands/module.rs
@@ -9,7 +9,7 @@ impl Command for Module {
         "module"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Define a custom module."
     }
 
@@ -26,7 +26,7 @@ impl Command for Module {
             .category(Category::Core)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
diff --git a/crates/nu-cmd-lang/src/core_commands/mut_.rs b/crates/nu-cmd-lang/src/core_commands/mut_.rs
index b729590027..a72d8f484f 100644
--- a/crates/nu-cmd-lang/src/core_commands/mut_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/mut_.rs
@@ -9,7 +9,7 @@ impl Command for Mut {
         "mut"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Create a mutable variable and give it a value."
     }
 
@@ -26,7 +26,7 @@ impl Command for Mut {
             .category(Category::Core)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
diff --git a/crates/nu-cmd-lang/src/core_commands/overlay/command.rs b/crates/nu-cmd-lang/src/core_commands/overlay/command.rs
index 00ec7438ad..c39df288d6 100644
--- a/crates/nu-cmd-lang/src/core_commands/overlay/command.rs
+++ b/crates/nu-cmd-lang/src/core_commands/overlay/command.rs
@@ -15,11 +15,11 @@ impl Command for Overlay {
             .input_output_types(vec![(Type::Nothing, Type::String)])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Commands for manipulating overlays."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html
 
diff --git a/crates/nu-cmd-lang/src/core_commands/overlay/hide.rs b/crates/nu-cmd-lang/src/core_commands/overlay/hide.rs
index 7ea84a2a91..0228eb10db 100644
--- a/crates/nu-cmd-lang/src/core_commands/overlay/hide.rs
+++ b/crates/nu-cmd-lang/src/core_commands/overlay/hide.rs
@@ -9,7 +9,7 @@ impl Command for OverlayHide {
         "overlay hide"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Hide an active overlay."
     }
 
@@ -31,7 +31,7 @@ impl Command for OverlayHide {
             .category(Category::Core)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
diff --git a/crates/nu-cmd-lang/src/core_commands/overlay/list.rs b/crates/nu-cmd-lang/src/core_commands/overlay/list.rs
index 776753cba8..d646d63acb 100644
--- a/crates/nu-cmd-lang/src/core_commands/overlay/list.rs
+++ b/crates/nu-cmd-lang/src/core_commands/overlay/list.rs
@@ -8,7 +8,7 @@ impl Command for OverlayList {
         "overlay list"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "List all active overlays."
     }
 
@@ -18,7 +18,7 @@ impl Command for OverlayList {
             .input_output_types(vec![(Type::Nothing, Type::List(Box::new(Type::String)))])
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "The overlays are listed in the order they were activated."
     }
 
diff --git a/crates/nu-cmd-lang/src/core_commands/overlay/new.rs b/crates/nu-cmd-lang/src/core_commands/overlay/new.rs
index a571c37947..98356971f2 100644
--- a/crates/nu-cmd-lang/src/core_commands/overlay/new.rs
+++ b/crates/nu-cmd-lang/src/core_commands/overlay/new.rs
@@ -9,7 +9,7 @@ impl Command for OverlayNew {
         "overlay new"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Create an empty overlay."
     }
 
@@ -27,7 +27,7 @@ impl Command for OverlayNew {
             .category(Category::Core)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"The command will first create an empty module, then add it as an overlay.
 
 This command is a parser keyword. For details, check:
diff --git a/crates/nu-cmd-lang/src/core_commands/overlay/use_.rs b/crates/nu-cmd-lang/src/core_commands/overlay/use_.rs
index d6d3ae745a..04cdb7a3da 100644
--- a/crates/nu-cmd-lang/src/core_commands/overlay/use_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/overlay/use_.rs
@@ -14,7 +14,7 @@ impl Command for OverlayUse {
         "overlay use"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Use definitions from a module as an overlay."
     }
 
@@ -45,7 +45,7 @@ impl Command for OverlayUse {
             .category(Category::Core)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
diff --git a/crates/nu-cmd-lang/src/core_commands/return_.rs b/crates/nu-cmd-lang/src/core_commands/return_.rs
index 478224079b..86863cd3d0 100644
--- a/crates/nu-cmd-lang/src/core_commands/return_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/return_.rs
@@ -9,7 +9,7 @@ impl Command for Return {
         "return"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Return early from a function."
     }
 
@@ -24,7 +24,7 @@ impl Command for Return {
             .category(Category::Core)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
diff --git a/crates/nu-cmd-lang/src/core_commands/scope/aliases.rs b/crates/nu-cmd-lang/src/core_commands/scope/aliases.rs
index 0b8d2d0200..6e5290a3e1 100644
--- a/crates/nu-cmd-lang/src/core_commands/scope/aliases.rs
+++ b/crates/nu-cmd-lang/src/core_commands/scope/aliases.rs
@@ -15,7 +15,7 @@ impl Command for ScopeAliases {
             .category(Category::Core)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Output info on the aliases in the current scope."
     }
 
diff --git a/crates/nu-cmd-lang/src/core_commands/scope/command.rs b/crates/nu-cmd-lang/src/core_commands/scope/command.rs
index cc52a8a16f..5e252c0077 100644
--- a/crates/nu-cmd-lang/src/core_commands/scope/command.rs
+++ b/crates/nu-cmd-lang/src/core_commands/scope/command.rs
@@ -15,7 +15,7 @@ impl Command for Scope {
             .allow_variants_without_examples(true)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Commands for getting info about what is in scope."
     }
 
diff --git a/crates/nu-cmd-lang/src/core_commands/scope/commands.rs b/crates/nu-cmd-lang/src/core_commands/scope/commands.rs
index 6ce0448f4e..a1fcd7be82 100644
--- a/crates/nu-cmd-lang/src/core_commands/scope/commands.rs
+++ b/crates/nu-cmd-lang/src/core_commands/scope/commands.rs
@@ -15,7 +15,7 @@ impl Command for ScopeCommands {
             .category(Category::Core)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Output info on the commands in the current scope."
     }
 
diff --git a/crates/nu-cmd-lang/src/core_commands/scope/engine_stats.rs b/crates/nu-cmd-lang/src/core_commands/scope/engine_stats.rs
index 649f622cd6..3109ef29a1 100644
--- a/crates/nu-cmd-lang/src/core_commands/scope/engine_stats.rs
+++ b/crates/nu-cmd-lang/src/core_commands/scope/engine_stats.rs
@@ -15,7 +15,7 @@ impl Command for ScopeEngineStats {
             .category(Category::Core)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Output stats on the engine in the current state."
     }
 
diff --git a/crates/nu-cmd-lang/src/core_commands/scope/externs.rs b/crates/nu-cmd-lang/src/core_commands/scope/externs.rs
index 187f90206d..fc7980c59e 100644
--- a/crates/nu-cmd-lang/src/core_commands/scope/externs.rs
+++ b/crates/nu-cmd-lang/src/core_commands/scope/externs.rs
@@ -15,7 +15,7 @@ impl Command for ScopeExterns {
             .category(Category::Core)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Output info on the known externals in the current scope."
     }
 
diff --git a/crates/nu-cmd-lang/src/core_commands/scope/modules.rs b/crates/nu-cmd-lang/src/core_commands/scope/modules.rs
index 9d78f2a061..1f5ca9e0e9 100644
--- a/crates/nu-cmd-lang/src/core_commands/scope/modules.rs
+++ b/crates/nu-cmd-lang/src/core_commands/scope/modules.rs
@@ -15,7 +15,7 @@ impl Command for ScopeModules {
             .category(Category::Core)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Output info on the modules in the current scope."
     }
 
diff --git a/crates/nu-cmd-lang/src/core_commands/scope/variables.rs b/crates/nu-cmd-lang/src/core_commands/scope/variables.rs
index 6c9a695c71..c07eb76230 100644
--- a/crates/nu-cmd-lang/src/core_commands/scope/variables.rs
+++ b/crates/nu-cmd-lang/src/core_commands/scope/variables.rs
@@ -15,7 +15,7 @@ impl Command for ScopeVariables {
             .category(Category::Core)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Output info on the variables in the current scope."
     }
 
diff --git a/crates/nu-cmd-lang/src/core_commands/try_.rs b/crates/nu-cmd-lang/src/core_commands/try_.rs
index 2309897a1b..fd2d3bd3cc 100644
--- a/crates/nu-cmd-lang/src/core_commands/try_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/try_.rs
@@ -9,7 +9,7 @@ impl Command for Try {
         "try"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Try to run a block, if it fails optionally run a catch closure."
     }
 
@@ -31,7 +31,7 @@ impl Command for Try {
             .category(Category::Core)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
diff --git a/crates/nu-cmd-lang/src/core_commands/use_.rs b/crates/nu-cmd-lang/src/core_commands/use_.rs
index 7f544fa5d4..8035cc81fe 100644
--- a/crates/nu-cmd-lang/src/core_commands/use_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/use_.rs
@@ -14,7 +14,7 @@ impl Command for Use {
         "use"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Use definitions from a module, making them available in your shell."
     }
 
@@ -35,7 +35,7 @@ impl Command for Use {
         vec!["module", "import", "include", "scope"]
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"See `help std` for the standard library module.
 See `help modules` to list all available modules.
 
diff --git a/crates/nu-cmd-lang/src/core_commands/version.rs b/crates/nu-cmd-lang/src/core_commands/version.rs
index 5491db65fc..f5716be6b3 100644
--- a/crates/nu-cmd-lang/src/core_commands/version.rs
+++ b/crates/nu-cmd-lang/src/core_commands/version.rs
@@ -21,7 +21,7 @@ impl Command for Version {
             .category(Category::Core)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Display Nu version, and its build configuration."
     }
 
diff --git a/crates/nu-cmd-lang/src/core_commands/while_.rs b/crates/nu-cmd-lang/src/core_commands/while_.rs
index a67c47fcab..acdac7edef 100644
--- a/crates/nu-cmd-lang/src/core_commands/while_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/while_.rs
@@ -9,7 +9,7 @@ impl Command for While {
         "while"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Conditionally run a block in a loop."
     }
 
@@ -30,7 +30,7 @@ impl Command for While {
         vec!["loop"]
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
diff --git a/crates/nu-cmd-plugin/src/commands/plugin/add.rs b/crates/nu-cmd-plugin/src/commands/plugin/add.rs
index 14f3541168..fa0b599de3 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/add.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/add.rs
@@ -37,11 +37,11 @@ impl Command for PluginAdd {
             .category(Category::Plugin)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Add a plugin to the plugin registry file."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"
 This does not load the plugin commands into the scope - see `plugin use` for
 that.
diff --git a/crates/nu-cmd-plugin/src/commands/plugin/list.rs b/crates/nu-cmd-plugin/src/commands/plugin/list.rs
index 030a3341d6..3fbf55b23c 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/list.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/list.rs
@@ -29,7 +29,7 @@ impl Command for PluginList {
             .category(Category::Plugin)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "List installed plugins."
     }
 
diff --git a/crates/nu-cmd-plugin/src/commands/plugin/mod.rs b/crates/nu-cmd-plugin/src/commands/plugin/mod.rs
index 36590e9a8a..ae4e5a7743 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/mod.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/mod.rs
@@ -26,7 +26,7 @@ impl Command for PluginCommand {
             .category(Category::Plugin)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Commands for managing plugins."
     }
 
diff --git a/crates/nu-cmd-plugin/src/commands/plugin/rm.rs b/crates/nu-cmd-plugin/src/commands/plugin/rm.rs
index a00060e27a..33557836c0 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/rm.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/rm.rs
@@ -33,11 +33,11 @@ impl Command for PluginRm {
             .category(Category::Plugin)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Remove a plugin from the plugin registry file."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"
 This does not remove the plugin commands from the current scope or from `plugin
 list` in the current shell. It instead removes the plugin from the plugin
diff --git a/crates/nu-cmd-plugin/src/commands/plugin/stop.rs b/crates/nu-cmd-plugin/src/commands/plugin/stop.rs
index f90eac8411..3c8383db93 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/stop.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/stop.rs
@@ -21,7 +21,7 @@ impl Command for PluginStop {
             .category(Category::Plugin)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Stop an installed plugin if it was running."
     }
 
diff --git a/crates/nu-cmd-plugin/src/commands/plugin/use_.rs b/crates/nu-cmd-plugin/src/commands/plugin/use_.rs
index 3cfb28f28b..df6ddb4507 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/use_.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/use_.rs
@@ -9,7 +9,7 @@ impl Command for PluginUse {
         "plugin use"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Load a plugin from the plugin registry file into scope."
     }
 
@@ -30,7 +30,7 @@ impl Command for PluginUse {
             .category(Category::Plugin)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"
 This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html
diff --git a/crates/nu-command/src/bytes/add.rs b/crates/nu-command/src/bytes/add.rs
index ab31f74b12..909a76bcd3 100644
--- a/crates/nu-command/src/bytes/add.rs
+++ b/crates/nu-command/src/bytes/add.rs
@@ -51,7 +51,7 @@ impl Command for BytesAdd {
             .category(Category::Bytes)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Add specified bytes to the input."
     }
 
diff --git a/crates/nu-command/src/bytes/at.rs b/crates/nu-command/src/bytes/at.rs
index 5e95f4fd62..adb4bfd9c2 100644
--- a/crates/nu-command/src/bytes/at.rs
+++ b/crates/nu-command/src/bytes/at.rs
@@ -53,7 +53,7 @@ impl Command for BytesAt {
             .category(Category::Bytes)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Get bytes defined by a range."
     }
 
diff --git a/crates/nu-command/src/bytes/build_.rs b/crates/nu-command/src/bytes/build_.rs
index 9a3599a071..f9ca58b10f 100644
--- a/crates/nu-command/src/bytes/build_.rs
+++ b/crates/nu-command/src/bytes/build_.rs
@@ -8,7 +8,7 @@ impl Command for BytesBuild {
         "bytes build"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Create bytes from the arguments."
     }
 
diff --git a/crates/nu-command/src/bytes/bytes_.rs b/crates/nu-command/src/bytes/bytes_.rs
index 82bf7c619b..5717b9d741 100644
--- a/crates/nu-command/src/bytes/bytes_.rs
+++ b/crates/nu-command/src/bytes/bytes_.rs
@@ -14,11 +14,11 @@ impl Command for Bytes {
             .input_output_types(vec![(Type::Nothing, Type::String)])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Various commands for working with byte data."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "You must use one of the following subcommands. Using this command as-is will only produce this help message."
     }
 
diff --git a/crates/nu-command/src/bytes/collect.rs b/crates/nu-command/src/bytes/collect.rs
index afb70bfb36..84089f2961 100644
--- a/crates/nu-command/src/bytes/collect.rs
+++ b/crates/nu-command/src/bytes/collect.rs
@@ -20,7 +20,7 @@ impl Command for BytesCollect {
             .category(Category::Bytes)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Concatenate multiple binary into a single binary, with an optional separator between each."
     }
 
diff --git a/crates/nu-command/src/bytes/ends_with.rs b/crates/nu-command/src/bytes/ends_with.rs
index 8e3966716c..774b45aefc 100644
--- a/crates/nu-command/src/bytes/ends_with.rs
+++ b/crates/nu-command/src/bytes/ends_with.rs
@@ -41,7 +41,7 @@ impl Command for BytesEndsWith {
             .category(Category::Bytes)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Check if bytes ends with a pattern."
     }
 
diff --git a/crates/nu-command/src/bytes/index_of.rs b/crates/nu-command/src/bytes/index_of.rs
index e10bd6c200..b6e1f4615d 100644
--- a/crates/nu-command/src/bytes/index_of.rs
+++ b/crates/nu-command/src/bytes/index_of.rs
@@ -47,7 +47,7 @@ impl Command for BytesIndexOf {
             .category(Category::Bytes)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns start index of first occurrence of pattern in bytes, or -1 if no match."
     }
 
diff --git a/crates/nu-command/src/bytes/length.rs b/crates/nu-command/src/bytes/length.rs
index 78b3d31eac..34a606b784 100644
--- a/crates/nu-command/src/bytes/length.rs
+++ b/crates/nu-command/src/bytes/length.rs
@@ -29,7 +29,7 @@ impl Command for BytesLen {
             .category(Category::Bytes)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Output the length of any bytes in the pipeline."
     }
 
diff --git a/crates/nu-command/src/bytes/remove.rs b/crates/nu-command/src/bytes/remove.rs
index 34d3c427f4..df420d044a 100644
--- a/crates/nu-command/src/bytes/remove.rs
+++ b/crates/nu-command/src/bytes/remove.rs
@@ -40,7 +40,7 @@ impl Command for BytesRemove {
             .category(Category::Bytes)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Remove bytes."
     }
 
diff --git a/crates/nu-command/src/bytes/replace.rs b/crates/nu-command/src/bytes/replace.rs
index db2b6fb790..a3ef18bdb7 100644
--- a/crates/nu-command/src/bytes/replace.rs
+++ b/crates/nu-command/src/bytes/replace.rs
@@ -41,7 +41,7 @@ impl Command for BytesReplace {
             .category(Category::Bytes)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Find and replace binary."
     }
 
diff --git a/crates/nu-command/src/bytes/reverse.rs b/crates/nu-command/src/bytes/reverse.rs
index fd769eaa40..ed988716b4 100644
--- a/crates/nu-command/src/bytes/reverse.rs
+++ b/crates/nu-command/src/bytes/reverse.rs
@@ -25,7 +25,7 @@ impl Command for BytesReverse {
             .category(Category::Bytes)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Reverse the bytes in the pipeline."
     }
 
diff --git a/crates/nu-command/src/bytes/starts_with.rs b/crates/nu-command/src/bytes/starts_with.rs
index 89cc4f7afc..39db1a80ce 100644
--- a/crates/nu-command/src/bytes/starts_with.rs
+++ b/crates/nu-command/src/bytes/starts_with.rs
@@ -39,7 +39,7 @@ impl Command for BytesStartsWith {
             .category(Category::Bytes)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Check if bytes starts with a pattern."
     }
 
diff --git a/crates/nu-command/src/charting/histogram.rs b/crates/nu-command/src/charting/histogram.rs
index 1162259409..349ec1c2a7 100755
--- a/crates/nu-command/src/charting/histogram.rs
+++ b/crates/nu-command/src/charting/histogram.rs
@@ -26,7 +26,7 @@ impl Command for Histogram {
             .category(Category::Chart)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Creates a new table with a histogram based on the column name passed in."
     }
 
diff --git a/crates/nu-command/src/conversions/fill.rs b/crates/nu-command/src/conversions/fill.rs
index 3bd205814a..4ab284931f 100644
--- a/crates/nu-command/src/conversions/fill.rs
+++ b/crates/nu-command/src/conversions/fill.rs
@@ -32,7 +32,7 @@ impl Command for Fill {
         "fill"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Fill and Align."
     }
 
diff --git a/crates/nu-command/src/conversions/into/binary.rs b/crates/nu-command/src/conversions/into/binary.rs
index e5c34ae6bc..d82f911506 100644
--- a/crates/nu-command/src/conversions/into/binary.rs
+++ b/crates/nu-command/src/conversions/into/binary.rs
@@ -43,7 +43,7 @@ impl Command for SubCommand {
             .category(Category::Conversions)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert value to a binary primitive."
     }
 
diff --git a/crates/nu-command/src/conversions/into/bool.rs b/crates/nu-command/src/conversions/into/bool.rs
index 0fcd33b4a3..c1af991d95 100644
--- a/crates/nu-command/src/conversions/into/bool.rs
+++ b/crates/nu-command/src/conversions/into/bool.rs
@@ -29,7 +29,7 @@ impl Command for SubCommand {
             .category(Category::Conversions)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert value to boolean."
     }
 
diff --git a/crates/nu-command/src/conversions/into/cell_path.rs b/crates/nu-command/src/conversions/into/cell_path.rs
index 1342fb14c0..cd5c7773f6 100644
--- a/crates/nu-command/src/conversions/into/cell_path.rs
+++ b/crates/nu-command/src/conversions/into/cell_path.rs
@@ -25,7 +25,7 @@ impl Command for IntoCellPath {
             .allow_variants_without_examples(true)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert value to a cell-path."
     }
 
@@ -33,7 +33,7 @@ impl Command for IntoCellPath {
         vec!["convert"]
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "Converting a string directly into a cell path is intentionally not supported."
     }
 
diff --git a/crates/nu-command/src/conversions/into/command.rs b/crates/nu-command/src/conversions/into/command.rs
index 03b8e81c4a..07c74c59f7 100644
--- a/crates/nu-command/src/conversions/into/command.rs
+++ b/crates/nu-command/src/conversions/into/command.rs
@@ -14,11 +14,11 @@ impl Command for Into {
             .input_output_types(vec![(Type::Nothing, Type::String)])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Commands to convert data from one type to another."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "You must use one of the following subcommands. Using this command as-is will only produce this help message."
     }
 
diff --git a/crates/nu-command/src/conversions/into/datetime.rs b/crates/nu-command/src/conversions/into/datetime.rs
index 9dd6ad9335..68fcc31420 100644
--- a/crates/nu-command/src/conversions/into/datetime.rs
+++ b/crates/nu-command/src/conversions/into/datetime.rs
@@ -145,7 +145,7 @@ impl Command for SubCommand {
         }
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert text or timestamp into a datetime."
     }
 
diff --git a/crates/nu-command/src/conversions/into/duration.rs b/crates/nu-command/src/conversions/into/duration.rs
index b459dd04b1..d11cfeffc2 100644
--- a/crates/nu-command/src/conversions/into/duration.rs
+++ b/crates/nu-command/src/conversions/into/duration.rs
@@ -36,11 +36,11 @@ impl Command for SubCommand {
             .category(Category::Conversions)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert value to duration."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "Max duration value is i64::MAX nanoseconds; max duration time unit is wk (weeks)."
     }
 
diff --git a/crates/nu-command/src/conversions/into/filesize.rs b/crates/nu-command/src/conversions/into/filesize.rs
index 5be167e30c..cfbdfc6f37 100644
--- a/crates/nu-command/src/conversions/into/filesize.rs
+++ b/crates/nu-command/src/conversions/into/filesize.rs
@@ -51,7 +51,7 @@ impl Command for SubCommand {
             .category(Category::Conversions)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert value to filesize."
     }
 
diff --git a/crates/nu-command/src/conversions/into/float.rs b/crates/nu-command/src/conversions/into/float.rs
index 43556bb5ef..23ada8c5a9 100644
--- a/crates/nu-command/src/conversions/into/float.rs
+++ b/crates/nu-command/src/conversions/into/float.rs
@@ -32,7 +32,7 @@ impl Command for SubCommand {
             .category(Category::Conversions)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert data into floating point number."
     }
 
diff --git a/crates/nu-command/src/conversions/into/glob.rs b/crates/nu-command/src/conversions/into/glob.rs
index ffc3655330..9ee8d2a361 100644
--- a/crates/nu-command/src/conversions/into/glob.rs
+++ b/crates/nu-command/src/conversions/into/glob.rs
@@ -39,7 +39,7 @@ impl Command for SubCommand {
             .category(Category::Conversions)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert value to glob."
     }
 
diff --git a/crates/nu-command/src/conversions/into/int.rs b/crates/nu-command/src/conversions/into/int.rs
index d4bfa61639..0792719fef 100644
--- a/crates/nu-command/src/conversions/into/int.rs
+++ b/crates/nu-command/src/conversions/into/int.rs
@@ -89,7 +89,7 @@ impl Command for SubCommand {
             .category(Category::Conversions)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert value to integer."
     }
 
diff --git a/crates/nu-command/src/conversions/into/record.rs b/crates/nu-command/src/conversions/into/record.rs
index ed86c5848e..6290739060 100644
--- a/crates/nu-command/src/conversions/into/record.rs
+++ b/crates/nu-command/src/conversions/into/record.rs
@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .category(Category::Conversions)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert value to record."
     }
 
diff --git a/crates/nu-command/src/conversions/into/string.rs b/crates/nu-command/src/conversions/into/string.rs
index 2b35272b3e..b116de9752 100644
--- a/crates/nu-command/src/conversions/into/string.rs
+++ b/crates/nu-command/src/conversions/into/string.rs
@@ -60,7 +60,7 @@ impl Command for SubCommand {
             .category(Category::Conversions)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert value to string."
     }
 
diff --git a/crates/nu-command/src/conversions/into/value.rs b/crates/nu-command/src/conversions/into/value.rs
index e8787e75bb..cd919ca8d6 100644
--- a/crates/nu-command/src/conversions/into/value.rs
+++ b/crates/nu-command/src/conversions/into/value.rs
@@ -31,7 +31,7 @@ impl Command for IntoValue {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Infer nushell datatype for each cell."
     }
 
diff --git a/crates/nu-command/src/database/commands/into_sqlite.rs b/crates/nu-command/src/database/commands/into_sqlite.rs
index 88a6114ab3..fcfa228f3b 100644
--- a/crates/nu-command/src/database/commands/into_sqlite.rs
+++ b/crates/nu-command/src/database/commands/into_sqlite.rs
@@ -46,7 +46,7 @@ impl Command for IntoSqliteDb {
         operate(engine_state, stack, call, input)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert table into a SQLite database."
     }
 
diff --git a/crates/nu-command/src/database/commands/query_db.rs b/crates/nu-command/src/database/commands/query_db.rs
index 6a132e2698..a70a11c6ae 100644
--- a/crates/nu-command/src/database/commands/query_db.rs
+++ b/crates/nu-command/src/database/commands/query_db.rs
@@ -27,7 +27,7 @@ impl Command for QueryDb {
             .category(Category::Database)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Query a database using SQL."
     }
 
diff --git a/crates/nu-command/src/database/commands/schema.rs b/crates/nu-command/src/database/commands/schema.rs
index ab7b36dab2..5663d7748a 100644
--- a/crates/nu-command/src/database/commands/schema.rs
+++ b/crates/nu-command/src/database/commands/schema.rs
@@ -17,7 +17,7 @@ impl Command for SchemaDb {
             .category(Category::Database)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Show the schema of a SQLite database."
     }
 
diff --git a/crates/nu-command/src/date/date_.rs b/crates/nu-command/src/date/date_.rs
index fd67e9c923..f404c62fed 100644
--- a/crates/nu-command/src/date/date_.rs
+++ b/crates/nu-command/src/date/date_.rs
@@ -14,11 +14,11 @@ impl Command for Date {
             .input_output_types(vec![(Type::Nothing, Type::String)])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Date-related commands."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "You must use one of the following subcommands. Using this command as-is will only produce this help message."
     }
 
diff --git a/crates/nu-command/src/date/humanize.rs b/crates/nu-command/src/date/humanize.rs
index d8542a540c..3f3300a94d 100644
--- a/crates/nu-command/src/date/humanize.rs
+++ b/crates/nu-command/src/date/humanize.rs
@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .category(Category::Date)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Print a 'humanized' format for the date, relative to now."
     }
 
diff --git a/crates/nu-command/src/date/list_timezone.rs b/crates/nu-command/src/date/list_timezone.rs
index 56f7fe5376..6b7c448af2 100644
--- a/crates/nu-command/src/date/list_timezone.rs
+++ b/crates/nu-command/src/date/list_timezone.rs
@@ -15,7 +15,7 @@ impl Command for SubCommand {
             .category(Category::Date)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "List supported time zones."
     }
 
diff --git a/crates/nu-command/src/date/now.rs b/crates/nu-command/src/date/now.rs
index adc75e3760..5492db9863 100644
--- a/crates/nu-command/src/date/now.rs
+++ b/crates/nu-command/src/date/now.rs
@@ -15,7 +15,7 @@ impl Command for SubCommand {
             .category(Category::Date)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Get the current date."
     }
 
diff --git a/crates/nu-command/src/date/to_record.rs b/crates/nu-command/src/date/to_record.rs
index c0b09c040b..f683ca1eec 100644
--- a/crates/nu-command/src/date/to_record.rs
+++ b/crates/nu-command/src/date/to_record.rs
@@ -20,7 +20,7 @@ impl Command for SubCommand {
             .category(Category::Date)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert the date into a record."
     }
 
diff --git a/crates/nu-command/src/date/to_table.rs b/crates/nu-command/src/date/to_table.rs
index 7ce8bc171b..1588d40063 100644
--- a/crates/nu-command/src/date/to_table.rs
+++ b/crates/nu-command/src/date/to_table.rs
@@ -20,7 +20,7 @@ impl Command for SubCommand {
             .category(Category::Date)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert the date into a structured table."
     }
 
diff --git a/crates/nu-command/src/date/to_timezone.rs b/crates/nu-command/src/date/to_timezone.rs
index 3d08d7271b..e5e354f9cc 100644
--- a/crates/nu-command/src/date/to_timezone.rs
+++ b/crates/nu-command/src/date/to_timezone.rs
@@ -19,11 +19,11 @@ impl Command for SubCommand {
             .category(Category::Date)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert a date to a given time zone."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "Use 'date list-timezone' to list all supported time zones."
     }
 
diff --git a/crates/nu-command/src/debug/ast.rs b/crates/nu-command/src/debug/ast.rs
index ef28d5a205..c6e405d533 100644
--- a/crates/nu-command/src/debug/ast.rs
+++ b/crates/nu-command/src/debug/ast.rs
@@ -10,7 +10,7 @@ impl Command for Ast {
         "ast"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Print the abstract syntax tree (ast) for a pipeline."
     }
 
diff --git a/crates/nu-command/src/debug/debug_.rs b/crates/nu-command/src/debug/debug_.rs
index 80a9067e49..8ce3407c89 100644
--- a/crates/nu-command/src/debug/debug_.rs
+++ b/crates/nu-command/src/debug/debug_.rs
@@ -8,7 +8,7 @@ impl Command for Debug {
         "debug"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Debug print the value(s) piped in."
     }
 
diff --git a/crates/nu-command/src/debug/explain.rs b/crates/nu-command/src/debug/explain.rs
index 710e37935a..dc68b283e6 100644
--- a/crates/nu-command/src/debug/explain.rs
+++ b/crates/nu-command/src/debug/explain.rs
@@ -12,7 +12,7 @@ impl Command for Explain {
         "explain"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Explain closure contents."
     }
 
diff --git a/crates/nu-command/src/debug/info.rs b/crates/nu-command/src/debug/info.rs
index 76317ed866..da4689738e 100644
--- a/crates/nu-command/src/debug/info.rs
+++ b/crates/nu-command/src/debug/info.rs
@@ -20,11 +20,11 @@ impl Command for DebugInfo {
         "debug info"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "View process memory info."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "This command is meant for debugging purposes.\nIt shows you the process information and system memory information."
     }
 
diff --git a/crates/nu-command/src/debug/inspect.rs b/crates/nu-command/src/debug/inspect.rs
index ad6163c7b6..97217780bf 100644
--- a/crates/nu-command/src/debug/inspect.rs
+++ b/crates/nu-command/src/debug/inspect.rs
@@ -10,7 +10,7 @@ impl Command for Inspect {
         "inspect"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Inspect pipeline results while running a pipeline."
     }
 
diff --git a/crates/nu-command/src/debug/metadata.rs b/crates/nu-command/src/debug/metadata.rs
index 245c150cea..c9b48bb79a 100644
--- a/crates/nu-command/src/debug/metadata.rs
+++ b/crates/nu-command/src/debug/metadata.rs
@@ -12,7 +12,7 @@ impl Command for Metadata {
         "metadata"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Get the metadata for items in the stream."
     }
 
diff --git a/crates/nu-command/src/debug/metadata_set.rs b/crates/nu-command/src/debug/metadata_set.rs
index c78a5df5c3..6274de7544 100644
--- a/crates/nu-command/src/debug/metadata_set.rs
+++ b/crates/nu-command/src/debug/metadata_set.rs
@@ -9,7 +9,7 @@ impl Command for MetadataSet {
         "metadata set"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Set the metadata for items in the stream."
     }
 
diff --git a/crates/nu-command/src/debug/profile.rs b/crates/nu-command/src/debug/profile.rs
index e8254563df..41eee4c183 100644
--- a/crates/nu-command/src/debug/profile.rs
+++ b/crates/nu-command/src/debug/profile.rs
@@ -43,11 +43,11 @@ impl Command for DebugProfile {
             .category(Category::Debug)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Profile pipeline elements in a closure."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"The profiler profiles every evaluated pipeline element inside a closure, stepping into all
 commands calls and other blocks/closures.
 
diff --git a/crates/nu-command/src/debug/timeit.rs b/crates/nu-command/src/debug/timeit.rs
index 7a48644a6d..08de95dcd2 100644
--- a/crates/nu-command/src/debug/timeit.rs
+++ b/crates/nu-command/src/debug/timeit.rs
@@ -9,7 +9,7 @@ impl Command for TimeIt {
         "timeit"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Time the running time of a block."
     }
 
diff --git a/crates/nu-command/src/debug/view.rs b/crates/nu-command/src/debug/view.rs
index 4ef1c1c7e0..b849a1bb0f 100644
--- a/crates/nu-command/src/debug/view.rs
+++ b/crates/nu-command/src/debug/view.rs
@@ -14,11 +14,11 @@ impl Command for View {
             .input_output_types(vec![(Type::Nothing, Type::String)])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Various commands for viewing debug information."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "You must use one of the following subcommands. Using this command as-is will only produce this help message."
     }
 
diff --git a/crates/nu-command/src/debug/view_files.rs b/crates/nu-command/src/debug/view_files.rs
index 4f4effc6f2..1b48166036 100644
--- a/crates/nu-command/src/debug/view_files.rs
+++ b/crates/nu-command/src/debug/view_files.rs
@@ -8,11 +8,11 @@ impl Command for ViewFiles {
         "view files"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "View the files registered in nushell's EngineState memory."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "These are files parsed and loaded at runtime."
     }
 
diff --git a/crates/nu-command/src/debug/view_ir.rs b/crates/nu-command/src/debug/view_ir.rs
index 72136079fd..676285844c 100644
--- a/crates/nu-command/src/debug/view_ir.rs
+++ b/crates/nu-command/src/debug/view_ir.rs
@@ -29,11 +29,11 @@ impl Command for ViewIr {
             .category(Category::Debug)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "View the compiled IR code for a block of code."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "
 The target can be a closure, the name of a custom command, or an internal block
 ID. Closure literals within IR dumps often reference the block by ID (e.g.
diff --git a/crates/nu-command/src/debug/view_source.rs b/crates/nu-command/src/debug/view_source.rs
index 54bca55956..b0163c3bd1 100644
--- a/crates/nu-command/src/debug/view_source.rs
+++ b/crates/nu-command/src/debug/view_source.rs
@@ -11,7 +11,7 @@ impl Command for ViewSource {
         "view source"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "View a block, module, or a definition."
     }
 
diff --git a/crates/nu-command/src/debug/view_span.rs b/crates/nu-command/src/debug/view_span.rs
index abf8e622b1..017cae62cf 100644
--- a/crates/nu-command/src/debug/view_span.rs
+++ b/crates/nu-command/src/debug/view_span.rs
@@ -8,11 +8,11 @@ impl Command for ViewSpan {
         "view span"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "View the contents of a span."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "This command is meant for debugging purposes.\nIt allows you to view the contents of nushell spans.\nOne way to get spans is to pipe something into 'debug --raw'.\nThen you can use the Span { start, end } values as the start and end values for this command."
     }
 
diff --git a/crates/nu-command/src/env/config/config_.rs b/crates/nu-command/src/env/config/config_.rs
index 1cd6ef4621..207c8c8651 100644
--- a/crates/nu-command/src/env/config/config_.rs
+++ b/crates/nu-command/src/env/config/config_.rs
@@ -14,11 +14,11 @@ impl Command for ConfigMeta {
             .input_output_types(vec![(Type::Nothing, Type::String)])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Edit nushell configuration files."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "You must use one of the following subcommands. Using this command as-is will only produce this help message."
     }
 
diff --git a/crates/nu-command/src/env/config/config_env.rs b/crates/nu-command/src/env/config/config_env.rs
index 777b6f3aac..cb4a217d9b 100644
--- a/crates/nu-command/src/env/config/config_env.rs
+++ b/crates/nu-command/src/env/config/config_env.rs
@@ -19,7 +19,7 @@ impl Command for ConfigEnv {
         // TODO: Signature narrower than what run actually supports theoretically
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Edit nu environment configurations."
     }
 
diff --git a/crates/nu-command/src/env/config/config_nu.rs b/crates/nu-command/src/env/config/config_nu.rs
index 80f0bbc012..9969968ed2 100644
--- a/crates/nu-command/src/env/config/config_nu.rs
+++ b/crates/nu-command/src/env/config/config_nu.rs
@@ -23,7 +23,7 @@ impl Command for ConfigNu {
         // TODO: Signature narrower than what run actually supports theoretically
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Edit nu configurations."
     }
 
diff --git a/crates/nu-command/src/env/config/config_reset.rs b/crates/nu-command/src/env/config/config_reset.rs
index 9a97285240..a185072d67 100644
--- a/crates/nu-command/src/env/config/config_reset.rs
+++ b/crates/nu-command/src/env/config/config_reset.rs
@@ -22,7 +22,7 @@ impl Command for ConfigReset {
             .category(Category::Env)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Reset nushell environment configurations to default, and saves old config files in the config location as oldconfig.nu and oldenv.nu."
     }
 
diff --git a/crates/nu-command/src/env/export_env.rs b/crates/nu-command/src/env/export_env.rs
index 7b583c9959..7c0072b5d4 100644
--- a/crates/nu-command/src/env/export_env.rs
+++ b/crates/nu-command/src/env/export_env.rs
@@ -20,11 +20,11 @@ impl Command for ExportEnv {
             .category(Category::Env)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Run a block and preserve its environment in a current scope."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
diff --git a/crates/nu-command/src/env/load_env.rs b/crates/nu-command/src/env/load_env.rs
index 38311430ef..f35b1d08ea 100644
--- a/crates/nu-command/src/env/load_env.rs
+++ b/crates/nu-command/src/env/load_env.rs
@@ -8,7 +8,7 @@ impl Command for LoadEnv {
         "load-env"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Loads an environment update from a record."
     }
 
diff --git a/crates/nu-command/src/env/source_env.rs b/crates/nu-command/src/env/source_env.rs
index 1813a92f1f..9768c4619f 100644
--- a/crates/nu-command/src/env/source_env.rs
+++ b/crates/nu-command/src/env/source_env.rs
@@ -25,11 +25,11 @@ impl Command for SourceEnv {
             .category(Category::Core)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Source the environment from a source file into the current environment."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
diff --git a/crates/nu-command/src/env/with_env.rs b/crates/nu-command/src/env/with_env.rs
index 46f7d1eb6e..dc21fcdf93 100644
--- a/crates/nu-command/src/env/with_env.rs
+++ b/crates/nu-command/src/env/with_env.rs
@@ -25,7 +25,7 @@ impl Command for WithEnv {
             .category(Category::Env)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Runs a block with an environment variable set."
     }
 
diff --git a/crates/nu-command/src/experimental/is_admin.rs b/crates/nu-command/src/experimental/is_admin.rs
index f6a2efef0a..2dbeb0e988 100644
--- a/crates/nu-command/src/experimental/is_admin.rs
+++ b/crates/nu-command/src/experimental/is_admin.rs
@@ -8,7 +8,7 @@ impl Command for IsAdmin {
         "is-admin"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Check if nushell is running with administrator or root privileges."
     }
 
diff --git a/crates/nu-command/src/filesystem/cd.rs b/crates/nu-command/src/filesystem/cd.rs
index 87071d2888..cd968a05a5 100644
--- a/crates/nu-command/src/filesystem/cd.rs
+++ b/crates/nu-command/src/filesystem/cd.rs
@@ -10,7 +10,7 @@ impl Command for Cd {
         "cd"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Change directory."
     }
 
diff --git a/crates/nu-command/src/filesystem/du.rs b/crates/nu-command/src/filesystem/du.rs
index d34892ace9..6ae07974b9 100644
--- a/crates/nu-command/src/filesystem/du.rs
+++ b/crates/nu-command/src/filesystem/du.rs
@@ -27,7 +27,7 @@ impl Command for Du {
         "du"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Find disk usage sizes of specified items."
     }
 
diff --git a/crates/nu-command/src/filesystem/glob.rs b/crates/nu-command/src/filesystem/glob.rs
index faba600c94..d6243bbc32 100644
--- a/crates/nu-command/src/filesystem/glob.rs
+++ b/crates/nu-command/src/filesystem/glob.rs
@@ -44,7 +44,7 @@ impl Command for Glob {
             .category(Category::FileSystem)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Creates a list of files and/or folders based on the glob pattern provided."
     }
 
@@ -114,7 +114,7 @@ impl Command for Glob {
         ]
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"For more glob pattern help, please refer to https://docs.rs/crate/wax/latest"#
     }
 
diff --git a/crates/nu-command/src/filesystem/ls.rs b/crates/nu-command/src/filesystem/ls.rs
index 445bf0f425..d198816727 100644
--- a/crates/nu-command/src/filesystem/ls.rs
+++ b/crates/nu-command/src/filesystem/ls.rs
@@ -38,7 +38,7 @@ impl Command for Ls {
         "ls"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "List the filenames, sizes, and modification times of items in a directory."
     }
 
diff --git a/crates/nu-command/src/filesystem/mktemp.rs b/crates/nu-command/src/filesystem/mktemp.rs
index cbe67e65ce..9a0c041f15 100644
--- a/crates/nu-command/src/filesystem/mktemp.rs
+++ b/crates/nu-command/src/filesystem/mktemp.rs
@@ -10,7 +10,7 @@ impl Command for Mktemp {
         "mktemp"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Create temporary files or directories using uutils/coreutils mktemp."
     }
 
diff --git a/crates/nu-command/src/filesystem/open.rs b/crates/nu-command/src/filesystem/open.rs
index 23e95d1aed..ea2a253a2a 100644
--- a/crates/nu-command/src/filesystem/open.rs
+++ b/crates/nu-command/src/filesystem/open.rs
@@ -18,11 +18,11 @@ impl Command for Open {
         "open"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Load a file into a cell, converting to table if possible (avoid by appending '--raw')."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "Support to automatically parse files with an extension `.xyz` can be provided by a `from xyz` command in scope."
     }
 
diff --git a/crates/nu-command/src/filesystem/rm.rs b/crates/nu-command/src/filesystem/rm.rs
index 9e879cb2ad..2e5b964a7e 100644
--- a/crates/nu-command/src/filesystem/rm.rs
+++ b/crates/nu-command/src/filesystem/rm.rs
@@ -25,7 +25,7 @@ impl Command for Rm {
         "rm"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Remove files and directories."
     }
 
diff --git a/crates/nu-command/src/filesystem/save.rs b/crates/nu-command/src/filesystem/save.rs
index 619e7d0b2b..1b6ddd5982 100644
--- a/crates/nu-command/src/filesystem/save.rs
+++ b/crates/nu-command/src/filesystem/save.rs
@@ -22,7 +22,7 @@ impl Command for Save {
         "save"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Save a file."
     }
 
diff --git a/crates/nu-command/src/filesystem/start.rs b/crates/nu-command/src/filesystem/start.rs
index 87aa34cf72..577fe128ba 100644
--- a/crates/nu-command/src/filesystem/start.rs
+++ b/crates/nu-command/src/filesystem/start.rs
@@ -15,7 +15,7 @@ impl Command for Start {
         "start"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Open a folder, file or website in the default application or viewer."
     }
 
diff --git a/crates/nu-command/src/filesystem/touch.rs b/crates/nu-command/src/filesystem/touch.rs
index a3e5bc40f1..9085554bb4 100644
--- a/crates/nu-command/src/filesystem/touch.rs
+++ b/crates/nu-command/src/filesystem/touch.rs
@@ -51,7 +51,7 @@ impl Command for Touch {
             .category(Category::FileSystem)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Creates one or more files."
     }
 
diff --git a/crates/nu-command/src/filesystem/ucp.rs b/crates/nu-command/src/filesystem/ucp.rs
index 6077278c18..3bc7f13325 100644
--- a/crates/nu-command/src/filesystem/ucp.rs
+++ b/crates/nu-command/src/filesystem/ucp.rs
@@ -20,7 +20,7 @@ impl Command for UCp {
         "cp"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Copy files using uutils/coreutils cp."
     }
 
diff --git a/crates/nu-command/src/filesystem/umkdir.rs b/crates/nu-command/src/filesystem/umkdir.rs
index 7565beee5e..6f4c77ef1b 100644
--- a/crates/nu-command/src/filesystem/umkdir.rs
+++ b/crates/nu-command/src/filesystem/umkdir.rs
@@ -28,7 +28,7 @@ impl Command for UMkdir {
         "mkdir"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Create directories, with intermediary directories if required using uutils/coreutils mkdir."
     }
 
diff --git a/crates/nu-command/src/filesystem/umv.rs b/crates/nu-command/src/filesystem/umv.rs
index 9f68a6697f..0f49a7d97d 100644
--- a/crates/nu-command/src/filesystem/umv.rs
+++ b/crates/nu-command/src/filesystem/umv.rs
@@ -14,7 +14,7 @@ impl Command for UMv {
         "mv"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Move files or directories using uutils/coreutils mv."
     }
 
diff --git a/crates/nu-command/src/filesystem/watch.rs b/crates/nu-command/src/filesystem/watch.rs
index e6d86357b8..5138af354e 100644
--- a/crates/nu-command/src/filesystem/watch.rs
+++ b/crates/nu-command/src/filesystem/watch.rs
@@ -28,7 +28,7 @@ impl Command for Watch {
         "watch"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Watch for file changes and execute Nu code when they happen."
     }
 
diff --git a/crates/nu-command/src/filters/all.rs b/crates/nu-command/src/filters/all.rs
index 648454eb07..e4ffdf2c87 100644
--- a/crates/nu-command/src/filters/all.rs
+++ b/crates/nu-command/src/filters/all.rs
@@ -20,7 +20,7 @@ impl Command for All {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Test if every element of the input fulfills a predicate expression."
     }
 
diff --git a/crates/nu-command/src/filters/any.rs b/crates/nu-command/src/filters/any.rs
index 87d7887b48..cd8a6b65e4 100644
--- a/crates/nu-command/src/filters/any.rs
+++ b/crates/nu-command/src/filters/any.rs
@@ -20,7 +20,7 @@ impl Command for Any {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Tests if any element of the input fulfills a predicate expression."
     }
 
diff --git a/crates/nu-command/src/filters/append.rs b/crates/nu-command/src/filters/append.rs
index 2064bdf1e8..7aab2bedcd 100644
--- a/crates/nu-command/src/filters/append.rs
+++ b/crates/nu-command/src/filters/append.rs
@@ -20,11 +20,11 @@ impl Command for Append {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Append any number of rows to a table."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"Be aware that this command 'unwraps' lists passed to it. So, if you pass a variable to it,
 and you want the variable's contents to be appended without being unwrapped, it's wise to
 pre-emptively wrap the variable in a list, like so: `append [$val]`. This way, `append` will
diff --git a/crates/nu-command/src/filters/chunks.rs b/crates/nu-command/src/filters/chunks.rs
index 68d682ecd1..4db436ca25 100644
--- a/crates/nu-command/src/filters/chunks.rs
+++ b/crates/nu-command/src/filters/chunks.rs
@@ -20,11 +20,11 @@ impl Command for Chunks {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Divide a list or table into chunks of `chunk_size`."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "This command will error if `chunk_size` is negative or zero."
     }
 
diff --git a/crates/nu-command/src/filters/columns.rs b/crates/nu-command/src/filters/columns.rs
index da8bc5ae57..e0d5b273a8 100644
--- a/crates/nu-command/src/filters/columns.rs
+++ b/crates/nu-command/src/filters/columns.rs
@@ -17,11 +17,11 @@ impl Command for Columns {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Given a record or table, produce a list of its columns' names."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "This is a counterpart to `values`, which produces a list of columns' values."
     }
 
diff --git a/crates/nu-command/src/filters/compact.rs b/crates/nu-command/src/filters/compact.rs
index f43d738ed1..7481d668e0 100644
--- a/crates/nu-command/src/filters/compact.rs
+++ b/crates/nu-command/src/filters/compact.rs
@@ -27,7 +27,7 @@ impl Command for Compact {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Creates a table with non-empty rows."
     }
 
diff --git a/crates/nu-command/src/filters/default.rs b/crates/nu-command/src/filters/default.rs
index e269c58ccd..6e5610f1be 100644
--- a/crates/nu-command/src/filters/default.rs
+++ b/crates/nu-command/src/filters/default.rs
@@ -26,7 +26,7 @@ impl Command for Default {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Sets a default value if a row's column is missing or null."
     }
 
diff --git a/crates/nu-command/src/filters/drop/column.rs b/crates/nu-command/src/filters/drop/column.rs
index f168e6c2ca..f39e0e2276 100644
--- a/crates/nu-command/src/filters/drop/column.rs
+++ b/crates/nu-command/src/filters/drop/column.rs
@@ -24,7 +24,7 @@ impl Command for DropColumn {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Remove N columns at the right-hand end of the input table. To remove columns by name, use `reject`."
     }
 
diff --git a/crates/nu-command/src/filters/drop/drop_.rs b/crates/nu-command/src/filters/drop/drop_.rs
index ba78058261..67abea625d 100644
--- a/crates/nu-command/src/filters/drop/drop_.rs
+++ b/crates/nu-command/src/filters/drop/drop_.rs
@@ -21,7 +21,7 @@ impl Command for Drop {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Remove items/rows from the end of the input list/table. Counterpart of `skip`. Opposite of `last`."
     }
 
diff --git a/crates/nu-command/src/filters/drop/nth.rs b/crates/nu-command/src/filters/drop/nth.rs
index a76c4f0d92..d2aed50332 100644
--- a/crates/nu-command/src/filters/drop/nth.rs
+++ b/crates/nu-command/src/filters/drop/nth.rs
@@ -27,7 +27,7 @@ impl Command for DropNth {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Drop the selected rows."
     }
 
diff --git a/crates/nu-command/src/filters/each.rs b/crates/nu-command/src/filters/each.rs
index a7035917b3..e1407c3ce1 100644
--- a/crates/nu-command/src/filters/each.rs
+++ b/crates/nu-command/src/filters/each.rs
@@ -10,11 +10,11 @@ impl Command for Each {
         "each"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Run a closure on each row of the input list, creating a new list with the results."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"Since tables are lists of records, passing a table into 'each' will
 iterate over each record, not necessarily each cell within it.
 
diff --git a/crates/nu-command/src/filters/enumerate.rs b/crates/nu-command/src/filters/enumerate.rs
index df0f4e2fca..f5182b3456 100644
--- a/crates/nu-command/src/filters/enumerate.rs
+++ b/crates/nu-command/src/filters/enumerate.rs
@@ -8,7 +8,7 @@ impl Command for Enumerate {
         "enumerate"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Enumerate the elements in a stream."
     }
 
diff --git a/crates/nu-command/src/filters/every.rs b/crates/nu-command/src/filters/every.rs
index 664be33bed..65d121435d 100644
--- a/crates/nu-command/src/filters/every.rs
+++ b/crates/nu-command/src/filters/every.rs
@@ -27,7 +27,7 @@ impl Command for Every {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Show (or skip) every n-th row, starting from the first one."
     }
 
diff --git a/crates/nu-command/src/filters/filter.rs b/crates/nu-command/src/filters/filter.rs
index f2efaa3af3..93fe5a6e6d 100644
--- a/crates/nu-command/src/filters/filter.rs
+++ b/crates/nu-command/src/filters/filter.rs
@@ -10,11 +10,11 @@ impl Command for Filter {
         "filter"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Filter values based on a predicate closure."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command works similar to 'where' but allows reading the predicate closure from
 a variable. On the other hand, the "row condition" syntax is not supported."#
     }
diff --git a/crates/nu-command/src/filters/find.rs b/crates/nu-command/src/filters/find.rs
index 9ed0c28a3c..78a84274ab 100644
--- a/crates/nu-command/src/filters/find.rs
+++ b/crates/nu-command/src/filters/find.rs
@@ -57,7 +57,7 @@ impl Command for Find {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Searches terms in the input."
     }
 
diff --git a/crates/nu-command/src/filters/first.rs b/crates/nu-command/src/filters/first.rs
index 8f2e8db1b9..5695f823c7 100644
--- a/crates/nu-command/src/filters/first.rs
+++ b/crates/nu-command/src/filters/first.rs
@@ -31,7 +31,7 @@ impl Command for First {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Return only the first several rows of the input. Counterpart of `last`. Opposite of `skip`."
     }
 
diff --git a/crates/nu-command/src/filters/flatten.rs b/crates/nu-command/src/filters/flatten.rs
index b4faec9589..3e285d21aa 100644
--- a/crates/nu-command/src/filters/flatten.rs
+++ b/crates/nu-command/src/filters/flatten.rs
@@ -28,7 +28,7 @@ impl Command for Flatten {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Flatten the table."
     }
 
diff --git a/crates/nu-command/src/filters/get.rs b/crates/nu-command/src/filters/get.rs
index 9f7d76277d..a79c1c48f4 100644
--- a/crates/nu-command/src/filters/get.rs
+++ b/crates/nu-command/src/filters/get.rs
@@ -8,11 +8,11 @@ impl Command for Get {
         "get"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Extract data using a cell path."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This is equivalent to using the cell path access syntax: `$env.OS` is the same as `$env | get OS`.
 
 If multiple cell paths are given, this will produce a list of values."#
diff --git a/crates/nu-command/src/filters/group.rs b/crates/nu-command/src/filters/group.rs
index 60c720e325..5327cad610 100644
--- a/crates/nu-command/src/filters/group.rs
+++ b/crates/nu-command/src/filters/group.rs
@@ -23,7 +23,7 @@ impl Command for Group {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Groups input into groups of `group_size`."
     }
 
diff --git a/crates/nu-command/src/filters/group_by.rs b/crates/nu-command/src/filters/group_by.rs
index c1d76ebe08..78789c606a 100644
--- a/crates/nu-command/src/filters/group_by.rs
+++ b/crates/nu-command/src/filters/group_by.rs
@@ -34,7 +34,7 @@ impl Command for GroupBy {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Splits a list or table into groups, and returns a record containing those groups."
     }
 
diff --git a/crates/nu-command/src/filters/headers.rs b/crates/nu-command/src/filters/headers.rs
index 6e63c33ff9..1a9de5367e 100644
--- a/crates/nu-command/src/filters/headers.rs
+++ b/crates/nu-command/src/filters/headers.rs
@@ -22,7 +22,7 @@ impl Command for Headers {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Use the first row of the table as column names."
     }
 
diff --git a/crates/nu-command/src/filters/insert.rs b/crates/nu-command/src/filters/insert.rs
index 3b47c4e6a9..e6f9a7d8d7 100644
--- a/crates/nu-command/src/filters/insert.rs
+++ b/crates/nu-command/src/filters/insert.rs
@@ -33,11 +33,11 @@ impl Command for Insert {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Insert a new column, using an expression or closure to create each row's values."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "When inserting a column, the closure will be run for each row, and the current row will be passed as the first argument.
 When inserting into a specific index, the closure will instead get the current value at the index or null if inserting at the end of a list/table."
     }
diff --git a/crates/nu-command/src/filters/interleave.rs b/crates/nu-command/src/filters/interleave.rs
index 9890fede1e..f31a3411ae 100644
--- a/crates/nu-command/src/filters/interleave.rs
+++ b/crates/nu-command/src/filters/interleave.rs
@@ -10,11 +10,11 @@ impl Command for Interleave {
         "interleave"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Read multiple streams in parallel and combine them into one stream."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This combinator is useful for reading output from multiple commands.
 
 If input is provided to `interleave`, the input will be combined with the
diff --git a/crates/nu-command/src/filters/is_empty.rs b/crates/nu-command/src/filters/is_empty.rs
index d18f3d4ceb..5a2781b52e 100644
--- a/crates/nu-command/src/filters/is_empty.rs
+++ b/crates/nu-command/src/filters/is_empty.rs
@@ -20,7 +20,7 @@ impl Command for IsEmpty {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Check for empty values."
     }
 
diff --git a/crates/nu-command/src/filters/is_not_empty.rs b/crates/nu-command/src/filters/is_not_empty.rs
index 6d97e3612d..6b1ffbe643 100644
--- a/crates/nu-command/src/filters/is_not_empty.rs
+++ b/crates/nu-command/src/filters/is_not_empty.rs
@@ -20,7 +20,7 @@ impl Command for IsNotEmpty {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Check for non-empty values."
     }
 
diff --git a/crates/nu-command/src/filters/items.rs b/crates/nu-command/src/filters/items.rs
index fa7b680afd..a32f2808b8 100644
--- a/crates/nu-command/src/filters/items.rs
+++ b/crates/nu-command/src/filters/items.rs
@@ -22,11 +22,11 @@ impl Command for Items {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Given a record, iterate on each pair of column name and associated value."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "This is a the fusion of `columns`, `values` and `each`."
     }
 
diff --git a/crates/nu-command/src/filters/join.rs b/crates/nu-command/src/filters/join.rs
index f5e6d63deb..379366d4c9 100644
--- a/crates/nu-command/src/filters/join.rs
+++ b/crates/nu-command/src/filters/join.rs
@@ -50,7 +50,7 @@ impl Command for Join {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Join two tables."
     }
 
diff --git a/crates/nu-command/src/filters/last.rs b/crates/nu-command/src/filters/last.rs
index bb5a75fecd..127833dcd4 100644
--- a/crates/nu-command/src/filters/last.rs
+++ b/crates/nu-command/src/filters/last.rs
@@ -29,7 +29,7 @@ impl Command for Last {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Return only the last several rows of the input. Counterpart of `first`. Opposite of `drop`."
     }
 
diff --git a/crates/nu-command/src/filters/length.rs b/crates/nu-command/src/filters/length.rs
index cced0a9515..cd64e7a5ed 100644
--- a/crates/nu-command/src/filters/length.rs
+++ b/crates/nu-command/src/filters/length.rs
@@ -8,7 +8,7 @@ impl Command for Length {
         "length"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Count the number of items in an input list or rows in a table."
     }
 
diff --git a/crates/nu-command/src/filters/lines.rs b/crates/nu-command/src/filters/lines.rs
index fc957e1c0e..6527e73f1d 100644
--- a/crates/nu-command/src/filters/lines.rs
+++ b/crates/nu-command/src/filters/lines.rs
@@ -8,7 +8,7 @@ impl Command for Lines {
         "lines"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Converts input to lines."
     }
 
diff --git a/crates/nu-command/src/filters/merge.rs b/crates/nu-command/src/filters/merge.rs
index 191ed1706c..fa8ec9d337 100644
--- a/crates/nu-command/src/filters/merge.rs
+++ b/crates/nu-command/src/filters/merge.rs
@@ -8,11 +8,11 @@ impl Command for Merge {
         "merge"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Merge the input with a record or table, overwriting values in matching columns."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"You may provide a column structure to merge
 
 When merging tables, row 0 of the input table is overwritten
diff --git a/crates/nu-command/src/filters/move_.rs b/crates/nu-command/src/filters/move_.rs
index 6e826af050..83130e8150 100644
--- a/crates/nu-command/src/filters/move_.rs
+++ b/crates/nu-command/src/filters/move_.rs
@@ -14,7 +14,7 @@ impl Command for Move {
         "move"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Move columns before or after other columns."
     }
 
diff --git a/crates/nu-command/src/filters/par_each.rs b/crates/nu-command/src/filters/par_each.rs
index 958a7fbc76..fc0da7d3d3 100644
--- a/crates/nu-command/src/filters/par_each.rs
+++ b/crates/nu-command/src/filters/par_each.rs
@@ -11,7 +11,7 @@ impl Command for ParEach {
         "par-each"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Run a closure on each row of the input list in parallel, creating a new list with the results."
     }
 
diff --git a/crates/nu-command/src/filters/prepend.rs b/crates/nu-command/src/filters/prepend.rs
index eeae0ef656..0a7e3d08fa 100644
--- a/crates/nu-command/src/filters/prepend.rs
+++ b/crates/nu-command/src/filters/prepend.rs
@@ -19,11 +19,11 @@ impl Command for Prepend {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Prepend any number of rows to a table."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"Be aware that this command 'unwraps' lists passed to it. So, if you pass a variable to it,
 and you want the variable's contents to be prepended without being unwrapped, it's wise to
 pre-emptively wrap the variable in a list, like so: `prepend [$val]`. This way, `prepend` will
diff --git a/crates/nu-command/src/filters/range.rs b/crates/nu-command/src/filters/range.rs
index 0d4e703bb1..d2a539b9ad 100644
--- a/crates/nu-command/src/filters/range.rs
+++ b/crates/nu-command/src/filters/range.rs
@@ -20,7 +20,7 @@ impl Command for Range {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Return only the selected rows."
     }
 
diff --git a/crates/nu-command/src/filters/reduce.rs b/crates/nu-command/src/filters/reduce.rs
index ffd2e850d9..ed3c61ec32 100644
--- a/crates/nu-command/src/filters/reduce.rs
+++ b/crates/nu-command/src/filters/reduce.rs
@@ -35,7 +35,7 @@ impl Command for Reduce {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Aggregate a list (starting from the left) to a single value using an accumulator closure."
     }
 
diff --git a/crates/nu-command/src/filters/reject.rs b/crates/nu-command/src/filters/reject.rs
index f8583d3f47..3f966e2da5 100644
--- a/crates/nu-command/src/filters/reject.rs
+++ b/crates/nu-command/src/filters/reject.rs
@@ -29,11 +29,11 @@ impl Command for Reject {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Remove the given columns or rows from the table. Opposite of `select`."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "To remove a quantity of rows or columns, use `skip`, `drop`, or `drop column`."
     }
 
diff --git a/crates/nu-command/src/filters/rename.rs b/crates/nu-command/src/filters/rename.rs
index 1e7ce34028..174d8d43ae 100644
--- a/crates/nu-command/src/filters/rename.rs
+++ b/crates/nu-command/src/filters/rename.rs
@@ -36,7 +36,7 @@ impl Command for Rename {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Creates a new table with columns renamed."
     }
 
diff --git a/crates/nu-command/src/filters/reverse.rs b/crates/nu-command/src/filters/reverse.rs
index 18891637ab..f3c4d32353 100644
--- a/crates/nu-command/src/filters/reverse.rs
+++ b/crates/nu-command/src/filters/reverse.rs
@@ -17,7 +17,7 @@ impl Command for Reverse {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Reverses the input list or table."
     }
 
diff --git a/crates/nu-command/src/filters/select.rs b/crates/nu-command/src/filters/select.rs
index 2fe4da3c36..45b965861e 100644
--- a/crates/nu-command/src/filters/select.rs
+++ b/crates/nu-command/src/filters/select.rs
@@ -32,11 +32,11 @@ impl Command for Select {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Select only these columns or rows from the input. Opposite of `reject`."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This differs from `get` in that, rather than accessing the given value in the data structure,
 it removes all non-selected values from the structure. Hence, using `select` on a table will
 produce a table, a list will produce a list, and a record will produce a record."#
diff --git a/crates/nu-command/src/filters/shuffle.rs b/crates/nu-command/src/filters/shuffle.rs
index ec4bf8c454..35e64f8ce7 100644
--- a/crates/nu-command/src/filters/shuffle.rs
+++ b/crates/nu-command/src/filters/shuffle.rs
@@ -18,7 +18,7 @@ impl Command for Shuffle {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Shuffle rows randomly."
     }
 
diff --git a/crates/nu-command/src/filters/skip/skip_.rs b/crates/nu-command/src/filters/skip/skip_.rs
index b64f438858..fade5a00ba 100644
--- a/crates/nu-command/src/filters/skip/skip_.rs
+++ b/crates/nu-command/src/filters/skip/skip_.rs
@@ -24,11 +24,11 @@ impl Command for Skip {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Skip the first several rows of the input. Counterpart of `drop`. Opposite of `first`."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"To skip specific numbered rows, try `drop nth`. To skip specific named columns, try `reject`."#
     }
 
diff --git a/crates/nu-command/src/filters/skip/skip_until.rs b/crates/nu-command/src/filters/skip/skip_until.rs
index 72cae739af..b73c817e9b 100644
--- a/crates/nu-command/src/filters/skip/skip_until.rs
+++ b/crates/nu-command/src/filters/skip/skip_until.rs
@@ -26,7 +26,7 @@ impl Command for SkipUntil {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Skip elements of the input until a predicate is true."
     }
 
diff --git a/crates/nu-command/src/filters/skip/skip_while.rs b/crates/nu-command/src/filters/skip/skip_while.rs
index ea9c12bf6a..9423915242 100644
--- a/crates/nu-command/src/filters/skip/skip_while.rs
+++ b/crates/nu-command/src/filters/skip/skip_while.rs
@@ -26,7 +26,7 @@ impl Command for SkipWhile {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Skip elements of the input while a predicate is true."
     }
 
diff --git a/crates/nu-command/src/filters/sort.rs b/crates/nu-command/src/filters/sort.rs
index 179235302d..aae00037c4 100644
--- a/crates/nu-command/src/filters/sort.rs
+++ b/crates/nu-command/src/filters/sort.rs
@@ -37,7 +37,7 @@ impl Command for Sort {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Sort in increasing order."
     }
 
diff --git a/crates/nu-command/src/filters/sort_by.rs b/crates/nu-command/src/filters/sort_by.rs
index e832255a26..440c16f490 100644
--- a/crates/nu-command/src/filters/sort_by.rs
+++ b/crates/nu-command/src/filters/sort_by.rs
@@ -34,7 +34,7 @@ impl Command for SortBy {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Sort by the given columns, in increasing order."
     }
 
diff --git a/crates/nu-command/src/filters/split_by.rs b/crates/nu-command/src/filters/split_by.rs
index 419119fe0c..7a5898e608 100644
--- a/crates/nu-command/src/filters/split_by.rs
+++ b/crates/nu-command/src/filters/split_by.rs
@@ -16,7 +16,7 @@ impl Command for SplitBy {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Split a record into groups."
     }
 
diff --git a/crates/nu-command/src/filters/take/take_.rs b/crates/nu-command/src/filters/take/take_.rs
index 1876244bdd..85a94fcd4b 100644
--- a/crates/nu-command/src/filters/take/take_.rs
+++ b/crates/nu-command/src/filters/take/take_.rs
@@ -29,7 +29,7 @@ impl Command for Take {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Take only the first n elements of a list, or the first n bytes of a binary value."
     }
 
diff --git a/crates/nu-command/src/filters/take/take_until.rs b/crates/nu-command/src/filters/take/take_until.rs
index c8544d364a..e1dcd6ceda 100644
--- a/crates/nu-command/src/filters/take/take_until.rs
+++ b/crates/nu-command/src/filters/take/take_until.rs
@@ -23,7 +23,7 @@ impl Command for TakeUntil {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Take elements of the input until a predicate is true."
     }
 
diff --git a/crates/nu-command/src/filters/take/take_while.rs b/crates/nu-command/src/filters/take/take_while.rs
index b8045080ea..54e9384cba 100644
--- a/crates/nu-command/src/filters/take/take_while.rs
+++ b/crates/nu-command/src/filters/take/take_while.rs
@@ -26,7 +26,7 @@ impl Command for TakeWhile {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Take elements of the input while a predicate is true."
     }
 
diff --git a/crates/nu-command/src/filters/tee.rs b/crates/nu-command/src/filters/tee.rs
index 663b2f19af..4e801bfcc8 100644
--- a/crates/nu-command/src/filters/tee.rs
+++ b/crates/nu-command/src/filters/tee.rs
@@ -17,11 +17,11 @@ impl Command for Tee {
         "tee"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Copy a stream to another command in parallel."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This is useful for doing something else with a stream while still continuing to
 use it in your pipeline."#
     }
diff --git a/crates/nu-command/src/filters/transpose.rs b/crates/nu-command/src/filters/transpose.rs
index 4a14c1aea2..2ca6958199 100644
--- a/crates/nu-command/src/filters/transpose.rs
+++ b/crates/nu-command/src/filters/transpose.rs
@@ -57,7 +57,7 @@ impl Command for Transpose {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Transposes the table contents so rows become columns and columns become rows."
     }
 
diff --git a/crates/nu-command/src/filters/uniq.rs b/crates/nu-command/src/filters/uniq.rs
index 99abb4e152..a22d62b89e 100644
--- a/crates/nu-command/src/filters/uniq.rs
+++ b/crates/nu-command/src/filters/uniq.rs
@@ -41,7 +41,7 @@ impl Command for Uniq {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Return the distinct values in the input."
     }
 
diff --git a/crates/nu-command/src/filters/uniq_by.rs b/crates/nu-command/src/filters/uniq_by.rs
index e1a502b06b..c092cfe6b4 100644
--- a/crates/nu-command/src/filters/uniq_by.rs
+++ b/crates/nu-command/src/filters/uniq_by.rs
@@ -43,7 +43,7 @@ impl Command for UniqBy {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Return the distinct values in the input by the given column(s)."
     }
 
diff --git a/crates/nu-command/src/filters/update.rs b/crates/nu-command/src/filters/update.rs
index d5ef0825ec..9d1d152d1e 100644
--- a/crates/nu-command/src/filters/update.rs
+++ b/crates/nu-command/src/filters/update.rs
@@ -33,11 +33,11 @@ impl Command for Update {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Update an existing column to have a new value."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "When updating a column, the closure will be run for each row, and the current row will be passed as the first argument. \
 Referencing `$in` inside the closure will provide the value at the column for the current row.
 
diff --git a/crates/nu-command/src/filters/upsert.rs b/crates/nu-command/src/filters/upsert.rs
index af2e6c74b1..a85e98f639 100644
--- a/crates/nu-command/src/filters/upsert.rs
+++ b/crates/nu-command/src/filters/upsert.rs
@@ -33,11 +33,11 @@ impl Command for Upsert {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Update an existing column to have a new value, or insert a new column."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "When updating or inserting a column, the closure will be run for each row, and the current row will be passed as the first argument. \
 Referencing `$in` inside the closure will provide the value at the column for the current row or null if the column does not exist.
 
diff --git a/crates/nu-command/src/filters/values.rs b/crates/nu-command/src/filters/values.rs
index 9a08f1168c..5039938055 100644
--- a/crates/nu-command/src/filters/values.rs
+++ b/crates/nu-command/src/filters/values.rs
@@ -18,11 +18,11 @@ impl Command for Values {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Given a record or table, produce a list of its columns' values."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "This is a counterpart to `columns`, which produces a list of columns' names."
     }
 
diff --git a/crates/nu-command/src/filters/where_.rs b/crates/nu-command/src/filters/where_.rs
index 0a8c8c9ef3..cf40639172 100644
--- a/crates/nu-command/src/filters/where_.rs
+++ b/crates/nu-command/src/filters/where_.rs
@@ -9,11 +9,11 @@ impl Command for Where {
         "where"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Filter values based on a row condition."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command works similar to 'filter' but allows extra shorthands for working with
 tables, known as "row conditions". On the other hand, reading the condition from a variable is
 not supported."#
diff --git a/crates/nu-command/src/filters/window.rs b/crates/nu-command/src/filters/window.rs
index 556543118b..65ce2b0aee 100644
--- a/crates/nu-command/src/filters/window.rs
+++ b/crates/nu-command/src/filters/window.rs
@@ -31,11 +31,11 @@ impl Command for Window {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Creates a sliding window of `window_size` that slide by n rows/elements across input."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "This command will error if `window_size` or `stride` are negative or zero."
     }
 
diff --git a/crates/nu-command/src/filters/wrap.rs b/crates/nu-command/src/filters/wrap.rs
index dfe1c11d03..6988c09f9a 100644
--- a/crates/nu-command/src/filters/wrap.rs
+++ b/crates/nu-command/src/filters/wrap.rs
@@ -8,7 +8,7 @@ impl Command for Wrap {
         "wrap"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Wrap the value into a column."
     }
 
diff --git a/crates/nu-command/src/filters/zip.rs b/crates/nu-command/src/filters/zip.rs
index 59e2b4ac98..14e3d57ddd 100644
--- a/crates/nu-command/src/filters/zip.rs
+++ b/crates/nu-command/src/filters/zip.rs
@@ -8,7 +8,7 @@ impl Command for Zip {
         "zip"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Combine a stream with the input."
     }
 
diff --git a/crates/nu-command/src/formats/from/command.rs b/crates/nu-command/src/formats/from/command.rs
index 40085b51d2..864e22615c 100644
--- a/crates/nu-command/src/formats/from/command.rs
+++ b/crates/nu-command/src/formats/from/command.rs
@@ -8,7 +8,7 @@ impl Command for From {
         "from"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Parse a string or binary data into structured data."
     }
 
@@ -18,7 +18,7 @@ impl Command for From {
             .input_output_types(vec![(Type::Nothing, Type::String)])
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "You must use one of the following subcommands. Using this command as-is will only produce this help message."
     }
 
diff --git a/crates/nu-command/src/formats/from/csv.rs b/crates/nu-command/src/formats/from/csv.rs
index b00dd5022b..472ccf4d71 100644
--- a/crates/nu-command/src/formats/from/csv.rs
+++ b/crates/nu-command/src/formats/from/csv.rs
@@ -56,7 +56,7 @@ impl Command for FromCsv {
             .category(Category::Formats)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Parse text as .csv and create table."
     }
 
diff --git a/crates/nu-command/src/formats/from/json.rs b/crates/nu-command/src/formats/from/json.rs
index 6d46df78a3..e3de2cbafd 100644
--- a/crates/nu-command/src/formats/from/json.rs
+++ b/crates/nu-command/src/formats/from/json.rs
@@ -11,7 +11,7 @@ impl Command for FromJson {
         "from json"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert from json to structured data."
     }
 
diff --git a/crates/nu-command/src/formats/from/msgpack.rs b/crates/nu-command/src/formats/from/msgpack.rs
index d3d0d710f1..a3538ea69f 100644
--- a/crates/nu-command/src/formats/from/msgpack.rs
+++ b/crates/nu-command/src/formats/from/msgpack.rs
@@ -31,11 +31,11 @@ impl Command for FromMsgpack {
             .category(Category::Formats)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert MessagePack data into Nu values."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"
 Not all values are representable as MessagePack.
 
diff --git a/crates/nu-command/src/formats/from/msgpackz.rs b/crates/nu-command/src/formats/from/msgpackz.rs
index c98b72cdd6..81cc901614 100644
--- a/crates/nu-command/src/formats/from/msgpackz.rs
+++ b/crates/nu-command/src/formats/from/msgpackz.rs
@@ -21,11 +21,11 @@ impl Command for FromMsgpackz {
             .category(Category::Formats)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert brotli-compressed MessagePack data into Nu values."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "This is the format used by the plugin registry file ($nu.plugin-path)."
     }
 
diff --git a/crates/nu-command/src/formats/from/nuon.rs b/crates/nu-command/src/formats/from/nuon.rs
index bfffe7e5b4..107ee9c3b4 100644
--- a/crates/nu-command/src/formats/from/nuon.rs
+++ b/crates/nu-command/src/formats/from/nuon.rs
@@ -8,7 +8,7 @@ impl Command for FromNuon {
         "from nuon"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert from nuon to structured data."
     }
 
diff --git a/crates/nu-command/src/formats/from/ods.rs b/crates/nu-command/src/formats/from/ods.rs
index ff7a76c0ca..c6f08f4481 100644
--- a/crates/nu-command/src/formats/from/ods.rs
+++ b/crates/nu-command/src/formats/from/ods.rs
@@ -25,7 +25,7 @@ impl Command for FromOds {
             .category(Category::Formats)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Parse OpenDocument Spreadsheet(.ods) data and create table."
     }
 
diff --git a/crates/nu-command/src/formats/from/ssv.rs b/crates/nu-command/src/formats/from/ssv.rs
index 1d17dfc69d..48fb0515cf 100644
--- a/crates/nu-command/src/formats/from/ssv.rs
+++ b/crates/nu-command/src/formats/from/ssv.rs
@@ -29,7 +29,7 @@ impl Command for FromSsv {
             .category(Category::Formats)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Parse text as space-separated values and create a table. The default minimum number of spaces counted as a separator is 2."
     }
 
diff --git a/crates/nu-command/src/formats/from/toml.rs b/crates/nu-command/src/formats/from/toml.rs
index 266911f50a..a61ced65a0 100644
--- a/crates/nu-command/src/formats/from/toml.rs
+++ b/crates/nu-command/src/formats/from/toml.rs
@@ -15,7 +15,7 @@ impl Command for FromToml {
             .category(Category::Formats)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Parse text as .toml and create record."
     }
 
diff --git a/crates/nu-command/src/formats/from/tsv.rs b/crates/nu-command/src/formats/from/tsv.rs
index ea507ab1c7..cd3c9f97bd 100644
--- a/crates/nu-command/src/formats/from/tsv.rs
+++ b/crates/nu-command/src/formats/from/tsv.rs
@@ -50,7 +50,7 @@ impl Command for FromTsv {
             .category(Category::Formats)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Parse text as .tsv and create table."
     }
 
diff --git a/crates/nu-command/src/formats/from/xlsx.rs b/crates/nu-command/src/formats/from/xlsx.rs
index 21e2567b45..1e02cf432c 100644
--- a/crates/nu-command/src/formats/from/xlsx.rs
+++ b/crates/nu-command/src/formats/from/xlsx.rs
@@ -26,7 +26,7 @@ impl Command for FromXlsx {
             .category(Category::Formats)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Parse binary Excel(.xlsx) data and create table."
     }
 
diff --git a/crates/nu-command/src/formats/from/xml.rs b/crates/nu-command/src/formats/from/xml.rs
index c3464e7a25..4c0675a109 100644
--- a/crates/nu-command/src/formats/from/xml.rs
+++ b/crates/nu-command/src/formats/from/xml.rs
@@ -24,11 +24,11 @@ impl Command for FromXml {
             .category(Category::Formats)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Parse text as .xml and create record."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"Every XML entry is represented via a record with tag, attribute and content fields.
 To represent different types of entries different values are written to this fields:
 1. Tag entry: `{tag: <tag name> attrs: {<attr name>: "<string value>" ...} content: [<entries>]}`
diff --git a/crates/nu-command/src/formats/from/yaml.rs b/crates/nu-command/src/formats/from/yaml.rs
index 74914ed0c8..5c463cc2a9 100644
--- a/crates/nu-command/src/formats/from/yaml.rs
+++ b/crates/nu-command/src/formats/from/yaml.rs
@@ -17,7 +17,7 @@ impl Command for FromYaml {
             .category(Category::Formats)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Parse text as .yaml/.yml and create table."
     }
 
@@ -51,7 +51,7 @@ impl Command for FromYml {
             .category(Category::Formats)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Parse text as .yaml/.yml and create table."
     }
 
diff --git a/crates/nu-command/src/formats/to/command.rs b/crates/nu-command/src/formats/to/command.rs
index 2138085c87..a687d480ba 100644
--- a/crates/nu-command/src/formats/to/command.rs
+++ b/crates/nu-command/src/formats/to/command.rs
@@ -8,7 +8,7 @@ impl Command for To {
         "to"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Translate structured data to a format."
     }
 
@@ -18,7 +18,7 @@ impl Command for To {
             .input_output_types(vec![(Type::Nothing, Type::String)])
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "You must use one of the following subcommands. Using this command as-is will only produce this help message."
     }
 
diff --git a/crates/nu-command/src/formats/to/csv.rs b/crates/nu-command/src/formats/to/csv.rs
index c5847abd6a..4e971a3abb 100644
--- a/crates/nu-command/src/formats/to/csv.rs
+++ b/crates/nu-command/src/formats/to/csv.rs
@@ -65,7 +65,7 @@ impl Command for ToCsv {
         ]
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert table into .csv text ."
     }
 
diff --git a/crates/nu-command/src/formats/to/json.rs b/crates/nu-command/src/formats/to/json.rs
index 729fe2293f..dc2b89c0c9 100644
--- a/crates/nu-command/src/formats/to/json.rs
+++ b/crates/nu-command/src/formats/to/json.rs
@@ -28,7 +28,7 @@ impl Command for ToJson {
             .category(Category::Formats)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Converts table data into JSON text."
     }
 
diff --git a/crates/nu-command/src/formats/to/md.rs b/crates/nu-command/src/formats/to/md.rs
index 7f86c5eb06..2cf6b5215e 100644
--- a/crates/nu-command/src/formats/to/md.rs
+++ b/crates/nu-command/src/formats/to/md.rs
@@ -27,7 +27,7 @@ impl Command for ToMd {
             .category(Category::Formats)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert table into simple Markdown."
     }
 
diff --git a/crates/nu-command/src/formats/to/msgpack.rs b/crates/nu-command/src/formats/to/msgpack.rs
index 049b4de86d..b4f7c7d79e 100644
--- a/crates/nu-command/src/formats/to/msgpack.rs
+++ b/crates/nu-command/src/formats/to/msgpack.rs
@@ -25,11 +25,11 @@ impl Command for ToMsgpack {
             .category(Category::Formats)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert Nu values into MessagePack."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"
 Not all values are representable as MessagePack.
 
diff --git a/crates/nu-command/src/formats/to/msgpackz.rs b/crates/nu-command/src/formats/to/msgpackz.rs
index 83d812cab6..e4166b15d3 100644
--- a/crates/nu-command/src/formats/to/msgpackz.rs
+++ b/crates/nu-command/src/formats/to/msgpackz.rs
@@ -34,11 +34,11 @@ impl Command for ToMsgpackz {
             .category(Category::Formats)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert Nu values into brotli-compressed MessagePack."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "This is the format used by the plugin registry file ($nu.plugin-path)."
     }
 
diff --git a/crates/nu-command/src/formats/to/nuon.rs b/crates/nu-command/src/formats/to/nuon.rs
index 809ddc01ad..db29934a4d 100644
--- a/crates/nu-command/src/formats/to/nuon.rs
+++ b/crates/nu-command/src/formats/to/nuon.rs
@@ -31,7 +31,7 @@ impl Command for ToNuon {
             .category(Category::Formats)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Converts table data into Nuon (Nushell Object Notation) text."
     }
 
diff --git a/crates/nu-command/src/formats/to/text.rs b/crates/nu-command/src/formats/to/text.rs
index 111c42cdff..626596ea76 100644
--- a/crates/nu-command/src/formats/to/text.rs
+++ b/crates/nu-command/src/formats/to/text.rs
@@ -24,7 +24,7 @@ impl Command for ToText {
             .category(Category::Formats)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Converts data into simple text."
     }
 
diff --git a/crates/nu-command/src/formats/to/toml.rs b/crates/nu-command/src/formats/to/toml.rs
index c70864b7f8..9e5728ef1e 100644
--- a/crates/nu-command/src/formats/to/toml.rs
+++ b/crates/nu-command/src/formats/to/toml.rs
@@ -16,7 +16,7 @@ impl Command for ToToml {
             .category(Category::Formats)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert record into .toml text."
     }
 
diff --git a/crates/nu-command/src/formats/to/tsv.rs b/crates/nu-command/src/formats/to/tsv.rs
index 63f72f4584..1afe18ea48 100644
--- a/crates/nu-command/src/formats/to/tsv.rs
+++ b/crates/nu-command/src/formats/to/tsv.rs
@@ -34,7 +34,7 @@ impl Command for ToTsv {
             .category(Category::Formats)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert table into .tsv text."
     }
 
diff --git a/crates/nu-command/src/formats/to/xml.rs b/crates/nu-command/src/formats/to/xml.rs
index 1285c558ee..0df986d082 100644
--- a/crates/nu-command/src/formats/to/xml.rs
+++ b/crates/nu-command/src/formats/to/xml.rs
@@ -38,7 +38,7 @@ impl Command for ToXml {
             .category(Category::Formats)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"Every XML entry is represented via a record with tag, attribute and content fields.
 To represent different types of entries different values must be written to this fields:
 1. Tag entry: `{tag: <tag name> attributes: {<attr name>: "<string value>" ...} content: [<entries>]}`
@@ -89,7 +89,7 @@ Additionally any field which is: empty record, empty list or null, can be omitte
         ]
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert special record structure into .xml text."
     }
 
diff --git a/crates/nu-command/src/formats/to/yaml.rs b/crates/nu-command/src/formats/to/yaml.rs
index ae923c1fc8..c5de035e42 100644
--- a/crates/nu-command/src/formats/to/yaml.rs
+++ b/crates/nu-command/src/formats/to/yaml.rs
@@ -15,7 +15,7 @@ impl Command for ToYaml {
             .category(Category::Formats)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert table into .yaml/.yml text."
     }
 
diff --git a/crates/nu-command/src/generators/cal.rs b/crates/nu-command/src/generators/cal.rs
index 018d9370dd..30430955b1 100644
--- a/crates/nu-command/src/generators/cal.rs
+++ b/crates/nu-command/src/generators/cal.rs
@@ -54,7 +54,7 @@ impl Command for Cal {
             .category(Category::Generators)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Display a calendar."
     }
 
diff --git a/crates/nu-command/src/generators/generate.rs b/crates/nu-command/src/generators/generate.rs
index 2b2cf838f4..ead6bdd7c9 100644
--- a/crates/nu-command/src/generators/generate.rs
+++ b/crates/nu-command/src/generators/generate.rs
@@ -22,11 +22,11 @@ impl Command for Generate {
             .category(Category::Generators)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Generate a list of values by successively invoking a closure."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"The generator closure accepts a single argument and returns a record
 containing two optional keys: 'out' and 'next'. Each invocation, the 'out'
 value, if present, is added to the stream. If a 'next' key is present, it is
diff --git a/crates/nu-command/src/generators/seq.rs b/crates/nu-command/src/generators/seq.rs
index 3636d89d4c..48eab645b9 100644
--- a/crates/nu-command/src/generators/seq.rs
+++ b/crates/nu-command/src/generators/seq.rs
@@ -16,7 +16,7 @@ impl Command for Seq {
             .category(Category::Generators)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Output sequences of numbers."
     }
 
diff --git a/crates/nu-command/src/generators/seq_char.rs b/crates/nu-command/src/generators/seq_char.rs
index 2b297b53a0..c0f16593d7 100644
--- a/crates/nu-command/src/generators/seq_char.rs
+++ b/crates/nu-command/src/generators/seq_char.rs
@@ -8,7 +8,7 @@ impl Command for SeqChar {
         "seq char"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Print a sequence of ASCII characters."
     }
 
diff --git a/crates/nu-command/src/generators/seq_date.rs b/crates/nu-command/src/generators/seq_date.rs
index 7ae1c514c7..955de5a507 100644
--- a/crates/nu-command/src/generators/seq_date.rs
+++ b/crates/nu-command/src/generators/seq_date.rs
@@ -11,7 +11,7 @@ impl Command for SeqDate {
         "seq date"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Print sequences of dates."
     }
 
diff --git a/crates/nu-command/src/hash/generic_digest.rs b/crates/nu-command/src/hash/generic_digest.rs
index f098f8a0cb..e94d484840 100644
--- a/crates/nu-command/src/hash/generic_digest.rs
+++ b/crates/nu-command/src/hash/generic_digest.rs
@@ -10,7 +10,7 @@ pub trait HashDigest: digest::Digest + Clone {
 #[derive(Clone)]
 pub struct GenericDigest<D: HashDigest> {
     name: String,
-    usage: String,
+    description: String,
     phantom: PhantomData<D>,
 }
 
@@ -18,7 +18,7 @@ impl<D: HashDigest> Default for GenericDigest<D> {
     fn default() -> Self {
         Self {
             name: format!("hash {}", D::name()),
-            usage: format!("Hash a value using the {} hash algorithm.", D::name()),
+            description: format!("Hash a value using the {} hash algorithm.", D::name()),
             phantom: PhantomData,
         }
     }
@@ -65,8 +65,8 @@ where
             )
     }
 
-    fn usage(&self) -> &str {
-        &self.usage
+    fn description(&self) -> &str {
+        &self.description
     }
 
     fn examples(&self) -> Vec<Example<'static>> {
diff --git a/crates/nu-command/src/hash/hash_.rs b/crates/nu-command/src/hash/hash_.rs
index d4eca79354..b16ee950bc 100644
--- a/crates/nu-command/src/hash/hash_.rs
+++ b/crates/nu-command/src/hash/hash_.rs
@@ -14,11 +14,11 @@ impl Command for Hash {
             .input_output_types(vec![(Type::Nothing, Type::String)])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Apply hash function."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "You must use one of the following subcommands. Using this command as-is will only produce this help message."
     }
 
diff --git a/crates/nu-command/src/help/help_.rs b/crates/nu-command/src/help/help_.rs
index 9835a20ad0..488095d62c 100644
--- a/crates/nu-command/src/help/help_.rs
+++ b/crates/nu-command/src/help/help_.rs
@@ -23,17 +23,17 @@ impl Command for Help {
             .named(
                 "find",
                 SyntaxShape::String,
-                "string to find in command names, usage, and search terms",
+                "string to find in command names, descriptions, and search terms",
                 Some('f'),
             )
             .category(Category::Core)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Display help information about different parts of Nushell."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"`help word` searches for "word" in commands, aliases and modules, in that order."#
     }
 
@@ -118,7 +118,7 @@ You can also learn more at https://www.nushell.sh/book/"#;
                 result: None,
             },
             Example {
-                description: "search for string in command names, usage and search terms",
+                description: "search for string in command names, descriptions, and search terms",
                 example: "help --find char",
                 result: None,
             },
diff --git a/crates/nu-command/src/help/help_aliases.rs b/crates/nu-command/src/help/help_aliases.rs
index 41af9da0b3..0d6d4b4f15 100644
--- a/crates/nu-command/src/help/help_aliases.rs
+++ b/crates/nu-command/src/help/help_aliases.rs
@@ -10,7 +10,7 @@ impl Command for HelpAliases {
         "help aliases"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Show help on nushell aliases."
     }
 
@@ -25,7 +25,7 @@ impl Command for HelpAliases {
             .named(
                 "find",
                 SyntaxShape::String,
-                "string to find in alias names and usage",
+                "string to find in alias names and descriptions",
                 Some('f'),
             )
             .input_output_types(vec![(Type::Nothing, Type::table())])
@@ -45,7 +45,7 @@ impl Command for HelpAliases {
                 result: None,
             },
             Example {
-                description: "search for string in alias names and usages",
+                description: "search for string in alias names and descriptions",
                 example: "help aliases --find my-alias",
                 result: None,
             },
@@ -86,7 +86,7 @@ pub fn help_aliases(
         let found_cmds_vec = highlight_search_in_table(
             all_cmds_vec,
             &f.item,
-            &["name", "usage"],
+            &["name", "description"],
             &string_style,
             &highlight_style,
         )?;
@@ -121,8 +121,8 @@ pub fn help_aliases(
 
         let alias_expansion =
             String::from_utf8_lossy(engine_state.get_span_contents(alias.wrapped_call.span));
-        let usage = alias.usage();
-        let extra_usage = alias.extra_usage();
+        let description = alias.description();
+        let extra_desc = alias.extra_description();
 
         // TODO: merge this into documentation.rs at some point
         const G: &str = "\x1b[32m"; // green
@@ -131,11 +131,11 @@ pub fn help_aliases(
 
         let mut long_desc = String::new();
 
-        long_desc.push_str(usage);
+        long_desc.push_str(description);
         long_desc.push_str("\n\n");
 
-        if !extra_usage.is_empty() {
-            long_desc.push_str(extra_usage);
+        if !extra_desc.is_empty() {
+            long_desc.push_str(extra_desc);
             long_desc.push_str("\n\n");
         }
 
diff --git a/crates/nu-command/src/help/help_commands.rs b/crates/nu-command/src/help/help_commands.rs
index f067a9fdcb..d7571b9c07 100644
--- a/crates/nu-command/src/help/help_commands.rs
+++ b/crates/nu-command/src/help/help_commands.rs
@@ -10,7 +10,7 @@ impl Command for HelpCommands {
         "help commands"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Show help on nushell commands."
     }
 
@@ -25,7 +25,7 @@ impl Command for HelpCommands {
             .named(
                 "find",
                 SyntaxShape::String,
-                "string to find in command names, usage, and search terms",
+                "string to find in command names, descriptions, and search terms",
                 Some('f'),
             )
             .input_output_types(vec![(Type::Nothing, Type::table())])
@@ -66,7 +66,7 @@ pub fn help_commands(
         let found_cmds_vec = highlight_search_in_table(
             all_cmds_vec,
             &f.item,
-            &["name", "usage", "search_terms"],
+            &["name", "description", "search_terms"],
             &string_style,
             &highlight_style,
         )?;
@@ -119,7 +119,7 @@ fn build_help_commands(engine_state: &EngineState, span: Span) -> Vec<Value> {
         let sig = decl.signature().update_from_command(decl);
 
         let key = sig.name;
-        let usage = sig.usage;
+        let description = sig.description;
         let search_terms = sig.search_terms;
 
         let command_type = decl.command_type().to_string();
@@ -216,7 +216,7 @@ fn build_help_commands(engine_state: &EngineState, span: Span) -> Vec<Value> {
             "name" => Value::string(key, span),
             "category" => Value::string(sig.category.to_string(), span),
             "command_type" => Value::string(command_type, span),
-            "usage" => Value::string(usage, span),
+            "description" => Value::string(description, span),
             "params" => param_table,
             "input_output" => input_output_table,
             "search_terms" => Value::string(search_terms.join(", "), span),
diff --git a/crates/nu-command/src/help/help_escapes.rs b/crates/nu-command/src/help/help_escapes.rs
index 212cbb58bf..ecdcca694e 100644
--- a/crates/nu-command/src/help/help_escapes.rs
+++ b/crates/nu-command/src/help/help_escapes.rs
@@ -8,7 +8,7 @@ impl Command for HelpEscapes {
         "help escapes"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Show help on nushell string escapes."
     }
 
diff --git a/crates/nu-command/src/help/help_externs.rs b/crates/nu-command/src/help/help_externs.rs
index 4a5c8123a4..af07835af4 100644
--- a/crates/nu-command/src/help/help_externs.rs
+++ b/crates/nu-command/src/help/help_externs.rs
@@ -10,7 +10,7 @@ impl Command for HelpExterns {
         "help externs"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Show help on nushell externs."
     }
 
@@ -25,7 +25,7 @@ impl Command for HelpExterns {
             .named(
                 "find",
                 SyntaxShape::String,
-                "string to find in extern names and usage",
+                "string to find in extern names and descriptions",
                 Some('f'),
             )
             .input_output_types(vec![(Type::Nothing, Type::table())])
@@ -45,7 +45,7 @@ impl Command for HelpExterns {
                 result: None,
             },
             Example {
-                description: "search for string in extern names and usages",
+                description: "search for string in extern names and descriptions",
                 example: "help externs --find smth",
                 result: None,
             },
@@ -86,7 +86,7 @@ pub fn help_externs(
         let found_cmds_vec = highlight_search_in_table(
             all_cmds_vec,
             &f.item,
-            &["name", "usage"],
+            &["name", "description"],
             &string_style,
             &highlight_style,
         )?;
diff --git a/crates/nu-command/src/help/help_modules.rs b/crates/nu-command/src/help/help_modules.rs
index c2c00cf400..579bd3f768 100644
--- a/crates/nu-command/src/help/help_modules.rs
+++ b/crates/nu-command/src/help/help_modules.rs
@@ -11,11 +11,11 @@ impl Command for HelpModules {
         "help modules"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Show help on nushell modules."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"When requesting help for a single module, its commands and aliases will be highlighted if they
 are also available in the current scope. Commands/aliases that were imported under a different name
 (such as with a prefix after `use some-module`) will be highlighted in parentheses."#
@@ -32,7 +32,7 @@ are also available in the current scope. Commands/aliases that were imported und
             .named(
                 "find",
                 SyntaxShape::String,
-                "string to find in module names and usage",
+                "string to find in module names and descriptions",
                 Some('f'),
             )
             .input_output_types(vec![(Type::Nothing, Type::table())])
@@ -52,7 +52,7 @@ are also available in the current scope. Commands/aliases that were imported und
                 result: None,
             },
             Example {
-                description: "search for string in module names and usages",
+                description: "search for string in module names and descriptions",
                 example: "help modules --find my-module",
                 result: None,
             },
@@ -93,7 +93,7 @@ pub fn help_modules(
         let found_cmds_vec = highlight_search_in_table(
             all_cmds_vec,
             &f.item,
-            &["name", "usage"],
+            &["name", "description"],
             &string_style,
             &highlight_style,
         )?;
@@ -123,7 +123,7 @@ pub fn help_modules(
 
         let module = engine_state.get_module(module_id);
 
-        let module_usage = engine_state.build_module_usage(module_id);
+        let module_desc = engine_state.build_module_desc(module_id);
 
         // TODO: merge this into documentation.rs at some point
         const G: &str = "\x1b[32m"; // green
@@ -133,12 +133,12 @@ pub fn help_modules(
 
         let mut long_desc = String::new();
 
-        if let Some((usage, extra_usage)) = module_usage {
-            long_desc.push_str(&usage);
+        if let Some((desc, extra_desc)) = module_desc {
+            long_desc.push_str(&desc);
             long_desc.push_str("\n\n");
 
-            if !extra_usage.is_empty() {
-                long_desc.push_str(&extra_usage);
+            if !extra_desc.is_empty() {
+                long_desc.push_str(&extra_desc);
                 long_desc.push_str("\n\n");
             }
         }
diff --git a/crates/nu-command/src/help/help_operators.rs b/crates/nu-command/src/help/help_operators.rs
index 12803fad8e..28be6a68ed 100644
--- a/crates/nu-command/src/help/help_operators.rs
+++ b/crates/nu-command/src/help/help_operators.rs
@@ -9,7 +9,7 @@ impl Command for HelpOperators {
         "help operators"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Show help on nushell operators."
     }
 
diff --git a/crates/nu-command/src/math/abs.rs b/crates/nu-command/src/math/abs.rs
index 86e913e3ee..95cf251abb 100644
--- a/crates/nu-command/src/math/abs.rs
+++ b/crates/nu-command/src/math/abs.rs
@@ -26,7 +26,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the absolute value of a number."
     }
 
diff --git a/crates/nu-command/src/math/avg.rs b/crates/nu-command/src/math/avg.rs
index fbc2aa327c..07e2ed00bf 100644
--- a/crates/nu-command/src/math/avg.rs
+++ b/crates/nu-command/src/math/avg.rs
@@ -30,7 +30,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the average of a list of numbers."
     }
 
diff --git a/crates/nu-command/src/math/ceil.rs b/crates/nu-command/src/math/ceil.rs
index 6a98e6da91..a971ef3975 100644
--- a/crates/nu-command/src/math/ceil.rs
+++ b/crates/nu-command/src/math/ceil.rs
@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the ceil of a number (smallest integer greater than or equal to that number)."
     }
 
diff --git a/crates/nu-command/src/math/floor.rs b/crates/nu-command/src/math/floor.rs
index cfd7a60981..2dfa293b24 100644
--- a/crates/nu-command/src/math/floor.rs
+++ b/crates/nu-command/src/math/floor.rs
@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the floor of a number (largest integer less than or equal to that number)."
     }
 
diff --git a/crates/nu-command/src/math/log.rs b/crates/nu-command/src/math/log.rs
index 0ac967b3b2..4c262017ca 100644
--- a/crates/nu-command/src/math/log.rs
+++ b/crates/nu-command/src/math/log.rs
@@ -26,7 +26,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the logarithm for an arbitrary base."
     }
 
diff --git a/crates/nu-command/src/math/math_.rs b/crates/nu-command/src/math/math_.rs
index 2ac067af4e..cab773016d 100644
--- a/crates/nu-command/src/math/math_.rs
+++ b/crates/nu-command/src/math/math_.rs
@@ -14,11 +14,11 @@ impl Command for MathCommand {
             .input_output_types(vec![(Type::Nothing, Type::String)])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Use mathematical functions as aggregate functions on a list of numbers or tables."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "You must use one of the following subcommands. Using this command as-is will only produce this help message."
     }
 
diff --git a/crates/nu-command/src/math/max.rs b/crates/nu-command/src/math/max.rs
index ce88f4d244..2ee7f89b15 100644
--- a/crates/nu-command/src/math/max.rs
+++ b/crates/nu-command/src/math/max.rs
@@ -27,7 +27,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the maximum of a list of values, or of columns in a table."
     }
 
diff --git a/crates/nu-command/src/math/median.rs b/crates/nu-command/src/math/median.rs
index eeb3b4a199..653ebb59ba 100644
--- a/crates/nu-command/src/math/median.rs
+++ b/crates/nu-command/src/math/median.rs
@@ -24,7 +24,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Computes the median of a list of numbers."
     }
 
diff --git a/crates/nu-command/src/math/min.rs b/crates/nu-command/src/math/min.rs
index 4998a93a15..6722575579 100644
--- a/crates/nu-command/src/math/min.rs
+++ b/crates/nu-command/src/math/min.rs
@@ -27,7 +27,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Finds the minimum within a list of values or tables."
     }
 
diff --git a/crates/nu-command/src/math/mode.rs b/crates/nu-command/src/math/mode.rs
index 6890e3f5b4..b89896ca88 100644
--- a/crates/nu-command/src/math/mode.rs
+++ b/crates/nu-command/src/math/mode.rs
@@ -54,7 +54,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the most frequent element(s) from a list of numbers or tables."
     }
 
diff --git a/crates/nu-command/src/math/product.rs b/crates/nu-command/src/math/product.rs
index 2e457767bd..41e100b154 100644
--- a/crates/nu-command/src/math/product.rs
+++ b/crates/nu-command/src/math/product.rs
@@ -24,7 +24,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the product of a list of numbers or the products of each column of a table."
     }
 
diff --git a/crates/nu-command/src/math/round.rs b/crates/nu-command/src/math/round.rs
index 2faf7842d9..aeb92002c0 100644
--- a/crates/nu-command/src/math/round.rs
+++ b/crates/nu-command/src/math/round.rs
@@ -27,7 +27,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the input number rounded to the specified precision."
     }
 
diff --git a/crates/nu-command/src/math/sqrt.rs b/crates/nu-command/src/math/sqrt.rs
index d20978222c..b8f982a540 100644
--- a/crates/nu-command/src/math/sqrt.rs
+++ b/crates/nu-command/src/math/sqrt.rs
@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the square root of the input number."
     }
 
diff --git a/crates/nu-command/src/math/stddev.rs b/crates/nu-command/src/math/stddev.rs
index 2e221e3b1f..1e10cedf41 100644
--- a/crates/nu-command/src/math/stddev.rs
+++ b/crates/nu-command/src/math/stddev.rs
@@ -26,7 +26,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the standard deviation of a list of numbers, or of each column in a table."
     }
 
diff --git a/crates/nu-command/src/math/sum.rs b/crates/nu-command/src/math/sum.rs
index cd4b6b4540..30bc71bb7a 100644
--- a/crates/nu-command/src/math/sum.rs
+++ b/crates/nu-command/src/math/sum.rs
@@ -26,7 +26,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the sum of a list of numbers or of each column in a table."
     }
 
diff --git a/crates/nu-command/src/math/variance.rs b/crates/nu-command/src/math/variance.rs
index 7def47bb19..8422009230 100644
--- a/crates/nu-command/src/math/variance.rs
+++ b/crates/nu-command/src/math/variance.rs
@@ -25,7 +25,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the variance of a list of numbers or of each column in a table."
     }
 
diff --git a/crates/nu-command/src/misc/panic.rs b/crates/nu-command/src/misc/panic.rs
index cf1a5e053a..f8bb0bae66 100644
--- a/crates/nu-command/src/misc/panic.rs
+++ b/crates/nu-command/src/misc/panic.rs
@@ -8,7 +8,7 @@ impl Command for Panic {
         "panic"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Executes a rust panic, useful only for testing."
     }
 
diff --git a/crates/nu-command/src/misc/source.rs b/crates/nu-command/src/misc/source.rs
index 08a979b9f5..df002c998a 100644
--- a/crates/nu-command/src/misc/source.rs
+++ b/crates/nu-command/src/misc/source.rs
@@ -21,11 +21,11 @@ impl Command for Source {
             .category(Category::Core)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Runs a script file in the current context."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
diff --git a/crates/nu-command/src/misc/tutor.rs b/crates/nu-command/src/misc/tutor.rs
index 6b1c43534b..94c95763cb 100644
--- a/crates/nu-command/src/misc/tutor.rs
+++ b/crates/nu-command/src/misc/tutor.rs
@@ -27,7 +27,7 @@ impl Command for Tutor {
             .category(Category::Misc)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Run the tutorial. To begin, run: tutor."
     }
 
diff --git a/crates/nu-command/src/network/http/delete.rs b/crates/nu-command/src/network/http/delete.rs
index f32c9d15bb..27b43e2b76 100644
--- a/crates/nu-command/src/network/http/delete.rs
+++ b/crates/nu-command/src/network/http/delete.rs
@@ -82,11 +82,11 @@ impl Command for SubCommand {
             .category(Category::Network)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Delete the specified resource."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "Performs HTTP DELETE operation."
     }
 
diff --git a/crates/nu-command/src/network/http/get.rs b/crates/nu-command/src/network/http/get.rs
index 3b702404f4..f348cc9fd6 100644
--- a/crates/nu-command/src/network/http/get.rs
+++ b/crates/nu-command/src/network/http/get.rs
@@ -78,11 +78,11 @@ impl Command for SubCommand {
             .category(Category::Network)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Fetch the contents from a URL."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "Performs HTTP GET operation."
     }
 
diff --git a/crates/nu-command/src/network/http/head.rs b/crates/nu-command/src/network/http/head.rs
index 797fa138e3..37d6c46ba9 100644
--- a/crates/nu-command/src/network/http/head.rs
+++ b/crates/nu-command/src/network/http/head.rs
@@ -62,11 +62,11 @@ impl Command for SubCommand {
             .category(Category::Network)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Get the headers from a URL."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "Performs HTTP HEAD operation."
     }
 
diff --git a/crates/nu-command/src/network/http/http_.rs b/crates/nu-command/src/network/http/http_.rs
index 361033708e..a797054ced 100644
--- a/crates/nu-command/src/network/http/http_.rs
+++ b/crates/nu-command/src/network/http/http_.rs
@@ -14,11 +14,11 @@ impl Command for Http {
             .category(Category::Network)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Various commands for working with http methods."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "You must use one of the following subcommands. Using this command as-is will only produce this help message."
     }
 
diff --git a/crates/nu-command/src/network/http/options.rs b/crates/nu-command/src/network/http/options.rs
index cd9a1f79c1..5c34be4041 100644
--- a/crates/nu-command/src/network/http/options.rs
+++ b/crates/nu-command/src/network/http/options.rs
@@ -61,11 +61,11 @@ impl Command for SubCommand {
             .category(Category::Network)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Requests permitted communication options for a given URL."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "Performs an HTTP OPTIONS request. Most commonly used for making CORS preflight requests."
     }
 
diff --git a/crates/nu-command/src/network/http/patch.rs b/crates/nu-command/src/network/http/patch.rs
index 7f49781284..09741c7492 100644
--- a/crates/nu-command/src/network/http/patch.rs
+++ b/crates/nu-command/src/network/http/patch.rs
@@ -78,11 +78,11 @@ impl Command for SubCommand {
             .category(Category::Network)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Patch a body to a URL."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "Performs HTTP PATCH operation."
     }
 
diff --git a/crates/nu-command/src/network/http/post.rs b/crates/nu-command/src/network/http/post.rs
index a593c5489c..f57953ea42 100644
--- a/crates/nu-command/src/network/http/post.rs
+++ b/crates/nu-command/src/network/http/post.rs
@@ -78,11 +78,11 @@ impl Command for SubCommand {
             .category(Category::Network)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Post a body to a URL."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "Performs HTTP POST operation."
     }
 
diff --git a/crates/nu-command/src/network/http/put.rs b/crates/nu-command/src/network/http/put.rs
index e2118ea359..ea7c722c4c 100644
--- a/crates/nu-command/src/network/http/put.rs
+++ b/crates/nu-command/src/network/http/put.rs
@@ -78,11 +78,11 @@ impl Command for SubCommand {
             .category(Category::Network)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Put a body to a URL."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "Performs HTTP PUT operation."
     }
 
diff --git a/crates/nu-command/src/network/port.rs b/crates/nu-command/src/network/port.rs
index 746df62d3a..eb77ab1d32 100644
--- a/crates/nu-command/src/network/port.rs
+++ b/crates/nu-command/src/network/port.rs
@@ -22,7 +22,7 @@ impl Command for SubCommand {
             .category(Category::Network)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Get a free port from system."
     }
 
diff --git a/crates/nu-command/src/network/url/build_query.rs b/crates/nu-command/src/network/url/build_query.rs
index dd50d9124f..1daabb507f 100644
--- a/crates/nu-command/src/network/url/build_query.rs
+++ b/crates/nu-command/src/network/url/build_query.rs
@@ -17,7 +17,7 @@ impl Command for SubCommand {
             .category(Category::Network)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Converts record or table into query string applying percent-encoding."
     }
 
diff --git a/crates/nu-command/src/network/url/decode.rs b/crates/nu-command/src/network/url/decode.rs
index b98e50a56e..8db5d09b15 100644
--- a/crates/nu-command/src/network/url/decode.rs
+++ b/crates/nu-command/src/network/url/decode.rs
@@ -31,7 +31,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Converts a percent-encoded web safe string to a string."
     }
 
diff --git a/crates/nu-command/src/network/url/encode.rs b/crates/nu-command/src/network/url/encode.rs
index 96e0289903..3854e0b401 100644
--- a/crates/nu-command/src/network/url/encode.rs
+++ b/crates/nu-command/src/network/url/encode.rs
@@ -32,7 +32,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Converts a string to a percent encoded web safe string."
     }
 
diff --git a/crates/nu-command/src/network/url/join.rs b/crates/nu-command/src/network/url/join.rs
index a2d6de8852..2bbd68bbcb 100644
--- a/crates/nu-command/src/network/url/join.rs
+++ b/crates/nu-command/src/network/url/join.rs
@@ -14,7 +14,7 @@ impl Command for SubCommand {
             .category(Category::Network)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Converts a record to url."
     }
 
diff --git a/crates/nu-command/src/network/url/parse.rs b/crates/nu-command/src/network/url/parse.rs
index 287c64c7b9..37502fd7ea 100644
--- a/crates/nu-command/src/network/url/parse.rs
+++ b/crates/nu-command/src/network/url/parse.rs
@@ -26,7 +26,7 @@ impl Command for SubCommand {
             .category(Category::Network)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Parses a url."
     }
 
diff --git a/crates/nu-command/src/network/url/url_.rs b/crates/nu-command/src/network/url/url_.rs
index 9988063d46..d139579a08 100644
--- a/crates/nu-command/src/network/url/url_.rs
+++ b/crates/nu-command/src/network/url/url_.rs
@@ -14,11 +14,11 @@ impl Command for Url {
             .category(Category::Network)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Various commands for working with URLs."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "You must use one of the following subcommands. Using this command as-is will only produce this help message."
     }
 
diff --git a/crates/nu-command/src/path/basename.rs b/crates/nu-command/src/path/basename.rs
index 8b7082048e..d619a54c34 100644
--- a/crates/nu-command/src/path/basename.rs
+++ b/crates/nu-command/src/path/basename.rs
@@ -35,7 +35,7 @@ impl Command for SubCommand {
             .category(Category::Path)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Get the final component of a path."
     }
 
diff --git a/crates/nu-command/src/path/dirname.rs b/crates/nu-command/src/path/dirname.rs
index 218091ee34..3a3a1604e5 100644
--- a/crates/nu-command/src/path/dirname.rs
+++ b/crates/nu-command/src/path/dirname.rs
@@ -42,7 +42,7 @@ impl Command for SubCommand {
             .category(Category::Path)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Get the parent directory of a path."
     }
 
diff --git a/crates/nu-command/src/path/exists.rs b/crates/nu-command/src/path/exists.rs
index 86b00c6024..f00e6c17ef 100644
--- a/crates/nu-command/src/path/exists.rs
+++ b/crates/nu-command/src/path/exists.rs
@@ -33,11 +33,11 @@ impl Command for SubCommand {
             .category(Category::Path)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Check whether a path exists."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This only checks if it is possible to either `open` or `cd` to the given path.
 If you need to distinguish dirs and files, please use `path type`."#
     }
diff --git a/crates/nu-command/src/path/expand.rs b/crates/nu-command/src/path/expand.rs
index ac51978810..cea1282b9a 100644
--- a/crates/nu-command/src/path/expand.rs
+++ b/crates/nu-command/src/path/expand.rs
@@ -42,7 +42,7 @@ impl Command for SubCommand {
             .category(Category::Path)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Try to expand a path to its absolute form."
     }
 
diff --git a/crates/nu-command/src/path/join.rs b/crates/nu-command/src/path/join.rs
index 19d65b4c46..2d537f6822 100644
--- a/crates/nu-command/src/path/join.rs
+++ b/crates/nu-command/src/path/join.rs
@@ -33,11 +33,11 @@ impl Command for SubCommand {
             .category(Category::Path)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Join a structured path or a list of path parts."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"Optionally, append an additional path to the result. It is designed to accept
 the output of 'path parse' and 'path split' subcommands."#
     }
diff --git a/crates/nu-command/src/path/parse.rs b/crates/nu-command/src/path/parse.rs
index cec2f5c6ac..c41bfeff1a 100644
--- a/crates/nu-command/src/path/parse.rs
+++ b/crates/nu-command/src/path/parse.rs
@@ -32,11 +32,11 @@ impl Command for SubCommand {
             .category(Category::Path)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert a path into structured data."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"Each path is split into a table with 'parent', 'stem' and 'extension' fields.
 On Windows, an extra 'prefix' column is added."#
     }
diff --git a/crates/nu-command/src/path/path_.rs b/crates/nu-command/src/path/path_.rs
index 667008b658..bb2b46fb38 100644
--- a/crates/nu-command/src/path/path_.rs
+++ b/crates/nu-command/src/path/path_.rs
@@ -14,11 +14,11 @@ impl Command for PathCommand {
             .category(Category::Path)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Explore and manipulate paths."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"You must use one of the following subcommands. Using this command as-is will only produce this help message.
 
 There are three ways to represent a path:
diff --git a/crates/nu-command/src/path/relative_to.rs b/crates/nu-command/src/path/relative_to.rs
index 35df385d74..71cfa8b2a9 100644
--- a/crates/nu-command/src/path/relative_to.rs
+++ b/crates/nu-command/src/path/relative_to.rs
@@ -35,11 +35,11 @@ impl Command for SubCommand {
             .category(Category::Path)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Express a path as relative to another path."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"Can be used only when the input and the argument paths are either both
 absolute or both relative. The argument path needs to be a parent of the input
 path."#
diff --git a/crates/nu-command/src/path/split.rs b/crates/nu-command/src/path/split.rs
index 80d86fb998..727e99b024 100644
--- a/crates/nu-command/src/path/split.rs
+++ b/crates/nu-command/src/path/split.rs
@@ -27,7 +27,7 @@ impl Command for SubCommand {
             .category(Category::Path)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Split a path into a list based on the system's path separator."
     }
 
diff --git a/crates/nu-command/src/path/type.rs b/crates/nu-command/src/path/type.rs
index 010fd295ad..81cdaf8cfe 100644
--- a/crates/nu-command/src/path/type.rs
+++ b/crates/nu-command/src/path/type.rs
@@ -31,11 +31,11 @@ impl Command for SubCommand {
             .category(Category::Path)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Get the type of the object a path refers to (e.g., file, dir, symlink)."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"This checks the file system to confirm the path's object type.
 If the path does not exist, null will be returned."#
     }
diff --git a/crates/nu-command/src/platform/ansi/ansi_.rs b/crates/nu-command/src/platform/ansi/ansi_.rs
index 3daed5e157..43fd7d83df 100644
--- a/crates/nu-command/src/platform/ansi/ansi_.rs
+++ b/crates/nu-command/src/platform/ansi/ansi_.rs
@@ -528,11 +528,11 @@ impl Command for AnsiCommand {
         true
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Output ANSI codes to change color and style of text."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "An introduction to what ANSI escape sequences are can be found in the
 \u{1b}]8;;https://en.wikipedia.org/wiki/ANSI_escape_code\u{1b}\\ANSI escape code\u{1b}]8;;\u{1b}\\ Wikipedia page.
 
diff --git a/crates/nu-command/src/platform/ansi/link.rs b/crates/nu-command/src/platform/ansi/link.rs
index b45b365d3f..4e86f76236 100644
--- a/crates/nu-command/src/platform/ansi/link.rs
+++ b/crates/nu-command/src/platform/ansi/link.rs
@@ -35,7 +35,7 @@ impl Command for SubCommand {
             .category(Category::Platform)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Add a link (using OSC 8 escape sequence) to the given string."
     }
 
diff --git a/crates/nu-command/src/platform/ansi/strip.rs b/crates/nu-command/src/platform/ansi/strip.rs
index 4f7f8ea596..5f172c5cdc 100644
--- a/crates/nu-command/src/platform/ansi/strip.rs
+++ b/crates/nu-command/src/platform/ansi/strip.rs
@@ -40,7 +40,7 @@ impl Command for SubCommand {
             .category(Category::Platform)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Strip ANSI escape sequences from a string."
     }
 
diff --git a/crates/nu-command/src/platform/clear.rs b/crates/nu-command/src/platform/clear.rs
index 7dbe79bd22..30c6cc69a5 100644
--- a/crates/nu-command/src/platform/clear.rs
+++ b/crates/nu-command/src/platform/clear.rs
@@ -15,7 +15,7 @@ impl Command for Clear {
         "clear"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Clear the terminal."
     }
 
diff --git a/crates/nu-command/src/platform/input/input_.rs b/crates/nu-command/src/platform/input/input_.rs
index b7f074da0d..cf46b400c0 100644
--- a/crates/nu-command/src/platform/input/input_.rs
+++ b/crates/nu-command/src/platform/input/input_.rs
@@ -18,7 +18,7 @@ impl Command for Input {
         "input"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Get input from the user."
     }
 
diff --git a/crates/nu-command/src/platform/input/input_listen.rs b/crates/nu-command/src/platform/input/input_listen.rs
index 3ab44f2e60..406903f7d9 100644
--- a/crates/nu-command/src/platform/input/input_listen.rs
+++ b/crates/nu-command/src/platform/input/input_listen.rs
@@ -43,11 +43,11 @@ impl Command for InputListen {
             )])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Listen for user interface event."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"There are 5 different type of events: focus, key, mouse, paste, resize. Each will produce a
 corresponding record, distinguished by type field:
 ```
diff --git a/crates/nu-command/src/platform/input/list.rs b/crates/nu-command/src/platform/input/list.rs
index 37f16e75d7..7d9761f296 100644
--- a/crates/nu-command/src/platform/input/list.rs
+++ b/crates/nu-command/src/platform/input/list.rs
@@ -54,11 +54,11 @@ impl Command for InputList {
             .category(Category::Platform)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Interactive list selection."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "Abort with esc or q."
     }
 
diff --git a/crates/nu-command/src/platform/is_terminal.rs b/crates/nu-command/src/platform/is_terminal.rs
index 2195f3ff8a..79cb27f188 100644
--- a/crates/nu-command/src/platform/is_terminal.rs
+++ b/crates/nu-command/src/platform/is_terminal.rs
@@ -18,7 +18,7 @@ impl Command for IsTerminal {
             .category(Category::Platform)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Check if stdin, stdout, or stderr is a terminal."
     }
 
diff --git a/crates/nu-command/src/platform/kill.rs b/crates/nu-command/src/platform/kill.rs
index 1cf6f15f01..06e0be859b 100644
--- a/crates/nu-command/src/platform/kill.rs
+++ b/crates/nu-command/src/platform/kill.rs
@@ -9,7 +9,7 @@ impl Command for Kill {
         "kill"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Kill a process using the process id."
     }
 
diff --git a/crates/nu-command/src/platform/sleep.rs b/crates/nu-command/src/platform/sleep.rs
index 4d5f6ec827..c63de6ae9d 100644
--- a/crates/nu-command/src/platform/sleep.rs
+++ b/crates/nu-command/src/platform/sleep.rs
@@ -15,7 +15,7 @@ impl Command for Sleep {
         "sleep"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Delay for a specified amount of time."
     }
 
diff --git a/crates/nu-command/src/platform/term_size.rs b/crates/nu-command/src/platform/term_size.rs
index 6fad20eb41..a4261dee81 100644
--- a/crates/nu-command/src/platform/term_size.rs
+++ b/crates/nu-command/src/platform/term_size.rs
@@ -9,7 +9,7 @@ impl Command for TermSize {
         "term size"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns a record containing the number of columns (width) and rows (height) of the terminal."
     }
 
diff --git a/crates/nu-command/src/platform/ulimit.rs b/crates/nu-command/src/platform/ulimit.rs
index 6ef2cd2b57..871633efc4 100644
--- a/crates/nu-command/src/platform/ulimit.rs
+++ b/crates/nu-command/src/platform/ulimit.rs
@@ -502,7 +502,7 @@ impl Command for ULimit {
         "ulimit"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Set or get resource usage limits."
     }
 
diff --git a/crates/nu-command/src/platform/whoami.rs b/crates/nu-command/src/platform/whoami.rs
index a1edc1e184..81253070b0 100644
--- a/crates/nu-command/src/platform/whoami.rs
+++ b/crates/nu-command/src/platform/whoami.rs
@@ -8,7 +8,7 @@ impl Command for Whoami {
         "whoami"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Get the current username using uutils/coreutils whoami."
     }
 
diff --git a/crates/nu-command/src/random/binary.rs b/crates/nu-command/src/random/binary.rs
index aacab071a8..136afc6e11 100644
--- a/crates/nu-command/src/random/binary.rs
+++ b/crates/nu-command/src/random/binary.rs
@@ -18,7 +18,7 @@ impl Command for SubCommand {
             .category(Category::Random)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Generate random bytes."
     }
 
diff --git a/crates/nu-command/src/random/bool.rs b/crates/nu-command/src/random/bool.rs
index 6c78516ed6..a2f13d337c 100644
--- a/crates/nu-command/src/random/bool.rs
+++ b/crates/nu-command/src/random/bool.rs
@@ -23,7 +23,7 @@ impl Command for SubCommand {
             .category(Category::Random)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Generate a random boolean value."
     }
 
diff --git a/crates/nu-command/src/random/chars.rs b/crates/nu-command/src/random/chars.rs
index aea27129b9..e2a1282f9e 100644
--- a/crates/nu-command/src/random/chars.rs
+++ b/crates/nu-command/src/random/chars.rs
@@ -28,7 +28,7 @@ impl Command for SubCommand {
             .category(Category::Random)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Generate random chars uniformly distributed over ASCII letters and numbers: a-z, A-Z and 0-9."
     }
 
diff --git a/crates/nu-command/src/random/dice.rs b/crates/nu-command/src/random/dice.rs
index 5e3a1b98b6..b11eb59e3e 100644
--- a/crates/nu-command/src/random/dice.rs
+++ b/crates/nu-command/src/random/dice.rs
@@ -29,7 +29,7 @@ impl Command for SubCommand {
             .category(Category::Random)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Generate a random dice roll."
     }
 
diff --git a/crates/nu-command/src/random/float.rs b/crates/nu-command/src/random/float.rs
index c34e468600..ad2c39e069 100644
--- a/crates/nu-command/src/random/float.rs
+++ b/crates/nu-command/src/random/float.rs
@@ -19,7 +19,7 @@ impl Command for SubCommand {
             .category(Category::Random)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Generate a random float within a range [min..max]."
     }
 
diff --git a/crates/nu-command/src/random/int.rs b/crates/nu-command/src/random/int.rs
index c04e957bf4..461ed2090c 100644
--- a/crates/nu-command/src/random/int.rs
+++ b/crates/nu-command/src/random/int.rs
@@ -23,7 +23,7 @@ impl Command for SubCommand {
             .category(Category::Random)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Generate a random integer [min..max]."
     }
 
diff --git a/crates/nu-command/src/random/random_.rs b/crates/nu-command/src/random/random_.rs
index 5cf14d7748..e9159e242a 100644
--- a/crates/nu-command/src/random/random_.rs
+++ b/crates/nu-command/src/random/random_.rs
@@ -14,11 +14,11 @@ impl Command for RandomCommand {
             .input_output_types(vec![(Type::Nothing, Type::String)])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Generate a random value."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "You must use one of the following subcommands. Using this command as-is will only produce this help message."
     }
 
diff --git a/crates/nu-command/src/random/uuid.rs b/crates/nu-command/src/random/uuid.rs
index c8d8d638b9..97f57f1ae8 100644
--- a/crates/nu-command/src/random/uuid.rs
+++ b/crates/nu-command/src/random/uuid.rs
@@ -16,7 +16,7 @@ impl Command for SubCommand {
             .allow_variants_without_examples(true)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Generate a random uuid4 string."
     }
 
diff --git a/crates/nu-command/src/removed/format.rs b/crates/nu-command/src/removed/format.rs
index fb2b50cd39..84083b037b 100644
--- a/crates/nu-command/src/removed/format.rs
+++ b/crates/nu-command/src/removed/format.rs
@@ -24,7 +24,7 @@ impl Command for SubCommand {
             .category(Category::Removed)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Removed command: use `format date` instead."
     }
 
diff --git a/crates/nu-command/src/removed/let_env.rs b/crates/nu-command/src/removed/let_env.rs
index a7e3de594c..07c73f06b6 100644
--- a/crates/nu-command/src/removed/let_env.rs
+++ b/crates/nu-command/src/removed/let_env.rs
@@ -21,7 +21,7 @@ impl Command for LetEnv {
             .category(Category::Removed)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "`let-env FOO = ...` has been removed, use `$env.FOO = ...` instead."
     }
 
diff --git a/crates/nu-command/src/shells/exit.rs b/crates/nu-command/src/shells/exit.rs
index 018c519ef7..68494e52ef 100644
--- a/crates/nu-command/src/shells/exit.rs
+++ b/crates/nu-command/src/shells/exit.rs
@@ -19,7 +19,7 @@ impl Command for Exit {
             .category(Category::Shells)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Exit Nu."
     }
 
diff --git a/crates/nu-command/src/stor/create.rs b/crates/nu-command/src/stor/create.rs
index 1e1219889d..37cc57ce6c 100644
--- a/crates/nu-command/src/stor/create.rs
+++ b/crates/nu-command/src/stor/create.rs
@@ -28,7 +28,7 @@ impl Command for StorCreate {
             .category(Category::Database)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Create a table in the in-memory sqlite database."
     }
 
diff --git a/crates/nu-command/src/stor/delete.rs b/crates/nu-command/src/stor/delete.rs
index 676e0490b0..5605794f11 100644
--- a/crates/nu-command/src/stor/delete.rs
+++ b/crates/nu-command/src/stor/delete.rs
@@ -29,7 +29,7 @@ impl Command for StorDelete {
             .category(Category::Database)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Delete a table or specified rows in the in-memory sqlite database."
     }
 
diff --git a/crates/nu-command/src/stor/export.rs b/crates/nu-command/src/stor/export.rs
index f8255eec49..ab7081c318 100644
--- a/crates/nu-command/src/stor/export.rs
+++ b/crates/nu-command/src/stor/export.rs
@@ -23,7 +23,7 @@ impl Command for StorExport {
             .category(Category::Database)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Export the in-memory sqlite database to a sqlite database file."
     }
 
diff --git a/crates/nu-command/src/stor/import.rs b/crates/nu-command/src/stor/import.rs
index 20b5b64f2d..8f5e99afd6 100644
--- a/crates/nu-command/src/stor/import.rs
+++ b/crates/nu-command/src/stor/import.rs
@@ -23,7 +23,7 @@ impl Command for StorImport {
             .category(Category::Database)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Import a sqlite database file into the in-memory sqlite database."
     }
 
diff --git a/crates/nu-command/src/stor/insert.rs b/crates/nu-command/src/stor/insert.rs
index 0e5c9ec6af..106e4fbffb 100644
--- a/crates/nu-command/src/stor/insert.rs
+++ b/crates/nu-command/src/stor/insert.rs
@@ -33,7 +33,7 @@ impl Command for StorInsert {
             .category(Category::Database)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Insert information into a specified table in the in-memory sqlite database."
     }
 
diff --git a/crates/nu-command/src/stor/open.rs b/crates/nu-command/src/stor/open.rs
index ba0f17c2af..b200d8e86e 100644
--- a/crates/nu-command/src/stor/open.rs
+++ b/crates/nu-command/src/stor/open.rs
@@ -20,7 +20,7 @@ impl Command for StorOpen {
             .category(Category::Database)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Opens the in-memory sqlite database."
     }
 
diff --git a/crates/nu-command/src/stor/reset.rs b/crates/nu-command/src/stor/reset.rs
index ba9e2a9681..dc68a83188 100644
--- a/crates/nu-command/src/stor/reset.rs
+++ b/crates/nu-command/src/stor/reset.rs
@@ -17,7 +17,7 @@ impl Command for StorReset {
             .category(Category::Database)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Reset the in-memory database by dropping all tables."
     }
 
diff --git a/crates/nu-command/src/stor/stor_.rs b/crates/nu-command/src/stor/stor_.rs
index c5bb378c2d..d8224e05ca 100644
--- a/crates/nu-command/src/stor/stor_.rs
+++ b/crates/nu-command/src/stor/stor_.rs
@@ -14,11 +14,11 @@ impl Command for Stor {
             .input_output_types(vec![(Type::Nothing, Type::String)])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Various commands for working with the in-memory sqlite database."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "You must use one of the following subcommands. Using this command as-is will only produce this help message."
     }
 
diff --git a/crates/nu-command/src/stor/update.rs b/crates/nu-command/src/stor/update.rs
index 18cf6f9f0f..a158e0f7d0 100644
--- a/crates/nu-command/src/stor/update.rs
+++ b/crates/nu-command/src/stor/update.rs
@@ -38,7 +38,7 @@ impl Command for StorUpdate {
             .category(Category::Database)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Update information in a specified table in the in-memory sqlite database."
     }
 
diff --git a/crates/nu-command/src/strings/char_.rs b/crates/nu-command/src/strings/char_.rs
index aa987438d2..889efa2c27 100644
--- a/crates/nu-command/src/strings/char_.rs
+++ b/crates/nu-command/src/strings/char_.rs
@@ -193,7 +193,7 @@ impl Command for Char {
         true
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Output special characters (e.g., 'newline')."
     }
 
diff --git a/crates/nu-command/src/strings/detect_columns.rs b/crates/nu-command/src/strings/detect_columns.rs
index 37a7cfe303..23858d9e49 100644
--- a/crates/nu-command/src/strings/detect_columns.rs
+++ b/crates/nu-command/src/strings/detect_columns.rs
@@ -37,7 +37,7 @@ impl Command for DetectColumns {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Attempt to automatically split text into multiple columns."
     }
 
diff --git a/crates/nu-command/src/strings/encode_decode/decode.rs b/crates/nu-command/src/strings/encode_decode/decode.rs
index 20385612f3..99bc1b9681 100644
--- a/crates/nu-command/src/strings/encode_decode/decode.rs
+++ b/crates/nu-command/src/strings/encode_decode/decode.rs
@@ -8,7 +8,7 @@ impl Command for Decode {
         "decode"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Decode bytes into a string."
     }
 
@@ -23,7 +23,7 @@ impl Command for Decode {
             .category(Category::Strings)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"Multiple encodings are supported; here are a few:
 big5, euc-jp, euc-kr, gbk, iso-8859-1, utf-16, cp1252, latin5
 
diff --git a/crates/nu-command/src/strings/encode_decode/decode_base64.rs b/crates/nu-command/src/strings/encode_decode/decode_base64.rs
index cda9de4be8..083c1c8448 100644
--- a/crates/nu-command/src/strings/encode_decode/decode_base64.rs
+++ b/crates/nu-command/src/strings/encode_decode/decode_base64.rs
@@ -40,11 +40,11 @@ impl Command for DecodeBase64 {
             .category(Category::Hash)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Base64 decode a value."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"Will attempt to decode binary payload as an UTF-8 string by default. Use the `--binary(-b)` argument to force binary output."#
     }
 
diff --git a/crates/nu-command/src/strings/encode_decode/encode.rs b/crates/nu-command/src/strings/encode_decode/encode.rs
index b7bebdba80..ed0f7714bb 100644
--- a/crates/nu-command/src/strings/encode_decode/encode.rs
+++ b/crates/nu-command/src/strings/encode_decode/encode.rs
@@ -8,7 +8,7 @@ impl Command for Encode {
         "encode"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         // Note: "Encode a UTF-8 string into other forms" is semantically incorrect because
         // Nushell strings, as abstract values, have no user-facing encoding.
         // (Remember that "encoding" exclusively means "how the characters are
@@ -32,7 +32,7 @@ impl Command for Encode {
             .category(Category::Strings)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"Multiple encodings are supported; here are a few:
 big5, euc-jp, euc-kr, gbk, iso-8859-1, cp1252, latin5
 
diff --git a/crates/nu-command/src/strings/encode_decode/encode_base64.rs b/crates/nu-command/src/strings/encode_decode/encode_base64.rs
index b01530b107..08a9cb5e51 100644
--- a/crates/nu-command/src/strings/encode_decode/encode_base64.rs
+++ b/crates/nu-command/src/strings/encode_decode/encode_base64.rs
@@ -46,7 +46,7 @@ impl Command for EncodeBase64 {
             .category(Category::Hash)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Encode a string or binary value using Base64."
     }
 
diff --git a/crates/nu-command/src/strings/format/date.rs b/crates/nu-command/src/strings/format/date.rs
index dd005b9216..fd398753d7 100644
--- a/crates/nu-command/src/strings/format/date.rs
+++ b/crates/nu-command/src/strings/format/date.rs
@@ -30,7 +30,7 @@ impl Command for FormatDate {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Format a given date using a format string."
     }
 
diff --git a/crates/nu-command/src/strings/format/duration.rs b/crates/nu-command/src/strings/format/duration.rs
index fbbe192048..c713f64a6f 100644
--- a/crates/nu-command/src/strings/format/duration.rs
+++ b/crates/nu-command/src/strings/format/duration.rs
@@ -45,7 +45,7 @@ impl Command for FormatDuration {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Outputs duration with a specified unit of time."
     }
 
diff --git a/crates/nu-command/src/strings/format/filesize.rs b/crates/nu-command/src/strings/format/filesize.rs
index 63865ac2ac..d6f898fee8 100644
--- a/crates/nu-command/src/strings/format/filesize.rs
+++ b/crates/nu-command/src/strings/format/filesize.rs
@@ -42,7 +42,7 @@ impl Command for FormatFilesize {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Converts a column of filesizes to some specified format."
     }
 
diff --git a/crates/nu-command/src/strings/format/format_.rs b/crates/nu-command/src/strings/format/format_.rs
index 21b46a8b05..72554f18e7 100644
--- a/crates/nu-command/src/strings/format/format_.rs
+++ b/crates/nu-command/src/strings/format/format_.rs
@@ -14,11 +14,11 @@ impl Command for Format {
             .input_output_types(vec![(Type::Nothing, Type::String)])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Various commands for formatting data."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "You must use one of the following subcommands. Using this command as-is will only produce this help message."
     }
 
diff --git a/crates/nu-command/src/strings/parse.rs b/crates/nu-command/src/strings/parse.rs
index 86b27aecbc..b7e546007a 100644
--- a/crates/nu-command/src/strings/parse.rs
+++ b/crates/nu-command/src/strings/parse.rs
@@ -11,7 +11,7 @@ impl Command for Parse {
         "parse"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Parse columns from string data using a simple pattern or a supplied regular expression."
     }
 
@@ -19,7 +19,7 @@ impl Command for Parse {
         vec!["pattern", "match", "regex", "str extract"]
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "The parse command always uses regular expressions even when you use a simple pattern. If a simple pattern is supplied, parse will transform that pattern into a regular expression."
     }
 
diff --git a/crates/nu-command/src/strings/split/chars.rs b/crates/nu-command/src/strings/split/chars.rs
index 370df262ea..ac71121645 100644
--- a/crates/nu-command/src/strings/split/chars.rs
+++ b/crates/nu-command/src/strings/split/chars.rs
@@ -30,7 +30,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Split a string into a list of characters."
     }
 
diff --git a/crates/nu-command/src/strings/split/column.rs b/crates/nu-command/src/strings/split/column.rs
index 540cfabe54..4a9a96a8d7 100644
--- a/crates/nu-command/src/strings/split/column.rs
+++ b/crates/nu-command/src/strings/split/column.rs
@@ -35,7 +35,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Split a string into multiple columns using a separator."
     }
 
diff --git a/crates/nu-command/src/strings/split/command.rs b/crates/nu-command/src/strings/split/command.rs
index ff9057eacc..8f76f30a18 100644
--- a/crates/nu-command/src/strings/split/command.rs
+++ b/crates/nu-command/src/strings/split/command.rs
@@ -14,11 +14,11 @@ impl Command for SplitCommand {
             .input_output_types(vec![(Type::Nothing, Type::String)])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Split contents across desired subcommand (like row, column) via the separator."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "You must use one of the following subcommands. Using this command as-is will only produce this help message."
     }
 
diff --git a/crates/nu-command/src/strings/split/list.rs b/crates/nu-command/src/strings/split/list.rs
index eb874841a2..82f7ec730a 100644
--- a/crates/nu-command/src/strings/split/list.rs
+++ b/crates/nu-command/src/strings/split/list.rs
@@ -28,7 +28,7 @@ impl Command for SubCommand {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Split a list into multiple lists using a separator."
     }
 
diff --git a/crates/nu-command/src/strings/split/row.rs b/crates/nu-command/src/strings/split/row.rs
index 1f427a06e0..73da7e6de8 100644
--- a/crates/nu-command/src/strings/split/row.rs
+++ b/crates/nu-command/src/strings/split/row.rs
@@ -35,7 +35,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Split a string into multiple rows using a separator."
     }
 
diff --git a/crates/nu-command/src/strings/split/words.rs b/crates/nu-command/src/strings/split/words.rs
index b95a06f65c..9d392302c2 100644
--- a/crates/nu-command/src/strings/split/words.rs
+++ b/crates/nu-command/src/strings/split/words.rs
@@ -56,7 +56,7 @@ impl Command for SubCommand {
             )
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Split a string's words into separate rows."
     }
 
diff --git a/crates/nu-command/src/strings/str_/case/capitalize.rs b/crates/nu-command/src/strings/str_/case/capitalize.rs
index 862ca127c2..545385a13c 100644
--- a/crates/nu-command/src/strings/str_/case/capitalize.rs
+++ b/crates/nu-command/src/strings/str_/case/capitalize.rs
@@ -28,7 +28,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Capitalize first letter of text."
     }
 
diff --git a/crates/nu-command/src/strings/str_/case/downcase.rs b/crates/nu-command/src/strings/str_/case/downcase.rs
index 0493a663aa..72c6619fc3 100644
--- a/crates/nu-command/src/strings/str_/case/downcase.rs
+++ b/crates/nu-command/src/strings/str_/case/downcase.rs
@@ -28,7 +28,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Make text lowercase."
     }
 
diff --git a/crates/nu-command/src/strings/str_/case/str_.rs b/crates/nu-command/src/strings/str_/case/str_.rs
index fe6cb86324..4ee04ec1e4 100644
--- a/crates/nu-command/src/strings/str_/case/str_.rs
+++ b/crates/nu-command/src/strings/str_/case/str_.rs
@@ -14,11 +14,11 @@ impl Command for Str {
             .input_output_types(vec![(Type::Nothing, Type::String)])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Various commands for working with string data."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "You must use one of the following subcommands. Using this command as-is will only produce this help message."
     }
 
diff --git a/crates/nu-command/src/strings/str_/case/upcase.rs b/crates/nu-command/src/strings/str_/case/upcase.rs
index 557239ec91..0fe46ce4e7 100644
--- a/crates/nu-command/src/strings/str_/case/upcase.rs
+++ b/crates/nu-command/src/strings/str_/case/upcase.rs
@@ -28,7 +28,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Make text uppercase."
     }
 
diff --git a/crates/nu-command/src/strings/str_/contains.rs b/crates/nu-command/src/strings/str_/contains.rs
index 27d8a8e313..e64ed8c72b 100644
--- a/crates/nu-command/src/strings/str_/contains.rs
+++ b/crates/nu-command/src/strings/str_/contains.rs
@@ -42,7 +42,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Checks if string input contains a substring."
     }
 
diff --git a/crates/nu-command/src/strings/str_/deunicode.rs b/crates/nu-command/src/strings/str_/deunicode.rs
index ef732571f9..48423c2be1 100644
--- a/crates/nu-command/src/strings/str_/deunicode.rs
+++ b/crates/nu-command/src/strings/str_/deunicode.rs
@@ -17,7 +17,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert Unicode string to pure ASCII."
     }
 
diff --git a/crates/nu-command/src/strings/str_/distance.rs b/crates/nu-command/src/strings/str_/distance.rs
index 9b88f8e3e0..ce54abcbe4 100644
--- a/crates/nu-command/src/strings/str_/distance.rs
+++ b/crates/nu-command/src/strings/str_/distance.rs
@@ -41,7 +41,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Compare two strings and return the edit distance/Levenshtein distance."
     }
 
diff --git a/crates/nu-command/src/strings/str_/ends_with.rs b/crates/nu-command/src/strings/str_/ends_with.rs
index d4841b74e0..bb70a919e8 100644
--- a/crates/nu-command/src/strings/str_/ends_with.rs
+++ b/crates/nu-command/src/strings/str_/ends_with.rs
@@ -42,7 +42,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Check if an input ends with a string."
     }
 
diff --git a/crates/nu-command/src/strings/str_/expand.rs b/crates/nu-command/src/strings/str_/expand.rs
index b9759ef6a1..985c7fa57d 100644
--- a/crates/nu-command/src/strings/str_/expand.rs
+++ b/crates/nu-command/src/strings/str_/expand.rs
@@ -8,11 +8,11 @@ impl Command for SubCommand {
         "str expand"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Generates all possible combinations defined in brace expansion syntax."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "This syntax may seem familiar with `glob {A,B}.C`. The difference is glob relies on filesystem, but str expand is not. Inside braces, we put variants. Then basically we're creating all possible outcomes."
     }
 
diff --git a/crates/nu-command/src/strings/str_/index_of.rs b/crates/nu-command/src/strings/str_/index_of.rs
index a6b06ef9b7..eace6c0494 100644
--- a/crates/nu-command/src/strings/str_/index_of.rs
+++ b/crates/nu-command/src/strings/str_/index_of.rs
@@ -64,7 +64,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns start index of first occurrence of string in input, or -1 if no match."
     }
 
diff --git a/crates/nu-command/src/strings/str_/join.rs b/crates/nu-command/src/strings/str_/join.rs
index d297ea4cbc..e40ffb9417 100644
--- a/crates/nu-command/src/strings/str_/join.rs
+++ b/crates/nu-command/src/strings/str_/join.rs
@@ -26,7 +26,7 @@ impl Command for StrJoin {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Concatenate multiple strings into a single string, with an optional separator between each."
     }
 
diff --git a/crates/nu-command/src/strings/str_/length.rs b/crates/nu-command/src/strings/str_/length.rs
index ab0ba8db49..ca1313e710 100644
--- a/crates/nu-command/src/strings/str_/length.rs
+++ b/crates/nu-command/src/strings/str_/length.rs
@@ -50,7 +50,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Output the length of any strings in the pipeline."
     }
 
diff --git a/crates/nu-command/src/strings/str_/replace.rs b/crates/nu-command/src/strings/str_/replace.rs
index 342dd0693e..c15d0003aa 100644
--- a/crates/nu-command/src/strings/str_/replace.rs
+++ b/crates/nu-command/src/strings/str_/replace.rs
@@ -65,7 +65,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Find and replace text."
     }
 
diff --git a/crates/nu-command/src/strings/str_/reverse.rs b/crates/nu-command/src/strings/str_/reverse.rs
index 9a339f7bcc..310efed854 100644
--- a/crates/nu-command/src/strings/str_/reverse.rs
+++ b/crates/nu-command/src/strings/str_/reverse.rs
@@ -29,7 +29,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Reverse every string in the pipeline."
     }
 
diff --git a/crates/nu-command/src/strings/str_/starts_with.rs b/crates/nu-command/src/strings/str_/starts_with.rs
index bac451466c..fecf560519 100644
--- a/crates/nu-command/src/strings/str_/starts_with.rs
+++ b/crates/nu-command/src/strings/str_/starts_with.rs
@@ -43,7 +43,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Check if an input starts with a string."
     }
 
diff --git a/crates/nu-command/src/strings/str_/stats.rs b/crates/nu-command/src/strings/str_/stats.rs
index eb091ae4f6..48d9f95daf 100644
--- a/crates/nu-command/src/strings/str_/stats.rs
+++ b/crates/nu-command/src/strings/str_/stats.rs
@@ -22,7 +22,7 @@ impl Command for SubCommand {
             .input_output_types(vec![(Type::String, Type::record())])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Gather word count statistics on the text."
     }
 
diff --git a/crates/nu-command/src/strings/str_/substring.rs b/crates/nu-command/src/strings/str_/substring.rs
index 10464580c7..58f32391fa 100644
--- a/crates/nu-command/src/strings/str_/substring.rs
+++ b/crates/nu-command/src/strings/str_/substring.rs
@@ -68,7 +68,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Get part of a string. Note that the first character of a string is index 0."
     }
 
diff --git a/crates/nu-command/src/strings/str_/trim/trim_.rs b/crates/nu-command/src/strings/str_/trim/trim_.rs
index 76d886a010..71e4359f78 100644
--- a/crates/nu-command/src/strings/str_/trim/trim_.rs
+++ b/crates/nu-command/src/strings/str_/trim/trim_.rs
@@ -63,7 +63,7 @@ impl Command for SubCommand {
             )
             .category(Category::Strings)
     }
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Trim whitespace or specific character."
     }
 
diff --git a/crates/nu-command/src/system/complete.rs b/crates/nu-command/src/system/complete.rs
index 409cef1f27..948f8acec6 100644
--- a/crates/nu-command/src/system/complete.rs
+++ b/crates/nu-command/src/system/complete.rs
@@ -15,11 +15,11 @@ impl Command for Complete {
             .input_output_types(vec![(Type::Any, Type::record())])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Capture the outputs and exit code from an external piped in command in a nushell table."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"In order to capture stdout, stderr, and exit_code, externally piped in commands need to be wrapped with `do`"#
     }
 
diff --git a/crates/nu-command/src/system/exec.rs b/crates/nu-command/src/system/exec.rs
index 018017cfb2..7bf9daecc9 100644
--- a/crates/nu-command/src/system/exec.rs
+++ b/crates/nu-command/src/system/exec.rs
@@ -16,11 +16,11 @@ impl Command for Exec {
             .category(Category::System)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Execute a command, replacing or exiting the current process, depending on platform."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"On Unix-based systems, the current process is replaced with the command.
 On Windows based systems, Nushell will wait for the command to finish and then exit with the command's exit code."#
     }
diff --git a/crates/nu-command/src/system/nu_check.rs b/crates/nu-command/src/system/nu_check.rs
index c0c29858d5..59982dfaa7 100644
--- a/crates/nu-command/src/system/nu_check.rs
+++ b/crates/nu-command/src/system/nu_check.rs
@@ -25,7 +25,7 @@ impl Command for NuCheck {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Validate and parse input content."
     }
 
diff --git a/crates/nu-command/src/system/ps.rs b/crates/nu-command/src/system/ps.rs
index 02bcabe130..6f39061dab 100644
--- a/crates/nu-command/src/system/ps.rs
+++ b/crates/nu-command/src/system/ps.rs
@@ -26,7 +26,7 @@ impl Command for Ps {
             .category(Category::System)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "View information about system processes."
     }
 
diff --git a/crates/nu-command/src/system/registry_query.rs b/crates/nu-command/src/system/registry_query.rs
index 9b68059ffa..3365a7d440 100644
--- a/crates/nu-command/src/system/registry_query.rs
+++ b/crates/nu-command/src/system/registry_query.rs
@@ -42,11 +42,11 @@ impl Command for RegistryQuery {
             .category(Category::System)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Query the Windows registry."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "Currently supported only on Windows systems."
     }
 
diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index c812280b62..743956250a 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -23,7 +23,7 @@ impl Command for External {
         "run-external"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Runs external command."
     }
 
diff --git a/crates/nu-command/src/system/sys/cpu.rs b/crates/nu-command/src/system/sys/cpu.rs
index d24197bf70..3243478e03 100644
--- a/crates/nu-command/src/system/sys/cpu.rs
+++ b/crates/nu-command/src/system/sys/cpu.rs
@@ -17,7 +17,7 @@ impl Command for SysCpu {
             .input_output_types(vec![(Type::Nothing, Type::table())])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "View information about the system CPUs."
     }
 
diff --git a/crates/nu-command/src/system/sys/disks.rs b/crates/nu-command/src/system/sys/disks.rs
index 0d9ce09db3..5b87acb51c 100644
--- a/crates/nu-command/src/system/sys/disks.rs
+++ b/crates/nu-command/src/system/sys/disks.rs
@@ -17,7 +17,7 @@ impl Command for SysDisks {
             .input_output_types(vec![(Type::Nothing, Type::table())])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "View information about the system disks."
     }
 
diff --git a/crates/nu-command/src/system/sys/host.rs b/crates/nu-command/src/system/sys/host.rs
index 64dd43424d..d74258872f 100644
--- a/crates/nu-command/src/system/sys/host.rs
+++ b/crates/nu-command/src/system/sys/host.rs
@@ -18,7 +18,7 @@ impl Command for SysHost {
             .input_output_types(vec![(Type::Nothing, Type::record())])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "View information about the system host."
     }
 
diff --git a/crates/nu-command/src/system/sys/mem.rs b/crates/nu-command/src/system/sys/mem.rs
index 89527807d7..58ad452755 100644
--- a/crates/nu-command/src/system/sys/mem.rs
+++ b/crates/nu-command/src/system/sys/mem.rs
@@ -16,7 +16,7 @@ impl Command for SysMem {
             .input_output_types(vec![(Type::Nothing, Type::record())])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "View information about the system memory."
     }
 
diff --git a/crates/nu-command/src/system/sys/net.rs b/crates/nu-command/src/system/sys/net.rs
index ef1c595800..ee82f73c61 100644
--- a/crates/nu-command/src/system/sys/net.rs
+++ b/crates/nu-command/src/system/sys/net.rs
@@ -17,7 +17,7 @@ impl Command for SysNet {
             .input_output_types(vec![(Type::Nothing, Type::table())])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "View information about the system network interfaces."
     }
 
diff --git a/crates/nu-command/src/system/sys/sys_.rs b/crates/nu-command/src/system/sys/sys_.rs
index 5369064f50..116df62dcb 100644
--- a/crates/nu-command/src/system/sys/sys_.rs
+++ b/crates/nu-command/src/system/sys/sys_.rs
@@ -15,11 +15,11 @@ impl Command for Sys {
             .input_output_types(vec![(Type::Nothing, Type::record())])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "View information about the system."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "You must use one of the following subcommands. Using this command as-is will only produce this help message."
     }
 
diff --git a/crates/nu-command/src/system/sys/temp.rs b/crates/nu-command/src/system/sys/temp.rs
index 088471f0fd..e743779e84 100644
--- a/crates/nu-command/src/system/sys/temp.rs
+++ b/crates/nu-command/src/system/sys/temp.rs
@@ -16,11 +16,11 @@ impl Command for SysTemp {
             .input_output_types(vec![(Type::Nothing, Type::table())])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "View the temperatures of system components."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "Some system components do not support temperature readings, so this command may return an empty list if no components support temperature."
     }
 
diff --git a/crates/nu-command/src/system/sys/users.rs b/crates/nu-command/src/system/sys/users.rs
index 04d9b9db91..ffc84f05bb 100644
--- a/crates/nu-command/src/system/sys/users.rs
+++ b/crates/nu-command/src/system/sys/users.rs
@@ -16,7 +16,7 @@ impl Command for SysUsers {
             .input_output_types(vec![(Type::Nothing, Type::table())])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "View information about the users on the system."
     }
 
diff --git a/crates/nu-command/src/system/uname.rs b/crates/nu-command/src/system/uname.rs
index 0bcb749f02..47a40b2ec8 100644
--- a/crates/nu-command/src/system/uname.rs
+++ b/crates/nu-command/src/system/uname.rs
@@ -15,7 +15,7 @@ impl Command for UName {
             .category(Category::System)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Print certain system information using uutils/coreutils uname."
     }
 
diff --git a/crates/nu-command/src/system/which_.rs b/crates/nu-command/src/system/which_.rs
index fd5b0beb18..a386590605 100644
--- a/crates/nu-command/src/system/which_.rs
+++ b/crates/nu-command/src/system/which_.rs
@@ -20,7 +20,7 @@ impl Command for Which {
             .category(Category::System)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Finds a program file, alias or custom command."
     }
 
diff --git a/crates/nu-command/src/viewers/griddle.rs b/crates/nu-command/src/viewers/griddle.rs
index c3e003be39..4c26514c1b 100644
--- a/crates/nu-command/src/viewers/griddle.rs
+++ b/crates/nu-command/src/viewers/griddle.rs
@@ -16,7 +16,7 @@ impl Command for Griddle {
         "grid"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Renders the output to a textual terminal grid."
     }
 
@@ -42,7 +42,7 @@ impl Command for Griddle {
             .category(Category::Viewers)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"grid was built to give a concise gridded layout for ls. however,
 it determines what to put in the grid by looking for a column named
 'name'. this works great for tables and records but for lists we
diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index e5fdf681f7..7ad15497da 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -45,11 +45,11 @@ impl Command for Table {
         "table"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Render the table."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "If the table contains a column called 'index', this column is used as the table index instead of the usual continuous index."
     }
 
diff --git a/crates/nu-command/tests/commands/help.rs b/crates/nu-command/tests/commands/help.rs
index 26e4a92b26..10b3bf6999 100644
--- a/crates/nu-command/tests/commands/help.rs
+++ b/crates/nu-command/tests/commands/help.rs
@@ -36,8 +36,8 @@ fn help_aliases() {
 }
 
 #[test]
-fn help_alias_usage_1() {
-    Playground::setup("help_alias_usage_1", |dirs, sandbox| {
+fn help_alias_description_1() {
+    Playground::setup("help_alias_description_1", |dirs, sandbox| {
         sandbox.with_files(&[FileWithContent(
             "spam.nu",
             r#"
@@ -48,7 +48,7 @@ fn help_alias_usage_1() {
 
         let code = &[
             "source spam.nu",
-            "help aliases | where name == SPAM | get 0.usage",
+            "help aliases | where name == SPAM | get 0.description",
         ];
         let actual = nu!(cwd: dirs.test(), nu_repl_code(code));
 
@@ -57,10 +57,10 @@ fn help_alias_usage_1() {
 }
 
 #[test]
-fn help_alias_usage_2() {
+fn help_alias_description_2() {
     let code = &[
         "alias SPAM = print 'spam'  # line2",
-        "help aliases | where name == SPAM | get 0.usage",
+        "help aliases | where name == SPAM | get 0.description",
     ];
     let actual = nu!(nu_repl_code(code));
 
@@ -68,8 +68,8 @@ fn help_alias_usage_2() {
 }
 
 #[test]
-fn help_alias_usage_3() {
-    Playground::setup("help_alias_usage_3", |dirs, sandbox| {
+fn help_alias_description_3() {
+    Playground::setup("help_alias_description_3", |dirs, sandbox| {
         sandbox.with_files(&[FileWithContent(
             "spam.nu",
             r#"
@@ -80,7 +80,7 @@ fn help_alias_usage_3() {
 
         let code = &[
             "source spam.nu",
-            "help aliases | where name == SPAM | get 0.usage",
+            "help aliases | where name == SPAM | get 0.description",
         ];
         let actual = nu!(cwd: dirs.test(), nu_repl_code(code));
 
@@ -121,7 +121,7 @@ fn help_alias_name_f() {
             "#,
         )]);
 
-        let code = &["source spam.nu", "help aliases -f SPAM | get 0.usage"];
+        let code = &["source spam.nu", "help aliases -f SPAM | get 0.description"];
         let actual = nu!(cwd: dirs.test(), nu_repl_code(code));
 
         assert!(actual.out.contains("line1"));
@@ -172,8 +172,8 @@ fn help_export_alias_name_multi_word() {
 }
 
 #[test]
-fn help_module_usage_1() {
-    Playground::setup("help_module_usage", |dirs, sandbox| {
+fn help_module_description_1() {
+    Playground::setup("help_module_description", |dirs, sandbox| {
         sandbox.with_files(&[FileWithContent(
             "spam.nu",
             r#"
@@ -186,7 +186,7 @@ fn help_module_usage_1() {
 
         let code = &[
             "source spam.nu",
-            "help modules | where name == SPAM | get 0.usage",
+            "help modules | where name == SPAM | get 0.description",
         ];
         let actual = nu!(cwd: dirs.test(), nu_repl_code(code));
 
@@ -260,11 +260,13 @@ fn help_module_sorted_aliases() {
 }
 
 #[test]
-fn help_usage_extra_usage_command() {
-    Playground::setup("help_usage_extra_usage_command", |dirs, sandbox| {
-        sandbox.with_files(&[FileWithContent(
-            "spam.nu",
-            r#"
+fn help_description_extra_description_command() {
+    Playground::setup(
+        "help_description_extra_description_command",
+        |dirs, sandbox| {
+            sandbox.with_files(&[FileWithContent(
+                "spam.nu",
+                r#"
                 # module_line1
                 #
                 # module_line2
@@ -274,34 +276,37 @@ fn help_usage_extra_usage_command() {
                 # def_line2
                 export def foo [] {}
             "#,
-        )]);
+            )]);
 
-        let actual = nu!(cwd: dirs.test(), "use spam.nu *; help modules spam");
-        assert!(actual.out.contains("module_line1"));
-        assert!(actual.out.contains("module_line2"));
+            let actual = nu!(cwd: dirs.test(), "use spam.nu *; help modules spam");
+            assert!(actual.out.contains("module_line1"));
+            assert!(actual.out.contains("module_line2"));
 
-        let actual = nu!(cwd: dirs.test(),
-            "use spam.nu *; help modules | where name == spam | get 0.usage");
-        assert!(actual.out.contains("module_line1"));
-        assert!(!actual.out.contains("module_line2"));
+            let actual = nu!(cwd: dirs.test(),
+            "use spam.nu *; help modules | where name == spam | get 0.description");
+            assert!(actual.out.contains("module_line1"));
+            assert!(!actual.out.contains("module_line2"));
 
-        let actual = nu!(cwd: dirs.test(), "use spam.nu *; help commands foo");
-        assert!(actual.out.contains("def_line1"));
-        assert!(actual.out.contains("def_line2"));
+            let actual = nu!(cwd: dirs.test(), "use spam.nu *; help commands foo");
+            assert!(actual.out.contains("def_line1"));
+            assert!(actual.out.contains("def_line2"));
 
-        let actual = nu!(cwd: dirs.test(),
-            "use spam.nu *; help commands | where name == foo | get 0.usage");
-        assert!(actual.out.contains("def_line1"));
-        assert!(!actual.out.contains("def_line2"));
-    })
+            let actual = nu!(cwd: dirs.test(),
+            "use spam.nu *; help commands | where name == foo | get 0.description");
+            assert!(actual.out.contains("def_line1"));
+            assert!(!actual.out.contains("def_line2"));
+        },
+    )
 }
 
 #[test]
-fn help_usage_extra_usage_alias() {
-    Playground::setup("help_usage_extra_usage_alias", |dirs, sandbox| {
-        sandbox.with_files(&[FileWithContent(
-            "spam.nu",
-            r#"
+fn help_description_extra_description_alias() {
+    Playground::setup(
+        "help_description_extra_description_alias",
+        |dirs, sandbox| {
+            sandbox.with_files(&[FileWithContent(
+                "spam.nu",
+                r#"
                 # module_line1
                 #
                 # module_line2
@@ -311,26 +316,27 @@ fn help_usage_extra_usage_alias() {
                 # alias_line2
                 export alias bar = echo 'bar'
             "#,
-        )]);
+            )]);
 
-        let actual = nu!(cwd: dirs.test(), "use spam.nu *; help modules spam");
-        assert!(actual.out.contains("module_line1"));
-        assert!(actual.out.contains("module_line2"));
+            let actual = nu!(cwd: dirs.test(), "use spam.nu *; help modules spam");
+            assert!(actual.out.contains("module_line1"));
+            assert!(actual.out.contains("module_line2"));
 
-        let actual = nu!(cwd: dirs.test(),
-            "use spam.nu *; help modules | where name == spam | get 0.usage");
-        assert!(actual.out.contains("module_line1"));
-        assert!(!actual.out.contains("module_line2"));
+            let actual = nu!(cwd: dirs.test(),
+            "use spam.nu *; help modules | where name == spam | get 0.description");
+            assert!(actual.out.contains("module_line1"));
+            assert!(!actual.out.contains("module_line2"));
 
-        let actual = nu!(cwd: dirs.test(), "use spam.nu *; help aliases bar");
-        assert!(actual.out.contains("alias_line1"));
-        assert!(actual.out.contains("alias_line2"));
+            let actual = nu!(cwd: dirs.test(), "use spam.nu *; help aliases bar");
+            assert!(actual.out.contains("alias_line1"));
+            assert!(actual.out.contains("alias_line2"));
 
-        let actual = nu!(cwd: dirs.test(),
-            "use spam.nu *; help aliases | where name == bar | get 0.usage");
-        assert!(actual.out.contains("alias_line1"));
-        assert!(!actual.out.contains("alias_line2"));
-    })
+            let actual = nu!(cwd: dirs.test(),
+            "use spam.nu *; help aliases | where name == bar | get 0.description");
+            assert!(actual.out.contains("alias_line1"));
+            assert!(!actual.out.contains("alias_line2"));
+        },
+    )
 }
 
 #[test]
diff --git a/crates/nu-command/tests/main.rs b/crates/nu-command/tests/main.rs
index 1039e1a0d7..248151e74a 100644
--- a/crates/nu-command/tests/main.rs
+++ b/crates/nu-command/tests/main.rs
@@ -197,7 +197,7 @@ fn no_search_term_duplicates() {
 }
 
 #[test]
-fn usage_end_period() {
+fn description_end_period() {
     let ctx = crate::create_default_context();
     let decls = ctx.get_decls_sorted(true);
     let mut failures = Vec::new();
@@ -205,22 +205,22 @@ fn usage_end_period() {
     for (name_bytes, decl_id) in decls {
         let cmd = ctx.get_decl(decl_id);
         let cmd_name = String::from_utf8_lossy(&name_bytes);
-        let usage = cmd.usage();
+        let description = cmd.description();
 
-        if !usage.ends_with('.') {
-            failures.push(format!("{cmd_name}: \"{usage}\""));
+        if !description.ends_with('.') {
+            failures.push(format!("{cmd_name}: \"{description}\""));
         }
     }
 
     assert!(
         failures.is_empty(),
-        "Command usage does not end with a period:\n{}",
+        "Command description does not end with a period:\n{}",
         failures.join("\n")
     );
 }
 
 #[test]
-fn usage_start_uppercase() {
+fn description_start_uppercase() {
     let ctx = crate::create_default_context();
     let decls = ctx.get_decls_sorted(true);
     let mut failures = Vec::new();
@@ -228,19 +228,19 @@ fn usage_start_uppercase() {
     for (name_bytes, decl_id) in decls {
         let cmd = ctx.get_decl(decl_id);
         let cmd_name = String::from_utf8_lossy(&name_bytes);
-        let usage = cmd.usage();
+        let description = cmd.description();
 
-        // Check lowercase to allow usage to contain syntax like:
+        // Check lowercase to allow description to contain syntax like:
         //
         // "`$env.FOO = ...`"
-        if usage.starts_with(|u: char| u.is_lowercase()) {
-            failures.push(format!("{cmd_name}: \"{usage}\""));
+        if description.starts_with(|u: char| u.is_lowercase()) {
+            failures.push(format!("{cmd_name}: \"{description}\""));
         }
     }
 
     assert!(
         failures.is_empty(),
-        "Command usage does not start with an uppercase letter:\n{}",
+        "Command description does not start with an uppercase letter:\n{}",
         failures.join("\n")
     );
 }
diff --git a/crates/nu-engine/src/documentation.rs b/crates/nu-engine/src/documentation.rs
index 3d5381dd9d..370b00e3f9 100644
--- a/crates/nu-engine/src/documentation.rs
+++ b/crates/nu-engine/src/documentation.rs
@@ -76,15 +76,15 @@ fn get_documentation(
     let cmd_name = &sig.name;
     let mut long_desc = String::new();
 
-    let usage = &sig.usage;
-    if !usage.is_empty() {
-        long_desc.push_str(usage);
+    let desc = &sig.description;
+    if !desc.is_empty() {
+        long_desc.push_str(desc);
         long_desc.push_str("\n\n");
     }
 
-    let extra_usage = &sig.extra_usage;
-    if !extra_usage.is_empty() {
-        long_desc.push_str(extra_usage);
+    let extra_desc = &sig.extra_description;
+    if !extra_desc.is_empty() {
+        long_desc.push_str(extra_desc);
         long_desc.push_str("\n\n");
     }
 
@@ -118,7 +118,7 @@ fn get_documentation(
         {
             subcommands.push(format!(
                 "  {help_subcolor_one}{}{RESET} - {}",
-                sig.name, sig.usage
+                sig.name, sig.description
             ));
         }
     }
diff --git a/crates/nu-engine/src/scope.rs b/crates/nu-engine/src/scope.rs
index b6a43ca47c..d9650d2c28 100644
--- a/crates/nu-engine/src/scope.rs
+++ b/crates/nu-engine/src/scope.rs
@@ -109,12 +109,12 @@ impl<'e, 's> ScopeData<'e, 's> {
                     "name" => Value::string(String::from_utf8_lossy(command_name), span),
                     "category" => Value::string(signature.category.to_string(), span),
                     "signatures" => self.collect_signatures(&signature, span),
-                    "usage" => Value::string(decl.usage(), span),
+                    "description" => Value::string(decl.description(), span),
                     "examples" => Value::list(examples, span),
                     "type" => Value::string(decl.command_type().to_string(), span),
                     "is_sub" => Value::bool(decl.is_sub(), span),
                     "creates_scope" => Value::bool(signature.creates_scope, span),
-                    "extra_usage" => Value::string(decl.extra_usage(), span),
+                    "extra_description" => Value::string(decl.extra_description(), span),
                     "search_terms" => Value::string(decl.search_terms().join(", "), span),
                     "decl_id" => Value::int(**decl_id as i64, span),
                 };
@@ -332,7 +332,7 @@ impl<'e, 's> ScopeData<'e, 's> {
             if decl.is_known_external() {
                 let record = record! {
                     "name" => Value::string(String::from_utf8_lossy(command_name), span),
-                    "usage" => Value::string(decl.usage(), span),
+                    "description" => Value::string(decl.description(), span),
                     "decl_id" => Value::int(**decl_id as i64, span),
                 };
 
@@ -366,7 +366,7 @@ impl<'e, 's> ScopeData<'e, 's> {
                         record! {
                             "name" => Value::string(String::from_utf8_lossy(&decl_name), span),
                             "expansion" => Value::string(expansion, span),
-                            "usage" => Value::string(alias.usage(), span),
+                            "description" => Value::string(alias.description(), span),
                             "decl_id" => Value::int(decl_id as i64, span),
                             "aliased_decl_id" => aliased_decl_id,
                         },
@@ -470,9 +470,9 @@ impl<'e, 's> ScopeData<'e, 's> {
         sort_rows(&mut export_submodules);
         sort_rows(&mut export_consts);
 
-        let (module_usage, module_extra_usage) = self
+        let (module_desc, module_extra_desc) = self
             .engine_state
-            .build_module_usage(*module_id)
+            .build_module_desc(*module_id)
             .unwrap_or_default();
 
         Value::record(
@@ -484,8 +484,8 @@ impl<'e, 's> ScopeData<'e, 's> {
                 "submodules" => Value::list(export_submodules, span),
                 "constants" => Value::list(export_consts, span),
                 "has_env_block" => Value::bool(module.env_block.is_some(), span),
-                "usage" => Value::string(module_usage, span),
-                "extra_usage" => Value::string(module_extra_usage, span),
+                "description" => Value::string(module_desc, span),
+                "extra_description" => Value::string(module_extra_desc, span),
                 "module_id" => Value::int(*module_id as i64, span),
             },
             span,
diff --git a/crates/nu-explore/src/commands/expand.rs b/crates/nu-explore/src/commands/expand.rs
index 38f92c0b50..8b03b71dc1 100644
--- a/crates/nu-explore/src/commands/expand.rs
+++ b/crates/nu-explore/src/commands/expand.rs
@@ -30,7 +30,7 @@ impl ViewCommand for ExpandCmd {
         Self::NAME
     }
 
-    fn usage(&self) -> &'static str {
+    fn description(&self) -> &'static str {
         ""
     }
 
diff --git a/crates/nu-explore/src/commands/help.rs b/crates/nu-explore/src/commands/help.rs
index 684e713939..721c2924a5 100644
--- a/crates/nu-explore/src/commands/help.rs
+++ b/crates/nu-explore/src/commands/help.rs
@@ -91,7 +91,7 @@ impl ViewCommand for HelpCmd {
         Self::NAME
     }
 
-    fn usage(&self) -> &'static str {
+    fn description(&self) -> &'static str {
         ""
     }
 
diff --git a/crates/nu-explore/src/commands/mod.rs b/crates/nu-explore/src/commands/mod.rs
index a748ddaaa3..8dafd83993 100644
--- a/crates/nu-explore/src/commands/mod.rs
+++ b/crates/nu-explore/src/commands/mod.rs
@@ -24,7 +24,7 @@ pub use table::TableCmd;
 pub trait SimpleCommand {
     fn name(&self) -> &'static str;
 
-    fn usage(&self) -> &'static str;
+    fn description(&self) -> &'static str;
 
     fn parse(&mut self, args: &str) -> Result<()>;
 
@@ -42,7 +42,7 @@ pub trait ViewCommand {
 
     fn name(&self) -> &'static str;
 
-    fn usage(&self) -> &'static str;
+    fn description(&self) -> &'static str;
 
     fn parse(&mut self, args: &str) -> Result<()>;
 
diff --git a/crates/nu-explore/src/commands/nu.rs b/crates/nu-explore/src/commands/nu.rs
index 84e1fb9706..8b5bc71f69 100644
--- a/crates/nu-explore/src/commands/nu.rs
+++ b/crates/nu-explore/src/commands/nu.rs
@@ -33,7 +33,7 @@ impl ViewCommand for NuCmd {
         Self::NAME
     }
 
-    fn usage(&self) -> &'static str {
+    fn description(&self) -> &'static str {
         ""
     }
 
diff --git a/crates/nu-explore/src/commands/quit.rs b/crates/nu-explore/src/commands/quit.rs
index e93a6a2dd1..03c1c18381 100644
--- a/crates/nu-explore/src/commands/quit.rs
+++ b/crates/nu-explore/src/commands/quit.rs
@@ -18,7 +18,7 @@ impl SimpleCommand for QuitCmd {
         Self::NAME
     }
 
-    fn usage(&self) -> &'static str {
+    fn description(&self) -> &'static str {
         ""
     }
 
diff --git a/crates/nu-explore/src/commands/table.rs b/crates/nu-explore/src/commands/table.rs
index 9ab1e39b98..1e4adeb0cb 100644
--- a/crates/nu-explore/src/commands/table.rs
+++ b/crates/nu-explore/src/commands/table.rs
@@ -36,7 +36,7 @@ impl ViewCommand for TableCmd {
         Self::NAME
     }
 
-    fn usage(&self) -> &'static str {
+    fn description(&self) -> &'static str {
         ""
     }
 
diff --git a/crates/nu-explore/src/commands/try.rs b/crates/nu-explore/src/commands/try.rs
index e1290651c8..6694125bab 100644
--- a/crates/nu-explore/src/commands/try.rs
+++ b/crates/nu-explore/src/commands/try.rs
@@ -28,7 +28,7 @@ impl ViewCommand for TryCmd {
         Self::NAME
     }
 
-    fn usage(&self) -> &'static str {
+    fn description(&self) -> &'static str {
         ""
     }
 
diff --git a/crates/nu-explore/src/explore.rs b/crates/nu-explore/src/explore.rs
index 28a3f04a30..3fdd9835d8 100644
--- a/crates/nu-explore/src/explore.rs
+++ b/crates/nu-explore/src/explore.rs
@@ -17,7 +17,7 @@ impl Command for Explore {
         "explore"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Explore acts as a table pager, just like `less` does for text."
     }
 
@@ -47,7 +47,7 @@ impl Command for Explore {
             .category(Category::Viewers)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"Press `:` then `h` to get a help menu."#
     }
 
diff --git a/crates/nu-explore/src/registry/command.rs b/crates/nu-explore/src/registry/command.rs
index 6a3e9a128f..17fcd863f2 100644
--- a/crates/nu-explore/src/registry/command.rs
+++ b/crates/nu-explore/src/registry/command.rs
@@ -65,8 +65,8 @@ where
         self.0.name()
     }
 
-    fn usage(&self) -> &'static str {
-        self.0.usage()
+    fn description(&self) -> &'static str {
+        self.0.description()
     }
 
     fn parse(&mut self, args: &str) -> Result<()> {
diff --git a/crates/nu-lsp/src/lib.rs b/crates/nu-lsp/src/lib.rs
index 6841749fc9..d698b126e0 100644
--- a/crates/nu-lsp/src/lib.rs
+++ b/crates/nu-lsp/src/lib.rs
@@ -353,11 +353,11 @@ impl LanguageServer {
                 let mut description = String::new();
 
                 // First description
-                description.push_str(&format!("{}\n", decl.usage().replace('\r', "")));
+                description.push_str(&format!("{}\n", decl.description().replace('\r', "")));
 
                 // Additional description
-                if !decl.extra_usage().is_empty() {
-                    description.push_str(&format!("\n{}\n", decl.extra_usage()));
+                if !decl.extra_description().is_empty() {
+                    description.push_str(&format!("\n{}\n", decl.extra_description()));
                 }
 
                 // Usage
diff --git a/crates/nu-parser/src/known_external.rs b/crates/nu-parser/src/known_external.rs
index a41cf3a4e8..7ba73f453b 100644
--- a/crates/nu-parser/src/known_external.rs
+++ b/crates/nu-parser/src/known_external.rs
@@ -9,8 +9,8 @@ use nu_protocol::{
 pub struct KnownExternal {
     pub name: String,
     pub signature: Box<Signature>,
-    pub usage: String,
-    pub extra_usage: String,
+    pub description: String,
+    pub extra_description: String,
 }
 
 impl Command for KnownExternal {
@@ -22,8 +22,8 @@ impl Command for KnownExternal {
         *self.signature.clone()
     }
 
-    fn usage(&self) -> &str {
-        &self.usage
+    fn description(&self) -> &str {
+        &self.description
     }
 
     fn command_type(&self) -> CommandType {
diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index b4506e7f7d..b75a57a286 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -371,7 +371,7 @@ pub fn parse_def(
 ) -> (Pipeline, Option<(Vec<u8>, DeclId)>) {
     let spans = &lite_command.parts[..];
 
-    let (usage, extra_usage) = working_set.build_usage(&lite_command.comments);
+    let (desc, extra_desc) = working_set.build_desc(&lite_command.comments);
 
     // Checking that the function is used with the correct name
     // Maybe this is not necessary but it is a sanity check
@@ -599,8 +599,8 @@ pub fn parse_def(
             if !has_wrapped {
                 *signature = signature.add_help();
             }
-            signature.usage = usage;
-            signature.extra_usage = extra_usage;
+            signature.description = desc;
+            signature.extra_description = extra_desc;
             signature.allows_unknown_args = has_wrapped;
 
             *declaration = signature.clone().into_block_command(block_id);
@@ -654,7 +654,7 @@ pub fn parse_extern(
 ) -> Pipeline {
     let spans = &lite_command.parts;
 
-    let (usage, extra_usage) = working_set.build_usage(&lite_command.comments);
+    let (description, extra_description) = working_set.build_desc(&lite_command.comments);
 
     // Checking that the function is used with the correct name
     // Maybe this is not necessary but it is a sanity check
@@ -759,8 +759,8 @@ pub fn parse_extern(
                 };
 
                 signature.name.clone_from(&external_name);
-                signature.usage.clone_from(&usage);
-                signature.extra_usage.clone_from(&extra_usage);
+                signature.description.clone_from(&description);
+                signature.extra_description.clone_from(&extra_description);
                 signature.allows_unknown_args = true;
 
                 if let Some(block_id) = body.and_then(|x| x.as_block()) {
@@ -787,8 +787,8 @@ pub fn parse_extern(
 
                     let decl = KnownExternal {
                         name: external_name,
-                        usage,
-                        extra_usage,
+                        description,
+                        extra_description,
                         signature,
                     };
 
@@ -1052,10 +1052,10 @@ pub fn parse_alias(
                 }
             };
 
-            // Tries to build a useful usage string
-            let (usage, extra_usage) = match lite_command.comments.is_empty() {
+            // Tries to build a useful description string
+            let (description, extra_description) = match lite_command.comments.is_empty() {
                 // First from comments, if any are present
-                false => working_set.build_usage(&lite_command.comments),
+                false => working_set.build_desc(&lite_command.comments),
                 // Then from the command itself
                 true => match alias_call.arguments.get(1) {
                     Some(Argument::Positional(Expression {
@@ -1077,8 +1077,8 @@ pub fn parse_alias(
                 name: alias_name,
                 command,
                 wrapped_call,
-                usage,
-                extra_usage,
+                description,
+                extra_description,
             };
 
             working_set.add_decl(Box::new(decl));
diff --git a/crates/nu-parser/tests/test_parser.rs b/crates/nu-parser/tests/test_parser.rs
index f72b52b433..ed0a288a47 100644
--- a/crates/nu-parser/tests/test_parser.rs
+++ b/crates/nu-parser/tests/test_parser.rs
@@ -16,7 +16,7 @@ impl Command for Let {
         "let"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Create a variable and give it a value."
     }
 
@@ -51,7 +51,7 @@ impl Command for Mut {
         "mut"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Mock mut command."
     }
 
@@ -84,7 +84,7 @@ impl Command for ToCustom {
         "to-custom"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Mock converter command."
     }
 
@@ -1903,7 +1903,7 @@ mod input_types {
             "ls"
         }
 
-        fn usage(&self) -> &str {
+        fn description(&self) -> &str {
             "Mock ls command."
         }
 
@@ -1930,7 +1930,7 @@ mod input_types {
             "def"
         }
 
-        fn usage(&self) -> &str {
+        fn description(&self) -> &str {
             "Mock def command."
         }
 
@@ -1962,7 +1962,7 @@ mod input_types {
             "group-by"
         }
 
-        fn usage(&self) -> &str {
+        fn description(&self) -> &str {
             "Mock group-by command."
         }
 
@@ -1983,6 +1983,35 @@ mod input_types {
         }
     }
 
+    #[derive(Clone)]
+    pub struct ToCustom;
+
+    impl Command for ToCustom {
+        fn name(&self) -> &str {
+            "to-custom"
+        }
+
+        fn description(&self) -> &str {
+            "Mock converter command."
+        }
+
+        fn signature(&self) -> nu_protocol::Signature {
+            Signature::build(self.name())
+                .input_output_type(Type::Any, Type::Custom("custom".into()))
+                .category(Category::Custom("custom".into()))
+        }
+
+        fn run(
+            &self,
+            _engine_state: &EngineState,
+            _stack: &mut Stack,
+            _call: &Call,
+            _input: PipelineData,
+        ) -> Result<PipelineData, ShellError> {
+            todo!()
+        }
+    }
+
     #[derive(Clone)]
     pub struct GroupByCustom;
 
@@ -1991,7 +2020,7 @@ mod input_types {
             "group-by"
         }
 
-        fn usage(&self) -> &str {
+        fn description(&self) -> &str {
             "Mock custom group-by command."
         }
 
@@ -2022,7 +2051,7 @@ mod input_types {
             "agg"
         }
 
-        fn usage(&self) -> &str {
+        fn description(&self) -> &str {
             "Mock custom agg command."
         }
 
@@ -2052,7 +2081,7 @@ mod input_types {
             "min"
         }
 
-        fn usage(&self) -> &str {
+        fn description(&self) -> &str {
             "Mock custom min command."
         }
 
@@ -2079,7 +2108,7 @@ mod input_types {
             "with-column"
         }
 
-        fn usage(&self) -> &str {
+        fn description(&self) -> &str {
             "Mock custom with-column command."
         }
 
@@ -2109,7 +2138,7 @@ mod input_types {
             "collect"
         }
 
-        fn usage(&self) -> &str {
+        fn description(&self) -> &str {
             "Mock custom collect command."
         }
 
@@ -2138,7 +2167,7 @@ mod input_types {
             "if"
         }
 
-        fn usage(&self) -> &str {
+        fn description(&self) -> &str {
             "Mock if command."
         }
 
diff --git a/crates/nu-plugin-core/src/serializers/tests.rs b/crates/nu-plugin-core/src/serializers/tests.rs
index 5d0c07cceb..b27f852ee4 100644
--- a/crates/nu-plugin-core/src/serializers/tests.rs
+++ b/crates/nu-plugin-core/src/serializers/tests.rs
@@ -254,10 +254,13 @@ macro_rules! generate_tests {
                 ) => {
                     assert_eq!(returned_signature.len(), 1);
                     assert_eq!(signature.sig.name, returned_signature[0].sig.name);
-                    assert_eq!(signature.sig.usage, returned_signature[0].sig.usage);
                     assert_eq!(
-                        signature.sig.extra_usage,
-                        returned_signature[0].sig.extra_usage
+                        signature.sig.description,
+                        returned_signature[0].sig.description
+                    );
+                    assert_eq!(
+                        signature.sig.extra_description,
+                        returned_signature[0].sig.extra_description
                     );
                     assert_eq!(signature.sig.is_filter, returned_signature[0].sig.is_filter);
 
diff --git a/crates/nu-plugin-engine/src/declaration.rs b/crates/nu-plugin-engine/src/declaration.rs
index 745ba9a998..987835823f 100644
--- a/crates/nu-plugin-engine/src/declaration.rs
+++ b/crates/nu-plugin-engine/src/declaration.rs
@@ -32,12 +32,12 @@ impl Command for PluginDeclaration {
         self.signature.sig.clone()
     }
 
-    fn usage(&self) -> &str {
-        self.signature.sig.usage.as_str()
+    fn description(&self) -> &str {
+        self.signature.sig.description.as_str()
     }
 
-    fn extra_usage(&self) -> &str {
-        self.signature.sig.extra_usage.as_str()
+    fn extra_description(&self) -> &str {
+        self.signature.sig.extra_description.as_str()
     }
 
     fn search_terms(&self) -> Vec<&str> {
diff --git a/crates/nu-plugin-test-support/src/lib.rs b/crates/nu-plugin-test-support/src/lib.rs
index 998c31ac0d..14e6acd9b7 100644
--- a/crates/nu-plugin-test-support/src/lib.rs
+++ b/crates/nu-plugin-test-support/src/lib.rs
@@ -22,7 +22,7 @@
 //!         "lowercase"
 //!     }
 //!
-//!     fn usage(&self) -> &str {
+//!     fn description(&self) -> &str {
 //!         "Convert each string in a stream to lowercase"
 //!     }
 //!
diff --git a/crates/nu-plugin-test-support/tests/custom_value/mod.rs b/crates/nu-plugin-test-support/tests/custom_value/mod.rs
index 888f05c1cb..3547b986e7 100644
--- a/crates/nu-plugin-test-support/tests/custom_value/mod.rs
+++ b/crates/nu-plugin-test-support/tests/custom_value/mod.rs
@@ -69,7 +69,7 @@ impl SimplePluginCommand for IntoU32 {
         "into u32"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert a number to a 32-bit unsigned integer"
     }
 
@@ -108,7 +108,7 @@ impl SimplePluginCommand for IntoIntFromU32 {
         "into int from u32"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Turn a u32 back into a number"
     }
 
diff --git a/crates/nu-plugin-test-support/tests/hello/mod.rs b/crates/nu-plugin-test-support/tests/hello/mod.rs
index a222637a76..b7e7474300 100644
--- a/crates/nu-plugin-test-support/tests/hello/mod.rs
+++ b/crates/nu-plugin-test-support/tests/hello/mod.rs
@@ -24,7 +24,7 @@ impl SimplePluginCommand for Hello {
         "hello"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Print a friendly greeting"
     }
 
diff --git a/crates/nu-plugin-test-support/tests/lowercase/mod.rs b/crates/nu-plugin-test-support/tests/lowercase/mod.rs
index 5be127e7f5..0147ebb4d9 100644
--- a/crates/nu-plugin-test-support/tests/lowercase/mod.rs
+++ b/crates/nu-plugin-test-support/tests/lowercase/mod.rs
@@ -15,7 +15,7 @@ impl PluginCommand for Lowercase {
         "lowercase"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert each string in a stream to lowercase"
     }
 
diff --git a/crates/nu-plugin/src/lib.rs b/crates/nu-plugin/src/lib.rs
index 4c1a033a02..98b88e1359 100644
--- a/crates/nu-plugin/src/lib.rs
+++ b/crates/nu-plugin/src/lib.rs
@@ -40,7 +40,7 @@
 //!         "my-command"
 //!     }
 //!
-//!     fn usage(&self) -> &str {
+//!     fn description(&self) -> &str {
 //!         todo!();
 //!     }
 //!
diff --git a/crates/nu-plugin/src/plugin/command.rs b/crates/nu-plugin/src/plugin/command.rs
index 8e8adc9578..d40005fa52 100644
--- a/crates/nu-plugin/src/plugin/command.rs
+++ b/crates/nu-plugin/src/plugin/command.rs
@@ -33,7 +33,7 @@ use crate::{EngineInterface, EvaluatedCall, Plugin};
 ///         "lowercase"
 ///     }
 ///
-///     fn usage(&self) -> &str {
+///     fn description(&self) -> &str {
 ///         "Convert each string in a stream to lowercase"
 ///     }
 ///
@@ -92,14 +92,14 @@ pub trait PluginCommand: Sync {
     /// A brief description of usage for the command.
     ///
     /// This should be short enough to fit in completion menus.
-    fn usage(&self) -> &str;
+    fn description(&self) -> &str;
 
     /// Additional documentation for usage of the command.
     ///
     /// This is optional - any arguments documented by [`.signature()`](Self::signature) will be
     /// shown in the help page automatically. However, this can be useful for explaining things that
-    /// would be too brief to include in [`.usage()`](Self::usage) and may span multiple lines.
-    fn extra_usage(&self) -> &str {
+    /// would be too brief to include in [`.description()`](Self::description) and may span multiple lines.
+    fn extra_description(&self) -> &str {
         ""
     }
 
@@ -177,7 +177,7 @@ pub trait PluginCommand: Sync {
 ///         "hello"
 ///     }
 ///
-///     fn usage(&self) -> &str {
+///     fn description(&self) -> &str {
 ///         "Every programmer's favorite greeting"
 ///     }
 ///
@@ -230,14 +230,14 @@ pub trait SimplePluginCommand: Sync {
     /// A brief description of usage for the command.
     ///
     /// This should be short enough to fit in completion menus.
-    fn usage(&self) -> &str;
+    fn description(&self) -> &str;
 
     /// Additional documentation for usage of the command.
     ///
     /// This is optional - any arguments documented by [`.signature()`] will be shown in the help
     /// page automatically. However, this can be useful for explaining things that would be too
-    /// brief to include in [`.usage()`] and may span multiple lines.
-    fn extra_usage(&self) -> &str {
+    /// brief to include in [`.description()`](Self::description) and may span multiple lines.
+    fn extra_description(&self) -> &str {
         ""
     }
 
@@ -301,8 +301,8 @@ where
         <Self as SimplePluginCommand>::examples(self)
     }
 
-    fn extra_usage(&self) -> &str {
-        <Self as SimplePluginCommand>::extra_usage(self)
+    fn extra_description(&self) -> &str {
+        <Self as SimplePluginCommand>::extra_description(self)
     }
 
     fn name(&self) -> &str {
@@ -333,8 +333,8 @@ where
         <Self as SimplePluginCommand>::signature(self)
     }
 
-    fn usage(&self) -> &str {
-        <Self as SimplePluginCommand>::usage(self)
+    fn description(&self) -> &str {
+        <Self as SimplePluginCommand>::description(self)
     }
 }
 
@@ -349,8 +349,8 @@ pub fn create_plugin_signature(command: &(impl PluginCommand + ?Sized)) -> Plugi
         // Add results of trait methods to signature
         command
             .signature()
-            .usage(command.usage())
-            .extra_usage(command.extra_usage())
+            .description(command.description())
+            .extra_description(command.extra_description())
             .search_terms(
                 command
                     .search_terms()
diff --git a/crates/nu-plugin/src/plugin/mod.rs b/crates/nu-plugin/src/plugin/mod.rs
index 87f95cf7d4..340d55e3b9 100644
--- a/crates/nu-plugin/src/plugin/mod.rs
+++ b/crates/nu-plugin/src/plugin/mod.rs
@@ -69,7 +69,7 @@ pub(crate) const OUTPUT_BUFFER_SIZE: usize = 16384;
 ///         "hello"
 ///     }
 ///
-///     fn usage(&self) -> &str {
+///     fn description(&self) -> &str {
 ///         "Every programmer's favorite greeting"
 ///     }
 ///
@@ -662,10 +662,14 @@ fn print_help(plugin: &impl Plugin, encoder: impl PluginEncoder) {
     plugin.commands().into_iter().for_each(|command| {
         let signature = command.signature();
         let res = write!(help, "\nCommand: {}", command.name())
-            .and_then(|_| writeln!(help, "\nUsage:\n > {}", command.usage()))
+            .and_then(|_| writeln!(help, "\nDescription:\n > {}", command.description()))
             .and_then(|_| {
-                if !command.extra_usage().is_empty() {
-                    writeln!(help, "\nExtra usage:\n > {}", command.extra_usage())
+                if !command.extra_description().is_empty() {
+                    writeln!(
+                        help,
+                        "\nExtra description:\n > {}",
+                        command.extra_description()
+                    )
                 } else {
                     Ok(())
                 }
diff --git a/crates/nu-protocol/src/alias.rs b/crates/nu-protocol/src/alias.rs
index 701543c57b..2da569b8ea 100644
--- a/crates/nu-protocol/src/alias.rs
+++ b/crates/nu-protocol/src/alias.rs
@@ -15,8 +15,8 @@ pub struct Alias {
     /// Wrapped inner [`Command`]. `None` if alias of external call
     pub command: Option<Box<dyn Command>>,
     pub wrapped_call: Expression,
-    pub usage: String,
-    pub extra_usage: String,
+    pub description: String,
+    pub extra_description: String,
 }
 
 impl Command for Alias {
@@ -32,12 +32,12 @@ impl Command for Alias {
         }
     }
 
-    fn usage(&self) -> &str {
-        &self.usage
+    fn description(&self) -> &str {
+        &self.description
     }
 
-    fn extra_usage(&self) -> &str {
-        &self.extra_usage
+    fn extra_description(&self) -> &str {
+        &self.extra_description
     }
 
     fn run(
diff --git a/crates/nu-protocol/src/engine/command.rs b/crates/nu-protocol/src/engine/command.rs
index 48cdc4440d..be80a18bc4 100644
--- a/crates/nu-protocol/src/engine/command.rs
+++ b/crates/nu-protocol/src/engine/command.rs
@@ -31,9 +31,15 @@ pub trait Command: Send + Sync + CommandClone {
 
     fn signature(&self) -> Signature;
 
-    fn usage(&self) -> &str;
+    /// Short preferably single sentence description for the command.
+    ///
+    /// Will be shown with the completions etc.
+    fn description(&self) -> &str;
 
-    fn extra_usage(&self) -> &str {
+    /// Longer documentation description, if necessary.
+    ///
+    /// Will be shown below `description`
+    fn extra_description(&self) -> &str {
         ""
     }
 
diff --git a/crates/nu-protocol/src/engine/usage.rs b/crates/nu-protocol/src/engine/description.rs
similarity index 66%
rename from crates/nu-protocol/src/engine/usage.rs
rename to crates/nu-protocol/src/engine/description.rs
index 76f50d2424..ede82955e1 100644
--- a/crates/nu-protocol/src/engine/usage.rs
+++ b/crates/nu-protocol/src/engine/description.rs
@@ -1,16 +1,16 @@
 use crate::{ModuleId, Span};
 use std::collections::HashMap;
 
-/// Organizes usage messages for various primitives
+/// Organizes documentation comments for various primitives
 #[derive(Debug, Clone)]
-pub(super) struct Usage {
-    // TODO: Move decl usages here
+pub(super) struct Doccomments {
+    // TODO: Move decl doccomments here
     module_comments: HashMap<ModuleId, Vec<Span>>,
 }
 
-impl Usage {
+impl Doccomments {
     pub fn new() -> Self {
-        Usage {
+        Doccomments {
             module_comments: HashMap::new(),
         }
     }
@@ -24,24 +24,24 @@ impl Usage {
     }
 
     /// Overwrite own values with the other
-    pub fn merge_with(&mut self, other: Usage) {
+    pub fn merge_with(&mut self, other: Doccomments) {
         self.module_comments.extend(other.module_comments);
     }
 }
 
-impl Default for Usage {
+impl Default for Doccomments {
     fn default() -> Self {
         Self::new()
     }
 }
 
-pub(super) fn build_usage(comment_lines: &[&[u8]]) -> (String, String) {
-    let mut usage = String::new();
+pub(super) fn build_desc(comment_lines: &[&[u8]]) -> (String, String) {
+    let mut description = String::new();
 
     let mut num_spaces = 0;
     let mut first = true;
 
-    // Use the comments to build the usage
+    // Use the comments to build the item/command description
     for contents in comment_lines {
         let comment_line = if first {
             // Count the number of spaces still at the front, skipping the '#'
@@ -75,17 +75,17 @@ pub(super) fn build_usage(comment_lines: &[&[u8]]) -> (String, String) {
             String::from_utf8_lossy(&contents[pos..]).to_string()
         };
 
-        if !usage.is_empty() {
-            usage.push('\n');
+        if !description.is_empty() {
+            description.push('\n');
         }
-        usage.push_str(&comment_line);
+        description.push_str(&comment_line);
     }
 
-    if let Some((brief_usage, extra_usage)) = usage.split_once("\r\n\r\n") {
-        (brief_usage.to_string(), extra_usage.to_string())
-    } else if let Some((brief_usage, extra_usage)) = usage.split_once("\n\n") {
-        (brief_usage.to_string(), extra_usage.to_string())
+    if let Some((brief_desc, extra_desc)) = description.split_once("\r\n\r\n") {
+        (brief_desc.to_string(), extra_desc.to_string())
+    } else if let Some((brief_desc, extra_desc)) = description.split_once("\n\n") {
+        (brief_desc.to_string(), extra_desc.to_string())
     } else {
-        (usage, String::default())
+        (description, String::default())
     }
 }
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index 405b702c12..cf24a26859 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -2,7 +2,7 @@ use crate::{
     ast::Block,
     debugger::{Debugger, NoopDebugger},
     engine::{
-        usage::{build_usage, Usage},
+        description::{build_desc, Doccomments},
         CachedFile, Command, CommandType, EnvVars, OverlayFrame, ScopeFrame, Stack, StateDelta,
         Variable, Visibility, DEFAULT_OVERLAY_NAME,
     },
@@ -84,7 +84,7 @@ pub struct EngineState {
     pub(super) blocks: Arc<Vec<Arc<Block>>>,
     pub(super) modules: Arc<Vec<Arc<Module>>>,
     pub spans: Vec<Span>,
-    usage: Usage,
+    doccomments: Doccomments,
     pub scope: ScopeFrame,
     signals: Signals,
     pub signal_handlers: Option<Handlers>,
@@ -140,7 +140,7 @@ impl EngineState {
                 DEFAULT_OVERLAY_NAME.as_bytes().to_vec(),
             ))]),
             spans: vec![Span::unknown()],
-            usage: Usage::new(),
+            doccomments: Doccomments::new(),
             // make sure we have some default overlay:
             scope: ScopeFrame::with_empty_overlay(
                 DEFAULT_OVERLAY_NAME.as_bytes().to_vec(),
@@ -209,7 +209,7 @@ impl EngineState {
         self.virtual_paths.extend(delta.virtual_paths);
         self.vars.extend(delta.vars);
         self.spans.extend(delta.spans);
-        self.usage.merge_with(delta.usage);
+        self.doccomments.merge_with(delta.doccomments);
 
         // Avoid potentially cloning the Arcs if we aren't adding anything
         if !delta.decls.is_empty() {
@@ -644,7 +644,7 @@ impl EngineState {
     }
 
     pub fn get_module_comments(&self, module_id: ModuleId) -> Option<&[Span]> {
-        self.usage.get_module_comments(module_id)
+        self.doccomments.get_module_comments(module_id)
     }
 
     #[cfg(feature = "plugin")]
@@ -715,7 +715,7 @@ impl EngineState {
                     }
                     output.push((
                         decl.0.clone(),
-                        Some(command.usage().to_string()),
+                        Some(command.description().to_string()),
                         command.command_type(),
                     ));
                 }
@@ -897,17 +897,17 @@ impl EngineState {
         self.config_path.get(key)
     }
 
-    pub fn build_usage(&self, spans: &[Span]) -> (String, String) {
+    pub fn build_desc(&self, spans: &[Span]) -> (String, String) {
         let comment_lines: Vec<&[u8]> = spans
             .iter()
             .map(|span| self.get_span_contents(*span))
             .collect();
-        build_usage(&comment_lines)
+        build_desc(&comment_lines)
     }
 
-    pub fn build_module_usage(&self, module_id: ModuleId) -> Option<(String, String)> {
+    pub fn build_module_desc(&self, module_id: ModuleId) -> Option<(String, String)> {
         self.get_module_comments(module_id)
-            .map(|comment_spans| self.build_usage(comment_spans))
+            .map(|comment_spans| self.build_desc(comment_spans))
     }
 
     /// Returns the current working directory, which is guaranteed to be canonicalized.
diff --git a/crates/nu-protocol/src/engine/mod.rs b/crates/nu-protocol/src/engine/mod.rs
index 0cf45217ea..e0d523f2f6 100644
--- a/crates/nu-protocol/src/engine/mod.rs
+++ b/crates/nu-protocol/src/engine/mod.rs
@@ -5,6 +5,7 @@ mod call;
 mod call_info;
 mod capture_block;
 mod command;
+mod description;
 mod engine_state;
 mod error_handler;
 mod overlay;
@@ -14,7 +15,6 @@ mod stack;
 mod stack_out_dest;
 mod state_delta;
 mod state_working_set;
-mod usage;
 mod variable;
 
 pub use cached_file::CachedFile;
diff --git a/crates/nu-protocol/src/engine/state_delta.rs b/crates/nu-protocol/src/engine/state_delta.rs
index 44c1b37386..033867e4c0 100644
--- a/crates/nu-protocol/src/engine/state_delta.rs
+++ b/crates/nu-protocol/src/engine/state_delta.rs
@@ -1,8 +1,8 @@
 use crate::{
     ast::Block,
     engine::{
-        usage::Usage, CachedFile, Command, EngineState, OverlayFrame, ScopeFrame, Variable,
-        VirtualPath,
+        description::Doccomments, CachedFile, Command, EngineState, OverlayFrame, ScopeFrame,
+        Variable, VirtualPath,
     },
     Module, Span,
 };
@@ -22,7 +22,7 @@ pub struct StateDelta {
     pub blocks: Vec<Arc<Block>>,             // indexed by BlockId
     pub(super) modules: Vec<Arc<Module>>,    // indexed by ModuleId
     pub spans: Vec<Span>,                    // indexed by SpanId
-    pub(super) usage: Usage,
+    pub(super) doccomments: Doccomments,
     pub scope: Vec<ScopeFrame>,
     #[cfg(feature = "plugin")]
     pub(super) plugins: Vec<Arc<dyn RegisteredPlugin>>,
@@ -48,7 +48,7 @@ impl StateDelta {
             modules: vec![],
             spans: vec![],
             scope: vec![scope_frame],
-            usage: Usage::new(),
+            doccomments: Doccomments::new(),
             #[cfg(feature = "plugin")]
             plugins: vec![],
             #[cfg(feature = "plugin")]
diff --git a/crates/nu-protocol/src/engine/state_working_set.rs b/crates/nu-protocol/src/engine/state_working_set.rs
index 822bf35e3a..2ffcfa023b 100644
--- a/crates/nu-protocol/src/engine/state_working_set.rs
+++ b/crates/nu-protocol/src/engine/state_working_set.rs
@@ -1,7 +1,7 @@
 use crate::{
     ast::Block,
     engine::{
-        usage::build_usage, CachedFile, Command, CommandType, EngineState, OverlayFrame,
+        description::build_desc, CachedFile, Command, CommandType, EngineState, OverlayFrame,
         StateDelta, Variable, VirtualPath, Visibility,
     },
     BlockId, Category, CompileError, Config, DeclId, FileId, GetSpan, Module, ModuleId, ParseError,
@@ -278,7 +278,9 @@ impl<'a> StateWorkingSet<'a> {
         let module_id = self.num_modules() - 1;
 
         if !comments.is_empty() {
-            self.delta.usage.add_module_comments(module_id, comments);
+            self.delta
+                .doccomments
+                .add_module_comments(module_id, comments);
         }
 
         self.last_overlay_mut().modules.insert(name, module_id);
@@ -288,7 +290,7 @@ impl<'a> StateWorkingSet<'a> {
 
     pub fn get_module_comments(&self, module_id: ModuleId) -> Option<&[Span]> {
         self.delta
-            .usage
+            .doccomments
             .get_module_comments(module_id)
             .or_else(|| self.permanent_state.get_module_comments(module_id))
     }
@@ -727,7 +729,7 @@ impl<'a> StateWorkingSet<'a> {
                         }
                         output.push((
                             decl.0.clone(),
-                            Some(command.usage().to_string()),
+                            Some(command.description().to_string()),
                             command.command_type(),
                         ));
                     }
@@ -952,12 +954,12 @@ impl<'a> StateWorkingSet<'a> {
         self.delta
     }
 
-    pub fn build_usage(&self, spans: &[Span]) -> (String, String) {
+    pub fn build_desc(&self, spans: &[Span]) -> (String, String) {
         let comment_lines: Vec<&[u8]> = spans
             .iter()
             .map(|span| self.get_span_contents(*span))
             .collect();
-        build_usage(&comment_lines)
+        build_desc(&comment_lines)
     }
 
     pub fn find_block_by_span(&self, span: Span) -> Option<Arc<Block>> {
diff --git a/crates/nu-protocol/src/plugin/registry_file/tests.rs b/crates/nu-protocol/src/plugin/registry_file/tests.rs
index e264e4463d..d13cdaefa1 100644
--- a/crates/nu-protocol/src/plugin/registry_file/tests.rs
+++ b/crates/nu-protocol/src/plugin/registry_file/tests.rs
@@ -45,7 +45,7 @@ fn bar_plugin() -> PluginRegistryItem {
             },
             commands: vec![PluginSignature {
                 sig: Signature::new("bar")
-                    .usage("overwrites files with random data")
+                    .description("overwrites files with random data")
                     .switch("force", "ignore errors", Some('f'))
                     .required(
                         "path",
diff --git a/crates/nu-protocol/src/signature.rs b/crates/nu-protocol/src/signature.rs
index c67e8a604e..4c5cae9e03 100644
--- a/crates/nu-protocol/src/signature.rs
+++ b/crates/nu-protocol/src/signature.rs
@@ -109,8 +109,8 @@ impl std::fmt::Display for Category {
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct Signature {
     pub name: String,
-    pub usage: String,
-    pub extra_usage: String,
+    pub description: String,
+    pub extra_description: String,
     pub search_terms: Vec<String>,
     pub required_positional: Vec<PositionalArg>,
     pub optional_positional: Vec<PositionalArg>,
@@ -128,7 +128,7 @@ pub struct Signature {
 impl PartialEq for Signature {
     fn eq(&self, other: &Self) -> bool {
         self.name == other.name
-            && self.usage == other.usage
+            && self.description == other.description
             && self.required_positional == other.required_positional
             && self.optional_positional == other.optional_positional
             && self.rest_positional == other.rest_positional
@@ -142,8 +142,8 @@ impl Signature {
     pub fn new(name: impl Into<String>) -> Signature {
         Signature {
             name: name.into(),
-            usage: String::new(),
-            extra_usage: String::new(),
+            description: String::new(),
+            extra_description: String::new(),
             search_terms: vec![],
             required_positional: vec![],
             optional_positional: vec![],
@@ -220,14 +220,19 @@ impl Signature {
     }
 
     /// Add a description to the signature
-    pub fn usage(mut self, msg: impl Into<String>) -> Signature {
-        self.usage = msg.into();
+    ///
+    /// This should be a single sentence as it is the part shown for example in the completion
+    /// menu.
+    pub fn description(mut self, msg: impl Into<String>) -> Signature {
+        self.description = msg.into();
         self
     }
 
-    /// Add an extra description to the signature
-    pub fn extra_usage(mut self, msg: impl Into<String>) -> Signature {
-        self.extra_usage = msg.into();
+    /// Add an extra description to the signature.
+    ///
+    /// Here additional documentation can be added
+    pub fn extra_description(mut self, msg: impl Into<String>) -> Signature {
+        self.extra_description = msg.into();
         self
     }
 
@@ -244,8 +249,8 @@ impl Signature {
             .into_iter()
             .map(|term| term.to_string())
             .collect();
-        self.extra_usage = command.extra_usage().to_string();
-        self.usage = command.usage().to_string();
+        self.extra_description = command.extra_description().to_string();
+        self.description = command.description().to_string();
         self
     }
 
@@ -627,12 +632,12 @@ impl Command for Predeclaration {
         self.signature.clone()
     }
 
-    fn usage(&self) -> &str {
-        &self.signature.usage
+    fn description(&self) -> &str {
+        &self.signature.description
     }
 
-    fn extra_usage(&self) -> &str {
-        &self.signature.extra_usage
+    fn extra_description(&self) -> &str {
+        &self.signature.extra_description
     }
 
     fn run(
@@ -680,12 +685,12 @@ impl Command for BlockCommand {
         self.signature.clone()
     }
 
-    fn usage(&self) -> &str {
-        &self.signature.usage
+    fn description(&self) -> &str {
+        &self.signature.description
     }
 
-    fn extra_usage(&self) -> &str {
-        &self.signature.extra_usage
+    fn extra_description(&self) -> &str {
+        &self.signature.extra_description
     }
 
     fn run(
diff --git a/crates/nu-protocol/tests/test_signature.rs b/crates/nu-protocol/tests/test_signature.rs
index 8faf772c38..011607959a 100644
--- a/crates/nu-protocol/tests/test_signature.rs
+++ b/crates/nu-protocol/tests/test_signature.rs
@@ -9,14 +9,14 @@ fn test_signature() {
     assert_eq!(signature, from_build);
 
     // constructing signature with description
-    let signature = Signature::new("signature").usage("example usage");
-    assert_eq!(signature.usage, "example usage".to_string())
+    let signature = Signature::new("signature").description("example description");
+    assert_eq!(signature.description, "example description".to_string())
 }
 
 #[test]
 fn test_signature_chained() {
     let signature = Signature::new("new_signature")
-        .usage("description")
+        .description("description")
         .required("required", SyntaxShape::String, "required description")
         .optional("optional", SyntaxShape::String, "optional description")
         .required_named(
@@ -126,7 +126,7 @@ fn test_signature_same_name() {
 #[test]
 fn test_signature_round_trip() {
     let signature = Signature::new("new_signature")
-        .usage("description")
+        .description("description")
         .required("first", SyntaxShape::String, "first required")
         .required("second", SyntaxShape::Int, "second required")
         .optional("optional", SyntaxShape::String, "optional description")
@@ -145,8 +145,8 @@ fn test_signature_round_trip() {
     let returned: Signature = serde_json::from_str(&string).unwrap();
 
     assert_eq!(signature.name, returned.name);
-    assert_eq!(signature.usage, returned.usage);
-    assert_eq!(signature.extra_usage, returned.extra_usage);
+    assert_eq!(signature.description, returned.description);
+    assert_eq!(signature.extra_description, returned.extra_description);
     assert_eq!(signature.is_filter, returned.is_filter);
     assert_eq!(signature.category, returned.category);
 
diff --git a/crates/nu-std/README.md b/crates/nu-std/README.md
index 23bd684a50..42cdf1569a 100644
--- a/crates/nu-std/README.md
+++ b/crates/nu-std/README.md
@@ -9,8 +9,8 @@ provide interactive utilities and building blocks for users writing casual scrip
 To see what's here:
 ```text
 > use std
-> scope commands | select name usage | where name =~ "std "
-#┬───────────name────────────┬──────────────────────usage──────────────────────
+> scope commands | select name description | where name =~ "std "
+#┬───────────name────────────┬───────────────────description───────────────────
 0│std assert                 │Universal assert command
 1│std assert equal           │Assert $left == $right
 2│std assert error           │Assert that executing the code generates an error
diff --git a/crates/nu-std/std/help.nu b/crates/nu-std/std/help.nu
index 16a20504cb..d608ae8bcb 100644
--- a/crates/nu-std/std/help.nu
+++ b/crates/nu-std/std/help.nu
@@ -73,11 +73,11 @@ def get-all-operators [] { return [
 ]}
 
 def "nu-complete list-aliases" [] {
-    scope aliases | select name usage | rename value description
+    scope aliases | select name description | rename value description
 }
 
 def "nu-complete list-modules" [] {
-    scope modules | select name usage | rename value description
+    scope modules | select name description | rename value description
 }
 
 def "nu-complete list-operators" [] {
@@ -90,7 +90,7 @@ def "nu-complete list-operators" [] {
 }
 
 def "nu-complete list-commands" [] {
-    scope commands | select name usage | rename value description
+    scope commands | select name description | rename value description
 }
 
 def "nu-complete main-help" [] {
@@ -106,7 +106,7 @@ def "nu-complete main-help" [] {
 }
 
 def "nu-complete list-externs" [] {
-    scope commands | where is_extern | select name usage | rename value description
+    scope commands | where is_extern | select name description | rename value description
 }
 
 def build-help-header [
@@ -123,8 +123,8 @@ def build-help-header [
 }
 
 def build-module-page [module: record] {
-    let usage = (if not ($module.usage? | is-empty) {[
-        $module.usage
+    let description = (if not ($module.description? | is-empty) {[
+        $module.description
         ""
     ]} else { [] })
 
@@ -157,7 +157,7 @@ def build-module-page [module: record] {
         (view source $module.env_block)
     ]})
 
-    [$usage $name $commands $aliases $env_block] | flatten | str join "\n"
+    [$description $name $commands $aliases $env_block] | flatten | str join "\n"
 }
 
 # Show help on nushell modules.
@@ -203,7 +203,7 @@ def build-module-page [module: record] {
 #     show all aliases
 #     > help modules
 #     ╭───┬──────┬──────────┬────────────────┬──────────────┬───────────────╮
-#     │ # │ name │ commands │    aliases     │  env_block   │     usage     │
+#     │ # │ name │ commands │    aliases     │  env_block   │  description  │
 #     ├───┼──────┼──────────┼────────────────┼──────────────┼───────────────┤
 #     │ 0 │ bar  │ [baz]    │ [list 0 items] │ <Block 1331> │ my bar module │
 #     │ 1 │ baz  │ [bar]    │ [list 0 items] │ <Block 1335> │ my baz module │
@@ -213,7 +213,7 @@ def build-module-page [module: record] {
 #     search for string in module names
 #     > help modules --find ba
 #     ╭───┬──────┬─────────────┬────────────────┬──────────────┬───────────────╮
-#     │ # │ name │  commands   │    aliases     │  env_block   │     usage     │
+#     │ # │ name │  commands   │    aliases     │  env_block   │  description  │
 #     ├───┼──────┼─────────────┼────────────────┼──────────────┼───────────────┤
 #     │ 0 │ bar  │ ╭───┬─────╮ │ [list 0 items] │ <Block 1331> │ my bar module │
 #     │   │      │ │ 0 │ baz │ │                │              │               │
@@ -253,7 +253,7 @@ export def modules [
     let modules = (scope modules)
 
     if not ($find | is-empty) {
-        $modules | find $find --columns [name usage]
+        $modules | find $find --columns [name description]
     } else if not ($module | is-empty) {
         let found_module = ($modules | where name == ($module | str join " "))
 
@@ -268,8 +268,8 @@ export def modules [
 }
 
 def build-alias-page [alias: record] {
-    let usage = (if not ($alias.usage? | is-empty) {[
-        $alias.usage
+    let description = (if not ($alias.description? | is-empty) {[
+        $alias.description
         ""
     ]} else { [] })
 
@@ -281,7 +281,7 @@ def build-alias-page [alias: record] {
         $"  ($alias.expansion)"
     ]
 
-    [$usage $rest] | flatten | str join "\n"
+    [$description $rest] | flatten | str join "\n"
 }
 
 # Show help on nushell aliases.
@@ -309,7 +309,7 @@ def build-alias-page [alias: record] {
 #     show all aliases
 #     > help aliases
 #     ╭───┬───────┬────────────────────┬───────────────────╮
-#     │ # │ name  │     expansion      │       usage       │
+#     │ # │ name  │     expansion      │    description    │
 #     ├───┼───────┼────────────────────┼───────────────────┤
 #     │ 0 │ bar   │ echo "this is bar" │ my bar alias      │
 #     │ 1 │ baz   │ echo "this is baz" │ my baz alias      │
@@ -324,7 +324,7 @@ def build-alias-page [alias: record] {
 #     search for string in alias names
 #     > help aliases --find ba
 #     ╭───┬──────┬────────────────────┬──────────────╮
-#     │ # │ name │     expansion      │    usage     │
+#     │ # │ name │     expansion      │ description  │
 #     ├───┼──────┼────────────────────┼──────────────┤
 #     │ 0 │ bar  │ echo "this is bar" │ my bar alias │
 #     │ 1 │ baz  │ echo "this is baz" │ my baz alias │
@@ -359,7 +359,7 @@ export def aliases [
     let aliases = (scope aliases | sort-by name)
 
     if not ($find | is-empty) {
-        $aliases | find $find --columns [name usage]
+        $aliases | find $find --columns [name description]
     } else if not ($alias | is-empty) {
         let found_alias = ($aliases | where name == ($alias | str join " "))
 
@@ -374,8 +374,8 @@ export def aliases [
 }
 
 def build-extern-page [extern: record] {
-    let usage = (if not ($extern.usage? | is-empty) {[
-        $extern.usage
+    let description = (if not ($extern.description? | is-empty) {[
+        $extern.description
         ""
     ]} else { [] })
 
@@ -384,7 +384,7 @@ def build-extern-page [extern: record] {
         $" ($extern.name)"
     ]
 
-    [$usage $rest] | flatten | str join "\n"
+    [$description $rest] | flatten | str join "\n"
 }
 
 # Show help on nushell externs.
@@ -395,13 +395,13 @@ export def externs [
     let externs = (
         scope commands
         | where is_extern
-        | select name module_name usage
+        | select name module_name description
         | sort-by name
         | str trim
     )
 
     if not ($find | is-empty) {
-        $externs | find $find --columns [name usage]
+        $externs | find $find --columns [name description]
     } else if not ($extern | is-empty) {
         let found_extern = ($externs | where name == ($extern | str join " "))
 
@@ -482,12 +482,12 @@ export def operators [
 }
 
 def build-command-page [command: record] {
-    let usage = (if not ($command.usage? | is-empty) {[
-        $command.usage
+    let description = (if not ($command.description? | is-empty) {[
+        $command.description
     ]} else { [] })
-    let extra_usage = (if not ($command.extra_usage? | is-empty) {[
+    let extra_description = (if not ($command.extra_description? | is-empty) {[
         ""
-        $command.extra_usage
+        $command.extra_description
     ]} else { [] })
 
     let search_terms = (if not ($command.search_terms? | is-empty) {[
@@ -568,11 +568,11 @@ def build-command-page [command: record] {
         ]
     } else { [] })
 
-    let subcommands = (scope commands | where name =~ $"^($command.name) " | select name usage)
+    let subcommands = (scope commands | where name =~ $"^($command.name) " | select name description)
     let subcommands = (if not ($subcommands | is-empty) {[
         (build-help-header "Subcommands")
         ($subcommands | each {|subcommand |
-            $"  (ansi teal)($subcommand.name)(ansi reset) - ($subcommand.usage)"
+            $"  (ansi teal)($subcommand.name)(ansi reset) - ($subcommand.description)"
         } | str join "\n")
     ]} else { [] })
 
@@ -671,8 +671,8 @@ def build-command-page [command: record] {
     ] | flatten} else { [] })
 
     [
-        $usage
-        $extra_usage
+        $description
+        $extra_description
         $search_terms
         $module
         $category
@@ -687,13 +687,13 @@ def build-command-page [command: record] {
 # Show help on commands.
 export def commands [
     ...command: string@"nu-complete list-commands"  # the name of command to get help on
-    --find (-f): string  # string to find in command names and usage
+    --find (-f): string  # string to find in command names and description
 ] {
     let commands = (scope commands | sort-by name)
 
     if not ($find | is-empty) {
         # TODO: impl find for external commands
-        $commands | find $find --columns [name usage search_terms] | select name category usage signatures search_terms
+        $commands | find $find --columns [name description search_terms] | select name category description signatures search_terms
     } else if not ($command | is-empty) {
         let target_command = ($command | str join " ")
         let found_command = ($commands | where name == $target_command)
@@ -709,7 +709,7 @@ export def commands [
 
         build-command-page ($found_command | get 0)
     } else {
-        $commands | select name category usage signatures search_terms
+        $commands | select name category description signatures search_terms
     }
 }
 
@@ -729,11 +729,11 @@ def pretty-cmd [] {
 #   show help for single sub-command, alias, or module
 #   > help str join
 #
-#   search for string in command names, usage and search terms
+#   search for string in command names, description and search terms
 #   > help --find char
 export def main [
     ...item: string@"nu-complete main-help"  # the name of the help item to get help on
-    --find (-f): string  # string to find in help items names and usage
+    --find (-f): string  # string to find in help items names and description
 ] {
     if ($item | is-empty) and ($find | is-empty) {
         print $"Welcome to Nushell.
diff --git a/crates/nu_plugin_custom_values/src/drop_check.rs b/crates/nu_plugin_custom_values/src/drop_check.rs
index b23090c37d..2881e59ad5 100644
--- a/crates/nu_plugin_custom_values/src/drop_check.rs
+++ b/crates/nu_plugin_custom_values/src/drop_check.rs
@@ -66,7 +66,7 @@ impl SimplePluginCommand for DropCheck {
         "custom-value drop-check"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Generates a custom value that prints a message when dropped"
     }
 
diff --git a/crates/nu_plugin_custom_values/src/generate.rs b/crates/nu_plugin_custom_values/src/generate.rs
index b4cc8bd6b1..264208d8ab 100644
--- a/crates/nu_plugin_custom_values/src/generate.rs
+++ b/crates/nu_plugin_custom_values/src/generate.rs
@@ -11,7 +11,7 @@ impl SimplePluginCommand for Generate {
         "custom-value generate"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "PluginSignature for a plugin that generates a custom value"
     }
 
diff --git a/crates/nu_plugin_custom_values/src/generate2.rs b/crates/nu_plugin_custom_values/src/generate2.rs
index 806086f4fb..1aa69d2715 100644
--- a/crates/nu_plugin_custom_values/src/generate2.rs
+++ b/crates/nu_plugin_custom_values/src/generate2.rs
@@ -11,7 +11,7 @@ impl SimplePluginCommand for Generate2 {
         "custom-value generate2"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "PluginSignature for a plugin that generates a different custom value"
     }
 
diff --git a/crates/nu_plugin_custom_values/src/handle_get.rs b/crates/nu_plugin_custom_values/src/handle_get.rs
index 017ac42477..826248aad3 100644
--- a/crates/nu_plugin_custom_values/src/handle_get.rs
+++ b/crates/nu_plugin_custom_values/src/handle_get.rs
@@ -17,7 +17,7 @@ impl SimplePluginCommand for HandleGet {
             .input_output_type(Type::Custom("HandleCustomValue".into()), Type::Any)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Get a value previously stored in a handle"
     }
 
diff --git a/crates/nu_plugin_custom_values/src/handle_make.rs b/crates/nu_plugin_custom_values/src/handle_make.rs
index afc3e914a2..e485ad3ced 100644
--- a/crates/nu_plugin_custom_values/src/handle_make.rs
+++ b/crates/nu_plugin_custom_values/src/handle_make.rs
@@ -19,7 +19,7 @@ impl SimplePluginCommand for HandleMake {
             .input_output_type(Type::Any, Type::Custom("HandleCustomValue".into()))
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Store a value in plugin memory and return a handle to it"
     }
 
diff --git a/crates/nu_plugin_custom_values/src/handle_update.rs b/crates/nu_plugin_custom_values/src/handle_update.rs
index 8256464ca7..230522732a 100644
--- a/crates/nu_plugin_custom_values/src/handle_update.rs
+++ b/crates/nu_plugin_custom_values/src/handle_update.rs
@@ -29,7 +29,7 @@ impl SimplePluginCommand for HandleUpdate {
             )
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Update the value in a handle and return a new handle with the result"
     }
 
diff --git a/crates/nu_plugin_custom_values/src/update.rs b/crates/nu_plugin_custom_values/src/update.rs
index 0ce7c09ec9..41d9c9a6f7 100644
--- a/crates/nu_plugin_custom_values/src/update.rs
+++ b/crates/nu_plugin_custom_values/src/update.rs
@@ -13,7 +13,7 @@ impl SimplePluginCommand for Update {
         "custom-value update"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "PluginSignature for a plugin that updates a custom value"
     }
 
diff --git a/crates/nu_plugin_custom_values/src/update_arg.rs b/crates/nu_plugin_custom_values/src/update_arg.rs
index adbe64773c..bac07e150a 100644
--- a/crates/nu_plugin_custom_values/src/update_arg.rs
+++ b/crates/nu_plugin_custom_values/src/update_arg.rs
@@ -11,7 +11,7 @@ impl SimplePluginCommand for UpdateArg {
         "custom-value update-arg"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Updates a custom value as an argument"
     }
 
diff --git a/crates/nu_plugin_example/src/commands/call_decl.rs b/crates/nu_plugin_example/src/commands/call_decl.rs
index d8c8206d90..7ced94218e 100644
--- a/crates/nu_plugin_example/src/commands/call_decl.rs
+++ b/crates/nu_plugin_example/src/commands/call_decl.rs
@@ -33,11 +33,11 @@ impl PluginCommand for CallDecl {
             )
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Demonstrates calling other commands from plugins using `call_decl()`."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "
 The arguments will not be typechecked at parse time. This command is for
 demonstration only, and should not be used for anything real.
diff --git a/crates/nu_plugin_example/src/commands/collect_bytes.rs b/crates/nu_plugin_example/src/commands/collect_bytes.rs
index e716493785..16cb205571 100644
--- a/crates/nu_plugin_example/src/commands/collect_bytes.rs
+++ b/crates/nu_plugin_example/src/commands/collect_bytes.rs
@@ -16,7 +16,7 @@ impl PluginCommand for CollectBytes {
         "example collect-bytes"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Example transformer to byte stream"
     }
 
diff --git a/crates/nu_plugin_example/src/commands/config.rs b/crates/nu_plugin_example/src/commands/config.rs
index 7716e27537..ff625f5e59 100644
--- a/crates/nu_plugin_example/src/commands/config.rs
+++ b/crates/nu_plugin_example/src/commands/config.rs
@@ -39,11 +39,11 @@ impl SimplePluginCommand for Config {
         "example config"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Show plugin configuration"
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "The configuration is set under $env.config.plugins.example"
     }
 
diff --git a/crates/nu_plugin_example/src/commands/ctrlc.rs b/crates/nu_plugin_example/src/commands/ctrlc.rs
index 50da9d24da..4170853d57 100644
--- a/crates/nu_plugin_example/src/commands/ctrlc.rs
+++ b/crates/nu_plugin_example/src/commands/ctrlc.rs
@@ -15,7 +15,7 @@ impl PluginCommand for Ctrlc {
         "example ctrlc"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Example command that demonstrates registering an interrupt signal handler"
     }
 
diff --git a/crates/nu_plugin_example/src/commands/disable_gc.rs b/crates/nu_plugin_example/src/commands/disable_gc.rs
index 5ff7f508e0..68263fc084 100644
--- a/crates/nu_plugin_example/src/commands/disable_gc.rs
+++ b/crates/nu_plugin_example/src/commands/disable_gc.rs
@@ -12,11 +12,11 @@ impl SimplePluginCommand for DisableGc {
         "example disable-gc"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Disable the plugin garbage collector for `example`"
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "\
 Plugins are garbage collected by default after a period of inactivity. This
 behavior is configurable with `$env.config.plugin_gc.default`, or to change it
diff --git a/crates/nu_plugin_example/src/commands/echo.rs b/crates/nu_plugin_example/src/commands/echo.rs
index e60ccf8107..47578c2401 100644
--- a/crates/nu_plugin_example/src/commands/echo.rs
+++ b/crates/nu_plugin_example/src/commands/echo.rs
@@ -13,7 +13,7 @@ impl PluginCommand for Echo {
         "example echo"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Example stream consumer that outputs the received input"
     }
 
diff --git a/crates/nu_plugin_example/src/commands/env.rs b/crates/nu_plugin_example/src/commands/env.rs
index 66d37e84fa..a854762999 100644
--- a/crates/nu_plugin_example/src/commands/env.rs
+++ b/crates/nu_plugin_example/src/commands/env.rs
@@ -12,11 +12,11 @@ impl SimplePluginCommand for Env {
         "example env"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Get environment variable(s)"
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "Returns all environment variables if no name provided"
     }
 
diff --git a/crates/nu_plugin_example/src/commands/for_each.rs b/crates/nu_plugin_example/src/commands/for_each.rs
index b784deb88c..e66a3841dc 100644
--- a/crates/nu_plugin_example/src/commands/for_each.rs
+++ b/crates/nu_plugin_example/src/commands/for_each.rs
@@ -13,11 +13,11 @@ impl PluginCommand for ForEach {
         "example for-each"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Example execution of a closure with a stream"
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "Prints each value the closure returns to stderr"
     }
 
diff --git a/crates/nu_plugin_example/src/commands/generate.rs b/crates/nu_plugin_example/src/commands/generate.rs
index c039cc23d5..de63849aef 100644
--- a/crates/nu_plugin_example/src/commands/generate.rs
+++ b/crates/nu_plugin_example/src/commands/generate.rs
@@ -16,11 +16,11 @@ impl PluginCommand for Generate {
         "example generate"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Example execution of a closure to produce a stream"
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "See the builtin `generate` command"
     }
 
diff --git a/crates/nu_plugin_example/src/commands/main.rs b/crates/nu_plugin_example/src/commands/main.rs
index adc8000aeb..c670cd4258 100644
--- a/crates/nu_plugin_example/src/commands/main.rs
+++ b/crates/nu_plugin_example/src/commands/main.rs
@@ -12,11 +12,11 @@ impl SimplePluginCommand for Main {
         "example"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Example commands for Nushell plugins"
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"
 The `example` plugin demonstrates usage of the Nushell plugin API.
 
diff --git a/crates/nu_plugin_example/src/commands/one.rs b/crates/nu_plugin_example/src/commands/one.rs
index e0824e3fcf..d99276d6a3 100644
--- a/crates/nu_plugin_example/src/commands/one.rs
+++ b/crates/nu_plugin_example/src/commands/one.rs
@@ -12,12 +12,12 @@ impl SimplePluginCommand for One {
         "example one"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Plugin test example 1. Returns Value::Nothing"
     }
 
-    fn extra_usage(&self) -> &str {
-        "Extra usage for example one"
+    fn extra_description(&self) -> &str {
+        "Extra description for example one"
     }
 
     fn signature(&self) -> Signature {
diff --git a/crates/nu_plugin_example/src/commands/seq.rs b/crates/nu_plugin_example/src/commands/seq.rs
index 88254394c1..902a6115da 100644
--- a/crates/nu_plugin_example/src/commands/seq.rs
+++ b/crates/nu_plugin_example/src/commands/seq.rs
@@ -16,7 +16,7 @@ impl PluginCommand for Seq {
         "example seq"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Example stream generator for a list of values"
     }
 
diff --git a/crates/nu_plugin_example/src/commands/sum.rs b/crates/nu_plugin_example/src/commands/sum.rs
index 6f748d426a..e58f27420c 100644
--- a/crates/nu_plugin_example/src/commands/sum.rs
+++ b/crates/nu_plugin_example/src/commands/sum.rs
@@ -13,7 +13,7 @@ impl PluginCommand for Sum {
         "example sum"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Example stream consumer for a list of values"
     }
 
diff --git a/crates/nu_plugin_example/src/commands/three.rs b/crates/nu_plugin_example/src/commands/three.rs
index c8e8554937..ff77a2215d 100644
--- a/crates/nu_plugin_example/src/commands/three.rs
+++ b/crates/nu_plugin_example/src/commands/three.rs
@@ -12,7 +12,7 @@ impl SimplePluginCommand for Three {
         "example three"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Plugin test example 3. Returns labeled error"
     }
 
diff --git a/crates/nu_plugin_example/src/commands/two.rs b/crates/nu_plugin_example/src/commands/two.rs
index e02465e8b7..f3f4df3240 100644
--- a/crates/nu_plugin_example/src/commands/two.rs
+++ b/crates/nu_plugin_example/src/commands/two.rs
@@ -12,7 +12,7 @@ impl SimplePluginCommand for Two {
         "example two"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Plugin test example 2. Returns list of records"
     }
 
diff --git a/crates/nu_plugin_example/src/commands/view_span.rs b/crates/nu_plugin_example/src/commands/view_span.rs
index 95f7cd1166..fb5e05d958 100644
--- a/crates/nu_plugin_example/src/commands/view_span.rs
+++ b/crates/nu_plugin_example/src/commands/view_span.rs
@@ -13,11 +13,11 @@ impl SimplePluginCommand for ViewSpan {
         "example view span"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Example command for looking up the contents of a parser span"
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "Shows the original source code of the expression that generated the value passed as input."
     }
 
diff --git a/crates/nu_plugin_formats/src/from/eml.rs b/crates/nu_plugin_formats/src/from/eml.rs
index 2b4c33a814..5d6324e1eb 100644
--- a/crates/nu_plugin_formats/src/from/eml.rs
+++ b/crates/nu_plugin_formats/src/from/eml.rs
@@ -18,7 +18,7 @@ impl SimplePluginCommand for FromEml {
         "from eml"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Parse text as .eml and create record."
     }
 
diff --git a/crates/nu_plugin_formats/src/from/ics.rs b/crates/nu_plugin_formats/src/from/ics.rs
index bcd7311f8a..482807ba29 100644
--- a/crates/nu_plugin_formats/src/from/ics.rs
+++ b/crates/nu_plugin_formats/src/from/ics.rs
@@ -17,7 +17,7 @@ impl SimplePluginCommand for FromIcs {
         "from ics"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Parse text as .ics and create table."
     }
 
diff --git a/crates/nu_plugin_formats/src/from/ini.rs b/crates/nu_plugin_formats/src/from/ini.rs
index bb44ce1398..ec1168f6f6 100644
--- a/crates/nu_plugin_formats/src/from/ini.rs
+++ b/crates/nu_plugin_formats/src/from/ini.rs
@@ -14,7 +14,7 @@ impl SimplePluginCommand for FromIni {
         "from ini"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Parse text as .ini and create table."
     }
 
diff --git a/crates/nu_plugin_formats/src/from/plist.rs b/crates/nu_plugin_formats/src/from/plist.rs
index c98b6ea58d..113714e4c4 100644
--- a/crates/nu_plugin_formats/src/from/plist.rs
+++ b/crates/nu_plugin_formats/src/from/plist.rs
@@ -18,7 +18,7 @@ impl SimplePluginCommand for FromPlist {
         "from plist"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert plist to Nushell values"
     }
 
diff --git a/crates/nu_plugin_formats/src/from/vcf.rs b/crates/nu_plugin_formats/src/from/vcf.rs
index a751a774d3..9bf99e02af 100644
--- a/crates/nu_plugin_formats/src/from/vcf.rs
+++ b/crates/nu_plugin_formats/src/from/vcf.rs
@@ -16,7 +16,7 @@ impl SimplePluginCommand for FromVcf {
         "from vcf"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Parse text as .vcf and create table."
     }
 
diff --git a/crates/nu_plugin_formats/src/to/plist.rs b/crates/nu_plugin_formats/src/to/plist.rs
index 94368c184a..caf039263e 100644
--- a/crates/nu_plugin_formats/src/to/plist.rs
+++ b/crates/nu_plugin_formats/src/to/plist.rs
@@ -15,7 +15,7 @@ impl SimplePluginCommand for IntoPlist {
         "to plist"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert Nu values into plist"
     }
 
diff --git a/crates/nu_plugin_gstat/src/gstat.rs b/crates/nu_plugin_gstat/src/gstat.rs
index 849531683d..5c1ab0e248 100644
--- a/crates/nu_plugin_gstat/src/gstat.rs
+++ b/crates/nu_plugin_gstat/src/gstat.rs
@@ -16,10 +16,6 @@ impl GStat {
         Default::default()
     }
 
-    pub fn usage() -> &'static str {
-        "Usage: gstat"
-    }
-
     pub fn gstat(
         &self,
         value: &Value,
diff --git a/crates/nu_plugin_gstat/src/nu/mod.rs b/crates/nu_plugin_gstat/src/nu/mod.rs
index f44894085d..e89112c878 100644
--- a/crates/nu_plugin_gstat/src/nu/mod.rs
+++ b/crates/nu_plugin_gstat/src/nu/mod.rs
@@ -21,7 +21,7 @@ impl SimplePluginCommand for GStat {
         "gstat"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Get the git status of a repo"
     }
 
diff --git a/crates/nu_plugin_inc/src/inc.rs b/crates/nu_plugin_inc/src/inc.rs
index 6510cbd6a6..acc74635ed 100644
--- a/crates/nu_plugin_inc/src/inc.rs
+++ b/crates/nu_plugin_inc/src/inc.rs
@@ -89,10 +89,6 @@ impl Inc {
         self.error = Some(message.to_string());
     }
 
-    pub fn usage() -> &'static str {
-        "Usage: inc field [--major|--minor|--patch]"
-    }
-
     pub fn inc(&self, head: Span, value: &Value) -> Result<Value, LabeledError> {
         if let Some(cell_path) = &self.cell_path {
             let working_value = value.clone();
diff --git a/crates/nu_plugin_inc/src/nu/mod.rs b/crates/nu_plugin_inc/src/nu/mod.rs
index b7d9c8960f..82a5fa978e 100644
--- a/crates/nu_plugin_inc/src/nu/mod.rs
+++ b/crates/nu_plugin_inc/src/nu/mod.rs
@@ -21,7 +21,7 @@ impl SimplePluginCommand for Inc {
         "inc"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Increment a value or version. Optionally use the column of a table."
     }
 
diff --git a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
index 51e2ef1ac8..09f4769311 100755
--- a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
+++ b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
@@ -22,8 +22,8 @@ const SIGNATURES = [
   {
     sig: {
       name: nu_plugin_nu_example,
-      usage: "Signature test for Nushell plugin in Nushell",
-      extra_usage: "",
+      description: "Signature test for Nushell plugin in Nushell",
+      extra_description: "",
       required_positional: [
         [
           name,
diff --git a/crates/nu_plugin_polars/src/cache/get.rs b/crates/nu_plugin_polars/src/cache/get.rs
index 11ade261b9..843e21305a 100644
--- a/crates/nu_plugin_polars/src/cache/get.rs
+++ b/crates/nu_plugin_polars/src/cache/get.rs
@@ -21,7 +21,7 @@ impl PluginCommand for CacheGet {
         "polars store-get"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Gets a Dataframe or other object from the plugin cache."
     }
 
diff --git a/crates/nu_plugin_polars/src/cache/list.rs b/crates/nu_plugin_polars/src/cache/list.rs
index 88fc1769ba..c68f910a81 100644
--- a/crates/nu_plugin_polars/src/cache/list.rs
+++ b/crates/nu_plugin_polars/src/cache/list.rs
@@ -15,7 +15,7 @@ impl PluginCommand for ListDF {
         "polars store-ls"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Lists stored polars objects."
     }
 
diff --git a/crates/nu_plugin_polars/src/cache/rm.rs b/crates/nu_plugin_polars/src/cache/rm.rs
index 9113f39cec..537b7c6356 100644
--- a/crates/nu_plugin_polars/src/cache/rm.rs
+++ b/crates/nu_plugin_polars/src/cache/rm.rs
@@ -17,7 +17,7 @@ impl PluginCommand for CacheRemove {
         "polars store-rm"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Removes a stored Dataframe or other object from the plugin cache."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/append.rs b/crates/nu_plugin_polars/src/dataframe/eager/append.rs
index 48c435baa3..fd32a30ca3 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/append.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/append.rs
@@ -40,7 +40,7 @@ impl PluginCommand for AppendDF {
         "polars append"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Appends a new dataframe."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/cast.rs b/crates/nu_plugin_polars/src/dataframe/eager/cast.rs
index d676fb04ea..5787d961e1 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/cast.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/cast.rs
@@ -22,7 +22,7 @@ impl PluginCommand for CastDF {
         "polars cast"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Cast a column to a different dtype."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/columns.rs b/crates/nu_plugin_polars/src/dataframe/eager/columns.rs
index 892d3a5175..5fa4fb82a8 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/columns.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/columns.rs
@@ -16,7 +16,7 @@ impl PluginCommand for ColumnsDF {
         "polars columns"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Show dataframe columns."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/drop.rs b/crates/nu_plugin_polars/src/dataframe/eager/drop.rs
index 812a77b048..4e2a2b7136 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/drop.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/drop.rs
@@ -20,7 +20,7 @@ impl PluginCommand for DropDF {
         "polars drop"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Creates a new dataframe by dropping the selected columns."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/drop_duplicates.rs b/crates/nu_plugin_polars/src/dataframe/eager/drop_duplicates.rs
index 3eb6311637..2d311867ea 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/drop_duplicates.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/drop_duplicates.rs
@@ -21,7 +21,7 @@ impl PluginCommand for DropDuplicates {
         "polars drop-duplicates"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Drops duplicate values in dataframe."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/drop_nulls.rs b/crates/nu_plugin_polars/src/dataframe/eager/drop_nulls.rs
index 4d1b41e2fa..43dbf29f3d 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/drop_nulls.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/drop_nulls.rs
@@ -20,7 +20,7 @@ impl PluginCommand for DropNulls {
         "polars drop-nulls"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Drops null values in dataframe."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/dummies.rs b/crates/nu_plugin_polars/src/dataframe/eager/dummies.rs
index 0f02085ec2..6346ebfb60 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/dummies.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/dummies.rs
@@ -16,7 +16,7 @@ impl PluginCommand for Dummies {
         "polars dummies"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Creates a new dataframe with dummy variables."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/filter_with.rs b/crates/nu_plugin_polars/src/dataframe/eager/filter_with.rs
index b95f646edd..acfe2251cd 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/filter_with.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/filter_with.rs
@@ -23,7 +23,7 @@ impl PluginCommand for FilterWith {
         "polars filter-with"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Filters dataframe using a mask or expression as reference."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/first.rs b/crates/nu_plugin_polars/src/dataframe/eager/first.rs
index b874c257cb..e75aa04428 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/first.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/first.rs
@@ -20,7 +20,7 @@ impl PluginCommand for FirstDF {
         "polars first"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Show only the first number of rows or create a first expression"
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/get.rs b/crates/nu_plugin_polars/src/dataframe/eager/get.rs
index 34ba98154f..330b027b0d 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/get.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/get.rs
@@ -20,7 +20,7 @@ impl PluginCommand for GetDF {
         "polars get"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Creates dataframe with the selected columns."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/last.rs b/crates/nu_plugin_polars/src/dataframe/eager/last.rs
index 316d346085..88f1041c25 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/last.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/last.rs
@@ -20,7 +20,7 @@ impl PluginCommand for LastDF {
         "polars last"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Creates new dataframe with tail rows or creates a last expression."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/open.rs b/crates/nu_plugin_polars/src/dataframe/eager/open.rs
index 77fbe583aa..c2894d64fe 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/open.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/open.rs
@@ -45,7 +45,7 @@ impl PluginCommand for OpenDataFrame {
         "polars open"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Opens CSV, JSON, NDJSON/JSON lines, arrow, avro, or parquet file to create dataframe. A lazy dataframe will be created by default, if supported."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/pivot.rs b/crates/nu_plugin_polars/src/dataframe/eager/pivot.rs
index b72210d011..c541d16520 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/pivot.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/pivot.rs
@@ -24,7 +24,7 @@ impl PluginCommand for PivotDF {
         "polars pivot"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Pivot a DataFrame from wide to long format."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/query_df.rs b/crates/nu_plugin_polars/src/dataframe/eager/query_df.rs
index a09da57250..799a3b4d64 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/query_df.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/query_df.rs
@@ -24,7 +24,7 @@ impl PluginCommand for QueryDf {
         "polars query"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Query dataframe using SQL. Note: The dataframe is always named 'df' in your query's from clause."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/rename.rs b/crates/nu_plugin_polars/src/dataframe/eager/rename.rs
index 724cf1f983..197d347b97 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/rename.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/rename.rs
@@ -22,7 +22,7 @@ impl PluginCommand for RenameDF {
         "polars rename"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Rename a dataframe column."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/sample.rs b/crates/nu_plugin_polars/src/dataframe/eager/sample.rs
index 59f9ad6eee..8e110feef9 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/sample.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/sample.rs
@@ -20,7 +20,7 @@ impl PluginCommand for SampleDF {
         "polars sample"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Create sample dataframe."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/save/mod.rs b/crates/nu_plugin_polars/src/dataframe/eager/save/mod.rs
index ce49fc54da..0c15f5abbc 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/save/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/save/mod.rs
@@ -29,7 +29,7 @@ impl PluginCommand for SaveDF {
         "polars save"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Saves a dataframe to disk. For lazy dataframes a sink operation will be used if the file type supports it (parquet, ipc/arrow, csv, and ndjson)."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/schema.rs b/crates/nu_plugin_polars/src/dataframe/eager/schema.rs
index e1350289a7..01451ff443 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/schema.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/schema.rs
@@ -15,7 +15,7 @@ impl PluginCommand for SchemaCmd {
         "polars schema"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Show schema for a dataframe."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/shape.rs b/crates/nu_plugin_polars/src/dataframe/eager/shape.rs
index ba1e99ebfe..60f96e8b9f 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/shape.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/shape.rs
@@ -17,7 +17,7 @@ impl PluginCommand for ShapeDF {
         "polars shape"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Shows column and row size for a dataframe."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/slice.rs b/crates/nu_plugin_polars/src/dataframe/eager/slice.rs
index c7ebaff4d7..feeeab5df0 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/slice.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/slice.rs
@@ -18,7 +18,7 @@ impl PluginCommand for SliceDF {
         "polars slice"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Creates new dataframe from a slice of rows."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/summary.rs b/crates/nu_plugin_polars/src/dataframe/eager/summary.rs
index 74e96fc7be..863fb891b7 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/summary.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/summary.rs
@@ -25,7 +25,7 @@ impl PluginCommand for Summary {
         "polars summary"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "For a dataframe, produces descriptive statistics (summary statistics) for its numeric columns."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/take.rs b/crates/nu_plugin_polars/src/dataframe/eager/take.rs
index 28b22095a1..a03093b607 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/take.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/take.rs
@@ -19,7 +19,7 @@ impl PluginCommand for TakeDF {
         "polars take"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Creates new dataframe using the given indices."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/to_df.rs b/crates/nu_plugin_polars/src/dataframe/eager/to_df.rs
index 0747f16613..39d54f6e10 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/to_df.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/to_df.rs
@@ -25,7 +25,7 @@ impl PluginCommand for ToDataFrame {
         "polars into-df"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Converts a list, table or record into a dataframe."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/to_nu.rs b/crates/nu_plugin_polars/src/dataframe/eager/to_nu.rs
index 0647b8d4e3..a8b4aa3976 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/to_nu.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/to_nu.rs
@@ -22,7 +22,7 @@ impl PluginCommand for ToNu {
         "polars into-nu"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Converts a dataframe or an expression into nushell value for access and exploration."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/unpivot.rs b/crates/nu_plugin_polars/src/dataframe/eager/unpivot.rs
index dafdc65ab4..0d61951ec2 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/unpivot.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/unpivot.rs
@@ -23,7 +23,7 @@ impl PluginCommand for UnpivotDF {
         "polars unpivot"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Unpivot a DataFrame from wide to long format."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/with_column.rs b/crates/nu_plugin_polars/src/dataframe/eager/with_column.rs
index 5db11766b9..1c29f90c3f 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/with_column.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/with_column.rs
@@ -20,7 +20,7 @@ impl PluginCommand for WithColumn {
         "polars with-column"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Adds a series to the dataframe."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/expressions/alias.rs b/crates/nu_plugin_polars/src/dataframe/expressions/alias.rs
index c780f13d9f..0c12be144e 100644
--- a/crates/nu_plugin_polars/src/dataframe/expressions/alias.rs
+++ b/crates/nu_plugin_polars/src/dataframe/expressions/alias.rs
@@ -17,7 +17,7 @@ impl PluginCommand for ExprAlias {
         "polars as"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Creates an alias expression."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/expressions/arg_where.rs b/crates/nu_plugin_polars/src/dataframe/expressions/arg_where.rs
index a9d29c3b14..45105a6f75 100644
--- a/crates/nu_plugin_polars/src/dataframe/expressions/arg_where.rs
+++ b/crates/nu_plugin_polars/src/dataframe/expressions/arg_where.rs
@@ -19,7 +19,7 @@ impl PluginCommand for ExprArgWhere {
         "polars arg-where"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Creates an expression that returns the arguments where expression is true."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/expressions/col.rs b/crates/nu_plugin_polars/src/dataframe/expressions/col.rs
index b9f152ebe7..33533e2a90 100644
--- a/crates/nu_plugin_polars/src/dataframe/expressions/col.rs
+++ b/crates/nu_plugin_polars/src/dataframe/expressions/col.rs
@@ -15,7 +15,7 @@ impl PluginCommand for ExprCol {
         "polars col"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Creates a named column expression."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/expressions/concat_str.rs b/crates/nu_plugin_polars/src/dataframe/expressions/concat_str.rs
index 09c64ccdb2..3dd3e4f6ae 100644
--- a/crates/nu_plugin_polars/src/dataframe/expressions/concat_str.rs
+++ b/crates/nu_plugin_polars/src/dataframe/expressions/concat_str.rs
@@ -19,7 +19,7 @@ impl PluginCommand for ExprConcatStr {
         "polars concat-str"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Creates a concat string expression."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/expressions/datepart.rs b/crates/nu_plugin_polars/src/dataframe/expressions/datepart.rs
index 1cbb5fa532..1c7b7e7005 100644
--- a/crates/nu_plugin_polars/src/dataframe/expressions/datepart.rs
+++ b/crates/nu_plugin_polars/src/dataframe/expressions/datepart.rs
@@ -27,7 +27,7 @@ impl PluginCommand for ExprDatePart {
         "polars datepart"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Creates an expression for capturing the specified datepart in a column."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/expressions/expressions_macro.rs b/crates/nu_plugin_polars/src/dataframe/expressions/expressions_macro.rs
index 58b60f3427..2a18c31c4d 100644
--- a/crates/nu_plugin_polars/src/dataframe/expressions/expressions_macro.rs
+++ b/crates/nu_plugin_polars/src/dataframe/expressions/expressions_macro.rs
@@ -21,13 +21,13 @@ macro_rules! expr_command {
                 $name
             }
 
-            fn usage(&self) -> &str {
+            fn description(&self) -> &str {
                 $desc
             }
 
             fn signature(&self) -> Signature {
                 Signature::build(self.name())
-                    .usage($desc)
+                    .description($desc)
                     .input_output_type(
                         Type::Custom("expression".into()),
                         Type::Custom("expression".into()),
@@ -76,7 +76,7 @@ macro_rules! expr_command {
 
             fn signature(&self) -> Signature {
                 Signature::build(self.name())
-                    .usage($desc)
+                    .description($desc)
                     .input_output_type(
                         Type::Custom("expression".into()),
                         Type::Custom("expression".into()),
@@ -127,13 +127,13 @@ macro_rules! lazy_expr_command {
                 $name
             }
 
-            fn usage(&self) -> &str {
+            fn description(&self) -> &str {
                 $desc
             }
 
             fn signature(&self) -> Signature {
                 Signature::build(self.name())
-                    .usage($desc)
+                    .description($desc)
                     .input_output_types(vec![
                         (
                             Type::Custom("expression".into()),
@@ -199,7 +199,7 @@ macro_rules! lazy_expr_command {
                 $name
             }
 
-            fn usage(&self) -> &str {
+            fn description(&self) -> &str {
                 $desc
             }
             fn signature(&self) -> Signature {
diff --git a/crates/nu_plugin_polars/src/dataframe/expressions/is_in.rs b/crates/nu_plugin_polars/src/dataframe/expressions/is_in.rs
index 136ac5c1e6..d2359c9d12 100644
--- a/crates/nu_plugin_polars/src/dataframe/expressions/is_in.rs
+++ b/crates/nu_plugin_polars/src/dataframe/expressions/is_in.rs
@@ -20,7 +20,7 @@ impl PluginCommand for ExprIsIn {
         "polars is-in"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Creates an is-in expression or checks to see if the elements are contained in the right series"
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/expressions/lit.rs b/crates/nu_plugin_polars/src/dataframe/expressions/lit.rs
index 1238717b2d..241058fb5c 100644
--- a/crates/nu_plugin_polars/src/dataframe/expressions/lit.rs
+++ b/crates/nu_plugin_polars/src/dataframe/expressions/lit.rs
@@ -14,7 +14,7 @@ impl PluginCommand for ExprLit {
         "polars lit"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Creates a literal expression."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/expressions/otherwise.rs b/crates/nu_plugin_polars/src/dataframe/expressions/otherwise.rs
index 73e616f8f8..5524205867 100644
--- a/crates/nu_plugin_polars/src/dataframe/expressions/otherwise.rs
+++ b/crates/nu_plugin_polars/src/dataframe/expressions/otherwise.rs
@@ -17,7 +17,7 @@ impl PluginCommand for ExprOtherwise {
         "polars otherwise"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Completes a when expression."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/expressions/when.rs b/crates/nu_plugin_polars/src/dataframe/expressions/when.rs
index 9ed9ffddac..886ee50f3b 100644
--- a/crates/nu_plugin_polars/src/dataframe/expressions/when.rs
+++ b/crates/nu_plugin_polars/src/dataframe/expressions/when.rs
@@ -19,7 +19,7 @@ impl PluginCommand for ExprWhen {
         "polars when"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Creates and modifies a when expression."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/aggregate.rs b/crates/nu_plugin_polars/src/dataframe/lazy/aggregate.rs
index add72faf88..fdce9ea311 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/aggregate.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/aggregate.rs
@@ -21,7 +21,7 @@ impl PluginCommand for LazyAggregate {
         "polars agg"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Performs a series of aggregations from a group-by."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/collect.rs b/crates/nu_plugin_polars/src/dataframe/lazy/collect.rs
index 4a48680c58..3f3a76df11 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/collect.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/collect.rs
@@ -17,7 +17,7 @@ impl PluginCommand for LazyCollect {
         "polars collect"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Collect lazy dataframe into eager dataframe."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/explode.rs b/crates/nu_plugin_polars/src/dataframe/lazy/explode.rs
index 787f07fd46..3266640d34 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/explode.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/explode.rs
@@ -18,7 +18,7 @@ impl PluginCommand for LazyExplode {
         "polars explode"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Explodes a dataframe or creates a explode expression."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/fetch.rs b/crates/nu_plugin_polars/src/dataframe/lazy/fetch.rs
index eb9663265b..48df365335 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/fetch.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/fetch.rs
@@ -17,7 +17,7 @@ impl PluginCommand for LazyFetch {
         "polars fetch"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Collects the lazyframe to the selected rows."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/fill_nan.rs b/crates/nu_plugin_polars/src/dataframe/lazy/fill_nan.rs
index baeb9da01b..dbe0adf5da 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/fill_nan.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/fill_nan.rs
@@ -19,7 +19,7 @@ impl PluginCommand for LazyFillNA {
         "polars fill-nan"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Replaces NaN values with the given expression."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/fill_null.rs b/crates/nu_plugin_polars/src/dataframe/lazy/fill_null.rs
index 6f4f13b08e..7f7b5f1862 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/fill_null.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/fill_null.rs
@@ -19,7 +19,7 @@ impl PluginCommand for LazyFillNull {
         "polars fill-null"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Replaces NULL values with the given expression."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/filter.rs b/crates/nu_plugin_polars/src/dataframe/lazy/filter.rs
index e7e30fd57d..0c4e9372e2 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/filter.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/filter.rs
@@ -20,7 +20,7 @@ impl PluginCommand for LazyFilter {
         "polars filter"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Filter dataframe based in expression."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/flatten.rs b/crates/nu_plugin_polars/src/dataframe/lazy/flatten.rs
index 93402bbe6a..f292a824bb 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/flatten.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/flatten.rs
@@ -21,7 +21,7 @@ impl PluginCommand for LazyFlatten {
         "polars flatten"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "An alias for polars explode."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/groupby.rs b/crates/nu_plugin_polars/src/dataframe/lazy/groupby.rs
index b7bd1017a3..060bdcd63a 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/groupby.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/groupby.rs
@@ -20,7 +20,7 @@ impl PluginCommand for ToLazyGroupBy {
         "polars group-by"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Creates a group-by object that can be used for other aggregations."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/join.rs b/crates/nu_plugin_polars/src/dataframe/lazy/join.rs
index 01fb2ac24d..ee18e17567 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/join.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/join.rs
@@ -20,7 +20,7 @@ impl PluginCommand for LazyJoin {
         "polars join"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Joins a lazy frame with other lazy frame."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/macro_commands.rs b/crates/nu_plugin_polars/src/dataframe/lazy/macro_commands.rs
index 1727946f6a..eb63f8b9f2 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/macro_commands.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/macro_commands.rs
@@ -19,13 +19,13 @@ macro_rules! lazy_command {
                 $name
             }
 
-            fn usage(&self) -> &str {
+            fn description(&self) -> &str {
                 $desc
             }
 
             fn signature(&self) -> Signature {
                 Signature::build(self.name())
-                    .usage($desc)
+                    .description($desc)
                     .input_output_type(
                         Type::Custom("dataframe".into()),
                         Type::Custom("dataframe".into()),
@@ -74,7 +74,7 @@ macro_rules! lazy_command {
 
             fn signature(&self) -> Signature {
                 Signature::build($name)
-                    .usage($desc)
+                    .description($desc)
                     .input_output_type(
                         Type::Custom("dataframe".into()),
                         Type::Custom("dataframe".into()),
@@ -122,7 +122,7 @@ macro_rules! lazy_command {
                 $name
             }
 
-            fn usage(&self) -> &str {
+            fn description(&self) -> &str {
                 $desc
             }
             fn signature(&self) -> Signature {
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/median.rs b/crates/nu_plugin_polars/src/dataframe/lazy/median.rs
index 8106218c26..92578da7e0 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/median.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/median.rs
@@ -19,7 +19,7 @@ impl PluginCommand for LazyMedian {
         "polars median"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Median value from columns in a dataframe or creates expression for an aggregation"
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/quantile.rs b/crates/nu_plugin_polars/src/dataframe/lazy/quantile.rs
index e63fae6610..79804b2937 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/quantile.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/quantile.rs
@@ -22,7 +22,7 @@ impl PluginCommand for LazyQuantile {
         "polars quantile"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Aggregates the columns to the selected quantile."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/select.rs b/crates/nu_plugin_polars/src/dataframe/lazy/select.rs
index 03c4306c30..9417427545 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/select.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/select.rs
@@ -18,7 +18,7 @@ impl PluginCommand for LazySelect {
         "polars select"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Selects columns from lazyframe."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/sort_by_expr.rs b/crates/nu_plugin_polars/src/dataframe/lazy/sort_by_expr.rs
index 20251a0ea0..952388a2dc 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/sort_by_expr.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/sort_by_expr.rs
@@ -21,7 +21,7 @@ impl PluginCommand for LazySortBy {
         "polars sort-by"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Sorts a lazy dataframe based on expression(s)."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/to_lazy.rs b/crates/nu_plugin_polars/src/dataframe/lazy/to_lazy.rs
index df6616e178..8d81bd1a8a 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/to_lazy.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/to_lazy.rs
@@ -15,7 +15,7 @@ impl PluginCommand for ToLazyFrame {
         "polars into-lazy"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Converts a dataframe into a lazy dataframe."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/all_false.rs b/crates/nu_plugin_polars/src/dataframe/series/all_false.rs
index 0c8c9719a5..36e31dfb98 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/all_false.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/all_false.rs
@@ -17,7 +17,7 @@ impl PluginCommand for AllFalse {
         "polars all-false"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns true if all values are false."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/all_true.rs b/crates/nu_plugin_polars/src/dataframe/series/all_true.rs
index 74d98d47c1..cf3d7a79fe 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/all_true.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/all_true.rs
@@ -17,7 +17,7 @@ impl PluginCommand for AllTrue {
         "polars all-true"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns true if all values are true."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/arg_max.rs b/crates/nu_plugin_polars/src/dataframe/series/arg_max.rs
index 6736731464..e7c67cdc32 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/arg_max.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/arg_max.rs
@@ -18,7 +18,7 @@ impl PluginCommand for ArgMax {
         "polars arg-max"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Return index for max value in series."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/arg_min.rs b/crates/nu_plugin_polars/src/dataframe/series/arg_min.rs
index 4fd29393ed..268ba401da 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/arg_min.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/arg_min.rs
@@ -18,7 +18,7 @@ impl PluginCommand for ArgMin {
         "polars arg-min"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Return index for min value in series."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/cumulative.rs b/crates/nu_plugin_polars/src/dataframe/series/cumulative.rs
index 7455297b59..da7081128d 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/cumulative.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/cumulative.rs
@@ -51,7 +51,7 @@ impl PluginCommand for Cumulative {
         "polars cumulative"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Cumulative calculation for a series."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/date/as_date.rs b/crates/nu_plugin_polars/src/dataframe/series/date/as_date.rs
index 414853d291..e5c12280d1 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/date/as_date.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/date/as_date.rs
@@ -18,11 +18,11 @@ impl PluginCommand for AsDate {
         "polars as-date"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         r#"Converts string to date."#
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"Format example:
         "%Y-%m-%d"    => 2021-12-31
         "%d-%m-%Y"    => 31-12-2021
diff --git a/crates/nu_plugin_polars/src/dataframe/series/date/as_datetime.rs b/crates/nu_plugin_polars/src/dataframe/series/date/as_datetime.rs
index 8e01fda6ac..05f28c00af 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/date/as_datetime.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/date/as_datetime.rs
@@ -20,11 +20,11 @@ impl PluginCommand for AsDateTime {
         "polars as-datetime"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         r#"Converts string to datetime."#
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"Format example:
         "%y/%m/%d %H:%M:%S"  => 21/12/31 12:54:98
         "%y-%m-%d %H:%M:%S"  => 2021-12-31 24:58:01
diff --git a/crates/nu_plugin_polars/src/dataframe/series/date/get_day.rs b/crates/nu_plugin_polars/src/dataframe/series/date/get_day.rs
index ea26f4999c..014b345aa2 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/date/get_day.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/date/get_day.rs
@@ -21,7 +21,7 @@ impl PluginCommand for GetDay {
         "polars get-day"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Gets day from date."
     }
 
@@ -58,7 +58,7 @@ impl PluginCommand for GetDay {
         command(plugin, engine, call, input).map_err(LabeledError::from)
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         ""
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/date/get_hour.rs b/crates/nu_plugin_polars/src/dataframe/series/date/get_hour.rs
index d8f6e2e1c1..0ff5c2d0b7 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/date/get_hour.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/date/get_hour.rs
@@ -21,7 +21,7 @@ impl PluginCommand for GetHour {
         "polars get-hour"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Gets hour from date."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/date/get_minute.rs b/crates/nu_plugin_polars/src/dataframe/series/date/get_minute.rs
index bb2f0abc19..a1505bf25b 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/date/get_minute.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/date/get_minute.rs
@@ -19,7 +19,7 @@ impl PluginCommand for GetMinute {
         "polars get-minute"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Gets minute from date."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/date/get_month.rs b/crates/nu_plugin_polars/src/dataframe/series/date/get_month.rs
index 141665d371..5ce06aee68 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/date/get_month.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/date/get_month.rs
@@ -21,7 +21,7 @@ impl PluginCommand for GetMonth {
         "polars get-month"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Gets month from date."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/date/get_nanosecond.rs b/crates/nu_plugin_polars/src/dataframe/series/date/get_nanosecond.rs
index a94f82add5..e5431dd7c7 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/date/get_nanosecond.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/date/get_nanosecond.rs
@@ -21,7 +21,7 @@ impl PluginCommand for GetNanosecond {
         "polars get-nanosecond"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Gets nanosecond from date."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/date/get_ordinal.rs b/crates/nu_plugin_polars/src/dataframe/series/date/get_ordinal.rs
index 7f074df8d9..8120751466 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/date/get_ordinal.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/date/get_ordinal.rs
@@ -21,7 +21,7 @@ impl PluginCommand for GetOrdinal {
         "polars get-ordinal"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Gets ordinal from date."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/date/get_second.rs b/crates/nu_plugin_polars/src/dataframe/series/date/get_second.rs
index bf11804443..4764bd1968 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/date/get_second.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/date/get_second.rs
@@ -21,7 +21,7 @@ impl PluginCommand for GetSecond {
         "polars get-second"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Gets second from date."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/date/get_week.rs b/crates/nu_plugin_polars/src/dataframe/series/date/get_week.rs
index c3b5724bc4..4418a51f3a 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/date/get_week.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/date/get_week.rs
@@ -21,7 +21,7 @@ impl PluginCommand for GetWeek {
         "polars get-week"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Gets week from date."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/date/get_weekday.rs b/crates/nu_plugin_polars/src/dataframe/series/date/get_weekday.rs
index e495370718..6863f161f7 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/date/get_weekday.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/date/get_weekday.rs
@@ -21,7 +21,7 @@ impl PluginCommand for GetWeekDay {
         "polars get-weekday"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Gets weekday from date."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/date/get_year.rs b/crates/nu_plugin_polars/src/dataframe/series/date/get_year.rs
index 380cd6367d..70c516a03b 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/date/get_year.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/date/get_year.rs
@@ -21,7 +21,7 @@ impl PluginCommand for GetYear {
         "polars get-year"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Gets year from date."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/indexes/arg_sort.rs b/crates/nu_plugin_polars/src/dataframe/series/indexes/arg_sort.rs
index 17f2e4477a..06359f4354 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/indexes/arg_sort.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/indexes/arg_sort.rs
@@ -18,7 +18,7 @@ impl PluginCommand for ArgSort {
         "polars arg-sort"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns indexes for a sorted series."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/indexes/arg_true.rs b/crates/nu_plugin_polars/src/dataframe/series/indexes/arg_true.rs
index ae0ec101ca..0cb8f75c03 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/indexes/arg_true.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/indexes/arg_true.rs
@@ -18,7 +18,7 @@ impl PluginCommand for ArgTrue {
         "polars arg-true"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns indexes where values are true."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/indexes/arg_unique.rs b/crates/nu_plugin_polars/src/dataframe/series/indexes/arg_unique.rs
index 542d9ed0b1..ef2946bfab 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/indexes/arg_unique.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/indexes/arg_unique.rs
@@ -18,7 +18,7 @@ impl PluginCommand for ArgUnique {
         "polars arg-unique"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns indexes for unique values."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/indexes/set_with_idx.rs b/crates/nu_plugin_polars/src/dataframe/series/indexes/set_with_idx.rs
index 436ba92f96..52a8894556 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/indexes/set_with_idx.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/indexes/set_with_idx.rs
@@ -22,7 +22,7 @@ impl PluginCommand for SetWithIndex {
         "polars set-with-idx"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Sets value in the given index."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/masks/is_duplicated.rs b/crates/nu_plugin_polars/src/dataframe/series/masks/is_duplicated.rs
index 3e4f54cbcf..97709730a9 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/masks/is_duplicated.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/masks/is_duplicated.rs
@@ -18,7 +18,7 @@ impl PluginCommand for IsDuplicated {
         "polars is-duplicated"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Creates mask indicating duplicated values."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/masks/is_not_null.rs b/crates/nu_plugin_polars/src/dataframe/series/masks/is_not_null.rs
index b7e506a67c..242870bcb8 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/masks/is_not_null.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/masks/is_not_null.rs
@@ -20,7 +20,7 @@ impl PluginCommand for IsNotNull {
         "polars is-not-null"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Creates mask where value is not null."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/masks/is_null.rs b/crates/nu_plugin_polars/src/dataframe/series/masks/is_null.rs
index bc04e7fb76..69f751d74e 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/masks/is_null.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/masks/is_null.rs
@@ -22,7 +22,7 @@ impl PluginCommand for IsNull {
         "polars is-null"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Creates mask where value is null."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/masks/is_unique.rs b/crates/nu_plugin_polars/src/dataframe/series/masks/is_unique.rs
index 76a1ab6193..b6438c5bf8 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/masks/is_unique.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/masks/is_unique.rs
@@ -18,7 +18,7 @@ impl PluginCommand for IsUnique {
         "polars is-unique"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Creates mask indicating unique values."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/masks/not.rs b/crates/nu_plugin_polars/src/dataframe/series/masks/not.rs
index 774f2ddeb5..2759e117fa 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/masks/not.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/masks/not.rs
@@ -19,7 +19,7 @@ impl PluginCommand for NotSeries {
         "polars not"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Inverts boolean mask."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/masks/set.rs b/crates/nu_plugin_polars/src/dataframe/series/masks/set.rs
index 3b7697c45b..d38508ad51 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/masks/set.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/masks/set.rs
@@ -19,7 +19,7 @@ impl PluginCommand for SetSeries {
         "polars set"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Sets value where given mask is true."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/n_null.rs b/crates/nu_plugin_polars/src/dataframe/series/n_null.rs
index 16aa5d0a52..cfe69853a7 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/n_null.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/n_null.rs
@@ -17,7 +17,7 @@ impl PluginCommand for NNull {
         "polars count-null"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Counts null values."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/n_unique.rs b/crates/nu_plugin_polars/src/dataframe/series/n_unique.rs
index 51c6e1bdb3..381017f9e7 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/n_unique.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/n_unique.rs
@@ -19,7 +19,7 @@ impl PluginCommand for NUnique {
         "polars n-unique"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Counts unique values."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/rolling.rs b/crates/nu_plugin_polars/src/dataframe/series/rolling.rs
index 72394d3375..b63b5048be 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/rolling.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/rolling.rs
@@ -53,7 +53,7 @@ impl PluginCommand for Rolling {
         "polars rolling"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Rolling calculation for a series."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/shift.rs b/crates/nu_plugin_polars/src/dataframe/series/shift.rs
index 58dc64ec47..51c8242e51 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/shift.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/shift.rs
@@ -24,7 +24,7 @@ impl PluginCommand for Shift {
         "polars shift"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Shifts the values by a given period."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/concatenate.rs b/crates/nu_plugin_polars/src/dataframe/series/string/concatenate.rs
index 3d3f3a598c..b7663bfa41 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/string/concatenate.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/string/concatenate.rs
@@ -19,7 +19,7 @@ impl PluginCommand for Concatenate {
         "polars concatenate"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Concatenates strings with other array."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/contains.rs b/crates/nu_plugin_polars/src/dataframe/series/string/contains.rs
index 513925b788..50068ea51b 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/string/contains.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/string/contains.rs
@@ -19,7 +19,7 @@ impl PluginCommand for Contains {
         "polars contains"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Checks if a pattern is contained in a string."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/replace.rs b/crates/nu_plugin_polars/src/dataframe/series/string/replace.rs
index b1c5f0ebd9..9d7d097f60 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/string/replace.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/string/replace.rs
@@ -19,7 +19,7 @@ impl PluginCommand for Replace {
         "polars replace"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Replace the leftmost (sub)string by a regex pattern."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/replace_all.rs b/crates/nu_plugin_polars/src/dataframe/series/string/replace_all.rs
index c1ae02218a..d88b581451 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/string/replace_all.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/string/replace_all.rs
@@ -19,7 +19,7 @@ impl PluginCommand for ReplaceAll {
         "polars replace-all"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Replace all (sub)strings by a regex pattern."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/str_lengths.rs b/crates/nu_plugin_polars/src/dataframe/series/string/str_lengths.rs
index ef664d8a63..417d3c0b90 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/string/str_lengths.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/string/str_lengths.rs
@@ -18,7 +18,7 @@ impl PluginCommand for StrLengths {
         "polars str-lengths"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Get lengths of all strings."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/str_slice.rs b/crates/nu_plugin_polars/src/dataframe/series/string/str_slice.rs
index a35ac43852..d81500a7cd 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/string/str_slice.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/string/str_slice.rs
@@ -22,7 +22,7 @@ impl PluginCommand for StrSlice {
         "polars str-slice"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Slices the string from the start position until the selected length."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/strftime.rs b/crates/nu_plugin_polars/src/dataframe/series/string/strftime.rs
index d793c3910f..85d3aa84a0 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/string/strftime.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/string/strftime.rs
@@ -19,7 +19,7 @@ impl PluginCommand for StrFTime {
         "polars strftime"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Formats date based on string rule."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/to_lowercase.rs b/crates/nu_plugin_polars/src/dataframe/series/string/to_lowercase.rs
index d3aebd693a..f12ece825c 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/string/to_lowercase.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/string/to_lowercase.rs
@@ -18,7 +18,7 @@ impl PluginCommand for ToLowerCase {
         "polars lowercase"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Lowercase the strings in the column."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/to_uppercase.rs b/crates/nu_plugin_polars/src/dataframe/series/string/to_uppercase.rs
index e178e57cf8..e252656d46 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/string/to_uppercase.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/string/to_uppercase.rs
@@ -18,7 +18,7 @@ impl PluginCommand for ToUpperCase {
         "polars uppercase"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Uppercase the strings in the column."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/unique.rs b/crates/nu_plugin_polars/src/dataframe/series/unique.rs
index 7626b35404..991d22b096 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/unique.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/unique.rs
@@ -23,7 +23,7 @@ impl PluginCommand for Unique {
         "polars unique"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns unique values from a dataframe."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/value_counts.rs b/crates/nu_plugin_polars/src/dataframe/series/value_counts.rs
index 16471e7b9f..bb228af8bb 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/value_counts.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/value_counts.rs
@@ -20,7 +20,7 @@ impl PluginCommand for ValueCount {
         "polars value-counts"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns a dataframe with the counts for unique values in series."
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/stub.rs b/crates/nu_plugin_polars/src/dataframe/stub.rs
index 160069f04c..ff8d80fcca 100644
--- a/crates/nu_plugin_polars/src/dataframe/stub.rs
+++ b/crates/nu_plugin_polars/src/dataframe/stub.rs
@@ -13,7 +13,7 @@ impl PluginCommand for PolarsCmd {
         "polars"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Operate with data in a dataframe format."
     }
 
@@ -23,7 +23,7 @@ impl PluginCommand for PolarsCmd {
             .input_output_types(vec![(Type::Nothing, Type::String)])
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "You must use one of the following subcommands. Using this command as-is will only produce this help message."
     }
 
diff --git a/crates/nu_plugin_python/nu_plugin_python_example.py b/crates/nu_plugin_python/nu_plugin_python_example.py
index a47ce46997..1fdb5bd076 100755
--- a/crates/nu_plugin_python/nu_plugin_python_example.py
+++ b/crates/nu_plugin_python/nu_plugin_python_example.py
@@ -44,8 +44,8 @@ def signatures():
             {
                 "sig": {
                     "name": "nu-python",
-                    "usage": "Signature test for Python",
-                    "extra_usage": "",
+                    "description": "Signature test for Python",
+                    "extra_description": "",
                     "required_positional": [
                         {
                             "name": "a",
diff --git a/crates/nu_plugin_query/src/query.rs b/crates/nu_plugin_query/src/query.rs
index 273fc858c6..89a0efc97c 100644
--- a/crates/nu_plugin_query/src/query.rs
+++ b/crates/nu_plugin_query/src/query.rs
@@ -12,10 +12,6 @@ impl Query {
     pub fn new() -> Self {
         Default::default()
     }
-
-    pub fn usage() -> &'static str {
-        "Usage: query"
-    }
 }
 
 impl Plugin for Query {
@@ -44,7 +40,7 @@ impl SimplePluginCommand for QueryCommand {
         "query"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Show all the query commands"
     }
 
diff --git a/crates/nu_plugin_query/src/query_json.rs b/crates/nu_plugin_query/src/query_json.rs
index ee8b919d12..b5f8bd7add 100644
--- a/crates/nu_plugin_query/src/query_json.rs
+++ b/crates/nu_plugin_query/src/query_json.rs
@@ -12,7 +12,7 @@ impl SimplePluginCommand for QueryJson {
         "query json"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "execute json query on json file (open --raw <file> | query json 'query string')"
     }
 
diff --git a/crates/nu_plugin_query/src/query_web.rs b/crates/nu_plugin_query/src/query_web.rs
index 2d57af6021..e6723d72f4 100644
--- a/crates/nu_plugin_query/src/query_web.rs
+++ b/crates/nu_plugin_query/src/query_web.rs
@@ -14,7 +14,7 @@ impl SimplePluginCommand for QueryWeb {
         "query web"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "execute selector query on html/web"
     }
 
diff --git a/crates/nu_plugin_query/src/query_webpage_info.rs b/crates/nu_plugin_query/src/query_webpage_info.rs
index f38f7241f5..74a7be94c3 100644
--- a/crates/nu_plugin_query/src/query_webpage_info.rs
+++ b/crates/nu_plugin_query/src/query_webpage_info.rs
@@ -12,7 +12,7 @@ impl SimplePluginCommand for QueryWebpageInfo {
         "query webpage-info"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "uses the webpage crate to extract info from html: title, description, language, links, RSS feeds, Opengraph, Schema.org, and more"
     }
 
diff --git a/crates/nu_plugin_query/src/query_xml.rs b/crates/nu_plugin_query/src/query_xml.rs
index 09bbde13df..5f46ce4355 100644
--- a/crates/nu_plugin_query/src/query_xml.rs
+++ b/crates/nu_plugin_query/src/query_xml.rs
@@ -15,7 +15,7 @@ impl SimplePluginCommand for QueryXml {
         "query xml"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "execute xpath query on xml"
     }
 
diff --git a/crates/nu_plugin_stress_internals/src/main.rs b/crates/nu_plugin_stress_internals/src/main.rs
index 79cbb92549..74539a04e0 100644
--- a/crates/nu_plugin_stress_internals/src/main.rs
+++ b/crates/nu_plugin_stress_internals/src/main.rs
@@ -201,8 +201,8 @@ fn signatures() -> Vec<Value> {
     vec![json!({
         "sig": {
             "name": "stress_internals",
-            "usage": "Used to test behavior of plugin protocol",
-            "extra_usage": "",
+            "description": "Used to test behavior of plugin protocol",
+            "extra_description": "",
             "search_terms": [],
             "required_positional": [],
             "optional_positional": [],
diff --git a/src/command.rs b/src/command.rs
index 5ba8a60996..57ecd98edc 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -304,7 +304,7 @@ impl Command for Nu {
 
     fn signature(&self) -> Signature {
         let mut signature = Signature::build("nu")
-            .usage("The nushell language and shell.")
+            .description("The nushell language and shell.")
             .named(
                 "commands",
                 SyntaxShape::String,
@@ -467,7 +467,7 @@ impl Command for Nu {
         signature
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "The nushell language and shell."
     }
 
diff --git a/src/ide.rs b/src/ide.rs
index 0a24bcd013..a08e7afcdf 100644
--- a/src/ide.rs
+++ b/src/ide.rs
@@ -203,11 +203,11 @@ pub fn hover(engine_state: &mut EngineState, file_path: &str, location: &Value)
             let mut description = String::new();
 
             // first description
-            description.push_str(&format!("{}\n", decl.usage()));
+            description.push_str(&format!("{}\n", decl.description()));
 
             // additional description
-            if !decl.extra_usage().is_empty() {
-                description.push_str(&format!("\n{}\n", decl.extra_usage()));
+            if !decl.extra_description().is_empty() {
+                description.push_str(&format!("\n{}\n", decl.extra_description()));
             }
 
             // Usage
diff --git a/tests/plugins/register.rs b/tests/plugins/register.rs
index 7ce641fec0..9260c5f4c1 100644
--- a/tests/plugins/register.rs
+++ b/tests/plugins/register.rs
@@ -11,7 +11,7 @@ fn help() {
         );
 
         assert!(actual.out.contains("test example 1"));
-        assert!(actual.out.contains("Extra usage for example one"));
+        assert!(actual.out.contains("Extra description for example one"));
     })
 }
 
diff --git a/tests/repl/test_parser.rs b/tests/repl/test_parser.rs
index a65e2c9a0f..b5ab6d735a 100644
--- a/tests/repl/test_parser.rs
+++ b/tests/repl/test_parser.rs
@@ -249,31 +249,31 @@ fn recursive_parse() -> TestResult {
 }
 
 #[test]
-fn commands_have_usage() -> TestResult {
+fn commands_have_description() -> TestResult {
     run_test_contains(
         r#"
     # This is a test
     #
-    # To see if I have cool usage
+    # To see if I have cool description
     def foo [] {}
     help foo"#,
-        "cool usage",
+        "cool description",
     )
 }
 
 #[test]
-fn commands_from_crlf_source_have_short_usage() -> TestResult {
+fn commands_from_crlf_source_have_short_description() -> TestResult {
     run_test_contains(
-        "# This is a test\r\n#\r\n# To see if I have cool usage\r\ndef foo [] {}\r\nscope commands | where name == foo | get usage.0",
+        "# This is a test\r\n#\r\n# To see if I have cool description\r\ndef foo [] {}\r\nscope commands | where name == foo | get description.0",
         "This is a test",
     )
 }
 
 #[test]
-fn commands_from_crlf_source_have_extra_usage() -> TestResult {
+fn commands_from_crlf_source_have_extra_description() -> TestResult {
     run_test_contains(
-        "# This is a test\r\n#\r\n# To see if I have cool usage\r\ndef foo [] {}\r\nscope commands | where name == foo | get extra_usage.0",
-        "To see if I have cool usage",
+        "# This is a test\r\n#\r\n# To see if I have cool description\r\ndef foo [] {}\r\nscope commands | where name == foo | get extra_description.0",
+        "To see if I have cool description",
     )
 }
 
diff --git a/tests/scope/mod.rs b/tests/scope/mod.rs
index bfcbb14958..ffcaa80bd7 100644
--- a/tests/scope/mod.rs
+++ b/tests/scope/mod.rs
@@ -92,7 +92,7 @@ fn correct_scope_modules_fields() {
     let module_setup = r#"
         # nice spam
         #
-        # and some extra usage for spam
+        # and some extra description for spam
 
         export module eggs {
             export module bacon {
@@ -120,17 +120,17 @@ fn correct_scope_modules_fields() {
 
         let inp = &[
             "use spam.nu",
-            "scope modules | where name == spam | get 0.usage",
+            "scope modules | where name == spam | get 0.description",
         ];
         let actual = nu!(cwd: dirs.test(), &inp.join("; "));
         assert_eq!(actual.out, "nice spam");
 
         let inp = &[
             "use spam.nu",
-            "scope modules | where name == spam | get 0.extra_usage",
+            "scope modules | where name == spam | get 0.extra_description",
         ];
         let actual = nu!(cwd: dirs.test(), &inp.join("; "));
-        assert_eq!(actual.out, "and some extra usage for spam");
+        assert_eq!(actual.out, "and some extra description for spam");
 
         let inp = &[
             "use spam.nu",
@@ -209,7 +209,7 @@ fn correct_scope_aliases_fields() {
 
         let inp = &[
             "use spam.nu",
-            "scope aliases | where name == 'spam xaz' | get 0.usage",
+            "scope aliases | where name == 'spam xaz' | get 0.description",
         ];
         let actual = nu!(cwd: dirs.test(), &inp.join("; "));
         assert_eq!(actual.out, "nice alias");
@@ -259,14 +259,14 @@ fn correct_scope_externs_fields() {
 
         let inp = &[
             "use spam.nu",
-            "scope externs | where name == 'spam git' | get 0.usage",
+            "scope externs | where name == 'spam git' | get 0.description",
         ];
         let actual = nu!(cwd: dirs.test(), &inp.join("; "));
         assert_eq!(actual.out, "nice extern");
 
         let inp = &[
             "use spam.nu",
-            "scope externs | where name == 'spam git' | get 0.usage | str contains (char nl)",
+            "scope externs | where name == 'spam git' | get 0.description | str contains (char nl)",
         ];
         let actual = nu!(cwd: dirs.test(), &inp.join("; "));
         assert_eq!(actual.out, "false");

From ffddee5678367c6d8ddc1113460ad6009a4142bb Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 22 Aug 2024 05:09:27 -0500
Subject: [PATCH 0363/1072] add more granularity for into record with dates
 (#13650)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

This PR adds a little more granularity when using `into record` with
dates.

### Before
```nushell
❯ date now | into record
╭──────────┬────────╮
│ year     │ 2024   │
│ month    │ 8      │
│ day      │ 19     │
│ hour     │ 18     │
│ minute   │ 31     │
│ second   │ 27     │
│ timezone │ -05:00 │
╰──────────┴────────╯
```

### After
```nushell
❯ date now | into record
╭─────────────┬────────╮
│ year        │ 2024   │
│ month       │ 8      │
│ day         │ 19     │
│ hour        │ 18     │
│ minute      │ 30     │
│ second      │ 51     │
│ millisecond │ 928    │
│ microsecond │ 980    │
│ nanosecond  │ 0      │
│ timezone    │ -05:00 │
╰─────────────┴────────╯
```
---
 crates/nu-command/src/conversions/into/record.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/crates/nu-command/src/conversions/into/record.rs b/crates/nu-command/src/conversions/into/record.rs
index 6290739060..445d81cb86 100644
--- a/crates/nu-command/src/conversions/into/record.rs
+++ b/crates/nu-command/src/conversions/into/record.rs
@@ -93,6 +93,9 @@ impl Command for SubCommand {
                     "hour" =>     Value::test_int(22),
                     "minute" =>   Value::test_int(10),
                     "second" =>   Value::test_int(57),
+                    "millisecond" => Value::test_int(0),
+                    "microsecond" => Value::test_int(0),
+                    "nanosecond" => Value::test_int(0),
                     "timezone" => Value::test_string("+02:00"),
                 })),
             },
@@ -187,6 +190,9 @@ fn parse_date_into_record(date: DateTime<FixedOffset>, span: Span) -> Value {
             "hour" => Value::int(date.hour() as i64, span),
             "minute" => Value::int(date.minute() as i64, span),
             "second" => Value::int(date.second() as i64, span),
+            "millisecond" => Value::int(date.timestamp_subsec_millis() as i64, span),
+            "microsecond" => Value::int((date.nanosecond() / 1_000 % 1_000) as i64, span),
+            "nanosecond" => Value::int((date.nanosecond() % 1_000) as i64, span),
             "timezone" => Value::string(date.offset().to_string(), span),
         },
         span,

From 43dcf19ac3daa388f505eaab01c59aeb9df72b0d Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Thu, 22 Aug 2024 21:22:10 +0200
Subject: [PATCH 0364/1072] Fix `bits ror`/`bits rol` implementation (#13673)

# Description
`bits rol` and `bits ror` were both undefined for the full byte rotates
and panicked when exceeding the byte rotation range.
`bits ror` further more produced nonsensical results by pulling bits
from the following byte instead of the preceding byte.

Those bugs are now fixed

# User-Facing Changes
Sound Nushell `IncorrectValue` error when exceeding the available bits

# Tests + Formatting
Added the necessary tests
---
 .../src/extra/bits/rotate_left.rs             |  74 ++++++++++--
 .../src/extra/bits/rotate_right.rs            |  75 ++++++++++--
 tests/repl/test_bits.rs                       | 110 +++++++++++++++++-
 3 files changed, 236 insertions(+), 23 deletions(-)

diff --git a/crates/nu-cmd-extra/src/extra/bits/rotate_left.rs b/crates/nu-cmd-extra/src/extra/bits/rotate_left.rs
index e1560fb157..59e772df64 100644
--- a/crates/nu-cmd-extra/src/extra/bits/rotate_left.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/rotate_left.rs
@@ -1,11 +1,10 @@
 use super::{get_input_num_type, get_number_bytes, InputNumType, NumberBytes};
-use itertools::Itertools;
 use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
 
 struct Arguments {
     signed: bool,
-    bits: usize,
+    bits: Spanned<usize>,
     number_size: NumberBytes,
 }
 
@@ -69,7 +68,7 @@ impl Command for BitsRol {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
-        let bits: usize = call.req(engine_state, stack, 0)?;
+        let bits = call.req(engine_state, stack, 0)?;
         let signed = call.has_flag(engine_state, stack, "signed")?;
         let number_bytes: Option<Spanned<usize>> =
             call.get_flag(engine_state, stack, "number-bytes")?;
@@ -119,6 +118,8 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
         number_size,
         bits,
     } = *args;
+    let bits_span = bits.span;
+    let bits = bits.item;
 
     match input {
         Value::Int { val, .. } => {
@@ -127,6 +128,19 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
             let bits = bits as u32;
             let input_num_type = get_input_num_type(val, signed, number_size);
 
+            if bits > input_num_type.num_bits() {
+                return Value::error(
+                    ShellError::IncorrectValue {
+                        msg: format!(
+                            "Trying to rotate by more than the available bits ({})",
+                            input_num_type.num_bits()
+                        ),
+                        val_span: bits_span,
+                        call_span: span,
+                    },
+                    span,
+                );
+            }
             let int = match input_num_type {
                 One => (val as u8).rotate_left(bits) as i64,
                 Two => (val as u16).rotate_left(bits) as i64,
@@ -157,16 +171,28 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
             Value::int(int, span)
         }
         Value::Binary { val, .. } => {
+            let len = val.len();
+            if bits > len * 8 {
+                return Value::error(
+                    ShellError::IncorrectValue {
+                        msg: format!(
+                            "Trying to rotate by more than the available bits ({})",
+                            len * 8
+                        ),
+                        val_span: bits_span,
+                        call_span: span,
+                    },
+                    span,
+                );
+            }
             let byte_shift = bits / 8;
             let bit_rotate = bits % 8;
 
-            let mut bytes = val
-                .iter()
-                .copied()
-                .circular_tuple_windows::<(u8, u8)>()
-                .map(|(lhs, rhs)| (lhs << bit_rotate) | (rhs >> (8 - bit_rotate)))
-                .collect::<Vec<u8>>();
-            bytes.rotate_left(byte_shift);
+            let bytes = if bit_rotate == 0 {
+                rotate_bytes_left(val, byte_shift)
+            } else {
+                rotate_bytes_and_bits_left(val, byte_shift, bit_rotate)
+            };
 
             Value::binary(bytes, span)
         }
@@ -184,6 +210,34 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
     }
 }
 
+fn rotate_bytes_left(data: &[u8], byte_shift: usize) -> Vec<u8> {
+    let len = data.len();
+    let mut output = vec![0; len];
+    output[..len - byte_shift].copy_from_slice(&data[byte_shift..]);
+    output[len - byte_shift..].copy_from_slice(&data[..byte_shift]);
+    output
+}
+
+fn rotate_bytes_and_bits_left(data: &[u8], byte_shift: usize, bit_shift: usize) -> Vec<u8> {
+    debug_assert!(byte_shift < data.len());
+    debug_assert!(
+        (1..8).contains(&bit_shift),
+        "Bit shifts of 0 can't be handled by this impl and everything else should be part of the byteshift");
+    let mut bytes = Vec::with_capacity(data.len());
+    let mut next_index = byte_shift;
+    for _ in 0..data.len() {
+        let curr_byte = data[next_index];
+        next_index += 1;
+        if next_index == data.len() {
+            next_index = 0;
+        }
+        let next_byte = data[next_index];
+        let new_byte = (curr_byte << bit_shift) | (next_byte >> (8 - bit_shift));
+        bytes.push(new_byte);
+    }
+    bytes
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/crates/nu-cmd-extra/src/extra/bits/rotate_right.rs b/crates/nu-cmd-extra/src/extra/bits/rotate_right.rs
index ed5fc49bd8..6017d0b5cf 100644
--- a/crates/nu-cmd-extra/src/extra/bits/rotate_right.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/rotate_right.rs
@@ -1,11 +1,10 @@
 use super::{get_input_num_type, get_number_bytes, InputNumType, NumberBytes};
-use itertools::Itertools;
 use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
 
 struct Arguments {
     signed: bool,
-    bits: usize,
+    bits: Spanned<usize>,
     number_size: NumberBytes,
 }
 
@@ -69,7 +68,7 @@ impl Command for BitsRor {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
-        let bits: usize = call.req(engine_state, stack, 0)?;
+        let bits = call.req(engine_state, stack, 0)?;
         let signed = call.has_flag(engine_state, stack, "signed")?;
         let number_bytes: Option<Spanned<usize>> =
             call.get_flag(engine_state, stack, "number-bytes")?;
@@ -123,6 +122,8 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
         number_size,
         bits,
     } = *args;
+    let bits_span = bits.span;
+    let bits = bits.item;
 
     match input {
         Value::Int { val, .. } => {
@@ -131,6 +132,19 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
             let bits = bits as u32;
             let input_num_type = get_input_num_type(val, signed, number_size);
 
+            if bits > input_num_type.num_bits() {
+                return Value::error(
+                    ShellError::IncorrectValue {
+                        msg: format!(
+                            "Trying to rotate by more than the available bits ({})",
+                            input_num_type.num_bits()
+                        ),
+                        val_span: bits_span,
+                        call_span: span,
+                    },
+                    span,
+                );
+            }
             let int = match input_num_type {
                 One => (val as u8).rotate_right(bits) as i64,
                 Two => (val as u16).rotate_right(bits) as i64,
@@ -161,16 +175,28 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
             Value::int(int, span)
         }
         Value::Binary { val, .. } => {
+            let len = val.len();
+            if bits > len * 8 {
+                return Value::error(
+                    ShellError::IncorrectValue {
+                        msg: format!(
+                            "Trying to rotate by more than the available bits ({})",
+                            len * 8
+                        ),
+                        val_span: bits_span,
+                        call_span: span,
+                    },
+                    span,
+                );
+            }
             let byte_shift = bits / 8;
             let bit_rotate = bits % 8;
 
-            let mut bytes = val
-                .iter()
-                .copied()
-                .circular_tuple_windows::<(u8, u8)>()
-                .map(|(lhs, rhs)| (lhs >> bit_rotate) | (rhs << (8 - bit_rotate)))
-                .collect::<Vec<u8>>();
-            bytes.rotate_right(byte_shift);
+            let bytes = if bit_rotate == 0 {
+                rotate_bytes_right(val, byte_shift)
+            } else {
+                rotate_bytes_and_bits_right(val, byte_shift, bit_rotate)
+            };
 
             Value::binary(bytes, span)
         }
@@ -188,6 +214,35 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
     }
 }
 
+fn rotate_bytes_right(data: &[u8], byte_shift: usize) -> Vec<u8> {
+    let len = data.len();
+    let mut output = vec![0; len];
+    output[byte_shift..].copy_from_slice(&data[..len - byte_shift]);
+    output[..byte_shift].copy_from_slice(&data[len - byte_shift..]);
+    output
+}
+
+fn rotate_bytes_and_bits_right(data: &[u8], byte_shift: usize, bit_shift: usize) -> Vec<u8> {
+    debug_assert!(byte_shift < data.len());
+    debug_assert!(
+        (1..8).contains(&bit_shift),
+        "Bit shifts of 0 can't be handled by this impl and everything else should be part of the byteshift"
+    );
+    let mut bytes = Vec::with_capacity(data.len());
+    let mut previous_index = data.len() - byte_shift - 1;
+    for _ in 0..data.len() {
+        let previous_byte = data[previous_index];
+        previous_index += 1;
+        if previous_index == data.len() {
+            previous_index = 0;
+        }
+        let curr_byte = data[previous_index];
+        let rotated_byte = (curr_byte >> bit_shift) | (previous_byte << (8 - bit_shift));
+        bytes.push(rotated_byte);
+    }
+
+    bytes
+}
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/tests/repl/test_bits.rs b/tests/repl/test_bits.rs
index 8848ea9f98..05c7ebad05 100644
--- a/tests/repl/test_bits.rs
+++ b/tests/repl/test_bits.rs
@@ -241,20 +241,124 @@ fn bits_rotate_left_list() -> TestResult {
     )
 }
 
+#[test]
+fn bits_rotate_left_negative_operand() -> TestResult {
+    fail_test("8 | bits rol -2", "positive value")
+}
+#[test]
+fn bits_rotate_left_exceeding1() -> TestResult {
+    // We have no type accepting more than 64 bits so guaranteed fail
+    fail_test("8 | bits rol 65", "more than the available bits (8)")
+}
+
+#[test]
+fn bits_rotate_left_exceeding2() -> TestResult {
+    // This is purely down to the current autodetect feature limiting to the smallest integer
+    // type thus assuming a u8
+    fail_test("8 | bits rol 9", "more than the available bits (8)")
+}
+
+#[test]
+fn bits_rotate_left_binary1() -> TestResult {
+    run_test(
+        "0x[01 30 80] | bits rol 3 | into bits",
+        "00001001 10000100 00000000",
+    )
+}
+
+#[test]
+fn bits_rotate_left_binary2() -> TestResult {
+    // Whole byte case
+    run_test(
+        "0x[01 30 80] | bits rol 8 | into bits",
+        "00110000 10000000 00000001",
+    )
+}
+
+#[test]
+fn bits_rotate_left_binary3() -> TestResult {
+    // Compared to the int case this is made inclusive of the bit count
+    run_test(
+        "0x[01 30 80] | bits rol 24 | into bits",
+        "00000001 00110000 10000000",
+    )
+}
+
+#[test]
+fn bits_rotate_left_binary4() -> TestResult {
+    // Shifting by both bytes and bits
+    run_test(
+        "0x[01 30 80] | bits rol 15 | into bits",
+        "01000000 00000000 10011000",
+    )
+}
+
 #[test]
 fn bits_rotate_right() -> TestResult {
-    run_test("2 | bits ror 62", "8")
+    run_test("2 | bits ror 6", "8")
 }
 
 #[test]
 fn bits_rotate_right_negative() -> TestResult {
-    run_test("-3 | bits ror 60", "-33")
+    run_test("-3 | bits ror 4", "-33")
 }
 
 #[test]
 fn bits_rotate_right_list() -> TestResult {
     run_test(
-        "[1 2 7 32 23 10] | bits ror 60 | str join '.'",
+        "[1 2 7 32 23 10] | bits ror 4 | str join '.'",
         "16.32.112.2.113.160",
     )
 }
+#[test]
+fn bits_rotate_right_negative_operand() -> TestResult {
+    fail_test("8 | bits ror -2", "positive value")
+}
+
+#[test]
+fn bits_rotate_right_exceeding1() -> TestResult {
+    // We have no type accepting more than 64 bits so guaranteed fail
+    fail_test("8 | bits ror 65", "more than the available bits (8)")
+}
+
+#[test]
+fn bits_rotate_right_exceeding2() -> TestResult {
+    // This is purely down to the current autodetect feature limiting to the smallest integer
+    // type thus assuming a u8
+    fail_test("8 | bits ror 9", "more than the available bits (8)")
+}
+
+#[test]
+fn bits_rotate_right_binary1() -> TestResult {
+    run_test(
+        "0x[01 30 80] | bits ror 3 | into bits",
+        "00000000 00100110 00010000",
+    )
+}
+
+#[test]
+fn bits_rotate_right_binary2() -> TestResult {
+    // Whole byte case
+    run_test(
+        "0x[01 30 80] | bits ror 8 | into bits",
+        "10000000 00000001 00110000",
+    )
+}
+
+#[test]
+fn bits_rotate_right_binary3() -> TestResult {
+    // Compared to the int case this is made inclusive of the bit count
+    run_test(
+        "0x[01 30 80] | bits ror 24 | into bits",
+        "00000001 00110000 10000000",
+    )
+}
+
+#[test]
+fn bits_rotate_right_binary4() -> TestResult {
+    // Shifting by both bytes and bits
+    run_test(
+        "0x[01 30 80] | bits ror 15 | into bits",
+        "01100001 00000000 00000010",
+    )
+}

From 712fec166d7fed06022c654b756c7c130215d5f0 Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Fri, 23 Aug 2024 00:59:00 +0200
Subject: [PATCH 0365/1072] Improve working with `IntoValue` and `FromValue`
 for byte collections (#13641)

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

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

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

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
I was working with byte collections like `Vec<u8>` and
[`bytes::Bytes`](https://docs.rs/bytes/1.7.1/bytes/struct.Bytes.html),
both are currently not possible to be used directly in a struct that
derives `IntoValue` and `FromValue` at the same time. The `Vec<u8>` will
convert itself into a `Value::List` but expects a `Value::String` or
`Value::Binary` to load from. I now also implemented that it can load
from `Value::List` just like the other `Vec<uX>` versions. For further
working with byte collections the type `bytes::Bytes` is wildly used,
therefore I added a implementation for it. `bytes` is already part of
the dependency graph as many crates (more than 5000 to crates.io) use
it.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
User of `nu-protocol` as library, e.g. plugin developers, can now use
byte collections more easily in their data structures and derive
`IntoValue` and `FromValue` for it.

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

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

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

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->
I added a few tests that check that these byte collections are correctly
translated in and from `Value`. They live in `test_derive.rs` as part of
the `ByteContainer` and I also explicitely tested that `FromValue` for
`Vec<u8>` works as expected.

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
Maybe it should be explored if `Value::Binary` should use `bytes::Bytes`
instead of `Vec<u8>`.
---
 Cargo.lock                                  |   1 +
 Cargo.toml                                  |   1 +
 crates/nu-protocol/Cargo.toml               |   1 +
 crates/nu-protocol/src/value/from_value.rs  | 116 ++++++++++++++++----
 crates/nu-protocol/src/value/into_value.rs  |   8 ++
 crates/nu-protocol/src/value/test_derive.rs |  54 +++++++++
 6 files changed, 162 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dd631a7e56..54d80b1449 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3364,6 +3364,7 @@ version = "0.97.2"
 dependencies = [
  "brotli",
  "byte-unit",
+ "bytes",
  "chrono",
  "chrono-humanize",
  "convert_case",
diff --git a/Cargo.toml b/Cargo.toml
index 1350a8d217..aa3eb60e45 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -69,6 +69,7 @@ base64 = "0.22.1"
 bracoxide = "0.1.2"
 brotli = "5.0"
 byteorder = "1.5"
+bytes = "1"
 bytesize = "1.3"
 calamine = "0.24.0"
 chardetng = "0.1.17"
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index e48f96a213..5a3829bbfe 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -19,6 +19,7 @@ nu-system = { path = "../nu-system", version = "0.97.2" }
 nu-derive-value = { path = "../nu-derive-value", version = "0.97.2" }
 
 brotli = { workspace = true, optional = true }
+bytes = { workspace = true }
 byte-unit = { version = "5.1", features = [ "serde" ] }
 chrono = { workspace = true, features = [ "serde", "std", "unstable-locales" ], default-features = false }
 chrono-humanize = { workspace = true }
diff --git a/crates/nu-protocol/src/value/from_value.rs b/crates/nu-protocol/src/value/from_value.rs
index 1c3bc7dfd4..d021b0b3a8 100644
--- a/crates/nu-protocol/src/value/from_value.rs
+++ b/crates/nu-protocol/src/value/from_value.rs
@@ -1,13 +1,14 @@
 use crate::{
     ast::{CellPath, PathMember},
     engine::Closure,
-    NuGlob, Range, Record, ShellError, Spanned, Type, Value,
+    NuGlob, Range, Record, ShellError, Span, Spanned, Type, Value,
 };
 use chrono::{DateTime, FixedOffset};
 use std::{
     any,
     cmp::Ordering,
     collections::{HashMap, VecDeque},
+    fmt,
     path::PathBuf,
     str::FromStr,
 };
@@ -221,20 +222,8 @@ macro_rules! impl_from_value_for_int {
                         "int should be within the valid range for {}",
                         stringify!($type)
                     ),
-                    i64::MIN..=MIN => ShellError::GenericError {
-                        error: "Integer too small".to_string(),
-                        msg: format!("{int} is smaller than {}", <$type>::MIN),
-                        span: Some(span),
-                        help: None,
-                        inner: vec![],
-                    },
-                    MAX..=i64::MAX => ShellError::GenericError {
-                        error: "Integer too large".to_string(),
-                        msg: format!("{int} is larger than {}", <$type>::MAX),
-                        span: Some(span),
-                        help: None,
-                        inner: vec![],
-                    },
+                    i64::MIN..=MIN => int_too_small_error(int, <$type>::MIN, span),
+                    MAX..=i64::MAX => int_too_large_error(int, <$type>::MAX, span),
                 })
             }
 
@@ -417,14 +406,31 @@ impl FromValue for String {
     }
 }
 
-// This impl is different from Vec<T> as it reads from Value::Binary and
-// Value::String instead of Value::List.
-// This also denies implementing FromValue for u8.
+// This impl is different from Vec<T> as it allows reading from Value::Binary and Value::String too.
+// This also denies implementing FromValue for u8 as it would be in conflict with the Vec<T> impl.
 impl FromValue for Vec<u8> {
     fn from_value(v: Value) -> Result<Self, ShellError> {
         match v {
             Value::Binary { val, .. } => Ok(val),
             Value::String { val, .. } => Ok(val.into_bytes()),
+            Value::List { vals, .. } => {
+                const U8MIN: i64 = u8::MIN as i64;
+                const U8MAX: i64 = u8::MAX as i64;
+                let mut this = Vec::with_capacity(vals.len());
+                for val in vals {
+                    let span = val.span();
+                    let int = i64::from_value(val)?;
+                    // calculating -1 on these ranges would be less readable
+                    #[allow(overlapping_range_endpoints)]
+                    #[allow(clippy::match_overlapping_arm)]
+                    match int {
+                        U8MIN..=U8MAX => this.push(int as u8),
+                        i64::MIN..=U8MIN => return Err(int_too_small_error(int, U8MIN, span)),
+                        U8MAX..=i64::MAX => return Err(int_too_large_error(int, U8MAX, span)),
+                    };
+                }
+                Ok(this)
+            }
             v => Err(ShellError::CantConvert {
                 to_type: Self::expected_type().to_string(),
                 from_type: v.get_type().to_string(),
@@ -664,9 +670,51 @@ where
     }
 }
 
+// Foreign Types
+
+impl FromValue for bytes::Bytes {
+    fn from_value(v: Value) -> Result<Self, ShellError> {
+        match v {
+            Value::Binary { val, .. } => Ok(val.into()),
+            v => Err(ShellError::CantConvert {
+                to_type: Self::expected_type().to_string(),
+                from_type: v.get_type().to_string(),
+                span: v.span(),
+                help: None,
+            }),
+        }
+    }
+
+    fn expected_type() -> Type {
+        Type::Binary
+    }
+}
+
+// Use generics with `fmt::Display` to allow passing different kinds of integer
+fn int_too_small_error(int: impl fmt::Display, min: impl fmt::Display, span: Span) -> ShellError {
+    ShellError::GenericError {
+        error: "Integer too small".to_string(),
+        msg: format!("{int} is smaller than {min}"),
+        span: Some(span),
+        help: None,
+        inner: vec![],
+    }
+}
+
+fn int_too_large_error(int: impl fmt::Display, max: impl fmt::Display, span: Span) -> ShellError {
+    ShellError::GenericError {
+        error: "Integer too large".to_string(),
+        msg: format!("{int} is larger than {max}"),
+        span: Some(span),
+        help: None,
+        inner: vec![],
+    }
+}
+
 #[cfg(test)]
 mod tests {
-    use crate::{engine::Closure, FromValue, Record, Type};
+    use crate::{engine::Closure, FromValue, IntoValue, Record, Span, Type, Value};
+    use std::ops::Deref;
 
     #[test]
     fn expected_type_default_impl() {
@@ -680,4 +728,34 @@ mod tests {
             Type::Custom("Closure".to_string().into_boxed_str())
         );
     }
+
+    #[test]
+    fn from_value_vec_u8() {
+        let vec: Vec<u8> = vec![1, 2, 3];
+        let span = Span::test_data();
+        let string = "Hello Vec<u8>!".to_string();
+
+        assert_eq!(
+            Vec::<u8>::from_value(vec.clone().into_value(span)).unwrap(),
+            vec.clone(),
+            "Vec<u8> roundtrip"
+        );
+
+        assert_eq!(
+            Vec::<u8>::from_value(Value::test_string(string.clone()))
+                .unwrap()
+                .deref(),
+            string.as_bytes(),
+            "Vec<u8> from String"
+        );
+
+        assert_eq!(
+            Vec::<u8>::from_value(Value::test_binary(vec.clone())).unwrap(),
+            vec,
+            "Vec<u8> from Binary"
+        );
+
+        assert!(Vec::<u8>::from_value(vec![u8::MIN as i32 - 1].into_value(span)).is_err());
+        assert!(Vec::<u8>::from_value(vec![u8::MAX as i32 + 1].into_value(span)).is_err());
+    }
 }
diff --git a/crates/nu-protocol/src/value/into_value.rs b/crates/nu-protocol/src/value/into_value.rs
index c27b19b651..5730f9d8da 100644
--- a/crates/nu-protocol/src/value/into_value.rs
+++ b/crates/nu-protocol/src/value/into_value.rs
@@ -172,6 +172,14 @@ impl IntoValue for Value {
     }
 }
 
+// Foreign Types
+
+impl IntoValue for bytes::Bytes {
+    fn into_value(self, span: Span) -> Value {
+        Value::binary(self.to_vec(), span)
+    }
+}
+
 // TODO: use this type for all the `into_value` methods that types implement but return a Result
 /// A trait for trying to convert a value into a `Value`.
 ///
diff --git a/crates/nu-protocol/src/value/test_derive.rs b/crates/nu-protocol/src/value/test_derive.rs
index 56bccabd2a..263d5f3ed4 100644
--- a/crates/nu-protocol/src/value/test_derive.rs
+++ b/crates/nu-protocol/src/value/test_derive.rs
@@ -1,4 +1,5 @@
 use crate::{record, FromValue, IntoValue, Record, Span, Value};
+use bytes::Bytes;
 use std::collections::HashMap;
 
 // Make nu_protocol available in this namespace, consumers of this crate will
@@ -440,3 +441,56 @@ enum_rename_all! {
     Flat: "flatcase" => ["alphaone", "betatwo", "charliethree"],
     UpperFlat: "UPPERFLATCASE" => ["ALPHAONE", "BETATWO", "CHARLIETHREE"]
 }
+
+#[derive(IntoValue, FromValue, Debug, PartialEq)]
+struct ByteContainer {
+    vec: Vec<u8>,
+    bytes: Bytes,
+}
+
+impl ByteContainer {
+    fn make() -> Self {
+        ByteContainer {
+            vec: vec![1, 2, 3],
+            bytes: Bytes::from_static(&[4, 5, 6]),
+        }
+    }
+
+    fn value() -> Value {
+        Value::test_record(record! {
+            "vec" => Value::test_list(vec![
+                Value::test_int(1),
+                Value::test_int(2),
+                Value::test_int(3),
+            ]),
+            "bytes" => Value::test_binary(vec![4, 5, 6]),
+        })
+    }
+}
+
+#[test]
+fn bytes_into_value() {
+    let expected = ByteContainer::value();
+    let actual = ByteContainer::make().into_test_value();
+    assert_eq!(expected, actual);
+}
+
+#[test]
+fn bytes_from_value() {
+    let expected = ByteContainer::make();
+    let actual = ByteContainer::from_value(ByteContainer::value()).unwrap();
+    assert_eq!(expected, actual);
+}
+
+#[test]
+fn bytes_roundtrip() {
+    let expected = ByteContainer::make();
+    let actual = ByteContainer::from_value(ByteContainer::make().into_test_value()).unwrap();
+    assert_eq!(expected, actual);
+
+    let expected = ByteContainer::value();
+    let actual = ByteContainer::from_value(ByteContainer::value())
+        .unwrap()
+        .into_test_value();
+    assert_eq!(expected, actual);
+}

From 39b0f3bdda781a8edf961bb6dc746033cff46988 Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Fri, 23 Aug 2024 13:47:15 +0200
Subject: [PATCH 0366/1072] Change expected type for derived `FromValue`
 implementations via attribute (#13647)

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

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

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

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
In this PR I expanded the helper attribute `#[nu_value]` on
`#[derive(FromValue)]`. It now allows the usage of `#[nu_value(type_name
= "...")]` to set a type name for the `FromValue::expected_type`
implementation. Currently it only uses the default implementation but
I'd like to change that without having to manually implement the entire
trait on my own.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
Users that derive `FromValue` may now change the name of the expected
type.

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

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

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

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->
I added some tests that check if this feature work and updated the
documentation about the derive macro.

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-derive-value/src/attributes.rs    |  7 ++
 crates/nu-derive-value/src/from.rs          | 96 +++++++++++++++++----
 crates/nu-derive-value/src/into.rs          |  4 +-
 crates/nu-derive-value/src/tests.rs         | 22 -----
 crates/nu-protocol/src/value/from_value.rs  | 11 ++-
 crates/nu-protocol/src/value/test_derive.rs | 21 +++++
 6 files changed, 117 insertions(+), 44 deletions(-)

diff --git a/crates/nu-derive-value/src/attributes.rs b/crates/nu-derive-value/src/attributes.rs
index 6969b64287..428c5aaae6 100644
--- a/crates/nu-derive-value/src/attributes.rs
+++ b/crates/nu-derive-value/src/attributes.rs
@@ -6,12 +6,14 @@ use crate::{error::DeriveError, HELPER_ATTRIBUTE};
 #[derive(Debug)]
 pub struct ContainerAttributes {
     pub rename_all: Case,
+    pub type_name: Option<String>,
 }
 
 impl Default for ContainerAttributes {
     fn default() -> Self {
         Self {
             rename_all: Case::Snake,
+            type_name: None,
         }
     }
 }
@@ -59,6 +61,11 @@ impl ContainerAttributes {
                         };
                         container_attrs.rename_all = case;
                     }
+                    "type_name" => {
+                        let type_name: LitStr = meta.value()?.parse()?;
+                        let type_name = type_name.value();
+                        container_attrs.type_name = Some(type_name);
+                    }
                     ident => {
                         err = Err(DeriveError::UnexpectedAttribute {
                             meta_span: ident.span(),
diff --git a/crates/nu-derive-value/src/from.rs b/crates/nu-derive-value/src/from.rs
index 783a22920e..901cc53d30 100644
--- a/crates/nu-derive-value/src/from.rs
+++ b/crates/nu-derive-value/src/from.rs
@@ -42,9 +42,7 @@ pub fn derive_from_value(input: TokenStream2) -> Result<TokenStream2, DeriveErro
 
 /// Implements the `#[derive(FromValue)]` macro for structs.
 ///
-/// This function ensures that the helper attribute is not used anywhere, as it is not supported for
-/// structs.
-/// Other than this, this function provides the impl signature for `FromValue`.
+/// This function provides the impl signature for `FromValue`.
 /// The implementation for `FromValue::from_value` is handled by [`struct_from_value`] and the
 /// `FromValue::expected_type` is handled by [`struct_expected_type`].
 fn derive_struct_from_value(
@@ -53,11 +51,12 @@ fn derive_struct_from_value(
     generics: Generics,
     attrs: Vec<Attribute>,
 ) -> Result<TokenStream2, DeriveError> {
-    attributes::deny(&attrs)?;
+    let container_attrs = ContainerAttributes::parse_attrs(attrs.iter())?;
     attributes::deny_fields(&data.fields)?;
     let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
     let from_value_impl = struct_from_value(&data);
-    let expected_type_impl = struct_expected_type(&data.fields);
+    let expected_type_impl =
+        struct_expected_type(&data.fields, container_attrs.type_name.as_deref());
     Ok(quote! {
         #[automatically_derived]
         impl #impl_generics nu_protocol::FromValue for #ident #ty_generics #where_clause {
@@ -219,13 +218,16 @@ fn struct_from_value(data: &DataStruct) -> TokenStream2 {
 /// `list[type0, type1, type2]`.
 /// No fields expect the `Type::Nothing`.
 ///
+/// If `#[nu_value(type_name = "...")]` is used, the output type will be `Type::Custom` with that
+/// passed name.
+///
 /// # Examples
 ///
 /// These examples show what the macro would generate.
 ///
 /// Struct with named fields:
 /// ```rust
-/// #[derive(IntoValue)]
+/// #[derive(FromValue)]
 /// struct Pet {
 ///     name: String,
 ///     age: u8,
@@ -256,7 +258,7 @@ fn struct_from_value(data: &DataStruct) -> TokenStream2 {
 ///
 /// Struct with unnamed fields:
 /// ```rust
-/// #[derive(IntoValue)]
+/// #[derive(FromValue)]
 /// struct Color(u8, u8, u8);
 ///
 /// impl nu_protocol::FromValue for Color {
@@ -276,7 +278,7 @@ fn struct_from_value(data: &DataStruct) -> TokenStream2 {
 ///
 /// Unit struct:
 /// ```rust
-/// #[derive(IntoValue)]
+/// #[derive(FromValue)]
 /// struct Unicorn;
 ///
 /// impl nu_protocol::FromValue for Color {
@@ -285,9 +287,30 @@ fn struct_from_value(data: &DataStruct) -> TokenStream2 {
 ///     }
 /// }
 /// ```
-fn struct_expected_type(fields: &Fields) -> TokenStream2 {
-    let ty = match fields {
-        Fields::Named(fields) => {
+///
+/// Struct with passed type name:
+/// ```rust
+/// #[derive(FromValue)]
+/// #[nu_value(type_name = "bird")]
+/// struct Parrot;
+///
+/// impl nu_protocol::FromValue for Parrot {
+///     fn expected_type() -> nu_protocol::Type {
+///         nu_protocol::Type::Custom(
+///             <std::string::String as std::convert::From::<&str>>::from("bird")
+///                 .into_boxed_str()
+///         )
+///     }
+/// }
+/// ```
+fn struct_expected_type(fields: &Fields, attr_type_name: Option<&str>) -> TokenStream2 {
+    let ty = match (fields, attr_type_name) {
+        (_, Some(type_name)) => {
+            quote!(nu_protocol::Type::Custom(
+                <std::string::String as std::convert::From::<&str>>::from(#type_name).into_boxed_str()
+            ))
+        }
+        (Fields::Named(fields), _) => {
             let fields = fields.named.iter().map(|field| {
                 let ident = field.ident.as_ref().expect("named has idents");
                 let ident_s = ident.to_string();
@@ -301,7 +324,7 @@ fn struct_expected_type(fields: &Fields) -> TokenStream2 {
                 std::vec![#(#fields),*].into_boxed_slice()
             ))
         }
-        Fields::Unnamed(fields) => {
+        (Fields::Unnamed(fields), _) => {
             let mut iter = fields.unnamed.iter();
             let fields = fields.unnamed.iter().map(|field| {
                 let ty = &field.ty;
@@ -324,7 +347,7 @@ fn struct_expected_type(fields: &Fields) -> TokenStream2 {
                 )
             }
         }
-        Fields::Unit => quote!(nu_protocol::Type::Nothing),
+        (Fields::Unit, _) => quote!(nu_protocol::Type::Nothing),
     };
 
     quote! {
@@ -338,23 +361,25 @@ fn struct_expected_type(fields: &Fields) -> TokenStream2 {
 ///
 /// This function constructs the implementation of the `FromValue` trait for enums.
 /// It is designed to be on the same level as [`derive_struct_from_value`], even though this
-/// function only provides the impl signature for `FromValue`.
-/// The actual implementation for `FromValue::from_value` is handled by [`enum_from_value`].
-///
-/// Since variants are difficult to type with the current type system, this function uses the
-/// default implementation for `expected_type`.
+/// implementation is a lot simpler.
+/// The main `FromValue::from_value` implementation is handled by [`enum_from_value`].
+/// The `FromValue::expected_type` implementation is usually kept empty to use the default
+/// implementation, but if `#[nu_value(type_name = "...")]` if given, we use that.
 fn derive_enum_from_value(
     ident: Ident,
     data: DataEnum,
     generics: Generics,
     attrs: Vec<Attribute>,
 ) -> Result<TokenStream2, DeriveError> {
+    let container_attrs = ContainerAttributes::parse_attrs(attrs.iter())?;
     let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
     let from_value_impl = enum_from_value(&data, &attrs)?;
+    let expected_type_impl = enum_expected_type(container_attrs.type_name.as_deref());
     Ok(quote! {
         #[automatically_derived]
         impl #impl_generics nu_protocol::FromValue for #ident #ty_generics #where_clause {
             #from_value_impl
+            #expected_type_impl
         }
     })
 }
@@ -448,6 +473,41 @@ fn enum_from_value(data: &DataEnum, attrs: &[Attribute]) -> Result<TokenStream2,
     })
 }
 
+/// Implements `FromValue::expected_type` for enums.
+///  
+/// Since it's difficult to name the type of an enum in the current type system, we want to use the
+/// default implementation if `#[nu_value(type_name = "...")]` was *not* given.
+/// For that, a `None` value is returned, for a passed type name we return something like this:
+/// ```rust
+/// #[derive(IntoValue)]
+/// #[nu_value(type_name = "sunny | cloudy | raining")]
+/// enum Weather {
+///     Sunny,
+///     Cloudy,
+///     Raining
+/// }
+///
+/// impl nu_protocol::FromValue for Weather {
+///     fn expected_type() -> nu_protocol::Type {
+///         nu_protocol::Type::Custom(
+///             <std::string::String as std::convert::From::<&str>>::from("sunny | cloudy | raining")
+///                 .into_boxed_str()
+///         )
+///     }
+/// }
+/// ```
+fn enum_expected_type(attr_type_name: Option<&str>) -> Option<TokenStream2> {
+    let type_name = attr_type_name?;
+    Some(quote! {
+        fn expected_type() -> nu_protocol::Type {
+            nu_protocol::Type::Custom(
+                <std::string::String as std::convert::From::<&str>>::from(#type_name)
+                    .into_boxed_str()
+            )
+        }
+    })
+}
+
 /// Parses a `Value` into self.
 ///
 /// This function handles the actual parsing of a `Value` into self.
diff --git a/crates/nu-derive-value/src/into.rs b/crates/nu-derive-value/src/into.rs
index a7cec06378..cb1d82352d 100644
--- a/crates/nu-derive-value/src/into.rs
+++ b/crates/nu-derive-value/src/into.rs
@@ -50,8 +50,6 @@ pub fn derive_into_value(input: TokenStream2) -> Result<TokenStream2, DeriveErro
 /// For structs with unnamed fields, this generates a `Value::List` with each field in the list.
 /// For unit structs, this generates `Value::Nothing`, because there is no data.
 ///
-/// Note: The helper attribute `#[nu_value(...)]` is currently not allowed on structs.
-///
 /// # Examples
 ///
 /// These examples show what the macro would generate.
@@ -109,7 +107,7 @@ fn struct_into_value(
     generics: Generics,
     attrs: Vec<Attribute>,
 ) -> Result<TokenStream2, DeriveError> {
-    attributes::deny(&attrs)?;
+    let _ = ContainerAttributes::parse_attrs(attrs.iter())?;
     attributes::deny_fields(&data.fields)?;
     let record = match &data.fields {
         Fields::Named(fields) => {
diff --git a/crates/nu-derive-value/src/tests.rs b/crates/nu-derive-value/src/tests.rs
index b94d12a732..ca51ed5970 100644
--- a/crates/nu-derive-value/src/tests.rs
+++ b/crates/nu-derive-value/src/tests.rs
@@ -85,28 +85,6 @@ fn unexpected_attribute() {
     );
 }
 
-#[test]
-fn deny_attribute_on_structs() {
-    let input = quote! {
-        #[nu_value]
-        struct SomeStruct;
-    };
-
-    let from_res = derive_from_value(input.clone());
-    assert!(
-        matches!(from_res, Err(DeriveError::InvalidAttributePosition { .. })),
-        "expected `DeriveError::InvalidAttributePosition`, got {:?}",
-        from_res
-    );
-
-    let into_res = derive_into_value(input);
-    assert!(
-        matches!(into_res, Err(DeriveError::InvalidAttributePosition { .. })),
-        "expected `DeriveError::InvalidAttributePosition`, got {:?}",
-        into_res
-    );
-}
-
 #[test]
 fn deny_attribute_on_fields() {
     let input = quote! {
diff --git a/crates/nu-protocol/src/value/from_value.rs b/crates/nu-protocol/src/value/from_value.rs
index d021b0b3a8..c5445446c9 100644
--- a/crates/nu-protocol/src/value/from_value.rs
+++ b/crates/nu-protocol/src/value/from_value.rs
@@ -34,10 +34,14 @@ use std::{
 /// [`#[serde(rename_all = "...")]`](https://serde.rs/container-attrs.html#rename_all) are valid
 /// here.
 ///
+/// Additionally, you can use `#[nu_value(type_name = "...")]` in the derive macro to set a custom type name
+/// for `FromValue::expected_type`. This will result in a `Type::Custom` with the specified type name.
+/// This can be useful in situations where the default type name is not desired.
+///
 /// ```
 /// # use nu_protocol::{FromValue, Value, ShellError};
 /// #[derive(FromValue, Debug, PartialEq)]
-/// #[nu_value(rename_all = "COBOL-CASE")]
+/// #[nu_value(rename_all = "COBOL-CASE", type_name = "birb")]
 /// enum Bird {
 ///     MountainEagle,
 ///     ForestOwl,
@@ -48,6 +52,11 @@ use std::{
 ///     Bird::from_value(Value::test_string("RIVER-DUCK")).unwrap(),
 ///     Bird::RiverDuck
 /// );
+///
+/// assert_eq!(
+///     &Bird::expected_type().to_string(),
+///     "birb"
+/// );
 /// ```
 pub trait FromValue: Sized {
     // TODO: instead of ShellError, maybe we could have a FromValueError that implements Into<ShellError>
diff --git a/crates/nu-protocol/src/value/test_derive.rs b/crates/nu-protocol/src/value/test_derive.rs
index 263d5f3ed4..182d37f980 100644
--- a/crates/nu-protocol/src/value/test_derive.rs
+++ b/crates/nu-protocol/src/value/test_derive.rs
@@ -494,3 +494,24 @@ fn bytes_roundtrip() {
         .into_test_value();
     assert_eq!(expected, actual);
 }
+
+#[test]
+fn struct_type_name_attr() {
+    #[derive(FromValue, Debug)]
+    #[nu_value(type_name = "struct")]
+    struct TypeNameStruct;
+
+    assert_eq!(
+        TypeNameStruct::expected_type().to_string().as_str(),
+        "struct"
+    );
+}
+
+#[test]
+fn enum_type_name_attr() {
+    #[derive(FromValue, Debug)]
+    #[nu_value(type_name = "enum")]
+    struct TypeNameEnum;
+
+    assert_eq!(TypeNameEnum::expected_type().to_string().as_str(), "enum");
+}

From 05608264145062e8446aabcd4470ed0870501767 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrej=20Kol=C4=8Din?= <self@kaathewise.net>
Date: Fri, 23 Aug 2024 19:18:51 +0300
Subject: [PATCH 0367/1072] `encode`/`decode` for multiple alphabets (#13428)

Based on the discussion in #13419.


## Description

Reworks the `decode`/`encode` commands by adding/changing the following
bases:

- `base32`
- `base32hex`
- `hex`
- `new-base64`

The `hex` base is compatible with the previous version of `hex` out of
the box (it only adds more flags). `base64` isn't, so the PR adds a new
version and deprecates the old one.

All commands have `string -> binary` signature for decoding and `string
| binary -> string` signature for encoding. A few `base64` encodings,
which are not a part of the
[RFC4648](https://datatracker.ietf.org/doc/html/rfc4648#section-6), have
been dropped.


## Example usage

```Nushell
~/fork/nushell> "string" | encode base32 | decode base32 | decode
string
```

```Nushell
~/fork/nushell> "ORSXG5A=" | decode base32
# `decode` always returns a binary value
Length: 4 (0x4) bytes | printable whitespace ascii_other non_ascii
00000000:   74 65 73 74                                          test
```


## User-Facing Changes

- New commands: `encode/decode base32/base32hex`.
- `encode hex` gets a `--lower` flag.
- `encode/decode base64` deprecated in favor of `encode/decode
new-base64`.
---
 Cargo.lock                                    |   8 +
 Cargo.toml                                    |   1 +
 crates/nu-cmd-extra/src/extra/mod.rs          |   2 -
 .../src/extra/strings/encode_decode/hex.rs    | 192 -----------------
 .../src/extra/strings/encode_decode/mod.rs    |   6 -
 crates/nu-cmd-extra/src/extra/strings/mod.rs  |   1 -
 crates/nu-command/Cargo.toml                  |   4 +-
 crates/nu-command/src/default_context.rs      |   8 +
 crates/nu-command/src/strings/base/base32.rs  | 180 ++++++++++++++++
 .../nu-command/src/strings/base/base32hex.rs  | 181 ++++++++++++++++
 crates/nu-command/src/strings/base/base64.rs  | 193 ++++++++++++++++++
 crates/nu-command/src/strings/base/hex.rs     | 151 ++++++++++++++
 crates/nu-command/src/strings/base/mod.rs     |  99 +++++++++
 .../strings/encode_decode/decode_base64.rs    |  17 +-
 .../strings/encode_decode/encode_base64.rs    |  17 +-
 .../src/strings/encode_decode/mod.rs          |   4 +-
 crates/nu-command/src/strings/mod.rs          |   5 +
 .../nu-command/tests/commands/base/base32.rs  |  58 ++++++
 .../tests/commands/base/base32hex.rs          |  58 ++++++
 .../nu-command/tests/commands/base/base64.rs  |  86 ++++++++
 crates/nu-command/tests/commands/base/hex.rs  |  36 ++++
 crates/nu-command/tests/commands/base/mod.rs  |  24 +++
 crates/nu-command/tests/commands/mod.rs       |   1 +
 23 files changed, 1122 insertions(+), 210 deletions(-)
 delete mode 100644 crates/nu-cmd-extra/src/extra/strings/encode_decode/hex.rs
 delete mode 100644 crates/nu-cmd-extra/src/extra/strings/encode_decode/mod.rs
 create mode 100644 crates/nu-command/src/strings/base/base32.rs
 create mode 100644 crates/nu-command/src/strings/base/base32hex.rs
 create mode 100644 crates/nu-command/src/strings/base/base64.rs
 create mode 100644 crates/nu-command/src/strings/base/hex.rs
 create mode 100644 crates/nu-command/src/strings/base/mod.rs
 create mode 100644 crates/nu-command/tests/commands/base/base32.rs
 create mode 100644 crates/nu-command/tests/commands/base/base32hex.rs
 create mode 100644 crates/nu-command/tests/commands/base/base64.rs
 create mode 100644 crates/nu-command/tests/commands/base/hex.rs
 create mode 100644 crates/nu-command/tests/commands/base/mod.rs

diff --git a/Cargo.lock b/Cargo.lock
index 54d80b1449..3e818b221d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1153,6 +1153,12 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "data-encoding"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+
 [[package]]
 name = "deranged"
 version = "0.3.11"
@@ -3066,6 +3072,7 @@ dependencies = [
  "chrono-tz 0.8.6",
  "crossterm",
  "csv",
+ "data-encoding",
  "deunicode",
  "dialoguer",
  "digest",
@@ -3120,6 +3127,7 @@ dependencies = [
  "quickcheck",
  "quickcheck_macros",
  "rand",
+ "rand_chacha",
  "rayon",
  "regex",
  "rmp",
diff --git a/Cargo.toml b/Cargo.toml
index aa3eb60e45..ebb26171c8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -136,6 +136,7 @@ quickcheck = "1.0"
 quickcheck_macros = "1.0"
 quote = "1.0"
 rand = "0.8"
+rand_chacha = "0.3.1"
 ratatui = "0.26"
 rayon = "1.10"
 reedline = "0.34.0"
diff --git a/crates/nu-cmd-extra/src/extra/mod.rs b/crates/nu-cmd-extra/src/extra/mod.rs
index 1877039a6f..3936b94a0f 100644
--- a/crates/nu-cmd-extra/src/extra/mod.rs
+++ b/crates/nu-cmd-extra/src/extra/mod.rs
@@ -45,8 +45,6 @@ pub fn add_extra_command_context(mut engine_state: EngineState) -> EngineState {
 
         bind_command!(
             strings::format::FormatPattern,
-            strings::encode_decode::EncodeHex,
-            strings::encode_decode::DecodeHex,
             strings::str_::case::Str,
             strings::str_::case::StrCamelCase,
             strings::str_::case::StrKebabCase,
diff --git a/crates/nu-cmd-extra/src/extra/strings/encode_decode/hex.rs b/crates/nu-cmd-extra/src/extra/strings/encode_decode/hex.rs
deleted file mode 100644
index be681b382a..0000000000
--- a/crates/nu-cmd-extra/src/extra/strings/encode_decode/hex.rs
+++ /dev/null
@@ -1,192 +0,0 @@
-use nu_cmd_base::input_handler::{operate as general_operate, CmdArgument};
-use nu_engine::command_prelude::*;
-
-enum HexDecodingError {
-    InvalidLength(usize),
-    InvalidDigit(usize, char),
-}
-
-fn hex_decode(value: &str) -> Result<Vec<u8>, HexDecodingError> {
-    let mut digits = value
-        .chars()
-        .enumerate()
-        .filter(|(_, c)| !c.is_whitespace());
-
-    let mut res = Vec::with_capacity(value.len() / 2);
-    loop {
-        let c1 = match digits.next() {
-            Some((ind, c)) => match c.to_digit(16) {
-                Some(d) => d,
-                None => return Err(HexDecodingError::InvalidDigit(ind, c)),
-            },
-            None => return Ok(res),
-        };
-        let c2 = match digits.next() {
-            Some((ind, c)) => match c.to_digit(16) {
-                Some(d) => d,
-                None => return Err(HexDecodingError::InvalidDigit(ind, c)),
-            },
-            None => {
-                return Err(HexDecodingError::InvalidLength(value.len()));
-            }
-        };
-        res.push((c1 << 4 | c2) as u8);
-    }
-}
-
-fn hex_digit(num: u8) -> char {
-    match num {
-        0..=9 => (num + b'0') as char,
-        10..=15 => (num - 10 + b'A') as char,
-        _ => unreachable!(),
-    }
-}
-
-fn hex_encode(bytes: &[u8]) -> String {
-    let mut res = String::with_capacity(bytes.len() * 2);
-    for byte in bytes {
-        res.push(hex_digit(byte >> 4));
-        res.push(hex_digit(byte & 0b1111));
-    }
-    res
-}
-
-#[derive(Clone)]
-pub struct HexConfig {
-    pub action_type: ActionType,
-}
-
-#[derive(Clone, Copy, PartialEq, Eq)]
-pub enum ActionType {
-    Encode,
-    Decode,
-}
-
-struct Arguments {
-    cell_paths: Option<Vec<CellPath>>,
-    encoding_config: HexConfig,
-}
-
-impl CmdArgument for Arguments {
-    fn take_cell_paths(&mut self) -> Option<Vec<CellPath>> {
-        self.cell_paths.take()
-    }
-}
-
-pub fn operate(
-    action_type: ActionType,
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
-    let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
-
-    let args = Arguments {
-        encoding_config: HexConfig { action_type },
-        cell_paths,
-    };
-
-    general_operate(action, args, input, call.head, engine_state.signals())
-}
-
-fn action(
-    input: &Value,
-    // only used for `decode` action
-    args: &Arguments,
-    command_span: Span,
-) -> Value {
-    let hex_config = &args.encoding_config;
-
-    match input {
-        // Propagate existing errors.
-        Value::Error { .. } => input.clone(),
-        Value::Binary { val, .. } => match hex_config.action_type {
-            ActionType::Encode => Value::string(hex_encode(val.as_ref()), command_span),
-            ActionType::Decode => Value::error(
-                ShellError::UnsupportedInput { msg: "Binary data can only be encoded".to_string(), input: "value originates from here".into(), msg_span: command_span, input_span: input.span() },
-                command_span,
-            ),
-        },
-        Value::String { val, .. } => {
-            match hex_config.action_type {
-                ActionType::Encode => Value::error(
-                    ShellError::UnsupportedInput { msg: "String value can only be decoded".to_string(), input: "value originates from here".into(), msg_span: command_span, input_span: input.span() },
-                    command_span,
-                ),
-
-                ActionType::Decode => match hex_decode(val.as_ref()) {
-                    Ok(decoded_value) => Value::binary(decoded_value, command_span),
-                    Err(HexDecodingError::InvalidLength(len)) => Value::error(ShellError::GenericError {
-                            error: "value could not be hex decoded".into(),
-                            msg: format!("invalid hex input length: {len}. The length should be even"),
-                            span: Some(command_span),
-                            help: None,
-                            inner: vec![],
-                        },
-                        command_span,
-                    ),
-                    Err(HexDecodingError::InvalidDigit(index, digit)) => Value::error(ShellError::GenericError {
-                            error: "value could not be hex decoded".into(),
-                            msg: format!("invalid hex digit: '{digit}' at index {index}. Only 0-9, A-F, a-f are allowed in hex encoding"),
-                            span: Some(command_span),
-                            help: None,
-                            inner: vec![],
-                        },
-                        command_span,
-                    ),
-                },
-            }
-        }
-        other => Value::error(
-            ShellError::TypeMismatch {
-                err_message: format!("string or binary, not {}", other.get_type()),
-                span: other.span(),
-            },
-            other.span(),
-        ),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::{action, ActionType, Arguments, HexConfig};
-    use nu_protocol::{Span, Value};
-
-    #[test]
-    fn hex_encode() {
-        let word = Value::binary([77, 97, 110], Span::test_data());
-        let expected = Value::test_string("4D616E");
-
-        let actual = action(
-            &word,
-            &Arguments {
-                encoding_config: HexConfig {
-                    action_type: ActionType::Encode,
-                },
-                cell_paths: None,
-            },
-            Span::test_data(),
-        );
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn hex_decode() {
-        let word = Value::test_string("4D 61\r\n\n6E");
-        let expected = Value::binary([77, 97, 110], Span::test_data());
-
-        let actual = action(
-            &word,
-            &Arguments {
-                encoding_config: HexConfig {
-                    action_type: ActionType::Decode,
-                },
-                cell_paths: None,
-            },
-            Span::test_data(),
-        );
-        assert_eq!(actual, expected);
-    }
-}
diff --git a/crates/nu-cmd-extra/src/extra/strings/encode_decode/mod.rs b/crates/nu-cmd-extra/src/extra/strings/encode_decode/mod.rs
deleted file mode 100644
index 581b87679f..0000000000
--- a/crates/nu-cmd-extra/src/extra/strings/encode_decode/mod.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-mod decode_hex;
-mod encode_hex;
-mod hex;
-
-pub(crate) use decode_hex::DecodeHex;
-pub(crate) use encode_hex::EncodeHex;
diff --git a/crates/nu-cmd-extra/src/extra/strings/mod.rs b/crates/nu-cmd-extra/src/extra/strings/mod.rs
index 391cf108e0..8d43cd8a65 100644
--- a/crates/nu-cmd-extra/src/extra/strings/mod.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/mod.rs
@@ -1,3 +1,2 @@
-pub(crate) mod encode_decode;
 pub(crate) mod format;
 pub(crate) mod str_;
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index f905f804fd..3c455eabcf 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -102,6 +102,7 @@ v_htmlescape = { workspace = true }
 wax = { workspace = true }
 which = { workspace = true }
 unicode-width = { workspace = true }
+data-encoding = { version = "2.6.0", features = ["alloc"] }
 
 [target.'cfg(windows)'.dependencies]
 winreg = { workspace = true }
@@ -146,4 +147,5 @@ quickcheck = { workspace = true }
 quickcheck_macros = { workspace = true }
 rstest = { workspace = true, default-features = false }
 pretty_assertions = { workspace = true }
-tempfile = { workspace = true }
\ No newline at end of file
+tempfile = { workspace = true }
+rand_chacha = { workspace = true }
diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index 6ef188d571..88b229fc48 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -179,8 +179,16 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             Char,
             Decode,
             Encode,
+            DecodeHex,
+            EncodeHex,
+            DecodeBase32,
+            EncodeBase32,
+            DecodeBase32Hex,
+            EncodeBase32Hex,
             DecodeBase64,
             EncodeBase64,
+            DecodeBase64Old,
+            EncodeBase64Old,
             DetectColumns,
             Parse,
             Split,
diff --git a/crates/nu-command/src/strings/base/base32.rs b/crates/nu-command/src/strings/base/base32.rs
new file mode 100644
index 0000000000..995cbb6294
--- /dev/null
+++ b/crates/nu-command/src/strings/base/base32.rs
@@ -0,0 +1,180 @@
+use data_encoding::Encoding;
+
+use nu_engine::command_prelude::*;
+
+const EXTRA_USAGE: &str = r"The default alphabet is taken from RFC 4648, section 6.
+
+Note this command will collect stream input.";
+
+#[derive(Clone)]
+pub struct DecodeBase32;
+
+impl Command for DecodeBase32 {
+    fn name(&self) -> &str {
+        "decode base32"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("decode base32")
+            .input_output_types(vec![(Type::String, Type::Binary)])
+            .allow_variants_without_examples(true)
+            .switch("nopad", "Do not pad the output.", None)
+            .category(Category::Formats)
+    }
+
+    fn description(&self) -> &str {
+        "Decode a Base32 value."
+    }
+
+    fn extra_description(&self) -> &str {
+        EXTRA_USAGE
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Decode arbitrary binary data",
+                example: r#""AEBAGBAF" | decode base32"#,
+                result: Some(Value::test_binary(vec![1, 2, 3, 4, 5])),
+            },
+            Example {
+                description: "Decode an encoded string",
+                example: r#""NBUQ====" | decode base32 | decode"#,
+                result: None,
+            },
+            Example {
+                description: "Parse a string without padding",
+                example: r#""NBUQ" | decode base32 --nopad"#,
+                result: Some(Value::test_binary(vec![0x68, 0x69])),
+            },
+        ]
+    }
+
+    fn is_const(&self) -> bool {
+        true
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let encoding = if call.has_flag(engine_state, stack, "nopad")? {
+            data_encoding::BASE32_NOPAD
+        } else {
+            data_encoding::BASE32
+        };
+        super::decode(encoding, call.span(), input)
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let encoding = if call.has_flag_const(working_set, "nopad")? {
+            data_encoding::BASE32_NOPAD
+        } else {
+            data_encoding::BASE32
+        };
+        super::decode(encoding, call.span(), input)
+    }
+}
+
+#[derive(Clone)]
+pub struct EncodeBase32;
+
+impl Command for EncodeBase32 {
+    fn name(&self) -> &str {
+        "encode base32"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("encode base32")
+            .input_output_types(vec![
+                (Type::String, Type::String),
+                (Type::Binary, Type::String),
+            ])
+            .switch("nopad", "Don't accept padding.", None)
+            .category(Category::Formats)
+    }
+
+    fn description(&self) -> &str {
+        "Encode a string or binary value using Base32."
+    }
+
+    fn extra_description(&self) -> &str {
+        EXTRA_USAGE
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Encode a binary value",
+                example: r#"0x[01 02 10] | encode base32"#,
+                result: Some(Value::test_string("AEBBA===")),
+            },
+            Example {
+                description: "Encode a string",
+                example: r#""hello there" | encode base32"#,
+                result: Some(Value::test_string("NBSWY3DPEB2GQZLSMU======")),
+            },
+            Example {
+                description: "Don't apply padding to the output",
+                example: r#""hi" | encode base32 --nopad"#,
+                result: Some(Value::test_string("NBUQ")),
+            },
+        ]
+    }
+
+    fn is_const(&self) -> bool {
+        true
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let encoding = if call.has_flag(engine_state, stack, "nopad")? {
+            data_encoding::BASE32_NOPAD
+        } else {
+            data_encoding::BASE32
+        };
+        super::encode(encoding, call.span(), input)
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let encoding = if call.has_flag_const(working_set, "nopad")? {
+            data_encoding::BASE32_NOPAD
+        } else {
+            data_encoding::BASE32
+        };
+        super::encode(encoding, call.span(), input)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_examples_decode() {
+        crate::test_examples(DecodeBase32)
+    }
+
+    #[test]
+    fn test_examples_encode() {
+        crate::test_examples(EncodeBase32)
+    }
+}
diff --git a/crates/nu-command/src/strings/base/base32hex.rs b/crates/nu-command/src/strings/base/base32hex.rs
new file mode 100644
index 0000000000..044a23415f
--- /dev/null
+++ b/crates/nu-command/src/strings/base/base32hex.rs
@@ -0,0 +1,181 @@
+use nu_engine::command_prelude::*;
+
+const EXTRA_USAGE: &str = r"This command uses an alternative Base32 alphabet, defined in RFC 4648, section 7.
+
+Note this command will collect stream input.";
+
+#[derive(Clone)]
+pub struct DecodeBase32Hex;
+
+impl Command for DecodeBase32Hex {
+    fn name(&self) -> &str {
+        "decode base32hex"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("decode base32hex")
+            .input_output_types(vec![(Type::String, Type::Binary)])
+            .allow_variants_without_examples(true)
+            .switch("nopad", "Reject input with padding.", None)
+            .category(Category::Formats)
+    }
+
+    fn description(&self) -> &str {
+        "Encode a base32hex value."
+    }
+
+    fn extra_description(&self) -> &str {
+        EXTRA_USAGE
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Decode arbitrary binary data",
+                example: r#""ATNAQ===" | decode base32hex"#,
+                result: Some(Value::test_binary(vec![0x57, 0x6E, 0xAD])),
+            },
+            Example {
+                description: "Decode an encoded string",
+                example: r#""D1KG====" | decode base32hex | decode"#,
+                result: None,
+            },
+            Example {
+                description: "Parse a string without padding",
+                example: r#""ATNAQ" | decode base32hex --nopad"#,
+                result: Some(Value::test_binary(vec![0x57, 0x6E, 0xAD])),
+            },
+        ]
+    }
+
+    fn is_const(&self) -> bool {
+        true
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let encoding = if call.has_flag(engine_state, stack, "nopad")? {
+            data_encoding::BASE32HEX_NOPAD
+        } else {
+            data_encoding::BASE32HEX
+        };
+
+        super::decode(encoding, call.head, input)
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let encoding = if call.has_flag_const(working_set, "nopad")? {
+            data_encoding::BASE32HEX_NOPAD
+        } else {
+            data_encoding::BASE32HEX
+        };
+
+        super::decode(encoding, call.head, input)
+    }
+}
+
+#[derive(Clone)]
+pub struct EncodeBase32Hex;
+
+impl Command for EncodeBase32Hex {
+    fn name(&self) -> &str {
+        "encode base32hex"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("encode base32hex")
+            .input_output_types(vec![
+                (Type::String, Type::String),
+                (Type::Binary, Type::String),
+            ])
+            .switch("nopad", "Don't pad the output.", None)
+            .category(Category::Formats)
+    }
+
+    fn description(&self) -> &str {
+        "Encode a binary value or a string using base32hex."
+    }
+
+    fn extra_description(&self) -> &str {
+        EXTRA_USAGE
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Encode a binary value",
+                example: r#"0x[57 6E AD] | encode base32hex"#,
+                result: Some(Value::test_string("ATNAQ===")),
+            },
+            Example {
+                description: "Encode a string",
+                example: r#""hello there" | encode base32hex"#,
+                result: Some(Value::test_string("D1IMOR3F41Q6GPBICK======")),
+            },
+            Example {
+                description: "Don't apply padding to the output",
+                example: r#""hello there" | encode base32hex --nopad"#,
+                result: Some(Value::test_string("D1IMOR3F41Q6GPBICK")),
+            },
+        ]
+    }
+
+    fn is_const(&self) -> bool {
+        true
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let encoding = if call.has_flag(engine_state, stack, "nopad")? {
+            data_encoding::BASE32HEX_NOPAD
+        } else {
+            data_encoding::BASE32HEX
+        };
+
+        super::encode(encoding, call.head, input)
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let encoding = if call.has_flag_const(working_set, "nopad")? {
+            data_encoding::BASE32HEX_NOPAD
+        } else {
+            data_encoding::BASE32HEX
+        };
+
+        super::encode(encoding, call.head, input)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_examples_decode() {
+        crate::test_examples(DecodeBase32Hex)
+    }
+    #[test]
+    fn test_examples_encode() {
+        crate::test_examples(EncodeBase32Hex)
+    }
+}
diff --git a/crates/nu-command/src/strings/base/base64.rs b/crates/nu-command/src/strings/base/base64.rs
new file mode 100644
index 0000000000..3a1ccad9ef
--- /dev/null
+++ b/crates/nu-command/src/strings/base/base64.rs
@@ -0,0 +1,193 @@
+use data_encoding::Encoding;
+
+use nu_engine::command_prelude::*;
+
+const EXTRA_USAGE: &str = r"The default alphabet is taken from RFC 4648, section 4.  A URL-safe version is available.
+
+Note this command will collect stream input.";
+
+fn get_encoding_from_flags(url: bool, nopad: bool) -> Encoding {
+    match (url, nopad) {
+        (false, false) => data_encoding::BASE64,
+        (false, true) => data_encoding::BASE64_NOPAD,
+        (true, false) => data_encoding::BASE64URL,
+        (true, true) => data_encoding::BASE64URL_NOPAD,
+    }
+}
+
+fn get_encoding(
+    engine_state: &EngineState,
+    stack: &mut Stack,
+    call: &Call,
+) -> Result<Encoding, ShellError> {
+    let url = call.has_flag(engine_state, stack, "url")?;
+    let nopad = call.has_flag(engine_state, stack, "nopad")?;
+
+    Ok(get_encoding_from_flags(url, nopad))
+}
+
+fn get_encoding_const(working_set: &StateWorkingSet, call: &Call) -> Result<Encoding, ShellError> {
+    let url = call.has_flag_const(working_set, "url")?;
+    let nopad = call.has_flag_const(working_set, "nopad")?;
+
+    Ok(get_encoding_from_flags(url, nopad))
+}
+
+#[derive(Clone)]
+pub struct DecodeBase64;
+
+impl Command for DecodeBase64 {
+    fn name(&self) -> &str {
+        "decode new-base64"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("decode new-base64")
+            .input_output_types(vec![(Type::String, Type::Binary)])
+            .allow_variants_without_examples(true)
+            .switch("url", "Decode the URL-safe Base64 version.", None)
+            .switch("nopad", "Reject padding.", None)
+            .category(Category::Formats)
+    }
+
+    fn description(&self) -> &str {
+        "Decode a Base64 value."
+    }
+
+    fn extra_description(&self) -> &str {
+        EXTRA_USAGE
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Decode a Base64 string",
+                example: r#""U29tZSBEYXRh" | decode new-base64 | decode"#,
+                result: None,
+            },
+            Example {
+                description: "Decode arbitrary data",
+                example: r#""/w==" | decode new-base64"#,
+                result: Some(Value::test_binary(vec![0xFF])),
+            },
+            Example {
+                description: "Decode a URL-safe Base64 string",
+                example: r#""_w==" | decode new-base64 --url"#,
+                result: Some(Value::test_binary(vec![0xFF])),
+            },
+        ]
+    }
+
+    fn is_const(&self) -> bool {
+        true
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let encoding = get_encoding(engine_state, stack, call)?;
+        super::decode(encoding, call.head, input)
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let encoding = get_encoding_const(working_set, call)?;
+        super::decode(encoding, call.head, input)
+    }
+}
+
+#[derive(Clone)]
+pub struct EncodeBase64;
+
+impl Command for EncodeBase64 {
+    fn name(&self) -> &str {
+        "encode new-base64"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("encode new-base64")
+            .input_output_types(vec![
+                (Type::String, Type::String),
+                (Type::Binary, Type::String),
+            ])
+            .switch("url", "Use the URL-safe Base64 version.", None)
+            .switch("nopad", "Don't pad the output.", None)
+            .category(Category::Formats)
+    }
+
+    fn description(&self) -> &str {
+        "Encode a string or binary value using Base64."
+    }
+
+    fn extra_description(&self) -> &str {
+        EXTRA_USAGE
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Encode a string with Base64",
+                example: r#""Alphabet from A to Z" | encode new-base64"#,
+                result: Some(Value::test_string("QWxwaGFiZXQgZnJvbSBBIHRvIFo=")),
+            },
+            Example {
+                description: "Encode arbitrary data",
+                example: r#"0x[BE EE FF] | encode new-base64"#,
+                result: Some(Value::test_string("vu7/")),
+            },
+            Example {
+                description: "Use a URL-safe alphabet",
+                example: r#"0x[BE EE FF] | encode new-base64 --url"#,
+                result: Some(Value::test_string("vu7_")),
+            },
+        ]
+    }
+
+    fn is_const(&self) -> bool {
+        true
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let encoding = get_encoding(engine_state, stack, call)?;
+        super::encode(encoding, call.head, input)
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let encoding = get_encoding_const(working_set, call)?;
+        super::encode(encoding, call.head, input)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_examples_decode() {
+        crate::test_examples(DecodeBase64)
+    }
+
+    #[test]
+    fn test_examples_encode() {
+        crate::test_examples(EncodeBase64)
+    }
+}
diff --git a/crates/nu-command/src/strings/base/hex.rs b/crates/nu-command/src/strings/base/hex.rs
new file mode 100644
index 0000000000..189b22742e
--- /dev/null
+++ b/crates/nu-command/src/strings/base/hex.rs
@@ -0,0 +1,151 @@
+use nu_engine::command_prelude::*;
+
+#[derive(Clone)]
+pub struct DecodeHex;
+
+impl Command for DecodeHex {
+    fn name(&self) -> &str {
+        "decode hex"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("decode hex")
+            .input_output_types(vec![(Type::String, Type::Binary)])
+            .category(Category::Formats)
+    }
+
+    fn description(&self) -> &str {
+        "Hex decode a value."
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Decode arbitrary binary data",
+                example: r#""09FD" | decode hex"#,
+                result: Some(Value::test_binary(vec![0x09, 0xFD])),
+            },
+            Example {
+                description: "Lowercase Hex is also accepted",
+                example: r#""09fd" | decode hex"#,
+                result: Some(Value::test_binary(vec![0x09, 0xFD])),
+            },
+        ]
+    }
+
+    fn is_const(&self) -> bool {
+        true
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        super::decode(data_encoding::HEXLOWER_PERMISSIVE, call.head, input)
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        todo!()
+    }
+}
+
+#[derive(Clone)]
+pub struct EncodeHex;
+
+impl Command for EncodeHex {
+    fn name(&self) -> &str {
+        "encode hex"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("encode hex")
+            .input_output_types(vec![
+                (Type::String, Type::String),
+                (Type::Binary, Type::String),
+            ])
+            .switch("lower", "Encode to lowercase hex.", None)
+            .category(Category::Formats)
+    }
+
+    fn description(&self) -> &str {
+        "Hex encode a binary value or a string."
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Encode a binary value",
+                example: r#"0x[C3 06] | encode hex"#,
+                result: Some(Value::test_string("C306")),
+            },
+            Example {
+                description: "Encode a string",
+                example: r#""hello" | encode hex"#,
+                result: Some(Value::test_string("68656C6C6F")),
+            },
+            Example {
+                description: "Output a Lowercase version of the encoding",
+                example: r#"0x[AD EF] | encode hex --lower"#,
+                result: Some(Value::test_string("adef")),
+            },
+        ]
+    }
+
+    fn is_const(&self) -> bool {
+        true
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let encoding = if call.has_flag(engine_state, stack, "lower")? {
+            data_encoding::HEXLOWER
+        } else {
+            data_encoding::HEXUPPER
+        };
+
+        super::encode(encoding, call.head, input)
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let encoding = if call.has_flag_const(working_set, "lower")? {
+            data_encoding::HEXLOWER
+        } else {
+            data_encoding::HEXUPPER
+        };
+
+        super::encode(encoding, call.head, input)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_examples_decode() {
+        crate::test_examples(DecodeHex)
+    }
+
+    #[test]
+    fn test_examples_encode() {
+        crate::test_examples(EncodeHex)
+    }
+}
diff --git a/crates/nu-command/src/strings/base/mod.rs b/crates/nu-command/src/strings/base/mod.rs
new file mode 100644
index 0000000000..d7e248a032
--- /dev/null
+++ b/crates/nu-command/src/strings/base/mod.rs
@@ -0,0 +1,99 @@
+#![allow(unused)]
+
+use data_encoding::Encoding;
+
+use nu_engine::command_prelude::*;
+
+mod base32;
+mod base32hex;
+mod base64;
+mod hex;
+
+pub use base32::{DecodeBase32, EncodeBase32};
+pub use base32hex::{DecodeBase32Hex, EncodeBase32Hex};
+pub use base64::{DecodeBase64, EncodeBase64};
+pub use hex::{DecodeHex, EncodeHex};
+
+pub fn decode(
+    encoding: Encoding,
+    call_span: Span,
+    input: PipelineData,
+) -> Result<PipelineData, ShellError> {
+    let metadata = input.metadata();
+    let (input_str, input_span) = get_string(input, call_span)?;
+    let output = match encoding.decode(input_str.as_bytes()) {
+        Ok(output) => output,
+        Err(err) => {
+            return Err(ShellError::IncorrectValue {
+                msg: err.to_string(),
+                val_span: input_span,
+                call_span,
+            });
+        }
+    };
+
+    Ok(Value::binary(output, call_span).into_pipeline_data_with_metadata(metadata))
+}
+
+pub fn encode(
+    encoding: Encoding,
+    call_span: Span,
+    input: PipelineData,
+) -> Result<PipelineData, ShellError> {
+    let metadata = input.metadata();
+    let (input_bytes, _) = get_binary(input, call_span)?;
+    let output = encoding.encode(&input_bytes);
+
+    Ok(Value::string(output, call_span).into_pipeline_data_with_metadata(metadata))
+}
+
+fn get_string(input: PipelineData, call_span: Span) -> Result<(String, Span), ShellError> {
+    match input {
+        PipelineData::Value(val, ..) => {
+            let span = val.span();
+            match val {
+                Value::String { val, .. } => Ok((val, span)),
+
+                _ => {
+                    todo!("Invalid type")
+                }
+            }
+        }
+        PipelineData::ListStream(..) => {
+            todo!()
+        }
+        PipelineData::ByteStream(stream, ..) => {
+            let span = stream.span();
+            Ok((stream.into_string()?, span))
+        }
+        PipelineData::Empty => Err(ShellError::PipelineEmpty {
+            dst_span: call_span,
+        }),
+    }
+}
+
+fn get_binary(input: PipelineData, call_span: Span) -> Result<(Vec<u8>, Span), ShellError> {
+    match input {
+        PipelineData::Value(val, ..) => {
+            let span = val.span();
+            match val {
+                Value::Binary { val, .. } => Ok((val, span)),
+                Value::String { val, .. } => Ok((val.into_bytes(), span)),
+
+                _ => {
+                    todo!("Invalid type")
+                }
+            }
+        }
+        PipelineData::ListStream(..) => {
+            todo!()
+        }
+        PipelineData::ByteStream(stream, ..) => {
+            let span = stream.span();
+            Ok((stream.into_bytes()?, span))
+        }
+        PipelineData::Empty => {
+            todo!("Can't have empty data");
+        }
+    }
+}
diff --git a/crates/nu-command/src/strings/encode_decode/decode_base64.rs b/crates/nu-command/src/strings/encode_decode/decode_base64.rs
index 083c1c8448..455aec915c 100644
--- a/crates/nu-command/src/strings/encode_decode/decode_base64.rs
+++ b/crates/nu-command/src/strings/encode_decode/decode_base64.rs
@@ -1,10 +1,11 @@
 use super::base64::{operate, ActionType, Base64CommandArguments, CHARACTER_SET_DESC};
 use nu_engine::command_prelude::*;
+use nu_protocol::{report_warning_new, ParseWarning};
 
 #[derive(Clone)]
-pub struct DecodeBase64;
+pub struct DecodeBase64Old;
 
-impl Command for DecodeBase64 {
+impl Command for DecodeBase64Old {
     fn name(&self) -> &str {
         "decode base64"
     }
@@ -77,6 +78,16 @@ impl Command for DecodeBase64 {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
+        report_warning_new(
+            engine_state,
+            &ParseWarning::DeprecatedWarning {
+                old_command: "decode base64".into(),
+                new_suggestion: "the new `decode new-base64` version".into(),
+                span: call.head,
+                url: "`help decode new-base64`".into(),
+            },
+        );
+
         let character_set: Option<Spanned<String>> =
             call.get_flag(engine_state, stack, "character-set")?;
         let binary = call.has_flag(engine_state, stack, "binary")?;
@@ -114,6 +125,6 @@ mod tests {
 
     #[test]
     fn test_examples() {
-        crate::test_examples(DecodeBase64)
+        crate::test_examples(DecodeBase64Old)
     }
 }
diff --git a/crates/nu-command/src/strings/encode_decode/encode_base64.rs b/crates/nu-command/src/strings/encode_decode/encode_base64.rs
index 08a9cb5e51..a484eeb974 100644
--- a/crates/nu-command/src/strings/encode_decode/encode_base64.rs
+++ b/crates/nu-command/src/strings/encode_decode/encode_base64.rs
@@ -1,10 +1,11 @@
 use super::base64::{operate, ActionType, Base64CommandArguments, CHARACTER_SET_DESC};
 use nu_engine::command_prelude::*;
+use nu_protocol::{report_warning_new, ParseWarning};
 
 #[derive(Clone)]
-pub struct EncodeBase64;
+pub struct EncodeBase64Old;
 
-impl Command for EncodeBase64 {
+impl Command for EncodeBase64Old {
     fn name(&self) -> &str {
         "encode base64"
     }
@@ -81,6 +82,16 @@ impl Command for EncodeBase64 {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
+        report_warning_new(
+            engine_state,
+            &ParseWarning::DeprecatedWarning {
+                old_command: "encode base64".into(),
+                new_suggestion: "the new `encode new-base64` version".into(),
+                span: call.head,
+                url: "`help encode new-base64`".into(),
+            },
+        );
+
         let character_set: Option<Spanned<String>> =
             call.get_flag(engine_state, stack, "character-set")?;
         let binary = call.has_flag(engine_state, stack, "binary")?;
@@ -118,6 +129,6 @@ mod tests {
 
     #[test]
     fn test_examples() {
-        crate::test_examples(EncodeBase64)
+        crate::test_examples(EncodeBase64Old)
     }
 }
diff --git a/crates/nu-command/src/strings/encode_decode/mod.rs b/crates/nu-command/src/strings/encode_decode/mod.rs
index e5d0ea06a6..5dde14e0f2 100644
--- a/crates/nu-command/src/strings/encode_decode/mod.rs
+++ b/crates/nu-command/src/strings/encode_decode/mod.rs
@@ -6,6 +6,6 @@ mod encode_base64;
 mod encoding;
 
 pub use self::decode::Decode;
-pub use self::decode_base64::DecodeBase64;
+pub use self::decode_base64::DecodeBase64Old;
 pub use self::encode::Encode;
-pub use self::encode_base64::EncodeBase64;
+pub use self::encode_base64::EncodeBase64Old;
diff --git a/crates/nu-command/src/strings/mod.rs b/crates/nu-command/src/strings/mod.rs
index 8b5af2dec4..08f50e537d 100644
--- a/crates/nu-command/src/strings/mod.rs
+++ b/crates/nu-command/src/strings/mod.rs
@@ -1,3 +1,4 @@
+mod base;
 mod char_;
 mod detect_columns;
 mod encode_decode;
@@ -7,6 +8,10 @@ mod parse;
 mod split;
 mod str_;
 
+pub use base::{
+    DecodeBase32, DecodeBase32Hex, DecodeBase64, DecodeHex, EncodeBase32, EncodeBase32Hex,
+    EncodeBase64, EncodeHex,
+};
 pub use char_::Char;
 pub use detect_columns::*;
 pub use encode_decode::*;
diff --git a/crates/nu-command/tests/commands/base/base32.rs b/crates/nu-command/tests/commands/base/base32.rs
new file mode 100644
index 0000000000..e6fae31808
--- /dev/null
+++ b/crates/nu-command/tests/commands/base/base32.rs
@@ -0,0 +1,58 @@
+use nu_test_support::nu;
+
+#[test]
+fn canonical() {
+    for value in super::random_bytes() {
+        let outcome = nu!("{} | encode base32 | decode base32 | to nuon", value);
+        assert_eq!(outcome.out, value);
+
+        let outcome = nu!(
+            "{} | encode base32 --nopad | decode base32 --nopad | to nuon",
+            value
+        );
+        assert_eq!(outcome.out, value);
+    }
+}
+
+#[test]
+fn encode() {
+    let text = "Ș̗͙̂̏o̲̲̗͗̌͊m̝̊̓́͂ë̡̦̞̤́̌̈́̀ ̥̝̪̎̿ͅf̧̪̻͉͗̈́̍̆u̮̝͌̈́ͅn̹̞̈́̊k̮͇̟͎̂͘y̧̲̠̾̆̕ͅ ̙͖̭͔̂̐t̞́́͘e̢̨͕̽x̥͋t͍̑̔͝";
+    let encoded = "KPGIFTEPZSTMZF6NTFX43F6MRTGYVTFSZSZMZF3NZSFMZE6MQHGYFTE5MXGYJTEMZWCMZAGMU3GKDTE6ZSSCBTEOZS743BOMUXGJ3TFKM3GZPTMEZSG4ZBWMVLGLXTFHZWEXLTMMZWCMZLWMTXGYK3WNQTGIVTFZZSPGXTMYZSBMZLWNQ7GJ7TMOPHGL5TEVZSDM3BOMWLGKPTFAEDGIFTEQZSM43FWMVXGZI5GMQHGZRTEBZSPGLTF5ZSRM3FOMVB4M3C6MUV2MZEOMSTGZ3TMN";
+
+    let outcome = nu!("'{}' | encode base32 --nopad", text);
+    assert_eq!(outcome.out, encoded);
+}
+
+#[test]
+fn decode_string() {
+    let text = "Very important data";
+    let encoded = "KZSXE6JANFWXA33SORQW45BAMRQXIYI=";
+
+    let outcome = nu!("'{}' | decode base32 | decode", encoded);
+    assert_eq!(outcome.out, text);
+}
+
+#[test]
+fn decode_pad_nopad() {
+    let text = "®lnnE¾ˆë";
+    let encoded_pad = "YKXGY3TOIXBL5S4GYOVQ====";
+    let encoded_nopad = "YKXGY3TOIXBL5S4GYOVQ";
+
+    let outcome = nu!("'{}' | decode base32 | decode", encoded_pad);
+    assert_eq!(outcome.out, text);
+
+    let outcome = nu!("'{}' | decode base32 --nopad | decode", encoded_nopad);
+    assert_eq!(outcome.out, text);
+}
+
+#[test]
+fn reject_pad_nopad() {
+    let encoded_nopad = "ME";
+    let encoded_pad = "ME======";
+
+    let outcome = nu!("'{}' | decode base32", encoded_nopad);
+    assert!(!outcome.err.is_empty());
+
+    let outcome = nu!("'{}' | decode base32 --nopad", encoded_pad);
+    assert!(!outcome.err.is_empty())
+}
diff --git a/crates/nu-command/tests/commands/base/base32hex.rs b/crates/nu-command/tests/commands/base/base32hex.rs
new file mode 100644
index 0000000000..adb1494bd9
--- /dev/null
+++ b/crates/nu-command/tests/commands/base/base32hex.rs
@@ -0,0 +1,58 @@
+use nu_test_support::nu;
+
+#[test]
+fn canonical() {
+    for value in super::random_bytes() {
+        let outcome = nu!("{} | encode base32hex | decode base32hex | to nuon", value);
+        assert_eq!(outcome.out, value);
+
+        let outcome = nu!(
+            "{} | encode base32hex --nopad | decode base32hex --nopad | to nuon",
+            value
+        );
+        assert_eq!(outcome.out, value);
+    }
+}
+
+#[test]
+fn encode() {
+    let text = "Ș̗͙̂̏o̲̲̗͗̌͊m̝̊̓́͂ë̡̦̞̤́̌̈́̀ ̥̝̪̎̿ͅf̧̪̻͉͗̈́̍̆u̮̝͌̈́ͅn̹̞̈́̊k̮͇̟͎̂͘y̧̲̠̾̆̕ͅ ̙͖̭͔̂̐t̞́́͘e̢̨͕̽x̥͋t͍̑̔͝";
+    let encoded = "AF685J4FPIJCP5UDJ5NSR5UCHJ6OLJ5IPIPCP5RDPI5CP4UCG76O5J4TCN6O9J4CPM2CP06CKR6A3J4UPII21J4EPIVSR1ECKN69RJ5ACR6PFJC4PI6SP1MCLB6BNJ57PM4NBJCCPM2CPBMCJN6OARMDGJ68LJ5PPIF6NJCOPI1CPBMDGV69VJCEF76BTJ4LPI3CR1ECMB6AFJ5043685J4GPICSR5MCLN6P8T6CG76PHJ41PIF6BJ5TPIHCR5ECL1SCR2UCKLQCP4ECIJ6PRJCD";
+
+    let outcome = nu!("'{}' | encode base32hex --nopad", text);
+    assert_eq!(outcome.out, encoded);
+}
+
+#[test]
+fn decode_string() {
+    let text = "Very important data";
+    let encoded = "APIN4U90D5MN0RRIEHGMST10CHGN8O8=";
+
+    let outcome = nu!("'{}' | decode base32hex | decode", encoded);
+    assert_eq!(outcome.out, text);
+}
+
+#[test]
+fn decode_pad_nopad() {
+    let text = "®lnnE¾ˆë";
+    let encoded_pad = "OAN6ORJE8N1BTIS6OELG====";
+    let encoded_nopad = "OAN6ORJE8N1BTIS6OELG";
+
+    let outcome = nu!("'{}' | decode base32hex | decode", encoded_pad);
+    assert_eq!(outcome.out, text);
+
+    let outcome = nu!("'{}' | decode base32hex --nopad | decode", encoded_nopad);
+    assert_eq!(outcome.out, text);
+}
+
+#[test]
+fn reject_pad_nopad() {
+    let encoded_nopad = "D1KG";
+    let encoded_pad = "D1KG====";
+
+    let outcome = nu!("'{}' | decode base32hex", encoded_nopad);
+    assert!(!outcome.err.is_empty());
+
+    let outcome = nu!("'{}' | decode base32hex --nopad", encoded_pad);
+    assert!(!outcome.err.is_empty())
+}
diff --git a/crates/nu-command/tests/commands/base/base64.rs b/crates/nu-command/tests/commands/base/base64.rs
new file mode 100644
index 0000000000..12b5f49fff
--- /dev/null
+++ b/crates/nu-command/tests/commands/base/base64.rs
@@ -0,0 +1,86 @@
+use nu_test_support::nu;
+
+#[test]
+fn canonical() {
+    for value in super::random_bytes() {
+        let outcome = nu!(
+            "{} | encode new-base64 | decode new-base64 | to nuon",
+            value
+        );
+        assert_eq!(outcome.out, value);
+
+        let outcome = nu!(
+            "{} | encode new-base64 --url | decode new-base64 --url | to nuon",
+            value
+        );
+        assert_eq!(outcome.out, value);
+
+        let outcome = nu!(
+            "{} | encode new-base64 --nopad | decode new-base64 --nopad | to nuon",
+            value
+        );
+        assert_eq!(outcome.out, value);
+
+        let outcome = nu!(
+            "{} | encode new-base64 --url --nopad | decode new-base64 --url --nopad | to nuon",
+            value
+        );
+        assert_eq!(outcome.out, value);
+    }
+}
+
+#[test]
+fn encode() {
+    let text = "Ș̗͙̂̏o̲̲̗͗̌͊m̝̊̓́͂ë̡̦̞̤́̌̈́̀ ̥̝̪̎̿ͅf̧̪̻͉͗̈́̍̆u̮̝͌̈́ͅn̹̞̈́̊k̮͇̟͎̂͘y̧̲̠̾̆̕ͅ ̙͖̭͔̂̐t̞́́͘e̢̨͕̽x̥͋t͍̑̔͝";
+    let encoded = "U8yCzI/MpsyXzZlvzZfMjM2KzLLMssyXbcyKzJPMgc2CzJ1lzYTMjM2EzIDMpsyhzJ7MpCDMjsy/zYXMpcydzKpmzZfNhMyNzIbMqsy7zKfNiXXNjM2EzK7Mnc2Fbs2EzIrMucyea82YzILMrs2HzJ/NjnnMvsyVzIbNhcyyzKfMoCDMgsyQzJnNlsytzZR0zIHNmMyBzJ5lzL3Mos2VzKh4zYvMpXTMkcyUzZ3NjQ==";
+
+    let outcome = nu!("'{}' | encode new-base64", text);
+    assert_eq!(outcome.out, encoded);
+}
+
+#[test]
+fn decode_string() {
+    let text = "Very important data";
+    let encoded = "VmVyeSBpbXBvcnRhbnQgZGF0YQ==";
+
+    let outcome = nu!("'{}' | decode new-base64 | decode", encoded);
+    assert_eq!(outcome.out, text);
+}
+
+#[test]
+fn decode_pad_nopad() {
+    let text = "”¥.ä@°bZö¢";
+    let encoded_pad = "4oCdwqUuw6RAwrBiWsO2wqI=";
+    let encoded_nopad = "4oCdwqUuw6RAwrBiWsO2wqI";
+
+    let outcome = nu!("'{}' | decode new-base64 | decode", encoded_pad);
+    assert_eq!(outcome.out, text);
+
+    let outcome = nu!("'{}' | decode new-base64 --nopad | decode", encoded_nopad);
+    assert_eq!(outcome.out, text);
+}
+
+#[test]
+fn decode_url() {
+    let text = "p:gטݾ߫t+?";
+    let encoded = "cDpn15jdvt+rdCs/";
+    let encoded_url = "cDpn15jdvt-rdCs_";
+
+    let outcome = nu!("'{}' | decode new-base64 | decode", encoded);
+    assert_eq!(outcome.out, text);
+
+    let outcome = nu!("'{}' | decode new-base64 --url | decode", encoded_url);
+    assert_eq!(outcome.out, text);
+}
+
+#[test]
+fn reject_pad_nopad() {
+    let encoded_nopad = "YQ";
+    let encoded_pad = "YQ==";
+
+    let outcome = nu!("'{}' | decode new-base64", encoded_nopad);
+    assert!(!outcome.err.is_empty());
+
+    let outcome = nu!("'{}' | decode new-base64 --nopad", encoded_pad);
+    assert!(!outcome.err.is_empty())
+}
diff --git a/crates/nu-command/tests/commands/base/hex.rs b/crates/nu-command/tests/commands/base/hex.rs
new file mode 100644
index 0000000000..5f497408b6
--- /dev/null
+++ b/crates/nu-command/tests/commands/base/hex.rs
@@ -0,0 +1,36 @@
+use nu_test_support::nu;
+
+#[test]
+fn canonical() {
+    for value in super::random_bytes() {
+        let outcome = nu!("{} | encode hex | decode hex | to nuon", value);
+        assert_eq!(outcome.out, value);
+    }
+}
+
+#[test]
+fn encode() {
+    let text = "Ș̗͙̂̏o̲̲̗͗̌͊m̝̊̓́͂ë̡̦̞̤́̌̈́̀ ̥̝̪̎̿ͅf̧̪̻͉͗̈́̍̆u̮̝͌̈́ͅn̹̞̈́̊k̮͇̟͎̂͘y̧̲̠̾̆̕ͅ ̙͖̭͔̂̐t̞́́͘e̢̨͕̽x̥͋t͍̑̔͝";
+    let encoded = "53CC82CC8FCCA6CC97CD996FCD97CC8CCD8ACCB2CCB2CC976DCC8ACC93CC81CD82CC9D65CD84CC8CCD84CC80CCA6CCA1CC9ECCA420CC8ECCBFCD85CCA5CC9DCCAA66CD97CD84CC8DCC86CCAACCBBCCA7CD8975CD8CCD84CCAECC9DCD856ECD84CC8ACCB9CC9E6BCD98CC82CCAECD87CC9FCD8E79CCBECC95CC86CD85CCB2CCA7CCA020CC82CC90CC99CD96CCADCD9474CC81CD98CC81CC9E65CCBDCCA2CD95CCA878CD8BCCA574CC91CC94CD9DCD8D";
+
+    let outcome = nu!("'{}' | encode hex", text);
+    assert_eq!(outcome.out, encoded);
+}
+
+#[test]
+fn decode_string() {
+    let text = "Very important data";
+    let encoded = "5665727920696D706F7274616E742064617461";
+
+    let outcome = nu!("'{}' | decode hex | decode", encoded);
+    assert_eq!(outcome.out, text);
+}
+
+#[test]
+fn decode_case_mixing() {
+    let text = "®lnnE¾ˆë";
+    let mixed_encoded = "c2aE6c6e6E45C2BeCB86c3ab";
+
+    let outcome = nu!("'{}' | decode hex | decode", mixed_encoded);
+    assert_eq!(outcome.out, text);
+}
diff --git a/crates/nu-command/tests/commands/base/mod.rs b/crates/nu-command/tests/commands/base/mod.rs
new file mode 100644
index 0000000000..09828c9211
--- /dev/null
+++ b/crates/nu-command/tests/commands/base/mod.rs
@@ -0,0 +1,24 @@
+use data_encoding::HEXUPPER;
+use rand::prelude::*;
+use rand_chacha::ChaCha8Rng;
+
+mod base32;
+mod base32hex;
+mod base64;
+mod hex;
+
+/// Generate a few random binaries.
+pub fn random_bytes() -> Vec<String> {
+    const NUM: usize = 32;
+    let mut rng = ChaCha8Rng::seed_from_u64(4);
+
+    (0..NUM)
+        .map(|_| {
+            let length = rng.gen_range(0..512);
+            let mut bytes = vec![0u8; length];
+            rng.fill_bytes(&mut bytes);
+            let hex_bytes = HEXUPPER.encode(&bytes);
+            format!("0x[{}]", hex_bytes)
+        })
+        .collect()
+}
diff --git a/crates/nu-command/tests/commands/mod.rs b/crates/nu-command/tests/commands/mod.rs
index 3cb468ad30..63911ebfbc 100644
--- a/crates/nu-command/tests/commands/mod.rs
+++ b/crates/nu-command/tests/commands/mod.rs
@@ -3,6 +3,7 @@ mod all;
 mod any;
 mod append;
 mod assignment;
+mod base;
 mod break_;
 mod bytes;
 mod cal;

From 822007dbbbb4edb3761b0b9d83c5ab832ea4452a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrej=20Kol=C4=8Din?= <self@kaathewise.net>
Date: Fri, 23 Aug 2024 21:51:34 +0300
Subject: [PATCH 0368/1072] Remove unused `same-file` workspace dependency
 (#13678)

A small no-op change. It was used in a two years old `mv` fix
(848550771a, pre `uu_mv`). But now it's redundant.
---
 Cargo.lock                   | 1 -
 Cargo.toml                   | 1 -
 crates/nu-command/Cargo.toml | 1 -
 3 files changed, 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3e818b221d..5ea776765f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3134,7 +3134,6 @@ dependencies = [
  "roxmltree",
  "rstest",
  "rusqlite",
- "same-file",
  "serde",
  "serde_json",
  "serde_urlencoded",
diff --git a/Cargo.toml b/Cargo.toml
index ebb26171c8..074cd764d6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -148,7 +148,6 @@ roxmltree = "0.19"
 rstest = { version = "0.18", default-features = false }
 rusqlite = "0.31"
 rust-embed = "8.5.0"
-same-file = "1.0"
 serde = { version = "1.0", default-features = false }
 serde_json = "1.0"
 serde_urlencoded = "0.7.1"
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 3c455eabcf..20e5d607ea 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -77,7 +77,6 @@ regex = { workspace = true }
 roxmltree = { workspace = true }
 rusqlite = { workspace = true, features = ["bundled", "backup", "chrono"], optional = true }
 rmp = { workspace = true }
-same-file = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true, features = ["preserve_order"] }
 serde_urlencoded = { workspace = true }

From dfdb2b5d317d5c9d9081e069560d349e2b07d97b Mon Sep 17 00:00:00 2001
From: Gwendolyn <me@gwendolyn.dev>
Date: Fri, 23 Aug 2024 21:08:27 +0200
Subject: [PATCH 0369/1072] Improve help output for scripts (#13445)

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

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
Currently the parser and the documentation generation use the signature
of the command, which means that it doesn't pick up on the changed name
of the `main` block, and therefore shows the name of the command as
"main" and doesn't find the subcommands. This PR changes the
aforementioned places to use the block signature to fix these issues.
This closes #13397. Incidentally it also causes input/output types to be
shown in the help, which is kinda pointless for scripts since they don't
operate on structured data but maybe not worth the effort to remove.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
```
# example.nu
export def main [] { help main }
export def 'main sub' [] { print 'sub' }
```
Before:

![image](https://github.com/user-attachments/assets/49fdcf8d-e56a-4c27-b7c8-7d2902c2a807)

![image](https://github.com/user-attachments/assets/4d1f4faa-5928-4269-b0b5-fd654563bb8b)


After:

![image](https://github.com/user-attachments/assets/a7232a1f-f997-4988-808c-8fa957e39bae)

![image](https://github.com/user-attachments/assets/c5628dc6-69b5-443a-b103-9e5faa9bb4ba)

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

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

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

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

Tests are still missing for the subcommands and the input/output types

---------

Co-authored-by: Stefan Holderbach <sholderbach@users.noreply.github.com>
---
 crates/nu-engine/src/documentation.rs         |  4 +-
 crates/nu-parser/src/parser.rs                |  2 +-
 .../src/engine/state_working_set.rs           | 10 ++-
 tests/shell/mod.rs                            | 66 +++++++++++++++++++
 4 files changed, 79 insertions(+), 3 deletions(-)

diff --git a/crates/nu-engine/src/documentation.rs b/crates/nu-engine/src/documentation.rs
index 370b00e3f9..9d7ea7f8f2 100644
--- a/crates/nu-engine/src/documentation.rs
+++ b/crates/nu-engine/src/documentation.rs
@@ -25,7 +25,9 @@ pub fn get_full_help(
     // execution.
     let stack = &mut stack.start_capture();
 
-    let signature = command.signature().update_from_command(command);
+    let signature = engine_state
+        .get_signature(command)
+        .update_from_command(command);
 
     get_documentation(
         &signature,
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 33ecdadd3a..b9147ed7f9 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -949,7 +949,7 @@ pub fn parse_internal_call(
     let _ = working_set.add_span(call.head);
 
     let decl = working_set.get_decl(decl_id);
-    let signature = decl.signature();
+    let signature = working_set.get_signature(decl);
     let output = signature.get_output_type();
 
     // storing the var ID for later due to borrowing issues
diff --git a/crates/nu-protocol/src/engine/state_working_set.rs b/crates/nu-protocol/src/engine/state_working_set.rs
index 2ffcfa023b..eb60f9df8b 100644
--- a/crates/nu-protocol/src/engine/state_working_set.rs
+++ b/crates/nu-protocol/src/engine/state_working_set.rs
@@ -5,7 +5,7 @@ use crate::{
         StateDelta, Variable, VirtualPath, Visibility,
     },
     BlockId, Category, CompileError, Config, DeclId, FileId, GetSpan, Module, ModuleId, ParseError,
-    ParseWarning, Span, SpanId, Type, Value, VarId, VirtualPathId,
+    ParseWarning, Signature, Span, SpanId, Type, Value, VarId, VirtualPathId,
 };
 use core::panic;
 use std::{
@@ -710,6 +710,14 @@ impl<'a> StateWorkingSet<'a> {
         }
     }
 
+    pub fn get_signature(&self, decl: &dyn Command) -> Signature {
+        if let Some(block_id) = decl.block_id() {
+            *self.get_block(block_id).signature.clone()
+        } else {
+            decl.signature()
+        }
+    }
+
     pub fn find_commands_by_predicate(
         &self,
         predicate: impl Fn(&[u8]) -> bool,
diff --git a/tests/shell/mod.rs b/tests/shell/mod.rs
index 62f79a59c1..bedfe8304e 100644
--- a/tests/shell/mod.rs
+++ b/tests/shell/mod.rs
@@ -334,3 +334,69 @@ fn source_empty_file() {
         assert!(actual.out.is_empty());
     })
 }
+
+#[test]
+fn main_script_help_uses_script_name1() {
+    // Note: this test is somewhat fragile and might need to be adapted if the usage help message changes
+    Playground::setup("main_filename", |dirs, sandbox| {
+        sandbox.mkdir("main_filename");
+        sandbox.with_files(&[FileWithContent(
+            "script.nu",
+            r#"def main [] {}
+            "#,
+        )]);
+        let actual = nu!(cwd: dirs.test(), pipeline("nu script.nu --help"));
+        assert!(actual.out.contains("> script.nu"));
+        assert!(!actual.out.contains("> main"));
+    })
+}
+
+#[test]
+fn main_script_help_uses_script_name2() {
+    // Note: this test is somewhat fragile and might need to be adapted if the usage help message changes
+    Playground::setup("main_filename", |dirs, sandbox| {
+        sandbox.mkdir("main_filename");
+        sandbox.with_files(&[FileWithContent(
+            "script.nu",
+            r#"def main [foo: string] {}
+            "#,
+        )]);
+        let actual = nu!(cwd: dirs.test(), pipeline("nu script.nu"));
+        assert!(actual.err.contains("Usage: script.nu"));
+        assert!(!actual.err.contains("Usage: main"));
+    })
+}
+
+#[test]
+fn main_script_subcommand_help_uses_script_name1() {
+    // Note: this test is somewhat fragile and might need to be adapted if the usage help message changes
+    Playground::setup("main_filename", |dirs, sandbox| {
+        sandbox.mkdir("main_filename");
+        sandbox.with_files(&[FileWithContent(
+            "script.nu",
+            r#"def main [] {}
+            def 'main foo' [] {}
+            "#,
+        )]);
+        let actual = nu!(cwd: dirs.test(), pipeline("nu script.nu foo --help"));
+        assert!(actual.out.contains("> script.nu foo"));
+        assert!(!actual.out.contains("> main foo"));
+    })
+}
+
+#[test]
+fn main_script_subcommand_help_uses_script_name2() {
+    // Note: this test is somewhat fragile and might need to be adapted if the usage help message changes
+    Playground::setup("main_filename", |dirs, sandbox| {
+        sandbox.mkdir("main_filename");
+        sandbox.with_files(&[FileWithContent(
+            "script.nu",
+            r#"def main [] {}
+            def 'main foo' [bar: string] {}
+            "#,
+        )]);
+        let actual = nu!(cwd: dirs.test(), pipeline("nu script.nu foo"));
+        assert!(actual.err.contains("Usage: script.nu foo"));
+        assert!(!actual.err.contains("Usage: main foo"));
+    })
+}

From 7003b007d50906f2661b55592ca982d9740467a1 Mon Sep 17 00:00:00 2001
From: Poliorcetics <poliorcetics@users.noreply.github.com>
Date: Fri, 23 Aug 2024 21:17:44 +0200
Subject: [PATCH 0370/1072] doc: fix broken doc links (#13644)

Some broken doc links I saw when compiling with `cargo +stable doc
--no-deps --document-private-items --workspace --open`
---
 crates/nu-command/src/charting/hashable_value.rs | 2 +-
 crates/nu-command/src/system/run_external.rs     | 2 +-
 crates/nu-engine/src/compile/mod.rs              | 4 ++--
 crates/nu-plugin-engine/src/process.rs           | 2 +-
 crates/nu-plugin-engine/src/source.rs            | 2 +-
 crates/nu-plugin-engine/src/util/mutable_cow.rs  | 4 ++--
 crates/nu-protocol/src/engine/stack.rs           | 2 +-
 crates/nu-table/src/table.rs                     | 3 ++-
 8 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/crates/nu-command/src/charting/hashable_value.rs b/crates/nu-command/src/charting/hashable_value.rs
index 5b49a3fcd2..e72f0fee5f 100644
--- a/crates/nu-command/src/charting/hashable_value.rs
+++ b/crates/nu-command/src/charting/hashable_value.rs
@@ -2,7 +2,7 @@ use chrono::{DateTime, FixedOffset};
 use nu_protocol::{ShellError, Span, Value};
 use std::hash::{Hash, Hasher};
 
-/// A subset of [`Value`](crate::Value), which is hashable.
+/// A subset of [`Value`], which is hashable.
 /// And it means that we can put the value into something like
 /// [`HashMap`](std::collections::HashMap) or [`HashSet`](std::collections::HashSet) for further
 /// usage like value statistics.
diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index 743956250a..70a00bc815 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -506,7 +506,7 @@ pub fn which(name: impl AsRef<OsStr>, paths: &str, cwd: &Path) -> Option<PathBuf
 }
 
 /// Returns true if `name` is a (somewhat useful) CMD internal command. The full
-/// list can be found at https://ss64.com/nt/syntax-internal.html
+/// list can be found at <https://ss64.com/nt/syntax-internal.html>
 fn is_cmd_internal_command(name: &str) -> bool {
     const COMMANDS: &[&str] = &[
         "ASSOC", "CLS", "ECHO", "FTYPE", "MKLINK", "PAUSE", "START", "VER", "VOL",
diff --git a/crates/nu-engine/src/compile/mod.rs b/crates/nu-engine/src/compile/mod.rs
index 8f6ae22682..0beea18dd1 100644
--- a/crates/nu-engine/src/compile/mod.rs
+++ b/crates/nu-engine/src/compile/mod.rs
@@ -43,8 +43,8 @@ pub fn compile(working_set: &StateWorkingSet, block: &Block) -> Result<IrBlock,
 }
 
 /// Compiles a [`Block`] in-place into an IR block. This can be used in a nested manner, for example
-/// by [`compile_if()`], where the instructions for the blocks for the if/else are inlined into the
-/// top-level IR block.
+/// by [`compile_if()`][keyword::compile_if], where the instructions for the blocks for the if/else
+/// are inlined into the top-level IR block.
 fn compile_block(
     working_set: &StateWorkingSet,
     builder: &mut BlockBuilder,
diff --git a/crates/nu-plugin-engine/src/process.rs b/crates/nu-plugin-engine/src/process.rs
index a87e2ea22b..130bf11079 100644
--- a/crates/nu-plugin-engine/src/process.rs
+++ b/crates/nu-plugin-engine/src/process.rs
@@ -79,7 +79,7 @@ impl PluginProcess {
         }
     }
 
-    /// Move the plugin process out of the foreground. See [`ForegroundGuard::reset`].
+    /// Move the plugin process out of the foreground. See [`ForegroundGuard`].
     ///
     /// This is a no-op if the plugin process was already in the background.
     pub(crate) fn exit_foreground(&self) -> Result<(), ShellError> {
diff --git a/crates/nu-plugin-engine/src/source.rs b/crates/nu-plugin-engine/src/source.rs
index 56043eccf5..5165100544 100644
--- a/crates/nu-plugin-engine/src/source.rs
+++ b/crates/nu-plugin-engine/src/source.rs
@@ -11,7 +11,7 @@ pub struct PluginSource {
     /// A weak reference to the persistent plugin that might hold an interface to the plugin.
     ///
     /// This is weak to avoid cyclic references, but it does mean we might fail to upgrade if
-    /// the engine state lost the [`PersistentPlugin`] at some point.
+    /// the engine state lost the [`PersistentPlugin`][crate::PersistentPlugin] at some point.
     pub(crate) persistent: Weak<dyn GetPlugin>,
 }
 
diff --git a/crates/nu-plugin-engine/src/util/mutable_cow.rs b/crates/nu-plugin-engine/src/util/mutable_cow.rs
index e0f7807fe2..100847dcfb 100644
--- a/crates/nu-plugin-engine/src/util/mutable_cow.rs
+++ b/crates/nu-plugin-engine/src/util/mutable_cow.rs
@@ -1,5 +1,5 @@
-/// Like [`Cow`] but with a mutable reference instead. So not exactly clone-on-write, but can be
-/// made owned.
+/// Like [`Cow`][std::borrow::Cow] but with a mutable reference instead. So not exactly
+/// clone-on-write, but can be made owned.
 pub enum MutableCow<'a, T> {
     Borrowed(&'a mut T),
     Owned(T),
diff --git a/crates/nu-protocol/src/engine/stack.rs b/crates/nu-protocol/src/engine/stack.rs
index 7ba8268985..86420caf50 100644
--- a/crates/nu-protocol/src/engine/stack.rs
+++ b/crates/nu-protocol/src/engine/stack.rs
@@ -68,7 +68,7 @@ impl Stack {
     /// stdout and stderr will be set to [`OutDest::Inherit`]. So, if the last command is an external command,
     /// then its output will be forwarded to the terminal/stdio streams.
     ///
-    /// Use [`Stack::capture`] afterwards if you need to evaluate an expression to a [`Value`](crate::Value)
+    /// Use [`Stack::capture`] afterwards if you need to evaluate an expression to a [`Value`]
     /// (as opposed to a [`PipelineData`](crate::PipelineData)).
     pub fn new() -> Self {
         Self {
diff --git a/crates/nu-table/src/table.rs b/crates/nu-table/src/table.rs
index bc23e48248..040954b7e8 100644
--- a/crates/nu-table/src/table.rs
+++ b/crates/nu-table/src/table.rs
@@ -847,7 +847,8 @@ fn truncate_columns_by_head(
     widths
 }
 
-/// The same as [`tabled::peaker::PriorityMax`] but prioritizes left columns first in case of equal width.
+/// The same as [`tabled::settings::peaker::PriorityMax`] but prioritizes left columns first in case
+/// of equal width.
 #[derive(Debug, Default, Clone)]
 pub struct PriorityMax;
 

From 525eac1afdb97caf8648b7725f314c7a3756c2de Mon Sep 17 00:00:00 2001
From: Maxim Zhiburt <zhiburt@gmail.com>
Date: Sat, 24 Aug 2024 01:35:42 +0300
Subject: [PATCH 0371/1072] [DRAFT] Check fix for emojie, wrap issues (#13430)

Hi there

Here I am using latest tabled.

My tests shows it does fixes panics, but I am wanna be sure.

@fdncred could you verify that it does fixes those panics/errors?

Closes #13405
Closes #12786
---
 Cargo.lock                                   | 1292 ++++++++++--------
 Cargo.toml                                   |    2 +-
 crates/nu-command/Cargo.toml                 |    2 +-
 crates/nu-command/src/debug/inspect_table.rs |    6 +-
 crates/nu-table/Cargo.toml                   |    2 +-
 crates/nu-table/examples/table_demo.rs       |    6 +-
 crates/nu-table/src/table.rs                 |  147 +-
 crates/nu-table/src/table_theme.rs           |  189 +--
 crates/nu-table/src/types/expanded.rs        |    2 +-
 crates/nu-table/src/unstructured_table.rs    |   29 +-
 crates/nu-table/src/util.rs                  |   36 +-
 crates/nu-table/tests/common.rs              |   12 +-
 crates/nu-table/tests/constrains.rs          |    4 +-
 crates/nu-table/tests/style.rs               |   10 +-
 14 files changed, 917 insertions(+), 822 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5ea776765f..ea008d0ef8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "addr2line"
-version = "0.21.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
 dependencies = [
  "gimli",
 ]
@@ -17,6 +17,12 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
 [[package]]
 name = "adler32"
 version = "1.2.0"
@@ -128,9 +134,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.14"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -143,33 +149,33 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.3"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
 dependencies = [
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.3"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
 dependencies = [
  "anstyle",
  "windows-sys 0.52.0",
@@ -177,9 +183,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 
 [[package]]
 name = "arboard"
@@ -220,9 +226,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "assert-json-diff"
@@ -236,13 +242,14 @@ dependencies = [
 
 [[package]]
 name = "assert_cmd"
-version = "2.0.14"
+version = "2.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed72493ac66d5804837f480ab3766c72bdfab91a65e565fc54fa9e42db0073a8"
+checksum = "dc1835b7f27878de8525dc71410b5a31cdcc5f230aed5ba5df968e09c201b23d"
 dependencies = [
  "anstyle",
  "bstr",
  "doc-comment",
+ "libc",
  "predicates",
  "predicates-core",
  "predicates-tree",
@@ -268,18 +275,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.80"
+version = "0.1.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
+checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -305,9 +312,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "avro-schema"
@@ -325,15 +332,15 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.71"
+version = "0.3.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
 dependencies = [
  "addr2line",
  "cc",
  "cfg-if",
  "libc",
- "miniz_oxide",
+ "miniz_oxide 0.7.4",
  "object",
  "rustc-demangle",
 ]
@@ -347,12 +354,6 @@ dependencies = [
  "backtrace",
 ]
 
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
 [[package]]
 name = "base64"
 version = "0.21.7"
@@ -380,7 +381,7 @@ version = "0.69.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cexpr",
  "clang-sys",
  "itertools 0.12.1",
@@ -391,7 +392,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.60",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -417,9 +418,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 dependencies = [
  "serde",
 ]
@@ -447,34 +448,34 @@ dependencies = [
 
 [[package]]
 name = "block2"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43ff7d91d3c1d568065b06c899777d1e48dcf76103a672a0adbc238a7f247f1e"
+checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
 dependencies = [
  "objc2",
 ]
 
 [[package]]
 name = "borsh"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbe5b10e214954177fb1dc9fbd20a1a2608fe99e6c832033bdc7cea287a20d77"
+checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed"
 dependencies = [
  "borsh-derive",
- "cfg_aliases",
+ "cfg_aliases 0.2.1",
 ]
 
 [[package]]
 name = "borsh-derive"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7a8646f94ab393e43e8b35a2558b1624bed28b97ee09c5d15456e3c9463f46d"
+checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b"
 dependencies = [
  "once_cell",
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
  "syn_derive",
 ]
 
@@ -497,9 +498,9 @@ dependencies = [
 
 [[package]]
 name = "brotli-decompressor"
-version = "4.0.0"
+version = "4.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6221fe77a248b9117d431ad93761222e1cf8ff282d9d1d5d9f53d6299a1cf76"
+checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -507,9 +508,9 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "1.9.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"
+checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
 dependencies = [
  "memchr",
  "regex-automata",
@@ -563,22 +564,22 @@ checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce"
 
 [[package]]
 name = "bytemuck"
-version = "1.15.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15"
+checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31"
 dependencies = [
  "bytemuck_derive",
 ]
 
 [[package]]
 name = "bytemuck_derive"
-version = "1.6.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60"
+checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -589,9 +590,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.6.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
 
 [[package]]
 name = "bytesize"
@@ -624,22 +625,22 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
 
 [[package]]
 name = "castaway"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc"
+checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5"
 dependencies = [
  "rustversion",
 ]
 
 [[package]]
 name = "cc"
-version = "1.0.96"
+version = "1.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd"
+checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932"
 dependencies = [
  "jobserver",
  "libc",
- "once_cell",
+ "shlex",
 ]
 
 [[package]]
@@ -663,6 +664,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "chardetng"
 version = "0.1.17"
@@ -676,11 +683,11 @@ dependencies = [
 
 [[package]]
 name = "charset"
-version = "0.1.3"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18e9079d1a12a2cc2bffb5db039c43661836ead4082120d5844f02555aca2d46"
+checksum = "f1f927b07c74ba84c7e5fe4db2baeb3e996ab2688992e39ac68ce3220a677c7e"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.22.1",
  "encoding_rs",
 ]
 
@@ -697,7 +704,7 @@ dependencies = [
  "pure-rust-locales",
  "serde",
  "wasm-bindgen",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -765,9 +772,9 @@ dependencies = [
 
 [[package]]
 name = "clang-sys"
-version = "1.7.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
 dependencies = [
  "glob",
  "libc",
@@ -776,9 +783,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.4"
+version = "4.5.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
+checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -786,9 +793,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.2"
+version = "4.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
+checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
 dependencies = [
  "anstream",
  "anstyle",
@@ -799,45 +806,45 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.4"
+version = "4.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
+checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
 dependencies = [
- "heck 0.5.0",
+ "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
 
 [[package]]
 name = "clipboard-win"
-version = "5.3.1"
+version = "5.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad"
+checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892"
 dependencies = [
  "error-code",
 ]
 
 [[package]]
 name = "codepage"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b0e9222c0cdf2c6ac27d73f664f9520266fa911c3106329d359f8861cb8bde9"
+checksum = "48f68d061bc2828ae826206326e61251aca94c1e4a5305cf52d9138639c918b4"
 dependencies = [
  "encoding_rs",
 ]
 
 [[package]]
 name = "colorchoice"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
 
 [[package]]
 name = "colorz"
@@ -947,15 +954,15 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.12"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
 dependencies = [
  "libc",
 ]
@@ -977,18 +984,18 @@ checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403"
 
 [[package]]
 name = "crc32fast"
-version = "1.4.0"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.12"
+version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -1023,9 +1030,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
 [[package]]
 name = "crossterm"
@@ -1033,10 +1040,10 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "crossterm_winapi",
  "libc",
- "mio",
+ "mio 0.8.11",
  "parking_lot",
  "serde",
  "signal-hook",
@@ -1089,7 +1096,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
 dependencies = [
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -1115,12 +1122,12 @@ dependencies = [
 
 [[package]]
 name = "ctrlc"
-version = "3.4.4"
+version = "3.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345"
+checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3"
 dependencies = [
- "nix",
- "windows-sys 0.52.0",
+ "nix 0.29.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1140,9 +1147,9 @@ dependencies = [
 
 [[package]]
 name = "curl-sys"
-version = "0.4.73+curl-8.8.0"
+version = "0.4.74+curl-8.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "450ab250ecf17227c39afb9a2dd9261dc0035cb80f2612472fc0c4aac2dcb84d"
+checksum = "8af10b986114528fcdc4b63b6f5f021b7057618411046a4de2ba0f0149a097bf"
 dependencies = [
  "cc",
  "libc",
@@ -1176,18 +1183,18 @@ checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
 ]
 
 [[package]]
 name = "derive_more"
-version = "0.99.17"
+version = "0.99.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -1295,18 +1302,18 @@ checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653"
 
 [[package]]
 name = "dtoa-short"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74"
+checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87"
 dependencies = [
  "dtoa",
 ]
 
 [[package]]
 name = "dtparse"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "458c7cfe1c34b1ef7c2c435076064711050aedabae9952a261687c500f80e839"
+checksum = "23fb403c0926d35af2cc54d961bc2696a10d40725c08360ef69db04a4c201fd7"
 dependencies = [
  "chrono",
  "lazy_static",
@@ -1316,9 +1323,9 @@ dependencies = [
 
 [[package]]
 name = "dunce"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
 
 [[package]]
 name = "dyn-clone"
@@ -1328,15 +1335,15 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
 [[package]]
 name = "ego-tree"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a68a4904193147e0a8dec3314640e6db742afd5f6e634f428a6af230d9b3591"
+checksum = "12a0bb14ac04a9fcf170d0bbbef949b44cc492f4452bd20c095636956f653642"
 
 [[package]]
 name = "either"
-version = "1.11.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 dependencies = [
  "serde",
 ]
@@ -1375,14 +1382,14 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
 ]
 
 [[package]]
 name = "env_filter"
-version = "0.1.0"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea"
+checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
 dependencies = [
  "log",
  "regex",
@@ -1400,9 +1407,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.3"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9"
+checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1419,18 +1426,19 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "erased-serde"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b73807008a3c7f171cc40312f37d95ef0396e048b5848d775f54b1a4dd4a0d3"
+checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d"
 dependencies = [
  "serde",
+ "typeid",
 ]
 
 [[package]]
 name = "errno"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -1514,14 +1522,14 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.23"
+version = "0.2.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
+checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.4.1",
- "windows-sys 0.52.0",
+ "libredox",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1532,12 +1540,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.30"
+version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666"
 dependencies = [
  "crc32fast",
- "miniz_oxide",
+ "miniz_oxide 0.8.0",
 ]
 
 [[package]]
@@ -1672,7 +1680,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -1745,9 +1753,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -1758,9 +1766,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.28.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
 
 [[package]]
 name = "git2"
@@ -1768,7 +1776,7 @@ version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "libc",
  "libgit2-sys",
  "log",
@@ -1808,9 +1816,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
+checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -1867,9 +1875,9 @@ dependencies = [
 
 [[package]]
 name = "hashlink"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "692eaaf7f7607518dd3cef090f1474b61edc5301d8012f09579920df68b725ee"
+checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af"
 dependencies = [
  "hashbrown 0.14.5",
 ]
@@ -1884,12 +1892,6 @@ dependencies = [
  "stable_deref_trait",
 ]
 
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -1902,6 +1904,12 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
+[[package]]
+name = "hermit-abi"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -1928,7 +1936,7 @@ dependencies = [
  "markup5ever",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -1967,9 +1975,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.8.0"
+version = "1.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
 
 [[package]]
 name = "httpdate"
@@ -2118,18 +2126,18 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "interprocess"
-version = "2.2.0"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67bafc2f5dbdad79a6d925649758d5472647b416028099f0b829d1b67fdd47d3"
+checksum = "d2f4e4a06d42fab3e85ab1b419ad32b09eab58b901d40c57935ff92db3287a13"
 dependencies = [
  "doctest-file",
  "libc",
@@ -2155,11 +2163,11 @@ dependencies = [
 
 [[package]]
 name = "is-terminal"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
+checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.4.0",
  "libc",
  "windows-sys 0.52.0",
 ]
@@ -2197,9 +2205,9 @@ dependencies = [
 
 [[package]]
 name = "is_terminal_polyfill"
-version = "1.70.0"
+version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
 [[package]]
 name = "itertools"
@@ -2219,6 +2227,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.11"
@@ -2233,9 +2250,9 @@ checksum = "9028f49264629065d057f340a86acb84867925865f73bbf8d47b4d149a7e88b8"
 
 [[package]]
 name = "jobserver"
-version = "0.1.31"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
 dependencies = [
  "libc",
 ]
@@ -2248,9 +2265,9 @@ checksum = "72167d68f5fce3b8655487b8038691a3c9984ee769590f93f2a631f4ad64e4f5"
 
 [[package]]
 name = "js-sys"
-version = "0.3.69"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2288,9 +2305,9 @@ dependencies = [
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "lazycell"
@@ -2364,9 +2381,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.155"
+version = "0.2.158"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
 
 [[package]]
 name = "libflate"
@@ -2404,12 +2421,12 @@ dependencies = [
 
 [[package]]
 name = "libloading"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -2420,9 +2437,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 
 [[package]]
 name = "libmimalloc-sys"
-version = "0.1.38"
+version = "0.1.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e7bb23d733dfcc8af652a78b7bf232f0e967710d044732185e561e47c0336b6"
+checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44"
 dependencies = [
  "cc",
  "libc",
@@ -2445,8 +2462,9 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "libc",
+ "redox_syscall",
 ]
 
 [[package]]
@@ -2476,9 +2494,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.16"
+version = "1.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9"
+checksum = "fdc53a7799a7496ebc9fd29f31f7df80e83c9bda5299768af5f9e59eeea74647"
 dependencies = [
  "cc",
  "libc",
@@ -2497,9 +2515,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "lock_api"
@@ -2513,15 +2531,15 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "lru"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc"
+checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904"
 dependencies = [
  "hashbrown 0.14.5",
 ]
@@ -2562,9 +2580,9 @@ dependencies = [
 
 [[package]]
 name = "lz4"
-version = "1.24.0"
+version = "1.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1"
+checksum = "958b4caa893816eea05507c20cfe47574a43d9a697138a7872990bba8a0ece68"
 dependencies = [
  "libc",
  "lz4-sys",
@@ -2572,9 +2590,9 @@ dependencies = [
 
 [[package]]
 name = "lz4-sys"
-version = "1.9.4"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900"
+checksum = "109de74d5d2353660401699a4174a4ff23fcc649caf553df71933c7fb45ad868"
 dependencies = [
  "cc",
  "libc",
@@ -2642,9 +2660,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.2"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memmap2"
@@ -2683,14 +2701,14 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
 ]
 
 [[package]]
 name = "mimalloc"
-version = "0.1.42"
+version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9186d86b79b52f4a77af65604b51225e8db1d6ee7e3f41aec1e40829c71a176"
+checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633"
 dependencies = [
  "libmimalloc-sys",
 ]
@@ -2703,9 +2721,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "mime_guess"
-version = "2.0.4"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
+checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
 dependencies = [
  "mime",
  "unicase",
@@ -2719,13 +2737,22 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
 dependencies = [
  "adler",
 ]
 
+[[package]]
+name = "miniz_oxide"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+dependencies = [
+ "adler2",
+]
+
 [[package]]
 name = "mio"
 version = "0.8.11"
@@ -2738,6 +2765,18 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "mio"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+dependencies = [
+ "hermit-abi 0.3.9",
+ "libc",
+ "wasi",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "mockito"
 version = "1.5.0"
@@ -2799,11 +2838,10 @@ dependencies = [
 
 [[package]]
 name = "native-tls"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
 dependencies = [
- "lazy_static",
  "libc",
  "log",
  "openssl",
@@ -2827,9 +2865,21 @@ version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cfg-if",
- "cfg_aliases",
+ "cfg_aliases 0.1.1",
+ "libc",
+]
+
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "cfg_aliases 0.2.1",
  "libc",
 ]
 
@@ -2849,7 +2899,7 @@ version = "6.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "crossbeam-channel",
  "filetime",
  "fsevent-sys",
@@ -2857,7 +2907,7 @@ dependencies = [
  "kqueue",
  "libc",
  "log",
- "mio",
+ "mio 0.8.11",
  "walkdir",
  "windows-sys 0.48.0",
 ]
@@ -2905,7 +2955,7 @@ dependencies = [
  "miette",
  "mimalloc",
  "multipart-rs",
- "nix",
+ "nix 0.28.0",
  "nu-cli",
  "nu-cmd-base",
  "nu-cmd-extra",
@@ -3000,7 +3050,7 @@ name = "nu-cmd-extra"
 version = "0.97.2"
 dependencies = [
  "fancy-regex",
- "heck 0.5.0",
+ "heck",
  "itertools 0.12.1",
  "nu-ansi-term",
  "nu-cmd-base",
@@ -3094,7 +3144,7 @@ dependencies = [
  "mockito",
  "multipart-rs",
  "native-tls",
- "nix",
+ "nix 0.28.0",
  "notify-debouncer-full",
  "nu-ansi-term",
  "nu-cmd-base",
@@ -3144,7 +3194,7 @@ dependencies = [
  "tempfile",
  "terminal_size",
  "titlecase",
- "toml 0.8.12",
+ "toml 0.8.19",
  "trash",
  "umask",
  "unicode-segmentation",
@@ -3174,7 +3224,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -3285,7 +3335,7 @@ name = "nu-plugin"
 version = "0.97.2"
 dependencies = [
  "log",
- "nix",
+ "nix 0.28.0",
  "nu-engine",
  "nu-plugin-core",
  "nu-plugin-protocol",
@@ -3382,7 +3432,7 @@ dependencies = [
  "log",
  "lru",
  "miette",
- "nix",
+ "nix 0.28.0",
  "nu-derive-value",
  "nu-path",
  "nu-system",
@@ -3424,7 +3474,7 @@ dependencies = [
  "libproc",
  "log",
  "mach2",
- "nix",
+ "nix 0.28.0",
  "ntapi",
  "once_cell",
  "procfs",
@@ -3473,7 +3523,7 @@ dependencies = [
  "crossterm_winapi",
  "log",
  "lscolors",
- "nix",
+ "nix 0.28.0",
  "num-format",
  "serde",
  "strip-ansi-escapes",
@@ -3541,7 +3591,7 @@ version = "0.97.2"
 dependencies = [
  "chrono",
  "chrono-tz 0.9.0",
- "env_logger 0.11.3",
+ "env_logger 0.11.5",
  "fancy-regex",
  "indexmap",
  "log",
@@ -3595,9 +3645,9 @@ dependencies = [
 
 [[package]]
 name = "num"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3135b08af27d103b0a51f2ae0f8632117b7b185ccf931445affa8df530576a41"
+checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
 dependencies = [
  "num-bigint",
  "num-complex",
@@ -3609,20 +3659,19 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
- "autocfg",
  "num-integer",
  "num-traits",
 ]
 
 [[package]]
 name = "num-complex"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
 dependencies = [
  "num-traits",
 ]
@@ -3639,7 +3688,7 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
  "itoa",
 ]
 
@@ -3654,9 +3703,9 @@ dependencies = [
 
 [[package]]
 name = "num-iter"
-version = "0.1.44"
+version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -3665,11 +3714,10 @@ dependencies = [
 
 [[package]]
 name = "num-rational"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
 dependencies = [
- "autocfg",
  "num-bigint",
  "num-integer",
  "num-traits",
@@ -3677,24 +3725,14 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
  "libm",
 ]
 
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
 [[package]]
 name = "num_threads"
 version = "0.1.7"
@@ -3733,15 +3771,15 @@ dependencies = [
 
 [[package]]
 name = "objc-sys"
-version = "0.3.3"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da284c198fb9b7b0603f8635185e85fbd5b64ee154b1ed406d489077de2d6d60"
+checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
 
 [[package]]
 name = "objc2"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4b25e1034d0e636cd84707ccdaa9f81243d399196b8a773946dcffec0401659"
+checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
 dependencies = [
  "objc-sys",
  "objc2-encode",
@@ -3749,48 +3787,92 @@ dependencies = [
 
 [[package]]
 name = "objc2-app-kit"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb79768a710a9a1798848179edb186d1af7e8a8679f369e4b8d201dd2a034047"
+checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
 dependencies = [
+ "bitflags 2.6.0",
  "block2",
+ "libc",
  "objc2",
  "objc2-core-data",
+ "objc2-core-image",
  "objc2-foundation",
+ "objc2-quartz-core",
 ]
 
 [[package]]
 name = "objc2-core-data"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e092bc42eaf30a08844e6a076938c60751225ec81431ab89f5d1ccd9f958d6c"
+checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
 dependencies = [
+ "bitflags 2.6.0",
  "block2",
  "objc2",
  "objc2-foundation",
 ]
 
 [[package]]
-name = "objc2-encode"
-version = "4.0.1"
+name = "objc2-core-image"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88658da63e4cc2c8adb1262902cd6af51094df0488b760d6fd27194269c0950a"
+checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-foundation",
+ "objc2-metal",
+]
+
+[[package]]
+name = "objc2-encode"
+version = "4.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8"
 
 [[package]]
 name = "objc2-foundation"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfaefe14254871ea16c7d88968c0ff14ba554712a20d76421eec52f0a7fb8904"
+checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
 dependencies = [
+ "bitflags 2.6.0",
  "block2",
+ "libc",
  "objc2",
 ]
 
 [[package]]
-name = "object"
-version = "0.32.2"
+name = "objc2-metal"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-quartz-core"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-foundation",
+ "objc2-metal",
+]
+
+[[package]]
+name = "object"
+version = "0.36.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9"
 dependencies = [
  "memchr",
 ]
@@ -3824,7 +3906,7 @@ version = "0.10.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -3841,7 +3923,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -3852,9 +3934,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-src"
-version = "300.2.3+3.2.1"
+version = "300.3.1+3.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843"
+checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91"
 dependencies = [
  "cc",
 ]
@@ -3899,12 +3981,12 @@ dependencies = [
 
 [[package]]
 name = "os_pipe"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29d73ba8daf8fac13b0501d1abeddcfe21ba7401ada61a819144b6c2a4f32209"
+checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3915,9 +3997,9 @@ checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f"
 
 [[package]]
 name = "papergrid"
-version = "0.10.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2ccbe15f2b6db62f9a9871642746427e297b0ceb85f9a7f1ee5ff47d184d0c8"
+checksum = "c7419ad52a7de9b60d33e11085a0fe3df1fbd5926aa3f93d3dd53afbc9e86725"
 dependencies = [
  "ansi-str",
  "ansitok",
@@ -3928,9 +4010,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.12.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -3944,9 +4026,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.1",
+ "redox_syscall",
  "smallvec",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -3970,9 +4052,9 @@ dependencies = [
 
 [[package]]
 name = "paste"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "pathdiff"
@@ -3994,9 +4076,9 @@ checksum = "f658886ed52e196e850cfbbfddab9eaa7f6d90dd0929e264c31e5cec07e09e57"
 
 [[package]]
 name = "pest"
-version = "2.7.10"
+version = "2.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8"
+checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95"
 dependencies = [
  "memchr",
  "thiserror",
@@ -4005,9 +4087,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.7.10"
+version = "2.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459"
+checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a"
 dependencies = [
  "pest",
  "pest_generator",
@@ -4015,22 +4097,22 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.10"
+version = "2.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687"
+checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.10"
+version = "2.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd"
+checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f"
 dependencies = [
  "once_cell",
  "pest",
@@ -4039,9 +4121,9 @@ dependencies = [
 
 [[package]]
 name = "petgraph"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
  "indexmap",
@@ -4116,7 +4198,7 @@ dependencies = [
  "phf_shared 0.11.2",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -4195,9 +4277,9 @@ dependencies = [
 
 [[package]]
 name = "polars"
-version = "0.41.2"
+version = "0.41.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce49e10a756f68eb99c102c6b2a0cbc0c583a0fa7263536ad0913d94be878d2d"
+checksum = "8e3351ea4570e54cd556e6755b78fe7a2c85368d820c0307cca73c96e796a7ba"
 dependencies = [
  "getrandom",
  "polars-arrow",
@@ -4215,9 +4297,9 @@ dependencies = [
 
 [[package]]
 name = "polars-arrow"
-version = "0.41.2"
+version = "0.41.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b436f83f62e864f0d91871e26528f2c5552c7cf07c8d77547f1b8e3fde22bd27"
+checksum = "ba65fc4bcabbd64fca01fd30e759f8b2043f0963c57619e331d4b534576c0b47"
 dependencies = [
  "ahash 0.8.11",
  "atoi",
@@ -4263,9 +4345,9 @@ dependencies = [
 
 [[package]]
 name = "polars-compute"
-version = "0.41.2"
+version = "0.41.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6758f834f07e622a2f859bebb542b2b7f8879b8704dbb2b2bbab460ddcdca4b"
+checksum = "9f099516af30ac9ae4b4480f4ad02aa017d624f2f37b7a16ad4e9ba52f7e5269"
 dependencies = [
  "bytemuck",
  "either",
@@ -4279,12 +4361,12 @@ dependencies = [
 
 [[package]]
 name = "polars-core"
-version = "0.41.2"
+version = "0.41.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ed262e9bdda15a12a9bfcfc9200bec5253335633dbd86cf5b94fda0194244b3"
+checksum = "b2439484be228b8c302328e2f953e64cfd93930636e5c7ceed90339ece7fef6c"
 dependencies = [
  "ahash 0.8.11",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "bytemuck",
  "chrono",
  "chrono-tz 0.8.6",
@@ -4313,9 +4395,9 @@ dependencies = [
 
 [[package]]
 name = "polars-error"
-version = "0.41.2"
+version = "0.41.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53e1707a17475ba5e74c349154b415e3148a1a275e395965427971b5e53ad621"
+checksum = "0c9b06dfbe79cabe50a7f0a90396864b5ee2c0e0f8d6a9353b2343c29c56e937"
 dependencies = [
  "avro-schema",
  "polars-arrow-format",
@@ -4326,12 +4408,12 @@ dependencies = [
 
 [[package]]
 name = "polars-expr"
-version = "0.41.2"
+version = "0.41.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31a9688d5842e7a7fbad88e67a174778794a91d97d3bba1b3c09dd1656fee3b2"
+checksum = "d9c630385a56a867c410a20f30772d088f90ec3d004864562b84250b35268f97"
 dependencies = [
  "ahash 0.8.11",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "once_cell",
  "polars-arrow",
  "polars-core",
@@ -4346,9 +4428,9 @@ dependencies = [
 
 [[package]]
 name = "polars-io"
-version = "0.41.2"
+version = "0.41.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18798dacd94fb9263f65f63f0feab0908675422646d6f7fc37043b85ff6dca35"
+checksum = "9d7363cd14e4696a28b334a56bd11013ff49cc96064818ab3f91a126e453462d"
 dependencies = [
  "ahash 0.8.11",
  "async-trait",
@@ -4387,9 +4469,9 @@ dependencies = [
 
 [[package]]
 name = "polars-json"
-version = "0.41.2"
+version = "0.41.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "044ea319f667efbf8007c4c38171c2956e0e7f9b078eb66e31e82f80d1e14b51"
+checksum = "543d7d3853f2c52dbfedee9ebf0d58c4ff3b92aadee5309150b2d14df49d6253"
 dependencies = [
  "ahash 0.8.11",
  "chrono",
@@ -4408,12 +4490,12 @@ dependencies = [
 
 [[package]]
 name = "polars-lazy"
-version = "0.41.2"
+version = "0.41.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74a11994c2211f2e99d9ac31776fd7c2c0607d5fe62d5b5db9e396f7d663f3d5"
+checksum = "03877e74e42b5340ae52ded705f6d5d14563d90554c9177b01b91ed2412a56ed"
 dependencies = [
  "ahash 0.8.11",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "glob",
  "memchr",
  "once_cell",
@@ -4435,9 +4517,9 @@ dependencies = [
 
 [[package]]
 name = "polars-mem-engine"
-version = "0.41.2"
+version = "0.41.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5acd5fde6fadaddfcae3227ec5b64121007928f8e68870c80653438e20c1c587"
+checksum = "dea9e17771af750c94bf959885e4b3f5b14149576c62ef3ec1c9ef5827b2a30f"
 dependencies = [
  "polars-arrow",
  "polars-core",
@@ -4454,9 +4536,9 @@ dependencies = [
 
 [[package]]
 name = "polars-ops"
-version = "0.41.2"
+version = "0.41.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4170c59e974727941edfb722f6d430ed623be9e7f30581ee00832c907f1b9fd"
+checksum = "6066552eb577d43b307027fb38096910b643ffb2c89a21628c7e41caf57848d0"
 dependencies = [
  "ahash 0.8.11",
  "argminmax",
@@ -4490,9 +4572,9 @@ dependencies = [
 
 [[package]]
 name = "polars-parquet"
-version = "0.41.2"
+version = "0.41.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c684638c36c60c691d707d414249fe8af4a19a35a39d418464b140fe23732e5d"
+checksum = "2b35b2592a2e7ef7ce9942dc2120dc4576142626c0e661668e4c6b805042e461"
 dependencies = [
  "ahash 0.8.11",
  "async-stream",
@@ -4508,7 +4590,6 @@ dependencies = [
  "polars-compute",
  "polars-error",
  "polars-utils",
- "seq-macro",
  "serde",
  "simdutf8",
  "snap",
@@ -4518,9 +4599,9 @@ dependencies = [
 
 [[package]]
 name = "polars-pipe"
-version = "0.41.2"
+version = "0.41.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "832af9fbebc4c074d95fb19e1ef9e1bf37c343641238c2476febff296a7028ea"
+checksum = "021bce7768c330687d735340395a77453aa18dd70d57c184cbb302311e87c1b9"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-queue",
@@ -4544,9 +4625,9 @@ dependencies = [
 
 [[package]]
 name = "polars-plan"
-version = "0.41.2"
+version = "0.41.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "801390ea815c05c9cf8337f3148090c9c10c9595a839fa0706b77cc2405b4466"
+checksum = "220d0d7c02d1c4375802b2813dbedcd1a184df39c43b74689e729ede8d5c2921"
 dependencies = [
  "ahash 0.8.11",
  "bytemuck",
@@ -4574,9 +4655,9 @@ dependencies = [
 
 [[package]]
 name = "polars-row"
-version = "0.41.2"
+version = "0.41.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee955e91b605fc91db4d0a8ea02609d3a09ff79256d905214a2a6f758cd6f7b"
+checksum = "c1d70d87a2882a64a43b431aea1329cb9a2c4100547c95c417cc426bb82408b3"
 dependencies = [
  "bytemuck",
  "polars-arrow",
@@ -4586,9 +4667,9 @@ dependencies = [
 
 [[package]]
 name = "polars-sql"
-version = "0.41.2"
+version = "0.41.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d89c00a4b399501d5bd478e8e8022b9391047fe8570324ecba20c4e4833c0e87"
+checksum = "a6fc1c9b778862f09f4a347f768dfdd3d0ba9957499d306d83c7103e0fa8dc5b"
 dependencies = [
  "hex",
  "once_cell",
@@ -4607,9 +4688,9 @@ dependencies = [
 
 [[package]]
 name = "polars-time"
-version = "0.41.2"
+version = "0.41.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9689b3aff99d64befe300495528bdc44c36d2656c3a8b242a790d4f43df027fc"
+checksum = "179f98313a15c0bfdbc8cc0f1d3076d08d567485b9952d46439f94fbc3085df5"
 dependencies = [
  "atoi",
  "bytemuck",
@@ -4629,9 +4710,9 @@ dependencies = [
 
 [[package]]
 name = "polars-utils"
-version = "0.41.2"
+version = "0.41.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12081e346983a91e26f395597e1d53dea1b4ecd694653aee1cc402d2fae01f04"
+checksum = "53e6dd89fcccb1ec1a62f752c9a9f2d482a85e9255153f46efecc617b4996d50"
 dependencies = [
  "ahash 0.8.11",
  "bytemuck",
@@ -4659,9 +4740,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
+checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
 
 [[package]]
 name = "powerfmt"
@@ -4671,9 +4752,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
 
 [[package]]
 name = "precomputed-hash"
@@ -4683,9 +4767,9 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
 [[package]]
 name = "predicates"
-version = "3.1.0"
+version = "3.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8"
+checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97"
 dependencies = [
  "anstyle",
  "difflib",
@@ -4694,15 +4778,15 @@ dependencies = [
 
 [[package]]
 name = "predicates-core"
-version = "1.0.6"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174"
+checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931"
 
 [[package]]
 name = "predicates-tree"
-version = "1.0.9"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf"
+checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13"
 dependencies = [
  "predicates-core",
  "termtree",
@@ -4761,9 +4845,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.81"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -4774,7 +4858,7 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "chrono",
  "flate2",
  "hex",
@@ -4789,7 +4873,7 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "chrono",
  "hex",
 ]
@@ -4870,6 +4954,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "quick-xml"
+version = "0.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "quickcheck"
 version = "1.0.3"
@@ -4894,18 +4987,18 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "quoted_printable"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0"
+checksum = "640c9bd8497b02465aeef5375144c26062e0dcd5939dfcbb0f5db76cb8c17c73"
 
 [[package]]
 name = "radium"
@@ -4959,7 +5052,7 @@ version = "0.26.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f44c9e68fd46eda15c646fbb85e1040b657a58cdc8c98db1d97a55930d991eef"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cassowary",
  "compact_str",
  "crossterm",
@@ -4975,11 +5068,11 @@ dependencies = [
 
 [[package]]
 name = "raw-cpuid"
-version = "11.0.2"
+version = "11.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd"
+checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
@@ -5019,7 +5112,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76009fbe0614077fc1a2ce255e3a1881a2e3a3527097d5dc6d8212c585e7e38b"
 dependencies = [
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -5030,27 +5123,18 @@ checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175"
 
 [[package]]
 name = "redox_syscall"
-version = "0.4.1"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
 dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
-dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
 name = "redox_users"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
  "getrandom",
  "libredox",
@@ -5082,29 +5166,29 @@ dependencies = [
 
 [[package]]
 name = "ref-cast"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4846d4c50d1721b1a3bef8af76924eef20d5e723647333798c1b519b3a9473f"
+checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931"
 dependencies = [
  "ref-cast-impl",
 ]
 
 [[package]]
 name = "ref-cast-impl"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc"
+checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.4"
+version = "1.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -5114,9 +5198,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -5125,15 +5209,15 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "relative-path"
-version = "1.9.2"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc"
+checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
 
 [[package]]
 name = "rend"
@@ -5160,9 +5244,9 @@ dependencies = [
 
 [[package]]
 name = "rkyv"
-version = "0.7.44"
+version = "0.7.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0"
+checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b"
 dependencies = [
  "bitvec",
  "bytecheck",
@@ -5178,9 +5262,9 @@ dependencies = [
 
 [[package]]
 name = "rkyv_derive"
-version = "0.7.44"
+version = "0.7.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65"
+checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5254,7 +5338,7 @@ dependencies = [
  "regex",
  "relative-path",
  "rustc_version",
- "syn 2.0.60",
+ "syn 2.0.75",
  "unicode-ident",
 ]
 
@@ -5264,7 +5348,7 @@ version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "chrono",
  "fallible-iterator",
  "fallible-streaming-iterator",
@@ -5286,22 +5370,22 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-impl"
-version = "8.4.0"
+version = "8.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4"
+checksum = "6125dbc8867951125eec87294137f4e9c2c96566e61bf72c45095a7c77761478"
 dependencies = [
  "proc-macro2",
  "quote",
  "rust-embed-utils",
- "syn 2.0.60",
+ "syn 2.0.75",
  "walkdir",
 ]
 
 [[package]]
 name = "rust-embed-utils"
-version = "8.4.0"
+version = "8.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32"
+checksum = "2e5347777e9aacb56039b0e1f28785929a8a3b709e87482e7442c72e7c12529d"
 dependencies = [
  "sha2",
  "walkdir",
@@ -5309,9 +5393,9 @@ dependencies = [
 
 [[package]]
 name = "rust-ini"
-version = "0.21.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d625ed57d8f49af6cfa514c42e1a71fadcff60eb0b1c517ff82fe41aa025b41"
+checksum = "4e310ef0e1b6eeb79169a1171daf9abcb87a2e17c03bee2c4bb100b55c75409f"
 dependencies = [
  "cfg-if",
  "ordered-multimap",
@@ -5320,11 +5404,11 @@ dependencies = [
 
 [[package]]
 name = "rust_decimal"
-version = "1.35.0"
+version = "1.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a"
+checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
  "borsh",
  "bytes",
  "num-traits",
@@ -5336,9 +5420,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
@@ -5361,7 +5445,7 @@ version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -5370,15 +5454,15 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.15"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47"
+checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
 
 [[package]]
 name = "ryu"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "same-file"
@@ -5391,9 +5475,9 @@ dependencies = [
 
 [[package]]
 name = "scc"
-version = "2.1.0"
+version = "2.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec96560eea317a9cc4e0bb1f6a2c93c09a19b8c4fc5cb3fcc0ec1c094cd783e2"
+checksum = "aeb7ac86243095b70a7920639507b71d51a63390d1ba26c4f60a552fbb914a37"
 dependencies = [
  "sdd",
 ]
@@ -5451,14 +5535,14 @@ checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
 ]
 
 [[package]]
 name = "sdd"
-version = "0.2.0"
+version = "3.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b84345e4c9bd703274a082fb80caaa99b7612be48dfaa1dd9266577ec412309d"
+checksum = "0495e4577c672de8254beb68d01a9b62d0e8a13c099edecdbedccce3223cd29f"
 
 [[package]]
 name = "seahash"
@@ -5468,11 +5552,11 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
 
 [[package]]
 name = "security-framework"
-version = "2.10.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -5481,9 +5565,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.10.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef"
+checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -5495,7 +5579,7 @@ version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cssparser",
  "derive_more",
  "fxhash",
@@ -5510,44 +5594,39 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
-
-[[package]]
-name = "seq-macro"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.200"
+version = "1.0.208"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f"
+checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.200"
+version = "1.0.208"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb"
+checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.116"
+version = "1.0.127"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
+checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
 dependencies = [
  "indexmap",
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
@@ -5560,14 +5639,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
 dependencies = [
  "serde",
 ]
@@ -5619,7 +5698,7 @@ checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -5677,12 +5756,12 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-mio"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
+checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
 dependencies = [
  "libc",
- "mio",
+ "mio 0.8.11",
  "signal-hook",
 ]
 
@@ -5802,12 +5881,12 @@ dependencies = [
 
 [[package]]
 name = "stability"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ff9eaf853dec4c8802325d8b6d3dffa86cc707fd7a1a4cdbf416e13b061787a"
+checksum = "d904e7009df136af5297832a3ace3370cd14ff1546a232f4f185036c2736fcac"
 dependencies = [
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -5818,15 +5897,15 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
 name = "stacker"
-version = "0.1.15"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce"
+checksum = "95a5daa25ea337c85ed954c0496e3bdd2c7308cc3b24cf7b50d04876654c579f"
 dependencies = [
  "cc",
  "cfg-if",
  "libc",
  "psm",
- "winapi",
+ "windows-sys 0.36.1",
 ]
 
 [[package]]
@@ -5905,24 +5984,24 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "strum"
-version = "0.26.2"
+version = "0.26.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29"
+checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
 dependencies = [
  "strum_macros",
 ]
 
 [[package]]
 name = "strum_macros"
-version = "0.26.2"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
 dependencies = [
- "heck 0.4.1",
+ "heck",
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.60",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -5990,9 +6069,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.60"
+version = "2.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
+checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6008,7 +6087,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -6037,14 +6116,13 @@ dependencies = [
 
 [[package]]
 name = "tabled"
-version = "0.14.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfe9c3632da101aba5131ed63f9eed38665f8b3c68703a6bb18124835c1a5d22"
+checksum = "77c9303ee60b9bedf722012ea29ae3711ba13a67c9b9ae28993838b63057cb1b"
 dependencies = [
  "ansi-str",
  "ansitok",
  "papergrid",
- "unicode-width",
 ]
 
 [[package]]
@@ -6082,14 +6160,15 @@ checksum = "c1bbb9f3c5c463a01705937a24fdabc5047929ac764b2d5b9cf681c1f5041ed5"
 
 [[package]]
 name = "tempfile"
-version = "3.10.1"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
 dependencies = [
  "cfg-if",
  "fastrand",
+ "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -6141,22 +6220,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.59"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.59"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -6213,9 +6292,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.6.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -6239,33 +6318,31 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.37.0"
+version = "1.39.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
- "mio",
- "num_cpus",
+ "mio 1.0.2",
  "parking_lot",
  "pin-project-lite",
  "socket2",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "tokio-util"
-version = "0.7.10"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
+checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
 dependencies = [
  "bytes",
  "futures-core",
  "futures-sink",
  "pin-project-lite",
  "tokio",
- "tracing",
 ]
 
 [[package]]
@@ -6282,22 +6359,22 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.12"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
 dependencies = [
  "indexmap",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.12",
+ "toml_edit 0.22.20",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 dependencies = [
  "serde",
 ]
@@ -6328,15 +6405,15 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.12"
+version = "0.22.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef"
+checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
 dependencies = [
  "indexmap",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.7",
+ "winnow 0.6.18",
 ]
 
 [[package]]
@@ -6376,9 +6453,9 @@ dependencies = [
 
 [[package]]
 name = "tree_magic_mini"
-version = "3.1.4"
+version = "3.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ee137597cdb361b55a4746983e4ac1b35ab6024396a419944ad473bb915265"
+checksum = "469a727cac55b41448315cc10427c069c618ac59bb6a4480283fcd811749bdc2"
 dependencies = [
  "fnv",
  "home",
@@ -6400,6 +6477,12 @@ version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a9b2228007eba4120145f785df0f6c92ea538f5a3635a612ecf4e334c8c1446d"
 
+[[package]]
+name = "typeid"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e"
+
 [[package]]
 name = "typenum"
 version = "1.17.0"
@@ -6408,9 +6491,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "typetag"
-version = "0.2.16"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "661d18414ec032a49ece2d56eee03636e43c4e8d577047ab334c0ba892e29aaf"
+checksum = "52ba3b6e86ffe0054b2c44f2d86407388b933b16cb0a70eea3929420db1d9bbe"
 dependencies = [
  "erased-serde",
  "inventory",
@@ -6421,13 +6504,13 @@ dependencies = [
 
 [[package]]
 name = "typetag-impl"
-version = "0.2.16"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac73887f47b9312552aa90ef477927ff014d63d1920ca8037c6c1951eab64bb1"
+checksum = "70b20a22c42c8f1cd23ce5e34f165d4d37038f5b663ad20fb6adbdf029172483"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -6498,25 +6581,26 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
 [[package]]
 name = "unicode-truncate"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5fbabedabe362c618c714dbefda9927b5afc8e2a8102f47f081089a9019226"
+checksum = "b3644627a5af5fa321c95b9b235a72fd24cd29c648c2c379431e6628655627bf"
 dependencies = [
- "itertools 0.12.1",
+ "itertools 0.13.0",
+ "unicode-segmentation",
  "unicode-width",
 ]
 
 [[package]]
 name = "unicode-width"
-version = "0.1.12"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
 
 [[package]]
 name = "unsafe-libyaml"
@@ -6526,9 +6610,9 @@ checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
 
 [[package]]
 name = "ureq"
-version = "2.10.0"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea"
+checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a"
 dependencies = [
  "base64 0.22.1",
  "encoding_rs",
@@ -6543,9 +6627,9 @@ dependencies = [
 
 [[package]]
 name = "url"
-version = "2.5.0"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -6567,9 +6651,9 @@ checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3"
 
 [[package]]
 name = "utf8parse"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uu_cp"
@@ -6654,7 +6738,7 @@ dependencies = [
  "dunce",
  "glob",
  "libc",
- "nix",
+ "nix 0.28.0",
  "number_prefix",
  "once_cell",
  "os_display",
@@ -6668,9 +6752,9 @@ dependencies = [
 
 [[package]]
 name = "uucore_procs"
-version = "0.0.26"
+version = "0.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a233a488da42f3ddb0aaa8a9f75a969e3f37e4de7e909d2d23f6aa3ee401d20"
+checksum = "c3d588f57acb2ba416e072a6fa652f2e11cf727267c697d2e2d65175f3b10c41"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6679,9 +6763,9 @@ dependencies = [
 
 [[package]]
 name = "uuhelp_parser"
-version = "0.0.26"
+version = "0.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "425a23c7b7145bc7620c9c445817c37b1f78b6790aee9f208133f3c028975b60"
+checksum = "96f26868814bf1ca9deec910a08007c93eb1d8e407ce36451999d4c1c1ea6767"
 
 [[package]]
 name = "uuid"
@@ -6719,9 +6803,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "vte"
@@ -6746,9 +6830,9 @@ dependencies = [
 
 [[package]]
 name = "vte_generate_state_changes"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff"
+checksum = "2e369bee1b05d510a7b4ed645f5faa90619e05437111783ea5848f28d97d3c2e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6781,34 +6865,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
 dependencies = [
  "cfg-if",
+ "once_cell",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6816,22 +6901,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
 
 [[package]]
 name = "wax"
@@ -6850,9 +6935,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-backend"
-version = "0.3.3"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40"
+checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993"
 dependencies = [
  "cc",
  "downcast-rs",
@@ -6864,11 +6949,11 @@ dependencies = [
 
 [[package]]
 name = "wayland-client"
-version = "0.31.2"
+version = "0.31.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f"
+checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "rustix",
  "wayland-backend",
  "wayland-scanner",
@@ -6880,7 +6965,7 @@ version = "0.31.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "wayland-backend",
  "wayland-client",
  "wayland-scanner",
@@ -6892,7 +6977,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -6901,20 +6986,20 @@ dependencies = [
 
 [[package]]
 name = "wayland-scanner"
-version = "0.31.1"
+version = "0.31.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283"
+checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6"
 dependencies = [
  "proc-macro2",
- "quick-xml 0.31.0",
+ "quick-xml 0.34.0",
  "quote",
 ]
 
 [[package]]
 name = "wayland-sys"
-version = "0.31.1"
+version = "0.31.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af"
+checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148"
 dependencies = [
  "dlib",
  "log",
@@ -6937,9 +7022,9 @@ dependencies = [
 
 [[package]]
 name = "which"
-version = "6.0.1"
+version = "6.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8211e4f58a2b2805adfbefbc07bab82958fc91e3836339b1ab7ae32465dce0d7"
+checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f"
 dependencies = [
  "either",
  "home",
@@ -6980,11 +7065,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -7009,7 +7094,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
 dependencies = [
  "windows-core 0.52.0",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -7019,7 +7104,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
 dependencies = [
  "windows-core 0.54.0",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -7028,7 +7113,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -7038,16 +7123,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
 dependencies = [
  "windows-result",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-result"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b"
+checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+dependencies = [
+ "windows_aarch64_msvc 0.36.1",
+ "windows_i686_gnu 0.36.1",
+ "windows_i686_msvc 0.36.1",
+ "windows_x86_64_gnu 0.36.1",
+ "windows_x86_64_msvc 0.36.1",
 ]
 
 [[package]]
@@ -7065,7 +7163,16 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -7100,18 +7207,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
  "windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
 ]
 
 [[package]]
@@ -7128,9 +7235,15 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -7146,9 +7259,15 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -7164,15 +7283,21 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -7188,9 +7313,15 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -7206,9 +7337,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -7224,9 +7355,15 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -7242,9 +7379,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
@@ -7257,9 +7394,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.6.7"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578"
+checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
 dependencies = [
  "memchr",
 ]
@@ -7299,7 +7436,7 @@ dependencies = [
  "derive-new",
  "libc",
  "log",
- "nix",
+ "nix 0.28.0",
  "os_pipe",
  "tempfile",
  "thiserror",
@@ -7360,9 +7497,9 @@ dependencies = [
 
 [[package]]
 name = "xxhash-rust"
-version = "0.8.10"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03"
+checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984"
 
 [[package]]
 name = "yansi"
@@ -7372,22 +7509,23 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.32"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
+ "byteorder",
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.32"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -7404,27 +7542,27 @@ dependencies = [
 
 [[package]]
 name = "zstd"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a"
+checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9"
 dependencies = [
  "zstd-safe",
 ]
 
 [[package]]
 name = "zstd-safe"
-version = "7.1.0"
+version = "7.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a"
+checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059"
 dependencies = [
  "zstd-sys",
 ]
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.10+zstd.1.5.6"
+version = "2.0.13+zstd.1.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa"
+checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
 dependencies = [
  "cc",
  "pkg-config",
diff --git a/Cargo.toml b/Cargo.toml
index 074cd764d6..b5a209c4cb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -156,7 +156,7 @@ sha2 = "0.10"
 strip-ansi-escapes = "0.2.0"
 syn = "2.0"
 sysinfo = "0.30"
-tabled = { version = "0.14.0", default-features = false }
+tabled = { version = "0.16.0", default-features = false }
 tempfile = "3.10"
 terminal_size = "0.3"
 titlecase = "2.0"
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 20e5d607ea..23e3c31166 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -83,7 +83,7 @@ serde_urlencoded = { workspace = true }
 serde_yaml = { workspace = true }
 sha2 = { workspace = true }
 sysinfo = { workspace = true }
-tabled = { workspace = true, features = ["color"], default-features = false }
+tabled = { workspace = true, features = ["ansi"], default-features = false }
 terminal_size = { workspace = true }
 titlecase = { workspace = true }
 toml = { workspace = true, features = ["preserve_order"] }
diff --git a/crates/nu-command/src/debug/inspect_table.rs b/crates/nu-command/src/debug/inspect_table.rs
index c7d5a87d9e..e30a8bedcf 100644
--- a/crates/nu-command/src/debug/inspect_table.rs
+++ b/crates/nu-command/src/debug/inspect_table.rs
@@ -57,7 +57,7 @@ pub fn build_table(value: Value, description: String, termsize: usize) -> String
         Settings::default()
             .with(Style::rounded().corner_top_left('├').corner_top_right('┤'))
             .with(SetWidths(widths))
-            .with(Wrap::new(width).priority::<PriorityMax>())
+            .with(Wrap::new(width).priority(PriorityMax))
             .with(SetHorizontalChar::new('┼', '┴', 11 + 2 + 1)),
     );
 
@@ -308,7 +308,7 @@ mod global_horizontal_char {
         }
     }
 
-    impl<R: Records + ExactRecords> TableOption<R, CompleteDimensionVecRecords<'_>, ColoredConfig>
+    impl<R: Records + ExactRecords> TableOption<R, ColoredConfig, CompleteDimensionVecRecords<'_>>
         for SetHorizontalChar
     {
         fn change(
@@ -377,7 +377,7 @@ mod set_widths {
 
     pub struct SetWidths(pub Vec<usize>);
 
-    impl<R> TableOption<R, CompleteDimensionVecRecords<'_>, ColoredConfig> for SetWidths {
+    impl<R> TableOption<R, ColoredConfig, CompleteDimensionVecRecords<'_>> for SetWidths {
         fn change(
             self,
             _: &mut R,
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index 7ed9de41e1..21f2e04151 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -18,7 +18,7 @@ nu-color-config = { path = "../nu-color-config", version = "0.97.2" }
 nu-ansi-term = { workspace = true }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
-tabled = { workspace = true, features = ["color"], default-features = false }
+tabled = { workspace = true, features = ["ansi"], default-features = false }
 
 [dev-dependencies]
 # nu-test-support = { path="../nu-test-support", version = "0.97.2"  }
\ No newline at end of file
diff --git a/crates/nu-table/examples/table_demo.rs b/crates/nu-table/examples/table_demo.rs
index c36f5d78dc..402936e8c0 100644
--- a/crates/nu-table/examples/table_demo.rs
+++ b/crates/nu-table/examples/table_demo.rs
@@ -1,7 +1,7 @@
 use nu_ansi_term::{Color, Style};
 use nu_color_config::TextStyle;
 use nu_table::{NuTable, NuTableConfig, TableTheme};
-use tabled::grid::records::vec_records::CellInfo;
+use tabled::grid::records::vec_records::Text;
 
 fn main() {
     let args: Vec<_> = std::env::args().collect();
@@ -80,10 +80,10 @@ fn make_table_data() -> (Vec<&'static str>, Vec<&'static str>) {
     (table_headers, row_data)
 }
 
-fn to_cell_info_vec(data: &[&str]) -> Vec<CellInfo<String>> {
+fn to_cell_info_vec(data: &[&str]) -> Vec<Text<String>> {
     let mut v = vec![];
     for x in data {
-        v.push(CellInfo::new(String::from(*x)));
+        v.push(Text::new(String::from(*x)));
     }
 
     v
diff --git a/crates/nu-table/src/table.rs b/crates/nu-table/src/table.rs
index 040954b7e8..7584c1bc5b 100644
--- a/crates/nu-table/src/table.rs
+++ b/crates/nu-table/src/table.rs
@@ -7,12 +7,12 @@ use std::{cmp::min, collections::HashMap};
 use tabled::{
     builder::Builder,
     grid::{
-        color::AnsiColor,
+        ansi::ANSIBuf,
         colors::Colors,
         config::{AlignmentHorizontal, ColoredConfig, Entity, EntityMap, Position},
         dimension::CompleteDimensionVecRecords,
         records::{
-            vec_records::{Cell, CellInfo, VecRecords},
+            vec_records::{Cell, Text, VecRecords},
             ExactRecords, PeekableRecords, Records, Resizable,
         },
     },
@@ -22,7 +22,7 @@ use tabled::{
         peaker::Peaker,
         themes::ColumnNames,
         width::Truncate,
-        Color, Modify, Padding, Settings, TableOption, Width,
+        Alignment, Color, Modify, Padding, Settings, TableOption, Width,
     },
     Table,
 };
@@ -37,13 +37,13 @@ pub struct NuTable {
 }
 
 pub type NuRecords = VecRecords<NuTableCell>;
-pub type NuTableCell = CellInfo<String>;
+pub type NuTableCell = Text<String>;
 
 #[derive(Debug, Default, Clone)]
 struct Styles {
-    index: AnsiColor<'static>,
-    header: AnsiColor<'static>,
-    data: EntityMap<AnsiColor<'static>>,
+    index: ANSIBuf,
+    header: ANSIBuf,
+    data: EntityMap<ANSIBuf>,
     data_is_set: bool,
 }
 
@@ -60,7 +60,7 @@ impl NuTable {
     /// Creates an empty [`NuTable`] instance.
     pub fn new(count_rows: usize, count_columns: usize) -> Self {
         Self {
-            data: VecRecords::new(vec![vec![CellInfo::default(); count_columns]; count_rows]),
+            data: VecRecords::new(vec![vec![Text::default(); count_columns]; count_rows]),
             styles: Styles::default(),
             indent: (1, 1),
             alignments: Alignments {
@@ -84,12 +84,12 @@ impl NuTable {
     }
 
     pub fn insert(&mut self, pos: Position, text: String) {
-        self.data[pos.0][pos.1] = CellInfo::new(text);
+        self.data[pos.0][pos.1] = Text::new(text);
     }
 
     pub fn set_column_style(&mut self, column: usize, style: TextStyle) {
         if let Some(style) = style.color_style {
-            let style = AnsiColor::from(convert_style(style));
+            let style = ANSIBuf::from(convert_style(style));
             self.styles.data.insert(Entity::Column(column), style);
             self.styles.data_is_set = true;
         }
@@ -102,7 +102,7 @@ impl NuTable {
 
     pub fn insert_style(&mut self, pos: Position, style: TextStyle) {
         if let Some(style) = style.color_style {
-            let style = AnsiColor::from(convert_style(style));
+            let style = ANSIBuf::from(convert_style(style));
             self.styles.data.insert(Entity::Cell(pos.0, pos.1), style);
             self.styles.data_is_set = true;
         }
@@ -115,7 +115,7 @@ impl NuTable {
 
     pub fn set_header_style(&mut self, style: TextStyle) {
         if let Some(style) = style.color_style {
-            let style = AnsiColor::from(convert_style(style));
+            let style = ANSIBuf::from(convert_style(style));
             self.styles.header = style;
         }
 
@@ -124,7 +124,7 @@ impl NuTable {
 
     pub fn set_index_style(&mut self, style: TextStyle) {
         if let Some(style) = style.color_style {
-            let style = AnsiColor::from(convert_style(style));
+            let style = ANSIBuf::from(convert_style(style));
             self.styles.index = style;
         }
 
@@ -133,7 +133,7 @@ impl NuTable {
 
     pub fn set_data_style(&mut self, style: TextStyle) {
         if let Some(style) = style.color_style {
-            let style = AnsiColor::from(convert_style(style));
+            let style = ANSIBuf::from(convert_style(style));
             self.styles.data.insert(Entity::Global, style);
             self.styles.data_is_set = true;
         }
@@ -171,8 +171,8 @@ impl NuTable {
     }
 }
 
-impl From<Vec<Vec<CellInfo<String>>>> for NuTable {
-    fn from(value: Vec<Vec<CellInfo<String>>>) -> Self {
+impl From<Vec<Vec<Text<String>>>> for NuTable {
+    fn from(value: Vec<Vec<Text<String>>>) -> Self {
         let mut nutable = Self::new(0, 0);
         nutable.data = VecRecords::new(value);
 
@@ -352,7 +352,7 @@ impl TableWidthCtrl {
     }
 }
 
-impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for TableWidthCtrl {
+impl TableOption<NuRecords, ColoredConfig, CompleteDimensionVecRecords<'_>> for TableWidthCtrl {
     fn change(
         self,
         rec: &mut NuRecords,
@@ -374,8 +374,8 @@ impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for
             )
             .change(rec, cfg, dim);
         } else if self.cfg.expand && self.width_max > total_width {
-            Settings::new(SetDimensions(self.width), Width::increase(self.width_max))
-                .change(rec, cfg, dim)
+            let opt = (SetDimensions(self.width), Width::increase(self.width_max));
+            TableOption::<VecRecords<_>, _, _>::change(opt, rec, cfg, dim)
         } else {
             SetDimensions(self.width).change(rec, cfg, dim);
         }
@@ -408,7 +408,7 @@ impl TableTrim {
     }
 }
 
-impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for TableTrim {
+impl TableOption<NuRecords, ColoredConfig, CompleteDimensionVecRecords<'_>> for TableTrim {
     fn change(
         self,
         recs: &mut NuRecords,
@@ -424,27 +424,28 @@ impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for
 
         match self.strategy {
             TrimStrategy::Wrap { try_to_keep_words } => {
-                let mut wrap = Width::wrap(self.width_max).priority::<PriorityMax>();
-                if try_to_keep_words {
-                    wrap = wrap.keep_words();
-                }
+                let wrap = Width::wrap(self.width_max)
+                    .keep_words(try_to_keep_words)
+                    .priority(PriorityMax);
 
-                Settings::new(SetDimensions(self.width), wrap).change(recs, cfg, dims);
+                let opt = (SetDimensions(self.width), wrap);
+                TableOption::<NuRecords, _, _>::change(opt, recs, cfg, dims);
             }
             TrimStrategy::Truncate { suffix } => {
-                let mut truncate = Width::truncate(self.width_max).priority::<PriorityMax>();
+                let mut truncate = Width::truncate(self.width_max).priority(PriorityMax);
                 if let Some(suffix) = suffix {
                     truncate = truncate.suffix(suffix).suffix_try_color(true);
                 }
 
-                Settings::new(SetDimensions(self.width), truncate).change(recs, cfg, dims);
+                let opt = (SetDimensions(self.width), truncate);
+                TableOption::<NuRecords, _, _>::change(opt, recs, cfg, dims);
             }
         }
     }
 }
 
 fn trim_as_header(
-    recs: &mut VecRecords<CellInfo<String>>,
+    recs: &mut VecRecords<Text<String>>,
     cfg: &mut ColoredConfig,
     dims: &mut CompleteDimensionVecRecords,
     trim: TableTrim,
@@ -456,7 +457,7 @@ fn trim_as_header(
     let headers = recs[0].to_owned();
     let headers_widths = headers
         .iter()
-        .map(CellInfo::width)
+        .map(Text::width)
         .map(|v| v + trim.pad)
         .collect::<Vec<_>>();
     let min_width_use = get_total_width2(&headers_widths, cfg);
@@ -481,14 +482,10 @@ fn trim_as_header(
 
         match &trim.strategy {
             TrimStrategy::Wrap { try_to_keep_words } => {
-                let mut wrap = Width::wrap(use_width);
-                if *try_to_keep_words {
-                    wrap = wrap.keep_words();
-                }
+                let wrap = Width::wrap(use_width).keep_words(*try_to_keep_words);
 
-                Modify::new(Columns::single(i))
-                    .with(wrap)
-                    .change(recs, cfg, dims);
+                let opt = Modify::new(Columns::single(i)).with(wrap);
+                TableOption::<VecRecords<Text<String>>, _, _>::change(opt, recs, cfg, dims);
             }
             TrimStrategy::Truncate { suffix } => {
                 let mut truncate = Width::truncate(use_width);
@@ -496,9 +493,8 @@ fn trim_as_header(
                     truncate = truncate.suffix(suffix).suffix_try_color(true);
                 }
 
-                Modify::new(Columns::single(i))
-                    .with(truncate)
-                    .change(recs, cfg, dims);
+                let opt = Modify::new(Columns::single(i)).with(truncate);
+                TableOption::<VecRecords<Text<String>>, _, _>::change(opt, recs, cfg, dims);
             }
         }
     }
@@ -579,19 +575,21 @@ fn load_theme(
     let mut theme = theme.get_theme();
 
     if !with_header {
-        theme.set_horizontals(std::collections::HashMap::new());
-    } else if with_footer && table.count_rows() > 2 {
-        if let Some(line) = theme.get_horizontal(1) {
-            theme.insert_horizontal(table.count_rows() - 1, line);
-        }
+        theme.set_horizontal_lines(Default::default());
     }
 
     table.with(theme);
 
     if let Some(style) = sep_color {
         let color = convert_style(style);
-        let color = AnsiColor::from(color);
-        table.get_config_mut().set_border_color_global(color);
+        let color = ANSIBuf::from(color);
+        table.get_config_mut().set_border_color_default(color);
+    }
+
+    if !with_header {
+        table.with(RemoveHorizontalLine);
+    } else if with_footer {
+        table.with(CopyFirstHorizontalLineAtLast);
     }
 }
 
@@ -853,10 +851,6 @@ fn truncate_columns_by_head(
 pub struct PriorityMax;
 
 impl Peaker for PriorityMax {
-    fn create() -> Self {
-        Self
-    }
-
     fn peak(&mut self, _: &[usize], widths: &[usize]) -> Option<usize> {
         let col = (0..widths.len()).rev().max_by_key(|&i| widths[i]);
         col.filter(|&col| widths[col] != 0)
@@ -881,7 +875,7 @@ fn push_empty_column(data: &mut NuRecords) {
     let records = std::mem::take(data);
     let mut inner: Vec<Vec<_>> = records.into();
 
-    let empty_cell = CellInfo::new(String::from("..."));
+    let empty_cell = Text::new(String::from("..."));
     for row in &mut inner {
         row.push(empty_cell.clone());
     }
@@ -920,7 +914,7 @@ fn convert_alignment(alignment: nu_color_config::Alignment) -> AlignmentHorizont
 
 struct SetAlignment(AlignmentHorizontal, Entity);
 
-impl<R, D> TableOption<R, D, ColoredConfig> for SetAlignment {
+impl<R, D> TableOption<R, ColoredConfig, D> for SetAlignment {
     fn change(self, _: &mut R, cfg: &mut ColoredConfig, _: &mut D) {
         cfg.set_alignment_horizontal(self.1, self.0);
     }
@@ -928,7 +922,7 @@ impl<R, D> TableOption<R, D, ColoredConfig> for SetAlignment {
 
 struct SetDimensions(Vec<usize>);
 
-impl<R> TableOption<R, CompleteDimensionVecRecords<'_>, ColoredConfig> for SetDimensions {
+impl<R> TableOption<R, ColoredConfig, CompleteDimensionVecRecords<'_>> for SetDimensions {
     fn change(self, _: &mut R, _: &mut ColoredConfig, dims: &mut CompleteDimensionVecRecords<'_>) {
         dims.set_widths(self.0);
     }
@@ -951,7 +945,7 @@ fn build_width(records: &NuRecords, pad: usize) -> Vec<usize> {
 
 struct GetRow(usize, Vec<String>);
 
-impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for &mut GetRow {
+impl TableOption<NuRecords, ColoredConfig, CompleteDimensionVecRecords<'_>> for &mut GetRow {
     fn change(
         self,
         recs: &mut NuRecords,
@@ -965,7 +959,7 @@ impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for
 
 struct GetRowSettings(usize, AlignmentHorizontal, Option<Color>);
 
-impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig>
+impl TableOption<NuRecords, ColoredConfig, CompleteDimensionVecRecords<'_>>
     for &mut GetRowSettings
 {
     fn change(
@@ -1007,7 +1001,7 @@ impl SetLineHeaders {
     }
 }
 
-impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for SetLineHeaders {
+impl TableOption<NuRecords, ColoredConfig, CompleteDimensionVecRecords<'_>> for SetLineHeaders {
     fn change(
         self,
         recs: &mut NuRecords,
@@ -1020,7 +1014,7 @@ impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for
                 columns = columns
                     .into_iter()
                     .zip(widths.iter().map(|w| w.checked_sub(2).unwrap_or(*w))) // exclude padding; which is generally 2
-                    .map(|(s, width)| Truncate::truncate_text(&s, width).into_owned())
+                    .map(|(s, width)| Truncate::truncate(&s, width).into_owned())
                     .collect();
             }
             None => {
@@ -1065,7 +1059,7 @@ impl MoveRowPrev {
     }
 }
 
-impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for MoveRowNext {
+impl TableOption<NuRecords, ColoredConfig, CompleteDimensionVecRecords<'_>> for MoveRowNext {
     fn change(
         self,
         recs: &mut NuRecords,
@@ -1076,7 +1070,7 @@ impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for
     }
 }
 
-impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for MoveRowPrev {
+impl TableOption<NuRecords, ColoredConfig, CompleteDimensionVecRecords<'_>> for MoveRowPrev {
     fn change(
         self,
         recs: &mut NuRecords,
@@ -1193,9 +1187,11 @@ fn set_column_names(
     align: AlignmentHorizontal,
     color: Option<Color>,
 ) {
-    let mut names = ColumnNames::new(head).set_line(line).set_alignment(align);
+    let mut names = ColumnNames::new(head)
+        .line(line)
+        .alignment(Alignment::from(align));
     if let Some(color) = color {
-        names = names.set_color(color);
+        names = names.color(color);
     }
 
     ColumnNames::change(names, records, cfg, dims)
@@ -1214,7 +1210,7 @@ fn remove_row(recs: &mut NuRecords, row: usize) -> Vec<String> {
 
 struct StripColorFromRow(usize);
 
-impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for StripColorFromRow {
+impl TableOption<NuRecords, ColoredConfig, CompleteDimensionVecRecords<'_>> for StripColorFromRow {
     fn change(
         self,
         recs: &mut NuRecords,
@@ -1222,7 +1218,32 @@ impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for
         _: &mut CompleteDimensionVecRecords<'_>,
     ) {
         for cell in &mut recs[self.0] {
-            *cell = CellInfo::new(strip_ansi_unlikely(cell.as_ref()).into_owned());
+            *cell = Text::new(strip_ansi_unlikely(cell.as_ref()).into_owned());
         }
     }
 }
+
+struct RemoveHorizontalLine;
+
+impl<D> TableOption<NuRecords, ColoredConfig, D> for RemoveHorizontalLine {
+    fn change(self, recs: &mut NuRecords, cfg: &mut ColoredConfig, _: &mut D) {
+        cfg.remove_horizontal_line(1, recs.count_rows());
+    }
+}
+
+struct CopyFirstHorizontalLineAtLast;
+
+impl<D> TableOption<NuRecords, ColoredConfig, D> for CopyFirstHorizontalLineAtLast {
+    fn change(self, recs: &mut NuRecords, cfg: &mut ColoredConfig, _: &mut D) {
+        if recs.count_rows() <= 2 {
+            return;
+        }
+
+        let line = match cfg.get_horizontal_line(1) {
+            Some(line) => *line,
+            None => return,
+        };
+
+        cfg.insert_horizontal_line(recs.count_rows() - 1, line);
+    }
+}
diff --git a/crates/nu-table/src/table_theme.rs b/crates/nu-table/src/table_theme.rs
index 4ae5a9e62a..76bf6c71de 100644
--- a/crates/nu-table/src/table_theme.rs
+++ b/crates/nu-table/src/table_theme.rs
@@ -1,107 +1,78 @@
-use tabled::settings::style::{HorizontalLine, Line, RawStyle, Style};
+use tabled::settings::style::{HorizontalLine, Style};
+use tabled::settings::themes::Theme;
 
 #[derive(Debug, Clone)]
 pub struct TableTheme {
-    theme: RawStyle,
-    full_theme: RawStyle,
+    theme: Theme,
+    full_theme: Theme,
     has_inner: bool,
 }
 
 impl TableTheme {
-    pub fn basic() -> TableTheme {
+    pub fn new(theme: impl Into<Theme>, full_theme: impl Into<Theme>, has_inner: bool) -> Self {
         Self {
-            theme: Style::ascii().into(),
-            full_theme: Style::ascii().into(),
-            has_inner: true,
+            theme: theme.into(),
+            full_theme: full_theme.into(),
+            has_inner,
         }
     }
 
+    pub fn basic() -> TableTheme {
+        Self::new(Style::ascii(), Style::ascii(), true)
+    }
+
     pub fn thin() -> TableTheme {
-        Self {
-            theme: Style::modern().into(),
-            full_theme: Style::modern().into(),
-            has_inner: true,
-        }
+        Self::new(Style::modern(), Style::modern(), true)
     }
 
     pub fn light() -> TableTheme {
-        let theme = Style::blank()
-            .horizontals([HorizontalLine::new(
-                1,
-                Line::new(Some('─'), Some('─'), None, None),
-            )])
-            .into();
-        Self {
-            theme,
-            full_theme: Style::modern().into(),
-            has_inner: true,
-        }
+        let mut theme = Theme::from_style(Style::blank());
+        theme.insert_horizontal_line(1, HorizontalLine::new('─').intersection('─'));
+
+        Self::new(theme, Style::modern(), true)
     }
 
     pub fn psql() -> TableTheme {
-        Self {
-            theme: Style::psql().into(),
-            full_theme: Style::psql().into(),
-            has_inner: true,
-        }
+        Self::new(Style::psql(), Style::psql(), true)
     }
 
     pub fn markdown() -> TableTheme {
-        Self {
-            theme: Style::markdown().into(),
-            full_theme: Style::markdown().into(),
-            has_inner: true,
-        }
+        Self::new(Style::markdown(), Style::markdown(), true)
     }
 
     pub fn dots() -> TableTheme {
-        let theme = Style::dots().remove_horizontal().into();
-        Self {
-            theme,
-            full_theme: Style::dots().into(),
-            has_inner: true,
-        }
+        let theme = Style::dots().remove_horizontal();
+
+        Self::new(theme, Style::dots(), true)
     }
 
     pub fn restructured() -> TableTheme {
-        Self {
-            theme: Style::re_structured_text().into(),
-            full_theme: Style::re_structured_text().into(),
-            has_inner: true,
-        }
+        Self::new(
+            Style::re_structured_text(),
+            Style::re_structured_text(),
+            true,
+        )
     }
 
     pub fn ascii_rounded() -> TableTheme {
-        Self {
-            theme: Style::ascii_rounded().into(),
-            full_theme: Style::ascii_rounded().into(),
-            has_inner: true,
-        }
+        Self::new(Style::ascii_rounded(), Style::ascii_rounded(), true)
     }
 
     pub fn basic_compact() -> TableTheme {
-        let theme = Style::ascii().remove_horizontal().into();
-        Self {
-            theme,
-            full_theme: Style::ascii().into(),
-            has_inner: true,
-        }
+        let theme = Style::ascii().remove_horizontal();
+
+        Self::new(theme, Style::ascii(), true)
     }
 
     pub fn compact() -> TableTheme {
+        let hline = HorizontalLine::inherit(Style::modern().remove_left().remove_right());
         let theme = Style::modern()
             .remove_left()
             .remove_right()
             .remove_horizontal()
-            .horizontals([HorizontalLine::new(1, Style::modern().get_horizontal())
-                .left(None)
-                .right(None)])
-            .into();
-        Self {
-            theme,
-            full_theme: Style::modern().into(),
-            has_inner: true,
-        }
+            .horizontals([(1, hline)]);
+
+        Self::new(theme, Style::modern(), true)
     }
 
     pub fn with_love() -> TableTheme {
@@ -109,10 +80,7 @@ impl TableTheme {
             .top('❤')
             .bottom('❤')
             .vertical('❤')
-            .horizontals([HorizontalLine::new(
-                1,
-                Line::new(Some('❤'), Some('❤'), None, None),
-            )]);
+            .horizontals([(1, HorizontalLine::new('❤').intersection('❤'))]);
 
         let full_theme = Style::empty()
             .top('❤')
@@ -131,53 +99,40 @@ impl TableTheme {
             .intersection_left('❤')
             .intersection('❤');
 
-        Self {
-            theme: theme.into(),
-            full_theme: full_theme.into(),
-            has_inner: true,
-        }
+        Self::new(theme, full_theme, true)
     }
 
     pub fn compact_double() -> TableTheme {
+        let hline = HorizontalLine::inherit(Style::extended())
+            .remove_left()
+            .remove_right();
         let theme = Style::extended()
             .remove_left()
             .remove_right()
             .remove_horizontal()
-            .horizontals([HorizontalLine::new(1, Style::extended().get_horizontal())
-                .left(None)
-                .right(None)])
-            .into();
-        Self {
-            theme,
-            full_theme: Style::extended().into(),
-            has_inner: true,
-        }
+            .horizontals([(1, hline)]);
+
+        Self::new(theme, Style::extended(), true)
     }
 
     pub fn rounded() -> TableTheme {
-        Self {
-            theme: Style::rounded().into(),
-            full_theme: Style::modern()
-                .corner_top_left('╭')
-                .corner_top_right('╮')
-                .corner_bottom_left('╰')
-                .corner_bottom_right('╯')
-                .into(),
-            has_inner: true,
-        }
+        let full = Style::modern()
+            .corner_top_left('╭')
+            .corner_top_right('╮')
+            .corner_bottom_left('╰')
+            .corner_bottom_right('╯');
+
+        Self::new(Style::rounded(), full, true)
     }
 
     pub fn reinforced() -> TableTheme {
-        let full_theme = Style::modern()
+        let full = Style::modern()
             .corner_top_left('┏')
             .corner_top_right('┓')
             .corner_bottom_left('┗')
             .corner_bottom_right('┛');
-        Self {
-            theme: full_theme.clone().remove_horizontal().into(),
-            full_theme: full_theme.into(),
-            has_inner: true,
-        }
+
+        Self::new(full.clone().remove_horizontal(), full, true)
     }
 
     pub fn heavy() -> TableTheme {
@@ -193,48 +148,32 @@ impl TableTheme {
             .corner_top_right('┓')
             .corner_bottom_left('┗')
             .corner_bottom_right('┛')
-            .horizontals([HorizontalLine::new(1, Line::full('━', '╋', '┣', '┫'))]);
-        let full_theme = theme
+            .horizontals([(1, HorizontalLine::full('━', '╋', '┣', '┫'))]);
+        let full = theme
             .clone()
             .remove_horizontals()
             .horizontal('━')
             .intersection_left('┣')
             .intersection_right('┫')
             .intersection('╋');
-        Self {
-            theme: theme.into(),
-            full_theme: full_theme.into(),
-            has_inner: true,
-        }
+
+        Self::new(theme, full, true)
     }
 
     pub fn none() -> TableTheme {
-        Self {
-            theme: Style::blank().into(),
-            full_theme: Style::blank().into(),
-            has_inner: true,
-        }
+        Self::new(Style::blank(), Style::blank(), true)
     }
 
-    pub fn has_top_line(&self) -> bool {
-        self.theme.get_top().is_some()
-            || self.theme.get_top_intersection().is_some()
-            || self.theme.get_top_left().is_some()
-            || self.theme.get_top_right().is_some()
+    pub fn has_top(&self) -> bool {
+        self.theme.borders_has_top()
     }
 
     pub fn has_left(&self) -> bool {
-        self.theme.get_left().is_some()
-            || self.theme.get_left_intersection().is_some()
-            || self.theme.get_top_left().is_some()
-            || self.theme.get_bottom_left().is_some()
+        self.theme.borders_has_left()
     }
 
     pub fn has_right(&self) -> bool {
-        self.theme.get_right().is_some()
-            || self.theme.get_right_intersection().is_some()
-            || self.theme.get_top_right().is_some()
-            || self.theme.get_bottom_right().is_some()
+        self.theme.borders_has_right()
     }
 
     pub fn has_inner(&self) -> bool {
@@ -245,11 +184,11 @@ impl TableTheme {
         self.full_theme.get_borders().has_horizontal()
     }
 
-    pub fn get_theme_full(&self) -> RawStyle {
+    pub fn get_theme_full(&self) -> Theme {
         self.full_theme.clone()
     }
 
-    pub fn get_theme(&self) -> RawStyle {
+    pub fn get_theme(&self) -> Theme {
         self.theme.clone()
     }
 }
diff --git a/crates/nu-table/src/types/expanded.rs b/crates/nu-table/src/types/expanded.rs
index 668e5ea25c..81215a89c3 100644
--- a/crates/nu-table/src/types/expanded.rs
+++ b/crates/nu-table/src/types/expanded.rs
@@ -358,7 +358,7 @@ fn expanded_table_kv(record: &Record, cfg: Cfg<'_>) -> StringResult {
         // we could use Padding for it but,
         // the easiest way to do so is just push a new_line char before
         let mut key = key.to_owned();
-        if !key.is_empty() && is_expanded && theme.has_top_line() {
+        if !key.is_empty() && is_expanded && theme.has_top() {
             key.insert(0, '\n');
         }
 
diff --git a/crates/nu-table/src/unstructured_table.rs b/crates/nu-table/src/unstructured_table.rs
index 5ab0bec3f6..6f9c741e9b 100644
--- a/crates/nu-table/src/unstructured_table.rs
+++ b/crates/nu-table/src/unstructured_table.rs
@@ -3,11 +3,11 @@ use nu_color_config::StyleComputer;
 use nu_protocol::{Config, Record, Span, Value};
 use tabled::{
     grid::{
-        color::{AnsiColor, StaticColor},
+        ansi::{ANSIBuf, ANSIStr},
         config::{AlignmentHorizontal, Borders, CompactMultilineConfig},
         dimension::{DimensionPriority, PoolTableDimension},
     },
-    settings::{style::RawStyle, Color, Padding, TableOption},
+    settings::{Color, Padding, TableOption, Theme},
     tables::{PoolTable, TableValue},
 };
 
@@ -53,7 +53,7 @@ fn build_table(
     let mut table = PoolTable::from(val);
 
     let mut theme = theme.get_theme_full();
-    theme.set_horizontals(std::collections::HashMap::default());
+    theme.set_horizontal_lines(Default::default());
 
     table.with(Padding::new(indent.0, indent.1, 0, 0));
     table.with(SetRawStyle(theme));
@@ -73,12 +73,13 @@ fn build_table(
         // We just need this unsafe section to cope with some limitations of [`PoolTable`].
         // Mitigation of this is definitely on a todo list.
 
-        let color: AnsiColor<'_> = color.into();
+        let color: ANSIBuf = color.into();
         let prefix = color.get_prefix();
         let suffix = color.get_suffix();
         let prefix: &'static str = unsafe { std::mem::transmute(prefix) };
         let suffix: &'static str = unsafe { std::mem::transmute(suffix) };
-        table.with(SetBorderColor(StaticColor::new(prefix, suffix)));
+
+        table.with(SetBorderColor(ANSIStr::new(prefix, suffix)));
         let table = table.to_string();
 
         return table;
@@ -217,29 +218,29 @@ fn get_columns_in_record(vals: &[Value]) -> Vec<String> {
     }
 }
 
-struct SetRawStyle(RawStyle);
+struct SetRawStyle(Theme);
 
-impl<R, D> TableOption<R, D, CompactMultilineConfig> for SetRawStyle {
+impl<R, D> TableOption<R, CompactMultilineConfig, D> for SetRawStyle {
     fn change(self, _: &mut R, cfg: &mut CompactMultilineConfig, _: &mut D) {
-        let borders = self.0.get_borders();
-        *cfg = cfg.set_borders(borders);
+        let borders = *self.0.get_borders();
+        cfg.set_borders(borders);
     }
 }
 
-struct SetBorderColor(StaticColor);
+struct SetBorderColor(ANSIStr<'static>);
 
-impl<R, D> TableOption<R, D, CompactMultilineConfig> for SetBorderColor {
+impl<R, D> TableOption<R, CompactMultilineConfig, D> for SetBorderColor {
     fn change(self, _: &mut R, cfg: &mut CompactMultilineConfig, _: &mut D) {
         let borders = Borders::filled(self.0);
-        *cfg = cfg.set_borders_color(borders);
+        cfg.set_borders_color(borders);
     }
 }
 
 struct SetAlignment(AlignmentHorizontal);
 
-impl<R, D> TableOption<R, D, CompactMultilineConfig> for SetAlignment {
+impl<R, D> TableOption<R, CompactMultilineConfig, D> for SetAlignment {
     fn change(self, _: &mut R, cfg: &mut CompactMultilineConfig, _: &mut D) {
-        *cfg = cfg.set_alignment_horizontal(self.0);
+        cfg.set_alignment_horizontal(self.0);
     }
 }
 
diff --git a/crates/nu-table/src/util.rs b/crates/nu-table/src/util.rs
index ecdf91863c..a40d6625be 100644
--- a/crates/nu-table/src/util.rs
+++ b/crates/nu-table/src/util.rs
@@ -2,7 +2,9 @@ use nu_color_config::StyleComputer;
 use tabled::{
     builder::Builder,
     grid::{
-        color::AnsiColor, records::vec_records::CellInfo, util::string::string_width_multiline,
+        ansi::{ANSIBuf, ANSIStr},
+        records::vec_records::Text,
+        util::string::get_text_width,
     },
     settings::{width::Truncate, Color, Modify, Padding, Style, Width},
 };
@@ -10,7 +12,7 @@ use tabled::{
 use crate::common::get_leading_trailing_space_style;
 
 pub fn string_width(text: &str) -> usize {
-    string_width_multiline(text)
+    get_text_width(text)
 }
 
 pub fn string_wrap(text: &str, width: usize, keep_words: bool) -> String {
@@ -24,7 +26,7 @@ pub fn string_wrap(text: &str, width: usize, keep_words: bool) -> String {
     }
 
     let wrap = if keep_words {
-        Width::wrap(width).keep_words()
+        Width::wrap(width).keep_words(true)
     } else {
         Width::wrap(width)
     };
@@ -45,7 +47,7 @@ pub fn string_truncate(text: &str, width: usize) -> String {
         None => return String::new(),
     };
 
-    Truncate::truncate_text(line, width).into_owned()
+    Truncate::truncate(line, width).into_owned()
 }
 
 pub fn clean_charset(text: &str) -> String {
@@ -53,24 +55,26 @@ pub fn clean_charset(text: &str) -> String {
     text.replace('\t', "    ").replace('\r', "")
 }
 
-pub fn colorize_space(data: &mut [Vec<CellInfo<String>>], style_computer: &StyleComputer<'_>) {
+pub fn colorize_space(data: &mut [Vec<Text<String>>], style_computer: &StyleComputer<'_>) {
     if let Some(style) = get_leading_trailing_space_style(style_computer).color_style {
-        let style = convert_style(style).into();
-        colorize_lead_trail_space(data, Some(&style), Some(&style));
+        let style = ANSIBuf::from(convert_style(style));
+        let style = style.as_ref();
+        colorize_lead_trail_space(data, Some(style), Some(style));
     }
 }
 
 pub fn colorize_space_str(text: &mut String, style_computer: &StyleComputer<'_>) {
     if let Some(style) = get_leading_trailing_space_style(style_computer).color_style {
-        let style = convert_style(style).into();
-        *text = colorize_space_one(text, Some(&style), Some(&style));
+        let style = ANSIBuf::from(convert_style(style));
+        let style = style.as_ref();
+        *text = colorize_space_one(text, Some(style), Some(style));
     }
 }
 
 fn colorize_lead_trail_space(
-    data: &mut [Vec<CellInfo<String>>],
-    lead: Option<&AnsiColor<'_>>,
-    trail: Option<&AnsiColor<'_>>,
+    data: &mut [Vec<Text<String>>],
+    lead: Option<ANSIStr<'_>>,
+    trail: Option<ANSIStr<'_>>,
 ) {
     if lead.is_none() && trail.is_none() {
         return;
@@ -79,16 +83,12 @@ fn colorize_lead_trail_space(
     for row in data.iter_mut() {
         for cell in row {
             let buf = colorize_space_one(cell.as_ref(), lead, trail);
-            *cell = CellInfo::new(buf);
+            *cell = Text::new(buf);
         }
     }
 }
 
-fn colorize_space_one(
-    text: &str,
-    lead: Option<&AnsiColor<'_>>,
-    trail: Option<&AnsiColor<'_>>,
-) -> String {
+fn colorize_space_one(text: &str, lead: Option<ANSIStr<'_>>, trail: Option<ANSIStr<'_>>) -> String {
     use fancy_regex::Captures;
     use fancy_regex::Regex;
     use once_cell::sync::Lazy;
diff --git a/crates/nu-table/tests/common.rs b/crates/nu-table/tests/common.rs
index ef8e6653e7..e5c97108f2 100644
--- a/crates/nu-table/tests/common.rs
+++ b/crates/nu-table/tests/common.rs
@@ -1,7 +1,7 @@
 #![allow(dead_code)]
 
 use nu_table::{string_width, NuTable, NuTableConfig};
-use tabled::grid::records::vec_records::CellInfo;
+use tabled::grid::records::vec_records::Text;
 
 pub struct TestCase {
     cfg: NuTableConfig,
@@ -19,7 +19,7 @@ impl TestCase {
     }
 }
 
-type Data = Vec<Vec<CellInfo<String>>>;
+type Data = Vec<Vec<Text<String>>>;
 
 pub fn test_table<I: IntoIterator<Item = TestCase>>(data: Data, tests: I) {
     for (i, test) in tests.into_iter().enumerate() {
@@ -42,15 +42,15 @@ pub fn create_table(data: Data, config: NuTableConfig, termwidth: usize) -> Opti
     table.draw(config, termwidth)
 }
 
-pub fn create_row(count_columns: usize) -> Vec<CellInfo<String>> {
+pub fn create_row(count_columns: usize) -> Vec<Text<String>> {
     let mut row = Vec::with_capacity(count_columns);
     for i in 0..count_columns {
-        row.push(CellInfo::new(i.to_string()));
+        row.push(Text::new(i.to_string()));
     }
 
     row
 }
 
-pub fn cell(text: &str) -> CellInfo<String> {
-    CellInfo::new(text.to_string())
+pub fn cell(text: &str) -> Text<String> {
+    Text::new(text.to_string())
 }
diff --git a/crates/nu-table/tests/constrains.rs b/crates/nu-table/tests/constrains.rs
index ea00333011..e9df774976 100644
--- a/crates/nu-table/tests/constrains.rs
+++ b/crates/nu-table/tests/constrains.rs
@@ -3,7 +3,7 @@ mod common;
 use common::{create_row, test_table, TestCase};
 use nu_protocol::TrimStrategy;
 use nu_table::{NuTable, NuTableConfig, TableTheme as theme};
-use tabled::grid::records::vec_records::CellInfo;
+use tabled::grid::records::vec_records::Text;
 
 #[test]
 fn data_and_header_has_different_size_doesnt_work() {
@@ -194,7 +194,7 @@ fn width_control_test_0() {
     test_width(data, &tests);
 }
 
-fn test_width(data: Vec<Vec<CellInfo<String>>>, tests: &[(usize, &str)]) {
+fn test_width(data: Vec<Vec<Text<String>>>, tests: &[(usize, &str)]) {
     let config = NuTableConfig {
         theme: theme::heavy(),
         trim: TrimStrategy::truncate(Some(String::from("..."))),
diff --git a/crates/nu-table/tests/style.rs b/crates/nu-table/tests/style.rs
index 032e5f9c45..942f7521ad 100644
--- a/crates/nu-table/tests/style.rs
+++ b/crates/nu-table/tests/style.rs
@@ -2,7 +2,7 @@ mod common;
 
 use common::create_row as row;
 use nu_table::{NuTable, NuTableConfig, TableTheme as theme};
-use tabled::grid::records::vec_records::CellInfo;
+use tabled::grid::records::vec_records::Text;
 
 #[test]
 fn test_rounded() {
@@ -451,7 +451,7 @@ fn test_with_love() {
     assert_eq!(create_table_with_size(vec![], true, theme::with_love()), "");
 }
 
-fn create_table(data: Vec<Vec<CellInfo<String>>>, with_header: bool, theme: theme) -> String {
+fn create_table(data: Vec<Vec<Text<String>>>, with_header: bool, theme: theme) -> String {
     let config = NuTableConfig {
         theme,
         with_header,
@@ -463,11 +463,7 @@ fn create_table(data: Vec<Vec<CellInfo<String>>>, with_header: bool, theme: them
     out.expect("not expected to get None")
 }
 
-fn create_table_with_size(
-    data: Vec<Vec<CellInfo<String>>>,
-    with_header: bool,
-    theme: theme,
-) -> String {
+fn create_table_with_size(data: Vec<Vec<Text<String>>>, with_header: bool, theme: theme) -> String {
     let config = NuTableConfig {
         theme,
         with_header,

From 3f332bef35e9a44b14f64decae75dc432e8fc6da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrej=20Kol=C4=8Din?= <self@kaathewise.net>
Date: Sat, 24 Aug 2024 17:02:02 +0300
Subject: [PATCH 0372/1072] Fix encode/decode todo's (#13683)

Mistakes have been made. I forgot about a bunch of `todo`s in the helper
functions. So, this PR replaces them with proper errors. It also adds
tests for parse-time evaluation, because one `todo` I missed was in a
`run_const` function.
---
 crates/nu-command/src/strings/base/hex.rs     |  2 +-
 crates/nu-command/src/strings/base/mod.rs     | 36 +++++++++++--------
 .../nu-command/tests/commands/base/base32.rs  | 16 ++++-----
 .../tests/commands/base/base32hex.rs          | 16 ++++-----
 .../nu-command/tests/commands/base/base64.rs  | 35 ++++++------------
 crates/nu-command/tests/commands/base/hex.rs  | 10 +++---
 crates/nu-command/tests/commands/base/mod.rs  | 26 ++++++++++++--
 7 files changed, 76 insertions(+), 65 deletions(-)

diff --git a/crates/nu-command/src/strings/base/hex.rs b/crates/nu-command/src/strings/base/hex.rs
index 189b22742e..9604bacd85 100644
--- a/crates/nu-command/src/strings/base/hex.rs
+++ b/crates/nu-command/src/strings/base/hex.rs
@@ -53,7 +53,7 @@ impl Command for DecodeHex {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        todo!()
+        super::decode(data_encoding::HEXLOWER_PERMISSIVE, call.span(), input)
     }
 }
 
diff --git a/crates/nu-command/src/strings/base/mod.rs b/crates/nu-command/src/strings/base/mod.rs
index d7e248a032..6a30c0d21f 100644
--- a/crates/nu-command/src/strings/base/mod.rs
+++ b/crates/nu-command/src/strings/base/mod.rs
@@ -54,14 +54,17 @@ fn get_string(input: PipelineData, call_span: Span) -> Result<(String, Span), Sh
             match val {
                 Value::String { val, .. } => Ok((val, span)),
 
-                _ => {
-                    todo!("Invalid type")
-                }
+                value => Err(ShellError::TypeMismatch {
+                    err_message: "binary or string".to_owned(),
+                    span: call_span,
+                }),
             }
         }
-        PipelineData::ListStream(..) => {
-            todo!()
-        }
+        PipelineData::ListStream(list, ..) => Err(ShellError::PipelineMismatch {
+            exp_input_type: "binary or string".to_owned(),
+            dst_span: call_span,
+            src_span: list.span(),
+        }),
         PipelineData::ByteStream(stream, ..) => {
             let span = stream.span();
             Ok((stream.into_string()?, span))
@@ -80,20 +83,23 @@ fn get_binary(input: PipelineData, call_span: Span) -> Result<(Vec<u8>, Span), S
                 Value::Binary { val, .. } => Ok((val, span)),
                 Value::String { val, .. } => Ok((val.into_bytes(), span)),
 
-                _ => {
-                    todo!("Invalid type")
-                }
+                value => Err(ShellError::TypeMismatch {
+                    err_message: "binary or string".to_owned(),
+                    span: call_span,
+                }),
             }
         }
-        PipelineData::ListStream(..) => {
-            todo!()
-        }
+        PipelineData::ListStream(list, ..) => Err(ShellError::PipelineMismatch {
+            exp_input_type: "binary or string".to_owned(),
+            dst_span: call_span,
+            src_span: list.span(),
+        }),
         PipelineData::ByteStream(stream, ..) => {
             let span = stream.span();
             Ok((stream.into_bytes()?, span))
         }
-        PipelineData::Empty => {
-            todo!("Can't have empty data");
-        }
+        PipelineData::Empty => Err(ShellError::PipelineEmpty {
+            dst_span: call_span,
+        }),
     }
 }
diff --git a/crates/nu-command/tests/commands/base/base32.rs b/crates/nu-command/tests/commands/base/base32.rs
index e6fae31808..dd7b49313d 100644
--- a/crates/nu-command/tests/commands/base/base32.rs
+++ b/crates/nu-command/tests/commands/base/base32.rs
@@ -2,16 +2,14 @@ use nu_test_support::nu;
 
 #[test]
 fn canonical() {
-    for value in super::random_bytes() {
-        let outcome = nu!("{} | encode base32 | decode base32 | to nuon", value);
-        assert_eq!(outcome.out, value);
+    super::test_canonical("base32");
+    super::test_canonical("base32 --nopad");
+}
 
-        let outcome = nu!(
-            "{} | encode base32 --nopad | decode base32 --nopad | to nuon",
-            value
-        );
-        assert_eq!(outcome.out, value);
-    }
+#[test]
+fn const_() {
+    super::test_const("base32");
+    super::test_const("base32 --nopad");
 }
 
 #[test]
diff --git a/crates/nu-command/tests/commands/base/base32hex.rs b/crates/nu-command/tests/commands/base/base32hex.rs
index adb1494bd9..eadbc9038c 100644
--- a/crates/nu-command/tests/commands/base/base32hex.rs
+++ b/crates/nu-command/tests/commands/base/base32hex.rs
@@ -2,16 +2,14 @@ use nu_test_support::nu;
 
 #[test]
 fn canonical() {
-    for value in super::random_bytes() {
-        let outcome = nu!("{} | encode base32hex | decode base32hex | to nuon", value);
-        assert_eq!(outcome.out, value);
+    super::test_canonical("base32hex");
+    super::test_canonical("base32hex --nopad");
+}
 
-        let outcome = nu!(
-            "{} | encode base32hex --nopad | decode base32hex --nopad | to nuon",
-            value
-        );
-        assert_eq!(outcome.out, value);
-    }
+#[test]
+fn const_() {
+    super::test_const("base32hex");
+    super::test_const("base32hex --nopad");
 }
 
 #[test]
diff --git a/crates/nu-command/tests/commands/base/base64.rs b/crates/nu-command/tests/commands/base/base64.rs
index 12b5f49fff..ac3554352c 100644
--- a/crates/nu-command/tests/commands/base/base64.rs
+++ b/crates/nu-command/tests/commands/base/base64.rs
@@ -2,31 +2,18 @@ use nu_test_support::nu;
 
 #[test]
 fn canonical() {
-    for value in super::random_bytes() {
-        let outcome = nu!(
-            "{} | encode new-base64 | decode new-base64 | to nuon",
-            value
-        );
-        assert_eq!(outcome.out, value);
+    super::test_canonical("new-base64");
+    super::test_canonical("new-base64 --url");
+    super::test_canonical("new-base64 --nopad");
+    super::test_canonical("new-base64 --url --nopad");
+}
 
-        let outcome = nu!(
-            "{} | encode new-base64 --url | decode new-base64 --url | to nuon",
-            value
-        );
-        assert_eq!(outcome.out, value);
-
-        let outcome = nu!(
-            "{} | encode new-base64 --nopad | decode new-base64 --nopad | to nuon",
-            value
-        );
-        assert_eq!(outcome.out, value);
-
-        let outcome = nu!(
-            "{} | encode new-base64 --url --nopad | decode new-base64 --url --nopad | to nuon",
-            value
-        );
-        assert_eq!(outcome.out, value);
-    }
+#[test]
+fn const_() {
+    super::test_const("new-base64");
+    super::test_const("new-base64 --url");
+    super::test_const("new-base64 --nopad");
+    super::test_const("new-base64 --url --nopad");
 }
 
 #[test]
diff --git a/crates/nu-command/tests/commands/base/hex.rs b/crates/nu-command/tests/commands/base/hex.rs
index 5f497408b6..d5bc336491 100644
--- a/crates/nu-command/tests/commands/base/hex.rs
+++ b/crates/nu-command/tests/commands/base/hex.rs
@@ -2,10 +2,12 @@ use nu_test_support::nu;
 
 #[test]
 fn canonical() {
-    for value in super::random_bytes() {
-        let outcome = nu!("{} | encode hex | decode hex | to nuon", value);
-        assert_eq!(outcome.out, value);
-    }
+    super::test_canonical("hex");
+}
+
+#[test]
+fn const_() {
+    super::test_const("hex");
 }
 
 #[test]
diff --git a/crates/nu-command/tests/commands/base/mod.rs b/crates/nu-command/tests/commands/base/mod.rs
index 09828c9211..308f0b35df 100644
--- a/crates/nu-command/tests/commands/base/mod.rs
+++ b/crates/nu-command/tests/commands/base/mod.rs
@@ -2,13 +2,15 @@ use data_encoding::HEXUPPER;
 use rand::prelude::*;
 use rand_chacha::ChaCha8Rng;
 
+use nu_test_support::nu;
+
 mod base32;
 mod base32hex;
 mod base64;
 mod hex;
 
 /// Generate a few random binaries.
-pub fn random_bytes() -> Vec<String> {
+fn random_bytes() -> Vec<String> {
     const NUM: usize = 32;
     let mut rng = ChaCha8Rng::seed_from_u64(4);
 
@@ -17,8 +19,26 @@ pub fn random_bytes() -> Vec<String> {
             let length = rng.gen_range(0..512);
             let mut bytes = vec![0u8; length];
             rng.fill_bytes(&mut bytes);
-            let hex_bytes = HEXUPPER.encode(&bytes);
-            format!("0x[{}]", hex_bytes)
+            HEXUPPER.encode(&bytes)
         })
         .collect()
 }
+
+pub fn test_canonical(cmd: &str) {
+    for value in random_bytes() {
+        let outcome = nu!("0x[{}] | encode {1} | decode {1} | to nuon", value, cmd);
+        let nuon_value = format!("0x[{value}]");
+        assert_eq!(outcome.out, nuon_value);
+    }
+}
+
+pub fn test_const(cmd: &str) {
+    for value in random_bytes() {
+        let outcome = nu!(
+            r#"const out = (0x[{}] | encode {1} | decode {1} | encode hex); $out"#,
+            value,
+            cmd
+        );
+        assert_eq!(outcome.out, value);
+    }
+}

From e3efc8da9f1193a19bf6c70549c8115c47b0a344 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Sun, 25 Aug 2024 20:13:05 +0200
Subject: [PATCH 0373/1072] Remove unnecessary sort in `explore` search fn
 (#13690)

Noticed when playing with the `stable_sort_primitive` lint that the
elements from `enumerate` are already sorted.
---
 crates/nu-explore/src/pager/mod.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/crates/nu-explore/src/pager/mod.rs b/crates/nu-explore/src/pager/mod.rs
index 5ea560093d..d230f8a54d 100644
--- a/crates/nu-explore/src/pager/mod.rs
+++ b/crates/nu-explore/src/pager/mod.rs
@@ -860,10 +860,8 @@ fn search_pattern(data: impl Iterator<Item = String>, pat: &str, rev: bool) -> V
         }
     }
 
-    if !rev {
-        matches.sort();
-    } else {
-        matches.sort_by(|a, b| b.cmp(a));
+    if rev {
+        matches.reverse();
     }
 
     matches

From da98c23ab3639ab78cadf2fe71ffbca42048b168 Mon Sep 17 00:00:00 2001
From: Yash Thakur <45539777+ysthakur@users.noreply.github.com>
Date: Mon, 26 Aug 2024 13:14:57 -0400
Subject: [PATCH 0374/1072] Use right options in custom completions (#13698)

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

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

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

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

This issue was reported by kira in
[Discord](https://discord.com/channels/601130461678272522/1276981416307069019).
In https://github.com/nushell/nushell/pull/13311, I accidentally made it
so that custom completions are filtered according to the user's
configured completion options (`$env.config.completions`) rather than
the completion options provided as part of the custom completions. This
PR is a quick fix for that.

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

It should once again be possible to override match algorithm, case
sensitivity, and substring matching (`positional`) in custom
completions.

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

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

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

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

Added a couple tests.

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

fdncred and I discussed this in Discord a bit and we thought it might be
better to not allow custom completions to override the user's config.
However, `positional` can't currently be set inside one's config, so you
can only do strict prefix matching, no substring matching. Another PR
could do one of the following:
- Document the fact that you can provide completion options inside
custom completions
- Remove the ability to provide completion options with custom
completions and add a `$env.config.completions.positional: true` option
- Remove the ability to provide completion options with custom
completions and add a new match algorithm `substring` (this is the one I
like most, since `positional` only applies to prefix matching anyway)

Separately from these options, we could also allow completers to specify
that they don't Nushell to do any filtering and sorting on the provided
custom completions.
---
 .../src/completions/custom_completions.rs     |  2 +-
 crates/nu-cli/tests/completions/mod.rs        | 40 +++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/crates/nu-cli/src/completions/custom_completions.rs b/crates/nu-cli/src/completions/custom_completions.rs
index f21f942501..8d5512a6a9 100644
--- a/crates/nu-cli/src/completions/custom_completions.rs
+++ b/crates/nu-cli/src/completions/custom_completions.rs
@@ -126,7 +126,7 @@ impl Completer for CustomCompletion {
         let options = custom_completion_options
             .as_ref()
             .unwrap_or(completion_options);
-        let suggestions = filter(&prefix, suggestions, completion_options);
+        let suggestions = filter(&prefix, suggestions, options);
         sort_suggestions(&String::from_utf8_lossy(&prefix), suggestions, options)
     }
 }
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index e1714f78e2..70ea1ea99f 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -61,6 +61,32 @@ fn extern_completer() -> NuCompleter {
     NuCompleter::new(Arc::new(engine), Arc::new(stack))
 }
 
+#[fixture]
+fn completer_strings_with_options() -> NuCompleter {
+    // Create a new engine
+    let (dir, _, mut engine, mut stack) = new_engine();
+    // Add record value as example
+    let record = r#"
+        # To test that the config setting has no effect on the custom completions
+        $env.config.completions.algorithm = "fuzzy"
+        def animals [] {
+            {
+                # Very rare and totally real animals
+                completions: ["Abcdef", "Foo Abcdef", "Acd Bar" ],
+                options: {
+                    completion_algorithm: "prefix",
+                    positional: false,
+                    case_sensitive: false,
+                }
+            }
+        }
+        def my-command [animal: string@animals] { print $animal }"#;
+    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+
+    // Instantiate a new completer
+    NuCompleter::new(Arc::new(engine), Arc::new(stack))
+}
+
 #[fixture]
 fn custom_completer() -> NuCompleter {
     // Create a new engine
@@ -169,6 +195,20 @@ fn variables_customcompletion_subcommands_with_customcompletion_2(
     match_suggestions(&expected, &suggestions);
 }
 
+#[rstest]
+fn customcompletions_substring_matching(mut completer_strings_with_options: NuCompleter) {
+    let suggestions = completer_strings_with_options.complete("my-command Abcd", 15);
+    let expected: Vec<String> = vec!["Abcdef".into(), "Foo Abcdef".into()];
+    match_suggestions(&expected, &suggestions);
+}
+
+#[rstest]
+fn customcompletions_case_insensitive(mut completer_strings_with_options: NuCompleter) {
+    let suggestions = completer_strings_with_options.complete("my-command foo", 14);
+    let expected: Vec<String> = vec!["Foo Abcdef".into()];
+    match_suggestions(&expected, &suggestions);
+}
+
 #[test]
 fn dotnu_completions() {
     // Create a new engine

From 1128df2d295dc4adf013d7a7f8e8bd6677d318c6 Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Tue, 27 Aug 2024 20:00:44 +0200
Subject: [PATCH 0375/1072] Added record key renaming for derive macros
 `IntoValue` and `FromValue` (#13699)

# Description

Using derived `IntoValue` and `FromValue` implementations on structs
with named fields currently produce `Value::Record`s where each key is
the key of the Rust struct. For records like the `$nu` constant, that
won't work as this record uses `kebab-case` for it's keys. To accomodate
this, I upgraded the `#[nu_value(rename_all = "...")]` helper attribute
to also work on structs with named fields which will rename the keys via
the same case conversion as the enums already have.

# User-Facing Changes
Users of these macros may choose different key styles for their in
`Value` representation.

# Tests + Formatting
I added the same test suite as enums already have and updated the traits
documentation with more examples that also pass the doc test.

# After Submitting
I played around with the `$nu` constant but got stuck at the point that
these keys are kebab-cased, with this, I can play around more with it.
---
 crates/nu-derive-value/src/attributes.rs    |  15 +-
 crates/nu-derive-value/src/from.rs          |  29 ++--
 crates/nu-derive-value/src/into.rs          |  25 ++-
 crates/nu-protocol/src/value/from_value.rs  |  45 +++++-
 crates/nu-protocol/src/value/into_value.rs  |  39 ++++-
 crates/nu-protocol/src/value/test_derive.rs | 165 ++++++++++++++------
 6 files changed, 228 insertions(+), 90 deletions(-)

diff --git a/crates/nu-derive-value/src/attributes.rs b/crates/nu-derive-value/src/attributes.rs
index 428c5aaae6..2ecfb97dd0 100644
--- a/crates/nu-derive-value/src/attributes.rs
+++ b/crates/nu-derive-value/src/attributes.rs
@@ -3,21 +3,12 @@ use syn::{spanned::Spanned, Attribute, Fields, LitStr};
 
 use crate::{error::DeriveError, HELPER_ATTRIBUTE};
 
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub struct ContainerAttributes {
-    pub rename_all: Case,
+    pub rename_all: Option<Case>,
     pub type_name: Option<String>,
 }
 
-impl Default for ContainerAttributes {
-    fn default() -> Self {
-        Self {
-            rename_all: Case::Snake,
-            type_name: None,
-        }
-    }
-}
-
 impl ContainerAttributes {
     pub fn parse_attrs<'a, M>(
         iter: impl Iterator<Item = &'a Attribute>,
@@ -59,7 +50,7 @@ impl ContainerAttributes {
                                 return Ok(()); // We stored the err in `err`.
                             }
                         };
-                        container_attrs.rename_all = case;
+                        container_attrs.rename_all = Some(case);
                     }
                     "type_name" => {
                         let type_name: LitStr = meta.value()?.parse()?;
diff --git a/crates/nu-derive-value/src/from.rs b/crates/nu-derive-value/src/from.rs
index 901cc53d30..e5a83375f4 100644
--- a/crates/nu-derive-value/src/from.rs
+++ b/crates/nu-derive-value/src/from.rs
@@ -1,4 +1,4 @@
-use convert_case::Casing;
+use convert_case::{Case, Casing};
 use proc_macro2::TokenStream as TokenStream2;
 use quote::{quote, ToTokens};
 use syn::{
@@ -54,7 +54,7 @@ fn derive_struct_from_value(
     let container_attrs = ContainerAttributes::parse_attrs(attrs.iter())?;
     attributes::deny_fields(&data.fields)?;
     let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
-    let from_value_impl = struct_from_value(&data);
+    let from_value_impl = struct_from_value(&data, container_attrs.rename_all);
     let expected_type_impl =
         struct_expected_type(&data.fields, container_attrs.type_name.as_deref());
     Ok(quote! {
@@ -70,7 +70,7 @@ fn derive_struct_from_value(
 ///
 /// This function constructs the `from_value` function for structs.
 /// The implementation is straightforward as most of the heavy lifting is handled by
-/// `parse_value_via_fields`, and this function only needs to construct the signature around it.
+/// [`parse_value_via_fields`], and this function only needs to construct the signature around it.
 ///
 /// For structs with named fields, this constructs a large return type where each field
 /// contains the implementation for that specific field.
@@ -198,8 +198,8 @@ fn derive_struct_from_value(
 ///     }
 /// }
 /// ```
-fn struct_from_value(data: &DataStruct) -> TokenStream2 {
-    let body = parse_value_via_fields(&data.fields, quote!(Self));
+fn struct_from_value(data: &DataStruct, rename_all: Option<Case>) -> TokenStream2 {
+    let body = parse_value_via_fields(&data.fields, quote!(Self), rename_all);
     quote! {
         fn from_value(
             v: nu_protocol::Value
@@ -437,7 +437,7 @@ fn enum_from_value(data: &DataEnum, attrs: &[Attribute]) -> Result<TokenStream2,
             let ident = &variant.ident;
             let ident_s = format!("{ident}")
                 .as_str()
-                .to_case(container_attrs.rename_all);
+                .to_case(container_attrs.rename_all.unwrap_or(Case::Snake));
             match &variant.fields {
                 Fields::Named(fields) => Err(DeriveError::UnsupportedEnums {
                     fields_span: fields.span(),
@@ -511,7 +511,7 @@ fn enum_expected_type(attr_type_name: Option<&str>) -> Option<TokenStream2> {
 /// Parses a `Value` into self.
 ///
 /// This function handles the actual parsing of a `Value` into self.
-/// It takes two parameters: `fields` and `self_ident`.
+/// It takes three parameters: `fields`, `self_ident` and `rename_all`.
 /// The `fields` parameter determines the expected type of `Value`: named fields expect a
 /// `Value::Record`, unnamed fields expect a `Value::List`, and a unit expects `Value::Nothing`.
 ///
@@ -525,6 +525,10 @@ fn enum_expected_type(attr_type_name: Option<&str>) -> Option<TokenStream2> {
 /// For structs, `Self` is usually sufficient, but for enums, `Self::Variant` may be needed in the
 /// future.
 ///
+/// The `rename_all` parameter is provided through `#[nu_value(rename_all = "...")]` and describes
+/// how, if passed, the field keys in the `Value` should be named.
+/// If this is `None`, we keep the names as they are in the struct.
+///
 /// This function is more complex than the equivalent for `IntoValue` due to error handling
 /// requirements.
 /// For missing fields, `ShellError::CantFindColumn` is used, and for unit structs,
@@ -533,12 +537,19 @@ fn enum_expected_type(attr_type_name: Option<&str>) -> Option<TokenStream2> {
 /// that poorly named fields don't cause issues.
 /// While this style is not typically recommended in handwritten Rust, it is acceptable for code
 /// generation.
-fn parse_value_via_fields(fields: &Fields, self_ident: impl ToTokens) -> TokenStream2 {
+fn parse_value_via_fields(
+    fields: &Fields,
+    self_ident: impl ToTokens,
+    rename_all: Option<Case>,
+) -> TokenStream2 {
     match fields {
         Fields::Named(fields) => {
             let fields = fields.named.iter().map(|field| {
                 let ident = field.ident.as_ref().expect("named has idents");
-                let ident_s = ident.to_string();
+                let mut ident_s = ident.to_string();
+                if let Some(rename_all) = rename_all {
+                    ident_s = ident_s.to_case(rename_all);
+                }
                 let ty = &field.ty;
                 match type_is_option(ty) {
                     true => quote! {
diff --git a/crates/nu-derive-value/src/into.rs b/crates/nu-derive-value/src/into.rs
index cb1d82352d..5c8553ef60 100644
--- a/crates/nu-derive-value/src/into.rs
+++ b/crates/nu-derive-value/src/into.rs
@@ -1,4 +1,4 @@
-use convert_case::Casing;
+use convert_case::{Case, Casing};
 use proc_macro2::TokenStream as TokenStream2;
 use quote::{quote, ToTokens};
 use syn::{
@@ -50,6 +50,9 @@ pub fn derive_into_value(input: TokenStream2) -> Result<TokenStream2, DeriveErro
 /// For structs with unnamed fields, this generates a `Value::List` with each field in the list.
 /// For unit structs, this generates `Value::Nothing`, because there is no data.
 ///
+/// This function provides the signature and prepares the call to the [`fields_return_value`]
+/// function which does the heavy lifting of creating the `Value` calls.
+///
 /// # Examples
 ///
 /// These examples show what the macro would generate.
@@ -107,7 +110,7 @@ fn struct_into_value(
     generics: Generics,
     attrs: Vec<Attribute>,
 ) -> Result<TokenStream2, DeriveError> {
-    let _ = ContainerAttributes::parse_attrs(attrs.iter())?;
+    let rename_all = ContainerAttributes::parse_attrs(attrs.iter())?.rename_all;
     attributes::deny_fields(&data.fields)?;
     let record = match &data.fields {
         Fields::Named(fields) => {
@@ -116,7 +119,7 @@ fn struct_into_value(
                 .iter()
                 .map(|field| field.ident.as_ref().expect("named has idents"))
                 .map(|ident| quote!(self.#ident));
-            fields_return_value(&data.fields, accessor)
+            fields_return_value(&data.fields, accessor, rename_all)
         }
         Fields::Unnamed(fields) => {
             let accessor = fields
@@ -125,7 +128,7 @@ fn struct_into_value(
                 .enumerate()
                 .map(|(n, _)| Index::from(n))
                 .map(|index| quote!(self.#index));
-            fields_return_value(&data.fields, accessor)
+            fields_return_value(&data.fields, accessor, rename_all)
         }
         Fields::Unit => quote!(nu_protocol::Value::nothing(span)),
     };
@@ -184,7 +187,7 @@ fn enum_into_value(
             let ident = variant.ident;
             let ident_s = format!("{ident}")
                 .as_str()
-                .to_case(container_attrs.rename_all);
+                .to_case(container_attrs.rename_all.unwrap_or(Case::Snake));
             match &variant.fields {
                 // In the future we can implement more complexe enums here.
                 Fields::Named(fields) => Err(DeriveError::UnsupportedEnums {
@@ -216,11 +219,13 @@ fn enum_into_value(
 ///
 /// This function handles the construction of the final `Value` that the macro generates.
 /// It is currently only used for structs but may be used for enums in the future.
-/// The function takes two parameters: the `fields`, which allow iterating over each field of a data
-/// type, and the `accessor`.
+/// The function takes three parameters: the `fields`, which allow iterating over each field of a
+/// data type, the `accessor` and `rename_all`.
 /// The fields determine whether we need to generate a `Value::Record`, `Value::List`, or
 /// `Value::Nothing`.
 /// For named fields, they are also directly used to generate the record key.
+/// If `#[nu_value(rename_all = "...")]` is used and then passed in here via `rename_all`, the
+/// named fields will be converted to the given case and then uses as the record key.
 ///
 /// The `accessor` parameter generalizes how the data is accessed.
 /// For named fields, this is usually the name of the fields preceded by `self` in a struct, and
@@ -233,6 +238,7 @@ fn enum_into_value(
 fn fields_return_value(
     fields: &Fields,
     accessor: impl Iterator<Item = impl ToTokens>,
+    rename_all: Option<Case>,
 ) -> TokenStream2 {
     match fields {
         Fields::Named(fields) => {
@@ -242,7 +248,10 @@ fn fields_return_value(
                 .zip(accessor)
                 .map(|(field, accessor)| {
                     let ident = field.ident.as_ref().expect("named has idents");
-                    let field = ident.to_string();
+                    let mut field = ident.to_string();
+                    if let Some(rename_all) = rename_all {
+                        field = field.to_case(rename_all);
+                    }
                     quote!(#field => nu_protocol::IntoValue::into_value(#accessor, span))
                 })
                 .collect();
diff --git a/crates/nu-protocol/src/value/from_value.rs b/crates/nu-protocol/src/value/from_value.rs
index c5445446c9..430ff63da4 100644
--- a/crates/nu-protocol/src/value/from_value.rs
+++ b/crates/nu-protocol/src/value/from_value.rs
@@ -17,29 +17,36 @@ use std::{
 ///
 /// # Derivable
 /// This trait can be used with `#[derive]`.
+///
 /// When derived on structs with named fields, it expects a [`Value::Record`] where each field of
 /// the struct maps to a corresponding field in the record.
+/// You can customize the case conversion of these field names by using
+/// `#[nu_value(rename_all = "...")]` on the struct.
+/// Supported case conversions include those provided by [`convert_case::Case`], such as
+/// "snake_case", "kebab-case", "PascalCase", and others.
+/// Additionally, all values accepted by
+/// [`#[serde(rename_all = "...")]`](https://serde.rs/container-attrs.html#rename_all) are valid here.
+/// If not set, the field names will match the original Rust field names as-is.
+///
 /// For structs with unnamed fields, it expects a [`Value::List`], and the fields are populated in
 /// the order they appear in the list.
-/// Unit structs expect  a [`Value::Nothing`], as they contain no data.
+/// Unit structs expect a [`Value::Nothing`], as they contain no data.
 /// Attempting to convert from a non-matching `Value` type will result in an error.
 ///
 /// Only enums with no fields may derive this trait.
 /// The expected value representation will be the name of the variant as a [`Value::String`].
 /// By default, variant names will be expected in ["snake_case"](convert_case::Case::Snake).
 /// You can customize the case conversion using `#[nu_value(rename_all = "kebab-case")]` on the enum.
-/// All deterministic and useful case conversions provided by [`convert_case::Case`] are supported
-/// by specifying the case name followed by "case".
-/// Also all values for
-/// [`#[serde(rename_all = "...")]`](https://serde.rs/container-attrs.html#rename_all) are valid
-/// here.
 ///
 /// Additionally, you can use `#[nu_value(type_name = "...")]` in the derive macro to set a custom type name
 /// for `FromValue::expected_type`. This will result in a `Type::Custom` with the specified type name.
 /// This can be useful in situations where the default type name is not desired.
 ///
 /// ```
-/// # use nu_protocol::{FromValue, Value, ShellError};
+/// # use nu_protocol::{FromValue, Value, ShellError, record, Span};
+/// #
+/// # let span = Span::unknown();
+/// #
 /// #[derive(FromValue, Debug, PartialEq)]
 /// #[nu_value(rename_all = "COBOL-CASE", type_name = "birb")]
 /// enum Bird {
@@ -57,6 +64,30 @@ use std::{
 ///     &Bird::expected_type().to_string(),
 ///     "birb"
 /// );
+///
+///
+/// #[derive(FromValue, PartialEq, Eq, Debug)]
+/// #[nu_value(rename_all = "kebab-case")]
+/// struct Person {
+///     first_name: String,
+///     last_name: String,
+///     age: u32,
+/// }
+///
+/// let value = Value::record(record! {
+///     "first-name" => Value::string("John", span),
+///     "last-name" => Value::string("Doe", span),
+///     "age" => Value::int(42, span),
+/// }, span);
+///
+/// assert_eq!(
+///     Person::from_value(value).unwrap(),
+///     Person {
+///         first_name: "John".into(),
+///         last_name: "Doe".into(),
+///         age: 42,
+///     }
+/// );
 /// ```
 pub trait FromValue: Sized {
     // TODO: instead of ShellError, maybe we could have a FromValueError that implements Into<ShellError>
diff --git a/crates/nu-protocol/src/value/into_value.rs b/crates/nu-protocol/src/value/into_value.rs
index 5730f9d8da..934525e033 100644
--- a/crates/nu-protocol/src/value/into_value.rs
+++ b/crates/nu-protocol/src/value/into_value.rs
@@ -10,6 +10,11 @@ use crate::{Record, ShellError, Span, Value};
 /// This trait can be used with `#[derive]`.
 /// When derived on structs with named fields, the resulting value representation will use
 /// [`Value::Record`], where each field of the record corresponds to a field of the struct.
+/// By default, field names will be kept as-is, but you can customize the case conversion
+/// for all fields in a struct by using `#[nu_value(rename_all = "kebab-case")]` on the struct.
+/// All useful case options from [`convert_case::Case`] are supported, as well as the
+/// values allowed by [`#[serde(rename_all)]`](https://serde.rs/container-attrs.html#rename_all).
+///
 /// For structs with unnamed fields, the value representation will be [`Value::List`], with all
 /// fields inserted into a list.
 /// Unit structs will be represented as [`Value::Nothing`] since they contain no data.
@@ -18,14 +23,12 @@ use crate::{Record, ShellError, Span, Value};
 /// The resulting value representation will be the name of the variant as a [`Value::String`].
 /// By default, variant names will be converted to ["snake_case"](convert_case::Case::Snake).
 /// You can customize the case conversion using `#[nu_value(rename_all = "kebab-case")]` on the enum.
-/// All deterministic and useful case conversions provided by [`convert_case::Case`] are supported
-/// by specifying the case name followed by "case".
-/// Also all values for
-/// [`#[serde(rename_all = "...")]`](https://serde.rs/container-attrs.html#rename_all) are valid
-/// here.
 ///
 /// ```
-/// # use nu_protocol::{IntoValue, Value, Span};
+/// # use nu_protocol::{IntoValue, Value, Span, record};
+/// #
+/// # let span = Span::unknown();
+/// #
 /// #[derive(IntoValue)]
 /// #[nu_value(rename_all = "COBOL-CASE")]
 /// enum Bird {
@@ -35,9 +38,31 @@ use crate::{Record, ShellError, Span, Value};
 /// }
 ///
 /// assert_eq!(
-///     Bird::RiverDuck.into_value(Span::unknown()),
+///     Bird::RiverDuck.into_value(span),
 ///     Value::test_string("RIVER-DUCK")
 /// );
+///
+///
+/// #[derive(IntoValue)]
+/// #[nu_value(rename_all = "kebab-case")]
+/// struct Person {
+///     first_name: String,
+///     last_name: String,
+///     age: u32,
+/// }
+///
+/// assert_eq!(
+///     Person {
+///         first_name: "John".into(),
+///         last_name: "Doe".into(),
+///         age: 42,
+///     }.into_value(span),
+///     Value::record(record! {
+///         "first-name" => Value::string("John", span),
+///         "last-name" => Value::string("Doe", span),
+///         "age" => Value::int(42, span),
+///     }, span)
+/// );
 /// ```
 pub trait IntoValue: Sized {
     /// Converts the given value to a [`Value`].
diff --git a/crates/nu-protocol/src/value/test_derive.rs b/crates/nu-protocol/src/value/test_derive.rs
index 182d37f980..4209b872b3 100644
--- a/crates/nu-protocol/src/value/test_derive.rs
+++ b/crates/nu-protocol/src/value/test_derive.rs
@@ -384,62 +384,133 @@ fn enum_incorrect_type() {
     assert!(res.is_err());
 }
 
-// Generate the `Enum` from before but with all possible `rename_all` variants.
-macro_rules! enum_rename_all {
-    ($($ident:ident: $case:literal => [$a1:literal, $b2:literal, $c3:literal]),*) => {
-        $(
-            #[derive(Debug, PartialEq, IntoValue, FromValue)]
-            #[nu_value(rename_all = $case)]
-            enum $ident {
-                AlphaOne,
-                BetaTwo,
-                CharlieThree
-            }
+mod enum_rename_all {
+    use super::*;
+    use crate as nu_protocol;
 
-            impl $ident {
-                fn make() -> [Self; 3] {
-                    [Self::AlphaOne, Self::BetaTwo, Self::CharlieThree]
+    // Generate the `Enum` from before but with all possible `rename_all` variants.
+    macro_rules! enum_rename_all {
+        ($($ident:ident: $case:literal => [$a1:literal, $b2:literal, $c3:literal]),*) => {
+            $(
+                #[derive(Debug, PartialEq, IntoValue, FromValue)]
+                #[nu_value(rename_all = $case)]
+                enum $ident {
+                    AlphaOne,
+                    BetaTwo,
+                    CharlieThree
                 }
 
-                fn value() -> Value {
-                    Value::test_list(vec![
-                        Value::test_string($a1),
-                        Value::test_string($b2),
-                        Value::test_string($c3),
-                    ])
+                impl $ident {
+                    fn make() -> [Self; 3] {
+                        [Self::AlphaOne, Self::BetaTwo, Self::CharlieThree]
+                    }
+
+                    fn value() -> Value {
+                        Value::test_list(vec![
+                            Value::test_string($a1),
+                            Value::test_string($b2),
+                            Value::test_string($c3),
+                        ])
+                    }
                 }
-            }
-        )*
+            )*
 
-        #[test]
-        fn enum_rename_all_into_value() {$({
-            let expected = $ident::value();
-            let actual = $ident::make().into_test_value();
-            assert_eq!(expected, actual);
-        })*}
+            #[test]
+            fn into_value() {$({
+                let expected = $ident::value();
+                let actual = $ident::make().into_test_value();
+                assert_eq!(expected, actual);
+            })*}
 
-        #[test]
-        fn enum_rename_all_from_value() {$({
-            let expected = $ident::make();
-            let actual = <[$ident; 3]>::from_value($ident::value()).unwrap();
-            assert_eq!(expected, actual);
-        })*}
+            #[test]
+            fn from_value() {$({
+                let expected = $ident::make();
+                let actual = <[$ident; 3]>::from_value($ident::value()).unwrap();
+                assert_eq!(expected, actual);
+            })*}
+        }
+    }
+
+    enum_rename_all! {
+        Upper: "UPPER CASE" => ["ALPHA ONE", "BETA TWO", "CHARLIE THREE"],
+        Lower: "lower case" => ["alpha one", "beta two", "charlie three"],
+        Title: "Title Case" => ["Alpha One", "Beta Two", "Charlie Three"],
+        Camel: "camelCase" => ["alphaOne", "betaTwo", "charlieThree"],
+        Pascal: "PascalCase" => ["AlphaOne", "BetaTwo", "CharlieThree"],
+        Snake: "snake_case" => ["alpha_one", "beta_two", "charlie_three"],
+        UpperSnake: "UPPER_SNAKE_CASE" => ["ALPHA_ONE", "BETA_TWO", "CHARLIE_THREE"],
+        Kebab: "kebab-case" => ["alpha-one", "beta-two", "charlie-three"],
+        Cobol: "COBOL-CASE" => ["ALPHA-ONE", "BETA-TWO", "CHARLIE-THREE"],
+        Train: "Train-Case" => ["Alpha-One", "Beta-Two", "Charlie-Three"],
+        Flat: "flatcase" => ["alphaone", "betatwo", "charliethree"],
+        UpperFlat: "UPPERFLATCASE" => ["ALPHAONE", "BETATWO", "CHARLIETHREE"]
     }
 }
 
-enum_rename_all! {
-    Upper: "UPPER CASE" => ["ALPHA ONE", "BETA TWO", "CHARLIE THREE"],
-    Lower: "lower case" => ["alpha one", "beta two", "charlie three"],
-    Title: "Title Case" => ["Alpha One", "Beta Two", "Charlie Three"],
-    Camel: "camelCase" => ["alphaOne", "betaTwo", "charlieThree"],
-    Pascal: "PascalCase" => ["AlphaOne", "BetaTwo", "CharlieThree"],
-    Snake: "snake_case" => ["alpha_one", "beta_two", "charlie_three"],
-    UpperSnake: "UPPER_SNAKE_CASE" => ["ALPHA_ONE", "BETA_TWO", "CHARLIE_THREE"],
-    Kebab: "kebab-case" => ["alpha-one", "beta-two", "charlie-three"],
-    Cobol: "COBOL-CASE" => ["ALPHA-ONE", "BETA-TWO", "CHARLIE-THREE"],
-    Train: "Train-Case" => ["Alpha-One", "Beta-Two", "Charlie-Three"],
-    Flat: "flatcase" => ["alphaone", "betatwo", "charliethree"],
-    UpperFlat: "UPPERFLATCASE" => ["ALPHAONE", "BETATWO", "CHARLIETHREE"]
+mod named_fields_struct_rename_all {
+    use super::*;
+    use crate as nu_protocol;
+
+    macro_rules! named_fields_struct_rename_all {
+        ($($ident:ident: $case:literal => [$a1:literal, $b2:literal, $c3:literal]),*) => {
+            $(
+                #[derive(Debug, PartialEq, IntoValue, FromValue)]
+                #[nu_value(rename_all = $case)]
+                struct $ident {
+                    alpha_one: (),
+                    beta_two: (),
+                    charlie_three: (),
+                }
+
+                impl $ident {
+                    fn make() -> Self {
+                        Self {
+                            alpha_one: (),
+                            beta_two: (),
+                            charlie_three: (),
+                        }
+                    }
+
+                    fn value() -> Value {
+                        Value::test_record(record! {
+                            $a1 => Value::test_nothing(),
+                            $b2 => Value::test_nothing(),
+                            $c3 => Value::test_nothing(),
+                        })
+                    }
+                }
+            )*
+
+            #[test]
+            fn into_value() {$({
+                let expected = $ident::value();
+                let actual = $ident::make().into_test_value();
+                assert_eq!(expected, actual);
+            })*}
+
+            #[test]
+            fn from_value() {$({
+                let expected = $ident::make();
+                let actual = $ident::from_value($ident::value()).unwrap();
+                assert_eq!(expected, actual);
+            })*}
+        }
+    }
+
+    named_fields_struct_rename_all! {
+        Upper: "UPPER CASE" => ["ALPHA ONE", "BETA TWO", "CHARLIE THREE"],
+        Lower: "lower case" => ["alpha one", "beta two", "charlie three"],
+        Title: "Title Case" => ["Alpha One", "Beta Two", "Charlie Three"],
+        Camel: "camelCase" => ["alphaOne", "betaTwo", "charlieThree"],
+        Pascal: "PascalCase" => ["AlphaOne", "BetaTwo", "CharlieThree"],
+        Snake: "snake_case" => ["alpha_one", "beta_two", "charlie_three"],
+        UpperSnake: "UPPER_SNAKE_CASE" => ["ALPHA_ONE", "BETA_TWO", "CHARLIE_THREE"],
+        Kebab: "kebab-case" => ["alpha-one", "beta-two", "charlie-three"],
+        Cobol: "COBOL-CASE" => ["ALPHA-ONE", "BETA-TWO", "CHARLIE-THREE"],
+        Train: "Train-Case" => ["Alpha-One", "Beta-Two", "Charlie-Three"],
+        Flat: "flatcase" => ["alphaone", "betatwo", "charliethree"],
+        UpperFlat: "UPPERFLATCASE" => ["ALPHAONE", "BETATWO", "CHARLIETHREE"]
+    }
 }
 
 #[derive(IntoValue, FromValue, Debug, PartialEq)]

From 71ced35987d9514cfa240e24c1f472cb2685e6b0 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Tue, 27 Aug 2024 16:58:05 -0700
Subject: [PATCH 0376/1072] Changed category for `panic` and added search terms
 and examples (#13707)

# Description
Cosmetic changes around `panic` command. Changed category, added search
terms, and examples.

# User-Facing Changes
See above
---
 crates/nu-command/src/misc/panic.rs | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/crates/nu-command/src/misc/panic.rs b/crates/nu-command/src/misc/panic.rs
index f8bb0bae66..cb880c1280 100644
--- a/crates/nu-command/src/misc/panic.rs
+++ b/crates/nu-command/src/misc/panic.rs
@@ -9,16 +9,22 @@ impl Command for Panic {
     }
 
     fn description(&self) -> &str {
-        "Executes a rust panic, useful only for testing."
+        "Causes nushell to panic."
+    }
+
+    fn search_terms(&self) -> Vec<&str> {
+        vec!["crash", "throw"]
     }
 
     fn signature(&self) -> nu_protocol::Signature {
         Signature::build("panic")
-            .input_output_types(vec![(Type::Nothing, Type::table())])
-            // LsGlobPattern is similar to string, it won't auto-expand
-            // and we use it to track if the user input is quoted.
-            .optional("msg", SyntaxShape::String, "The glob pattern to use.")
-            .category(Category::Experimental)
+            .input_output_types(vec![(Type::Nothing, Type::Nothing)])
+            .optional(
+                "msg",
+                SyntaxShape::String,
+                "The custom message for the panic.",
+            )
+            .category(Category::Debug)
     }
 
     fn run(
@@ -35,6 +41,10 @@ impl Command for Panic {
     }
 
     fn examples(&self) -> Vec<Example> {
-        vec![]
+        vec![Example {
+            description: "Panic with a custom message",
+            example: "panic 'This is a custom panic message'",
+            result: None,
+        }]
     }
 }

From 4ca1f95b6c9e1be5606307c9cc7d0c15ac094dbd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Aug 2024 12:36:03 +0000
Subject: [PATCH 0377/1072] Bump crate-ci/typos from 1.23.6 to 1.24.1 (#13716)

---
 .github/workflows/typos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index fb363cad64..0677936b0b 100644
--- 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.23.6
+        uses: crate-ci/typos@v1.24.1

From a88f46c6c9ad19867304fc812f81b99ee8e0094f Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Wed, 28 Aug 2024 07:54:01 -0500
Subject: [PATCH 0378/1072] update virtual terminal processing (#13710)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

With Windows Terminal Canary 1.23.240826001-llm, this enables nushell to
query the terminal and receive a response.


![image](https://github.com/user-attachments/assets/c4c43328-c431-47e4-b377-8b3a2bc12b74)

The red component here is
```nushell
❯ ("0c0c" | into int -r 16) / 256 | math round | fmt | get lowerhex
0xc
```

This example queries the background and the response is a r/g/b color.
The response really should be
```
␛]11;1;rgb:0c0c/0c0c/0c0c
```
I'm not sure why nushell's input is eating the first part.

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-utils/src/utils.rs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/crates/nu-utils/src/utils.rs b/crates/nu-utils/src/utils.rs
index 8baf674075..ee575b5640 100644
--- a/crates/nu-utils/src/utils.rs
+++ b/crates/nu-utils/src/utils.rs
@@ -7,6 +7,7 @@ pub fn enable_vt_processing() -> Result<()> {
         use crossterm_winapi::{ConsoleMode, Handle};
 
         pub const ENABLE_PROCESSED_OUTPUT: u32 = 0x0001;
+        pub const ENABLE_VIRTUAL_TERMINAL_INPUT: u32 = 0x0200;
         pub const ENABLE_VIRTUAL_TERMINAL_PROCESSING: u32 = 0x0004;
         let mask = ENABLE_VIRTUAL_TERMINAL_PROCESSING;
 
@@ -17,8 +18,12 @@ pub fn enable_vt_processing() -> Result<()> {
         // enable_processed_output and enable_virtual_terminal_processing should be used
 
         if old_mode & mask == 0 {
-            console_mode
-                .set_mode(old_mode | ENABLE_PROCESSED_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING)?
+            console_mode.set_mode(
+                old_mode
+                    | ENABLE_PROCESSED_OUTPUT
+                    | ENABLE_VIRTUAL_TERMINAL_PROCESSING
+                    | ENABLE_VIRTUAL_TERMINAL_INPUT,
+            )?
         }
     }
     Ok(())

From a39e94de8a8ad4cd889e322ce9f05aab344fd155 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Wed, 28 Aug 2024 05:54:31 -0700
Subject: [PATCH 0379/1072] Added polars commands for converting string columns
 to integer and decimal columns (#13711)

# Description
Introduces two new polars commands for converting string columns to
decimal and integer columns:

<img width="740" alt="Screenshot 2024-08-27 at 15 32 28"
src="https://github.com/user-attachments/assets/f9573b6e-48f6-4bbf-8782-39ffb95eb934">

<img width="720" alt="Screenshot 2024-08-27 at 15 33 46"
src="https://github.com/user-attachments/assets/90a66bb5-fa78-4ed3-8b2b-ae05cddd2f3a">

# User-Facing Changes
- Addition of the `polars integer` command
- Addition of the `polars decimal` command
---
 crates/nu_plugin_polars/Cargo.toml            |   6 +-
 .../src/dataframe/lazy/select.rs              |   2 +-
 .../src/dataframe/series/mod.rs               |   2 +
 .../src/dataframe/series/string/mod.rs        |   4 +
 .../src/dataframe/series/string/to_decimal.rs | 111 ++++++++++++++++++
 .../src/dataframe/series/string/to_integer.rs |  97 +++++++++++++++
 6 files changed, 219 insertions(+), 3 deletions(-)
 create mode 100644 crates/nu_plugin_polars/src/dataframe/series/string/to_decimal.rs
 create mode 100644 crates/nu_plugin_polars/src/dataframe/series/string/to_integer.rs

diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 70c901c4ce..b333ae16ae 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -53,6 +53,7 @@ features = [
 	"dtype-categorical",
 	"dtype-datetime",
 	"dtype-struct",
+	"dtype-decimal",
 	"dtype-i8",
 	"dtype-i16",
 	"dtype-u8",
@@ -70,7 +71,8 @@ features = [
 	"serde",
 	"serde-lazy",
 	"strings",
-    "streaming",
+	"string_to_integer",
+	"streaming",
 	"to_dummies",
 ]
 optional = false
@@ -82,4 +84,4 @@ nu-engine = { path = "../nu-engine", version = "0.97.2" }
 nu-parser = { path = "../nu-parser", version = "0.97.2" }
 nu-command = { path = "../nu-command", version = "0.97.2" }
 nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.97.2" }
-tempfile.workspace = true
\ No newline at end of file
+tempfile.workspace = true
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/select.rs b/crates/nu_plugin_polars/src/dataframe/lazy/select.rs
index 9417427545..ac6c2683d7 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/select.rs
+++ b/crates/nu_plugin_polars/src/dataframe/lazy/select.rs
@@ -67,7 +67,7 @@ impl PluginCommand for LazySelect {
 
         let pipeline_value = input.into_value(call.head)?;
         let lazy = NuLazyFrame::try_from_value_coerce(plugin, &pipeline_value)?;
-        let lazy = NuLazyFrame::new(lazy.from_eager, lazy.to_polars().select(&expressions));
+        let lazy: NuLazyFrame = lazy.to_polars().select(&expressions).into();
         lazy.to_pipeline_data(plugin, engine, call.head)
             .map_err(LabeledError::from)
     }
diff --git a/crates/nu_plugin_polars/src/dataframe/series/mod.rs b/crates/nu_plugin_polars/src/dataframe/series/mod.rs
index 94f28b0801..0c5128f966 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/mod.rs
@@ -77,6 +77,8 @@ pub(crate) fn series_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlug
         Box::new(StrLengths),
         Box::new(StrSlice),
         Box::new(StrFTime),
+        Box::new(ToDecimal),
+        Box::new(ToInteger),
         Box::new(ToLowerCase),
         Box::new(ToUpperCase),
         Box::new(Unique),
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/mod.rs b/crates/nu_plugin_polars/src/dataframe/series/string/mod.rs
index f2fa19cbaf..424b26a35d 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/string/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/string/mod.rs
@@ -5,6 +5,8 @@ mod replace_all;
 mod str_lengths;
 mod str_slice;
 mod strftime;
+mod to_decimal;
+mod to_integer;
 mod to_lowercase;
 mod to_uppercase;
 
@@ -15,5 +17,7 @@ pub use replace_all::ReplaceAll;
 pub use str_lengths::StrLengths;
 pub use str_slice::StrSlice;
 pub use strftime::StrFTime;
+pub use to_decimal::ToDecimal;
+pub use to_integer::ToInteger;
 pub use to_lowercase::ToLowerCase;
 pub use to_uppercase::ToUpperCase;
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/to_decimal.rs b/crates/nu_plugin_polars/src/dataframe/series/string/to_decimal.rs
new file mode 100644
index 0000000000..92469aa10b
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/series/string/to_decimal.rs
@@ -0,0 +1,111 @@
+use crate::{
+    values::{
+        cant_convert_err, Column, CustomValueSupport, NuDataFrame, NuExpression,
+        PolarsPluginObject, PolarsPluginType,
+    },
+    PolarsPlugin,
+};
+
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{
+    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
+    Value,
+};
+use polars::prelude::DataType;
+
+#[derive(Clone)]
+pub struct ToDecimal;
+
+impl PluginCommand for ToDecimal {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars decimal"
+    }
+
+    fn description(&self) -> &str {
+        "Converts a string column into a decimal column"
+    }
+
+    fn search_terms(&self) -> Vec<&str> {
+        vec!["expression", "decimal", "float"]
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .required(
+                "infer_length",
+                SyntaxShape::Int,
+                "Number of decimal points to infer",
+            )
+            .input_output_type(
+                Type::Custom("expression".into()),
+                Type::Custom("expression".into()),
+            )
+            .category(Category::Custom("dataframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![Example {
+            description: "Modifies strings to decimal",
+            example: "[[a b]; [1, '2.4']] | polars into-df | polars select (polars col b | polars decimal 2) | polars collect",
+            result: Some(
+                NuDataFrame::try_from_columns(
+                    vec![Column::new(
+                        "b".to_string(),
+                        vec![
+                            Value::test_float(2.40),
+                        ],
+                    )],
+                    None,
+                )
+                .expect("simple df for test should not fail")
+                .into_value(Span::test_data()),
+            ),
+        }]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        let value = input.into_value(call.head)?;
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuExpression(expr) => command(plugin, engine, call, expr),
+            _ => Err(cant_convert_err(&value, &[PolarsPluginType::NuExpression])),
+        }
+        .map_err(LabeledError::from)
+    }
+}
+
+fn command(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    expr: NuExpression,
+) -> Result<PipelineData, ShellError> {
+    let infer_length: usize = call.req(0)?;
+    let res: NuExpression = expr
+        .into_polars()
+        .str()
+        .to_decimal(infer_length)
+        // since there isn't a good way to support actual large decimal types
+        // in nushell, just cast it to an f64.
+        .cast(DataType::Float64)
+        .into();
+    res.to_pipeline_data(plugin, engine, call.head)
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::test::test_polars_plugin_command;
+
+    #[test]
+    fn test_examples() -> Result<(), ShellError> {
+        test_polars_plugin_command(&ToDecimal)
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/to_integer.rs b/crates/nu_plugin_polars/src/dataframe/series/string/to_integer.rs
new file mode 100644
index 0000000000..9d1df4aa00
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/series/string/to_integer.rs
@@ -0,0 +1,97 @@
+use crate::{
+    values::{
+        cant_convert_err, Column, CustomValueSupport, NuDataFrame, NuExpression,
+        PolarsPluginObject, PolarsPluginType,
+    },
+    PolarsPlugin,
+};
+
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{
+    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Type, Value,
+};
+use polars::prelude::lit;
+
+#[derive(Clone)]
+pub struct ToInteger;
+
+impl PluginCommand for ToInteger {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars integer"
+    }
+
+    fn description(&self) -> &str {
+        "Converts a string column into a integer column"
+    }
+
+    fn search_terms(&self) -> Vec<&str> {
+        vec!["expression", "integer", "float"]
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .input_output_type(
+                Type::Custom("expression".into()),
+                Type::Custom("expression".into()),
+            )
+            .category(Category::Custom("dataframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![Example {
+            description: "Modifies strings to integer",
+            example: "[[a b]; [1, '2']] | polars into-df | polars select (polars col b | polars integer) | polars collect",
+            result: Some(
+                NuDataFrame::try_from_columns(
+                    vec![Column::new(
+                        "b".to_string(),
+                        vec![
+                            Value::test_int(2),
+                        ],
+                    )],
+                    None,
+                )
+                .expect("simple df for test should not fail")
+                .into_value(Span::test_data()),
+            ),
+        }]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        let value = input.into_value(call.head)?;
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuExpression(expr) => command(plugin, engine, call, expr),
+            _ => Err(cant_convert_err(&value, &[PolarsPluginType::NuExpression])),
+        }
+        .map_err(LabeledError::from)
+    }
+}
+
+fn command(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    expr: NuExpression,
+) -> Result<PipelineData, ShellError> {
+    let res: NuExpression = expr.into_polars().str().to_integer(lit(10), false).into();
+    res.to_pipeline_data(plugin, engine, call.head)
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::test::test_polars_plugin_command;
+
+    #[test]
+    fn test_examples() -> Result<(), ShellError> {
+        test_polars_plugin_command(&ToInteger)
+    }
+}

From 4f822e263f8552a1eca0b4a888570b66338e695f Mon Sep 17 00:00:00 2001
From: Bruce Weirdan <weirdan@gmail.com>
Date: Wed, 28 Aug 2024 14:57:43 +0200
Subject: [PATCH 0380/1072] Respect user-defined `$env.NU_LOG_FORMAT` and
 `$env.NU_LOG_DATE_FORMAT` (#13692)

Fixes nushell/nushell#13689

# Description

Respect user-defined `$env.NU_LOG_FORMAT` and `$env.NU_LOG_DATE_FORMAT`

Additionally I fixed `nu_with_std!()` macro (it was not working
correctly)

# User-Facing Changes

Users now may set `$env.NU_LOG_FORMAT` and `$env.NU_LOG_DATE_FORMAT` in
`env.nu` and it will work even if `use std` is used after that.

# Tests + Formatting

Added a couple of tests for the new functionality.

# After Submitting
---
 crates/nu-std/std/log.nu             |  4 ++--
 crates/nu-test-support/src/macros.rs | 12 +++++------
 tests/shell/environment/env.rs       | 32 +++++++++++++++++++++++++++-
 3 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/crates/nu-std/std/log.nu b/crates/nu-std/std/log.nu
index e53d95a15a..5117460be7 100644
--- a/crates/nu-std/std/log.nu
+++ b/crates/nu-std/std/log.nu
@@ -36,8 +36,8 @@ export def log-short-prefix [] {
     }
 }
 export-env {
-    $env.NU_LOG_FORMAT = $"%ANSI_START%%DATE%|%LEVEL%|%MSG%%ANSI_STOP%"
-    $env.NU_LOG_DATE_FORMAT = "%Y-%m-%dT%H:%M:%S%.3f"
+    $env.NU_LOG_FORMAT = $env.NU_LOG_FORMAT? | default "%ANSI_START%%DATE%|%LEVEL%|%MSG%%ANSI_STOP%"
+    $env.NU_LOG_DATE_FORMAT = $env.NU_LOG_DATE_FORMAT? | default "%Y-%m-%dT%H:%M:%S%.3f"
 }
 
 def log-types [] {
diff --git a/crates/nu-test-support/src/macros.rs b/crates/nu-test-support/src/macros.rs
index 6fd3a8c307..3104c04e7d 100644
--- a/crates/nu-test-support/src/macros.rs
+++ b/crates/nu-test-support/src/macros.rs
@@ -143,7 +143,7 @@ macro_rules! nu_with_std {
         cwd: $value:expr,
         $($rest:tt)*
     ) => {
-        nu!(@options [ $($options)* cwd => $crate::fs::in_directory($value) ; ] $($rest)*)
+        nu_with_std!(@options [ $($options)* cwd => $crate::fs::in_directory($value) ; ] $($rest)*)
     };
     // For all other options, we call `.into()` on the `$value` and hope for the best. ;)
     (
@@ -151,7 +151,7 @@ macro_rules! nu_with_std {
         $field:ident : $value:expr,
         $($rest:tt)*
     ) => {
-        nu!(@options [ $($options)* $field => $value.into() ; ] $($rest)*)
+        nu_with_std!(@options [ $($options)* $field => $value.into() ; ] $($rest)*)
     };
 
     // When the `$field: $value,` pairs are all parsed, the next tokens are the `$path` and any
@@ -163,11 +163,11 @@ macro_rules! nu_with_std {
         $(,)*
     ) => {{
         // Here we parse the options into a `NuOpts` struct
-        let opts = nu!(@nu_opts $($options)*);
+        let opts = nu_with_std!(@nu_opts $($options)*);
         // and format the `$path` using the `$part`s
-        let path = nu!(@format_path $path, $($part),*);
+        let path = nu_with_std!(@format_path $path, $($part),*);
         // Then finally we go to the `@main` phase, where the actual work is done.
-        nu!(@main opts, path)
+        nu_with_std!(@main opts, path)
     }};
 
     // Create the NuOpts struct from the `field => value ;` pairs
@@ -196,7 +196,7 @@ macro_rules! nu_with_std {
 
     // This is the entrypoint for this macro.
     ($($token:tt)*) => {{
-        nu!(@options [ ] $($token)*)
+        nu_with_std!(@options [ ] $($token)*)
     }};
 }
 
diff --git a/tests/shell/environment/env.rs b/tests/shell/environment/env.rs
index 1a9c14b18a..e07259a500 100644
--- a/tests/shell/environment/env.rs
+++ b/tests/shell/environment/env.rs
@@ -2,7 +2,7 @@ use super::support::Trusted;
 
 use nu_test_support::fs::Stub::FileWithContent;
 use nu_test_support::playground::Playground;
-use nu_test_support::{nu, nu_repl_code};
+use nu_test_support::{nu, nu_repl_code, nu_with_std};
 use pretty_assertions::assert_eq;
 use serial_test::serial;
 
@@ -215,3 +215,33 @@ fn env_var_case_insensitive() {
     assert!(actual.out.contains("111"));
     assert!(actual.out.contains("222"));
 }
+
+#[test]
+fn std_log_env_vars_are_not_overridden() {
+    let actual = nu_with_std!(
+        envs: vec![
+            ("NU_LOG_FORMAT".to_string(), "%MSG%".to_string()),
+            ("NU_LOG_DATE_FORMAT".to_string(), "%Y".to_string()),
+        ],
+        r#"
+            use std
+            print -e $env.NU_LOG_FORMAT
+            print -e $env.NU_LOG_DATE_FORMAT
+            std log error "err"
+        "#
+    );
+    assert_eq!(actual.err, "%MSG%\n%Y\nerr\n");
+}
+
+#[test]
+fn std_log_env_vars_have_defaults() {
+    let actual = nu_with_std!(
+        r#"
+            use std
+            print -e $env.NU_LOG_FORMAT
+            print -e $env.NU_LOG_DATE_FORMAT
+        "#
+    );
+    assert!(actual.err.contains("%MSG%"));
+    assert!(actual.err.contains("%Y-"));
+}

From 7dda39a89e90e2d8a88b5b6546d07b4fbc8dcb09 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Wed, 28 Aug 2024 14:58:10 +0200
Subject: [PATCH 0381/1072] Simplify our bug reporting form (#13695)

The two additional boxes for "additional context" and screenshots may be
somewhat redundant to the primary `Steps to reproduce`. Sadly folks are
already a bit lazy with the core task of providing a succinct
reproducing example. Having additional fields may not actually improve
the quality and lead to waffling or if left empty some deadspace to
scroll past.
---
 .github/ISSUE_TEMPLATE/bug_report.yml | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

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

From af76e11dd6b2e47dfdc9424d2709a2ddffe3f29b Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Wed, 28 Aug 2024 14:58:38 +0200
Subject: [PATCH 0382/1072] Remove `str deunicode` (#13693)

# Description
Closes #13677

Remove the command `str deunicode`, as it has a narrow application, is
loosely defined by the data provided by the `deunicode` crate and thus a
stabilization liability post-1.0.

Furthermore the data to perform the look-up is quite substantial.

Removing the command and the `deunicode` dependency saves 0.9 MB of
binary data in release mode (~ 2% of total)

(checked via `cargo bloat --release` for a linux x86 build)


# User-Facing Changes
The `str deunicode` command recently added in #13270 is gone
---
 Cargo.lock                                    |  7 --
 Cargo.toml                                    |  1 -
 crates/nu-command/Cargo.toml                  |  1 -
 crates/nu-command/src/default_context.rs      |  1 -
 .../nu-command/src/strings/str_/deunicode.rs  | 98 -------------------
 crates/nu-command/src/strings/str_/mod.rs     |  2 -
 6 files changed, 110 deletions(-)
 delete mode 100644 crates/nu-command/src/strings/str_/deunicode.rs

diff --git a/Cargo.lock b/Cargo.lock
index ea008d0ef8..017a32cd11 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1197,12 +1197,6 @@ dependencies = [
  "syn 2.0.75",
 ]
 
-[[package]]
-name = "deunicode"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00"
-
 [[package]]
 name = "dialoguer"
 version = "0.11.0"
@@ -3123,7 +3117,6 @@ dependencies = [
  "crossterm",
  "csv",
  "data-encoding",
- "deunicode",
  "dialoguer",
  "digest",
  "dirs",
diff --git a/Cargo.toml b/Cargo.toml
index b5a209c4cb..9dd07f6902 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -81,7 +81,6 @@ 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 = "5.0"
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 23e3c31166..7c33a60a23 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -42,7 +42,6 @@ chrono-humanize = { workspace = true }
 chrono-tz = { workspace = true }
 crossterm = { workspace = true }
 csv = { workspace = true }
-deunicode = { workspace = true }
 dialoguer = { workspace = true, default-features = false, features = ["fuzzy-select"] }
 digest = { workspace = true, default-features = false }
 dtparse = { workspace = true }
diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index 88b229fc48..d98ac41f53 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -199,7 +199,6 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             Str,
             StrCapitalize,
             StrContains,
-            StrDeunicode,
             StrDistance,
             StrDowncase,
             StrEndswith,
diff --git a/crates/nu-command/src/strings/str_/deunicode.rs b/crates/nu-command/src/strings/str_/deunicode.rs
deleted file mode 100644
index 48423c2be1..0000000000
--- a/crates/nu-command/src/strings/str_/deunicode.rs
+++ /dev/null
@@ -1,98 +0,0 @@
-use deunicode::deunicode;
-use nu_cmd_base::input_handler::{operate, CellPathOnlyArgs};
-use nu_engine::command_prelude::*;
-use nu_protocol::engine::StateWorkingSet;
-
-#[derive(Clone)]
-pub struct SubCommand;
-
-impl Command for SubCommand {
-    fn name(&self) -> &str {
-        "str deunicode"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("str deunicode")
-            .input_output_types(vec![(Type::String, Type::String)])
-            .category(Category::Strings)
-    }
-
-    fn description(&self) -> &str {
-        "Convert Unicode string to pure ASCII."
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["convert", "ascii"]
-    }
-
-    fn is_const(&self) -> bool {
-        true
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
-        let args = CellPathOnlyArgs::from(cell_paths);
-
-        operate(action, args, input, call.head, engine_state.signals())
-    }
-
-    fn run_const(
-        &self,
-        working_set: &StateWorkingSet,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let cell_paths: Vec<CellPath> = call.rest_const(working_set, 0)?;
-        let args = CellPathOnlyArgs::from(cell_paths);
-
-        operate(
-            action,
-            args,
-            input,
-            call.head,
-            working_set.permanent().signals(),
-        )
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "deunicode a string",
-            example: "'A…B' | str deunicode",
-            result: Some(Value::test_string("A...B")),
-        }]
-    }
-}
-
-fn action(input: &Value, _args: &CellPathOnlyArgs, head: Span) -> Value {
-    match input {
-        Value::String { val, .. } => Value::string(deunicode(val), head),
-        Value::Error { .. } => input.clone(),
-        _ => Value::error(
-            ShellError::OnlySupportsThisInputType {
-                exp_input_type: "string".into(),
-                wrong_type: input.get_type().to_string(),
-                dst_span: head,
-                src_span: input.span(),
-            },
-            head,
-        ),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        use crate::test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/crates/nu-command/src/strings/str_/mod.rs b/crates/nu-command/src/strings/str_/mod.rs
index b9290ada2c..fb34ace833 100644
--- a/crates/nu-command/src/strings/str_/mod.rs
+++ b/crates/nu-command/src/strings/str_/mod.rs
@@ -1,6 +1,5 @@
 mod case;
 mod contains;
-mod deunicode;
 mod distance;
 mod ends_with;
 mod expand;
@@ -16,7 +15,6 @@ mod trim;
 
 pub use case::*;
 pub use contains::SubCommand as StrContains;
-pub use deunicode::SubCommand as StrDeunicode;
 pub use distance::SubCommand as StrDistance;
 pub use ends_with::SubCommand as StrEndswith;
 pub use expand::SubCommand as StrExpand;

From 055d7e27e987c33332d258ab8dac80e2fc51376c Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Wed, 28 Aug 2024 15:02:25 +0200
Subject: [PATCH 0383/1072] Use `heck` instead of `convert_case` for
 `nu-derive-value` (#13708)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

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

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
@sholderbach mentioned that I introduced `convert_case` as a dependency
while we already had `heck` for case conversion. So in this PR replaced
the use `convert_case` with `heck`. Mostly I rebuilt the `convert_case`
API with `heck` to work with it as I like the API of `convert_case` more
than `heck`.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
Nothing changed, the use of `convert_case` wasn't exposed anywhere and
all case conversions are still available.

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

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

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

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->
No new tests required but my tests in `test_derive` captured some errors
I made while developing this change, (hurray, tests work 🎉)
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock                                 | 13 +---
 Cargo.toml                                 |  1 -
 crates/nu-derive-value/Cargo.toml          |  2 +-
 crates/nu-derive-value/src/attributes.rs   | 35 +++--------
 crates/nu-derive-value/src/case.rs         | 72 ++++++++++++++++++++++
 crates/nu-derive-value/src/from.rs         |  8 ++-
 crates/nu-derive-value/src/into.rs         |  6 +-
 crates/nu-derive-value/src/lib.rs          |  1 +
 crates/nu-protocol/Cargo.toml              |  2 +-
 crates/nu-protocol/src/value/from_value.rs |  4 +-
 crates/nu-protocol/src/value/into_value.rs |  6 +-
 11 files changed, 100 insertions(+), 50 deletions(-)
 create mode 100644 crates/nu-derive-value/src/case.rs

diff --git a/Cargo.lock b/Cargo.lock
index 017a32cd11..0aa064bbdc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -933,15 +933,6 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "convert_case"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
-dependencies = [
- "unicode-segmentation",
-]
-
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -3213,7 +3204,7 @@ dependencies = [
 name = "nu-derive-value"
 version = "0.97.2"
 dependencies = [
- "convert_case",
+ "heck",
  "proc-macro-error",
  "proc-macro2",
  "quote",
@@ -3417,10 +3408,10 @@ dependencies = [
  "bytes",
  "chrono",
  "chrono-humanize",
- "convert_case",
  "dirs",
  "dirs-sys",
  "fancy-regex",
+ "heck",
  "indexmap",
  "log",
  "lru",
diff --git a/Cargo.toml b/Cargo.toml
index 9dd07f6902..2a1b9a0439 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -76,7 +76,6 @@ chardetng = "0.1.17"
 chrono = { default-features = false, version = "0.4.34" }
 chrono-humanize = "0.2.3"
 chrono-tz = "0.8"
-convert_case = "0.6"
 crossbeam-channel = "0.5.8"
 crossterm = "0.27"
 csv = "1.3"
diff --git a/crates/nu-derive-value/Cargo.toml b/crates/nu-derive-value/Cargo.toml
index d7d1ff6e4c..bf28ec878f 100644
--- a/crates/nu-derive-value/Cargo.toml
+++ b/crates/nu-derive-value/Cargo.toml
@@ -18,4 +18,4 @@ proc-macro2 = { workspace = true }
 syn = { workspace = true }
 quote = { workspace = true }
 proc-macro-error = { workspace = true }
-convert_case = { workspace = true }
\ No newline at end of file
+heck = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-derive-value/src/attributes.rs b/crates/nu-derive-value/src/attributes.rs
index 2ecfb97dd0..ef353685ab 100644
--- a/crates/nu-derive-value/src/attributes.rs
+++ b/crates/nu-derive-value/src/attributes.rs
@@ -1,7 +1,6 @@
-use convert_case::Case;
 use syn::{spanned::Spanned, Attribute, Fields, LitStr};
 
-use crate::{error::DeriveError, HELPER_ATTRIBUTE};
+use crate::{case::Case, error::DeriveError, HELPER_ATTRIBUTE};
 
 #[derive(Debug, Default)]
 pub struct ContainerAttributes {
@@ -22,35 +21,19 @@ impl ContainerAttributes {
                 let ident = meta.path.require_ident()?;
                 match ident.to_string().as_str() {
                     "rename_all" => {
-                        // The matched case are all useful variants from `convert_case` with aliases
-                        // that `serde` uses.
                         let case: LitStr = meta.value()?.parse()?;
-                        let case = match case.value().as_str() {
-                            "UPPER CASE" | "UPPER WITH SPACES CASE" => Case::Upper,
-                            "lower case" | "lower with spaces case" => Case::Lower,
-                            "Title Case" => Case::Title,
-                            "camelCase" => Case::Camel,
-                            "PascalCase" | "UpperCamelCase" => Case::Pascal,
-                            "snake_case" => Case::Snake,
-                            "UPPER_SNAKE_CASE" | "SCREAMING_SNAKE_CASE" => Case::UpperSnake,
-                            "kebab-case" => Case::Kebab,
-                            "COBOL-CASE" | "UPPER-KEBAB-CASE" | "SCREAMING-KEBAB-CASE" => {
-                                Case::Cobol
-                            }
-                            "Train-Case" => Case::Train,
-                            "flatcase" | "lowercase" => Case::Flat,
-                            "UPPERFLATCASE" | "UPPERCASE" => Case::UpperFlat,
-                            // Although very funny, we don't support `Case::{Toggle, Alternating}`,
-                            // as we see no real benefit.
-                            c => {
+                        let value_span = case.span();
+                        let case = case.value();
+                        match Case::from_str(&case) {
+                            Some(case) => container_attrs.rename_all = Some(case),
+                            None => {
                                 err = Err(DeriveError::InvalidAttributeValue {
-                                    value_span: case.span(),
-                                    value: Box::new(c.to_string()),
+                                    value_span,
+                                    value: Box::new(case),
                                 });
                                 return Ok(()); // We stored the err in `err`.
                             }
-                        };
-                        container_attrs.rename_all = Some(case);
+                        }
                     }
                     "type_name" => {
                         let type_name: LitStr = meta.value()?.parse()?;
diff --git a/crates/nu-derive-value/src/case.rs b/crates/nu-derive-value/src/case.rs
new file mode 100644
index 0000000000..02ca5ba255
--- /dev/null
+++ b/crates/nu-derive-value/src/case.rs
@@ -0,0 +1,72 @@
+use heck::*;
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub enum Case {
+    // directly supported by heck
+    Pascal,
+    Camel,
+    Snake,
+    Kebab,
+    ScreamingSnake,
+    Title,
+    Cobol,
+    Train,
+
+    // custom variants
+    Upper,
+    Lower,
+    Flat,
+    ScreamingFlat,
+}
+
+impl Case {
+    pub fn from_str(s: impl AsRef<str>) -> Option<Self> {
+        match s.as_ref() {
+            // The matched case are all useful variants from `convert_case` with aliases
+            // that `serde` uses.
+            "PascalCase" | "UpperCamelCase" => Case::Pascal,
+            "camelCase" | "lowerCamelCase" => Case::Camel,
+            "snake_case" => Case::Snake,
+            "kebab-case" => Case::Kebab,
+            "SCREAMING_SNAKE_CASE" | "UPPER_SNAKE_CASE" | "SHOUTY_SNAKE_CASE" => {
+                Case::ScreamingSnake
+            }
+            "Title Case" => Case::Title,
+            "COBOL-CASE" | "SCREAMING-KEBAB-CASE" | "UPPER-KEBAB-CASE" => Case::Cobol,
+            "Train-Case" => Case::Train,
+
+            "UPPER CASE" | "UPPER WITH SPACES CASE" => Case::Upper,
+            "lower case" | "lower with spaces case" => Case::Lower,
+            "flatcase" | "lowercase" => Case::Flat,
+            "SCREAMINGFLATCASE" | "UPPERFLATCASE" | "UPPERCASE" => Case::ScreamingFlat,
+
+            _ => return None,
+        }
+        .into()
+    }
+}
+
+pub trait Casing {
+    fn to_case(&self, case: Case) -> String;
+}
+
+impl<T: AsRef<str>> Casing for T {
+    fn to_case(&self, case: Case) -> String {
+        let s = self.as_ref();
+        match case {
+            Case::Pascal => s.to_upper_camel_case(),
+            Case::Camel => s.to_lower_camel_case(),
+            Case::Snake => s.to_snake_case(),
+            Case::Kebab => s.to_kebab_case(),
+            Case::ScreamingSnake => s.to_shouty_snake_case(),
+            Case::Title => s.to_title_case(),
+            Case::Cobol => s.to_shouty_kebab_case(),
+            Case::Train => s.to_train_case(),
+
+            Case::Upper => s.to_shouty_snake_case().replace('_', " "),
+            Case::Lower => s.to_snake_case().replace('_', " "),
+            Case::Flat => s.to_snake_case().replace('_', ""),
+            Case::ScreamingFlat => s.to_shouty_snake_case().replace('_', ""),
+        }
+    }
+}
diff --git a/crates/nu-derive-value/src/from.rs b/crates/nu-derive-value/src/from.rs
index e5a83375f4..820fa46bc6 100644
--- a/crates/nu-derive-value/src/from.rs
+++ b/crates/nu-derive-value/src/from.rs
@@ -1,4 +1,3 @@
-use convert_case::{Case, Casing};
 use proc_macro2::TokenStream as TokenStream2;
 use quote::{quote, ToTokens};
 use syn::{
@@ -6,7 +5,10 @@ use syn::{
     Type,
 };
 
-use crate::attributes::{self, ContainerAttributes};
+use crate::{
+    attributes::{self, ContainerAttributes},
+    case::{Case, Casing},
+};
 
 #[derive(Debug)]
 pub struct FromValue;
@@ -393,7 +395,7 @@ fn derive_enum_from_value(
 /// all possible variants.
 /// The input value is expected to be a `Value::String` containing the name of the variant formatted
 /// as defined by the `#[nu_value(rename_all = "...")]` attribute.
-/// If no attribute is given, [`convert_case::Case::Snake`] is expected.
+/// If no attribute is given, [`snake_case`](heck::ToSnakeCase) is expected.
 ///
 /// If no matching variant is found, `ShellError::CantConvert` is returned.
 ///
diff --git a/crates/nu-derive-value/src/into.rs b/crates/nu-derive-value/src/into.rs
index 5c8553ef60..3dfb92d28e 100644
--- a/crates/nu-derive-value/src/into.rs
+++ b/crates/nu-derive-value/src/into.rs
@@ -1,4 +1,3 @@
-use convert_case::{Case, Casing};
 use proc_macro2::TokenStream as TokenStream2;
 use quote::{quote, ToTokens};
 use syn::{
@@ -6,7 +5,10 @@ use syn::{
     Index,
 };
 
-use crate::attributes::{self, ContainerAttributes};
+use crate::{
+    attributes::{self, ContainerAttributes},
+    case::{Case, Casing},
+};
 
 #[derive(Debug)]
 pub struct IntoValue;
diff --git a/crates/nu-derive-value/src/lib.rs b/crates/nu-derive-value/src/lib.rs
index 269566fc88..4fa038f2fd 100644
--- a/crates/nu-derive-value/src/lib.rs
+++ b/crates/nu-derive-value/src/lib.rs
@@ -32,6 +32,7 @@ use proc_macro2::TokenStream as TokenStream2;
 use proc_macro_error::{proc_macro_error, Diagnostic};
 
 mod attributes;
+mod case;
 mod error;
 mod from;
 mod into;
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 5a3829bbfe..ead8ee8089 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -23,9 +23,9 @@ bytes = { workspace = true }
 byte-unit = { version = "5.1", features = [ "serde" ] }
 chrono = { workspace = true, features = [ "serde", "std", "unstable-locales" ], default-features = false }
 chrono-humanize = { workspace = true }
-convert_case = { workspace = true }
 dirs = { workspace = true }
 fancy-regex = { workspace = true }
+heck = { workspace = true }
 indexmap = { workspace = true }
 lru = { workspace = true }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
diff --git a/crates/nu-protocol/src/value/from_value.rs b/crates/nu-protocol/src/value/from_value.rs
index 430ff63da4..1b8e9536d7 100644
--- a/crates/nu-protocol/src/value/from_value.rs
+++ b/crates/nu-protocol/src/value/from_value.rs
@@ -22,7 +22,7 @@ use std::{
 /// the struct maps to a corresponding field in the record.
 /// You can customize the case conversion of these field names by using
 /// `#[nu_value(rename_all = "...")]` on the struct.
-/// Supported case conversions include those provided by [`convert_case::Case`], such as
+/// Supported case conversions include those provided by [`heck`], such as
 /// "snake_case", "kebab-case", "PascalCase", and others.
 /// Additionally, all values accepted by
 /// [`#[serde(rename_all = "...")]`](https://serde.rs/container-attrs.html#rename_all) are valid here.
@@ -35,7 +35,7 @@ use std::{
 ///
 /// Only enums with no fields may derive this trait.
 /// The expected value representation will be the name of the variant as a [`Value::String`].
-/// By default, variant names will be expected in ["snake_case"](convert_case::Case::Snake).
+/// By default, variant names will be expected in ["snake_case"](heck::ToSnakeCase).
 /// You can customize the case conversion using `#[nu_value(rename_all = "kebab-case")]` on the enum.
 ///
 /// Additionally, you can use `#[nu_value(type_name = "...")]` in the derive macro to set a custom type name
diff --git a/crates/nu-protocol/src/value/into_value.rs b/crates/nu-protocol/src/value/into_value.rs
index 934525e033..d95de9d96a 100644
--- a/crates/nu-protocol/src/value/into_value.rs
+++ b/crates/nu-protocol/src/value/into_value.rs
@@ -12,8 +12,8 @@ use crate::{Record, ShellError, Span, Value};
 /// [`Value::Record`], where each field of the record corresponds to a field of the struct.
 /// By default, field names will be kept as-is, but you can customize the case conversion
 /// for all fields in a struct by using `#[nu_value(rename_all = "kebab-case")]` on the struct.
-/// All useful case options from [`convert_case::Case`] are supported, as well as the
-/// values allowed by [`#[serde(rename_all)]`](https://serde.rs/container-attrs.html#rename_all).
+/// All case options from [`heck`] are supported, as well as the values allowed by
+/// [`#[serde(rename_all)]`](https://serde.rs/container-attrs.html#rename_all).
 ///
 /// For structs with unnamed fields, the value representation will be [`Value::List`], with all
 /// fields inserted into a list.
@@ -21,7 +21,7 @@ use crate::{Record, ShellError, Span, Value};
 ///
 /// Only enums with no fields may derive this trait.
 /// The resulting value representation will be the name of the variant as a [`Value::String`].
-/// By default, variant names will be converted to ["snake_case"](convert_case::Case::Snake).
+/// By default, variant names will be converted to ["snake_case"](heck::ToSnakeCase).
 /// You can customize the case conversion using `#[nu_value(rename_all = "kebab-case")]` on the enum.
 ///
 /// ```

From 7171c9b84ab80bb11b86de1b0b70eacee6421999 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Aug 2024 13:05:11 +0000
Subject: [PATCH 0384/1072] Bump shadow-rs from 0.31.1 to 0.33.0 (#13713)

---
 Cargo.lock                    | 4 ++--
 crates/nu-cmd-lang/Cargo.toml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0aa064bbdc..089938ed6d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5707,9 +5707,9 @@ dependencies = [
 
 [[package]]
 name = "shadow-rs"
-version = "0.31.1"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02c282402d25101f9c893e9cd7e4cae535fe7db18b81291de973026c219ddf1e"
+checksum = "8a3978e7641f86a78c2f619f9b13bdffb4e43a1d5119f39eb03d1bc5ac61daaf"
 dependencies = [
  "const_format",
  "is_debug",
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index 5ddc67b801..d287e80cc8 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -18,10 +18,10 @@ nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
 nu-utils = { path = "../nu-utils", version = "0.97.2" }
 
 itertools = { workspace = true }
-shadow-rs = { version = "0.31", default-features = false }
+shadow-rs = { version = "0.33", default-features = false }
 
 [build-dependencies]
-shadow-rs = { version = "0.31", default-features = false }
+shadow-rs = { version = "0.33", default-features = false }
 
 [features]
 mimalloc = []

From 2c379cba71a3485a317cf823398f1633e6eaea6a Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Wed, 28 Aug 2024 22:19:13 +0200
Subject: [PATCH 0385/1072] Remove `system-clipboard` from the default build
 (#13694)

# Description
This feature tried to connect reedline with the system clipboard for
three special bindings.
To do so it uses the `arboard` crate with heavy dependencies for the
system X or Wayland server or the Windows APIs. We had issues in the
headless CI with it and builds with musl seem to stall.

Removing it from the default build should negatively impact only a small
subset of users aware of the extra bindings. You can still use the
internal clipboard for binding based selection and the terminals extra
bindings to copy arbitrary content into the system clipboard.

For all other users it removes potential sources of failure and a whole
1 MB of release mode binary size (> 2% reduction). Furthermore a
potentially substantial attack surface for Nushell is gone for default
builds.

- Should resolve #13019
- Work in the spirit of #13603


# User-Facing Changes

The `edit` entries
`copyselectionsystem`/`copyselectionsystem`/`pastesystem` for
keybindings are gone in the default build

If you strictly depend on this behavior, you can still build with the
addition of `--features system-clipboard`
---
 .github/workflows/ci.yml                            | 7 +------
 Cargo.toml                                          | 8 ++++----
 crates/nu-utils/src/sample_config/default_config.nu | 4 +---
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 25fcfde55e..5422b7b9e6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -57,11 +57,6 @@ jobs:
       fail-fast: true
       matrix:
         platform: [windows-latest, macos-latest, ubuntu-20.04]
-        include:
-          - default-flags: ""
-          # linux CI cannot handle clipboard feature
-          - platform: ubuntu-20.04
-            default-flags: "--no-default-features --features=default-no-clipboard"
 
     runs-on: ${{ matrix.platform }}
 
@@ -72,7 +67,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
 
       - name: Tests
-        run: cargo test --workspace --profile ci --exclude nu_plugin_* ${{ matrix.default-flags }}
+        run: cargo test --workspace --profile ci --exclude nu_plugin_*
       - name: Check for clean repo
         shell: bash
         run: |
diff --git a/Cargo.toml b/Cargo.toml
index 2a1b9a0439..22afaccf49 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -248,10 +248,8 @@ plugin = [
   "nu-protocol/plugin",
   "nu-engine/plugin",
 ]
-default = ["default-no-clipboard", "system-clipboard"]
-# Enables convenient omitting of the system-clipboard feature, as it leads to problems in ci on linux
-# See https://github.com/nushell/nushell/pull/11535
-default-no-clipboard = [
+
+default = [
   "plugin",
   "trash-support",
   "sqlite",
@@ -265,6 +263,8 @@ stable = ["default"]
 static-link-openssl = ["dep:openssl", "nu-cmd-lang/static-link-openssl"]
 
 mimalloc = ["nu-cmd-lang/mimalloc", "dep:mimalloc"]
+# Optional system clipboard support in `reedline`, this behavior has problematic compatibility with some systems.
+# Missing X server/ Wayland can cause issues
 system-clipboard = [
   "reedline/system_clipboard",
   "nu-cli/system-clipboard",
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index 5345613d3b..32ddbcf511 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -854,8 +854,6 @@ $env.config = {
         }
         # The following bindings with `*system` events require that Nushell has
         # been compiled with the `system-clipboard` feature.
-        # This should be the case for Windows, macOS, and most Linux distributions
-        # Not available for example on Android (termux)
         # If you want to use the system clipboard for visual selection or to
         # paste directly, uncomment the respective lines and replace the version
         # using the internal clipboard.
@@ -890,4 +888,4 @@ $env.config = {
             event: { edit: selectall }
         }
     ]
-}
\ No newline at end of file
+}

From ae0e13733d09524e9380cd45c47db0d489cfa05e Mon Sep 17 00:00:00 2001
From: Kira <k@cyra.pink>
Date: Wed, 28 Aug 2024 22:53:56 +0200
Subject: [PATCH 0386/1072] Fix parsing record values containing colons
 (#13413)

This PR is an attempt to fix #8257 and fix #10985 (which is
duplicate-ish)

# Description
The parser currently doesn't know how to deal with colons appearing
while lexing whitespace-terminated tokens specifying a record value.
Most notably, this means you can't use datetime literals in record value
position (and as a consequence, `| to nuon | from nuon` roundtrips can
fail), but it also means that bare words containing colons cause a
non-useful error message.

![image](https://github.com/user-attachments/assets/f04a8417-ee18-44e7-90eb-a0ecef943a0f)

`parser::parse_record` calls `lex::lex` with the `:` colon character in
the `special_tokens` argument. This allows colons to terminate record
keys, but as a side effect, it also causes colons to terminate record
*values*. I added a new function `lex::lex_n_tokens`, which allows the
caller to drive the lexing process more explicitly, and used it in
`parser::parse_record` to let colons terminate record keys while not
giving them special treatment when appearing in record values.

This PR description previously said: *Another approach suggested in one
of the issues was to support an additional datetime literal format that
doesn't require colons. I like that that wouldn't require new
`lex::lex_internal` behaviour, but an advantage of my approach is that
it also newly allows for string record values given as bare words
containing colons. I think this eliminates another possible source of
confusion.* It was determined that this is undesirable, and in the
current state of this PR, bare word record values with colons are
rejected explicitly. The better error message is still a win.

# User-Facing Changes
In addition to the above, this PR also disables the use of "special"
(non-item) tokens in record key and value position, and the use of a
single bare `:` as a record key.

Examples of behaviour *before* this PR:
```nu
{ a: b } # Valid, same as { 'a': 'b' }
{ a: b:c } # Error: expected ':'
{ a: 2024-08-13T22:11:09 } # Error: expected ':'
{ :: 1 } # Valid, same as { ':': 1 }
{ ;: 1 } # Valid, same as { ';': 1 }
{ a: || } # Valid, same as { 'a': '||' }
```

Examples of behaviour *after* this PR:
```nu
{ a: b } # (Unchanged) Valid, same as { 'a': 'b' }
{ a: b:c } # Error: colon in bare word specifying record value
{ a: 2024-08-13T22:11:09 } # Valid, same as { a: (2024-08-13T22:11:09) }
{ :: 1 } # Error: colon in bare word specifying record key
{ ;: 1 } # Error: expected item in record key position
{ a: || } # Error: expected item in record value position
```

# Tests + Formatting
I added tests, but I'm not sure if they're sufficient and in the right
place.

# After Submitting
I don't think documentation changes are needed for this, but please let
me know if you disagree.
---
 crates/nu-parser/src/lex.rs           | 140 ++++++++++++++++++--------
 crates/nu-parser/src/lib.rs           |   2 +-
 crates/nu-parser/src/parser.rs        | 110 +++++++++++++++++++-
 crates/nu-parser/tests/test_lex.rs    |  25 ++++-
 crates/nu-parser/tests/test_parser.rs |  53 ++++++++++
 5 files changed, 281 insertions(+), 49 deletions(-)

diff --git a/crates/nu-parser/src/lex.rs b/crates/nu-parser/src/lex.rs
index bad9e94a10..f0802fcd7a 100644
--- a/crates/nu-parser/src/lex.rs
+++ b/crates/nu-parser/src/lex.rs
@@ -447,14 +447,61 @@ pub fn lex_signature(
     special_tokens: &[u8],
     skip_comment: bool,
 ) -> (Vec<Token>, Option<ParseError>) {
-    lex_internal(
+    let mut state = LexState {
         input,
+        output: Vec::new(),
+        error: None,
         span_offset,
+    };
+    lex_internal(
+        &mut state,
         additional_whitespace,
         special_tokens,
         skip_comment,
         true,
-    )
+        None,
+    );
+    (state.output, state.error)
+}
+
+#[derive(Debug)]
+pub struct LexState<'a> {
+    pub input: &'a [u8],
+    pub output: Vec<Token>,
+    pub error: Option<ParseError>,
+    pub span_offset: usize,
+}
+
+/// Lex until the output is `max_tokens` longer than before the call, or until the input is exhausted.
+/// The return value indicates how many tokens the call added to / removed from the output.
+///
+/// The behaviour here is non-obvious when `additional_whitespace` doesn't include newline:
+/// If you pass a `state` where the last token in the output is an Eol, this might *remove* tokens.
+pub fn lex_n_tokens(
+    state: &mut LexState,
+    additional_whitespace: &[u8],
+    special_tokens: &[u8],
+    skip_comment: bool,
+    max_tokens: usize,
+) -> isize {
+    let n_tokens = state.output.len();
+    lex_internal(
+        state,
+        additional_whitespace,
+        special_tokens,
+        skip_comment,
+        false,
+        Some(max_tokens),
+    );
+    // If this lex_internal call reached the end of the input, there may now be fewer tokens
+    // in the output than before.
+    let tokens_n_diff = (state.output.len() as isize) - (n_tokens as isize);
+    let next_offset = state.output.last().map(|token| token.span.end);
+    if let Some(next_offset) = next_offset {
+        state.input = &state.input[next_offset - state.span_offset..];
+        state.span_offset = next_offset;
+    }
+    tokens_n_diff
 }
 
 pub fn lex(
@@ -464,33 +511,43 @@ pub fn lex(
     special_tokens: &[u8],
     skip_comment: bool,
 ) -> (Vec<Token>, Option<ParseError>) {
-    lex_internal(
+    let mut state = LexState {
         input,
+        output: Vec::new(),
+        error: None,
         span_offset,
+    };
+    lex_internal(
+        &mut state,
         additional_whitespace,
         special_tokens,
         skip_comment,
         false,
-    )
+        None,
+    );
+    (state.output, state.error)
 }
 
 fn lex_internal(
-    input: &[u8],
-    span_offset: usize,
+    state: &mut LexState,
     additional_whitespace: &[u8],
     special_tokens: &[u8],
     skip_comment: bool,
     // within signatures we want to treat `<` and `>` specially
     in_signature: bool,
-) -> (Vec<Token>, Option<ParseError>) {
-    let mut error = None;
+    max_tokens: Option<usize>,
+) {
+    let initial_output_len = state.output.len();
 
     let mut curr_offset = 0;
 
-    let mut output = vec![];
     let mut is_complete = true;
-
-    while let Some(c) = input.get(curr_offset) {
+    while let Some(c) = state.input.get(curr_offset) {
+        if max_tokens
+            .is_some_and(|max_tokens| state.output.len() >= initial_output_len + max_tokens)
+        {
+            break;
+        }
         let c = *c;
         if c == b'|' {
             // If the next character is `|`, it's either `|` or `||`.
@@ -499,13 +556,13 @@ fn lex_internal(
             curr_offset += 1;
 
             // If the next character is `|`, we're looking at a `||`.
-            if let Some(c) = input.get(curr_offset) {
+            if let Some(c) = state.input.get(curr_offset) {
                 if *c == b'|' {
                     let idx = curr_offset;
                     curr_offset += 1;
-                    output.push(Token::new(
+                    state.output.push(Token::new(
                         TokenContents::PipePipe,
-                        Span::new(span_offset + prev_idx, span_offset + idx + 1),
+                        Span::new(state.span_offset + prev_idx, state.span_offset + idx + 1),
                     ));
                     continue;
                 }
@@ -515,12 +572,12 @@ fn lex_internal(
 
             // Before we push, check to see if the previous character was a newline.
             // If so, then this is a continuation of the previous line
-            if let Some(prev) = output.last_mut() {
+            if let Some(prev) = state.output.last_mut() {
                 match prev.contents {
                     TokenContents::Eol => {
                         *prev = Token::new(
                             TokenContents::Pipe,
-                            Span::new(span_offset + idx, span_offset + idx + 1),
+                            Span::new(state.span_offset + idx, state.span_offset + idx + 1),
                         );
                         // And this is a continuation of the previous line if previous line is a
                         // comment line (combined with EOL + Comment)
@@ -528,12 +585,12 @@ fn lex_internal(
                         // Initially, the last one token is TokenContents::Pipe, we don't need to
                         // check it, so the beginning offset is 2.
                         let mut offset = 2;
-                        while output.len() > offset {
-                            let index = output.len() - offset;
-                            if output[index].contents == TokenContents::Comment
-                                && output[index - 1].contents == TokenContents::Eol
+                        while state.output.len() > offset {
+                            let index = state.output.len() - offset;
+                            if state.output[index].contents == TokenContents::Comment
+                                && state.output[index - 1].contents == TokenContents::Eol
                             {
-                                output.remove(index - 1);
+                                state.output.remove(index - 1);
                                 offset += 1;
                             } else {
                                 break;
@@ -541,16 +598,16 @@ fn lex_internal(
                         }
                     }
                     _ => {
-                        output.push(Token::new(
+                        state.output.push(Token::new(
                             TokenContents::Pipe,
-                            Span::new(span_offset + idx, span_offset + idx + 1),
+                            Span::new(state.span_offset + idx, state.span_offset + idx + 1),
                         ));
                     }
                 }
             } else {
-                output.push(Token::new(
+                state.output.push(Token::new(
                     TokenContents::Pipe,
-                    Span::new(span_offset + idx, span_offset + idx + 1),
+                    Span::new(state.span_offset + idx, state.span_offset + idx + 1),
                 ));
             }
 
@@ -558,17 +615,17 @@ fn lex_internal(
         } else if c == b';' {
             // If the next character is a `;`, we're looking at a semicolon token.
 
-            if !is_complete && error.is_none() {
-                error = Some(ParseError::ExtraTokens(Span::new(
+            if !is_complete && state.error.is_none() {
+                state.error = Some(ParseError::ExtraTokens(Span::new(
                     curr_offset,
                     curr_offset + 1,
                 )));
             }
             let idx = curr_offset;
             curr_offset += 1;
-            output.push(Token::new(
+            state.output.push(Token::new(
                 TokenContents::Semicolon,
-                Span::new(span_offset + idx, span_offset + idx + 1),
+                Span::new(state.span_offset + idx, state.span_offset + idx + 1),
             ));
         } else if c == b'\r' {
             // Ignore a stand-alone carriage return
@@ -578,9 +635,9 @@ fn lex_internal(
             let idx = curr_offset;
             curr_offset += 1;
             if !additional_whitespace.contains(&c) {
-                output.push(Token::new(
+                state.output.push(Token::new(
                     TokenContents::Eol,
-                    Span::new(span_offset + idx, span_offset + idx + 1),
+                    Span::new(state.span_offset + idx, state.span_offset + idx + 1),
                 ));
             }
         } else if c == b'#' {
@@ -588,12 +645,12 @@ fn lex_internal(
             // comment. The comment continues until the next newline.
             let mut start = curr_offset;
 
-            while let Some(input) = input.get(curr_offset) {
+            while let Some(input) = state.input.get(curr_offset) {
                 if *input == b'\n' {
                     if !skip_comment {
-                        output.push(Token::new(
+                        state.output.push(Token::new(
                             TokenContents::Comment,
-                            Span::new(span_offset + start, span_offset + curr_offset),
+                            Span::new(state.span_offset + start, state.span_offset + curr_offset),
                         ));
                     }
                     start = curr_offset;
@@ -604,9 +661,9 @@ fn lex_internal(
                 }
             }
             if start != curr_offset && !skip_comment {
-                output.push(Token::new(
+                state.output.push(Token::new(
                     TokenContents::Comment,
-                    Span::new(span_offset + start, span_offset + curr_offset),
+                    Span::new(state.span_offset + start, state.span_offset + curr_offset),
                 ));
             }
         } else if c == b' ' || c == b'\t' || additional_whitespace.contains(&c) {
@@ -614,21 +671,20 @@ fn lex_internal(
             curr_offset += 1;
         } else {
             let (token, err) = lex_item(
-                input,
+                state.input,
                 &mut curr_offset,
-                span_offset,
+                state.span_offset,
                 additional_whitespace,
                 special_tokens,
                 in_signature,
             );
-            if error.is_none() {
-                error = err;
+            if state.error.is_none() {
+                state.error = err;
             }
             is_complete = true;
-            output.push(token);
+            state.output.push(token);
         }
     }
-    (output, error)
 }
 
 /// True if this the start of a redirection. Does not match `>>` or `>|` forms.
diff --git a/crates/nu-parser/src/lib.rs b/crates/nu-parser/src/lib.rs
index 8f871aa815..c5d69cb270 100644
--- a/crates/nu-parser/src/lib.rs
+++ b/crates/nu-parser/src/lib.rs
@@ -16,7 +16,7 @@ pub use flatten::{
     flatten_block, flatten_expression, flatten_pipeline, flatten_pipeline_element, FlatShape,
 };
 pub use known_external::KnownExternal;
-pub use lex::{lex, lex_signature, Token, TokenContents};
+pub use lex::{lex, lex_n_tokens, lex_signature, LexState, Token, TokenContents};
 pub use lite_parser::{lite_parse, LiteBlock, LiteCommand};
 pub use nu_protocol::parser_path::*;
 pub use parse_keywords::*;
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index b9147ed7f9..3a84defe95 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -1,5 +1,5 @@
 use crate::{
-    lex::{is_assignment_operator, lex, lex_signature},
+    lex::{is_assignment_operator, lex, lex_n_tokens, lex_signature, LexState},
     lite_parser::{lite_parse, LiteCommand, LitePipeline, LiteRedirection, LiteRedirectionTarget},
     parse_keywords::*,
     parse_patterns::parse_pattern,
@@ -5650,6 +5650,49 @@ pub fn parse_builtin_commands(
     }
 }
 
+fn check_record_key_or_value(
+    working_set: &StateWorkingSet,
+    expr: &Expression,
+    position: &str,
+) -> Option<ParseError> {
+    let bareword_error = |string_value: &Expression| {
+        working_set
+            .get_span_contents(string_value.span)
+            .iter()
+            .find_position(|b| **b == b':')
+            .map(|(i, _)| {
+                let colon_position = i + string_value.span.start;
+                ParseError::InvalidLiteral(
+                    "colon".to_string(),
+                    format!("bare word specifying record {}", position),
+                    Span::new(colon_position, colon_position + 1),
+                )
+            })
+    };
+    let value_span = working_set.get_span_contents(expr.span);
+    match expr.expr {
+        Expr::String(_) => {
+            if ![b'"', b'\'', b'`'].contains(&value_span[0]) {
+                bareword_error(expr)
+            } else {
+                None
+            }
+        }
+        Expr::StringInterpolation(ref expressions) => {
+            if value_span[0] != b'$' {
+                expressions
+                    .iter()
+                    .filter(|expr| matches!(expr.expr, Expr::String(_)))
+                    .filter_map(bareword_error)
+                    .next()
+            } else {
+                None
+            }
+        }
+        _ => None,
+    }
+}
+
 pub fn parse_record(working_set: &mut StateWorkingSet, span: Span) -> Expression {
     let bytes = working_set.get_span_contents(span);
 
@@ -5670,9 +5713,32 @@ pub fn parse_record(working_set: &mut StateWorkingSet, span: Span) -> Expression
     }
 
     let inner_span = Span::new(start, end);
-    let source = working_set.get_span_contents(inner_span);
 
-    let (tokens, err) = lex(source, start, &[b'\n', b'\r', b','], &[b':'], true);
+    let mut lex_state = LexState {
+        input: working_set.get_span_contents(inner_span),
+        output: Vec::new(),
+        error: None,
+        span_offset: start,
+    };
+    let mut lex_n = |additional_whitespace, special_tokens, max_tokens| {
+        lex_n_tokens(
+            &mut lex_state,
+            additional_whitespace,
+            special_tokens,
+            true,
+            max_tokens,
+        )
+    };
+    loop {
+        if lex_n(&[b'\n', b'\r', b','], &[b':'], 2) < 2 {
+            break;
+        };
+        if lex_n(&[b'\n', b'\r', b','], &[], 1) < 1 {
+            break;
+        };
+    }
+    let (tokens, err) = (lex_state.output, lex_state.error);
+
     if let Some(err) = err {
         working_set.error(err);
     }
@@ -5716,7 +5782,22 @@ pub fn parse_record(working_set: &mut StateWorkingSet, span: Span) -> Expression
             ));
         } else {
             // Normal key-value pair
-            let field = parse_value(working_set, curr_span, &SyntaxShape::Any);
+            let field_token = &tokens[idx];
+            let field = if field_token.contents != TokenContents::Item {
+                working_set.error(ParseError::Expected(
+                    "item in record key position",
+                    Span::new(field_token.span.start, field_token.span.end),
+                ));
+                garbage(working_set, curr_span)
+            } else {
+                let field = parse_value(working_set, curr_span, &SyntaxShape::Any);
+                if let Some(error) = check_record_key_or_value(working_set, &field, "key") {
+                    working_set.error(error);
+                    garbage(working_set, field.span)
+                } else {
+                    field
+                }
+            };
 
             idx += 1;
             if idx == tokens.len() {
@@ -5761,7 +5842,26 @@ pub fn parse_record(working_set: &mut StateWorkingSet, span: Span) -> Expression
                 ));
                 break;
             }
-            let value = parse_value(working_set, tokens[idx].span, &SyntaxShape::Any);
+
+            let value_token = &tokens[idx];
+            let value = if value_token.contents != TokenContents::Item {
+                working_set.error(ParseError::Expected(
+                    "item in record value position",
+                    Span::new(value_token.span.start, value_token.span.end),
+                ));
+                garbage(
+                    working_set,
+                    Span::new(value_token.span.start, value_token.span.end),
+                )
+            } else {
+                let value = parse_value(working_set, tokens[idx].span, &SyntaxShape::Any);
+                if let Some(parse_error) = check_record_key_or_value(working_set, &value, "value") {
+                    working_set.error(parse_error);
+                    garbage(working_set, value.span)
+                } else {
+                    value
+                }
+            };
             idx += 1;
 
             if let Some(field) = field.as_string() {
diff --git a/crates/nu-parser/tests/test_lex.rs b/crates/nu-parser/tests/test_lex.rs
index 07470a310e..22fe4c4715 100644
--- a/crates/nu-parser/tests/test_lex.rs
+++ b/crates/nu-parser/tests/test_lex.rs
@@ -1,4 +1,4 @@
-use nu_parser::{lex, lex_signature, Token, TokenContents};
+use nu_parser::{lex, lex_n_tokens, lex_signature, LexState, Token, TokenContents};
 use nu_protocol::{ParseError, Span};
 
 #[test]
@@ -281,3 +281,26 @@ fn lex_comments() {
         }
     );
 }
+
+#[test]
+fn lex_manually() {
+    let file = b"'a'\n#comment\n#comment again\n| continue";
+    let mut lex_state = LexState {
+        input: file,
+        output: Vec::new(),
+        error: None,
+        span_offset: 10,
+    };
+    assert_eq!(lex_n_tokens(&mut lex_state, &[], &[], false, 1), 1);
+    assert_eq!(lex_state.output.len(), 1);
+    assert_eq!(lex_n_tokens(&mut lex_state, &[], &[], false, 5), 5);
+    assert_eq!(lex_state.output.len(), 6);
+    // Next token is the pipe.
+    // This shortens the output because it exhausts the input before it can
+    // compensate for the EOL tokens lost to the line continuation
+    assert_eq!(lex_n_tokens(&mut lex_state, &[], &[], false, 1), -1);
+    assert_eq!(lex_state.output.len(), 5);
+    assert_eq!(file.len(), lex_state.span_offset - 10);
+    let last_span = lex_state.output.last().unwrap().span;
+    assert_eq!(&file[last_span.start - 10..last_span.end - 10], b"continue");
+}
diff --git a/crates/nu-parser/tests/test_parser.rs b/crates/nu-parser/tests/test_parser.rs
index ed0a288a47..973ba1b689 100644
--- a/crates/nu-parser/tests/test_parser.rs
+++ b/crates/nu-parser/tests/test_parser.rs
@@ -2478,3 +2478,56 @@ mod operator {
         );
     }
 }
+
+mod record {
+    use super::*;
+
+    use nu_protocol::ast::RecordItem;
+
+    #[rstest]
+    #[case(b"{ :: x }", "Invalid literal")] // Key is bare colon
+    #[case(b"{ a: x:y }", "Invalid literal")] // Value is bare word with colon
+    #[case(b"{ a: x('y'):z }", "Invalid literal")] // Value is bare string interpolation with colon
+    #[case(b"{ ;: x }", "Parse mismatch during operation.")] // Key is a non-item token
+    #[case(b"{ a: || }", "Parse mismatch during operation.")] // Value is a non-item token
+    fn refuse_confusing_record(#[case] expr: &[u8], #[case] error: &str) {
+        dbg!(String::from_utf8_lossy(expr));
+        let engine_state = EngineState::new();
+        let mut working_set = StateWorkingSet::new(&engine_state);
+        parse(&mut working_set, None, expr, false);
+        assert_eq!(
+            working_set.parse_errors.first().map(|e| e.to_string()),
+            Some(error.to_string())
+        );
+    }
+
+    #[rstest]
+    #[case(b"{ a: 2024-07-23T22:54:54.532100627+02:00 b:xy }")]
+    fn parse_datetime_in_record(#[case] expr: &[u8]) {
+        dbg!(String::from_utf8_lossy(expr));
+        let engine_state = EngineState::new();
+        let mut working_set = StateWorkingSet::new(&engine_state);
+        let block = parse(&mut working_set, None, expr, false);
+        assert!(working_set.parse_errors.first().is_none());
+        let pipeline_el_expr = &block
+            .pipelines
+            .first()
+            .unwrap()
+            .elements
+            .first()
+            .unwrap()
+            .expr
+            .expr;
+        dbg!(pipeline_el_expr);
+        match pipeline_el_expr {
+            Expr::FullCellPath(v) => match &v.head.expr {
+                Expr::Record(fields) => assert!(matches!(
+                    fields[0],
+                    RecordItem::Pair(_, Expression { ty: Type::Date, .. })
+                )),
+                _ => panic!("Expected record head"),
+            },
+            _ => panic!("Expected full cell path"),
+        }
+    }
+}

From f58a4b501715bb1c0a6f19b982b5954e4f520f7b Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Thu, 29 Aug 2024 00:01:26 +0300
Subject: [PATCH 0387/1072] Add split cell-path (#13705)

this PR should close #12168

# Description
Add `split cell-path`, inverse of `into cell-path`.

# User-Facing Changes
Currently there is no way to make use of cell-path values as a user,
other than passing them to builtin commands. This PR makes more use
cases possible.
---
 crates/nu-command/src/conversions/mod.rs      |   2 +
 .../src/conversions/split_cell_path.rs        | 161 ++++++++++++++++++
 crates/nu-command/src/default_context.rs      |   1 +
 3 files changed, 164 insertions(+)
 create mode 100644 crates/nu-command/src/conversions/split_cell_path.rs

diff --git a/crates/nu-command/src/conversions/mod.rs b/crates/nu-command/src/conversions/mod.rs
index 8c34392d57..b67c77936f 100644
--- a/crates/nu-command/src/conversions/mod.rs
+++ b/crates/nu-command/src/conversions/mod.rs
@@ -1,5 +1,7 @@
 mod fill;
 pub(crate) mod into;
+mod split_cell_path;
 
 pub use fill::Fill;
 pub use into::*;
+pub use split_cell_path::SubCommand as SplitCellPath;
diff --git a/crates/nu-command/src/conversions/split_cell_path.rs b/crates/nu-command/src/conversions/split_cell_path.rs
new file mode 100644
index 0000000000..c66481bffd
--- /dev/null
+++ b/crates/nu-command/src/conversions/split_cell_path.rs
@@ -0,0 +1,161 @@
+use nu_engine::command_prelude::*;
+use nu_protocol::{ast::PathMember, IntoValue};
+
+#[derive(Clone)]
+pub struct SubCommand;
+
+impl Command for SubCommand {
+    fn name(&self) -> &str {
+        "split cell-path"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .input_output_types(vec![
+                (Type::CellPath, Type::List(Box::new(Type::Any))),
+                (
+                    Type::CellPath,
+                    Type::List(Box::new(Type::Record(
+                        [("value".into(), Type::Any), ("optional".into(), Type::Bool)].into(),
+                    ))),
+                ),
+            ])
+            .category(Category::Conversions)
+            .allow_variants_without_examples(true)
+    }
+
+    fn description(&self) -> &str {
+        "Split a cell-path into its components."
+    }
+
+    fn search_terms(&self) -> Vec<&str> {
+        vec!["convert"]
+    }
+
+    fn run(
+        &self,
+        _engine_state: &EngineState,
+        _stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let head = call.head;
+
+        let src_span = match input {
+            // Early return on correct type and empty pipeline
+            PipelineData::Value(Value::CellPath { val, .. }, _) => {
+                return Ok(split_cell_path(val, head)?.into_pipeline_data())
+            }
+            PipelineData::Empty => return Err(ShellError::PipelineEmpty { dst_span: head }),
+
+            // Extract span from incorrect pipeline types
+            // NOTE: Match arms can't be combined, `stream`s are of different types
+            PipelineData::Value(other, _) => other.span(),
+            PipelineData::ListStream(stream, ..) => stream.span(),
+            PipelineData::ByteStream(stream, ..) => stream.span(),
+        };
+        Err(ShellError::PipelineMismatch {
+            exp_input_type: "cell-path".into(),
+            dst_span: head,
+            src_span,
+        })
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Split a cell-path into its components",
+                example: "$.5?.c | split cell-path",
+                result: Some(Value::test_list(vec![
+                    Value::test_record(record! {
+                        "value" => Value::test_int(5),
+                        "optional" => Value::test_bool(true),
+                    }),
+                    Value::test_record(record! {
+                        "value" => Value::test_string("c"),
+                        "optional" => Value::test_bool(false),
+                    }),
+                ])),
+            },
+            Example {
+                description: "Split a complex cell-path",
+                example: r#"$.a.b?.1."2"."c.d" | split cell-path"#,
+                result: Some(Value::test_list(vec![
+                    Value::test_record(record! {
+                        "value" => Value::test_string("a"),
+                        "optional" => Value::test_bool(false),
+                    }),
+                    Value::test_record(record! {
+                        "value" => Value::test_string("b"),
+                        "optional" => Value::test_bool(true),
+                    }),
+                    Value::test_record(record! {
+                        "value" => Value::test_int(1),
+                        "optional" => Value::test_bool(false),
+                    }),
+                    Value::test_record(record! {
+                        "value" => Value::test_string("2"),
+                        "optional" => Value::test_bool(false),
+                    }),
+                    Value::test_record(record! {
+                        "value" => Value::test_string("c.d"),
+                        "optional" => Value::test_bool(false),
+                    }),
+                ])),
+            },
+        ]
+    }
+}
+
+fn split_cell_path(val: CellPath, span: Span) -> Result<Value, ShellError> {
+    #[derive(IntoValue)]
+    struct PathMemberRecord {
+        value: Value,
+        optional: bool,
+    }
+
+    impl PathMemberRecord {
+        fn from_path_member(pm: PathMember) -> Self {
+            let (optional, internal_span) = match pm {
+                PathMember::String { optional, span, .. }
+                | PathMember::Int { optional, span, .. } => (optional, span),
+            };
+            let value = match pm {
+                PathMember::String { val, .. } => Value::String { val, internal_span },
+                PathMember::Int { val, .. } => Value::Int {
+                    val: val as i64,
+                    internal_span,
+                },
+            };
+            Self { value, optional }
+        }
+    }
+
+    let members = val
+        .members
+        .into_iter()
+        .map(|pm| {
+            let span = match pm {
+                PathMember::String { span, .. } | PathMember::Int { span, .. } => span,
+            };
+            PathMemberRecord::from_path_member(pm).into_value(span)
+        })
+        .collect();
+
+    Ok(Value::List {
+        vals: members,
+        internal_span: span,
+    })
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_examples() {
+        use crate::test_examples;
+
+        test_examples(SubCommand {})
+    }
+}
diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index d98ac41f53..bf16c05e36 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -326,6 +326,7 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             IntoString,
             IntoGlob,
             IntoValue,
+            SplitCellPath,
         };
 
         // Env

From 644bebf4c61ab59d8979e41f23df5116924ebb22 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Wed, 28 Aug 2024 14:08:16 -0700
Subject: [PATCH 0388/1072] Expression support for `polars uppercase` and
 `polars lowercase` (#13724)

---
 .../dataframe/series/string/to_lowercase.rs   | 111 +++++++++++++-----
 .../dataframe/series/string/to_uppercase.rs   | 111 +++++++++++++-----
 2 files changed, 166 insertions(+), 56 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/to_lowercase.rs b/crates/nu_plugin_polars/src/dataframe/series/string/to_lowercase.rs
index f12ece825c..972446214a 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/string/to_lowercase.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/string/to_lowercase.rs
@@ -1,4 +1,9 @@
-use crate::{values::CustomValueSupport, PolarsPlugin};
+use crate::{
+    values::{
+        cant_convert_err, CustomValueSupport, NuExpression, PolarsPluginObject, PolarsPluginType,
+    },
+    PolarsPlugin,
+};
 
 use super::super::super::values::{Column, NuDataFrame};
 
@@ -24,33 +29,58 @@ impl PluginCommand for ToLowerCase {
 
     fn signature(&self) -> Signature {
         Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
+            .input_output_types(vec![
+                (
+                    Type::Custom("dataframe".into()),
+                    Type::Custom("dataframe".into()),
+                ),
+                (
+                    Type::Custom("expression".into()),
+                    Type::Custom("expression".into()),
+                ),
+            ])
             .category(Category::Custom("dataframe".into()))
     }
 
     fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Modifies strings to lowercase",
-            example: "[Abc aBc abC] | polars into-df | polars lowercase",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![
-                            Value::test_string("abc"),
-                            Value::test_string("abc"),
-                            Value::test_string("abc"),
-                        ],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
+        vec![
+            Example {
+                description: "Modifies strings in a column to lowercase",
+                example: "[[a]; [Abc]] | polars into-df | polars select (polars col a | polars lowercase) | polars collect",
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![Column::new(
+                            "a".to_string(),
+                            vec![
+                                Value::test_string("abc"),
+                            ],
+                        )],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+            Example {
+                description: "Modifies strings to lowercase",
+                example: "[Abc aBc abC] | polars into-df | polars lowercase",
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![Column::new(
+                            "0".to_string(),
+                            vec![
+                                Value::test_string("abc"),
+                                Value::test_string("abc"),
+                                Value::test_string("abc"),
+                            ],
+                        )],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+        ]
     }
 
     fn run(
@@ -60,17 +90,42 @@ impl PluginCommand for ToLowerCase {
         call: &EvaluatedCall,
         input: PipelineData,
     ) -> Result<PipelineData, LabeledError> {
-        command(plugin, engine, call, input).map_err(LabeledError::from)
+        let value = input.into_value(call.head)?;
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuDataFrame(df) => command_df(plugin, engine, call, df),
+            PolarsPluginObject::NuLazyFrame(lazy) => {
+                command_df(plugin, engine, call, lazy.collect(call.head)?)
+            }
+            PolarsPluginObject::NuExpression(expr) => command_expr(plugin, engine, call, expr),
+            _ => Err(cant_convert_err(
+                &value,
+                &[
+                    PolarsPluginType::NuDataFrame,
+                    PolarsPluginType::NuLazyFrame,
+                    PolarsPluginType::NuExpression,
+                ],
+            )),
+        }
+        .map_err(LabeledError::from)
     }
 }
 
-fn command(
+fn command_expr(
     plugin: &PolarsPlugin,
     engine: &EngineInterface,
     call: &EvaluatedCall,
-    input: PipelineData,
+    expr: NuExpression,
+) -> Result<PipelineData, ShellError> {
+    let res: NuExpression = expr.into_polars().str().to_lowercase().into();
+    res.to_pipeline_data(plugin, engine, call.head)
+}
+
+fn command_df(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    df: NuDataFrame,
 ) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
     let series = df.as_series(call.head)?;
 
     let casted = series.str().map_err(|e| ShellError::GenericError {
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/to_uppercase.rs b/crates/nu_plugin_polars/src/dataframe/series/string/to_uppercase.rs
index e252656d46..b973c0fb30 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/string/to_uppercase.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/string/to_uppercase.rs
@@ -1,4 +1,9 @@
-use crate::{values::CustomValueSupport, PolarsPlugin};
+use crate::{
+    values::{
+        cant_convert_err, CustomValueSupport, NuExpression, PolarsPluginObject, PolarsPluginType,
+    },
+    PolarsPlugin,
+};
 
 use super::super::super::values::{Column, NuDataFrame};
 
@@ -28,33 +33,58 @@ impl PluginCommand for ToUpperCase {
 
     fn signature(&self) -> Signature {
         Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
+            .input_output_types(vec![
+                (
+                    Type::Custom("dataframe".into()),
+                    Type::Custom("dataframe".into()),
+                ),
+                (
+                    Type::Custom("expression".into()),
+                    Type::Custom("expression".into()),
+                ),
+            ])
             .category(Category::Custom("dataframe".into()))
     }
 
     fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Modifies strings to uppercase",
-            example: "[Abc aBc abC] | polars into-df | polars uppercase",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![
-                            Value::test_string("ABC"),
-                            Value::test_string("ABC"),
-                            Value::test_string("ABC"),
-                        ],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
+        vec![
+            Example {
+                description: "Modifies strings in a column to uppercase",
+                example: "[[a]; [Abc]] | polars into-df | polars select (polars col a | polars uppercase) | polars collect",
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![Column::new(
+                            "a".to_string(),
+                            vec![
+                                Value::test_string("ABC"),
+                            ],
+                        )],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+            Example {
+                description: "Modifies strings to uppercase",
+                example: "[Abc aBc abC] | polars into-df | polars uppercase",
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![Column::new(
+                            "0".to_string(),
+                            vec![
+                                Value::test_string("ABC"),
+                                Value::test_string("ABC"),
+                                Value::test_string("ABC"),
+                            ],
+                        )],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+        ]
     }
 
     fn run(
@@ -64,17 +94,42 @@ impl PluginCommand for ToUpperCase {
         call: &EvaluatedCall,
         input: PipelineData,
     ) -> Result<PipelineData, LabeledError> {
-        command(plugin, engine, call, input).map_err(LabeledError::from)
+        let value = input.into_value(call.head)?;
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuDataFrame(df) => command_df(plugin, engine, call, df),
+            PolarsPluginObject::NuLazyFrame(lazy) => {
+                command_df(plugin, engine, call, lazy.collect(call.head)?)
+            }
+            PolarsPluginObject::NuExpression(expr) => command_expr(plugin, engine, call, expr),
+            _ => Err(cant_convert_err(
+                &value,
+                &[
+                    PolarsPluginType::NuDataFrame,
+                    PolarsPluginType::NuLazyFrame,
+                    PolarsPluginType::NuExpression,
+                ],
+            )),
+        }
+        .map_err(LabeledError::from)
     }
 }
 
-fn command(
+fn command_expr(
     plugin: &PolarsPlugin,
     engine: &EngineInterface,
     call: &EvaluatedCall,
-    input: PipelineData,
+    expr: NuExpression,
+) -> Result<PipelineData, ShellError> {
+    let res: NuExpression = expr.into_polars().str().to_uppercase().into();
+    res.to_pipeline_data(plugin, engine, call.head)
+}
+
+fn command_df(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    df: NuDataFrame,
 ) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
     let series = df.as_series(call.head)?;
 
     let casted = series.str().map_err(|e| ShellError::GenericError {

From 84e1ac27e5ac80398ff428e1476968e1c42f7c2f Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Wed, 28 Aug 2024 23:37:17 +0200
Subject: [PATCH 0389/1072] Setup global `cargo` lint configuration (#13691)

# Description
`cargo` somewhat recently gained the capability to store `lints`
settings for the crate and workspace, that can override the defaults
from `rustc` and `clippy` lints. This means we can enforce some lints
without having to actively pass them to clippy via `cargo clippy -- -W
...`. So users just forking the repo have an easier time to follow
similar requirements like our CI.

## Limitation

An exception that remains is that those lints apply to both the primary
code base and the tests. Thus we can't include e.g. `unwrap_used`
without generating noise in the tests. Here the setup in the CI remains
the most helpful.

## Included lints

- Add `clippy::unchecked_duration_subtraction` (added by #12549)
# User-Facing Changes
Running `cargo clippy --workspace` should be closer to the CI. This has
benefits for editor configured runs of clippy and saves you from having
to use `toolkit` to be close to CI in more cases.
---
 Cargo.toml                               | 8 ++++++++
 crates/nu-cli/Cargo.toml                 | 5 ++++-
 crates/nu-cmd-base/Cargo.toml            | 5 ++++-
 crates/nu-cmd-extra/Cargo.toml           | 5 ++++-
 crates/nu-cmd-lang/Cargo.toml            | 5 ++++-
 crates/nu-cmd-plugin/Cargo.toml          | 5 ++++-
 crates/nu-color-config/Cargo.toml        | 5 ++++-
 crates/nu-command/Cargo.toml             | 3 +++
 crates/nu-derive-value/Cargo.toml        | 5 ++++-
 crates/nu-engine/Cargo.toml              | 5 ++++-
 crates/nu-explore/Cargo.toml             | 5 ++++-
 crates/nu-glob/Cargo.toml                | 5 ++++-
 crates/nu-json/Cargo.toml                | 5 ++++-
 crates/nu-lsp/Cargo.toml                 | 5 ++++-
 crates/nu-parser/Cargo.toml              | 5 ++++-
 crates/nu-path/Cargo.toml                | 5 ++++-
 crates/nu-plugin-core/Cargo.toml         | 5 ++++-
 crates/nu-plugin-engine/Cargo.toml       | 5 ++++-
 crates/nu-plugin-engine/src/gc.rs        | 5 +++--
 crates/nu-plugin-protocol/Cargo.toml     | 5 ++++-
 crates/nu-plugin-test-support/Cargo.toml | 5 ++++-
 crates/nu-plugin/Cargo.toml              | 5 ++++-
 crates/nu-pretty-hex/Cargo.toml          | 5 ++++-
 crates/nu-protocol/Cargo.toml            | 5 ++++-
 crates/nu-std/Cargo.toml                 | 5 ++++-
 crates/nu-system/Cargo.toml              | 5 ++++-
 crates/nu-table/Cargo.toml               | 5 ++++-
 crates/nu-term-grid/Cargo.toml           | 5 ++++-
 crates/nu-test-support/Cargo.toml        | 5 ++++-
 crates/nu-utils/Cargo.toml               | 5 ++++-
 crates/nuon/Cargo.toml                   | 5 ++++-
 31 files changed, 126 insertions(+), 30 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 22afaccf49..19f12d9a5a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -180,6 +180,14 @@ windows = "0.54"
 windows-sys = "0.48"
 winreg = "0.52"
 
+[workspace.lints.clippy]
+# Warning: workspace lints affect library code as well as tests, so don't enable lints that would be too noisy in tests like that.
+# todo = "warn"
+unchecked_duration_subtraction = "warn"
+
+[lints]
+workspace = true
+
 [dependencies]
 nu-cli = { path = "./crates/nu-cli", version = "0.97.2" }
 nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.97.2" }
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index f392d3b9d9..2e357b0932 100644
--- a/crates/nu-cli/Cargo.toml
+++ b/crates/nu-cli/Cargo.toml
@@ -46,4 +46,7 @@ which = { workspace = true }
 
 [features]
 plugin = ["nu-plugin-engine"]
-system-clipboard = ["reedline/system_clipboard"]
\ No newline at end of file
+system-clipboard = ["reedline/system_clipboard"]
+
+[lints]
+workspace = true
diff --git a/crates/nu-cmd-base/Cargo.toml b/crates/nu-cmd-base/Cargo.toml
index 89ea225f28..afc75c336d 100644
--- a/crates/nu-cmd-base/Cargo.toml
+++ b/crates/nu-cmd-base/Cargo.toml
@@ -9,6 +9,9 @@ version = "0.97.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[lints]
+workspace = true
+
 [dependencies]
 nu-engine = { path = "../nu-engine", version = "0.97.2" }
 nu-parser = { path = "../nu-parser", version = "0.97.2" }
@@ -18,4 +21,4 @@ nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
 indexmap = { workspace = true }
 miette = { workspace = true }
 
-[dev-dependencies]
\ No newline at end of file
+[dev-dependencies]
diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml
index fae6568eaf..bc5a2343b5 100644
--- a/crates/nu-cmd-extra/Cargo.toml
+++ b/crates/nu-cmd-extra/Cargo.toml
@@ -12,6 +12,9 @@ version = "0.97.2"
 [lib]
 bench = false
 
+[lints]
+workspace = true
+
 [dependencies]
 nu-cmd-base = { path = "../nu-cmd-base", version = "0.97.2" }
 nu-engine = { path = "../nu-engine", version = "0.97.2" }
@@ -35,4 +38,4 @@ itertools = { workspace = true }
 [dev-dependencies]
 nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.2" }
 nu-command = { path = "../nu-command", version = "0.97.2" }
-nu-test-support = { path = "../nu-test-support", version = "0.97.2" }
\ No newline at end of file
+nu-test-support = { path = "../nu-test-support", version = "0.97.2" }
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index d287e80cc8..b248ad836a 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -11,6 +11,9 @@ version = "0.97.2"
 [lib]
 bench = false
 
+[lints]
+workspace = true
+
 [dependencies]
 nu-engine = { path = "../nu-engine", version = "0.97.2" }
 nu-parser = { path = "../nu-parser", version = "0.97.2" }
@@ -28,4 +31,4 @@ mimalloc = []
 trash-support = []
 sqlite = []
 static-link-openssl = []
-system-clipboard = []
\ No newline at end of file
+system-clipboard = []
diff --git a/crates/nu-cmd-plugin/Cargo.toml b/crates/nu-cmd-plugin/Cargo.toml
index 28c6abf8bc..6442e97879 100644
--- a/crates/nu-cmd-plugin/Cargo.toml
+++ b/crates/nu-cmd-plugin/Cargo.toml
@@ -9,6 +9,9 @@ version = "0.97.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[lints]
+workspace = true
+
 [dependencies]
 nu-engine = { path = "../nu-engine", version = "0.97.2" }
 nu-path = { path = "../nu-path", version = "0.97.2" }
@@ -17,4 +20,4 @@ nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.97.2" }
 
 itertools = { workspace = true }
 
-[dev-dependencies]
\ No newline at end of file
+[dev-dependencies]
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index 2a7b1e9c6c..3a7dce1b2b 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -10,6 +10,9 @@ version = "0.97.2"
 [lib]
 bench = false
 
+[lints]
+workspace = true
+
 [dependencies]
 nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
 nu-engine = { path = "../nu-engine", version = "0.97.2" }
@@ -19,4 +22,4 @@ nu-ansi-term = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.97.2" }
\ No newline at end of file
+nu-test-support = { path = "../nu-test-support", version = "0.97.2" }
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 7c33a60a23..837991cf5d 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -12,6 +12,9 @@ version = "0.97.2"
 [lib]
 bench = false
 
+[lints]
+workspace = true
+
 [dependencies]
 nu-cmd-base = { path = "../nu-cmd-base", version = "0.97.2" }
 nu-color-config = { path = "../nu-color-config", version = "0.97.2" }
diff --git a/crates/nu-derive-value/Cargo.toml b/crates/nu-derive-value/Cargo.toml
index bf28ec878f..01ab5138b7 100644
--- a/crates/nu-derive-value/Cargo.toml
+++ b/crates/nu-derive-value/Cargo.toml
@@ -13,9 +13,12 @@ proc-macro = true
 # so we cannot test anything useful in a doctest
 doctest = false 
 
+[lints]
+workspace = true
+
 [dependencies]
 proc-macro2 = { workspace = true }
 syn = { workspace = true }
 quote = { workspace = true }
 proc-macro-error = { workspace = true }
-heck = { workspace = true }
\ No newline at end of file
+heck = { workspace = true }
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index 42e5a0e07b..04db74a14a 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -10,6 +10,9 @@ version = "0.97.2"
 [lib]
 bench = false
 
+[lints]
+workspace = true
+
 [dependencies]
 nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.97.2" }
 nu-path = { path = "../nu-path", version = "0.97.2" }
@@ -19,4 +22,4 @@ log = { workspace = true }
 terminal_size = { workspace = true }
 
 [features]
-plugin = []
\ No newline at end of file
+plugin = []
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index b1acd89bf1..ad699c4bad 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -10,6 +10,9 @@ version = "0.97.2"
 [lib]
 bench = false
 
+[lints]
+workspace = true
+
 [dependencies]
 nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
 nu-parser = { path = "../nu-parser", version = "0.97.2" }
@@ -32,4 +35,4 @@ ansi-str = { workspace = true }
 unicode-width = { workspace = true }
 lscolors = { workspace = true, default-features = false, features = [
   "nu-ansi-term",
-] }
\ No newline at end of file
+] }
diff --git a/crates/nu-glob/Cargo.toml b/crates/nu-glob/Cargo.toml
index 4206fe85ad..299e72eec5 100644
--- a/crates/nu-glob/Cargo.toml
+++ b/crates/nu-glob/Cargo.toml
@@ -14,4 +14,7 @@ categories = ["filesystem"]
 bench = false
 
 [dev-dependencies]
-doc-comment = "0.3"
\ No newline at end of file
+doc-comment = "0.3"
+
+[lints]
+workspace = true
diff --git a/crates/nu-json/Cargo.toml b/crates/nu-json/Cargo.toml
index 139436d95b..2c7d8545fb 100644
--- a/crates/nu-json/Cargo.toml
+++ b/crates/nu-json/Cargo.toml
@@ -29,4 +29,7 @@ serde_json = { workspace = true }
 nu-test-support = { path = "../nu-test-support", version = "0.97.2" }
 nu-path = { path = "../nu-path", version = "0.97.2" }
 serde_json = "1.0"
-fancy-regex = "0.13.0"
\ No newline at end of file
+fancy-regex = "0.13.0"
+
+[lints]
+workspace = true
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index 255dc58253..b72bce9d03 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -27,4 +27,7 @@ nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.2" }
 nu-command = { path = "../nu-command", version = "0.97.2" }
 nu-test-support = { path = "../nu-test-support", version = "0.97.2" }
 
-assert-json-diff = "2.0"
\ No newline at end of file
+assert-json-diff = "2.0"
+
+[lints]
+workspace = true
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index 49a0dbc0a7..8f5145ed42 100644
--- a/crates/nu-parser/Cargo.toml
+++ b/crates/nu-parser/Cargo.toml
@@ -11,6 +11,9 @@ exclude = ["/fuzz"]
 [lib]
 bench = false
 
+[lints]
+workspace = true
+
 [dependencies]
 nu-engine = { path = "../nu-engine", version = "0.97.2" }
 nu-path = { path = "../nu-path", version = "0.97.2" }
@@ -27,4 +30,4 @@ serde_json = { workspace = true }
 rstest = { workspace = true, default-features = false }
 
 [features]
-plugin = ["nu-plugin-engine"]
\ No newline at end of file
+plugin = ["nu-plugin-engine"]
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index af219d58e0..7b68488986 100644
--- a/crates/nu-path/Cargo.toml
+++ b/crates/nu-path/Cargo.toml
@@ -18,4 +18,7 @@ dirs = { workspace = true }
 omnipath = { workspace = true }
 
 [target.'cfg(all(unix, not(target_os = "macos"), not(target_os = "android")))'.dependencies]
-pwd = { workspace = true }
\ No newline at end of file
+pwd = { workspace = true }
+
+[lints]
+workspace = true
diff --git a/crates/nu-plugin-core/Cargo.toml b/crates/nu-plugin-core/Cargo.toml
index 018f7d1f08..ca4b63dc32 100644
--- a/crates/nu-plugin-core/Cargo.toml
+++ b/crates/nu-plugin-core/Cargo.toml
@@ -10,6 +10,9 @@ version = "0.97.2"
 [lib]
 bench = false
 
+[lints]
+workspace = true
+
 [dependencies]
 nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
 nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.97.2", default-features = false }
@@ -25,4 +28,4 @@ default = ["local-socket"]
 local-socket = ["interprocess", "nu-plugin-protocol/local-socket"]
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows = { workspace = true }
\ No newline at end of file
+windows = { workspace = true }
diff --git a/crates/nu-plugin-engine/Cargo.toml b/crates/nu-plugin-engine/Cargo.toml
index cd01707da8..3e16927a75 100644
--- a/crates/nu-plugin-engine/Cargo.toml
+++ b/crates/nu-plugin-engine/Cargo.toml
@@ -10,6 +10,9 @@ version = "0.97.2"
 [lib]
 bench = false
 
+[lints]
+workspace = true
+
 [dependencies]
 nu-engine = { path = "../nu-engine", version = "0.97.2" }
 nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
@@ -32,4 +35,4 @@ local-socket = ["nu-plugin-core/local-socket"]
 windows = { workspace = true, features = [
   # For setting process creation flags
   "Win32_System_Threading",
-] }
\ No newline at end of file
+] }
diff --git a/crates/nu-plugin-engine/src/gc.rs b/crates/nu-plugin-engine/src/gc.rs
index 555c57e47d..6aed37292d 100644
--- a/crates/nu-plugin-engine/src/gc.rs
+++ b/crates/nu-plugin-engine/src/gc.rs
@@ -244,7 +244,7 @@ mod tests {
         let mut state = test_state();
         state.config.enabled = true;
         state.config.stop_after = Duration::from_secs(1).as_nanos() as i64;
-        state.last_update = Some(now - Duration::from_secs(2));
+        state.last_update = Some(now.checked_sub(Duration::from_secs(2)).unwrap());
 
         assert_eq!(Some(Duration::ZERO), state.next_timeout(now));
     }
@@ -295,7 +295,8 @@ mod tests {
     #[test]
     fn adding_locks_changes_last_update() {
         let mut state = test_state();
-        let original_last_update = Some(Instant::now() - Duration::from_secs(1));
+        let original_last_update =
+            Some(Instant::now().checked_sub(Duration::from_secs(1)).unwrap());
         state.last_update = original_last_update;
         state.handle_message(PluginGcMsg::AddLocks(1));
         assert_ne!(original_last_update, state.last_update, "not updated");
diff --git a/crates/nu-plugin-protocol/Cargo.toml b/crates/nu-plugin-protocol/Cargo.toml
index bfd2dcbc28..45d8fe3a97 100644
--- a/crates/nu-plugin-protocol/Cargo.toml
+++ b/crates/nu-plugin-protocol/Cargo.toml
@@ -10,6 +10,9 @@ version = "0.97.2"
 [lib]
 bench = false
 
+[lints]
+workspace = true
+
 [dependencies]
 nu-protocol = { path = "../nu-protocol", version = "0.97.2", features = ["plugin"] }
 nu-utils = { path = "../nu-utils", version = "0.97.2" }
@@ -21,4 +24,4 @@ typetag = "0.2"
 
 [features]
 default = ["local-socket"]
-local-socket = []
\ No newline at end of file
+local-socket = []
diff --git a/crates/nu-plugin-test-support/Cargo.toml b/crates/nu-plugin-test-support/Cargo.toml
index 5e44966f8c..9234bee18c 100644
--- a/crates/nu-plugin-test-support/Cargo.toml
+++ b/crates/nu-plugin-test-support/Cargo.toml
@@ -9,6 +9,9 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-test
 [lib]
 bench = false
 
+[lints]
+workspace = true
+
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
@@ -25,4 +28,4 @@ similar = "2.6"
 
 [dev-dependencies]
 typetag = "0.2"
-serde = "1.0"
\ No newline at end of file
+serde = "1.0"
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index 94d749de2c..112b364a8b 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -10,6 +10,9 @@ version = "0.97.2"
 [lib]
 bench = false
 
+[lints]
+workspace = true
+
 [dependencies]
 nu-engine = { path = "../nu-engine", version = "0.97.2" }
 nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
@@ -30,4 +33,4 @@ local-socket = ["nu-plugin-core/local-socket"]
 
 [target.'cfg(target_family = "unix")'.dependencies]
 # For setting the process group ID (EnterForeground / LeaveForeground)
-nix = { workspace = true, default-features = false, features = ["process"] }
\ No newline at end of file
+nix = { workspace = true, default-features = false, features = ["process"] }
diff --git a/crates/nu-pretty-hex/Cargo.toml b/crates/nu-pretty-hex/Cargo.toml
index 1f58d53340..5d95c486d6 100644
--- a/crates/nu-pretty-hex/Cargo.toml
+++ b/crates/nu-pretty-hex/Cargo.toml
@@ -13,9 +13,12 @@ name = "nu_pretty_hex"
 path = "src/lib.rs"
 bench = false
 
+[lints]
+workspace = true
+
 [dependencies]
 nu-ansi-term = { workspace = true }
 
 [dev-dependencies]
 heapless = { version = "0.8", default-features = false }
-rand = "0.8"
\ No newline at end of file
+rand = "0.8"
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index ead8ee8089..0a91d5fc1f 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -12,6 +12,9 @@ version = "0.97.2"
 [lib]
 bench = false
 
+[lints]
+workspace = true
+
 [dependencies]
 nu-utils = { path = "../nu-utils", version = "0.97.2" }
 nu-path = { path = "../nu-path", version = "0.97.2" }
@@ -61,4 +64,4 @@ tempfile = { workspace = true }
 os_pipe = { workspace = true }
 
 [package.metadata.docs.rs]
-all-features = true
\ No newline at end of file
+all-features = true
diff --git a/crates/nu-std/Cargo.toml b/crates/nu-std/Cargo.toml
index 1ecbd5280a..6766b8ac3c 100644
--- a/crates/nu-std/Cargo.toml
+++ b/crates/nu-std/Cargo.toml
@@ -13,4 +13,7 @@ nu-protocol = { version = "0.97.2", path = "../nu-protocol" }
 nu-engine = { version = "0.97.2", path = "../nu-engine" }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
 
-log = "0.4"
\ No newline at end of file
+log = "0.4"
+
+[lints]
+workspace = true
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index be7a36b3c6..6de7fd0dc4 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -12,6 +12,9 @@ license = "MIT"
 [lib]
 bench = false
 
+[lints]
+workspace = true
+
 [dependencies]
 libc = { workspace = true }
 log = { workspace = true }
@@ -45,4 +48,4 @@ windows = { workspace = true, features = [
   "Win32_System_SystemInformation",
   "Win32_System_Threading",
   "Win32_UI_Shell",
-]}
\ No newline at end of file
+]}
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index 21f2e04151..3cce028e35 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -10,6 +10,9 @@ version = "0.97.2"
 [lib]
 bench = false
 
+[lints]
+workspace = true
+
 [dependencies]
 nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
 nu-utils = { path = "../nu-utils", version = "0.97.2" }
@@ -21,4 +24,4 @@ fancy-regex = { workspace = true }
 tabled = { workspace = true, features = ["ansi"], default-features = false }
 
 [dev-dependencies]
-# nu-test-support = { path="../nu-test-support", version = "0.97.2"  }
\ No newline at end of file
+# nu-test-support = { path="../nu-test-support", version = "0.97.2"  }
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index b8a4328da3..858ca72e70 100644
--- a/crates/nu-term-grid/Cargo.toml
+++ b/crates/nu-term-grid/Cargo.toml
@@ -10,7 +10,10 @@ version = "0.97.2"
 [lib]
 bench = false
 
+[lints]
+workspace = true
+
 [dependencies]
 nu-utils = { path = "../nu-utils", version = "0.97.2" }
 
-unicode-width = { workspace = true }
\ No newline at end of file
+unicode-width = { workspace = true }
diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml
index fa6f818561..58db142732 100644
--- a/crates/nu-test-support/Cargo.toml
+++ b/crates/nu-test-support/Cargo.toml
@@ -11,6 +11,9 @@ version = "0.97.2"
 doctest = false
 bench = false
 
+[lints]
+workspace = true
+
 [dependencies]
 nu-path = { path = "../nu-path", version = "0.97.2" }
 nu-glob = { path = "../nu-glob", version = "0.97.2" }
@@ -18,4 +21,4 @@ nu-utils = { path = "../nu-utils", version = "0.97.2" }
 
 num-format = { workspace = true }
 which = { workspace = true }
-tempfile = { workspace = true }
\ No newline at end of file
+tempfile = { workspace = true }
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index a5b3e42d4c..038ca44932 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -29,4 +29,7 @@ unicase = "2.7.0"
 crossterm_winapi = "0.9"
 
 [target.'cfg(unix)'.dependencies]
-nix = { workspace = true, default-features = false, features = ["user", "fs"] }
\ No newline at end of file
+nix = { workspace = true, default-features = false, features = ["user", "fs"] }
+
+[lints]
+workspace = true
diff --git a/crates/nuon/Cargo.toml b/crates/nuon/Cargo.toml
index 1f91935e48..d34a649a95 100644
--- a/crates/nuon/Cargo.toml
+++ b/crates/nuon/Cargo.toml
@@ -17,4 +17,7 @@ once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 
 [dev-dependencies]
-chrono = { workspace = true }
\ No newline at end of file
+chrono = { workspace = true }
+
+[lints]
+workspace = true

From 0119534f6193e01f45a0f11f755bfaadddf3b4a0 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Thu, 29 Aug 2024 13:59:44 -0700
Subject: [PATCH 0390/1072] Expression support `polars replace` and `polars
 replace-all` (#13726)

# Description
Adds the ability for `polars replace` and `polars replace-all` to work
as expressions.

# User-Facing Changes
- `polars replace` can be used with polars expressions
- `polars replace-all` can be used with polars expressions
---
 .../src/dataframe/series/string/replace.rs    | 132 +++++++++++++----
 .../dataframe/series/string/replace_all.rs    | 133 ++++++++++++++----
 .../src/dataframe/values/mod.rs               |   4 +-
 3 files changed, 208 insertions(+), 61 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/replace.rs b/crates/nu_plugin_polars/src/dataframe/series/string/replace.rs
index 9d7d097f60..c0fa1d2358 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/string/replace.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/string/replace.rs
@@ -1,4 +1,10 @@
-use crate::{missing_flag_error, values::CustomValueSupport, PolarsPlugin};
+use crate::{
+    missing_flag_error,
+    values::{
+        cant_convert_err, CustomValueSupport, NuExpression, PolarsPluginObject, PolarsPluginType,
+    },
+    PolarsPlugin,
+};
 
 use super::super::super::values::{Column, NuDataFrame};
 
@@ -7,7 +13,7 @@ use nu_protocol::{
     Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
     Value,
 };
-use polars::prelude::{IntoSeries, StringNameSpaceImpl};
+use polars::prelude::{lit, IntoSeries, StringNameSpaceImpl};
 
 #[derive(Clone)]
 pub struct Replace;
@@ -37,33 +43,61 @@ impl PluginCommand for Replace {
                 "replacing string",
                 Some('r'),
             )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
+            .input_output_types(vec![
+                (
+                    Type::Custom("dataframe".into()),
+                    Type::Custom("dataframe".into()),
+                ),
+                (
+                    Type::Custom("expression".into()),
+                    Type::Custom("expression".into()),
+                ),
+            ])
             .category(Category::Custom("dataframe".into()))
     }
 
     fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Replaces string",
-            example: "[abc abc abc] | polars into-df | polars replace --pattern ab --replace AB",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![
-                            Value::test_string("ABc"),
-                            Value::test_string("ABc"),
-                            Value::test_string("ABc"),
-                        ],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
+        vec![
+            Example {
+                description: "Replaces string in column",
+                example:
+                    "[[a]; [abc] [abcabc]] | polars into-df | polars select (polars col a | polars replace --pattern ab --replace AB) | polars collect",
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![Column::new(
+                            "a".to_string(),
+                            vec![
+                                Value::test_string("ABc"),
+                                Value::test_string("ABcabc"),
+                            ],
+                        )],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+            Example {
+                description: "Replaces string",
+                example:
+                    "[abc abc abc] | polars into-df | polars replace --pattern ab --replace AB",
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![Column::new(
+                            "0".to_string(),
+                            vec![
+                                Value::test_string("ABc"),
+                                Value::test_string("ABc"),
+                                Value::test_string("ABc"),
+                            ],
+                        )],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+        ]
     }
 
     fn run(
@@ -73,15 +107,56 @@ impl PluginCommand for Replace {
         call: &EvaluatedCall,
         input: PipelineData,
     ) -> Result<PipelineData, LabeledError> {
-        command(plugin, engine, call, input).map_err(LabeledError::from)
+        let value = input.into_value(call.head)?;
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuDataFrame(df) => command_df(plugin, engine, call, df),
+            PolarsPluginObject::NuLazyFrame(lazy) => {
+                command_df(plugin, engine, call, lazy.collect(call.head)?)
+            }
+            PolarsPluginObject::NuExpression(expr) => command_expr(plugin, engine, call, expr),
+            _ => Err(cant_convert_err(
+                &value,
+                &[
+                    PolarsPluginType::NuDataFrame,
+                    PolarsPluginType::NuLazyFrame,
+                    PolarsPluginType::NuExpression,
+                ],
+            )),
+        }
+        .map_err(LabeledError::from)
     }
 }
 
-fn command(
+fn command_expr(
     plugin: &PolarsPlugin,
     engine: &EngineInterface,
     call: &EvaluatedCall,
-    input: PipelineData,
+    expr: NuExpression,
+) -> Result<PipelineData, ShellError> {
+    let pattern: String = call
+        .get_flag("pattern")?
+        .ok_or_else(|| missing_flag_error("pattern", call.head))?;
+    let pattern = lit(pattern);
+
+    let replace: String = call
+        .get_flag("replace")?
+        .ok_or_else(|| missing_flag_error("replace", call.head))?;
+    let replace = lit(replace);
+
+    let res: NuExpression = expr
+        .into_polars()
+        .str()
+        .replace(pattern, replace, false)
+        .into();
+
+    res.to_pipeline_data(plugin, engine, call.head)
+}
+
+fn command_df(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    df: NuDataFrame,
 ) -> Result<PipelineData, ShellError> {
     let pattern: String = call
         .get_flag("pattern")?
@@ -90,7 +165,6 @@ fn command(
         .get_flag("replace")?
         .ok_or_else(|| missing_flag_error("replace", call.head))?;
 
-    let df = NuDataFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
     let series = df.as_series(call.head)?;
     let chunked = series.str().map_err(|e| ShellError::GenericError {
         error: "Error conversion to string".into(),
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/replace_all.rs b/crates/nu_plugin_polars/src/dataframe/series/string/replace_all.rs
index d88b581451..13799818ee 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/string/replace_all.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/string/replace_all.rs
@@ -1,4 +1,10 @@
-use crate::{missing_flag_error, values::CustomValueSupport, PolarsPlugin};
+use crate::{
+    missing_flag_error,
+    values::{
+        cant_convert_err, CustomValueSupport, NuExpression, PolarsPluginObject, PolarsPluginType,
+    },
+    PolarsPlugin,
+};
 
 use super::super::super::values::{Column, NuDataFrame};
 
@@ -7,7 +13,7 @@ use nu_protocol::{
     Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
     Value,
 };
-use polars::prelude::{IntoSeries, StringNameSpaceImpl};
+use polars::prelude::{lit, IntoSeries, StringNameSpaceImpl};
 
 #[derive(Clone)]
 pub struct ReplaceAll;
@@ -37,34 +43,62 @@ impl PluginCommand for ReplaceAll {
                 "replacing string",
                 Some('r'),
             )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
+            .input_output_types(vec![
+                (
+                    Type::Custom("dataframe".into()),
+                    Type::Custom("dataframe".into()),
+                ),
+                (
+                    Type::Custom("expression".into()),
+                    Type::Custom("expression".into()),
+                ),
+            ])
             .category(Category::Custom("dataframe".into()))
     }
 
     fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Replaces string",
-            example:
-                "[abac abac abac] | polars into-df | polars replace-all --pattern a --replace A",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![
-                            Value::test_string("AbAc"),
-                            Value::test_string("AbAc"),
-                            Value::test_string("AbAc"),
-                        ],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
+        vec![
+            Example {
+                description: "Replaces string in a column",
+                example:
+                    "[[a]; [abac] [abac] [abac]] | polars into-df | polars select (polars col a | polars replace-all --pattern a --replace A) | polars collect",
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![Column::new(
+                            "a".to_string(),
+                            vec![
+                                Value::test_string("AbAc"),
+                                Value::test_string("AbAc"),
+                                Value::test_string("AbAc"),
+                            ],
+                        )],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+            Example {
+                description: "Replaces string",
+                example:
+                    "[abac abac abac] | polars into-df | polars replace-all --pattern a --replace A",
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![Column::new(
+                            "0".to_string(),
+                            vec![
+                                Value::test_string("AbAc"),
+                                Value::test_string("AbAc"),
+                                Value::test_string("AbAc"),
+                            ],
+                        )],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+        ]
     }
 
     fn run(
@@ -74,15 +108,55 @@ impl PluginCommand for ReplaceAll {
         call: &EvaluatedCall,
         input: PipelineData,
     ) -> Result<PipelineData, LabeledError> {
-        command(plugin, engine, call, input).map_err(LabeledError::from)
+        let value = input.into_value(call.head)?;
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuDataFrame(df) => command_df(plugin, engine, call, df),
+            PolarsPluginObject::NuLazyFrame(lazy) => {
+                command_df(plugin, engine, call, lazy.collect(call.head)?)
+            }
+            PolarsPluginObject::NuExpression(expr) => command_expr(plugin, engine, call, expr),
+            _ => Err(cant_convert_err(
+                &value,
+                &[
+                    PolarsPluginType::NuDataFrame,
+                    PolarsPluginType::NuLazyFrame,
+                    PolarsPluginType::NuExpression,
+                ],
+            )),
+        }
+        .map_err(LabeledError::from)
     }
 }
 
-fn command(
+fn command_expr(
     plugin: &PolarsPlugin,
     engine_state: &EngineInterface,
     call: &EvaluatedCall,
-    input: PipelineData,
+    expr: NuExpression,
+) -> Result<PipelineData, ShellError> {
+    let pattern: String = call
+        .get_flag("pattern")?
+        .ok_or_else(|| missing_flag_error("pattern", call.head))?;
+    let pattern = lit(pattern);
+    let replace: String = call
+        .get_flag("replace")?
+        .ok_or_else(|| missing_flag_error("replace", call.head))?;
+    let replace = lit(replace);
+
+    let res: NuExpression = expr
+        .into_polars()
+        .str()
+        .replace_all(pattern, replace, false)
+        .into();
+
+    res.to_pipeline_data(plugin, engine_state, call.head)
+}
+
+fn command_df(
+    plugin: &PolarsPlugin,
+    engine_state: &EngineInterface,
+    call: &EvaluatedCall,
+    df: NuDataFrame,
 ) -> Result<PipelineData, ShellError> {
     let pattern: String = call
         .get_flag("pattern")?
@@ -91,7 +165,6 @@ fn command(
         .get_flag("replace")?
         .ok_or_else(|| missing_flag_error("replace", call.head))?;
 
-    let df = NuDataFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
     let series = df.as_series(call.head)?;
     let chunked = series.str().map_err(|e| ShellError::GenericError {
         error: "Error conversion to string".into(),
diff --git a/crates/nu_plugin_polars/src/dataframe/values/mod.rs b/crates/nu_plugin_polars/src/dataframe/values/mod.rs
index 41a119cddc..42fb8dace1 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/mod.rs
@@ -185,8 +185,8 @@ impl CustomValueType {
     }
 }
 
-pub fn cant_convert_err(value: &Value, types: &[PolarsPluginType]) -> ShellError {
-    let type_string = types
+pub fn cant_convert_err(value: &Value, expected_types: &[PolarsPluginType]) -> ShellError {
+    let type_string = expected_types
         .iter()
         .map(ToString::to_string)
         .collect::<Vec<String>>()

From 3f31ca7b8eedff4a48f5213357d9c64a751408a9 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Sat, 31 Aug 2024 09:45:15 -0500
Subject: [PATCH 0391/1072] remove cfg_atter tarpaulin (#13739)

# Description

Remove the `#[cfg_attr(tarpaulin, ignore)]` code coverage attributes to
get rid warnings when compiling plugins with a more recent rust version
than nushell.
---
 crates/nu-system/src/macos.rs   |  5 -----
 crates/nu-system/src/windows.rs | 16 ----------------
 2 files changed, 21 deletions(-)

diff --git a/crates/nu-system/src/macos.rs b/crates/nu-system/src/macos.rs
index 06683da6fd..e9b927c1fe 100644
--- a/crates/nu-system/src/macos.rs
+++ b/crates/nu-system/src/macos.rs
@@ -27,7 +27,6 @@ pub struct ProcessInfo {
     pub interval: Duration,
 }
 
-#[cfg_attr(tarpaulin, ignore)]
 pub fn collect_proc(interval: Duration, _with_thread: bool) -> Vec<ProcessInfo> {
     let mut base_procs = Vec::new();
     let mut ret = Vec::new();
@@ -116,7 +115,6 @@ pub fn collect_proc(interval: Duration, _with_thread: bool) -> Vec<ProcessInfo>
     ret
 }
 
-#[cfg_attr(tarpaulin, ignore)]
 fn get_arg_max() -> size_t {
     let mut mib: [c_int; 2] = [libc::CTL_KERN, libc::KERN_ARGMAX];
     let mut arg_max = 0i32;
@@ -144,14 +142,12 @@ pub struct PathInfo {
     pub cwd: PathBuf,
 }
 
-#[cfg_attr(tarpaulin, ignore)]
 unsafe fn get_unchecked_str(cp: *mut u8, start: *mut u8) -> String {
     let len = (cp as usize).saturating_sub(start as usize);
     let part = std::slice::from_raw_parts(start, len);
     String::from_utf8_unchecked(part.to_vec())
 }
 
-#[cfg_attr(tarpaulin, ignore)]
 fn get_path_info(pid: i32, mut size: size_t) -> Option<PathInfo> {
     let mut proc_args = Vec::with_capacity(size);
     let ptr: *mut u8 = proc_args.as_mut_slice().as_mut_ptr();
@@ -252,7 +248,6 @@ fn get_path_info(pid: i32, mut size: size_t) -> Option<PathInfo> {
     }
 }
 
-#[cfg_attr(tarpaulin, ignore)]
 fn clone_task_all_info(src: &TaskAllInfo) -> TaskAllInfo {
     let pbsd = BSDInfo {
         pbi_flags: src.pbsd.pbi_flags,
diff --git a/crates/nu-system/src/windows.rs b/crates/nu-system/src/windows.rs
index d79ce5b0ea..b4217d4b9a 100644
--- a/crates/nu-system/src/windows.rs
+++ b/crates/nu-system/src/windows.rs
@@ -109,7 +109,6 @@ pub struct CpuInfo {
     pub curr_user: u64,
 }
 
-#[cfg_attr(tarpaulin, ignore)]
 pub fn collect_proc(interval: Duration, _with_thread: bool) -> Vec<ProcessInfo> {
     let mut base_procs = Vec::new();
     let mut ret = Vec::new();
@@ -257,7 +256,6 @@ pub fn collect_proc(interval: Duration, _with_thread: bool) -> Vec<ProcessInfo>
     ret
 }
 
-#[cfg_attr(tarpaulin, ignore)]
 fn set_privilege() -> bool {
     unsafe {
         let handle = GetCurrentProcess();
@@ -284,7 +282,6 @@ fn set_privilege() -> bool {
     }
 }
 
-#[cfg_attr(tarpaulin, ignore)]
 fn get_pids() -> Vec<i32> {
     let dword_size = size_of::<u32>();
     let mut pids: Vec<u32> = Vec::with_capacity(10192);
@@ -307,7 +304,6 @@ fn get_pids() -> Vec<i32> {
     pids.iter().map(|x| *x as i32).collect()
 }
 
-#[cfg_attr(tarpaulin, ignore)]
 fn get_ppid_threads() -> (HashMap<i32, i32>, HashMap<i32, i32>) {
     let mut ppids = HashMap::new();
     let mut threads = HashMap::new();
@@ -332,7 +328,6 @@ fn get_ppid_threads() -> (HashMap<i32, i32>, HashMap<i32, i32>) {
     (ppids, threads)
 }
 
-#[cfg_attr(tarpaulin, ignore)]
 fn get_handle(pid: i32) -> Option<HANDLE> {
     if pid == 0 {
         return None;
@@ -353,7 +348,6 @@ fn get_handle(pid: i32) -> Option<HANDLE> {
     }
 }
 
-#[cfg_attr(tarpaulin, ignore)]
 fn get_times(handle: HANDLE) -> Option<(u64, u64, u64, u64)> {
     unsafe {
         let mut start: FILETIME = zeroed();
@@ -382,7 +376,6 @@ fn get_times(handle: HANDLE) -> Option<(u64, u64, u64, u64)> {
     }
 }
 
-#[cfg_attr(tarpaulin, ignore)]
 fn get_memory_info(handle: HANDLE) -> Option<MemoryInfo> {
     unsafe {
         let mut pmc: PROCESS_MEMORY_COUNTERS_EX = zeroed();
@@ -413,7 +406,6 @@ fn get_memory_info(handle: HANDLE) -> Option<MemoryInfo> {
     }
 }
 
-#[cfg_attr(tarpaulin, ignore)]
 fn get_command(handle: HANDLE) -> Option<String> {
     unsafe {
         let mut exe_buf = [0u16; MAX_PATH as usize + 1];
@@ -780,7 +772,6 @@ fn get_cwd<T: RtlUserProcessParameters>(params: &T, handle: HANDLE) -> PathBuf {
     }
 }
 
-#[cfg_attr(tarpaulin, ignore)]
 fn get_io(handle: HANDLE) -> Option<(u64, u64)> {
     unsafe {
         let mut io: IO_COUNTERS = zeroed();
@@ -801,7 +792,6 @@ pub struct SidName {
     pub domainname: Option<String>,
 }
 
-#[cfg_attr(tarpaulin, ignore)]
 fn get_user(handle: HANDLE) -> Option<SidName> {
     unsafe {
         let mut token: HANDLE = zeroed();
@@ -854,7 +844,6 @@ fn get_user(handle: HANDLE) -> Option<SidName> {
     }
 }
 
-#[cfg_attr(tarpaulin, ignore)]
 fn get_groups(handle: HANDLE) -> Option<Vec<SidName>> {
     unsafe {
         let mut token: HANDLE = zeroed();
@@ -914,7 +903,6 @@ fn get_groups(handle: HANDLE) -> Option<Vec<SidName>> {
     }
 }
 
-#[cfg_attr(tarpaulin, ignore)]
 fn get_sid(psid: PSID) -> Vec<u64> {
     unsafe {
         let mut ret = Vec::new();
@@ -945,7 +933,6 @@ thread_local!(
         RefCell::new(HashMap::new());
 );
 
-#[cfg_attr(tarpaulin, ignore)]
 fn get_name_cached(psid: PSID) -> Option<(String, String)> {
     NAME_CACHE.with(|c| {
         let mut c = c.borrow_mut();
@@ -959,7 +946,6 @@ fn get_name_cached(psid: PSID) -> Option<(String, String)> {
     })
 }
 
-#[cfg_attr(tarpaulin, ignore)]
 fn get_name(psid: PSID) -> Option<(String, String)> {
     unsafe {
         let mut cc_name = 0;
@@ -1003,7 +989,6 @@ fn get_name(psid: PSID) -> Option<(String, String)> {
     }
 }
 
-#[cfg_attr(tarpaulin, ignore)]
 fn from_wide_ptr(ptr: *const u16) -> String {
     unsafe {
         assert!(!ptr.is_null());
@@ -1015,7 +1000,6 @@ fn from_wide_ptr(ptr: *const u16) -> String {
     }
 }
 
-#[cfg_attr(tarpaulin, ignore)]
 fn get_priority(handle: HANDLE) -> u32 {
     unsafe { GetPriorityClass(handle) }
 }

From f4940e115fd5de059c15be78f1df66081fa9bec4 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Sun, 1 Sep 2024 08:33:10 -0700
Subject: [PATCH 0392/1072] Remove bincode and use MessagePack instead for
 plugin custom values (#13745)

# Description

This changes the serialization of custom values within the plugin
protocol to use MessagePack instead of bincode, removing the dependency
on bincode entirely.

Bincode does not seem to be very maintained anymore, and the externally
tagged enum representation doesn't seem to always work now even though
it should. Since we use MessagePack already anyway for the plugin
protocol, this seems like an obvious choice. This uses the unnamed
variant of the serialization rather than the named variant, which is
what the plugin protocol in general uses. The unnamed variant does not
include field names, which aren't really required here, so this should
give us something that's more or less as efficient as bincode is.

Should fix #13743.

# User-Facing Changes

- Will need to recompile plugins (but always do anyway)
- Doesn't technically break the plugin protocol (custom value data is a
black box / plugin implementation specific), but breaks compatibility
between `nu-plugin-engine` and `nu-plugin` so they do need to both be
updated to match.

# Tests + Formatting

All tests pass.

# After Submitting

- [ ] release notes
---
 Cargo.lock                                            | 11 +----------
 crates/nu-plugin-protocol/Cargo.toml                  |  2 +-
 .../nu-plugin-protocol/src/plugin_custom_value/mod.rs |  4 ++--
 crates/nu-plugin-protocol/src/test_util.rs            |  4 ++--
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 089938ed6d..c73ddb8f32 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -366,15 +366,6 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
-[[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "bindgen"
 version = "0.69.4"
@@ -3364,9 +3355,9 @@ dependencies = [
 name = "nu-plugin-protocol"
 version = "0.97.2"
 dependencies = [
- "bincode",
  "nu-protocol",
  "nu-utils",
+ "rmp-serde",
  "semver",
  "serde",
  "typetag",
diff --git a/crates/nu-plugin-protocol/Cargo.toml b/crates/nu-plugin-protocol/Cargo.toml
index 45d8fe3a97..1d8aab6a1a 100644
--- a/crates/nu-plugin-protocol/Cargo.toml
+++ b/crates/nu-plugin-protocol/Cargo.toml
@@ -17,7 +17,7 @@ workspace = true
 nu-protocol = { path = "../nu-protocol", version = "0.97.2", features = ["plugin"] }
 nu-utils = { path = "../nu-utils", version = "0.97.2" }
 
-bincode = "1.3"
+rmp-serde = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 semver = "1.0"
 typetag = "0.2"
diff --git a/crates/nu-plugin-protocol/src/plugin_custom_value/mod.rs b/crates/nu-plugin-protocol/src/plugin_custom_value/mod.rs
index ea2b1551c9..db7ea733d7 100644
--- a/crates/nu-plugin-protocol/src/plugin_custom_value/mod.rs
+++ b/crates/nu-plugin-protocol/src/plugin_custom_value/mod.rs
@@ -142,7 +142,7 @@ impl PluginCustomValue {
     ) -> Result<PluginCustomValue, ShellError> {
         let name = custom_value.type_name();
         let notify_on_drop = custom_value.notify_plugin_on_drop();
-        bincode::serialize(custom_value)
+        rmp_serde::to_vec(custom_value)
             .map(|data| PluginCustomValue::new(name, data, notify_on_drop))
             .map_err(|err| ShellError::CustomValueFailedToEncode {
                 msg: err.to_string(),
@@ -156,7 +156,7 @@ impl PluginCustomValue {
         &self,
         span: Span,
     ) -> Result<Box<dyn CustomValue>, ShellError> {
-        bincode::deserialize::<Box<dyn CustomValue>>(self.data()).map_err(|err| {
+        rmp_serde::from_slice::<Box<dyn CustomValue>>(self.data()).map_err(|err| {
             ShellError::CustomValueFailedToDecode {
                 msg: err.to_string(),
                 span,
diff --git a/crates/nu-plugin-protocol/src/test_util.rs b/crates/nu-plugin-protocol/src/test_util.rs
index 579b1ee758..7d3bfb28ca 100644
--- a/crates/nu-plugin-protocol/src/test_util.rs
+++ b/crates/nu-plugin-protocol/src/test_util.rs
@@ -31,8 +31,8 @@ impl CustomValue for TestCustomValue {
 
 /// A [`TestCustomValue`] serialized as a [`PluginCustomValue`].
 pub fn test_plugin_custom_value() -> PluginCustomValue {
-    let data = bincode::serialize(&expected_test_custom_value() as &dyn CustomValue)
-        .expect("bincode serialization of the expected_test_custom_value() failed");
+    let data = rmp_serde::to_vec(&expected_test_custom_value() as &dyn CustomValue)
+        .expect("MessagePack serialization of the expected_test_custom_value() failed");
 
     PluginCustomValue::new("TestCustomValue".into(), data, false)
 }

From e3f59910b87ddbee24ec5e1de059dd87f7b56fe3 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Sun, 1 Sep 2024 10:02:12 -0700
Subject: [PATCH 0393/1072] Implement `IntoValue` for more types (#13744)

# Description

Implements `IntoValue` for `&str` and `DateTime` as well as other
nushell types like `Record` and `Closure`. Also allows `HashMap`s with
keys besides `String` to implement `IntoValue`.
---
 crates/nu-cli/tests/completions/mod.rs     | 10 +--
 crates/nu-derive-value/src/into.rs         |  2 +-
 crates/nu-protocol/src/value/into_value.rs | 71 ++++++++++++++++++----
 3 files changed, 65 insertions(+), 18 deletions(-)

diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index 70ea1ea99f..3dc4443bc3 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -377,7 +377,7 @@ fn file_completions_with_mixed_separators() {
         file(dir.join("lib-dir1").join("baz.nu")),
         file(dir.join("lib-dir1").join("xyzzy.nu")),
     ];
-    let expecetd_slash_paths: Vec<String> = expected_paths
+    let expected_slash_paths: Vec<String> = expected_paths
         .iter()
         .map(|s| s.replace(MAIN_SEPARATOR, "/"))
         .collect();
@@ -385,22 +385,22 @@ fn file_completions_with_mixed_separators() {
     let target_dir = format!("ls {dir_str}/lib-dir1/");
     let suggestions = completer.complete(&target_dir, target_dir.len());
 
-    match_suggestions(&expecetd_slash_paths, &suggestions);
+    match_suggestions(&expected_slash_paths, &suggestions);
 
     let target_dir = format!("cp {dir_str}\\lib-dir1/");
     let suggestions = completer.complete(&target_dir, target_dir.len());
 
-    match_suggestions(&expecetd_slash_paths, &suggestions);
+    match_suggestions(&expected_slash_paths, &suggestions);
 
     let target_dir = format!("ls {dir_str}/lib-dir1\\/");
     let suggestions = completer.complete(&target_dir, target_dir.len());
 
-    match_suggestions(&expecetd_slash_paths, &suggestions);
+    match_suggestions(&expected_slash_paths, &suggestions);
 
     let target_dir = format!("ls {dir_str}\\lib-dir1\\/");
     let suggestions = completer.complete(&target_dir, target_dir.len());
 
-    match_suggestions(&expecetd_slash_paths, &suggestions);
+    match_suggestions(&expected_slash_paths, &suggestions);
 
     let target_dir = format!("ls {dir_str}\\lib-dir1\\");
     let suggestions = completer.complete(&target_dir, target_dir.len());
diff --git a/crates/nu-derive-value/src/into.rs b/crates/nu-derive-value/src/into.rs
index 3dfb92d28e..370558005a 100644
--- a/crates/nu-derive-value/src/into.rs
+++ b/crates/nu-derive-value/src/into.rs
@@ -191,7 +191,7 @@ fn enum_into_value(
                 .as_str()
                 .to_case(container_attrs.rename_all.unwrap_or(Case::Snake));
             match &variant.fields {
-                // In the future we can implement more complexe enums here.
+                // In the future we can implement more complex enums here.
                 Fields::Named(fields) => Err(DeriveError::UnsupportedEnums {
                     fields_span: fields.span(),
                 }),
diff --git a/crates/nu-protocol/src/value/into_value.rs b/crates/nu-protocol/src/value/into_value.rs
index d95de9d96a..c7b776071a 100644
--- a/crates/nu-protocol/src/value/into_value.rs
+++ b/crates/nu-protocol/src/value/into_value.rs
@@ -1,6 +1,6 @@
-use std::collections::HashMap;
-
-use crate::{Record, ShellError, Span, Value};
+use crate::{ast::CellPath, engine::Closure, Range, Record, ShellError, Span, Value};
+use chrono::{DateTime, FixedOffset};
+use std::{borrow::Borrow, collections::HashMap};
 
 /// A trait for converting a value into a [`Value`].
 ///
@@ -152,6 +152,12 @@ impl IntoValue for String {
     }
 }
 
+impl IntoValue for &str {
+    fn into_value(self, span: Span) -> Value {
+        Value::string(self, span)
+    }
+}
+
 impl<T> IntoValue for Vec<T>
 where
     T: IntoValue,
@@ -173,24 +179,59 @@ where
     }
 }
 
-impl<V> IntoValue for HashMap<String, V>
+impl<K, V> IntoValue for HashMap<K, V>
 where
+    K: Borrow<str> + Into<String>,
     V: IntoValue,
 {
     fn into_value(self, span: Span) -> Value {
-        let mut record = Record::new();
-        for (k, v) in self.into_iter() {
-            // Using `push` is fine as a hashmaps have unique keys.
-            // To ensure this uniqueness, we only allow hashmaps with strings as
-            // keys and not keys which implement `Into<String>` or `ToString`.
-            record.push(k, v.into_value(span));
-        }
-        Value::record(record, span)
+        // The `Borrow<str>` constraint is to ensure uniqueness, as implementations of `Borrow`
+        // must uphold by certain properties (e.g., `(x == y) == (x.borrow() == y.borrow())`.
+        //
+        // The `Into<String>` constraint is necessary for us to convert the key into a `String`.
+        // Most types that implement `Borrow<str>` also implement `Into<String>`.
+        // Implementations of `Into` must also be lossless and value-preserving conversions.
+        // So, when combined with the `Borrow` constraint, this means that the converted
+        // `String` keys should be unique.
+        self.into_iter()
+            .map(|(k, v)| (k.into(), v.into_value(span)))
+            .collect::<Record>()
+            .into_value(span)
     }
 }
 
 // Nu Types
 
+impl IntoValue for Range {
+    fn into_value(self, span: Span) -> Value {
+        Value::range(self, span)
+    }
+}
+
+impl IntoValue for Record {
+    fn into_value(self, span: Span) -> Value {
+        Value::record(self, span)
+    }
+}
+
+impl IntoValue for Closure {
+    fn into_value(self, span: Span) -> Value {
+        Value::closure(self, span)
+    }
+}
+
+impl IntoValue for ShellError {
+    fn into_value(self, span: Span) -> Value {
+        Value::error(self, span)
+    }
+}
+
+impl IntoValue for CellPath {
+    fn into_value(self, span: Span) -> Value {
+        Value::cell_path(self, span)
+    }
+}
+
 impl IntoValue for Value {
     fn into_value(self, span: Span) -> Value {
         self.with_span(span)
@@ -199,6 +240,12 @@ impl IntoValue for Value {
 
 // Foreign Types
 
+impl IntoValue for DateTime<FixedOffset> {
+    fn into_value(self, span: Span) -> Value {
+        Value::date(self, span)
+    }
+}
+
 impl IntoValue for bytes::Bytes {
     fn into_value(self, span: Span) -> Value {
         Value::binary(self.to_vec(), span)

From ee997ef3ddef344c81622ea6f6f573303f55ea63 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Sun, 1 Sep 2024 19:02:28 +0200
Subject: [PATCH 0394/1072] Remove unneeded `serde` feature on `byte-unit` dep
 (#13749)

removing the `std` feature as well would drop some dependencies tied to
`rust_decimal` from the `Cargo.lock` but unclear to me what the actual
impact on compile times is.

We may want to consider dropping the `byte-unit` dependency altogether
as we have a significant fraction of our own logic to support the byte
units with 1024 and 1000 prefixes. Not sure which fraction is covered by
us or the dependency.
---
 crates/nu-protocol/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 0a91d5fc1f..ac44ade67f 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -23,7 +23,7 @@ nu-derive-value = { path = "../nu-derive-value", version = "0.97.2" }
 
 brotli = { workspace = true, optional = true }
 bytes = { workspace = true }
-byte-unit = { version = "5.1", features = [ "serde" ] }
+byte-unit = { version = "5.1" }
 chrono = { workspace = true, features = [ "serde", "std", "unstable-locales" ], default-features = false }
 chrono-humanize = { workspace = true }
 dirs = { workspace = true }

From 39bda8986e7c76d02143cedf630aca5c6dfa2827 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Sun, 1 Sep 2024 10:03:46 -0700
Subject: [PATCH 0395/1072] Make `tee` work more nicely with non-collections
 (#13652)

# Description

This changes the behavior of `tee` to be more transparent when given a
value that isn't a list or range. Previously, anything that wasn't a
byte stream would converted to a list stream using the iterator
implementation, which led to some surprising results. Instead, now, if
the value is a string or binary, it will be treated the same way a byte
stream is, and the output of `tee` is a byte stream instead of the
original value. This is done so that we can synchronize with the other
thread on collect, and potentially capture any error produced by the
closure.

For values that can't be converted to streams, the closure is just run
with a clone of the value instead on another thread. Because we can't
wait for the other thread, there is no way to send an error back to the
original thread, so instead it's just written to stderr using
`report_error_new()`.

There are a couple of follow up edge cases I see where byte streams
aren't necessarily treated exactly the same way strings are, but this
should mostly be a good experience.

Fixes #13489.

# User-Facing Changes

Breaking change.

- `tee` now outputs and sends string/binary stream for string/binary
input.
- `tee` now outputs and sends the original value for any other input
other than lists/ranges.

# Tests + Formatting

Added for new behavior.

# After Submitting

- [ ] release notes: breaking change, command change
---
 crates/nu-command/src/filters/tee.rs          | 80 ++++++++++++++-----
 crates/nu-command/tests/commands/tee.rs       | 20 +++++
 .../nu-protocol/src/pipeline/pipeline_data.rs | 34 ++++++++
 3 files changed, 116 insertions(+), 18 deletions(-)

diff --git a/crates/nu-command/src/filters/tee.rs b/crates/nu-command/src/filters/tee.rs
index 4e801bfcc8..db29d31e5f 100644
--- a/crates/nu-command/src/filters/tee.rs
+++ b/crates/nu-command/src/filters/tee.rs
@@ -1,11 +1,14 @@
 use nu_engine::{command_prelude::*, get_eval_block_with_early_return};
 use nu_protocol::{
-    byte_stream::copy_with_signals, engine::Closure, process::ChildPipe, ByteStream,
-    ByteStreamSource, OutDest, PipelineMetadata, Signals,
+    byte_stream::copy_with_signals, engine::Closure, process::ChildPipe, report_error_new,
+    ByteStream, ByteStreamSource, OutDest, PipelineMetadata, Signals,
 };
 use std::{
     io::{self, Read, Write},
-    sync::mpsc::{self, Sender},
+    sync::{
+        mpsc::{self, Sender},
+        Arc,
+    },
     thread::{self, JoinHandle},
 };
 
@@ -61,6 +64,11 @@ use it in your pipeline."#
                 description: "Print numbers and their sum",
                 result: None,
             },
+            Example {
+                example: "10000 | tee { 1..$in | print } | $in * 5",
+                description: "Do something with a value on another thread, while also passing through the value",
+                result: Some(Value::test_int(50000)),
+            }
         ]
     }
 
@@ -78,8 +86,10 @@ use it in your pipeline."#
         let closure_span = closure.span;
         let closure = closure.item;
 
+        let engine_state_arc = Arc::new(engine_state.clone());
+
         let mut eval_block = {
-            let closure_engine_state = engine_state.clone();
+            let closure_engine_state = engine_state_arc.clone();
             let mut closure_stack = stack
                 .captures_to_stack_preserve_out_dest(closure.captures)
                 .reset_pipes();
@@ -97,8 +107,15 @@ use it in your pipeline."#
             }
         };
 
+        // Convert values that can be represented as streams into streams. Streams can pass errors
+        // through later, so if we treat string/binary/list as a stream instead, it's likely that
+        // we can get the error back to the original thread.
+        let span = input.span().unwrap_or(head);
+        let input = input
+            .try_into_stream(engine_state)
+            .unwrap_or_else(|original_input| original_input);
+
         if let PipelineData::ByteStream(stream, metadata) = input {
-            let span = stream.span();
             let type_ = stream.type_();
 
             let info = StreamInfo {
@@ -228,22 +245,37 @@ use it in your pipeline."#
                 return stderr_misuse(input.span().unwrap_or(head), head);
             }
 
-            let span = input.span().unwrap_or(head);
             let metadata = input.metadata();
             let metadata_clone = metadata.clone();
-            let signals = engine_state.signals().clone();
 
-            Ok(tee(input.into_iter(), move |rx| {
-                let input = rx.into_pipeline_data_with_metadata(span, signals, metadata_clone);
-                eval_block(input)
-            })
-            .err_span(call.head)?
-            .map(move |result| result.unwrap_or_else(|err| Value::error(err, closure_span)))
-            .into_pipeline_data_with_metadata(
-                span,
-                engine_state.signals().clone(),
-                metadata,
-            ))
+            if matches!(input, PipelineData::ListStream(..)) {
+                // Only use the iterator implementation on lists / list streams. We want to be able
+                // to preserve errors as much as possible, and only the stream implementations can
+                // really do that
+                let signals = engine_state.signals().clone();
+
+                Ok(tee(input.into_iter(), move |rx| {
+                    let input = rx.into_pipeline_data_with_metadata(span, signals, metadata_clone);
+                    eval_block(input)
+                })
+                .err_span(call.head)?
+                .map(move |result| result.unwrap_or_else(|err| Value::error(err, closure_span)))
+                .into_pipeline_data_with_metadata(
+                    span,
+                    engine_state.signals().clone(),
+                    metadata,
+                ))
+            } else {
+                // Otherwise, we can spawn a thread with the input value, but we have nowhere to
+                // send an error to other than just trying to print it to stderr.
+                let value = input.into_value(span)?;
+                let value_clone = value.clone();
+                tee_once(engine_state_arc, move || {
+                    eval_block(value_clone.into_pipeline_data_with_metadata(metadata_clone))
+                })
+                .err_span(call.head)?;
+                Ok(value.into_pipeline_data_with_metadata(metadata))
+            }
         }
     }
 
@@ -314,6 +346,18 @@ where
     }))
 }
 
+/// "tee" for a single value. No stream handling, just spawns a thread, printing any resulting error
+fn tee_once(
+    engine_state: Arc<EngineState>,
+    on_thread: impl FnOnce() -> Result<(), ShellError> + Send + 'static,
+) -> Result<JoinHandle<()>, std::io::Error> {
+    thread::Builder::new().name("tee".into()).spawn(move || {
+        if let Err(err) = on_thread() {
+            report_error_new(&engine_state, &err);
+        }
+    })
+}
+
 fn stderr_misuse<T>(span: Span, head: Span) -> Result<T, ShellError> {
     Err(ShellError::UnsupportedInput {
         msg: "--stderr can only be used on external commands".into(),
diff --git a/crates/nu-command/tests/commands/tee.rs b/crates/nu-command/tests/commands/tee.rs
index 6a69d7fe6d..3f6ca38709 100644
--- a/crates/nu-command/tests/commands/tee.rs
+++ b/crates/nu-command/tests/commands/tee.rs
@@ -47,3 +47,23 @@ fn tee_save_stderr_to_file() {
         assert_eq!("teststring\n", file_contents(dirs.test().join("copy.txt")));
     })
 }
+
+#[test]
+fn tee_single_value_streamable() {
+    let actual = nu!("'Hello, world!' | tee { print -e } | print");
+    assert!(actual.status.success());
+    assert_eq!("Hello, world!", actual.out);
+    // FIXME: note the lack of newline: this is a consequence of converting the string to a stream
+    // for now, but most likely the printer should be checking whether a string stream ends with a
+    // newline and adding it unless no_newline is true
+    assert_eq!("Hello, world!", actual.err);
+}
+
+#[test]
+fn tee_single_value_non_streamable() {
+    // Non-streamable values don't have any synchronization point, so we have to wait.
+    let actual = nu!("500 | tee { print -e } | print; sleep 1sec");
+    assert!(actual.status.success());
+    assert_eq!("500", actual.out);
+    assert_eq!("500\n", actual.err);
+}
diff --git a/crates/nu-protocol/src/pipeline/pipeline_data.rs b/crates/nu-protocol/src/pipeline/pipeline_data.rs
index 33e932ecaf..85789b4f37 100644
--- a/crates/nu-protocol/src/pipeline/pipeline_data.rs
+++ b/crates/nu-protocol/src/pipeline/pipeline_data.rs
@@ -142,6 +142,40 @@ impl PipelineData {
         }
     }
 
+    /// Converts any `Value` variant that can be represented as a stream into its stream variant.
+    ///
+    /// This means that lists and ranges are converted into list streams, and strings and binary are
+    /// converted into byte streams.
+    ///
+    /// Returns an `Err` with the original stream if the variant couldn't be converted to a stream
+    /// variant. If the variant is already a stream variant, it is returned as-is.
+    pub fn try_into_stream(self, engine_state: &EngineState) -> Result<PipelineData, PipelineData> {
+        let span = self.span().unwrap_or(Span::unknown());
+        match self {
+            PipelineData::ListStream(..) | PipelineData::ByteStream(..) => Ok(self),
+            PipelineData::Value(Value::List { .. } | Value::Range { .. }, ref metadata) => {
+                let metadata = metadata.clone();
+                Ok(PipelineData::ListStream(
+                    ListStream::new(self.into_iter(), span, engine_state.signals().clone()),
+                    metadata,
+                ))
+            }
+            PipelineData::Value(Value::String { val, .. }, metadata) => {
+                Ok(PipelineData::ByteStream(
+                    ByteStream::read_string(val, span, engine_state.signals().clone()),
+                    metadata,
+                ))
+            }
+            PipelineData::Value(Value::Binary { val, .. }, metadata) => {
+                Ok(PipelineData::ByteStream(
+                    ByteStream::read_binary(val, span, engine_state.signals().clone()),
+                    metadata,
+                ))
+            }
+            _ => Err(self),
+        }
+    }
+
     /// Writes all values or redirects all output to the current [`OutDest`]s in `stack`.
     ///
     /// For [`OutDest::Pipe`] and [`OutDest::Capture`], this will return the `PipelineData` as is

From c150af42795d4078f0ea3b66eb1fe60d3373e510 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Mon, 2 Sep 2024 22:29:53 +0800
Subject: [PATCH 0396/1072] Don't panic on `detect columns` with `--guess` flag
 (#13752)

# Description
This pr addresses the comment:
https://github.com/nushell/nushell/issues/11791#issuecomment-2308384155

It's caused by if the last row have a very different format to the first
row, the value of `end_char` will exceed the `line_char_boundaries`.
Adding a guard for it should avoid such panic.

# User-Facing Changes
The following code should no longer panic:
```shell
"nu_plugin_highlight = '1.2.2+0.97.1'    # A nushell plugin for syntax highlighting
trace_nu_plugin = '0.3.1'               # A wrapper to trace Nu plugins
nu_plugin_bash_env = '0.13.0'           # Nu plugin bash-env
nu_plugin_from_sse = '0.4.0'            # Nushell plugin to convert a HTTP server sent event stream to structured data
... and 90 crates more (use --limit N to see more)" | detect columns -n --guess
```

# Tests + Formatting
Added 1 test.
---
 crates/nu-command/src/strings/guess_width.rs | 35 ++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/crates/nu-command/src/strings/guess_width.rs b/crates/nu-command/src/strings/guess_width.rs
index 8c758516bd..59d666dd02 100644
--- a/crates/nu-command/src/strings/guess_width.rs
+++ b/crates/nu-command/src/strings/guess_width.rs
@@ -203,7 +203,7 @@ fn split(line: &str, pos: &[usize], trim_space: bool) -> Vec<String> {
 
         if pos[n] <= w {
             let end_char = separator_position(&line_chars, p, pos, n);
-            if start_char > end_char {
+            if start_char > end_char || end_char >= line_char_boundaries.len() {
                 break;
             }
             let col = &line[line_char_boundaries[start_char]..line_char_boundaries[end_char]];
@@ -575,7 +575,7 @@ E F G H";
     #[test]
     fn test_guess_width_row_with_only_whitespace() {
         let input = "A B C D
-       
+
 E F G H";
 
         let r = Box::new(std::io::BufReader::new(input.as_bytes())) as Box<dyn std::io::Read>;
@@ -594,6 +594,37 @@ E F G H";
         assert_eq!(got, want);
     }
 
+    #[test]
+    fn test_guess_no_panic_for_some_cases() {
+        let input = r#"nu_plugin_highlight = '1.2.2+0.97.1'    # A nushell plugin for syntax highlighting
+trace_nu_plugin = '0.3.1'               # A wrapper to trace Nu plugins
+nu_plugin_bash_env = '0.13.0'           # Nu plugin bash-env
+nu_plugin_from_sse = '0.4.0'            # Nushell plugin to convert a HTTP server sent event stream to structured data
+... and 90 crates more (use --limit N to see more)"#;
+        let r = Box::new(std::io::BufReader::new(input.as_bytes())) as Box<dyn std::io::Read>;
+        let reader = std::io::BufReader::new(r);
+
+        let mut guess_width = GuessWidth {
+            reader,
+            pos: Vec::new(),
+            pre_lines: Vec::new(),
+            pre_count: 0,
+            limit_split: 0,
+        };
+
+        let first_column_want = [
+            "nu_plugin_highlight = '1.2.2+0.97.1'",
+            "trace_nu_plugin = '0.3.1'",
+            "nu_plugin_bash_env = '0.13.0'",
+            "nu_plugin_from_sse = '0.4.0'",
+            "... and 90 crates more (use --limit N",
+        ];
+        let got = guess_width.read_all();
+        for (row_indx, row) in got.into_iter().enumerate() {
+            assert_eq!(row[0], first_column_want[row_indx]);
+        }
+    }
+
     #[test]
     fn test_to_table() {
         let lines = vec![

From 61544eecd6388fcea5b40861503f000e23ca1ab0 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Tue, 3 Sep 2024 12:46:36 -0500
Subject: [PATCH 0397/1072] add version and path to plugin executable help
 (#13764)

# Description

This change allows one to see the version of their plugin file without
trying to register it.


![image](https://github.com/user-attachments/assets/9f1ddbd7-f63f-47f7-87c8-0d839f5e4b1f)


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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-plugin/src/plugin/mod.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/crates/nu-plugin/src/plugin/mod.rs b/crates/nu-plugin/src/plugin/mod.rs
index 340d55e3b9..c5af681f5e 100644
--- a/crates/nu-plugin/src/plugin/mod.rs
+++ b/crates/nu-plugin/src/plugin/mod.rs
@@ -655,6 +655,15 @@ fn print_help(plugin: &impl Plugin, encoder: impl PluginEncoder) {
 
     println!("Nushell Plugin");
     println!("Encoder: {}", encoder.name());
+    println!("Version: {}", plugin.version());
+
+    // Determine the plugin name
+    let exe = std::env::current_exe().ok();
+    let plugin_name: String = exe
+        .as_ref()
+        .map(|stem| stem.to_string_lossy().into_owned())
+        .unwrap_or_else(|| "(unknown)".into());
+    println!("Plugin file path: {}", plugin_name);
 
     let mut help = String::new();
     let help_style = HelpStyle::default();

From 2c827d2bf46aa73adc2ecb968c8c64e1bc4d8e51 Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Wed, 4 Sep 2024 09:28:00 +0800
Subject: [PATCH 0398/1072] Try to add aarch64-unknown-linux-musl and
 armv7-unknown-linux-musleabihf release target (#13775)

Related: https://github.com/nushell/nushell/issues/10444

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

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

# Description
Try to add `aarch64-unknown-linux-musl` and
`armv7-unknown-linux-musleabihf` release target
I will test these two new targets in the nightly workflow, It should
work:
https://github.com/nushell/nightly/actions/runs/10692449465/job/29640875827,
and check the release binaries. If everything goes well we can add the
`musl` targets in the next release
---
 .github/workflows/nightly-build.yml |  6 ++++++
 .github/workflows/release-pkg.nu    | 14 ++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index c581e4a274..8a598cf1ca 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -78,7 +78,9 @@ jobs:
         - x86_64-unknown-linux-gnu
         - x86_64-unknown-linux-musl
         - aarch64-unknown-linux-gnu
+        - aarch64-unknown-linux-musl
         - armv7-unknown-linux-gnueabihf
+        - armv7-unknown-linux-musleabihf
         - riscv64gc-unknown-linux-gnu
         extra: ['bin']
         include:
@@ -104,8 +106,12 @@ jobs:
           os: ubuntu-22.04
         - target: aarch64-unknown-linux-gnu
           os: ubuntu-22.04
+        - target: aarch64-unknown-linux-musl
+          os: ubuntu-22.04
         - target: armv7-unknown-linux-gnueabihf
           os: ubuntu-22.04
+        - target: armv7-unknown-linux-musleabihf
+          os: ubuntu-22.04
         - target: riscv64gc-unknown-linux-gnu
           os: ubuntu-latest
 
diff --git a/.github/workflows/release-pkg.nu b/.github/workflows/release-pkg.nu
index 562f42b4a4..f1d56d7614 100755
--- a/.github/workflows/release-pkg.nu
+++ b/.github/workflows/release-pkg.nu
@@ -84,6 +84,20 @@ if $os in ['macos-latest'] or $USE_UBUNTU {
             $env.CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER = 'arm-linux-gnueabihf-gcc'
             cargo-build-nu
         }
+        'aarch64-unknown-linux-musl' => {
+            aria2c https://musl.cc/aarch64-linux-musl-cross.tgz
+            tar -xf aarch64-linux-musl-cross.tgz
+            $env.PATH = ($env.PATH | split row (char esep) | prepend $'($env.PWD)/aarch64-linux-musl-cross/bin')
+            $env.CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER = 'aarch64-linux-musl-gcc'
+            cargo-build-nu
+        }
+        'armv7-unknown-linux-musleabihf' => {
+            aria2c https://musl.cc/armv7r-linux-musleabihf-cross.tgz
+            tar -xf armv7r-linux-musleabihf-cross.tgz
+            $env.PATH = ($env.PATH | split row (char esep) | prepend $'($env.PWD)/armv7r-linux-musleabihf-cross/bin')
+            $env.CARGO_TARGET_ARMV7_UNKNOWN_LINUX_MUSLEABIHF_LINKER = 'armv7r-linux-musleabihf-gcc'
+            cargo-build-nu
+        }
         _ => {
             # musl-tools to fix 'Failed to find tool. Is `musl-gcc` installed?'
             # Actually just for x86_64-unknown-linux-musl target

From 348c59b7401114848055f1eb7b00f8fe7a1c88f5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Sep 2024 10:02:01 +0800
Subject: [PATCH 0399/1072] Bump indexmap from 2.4.0 to 2.5.0 (#13772)

Bumps [indexmap](https://github.com/indexmap-rs/indexmap) from 2.4.0 to
2.5.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/indexmap-rs/indexmap/blob/master/RELEASES.md">indexmap's
changelog</a>.</em></p>
<blockquote>
<h2>2.5.0</h2>
<ul>
<li>Added an <code>insert_before</code> method to <code>IndexMap</code>
and <code>IndexSet</code>, as an
alternative to <code>shift_insert</code> with different behavior on
existing entries.</li>
<li>Added <code>first_entry</code> and <code>last_entry</code> methods
to <code>IndexMap</code>.</li>
<li>Added <code>From</code> implementations between
<code>IndexedEntry</code> and <code>OccupiedEntry</code>.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/48ed49017c9af536bda2916c78e77b619163a2f2"><code>48ed490</code></a>
Release 2.5.0</li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/139d7addfb59a77ebaf52490a19f0f129d49abfa"><code>139d7ad</code></a>
Merge pull request <a
href="https://redirect.github.com/indexmap-rs/indexmap/issues/340">#340</a>
from cuviper/insert-bounds</li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/1d9b5e3d0345aacf296eec8515746b3dfb81f97d"><code>1d9b5e3</code></a>
Add doc examples for <code>insert_before</code> and
<code>shift_insert</code></li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/8ca01b0df72a4914b2248a65087ce67e3711f52d"><code>8ca01b0</code></a>
Use <code>insert_before</code> for &quot;new&quot; entries in
<code>insert_sorted</code></li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/7224def0106a4a6074a0d4619ce99d4120b859a8"><code>7224def</code></a>
Add <code>insert_before</code> as an alternate to
<code>shift_insert</code></li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/0247a1555de940982260384101946d3f958452e5"><code>0247a15</code></a>
Document and assert index bounds in <code>shift_insert</code></li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/922c6ad1afebfa7c6f5781fdb4fcba88f1cb2e0a"><code>922c6ad</code></a>
Update the CI badge</li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/e482e1768a2aa8ef50788e413b3c254a6cf6e776"><code>e482e17</code></a>
Merge pull request <a
href="https://redirect.github.com/indexmap-rs/indexmap/issues/342">#342</a>
from cuviper/btree-like</li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/b63e4a15568f8da4403734f35f0b1e2ad908a3db"><code>b63e4a1</code></a>
Merge pull request <a
href="https://redirect.github.com/indexmap-rs/indexmap/issues/341">#341</a>
from cuviper/from-entry</li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/264e5b73045b1f28d36f80c7e3d0bac63af5e887"><code>264e5b7</code></a>
Add doc aliases like <code>BTreeMap</code>/<code>BTreeSet</code></li>
<li>Additional commits viewable in <a
href="https://github.com/indexmap-rs/indexmap/compare/2.4.0...2.5.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=indexmap&package-manager=cargo&previous-version=2.4.0&new-version=2.5.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                         | 4 ++--
 Cargo.toml                         | 2 +-
 crates/nu_plugin_polars/Cargo.toml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c73ddb8f32..898b36a29a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2058,9 +2058,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
+checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.5",
diff --git a/Cargo.toml b/Cargo.toml
index 19f12d9a5a..e349c57a45 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -92,7 +92,7 @@ filetime = "0.2"
 fuzzy-matcher = "0.3"
 heck = "0.5.0"
 human-date-parser = "0.1.1"
-indexmap = "2.4"
+indexmap = "2.5"
 indicatif = "0.17"
 interprocess = "2.2.0"
 is_executable = "1.0"
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index b333ae16ae..2d3e1ee312 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -26,7 +26,7 @@ nu-utils = { path = "../nu-utils", version = "0.97.2" }
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
 chrono-tz = "0.9"
 fancy-regex = { workspace = true }
-indexmap = { version = "2.4" }
+indexmap = { version = "2.5" }
 mimalloc = { version = "0.1.42" }
 num = {version = "0.4"}
 serde = { version = "1.0", features = ["derive"] }

From 6be458c6869f596471ada820d719967ec46e7ff8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Sep 2024 10:02:48 +0800
Subject: [PATCH 0400/1072] Bump itertools from 0.12.1 to 0.13.0 (#13774)

Bumps [itertools](https://github.com/rust-itertools/itertools) from
0.12.1 to 0.13.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/rust-itertools/itertools/blob/master/CHANGELOG.md">itertools's
changelog</a>.</em></p>
<blockquote>
<h2>0.13.0</h2>
<h3>Breaking</h3>
<ul>
<li>Removed implementation of <code>DoubleEndedIterator</code> for
<code>ConsTuples</code> (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/853">#853</a>)</li>
<li>Made <code>MultiProduct</code> fused and fixed on an empty iterator
(<a
href="https://redirect.github.com/rust-itertools/itertools/issues/835">#835</a>,
<a
href="https://redirect.github.com/rust-itertools/itertools/issues/834">#834</a>)</li>
<li>Changed <code>iproduct!</code> to return tuples for maxi one
iterator too (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/870">#870</a>)</li>
<li>Changed <code>PutBack::put_back</code> to return the old value (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/880">#880</a>)</li>
<li>Removed deprecated <code>repeat_call, Itertools::{foreach, step,
map_results, fold_results}</code> (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/878">#878</a>)</li>
<li>Removed <code>TakeWhileInclusive::new</code> (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/912">#912</a>)</li>
</ul>
<h3>Added</h3>
<ul>
<li>Added <code>Itertools::{smallest_by, smallest_by_key, largest,
largest_by, largest_by_key}</code> (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/654">#654</a>,
<a
href="https://redirect.github.com/rust-itertools/itertools/issues/885">#885</a>)</li>
<li>Added <code>Itertools::tail</code> (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/899">#899</a>)</li>
<li>Implemented <code>DoubleEndedIterator</code> for
<code>ProcessResults</code> (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/910">#910</a>)</li>
<li>Implemented <code>Debug</code> for <code>FormatWith</code> (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/931">#931</a>)</li>
<li>Added <code>Itertools::get</code> (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/891">#891</a>)</li>
</ul>
<h3>Changed</h3>
<ul>
<li>Deprecated <code>Itertools::group_by</code> (renamed
<code>chunk_by</code>) (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/866">#866</a>,
<a
href="https://redirect.github.com/rust-itertools/itertools/issues/879">#879</a>)</li>
<li>Deprecated <code>unfold</code> (use <code>std::iter::from_fn</code>
instead) (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/871">#871</a>)</li>
<li>Optimized <code>GroupingMapBy</code> (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/873">#873</a>,
<a
href="https://redirect.github.com/rust-itertools/itertools/issues/876">#876</a>)</li>
<li>Relaxed <code>Fn</code> bounds to <code>FnMut</code> in
<code>diff_with, Itertools::into_group_map_by</code> (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/886">#886</a>)</li>
<li>Relaxed <code>Debug/Clone</code> bounds for <code>MapInto</code> (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/889">#889</a>)</li>
<li>Documented the <code>use_alloc</code> feature (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/887">#887</a>)</li>
<li>Optimized <code>Itertools::set_from</code> (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/888">#888</a>)</li>
<li>Removed badges in <code>README.md</code> (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/890">#890</a>)</li>
<li>Added &quot;no-std&quot; categories in <code>Cargo.toml</code> (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/894">#894</a>)</li>
<li>Fixed <code>Itertools::k_smallest</code> on short unfused iterators
(<a
href="https://redirect.github.com/rust-itertools/itertools/issues/900">#900</a>)</li>
<li>Deprecated <code>Itertools::tree_fold1</code> (renamed
<code>tree_reduce</code>) (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/895">#895</a>)</li>
<li>Deprecated <code>GroupingMap::fold_first</code> (renamed
<code>reduce</code>) (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/902">#902</a>)</li>
<li>Fixed <code>Itertools::k_smallest(0)</code> to consume the iterator,
optimized <code>Itertools::k_smallest(1)</code> (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/909">#909</a>)</li>
<li>Specialized <code>Combinations::nth</code> (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/914">#914</a>)</li>
<li>Specialized <code>MergeBy::fold</code> (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/920">#920</a>)</li>
<li>Specialized <code>CombinationsWithReplacement::nth</code> (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/923">#923</a>)</li>
<li>Specialized <code>FlattenOk::{fold, rfold}</code> (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/927">#927</a>)</li>
<li>Specialized <code>Powerset::nth</code> (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/924">#924</a>)</li>
<li>Documentation fixes (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/882">#882</a>,
<a
href="https://redirect.github.com/rust-itertools/itertools/issues/936">#936</a>)</li>
<li>Fixed <code>assert_equal</code> for iterators longer than
<code>i32::MAX</code> (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/932">#932</a>)</li>
<li>Updated the <code>must_use</code> message of non-lazy
<code>KMergeBy</code> and <code>TupleCombinations</code> (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/939">#939</a>)</li>
</ul>
<h3>Notable Internal Changes</h3>
<ul>
<li>Tested iterator laziness (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/792">#792</a>)</li>
<li>Created <code>CONTRIBUTING.md</code> (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/767">#767</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/rust-itertools/itertools/commit/d5084d15e959b85d89a49e5cd33ad6267bc541a3"><code>d5084d1</code></a>
Prepare v0.13.0 release (<a
href="https://redirect.github.com/rust-itertools/itertools/issues/937">#937</a>)</li>
<li><a
href="https://github.com/rust-itertools/itertools/commit/d7c99d55daeaa76f482444e95beb99f5744ced4e"><code>d7c99d5</code></a>
<code>TupleCombinations</code> is not lazy but must be used
nonetheless</li>
<li><a
href="https://github.com/rust-itertools/itertools/commit/074c7fcc07c2bfd60f238585c05134ea3eb43f77"><code>074c7fc</code></a>
<code>KMergeBy</code> is not lazy but must be used nonetheless</li>
<li><a
href="https://github.com/rust-itertools/itertools/commit/2ad9e07ae860bb891e48b35edfea5b3286dcb4ab"><code>2ad9e07</code></a>
<code>assert_equal</code>: fix
<code>clippy::default_numeric_fallback</code></li>
<li><a
href="https://github.com/rust-itertools/itertools/commit/0d4efc84323399b47b09ae9da1ff3fdfc2cf95e1"><code>0d4efc8</code></a>
Remove free function <code>get</code></li>
<li><a
href="https://github.com/rust-itertools/itertools/commit/05cc0ee256e84d665e34209053ebc62ef7e4463d"><code>05cc0ee</code></a>
<code>get(s..=usize::MAX)</code> should be fine when <code>s !=
0</code></li>
<li><a
href="https://github.com/rust-itertools/itertools/commit/3c16f14baa5515376adcd8c530f6d3d275b14f44"><code>3c16f14</code></a>
<code>get</code>: when is it ESI and/or DEI</li>
<li><a
href="https://github.com/rust-itertools/itertools/commit/4dd6ba0e7c44bb287dff1098d8fb6ab77c32bf87"><code>4dd6ba0</code></a>
<code>get</code>: panics if the range includes
<code>usize::MAX</code></li>
<li><a
href="https://github.com/rust-itertools/itertools/commit/7a9ce56fc59489668178d696db76afb3580a359c"><code>7a9ce56</code></a>
<code>get(r: Range)</code> as <code>Skip\&lt;Take&gt;</code></li>
<li><a
href="https://github.com/rust-itertools/itertools/commit/f676f2f96451220c827c62f714d79ce6454d0184"><code>f676f2f</code></a>
Remove the unspecified check about
<code>.get(exhausted_range_inclusive)</code></li>
<li>Additional commits viewable in <a
href="https://github.com/rust-itertools/itertools/compare/v0.12.1...v0.13.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=itertools&package-manager=cargo&previous-version=0.12.1&new-version=0.13.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 14 +++++++-------
 Cargo.toml |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 898b36a29a..023afbe0f8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -375,7 +375,7 @@ dependencies = [
  "bitflags 2.6.0",
  "cexpr",
  "clang-sys",
- "itertools 0.12.1",
+ "itertools 0.11.0",
  "lazy_static",
  "lazycell",
  "proc-macro2",
@@ -3027,7 +3027,7 @@ version = "0.97.2"
 dependencies = [
  "fancy-regex",
  "heck",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "nu-ansi-term",
  "nu-cmd-base",
  "nu-cmd-lang",
@@ -3050,7 +3050,7 @@ dependencies = [
 name = "nu-cmd-lang"
 version = "0.97.2"
 dependencies = [
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "nu-engine",
  "nu-parser",
  "nu-protocol",
@@ -3062,7 +3062,7 @@ dependencies = [
 name = "nu-cmd-plugin"
 version = "0.97.2"
 dependencies = [
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "nu-engine",
  "nu-path",
  "nu-plugin-engine",
@@ -3110,7 +3110,7 @@ dependencies = [
  "human-date-parser",
  "indexmap",
  "indicatif",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "log",
  "lscolors",
  "md-5",
@@ -3286,7 +3286,7 @@ version = "0.97.2"
 dependencies = [
  "bytesize",
  "chrono",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "log",
  "nu-engine",
  "nu-path",
@@ -3444,7 +3444,7 @@ name = "nu-system"
 version = "0.97.2"
 dependencies = [
  "chrono",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "libc",
  "libproc",
  "log",
diff --git a/Cargo.toml b/Cargo.toml
index e349c57a45..5a4cf3d536 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -96,7 +96,7 @@ indexmap = "2.5"
 indicatif = "0.17"
 interprocess = "2.2.0"
 is_executable = "1.0"
-itertools = "0.12"
+itertools = "0.13"
 libc = "0.2"
 libproc = "0.14"
 log = "0.4"

From e7b7c7f39a34d899a9da6454d4a3813ac9ec99d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Sep 2024 10:03:02 +0800
Subject: [PATCH 0401/1072] Bump nix from 0.28.0 to 0.29.0 (#13773)

Bumps [nix](https://github.com/nix-rust/nix) from 0.28.0 to 0.29.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/nix-rust/nix/blob/master/CHANGELOG.md">nix's
changelog</a>.</em></p>
<blockquote>
<h2>[0.29.0] - 2024-05-24</h2>
<h3>Added</h3>
<ul>
<li>Add <code>getregset()/setregset()</code> for
Linux/glibc/x86/x86_64/aarch64/riscv64 and
<code>getregs()/setregs()</code> for Linux/glibc/aarch64/riscv64
(<a
href="https://redirect.github.com/nix-rust/nix/pull/2044">#2044</a>)</li>
<li>Add socket option Ipv6Ttl for apple targets.
(<a
href="https://redirect.github.com/nix-rust/nix/pull/2287">#2287</a>)</li>
<li>Add socket option UtunIfname.
(<a
href="https://redirect.github.com/nix-rust/nix/pull/2325">#2325</a>)</li>
<li>make SigAction repr(transparent) &amp; can be converted to the libc
raw type
(<a
href="https://redirect.github.com/nix-rust/nix/pull/2326">#2326</a>)</li>
<li>Add <code>From</code> trait implementation for conversions between
<code>sockaddr_in</code> and
<code>SockaddrIn</code>, <code>sockaddr_in6</code> and
<code>SockaddrIn6</code>
(<a
href="https://redirect.github.com/nix-rust/nix/pull/2328">#2328</a>)</li>
<li>Add socket option ReusePortLb for FreeBSD.
(<a
href="https://redirect.github.com/nix-rust/nix/pull/2332">#2332</a>)</li>
<li>Added support for openat2 on linux.
(<a
href="https://redirect.github.com/nix-rust/nix/pull/2339">#2339</a>)</li>
<li>Add if_indextoname function.
(<a
href="https://redirect.github.com/nix-rust/nix/pull/2340">#2340</a>)</li>
<li>Add <code>mount</code> and <code>unmount</code> API for apple
targets.
(<a
href="https://redirect.github.com/nix-rust/nix/pull/2347">#2347</a>)</li>
<li>Added <code>_PC_MIN_HOLE_SIZE</code> for <code>pathconf</code> and
<code>fpathconf</code>.
(<a
href="https://redirect.github.com/nix-rust/nix/pull/2349">#2349</a>)</li>
<li>Added <code>impl AsFd for pty::PtyMaster</code>
(<a
href="https://redirect.github.com/nix-rust/nix/pull/2355">#2355</a>)</li>
<li>Add <code>open</code> flag <code>O_SEARCH</code> to AIX,
Empscripten, FreeBSD, Fuchsia, solarish,
WASI (<a
href="https://redirect.github.com/nix-rust/nix/pull/2374">#2374</a>)</li>
<li>Add prctl function <code>prctl_set_vma_anon_name</code> for
Linux/Android.
(<a
href="https://redirect.github.com/nix-rust/nix/pull/2378">#2378</a>)</li>
<li>Add <code>sync(2)</code> for
<code>apple_targets/solarish/haiku/aix/hurd</code>,
<code>syncfs(2)</code> for
<code>hurd</code> and <code>fdatasync(2)</code> for
<code>aix/hurd</code>
(<a
href="https://redirect.github.com/nix-rust/nix/pull/2379">#2379</a>)</li>
<li>Add fdatasync support for Apple targets.
(<a
href="https://redirect.github.com/nix-rust/nix/pull/2380">#2380</a>)</li>
<li>Add <code>fcntl::OFlag::O_PATH</code> for FreeBSD and Fuchsia
(<a
href="https://redirect.github.com/nix-rust/nix/pull/2382">#2382</a>)</li>
<li>Added <code>PathconfVar::MIN_HOLE_SIZE</code> for apple_targets.
(<a
href="https://redirect.github.com/nix-rust/nix/pull/2388">#2388</a>)</li>
<li>Add <code>open</code> flag <code>O_SEARCH</code> to apple_targets
(<a
href="https://redirect.github.com/nix-rust/nix/pull/2391">#2391</a>)</li>
<li><code>O_DSYNC</code> may now be used with <code>aio_fsync</code> and
<code>fcntl</code> on FreeBSD.
(<a
href="https://redirect.github.com/nix-rust/nix/pull/2404">#2404</a>)</li>
<li>Added <code>Flock::relock</code> for upgrading and downgrading
locks.
(<a
href="https://redirect.github.com/nix-rust/nix/pull/2407">#2407</a>)</li>
</ul>
<h3>Changed</h3>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/nix-rust/nix/commit/1dad4d8d04a2cd187fae87cb91c4f4e95ff0decd"><code>1dad4d8</code></a>
chore: prepare for 0.29.0</li>
<li><a
href="https://github.com/nix-rust/nix/commit/f7431971b40f9516e6c8d280db353fd55d7ac7d7"><code>f743197</code></a>
fix ControlMessageOwned::UdpGroSegments UDP packets processing type. (<a
href="https://redirect.github.com/nix-rust/nix/issues/2406">#2406</a>)</li>
<li><a
href="https://github.com/nix-rust/nix/commit/208b80b65d9a54bac3172b97af81cfe90dd6412b"><code>208b80b</code></a>
recvmsg: Check if CMSG buffer was too small and return an error (<a
href="https://redirect.github.com/nix-rust/nix/issues/2413">#2413</a>)</li>
<li><a
href="https://github.com/nix-rust/nix/commit/ecd12a99907d6b1c9f43e88c087b1c6a2f633750"><code>ecd12a9</code></a>
test: remove test of inode count in test_statfs.rs (<a
href="https://redirect.github.com/nix-rust/nix/issues/2414">#2414</a>)</li>
<li><a
href="https://github.com/nix-rust/nix/commit/663506a602251675c66efcd9d25a2dfc3c2c61da"><code>663506a</code></a>
fix: only close <code>fanotify</code> events with a valid fd (<a
href="https://redirect.github.com/nix-rust/nix/issues/2399">#2399</a>)</li>
<li><a
href="https://github.com/nix-rust/nix/commit/1604723757735e59bf3142209b22b250b7412d40"><code>1604723</code></a>
revert: impl From&lt;sigaction&gt; for SigAction (<a
href="https://redirect.github.com/nix-rust/nix/issues/2410">#2410</a>)</li>
<li><a
href="https://github.com/nix-rust/nix/commit/ec4beb5a2229159021298d56af16e18a9151fb4e"><code>ec4beb5</code></a>
docs: correct limit value of FAN_UNLIMITED_QUEUE and
FAN_UNLIMITED_MARKS[skip...</li>
<li><a
href="https://github.com/nix-rust/nix/commit/84c0444c3a957b8bffd5172848d4ea73eb06c3ff"><code>84c0444</code></a>
chore: bump libc to 0.2.155 (<a
href="https://redirect.github.com/nix-rust/nix/issues/2409">#2409</a>)</li>
<li><a
href="https://github.com/nix-rust/nix/commit/c5af4adffd876605002e3a8a22b53fe9c83206d3"><code>c5af4ad</code></a>
Add Flock::relock (<a
href="https://redirect.github.com/nix-rust/nix/issues/2407">#2407</a>)</li>
<li><a
href="https://github.com/nix-rust/nix/commit/e7acaff07f39ece39eae38a45c82810bfbbf58cd"><code>e7acaff</code></a>
Enable O_DSYNC on FreeBSD with fcntl and aio_fsync (<a
href="https://redirect.github.com/nix-rust/nix/issues/2404">#2404</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/nix-rust/nix/compare/v0.28.0...v0.29.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=nix&package-manager=cargo&previous-version=0.28.0&new-version=0.29.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 12 ++++++------
 Cargo.toml |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 023afbe0f8..eca168dbe2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2931,7 +2931,7 @@ dependencies = [
  "miette",
  "mimalloc",
  "multipart-rs",
- "nix 0.28.0",
+ "nix 0.29.0",
  "nu-cli",
  "nu-cmd-base",
  "nu-cmd-extra",
@@ -3119,7 +3119,7 @@ dependencies = [
  "mockito",
  "multipart-rs",
  "native-tls",
- "nix 0.28.0",
+ "nix 0.29.0",
  "notify-debouncer-full",
  "nu-ansi-term",
  "nu-cmd-base",
@@ -3310,7 +3310,7 @@ name = "nu-plugin"
 version = "0.97.2"
 dependencies = [
  "log",
- "nix 0.28.0",
+ "nix 0.29.0",
  "nu-engine",
  "nu-plugin-core",
  "nu-plugin-protocol",
@@ -3407,7 +3407,7 @@ dependencies = [
  "log",
  "lru",
  "miette",
- "nix 0.28.0",
+ "nix 0.29.0",
  "nu-derive-value",
  "nu-path",
  "nu-system",
@@ -3449,7 +3449,7 @@ dependencies = [
  "libproc",
  "log",
  "mach2",
- "nix 0.28.0",
+ "nix 0.29.0",
  "ntapi",
  "once_cell",
  "procfs",
@@ -3498,7 +3498,7 @@ dependencies = [
  "crossterm_winapi",
  "log",
  "lscolors",
- "nix 0.28.0",
+ "nix 0.29.0",
  "num-format",
  "serde",
  "strip-ansi-escapes",
diff --git a/Cargo.toml b/Cargo.toml
index 5a4cf3d536..070269cf77 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -112,7 +112,7 @@ mime_guess = "2.0"
 mockito = { version = "1.5", default-features = false }
 multipart-rs = "0.1.11"
 native-tls = "0.2"
-nix = { version = "0.28", default-features = false }
+nix = { version = "0.29", default-features = false }
 notify-debouncer-full = { version = "0.3", default-features = false }
 nu-ansi-term = "0.50.1"
 num-format = "0.4"

From fa4f9b083e5571c11a60625f4b942a87c56951ab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Sep 2024 10:03:07 +0800
Subject: [PATCH 0402/1072] Bump crate-ci/typos from 1.24.1 to 1.24.4 (#13770)

Bumps [crate-ci/typos](https://github.com/crate-ci/typos) from 1.24.1 to
1.24.4.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/crate-ci/typos/releases">crate-ci/typos's
releases</a>.</em></p>
<blockquote>
<h2>v1.24.4</h2>
<h2>[1.24.4] - 2024-09-03</h2>
<h3>Fixes</h3>
<ul>
<li>Offer a correction for <code>grather</code></li>
</ul>
<h2>v1.24.3</h2>
<h2>[1.24.3] - 2024-08-30</h2>
<h3>Fixes</h3>
<ul>
<li>Updated the dictionary with the <a
href="https://redirect.github.com/crate-ci/typos/issues/1069">August
2024</a> changes</li>
</ul>
<h2>v1.24.2</h2>
<h2>[1.24.2] - 2024-08-30</h2>
<h3>Performance</h3>
<ul>
<li>Cap unbounded parsing to avoid worst case performance (hit with test
data)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/crate-ci/typos/blob/master/CHANGELOG.md">crate-ci/typos's
changelog</a>.</em></p>
<blockquote>
<h2>[1.24.4] - 2024-09-03</h2>
<h3>Fixes</h3>
<ul>
<li>Offer a correction for <code>grather</code></li>
</ul>
<h2>[1.24.3] - 2024-08-30</h2>
<h3>Fixes</h3>
<ul>
<li>Updated the dictionary with the <a
href="https://redirect.github.com/crate-ci/typos/issues/1069">August
2024</a> changes</li>
</ul>
<h2>[1.24.2] - 2024-08-30</h2>
<h3>Performance</h3>
<ul>
<li>Cap unbounded parsing to avoid worst case performance (hit with test
data)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/crate-ci/typos/commit/853bbe8898c2e3ce040ba6fb0b2cbb3d0ababec5"><code>853bbe8</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/b5f56600b2fce35c214fc337a4884c4eafa6407a"><code>b5f5660</code></a>
docs: Update changelog</li>
<li><a
href="https://github.com/crate-ci/typos/commit/39f678e520527f50a251775ee38731def724d591"><code>39f678e</code></a>
Merge pull request <a
href="https://redirect.github.com/crate-ci/typos/issues/1093">#1093</a>
from kachick/grather-suggest-candidates</li>
<li><a
href="https://github.com/crate-ci/typos/commit/bb6905fdc963da291c50ef79072a8cbccac06e81"><code>bb6905f</code></a>
Merge pull request <a
href="https://redirect.github.com/crate-ci/typos/issues/1092">#1092</a>
from crate-ci/renovate/embarkstudios-cargo-deny-acti...</li>
<li><a
href="https://github.com/crate-ci/typos/commit/786c825f1753f87b02d24770e3f4ec8043d9084a"><code>786c825</code></a>
fix(dict): Add suggestions for the typo &quot;grather&quot;</li>
<li><a
href="https://github.com/crate-ci/typos/commit/340058181bc154efb6751badb34d4e40285d654b"><code>3400581</code></a>
chore(deps): Update EmbarkStudios/cargo-deny-action action to v2</li>
<li><a
href="https://github.com/crate-ci/typos/commit/9ad6f5c0549e0eb32bd70e26d5083421d639f278"><code>9ad6f5c</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/12e101ec518a3968b5ff2fc190678feef21970de"><code>12e101e</code></a>
docs: Update changelog</li>
<li><a
href="https://github.com/crate-ci/typos/commit/8c58591ec4bb391e454a69652952102e6a5810aa"><code>8c58591</code></a>
Merge pull request <a
href="https://redirect.github.com/crate-ci/typos/issues/1091">#1091</a>
from epage/august</li>
<li><a
href="https://github.com/crate-ci/typos/commit/250dcc73e6f494701c8d9584636bc103a7e68326"><code>250dcc7</code></a>
fix(dict): Aug updates</li>
<li>Additional commits viewable in <a
href="https://github.com/crate-ci/typos/compare/v1.24.1...v1.24.4">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=crate-ci/typos&package-manager=github_actions&previous-version=1.24.1&new-version=1.24.4)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/typos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index 0677936b0b..1001a4ff4e 100644
--- 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.24.1
+        uses: crate-ci/typos@v1.24.4

From ebe42241fe76d7df83123374e7de961aa109c6fc Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Wed, 4 Sep 2024 11:27:21 +0200
Subject: [PATCH 0403/1072] Add `#[nu_value(rename = "...")]` as helper
 attribute on members for derive macros (#13761)

# Description

This PR allows the helper attribute `nu_value(rename = "...")` to be
used on struct fields and enum variants. This allows renaming keys and
variants just like [`#[serde(rename =
"name")]`](https://serde.rs/field-attrs.html#rename). This has no
singular variants for `IntoValue` or `FromValue`, both need to use the
same (but I think this shouldn't be an issue for now).

# User-Facing Changes

Users of the derive macros `IntoValue` and `FromValue` may now use
`#[nu_value(rename = "...")]` to rename single fields, but no already
existing code will break.
---
 crates/nu-derive-value/src/attributes.rs    | 118 ++++++++-----
 crates/nu-derive-value/src/case.rs          |  12 +-
 crates/nu-derive-value/src/error.rs         |  22 +++
 crates/nu-derive-value/src/from.rs          | 180 +++++++++++---------
 crates/nu-derive-value/src/into.rs          | 126 ++++++++------
 crates/nu-derive-value/src/lib.rs           |   1 +
 crates/nu-derive-value/src/names.rs         |  61 +++++++
 crates/nu-derive-value/src/tests.rs         | 119 ++++++++++++-
 crates/nu-protocol/src/value/from_value.rs  |  40 ++++-
 crates/nu-protocol/src/value/into_value.rs  |  47 +++--
 crates/nu-protocol/src/value/test_derive.rs |  83 +++++++++
 11 files changed, 599 insertions(+), 210 deletions(-)
 create mode 100644 crates/nu-derive-value/src/names.rs

diff --git a/crates/nu-derive-value/src/attributes.rs b/crates/nu-derive-value/src/attributes.rs
index ef353685ab..f13ac51ce6 100644
--- a/crates/nu-derive-value/src/attributes.rs
+++ b/crates/nu-derive-value/src/attributes.rs
@@ -1,60 +1,92 @@
-use syn::{spanned::Spanned, Attribute, Fields, LitStr};
+use syn::{meta::ParseNestedMeta, spanned::Spanned, Attribute, Fields, LitStr};
 
 use crate::{case::Case, error::DeriveError, HELPER_ATTRIBUTE};
 
+pub trait ParseAttrs: Default {
+    fn parse_attrs<'a, M>(
+        iter: impl IntoIterator<Item = &'a Attribute>,
+    ) -> Result<Self, DeriveError<M>> {
+        let mut attrs = Self::default();
+        for attr in filter(iter.into_iter()) {
+            // This is a container to allow returning derive errors inside the parse_nested_meta fn.
+            let mut err = Ok(());
+            let _ = attr.parse_nested_meta(|meta| {
+                attrs.parse_attr(meta).or_else(|e| {
+                    err = Err(e);
+                    Ok(()) // parse_nested_meta requires another error type, so we escape it here
+                })
+            });
+            err?; // Shortcircuit here if `err` is holding some error.
+        }
+
+        Ok(attrs)
+    }
+
+    fn parse_attr<M>(&mut self, attr_meta: ParseNestedMeta<'_>) -> Result<(), DeriveError<M>>;
+}
+
 #[derive(Debug, Default)]
 pub struct ContainerAttributes {
     pub rename_all: Option<Case>,
     pub type_name: Option<String>,
 }
 
-impl ContainerAttributes {
-    pub fn parse_attrs<'a, M>(
-        iter: impl Iterator<Item = &'a Attribute>,
-    ) -> Result<Self, DeriveError<M>> {
-        let mut container_attrs = ContainerAttributes::default();
-        for attr in filter(iter) {
-            // This is a container to allow returning derive errors inside the parse_nested_meta fn.
-            let mut err = Ok(());
-
-            attr.parse_nested_meta(|meta| {
-                let ident = meta.path.require_ident()?;
-                match ident.to_string().as_str() {
-                    "rename_all" => {
-                        let case: LitStr = meta.value()?.parse()?;
-                        let value_span = case.span();
-                        let case = case.value();
-                        match Case::from_str(&case) {
-                            Some(case) => container_attrs.rename_all = Some(case),
-                            None => {
-                                err = Err(DeriveError::InvalidAttributeValue {
-                                    value_span,
-                                    value: Box::new(case),
-                                });
-                                return Ok(()); // We stored the err in `err`.
-                            }
-                        }
-                    }
-                    "type_name" => {
-                        let type_name: LitStr = meta.value()?.parse()?;
-                        let type_name = type_name.value();
-                        container_attrs.type_name = Some(type_name);
-                    }
-                    ident => {
-                        err = Err(DeriveError::UnexpectedAttribute {
-                            meta_span: ident.span(),
+impl ParseAttrs for ContainerAttributes {
+    fn parse_attr<M>(&mut self, attr_meta: ParseNestedMeta<'_>) -> Result<(), DeriveError<M>> {
+        let ident = attr_meta.path.require_ident()?;
+        match ident.to_string().as_str() {
+            "rename_all" => {
+                let case: LitStr = attr_meta.value()?.parse()?;
+                let value_span = case.span();
+                let case = case.value();
+                match Case::from_str(&case) {
+                    Some(case) => self.rename_all = Some(case),
+                    None => {
+                        return Err(DeriveError::InvalidAttributeValue {
+                            value_span,
+                            value: Box::new(case),
                         });
                     }
                 }
-
-                Ok(())
-            })
-            .map_err(DeriveError::Syn)?;
-
-            err?; // Shortcircuit here if `err` is holding some error.
+            }
+            "type_name" => {
+                let type_name: LitStr = attr_meta.value()?.parse()?;
+                let type_name = type_name.value();
+                self.type_name = Some(type_name);
+            }
+            ident => {
+                return Err(DeriveError::UnexpectedAttribute {
+                    meta_span: ident.span(),
+                });
+            }
         }
 
-        Ok(container_attrs)
+        Ok(())
+    }
+}
+
+#[derive(Debug, Default)]
+pub struct MemberAttributes {
+    pub rename: Option<String>,
+}
+
+impl ParseAttrs for MemberAttributes {
+    fn parse_attr<M>(&mut self, attr_meta: ParseNestedMeta<'_>) -> Result<(), DeriveError<M>> {
+        let ident = attr_meta.path.require_ident()?;
+        match ident.to_string().as_str() {
+            "rename" => {
+                let rename: LitStr = attr_meta.value()?.parse()?;
+                let rename = rename.value();
+                self.rename = Some(rename);
+            }
+            ident => {
+                return Err(DeriveError::UnexpectedAttribute {
+                    meta_span: ident.span(),
+                });
+            }
+        }
+
+        Ok(())
     }
 }
 
diff --git a/crates/nu-derive-value/src/case.rs b/crates/nu-derive-value/src/case.rs
index 02ca5ba255..5962a29b91 100644
--- a/crates/nu-derive-value/src/case.rs
+++ b/crates/nu-derive-value/src/case.rs
@@ -47,12 +47,16 @@ impl Case {
 }
 
 pub trait Casing {
-    fn to_case(&self, case: Case) -> String;
+    fn to_case(&self, case: impl Into<Option<Case>>) -> String;
 }
 
-impl<T: AsRef<str>> Casing for T {
-    fn to_case(&self, case: Case) -> String {
-        let s = self.as_ref();
+impl<T: ToString> Casing for T {
+    fn to_case(&self, case: impl Into<Option<Case>>) -> String {
+        let s = self.to_string();
+        let Some(case) = case.into() else {
+            return s.to_string();
+        };
+
         match case {
             Case::Pascal => s.to_upper_camel_case(),
             Case::Camel => s.to_lower_camel_case(),
diff --git a/crates/nu-derive-value/src/error.rs b/crates/nu-derive-value/src/error.rs
index b7fd3e2f91..cde155044e 100644
--- a/crates/nu-derive-value/src/error.rs
+++ b/crates/nu-derive-value/src/error.rs
@@ -28,6 +28,19 @@ pub enum DeriveError<M> {
         value_span: Span,
         value: Box<dyn Debug>,
     },
+
+    /// Two keys or variants are called the same name breaking bidirectionality.
+    NonUniqueName {
+        name: String,
+        first: Span,
+        second: Span,
+    },
+}
+
+impl<M> From<syn::parse::Error> for DeriveError<M> {
+    fn from(value: syn::parse::Error) -> Self {
+        Self::Syn(value)
+    }
 }
 
 impl<M> From<DeriveError<M>> for Diagnostic {
@@ -77,6 +90,15 @@ impl<M> From<DeriveError<M>> for Diagnostic {
                         "check documentation for `{derive_name}` for valid attribute values"
                     ))
             }
+
+            DeriveError::NonUniqueName {
+                name,
+                first,
+                second,
+            } => Diagnostic::new(Level::Error, format!("non-unique name {name:?} found"))
+                .span_error(first, "first occurrence found here".to_string())
+                .span_error(second, "second occurrence found here".to_string())
+                .help("use `#[nu_value(rename = \"...\")]` to ensure unique names".to_string()),
         }
     }
 }
diff --git a/crates/nu-derive-value/src/from.rs b/crates/nu-derive-value/src/from.rs
index 820fa46bc6..7c929ffca3 100644
--- a/crates/nu-derive-value/src/from.rs
+++ b/crates/nu-derive-value/src/from.rs
@@ -6,13 +6,15 @@ use syn::{
 };
 
 use crate::{
-    attributes::{self, ContainerAttributes},
-    case::{Case, Casing},
+    attributes::{self, ContainerAttributes, MemberAttributes, ParseAttrs},
+    case::Case,
+    names::NameResolver,
 };
 
 #[derive(Debug)]
 pub struct FromValue;
 type DeriveError = super::error::DeriveError<FromValue>;
+type Result<T = TokenStream2> = std::result::Result<T, DeriveError>;
 
 /// Inner implementation of the `#[derive(FromValue)]` macro for structs and enums.
 ///
@@ -23,7 +25,7 @@ type DeriveError = super::error::DeriveError<FromValue>;
 /// - For structs: [`derive_struct_from_value`]
 /// - For enums: [`derive_enum_from_value`]
 /// - Unions are not supported and will return an error.
-pub fn derive_from_value(input: TokenStream2) -> Result<TokenStream2, DeriveError> {
+pub fn derive_from_value(input: TokenStream2) -> Result {
     let input: DeriveInput = syn::parse2(input).map_err(DeriveError::Syn)?;
     match input.data {
         Data::Struct(data_struct) => Ok(derive_struct_from_value(
@@ -52,13 +54,15 @@ fn derive_struct_from_value(
     data: DataStruct,
     generics: Generics,
     attrs: Vec<Attribute>,
-) -> Result<TokenStream2, DeriveError> {
+) -> Result {
     let container_attrs = ContainerAttributes::parse_attrs(attrs.iter())?;
-    attributes::deny_fields(&data.fields)?;
     let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
-    let from_value_impl = struct_from_value(&data, container_attrs.rename_all);
-    let expected_type_impl =
-        struct_expected_type(&data.fields, container_attrs.type_name.as_deref());
+    let from_value_impl = struct_from_value(&data, &container_attrs)?;
+    let expected_type_impl = struct_expected_type(
+        &data.fields,
+        container_attrs.type_name.as_deref(),
+        &container_attrs,
+    )?;
     Ok(quote! {
         #[automatically_derived]
         impl #impl_generics nu_protocol::FromValue for #ident #ty_generics #where_clause {
@@ -200,28 +204,28 @@ fn derive_struct_from_value(
 ///     }
 /// }
 /// ```
-fn struct_from_value(data: &DataStruct, rename_all: Option<Case>) -> TokenStream2 {
-    let body = parse_value_via_fields(&data.fields, quote!(Self), rename_all);
-    quote! {
+fn struct_from_value(data: &DataStruct, container_attrs: &ContainerAttributes) -> Result {
+    let body = parse_value_via_fields(&data.fields, quote!(Self), container_attrs)?;
+    Ok(quote! {
         fn from_value(
             v: nu_protocol::Value
         ) -> std::result::Result<Self, nu_protocol::ShellError> {
             #body
         }
-    }
+    })
 }
 
 /// Implements `FromValue::expected_type` for structs.
 ///
-/// This function constructs the `expected_type` function for structs.
-/// The type depends on the `fields`: named fields construct a record type with every key and type
-/// laid out.
-/// Unnamed fields construct a custom type with the name in the format like
-/// `list[type0, type1, type2]`.
-/// No fields expect the `Type::Nothing`.
+/// This function constructs the `expected_type` function for structs based on the provided fields.
+/// The type depends on the `fields`:
+/// - Named fields construct a record type where each key corresponds to a field name.
+///   The specific keys are resolved by [`NameResolver::resolve_ident`].
+/// - Unnamed fields construct a custom type with the format `list[type0, type1, type2]`.
+/// - Unit structs expect `Type::Nothing`.
 ///
-/// If `#[nu_value(type_name = "...")]` is used, the output type will be `Type::Custom` with that
-/// passed name.
+/// If the `#[nu_value(type_name = "...")]` attribute is used, the output type will be
+/// `Type::Custom` with the provided name.
 ///
 /// # Examples
 ///
@@ -233,6 +237,7 @@ fn struct_from_value(data: &DataStruct, rename_all: Option<Case>) -> TokenStream
 /// struct Pet {
 ///     name: String,
 ///     age: u8,
+///     #[nu_value(rename = "toy")]
 ///     favorite_toy: Option<String>,
 /// }
 ///
@@ -249,7 +254,7 @@ fn struct_from_value(data: &DataStruct, rename_all: Option<Case>) -> TokenStream
 ///                     <u8 as nu_protocol::FromValue>::expected_type(),
 ///                 ),
 ///                 (
-///                     std::string::ToString::to_string("favorite_toy"),
+///                     std::string::ToString::to_string("toy"),
 ///                     <Option<String> as nu_protocol::FromValue>::expected_type(),
 ///                 )
 ///             ].into_boxed_slice()
@@ -305,7 +310,11 @@ fn struct_from_value(data: &DataStruct, rename_all: Option<Case>) -> TokenStream
 ///     }
 /// }
 /// ```
-fn struct_expected_type(fields: &Fields, attr_type_name: Option<&str>) -> TokenStream2 {
+fn struct_expected_type(
+    fields: &Fields,
+    attr_type_name: Option<&str>,
+    container_attrs: &ContainerAttributes,
+) -> Result {
     let ty = match (fields, attr_type_name) {
         (_, Some(type_name)) => {
             quote!(nu_protocol::Type::Custom(
@@ -313,20 +322,25 @@ fn struct_expected_type(fields: &Fields, attr_type_name: Option<&str>) -> TokenS
             ))
         }
         (Fields::Named(fields), _) => {
-            let fields = fields.named.iter().map(|field| {
+            let mut name_resolver = NameResolver::new();
+            let mut fields_ts = Vec::with_capacity(fields.named.len());
+            for field in fields.named.iter() {
+                let member_attrs = MemberAttributes::parse_attrs(&field.attrs)?;
                 let ident = field.ident.as_ref().expect("named has idents");
-                let ident_s = ident.to_string();
+                let ident_s =
+                    name_resolver.resolve_ident(ident, container_attrs, &member_attrs, None)?;
                 let ty = &field.ty;
-                quote! {(
+                fields_ts.push(quote! {(
                     std::string::ToString::to_string(#ident_s),
                     <#ty as nu_protocol::FromValue>::expected_type(),
-                )}
-            });
+                )});
+            }
             quote!(nu_protocol::Type::Record(
-                std::vec![#(#fields),*].into_boxed_slice()
+                std::vec![#(#fields_ts),*].into_boxed_slice()
             ))
         }
-        (Fields::Unnamed(fields), _) => {
+        (f @ Fields::Unnamed(fields), _) => {
+            attributes::deny_fields(f)?;
             let mut iter = fields.unnamed.iter();
             let fields = fields.unnamed.iter().map(|field| {
                 let ty = &field.ty;
@@ -352,11 +366,11 @@ fn struct_expected_type(fields: &Fields, attr_type_name: Option<&str>) -> TokenS
         (Fields::Unit, _) => quote!(nu_protocol::Type::Nothing),
     };
 
-    quote! {
+    Ok(quote! {
         fn expected_type() -> nu_protocol::Type {
             #ty
         }
-    }
+    })
 }
 
 /// Implements the `#[derive(FromValue)]` macro for enums.
@@ -372,7 +386,7 @@ fn derive_enum_from_value(
     data: DataEnum,
     generics: Generics,
     attrs: Vec<Attribute>,
-) -> Result<TokenStream2, DeriveError> {
+) -> Result {
     let container_attrs = ContainerAttributes::parse_attrs(attrs.iter())?;
     let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
     let from_value_impl = enum_from_value(&data, &attrs)?;
@@ -393,9 +407,9 @@ fn derive_enum_from_value(
 /// should be represented via a `Value`.
 /// This function checks that every field is a unit variant and constructs a match statement over
 /// all possible variants.
-/// The input value is expected to be a `Value::String` containing the name of the variant formatted
-/// as defined by the `#[nu_value(rename_all = "...")]` attribute.
-/// If no attribute is given, [`snake_case`](heck::ToSnakeCase) is expected.
+/// The input value is expected to be a `Value::String` containing the name of the variant.
+/// That string is defined by the [`NameResolver::resolve_ident`] method with the `default` value
+/// being [`Case::Snake`].
 ///
 /// If no matching variant is found, `ShellError::CantConvert` is returned.
 ///
@@ -405,6 +419,7 @@ fn derive_enum_from_value(
 /// enum Weather {
 ///     Sunny,
 ///     Cloudy,
+///     #[nu_value(rename = "rain")]
 ///     Raining
 /// }
 ///
@@ -417,7 +432,7 @@ fn derive_enum_from_value(
 ///         match s.as_str() {
 ///             "sunny" => std::result::Ok(Self::Sunny),
 ///             "cloudy" => std::result::Ok(Self::Cloudy),
-///             "raining" => std::result::Ok(Self::Raining),
+///             "rain" => std::result::Ok(Self::Raining),
 ///             _ => std::result::Result::Err(nu_protocol::ShellError::CantConvert {
 ///                 to_type: std::string::ToString::to_string(
 ///                     &<Self as nu_protocol::FromValue>::expected_type()
@@ -429,17 +444,17 @@ fn derive_enum_from_value(
 ///     }
 /// }
 /// ```
-fn enum_from_value(data: &DataEnum, attrs: &[Attribute]) -> Result<TokenStream2, DeriveError> {
+fn enum_from_value(data: &DataEnum, attrs: &[Attribute]) -> Result {
     let container_attrs = ContainerAttributes::parse_attrs(attrs.iter())?;
+    let mut name_resolver = NameResolver::new();
     let arms: Vec<TokenStream2> = data
         .variants
         .iter()
         .map(|variant| {
-            attributes::deny(&variant.attrs)?;
+            let member_attrs = MemberAttributes::parse_attrs(&variant.attrs)?;
             let ident = &variant.ident;
-            let ident_s = format!("{ident}")
-                .as_str()
-                .to_case(container_attrs.rename_all.unwrap_or(Case::Snake));
+            let ident_s =
+                name_resolver.resolve_ident(ident, &container_attrs, &member_attrs, Case::Snake)?;
             match &variant.fields {
                 Fields::Named(fields) => Err(DeriveError::UnsupportedEnums {
                     fields_span: fields.span(),
@@ -450,7 +465,7 @@ fn enum_from_value(data: &DataEnum, attrs: &[Attribute]) -> Result<TokenStream2,
                 Fields::Unit => Ok(quote!(#ident_s => std::result::Result::Ok(Self::#ident))),
             }
         })
-        .collect::<Result<_, _>>()?;
+        .collect::<Result<_>>()?;
 
     Ok(quote! {
         fn from_value(
@@ -512,48 +527,50 @@ fn enum_expected_type(attr_type_name: Option<&str>) -> Option<TokenStream2> {
 
 /// Parses a `Value` into self.
 ///
-/// This function handles the actual parsing of a `Value` into self.
-/// It takes three parameters: `fields`, `self_ident` and `rename_all`.
-/// The `fields` parameter determines the expected type of `Value`: named fields expect a
-/// `Value::Record`, unnamed fields expect a `Value::List`, and a unit expects `Value::Nothing`.
+/// This function handles parsing a `Value` into the corresponding struct or enum variant (`self`).
+/// It takes three parameters: `fields`, `self_ident`, and `rename_all`.
 ///
-/// For named fields, the `fields` parameter indicates which field in the record corresponds to
-/// which struct field.
-/// For both named and unnamed fields, it also helps cast the type into a `FromValue` type.
-/// This approach maintains
-/// [hygiene](https://doc.rust-lang.org/reference/macros-by-example.html#hygiene).
+/// - The `fields` parameter specifies the expected structure of the `Value`:
+///   - Named fields expect a `Value::Record`.
+///   - Unnamed fields expect a `Value::List`.
+///   - A unit struct expects `Value::Nothing`.
 ///
-/// The `self_ident` parameter is used to describe the identifier of the returned value.
-/// For structs, `Self` is usually sufficient, but for enums, `Self::Variant` may be needed in the
-/// future.
+/// For named fields, each field in the record is matched to a struct field.
+/// The name matching uses the identifiers resolved by
+/// [`NameResolver`](NameResolver::resolve_ident) with `default` being `None`.
 ///
-/// The `rename_all` parameter is provided through `#[nu_value(rename_all = "...")]` and describes
-/// how, if passed, the field keys in the `Value` should be named.
-/// If this is `None`, we keep the names as they are in the struct.
+/// The `self_ident` parameter is used to specify the identifier for the returned value.
+/// For most structs, `Self` is sufficient, but `Self::Variant` may be needed for enum variants.
+///
+/// The `container_attrs` parameters, provided through `#[nu_value]` on the container, defines
+/// global rules for the `FromValue` implementation.
+/// This is used for the [`NameResolver`] to resolve the correct ident in the `Value`.
+///
+/// This function is more complex than the equivalent for `IntoValue` due to additional error
+/// handling:
+/// - If a named field is missing in the `Value`, `ShellError::CantFindColumn` is returned.
+/// - For unit structs, if the value is not `Value::Nothing`, `ShellError::CantConvert` is returned.
 ///
-/// This function is more complex than the equivalent for `IntoValue` due to error handling
-/// requirements.
-/// For missing fields, `ShellError::CantFindColumn` is used, and for unit structs,
-/// `ShellError::CantConvert` is used.
 /// The implementation avoids local variables for fields to prevent accidental shadowing, ensuring
-/// that poorly named fields don't cause issues.
-/// While this style is not typically recommended in handwritten Rust, it is acceptable for code
+/// that fields with similar names do not cause unexpected behavior.
+/// This approach is not typically recommended in handwritten Rust, but it is acceptable for code
 /// generation.
 fn parse_value_via_fields(
     fields: &Fields,
     self_ident: impl ToTokens,
-    rename_all: Option<Case>,
-) -> TokenStream2 {
+    container_attrs: &ContainerAttributes,
+) -> Result {
     match fields {
         Fields::Named(fields) => {
-            let fields = fields.named.iter().map(|field| {
+            let mut name_resolver = NameResolver::new();
+            let mut fields_ts: Vec<TokenStream2> = Vec::with_capacity(fields.named.len());
+            for field in fields.named.iter() {
+                let member_attrs = MemberAttributes::parse_attrs(&field.attrs)?;
                 let ident = field.ident.as_ref().expect("named has idents");
-                let mut ident_s = ident.to_string();
-                if let Some(rename_all) = rename_all {
-                    ident_s = ident_s.to_case(rename_all);
-                }
+                let ident_s =
+                    name_resolver.resolve_ident(ident, container_attrs, &member_attrs, None)?;
                 let ty = &field.ty;
-                match type_is_option(ty) {
+                fields_ts.push(match type_is_option(ty) {
                     true => quote! {
                         #ident: record
                             .remove(#ident_s)
@@ -573,15 +590,16 @@ fn parse_value_via_fields(
                                 })?,
                         )?
                     },
-                }
-            });
-            quote! {
+                });
+            }
+            Ok(quote! {
                 let span = v.span();
                 let mut record = v.into_record()?;
-                std::result::Result::Ok(#self_ident {#(#fields),*})
-            }
+                std::result::Result::Ok(#self_ident {#(#fields_ts),*})
+            })
         }
-        Fields::Unnamed(fields) => {
+        f @ Fields::Unnamed(fields) => {
+            attributes::deny_fields(f)?;
             let fields = fields.unnamed.iter().enumerate().map(|(i, field)| {
                 let ty = &field.ty;
                 quote! {{
@@ -596,14 +614,14 @@ fn parse_value_via_fields(
                     )?
                 }}
             });
-            quote! {
+            Ok(quote! {
                 let span = v.span();
                 let list = v.into_list()?;
                 let mut deque: std::collections::VecDeque<_> = std::convert::From::from(list);
                 std::result::Result::Ok(#self_ident(#(#fields),*))
-            }
+            })
         }
-        Fields::Unit => quote! {
+        Fields::Unit => Ok(quote! {
             match v {
                 nu_protocol::Value::Nothing {..} => Ok(#self_ident),
                 v => std::result::Result::Err(nu_protocol::ShellError::CantConvert {
@@ -613,7 +631,7 @@ fn parse_value_via_fields(
                     help: std::option::Option::None
                 })
             }
-        },
+        }),
     }
 }
 
diff --git a/crates/nu-derive-value/src/into.rs b/crates/nu-derive-value/src/into.rs
index 370558005a..4a52119097 100644
--- a/crates/nu-derive-value/src/into.rs
+++ b/crates/nu-derive-value/src/into.rs
@@ -6,13 +6,15 @@ use syn::{
 };
 
 use crate::{
-    attributes::{self, ContainerAttributes},
-    case::{Case, Casing},
+    attributes::{self, ContainerAttributes, MemberAttributes, ParseAttrs},
+    case::Case,
+    names::NameResolver,
 };
 
 #[derive(Debug)]
 pub struct IntoValue;
 type DeriveError = super::error::DeriveError<IntoValue>;
+type Result<T = TokenStream2> = std::result::Result<T, DeriveError>;
 
 /// Inner implementation of the `#[derive(IntoValue)]` macro for structs and enums.
 ///
@@ -23,7 +25,7 @@ type DeriveError = super::error::DeriveError<IntoValue>;
 /// - For structs: [`struct_into_value`]
 /// - For enums: [`enum_into_value`]
 /// - Unions are not supported and will return an error.
-pub fn derive_into_value(input: TokenStream2) -> Result<TokenStream2, DeriveError> {
+pub fn derive_into_value(input: TokenStream2) -> Result {
     let input: DeriveInput = syn::parse2(input).map_err(DeriveError::Syn)?;
     match input.data {
         Data::Struct(data_struct) => Ok(struct_into_value(
@@ -48,6 +50,7 @@ pub fn derive_into_value(input: TokenStream2) -> Result<TokenStream2, DeriveErro
 /// `IntoValue`.
 /// For structs with named fields, the derived implementation creates a `Value::Record` using the
 /// struct fields as keys.
+/// The specific keys are resolved by [`NameResolver`](NameResolver::resolve_ident).
 /// Each field value is converted using the `IntoValue::into_value` method.
 /// For structs with unnamed fields, this generates a `Value::List` with each field in the list.
 /// For unit structs, this generates `Value::Nothing`, because there is no data.
@@ -111,9 +114,8 @@ fn struct_into_value(
     data: DataStruct,
     generics: Generics,
     attrs: Vec<Attribute>,
-) -> Result<TokenStream2, DeriveError> {
-    let rename_all = ContainerAttributes::parse_attrs(attrs.iter())?.rename_all;
-    attributes::deny_fields(&data.fields)?;
+) -> Result {
+    let container_attrs = ContainerAttributes::parse_attrs(attrs.iter())?;
     let record = match &data.fields {
         Fields::Named(fields) => {
             let accessor = fields
@@ -121,7 +123,7 @@ fn struct_into_value(
                 .iter()
                 .map(|field| field.ident.as_ref().expect("named has idents"))
                 .map(|ident| quote!(self.#ident));
-            fields_return_value(&data.fields, accessor, rename_all)
+            fields_return_value(&data.fields, accessor, &container_attrs)?
         }
         Fields::Unnamed(fields) => {
             let accessor = fields
@@ -130,7 +132,7 @@ fn struct_into_value(
                 .enumerate()
                 .map(|(n, _)| Index::from(n))
                 .map(|index| quote!(self.#index));
-            fields_return_value(&data.fields, accessor, rename_all)
+            fields_return_value(&data.fields, accessor, &container_attrs)?
         }
         Fields::Unit => quote!(nu_protocol::Value::nothing(span)),
     };
@@ -150,10 +152,13 @@ fn struct_into_value(
 /// This function implements the derive macro `IntoValue` for enums.
 /// Currently, only unit enum variants are supported as it is not clear how other types of enums
 /// should be represented in a `Value`.
-/// For simple enums, we represent the enum as a `Value::String`. For other types of variants, we return an error.
-/// The variant name will be case-converted as described by the `#[nu_value(rename_all = "...")]` helper attribute.
-/// If no attribute is used, the default is `case_convert::Case::Snake`.
-/// The implementation matches over all variants, uses the appropriate variant name, and constructs a `Value::String`.
+/// For simple enums, we represent the enum as a `Value::String`.
+/// For other types of variants, we return an error.
+///
+/// The variant name used in the `Value::String` is resolved by the
+/// [`NameResolver`](NameResolver::resolve_ident) with the `default` being [`Case::Snake`].
+/// The implementation matches over all variants, uses the appropriate variant name, and constructs
+/// a `Value::String`.
 ///
 /// This is how such a derived implementation looks:
 /// ```rust
@@ -161,6 +166,7 @@ fn struct_into_value(
 /// enum Weather {
 ///     Sunny,
 ///     Cloudy,
+///     #[nu_value(rename = "rain")]
 ///     Raining
 /// }
 ///
@@ -169,7 +175,7 @@ fn struct_into_value(
 ///         match self {
 ///             Self::Sunny => nu_protocol::Value::string("sunny", span),
 ///             Self::Cloudy => nu_protocol::Value::string("cloudy", span),
-///             Self::Raining => nu_protocol::Value::string("raining", span),
+///             Self::Raining => nu_protocol::Value::string("rain", span),
 ///         }
 ///     }
 /// }
@@ -179,17 +185,21 @@ fn enum_into_value(
     data: DataEnum,
     generics: Generics,
     attrs: Vec<Attribute>,
-) -> Result<TokenStream2, DeriveError> {
+) -> Result {
     let container_attrs = ContainerAttributes::parse_attrs(attrs.iter())?;
+    let mut name_resolver = NameResolver::new();
     let arms: Vec<TokenStream2> = data
         .variants
         .into_iter()
         .map(|variant| {
-            attributes::deny(&variant.attrs)?;
+            let member_attrs = MemberAttributes::parse_attrs(variant.attrs.iter())?;
             let ident = variant.ident;
-            let ident_s = format!("{ident}")
-                .as_str()
-                .to_case(container_attrs.rename_all.unwrap_or(Case::Snake));
+            let ident_s = name_resolver.resolve_ident(
+                &ident,
+                &container_attrs,
+                &member_attrs,
+                Case::Snake,
+            )?;
             match &variant.fields {
                 // In the future we can implement more complex enums here.
                 Fields::Named(fields) => Err(DeriveError::UnsupportedEnums {
@@ -203,7 +213,7 @@ fn enum_into_value(
                 }
             }
         })
-        .collect::<Result<_, _>>()?;
+        .collect::<Result<_>>()?;
 
     let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
     Ok(quote! {
@@ -219,57 +229,63 @@ fn enum_into_value(
 
 /// Constructs the final `Value` that the macro generates.
 ///
-/// This function handles the construction of the final `Value` that the macro generates.
-/// It is currently only used for structs but may be used for enums in the future.
-/// The function takes three parameters: the `fields`, which allow iterating over each field of a
-/// data type, the `accessor` and `rename_all`.
-/// The fields determine whether we need to generate a `Value::Record`, `Value::List`, or
-/// `Value::Nothing`.
-/// For named fields, they are also directly used to generate the record key.
-/// If `#[nu_value(rename_all = "...")]` is used and then passed in here via `rename_all`, the
-/// named fields will be converted to the given case and then uses as the record key.
+/// This function handles the construction of the final `Value` that the macro generates, primarily
+/// for structs.
+/// It takes three parameters: `fields`, which allows iterating over each field of a data type,
+/// `accessor`, which generalizes data access, and `container_attrs`, which is used for the
+/// [`NameResolver`].
 ///
-/// The `accessor` parameter generalizes how the data is accessed.
-/// For named fields, this is usually the name of the fields preceded by `self` in a struct, and
-/// maybe something else for enums.
-/// For unnamed fields, this should be an iterator similar to the one with named fields, but
-/// accessing tuple fields, so we get `self.n`.
-/// For unit structs, this parameter is ignored.
-/// By using the accessor like this, we can have the same code for structs and enums with data
+/// - **Field Keys**:
+///   The field key is field name of the input struct and resolved the
+///   [`NameResolver`](NameResolver::resolve_ident).
+///
+/// - **Fields Type**:
+///   - Determines whether to generate a `Value::Record`, `Value::List`, or `Value::Nothing` based
+///     on the nature of the fields.
+///   - Named fields are directly used to generate the record key, as described above.
+///
+/// - **Accessor**:
+///   - Generalizes how data is accessed for different data types.
+///   - For named fields in structs, this is typically `self.field_name`.
+///   - For unnamed fields (e.g., tuple structs), it should be an iterator similar to named fields
+///     but accessing fields like `self.0`.
+///   - For unit structs, this parameter is ignored.
+///
+/// This design allows the same function to potentially handle both structs and enums with data
 /// variants in the future.
 fn fields_return_value(
     fields: &Fields,
     accessor: impl Iterator<Item = impl ToTokens>,
-    rename_all: Option<Case>,
-) -> TokenStream2 {
+    container_attrs: &ContainerAttributes,
+) -> Result {
     match fields {
         Fields::Named(fields) => {
-            let items: Vec<TokenStream2> = fields
-                .named
-                .iter()
-                .zip(accessor)
-                .map(|(field, accessor)| {
-                    let ident = field.ident.as_ref().expect("named has idents");
-                    let mut field = ident.to_string();
-                    if let Some(rename_all) = rename_all {
-                        field = field.to_case(rename_all);
-                    }
-                    quote!(#field => nu_protocol::IntoValue::into_value(#accessor, span))
-                })
-                .collect();
-            quote! {
+            let mut name_resolver = NameResolver::new();
+            let mut items: Vec<TokenStream2> = Vec::with_capacity(fields.named.len());
+            for (field, accessor) in fields.named.iter().zip(accessor) {
+                let member_attrs = MemberAttributes::parse_attrs(field.attrs.iter())?;
+                let ident = field.ident.as_ref().expect("named has idents");
+                let field =
+                    name_resolver.resolve_ident(ident, container_attrs, &member_attrs, None)?;
+                items.push(quote!(#field => nu_protocol::IntoValue::into_value(#accessor, span)));
+            }
+            Ok(quote! {
                 nu_protocol::Value::record(nu_protocol::record! {
                     #(#items),*
                 }, span)
-            }
+            })
         }
-        Fields::Unnamed(fields) => {
+        f @ Fields::Unnamed(fields) => {
+            attributes::deny_fields(f)?;
             let items =
                 fields.unnamed.iter().zip(accessor).map(
                     |(_, accessor)| quote!(nu_protocol::IntoValue::into_value(#accessor, span)),
                 );
-            quote!(nu_protocol::Value::list(std::vec![#(#items),*], span))
+            Ok(quote!(nu_protocol::Value::list(
+                std::vec![#(#items),*],
+                span
+            )))
         }
-        Fields::Unit => quote!(nu_protocol::Value::nothing(span)),
+        Fields::Unit => Ok(quote!(nu_protocol::Value::nothing(span))),
     }
 }
diff --git a/crates/nu-derive-value/src/lib.rs b/crates/nu-derive-value/src/lib.rs
index 4fa038f2fd..5d87951927 100644
--- a/crates/nu-derive-value/src/lib.rs
+++ b/crates/nu-derive-value/src/lib.rs
@@ -36,6 +36,7 @@ mod case;
 mod error;
 mod from;
 mod into;
+mod names;
 #[cfg(test)]
 mod tests;
 
diff --git a/crates/nu-derive-value/src/names.rs b/crates/nu-derive-value/src/names.rs
new file mode 100644
index 0000000000..3798395b7f
--- /dev/null
+++ b/crates/nu-derive-value/src/names.rs
@@ -0,0 +1,61 @@
+use proc_macro2::Span;
+use std::collections::HashMap;
+use syn::Ident;
+
+use crate::attributes::{ContainerAttributes, MemberAttributes};
+use crate::case::{Case, Casing};
+use crate::error::DeriveError;
+
+#[derive(Debug, Default)]
+pub struct NameResolver {
+    seen_names: HashMap<String, Span>,
+}
+
+impl NameResolver {
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    /// Resolves an identifier using attributes and ensures its uniqueness.
+    ///
+    /// The identifier is transformed according to these rules:
+    /// - If [`MemberAttributes::rename`] is set, this explicitly renamed value is used.
+    ///   The value is defined by the helper attribute `#[nu_value(rename = "...")]` on a member.
+    /// - If the above is not set but [`ContainerAttributes::rename_all`] is, the identifier
+    ///   undergoes case conversion as specified by the helper attribute
+    ///   `#[nu_value(rename_all = "...")]` on the container (struct or enum).
+    /// - If neither renaming attribute is set, the function applies the case conversion provided
+    ///   by the `default` parameter.
+    ///   If `default` is `None`, the identifier remains unchanged.
+    ///
+    /// This function checks the transformed identifier against previously seen identifiers to
+    /// ensure it is unique.
+    /// If a duplicate identifier is detected, it returns [`DeriveError::NonUniqueName`].
+    pub fn resolve_ident<M>(
+        &mut self,
+        ident: &'_ Ident,
+        container_attrs: &'_ ContainerAttributes,
+        member_attrs: &'_ MemberAttributes,
+        default: impl Into<Option<Case>>,
+    ) -> Result<String, DeriveError<M>> {
+        let span = ident.span();
+        let rename_all = container_attrs.rename_all;
+        let rename = member_attrs.rename.as_ref();
+        let ident = match (rename, rename_all) {
+            (Some(rename), _) => rename.to_string(),
+            (None, Some(case)) => ident.to_case(case),
+            (None, None) => ident.to_case(default),
+        };
+
+        if let Some(seen) = self.seen_names.get(&ident) {
+            return Err(DeriveError::NonUniqueName {
+                name: ident.to_string(),
+                first: *seen,
+                second: span,
+            });
+        }
+
+        self.seen_names.insert(ident.clone(), span);
+        Ok(ident)
+    }
+}
diff --git a/crates/nu-derive-value/src/tests.rs b/crates/nu-derive-value/src/tests.rs
index ca51ed5970..87a4b7c24b 100644
--- a/crates/nu-derive-value/src/tests.rs
+++ b/crates/nu-derive-value/src/tests.rs
@@ -86,24 +86,81 @@ fn unexpected_attribute() {
 }
 
 #[test]
-fn deny_attribute_on_fields() {
+fn unexpected_attribute_on_struct_field() {
     let input = quote! {
-        struct SomeStruct {
-            #[nu_value]
-            field: ()
+        struct SimpleStruct {
+            #[nu_value(what)]
+            field_a: i32,
+            field_b: String,
         }
     };
 
     let from_res = derive_from_value(input.clone());
     assert!(
-        matches!(from_res, Err(DeriveError::InvalidAttributePosition { .. })),
+        matches!(from_res, Err(DeriveError::UnexpectedAttribute { .. })),
+        "expected `DeriveError::UnexpectedAttribute`, got {:?}",
+        from_res
+    );
+
+    let into_res = derive_into_value(input);
+    assert!(
+        matches!(into_res, Err(DeriveError::UnexpectedAttribute { .. })),
+        "expected `DeriveError::UnexpectedAttribute`, got {:?}",
+        into_res
+    );
+}
+
+#[test]
+fn unexpected_attribute_on_enum_variant() {
+    let input = quote! {
+        enum SimpleEnum {
+            #[nu_value(what)]
+            A,
+            B,
+        }
+    };
+
+    let from_res = derive_from_value(input.clone());
+    assert!(
+        matches!(from_res, Err(DeriveError::UnexpectedAttribute { .. })),
+        "expected `DeriveError::UnexpectedAttribute`, got {:?}",
+        from_res
+    );
+
+    let into_res = derive_into_value(input);
+    assert!(
+        matches!(into_res, Err(DeriveError::UnexpectedAttribute { .. })),
+        "expected `DeriveError::UnexpectedAttribute`, got {:?}",
+        into_res
+    );
+}
+
+#[test]
+fn invalid_attribute_position_in_tuple_struct() {
+    let input = quote! {
+        struct SimpleTupleStruct(
+            #[nu_value(what)]
+            i32,
+            String,
+        );
+    };
+
+    let from_res = derive_from_value(input.clone());
+    assert!(
+        matches!(
+            from_res,
+            Err(DeriveError::InvalidAttributePosition { attribute_span: _ })
+        ),
         "expected `DeriveError::InvalidAttributePosition`, got {:?}",
         from_res
     );
 
     let into_res = derive_into_value(input);
     assert!(
-        matches!(into_res, Err(DeriveError::InvalidAttributePosition { .. })),
+        matches!(
+            into_res,
+            Err(DeriveError::InvalidAttributePosition { attribute_span: _ })
+        ),
         "expected `DeriveError::InvalidAttributePosition`, got {:?}",
         into_res
     );
@@ -133,3 +190,53 @@ fn invalid_attribute_value() {
         into_res
     );
 }
+
+#[test]
+fn non_unique_struct_keys() {
+    let input = quote! {
+        struct DuplicateStruct {
+            #[nu_value(rename = "field")]
+            some_field: (),
+            field: (),
+        }
+    };
+
+    let from_res = derive_from_value(input.clone());
+    assert!(
+        matches!(from_res, Err(DeriveError::NonUniqueName { .. })),
+        "expected `DeriveError::NonUniqueName`, got {:?}",
+        from_res
+    );
+
+    let into_res = derive_into_value(input);
+    assert!(
+        matches!(into_res, Err(DeriveError::NonUniqueName { .. })),
+        "expected `DeriveError::NonUniqueName`, got {:?}",
+        into_res
+    );
+}
+
+#[test]
+fn non_unique_enum_variants() {
+    let input = quote! {
+        enum DuplicateEnum {
+            #[nu_value(rename = "variant")]
+            SomeVariant,
+            Variant
+        }
+    };
+
+    let from_res = derive_from_value(input.clone());
+    assert!(
+        matches!(from_res, Err(DeriveError::NonUniqueName { .. })),
+        "expected `DeriveError::NonUniqueName`, got {:?}",
+        from_res
+    );
+
+    let into_res = derive_into_value(input);
+    assert!(
+        matches!(into_res, Err(DeriveError::NonUniqueName { .. })),
+        "expected `DeriveError::NonUniqueName`, got {:?}",
+        into_res
+    );
+}
diff --git a/crates/nu-protocol/src/value/from_value.rs b/crates/nu-protocol/src/value/from_value.rs
index 1b8e9536d7..624d7dae39 100644
--- a/crates/nu-protocol/src/value/from_value.rs
+++ b/crates/nu-protocol/src/value/from_value.rs
@@ -20,13 +20,17 @@ use std::{
 ///
 /// When derived on structs with named fields, it expects a [`Value::Record`] where each field of
 /// the struct maps to a corresponding field in the record.
-/// You can customize the case conversion of these field names by using
-/// `#[nu_value(rename_all = "...")]` on the struct.
+///
+/// - If `#[nu_value(rename = "...")]` is applied to a field, that name will be used as the key in
+///   the record.
+/// - If `#[nu_value(rename_all = "...")]` is applied on the container (struct) the key of the
+///   field will be case-converted accordingly.
+/// - If neither attribute is applied, the field name is used as is.
+///
 /// Supported case conversions include those provided by [`heck`], such as
 /// "snake_case", "kebab-case", "PascalCase", and others.
 /// Additionally, all values accepted by
 /// [`#[serde(rename_all = "...")]`](https://serde.rs/container-attrs.html#rename_all) are valid here.
-/// If not set, the field names will match the original Rust field names as-is.
 ///
 /// For structs with unnamed fields, it expects a [`Value::List`], and the fields are populated in
 /// the order they appear in the list.
@@ -35,13 +39,18 @@ use std::{
 ///
 /// Only enums with no fields may derive this trait.
 /// The expected value representation will be the name of the variant as a [`Value::String`].
-/// By default, variant names will be expected in ["snake_case"](heck::ToSnakeCase).
-/// You can customize the case conversion using `#[nu_value(rename_all = "kebab-case")]` on the enum.
+///
+/// - If `#[nu_value(rename = "...")]` is applied to a variant, that name will be used.
+/// - If `#[nu_value(rename_all = "...")]` is applied on the enum container, the name of variant
+///   will be case-converted accordingly.
+/// - If neither attribute is applied, the variant name will default to
+///   ["snake_case"](heck::ToSnakeCase).
 ///
 /// Additionally, you can use `#[nu_value(type_name = "...")]` in the derive macro to set a custom type name
 /// for `FromValue::expected_type`. This will result in a `Type::Custom` with the specified type name.
 /// This can be useful in situations where the default type name is not desired.
 ///
+/// # Enum Example
 /// ```
 /// # use nu_protocol::{FromValue, Value, ShellError, record, Span};
 /// #
@@ -52,11 +61,17 @@ use std::{
 /// enum Bird {
 ///     MountainEagle,
 ///     ForestOwl,
+///     #[nu_value(rename = "RIVER-QUACK")]
 ///     RiverDuck,
 /// }
 ///
 /// assert_eq!(
-///     Bird::from_value(Value::test_string("RIVER-DUCK")).unwrap(),
+///     Bird::from_value(Value::string("FOREST-OWL", span)).unwrap(),
+///     Bird::ForestOwl
+/// );
+///
+/// assert_eq!(
+///     Bird::from_value(Value::string("RIVER-QUACK", span)).unwrap(),
 ///     Bird::RiverDuck
 /// );
 ///
@@ -64,14 +79,21 @@ use std::{
 ///     &Bird::expected_type().to_string(),
 ///     "birb"
 /// );
+/// ```
 ///
-///
+/// # Struct Example
+/// ```
+/// # use nu_protocol::{FromValue, Value, ShellError, record, Span};
+/// #
+/// # let span = Span::unknown();
+/// #
 /// #[derive(FromValue, PartialEq, Eq, Debug)]
 /// #[nu_value(rename_all = "kebab-case")]
 /// struct Person {
 ///     first_name: String,
 ///     last_name: String,
-///     age: u32,
+///     #[nu_value(rename = "age")]
+///     age_years: u32,
 /// }
 ///
 /// let value = Value::record(record! {
@@ -85,7 +107,7 @@ use std::{
 ///     Person {
 ///         first_name: "John".into(),
 ///         last_name: "Doe".into(),
-///         age: 42,
+///         age_years: 42,
 ///     }
 /// );
 /// ```
diff --git a/crates/nu-protocol/src/value/into_value.rs b/crates/nu-protocol/src/value/into_value.rs
index c7b776071a..0cebd2e481 100644
--- a/crates/nu-protocol/src/value/into_value.rs
+++ b/crates/nu-protocol/src/value/into_value.rs
@@ -10,20 +10,30 @@ use std::{borrow::Borrow, collections::HashMap};
 /// This trait can be used with `#[derive]`.
 /// When derived on structs with named fields, the resulting value representation will use
 /// [`Value::Record`], where each field of the record corresponds to a field of the struct.
-/// By default, field names will be kept as-is, but you can customize the case conversion
-/// for all fields in a struct by using `#[nu_value(rename_all = "kebab-case")]` on the struct.
-/// All case options from [`heck`] are supported, as well as the values allowed by
-/// [`#[serde(rename_all)]`](https://serde.rs/container-attrs.html#rename_all).
+///
+/// By default, field names will be used as-is unless specified otherwise:
+/// - If `#[nu_value(rename = "...")]` is applied to a specific field, that name is used.
+/// - If `#[nu_value(rename_all = "...")]` is applied to the struct, field names will be
+///   case-converted accordingly.
+/// - If neither attribute is used, the original field name will be retained.
 ///
 /// For structs with unnamed fields, the value representation will be [`Value::List`], with all
 /// fields inserted into a list.
 /// Unit structs will be represented as [`Value::Nothing`] since they contain no data.
 ///
-/// Only enums with no fields may derive this trait.
-/// The resulting value representation will be the name of the variant as a [`Value::String`].
-/// By default, variant names will be converted to ["snake_case"](heck::ToSnakeCase).
-/// You can customize the case conversion using `#[nu_value(rename_all = "kebab-case")]` on the enum.
+/// For enums, the resulting value representation depends on the variant name:
+/// - If `#[nu_value(rename = "...")]` is applied to a specific variant, that name is used.
+/// - If `#[nu_value(rename_all = "...")]` is applied to the enum, variant names will be
+///   case-converted accordingly.
+/// - If neither attribute is used, variant names will default to snake_case.
 ///
+/// Only enums with no fields may derive this trait.
+/// The resulting value will be the name of the variant as a [`Value::String`].
+///
+/// All case options from [`heck`] are supported, as well as the values allowed by
+/// [`#[serde(rename_all)]`](https://serde.rs/container-attrs.html#rename_all).
+///
+/// # Enum Example
 /// ```
 /// # use nu_protocol::{IntoValue, Value, Span, record};
 /// #
@@ -34,28 +44,41 @@ use std::{borrow::Borrow, collections::HashMap};
 /// enum Bird {
 ///     MountainEagle,
 ///     ForestOwl,
+///     #[nu_value(rename = "RIVER-QUACK")]
 ///     RiverDuck,
 /// }
 ///
 /// assert_eq!(
-///     Bird::RiverDuck.into_value(span),
-///     Value::test_string("RIVER-DUCK")
+///     Bird::ForestOwl.into_value(span),
+///     Value::string("FOREST-OWL", span)
 /// );
 ///
+/// assert_eq!(
+///     Bird::RiverDuck.into_value(span),
+///     Value::string("RIVER-QUACK", span)
+/// );
+/// ```
 ///
+/// # Struct Example
+/// ```
+/// # use nu_protocol::{IntoValue, Value, Span, record};
+/// #
+/// # let span = Span::unknown();
+/// #
 /// #[derive(IntoValue)]
 /// #[nu_value(rename_all = "kebab-case")]
 /// struct Person {
 ///     first_name: String,
 ///     last_name: String,
-///     age: u32,
+///     #[nu_value(rename = "age")]
+///     age_years: u32,
 /// }
 ///
 /// assert_eq!(
 ///     Person {
 ///         first_name: "John".into(),
 ///         last_name: "Doe".into(),
-///         age: 42,
+///         age_years: 42,
 ///     }.into_value(span),
 ///     Value::record(record! {
 ///         "first-name" => Value::string("John", span),
diff --git a/crates/nu-protocol/src/value/test_derive.rs b/crates/nu-protocol/src/value/test_derive.rs
index 4209b872b3..cbb9ccbadf 100644
--- a/crates/nu-protocol/src/value/test_derive.rs
+++ b/crates/nu-protocol/src/value/test_derive.rs
@@ -586,3 +586,86 @@ fn enum_type_name_attr() {
 
     assert_eq!(TypeNameEnum::expected_type().to_string().as_str(), "enum");
 }
+
+#[derive(IntoValue, FromValue, Default, Debug, PartialEq)]
+struct RenamedFieldStruct {
+    #[nu_value(rename = "renamed")]
+    field: (),
+}
+
+impl RenamedFieldStruct {
+    fn value() -> Value {
+        Value::test_record(record! {
+            "renamed" => Value::test_nothing(),
+        })
+    }
+}
+
+#[test]
+fn renamed_field_struct_into_value() {
+    let expected = RenamedFieldStruct::value();
+    let actual = RenamedFieldStruct::default().into_test_value();
+    assert_eq!(expected, actual);
+}
+
+#[test]
+fn renamed_field_struct_from_value() {
+    let expected = RenamedFieldStruct::default();
+    let actual = RenamedFieldStruct::from_value(RenamedFieldStruct::value()).unwrap();
+    assert_eq!(expected, actual);
+}
+
+#[test]
+fn renamed_field_struct_roundtrip() {
+    let expected = RenamedFieldStruct::default();
+    let actual =
+        RenamedFieldStruct::from_value(RenamedFieldStruct::default().into_test_value()).unwrap();
+    assert_eq!(expected, actual);
+
+    let expected = RenamedFieldStruct::value();
+    let actual = RenamedFieldStruct::from_value(RenamedFieldStruct::value())
+        .unwrap()
+        .into_test_value();
+    assert_eq!(expected, actual);
+}
+
+#[derive(IntoValue, FromValue, Default, Debug, PartialEq)]
+enum RenamedVariantEnum {
+    #[default]
+    #[nu_value(rename = "renamed")]
+    Variant,
+}
+
+impl RenamedVariantEnum {
+    fn value() -> Value {
+        Value::test_string("renamed")
+    }
+}
+
+#[test]
+fn renamed_variant_enum_into_value() {
+    let expected = RenamedVariantEnum::value();
+    let actual = RenamedVariantEnum::default().into_test_value();
+    assert_eq!(expected, actual);
+}
+
+#[test]
+fn renamed_variant_enum_from_value() {
+    let expected = RenamedVariantEnum::default();
+    let actual = RenamedVariantEnum::from_value(RenamedVariantEnum::value()).unwrap();
+    assert_eq!(expected, actual);
+}
+
+#[test]
+fn renamed_variant_enum_roundtrip() {
+    let expected = RenamedVariantEnum::default();
+    let actual =
+        RenamedVariantEnum::from_value(RenamedVariantEnum::default().into_test_value()).unwrap();
+    assert_eq!(expected, actual);
+
+    let expected = RenamedVariantEnum::value();
+    let actual = RenamedVariantEnum::from_value(RenamedVariantEnum::value())
+        .unwrap()
+        .into_test_value();
+    assert_eq!(expected, actual);
+}

From eb0de25d190dc596cfbf055be9806741bc047c1b Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Wed, 4 Sep 2024 03:19:29 -0700
Subject: [PATCH 0404/1072] Expression support for `polars strftime` (#13767)

# Description
Allows `polars strftime` to be used as an expression:
<img width="849" alt="Screenshot 2024-09-03 at 13 14 11"
src="https://github.com/user-attachments/assets/2a987fdf-cf00-4c57-b6e1-0b706c594c20">

# User-Facing Changes
- `polars strftime` can now be used as an expression.
---
 crates/nu_plugin_polars/Cargo.toml            |   1 +
 .../src/dataframe/series/string/strftime.rs   | 111 +++++++++++++-----
 2 files changed, 85 insertions(+), 27 deletions(-)

diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 2d3e1ee312..0c75a1fc56 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -73,6 +73,7 @@ features = [
 	"strings",
 	"string_to_integer",
 	"streaming",
+	"temporal",
 	"to_dummies",
 ]
 optional = false
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/strftime.rs b/crates/nu_plugin_polars/src/dataframe/series/string/strftime.rs
index 85d3aa84a0..ed48b9b905 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/string/strftime.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/string/strftime.rs
@@ -1,4 +1,9 @@
-use crate::{values::CustomValueSupport, PolarsPlugin};
+use crate::{
+    values::{
+        cant_convert_err, CustomValueSupport, NuExpression, PolarsPluginObject, PolarsPluginType,
+    },
+    PolarsPlugin,
+};
 
 use super::super::super::values::{Column, NuDataFrame};
 
@@ -26,34 +31,60 @@ impl PluginCommand for StrFTime {
     fn signature(&self) -> Signature {
         Signature::build(self.name())
             .required("fmt", SyntaxShape::String, "Format rule")
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
+            .input_output_types(vec![
+                (
+                    Type::Custom("expression".into()),
+                    Type::Custom("expression".into()),
+                ),
+                (
+                    Type::Custom("dataframe".into()),
+                    Type::Custom("dataframe".into()),
+                ),
+            ])
             .category(Category::Custom("dataframe".into()))
     }
 
     fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Formats date",
-            example: r#"let dt = ('2020-08-04T16:39:18+00:00' | into datetime --timezone 'UTC');
+        vec![
+            Example {
+                description: "Formats date column as a string",
+                example: r#"let date = '2020-08-04T16:39:18+00:00' | into datetime --timezone 'UTC';
+    let df = ([[a]; [$date]] | polars into-df);
+    let df2 = $df | polars with-column [(polars col a | polars strftime "%Y/%m/%d" | polars as b)] | polars collect;
+    $df2.b"#,
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![Column::new(
+                            "b".to_string(),
+                            vec![Value::test_string("2020/08/04")],
+                        )],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+            Example {
+                description: "Formats date",
+                example: r#"let dt = ('2020-08-04T16:39:18+00:00' | into datetime --timezone 'UTC');
     let df = ([$dt $dt] | polars into-df);
     $df | polars strftime "%Y/%m/%d""#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![
-                            Value::test_string("2020/08/04"),
-                            Value::test_string("2020/08/04"),
-                        ],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![Column::new(
+                            "0".to_string(),
+                            vec![
+                                Value::test_string("2020/08/04"),
+                                Value::test_string("2020/08/04"),
+                            ],
+                        )],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+        ]
     }
 
     fn run(
@@ -63,19 +94,45 @@ impl PluginCommand for StrFTime {
         call: &EvaluatedCall,
         input: PipelineData,
     ) -> Result<PipelineData, LabeledError> {
-        command(plugin, engine, call, input).map_err(LabeledError::from)
+        let value = input.into_value(call.head)?;
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuDataFrame(df) => command_df(plugin, engine, call, df),
+            PolarsPluginObject::NuLazyFrame(lazy) => {
+                command_df(plugin, engine, call, lazy.collect(call.head)?)
+            }
+            PolarsPluginObject::NuExpression(expr) => command_expr(plugin, engine, call, expr),
+            _ => Err(cant_convert_err(
+                &value,
+                &[
+                    PolarsPluginType::NuDataFrame,
+                    PolarsPluginType::NuLazyFrame,
+                    PolarsPluginType::NuExpression,
+                ],
+            )),
+        }
+        .map_err(LabeledError::from)
     }
 }
 
-fn command(
+fn command_expr(
     plugin: &PolarsPlugin,
     engine: &EngineInterface,
     call: &EvaluatedCall,
-    input: PipelineData,
+    expr: NuExpression,
+) -> Result<PipelineData, ShellError> {
+    let fmt: String = call.req(0)?;
+    let res: NuExpression = expr.into_polars().dt().strftime(&fmt).into();
+    res.to_pipeline_data(plugin, engine, call.head)
+}
+
+fn command_df(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    df: NuDataFrame,
 ) -> Result<PipelineData, ShellError> {
     let fmt: String = call.req(0)?;
 
-    let df = NuDataFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
     let series = df.as_series(call.head)?;
 
     let casted = series.datetime().map_err(|e| ShellError::GenericError {

From 63b94dbd28aa730cadb5f9443e60050dd2ffcb99 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Wed, 4 Sep 2024 03:19:45 -0700
Subject: [PATCH 0405/1072] Added expression support for `polars contains`
 (#13769)

# Description
Adds the ability to use `polars contains` as an expression:
<img width="785" alt="Screenshot 2024-09-03 at 14 39 03"
src="https://github.com/user-attachments/assets/35c0d4e5-6bef-4974-a31f-463c7203bd03">


# User-Facing Changes
- `polars contains` can now be used with expressions
---
 .../src/dataframe/series/string/contains.rs   | 123 +++++++++++++-----
 1 file changed, 94 insertions(+), 29 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/contains.rs b/crates/nu_plugin_polars/src/dataframe/series/string/contains.rs
index 50068ea51b..551f32a744 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/string/contains.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/string/contains.rs
@@ -1,4 +1,9 @@
-use crate::{values::CustomValueSupport, PolarsPlugin};
+use crate::{
+    values::{
+        cant_convert_err, CustomValueSupport, NuExpression, PolarsPluginObject, PolarsPluginType,
+    },
+    PolarsPlugin,
+};
 
 use super::super::super::values::{Column, NuDataFrame};
 
@@ -7,7 +12,7 @@ use nu_protocol::{
     Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
     Value,
 };
-use polars::prelude::{IntoSeries, StringNameSpaceImpl};
+use polars::prelude::{lit, IntoSeries, StringNameSpaceImpl};
 
 #[derive(Clone)]
 pub struct Contains;
@@ -30,33 +35,62 @@ impl PluginCommand for Contains {
                 SyntaxShape::String,
                 "Regex pattern to be searched",
             )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
+            .input_output_types(vec![
+                (
+                    Type::Custom("expression".into()),
+                    Type::Custom("expression".into()),
+                ),
+                (
+                    Type::Custom("dataframe".into()),
+                    Type::Custom("dataframe".into()),
+                ),
+            ])
             .category(Category::Custom("dataframe".into()))
     }
 
     fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns boolean indicating if pattern was found",
-            example: "[abc acb acb] | polars into-df | polars contains ab",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![
-                            Value::test_bool(true),
-                            Value::test_bool(false),
-                            Value::test_bool(false),
-                        ],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
+        vec![
+            Example {
+                description: "Returns boolean indicating if pattern was found in a column",
+                example: "let df = [[a]; [abc] [acb] [acb]] | polars into-df;
+                let df2 = $df | polars with-column [(polars col a | polars contains ab | polars as b)] | polars collect;
+                $df2.b",
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![Column::new(
+                            "b".to_string(),
+                            vec![
+                                Value::test_bool(true),
+                                Value::test_bool(false),
+                                Value::test_bool(false),
+                            ],
+                        )],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+            Example {
+                description: "Returns boolean indicating if pattern was found",
+                example: "[abc acb acb] | polars into-df | polars contains ab",
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![Column::new(
+                            "0".to_string(),
+                            vec![
+                                Value::test_bool(true),
+                                Value::test_bool(false),
+                                Value::test_bool(false),
+                            ],
+                        )],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+        ]
     }
 
     fn run(
@@ -66,17 +100,48 @@ impl PluginCommand for Contains {
         call: &EvaluatedCall,
         input: PipelineData,
     ) -> Result<PipelineData, LabeledError> {
-        command(plugin, engine, call, input).map_err(LabeledError::from)
+        let value = input.into_value(call.head)?;
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuDataFrame(df) => command_df(plugin, engine, call, df),
+            PolarsPluginObject::NuLazyFrame(lazy) => {
+                let df = lazy.collect(call.head)?;
+                command_df(plugin, engine, call, df)
+            }
+            PolarsPluginObject::NuExpression(expr) => command_expr(plugin, engine, call, expr),
+            _ => Err(cant_convert_err(
+                &value,
+                &[
+                    PolarsPluginType::NuDataFrame,
+                    PolarsPluginType::NuLazyFrame,
+                    PolarsPluginType::NuExpression,
+                ],
+            )),
+        }
+        .map_err(LabeledError::from)
     }
 }
 
-fn command(
+fn command_expr(
     plugin: &PolarsPlugin,
     engine: &EngineInterface,
     call: &EvaluatedCall,
-    input: PipelineData,
+    expr: NuExpression,
+) -> Result<PipelineData, ShellError> {
+    let pattern: String = call.req(0)?;
+    let res: NuExpression = expr
+        .into_polars()
+        .str()
+        .contains(lit(pattern), false)
+        .into();
+    res.to_pipeline_data(plugin, engine, call.head)
+}
+
+fn command_df(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    df: NuDataFrame,
 ) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
     let pattern: String = call.req(0)?;
 
     let series = df.as_series(call.head)?;

From 4792328d0e20fdc72c76700ad4ba8ce9464b4063 Mon Sep 17 00:00:00 2001
From: xonas <jontopanotti@gmail.com>
Date: Wed, 4 Sep 2024 18:05:39 -0300
Subject: [PATCH 0406/1072] Refactor send_request in client.rs (#13701)

Closes #13687
Closes #13686

# Description
Light refactoring of `send_request `in `client.rs`. In the end there are
more lines but now the logic is more concise and facilitates adding new
conditions in the future. Unit tests ran fine and I tested a few cases
manually.
Cool project btw, I'll be using nushell from now on.
---
 crates/nu-command/src/network/http/client.rs  | 287 ++++++++++--------
 .../tests/commands/network/http/post.rs       |  30 ++
 crates/nu-protocol/src/errors/shell_error.rs  |   9 +
 3 files changed, 203 insertions(+), 123 deletions(-)

diff --git a/crates/nu-command/src/network/http/client.rs b/crates/nu-command/src/network/http/client.rs
index 75ef8c4897..5c335fedf0 100644
--- a/crates/nu-command/src/network/http/client.rs
+++ b/crates/nu-command/src/network/http/client.rs
@@ -18,6 +18,8 @@ use std::{
 use ureq::{Error, ErrorKind, Request, Response};
 use url::Url;
 
+const HTTP_DOCS: &str = "https://www.nushell.sh/cookbook/http.html";
+
 #[derive(PartialEq, Eq)]
 pub enum BodyType {
     Json,
@@ -221,135 +223,174 @@ pub fn send_request(
                 _ => (BodyType::Unknown, request),
             };
 
-            match body {
-                Value::Binary { val, .. } => send_cancellable_request(
-                    &request_url,
-                    Box::new(move || req.send_bytes(&val)),
-                    span,
-                    signals,
-                ),
-                Value::String { .. } if body_type == BodyType::Json => {
-                    let data = value_to_json_value(&body)?;
-                    send_cancellable_request(
-                        &request_url,
-                        Box::new(|| req.send_json(data)),
-                        span,
-                        signals,
-                    )
+            match body_type {
+                BodyType::Json => send_json_request(&request_url, body, req, span, signals),
+                BodyType::Form => send_form_request(&request_url, body, req, span, signals),
+                BodyType::Multipart => {
+                    send_multipart_request(&request_url, body, req, span, signals)
                 }
-                Value::String { val, .. } => send_cancellable_request(
-                    &request_url,
-                    Box::new(move || req.send_string(&val)),
-                    span,
-                    signals,
-                ),
-                Value::Record { .. } if body_type == BodyType::Json => {
-                    let data = value_to_json_value(&body)?;
-                    send_cancellable_request(
-                        &request_url,
-                        Box::new(|| req.send_json(data)),
-                        span,
-                        signals,
-                    )
-                }
-                Value::Record { val, .. } if body_type == BodyType::Form => {
-                    let mut data: Vec<(String, String)> = Vec::with_capacity(val.len());
-
-                    for (col, val) in val.into_owned() {
-                        data.push((col, val.coerce_into_string()?))
-                    }
-
-                    let request_fn = move || {
-                        // coerce `data` into a shape that send_form() is happy with
-                        let data = data
-                            .iter()
-                            .map(|(a, b)| (a.as_str(), b.as_str()))
-                            .collect::<Vec<(&str, &str)>>();
-                        req.send_form(&data)
-                    };
-                    send_cancellable_request(&request_url, Box::new(request_fn), span, signals)
-                }
-                // multipart form upload
-                Value::Record { val, .. } if body_type == BodyType::Multipart => {
-                    let mut builder = MultipartWriter::new();
-
-                    let err = |e| {
-                        ShellErrorOrRequestError::ShellError(ShellError::IOError {
-                            msg: format!("failed to build multipart data: {}", e),
-                        })
-                    };
-
-                    for (col, val) in val.into_owned() {
-                        if let Value::Binary { val, .. } = val {
-                            let headers = [
-                                "Content-Type: application/octet-stream".to_string(),
-                                "Content-Transfer-Encoding: binary".to_string(),
-                                format!(
-                                    "Content-Disposition: form-data; name=\"{}\"; filename=\"{}\"",
-                                    col, col
-                                ),
-                                format!("Content-Length: {}", val.len()),
-                            ];
-                            builder
-                                .add(&mut Cursor::new(val), &headers.join("\n"))
-                                .map_err(err)?;
-                        } else {
-                            let headers =
-                                format!(r#"Content-Disposition: form-data; name="{}""#, col);
-                            builder
-                                .add(val.coerce_into_string()?.as_bytes(), &headers)
-                                .map_err(err)?;
-                        }
-                    }
-                    builder.finish();
-
-                    let (boundary, data) = (builder.boundary, builder.data);
-                    let content_type = format!("multipart/form-data; boundary={}", boundary);
-
-                    let request_fn =
-                        move || req.set("Content-Type", &content_type).send_bytes(&data);
-
-                    send_cancellable_request(&request_url, Box::new(request_fn), span, signals)
-                }
-                Value::List { vals, .. } if body_type == BodyType::Form => {
-                    if vals.len() % 2 != 0 {
-                        return Err(ShellErrorOrRequestError::ShellError(ShellError::IOError {
-                            msg: "unsupported body input".into(),
-                        }));
-                    }
-
-                    let data = vals
-                        .chunks(2)
-                        .map(|it| Ok((it[0].coerce_string()?, it[1].coerce_string()?)))
-                        .collect::<Result<Vec<(String, String)>, ShellErrorOrRequestError>>()?;
-
-                    let request_fn = move || {
-                        // coerce `data` into a shape that send_form() is happy with
-                        let data = data
-                            .iter()
-                            .map(|(a, b)| (a.as_str(), b.as_str()))
-                            .collect::<Vec<(&str, &str)>>();
-                        req.send_form(&data)
-                    };
-                    send_cancellable_request(&request_url, Box::new(request_fn), span, signals)
-                }
-                Value::List { .. } if body_type == BodyType::Json => {
-                    let data = value_to_json_value(&body)?;
-                    send_cancellable_request(
-                        &request_url,
-                        Box::new(|| req.send_json(data)),
-                        span,
-                        signals,
-                    )
-                }
-                _ => Err(ShellErrorOrRequestError::ShellError(ShellError::IOError {
-                    msg: "unsupported body input".into(),
-                })),
+                BodyType::Unknown => send_default_request(&request_url, body, req, span, signals),
             }
         }
     }
 }
 
+fn send_json_request(
+    request_url: &str,
+    body: Value,
+    req: Request,
+    span: Span,
+    signals: &Signals,
+) -> Result<Response, ShellErrorOrRequestError> {
+    let data = match body {
+        Value::Int { .. } | Value::List { .. } | Value::String { .. } | Value::Record { .. } => {
+            value_to_json_value(&body)?
+        }
+        _ => {
+            return Err(ShellErrorOrRequestError::ShellError(
+                ShellError::UnsupportedHttpBody {
+                    msg: format!("Accepted types: [Int, List, String, Record]. Check: {HTTP_DOCS}"),
+                },
+            ))
+        }
+    };
+    send_cancellable_request(request_url, Box::new(|| req.send_json(data)), span, signals)
+}
+
+fn send_form_request(
+    request_url: &str,
+    body: Value,
+    req: Request,
+    span: Span,
+    signals: &Signals,
+) -> Result<Response, ShellErrorOrRequestError> {
+    let build_request_fn = |data: Vec<(String, String)>| {
+        // coerce `data` into a shape that send_form() is happy with
+        let data = data
+            .iter()
+            .map(|(a, b)| (a.as_str(), b.as_str()))
+            .collect::<Vec<(&str, &str)>>();
+        req.send_form(&data)
+    };
+
+    match body {
+        Value::List { vals, .. } => {
+            if vals.len() % 2 != 0 {
+                return Err(ShellErrorOrRequestError::ShellError(ShellError::UnsupportedHttpBody {
+                    msg: "Body type 'List' for form requests requires paired values. E.g.: [value, 10]".into(),
+                }));
+            }
+
+            let data = vals
+                .chunks(2)
+                .map(|it| Ok((it[0].coerce_string()?, it[1].coerce_string()?)))
+                .collect::<Result<Vec<(String, String)>, ShellErrorOrRequestError>>()?;
+
+            let request_fn = Box::new(|| build_request_fn(data));
+            send_cancellable_request(request_url, request_fn, span, signals)
+        }
+        Value::Record { val, .. } => {
+            let mut data: Vec<(String, String)> = Vec::with_capacity(val.len());
+
+            for (col, val) in val.into_owned() {
+                data.push((col, val.coerce_into_string()?))
+            }
+
+            let request_fn = Box::new(|| build_request_fn(data));
+            send_cancellable_request(request_url, request_fn, span, signals)
+        }
+        _ => Err(ShellErrorOrRequestError::ShellError(
+            ShellError::UnsupportedHttpBody {
+                msg: format!("Accepted types: [List, Record]. Check: {HTTP_DOCS}"),
+            },
+        )),
+    }
+}
+
+fn send_multipart_request(
+    request_url: &str,
+    body: Value,
+    req: Request,
+    span: Span,
+    signals: &Signals,
+) -> Result<Response, ShellErrorOrRequestError> {
+    let request_fn = match body {
+        Value::Record { val, .. } => {
+            let mut builder = MultipartWriter::new();
+
+            let err = |e| {
+                ShellErrorOrRequestError::ShellError(ShellError::IOError {
+                    msg: format!("failed to build multipart data: {}", e),
+                })
+            };
+
+            for (col, val) in val.into_owned() {
+                if let Value::Binary { val, .. } = val {
+                    let headers = [
+                        "Content-Type: application/octet-stream".to_string(),
+                        "Content-Transfer-Encoding: binary".to_string(),
+                        format!(
+                            "Content-Disposition: form-data; name=\"{}\"; filename=\"{}\"",
+                            col, col
+                        ),
+                        format!("Content-Length: {}", val.len()),
+                    ];
+                    builder
+                        .add(&mut Cursor::new(val), &headers.join("\n"))
+                        .map_err(err)?;
+                } else {
+                    let headers = format!(r#"Content-Disposition: form-data; name="{}""#, col);
+                    builder
+                        .add(val.coerce_into_string()?.as_bytes(), &headers)
+                        .map_err(err)?;
+                }
+            }
+            builder.finish();
+
+            let (boundary, data) = (builder.boundary, builder.data);
+            let content_type = format!("multipart/form-data; boundary={}", boundary);
+
+            move || req.set("Content-Type", &content_type).send_bytes(&data)
+        }
+        _ => {
+            return Err(ShellErrorOrRequestError::ShellError(
+                ShellError::UnsupportedHttpBody {
+                    msg: format!("Accepted types: [Record]. Check: {HTTP_DOCS}"),
+                },
+            ))
+        }
+    };
+    send_cancellable_request(request_url, Box::new(request_fn), span, signals)
+}
+
+fn send_default_request(
+    request_url: &str,
+    body: Value,
+    req: Request,
+    span: Span,
+    signals: &Signals,
+) -> Result<Response, ShellErrorOrRequestError> {
+    match body {
+        Value::Binary { val, .. } => send_cancellable_request(
+            request_url,
+            Box::new(move || req.send_bytes(&val)),
+            span,
+            signals,
+        ),
+        Value::String { val, .. } => send_cancellable_request(
+            request_url,
+            Box::new(move || req.send_string(&val)),
+            span,
+            signals,
+        ),
+        _ => Err(ShellErrorOrRequestError::ShellError(
+            ShellError::UnsupportedHttpBody {
+                msg: format!("Accepted types: [Binary, String]. Check: {HTTP_DOCS}"),
+            },
+        )),
+    }
+}
+
 // Helper method used to make blocking HTTP request calls cancellable with ctrl+c
 // ureq functions can block for a long time (default 30s?) while attempting to make an HTTP connection
 fn send_cancellable_request(
diff --git a/crates/nu-command/tests/commands/network/http/post.rs b/crates/nu-command/tests/commands/network/http/post.rs
index 11db87168e..6fbcb03b69 100644
--- a/crates/nu-command/tests/commands/network/http/post.rs
+++ b/crates/nu-command/tests/commands/network/http/post.rs
@@ -133,6 +133,36 @@ fn http_post_json_list_is_success() {
     assert!(actual.out.is_empty())
 }
 
+#[test]
+fn http_post_json_int_is_success() {
+    let mut server = Server::new();
+
+    let mock = server.mock("POST", "/").match_body(r#"50"#).create();
+
+    let actual = nu!(format!(
+        r#"http post -t 'application/json' {url} 50"#,
+        url = server.url()
+    ));
+
+    mock.assert();
+    assert!(actual.out.is_empty())
+}
+
+#[test]
+fn http_post_json_string_is_success() {
+    let mut server = Server::new();
+
+    let mock = server.mock("POST", "/").match_body(r#""test""#).create();
+
+    let actual = nu!(format!(
+        r#"http post -t 'application/json' {url} "test""#,
+        url = server.url()
+    ));
+
+    mock.assert();
+    assert!(actual.out.is_empty())
+}
+
 #[test]
 fn http_post_follows_redirect() {
     let mut server = Server::new();
diff --git a/crates/nu-protocol/src/errors/shell_error.rs b/crates/nu-protocol/src/errors/shell_error.rs
index ab01ccfa54..b4224ae05c 100644
--- a/crates/nu-protocol/src/errors/shell_error.rs
+++ b/crates/nu-protocol/src/errors/shell_error.rs
@@ -639,6 +639,15 @@ pub enum ShellError {
         span: Span,
     },
 
+    /// An unsupported body input was used for the respective application body type in 'http' command
+    ///
+    /// ## Resolution
+    ///
+    /// This error is fairly generic. Refer to the specific error message for further details.
+    #[error("Unsupported body for current content type")]
+    #[diagnostic(code(nu::shell::unsupported_body), help("{msg}"))]
+    UnsupportedHttpBody { msg: String },
+
     /// An operation was attempted with an input unsupported for some reason.
     ///
     /// ## Resolution

From abd230e12e72d5f1863fc33e91ce11733913ce92 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Thu, 5 Sep 2024 00:44:23 -0700
Subject: [PATCH 0407/1072] Use `IntoValue` in config code (#13751)

# Description

Cleans up and refactors the config code using the `IntoValue` macro.
Shoutout to @cptpiepmatz for making the macro!

# User-Facing Changes

Should be none.

# After Submitting

Somehow refactor the reverse transformation.
---
 .../nu-cli/src/commands/history/history_.rs   |    6 +-
 .../src/completions/command_completions.rs    |    6 +-
 crates/nu-cli/src/completions/completer.rs    |   12 +-
 .../src/completions/completion_common.rs      |    2 +-
 crates/nu-cli/src/config_files.rs             |    2 +-
 crates/nu-cli/src/eval_cmds.rs                |    4 +-
 crates/nu-cli/src/prompt_update.rs            |    6 +-
 crates/nu-cli/src/reedline_config.rs          |   28 +-
 crates/nu-cli/src/repl.rs                     |   38 +-
 crates/nu-command/src/filesystem/rm.rs        |    2 +-
 crates/nu-command/src/viewers/table.rs        |   16 +-
 crates/nu-derive-value/src/from.rs            |    4 +-
 crates/nu-derive-value/src/names.rs           |   18 +-
 crates/nu-explore/src/explore.rs              |    4 +-
 crates/nu-explore/src/nu_common/table.rs      |    8 +-
 crates/nu-protocol/src/config/completer.rs    |   81 +-
 .../nu-protocol/src/config/datetime_format.rs |    8 +
 crates/nu-protocol/src/config/filesize.rs     |   17 +
 crates/nu-protocol/src/config/helper.rs       |   12 +-
 crates/nu-protocol/src/config/history.rs      |   41 +
 crates/nu-protocol/src/config/hooks.rs        |   28 +-
 crates/nu-protocol/src/config/ls.rs           |   17 +
 crates/nu-protocol/src/config/mod.rs          | 1314 ++++++++---------
 crates/nu-protocol/src/config/output.rs       |   31 +-
 crates/nu-protocol/src/config/plugin_gc.rs    |   69 +-
 crates/nu-protocol/src/config/prelude.rs      |    3 +
 crates/nu-protocol/src/config/reedline.rs     |  154 +-
 crates/nu-protocol/src/config/rm.rs           |   16 +
 .../src/config/shell_integration.rs           |   28 +
 crates/nu-protocol/src/config/table.rs        |  185 +--
 crates/nu-protocol/src/eval_const.rs          |    2 +-
 crates/nu-protocol/src/value/filesize.rs      |    4 +-
 crates/nu-protocol/src/value/mod.rs           |    4 +-
 crates/nu-table/src/common.rs                 |   16 +-
 crates/nu-table/src/types/collapse.rs         |    2 +-
 crates/nu-table/src/types/general.rs          |    8 +-
 crates/nu-table/src/types/mod.rs              |    2 +-
 37 files changed, 992 insertions(+), 1206 deletions(-)
 create mode 100644 crates/nu-protocol/src/config/datetime_format.rs
 create mode 100644 crates/nu-protocol/src/config/filesize.rs
 create mode 100644 crates/nu-protocol/src/config/history.rs
 create mode 100644 crates/nu-protocol/src/config/ls.rs
 create mode 100644 crates/nu-protocol/src/config/prelude.rs
 create mode 100644 crates/nu-protocol/src/config/rm.rs
 create mode 100644 crates/nu-protocol/src/config/shell_integration.rs

diff --git a/crates/nu-cli/src/commands/history/history_.rs b/crates/nu-cli/src/commands/history/history_.rs
index cf6e0f390f..fc1ed1b516 100644
--- a/crates/nu-cli/src/commands/history/history_.rs
+++ b/crates/nu-cli/src/commands/history/history_.rs
@@ -55,7 +55,7 @@ impl Command for History {
                 HistoryFileFormat::Sqlite => {
                     history_path.push("history.sqlite3");
                 }
-                HistoryFileFormat::PlainText => {
+                HistoryFileFormat::Plaintext => {
                     history_path.push("history.txt");
                 }
             }
@@ -75,7 +75,7 @@ impl Command for History {
                             .ok()
                     }
 
-                    HistoryFileFormat::PlainText => FileBackedHistory::with_file(
+                    HistoryFileFormat::Plaintext => FileBackedHistory::with_file(
                         history.max_size as usize,
                         history_path.clone().into(),
                     )
@@ -87,7 +87,7 @@ impl Command for History {
                 };
 
                 match history.file_format {
-                    HistoryFileFormat::PlainText => Ok(history_reader
+                    HistoryFileFormat::Plaintext => Ok(history_reader
                         .and_then(|h| {
                             h.search(SearchQuery::everything(SearchDirection::Forward, None))
                                 .ok()
diff --git a/crates/nu-cli/src/completions/command_completions.rs b/crates/nu-cli/src/completions/command_completions.rs
index f8107f8ed7..e5c7e8f140 100644
--- a/crates/nu-cli/src/completions/command_completions.rs
+++ b/crates/nu-cli/src/completions/command_completions.rs
@@ -51,7 +51,9 @@ impl CommandCompletion {
                             if working_set
                                 .permanent_state
                                 .config
-                                .max_external_completion_results
+                                .completions
+                                .external
+                                .max_results
                                 > executables.len() as i64
                                 && !executables.contains(
                                     &item
@@ -211,7 +213,7 @@ impl Completer for CommandCompletion {
                 working_set,
                 span,
                 offset,
-                config.enable_external_completion,
+                config.completions.external.enable,
                 options.match_algorithm,
             )
         } else {
diff --git a/crates/nu-cli/src/completions/completer.rs b/crates/nu-cli/src/completions/completer.rs
index 91fc1132a5..f4e3b1e817 100644
--- a/crates/nu-cli/src/completions/completer.rs
+++ b/crates/nu-cli/src/completions/completer.rs
@@ -46,9 +46,9 @@ impl NuCompleter {
         let config = self.engine_state.get_config();
 
         let options = CompletionOptions {
-            case_sensitive: config.case_sensitive_completions,
-            match_algorithm: config.completion_algorithm.into(),
-            sort: config.completion_sort,
+            case_sensitive: config.completions.case_sensitive,
+            match_algorithm: config.completions.algorithm.into(),
+            sort: config.completions.sort,
             ..Default::default()
         };
 
@@ -208,7 +208,7 @@ impl NuCompleter {
 
                             // We got no results for internal completion
                             // now we can check if external completer is set and use it
-                            if let Some(closure) = config.external_completer.as_ref() {
+                            if let Some(closure) = config.completions.external.completer.as_ref() {
                                 if let Some(external_result) =
                                     self.external_completion(closure, &spans, fake_offset, new_span)
                                 {
@@ -338,7 +338,9 @@ impl NuCompleter {
                                 }
 
                                 // Try to complete using an external completer (if set)
-                                if let Some(closure) = config.external_completer.as_ref() {
+                                if let Some(closure) =
+                                    config.completions.external.completer.as_ref()
+                                {
                                     if let Some(external_result) = self.external_completion(
                                         closure,
                                         &spans,
diff --git a/crates/nu-cli/src/completions/completion_common.rs b/crates/nu-cli/src/completions/completion_common.rs
index a5d07be57e..8aae72b4f3 100644
--- a/crates/nu-cli/src/completions/completion_common.rs
+++ b/crates/nu-cli/src/completions/completion_common.rs
@@ -167,7 +167,7 @@ pub fn complete_item(
         .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
+    let ls_colors = (engine_state.config.completions.use_ls_colors
         && engine_state.config.use_ansi_coloring)
         .then(|| {
             let ls_colors_env_str = match stack.get_env_var(engine_state, "LS_COLORS") {
diff --git a/crates/nu-cli/src/config_files.rs b/crates/nu-cli/src/config_files.rs
index 0a1226c304..701db7ac65 100644
--- a/crates/nu-cli/src/config_files.rs
+++ b/crates/nu-cli/src/config_files.rs
@@ -245,7 +245,7 @@ pub(crate) fn get_history_path(storage_path: &str, mode: HistoryFileFormat) -> O
     nu_path::config_dir().map(|mut history_path| {
         history_path.push(storage_path);
         history_path.push(match mode {
-            HistoryFileFormat::PlainText => HISTORY_FILE_TXT,
+            HistoryFileFormat::Plaintext => HISTORY_FILE_TXT,
             HistoryFileFormat::Sqlite => HISTORY_FILE_SQLITE,
         });
         history_path.into()
diff --git a/crates/nu-cli/src/eval_cmds.rs b/crates/nu-cli/src/eval_cmds.rs
index 1459f1ef0d..0a9136bc51 100644
--- a/crates/nu-cli/src/eval_cmds.rs
+++ b/crates/nu-cli/src/eval_cmds.rs
@@ -53,7 +53,7 @@ pub fn evaluate_commands(
     // Parse the source code
     let (block, delta) = {
         if let Some(ref t_mode) = table_mode {
-            Arc::make_mut(&mut engine_state.config).table_mode =
+            Arc::make_mut(&mut engine_state.config).table.mode =
                 t_mode.coerce_str()?.parse().unwrap_or_default();
         }
 
@@ -88,7 +88,7 @@ pub fn evaluate_commands(
     }
 
     if let Some(t_mode) = table_mode {
-        Arc::make_mut(&mut engine_state.config).table_mode =
+        Arc::make_mut(&mut engine_state.config).table.mode =
             t_mode.coerce_str()?.parse().unwrap_or_default();
     }
 
diff --git a/crates/nu-cli/src/prompt_update.rs b/crates/nu-cli/src/prompt_update.rs
index 5765755ac4..dd99b6f338 100644
--- a/crates/nu-cli/src/prompt_update.rs
+++ b/crates/nu-cli/src/prompt_update.rs
@@ -118,13 +118,13 @@ pub(crate) fn update_prompt(
 
     // Now that we have the prompt string lets ansify it.
     // <133 A><prompt><133 B><command><133 C><command output>
-    let left_prompt_string = if config.shell_integration_osc633 {
+    let left_prompt_string = if config.shell_integration.osc633 {
         if stack.get_env_var(engine_state, "TERM_PROGRAM") == Some(Value::test_string("vscode")) {
             // We're in vscode and we have osc633 enabled
             Some(format!(
                 "{VSCODE_PRE_PROMPT_MARKER}{configured_left_prompt_string}{VSCODE_POST_PROMPT_MARKER}"
             ))
-        } else if config.shell_integration_osc133 {
+        } else if config.shell_integration.osc133 {
             // If we're in VSCode but we don't find the env var, but we have osc133 set, then use it
             Some(format!(
                 "{PRE_PROMPT_MARKER}{configured_left_prompt_string}{POST_PROMPT_MARKER}"
@@ -132,7 +132,7 @@ pub(crate) fn update_prompt(
         } else {
             configured_left_prompt_string.into()
         }
-    } else if config.shell_integration_osc133 {
+    } else if config.shell_integration.osc133 {
         Some(format!(
             "{PRE_PROMPT_MARKER}{configured_left_prompt_string}{POST_PROMPT_MARKER}"
         ))
diff --git a/crates/nu-cli/src/reedline_config.rs b/crates/nu-cli/src/reedline_config.rs
index 63d88316df..71fd9f32e1 100644
--- a/crates/nu-cli/src/reedline_config.rs
+++ b/crates/nu-cli/src/reedline_config.rs
@@ -159,8 +159,8 @@ fn add_menu(
     stack: &Stack,
     config: Arc<Config>,
 ) -> Result<Reedline, ShellError> {
-    let span = menu.menu_type.span();
-    if let Value::Record { val, .. } = &menu.menu_type {
+    let span = menu.r#type.span();
+    if let Value::Record { val, .. } = &menu.r#type {
         let layout = extract_value("layout", val, span)?.to_expanded_string("", &config);
 
         match layout.as_str() {
@@ -170,15 +170,15 @@ fn add_menu(
             "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),
-                span: menu.menu_type.span(),
+                value: menu.r#type.to_abbreviated_string(&config),
+                span: menu.r#type.span(),
             }),
         }
     } else {
         Err(ShellError::UnsupportedConfigValue {
             expected: "only record type".to_string(),
-            value: menu.menu_type.to_abbreviated_string(&config),
-            span: menu.menu_type.span(),
+            value: menu.r#type.to_abbreviated_string(&config),
+            span: menu.r#type.span(),
         })
     }
 }
@@ -224,11 +224,11 @@ pub(crate) fn add_columnar_menu(
     stack: &Stack,
     config: &Config,
 ) -> Result<Reedline, ShellError> {
-    let span = menu.menu_type.span();
+    let span = menu.r#type.span();
     let name = menu.name.to_expanded_string("", config);
     let mut columnar_menu = ColumnarMenu::default().with_name(&name);
 
-    if let Value::Record { val, .. } = &menu.menu_type {
+    if let Value::Record { val, .. } = &menu.r#type {
         columnar_menu = match extract_value("columns", val, span) {
             Ok(columns) => {
                 let columns = columns.as_int()?;
@@ -299,8 +299,8 @@ pub(crate) fn add_list_menu(
     let name = menu.name.to_expanded_string("", &config);
     let mut list_menu = ListMenu::default().with_name(&name);
 
-    let span = menu.menu_type.span();
-    if let Value::Record { val, .. } = &menu.menu_type {
+    let span = menu.r#type.span();
+    if let Value::Record { val, .. } = &menu.r#type {
         list_menu = match extract_value("page_size", val, span) {
             Ok(page_size) => {
                 let page_size = page_size.as_int()?;
@@ -352,11 +352,11 @@ pub(crate) fn add_ide_menu(
     stack: &Stack,
     config: Arc<Config>,
 ) -> Result<Reedline, ShellError> {
-    let span = menu.menu_type.span();
+    let span = menu.r#type.span();
     let name = menu.name.to_expanded_string("", &config);
     let mut ide_menu = IdeMenu::default().with_name(&name);
 
-    if let Value::Record { val, .. } = &menu.menu_type {
+    if let Value::Record { val, .. } = &menu.r#type {
         ide_menu = match extract_value("min_completion_width", val, span) {
             Ok(min_completion_width) => {
                 let min_completion_width = min_completion_width.as_int()?;
@@ -536,8 +536,8 @@ pub(crate) fn add_description_menu(
     let name = menu.name.to_expanded_string("", &config);
     let mut description_menu = DescriptionMenu::default().with_name(&name);
 
-    let span = menu.menu_type.span();
-    if let Value::Record { val, .. } = &menu.menu_type {
+    let span = menu.r#type.span();
+    if let Value::Record { val, .. } = &menu.r#type {
         description_menu = match extract_value("columns", val, span) {
             Ok(columns) => {
                 let columns = columns.as_int()?;
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 0fd23b76d0..95fb000be0 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -72,11 +72,11 @@ pub fn evaluate_repl(
     let mut entry_num = 0;
 
     // Let's grab the shell_integration configs
-    let shell_integration_osc2 = config.shell_integration_osc2;
-    let shell_integration_osc7 = config.shell_integration_osc7;
-    let shell_integration_osc9_9 = config.shell_integration_osc9_9;
-    let shell_integration_osc133 = config.shell_integration_osc133;
-    let shell_integration_osc633 = config.shell_integration_osc633;
+    let shell_integration_osc2 = config.shell_integration.osc2;
+    let shell_integration_osc7 = config.shell_integration.osc7;
+    let shell_integration_osc9_9 = config.shell_integration.osc9_9;
+    let shell_integration_osc133 = config.shell_integration.osc133;
+    let shell_integration_osc633 = config.shell_integration.osc633;
 
     let nu_prompt = NushellPrompt::new(
         shell_integration_osc133,
@@ -322,9 +322,9 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
     start_time = std::time::Instant::now();
     // Find the configured cursor shapes for each mode
     let cursor_config = CursorConfig {
-        vi_insert: map_nucursorshape_to_cursorshape(config.cursor_shape_vi_insert),
-        vi_normal: map_nucursorshape_to_cursorshape(config.cursor_shape_vi_normal),
-        emacs: map_nucursorshape_to_cursorshape(config.cursor_shape_emacs),
+        vi_insert: map_nucursorshape_to_cursorshape(config.cursor_shape.vi_insert),
+        vi_normal: map_nucursorshape_to_cursorshape(config.cursor_shape.vi_normal),
+        emacs: map_nucursorshape_to_cursorshape(config.cursor_shape.emacs),
     };
     perf!("get config/cursor config", start_time, use_color);
 
@@ -352,8 +352,8 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
             // STACK-REFERENCE 2
             stack_arc.clone(),
         )))
-        .with_quick_completions(config.quick_completions)
-        .with_partial_completions(config.partial_completions)
+        .with_quick_completions(config.completions.quick)
+        .with_partial_completions(config.completions.partial)
         .with_ansi_colors(config.use_ansi_coloring)
         .with_cwd(Some(
             engine_state
@@ -457,12 +457,12 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
         .with_completer(Box::<DefaultCompleter>::default());
 
     // Let's grab the shell_integration configs
-    let shell_integration_osc2 = config.shell_integration_osc2;
-    let shell_integration_osc7 = config.shell_integration_osc7;
-    let shell_integration_osc9_9 = config.shell_integration_osc9_9;
-    let shell_integration_osc133 = config.shell_integration_osc133;
-    let shell_integration_osc633 = config.shell_integration_osc633;
-    let shell_integration_reset_application_mode = config.shell_integration_reset_application_mode;
+    let shell_integration_osc2 = config.shell_integration.osc2;
+    let shell_integration_osc7 = config.shell_integration.osc7;
+    let shell_integration_osc9_9 = config.shell_integration.osc9_9;
+    let shell_integration_osc133 = config.shell_integration.osc133;
+    let shell_integration_osc633 = config.shell_integration.osc633;
+    let shell_integration_reset_application_mode = config.shell_integration.reset_application_mode;
 
     // TODO: we may clone the stack, this can lead to major performance issues
     // so we should avoid it or making stack cheaper to clone.
@@ -1173,7 +1173,7 @@ fn update_line_editor_history(
     history_session_id: Option<HistorySessionId>,
 ) -> Result<Reedline, ErrReport> {
     let history: Box<dyn reedline::History> = match history.file_format {
-        HistoryFileFormat::PlainText => Box::new(
+        HistoryFileFormat::Plaintext => Box::new(
             FileBackedHistory::with_file(history.max_size as usize, history_path)
                 .into_diagnostic()?,
         ),
@@ -1211,10 +1211,10 @@ fn confirm_stdin_is_terminal() -> Result<()> {
 fn map_nucursorshape_to_cursorshape(shape: NuCursorShape) -> Option<SetCursorStyle> {
     match shape {
         NuCursorShape::Block => Some(SetCursorStyle::SteadyBlock),
-        NuCursorShape::UnderScore => Some(SetCursorStyle::SteadyUnderScore),
+        NuCursorShape::Underscore => Some(SetCursorStyle::SteadyUnderScore),
         NuCursorShape::Line => Some(SetCursorStyle::SteadyBar),
         NuCursorShape::BlinkBlock => Some(SetCursorStyle::BlinkingBlock),
-        NuCursorShape::BlinkUnderScore => Some(SetCursorStyle::BlinkingUnderScore),
+        NuCursorShape::BlinkUnderscore => Some(SetCursorStyle::BlinkingUnderScore),
         NuCursorShape::BlinkLine => Some(SetCursorStyle::BlinkingBar),
         NuCursorShape::Inherit => None,
     }
diff --git a/crates/nu-command/src/filesystem/rm.rs b/crates/nu-command/src/filesystem/rm.rs
index 2e5b964a7e..3475c1a595 100644
--- a/crates/nu-command/src/filesystem/rm.rs
+++ b/crates/nu-command/src/filesystem/rm.rs
@@ -167,7 +167,7 @@ fn rm(
     }
 
     let span = call.head;
-    let rm_always_trash = stack.get_config(engine_state).rm_always_trash;
+    let rm_always_trash = stack.get_config(engine_state).rm.always_trash;
 
     if !TRASH_SUPPORTED {
         if rm_always_trash {
diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index 7ad15497da..dc52c4e094 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -258,7 +258,7 @@ fn parse_table_config(
     let flatten_separator: Option<String> = call.get_flag(state, stack, "flatten-separator")?;
     let abbrivation: Option<usize> = call
         .get_flag(state, stack, "abbreviated")?
-        .or_else(|| stack.get_config(state).table_abbreviation_threshold);
+        .or_else(|| stack.get_config(state).table.abbreviated_row_count);
     let table_view = match (expand, collapse) {
         (false, false) => TableView::General,
         (_, true) => TableView::Collapsed,
@@ -269,7 +269,7 @@ fn parse_table_config(
         },
     };
     let theme =
-        get_theme_flag(call, state, stack)?.unwrap_or_else(|| stack.get_config(state).table_mode);
+        get_theme_flag(call, state, stack)?.unwrap_or_else(|| stack.get_config(state).table.mode);
     let index = get_index_flag(call, state, stack)?;
 
     let term_width = get_width_param(width_param);
@@ -520,7 +520,7 @@ fn handle_record(
         }
     }
 
-    let indent = (config.table_indent.left, config.table_indent.right);
+    let indent = (config.table.padding.left, config.table.padding.right);
     let opts = TableOpts::new(
         &config,
         styles,
@@ -821,7 +821,7 @@ impl PagingTableCreator {
             self.engine_state.signals(),
             self.head,
             self.cfg.term_width,
-            (cfg.table_indent.left, cfg.table_indent.right),
+            (cfg.table.padding.left, cfg.table.padding.right),
             self.cfg.theme,
             self.cfg.index.unwrap_or(0) + self.row_offset,
             self.cfg.index.is_none(),
@@ -1010,7 +1010,7 @@ fn render_path_name(
     ls_colors: &LsColors,
     span: Span,
 ) -> Option<Value> {
-    if !config.use_ls_colors {
+    if !config.ls.use_ls_colors {
         return None;
     }
 
@@ -1024,10 +1024,10 @@ fn render_path_name(
     // clickable links don't work in remote SSH sessions
     let in_ssh_session = std::env::var("SSH_CLIENT").is_ok();
     //TODO: Deprecated show_clickable_links_in_ls in favor of shell_integration_osc8
-    let show_clickable_links = config.show_clickable_links_in_ls
+    let show_clickable_links = config.ls.clickable_links
         && !in_ssh_session
         && has_metadata
-        && config.shell_integration_osc8;
+        && config.shell_integration.osc8;
 
     let ansi_style = style.map(Style::to_nu_ansi_term_style).unwrap_or_default();
 
@@ -1074,7 +1074,7 @@ fn create_empty_placeholder(
     stack: &Stack,
 ) -> String {
     let config = stack.get_config(engine_state);
-    if !config.table_show_empty {
+    if !config.table.show_empty {
         return String::new();
     }
 
diff --git a/crates/nu-derive-value/src/from.rs b/crates/nu-derive-value/src/from.rs
index 7c929ffca3..ee5f9f823e 100644
--- a/crates/nu-derive-value/src/from.rs
+++ b/crates/nu-derive-value/src/from.rs
@@ -126,7 +126,7 @@ fn derive_struct_from_value(
 ///                 .remove("favorite_toy")
 ///                 .map(|v| <#ty as nu_protocol::FromValue>::from_value(v))
 ///                 .transpose()?
-///                 .flatten(),         
+///                 .flatten(),
 ///         })
 ///     }
 /// }
@@ -491,7 +491,7 @@ fn enum_from_value(data: &DataEnum, attrs: &[Attribute]) -> Result {
 }
 
 /// Implements `FromValue::expected_type` for enums.
-///  
+///
 /// Since it's difficult to name the type of an enum in the current type system, we want to use the
 /// default implementation if `#[nu_value(type_name = "...")]` was *not* given.
 /// For that, a `None` value is returned, for a passed type name we return something like this:
diff --git a/crates/nu-derive-value/src/names.rs b/crates/nu-derive-value/src/names.rs
index 3798395b7f..3a8867121b 100644
--- a/crates/nu-derive-value/src/names.rs
+++ b/crates/nu-derive-value/src/names.rs
@@ -1,5 +1,6 @@
 use proc_macro2::Span;
 use std::collections::HashMap;
+use syn::ext::IdentExt;
 use syn::Ident;
 
 use crate::attributes::{ContainerAttributes, MemberAttributes};
@@ -33,18 +34,17 @@ impl NameResolver {
     /// If a duplicate identifier is detected, it returns [`DeriveError::NonUniqueName`].
     pub fn resolve_ident<M>(
         &mut self,
-        ident: &'_ Ident,
-        container_attrs: &'_ ContainerAttributes,
-        member_attrs: &'_ MemberAttributes,
+        ident: &Ident,
+        container_attrs: &ContainerAttributes,
+        member_attrs: &MemberAttributes,
         default: impl Into<Option<Case>>,
     ) -> Result<String, DeriveError<M>> {
         let span = ident.span();
-        let rename_all = container_attrs.rename_all;
-        let rename = member_attrs.rename.as_ref();
-        let ident = match (rename, rename_all) {
-            (Some(rename), _) => rename.to_string(),
-            (None, Some(case)) => ident.to_case(case),
-            (None, None) => ident.to_case(default),
+        let ident = if let Some(rename) = &member_attrs.rename {
+            rename.clone()
+        } else {
+            let case = container_attrs.rename_all.or(default.into());
+            ident.unraw().to_case(case)
         };
 
         if let Some(seen) = self.seen_names.get(&ident) {
diff --git a/crates/nu-explore/src/explore.rs b/crates/nu-explore/src/explore.rs
index 3fdd9835d8..d6a59ee083 100644
--- a/crates/nu-explore/src/explore.rs
+++ b/crates/nu-explore/src/explore.rs
@@ -177,8 +177,8 @@ impl ExploreConfig {
     pub fn from_nu_config(config: &Config) -> Self {
         let mut ret = Self::default();
 
-        ret.table.column_padding_left = config.table_indent.left;
-        ret.table.column_padding_right = config.table_indent.right;
+        ret.table.column_padding_left = config.table.padding.left;
+        ret.table.column_padding_right = config.table.padding.right;
 
         let explore_cfg_hash_map = config.explore.clone();
         let colors = get_color_map(&explore_cfg_hash_map);
diff --git a/crates/nu-explore/src/nu_common/table.rs b/crates/nu-explore/src/nu_common/table.rs
index 164c837bf9..79a97ed9ca 100644
--- a/crates/nu-explore/src/nu_common/table.rs
+++ b/crates/nu-explore/src/nu_common/table.rs
@@ -36,8 +36,8 @@ fn try_build_map(
         signals,
         Span::unknown(),
         usize::MAX,
-        (config.table_indent.left, config.table_indent.right),
-        config.table_mode,
+        (config.table.padding.left, config.table.padding.right),
+        config.table.mode,
         0,
         false,
     );
@@ -63,8 +63,8 @@ fn try_build_list(
         signals,
         Span::unknown(),
         usize::MAX,
-        (config.table_indent.left, config.table_indent.right),
-        config.table_mode,
+        (config.table.padding.left, config.table.padding.right),
+        config.table.mode,
         0,
         false,
     );
diff --git a/crates/nu-protocol/src/config/completer.rs b/crates/nu-protocol/src/config/completer.rs
index 921057c082..1494c375a6 100644
--- a/crates/nu-protocol/src/config/completer.rs
+++ b/crates/nu-protocol/src/config/completer.rs
@@ -1,12 +1,8 @@
-use std::str::FromStr;
+use super::prelude::*;
+use crate as nu_protocol;
+use crate::engine::Closure;
 
-use serde::{Deserialize, Serialize};
-
-use crate::{record, Config, Span, Value};
-
-use super::helper::ReconstructVal;
-
-#[derive(Serialize, Deserialize, Clone, Copy, Debug, Default)]
+#[derive(Clone, Copy, Debug, Default, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
 pub enum CompletionAlgorithm {
     #[default]
     Prefix,
@@ -25,17 +21,7 @@ impl FromStr for CompletionAlgorithm {
     }
 }
 
-impl ReconstructVal for CompletionAlgorithm {
-    fn reconstruct_value(&self, span: Span) -> Value {
-        let str = match self {
-            CompletionAlgorithm::Prefix => "prefix",
-            CompletionAlgorithm::Fuzzy => "fuzzy",
-        };
-        Value::string(str, span)
-    }
-}
-
-#[derive(Serialize, Deserialize, Clone, Copy, Debug, Default, PartialEq)]
+#[derive(Clone, Copy, Debug, Default, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
 pub enum CompletionSort {
     #[default]
     Smart,
@@ -54,31 +40,44 @@ impl FromStr for CompletionSort {
     }
 }
 
-impl ReconstructVal for CompletionSort {
-    fn reconstruct_value(&self, span: Span) -> Value {
-        let str = match self {
-            Self::Smart => "smart",
-            Self::Alphabetical => "alphabetical",
-        };
-        Value::string(str, span)
+#[derive(Clone, Debug, IntoValue, Serialize, Deserialize)]
+pub struct ExternalCompleterConfig {
+    pub enable: bool,
+    pub max_results: i64,
+    pub completer: Option<Closure>,
+}
+
+impl Default for ExternalCompleterConfig {
+    fn default() -> Self {
+        Self {
+            enable: true,
+            max_results: 100,
+            completer: None,
+        }
     }
 }
 
-pub(super) fn reconstruct_external_completer(config: &Config, span: Span) -> Value {
-    if let Some(closure) = config.external_completer.as_ref() {
-        Value::closure(closure.clone(), span)
-    } else {
-        Value::nothing(span)
-    }
+#[derive(Clone, Debug, IntoValue, Serialize, Deserialize)]
+pub struct CompleterConfig {
+    pub sort: CompletionSort,
+    pub case_sensitive: bool,
+    pub quick: bool,
+    pub partial: bool,
+    pub algorithm: CompletionAlgorithm,
+    pub external: ExternalCompleterConfig,
+    pub use_ls_colors: bool,
 }
 
-pub(super) fn reconstruct_external(config: &Config, span: Span) -> Value {
-    Value::record(
-        record! {
-            "max_results" => Value::int(config.max_external_completion_results, span),
-            "completer" => reconstruct_external_completer(config, span),
-            "enable" => Value::bool(config.enable_external_completion, span),
-        },
-        span,
-    )
+impl Default for CompleterConfig {
+    fn default() -> Self {
+        Self {
+            sort: CompletionSort::default(),
+            case_sensitive: false,
+            quick: true,
+            partial: true,
+            algorithm: CompletionAlgorithm::default(),
+            external: ExternalCompleterConfig::default(),
+            use_ls_colors: true,
+        }
+    }
 }
diff --git a/crates/nu-protocol/src/config/datetime_format.rs b/crates/nu-protocol/src/config/datetime_format.rs
new file mode 100644
index 0000000000..1157302c8a
--- /dev/null
+++ b/crates/nu-protocol/src/config/datetime_format.rs
@@ -0,0 +1,8 @@
+use super::prelude::*;
+use crate as nu_protocol;
+
+#[derive(Clone, Debug, Default, IntoValue, Serialize, Deserialize)]
+pub struct DatetimeFormatConfig {
+    pub normal: Option<String>,
+    pub table: Option<String>,
+}
diff --git a/crates/nu-protocol/src/config/filesize.rs b/crates/nu-protocol/src/config/filesize.rs
new file mode 100644
index 0000000000..f7dc37b0f3
--- /dev/null
+++ b/crates/nu-protocol/src/config/filesize.rs
@@ -0,0 +1,17 @@
+use super::prelude::*;
+use crate as nu_protocol;
+
+#[derive(Clone, Debug, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
+pub struct FilesizeConfig {
+    pub metric: bool,
+    pub format: String,
+}
+
+impl Default for FilesizeConfig {
+    fn default() -> Self {
+        Self {
+            metric: false,
+            format: "auto".into(),
+        }
+    }
+}
diff --git a/crates/nu-protocol/src/config/helper.rs b/crates/nu-protocol/src/config/helper.rs
index 7033a1ac11..aead7ea3fe 100644
--- a/crates/nu-protocol/src/config/helper.rs
+++ b/crates/nu-protocol/src/config/helper.rs
@@ -1,17 +1,13 @@
-use crate::{Record, ShellError, Span, Value};
+use crate::{IntoValue, Record, ShellError, Span, Value};
 use std::{collections::HashMap, fmt::Display, str::FromStr};
 
-pub(super) trait ReconstructVal {
-    fn reconstruct_value(&self, span: Span) -> Value;
-}
-
 pub(super) fn process_string_enum<T, E>(
     config_point: &mut T,
     config_path: &[&str],
     value: &mut Value,
     errors: &mut Vec<ShellError>,
 ) where
-    T: FromStr<Err = E> + ReconstructVal,
+    T: FromStr<Err = E> + Clone + IntoValue,
     E: Display,
 {
     let span = value.span();
@@ -32,7 +28,7 @@ pub(super) fn process_string_enum<T, E>(
                     inner: vec![],
                 });
                 // Reconstruct
-                *value = config_point.reconstruct_value(span);
+                *value = config_point.clone().into_value(span);
             }
         }
     } else {
@@ -44,7 +40,7 @@ pub(super) fn process_string_enum<T, E>(
             inner: vec![],
         });
         // Reconstruct
-        *value = config_point.reconstruct_value(span);
+        *value = config_point.clone().into_value(span);
     }
 }
 
diff --git a/crates/nu-protocol/src/config/history.rs b/crates/nu-protocol/src/config/history.rs
new file mode 100644
index 0000000000..56418ae0a1
--- /dev/null
+++ b/crates/nu-protocol/src/config/history.rs
@@ -0,0 +1,41 @@
+use super::prelude::*;
+use crate as nu_protocol;
+
+#[derive(Clone, Copy, Debug, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
+pub enum HistoryFileFormat {
+    /// Store history as an SQLite database with additional context
+    Sqlite,
+    /// store history as a plain text file where every line is one command (without any context such as timestamps)
+    Plaintext,
+}
+
+impl FromStr for HistoryFileFormat {
+    type Err = &'static str;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s.to_ascii_lowercase().as_str() {
+            "sqlite" => Ok(Self::Sqlite),
+            "plaintext" => Ok(Self::Plaintext),
+            _ => Err("expected either 'sqlite' or 'plaintext'"),
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
+pub struct HistoryConfig {
+    pub max_size: i64,
+    pub sync_on_enter: bool,
+    pub file_format: HistoryFileFormat,
+    pub isolation: bool,
+}
+
+impl Default for HistoryConfig {
+    fn default() -> Self {
+        Self {
+            max_size: 100_000,
+            sync_on_enter: true,
+            file_format: HistoryFileFormat::Plaintext,
+            isolation: false,
+        }
+    }
+}
diff --git a/crates/nu-protocol/src/config/hooks.rs b/crates/nu-protocol/src/config/hooks.rs
index 88f5f4abf1..c0e3aa3329 100644
--- a/crates/nu-protocol/src/config/hooks.rs
+++ b/crates/nu-protocol/src/config/hooks.rs
@@ -1,8 +1,9 @@
-use crate::{Config, Record, ShellError, Span, Value};
-use serde::{Deserialize, Serialize};
+use super::prelude::*;
+use crate as nu_protocol;
+use crate::ShellError;
 
 /// Definition of a parsed hook from the config object
-#[derive(Serialize, Deserialize, Clone, Debug)]
+#[derive(Clone, Debug, IntoValue, PartialEq, Serialize, Deserialize)]
 pub struct Hooks {
     pub pre_prompt: Option<Value>,
     pub pre_execution: Option<Value>,
@@ -65,24 +66,3 @@ pub(super) fn create_hooks(value: &Value) -> Result<Hooks, ShellError> {
         }),
     }
 }
-
-pub(super) fn reconstruct_hooks(config: &Config, span: Span) -> Value {
-    let mut hook = Record::new();
-    if let Some(ref value) = config.hooks.pre_prompt {
-        hook.push("pre_prompt", value.clone());
-    }
-    if let Some(ref value) = config.hooks.pre_execution {
-        hook.push("pre_execution", value.clone());
-    }
-    if let Some(ref value) = config.hooks.env_change {
-        hook.push("env_change", value.clone());
-    }
-    if let Some(ref value) = config.hooks.display_output {
-        hook.push("display_output", value.clone());
-    }
-    if let Some(ref value) = config.hooks.command_not_found {
-        hook.push("command_not_found", value.clone());
-    }
-
-    Value::record(hook, span)
-}
diff --git a/crates/nu-protocol/src/config/ls.rs b/crates/nu-protocol/src/config/ls.rs
new file mode 100644
index 0000000000..522163d9a1
--- /dev/null
+++ b/crates/nu-protocol/src/config/ls.rs
@@ -0,0 +1,17 @@
+use super::prelude::*;
+use crate as nu_protocol;
+
+#[derive(Clone, Copy, Debug, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
+pub struct LsConfig {
+    pub use_ls_colors: bool,
+    pub clickable_links: bool,
+}
+
+impl Default for LsConfig {
+    fn default() -> Self {
+        Self {
+            use_ls_colors: true,
+            clickable_links: true,
+        }
+    }
+}
diff --git a/crates/nu-protocol/src/config/mod.rs b/crates/nu-protocol/src/config/mod.rs
index 59cc70fb79..ab98edf9db 100644
--- a/crates/nu-protocol/src/config/mod.rs
+++ b/crates/nu-protocol/src/config/mod.rs
@@ -1,108 +1,75 @@
 //! Module containing the internal representation of user configuration
-use self::completer::*;
 use self::helper::*;
 use self::hooks::*;
-use self::output::*;
-use self::reedline::*;
-use self::table::*;
 
-use crate::engine::Closure;
-use crate::{record, ShellError, Span, Value};
+use crate::{IntoValue, ShellError, Span, Value};
+use reedline::create_keybindings;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
+use table::try_parse_trim_strategy;
 
-pub use self::completer::{CompletionAlgorithm, CompletionSort};
+pub use self::completer::{
+    CompleterConfig, CompletionAlgorithm, CompletionSort, ExternalCompleterConfig,
+};
+pub use self::datetime_format::DatetimeFormatConfig;
+pub use self::filesize::FilesizeConfig;
 pub use self::helper::extract_value;
+pub use self::history::{HistoryConfig, HistoryFileFormat};
 pub use self::hooks::Hooks;
+pub use self::ls::LsConfig;
 pub use self::output::ErrorStyle;
 pub use self::plugin_gc::{PluginGcConfig, PluginGcConfigs};
 pub use self::reedline::{
-    create_menus, EditBindings, HistoryFileFormat, NuCursorShape, ParsedKeybinding, ParsedMenu,
+    create_menus, CursorShapeConfig, EditBindings, NuCursorShape, ParsedKeybinding, ParsedMenu,
 };
-pub use self::table::{FooterMode, TableIndexMode, TableMode, TrimStrategy};
+pub use self::rm::RmConfig;
+pub use self::shell_integration::ShellIntegrationConfig;
+pub use self::table::{FooterMode, TableConfig, TableIndexMode, TableMode, TrimStrategy};
 
 mod completer;
+mod datetime_format;
+mod filesize;
 mod helper;
+mod history;
 mod hooks;
+mod ls;
 mod output;
 mod plugin_gc;
+mod prelude;
 mod reedline;
+mod rm;
+mod shell_integration;
 mod table;
 
-#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
-pub struct HistoryConfig {
-    pub max_size: i64,
-    pub sync_on_enter: bool,
-    pub file_format: HistoryFileFormat,
-    pub isolation: bool,
-}
-
-impl Default for HistoryConfig {
-    fn default() -> Self {
-        Self {
-            max_size: 100_000,
-            sync_on_enter: true,
-            file_format: HistoryFileFormat::PlainText,
-            isolation: false,
-        }
-    }
-}
-
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct Config {
-    pub external_completer: Option<Closure>,
-    pub filesize_metric: bool,
-    pub table_mode: TableMode,
-    pub table_move_header: bool,
-    pub table_show_empty: bool,
-    pub table_indent: TableIndent,
-    pub table_abbreviation_threshold: Option<usize>,
-    pub use_ls_colors: bool,
+    pub filesize: FilesizeConfig,
+    pub table: TableConfig,
+    pub ls: LsConfig,
     pub color_config: HashMap<String, Value>,
     pub use_grid_icons: bool,
     pub footer_mode: FooterMode,
     pub float_precision: i64,
-    pub max_external_completion_results: i64,
     pub recursion_limit: i64,
-    pub filesize_format: String,
     pub use_ansi_coloring: bool,
-    pub quick_completions: bool,
-    pub partial_completions: bool,
-    pub completion_algorithm: CompletionAlgorithm,
-    pub completion_sort: CompletionSort,
+    pub completions: CompleterConfig,
     pub edit_mode: EditBindings,
     pub history: HistoryConfig,
     pub keybindings: Vec<ParsedKeybinding>,
     pub menus: Vec<ParsedMenu>,
     pub hooks: Hooks,
-    pub rm_always_trash: bool,
-    // Shell integration OSC meaning is described in the default_config.nu
-    pub shell_integration_osc2: bool,
-    pub shell_integration_osc7: bool,
-    pub shell_integration_osc8: bool,
-    pub shell_integration_osc9_9: bool,
-    pub shell_integration_osc133: bool,
-    pub shell_integration_osc633: bool,
-    pub shell_integration_reset_application_mode: bool,
+    pub rm: RmConfig,
+    pub shell_integration: ShellIntegrationConfig,
     pub buffer_editor: Value,
-    pub table_index_mode: TableIndexMode,
-    pub case_sensitive_completions: bool,
-    pub enable_external_completion: bool,
-    pub trim_strategy: TrimStrategy,
     pub show_banner: bool,
     pub bracketed_paste: bool,
-    pub show_clickable_links_in_ls: bool,
     pub render_right_prompt_on_last_line: bool,
     pub explore: HashMap<String, Value>,
-    pub cursor_shape_vi_insert: NuCursorShape,
-    pub cursor_shape_vi_normal: NuCursorShape,
-    pub cursor_shape_emacs: NuCursorShape,
-    pub datetime_normal_format: Option<String>,
-    pub datetime_table_format: Option<String>,
+    pub cursor_shape: CursorShapeConfig,
+    pub datetime_format: DatetimeFormatConfig,
     pub error_style: ErrorStyle,
     pub use_kitty_protocol: bool,
     pub highlight_resolved_externals: bool,
-    pub use_ls_colors_completions: bool,
     /// Configuration for plugins.
     ///
     /// Users can provide configuration for a plugin through this entry.  The entry name must
@@ -118,43 +85,23 @@ impl Default for Config {
         Config {
             show_banner: true,
 
-            use_ls_colors: true,
-            show_clickable_links_in_ls: true,
+            table: TableConfig::default(),
+            rm: RmConfig::default(),
+            ls: LsConfig::default(),
 
-            rm_always_trash: false,
-
-            table_mode: TableMode::Rounded,
-            table_index_mode: TableIndexMode::Always,
-            table_show_empty: true,
-            trim_strategy: TrimStrategy::default(),
-            table_move_header: false,
-            table_indent: TableIndent { left: 1, right: 1 },
-            table_abbreviation_threshold: None,
-
-            datetime_normal_format: None,
-            datetime_table_format: None,
+            datetime_format: DatetimeFormatConfig::default(),
 
             explore: HashMap::new(),
 
             history: HistoryConfig::default(),
 
-            case_sensitive_completions: false,
-            quick_completions: true,
-            partial_completions: true,
-            completion_algorithm: CompletionAlgorithm::default(),
-            completion_sort: CompletionSort::default(),
-            enable_external_completion: true,
-            max_external_completion_results: 100,
+            completions: CompleterConfig::default(),
+
             recursion_limit: 50,
-            external_completer: None,
-            use_ls_colors_completions: true,
 
-            filesize_metric: false,
-            filesize_format: "auto".into(),
+            filesize: FilesizeConfig::default(),
 
-            cursor_shape_emacs: NuCursorShape::default(),
-            cursor_shape_vi_insert: NuCursorShape::default(),
-            cursor_shape_vi_normal: NuCursorShape::default(),
+            cursor_shape: CursorShapeConfig::default(),
 
             color_config: HashMap::new(),
             use_grid_icons: true,
@@ -164,14 +111,8 @@ impl Default for Config {
             use_ansi_coloring: true,
             bracketed_paste: true,
             edit_mode: EditBindings::default(),
-            // shell_integration: false,
-            shell_integration_osc2: false,
-            shell_integration_osc7: false,
-            shell_integration_osc8: false,
-            shell_integration_osc9_9: false,
-            shell_integration_osc133: false,
-            shell_integration_osc633: false,
-            shell_integration_reset_application_mode: false,
+
+            shell_integration: ShellIntegrationConfig::default(),
 
             render_right_prompt_on_last_line: false,
 
@@ -219,638 +160,7 @@ impl Value {
         // config setting is converted to a `Value::Boolean` and inserted in the record in place of
         // the `2`.
 
-        if let Value::Record { val, .. } = self {
-            val.to_mut().retain_mut(|key, value| {
-                let span = value.span();
-                match key {
-                    // Grouped options
-                    "ls" => {
-                        if let Value::Record { val, .. } = value {
-                            val.to_mut().retain_mut(|key2, value| {
-                                let span = value.span();
-                                match key2 {
-                                    "use_ls_colors" => {
-                                        process_bool_config(value, &mut errors, &mut config.use_ls_colors);
-                                    }
-                                    "clickable_links" => {
-                                        process_bool_config(value, &mut errors, &mut config.show_clickable_links_in_ls);
-                                    }
-                                    _ => {
-                                        report_invalid_key(&[key, key2], span, &mut errors);
-                                        return false;
-                                    }
-                                }; true
-                            });
-                        } else {
-                            report_invalid_value("should be a record", span, &mut errors);
-                            // Reconstruct
-                            *value = Value::record(
-                                record! {
-                                    "use_ls_colors" => Value::bool(config.use_ls_colors, span),
-                                    "clickable_links" => Value::bool(config.show_clickable_links_in_ls, span),
-                                },
-                                span,
-                            );
-                        }
-                    }
-                    "rm" => {
-                        if let Value::Record { val, .. } = value {
-                            val.to_mut().retain_mut(|key2, value| {
-                                let span = value.span();
-                                match key2 {
-                                    "always_trash" => {
-                                        process_bool_config(value, &mut errors, &mut config.rm_always_trash);
-                                    }
-                                    _ => {
-                                        report_invalid_key(&[key, key2], span, &mut errors);
-                                        return false;
-                                    }
-                                };
-                                true
-                            });
-                        } else {
-                            report_invalid_value("should be a record", span, &mut errors);
-                            // Reconstruct
-                            *value = Value::record(
-                                record! {
-                                    "always_trash" => Value::bool(config.rm_always_trash, span),
-                                },
-                                span,
-                            );
-                        }
-                    }
-                    "history" => {
-                        let history = &mut config.history;
-                        if let Value::Record { val, .. } = value {
-                            val.to_mut().retain_mut(|key2, value| {
-                                let span = value.span();
-                                match key2 {
-                                    "isolation" => {
-                                        process_bool_config(value, &mut errors, &mut history.isolation);
-                                    }
-                                    "sync_on_enter" => {
-                                        process_bool_config(value, &mut errors, &mut history.sync_on_enter);
-                                    }
-                                    "max_size" => {
-                                        process_int_config(value, &mut errors, &mut history.max_size);
-                                    }
-                                    "file_format" => {
-                                        process_string_enum(
-                                            &mut history.file_format,
-                                            &[key, key2],
-                                            value,
-                                            &mut errors);
-                                    }
-                                    _ => {
-                                        report_invalid_key(&[key, key2], span, &mut errors);
-                                        return false;
-                                    }
-                                };
-                                true
-                            });
-                        } else {
-                            report_invalid_value("should be a record", span, &mut errors);
-                            // Reconstruct
-                            *value = Value::record(
-                                record! {
-                                    "sync_on_enter" => Value::bool(history.sync_on_enter, span),
-                                    "max_size" => Value::int(history.max_size, span),
-                                    "file_format" => history.file_format.reconstruct_value(span),
-                                    "isolation" => Value::bool(history.isolation, span),
-                                },
-                                span,
-                            );
-                        }
-                    }
-                    "completions" => {
-                        if let Value::Record { val, .. } = value {
-                            val.to_mut().retain_mut(|key2, value| {
-                                let span = value.span();
-                                match key2 {
-                                    "quick" => {
-                                        process_bool_config(value, &mut errors, &mut config.quick_completions);
-                                    }
-                                    "partial" => {
-                                        process_bool_config(value, &mut errors, &mut config.partial_completions);
-                                    }
-                                    "algorithm" => {
-                                        process_string_enum(
-                                            &mut config.completion_algorithm,
-                                            &[key, key2],
-                                            value,
-                                            &mut errors);
-                                    }
-                                    "case_sensitive" => {
-                                        process_bool_config(value, &mut errors, &mut config.case_sensitive_completions);
-                                    }
-                                    "sort" => {
-                                        process_string_enum(
-                                            &mut config.completion_sort,
-                                            &[key, key2],
-                                            value,
-                                            &mut errors);
-                                    }
-                                    "external" => {
-                                        if let Value::Record { val, .. } = value {
-                                            val.to_mut().retain_mut(|key3, value|
-                                                {
-                                                    let span = value.span();
-                                                    match key3 {
-                                                        "max_results" => {
-                                                            process_int_config(value, &mut errors, &mut config.max_external_completion_results);
-                                                        }
-                                                        "completer" => {
-                                                            if let Ok(v) = value.as_closure() {
-                                                                config.external_completer = Some(v.clone())
-                                                            } else {
-                                                                match value {
-                                                                    Value::Nothing { .. } => {}
-                                                                    _ => {
-                                                                        report_invalid_value("should be a closure or null", span, &mut errors);
-                                                                        // Reconstruct
-                                                                        *value = reconstruct_external_completer(&config,
-                                                                            span
-                                                                        );
-                                                                    }
-                                                                }
-                                                            }
-                                                        }
-                                                        "enable" => {
-                                                            process_bool_config(value, &mut errors, &mut config.enable_external_completion);
-                                                        }
-                                                        _ => {
-                                                            report_invalid_key(&[key, key2, key3], span, &mut errors);
-                                                            return false;
-                                                        }
-                                                    };
-                                                    true
-                                                });
-                                        } else {
-                                            report_invalid_value("should be a record", span, &mut errors);
-                                            // Reconstruct
-                                            *value = reconstruct_external(&config, span);
-                                        }
-                                    }
-                                    "use_ls_colors" => {
-                                        process_bool_config(value, &mut errors, &mut config.use_ls_colors_completions);
-                                    }
-                                    _ => {
-                                        report_invalid_key(&[key, key2], span, &mut errors);
-                                        return false;
-                                    }
-                                };
-                                true
-                            });
-                        } else {
-                            report_invalid_value("should be a record", span, &mut errors);
-                            // Reconstruct record
-                            *value = Value::record(
-                                record! {
-                                    "quick" => Value::bool(config.quick_completions, span),
-                                    "partial" => Value::bool(config.partial_completions, span),
-                                    "algorithm" => config.completion_algorithm.reconstruct_value(span),
-                                    "case_sensitive" => Value::bool(config.case_sensitive_completions, span),
-                                    "sort" => config.completion_sort.reconstruct_value(span),
-                                    "external" => reconstruct_external(&config, span),
-                                    "use_ls_colors" => Value::bool(config.use_ls_colors_completions, span),
-                                },
-                                span,
-                            );
-                        }
-                    }
-                    "cursor_shape" => {
-                        if let Value::Record { val, .. } = value {
-                            val.to_mut().retain_mut(|key2, value| {
-                                let span = value.span();
-                                let config_point = match key2 {
-                                    "vi_insert" => &mut config.cursor_shape_vi_insert,
-                                    "vi_normal" => &mut config.cursor_shape_vi_normal,
-                                    "emacs" => &mut config.cursor_shape_emacs,
-                                    _ => {
-                                        report_invalid_key(&[key, key2], span, &mut errors);
-                                        return false;
-                                    }
-                                };
-                                process_string_enum(
-                                    config_point,
-                                    &[key, key2],
-                                    value,
-                                    &mut errors);
-                                true
-                            });
-                        } else {
-                            report_invalid_value("should be a record", span, &mut errors);
-                            // Reconstruct
-                            *value = Value::record(
-                                record! {
-                                    "vi_insert" => config.cursor_shape_vi_insert.reconstruct_value(span),
-                                    "vi_normal" => config.cursor_shape_vi_normal.reconstruct_value(span),
-                                    "emacs" => config.cursor_shape_emacs.reconstruct_value(span),
-                                },
-                                span,
-                            );
-                        }
-                    }
-                    "table" => {
-                        if let Value::Record { val, .. } = value {
-                            val.to_mut().retain_mut(|key2, value| {
-                                let span = value.span();
-                                match key2 {
-                                    "mode" => {
-                                        process_string_enum(
-                                            &mut config.table_mode,
-                                    &[key, key2],
-                                            value,
-                                            &mut errors);
-                                    }
-                                    "header_on_separator" => {
-                                        process_bool_config(value, &mut errors, &mut config.table_move_header);
-                                    }
-                                    "padding" => match value {
-                                        Value::Int { val, .. } => {
-                                            if *val < 0 {
-                                                report_invalid_value("expected a unsigned integer", span, &mut errors);
-                                                *value = reconstruct_padding(&config, span);
-                                            } else {
-                                                config.table_indent.left = *val as usize;
-                                                config.table_indent.right = *val as usize;
-                                            }
-                                        }
-                                        Value::Record { val, .. } => {
-                                            let mut invalid = false;
-                                            val.to_mut().retain(|key3, value| {
-                                                match key3 {
-                                                    "left" => {
-                                                        match value.as_int() {
-                                                            Ok(val) if val >= 0 => {
-                                                                config.table_indent.left = val as usize;
-                                                            }
-                                                            _ => {
-                                                                report_invalid_value("expected a unsigned integer >= 0", span, &mut errors);
-                                                                invalid = true;
-                                                            }
-                                                        }
-                                                    }
-                                                    "right" => {
-                                                        match value.as_int() {
-                                                            Ok(val) if val >= 0 => {
-                                                                config.table_indent.right = val as usize;
-                                                            }
-                                                            _ => {
-                                                                report_invalid_value("expected a unsigned integer >= 0", span, &mut errors);
-                                                                invalid = true;
-                                                            }
-                                                        }
-                                                    }
-                                                    _ => {
-                                        report_invalid_key(&[key, key2, key3], span, &mut errors);
-                                                    return false;
-                                                    }
-                                                };
-                                                true
-                                            });
-                                            if invalid {
-                                                *value = reconstruct_padding(&config, span);
-                                            }
-                                        }
-                                        _ => {
-                                            report_invalid_value("expected a unsigned integer or a record", span, &mut errors);
-                                            *value = reconstruct_padding(&config, span);
-                                        }
-                                    },
-                                    "index_mode" => {
-                                        process_string_enum(
-                                            &mut config.table_index_mode,
-                                            &[key, key2],
-                                            value,
-                                            &mut errors);
-                                    }
-                                    "trim" => {
-                                        match try_parse_trim_strategy(value, &mut errors) {
-                                            Ok(v) => config.trim_strategy = v,
-                                            Err(e) => {
-                                                // try_parse_trim_strategy() already adds its own errors
-                                                errors.push(e);
-                                                *value =
-                                                    reconstruct_trim_strategy(&config, span);
-                                            }
-                                        }
-                                    }
-                                    "show_empty" => {
-                                        process_bool_config(value, &mut errors, &mut config.table_show_empty);
-                                    }
-                                    "abbreviated_row_count" => {
-                                        if let Ok(b) = value.as_int() {
-                                            if b < 0 {
-                                                report_invalid_value("should be an int unsigned", span, &mut errors);
-                                            }
-
-                                            config.table_abbreviation_threshold = Some(b as usize);
-                                        } else {
-                                            report_invalid_value("should be an int", span, &mut errors);
-                                        }
-                                    }
-                                    _ => {
-                                        report_invalid_key(&[key, key2], span, &mut errors);
-                                        return false
-                                    }
-                                };
-                                true
-                             });
-                        } else {
-                            report_invalid_value("should be a record", span, &mut errors);
-                            // Reconstruct
-                            *value = Value::record(
-                                record! {
-                                    "mode" => config.table_mode.reconstruct_value(span),
-                                    "index_mode" => config.table_index_mode.reconstruct_value(span),
-                                    "trim" => reconstruct_trim_strategy(&config, span),
-                                    "show_empty" => Value::bool(config.table_show_empty, span),
-                                },
-                                span,
-                            );
-                        }
-                    }
-                    "filesize" => {
-                        if let Value::Record { val, .. } = value {
-                            val.to_mut().retain_mut(|key2, value| {
-                                let span = value.span();
-                                match key2 {
-                                "metric" => {
-                                    process_bool_config(value, &mut errors, &mut config.filesize_metric);
-                                }
-                                "format" => {
-                                    if let Ok(v) = value.coerce_str() {
-                                        config.filesize_format = v.to_lowercase();
-                                    } else {
-                                        report_invalid_value("should be a string", span, &mut errors);
-                                        // Reconstruct
-                                        *value =
-                                            Value::string(config.filesize_format.clone(), span);
-                                    }
-                                }
-                                _ => {
-                                    report_invalid_key(&[key, key2], span, &mut errors);
-                                    return false;
-                                }
-                            };
-                            true
-                        })
-                        } else {
-                            report_invalid_value("should be a record", span, &mut errors);
-                            // Reconstruct
-                            *value = Value::record(
-                                record! {
-                                    "metric" => Value::bool(config.filesize_metric, span),
-                                    "format" => Value::string(config.filesize_format.clone(), span),
-                                },
-                                span,
-                            );
-                        }
-                    }
-                    "explore" => {
-                        if let Ok(map) = create_map(value) {
-                            config.explore = map;
-                        } else {
-                            report_invalid_value("should be a record", span, &mut errors);
-                            // Reconstruct
-                            *value = Value::record(
-                                config
-                                    .explore
-                                    .iter()
-                                    .map(|(k, v)| (k.clone(), v.clone()))
-                                    .collect(),
-                                span,
-                            );
-                        }
-                    }
-                    // Misc. options
-                    "color_config" => {
-                        if let Ok(map) = create_map(value) {
-                            config.color_config = map;
-                        } else {
-                            report_invalid_value("should be a record", span, &mut errors);
-                            // Reconstruct
-                            *value = Value::record(
-                                config
-                                    .color_config
-                                    .iter()
-                                    .map(|(k, v)| (k.clone(), v.clone()))
-                                    .collect(),
-                                span,
-                            );
-                        }
-                    }
-                    "use_grid_icons" => {
-                        process_bool_config(value, &mut errors, &mut config.use_grid_icons);
-                    }
-                    "footer_mode" => {
-                        process_string_enum(
-                            &mut config.footer_mode,
-                            &[key],
-                            value,
-                            &mut errors);
-                    }
-                    "float_precision" => {
-                        process_int_config(value, &mut errors, &mut config.float_precision);
-                    }
-                    "use_ansi_coloring" => {
-                        process_bool_config(value, &mut errors, &mut config.use_ansi_coloring);
-                    }
-                    "edit_mode" => {
-                        process_string_enum(
-                            &mut config.edit_mode,
-                            &[key],
-                            value,
-                            &mut errors);
-                    }
-                    "shell_integration" => {
-                        if let Value::Record { val, .. } = value {
-                            val.to_mut().retain_mut(|key2, value| {
-                                let span = value.span();
-                                match key2 {
-                                "osc2" => {
-                                    process_bool_config(value, &mut errors, &mut config.shell_integration_osc2);
-                                }
-                                "osc7" => {
-                                    process_bool_config(value, &mut errors, &mut config.shell_integration_osc7);
-                                }
-                                "osc8" => {
-                                    process_bool_config(value, &mut errors, &mut config.shell_integration_osc8);
-                                }
-                                "osc9_9" => {
-                                    process_bool_config(value, &mut errors, &mut config.shell_integration_osc9_9);
-                                }
-                                "osc133" => {
-                                    process_bool_config(value, &mut errors, &mut config.shell_integration_osc133);
-                                }
-                                "osc633" => {
-                                    process_bool_config(value, &mut errors, &mut config.shell_integration_osc633);
-                                }
-                                "reset_application_mode" => {
-                                    process_bool_config(value, &mut errors, &mut config.shell_integration_reset_application_mode);
-                                }
-                                _ => {
-                                    report_invalid_key(&[key, key2], span, &mut errors);
-                                    return false;
-                                }
-                            };
-                            true
-                        })
-                        } else {
-                            report_invalid_value("boolean value is deprecated, should be a record. see `config nu --default`.", span, &mut errors);
-                            // Reconstruct
-                            *value = Value::record(
-                                record! {
-                                    "osc2" => Value::bool(config.shell_integration_osc2, span),
-                                    "ocs7" => Value::bool(config.shell_integration_osc7, span),
-                                    "osc8" => Value::bool(config.shell_integration_osc8, span),
-                                    "osc9_9" => Value::bool(config.shell_integration_osc9_9, span),
-                                    "osc133" => Value::bool(config.shell_integration_osc133, span),
-                                    "osc633" => Value::bool(config.shell_integration_osc633, span),
-                                    "reset_application_mode" => Value::bool(config.shell_integration_reset_application_mode, span),
-                                },
-                                span,
-                            );
-                        }
-                    }
-                    "buffer_editor" => match value {
-                        Value::Nothing { .. } | Value::String { .. } => {
-                            config.buffer_editor = value.clone();
-                        }
-                        Value::List { vals, .. }
-                            if vals.iter().all(|val| matches!(val, Value::String { .. })) =>
-                        {
-                            config.buffer_editor = value.clone();
-                        }
-                        _ => {
-                            report_invalid_value("should be a string, list<string>, or null", span, &mut errors);
-                            *value = config.buffer_editor.clone();
-                        }
-                    },
-                    "show_banner" => {
-                        process_bool_config(value, &mut errors, &mut config.show_banner);
-                    }
-                    "render_right_prompt_on_last_line" => {
-                        process_bool_config(value, &mut errors, &mut config.render_right_prompt_on_last_line);
-                    }
-                    "bracketed_paste" => {
-                        process_bool_config(value, &mut errors, &mut config.bracketed_paste);
-                    }
-                    "use_kitty_protocol" => {
-                        process_bool_config(value, &mut errors, &mut config.use_kitty_protocol);
-                    }
-                    "highlight_resolved_externals" => {
-                        process_bool_config(value, &mut errors, &mut config.highlight_resolved_externals);
-                    }
-                    "plugins" => {
-                        if let Ok(map) = create_map(value) {
-                            config.plugins = map;
-                        } else {
-                            report_invalid_value("should be a record", span, &mut errors);
-                            // Reconstruct
-                            *value = Value::record(
-                                config
-                                    .explore
-                                    .iter()
-                                    .map(|(k, v)| (k.clone(), v.clone()))
-                                    .collect(),
-                                span,
-                            );
-                        }
-                    }
-                    "plugin_gc" => {
-                        config.plugin_gc.process(&[key], value, &mut errors);
-                    }
-                    // Menus
-                    "menus" => match create_menus(value) {
-                        Ok(map) => config.menus = map,
-                        Err(e) => {
-                            report_invalid_value("should be a valid list of menus", span, &mut errors);
-                            errors.push(e);
-                            // Reconstruct
-                            *value = reconstruct_menus(&config, span);
-                        }
-                    },
-                    // Keybindings
-                    "keybindings" => match create_keybindings(value) {
-                        Ok(keybindings) => config.keybindings = keybindings,
-                        Err(e) => {
-                            report_invalid_value("should be a valid keybindings list", span, &mut errors);
-                            errors.push(e);
-                            // Reconstruct
-                            *value = reconstruct_keybindings(&config, span);
-                        }
-                    },
-                    // Hooks
-                    "hooks" => match create_hooks(value) {
-                        Ok(hooks) => config.hooks = hooks,
-                        Err(e) => {
-                            report_invalid_value("should be a valid hooks list", span, &mut errors);
-                            errors.push(e);
-                            *value = reconstruct_hooks(&config, span);
-                        }
-                    },
-                    "datetime_format" => {
-                        if let Value::Record { val, .. } = value {
-                            val.to_mut().retain_mut(|key2, value|
-                                {
-                                let span = value.span();
-                                match key2 {
-                                "normal" => {
-                                    if let Ok(v) = value.coerce_string() {
-                                        config.datetime_normal_format = Some(v);
-                                    } else {
-                                        report_invalid_value("should be a string", span, &mut errors);
-                                    }
-                                }
-                                "table" => {
-                                    if let Ok(v) = value.coerce_string() {
-                                        config.datetime_table_format = Some(v);
-                                    } else {
-                                        report_invalid_value("should be a string", span, &mut errors);
-                                    }
-                                }
-                                _ => {
-                                    report_invalid_key(&[key, key2], span, &mut errors);
-                                    return false;
-                                }
-                            }; true})
-                        } else {
-                            report_invalid_value("should be a record", span, &mut errors);
-                            // Reconstruct
-                            *value = reconstruct_datetime_format(&config, span);
-                        }
-                    }
-                    "error_style" => {
-                        process_string_enum(
-                            &mut config.error_style,
-                            &[key],
-                            value,
-                            &mut errors);
-                    }
-                    "recursion_limit" => {
-                        if let Value::Int { val, internal_span } = value {
-                            if val > &mut 1 {
-                                config.recursion_limit = *val;
-                            } else {
-                                report_invalid_value("should be a integer greater than 1", span, &mut errors);
-                                *value = Value::Int { val: 50, internal_span: *internal_span };
-                            }
-                        } else {
-                            report_invalid_value("should be a integer greater than 1", span, &mut errors);
-                            *value = Value::Int { val: 50, internal_span: value.span() };
-                        }
-                    }
-                    // Catch all
-                    _ => {
-                        report_invalid_key(&[key], span, &mut errors);
-                        return false;
-                    }
-                };
-                true
-            });
-        } else {
+        let Value::Record { val, .. } = self else {
             return (
                 config,
                 Some(ShellError::GenericError {
@@ -861,7 +171,549 @@ impl Value {
                     inner: vec![],
                 }),
             );
-        }
+        };
+
+        val.to_mut().retain_mut(|key, value| {
+            let span = value.span();
+            match key {
+                "ls" => {
+                    if let Value::Record { val, .. } = value {
+                        val.to_mut().retain_mut(|key2, value| {
+                            let span = value.span();
+                            match key2 {
+                                "use_ls_colors" => {
+                                    process_bool_config(value, &mut errors, &mut config.ls.use_ls_colors);
+                                }
+                                "clickable_links" => {
+                                    process_bool_config(value, &mut errors, &mut config.ls.clickable_links);
+                                }
+                                _ => {
+                                    report_invalid_key(&[key, key2], span, &mut errors);
+                                    return false;
+                                }
+                            }
+                            true
+                        });
+                    } else {
+                        report_invalid_value("should be a record", span, &mut errors);
+                        *value = config.ls.into_value(span);
+                    }
+                }
+                "rm" => {
+                    if let Value::Record { val, .. } = value {
+                        val.to_mut().retain_mut(|key2, value| {
+                            let span = value.span();
+                            match key2 {
+                                "always_trash" => {
+                                    process_bool_config(value, &mut errors, &mut config.rm.always_trash);
+                                }
+                                _ => {
+                                    report_invalid_key(&[key, key2], span, &mut errors);
+                                    return false;
+                                }
+                            };
+                            true
+                        });
+                    } else {
+                        report_invalid_value("should be a record", span, &mut errors);
+                        *value = config.rm.into_value(span);
+                    }
+                }
+                "history" => {
+                    let history = &mut config.history;
+                    if let Value::Record { val, .. } = value {
+                        val.to_mut().retain_mut(|key2, value| {
+                            let span = value.span();
+                            match key2 {
+                                "isolation" => {
+                                    process_bool_config(value, &mut errors, &mut history.isolation);
+                                }
+                                "sync_on_enter" => {
+                                    process_bool_config(value, &mut errors, &mut history.sync_on_enter);
+                                }
+                                "max_size" => {
+                                    process_int_config(value, &mut errors, &mut history.max_size);
+                                }
+                                "file_format" => {
+                                    process_string_enum(
+                                        &mut history.file_format,
+                                        &[key, key2],
+                                        value,
+                                        &mut errors
+                                    );
+                                }
+                                _ => {
+                                    report_invalid_key(&[key, key2], span, &mut errors);
+                                    return false;
+                                }
+                            };
+                            true
+                        });
+                    } else {
+                        report_invalid_value("should be a record", span, &mut errors);
+                        *value = config.history.into_value(span);
+                    }
+                }
+                "completions" => {
+                    if let Value::Record { val, .. } = value {
+                        val.to_mut().retain_mut(|key2, value| {
+                            let span = value.span();
+                            match key2 {
+                                "quick" => {
+                                    process_bool_config(value, &mut errors, &mut config.completions.quick);
+                                }
+                                "partial" => {
+                                    process_bool_config(value, &mut errors, &mut config.completions.partial);
+                                }
+                                "algorithm" => {
+                                    process_string_enum(
+                                        &mut config.completions.algorithm,
+                                        &[key, key2],
+                                        value,
+                                        &mut errors
+                                    );
+                                }
+                                "case_sensitive" => {
+                                    process_bool_config(value, &mut errors, &mut config.completions.case_sensitive);
+                                }
+                                "sort" => {
+                                    process_string_enum(
+                                        &mut config.completions.sort,
+                                        &[key, key2],
+                                        value,
+                                        &mut errors
+                                    );
+                                }
+                                "external" => {
+                                    if let Value::Record { val, .. } = value {
+                                        val.to_mut().retain_mut(|key3, value| {
+                                            let span = value.span();
+                                            match key3 {
+                                                "max_results" => {
+                                                    process_int_config(value, &mut errors, &mut config.completions.external.max_results);
+                                                }
+                                                "completer" => {
+                                                    if let Ok(v) = value.as_closure() {
+                                                        config.completions.external.completer = Some(v.clone())
+                                                    } else {
+                                                        match value {
+                                                            Value::Nothing { .. } => {}
+                                                            _ => {
+                                                                report_invalid_value("should be a closure or null", span, &mut errors);
+                                                                *value = config.completions.external.completer.clone().into_value(span);
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                                "enable" => {
+                                                    process_bool_config(value, &mut errors, &mut config.completions.external.enable);
+                                                }
+                                                _ => {
+                                                    report_invalid_key(&[key, key2, key3], span, &mut errors);
+                                                    return false;
+                                                }
+                                            };
+                                            true
+                                        });
+                                    } else {
+                                        report_invalid_value("should be a record", span, &mut errors);
+                                        *value = config.completions.external.clone().into_value(span);
+                                    }
+                                }
+                                "use_ls_colors" => {
+                                    process_bool_config(value, &mut errors, &mut config.completions.use_ls_colors);
+                                }
+                                _ => {
+                                    report_invalid_key(&[key, key2], span, &mut errors);
+                                    return false;
+                                }
+                            };
+                            true
+                        });
+                    } else {
+                        report_invalid_value("should be a record", span, &mut errors);
+                        *value = config.completions.clone().into_value(span);
+                    }
+                }
+                "cursor_shape" => {
+                    if let Value::Record { val, .. } = value {
+                        val.to_mut().retain_mut(|key2, value| {
+                            let span = value.span();
+                            let config_point = match key2 {
+                                "vi_insert" => &mut config.cursor_shape.vi_insert,
+                                "vi_normal" => &mut config.cursor_shape.vi_normal,
+                                "emacs" => &mut config.cursor_shape.emacs,
+                                _ => {
+                                    report_invalid_key(&[key, key2], span, &mut errors);
+                                    return false;
+                                }
+                            };
+                            process_string_enum(
+                                config_point,
+                                &[key, key2],
+                                value,
+                                &mut errors
+                            );
+                            true
+                        });
+                    } else {
+                        report_invalid_value("should be a record", span, &mut errors);
+                        *value = config.cursor_shape.into_value(span);
+                    }
+                }
+                "table" => {
+                    if let Value::Record { val, .. } = value {
+                        val.to_mut().retain_mut(|key2, value| {
+                            let span = value.span();
+                            match key2 {
+                                "mode" => {
+                                    process_string_enum(
+                                        &mut config.table.mode,
+                                        &[key, key2],
+                                        value,
+                                        &mut errors
+                                    );
+                                }
+                                "header_on_separator" => {
+                                    process_bool_config(value, &mut errors, &mut config.table.header_on_separator);
+                                }
+                                "padding" => match value {
+                                    Value::Int { val, .. } => {
+                                        if *val < 0 {
+                                            report_invalid_value("expected a unsigned integer", span, &mut errors);
+                                            *value = config.table.padding.into_value(span);
+                                        } else {
+                                            config.table.padding.left = *val as usize;
+                                            config.table.padding.right = *val as usize;
+                                        }
+                                    }
+                                    Value::Record { val, .. } => {
+                                        let mut invalid = false;
+                                        val.to_mut().retain(|key3, value| {
+                                            match key3 {
+                                                "left" => {
+                                                    match value.as_int() {
+                                                        Ok(val) if val >= 0 => {
+                                                            config.table.padding.left = val as usize;
+                                                        }
+                                                        _ => {
+                                                            report_invalid_value("expected a unsigned integer >= 0", span, &mut errors);
+                                                            invalid = true;
+                                                        }
+                                                    }
+                                                }
+                                                "right" => {
+                                                    match value.as_int() {
+                                                        Ok(val) if val >= 0 => {
+                                                            config.table.padding.right = val as usize;
+                                                        }
+                                                        _ => {
+                                                            report_invalid_value("expected a unsigned integer >= 0", span, &mut errors);
+                                                            invalid = true;
+                                                        }
+                                                    }
+                                                }
+                                                _ => {
+                                                    report_invalid_key(&[key, key2, key3], span, &mut errors);
+                                                    return false;
+                                                }
+                                            };
+                                            true
+                                        });
+                                        if invalid {
+                                            *value = config.table.padding.into_value(span);
+                                        }
+                                    }
+                                    _ => {
+                                        report_invalid_value("expected a unsigned integer or a record", span, &mut errors);
+                                        *value = config.table.padding.into_value(span);
+                                    }
+                                },
+                                "index_mode" => {
+                                    process_string_enum(
+                                        &mut config.table.index_mode,
+                                        &[key, key2],
+                                        value,
+                                        &mut errors
+                                    );
+                                }
+                                "trim" => {
+                                    match try_parse_trim_strategy(value, &mut errors) {
+                                        Ok(v) => config.table.trim = v,
+                                        Err(e) => {
+                                            // try_parse_trim_strategy() already adds its own errors
+                                            errors.push(e);
+                                            *value = config.table.trim.clone().into_value(span);
+                                        }
+                                    }
+                                }
+                                "show_empty" => {
+                                    process_bool_config(value, &mut errors, &mut config.table.show_empty);
+                                }
+                                "abbreviated_row_count" => {
+                                    match *value {
+                                        Value::Int { val, .. } => {
+                                            if val >= 0 {
+                                                config.table.abbreviated_row_count = Some(val as usize);
+                                            } else {
+                                                report_invalid_value("should be an int unsigned", span, &mut errors);
+                                                *value = config.table.abbreviated_row_count.map(|count| Value::int(count as i64, span)).unwrap_or(Value::nothing(span));
+                                            }
+                                        }
+                                        Value::Nothing { .. } => {
+                                            config.table.abbreviated_row_count = None;
+                                        }
+                                        _ => {
+                                            report_invalid_value("should be an int", span, &mut errors);
+                                            *value = config.table.abbreviated_row_count.map(|count| Value::int(count as i64, span)).unwrap_or(Value::nothing(span))
+                                        }
+                                    }
+                                }
+                                _ => {
+                                    report_invalid_key(&[key, key2], span, &mut errors);
+                                    return false;
+                                }
+                            };
+                            true
+                        });
+                    } else {
+                        report_invalid_value("should be a record", span, &mut errors);
+                        *value = config.table.clone().into_value(span);
+                    }
+                }
+                "filesize" => {
+                    if let Value::Record { val, .. } = value {
+                        val.to_mut().retain_mut(|key2, value| {
+                            let span = value.span();
+                            match key2 {
+                                "metric" => {
+                                    process_bool_config(value, &mut errors, &mut config.filesize.metric);
+                                }
+                                "format" => {
+                                    if let Ok(v) = value.coerce_str() {
+                                        config.filesize.format = v.to_lowercase();
+                                    } else {
+                                        report_invalid_value("should be a string", span, &mut errors);
+                                        *value = Value::string(config.filesize.format.clone(), span);
+                                    }
+                                }
+                                _ => {
+                                    report_invalid_key(&[key, key2], span, &mut errors);
+                                    return false;
+                                }
+                            };
+                            true
+                        })
+                    } else {
+                        report_invalid_value("should be a record", span, &mut errors);
+                        *value = config.filesize.clone().into_value(span);
+                    }
+                }
+                "explore" => {
+                    if let Ok(map) = create_map(value) {
+                        config.explore = map;
+                    } else {
+                        report_invalid_value("should be a record", span, &mut errors);
+                        *value = config.explore.clone().into_value(span);
+                    }
+                }
+                // Misc. options
+                "color_config" => {
+                    if let Ok(map) = create_map(value) {
+                        config.color_config = map;
+                    } else {
+                        report_invalid_value("should be a record", span, &mut errors);
+                        *value = config.color_config.clone().into_value(span);
+                    }
+                }
+                "use_grid_icons" => {
+                    process_bool_config(value, &mut errors, &mut config.use_grid_icons);
+                }
+                "footer_mode" => {
+                    process_string_enum(
+                        &mut config.footer_mode,
+                        &[key],
+                        value,
+                        &mut errors
+                    );
+                }
+                "float_precision" => {
+                    process_int_config(value, &mut errors, &mut config.float_precision);
+                }
+                "use_ansi_coloring" => {
+                    process_bool_config(value, &mut errors, &mut config.use_ansi_coloring);
+                }
+                "edit_mode" => {
+                    process_string_enum(
+                        &mut config.edit_mode,
+                        &[key],
+                        value,
+                        &mut errors
+                    );
+                }
+                "shell_integration" => {
+                    if let Value::Record { val, .. } = value {
+                        val.to_mut().retain_mut(|key2, value| {
+                            let span = value.span();
+                            match key2 {
+                                "osc2" => {
+                                    process_bool_config(value, &mut errors, &mut config.shell_integration.osc2);
+                                }
+                                "osc7" => {
+                                    process_bool_config(value, &mut errors, &mut config.shell_integration.osc7);
+                                }
+                                "osc8" => {
+                                    process_bool_config(value, &mut errors, &mut config.shell_integration.osc8);
+                                }
+                                "osc9_9" => {
+                                    process_bool_config(value, &mut errors, &mut config.shell_integration.osc9_9);
+                                }
+                                "osc133" => {
+                                    process_bool_config(value, &mut errors, &mut config.shell_integration.osc133);
+                                }
+                                "osc633" => {
+                                    process_bool_config(value, &mut errors, &mut config.shell_integration.osc633);
+                                }
+                                "reset_application_mode" => {
+                                    process_bool_config(value, &mut errors, &mut config.shell_integration.reset_application_mode);
+                                }
+                                _ => {
+                                    report_invalid_key(&[key, key2], span, &mut errors);
+                                    return false;
+                                }
+                            };
+                            true
+                        })
+                    } else {
+                        report_invalid_value("boolean value is deprecated, should be a record. see `config nu --default`.", span, &mut errors);
+                        *value = config.shell_integration.into_value(span);
+                    }
+                }
+                "buffer_editor" => match value {
+                    Value::Nothing { .. } | Value::String { .. } => {
+                        config.buffer_editor = value.clone();
+                    }
+                    Value::List { vals, .. }
+                        if vals.iter().all(|val| matches!(val, Value::String { .. })) =>
+                    {
+                        config.buffer_editor = value.clone();
+                    }
+                    _ => {
+                        report_invalid_value("should be a string, list<string>, or null", span, &mut errors);
+                        *value = config.buffer_editor.clone();
+                    }
+                },
+                "show_banner" => {
+                    process_bool_config(value, &mut errors, &mut config.show_banner);
+                }
+                "render_right_prompt_on_last_line" => {
+                    process_bool_config(value, &mut errors, &mut config.render_right_prompt_on_last_line);
+                }
+                "bracketed_paste" => {
+                    process_bool_config(value, &mut errors, &mut config.bracketed_paste);
+                }
+                "use_kitty_protocol" => {
+                    process_bool_config(value, &mut errors, &mut config.use_kitty_protocol);
+                }
+                "highlight_resolved_externals" => {
+                    process_bool_config(value, &mut errors, &mut config.highlight_resolved_externals);
+                }
+                "plugins" => {
+                    if let Ok(map) = create_map(value) {
+                        config.plugins = map;
+                    } else {
+                        report_invalid_value("should be a record", span, &mut errors);
+                        *value = config.plugins.clone().into_value(span);
+                    }
+                }
+                "plugin_gc" => {
+                    config.plugin_gc.process(&[key], value, &mut errors);
+                }
+                "menus" => match create_menus(value) {
+                    Ok(map) => config.menus = map,
+                    Err(e) => {
+                        report_invalid_value("should be a valid list of menus", span, &mut errors);
+                        errors.push(e);
+                        *value = config.menus.clone().into_value(span);
+                    }
+                },
+                "keybindings" => match create_keybindings(value) {
+                    Ok(keybindings) => config.keybindings = keybindings,
+                    Err(e) => {
+                        report_invalid_value("should be a valid keybindings list", span, &mut errors);
+                        errors.push(e);
+                        *value = config.keybindings.clone().into_value(span);
+                    }
+                },
+                "hooks" => match create_hooks(value) {
+                    Ok(hooks) => config.hooks = hooks,
+                    Err(e) => {
+                        report_invalid_value("should be a valid hooks list", span, &mut errors);
+                        errors.push(e);
+                        *value = config.hooks.clone().into_value(span);
+                    }
+                },
+                "datetime_format" => {
+                    if let Value::Record { val, .. } = value {
+                        val.to_mut().retain_mut(|key2, value|
+                            {
+                            let span = value.span();
+                            match key2 {
+                                "normal" => {
+                                    if let Ok(v) = value.coerce_string() {
+                                        config.datetime_format.normal = Some(v);
+                                    } else {
+                                        report_invalid_value("should be a string", span, &mut errors);
+                                    }
+                                }
+                                "table" => {
+                                    if let Ok(v) = value.coerce_string() {
+                                        config.datetime_format.table = Some(v);
+                                    } else {
+                                        report_invalid_value("should be a string", span, &mut errors);
+                                    }
+                                }
+                                _ => {
+                                    report_invalid_key(&[key, key2], span, &mut errors);
+                                    return false;
+                                }
+                            };
+                            true
+                        })
+                    } else {
+                        report_invalid_value("should be a record", span, &mut errors);
+                        *value = config.datetime_format.clone().into_value(span);
+                    }
+                }
+                "error_style" => {
+                    process_string_enum(
+                        &mut config.error_style,
+                        &[key],
+                        value,
+                        &mut errors
+                    );
+                }
+                "recursion_limit" => {
+                    if let Value::Int { val, internal_span } = value {
+                        if val > &mut 1 {
+                            config.recursion_limit = *val;
+                        } else {
+                            report_invalid_value("should be a integer greater than 1", span, &mut errors);
+                            *value = Value::Int { val: 50, internal_span: *internal_span };
+                        }
+                    } else {
+                        report_invalid_value("should be a integer greater than 1", span, &mut errors);
+                        *value = Value::Int { val: 50, internal_span: value.span() };
+                    }
+                }
+                // Catch all
+                _ => {
+                    report_invalid_key(&[key], span, &mut errors);
+                    return false;
+                }
+            };
+            true
+        });
 
         // Return the config and the vec of errors.
         (
diff --git a/crates/nu-protocol/src/config/output.rs b/crates/nu-protocol/src/config/output.rs
index 473f9cfdff..c2340c9963 100644
--- a/crates/nu-protocol/src/config/output.rs
+++ b/crates/nu-protocol/src/config/output.rs
@@ -1,9 +1,7 @@
-use super::helper::ReconstructVal;
-use crate::{Config, Record, Span, Value};
-use serde::{Deserialize, Serialize};
-use std::str::FromStr;
+use super::prelude::*;
+use crate as nu_protocol;
 
-#[derive(Serialize, Deserialize, Clone, Debug, Copy)]
+#[derive(Clone, Copy, Debug, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
 pub enum ErrorStyle {
     Plain,
     Fancy,
@@ -20,26 +18,3 @@ impl FromStr for ErrorStyle {
         }
     }
 }
-
-impl ReconstructVal for ErrorStyle {
-    fn reconstruct_value(&self, span: Span) -> Value {
-        Value::string(
-            match self {
-                ErrorStyle::Fancy => "fancy",
-                ErrorStyle::Plain => "plain",
-            },
-            span,
-        )
-    }
-}
-
-pub(super) fn reconstruct_datetime_format(config: &Config, span: Span) -> Value {
-    let mut record = Record::new();
-    if let Some(normal) = &config.datetime_normal_format {
-        record.push("normal", Value::string(normal, span));
-    }
-    if let Some(table) = &config.datetime_table_format {
-        record.push("table", Value::string(table, span));
-    }
-    Value::record(record, span)
-}
diff --git a/crates/nu-protocol/src/config/plugin_gc.rs b/crates/nu-protocol/src/config/plugin_gc.rs
index 70beeb6ae3..240b65349a 100644
--- a/crates/nu-protocol/src/config/plugin_gc.rs
+++ b/crates/nu-protocol/src/config/plugin_gc.rs
@@ -1,15 +1,11 @@
+use super::helper::{process_bool_config, report_invalid_key, report_invalid_value};
+use super::prelude::*;
+use crate as nu_protocol;
+use crate::ShellError;
 use std::collections::HashMap;
 
-use serde::{Deserialize, Serialize};
-
-use crate::{record, ShellError, Span, Value};
-
-use super::helper::{
-    process_bool_config, report_invalid_key, report_invalid_value, ReconstructVal,
-};
-
 /// Configures when plugins should be stopped if inactive
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
+#[derive(Clone, Debug, Default, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
 pub struct PluginGcConfigs {
     /// The config to use for plugins not otherwise specified
     pub default: PluginGcConfig,
@@ -61,23 +57,11 @@ impl PluginGcConfigs {
             });
         } else {
             report_invalid_value("should be a record", value.span(), errors);
-            *value = self.reconstruct_value(value.span());
+            *value = self.clone().into_value(value.span());
         }
     }
 }
 
-impl ReconstructVal for PluginGcConfigs {
-    fn reconstruct_value(&self, span: Span) -> Value {
-        Value::record(
-            record! {
-                "default" => self.default.reconstruct_value(span),
-                "plugins" => reconstruct_plugins(&self.plugins, span),
-            },
-            span,
-        )
-    }
-}
-
 fn process_plugins(
     path: &[&str],
     value: &mut Value,
@@ -100,7 +84,7 @@ fn process_plugins(
                 report_invalid_value("should be a record", value.span(), errors);
                 if let Some(conf) = plugins.get(key) {
                     // Reconstruct the value if it existed before
-                    *value = conf.reconstruct_value(value.span());
+                    *value = conf.clone().into_value(value.span());
                     true
                 } else {
                     // Remove it if it didn't
@@ -111,18 +95,8 @@ fn process_plugins(
     }
 }
 
-fn reconstruct_plugins(plugins: &HashMap<String, PluginGcConfig>, span: Span) -> Value {
-    Value::record(
-        plugins
-            .iter()
-            .map(|(key, val)| (key.to_owned(), val.reconstruct_value(span)))
-            .collect(),
-        span,
-    )
-}
-
 /// Configures when a plugin should be stopped if inactive
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct PluginGcConfig {
     /// True if the plugin should be stopped automatically
     pub enabled: bool,
@@ -139,6 +113,16 @@ impl Default for PluginGcConfig {
     }
 }
 
+impl IntoValue for PluginGcConfig {
+    fn into_value(self, span: Span) -> Value {
+        record! {
+            "enabled" => self.enabled.into_value(span),
+            "stop_after" => Value::duration(self.stop_after, span),
+        }
+        .into_value(span)
+    }
+}
+
 impl PluginGcConfig {
     fn process(&mut self, path: &[&str], value: &mut Value, errors: &mut Vec<ShellError>) {
         if let Value::Record { val, .. } = value {
@@ -177,23 +161,11 @@ impl PluginGcConfig {
             })
         } else {
             report_invalid_value("should be a record", value.span(), errors);
-            *value = self.reconstruct_value(value.span());
+            *value = self.clone().into_value(value.span());
         }
     }
 }
 
-impl ReconstructVal for PluginGcConfig {
-    fn reconstruct_value(&self, span: Span) -> Value {
-        Value::record(
-            record! {
-                "enabled" => Value::bool(self.enabled, span),
-                "stop_after" => Value::duration(self.stop_after, span),
-            },
-            span,
-        )
-    }
-}
-
 fn join_path<'a>(a: &[&'a str], b: &[&'a str]) -> Vec<&'a str> {
     a.iter().copied().chain(b.iter().copied()).collect()
 }
@@ -201,6 +173,7 @@ fn join_path<'a>(a: &[&'a str], b: &[&'a str]) -> Vec<&'a str> {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use nu_protocol::{record, Span};
 
     fn test_pair() -> (PluginGcConfigs, Value) {
         (
@@ -247,6 +220,6 @@ mod tests {
     #[test]
     fn reconstruct() {
         let (input, expected) = test_pair();
-        assert_eq!(expected, input.reconstruct_value(Span::test_data()));
+        assert_eq!(expected, input.into_value(Span::test_data()));
     }
 }
diff --git a/crates/nu-protocol/src/config/prelude.rs b/crates/nu-protocol/src/config/prelude.rs
new file mode 100644
index 0000000000..8bc100cb90
--- /dev/null
+++ b/crates/nu-protocol/src/config/prelude.rs
@@ -0,0 +1,3 @@
+pub use crate::{record, IntoValue, Span, Value};
+pub use serde::{Deserialize, Serialize};
+pub use std::str::FromStr;
diff --git a/crates/nu-protocol/src/config/reedline.rs b/crates/nu-protocol/src/config/reedline.rs
index 7032e74087..65129cf176 100644
--- a/crates/nu-protocol/src/config/reedline.rs
+++ b/crates/nu-protocol/src/config/reedline.rs
@@ -1,11 +1,9 @@
-use std::str::FromStr;
-
-use super::{extract_value, helper::ReconstructVal};
-use crate::{record, Config, ShellError, Span, Value};
-use serde::{Deserialize, Serialize};
+use super::{extract_value, prelude::*};
+use crate as nu_protocol;
+use crate::ShellError;
 
 /// Definition of a parsed keybinding from the config object
-#[derive(Serialize, Deserialize, Clone, Debug)]
+#[derive(Clone, Debug, IntoValue, Serialize, Deserialize)]
 pub struct ParsedKeybinding {
     pub modifier: Value,
     pub keycode: Value,
@@ -14,23 +12,23 @@ pub struct ParsedKeybinding {
 }
 
 /// Definition of a parsed menu from the config object
-#[derive(Serialize, Deserialize, Clone, Debug)]
+#[derive(Clone, Debug, IntoValue, Serialize, Deserialize)]
 pub struct ParsedMenu {
     pub name: Value,
     pub marker: Value,
     pub only_buffer_difference: Value,
     pub style: Value,
-    pub menu_type: Value,
+    pub r#type: Value,
     pub source: Value,
 }
 
 /// Definition of a Nushell CursorShape (to be mapped to crossterm::cursor::CursorShape)
-#[derive(Serialize, Deserialize, Clone, Debug, Copy, Default)]
+#[derive(Clone, Copy, Debug, Default, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
 pub enum NuCursorShape {
-    UnderScore,
+    Underscore,
     Line,
     Block,
-    BlinkUnderScore,
+    BlinkUnderscore,
     BlinkLine,
     BlinkBlock,
     #[default]
@@ -44,66 +42,24 @@ impl FromStr for NuCursorShape {
         match s.to_ascii_lowercase().as_str() {
         "line" => Ok(NuCursorShape::Line),
         "block" => Ok(NuCursorShape::Block),
-        "underscore" => Ok(NuCursorShape::UnderScore),
+        "underscore" => Ok(NuCursorShape::Underscore),
         "blink_line" => Ok(NuCursorShape::BlinkLine),
         "blink_block" => Ok(NuCursorShape::BlinkBlock),
-        "blink_underscore" => Ok(NuCursorShape::BlinkUnderScore),
+        "blink_underscore" => Ok(NuCursorShape::BlinkUnderscore),
         "inherit" => Ok(NuCursorShape::Inherit),
         _ => Err("expected either 'line', 'block', 'underscore', 'blink_line', 'blink_block', 'blink_underscore' or 'inherit'"),
         }
     }
 }
 
-impl ReconstructVal for NuCursorShape {
-    fn reconstruct_value(&self, span: Span) -> Value {
-        Value::string(
-            match self {
-                NuCursorShape::Line => "line",
-                NuCursorShape::Block => "block",
-                NuCursorShape::UnderScore => "underscore",
-                NuCursorShape::BlinkLine => "blink_line",
-                NuCursorShape::BlinkBlock => "blink_block",
-                NuCursorShape::BlinkUnderScore => "blink_underscore",
-                NuCursorShape::Inherit => "inherit",
-            },
-            span,
-        )
-    }
+#[derive(Clone, Copy, Debug, Default, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
+pub struct CursorShapeConfig {
+    pub emacs: NuCursorShape,
+    pub vi_insert: NuCursorShape,
+    pub vi_normal: NuCursorShape,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, Copy)]
-pub enum HistoryFileFormat {
-    /// Store history as an SQLite database with additional context
-    Sqlite,
-    /// store history as a plain text file where every line is one command (without any context such as timestamps)
-    PlainText,
-}
-
-impl FromStr for HistoryFileFormat {
-    type Err = &'static str;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s.to_ascii_lowercase().as_str() {
-            "sqlite" => Ok(Self::Sqlite),
-            "plaintext" => Ok(Self::PlainText),
-            _ => Err("expected either 'sqlite' or 'plaintext'"),
-        }
-    }
-}
-
-impl ReconstructVal for HistoryFileFormat {
-    fn reconstruct_value(&self, span: Span) -> Value {
-        Value::string(
-            match self {
-                HistoryFileFormat::Sqlite => "sqlite",
-                HistoryFileFormat::PlainText => "plaintext",
-            },
-            span,
-        )
-    }
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, Default, Copy)]
+#[derive(Clone, Copy, Debug, Default, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
 pub enum EditBindings {
     Vi,
     #[default]
@@ -122,18 +78,6 @@ impl FromStr for EditBindings {
     }
 }
 
-impl ReconstructVal for EditBindings {
-    fn reconstruct_value(&self, span: Span) -> Value {
-        Value::string(
-            match self {
-                EditBindings::Vi => "vi",
-                EditBindings::Emacs => "emacs",
-            },
-            span,
-        )
-    }
-}
-
 /// Parses the config object to extract the strings that will compose a keybinding for reedline
 pub(super) fn create_keybindings(value: &Value) -> Result<Vec<ParsedKeybinding>, ShellError> {
     let span = value.span();
@@ -172,34 +116,6 @@ pub(super) fn create_keybindings(value: &Value) -> Result<Vec<ParsedKeybinding>,
     }
 }
 
-pub(super) fn reconstruct_keybindings(config: &Config, span: Span) -> Value {
-    Value::list(
-        config
-            .keybindings
-            .iter()
-            .map(
-                |ParsedKeybinding {
-                     modifier,
-                     keycode,
-                     mode,
-                     event,
-                 }| {
-                    Value::record(
-                        record! {
-                            "modifier" => modifier.clone(),
-                            "keycode" => keycode.clone(),
-                            "mode" => mode.clone(),
-                            "event" => event.clone(),
-                        },
-                        span,
-                    )
-                },
-            )
-            .collect(),
-        span,
-    )
-}
-
 /// Parses the config object to extract the strings that will compose a keybinding for reedline
 pub fn create_menus(value: &Value) -> Result<Vec<ParsedMenu>, ShellError> {
     let span = value.span();
@@ -211,7 +127,7 @@ pub fn create_menus(value: &Value) -> Result<Vec<ParsedMenu>, ShellError> {
             let only_buffer_difference =
                 extract_value("only_buffer_difference", val, span)?.clone();
             let style = extract_value("style", val, span)?.clone();
-            let menu_type = extract_value("type", val, span)?.clone();
+            let r#type = extract_value("type", val, span)?.clone();
 
             // Source is an optional value
             let source = match extract_value("source", val, span) {
@@ -224,7 +140,7 @@ pub fn create_menus(value: &Value) -> Result<Vec<ParsedMenu>, ShellError> {
                 only_buffer_difference,
                 marker,
                 style,
-                menu_type,
+                r#type,
                 source,
             };
 
@@ -243,35 +159,3 @@ pub fn create_menus(value: &Value) -> Result<Vec<ParsedMenu>, ShellError> {
         _ => Ok(Vec::new()),
     }
 }
-
-pub(super) fn reconstruct_menus(config: &Config, span: Span) -> Value {
-    Value::list(
-        config
-            .menus
-            .iter()
-            .map(
-                |ParsedMenu {
-                     name,
-                     only_buffer_difference,
-                     marker,
-                     style,
-                     menu_type, // WARNING: this is not the same name as what is used in Config.nu! ("type")
-                     source,
-                 }| {
-                    Value::record(
-                        record! {
-                            "name" => name.clone(),
-                            "only_buffer_difference" => only_buffer_difference.clone(),
-                            "marker" => marker.clone(),
-                            "style" => style.clone(),
-                            "type" => menu_type.clone(),
-                            "source" => source.clone(),
-                        },
-                        span,
-                    )
-                },
-            )
-            .collect(),
-        span,
-    )
-}
diff --git a/crates/nu-protocol/src/config/rm.rs b/crates/nu-protocol/src/config/rm.rs
new file mode 100644
index 0000000000..1d7beca04e
--- /dev/null
+++ b/crates/nu-protocol/src/config/rm.rs
@@ -0,0 +1,16 @@
+use super::prelude::*;
+use crate as nu_protocol;
+
+#[derive(Clone, Copy, Debug, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
+pub struct RmConfig {
+    pub always_trash: bool,
+}
+
+#[allow(clippy::derivable_impls)]
+impl Default for RmConfig {
+    fn default() -> Self {
+        Self {
+            always_trash: false,
+        }
+    }
+}
diff --git a/crates/nu-protocol/src/config/shell_integration.rs b/crates/nu-protocol/src/config/shell_integration.rs
new file mode 100644
index 0000000000..f1eb6b3a53
--- /dev/null
+++ b/crates/nu-protocol/src/config/shell_integration.rs
@@ -0,0 +1,28 @@
+use super::prelude::*;
+use crate as nu_protocol;
+
+#[derive(Clone, Copy, Debug, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
+pub struct ShellIntegrationConfig {
+    pub osc2: bool,
+    pub osc7: bool,
+    pub osc8: bool,
+    pub osc9_9: bool,
+    pub osc133: bool,
+    pub osc633: bool,
+    pub reset_application_mode: bool,
+}
+
+#[allow(clippy::derivable_impls)]
+impl Default for ShellIntegrationConfig {
+    fn default() -> Self {
+        Self {
+            osc2: false,
+            osc7: false,
+            osc8: false,
+            osc9_9: false,
+            osc133: false,
+            osc633: false,
+            reset_application_mode: false,
+        }
+    }
+}
diff --git a/crates/nu-protocol/src/config/table.rs b/crates/nu-protocol/src/config/table.rs
index ea17bf9fec..ac752e267c 100644
--- a/crates/nu-protocol/src/config/table.rs
+++ b/crates/nu-protocol/src/config/table.rs
@@ -1,9 +1,8 @@
-use super::helper::ReconstructVal;
-use crate::{record, Config, ShellError, Span, Value};
-use serde::{Deserialize, Serialize};
-use std::str::FromStr;
+use super::prelude::*;
+use crate as nu_protocol;
+use crate::ShellError;
 
-#[derive(Serialize, Deserialize, Clone, Copy, Debug, Default)]
+#[derive(Clone, Copy, Debug, Default, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
 pub enum TableMode {
     Basic,
     Thin,
@@ -51,33 +50,7 @@ impl FromStr for TableMode {
     }
 }
 
-impl ReconstructVal for TableMode {
-    fn reconstruct_value(&self, span: Span) -> Value {
-        Value::string(
-            match self {
-                TableMode::Basic => "basic",
-                TableMode::Thin => "thin",
-                TableMode::Light => "light",
-                TableMode::Compact => "compact",
-                TableMode::WithLove => "with_love",
-                TableMode::CompactDouble => "compact_double",
-                TableMode::Rounded => "rounded",
-                TableMode::Reinforced => "reinforced",
-                TableMode::Heavy => "heavy",
-                TableMode::None => "none",
-                TableMode::Psql => "psql",
-                TableMode::Markdown => "markdown",
-                TableMode::Dots => "dots",
-                TableMode::Restructured => "restructured",
-                TableMode::AsciiRounded => "ascii_rounded",
-                TableMode::BasicCompact => "basic_compact",
-            },
-            span,
-        )
-    }
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum FooterMode {
     /// Never show the footer
     Never,
@@ -108,21 +81,18 @@ impl FromStr for FooterMode {
     }
 }
 
-impl ReconstructVal for FooterMode {
-    fn reconstruct_value(&self, span: Span) -> Value {
-        Value::string(
-            match self {
-                FooterMode::Always => "always".to_string(),
-                FooterMode::Never => "never".to_string(),
-                FooterMode::Auto => "auto".to_string(),
-                FooterMode::RowCount(c) => c.to_string(),
-            },
-            span,
-        )
+impl IntoValue for FooterMode {
+    fn into_value(self, span: Span) -> Value {
+        match self {
+            FooterMode::Always => "always".into_value(span),
+            FooterMode::Never => "never".into_value(span),
+            FooterMode::Auto => "auto".into_value(span),
+            FooterMode::RowCount(c) => c.to_string().into_value(span),
+        }
     }
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug)]
+#[derive(Clone, Copy, Debug, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
 pub enum TableIndexMode {
     /// Always show indexes
     Always,
@@ -145,22 +115,9 @@ impl FromStr for TableIndexMode {
     }
 }
 
-impl ReconstructVal for TableIndexMode {
-    fn reconstruct_value(&self, span: Span) -> Value {
-        Value::string(
-            match self {
-                TableIndexMode::Always => "always",
-                TableIndexMode::Never => "never",
-                TableIndexMode::Auto => "auto",
-            },
-            span,
-        )
-    }
-}
-
 /// A Table view configuration, for a situation where
 /// we need to limit cell width in order to adjust for a terminal size.
-#[derive(Serialize, Deserialize, Clone, Debug)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum TrimStrategy {
     /// Wrapping strategy.
     ///
@@ -196,7 +153,7 @@ impl TrimStrategy {
 
 impl Default for TrimStrategy {
     fn default() -> Self {
-        TrimStrategy::Wrap {
+        Self::Wrap {
             try_to_keep_words: true,
         }
     }
@@ -289,45 +246,89 @@ fn try_parse_trim_methodology(value: &Value) -> Option<TrimStrategy> {
     None
 }
 
-pub(super) fn reconstruct_trim_strategy(config: &Config, span: Span) -> Value {
-    match &config.trim_strategy {
-        TrimStrategy::Wrap { try_to_keep_words } => Value::record(
-            record! {
-                "methodology" => Value::string("wrapping", span),
-                "wrapping_try_keep_words" => Value::bool(*try_to_keep_words, span),
-            },
-            span,
-        ),
-        TrimStrategy::Truncate { suffix } => Value::record(
-            match suffix {
-                Some(s) => record! {
-                    "methodology" => Value::string("truncating", span),
-                    "truncating_suffix" => Value::string(s.clone(), span),
-                },
-                None => record! {
-                    "methodology" => Value::string("truncating", span),
-                    "truncating_suffix" => Value::nothing(span),
-                },
-            },
-            span,
-        ),
+impl IntoValue for TrimStrategy {
+    fn into_value(self, span: Span) -> Value {
+        match self {
+            TrimStrategy::Wrap { try_to_keep_words } => {
+                record! {
+                    "methodology" => "wrapping".into_value(span),
+                    "wrapping_try_keep_words" => try_to_keep_words.into_value(span),
+                }
+            }
+            TrimStrategy::Truncate { suffix } => {
+                record! {
+                    "methodology" => "truncating".into_value(span),
+                    "truncating_suffix" => suffix.into_value(span),
+                }
+            }
+        }
+        .into_value(span)
     }
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct TableIndent {
     pub left: usize,
     pub right: usize,
 }
 
-pub(super) fn reconstruct_padding(config: &Config, span: Span) -> Value {
-    // For better completions always reconstruct the record version even though unsigned int would
-    // be supported, `as` conversion is sane as it came from an i64 original
-    Value::record(
-        record!(
-            "left" => Value::int(config.table_indent.left as i64, span),
-            "right" => Value::int(config.table_indent.right as i64, span),
-        ),
-        span,
-    )
+impl IntoValue for TableIndent {
+    fn into_value(self, span: Span) -> Value {
+        record! {
+            "left" => (self.left as i64).into_value(span),
+            "right" => (self.right as i64).into_value(span),
+        }
+        .into_value(span)
+    }
+}
+
+impl Default for TableIndent {
+    fn default() -> Self {
+        Self { left: 1, right: 1 }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct TableConfig {
+    pub mode: TableMode,
+    pub index_mode: TableIndexMode,
+    pub show_empty: bool,
+    pub padding: TableIndent,
+    pub trim: TrimStrategy,
+    pub header_on_separator: bool,
+    pub abbreviated_row_count: Option<usize>,
+}
+
+impl IntoValue for TableConfig {
+    fn into_value(self, span: Span) -> Value {
+        let abbv_count = self
+            .abbreviated_row_count
+            .map(|t| t as i64)
+            .into_value(span);
+
+        record! {
+            "mode" => self.mode.into_value(span),
+            "index_mode" => self.index_mode.into_value(span),
+            "show_empty" => self.show_empty.into_value(span),
+            "padding" => self.padding.into_value(span),
+            "trim" => self.trim.into_value(span),
+            "header_on_separator" => self.header_on_separator.into_value(span),
+            "abbreviated_row_count" => abbv_count,
+        }
+        .into_value(span)
+    }
+}
+
+impl Default for TableConfig {
+    fn default() -> Self {
+        Self {
+            mode: TableMode::Rounded,
+            index_mode: TableIndexMode::Always,
+            show_empty: true,
+            trim: TrimStrategy::default(),
+            header_on_separator: false,
+            padding: TableIndent::default(),
+            abbreviated_row_count: None,
+        }
+    }
 }
diff --git a/crates/nu-protocol/src/eval_const.rs b/crates/nu-protocol/src/eval_const.rs
index 1ee7802799..72f165d195 100644
--- a/crates/nu-protocol/src/eval_const.rs
+++ b/crates/nu-protocol/src/eval_const.rs
@@ -95,7 +95,7 @@ pub(crate) fn create_nu_constant(engine_state: &EngineState, span: Span) -> Valu
                     HistoryFileFormat::Sqlite => {
                         path.push("history.sqlite3");
                     }
-                    HistoryFileFormat::PlainText => {
+                    HistoryFileFormat::Plaintext => {
                         path.push("history.txt");
                     }
                 }
diff --git a/crates/nu-protocol/src/value/filesize.rs b/crates/nu-protocol/src/value/filesize.rs
index 79ecc136b9..9d58c103df 100644
--- a/crates/nu-protocol/src/value/filesize.rs
+++ b/crates/nu-protocol/src/value/filesize.rs
@@ -8,8 +8,8 @@ pub fn format_filesize_from_conf(num_bytes: i64, config: &Config) -> String {
     // and filesize_metric is false, return KiB
     format_filesize(
         num_bytes,
-        config.filesize_format.as_str(),
-        Some(config.filesize_metric),
+        &config.filesize.format,
+        Some(config.filesize.metric),
     )
 }
 
diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs
index 3620be698c..80f96707af 100644
--- a/crates/nu-protocol/src/value/mod.rs
+++ b/crates/nu-protocol/src/value/mod.rs
@@ -832,7 +832,7 @@ impl Value {
             Value::Float { val, .. } => val.to_string(),
             Value::Filesize { val, .. } => format_filesize_from_conf(*val, config),
             Value::Duration { val, .. } => format_duration(*val),
-            Value::Date { val, .. } => match &config.datetime_normal_format {
+            Value::Date { val, .. } => match &config.datetime_format.normal {
                 Some(format) => self.format_datetime(val, format),
                 None => {
                     format!(
@@ -886,7 +886,7 @@ impl Value {
     /// - "[record {n} fields]"
     pub fn to_abbreviated_string(&self, config: &Config) -> String {
         match self {
-            Value::Date { val, .. } => match &config.datetime_table_format {
+            Value::Date { val, .. } => match &config.datetime_format.table {
                 Some(format) => self.format_datetime(val, format),
                 None => HumanTime::from(*val).to_string(),
             },
diff --git a/crates/nu-table/src/common.rs b/crates/nu-table/src/common.rs
index 76cd8adf52..b15874d7c8 100644
--- a/crates/nu-table/src/common.rs
+++ b/crates/nu-table/src/common.rs
@@ -23,8 +23,8 @@ pub fn create_nu_table_config(
         with_index: out.with_index,
         with_header: out.with_header,
         split_color: Some(lookup_separator_color(comp)),
-        trim: config.trim_strategy.clone(),
-        header_on_border: config.table_move_header,
+        trim: config.table.trim.clone(),
+        header_on_border: config.table.header_on_separator,
         expand,
     }
 }
@@ -62,7 +62,8 @@ pub fn error_sign(style_computer: &StyleComputer) -> (String, TextStyle) {
 }
 
 pub fn wrap_text(text: &str, width: usize, config: &Config) -> String {
-    string_wrap(text, width, is_cfg_trim_keep_words(config))
+    let keep_words = config.table.trim == TrimStrategy::wrap(true);
+    string_wrap(text, width, keep_words)
 }
 
 pub fn get_header_style(style_computer: &StyleComputer) -> TextStyle {
@@ -163,15 +164,6 @@ fn convert_with_precision(val: &str, precision: usize) -> Result<String, ShellEr
     Ok(format!("{val_float:.precision$}"))
 }
 
-fn is_cfg_trim_keep_words(config: &Config) -> bool {
-    matches!(
-        config.trim_strategy,
-        TrimStrategy::Wrap {
-            try_to_keep_words: true
-        }
-    )
-}
-
 pub fn load_theme(mode: TableMode) -> TableTheme {
     match mode {
         TableMode::Basic => TableTheme::basic(),
diff --git a/crates/nu-table/src/types/collapse.rs b/crates/nu-table/src/types/collapse.rs
index e25b7f1e79..0012c70a35 100644
--- a/crates/nu-table/src/types/collapse.rs
+++ b/crates/nu-table/src/types/collapse.rs
@@ -36,7 +36,7 @@ fn collapsed_table(
         return Ok(None);
     }
 
-    let indent = (config.table_indent.left, config.table_indent.right);
+    let indent = (config.table.padding.left, config.table.padding.right);
     let table = table.draw(style_computer, &theme, indent);
 
     Ok(Some(table))
diff --git a/crates/nu-table/src/types/general.rs b/crates/nu-table/src/types/general.rs
index 66048267d7..f7bd24f2e2 100644
--- a/crates/nu-table/src/types/general.rs
+++ b/crates/nu-table/src/types/general.rs
@@ -26,8 +26,8 @@ impl JustTable {
 fn create_table(input: &[Value], opts: TableOpts<'_>) -> Result<Option<String>, ShellError> {
     match table(input, &opts)? {
         Some(mut out) => {
-            let left = opts.config.table_indent.left;
-            let right = opts.config.table_indent.right;
+            let left = opts.config.table.padding.left;
+            let right = opts.config.table.padding.right;
             out.table.set_indent(left, right);
 
             colorize_space(out.table.get_records_mut(), opts.style_computer);
@@ -59,8 +59,8 @@ fn kv_table(record: &Record, opts: TableOpts<'_>) -> StringResult {
 
     let mut out = TableOutput::new(table, false, true);
 
-    let left = opts.config.table_indent.left;
-    let right = opts.config.table_indent.right;
+    let left = opts.config.table.padding.left;
+    let right = opts.config.table.padding.right;
     out.table.set_indent(left, right);
 
     let table_config =
diff --git a/crates/nu-table/src/types/mod.rs b/crates/nu-table/src/types/mod.rs
index 163e4b0c81..571dda26ab 100644
--- a/crates/nu-table/src/types/mod.rs
+++ b/crates/nu-table/src/types/mod.rs
@@ -67,7 +67,7 @@ impl<'a> TableOpts<'a> {
 }
 
 fn has_index(opts: &TableOpts<'_>, headers: &[String]) -> bool {
-    let with_index = match opts.config.table_index_mode {
+    let with_index = match opts.config.table.index_mode {
         TableIndexMode::Always => true,
         TableIndexMode::Never => false,
         TableIndexMode::Auto => headers.iter().any(|header| header == INDEX_COLUMN_NAME),

From f611196373e51b8dda018e2fedb8cbfa3da8726b Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Thu, 5 Sep 2024 09:06:37 -0700
Subject: [PATCH 0408/1072] Expression support for `polars str-slice` (#13783)

# Description
Provides expression support for `polars str-slice`:
<img width="893" alt="Screenshot 2024-09-04 at 18 03 05"
src="https://github.com/user-attachments/assets/d8a8a2a7-53cf-4c3a-ae7a-dfdaf48a05ee">

# User-Facing Changes
- `polars str-slice` can now be used as an expression
---
 .../src/dataframe/series/string/str_slice.rs  | 81 ++++++++++++++++---
 1 file changed, 71 insertions(+), 10 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/str_slice.rs b/crates/nu_plugin_polars/src/dataframe/series/string/str_slice.rs
index d81500a7cd..f51b42c3d0 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/string/str_slice.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/string/str_slice.rs
@@ -1,4 +1,9 @@
-use crate::{values::CustomValueSupport, PolarsPlugin};
+use crate::{
+    values::{
+        cant_convert_err, CustomValueSupport, NuExpression, PolarsPluginObject, PolarsPluginType,
+    },
+    PolarsPlugin,
+};
 
 use super::super::super::values::{Column, NuDataFrame};
 
@@ -8,7 +13,7 @@ use nu_protocol::{
     Value,
 };
 use polars::{
-    prelude::{IntoSeries, NamedFrom, StringNameSpaceImpl},
+    prelude::{lit, Expr, IntoSeries, NamedFrom, Null, StringNameSpaceImpl},
     series::Series,
 };
 
@@ -30,15 +35,40 @@ impl PluginCommand for StrSlice {
         Signature::build(self.name())
             .required("start", SyntaxShape::Int, "start of slice")
             .named("length", SyntaxShape::Int, "optional length", Some('l'))
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
+            .input_output_types(vec![
+                (
+                    Type::Custom("expression".into()),
+                    Type::Custom("expression".into()),
+                ),
+                (
+                    Type::Custom("dataframe".into()),
+                    Type::Custom("dataframe".into()),
+                ),
+            ])
             .category(Category::Custom("dataframe".into()))
     }
 
     fn examples(&self) -> Vec<Example> {
         vec![
+            Example {
+                description: "Creates slices from the strings in a specified column",
+                example: "[[a]; [abcded] [abc321] [abc123]] | polars into-df | polars select (polars col a | polars str-slice 1 --length 2) | polars collect",
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![Column::new(
+                            "a".to_string(),
+                            vec![
+                                Value::test_string("bc"),
+                                Value::test_string("bc"),
+                                Value::test_string("bc"),
+                            ],
+                        )],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
             Example {
                 description: "Creates slices from the strings",
                 example: "[abcded abc321 abc123] | polars into-df | polars str-slice 1 --length 2",
@@ -87,15 +117,47 @@ impl PluginCommand for StrSlice {
         call: &EvaluatedCall,
         input: PipelineData,
     ) -> Result<PipelineData, LabeledError> {
-        command(plugin, engine, call, input).map_err(LabeledError::from)
+        let value = input.into_value(call.head)?;
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuDataFrame(df) => command_df(plugin, engine, call, df),
+            PolarsPluginObject::NuLazyFrame(lazy) => {
+                command_df(plugin, engine, call, lazy.collect(call.head)?)
+            }
+            PolarsPluginObject::NuExpression(expr) => command_expr(plugin, engine, call, expr),
+            _ => Err(cant_convert_err(
+                &value,
+                &[
+                    PolarsPluginType::NuDataFrame,
+                    PolarsPluginType::NuLazyFrame,
+                    PolarsPluginType::NuExpression,
+                ],
+            )),
+        }
+        .map_err(LabeledError::from)
     }
 }
 
-fn command(
+fn command_expr(
     plugin: &PolarsPlugin,
     engine: &EngineInterface,
     call: &EvaluatedCall,
-    input: PipelineData,
+    expr: NuExpression,
+) -> Result<PipelineData, ShellError> {
+    let start = lit(call.req::<i64>(0)?);
+    let length: Expr = call
+        .get_flag::<i64>("length")?
+        .map(lit)
+        .unwrap_or(lit(Null {}));
+
+    let res: NuExpression = expr.into_polars().str().slice(start, length).into();
+    res.to_pipeline_data(plugin, engine, call.head)
+}
+
+fn command_df(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    df: NuDataFrame,
 ) -> Result<PipelineData, ShellError> {
     let start: i64 = call.req(0)?;
     let start = Series::new("", &[start]);
@@ -106,7 +168,6 @@ fn command(
         None => Series::new_null("", 1),
     };
 
-    let df = NuDataFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
     let series = df.as_series(call.head)?;
 
     let chunked = series.str().map_err(|e| ShellError::GenericError {

From e7c5f834609f26c1cbb7bfa0ff8a3282458347c6 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Thu, 5 Sep 2024 09:26:09 -0700
Subject: [PATCH 0409/1072] Added expression support for `polars str-lengths`
 (#13782)

# Description
Allows `polars str-lengths` to be used as an expression:

<img width="826" alt="Screenshot 2024-09-04 at 13 57 45"
src="https://github.com/user-attachments/assets/b74139e0-e8ba-4910-84c2-cf4be4a084b6">

# User-Facing Changes
- `polars str-lengths` can be used as an expression.
- char length is now the default. Use the --bytes flag to get bytes
length.
---
 .../dataframe/series/string/str_lengths.rs    | 114 ++++++++++++++----
 1 file changed, 90 insertions(+), 24 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/str_lengths.rs b/crates/nu_plugin_polars/src/dataframe/series/string/str_lengths.rs
index 417d3c0b90..78d8030b06 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/string/str_lengths.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/string/str_lengths.rs
@@ -1,4 +1,9 @@
-use crate::{values::CustomValueSupport, PolarsPlugin};
+use crate::{
+    values::{
+        cant_convert_err, CustomValueSupport, NuExpression, PolarsPluginObject, PolarsPluginType,
+    },
+    PolarsPlugin,
+};
 
 use super::super::super::values::{Column, NuDataFrame};
 
@@ -24,29 +29,57 @@ impl PluginCommand for StrLengths {
 
     fn signature(&self) -> Signature {
         Signature::build(self.name())
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
+            .switch(
+                "bytes",
+                "Get the length in bytes instead of chars.",
+                Some('b'),
             )
+            .input_output_types(vec![
+                (
+                    Type::Custom("expression".into()),
+                    Type::Custom("expression".into()),
+                ),
+                (
+                    Type::Custom("dataframe".into()),
+                    Type::Custom("dataframe".into()),
+                ),
+            ])
             .category(Category::Custom("dataframe".into()))
     }
 
     fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns string lengths",
-            example: "[a ab abc] | polars into-df | polars str-lengths",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![Value::test_int(1), Value::test_int(2), Value::test_int(3)],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
+        vec![
+            Example {
+                description: "Returns string lengths for a column",
+                example: "[[a]; [a] [ab] [abc]] | polars into-df | polars select (polars col a | polars str-lengths) | polars collect",
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![Column::new(
+                            "a".to_string(),
+                            vec![Value::test_int(1), Value::test_int(2), Value::test_int(3)],
+                        )],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+            Example {
+                description: "Returns string lengths",
+                example: "[a ab abc] | polars into-df | polars str-lengths",
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![Column::new(
+                            "0".to_string(),
+                            vec![Value::test_int(1), Value::test_int(2), Value::test_int(3)],
+                        )],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+        ]
     }
 
     fn run(
@@ -56,17 +89,46 @@ impl PluginCommand for StrLengths {
         call: &EvaluatedCall,
         input: PipelineData,
     ) -> Result<PipelineData, LabeledError> {
-        command(plugin, engine, call, input).map_err(LabeledError::from)
+        let value = input.into_value(call.head)?;
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuDataFrame(df) => command_df(plugin, engine, call, df),
+            PolarsPluginObject::NuLazyFrame(lazy) => {
+                command_df(plugin, engine, call, lazy.collect(call.head)?)
+            }
+            PolarsPluginObject::NuExpression(expr) => command_expr(plugin, engine, call, expr),
+            _ => Err(cant_convert_err(
+                &value,
+                &[
+                    PolarsPluginType::NuDataFrame,
+                    PolarsPluginType::NuLazyFrame,
+                    PolarsPluginType::NuExpression,
+                ],
+            )),
+        }
+        .map_err(LabeledError::from)
     }
 }
 
-fn command(
+fn command_expr(
     plugin: &PolarsPlugin,
     engine: &EngineInterface,
     call: &EvaluatedCall,
-    input: PipelineData,
+    expr: NuExpression,
+) -> Result<PipelineData, ShellError> {
+    let res: NuExpression = if call.has_flag("bytes")? {
+        expr.into_polars().str().len_bytes().into()
+    } else {
+        expr.into_polars().str().len_chars().into()
+    };
+    res.to_pipeline_data(plugin, engine, call.head)
+}
+
+fn command_df(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    df: NuDataFrame,
 ) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
     let series = df.as_series(call.head)?;
 
     let chunked = series.str().map_err(|e| ShellError::GenericError {
@@ -77,7 +139,11 @@ fn command(
         inner: vec![],
     })?;
 
-    let res = chunked.as_ref().str_len_bytes().into_series();
+    let res = if call.has_flag("bytes")? {
+        chunked.as_ref().str_len_bytes().into_series()
+    } else {
+        chunked.as_ref().str_len_chars().into_series()
+    };
 
     let df = NuDataFrame::try_from_series_vec(vec![res], call.head)?;
     df.to_pipeline_data(plugin, engine, call.head)

From dc53c20628690faf116dbef30113d1f956d4b72a Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Thu, 5 Sep 2024 09:28:34 -0700
Subject: [PATCH 0410/1072] Renamed `polars concatenate` and added expression
 support. (#13781)

# Description
In order to be more consistent with the nushell terminology and with
polars expression terminology `polars concatenate` is now `polars
str-join`. `polars str-join` can also be used as expression.

<img width="857" alt="Screenshot 2024-09-04 at 12 41 25"
src="https://github.com/user-attachments/assets/8cc5a0c2-194c-49ec-9fe1-65ec4825414d">


# User-Facing Changes
- `polars concatenate` is now `polars str-join`
- `polars str-join` can be used as an expression
---
 .../src/dataframe/series/mod.rs               |   2 +-
 .../dataframe/series/string/concatenate.rs    | 121 ------------
 .../src/dataframe/series/string/mod.rs        |   4 +-
 .../src/dataframe/series/string/str_join.rs   | 177 ++++++++++++++++++
 4 files changed, 180 insertions(+), 124 deletions(-)
 delete mode 100644 crates/nu_plugin_polars/src/dataframe/series/string/concatenate.rs
 create mode 100644 crates/nu_plugin_polars/src/dataframe/series/string/str_join.rs

diff --git a/crates/nu_plugin_polars/src/dataframe/series/mod.rs b/crates/nu_plugin_polars/src/dataframe/series/mod.rs
index 0c5128f966..d4328937f6 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/mod.rs
@@ -48,7 +48,6 @@ pub(crate) fn series_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlug
         Box::new(ArgUnique),
         Box::new(AsDate),
         Box::new(AsDateTime),
-        Box::new(Concatenate),
         Box::new(Contains),
         Box::new(Cumulative),
         Box::new(GetDay),
@@ -74,6 +73,7 @@ pub(crate) fn series_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlug
         Box::new(SetSeries),
         Box::new(SetWithIndex),
         Box::new(Shift),
+        Box::new(StrJoin),
         Box::new(StrLengths),
         Box::new(StrSlice),
         Box::new(StrFTime),
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/concatenate.rs b/crates/nu_plugin_polars/src/dataframe/series/string/concatenate.rs
deleted file mode 100644
index b7663bfa41..0000000000
--- a/crates/nu_plugin_polars/src/dataframe/series/string/concatenate.rs
+++ /dev/null
@@ -1,121 +0,0 @@
-use crate::{values::CustomValueSupport, PolarsPlugin};
-
-use super::super::super::values::{Column, NuDataFrame};
-
-use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
-use nu_protocol::{
-    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
-    Value,
-};
-use polars::prelude::{IntoSeries, StringNameSpaceImpl};
-
-#[derive(Clone)]
-pub struct Concatenate;
-
-impl PluginCommand for Concatenate {
-    type Plugin = PolarsPlugin;
-
-    fn name(&self) -> &str {
-        "polars concatenate"
-    }
-
-    fn description(&self) -> &str {
-        "Concatenates strings with other array."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required(
-                "other",
-                SyntaxShape::Any,
-                "Other array with string to be concatenated",
-            )
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
-            )
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Concatenate string",
-            example: r#"let other = ([za xs cd] | polars into-df);
-    [abc abc abc] | polars into-df | polars concatenate $other"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![
-                            Value::test_string("abcza"),
-                            Value::test_string("abcxs"),
-                            Value::test_string("abccd"),
-                        ],
-                    )],
-                    None,
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        }]
-    }
-
-    fn run(
-        &self,
-        plugin: &Self::Plugin,
-        engine: &EngineInterface,
-        call: &EvaluatedCall,
-        input: PipelineData,
-    ) -> Result<PipelineData, LabeledError> {
-        command(plugin, engine, call, input).map_err(LabeledError::from)
-    }
-}
-
-fn command(
-    plugin: &PolarsPlugin,
-    engine: &EngineInterface,
-    call: &EvaluatedCall,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let df = NuDataFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
-
-    let other: Value = call.req(0)?;
-    let other_span = other.span();
-    let other_df = NuDataFrame::try_from_value_coerce(plugin, &other, other_span)?;
-
-    let other_series = other_df.as_series(other_span)?;
-    let other_chunked = other_series.str().map_err(|e| ShellError::GenericError {
-        error: "The concatenate only with string columns".into(),
-        msg: e.to_string(),
-        span: Some(other_span),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let series = df.as_series(call.head)?;
-    let chunked = series.str().map_err(|e| ShellError::GenericError {
-        error: "The concatenate only with string columns".into(),
-        msg: e.to_string(),
-        span: Some(call.head),
-        help: None,
-        inner: vec![],
-    })?;
-
-    let mut res = chunked.concat(other_chunked);
-
-    res.rename(series.name());
-
-    let df = NuDataFrame::try_from_series_vec(vec![res.into_series()], call.head)?;
-    df.to_pipeline_data(plugin, engine, call.head)
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use crate::test::test_polars_plugin_command;
-
-    #[test]
-    fn test_examples() -> Result<(), ShellError> {
-        test_polars_plugin_command(&Concatenate)
-    }
-}
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/mod.rs b/crates/nu_plugin_polars/src/dataframe/series/string/mod.rs
index 424b26a35d..0aa758c7aa 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/string/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/series/string/mod.rs
@@ -1,7 +1,7 @@
-mod concatenate;
 mod contains;
 mod replace;
 mod replace_all;
+mod str_join;
 mod str_lengths;
 mod str_slice;
 mod strftime;
@@ -10,10 +10,10 @@ mod to_integer;
 mod to_lowercase;
 mod to_uppercase;
 
-pub use concatenate::Concatenate;
 pub use contains::Contains;
 pub use replace::Replace;
 pub use replace_all::ReplaceAll;
+pub use str_join::StrJoin;
 pub use str_lengths::StrLengths;
 pub use str_slice::StrSlice;
 pub use strftime::StrFTime;
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/str_join.rs b/crates/nu_plugin_polars/src/dataframe/series/string/str_join.rs
new file mode 100644
index 0000000000..ba74af60ec
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/series/string/str_join.rs
@@ -0,0 +1,177 @@
+use crate::{
+    values::{
+        cant_convert_err, CustomValueSupport, NuExpression, PolarsPluginObject, PolarsPluginType,
+    },
+    PolarsPlugin,
+};
+
+use super::super::super::values::{Column, NuDataFrame};
+
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{
+    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
+    Value,
+};
+use polars::{prelude::StringNameSpaceImpl, series::IntoSeries};
+
+#[derive(Clone)]
+pub struct StrJoin;
+
+impl PluginCommand for StrJoin {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars str-join"
+    }
+
+    fn description(&self) -> &str {
+        "Concatenates strings within a column or dataframes"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .optional("other", SyntaxShape::Any, "Other dataframe with a single series of strings to be concatenated. Required when used with a dataframe, ignored when used as an expression.")
+            .named("delimiter", SyntaxShape::String, "Delimiter to join strings within an expression. Other dataframe when used with a dataframe.", Some('d'))
+            .switch("ignore-nulls", "Ignore null values. Only available when used as an expression.", Some('n'))
+            .input_output_types(vec![
+                (
+                    Type::Custom("expression".into()),
+                    Type::Custom("expression".into()),
+                ),
+                (
+                    Type::Custom("dataframe".into()),
+                    Type::Custom("dataframe".into()),
+                ),
+            ])
+            .category(Category::Custom("dataframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Join strings in a column",
+                example: r#"[[a]; [abc] [abc] [abc]] | polars into-df | polars select (polars col a | polars str-join -d ',') | polars collect"#,
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![Column::new(
+                            "a".to_string(),
+                            vec![Value::test_string("abc,abc,abc")],
+                        )],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+            Example {
+                description: "StrJoin strings across two series",
+                example: r#"let other = ([za xs cd] | polars into-df);
+    [abc abc abc] | polars into-df | polars str-join $other"#,
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![Column::new(
+                            "0".to_string(),
+                            vec![
+                                Value::test_string("abcza"),
+                                Value::test_string("abcxs"),
+                                Value::test_string("abccd"),
+                            ],
+                        )],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+        ]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        let value = input.into_value(call.head)?;
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuDataFrame(df) => command_df(plugin, engine, call, df),
+            PolarsPluginObject::NuLazyFrame(lazy) => {
+                command_df(plugin, engine, call, lazy.collect(call.head)?)
+            }
+            PolarsPluginObject::NuExpression(expr) => command_expr(plugin, engine, call, expr),
+            _ => Err(cant_convert_err(&value, &[PolarsPluginType::NuExpression])),
+        }
+        .map_err(LabeledError::from)
+    }
+}
+
+fn command_expr(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    expr: NuExpression,
+) -> Result<PipelineData, ShellError> {
+    let delimiter = call
+        .get_flag::<String>("delimiter")?
+        .map(|x| x.to_string())
+        .unwrap_or_else(|| "".to_string());
+    let ignore_nulls = call.has_flag("ignore-nulls")?;
+    let res: NuExpression = expr
+        .into_polars()
+        .str()
+        .join(&delimiter, ignore_nulls)
+        .into();
+
+    res.to_pipeline_data(plugin, engine, call.head)
+}
+
+fn command_df(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    df: NuDataFrame,
+) -> Result<PipelineData, ShellError> {
+    let other: Value = call.req(0).map_err(|_| ShellError::MissingParameter {
+        param_name: "other".into(),
+        span: call.head,
+    })?;
+    let other_span = other.span();
+    let other_df = NuDataFrame::try_from_value_coerce(plugin, &other, other_span)?;
+
+    let other_series = other_df.as_series(other_span)?;
+    let other_chunked = other_series.str().map_err(|e| ShellError::GenericError {
+        error: "The str-join command only works with string columns".into(),
+        msg: e.to_string(),
+        span: Some(other_span),
+        help: None,
+        inner: vec![],
+    })?;
+
+    let series = df.as_series(call.head)?;
+    let chunked = series.str().map_err(|e| ShellError::GenericError {
+        error: "The str-join command only works only with string columns".into(),
+        msg: e.to_string(),
+        span: Some(call.head),
+        help: None,
+        inner: vec![],
+    })?;
+
+    let mut res = chunked.concat(other_chunked);
+
+    res.rename(series.name());
+
+    let df = NuDataFrame::try_from_series_vec(vec![res.into_series()], call.head)?;
+    df.to_pipeline_data(plugin, engine, call.head)
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::test::test_polars_plugin_command;
+
+    #[test]
+    fn test_examples() -> Result<(), ShellError> {
+        test_polars_plugin_command(&StrJoin)
+    }
+}

From 4d2d553cca5abd3f6c204c20c1eca0f1df094924 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Thu, 5 Sep 2024 11:08:19 -0700
Subject: [PATCH 0411/1072] Use String::contains instead of exact match when
 matching content types for http requests. (#13791)

# Description
The existing code uses exact matches on content type. This can caused
things like "application/json; charset=utf-8" that contain a charset not
using send_json method.

NOTE: The charset portion in the above example would still be ignored as
we rely on serde and the client library to control the encoding, it is
still better to catch the json case.

---------

Co-authored-by: Ian Manske <ian.manske@pm.me>
---
 crates/nu-command/src/network/http/client.rs | 74 ++++++++++++++++----
 1 file changed, 61 insertions(+), 13 deletions(-)

diff --git a/crates/nu-command/src/network/http/client.rs b/crates/nu-command/src/network/http/client.rs
index 5c335fedf0..7afd114024 100644
--- a/crates/nu-command/src/network/http/client.rs
+++ b/crates/nu-command/src/network/http/client.rs
@@ -20,12 +20,26 @@ use url::Url;
 
 const HTTP_DOCS: &str = "https://www.nushell.sh/cookbook/http.html";
 
-#[derive(PartialEq, Eq)]
+type ContentType = String;
+
+#[derive(Debug, PartialEq, Eq)]
 pub enum BodyType {
     Json,
     Form,
     Multipart,
-    Unknown,
+    Unknown(Option<ContentType>),
+}
+
+impl From<Option<ContentType>> for BodyType {
+    fn from(content_type: Option<ContentType>) -> Self {
+        match content_type {
+            Some(it) if it.contains("application/json") => BodyType::Json,
+            Some(it) if it.contains("application/x-www-form-urlencoded") => BodyType::Form,
+            Some(it) if it.contains("multipart/form-data") => BodyType::Multipart,
+            Some(it) => BodyType::Unknown(Some(it)),
+            None => BodyType::Unknown(None),
+        }
+    }
 }
 
 #[derive(Clone, Copy, PartialEq)]
@@ -212,15 +226,14 @@ pub fn send_request(
             send_cancellable_request_bytes(&request_url, req, byte_stream, span, signals)
         }
         HttpBody::Value(body) => {
-            let (body_type, req) = match content_type {
-                Some(it) if it == "application/json" => (BodyType::Json, request),
-                Some(it) if it == "application/x-www-form-urlencoded" => (BodyType::Form, request),
-                Some(it) if it == "multipart/form-data" => (BodyType::Multipart, request),
-                Some(it) => {
-                    let r = request.clone().set("Content-Type", &it);
-                    (BodyType::Unknown, r)
-                }
-                _ => (BodyType::Unknown, request),
+            let body_type = BodyType::from(content_type);
+
+            // We should set the content_type if there is one available
+            // when the content type is unknown
+            let req = if let BodyType::Unknown(Some(content_type)) = &body_type {
+                request.clone().set("Content-Type", content_type)
+            } else {
+                request
             };
 
             match body_type {
@@ -229,7 +242,9 @@ pub fn send_request(
                 BodyType::Multipart => {
                     send_multipart_request(&request_url, body, req, span, signals)
                 }
-                BodyType::Unknown => send_default_request(&request_url, body, req, span, signals),
+                BodyType::Unknown(_) => {
+                    send_default_request(&request_url, body, req, span, signals)
+                }
             }
         }
     }
@@ -243,9 +258,14 @@ fn send_json_request(
     signals: &Signals,
 ) -> Result<Response, ShellErrorOrRequestError> {
     let data = match body {
-        Value::Int { .. } | Value::List { .. } | Value::String { .. } | Value::Record { .. } => {
+        Value::Int { .. } | Value::List { .. } | Value::Record { .. } => {
             value_to_json_value(&body)?
         }
+        // If the body type is string, assume it is string json content.
+        // If parsing fails, just send the raw string
+        Value::String { val: s, .. } => {
+            serde_json::from_str(&s).unwrap_or_else(|_| nu_json::Value::String(s))
+        }
         _ => {
             return Err(ShellErrorOrRequestError::ShellError(
                 ShellError::UnsupportedHttpBody {
@@ -861,3 +881,31 @@ fn retrieve_http_proxy_from_env(engine_state: &EngineState, stack: &mut Stack) -
         .or(stack.get_env_var(engine_state, "ALL_PROXY"))
         .and_then(|proxy| proxy.coerce_into_string().ok())
 }
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_body_type_from_content_type() {
+        let json = Some("application/json".to_string());
+        assert_eq!(BodyType::Json, BodyType::from(json));
+
+        // while the charset wont' be passed as we are allowing serde and the library to control
+        // this, it still shouldn't be missed as json if passed in.
+        let json_with_charset = Some("application/json; charset=utf-8".to_string());
+        assert_eq!(BodyType::Json, BodyType::from(json_with_charset));
+
+        let form = Some("application/x-www-form-urlencoded".to_string());
+        assert_eq!(BodyType::Form, BodyType::from(form));
+
+        let multipart = Some("multipart/form-data".to_string());
+        assert_eq!(BodyType::Multipart, BodyType::from(multipart));
+
+        let unknown = Some("application/octet-stream".to_string());
+        assert_eq!(BodyType::Unknown(unknown.clone()), BodyType::from(unknown));
+
+        let none = None;
+        assert_eq!(BodyType::Unknown(none.clone()), BodyType::from(none));
+    }
+}

From 92091599ffc1322257dbc280c42b147d419b32cd Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Fri, 6 Sep 2024 00:57:36 +0200
Subject: [PATCH 0412/1072] Fixup `serde` feature selection in `nu-protocol`
 (#13793)

Discovered by @cptpiepmatz that #13749 broke the standalone check for
`nu-protocol`

Explicit use of the feature as workspace root also disables all features
for `serde`. Alternatively we could reconsider this there.
---
 Cargo.toml                                | 2 +-
 crates/nu-protocol/Cargo.toml             | 2 +-
 crates/nu_plugin_custom_values/Cargo.toml | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 070269cf77..48bda05ba0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -146,7 +146,7 @@ roxmltree = "0.19"
 rstest = { version = "0.18", default-features = false }
 rusqlite = "0.31"
 rust-embed = "8.5.0"
-serde = { version = "1.0", default-features = false }
+serde = { version = "1.0" }
 serde_json = "1.0"
 serde_urlencoded = "0.7.1"
 serde_yaml = "0.9"
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index ac44ade67f..37db9fd289 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -34,7 +34,7 @@ lru = { workspace = true }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
 num-format = { workspace = true }
 rmp-serde = { workspace = true, optional = true }
-serde = { workspace = true, default-features = false }
+serde = { workspace = true }
 thiserror = "1.0"
 typetag = "0.2"
 os_pipe = { workspace = true, features = ["io_safety"] }
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index 90e00b1feb..aa8d42bedf 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -12,8 +12,8 @@ bench = false
 [dependencies]
 nu-plugin = { path = "../nu-plugin", version = "0.97.2" }
 nu-protocol = { path = "../nu-protocol", version = "0.97.2", features = ["plugin"] }
-serde = { workspace = true, default-features = false }
+serde = { workspace = true }
 typetag = "0.2"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.97.2" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.97.2" }

From b2cab3274b7522f493665a7a4d27ca91a5ffda3c Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 5 Sep 2024 18:17:40 -0500
Subject: [PATCH 0413/1072] fix --ide-ast when there are errors (#13737)

# Description

This PR fixes #13732. However, I don't think it's a proper fix.
1. It doesn't really show what the problem is.
2. It kind of side-steps the error entirely.

I do think the change in span.rs may be valid because I don't think
span.end should ever be 0. In the example in 13732 the span end was
always 0 and so that made contains_span() return true, which seems like
a false positive.

The `checked_sub()` in ide.rs kind of just stops it from failing
outloud.

I'll leave it to smarter folks than me to land this if they think it's
worthy.
---
 crates/nu-protocol/src/span.rs | 2 +-
 src/ide.rs                     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/nu-protocol/src/span.rs b/crates/nu-protocol/src/span.rs
index cb6d96421c..9fe42c2530 100644
--- a/crates/nu-protocol/src/span.rs
+++ b/crates/nu-protocol/src/span.rs
@@ -130,7 +130,7 @@ impl Span {
     }
 
     pub fn contains_span(&self, span: Self) -> bool {
-        self.start <= span.start && span.end <= self.end
+        self.start <= span.start && span.end <= self.end && span.end != 0
     }
 
     /// Point to the space just past this span, useful for missing values
diff --git a/src/ide.rs b/src/ide.rs
index a08e7afcdf..948539d839 100644
--- a/src/ide.rs
+++ b/src/ide.rs
@@ -642,8 +642,8 @@ pub fn ast(engine_state: &mut EngineState, file_path: &str) {
                 {
                     "type": "ast",
                     "span": {
-                        "start": span.start - offset,
-                        "end": span.end - offset,
+                        "start": span.start.checked_sub(offset),
+                        "end": span.end.checked_sub(offset),
                     },
                     "shape": shape.to_string(),
                     "content": content // may not be necessary, but helpful for debugging

From 870eb2530c5b953833e156a68dd3805b3b3ebdbd Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 5 Sep 2024 18:22:03 -0500
Subject: [PATCH 0414/1072] fixed issue with find not working with symbols that
 should be escaped (#13792)

# Description

Thanks to @weirdan's suggestion, this now works.

![image](https://github.com/user-attachments/assets/34522c7b-b012-4f73-883d-9913142e85b9)

Closes #13789
---
 crates/nu-command/src/help/help_.rs      |  3 +-
 crates/nu-command/tests/commands/find.rs | 60 ++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/help/help_.rs b/crates/nu-command/src/help/help_.rs
index 488095d62c..a036161003 100644
--- a/crates/nu-command/src/help/help_.rs
+++ b/crates/nu-command/src/help/help_.rs
@@ -193,7 +193,8 @@ pub fn highlight_search_string(
     string_style: &Style,
     highlight_style: &Style,
 ) -> Result<String, ShellError> {
-    let regex_string = format!("(?i){needle}");
+    let escaped_needle = regex::escape(needle);
+    let regex_string = format!("(?i){escaped_needle}");
     let regex = match Regex::new(&regex_string) {
         Ok(regex) => regex,
         Err(err) => {
diff --git a/crates/nu-command/tests/commands/find.rs b/crates/nu-command/tests/commands/find.rs
index 89bf2d9f39..bc8f166eb9 100644
--- a/crates/nu-command/tests/commands/find.rs
+++ b/crates/nu-command/tests/commands/find.rs
@@ -138,3 +138,63 @@ fn find_in_table_keeps_row_with_multiple_matched_and_keeps_other_columns() {
     assert!(actual.out.contains("bill"));
     assert!(actual.out.contains("60"));
 }
+
+#[test]
+fn find_with_string_search_with_special_char_1() {
+    let actual = nu!("[[d]; [a?b] [a*b] [a{1}b] ] | find '?' | to json -r");
+
+    assert_eq!(
+        actual.out,
+        "[{\"d\":\"\\u001b[37ma\\u001b[0m\\u001b[41;37m?\\u001b[0m\\u001b[37mb\\u001b[0m\"}]"
+    );
+}
+
+#[test]
+fn find_with_string_search_with_special_char_2() {
+    let actual = nu!("[[d]; [a?b] [a*b] [a{1}b]] | find '*' | to json -r");
+
+    assert_eq!(
+        actual.out,
+        "[{\"d\":\"\\u001b[37ma\\u001b[0m\\u001b[41;37m*\\u001b[0m\\u001b[37mb\\u001b[0m\"}]"
+    );
+}
+
+#[test]
+fn find_with_string_search_with_special_char_3() {
+    let actual = nu!("[[d]; [a?b] [a*b] [a{1}b] ] | find '{1}' | to json -r");
+
+    assert_eq!(
+        actual.out,
+        "[{\"d\":\"\\u001b[37ma\\u001b[0m\\u001b[41;37m{1}\\u001b[0m\\u001b[37mb\\u001b[0m\"}]"
+    );
+}
+
+#[test]
+fn find_with_string_search_with_special_char_4() {
+    let actual = nu!("[{d: a?b} {d: a*b} {d: a{1}b} {d: a[]b}] | find '[' | to json -r");
+
+    assert_eq!(
+        actual.out,
+        "[{\"d\":\"\\u001b[37ma\\u001b[0m\\u001b[41;37m[\\u001b[0m\\u001b[37m]b\\u001b[0m\"}]"
+    );
+}
+
+#[test]
+fn find_with_string_search_with_special_char_5() {
+    let actual = nu!("[{d: a?b} {d: a*b} {d: a{1}b} {d: a[]b}] | find ']' | to json -r");
+
+    assert_eq!(
+        actual.out,
+        "[{\"d\":\"\\u001b[37ma[\\u001b[0m\\u001b[41;37m]\\u001b[0m\\u001b[37mb\\u001b[0m\"}]"
+    );
+}
+
+#[test]
+fn find_with_string_search_with_special_char_6() {
+    let actual = nu!("[{d: a?b} {d: a*b} {d: a{1}b} {d: a[]b}] | find '[]' | to json -r");
+
+    assert_eq!(
+        actual.out,
+        "[{\"d\":\"\\u001b[37ma\\u001b[0m\\u001b[41;37m[]\\u001b[0m\\u001b[37mb\\u001b[0m\"}]"
+    );
+}

From d0c2adabf78268789e1030eeee930645a7368ed9 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 5 Sep 2024 18:25:43 -0500
Subject: [PATCH 0415/1072] remove config use_grid_icons, move to parameter of
 grid command (#13788)

# Description

After looking at #13751 I noticed that the config setting
`use_grid_icons` seems out of place. So, I removed it from the config
and made it a parameter to the `grid` command.
---
 crates/nu-command/src/viewers/griddle.rs      | 31 +++++++++++++++----
 crates/nu-command/tests/commands/table.rs     |  6 ++--
 crates/nu-protocol/src/config/mod.rs          |  5 ---
 .../src/sample_config/default_config.nu       |  1 -
 4 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/crates/nu-command/src/viewers/griddle.rs b/crates/nu-command/src/viewers/griddle.rs
index 4c26514c1b..dccd856512 100644
--- a/crates/nu-command/src/viewers/griddle.rs
+++ b/crates/nu-command/src/viewers/griddle.rs
@@ -33,6 +33,11 @@ impl Command for Griddle {
                 Some('w'),
             )
             .switch("color", "draw output with color", Some('c'))
+            .switch(
+                "icons",
+                "draw output with icons (assumes nerd font is used)",
+                Some('i'),
+            )
             .named(
                 "separator",
                 SyntaxShape::String,
@@ -61,12 +66,13 @@ prints out the list properly."#
         let width_param: Option<i64> = call.get_flag(engine_state, stack, "width")?;
         let color_param: bool = call.has_flag(engine_state, stack, "color")?;
         let separator_param: Option<String> = call.get_flag(engine_state, stack, "separator")?;
+        let icons_param: bool = call.has_flag(engine_state, stack, "icons")?;
         let config = &stack.get_config(engine_state);
         let env_str = match stack.get_env_var(engine_state, "LS_COLORS") {
             Some(v) => Some(env_to_string("LS_COLORS", &v, engine_state, stack)?),
             None => None,
         };
-        let use_grid_icons = config.use_grid_icons;
+
         let use_color: bool = color_param && config.use_ansi_coloring;
         let cwd = engine_state.cwd(Some(stack))?;
 
@@ -82,7 +88,7 @@ prints out the list properly."#
                         use_color,
                         separator_param,
                         env_str,
-                        use_grid_icons,
+                        icons_param,
                         cwd.as_ref(),
                     )?)
                 } else {
@@ -100,7 +106,7 @@ prints out the list properly."#
                         use_color,
                         separator_param,
                         env_str,
-                        use_grid_icons,
+                        icons_param,
                         cwd.as_ref(),
                     )?)
                 } else {
@@ -123,7 +129,7 @@ prints out the list properly."#
                     use_color,
                     separator_param,
                     env_str,
-                    use_grid_icons,
+                    icons_param,
                     cwd.as_ref(),
                 )?)
             }
@@ -162,6 +168,11 @@ prints out the list properly."#
                 example: "[[name patch]; [0.1.0 false] [0.1.1 true] [0.2.0 false]] | grid",
                 result: Some(Value::test_string("0.1.0 │ 0.1.1 │ 0.2.0\n")),
             },
+            Example {
+                description: "Render a table with 'name' column in it to a grid with icons and colors",
+                example: "[[name patch]; [Cargo.toml false] [README.md true] [SECURITY.md false]] | grid --icons --color",
+                result: None,
+            },
         ]
     }
 }
@@ -174,7 +185,7 @@ fn create_grid_output(
     use_color: bool,
     separator_param: Option<String>,
     env_str: Option<String>,
-    use_grid_icons: bool,
+    icons_param: bool,
     cwd: &Path,
 ) -> Result<PipelineData, ShellError> {
     let ls_colors = get_ls_colors(env_str);
@@ -201,7 +212,7 @@ fn create_grid_output(
         // only output value if the header name is 'name'
         if header == "name" {
             if use_color {
-                if use_grid_icons {
+                if icons_param {
                     let no_ansi = nu_utils::strip_ansi_unlikely(&value);
                     let path = cwd.join(no_ansi.as_ref());
                     let icon = icon_for_file(&path, call.head)?;
@@ -232,6 +243,14 @@ fn create_grid_output(
                     cell.alignment = Alignment::Left;
                     grid.add(cell);
                 }
+            } else if icons_param {
+                let no_ansi = nu_utils::strip_ansi_unlikely(&value);
+                let path = cwd.join(no_ansi.as_ref());
+                let icon = icon_for_file(&path, call.head)?;
+                let item = format!("{} {}", String::from(icon), value);
+                let mut cell = Cell::from(item);
+                cell.alignment = Alignment::Left;
+                grid.add(cell);
             } else {
                 let mut cell = Cell::from(value);
                 cell.alignment = Alignment::Left;
diff --git a/crates/nu-command/tests/commands/table.rs b/crates/nu-command/tests/commands/table.rs
index f73cce6540..24484b1206 100644
--- a/crates/nu-command/tests/commands/table.rs
+++ b/crates/nu-command/tests/commands/table.rs
@@ -1362,7 +1362,7 @@ fn test_expand_big_0() {
 
 #[test]
 fn table_expande_with_no_header_internally_0() {
-    let nu_value = r##"{ "config            ": { "ls": { "use_ls_colors": true, "clickable_links": false }, "rm": { "always_trash": false }, "cd": { "abbreviations": false }, "table": { "mode": "rounded", "index_mode": "always", "trim": { "methodology": "wrapping", "wrapping_try_keep_words": true, "truncating_suffix": "..." } }, "explore": { "help_banner": true, "exit_esc": true, "command_bar_text": "#C4C9C6", "status_bar_background": { "fg": "#1D1F21", "bg": "#C4C9C6" }, "highlight": { "bg": "yellow", "fg": "black" }, "status": {}, "try": {}, "table": { "split_line": "#404040", "cursor": true, "line_index": true, "line_shift": true, "line_head_top": true, "line_head_bottom": true, "show_head": true, "show_index": true }, "config": { "cursor_color": { "bg": "yellow", "fg": "black" } } }, "history": { "max_size": 10000, "sync_on_enter": true, "file_format": "plaintext" }, "completions": { "case_sensitive": false, "quick": true, "partial": true, "algorithm": "prefix", "external": { "enable": true, "max_results": 100, "completer": null } }, "filesize": { "metric": true, "format": "auto" }, "cursor_shape": { "emacs": "line", "vi_insert": "block", "vi_normal": "underscore" }, "color_config": { "separator": "white", "leading_trailing_space_bg": { "attr": "n" }, "header": "green_bold", "empty": "blue", "bool": null, "int": "white", "filesize": null, "duration": "white", "date": null, "range": "white", "float": "white", "string": "white", "nothing": "white", "binary": "white", "cell-path": "white", "row_index": "green_bold", "record": "white", "list": "white", "block": "white", "hints": "dark_gray", "search_result": {"fg": "white", "bg": "red"}, "shape_and": "purple_bold", "shape_binary": "purple_bold", "shape_block": "blue_bold", "shape_bool": "light_cyan", "shape_custom": "green", "shape_datetime": "cyan_bold", "shape_directory": "cyan", "shape_external": "cyan", "shape_externalarg": "green_bold", "shape_filepath": "cyan", "shape_flag": "blue_bold", "shape_float": "purple_bold", "shape_garbage": { "fg": "#FFFFFF", "bg": "#FF0000", "attr": "b" }, "shape_globpattern": "cyan_bold", "shape_int": "purple_bold", "shape_internalcall": "cyan_bold", "shape_list": "cyan_bold", "shape_literal": "blue", "shape_matching_brackets": { "attr": "u" }, "shape_nothing": "light_cyan", "shape_operator": "yellow", "shape_or": "purple_bold", "shape_pipe": "purple_bold", "shape_range": "yellow_bold", "shape_record": "cyan_bold", "shape_redirection": "purple_bold", "shape_signature": "green_bold", "shape_string": "green", "shape_string_interpolation": "cyan_bold", "shape_table": "blue_bold", "shape_variable": "purple" }, "use_grid_icons": true, "footer_mode": "25", "float_precision": 2, "use_ansi_coloring": true, "edit_mode": "emacs", "shell_integration": true, "show_banner": true, "render_right_prompt_on_last_line": false, "hooks": { "pre_prompt": [ null ], "pre_execution": [ null ], "env_change": { "PWD": [ null ] }, "display_output": null }, "menus": [ { "name": "completion_menu", "only_buffer_difference": false, "marker": "| ", "type": { "layout": "columnar", "columns": 4, "col_width": 20, "col_padding": 2 }, "style": { "text": "green", "selected_text": "green_reverse", "description_text": "yellow" } }, { "name": "history_menu", "only_buffer_difference": true, "marker": "? ", "type": { "layout": "list", "page_size": 10 }, "style": { "text": "green", "selected_text": "green_reverse", "description_text": "yellow" } }, { "name": "help_menu", "only_buffer_difference": true, "marker": "? ", "type": { "layout": "description", "columns": 4, "col_width": 20, "col_padding": 2, "selection_rows": 4, "description_rows": 10 }, "style": { "text": "green", "selected_text": "green_reverse", "description_text": "yellow" } }, { "name": "commands_menu", "only_buffer_difference": false, "marker": "# ", "type": { "layout": "columnar", "columns": 4, "col_width": 20, "col_padding": 2 }, "style": { "text": "green", "selected_text": "green_reverse", "description_text": "yellow" }, "source": null }, { "name": "vars_menu", "only_buffer_difference": true, "marker": "# ", "type": { "layout": "list", "page_size": 10 }, "style": { "text": "green", "selected_text": "green_reverse", "description_text": "yellow" }, "source": null }, { "name": "commands_with_description", "only_buffer_difference": true, "marker": "# ", "type": { "layout": "description", "columns": 4, "col_width": 20, "col_padding": 2, "selection_rows": 4, "description_rows": 10 }, "style": { "text": "green", "selected_text": "green_reverse", "description_text": "yellow" }, "source": null } ], "keybindings": [ { "name": "completion_menu", "modifier": "none", "keycode": "tab", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "until": [ { "send": "menu", "name": "completion_menu" }, { "send": "menunext" } ] } }, { "name": "completion_previous", "modifier": "shift", "keycode": "backtab", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "send": "menuprevious" } }, { "name": "history_menu", "modifier": "control", "keycode": "char_r", "mode": "emacs", "event": { "send": "menu", "name": "history_menu" } }, { "name": "next_page", "modifier": "control", "keycode": "char_x", "mode": "emacs", "event": { "send": "menupagenext" } }, { "name": "undo_or_previous_page", "modifier": "control", "keycode": "char_z", "mode": "emacs", "event": { "until": [ { "send": "menupageprevious" }, { "edit": "undo" } ] } }, { "name": "yank", "modifier": "control", "keycode": "char_y", "mode": "emacs", "event": { "until": [ { "edit": "pastecutbufferafter" } ] } }, { "name": "unix-line-discard", "modifier": "control", "keycode": "char_u", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "until": [ { "edit": "cutfromlinestart" } ] } }, { "name": "kill-line", "modifier": "control", "keycode": "char_k", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "until": [ { "edit": "cuttolineend" } ] } }, { "name": "commands_menu", "modifier": "control", "keycode": "char_t", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "send": "menu", "name": "commands_menu" } }, { "name": "vars_menu", "modifier": "alt", "keycode": "char_o", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "send": "menu", "name": "vars_menu" } }, { "name": "commands_with_description", "modifier": "control", "keycode": "char_s", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "send": "menu", "name": "commands_with_description" } } ] } }"##;
+    let nu_value = r##"{ "config            ": { "ls": { "use_ls_colors": true, "clickable_links": false }, "rm": { "always_trash": false }, "cd": { "abbreviations": false }, "table": { "mode": "rounded", "index_mode": "always", "trim": { "methodology": "wrapping", "wrapping_try_keep_words": true, "truncating_suffix": "..." } }, "explore": { "help_banner": true, "exit_esc": true, "command_bar_text": "#C4C9C6", "status_bar_background": { "fg": "#1D1F21", "bg": "#C4C9C6" }, "highlight": { "bg": "yellow", "fg": "black" }, "status": {}, "try": {}, "table": { "split_line": "#404040", "cursor": true, "line_index": true, "line_shift": true, "line_head_top": true, "line_head_bottom": true, "show_head": true, "show_index": true }, "config": { "cursor_color": { "bg": "yellow", "fg": "black" } } }, "history": { "max_size": 10000, "sync_on_enter": true, "file_format": "plaintext" }, "completions": { "case_sensitive": false, "quick": true, "partial": true, "algorithm": "prefix", "external": { "enable": true, "max_results": 100, "completer": null } }, "filesize": { "metric": true, "format": "auto" }, "cursor_shape": { "emacs": "line", "vi_insert": "block", "vi_normal": "underscore" }, "color_config": { "separator": "white", "leading_trailing_space_bg": { "attr": "n" }, "header": "green_bold", "empty": "blue", "bool": null, "int": "white", "filesize": null, "duration": "white", "date": null, "range": "white", "float": "white", "string": "white", "nothing": "white", "binary": "white", "cell-path": "white", "row_index": "green_bold", "record": "white", "list": "white", "block": "white", "hints": "dark_gray", "search_result": {"fg": "white", "bg": "red"}, "shape_and": "purple_bold", "shape_binary": "purple_bold", "shape_block": "blue_bold", "shape_bool": "light_cyan", "shape_custom": "green", "shape_datetime": "cyan_bold", "shape_directory": "cyan", "shape_external": "cyan", "shape_externalarg": "green_bold", "shape_filepath": "cyan", "shape_flag": "blue_bold", "shape_float": "purple_bold", "shape_garbage": { "fg": "#FFFFFF", "bg": "#FF0000", "attr": "b" }, "shape_globpattern": "cyan_bold", "shape_int": "purple_bold", "shape_internalcall": "cyan_bold", "shape_list": "cyan_bold", "shape_literal": "blue", "shape_matching_brackets": { "attr": "u" }, "shape_nothing": "light_cyan", "shape_operator": "yellow", "shape_or": "purple_bold", "shape_pipe": "purple_bold", "shape_range": "yellow_bold", "shape_record": "cyan_bold", "shape_redirection": "purple_bold", "shape_signature": "green_bold", "shape_string": "green", "shape_string_interpolation": "cyan_bold", "shape_table": "blue_bold", "shape_variable": "purple" }, "footer_mode": "25", "float_precision": 2, "use_ansi_coloring": true, "edit_mode": "emacs", "shell_integration": true, "show_banner": true, "render_right_prompt_on_last_line": false, "hooks": { "pre_prompt": [ null ], "pre_execution": [ null ], "env_change": { "PWD": [ null ] }, "display_output": null }, "menus": [ { "name": "completion_menu", "only_buffer_difference": false, "marker": "| ", "type": { "layout": "columnar", "columns": 4, "col_width": 20, "col_padding": 2 }, "style": { "text": "green", "selected_text": "green_reverse", "description_text": "yellow" } }, { "name": "history_menu", "only_buffer_difference": true, "marker": "? ", "type": { "layout": "list", "page_size": 10 }, "style": { "text": "green", "selected_text": "green_reverse", "description_text": "yellow" } }, { "name": "help_menu", "only_buffer_difference": true, "marker": "? ", "type": { "layout": "description", "columns": 4, "col_width": 20, "col_padding": 2, "selection_rows": 4, "description_rows": 10 }, "style": { "text": "green", "selected_text": "green_reverse", "description_text": "yellow" } }, { "name": "commands_menu", "only_buffer_difference": false, "marker": "# ", "type": { "layout": "columnar", "columns": 4, "col_width": 20, "col_padding": 2 }, "style": { "text": "green", "selected_text": "green_reverse", "description_text": "yellow" }, "source": null }, { "name": "vars_menu", "only_buffer_difference": true, "marker": "# ", "type": { "layout": "list", "page_size": 10 }, "style": { "text": "green", "selected_text": "green_reverse", "description_text": "yellow" }, "source": null }, { "name": "commands_with_description", "only_buffer_difference": true, "marker": "# ", "type": { "layout": "description", "columns": 4, "col_width": 20, "col_padding": 2, "selection_rows": 4, "description_rows": 10 }, "style": { "text": "green", "selected_text": "green_reverse", "description_text": "yellow" }, "source": null } ], "keybindings": [ { "name": "completion_menu", "modifier": "none", "keycode": "tab", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "until": [ { "send": "menu", "name": "completion_menu" }, { "send": "menunext" } ] } }, { "name": "completion_previous", "modifier": "shift", "keycode": "backtab", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "send": "menuprevious" } }, { "name": "history_menu", "modifier": "control", "keycode": "char_r", "mode": "emacs", "event": { "send": "menu", "name": "history_menu" } }, { "name": "next_page", "modifier": "control", "keycode": "char_x", "mode": "emacs", "event": { "send": "menupagenext" } }, { "name": "undo_or_previous_page", "modifier": "control", "keycode": "char_z", "mode": "emacs", "event": { "until": [ { "send": "menupageprevious" }, { "edit": "undo" } ] } }, { "name": "yank", "modifier": "control", "keycode": "char_y", "mode": "emacs", "event": { "until": [ { "edit": "pastecutbufferafter" } ] } }, { "name": "unix-line-discard", "modifier": "control", "keycode": "char_u", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "until": [ { "edit": "cutfromlinestart" } ] } }, { "name": "kill-line", "modifier": "control", "keycode": "char_k", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "until": [ { "edit": "cuttolineend" } ] } }, { "name": "commands_menu", "modifier": "control", "keycode": "char_t", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "send": "menu", "name": "commands_menu" } }, { "name": "vars_menu", "modifier": "alt", "keycode": "char_o", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "send": "menu", "name": "vars_menu" } }, { "name": "commands_with_description", "modifier": "control", "keycode": "char_s", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "send": "menu", "name": "commands_with_description" } } ] } }"##;
 
     let actual = nu!(format!("{} | table --expand --width 141", nu_value.trim()));
 
@@ -1511,7 +1511,6 @@ fn table_expande_with_no_header_internally_0() {
             "│                    │ │                                  │ │ shape_table                │ blue_bold          │                           │ │",
             "│                    │ │                                  │ │ shape_variable             │ purple             │                           │ │",
             "│                    │ │                                  │ ╰────────────────────────────┴────────────────────╯                           │ │",
-            "│                    │ │ use_grid_icons                   │ true                                                                          │ │",
             "│                    │ │ footer_mode                      │ 25                                                                            │ │",
             "│                    │ │ float_precision                  │ 2                                                                             │ │",
             "│                    │ │ use_ansi_coloring                │ true                                                                          │ │",
@@ -1608,7 +1607,7 @@ fn table_expande_with_no_header_internally_0() {
 
 #[test]
 fn table_expande_with_no_header_internally_1() {
-    let nu_value = r##"{ "config            ": { "ls": { "use_ls_colors": true, "clickable_links": false }, "rm": { "always_trash": false }, "cd": { "abbreviations": false }, "table": { "mode": "rounded", "index_mode": "always", "trim": { "methodology": "wrapping", "wrapping_try_keep_words": true, "truncating_suffix": "..." } }, "explore": { "help_banner": true, "exit_esc": true, "command_bar_text": "#C4C9C6", "status_bar_background": { "fg": "#1D1F21", "bg": "#C4C9C6" }, "highlight": { "bg": "yellow", "fg": "black" }, "status": {}, "try": {}, "table": { "split_line": "#404040", "cursor": true, "line_index": true, "line_shift": true, "line_head_top": true, "line_head_bottom": true, "show_head": true, "show_index": true }, "config": { "cursor_color": { "bg": "yellow", "fg": "black" } } }, "history": { "max_size": 10000, "sync_on_enter": true, "file_format": "plaintext" }, "completions": { "case_sensitive": false, "quick": true, "partial": true, "algorithm": "prefix", "external": { "enable": true, "max_results": 100, "completer": null } }, "filesize": { "metric": true, "format": "auto" }, "cursor_shape": { "emacs": "line", "vi_insert": "block", "vi_normal": "underscore" }, "color_config": { "separator": "white", "leading_trailing_space_bg": { "attr": "n" }, "header": "green_bold", "empty": "blue", "bool": null, "int": "white", "filesize": null, "duration": "white", "date": null, "range": "white", "float": "white", "string": "white", "nothing": "white", "binary": "white", "cell-path": "white", "row_index": "green_bold", "record": "white", "list": "white", "block": "white", "hints": "dark_gray", "search_result": {"fg": "white", "bg": "red"}, "shape_and": "purple_bold", "shape_binary": "purple_bold", "shape_block": "blue_bold", "shape_bool": "light_cyan", "shape_custom": "green", "shape_datetime": "cyan_bold", "shape_directory": "cyan", "shape_external": "cyan", "shape_externalarg": "green_bold", "shape_filepath": "cyan", "shape_flag": "blue_bold", "shape_float": "purple_bold", "shape_garbage": { "fg": "#FFFFFF", "bg": "#FF0000", "attr": "b" }, "shape_globpattern": "cyan_bold", "shape_int": "purple_bold", "shape_internalcall": "cyan_bold", "shape_list": "cyan_bold", "shape_literal": "blue", "shape_matching_brackets": { "attr": "u" }, "shape_nothing": "light_cyan", "shape_operator": "yellow", "shape_or": "purple_bold", "shape_pipe": "purple_bold", "shape_range": "yellow_bold", "shape_record": "cyan_bold", "shape_redirection": "purple_bold", "shape_signature": "green_bold", "shape_string": "green", "shape_string_interpolation": "cyan_bold", "shape_table": "blue_bold", "shape_variable": "purple" }, "use_grid_icons": true, "footer_mode": "25", "float_precision": 2, "use_ansi_coloring": true, "edit_mode": "emacs", "shell_integration": true, "show_banner": true, "render_right_prompt_on_last_line": false, "hooks": { "pre_prompt": [ null ], "pre_execution": [ null ], "env_change": { "PWD": [ null ] }, "display_output": null }, "menus": [ { "name": "completion_menu", "only_buffer_difference": false, "marker": "| ", "type": { "layout": "columnar", "columns": 4, "col_width": 20, "col_padding": 2 }, "style": { "text": "green", "selected_text": "green_reverse", "description_text": "yellow" } }, { "name": "history_menu", "only_buffer_difference": true, "marker": "? ", "type": { "layout": "list", "page_size": 10 }, "style": { "text": "green", "selected_text": "green_reverse", "description_text": "yellow" } }, { "name": "help_menu", "only_buffer_difference": true, "marker": "? ", "type": { "layout": "description", "columns": 4, "col_width": 20, "col_padding": 2, "selection_rows": 4, "description_rows": 10 }, "style": { "text": "green", "selected_text": "green_reverse", "description_text": "yellow" } }, { "name": "commands_menu", "only_buffer_difference": false, "marker": "# ", "type": { "layout": "columnar", "columns": 4, "col_width": 20, "col_padding": 2 }, "style": { "text": "green", "selected_text": "green_reverse", "description_text": "yellow" }, "source": null }, { "name": "vars_menu", "only_buffer_difference": true, "marker": "# ", "type": { "layout": "list", "page_size": 10 }, "style": { "text": "green", "selected_text": "green_reverse", "description_text": "yellow" }, "source": null }, { "name": "commands_with_description", "only_buffer_difference": true, "marker": "# ", "type": { "layout": "description", "columns": 4, "col_width": 20, "col_padding": 2, "selection_rows": 4, "description_rows": 10 }, "style": { "text": "green", "selected_text": "green_reverse", "description_text": "yellow" }, "source": null } ], "keybindings": [ { "name": "completion_menu", "modifier": "none", "keycode": "tab", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "until": [ { "send": "menu", "name": "completion_menu" }, { "send": "menunext" } ] } }, { "name": "completion_previous", "modifier": "shift", "keycode": "backtab", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "send": "menuprevious" } }, { "name": "history_menu", "modifier": "control", "keycode": "char_r", "mode": "emacs", "event": { "send": "menu", "name": "history_menu" } }, { "name": "next_page", "modifier": "control", "keycode": "char_x", "mode": "emacs", "event": { "send": "menupagenext" } }, { "name": "undo_or_previous_page", "modifier": "control", "keycode": "char_z", "mode": "emacs", "event": { "until": [ { "send": "menupageprevious" }, { "edit": "undo" } ] } }, { "name": "yank", "modifier": "control", "keycode": "char_y", "mode": "emacs", "event": { "until": [ { "edit": "pastecutbufferafter" } ] } }, { "name": "unix-line-discard", "modifier": "control", "keycode": "char_u", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "until": [ { "edit": "cutfromlinestart" } ] } }, { "name": "kill-line", "modifier": "control", "keycode": "char_k", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "until": [ { "edit": "cuttolineend" } ] } }, { "name": "commands_menu", "modifier": "control", "keycode": "char_t", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "send": "menu", "name": "commands_menu" } }, { "name": "vars_menu", "modifier": "alt", "keycode": "char_o", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "send": "menu", "name": "vars_menu" } }, { "name": "commands_with_description", "modifier": "control", "keycode": "char_s", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "send": "menu", "name": "commands_with_description" } } ] } }"##;
+    let nu_value = r##"{ "config            ": { "ls": { "use_ls_colors": true, "clickable_links": false }, "rm": { "always_trash": false }, "cd": { "abbreviations": false }, "table": { "mode": "rounded", "index_mode": "always", "trim": { "methodology": "wrapping", "wrapping_try_keep_words": true, "truncating_suffix": "..." } }, "explore": { "help_banner": true, "exit_esc": true, "command_bar_text": "#C4C9C6", "status_bar_background": { "fg": "#1D1F21", "bg": "#C4C9C6" }, "highlight": { "bg": "yellow", "fg": "black" }, "status": {}, "try": {}, "table": { "split_line": "#404040", "cursor": true, "line_index": true, "line_shift": true, "line_head_top": true, "line_head_bottom": true, "show_head": true, "show_index": true }, "config": { "cursor_color": { "bg": "yellow", "fg": "black" } } }, "history": { "max_size": 10000, "sync_on_enter": true, "file_format": "plaintext" }, "completions": { "case_sensitive": false, "quick": true, "partial": true, "algorithm": "prefix", "external": { "enable": true, "max_results": 100, "completer": null } }, "filesize": { "metric": true, "format": "auto" }, "cursor_shape": { "emacs": "line", "vi_insert": "block", "vi_normal": "underscore" }, "color_config": { "separator": "white", "leading_trailing_space_bg": { "attr": "n" }, "header": "green_bold", "empty": "blue", "bool": null, "int": "white", "filesize": null, "duration": "white", "date": null, "range": "white", "float": "white", "string": "white", "nothing": "white", "binary": "white", "cell-path": "white", "row_index": "green_bold", "record": "white", "list": "white", "block": "white", "hints": "dark_gray", "search_result": {"fg": "white", "bg": "red"}, "shape_and": "purple_bold", "shape_binary": "purple_bold", "shape_block": "blue_bold", "shape_bool": "light_cyan", "shape_custom": "green", "shape_datetime": "cyan_bold", "shape_directory": "cyan", "shape_external": "cyan", "shape_externalarg": "green_bold", "shape_filepath": "cyan", "shape_flag": "blue_bold", "shape_float": "purple_bold", "shape_garbage": { "fg": "#FFFFFF", "bg": "#FF0000", "attr": "b" }, "shape_globpattern": "cyan_bold", "shape_int": "purple_bold", "shape_internalcall": "cyan_bold", "shape_list": "cyan_bold", "shape_literal": "blue", "shape_matching_brackets": { "attr": "u" }, "shape_nothing": "light_cyan", "shape_operator": "yellow", "shape_or": "purple_bold", "shape_pipe": "purple_bold", "shape_range": "yellow_bold", "shape_record": "cyan_bold", "shape_redirection": "purple_bold", "shape_signature": "green_bold", "shape_string": "green", "shape_string_interpolation": "cyan_bold", "shape_table": "blue_bold", "shape_variable": "purple" }, "footer_mode": "25", "float_precision": 2, "use_ansi_coloring": true, "edit_mode": "emacs", "shell_integration": true, "show_banner": true, "render_right_prompt_on_last_line": false, "hooks": { "pre_prompt": [ null ], "pre_execution": [ null ], "env_change": { "PWD": [ null ] }, "display_output": null }, "menus": [ { "name": "completion_menu", "only_buffer_difference": false, "marker": "| ", "type": { "layout": "columnar", "columns": 4, "col_width": 20, "col_padding": 2 }, "style": { "text": "green", "selected_text": "green_reverse", "description_text": "yellow" } }, { "name": "history_menu", "only_buffer_difference": true, "marker": "? ", "type": { "layout": "list", "page_size": 10 }, "style": { "text": "green", "selected_text": "green_reverse", "description_text": "yellow" } }, { "name": "help_menu", "only_buffer_difference": true, "marker": "? ", "type": { "layout": "description", "columns": 4, "col_width": 20, "col_padding": 2, "selection_rows": 4, "description_rows": 10 }, "style": { "text": "green", "selected_text": "green_reverse", "description_text": "yellow" } }, { "name": "commands_menu", "only_buffer_difference": false, "marker": "# ", "type": { "layout": "columnar", "columns": 4, "col_width": 20, "col_padding": 2 }, "style": { "text": "green", "selected_text": "green_reverse", "description_text": "yellow" }, "source": null }, { "name": "vars_menu", "only_buffer_difference": true, "marker": "# ", "type": { "layout": "list", "page_size": 10 }, "style": { "text": "green", "selected_text": "green_reverse", "description_text": "yellow" }, "source": null }, { "name": "commands_with_description", "only_buffer_difference": true, "marker": "# ", "type": { "layout": "description", "columns": 4, "col_width": 20, "col_padding": 2, "selection_rows": 4, "description_rows": 10 }, "style": { "text": "green", "selected_text": "green_reverse", "description_text": "yellow" }, "source": null } ], "keybindings": [ { "name": "completion_menu", "modifier": "none", "keycode": "tab", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "until": [ { "send": "menu", "name": "completion_menu" }, { "send": "menunext" } ] } }, { "name": "completion_previous", "modifier": "shift", "keycode": "backtab", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "send": "menuprevious" } }, { "name": "history_menu", "modifier": "control", "keycode": "char_r", "mode": "emacs", "event": { "send": "menu", "name": "history_menu" } }, { "name": "next_page", "modifier": "control", "keycode": "char_x", "mode": "emacs", "event": { "send": "menupagenext" } }, { "name": "undo_or_previous_page", "modifier": "control", "keycode": "char_z", "mode": "emacs", "event": { "until": [ { "send": "menupageprevious" }, { "edit": "undo" } ] } }, { "name": "yank", "modifier": "control", "keycode": "char_y", "mode": "emacs", "event": { "until": [ { "edit": "pastecutbufferafter" } ] } }, { "name": "unix-line-discard", "modifier": "control", "keycode": "char_u", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "until": [ { "edit": "cutfromlinestart" } ] } }, { "name": "kill-line", "modifier": "control", "keycode": "char_k", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "until": [ { "edit": "cuttolineend" } ] } }, { "name": "commands_menu", "modifier": "control", "keycode": "char_t", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "send": "menu", "name": "commands_menu" } }, { "name": "vars_menu", "modifier": "alt", "keycode": "char_o", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "send": "menu", "name": "vars_menu" } }, { "name": "commands_with_description", "modifier": "control", "keycode": "char_s", "mode": [ "emacs", "vi_normal", "vi_insert" ], "event": { "send": "menu", "name": "commands_with_description" } } ] } }"##;
 
     let actual = nu!(format!("{} | table --expand --width 136", nu_value.trim()));
 
@@ -1757,7 +1756,6 @@ fn table_expande_with_no_header_internally_1() {
             "│                    │ │                                  │ │ shape_table                │ blue_bold          │                      │ │",
             "│                    │ │                                  │ │ shape_variable             │ purple             │                      │ │",
             "│                    │ │                                  │ ╰────────────────────────────┴────────────────────╯                      │ │",
-            "│                    │ │ use_grid_icons                   │ true                                                                     │ │",
             "│                    │ │ footer_mode                      │ 25                                                                       │ │",
             "│                    │ │ float_precision                  │ 2                                                                        │ │",
             "│                    │ │ use_ansi_coloring                │ true                                                                     │ │",
diff --git a/crates/nu-protocol/src/config/mod.rs b/crates/nu-protocol/src/config/mod.rs
index ab98edf9db..2c2dd08277 100644
--- a/crates/nu-protocol/src/config/mod.rs
+++ b/crates/nu-protocol/src/config/mod.rs
@@ -47,7 +47,6 @@ pub struct Config {
     pub table: TableConfig,
     pub ls: LsConfig,
     pub color_config: HashMap<String, Value>,
-    pub use_grid_icons: bool,
     pub footer_mode: FooterMode,
     pub float_precision: i64,
     pub recursion_limit: i64,
@@ -104,7 +103,6 @@ impl Default for Config {
             cursor_shape: CursorShapeConfig::default(),
 
             color_config: HashMap::new(),
-            use_grid_icons: true,
             footer_mode: FooterMode::RowCount(25),
             float_precision: 2,
             buffer_editor: Value::nothing(Span::unknown()),
@@ -526,9 +524,6 @@ impl Value {
                         *value = config.color_config.clone().into_value(span);
                     }
                 }
-                "use_grid_icons" => {
-                    process_bool_config(value, &mut errors, &mut config.use_grid_icons);
-                }
                 "footer_mode" => {
                     process_string_enum(
                         &mut config.footer_mode,
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index 32ddbcf511..2165dc5288 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -227,7 +227,6 @@ $env.config = {
     }
 
     color_config: $dark_theme # if you want a more interesting theme, you can replace the empty record with `$dark_theme`, `$light_theme` or another custom record
-    use_grid_icons: true
     footer_mode: 25 # always, never, number_of_rows, auto
     float_precision: 2 # the precision for displaying floats in tables
     buffer_editor: null # command that will be used to edit the current line buffer with ctrl+o, if unset fallback to $env.EDITOR and $env.VISUAL

From 2d360fda7f14654eab5483a27116d9d1a41e6fff Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Thu, 5 Sep 2024 16:29:50 -0700
Subject: [PATCH 0416/1072] String values should pass their content-type
 correctly on http requests with a body (e.g. http post) (#13731)

# Description
The content-type was not being handled appropriately when sending
requests with a string value.

# User-Facing Changes
- Passing a string value through a pipeline with a content-type set as
metadata is handled correctly
- Passing a string value as a parameter with a content-type set as a
flag is handled correctly.
---
 crates/nu-command/src/network/http/client.rs  | 38 +++++++++++++------
 crates/nu-command/src/network/http/patch.rs   |  2 +-
 crates/nu-command/src/network/http/post.rs    |  2 +-
 crates/nu-command/src/network/http/put.rs     |  2 +-
 .../tests/commands/network/http/post.rs       | 20 +++++++++-
 5 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/crates/nu-command/src/network/http/client.rs b/crates/nu-command/src/network/http/client.rs
index 7afd114024..3729b37a43 100644
--- a/crates/nu-command/src/network/http/client.rs
+++ b/crates/nu-command/src/network/http/client.rs
@@ -7,6 +7,7 @@ use base64::{
 use multipart_rs::MultipartWriter;
 use nu_engine::command_prelude::*;
 use nu_protocol::{ByteStream, LabeledError, Signals};
+use serde_json::Value as JsonValue;
 use std::{
     collections::HashMap,
     io::Cursor,
@@ -257,24 +258,37 @@ fn send_json_request(
     span: Span,
     signals: &Signals,
 ) -> Result<Response, ShellErrorOrRequestError> {
-    let data = match body {
+    match body {
         Value::Int { .. } | Value::List { .. } | Value::Record { .. } => {
-            value_to_json_value(&body)?
+            let data = value_to_json_value(&body)?;
+            send_cancellable_request(request_url, Box::new(|| req.send_json(data)), span, signals)
         }
         // If the body type is string, assume it is string json content.
         // If parsing fails, just send the raw string
         Value::String { val: s, .. } => {
-            serde_json::from_str(&s).unwrap_or_else(|_| nu_json::Value::String(s))
+            if let Ok(jvalue) = serde_json::from_str::<JsonValue>(&s) {
+                send_cancellable_request(
+                    request_url,
+                    Box::new(|| req.send_json(jvalue)),
+                    span,
+                    signals,
+                )
+            } else {
+                let data = serde_json::from_str(&s).unwrap_or_else(|_| nu_json::Value::String(s));
+                send_cancellable_request(
+                    request_url,
+                    Box::new(|| req.send_json(data)),
+                    span,
+                    signals,
+                )
+            }
         }
-        _ => {
-            return Err(ShellErrorOrRequestError::ShellError(
-                ShellError::UnsupportedHttpBody {
-                    msg: format!("Accepted types: [Int, List, String, Record]. Check: {HTTP_DOCS}"),
-                },
-            ))
-        }
-    };
-    send_cancellable_request(request_url, Box::new(|| req.send_json(data)), span, signals)
+        _ => Err(ShellErrorOrRequestError::ShellError(
+            ShellError::UnsupportedHttpBody {
+                msg: format!("Accepted types: [Int, List, String, Record]. Check: {HTTP_DOCS}"),
+            },
+        )),
+    }
 }
 
 fn send_form_request(
diff --git a/crates/nu-command/src/network/http/patch.rs b/crates/nu-command/src/network/http/patch.rs
index 09741c7492..eeebaf55a8 100644
--- a/crates/nu-command/src/network/http/patch.rs
+++ b/crates/nu-command/src/network/http/patch.rs
@@ -126,7 +126,7 @@ impl Command for SubCommand {
             },
             Example {
                 description: "Patch JSON content from a pipeline to example.com",
-                example: "open foo.json | http patch https://www.example.com",
+                example: "open --raw foo.json | http patch https://www.example.com",
                 result: None,
             },
         ]
diff --git a/crates/nu-command/src/network/http/post.rs b/crates/nu-command/src/network/http/post.rs
index f57953ea42..f38f7aeed3 100644
--- a/crates/nu-command/src/network/http/post.rs
+++ b/crates/nu-command/src/network/http/post.rs
@@ -124,7 +124,7 @@ impl Command for SubCommand {
             },
             Example {
                 description: "Post JSON content from a pipeline to example.com",
-                example: "open foo.json | http post https://www.example.com",
+                example: "open --raw foo.json | http post https://www.example.com",
                 result: None,
             },
             Example {
diff --git a/crates/nu-command/src/network/http/put.rs b/crates/nu-command/src/network/http/put.rs
index ea7c722c4c..0494f5ea0e 100644
--- a/crates/nu-command/src/network/http/put.rs
+++ b/crates/nu-command/src/network/http/put.rs
@@ -124,7 +124,7 @@ impl Command for SubCommand {
             },
             Example {
                 description: "Put JSON content from a pipeline to example.com",
-                example: "open foo.json | http put https://www.example.com",
+                example: "open --raw foo.json | http put https://www.example.com",
                 result: None,
             },
         ]
diff --git a/crates/nu-command/tests/commands/network/http/post.rs b/crates/nu-command/tests/commands/network/http/post.rs
index 6fbcb03b69..44dde270c1 100644
--- a/crates/nu-command/tests/commands/network/http/post.rs
+++ b/crates/nu-command/tests/commands/network/http/post.rs
@@ -115,6 +115,24 @@ fn http_post_json_is_success() {
     assert!(actual.out.is_empty())
 }
 
+#[test]
+fn http_post_json_string_is_success() {
+    let mut server = Server::new();
+
+    let mock = server
+        .mock("POST", "/")
+        .match_body(r#"{"foo":"bar"}"#)
+        .create();
+
+    let actual = nu!(format!(
+        r#"http post -t 'application/json' {url} '{{"foo":"bar"}}'"#,
+        url = server.url()
+    ));
+
+    mock.assert();
+    assert!(actual.out.is_empty())
+}
+
 #[test]
 fn http_post_json_list_is_success() {
     let mut server = Server::new();
@@ -149,7 +167,7 @@ fn http_post_json_int_is_success() {
 }
 
 #[test]
-fn http_post_json_string_is_success() {
+fn http_post_json_raw_string_is_success() {
     let mut server = Server::new();
 
     let mock = server.mock("POST", "/").match_body(r#""test""#).create();

From 3d20c53904ad2eb62d19c2980f4593c1ed6346f7 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Fri, 6 Sep 2024 19:39:52 +0800
Subject: [PATCH 0417/1072] make a user friendly message when `use_grid_icons`
 is used in config (#13795)

# Description
After merging #13788, I get an error message which says that
`use_grid_icons` is invalid.

I think it's good to report the specific error, and guide user to delete
it.
---
 crates/nu-protocol/src/config/mod.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/crates/nu-protocol/src/config/mod.rs b/crates/nu-protocol/src/config/mod.rs
index 2c2dd08277..b6f98ed883 100644
--- a/crates/nu-protocol/src/config/mod.rs
+++ b/crates/nu-protocol/src/config/mod.rs
@@ -524,6 +524,14 @@ impl Value {
                         *value = config.color_config.clone().into_value(span);
                     }
                 }
+                "use_grid_icons" => {
+                    // TODO: delete it after 0.99
+                    report_invalid_value(
+                        "`use_grid_icons` is deleted, you should delete the key, and use `grid -i` in such case.",
+                        span,
+                        &mut errors
+                    );
+                }
                 "footer_mode" => {
                     process_string_enum(
                         &mut config.footer_mode,

From edd69aa2833a0445ff0e9080ed79aae01578c1c2 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Fri, 6 Sep 2024 09:57:45 -0500
Subject: [PATCH 0418/1072] update the latest reedline (#13797)

# Description

I swear, I only did `cargo update -p reedline`. However, I feel down the
dependency rabbit hole. We need to get nushell on crossterm 28.1 and
ratatui on 28.1 but we can't because tabled uses papergrid which uses an
older version of unicode-width that can't be upgraded apparently. Ugh.
I've opened an issue at the tabled repo about this.

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock | 35 ++++++++++++++++++++++++++---------
 Cargo.toml |  4 ++--
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index eca168dbe2..6206c85482 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -852,7 +852,7 @@ version = "7.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7"
 dependencies = [
- "crossterm",
+ "crossterm 0.27.0",
  "strum",
  "strum_macros",
  "unicode-width",
@@ -1027,6 +1027,22 @@ dependencies = [
  "libc",
  "mio 0.8.11",
  "parking_lot",
+ "signal-hook",
+ "signal-hook-mio",
+ "winapi",
+]
+
+[[package]]
+name = "crossterm"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
+dependencies = [
+ "bitflags 2.6.0",
+ "crossterm_winapi",
+ "mio 1.0.2",
+ "parking_lot",
+ "rustix",
  "serde",
  "signal-hook",
  "signal-hook-mio",
@@ -2749,6 +2765,7 @@ checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
 dependencies = [
  "hermit-abi 0.3.9",
  "libc",
+ "log",
  "wasi",
  "windows-sys 0.52.0",
 ]
@@ -2924,7 +2941,7 @@ name = "nu"
 version = "0.97.2"
 dependencies = [
  "assert_cmd",
- "crossterm",
+ "crossterm 0.28.1",
  "ctrlc",
  "dirs",
  "log",
@@ -2979,7 +2996,7 @@ name = "nu-cli"
 version = "0.97.2"
 dependencies = [
  "chrono",
- "crossterm",
+ "crossterm 0.28.1",
  "fancy-regex",
  "fuzzy-matcher",
  "is_executable",
@@ -3096,7 +3113,7 @@ dependencies = [
  "chrono",
  "chrono-humanize",
  "chrono-tz 0.8.6",
- "crossterm",
+ "crossterm 0.28.1",
  "csv",
  "data-encoding",
  "dialoguer",
@@ -3220,7 +3237,7 @@ version = "0.97.2"
 dependencies = [
  "ansi-str",
  "anyhow",
- "crossterm",
+ "crossterm 0.28.1",
  "log",
  "lscolors",
  "nu-ansi-term",
@@ -5030,7 +5047,7 @@ dependencies = [
  "bitflags 2.6.0",
  "cassowary",
  "compact_str",
- "crossterm",
+ "crossterm 0.27.0",
  "itertools 0.12.1",
  "lru",
  "paste",
@@ -5119,12 +5136,11 @@ dependencies = [
 [[package]]
 name = "reedline"
 version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc271368d0d3f395745b40fababc0c9061f3fc2978189a8bc76f889e47255b01"
+source = "git+https://github.com/nushell/reedline?branch=main#7af89595377fa59d2a6a2333718d60adf61c86b1"
 dependencies = [
  "arboard",
  "chrono",
- "crossterm",
+ "crossterm 0.28.1",
  "fd-lock",
  "itertools 0.12.1",
  "nu-ansi-term",
@@ -5737,6 +5753,7 @@ checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
 dependencies = [
  "libc",
  "mio 0.8.11",
+ "mio 1.0.2",
  "signal-hook",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 48bda05ba0..2bf290e96a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -77,7 +77,7 @@ chrono = { default-features = false, version = "0.4.34" }
 chrono-humanize = "0.2.3"
 chrono-tz = "0.8"
 crossbeam-channel = "0.5.8"
-crossterm = "0.27"
+crossterm = "0.28.1"
 csv = "1.3"
 ctrlc = "3.4"
 dialoguer = { default-features = false, version = "0.11" }
@@ -313,7 +313,7 @@ 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`

From f531cc20581c9e79b8469c74d16c7ff92083d8b5 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Fri, 6 Sep 2024 13:46:37 -0700
Subject: [PATCH 0419/1072] Polars command reorg (#13798)

# Description
House keeping. Restructures polars modules as discussed in:
https://docs.google.com/spreadsheets/d/1gyA58i_yTXKCJ5DbO_RxBNAlK6S7C1M22ppKwVLZltc/edit?usp=sharing
---
 .../aggregation}/aggregate.rs                 |   0
 .../aggregation/aggregation_commands.rs}      | 270 +----------
 .../aggregation}/cumulative.rs                |   2 +-
 .../{lazy => command/aggregation}/groupby.rs  |   0
 .../{lazy => command/aggregation}/median.rs   |   0
 .../src/dataframe/command/aggregation/mod.rs  |  44 ++
 .../{series => command/aggregation}/n_null.rs |   2 +-
 .../aggregation}/n_unique.rs                  |   2 +-
 .../{lazy => command/aggregation}/quantile.rs |   0
 .../aggregation}/rolling.rs                   |   3 +-
 .../aggregation}/value_counts.rs              |   5 +-
 .../{series => command/boolean}/all_false.rs  |   5 +-
 .../{series => command/boolean}/all_true.rs   |   5 +-
 .../indexes => command/boolean}/arg_true.rs   |   0
 .../src/dataframe/command/boolean/expr_not.rs |  21 +
 .../boolean}/is_duplicated.rs                 |   0
 .../{expressions => command/boolean}/is_in.rs |   0
 .../masks => command/boolean}/is_not_null.rs  |   0
 .../masks => command/boolean}/is_null.rs      |   0
 .../masks => command/boolean}/is_unique.rs    |   0
 .../src/dataframe/command/boolean/mod.rs      |  46 ++
 .../{series/masks => command/boolean}/not.rs  |   0
 .../boolean}/otherwise.rs                     |   0
 .../{series/masks => command/boolean}/set.rs  |   0
 .../{expressions => command/boolean}/when.rs  |   0
 .../src/dataframe/command/core/cache.rs       |  16 +
 .../{eager => command/core}/columns.rs        |   2 +-
 .../dataframe/{lazy => command/core}/fetch.rs |   0
 .../src/dataframe/command/core/mod.rs         |  39 ++
 .../dataframe/{eager => command/core}/open.rs |   3 +-
 .../{eager => command/core}/save/arrow.rs     |   2 +-
 .../{eager => command/core}/save/avro.rs      |   2 +-
 .../{eager => command/core}/save/csv.rs       |   2 +-
 .../{eager => command/core}/save/mod.rs       |   0
 .../{eager => command/core}/save/ndjson.rs    |   2 +-
 .../{eager => command/core}/save/parquet.rs   |   2 +-
 .../{eager => command/core}/schema.rs         |   0
 .../{eager => command/core}/shape.rs          |   2 +-
 .../{eager => command/core}/summary.rs        |   2 +-
 .../{eager => command/core}/to_df.rs          |   2 +-
 .../{lazy => command/core}/to_lazy.rs         |   2 +-
 .../{eager => command/core}/to_nu.rs          |   2 +-
 .../{expressions => command/data}/alias.rs    |   2 +-
 .../{eager => command/data}/append.rs         |   0
 .../data}/arg_where.rs                        |   0
 .../dataframe/{eager => command/data}/cast.rs |   2 +-
 .../{expressions => command/data}/col.rs      |   0
 .../{lazy => command/data}/collect.rs         |   0
 .../dataframe/{eager => command/data}/drop.rs |   4 +-
 .../data}/drop_duplicates.rs                  |   4 +-
 .../{eager => command/data}/drop_nulls.rs     |   4 +-
 .../{eager => command/data}/dummies.rs        |   2 +-
 .../{lazy => command/data}/explode.rs         |   0
 .../{lazy => command/data}/fill_nan.rs        |   0
 .../{lazy => command/data}/fill_null.rs       |   0
 .../{lazy => command/data}/filter.rs          |   0
 .../{eager => command/data}/filter_with.rs    |   2 +-
 .../{eager => command/data}/first.rs          |   2 +-
 .../{lazy => command/data}/flatten.rs         |   0
 .../dataframe/{eager => command/data}/get.rs  |   2 +-
 .../dataframe/{lazy => command/data}/join.rs  |   0
 .../dataframe/{eager => command/data}/last.rs |   2 +-
 .../{expressions => command/data}/lit.rs      |   0
 .../src/dataframe/command/data/mod.rs         | 109 +++++
 .../{eager => command/data}/pivot.rs          |   4 +-
 .../{eager => command/data}/query_df.rs       |   5 +-
 .../{eager => command/data}/rename.rs         |   2 +-
 .../src/dataframe/command/data/reverse.rs     |  37 ++
 .../{eager => command/data}/sample.rs         |   2 +-
 .../{lazy => command/data}/select.rs          |   0
 .../{series => command/data}/shift.rs         |   2 +-
 .../{eager => command/data}/slice.rs          |   2 +-
 .../{lazy => command/data}/sort_by_expr.rs    |   2 +-
 .../{eager => command/data}/sql_context.rs    |   2 +-
 .../{eager => command/data}/sql_expr.rs       |   0
 .../dataframe/{eager => command/data}/take.rs |   2 +-
 .../{series => command/data}/unique.rs        |   2 +-
 .../{eager => command/data}/unpivot.rs        |   2 +-
 .../{eager => command/data}/with_column.rs    |   2 +-
 .../date => command/datetime}/as_date.rs      |   0
 .../date => command/datetime}/as_datetime.rs  |   0
 .../datetime}/datepart.rs                     |   2 +-
 .../date => command/datetime}/get_day.rs      |   0
 .../date => command/datetime}/get_hour.rs     |   0
 .../date => command/datetime}/get_minute.rs   |   0
 .../date => command/datetime}/get_month.rs    |   0
 .../datetime}/get_nanosecond.rs               |   0
 .../date => command/datetime}/get_ordinal.rs  |   0
 .../date => command/datetime}/get_second.rs   |   0
 .../date => command/datetime}/get_week.rs     |   0
 .../date => command/datetime}/get_weekday.rs  |   0
 .../date => command/datetime}/get_year.rs     |   0
 .../src/dataframe/command/datetime/mod.rs     |  52 +++
 .../string => command/datetime}/strftime.rs   |   0
 .../{series => command/index}/arg_max.rs      |   2 +-
 .../{series => command/index}/arg_min.rs      |   2 +-
 .../indexes => command/index}/arg_sort.rs     |   0
 .../indexes => command/index}/arg_unique.rs   |   0
 .../src/dataframe/command/index/mod.rs        |  24 +
 .../indexes => command/index}/set_with_idx.rs |   0
 .../src/dataframe/command/integer/mod.rs      |  12 +
 .../string => command/integer}/to_decimal.rs  |   0
 .../string => command/integer}/to_integer.rs  |   0
 .../src/dataframe/command/macro_commands.rs   | 440 ++++++++++++++++++
 .../src/dataframe/command/mod.rs              |  10 +
 .../string}/concat_str.rs                     |   0
 .../{series => command}/string/contains.rs    |   0
 .../src/dataframe/command/string/mod.rs       |  36 ++
 .../{series => command}/string/replace.rs     |   0
 .../{series => command}/string/replace_all.rs |   0
 .../{series => command}/string/str_join.rs    |   0
 .../{series => command}/string/str_lengths.rs |   0
 .../{series => command}/string/str_slice.rs   |   0
 .../string/to_lowercase.rs                    |   0
 .../string/to_uppercase.rs                    |   0
 .../src/dataframe/{ => command}/stub.rs       |   0
 .../src/dataframe/eager/mod.rs                |  88 ----
 .../src/dataframe/expressions/mod.rs          |  48 --
 .../src/dataframe/lazy/macro_commands.rs      | 228 ---------
 .../src/dataframe/lazy/mod.rs                 |  57 ---
 crates/nu_plugin_polars/src/dataframe/mod.rs  |   6 +-
 .../src/dataframe/series/date/mod.rs          |  25 -
 .../src/dataframe/series/indexes/mod.rs       |   9 -
 .../src/dataframe/series/masks/mod.rs         |  13 -
 .../src/dataframe/series/mod.rs               |  87 ----
 .../src/dataframe/series/string/mod.rs        |  23 -
 crates/nu_plugin_polars/src/lib.rs            |  26 +-
 127 files changed, 958 insertions(+), 918 deletions(-)
 rename crates/nu_plugin_polars/src/dataframe/{lazy => command/aggregation}/aggregate.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{expressions/expressions_macro.rs => command/aggregation/aggregation_commands.rs} (56%)
 rename crates/nu_plugin_polars/src/dataframe/{series => command/aggregation}/cumulative.rs (99%)
 rename crates/nu_plugin_polars/src/dataframe/{lazy => command/aggregation}/groupby.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{lazy => command/aggregation}/median.rs (100%)
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/aggregation/mod.rs
 rename crates/nu_plugin_polars/src/dataframe/{series => command/aggregation}/n_null.rs (98%)
 rename crates/nu_plugin_polars/src/dataframe/{series => command/aggregation}/n_unique.rs (98%)
 rename crates/nu_plugin_polars/src/dataframe/{lazy => command/aggregation}/quantile.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{series => command/aggregation}/rolling.rs (99%)
 rename crates/nu_plugin_polars/src/dataframe/{series => command/aggregation}/value_counts.rs (97%)
 rename crates/nu_plugin_polars/src/dataframe/{series => command/boolean}/all_false.rs (97%)
 rename crates/nu_plugin_polars/src/dataframe/{series => command/boolean}/all_true.rs (96%)
 rename crates/nu_plugin_polars/src/dataframe/{series/indexes => command/boolean}/arg_true.rs (100%)
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/boolean/expr_not.rs
 rename crates/nu_plugin_polars/src/dataframe/{series/masks => command/boolean}/is_duplicated.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{expressions => command/boolean}/is_in.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{series/masks => command/boolean}/is_not_null.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{series/masks => command/boolean}/is_null.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{series/masks => command/boolean}/is_unique.rs (100%)
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/boolean/mod.rs
 rename crates/nu_plugin_polars/src/dataframe/{series/masks => command/boolean}/not.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{expressions => command/boolean}/otherwise.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{series/masks => command/boolean}/set.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{expressions => command/boolean}/when.rs (100%)
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/core/cache.rs
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/core}/columns.rs (98%)
 rename crates/nu_plugin_polars/src/dataframe/{lazy => command/core}/fetch.rs (100%)
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/core/mod.rs
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/core}/open.rs (99%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/core}/save/arrow.rs (95%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/core}/save/avro.rs (96%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/core}/save/csv.rs (97%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/core}/save/mod.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/core}/save/ndjson.rs (95%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/core}/save/parquet.rs (95%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/core}/schema.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/core}/shape.rs (98%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/core}/summary.rs (99%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/core}/to_df.rs (99%)
 rename crates/nu_plugin_polars/src/dataframe/{lazy => command/core}/to_lazy.rs (98%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/core}/to_nu.rs (99%)
 rename crates/nu_plugin_polars/src/dataframe/{expressions => command/data}/alias.rs (98%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/data}/append.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{expressions => command/data}/arg_where.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/data}/cast.rs (99%)
 rename crates/nu_plugin_polars/src/dataframe/{expressions => command/data}/col.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{lazy => command/data}/collect.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/data}/drop.rs (97%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/data}/drop_duplicates.rs (97%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/data}/drop_nulls.rs (97%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/data}/dummies.rs (98%)
 rename crates/nu_plugin_polars/src/dataframe/{lazy => command/data}/explode.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{lazy => command/data}/fill_nan.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{lazy => command/data}/fill_null.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{lazy => command/data}/filter.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/data}/filter_with.rs (99%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/data}/first.rs (98%)
 rename crates/nu_plugin_polars/src/dataframe/{lazy => command/data}/flatten.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/data}/get.rs (98%)
 rename crates/nu_plugin_polars/src/dataframe/{lazy => command/data}/join.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/data}/last.rs (98%)
 rename crates/nu_plugin_polars/src/dataframe/{expressions => command/data}/lit.rs (100%)
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/data/mod.rs
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/data}/pivot.rs (99%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/data}/query_df.rs (96%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/data}/rename.rs (99%)
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/data/reverse.rs
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/data}/sample.rs (99%)
 rename crates/nu_plugin_polars/src/dataframe/{lazy => command/data}/select.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{series => command/data}/shift.rs (99%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/data}/slice.rs (98%)
 rename crates/nu_plugin_polars/src/dataframe/{lazy => command/data}/sort_by_expr.rs (99%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/data}/sql_context.rs (99%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/data}/sql_expr.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/data}/take.rs (99%)
 rename crates/nu_plugin_polars/src/dataframe/{series => command/data}/unique.rs (99%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/data}/unpivot.rs (99%)
 rename crates/nu_plugin_polars/src/dataframe/{eager => command/data}/with_column.rs (99%)
 rename crates/nu_plugin_polars/src/dataframe/{series/date => command/datetime}/as_date.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{series/date => command/datetime}/as_datetime.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{expressions => command/datetime}/datepart.rs (99%)
 rename crates/nu_plugin_polars/src/dataframe/{series/date => command/datetime}/get_day.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{series/date => command/datetime}/get_hour.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{series/date => command/datetime}/get_minute.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{series/date => command/datetime}/get_month.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{series/date => command/datetime}/get_nanosecond.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{series/date => command/datetime}/get_ordinal.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{series/date => command/datetime}/get_second.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{series/date => command/datetime}/get_week.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{series/date => command/datetime}/get_weekday.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{series/date => command/datetime}/get_year.rs (100%)
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/datetime/mod.rs
 rename crates/nu_plugin_polars/src/dataframe/{series/string => command/datetime}/strftime.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{series => command/index}/arg_max.rs (98%)
 rename crates/nu_plugin_polars/src/dataframe/{series => command/index}/arg_min.rs (98%)
 rename crates/nu_plugin_polars/src/dataframe/{series/indexes => command/index}/arg_sort.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{series/indexes => command/index}/arg_unique.rs (100%)
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/index/mod.rs
 rename crates/nu_plugin_polars/src/dataframe/{series/indexes => command/index}/set_with_idx.rs (100%)
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/integer/mod.rs
 rename crates/nu_plugin_polars/src/dataframe/{series/string => command/integer}/to_decimal.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{series/string => command/integer}/to_integer.rs (100%)
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/macro_commands.rs
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/mod.rs
 rename crates/nu_plugin_polars/src/dataframe/{expressions => command/string}/concat_str.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{series => command}/string/contains.rs (100%)
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/string/mod.rs
 rename crates/nu_plugin_polars/src/dataframe/{series => command}/string/replace.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{series => command}/string/replace_all.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{series => command}/string/str_join.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{series => command}/string/str_lengths.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{series => command}/string/str_slice.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{series => command}/string/to_lowercase.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{series => command}/string/to_uppercase.rs (100%)
 rename crates/nu_plugin_polars/src/dataframe/{ => command}/stub.rs (100%)
 delete mode 100644 crates/nu_plugin_polars/src/dataframe/eager/mod.rs
 delete mode 100644 crates/nu_plugin_polars/src/dataframe/expressions/mod.rs
 delete mode 100644 crates/nu_plugin_polars/src/dataframe/lazy/macro_commands.rs
 delete mode 100644 crates/nu_plugin_polars/src/dataframe/lazy/mod.rs
 delete mode 100644 crates/nu_plugin_polars/src/dataframe/series/date/mod.rs
 delete mode 100644 crates/nu_plugin_polars/src/dataframe/series/indexes/mod.rs
 delete mode 100644 crates/nu_plugin_polars/src/dataframe/series/masks/mod.rs
 delete mode 100644 crates/nu_plugin_polars/src/dataframe/series/mod.rs
 delete mode 100644 crates/nu_plugin_polars/src/dataframe/series/string/mod.rs

diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/aggregate.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/aggregate.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/lazy/aggregate.rs
rename to crates/nu_plugin_polars/src/dataframe/command/aggregation/aggregate.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/expressions/expressions_macro.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/aggregation_commands.rs
similarity index 56%
rename from crates/nu_plugin_polars/src/dataframe/expressions/expressions_macro.rs
rename to crates/nu_plugin_polars/src/dataframe/command/aggregation/aggregation_commands.rs
index 2a18c31c4d..4f2a4875da 100644
--- a/crates/nu_plugin_polars/src/dataframe/expressions/expressions_macro.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/aggregation_commands.rs
@@ -1,263 +1,10 @@
-/// Definition of multiple Expression commands using a macro rule
-/// All of these expressions have an identical body and only require
-/// to have a change in the name, description and expression function
 use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuLazyFrame};
 use crate::values::CustomValueSupport;
 use crate::PolarsPlugin;
+use crate::{expr_command, lazy_expr_command};
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{Category, Example, LabeledError, PipelineData, Signature, Span, Type, Value};
 
-// The structs defined in this file are structs that form part of other commands
-// since they share a similar name
-macro_rules! expr_command {
-    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident, $test: ident) => {
-        #[derive(Clone)]
-        pub struct $command;
-
-        impl PluginCommand for $command {
-            type Plugin = PolarsPlugin;
-
-            fn name(&self) -> &str {
-                $name
-            }
-
-            fn description(&self) -> &str {
-                $desc
-            }
-
-            fn signature(&self) -> Signature {
-                Signature::build(self.name())
-                    .description($desc)
-                    .input_output_type(
-                        Type::Custom("expression".into()),
-                        Type::Custom("expression".into()),
-                    )
-                    .category(Category::Custom("expression".into()))
-            }
-
-            fn examples(&self) -> Vec<Example> {
-                $examples
-            }
-
-            fn run(
-                &self,
-                plugin: &Self::Plugin,
-                engine: &EngineInterface,
-                call: &EvaluatedCall,
-                input: PipelineData,
-            ) -> Result<PipelineData, LabeledError> {
-                let expr = NuExpression::try_from_pipeline(plugin, input, call.head)
-                    .map_err(LabeledError::from)?;
-                let expr: NuExpression = expr.into_polars().$func().into();
-                expr.to_pipeline_data(plugin, engine, call.head)
-                    .map_err(LabeledError::from)
-            }
-        }
-
-        #[cfg(test)]
-        mod $test {
-            use super::*;
-            use crate::test::test_polars_plugin_command;
-            use nu_protocol::ShellError;
-
-            #[test]
-            fn test_examples() -> Result<(), ShellError> {
-                test_polars_plugin_command(&$command)
-            }
-        }
-    };
-
-    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident, $test: ident, $ddof: expr) => {
-        #[derive(Clone)]
-        pub struct $command;
-
-        impl PluginCommand for $command {
-            type Plugin = PolarsPlugin;
-
-            fn signature(&self) -> Signature {
-                Signature::build(self.name())
-                    .description($desc)
-                    .input_output_type(
-                        Type::Custom("expression".into()),
-                        Type::Custom("expression".into()),
-                    )
-                    .category(Category::Custom("expression".into()))
-                    .plugin_examples($examples)
-            }
-
-            fn run(
-                &self,
-                _plugin: &Self::Plugin,
-                engine: &EngineInterface,
-                call: &EvaluatedCall,
-                input: PipelineData,
-            ) -> Result<PipelineData, LabeledError> {
-                let expr = NuExpression::try_from_pipeline(input, call.head)
-                    .map_err(LabeledError::from)?;
-                let expr: NuExpression = expr.into_polars().$func($ddof).into();
-                expr.to_pipeline_data(plugin, engine, call.head)
-                    .map_err(LabeledError::from)
-            }
-        }
-
-        #[cfg(test)]
-        mod $test {
-            use super::*;
-            use crate::test::test_polars_plugin_command;
-
-            #[test]
-            fn test_examples() -> Result<(), ShellError> {
-                test_polars_plugin_command(&$command)
-            }
-        }
-    };
-}
-
-// The structs defined in this file are structs that form part of other commands
-// since they share a similar name
-macro_rules! lazy_expr_command {
-    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident, $test: ident) => {
-        #[derive(Clone)]
-        pub struct $command;
-
-        impl PluginCommand for $command {
-            type Plugin = PolarsPlugin;
-
-            fn name(&self) -> &str {
-                $name
-            }
-
-            fn description(&self) -> &str {
-                $desc
-            }
-
-            fn signature(&self) -> Signature {
-                Signature::build(self.name())
-                    .description($desc)
-                    .input_output_types(vec![
-                        (
-                            Type::Custom("expression".into()),
-                            Type::Custom("expression".into()),
-                        ),
-                        (
-                            Type::Custom("dataframe".into()),
-                            Type::Custom("dataframe".into()),
-                        ),
-                    ])
-                    .category(Category::Custom("expression".into()))
-            }
-
-            fn examples(&self) -> Vec<Example> {
-                $examples
-            }
-
-            fn run(
-                &self,
-                plugin: &Self::Plugin,
-                engine: &EngineInterface,
-                call: &EvaluatedCall,
-                input: PipelineData,
-            ) -> Result<PipelineData, LabeledError> {
-                let value = input.into_value(call.head)?;
-                if NuDataFrame::can_downcast(&value) || NuLazyFrame::can_downcast(&value) {
-                    let lazy = NuLazyFrame::try_from_value_coerce(plugin, &value)
-                        .map_err(LabeledError::from)?;
-                    let lazy = NuLazyFrame::new(lazy.from_eager, lazy.to_polars().$func());
-                    lazy.to_pipeline_data(plugin, engine, call.head)
-                        .map_err(LabeledError::from)
-                } else {
-                    let expr =
-                        NuExpression::try_from_value(plugin, &value).map_err(LabeledError::from)?;
-                    let expr: NuExpression = expr.into_polars().$func().into();
-                    expr.to_pipeline_data(plugin, engine, call.head)
-                        .map_err(LabeledError::from)
-                }
-            }
-        }
-
-        #[cfg(test)]
-        mod $test {
-            use super::*;
-            use crate::test::test_polars_plugin_command;
-            use nu_protocol::ShellError;
-
-            #[test]
-            fn test_examples() -> Result<(), ShellError> {
-                test_polars_plugin_command(&$command)
-            }
-        }
-    };
-
-    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident, $test: ident, $ddof: expr) => {
-        #[derive(Clone)]
-        pub struct $command;
-
-        impl PluginCommand for $command {
-            type Plugin = PolarsPlugin;
-
-            fn name(&self) -> &str {
-                $name
-            }
-
-            fn description(&self) -> &str {
-                $desc
-            }
-            fn signature(&self) -> Signature {
-                Signature::build(self.name())
-                    .input_output_types(vec![
-                        (
-                            Type::Custom("expression".into()),
-                            Type::Custom("expression".into()),
-                        ),
-                        (
-                            Type::Custom("dataframe".into()),
-                            Type::Custom("dataframe".into()),
-                        ),
-                    ])
-                    .category(Category::Custom("expression".into()))
-            }
-
-            fn examples(&self) -> Vec<Example> {
-                $examples
-            }
-
-            fn run(
-                &self,
-                plugin: &Self::Plugin,
-                engine: &EngineInterface,
-                call: &EvaluatedCall,
-                input: PipelineData,
-            ) -> Result<PipelineData, LabeledError> {
-                let value = input.into_value(call.head)?;
-                if NuDataFrame::can_downcast(&value) || NuLazyFrame::can_downcast(&value) {
-                    let lazy = NuLazyFrame::try_from_value_coerce(plugin, &value)
-                        .map_err(LabeledError::from)?;
-                    let lazy = NuLazyFrame::new(lazy.from_eager, lazy.to_polars().$func($ddof));
-                    lazy.to_pipeline_data(plugin, engine, call.head)
-                        .map_err(LabeledError::from)
-                } else {
-                    let expr = NuExpression::try_from_value(plugin, &value)?;
-                    let expr: NuExpression = expr.into_polars().$func($ddof).into();
-                    expr.to_pipeline_data(plugin, engine, call.head)
-                        .map_err(LabeledError::from)
-                }
-            }
-        }
-
-        #[cfg(test)]
-        mod $test {
-            use super::*;
-            use crate::test::test_polars_plugin_command;
-            use nu_protocol::ShellError;
-
-            #[test]
-            fn test_examples() -> Result<(), ShellError> {
-                test_polars_plugin_command(&$command)
-            }
-        }
-    };
-}
-
 // ExprList command
 // Expands to a command definition for a list expression
 expr_command!(
@@ -303,21 +50,6 @@ expr_command!(
     test_count
 );
 
-// ExprNot command
-// Expands to a command definition for a not expression
-expr_command!(
-    ExprNot,
-    "polars expr-not",
-    "Creates a not expression.",
-    vec![Example {
-        description: "Creates a not expression",
-        example: "(polars col a) > 2) | polars expr-not",
-        result: None,
-    },],
-    not,
-    test_not
-);
-
 // ExprMax command
 // Expands to a command definition for max aggregation
 lazy_expr_command!(
diff --git a/crates/nu_plugin_polars/src/dataframe/series/cumulative.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/cumulative.rs
similarity index 99%
rename from crates/nu_plugin_polars/src/dataframe/series/cumulative.rs
rename to crates/nu_plugin_polars/src/dataframe/command/aggregation/cumulative.rs
index da7081128d..e745bf5432 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/cumulative.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/cumulative.rs
@@ -1,6 +1,6 @@
 use crate::{values::CustomValueSupport, PolarsPlugin};
 
-use super::super::values::{Column, NuDataFrame};
+use crate::values::{Column, NuDataFrame};
 
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/groupby.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/groupby.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/lazy/groupby.rs
rename to crates/nu_plugin_polars/src/dataframe/command/aggregation/groupby.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/median.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/median.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/lazy/median.rs
rename to crates/nu_plugin_polars/src/dataframe/command/aggregation/median.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/command/aggregation/mod.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/mod.rs
new file mode 100644
index 0000000000..ea14500075
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/mod.rs
@@ -0,0 +1,44 @@
+mod aggregate;
+mod aggregation_commands;
+mod cumulative;
+pub mod groupby;
+mod median;
+mod n_null;
+mod n_unique;
+mod quantile;
+mod rolling;
+mod value_counts;
+
+use crate::PolarsPlugin;
+use nu_plugin::PluginCommand;
+
+pub use aggregate::LazyAggregate;
+pub use aggregation_commands::*;
+pub use cumulative::Cumulative;
+pub use n_null::NNull;
+pub use n_unique::NUnique;
+pub use rolling::Rolling;
+pub use value_counts::ValueCount;
+
+pub(crate) fn aggregation_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin>>> {
+    vec![
+        Box::new(Cumulative),
+        Box::new(ExprAggGroups),
+        Box::new(ExprCount),
+        Box::new(ExprList),
+        Box::new(ExprMax),
+        Box::new(ExprMin),
+        Box::new(ExprSum),
+        Box::new(ExprMean),
+        Box::new(ExprStd),
+        Box::new(ExprVar),
+        Box::new(LazyAggregate),
+        Box::new(median::LazyMedian),
+        Box::new(quantile::LazyQuantile),
+        Box::new(groupby::ToLazyGroupBy),
+        Box::new(Rolling),
+        Box::new(ValueCount),
+        Box::new(NNull),
+        Box::new(NUnique),
+    ]
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/series/n_null.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/n_null.rs
similarity index 98%
rename from crates/nu_plugin_polars/src/dataframe/series/n_null.rs
rename to crates/nu_plugin_polars/src/dataframe/command/aggregation/n_null.rs
index cfe69853a7..61507d9d69 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/n_null.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/n_null.rs
@@ -1,6 +1,6 @@
 use crate::{values::CustomValueSupport, PolarsPlugin};
 
-use super::super::values::{Column, NuDataFrame};
+use crate::values::{Column, NuDataFrame};
 
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
diff --git a/crates/nu_plugin_polars/src/dataframe/series/n_unique.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/n_unique.rs
similarity index 98%
rename from crates/nu_plugin_polars/src/dataframe/series/n_unique.rs
rename to crates/nu_plugin_polars/src/dataframe/command/aggregation/n_unique.rs
index 381017f9e7..3c696ee371 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/n_unique.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/n_unique.rs
@@ -3,7 +3,7 @@ use crate::{
     PolarsPlugin,
 };
 
-use super::super::values::{Column, NuDataFrame, NuExpression};
+use crate::values::{Column, NuDataFrame, NuExpression};
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
     Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Type, Value,
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/quantile.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/quantile.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/lazy/quantile.rs
rename to crates/nu_plugin_polars/src/dataframe/command/aggregation/quantile.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/series/rolling.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/rolling.rs
similarity index 99%
rename from crates/nu_plugin_polars/src/dataframe/series/rolling.rs
rename to crates/nu_plugin_polars/src/dataframe/command/aggregation/rolling.rs
index b63b5048be..05e7df6040 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/rolling.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/rolling.rs
@@ -1,7 +1,6 @@
+use crate::values::{Column, NuDataFrame};
 use crate::{values::CustomValueSupport, PolarsPlugin};
 
-use super::super::values::{Column, NuDataFrame};
-
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
     Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Spanned,
diff --git a/crates/nu_plugin_polars/src/dataframe/series/value_counts.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/value_counts.rs
similarity index 97%
rename from crates/nu_plugin_polars/src/dataframe/series/value_counts.rs
rename to crates/nu_plugin_polars/src/dataframe/command/aggregation/value_counts.rs
index bb228af8bb..e05a1c401c 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/value_counts.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/value_counts.rs
@@ -1,6 +1,5 @@
-use crate::{values::CustomValueSupport, PolarsPlugin};
-
-use super::super::values::{Column, NuDataFrame};
+use crate::values::{Column, CustomValueSupport, NuDataFrame};
+use crate::PolarsPlugin;
 
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
diff --git a/crates/nu_plugin_polars/src/dataframe/series/all_false.rs b/crates/nu_plugin_polars/src/dataframe/command/boolean/all_false.rs
similarity index 97%
rename from crates/nu_plugin_polars/src/dataframe/series/all_false.rs
rename to crates/nu_plugin_polars/src/dataframe/command/boolean/all_false.rs
index 36e31dfb98..f5cc7acf11 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/all_false.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/boolean/all_false.rs
@@ -1,6 +1,5 @@
-use crate::{values::CustomValueSupport, PolarsPlugin};
-
-use super::super::values::{Column, NuDataFrame};
+use crate::values::{Column, CustomValueSupport, NuDataFrame};
+use crate::PolarsPlugin;
 
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
diff --git a/crates/nu_plugin_polars/src/dataframe/series/all_true.rs b/crates/nu_plugin_polars/src/dataframe/command/boolean/all_true.rs
similarity index 96%
rename from crates/nu_plugin_polars/src/dataframe/series/all_true.rs
rename to crates/nu_plugin_polars/src/dataframe/command/boolean/all_true.rs
index cf3d7a79fe..bcca2f1562 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/all_true.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/boolean/all_true.rs
@@ -1,6 +1,5 @@
-use crate::{values::CustomValueSupport, PolarsPlugin};
-
-use super::super::values::{Column, NuDataFrame};
+use crate::values::{Column, CustomValueSupport, NuDataFrame};
+use crate::PolarsPlugin;
 
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
diff --git a/crates/nu_plugin_polars/src/dataframe/series/indexes/arg_true.rs b/crates/nu_plugin_polars/src/dataframe/command/boolean/arg_true.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/indexes/arg_true.rs
rename to crates/nu_plugin_polars/src/dataframe/command/boolean/arg_true.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/command/boolean/expr_not.rs b/crates/nu_plugin_polars/src/dataframe/command/boolean/expr_not.rs
new file mode 100644
index 0000000000..886d89eeab
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/boolean/expr_not.rs
@@ -0,0 +1,21 @@
+use crate::expr_command;
+use crate::values::CustomValueSupport;
+use crate::values::NuExpression;
+use crate::PolarsPlugin;
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{Category, Example, LabeledError, PipelineData, Signature, Type};
+
+// ExprNot command
+// Expands to a command definition for a not expression
+expr_command!(
+    ExprNot,
+    "polars expr-not",
+    "Creates a not expression.",
+    vec![Example {
+        description: "Creates a not expression",
+        example: "(polars col a) > 2) | polars expr-not",
+        result: None,
+    },],
+    not,
+    test_not
+);
diff --git a/crates/nu_plugin_polars/src/dataframe/series/masks/is_duplicated.rs b/crates/nu_plugin_polars/src/dataframe/command/boolean/is_duplicated.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/masks/is_duplicated.rs
rename to crates/nu_plugin_polars/src/dataframe/command/boolean/is_duplicated.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/expressions/is_in.rs b/crates/nu_plugin_polars/src/dataframe/command/boolean/is_in.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/expressions/is_in.rs
rename to crates/nu_plugin_polars/src/dataframe/command/boolean/is_in.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/series/masks/is_not_null.rs b/crates/nu_plugin_polars/src/dataframe/command/boolean/is_not_null.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/masks/is_not_null.rs
rename to crates/nu_plugin_polars/src/dataframe/command/boolean/is_not_null.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/series/masks/is_null.rs b/crates/nu_plugin_polars/src/dataframe/command/boolean/is_null.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/masks/is_null.rs
rename to crates/nu_plugin_polars/src/dataframe/command/boolean/is_null.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/series/masks/is_unique.rs b/crates/nu_plugin_polars/src/dataframe/command/boolean/is_unique.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/masks/is_unique.rs
rename to crates/nu_plugin_polars/src/dataframe/command/boolean/is_unique.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/command/boolean/mod.rs b/crates/nu_plugin_polars/src/dataframe/command/boolean/mod.rs
new file mode 100644
index 0000000000..e57229fe3a
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/boolean/mod.rs
@@ -0,0 +1,46 @@
+mod all_false;
+mod all_true;
+mod arg_true;
+mod expr_not;
+mod is_duplicated;
+mod is_in;
+mod is_not_null;
+mod is_null;
+mod is_unique;
+mod not;
+pub(crate) mod otherwise;
+mod set;
+mod when;
+
+use crate::PolarsPlugin;
+use nu_plugin::PluginCommand;
+
+pub use all_false::AllFalse;
+pub use arg_true::ArgTrue;
+pub use is_duplicated::IsDuplicated;
+pub use is_in::ExprIsIn;
+pub use is_not_null::IsNotNull;
+pub use is_null::IsNull;
+pub use is_unique::IsUnique;
+pub use not::NotSeries;
+pub use otherwise::ExprOtherwise;
+pub use set::SetSeries;
+pub use when::ExprWhen;
+
+pub(crate) fn boolean_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin>>> {
+    vec![
+        Box::new(AllFalse),
+        Box::new(all_true::AllTrue),
+        Box::new(ArgTrue),
+        Box::new(ExprIsIn),
+        Box::new(ExprOtherwise),
+        Box::new(ExprWhen),
+        Box::new(expr_not::ExprNot),
+        Box::new(IsDuplicated),
+        Box::new(IsNotNull),
+        Box::new(IsNull),
+        Box::new(IsUnique),
+        Box::new(NotSeries),
+        Box::new(SetSeries),
+    ]
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/series/masks/not.rs b/crates/nu_plugin_polars/src/dataframe/command/boolean/not.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/masks/not.rs
rename to crates/nu_plugin_polars/src/dataframe/command/boolean/not.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/expressions/otherwise.rs b/crates/nu_plugin_polars/src/dataframe/command/boolean/otherwise.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/expressions/otherwise.rs
rename to crates/nu_plugin_polars/src/dataframe/command/boolean/otherwise.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/series/masks/set.rs b/crates/nu_plugin_polars/src/dataframe/command/boolean/set.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/masks/set.rs
rename to crates/nu_plugin_polars/src/dataframe/command/boolean/set.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/expressions/when.rs b/crates/nu_plugin_polars/src/dataframe/command/boolean/when.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/expressions/when.rs
rename to crates/nu_plugin_polars/src/dataframe/command/boolean/when.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/cache.rs b/crates/nu_plugin_polars/src/dataframe/command/core/cache.rs
new file mode 100644
index 0000000000..ce68f7712b
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/cache.rs
@@ -0,0 +1,16 @@
+use crate::lazy_command;
+
+// LazyCache command
+// Expands to a command definition for cache
+lazy_command!(
+    LazyCache,
+    "polars cache",
+    "Caches operations in a new LazyFrame.",
+    vec![Example {
+        description: "Caches the result into a new LazyFrame",
+        example: "[[a b]; [6 2] [4 2] [2 2]] | polars into-df | polars reverse | polars cache",
+        result: None,
+    }],
+    cache,
+    test_cache
+);
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/columns.rs b/crates/nu_plugin_polars/src/dataframe/command/core/columns.rs
similarity index 98%
rename from crates/nu_plugin_polars/src/dataframe/eager/columns.rs
rename to crates/nu_plugin_polars/src/dataframe/command/core/columns.rs
index 5fa4fb82a8..ceb9975dfe 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/columns.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/columns.rs
@@ -1,6 +1,6 @@
+use crate::values::NuDataFrame;
 use crate::PolarsPlugin;
 
-use super::super::values::NuDataFrame;
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
     Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Type, Value,
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/fetch.rs b/crates/nu_plugin_polars/src/dataframe/command/core/fetch.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/lazy/fetch.rs
rename to crates/nu_plugin_polars/src/dataframe/command/core/fetch.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/mod.rs b/crates/nu_plugin_polars/src/dataframe/command/core/mod.rs
new file mode 100644
index 0000000000..4acf6778e1
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/mod.rs
@@ -0,0 +1,39 @@
+mod cache;
+mod columns;
+mod fetch;
+mod open;
+mod save;
+mod schema;
+mod shape;
+mod summary;
+mod to_df;
+mod to_lazy;
+mod to_nu;
+
+use crate::PolarsPlugin;
+use nu_plugin::PluginCommand;
+
+pub use self::open::OpenDataFrame;
+use fetch::LazyFetch;
+pub use schema::SchemaCmd;
+pub use shape::ShapeDF;
+pub use summary::Summary;
+pub use to_df::ToDataFrame;
+pub use to_lazy::ToLazyFrame;
+pub use to_nu::ToNu;
+
+pub(crate) fn core_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin>>> {
+    vec![
+        Box::new(columns::ColumnsDF),
+        Box::new(cache::LazyCache),
+        Box::new(LazyFetch),
+        Box::new(OpenDataFrame),
+        Box::new(Summary),
+        Box::new(ShapeDF),
+        Box::new(SchemaCmd),
+        Box::new(ToNu),
+        Box::new(ToDataFrame),
+        Box::new(save::SaveDF),
+        Box::new(ToLazyFrame),
+    ]
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/open.rs b/crates/nu_plugin_polars/src/dataframe/command/core/open.rs
similarity index 99%
rename from crates/nu_plugin_polars/src/dataframe/eager/open.rs
rename to crates/nu_plugin_polars/src/dataframe/command/core/open.rs
index c2894d64fe..a897114999 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/open.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/open.rs
@@ -1,12 +1,11 @@
 use crate::{
     dataframe::values::NuSchema,
-    values::{CustomValueSupport, NuLazyFrame, PolarsFileType},
+    values::{CustomValueSupport, NuDataFrame, NuLazyFrame, PolarsFileType},
     EngineWrapper, PolarsPlugin,
 };
 use nu_path::expand_path_with;
 use nu_utils::perf;
 
-use super::super::values::NuDataFrame;
 use nu_plugin::PluginCommand;
 use nu_protocol::{
     Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Spanned,
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/save/arrow.rs b/crates/nu_plugin_polars/src/dataframe/command/core/save/arrow.rs
similarity index 95%
rename from crates/nu_plugin_polars/src/dataframe/eager/save/arrow.rs
rename to crates/nu_plugin_polars/src/dataframe/command/core/save/arrow.rs
index 2c972c4d4f..54317edea3 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/save/arrow.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/save/arrow.rs
@@ -48,7 +48,7 @@ pub(crate) fn command_eager(
 #[cfg(test)]
 pub mod test {
 
-    use crate::eager::save::test::{test_eager_save, test_lazy_save};
+    use crate::command::core::save::test::{test_eager_save, test_lazy_save};
 
     #[test]
     pub fn test_arrow_eager_save() -> Result<(), Box<dyn std::error::Error>> {
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/save/avro.rs b/crates/nu_plugin_polars/src/dataframe/command/core/save/avro.rs
similarity index 96%
rename from crates/nu_plugin_polars/src/dataframe/eager/save/avro.rs
rename to crates/nu_plugin_polars/src/dataframe/command/core/save/avro.rs
index 58463ec36c..ef5c0cdca2 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/save/avro.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/save/avro.rs
@@ -60,7 +60,7 @@ pub(crate) fn command_eager(
 
 #[cfg(test)]
 pub mod test {
-    use crate::eager::save::test::{test_eager_save, test_lazy_save};
+    use crate::command::core::save::test::{test_eager_save, test_lazy_save};
 
     #[test]
     pub fn test_avro_eager_save() -> Result<(), Box<dyn std::error::Error>> {
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/save/csv.rs b/crates/nu_plugin_polars/src/dataframe/command/core/save/csv.rs
similarity index 97%
rename from crates/nu_plugin_polars/src/dataframe/eager/save/csv.rs
rename to crates/nu_plugin_polars/src/dataframe/command/core/save/csv.rs
index f43b1b023b..941967b469 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/save/csv.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/save/csv.rs
@@ -97,7 +97,7 @@ pub(crate) fn command_eager(
 
 #[cfg(test)]
 pub mod test {
-    use crate::eager::save::test::{test_eager_save, test_lazy_save};
+    use crate::command::core::save::test::{test_eager_save, test_lazy_save};
 
     #[test]
     pub fn test_csv_eager_save() -> Result<(), Box<dyn std::error::Error>> {
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/save/mod.rs b/crates/nu_plugin_polars/src/dataframe/command/core/save/mod.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/eager/save/mod.rs
rename to crates/nu_plugin_polars/src/dataframe/command/core/save/mod.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/save/ndjson.rs b/crates/nu_plugin_polars/src/dataframe/command/core/save/ndjson.rs
similarity index 95%
rename from crates/nu_plugin_polars/src/dataframe/eager/save/ndjson.rs
rename to crates/nu_plugin_polars/src/dataframe/command/core/save/ndjson.rs
index 7840103079..55204436d8 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/save/ndjson.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/save/ndjson.rs
@@ -49,7 +49,7 @@ pub(crate) fn command_eager(
 
 #[cfg(test)]
 pub mod test {
-    use crate::eager::save::test::{test_eager_save, test_lazy_save};
+    use crate::command::core::save::test::{test_eager_save, test_lazy_save};
 
     #[test]
     pub fn test_arrow_eager_save() -> Result<(), Box<dyn std::error::Error>> {
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/save/parquet.rs b/crates/nu_plugin_polars/src/dataframe/command/core/save/parquet.rs
similarity index 95%
rename from crates/nu_plugin_polars/src/dataframe/eager/save/parquet.rs
rename to crates/nu_plugin_polars/src/dataframe/command/core/save/parquet.rs
index 7200e23500..f77e7c4028 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/save/parquet.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/save/parquet.rs
@@ -48,7 +48,7 @@ pub(crate) fn command_eager(
 #[cfg(test)]
 pub(crate) mod test {
 
-    use crate::eager::save::test::{test_eager_save, test_lazy_save};
+    use crate::command::core::save::test::{test_eager_save, test_lazy_save};
 
     #[test]
     pub fn test_parquet_eager_save() -> Result<(), Box<dyn std::error::Error>> {
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/schema.rs b/crates/nu_plugin_polars/src/dataframe/command/core/schema.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/eager/schema.rs
rename to crates/nu_plugin_polars/src/dataframe/command/core/schema.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/shape.rs b/crates/nu_plugin_polars/src/dataframe/command/core/shape.rs
similarity index 98%
rename from crates/nu_plugin_polars/src/dataframe/eager/shape.rs
rename to crates/nu_plugin_polars/src/dataframe/command/core/shape.rs
index 60f96e8b9f..bbd8821e18 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/shape.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/shape.rs
@@ -5,7 +5,7 @@ use nu_protocol::{
 
 use crate::{dataframe::values::Column, values::CustomValueSupport, PolarsPlugin};
 
-use super::super::values::NuDataFrame;
+use crate::values::NuDataFrame;
 
 #[derive(Clone)]
 pub struct ShapeDF;
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/summary.rs b/crates/nu_plugin_polars/src/dataframe/command/core/summary.rs
similarity index 99%
rename from crates/nu_plugin_polars/src/dataframe/eager/summary.rs
rename to crates/nu_plugin_polars/src/dataframe/command/core/summary.rs
index 863fb891b7..f9156560d2 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/summary.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/summary.rs
@@ -1,6 +1,6 @@
 use crate::{values::CustomValueSupport, PolarsPlugin};
 
-use super::super::values::{Column, NuDataFrame};
+use crate::values::{Column, NuDataFrame};
 
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/to_df.rs b/crates/nu_plugin_polars/src/dataframe/command/core/to_df.rs
similarity index 99%
rename from crates/nu_plugin_polars/src/dataframe/eager/to_df.rs
rename to crates/nu_plugin_polars/src/dataframe/command/core/to_df.rs
index 39d54f6e10..e3a9491411 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/to_df.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/to_df.rs
@@ -4,7 +4,7 @@ use crate::{
     PolarsPlugin,
 };
 
-use super::super::values::NuDataFrame;
+use crate::values::NuDataFrame;
 
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/to_lazy.rs b/crates/nu_plugin_polars/src/dataframe/command/core/to_lazy.rs
similarity index 98%
rename from crates/nu_plugin_polars/src/dataframe/lazy/to_lazy.rs
rename to crates/nu_plugin_polars/src/dataframe/command/core/to_lazy.rs
index 8d81bd1a8a..1b42d310f3 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/to_lazy.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/to_lazy.rs
@@ -1,6 +1,6 @@
 use crate::{dataframe::values::NuSchema, values::CustomValueSupport, Cacheable, PolarsPlugin};
 
-use super::super::values::{NuDataFrame, NuLazyFrame};
+use crate::values::{NuDataFrame, NuLazyFrame};
 
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{Category, Example, LabeledError, PipelineData, Signature, SyntaxShape, Type};
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/to_nu.rs b/crates/nu_plugin_polars/src/dataframe/command/core/to_nu.rs
similarity index 99%
rename from crates/nu_plugin_polars/src/dataframe/eager/to_nu.rs
rename to crates/nu_plugin_polars/src/dataframe/command/core/to_nu.rs
index a8b4aa3976..07427ca63d 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/to_nu.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/to_nu.rs
@@ -10,7 +10,7 @@ use crate::{
     PolarsPlugin,
 };
 
-use super::super::values::NuDataFrame;
+use crate::values::NuDataFrame;
 
 #[derive(Clone)]
 pub struct ToNu;
diff --git a/crates/nu_plugin_polars/src/dataframe/expressions/alias.rs b/crates/nu_plugin_polars/src/dataframe/command/data/alias.rs
similarity index 98%
rename from crates/nu_plugin_polars/src/dataframe/expressions/alias.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/alias.rs
index 0c12be144e..1d1c547073 100644
--- a/crates/nu_plugin_polars/src/dataframe/expressions/alias.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/alias.rs
@@ -1,6 +1,6 @@
 use crate::{values::CustomValueSupport, PolarsPlugin};
 
-use super::super::values::NuExpression;
+use crate::values::NuExpression;
 
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/append.rs b/crates/nu_plugin_polars/src/dataframe/command/data/append.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/eager/append.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/append.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/expressions/arg_where.rs b/crates/nu_plugin_polars/src/dataframe/command/data/arg_where.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/expressions/arg_where.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/arg_where.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/cast.rs b/crates/nu_plugin_polars/src/dataframe/command/data/cast.rs
similarity index 99%
rename from crates/nu_plugin_polars/src/dataframe/eager/cast.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/cast.rs
index 5787d961e1..c1fc08c3c8 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/cast.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/cast.rs
@@ -4,7 +4,7 @@ use crate::{
     PolarsPlugin,
 };
 
-use super::super::values::NuDataFrame;
+use crate::values::NuDataFrame;
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
     record, Category, Example, LabeledError, PipelineData, ShellError, Signature, Span,
diff --git a/crates/nu_plugin_polars/src/dataframe/expressions/col.rs b/crates/nu_plugin_polars/src/dataframe/command/data/col.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/expressions/col.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/col.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/collect.rs b/crates/nu_plugin_polars/src/dataframe/command/data/collect.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/lazy/collect.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/collect.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/drop.rs b/crates/nu_plugin_polars/src/dataframe/command/data/drop.rs
similarity index 97%
rename from crates/nu_plugin_polars/src/dataframe/eager/drop.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/drop.rs
index 4e2a2b7136..852e42e52c 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/drop.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/drop.rs
@@ -7,8 +7,8 @@ use nu_protocol::{
 use crate::values::CustomValueSupport;
 use crate::PolarsPlugin;
 
-use super::super::values::utils::convert_columns;
-use super::super::values::{Column, NuDataFrame};
+use crate::values::utils::convert_columns;
+use crate::values::{Column, NuDataFrame};
 
 #[derive(Clone)]
 pub struct DropDF;
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/drop_duplicates.rs b/crates/nu_plugin_polars/src/dataframe/command/data/drop_duplicates.rs
similarity index 97%
rename from crates/nu_plugin_polars/src/dataframe/eager/drop_duplicates.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/drop_duplicates.rs
index 2d311867ea..5f82ce13f6 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/drop_duplicates.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/drop_duplicates.rs
@@ -8,8 +8,8 @@ use polars::prelude::UniqueKeepStrategy;
 use crate::values::CustomValueSupport;
 use crate::PolarsPlugin;
 
-use super::super::values::utils::convert_columns_string;
-use super::super::values::{Column, NuDataFrame};
+use crate::values::utils::convert_columns_string;
+use crate::values::{Column, NuDataFrame};
 
 #[derive(Clone)]
 pub struct DropDuplicates;
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/drop_nulls.rs b/crates/nu_plugin_polars/src/dataframe/command/data/drop_nulls.rs
similarity index 97%
rename from crates/nu_plugin_polars/src/dataframe/eager/drop_nulls.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/drop_nulls.rs
index 43dbf29f3d..b99ea4223d 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/drop_nulls.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/drop_nulls.rs
@@ -7,8 +7,8 @@ use nu_protocol::{
 use crate::values::CustomValueSupport;
 use crate::PolarsPlugin;
 
-use super::super::values::utils::convert_columns_string;
-use super::super::values::{Column, NuDataFrame};
+use crate::values::utils::convert_columns_string;
+use crate::values::{Column, NuDataFrame};
 
 #[derive(Clone)]
 pub struct DropNulls;
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/dummies.rs b/crates/nu_plugin_polars/src/dataframe/command/data/dummies.rs
similarity index 98%
rename from crates/nu_plugin_polars/src/dataframe/eager/dummies.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/dummies.rs
index 6346ebfb60..684cda772d 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/dummies.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/dummies.rs
@@ -1,4 +1,4 @@
-use super::super::values::NuDataFrame;
+use crate::values::NuDataFrame;
 use crate::{values::CustomValueSupport, PolarsPlugin};
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/explode.rs b/crates/nu_plugin_polars/src/dataframe/command/data/explode.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/lazy/explode.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/explode.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/fill_nan.rs b/crates/nu_plugin_polars/src/dataframe/command/data/fill_nan.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/lazy/fill_nan.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/fill_nan.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/fill_null.rs b/crates/nu_plugin_polars/src/dataframe/command/data/fill_null.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/lazy/fill_null.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/fill_null.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/filter.rs b/crates/nu_plugin_polars/src/dataframe/command/data/filter.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/lazy/filter.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/filter.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/filter_with.rs b/crates/nu_plugin_polars/src/dataframe/command/data/filter_with.rs
similarity index 99%
rename from crates/nu_plugin_polars/src/dataframe/eager/filter_with.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/filter_with.rs
index acfe2251cd..bc222459e1 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/filter_with.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/filter_with.rs
@@ -11,7 +11,7 @@ use crate::{
     PolarsPlugin,
 };
 
-use super::super::values::{Column, NuDataFrame};
+use crate::values::{Column, NuDataFrame};
 
 #[derive(Clone)]
 pub struct FilterWith;
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/first.rs b/crates/nu_plugin_polars/src/dataframe/command/data/first.rs
similarity index 98%
rename from crates/nu_plugin_polars/src/dataframe/eager/first.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/first.rs
index e75aa04428..ca5205ff6a 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/first.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/first.rs
@@ -3,7 +3,7 @@ use crate::{
     PolarsPlugin,
 };
 
-use super::super::values::{NuDataFrame, NuExpression};
+use crate::values::{NuDataFrame, NuExpression};
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
     Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/flatten.rs b/crates/nu_plugin_polars/src/dataframe/command/data/flatten.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/lazy/flatten.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/flatten.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/get.rs b/crates/nu_plugin_polars/src/dataframe/command/data/get.rs
similarity index 98%
rename from crates/nu_plugin_polars/src/dataframe/eager/get.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/get.rs
index 330b027b0d..09269589a3 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/get.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/get.rs
@@ -8,7 +8,7 @@ use crate::{
     dataframe::values::utils::convert_columns_string, values::CustomValueSupport, PolarsPlugin,
 };
 
-use super::super::values::{Column, NuDataFrame};
+use crate::values::{Column, NuDataFrame};
 
 #[derive(Clone)]
 pub struct GetDF;
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/join.rs b/crates/nu_plugin_polars/src/dataframe/command/data/join.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/lazy/join.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/join.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/last.rs b/crates/nu_plugin_polars/src/dataframe/command/data/last.rs
similarity index 98%
rename from crates/nu_plugin_polars/src/dataframe/eager/last.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/last.rs
index 88f1041c25..43e4fbc232 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/last.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/last.rs
@@ -3,7 +3,7 @@ use crate::{
     PolarsPlugin,
 };
 
-use super::super::values::{utils::DEFAULT_ROWS, NuDataFrame, NuExpression};
+use crate::values::{utils::DEFAULT_ROWS, NuDataFrame, NuExpression};
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
     Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
diff --git a/crates/nu_plugin_polars/src/dataframe/expressions/lit.rs b/crates/nu_plugin_polars/src/dataframe/command/data/lit.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/expressions/lit.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/lit.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/mod.rs b/crates/nu_plugin_polars/src/dataframe/command/data/mod.rs
new file mode 100644
index 0000000000..302b5f4685
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/mod.rs
@@ -0,0 +1,109 @@
+mod alias;
+mod append;
+mod arg_where;
+mod cast;
+mod col;
+mod collect;
+mod drop;
+mod drop_duplicates;
+mod drop_nulls;
+mod dummies;
+mod explode;
+mod fill_nan;
+mod fill_null;
+mod filter;
+mod filter_with;
+mod first;
+mod flatten;
+mod get;
+mod join;
+mod last;
+mod lit;
+mod pivot;
+mod query_df;
+mod rename;
+mod reverse;
+mod sample;
+mod select;
+mod slice;
+mod sort_by_expr;
+pub mod sql_context;
+pub mod sql_expr;
+mod take;
+mod unpivot;
+mod with_column;
+use filter::LazyFilter;
+mod shift;
+mod unique;
+
+use crate::PolarsPlugin;
+use nu_plugin::PluginCommand;
+
+pub use alias::ExprAlias;
+pub use append::AppendDF;
+pub use arg_where::ExprArgWhere;
+pub use cast::CastDF;
+pub use col::ExprCol;
+pub use collect::LazyCollect;
+pub use drop::DropDF;
+pub use drop_duplicates::DropDuplicates;
+pub use drop_nulls::DropNulls;
+pub use dummies::Dummies;
+pub use explode::LazyExplode;
+use fill_nan::LazyFillNA;
+pub use fill_null::LazyFillNull;
+pub use first::FirstDF;
+use flatten::LazyFlatten;
+pub use get::GetDF;
+use join::LazyJoin;
+pub use last::LastDF;
+pub use lit::ExprLit;
+use query_df::QueryDf;
+pub use rename::RenameDF;
+pub use sample::SampleDF;
+pub use shift::Shift;
+pub use slice::SliceDF;
+use sort_by_expr::LazySortBy;
+pub use take::TakeDF;
+pub use unique::Unique;
+pub use unpivot::UnpivotDF;
+pub use with_column::WithColumn;
+
+pub(crate) fn data_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin>>> {
+    vec![
+        Box::new(AppendDF),
+        Box::new(CastDF),
+        Box::new(DropDF),
+        Box::new(DropDuplicates),
+        Box::new(DropNulls),
+        Box::new(Dummies),
+        Box::new(filter_with::FilterWith),
+        Box::new(GetDF),
+        Box::new(pivot::PivotDF),
+        Box::new(UnpivotDF),
+        Box::new(FirstDF),
+        Box::new(LastDF),
+        Box::new(RenameDF),
+        Box::new(SampleDF),
+        Box::new(SliceDF),
+        Box::new(TakeDF),
+        Box::new(QueryDf),
+        Box::new(WithColumn),
+        Box::new(ExprAlias),
+        Box::new(ExprArgWhere),
+        Box::new(ExprLit),
+        Box::new(ExprCol),
+        Box::new(LazyCollect),
+        Box::new(LazyExplode),
+        Box::new(LazyFillNA),
+        Box::new(LazyFillNull),
+        Box::new(LazyFlatten),
+        Box::new(LazyJoin),
+        Box::new(reverse::LazyReverse),
+        Box::new(select::LazySelect),
+        Box::new(LazySortBy),
+        Box::new(LazyFilter),
+        Box::new(Shift),
+        Box::new(Unique),
+    ]
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/pivot.rs b/crates/nu_plugin_polars/src/dataframe/command/data/pivot.rs
similarity index 99%
rename from crates/nu_plugin_polars/src/dataframe/eager/pivot.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/pivot.rs
index c541d16520..946868e6ad 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/pivot.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/pivot.rs
@@ -12,7 +12,7 @@ use crate::{
     PolarsPlugin,
 };
 
-use super::super::values::NuDataFrame;
+use crate::values::NuDataFrame;
 
 #[derive(Clone)]
 pub struct PivotDF;
@@ -75,7 +75,7 @@ impl PluginCommand for PivotDF {
         vec![
             Example {
                 example: "[[name subject test_1 test_2]; [Cady maths 98 100] [Cady physics 99 100] [Karen maths 61 60] [Karen physics 58 60]] | polars into-df |  polars pivot --on [subject] --index [name] --values [test_1]",
-                description: "Perform a pivot in order to show individuals test score by subject", 
+                description: "Perform a pivot in order to show individuals test score by subject",
                 result: Some(
                     NuDataFrame::try_from_columns(
                         vec![
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/query_df.rs b/crates/nu_plugin_polars/src/dataframe/command/data/query_df.rs
similarity index 96%
rename from crates/nu_plugin_polars/src/dataframe/eager/query_df.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/query_df.rs
index 799a3b4d64..3d0c218796 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/query_df.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/query_df.rs
@@ -1,7 +1,8 @@
-use super::super::values::NuDataFrame;
+use super::sql_context::SQLContext;
 use crate::dataframe::values::Column;
-use crate::dataframe::{eager::SQLContext, values::NuLazyFrame};
+use crate::dataframe::values::NuLazyFrame;
 use crate::values::CustomValueSupport;
+use crate::values::NuDataFrame;
 use crate::PolarsPlugin;
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/rename.rs b/crates/nu_plugin_polars/src/dataframe/command/data/rename.rs
similarity index 99%
rename from crates/nu_plugin_polars/src/dataframe/eager/rename.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/rename.rs
index 197d347b97..485c440818 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/rename.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/rename.rs
@@ -10,7 +10,7 @@ use crate::{
     PolarsPlugin,
 };
 
-use super::super::values::{Column, NuDataFrame};
+use crate::values::{Column, NuDataFrame};
 
 #[derive(Clone)]
 pub struct RenameDF;
diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/reverse.rs b/crates/nu_plugin_polars/src/dataframe/command/data/reverse.rs
new file mode 100644
index 0000000000..cb1e6af35f
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/reverse.rs
@@ -0,0 +1,37 @@
+use nu_protocol::{Span, Value};
+
+use crate::{
+    lazy_command,
+    values::{Column, NuDataFrame},
+};
+
+// LazyReverse command
+// Expands to a command definition for reverse
+lazy_command!(
+    LazyReverse,
+    "polars reverse",
+    "Reverses the LazyFrame",
+    vec![Example {
+        description: "Reverses the dataframe.",
+        example: "[[a b]; [6 2] [4 2] [2 2]] | polars into-df | polars reverse",
+        result: Some(
+            NuDataFrame::try_from_columns(
+                vec![
+                    Column::new(
+                        "a".to_string(),
+                        vec![Value::test_int(2), Value::test_int(4), Value::test_int(6),],
+                    ),
+                    Column::new(
+                        "b".to_string(),
+                        vec![Value::test_int(2), Value::test_int(2), Value::test_int(2),],
+                    ),
+                ],
+                None
+            )
+            .expect("simple df for test should not fail")
+            .into_value(Span::test_data()),
+        ),
+    },],
+    reverse,
+    test_reverse
+);
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/sample.rs b/crates/nu_plugin_polars/src/dataframe/command/data/sample.rs
similarity index 99%
rename from crates/nu_plugin_polars/src/dataframe/eager/sample.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/sample.rs
index 8e110feef9..b334c2cbc4 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/sample.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/sample.rs
@@ -8,7 +8,7 @@ use polars::series::Series;
 
 use crate::{values::CustomValueSupport, PolarsPlugin};
 
-use super::super::values::{Column, NuDataFrame};
+use crate::values::{Column, NuDataFrame};
 
 #[derive(Clone)]
 pub struct SampleDF;
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/select.rs b/crates/nu_plugin_polars/src/dataframe/command/data/select.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/lazy/select.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/select.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/series/shift.rs b/crates/nu_plugin_polars/src/dataframe/command/data/shift.rs
similarity index 99%
rename from crates/nu_plugin_polars/src/dataframe/series/shift.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/shift.rs
index 51c8242e51..6565ad92b2 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/shift.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/shift.rs
@@ -4,7 +4,7 @@ use crate::{
     PolarsPlugin,
 };
 
-use super::super::values::{Column, NuDataFrame};
+use crate::values::{Column, NuDataFrame};
 
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/slice.rs b/crates/nu_plugin_polars/src/dataframe/command/data/slice.rs
similarity index 98%
rename from crates/nu_plugin_polars/src/dataframe/eager/slice.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/slice.rs
index feeeab5df0..422d17db49 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/slice.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/slice.rs
@@ -6,7 +6,7 @@ use nu_protocol::{
 
 use crate::{dataframe::values::Column, values::CustomValueSupport, PolarsPlugin};
 
-use super::super::values::NuDataFrame;
+use crate::values::NuDataFrame;
 
 #[derive(Clone)]
 pub struct SliceDF;
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/sort_by_expr.rs b/crates/nu_plugin_polars/src/dataframe/command/data/sort_by_expr.rs
similarity index 99%
rename from crates/nu_plugin_polars/src/dataframe/lazy/sort_by_expr.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/sort_by_expr.rs
index 952388a2dc..3a0f2dd2d0 100644
--- a/crates/nu_plugin_polars/src/dataframe/lazy/sort_by_expr.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/sort_by_expr.rs
@@ -1,4 +1,4 @@
-use super::super::values::NuLazyFrame;
+use crate::values::NuLazyFrame;
 use crate::{
     dataframe::values::{Column, NuDataFrame, NuExpression},
     values::CustomValueSupport,
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/sql_context.rs b/crates/nu_plugin_polars/src/dataframe/command/data/sql_context.rs
similarity index 99%
rename from crates/nu_plugin_polars/src/dataframe/eager/sql_context.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/sql_context.rs
index f558904344..3349736702 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/sql_context.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/sql_context.rs
@@ -1,4 +1,4 @@
-use crate::dataframe::eager::sql_expr::parse_sql_expr;
+use crate::dataframe::command::data::sql_expr::parse_sql_expr;
 use polars::error::{ErrString, PolarsError};
 use polars::prelude::{col, DataFrame, DataType, IntoLazy, LazyFrame};
 use sqlparser::ast::{
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/sql_expr.rs b/crates/nu_plugin_polars/src/dataframe/command/data/sql_expr.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/eager/sql_expr.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/sql_expr.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/take.rs b/crates/nu_plugin_polars/src/dataframe/command/data/take.rs
similarity index 99%
rename from crates/nu_plugin_polars/src/dataframe/eager/take.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/take.rs
index a03093b607..e6c3c3c9b6 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/take.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/take.rs
@@ -7,7 +7,7 @@ use polars::prelude::DataType;
 
 use crate::{dataframe::values::Column, values::CustomValueSupport, PolarsPlugin};
 
-use super::super::values::NuDataFrame;
+use crate::values::NuDataFrame;
 
 #[derive(Clone)]
 pub struct TakeDF;
diff --git a/crates/nu_plugin_polars/src/dataframe/series/unique.rs b/crates/nu_plugin_polars/src/dataframe/command/data/unique.rs
similarity index 99%
rename from crates/nu_plugin_polars/src/dataframe/series/unique.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/unique.rs
index 991d22b096..ebc854a211 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/unique.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/unique.rs
@@ -4,7 +4,7 @@ use crate::{
     PolarsPlugin,
 };
 
-use super::super::values::{Column, NuDataFrame};
+use crate::values::{Column, NuDataFrame};
 
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/unpivot.rs b/crates/nu_plugin_polars/src/dataframe/command/data/unpivot.rs
similarity index 99%
rename from crates/nu_plugin_polars/src/dataframe/eager/unpivot.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/unpivot.rs
index 0d61951ec2..5235305de2 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/unpivot.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/unpivot.rs
@@ -11,7 +11,7 @@ use crate::{
     PolarsPlugin,
 };
 
-use super::super::values::{Column, NuDataFrame};
+use crate::values::{Column, NuDataFrame};
 
 #[derive(Clone)]
 pub struct UnpivotDF;
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/with_column.rs b/crates/nu_plugin_polars/src/dataframe/command/data/with_column.rs
similarity index 99%
rename from crates/nu_plugin_polars/src/dataframe/eager/with_column.rs
rename to crates/nu_plugin_polars/src/dataframe/command/data/with_column.rs
index 1c29f90c3f..f7c6deccf8 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/with_column.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/with_column.rs
@@ -1,4 +1,4 @@
-use super::super::values::{Column, NuDataFrame};
+use crate::values::{Column, NuDataFrame};
 use crate::{
     dataframe::values::{NuExpression, NuLazyFrame},
     values::{CustomValueSupport, PolarsPluginObject},
diff --git a/crates/nu_plugin_polars/src/dataframe/series/date/as_date.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/as_date.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/date/as_date.rs
rename to crates/nu_plugin_polars/src/dataframe/command/datetime/as_date.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/series/date/as_datetime.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/as_datetime.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/date/as_datetime.rs
rename to crates/nu_plugin_polars/src/dataframe/command/datetime/as_datetime.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/expressions/datepart.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/datepart.rs
similarity index 99%
rename from crates/nu_plugin_polars/src/dataframe/expressions/datepart.rs
rename to crates/nu_plugin_polars/src/dataframe/command/datetime/datepart.rs
index 1c7b7e7005..12841db43f 100644
--- a/crates/nu_plugin_polars/src/dataframe/expressions/datepart.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/datetime/datepart.rs
@@ -1,4 +1,4 @@
-use super::super::values::NuExpression;
+use crate::values::NuExpression;
 
 use crate::{
     dataframe::values::{Column, NuDataFrame},
diff --git a/crates/nu_plugin_polars/src/dataframe/series/date/get_day.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_day.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/date/get_day.rs
rename to crates/nu_plugin_polars/src/dataframe/command/datetime/get_day.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/series/date/get_hour.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_hour.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/date/get_hour.rs
rename to crates/nu_plugin_polars/src/dataframe/command/datetime/get_hour.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/series/date/get_minute.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_minute.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/date/get_minute.rs
rename to crates/nu_plugin_polars/src/dataframe/command/datetime/get_minute.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/series/date/get_month.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_month.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/date/get_month.rs
rename to crates/nu_plugin_polars/src/dataframe/command/datetime/get_month.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/series/date/get_nanosecond.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_nanosecond.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/date/get_nanosecond.rs
rename to crates/nu_plugin_polars/src/dataframe/command/datetime/get_nanosecond.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/series/date/get_ordinal.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_ordinal.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/date/get_ordinal.rs
rename to crates/nu_plugin_polars/src/dataframe/command/datetime/get_ordinal.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/series/date/get_second.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_second.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/date/get_second.rs
rename to crates/nu_plugin_polars/src/dataframe/command/datetime/get_second.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/series/date/get_week.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_week.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/date/get_week.rs
rename to crates/nu_plugin_polars/src/dataframe/command/datetime/get_week.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/series/date/get_weekday.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_weekday.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/date/get_weekday.rs
rename to crates/nu_plugin_polars/src/dataframe/command/datetime/get_weekday.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/series/date/get_year.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_year.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/date/get_year.rs
rename to crates/nu_plugin_polars/src/dataframe/command/datetime/get_year.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/command/datetime/mod.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/mod.rs
new file mode 100644
index 0000000000..44c5d5a53a
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/datetime/mod.rs
@@ -0,0 +1,52 @@
+mod as_date;
+mod as_datetime;
+mod datepart;
+mod get_day;
+mod get_hour;
+mod get_minute;
+mod get_month;
+mod get_nanosecond;
+mod get_ordinal;
+mod get_second;
+mod get_week;
+mod get_weekday;
+mod get_year;
+
+use crate::PolarsPlugin;
+use nu_plugin::PluginCommand;
+
+pub use as_date::AsDate;
+pub use as_datetime::AsDateTime;
+pub use datepart::ExprDatePart;
+pub use get_day::GetDay;
+pub use get_hour::GetHour;
+pub use get_minute::GetMinute;
+pub use get_month::GetMonth;
+pub use get_nanosecond::GetNanosecond;
+pub use get_ordinal::GetOrdinal;
+pub use get_second::GetSecond;
+pub use get_week::GetWeek;
+pub use get_weekday::GetWeekDay;
+pub use get_year::GetYear;
+mod strftime;
+
+pub use strftime::StrFTime;
+
+pub(crate) fn datetime_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin>>> {
+    vec![
+        Box::new(ExprDatePart),
+        Box::new(AsDate),
+        Box::new(AsDateTime),
+        Box::new(GetDay),
+        Box::new(GetHour),
+        Box::new(GetMinute),
+        Box::new(GetMonth),
+        Box::new(GetNanosecond),
+        Box::new(GetOrdinal),
+        Box::new(GetSecond),
+        Box::new(GetWeek),
+        Box::new(GetWeekDay),
+        Box::new(GetYear),
+        Box::new(StrFTime),
+    ]
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/strftime.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/strftime.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/string/strftime.rs
rename to crates/nu_plugin_polars/src/dataframe/command/datetime/strftime.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/series/arg_max.rs b/crates/nu_plugin_polars/src/dataframe/command/index/arg_max.rs
similarity index 98%
rename from crates/nu_plugin_polars/src/dataframe/series/arg_max.rs
rename to crates/nu_plugin_polars/src/dataframe/command/index/arg_max.rs
index e7c67cdc32..de81281bda 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/arg_max.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/index/arg_max.rs
@@ -1,6 +1,6 @@
 use crate::{values::CustomValueSupport, PolarsPlugin};
 
-use super::super::values::{Column, NuDataFrame};
+use crate::values::{Column, NuDataFrame};
 
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
diff --git a/crates/nu_plugin_polars/src/dataframe/series/arg_min.rs b/crates/nu_plugin_polars/src/dataframe/command/index/arg_min.rs
similarity index 98%
rename from crates/nu_plugin_polars/src/dataframe/series/arg_min.rs
rename to crates/nu_plugin_polars/src/dataframe/command/index/arg_min.rs
index 268ba401da..5df4cbaa17 100644
--- a/crates/nu_plugin_polars/src/dataframe/series/arg_min.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/index/arg_min.rs
@@ -1,6 +1,6 @@
 use crate::{values::CustomValueSupport, PolarsPlugin};
 
-use super::super::values::{Column, NuDataFrame};
+use crate::values::{Column, NuDataFrame};
 
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
diff --git a/crates/nu_plugin_polars/src/dataframe/series/indexes/arg_sort.rs b/crates/nu_plugin_polars/src/dataframe/command/index/arg_sort.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/indexes/arg_sort.rs
rename to crates/nu_plugin_polars/src/dataframe/command/index/arg_sort.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/series/indexes/arg_unique.rs b/crates/nu_plugin_polars/src/dataframe/command/index/arg_unique.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/indexes/arg_unique.rs
rename to crates/nu_plugin_polars/src/dataframe/command/index/arg_unique.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/command/index/mod.rs b/crates/nu_plugin_polars/src/dataframe/command/index/mod.rs
new file mode 100644
index 0000000000..e0439f13f4
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/index/mod.rs
@@ -0,0 +1,24 @@
+mod arg_max;
+mod arg_min;
+mod arg_sort;
+mod arg_unique;
+mod set_with_idx;
+
+use crate::PolarsPlugin;
+use nu_plugin::PluginCommand;
+
+pub use arg_max::ArgMax;
+pub use arg_min::ArgMin;
+pub use arg_sort::ArgSort;
+pub use arg_unique::ArgUnique;
+pub use set_with_idx::SetWithIndex;
+
+pub(crate) fn index_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin>>> {
+    vec![
+        Box::new(ArgMax),
+        Box::new(ArgMin),
+        Box::new(ArgSort),
+        Box::new(ArgUnique),
+        Box::new(SetWithIndex),
+    ]
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/series/indexes/set_with_idx.rs b/crates/nu_plugin_polars/src/dataframe/command/index/set_with_idx.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/indexes/set_with_idx.rs
rename to crates/nu_plugin_polars/src/dataframe/command/index/set_with_idx.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/command/integer/mod.rs b/crates/nu_plugin_polars/src/dataframe/command/integer/mod.rs
new file mode 100644
index 0000000000..080b7141b8
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/integer/mod.rs
@@ -0,0 +1,12 @@
+mod to_decimal;
+mod to_integer;
+
+use crate::PolarsPlugin;
+use nu_plugin::PluginCommand;
+
+pub use to_decimal::ToDecimal;
+pub use to_integer::ToInteger;
+
+pub(crate) fn integer_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin>>> {
+    vec![Box::new(ToDecimal), Box::new(ToInteger)]
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/to_decimal.rs b/crates/nu_plugin_polars/src/dataframe/command/integer/to_decimal.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/string/to_decimal.rs
rename to crates/nu_plugin_polars/src/dataframe/command/integer/to_decimal.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/to_integer.rs b/crates/nu_plugin_polars/src/dataframe/command/integer/to_integer.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/string/to_integer.rs
rename to crates/nu_plugin_polars/src/dataframe/command/integer/to_integer.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/command/macro_commands.rs b/crates/nu_plugin_polars/src/dataframe/command/macro_commands.rs
new file mode 100644
index 0000000000..3986a53037
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/macro_commands.rs
@@ -0,0 +1,440 @@
+/// Definition of multiple Expression commands using a macro rule
+/// All of these expressions have an identical body and only require
+/// to have a change in the name, description and expression function
+
+#[macro_export]
+macro_rules! lazy_command {
+    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident, $test: ident) => {
+        use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+        use nu_protocol::{Category, Example, LabeledError, PipelineData, Signature, Type};
+        /// Definition of multiple lazyframe commands using a macro rule
+        /// All of these commands have an identical body and only require
+        /// to have a change in the name, description and function
+        use $crate::dataframe::values::NuLazyFrame;
+        use $crate::values::CustomValueSupport;
+        use $crate::PolarsPlugin;
+
+        #[derive(Clone)]
+        pub struct $command;
+
+        impl PluginCommand for $command {
+            type Plugin = PolarsPlugin;
+
+            fn name(&self) -> &str {
+                $name
+            }
+
+            fn description(&self) -> &str {
+                $desc
+            }
+
+            fn signature(&self) -> Signature {
+                Signature::build(self.name())
+                    .description($desc)
+                    .input_output_type(
+                        Type::Custom("dataframe".into()),
+                        Type::Custom("dataframe".into()),
+                    )
+                    .category(Category::Custom("lazyframe".into()))
+            }
+
+            fn examples(&self) -> Vec<Example> {
+                $examples
+            }
+
+            fn run(
+                &self,
+                plugin: &Self::Plugin,
+                engine: &EngineInterface,
+                call: &EvaluatedCall,
+                input: PipelineData,
+            ) -> Result<PipelineData, LabeledError> {
+                let lazy = NuLazyFrame::try_from_pipeline_coerce(plugin, input, call.head)
+                    .map_err(LabeledError::from)?;
+                let lazy = NuLazyFrame::new(lazy.from_eager, lazy.to_polars().$func());
+                lazy.to_pipeline_data(plugin, engine, call.head)
+                    .map_err(LabeledError::from)
+            }
+        }
+
+        #[cfg(test)]
+        mod $test {
+            use super::*;
+            use nu_protocol::ShellError;
+            use $crate::test::test_polars_plugin_command;
+
+            #[test]
+            fn test_examples() -> Result<(), ShellError> {
+                test_polars_plugin_command(&$command)
+            }
+        }
+    };
+
+    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident, $test: ident, $ddot: expr) => {
+        #[derive(Clone)]
+        pub struct $command;
+
+        impl PluginCommand for $command {
+            type Plugin = PolarsPlugin;
+
+            fn signature(&self) -> Signature {
+                Signature::build($name)
+                    .description($desc)
+                    .input_output_type(
+                        Type::Custom("dataframe".into()),
+                        Type::Custom("dataframe".into()),
+                    )
+                    .category(Category::Custom("lazyframe".into()))
+                    .plugin_examples($examples)
+            }
+
+            fn run(
+                &self,
+                _plugin: &Self::Plugin,
+                engine: &EngineInterface,
+                call: &EvaluatedCall,
+                input: PipelineData,
+            ) -> Result<PipelineData, LabeledError> {
+                let lazy = NuLazyFrame::try_from_pipeline_coerce(plugin, input, call.head)
+                    .map_err(LabeledError::from)?;
+                let lazy = NuLazyFrame::new(lazy.from_eager, lazy.into_polars().$func($ddot));
+                lazy.to_pipeline_data(plugin, engine, call.head)
+                    .map_err(LabeledError::from)
+            }
+        }
+
+        #[cfg(test)]
+        mod $test {
+            use super::*;
+            use nu_protocol::ShellError;
+            use $crate::test::test_polars_plugin_command;
+
+            #[test]
+            fn test_examples() -> Result<(), ShellError> {
+                test_polars_plugin_command(&$command)
+            }
+        }
+    };
+
+    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident?, $test: ident) => {
+        #[derive(Clone)]
+        pub struct $command;
+
+        impl PluginCommand for $command {
+            type Plugin = PolarsPlugin;
+
+            fn name(&self) -> &str {
+                $name
+            }
+
+            fn description(&self) -> &str {
+                $desc
+            }
+            fn signature(&self) -> Signature {
+                Signature::build(self.name())
+                    .input_output_type(
+                        Type::Custom("dataframe".into()),
+                        Type::Custom("dataframe".into()),
+                    )
+                    .category(Category::Custom("lazyframe".into()))
+            }
+
+            fn examples(&self) -> Vec<Example> {
+                $examples
+            }
+
+            fn run(
+                &self,
+                plugin: &Self::Plugin,
+                engine: &EngineInterface,
+                call: &EvaluatedCall,
+                input: PipelineData,
+            ) -> Result<PipelineData, LabeledError> {
+                let lazy = NuLazyFrame::try_from_pipeline_coerce(plugin, input, call.head)
+                    .map_err(LabeledError::from)?;
+
+                let lazy = NuLazyFrame::new(
+                    lazy.from_eager,
+                    lazy.to_polars()
+                        .$func()
+                        .map_err(|e| ShellError::GenericError {
+                            error: "Dataframe Error".into(),
+                            msg: e.to_string(),
+                            help: None,
+                            span: None,
+                            inner: vec![],
+                        })
+                        .map_err(LabeledError::from)?,
+                );
+
+                lazy.to_pipeline_data(plugin, engine, call.head)
+                    .map_err(LabeledError::from)
+            }
+        }
+
+        #[cfg(test)]
+        mod $test {
+            use super::*;
+            use nu_protocol::ShellError;
+            use $crate::test::test_polars_plugin_command;
+
+            #[test]
+            fn test_examples() -> Result<(), ShellError> {
+                test_polars_plugin_command(&$command)
+            }
+        }
+    };
+}
+
+// The structs defined in this file are structs that form part of other commands
+// since they share a similar name
+#[macro_export]
+macro_rules! expr_command {
+    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident, $test: ident) => {
+        #[derive(Clone)]
+        pub struct $command;
+
+        impl PluginCommand for $command {
+            type Plugin = PolarsPlugin;
+
+            fn name(&self) -> &str {
+                $name
+            }
+
+            fn description(&self) -> &str {
+                $desc
+            }
+
+            fn signature(&self) -> Signature {
+                Signature::build(self.name())
+                    .description($desc)
+                    .input_output_type(
+                        Type::Custom("expression".into()),
+                        Type::Custom("expression".into()),
+                    )
+                    .category(Category::Custom("expression".into()))
+            }
+
+            fn examples(&self) -> Vec<Example> {
+                $examples
+            }
+
+            fn run(
+                &self,
+                plugin: &Self::Plugin,
+                engine: &EngineInterface,
+                call: &EvaluatedCall,
+                input: PipelineData,
+            ) -> Result<PipelineData, LabeledError> {
+                let expr = NuExpression::try_from_pipeline(plugin, input, call.head)
+                    .map_err(LabeledError::from)?;
+                let expr: NuExpression = expr.into_polars().$func().into();
+                expr.to_pipeline_data(plugin, engine, call.head)
+                    .map_err(LabeledError::from)
+            }
+        }
+
+        #[cfg(test)]
+        mod $test {
+            use super::*;
+            use nu_protocol::ShellError;
+            use $crate::test::test_polars_plugin_command;
+
+            #[test]
+            fn test_examples() -> Result<(), ShellError> {
+                test_polars_plugin_command(&$command)
+            }
+        }
+    };
+
+    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident, $test: ident, $ddof: expr) => {
+        #[derive(Clone)]
+        pub struct $command;
+
+        impl PluginCommand for $command {
+            type Plugin = PolarsPlugin;
+
+            fn signature(&self) -> Signature {
+                Signature::build(self.name())
+                    .description($desc)
+                    .input_output_type(
+                        Type::Custom("expression".into()),
+                        Type::Custom("expression".into()),
+                    )
+                    .category(Category::Custom("expression".into()))
+                    .plugin_examples($examples)
+            }
+
+            fn run(
+                &self,
+                _plugin: &Self::Plugin,
+                engine: &EngineInterface,
+                call: &EvaluatedCall,
+                input: PipelineData,
+            ) -> Result<PipelineData, LabeledError> {
+                let expr = NuExpression::try_from_pipeline(input, call.head)
+                    .map_err(LabeledError::from)?;
+                let expr: NuExpression = expr.into_polars().$func($ddof).into();
+                expr.to_pipeline_data(plugin, engine, call.head)
+                    .map_err(LabeledError::from)
+            }
+        }
+
+        #[cfg(test)]
+        mod $test {
+            use super::*;
+            use $crate::test::test_polars_plugin_command;
+
+            #[test]
+            fn test_examples() -> Result<(), ShellError> {
+                test_polars_plugin_command(&$command)
+            }
+        }
+    };
+}
+
+// The structs defined in this file are structs that form part of other commands
+// since they share a similar name
+#[macro_export]
+macro_rules! lazy_expr_command {
+    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident, $test: ident) => {
+        #[derive(Clone)]
+        pub struct $command;
+
+        impl PluginCommand for $command {
+            type Plugin = PolarsPlugin;
+
+            fn name(&self) -> &str {
+                $name
+            }
+
+            fn description(&self) -> &str {
+                $desc
+            }
+
+            fn signature(&self) -> Signature {
+                Signature::build(self.name())
+                    .description($desc)
+                    .input_output_types(vec![
+                        (
+                            Type::Custom("expression".into()),
+                            Type::Custom("expression".into()),
+                        ),
+                        (
+                            Type::Custom("dataframe".into()),
+                            Type::Custom("dataframe".into()),
+                        ),
+                    ])
+                    .category(Category::Custom("expression".into()))
+            }
+
+            fn examples(&self) -> Vec<Example> {
+                $examples
+            }
+
+            fn run(
+                &self,
+                plugin: &Self::Plugin,
+                engine: &EngineInterface,
+                call: &EvaluatedCall,
+                input: PipelineData,
+            ) -> Result<PipelineData, LabeledError> {
+                let value = input.into_value(call.head)?;
+                if NuDataFrame::can_downcast(&value) || NuLazyFrame::can_downcast(&value) {
+                    let lazy = NuLazyFrame::try_from_value_coerce(plugin, &value)
+                        .map_err(LabeledError::from)?;
+                    let lazy = NuLazyFrame::new(lazy.from_eager, lazy.to_polars().$func());
+                    lazy.to_pipeline_data(plugin, engine, call.head)
+                        .map_err(LabeledError::from)
+                } else {
+                    let expr =
+                        NuExpression::try_from_value(plugin, &value).map_err(LabeledError::from)?;
+                    let expr: NuExpression = expr.into_polars().$func().into();
+                    expr.to_pipeline_data(plugin, engine, call.head)
+                        .map_err(LabeledError::from)
+                }
+            }
+        }
+
+        #[cfg(test)]
+        mod $test {
+            use super::*;
+            use nu_protocol::ShellError;
+            use $crate::test::test_polars_plugin_command;
+
+            #[test]
+            fn test_examples() -> Result<(), ShellError> {
+                test_polars_plugin_command(&$command)
+            }
+        }
+    };
+
+    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident, $test: ident, $ddof: expr) => {
+        #[derive(Clone)]
+        pub struct $command;
+
+        impl PluginCommand for $command {
+            type Plugin = PolarsPlugin;
+
+            fn name(&self) -> &str {
+                $name
+            }
+
+            fn description(&self) -> &str {
+                $desc
+            }
+            fn signature(&self) -> Signature {
+                Signature::build(self.name())
+                    .input_output_types(vec![
+                        (
+                            Type::Custom("expression".into()),
+                            Type::Custom("expression".into()),
+                        ),
+                        (
+                            Type::Custom("dataframe".into()),
+                            Type::Custom("dataframe".into()),
+                        ),
+                    ])
+                    .category(Category::Custom("expression".into()))
+            }
+
+            fn examples(&self) -> Vec<Example> {
+                $examples
+            }
+
+            fn run(
+                &self,
+                plugin: &Self::Plugin,
+                engine: &EngineInterface,
+                call: &EvaluatedCall,
+                input: PipelineData,
+            ) -> Result<PipelineData, LabeledError> {
+                let value = input.into_value(call.head)?;
+                if NuDataFrame::can_downcast(&value) || NuLazyFrame::can_downcast(&value) {
+                    let lazy = NuLazyFrame::try_from_value_coerce(plugin, &value)
+                        .map_err(LabeledError::from)?;
+                    let lazy = NuLazyFrame::new(lazy.from_eager, lazy.to_polars().$func($ddof));
+                    lazy.to_pipeline_data(plugin, engine, call.head)
+                        .map_err(LabeledError::from)
+                } else {
+                    let expr = NuExpression::try_from_value(plugin, &value)?;
+                    let expr: NuExpression = expr.into_polars().$func($ddof).into();
+                    expr.to_pipeline_data(plugin, engine, call.head)
+                        .map_err(LabeledError::from)
+                }
+            }
+        }
+
+        #[cfg(test)]
+        mod $test {
+            use super::*;
+            use nu_protocol::ShellError;
+            use $crate::test::test_polars_plugin_command;
+
+            #[test]
+            fn test_examples() -> Result<(), ShellError> {
+                test_polars_plugin_command(&$command)
+            }
+        }
+    };
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/command/mod.rs b/crates/nu_plugin_polars/src/dataframe/command/mod.rs
new file mode 100644
index 0000000000..bab0f3c9f2
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/mod.rs
@@ -0,0 +1,10 @@
+pub mod aggregation;
+pub mod boolean;
+pub mod core;
+pub mod data;
+pub mod datetime;
+pub mod index;
+pub mod integer;
+pub mod macro_commands;
+pub mod string;
+pub mod stub;
diff --git a/crates/nu_plugin_polars/src/dataframe/expressions/concat_str.rs b/crates/nu_plugin_polars/src/dataframe/command/string/concat_str.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/expressions/concat_str.rs
rename to crates/nu_plugin_polars/src/dataframe/command/string/concat_str.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/contains.rs b/crates/nu_plugin_polars/src/dataframe/command/string/contains.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/string/contains.rs
rename to crates/nu_plugin_polars/src/dataframe/command/string/contains.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/command/string/mod.rs b/crates/nu_plugin_polars/src/dataframe/command/string/mod.rs
new file mode 100644
index 0000000000..c921fa2d79
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/string/mod.rs
@@ -0,0 +1,36 @@
+mod concat_str;
+mod contains;
+mod replace;
+mod replace_all;
+mod str_join;
+mod str_lengths;
+mod str_slice;
+mod to_lowercase;
+mod to_uppercase;
+
+use crate::PolarsPlugin;
+use nu_plugin::PluginCommand;
+
+pub use concat_str::ExprConcatStr;
+pub use contains::Contains;
+pub use replace::Replace;
+pub use replace_all::ReplaceAll;
+pub use str_join::StrJoin;
+pub use str_lengths::StrLengths;
+pub use str_slice::StrSlice;
+pub use to_lowercase::ToLowerCase;
+pub use to_uppercase::ToUpperCase;
+
+pub(crate) fn string_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin>>> {
+    vec![
+        Box::new(ExprConcatStr),
+        Box::new(Contains),
+        Box::new(Replace),
+        Box::new(ReplaceAll),
+        Box::new(StrJoin),
+        Box::new(StrLengths),
+        Box::new(StrSlice),
+        Box::new(ToLowerCase),
+        Box::new(ToUpperCase),
+    ]
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/replace.rs b/crates/nu_plugin_polars/src/dataframe/command/string/replace.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/string/replace.rs
rename to crates/nu_plugin_polars/src/dataframe/command/string/replace.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/replace_all.rs b/crates/nu_plugin_polars/src/dataframe/command/string/replace_all.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/string/replace_all.rs
rename to crates/nu_plugin_polars/src/dataframe/command/string/replace_all.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/str_join.rs b/crates/nu_plugin_polars/src/dataframe/command/string/str_join.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/string/str_join.rs
rename to crates/nu_plugin_polars/src/dataframe/command/string/str_join.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/str_lengths.rs b/crates/nu_plugin_polars/src/dataframe/command/string/str_lengths.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/string/str_lengths.rs
rename to crates/nu_plugin_polars/src/dataframe/command/string/str_lengths.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/str_slice.rs b/crates/nu_plugin_polars/src/dataframe/command/string/str_slice.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/string/str_slice.rs
rename to crates/nu_plugin_polars/src/dataframe/command/string/str_slice.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/to_lowercase.rs b/crates/nu_plugin_polars/src/dataframe/command/string/to_lowercase.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/string/to_lowercase.rs
rename to crates/nu_plugin_polars/src/dataframe/command/string/to_lowercase.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/to_uppercase.rs b/crates/nu_plugin_polars/src/dataframe/command/string/to_uppercase.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/series/string/to_uppercase.rs
rename to crates/nu_plugin_polars/src/dataframe/command/string/to_uppercase.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/stub.rs b/crates/nu_plugin_polars/src/dataframe/command/stub.rs
similarity index 100%
rename from crates/nu_plugin_polars/src/dataframe/stub.rs
rename to crates/nu_plugin_polars/src/dataframe/command/stub.rs
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/mod.rs b/crates/nu_plugin_polars/src/dataframe/eager/mod.rs
deleted file mode 100644
index 1dea968efe..0000000000
--- a/crates/nu_plugin_polars/src/dataframe/eager/mod.rs
+++ /dev/null
@@ -1,88 +0,0 @@
-mod append;
-mod cast;
-mod columns;
-mod drop;
-mod drop_duplicates;
-mod drop_nulls;
-mod dummies;
-mod filter_with;
-mod first;
-mod get;
-mod last;
-mod open;
-mod pivot;
-mod query_df;
-mod rename;
-mod sample;
-mod save;
-mod schema;
-mod shape;
-mod slice;
-mod sql_context;
-mod sql_expr;
-mod summary;
-mod take;
-mod to_df;
-mod to_nu;
-mod unpivot;
-mod with_column;
-
-use crate::PolarsPlugin;
-
-pub use self::open::OpenDataFrame;
-pub use append::AppendDF;
-pub use cast::CastDF;
-pub use columns::ColumnsDF;
-pub use drop::DropDF;
-pub use drop_duplicates::DropDuplicates;
-pub use drop_nulls::DropNulls;
-pub use dummies::Dummies;
-pub use filter_with::FilterWith;
-pub use first::FirstDF;
-pub use get::GetDF;
-pub use last::LastDF;
-use nu_plugin::PluginCommand;
-pub use query_df::QueryDf;
-pub use rename::RenameDF;
-pub use sample::SampleDF;
-pub use schema::SchemaCmd;
-pub use shape::ShapeDF;
-pub use slice::SliceDF;
-pub use sql_context::SQLContext;
-pub use summary::Summary;
-pub use take::TakeDF;
-pub use to_df::ToDataFrame;
-pub use to_nu::ToNu;
-pub use unpivot::UnpivotDF;
-pub use with_column::WithColumn;
-
-pub(crate) fn eager_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin>>> {
-    vec![
-        Box::new(AppendDF),
-        Box::new(CastDF),
-        Box::new(ColumnsDF),
-        Box::new(DropDF),
-        Box::new(DropDuplicates),
-        Box::new(DropNulls),
-        Box::new(Dummies),
-        Box::new(FilterWith),
-        Box::new(GetDF),
-        Box::new(OpenDataFrame),
-        Box::new(pivot::PivotDF),
-        Box::new(UnpivotDF),
-        Box::new(Summary),
-        Box::new(FirstDF),
-        Box::new(LastDF),
-        Box::new(RenameDF),
-        Box::new(SampleDF),
-        Box::new(ShapeDF),
-        Box::new(SliceDF),
-        Box::new(SchemaCmd),
-        Box::new(TakeDF),
-        Box::new(ToNu),
-        Box::new(ToDataFrame),
-        Box::new(QueryDf),
-        Box::new(WithColumn),
-        Box::new(save::SaveDF),
-    ]
-}
diff --git a/crates/nu_plugin_polars/src/dataframe/expressions/mod.rs b/crates/nu_plugin_polars/src/dataframe/expressions/mod.rs
deleted file mode 100644
index 055b836dac..0000000000
--- a/crates/nu_plugin_polars/src/dataframe/expressions/mod.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-mod alias;
-mod arg_where;
-mod col;
-mod concat_str;
-mod datepart;
-mod expressions_macro;
-mod is_in;
-mod lit;
-mod otherwise;
-mod when;
-
-use nu_plugin::PluginCommand;
-
-pub use crate::dataframe::expressions::alias::ExprAlias;
-pub use crate::dataframe::expressions::arg_where::ExprArgWhere;
-pub use crate::dataframe::expressions::col::ExprCol;
-pub use crate::dataframe::expressions::concat_str::ExprConcatStr;
-pub use crate::dataframe::expressions::datepart::ExprDatePart;
-pub use crate::dataframe::expressions::expressions_macro::*;
-pub use crate::dataframe::expressions::is_in::ExprIsIn;
-pub use crate::dataframe::expressions::lit::ExprLit;
-pub use crate::dataframe::expressions::otherwise::ExprOtherwise;
-pub use crate::dataframe::expressions::when::ExprWhen;
-use crate::PolarsPlugin;
-
-pub(crate) fn expr_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin>>> {
-    vec![
-        Box::new(ExprAlias),
-        Box::new(ExprArgWhere),
-        Box::new(ExprAggGroups),
-        Box::new(ExprCol),
-        Box::new(ExprConcatStr),
-        Box::new(ExprCount),
-        Box::new(ExprDatePart),
-        Box::new(ExprIsIn),
-        Box::new(ExprList),
-        Box::new(ExprLit),
-        Box::new(ExprNot),
-        Box::new(ExprMax),
-        Box::new(ExprMin),
-        Box::new(ExprOtherwise),
-        Box::new(ExprSum),
-        Box::new(ExprMean),
-        Box::new(ExprStd),
-        Box::new(ExprVar),
-        Box::new(ExprWhen),
-    ]
-}
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/macro_commands.rs b/crates/nu_plugin_polars/src/dataframe/lazy/macro_commands.rs
deleted file mode 100644
index eb63f8b9f2..0000000000
--- a/crates/nu_plugin_polars/src/dataframe/lazy/macro_commands.rs
+++ /dev/null
@@ -1,228 +0,0 @@
-/// Definition of multiple lazyframe commands using a macro rule
-/// All of these commands have an identical body and only require
-/// to have a change in the name, description and function
-use crate::dataframe::values::{Column, NuDataFrame, NuLazyFrame};
-use crate::values::CustomValueSupport;
-use crate::PolarsPlugin;
-use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
-use nu_protocol::{Category, Example, LabeledError, PipelineData, Signature, Span, Type, Value};
-
-macro_rules! lazy_command {
-    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident, $test: ident) => {
-        #[derive(Clone)]
-        pub struct $command;
-
-        impl PluginCommand for $command {
-            type Plugin = PolarsPlugin;
-
-            fn name(&self) -> &str {
-                $name
-            }
-
-            fn description(&self) -> &str {
-                $desc
-            }
-
-            fn signature(&self) -> Signature {
-                Signature::build(self.name())
-                    .description($desc)
-                    .input_output_type(
-                        Type::Custom("dataframe".into()),
-                        Type::Custom("dataframe".into()),
-                    )
-                    .category(Category::Custom("lazyframe".into()))
-            }
-
-            fn examples(&self) -> Vec<Example> {
-                $examples
-            }
-
-            fn run(
-                &self,
-                plugin: &Self::Plugin,
-                engine: &EngineInterface,
-                call: &EvaluatedCall,
-                input: PipelineData,
-            ) -> Result<PipelineData, LabeledError> {
-                let lazy = NuLazyFrame::try_from_pipeline_coerce(plugin, input, call.head)
-                    .map_err(LabeledError::from)?;
-                let lazy = NuLazyFrame::new(lazy.from_eager, lazy.to_polars().$func());
-                lazy.to_pipeline_data(plugin, engine, call.head)
-                    .map_err(LabeledError::from)
-            }
-        }
-
-        #[cfg(test)]
-        mod $test {
-            use super::*;
-            use crate::test::test_polars_plugin_command;
-            use nu_protocol::ShellError;
-
-            #[test]
-            fn test_examples() -> Result<(), ShellError> {
-                test_polars_plugin_command(&$command)
-            }
-        }
-    };
-
-    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident, $test: ident, $ddot: expr) => {
-        #[derive(Clone)]
-        pub struct $command;
-
-        impl PluginCommand for $command {
-            type Plugin = PolarsPlugin;
-
-            fn signature(&self) -> Signature {
-                Signature::build($name)
-                    .description($desc)
-                    .input_output_type(
-                        Type::Custom("dataframe".into()),
-                        Type::Custom("dataframe".into()),
-                    )
-                    .category(Category::Custom("lazyframe".into()))
-                    .plugin_examples($examples)
-            }
-
-            fn run(
-                &self,
-                _plugin: &Self::Plugin,
-                engine: &EngineInterface,
-                call: &EvaluatedCall,
-                input: PipelineData,
-            ) -> Result<PipelineData, LabeledError> {
-                let lazy = NuLazyFrame::try_from_pipeline_coerce(plugin, input, call.head)
-                    .map_err(LabeledError::from)?;
-                let lazy = NuLazyFrame::new(lazy.from_eager, lazy.into_polars().$func($ddot));
-                lazy.to_pipeline_data(plugin, engine, call.head)
-                    .map_err(LabeledError::from)
-            }
-        }
-
-        #[cfg(test)]
-        mod $test {
-            use super::*;
-            use crate::test::test_polars_plugin_command;
-            use nu_protocol::ShellError;
-
-            #[test]
-            fn test_examples() -> Result<(), ShellError> {
-                test_polars_plugin_command(&$command)
-            }
-        }
-    };
-
-    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident?, $test: ident) => {
-        #[derive(Clone)]
-        pub struct $command;
-
-        impl PluginCommand for $command {
-            type Plugin = PolarsPlugin;
-
-            fn name(&self) -> &str {
-                $name
-            }
-
-            fn description(&self) -> &str {
-                $desc
-            }
-            fn signature(&self) -> Signature {
-                Signature::build(self.name())
-                    .input_output_type(
-                        Type::Custom("dataframe".into()),
-                        Type::Custom("dataframe".into()),
-                    )
-                    .category(Category::Custom("lazyframe".into()))
-            }
-
-            fn examples(&self) -> Vec<Example> {
-                $examples
-            }
-
-            fn run(
-                &self,
-                plugin: &Self::Plugin,
-                engine: &EngineInterface,
-                call: &EvaluatedCall,
-                input: PipelineData,
-            ) -> Result<PipelineData, LabeledError> {
-                let lazy = NuLazyFrame::try_from_pipeline_coerce(plugin, input, call.head)
-                    .map_err(LabeledError::from)?;
-
-                let lazy = NuLazyFrame::new(
-                    lazy.from_eager,
-                    lazy.to_polars()
-                        .$func()
-                        .map_err(|e| ShellError::GenericError {
-                            error: "Dataframe Error".into(),
-                            msg: e.to_string(),
-                            help: None,
-                            span: None,
-                            inner: vec![],
-                        })
-                        .map_err(LabeledError::from)?,
-                );
-
-                lazy.to_pipeline_data(plugin, engine, call.head)
-                    .map_err(LabeledError::from)
-            }
-        }
-
-        #[cfg(test)]
-        mod $test {
-            use super::*;
-            use crate::test::test_polars_plugin_command;
-            use nu_protocol::ShellError;
-
-            #[test]
-            fn test_examples() -> Result<(), ShellError> {
-                test_polars_plugin_command(&$command)
-            }
-        }
-    };
-}
-
-// LazyReverse command
-// Expands to a command definition for reverse
-lazy_command!(
-    LazyReverse,
-    "polars reverse",
-    "Reverses the LazyFrame",
-    vec![Example {
-        description: "Reverses the dataframe.",
-        example: "[[a b]; [6 2] [4 2] [2 2]] | polars into-df | polars reverse",
-        result: Some(
-            NuDataFrame::try_from_columns(
-                vec![
-                    Column::new(
-                        "a".to_string(),
-                        vec![Value::test_int(2), Value::test_int(4), Value::test_int(6),],
-                    ),
-                    Column::new(
-                        "b".to_string(),
-                        vec![Value::test_int(2), Value::test_int(2), Value::test_int(2),],
-                    ),
-                ],
-                None
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Span::test_data()),
-        ),
-    },],
-    reverse,
-    test_reverse
-);
-
-// LazyCache command
-// Expands to a command definition for cache
-lazy_command!(
-    LazyCache,
-    "polars cache",
-    "Caches operations in a new LazyFrame.",
-    vec![Example {
-        description: "Caches the result into a new LazyFrame",
-        example: "[[a b]; [6 2] [4 2] [2 2]] | polars into-df | polars reverse | polars cache",
-        result: None,
-    }],
-    cache,
-    test_cache
-);
diff --git a/crates/nu_plugin_polars/src/dataframe/lazy/mod.rs b/crates/nu_plugin_polars/src/dataframe/lazy/mod.rs
deleted file mode 100644
index e70143e6ce..0000000000
--- a/crates/nu_plugin_polars/src/dataframe/lazy/mod.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-mod aggregate;
-mod collect;
-mod explode;
-mod fetch;
-mod fill_nan;
-mod fill_null;
-mod filter;
-mod flatten;
-pub mod groupby;
-mod join;
-mod macro_commands;
-mod median;
-mod quantile;
-mod select;
-mod sort_by_expr;
-mod to_lazy;
-
-use nu_plugin::PluginCommand;
-
-pub use crate::dataframe::lazy::aggregate::LazyAggregate;
-pub use crate::dataframe::lazy::collect::LazyCollect;
-use crate::dataframe::lazy::fetch::LazyFetch;
-use crate::dataframe::lazy::fill_nan::LazyFillNA;
-pub use crate::dataframe::lazy::fill_null::LazyFillNull;
-use crate::dataframe::lazy::filter::LazyFilter;
-use crate::dataframe::lazy::groupby::ToLazyGroupBy;
-use crate::dataframe::lazy::join::LazyJoin;
-pub(crate) use crate::dataframe::lazy::macro_commands::*;
-use crate::dataframe::lazy::quantile::LazyQuantile;
-pub(crate) use crate::dataframe::lazy::select::LazySelect;
-use crate::dataframe::lazy::sort_by_expr::LazySortBy;
-pub use crate::dataframe::lazy::to_lazy::ToLazyFrame;
-use crate::PolarsPlugin;
-pub use explode::LazyExplode;
-pub use flatten::LazyFlatten;
-
-pub(crate) fn lazy_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin>>> {
-    vec![
-        Box::new(LazyAggregate),
-        Box::new(LazyCache),
-        Box::new(LazyCollect),
-        Box::new(LazyExplode),
-        Box::new(LazyFetch),
-        Box::new(LazyFillNA),
-        Box::new(LazyFillNull),
-        Box::new(LazyFilter),
-        Box::new(LazyFlatten),
-        Box::new(LazyJoin),
-        Box::new(median::LazyMedian),
-        Box::new(LazyReverse),
-        Box::new(LazySelect),
-        Box::new(LazySortBy),
-        Box::new(LazyQuantile),
-        Box::new(ToLazyFrame),
-        Box::new(ToLazyGroupBy),
-    ]
-}
diff --git a/crates/nu_plugin_polars/src/dataframe/mod.rs b/crates/nu_plugin_polars/src/dataframe/mod.rs
index e41ef5bc1a..6899b8beee 100644
--- a/crates/nu_plugin_polars/src/dataframe/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/mod.rs
@@ -1,10 +1,6 @@
 use nu_protocol::{ShellError, Span};
 
-pub mod eager;
-pub mod expressions;
-pub mod lazy;
-pub mod series;
-pub mod stub;
+pub mod command;
 mod utils;
 pub mod values;
 
diff --git a/crates/nu_plugin_polars/src/dataframe/series/date/mod.rs b/crates/nu_plugin_polars/src/dataframe/series/date/mod.rs
deleted file mode 100644
index ed3895a172..0000000000
--- a/crates/nu_plugin_polars/src/dataframe/series/date/mod.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-mod as_date;
-mod as_datetime;
-mod get_day;
-mod get_hour;
-mod get_minute;
-mod get_month;
-mod get_nanosecond;
-mod get_ordinal;
-mod get_second;
-mod get_week;
-mod get_weekday;
-mod get_year;
-
-pub use as_date::AsDate;
-pub use as_datetime::AsDateTime;
-pub use get_day::GetDay;
-pub use get_hour::GetHour;
-pub use get_minute::GetMinute;
-pub use get_month::GetMonth;
-pub use get_nanosecond::GetNanosecond;
-pub use get_ordinal::GetOrdinal;
-pub use get_second::GetSecond;
-pub use get_week::GetWeek;
-pub use get_weekday::GetWeekDay;
-pub use get_year::GetYear;
diff --git a/crates/nu_plugin_polars/src/dataframe/series/indexes/mod.rs b/crates/nu_plugin_polars/src/dataframe/series/indexes/mod.rs
deleted file mode 100644
index c0af8c8653..0000000000
--- a/crates/nu_plugin_polars/src/dataframe/series/indexes/mod.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-mod arg_sort;
-mod arg_true;
-mod arg_unique;
-mod set_with_idx;
-
-pub use arg_sort::ArgSort;
-pub use arg_true::ArgTrue;
-pub use arg_unique::ArgUnique;
-pub use set_with_idx::SetWithIndex;
diff --git a/crates/nu_plugin_polars/src/dataframe/series/masks/mod.rs b/crates/nu_plugin_polars/src/dataframe/series/masks/mod.rs
deleted file mode 100644
index 985b14eaec..0000000000
--- a/crates/nu_plugin_polars/src/dataframe/series/masks/mod.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-mod is_duplicated;
-mod is_not_null;
-mod is_null;
-mod is_unique;
-mod not;
-mod set;
-
-pub use is_duplicated::IsDuplicated;
-pub use is_not_null::IsNotNull;
-pub use is_null::IsNull;
-pub use is_unique::IsUnique;
-pub use not::NotSeries;
-pub use set::SetSeries;
diff --git a/crates/nu_plugin_polars/src/dataframe/series/mod.rs b/crates/nu_plugin_polars/src/dataframe/series/mod.rs
deleted file mode 100644
index d4328937f6..0000000000
--- a/crates/nu_plugin_polars/src/dataframe/series/mod.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-mod date;
-pub use date::*;
-
-mod string;
-pub use string::*;
-
-mod masks;
-pub use masks::*;
-
-mod indexes;
-pub use indexes::*;
-
-mod all_false;
-mod all_true;
-mod arg_max;
-mod arg_min;
-mod cumulative;
-mod n_null;
-mod n_unique;
-mod rolling;
-mod shift;
-mod unique;
-mod value_counts;
-
-pub use all_false::AllFalse;
-use nu_plugin::PluginCommand;
-
-use crate::PolarsPlugin;
-pub use all_true::AllTrue;
-pub use arg_max::ArgMax;
-pub use arg_min::ArgMin;
-pub use cumulative::Cumulative;
-pub use n_null::NNull;
-pub use n_unique::NUnique;
-pub use rolling::Rolling;
-pub use shift::Shift;
-pub use unique::Unique;
-pub use value_counts::ValueCount;
-
-pub(crate) fn series_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin>>> {
-    vec![
-        Box::new(AllFalse),
-        Box::new(AllTrue),
-        Box::new(ArgMax),
-        Box::new(ArgMin),
-        Box::new(ArgSort),
-        Box::new(ArgTrue),
-        Box::new(ArgUnique),
-        Box::new(AsDate),
-        Box::new(AsDateTime),
-        Box::new(Contains),
-        Box::new(Cumulative),
-        Box::new(GetDay),
-        Box::new(GetHour),
-        Box::new(GetMinute),
-        Box::new(GetMonth),
-        Box::new(GetNanosecond),
-        Box::new(GetOrdinal),
-        Box::new(GetSecond),
-        Box::new(GetWeek),
-        Box::new(GetWeekDay),
-        Box::new(GetYear),
-        Box::new(IsDuplicated),
-        Box::new(IsNotNull),
-        Box::new(IsNull),
-        Box::new(IsUnique),
-        Box::new(NNull),
-        Box::new(NUnique),
-        Box::new(NotSeries),
-        Box::new(Replace),
-        Box::new(ReplaceAll),
-        Box::new(Rolling),
-        Box::new(SetSeries),
-        Box::new(SetWithIndex),
-        Box::new(Shift),
-        Box::new(StrJoin),
-        Box::new(StrLengths),
-        Box::new(StrSlice),
-        Box::new(StrFTime),
-        Box::new(ToDecimal),
-        Box::new(ToInteger),
-        Box::new(ToLowerCase),
-        Box::new(ToUpperCase),
-        Box::new(Unique),
-        Box::new(ValueCount),
-    ]
-}
diff --git a/crates/nu_plugin_polars/src/dataframe/series/string/mod.rs b/crates/nu_plugin_polars/src/dataframe/series/string/mod.rs
deleted file mode 100644
index 0aa758c7aa..0000000000
--- a/crates/nu_plugin_polars/src/dataframe/series/string/mod.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-mod contains;
-mod replace;
-mod replace_all;
-mod str_join;
-mod str_lengths;
-mod str_slice;
-mod strftime;
-mod to_decimal;
-mod to_integer;
-mod to_lowercase;
-mod to_uppercase;
-
-pub use contains::Contains;
-pub use replace::Replace;
-pub use replace_all::ReplaceAll;
-pub use str_join::StrJoin;
-pub use str_lengths::StrLengths;
-pub use str_slice::StrSlice;
-pub use strftime::StrFTime;
-pub use to_decimal::ToDecimal;
-pub use to_integer::ToInteger;
-pub use to_lowercase::ToLowerCase;
-pub use to_uppercase::ToUpperCase;
diff --git a/crates/nu_plugin_polars/src/lib.rs b/crates/nu_plugin_polars/src/lib.rs
index e4d627e4db..c537ef53fe 100644
--- a/crates/nu_plugin_polars/src/lib.rs
+++ b/crates/nu_plugin_polars/src/lib.rs
@@ -2,7 +2,11 @@ use std::cmp::Ordering;
 
 use cache::cache_commands;
 pub use cache::{Cache, Cacheable};
-use dataframe::{stub::PolarsCmd, values::CustomValueType};
+use command::{
+    aggregation::aggregation_commands, boolean::boolean_commands, core::core_commands,
+    data::data_commands, datetime::datetime_commands, index::index_commands,
+    integer::integer_commands, string::string_commands, stub::PolarsCmd,
+};
 use log::debug;
 use nu_plugin::{EngineInterface, Plugin, PluginCommand};
 
@@ -10,11 +14,9 @@ mod cache;
 pub mod dataframe;
 pub use dataframe::*;
 use nu_protocol::{ast::Operator, CustomValue, LabeledError, ShellError, Span, Spanned, Value};
+use values::CustomValueType;
 
-use crate::{
-    eager::eager_commands, expressions::expr_commands, lazy::lazy_commands,
-    series::series_commands, values::PolarsPluginCustomValue,
-};
+use crate::values::PolarsPluginCustomValue;
 
 pub trait EngineWrapper {
     fn get_env_var(&self, key: &str) -> Option<String>;
@@ -61,10 +63,16 @@ impl Plugin for PolarsPlugin {
 
     fn commands(&self) -> Vec<Box<dyn PluginCommand<Plugin = Self>>> {
         let mut commands: Vec<Box<dyn PluginCommand<Plugin = Self>>> = vec![Box::new(PolarsCmd)];
-        commands.append(&mut eager_commands());
-        commands.append(&mut lazy_commands());
-        commands.append(&mut expr_commands());
-        commands.append(&mut series_commands());
+
+        commands.append(&mut aggregation_commands());
+        commands.append(&mut boolean_commands());
+        commands.append(&mut core_commands());
+        commands.append(&mut data_commands());
+        commands.append(&mut datetime_commands());
+        commands.append(&mut index_commands());
+        commands.append(&mut integer_commands());
+        commands.append(&mut string_commands());
+
         commands.append(&mut cache_commands());
         commands
     }

From 6c1c7f95090649b3d73845f9cc81f35a3161161b Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Fri, 6 Sep 2024 20:03:51 -0700
Subject: [PATCH 0420/1072] Added expression support for `polars cumulative`
 (#13799)

# Description
Provides the ability to use `polars cumulative` as an expression:

<img width="1266" alt="Screenshot 2024-09-06 at 17 47 15"
src="https://github.com/user-attachments/assets/73c11f79-598c-4efa-bfcd-755e536ead66">

# User-Facing Changes
- `polars cumulative` can now be used as an expression.
---
 .../command/aggregation/cumulative.rs         | 96 ++++++++++++++++---
 1 file changed, 83 insertions(+), 13 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/command/aggregation/cumulative.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/cumulative.rs
index e745bf5432..db3affbd25 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/aggregation/cumulative.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/cumulative.rs
@@ -1,6 +1,8 @@
 use crate::{values::CustomValueSupport, PolarsPlugin};
 
-use crate::values::{Column, NuDataFrame};
+use crate::values::{
+    cant_convert_err, Column, NuDataFrame, NuExpression, PolarsPluginObject, PolarsPluginType,
+};
 
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
@@ -52,22 +54,53 @@ impl PluginCommand for Cumulative {
     }
 
     fn description(&self) -> &str {
-        "Cumulative calculation for a series."
+        "Cumulative calculation for a column or series."
     }
 
     fn signature(&self) -> Signature {
         Signature::build(self.name())
-            .required("type", SyntaxShape::String, "rolling operation")
-            .switch("reverse", "Reverse cumulative calculation", Some('r'))
-            .input_output_type(
-                Type::Custom("dataframe".into()),
-                Type::Custom("dataframe".into()),
+            .required(
+                "type",
+                SyntaxShape::String,
+                "rolling operation. Values of min, max, and sum are accepted.",
             )
+            .switch("reverse", "Reverse cumulative calculation", Some('r'))
+            .input_output_types(vec![
+                (
+                    Type::Custom("dataframe".into()),
+                    Type::Custom("dataframe".into()),
+                ),
+                (
+                    Type::Custom("expression".into()),
+                    Type::Custom("expression".into()),
+                ),
+            ])
             .category(Category::Custom("dataframe".into()))
     }
 
     fn examples(&self) -> Vec<Example> {
         vec![
+            Example {
+                description: "Cumulative sum for a column",
+                example: "[[a]; [1] [2] [3] [4] [5]] | polars into-df | polars select (polars col a | polars cumulative sum | polars as cum_a) | polars collect",
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![Column::new(
+                            "cum_a".to_string(),
+                            vec![
+                                Value::test_int(1),
+                                Value::test_int(3),
+                                Value::test_int(6),
+                                Value::test_int(10),
+                                Value::test_int(15),
+                            ],
+                        )],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
             Example {
                 description: "Cumulative sum for a series",
                 example: "[1 2 3 4 5] | polars into-df | polars cumulative sum",
@@ -120,20 +153,58 @@ impl PluginCommand for Cumulative {
         call: &EvaluatedCall,
         input: PipelineData,
     ) -> Result<PipelineData, LabeledError> {
-        command(plugin, engine, call, input).map_err(LabeledError::from)
+        let value = input.into_value(call.head)?;
+        let cum_type: Spanned<String> = call.req(0)?;
+        let cum_type = CumulativeType::from_str(&cum_type.item, cum_type.span)?;
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuDataFrame(df) => command_df(plugin, engine, call, cum_type, df),
+            PolarsPluginObject::NuLazyFrame(lazy) => {
+                command_df(plugin, engine, call, cum_type, lazy.collect(call.head)?)
+            }
+            PolarsPluginObject::NuExpression(expr) => {
+                command_expr(plugin, engine, call, cum_type, expr)
+            }
+            _ => Err(cant_convert_err(
+                &value,
+                &[
+                    PolarsPluginType::NuDataFrame,
+                    PolarsPluginType::NuLazyFrame,
+                    PolarsPluginType::NuExpression,
+                ],
+            )),
+        }
+        .map_err(LabeledError::from)
     }
 }
 
-fn command(
+fn command_expr(
     plugin: &PolarsPlugin,
     engine: &EngineInterface,
     call: &EvaluatedCall,
-    input: PipelineData,
+    cum_type: CumulativeType,
+    expr: NuExpression,
 ) -> Result<PipelineData, ShellError> {
-    let cum_type: Spanned<String> = call.req(0)?;
     let reverse = call.has_flag("reverse")?;
+    let polars = expr.into_polars();
 
-    let df = NuDataFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
+    let res: NuExpression = match cum_type {
+        CumulativeType::Max => polars.cum_max(reverse),
+        CumulativeType::Min => polars.cum_min(reverse),
+        CumulativeType::Sum => polars.cum_sum(reverse),
+    }
+    .into();
+
+    res.to_pipeline_data(plugin, engine, call.head)
+}
+
+fn command_df(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    cum_type: CumulativeType,
+    df: NuDataFrame,
+) -> Result<PipelineData, ShellError> {
+    let reverse = call.has_flag("reverse")?;
     let series = df.as_series(call.head)?;
 
     if let DataType::Object(..) = series.dtype() {
@@ -146,7 +217,6 @@ fn command(
         });
     }
 
-    let cum_type = CumulativeType::from_str(&cum_type.item, cum_type.span)?;
     let mut res = match cum_type {
         CumulativeType::Max => cum_max(&series, reverse),
         CumulativeType::Min => cum_min(&series, reverse),

From 3d008e2c4e1248672763ec5141146eaaba526b0d Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Fri, 6 Sep 2024 23:44:26 -0700
Subject: [PATCH 0421/1072] Error on non-zero exit statuses (#13515)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
This PR makes it so that non-zero exit codes and termination by signal
are treated as a normal `ShellError`. Currently, these are silent
errors. That is, if an external command fails, then it's code block is
aborted, but the parent block can sometimes continue execution. E.g.,
see #8569 and this example:
```nushell
[1 2] | each { ^false }
```

Before this would give:
```
╭───┬──╮
│ 0 │  │
│ 1 │  │
╰───┴──╯
```

Now, this shows an error:
```
Error: nu::shell::eval_block_with_input

  × Eval block failed with pipeline input
   ╭─[entry #1:1:2]
 1 │ [1 2] | each { ^false }
   ·  ┬
   ·  ╰── source value
   ╰────

Error: nu::shell::non_zero_exit_code

  × External command had a non-zero exit code
   ╭─[entry #1:1:17]
 1 │ [1 2] | each { ^false }
   ·                 ──┬──
   ·                   ╰── exited with code 1
   ╰────
```

This PR fixes #12874, fixes #5960, fixes #10856, and fixes #5347. This
PR also partially addresses #10633 and #10624 (only the last command of
a pipeline is currently checked). It looks like #8569 is already fixed,
but this PR will make sure it is definitely fixed (fixes #8569).

# User-Facing Changes
- Non-zero exit codes and termination by signal now cause an error to be
thrown.
- The error record value passed to a `catch` block may now have an
`exit_code` column containing the integer exit code if the error was due
to an external command.
- Adds new config values, `display_errors.exit_code` and
`display_errors.termination_signal`, which determine whether an error
message should be printed in the respective error cases. For
non-interactive sessions, these are set to `true`, and for interactive
sessions `display_errors.exit_code` is false (via the default config).

# Tests
Added a few tests.

# After Submitting
- Update docs and book.
- Future work:
- Error if other external commands besides the last in a pipeline exit
with a non-zero exit code. Then, deprecate `do -c` since this will be
the default behavior everywhere.
- Add a better mechanism for exit codes and deprecate
`$env.LAST_EXIT_CODE` (it's buggy).
---
 crates/nu-cli/src/config_files.rs             |  29 ++---
 crates/nu-cli/src/eval_cmds.rs                |  15 +--
 crates/nu-cli/src/eval_file.rs                |  17 ++-
 crates/nu-cli/src/prompt_update.rs            |   4 +-
 crates/nu-cli/src/repl.rs                     |  26 ++--
 crates/nu-cli/src/util.rs                     |  67 ++++++-----
 crates/nu-cmd-base/src/hook.rs                |  10 +-
 crates/nu-cmd-lang/src/core_commands/do_.rs   |  10 +-
 crates/nu-cmd-lang/src/core_commands/for_.rs  |  46 ++-----
 crates/nu-cmd-lang/src/core_commands/if_.rs   |   3 +-
 crates/nu-cmd-lang/src/core_commands/loop_.rs |  21 +---
 .../nu-cmd-lang/src/core_commands/match_.rs   |   2 +-
 crates/nu-cmd-lang/src/core_commands/try_.rs  |  75 +++++-------
 .../nu-cmd-lang/src/core_commands/while_.rs   |  25 +---
 crates/nu-cmd-lang/src/example_support.rs     |   4 +-
 crates/nu-command/src/debug/timeit.rs         |   2 +-
 crates/nu-command/src/filesystem/rm.rs        |   4 +-
 crates/nu-command/src/filesystem/watch.rs     |   4 +-
 crates/nu-command/src/filters/group.rs        |   6 +-
 crates/nu-command/src/filters/tee.rs          |   4 +-
 crates/nu-command/src/network/url/join.rs     |   2 +-
 .../strings/encode_decode/decode_base64.rs    |   6 +-
 .../strings/encode_decode/encode_base64.rs    |   6 +-
 .../nu-command/src/strings/str_/contains.rs   |   2 +-
 crates/nu-command/tests/commands/do_.rs       |   6 +-
 crates/nu-command/tests/commands/try_.rs      |  10 +-
 crates/nu-engine/src/compile/builder.rs       |   2 +-
 crates/nu-engine/src/compile/keyword.rs       |  30 +----
 crates/nu-engine/src/eval.rs                  | 106 ++++++----------
 crates/nu-engine/src/eval_helpers.rs          |   8 +-
 crates/nu-engine/src/eval_ir.rs               |  63 +++-------
 crates/nu-plugin-engine/src/init.rs           |   4 +-
 .../nu-plugin-test-support/src/plugin_test.rs |   4 +-
 .../nu-protocol/src/config/display_errors.rs  |  29 +++++
 crates/nu-protocol/src/config/mod.rs          |  27 +++++
 crates/nu-protocol/src/engine/stack.rs        |  10 ++
 crates/nu-protocol/src/errors/cli_error.rs    |  51 ++++----
 crates/nu-protocol/src/errors/mod.rs          |   3 +-
 crates/nu-protocol/src/errors/shell_error.rs  | 109 +++++++++++++----
 crates/nu-protocol/src/ir/display.rs          |   3 -
 crates/nu-protocol/src/ir/mod.rs              |   4 -
 .../nu-protocol/src/pipeline/byte_stream.rs   |  54 ++++-----
 .../nu-protocol/src/pipeline/pipeline_data.rs | 113 +++---------------
 crates/nu-protocol/src/process/child.rs       |  28 ++---
 crates/nu-protocol/src/process/exit_status.rs |  42 +++++++
 crates/nu-protocol/tests/test_config.rs       |  14 ++-
 crates/nu-std/src/lib.rs                      |   4 +-
 .../src/sample_config/default_config.nu       |   8 ++
 src/command.rs                                |   4 +-
 src/config_files.rs                           |  16 ++-
 src/ide.rs                                    |   4 +-
 src/main.rs                                   |   8 +-
 src/run.rs                                    |  34 ++----
 tests/shell/pipeline/commands/external.rs     |  28 +++--
 54 files changed, 566 insertions(+), 650 deletions(-)
 create mode 100644 crates/nu-protocol/src/config/display_errors.rs

diff --git a/crates/nu-cli/src/config_files.rs b/crates/nu-cli/src/config_files.rs
index 701db7ac65..427f503a6f 100644
--- a/crates/nu-cli/src/config_files.rs
+++ b/crates/nu-cli/src/config_files.rs
@@ -2,10 +2,10 @@ use crate::util::eval_source;
 #[cfg(feature = "plugin")]
 use nu_path::canonicalize_with;
 #[cfg(feature = "plugin")]
-use nu_protocol::{engine::StateWorkingSet, report_error, ParseError, PluginRegistryFile, Spanned};
+use nu_protocol::{engine::StateWorkingSet, ParseError, PluginRegistryFile, Spanned};
 use nu_protocol::{
     engine::{EngineState, Stack},
-    report_error_new, HistoryFileFormat, PipelineData,
+    report_shell_error, HistoryFileFormat, PipelineData,
 };
 #[cfg(feature = "plugin")]
 use nu_utils::perf;
@@ -36,7 +36,7 @@ pub fn read_plugin_file(
         .and_then(|p| Path::new(&p.item).extension())
         .is_some_and(|ext| ext == "nu")
     {
-        report_error_new(
+        report_shell_error(
             engine_state,
             &ShellError::GenericError {
                 error: "Wrong plugin file format".into(),
@@ -81,7 +81,7 @@ pub fn read_plugin_file(
                         return;
                     }
                 } else {
-                    report_error_new(
+                    report_shell_error(
                         engine_state,
                         &ShellError::GenericError {
                             error: format!(
@@ -113,7 +113,7 @@ pub fn read_plugin_file(
             Ok(contents) => contents,
             Err(err) => {
                 log::warn!("Failed to read plugin registry file: {err:?}");
-                report_error_new(
+                report_shell_error(
                     engine_state,
                     &ShellError::GenericError {
                         error: format!(
@@ -146,7 +146,7 @@ pub fn read_plugin_file(
         nu_plugin_engine::load_plugin_file(&mut working_set, &contents, span);
 
         if let Err(err) = engine_state.merge_delta(working_set.render()) {
-            report_error_new(engine_state, &err);
+            report_shell_error(engine_state, &err);
             return;
         }
 
@@ -166,7 +166,7 @@ pub fn add_plugin_file(
 ) {
     use std::path::Path;
 
-    let working_set = StateWorkingSet::new(engine_state);
+    use nu_protocol::report_parse_error;
 
     if let Ok(cwd) = engine_state.cwd_as_string(None) {
         if let Some(plugin_file) = plugin_file {
@@ -181,8 +181,8 @@ pub fn add_plugin_file(
                 engine_state.plugin_path = Some(path)
             } else {
                 // It's an error if the directory for the plugin file doesn't exist.
-                report_error(
-                    &working_set,
+                report_parse_error(
+                    &StateWorkingSet::new(engine_state),
                     &ParseError::FileNotFound(
                         path_dir.to_string_lossy().into_owned(),
                         plugin_file.span,
@@ -214,7 +214,8 @@ pub fn eval_config_contents(
             let prev_file = engine_state.file.take();
             engine_state.file = Some(config_path.clone());
 
-            eval_source(
+            // TODO: ignore this error?
+            let _ = eval_source(
                 engine_state,
                 stack,
                 &contents,
@@ -230,11 +231,11 @@ pub fn eval_config_contents(
             match engine_state.cwd(Some(stack)) {
                 Ok(cwd) => {
                     if let Err(e) = engine_state.merge_env(stack, cwd) {
-                        report_error_new(engine_state, &e);
+                        report_shell_error(engine_state, &e);
                     }
                 }
                 Err(e) => {
-                    report_error_new(engine_state, &e);
+                    report_shell_error(engine_state, &e);
                 }
             }
         }
@@ -280,7 +281,7 @@ pub fn migrate_old_plugin_file(engine_state: &EngineState, storage_path: &str) -
     let old_contents = match std::fs::read(&old_plugin_file_path) {
         Ok(old_contents) => old_contents,
         Err(err) => {
-            report_error_new(
+            report_shell_error(
                 engine_state,
                 &ShellError::GenericError {
                     error: "Can't read old plugin file to migrate".into(),
@@ -349,7 +350,7 @@ pub fn migrate_old_plugin_file(engine_state: &EngineState, storage_path: &str) -
         .map_err(|e| e.into())
         .and_then(|file| contents.write_to(file, None))
     {
-        report_error_new(
+        report_shell_error(
             &engine_state,
             &ShellError::GenericError {
                 error: "Failed to save migrated plugin file".into(),
diff --git a/crates/nu-cli/src/eval_cmds.rs b/crates/nu-cli/src/eval_cmds.rs
index 0a9136bc51..f0bebfc884 100644
--- a/crates/nu-cli/src/eval_cmds.rs
+++ b/crates/nu-cli/src/eval_cmds.rs
@@ -2,9 +2,10 @@ use log::info;
 use nu_engine::{convert_env_values, eval_block};
 use nu_parser::parse;
 use nu_protocol::{
+    cli_error::report_compile_error,
     debugger::WithoutDebug,
     engine::{EngineState, Stack, StateWorkingSet},
-    report_error, PipelineData, ShellError, Spanned, Value,
+    report_parse_error, report_parse_warning, PipelineData, ShellError, Spanned, Value,
 };
 use std::sync::Arc;
 
@@ -61,16 +62,16 @@ pub fn evaluate_commands(
 
         let output = parse(&mut working_set, None, commands.item.as_bytes(), false);
         if let Some(warning) = working_set.parse_warnings.first() {
-            report_error(&working_set, warning);
+            report_parse_warning(&working_set, warning);
         }
 
         if let Some(err) = working_set.parse_errors.first() {
-            report_error(&working_set, err);
+            report_parse_error(&working_set, err);
             std::process::exit(1);
         }
 
         if let Some(err) = working_set.compile_errors.first() {
-            report_error(&working_set, err);
+            report_compile_error(&working_set, err);
             // Not a fatal error, for now
         }
 
@@ -92,11 +93,7 @@ pub fn evaluate_commands(
             t_mode.coerce_str()?.parse().unwrap_or_default();
     }
 
-    if let Some(status) = pipeline.print(engine_state, stack, no_newline, false)? {
-        if status.code() != 0 {
-            std::process::exit(status.code())
-        }
-    }
+    pipeline.print(engine_state, stack, no_newline, false)?;
 
     info!("evaluate {}:{}:{}", file!(), line!(), column!());
 
diff --git a/crates/nu-cli/src/eval_file.rs b/crates/nu-cli/src/eval_file.rs
index bac4378d1b..df75f7e4f8 100644
--- a/crates/nu-cli/src/eval_file.rs
+++ b/crates/nu-cli/src/eval_file.rs
@@ -4,9 +4,10 @@ use nu_engine::{convert_env_values, eval_block};
 use nu_parser::parse;
 use nu_path::canonicalize_with;
 use nu_protocol::{
+    cli_error::report_compile_error,
     debugger::WithoutDebug,
     engine::{EngineState, Stack, StateWorkingSet},
-    report_error, PipelineData, ShellError, Span, Value,
+    report_parse_error, report_parse_warning, PipelineData, ShellError, Span, Value,
 };
 use std::sync::Arc;
 
@@ -77,17 +78,17 @@ pub fn evaluate_file(
     let block = parse(&mut working_set, Some(file_path_str), &file, false);
 
     if let Some(warning) = working_set.parse_warnings.first() {
-        report_error(&working_set, warning);
+        report_parse_warning(&working_set, warning);
     }
 
     // If any parse errors were found, report the first error and exit.
     if let Some(err) = working_set.parse_errors.first() {
-        report_error(&working_set, err);
+        report_parse_error(&working_set, err);
         std::process::exit(1);
     }
 
     if let Some(err) = working_set.compile_errors.first() {
-        report_error(&working_set, err);
+        report_compile_error(&working_set, err);
         // Not a fatal error, for now
     }
 
@@ -118,11 +119,7 @@ pub fn evaluate_file(
             };
 
         // Print the pipeline output of the last command of the file.
-        if let Some(status) = pipeline.print(engine_state, stack, true, false)? {
-            if status.code() != 0 {
-                std::process::exit(status.code())
-            }
-        }
+        pipeline.print(engine_state, stack, true, false)?;
 
         // Invoke the main command with arguments.
         // Arguments with whitespaces are quoted, thus can be safely concatenated by whitespace.
@@ -140,7 +137,7 @@ pub fn evaluate_file(
     };
 
     if exit_code != 0 {
-        std::process::exit(exit_code)
+        std::process::exit(exit_code);
     }
 
     info!("evaluate {}:{}:{}", file!(), line!(), column!());
diff --git a/crates/nu-cli/src/prompt_update.rs b/crates/nu-cli/src/prompt_update.rs
index dd99b6f338..d96bf40b8f 100644
--- a/crates/nu-cli/src/prompt_update.rs
+++ b/crates/nu-cli/src/prompt_update.rs
@@ -3,7 +3,7 @@ use log::trace;
 use nu_engine::ClosureEvalOnce;
 use nu_protocol::{
     engine::{EngineState, Stack},
-    report_error_new, Config, PipelineData, Value,
+    report_shell_error, Config, PipelineData, Value,
 };
 use reedline::Prompt;
 
@@ -80,7 +80,7 @@ fn get_prompt_string(
 
                 result
                     .map_err(|err| {
-                        report_error_new(engine_state, &err);
+                        report_shell_error(engine_state, &err);
                     })
                     .ok()
             }
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 95fb000be0..0e734571c9 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -27,7 +27,7 @@ use nu_parser::{lex, parse, trim_quotes_str};
 use nu_protocol::{
     config::NuCursorShape,
     engine::{EngineState, Stack, StateWorkingSet},
-    report_error_new, HistoryConfig, HistoryFileFormat, PipelineData, ShellError, Span, Spanned,
+    report_shell_error, HistoryConfig, HistoryFileFormat, PipelineData, ShellError, Span, Spanned,
     Value,
 };
 use nu_utils::{
@@ -88,7 +88,7 @@ pub fn evaluate_repl(
     let start_time = std::time::Instant::now();
     // Translate environment variables from Strings to Values
     if let Err(e) = convert_env_values(engine_state, &unique_stack) {
-        report_error_new(engine_state, &e);
+        report_shell_error(engine_state, &e);
     }
     perf!("translate env vars", start_time, use_color);
 
@@ -98,7 +98,7 @@ pub fn evaluate_repl(
         Value::string("0823", Span::unknown()),
     );
 
-    unique_stack.add_env_var("LAST_EXIT_CODE".into(), Value::int(0, Span::unknown()));
+    unique_stack.set_last_exit_code(0, Span::unknown());
 
     let mut line_editor = get_line_editor(engine_state, nushell_path, use_color)?;
     let temp_file = temp_dir().join(format!("{}.nu", uuid::Uuid::new_v4()));
@@ -286,7 +286,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
     // Before doing anything, merge the environment from the previous REPL iteration into the
     // permanent state.
     if let Err(err) = engine_state.merge_env(&mut stack, cwd) {
-        report_error_new(engine_state, &err);
+        report_shell_error(engine_state, &err);
     }
     // Check whether $env.NU_USE_IR is set, so that the user can change it in the REPL
     // Temporary while IR eval is optional
@@ -302,7 +302,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
     // fire the "pre_prompt" hook
     if let Some(hook) = engine_state.get_config().hooks.pre_prompt.clone() {
         if let Err(err) = eval_hook(engine_state, &mut stack, None, vec![], &hook, "pre_prompt") {
-            report_error_new(engine_state, &err);
+            report_shell_error(engine_state, &err);
         }
     }
     perf!("pre-prompt hook", start_time, use_color);
@@ -312,7 +312,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
     // fire the "env_change" hook
     let env_change = engine_state.get_config().hooks.env_change.clone();
     if let Err(error) = hook::eval_env_change_hook(env_change, engine_state, &mut stack) {
-        report_error_new(engine_state, &error)
+        report_shell_error(engine_state, &error)
     }
     perf!("env-change hook", start_time, use_color);
 
@@ -386,7 +386,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
     trace!("adding menus");
     line_editor =
         add_menus(line_editor, engine_reference, &stack_arc, config).unwrap_or_else(|e| {
-            report_error_new(engine_state, &e);
+            report_shell_error(engine_state, &e);
             Reedline::create()
         });
 
@@ -506,7 +506,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
                     &hook,
                     "pre_execution",
                 ) {
-                    report_error_new(engine_state, &err);
+                    report_shell_error(engine_state, &err);
                 }
             }
 
@@ -808,7 +808,7 @@ fn do_auto_cd(
 ) {
     let path = {
         if !path.exists() {
-            report_error_new(
+            report_shell_error(
                 engine_state,
                 &ShellError::DirectoryNotFound {
                     dir: path.to_string_lossy().to_string(),
@@ -820,7 +820,7 @@ fn do_auto_cd(
     };
 
     if let PermissionResult::PermissionDenied(reason) = have_permission(path.clone()) {
-        report_error_new(
+        report_shell_error(
             engine_state,
             &ShellError::IOError {
                 msg: format!("Cannot change directory to {path}: {reason}"),
@@ -834,7 +834,7 @@ fn do_auto_cd(
     //FIXME: this only changes the current scope, but instead this environment variable
     //should probably be a block that loads the information from the state in the overlay
     if let Err(err) = stack.set_cwd(&path) {
-        report_error_new(engine_state, &err);
+        report_shell_error(engine_state, &err);
         return;
     };
     let cwd = Value::string(cwd, span);
@@ -867,7 +867,7 @@ fn do_auto_cd(
         "NUSHELL_LAST_SHELL".into(),
         Value::int(last_shell as i64, span),
     );
-    stack.add_env_var("LAST_EXIT_CODE".into(), Value::int(0, Span::unknown()));
+    stack.set_last_exit_code(0, Span::unknown());
 }
 
 ///
@@ -1141,7 +1141,7 @@ fn setup_keybindings(engine_state: &EngineState, line_editor: Reedline) -> Reedl
             }
         },
         Err(e) => {
-            report_error_new(engine_state, &e);
+            report_shell_error(engine_state, &e);
             line_editor
         }
     };
diff --git a/crates/nu-cli/src/util.rs b/crates/nu-cli/src/util.rs
index e912bceb5f..038d0d0312 100644
--- a/crates/nu-cli/src/util.rs
+++ b/crates/nu-cli/src/util.rs
@@ -2,9 +2,11 @@ use nu_cmd_base::hook::eval_hook;
 use nu_engine::{eval_block, eval_block_with_early_return};
 use nu_parser::{escape_quote_string, lex, parse, unescape_unquote_string, Token, TokenContents};
 use nu_protocol::{
+    cli_error::report_compile_error,
     debugger::WithoutDebug,
     engine::{EngineState, Stack, StateWorkingSet},
-    report_error, report_error_new, PipelineData, ShellError, Span, Value,
+    report_parse_error, report_parse_warning, report_shell_error, PipelineData, ShellError, Span,
+    Value,
 };
 #[cfg(windows)]
 use nu_utils::enable_vt_processing;
@@ -39,7 +41,7 @@ fn gather_env_vars(
     init_cwd: &Path,
 ) {
     fn report_capture_error(engine_state: &EngineState, env_str: &str, msg: &str) {
-        report_error_new(
+        report_shell_error(
             engine_state,
             &ShellError::GenericError {
                 error: format!("Environment variable was not captured: {env_str}"),
@@ -70,7 +72,7 @@ fn gather_env_vars(
         }
         None => {
             // Could not capture current working directory
-            report_error_new(
+            report_shell_error(
                 engine_state,
                 &ShellError::GenericError {
                     error: "Current directory is not a valid utf-8 path".into(),
@@ -210,18 +212,19 @@ pub fn eval_source(
     let start_time = std::time::Instant::now();
 
     let exit_code = match evaluate_source(engine_state, stack, source, fname, input, allow_return) {
-        Ok(code) => code.unwrap_or(0),
+        Ok(failed) => {
+            let code = failed.into();
+            stack.set_last_exit_code(code, Span::unknown());
+            code
+        }
         Err(err) => {
-            report_error_new(engine_state, &err);
-            1
+            report_shell_error(engine_state, &err);
+            let code = err.exit_code();
+            stack.set_last_error(&err);
+            code
         }
     };
 
-    stack.add_env_var(
-        "LAST_EXIT_CODE".to_string(),
-        Value::int(exit_code.into(), Span::unknown()),
-    );
-
     // reset vt processing, aka ansi because illbehaved externals can break it
     #[cfg(windows)]
     {
@@ -244,7 +247,7 @@ fn evaluate_source(
     fname: &str,
     input: PipelineData,
     allow_return: bool,
-) -> Result<Option<i32>, ShellError> {
+) -> Result<bool, ShellError> {
     let (block, delta) = {
         let mut working_set = StateWorkingSet::new(engine_state);
         let output = parse(
@@ -254,16 +257,16 @@ fn evaluate_source(
             false,
         );
         if let Some(warning) = working_set.parse_warnings.first() {
-            report_error(&working_set, warning);
+            report_parse_warning(&working_set, warning);
         }
 
         if let Some(err) = working_set.parse_errors.first() {
-            report_error(&working_set, err);
-            return Ok(Some(1));
+            report_parse_error(&working_set, err);
+            return Ok(true);
         }
 
         if let Some(err) = working_set.compile_errors.first() {
-            report_error(&working_set, err);
+            report_compile_error(&working_set, err);
             // Not a fatal error, for now
         }
 
@@ -278,25 +281,23 @@ fn evaluate_source(
         eval_block::<WithoutDebug>(engine_state, stack, &block, input)
     }?;
 
-    let status = if let PipelineData::ByteStream(..) = pipeline {
-        pipeline.print(engine_state, stack, false, false)?
+    if let PipelineData::ByteStream(..) = pipeline {
+        pipeline.print(engine_state, stack, false, false)
+    } else if let Some(hook) = engine_state.get_config().hooks.display_output.clone() {
+        let pipeline = eval_hook(
+            engine_state,
+            stack,
+            Some(pipeline),
+            vec![],
+            &hook,
+            "display_output",
+        )?;
+        pipeline.print(engine_state, stack, false, false)
     } else {
-        if let Some(hook) = engine_state.get_config().hooks.display_output.clone() {
-            let pipeline = eval_hook(
-                engine_state,
-                stack,
-                Some(pipeline),
-                vec![],
-                &hook,
-                "display_output",
-            )?;
-            pipeline.print(engine_state, stack, false, false)
-        } else {
-            pipeline.print(engine_state, stack, true, false)
-        }?
-    };
+        pipeline.print(engine_state, stack, true, false)
+    }?;
 
-    Ok(status.map(|status| status.code()))
+    Ok(false)
 }
 
 #[cfg(test)]
diff --git a/crates/nu-cmd-base/src/hook.rs b/crates/nu-cmd-base/src/hook.rs
index cef5348618..6eba273f3d 100644
--- a/crates/nu-cmd-base/src/hook.rs
+++ b/crates/nu-cmd-base/src/hook.rs
@@ -3,7 +3,7 @@ use miette::Result;
 use nu_engine::{eval_block, eval_block_with_early_return};
 use nu_parser::parse;
 use nu_protocol::{
-    cli_error::{report_error, report_error_new},
+    cli_error::{report_parse_error, report_shell_error},
     debugger::WithoutDebug,
     engine::{Closure, EngineState, Stack, StateWorkingSet},
     PipelineData, PositionalArg, ShellError, Span, Type, Value, VarId,
@@ -91,7 +91,7 @@ pub fn eval_hook(
                     false,
                 );
                 if let Some(err) = working_set.parse_errors.first() {
-                    report_error(&working_set, err);
+                    report_parse_error(&working_set, err);
 
                     return Err(ShellError::UnsupportedConfigValue {
                         expected: "valid source code".into(),
@@ -123,7 +123,7 @@ pub fn eval_hook(
                     output = pipeline_data;
                 }
                 Err(err) => {
-                    report_error_new(engine_state, &err);
+                    report_shell_error(engine_state, &err);
                 }
             }
 
@@ -223,7 +223,7 @@ pub fn eval_hook(
                                 false,
                             );
                             if let Some(err) = working_set.parse_errors.first() {
-                                report_error(&working_set, err);
+                                report_parse_error(&working_set, err);
 
                                 return Err(ShellError::UnsupportedConfigValue {
                                     expected: "valid source code".into(),
@@ -251,7 +251,7 @@ pub fn eval_hook(
                                 output = pipeline_data;
                             }
                             Err(err) => {
-                                report_error_new(engine_state, &err);
+                                report_shell_error(engine_state, &err);
                             }
                         }
 
diff --git a/crates/nu-cmd-lang/src/core_commands/do_.rs b/crates/nu-cmd-lang/src/core_commands/do_.rs
index 61c9cf09a0..6c7c36e7d1 100644
--- a/crates/nu-cmd-lang/src/core_commands/do_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/do_.rs
@@ -1,7 +1,7 @@
 use nu_engine::{command_prelude::*, get_eval_block_with_early_return, redirect_env};
 use nu_protocol::{
     engine::Closure,
-    process::{ChildPipe, ChildProcess, ExitStatus},
+    process::{ChildPipe, ChildProcess},
     ByteStream, ByteStreamSource, OutDest,
 };
 use std::{
@@ -147,13 +147,7 @@ impl Command for Do {
                             None
                         };
 
-                        if child.wait()? != ExitStatus::Exited(0) {
-                            return Err(ShellError::ExternalCommand {
-                                label: "External command failed".to_string(),
-                                help: stderr_msg,
-                                span,
-                            });
-                        }
+                        child.wait()?;
 
                         let mut child = ChildProcess::from_raw(None, None, None, span);
                         if let Some(stdout) = stdout {
diff --git a/crates/nu-cmd-lang/src/core_commands/for_.rs b/crates/nu-cmd-lang/src/core_commands/for_.rs
index 16e1364225..912d738524 100644
--- a/crates/nu-cmd-lang/src/core_commands/for_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/for_.rs
@@ -93,25 +93,10 @@ impl Command for For {
                     stack.add_var(var_id, x);
 
                     match eval_block(&engine_state, stack, block, PipelineData::empty()) {
-                        Err(ShellError::Break { .. }) => {
-                            break;
-                        }
-                        Err(ShellError::Continue { .. }) => {
-                            continue;
-                        }
-                        Err(err) => {
-                            return Err(err);
-                        }
-                        Ok(data) => {
-                            if let Some(status) = data.drain()? {
-                                let code = status.code();
-                                if code != 0 {
-                                    return Ok(
-                                        PipelineData::new_external_stream_with_only_exit_code(code),
-                                    );
-                                }
-                            }
-                        }
+                        Err(ShellError::Break { .. }) => break,
+                        Err(ShellError::Continue { .. }) => continue,
+                        Err(err) => return Err(err),
+                        Ok(data) => data.drain()?,
                     }
                 }
             }
@@ -121,25 +106,10 @@ impl Command for For {
                     stack.add_var(var_id, x);
 
                     match eval_block(&engine_state, stack, block, PipelineData::empty()) {
-                        Err(ShellError::Break { .. }) => {
-                            break;
-                        }
-                        Err(ShellError::Continue { .. }) => {
-                            continue;
-                        }
-                        Err(err) => {
-                            return Err(err);
-                        }
-                        Ok(data) => {
-                            if let Some(status) = data.drain()? {
-                                let code = status.code();
-                                if code != 0 {
-                                    return Ok(
-                                        PipelineData::new_external_stream_with_only_exit_code(code),
-                                    );
-                                }
-                            }
-                        }
+                        Err(ShellError::Break { .. }) => break,
+                        Err(ShellError::Continue { .. }) => continue,
+                        Err(err) => return Err(err),
+                        Ok(data) => data.drain()?,
                     }
                 }
             }
diff --git a/crates/nu-cmd-lang/src/core_commands/if_.rs b/crates/nu-cmd-lang/src/core_commands/if_.rs
index 3b18b23879..e40bb13b82 100644
--- a/crates/nu-cmd-lang/src/core_commands/if_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/if_.rs
@@ -127,10 +127,9 @@ impl Command for If {
                     eval_block(engine_state, stack, block, input)
                 } else {
                     eval_expression_with_input(engine_state, stack, else_expr, input)
-                        .map(|res| res.0)
                 }
             } else {
-                eval_expression_with_input(engine_state, stack, else_case, input).map(|res| res.0)
+                eval_expression_with_input(engine_state, stack, else_case, input)
             }
         } else {
             Ok(PipelineData::empty())
diff --git a/crates/nu-cmd-lang/src/core_commands/loop_.rs b/crates/nu-cmd-lang/src/core_commands/loop_.rs
index 1ef3706a6e..b799d32141 100644
--- a/crates/nu-cmd-lang/src/core_commands/loop_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/loop_.rs
@@ -56,23 +56,10 @@ impl Command for Loop {
             engine_state.signals().check(head)?;
 
             match eval_block(engine_state, stack, block, PipelineData::empty()) {
-                Err(ShellError::Break { .. }) => {
-                    break;
-                }
-                Err(ShellError::Continue { .. }) => {
-                    continue;
-                }
-                Err(err) => {
-                    return Err(err);
-                }
-                Ok(data) => {
-                    if let Some(status) = data.drain()? {
-                        let code = status.code();
-                        if code != 0 {
-                            return Ok(PipelineData::new_external_stream_with_only_exit_code(code));
-                        }
-                    }
-                }
+                Err(ShellError::Break { .. }) => break,
+                Err(ShellError::Continue { .. }) => continue,
+                Err(err) => return Err(err),
+                Ok(data) => data.drain()?,
             }
         }
         Ok(PipelineData::empty())
diff --git a/crates/nu-cmd-lang/src/core_commands/match_.rs b/crates/nu-cmd-lang/src/core_commands/match_.rs
index 71ec8ebaec..a7bebeb857 100644
--- a/crates/nu-cmd-lang/src/core_commands/match_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/match_.rs
@@ -81,7 +81,7 @@ impl Command for Match {
                         let block = engine_state.get_block(block_id);
                         eval_block(engine_state, stack, block, input)
                     } else {
-                        eval_expression_with_input(engine_state, stack, expr, input).map(|x| x.0)
+                        eval_expression_with_input(engine_state, stack, expr, input)
                     };
                 }
             } else {
diff --git a/crates/nu-cmd-lang/src/core_commands/try_.rs b/crates/nu-cmd-lang/src/core_commands/try_.rs
index fd2d3bd3cc..25d6fe59a3 100644
--- a/crates/nu-cmd-lang/src/core_commands/try_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/try_.rs
@@ -47,6 +47,7 @@ impl Command for Try {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
+        let head = call.head;
         // 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()?;
@@ -61,30 +62,15 @@ impl Command for Try {
         let try_block = engine_state.get_block(try_block);
         let eval_block = get_eval_block(engine_state);
 
-        match eval_block(engine_state, stack, try_block, input) {
-            Err(error) => {
-                let error = intercept_block_control(error)?;
-                let err_record = err_to_record(error, call.head);
-                handle_catch(err_record, catch_block, engine_state, stack, eval_block)
-            }
+        let result = eval_block(engine_state, stack, try_block, input)
+            .and_then(|pipeline| pipeline.write_to_out_dests(engine_state, stack));
+
+        match result {
+            Err(err) => run_catch(err, head, catch_block, engine_state, stack, eval_block),
             Ok(PipelineData::Value(Value::Error { error, .. }, ..)) => {
-                let error = intercept_block_control(*error)?;
-                let err_record = err_to_record(error, call.head);
-                handle_catch(err_record, catch_block, engine_state, stack, eval_block)
-            }
-            // external command may fail to run
-            Ok(pipeline) => {
-                let (pipeline, external_failed) = pipeline.check_external_failed()?;
-                if external_failed {
-                    let status = pipeline.drain()?;
-                    let code = status.map(|status| status.code()).unwrap_or(0);
-                    stack.add_env_var("LAST_EXIT_CODE".into(), Value::int(code.into(), call.head));
-                    let err_value = Value::nothing(call.head);
-                    handle_catch(err_value, catch_block, engine_state, stack, eval_block)
-                } else {
-                    Ok(pipeline)
-                }
+                run_catch(*error, head, catch_block, engine_state, stack, eval_block)
             }
+            Ok(pipeline) => Ok(pipeline),
         }
     }
 
@@ -109,28 +95,33 @@ impl Command for Try {
     }
 }
 
-fn handle_catch(
-    err_value: Value,
-    catch_block: Option<Closure>,
+fn run_catch(
+    error: ShellError,
+    span: Span,
+    catch: Option<Closure>,
     engine_state: &EngineState,
     stack: &mut Stack,
-    eval_block_fn: EvalBlockFn,
+    eval_block: EvalBlockFn,
 ) -> Result<PipelineData, ShellError> {
-    if let Some(catch_block) = catch_block {
-        let catch_block = engine_state.get_block(catch_block.block_id);
+    let error = intercept_block_control(error)?;
+
+    if let Some(catch) = catch {
+        stack.set_last_error(&error);
+        let error = error.into_value(span);
+        let block = engine_state.get_block(catch.block_id);
         // Put the error value in the positional closure var
-        if let Some(var) = catch_block.signature.get_positional(0) {
+        if let Some(var) = block.signature.get_positional(0) {
             if let Some(var_id) = &var.var_id {
-                stack.add_var(*var_id, err_value.clone());
+                stack.add_var(*var_id, error.clone());
             }
         }
 
-        eval_block_fn(
+        eval_block(
             engine_state,
             stack,
-            catch_block,
+            block,
             // Make the error accessible with $in, too
-            err_value.into_pipeline_data(),
+            error.into_pipeline_data(),
         )
     } else {
         Ok(PipelineData::empty())
@@ -143,25 +134,13 @@ fn handle_catch(
 /// `Err` when flow control to bubble up with `?`
 fn intercept_block_control(error: ShellError) -> Result<ShellError, ShellError> {
     match error {
-        nu_protocol::ShellError::Break { .. } => Err(error),
-        nu_protocol::ShellError::Continue { .. } => Err(error),
-        nu_protocol::ShellError::Return { .. } => Err(error),
+        ShellError::Break { .. } => Err(error),
+        ShellError::Continue { .. } => Err(error),
+        ShellError::Return { .. } => Err(error),
         _ => Ok(error),
     }
 }
 
-/// Convert from `error` to [`Value::Record`] so the error information can be easily accessed in catch.
-fn err_to_record(error: ShellError, head: Span) -> Value {
-    Value::record(
-        record! {
-            "msg" => Value::string(error.to_string(), head),
-            "debug" => Value::string(format!("{error:?}"), head),
-            "raw" => Value::error(error, head),
-        },
-        head,
-    )
-}
-
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/crates/nu-cmd-lang/src/core_commands/while_.rs b/crates/nu-cmd-lang/src/core_commands/while_.rs
index acdac7edef..e9578ae6f5 100644
--- a/crates/nu-cmd-lang/src/core_commands/while_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/while_.rs
@@ -73,27 +73,10 @@ impl Command for While {
                         let block = engine_state.get_block(block_id);
 
                         match eval_block(engine_state, stack, block, PipelineData::empty()) {
-                            Err(ShellError::Break { .. }) => {
-                                break;
-                            }
-                            Err(ShellError::Continue { .. }) => {
-                                continue;
-                            }
-                            Err(err) => {
-                                return Err(err);
-                            }
-                            Ok(data) => {
-                                if let Some(status) = data.drain()? {
-                                    let code = status.code();
-                                    if code != 0 {
-                                        return Ok(
-                                            PipelineData::new_external_stream_with_only_exit_code(
-                                                code,
-                                            ),
-                                        );
-                                    }
-                                }
-                            }
+                            Err(ShellError::Break { .. }) => break,
+                            Err(ShellError::Continue { .. }) => continue,
+                            Err(err) => return Err(err),
+                            Ok(data) => data.drain()?,
                         }
                     } else {
                         break;
diff --git a/crates/nu-cmd-lang/src/example_support.rs b/crates/nu-cmd-lang/src/example_support.rs
index 70ee7a9b0f..9ae3808480 100644
--- a/crates/nu-cmd-lang/src/example_support.rs
+++ b/crates/nu-cmd-lang/src/example_support.rs
@@ -4,7 +4,7 @@ use nu_protocol::{
     ast::Block,
     debugger::WithoutDebug,
     engine::{StateDelta, StateWorkingSet},
-    report_error_new, Range,
+    report_shell_error, Range,
 };
 use std::{
     sync::Arc,
@@ -125,7 +125,7 @@ pub fn eval_block(
     nu_engine::eval_block::<WithoutDebug>(engine_state, &mut stack, &block, input)
         .and_then(|data| data.into_value(Span::test_data()))
         .unwrap_or_else(|err| {
-            report_error_new(engine_state, &err);
+            report_shell_error(engine_state, &err);
             panic!("test eval error in `{}`: {:?}", "TODO", err)
         })
 }
diff --git a/crates/nu-command/src/debug/timeit.rs b/crates/nu-command/src/debug/timeit.rs
index 08de95dcd2..7bb492769c 100644
--- a/crates/nu-command/src/debug/timeit.rs
+++ b/crates/nu-command/src/debug/timeit.rs
@@ -59,7 +59,7 @@ impl Command for TimeIt {
             } else {
                 let eval_expression_with_input = get_eval_expression_with_input(engine_state);
                 let expression = &command_to_run.clone();
-                eval_expression_with_input(engine_state, stack, expression, input)?.0
+                eval_expression_with_input(engine_state, stack, expression, input)?
             }
         } else {
             PipelineData::empty()
diff --git a/crates/nu-command/src/filesystem/rm.rs b/crates/nu-command/src/filesystem/rm.rs
index 3475c1a595..3d2c712155 100644
--- a/crates/nu-command/src/filesystem/rm.rs
+++ b/crates/nu-command/src/filesystem/rm.rs
@@ -3,7 +3,7 @@ use super::util::{get_rest_for_glob_pattern, try_interaction};
 use nu_engine::{command_prelude::*, env::current_dir};
 use nu_glob::MatchOptions;
 use nu_path::expand_path_with;
-use nu_protocol::{report_error_new, NuGlob};
+use nu_protocol::{report_shell_error, NuGlob};
 #[cfg(unix)]
 use std::os::unix::prelude::FileTypeExt;
 use std::{
@@ -452,7 +452,7 @@ fn rm(
         match result {
             Ok(None) => {}
             Ok(Some(msg)) => eprintln!("{msg}"),
-            Err(err) => report_error_new(engine_state, &err),
+            Err(err) => report_shell_error(engine_state, &err),
         }
     }
 
diff --git a/crates/nu-command/src/filesystem/watch.rs b/crates/nu-command/src/filesystem/watch.rs
index 5138af354e..6f022acca8 100644
--- a/crates/nu-command/src/filesystem/watch.rs
+++ b/crates/nu-command/src/filesystem/watch.rs
@@ -8,7 +8,7 @@ use notify_debouncer_full::{
 use nu_engine::{command_prelude::*, ClosureEval};
 use nu_protocol::{
     engine::{Closure, StateWorkingSet},
-    format_error,
+    format_shell_error,
 };
 use std::{
     path::PathBuf,
@@ -198,7 +198,7 @@ impl Command for Watch {
                     }
                     Err(err) => {
                         let working_set = StateWorkingSet::new(engine_state);
-                        eprintln!("{}", format_error(&working_set, &err));
+                        eprintln!("{}", format_shell_error(&working_set, &err));
                     }
                 }
             }
diff --git a/crates/nu-command/src/filters/group.rs b/crates/nu-command/src/filters/group.rs
index 5327cad610..34b70f697a 100644
--- a/crates/nu-command/src/filters/group.rs
+++ b/crates/nu-command/src/filters/group.rs
@@ -1,5 +1,5 @@
 use nu_engine::command_prelude::*;
-use nu_protocol::{report_warning_new, ParseWarning, ValueIterator};
+use nu_protocol::{report_shell_warning, ValueIterator};
 
 #[derive(Clone)]
 pub struct Group;
@@ -55,9 +55,9 @@ impl Command for Group {
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
 
-        report_warning_new(
+        report_shell_warning(
             engine_state,
-            &ParseWarning::DeprecatedWarning {
+            &ShellError::Deprecated {
                 old_command: "group".into(),
                 new_suggestion: "the new `chunks` command".into(),
                 span: head,
diff --git a/crates/nu-command/src/filters/tee.rs b/crates/nu-command/src/filters/tee.rs
index db29d31e5f..65c0aba546 100644
--- a/crates/nu-command/src/filters/tee.rs
+++ b/crates/nu-command/src/filters/tee.rs
@@ -1,6 +1,6 @@
 use nu_engine::{command_prelude::*, get_eval_block_with_early_return};
 use nu_protocol::{
-    byte_stream::copy_with_signals, engine::Closure, process::ChildPipe, report_error_new,
+    byte_stream::copy_with_signals, engine::Closure, process::ChildPipe, report_shell_error,
     ByteStream, ByteStreamSource, OutDest, PipelineMetadata, Signals,
 };
 use std::{
@@ -353,7 +353,7 @@ fn tee_once(
 ) -> Result<JoinHandle<()>, std::io::Error> {
     thread::Builder::new().name("tee".into()).spawn(move || {
         if let Err(err) = on_thread() {
-            report_error_new(&engine_state, &err);
+            report_shell_error(&engine_state, &err);
         }
     })
 }
diff --git a/crates/nu-command/src/network/url/join.rs b/crates/nu-command/src/network/url/join.rs
index 2bbd68bbcb..82f9e21914 100644
--- a/crates/nu-command/src/network/url/join.rs
+++ b/crates/nu-command/src/network/url/join.rs
@@ -279,7 +279,7 @@ impl UrlComponents {
                 ..self
             }),
             _ => {
-                nu_protocol::report_error_new(
+                nu_protocol::report_shell_error(
                     engine_state,
                     &ShellError::GenericError {
                         error: format!("'{key}' is not a valid URL field"),
diff --git a/crates/nu-command/src/strings/encode_decode/decode_base64.rs b/crates/nu-command/src/strings/encode_decode/decode_base64.rs
index 455aec915c..f3c2b7fcde 100644
--- a/crates/nu-command/src/strings/encode_decode/decode_base64.rs
+++ b/crates/nu-command/src/strings/encode_decode/decode_base64.rs
@@ -1,6 +1,6 @@
 use super::base64::{operate, ActionType, Base64CommandArguments, CHARACTER_SET_DESC};
 use nu_engine::command_prelude::*;
-use nu_protocol::{report_warning_new, ParseWarning};
+use nu_protocol::report_shell_warning;
 
 #[derive(Clone)]
 pub struct DecodeBase64Old;
@@ -78,9 +78,9 @@ impl Command for DecodeBase64Old {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        report_warning_new(
+        report_shell_warning(
             engine_state,
-            &ParseWarning::DeprecatedWarning {
+            &ShellError::Deprecated {
                 old_command: "decode base64".into(),
                 new_suggestion: "the new `decode new-base64` version".into(),
                 span: call.head,
diff --git a/crates/nu-command/src/strings/encode_decode/encode_base64.rs b/crates/nu-command/src/strings/encode_decode/encode_base64.rs
index a484eeb974..0181f94aef 100644
--- a/crates/nu-command/src/strings/encode_decode/encode_base64.rs
+++ b/crates/nu-command/src/strings/encode_decode/encode_base64.rs
@@ -1,6 +1,6 @@
 use super::base64::{operate, ActionType, Base64CommandArguments, CHARACTER_SET_DESC};
 use nu_engine::command_prelude::*;
-use nu_protocol::{report_warning_new, ParseWarning};
+use nu_protocol::report_shell_warning;
 
 #[derive(Clone)]
 pub struct EncodeBase64Old;
@@ -82,9 +82,9 @@ impl Command for EncodeBase64Old {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        report_warning_new(
+        report_shell_warning(
             engine_state,
-            &ParseWarning::DeprecatedWarning {
+            &ShellError::Deprecated {
                 old_command: "encode base64".into(),
                 new_suggestion: "the new `encode new-base64` version".into(),
                 span: call.head,
diff --git a/crates/nu-command/src/strings/str_/contains.rs b/crates/nu-command/src/strings/str_/contains.rs
index e64ed8c72b..de91768e76 100644
--- a/crates/nu-command/src/strings/str_/contains.rs
+++ b/crates/nu-command/src/strings/str_/contains.rs
@@ -78,7 +78,7 @@ impl Command for SubCommand {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         if call.has_flag_const(working_set, "not")? {
-            nu_protocol::report_error_new(
+            nu_protocol::report_shell_error(
                 working_set.permanent(),
                 &ShellError::GenericError {
                     error: "Deprecated option".into(),
diff --git a/crates/nu-command/tests/commands/do_.rs b/crates/nu-command/tests/commands/do_.rs
index 5f46b02c17..645421c15f 100644
--- a/crates/nu-command/tests/commands/do_.rs
+++ b/crates/nu-command/tests/commands/do_.rs
@@ -12,21 +12,21 @@ fn capture_errors_works() {
 #[test]
 fn capture_errors_works_for_external() {
     let actual = nu!("do -c {nu --testbin fail}");
-    assert!(actual.err.contains("External command failed"));
+    assert!(actual.err.contains("exited with code"));
     assert_eq!(actual.out, "");
 }
 
 #[test]
 fn capture_errors_works_for_external_with_pipeline() {
     let actual = nu!("do -c {nu --testbin fail} | echo `text`");
-    assert!(actual.err.contains("External command failed"));
+    assert!(actual.err.contains("exited with code"));
     assert_eq!(actual.out, "");
 }
 
 #[test]
 fn capture_errors_works_for_external_with_semicolon() {
     let actual = nu!(r#"do -c {nu --testbin fail}; echo `text`"#);
-    assert!(actual.err.contains("External command failed"));
+    assert!(actual.err.contains("exited with code"));
     assert_eq!(actual.out, "");
 }
 
diff --git a/crates/nu-command/tests/commands/try_.rs b/crates/nu-command/tests/commands/try_.rs
index c4fc9269d0..264b20796f 100644
--- a/crates/nu-command/tests/commands/try_.rs
+++ b/crates/nu-command/tests/commands/try_.rs
@@ -95,7 +95,13 @@ fn can_catch_infinite_recursion() {
 }
 
 #[test]
-fn exit_code_available_in_catch() {
-    let actual = nu!("try { nu -c 'exit 42' } catch { $env.LAST_EXIT_CODE }");
+fn exit_code_available_in_catch_env() {
+    let actual = nu!("try { nu -c 'exit 42'; null } catch { $env.LAST_EXIT_CODE }");
+    assert_eq!(actual.out, "42");
+}
+
+#[test]
+fn exit_code_available_in_catch() {
+    let actual = nu!("try { nu -c 'exit 42'; null } catch { |e| $e.exit_code }");
     assert_eq!(actual.out, "42");
 }
diff --git a/crates/nu-engine/src/compile/builder.rs b/crates/nu-engine/src/compile/builder.rs
index 2a443b7bde..655ffbddc5 100644
--- a/crates/nu-engine/src/compile/builder.rs
+++ b/crates/nu-engine/src/compile/builder.rs
@@ -278,7 +278,6 @@ impl BlockBuilder {
             Instruction::OnError { index: _ } => Ok(()),
             Instruction::OnErrorInto { index: _, dst } => allocate(&[], &[*dst]),
             Instruction::PopErrorHandler => Ok(()),
-            Instruction::CheckExternalFailed { dst, src } => allocate(&[*src], &[*dst, *src]),
             Instruction::ReturnEarly { src } => allocate(&[*src], &[]),
             Instruction::Return { src } => allocate(&[*src], &[]),
         };
@@ -499,6 +498,7 @@ impl BlockBuilder {
     }
 
     /// Mark an unreachable code path. Produces an error at runtime if executed.
+    #[allow(dead_code)] // currently unused, but might be used in the future.
     pub(crate) fn unreachable(&mut self, span: Span) -> Result<(), CompileError> {
         self.push(Instruction::Unreachable.into_spanned(span))
     }
diff --git a/crates/nu-engine/src/compile/keyword.rs b/crates/nu-engine/src/compile/keyword.rs
index 12f4a54c10..8fe939d638 100644
--- a/crates/nu-engine/src/compile/keyword.rs
+++ b/crates/nu-engine/src/compile/keyword.rs
@@ -362,12 +362,8 @@ pub(crate) fn compile_try(
     //
     //       on-error-into ERR, %io_reg           // or without
     //       %io_reg <- <...block...> <- %io_reg
-    //       check-external-failed %failed_reg, %io_reg
-    //       branch-if %failed_reg, FAIL
     //       pop-error-handler
     //       jump END
-    // FAIL: drain %io_reg
-    //       unreachable
     // ERR:  clone %err_reg, %io_reg
     //       store-variable $err_var, %err_reg         // or without
     //       %io_reg <- <...catch block...> <- %io_reg // set to empty if no catch block
@@ -378,12 +374,8 @@ pub(crate) fn compile_try(
     //       %closure_reg <- <catch_expr>
     //       on-error-into ERR, %io_reg
     //       %io_reg <- <...block...> <- %io_reg
-    //       check-external-failed %failed_reg, %io_reg
-    //       branch-if %failed_reg, FAIL
     //       pop-error-handler
     //       jump END
-    // FAIL: drain %io_reg
-    //       unreachable
     // ERR:  clone %err_reg, %io_reg
     //       push-positional %closure_reg
     //       push-positional %err_reg
@@ -405,7 +397,6 @@ pub(crate) fn compile_try(
     let catch_span = catch_expr.map(|e| e.span).unwrap_or(call.head);
 
     let err_label = builder.label(None);
-    let failed_label = builder.label(None);
     let end_label = builder.label(None);
 
     // We have two ways of executing `catch`: if it was provided as a literal, we can inline it.
@@ -470,32 +461,13 @@ pub(crate) fn compile_try(
         io_reg,
     )?;
 
-    // Check for external command exit code failure, and also redirect that to the catch handler
-    let failed_reg = builder.next_register()?;
-    builder.push(
-        Instruction::CheckExternalFailed {
-            dst: failed_reg,
-            src: io_reg,
-        }
-        .into_spanned(catch_span),
-    )?;
-    builder.branch_if(failed_reg, failed_label, catch_span)?;
-
     // Successful case: pop the error handler
     builder.push(Instruction::PopErrorHandler.into_spanned(call.head))?;
 
     // Jump over the failure case
     builder.jump(end_label, catch_span)?;
 
-    // Set up an error handler preamble for failed external.
-    // Draining the %io_reg results in the error handler being called with Empty, and sets
-    // $env.LAST_EXIT_CODE
-    builder.set_label(failed_label, builder.here())?;
-    builder.drain(io_reg, catch_span)?;
-    builder.add_comment("branches to err");
-    builder.unreachable(catch_span)?;
-
-    // This is the real error handler
+    // This is the error handler
     builder.set_label(err_label, builder.here())?;
 
     // Mark out register as likely not clean - state in error handler is not well defined
diff --git a/crates/nu-engine/src/eval.rs b/crates/nu-engine/src/eval.rs
index 56a85e91e7..ccb494e68e 100644
--- a/crates/nu-engine/src/eval.rs
+++ b/crates/nu-engine/src/eval.rs
@@ -250,7 +250,7 @@ pub fn eval_expression_with_input<D: DebugContext>(
     stack: &mut Stack,
     expr: &Expression,
     mut input: PipelineData,
-) -> Result<(PipelineData, bool), ShellError> {
+) -> Result<PipelineData, ShellError> {
     match &expr.expr {
         Expr::Call(call) => {
             input = eval_call::<D>(engine_state, stack, call, input)?;
@@ -298,16 +298,7 @@ pub fn eval_expression_with_input<D: DebugContext>(
         }
     };
 
-    // If input an external command,
-    // then `might_consume_external_result` will consume `stderr` if `stdout` is `None`.
-    // This should not happen if the user wants to capture stderr.
-    if !matches!(stack.stdout(), OutDest::Pipe | OutDest::Capture)
-        && matches!(stack.stderr(), OutDest::Capture)
-    {
-        Ok((input, false))
-    } else {
-        input.check_external_failed()
-    }
+    Ok(input)
 }
 
 fn eval_redirection<D: DebugContext>(
@@ -401,9 +392,8 @@ fn eval_element_with_input_inner<D: DebugContext>(
     stack: &mut Stack,
     element: &PipelineElement,
     input: PipelineData,
-) -> Result<(PipelineData, bool), ShellError> {
-    let (data, failed) =
-        eval_expression_with_input::<D>(engine_state, stack, &element.expr, input)?;
+) -> Result<PipelineData, ShellError> {
+    let data = eval_expression_with_input::<D>(engine_state, stack, &element.expr, input)?;
 
     if let Some(redirection) = element.redirection.as_ref() {
         let is_external = if let PipelineData::ByteStream(stream, ..) = &data {
@@ -473,7 +463,7 @@ fn eval_element_with_input_inner<D: DebugContext>(
         PipelineData::Empty => PipelineData::Empty,
     };
 
-    Ok((data, failed))
+    Ok(data)
 }
 
 fn eval_element_with_input<D: DebugContext>(
@@ -481,20 +471,11 @@ fn eval_element_with_input<D: DebugContext>(
     stack: &mut Stack,
     element: &PipelineElement,
     input: PipelineData,
-) -> Result<(PipelineData, bool), ShellError> {
+) -> Result<PipelineData, ShellError> {
     D::enter_element(engine_state, element);
-    match eval_element_with_input_inner::<D>(engine_state, stack, element, input) {
-        Ok((data, failed)) => {
-            let res = Ok(data);
-            D::leave_element(engine_state, element, &res);
-            res.map(|data| (data, failed))
-        }
-        Err(err) => {
-            let res = Err(err);
-            D::leave_element(engine_state, element, &res);
-            res.map(|data| (data, false))
-        }
-    }
+    let result = eval_element_with_input_inner::<D>(engine_state, stack, element, input);
+    D::leave_element(engine_state, element, &result);
+    result
 }
 
 pub fn eval_block_with_early_return<D: DebugContext>(
@@ -509,7 +490,7 @@ pub fn eval_block_with_early_return<D: DebugContext>(
     }
 }
 
-pub fn eval_block<D: DebugContext>(
+fn eval_block_inner<D: DebugContext>(
     engine_state: &EngineState,
     stack: &mut Stack,
     block: &Block,
@@ -520,8 +501,6 @@ pub fn eval_block<D: DebugContext>(
         return eval_ir_block::<D>(engine_state, stack, block, input);
     }
 
-    D::enter_block(engine_state, block);
-
     let num_pipelines = block.len();
 
     for (pipeline_idx, pipeline) in block.pipelines.iter().enumerate() {
@@ -542,14 +521,7 @@ pub fn eval_block<D: DebugContext>(
                 (next_out.or(Some(OutDest::Pipe)), next_err),
             )?;
             let stack = &mut stack.push_redirection(stdout, stderr);
-            let (output, failed) =
-                eval_element_with_input::<D>(engine_state, stack, element, input)?;
-            if failed {
-                // External command failed.
-                // Don't return `Err(ShellError)`, so nushell won't show an extra error message.
-                return Ok(output);
-            }
-            input = output;
+            input = eval_element_with_input::<D>(engine_state, stack, element, input)?;
         }
 
         if last_pipeline {
@@ -560,13 +532,7 @@ pub fn eval_block<D: DebugContext>(
                 (stack.pipe_stdout().cloned(), stack.pipe_stderr().cloned()),
             )?;
             let stack = &mut stack.push_redirection(stdout, stderr);
-            let (output, failed) = eval_element_with_input::<D>(engine_state, stack, last, input)?;
-            if failed {
-                // External command failed.
-                // Don't return `Err(ShellError)`, so nushell won't show an extra error message.
-                return Ok(output);
-            }
-            input = output;
+            input = eval_element_with_input::<D>(engine_state, stack, last, input)?;
         } else {
             let (stdout, stderr) = eval_element_redirection::<D>(
                 engine_state,
@@ -575,40 +541,41 @@ pub fn eval_block<D: DebugContext>(
                 (None, None),
             )?;
             let stack = &mut stack.push_redirection(stdout, stderr);
-            let (output, failed) = eval_element_with_input::<D>(engine_state, stack, last, input)?;
-            if failed {
-                // External command failed.
-                // Don't return `Err(ShellError)`, so nushell won't show an extra error message.
-                return Ok(output);
-            }
-            input = PipelineData::Empty;
-            match output {
+            match eval_element_with_input::<D>(engine_state, stack, last, input)? {
                 PipelineData::ByteStream(stream, ..) => {
                     let span = stream.span();
-                    let status = stream.drain()?;
-                    if let Some(status) = status {
-                        stack.add_env_var(
-                            "LAST_EXIT_CODE".into(),
-                            Value::int(status.code().into(), span),
-                        );
-                        if status.code() != 0 {
-                            break;
-                        }
+                    if let Err(err) = stream.drain() {
+                        stack.set_last_error(&err);
+                        return Err(err);
+                    } else {
+                        stack.set_last_exit_code(0, span);
                     }
                 }
-                PipelineData::ListStream(stream, ..) => {
-                    stream.drain()?;
-                }
+                PipelineData::ListStream(stream, ..) => stream.drain()?,
                 PipelineData::Value(..) | PipelineData::Empty => {}
             }
+            input = PipelineData::Empty;
         }
     }
 
-    D::leave_block(engine_state, block);
-
     Ok(input)
 }
 
+pub fn eval_block<D: DebugContext>(
+    engine_state: &EngineState,
+    stack: &mut Stack,
+    block: &Block,
+    input: PipelineData,
+) -> Result<PipelineData, ShellError> {
+    D::enter_block(engine_state, block);
+    let result = eval_block_inner::<D>(engine_state, stack, block, input);
+    D::leave_block(engine_state, block);
+    if let Err(err) = &result {
+        stack.set_last_error(err);
+    }
+    result
+}
+
 pub fn eval_collect<D: DebugContext>(
     engine_state: &EngineState,
     stack: &mut Stack,
@@ -639,8 +606,7 @@ pub fn eval_collect<D: DebugContext>(
         expr,
         // We still have to pass it as input
         input.into_pipeline_data_with_metadata(metadata),
-    )
-    .map(|(result, _failed)| result);
+    );
 
     stack.remove_var(var_id);
 
diff --git a/crates/nu-engine/src/eval_helpers.rs b/crates/nu-engine/src/eval_helpers.rs
index 65ebc6b61d..baa7bf432b 100644
--- a/crates/nu-engine/src/eval_helpers.rs
+++ b/crates/nu-engine/src/eval_helpers.rs
@@ -25,12 +25,8 @@ pub type EvalBlockWithEarlyReturnFn =
 pub type EvalExpressionFn = fn(&EngineState, &mut Stack, &Expression) -> Result<Value, ShellError>;
 
 /// Type of eval_expression_with_input() function
-pub type EvalExpressionWithInputFn = fn(
-    &EngineState,
-    &mut Stack,
-    &Expression,
-    PipelineData,
-) -> Result<(PipelineData, bool), ShellError>;
+pub type EvalExpressionWithInputFn =
+    fn(&EngineState, &mut Stack, &Expression, PipelineData) -> Result<PipelineData, ShellError>;
 
 /// Type of eval_subexpression() function
 pub type EvalSubexpressionFn =
diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index 8550cbab99..34ec541a14 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -6,9 +6,9 @@ use nu_protocol::{
     debugger::DebugContext,
     engine::{Argument, Closure, EngineState, ErrorHandler, Matcher, Redirection, Stack},
     ir::{Call, DataSlice, Instruction, IrAstRef, IrBlock, Literal, RedirectMode},
-    record, ByteStreamSource, DataSource, DeclId, ErrSpan, Flag, IntoPipelineData, IntoSpanned,
-    ListStream, OutDest, PipelineData, PipelineMetadata, PositionalArg, Range, Record, RegId,
-    ShellError, Signals, Signature, Span, Spanned, Type, Value, VarId, ENV_VARIABLE_ID,
+    ByteStreamSource, DataSource, DeclId, ErrSpan, Flag, IntoPipelineData, IntoSpanned, ListStream,
+    OutDest, PipelineData, PipelineMetadata, PositionalArg, Range, Record, RegId, ShellError,
+    Signals, Signature, Span, Spanned, Type, Value, VarId, ENV_VARIABLE_ID,
 };
 use nu_utils::IgnoreCaseExt;
 
@@ -207,18 +207,6 @@ fn eval_ir_block_impl<D: DebugContext>(
             Ok(InstructionResult::Return(reg_id)) => {
                 return Ok(ctx.take_reg(reg_id));
             }
-            Ok(InstructionResult::ExitCode(exit_code)) => {
-                if let Some(error_handler) = ctx.stack.error_handlers.pop(ctx.error_handler_base) {
-                    // If an error handler is set, branch there
-                    prepare_error_handler(ctx, error_handler, None);
-                    pc = error_handler.handler_index;
-                } else {
-                    // If not, exit the block with the exit code
-                    return Ok(PipelineData::new_external_stream_with_only_exit_code(
-                        exit_code,
-                    ));
-                }
-            }
             Err(
                 err @ (ShellError::Return { .. }
                 | ShellError::Continue { .. }
@@ -259,15 +247,10 @@ fn prepare_error_handler(
     if let Some(reg_id) = error_handler.error_register {
         if let Some(error) = error {
             // Create the error value and put it in the register
-            let value = Value::record(
-                record! {
-                    "msg" => Value::string(format!("{}", error.item), error.span),
-                    "debug" => Value::string(format!("{:?}", error.item), error.span),
-                    "raw" => Value::error(error.item, error.span),
-                },
-                error.span,
+            ctx.put_reg(
+                reg_id,
+                error.item.into_value(error.span).into_pipeline_data(),
             );
-            ctx.put_reg(reg_id, PipelineData::Value(value, None));
         } else {
             // Set the register to empty
             ctx.put_reg(reg_id, PipelineData::Empty);
@@ -281,7 +264,6 @@ enum InstructionResult {
     Continue,
     Branch(usize),
     Return(RegId),
-    ExitCode(i32),
 }
 
 /// Perform an instruction
@@ -788,13 +770,6 @@ fn eval_instruction<D: DebugContext>(
             ctx.stack.error_handlers.pop(ctx.error_handler_base);
             Ok(Continue)
         }
-        Instruction::CheckExternalFailed { dst, src } => {
-            let data = ctx.take_reg(*src);
-            let (data, failed) = data.check_external_failed()?;
-            ctx.put_reg(*src, data);
-            ctx.put_reg(*dst, Value::bool(failed, *span).into_pipeline_data());
-            Ok(Continue)
-        }
         Instruction::ReturnEarly { src } => {
             let val = ctx.collect_reg(*src, *span)?;
             Err(ShellError::Return {
@@ -1362,23 +1337,23 @@ fn collect(data: PipelineData, fallback_span: Span) -> Result<PipelineData, Shel
     Ok(PipelineData::Value(value, metadata))
 }
 
-/// Helper for drain behavior. Returns `Ok(ExitCode)` on failed external.
+/// Helper for drain behavior.
 fn drain(ctx: &mut EvalContext<'_>, data: PipelineData) -> Result<InstructionResult, ShellError> {
     use self::InstructionResult::*;
-    let span = data.span().unwrap_or(Span::unknown());
-    if let Some(exit_status) = data.drain()? {
-        ctx.stack.add_env_var(
-            "LAST_EXIT_CODE".into(),
-            Value::int(exit_status.code() as i64, span),
-        );
-        if exit_status.code() == 0 {
-            Ok(Continue)
-        } else {
-            Ok(ExitCode(exit_status.code()))
+    match data {
+        PipelineData::ByteStream(stream, ..) => {
+            let span = stream.span();
+            if let Err(err) = stream.drain() {
+                ctx.stack.set_last_error(&err);
+                return Err(err);
+            } else {
+                ctx.stack.set_last_exit_code(0, span);
+            }
         }
-    } else {
-        Ok(Continue)
+        PipelineData::ListStream(stream, ..) => stream.drain()?,
+        PipelineData::Value(..) | PipelineData::Empty => {}
     }
+    Ok(Continue)
 }
 
 enum RedirectionStream {
diff --git a/crates/nu-plugin-engine/src/init.rs b/crates/nu-plugin-engine/src/init.rs
index 44fa4f031f..67ca57245c 100644
--- a/crates/nu-plugin-engine/src/init.rs
+++ b/crates/nu-plugin-engine/src/init.rs
@@ -15,7 +15,7 @@ use nu_plugin_core::{
     ServerCommunicationIo,
 };
 use nu_protocol::{
-    engine::StateWorkingSet, report_error_new, PluginIdentity, PluginRegistryFile,
+    engine::StateWorkingSet, report_shell_error, PluginIdentity, PluginRegistryFile,
     PluginRegistryItem, PluginRegistryItemData, RegisteredPlugin, ShellError, Span,
 };
 
@@ -225,7 +225,7 @@ pub fn load_plugin_file(
     for plugin in &plugin_registry_file.plugins {
         // Any errors encountered should just be logged.
         if let Err(err) = load_plugin_registry_item(working_set, plugin, span) {
-            report_error_new(working_set.permanent_state, &err)
+            report_shell_error(working_set.permanent_state, &err)
         }
     }
 }
diff --git a/crates/nu-plugin-test-support/src/plugin_test.rs b/crates/nu-plugin-test-support/src/plugin_test.rs
index 5e3334c78b..d414887e84 100644
--- a/crates/nu-plugin-test-support/src/plugin_test.rs
+++ b/crates/nu-plugin-test-support/src/plugin_test.rs
@@ -10,7 +10,7 @@ use nu_plugin_protocol::PluginCustomValue;
 use nu_protocol::{
     debugger::WithoutDebug,
     engine::{EngineState, Stack, StateWorkingSet},
-    report_error_new, CustomValue, Example, IntoSpanned as _, LabeledError, PipelineData,
+    report_shell_error, CustomValue, Example, IntoSpanned as _, LabeledError, PipelineData,
     ShellError, Signals, Span, Value,
 };
 
@@ -252,7 +252,7 @@ impl PluginTest {
                     Err(err) => {
                         // Report the error
                         failed_header();
-                        report_error_new(&self.engine_state, &err);
+                        report_shell_error(&self.engine_state, &err);
                     }
                 }
             }
diff --git a/crates/nu-protocol/src/config/display_errors.rs b/crates/nu-protocol/src/config/display_errors.rs
new file mode 100644
index 0000000000..6dbad874d2
--- /dev/null
+++ b/crates/nu-protocol/src/config/display_errors.rs
@@ -0,0 +1,29 @@
+use super::prelude::*;
+use crate as nu_protocol;
+use crate::ShellError;
+
+#[derive(Clone, Copy, Debug, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
+pub struct DisplayErrors {
+    pub exit_code: bool,
+    pub termination_signal: bool,
+}
+
+impl DisplayErrors {
+    pub fn should_show(&self, error: &ShellError) -> bool {
+        match error {
+            ShellError::NonZeroExitCode { .. } => self.exit_code,
+            #[cfg(unix)]
+            ShellError::TerminatedBySignal { .. } => self.termination_signal,
+            _ => true,
+        }
+    }
+}
+
+impl Default for DisplayErrors {
+    fn default() -> Self {
+        Self {
+            exit_code: true,
+            termination_signal: true,
+        }
+    }
+}
diff --git a/crates/nu-protocol/src/config/mod.rs b/crates/nu-protocol/src/config/mod.rs
index b6f98ed883..e30892474c 100644
--- a/crates/nu-protocol/src/config/mod.rs
+++ b/crates/nu-protocol/src/config/mod.rs
@@ -12,6 +12,7 @@ pub use self::completer::{
     CompleterConfig, CompletionAlgorithm, CompletionSort, ExternalCompleterConfig,
 };
 pub use self::datetime_format::DatetimeFormatConfig;
+pub use self::display_errors::DisplayErrors;
 pub use self::filesize::FilesizeConfig;
 pub use self::helper::extract_value;
 pub use self::history::{HistoryConfig, HistoryFileFormat};
@@ -28,6 +29,7 @@ pub use self::table::{FooterMode, TableConfig, TableIndexMode, TableMode, TrimSt
 
 mod completer;
 mod datetime_format;
+mod display_errors;
 mod filesize;
 mod helper;
 mod history;
@@ -67,6 +69,7 @@ pub struct Config {
     pub cursor_shape: CursorShapeConfig,
     pub datetime_format: DatetimeFormatConfig,
     pub error_style: ErrorStyle,
+    pub display_errors: DisplayErrors,
     pub use_kitty_protocol: bool,
     pub highlight_resolved_externals: bool,
     /// Configuration for plugins.
@@ -121,6 +124,7 @@ impl Default for Config {
             keybindings: Vec::new(),
 
             error_style: ErrorStyle::Fancy,
+            display_errors: DisplayErrors::default(),
 
             use_kitty_protocol: false,
             highlight_resolved_externals: false,
@@ -609,6 +613,29 @@ impl Value {
                 "show_banner" => {
                     process_bool_config(value, &mut errors, &mut config.show_banner);
                 }
+                "display_errors" => {
+                    if let Value::Record { val, .. } = value {
+                        val.to_mut().retain_mut(|key2, value| {
+                            let span = value.span();
+                            match key2 {
+                                "exit_code" => {
+                                    process_bool_config(value, &mut errors, &mut config.display_errors.exit_code);
+                                }
+                                "termination_signal" => {
+                                    process_bool_config(value, &mut errors, &mut config.display_errors.termination_signal);
+                                }
+                                _ => {
+                                    report_invalid_key(&[key, key2], span, &mut errors);
+                                    return false;
+                                }
+                            };
+                            true
+                        });
+                    } else {
+                        report_invalid_value("should be a record", span, &mut errors);
+                        *value = config.display_errors.into_value(span);
+                    }
+                }
                 "render_right_prompt_on_last_line" => {
                     process_bool_config(value, &mut errors, &mut config.render_right_prompt_on_last_line);
                 }
diff --git a/crates/nu-protocol/src/engine/stack.rs b/crates/nu-protocol/src/engine/stack.rs
index 86420caf50..5819f1134b 100644
--- a/crates/nu-protocol/src/engine/stack.rs
+++ b/crates/nu-protocol/src/engine/stack.rs
@@ -279,6 +279,16 @@ impl Stack {
         }
     }
 
+    pub fn set_last_exit_code(&mut self, code: i32, span: Span) {
+        self.add_env_var("LAST_EXIT_CODE".into(), Value::int(code.into(), span));
+    }
+
+    pub fn set_last_error(&mut self, error: &ShellError) {
+        if let Some(code) = error.external_exit_code() {
+            self.set_last_exit_code(code.item, code.span);
+        }
+    }
+
     pub fn last_overlay_name(&self) -> Result<String, ShellError> {
         self.active_overlays
             .last()
diff --git a/crates/nu-protocol/src/errors/cli_error.rs b/crates/nu-protocol/src/errors/cli_error.rs
index 9ce6829b7b..8335f787fb 100644
--- a/crates/nu-protocol/src/errors/cli_error.rs
+++ b/crates/nu-protocol/src/errors/cli_error.rs
@@ -3,7 +3,7 @@
 //! Relies on the `miette` crate for pretty layout
 use crate::{
     engine::{EngineState, StateWorkingSet},
-    ErrorStyle,
+    CompileError, ErrorStyle, ParseError, ParseWarning, ShellError,
 };
 use miette::{
     LabeledSpan, MietteHandlerOpts, NarratableReportHandler, ReportHandler, RgbColors, Severity,
@@ -20,14 +20,35 @@ pub struct CliError<'src>(
     pub &'src StateWorkingSet<'src>,
 );
 
-pub fn format_error(
-    working_set: &StateWorkingSet,
-    error: &(dyn miette::Diagnostic + Send + Sync + 'static),
-) -> String {
+pub fn format_shell_error(working_set: &StateWorkingSet, error: &ShellError) -> String {
     format!("Error: {:?}", CliError(error, working_set))
 }
 
-pub fn report_error(
+pub fn report_shell_error(engine_state: &EngineState, error: &ShellError) {
+    if engine_state.config.display_errors.should_show(error) {
+        report_error(&StateWorkingSet::new(engine_state), error)
+    }
+}
+
+pub fn report_shell_warning(engine_state: &EngineState, error: &ShellError) {
+    if engine_state.config.display_errors.should_show(error) {
+        report_warning(&StateWorkingSet::new(engine_state), error)
+    }
+}
+
+pub fn report_parse_error(working_set: &StateWorkingSet, error: &ParseError) {
+    report_error(working_set, error);
+}
+
+pub fn report_parse_warning(working_set: &StateWorkingSet, error: &ParseWarning) {
+    report_warning(working_set, error);
+}
+
+pub fn report_compile_error(working_set: &StateWorkingSet, error: &CompileError) {
+    report_error(working_set, error);
+}
+
+fn report_error(
     working_set: &StateWorkingSet,
     error: &(dyn miette::Diagnostic + Send + Sync + 'static),
 ) {
@@ -39,15 +60,7 @@ pub fn report_error(
     }
 }
 
-pub fn report_error_new(
-    engine_state: &EngineState,
-    error: &(dyn miette::Diagnostic + Send + Sync + 'static),
-) {
-    let working_set = StateWorkingSet::new(engine_state);
-    report_error(&working_set, error);
-}
-
-pub fn report_warning(
+fn report_warning(
     working_set: &StateWorkingSet,
     error: &(dyn miette::Diagnostic + Send + Sync + 'static),
 ) {
@@ -59,14 +72,6 @@ pub fn report_warning(
     }
 }
 
-pub fn report_warning_new(
-    engine_state: &EngineState,
-    error: &(dyn miette::Diagnostic + Send + Sync + 'static),
-) {
-    let working_set = StateWorkingSet::new(engine_state);
-    report_error(&working_set, error);
-}
-
 impl std::fmt::Debug for CliError<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let config = self.1.get_config();
diff --git a/crates/nu-protocol/src/errors/mod.rs b/crates/nu-protocol/src/errors/mod.rs
index 59369cd54f..17ec6bb813 100644
--- a/crates/nu-protocol/src/errors/mod.rs
+++ b/crates/nu-protocol/src/errors/mod.rs
@@ -6,7 +6,8 @@ mod parse_warning;
 mod shell_error;
 
 pub use cli_error::{
-    format_error, report_error, report_error_new, report_warning, report_warning_new,
+    format_shell_error, report_parse_error, report_parse_warning, report_shell_error,
+    report_shell_warning,
 };
 pub use compile_error::CompileError;
 pub use labeled_error::{ErrorLabel, LabeledError};
diff --git a/crates/nu-protocol/src/errors/shell_error.rs b/crates/nu-protocol/src/errors/shell_error.rs
index b4224ae05c..0784c91fb4 100644
--- a/crates/nu-protocol/src/errors/shell_error.rs
+++ b/crates/nu-protocol/src/errors/shell_error.rs
@@ -1,11 +1,11 @@
 use miette::Diagnostic;
 use serde::{Deserialize, Serialize};
-use std::io;
+use std::{io, num::NonZeroI32};
 use thiserror::Error;
 
 use crate::{
-    ast::Operator, engine::StateWorkingSet, format_error, LabeledError, ParseError, Span, Spanned,
-    Value,
+    ast::Operator, engine::StateWorkingSet, format_shell_error, record, LabeledError, ParseError,
+    Span, Spanned, Value,
 };
 
 /// The fundamental error type for the evaluation engine. These cases represent different kinds of errors
@@ -639,6 +639,49 @@ pub enum ShellError {
         span: Span,
     },
 
+    /// An external command exited with a non-zero exit code.
+    ///
+    /// ## Resolution
+    ///
+    /// Check the external command's error message.
+    #[error("External command had a non-zero exit code")]
+    #[diagnostic(code(nu::shell::non_zero_exit_code))]
+    NonZeroExitCode {
+        exit_code: NonZeroI32,
+        #[label("exited with code {exit_code}")]
+        span: Span,
+    },
+
+    #[cfg(unix)]
+    /// An external command exited due to a signal.
+    ///
+    /// ## Resolution
+    ///
+    /// Check why the signal was sent or triggered.
+    #[error("External command was terminated by a signal")]
+    #[diagnostic(code(nu::shell::terminated_by_signal))]
+    TerminatedBySignal {
+        signal_name: String,
+        signal: i32,
+        #[label("terminated by {signal_name} ({signal})")]
+        span: Span,
+    },
+
+    #[cfg(unix)]
+    /// An external command core dumped.
+    ///
+    /// ## Resolution
+    ///
+    /// Check why the core dumped was triggered.
+    #[error("External command core dumped")]
+    #[diagnostic(code(nu::shell::core_dumped))]
+    CoreDumped {
+        signal_name: String,
+        signal: i32,
+        #[label("core dumped with {signal_name} ({signal})")]
+        span: Span,
+    },
+
     /// An unsupported body input was used for the respective application body type in 'http' command
     ///
     /// ## Resolution
@@ -885,21 +928,6 @@ pub enum ShellError {
         span: Span,
     },
 
-    #[cfg(unix)]
-    /// An I/O operation failed.
-    ///
-    /// ## Resolution
-    ///
-    /// This is a generic error. Refer to the specific error message for further details.
-    #[error("program coredump error")]
-    #[diagnostic(code(nu::shell::coredump_error))]
-    CoredumpErrorSpanned {
-        msg: String,
-        signal: i32,
-        #[label("{msg}")]
-        span: Span,
-    },
-
     /// Tried to `cd` to a path that isn't a directory.
     ///
     /// ## Resolution
@@ -1285,6 +1313,16 @@ This is an internal Nushell error, please file an issue https://github.com/nushe
         span: Span,
     },
 
+    #[error("Deprecated: {old_command}")]
+    #[diagnostic(help("for more info see {url}"))]
+    Deprecated {
+        old_command: String,
+        new_suggestion: String,
+        #[label("`{old_command}` is deprecated and will be removed in a future release. Please {new_suggestion} instead.")]
+        span: Span,
+        url: String,
+    },
+
     /// Invalid glob pattern
     ///
     /// ## Resolution
@@ -1404,10 +1442,41 @@ On Windows, this would be %USERPROFILE%\AppData\Roaming"#
     },
 }
 
-// TODO: Implement as From trait
 impl ShellError {
+    pub fn external_exit_code(&self) -> Option<Spanned<i32>> {
+        let (item, span) = match *self {
+            Self::NonZeroExitCode { exit_code, span } => (exit_code.into(), span),
+            #[cfg(unix)]
+            Self::TerminatedBySignal { signal, span, .. }
+            | Self::CoreDumped { signal, span, .. } => (-signal, span),
+            _ => return None,
+        };
+        Some(Spanned { item, span })
+    }
+
+    pub fn exit_code(&self) -> i32 {
+        self.external_exit_code().map(|e| e.item).unwrap_or(1)
+    }
+
+    pub fn into_value(self, span: Span) -> Value {
+        let exit_code = self.external_exit_code();
+
+        let mut record = record! {
+            "msg" => Value::string(self.to_string(), span),
+            "debug" => Value::string(format!("{self:?}"), span),
+            "raw" => Value::error(self, span),
+        };
+
+        if let Some(code) = exit_code {
+            record.push("exit_code", Value::int(code.item.into(), code.span));
+        }
+
+        Value::record(record, span)
+    }
+
+    // TODO: Implement as From trait
     pub fn wrap(self, working_set: &StateWorkingSet, span: Span) -> ParseError {
-        let msg = format_error(working_set, &self);
+        let msg = format_shell_error(working_set, &self);
         ParseError::LabeledError(
             msg,
             "Encountered error during parse-time evaluation".into(),
diff --git a/crates/nu-protocol/src/ir/display.rs b/crates/nu-protocol/src/ir/display.rs
index 0026e15eab..af521e162f 100644
--- a/crates/nu-protocol/src/ir/display.rs
+++ b/crates/nu-protocol/src/ir/display.rs
@@ -255,9 +255,6 @@ impl<'a> fmt::Display for FmtInstruction<'a> {
             Instruction::PopErrorHandler => {
                 write!(f, "{:WIDTH$}", "pop-error-handler")
             }
-            Instruction::CheckExternalFailed { dst, src } => {
-                write!(f, "{:WIDTH$} {dst}, {src}", "check-external-failed")
-            }
             Instruction::ReturnEarly { src } => {
                 write!(f, "{:WIDTH$} {src}", "return-early")
             }
diff --git a/crates/nu-protocol/src/ir/mod.rs b/crates/nu-protocol/src/ir/mod.rs
index bdded28c0e..214632b44d 100644
--- a/crates/nu-protocol/src/ir/mod.rs
+++ b/crates/nu-protocol/src/ir/mod.rs
@@ -252,9 +252,6 @@ pub enum Instruction {
     /// Pop an error handler. This is not necessary when control flow is directed to the error
     /// handler due to an error.
     PopErrorHandler,
-    /// Check if an external command failed. Boolean value into `dst`. `src` is preserved, but it
-    /// does require waiting for the command to exit.
-    CheckExternalFailed { dst: RegId, src: RegId },
     /// Return early from the block, raising a `ShellError::Return` instead.
     ///
     /// Collecting the value is unavoidable.
@@ -330,7 +327,6 @@ impl Instruction {
             Instruction::OnError { .. } => None,
             Instruction::OnErrorInto { .. } => None,
             Instruction::PopErrorHandler => None,
-            Instruction::CheckExternalFailed { dst, .. } => Some(dst),
             Instruction::ReturnEarly { .. } => None,
             Instruction::Return { .. } => None,
         }
diff --git a/crates/nu-protocol/src/pipeline/byte_stream.rs b/crates/nu-protocol/src/pipeline/byte_stream.rs
index bd384e88c2..6811b7b89b 100644
--- a/crates/nu-protocol/src/pipeline/byte_stream.rs
+++ b/crates/nu-protocol/src/pipeline/byte_stream.rs
@@ -1,6 +1,6 @@
 //! Module managing the streaming of raw bytes between pipeline elements
 use crate::{
-    process::{ChildPipe, ChildProcess, ExitStatus},
+    process::{ChildPipe, ChildProcess},
     ErrSpan, IntoSpanned, OutDest, PipelineData, ShellError, Signals, Span, Type, Value,
 };
 use serde::{Deserialize, Serialize};
@@ -548,25 +548,19 @@ impl ByteStream {
     }
 
     /// Consume and drop all bytes of the [`ByteStream`].
-    ///
-    /// If the source of the [`ByteStream`] is [`ByteStreamSource::Child`],
-    /// then the [`ExitStatus`] of the [`ChildProcess`] is returned.
-    pub fn drain(self) -> Result<Option<ExitStatus>, ShellError> {
+    pub fn drain(self) -> Result<(), ShellError> {
         match self.stream {
             ByteStreamSource::Read(read) => {
                 copy_with_signals(read, io::sink(), self.span, &self.signals)?;
-                Ok(None)
+                Ok(())
             }
-            ByteStreamSource::File(_) => Ok(None),
-            ByteStreamSource::Child(child) => Ok(Some(child.wait()?)),
+            ByteStreamSource::File(_) => Ok(()),
+            ByteStreamSource::Child(child) => child.wait(),
         }
     }
 
     /// Print all bytes of the [`ByteStream`] to stdout or stderr.
-    ///
-    /// If the source of the [`ByteStream`] is [`ByteStreamSource::Child`],
-    /// then the [`ExitStatus`] of the [`ChildProcess`] is returned.
-    pub fn print(self, to_stderr: bool) -> Result<Option<ExitStatus>, ShellError> {
+    pub fn print(self, to_stderr: bool) -> Result<(), ShellError> {
         if to_stderr {
             self.write_to(&mut io::stderr())
         } else {
@@ -575,20 +569,15 @@ impl ByteStream {
     }
 
     /// Write all bytes of the [`ByteStream`] to `dest`.
-    ///
-    /// If the source of the [`ByteStream`] is [`ByteStreamSource::Child`],
-    /// then the [`ExitStatus`] of the [`ChildProcess`] is returned.
-    pub fn write_to(self, dest: impl Write) -> Result<Option<ExitStatus>, ShellError> {
+    pub fn write_to(self, dest: impl Write) -> Result<(), ShellError> {
         let span = self.span;
         let signals = &self.signals;
         match self.stream {
             ByteStreamSource::Read(read) => {
                 copy_with_signals(read, dest, span, signals)?;
-                Ok(None)
             }
             ByteStreamSource::File(file) => {
                 copy_with_signals(file, dest, span, signals)?;
-                Ok(None)
             }
             ByteStreamSource::Child(mut child) => {
                 // All `OutDest`s except `OutDest::Capture` will cause `stderr` to be `None`.
@@ -606,36 +595,33 @@ impl ByteStream {
                         }
                     }
                 }
-                Ok(Some(child.wait()?))
+                child.wait()?;
             }
         }
+        Ok(())
     }
 
     pub(crate) fn write_to_out_dests(
         self,
         stdout: &OutDest,
         stderr: &OutDest,
-    ) -> Result<Option<ExitStatus>, ShellError> {
+    ) -> Result<(), ShellError> {
         let span = self.span;
         let signals = &self.signals;
 
         match self.stream {
             ByteStreamSource::Read(read) => {
                 write_to_out_dest(read, stdout, true, span, signals)?;
-                Ok(None)
             }
-            ByteStreamSource::File(file) => {
-                match stdout {
-                    OutDest::Pipe | OutDest::Capture | OutDest::Null => {}
-                    OutDest::Inherit => {
-                        copy_with_signals(file, io::stdout(), span, signals)?;
-                    }
-                    OutDest::File(f) => {
-                        copy_with_signals(file, f.as_ref(), span, signals)?;
-                    }
+            ByteStreamSource::File(file) => match stdout {
+                OutDest::Pipe | OutDest::Capture | OutDest::Null => {}
+                OutDest::Inherit => {
+                    copy_with_signals(file, io::stdout(), span, signals)?;
                 }
-                Ok(None)
-            }
+                OutDest::File(f) => {
+                    copy_with_signals(file, f.as_ref(), span, signals)?;
+                }
+            },
             ByteStreamSource::Child(mut child) => {
                 match (child.stdout.take(), child.stderr.take()) {
                     (Some(out), Some(err)) => {
@@ -682,9 +668,11 @@ impl ByteStream {
                     }
                     (None, None) => {}
                 }
-                Ok(Some(child.wait()?))
+                child.wait()?;
             }
         }
+
+        Ok(())
     }
 }
 
diff --git a/crates/nu-protocol/src/pipeline/pipeline_data.rs b/crates/nu-protocol/src/pipeline/pipeline_data.rs
index 85789b4f37..da0fea3213 100644
--- a/crates/nu-protocol/src/pipeline/pipeline_data.rs
+++ b/crates/nu-protocol/src/pipeline/pipeline_data.rs
@@ -1,12 +1,11 @@
 use crate::{
     ast::{Call, PathMember},
     engine::{EngineState, Stack},
-    process::{ChildPipe, ChildProcess, ExitStatus},
-    ByteStream, ByteStreamType, Config, ErrSpan, ListStream, OutDest, PipelineMetadata, Range,
-    ShellError, Signals, Span, Type, Value,
+    ByteStream, ByteStreamType, Config, ListStream, OutDest, PipelineMetadata, Range, ShellError,
+    Signals, Span, Type, Value,
 };
 use nu_utils::{stderr_write_all_and_flush, stdout_write_all_and_flush};
-use std::io::{Cursor, Read, Write};
+use std::io::Write;
 
 const LINE_ENDING_PATTERN: &[char] = &['\r', '\n'];
 
@@ -52,16 +51,6 @@ impl PipelineData {
         PipelineData::Empty
     }
 
-    /// create a `PipelineData::ByteStream` with proper exit_code
-    ///
-    /// It's useful to break running without raising error at user level.
-    pub fn new_external_stream_with_only_exit_code(exit_code: i32) -> PipelineData {
-        let span = Span::unknown();
-        let mut child = ChildProcess::from_raw(None, None, None, span);
-        child.set_exit_code(exit_code);
-        PipelineData::ByteStream(ByteStream::child(child, span), None)
-    }
-
     pub fn metadata(&self) -> Option<PipelineMetadata> {
         match self {
             PipelineData::Empty => None,
@@ -182,22 +171,17 @@ impl PipelineData {
     /// without consuming input and without writing anything.
     ///
     /// For the other [`OutDest`]s, the given `PipelineData` will be completely consumed
-    /// and `PipelineData::Empty` will be returned, unless the data is from an external stream,
-    /// in which case an external stream containing only that exit code will be returned.
+    /// and `PipelineData::Empty` will be returned (assuming no errors).
     pub fn write_to_out_dests(
         self,
         engine_state: &EngineState,
         stack: &mut Stack,
     ) -> Result<PipelineData, ShellError> {
         match (self, stack.stdout()) {
-            (PipelineData::ByteStream(stream, ..), stdout) => {
-                if let Some(exit_status) = stream.write_to_out_dests(stdout, stack.stderr())? {
-                    return Ok(PipelineData::new_external_stream_with_only_exit_code(
-                        exit_status.code(),
-                    ));
-                }
-            }
             (data, OutDest::Pipe | OutDest::Capture) => return Ok(data),
+            (PipelineData::ByteStream(stream, ..), stdout) => {
+                stream.write_to_out_dests(stdout, stack.stderr())?;
+            }
             (PipelineData::Empty, ..) => {}
             (PipelineData::Value(..), OutDest::Null) => {}
             (PipelineData::ListStream(stream, ..), OutDest::Null) => {
@@ -227,15 +211,12 @@ impl PipelineData {
         Ok(PipelineData::Empty)
     }
 
-    pub fn drain(self) -> Result<Option<ExitStatus>, ShellError> {
+    pub fn drain(self) -> Result<(), ShellError> {
         match self {
-            PipelineData::Empty => Ok(None),
+            PipelineData::Empty => Ok(()),
             PipelineData::Value(Value::Error { error, .. }, ..) => Err(*error),
-            PipelineData::Value(..) => Ok(None),
-            PipelineData::ListStream(stream, ..) => {
-                stream.drain()?;
-                Ok(None)
-            }
+            PipelineData::Value(..) => Ok(()),
+            PipelineData::ListStream(stream, ..) => stream.drain(),
             PipelineData::ByteStream(stream, ..) => stream.drain(),
         }
     }
@@ -496,68 +477,6 @@ impl PipelineData {
         }
     }
 
-    /// Try to catch the external command exit status and detect if it failed.
-    ///
-    /// This is useful for external commands with semicolon, we can detect errors early to avoid
-    /// commands after the semicolon running.
-    ///
-    /// Returns `self` and a flag that indicates if the external command run failed. If `self` is
-    /// not [`PipelineData::ByteStream`], the flag will be `false`.
-    ///
-    /// Currently this will consume an external command to completion.
-    pub fn check_external_failed(self) -> Result<(Self, bool), ShellError> {
-        if let PipelineData::ByteStream(stream, metadata) = self {
-            // Preserve stream attributes
-            let span = stream.span();
-            let type_ = stream.type_();
-            let known_size = stream.known_size();
-            match stream.into_child() {
-                Ok(mut child) => {
-                    // Only check children without stdout. This means that nothing
-                    // later in the pipeline can possibly consume output from this external command.
-                    if child.stdout.is_none() {
-                        // Note:
-                        // In run-external's implementation detail, the result sender thread
-                        // send out stderr message first, then stdout message, then exit_code.
-                        //
-                        // In this clause, we already make sure that `stdout` is None
-                        // But not the case of `stderr`, so if `stderr` is not None
-                        // We need to consume stderr message before reading external commands' exit code.
-                        //
-                        // Or we'll never have a chance to read exit_code if stderr producer produce too much stderr message.
-                        // So we consume stderr stream and rebuild it.
-                        let stderr = child
-                            .stderr
-                            .take()
-                            .map(|mut stderr| {
-                                let mut buf = Vec::new();
-                                stderr.read_to_end(&mut buf).err_span(span)?;
-                                Ok::<_, ShellError>(buf)
-                            })
-                            .transpose()?;
-
-                        let code = child.wait()?.code();
-                        let mut child = ChildProcess::from_raw(None, None, None, span);
-                        if let Some(stderr) = stderr {
-                            child.stderr = Some(ChildPipe::Tee(Box::new(Cursor::new(stderr))));
-                        }
-                        child.set_exit_code(code);
-                        let stream = ByteStream::child(child, span).with_type(type_);
-                        Ok((PipelineData::ByteStream(stream, metadata), code != 0))
-                    } else {
-                        let stream = ByteStream::child(child, span)
-                            .with_type(type_)
-                            .with_known_size(known_size);
-                        Ok((PipelineData::ByteStream(stream, metadata), false))
-                    }
-                }
-                Err(stream) => Ok((PipelineData::ByteStream(stream, metadata), false)),
-            }
-        } else {
-            Ok((self, false))
-        }
-    }
-
     /// Try to convert Value from Value::Range to Value::List.
     /// This is useful to expand Value::Range into array notation, specifically when
     /// converting `to json` or `to nuon`.
@@ -613,7 +532,7 @@ impl PipelineData {
         stack: &mut Stack,
         no_newline: bool,
         to_stderr: bool,
-    ) -> Result<Option<ExitStatus>, ShellError> {
+    ) -> Result<(), ShellError> {
         match self {
             // Print byte streams directly as long as they aren't binary.
             PipelineData::ByteStream(stream, ..) if stream.type_() != ByteStreamType::Binary => {
@@ -650,14 +569,14 @@ impl PipelineData {
         engine_state: &EngineState,
         no_newline: bool,
         to_stderr: bool,
-    ) -> Result<Option<ExitStatus>, ShellError> {
+    ) -> Result<(), ShellError> {
         if let PipelineData::Value(Value::Binary { val: bytes, .. }, _) = self {
             if to_stderr {
                 stderr_write_all_and_flush(bytes)?;
             } else {
                 stdout_write_all_and_flush(bytes)?;
             }
-            Ok(None)
+            Ok(())
         } else {
             self.write_all_and_flush(engine_state, no_newline, to_stderr)
         }
@@ -668,7 +587,7 @@ impl PipelineData {
         engine_state: &EngineState,
         no_newline: bool,
         to_stderr: bool,
-    ) -> Result<Option<ExitStatus>, ShellError> {
+    ) -> Result<(), ShellError> {
         if let PipelineData::ByteStream(stream, ..) = self {
             // Copy ByteStreams directly
             stream.print(to_stderr)
@@ -692,7 +611,7 @@ impl PipelineData {
                 }
             }
 
-            Ok(None)
+            Ok(())
         }
     }
 
diff --git a/crates/nu-protocol/src/process/child.rs b/crates/nu-protocol/src/process/child.rs
index 08da7e704c..320427a819 100644
--- a/crates/nu-protocol/src/process/child.rs
+++ b/crates/nu-protocol/src/process/child.rs
@@ -23,21 +23,16 @@ impl ExitStatusFuture {
             ExitStatusFuture::Finished(Err(err)) => Err(err.as_ref().clone()),
             ExitStatusFuture::Running(receiver) => {
                 let code = match receiver.recv() {
-                    Ok(Ok(status)) => {
-                        #[cfg(unix)]
-                        if let ExitStatus::Signaled {
-                            signal,
-                            core_dumped: true,
-                        } = status
-                        {
-                            return Err(ShellError::CoredumpErrorSpanned {
-                                msg: format!("coredump detected. received signal: {signal}"),
-                                signal,
-                                span,
-                            });
-                        }
+                    #[cfg(unix)]
+                    Ok(Ok(
+                        status @ ExitStatus::Signaled {
+                            core_dumped: true, ..
+                        },
+                    )) => {
+                        status.check_ok(span)?;
                         Ok(status)
                     }
+                    Ok(Ok(status)) => Ok(status),
                     Ok(Err(err)) => Err(ShellError::IOErrorSpanned {
                         msg: format!("failed to get exit code: {err:?}"),
                         span,
@@ -187,13 +182,12 @@ impl ChildProcess {
             Vec::new()
         };
 
-        // TODO: check exit_status
-        self.exit_status.wait(self.span)?;
+        self.exit_status.wait(self.span)?.check_ok(self.span)?;
 
         Ok(bytes)
     }
 
-    pub fn wait(mut self) -> Result<ExitStatus, ShellError> {
+    pub fn wait(mut self) -> Result<(), ShellError> {
         if let Some(stdout) = self.stdout.take() {
             let stderr = self
                 .stderr
@@ -229,7 +223,7 @@ impl ChildProcess {
             consume_pipe(stderr).err_span(self.span)?;
         }
 
-        self.exit_status.wait(self.span)
+        self.exit_status.wait(self.span)?.check_ok(self.span)
     }
 
     pub fn try_wait(&mut self) -> Result<Option<ExitStatus>, ShellError> {
diff --git a/crates/nu-protocol/src/process/exit_status.rs b/crates/nu-protocol/src/process/exit_status.rs
index 8f3794c44f..0ea6b0e72b 100644
--- a/crates/nu-protocol/src/process/exit_status.rs
+++ b/crates/nu-protocol/src/process/exit_status.rs
@@ -1,3 +1,4 @@
+use crate::{ShellError, Span};
 use std::process;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -18,6 +19,47 @@ impl ExitStatus {
             ExitStatus::Signaled { signal, .. } => -signal,
         }
     }
+
+    pub fn check_ok(self, span: Span) -> Result<(), ShellError> {
+        match self {
+            ExitStatus::Exited(exit_code) => {
+                if let Ok(exit_code) = exit_code.try_into() {
+                    Err(ShellError::NonZeroExitCode { exit_code, span })
+                } else {
+                    Ok(())
+                }
+            }
+            #[cfg(unix)]
+            ExitStatus::Signaled {
+                signal,
+                core_dumped,
+            } => {
+                use nix::sys::signal::Signal;
+
+                let sig = Signal::try_from(signal);
+
+                if sig == Ok(Signal::SIGPIPE) {
+                    // Processes often exit with SIGPIPE, but this is not an error condition.
+                    Ok(())
+                } else {
+                    let signal_name = sig.map(Signal::as_str).unwrap_or("unknown signal").into();
+                    Err(if core_dumped {
+                        ShellError::CoreDumped {
+                            signal_name,
+                            signal,
+                            span,
+                        }
+                    } else {
+                        ShellError::TerminatedBySignal {
+                            signal_name,
+                            signal,
+                            span,
+                        }
+                    })
+                }
+            }
+        }
+    }
 }
 
 #[cfg(unix)]
diff --git a/crates/nu-protocol/tests/test_config.rs b/crates/nu-protocol/tests/test_config.rs
index bee944d0a2..ed44b36581 100644
--- a/crates/nu-protocol/tests/test_config.rs
+++ b/crates/nu-protocol/tests/test_config.rs
@@ -52,7 +52,7 @@ fn filesize_format_auto_metric_false() {
 
 #[test]
 fn fancy_default_errors() {
-    let actual = nu!(nu_repl_code(&[
+    let code = nu_repl_code(&[
         r#"def force_error [x] {
         error make {
             msg: "oh no!"
@@ -62,8 +62,10 @@ fn fancy_default_errors() {
             }
         }
     }"#,
-        r#"force_error "My error""#
-    ]));
+        r#"force_error "My error""#,
+    ]);
+
+    let actual = nu!(format!("try {{ {code}; null }}"));
 
     assert_eq!(
         actual.err,
@@ -73,7 +75,7 @@ fn fancy_default_errors() {
 
 #[test]
 fn narratable_errors() {
-    let actual = nu!(nu_repl_code(&[
+    let code = nu_repl_code(&[
         r#"$env.config = { error_style: "plain" }"#,
         r#"def force_error [x] {
         error make {
@@ -85,7 +87,9 @@ fn narratable_errors() {
         }
     }"#,
         r#"force_error "my error""#,
-    ]));
+    ]);
+
+    let actual = nu!(format!("try {{ {code}; null }}"));
 
     assert_eq!(
         actual.err,
diff --git a/crates/nu-std/src/lib.rs b/crates/nu-std/src/lib.rs
index ff6910e4ba..9944d9bf21 100644
--- a/crates/nu-std/src/lib.rs
+++ b/crates/nu-std/src/lib.rs
@@ -5,7 +5,7 @@ use nu_parser::parse;
 use nu_protocol::{
     debugger::WithoutDebug,
     engine::{FileStack, Stack, StateWorkingSet, VirtualPath},
-    report_error, PipelineData,
+    report_parse_error, PipelineData,
 };
 use std::path::PathBuf;
 
@@ -85,7 +85,7 @@ use std pwd
         working_set.files.pop();
 
         if let Some(err) = working_set.parse_errors.first() {
-            report_error(&working_set, err);
+            report_parse_error(&working_set, err);
         }
 
         (block, working_set.render())
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index 2165dc5288..1498423c45 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -174,6 +174,14 @@ $env.config = {
 
     error_style: "fancy" # "fancy" or "plain" for screen reader-friendly error messages
 
+    # Whether an error message should be printed if an error of a certain kind is triggered.
+    display_errors: {
+        exit_code: false # assume the external command prints an error message
+        # Core dump errors are always printed, and SIGPIPE never triggers an error.
+        # The setting below controls message printing for termination by all other signals.
+        termination_signal: true
+    }
+
     # datetime_format determines what a datetime rendered in the shell would look like.
     # Behavior without this configuration point will be to "humanize" the datetime display,
     # showing something like "a day ago."
diff --git a/src/command.rs b/src/command.rs
index 57ecd98edc..2ba817ac6b 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -3,7 +3,7 @@ use nu_parser::{escape_for_script_arg, escape_quote_string, parse};
 use nu_protocol::{
     ast::{Expr, Expression},
     engine::StateWorkingSet,
-    report_error,
+    report_parse_error,
 };
 use nu_utils::stdout_write_all_and_flush;
 
@@ -68,7 +68,7 @@ pub(crate) fn parse_commandline_args(
 
         let output = parse(&mut working_set, None, commandline_args.as_bytes(), false);
         if let Some(err) = working_set.parse_errors.first() {
-            report_error(&working_set, err);
+            report_parse_error(&working_set, err);
             std::process::exit(1);
         }
 
diff --git a/src/config_files.rs b/src/config_files.rs
index 565cd0579a..e2d0af8131 100644
--- a/src/config_files.rs
+++ b/src/config_files.rs
@@ -5,7 +5,7 @@ use nu_cli::{eval_config_contents, eval_source};
 use nu_path::canonicalize_with;
 use nu_protocol::{
     engine::{EngineState, Stack, StateWorkingSet},
-    report_error, report_error_new, Config, ParseError, PipelineData, Spanned,
+    report_parse_error, report_shell_error, Config, ParseError, PipelineData, Spanned,
 };
 use nu_utils::{get_default_config, get_default_env};
 use std::{
@@ -34,19 +34,17 @@ pub(crate) fn read_config_file(
     );
     // Load config startup file
     if let Some(file) = config_file {
-        let working_set = StateWorkingSet::new(engine_state);
-
         match engine_state.cwd_as_string(Some(stack)) {
             Ok(cwd) => {
                 if let Ok(path) = canonicalize_with(&file.item, cwd) {
                     eval_config_contents(path, engine_state, stack);
                 } else {
                     let e = ParseError::FileNotFound(file.item, file.span);
-                    report_error(&working_set, &e);
+                    report_parse_error(&StateWorkingSet::new(engine_state), &e);
                 }
             }
             Err(e) => {
-                report_error(&working_set, &e);
+                report_shell_error(engine_state, &e);
             }
         }
     } else if let Some(mut config_path) = nu_path::config_dir() {
@@ -168,11 +166,11 @@ pub(crate) fn read_default_env_file(engine_state: &mut EngineState, stack: &mut
     match engine_state.cwd(Some(stack)) {
         Ok(cwd) => {
             if let Err(e) = engine_state.merge_env(stack, cwd) {
-                report_error_new(engine_state, &e);
+                report_shell_error(engine_state, &e);
             }
         }
         Err(e) => {
-            report_error_new(engine_state, &e);
+            report_shell_error(engine_state, &e);
         }
     }
 }
@@ -254,11 +252,11 @@ fn eval_default_config(
     match engine_state.cwd(Some(stack)) {
         Ok(cwd) => {
             if let Err(e) = engine_state.merge_env(stack, cwd) {
-                report_error_new(engine_state, &e);
+                report_shell_error(engine_state, &e);
             }
         }
         Err(e) => {
-            report_error_new(engine_state, &e);
+            report_shell_error(engine_state, &e);
         }
     }
 }
diff --git a/src/ide.rs b/src/ide.rs
index 948539d839..85046ef0d7 100644
--- a/src/ide.rs
+++ b/src/ide.rs
@@ -3,7 +3,7 @@ use nu_cli::NuCompleter;
 use nu_parser::{flatten_block, parse, FlatShape};
 use nu_protocol::{
     engine::{EngineState, Stack, StateWorkingSet},
-    report_error_new, DeclId, ShellError, Span, Value, VarId,
+    report_shell_error, DeclId, ShellError, Span, Value, VarId,
 };
 use reedline::Completer;
 use serde_json::{json, Value as JsonValue};
@@ -55,7 +55,7 @@ fn read_in_file<'a>(
     let file = std::fs::read(file_path)
         .into_diagnostic()
         .unwrap_or_else(|e| {
-            report_error_new(
+            report_shell_error(
                 engine_state,
                 &ShellError::FileNotFoundCustom {
                     msg: format!("Could not read file '{}': {:?}", file_path, e.to_string()),
diff --git a/src/main.rs b/src/main.rs
index a5c5c5d8ef..303fb50e9f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -25,7 +25,7 @@ use nu_cmd_base::util::get_init_cwd;
 use nu_lsp::LanguageServer;
 use nu_path::canonicalize_with;
 use nu_protocol::{
-    engine::EngineState, report_error_new, ByteStream, PipelineData, ShellError, Span, Spanned,
+    engine::EngineState, report_shell_error, ByteStream, PipelineData, ShellError, Span, Spanned,
     Value,
 };
 use nu_std::load_standard_library;
@@ -67,7 +67,7 @@ fn main() -> Result<()> {
     };
 
     if let Err(err) = engine_state.merge_delta(delta) {
-        report_error_new(&engine_state, &err);
+        report_shell_error(&engine_state, &err);
     }
 
     // TODO: make this conditional in the future
@@ -92,7 +92,7 @@ fn main() -> Result<()> {
                     .unwrap_or(PathBuf::from(&xdg_config_home))
                     .join("nushell")
             {
-                report_error_new(
+                report_shell_error(
                     &engine_state,
                     &ShellError::InvalidXdgConfig {
                         xdg: xdg_config_home,
@@ -164,7 +164,7 @@ fn main() -> Result<()> {
     let (args_to_nushell, script_name, args_to_script) = gather_commandline_args();
     let parsed_nu_cli_args = parse_commandline_args(&args_to_nushell.join(" "), &mut engine_state)
         .unwrap_or_else(|err| {
-            report_error_new(&engine_state, &err);
+            report_shell_error(&engine_state, &err);
             std::process::exit(1)
         });
 
diff --git a/src/run.rs b/src/run.rs
index 10a5043b25..89e70b8f0f 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -10,7 +10,7 @@ use nu_cli::read_plugin_file;
 use nu_cli::{evaluate_commands, evaluate_file, evaluate_repl, EvaluateCommandsOpts};
 use nu_protocol::{
     engine::{EngineState, Stack},
-    report_error_new, PipelineData, Spanned,
+    report_shell_error, PipelineData, Spanned,
 };
 use nu_utils::perf;
 
@@ -85,7 +85,7 @@ pub(crate) fn run_commands(
     engine_state.generate_nu_constant();
 
     let start_time = std::time::Instant::now();
-    if let Err(err) = evaluate_commands(
+    let result = evaluate_commands(
         commands,
         engine_state,
         &mut stack,
@@ -95,11 +95,13 @@ pub(crate) fn run_commands(
             error_style: parsed_nu_cli_args.error_style,
             no_newline: parsed_nu_cli_args.no_newline.is_some(),
         },
-    ) {
-        report_error_new(engine_state, &err);
-        std::process::exit(1);
-    }
+    );
     perf!("evaluate_commands", start_time, use_color);
+
+    if let Err(err) = result {
+        report_shell_error(engine_state, &err);
+        std::process::exit(err.exit_code());
+    }
 }
 
 pub(crate) fn run_file(
@@ -158,29 +160,19 @@ pub(crate) fn run_file(
     engine_state.generate_nu_constant();
 
     let start_time = std::time::Instant::now();
-    if let Err(err) = evaluate_file(
+    let result = evaluate_file(
         script_name,
         &args_to_script,
         engine_state,
         &mut stack,
         input,
-    ) {
-        report_error_new(engine_state, &err);
-        std::process::exit(1);
-    }
+    );
     perf!("evaluate_file", start_time, use_color);
 
-    let start_time = std::time::Instant::now();
-    let last_exit_code = stack.get_env_var(&*engine_state, "LAST_EXIT_CODE");
-    if let Some(last_exit_code) = last_exit_code {
-        let value = last_exit_code.as_int();
-        if let Ok(value) = value {
-            if value != 0 {
-                std::process::exit(value as i32);
-            }
-        }
+    if let Err(err) = result {
+        report_shell_error(engine_state, &err);
+        std::process::exit(err.exit_code());
     }
-    perf!("get exit code", start_time, use_color);
 }
 
 pub(crate) fn run_repl(
diff --git a/tests/shell/pipeline/commands/external.rs b/tests/shell/pipeline/commands/external.rs
index 5b9f116626..9a19f4b3a7 100644
--- a/tests/shell/pipeline/commands/external.rs
+++ b/tests/shell/pipeline/commands/external.rs
@@ -182,13 +182,6 @@ fn basic_outerr_pipe_works(#[case] redirection: &str) {
     assert_eq!(actual.out, "7");
 }
 
-#[test]
-fn err_pipe_with_failed_external_works() {
-    let actual =
-        nu!(r#"with-env { FOO: "bar" } { nu --testbin echo_env_stderr_fail FOO e>| str length }"#);
-    assert_eq!(actual.out, "3");
-}
-
 #[test]
 fn dont_run_glob_if_pass_variable_to_external() {
     Playground::setup("dont_run_glob", |dirs, sandbox| {
@@ -626,3 +619,24 @@ mod external_command_arguments {
         assert_eq!(actual.out, r#"expression=-r\" -w"#);
     }
 }
+
+#[test]
+fn exit_code_stops_execution_closure() {
+    let actual = nu!("[1 2] | each {|x| nu -c $'exit ($x)'; print $x }");
+    assert!(actual.out.is_empty());
+    assert!(actual.err.contains("exited with code 1"));
+}
+
+#[test]
+fn exit_code_stops_execution_custom_command() {
+    let actual = nu!("def cmd [] { nu -c 'exit 42'; 'ok1' }; cmd; print 'ok2'");
+    assert!(actual.out.is_empty());
+    assert!(actual.err.contains("exited with code 42"));
+}
+
+#[test]
+fn exit_code_stops_execution_for_loop() {
+    let actual = nu!("for x in [0 1] { nu -c 'exit 42'; print $x }");
+    assert!(actual.out.is_empty());
+    assert!(actual.err.contains("exited with code 42"));
+}

From 3e074bc447fe5394e365a918a0e46b5905c3a6bd Mon Sep 17 00:00:00 2001
From: xonas <jontopanotti@gmail.com>
Date: Sat, 7 Sep 2024 18:57:34 -0300
Subject: [PATCH 0422/1072] Refining error handling in http post (#13805)

Related to #13701

# Description
Refining some of the error handling related to http post command
---
 crates/nu-command/src/network/http/client.rs | 32 ++++++++++++--------
 crates/nu-protocol/src/errors/shell_error.rs |  9 ------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/crates/nu-command/src/network/http/client.rs b/crates/nu-command/src/network/http/client.rs
index 3729b37a43..e53a1f4413 100644
--- a/crates/nu-command/src/network/http/client.rs
+++ b/crates/nu-command/src/network/http/client.rs
@@ -259,7 +259,7 @@ fn send_json_request(
     signals: &Signals,
 ) -> Result<Response, ShellErrorOrRequestError> {
     match body {
-        Value::Int { .. } | Value::List { .. } | Value::Record { .. } => {
+        Value::Int { .. } | Value::Float { .. } | Value::List { .. } | Value::Record { .. } => {
             let data = value_to_json_value(&body)?;
             send_cancellable_request(request_url, Box::new(|| req.send_json(data)), span, signals)
         }
@@ -284,8 +284,11 @@ fn send_json_request(
             }
         }
         _ => Err(ShellErrorOrRequestError::ShellError(
-            ShellError::UnsupportedHttpBody {
-                msg: format!("Accepted types: [Int, List, String, Record]. Check: {HTTP_DOCS}"),
+            ShellError::TypeMismatch {
+                err_message: format!(
+                    "Accepted types: [int, float, list, string, record]. Check: {HTTP_DOCS}"
+                ),
+                span: body.span(),
             },
         )),
     }
@@ -308,10 +311,12 @@ fn send_form_request(
     };
 
     match body {
-        Value::List { vals, .. } => {
+        Value::List { ref vals, .. } => {
             if vals.len() % 2 != 0 {
-                return Err(ShellErrorOrRequestError::ShellError(ShellError::UnsupportedHttpBody {
-                    msg: "Body type 'List' for form requests requires paired values. E.g.: [value, 10]".into(),
+                return Err(ShellErrorOrRequestError::ShellError(ShellError::IncorrectValue {
+                    msg: "Body type 'list' for form requests requires paired values. E.g.: [foo, 10]".into(), 
+                    val_span: body.span(),
+                    call_span: span,
                 }));
             }
 
@@ -334,8 +339,9 @@ fn send_form_request(
             send_cancellable_request(request_url, request_fn, span, signals)
         }
         _ => Err(ShellErrorOrRequestError::ShellError(
-            ShellError::UnsupportedHttpBody {
-                msg: format!("Accepted types: [List, Record]. Check: {HTTP_DOCS}"),
+            ShellError::TypeMismatch {
+                err_message: format!("Accepted types: [list, record]. Check: {HTTP_DOCS}"),
+                span: body.span(),
             },
         )),
     }
@@ -388,8 +394,9 @@ fn send_multipart_request(
         }
         _ => {
             return Err(ShellErrorOrRequestError::ShellError(
-                ShellError::UnsupportedHttpBody {
-                    msg: format!("Accepted types: [Record]. Check: {HTTP_DOCS}"),
+                ShellError::TypeMismatch {
+                    err_message: format!("Accepted types: [record]. Check: {HTTP_DOCS}"),
+                    span: body.span(),
                 },
             ))
         }
@@ -418,8 +425,9 @@ fn send_default_request(
             signals,
         ),
         _ => Err(ShellErrorOrRequestError::ShellError(
-            ShellError::UnsupportedHttpBody {
-                msg: format!("Accepted types: [Binary, String]. Check: {HTTP_DOCS}"),
+            ShellError::TypeMismatch {
+                err_message: format!("Accepted types: [binary, string]. Check: {HTTP_DOCS}"),
+                span: body.span(),
             },
         )),
     }
diff --git a/crates/nu-protocol/src/errors/shell_error.rs b/crates/nu-protocol/src/errors/shell_error.rs
index 0784c91fb4..4bed5abd07 100644
--- a/crates/nu-protocol/src/errors/shell_error.rs
+++ b/crates/nu-protocol/src/errors/shell_error.rs
@@ -682,15 +682,6 @@ pub enum ShellError {
         span: Span,
     },
 
-    /// An unsupported body input was used for the respective application body type in 'http' command
-    ///
-    /// ## Resolution
-    ///
-    /// This error is fairly generic. Refer to the specific error message for further details.
-    #[error("Unsupported body for current content type")]
-    #[diagnostic(code(nu::shell::unsupported_body), help("{msg}"))]
-    UnsupportedHttpBody { msg: String },
-
     /// An operation was attempted with an input unsupported for some reason.
     ///
     /// ## Resolution

From 1e64f592201b438906a55d09f7e1f4f0a77c689b Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Sun, 8 Sep 2024 10:12:03 -0700
Subject: [PATCH 0423/1072] Added documentation explanation explaining how to
 select all columns with `polars col` (#13806)

# Description
Previously there were no examples or explanations that you can use '*'
to select all columns. Updated description and added a new example.
---
 .../src/dataframe/command/data/col.rs         | 41 ++++++++++++++-----
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/col.rs b/crates/nu_plugin_polars/src/dataframe/command/data/col.rs
index 33533e2a90..e39952378d 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/col.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/col.rs
@@ -1,7 +1,12 @@
-use crate::{dataframe::values::NuExpression, values::CustomValueSupport, PolarsPlugin};
+use crate::{
+    dataframe::values::NuExpression,
+    values::{Column, CustomValueSupport, NuDataFrame},
+    PolarsPlugin,
+};
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
-    record, Category, Example, LabeledError, PipelineData, Signature, SyntaxShape, Type, Value,
+    record, Category, Example, LabeledError, PipelineData, Signature, Span, SyntaxShape, Type,
+    Value,
 };
 use polars::prelude::col;
 
@@ -24,21 +29,35 @@ impl PluginCommand for ExprCol {
             .required(
                 "column name",
                 SyntaxShape::String,
-                "Name of column to be used",
+                "Name of column to be used. '*' can be used for all columns.",
             )
             .input_output_type(Type::Any, Type::Custom("expression".into()))
             .category(Category::Custom("expression".into()))
     }
 
     fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Creates a named column expression and converts it to a nu object",
-            example: "polars col a | polars into-nu",
-            result: Some(Value::test_record(record! {
-                "expr" =>  Value::test_string("column"),
-                "value" => Value::test_string("a"),
-            })),
-        }]
+        vec![
+            Example {
+                description: "Creates a named column expression and converts it to a nu object",
+                example: "polars col a | polars into-nu",
+                result: Some(Value::test_record(record! {
+                    "expr" =>  Value::test_string("column"),
+                    "value" => Value::test_string("a"),
+                })),
+            },
+            Example {
+                description: "Select all columns using the asterisk wildcard.",
+                example: "[[a b]; [x 1] [y 2] [z 3]] | polars into-df | polars select (polars col '*') | polars collect",
+                result: Some(
+                    NuDataFrame::try_from_columns(vec![
+                        Column::new("a".to_string(), vec![Value::test_string("x"), Value::test_string("y"), Value::test_string("z")]),
+                        Column::new("b".to_string(), vec![Value::test_int(1), Value::test_int(2), Value::test_int(3)]),
+                    ],None)
+                    .expect("should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+        ]
     }
 
     fn search_terms(&self) -> Vec<&str> {

From 2afc6a974ec98652d9e58ffb6e42502c50dacfba Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Sun, 8 Sep 2024 16:15:54 -0500
Subject: [PATCH 0424/1072] bump rust version to 1.79.0 (#13809)

# Description

This PR bumps our rust version from 1.78 to 1.79.0 due to the 1.81.0
release.

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.toml                      | 2 +-
 crates/nu-system/src/windows.rs | 2 +-
 rust-toolchain.toml             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 2bf290e96a..8668332f78 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ homepage = "https://www.nushell.sh"
 license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
-rust-version = "1.78.0"
+rust-version = "1.79.0"
 version = "0.97.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/crates/nu-system/src/windows.rs b/crates/nu-system/src/windows.rs
index b4217d4b9a..cd689b77c4 100644
--- a/crates/nu-system/src/windows.rs
+++ b/crates/nu-system/src/windows.rs
@@ -992,7 +992,7 @@ fn get_name(psid: PSID) -> Option<(String, String)> {
 fn from_wide_ptr(ptr: *const u16) -> String {
     unsafe {
         assert!(!ptr.is_null());
-        let len = (0..std::isize::MAX)
+        let len = (0..isize::MAX)
             .position(|i| *ptr.offset(i) == 0)
             .unwrap_or_default();
         let slice = std::slice::from_raw_parts(ptr, len);
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index b8ca48435b..bb2f1fcb35 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -16,4 +16,4 @@ profile = "default"
 # use in nushell, we may opt to use the bleeding edge stable version of rust.
 # I believe rust is on a 6 week release cycle and nushell is on a 4 week release cycle.
 # So, every two nushell releases, this version number should be bumped by one.
-channel = "1.78.0"
+channel = "1.79.0"

From aff974552aed32e2b17070d2c2c65fc39e9d0983 Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Mon, 9 Sep 2024 09:47:59 +0800
Subject: [PATCH 0425/1072] Add aarch64-unknown-linux-musl and
 armv7-unknown-linux-musleabihf targets to release workflow (#13800)

# Description

Add aarch64-unknown-linux-musl and armv7-unknown-linux-musleabihf
targets to release workflow. This PR and
https://github.com/nushell/nushell/pull/13775 will close:
https://github.com/nushell/nushell/issues/10444

It works well here:
https://github.com/nushell/nightly/releases/tag/nightly-2d360fd
---
 .github/workflows/release.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 53f22cec66..2189286574 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -28,7 +28,9 @@ jobs:
         - x86_64-unknown-linux-gnu
         - x86_64-unknown-linux-musl
         - aarch64-unknown-linux-gnu
+        - aarch64-unknown-linux-musl
         - armv7-unknown-linux-gnueabihf
+        - armv7-unknown-linux-musleabihf
         - riscv64gc-unknown-linux-gnu
         extra: ['bin']
         include:
@@ -54,8 +56,12 @@ jobs:
           os: ubuntu-22.04
         - target: aarch64-unknown-linux-gnu
           os: ubuntu-22.04
+        - target: aarch64-unknown-linux-musl
+          os: ubuntu-22.04
         - target: armv7-unknown-linux-gnueabihf
           os: ubuntu-22.04
+        - target: armv7-unknown-linux-musleabihf
+          os: ubuntu-22.04
         - target: riscv64gc-unknown-linux-gnu
           os: ubuntu-latest
 

From 6600b3edfbd0d7ac58e604b14b4336f69dcbea3b Mon Sep 17 00:00:00 2001
From: Anton Sagel <76914086+Ancient77@users.noreply.github.com>
Date: Mon, 9 Sep 2024 20:39:18 +0200
Subject: [PATCH 0426/1072] Expand multiple dots in path in completions
 (#13725)

# Description
This is my first PR, and I'm looking for feedback to help me improve!

This PR fixes #13380 by expanding the path prior to parsing it.
Also I've removed some unused code in
[completion_common.rs](https://github.com/Ancient77/nushell/blob/84e92bb02c78d4bb71a045fbbe73b9351ab8d16a/crates/nu-cli/src/completions/completion_common.rs
)
# User-Facing Changes

Auto-completion for "cd .../" now works by expanding to "cd ../../".

# Tests + Formatting

Formatted and added 2 tests for triple dots in the middle of a path and
at the end.
Also added a test for the expand_ndots() function.
---
 .../src/completions/completion_common.rs      |  66 ++++-
 crates/nu-cli/tests/completions/mod.rs        | 240 +++++++++++++++++-
 crates/nu-path/src/dots.rs                    |  11 +
 .../folder_inside_folder/myfile               |   0
 4 files changed, 303 insertions(+), 14 deletions(-)
 create mode 100644 tests/fixtures/completions/directory_completion/folder_inside_folder/myfile

diff --git a/crates/nu-cli/src/completions/completion_common.rs b/crates/nu-cli/src/completions/completion_common.rs
index 8aae72b4f3..77ae165c73 100644
--- a/crates/nu-cli/src/completions/completion_common.rs
+++ b/crates/nu-cli/src/completions/completion_common.rs
@@ -1,3 +1,4 @@
+use super::MatchAlgorithm;
 use crate::{
     completions::{matches, CompletionOptions},
     SemanticSuggestion,
@@ -5,6 +6,7 @@ use crate::{
 use fuzzy_matcher::{skim::SkimMatcherV2, FuzzyMatcher};
 use nu_ansi_term::Style;
 use nu_engine::env_to_string;
+use nu_path::dots::expand_ndots;
 use nu_path::{expand_to_real_path, home_dir};
 use nu_protocol::{
     engine::{EngineState, Stack, StateWorkingSet},
@@ -13,8 +15,6 @@ use nu_protocol::{
 use nu_utils::get_ls_colors;
 use std::path::{is_separator, Component, Path, PathBuf, MAIN_SEPARATOR as SEP};
 
-use super::MatchAlgorithm;
-
 #[derive(Clone, Default)]
 pub struct PathBuiltFromString {
     parts: Vec<String>,
@@ -41,7 +41,7 @@ pub fn complete_rec(
     let mut completions = vec![];
 
     if let Some((&base, rest)) = partial.split_first() {
-        if (base == "." || base == "..") && (isdir || !rest.is_empty()) {
+        if base.chars().all(|c| c == '.') && (isdir || !rest.is_empty()) {
             let mut built = built.clone();
             built.parts.push(base.to_string());
             built.isdir = true;
@@ -156,16 +156,25 @@ pub fn complete_item(
     engine_state: &EngineState,
     stack: &Stack,
 ) -> Vec<(nu_protocol::Span, String, Option<Style>)> {
-    let partial = surround_remove(partial);
-    let isdir = partial.ends_with(is_separator);
+    let cleaned_partial = surround_remove(partial);
+    let isdir = cleaned_partial.ends_with(is_separator);
+    let expanded_partial = expand_ndots(Path::new(&cleaned_partial));
+    let should_collapse_dots = expanded_partial != Path::new(&cleaned_partial);
+    let mut partial = expanded_partial.to_string_lossy().to_string();
 
     #[cfg(unix)]
     let path_separator = SEP;
     #[cfg(windows)]
-    let path_separator = partial
+    let path_separator = cleaned_partial
         .chars()
         .rfind(|c: &char| is_separator(*c))
         .unwrap_or(SEP);
+
+    // Handle the trailing dot case
+    if cleaned_partial.ends_with(&format!("{path_separator}.")) {
+        partial.push_str(&format!("{path_separator}."));
+    }
+
     let cwd_pathbuf = Path::new(cwd).to_path_buf();
     let ls_colors = (engine_state.config.completions.use_ls_colors
         && engine_state.config.use_ansi_coloring)
@@ -185,16 +194,11 @@ pub fn complete_item(
     match components.peek().cloned() {
         Some(c @ Component::Prefix(..)) => {
             // windows only by definition
-            components.next();
-            if let Some(Component::RootDir) = components.peek().cloned() {
-                components.next();
-            };
             cwd = [c, Component::RootDir].iter().collect();
             prefix_len = c.as_os_str().len();
             original_cwd = OriginalCwd::Prefix(c.as_os_str().to_string_lossy().into_owned());
         }
         Some(c @ Component::RootDir) => {
-            components.next();
             // This is kind of a hack. When joining an empty string with the rest,
             // we add the slash automagically
             cwd = PathBuf::from(c.as_os_str());
@@ -202,7 +206,6 @@ pub fn complete_item(
             original_cwd = OriginalCwd::Prefix(String::new());
         }
         Some(Component::Normal(home)) if home.to_string_lossy() == "~" => {
-            components.next();
             cwd = home_dir().map(Into::into).unwrap_or(cwd_pathbuf);
             prefix_len = 1;
             original_cwd = OriginalCwd::Home;
@@ -227,7 +230,10 @@ pub fn complete_item(
         isdir,
     )
     .into_iter()
-    .map(|p| {
+    .map(|mut p| {
+        if should_collapse_dots {
+            p = collapse_ndots(p);
+        }
         let path = original_cwd.apply(p, path_separator);
         let style = ls_colors.as_ref().map(|lsc| {
             lsc.style_for_path_with_metadata(
@@ -340,3 +346,37 @@ pub fn sort_completions<T>(
 
     items
 }
+
+/// Collapse multiple ".." components into n-dots.
+///
+/// It performs the reverse operation of `expand_ndots`, collapsing sequences of ".." into n-dots,
+/// such as "..." and "....".
+///
+/// The resulting path will use platform-specific path separators, regardless of what path separators were used in the input.
+fn collapse_ndots(path: PathBuiltFromString) -> PathBuiltFromString {
+    let mut result = PathBuiltFromString {
+        parts: Vec::with_capacity(path.parts.len()),
+        isdir: path.isdir,
+    };
+
+    let mut dot_count = 0;
+
+    for part in path.parts {
+        if part == ".." {
+            dot_count += 1;
+        } else {
+            if dot_count > 0 {
+                result.parts.push(".".repeat(dot_count + 1));
+                dot_count = 0;
+            }
+            result.parts.push(part);
+        }
+    }
+
+    // Add any remaining dots
+    if dot_count > 0 {
+        result.parts.push(".".repeat(dot_count + 1));
+    }
+
+    result
+}
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index 3dc4443bc3..2c0a98688c 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -339,7 +339,7 @@ fn file_completions() {
     match_suggestions(&expected_paths, &suggestions);
 
     // Test completions for hidden files
-    let target_dir = format!("ls {}{MAIN_SEPARATOR}.", folder(dir.join(".hidden_folder")));
+    let target_dir = format!("ls {}", file(dir.join(".hidden_folder").join(".")));
     let suggestions = completer.complete(&target_dir, target_dir.len());
 
     let expected_paths: Vec<String> =
@@ -564,6 +564,58 @@ fn partial_completions() {
     match_suggestions(&expected_paths, &suggestions);
 }
 
+#[test]
+fn partial_completion_with_dot_expansions() {
+    let (dir, _, engine, stack) = new_partial_engine();
+
+    let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
+
+    let dir_str = file(
+        dir.join("par")
+            .join("...")
+            .join("par")
+            .join("fi")
+            .join("so"),
+    );
+    let target_dir = format!("rm {dir_str}");
+    let suggestions = completer.complete(&target_dir, target_dir.len());
+
+    // Create the expected values
+    let expected_paths: Vec<String> = vec![
+        file(
+            dir.join("partial")
+                .join("...")
+                .join("partial_completions")
+                .join("final_partial")
+                .join("somefile"),
+        ),
+        file(
+            dir.join("partial-a")
+                .join("...")
+                .join("partial_completions")
+                .join("final_partial")
+                .join("somefile"),
+        ),
+        file(
+            dir.join("partial-b")
+                .join("...")
+                .join("partial_completions")
+                .join("final_partial")
+                .join("somefile"),
+        ),
+        file(
+            dir.join("partial-c")
+                .join("...")
+                .join("partial_completions")
+                .join("final_partial")
+                .join("somefile"),
+        ),
+    ];
+
+    // Match the results
+    match_suggestions(&expected_paths, &suggestions);
+}
+
 #[test]
 fn command_ls_with_filecompletion() {
     let (_, _, engine, stack) = new_engine();
@@ -953,6 +1005,192 @@ fn folder_with_directorycompletions() {
     match_suggestions(&expected_paths, &suggestions);
 }
 
+#[test]
+fn folder_with_directorycompletions_with_dots() {
+    // Create a new engine
+    let (dir, _, engine, stack) = new_engine();
+    let dir_str = dir
+        .join("directory_completion")
+        .join("folder_inside_folder")
+        .into_os_string()
+        .into_string()
+        .unwrap();
+
+    // Instantiate a new completer
+    let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
+
+    // Test completions for the current folder
+    let target_dir = format!("cd {dir_str}{MAIN_SEPARATOR}..{MAIN_SEPARATOR}");
+    let suggestions = completer.complete(&target_dir, target_dir.len());
+
+    // Create the expected values
+    let expected_paths: Vec<String> = vec![folder(
+        dir.join("directory_completion")
+            .join("folder_inside_folder")
+            .join("..")
+            .join("folder_inside_folder"),
+    )];
+
+    #[cfg(windows)]
+    {
+        let target_dir = format!("cd {dir_str}/../");
+        let slash_suggestions = completer.complete(&target_dir, target_dir.len());
+
+        let expected_slash_paths: Vec<String> = expected_paths
+            .iter()
+            .map(|s| s.replace('\\', "/"))
+            .collect();
+
+        match_suggestions(&expected_slash_paths, &slash_suggestions);
+    }
+
+    // Match the results
+    match_suggestions(&expected_paths, &suggestions);
+}
+
+#[test]
+fn folder_with_directorycompletions_with_three_trailing_dots() {
+    // Create a new engine
+    let (dir, _, engine, stack) = new_engine();
+    let dir_str = dir
+        .join("directory_completion")
+        .join("folder_inside_folder")
+        .into_os_string()
+        .into_string()
+        .unwrap();
+
+    // Instantiate a new completer
+    let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
+
+    // Test completions for the current folder
+    let target_dir = format!("cd {dir_str}{MAIN_SEPARATOR}...{MAIN_SEPARATOR}");
+    let suggestions = completer.complete(&target_dir, target_dir.len());
+
+    // Create the expected values
+    let expected_paths: Vec<String> = vec![
+        folder(
+            dir.join("directory_completion")
+                .join("folder_inside_folder")
+                .join("...")
+                .join("another"),
+        ),
+        folder(
+            dir.join("directory_completion")
+                .join("folder_inside_folder")
+                .join("...")
+                .join("directory_completion"),
+        ),
+        folder(
+            dir.join("directory_completion")
+                .join("folder_inside_folder")
+                .join("...")
+                .join("test_a"),
+        ),
+        folder(
+            dir.join("directory_completion")
+                .join("folder_inside_folder")
+                .join("...")
+                .join("test_b"),
+        ),
+        folder(
+            dir.join("directory_completion")
+                .join("folder_inside_folder")
+                .join("...")
+                .join(".hidden_folder"),
+        ),
+    ];
+
+    #[cfg(windows)]
+    {
+        let target_dir = format!("cd {dir_str}/.../");
+        let slash_suggestions = completer.complete(&target_dir, target_dir.len());
+
+        let expected_slash_paths: Vec<String> = expected_paths
+            .iter()
+            .map(|s| s.replace('\\', "/"))
+            .collect();
+
+        match_suggestions(&expected_slash_paths, &slash_suggestions);
+    }
+
+    // Match the results
+    match_suggestions(&expected_paths, &suggestions);
+}
+
+#[test]
+fn folder_with_directorycompletions_do_not_collapse_dots() {
+    // Create a new engine
+    let (dir, _, engine, stack) = new_engine();
+    let dir_str = dir
+        .join("directory_completion")
+        .join("folder_inside_folder")
+        .into_os_string()
+        .into_string()
+        .unwrap();
+
+    // Instantiate a new completer
+    let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
+
+    // Test completions for the current folder
+    let target_dir = format!("cd {dir_str}{MAIN_SEPARATOR}..{MAIN_SEPARATOR}..{MAIN_SEPARATOR}");
+    let suggestions = completer.complete(&target_dir, target_dir.len());
+
+    // Create the expected values
+    let expected_paths: Vec<String> = vec![
+        folder(
+            dir.join("directory_completion")
+                .join("folder_inside_folder")
+                .join("..")
+                .join("..")
+                .join("another"),
+        ),
+        folder(
+            dir.join("directory_completion")
+                .join("folder_inside_folder")
+                .join("..")
+                .join("..")
+                .join("directory_completion"),
+        ),
+        folder(
+            dir.join("directory_completion")
+                .join("folder_inside_folder")
+                .join("..")
+                .join("..")
+                .join("test_a"),
+        ),
+        folder(
+            dir.join("directory_completion")
+                .join("folder_inside_folder")
+                .join("..")
+                .join("..")
+                .join("test_b"),
+        ),
+        folder(
+            dir.join("directory_completion")
+                .join("folder_inside_folder")
+                .join("..")
+                .join("..")
+                .join(".hidden_folder"),
+        ),
+    ];
+
+    #[cfg(windows)]
+    {
+        let target_dir = format!("cd {dir_str}/../../");
+        let slash_suggestions = completer.complete(&target_dir, target_dir.len());
+
+        let expected_slash_paths: Vec<String> = expected_paths
+            .iter()
+            .map(|s| s.replace('\\', "/"))
+            .collect();
+
+        match_suggestions(&expected_slash_paths, &slash_suggestions);
+    }
+
+    // Match the results
+    match_suggestions(&expected_paths, &suggestions);
+}
+
 #[test]
 fn variables_completions() {
     // Create a new engine
diff --git a/crates/nu-path/src/dots.rs b/crates/nu-path/src/dots.rs
index 6f46bb09c3..8d6341cb46 100644
--- a/crates/nu-path/src/dots.rs
+++ b/crates/nu-path/src/dots.rs
@@ -152,6 +152,17 @@ mod test_expand_ndots {
         };
         assert_path_eq!(expand_ndots(path), expected);
     }
+
+    #[test]
+    fn trailing_dots() {
+        let path = Path::new("/foo/bar/..");
+        let expected = if cfg!(windows) {
+            r"\foo\bar\.."
+        } else {
+            "/foo/bar/.."
+        };
+        assert_path_eq!(expand_ndots(path), expected);
+    }
 }
 
 #[cfg(test)]
diff --git a/tests/fixtures/completions/directory_completion/folder_inside_folder/myfile b/tests/fixtures/completions/directory_completion/folder_inside_folder/myfile
new file mode 100644
index 0000000000..e69de29bb2

From 493850b1bf12f417a059094932173b3805561760 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Mon, 9 Sep 2024 19:44:04 -0700
Subject: [PATCH 0427/1072] Fix IR for `try` (#13811)

# Description
Fixes a bug in the IR for `try` to match that of the regular evaluator
(continuing from #13515):
```nushell
# without IR:
try { ^false } catch { 'caught' } # == 'caught'

# with IR:
try { ^false } catch { 'caught' } # error, non-zero exit code
```

In this PR, both now evaluate to `caught`. For the implementation, I had
to add another instruction, and feel free to suggest better
alternatives. In the future, it might be possible to get rid of this
extra instruction.

# User-Facing Changes
Bug fix, `try { ^false } catch { 'caught' }` now works in IR.
---
 crates/nu-command/tests/commands/try_.rs |  4 ++--
 crates/nu-engine/src/compile/builder.rs  |  1 +
 crates/nu-engine/src/compile/keyword.rs  | 14 +++++++++++++-
 crates/nu-engine/src/eval_ir.rs          | 11 +++++++++++
 crates/nu-protocol/src/ir/display.rs     |  3 +++
 crates/nu-protocol/src/ir/mod.rs         |  4 ++++
 crates/nu-protocol/tests/test_config.rs  |  4 ++--
 7 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/crates/nu-command/tests/commands/try_.rs b/crates/nu-command/tests/commands/try_.rs
index 264b20796f..58d1c8f80a 100644
--- a/crates/nu-command/tests/commands/try_.rs
+++ b/crates/nu-command/tests/commands/try_.rs
@@ -96,12 +96,12 @@ fn can_catch_infinite_recursion() {
 
 #[test]
 fn exit_code_available_in_catch_env() {
-    let actual = nu!("try { nu -c 'exit 42'; null } catch { $env.LAST_EXIT_CODE }");
+    let actual = nu!("try { nu -c 'exit 42' } catch { $env.LAST_EXIT_CODE }");
     assert_eq!(actual.out, "42");
 }
 
 #[test]
 fn exit_code_available_in_catch() {
-    let actual = nu!("try { nu -c 'exit 42'; null } catch { |e| $e.exit_code }");
+    let actual = nu!("try { nu -c 'exit 42' } catch { |e| $e.exit_code }");
     assert_eq!(actual.out, "42");
 }
diff --git a/crates/nu-engine/src/compile/builder.rs b/crates/nu-engine/src/compile/builder.rs
index 655ffbddc5..cedebd0fb2 100644
--- a/crates/nu-engine/src/compile/builder.rs
+++ b/crates/nu-engine/src/compile/builder.rs
@@ -202,6 +202,7 @@ impl BlockBuilder {
             Instruction::Span { src_dst } => allocate(&[*src_dst], &[*src_dst]),
             Instruction::Drop { src } => allocate(&[*src], &[]),
             Instruction::Drain { src } => allocate(&[*src], &[]),
+            Instruction::WriteToOutDests { src } => allocate(&[*src], &[]),
             Instruction::LoadVariable { dst, var_id: _ } => allocate(&[], &[*dst]),
             Instruction::StoreVariable { var_id: _, src } => allocate(&[*src], &[]),
             Instruction::DropVariable { var_id: _ } => Ok(()),
diff --git a/crates/nu-engine/src/compile/keyword.rs b/crates/nu-engine/src/compile/keyword.rs
index 8fe939d638..f9a81ab6d1 100644
--- a/crates/nu-engine/src/compile/keyword.rs
+++ b/crates/nu-engine/src/compile/keyword.rs
@@ -362,6 +362,7 @@ pub(crate) fn compile_try(
     //
     //       on-error-into ERR, %io_reg           // or without
     //       %io_reg <- <...block...> <- %io_reg
+    //       write-to-out-dests %io_reg
     //       pop-error-handler
     //       jump END
     // ERR:  clone %err_reg, %io_reg
@@ -374,6 +375,7 @@ pub(crate) fn compile_try(
     //       %closure_reg <- <catch_expr>
     //       on-error-into ERR, %io_reg
     //       %io_reg <- <...block...> <- %io_reg
+    //       write-to-out-dests %io_reg
     //       pop-error-handler
     //       jump END
     // ERR:  clone %err_reg, %io_reg
@@ -461,7 +463,17 @@ pub(crate) fn compile_try(
         io_reg,
     )?;
 
-    // Successful case: pop the error handler
+    // Successful case:
+    // - write to the current output destinations
+    // - pop the error handler
+    if let Some(mode) = redirect_modes.out {
+        builder.push(mode.map(|mode| Instruction::RedirectOut { mode }))?;
+    }
+
+    if let Some(mode) = redirect_modes.err {
+        builder.push(mode.map(|mode| Instruction::RedirectErr { mode }))?;
+    }
+    builder.push(Instruction::WriteToOutDests { src: io_reg }.into_spanned(call.head))?;
     builder.push(Instruction::PopErrorHandler.into_spanned(call.head))?;
 
     // Jump over the failure case
diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index 34ec541a14..62e9b0caad 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -317,6 +317,17 @@ fn eval_instruction<D: DebugContext>(
             let data = ctx.take_reg(*src);
             drain(ctx, data)
         }
+        Instruction::WriteToOutDests { src } => {
+            let data = ctx.take_reg(*src);
+            let res = {
+                let stack = &mut ctx
+                    .stack
+                    .push_redirection(ctx.redirect_out.clone(), ctx.redirect_err.clone());
+                data.write_to_out_dests(ctx.engine_state, stack)?
+            };
+            ctx.put_reg(*src, res);
+            Ok(Continue)
+        }
         Instruction::LoadVariable { dst, var_id } => {
             let value = get_var(ctx, *var_id, *span)?;
             ctx.put_reg(*dst, value.into_pipeline_data());
diff --git a/crates/nu-protocol/src/ir/display.rs b/crates/nu-protocol/src/ir/display.rs
index af521e162f..feac8f961d 100644
--- a/crates/nu-protocol/src/ir/display.rs
+++ b/crates/nu-protocol/src/ir/display.rs
@@ -94,6 +94,9 @@ impl<'a> fmt::Display for FmtInstruction<'a> {
             Instruction::Drain { src } => {
                 write!(f, "{:WIDTH$} {src}", "drain")
             }
+            Instruction::WriteToOutDests { src } => {
+                write!(f, "{:WIDTH$} {src}", "write-to-out-dests")
+            }
             Instruction::LoadVariable { dst, var_id } => {
                 let var = FmtVar::new(self.engine_state, *var_id);
                 write!(f, "{:WIDTH$} {dst}, {var}", "load-variable")
diff --git a/crates/nu-protocol/src/ir/mod.rs b/crates/nu-protocol/src/ir/mod.rs
index 214632b44d..c2f51f514a 100644
--- a/crates/nu-protocol/src/ir/mod.rs
+++ b/crates/nu-protocol/src/ir/mod.rs
@@ -123,6 +123,9 @@ pub enum Instruction {
     /// code, and invokes any available error handler with Empty, or if not available, returns an
     /// exit-code-only stream, leaving the block.
     Drain { src: RegId },
+    /// Write to the output destinations in the stack
+    // TODO: see if it's possible to remove this
+    WriteToOutDests { src: RegId },
     /// Load the value of a variable into the `dst` register
     LoadVariable { dst: RegId, var_id: VarId },
     /// Store the value of a variable from the `src` register
@@ -287,6 +290,7 @@ impl Instruction {
             Instruction::Span { src_dst } => Some(src_dst),
             Instruction::Drop { .. } => None,
             Instruction::Drain { .. } => None,
+            Instruction::WriteToOutDests { .. } => None,
             Instruction::LoadVariable { dst, .. } => Some(dst),
             Instruction::StoreVariable { .. } => None,
             Instruction::DropVariable { .. } => None,
diff --git a/crates/nu-protocol/tests/test_config.rs b/crates/nu-protocol/tests/test_config.rs
index ed44b36581..f47dda3121 100644
--- a/crates/nu-protocol/tests/test_config.rs
+++ b/crates/nu-protocol/tests/test_config.rs
@@ -65,7 +65,7 @@ fn fancy_default_errors() {
         r#"force_error "My error""#,
     ]);
 
-    let actual = nu!(format!("try {{ {code}; null }}"));
+    let actual = nu!(format!("try {{ {code} }}"));
 
     assert_eq!(
         actual.err,
@@ -89,7 +89,7 @@ fn narratable_errors() {
         r#"force_error "my error""#,
     ]);
 
-    let actual = nu!(format!("try {{ {code}; null }}"));
+    let actual = nu!(format!("try {{ {code} }}"));
 
     assert_eq!(
         actual.err,

From 6b5906613c221a4309c9981560334fd22f4c9cc6 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Mon, 9 Sep 2024 20:03:06 -0700
Subject: [PATCH 0428/1072] Fix remaining mismatch for env handling in IR
 (#13796)

# Description

This fixes a couple of remaining differences between the IR evaluator's
handling of env vars and the AST evaluator's handling of env vars.

Blocker for #13718 (this is why those tests failed)

# User-Facing Changes

1. Handles checking overlays for hidden env vars properly, when getting
an env var from IR instruction
2. Updates config properly when doing `redirect_env()` (these probably
shouldn't be separate functions anyway, though, they're basically the
same. I did this because I intended to remove one, but now it's just
like that)

# Tests + Formatting

The `nu_repl` testbin now handles `NU_USE_IR` properly, so these tests
now work as expected.

# After Submitting

- [ ] check in on #13718 again
---
 crates/nu-engine/src/eval_ir.rs | 51 ++++++++++++++++++++++-----------
 src/test_bins.rs                |  5 ++++
 2 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index 62e9b0caad..b6f5287196 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -1274,27 +1274,41 @@ fn get_var(ctx: &EvalContext<'_>, var_id: VarId, span: Span) -> Result<Value, Sh
 /// Get an environment variable, case-insensitively
 fn get_env_var_case_insensitive<'a>(ctx: &'a mut EvalContext<'_>, key: &str) -> Option<&'a Value> {
     // Read scopes in order
-    ctx.stack
+    for overlays in ctx
+        .stack
         .env_vars
         .iter()
         .rev()
         .chain(std::iter::once(&ctx.engine_state.env_vars))
-        .flat_map(|overlays| {
-            // Read overlays in order
-            ctx.stack
-                .active_overlays
-                .iter()
-                .rev()
-                .filter_map(|name| overlays.get(name))
-        })
-        .find_map(|map| {
-            // Use the hashmap first to try to be faster?
-            map.get(key).or_else(|| {
-                // Check to see if it exists at all in the map
-                map.iter()
-                    .find_map(|(k, v)| k.eq_ignore_case(key).then_some(v))
-            })
-        })
+    {
+        // Read overlays in order
+        for overlay_name in ctx.stack.active_overlays.iter().rev() {
+            let Some(map) = overlays.get(overlay_name) else {
+                // Skip if overlay doesn't exist in this scope
+                continue;
+            };
+            let hidden = ctx.stack.env_hidden.get(overlay_name);
+            let is_hidden = |key: &str| hidden.is_some_and(|hidden| hidden.contains(key));
+
+            if let Some(val) = map
+                // Check for exact match
+                .get(key)
+                // Skip when encountering an overlay where the key is hidden
+                .filter(|_| !is_hidden(key))
+                .or_else(|| {
+                    // Check to see if it exists at all in the map, with a different case
+                    map.iter().find_map(|(k, v)| {
+                        // Again, skip something that's hidden
+                        (k.eq_ignore_case(key) && !is_hidden(k)).then_some(v)
+                    })
+                })
+            {
+                return Some(val);
+            }
+        }
+    }
+    // Not found
+    None
 }
 
 /// Get the existing name of an environment variable, case-insensitively. This is used to implement
@@ -1472,4 +1486,7 @@ fn redirect_env(engine_state: &EngineState, caller_stack: &mut Stack, callee_sta
     for (var, value) in callee_stack.get_stack_env_vars() {
         caller_stack.add_env_var(var, value);
     }
+
+    // set config to callee config, to capture any updates to that
+    caller_stack.config.clone_from(&callee_stack.config);
 }
diff --git a/src/test_bins.rs b/src/test_bins.rs
index b20c01f997..c2ec287138 100644
--- a/src/test_bins.rs
+++ b/src/test_bins.rs
@@ -244,6 +244,11 @@ pub fn nu_repl() {
     engine_state.add_env_var("PWD".into(), Value::test_string(cwd.to_string_lossy()));
     engine_state.add_env_var("PATH".into(), Value::test_string(""));
 
+    // Enable IR in tests if set
+    if std::env::var_os("NU_USE_IR").is_some() {
+        Arc::make_mut(&mut top_stack).use_ir = true;
+    }
+
     let mut last_output = String::new();
 
     load_standard_library(&mut engine_state).expect("Could not load the standard library.");

From d192d854d6e2cada1f8eb4c20eb34f342bc7e8b5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Sep 2024 14:35:27 +0800
Subject: [PATCH 0429/1072] Bump shadow-rs from 0.33.0 to 0.34.0 (#13825)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [shadow-rs](https://github.com/baoyachi/shadow-rs) from 0.33.0 to
0.34.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/baoyachi/shadow-rs/releases">shadow-rs's
releases</a>.</em></p>
<blockquote>
<h2>v0.34.0</h2>
<h2>What's Changed</h2>
<ul>
<li>Make using the CARGO_METADATA object simpler by <a
href="https://github.com/baoyachi"><code>@​baoyachi</code></a> in <a
href="https://redirect.github.com/baoyachi/shadow-rs/pull/181">baoyachi/shadow-rs#181</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/baoyachi/shadow-rs/compare/v0.33.0...v0.34.0">https://github.com/baoyachi/shadow-rs/compare/v0.33.0...v0.34.0</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/ccb09f154bede1d3290fa5744516c630d69866c5"><code>ccb09f1</code></a>
Merge pull request <a
href="https://redirect.github.com/baoyachi/shadow-rs/issues/181">#181</a>
from baoyachi/issue/179</li>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/65c56630da5d9d28d4dfe320c436eab6a69c23dc"><code>65c5663</code></a>
fix cargo clippy check</li>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/998d000023c4e91c8dcfad0b0cc7838961c98219"><code>998d000</code></a>
Make using the CARGO_METADATA object simpler</li>
<li>See full diff in <a
href="https://github.com/baoyachi/shadow-rs/compare/v0.33.0...v0.34.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=shadow-rs&package-manager=cargo&previous-version=0.33.0&new-version=0.34.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                    | 6 +++---
 crates/nu-cmd-lang/Cargo.toml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6206c85482..098e7ffd9d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -375,7 +375,7 @@ dependencies = [
  "bitflags 2.6.0",
  "cexpr",
  "clang-sys",
- "itertools 0.11.0",
+ "itertools 0.12.1",
  "lazy_static",
  "lazycell",
  "proc-macro2",
@@ -5714,9 +5714,9 @@ dependencies = [
 
 [[package]]
 name = "shadow-rs"
-version = "0.33.0"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a3978e7641f86a78c2f619f9b13bdffb4e43a1d5119f39eb03d1bc5ac61daaf"
+checksum = "69fe0bac8a8752586a618a1c80d01d8ca5d40fce4f6077fbc851e48dcbdb90df"
 dependencies = [
  "const_format",
  "is_debug",
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index b248ad836a..fa1b9a54af 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -21,10 +21,10 @@ nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
 nu-utils = { path = "../nu-utils", version = "0.97.2" }
 
 itertools = { workspace = true }
-shadow-rs = { version = "0.33", default-features = false }
+shadow-rs = { version = "0.34", default-features = false }
 
 [build-dependencies]
-shadow-rs = { version = "0.33", default-features = false }
+shadow-rs = { version = "0.34", default-features = false }
 
 [features]
 mimalloc = []

From 2ab8751ff99ca5dde5588a9fbcf83df4b7e85d38 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Sep 2024 14:35:38 +0800
Subject: [PATCH 0430/1072] Bump hustcer/setup-nu from 3.12 to 3.13 (#13827)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [hustcer/setup-nu](https://github.com/hustcer/setup-nu) from 3.12
to 3.13.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/hustcer/setup-nu/releases">hustcer/setup-nu's
releases</a>.</em></p>
<blockquote>
<h2>v3.13</h2>
<h2>[3.13] - 2024-09-07</h2>
<h3>Features</h3>
<ul>
<li>Add <code>aarch64_linux</code> and <code>aarch64_windows</code>
runners support</li>
</ul>
<h3>Deps</h3>
<ul>
<li>Upgrade
<code>@​octokit/rest</code>,globby,<code>@​biomejs/biome</code>,lefthook,
etc.</li>
<li>Upgrade semver,lefthook,<code>@​octokit/rest</code> and
@typescript-eslint/*</li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/hustcer/setup-nu/compare/v3.12...v3.13">https://github.com/hustcer/setup-nu/compare/v3.12...v3.13</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/hustcer/setup-nu/blob/main/CHANGELOG.md">hustcer/setup-nu's
changelog</a>.</em></p>
<blockquote>
<h2>[3.13] - 2024-09-07</h2>
<h3>Features</h3>
<ul>
<li>Add <code>aarch64_linux</code> and <code>aarch64_windows</code>
runners support</li>
</ul>
<h3>Deps</h3>
<ul>
<li>Upgrade
<code>@​octokit/rest</code>,globby,<code>@​biomejs/biome</code>,lefthook,
etc.</li>
<li>Upgrade semver,lefthook,<code>@​octokit/rest</code> and
@typescript-eslint/*</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/hustcer/setup-nu/commit/5dfe3b1a9e90adda6d8d1478f14482857f4f3563"><code>5dfe3b1</code></a>
Bump to v3.13</li>
<li><a
href="https://github.com/hustcer/setup-nu/commit/7f30320d512310a74a5dcfd3a425822f4bb6d8a1"><code>7f30320</code></a>
deps: Upgrade <code>@​octokit/rest</code>, lefthook and
@typescript-eslint/*</li>
<li><a
href="https://github.com/hustcer/setup-nu/commit/aed3675fdbd0299d9634867e862f863db18cc04e"><code>aed3675</code></a>
deps: Upgrade semver,lefthook,<code>@​octokit/rest</code> and
@typescript-eslint/*</li>
<li><a
href="https://github.com/hustcer/setup-nu/commit/cb4476b15e2d2729f771c1a640eacb733f1ad87d"><code>cb4476b</code></a>
deps: Upgrade
<code>@​octokit/rest</code>,globby,<code>@​biomejs/biome</code>,lefthook
and <a
href="https://github.com/typescript-es"><code>@​typescript-es</code></a>...</li>
<li><a
href="https://github.com/hustcer/setup-nu/commit/25c9361cd14cf2ab0d91a11482ea9e29d90d0deb"><code>25c9361</code></a>
feat: Add aarch64_linux and aarch64_windows runners support</li>
<li>See full diff in <a
href="https://github.com/hustcer/setup-nu/compare/v3.12...v3.13">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=hustcer/setup-nu&package-manager=github_actions&previous-version=3.12&new-version=3.13)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/nightly-build.yml | 6 +++---
 .github/workflows/release.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 8a598cf1ca..898833e457 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -36,7 +36,7 @@ jobs:
           token: ${{ secrets.WORKFLOW_TOKEN }}
 
       - name: Setup Nushell
-        uses: hustcer/setup-nu@v3.12
+        uses: hustcer/setup-nu@v3.13
         if: github.repository == 'nushell/nightly'
         with:
           version: 0.95.0
@@ -134,7 +134,7 @@ jobs:
         rustflags: ''
 
     - name: Setup Nushell
-      uses: hustcer/setup-nu@v3.12
+      uses: hustcer/setup-nu@v3.13
       with:
         version: 0.95.0
 
@@ -192,7 +192,7 @@ jobs:
           ref: main
 
       - name: Setup Nushell
-        uses: hustcer/setup-nu@v3.12
+        uses: hustcer/setup-nu@v3.13
         with:
           version: 0.95.0
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2189286574..6a15d68546 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -82,7 +82,7 @@ jobs:
         rustflags: ''
 
     - name: Setup Nushell
-      uses: hustcer/setup-nu@v3.12
+      uses: hustcer/setup-nu@v3.13
       with:
         version: 0.95.0
 

From c4bac90b358a9cc41367cc4df6ddb69e1bb59245 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Sep 2024 14:35:46 +0800
Subject: [PATCH 0431/1072] Bump crate-ci/typos from 1.24.4 to 1.24.5 (#13826)

Bumps [crate-ci/typos](https://github.com/crate-ci/typos) from 1.24.4 to
1.24.5.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/crate-ci/typos/releases">crate-ci/typos's
releases</a>.</em></p>
<blockquote>
<h2>v1.24.5</h2>
<h2>[1.24.5] - 2024-09-04</h2>
<h3>Features</h3>
<ul>
<li><em>(action)</em> Support windows</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/crate-ci/typos/blob/master/CHANGELOG.md">crate-ci/typos's
changelog</a>.</em></p>
<blockquote>
<h2>[1.24.5] - 2024-09-04</h2>
<h3>Features</h3>
<ul>
<li><em>(action)</em> Support windows</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/crate-ci/typos/commit/945d407a5fc9097f020969446a16f581612ab4df"><code>945d407</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/e972e95d223e37b01e2c21a456b1c70e79836a5d"><code>e972e95</code></a>
docs: Update changelog</li>
<li><a
href="https://github.com/crate-ci/typos/commit/fcfade456a71a13e7c3495a3d3055af176e1a55e"><code>fcfade4</code></a>
Merge pull request <a
href="https://redirect.github.com/crate-ci/typos/issues/1095">#1095</a>
from zyf722/actions-windows</li>
<li><a
href="https://github.com/crate-ci/typos/commit/264f549c13a4c604d08542635a846f750d512b6b"><code>264f549</code></a>
feat(action): Add Windows support to actions</li>
<li>See full diff in <a
href="https://github.com/crate-ci/typos/compare/v1.24.4...v1.24.5">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=crate-ci/typos&package-manager=github_actions&previous-version=1.24.4&new-version=1.24.5)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/typos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index 1001a4ff4e..50eb74d0e5 100644
--- 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.24.4
+        uses: crate-ci/typos@v1.24.5

From 0c139c7411774385f120bcef8d11a38246d6e232 Mon Sep 17 00:00:00 2001
From: Maxim Zhiburt <zhiburt@gmail.com>
Date: Wed, 11 Sep 2024 14:12:53 +0300
Subject: [PATCH 0432/1072] Fix padding issue with header_on_border (#13808)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

close #13803

For your @amtoine  example we get

```
#┬c-a┬c-b┬c-c┬c-d─┬─c-e─
0│  1│ 12│123│1234│12345
─┴───┴───┴───┴────┴─────
```
---
 crates/nu-table/src/table.rs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/crates/nu-table/src/table.rs b/crates/nu-table/src/table.rs
index 7584c1bc5b..c4e7e7590c 100644
--- a/crates/nu-table/src/table.rs
+++ b/crates/nu-table/src/table.rs
@@ -272,6 +272,8 @@ fn set_indent(table: &mut Table, left: usize, right: usize) {
 }
 
 fn set_border_head(table: &mut Table, with_footer: bool, wctrl: TableWidthCtrl) {
+    let pad = wctrl.pad;
+
     if with_footer {
         let count_rows = table.count_rows();
         let last_row_index = count_rows - 1;
@@ -298,12 +300,14 @@ fn set_border_head(table: &mut Table, with_footer: bool, wctrl: TableWidthCtrl)
                     first_row.1,
                     head_settings.1,
                     head_settings.2.clone(),
+                    pad,
                 ))
                 .with(SetLineHeaders::new(
                     last_row_index - 1,
                     last_row.1,
                     head_settings.1,
                     head_settings.2,
+                    pad,
                 )),
         );
     } else {
@@ -318,7 +322,7 @@ fn set_border_head(table: &mut Table, with_footer: bool, wctrl: TableWidthCtrl)
                 .with(wctrl)
                 .with(StripColorFromRow(0))
                 .with(MoveRowNext::new(0, 0))
-                .with(SetLineHeaders::new(0, row.1, row_opts.1, row_opts.2)),
+                .with(SetLineHeaders::new(0, row.1, row_opts.1, row_opts.2, pad)),
         );
     }
 }
@@ -983,6 +987,7 @@ struct SetLineHeaders {
     columns: Vec<String>,
     alignment: AlignmentHorizontal,
     color: Option<Color>,
+    pad: usize,
 }
 
 impl SetLineHeaders {
@@ -991,12 +996,14 @@ impl SetLineHeaders {
         columns: Vec<String>,
         alignment: AlignmentHorizontal,
         color: Option<Color>,
+        pad: usize,
     ) -> Self {
         Self {
             line,
             columns,
             alignment,
             color,
+            pad,
         }
     }
 }
@@ -1013,7 +1020,7 @@ impl TableOption<NuRecords, ColoredConfig, CompleteDimensionVecRecords<'_>> for
             Some(widths) => {
                 columns = columns
                     .into_iter()
-                    .zip(widths.iter().map(|w| w.checked_sub(2).unwrap_or(*w))) // exclude padding; which is generally 2
+                    .zip(widths.iter().map(|w| w - self.pad)) // it must be always safe to do
                     .map(|(s, width)| Truncate::truncate(&s, width).into_owned())
                     .collect();
             }

From 8d60c0d35d00b60dca1fd52ee74fbcb596e169eb Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Wed, 11 Sep 2024 10:33:05 -0700
Subject: [PATCH 0433/1072] Migrating polars commands away from macros, removed
 custom DataFrame comparison. (#13829)

# Description
This PR:
- Removes the lazy_command, expr_command macros and migrates the
commands that were utilizing them.
- Removes the custom logic in DataFrameValues::is_equals to use the
polars DataFrame version of PartialEq
- Adds examples to commands that previously did not have examples or had
inadequate ones.

NOTE: A lot of examples now have a `polars sort` at the end. This is
needed due to the comparison in the result. The new polars version of
equals cares about the ordering. I removed the custom equals logic as it
causes comparisons to lock up when comparing dataframes that contain a
row that contains a list. I discovered this issue when adding examples
to `polars implode`
---
 .../command/aggregation/agg_groups.rs         |  92 ++++
 .../command/aggregation/aggregate.rs          | 113 ++---
 .../aggregation/aggregation_commands.rs       | 360 --------------
 .../dataframe/command/aggregation/count.rs    |  90 ++++
 .../command/aggregation/cumulative.rs         |   5 +-
 .../dataframe/command/aggregation/groupby.rs  |  88 +---
 .../dataframe/command/aggregation/implode.rs  |  85 ++++
 .../src/dataframe/command/aggregation/max.rs  | 141 ++++++
 .../src/dataframe/command/aggregation/mean.rs | 141 ++++++
 .../dataframe/command/aggregation/median.rs   |  11 +-
 .../src/dataframe/command/aggregation/min.rs  | 141 ++++++
 .../src/dataframe/command/aggregation/mod.rs  |  22 +-
 .../dataframe/command/aggregation/quantile.rs |   8 +-
 .../src/dataframe/command/aggregation/std.rs  | 134 ++++++
 .../src/dataframe/command/aggregation/sum.rs  | 142 ++++++
 .../command/aggregation/value_counts.rs       |  25 +-
 .../src/dataframe/command/aggregation/var.rs  | 138 ++++++
 .../src/dataframe/command/boolean/expr_not.rs | 113 ++++-
 .../src/dataframe/command/core/cache.rs       |  91 +++-
 .../dataframe/command/data/drop_duplicates.rs |  26 +-
 .../src/dataframe/command/data/explode.rs     |   6 +-
 .../src/dataframe/command/data/reverse.rs     | 107 +++--
 .../src/dataframe/command/macro_commands.rs   | 440 ------------------
 .../src/dataframe/command/mod.rs              |   1 -
 .../src/dataframe/values/nu_dataframe/mod.rs  |  85 +---
 crates/nu_plugin_polars/src/lib.rs            |   6 +-
 26 files changed, 1477 insertions(+), 1134 deletions(-)
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/aggregation/agg_groups.rs
 delete mode 100644 crates/nu_plugin_polars/src/dataframe/command/aggregation/aggregation_commands.rs
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/aggregation/count.rs
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/aggregation/implode.rs
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/aggregation/max.rs
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/aggregation/mean.rs
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/aggregation/min.rs
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/aggregation/std.rs
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/aggregation/sum.rs
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/aggregation/var.rs
 delete mode 100644 crates/nu_plugin_polars/src/dataframe/command/macro_commands.rs

diff --git a/crates/nu_plugin_polars/src/dataframe/command/aggregation/agg_groups.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/agg_groups.rs
new file mode 100644
index 0000000000..ae12239800
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/agg_groups.rs
@@ -0,0 +1,92 @@
+use crate::dataframe::values::NuExpression;
+use crate::values::{
+    cant_convert_err, CustomValueSupport, NuDataFrame, PolarsPluginObject, PolarsPluginType,
+};
+use crate::PolarsPlugin;
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{
+    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Type,
+};
+use polars::df;
+use polars::series::Series;
+
+pub struct ExprAggGroups;
+
+impl PluginCommand for ExprAggGroups {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars agg-groups"
+    }
+
+    fn description(&self) -> &str {
+        "Creates an agg_groups expression."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .input_output_types(vec![(
+                Type::Custom("expression".into()),
+                Type::Custom("expression".into()),
+            )])
+            .category(Category::Custom("dataframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![Example {
+            description: "Get the groiup index of the group by operations.",
+            example: r#"[[group value]; [one 94] [one 95] [one 96] [two 97] [two 98] [two 99]] 
+                | polars into-df 
+                | polars group-by group
+                | polars agg (polars col value | polars agg-groups)
+                | polars collect
+                | polars sort-by group"#,
+            result: Some(
+                NuDataFrame::from(
+                    df!(
+                        "group"=> ["one", "two"],
+                        "values" => [[0i64, 1, 2].iter().collect::<Series>(), [3i64, 4, 5].iter().collect::<Series>()],
+                    )
+                    .expect("should not fail"),
+                )
+                .into_value(Span::test_data()),
+            ),
+        }]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        let value = input.into_value(call.head)?;
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuExpression(expr) => command_expr(plugin, engine, call, expr),
+            _ => Err(cant_convert_err(&value, &[PolarsPluginType::NuExpression])),
+        }
+        .map_err(LabeledError::from)
+    }
+}
+
+fn command_expr(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    expr: NuExpression,
+) -> Result<PipelineData, ShellError> {
+    NuExpression::from(expr.into_polars().agg_groups()).to_pipeline_data(plugin, engine, call.head)
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::test::test_polars_plugin_command;
+    use nu_protocol::ShellError;
+
+    #[test]
+    fn test_examples() -> Result<(), ShellError> {
+        test_polars_plugin_command(&ExprAggGroups)
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/command/aggregation/aggregate.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/aggregate.rs
index fdce9ea311..73ff561a28 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/aggregation/aggregate.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/aggregate.rs
@@ -40,81 +40,44 @@ impl PluginCommand for LazyAggregate {
     }
 
     fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Group by and perform an aggregation",
-                example: r#"[[a b]; [1 2] [1 4] [2 6] [2 4]]
-    | polars into-df
-    | polars group-by a
-    | polars agg [
-        (polars col b | polars min | polars as "b_min")
-        (polars col b | polars max | polars as "b_max")
-        (polars col b | polars sum | polars as "b_sum")
-     ]"#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new(
-                                "a".to_string(),
-                                vec![Value::test_int(1), Value::test_int(2)],
-                            ),
-                            Column::new(
-                                "b_min".to_string(),
-                                vec![Value::test_int(2), Value::test_int(4)],
-                            ),
-                            Column::new(
-                                "b_max".to_string(),
-                                vec![Value::test_int(4), Value::test_int(6)],
-                            ),
-                            Column::new(
-                                "b_sum".to_string(),
-                                vec![Value::test_int(6), Value::test_int(10)],
-                            ),
-                        ],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Group by and perform an aggregation",
-                example: r#"[[a b]; [1 2] [1 4] [2 6] [2 4]]
-    | polars into-lazy
-    | polars group-by a
-    | polars agg [
-        (polars col b | polars min | polars as "b_min")
-        (polars col b | polars max | polars as "b_max")
-        (polars col b | polars sum | polars as "b_sum")
-     ]
-    | polars collect"#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new(
-                                "a".to_string(),
-                                vec![Value::test_int(1), Value::test_int(2)],
-                            ),
-                            Column::new(
-                                "b_min".to_string(),
-                                vec![Value::test_int(2), Value::test_int(4)],
-                            ),
-                            Column::new(
-                                "b_max".to_string(),
-                                vec![Value::test_int(4), Value::test_int(6)],
-                            ),
-                            Column::new(
-                                "b_sum".to_string(),
-                                vec![Value::test_int(6), Value::test_int(10)],
-                            ),
-                        ],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-        ]
+        vec![Example {
+            description: "Group by and perform an aggregation",
+            example: r#"[[a b]; [1 2] [1 4] [2 6] [2 4]]
+                | polars into-lazy
+                | polars group-by a
+                | polars agg [
+                    (polars col b | polars min | polars as "b_min")
+                    (polars col b | polars max | polars as "b_max")
+                    (polars col b | polars sum | polars as "b_sum")
+                 ]
+                | polars collect
+                | polars sort-by a"#,
+            result: Some(
+                NuDataFrame::try_from_columns(
+                    vec![
+                        Column::new(
+                            "a".to_string(),
+                            vec![Value::test_int(1), Value::test_int(2)],
+                        ),
+                        Column::new(
+                            "b_min".to_string(),
+                            vec![Value::test_int(2), Value::test_int(4)],
+                        ),
+                        Column::new(
+                            "b_max".to_string(),
+                            vec![Value::test_int(4), Value::test_int(6)],
+                        ),
+                        Column::new(
+                            "b_sum".to_string(),
+                            vec![Value::test_int(6), Value::test_int(10)],
+                        ),
+                    ],
+                    None,
+                )
+                .expect("simple df for test should not fail")
+                .into_value(Span::test_data()),
+            ),
+        }]
     }
 
     fn run(
diff --git a/crates/nu_plugin_polars/src/dataframe/command/aggregation/aggregation_commands.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/aggregation_commands.rs
deleted file mode 100644
index 4f2a4875da..0000000000
--- a/crates/nu_plugin_polars/src/dataframe/command/aggregation/aggregation_commands.rs
+++ /dev/null
@@ -1,360 +0,0 @@
-use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuLazyFrame};
-use crate::values::CustomValueSupport;
-use crate::PolarsPlugin;
-use crate::{expr_command, lazy_expr_command};
-use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
-use nu_protocol::{Category, Example, LabeledError, PipelineData, Signature, Span, Type, Value};
-
-// ExprList command
-// Expands to a command definition for a list expression
-expr_command!(
-    ExprList,
-    "polars implode",
-    "Aggregates a group to a Series.",
-    vec![Example {
-        description: "",
-        example: "",
-        result: None,
-    }],
-    implode,
-    test_implode
-);
-
-// ExprAggGroups command
-// Expands to a command definition for a agg groups expression
-expr_command!(
-    ExprAggGroups,
-    "polars agg-groups",
-    "Creates an agg_groups expression.",
-    vec![Example {
-        description: "",
-        example: "",
-        result: None,
-    }],
-    agg_groups,
-    test_groups
-);
-
-// ExprCount command
-// Expands to a command definition for a count expression
-expr_command!(
-    ExprCount,
-    "polars count",
-    "Creates a count expression.",
-    vec![Example {
-        description: "",
-        example: "",
-        result: None,
-    }],
-    count,
-    test_count
-);
-
-// ExprMax command
-// Expands to a command definition for max aggregation
-lazy_expr_command!(
-    ExprMax,
-    "polars max",
-    "Creates a max expression or aggregates columns to their max value.",
-    vec![
-        Example {
-            description: "Max value from columns in a dataframe",
-            example: "[[a b]; [6 2] [1 4] [4 1]] | polars into-df | polars max",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new("a".to_string(), vec![Value::test_int(6)],),
-                        Column::new("b".to_string(), vec![Value::test_int(4)],),
-                    ],
-                    None
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        },
-        Example {
-            description: "Max aggregation for a group-by",
-            example: r#"[[a b]; [one 2] [one 4] [two 1]]
-    | polars into-df
-    | polars group-by a
-    | polars agg (polars col b | polars max)"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![Value::test_string("one"), Value::test_string("two")],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![Value::test_int(4), Value::test_int(1)],
-                        ),
-                    ],
-                    None
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        },
-    ],
-    max,
-    test_max
-);
-
-// ExprMin command
-// Expands to a command definition for min aggregation
-lazy_expr_command!(
-    ExprMin,
-    "polars min",
-    "Creates a min expression or aggregates columns to their min value.",
-    vec![
-        Example {
-            description: "Min value from columns in a dataframe",
-            example: "[[a b]; [6 2] [1 4] [4 1]] | polars into-df | polars min",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new("a".to_string(), vec![Value::test_int(1)],),
-                        Column::new("b".to_string(), vec![Value::test_int(1)],),
-                    ],
-                    None
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        },
-        Example {
-            description: "Min aggregation for a group-by",
-            example: r#"[[a b]; [one 2] [one 4] [two 1]]
-    | polars into-df
-    | polars group-by a
-    | polars agg (polars col b | polars min)"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![Value::test_string("one"), Value::test_string("two")],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![Value::test_int(2), Value::test_int(1)],
-                        ),
-                    ],
-                    None
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        },
-    ],
-    min,
-    test_min
-);
-
-// ExprSum command
-// Expands to a command definition for sum aggregation
-lazy_expr_command!(
-    ExprSum,
-    "polars sum",
-    "Creates a sum expression for an aggregation or aggregates columns to their sum value.",
-    vec![
-        Example {
-            description: "Sums all columns in a dataframe",
-            example: "[[a b]; [6 2] [1 4] [4 1]] | polars into-df | polars sum",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new("a".to_string(), vec![Value::test_int(11)],),
-                        Column::new("b".to_string(), vec![Value::test_int(7)],),
-                    ],
-                    None
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        },
-        Example {
-            description: "Sum aggregation for a group-by",
-            example: r#"[[a b]; [one 2] [one 4] [two 1]]
-    | polars into-df
-    | polars group-by a
-    | polars agg (polars col b | polars sum)"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![Value::test_string("one"), Value::test_string("two")],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![Value::test_int(6), Value::test_int(1)],
-                        ),
-                    ],
-                    None
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        },
-    ],
-    sum,
-    test_sum
-);
-
-// ExprMean command
-// Expands to a command definition for mean aggregation
-lazy_expr_command!(
-    ExprMean,
-    "polars mean",
-    "Creates a mean expression for an aggregation or aggregates columns to their mean value.",
-    vec![
-        Example {
-            description: "Mean value from columns in a dataframe",
-            example: "[[a b]; [6 2] [4 2] [2 2]] | polars into-df | polars mean",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new("a".to_string(), vec![Value::test_float(4.0)],),
-                        Column::new("b".to_string(), vec![Value::test_float(2.0)],),
-                    ],
-                    None
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        },
-        Example {
-            description: "Mean aggregation for a group-by",
-            example: r#"[[a b]; [one 2] [one 4] [two 1]]
-    | polars into-df
-    | polars group-by a
-    | polars agg (polars col b | polars mean)"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![Value::test_string("one"), Value::test_string("two")],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![Value::test_float(3.0), Value::test_float(1.0)],
-                        ),
-                    ],
-                    None
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        },
-    ],
-    mean,
-    test_mean
-);
-
-// ExprStd command
-// Expands to a command definition for std aggregation
-lazy_expr_command!(
-    ExprStd,
-    "polars std",
-    "Creates a std expression for an aggregation of std value from columns in a dataframe.",
-    vec![
-        Example {
-            description: "Std value from columns in a dataframe",
-            example: "[[a b]; [6 2] [4 2] [2 2]] | polars into-df | polars std",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new("a".to_string(), vec![Value::test_float(2.0)],),
-                        Column::new("b".to_string(), vec![Value::test_float(0.0)],),
-                    ],
-                    None
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        },
-        Example {
-            description: "Std aggregation for a group-by",
-            example: r#"[[a b]; [one 2] [one 2] [two 1] [two 1]]
-    | polars into-df
-    | polars group-by a
-    | polars agg (polars col b | polars std)"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![Value::test_string("one"), Value::test_string("two")],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![Value::test_float(0.0), Value::test_float(0.0)],
-                        ),
-                    ],
-                    None
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        },
-    ],
-    std,
-    test_std,
-    1
-);
-
-// ExprVar command
-// Expands to a command definition for var aggregation
-lazy_expr_command!(
-    ExprVar,
-    "polars var",
-    "Create a var expression for an aggregation.",
-    vec![
-        Example {
-            description:
-                "Var value from columns in a dataframe or aggregates columns to their var value",
-            example: "[[a b]; [6 2] [4 2] [2 2]] | polars into-df | polars var",
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new("a".to_string(), vec![Value::test_float(4.0)],),
-                        Column::new("b".to_string(), vec![Value::test_float(0.0)],),
-                    ],
-                    None
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        },
-        Example {
-            description: "Var aggregation for a group-by",
-            example: r#"[[a b]; [one 2] [one 2] [two 1] [two 1]]
-    | polars into-df
-    | polars group-by a
-    | polars agg (polars col b | polars var)"#,
-            result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![Value::test_string("one"), Value::test_string("two")],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![Value::test_float(0.0), Value::test_float(0.0)],
-                        ),
-                    ],
-                    None
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Span::test_data()),
-            ),
-        },
-    ],
-    var,
-    test_var,
-    1
-);
diff --git a/crates/nu_plugin_polars/src/dataframe/command/aggregation/count.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/count.rs
new file mode 100644
index 0000000000..8bf8163413
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/count.rs
@@ -0,0 +1,90 @@
+use crate::dataframe::values::NuExpression;
+use crate::values::{
+    cant_convert_err, CustomValueSupport, NuDataFrame, PolarsPluginObject, PolarsPluginType,
+};
+use crate::PolarsPlugin;
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{
+    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Type,
+};
+use polars::df;
+
+pub struct ExprCount;
+
+impl PluginCommand for ExprCount {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars count"
+    }
+
+    fn description(&self) -> &str {
+        "Returns the number of non-null values in the column."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .input_output_types(vec![(
+                Type::Custom("expression".into()),
+                Type::Custom("expression".into()),
+            )])
+            .category(Category::Custom("dataframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        // to add an example with a result that contains a null we will need to be able to
+        // allow null values to be entered into the dataframe from nushell
+        // and retain the correct dtype. Right now null values cause the dtype to be object
+        vec![Example {
+            description: "Count the number of non-null values in a column",
+            example: r#"[[a]; ["foo"] ["bar"]] | polars into-df 
+                    | polars select (polars col a | polars count) 
+                    | polars collect"#,
+            result: Some(
+                NuDataFrame::from(
+                    df!(
+                        "a" => [2]
+                    )
+                    .expect("should not fail"),
+                )
+                .into_value(Span::unknown()),
+            ),
+        }]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        let value = input.into_value(call.head)?;
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuExpression(expr) => command_expr(plugin, engine, call, expr),
+            _ => Err(cant_convert_err(&value, &[PolarsPluginType::NuExpression])),
+        }
+        .map_err(LabeledError::from)
+    }
+}
+
+fn command_expr(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    expr: NuExpression,
+) -> Result<PipelineData, ShellError> {
+    NuExpression::from(expr.into_polars().count()).to_pipeline_data(plugin, engine, call.head)
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::test::test_polars_plugin_command;
+    use nu_protocol::ShellError;
+
+    #[test]
+    fn test_examples() -> Result<(), ShellError> {
+        test_polars_plugin_command(&ExprCount)
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/command/aggregation/cumulative.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/cumulative.rs
index db3affbd25..7d68391dfb 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/aggregation/cumulative.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/cumulative.rs
@@ -82,7 +82,10 @@ impl PluginCommand for Cumulative {
         vec![
             Example {
                 description: "Cumulative sum for a column",
-                example: "[[a]; [1] [2] [3] [4] [5]] | polars into-df | polars select (polars col a | polars cumulative sum | polars as cum_a) | polars collect",
+                example: "[[a]; [1] [2] [3] [4] [5]] 
+                    | polars into-df 
+                    | polars select (polars col a | polars cumulative sum | polars as cum_a) 
+                    | polars collect",
                 result: Some(
                     NuDataFrame::try_from_columns(
                         vec![Column::new(
diff --git a/crates/nu_plugin_polars/src/dataframe/command/aggregation/groupby.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/groupby.rs
index 060bdcd63a..24372e47aa 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/aggregation/groupby.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/groupby.rs
@@ -1,5 +1,5 @@
 use crate::{
-    dataframe::values::{Column, NuDataFrame, NuExpression, NuLazyFrame, NuLazyGroupBy},
+    dataframe::values::{NuDataFrame, NuExpression, NuLazyFrame, NuLazyGroupBy},
     values::CustomValueSupport,
     PolarsPlugin,
 };
@@ -8,7 +8,7 @@ use nu_protocol::{
     Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
     Value,
 };
-use polars::prelude::Expr;
+use polars::{df, prelude::Expr};
 
 #[derive(Clone)]
 pub struct ToLazyGroupBy;
@@ -39,46 +39,9 @@ impl PluginCommand for ToLazyGroupBy {
     }
 
     fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Group by and perform an aggregation",
-                example: r#"[[a b]; [1 2] [1 4] [2 6] [2 4]]
-    | polars into-df
-    | polars group-by a
-    | polars agg [
-        (polars col b | polars min | polars as "b_min")
-        (polars col b | polars max | polars as "b_max")
-        (polars col b | polars sum | polars as "b_sum")
-     ]"#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new(
-                                "a".to_string(),
-                                vec![Value::test_int(1), Value::test_int(2)],
-                            ),
-                            Column::new(
-                                "b_min".to_string(),
-                                vec![Value::test_int(2), Value::test_int(4)],
-                            ),
-                            Column::new(
-                                "b_max".to_string(),
-                                vec![Value::test_int(4), Value::test_int(6)],
-                            ),
-                            Column::new(
-                                "b_sum".to_string(),
-                                vec![Value::test_int(6), Value::test_int(10)],
-                            ),
-                        ],
-                        None,
-                    )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Group by and perform an aggregation",
-                example: r#"[[a b]; [1 2] [1 4] [2 6] [2 4]]
+        vec![Example {
+            description: "Group by and perform an aggregation",
+            example: r#"[[a b]; [1 2] [1 4] [2 6] [2 4]]
     | polars into-lazy
     | polars group-by a
     | polars agg [
@@ -86,34 +49,21 @@ impl PluginCommand for ToLazyGroupBy {
         (polars col b | polars max | polars as "b_max")
         (polars col b | polars sum | polars as "b_sum")
      ]
-    | polars collect"#,
-                result: Some(
-                    NuDataFrame::try_from_columns(
-                        vec![
-                            Column::new(
-                                "a".to_string(),
-                                vec![Value::test_int(1), Value::test_int(2)],
-                            ),
-                            Column::new(
-                                "b_min".to_string(),
-                                vec![Value::test_int(2), Value::test_int(4)],
-                            ),
-                            Column::new(
-                                "b_max".to_string(),
-                                vec![Value::test_int(4), Value::test_int(6)],
-                            ),
-                            Column::new(
-                                "b_sum".to_string(),
-                                vec![Value::test_int(6), Value::test_int(10)],
-                            ),
-                        ],
-                        None,
+    | polars collect
+    | polars sort-by a"#,
+            result: Some(
+                NuDataFrame::from(
+                    df!(
+                        "a" => &[1i64, 2],
+                        "b_min" => &[2i64, 4],
+                        "b_max" => &[4i64, 6],
+                        "b_sum" => &[6i64, 10],
                     )
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
-                ),
-            },
-        ]
+                    .expect("should not fail"),
+                )
+                .into_value(Span::test_data()),
+            ),
+        }]
     }
 
     fn run(
diff --git a/crates/nu_plugin_polars/src/dataframe/command/aggregation/implode.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/implode.rs
new file mode 100644
index 0000000000..c46dd6f7a8
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/implode.rs
@@ -0,0 +1,85 @@
+use crate::dataframe::values::NuExpression;
+use crate::values::{
+    cant_convert_err, CustomValueSupport, NuDataFrame, PolarsPluginObject, PolarsPluginType,
+};
+use crate::PolarsPlugin;
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{
+    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Type,
+};
+use polars::df;
+use polars::series::Series;
+
+pub struct ExprImplode;
+
+impl PluginCommand for ExprImplode {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars implode"
+    }
+
+    fn description(&self) -> &str {
+        "Aggregates values into a list."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .input_output_type(
+                Type::Custom("expression".into()),
+                Type::Custom("expression".into()),
+            )
+            .category(Category::Custom("dataframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![Example {
+            description: "Create two lists for columns a and b with all the rows as values.",
+            example: "[[a b]; [1 4] [2 5] [3 6]] | polars into-df | polars select (polars col '*' | polars implode) | polars collect",
+            result: Some(
+                NuDataFrame::from(df!(
+                    "a"=> [[1i64, 2, 3].iter().collect::<Series>()],
+                    "b"=> [[4i64, 5, 6].iter().collect::<Series>()],
+                ).expect("should not fail"))
+                .into_value(Span::unknown())
+            ),
+        }]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        let value = input.into_value(call.head)?;
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuExpression(expr) => command_expr(plugin, engine, call, expr),
+            _ => Err(cant_convert_err(&value, &[PolarsPluginType::NuExpression])),
+        }
+        .map_err(LabeledError::from)
+    }
+}
+
+fn command_expr(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    expr: NuExpression,
+) -> Result<PipelineData, ShellError> {
+    let res: NuExpression = expr.into_polars().implode().into();
+    res.to_pipeline_data(plugin, engine, call.head)
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::test::test_polars_plugin_command;
+    use nu_protocol::ShellError;
+
+    #[test]
+    fn test_examples() -> Result<(), ShellError> {
+        test_polars_plugin_command(&ExprImplode)
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/command/aggregation/max.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/max.rs
new file mode 100644
index 0000000000..d75ea65ede
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/max.rs
@@ -0,0 +1,141 @@
+use crate::dataframe::values::NuExpression;
+use crate::values::{
+    cant_convert_err, Column, CustomValueSupport, NuDataFrame, NuLazyFrame, PolarsPluginObject,
+    PolarsPluginType,
+};
+use crate::PolarsPlugin;
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{
+    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Type, Value,
+};
+
+pub struct ExprMax;
+
+impl PluginCommand for ExprMax {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars max"
+    }
+
+    fn description(&self) -> &str {
+        "Creates a max expression or aggregates columns to their max value."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .input_output_types(vec![
+                (
+                    Type::Custom("expression".into()),
+                    Type::Custom("expression".into()),
+                ),
+                (
+                    Type::Custom("dataframe".into()),
+                    Type::Custom("dataframe".into()),
+                ),
+            ])
+            .category(Category::Custom("dataframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Max value from columns in a dataframe",
+                example: "[[a b]; [6 2] [1 4] [4 1]] | polars into-df | polars max",
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![
+                            Column::new("a".to_string(), vec![Value::test_int(6)]),
+                            Column::new("b".to_string(), vec![Value::test_int(4)]),
+                        ],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+            Example {
+                description: "Max aggregation for a group-by",
+                example: r#"[[a b]; [one 2] [one 4] [two 1]]
+                | polars into-df
+                | polars group-by a
+                | polars agg (polars col b | polars max)
+                | polars collect
+                | polars sort-by a"#,
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![
+                            Column::new(
+                                "a".to_string(),
+                                vec![Value::test_string("one"), Value::test_string("two")],
+                            ),
+                            Column::new(
+                                "b".to_string(),
+                                vec![Value::test_int(4), Value::test_int(1)],
+                            ),
+                        ],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+        ]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        let value = input.into_value(call.head)?;
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuDataFrame(df) => command_lazy(plugin, engine, call, df.lazy()),
+            PolarsPluginObject::NuLazyFrame(lazy) => command_lazy(plugin, engine, call, lazy),
+            PolarsPluginObject::NuExpression(expr) => command_expr(plugin, engine, call, expr),
+            _ => Err(cant_convert_err(
+                &value,
+                &[
+                    PolarsPluginType::NuDataFrame,
+                    PolarsPluginType::NuLazyFrame,
+                    PolarsPluginType::NuExpression,
+                ],
+            )),
+        }
+        .map_err(LabeledError::from)
+    }
+}
+
+fn command_expr(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    expr: NuExpression,
+) -> Result<PipelineData, ShellError> {
+    NuExpression::from(expr.into_polars().max()).to_pipeline_data(plugin, engine, call.head)
+}
+
+fn command_lazy(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    lazy: NuLazyFrame,
+) -> Result<PipelineData, ShellError> {
+    let res: NuLazyFrame = lazy.to_polars().max().into();
+
+    res.to_pipeline_data(plugin, engine, call.head)
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::test::test_polars_plugin_command;
+    use nu_protocol::ShellError;
+
+    #[test]
+    fn test_examples() -> Result<(), ShellError> {
+        test_polars_plugin_command(&ExprMax)
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/command/aggregation/mean.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/mean.rs
new file mode 100644
index 0000000000..1dab512020
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/mean.rs
@@ -0,0 +1,141 @@
+use crate::dataframe::values::NuExpression;
+use crate::values::{
+    cant_convert_err, Column, CustomValueSupport, NuDataFrame, NuLazyFrame, PolarsPluginObject,
+    PolarsPluginType,
+};
+use crate::PolarsPlugin;
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{
+    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Type, Value,
+};
+
+pub struct ExprMean;
+
+impl PluginCommand for ExprMean {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars mean"
+    }
+
+    fn description(&self) -> &str {
+        "Creates a mean expression for an aggregation or aggregates columns to their mean value."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .input_output_types(vec![
+                (
+                    Type::Custom("expression".into()),
+                    Type::Custom("expression".into()),
+                ),
+                (
+                    Type::Custom("dataframe".into()),
+                    Type::Custom("dataframe".into()),
+                ),
+            ])
+            .category(Category::Custom("dataframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Mean value from columns in a dataframe",
+                example: "[[a b]; [6 2] [4 2] [2 2]] | polars into-df | polars mean",
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![
+                            Column::new("a".to_string(), vec![Value::test_float(4.0)]),
+                            Column::new("b".to_string(), vec![Value::test_float(2.0)]),
+                        ],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+            Example {
+                description: "Mean aggregation for a group-by",
+                example: r#"[[a b]; [one 2] [one 4] [two 1]]
+                | polars into-df
+                | polars group-by a
+                | polars agg (polars col b | polars mean)
+                | polars collect
+                | polars sort-by a"#,
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![
+                            Column::new(
+                                "a".to_string(),
+                                vec![Value::test_string("one"), Value::test_string("two")],
+                            ),
+                            Column::new(
+                                "b".to_string(),
+                                vec![Value::test_float(3.0), Value::test_float(1.0)],
+                            ),
+                        ],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+        ]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        let value = input.into_value(call.head)?;
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuDataFrame(df) => command_lazy(plugin, engine, call, df.lazy()),
+            PolarsPluginObject::NuLazyFrame(lazy) => command_lazy(plugin, engine, call, lazy),
+            PolarsPluginObject::NuExpression(expr) => command_expr(plugin, engine, call, expr),
+            _ => Err(cant_convert_err(
+                &value,
+                &[
+                    PolarsPluginType::NuDataFrame,
+                    PolarsPluginType::NuLazyFrame,
+                    PolarsPluginType::NuExpression,
+                ],
+            )),
+        }
+        .map_err(LabeledError::from)
+    }
+}
+
+fn command_expr(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    expr: NuExpression,
+) -> Result<PipelineData, ShellError> {
+    NuExpression::from(expr.into_polars().mean()).to_pipeline_data(plugin, engine, call.head)
+}
+
+fn command_lazy(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    lazy: NuLazyFrame,
+) -> Result<PipelineData, ShellError> {
+    let res: NuLazyFrame = lazy.to_polars().mean().into();
+
+    res.to_pipeline_data(plugin, engine, call.head)
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::test::test_polars_plugin_command;
+    use nu_protocol::ShellError;
+
+    #[test]
+    fn test_examples() -> Result<(), ShellError> {
+        test_polars_plugin_command(&ExprMean)
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/command/aggregation/median.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/median.rs
index 92578da7e0..e4beadecca 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/aggregation/median.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/median.rs
@@ -43,9 +43,11 @@ impl PluginCommand for LazyMedian {
             Example {
                 description: "Median aggregation for a group-by",
                 example: r#"[[a b]; [one 2] [one 4] [two 1]]
-    | polars into-df
-    | polars group-by a
-    | polars agg (polars col b | polars median)"#,
+                    | polars into-df
+                    | polars group-by a
+                    | polars agg (polars col b | polars median)
+                    | polars collect
+                    | polars sort-by a"#,
                 result: Some(
                     NuDataFrame::try_from_columns(
                         vec![
@@ -66,7 +68,8 @@ impl PluginCommand for LazyMedian {
             },
             Example {
                 description: "Median value from columns in a dataframe",
-                example: "[[a b]; [6 2] [4 2] [2 2]] | polars into-df | polars median",
+                example:
+                    "[[a b]; [6 2] [4 2] [2 2]] | polars into-df | polars median | polars collect",
                 result: Some(
                     NuDataFrame::try_from_columns(
                         vec![
diff --git a/crates/nu_plugin_polars/src/dataframe/command/aggregation/min.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/min.rs
new file mode 100644
index 0000000000..750099d32f
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/min.rs
@@ -0,0 +1,141 @@
+use crate::dataframe::values::NuExpression;
+use crate::values::{
+    cant_convert_err, Column, CustomValueSupport, NuDataFrame, NuLazyFrame, PolarsPluginObject,
+    PolarsPluginType,
+};
+use crate::PolarsPlugin;
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{
+    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Type, Value,
+};
+
+pub struct ExprMin;
+
+impl PluginCommand for ExprMin {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars min"
+    }
+
+    fn description(&self) -> &str {
+        "Creates a min expression or aggregates columns to their min value."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .input_output_types(vec![
+                (
+                    Type::Custom("expression".into()),
+                    Type::Custom("expression".into()),
+                ),
+                (
+                    Type::Custom("dataframe".into()),
+                    Type::Custom("dataframe".into()),
+                ),
+            ])
+            .category(Category::Custom("dataframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Min value from columns in a dataframe",
+                example: "[[a b]; [6 2] [1 4] [4 1]] | polars into-df | polars min",
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![
+                            Column::new("a".to_string(), vec![Value::test_int(1)]),
+                            Column::new("b".to_string(), vec![Value::test_int(1)]),
+                        ],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+            Example {
+                description: "Min aggregation for a group-by",
+                example: r#"[[a b]; [one 2] [one 4] [two 1]]
+                | polars into-df
+                | polars group-by a
+                | polars agg (polars col b | polars min)
+                | polars collect
+                | polars sort-by a"#,
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![
+                            Column::new(
+                                "a".to_string(),
+                                vec![Value::test_string("one"), Value::test_string("two")],
+                            ),
+                            Column::new(
+                                "b".to_string(),
+                                vec![Value::test_int(2), Value::test_int(1)],
+                            ),
+                        ],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+        ]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        let value = input.into_value(call.head)?;
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuDataFrame(df) => command_lazy(plugin, engine, call, df.lazy()),
+            PolarsPluginObject::NuLazyFrame(lazy) => command_lazy(plugin, engine, call, lazy),
+            PolarsPluginObject::NuExpression(expr) => command_expr(plugin, engine, call, expr),
+            _ => Err(cant_convert_err(
+                &value,
+                &[
+                    PolarsPluginType::NuDataFrame,
+                    PolarsPluginType::NuLazyFrame,
+                    PolarsPluginType::NuExpression,
+                ],
+            )),
+        }
+        .map_err(LabeledError::from)
+    }
+}
+
+fn command_expr(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    expr: NuExpression,
+) -> Result<PipelineData, ShellError> {
+    NuExpression::from(expr.into_polars().min()).to_pipeline_data(plugin, engine, call.head)
+}
+
+fn command_lazy(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    lazy: NuLazyFrame,
+) -> Result<PipelineData, ShellError> {
+    let res: NuLazyFrame = lazy.to_polars().min().into();
+
+    res.to_pipeline_data(plugin, engine, call.head)
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::test::test_polars_plugin_command;
+    use nu_protocol::ShellError;
+
+    #[test]
+    fn test_examples() -> Result<(), ShellError> {
+        test_polars_plugin_command(&ExprMin)
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/command/aggregation/mod.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/mod.rs
index ea14500075..f86b267df1 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/aggregation/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/mod.rs
@@ -1,31 +1,47 @@
+mod agg_groups;
 mod aggregate;
-mod aggregation_commands;
+mod count;
 mod cumulative;
 pub mod groupby;
+mod implode;
+mod max;
+mod mean;
 mod median;
+mod min;
 mod n_null;
 mod n_unique;
 mod quantile;
 mod rolling;
+mod std;
+mod sum;
 mod value_counts;
+mod var;
 
 use crate::PolarsPlugin;
+use agg_groups::ExprAggGroups;
 use nu_plugin::PluginCommand;
 
 pub use aggregate::LazyAggregate;
-pub use aggregation_commands::*;
+use count::ExprCount;
 pub use cumulative::Cumulative;
+use implode::ExprImplode;
+use max::ExprMax;
+use mean::ExprMean;
+use min::ExprMin;
 pub use n_null::NNull;
 pub use n_unique::NUnique;
 pub use rolling::Rolling;
+use std::ExprStd;
+pub use sum::ExprSum;
 pub use value_counts::ValueCount;
+use var::ExprVar;
 
 pub(crate) fn aggregation_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin>>> {
     vec![
         Box::new(Cumulative),
         Box::new(ExprAggGroups),
         Box::new(ExprCount),
-        Box::new(ExprList),
+        Box::new(ExprImplode),
         Box::new(ExprMax),
         Box::new(ExprMin),
         Box::new(ExprSum),
diff --git a/crates/nu_plugin_polars/src/dataframe/command/aggregation/quantile.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/quantile.rs
index 79804b2937..def85a3e01 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/aggregation/quantile.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/quantile.rs
@@ -66,9 +66,11 @@ impl PluginCommand for LazyQuantile {
             Example {
                 description: "Quantile aggregation for a group-by",
                 example: r#"[[a b]; [one 2] [one 4] [two 1]]
-    | polars into-df
-    | polars group-by a
-    | polars agg (polars col b | polars quantile 0.5)"#,
+                    | polars into-df
+                    | polars group-by a
+                    | polars agg (polars col b | polars quantile 0.5)
+                    | polars collect
+                    | polars sort-by a"#,
                 result: Some(
                     NuDataFrame::try_from_columns(
                         vec![
diff --git a/crates/nu_plugin_polars/src/dataframe/command/aggregation/std.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/std.rs
new file mode 100644
index 0000000000..46411d1b0d
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/std.rs
@@ -0,0 +1,134 @@
+use crate::values::{
+    cant_convert_err, Column, CustomValueSupport, NuLazyFrame, PolarsPluginObject, PolarsPluginType,
+};
+use crate::PolarsPlugin;
+use crate::{dataframe::values::NuExpression, values::NuDataFrame};
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{
+    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Type, Value,
+};
+use polars::df;
+
+pub struct ExprStd;
+
+impl PluginCommand for ExprStd {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars std"
+    }
+
+    fn description(&self) -> &str {
+        "Creates a std expression for an aggregation of std value from columns in a dataframe."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .input_output_types(vec![
+                (
+                    Type::Custom("expression".into()),
+                    Type::Custom("expression".into()),
+                ),
+                (
+                    Type::Custom("dataframe".into()),
+                    Type::Custom("dataframe".into()),
+                ),
+            ])
+            .category(Category::Custom("dataframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Std value from columns in a dataframe",
+                example:
+                    "[[a b]; [6 2] [4 2] [2 2]] | polars into-df | polars std | polars collect",
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![
+                            Column::new("a".to_string(), vec![Value::test_float(2.0)]),
+                            Column::new("b".to_string(), vec![Value::test_float(0.0)]),
+                        ],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+            Example {
+                description: "Std aggregation for a group-by",
+                example: r#"[[a b]; [one 2] [one 2] [two 1] [two 1]]
+            | polars into-df
+            | polars group-by a
+            | polars agg (polars col b | polars std)
+            | polars collect
+            | polars sort-by a"#,
+                result: Some(
+                    NuDataFrame::from(
+                        df!(
+                            "a" => &["one", "two"],
+                            "b" => &[0.0f64, 0.0],
+                        )
+                        .expect("should not fail"),
+                    )
+                    .into_value(Span::test_data()),
+                ),
+            },
+        ]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        let value = input.into_value(call.head)?;
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuDataFrame(df) => command_lazy(plugin, engine, call, df.lazy()),
+            PolarsPluginObject::NuLazyFrame(lazy) => command_lazy(plugin, engine, call, lazy),
+            PolarsPluginObject::NuExpression(expr) => command_expr(plugin, engine, call, expr),
+            _ => Err(cant_convert_err(
+                &value,
+                &[
+                    PolarsPluginType::NuDataFrame,
+                    PolarsPluginType::NuLazyFrame,
+                    PolarsPluginType::NuExpression,
+                ],
+            )),
+        }
+        .map_err(LabeledError::from)
+    }
+}
+
+fn command_expr(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    expr: NuExpression,
+) -> Result<PipelineData, ShellError> {
+    NuExpression::from(expr.into_polars().std(1)).to_pipeline_data(plugin, engine, call.head)
+}
+
+fn command_lazy(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    lazy: NuLazyFrame,
+) -> Result<PipelineData, ShellError> {
+    let res: NuLazyFrame = lazy.to_polars().std(1).into();
+
+    res.to_pipeline_data(plugin, engine, call.head)
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::test::test_polars_plugin_command;
+
+    #[test]
+    fn test_examples() -> Result<(), ShellError> {
+        test_polars_plugin_command(&ExprStd)
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/command/aggregation/sum.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/sum.rs
new file mode 100644
index 0000000000..6aaf3320fe
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/sum.rs
@@ -0,0 +1,142 @@
+use crate::dataframe::values::NuExpression;
+use crate::values::{
+    cant_convert_err, Column, CustomValueSupport, NuDataFrame, NuLazyFrame, PolarsPluginObject,
+    PolarsPluginType,
+};
+use crate::PolarsPlugin;
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{
+    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Type, Value,
+};
+
+pub struct ExprSum;
+
+impl PluginCommand for ExprSum {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars sum"
+    }
+
+    fn description(&self) -> &str {
+        "Creates a sum expression for an aggregation or aggregates columns to their sum value."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .input_output_types(vec![
+                (
+                    Type::Custom("expression".into()),
+                    Type::Custom("expression".into()),
+                ),
+                (
+                    Type::Custom("dataframe".into()),
+                    Type::Custom("dataframe".into()),
+                ),
+            ])
+            .category(Category::Custom("dataframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Sums all columns in a dataframe",
+                example:
+                    "[[a b]; [6 2] [1 4] [4 1]] | polars into-df | polars sum | polars collect",
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![
+                            Column::new("a".to_string(), vec![Value::test_int(11)]),
+                            Column::new("b".to_string(), vec![Value::test_int(7)]),
+                        ],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+            Example {
+                description: "Sum aggregation for a group-by",
+                example: r#"[[a b]; [one 2] [one 4] [two 1]]
+                    | polars into-df
+                    | polars group-by a
+                    | polars agg (polars col b | polars sum)
+                    | polars collect
+                    | polars sort-by a"#,
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![
+                            Column::new(
+                                "a".to_string(),
+                                vec![Value::test_string("one"), Value::test_string("two")],
+                            ),
+                            Column::new(
+                                "b".to_string(),
+                                vec![Value::test_int(6), Value::test_int(1)],
+                            ),
+                        ],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+        ]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        let value = input.into_value(call.head)?;
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuDataFrame(df) => command_lazy(plugin, engine, call, df.lazy()),
+            PolarsPluginObject::NuLazyFrame(lazy) => command_lazy(plugin, engine, call, lazy),
+            PolarsPluginObject::NuExpression(expr) => command_expr(plugin, engine, call, expr),
+            _ => Err(cant_convert_err(
+                &value,
+                &[
+                    PolarsPluginType::NuDataFrame,
+                    PolarsPluginType::NuLazyFrame,
+                    PolarsPluginType::NuExpression,
+                ],
+            )),
+        }
+        .map_err(LabeledError::from)
+    }
+}
+
+fn command_expr(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    expr: NuExpression,
+) -> Result<PipelineData, ShellError> {
+    NuExpression::from(expr.into_polars().sum()).to_pipeline_data(plugin, engine, call.head)
+}
+
+fn command_lazy(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    lazy: NuLazyFrame,
+) -> Result<PipelineData, ShellError> {
+    let res: NuLazyFrame = lazy.to_polars().sum().into();
+
+    res.to_pipeline_data(plugin, engine, call.head)
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::test::test_polars_plugin_command;
+    use nu_protocol::ShellError;
+
+    #[test]
+    fn test_examples() -> Result<(), ShellError> {
+        test_polars_plugin_command(&ExprSum)
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/command/aggregation/value_counts.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/value_counts.rs
index e05a1c401c..dd3fc57261 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/aggregation/value_counts.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/value_counts.rs
@@ -1,12 +1,12 @@
-use crate::values::{Column, CustomValueSupport, NuDataFrame};
+use crate::values::{CustomValueSupport, NuDataFrame};
 use crate::PolarsPlugin;
 
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
     Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
-    Value,
 };
 
+use polars::df;
 use polars::prelude::SeriesMethods;
 
 #[derive(Clone)]
@@ -53,22 +53,15 @@ impl PluginCommand for ValueCount {
     fn examples(&self) -> Vec<Example> {
         vec![Example {
             description: "Calculates value counts",
-            example: "[5 5 5 5 6 6] | polars into-df | polars value-counts",
+            example: "[5 5 5 5 6 6] | polars into-df | polars value-counts | polars sort-by count",
             result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "0".to_string(),
-                            vec![Value::test_int(5), Value::test_int(6)],
-                        ),
-                        Column::new(
-                            "count".to_string(),
-                            vec![Value::test_int(4), Value::test_int(2)],
-                        ),
-                    ],
-                    None,
+                NuDataFrame::from(
+                    df!(
+                        "0" => &[6i64, 5],
+                        "count" => &[2i64, 4],
+                    )
+                    .expect("should not fail"),
                 )
-                .expect("simple df for test should not fail")
                 .into_value(Span::test_data()),
             ),
         }]
diff --git a/crates/nu_plugin_polars/src/dataframe/command/aggregation/var.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/var.rs
new file mode 100644
index 0000000000..bc1ee8ed04
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/var.rs
@@ -0,0 +1,138 @@
+use crate::dataframe::values::NuExpression;
+use crate::values::{
+    cant_convert_err, Column, CustomValueSupport, NuDataFrame, NuLazyFrame, PolarsPluginObject,
+    PolarsPluginType,
+};
+use crate::PolarsPlugin;
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{
+    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Type, Value,
+};
+use polars::df;
+
+pub struct ExprVar;
+
+impl PluginCommand for ExprVar {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars var"
+    }
+
+    fn description(&self) -> &str {
+        "Create a var expression for an aggregation."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .input_output_types(vec![
+                (
+                    Type::Custom("expression".into()),
+                    Type::Custom("expression".into()),
+                ),
+                (
+                    Type::Custom("dataframe".into()),
+                    Type::Custom("dataframe".into()),
+                ),
+            ])
+            .category(Category::Custom("dataframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description:
+                    "Var value from columns in a dataframe or aggregates columns to their var value",
+                example:
+                    "[[a b]; [6 2] [4 2] [2 2]] | polars into-df | polars var | polars collect",
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![
+                            Column::new("a".to_string(), vec![Value::test_float(4.0)]),
+                            Column::new("b".to_string(), vec![Value::test_float(0.0)]),
+                        ],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+            Example {
+                description: "Var aggregation for a group-by",
+                example: r#"[[a b]; [one 2] [one 2] [two 1] [two 1]]
+                    | polars into-df
+                    | polars group-by a
+                    | polars agg (polars col b | polars var)
+                    | polars collect
+                    | polars sort-by a"#,
+                result: Some(
+                    NuDataFrame::from(
+                        df!(
+                            "a" => &["one", "two"],
+                            "b" => &[0.0, 0.0],
+                        )
+                        .expect("should not fail"),
+                    )
+                    .into_value(Span::test_data()),
+                ),
+            },
+        ]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        let value = input.into_value(call.head)?;
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuDataFrame(df) => command_lazy(plugin, engine, call, df.lazy()),
+            PolarsPluginObject::NuLazyFrame(lazy) => command_lazy(plugin, engine, call, lazy),
+            PolarsPluginObject::NuExpression(expr) => command_expr(plugin, engine, call, expr),
+            _ => Err(cant_convert_err(
+                &value,
+                &[
+                    PolarsPluginType::NuDataFrame,
+                    PolarsPluginType::NuLazyFrame,
+                    PolarsPluginType::NuExpression,
+                ],
+            )),
+        }
+        .map_err(LabeledError::from)
+    }
+}
+
+fn command_expr(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    expr: NuExpression,
+) -> Result<PipelineData, ShellError> {
+    NuExpression::from(expr.into_polars().var(1)).to_pipeline_data(plugin, engine, call.head)
+}
+
+fn command_lazy(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    lazy: NuLazyFrame,
+) -> Result<PipelineData, ShellError> {
+    let res: NuLazyFrame = lazy.to_polars().var(1).into();
+
+    res.to_pipeline_data(plugin, engine, call.head)
+}
+
+#[cfg(test)]
+mod test {
+    use crate::test::test_polars_plugin_command;
+
+    use super::*;
+    use nu_protocol::ShellError;
+
+    #[test]
+    fn test_examples() -> Result<(), ShellError> {
+        test_polars_plugin_command(&ExprVar)
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/command/boolean/expr_not.rs b/crates/nu_plugin_polars/src/dataframe/command/boolean/expr_not.rs
index 886d89eeab..c70d921e32 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/boolean/expr_not.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/boolean/expr_not.rs
@@ -1,21 +1,98 @@
-use crate::expr_command;
-use crate::values::CustomValueSupport;
-use crate::values::NuExpression;
+use crate::dataframe::values::NuExpression;
+use crate::values::{
+    cant_convert_err, CustomValueSupport, NuDataFrame, PolarsPluginObject, PolarsPluginType,
+};
 use crate::PolarsPlugin;
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
-use nu_protocol::{Category, Example, LabeledError, PipelineData, Signature, Type};
+use nu_protocol::{
+    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Type,
+};
+use polars::df;
 
-// ExprNot command
-// Expands to a command definition for a not expression
-expr_command!(
-    ExprNot,
-    "polars expr-not",
-    "Creates a not expression.",
-    vec![Example {
-        description: "Creates a not expression",
-        example: "(polars col a) > 2) | polars expr-not",
-        result: None,
-    },],
-    not,
-    test_not
-);
+pub struct ExprNot;
+
+impl PluginCommand for ExprNot {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars expr-not"
+    }
+
+    fn description(&self) -> &str {
+        "Creates a not expression."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .input_output_types(vec![(
+                Type::Custom("expression".into()),
+                Type::Custom("expression".into()),
+            )])
+            .category(Category::Custom("dataframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Creates a not expression",
+                example: "(polars col a) > 2) | polars expr-not",
+                result: None,
+            },
+            Example {
+                description: "Adds a column showing which values of col a are not greater than 2",
+                example: "[[a]; [1] [2] [3] [4] [5]] | polars into-df 
+                    | polars with-column [(((polars col a) > 2)
+                    | polars expr-not
+                    | polars as a_expr_not)]
+                    | polars collect
+                    | polars sort-by a",
+                result: Some(
+                    NuDataFrame::from(
+                        df!(
+                            "a" => [1, 2, 3, 4, 5],
+                            "b" => [true, true, false, false, false]
+                        )
+                        .expect("should not fail"),
+                    )
+                    .into_value(Span::test_data()),
+                ),
+            },
+        ]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        let value = input.into_value(call.head)?;
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuExpression(expr) => command_expr(plugin, engine, call, expr),
+            _ => Err(cant_convert_err(&value, &[PolarsPluginType::NuExpression])),
+        }
+        .map_err(LabeledError::from)
+    }
+}
+
+fn command_expr(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    expr: NuExpression,
+) -> Result<PipelineData, ShellError> {
+    NuExpression::from(expr.into_polars().not()).to_pipeline_data(plugin, engine, call.head)
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::test::test_polars_plugin_command;
+    use nu_protocol::ShellError;
+
+    #[test]
+    fn test_examples() -> Result<(), ShellError> {
+        test_polars_plugin_command(&ExprNot)
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/cache.rs b/crates/nu_plugin_polars/src/dataframe/command/core/cache.rs
index ce68f7712b..23c972654e 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/cache.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/cache.rs
@@ -1,16 +1,77 @@
-use crate::lazy_command;
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{Category, Example, LabeledError, PipelineData, Signature, Span, Type};
+use polars::df;
 
-// LazyCache command
-// Expands to a command definition for cache
-lazy_command!(
-    LazyCache,
-    "polars cache",
-    "Caches operations in a new LazyFrame.",
-    vec![Example {
-        description: "Caches the result into a new LazyFrame",
-        example: "[[a b]; [6 2] [4 2] [2 2]] | polars into-df | polars reverse | polars cache",
-        result: None,
-    }],
-    cache,
-    test_cache
-);
+use crate::{
+    values::{CustomValueSupport, NuDataFrame, NuLazyFrame},
+    PolarsPlugin,
+};
+
+pub struct LazyCache;
+
+impl PluginCommand for LazyCache {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars cache"
+    }
+
+    fn description(&self) -> &str {
+        "Caches operations in a new LazyFrame."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .input_output_type(
+                Type::Custom("dataframe".into()),
+                Type::Custom("dataframe".into()),
+            )
+            .category(Category::Custom("dataframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![Example {
+            description: "Caches the result into a new LazyFrame",
+            example: "[[a b]; [6 2] [4 2] [2 2]] | polars into-df 
+                | polars reverse 
+                | polars cache
+                | polars sort-by a",
+            result: Some(
+                NuDataFrame::from(
+                    df!(
+                        "a" => [2i64, 4, 6],
+                        "b" => [2i64, 2, 2],
+                    )
+                    .expect("should not fail"),
+                )
+                .into_value(Span::test_data()),
+            ),
+        }]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        let lazy = NuLazyFrame::try_from_pipeline_coerce(plugin, input, call.head)
+            .map_err(LabeledError::from)?;
+        let lazy = NuLazyFrame::new(lazy.from_eager, lazy.to_polars().cache());
+        lazy.to_pipeline_data(plugin, engine, call.head)
+            .map_err(LabeledError::from)
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::test::test_polars_plugin_command;
+    use nu_protocol::ShellError;
+
+    #[test]
+    fn test_examples() -> Result<(), ShellError> {
+        test_polars_plugin_command(&LazyCache)
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/drop_duplicates.rs b/crates/nu_plugin_polars/src/dataframe/command/data/drop_duplicates.rs
index 5f82ce13f6..4ea26a78b5 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/drop_duplicates.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/drop_duplicates.rs
@@ -3,13 +3,14 @@ use nu_protocol::{
     Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
     Value,
 };
+use polars::df;
 use polars::prelude::UniqueKeepStrategy;
 
 use crate::values::CustomValueSupport;
 use crate::PolarsPlugin;
 
 use crate::values::utils::convert_columns_string;
-use crate::values::{Column, NuDataFrame};
+use crate::values::NuDataFrame;
 
 #[derive(Clone)]
 pub struct DropDuplicates;
@@ -48,22 +49,17 @@ impl PluginCommand for DropDuplicates {
     fn examples(&self) -> Vec<Example> {
         vec![Example {
             description: "drop duplicates",
-            example: "[[a b]; [1 2] [3 4] [1 2]] | polars into-df | polars drop-duplicates",
+            example: "[[a b]; [1 2] [3 4] [1 2]] | polars into-df 
+                | polars drop-duplicates
+                | polars sort-by a",
             result: Some(
-                NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![Value::test_int(3), Value::test_int(1)],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![Value::test_int(4), Value::test_int(2)],
-                        ),
-                    ],
-                    None,
+                NuDataFrame::from(
+                    df!(
+                        "a" => &[1i64, 3],
+                        "b" => &[2i64, 4],
+                    )
+                    .expect("should not fail"),
                 )
-                .expect("simple df for test should not fail")
                 .into_value(Span::test_data()),
             ),
         }]
diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/explode.rs b/crates/nu_plugin_polars/src/dataframe/command/data/explode.rs
index 3266640d34..e2bc6b4e49 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/explode.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/explode.rs
@@ -46,7 +46,11 @@ impl PluginCommand for LazyExplode {
         vec![
             Example {
                 description: "Explode the specified dataframe",
-                example: "[[id name hobbies]; [1 Mercy [Cycling Knitting]] [2 Bob [Skiing Football]]] | polars into-df | polars explode hobbies | polars collect",
+                example: "[[id name hobbies]; [1 Mercy [Cycling Knitting]] [2 Bob [Skiing Football]]] 
+                    | polars into-df 
+                    | polars explode hobbies 
+                    | polars collect
+                    | polars sort-by [id, name]",
                 result: Some(
                     NuDataFrame::try_from_columns(vec![
                         Column::new(
diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/reverse.rs b/crates/nu_plugin_polars/src/dataframe/command/data/reverse.rs
index cb1e6af35f..9665b7aa2b 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/reverse.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/reverse.rs
@@ -1,37 +1,80 @@
-use nu_protocol::{Span, Value};
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{Category, Example, LabeledError, PipelineData, Signature, Span, Type, Value};
 
 use crate::{
-    lazy_command,
-    values::{Column, NuDataFrame},
+    values::{Column, CustomValueSupport, NuDataFrame, NuLazyFrame},
+    PolarsPlugin,
 };
 
-// LazyReverse command
-// Expands to a command definition for reverse
-lazy_command!(
-    LazyReverse,
-    "polars reverse",
-    "Reverses the LazyFrame",
-    vec![Example {
-        description: "Reverses the dataframe.",
-        example: "[[a b]; [6 2] [4 2] [2 2]] | polars into-df | polars reverse",
-        result: Some(
-            NuDataFrame::try_from_columns(
-                vec![
-                    Column::new(
-                        "a".to_string(),
-                        vec![Value::test_int(2), Value::test_int(4), Value::test_int(6),],
-                    ),
-                    Column::new(
-                        "b".to_string(),
-                        vec![Value::test_int(2), Value::test_int(2), Value::test_int(2),],
-                    ),
-                ],
-                None
+pub struct LazyReverse;
+
+impl PluginCommand for LazyReverse {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars reverse"
+    }
+
+    fn description(&self) -> &str {
+        "Reverses the LazyFrame"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .input_output_type(
+                Type::Custom("dataframe".into()),
+                Type::Custom("dataframe".into()),
             )
-            .expect("simple df for test should not fail")
-            .into_value(Span::test_data()),
-        ),
-    },],
-    reverse,
-    test_reverse
-);
+            .category(Category::Custom("dataframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![Example {
+            description: "Reverses the dataframe.",
+            example: "[[a b]; [6 2] [4 2] [2 2]] | polars into-df | polars reverse",
+            result: Some(
+                NuDataFrame::try_from_columns(
+                    vec![
+                        Column::new(
+                            "a".to_string(),
+                            vec![Value::test_int(2), Value::test_int(4), Value::test_int(6)],
+                        ),
+                        Column::new(
+                            "b".to_string(),
+                            vec![Value::test_int(2), Value::test_int(2), Value::test_int(2)],
+                        ),
+                    ],
+                    None,
+                )
+                .expect("simple df for test should not fail")
+                .into_value(Span::test_data()),
+            ),
+        }]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        let lazy = NuLazyFrame::try_from_pipeline_coerce(plugin, input, call.head)
+            .map_err(LabeledError::from)?;
+        let lazy = NuLazyFrame::new(lazy.from_eager, lazy.to_polars().reverse());
+        lazy.to_pipeline_data(plugin, engine, call.head)
+            .map_err(LabeledError::from)
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::test::test_polars_plugin_command;
+    use nu_protocol::ShellError;
+
+    #[test]
+    fn test_examples() -> Result<(), ShellError> {
+        test_polars_plugin_command(&LazyReverse)
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/command/macro_commands.rs b/crates/nu_plugin_polars/src/dataframe/command/macro_commands.rs
deleted file mode 100644
index 3986a53037..0000000000
--- a/crates/nu_plugin_polars/src/dataframe/command/macro_commands.rs
+++ /dev/null
@@ -1,440 +0,0 @@
-/// Definition of multiple Expression commands using a macro rule
-/// All of these expressions have an identical body and only require
-/// to have a change in the name, description and expression function
-
-#[macro_export]
-macro_rules! lazy_command {
-    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident, $test: ident) => {
-        use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
-        use nu_protocol::{Category, Example, LabeledError, PipelineData, Signature, Type};
-        /// Definition of multiple lazyframe commands using a macro rule
-        /// All of these commands have an identical body and only require
-        /// to have a change in the name, description and function
-        use $crate::dataframe::values::NuLazyFrame;
-        use $crate::values::CustomValueSupport;
-        use $crate::PolarsPlugin;
-
-        #[derive(Clone)]
-        pub struct $command;
-
-        impl PluginCommand for $command {
-            type Plugin = PolarsPlugin;
-
-            fn name(&self) -> &str {
-                $name
-            }
-
-            fn description(&self) -> &str {
-                $desc
-            }
-
-            fn signature(&self) -> Signature {
-                Signature::build(self.name())
-                    .description($desc)
-                    .input_output_type(
-                        Type::Custom("dataframe".into()),
-                        Type::Custom("dataframe".into()),
-                    )
-                    .category(Category::Custom("lazyframe".into()))
-            }
-
-            fn examples(&self) -> Vec<Example> {
-                $examples
-            }
-
-            fn run(
-                &self,
-                plugin: &Self::Plugin,
-                engine: &EngineInterface,
-                call: &EvaluatedCall,
-                input: PipelineData,
-            ) -> Result<PipelineData, LabeledError> {
-                let lazy = NuLazyFrame::try_from_pipeline_coerce(plugin, input, call.head)
-                    .map_err(LabeledError::from)?;
-                let lazy = NuLazyFrame::new(lazy.from_eager, lazy.to_polars().$func());
-                lazy.to_pipeline_data(plugin, engine, call.head)
-                    .map_err(LabeledError::from)
-            }
-        }
-
-        #[cfg(test)]
-        mod $test {
-            use super::*;
-            use nu_protocol::ShellError;
-            use $crate::test::test_polars_plugin_command;
-
-            #[test]
-            fn test_examples() -> Result<(), ShellError> {
-                test_polars_plugin_command(&$command)
-            }
-        }
-    };
-
-    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident, $test: ident, $ddot: expr) => {
-        #[derive(Clone)]
-        pub struct $command;
-
-        impl PluginCommand for $command {
-            type Plugin = PolarsPlugin;
-
-            fn signature(&self) -> Signature {
-                Signature::build($name)
-                    .description($desc)
-                    .input_output_type(
-                        Type::Custom("dataframe".into()),
-                        Type::Custom("dataframe".into()),
-                    )
-                    .category(Category::Custom("lazyframe".into()))
-                    .plugin_examples($examples)
-            }
-
-            fn run(
-                &self,
-                _plugin: &Self::Plugin,
-                engine: &EngineInterface,
-                call: &EvaluatedCall,
-                input: PipelineData,
-            ) -> Result<PipelineData, LabeledError> {
-                let lazy = NuLazyFrame::try_from_pipeline_coerce(plugin, input, call.head)
-                    .map_err(LabeledError::from)?;
-                let lazy = NuLazyFrame::new(lazy.from_eager, lazy.into_polars().$func($ddot));
-                lazy.to_pipeline_data(plugin, engine, call.head)
-                    .map_err(LabeledError::from)
-            }
-        }
-
-        #[cfg(test)]
-        mod $test {
-            use super::*;
-            use nu_protocol::ShellError;
-            use $crate::test::test_polars_plugin_command;
-
-            #[test]
-            fn test_examples() -> Result<(), ShellError> {
-                test_polars_plugin_command(&$command)
-            }
-        }
-    };
-
-    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident?, $test: ident) => {
-        #[derive(Clone)]
-        pub struct $command;
-
-        impl PluginCommand for $command {
-            type Plugin = PolarsPlugin;
-
-            fn name(&self) -> &str {
-                $name
-            }
-
-            fn description(&self) -> &str {
-                $desc
-            }
-            fn signature(&self) -> Signature {
-                Signature::build(self.name())
-                    .input_output_type(
-                        Type::Custom("dataframe".into()),
-                        Type::Custom("dataframe".into()),
-                    )
-                    .category(Category::Custom("lazyframe".into()))
-            }
-
-            fn examples(&self) -> Vec<Example> {
-                $examples
-            }
-
-            fn run(
-                &self,
-                plugin: &Self::Plugin,
-                engine: &EngineInterface,
-                call: &EvaluatedCall,
-                input: PipelineData,
-            ) -> Result<PipelineData, LabeledError> {
-                let lazy = NuLazyFrame::try_from_pipeline_coerce(plugin, input, call.head)
-                    .map_err(LabeledError::from)?;
-
-                let lazy = NuLazyFrame::new(
-                    lazy.from_eager,
-                    lazy.to_polars()
-                        .$func()
-                        .map_err(|e| ShellError::GenericError {
-                            error: "Dataframe Error".into(),
-                            msg: e.to_string(),
-                            help: None,
-                            span: None,
-                            inner: vec![],
-                        })
-                        .map_err(LabeledError::from)?,
-                );
-
-                lazy.to_pipeline_data(plugin, engine, call.head)
-                    .map_err(LabeledError::from)
-            }
-        }
-
-        #[cfg(test)]
-        mod $test {
-            use super::*;
-            use nu_protocol::ShellError;
-            use $crate::test::test_polars_plugin_command;
-
-            #[test]
-            fn test_examples() -> Result<(), ShellError> {
-                test_polars_plugin_command(&$command)
-            }
-        }
-    };
-}
-
-// The structs defined in this file are structs that form part of other commands
-// since they share a similar name
-#[macro_export]
-macro_rules! expr_command {
-    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident, $test: ident) => {
-        #[derive(Clone)]
-        pub struct $command;
-
-        impl PluginCommand for $command {
-            type Plugin = PolarsPlugin;
-
-            fn name(&self) -> &str {
-                $name
-            }
-
-            fn description(&self) -> &str {
-                $desc
-            }
-
-            fn signature(&self) -> Signature {
-                Signature::build(self.name())
-                    .description($desc)
-                    .input_output_type(
-                        Type::Custom("expression".into()),
-                        Type::Custom("expression".into()),
-                    )
-                    .category(Category::Custom("expression".into()))
-            }
-
-            fn examples(&self) -> Vec<Example> {
-                $examples
-            }
-
-            fn run(
-                &self,
-                plugin: &Self::Plugin,
-                engine: &EngineInterface,
-                call: &EvaluatedCall,
-                input: PipelineData,
-            ) -> Result<PipelineData, LabeledError> {
-                let expr = NuExpression::try_from_pipeline(plugin, input, call.head)
-                    .map_err(LabeledError::from)?;
-                let expr: NuExpression = expr.into_polars().$func().into();
-                expr.to_pipeline_data(plugin, engine, call.head)
-                    .map_err(LabeledError::from)
-            }
-        }
-
-        #[cfg(test)]
-        mod $test {
-            use super::*;
-            use nu_protocol::ShellError;
-            use $crate::test::test_polars_plugin_command;
-
-            #[test]
-            fn test_examples() -> Result<(), ShellError> {
-                test_polars_plugin_command(&$command)
-            }
-        }
-    };
-
-    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident, $test: ident, $ddof: expr) => {
-        #[derive(Clone)]
-        pub struct $command;
-
-        impl PluginCommand for $command {
-            type Plugin = PolarsPlugin;
-
-            fn signature(&self) -> Signature {
-                Signature::build(self.name())
-                    .description($desc)
-                    .input_output_type(
-                        Type::Custom("expression".into()),
-                        Type::Custom("expression".into()),
-                    )
-                    .category(Category::Custom("expression".into()))
-                    .plugin_examples($examples)
-            }
-
-            fn run(
-                &self,
-                _plugin: &Self::Plugin,
-                engine: &EngineInterface,
-                call: &EvaluatedCall,
-                input: PipelineData,
-            ) -> Result<PipelineData, LabeledError> {
-                let expr = NuExpression::try_from_pipeline(input, call.head)
-                    .map_err(LabeledError::from)?;
-                let expr: NuExpression = expr.into_polars().$func($ddof).into();
-                expr.to_pipeline_data(plugin, engine, call.head)
-                    .map_err(LabeledError::from)
-            }
-        }
-
-        #[cfg(test)]
-        mod $test {
-            use super::*;
-            use $crate::test::test_polars_plugin_command;
-
-            #[test]
-            fn test_examples() -> Result<(), ShellError> {
-                test_polars_plugin_command(&$command)
-            }
-        }
-    };
-}
-
-// The structs defined in this file are structs that form part of other commands
-// since they share a similar name
-#[macro_export]
-macro_rules! lazy_expr_command {
-    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident, $test: ident) => {
-        #[derive(Clone)]
-        pub struct $command;
-
-        impl PluginCommand for $command {
-            type Plugin = PolarsPlugin;
-
-            fn name(&self) -> &str {
-                $name
-            }
-
-            fn description(&self) -> &str {
-                $desc
-            }
-
-            fn signature(&self) -> Signature {
-                Signature::build(self.name())
-                    .description($desc)
-                    .input_output_types(vec![
-                        (
-                            Type::Custom("expression".into()),
-                            Type::Custom("expression".into()),
-                        ),
-                        (
-                            Type::Custom("dataframe".into()),
-                            Type::Custom("dataframe".into()),
-                        ),
-                    ])
-                    .category(Category::Custom("expression".into()))
-            }
-
-            fn examples(&self) -> Vec<Example> {
-                $examples
-            }
-
-            fn run(
-                &self,
-                plugin: &Self::Plugin,
-                engine: &EngineInterface,
-                call: &EvaluatedCall,
-                input: PipelineData,
-            ) -> Result<PipelineData, LabeledError> {
-                let value = input.into_value(call.head)?;
-                if NuDataFrame::can_downcast(&value) || NuLazyFrame::can_downcast(&value) {
-                    let lazy = NuLazyFrame::try_from_value_coerce(plugin, &value)
-                        .map_err(LabeledError::from)?;
-                    let lazy = NuLazyFrame::new(lazy.from_eager, lazy.to_polars().$func());
-                    lazy.to_pipeline_data(plugin, engine, call.head)
-                        .map_err(LabeledError::from)
-                } else {
-                    let expr =
-                        NuExpression::try_from_value(plugin, &value).map_err(LabeledError::from)?;
-                    let expr: NuExpression = expr.into_polars().$func().into();
-                    expr.to_pipeline_data(plugin, engine, call.head)
-                        .map_err(LabeledError::from)
-                }
-            }
-        }
-
-        #[cfg(test)]
-        mod $test {
-            use super::*;
-            use nu_protocol::ShellError;
-            use $crate::test::test_polars_plugin_command;
-
-            #[test]
-            fn test_examples() -> Result<(), ShellError> {
-                test_polars_plugin_command(&$command)
-            }
-        }
-    };
-
-    ($command: ident, $name: expr, $desc: expr, $examples: expr, $func: ident, $test: ident, $ddof: expr) => {
-        #[derive(Clone)]
-        pub struct $command;
-
-        impl PluginCommand for $command {
-            type Plugin = PolarsPlugin;
-
-            fn name(&self) -> &str {
-                $name
-            }
-
-            fn description(&self) -> &str {
-                $desc
-            }
-            fn signature(&self) -> Signature {
-                Signature::build(self.name())
-                    .input_output_types(vec![
-                        (
-                            Type::Custom("expression".into()),
-                            Type::Custom("expression".into()),
-                        ),
-                        (
-                            Type::Custom("dataframe".into()),
-                            Type::Custom("dataframe".into()),
-                        ),
-                    ])
-                    .category(Category::Custom("expression".into()))
-            }
-
-            fn examples(&self) -> Vec<Example> {
-                $examples
-            }
-
-            fn run(
-                &self,
-                plugin: &Self::Plugin,
-                engine: &EngineInterface,
-                call: &EvaluatedCall,
-                input: PipelineData,
-            ) -> Result<PipelineData, LabeledError> {
-                let value = input.into_value(call.head)?;
-                if NuDataFrame::can_downcast(&value) || NuLazyFrame::can_downcast(&value) {
-                    let lazy = NuLazyFrame::try_from_value_coerce(plugin, &value)
-                        .map_err(LabeledError::from)?;
-                    let lazy = NuLazyFrame::new(lazy.from_eager, lazy.to_polars().$func($ddof));
-                    lazy.to_pipeline_data(plugin, engine, call.head)
-                        .map_err(LabeledError::from)
-                } else {
-                    let expr = NuExpression::try_from_value(plugin, &value)?;
-                    let expr: NuExpression = expr.into_polars().$func($ddof).into();
-                    expr.to_pipeline_data(plugin, engine, call.head)
-                        .map_err(LabeledError::from)
-                }
-            }
-        }
-
-        #[cfg(test)]
-        mod $test {
-            use super::*;
-            use nu_protocol::ShellError;
-            use $crate::test::test_polars_plugin_command;
-
-            #[test]
-            fn test_examples() -> Result<(), ShellError> {
-                test_polars_plugin_command(&$command)
-            }
-        }
-    };
-}
diff --git a/crates/nu_plugin_polars/src/dataframe/command/mod.rs b/crates/nu_plugin_polars/src/dataframe/command/mod.rs
index bab0f3c9f2..50c0d522a1 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/mod.rs
@@ -5,6 +5,5 @@ pub mod data;
 pub mod datetime;
 pub mod index;
 pub mod integer;
-pub mod macro_commands;
 pub mod string;
 pub mod stub;
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs
index 89a8c862e7..e782cb9265 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs
@@ -8,10 +8,7 @@ pub use operations::Axis;
 
 use indexmap::map::IndexMap;
 use nu_protocol::{did_you_mean, PipelineData, Record, ShellError, Span, Value};
-use polars::{
-    chunked_array::ops::SortMultipleOptions,
-    prelude::{DataFrame, DataType, IntoLazy, PolarsObject, Series},
-};
+use polars::prelude::{DataFrame, DataType, IntoLazy, PolarsObject, Series};
 use polars_plan::prelude::{lit, Expr, Null};
 use polars_utils::total_ord::{TotalEq, TotalHash};
 use std::{
@@ -429,80 +426,14 @@ impl NuDataFrame {
 
     // Dataframes are considered equal if they have the same shape, column name and values
     pub fn is_equal(&self, other: &Self) -> Option<Ordering> {
-        if self.as_ref().width() == 0 {
-            // checking for empty dataframe
-            return None;
+        let polars_self = self.to_polars();
+        let polars_other = other.to_polars();
+
+        if polars_self == polars_other {
+            Some(Ordering::Equal)
+        } else {
+            None
         }
-
-        if self.as_ref().get_column_names() != other.as_ref().get_column_names() {
-            // checking both dataframes share the same names
-            return None;
-        }
-
-        if self.as_ref().height() != other.as_ref().height() {
-            // checking both dataframes have the same row size
-            return None;
-        }
-
-        // sorting dataframe by the first column
-        let column_names = self.as_ref().get_column_names();
-        let first_col = column_names
-            .first()
-            .expect("already checked that dataframe is different than 0");
-
-        // if unable to sort, then unable to compare
-        let lhs = match self
-            .as_ref()
-            .sort(vec![*first_col], SortMultipleOptions::default())
-        {
-            Ok(df) => df,
-            Err(_) => return None,
-        };
-
-        let rhs = match other
-            .as_ref()
-            .sort(vec![*first_col], SortMultipleOptions::default())
-        {
-            Ok(df) => df,
-            Err(_) => return None,
-        };
-
-        for name in self.as_ref().get_column_names() {
-            let self_series = lhs.column(name).expect("name from dataframe names");
-
-            let other_series = rhs
-                .column(name)
-                .expect("already checked that name in other");
-
-            // Casting needed to compare other numeric types with nushell numeric type.
-            // In nushell we only have i64 integer numeric types and any array created
-            // with nushell untagged primitives will be of type i64
-            let self_series = match self_series.dtype() {
-                DataType::UInt32 | DataType::Int32 if *other_series.dtype() == DataType::Int64 => {
-                    match self_series.cast(&DataType::Int64) {
-                        Ok(series) => series,
-                        Err(_) => return None,
-                    }
-                }
-                _ => self_series.clone(),
-            };
-
-            let other_series = match other_series.dtype() {
-                DataType::UInt32 | DataType::Int32 if *self_series.dtype() == DataType::Int64 => {
-                    match other_series.cast(&DataType::Int64) {
-                        Ok(series) => series,
-                        Err(_) => return None,
-                    }
-                }
-                _ => other_series.clone(),
-            };
-
-            if !self_series.equals(&other_series) {
-                return None;
-            }
-        }
-
-        Some(Ordering::Equal)
     }
 
     pub fn schema(&self) -> NuSchema {
diff --git a/crates/nu_plugin_polars/src/lib.rs b/crates/nu_plugin_polars/src/lib.rs
index c537ef53fe..f70ab2b6ef 100644
--- a/crates/nu_plugin_polars/src/lib.rs
+++ b/crates/nu_plugin_polars/src/lib.rs
@@ -267,13 +267,11 @@ pub mod test {
             }
         }
 
-        let mut plugin_test = PluginTest::new("polars", plugin.into())?;
+        let mut plugin_test = PluginTest::new(command.name(), plugin.into())?;
 
         for decl in decls {
             let _ = plugin_test.add_decl(decl)?;
         }
-        plugin_test.test_examples(&examples)?;
-
-        Ok(())
+        plugin_test.test_examples(&examples)
     }
 }

From f63cecc3169aa1a2b1f457ffbe165e1e31960ee4 Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Wed, 11 Sep 2024 20:44:06 +0300
Subject: [PATCH 0434/1072] add `metadata access` command (#13785)

# Description
Add `metadata access`, which allows accessing/inspecting the metadata of
a stream in a closure.
```nu
ls | metadata access {|meta|
    ...
}
```

- The metadata is provided as an argument to the closure, identical to
the record obtained with `metadata` command.

- `metadata access` passes its input stream into the closure as it is.

- Within the closure, both the metadata and the stream are available.
The closure may modify, collect or pass the stream as it is.

# Motivation
- Without this command, nu code can't act on metadata without losing the
stream, use cases requiring both the stream and metadata must be
implemented either as a built-in or a plugin.

- This command allows users to enhance presentation of data, similar to
`table` coloring the output of `ls`.
---
 .../nu-command/src/debug/metadata_access.rs   | 109 ++++++++++++++++++
 crates/nu-command/src/debug/mod.rs            |   2 +
 crates/nu-command/src/default_context.rs      |   1 +
 3 files changed, 112 insertions(+)
 create mode 100644 crates/nu-command/src/debug/metadata_access.rs

diff --git a/crates/nu-command/src/debug/metadata_access.rs b/crates/nu-command/src/debug/metadata_access.rs
new file mode 100644
index 0000000000..ff176168e1
--- /dev/null
+++ b/crates/nu-command/src/debug/metadata_access.rs
@@ -0,0 +1,109 @@
+use nu_engine::{command_prelude::*, get_eval_block_with_early_return};
+use nu_protocol::{
+    engine::{Call, Closure, Command, EngineState, Stack},
+    DataSource, PipelineData, PipelineMetadata, ShellError, Signature, SyntaxShape, Type, Value,
+};
+
+#[derive(Clone)]
+pub struct MetadataAccess;
+
+impl Command for MetadataAccess {
+    fn name(&self) -> &str {
+        "metadata access"
+    }
+
+    fn description(&self) -> &str {
+        "Access the metadata for the input stream within a closure."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("metadata access")
+            .required(
+                "closure",
+                SyntaxShape::Closure(Some(vec![SyntaxShape::Record(vec![])])),
+                "The closure to run with metadata access.",
+            )
+            .input_output_types(vec![(Type::Any, Type::Any)])
+            .category(Category::Debug)
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        caller_stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let closure: Closure = call.req(engine_state, caller_stack, 0)?;
+        let block = engine_state.get_block(closure.block_id);
+
+        // `ClosureEvalOnce` is not used as it uses `Stack::captures_to_stack` rather than
+        // `Stack::captures_to_stack_preserve_out_dest`. This command shouldn't collect streams
+        let mut callee_stack = caller_stack.captures_to_stack_preserve_out_dest(closure.captures);
+        let metadata_record = build_metadata_record(input.metadata().as_ref(), call.head);
+
+        if let Some(var_id) = block.signature.get_positional(0).and_then(|var| var.var_id) {
+            callee_stack.add_var(var_id, metadata_record)
+        }
+
+        let eval = get_eval_block_with_early_return(engine_state);
+        eval(engine_state, &mut callee_stack, block, input)
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![Example {
+            description: "Access metadata and data from a stream together",
+            example: r#"{foo: bar} | to json --raw | metadata access {|meta| {in: $in, meta: $meta}}"#,
+            result: Some(Value::test_record(record! {
+                "in" => Value::test_string(r#"{"foo":"bar"}"#),
+                "meta" => Value::test_record(record! {
+                    "content_type" => Value::test_string(r#"application/json"#)
+                })
+            })),
+        }]
+    }
+}
+
+fn build_metadata_record(metadata: Option<&PipelineMetadata>, head: Span) -> Value {
+    let mut record = Record::new();
+
+    if let Some(x) = metadata {
+        match x {
+            PipelineMetadata {
+                data_source: DataSource::Ls,
+                ..
+            } => record.push("source", Value::string("ls", head)),
+            PipelineMetadata {
+                data_source: DataSource::HtmlThemes,
+                ..
+            } => record.push("source", Value::string("into html --list", head)),
+            PipelineMetadata {
+                data_source: DataSource::FilePath(path),
+                ..
+            } => record.push(
+                "source",
+                Value::string(path.to_string_lossy().to_string(), head),
+            ),
+            _ => {}
+        }
+        if let Some(ref content_type) = x.content_type {
+            record.push("content_type", Value::string(content_type, head));
+        }
+    }
+
+    Value::record(record, head)
+}
+
+#[cfg(test)]
+mod test {
+    use crate::ToJson;
+
+    use super::*;
+
+    #[test]
+    fn test_examples() {
+        use crate::test_examples_with_commands;
+
+        test_examples_with_commands(MetadataAccess {}, &[&ToJson])
+    }
+}
diff --git a/crates/nu-command/src/debug/mod.rs b/crates/nu-command/src/debug/mod.rs
index ec18c2be87..aabb20883d 100644
--- a/crates/nu-command/src/debug/mod.rs
+++ b/crates/nu-command/src/debug/mod.rs
@@ -5,6 +5,7 @@ mod info;
 mod inspect;
 mod inspect_table;
 mod metadata;
+mod metadata_access;
 mod metadata_set;
 mod profile;
 mod timeit;
@@ -21,6 +22,7 @@ pub use info::DebugInfo;
 pub use inspect::Inspect;
 pub use inspect_table::build_table;
 pub use metadata::Metadata;
+pub use metadata_access::MetadataAccess;
 pub use metadata_set::MetadataSet;
 pub use profile::DebugProfile;
 pub use timeit::TimeIt;
diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index bf16c05e36..01858f02d6 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -151,6 +151,7 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             Explain,
             Inspect,
             Metadata,
+            MetadataAccess,
             MetadataSet,
             TimeIt,
             View,

From 78af66f2ceca05c6e9c636a097d1e9a954fcb7d5 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Thu, 12 Sep 2024 01:45:12 +0800
Subject: [PATCH 0435/1072] Config: change ctrl-k to `cuttolineend` event
 (#13801)

# Description
According to emacs doc, I think `ctrl-k` should map to `cuttolineend`.

# User-Facing Changes
`ctrl-k` will no longer cut to the end of buffer
---
 crates/nu-utils/src/sample_config/default_config.nu | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index 1498423c45..04ae31ad25 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -756,7 +756,7 @@ $env.config = {
             modifier: control
             keycode: char_k
             mode: emacs
-            event: { edit: cuttoend }
+            event: { edit: cuttolineend }
         }
         {
             name: cut_line_from_start

From 217eb4ed703c60d0ab96a069d851cba5ec3e8894 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Thu, 12 Sep 2024 01:45:39 +0800
Subject: [PATCH 0436/1072] fix path exists on a non-directory file (#13763)

# Description
Fixes:  #13460

The issue is caused by `try_exists` method on path, it will return
`Err(NotADirectory)` if user tried to check for a path under a regular
file.
To fix it, I think it's ok to use `exists` rather than `try_exists`,
although
[Path::exists()](https://doc.rust-lang.org/std/path/struct.Path.html#method.exists)
only checks whether or not a path was both found and readable. I think
it's ok, and we can add this information under `extra_description`.

# User-Facing Changes
The following code will no longer raise error:
```
touch a; 'a/b' | path exists
```

# Tests + Formatting
Added 1 test.
---
 crates/nu-command/src/path/exists.rs            |  5 +++--
 crates/nu-command/tests/commands/path/exists.rs | 12 ++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/crates/nu-command/src/path/exists.rs b/crates/nu-command/src/path/exists.rs
index f00e6c17ef..3e40bef28a 100644
--- a/crates/nu-command/src/path/exists.rs
+++ b/crates/nu-command/src/path/exists.rs
@@ -39,7 +39,8 @@ impl Command for SubCommand {
 
     fn extra_description(&self) -> &str {
         r#"This only checks if it is possible to either `open` or `cd` to the given path.
-If you need to distinguish dirs and files, please use `path type`."#
+If you need to distinguish dirs and files, please use `path type`.
+Also note that if you don't have a permission to a directory of a path, false will be returned"#
     }
 
     fn is_const(&self) -> bool {
@@ -147,7 +148,7 @@ fn exists(path: &Path, span: Span, args: &Arguments) -> Value {
             |_| Ok(true),
         )
     } else {
-        path.try_exists()
+        Ok(path.exists())
     };
     Value::bool(
         match exists {
diff --git a/crates/nu-command/tests/commands/path/exists.rs b/crates/nu-command/tests/commands/path/exists.rs
index 96fa02c0e8..faafac910c 100644
--- a/crates/nu-command/tests/commands/path/exists.rs
+++ b/crates/nu-command/tests/commands/path/exists.rs
@@ -64,6 +64,18 @@ fn const_path_exists() {
     assert_eq!(actual.out, "true");
 }
 
+#[test]
+fn path_exists_under_a_non_directory() {
+    Playground::setup("path_exists_6", |dirs, _| {
+        let actual = nu!(
+                cwd: dirs.test(),
+                "touch test_file; 'test_file/aaa' | path exists"
+        );
+        assert_eq!(actual.out, "false");
+        assert!(actual.err.is_empty());
+    })
+}
+
 #[test]
 fn test_check_symlink_exists() {
     use nu_test_support::{nu, playground::Playground};

From 1bcceafd931ece172de77a84db6009e4d1ac12ea Mon Sep 17 00:00:00 2001
From: Tooster <5300963+T3sT3ro@users.noreply.github.com>
Date: Wed, 11 Sep 2024 22:33:20 +0200
Subject: [PATCH 0437/1072] Improve #12008 UX, clear scrollback by default on
 `clear` (#13821)

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

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

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

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

Related to #11693. It looks like there is no reason for Nu shell's
`clear` to behave differently than other shells' `clear`. To improve the
UX and fulfill the user expectations, the default has been adjusted to
work the same as in other shells by clearing the scrollback buffer. For
edge cases where someone depends on the current behavior of keeping the
scrollback, a `-k` option has been added.

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

- Improve the UX of `clear` by changing the default behavior to the same
as other popular shells, i.e clear scrollback by default.
- Remove `-a --all` flag, make it the default behavior to clear the
scrollback
- Add `-k --keep-scrollback` flag for backward compat to keep the
scrollback buffer

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

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

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

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

This is a simple change flipping the flag and default behavior, no tests
should be needed.

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

- [ ] update the `clear` command docs

---------

Co-authored-by: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
---
 crates/nu-command/src/platform/clear.rs | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/crates/nu-command/src/platform/clear.rs b/crates/nu-command/src/platform/clear.rs
index 30c6cc69a5..b47db161c6 100644
--- a/crates/nu-command/src/platform/clear.rs
+++ b/crates/nu-command/src/platform/clear.rs
@@ -19,14 +19,18 @@ impl Command for Clear {
         "Clear the terminal."
     }
 
+    fn extra_description(&self) -> &str {
+        "By default clears the current screen and the off-screen scrollback buffer."
+    }
+
     fn signature(&self) -> Signature {
         Signature::build("clear")
             .category(Category::Platform)
             .input_output_types(vec![(Type::Nothing, Type::Nothing)])
             .switch(
-                "all",
-                "Clear the terminal and its scroll-back history",
-                Some('a'),
+                "keep-scrollback",
+                "Do not clear the scrollback history",
+                Some('k'),
             )
     }
 
@@ -37,9 +41,9 @@ impl Command for Clear {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let clear_type: ClearType = match call.has_flag(engine_state, stack, "all")? {
-            true => ClearType::Purge,
-            _ => ClearType::All,
+        let clear_type: ClearType = match call.has_flag(engine_state, stack, "keep-scrollback")? {
+            true => ClearType::All,
+            _ => ClearType::Purge,
         };
         std::io::stdout()
             .queue(ClearCommand(clear_type))?
@@ -57,8 +61,8 @@ impl Command for Clear {
                 result: None,
             },
             Example {
-                description: "Clear the terminal and its scroll-back history",
-                example: "clear --all",
+                description: "Clear the terminal but not its scrollback history",
+                example: "clear --keep-scrollback",
                 result: None,
             },
         ]

From fb34a4fc6c9ca882cc6dc95d437902a45c402e9a Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Thu, 12 Sep 2024 04:23:40 -0700
Subject: [PATCH 0438/1072] Make `polars save` return an empty pipeline
 (#13833)

# Description
In order to be more consistent with it's nu counterpart, `polars save`
now returns an empty pipeline instead of a message of the saved file.

# User-Facing Changes
- `polars save` no longer displays a save message, making it consistent
with `save` behavior.
---
 .../src/dataframe/command/core/save/mod.rs    | 31 ++-----------------
 1 file changed, 3 insertions(+), 28 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/save/mod.rs b/crates/nu_plugin_polars/src/dataframe/command/core/save/mod.rs
index 0c15f5abbc..6d92b9bd33 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/save/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/save/mod.rs
@@ -15,7 +15,7 @@ use nu_path::expand_path_with;
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
     Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Spanned,
-    SyntaxShape, Type, Value,
+    SyntaxShape, Type,
 };
 use polars::error::PolarsError;
 
@@ -209,12 +209,8 @@ fn command(
             span: spanned_file.span,
         }),
     }?;
-    let file_value = Value::string(format!("saved {:?}", &file_path), file_span);
 
-    Ok(PipelineData::Value(
-        Value::list(vec![file_value], call.head),
-        None,
-    ))
+    Ok(PipelineData::empty())
 }
 
 pub(crate) fn polars_file_save_error(e: PolarsError, span: Span) -> ShellError {
@@ -264,16 +260,10 @@ pub(crate) mod test {
                 Span::test_data(),
             ),
         );
-        let pipeline_data = plugin_test.eval(&cmd)?;
+        let _pipeline_data = plugin_test.eval(&cmd)?;
 
         assert!(tmp_file.exists());
 
-        let value = pipeline_data.into_value(Span::test_data())?;
-        let list = value.as_list()?;
-        assert_eq!(list.len(), 1);
-        let msg = list.first().expect("should have a value").as_str()?;
-        assert!(msg.contains("saved"));
-
         Ok(())
     }
 
@@ -290,19 +280,4 @@ pub(crate) mod test {
             extension,
         )
     }
-
-    //     #[test]
-    //     pub fn test_to_ipc() -> Result<(), Box<dyn std::error::Error>> {
-    //         test_sink("ipc")
-    //     }
-    //
-    //     #[test]
-    //     pub fn test_to_csv() -> Result<(), Box<dyn std::error::Error>> {
-    //         test_sink("csv")
-    //     }
-    //
-    //     #[test]
-    //     pub fn test_to_json() -> Result<(), Box<dyn std::error::Error>> {
-    //         test_sink("ndjson")
-    //     }
 }

From 5101b5e30630d96d435c49a3290c43937e548e77 Mon Sep 17 00:00:00 2001
From: nome <Knut.Franke@gmx.de>
Date: Thu, 12 Sep 2024 14:16:33 +0200
Subject: [PATCH 0439/1072] Add --number flag to split column (#13831)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This allows parsing of data (e.g. key-value pairs) where the last column
may contain the delimiter.

- this PR should close #13742

# Description

Adds a `--number (-n)` flag to `split column`, analogous to `split row
--number`.

```
~> ['author: Salina Yoon' r#'title: Where's Ellie?: A Hide-and-Seek Book'#] | split column --number 2 ': ' key value
╭───┬────────┬──────────────────────────────────────╮
│ # │  key   │                value                 │
├───┼────────┼──────────────────────────────────────┤
│ 0 │ author │ Salina Yoon                          │
│ 1 │ title  │ Where's Ellie?: A Hide-and-Seek Book │
╰───┴────────┴──────────────────────────────────────╯
```

# User-Facing Changes
* `split column` gains a `--number` option

# Tests + Formatting
Tests included in strings::split::column::test::test_examples and
commands::split_column::to_column.

# After Submitting
Reference documentation is auto-generated from code. No other
documentation updates necessary.
---
 crates/nu-command/src/strings/split/column.rs | 51 +++++++++++++++++--
 .../nu-command/tests/commands/split_column.rs | 13 +++++
 2 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/crates/nu-command/src/strings/split/column.rs b/crates/nu-command/src/strings/split/column.rs
index 4a9a96a8d7..3ed56a56ae 100644
--- a/crates/nu-command/src/strings/split/column.rs
+++ b/crates/nu-command/src/strings/split/column.rs
@@ -26,6 +26,12 @@ impl Command for SubCommand {
                 "The character or string that denotes what separates columns.",
             )
             .switch("collapse-empty", "remove empty columns", Some('c'))
+            .named(
+                "number",
+                SyntaxShape::Int,
+                "Split into maximum number of items",
+                Some('n'),
+            )
             .switch("regex", "separator is a regular expression", Some('r'))
             .rest(
                 "rest",
@@ -91,6 +97,20 @@ impl Command for SubCommand {
                     }),
                 ])),
             },
+            Example {
+                description: "Split into columns, last column may contain the delimiter",
+                example: r"['author: Salina Yoon' r#'title: Where's Ellie?: A Hide-and-Seek Book'#] | split column --number 2 ': ' key value",
+                result: Some(Value::test_list(vec![
+                    Value::test_record(record! {
+                        "key" => Value::test_string("author"),
+                        "value" => Value::test_string("Salina Yoon"),
+                    }),
+                    Value::test_record(record! {
+                        "key" => Value::test_string("title"),
+                        "value" => Value::test_string("Where's Ellie?: A Hide-and-Seek Book"),
+                    }),
+                ])),
+            },
         ]
     }
 
@@ -108,12 +128,14 @@ impl Command for SubCommand {
         let separator: Spanned<String> = call.req(engine_state, stack, 0)?;
         let rest: Vec<Spanned<String>> = call.rest(engine_state, stack, 1)?;
         let collapse_empty = call.has_flag(engine_state, stack, "collapse-empty")?;
+        let max_split: Option<usize> = call.get_flag(engine_state, stack, "number")?;
         let has_regex = call.has_flag(engine_state, stack, "regex")?;
 
         let args = Arguments {
             separator,
             rest,
             collapse_empty,
+            max_split,
             has_regex,
         };
         split_column(engine_state, call, input, args)
@@ -128,12 +150,14 @@ impl Command for SubCommand {
         let separator: Spanned<String> = call.req_const(working_set, 0)?;
         let rest: Vec<Spanned<String>> = call.rest_const(working_set, 1)?;
         let collapse_empty = call.has_flag_const(working_set, "collapse-empty")?;
+        let max_split: Option<usize> = call.get_flag_const(working_set, "number")?;
         let has_regex = call.has_flag_const(working_set, "regex")?;
 
         let args = Arguments {
             separator,
             rest,
             collapse_empty,
+            max_split,
             has_regex,
         };
         split_column(working_set.permanent(), call, input, args)
@@ -144,6 +168,7 @@ struct Arguments {
     separator: Spanned<String>,
     rest: Vec<Spanned<String>>,
     collapse_empty: bool,
+    max_split: Option<usize>,
     has_regex: bool,
 }
 
@@ -169,7 +194,16 @@ fn split_column(
     })?;
 
     input.flat_map(
-        move |x| split_column_helper(&x, &regex, &args.rest, args.collapse_empty, name_span),
+        move |x| {
+            split_column_helper(
+                &x,
+                &regex,
+                &args.rest,
+                args.collapse_empty,
+                args.max_split,
+                name_span,
+            )
+        },
         engine_state.signals(),
     )
 }
@@ -179,13 +213,20 @@ fn split_column_helper(
     separator: &Regex,
     rest: &[Spanned<String>],
     collapse_empty: bool,
+    max_split: Option<usize>,
     head: Span,
 ) -> Vec<Value> {
     if let Ok(s) = v.coerce_str() {
-        let split_result: Vec<_> = separator
-            .split(&s)
-            .filter(|x| !(collapse_empty && x.is_empty()))
-            .collect();
+        let split_result: Vec<_> = match max_split {
+            Some(max_split) => separator
+                .splitn(&s, max_split)
+                .filter(|x| !(collapse_empty && x.is_empty()))
+                .collect(),
+            None => separator
+                .split(&s)
+                .filter(|x| !(collapse_empty && x.is_empty()))
+                .collect(),
+        };
         let positional: Vec<_> = rest.iter().map(|f| f.item.clone()).collect();
 
         // If they didn't provide column names, make up our own
diff --git a/crates/nu-command/tests/commands/split_column.rs b/crates/nu-command/tests/commands/split_column.rs
index 544c238cfa..5b40117990 100644
--- a/crates/nu-command/tests/commands/split_column.rs
+++ b/crates/nu-command/tests/commands/split_column.rs
@@ -33,6 +33,19 @@ fn to_column() {
 
         assert!(actual.out.contains("shipper"));
 
+        let actual = nu!(
+            cwd: dirs.test(), pipeline(
+            r#"
+                open sample.txt
+                | lines
+                | str trim
+                | split column -n 3 ","
+                | get column3
+            "#
+        ));
+
+        assert!(actual.out.contains("tariff_item,name,origin"));
+
         let actual = nu!(
             cwd: dirs.test(), pipeline(
             r"

From a59477205dbf114d12d2ab9099d4bd13004a1b96 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Fri, 13 Sep 2024 00:07:22 -0700
Subject: [PATCH 0440/1072] Fix `try`: Add `set_last_error()` to
 `prepare_error_handler()` for IR eval (#13838)

# Description

Fixes a bug with `set_last_error()` introduced by @IanManske not being
called during the jump to an error handler in IR eval. Without this,
`$env.LAST_EXIT_CODE` wasn't getting set in the `catch` block for an
external.

# Tests + Formatting

Added a `tests/eval` test to cover this in both IR and non-IR eval
---
 crates/nu-engine/src/eval_ir.rs | 2 ++
 tests/eval/mod.rs               | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index b6f5287196..7cc4e0267d 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -246,6 +246,8 @@ fn prepare_error_handler(
 ) {
     if let Some(reg_id) = error_handler.error_register {
         if let Some(error) = error {
+            // Stack state has to be updated for stuff like LAST_EXIT_CODE
+            ctx.stack.set_last_error(&error.item);
             // Create the error value and put it in the register
             ctx.put_reg(
                 reg_id,
diff --git a/tests/eval/mod.rs b/tests/eval/mod.rs
index e9afd401e9..f8996f0a3e 100644
--- a/tests/eval/mod.rs
+++ b/tests/eval/mod.rs
@@ -451,6 +451,14 @@ fn try_catch_with_non_literal_closure() {
     )
 }
 
+#[test]
+fn try_catch_external() {
+    test_eval(
+        r#"try { nu -c 'exit 1' } catch { $env.LAST_EXIT_CODE }"#,
+        Eq("1"),
+    )
+}
+
 #[test]
 fn row_condition() {
     test_eval(

From aaaab8e070c644a87bbd7682099e3fe9e6a4b42a Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Fri, 13 Sep 2024 22:03:31 +0800
Subject: [PATCH 0441/1072] Update Nu for release workflow and fix build
 warning of musl targets (#13840)

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

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

# Description

1. Update Nushell to v0.97.1 for release workflow
2. Fix musl targets cross compiling warning like: `warning: File system
loop found:
/home/runner/work/nightly/nightly/aarch64-linux-musl-cross/usr points to
an ancestor /home/runner/work/nightly/nightly/aarch64-linux-musl-cross/`

Tested in
https://github.com/nushell/nightly/actions/runs/10849647834/job/30109290106
---
 .github/workflows/nightly-build.yml | 6 +++---
 .github/workflows/release-pkg.nu    | 8 ++++----
 .github/workflows/release.yml       | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 898833e457..abef444ec3 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -39,7 +39,7 @@ jobs:
         uses: hustcer/setup-nu@v3.13
         if: github.repository == 'nushell/nightly'
         with:
-          version: 0.95.0
+          version: 0.97.1
 
       # Synchronize the main branch of nightly repo with the main branch of Nushell official repo
       - name: Prepare for Nightly Release
@@ -136,7 +136,7 @@ jobs:
     - name: Setup Nushell
       uses: hustcer/setup-nu@v3.13
       with:
-        version: 0.95.0
+        version: 0.97.1
 
     - name: Release Nu Binary
       id: nu
@@ -194,7 +194,7 @@ jobs:
       - name: Setup Nushell
         uses: hustcer/setup-nu@v3.13
         with:
-          version: 0.95.0
+          version: 0.97.1
 
       # Keep the last a few releases
       - name: Delete Older Releases
diff --git a/.github/workflows/release-pkg.nu b/.github/workflows/release-pkg.nu
index f1d56d7614..85ce6a1caf 100755
--- a/.github/workflows/release-pkg.nu
+++ b/.github/workflows/release-pkg.nu
@@ -86,15 +86,15 @@ if $os in ['macos-latest'] or $USE_UBUNTU {
         }
         'aarch64-unknown-linux-musl' => {
             aria2c https://musl.cc/aarch64-linux-musl-cross.tgz
-            tar -xf aarch64-linux-musl-cross.tgz
-            $env.PATH = ($env.PATH | split row (char esep) | prepend $'($env.PWD)/aarch64-linux-musl-cross/bin')
+            tar -xf aarch64-linux-musl-cross.tgz -C $env.HOME
+            $env.PATH = ($env.PATH | split row (char esep) | prepend $'($env.HOME)/aarch64-linux-musl-cross/bin')
             $env.CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER = 'aarch64-linux-musl-gcc'
             cargo-build-nu
         }
         'armv7-unknown-linux-musleabihf' => {
             aria2c https://musl.cc/armv7r-linux-musleabihf-cross.tgz
-            tar -xf armv7r-linux-musleabihf-cross.tgz
-            $env.PATH = ($env.PATH | split row (char esep) | prepend $'($env.PWD)/armv7r-linux-musleabihf-cross/bin')
+            tar -xf armv7r-linux-musleabihf-cross.tgz -C $env.HOME
+            $env.PATH = ($env.PATH | split row (char esep) | prepend $'($env.HOME)/armv7r-linux-musleabihf-cross/bin')
             $env.CARGO_TARGET_ARMV7_UNKNOWN_LINUX_MUSLEABIHF_LINKER = 'armv7r-linux-musleabihf-gcc'
             cargo-build-nu
         }
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6a15d68546..ed42b5c3ca 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -84,7 +84,7 @@ jobs:
     - name: Setup Nushell
       uses: hustcer/setup-nu@v3.13
       with:
-        version: 0.95.0
+        version: 0.97.1
 
     - name: Release Nu Binary
       id: nu

From ebc7b80c23f777f70c5053cca428226b3fe00d30 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Sat, 14 Sep 2024 08:51:00 -0500
Subject: [PATCH 0442/1072] allow tab to be retained with `find` (#13848)

# Description

This PR allows the tab character to be retained when using `find`.

### Before

![image](https://github.com/user-attachments/assets/92d78f55-58fb-42f4-be8f-82992292c900)

### After

![image](https://github.com/user-attachments/assets/fbd8e47f-9806-4e30-89a1-6c88b12a612c)


closes #13846

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/help/help_.rs | 2 +-
 crates/nu-utils/src/deansi.rs       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/nu-command/src/help/help_.rs b/crates/nu-command/src/help/help_.rs
index a036161003..ff24f84206 100644
--- a/crates/nu-command/src/help/help_.rs
+++ b/crates/nu-command/src/help/help_.rs
@@ -208,7 +208,7 @@ pub fn highlight_search_string(
         }
     };
     // strip haystack to remove existing ansi style
-    let stripped_haystack = nu_utils::strip_ansi_likely(haystack);
+    let stripped_haystack = nu_utils::strip_ansi_string_unlikely(haystack.to_string());
     let mut last_match_end = 0;
     let mut highlighted = String::new();
 
diff --git a/crates/nu-utils/src/deansi.rs b/crates/nu-utils/src/deansi.rs
index 28f41495d8..1e4afe7ffc 100644
--- a/crates/nu-utils/src/deansi.rs
+++ b/crates/nu-utils/src/deansi.rs
@@ -54,7 +54,7 @@ pub fn strip_ansi_string_unlikely(string: String) -> String {
     if string
         .as_str()
         .bytes()
-        .any(|x| matches!(x, 0..=9 | 11..=31))
+        .any(|x| matches!(x, 0..=8 | 11..=31))
     {
         if let Ok(stripped) = String::from_utf8(strip_ansi_escapes::strip(&string)) {
             return stripped;

From c9cb62067c7087a3f32ab54206aa007de2218ad6 Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Sun, 15 Sep 2024 20:03:22 +0800
Subject: [PATCH 0443/1072] Fix dockerfile and reset Nu config to default
 (#13851)

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

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

# Description

Fix dockerfile and reset Nu config to default, fetching config file from
the remote may cause compatible issues
---
 docker/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 64c37f6230..0ccfc45740 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -10,8 +10,6 @@ LABEL maintainer=nushell
 RUN echo '/usr/bin/nu' >> /etc/shells \
     && adduser -D -s /usr/bin/nu nushell \
     && mkdir -p /home/nushell/.config/nushell/ \
-    && wget -q https://raw.githubusercontent.com/nushell/nushell/main/crates/nu-utils/src/sample_config/default_config.nu -O /home/nushell/.config/nushell/config.nu \
-    && wget -q https://raw.githubusercontent.com/nushell/nushell/main/crates/nu-utils/src/sample_config/default_env.nu -O /home/nushell/.config/nushell/env.nu \
     && cd /tmp \
     && wget -qO - https://api.github.com/repos/nushell/nushell/releases/latest \
     | grep browser_download_url \
@@ -23,6 +21,8 @@ RUN echo '/usr/bin/nu' >> /etc/shells \
     && mv nu* /usr/bin \
     && chmod +x /usr/bin/nu \
     && chown -R nushell:nushell /home/nushell/.config/nushell \
+    # Reset Nushell config to default
+    && su -c 'config reset -w' nushell \
     && ls /usr/bin/nu_plugin* \
     | xargs -I{} su -c 'plugin add {}' nushell \
     && rm -rf /tmp/*

From c535c24d03aa6c1eeee5dd4654aa9e9109b017a5 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Sun, 15 Sep 2024 05:21:02 -0700
Subject: [PATCH 0444/1072] catch unwrap on panics with `polars collect`
 (#13850)

# Description
This resurrects the work from #12866 and fixes #12732.

Polars panics for a plethora or reasons. While handling panics is
generally frowned upon, in cases like with `polars collect` a panic
cause a lot of work to be lost. Often you might have multiple dataframes
in memory and you are trying one operation and lose all state.

While it possible the panic can leave things a strange state, it is
pretty unlikely as part of a polars pipeline. Most of the time polars
objects are not manipulating dataframes in memory mutability, but rather
creating a new dataframe the operations being applied. This is always
the case with a lazy pipeline. After the collect call, the original
dataframes are intact still and I haven't observed any side effects.
---
 .../src/dataframe/values/nu_lazyframe/mod.rs  | 25 +++++++++++--------
 crates/nu_plugin_polars/src/lib.rs            | 21 +++++++++++++++-
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/mod.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/mod.rs
index e89f14c316..dad72cab74 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/mod.rs
@@ -55,16 +55,21 @@ impl NuLazyFrame {
     }
 
     pub fn collect(self, span: Span) -> Result<NuDataFrame, ShellError> {
-        self.to_polars()
-            .collect()
-            .map_err(|e| ShellError::GenericError {
-                error: "Error collecting lazy frame".into(),
-                msg: e.to_string(),
-                span: Some(span),
-                help: None,
-                inner: vec![],
-            })
-            .map(|df| NuDataFrame::new(true, df))
+        crate::handle_panic(
+            || {
+                self.to_polars()
+                    .collect()
+                    .map_err(|e| ShellError::GenericError {
+                        error: "Error collecting lazy frame".into(),
+                        msg: e.to_string(),
+                        span: Some(span),
+                        help: None,
+                        inner: vec![],
+                    })
+                    .map(|df| NuDataFrame::new(true, df))
+            },
+            span,
+        )
     }
 
     pub fn apply_with_expr<F>(self, expr: NuExpression, f: F) -> Self
diff --git a/crates/nu_plugin_polars/src/lib.rs b/crates/nu_plugin_polars/src/lib.rs
index f70ab2b6ef..342e5cd28c 100644
--- a/crates/nu_plugin_polars/src/lib.rs
+++ b/crates/nu_plugin_polars/src/lib.rs
@@ -1,4 +1,7 @@
-use std::cmp::Ordering;
+use std::{
+    cmp::Ordering,
+    panic::{catch_unwind, AssertUnwindSafe},
+};
 
 use cache::cache_commands;
 pub use cache::{Cache, Cacheable};
@@ -209,6 +212,22 @@ impl Plugin for PolarsPlugin {
     }
 }
 
+pub(crate) fn handle_panic<F, R>(f: F, span: Span) -> Result<R, ShellError>
+where
+    F: FnOnce() -> Result<R, ShellError>,
+{
+    match catch_unwind(AssertUnwindSafe(f)) {
+        Ok(inner_result) => inner_result,
+        Err(_) => Err(ShellError::GenericError {
+            error: "Panic occurred".into(),
+            msg: "".into(),
+            span: Some(span),
+            help: None,
+            inner: vec![],
+        }),
+    }
+}
+
 #[cfg(test)]
 pub mod test {
     use super::*;

From 9ca0fb772ddc9ab362efa9dd15d98f12c7130b8f Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Sun, 15 Sep 2024 14:54:38 -0700
Subject: [PATCH 0445/1072] Make IR the default evaluator (#13718)

# Description

Makes IR the default evaluator, in preparation to remove the non-IR
evaluator in a future release.

# User-Facing Changes

* Remove `NU_USE_IR` option
* Add `NU_DISABLE_IR` option
* IR is enabled unless `NU_DISABLE_IR` is set

# After Submitting
- [ ] release notes
---
 benches/benchmarks.rs                         |  4 +-
 crates/nu-cli/src/repl.rs                     |  4 +-
 .../nu-cmd-lang/src/core_commands/describe.rs |  2 +-
 crates/nu-cmd-lang/src/core_commands/do_.rs   |  2 +-
 crates/nu-cmd-lang/src/core_commands/try_.rs  | 14 ++---
 crates/nu-cmd-lang/src/example_support.rs     | 53 +++++++++++--------
 crates/nu-command/src/formats/to/csv.rs       |  3 +-
 crates/nu-command/src/formats/to/json.rs      |  3 +-
 crates/nu-command/src/formats/to/md.rs        |  3 +-
 crates/nu-command/src/formats/to/msgpack.rs   |  3 +-
 crates/nu-command/src/formats/to/nuon.rs      |  3 +-
 crates/nu-command/src/formats/to/text.rs      |  3 +-
 crates/nu-command/src/formats/to/tsv.rs       |  3 +-
 crates/nu-command/src/formats/to/xml.rs       |  3 +-
 crates/nu-command/src/formats/to/yaml.rs      |  3 +-
 crates/nu-protocol/src/engine/stack.rs        |  2 +-
 crates/nu-test-support/src/macros.rs          |  8 +--
 src/run.rs                                    | 12 ++---
 src/test_bins.rs                              |  6 +--
 19 files changed, 77 insertions(+), 57 deletions(-)

diff --git a/benches/benchmarks.rs b/benches/benchmarks.rs
index 4efb666507..6eb56532a4 100644
--- a/benches/benchmarks.rs
+++ b/benches/benchmarks.rs
@@ -46,8 +46,8 @@ fn setup_stack_and_engine_from_command(command: &str) -> (Stack, EngineState) {
 
     let mut stack = Stack::new();
 
-    // Support running benchmarks with IR mode
-    stack.use_ir = std::env::var_os("NU_USE_IR").is_some();
+    // Support running benchmarks without IR mode
+    stack.use_ir = std::env::var_os("NU_DISABLE_IR").is_none();
 
     evaluate_commands(
         &commands,
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 0e734571c9..d89af0bb9e 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -288,9 +288,9 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
     if let Err(err) = engine_state.merge_env(&mut stack, cwd) {
         report_shell_error(engine_state, &err);
     }
-    // Check whether $env.NU_USE_IR is set, so that the user can change it in the REPL
+    // Check whether $env.NU_DISABLE_IR is set, so that the user can change it in the REPL
     // Temporary while IR eval is optional
-    stack.use_ir = stack.has_env_var(engine_state, "NU_USE_IR");
+    stack.use_ir = !stack.has_env_var(engine_state, "NU_DISABLE_IR");
     perf!("merge env", start_time, use_color);
 
     start_time = std::time::Instant::now();
diff --git a/crates/nu-cmd-lang/src/core_commands/describe.rs b/crates/nu-cmd-lang/src/core_commands/describe.rs
index 5df62e6793..ec98dc896f 100644
--- a/crates/nu-cmd-lang/src/core_commands/describe.rs
+++ b/crates/nu-cmd-lang/src/core_commands/describe.rs
@@ -70,7 +70,7 @@ impl Command for Describe {
             Example {
                 description: "Describe the type of a record in a detailed way",
                 example:
-                    "{shell:'true', uwu:true, features: {bugs:false, multiplatform:true, speed: 10}, fib: [1 1 2 3 5 8], on_save: {|x| print $'Saving ($x)'}, first_commit: 2019-05-10, my_duration: (4min + 20sec)} | describe -d",
+                    "{shell:'true', uwu:true, features: {bugs:false, multiplatform:true, speed: 10}, fib: [1 1 2 3 5 8], on_save: {|x| $'Saving ($x)'}, first_commit: 2019-05-10, my_duration: (4min + 20sec)} | describe -d",
                 result: Some(Value::test_record(record!(
                     "type" => Value::test_string("record"),
                     "columns" => Value::test_record(record!(
diff --git a/crates/nu-cmd-lang/src/core_commands/do_.rs b/crates/nu-cmd-lang/src/core_commands/do_.rs
index 6c7c36e7d1..b05de81d57 100644
--- a/crates/nu-cmd-lang/src/core_commands/do_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/do_.rs
@@ -83,7 +83,7 @@ impl Command for Do {
         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");
+        callee_stack.use_ir = !caller_stack.has_env_var(engine_state, "NU_DISABLE_IR");
 
         let result = eval_block_with_early_return(engine_state, &mut callee_stack, block, input);
 
diff --git a/crates/nu-cmd-lang/src/core_commands/try_.rs b/crates/nu-cmd-lang/src/core_commands/try_.rs
index 25d6fe59a3..9e5196c650 100644
--- a/crates/nu-cmd-lang/src/core_commands/try_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/try_.rs
@@ -77,18 +77,18 @@ impl Command for Try {
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
-                description: "Try to run a missing command",
-                example: "try { asdfasdf }",
+                description: "Try to run a division by zero",
+                example: "try { 1 / 0 }",
                 result: None,
             },
             Example {
-                description: "Try to run a missing command",
-                example: "try { asdfasdf } catch { 'missing' }",
-                result: Some(Value::test_string("missing")),
+                description: "Try to run a division by zero and return a string instead",
+                example: "try { 1 / 0 } catch { 'divided by zero' }",
+                result: Some(Value::test_string("divided by zero")),
             },
             Example {
-                description: "Try to run a missing command and report the message",
-                example: "try { asdfasdf } catch { |err| $err.msg }",
+                description: "Try to run a division by zero and report the message",
+                example: "try { 1 / 0 } catch { |err| $err.msg }",
                 result: None,
             },
         ]
diff --git a/crates/nu-cmd-lang/src/example_support.rs b/crates/nu-cmd-lang/src/example_support.rs
index 9ae3808480..8df5a6c1e8 100644
--- a/crates/nu-cmd-lang/src/example_support.rs
+++ b/crates/nu-cmd-lang/src/example_support.rs
@@ -1,10 +1,7 @@
 use itertools::Itertools;
-use nu_engine::command_prelude::*;
+use nu_engine::{command_prelude::*, compile};
 use nu_protocol::{
-    ast::Block,
-    debugger::WithoutDebug,
-    engine::{StateDelta, StateWorkingSet},
-    report_shell_error, Range,
+    ast::Block, debugger::WithoutDebug, engine::StateWorkingSet, report_shell_error, Range,
 };
 use std::{
     sync::Arc,
@@ -77,16 +74,25 @@ pub fn eval_pipeline_without_terminal_expression(
     cwd: &std::path::Path,
     engine_state: &mut Box<EngineState>,
 ) -> Option<Value> {
-    let (mut block, delta) = parse(src, engine_state);
+    let (mut block, mut working_set) = parse(src, engine_state);
     if block.pipelines.len() == 1 {
         let n_expressions = block.pipelines[0].elements.len();
-        Arc::make_mut(&mut block).pipelines[0]
-            .elements
-            .truncate(&n_expressions - 1);
+        // Modify the block to remove the last element and recompile it
+        {
+            let mut_block = Arc::make_mut(&mut block);
+            mut_block.pipelines[0].elements.truncate(n_expressions - 1);
+            mut_block.ir_block = Some(compile(&working_set, mut_block).expect(
+                "failed to compile block modified by eval_pipeline_without_terminal_expression",
+            ));
+        }
+        working_set.add_block(block.clone());
+        engine_state
+            .merge_delta(working_set.render())
+            .expect("failed to merge delta");
 
         if !block.pipelines[0].elements.is_empty() {
             let empty_input = PipelineData::empty();
-            Some(eval_block(block, empty_input, cwd, engine_state, delta))
+            Some(eval_block(block, empty_input, cwd, engine_state))
         } else {
             Some(Value::nothing(Span::test_data()))
         }
@@ -96,28 +102,30 @@ pub fn eval_pipeline_without_terminal_expression(
     }
 }
 
-pub fn parse(contents: &str, engine_state: &EngineState) -> (Arc<Block>, StateDelta) {
+pub fn parse<'engine>(
+    contents: &str,
+    engine_state: &'engine EngineState,
+) -> (Arc<Block>, StateWorkingSet<'engine>) {
     let mut working_set = StateWorkingSet::new(engine_state);
     let output = nu_parser::parse(&mut working_set, None, contents.as_bytes(), false);
 
     if let Some(err) = working_set.parse_errors.first() {
-        panic!("test parse error in `{contents}`: {err:?}")
+        panic!("test parse error in `{contents}`: {err:?}");
     }
 
-    (output, working_set.render())
+    if let Some(err) = working_set.compile_errors.first() {
+        panic!("test compile error in `{contents}`: {err:?}");
+    }
+
+    (output, working_set)
 }
 
 pub fn eval_block(
     block: Arc<Block>,
     input: PipelineData,
     cwd: &std::path::Path,
-    engine_state: &mut Box<EngineState>,
-    delta: StateDelta,
+    engine_state: &EngineState,
 ) -> Value {
-    engine_state
-        .merge_delta(delta)
-        .expect("Error merging delta");
-
     let mut stack = Stack::new().capture();
 
     stack.add_env_var("PWD".to_string(), Value::test_string(cwd.to_string_lossy()));
@@ -191,8 +199,11 @@ fn eval(
     cwd: &std::path::Path,
     engine_state: &mut Box<EngineState>,
 ) -> Value {
-    let (block, delta) = parse(contents, engine_state);
-    eval_block(block, input, cwd, engine_state, delta)
+    let (block, working_set) = parse(contents, engine_state);
+    engine_state
+        .merge_delta(working_set.render())
+        .expect("failed to merge delta");
+    eval_block(block, input, cwd, engine_state)
 }
 
 pub struct DebuggableValue<'a>(pub &'a Value);
diff --git a/crates/nu-command/src/formats/to/csv.rs b/crates/nu-command/src/formats/to/csv.rs
index 4e971a3abb..73eacf49a7 100644
--- a/crates/nu-command/src/formats/to/csv.rs
+++ b/crates/nu-command/src/formats/to/csv.rs
@@ -137,7 +137,7 @@ mod test {
 
     use nu_cmd_lang::eval_pipeline_without_terminal_expression;
 
-    use crate::Metadata;
+    use crate::{Get, Metadata};
 
     use super::*;
 
@@ -157,6 +157,7 @@ mod test {
 
             working_set.add_decl(Box::new(ToCsv {}));
             working_set.add_decl(Box::new(Metadata {}));
+            working_set.add_decl(Box::new(Get {}));
 
             working_set.render()
         };
diff --git a/crates/nu-command/src/formats/to/json.rs b/crates/nu-command/src/formats/to/json.rs
index dc2b89c0c9..9e68961092 100644
--- a/crates/nu-command/src/formats/to/json.rs
+++ b/crates/nu-command/src/formats/to/json.rs
@@ -161,7 +161,7 @@ fn json_list(input: &[Value]) -> Result<Vec<nu_json::Value>, ShellError> {
 mod test {
     use nu_cmd_lang::eval_pipeline_without_terminal_expression;
 
-    use crate::Metadata;
+    use crate::{Get, Metadata};
 
     use super::*;
 
@@ -182,6 +182,7 @@ mod test {
 
             working_set.add_decl(Box::new(ToJson {}));
             working_set.add_decl(Box::new(Metadata {}));
+            working_set.add_decl(Box::new(Get {}));
 
             working_set.render()
         };
diff --git a/crates/nu-command/src/formats/to/md.rs b/crates/nu-command/src/formats/to/md.rs
index 2cf6b5215e..434b65a8d9 100644
--- a/crates/nu-command/src/formats/to/md.rs
+++ b/crates/nu-command/src/formats/to/md.rs
@@ -335,7 +335,7 @@ fn get_padded_string(text: String, desired_length: usize, padding_character: cha
 
 #[cfg(test)]
 mod tests {
-    use crate::Metadata;
+    use crate::{Get, Metadata};
 
     use super::*;
     use nu_cmd_lang::eval_pipeline_without_terminal_expression;
@@ -474,6 +474,7 @@ mod tests {
 
             working_set.add_decl(Box::new(ToMd {}));
             working_set.add_decl(Box::new(Metadata {}));
+            working_set.add_decl(Box::new(Get {}));
 
             working_set.render()
         };
diff --git a/crates/nu-command/src/formats/to/msgpack.rs b/crates/nu-command/src/formats/to/msgpack.rs
index b4f7c7d79e..537aa9efdb 100644
--- a/crates/nu-command/src/formats/to/msgpack.rs
+++ b/crates/nu-command/src/formats/to/msgpack.rs
@@ -275,7 +275,7 @@ where
 mod test {
     use nu_cmd_lang::eval_pipeline_without_terminal_expression;
 
-    use crate::Metadata;
+    use crate::{Get, Metadata};
 
     use super::*;
 
@@ -296,6 +296,7 @@ mod test {
 
             working_set.add_decl(Box::new(ToMsgpack {}));
             working_set.add_decl(Box::new(Metadata {}));
+            working_set.add_decl(Box::new(Get {}));
 
             working_set.render()
         };
diff --git a/crates/nu-command/src/formats/to/nuon.rs b/crates/nu-command/src/formats/to/nuon.rs
index db29934a4d..8f4fc80e7f 100644
--- a/crates/nu-command/src/formats/to/nuon.rs
+++ b/crates/nu-command/src/formats/to/nuon.rs
@@ -107,7 +107,7 @@ mod test {
     use super::*;
     use nu_cmd_lang::eval_pipeline_without_terminal_expression;
 
-    use crate::Metadata;
+    use crate::{Get, Metadata};
 
     #[test]
     fn test_examples() {
@@ -126,6 +126,7 @@ mod test {
 
             working_set.add_decl(Box::new(ToNuon {}));
             working_set.add_decl(Box::new(Metadata {}));
+            working_set.add_decl(Box::new(Get {}));
 
             working_set.render()
         };
diff --git a/crates/nu-command/src/formats/to/text.rs b/crates/nu-command/src/formats/to/text.rs
index 626596ea76..21b543d0eb 100644
--- a/crates/nu-command/src/formats/to/text.rs
+++ b/crates/nu-command/src/formats/to/text.rs
@@ -144,7 +144,7 @@ fn update_metadata(metadata: Option<PipelineMetadata>) -> Option<PipelineMetadat
 mod test {
     use nu_cmd_lang::eval_pipeline_without_terminal_expression;
 
-    use crate::Metadata;
+    use crate::{Get, Metadata};
 
     use super::*;
 
@@ -165,6 +165,7 @@ mod test {
 
             working_set.add_decl(Box::new(ToText {}));
             working_set.add_decl(Box::new(Metadata {}));
+            working_set.add_decl(Box::new(Get {}));
 
             working_set.render()
         };
diff --git a/crates/nu-command/src/formats/to/tsv.rs b/crates/nu-command/src/formats/to/tsv.rs
index 1afe18ea48..c55428c5a0 100644
--- a/crates/nu-command/src/formats/to/tsv.rs
+++ b/crates/nu-command/src/formats/to/tsv.rs
@@ -102,7 +102,7 @@ fn to_tsv(
 mod test {
     use nu_cmd_lang::eval_pipeline_without_terminal_expression;
 
-    use crate::Metadata;
+    use crate::{Get, Metadata};
 
     use super::*;
 
@@ -123,6 +123,7 @@ mod test {
 
             working_set.add_decl(Box::new(ToTsv {}));
             working_set.add_decl(Box::new(Metadata {}));
+            working_set.add_decl(Box::new(Get {}));
 
             working_set.render()
         };
diff --git a/crates/nu-command/src/formats/to/xml.rs b/crates/nu-command/src/formats/to/xml.rs
index 0df986d082..77708aa375 100644
--- a/crates/nu-command/src/formats/to/xml.rs
+++ b/crates/nu-command/src/formats/to/xml.rs
@@ -514,7 +514,7 @@ impl Job {
 mod test {
     use nu_cmd_lang::eval_pipeline_without_terminal_expression;
 
-    use crate::Metadata;
+    use crate::{Get, Metadata};
 
     use super::*;
 
@@ -535,6 +535,7 @@ mod test {
 
             working_set.add_decl(Box::new(ToXml {}));
             working_set.add_decl(Box::new(Metadata {}));
+            working_set.add_decl(Box::new(Get {}));
 
             working_set.render()
         };
diff --git a/crates/nu-command/src/formats/to/yaml.rs b/crates/nu-command/src/formats/to/yaml.rs
index c5de035e42..73c743a056 100644
--- a/crates/nu-command/src/formats/to/yaml.rs
+++ b/crates/nu-command/src/formats/to/yaml.rs
@@ -125,7 +125,7 @@ fn to_yaml(input: PipelineData, head: Span) -> Result<PipelineData, ShellError>
 mod test {
     use nu_cmd_lang::eval_pipeline_without_terminal_expression;
 
-    use crate::Metadata;
+    use crate::{Get, Metadata};
 
     use super::*;
 
@@ -146,6 +146,7 @@ mod test {
 
             working_set.add_decl(Box::new(ToYaml {}));
             working_set.add_decl(Box::new(Metadata {}));
+            working_set.add_decl(Box::new(Get {}));
 
             working_set.render()
         };
diff --git a/crates/nu-protocol/src/engine/stack.rs b/crates/nu-protocol/src/engine/stack.rs
index 5819f1134b..854b338c1d 100644
--- a/crates/nu-protocol/src/engine/stack.rs
+++ b/crates/nu-protocol/src/engine/stack.rs
@@ -78,7 +78,7 @@ impl Stack {
             active_overlays: vec![DEFAULT_OVERLAY_NAME.to_string()],
             arguments: ArgumentStack::new(),
             error_handlers: ErrorHandlerStack::new(),
-            use_ir: false,
+            use_ir: true,
             recursion_count: 0,
             parent_stack: None,
             parent_deletions: vec![],
diff --git a/crates/nu-test-support/src/macros.rs b/crates/nu-test-support/src/macros.rs
index 3104c04e7d..2547b1f4c8 100644
--- a/crates/nu-test-support/src/macros.rs
+++ b/crates/nu-test-support/src/macros.rs
@@ -290,12 +290,12 @@ pub fn nu_run_test(opts: NuOpts, commands: impl AsRef<str>, with_std: bool) -> O
         .stdout(Stdio::piped())
         .stderr(Stdio::piped());
 
-    // Explicitly set NU_USE_IR
+    // Explicitly set NU_DISABLE_IR
     if let Some(use_ir) = opts.use_ir {
-        if use_ir {
-            command.env("NU_USE_IR", "1");
+        if !use_ir {
+            command.env("NU_DISABLE_IR", "1");
         } else {
-            command.env_remove("NU_USE_IR");
+            command.env_remove("NU_DISABLE_IR");
         }
     }
 
diff --git a/src/run.rs b/src/run.rs
index 89e70b8f0f..068a581b72 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -26,8 +26,8 @@ pub(crate) fn run_commands(
     let mut stack = Stack::new();
     let start_time = std::time::Instant::now();
 
-    if stack.has_env_var(engine_state, "NU_USE_IR") {
-        stack.use_ir = true;
+    if stack.has_env_var(engine_state, "NU_DISABLE_IR") {
+        stack.use_ir = false;
     }
 
     // if the --no-config-file(-n) option is NOT passed, load the plugin file,
@@ -115,8 +115,8 @@ pub(crate) fn run_file(
     trace!("run_file");
     let mut stack = Stack::new();
 
-    if stack.has_env_var(engine_state, "NU_USE_IR") {
-        stack.use_ir = true;
+    if stack.has_env_var(engine_state, "NU_DISABLE_IR") {
+        stack.use_ir = false;
     }
 
     // if the --no-config-file(-n) option is NOT passed, load the plugin file,
@@ -184,8 +184,8 @@ pub(crate) fn run_repl(
     let mut stack = Stack::new();
     let start_time = std::time::Instant::now();
 
-    if stack.has_env_var(engine_state, "NU_USE_IR") {
-        stack.use_ir = true;
+    if stack.has_env_var(engine_state, "NU_DISABLE_IR") {
+        stack.use_ir = false;
     }
 
     if parsed_nu_cli_args.no_config_file.is_none() {
diff --git a/src/test_bins.rs b/src/test_bins.rs
index c2ec287138..d5ae92ec60 100644
--- a/src/test_bins.rs
+++ b/src/test_bins.rs
@@ -244,9 +244,9 @@ pub fn nu_repl() {
     engine_state.add_env_var("PWD".into(), Value::test_string(cwd.to_string_lossy()));
     engine_state.add_env_var("PATH".into(), Value::test_string(""));
 
-    // Enable IR in tests if set
-    if std::env::var_os("NU_USE_IR").is_some() {
-        Arc::make_mut(&mut top_stack).use_ir = true;
+    // Disable IR in tests if set
+    if std::env::var_os("NU_DISABLE_IR").is_some() {
+        Arc::make_mut(&mut top_stack).use_ir = false;
     }
 
     let mut last_output = String::new();

From af77bc60e29a104b0a0d89f2c74369bdc9bd26a0 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Mon, 16 Sep 2024 16:07:13 -0700
Subject: [PATCH 0446/1072] Improved null handling when converting from nu ->
 dataframe. (#13855)

# Description
Fixes: #12726 and #13185

Previously converting columns that contained null caused polars to force
a dtype of object even when using a schema.

Now:
1. When using a schema, the type the schema defines for the column will
always be used.
2. When a schema is not used, the previous type is used when a value is
null.

# User-Facing Changes
- The type defined by the schema we be respected when passing in a null
value `[a]; [null] | polars into-df -s {a: str}` will create a df with
an str dtype column with one null value versus a column of type object.
- *BREAKING CHANGE* If you define a schema, all columns must be in the
schema.
---
 .../dataframe/command/aggregation/count.rs    |   5 +-
 .../values/nu_dataframe/conversion.rs         | 312 +++++++++++++++---
 2 files changed, 272 insertions(+), 45 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/command/aggregation/count.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/count.rs
index 8bf8163413..3b1b32952b 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/aggregation/count.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/count.rs
@@ -32,12 +32,9 @@ impl PluginCommand for ExprCount {
     }
 
     fn examples(&self) -> Vec<Example> {
-        // to add an example with a result that contains a null we will need to be able to
-        // allow null values to be entered into the dataframe from nushell
-        // and retain the correct dtype. Right now null values cause the dtype to be object
         vec![Example {
             description: "Count the number of non-null values in a column",
-            example: r#"[[a]; ["foo"] ["bar"]] | polars into-df 
+            example: r#"[[a]; ["foo"] ["bar"] [null]] | polars into-df 
                     | polars select (polars col a | polars count) 
                     | polars collect"#,
             result: Some(
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
index fe0a956129..2e988a08b3 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
@@ -71,8 +71,11 @@ pub struct Column {
 }
 
 impl Column {
-    pub fn new(name: String, values: Vec<Value>) -> Self {
-        Self { name, values }
+    pub fn new(name: impl Into<String>, values: Vec<Value>) -> Self {
+        Self {
+            name: name.into(),
+            values,
+        }
     }
 
     pub fn new_empty(name: String) -> Self {
@@ -149,7 +152,7 @@ pub fn create_column(
 ) -> Result<Column, ShellError> {
     let size = to_row - from_row;
     let values = series_to_values(series, Some(from_row), Some(size), span)?;
-    Ok(Column::new(series.name().into(), values))
+    Ok(Column::new(series.name(), values))
 }
 
 // Adds a separator to the vector of values using the column names from the
@@ -194,9 +197,25 @@ pub fn insert_value(
         Entry::Occupied(entry) => entry.into_mut(),
     };
 
+    // If we have a schema, use that for determining how things should be added to each column
+    if let Some(schema) = maybe_schema {
+        if let Some(field) = schema.schema.get_field(&key) {
+            col_val.column_type = Some(field.data_type().clone());
+            col_val.values.push(value);
+            Ok(())
+        } else {
+            Err(ShellError::GenericError {
+                error: format!("Schema does not contain column: {key}"),
+                msg: "".into(),
+                span: Some(value.span()),
+                help: None,
+                inner: vec![],
+            })
+        }
+    }
     // Checking that the type for the value is the same
     // for the previous value in the column
-    if col_val.values.is_empty() {
+    else if col_val.values.is_empty() {
         if let Some(schema) = maybe_schema {
             if let Some(field) = schema.schema.get_field(&key) {
                 col_val.column_type = Some(field.data_type().clone());
@@ -206,8 +225,8 @@ pub fn insert_value(
         if col_val.column_type.is_none() {
             col_val.column_type = Some(value_to_data_type(&value));
         }
-
         col_val.values.push(value);
+        Ok(())
     } else {
         let prev_value = &col_val.values[col_val.values.len() - 1];
 
@@ -219,6 +238,7 @@ pub fn insert_value(
             | (Value::Date { .. }, Value::Date { .. })
             | (Value::Filesize { .. }, Value::Filesize { .. })
             | (Value::Duration { .. }, Value::Duration { .. }) => col_val.values.push(value),
+            (_, Value::Nothing { .. }) => col_val.values.push(value),
             (Value::List { .. }, _) => {
                 col_val.column_type = Some(value_to_data_type(&value));
                 col_val.values.push(value);
@@ -228,9 +248,8 @@ pub fn insert_value(
                 col_val.values.push(value);
             }
         }
+        Ok(())
     }
-
-    Ok(())
 }
 
 fn value_to_data_type(value: &Value) -> DataType {
@@ -269,16 +288,18 @@ fn typed_column_to_series(name: &str, column: TypedColumn) -> Result<Series, She
                 let series_values: Result<Vec<_>, _> = column
                     .values
                     .iter()
-                    .map(|v| match v {
-                        Value::Float { val, .. } => Ok(*val as f32),
-                        Value::Int { val, .. } => Ok(*val as f32),
-                        x => Err(ShellError::GenericError {
-                            error: "Error converting to f32".into(),
-                            msg: "".into(),
-                            span: None,
-                            help: Some(format!("Unexpected type: {x:?}")),
-                            inner: vec![],
-                        }),
+                    .map(|v| {
+                        value_to_option(v, |v| match v {
+                            Value::Float { val, .. } => Ok(*val as f32),
+                            Value::Int { val, .. } => Ok(*val as f32),
+                            x => Err(ShellError::GenericError {
+                                error: "Error converting to f32".into(),
+                                msg: "".into(),
+                                span: None,
+                                help: Some(format!("Unexpected type: {x:?}")),
+                                inner: vec![],
+                            }),
+                        })
                     })
                     .collect();
                 Ok(Series::new(name, series_values?))
@@ -287,16 +308,18 @@ fn typed_column_to_series(name: &str, column: TypedColumn) -> Result<Series, She
                 let series_values: Result<Vec<_>, _> = column
                     .values
                     .iter()
-                    .map(|v| match v {
-                        Value::Float { val, .. } => Ok(*val),
-                        Value::Int { val, .. } => Ok(*val as f64),
-                        x => Err(ShellError::GenericError {
-                            error: "Error converting to f64".into(),
-                            msg: "".into(),
-                            span: None,
-                            help: Some(format!("Unexpected type: {x:?}")),
-                            inner: vec![],
-                        }),
+                    .map(|v| {
+                        value_to_option(v, |v| match v {
+                            Value::Float { val, .. } => Ok(*val),
+                            Value::Int { val, .. } => Ok(*val as f64),
+                            x => Err(ShellError::GenericError {
+                                error: "Error converting to f64".into(),
+                                msg: "".into(),
+                                span: None,
+                                help: Some(format!("Unexpected type: {x:?}")),
+                                inner: vec![],
+                            }),
+                        })
                     })
                     .collect();
                 Ok(Series::new(name, series_values?))
@@ -305,7 +328,7 @@ fn typed_column_to_series(name: &str, column: TypedColumn) -> Result<Series, She
                 let series_values: Result<Vec<_>, _> = column
                     .values
                     .iter()
-                    .map(|v| v.as_i64().map(|v| v as u8))
+                    .map(|v| value_to_option(v, |v| v.as_i64().map(|v| v as u8)))
                     .collect();
                 Ok(Series::new(name, series_values?))
             }
@@ -313,7 +336,7 @@ fn typed_column_to_series(name: &str, column: TypedColumn) -> Result<Series, She
                 let series_values: Result<Vec<_>, _> = column
                     .values
                     .iter()
-                    .map(|v| v.as_i64().map(|v| v as u16))
+                    .map(|v| value_to_option(v, |v| v.as_i64().map(|v| v as u16)))
                     .collect();
                 Ok(Series::new(name, series_values?))
             }
@@ -321,7 +344,7 @@ fn typed_column_to_series(name: &str, column: TypedColumn) -> Result<Series, She
                 let series_values: Result<Vec<_>, _> = column
                     .values
                     .iter()
-                    .map(|v| v.as_i64().map(|v| v as u32))
+                    .map(|v| value_to_option(v, |v| v.as_i64().map(|v| v as u32)))
                     .collect();
                 Ok(Series::new(name, series_values?))
             }
@@ -329,7 +352,7 @@ fn typed_column_to_series(name: &str, column: TypedColumn) -> Result<Series, She
                 let series_values: Result<Vec<_>, _> = column
                     .values
                     .iter()
-                    .map(|v| v.as_i64().map(|v| v as u64))
+                    .map(|v| value_to_option(v, |v| v.as_i64().map(|v| v as u64)))
                     .collect();
                 Ok(Series::new(name, series_values?))
             }
@@ -337,7 +360,7 @@ fn typed_column_to_series(name: &str, column: TypedColumn) -> Result<Series, She
                 let series_values: Result<Vec<_>, _> = column
                     .values
                     .iter()
-                    .map(|v| v.as_i64().map(|v| v as i8))
+                    .map(|v| value_to_option(v, |v| v.as_i64().map(|v| v as i8)))
                     .collect();
                 Ok(Series::new(name, series_values?))
             }
@@ -345,7 +368,7 @@ fn typed_column_to_series(name: &str, column: TypedColumn) -> Result<Series, She
                 let series_values: Result<Vec<_>, _> = column
                     .values
                     .iter()
-                    .map(|v| v.as_i64().map(|v| v as i16))
+                    .map(|v| value_to_option(v, |v| v.as_i64().map(|v| v as i16)))
                     .collect();
                 Ok(Series::new(name, series_values?))
             }
@@ -353,23 +376,32 @@ fn typed_column_to_series(name: &str, column: TypedColumn) -> Result<Series, She
                 let series_values: Result<Vec<_>, _> = column
                     .values
                     .iter()
-                    .map(|v| v.as_i64().map(|v| v as i32))
+                    .map(|v| value_to_option(v, |v| v.as_i64().map(|v| v as i32)))
                     .collect();
                 Ok(Series::new(name, series_values?))
             }
             DataType::Int64 => {
-                let series_values: Result<Vec<_>, _> =
-                    column.values.iter().map(|v| v.as_i64()).collect();
+                let series_values: Result<Vec<_>, _> = column
+                    .values
+                    .iter()
+                    .map(|v| value_to_option(v, |v| v.as_i64()))
+                    .collect();
                 Ok(Series::new(name, series_values?))
             }
             DataType::Boolean => {
-                let series_values: Result<Vec<_>, _> =
-                    column.values.iter().map(|v| v.as_bool()).collect();
+                let series_values: Result<Vec<_>, _> = column
+                    .values
+                    .iter()
+                    .map(|v| value_to_option(v, |v| v.as_bool()))
+                    .collect();
                 Ok(Series::new(name, series_values?))
             }
             DataType::String => {
-                let series_values: Result<Vec<_>, _> =
-                    column.values.iter().map(|v| v.coerce_string()).collect();
+                let series_values: Result<Vec<_>, _> = column
+                    .values
+                    .iter()
+                    .map(|v| value_to_option(v, |v| v.coerce_string()))
+                    .collect();
                 Ok(Series::new(name, series_values?))
             }
             DataType::Object(_, _) => value_to_series(name, &column.values),
@@ -377,7 +409,11 @@ fn typed_column_to_series(name: &str, column: TypedColumn) -> Result<Series, She
                 let series_values: Result<Vec<_>, _> = column
                     .values
                     .iter()
-                    .map(|v| v.as_i64().map(|v| nanos_from_timeunit(v, *time_unit)))
+                    .map(|v| {
+                        value_to_option(v, |v| {
+                            v.as_i64().map(|v| nanos_from_timeunit(v, *time_unit))
+                        })
+                    })
                     .collect();
                 Ok(Series::new(name, series_values?))
             }
@@ -1241,6 +1277,17 @@ fn time_from_midnight(nanos: i64, span: Span) -> Result<Value, ShellError> {
         })
 }
 
+fn value_to_option<T, F>(value: &Value, func: F) -> Result<Option<T>, ShellError>
+where
+    F: FnOnce(&Value) -> Result<T, ShellError>,
+{
+    if value.is_nothing() {
+        Ok(None)
+    } else {
+        func(value).map(|v| Some(v))
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use indexmap::indexmap;
@@ -1461,4 +1508,187 @@ mod tests {
 
         Ok(())
     }
+
+    #[test]
+    fn test_typed_column_to_series_f32() -> Result<(), Box<dyn std::error::Error>> {
+        let column = TypedColumn {
+            column: Column::new(
+                "foo",
+                vec![
+                    Value::test_float(1.1),
+                    Value::test_int(2),
+                    Value::test_nothing(),
+                ],
+            ),
+            column_type: Some(DataType::Float32),
+        };
+
+        let result = typed_column_to_series("foo", column)?;
+
+        assert_eq!(result, Series::new("name", [Some(1.1f32), Some(2.0), None]));
+        Ok(())
+    }
+
+    #[test]
+    fn test_typed_column_to_series_f64() -> Result<(), Box<dyn std::error::Error>> {
+        let column = TypedColumn {
+            column: Column::new(
+                "foo",
+                vec![
+                    Value::test_float(1.1),
+                    Value::test_int(2),
+                    Value::test_nothing(),
+                ],
+            ),
+            column_type: Some(DataType::Float64),
+        };
+
+        let result = typed_column_to_series("foo", column)?;
+
+        assert_eq!(result, Series::new("name", [Some(1.1f64), Some(2.0), None]));
+        Ok(())
+    }
+
+    #[test]
+    fn test_typed_column_to_series_u8() -> Result<(), Box<dyn std::error::Error>> {
+        let column = TypedColumn {
+            column: Column::new("foo", vec![Value::test_int(1), Value::test_nothing()]),
+            column_type: Some(DataType::UInt8),
+        };
+
+        let result = typed_column_to_series("foo", column)?;
+
+        assert_eq!(result, Series::new("name", [Some(1u8), None]));
+        Ok(())
+    }
+
+    #[test]
+    fn test_typed_column_to_series_u16() -> Result<(), Box<dyn std::error::Error>> {
+        let column = TypedColumn {
+            column: Column::new("foo", vec![Value::test_int(1), Value::test_nothing()]),
+            column_type: Some(DataType::UInt16),
+        };
+
+        let result = typed_column_to_series("foo", column)?;
+
+        assert_eq!(result, Series::new("name", [Some(1u16), None]));
+        Ok(())
+    }
+
+    #[test]
+    fn test_typed_column_to_series_u32() -> Result<(), Box<dyn std::error::Error>> {
+        let column = TypedColumn {
+            column: Column::new("foo", vec![Value::test_int(1), Value::test_nothing()]),
+            column_type: Some(DataType::UInt32),
+        };
+
+        let result = typed_column_to_series("foo", column)?;
+
+        assert_eq!(result, Series::new("name", [Some(1u32), None]));
+        Ok(())
+    }
+
+    #[test]
+    fn test_typed_column_to_series_u64() -> Result<(), Box<dyn std::error::Error>> {
+        let column = TypedColumn {
+            column: Column::new("foo", vec![Value::test_int(1), Value::test_nothing()]),
+            column_type: Some(DataType::UInt64),
+        };
+
+        let result = typed_column_to_series("foo", column)?;
+
+        assert_eq!(result, Series::new("name", [Some(1u64), None]));
+        Ok(())
+    }
+
+    #[test]
+    fn test_typed_column_to_series_i8() -> Result<(), Box<dyn std::error::Error>> {
+        let column = TypedColumn {
+            column: Column::new("foo", vec![Value::test_int(1), Value::test_nothing()]),
+            column_type: Some(DataType::Int8),
+        };
+
+        let result = typed_column_to_series("foo", column)?;
+
+        assert_eq!(result, Series::new("name", [Some(1i8), None]));
+        Ok(())
+    }
+
+    #[test]
+    fn test_typed_column_to_series_i16() -> Result<(), Box<dyn std::error::Error>> {
+        let column = TypedColumn {
+            column: Column::new("foo", vec![Value::test_int(1), Value::test_nothing()]),
+            column_type: Some(DataType::Int16),
+        };
+
+        let result = typed_column_to_series("foo", column)?;
+
+        assert_eq!(result, Series::new("name", [Some(1i16), None]));
+        Ok(())
+    }
+
+    #[test]
+    fn test_typed_column_to_series_i32() -> Result<(), Box<dyn std::error::Error>> {
+        let column = TypedColumn {
+            column: Column::new("foo", vec![Value::test_int(1), Value::test_nothing()]),
+            column_type: Some(DataType::Int32),
+        };
+
+        let result = typed_column_to_series("foo", column)?;
+
+        assert_eq!(result, Series::new("name", [Some(1i32), None]));
+        Ok(())
+    }
+
+    #[test]
+    fn test_typed_column_to_series_i64() -> Result<(), Box<dyn std::error::Error>> {
+        let column = TypedColumn {
+            column: Column::new("foo", vec![Value::test_int(1), Value::test_nothing()]),
+            column_type: Some(DataType::Int64),
+        };
+
+        let result = typed_column_to_series("foo", column)?;
+
+        assert_eq!(result, Series::new("name", [Some(1i64), None]));
+        Ok(())
+    }
+
+    #[test]
+    fn test_typed_column_to_series_bool() -> Result<(), Box<dyn std::error::Error>> {
+        let column = TypedColumn {
+            column: Column::new(
+                "foo",
+                vec![
+                    Value::test_bool(true),
+                    Value::test_bool(false),
+                    Value::test_nothing(),
+                ],
+            ),
+            column_type: Some(DataType::Boolean),
+        };
+
+        let result = typed_column_to_series("foo", column)?;
+
+        assert_eq!(result, Series::new("name", [Some(true), Some(false), None]));
+        Ok(())
+    }
+
+    #[test]
+    fn test_typed_column_to_series_string() -> Result<(), Box<dyn std::error::Error>> {
+        let column = TypedColumn {
+            column: Column::new(
+                "foo",
+                vec![Value::test_string("barbaz"), Value::test_nothing()],
+            ),
+            column_type: Some(DataType::String),
+        };
+
+        let result = typed_column_to_series("foo", column)?;
+
+        assert_eq!(
+            result,
+            Series::new("name", [Some("barbaz".to_string()), None])
+        );
+        Ok(())
+    }
 }

From 6e1e824473e15eba246e1c43704c5d88fa237a17 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Wed, 18 Sep 2024 00:48:46 -0700
Subject: [PATCH 0447/1072] Bump version to `0.98.0` (#13865)

---
 Cargo.lock                                    | 79 ++++++++++---------
 Cargo.toml                                    | 44 +++++------
 crates/nu-cli/Cargo.toml                      | 26 +++---
 crates/nu-cmd-base/Cargo.toml                 | 12 +--
 crates/nu-cmd-extra/Cargo.toml                | 22 +++---
 crates/nu-cmd-lang/Cargo.toml                 | 12 +--
 crates/nu-cmd-plugin/Cargo.toml               | 12 +--
 crates/nu-color-config/Cargo.toml             | 10 +--
 crates/nu-command/Cargo.toml                  | 36 ++++-----
 crates/nu-derive-value/Cargo.toml             |  4 +-
 crates/nu-engine/Cargo.toml                   | 12 +--
 crates/nu-explore/Cargo.toml                  | 20 ++---
 crates/nu-glob/Cargo.toml                     |  4 +-
 crates/nu-json/Cargo.toml                     |  8 +-
 crates/nu-lsp/Cargo.toml                      | 16 ++--
 crates/nu-parser/Cargo.toml                   | 12 +--
 crates/nu-path/Cargo.toml                     |  4 +-
 crates/nu-plugin-core/Cargo.toml              |  8 +-
 crates/nu-plugin-engine/Cargo.toml            | 16 ++--
 crates/nu-plugin-protocol/Cargo.toml          |  8 +-
 crates/nu-plugin-test-support/Cargo.toml      | 20 ++---
 crates/nu-plugin/Cargo.toml                   | 14 ++--
 crates/nu-pretty-hex/Cargo.toml               |  4 +-
 crates/nu-protocol/Cargo.toml                 | 14 ++--
 crates/nu-std/Cargo.toml                      | 10 +--
 crates/nu-system/Cargo.toml                   |  4 +-
 crates/nu-table/Cargo.toml                    | 12 +--
 crates/nu-term-grid/Cargo.toml                |  6 +-
 crates/nu-test-support/Cargo.toml             | 10 +--
 crates/nu-utils/Cargo.toml                    |  4 +-
 .../src/sample_config/default_config.nu       |  4 +-
 .../nu-utils/src/sample_config/default_env.nu |  2 +-
 crates/nu_plugin_custom_values/Cargo.toml     |  6 +-
 crates/nu_plugin_example/Cargo.toml           | 10 +--
 crates/nu_plugin_formats/Cargo.toml           |  8 +-
 crates/nu_plugin_gstat/Cargo.toml             |  6 +-
 crates/nu_plugin_inc/Cargo.toml               |  6 +-
 .../nu_plugin_nu_example.nu                   |  2 +-
 crates/nu_plugin_polars/Cargo.toml            | 22 +++---
 .../nu_plugin_python_example.py               |  2 +-
 crates/nu_plugin_query/Cargo.toml             |  6 +-
 crates/nu_plugin_stress_internals/Cargo.toml  |  2 +-
 crates/nuon/Cargo.toml                        | 10 +--
 43 files changed, 275 insertions(+), 274 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 098e7ffd9d..10b0ddfbd8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2938,7 +2938,7 @@ dependencies = [
 
 [[package]]
 name = "nu"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "assert_cmd",
  "crossterm 0.28.1",
@@ -2993,7 +2993,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cli"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "chrono",
  "crossterm 0.28.1",
@@ -3028,7 +3028,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-base"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "indexmap",
  "miette",
@@ -3040,7 +3040,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-extra"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "fancy-regex",
  "heck",
@@ -3065,7 +3065,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-lang"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "itertools 0.13.0",
  "nu-engine",
@@ -3077,7 +3077,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-plugin"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "itertools 0.13.0",
  "nu-engine",
@@ -3088,7 +3088,7 @@ dependencies = [
 
 [[package]]
 name = "nu-color-config"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "nu-ansi-term",
  "nu-engine",
@@ -3100,7 +3100,7 @@ dependencies = [
 
 [[package]]
 name = "nu-command"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "alphanumeric-sort",
  "base64 0.22.1",
@@ -3210,7 +3210,7 @@ dependencies = [
 
 [[package]]
 name = "nu-derive-value"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -3221,7 +3221,7 @@ dependencies = [
 
 [[package]]
 name = "nu-engine"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "log",
  "nu-glob",
@@ -3233,7 +3233,7 @@ dependencies = [
 
 [[package]]
 name = "nu-explore"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "ansi-str",
  "anyhow",
@@ -3258,14 +3258,14 @@ dependencies = [
 
 [[package]]
 name = "nu-glob"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "doc-comment",
 ]
 
 [[package]]
 name = "nu-json"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "fancy-regex",
  "linked-hash-map",
@@ -3278,7 +3278,7 @@ dependencies = [
 
 [[package]]
 name = "nu-lsp"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "assert-json-diff",
  "crossbeam-channel",
@@ -3299,7 +3299,7 @@ dependencies = [
 
 [[package]]
 name = "nu-parser"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "bytesize",
  "chrono",
@@ -3315,7 +3315,7 @@ dependencies = [
 
 [[package]]
 name = "nu-path"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "dirs",
  "omnipath",
@@ -3324,7 +3324,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "log",
  "nix 0.29.0",
@@ -3340,7 +3340,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-core"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "interprocess",
  "log",
@@ -3354,7 +3354,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-engine"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "log",
  "nu-engine",
@@ -3370,7 +3370,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-protocol"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "nu-protocol",
  "nu-utils",
@@ -3382,7 +3382,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-test-support"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "nu-ansi-term",
  "nu-cmd-lang",
@@ -3400,7 +3400,7 @@ dependencies = [
 
 [[package]]
 name = "nu-pretty-hex"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "heapless",
  "nu-ansi-term",
@@ -3409,7 +3409,7 @@ dependencies = [
 
 [[package]]
 name = "nu-protocol"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "brotli",
  "byte-unit",
@@ -3447,7 +3447,7 @@ dependencies = [
 
 [[package]]
 name = "nu-std"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "log",
  "miette",
@@ -3458,7 +3458,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "chrono",
  "itertools 0.13.0",
@@ -3476,7 +3476,7 @@ dependencies = [
 
 [[package]]
 name = "nu-table"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "fancy-regex",
  "nu-ansi-term",
@@ -3490,7 +3490,7 @@ dependencies = [
 
 [[package]]
 name = "nu-term-grid"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "nu-utils",
  "unicode-width",
@@ -3498,7 +3498,7 @@ dependencies = [
 
 [[package]]
 name = "nu-test-support"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -3510,7 +3510,7 @@ dependencies = [
 
 [[package]]
 name = "nu-utils"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "crossterm_winapi",
  "log",
@@ -3536,7 +3536,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_example"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "nu-cmd-lang",
  "nu-plugin",
@@ -3546,7 +3546,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_formats"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "chrono",
  "eml-parser",
@@ -3561,7 +3561,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_gstat"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "git2",
  "nu-plugin",
@@ -3570,7 +3570,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_inc"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -3579,7 +3579,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_polars"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "chrono",
  "chrono-tz 0.9.0",
@@ -3613,7 +3613,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_query"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "gjson",
  "nu-plugin",
@@ -3628,7 +3628,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_stress_internals"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "interprocess",
  "serde",
@@ -3742,7 +3742,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "nuon"
-version = "0.97.2"
+version = "0.98.0"
 dependencies = [
  "chrono",
  "fancy-regex",
@@ -5135,8 +5135,9 @@ dependencies = [
 
 [[package]]
 name = "reedline"
-version = "0.34.0"
-source = "git+https://github.com/nushell/reedline?branch=main#7af89595377fa59d2a6a2333718d60adf61c86b1"
+version = "0.35.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5289de810296f8f2ff58d35544d92ae98d0a631453388bc3e608086be0fa596"
 dependencies = [
  "arboard",
  "chrono",
diff --git a/Cargo.toml b/Cargo.toml
index 8668332f78..a5372d5b32 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
 rust-version = "1.79.0"
-version = "0.97.2"
+version = "0.98.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -137,7 +137,7 @@ rand = "0.8"
 rand_chacha = "0.3.1"
 ratatui = "0.26"
 rayon = "1.10"
-reedline = "0.34.0"
+reedline = "0.35.0"
 regex = "1.9.5"
 rmp = "0.8"
 rmp-serde = "1.3"
@@ -189,22 +189,22 @@ unchecked_duration_subtraction = "warn"
 workspace = true
 
 [dependencies]
-nu-cli = { path = "./crates/nu-cli", version = "0.97.2" }
-nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.97.2" }
-nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.97.2" }
-nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.97.2", optional = true }
-nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.97.2" }
-nu-command = { path = "./crates/nu-command", version = "0.97.2" }
-nu-engine = { path = "./crates/nu-engine", version = "0.97.2" }
-nu-explore = { path = "./crates/nu-explore", version = "0.97.2" }
-nu-lsp = { path = "./crates/nu-lsp/", version = "0.97.2" }
-nu-parser = { path = "./crates/nu-parser", version = "0.97.2" }
-nu-path = { path = "./crates/nu-path", version = "0.97.2" }
-nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.97.2" }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.97.2" }
-nu-std = { path = "./crates/nu-std", version = "0.97.2" }
-nu-system = { path = "./crates/nu-system", version = "0.97.2" }
-nu-utils = { path = "./crates/nu-utils", version = "0.97.2" }
+nu-cli = { path = "./crates/nu-cli", version = "0.98.0" }
+nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.98.0" }
+nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.98.0" }
+nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.98.0", optional = true }
+nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.98.0" }
+nu-command = { path = "./crates/nu-command", version = "0.98.0" }
+nu-engine = { path = "./crates/nu-engine", version = "0.98.0" }
+nu-explore = { path = "./crates/nu-explore", version = "0.98.0" }
+nu-lsp = { path = "./crates/nu-lsp/", version = "0.98.0" }
+nu-parser = { path = "./crates/nu-parser", version = "0.98.0" }
+nu-path = { path = "./crates/nu-path", version = "0.98.0" }
+nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.98.0" }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.98.0" }
+nu-std = { path = "./crates/nu-std", version = "0.98.0" }
+nu-system = { path = "./crates/nu-system", version = "0.98.0" }
+nu-utils = { path = "./crates/nu-utils", version = "0.98.0" }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
 crossterm = { workspace = true }
@@ -234,9 +234,9 @@ nix = { workspace = true, default-features = false, features = [
 ] }
 
 [dev-dependencies]
-nu-test-support = { path = "./crates/nu-test-support", version = "0.97.2" }
-nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.97.2" }
-nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.97.2" }
+nu-test-support = { path = "./crates/nu-test-support", version = "0.98.0" }
+nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.98.0" }
+nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.98.0" }
 assert_cmd = "2.0"
 dirs = { workspace = true }
 tango-bench = "0.5"
@@ -313,7 +313,7 @@ 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`
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 2e357b0932..c3d040449c 100644
--- 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.97.2"
+version = "0.98.0"
 
 [lib]
 bench = false
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.2" }
-nu-command = { path = "../nu-command", version = "0.97.2" }
-nu-test-support = { path = "../nu-test-support", version = "0.97.2" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.0" }
+nu-command = { path = "../nu-command", version = "0.98.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.98.0" }
 rstest = { workspace = true, default-features = false }
 tempfile = { workspace = true }
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.97.2" }
-nu-engine = { path = "../nu-engine", version = "0.97.2" }
-nu-path = { path = "../nu-path", version = "0.97.2" }
-nu-parser = { path = "../nu-parser", version = "0.97.2" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.97.2", optional = true }
-nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
-nu-utils = { path = "../nu-utils", version = "0.97.2" }
-nu-color-config = { path = "../nu-color-config", version = "0.97.2" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.98.0" }
+nu-engine = { path = "../nu-engine", version = "0.98.0" }
+nu-path = { path = "../nu-path", version = "0.98.0" }
+nu-parser = { path = "../nu-parser", version = "0.98.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.98.0", optional = true }
+nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
+nu-utils = { path = "../nu-utils", version = "0.98.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.98.0" }
 nu-ansi-term = { workspace = true }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
@@ -49,4 +49,4 @@ plugin = ["nu-plugin-engine"]
 system-clipboard = ["reedline/system_clipboard"]
 
 [lints]
-workspace = true
+workspace = true
\ No newline at end of file
diff --git a/crates/nu-cmd-base/Cargo.toml b/crates/nu-cmd-base/Cargo.toml
index afc75c336d..f9396a1548 100644
--- a/crates/nu-cmd-base/Cargo.toml
+++ b/crates/nu-cmd-base/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-base"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-base"
-version = "0.97.2"
+version = "0.98.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,12 +13,12 @@ version = "0.97.2"
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.97.2" }
-nu-parser = { path = "../nu-parser", version = "0.97.2" }
-nu-path = { path = "../nu-path", version = "0.97.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
+nu-engine = { path = "../nu-engine", version = "0.98.0" }
+nu-parser = { path = "../nu-parser", version = "0.98.0" }
+nu-path = { path = "../nu-path", version = "0.98.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
 
 indexmap = { workspace = true }
 miette = { workspace = true }
 
-[dev-dependencies]
+[dev-dependencies]
\ No newline at end of file
diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml
index bc5a2343b5..735142c92a 100644
--- 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.97.2"
+version = "0.98.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,13 +16,13 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.97.2" }
-nu-engine = { path = "../nu-engine", version = "0.97.2" }
-nu-json = { version = "0.97.2", path = "../nu-json" }
-nu-parser = { path = "../nu-parser", version = "0.97.2" }
-nu-pretty-hex = { version = "0.97.2", path = "../nu-pretty-hex" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
-nu-utils = { path = "../nu-utils", version = "0.97.2" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.98.0" }
+nu-engine = { path = "../nu-engine", version = "0.98.0" }
+nu-json = { version = "0.98.0", path = "../nu-json" }
+nu-parser = { path = "../nu-parser", version = "0.98.0" }
+nu-pretty-hex = { version = "0.98.0", path = "../nu-pretty-hex" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
+nu-utils = { path = "../nu-utils", version = "0.98.0" }
 
 # Potential dependencies for extras
 heck = { workspace = true }
@@ -36,6 +36,6 @@ v_htmlescape = { workspace = true }
 itertools = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.2" }
-nu-command = { path = "../nu-command", version = "0.97.2" }
-nu-test-support = { path = "../nu-test-support", version = "0.97.2" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.0" }
+nu-command = { path = "../nu-command", version = "0.98.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.98.0" }
\ No newline at end of file
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index fa1b9a54af..2aa43bdda4 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -6,7 +6,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-lang"
 edition = "2021"
 license = "MIT"
 name = "nu-cmd-lang"
-version = "0.97.2"
+version = "0.98.0"
 
 [lib]
 bench = false
@@ -15,10 +15,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.97.2" }
-nu-parser = { path = "../nu-parser", version = "0.97.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
-nu-utils = { path = "../nu-utils", version = "0.97.2" }
+nu-engine = { path = "../nu-engine", version = "0.98.0" }
+nu-parser = { path = "../nu-parser", version = "0.98.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
+nu-utils = { path = "../nu-utils", version = "0.98.0" }
 
 itertools = { workspace = true }
 shadow-rs = { version = "0.34", default-features = false }
@@ -31,4 +31,4 @@ mimalloc = []
 trash-support = []
 sqlite = []
 static-link-openssl = []
-system-clipboard = []
+system-clipboard = []
\ No newline at end of file
diff --git a/crates/nu-cmd-plugin/Cargo.toml b/crates/nu-cmd-plugin/Cargo.toml
index 6442e97879..a6feefb0aa 100644
--- a/crates/nu-cmd-plugin/Cargo.toml
+++ b/crates/nu-cmd-plugin/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-plugin"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-plugin"
-version = "0.97.2"
+version = "0.98.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,11 +13,11 @@ version = "0.97.2"
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.97.2" }
-nu-path = { path = "../nu-path", version = "0.97.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.2", features = ["plugin"] }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.97.2" }
+nu-engine = { path = "../nu-engine", version = "0.98.0" }
+nu-path = { path = "../nu-path", version = "0.98.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.0", features = ["plugin"] }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.98.0" }
 
 itertools = { workspace = true }
 
-[dev-dependencies]
+[dev-dependencies]
\ No newline at end of file
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index 3a7dce1b2b..423c1daa42 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-color-confi
 edition = "2021"
 license = "MIT"
 name = "nu-color-config"
-version = "0.97.2"
+version = "0.98.0"
 
 [lib]
 bench = false
@@ -14,12 +14,12 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
-nu-engine = { path = "../nu-engine", version = "0.97.2" }
-nu-json = { path = "../nu-json", version = "0.97.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
+nu-engine = { path = "../nu-engine", version = "0.98.0" }
+nu-json = { path = "../nu-json", version = "0.98.0" }
 nu-ansi-term = { workspace = true }
 
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.97.2" }
+nu-test-support = { path = "../nu-test-support", version = "0.98.0" }
\ No newline at end of file
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 837991cf5d..ff6bda6767 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-command"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
-version = "0.97.2"
+version = "0.98.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,21 +16,21 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.97.2" }
-nu-color-config = { path = "../nu-color-config", version = "0.97.2" }
-nu-engine = { path = "../nu-engine", version = "0.97.2" }
-nu-glob = { path = "../nu-glob", version = "0.97.2" }
-nu-json = { path = "../nu-json", version = "0.97.2" }
-nu-parser = { path = "../nu-parser", version = "0.97.2" }
-nu-path = { path = "../nu-path", version = "0.97.2" }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.97.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
-nu-system = { path = "../nu-system", version = "0.97.2" }
-nu-table = { path = "../nu-table", version = "0.97.2" }
-nu-term-grid = { path = "../nu-term-grid", version = "0.97.2" }
-nu-utils = { path = "../nu-utils", version = "0.97.2" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.98.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.98.0" }
+nu-engine = { path = "../nu-engine", version = "0.98.0" }
+nu-glob = { path = "../nu-glob", version = "0.98.0" }
+nu-json = { path = "../nu-json", version = "0.98.0" }
+nu-parser = { path = "../nu-parser", version = "0.98.0" }
+nu-path = { path = "../nu-path", version = "0.98.0" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.98.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
+nu-system = { path = "../nu-system", version = "0.98.0" }
+nu-table = { path = "../nu-table", version = "0.98.0" }
+nu-term-grid = { path = "../nu-term-grid", version = "0.98.0" }
+nu-utils = { path = "../nu-utils", version = "0.98.0" }
 nu-ansi-term = { workspace = true }
-nuon = { path = "../nuon", version = "0.97.2" }
+nuon = { path = "../nuon", version = "0.98.0" }
 
 alphanumeric-sort = { workspace = true }
 base64 = { workspace = true }
@@ -139,8 +139,8 @@ sqlite = ["rusqlite"]
 trash-support = ["trash"]
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.2" }
-nu-test-support = { path = "../nu-test-support", version = "0.97.2" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.98.0" }
 
 dirs = { workspace = true }
 mockito = { workspace = true, default-features = false }
@@ -149,4 +149,4 @@ quickcheck_macros = { workspace = true }
 rstest = { workspace = true, default-features = false }
 pretty_assertions = { workspace = true }
 tempfile = { workspace = true }
-rand_chacha = { workspace = true }
+rand_chacha = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-derive-value/Cargo.toml b/crates/nu-derive-value/Cargo.toml
index 01ab5138b7..c453c2dc05 100644
--- a/crates/nu-derive-value/Cargo.toml
+++ b/crates/nu-derive-value/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-derive-value"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-derive-value"
-version = "0.97.2"
+version = "0.98.0"
 
 [lib]
 proc-macro = true
@@ -21,4 +21,4 @@ proc-macro2 = { workspace = true }
 syn = { workspace = true }
 quote = { workspace = true }
 proc-macro-error = { workspace = true }
-heck = { workspace = true }
+heck = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index 04db74a14a..767a83bbd0 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-engine"
 edition = "2021"
 license = "MIT"
 name = "nu-engine"
-version = "0.97.2"
+version = "0.98.0"
 
 [lib]
 bench = false
@@ -14,12 +14,12 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.97.2" }
-nu-path = { path = "../nu-path", version = "0.97.2" }
-nu-glob = { path = "../nu-glob", version = "0.97.2" }
-nu-utils = { path = "../nu-utils", version = "0.97.2" }
+nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.98.0" }
+nu-path = { path = "../nu-path", version = "0.98.0" }
+nu-glob = { path = "../nu-glob", version = "0.98.0" }
+nu-utils = { path = "../nu-utils", version = "0.98.0" }
 log = { workspace = true }
 terminal_size = { workspace = true }
 
 [features]
-plugin = []
+plugin = []
\ No newline at end of file
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index ad699c4bad..bbbe5e24fc 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-explore"
 edition = "2021"
 license = "MIT"
 name = "nu-explore"
-version = "0.97.2"
+version = "0.98.0"
 
 [lib]
 bench = false
@@ -14,15 +14,15 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
-nu-parser = { path = "../nu-parser", version = "0.97.2" }
-nu-color-config = { path = "../nu-color-config", version = "0.97.2" }
-nu-engine = { path = "../nu-engine", version = "0.97.2" }
-nu-table = { path = "../nu-table", version = "0.97.2" }
-nu-json = { path = "../nu-json", version = "0.97.2" }
-nu-utils = { path = "../nu-utils", version = "0.97.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
+nu-parser = { path = "../nu-parser", version = "0.98.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.98.0" }
+nu-engine = { path = "../nu-engine", version = "0.98.0" }
+nu-table = { path = "../nu-table", version = "0.98.0" }
+nu-json = { path = "../nu-json", version = "0.98.0" }
+nu-utils = { path = "../nu-utils", version = "0.98.0" }
 nu-ansi-term = { workspace = true }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.97.2" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.98.0" }
 
 anyhow = { workspace = true }
 log = { workspace = true }
@@ -35,4 +35,4 @@ ansi-str = { workspace = true }
 unicode-width = { workspace = true }
 lscolors = { workspace = true, default-features = false, features = [
   "nu-ansi-term",
-] }
+] }
\ No newline at end of file
diff --git a/crates/nu-glob/Cargo.toml b/crates/nu-glob/Cargo.toml
index 299e72eec5..90b5428ac5 100644
--- a/crates/nu-glob/Cargo.toml
+++ b/crates/nu-glob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-glob"
-version = "0.97.2"
+version = "0.98.0"
 authors = ["The Nushell Project Developers", "The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 description = """
@@ -17,4 +17,4 @@ bench = false
 doc-comment = "0.3"
 
 [lints]
-workspace = true
+workspace = true
\ No newline at end of file
diff --git a/crates/nu-json/Cargo.toml b/crates/nu-json/Cargo.toml
index 2c7d8545fb..1c36c1ba6e 100644
--- a/crates/nu-json/Cargo.toml
+++ b/crates/nu-json/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-json"
 edition = "2021"
 license = "MIT"
 name = "nu-json"
-version = "0.97.2"
+version = "0.98.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -26,10 +26,10 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.97.2" }
-nu-path = { path = "../nu-path", version = "0.97.2" }
+nu-test-support = { path = "../nu-test-support", version = "0.98.0" }
+nu-path = { path = "../nu-path", version = "0.98.0" }
 serde_json = "1.0"
 fancy-regex = "0.13.0"
 
 [lints]
-workspace = true
+workspace = true
\ No newline at end of file
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index b72bce9d03..0d2e4df9c9 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -3,14 +3,14 @@ authors = ["The Nushell Project Developers"]
 description = "Nushell's integrated LSP server"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-lsp"
 name = "nu-lsp"
-version = "0.97.2"
+version = "0.98.0"
 edition = "2021"
 license = "MIT"
 
 [dependencies]
-nu-cli = { path = "../nu-cli", version = "0.97.2" }
-nu-parser = { path = "../nu-parser", version = "0.97.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
+nu-cli = { path = "../nu-cli", version = "0.98.0" }
+nu-parser = { path = "../nu-parser", version = "0.98.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
 
 reedline = { workspace = true }
 
@@ -23,11 +23,11 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.2" }
-nu-command = { path = "../nu-command", version = "0.97.2" }
-nu-test-support = { path = "../nu-test-support", version = "0.97.2" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.0" }
+nu-command = { path = "../nu-command", version = "0.98.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.98.0" }
 
 assert-json-diff = "2.0"
 
 [lints]
-workspace = true
+workspace = true
\ No newline at end of file
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index 8f5145ed42..96a5cbd854 100644
--- a/crates/nu-parser/Cargo.toml
+++ b/crates/nu-parser/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-parser"
 edition = "2021"
 license = "MIT"
 name = "nu-parser"
-version = "0.97.2"
+version = "0.98.0"
 exclude = ["/fuzz"]
 
 [lib]
@@ -15,10 +15,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.97.2" }
-nu-path = { path = "../nu-path", version = "0.97.2" }
-nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.97.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
+nu-engine = { path = "../nu-engine", version = "0.98.0" }
+nu-path = { path = "../nu-path", version = "0.98.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.98.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
 
 bytesize = { workspace = true }
 chrono = { default-features = false, features = ['std'], workspace = true }
@@ -30,4 +30,4 @@ serde_json = { workspace = true }
 rstest = { workspace = true, default-features = false }
 
 [features]
-plugin = ["nu-plugin-engine"]
+plugin = ["nu-plugin-engine"]
\ No newline at end of file
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index 7b68488986..38fb81ff8b 100644
--- a/crates/nu-path/Cargo.toml
+++ b/crates/nu-path/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-path"
 edition = "2021"
 license = "MIT"
 name = "nu-path"
-version = "0.97.2"
+version = "0.98.0"
 exclude = ["/fuzz"]
 
 [lib]
@@ -21,4 +21,4 @@ omnipath = { workspace = true }
 pwd = { workspace = true }
 
 [lints]
-workspace = true
+workspace = true
\ No newline at end of file
diff --git a/crates/nu-plugin-core/Cargo.toml b/crates/nu-plugin-core/Cargo.toml
index ca4b63dc32..91f567c412 100644
--- a/crates/nu-plugin-core/Cargo.toml
+++ b/crates/nu-plugin-core/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-core
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-core"
-version = "0.97.2"
+version = "0.98.0"
 
 [lib]
 bench = false
@@ -14,8 +14,8 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.97.2", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.98.0", default-features = false }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true }
@@ -28,4 +28,4 @@ default = ["local-socket"]
 local-socket = ["interprocess", "nu-plugin-protocol/local-socket"]
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows = { workspace = true }
+windows = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-plugin-engine/Cargo.toml b/crates/nu-plugin-engine/Cargo.toml
index 3e16927a75..9a344121ae 100644
--- a/crates/nu-plugin-engine/Cargo.toml
+++ b/crates/nu-plugin-engine/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-engi
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-engine"
-version = "0.97.2"
+version = "0.98.0"
 
 [lib]
 bench = false
@@ -14,12 +14,12 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.97.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
-nu-system = { path = "../nu-system", version = "0.97.2" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.97.2" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.97.2", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.97.2" }
+nu-engine = { path = "../nu-engine", version = "0.98.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
+nu-system = { path = "../nu-system", version = "0.98.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.98.0" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.98.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.98.0" }
 
 serde = { workspace = true }
 log = { workspace = true }
@@ -35,4 +35,4 @@ local-socket = ["nu-plugin-core/local-socket"]
 windows = { workspace = true, features = [
   # For setting process creation flags
   "Win32_System_Threading",
-] }
+] }
\ No newline at end of file
diff --git a/crates/nu-plugin-protocol/Cargo.toml b/crates/nu-plugin-protocol/Cargo.toml
index 1d8aab6a1a..3fb8147533 100644
--- a/crates/nu-plugin-protocol/Cargo.toml
+++ b/crates/nu-plugin-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-prot
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-protocol"
-version = "0.97.2"
+version = "0.98.0"
 
 [lib]
 bench = false
@@ -14,8 +14,8 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.97.2", features = ["plugin"] }
-nu-utils = { path = "../nu-utils", version = "0.97.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.0", features = ["plugin"] }
+nu-utils = { path = "../nu-utils", version = "0.98.0" }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
@@ -24,4 +24,4 @@ typetag = "0.2"
 
 [features]
 default = ["local-socket"]
-local-socket = []
+local-socket = []
\ No newline at end of file
diff --git a/crates/nu-plugin-test-support/Cargo.toml b/crates/nu-plugin-test-support/Cargo.toml
index 9234bee18c..901e4ddd35 100644
--- a/crates/nu-plugin-test-support/Cargo.toml
+++ b/crates/nu-plugin-test-support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-plugin-test-support"
-version = "0.97.2"
+version = "0.98.0"
 edition = "2021"
 license = "MIT"
 description = "Testing support for Nushell plugins"
@@ -15,17 +15,17 @@ workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.97.2", features = ["plugin"] }
-nu-protocol = { path = "../nu-protocol", version = "0.97.2", features = ["plugin"] }
-nu-parser = { path = "../nu-parser", version = "0.97.2", features = ["plugin"] }
-nu-plugin = { path = "../nu-plugin", version = "0.97.2" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.97.2" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.97.2" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.97.2" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.2" }
+nu-engine = { path = "../nu-engine", version = "0.98.0", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.98.0", features = ["plugin"] }
+nu-parser = { path = "../nu-parser", version = "0.98.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.98.0" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.98.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.98.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.98.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.0" }
 nu-ansi-term = { workspace = true }
 similar = "2.6"
 
 [dev-dependencies]
 typetag = "0.2"
-serde = "1.0"
+serde = "1.0"
\ No newline at end of file
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index 112b364a8b..3b1d63fa1e 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin"
 edition = "2021"
 license = "MIT"
 name = "nu-plugin"
-version = "0.97.2"
+version = "0.98.0"
 
 [lib]
 bench = false
@@ -14,11 +14,11 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.97.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.97.2" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.97.2", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.97.2" }
+nu-engine = { path = "../nu-engine", version = "0.98.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.98.0" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.98.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.98.0" }
 
 log = { workspace = true }
 thiserror = "1.0"
@@ -33,4 +33,4 @@ local-socket = ["nu-plugin-core/local-socket"]
 
 [target.'cfg(target_family = "unix")'.dependencies]
 # For setting the process group ID (EnterForeground / LeaveForeground)
-nix = { workspace = true, default-features = false, features = ["process"] }
+nix = { workspace = true, default-features = false, features = ["process"] }
\ No newline at end of file
diff --git a/crates/nu-pretty-hex/Cargo.toml b/crates/nu-pretty-hex/Cargo.toml
index 5d95c486d6..b20535897e 100644
--- a/crates/nu-pretty-hex/Cargo.toml
+++ b/crates/nu-pretty-hex/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-pretty-hex"
 edition = "2021"
 license = "MIT"
 name = "nu-pretty-hex"
-version = "0.97.2"
+version = "0.98.0"
 
 [lib]
 doctest = false
@@ -21,4 +21,4 @@ nu-ansi-term = { workspace = true }
 
 [dev-dependencies]
 heapless = { version = "0.8", default-features = false }
-rand = "0.8"
+rand = "0.8"
\ No newline at end of file
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 37db9fd289..5035844a85 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-protocol"
 edition = "2021"
 license = "MIT"
 name = "nu-protocol"
-version = "0.97.2"
+version = "0.98.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,10 +16,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.97.2" }
-nu-path = { path = "../nu-path", version = "0.97.2" }
-nu-system = { path = "../nu-system", version = "0.97.2" }
-nu-derive-value = { path = "../nu-derive-value", version = "0.97.2" }
+nu-utils = { path = "../nu-utils", version = "0.98.0" }
+nu-path = { path = "../nu-path", version = "0.98.0" }
+nu-system = { path = "../nu-system", version = "0.98.0" }
+nu-derive-value = { path = "../nu-derive-value", version = "0.98.0" }
 
 brotli = { workspace = true, optional = true }
 bytes = { workspace = true }
@@ -57,11 +57,11 @@ plugin = [
 serde_json = { workspace = true }
 strum = "0.26"
 strum_macros = "0.26"
-nu-test-support = { path = "../nu-test-support", version = "0.97.2" }
+nu-test-support = { path = "../nu-test-support", version = "0.98.0" }
 pretty_assertions = { workspace = true }
 rstest = { workspace = true }
 tempfile = { workspace = true }
 os_pipe = { workspace = true }
 
 [package.metadata.docs.rs]
-all-features = true
+all-features = true
\ No newline at end of file
diff --git a/crates/nu-std/Cargo.toml b/crates/nu-std/Cargo.toml
index 6766b8ac3c..72fa7a2ab6 100644
--- a/crates/nu-std/Cargo.toml
+++ b/crates/nu-std/Cargo.toml
@@ -5,15 +5,15 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-std"
 edition = "2021"
 license = "MIT"
 name = "nu-std"
-version = "0.97.2"
+version = "0.98.0"
 
 [dependencies]
-nu-parser = { version = "0.97.2", path = "../nu-parser" }
-nu-protocol = { version = "0.97.2", path = "../nu-protocol" }
-nu-engine = { version = "0.97.2", path = "../nu-engine" }
+nu-parser = { version = "0.98.0", path = "../nu-parser" }
+nu-protocol = { version = "0.98.0", path = "../nu-protocol" }
+nu-engine = { version = "0.98.0", path = "../nu-engine" }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
 
 log = "0.4"
 
 [lints]
-workspace = true
+workspace = true
\ No newline at end of file
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index 6de7fd0dc4..129d74c5ae 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["The Nushell Project Developers", "procs creators"]
 description = "Nushell system querying"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-system"
 name = "nu-system"
-version = "0.97.2"
+version = "0.98.0"
 edition = "2021"
 license = "MIT"
 
@@ -48,4 +48,4 @@ windows = { workspace = true, features = [
   "Win32_System_SystemInformation",
   "Win32_System_Threading",
   "Win32_UI_Shell",
-]}
+]}
\ No newline at end of file
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index 3cce028e35..eb73661ee7 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-table"
 edition = "2021"
 license = "MIT"
 name = "nu-table"
-version = "0.97.2"
+version = "0.98.0"
 
 [lib]
 bench = false
@@ -14,14 +14,14 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
-nu-utils = { path = "../nu-utils", version = "0.97.2" }
-nu-engine = { path = "../nu-engine", version = "0.97.2" }
-nu-color-config = { path = "../nu-color-config", version = "0.97.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
+nu-utils = { path = "../nu-utils", version = "0.98.0" }
+nu-engine = { path = "../nu-engine", version = "0.98.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.98.0" }
 nu-ansi-term = { workspace = true }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 tabled = { workspace = true, features = ["ansi"], default-features = false }
 
 [dev-dependencies]
-# nu-test-support = { path="../nu-test-support", version = "0.97.2"  }
+# nu-test-support = { path="../nu-test-support", version = "0.98.0"  }
\ No newline at end of file
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index 858ca72e70..37427affb0 100644
--- a/crates/nu-term-grid/Cargo.toml
+++ b/crates/nu-term-grid/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-term-grid"
 edition = "2021"
 license = "MIT"
 name = "nu-term-grid"
-version = "0.97.2"
+version = "0.98.0"
 
 [lib]
 bench = false
@@ -14,6 +14,6 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.97.2" }
+nu-utils = { path = "../nu-utils", version = "0.98.0" }
 
-unicode-width = { workspace = true }
+unicode-width = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml
index 58db142732..da957915db 100644
--- a/crates/nu-test-support/Cargo.toml
+++ b/crates/nu-test-support/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-test-suppor
 edition = "2021"
 license = "MIT"
 name = "nu-test-support"
-version = "0.97.2"
+version = "0.98.0"
 
 [lib]
 doctest = false
@@ -15,10 +15,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-path = { path = "../nu-path", version = "0.97.2" }
-nu-glob = { path = "../nu-glob", version = "0.97.2" }
-nu-utils = { path = "../nu-utils", version = "0.97.2" }
+nu-path = { path = "../nu-path", version = "0.98.0" }
+nu-glob = { path = "../nu-glob", version = "0.98.0" }
+nu-utils = { path = "../nu-utils", version = "0.98.0" }
 
 num-format = { workspace = true }
 which = { workspace = true }
-tempfile = { workspace = true }
+tempfile = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index 038ca44932..7fb5b575eb 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-utils"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-utils"
-version = "0.97.2"
+version = "0.98.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
@@ -32,4 +32,4 @@ crossterm_winapi = "0.9"
 nix = { workspace = true, default-features = false, features = ["user", "fs"] }
 
 [lints]
-workspace = true
+workspace = true
\ No newline at end of file
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index 04ae31ad25..a16e302d1b 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -1,6 +1,6 @@
 # Nushell Config File
 #
-# version = "0.97.2"
+# version = "0.98.0"
 
 # For more information on defining custom themes, see
 # https://www.nushell.sh/book/coloring_and_theming.html
@@ -895,4 +895,4 @@ $env.config = {
             event: { edit: selectall }
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/crates/nu-utils/src/sample_config/default_env.nu b/crates/nu-utils/src/sample_config/default_env.nu
index 2988e1f100..f39725a8f4 100644
--- a/crates/nu-utils/src/sample_config/default_env.nu
+++ b/crates/nu-utils/src/sample_config/default_env.nu
@@ -1,6 +1,6 @@
 # Nushell Environment Config File
 #
-# version = "0.97.2"
+# version = "0.98.0"
 
 def create_left_prompt [] {
     let dir = match (do --ignore-shell-errors { $env.PWD | path relative-to $nu.home-path }) {
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index aa8d42bedf..65fe633fd4 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -10,10 +10,10 @@ name = "nu_plugin_custom_values"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.97.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.2", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.98.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.0", features = ["plugin"] }
 serde = { workspace = true }
 typetag = "0.2"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.97.2" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.98.0" }
\ No newline at end of file
diff --git a/crates/nu_plugin_example/Cargo.toml b/crates/nu_plugin_example/Cargo.toml
index c16f6c2573..2a8c5427d9 100644
--- a/crates/nu_plugin_example/Cargo.toml
+++ b/crates/nu_plugin_example/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_exam
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_example"
-version = "0.97.2"
+version = "0.98.0"
 
 [[bin]]
 name = "nu_plugin_example"
@@ -15,9 +15,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.97.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.2", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.98.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.0", features = ["plugin"] }
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.97.2" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.2" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.98.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.0" }
\ No newline at end of file
diff --git a/crates/nu_plugin_formats/Cargo.toml b/crates/nu_plugin_formats/Cargo.toml
index 157c75a847..e71b9a226a 100644
--- a/crates/nu_plugin_formats/Cargo.toml
+++ b/crates/nu_plugin_formats/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_form
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_formats"
-version = "0.97.2"
+version = "0.98.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.97.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.2", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.98.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.0", features = ["plugin"] }
 
 indexmap = { workspace = true }
 eml-parser = "0.1"
@@ -20,4 +20,4 @@ plist = "1.7"
 chrono = "0.4"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.97.2" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.98.0" }
\ No newline at end of file
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index 368f13529b..64eabffc7c 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gsta
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_gstat"
-version = "0.97.2"
+version = "0.98.0"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_gstat"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.97.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
+nu-plugin = { path = "../nu-plugin", version = "0.98.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
 
 git2 = "0.19"
\ No newline at end of file
diff --git a/crates/nu_plugin_inc/Cargo.toml b/crates/nu_plugin_inc/Cargo.toml
index 09904bb1a5..04f9d478dd 100644
--- a/crates/nu_plugin_inc/Cargo.toml
+++ b/crates/nu_plugin_inc/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_inc"
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_inc"
-version = "0.97.2"
+version = "0.98.0"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_inc"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.97.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.2", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.98.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.0", features = ["plugin"] }
 
 semver = "1.0"
\ No newline at end of file
diff --git a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
index 09f4769311..3191b3eaf7 100755
--- a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
+++ b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
@@ -6,7 +6,7 @@
 # it also allows us to test the plugin interface with something manually implemented in a scripting
 # language without adding any extra dependencies to our tests.
 
-const NUSHELL_VERSION = "0.97.2"
+const NUSHELL_VERSION = "0.98.0"
 const PLUGIN_VERSION = "0.1.1" # bump if you change commands!
 
 def main [--stdio] {
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 0c75a1fc56..320842443b 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu_plugin_polars"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_polars"
-version = "0.97.2"
+version = "0.98.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -17,10 +17,10 @@ bench = false
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
-nu-plugin = { path = "../nu-plugin", version = "0.97.2" }
-nu-path = { path = "../nu-path", version = "0.97.2" }
-nu-utils = { path = "../nu-utils", version = "0.97.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
+nu-plugin = { path = "../nu-plugin", version = "0.98.0" }
+nu-path = { path = "../nu-path", version = "0.98.0" }
+nu-utils = { path = "../nu-utils", version = "0.98.0" }
 
 # Potential dependencies for extras
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
@@ -80,9 +80,9 @@ optional = false
 version = "0.41"
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.2" }
-nu-engine = { path = "../nu-engine", version = "0.97.2" }
-nu-parser = { path = "../nu-parser", version = "0.97.2" }
-nu-command = { path = "../nu-command", version = "0.97.2" }
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.97.2" }
-tempfile.workspace = true
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.0" }
+nu-engine = { path = "../nu-engine", version = "0.98.0" }
+nu-parser = { path = "../nu-parser", version = "0.98.0" }
+nu-command = { path = "../nu-command", version = "0.98.0" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.98.0" }
+tempfile.workspace = true
\ No newline at end of file
diff --git a/crates/nu_plugin_python/nu_plugin_python_example.py b/crates/nu_plugin_python/nu_plugin_python_example.py
index 1fdb5bd076..f336eaf092 100755
--- a/crates/nu_plugin_python/nu_plugin_python_example.py
+++ b/crates/nu_plugin_python/nu_plugin_python_example.py
@@ -27,7 +27,7 @@ import sys
 import json
 
 
-NUSHELL_VERSION = "0.97.2"
+NUSHELL_VERSION = "0.98.0"
 PLUGIN_VERSION = "0.1.1"  # bump if you change commands!
 
 
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index f6bc2b5918..8d6b80f917 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_quer
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_query"
-version = "0.97.2"
+version = "0.98.0"
 
 [lib]
 doctest = false
@@ -16,8 +16,8 @@ name = "nu_plugin_query"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.97.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
+nu-plugin = { path = "../nu-plugin", version = "0.98.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
 
 gjson = "0.8"
 scraper = { default-features = false, version = "0.20" }
diff --git a/crates/nu_plugin_stress_internals/Cargo.toml b/crates/nu_plugin_stress_internals/Cargo.toml
index 7d4050bfa3..05c068bb41 100644
--- a/crates/nu_plugin_stress_internals/Cargo.toml
+++ b/crates/nu_plugin_stress_internals/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_stre
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_stress_internals"
-version = "0.97.2"
+version = "0.98.0"
 
 [[bin]]
 name = "nu_plugin_stress_internals"
diff --git a/crates/nuon/Cargo.toml b/crates/nuon/Cargo.toml
index d34a649a95..0711dd2853 100644
--- a/crates/nuon/Cargo.toml
+++ b/crates/nuon/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nuon"
 edition = "2021"
 license = "MIT"
 name = "nuon"
-version = "0.97.2"
+version = "0.98.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-parser = { path = "../nu-parser", version = "0.97.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.2" }
-nu-engine = { path = "../nu-engine", version = "0.97.2" }
+nu-parser = { path = "../nu-parser", version = "0.98.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
+nu-engine = { path = "../nu-engine", version = "0.98.0" }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 
@@ -20,4 +20,4 @@ fancy-regex = { workspace = true }
 chrono = { workspace = true }
 
 [lints]
-workspace = true
+workspace = true
\ No newline at end of file

From 1a081c09de7d8fec5e0dd4e6140c9732ed854872 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Sun, 22 Sep 2024 12:41:44 +0800
Subject: [PATCH 0448/1072] Bump version to 0.98.1 (#13896)

---
 Cargo.lock                                    | 74 +++++++++----------
 Cargo.toml                                    | 40 +++++-----
 crates/nu-cli/Cargo.toml                      | 26 +++----
 crates/nu-cmd-base/Cargo.toml                 | 12 +--
 crates/nu-cmd-extra/Cargo.toml                | 22 +++---
 crates/nu-cmd-lang/Cargo.toml                 | 12 +--
 crates/nu-cmd-plugin/Cargo.toml               | 12 +--
 crates/nu-color-config/Cargo.toml             | 10 +--
 crates/nu-command/Cargo.toml                  | 36 ++++-----
 crates/nu-derive-value/Cargo.toml             |  4 +-
 crates/nu-engine/Cargo.toml                   | 12 +--
 crates/nu-explore/Cargo.toml                  | 20 ++---
 crates/nu-glob/Cargo.toml                     |  4 +-
 crates/nu-json/Cargo.toml                     |  8 +-
 crates/nu-lsp/Cargo.toml                      | 16 ++--
 crates/nu-parser/Cargo.toml                   | 12 +--
 crates/nu-path/Cargo.toml                     |  4 +-
 crates/nu-plugin-core/Cargo.toml              |  8 +-
 crates/nu-plugin-engine/Cargo.toml            | 16 ++--
 crates/nu-plugin-protocol/Cargo.toml          |  8 +-
 crates/nu-plugin-test-support/Cargo.toml      | 20 ++---
 crates/nu-plugin/Cargo.toml                   | 14 ++--
 crates/nu-pretty-hex/Cargo.toml               |  4 +-
 crates/nu-protocol/Cargo.toml                 | 14 ++--
 crates/nu-std/Cargo.toml                      | 10 +--
 crates/nu-system/Cargo.toml                   |  4 +-
 crates/nu-table/Cargo.toml                    | 12 +--
 crates/nu-term-grid/Cargo.toml                |  6 +-
 crates/nu-test-support/Cargo.toml             | 10 +--
 crates/nu-utils/Cargo.toml                    |  4 +-
 .../src/sample_config/default_config.nu       |  4 +-
 .../nu-utils/src/sample_config/default_env.nu |  4 +-
 crates/nu_plugin_custom_values/Cargo.toml     |  6 +-
 crates/nu_plugin_example/Cargo.toml           | 10 +--
 crates/nu_plugin_formats/Cargo.toml           |  8 +-
 crates/nu_plugin_gstat/Cargo.toml             |  8 +-
 crates/nu_plugin_inc/Cargo.toml               |  8 +-
 .../nu_plugin_nu_example.nu                   |  4 +-
 crates/nu_plugin_polars/Cargo.toml            | 22 +++---
 .../nu_plugin_python_example.py               |  4 +-
 crates/nu_plugin_query/Cargo.toml             |  8 +-
 crates/nu_plugin_stress_internals/Cargo.toml  |  4 +-
 crates/nuon/Cargo.toml                        | 10 +--
 43 files changed, 277 insertions(+), 277 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 10b0ddfbd8..1b731ca059 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2938,7 +2938,7 @@ dependencies = [
 
 [[package]]
 name = "nu"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "assert_cmd",
  "crossterm 0.28.1",
@@ -2993,7 +2993,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cli"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "chrono",
  "crossterm 0.28.1",
@@ -3028,7 +3028,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-base"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "indexmap",
  "miette",
@@ -3040,7 +3040,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-extra"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "fancy-regex",
  "heck",
@@ -3065,7 +3065,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-lang"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "itertools 0.13.0",
  "nu-engine",
@@ -3077,7 +3077,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-plugin"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "itertools 0.13.0",
  "nu-engine",
@@ -3088,7 +3088,7 @@ dependencies = [
 
 [[package]]
 name = "nu-color-config"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "nu-ansi-term",
  "nu-engine",
@@ -3100,7 +3100,7 @@ dependencies = [
 
 [[package]]
 name = "nu-command"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "alphanumeric-sort",
  "base64 0.22.1",
@@ -3210,7 +3210,7 @@ dependencies = [
 
 [[package]]
 name = "nu-derive-value"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -3221,7 +3221,7 @@ dependencies = [
 
 [[package]]
 name = "nu-engine"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "log",
  "nu-glob",
@@ -3233,7 +3233,7 @@ dependencies = [
 
 [[package]]
 name = "nu-explore"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "ansi-str",
  "anyhow",
@@ -3258,14 +3258,14 @@ dependencies = [
 
 [[package]]
 name = "nu-glob"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "doc-comment",
 ]
 
 [[package]]
 name = "nu-json"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "fancy-regex",
  "linked-hash-map",
@@ -3278,7 +3278,7 @@ dependencies = [
 
 [[package]]
 name = "nu-lsp"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "assert-json-diff",
  "crossbeam-channel",
@@ -3299,7 +3299,7 @@ dependencies = [
 
 [[package]]
 name = "nu-parser"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "bytesize",
  "chrono",
@@ -3315,7 +3315,7 @@ dependencies = [
 
 [[package]]
 name = "nu-path"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "dirs",
  "omnipath",
@@ -3324,7 +3324,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "log",
  "nix 0.29.0",
@@ -3340,7 +3340,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-core"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "interprocess",
  "log",
@@ -3354,7 +3354,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-engine"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "log",
  "nu-engine",
@@ -3370,7 +3370,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-protocol"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "nu-protocol",
  "nu-utils",
@@ -3382,7 +3382,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-test-support"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "nu-ansi-term",
  "nu-cmd-lang",
@@ -3400,7 +3400,7 @@ dependencies = [
 
 [[package]]
 name = "nu-pretty-hex"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "heapless",
  "nu-ansi-term",
@@ -3409,7 +3409,7 @@ dependencies = [
 
 [[package]]
 name = "nu-protocol"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "brotli",
  "byte-unit",
@@ -3447,7 +3447,7 @@ dependencies = [
 
 [[package]]
 name = "nu-std"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "log",
  "miette",
@@ -3458,7 +3458,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "chrono",
  "itertools 0.13.0",
@@ -3476,7 +3476,7 @@ dependencies = [
 
 [[package]]
 name = "nu-table"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "fancy-regex",
  "nu-ansi-term",
@@ -3490,7 +3490,7 @@ dependencies = [
 
 [[package]]
 name = "nu-term-grid"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "nu-utils",
  "unicode-width",
@@ -3498,7 +3498,7 @@ dependencies = [
 
 [[package]]
 name = "nu-test-support"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -3510,7 +3510,7 @@ dependencies = [
 
 [[package]]
 name = "nu-utils"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "crossterm_winapi",
  "log",
@@ -3536,7 +3536,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_example"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "nu-cmd-lang",
  "nu-plugin",
@@ -3546,7 +3546,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_formats"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "chrono",
  "eml-parser",
@@ -3561,7 +3561,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_gstat"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "git2",
  "nu-plugin",
@@ -3570,7 +3570,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_inc"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -3579,7 +3579,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_polars"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "chrono",
  "chrono-tz 0.9.0",
@@ -3613,7 +3613,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_query"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "gjson",
  "nu-plugin",
@@ -3628,7 +3628,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_stress_internals"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "interprocess",
  "serde",
@@ -3742,7 +3742,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "nuon"
-version = "0.98.0"
+version = "0.98.1"
 dependencies = [
  "chrono",
  "fancy-regex",
diff --git a/Cargo.toml b/Cargo.toml
index a5372d5b32..033521d2b1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
 rust-version = "1.79.0"
-version = "0.98.0"
+version = "0.98.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -189,22 +189,22 @@ unchecked_duration_subtraction = "warn"
 workspace = true
 
 [dependencies]
-nu-cli = { path = "./crates/nu-cli", version = "0.98.0" }
-nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.98.0" }
-nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.98.0" }
-nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.98.0", optional = true }
-nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.98.0" }
-nu-command = { path = "./crates/nu-command", version = "0.98.0" }
-nu-engine = { path = "./crates/nu-engine", version = "0.98.0" }
-nu-explore = { path = "./crates/nu-explore", version = "0.98.0" }
-nu-lsp = { path = "./crates/nu-lsp/", version = "0.98.0" }
-nu-parser = { path = "./crates/nu-parser", version = "0.98.0" }
-nu-path = { path = "./crates/nu-path", version = "0.98.0" }
-nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.98.0" }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.98.0" }
-nu-std = { path = "./crates/nu-std", version = "0.98.0" }
-nu-system = { path = "./crates/nu-system", version = "0.98.0" }
-nu-utils = { path = "./crates/nu-utils", version = "0.98.0" }
+nu-cli = { path = "./crates/nu-cli", version = "0.98.1" }
+nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.98.1" }
+nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.98.1" }
+nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.98.1", optional = true }
+nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.98.1" }
+nu-command = { path = "./crates/nu-command", version = "0.98.1" }
+nu-engine = { path = "./crates/nu-engine", version = "0.98.1" }
+nu-explore = { path = "./crates/nu-explore", version = "0.98.1" }
+nu-lsp = { path = "./crates/nu-lsp/", version = "0.98.1" }
+nu-parser = { path = "./crates/nu-parser", version = "0.98.1" }
+nu-path = { path = "./crates/nu-path", version = "0.98.1" }
+nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.98.1" }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.98.1" }
+nu-std = { path = "./crates/nu-std", version = "0.98.1" }
+nu-system = { path = "./crates/nu-system", version = "0.98.1" }
+nu-utils = { path = "./crates/nu-utils", version = "0.98.1" }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
 crossterm = { workspace = true }
@@ -234,9 +234,9 @@ nix = { workspace = true, default-features = false, features = [
 ] }
 
 [dev-dependencies]
-nu-test-support = { path = "./crates/nu-test-support", version = "0.98.0" }
-nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.98.0" }
-nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.98.0" }
+nu-test-support = { path = "./crates/nu-test-support", version = "0.98.1" }
+nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.98.1" }
+nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.98.1" }
 assert_cmd = "2.0"
 dirs = { workspace = true }
 tango-bench = "0.5"
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index c3d040449c..4d258f9254 100644
--- 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.98.0"
+version = "0.98.1"
 
 [lib]
 bench = false
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.0" }
-nu-command = { path = "../nu-command", version = "0.98.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.98.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.1" }
+nu-command = { path = "../nu-command", version = "0.98.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.98.1" }
 rstest = { workspace = true, default-features = false }
 tempfile = { workspace = true }
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.98.0" }
-nu-engine = { path = "../nu-engine", version = "0.98.0" }
-nu-path = { path = "../nu-path", version = "0.98.0" }
-nu-parser = { path = "../nu-parser", version = "0.98.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.98.0", optional = true }
-nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
-nu-utils = { path = "../nu-utils", version = "0.98.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.98.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.98.1" }
+nu-engine = { path = "../nu-engine", version = "0.98.1" }
+nu-path = { path = "../nu-path", version = "0.98.1" }
+nu-parser = { path = "../nu-parser", version = "0.98.1" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.98.1", optional = true }
+nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
+nu-utils = { path = "../nu-utils", version = "0.98.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.98.1" }
 nu-ansi-term = { workspace = true }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
@@ -49,4 +49,4 @@ plugin = ["nu-plugin-engine"]
 system-clipboard = ["reedline/system_clipboard"]
 
 [lints]
-workspace = true
\ No newline at end of file
+workspace = true
diff --git a/crates/nu-cmd-base/Cargo.toml b/crates/nu-cmd-base/Cargo.toml
index f9396a1548..ce105d6f91 100644
--- a/crates/nu-cmd-base/Cargo.toml
+++ b/crates/nu-cmd-base/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-base"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-base"
-version = "0.98.0"
+version = "0.98.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,12 +13,12 @@ version = "0.98.0"
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.98.0" }
-nu-parser = { path = "../nu-parser", version = "0.98.0" }
-nu-path = { path = "../nu-path", version = "0.98.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
+nu-engine = { path = "../nu-engine", version = "0.98.1" }
+nu-parser = { path = "../nu-parser", version = "0.98.1" }
+nu-path = { path = "../nu-path", version = "0.98.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
 
 indexmap = { workspace = true }
 miette = { workspace = true }
 
-[dev-dependencies]
\ No newline at end of file
+[dev-dependencies]
diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml
index 735142c92a..40fd2d71e6 100644
--- 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.98.0"
+version = "0.98.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,13 +16,13 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.98.0" }
-nu-engine = { path = "../nu-engine", version = "0.98.0" }
-nu-json = { version = "0.98.0", path = "../nu-json" }
-nu-parser = { path = "../nu-parser", version = "0.98.0" }
-nu-pretty-hex = { version = "0.98.0", path = "../nu-pretty-hex" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
-nu-utils = { path = "../nu-utils", version = "0.98.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.98.1" }
+nu-engine = { path = "../nu-engine", version = "0.98.1" }
+nu-json = { version = "0.98.1", path = "../nu-json" }
+nu-parser = { path = "../nu-parser", version = "0.98.1" }
+nu-pretty-hex = { version = "0.98.1", path = "../nu-pretty-hex" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
+nu-utils = { path = "../nu-utils", version = "0.98.1" }
 
 # Potential dependencies for extras
 heck = { workspace = true }
@@ -36,6 +36,6 @@ v_htmlescape = { workspace = true }
 itertools = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.0" }
-nu-command = { path = "../nu-command", version = "0.98.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.98.0" }
\ No newline at end of file
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.1" }
+nu-command = { path = "../nu-command", version = "0.98.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.98.1" }
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index 2aa43bdda4..b529062e68 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -6,7 +6,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-lang"
 edition = "2021"
 license = "MIT"
 name = "nu-cmd-lang"
-version = "0.98.0"
+version = "0.98.1"
 
 [lib]
 bench = false
@@ -15,10 +15,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.98.0" }
-nu-parser = { path = "../nu-parser", version = "0.98.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
-nu-utils = { path = "../nu-utils", version = "0.98.0" }
+nu-engine = { path = "../nu-engine", version = "0.98.1" }
+nu-parser = { path = "../nu-parser", version = "0.98.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
+nu-utils = { path = "../nu-utils", version = "0.98.1" }
 
 itertools = { workspace = true }
 shadow-rs = { version = "0.34", default-features = false }
@@ -31,4 +31,4 @@ mimalloc = []
 trash-support = []
 sqlite = []
 static-link-openssl = []
-system-clipboard = []
\ No newline at end of file
+system-clipboard = []
diff --git a/crates/nu-cmd-plugin/Cargo.toml b/crates/nu-cmd-plugin/Cargo.toml
index a6feefb0aa..d91e4284ff 100644
--- a/crates/nu-cmd-plugin/Cargo.toml
+++ b/crates/nu-cmd-plugin/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-plugin"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-plugin"
-version = "0.98.0"
+version = "0.98.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,11 +13,11 @@ version = "0.98.0"
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.98.0" }
-nu-path = { path = "../nu-path", version = "0.98.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.0", features = ["plugin"] }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.98.0" }
+nu-engine = { path = "../nu-engine", version = "0.98.1" }
+nu-path = { path = "../nu-path", version = "0.98.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.1", features = ["plugin"] }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.98.1" }
 
 itertools = { workspace = true }
 
-[dev-dependencies]
\ No newline at end of file
+[dev-dependencies]
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index 423c1daa42..80e1f82d81 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-color-confi
 edition = "2021"
 license = "MIT"
 name = "nu-color-config"
-version = "0.98.0"
+version = "0.98.1"
 
 [lib]
 bench = false
@@ -14,12 +14,12 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
-nu-engine = { path = "../nu-engine", version = "0.98.0" }
-nu-json = { path = "../nu-json", version = "0.98.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
+nu-engine = { path = "../nu-engine", version = "0.98.1" }
+nu-json = { path = "../nu-json", version = "0.98.1" }
 nu-ansi-term = { workspace = true }
 
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.98.0" }
\ No newline at end of file
+nu-test-support = { path = "../nu-test-support", version = "0.98.1" }
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index ff6bda6767..b18ecb04fe 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-command"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
-version = "0.98.0"
+version = "0.98.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,21 +16,21 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.98.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.98.0" }
-nu-engine = { path = "../nu-engine", version = "0.98.0" }
-nu-glob = { path = "../nu-glob", version = "0.98.0" }
-nu-json = { path = "../nu-json", version = "0.98.0" }
-nu-parser = { path = "../nu-parser", version = "0.98.0" }
-nu-path = { path = "../nu-path", version = "0.98.0" }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.98.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
-nu-system = { path = "../nu-system", version = "0.98.0" }
-nu-table = { path = "../nu-table", version = "0.98.0" }
-nu-term-grid = { path = "../nu-term-grid", version = "0.98.0" }
-nu-utils = { path = "../nu-utils", version = "0.98.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.98.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.98.1" }
+nu-engine = { path = "../nu-engine", version = "0.98.1" }
+nu-glob = { path = "../nu-glob", version = "0.98.1" }
+nu-json = { path = "../nu-json", version = "0.98.1" }
+nu-parser = { path = "../nu-parser", version = "0.98.1" }
+nu-path = { path = "../nu-path", version = "0.98.1" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.98.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
+nu-system = { path = "../nu-system", version = "0.98.1" }
+nu-table = { path = "../nu-table", version = "0.98.1" }
+nu-term-grid = { path = "../nu-term-grid", version = "0.98.1" }
+nu-utils = { path = "../nu-utils", version = "0.98.1" }
 nu-ansi-term = { workspace = true }
-nuon = { path = "../nuon", version = "0.98.0" }
+nuon = { path = "../nuon", version = "0.98.1" }
 
 alphanumeric-sort = { workspace = true }
 base64 = { workspace = true }
@@ -139,8 +139,8 @@ sqlite = ["rusqlite"]
 trash-support = ["trash"]
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.98.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.98.1" }
 
 dirs = { workspace = true }
 mockito = { workspace = true, default-features = false }
@@ -149,4 +149,4 @@ quickcheck_macros = { workspace = true }
 rstest = { workspace = true, default-features = false }
 pretty_assertions = { workspace = true }
 tempfile = { workspace = true }
-rand_chacha = { workspace = true }
\ No newline at end of file
+rand_chacha = { workspace = true }
diff --git a/crates/nu-derive-value/Cargo.toml b/crates/nu-derive-value/Cargo.toml
index c453c2dc05..5d8e421ae0 100644
--- a/crates/nu-derive-value/Cargo.toml
+++ b/crates/nu-derive-value/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-derive-value"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-derive-value"
-version = "0.98.0"
+version = "0.98.1"
 
 [lib]
 proc-macro = true
@@ -21,4 +21,4 @@ proc-macro2 = { workspace = true }
 syn = { workspace = true }
 quote = { workspace = true }
 proc-macro-error = { workspace = true }
-heck = { workspace = true }
\ No newline at end of file
+heck = { workspace = true }
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index 767a83bbd0..dadf71ed43 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-engine"
 edition = "2021"
 license = "MIT"
 name = "nu-engine"
-version = "0.98.0"
+version = "0.98.1"
 
 [lib]
 bench = false
@@ -14,12 +14,12 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.98.0" }
-nu-path = { path = "../nu-path", version = "0.98.0" }
-nu-glob = { path = "../nu-glob", version = "0.98.0" }
-nu-utils = { path = "../nu-utils", version = "0.98.0" }
+nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.98.1" }
+nu-path = { path = "../nu-path", version = "0.98.1" }
+nu-glob = { path = "../nu-glob", version = "0.98.1" }
+nu-utils = { path = "../nu-utils", version = "0.98.1" }
 log = { workspace = true }
 terminal_size = { workspace = true }
 
 [features]
-plugin = []
\ No newline at end of file
+plugin = []
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index bbbe5e24fc..f980467e32 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-explore"
 edition = "2021"
 license = "MIT"
 name = "nu-explore"
-version = "0.98.0"
+version = "0.98.1"
 
 [lib]
 bench = false
@@ -14,15 +14,15 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
-nu-parser = { path = "../nu-parser", version = "0.98.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.98.0" }
-nu-engine = { path = "../nu-engine", version = "0.98.0" }
-nu-table = { path = "../nu-table", version = "0.98.0" }
-nu-json = { path = "../nu-json", version = "0.98.0" }
-nu-utils = { path = "../nu-utils", version = "0.98.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
+nu-parser = { path = "../nu-parser", version = "0.98.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.98.1" }
+nu-engine = { path = "../nu-engine", version = "0.98.1" }
+nu-table = { path = "../nu-table", version = "0.98.1" }
+nu-json = { path = "../nu-json", version = "0.98.1" }
+nu-utils = { path = "../nu-utils", version = "0.98.1" }
 nu-ansi-term = { workspace = true }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.98.0" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.98.1" }
 
 anyhow = { workspace = true }
 log = { workspace = true }
@@ -35,4 +35,4 @@ ansi-str = { workspace = true }
 unicode-width = { workspace = true }
 lscolors = { workspace = true, default-features = false, features = [
   "nu-ansi-term",
-] }
\ No newline at end of file
+] }
diff --git a/crates/nu-glob/Cargo.toml b/crates/nu-glob/Cargo.toml
index 90b5428ac5..fe268f8152 100644
--- a/crates/nu-glob/Cargo.toml
+++ b/crates/nu-glob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-glob"
-version = "0.98.0"
+version = "0.98.1"
 authors = ["The Nushell Project Developers", "The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 description = """
@@ -17,4 +17,4 @@ bench = false
 doc-comment = "0.3"
 
 [lints]
-workspace = true
\ No newline at end of file
+workspace = true
diff --git a/crates/nu-json/Cargo.toml b/crates/nu-json/Cargo.toml
index 1c36c1ba6e..bf4bdc101d 100644
--- a/crates/nu-json/Cargo.toml
+++ b/crates/nu-json/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-json"
 edition = "2021"
 license = "MIT"
 name = "nu-json"
-version = "0.98.0"
+version = "0.98.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -26,10 +26,10 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.98.0" }
-nu-path = { path = "../nu-path", version = "0.98.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.98.1" }
+nu-path = { path = "../nu-path", version = "0.98.1" }
 serde_json = "1.0"
 fancy-regex = "0.13.0"
 
 [lints]
-workspace = true
\ No newline at end of file
+workspace = true
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index 0d2e4df9c9..e485b5590c 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -3,14 +3,14 @@ authors = ["The Nushell Project Developers"]
 description = "Nushell's integrated LSP server"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-lsp"
 name = "nu-lsp"
-version = "0.98.0"
+version = "0.98.1"
 edition = "2021"
 license = "MIT"
 
 [dependencies]
-nu-cli = { path = "../nu-cli", version = "0.98.0" }
-nu-parser = { path = "../nu-parser", version = "0.98.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
+nu-cli = { path = "../nu-cli", version = "0.98.1" }
+nu-parser = { path = "../nu-parser", version = "0.98.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
 
 reedline = { workspace = true }
 
@@ -23,11 +23,11 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.0" }
-nu-command = { path = "../nu-command", version = "0.98.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.98.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.1" }
+nu-command = { path = "../nu-command", version = "0.98.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.98.1" }
 
 assert-json-diff = "2.0"
 
 [lints]
-workspace = true
\ No newline at end of file
+workspace = true
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index 96a5cbd854..d9386921e4 100644
--- a/crates/nu-parser/Cargo.toml
+++ b/crates/nu-parser/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-parser"
 edition = "2021"
 license = "MIT"
 name = "nu-parser"
-version = "0.98.0"
+version = "0.98.1"
 exclude = ["/fuzz"]
 
 [lib]
@@ -15,10 +15,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.98.0" }
-nu-path = { path = "../nu-path", version = "0.98.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.98.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
+nu-engine = { path = "../nu-engine", version = "0.98.1" }
+nu-path = { path = "../nu-path", version = "0.98.1" }
+nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.98.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
 
 bytesize = { workspace = true }
 chrono = { default-features = false, features = ['std'], workspace = true }
@@ -30,4 +30,4 @@ serde_json = { workspace = true }
 rstest = { workspace = true, default-features = false }
 
 [features]
-plugin = ["nu-plugin-engine"]
\ No newline at end of file
+plugin = ["nu-plugin-engine"]
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index 38fb81ff8b..4c844a8150 100644
--- a/crates/nu-path/Cargo.toml
+++ b/crates/nu-path/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-path"
 edition = "2021"
 license = "MIT"
 name = "nu-path"
-version = "0.98.0"
+version = "0.98.1"
 exclude = ["/fuzz"]
 
 [lib]
@@ -21,4 +21,4 @@ omnipath = { workspace = true }
 pwd = { workspace = true }
 
 [lints]
-workspace = true
\ No newline at end of file
+workspace = true
diff --git a/crates/nu-plugin-core/Cargo.toml b/crates/nu-plugin-core/Cargo.toml
index 91f567c412..d1815ba7cb 100644
--- a/crates/nu-plugin-core/Cargo.toml
+++ b/crates/nu-plugin-core/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-core
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-core"
-version = "0.98.0"
+version = "0.98.1"
 
 [lib]
 bench = false
@@ -14,8 +14,8 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.98.0", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.98.1", default-features = false }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true }
@@ -28,4 +28,4 @@ default = ["local-socket"]
 local-socket = ["interprocess", "nu-plugin-protocol/local-socket"]
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows = { workspace = true }
\ No newline at end of file
+windows = { workspace = true }
diff --git a/crates/nu-plugin-engine/Cargo.toml b/crates/nu-plugin-engine/Cargo.toml
index 9a344121ae..1c3fa52beb 100644
--- a/crates/nu-plugin-engine/Cargo.toml
+++ b/crates/nu-plugin-engine/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-engi
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-engine"
-version = "0.98.0"
+version = "0.98.1"
 
 [lib]
 bench = false
@@ -14,12 +14,12 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.98.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
-nu-system = { path = "../nu-system", version = "0.98.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.98.0" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.98.0", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.98.0" }
+nu-engine = { path = "../nu-engine", version = "0.98.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
+nu-system = { path = "../nu-system", version = "0.98.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.98.1" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.98.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.98.1" }
 
 serde = { workspace = true }
 log = { workspace = true }
@@ -35,4 +35,4 @@ local-socket = ["nu-plugin-core/local-socket"]
 windows = { workspace = true, features = [
   # For setting process creation flags
   "Win32_System_Threading",
-] }
\ No newline at end of file
+] }
diff --git a/crates/nu-plugin-protocol/Cargo.toml b/crates/nu-plugin-protocol/Cargo.toml
index 3fb8147533..3c6befc763 100644
--- a/crates/nu-plugin-protocol/Cargo.toml
+++ b/crates/nu-plugin-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-prot
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-protocol"
-version = "0.98.0"
+version = "0.98.1"
 
 [lib]
 bench = false
@@ -14,8 +14,8 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.98.0", features = ["plugin"] }
-nu-utils = { path = "../nu-utils", version = "0.98.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.1", features = ["plugin"] }
+nu-utils = { path = "../nu-utils", version = "0.98.1" }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
@@ -24,4 +24,4 @@ typetag = "0.2"
 
 [features]
 default = ["local-socket"]
-local-socket = []
\ No newline at end of file
+local-socket = []
diff --git a/crates/nu-plugin-test-support/Cargo.toml b/crates/nu-plugin-test-support/Cargo.toml
index 901e4ddd35..53d309eb66 100644
--- a/crates/nu-plugin-test-support/Cargo.toml
+++ b/crates/nu-plugin-test-support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-plugin-test-support"
-version = "0.98.0"
+version = "0.98.1"
 edition = "2021"
 license = "MIT"
 description = "Testing support for Nushell plugins"
@@ -15,17 +15,17 @@ workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.98.0", features = ["plugin"] }
-nu-protocol = { path = "../nu-protocol", version = "0.98.0", features = ["plugin"] }
-nu-parser = { path = "../nu-parser", version = "0.98.0", features = ["plugin"] }
-nu-plugin = { path = "../nu-plugin", version = "0.98.0" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.98.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.98.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.98.0" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.0" }
+nu-engine = { path = "../nu-engine", version = "0.98.1", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.98.1", features = ["plugin"] }
+nu-parser = { path = "../nu-parser", version = "0.98.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.98.1" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.98.1" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.98.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.98.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.1" }
 nu-ansi-term = { workspace = true }
 similar = "2.6"
 
 [dev-dependencies]
 typetag = "0.2"
-serde = "1.0"
\ No newline at end of file
+serde = "1.0"
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index 3b1d63fa1e..258c0af220 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin"
 edition = "2021"
 license = "MIT"
 name = "nu-plugin"
-version = "0.98.0"
+version = "0.98.1"
 
 [lib]
 bench = false
@@ -14,11 +14,11 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.98.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.98.0" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.98.0", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.98.0" }
+nu-engine = { path = "../nu-engine", version = "0.98.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.98.1" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.98.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.98.1" }
 
 log = { workspace = true }
 thiserror = "1.0"
@@ -33,4 +33,4 @@ local-socket = ["nu-plugin-core/local-socket"]
 
 [target.'cfg(target_family = "unix")'.dependencies]
 # For setting the process group ID (EnterForeground / LeaveForeground)
-nix = { workspace = true, default-features = false, features = ["process"] }
\ No newline at end of file
+nix = { workspace = true, default-features = false, features = ["process"] }
diff --git a/crates/nu-pretty-hex/Cargo.toml b/crates/nu-pretty-hex/Cargo.toml
index b20535897e..3be55f0cdb 100644
--- a/crates/nu-pretty-hex/Cargo.toml
+++ b/crates/nu-pretty-hex/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-pretty-hex"
 edition = "2021"
 license = "MIT"
 name = "nu-pretty-hex"
-version = "0.98.0"
+version = "0.98.1"
 
 [lib]
 doctest = false
@@ -21,4 +21,4 @@ nu-ansi-term = { workspace = true }
 
 [dev-dependencies]
 heapless = { version = "0.8", default-features = false }
-rand = "0.8"
\ No newline at end of file
+rand = "0.8"
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 5035844a85..b8dcbe4607 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-protocol"
 edition = "2021"
 license = "MIT"
 name = "nu-protocol"
-version = "0.98.0"
+version = "0.98.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,10 +16,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.98.0" }
-nu-path = { path = "../nu-path", version = "0.98.0" }
-nu-system = { path = "../nu-system", version = "0.98.0" }
-nu-derive-value = { path = "../nu-derive-value", version = "0.98.0" }
+nu-utils = { path = "../nu-utils", version = "0.98.1" }
+nu-path = { path = "../nu-path", version = "0.98.1" }
+nu-system = { path = "../nu-system", version = "0.98.1" }
+nu-derive-value = { path = "../nu-derive-value", version = "0.98.1" }
 
 brotli = { workspace = true, optional = true }
 bytes = { workspace = true }
@@ -57,11 +57,11 @@ plugin = [
 serde_json = { workspace = true }
 strum = "0.26"
 strum_macros = "0.26"
-nu-test-support = { path = "../nu-test-support", version = "0.98.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.98.1" }
 pretty_assertions = { workspace = true }
 rstest = { workspace = true }
 tempfile = { workspace = true }
 os_pipe = { workspace = true }
 
 [package.metadata.docs.rs]
-all-features = true
\ No newline at end of file
+all-features = true
diff --git a/crates/nu-std/Cargo.toml b/crates/nu-std/Cargo.toml
index 72fa7a2ab6..838506e605 100644
--- a/crates/nu-std/Cargo.toml
+++ b/crates/nu-std/Cargo.toml
@@ -5,15 +5,15 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-std"
 edition = "2021"
 license = "MIT"
 name = "nu-std"
-version = "0.98.0"
+version = "0.98.1"
 
 [dependencies]
-nu-parser = { version = "0.98.0", path = "../nu-parser" }
-nu-protocol = { version = "0.98.0", path = "../nu-protocol" }
-nu-engine = { version = "0.98.0", path = "../nu-engine" }
+nu-parser = { version = "0.98.1", path = "../nu-parser" }
+nu-protocol = { version = "0.98.1", path = "../nu-protocol" }
+nu-engine = { version = "0.98.1", path = "../nu-engine" }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
 
 log = "0.4"
 
 [lints]
-workspace = true
\ No newline at end of file
+workspace = true
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index 129d74c5ae..25a38d36cf 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["The Nushell Project Developers", "procs creators"]
 description = "Nushell system querying"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-system"
 name = "nu-system"
-version = "0.98.0"
+version = "0.98.1"
 edition = "2021"
 license = "MIT"
 
@@ -48,4 +48,4 @@ windows = { workspace = true, features = [
   "Win32_System_SystemInformation",
   "Win32_System_Threading",
   "Win32_UI_Shell",
-]}
\ No newline at end of file
+]}
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index eb73661ee7..f9aeaca041 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-table"
 edition = "2021"
 license = "MIT"
 name = "nu-table"
-version = "0.98.0"
+version = "0.98.1"
 
 [lib]
 bench = false
@@ -14,14 +14,14 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
-nu-utils = { path = "../nu-utils", version = "0.98.0" }
-nu-engine = { path = "../nu-engine", version = "0.98.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.98.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
+nu-utils = { path = "../nu-utils", version = "0.98.1" }
+nu-engine = { path = "../nu-engine", version = "0.98.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.98.1" }
 nu-ansi-term = { workspace = true }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 tabled = { workspace = true, features = ["ansi"], default-features = false }
 
 [dev-dependencies]
-# nu-test-support = { path="../nu-test-support", version = "0.98.0"  }
\ No newline at end of file
+# nu-test-support = { path="../nu-test-support", version = "0.98.1"  }
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index 37427affb0..50e1cd19e3 100644
--- a/crates/nu-term-grid/Cargo.toml
+++ b/crates/nu-term-grid/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-term-grid"
 edition = "2021"
 license = "MIT"
 name = "nu-term-grid"
-version = "0.98.0"
+version = "0.98.1"
 
 [lib]
 bench = false
@@ -14,6 +14,6 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.98.0" }
+nu-utils = { path = "../nu-utils", version = "0.98.1" }
 
-unicode-width = { workspace = true }
\ No newline at end of file
+unicode-width = { workspace = true }
diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml
index da957915db..a4ae4564ec 100644
--- a/crates/nu-test-support/Cargo.toml
+++ b/crates/nu-test-support/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-test-suppor
 edition = "2021"
 license = "MIT"
 name = "nu-test-support"
-version = "0.98.0"
+version = "0.98.1"
 
 [lib]
 doctest = false
@@ -15,10 +15,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-path = { path = "../nu-path", version = "0.98.0" }
-nu-glob = { path = "../nu-glob", version = "0.98.0" }
-nu-utils = { path = "../nu-utils", version = "0.98.0" }
+nu-path = { path = "../nu-path", version = "0.98.1" }
+nu-glob = { path = "../nu-glob", version = "0.98.1" }
+nu-utils = { path = "../nu-utils", version = "0.98.1" }
 
 num-format = { workspace = true }
 which = { workspace = true }
-tempfile = { workspace = true }
\ No newline at end of file
+tempfile = { workspace = true }
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index 7fb5b575eb..74239ea7ac 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-utils"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-utils"
-version = "0.98.0"
+version = "0.98.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
@@ -32,4 +32,4 @@ crossterm_winapi = "0.9"
 nix = { workspace = true, default-features = false, features = ["user", "fs"] }
 
 [lints]
-workspace = true
\ No newline at end of file
+workspace = true
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index a16e302d1b..8d5712f603 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -1,6 +1,6 @@
 # Nushell Config File
 #
-# version = "0.98.0"
+# version = "0.98.1"
 
 # For more information on defining custom themes, see
 # https://www.nushell.sh/book/coloring_and_theming.html
@@ -895,4 +895,4 @@ $env.config = {
             event: { edit: selectall }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/crates/nu-utils/src/sample_config/default_env.nu b/crates/nu-utils/src/sample_config/default_env.nu
index f39725a8f4..13191681e1 100644
--- a/crates/nu-utils/src/sample_config/default_env.nu
+++ b/crates/nu-utils/src/sample_config/default_env.nu
@@ -1,6 +1,6 @@
 # Nushell Environment Config File
 #
-# version = "0.98.0"
+# version = "0.98.1"
 
 def create_left_prompt [] {
     let dir = match (do --ignore-shell-errors { $env.PWD | path relative-to $nu.home-path }) {
@@ -98,4 +98,4 @@ $env.NU_PLUGIN_DIRS = [
 # $env.PATH = ($env.PATH | uniq)
 
 # To load from a custom file you can use:
-# source ($nu.default-config-dir | path join 'custom.nu')
\ No newline at end of file
+# source ($nu.default-config-dir | path join 'custom.nu')
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index 65fe633fd4..491976b4c3 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -10,10 +10,10 @@ name = "nu_plugin_custom_values"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.98.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.98.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.1", features = ["plugin"] }
 serde = { workspace = true }
 typetag = "0.2"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.98.0" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.98.1" }
diff --git a/crates/nu_plugin_example/Cargo.toml b/crates/nu_plugin_example/Cargo.toml
index 2a8c5427d9..638d583173 100644
--- a/crates/nu_plugin_example/Cargo.toml
+++ b/crates/nu_plugin_example/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_exam
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_example"
-version = "0.98.0"
+version = "0.98.1"
 
 [[bin]]
 name = "nu_plugin_example"
@@ -15,9 +15,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.98.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.98.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.1", features = ["plugin"] }
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.98.0" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.0" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.98.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.1" }
diff --git a/crates/nu_plugin_formats/Cargo.toml b/crates/nu_plugin_formats/Cargo.toml
index e71b9a226a..fbbbaaac50 100644
--- a/crates/nu_plugin_formats/Cargo.toml
+++ b/crates/nu_plugin_formats/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_form
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_formats"
-version = "0.98.0"
+version = "0.98.1"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.98.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.98.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.1", features = ["plugin"] }
 
 indexmap = { workspace = true }
 eml-parser = "0.1"
@@ -20,4 +20,4 @@ plist = "1.7"
 chrono = "0.4"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.98.0" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.98.1" }
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index 64eabffc7c..9f84d2661b 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gsta
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_gstat"
-version = "0.98.0"
+version = "0.98.1"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_gstat"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.98.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
+nu-plugin = { path = "../nu-plugin", version = "0.98.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
 
-git2 = "0.19"
\ No newline at end of file
+git2 = "0.19"
diff --git a/crates/nu_plugin_inc/Cargo.toml b/crates/nu_plugin_inc/Cargo.toml
index 04f9d478dd..15f385b2e7 100644
--- a/crates/nu_plugin_inc/Cargo.toml
+++ b/crates/nu_plugin_inc/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_inc"
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_inc"
-version = "0.98.0"
+version = "0.98.1"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_inc"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.98.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.98.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.1", features = ["plugin"] }
 
-semver = "1.0"
\ No newline at end of file
+semver = "1.0"
diff --git a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
index 3191b3eaf7..d277ef5ed8 100755
--- a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
+++ b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
@@ -6,7 +6,7 @@
 # it also allows us to test the plugin interface with something manually implemented in a scripting
 # language without adding any extra dependencies to our tests.
 
-const NUSHELL_VERSION = "0.98.0"
+const NUSHELL_VERSION = "0.98.1"
 const PLUGIN_VERSION = "0.1.1" # bump if you change commands!
 
 def main [--stdio] {
@@ -264,4 +264,4 @@ def start_plugin [] {
     }) |
     each { from json | handle_input } |
     ignore
-}
\ No newline at end of file
+}
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 320842443b..200e096c85 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu_plugin_polars"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_polars"
-version = "0.98.0"
+version = "0.98.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -17,10 +17,10 @@ bench = false
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
-nu-plugin = { path = "../nu-plugin", version = "0.98.0" }
-nu-path = { path = "../nu-path", version = "0.98.0" }
-nu-utils = { path = "../nu-utils", version = "0.98.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.98.1" }
+nu-path = { path = "../nu-path", version = "0.98.1" }
+nu-utils = { path = "../nu-utils", version = "0.98.1" }
 
 # Potential dependencies for extras
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
@@ -80,9 +80,9 @@ optional = false
 version = "0.41"
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.0" }
-nu-engine = { path = "../nu-engine", version = "0.98.0" }
-nu-parser = { path = "../nu-parser", version = "0.98.0" }
-nu-command = { path = "../nu-command", version = "0.98.0" }
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.98.0" }
-tempfile.workspace = true
\ No newline at end of file
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.1" }
+nu-engine = { path = "../nu-engine", version = "0.98.1" }
+nu-parser = { path = "../nu-parser", version = "0.98.1" }
+nu-command = { path = "../nu-command", version = "0.98.1" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.98.1" }
+tempfile.workspace = true
diff --git a/crates/nu_plugin_python/nu_plugin_python_example.py b/crates/nu_plugin_python/nu_plugin_python_example.py
index f336eaf092..945d365eec 100755
--- a/crates/nu_plugin_python/nu_plugin_python_example.py
+++ b/crates/nu_plugin_python/nu_plugin_python_example.py
@@ -27,7 +27,7 @@ import sys
 import json
 
 
-NUSHELL_VERSION = "0.98.0"
+NUSHELL_VERSION = "0.98.1"
 PLUGIN_VERSION = "0.1.1"  # bump if you change commands!
 
 
@@ -265,4 +265,4 @@ if __name__ == "__main__":
     if len(sys.argv) == 2 and sys.argv[1] == "--stdio":
         plugin()
     else:
-        print("Run me from inside nushell!")
\ No newline at end of file
+        print("Run me from inside nushell!")
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index 8d6b80f917..71146ee9bf 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_quer
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_query"
-version = "0.98.0"
+version = "0.98.1"
 
 [lib]
 doctest = false
@@ -16,8 +16,8 @@ name = "nu_plugin_query"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.98.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
+nu-plugin = { path = "../nu-plugin", version = "0.98.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
 
 gjson = "0.8"
 scraper = { default-features = false, version = "0.20" }
@@ -25,4 +25,4 @@ sxd-document = "0.3"
 sxd-xpath = "0.4"
 webpage = { version = "2.0.1", features = ["serde"] }
 serde_json.workspace = true
-serde.workspace = true
\ No newline at end of file
+serde.workspace = true
diff --git a/crates/nu_plugin_stress_internals/Cargo.toml b/crates/nu_plugin_stress_internals/Cargo.toml
index 05c068bb41..ddd4da61e9 100644
--- a/crates/nu_plugin_stress_internals/Cargo.toml
+++ b/crates/nu_plugin_stress_internals/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_stre
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_stress_internals"
-version = "0.98.0"
+version = "0.98.1"
 
 [[bin]]
 name = "nu_plugin_stress_internals"
@@ -16,4 +16,4 @@ bench = false
 # assumptions about the serialized format
 serde = { workspace = true }
 serde_json = { workspace = true }
-interprocess = { workspace = true }
\ No newline at end of file
+interprocess = { workspace = true }
diff --git a/crates/nuon/Cargo.toml b/crates/nuon/Cargo.toml
index 0711dd2853..d6f6307f0a 100644
--- a/crates/nuon/Cargo.toml
+++ b/crates/nuon/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nuon"
 edition = "2021"
 license = "MIT"
 name = "nuon"
-version = "0.98.0"
+version = "0.98.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-parser = { path = "../nu-parser", version = "0.98.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.0" }
-nu-engine = { path = "../nu-engine", version = "0.98.0" }
+nu-parser = { path = "../nu-parser", version = "0.98.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
+nu-engine = { path = "../nu-engine", version = "0.98.1" }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 
@@ -20,4 +20,4 @@ fancy-regex = { workspace = true }
 chrono = { workspace = true }
 
 [lints]
-workspace = true
\ No newline at end of file
+workspace = true

From 299a218de7a37336329567070f49227097d670c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 22 Sep 2024 15:15:58 +0800
Subject: [PATCH 0449/1072] Bump tango-bench from 0.5.0 to 0.6.0 (#13861)

Bumps [tango-bench](https://github.com/bazhenov/tango) from 0.5.0 to
0.6.0.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/bazhenov/tango/commit/425ddb93be2d7a4c7a9ead35b984aed381ee9b50"><code>425ddb9</code></a>
v0.6.0</li>
<li><a
href="https://github.com/bazhenov/tango/commit/0da1bf5f3908ab4208bb809e702f56307c63b483"><code>0da1bf5</code></a>
Fixing incorrect path to gnuplot graph</li>
<li><a
href="https://github.com/bazhenov/tango/commit/6b084ea1896689de0ce65ff68688bd6dfa58f0be"><code>6b084ea</code></a>
Limit visibility of internal type</li>
<li><a
href="https://github.com/bazhenov/tango/commit/4ea09e22160bb40bdfa55863cac5ef2a6feb07e7"><code>4ea09e2</code></a>
Solo support (<a
href="https://redirect.github.com/bazhenov/tango/issues/35">#35</a>)</li>
<li><a
href="https://github.com/bazhenov/tango/commit/abd888cbc02dd68a620ee0c84738f1d1783475d8"><code>abd888c</code></a>
toolchain file added</li>
<li><a
href="https://github.com/bazhenov/tango/commit/2d722474ff47b4eb015117026ddc6a1a7e419eba"><code>2d72247</code></a>
Async poc (dev-branch) (<a
href="https://redirect.github.com/bazhenov/tango/issues/34">#34</a>)</li>
<li><a
href="https://github.com/bazhenov/tango/commit/5e236aec24f93f7cc7166977119566fefac04245"><code>5e236ae</code></a>
Simplify code</li>
<li><a
href="https://github.com/bazhenov/tango/commit/40569a9c98b3d937444f30ff7ba5eb228b3b01bf"><code>40569a9</code></a>
Documentation added</li>
<li><a
href="https://github.com/bazhenov/tango/commit/5908909fb219251edb76dce1c999c61b5390aa78"><code>5908909</code></a>
README updated</li>
<li><a
href="https://github.com/bazhenov/tango/commit/6fb1ebd6f692d2d6da8344f3a7bad4655a6cb714"><code>6fb1ebd</code></a>
Gnuplot support (<a
href="https://redirect.github.com/bazhenov/tango/issues/33">#33</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/bazhenov/tango/compare/v0.5.0...v0.6.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=tango-bench&package-manager=cargo&previous-version=0.5.0&new-version=0.6.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1b731ca059..f04e13588f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6120,9 +6120,9 @@ dependencies = [
 
 [[package]]
 name = "tango-bench"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e79d9e491b718fb52bb2052726a0e66fe89a31cc6979fe58c72c73f058c279e"
+checksum = "257822358c6f206fed78bfe6369cf959063b0644d70f88df6b19f2dadc93423e"
 dependencies = [
  "alloca",
  "anyhow",
diff --git a/Cargo.toml b/Cargo.toml
index 033521d2b1..a354fcbb68 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -239,7 +239,7 @@ nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.98.1"
 nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.98.1" }
 assert_cmd = "2.0"
 dirs = { workspace = true }
-tango-bench = "0.5"
+tango-bench = "0.6"
 pretty_assertions = { workspace = true }
 regex = { workspace = true }
 rstest = { workspace = true, default-features = false }

From 18c8c16c5e448032705a3152abb9a52d4d851043 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 22 Sep 2024 15:16:11 +0800
Subject: [PATCH 0450/1072] Bump unicode-segmentation from 1.11.0 to 1.12.0
 (#13862)

Bumps
[unicode-segmentation](https://github.com/unicode-rs/unicode-segmentation)
from 1.11.0 to 1.12.0.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/unicode-rs/unicode-segmentation/commit/9e3f88c06ca275294ef4cb1daf0789f06a28611d"><code>9e3f88c</code></a>
Publish 1.12</li>
<li><a
href="https://github.com/unicode-rs/unicode-segmentation/commit/187d8b8e848b202914c13d574241a9f7219a0ae7"><code>187d8b8</code></a>
Support Unicode 16.0.0 (<a
href="https://redirect.github.com/unicode-rs/unicode-segmentation/issues/140">#140</a>)</li>
<li><a
href="https://github.com/unicode-rs/unicode-segmentation/commit/0f55f70b445202fd9d3c101b9936e6649e808441"><code>0f55f70</code></a>
Fix unwrap panic in next_boundary() (<a
href="https://redirect.github.com/unicode-rs/unicode-segmentation/issues/137">#137</a>)</li>
<li><a
href="https://github.com/unicode-rs/unicode-segmentation/commit/0fa7148d3bfd1b1e35e942b27f8c86d460bae896"><code>0fa7148</code></a>
Merge pull request <a
href="https://redirect.github.com/unicode-rs/unicode-segmentation/issues/138">#138</a>
from cardigan1008/issue-overflow</li>
<li><a
href="https://github.com/unicode-rs/unicode-segmentation/commit/164f787b72d044562103cd4edb2027f321d032b8"><code>164f787</code></a>
fmt</li>
<li><a
href="https://github.com/unicode-rs/unicode-segmentation/commit/cbb87720d2a32eefdb0a7e18184deab2727d6d2e"><code>cbb8772</code></a>
fix: arithmetic overflow</li>
<li><a
href="https://github.com/unicode-rs/unicode-segmentation/commit/2081c29df7cf131341f01adfeb4ba1e8c68661c4"><code>2081c29</code></a>
Merge pull request <a
href="https://redirect.github.com/unicode-rs/unicode-segmentation/issues/136">#136</a>
from Jules-Bertholet/std-tables</li>
<li><a
href="https://github.com/unicode-rs/unicode-segmentation/commit/e96ec2eb6c099b8439570d6ae8cc4343d0bc59f1"><code>e96ec2e</code></a>
Use stdlib alphabetic and numeric character tables</li>
<li><a
href="https://github.com/unicode-rs/unicode-segmentation/commit/592ce00a3f90d521f18ce325b9641fcd30794c21"><code>592ce00</code></a>
Merge pull request <a
href="https://redirect.github.com/unicode-rs/unicode-segmentation/issues/134">#134</a>
from Jules-Bertholet/fix</li>
<li><a
href="https://github.com/unicode-rs/unicode-segmentation/commit/dce3a345cc5bdda1dd70438c1b85f733460f6a67"><code>dce3a34</code></a>
Add comments to <code>handle_incb_consonant</code></li>
<li>Additional commits viewable in <a
href="https://github.com/unicode-rs/unicode-segmentation/compare/v1.11.0...v1.12.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=unicode-segmentation&package-manager=cargo&previous-version=1.11.0&new-version=1.12.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f04e13588f..74d88afb20 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6568,9 +6568,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
 [[package]]
 name = "unicode-truncate"
diff --git a/Cargo.toml b/Cargo.toml
index a354fcbb68..afc7ff643f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -161,7 +161,7 @@ titlecase = "2.0"
 toml = "0.8"
 trash = "3.3"
 umask = "2.1"
-unicode-segmentation = "1.11"
+unicode-segmentation = "1.12"
 unicode-width = "0.1"
 ureq = { version = "2.10", default-features = false }
 url = "2.2"

From fb14008f50d98c07c552d603ebf1f13dad3a4362 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 22 Sep 2024 15:16:20 +0800
Subject: [PATCH 0451/1072] Bump shadow-rs from 0.34.0 to 0.35.0 (#13863)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [shadow-rs](https://github.com/baoyachi/shadow-rs) from 0.34.0 to
0.35.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/baoyachi/shadow-rs/releases">shadow-rs's
releases</a>.</em></p>
<blockquote>
<h2>v0.35.0</h2>
<h2>What's Changed</h2>
<ul>
<li>Update time crate by <a
href="https://github.com/diniamo"><code>@​diniamo</code></a> in <a
href="https://redirect.github.com/baoyachi/shadow-rs/pull/182">baoyachi/shadow-rs#182</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/diniamo"><code>@​diniamo</code></a> made
their first contribution in <a
href="https://redirect.github.com/baoyachi/shadow-rs/pull/182">baoyachi/shadow-rs#182</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/baoyachi/shadow-rs/compare/v0.34.0...v0.35.0">https://github.com/baoyachi/shadow-rs/compare/v0.34.0...v0.35.0</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/4358b4a0949fc50e50860ee625bc4dbfdc79166a"><code>4358b4a</code></a>
Update Cargo.toml</li>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/2851d669dd3b9caaabbf2ec4f87f46c67a642712"><code>2851d66</code></a>
Merge pull request <a
href="https://redirect.github.com/baoyachi/shadow-rs/issues/182">#182</a>
from diniamo/update-time</li>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/e77dcef733ddf5f9e2fe1e44ba949073d8e531a3"><code>e77dcef</code></a>
Update time crate</li>
<li>See full diff in <a
href="https://github.com/baoyachi/shadow-rs/compare/v0.34.0...v0.35.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=shadow-rs&package-manager=cargo&previous-version=0.34.0&new-version=0.35.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                    | 4 ++--
 crates/nu-cmd-lang/Cargo.toml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 74d88afb20..a509daaa4f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5715,9 +5715,9 @@ dependencies = [
 
 [[package]]
 name = "shadow-rs"
-version = "0.34.0"
+version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69fe0bac8a8752586a618a1c80d01d8ca5d40fce4f6077fbc851e48dcbdb90df"
+checksum = "fca0e9bdc073d7173ba993fb7886477af5df75588b57afcb4b96f21911ab0bfa"
 dependencies = [
  "const_format",
  "is_debug",
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index b529062e68..af00333b72 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -21,10 +21,10 @@ nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
 nu-utils = { path = "../nu-utils", version = "0.98.1" }
 
 itertools = { workspace = true }
-shadow-rs = { version = "0.34", default-features = false }
+shadow-rs = { version = "0.35", default-features = false }
 
 [build-dependencies]
-shadow-rs = { version = "0.34", default-features = false }
+shadow-rs = { version = "0.35", default-features = false }
 
 [features]
 mimalloc = []

From 5c5cf418fb6c9a2a69f8c254b8e91f1cc8f86052 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 22 Sep 2024 15:16:28 +0800
Subject: [PATCH 0452/1072] Bump crate-ci/typos from 1.24.5 to 1.24.6 (#13864)

Bumps [crate-ci/typos](https://github.com/crate-ci/typos) from 1.24.5 to
1.24.6.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/crate-ci/typos/releases">crate-ci/typos's
releases</a>.</em></p>
<blockquote>
<h2>v1.24.6</h2>
<h2>[1.24.6] - 2024-09-16</h2>
<h3>Fixes</h3>
<ul>
<li>Respect negation (<code>!</code>) in
<code>extend-exclude</code></li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/crate-ci/typos/blob/master/CHANGELOG.md">crate-ci/typos's
changelog</a>.</em></p>
<blockquote>
<h2>[1.24.6] - 2024-09-16</h2>
<h3>Fixes</h3>
<ul>
<li>Respect negation (<code>!</code>) in
<code>extend-exclude</code></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/crate-ci/typos/commit/8e6a4285bcbde632c5d79900a7779746e8b7ea3f"><code>8e6a428</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/cab7c3c4a5689885b27532e5abfc2396c9115417"><code>cab7c3c</code></a>
docs: Update changelog</li>
<li><a
href="https://github.com/crate-ci/typos/commit/c4a659223979f6ca192e71e3ea7147e0cf9b225c"><code>c4a6592</code></a>
Merge pull request <a
href="https://redirect.github.com/crate-ci/typos/issues/1100">#1100</a>
from epage/invert</li>
<li><a
href="https://github.com/crate-ci/typos/commit/ad3538f7199c880c450a1ea0b5b465c187cece5c"><code>ad3538f</code></a>
refactor(cli): Switch from Overrides to Gitignore</li>
<li><a
href="https://github.com/crate-ci/typos/commit/d9b55f966cbffa8e201ffa525cadfc608938b3d0"><code>d9b55f9</code></a>
fix(cli): Allow negative expressions in extend-exclude</li>
<li><a
href="https://github.com/crate-ci/typos/commit/777cf42dc2d133b4dd91f2ec52cdd7347f9c3d74"><code>777cf42</code></a>
refactor(cli): Be explicit in overrides</li>
<li><a
href="https://github.com/crate-ci/typos/commit/0e8148fbbdfdf4412219b962474ebd9672c6bc24"><code>0e8148f</code></a>
test(cli): Show inverted extend-exclude behavior</li>
<li>See full diff in <a
href="https://github.com/crate-ci/typos/compare/v1.24.5...v1.24.6">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=crate-ci/typos&package-manager=github_actions&previous-version=1.24.5&new-version=1.24.6)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/typos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index 50eb74d0e5..f13bc77876 100644
--- 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.24.5
+        uses: crate-ci/typos@v1.24.6

From cf5fec63c07b38ab7b318ef3f8e3e6c3d866265f Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Sun, 22 Sep 2024 17:20:15 +0800
Subject: [PATCH 0453/1072] Add loongarch64-unknown-linux-gnu-gcc build target
 (#13895)

# Description

Add `loongarch64-unknown-linux-gnu-gcc` build target
A test release could be found here:
https://github.com/nushell/nightly/releases/tag/v0.98.1
Loongarch64 workflow build result:
https://github.com/nushell/nightly/actions/runs/10973523602/job/30471006104
---
 .github/workflows/nightly-build.yml | 3 +++
 .github/workflows/release-pkg.nu    | 7 +++++++
 .github/workflows/release.yml       | 3 +++
 3 files changed, 13 insertions(+)

diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index abef444ec3..ef5a7c7f57 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -82,6 +82,7 @@ jobs:
         - armv7-unknown-linux-gnueabihf
         - armv7-unknown-linux-musleabihf
         - riscv64gc-unknown-linux-gnu
+        - loongarch64-unknown-linux-gnu
         extra: ['bin']
         include:
         - target: aarch64-apple-darwin
@@ -114,6 +115,8 @@ jobs:
           os: ubuntu-22.04
         - target: riscv64gc-unknown-linux-gnu
           os: ubuntu-latest
+        - target: loongarch64-unknown-linux-gnu
+          os: ubuntu-22.04
 
     runs-on: ${{matrix.os}}
 
diff --git a/.github/workflows/release-pkg.nu b/.github/workflows/release-pkg.nu
index 85ce6a1caf..0c65dcb44d 100755
--- a/.github/workflows/release-pkg.nu
+++ b/.github/workflows/release-pkg.nu
@@ -98,6 +98,13 @@ if $os in ['macos-latest'] or $USE_UBUNTU {
             $env.CARGO_TARGET_ARMV7_UNKNOWN_LINUX_MUSLEABIHF_LINKER = 'armv7r-linux-musleabihf-gcc'
             cargo-build-nu
         }
+        'loongarch64-unknown-linux-gnu' => {
+            aria2c https://github.com/loongson/build-tools/releases/download/2024.08.08/x86_64-cross-tools-loongarch64-binutils_2.43-gcc_14.2.0-glibc_2.40.tar.xz
+            tar xf x86_64-cross-tools-loongarch64-*.tar.xz
+            $env.PATH = ($env.PATH | split row (char esep) | prepend $'($env.PWD)/cross-tools/bin')
+            $env.CARGO_TARGET_LOONGARCH64_UNKNOWN_LINUX_GNU_LINKER = 'loongarch64-unknown-linux-gnu-gcc'
+            cargo-build-nu
+        }
         _ => {
             # musl-tools to fix 'Failed to find tool. Is `musl-gcc` installed?'
             # Actually just for x86_64-unknown-linux-musl target
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ed42b5c3ca..00fec604f3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,6 +32,7 @@ jobs:
         - armv7-unknown-linux-gnueabihf
         - armv7-unknown-linux-musleabihf
         - riscv64gc-unknown-linux-gnu
+        - loongarch64-unknown-linux-gnu
         extra: ['bin']
         include:
         - target: aarch64-apple-darwin
@@ -64,6 +65,8 @@ jobs:
           os: ubuntu-22.04
         - target: riscv64gc-unknown-linux-gnu
           os: ubuntu-latest
+        - target: loongarch64-unknown-linux-gnu
+          os: ubuntu-22.04
 
     runs-on: ${{matrix.os}}
 

From cd0d0364ecc759bf7401f8d762611ceeb0e8c909 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Sun, 22 Sep 2024 07:26:32 -0700
Subject: [PATCH 0454/1072] Fix `do -p` not waiting for external commands
 (#13881)

# Description
Similar to #13870 (thanks @WindSoilder), this PR adds a boolean which
determines whether to ignore any errors from an external command. This
is in order to fix #13876. I.e., `do -p` does not wait for externals to
complete before continuing.

# User-Facing Changes
Bug fix.

# Tests + Formatting
Added a test.
---
 crates/nu-cmd-lang/src/core_commands/do_.rs   |  2 +-
 crates/nu-command/tests/commands/do_.rs       |  7 +++++++
 crates/nu-protocol/src/process/child.rs       | 17 ++++++++++++-----
 crates/nu-protocol/src/process/exit_status.rs |  8 +++++---
 4 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/crates/nu-cmd-lang/src/core_commands/do_.rs b/crates/nu-cmd-lang/src/core_commands/do_.rs
index b05de81d57..742bc3d218 100644
--- a/crates/nu-cmd-lang/src/core_commands/do_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/do_.rs
@@ -169,7 +169,7 @@ impl Command for Do {
                     && !matches!(caller_stack.stdout(), OutDest::Pipe | OutDest::Capture) =>
             {
                 if let ByteStreamSource::Child(child) = stream.source_mut() {
-                    child.set_exit_code(0)
+                    child.ignore_error();
                 }
                 Ok(PipelineData::ByteStream(stream, metadata))
             }
diff --git a/crates/nu-command/tests/commands/do_.rs b/crates/nu-command/tests/commands/do_.rs
index 645421c15f..fe7959acb4 100644
--- a/crates/nu-command/tests/commands/do_.rs
+++ b/crates/nu-command/tests/commands/do_.rs
@@ -73,3 +73,10 @@ fn run_closure_with_it_using() {
     assert!(actual.err.is_empty());
     assert_eq!(actual.out, "3");
 }
+
+#[test]
+fn waits_for_external() {
+    let actual = nu!(r#"do -p { nu -c 'sleep 1sec; print before; exit 1'}; print after"#);
+    assert!(actual.err.is_empty());
+    assert_eq!(actual.out, "beforeafter");
+}
diff --git a/crates/nu-protocol/src/process/child.rs b/crates/nu-protocol/src/process/child.rs
index 320427a819..9ab92b331c 100644
--- a/crates/nu-protocol/src/process/child.rs
+++ b/crates/nu-protocol/src/process/child.rs
@@ -29,7 +29,7 @@ impl ExitStatusFuture {
                             core_dumped: true, ..
                         },
                     )) => {
-                        status.check_ok(span)?;
+                        status.check_ok(false, span)?;
                         Ok(status)
                     }
                     Ok(Ok(status)) => Ok(status),
@@ -109,6 +109,7 @@ pub struct ChildProcess {
     pub stdout: Option<ChildPipe>,
     pub stderr: Option<ChildPipe>,
     exit_status: ExitStatusFuture,
+    ignore_error: bool,
     span: Span,
 }
 
@@ -155,12 +156,14 @@ impl ChildProcess {
             exit_status: exit_status
                 .map(ExitStatusFuture::Running)
                 .unwrap_or(ExitStatusFuture::Finished(Ok(ExitStatus::Exited(0)))),
+            ignore_error: false,
             span,
         }
     }
 
-    pub fn set_exit_code(&mut self, exit_code: i32) {
-        self.exit_status = ExitStatusFuture::Finished(Ok(ExitStatus::Exited(exit_code)));
+    pub fn ignore_error(&mut self) -> &mut Self {
+        self.ignore_error = true;
+        self
     }
 
     pub fn span(&self) -> Span {
@@ -182,7 +185,9 @@ impl ChildProcess {
             Vec::new()
         };
 
-        self.exit_status.wait(self.span)?.check_ok(self.span)?;
+        self.exit_status
+            .wait(self.span)?
+            .check_ok(self.ignore_error, self.span)?;
 
         Ok(bytes)
     }
@@ -223,7 +228,9 @@ impl ChildProcess {
             consume_pipe(stderr).err_span(self.span)?;
         }
 
-        self.exit_status.wait(self.span)?.check_ok(self.span)
+        self.exit_status
+            .wait(self.span)?
+            .check_ok(self.ignore_error, self.span)
     }
 
     pub fn try_wait(&mut self) -> Result<Option<ExitStatus>, ShellError> {
diff --git a/crates/nu-protocol/src/process/exit_status.rs b/crates/nu-protocol/src/process/exit_status.rs
index 0ea6b0e72b..8f37902aae 100644
--- a/crates/nu-protocol/src/process/exit_status.rs
+++ b/crates/nu-protocol/src/process/exit_status.rs
@@ -20,10 +20,12 @@ impl ExitStatus {
         }
     }
 
-    pub fn check_ok(self, span: Span) -> Result<(), ShellError> {
+    pub fn check_ok(self, ignore_error: bool, span: Span) -> Result<(), ShellError> {
         match self {
             ExitStatus::Exited(exit_code) => {
-                if let Ok(exit_code) = exit_code.try_into() {
+                if ignore_error {
+                    Ok(())
+                } else if let Ok(exit_code) = exit_code.try_into() {
                     Err(ShellError::NonZeroExitCode { exit_code, span })
                 } else {
                     Ok(())
@@ -38,7 +40,7 @@ impl ExitStatus {
 
                 let sig = Signal::try_from(signal);
 
-                if sig == Ok(Signal::SIGPIPE) {
+                if sig == Ok(Signal::SIGPIPE) || (ignore_error && !core_dumped) {
                     // Processes often exit with SIGPIPE, but this is not an error condition.
                     Ok(())
                 } else {

From 5fa9d7650073c1dc764c16ea565bd26c0fdec747 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.dev>
Date: Mon, 23 Sep 2024 07:28:41 -0400
Subject: [PATCH 0455/1072] polars: add binary type support (#13830)

# Description
This adds support for reading and writing binary types in the polars
commands.

The `BinaryOffset` type can be read into a Nushell native `Value` type
no problem, but unfortunately this is a lossy conversion, as there's
no Nushell-native semantic equivalent to the fixed size binary type
in Arrow.

# User-Facing Changes

`polars open` and `polars save` now work with binary types.
---
 .../values/nu_dataframe/conversion.rs         | 39 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
index 2e988a08b3..c01b0ae834 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
@@ -12,8 +12,8 @@ use polars::prelude::{
     DataFrame, DataType, DatetimeChunked, Float32Type, Float64Type, Int16Type, Int32Type,
     Int64Type, Int8Type, IntoSeries, ListBooleanChunkedBuilder, ListBuilderTrait,
     ListPrimitiveChunkedBuilder, ListStringChunkedBuilder, ListType, NamedFrom, NewChunkedArray,
-    ObjectType, Schema, Series, StructChunked, TemporalMethods, TimeUnit, UInt16Type, UInt32Type,
-    UInt64Type, UInt8Type,
+    ObjectType, PolarsError, Schema, Series, StructChunked, TemporalMethods, TimeUnit, UInt16Type,
+    UInt32Type, UInt64Type, UInt8Type,
 };
 
 use nu_protocol::{Record, ShellError, Span, Value};
@@ -237,6 +237,7 @@ pub fn insert_value(
             | (Value::Bool { .. }, Value::Bool { .. })
             | (Value::Date { .. }, Value::Date { .. })
             | (Value::Filesize { .. }, Value::Filesize { .. })
+            | (Value::Binary { .. }, Value::Binary { .. })
             | (Value::Duration { .. }, Value::Duration { .. }) => col_val.values.push(value),
             (_, Value::Nothing { .. }) => col_val.values.push(value),
             (Value::List { .. }, _) => {
@@ -261,6 +262,7 @@ fn value_to_data_type(value: &Value) -> DataType {
         Value::Date { .. } => DataType::Date,
         Value::Duration { .. } => DataType::Duration(TimeUnit::Nanoseconds),
         Value::Filesize { .. } => DataType::Int64,
+        Value::Binary { .. } => DataType::Binary,
         Value::List { vals, .. } => {
             // We need to determined the type inside of the list.
             // Since Value::List does not have any kind of
@@ -404,6 +406,11 @@ fn typed_column_to_series(name: &str, column: TypedColumn) -> Result<Series, She
                     .collect();
                 Ok(Series::new(name, series_values?))
             }
+            DataType::Binary | DataType::BinaryOffset => {
+                let series_values: Result<Vec<_>, _> =
+                    column.values.iter().map(|v| v.coerce_binary()).collect();
+                Ok(Series::new(name, series_values?))
+            }
             DataType::Object(_, _) => value_to_series(name, &column.values),
             DataType::Duration(time_unit) => {
                 let series_values: Result<Vec<_>, _> = column
@@ -965,6 +972,34 @@ fn series_to_values(
 
             Ok(values)
         }
+        t @ (DataType::Binary | DataType::BinaryOffset) => {
+            let make_err = |e: PolarsError| ShellError::GenericError {
+                error: "Error casting column to binary".into(),
+                msg: "".into(),
+                span: None,
+                help: Some(e.to_string()),
+                inner: vec![],
+            };
+
+            let it = match t {
+                DataType::Binary => series.binary().map_err(make_err)?.into_iter(),
+                DataType::BinaryOffset => series.binary_offset().map_err(make_err)?.into_iter(),
+                _ => unreachable!(),
+            };
+
+            let values = if let (Some(size), Some(from_row)) = (maybe_size, maybe_from_row) {
+                Either::Left(it.skip(from_row).take(size))
+            } else {
+                Either::Right(it)
+            }
+            .map(|v| match v {
+                Some(b) => Value::binary(b, span),
+                None => Value::nothing(span),
+            })
+            .collect::<Vec<Value>>();
+
+            Ok(values)
+        }
         DataType::Object(x, _) => {
             let casted = series
                 .as_any()

From 93351b889a6603cd794ed96c52845879d9a6f3f4 Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Mon, 23 Sep 2024 14:42:52 +0300
Subject: [PATCH 0456/1072] view source: add content_type metadata (#13859)

# Description
Add content type metadata to the output of `view source`.

I've gone along with the mime type used [here][xdg], but this shouldn't
be merged until there is consensus #13858.

`to nuon`'s output has content type `application/x-nuon`

[xdg]:
https://gitlab.freedesktop.org/xdg/shared-mime-info/-/merge_requests/231

# User-Facing Changes
Combined with `metadata access`, allows richer display_output hooks.
Might be useful with other commands that make use of content_type like
the `http` commands.
---
 crates/nu-command/src/debug/view_source.rs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/crates/nu-command/src/debug/view_source.rs b/crates/nu-command/src/debug/view_source.rs
index b0163c3bd1..417da5ec1e 100644
--- a/crates/nu-command/src/debug/view_source.rs
+++ b/crates/nu-command/src/debug/view_source.rs
@@ -1,5 +1,5 @@
 use nu_engine::command_prelude::*;
-use nu_protocol::Config;
+use nu_protocol::{Config, DataSource, PipelineMetadata};
 
 use std::fmt::Write;
 
@@ -32,7 +32,7 @@ impl Command for ViewSource {
         let arg: Value = call.req(engine_state, stack, 0)?;
         let arg_span = arg.span();
 
-        match arg {
+        let source = match arg {
             Value::String { val, .. } => {
                 if let Some(decl_id) = engine_state.find_decl(val.as_bytes(), &[]) {
                     // arg is a command
@@ -193,7 +193,13 @@ impl Command for ViewSource {
                     })
                 }
             }
-        }
+        };
+        source.map(|x| {
+            x.set_metadata(Some(PipelineMetadata {
+                data_source: DataSource::None,
+                content_type: Some("application/x-nuscript".into()),
+            }))
+        })
     }
 
     fn examples(&self) -> Vec<Example> {

From ee877607fb5500d378e261a4a4f3495db8deec03 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Mon, 23 Sep 2024 06:43:19 -0500
Subject: [PATCH 0457/1072] fix the ability to add a plugin by name instead of
 path (#13877)

# Description

This plugin fixes the ability to do `plugin add nu_plugin_polars` and
have nushell look in NU_PLUGINS_DIR to find the plugin and add it.

closes #13040

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-cmd-plugin/src/commands/plugin/add.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/crates/nu-cmd-plugin/src/commands/plugin/add.rs b/crates/nu-cmd-plugin/src/commands/plugin/add.rs
index fa0b599de3..c12f486668 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/add.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/add.rs
@@ -1,10 +1,9 @@
+use crate::util::{get_plugin_dirs, modify_plugin_file};
 use nu_engine::command_prelude::*;
 use nu_plugin_engine::{GetPlugin, PersistentPlugin};
 use nu_protocol::{PluginGcConfig, PluginIdentity, PluginRegistryItem, RegisteredPlugin};
 use std::sync::Arc;
 
-use crate::util::{get_plugin_dirs, modify_plugin_file};
-
 #[derive(Clone)]
 pub struct PluginAdd;
 
@@ -31,7 +30,7 @@ impl Command for PluginAdd {
             )
             .required(
                 "filename",
-                SyntaxShape::Filepath,
+                SyntaxShape::String,
                 "Path to the executable for the plugin",
             )
             .category(Category::Plugin)
@@ -81,7 +80,6 @@ apparent the next time `nu` is next launched with that plugin registry file.
     ) -> Result<PipelineData, ShellError> {
         let filename: Spanned<String> = call.req(engine_state, stack, 0)?;
         let shell: Option<Spanned<String>> = call.get_flag(engine_state, stack, "shell")?;
-
         let cwd = engine_state.cwd(Some(stack))?;
 
         // Check the current directory, or fall back to NU_PLUGIN_DIRS

From 2541a712e4091a334c66d750e7246c77413ce76d Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Mon, 23 Sep 2024 04:43:43 -0700
Subject: [PATCH 0458/1072] Added `polars concat` to allow concatenation of
 multiple dataframes (#13879)

# Description
Provides the ability to concatenate multiple dataframes together

# User-Facing Changes
- Introduces new command `polars concat`
---
 .../src/dataframe/command/data/concat.rs      | 162 ++++++++++++++++++
 .../src/dataframe/command/data/mod.rs         |   2 +
 2 files changed, 164 insertions(+)
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/data/concat.rs

diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/concat.rs b/crates/nu_plugin_polars/src/dataframe/command/data/concat.rs
new file mode 100644
index 0000000000..afb2a1733d
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/concat.rs
@@ -0,0 +1,162 @@
+use crate::{
+    values::{CustomValueSupport, NuLazyFrame},
+    PolarsPlugin,
+};
+
+use crate::values::NuDataFrame;
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{
+    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
+    Value,
+};
+use polars::{
+    df,
+    prelude::{LazyFrame, UnionArgs},
+};
+
+#[derive(Clone)]
+pub struct ConcatDF;
+
+impl PluginCommand for ConcatDF {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars concat"
+    }
+
+    fn description(&self) -> &str {
+        "Concatenate two or more dataframes."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .switch("no-parallel", "Disable parallel execution", None)
+            .switch("rechunk", "Rechunk the resulting dataframe", None)
+            .switch("to-supertypes", "Cast to supertypes", None)
+            .switch("diagonal", "Concatenate dataframes diagonally", None)
+            .switch(
+                "from-partitioned-ds",
+                "Concatenate dataframes from a partitioned dataset",
+                None,
+            )
+            .rest(
+                "dataframes",
+                SyntaxShape::Any,
+                "The dataframes to concatenate",
+            )
+            .input_output_type(Type::Any, Type::Custom("dataframe".into()))
+            .category(Category::Custom("dataframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Concatenates two dataframes with the dataframe in the pipeline.",
+                example: "[[a b]; [1 2]] | polars into-df 
+                    | polars concat ([[a b]; [3 4]] | polars into-df) ([[a b]; [5 6]] | polars into-df) 
+                    | polars collect 
+                    | polars sort-by [a b]",
+                result: Some(
+                    NuDataFrame::from(
+                        df!(
+                            "a" => [1, 3, 5],
+                            "b" => [2, 4, 6],
+                        )
+                        .expect("simple df for test should not fail"),
+                    )
+                    .into_value(Span::test_data()),
+                ),
+            },
+            Example {
+                description: "Concatenates three dataframes together",
+                example: "polars concat ([[a b]; [1 2]] | polars into-df) ([[a b]; [3 4]] | polars into-df) ([[a b]; [5 6]] | polars into-df) 
+                    | polars collect 
+                    | polars sort-by [a b]",
+                result: Some(
+                    NuDataFrame::from(
+                        df!(
+                            "a" => [1, 3, 5],
+                            "b" => [2, 4, 6],
+                        )
+                        .expect("simple df for test should not fail"),
+                    )
+                    .into_value(Span::test_data()),
+                ),
+            }
+        ]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        let maybe_df = NuLazyFrame::try_from_pipeline_coerce(plugin, input, call.head).ok();
+        command_lazy(plugin, engine, call, maybe_df).map_err(LabeledError::from)
+    }
+}
+
+fn command_lazy(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    maybe_lazy: Option<NuLazyFrame>,
+) -> Result<PipelineData, ShellError> {
+    let parallel = !call.has_flag("no-parallel")?;
+    let rechunk = call.has_flag("rechunk")?;
+    let to_supertypes = call.has_flag("to-supertypes")?;
+    let diagonal = call.has_flag("diagonal")?;
+    let from_partitioned_ds = call.has_flag("from-partitioned-ds")?;
+    let mut dataframes = call
+        .rest::<Value>(0)?
+        .iter()
+        .map(|v| NuLazyFrame::try_from_value_coerce(plugin, v).map(|lazy| lazy.to_polars()))
+        .collect::<Result<Vec<LazyFrame>, ShellError>>()?;
+
+    if dataframes.is_empty() {
+        Err(ShellError::GenericError {
+            error: "At least one other dataframe must be provided".into(),
+            msg: "".into(),
+            span: Some(call.head),
+            help: None,
+            inner: vec![],
+        })
+    } else {
+        if let Some(lazy) = maybe_lazy.as_ref() {
+            dataframes.insert(0, lazy.to_polars());
+        }
+        let args = UnionArgs {
+            parallel,
+            rechunk,
+            to_supertypes,
+            diagonal,
+            from_partitioned_ds,
+        };
+
+        let res: NuLazyFrame = polars::prelude::concat(&dataframes, args)
+            .map_err(|e| ShellError::GenericError {
+                error: format!("Failed to concatenate dataframes: {e}"),
+                msg: "".into(),
+                span: Some(call.head),
+                help: None,
+                inner: vec![],
+            })?
+            .into();
+
+        res.to_pipeline_data(plugin, engine, call.head)
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use crate::test::test_polars_plugin_command;
+
+    use super::*;
+
+    #[test]
+    fn test_examples() -> Result<(), ShellError> {
+        test_polars_plugin_command(&ConcatDF)
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/mod.rs b/crates/nu_plugin_polars/src/dataframe/command/data/mod.rs
index 302b5f4685..f11ac31fe4 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/mod.rs
@@ -4,6 +4,7 @@ mod arg_where;
 mod cast;
 mod col;
 mod collect;
+mod concat;
 mod drop;
 mod drop_duplicates;
 mod drop_nulls;
@@ -74,6 +75,7 @@ pub(crate) fn data_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin
         Box::new(AppendDF),
         Box::new(CastDF),
         Box::new(DropDF),
+        Box::new(concat::ConcatDF),
         Box::new(DropDuplicates),
         Box::new(DropNulls),
         Box::new(Dummies),

From 03ee54a4df36889fa6accc52a8d33b1a21717732 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Mon, 23 Sep 2024 04:44:25 -0700
Subject: [PATCH 0459/1072] Fix `try` not working with `let`, etc. (#13885)

# Description
Partialy addresses #13868. `try` does not catch non-zero exit code
errors from the last command in a pipeline if the result is assigned to
a variable using `let` (or `mut`).

This was fixed by adding a new `OutDest::Value` case. This is used when
the pipeline is in a "value" position. I.e., it will be collected into a
value. This ended up replacing most of the usages of `OutDest::Capture`.
So, this PR also renames `OutDest::Capture` to `OutDest::PipeSeparate`
to better fit the few remaining use cases for it.

# User-Facing Changes
Bug fix.

# Tests + Formatting
Added two tests.
---
 crates/nu-cli/src/completions/completer.rs    |  2 +-
 crates/nu-cli/src/menus/menu_completions.rs   |  2 +-
 crates/nu-cli/src/reedline_config.rs          |  2 +-
 crates/nu-cmd-lang/src/core_commands/do_.rs   |  5 ++++-
 crates/nu-cmd-lang/src/core_commands/let_.rs  |  2 +-
 crates/nu-cmd-lang/src/core_commands/mut_.rs  |  2 +-
 crates/nu-cmd-lang/src/example_support.rs     |  4 ++--
 crates/nu-command/src/filesystem/save.rs      |  2 +-
 crates/nu-command/src/filters/tee.rs          | 10 ++++-----
 crates/nu-command/src/system/complete.rs      |  2 +-
 crates/nu-command/src/system/run_external.rs  |  4 ++--
 crates/nu-command/tests/commands/try_.rs      | 12 ++++++++++
 crates/nu-engine/src/compile/call.rs          |  2 +-
 crates/nu-engine/src/compile/expression.rs    | 22 +++++++++----------
 crates/nu-engine/src/compile/keyword.rs       | 16 +++++++-------
 crates/nu-engine/src/compile/operator.rs      | 12 +++++-----
 crates/nu-engine/src/compile/redirect.rs      |  9 ++++----
 crates/nu-engine/src/documentation.rs         |  6 ++---
 crates/nu-engine/src/eval.rs                  |  8 +++----
 crates/nu-engine/src/eval_ir.rs               |  3 ++-
 crates/nu-explore/src/nu_common/command.rs    |  4 ++--
 crates/nu-plugin-engine/src/context.rs        |  8 +++----
 crates/nu-plugin-engine/src/persistent.rs     |  2 +-
 .../nu-plugin-test-support/src/plugin_test.rs |  2 +-
 crates/nu-protocol/src/engine/stack.rs        | 21 +++++++++---------
 .../nu-protocol/src/engine/stack_out_dest.rs  | 14 ++++++------
 crates/nu-protocol/src/ir/display.rs          |  9 ++++----
 crates/nu-protocol/src/ir/mod.rs              |  3 ++-
 .../nu-protocol/src/pipeline/byte_stream.rs   |  8 +++----
 crates/nu-protocol/src/pipeline/out_dest.rs   | 10 ++++++---
 .../nu-protocol/src/pipeline/pipeline_data.rs | 15 +++++++++----
 src/test_bins.rs                              |  2 +-
 32 files changed, 127 insertions(+), 98 deletions(-)

diff --git a/crates/nu-cli/src/completions/completer.rs b/crates/nu-cli/src/completions/completer.rs
index f4e3b1e817..079425e2a7 100644
--- a/crates/nu-cli/src/completions/completer.rs
+++ b/crates/nu-cli/src/completions/completer.rs
@@ -25,7 +25,7 @@ impl NuCompleter {
     pub fn new(engine_state: Arc<EngineState>, stack: Arc<Stack>) -> Self {
         Self {
             engine_state,
-            stack: Stack::with_parent(stack).reset_out_dest().capture(),
+            stack: Stack::with_parent(stack).reset_out_dest().collect_value(),
         }
     }
 
diff --git a/crates/nu-cli/src/menus/menu_completions.rs b/crates/nu-cli/src/menus/menu_completions.rs
index af653843f0..4c4c9f59e8 100644
--- a/crates/nu-cli/src/menus/menu_completions.rs
+++ b/crates/nu-cli/src/menus/menu_completions.rs
@@ -28,7 +28,7 @@ impl NuMenuCompleter {
         Self {
             block_id,
             span,
-            stack: stack.reset_out_dest().capture(),
+            stack: stack.reset_out_dest().collect_value(),
             engine_state,
             only_buffer_difference,
         }
diff --git a/crates/nu-cli/src/reedline_config.rs b/crates/nu-cli/src/reedline_config.rs
index 71fd9f32e1..6c3d457612 100644
--- a/crates/nu-cli/src/reedline_config.rs
+++ b/crates/nu-cli/src/reedline_config.rs
@@ -122,7 +122,7 @@ pub(crate) fn add_menus(
 
             engine_state.merge_delta(delta)?;
 
-            let mut temp_stack = Stack::new().capture();
+            let mut temp_stack = Stack::new().collect_value();
             let input = PipelineData::Empty;
             menu_eval_results.push(eval_block::<WithoutDebug>(
                 &engine_state,
diff --git a/crates/nu-cmd-lang/src/core_commands/do_.rs b/crates/nu-cmd-lang/src/core_commands/do_.rs
index 742bc3d218..3a48c66745 100644
--- a/crates/nu-cmd-lang/src/core_commands/do_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/do_.rs
@@ -166,7 +166,10 @@ impl Command for Do {
             }
             Ok(PipelineData::ByteStream(mut stream, metadata))
                 if ignore_program_errors
-                    && !matches!(caller_stack.stdout(), OutDest::Pipe | OutDest::Capture) =>
+                    && !matches!(
+                        caller_stack.stdout(),
+                        OutDest::Pipe | OutDest::PipeSeparate | OutDest::Value
+                    ) =>
             {
                 if let ByteStreamSource::Child(child) = stream.source_mut() {
                     child.ignore_error();
diff --git a/crates/nu-cmd-lang/src/core_commands/let_.rs b/crates/nu-cmd-lang/src/core_commands/let_.rs
index 3e0b2f97eb..b7deca5b81 100644
--- a/crates/nu-cmd-lang/src/core_commands/let_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/let_.rs
@@ -63,7 +63,7 @@ impl Command for Let {
 
         let block = engine_state.get_block(block_id);
         let eval_block = get_eval_block(engine_state);
-        let stack = &mut stack.start_capture();
+        let stack = &mut stack.start_collect_value();
         let pipeline_data = eval_block(engine_state, stack, block, input)?;
         let value = pipeline_data.into_value(call.head)?;
 
diff --git a/crates/nu-cmd-lang/src/core_commands/mut_.rs b/crates/nu-cmd-lang/src/core_commands/mut_.rs
index a72d8f484f..785a47f943 100644
--- a/crates/nu-cmd-lang/src/core_commands/mut_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/mut_.rs
@@ -63,7 +63,7 @@ impl Command for Mut {
 
         let block = engine_state.get_block(block_id);
         let eval_block = get_eval_block(engine_state);
-        let stack = &mut stack.start_capture();
+        let stack = &mut stack.start_collect_value();
         let pipeline_data = eval_block(engine_state, stack, block, input)?;
         let value = pipeline_data.into_value(call.head)?;
 
diff --git a/crates/nu-cmd-lang/src/example_support.rs b/crates/nu-cmd-lang/src/example_support.rs
index 8df5a6c1e8..e430c35c43 100644
--- a/crates/nu-cmd-lang/src/example_support.rs
+++ b/crates/nu-cmd-lang/src/example_support.rs
@@ -126,7 +126,7 @@ pub fn eval_block(
     cwd: &std::path::Path,
     engine_state: &EngineState,
 ) -> Value {
-    let mut stack = Stack::new().capture();
+    let mut stack = Stack::new().collect_value();
 
     stack.add_env_var("PWD".to_string(), Value::test_string(cwd.to_string_lossy()));
 
@@ -143,7 +143,7 @@ pub fn check_example_evaluates_to_expected_output(
     cwd: &std::path::Path,
     engine_state: &mut Box<EngineState>,
 ) {
-    let mut stack = Stack::new().capture();
+    let mut stack = Stack::new().collect_value();
 
     // Set up PWD
     stack.add_env_var("PWD".to_string(), Value::test_string(cwd.to_string_lossy()));
diff --git a/crates/nu-command/src/filesystem/save.rs b/crates/nu-command/src/filesystem/save.rs
index 1b6ddd5982..f14ed25471 100644
--- a/crates/nu-command/src/filesystem/save.rs
+++ b/crates/nu-command/src/filesystem/save.rs
@@ -270,7 +270,7 @@ impl Command for Save {
     }
 
     fn pipe_redirection(&self) -> (Option<OutDest>, Option<OutDest>) {
-        (Some(OutDest::Capture), Some(OutDest::Capture))
+        (Some(OutDest::PipeSeparate), Some(OutDest::PipeSeparate))
     }
 }
 
diff --git a/crates/nu-command/src/filters/tee.rs b/crates/nu-command/src/filters/tee.rs
index 65c0aba546..02afdc5271 100644
--- a/crates/nu-command/src/filters/tee.rs
+++ b/crates/nu-command/src/filters/tee.rs
@@ -158,7 +158,7 @@ use it in your pipeline."#
                             let tee_thread = spawn_tee(info.clone(), eval_block)?;
                             let tee = IoTee::new(stderr, tee_thread);
                             match stack.stderr() {
-                                OutDest::Pipe | OutDest::Capture => {
+                                OutDest::Pipe | OutDest::PipeSeparate | OutDest::Value => {
                                     child.stderr = Some(ChildPipe::Tee(Box::new(tee)));
                                     Ok(None)
                                 }
@@ -176,7 +176,7 @@ use it in your pipeline."#
 
                         if let Some(stdout) = child.stdout.take() {
                             match stack.stdout() {
-                                OutDest::Pipe | OutDest::Capture => {
+                                OutDest::Pipe | OutDest::PipeSeparate | OutDest::Value => {
                                     child.stdout = Some(stdout);
                                     Ok(())
                                 }
@@ -191,7 +191,7 @@ use it in your pipeline."#
                         let stderr_thread = if let Some(stderr) = child.stderr.take() {
                             let info = info.clone();
                             match stack.stderr() {
-                                OutDest::Pipe | OutDest::Capture => {
+                                OutDest::Pipe | OutDest::PipeSeparate | OutDest::Value => {
                                     child.stderr = Some(stderr);
                                     Ok(None)
                                 }
@@ -213,7 +213,7 @@ use it in your pipeline."#
                             let tee_thread = spawn_tee(info.clone(), eval_block)?;
                             let tee = IoTee::new(stdout, tee_thread);
                             match stack.stdout() {
-                                OutDest::Pipe | OutDest::Capture => {
+                                OutDest::Pipe | OutDest::PipeSeparate | OutDest::Value => {
                                     child.stdout = Some(ChildPipe::Tee(Box::new(tee)));
                                     Ok(())
                                 }
@@ -280,7 +280,7 @@ use it in your pipeline."#
     }
 
     fn pipe_redirection(&self) -> (Option<OutDest>, Option<OutDest>) {
-        (Some(OutDest::Capture), Some(OutDest::Capture))
+        (Some(OutDest::PipeSeparate), Some(OutDest::PipeSeparate))
     }
 }
 
diff --git a/crates/nu-command/src/system/complete.rs b/crates/nu-command/src/system/complete.rs
index 948f8acec6..21b33ac656 100644
--- a/crates/nu-command/src/system/complete.rs
+++ b/crates/nu-command/src/system/complete.rs
@@ -93,6 +93,6 @@ impl Command for Complete {
     }
 
     fn pipe_redirection(&self) -> (Option<OutDest>, Option<OutDest>) {
-        (Some(OutDest::Capture), Some(OutDest::Capture))
+        (Some(OutDest::PipeSeparate), Some(OutDest::PipeSeparate))
     }
 }
diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index 70a00bc815..80c1c94e23 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -340,7 +340,7 @@ fn write_pipeline_data(
     } else if let PipelineData::Value(Value::Binary { val, .. }, ..) = data {
         writer.write_all(&val)?;
     } else {
-        stack.start_capture();
+        stack.start_collect_value();
 
         // Turn off color as we pass data through
         Arc::make_mut(&mut engine_state.config).use_ansi_coloring = false;
@@ -367,7 +367,7 @@ pub fn command_not_found(
 ) -> ShellError {
     // Run the `command_not_found` hook if there is one.
     if let Some(hook) = &stack.get_config(engine_state).hooks.command_not_found {
-        let mut stack = stack.start_capture();
+        let mut stack = stack.start_collect_value();
         // Set a special environment variable to avoid infinite loops when the
         // `command_not_found` hook triggers itself.
         let canary = "ENTERED_COMMAND_NOT_FOUND";
diff --git a/crates/nu-command/tests/commands/try_.rs b/crates/nu-command/tests/commands/try_.rs
index 58d1c8f80a..dc8c7ba5f8 100644
--- a/crates/nu-command/tests/commands/try_.rs
+++ b/crates/nu-command/tests/commands/try_.rs
@@ -105,3 +105,15 @@ fn exit_code_available_in_catch() {
     let actual = nu!("try { nu -c 'exit 42' } catch { |e| $e.exit_code }");
     assert_eq!(actual.out, "42");
 }
+
+#[test]
+fn try_catches_exit_code_in_assignment() {
+    let actual = nu!("let x = try { nu -c 'exit 42' } catch { |e| $e.exit_code }; $x");
+    assert_eq!(actual.out, "42");
+}
+
+#[test]
+fn try_catches_exit_code_in_expr() {
+    let actual = nu!("print (try { nu -c 'exit 42' } catch { |e| $e.exit_code })");
+    assert_eq!(actual.out, "42");
+}
diff --git a/crates/nu-engine/src/compile/call.rs b/crates/nu-engine/src/compile/call.rs
index d9f1b8e581..e928b63826 100644
--- a/crates/nu-engine/src/compile/call.rs
+++ b/crates/nu-engine/src/compile/call.rs
@@ -108,7 +108,7 @@ pub(crate) fn compile_call(
                     working_set,
                     builder,
                     expr,
-                    RedirectModes::capture_out(arg.span()),
+                    RedirectModes::value(arg.span()),
                     None,
                     arg_reg,
                 )?;
diff --git a/crates/nu-engine/src/compile/expression.rs b/crates/nu-engine/src/compile/expression.rs
index 80fc4fb3fb..0badb76b45 100644
--- a/crates/nu-engine/src/compile/expression.rs
+++ b/crates/nu-engine/src/compile/expression.rs
@@ -90,7 +90,7 @@ pub(crate) fn compile_expression(
                         working_set,
                         builder,
                         part_expr,
-                        RedirectModes::capture_out(part_expr.span),
+                        RedirectModes::value(part_expr.span),
                         None,
                         reg,
                     )?;
@@ -148,7 +148,7 @@ pub(crate) fn compile_expression(
                 working_set,
                 builder,
                 subexpr,
-                RedirectModes::capture_out(subexpr.span),
+                RedirectModes::value(subexpr.span),
                 None,
                 out_reg,
             )?;
@@ -217,7 +217,7 @@ pub(crate) fn compile_expression(
                     working_set,
                     builder,
                     expr,
-                    RedirectModes::capture_out(expr.span),
+                    RedirectModes::value(expr.span),
                     None,
                     reg,
                 )?;
@@ -265,7 +265,7 @@ pub(crate) fn compile_expression(
                         working_set,
                         builder,
                         column,
-                        RedirectModes::capture_out(column.span),
+                        RedirectModes::value(column.span),
                         None,
                         reg,
                     )?;
@@ -290,7 +290,7 @@ pub(crate) fn compile_expression(
                         working_set,
                         builder,
                         item,
-                        RedirectModes::capture_out(item.span),
+                        RedirectModes::value(item.span),
                         None,
                         item_reg,
                     )?;
@@ -337,7 +337,7 @@ pub(crate) fn compile_expression(
                             working_set,
                             builder,
                             key,
-                            RedirectModes::capture_out(key.span),
+                            RedirectModes::value(key.span),
                             None,
                             key_reg,
                         )?;
@@ -345,7 +345,7 @@ pub(crate) fn compile_expression(
                             working_set,
                             builder,
                             val,
-                            RedirectModes::capture_out(val.span),
+                            RedirectModes::value(val.span),
                             None,
                             val_reg,
                         )?;
@@ -365,7 +365,7 @@ pub(crate) fn compile_expression(
                             working_set,
                             builder,
                             expr,
-                            RedirectModes::capture_out(expr.span),
+                            RedirectModes::value(expr.span),
                             None,
                             reg,
                         )?;
@@ -449,7 +449,7 @@ pub(crate) fn compile_expression(
                     // general, which shouldn't be captured any differently than they otherwise
                     // would be.
                     if !full_cell_path.tail.is_empty() {
-                        RedirectModes::capture_out(expr.span)
+                        RedirectModes::value(expr.span)
                     } else {
                         redirect_modes
                     },
@@ -491,7 +491,7 @@ pub(crate) fn compile_expression(
                     working_set,
                     builder,
                     exprs_iter.next().expect("peek() was Some"),
-                    RedirectModes::capture_out(expr.span),
+                    RedirectModes::value(expr.span),
                     None,
                     out_reg,
                 )?;
@@ -507,7 +507,7 @@ pub(crate) fn compile_expression(
                     working_set,
                     builder,
                     expr,
-                    RedirectModes::capture_out(expr.span),
+                    RedirectModes::value(expr.span),
                     None,
                     scratch_reg,
                 )?;
diff --git a/crates/nu-engine/src/compile/keyword.rs b/crates/nu-engine/src/compile/keyword.rs
index f9a81ab6d1..62c5b7108a 100644
--- a/crates/nu-engine/src/compile/keyword.rs
+++ b/crates/nu-engine/src/compile/keyword.rs
@@ -47,7 +47,7 @@ pub(crate) fn compile_if(
             working_set,
             builder,
             condition,
-            RedirectModes::capture_out(condition.span),
+            RedirectModes::value(condition.span),
             None,
             condition_reg,
         )?;
@@ -181,7 +181,7 @@ pub(crate) fn compile_match(
         working_set,
         builder,
         match_expr,
-        RedirectModes::capture_out(match_expr.span),
+        RedirectModes::value(match_expr.span),
         None,
         match_reg,
     )?;
@@ -233,7 +233,7 @@ pub(crate) fn compile_match(
                 working_set,
                 builder,
                 guard,
-                RedirectModes::capture_out(guard.span),
+                RedirectModes::value(guard.span),
                 None,
                 guard_reg,
             )?;
@@ -319,7 +319,7 @@ pub(crate) fn compile_let(
         working_set,
         builder,
         block,
-        RedirectModes::capture_out(call.head),
+        RedirectModes::value(call.head),
         Some(io_reg),
         io_reg,
     )?;
@@ -427,7 +427,7 @@ pub(crate) fn compile_try(
                     working_set,
                     builder,
                     catch_expr,
-                    RedirectModes::capture_out(catch_expr.span),
+                    RedirectModes::value(catch_expr.span),
                     None,
                     closure_reg,
                 )?;
@@ -655,7 +655,7 @@ pub(crate) fn compile_while(
         working_set,
         builder,
         cond_arg,
-        RedirectModes::capture_out(call.head),
+        RedirectModes::value(call.head),
         None,
         io_reg,
     )?;
@@ -739,7 +739,7 @@ pub(crate) fn compile_for(
         working_set,
         builder,
         in_expr,
-        RedirectModes::capture_out(in_expr.span),
+        RedirectModes::value(in_expr.span),
         None,
         stream_reg,
     )?;
@@ -867,7 +867,7 @@ pub(crate) fn compile_return(
             working_set,
             builder,
             arg_expr,
-            RedirectModes::capture_out(arg_expr.span),
+            RedirectModes::value(arg_expr.span),
             None,
             io_reg,
         )?;
diff --git a/crates/nu-engine/src/compile/operator.rs b/crates/nu-engine/src/compile/operator.rs
index a1ed3f66df..bad206358d 100644
--- a/crates/nu-engine/src/compile/operator.rs
+++ b/crates/nu-engine/src/compile/operator.rs
@@ -35,7 +35,7 @@ pub(crate) fn compile_binary_op(
                 working_set,
                 builder,
                 rhs,
-                RedirectModes::capture_out(rhs.span),
+                RedirectModes::value(rhs.span),
                 None,
                 out_reg,
             )?;
@@ -53,7 +53,7 @@ pub(crate) fn compile_binary_op(
             working_set,
             builder,
             lhs,
-            RedirectModes::capture_out(lhs.span),
+            RedirectModes::value(lhs.span),
             None,
             lhs_reg,
         )?;
@@ -73,7 +73,7 @@ pub(crate) fn compile_binary_op(
                     working_set,
                     builder,
                     rhs,
-                    RedirectModes::capture_out(rhs.span),
+                    RedirectModes::value(rhs.span),
                     None,
                     lhs_reg,
                 )?;
@@ -96,7 +96,7 @@ pub(crate) fn compile_binary_op(
                     working_set,
                     builder,
                     rhs,
-                    RedirectModes::capture_out(rhs.span),
+                    RedirectModes::value(rhs.span),
                     None,
                     lhs_reg,
                 )?;
@@ -118,7 +118,7 @@ pub(crate) fn compile_binary_op(
                     working_set,
                     builder,
                     rhs,
-                    RedirectModes::capture_out(rhs.span),
+                    RedirectModes::value(rhs.span),
                     None,
                     rhs_reg,
                 )?;
@@ -277,7 +277,7 @@ pub(crate) fn compile_assignment(
                     working_set,
                     builder,
                     &path.head,
-                    RedirectModes::capture_out(path.head.span),
+                    RedirectModes::value(path.head.span),
                     None,
                     head_reg,
                 )?;
diff --git a/crates/nu-engine/src/compile/redirect.rs b/crates/nu-engine/src/compile/redirect.rs
index 15af1a9f8c..eaedd65213 100644
--- a/crates/nu-engine/src/compile/redirect.rs
+++ b/crates/nu-engine/src/compile/redirect.rs
@@ -14,9 +14,9 @@ pub(crate) struct RedirectModes {
 }
 
 impl RedirectModes {
-    pub(crate) fn capture_out(span: Span) -> Self {
+    pub(crate) fn value(span: Span) -> Self {
         RedirectModes {
-            out: Some(RedirectMode::Capture.into_spanned(span)),
+            out: Some(RedirectMode::Value.into_spanned(span)),
             err: None,
         }
     }
@@ -46,7 +46,7 @@ pub(crate) fn redirection_target_to_mode(
                 working_set,
                 builder,
                 expr,
-                RedirectModes::capture_out(*redir_span),
+                RedirectModes::value(*redir_span),
                 None,
                 path_reg,
             )?;
@@ -148,7 +148,8 @@ pub(crate) fn out_dest_to_redirect_mode(
     out_dest
         .map(|out_dest| match out_dest {
             OutDest::Pipe => Ok(RedirectMode::Pipe),
-            OutDest::Capture => Ok(RedirectMode::Capture),
+            OutDest::PipeSeparate => Ok(RedirectMode::PipeSeparate),
+            OutDest::Value => Ok(RedirectMode::Value),
             OutDest::Null => Ok(RedirectMode::Null),
             OutDest::Inherit => Ok(RedirectMode::Inherit),
             OutDest::File(_) => Err(CompileError::InvalidRedirectMode { span }),
diff --git a/crates/nu-engine/src/documentation.rs b/crates/nu-engine/src/documentation.rs
index 9d7ea7f8f2..92f2c3b925 100644
--- a/crates/nu-engine/src/documentation.rs
+++ b/crates/nu-engine/src/documentation.rs
@@ -23,7 +23,7 @@ pub fn get_full_help(
     // internally call several commands (`table`, `ansi`, `nu-highlight`) and get their
     // `PipelineData` using this `Stack`, any other output should not be redirected like the main
     // execution.
-    let stack = &mut stack.start_capture();
+    let stack = &mut stack.start_collect_value();
 
     let signature = engine_state
         .get_signature(command)
@@ -202,7 +202,7 @@ fn get_documentation(
                 ));
             }
 
-            let caller_stack = &mut Stack::new().capture();
+            let caller_stack = &mut Stack::new().collect_value();
             if let Ok(result) = eval_call::<WithoutDebug>(
                 engine_state,
                 caller_stack,
@@ -329,7 +329,7 @@ fn update_ansi_from_config(
     theme_component: &str,
 ) {
     if let Some(color) = &nu_config.color_config.get(theme_component) {
-        let caller_stack = &mut Stack::new().capture();
+        let caller_stack = &mut Stack::new().collect_value();
         let span = Span::unknown();
         let span_id = UNKNOWN_SPAN_ID;
 
diff --git a/crates/nu-engine/src/eval.rs b/crates/nu-engine/src/eval.rs
index ccb494e68e..f0effb9a37 100644
--- a/crates/nu-engine/src/eval.rs
+++ b/crates/nu-engine/src/eval.rs
@@ -235,7 +235,7 @@ pub fn eval_expression<D: DebugContext>(
     stack: &mut Stack,
     expr: &Expression,
 ) -> Result<Value, ShellError> {
-    let stack = &mut stack.start_capture();
+    let stack = &mut stack.start_collect_value();
     <EvalRuntime as Eval>::eval::<D>(engine_state, stack, expr)
 }
 
@@ -278,7 +278,7 @@ pub fn eval_expression_with_input<D: DebugContext>(
                 let block = engine_state.get_block(*block_id);
 
                 if !full_cell_path.tail.is_empty() {
-                    let stack = &mut stack.start_capture();
+                    let stack = &mut stack.start_collect_value();
                     // FIXME: protect this collect with ctrl-c
                     input = eval_subexpression::<D>(engine_state, stack, block, input)?
                         .into_value(*span)?
@@ -325,7 +325,7 @@ fn eval_redirection<D: DebugContext>(
         }
         RedirectionTarget::Pipe { .. } => {
             let dest = match next_out {
-                None | Some(OutDest::Capture) => OutDest::Pipe,
+                None | Some(OutDest::PipeSeparate) => OutDest::Pipe,
                 Some(next) => next,
             };
             Ok(Redirection::Pipe(dest))
@@ -357,7 +357,7 @@ fn eval_element_redirection<D: DebugContext>(
                 let stderr = eval_redirection::<D>(engine_state, stack, target, None)?;
                 if matches!(stderr, Redirection::Pipe(OutDest::Pipe)) {
                     let dest = match next_out {
-                        None | Some(OutDest::Capture) => OutDest::Pipe,
+                        None | Some(OutDest::PipeSeparate) => OutDest::Pipe,
                         Some(next) => next,
                     };
                     // e>| redirection, don't override current stack `stdout`
diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index 7cc4e0267d..790016cb1b 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -1414,7 +1414,8 @@ fn eval_redirection(
 ) -> Result<Option<Redirection>, ShellError> {
     match mode {
         RedirectMode::Pipe => Ok(Some(Redirection::Pipe(OutDest::Pipe))),
-        RedirectMode::Capture => Ok(Some(Redirection::Pipe(OutDest::Capture))),
+        RedirectMode::PipeSeparate => Ok(Some(Redirection::Pipe(OutDest::PipeSeparate))),
+        RedirectMode::Value => Ok(Some(Redirection::Pipe(OutDest::Value))),
         RedirectMode::Null => Ok(Some(Redirection::Pipe(OutDest::Null))),
         RedirectMode::Inherit => Ok(Some(Redirection::Pipe(OutDest::Inherit))),
         RedirectMode::File { file_num } => {
diff --git a/crates/nu-explore/src/nu_common/command.rs b/crates/nu-explore/src/nu_common/command.rs
index 269382d1f0..ef0157ac67 100644
--- a/crates/nu-explore/src/nu_common/command.rs
+++ b/crates/nu-explore/src/nu_common/command.rs
@@ -96,8 +96,8 @@ fn eval_source2(
     }
 
     let stack = &mut stack.push_redirection(
-        Some(Redirection::Pipe(OutDest::Capture)),
-        Some(Redirection::Pipe(OutDest::Capture)),
+        Some(Redirection::Pipe(OutDest::PipeSeparate)),
+        Some(Redirection::Pipe(OutDest::PipeSeparate)),
     );
     eval_block::<WithoutDebug>(engine_state, stack, &block, input)
 }
diff --git a/crates/nu-plugin-engine/src/context.rs b/crates/nu-plugin-engine/src/context.rs
index 160ce802b2..6b6b1a15f3 100644
--- a/crates/nu-plugin-engine/src/context.rs
+++ b/crates/nu-plugin-engine/src/context.rs
@@ -190,8 +190,8 @@ impl<'a> PluginExecutionContext for PluginExecutionCommandContext<'a> {
             .reset_pipes();
 
         let stack = &mut stack.push_redirection(
-            redirect_stdout.then_some(Redirection::Pipe(OutDest::Capture)),
-            redirect_stderr.then_some(Redirection::Pipe(OutDest::Capture)),
+            redirect_stdout.then_some(Redirection::Pipe(OutDest::PipeSeparate)),
+            redirect_stderr.then_some(Redirection::Pipe(OutDest::PipeSeparate)),
         );
 
         // Set up the positional arguments
@@ -239,8 +239,8 @@ impl<'a> PluginExecutionContext for PluginExecutionCommandContext<'a> {
         let decl = self.engine_state.get_decl(decl_id);
 
         let stack = &mut self.stack.push_redirection(
-            redirect_stdout.then_some(Redirection::Pipe(OutDest::Capture)),
-            redirect_stderr.then_some(Redirection::Pipe(OutDest::Capture)),
+            redirect_stdout.then_some(Redirection::Pipe(OutDest::PipeSeparate)),
+            redirect_stderr.then_some(Redirection::Pipe(OutDest::PipeSeparate)),
         );
 
         let mut call_builder = ir::Call::build(decl_id, call.head);
diff --git a/crates/nu-plugin-engine/src/persistent.rs b/crates/nu-plugin-engine/src/persistent.rs
index f9dcc5143b..e664b37f87 100644
--- a/crates/nu-plugin-engine/src/persistent.rs
+++ b/crates/nu-plugin-engine/src/persistent.rs
@@ -353,7 +353,7 @@ impl GetPlugin for PersistentPlugin {
                     // We need the current environment variables for `python` based plugins. Or
                     // we'll likely have a problem when a plugin is implemented in a virtual Python
                     // environment.
-                    let stack = &mut stack.start_capture();
+                    let stack = &mut stack.start_collect_value();
                     nu_engine::env::env_to_strings(engine_state, stack)
                 })
                 .transpose()?;
diff --git a/crates/nu-plugin-test-support/src/plugin_test.rs b/crates/nu-plugin-test-support/src/plugin_test.rs
index d414887e84..1d66674824 100644
--- a/crates/nu-plugin-test-support/src/plugin_test.rs
+++ b/crates/nu-plugin-test-support/src/plugin_test.rs
@@ -156,7 +156,7 @@ impl PluginTest {
         };
 
         // Eval the block with the input
-        let mut stack = Stack::new().capture();
+        let mut stack = Stack::new().collect_value();
         let data = eval_block::<WithoutDebug>(&self.engine_state, &mut stack, &block, input)?;
         if matches!(data, PipelineData::ByteStream(..)) {
             Ok(data)
diff --git a/crates/nu-protocol/src/engine/stack.rs b/crates/nu-protocol/src/engine/stack.rs
index 854b338c1d..843315871a 100644
--- a/crates/nu-protocol/src/engine/stack.rs
+++ b/crates/nu-protocol/src/engine/stack.rs
@@ -1,7 +1,7 @@
 use crate::{
     engine::{
         ArgumentStack, EngineState, ErrorHandlerStack, Redirection, StackCallArgGuard,
-        StackCaptureGuard, StackIoGuard, StackOutDest, DEFAULT_OVERLAY_NAME,
+        StackCollectValueGuard, StackIoGuard, StackOutDest, DEFAULT_OVERLAY_NAME,
     },
     Config, OutDest, ShellError, Span, Value, VarId, ENV_VARIABLE_ID, NU_VARIABLE_ID,
 };
@@ -68,7 +68,7 @@ impl Stack {
     /// stdout and stderr will be set to [`OutDest::Inherit`]. So, if the last command is an external command,
     /// then its output will be forwarded to the terminal/stdio streams.
     ///
-    /// Use [`Stack::capture`] afterwards if you need to evaluate an expression to a [`Value`]
+    /// Use [`Stack::collect_value`] afterwards if you need to evaluate an expression to a [`Value`]
     /// (as opposed to a [`PipelineData`](crate::PipelineData)).
     pub fn new() -> Self {
         Self {
@@ -299,7 +299,8 @@ impl Stack {
     }
 
     pub fn captures_to_stack(&self, captures: Vec<(VarId, Value)>) -> Stack {
-        self.captures_to_stack_preserve_out_dest(captures).capture()
+        self.captures_to_stack_preserve_out_dest(captures)
+            .collect_value()
     }
 
     pub fn captures_to_stack_preserve_out_dest(&self, captures: Vec<(VarId, Value)>) -> Stack {
@@ -589,11 +590,11 @@ impl Stack {
         self.out_dest.pipe_stderr.as_ref()
     }
 
-    /// Temporarily set the pipe stdout redirection to [`OutDest::Capture`].
+    /// Temporarily set the pipe stdout redirection to [`OutDest::Value`].
     ///
     /// This is used before evaluating an expression into a `Value`.
-    pub fn start_capture(&mut self) -> StackCaptureGuard {
-        StackCaptureGuard::new(self)
+    pub fn start_collect_value(&mut self) -> StackCollectValueGuard {
+        StackCollectValueGuard::new(self)
     }
 
     /// Temporarily use the output redirections in the parent scope.
@@ -612,14 +613,14 @@ impl Stack {
         StackIoGuard::new(self, stdout, stderr)
     }
 
-    /// Mark stdout for the last command as [`OutDest::Capture`].
+    /// Mark stdout for the last command as [`OutDest::Value`].
     ///
     /// This will irreversibly alter the output redirections, and so it only makes sense to use this on an owned `Stack`
     /// (which is why this function does not take `&mut self`).
     ///
-    /// See [`Stack::start_capture`] which can temporarily set stdout as [`OutDest::Capture`] for a mutable `Stack` reference.
-    pub fn capture(mut self) -> Self {
-        self.out_dest.pipe_stdout = Some(OutDest::Capture);
+    /// See [`Stack::start_collect_value`] which can temporarily set stdout as [`OutDest::Value`] for a mutable `Stack` reference.
+    pub fn collect_value(mut self) -> Self {
+        self.out_dest.pipe_stdout = Some(OutDest::Value);
         self.out_dest.pipe_stderr = None;
         self
     }
diff --git a/crates/nu-protocol/src/engine/stack_out_dest.rs b/crates/nu-protocol/src/engine/stack_out_dest.rs
index 7699d29edd..b11177ec3a 100644
--- a/crates/nu-protocol/src/engine/stack_out_dest.rs
+++ b/crates/nu-protocol/src/engine/stack_out_dest.rs
@@ -184,15 +184,15 @@ impl Drop for StackIoGuard<'_> {
     }
 }
 
-pub struct StackCaptureGuard<'a> {
+pub struct StackCollectValueGuard<'a> {
     stack: &'a mut Stack,
     old_pipe_stdout: Option<OutDest>,
     old_pipe_stderr: Option<OutDest>,
 }
 
-impl<'a> StackCaptureGuard<'a> {
+impl<'a> StackCollectValueGuard<'a> {
     pub(crate) fn new(stack: &'a mut Stack) -> Self {
-        let old_pipe_stdout = mem::replace(&mut stack.out_dest.pipe_stdout, Some(OutDest::Capture));
+        let old_pipe_stdout = mem::replace(&mut stack.out_dest.pipe_stdout, Some(OutDest::Value));
         let old_pipe_stderr = stack.out_dest.pipe_stderr.take();
         Self {
             stack,
@@ -202,7 +202,7 @@ impl<'a> StackCaptureGuard<'a> {
     }
 }
 
-impl<'a> Deref for StackCaptureGuard<'a> {
+impl<'a> Deref for StackCollectValueGuard<'a> {
     type Target = Stack;
 
     fn deref(&self) -> &Self::Target {
@@ -210,13 +210,13 @@ impl<'a> Deref for StackCaptureGuard<'a> {
     }
 }
 
-impl<'a> DerefMut for StackCaptureGuard<'a> {
+impl<'a> DerefMut for StackCollectValueGuard<'a> {
     fn deref_mut(&mut self) -> &mut Self::Target {
         self.stack
     }
 }
 
-impl Drop for StackCaptureGuard<'_> {
+impl Drop for StackCollectValueGuard<'_> {
     fn drop(&mut self) {
         self.out_dest.pipe_stdout = self.old_pipe_stdout.take();
         self.out_dest.pipe_stderr = self.old_pipe_stderr.take();
@@ -233,7 +233,7 @@ pub struct StackCallArgGuard<'a> {
 
 impl<'a> StackCallArgGuard<'a> {
     pub(crate) fn new(stack: &'a mut Stack) -> Self {
-        let old_pipe_stdout = mem::replace(&mut stack.out_dest.pipe_stdout, Some(OutDest::Capture));
+        let old_pipe_stdout = mem::replace(&mut stack.out_dest.pipe_stdout, Some(OutDest::Value));
         let old_pipe_stderr = stack.out_dest.pipe_stderr.take();
 
         let old_stdout = stack
diff --git a/crates/nu-protocol/src/ir/display.rs b/crates/nu-protocol/src/ir/display.rs
index feac8f961d..0168306f8a 100644
--- a/crates/nu-protocol/src/ir/display.rs
+++ b/crates/nu-protocol/src/ir/display.rs
@@ -1,8 +1,6 @@
-use std::fmt;
-
-use crate::{ast::Pattern, engine::EngineState, DeclId, VarId};
-
 use super::{DataSlice, Instruction, IrBlock, Literal, RedirectMode};
+use crate::{ast::Pattern, engine::EngineState, DeclId, VarId};
+use std::fmt::{self};
 
 pub struct FmtIrBlock<'a> {
     pub(super) engine_state: &'a EngineState,
@@ -310,7 +308,8 @@ impl fmt::Display for RedirectMode {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             RedirectMode::Pipe => write!(f, "pipe"),
-            RedirectMode::Capture => write!(f, "capture"),
+            RedirectMode::PipeSeparate => write!(f, "pipe separate"),
+            RedirectMode::Value => write!(f, "value"),
             RedirectMode::Null => write!(f, "null"),
             RedirectMode::Inherit => write!(f, "inherit"),
             RedirectMode::File { file_num } => write!(f, "file({file_num})"),
diff --git a/crates/nu-protocol/src/ir/mod.rs b/crates/nu-protocol/src/ir/mod.rs
index c2f51f514a..8c1bb52240 100644
--- a/crates/nu-protocol/src/ir/mod.rs
+++ b/crates/nu-protocol/src/ir/mod.rs
@@ -446,7 +446,8 @@ pub enum Literal {
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 pub enum RedirectMode {
     Pipe,
-    Capture,
+    PipeSeparate,
+    Value,
     Null,
     Inherit,
     /// Use the given numbered file.
diff --git a/crates/nu-protocol/src/pipeline/byte_stream.rs b/crates/nu-protocol/src/pipeline/byte_stream.rs
index 6811b7b89b..0dc03b3091 100644
--- a/crates/nu-protocol/src/pipeline/byte_stream.rs
+++ b/crates/nu-protocol/src/pipeline/byte_stream.rs
@@ -580,8 +580,8 @@ impl ByteStream {
                 copy_with_signals(file, dest, span, signals)?;
             }
             ByteStreamSource::Child(mut child) => {
-                // All `OutDest`s except `OutDest::Capture` will cause `stderr` to be `None`.
-                // Only `save`, `tee`, and `complete` set the stderr `OutDest` to `OutDest::Capture`,
+                // All `OutDest`s except `OutDest::PipeSeparate` will cause `stderr` to be `None`.
+                // Only `save`, `tee`, and `complete` set the stderr `OutDest` to `OutDest::PipeSeparate`,
                 // and those commands have proper simultaneous handling of stdout and stderr.
                 debug_assert!(child.stderr.is_none(), "stderr should not exist");
 
@@ -614,7 +614,7 @@ impl ByteStream {
                 write_to_out_dest(read, stdout, true, span, signals)?;
             }
             ByteStreamSource::File(file) => match stdout {
-                OutDest::Pipe | OutDest::Capture | OutDest::Null => {}
+                OutDest::Pipe | OutDest::PipeSeparate | OutDest::Value | OutDest::Null => {}
                 OutDest::Inherit => {
                     copy_with_signals(file, io::stdout(), span, signals)?;
                 }
@@ -970,7 +970,7 @@ fn write_to_out_dest(
     signals: &Signals,
 ) -> Result<(), ShellError> {
     match stream {
-        OutDest::Pipe | OutDest::Capture => return Ok(()),
+        OutDest::Pipe | OutDest::PipeSeparate | OutDest::Value => return Ok(()),
         OutDest::Null => copy_with_signals(read, io::sink(), span, signals),
         OutDest::Inherit if stdout => copy_with_signals(read, io::stdout(), span, signals),
         OutDest::Inherit => copy_with_signals(read, io::stderr(), span, signals),
diff --git a/crates/nu-protocol/src/pipeline/out_dest.rs b/crates/nu-protocol/src/pipeline/out_dest.rs
index 69955e6b0b..8ea8395378 100644
--- a/crates/nu-protocol/src/pipeline/out_dest.rs
+++ b/crates/nu-protocol/src/pipeline/out_dest.rs
@@ -10,13 +10,17 @@ pub enum OutDest {
     /// If stdout and stderr are both set to `Pipe`,
     /// then they will combined into the `stdout` of [`ChildProcess`](crate::process::ChildProcess).
     Pipe,
-    /// Capture output to later be collected into a [`Value`](crate::Value), `Vec`, or used in some other way.
+    /// Redirect the stdout and/or stderr of one command as the input for the next command in the pipeline.
     ///
     /// The output stream(s) will be available in the `stdout` or `stderr` of [`ChildProcess`](crate::process::ChildProcess).
     ///
     /// This is similar to `Pipe` but will never combine stdout and stderr
     /// or place an external command's stderr into `stdout` of [`ChildProcess`](crate::process::ChildProcess).
-    Capture,
+    PipeSeparate,
+    /// Signifies the result of the pipeline will be immediately collected into a value after this command.
+    ///
+    /// So, it is fine to collect the stream ahead of time in the current command.
+    Value,
     /// Ignore output.
     ///
     /// This will forward output to the null device for the platform.
@@ -46,7 +50,7 @@ impl TryFrom<&OutDest> for Stdio {
 
     fn try_from(out_dest: &OutDest) -> Result<Self, Self::Error> {
         match out_dest {
-            OutDest::Pipe | OutDest::Capture => Ok(Self::piped()),
+            OutDest::Pipe | OutDest::PipeSeparate | OutDest::Value => Ok(Self::piped()),
             OutDest::Null => Ok(Self::null()),
             OutDest::Inherit => Ok(Self::inherit()),
             OutDest::File(file) => Ok(file.try_clone()?.into()),
diff --git a/crates/nu-protocol/src/pipeline/pipeline_data.rs b/crates/nu-protocol/src/pipeline/pipeline_data.rs
index da0fea3213..45704e2cf4 100644
--- a/crates/nu-protocol/src/pipeline/pipeline_data.rs
+++ b/crates/nu-protocol/src/pipeline/pipeline_data.rs
@@ -167,8 +167,8 @@ impl PipelineData {
 
     /// Writes all values or redirects all output to the current [`OutDest`]s in `stack`.
     ///
-    /// For [`OutDest::Pipe`] and [`OutDest::Capture`], this will return the `PipelineData` as is
-    /// without consuming input and without writing anything.
+    /// For [`OutDest::Pipe`] and [`OutDest::PipeSeparate`], this will return the `PipelineData` as
+    /// is without consuming input and without writing anything.
     ///
     /// For the other [`OutDest`]s, the given `PipelineData` will be completely consumed
     /// and `PipelineData::Empty` will be returned (assuming no errors).
@@ -178,11 +178,18 @@ impl PipelineData {
         stack: &mut Stack,
     ) -> Result<PipelineData, ShellError> {
         match (self, stack.stdout()) {
-            (data, OutDest::Pipe | OutDest::Capture) => return Ok(data),
+            (PipelineData::Empty, ..) => {}
+            (data, OutDest::Pipe | OutDest::PipeSeparate) => return Ok(data),
+            (data, OutDest::Value) => {
+                let metadata = data.metadata();
+                let span = data.span().unwrap_or(Span::unknown());
+                return data
+                    .into_value(span)
+                    .map(|val| PipelineData::Value(val, metadata));
+            }
             (PipelineData::ByteStream(stream, ..), stdout) => {
                 stream.write_to_out_dests(stdout, stack.stderr())?;
             }
-            (PipelineData::Empty, ..) => {}
             (PipelineData::Value(..), OutDest::Null) => {}
             (PipelineData::ListStream(stream, ..), OutDest::Null) => {
                 // we need to drain the stream in case there are external commands in the pipeline
diff --git a/src/test_bins.rs b/src/test_bins.rs
index d5ae92ec60..efa7e9dd7d 100644
--- a/src/test_bins.rs
+++ b/src/test_bins.rs
@@ -337,7 +337,7 @@ pub fn nu_repl() {
         let config = engine_state.get_config();
 
         {
-            let stack = &mut stack.start_capture();
+            let stack = &mut stack.start_collect_value();
             match eval_block::<WithoutDebug>(&engine_state, stack, &block, input) {
                 Ok(pipeline_data) => match pipeline_data.collect_string("", config) {
                     Ok(s) => last_output = s,

From 183c2221bbe7a997a7c7ff2638b584f3c2d39f58 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Mon, 23 Sep 2024 19:44:51 +0800
Subject: [PATCH 0460/1072] Removes more quotes on external command arguments
 (#13883)

# Description
Fixes: #13662

I don't think nushell need to parse and keep nested quote on external
command arguments. Some nested quote is safe to removed. After the pr,
nushell will behave more likely to bash.

# User-Facing Changes
#### Before
```
> ^echo {a:1,b:'c',c:'d'}
{a:1,b:c',c:'d}
```
#### After
```
> ^echo {a:1,b:'c',c:'d'}
{a:1,b:c,c:d}
```

# Tests + Formatting
Added some tests to cover the behavior
---
 crates/nu-parser/src/parser.rs        | 27 ++++-----------------------
 crates/nu-parser/tests/test_parser.rs | 25 +++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 3a84defe95..57be8ec820 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -258,7 +258,6 @@ fn parse_external_string(working_set: &mut StateWorkingSet, span: Span) -> Expre
                 from: usize,
                 quote_char: u8,
                 escaped: bool,
-                depth: i32,
             },
         }
         // Find the spans of parts of the string that can be parsed as their own strings for
@@ -287,7 +286,6 @@ fn parse_external_string(working_set: &mut StateWorkingSet, span: Span) -> Expre
                             from: index,
                             quote_char: ch,
                             escaped: false,
-                            depth: 1,
                         };
                     }
                     b'$' => {
@@ -300,7 +298,6 @@ fn parse_external_string(working_set: &mut StateWorkingSet, span: Span) -> Expre
                                 from: index,
                                 quote_char,
                                 escaped: false,
-                                depth: 1,
                             };
                             // Skip over two chars (the dollar sign and the quote)
                             index += 2;
@@ -314,28 +311,12 @@ fn parse_external_string(working_set: &mut StateWorkingSet, span: Span) -> Expre
                     from,
                     quote_char,
                     escaped,
-                    depth,
                 } => match ch {
                     ch if ch == *quote_char && !*escaped => {
-                        // Count if there are more than `depth` quotes remaining
-                        if contents[index..]
-                            .iter()
-                            .filter(|b| *b == quote_char)
-                            .count() as i32
-                            > *depth
-                        {
-                            // Increment depth to be greedy
-                            *depth += 1;
-                        } else {
-                            // Decrement depth
-                            *depth -= 1;
-                        }
-                        if *depth == 0 {
-                            // End of string
-                            spans.push(make_span(*from, index + 1));
-                            // go back to Bare state
-                            state = State::Bare { from: index + 1 };
-                        }
+                        // quoted string ended, just make a new span for it.
+                        spans.push(make_span(*from, index + 1));
+                        // go back to Bare state.
+                        state = State::Bare { from: index + 1 };
                     }
                     b'\\' if !*escaped && *quote_char == b'"' => {
                         // The next token is escaped so it doesn't count (only for double quote)
diff --git a/crates/nu-parser/tests/test_parser.rs b/crates/nu-parser/tests/test_parser.rs
index 973ba1b689..86511bdca1 100644
--- a/crates/nu-parser/tests/test_parser.rs
+++ b/crates/nu-parser/tests/test_parser.rs
@@ -996,6 +996,31 @@ pub fn test_external_call_head_interpolated_string(
     r"foo\external call",
     "backtick quote with backslash"
 )]
+#[case(
+    r#"^foo --flag="value""#,
+    r#"--flag=value"#,
+    "flag value with double quote"
+)]
+#[case(
+    r#"^foo --flag='value'"#,
+    r#"--flag=value"#,
+    "flag value with single quote"
+)]
+#[case(
+    r#"^foo {a:1,b:'c',c:'d'}"#,
+    r#"{a:1,b:c,c:d}"#,
+    "value with many inner single quotes"
+)]
+#[case(
+    r#"^foo {a:1,b:"c",c:"d"}"#,
+    r#"{a:1,b:c,c:d}"#,
+    "value with many double quotes"
+)]
+#[case(
+    r#"^foo {a:1,b:'c',c:"d"}"#,
+    r#"{a:1,b:c,c:d}"#,
+    "value with single quote and double quote"
+)]
 pub fn test_external_call_arg_glob(#[case] input: &str, #[case] expected: &str, #[case] tag: &str) {
     test_external_call(input, tag, |name, args| {
         match &name.expr {

From 6f47990a6325f530db543198e51154f99d7a4bcb Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Mon, 23 Sep 2024 08:55:58 -0400
Subject: [PATCH 0461/1072] Add search terms to `into value` (#13890)

# Description

From [Discord
today](https://discord.com/channels/601130461678272522/729071784321876040/1286904159047778316),
`into value` isn't classified with `conversions` like the other `into
...` subcommands. I think this is correct, since it's a `table->table`
operation, so it's a filter that has the side effect of (potentially)
converting (via inference) cell values.

But we should at least have some search terms that help here, so this PR
adds *"conversion"* and *"convert"* to the command.

# User-Facing Changes

`help -f conversion` will return `into value`

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

N/A
---
 crates/nu-command/src/conversions/into/value.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/conversions/into/value.rs b/crates/nu-command/src/conversions/into/value.rs
index cd919ca8d6..52e5ab339c 100644
--- a/crates/nu-command/src/conversions/into/value.rs
+++ b/crates/nu-command/src/conversions/into/value.rs
@@ -32,7 +32,11 @@ impl Command for IntoValue {
     }
 
     fn description(&self) -> &str {
-        "Infer nushell datatype for each cell."
+        "Infer Nushell datatype for each cell."
+    }
+
+    fn search_terms(&self) -> Vec<&str> {
+        vec!["convert", "conversion"]
     }
 
     fn examples(&self) -> Vec<Example> {

From 28a7461057456555314e65e9b10cb5b996d4f72d Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Mon, 23 Sep 2024 05:57:59 -0700
Subject: [PATCH 0462/1072] Added command `polars profile` for profiling lazy
 dataframes (#13904)

# Description
Introduce a new command `polars profile` for profiling lazy dataframes:

<img width="965" alt="Screenshot 2024-09-22 at 23 46 18"
src="https://github.com/user-attachments/assets/11402dd3-8256-43df-a986-64241c15354f">

# User-Facing Changes
- Introduces new command `polars profile`
---
 .../src/dataframe/command/core/mod.rs         |   2 +
 .../src/dataframe/command/core/profile.rs     | 105 ++++++++++++++++++
 2 files changed, 107 insertions(+)
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/core/profile.rs

diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/mod.rs b/crates/nu_plugin_polars/src/dataframe/command/core/mod.rs
index 4acf6778e1..1badf9d5f1 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/mod.rs
@@ -2,6 +2,7 @@ mod cache;
 mod columns;
 mod fetch;
 mod open;
+mod profile;
 mod save;
 mod schema;
 mod shape;
@@ -28,6 +29,7 @@ pub(crate) fn core_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin
         Box::new(cache::LazyCache),
         Box::new(LazyFetch),
         Box::new(OpenDataFrame),
+        Box::new(profile::ProfileDF),
         Box::new(Summary),
         Box::new(ShapeDF),
         Box::new(SchemaCmd),
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/profile.rs b/crates/nu_plugin_polars/src/dataframe/command/core/profile.rs
new file mode 100644
index 0000000000..c975e8d321
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/profile.rs
@@ -0,0 +1,105 @@
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{
+    record, Category, Example, LabeledError, PipelineData, ShellError, Signature, Type, Value,
+};
+
+use crate::{
+    values::{
+        cant_convert_err, CustomValueSupport, NuDataFrame, NuLazyFrame, PolarsPluginObject,
+        PolarsPluginType,
+    },
+    PolarsPlugin,
+};
+
+pub struct ProfileDF;
+
+impl PluginCommand for ProfileDF {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars profile"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .input_output_type(
+                Type::Custom("dataframe".into()),
+                Type::Custom("dataframe".into()),
+            )
+            .category(Category::Custom("dataframe".into()))
+    }
+
+    fn description(&self) -> &str {
+        "Profile a lazy dataframe. This will run the query and return a record containing the materialized DataFrame and a DataFrame that contains profiling information of each node that is executed.
+
+The units of the timings are microseconds."
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![Example {
+            description: "Profile a lazy dataframe",
+            example: r#"[[a b]; [1 2] [1 4] [2 6] [2 4]]
+    | polars into-lazy
+    | polars group-by a
+    | polars agg [
+        (polars col b | polars min | polars as "b_min")
+        (polars col b | polars max | polars as "b_max")
+        (polars col b | polars sum | polars as "b_sum")
+     ]
+    | polars profile
+"#,
+            result: None,
+        }]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        let value = input.into_value(call.head)?;
+        match PolarsPluginObject::try_from_value(plugin, &value)? {
+            PolarsPluginObject::NuDataFrame(df) => command_lazy(plugin, engine, call, df.lazy()),
+            PolarsPluginObject::NuLazyFrame(lazy) => command_lazy(plugin, engine, call, lazy),
+            _ => Err(cant_convert_err(
+                &value,
+                &[PolarsPluginType::NuDataFrame, PolarsPluginType::NuLazyFrame],
+            )),
+        }
+        .map_err(LabeledError::from)
+    }
+}
+
+fn command_lazy(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    lazy: NuLazyFrame,
+) -> Result<PipelineData, ShellError> {
+    let (df, profiling_df) = lazy
+        .to_polars()
+        .profile()
+        .map_err(|e| ShellError::GenericError {
+            error: format!("Could not profile dataframe: {e}"),
+            msg: "".into(),
+            span: Some(call.head),
+            help: None,
+            inner: vec![],
+        })?;
+
+    let df = NuDataFrame::from(df).cache_and_to_value(plugin, engine, call.head)?;
+    let profiling_df =
+        NuDataFrame::from(profiling_df).cache_and_to_value(plugin, engine, call.head)?;
+
+    let result = Value::record(
+        record!(
+            "dataframe" => df,
+            "profiling" => profiling_df,
+        ),
+        call.head,
+    );
+
+    Ok(PipelineData::Value(result, None))
+}

From a948ec6c2cd2d2486589e73e701bd2c0a91a7547 Mon Sep 17 00:00:00 2001
From: nome <Knut.Franke@gmx.de>
Date: Tue, 24 Sep 2024 13:44:58 +0200
Subject: [PATCH 0463/1072] Fix handling of stopped TUI applications on unix
 (#13741)

# Description

Instead of handling a foreground process being stopped in any way, we
were simply ignoring SIGTSTP (which the terminal usually sends to the
foreground process group when Ctrl-Z is pressed), and propagating this
to our foreground children. This works for most processes, but it
generally fails for applications which put the terminal in raw mode[1]
and implement their own suspension mechanism (typically TUI apps like
helix[2], neovim[3], top[4] or amp[5]). In these cases, triggering
suspension within the app results in the terminal getting blocked, since
the application is waiting for a SIGCONT, while nushell is waiting for
it to exit.

Fix this by unblocking SIGTSTP for our foreground children (neovim,
helix and probably others send this to themselves while trying to
suspend), and displaying the following message whenever one of them gets
stopped:

    nushell currently does not support background jobs
    press any key to continue

Pressing any key will then send SIGCONT to the child's process group and
resume waiting.

This fix is probably going to be superseded by a proper background job
implementation (#247) at some point, but for now it's better than
completely blocking the terminal.

[1]
https://docs.rs/crossterm/latest/crossterm/terminal/index.html#raw-mode
[2] https://helix-editor.com/
[3] https://neovim.io/
[4] https://man7.org/linux/man-pages/man1/top.1.html
[5] https://amp.rs/

- fixes #1038
- fixes #7335
- fixes #10335

# User-Facing Changes

While any foreground process is running, Ctrl-Z is no longer ignored.
Instead, the message described above is displayed, and nushell waits for
a key to be pressed.

# Tests + Formatting

<!--
Don't forget to add tests that cover your changes.

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-protocol/src/process/child.rs       | 69 +++++++++++++++----
 crates/nu-protocol/src/process/mod.rs         |  2 -
 .../process => nu-system/src}/exit_status.rs  | 44 ------------
 crates/nu-system/src/foreground.rs            | 62 ++++++++++++++++-
 crates/nu-system/src/lib.rs                   |  2 +
 5 files changed, 118 insertions(+), 61 deletions(-)
 rename crates/{nu-protocol/src/process => nu-system/src}/exit_status.rs (54%)

diff --git a/crates/nu-protocol/src/process/child.rs b/crates/nu-protocol/src/process/child.rs
index 9ab92b331c..930015742b 100644
--- a/crates/nu-protocol/src/process/child.rs
+++ b/crates/nu-protocol/src/process/child.rs
@@ -1,7 +1,5 @@
-use crate::{
-    byte_stream::convert_file, process::ExitStatus, ErrSpan, IntoSpanned, ShellError, Span,
-};
-use nu_system::ForegroundChild;
+use crate::{byte_stream::convert_file, ErrSpan, IntoSpanned, ShellError, Span};
+use nu_system::{ExitStatus, ForegroundChild};
 use os_pipe::PipeReader;
 use std::{
     fmt::Debug,
@@ -10,6 +8,49 @@ use std::{
     thread,
 };
 
+fn check_ok(status: ExitStatus, ignore_error: bool, span: Span) -> Result<(), ShellError> {
+    match status {
+        ExitStatus::Exited(exit_code) => {
+            if ignore_error {
+                Ok(())
+            } else if let Ok(exit_code) = exit_code.try_into() {
+                Err(ShellError::NonZeroExitCode { exit_code, span })
+            } else {
+                Ok(())
+            }
+        }
+        #[cfg(unix)]
+        ExitStatus::Signaled {
+            signal,
+            core_dumped,
+        } => {
+            use nix::sys::signal::Signal;
+
+            let sig = Signal::try_from(signal);
+
+            if sig == Ok(Signal::SIGPIPE) || (ignore_error && !core_dumped) {
+                // Processes often exit with SIGPIPE, but this is not an error condition.
+                Ok(())
+            } else {
+                let signal_name = sig.map(Signal::as_str).unwrap_or("unknown signal").into();
+                Err(if core_dumped {
+                    ShellError::CoreDumped {
+                        signal_name,
+                        signal,
+                        span,
+                    }
+                } else {
+                    ShellError::TerminatedBySignal {
+                        signal_name,
+                        signal,
+                        span,
+                    }
+                })
+            }
+        }
+    }
+}
+
 #[derive(Debug)]
 enum ExitStatusFuture {
     Finished(Result<ExitStatus, Box<ShellError>>),
@@ -29,7 +70,7 @@ impl ExitStatusFuture {
                             core_dumped: true, ..
                         },
                     )) => {
-                        status.check_ok(false, span)?;
+                        check_ok(status, false, span)?;
                         Ok(status)
                     }
                     Ok(Ok(status)) => Ok(status),
@@ -138,7 +179,7 @@ impl ChildProcess {
 
         thread::Builder::new()
             .name("exit status waiter".into())
-            .spawn(move || exit_status_sender.send(child.wait().map(Into::into)))
+            .spawn(move || exit_status_sender.send(child.wait()))
             .err_span(span)?;
 
         Ok(Self::from_raw(stdout, stderr, Some(exit_status), span))
@@ -185,9 +226,11 @@ impl ChildProcess {
             Vec::new()
         };
 
-        self.exit_status
-            .wait(self.span)?
-            .check_ok(self.ignore_error, self.span)?;
+        check_ok(
+            self.exit_status.wait(self.span)?,
+            self.ignore_error,
+            self.span,
+        )?;
 
         Ok(bytes)
     }
@@ -228,9 +271,11 @@ impl ChildProcess {
             consume_pipe(stderr).err_span(self.span)?;
         }
 
-        self.exit_status
-            .wait(self.span)?
-            .check_ok(self.ignore_error, self.span)
+        check_ok(
+            self.exit_status.wait(self.span)?,
+            self.ignore_error,
+            self.span,
+        )
     }
 
     pub fn try_wait(&mut self) -> Result<Option<ExitStatus>, ShellError> {
diff --git a/crates/nu-protocol/src/process/mod.rs b/crates/nu-protocol/src/process/mod.rs
index 6e10fdd620..f8a739b41b 100644
--- a/crates/nu-protocol/src/process/mod.rs
+++ b/crates/nu-protocol/src/process/mod.rs
@@ -1,6 +1,4 @@
 //! Handling of external subprocesses
 mod child;
-mod exit_status;
 
 pub use child::*;
-pub use exit_status::ExitStatus;
diff --git a/crates/nu-protocol/src/process/exit_status.rs b/crates/nu-system/src/exit_status.rs
similarity index 54%
rename from crates/nu-protocol/src/process/exit_status.rs
rename to crates/nu-system/src/exit_status.rs
index 8f37902aae..8f3794c44f 100644
--- a/crates/nu-protocol/src/process/exit_status.rs
+++ b/crates/nu-system/src/exit_status.rs
@@ -1,4 +1,3 @@
-use crate::{ShellError, Span};
 use std::process;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -19,49 +18,6 @@ impl ExitStatus {
             ExitStatus::Signaled { signal, .. } => -signal,
         }
     }
-
-    pub fn check_ok(self, ignore_error: bool, span: Span) -> Result<(), ShellError> {
-        match self {
-            ExitStatus::Exited(exit_code) => {
-                if ignore_error {
-                    Ok(())
-                } else if let Ok(exit_code) = exit_code.try_into() {
-                    Err(ShellError::NonZeroExitCode { exit_code, span })
-                } else {
-                    Ok(())
-                }
-            }
-            #[cfg(unix)]
-            ExitStatus::Signaled {
-                signal,
-                core_dumped,
-            } => {
-                use nix::sys::signal::Signal;
-
-                let sig = Signal::try_from(signal);
-
-                if sig == Ok(Signal::SIGPIPE) || (ignore_error && !core_dumped) {
-                    // Processes often exit with SIGPIPE, but this is not an error condition.
-                    Ok(())
-                } else {
-                    let signal_name = sig.map(Signal::as_str).unwrap_or("unknown signal").into();
-                    Err(if core_dumped {
-                        ShellError::CoreDumped {
-                            signal_name,
-                            signal,
-                            span,
-                        }
-                    } else {
-                        ShellError::TerminatedBySignal {
-                            signal_name,
-                            signal,
-                            span,
-                        }
-                    })
-                }
-            }
-        }
-    }
 }
 
 #[cfg(unix)]
diff --git a/crates/nu-system/src/foreground.rs b/crates/nu-system/src/foreground.rs
index 93f7dd35c0..95b058c0e2 100644
--- a/crates/nu-system/src/foreground.rs
+++ b/crates/nu-system/src/foreground.rs
@@ -1,15 +1,22 @@
+#[cfg(unix)]
+use std::io::prelude::*;
 use std::{
     io,
-    process::{Child, Command, ExitStatus},
+    process::{Child, Command},
     sync::{atomic::AtomicU32, Arc},
 };
 
+use crate::ExitStatus;
+
 #[cfg(unix)]
 use std::{io::IsTerminal, sync::atomic::Ordering};
 
 #[cfg(unix)]
 pub use foreground_pgroup::stdin_fd;
 
+#[cfg(unix)]
+use nix::{sys::signal, sys::wait, unistd::Pid};
+
 /// A simple wrapper for [`std::process::Child`]
 ///
 /// It can only be created by [`ForegroundChild::spawn`].
@@ -73,7 +80,52 @@ impl ForegroundChild {
     }
 
     pub fn wait(&mut self) -> io::Result<ExitStatus> {
-        self.as_mut().wait()
+        #[cfg(unix)]
+        {
+            // the child may be stopped multiple times, we loop until it exits
+            loop {
+                let child_pid = Pid::from_raw(self.inner.id() as i32);
+                let status = wait::waitpid(child_pid, Some(wait::WaitPidFlag::WUNTRACED));
+                match status {
+                    Err(e) => {
+                        drop(self.inner.stdin.take());
+                        return Err(e.into());
+                    }
+                    Ok(wait::WaitStatus::Exited(_, status)) => {
+                        drop(self.inner.stdin.take());
+                        return Ok(ExitStatus::Exited(status));
+                    }
+                    Ok(wait::WaitStatus::Signaled(_, signal, core_dumped)) => {
+                        drop(self.inner.stdin.take());
+                        return Ok(ExitStatus::Signaled {
+                            signal: signal as i32,
+                            core_dumped,
+                        });
+                    }
+                    Ok(wait::WaitStatus::Stopped(_, _)) => {
+                        println!("nushell currently does not support background jobs");
+                        // acquire terminal in order to be able to read from stdin
+                        foreground_pgroup::reset();
+                        let mut stdin = io::stdin();
+                        let mut stdout = io::stdout();
+                        write!(stdout, "press any key to continue")?;
+                        stdout.flush()?;
+                        stdin.read_exact(&mut [0u8])?;
+                        // bring child's pg back into foreground and continue it
+                        if let Some(state) = self.pipeline_state.as_ref() {
+                            let existing_pgrp = state.0.load(Ordering::SeqCst);
+                            foreground_pgroup::set(&self.inner, existing_pgrp);
+                        }
+                        signal::killpg(child_pid, signal::SIGCONT)?;
+                    }
+                    Ok(_) => {
+                        // keep waiting
+                    }
+                };
+            }
+        }
+        #[cfg(not(unix))]
+        self.as_mut().wait().map(Into::into)
     }
 }
 
@@ -275,9 +327,13 @@ mod foreground_pgroup {
                 // SIGINT has special handling
                 let _ = sigaction(Signal::SIGQUIT, &default);
                 // We don't support background jobs, so keep some signals blocked for now
-                // let _ = sigaction(Signal::SIGTSTP, &default);
                 // let _ = sigaction(Signal::SIGTTIN, &default);
                 // let _ = sigaction(Signal::SIGTTOU, &default);
+                // We do need to reset SIGTSTP though, since some TUI
+                // applications implement their own Ctrl-Z handling, and
+                // ForegroundChild::wait() needs to be able to react to the
+                // child being stopped.
+                let _ = sigaction(Signal::SIGTSTP, &default);
                 let _ = sigaction(Signal::SIGTERM, &default);
 
                 Ok(())
diff --git a/crates/nu-system/src/lib.rs b/crates/nu-system/src/lib.rs
index 3633d62990..d6c10a697f 100644
--- a/crates/nu-system/src/lib.rs
+++ b/crates/nu-system/src/lib.rs
@@ -1,4 +1,5 @@
 #![doc = include_str!("../README.md")]
+mod exit_status;
 mod foreground;
 
 #[cfg(target_os = "freebsd")]
@@ -13,6 +14,7 @@ pub mod os_info;
 #[cfg(target_os = "windows")]
 mod windows;
 
+pub use self::exit_status::ExitStatus;
 #[cfg(unix)]
 pub use self::foreground::stdin_fd;
 pub use self::foreground::{ForegroundChild, ForegroundGuard};

From 151767a5e39a5775cde3c710c5940249133b1c50 Mon Sep 17 00:00:00 2001
From: replcat <replcat@imap.cc>
Date: Tue, 24 Sep 2024 23:37:04 +1000
Subject: [PATCH 0464/1072] Support kitty key modifiers in keybindings (#13906)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
hi hi, this makes the parsing of modifier key combos in config more
general, and adds support for additional kitty keyboard protocol
modifiers. It seems that support for [kitty
keys](https://sw.kovidgoyal.net/kitty/keyboard-protocol) had already
been added to nushell in https://github.com/nushell/nushell/pull/10540,
and this was the only missing piece to making them available in
keybindings.

# User-Facing Changes
- keybindings in config can include the super, hyper and meta modifiers
(e.g. `modifier: super`, `modifier: shift_super`, etc.), and these
modifiers will work in supporting terminals (kitty, foot, wezterm,
alacritty...)
- all permutations of snake_cased modifier combinations now behave
equivalently for the purpose of describing keybindings in config (e.g.
`control_alt_shift` was previously supported where `shift_control_alt`
was a config error — now they're the same)

# Tests
None of this looks to be tested at the moment. I only found a smoke test
under the nu-cli crate, and I couldn't break tests elsewhere by stuffing
around with modifier handling. Works on my machine, though! ✨🌈
---
 crates/nu-cli/src/reedline_config.rs | 41 ++++++++++++++--------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/crates/nu-cli/src/reedline_config.rs b/crates/nu-cli/src/reedline_config.rs
index 6c3d457612..dacdca3cae 100644
--- a/crates/nu-cli/src/reedline_config.rs
+++ b/crates/nu-cli/src/reedline_config.rs
@@ -761,28 +761,29 @@ fn add_parsed_keybinding(
     keybinding: &ParsedKeybinding,
     config: &Config,
 ) -> Result<(), ShellError> {
-    let modifier = match keybinding
+    let modifier_string = keybinding
         .modifier
         .to_expanded_string("", config)
-        .to_ascii_lowercase()
-        .as_str()
-    {
-        "control" => KeyModifiers::CONTROL,
-        "shift" => KeyModifiers::SHIFT,
-        "alt" => KeyModifiers::ALT,
-        "none" => KeyModifiers::NONE,
-        "shift_alt" | "alt_shift" => KeyModifiers::SHIFT | KeyModifiers::ALT,
-        "control_shift" | "shift_control" => KeyModifiers::CONTROL | KeyModifiers::SHIFT,
-        "control_alt" | "alt_control" => KeyModifiers::CONTROL | KeyModifiers::ALT,
-        "control_alt_shift" | "control_shift_alt" => {
-            KeyModifiers::CONTROL | KeyModifiers::ALT | KeyModifiers::SHIFT
-        }
-        _ => {
-            return Err(ShellError::UnsupportedConfigValue {
-                expected: "CONTROL, SHIFT, ALT or NONE".to_string(),
-                value: keybinding.modifier.to_abbreviated_string(config),
-                span: keybinding.modifier.span(),
-            })
+        .to_ascii_lowercase();
+
+    let mut modifier = KeyModifiers::NONE;
+    if modifier_string != "none" {
+        for part in modifier_string.split('_') {
+            match part {
+                "control" => modifier |= KeyModifiers::CONTROL,
+                "shift" => modifier |= KeyModifiers::SHIFT,
+                "alt" => modifier |= KeyModifiers::ALT,
+                "super" => modifier |= KeyModifiers::SUPER,
+                "hyper" => modifier |= KeyModifiers::HYPER,
+                "meta" => modifier |= KeyModifiers::META,
+                _ => {
+                    return Err(ShellError::UnsupportedConfigValue {
+                        expected: "CONTROL, SHIFT, ALT, SUPER, HYPER, META or NONE".to_string(),
+                        value: keybinding.modifier.to_abbreviated_string(config),
+                        span: keybinding.modifier.span(),
+                    })
+                }
+            }
         }
     };
 

From 65bb0ff1671bfdbdad109c408d32c42e0c017803 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Tue, 24 Sep 2024 08:40:48 -0500
Subject: [PATCH 0465/1072] Add threads to the `ls` command in order to
 increase performance in some circumstances (#13836)

# Description

This PR tries to allow the `ls` command to use multiple threads if so
specified. The reason why you'd want to use threads is if you notice
`ls` taking a long time. The one place I see that happening is from WSL.

I'm not sure how real-world this test is but you can see that this
simple `ls` of a folder with length takes a while 9366 ms. I've run this
test many times and it ranges from about 15 seconds to about 10 seconds.
But with the `--threads` parameter, it takes less time, 2744ms in this
screenshot.

![image](https://github.com/user-attachments/assets/e5c4afa2-7837-4437-8e6e-5d4bc3894ae1)

The only way forward I could find was to _always_ use threading and
adjust the number of threads based on if the user provides a flag. That
seemed the easiest way to do it after applying @devyn's interleave
advice.

No feelings hurt if this doesn't land. It's more of an experiment but I
think it has potential.

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-cli/tests/completions/mod.rs |   4 +-
 crates/nu-command/src/filesystem/ls.rs | 240 ++++++++++++++++---------
 2 files changed, 156 insertions(+), 88 deletions(-)

diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index 2c0a98688c..001a6c0599 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -942,7 +942,7 @@ fn flag_completions() {
     // Test completions for the 'ls' flags
     let suggestions = completer.complete("ls -", 4);
 
-    assert_eq!(16, suggestions.len());
+    assert_eq!(18, suggestions.len());
 
     let expected: Vec<String> = vec![
         "--all".into(),
@@ -953,6 +953,7 @@ fn flag_completions() {
         "--long".into(),
         "--mime-type".into(),
         "--short-names".into(),
+        "--threads".into(),
         "-D".into(),
         "-a".into(),
         "-d".into(),
@@ -961,6 +962,7 @@ fn flag_completions() {
         "-l".into(),
         "-m".into(),
         "-s".into(),
+        "-t".into(),
     ];
 
     // Match results
diff --git a/crates/nu-command/src/filesystem/ls.rs b/crates/nu-command/src/filesystem/ls.rs
index d198816727..465fae16ff 100644
--- a/crates/nu-command/src/filesystem/ls.rs
+++ b/crates/nu-command/src/filesystem/ls.rs
@@ -8,11 +8,14 @@ use nu_glob::MatchOptions;
 use nu_path::{expand_path_with, expand_to_real_path};
 use nu_protocol::{DataSource, NuGlob, PipelineMetadata, Signals};
 use pathdiff::diff_paths;
+use rayon::prelude::*;
 
 #[cfg(unix)]
 use std::os::unix::fs::PermissionsExt;
 use std::{
     path::PathBuf,
+    sync::mpsc,
+    sync::{Arc, Mutex},
     time::{SystemTime, UNIX_EPOCH},
 };
 
@@ -28,6 +31,7 @@ struct Args {
     du: bool,
     directory: bool,
     use_mime_type: bool,
+    use_threads: bool,
     call_span: Span,
 }
 
@@ -75,6 +79,7 @@ impl Command for Ls {
                 Some('D'),
             )
             .switch("mime-type", "Show mime-type in type column instead of 'file' (based on filenames only; files' contents are not examined)", Some('m'))
+            .switch("threads", "Use multiple threads to list contents. Output will be non-deterministic.", Some('t'))
             .category(Category::FileSystem)
     }
 
@@ -92,6 +97,7 @@ impl Command for Ls {
         let du = call.has_flag(engine_state, stack, "du")?;
         let directory = call.has_flag(engine_state, stack, "directory")?;
         let use_mime_type = call.has_flag(engine_state, stack, "mime-type")?;
+        let use_threads = call.has_flag(engine_state, stack, "threads")?;
         let call_span = call.head;
         #[allow(deprecated)]
         let cwd = current_dir(engine_state, stack)?;
@@ -104,6 +110,7 @@ impl Command for Ls {
             du,
             directory,
             use_mime_type,
+            use_threads,
             call_span,
         };
 
@@ -114,22 +121,24 @@ impl Command for Ls {
             Some(pattern_arg)
         };
         match input_pattern_arg {
-            None => Ok(ls_for_one_pattern(None, args, engine_state.signals(), cwd)?
-                .into_pipeline_data_with_metadata(
-                    call_span,
-                    engine_state.signals().clone(),
-                    PipelineMetadata {
-                        data_source: DataSource::Ls,
-                        content_type: None,
-                    },
-                )),
+            None => Ok(
+                ls_for_one_pattern(None, args, engine_state.signals().clone(), cwd)?
+                    .into_pipeline_data_with_metadata(
+                        call_span,
+                        engine_state.signals().clone(),
+                        PipelineMetadata {
+                            data_source: DataSource::Ls,
+                            content_type: None,
+                        },
+                    ),
+            ),
             Some(pattern) => {
                 let mut result_iters = vec![];
                 for pat in pattern {
                     result_iters.push(ls_for_one_pattern(
                         Some(pat),
                         args,
-                        engine_state.signals(),
+                        engine_state.signals().clone(),
                         cwd.clone(),
                     )?)
                 }
@@ -213,9 +222,27 @@ impl Command for Ls {
 fn ls_for_one_pattern(
     pattern_arg: Option<Spanned<NuGlob>>,
     args: Args,
-    signals: &Signals,
+    signals: Signals,
     cwd: PathBuf,
-) -> Result<Box<dyn Iterator<Item = Value> + Send>, ShellError> {
+) -> Result<PipelineData, ShellError> {
+    fn create_pool(num_threads: usize) -> Result<rayon::ThreadPool, ShellError> {
+        match rayon::ThreadPoolBuilder::new()
+            .num_threads(num_threads)
+            .build()
+        {
+            Err(e) => Err(e).map_err(|e| ShellError::GenericError {
+                error: "Error creating thread pool".into(),
+                msg: e.to_string(),
+                span: Some(Span::unknown()),
+                help: None,
+                inner: vec![],
+            }),
+            Ok(pool) => Ok(pool),
+        }
+    }
+
+    let (tx, rx) = mpsc::channel();
+
     let Args {
         all,
         long,
@@ -224,6 +251,7 @@ fn ls_for_one_pattern(
         du,
         directory,
         use_mime_type,
+        use_threads,
         call_span,
     } = args;
     let pattern_arg = {
@@ -281,7 +309,7 @@ fn ls_for_one_pattern(
                     });
                 }
                 if is_empty_dir(&tmp_expanded) {
-                    return Ok(Box::new(vec![].into_iter()));
+                    return Ok(Value::test_nothing().into_pipeline_data());
                 }
                 just_read_dir = !(pat.item.is_expand() && pat.item.as_ref().contains(GLOB_CHARS));
             }
@@ -300,7 +328,7 @@ fn ls_for_one_pattern(
             if directory {
                 (NuGlob::Expand(".".to_string()), false)
             } else if is_empty_dir(&cwd) {
-                return Ok(Box::new(vec![].into_iter()));
+                return Ok(Value::test_nothing().into_pipeline_data());
             } else {
                 (NuGlob::Expand("*".to_string()), false)
             }
@@ -338,92 +366,130 @@ fn ls_for_one_pattern(
         });
     }
 
-    let mut hidden_dirs = vec![];
+    let hidden_dirs = Arc::new(Mutex::new(Vec::new()));
 
-    let signals = signals.clone();
-    Ok(Box::new(paths_peek.filter_map(move |x| match x {
-        Ok(path) => {
-            let metadata = match std::fs::symlink_metadata(&path) {
-                Ok(metadata) => Some(metadata),
-                Err(_) => None,
-            };
-            if path_contains_hidden_folder(&path, &hidden_dirs) {
-                return None;
-            }
+    let signals_clone = signals.clone();
 
-            if !all && !hidden_dir_specified && is_hidden_dir(&path) {
-                if path.is_dir() {
-                    hidden_dirs.push(path);
-                }
-                return None;
-            }
+    let pool = if use_threads {
+        let count = std::thread::available_parallelism()?.get();
+        create_pool(count)?
+    } else {
+        create_pool(1)?
+    };
 
-            let display_name = if short_names {
-                path.file_name().map(|os| os.to_string_lossy().to_string())
-            } else if full_paths || absolute_path {
-                Some(path.to_string_lossy().to_string())
-            } else if let Some(prefix) = &prefix {
-                if let Ok(remainder) = path.strip_prefix(prefix) {
-                    if directory {
-                        // When the path is the same as the cwd, path_diff should be "."
-                        let path_diff = if let Some(path_diff_not_dot) = diff_paths(&path, &cwd) {
-                            let path_diff_not_dot = path_diff_not_dot.to_string_lossy();
-                            if path_diff_not_dot.is_empty() {
-                                ".".to_string()
+    pool.install(|| {
+        paths_peek
+            .par_bridge()
+            .filter_map(move |x| match x {
+                Ok(path) => {
+                    let metadata = match std::fs::symlink_metadata(&path) {
+                        Ok(metadata) => Some(metadata),
+                        Err(_) => None,
+                    };
+                    let hidden_dir_clone = Arc::clone(&hidden_dirs);
+                    let mut hidden_dir_mutex = hidden_dir_clone
+                        .lock()
+                        .expect("Unable to acquire lock for hidden_dirs");
+                    if path_contains_hidden_folder(&path, &hidden_dir_mutex) {
+                        return None;
+                    }
+
+                    if !all && !hidden_dir_specified && is_hidden_dir(&path) {
+                        if path.is_dir() {
+                            hidden_dir_mutex.push(path);
+                            drop(hidden_dir_mutex);
+                        }
+                        return None;
+                    }
+
+                    let display_name = if short_names {
+                        path.file_name().map(|os| os.to_string_lossy().to_string())
+                    } else if full_paths || absolute_path {
+                        Some(path.to_string_lossy().to_string())
+                    } else if let Some(prefix) = &prefix {
+                        if let Ok(remainder) = path.strip_prefix(prefix) {
+                            if directory {
+                                // When the path is the same as the cwd, path_diff should be "."
+                                let path_diff =
+                                    if let Some(path_diff_not_dot) = diff_paths(&path, &cwd) {
+                                        let path_diff_not_dot = path_diff_not_dot.to_string_lossy();
+                                        if path_diff_not_dot.is_empty() {
+                                            ".".to_string()
+                                        } else {
+                                            path_diff_not_dot.to_string()
+                                        }
+                                    } else {
+                                        path.to_string_lossy().to_string()
+                                    };
+
+                                Some(path_diff)
                             } else {
-                                path_diff_not_dot.to_string()
+                                let new_prefix = if let Some(pfx) = diff_paths(prefix, &cwd) {
+                                    pfx
+                                } else {
+                                    prefix.to_path_buf()
+                                };
+
+                                Some(new_prefix.join(remainder).to_string_lossy().to_string())
                             }
                         } else {
-                            path.to_string_lossy().to_string()
-                        };
-
-                        Some(path_diff)
+                            Some(path.to_string_lossy().to_string())
+                        }
                     } else {
-                        let new_prefix = if let Some(pfx) = diff_paths(prefix, &cwd) {
-                            pfx
-                        } else {
-                            prefix.to_path_buf()
-                        };
-
-                        Some(new_prefix.join(remainder).to_string_lossy().to_string())
+                        Some(path.to_string_lossy().to_string())
                     }
-                } else {
-                    Some(path.to_string_lossy().to_string())
-                }
-            } else {
-                Some(path.to_string_lossy().to_string())
-            }
-            .ok_or_else(|| ShellError::GenericError {
-                error: format!("Invalid file name: {:}", path.to_string_lossy()),
-                msg: "invalid file name".into(),
-                span: Some(call_span),
-                help: None,
-                inner: vec![],
-            });
+                    .ok_or_else(|| ShellError::GenericError {
+                        error: format!("Invalid file name: {:}", path.to_string_lossy()),
+                        msg: "invalid file name".into(),
+                        span: Some(call_span),
+                        help: None,
+                        inner: vec![],
+                    });
 
-            match display_name {
-                Ok(name) => {
-                    let entry = dir_entry_dict(
-                        &path,
-                        &name,
-                        metadata.as_ref(),
-                        call_span,
-                        long,
-                        du,
-                        &signals,
-                        use_mime_type,
-                        args.full_paths,
-                    );
-                    match entry {
-                        Ok(value) => Some(value),
+                    match display_name {
+                        Ok(name) => {
+                            let entry = dir_entry_dict(
+                                &path,
+                                &name,
+                                metadata.as_ref(),
+                                call_span,
+                                long,
+                                du,
+                                &signals_clone,
+                                use_mime_type,
+                                args.full_paths,
+                            );
+                            match entry {
+                                Ok(value) => Some(value),
+                                Err(err) => Some(Value::error(err, call_span)),
+                            }
+                        }
                         Err(err) => Some(Value::error(err, call_span)),
                     }
                 }
                 Err(err) => Some(Value::error(err, call_span)),
-            }
-        }
-        Err(err) => Some(Value::error(err, call_span)),
-    })))
+            })
+            .try_for_each(|stream| {
+                tx.send(stream).map_err(|e| ShellError::GenericError {
+                    error: "Error streaming data".into(),
+                    msg: e.to_string(),
+                    span: Some(call_span),
+                    help: None,
+                    inner: vec![],
+                })
+            })
+    })
+    .map_err(|err| ShellError::GenericError {
+        error: "Unable to create a rayon pool".into(),
+        msg: err.to_string(),
+        span: Some(call_span),
+        help: None,
+        inner: vec![],
+    })?;
+
+    Ok(rx
+        .into_iter()
+        .into_pipeline_data(call_span, signals.clone()))
 }
 
 fn permission_denied(dir: impl AsRef<Path>) -> bool {

From 0d305509508b06b2ff2141e04490b851511fc1b3 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Tue, 24 Sep 2024 08:46:47 -0500
Subject: [PATCH 0466/1072] update reedline to the latest 660a5074 (#13909)

# Description

This PR updates nushell to the latest reedline commit 660a5074

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

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

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

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

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

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

diff --git a/Cargo.lock b/Cargo.lock
index a509daaa4f..e41e74ce5a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5136,8 +5136,7 @@ dependencies = [
 [[package]]
 name = "reedline"
 version = "0.35.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5289de810296f8f2ff58d35544d92ae98d0a631453388bc3e608086be0fa596"
+source = "git+https://github.com/nushell/reedline?branch=main#660a5074b2bd432b47e2e0bb7cca11b4509ff3df"
 dependencies = [
  "arboard",
  "chrono",
diff --git a/Cargo.toml b/Cargo.toml
index afc7ff643f..5ac98485e5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -313,7 +313,7 @@ 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`

From a940a8aa8095c91d9de969c1dffe02c86e92130c Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Tue, 24 Sep 2024 23:13:05 +0800
Subject: [PATCH 0467/1072] Some small tweaks to release and nightly workflow
 (#13912)

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

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

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

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

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 .github/workflows/nightly-build.yml | 20 ++++++++++----------
 .github/workflows/release.yml       |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index ef5a7c7f57..1301e31a64 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -27,7 +27,7 @@ jobs:
     # if: github.repository == 'nushell/nightly'
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4
         if: github.repository == 'nushell/nightly'
         with:
           ref: main
@@ -36,10 +36,10 @@ jobs:
           token: ${{ secrets.WORKFLOW_TOKEN }}
 
       - name: Setup Nushell
-        uses: hustcer/setup-nu@v3.13
+        uses: hustcer/setup-nu@v3
         if: github.repository == 'nushell/nightly'
         with:
-          version: 0.97.1
+          version: 0.98.0
 
       # Synchronize the main branch of nightly repo with the main branch of Nushell official repo
       - name: Prepare for Nightly Release
@@ -65,7 +65,7 @@ jobs:
           }
 
   standard:
-    name: Std
+    name: Nu
     needs: prepare
     strategy:
       fail-fast: false
@@ -121,7 +121,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v4
       with:
         ref: main
         fetch-depth: 0
@@ -137,9 +137,9 @@ jobs:
         rustflags: ''
 
     - name: Setup Nushell
-      uses: hustcer/setup-nu@v3.13
+      uses: hustcer/setup-nu@v3
       with:
-        version: 0.97.1
+        version: 0.98.0
 
     - name: Release Nu Binary
       id: nu
@@ -190,14 +190,14 @@ jobs:
       - name: Waiting for Release
         run: sleep 1800
 
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4
         with:
           ref: main
 
       - name: Setup Nushell
-        uses: hustcer/setup-nu@v3.13
+        uses: hustcer/setup-nu@v3
         with:
-          version: 0.97.1
+          version: 0.98.0
 
       # Keep the last a few releases
       - name: Delete Older Releases
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 00fec604f3..cd49cfccaa 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ defaults:
 
 jobs:
   standard:
-    name: Std
+    name: Nu
 
     strategy:
       fail-fast: false
@@ -71,7 +71,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v4
 
     - name: Update Rust Toolchain Target
       run: |
@@ -85,9 +85,9 @@ jobs:
         rustflags: ''
 
     - name: Setup Nushell
-      uses: hustcer/setup-nu@v3.13
+      uses: hustcer/setup-nu@v3
       with:
-        version: 0.97.1
+        version: 0.98.0
 
     - name: Release Nu Binary
       id: nu

From 66d0e1867428a6d7d964a4ddaba9a445e74a86b1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 25 Sep 2024 09:55:47 +0800
Subject: [PATCH 0468/1072] Bump rustsec/audit-check from 1.4.1 to 2.0.0
 (#13921)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [rustsec/audit-check](https://github.com/rustsec/audit-check) from
1.4.1 to 2.0.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/rustsec/audit-check/releases">rustsec/audit-check's
releases</a>.</em></p>
<blockquote>
<h2>v2.0.0</h2>
<h2>What's Changed</h2>
<ul>
<li>Run on Node 20.x by <a
href="https://github.com/clechasseur"><code>@​clechasseur</code></a> in
<a
href="https://redirect.github.com/rustsec/audit-check/pull/16">rustsec/audit-check#16</a></li>
<li>Remove <code>generate-lockfile</code> To Prevent Overwriting
Checked-In Lock Files by <a
href="https://github.com/tillmann-crabnebula"><code>@​tillmann-crabnebula</code></a>
in <a
href="https://redirect.github.com/rustsec/audit-check/pull/20">rustsec/audit-check#20</a></li>
<li>Added support for <code>working-directory</code> by <a
href="https://github.com/ranger-ross"><code>@​ranger-ross</code></a> in
<a
href="https://redirect.github.com/rustsec/audit-check/pull/21">rustsec/audit-check#21</a></li>
<li>fix: security fix for vulnerability in <code>braces</code> library
by <a
href="https://github.com/clechasseur"><code>@​clechasseur</code></a> in
<a
href="https://redirect.github.com/rustsec/audit-check/pull/23">rustsec/audit-check#23</a></li>
<li>npm audit fix by <a
href="https://github.com/tarcieri"><code>@​tarcieri</code></a> in <a
href="https://redirect.github.com/rustsec/audit-check/pull/24">rustsec/audit-check#24</a></li>
<li>v2.0.0 release prep by <a
href="https://github.com/tarcieri"><code>@​tarcieri</code></a> in <a
href="https://redirect.github.com/rustsec/audit-check/pull/25">rustsec/audit-check#25</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a
href="https://github.com/clechasseur"><code>@​clechasseur</code></a>
made their first contribution in <a
href="https://redirect.github.com/rustsec/audit-check/pull/16">rustsec/audit-check#16</a></li>
<li><a
href="https://github.com/tillmann-crabnebula"><code>@​tillmann-crabnebula</code></a>
made their first contribution in <a
href="https://redirect.github.com/rustsec/audit-check/pull/20">rustsec/audit-check#20</a></li>
<li><a
href="https://github.com/ranger-ross"><code>@​ranger-ross</code></a>
made their first contribution in <a
href="https://redirect.github.com/rustsec/audit-check/pull/21">rustsec/audit-check#21</a></li>
<li><a href="https://github.com/tarcieri"><code>@​tarcieri</code></a>
made their first contribution in <a
href="https://redirect.github.com/rustsec/audit-check/pull/24">rustsec/audit-check#24</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/rustsec/audit-check/compare/v1.4.1...v2.0.0">https://github.com/rustsec/audit-check/compare/v1.4.1...v2.0.0</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/rustsec/audit-check/blob/main/CHANGELOG.md">rustsec/audit-check's
changelog</a>.</em></p>
<blockquote>
<h1>Changelog</h1>
<p>All notable changes to this project will be documented in this
file.</p>
<p>The format is based on <a
href="https://keepachangelog.com/en/1.0.0/">Keep a Changelog</a>,
and this project adheres to <a
href="https://semver.org/spec/v2.0.0.html">Semantic Versioning</a>.</p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/rustsec/audit-check/commit/69366f33c96575abad1ee0dba8212993eecbe998"><code>69366f3</code></a>
Prep for v2.0.0 release (<a
href="https://redirect.github.com/rustsec/audit-check/issues/25">#25</a>)</li>
<li><a
href="https://github.com/rustsec/audit-check/commit/7b350a127d324d9632e9049c66527484ab8fbf63"><code>7b350a1</code></a>
npm audit fix (<a
href="https://redirect.github.com/rustsec/audit-check/issues/24">#24</a>)</li>
<li><a
href="https://github.com/rustsec/audit-check/commit/286a088f1cead63b54654692f8b045680f8f805f"><code>286a088</code></a>
fix: update <code>@clechasseur/rs-actions-core</code> and other
dependencies (<a
href="https://redirect.github.com/rustsec/audit-check/issues/23">#23</a>)</li>
<li><a
href="https://github.com/rustsec/audit-check/commit/b7dc4ebf0c78ffba0982f75a53d230f48c2a76e9"><code>b7dc4eb</code></a>
Added support for <code>working-directory</code> (<a
href="https://redirect.github.com/rustsec/audit-check/issues/21">#21</a>)</li>
<li><a
href="https://github.com/rustsec/audit-check/commit/6dc762e8045bad20174b22deb6c2b6493ee7ae08"><code>6dc762e</code></a>
update to latest upstream and rebuild (<a
href="https://redirect.github.com/rustsec/audit-check/issues/20">#20</a>)</li>
<li><a
href="https://github.com/rustsec/audit-check/commit/fe0359b3e165e4d83e11ffab7715e56c43cc2d76"><code>fe0359b</code></a>
Run on Node 20.x (<a
href="https://redirect.github.com/rustsec/audit-check/issues/16">#16</a>)</li>
<li><a
href="https://github.com/rustsec/audit-check/commit/4da312dd0f2a5e6b58fecaec5b19e7271ce2ec5d"><code>4da312d</code></a>
docs: Update repo link</li>
<li><a
href="https://github.com/rustsec/audit-check/commit/d6805b6463edcabb67093cf679d55a1770f03c9f"><code>d6805b6</code></a>
docs: Bump version in README</li>
<li>See full diff in <a
href="https://github.com/rustsec/audit-check/compare/v1.4.1...v2.0.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=rustsec/audit-check&package-manager=github_actions&previous-version=1.4.1&new-version=2.0.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/audit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
index 694ff6e1bb..d6044d22d8 100644
--- a/.github/workflows/audit.yml
+++ b/.github/workflows/audit.yml
@@ -20,6 +20,6 @@ jobs:
     continue-on-error: true
     steps:
       - uses: actions/checkout@v4.1.7
-      - uses: rustsec/audit-check@v1.4.1
+      - uses: rustsec/audit-check@v2.0.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

From 71d604067aefa10148ed62063034bde0ba4dfeaf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 25 Sep 2024 09:55:58 +0800
Subject: [PATCH 0469/1072] Bump actions-rust-lang/setup-rust-toolchain from
 1.9.0 to 1.10.0 (#13922)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps
[actions-rust-lang/setup-rust-toolchain](https://github.com/actions-rust-lang/setup-rust-toolchain)
from 1.9.0 to 1.10.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/releases">actions-rust-lang/setup-rust-toolchain's
releases</a>.</em></p>
<blockquote>
<h2>v1.10.0</h2>
<h2>What's Changed</h2>
<ul>
<li>Add new parameter cache-directories that is propagated to
Swatinem/rust-cache (<a
href="https://redirect.github.com/actions-rust-lang/setup-rust-toolchain/issues/44">#44</a>
by <a
href="https://github.com/pranc1ngpegasus"><code>@​pranc1ngpegasus</code></a>)</li>
<li>Add new parameter cache-key that is propagated to
Swatinem/rust-cache as key (<a
href="https://redirect.github.com/actions-rust-lang/setup-rust-toolchain/issues/41">#41</a>
by <a
href="https://github.com/iainlane"><code>@​iainlane</code></a>)</li>
<li>Make rustup toolchain installation more robust in light of planned
changes <a
href="https://redirect.github.com/rust-lang/rustup/issues/3635">rust-lang/rustup#3635</a>
and <a
href="https://redirect.github.com/rust-lang/rustup/pull/3985">rust-lang/rustup#3985</a></li>
<li>Allow installing multiple Rust toolchains by specifying multiple
versions in the toolchain input parameter.</li>
<li>Configure the rustup override behavior via the new override input.
(<a
href="https://redirect.github.com/actions-rust-lang/setup-rust-toolchain/issues/38">#38</a>)</li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a
href="https://github.com/pranc1ngpegasus"><code>@​pranc1ngpegasus</code></a>
made their first contribution in <a
href="https://redirect.github.com/actions-rust-lang/setup-rust-toolchain/pull/44">actions-rust-lang/setup-rust-toolchain#44</a></li>
<li><a href="https://github.com/iainlane"><code>@​iainlane</code></a>
made their first contribution in <a
href="https://redirect.github.com/actions-rust-lang/setup-rust-toolchain/pull/41">actions-rust-lang/setup-rust-toolchain#41</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/compare/v1...v1.10.0">https://github.com/actions-rust-lang/setup-rust-toolchain/compare/v1...v1.10.0</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/blob/main/CHANGELOG.md">actions-rust-lang/setup-rust-toolchain's
changelog</a>.</em></p>
<blockquote>
<h1>Changelog</h1>
<p>All notable changes to this project will be documented in this
file.</p>
<p>The format is based on <a
href="https://keepachangelog.com/en/1.0.0/">Keep a Changelog</a>,
and this project adheres to <a
href="https://semver.org/spec/v2.0.0.html">Semantic Versioning</a>.</p>
<h2>[Unreleased]</h2>
<ul>
<li>Add new parameter <code>cache-directories</code> that is propagated
to <code>Swatinem/rust-cache</code> (<a
href="https://redirect.github.com/actions-rust-lang/setup-rust-toolchain/issues/44">#44</a>
by <a
href="https://github.com/pranc1ngpegasus"><code>@​pranc1ngpegasus</code></a>)</li>
<li>Add new parameter <code>cache-key</code> that is propagated to
<code>Swatinem/rust-cache</code> as <code>key</code> (<a
href="https://redirect.github.com/actions-rust-lang/setup-rust-toolchain/issues/41">#41</a>
by <a
href="https://github.com/iainlane"><code>@​iainlane</code></a>)</li>
<li>Make rustup toolchain installation more robust in light of planned
changes <a
href="https://redirect.github.com/rust-lang/rustup/issues/3635">rust-lang/rustup#3635</a>
and <a
href="https://redirect.github.com/rust-lang/rustup/pull/3985">rust-lang/rustup#3985</a></li>
<li>Allow installing multiple Rust toolchains by specifying multiple
versions in the <code>toolchain</code> input parameter.</li>
<li>Configure the <code>rustup override</code> behavior via the new
<code>override</code> input. (<a
href="https://redirect.github.com/actions-rust-lang/setup-rust-toolchain/issues/38">#38</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/commit/4d1965c9142484e48d40c19de54b5cba84953a06"><code>4d1965c</code></a>
Add override input parameter that controls the <code>rustup
override</code> behavior</li>
<li><a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/commit/b31b1317f290cc8743fce262ee98435b8c2a3c5a"><code>b31b131</code></a>
Allow installing multiple Rust toolchains at once.</li>
<li><a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/commit/9f99923fade1f569928b687ccc2858a192effa02"><code>9f99923</code></a>
Add pre-commit for basic checks</li>
<li><a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/commit/86a2ce66737229469494d3779ce1c99c3b5b351d"><code>86a2ce6</code></a>
Make toolchain install more robust</li>
<li><a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/commit/eb4a655afde124c3ebbd7ddebd7ef287d56ac4d6"><code>eb4a655</code></a>
Document new keys and add changelog</li>
<li><a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/commit/a90048dfddd1feb871e378c4535c05d7525117d4"><code>a90048d</code></a>
Merge pull request <a
href="https://redirect.github.com/actions-rust-lang/setup-rust-toolchain/issues/41">#41</a>
from iainlane/iainlane/propagate-cache-key</li>
<li><a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/commit/597574aacb4ee305cfa0c6a3ba38e8be6f9a2eb6"><code>597574a</code></a>
Update key name in README</li>
<li><a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/commit/634cedf365286cb557a12970c1484ea71a309524"><code>634cedf</code></a>
Merge pull request <a
href="https://redirect.github.com/actions-rust-lang/setup-rust-toolchain/issues/44">#44</a>
from pranc1ngpegasus/feat/able-to-cache-additional-dir...</li>
<li><a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/commit/5d6934e965a5457a045bd6a3327b3ce9dd0c6cbf"><code>5d6934e</code></a>
Able to cache additional directories</li>
<li><a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/commit/b01657d9bb1c81c4e7a46604980d19112a4034f0"><code>b01657d</code></a>
Add support for adding to cache key</li>
<li>See full diff in <a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/compare/v1.9.0...v1.10.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions-rust-lang/setup-rust-toolchain&package-manager=github_actions&previous-version=1.9.0&new-version=1.10.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/ci.yml            | 8 ++++----
 .github/workflows/nightly-build.yml | 2 +-
 .github/workflows/release.yml       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5422b7b9e6..91c3e92551 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/checkout@v4.1.7
 
       - name: Setup Rust toolchain and cache
-        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.10.0
 
       - name: cargo fmt
         run: cargo fmt --all -- --check
@@ -64,7 +64,7 @@ jobs:
       - uses: actions/checkout@v4.1.7
 
       - name: Setup Rust toolchain and cache
-        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.10.0
 
       - name: Tests
         run: cargo test --workspace --profile ci --exclude nu_plugin_*
@@ -93,7 +93,7 @@ jobs:
       - uses: actions/checkout@v4.1.7
 
       - name: Setup Rust toolchain and cache
-        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.10.0
 
       - name: Install Nushell
         run: cargo install --path . --locked --no-default-features
@@ -144,7 +144,7 @@ jobs:
       - uses: actions/checkout@v4.1.7
 
       - name: Setup Rust toolchain and cache
-        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.10.0
 
       - name: Clippy
         run: cargo clippy --package nu_plugin_* -- $CLIPPY_OPTIONS
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 1301e31a64..57f6ce678b 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -131,7 +131,7 @@ jobs:
         echo "targets = ['${{matrix.target}}']" >> rust-toolchain.toml
 
     - name: Setup Rust toolchain and cache
-      uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
+      uses: actions-rust-lang/setup-rust-toolchain@v1.10.0
       # WARN: Keep the rustflags to prevent from the winget submission error: `CAQuietExec: Error 0xc0000135`
       with:
         rustflags: ''
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cd49cfccaa..5684b0577f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -78,7 +78,7 @@ jobs:
         echo "targets = ['${{matrix.target}}']" >> rust-toolchain.toml
 
     - name: Setup Rust toolchain
-      uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
+      uses: actions-rust-lang/setup-rust-toolchain@v1.10.0
       # WARN: Keep the rustflags to prevent from the winget submission error: `CAQuietExec: Error 0xc0000135`
       with:
         cache: false

From 63f9e273b38d23f12184684cfe9d6d0d037b2f33 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Wed, 25 Sep 2024 03:47:52 -0500
Subject: [PATCH 0470/1072] add binary as input to hash commands (#13923)

# Description

This allows `hash sha256` to support binary input. The code was there
but the signature wasn't.

closes #13916
---
 crates/nu-command/src/hash/generic_digest.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/nu-command/src/hash/generic_digest.rs b/crates/nu-command/src/hash/generic_digest.rs
index e94d484840..9da805d2c3 100644
--- a/crates/nu-command/src/hash/generic_digest.rs
+++ b/crates/nu-command/src/hash/generic_digest.rs
@@ -49,6 +49,7 @@ where
             .category(Category::Hash)
             .input_output_types(vec![
                 (Type::String, Type::Any),
+                (Type::Binary, Type::Any),
                 (Type::table(), Type::table()),
                 (Type::record(), Type::record()),
             ])

From 08a241f763a000a8eedc1c8906c996cbe9e6b8f9 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Wed, 25 Sep 2024 07:43:05 -0500
Subject: [PATCH 0471/1072] update the defaults for shell_integration (#13929)

# Description

This PR updates the shell_integration defaults so that they work as
described in default_config.nu even when there is no config.nu file.

closes #13924

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-protocol/src/config/shell_integration.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/crates/nu-protocol/src/config/shell_integration.rs b/crates/nu-protocol/src/config/shell_integration.rs
index f1eb6b3a53..aa8ab85e9f 100644
--- a/crates/nu-protocol/src/config/shell_integration.rs
+++ b/crates/nu-protocol/src/config/shell_integration.rs
@@ -16,13 +16,13 @@ pub struct ShellIntegrationConfig {
 impl Default for ShellIntegrationConfig {
     fn default() -> Self {
         Self {
-            osc2: false,
-            osc7: false,
-            osc8: false,
+            osc2: true,
+            osc7: true,
+            osc8: true,
             osc9_9: false,
-            osc133: false,
-            osc633: false,
-            reset_application_mode: false,
+            osc133: true,
+            osc633: true,
+            reset_application_mode: true,
         }
     }
 }

From 071faae772447afd88cf2e3aadefc67fbf652cb8 Mon Sep 17 00:00:00 2001
From: Solomon <git@solomonvictorino.com>
Date: Wed, 25 Sep 2024 12:48:16 +0000
Subject: [PATCH 0472/1072] fix `inspect` and `explore` panics on empty records
 (#13893)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

Fixes a couple panics:

```
> {} | inspect
Error:   x Main thread panicked.
  |-> at crates/nu-command/src/debug/inspect_table.rs:87:15
  `-> attempt to divide by zero
```

```
> {} | explore
# see an empty column, press Down
Error:   x Main thread panicked.
  |-> at crates/nu-explore/src/views/cursor/mod.rs:39:9
  `-> attempt to subtract with overflow
```

# User-Facing Changes

`{} | inspect` now outputs an empty table:

```
╭─────────────┬────────╮
│ description │ record │
├─────────────┴────────┤
│                      │
├──────────────────────┤
```

`{} | explore` opens the help menu.

Both match the empty list behavior.

# Tests

I'm not sure how to test `explore`, as it waits for interaction.
---
 crates/nu-command/src/debug/inspect_table.rs | 15 +++++++++++----
 crates/nu-command/tests/commands/inspect.rs  | 12 ++++++++++++
 crates/nu-explore/src/nu_common/value.rs     | 11 +++++++++--
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/crates/nu-command/src/debug/inspect_table.rs b/crates/nu-command/src/debug/inspect_table.rs
index e30a8bedcf..f7195992a8 100644
--- a/crates/nu-command/src/debug/inspect_table.rs
+++ b/crates/nu-command/src/debug/inspect_table.rs
@@ -152,7 +152,7 @@ fn truncate_data(
     let left_space = expected_width - width;
     let has_space_for_truncation_column = left_space > PAD;
     if !has_space_for_truncation_column {
-        peak_count -= 1;
+        peak_count = peak_count.saturating_sub(1);
     }
 
     remove_columns(data, peak_count);
@@ -201,11 +201,18 @@ mod util {
             Value::Record { val: record, .. } => {
                 let (cols, vals): (Vec<_>, Vec<_>) = record.into_owned().into_iter().unzip();
                 (
-                    cols,
-                    vec![vals
+                    match cols.is_empty() {
+                        true => vec![String::from("")],
+                        false => cols,
+                    },
+                    match vals
                         .into_iter()
                         .map(|s| debug_string_without_formatting(&s))
-                        .collect()],
+                        .collect::<Vec<String>>()
+                    {
+                        vals if vals.is_empty() => vec![],
+                        vals => vec![vals],
+                    },
                 )
             }
             Value::List { vals, .. } => {
diff --git a/crates/nu-command/tests/commands/inspect.rs b/crates/nu-command/tests/commands/inspect.rs
index efa401479b..5917b72e5f 100644
--- a/crates/nu-command/tests/commands/inspect.rs
+++ b/crates/nu-command/tests/commands/inspect.rs
@@ -5,3 +5,15 @@ fn inspect_with_empty_pipeline() {
     let actual = nu!("inspect");
     assert!(actual.err.contains("no input value was piped in"));
 }
+
+#[test]
+fn inspect_with_empty_list() {
+    let actual = nu!("[] | inspect");
+    assert!(actual.out.contains("empty list"));
+}
+
+#[test]
+fn inspect_with_empty_record() {
+    let actual = nu!("{} | inspect");
+    assert!(actual.out.contains("empty record"));
+}
diff --git a/crates/nu-explore/src/nu_common/value.rs b/crates/nu-explore/src/nu_common/value.rs
index ae90278358..3b5751c11a 100644
--- a/crates/nu-explore/src/nu_common/value.rs
+++ b/crates/nu-explore/src/nu_common/value.rs
@@ -92,8 +92,15 @@ pub fn collect_input(value: Value) -> Result<(Vec<String>, Vec<Vec<Value>>)> {
     let span = value.span();
     match value {
         Value::Record { val: record, .. } => {
-            let (key, val) = record.into_owned().into_iter().unzip();
-            Ok((key, vec![val]))
+            let (key, val): (_, Vec<Value>) = record.into_owned().into_iter().unzip();
+
+            Ok((
+                key,
+                match val.is_empty() {
+                    true => vec![],
+                    false => vec![val],
+                },
+            ))
         }
         Value::List { vals, .. } => {
             let mut columns = get_columns(&vals);

From 1afff777a6f7ca39c6c2ee0f5ecb57ebfab7cbd4 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Wed, 25 Sep 2024 08:15:18 -0500
Subject: [PATCH 0473/1072] update folder_depth algorithm for glob command
 (#13915)

# Description

This PR updates the `folder_depth` algorithm in order to make `glob` a
bit faster. The algorithm works like this. Since `folder_depth` is
always used we need to set it to a value. If the glob pattern contains
`**` then make `folder_depth` `usize::MAX`. If `--depth` is not
provided, make it 1, otherwise use the provided value.

closes #13914

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/filesystem/glob.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/filesystem/glob.rs b/crates/nu-command/src/filesystem/glob.rs
index d6243bbc32..219853f6cb 100644
--- a/crates/nu-command/src/filesystem/glob.rs
+++ b/crates/nu-command/src/filesystem/glob.rs
@@ -171,8 +171,12 @@ impl Command for Glob {
 
         let folder_depth = if let Some(depth) = depth {
             depth
-        } else {
+        } else if glob_pattern.contains("**") {
             usize::MAX
+        } else if glob_pattern.contains(std::path::MAIN_SEPARATOR) {
+            glob_pattern.split(std::path::MAIN_SEPARATOR).count() + 1
+        } else {
+            1
         };
 
         let (prefix, glob) = match WaxGlob::new(&glob_pattern) {

From 54e9aa92bca54a430afc11de5129b31c805a8528 Mon Sep 17 00:00:00 2001
From: Bruce Weirdan <weirdan@gmail.com>
Date: Wed, 25 Sep 2024 15:57:00 +0200
Subject: [PATCH 0474/1072] Respect `$env.config.use_kitty_protocol` in `input
 listen` (#13892)

Fixes nushell/nushell#13891

# Description

`input listen` now respects `$env.config.use_kitty_protocol`
This is essentially a copy-paste from `keybindings listen` where it was
already implemented.

# User-Facing Changes

`input listen` now respects `$env.config.use_kitty_protocol`

# Tests + Formatting

# After Submitting

---------

Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
---
 .../src/platform/input/input_listen.rs        | 37 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/platform/input/input_listen.rs b/crates/nu-command/src/platform/input/input_listen.rs
index 406903f7d9..69e96e1966 100644
--- a/crates/nu-command/src/platform/input/input_listen.rs
+++ b/crates/nu-command/src/platform/input/input_listen.rs
@@ -2,7 +2,7 @@ use crossterm::event::{
     DisableBracketedPaste, DisableFocusChange, DisableMouseCapture, EnableBracketedPaste,
     EnableMouseCapture, KeyCode, KeyEventKind, KeyModifiers, MouseEvent, MouseEventKind,
 };
-use crossterm::terminal;
+use crossterm::{execute, terminal};
 use nu_engine::command_prelude::*;
 
 use num_traits::AsPrimitive;
@@ -81,8 +81,36 @@ There are 4 `key_type` variants:
         let head = call.head;
         let event_type_filter = get_event_type_filter(engine_state, stack, call, head)?;
         let add_raw = call.has_flag(engine_state, stack, "raw")?;
+        let config = engine_state.get_config();
 
         terminal::enable_raw_mode()?;
+
+        if config.use_kitty_protocol {
+            if let Ok(false) = crossterm::terminal::supports_keyboard_enhancement() {
+                println!("WARN: The terminal doesn't support use_kitty_protocol config.\r");
+            }
+
+            // enable kitty protocol
+            //
+            // Note that, currently, only the following support this protocol:
+            // * [kitty terminal](https://sw.kovidgoyal.net/kitty/)
+            // * [foot terminal](https://codeberg.org/dnkl/foot/issues/319)
+            // * [WezTerm terminal](https://wezfurlong.org/wezterm/config/lua/config/enable_kitty_keyboard.html)
+            // * [notcurses library](https://github.com/dankamongmen/notcurses/issues/2131)
+            // * [neovim text editor](https://github.com/neovim/neovim/pull/18181)
+            // * [kakoune text editor](https://github.com/mawww/kakoune/issues/4103)
+            // * [dte text editor](https://gitlab.com/craigbarnes/dte/-/issues/138)
+            // * [ghostty terminal](https://github.com/ghostty-org/ghostty/pull/317)
+            //
+            // Refer to https://sw.kovidgoyal.net/kitty/keyboard-protocol/ if you're curious.
+            let _ = execute!(
+                stdout(),
+                crossterm::event::PushKeyboardEnhancementFlags(
+                    crossterm::event::KeyboardEnhancementFlags::DISAMBIGUATE_ESCAPE_CODES
+                )
+            );
+        }
+
         let console_state = event_type_filter.enable_events()?;
         loop {
             let event = crossterm::event::read().map_err(|_| ShellError::GenericError {
@@ -95,6 +123,13 @@ There are 4 `key_type` variants:
             let event = parse_event(head, &event, &event_type_filter, add_raw);
             if let Some(event) = event {
                 terminal::disable_raw_mode()?;
+                if config.use_kitty_protocol {
+                    let _ = execute!(
+                        std::io::stdout(),
+                        crossterm::event::PopKeyboardEnhancementFlags
+                    );
+                }
+
                 console_state.restore();
                 return Ok(event.into_pipeline_data());
             }

From 13df0af5140674e00980ff19843c9bf2e1aa36bb Mon Sep 17 00:00:00 2001
From: YizhePKU <yizhe@pku.edu.cn>
Date: Thu, 26 Sep 2024 02:04:26 +0800
Subject: [PATCH 0475/1072] Set current working directory at startup (#12953)

This PR sets the current working directory to the location of the
Nushell executable at startup, using `std::env::set_current_dir()`. This
is desirable because after PR
https://github.com/nushell/nushell/pull/12922, we no longer change our
current working directory even after `cd` is executed, and some OS might
lock the directory where Nushell started.

The location of the Nushell executable is chosen because it cannot be
removed while Nushell is running anyways, so we don't have to worry
about OS locking it.

This PR has the side effect that it breaks buggy command even harder.
I'll keep this PR as a draft until these commands are fixed, but it
might be helpful to pull this PR if you're working on fixing one of
those bugs.

---------

Co-authored-by: Devyn Cairns <devyn.cairns@gmail.com>
Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
---
 crates/nu-cli/src/config_files.rs             | 11 +---
 crates/nu-cli/src/lib.rs                      |  1 -
 crates/nu-cli/src/repl.rs                     | 12 +---
 crates/nu-cli/tests/completions/mod.rs        | 59 ++++++++++---------
 .../support/completions_helpers.rs            | 11 ++--
 crates/nu-cmd-base/src/hook.rs                |  4 +-
 crates/nu-cmd-base/src/util.rs                | 21 -------
 crates/nu-cmd-lang/src/example_support.rs     |  2 +-
 crates/nu-command/src/filesystem/cd.rs        | 11 ++--
 crates/nu-command/src/filesystem/start.rs     |  5 +-
 crates/nu-protocol/src/engine/engine_state.rs | 11 +---
 crates/nu-std/src/lib.rs                      |  3 +-
 src/config_files.rs                           | 22 ++-----
 src/main.rs                                   | 33 ++++++++++-
 src/test_bins.rs                              |  6 +-
 tests/shell/pipeline/commands/external.rs     |  6 +-
 16 files changed, 91 insertions(+), 127 deletions(-)

diff --git a/crates/nu-cli/src/config_files.rs b/crates/nu-cli/src/config_files.rs
index 427f503a6f..998686d870 100644
--- a/crates/nu-cli/src/config_files.rs
+++ b/crates/nu-cli/src/config_files.rs
@@ -228,15 +228,8 @@ pub fn eval_config_contents(
             engine_state.file = prev_file;
 
             // Merge the environment in case env vars changed in the config
-            match engine_state.cwd(Some(stack)) {
-                Ok(cwd) => {
-                    if let Err(e) = engine_state.merge_env(stack, cwd) {
-                        report_shell_error(engine_state, &e);
-                    }
-                }
-                Err(e) => {
-                    report_shell_error(engine_state, &e);
-                }
+            if let Err(e) = engine_state.merge_env(stack) {
+                report_shell_error(engine_state, &e);
             }
         }
     }
diff --git a/crates/nu-cli/src/lib.rs b/crates/nu-cli/src/lib.rs
index d584802cfb..3fe293a030 100644
--- a/crates/nu-cli/src/lib.rs
+++ b/crates/nu-cli/src/lib.rs
@@ -21,7 +21,6 @@ pub use config_files::eval_config_contents;
 pub use eval_cmds::{evaluate_commands, EvaluateCommandsOpts};
 pub use eval_file::evaluate_file;
 pub use menus::NuHelpCompleter;
-pub use nu_cmd_base::util::get_init_cwd;
 pub use nu_highlight::NuHighlight;
 pub use print::Print;
 pub use prompt::NushellPrompt;
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index d89af0bb9e..087a44114d 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -16,10 +16,7 @@ use crate::{
 use crossterm::cursor::SetCursorStyle;
 use log::{error, trace, warn};
 use miette::{ErrReport, IntoDiagnostic, Result};
-use nu_cmd_base::{
-    hook::eval_hook,
-    util::{get_editor, get_guaranteed_cwd},
-};
+use nu_cmd_base::{hook::eval_hook, util::get_editor};
 use nu_color_config::StyleComputer;
 #[allow(deprecated)]
 use nu_engine::{convert_env_values, current_dir_str, env_to_strings};
@@ -112,8 +109,7 @@ pub fn evaluate_repl(
             PipelineData::empty(),
             false,
         );
-        let cwd = get_guaranteed_cwd(engine_state, &unique_stack);
-        engine_state.merge_env(&mut unique_stack, cwd)?;
+        engine_state.merge_env(&mut unique_stack)?;
     }
 
     let hostname = System::host_name();
@@ -280,12 +276,10 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
         hostname,
     } = ctx;
 
-    let cwd = get_guaranteed_cwd(engine_state, &stack);
-
     let mut start_time = std::time::Instant::now();
     // Before doing anything, merge the environment from the previous REPL iteration into the
     // permanent state.
-    if let Err(err) = engine_state.merge_env(&mut stack, cwd) {
+    if let Err(err) = engine_state.merge_env(&mut stack) {
         report_shell_error(engine_state, &err);
     }
     // Check whether $env.NU_DISABLE_IR is set, so that the user can change it in the REPL
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index 001a6c0599..8e89239663 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -18,11 +18,11 @@ use support::{
 #[fixture]
 fn completer() -> NuCompleter {
     // Create a new engine
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Add record value as example
     let record = "def tst [--mod -s] {}";
-    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack).is_ok());
 
     // Instantiate a new completer
     NuCompleter::new(Arc::new(engine), Arc::new(stack))
@@ -31,11 +31,12 @@ fn completer() -> NuCompleter {
 #[fixture]
 fn completer_strings() -> NuCompleter {
     // Create a new engine
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
+
     // Add record value as example
     let record = r#"def animals [] { ["cat", "dog", "eel" ] }
     def my-command [animal: string@animals] { print $animal }"#;
-    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack).is_ok());
 
     // Instantiate a new completer
     NuCompleter::new(Arc::new(engine), Arc::new(stack))
@@ -44,7 +45,7 @@ fn completer_strings() -> NuCompleter {
 #[fixture]
 fn extern_completer() -> NuCompleter {
     // Create a new engine
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Add record value as example
     let record = r#"
@@ -55,7 +56,7 @@ fn extern_completer() -> NuCompleter {
             -b: string@animals
         ]
     "#;
-    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack).is_ok());
 
     // Instantiate a new completer
     NuCompleter::new(Arc::new(engine), Arc::new(stack))
@@ -64,7 +65,7 @@ fn extern_completer() -> NuCompleter {
 #[fixture]
 fn completer_strings_with_options() -> NuCompleter {
     // Create a new engine
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
     // Add record value as example
     let record = r#"
         # To test that the config setting has no effect on the custom completions
@@ -81,7 +82,7 @@ fn completer_strings_with_options() -> NuCompleter {
             }
         }
         def my-command [animal: string@animals] { print $animal }"#;
-    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack).is_ok());
 
     // Instantiate a new completer
     NuCompleter::new(Arc::new(engine), Arc::new(stack))
@@ -90,7 +91,7 @@ fn completer_strings_with_options() -> NuCompleter {
 #[fixture]
 fn custom_completer() -> NuCompleter {
     // Create a new engine
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Add record value as example
     let record = r#"
@@ -104,7 +105,7 @@ fn custom_completer() -> NuCompleter {
             completer: $external_completer
         }
     "#;
-    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack).is_ok());
 
     // Instantiate a new completer
     NuCompleter::new(Arc::new(engine), Arc::new(stack))
@@ -113,7 +114,7 @@ fn custom_completer() -> NuCompleter {
 #[fixture]
 fn subcommand_completer() -> NuCompleter {
     // Create a new engine
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     let commands = r#"
             $env.config.completions.algorithm = "fuzzy"
@@ -123,7 +124,7 @@ fn subcommand_completer() -> NuCompleter {
             def "foo aabcrr" [] {}
             def food [] {}
         "#;
-    assert!(support::merge_input(commands.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(commands.as_bytes(), &mut engine, &mut stack).is_ok());
 
     // Instantiate a new completer
     NuCompleter::new(Arc::new(engine), Arc::new(stack))
@@ -133,13 +134,13 @@ fn subcommand_completer() -> NuCompleter {
 #[fixture]
 fn fuzzy_alpha_sort_completer() -> NuCompleter {
     // Create a new engine
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     let config = r#"
         $env.config.completions.algorithm = "fuzzy"
         $env.config.completions.sort = "alphabetical"
     "#;
-    assert!(support::merge_input(config.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(config.as_bytes(), &mut engine, &mut stack).is_ok());
 
     // Instantiate a new completer
     NuCompleter::new(Arc::new(engine), Arc::new(stack))
@@ -1196,11 +1197,11 @@ fn folder_with_directorycompletions_do_not_collapse_dots() {
 #[test]
 fn variables_completions() {
     // Create a new engine
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Add record value as example
     let record = "let actor = { name: 'Tom Hardy', age: 44 }";
-    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack).is_ok());
 
     // Instantiate a new completer
     let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
@@ -1311,11 +1312,11 @@ fn variables_completions() {
 
 #[test]
 fn alias_of_command_and_flags() {
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Create an alias
     let alias = r#"alias ll = ls -l"#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack).is_ok());
 
     let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
 
@@ -1330,11 +1331,11 @@ fn alias_of_command_and_flags() {
 
 #[test]
 fn alias_of_basic_command() {
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Create an alias
     let alias = r#"alias ll = ls "#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack).is_ok());
 
     let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
 
@@ -1349,14 +1350,14 @@ fn alias_of_basic_command() {
 
 #[test]
 fn alias_of_another_alias() {
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Create an alias
     let alias = r#"alias ll = ls -la"#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir.clone()).is_ok());
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack).is_ok());
     // Create the second alias
     let alias = r#"alias lf = ll -f"#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack).is_ok());
 
     let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
 
@@ -1373,7 +1374,7 @@ fn run_external_completion(completer: &str, input: &str) -> Vec<Suggestion> {
     let completer = format!("$env.config.completions.external.completer = {completer}");
 
     // Create a new engine
-    let (dir, _, mut engine_state, mut stack) = new_engine();
+    let (_, _, mut engine_state, mut stack) = new_engine();
     let (block, delta) = {
         let mut working_set = StateWorkingSet::new(&engine_state);
         let block = parse(&mut working_set, None, completer.as_bytes(), false);
@@ -1389,7 +1390,7 @@ fn run_external_completion(completer: &str, input: &str) -> Vec<Suggestion> {
     );
 
     // Merge environment into the permanent state
-    assert!(engine_state.merge_env(&mut stack, &dir).is_ok());
+    assert!(engine_state.merge_env(&mut stack).is_ok());
 
     // Instantiate a new completer
     let mut completer = NuCompleter::new(Arc::new(engine_state), Arc::new(stack));
@@ -1578,11 +1579,11 @@ fn sort_fuzzy_completions_in_alphabetical_order(mut fuzzy_alpha_sort_completer:
 #[ignore = "was reverted, still needs fixing"]
 #[rstest]
 fn alias_offset_bug_7648() {
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Create an alias
     let alias = r#"alias ea = ^$env.EDITOR /tmp/test.s"#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack).is_ok());
 
     let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
 
@@ -1597,11 +1598,11 @@ fn alias_offset_bug_7648() {
 #[ignore = "was reverted, still needs fixing"]
 #[rstest]
 fn alias_offset_bug_7754() {
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Create an alias
     let alias = r#"alias ll = ls -l"#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack).is_ok());
 
     let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
 
diff --git a/crates/nu-cli/tests/completions/support/completions_helpers.rs b/crates/nu-cli/tests/completions/support/completions_helpers.rs
index c6c2cba2a8..983dd778d2 100644
--- a/crates/nu-cli/tests/completions/support/completions_helpers.rs
+++ b/crates/nu-cli/tests/completions/support/completions_helpers.rs
@@ -63,7 +63,7 @@ pub fn new_engine() -> (AbsolutePathBuf, String, EngineState, Stack) {
     );
 
     // Merge environment into the permanent state
-    let merge_result = engine_state.merge_env(&mut stack, &dir);
+    let merge_result = engine_state.merge_env(&mut stack);
     assert!(merge_result.is_ok());
 
     (dir, dir_str, engine_state, stack)
@@ -109,7 +109,7 @@ pub fn new_dotnu_engine() -> (AbsolutePathBuf, String, EngineState, Stack) {
     );
 
     // Merge environment into the permanent state
-    let merge_result = engine_state.merge_env(&mut stack, &dir);
+    let merge_result = engine_state.merge_env(&mut stack);
     assert!(merge_result.is_ok());
 
     (dir, dir_str, engine_state, stack)
@@ -144,7 +144,7 @@ pub fn new_quote_engine() -> (AbsolutePathBuf, String, EngineState, Stack) {
     );
 
     // Merge environment into the permanent state
-    let merge_result = engine_state.merge_env(&mut stack, &dir);
+    let merge_result = engine_state.merge_env(&mut stack);
     assert!(merge_result.is_ok());
 
     (dir, dir_str, engine_state, stack)
@@ -179,7 +179,7 @@ pub fn new_partial_engine() -> (AbsolutePathBuf, String, EngineState, Stack) {
     );
 
     // Merge environment into the permanent state
-    let merge_result = engine_state.merge_env(&mut stack, &dir);
+    let merge_result = engine_state.merge_env(&mut stack);
     assert!(merge_result.is_ok());
 
     (dir, dir_str, engine_state, stack)
@@ -223,7 +223,6 @@ pub fn merge_input(
     input: &[u8],
     engine_state: &mut EngineState,
     stack: &mut Stack,
-    dir: AbsolutePathBuf,
 ) -> Result<(), ShellError> {
     let (block, delta) = {
         let mut working_set = StateWorkingSet::new(engine_state);
@@ -246,5 +245,5 @@ pub fn merge_input(
     .is_ok());
 
     // Merge environment into the permanent state
-    engine_state.merge_env(stack, &dir)
+    engine_state.merge_env(stack)
 }
diff --git a/crates/nu-cmd-base/src/hook.rs b/crates/nu-cmd-base/src/hook.rs
index 6eba273f3d..064db0e5bc 100644
--- a/crates/nu-cmd-base/src/hook.rs
+++ b/crates/nu-cmd-base/src/hook.rs
@@ -1,4 +1,3 @@
-use crate::util::get_guaranteed_cwd;
 use miette::Result;
 use nu_engine::{eval_block, eval_block_with_early_return};
 use nu_parser::parse;
@@ -284,8 +283,7 @@ pub fn eval_hook(
         }
     }
 
-    let cwd = get_guaranteed_cwd(engine_state, stack);
-    engine_state.merge_env(stack, cwd)?;
+    engine_state.merge_env(stack)?;
 
     Ok(output)
 }
diff --git a/crates/nu-cmd-base/src/util.rs b/crates/nu-cmd-base/src/util.rs
index f778fe4679..a2af4d4773 100644
--- a/crates/nu-cmd-base/src/util.rs
+++ b/crates/nu-cmd-base/src/util.rs
@@ -1,30 +1,9 @@
-use nu_path::AbsolutePathBuf;
 use nu_protocol::{
     engine::{EngineState, Stack},
     Range, ShellError, Span, Value,
 };
 use std::ops::Bound;
 
-pub fn get_init_cwd() -> AbsolutePathBuf {
-    std::env::current_dir()
-        .ok()
-        .and_then(|path| AbsolutePathBuf::try_from(path).ok())
-        .or_else(|| {
-            std::env::var("PWD")
-                .ok()
-                .and_then(|path| AbsolutePathBuf::try_from(path).ok())
-        })
-        .or_else(nu_path::home_dir)
-        .expect("Failed to get current working directory")
-}
-
-pub fn get_guaranteed_cwd(engine_state: &EngineState, stack: &Stack) -> AbsolutePathBuf {
-    engine_state
-        .cwd(Some(stack))
-        .ok()
-        .unwrap_or_else(get_init_cwd)
-}
-
 type MakeRangeError = fn(&str, Span) -> ShellError;
 
 /// Returns a inclusive pair of boundary in given `range`.
diff --git a/crates/nu-cmd-lang/src/example_support.rs b/crates/nu-cmd-lang/src/example_support.rs
index e430c35c43..c4d532058a 100644
--- a/crates/nu-cmd-lang/src/example_support.rs
+++ b/crates/nu-cmd-lang/src/example_support.rs
@@ -149,7 +149,7 @@ pub fn check_example_evaluates_to_expected_output(
     stack.add_env_var("PWD".to_string(), Value::test_string(cwd.to_string_lossy()));
 
     engine_state
-        .merge_env(&mut stack, cwd)
+        .merge_env(&mut stack)
         .expect("Error merging environment");
 
     let empty_input = PipelineData::empty();
diff --git a/crates/nu-command/src/filesystem/cd.rs b/crates/nu-command/src/filesystem/cd.rs
index cd968a05a5..ed63f06d74 100644
--- a/crates/nu-command/src/filesystem/cd.rs
+++ b/crates/nu-command/src/filesystem/cd.rs
@@ -1,4 +1,3 @@
-use nu_cmd_base::util::get_init_cwd;
 use nu_engine::command_prelude::*;
 use nu_utils::filesystem::{have_permission, PermissionResult};
 
@@ -41,12 +40,14 @@ impl Command for Cd {
         let physical = call.has_flag(engine_state, stack, "physical")?;
         let path_val: Option<Spanned<String>> = call.opt(engine_state, stack, 0)?;
 
-        // If getting PWD failed, default to the initial directory. This way, the
-        // user can use `cd` to recover PWD to a good state.
+        // If getting PWD failed, default to the home directory. The user can
+        // use `cd` to reset PWD to a good state.
         let cwd = engine_state
             .cwd(Some(stack))
             .ok()
-            .unwrap_or_else(get_init_cwd);
+            .or_else(nu_path::home_dir)
+            .map(|path| path.into_std_path_buf())
+            .unwrap_or_default();
 
         let path_val = {
             if let Some(path) = path_val {
@@ -65,7 +66,7 @@ impl Command for Cd {
                     if let Some(oldpwd) = stack.get_env_var(engine_state, "OLDPWD") {
                         oldpwd.to_path()?
                     } else {
-                        cwd.into()
+                        cwd
                     }
                 } else {
                     // Trim whitespace from the end of path.
diff --git a/crates/nu-command/src/filesystem/start.rs b/crates/nu-command/src/filesystem/start.rs
index 577fe128ba..b295b5f368 100644
--- a/crates/nu-command/src/filesystem/start.rs
+++ b/crates/nu-command/src/filesystem/start.rs
@@ -58,9 +58,8 @@ impl Command for Start {
             open_path(url.as_str(), engine_state, stack, path.span)?;
         } else {
             // try to distinguish between file not found and opening url without prefix
-            if let Ok(canon_path) =
-                canonicalize_with(path_no_whitespace, std::env::current_dir()?.as_path())
-            {
+            let cwd = engine_state.cwd(Some(stack))?;
+            if let Ok(canon_path) = canonicalize_with(path_no_whitespace, cwd) {
                 open_path(canon_path, engine_state, stack, path.span)?;
             } else {
                 // open crate does not allow opening URL without prefix
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index cf24a26859..6d7aff120e 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -17,7 +17,7 @@ use nu_path::AbsolutePathBuf;
 use std::{
     collections::HashMap,
     num::NonZeroUsize,
-    path::{Path, PathBuf},
+    path::PathBuf,
     sync::{
         atomic::{AtomicBool, AtomicU32, Ordering},
         Arc, Mutex, MutexGuard, PoisonError,
@@ -307,11 +307,7 @@ impl EngineState {
     }
 
     /// Merge the environment from the runtime Stack into the engine state
-    pub fn merge_env(
-        &mut self,
-        stack: &mut Stack,
-        cwd: impl AsRef<Path>,
-    ) -> Result<(), ShellError> {
+    pub fn merge_env(&mut self, stack: &mut Stack) -> Result<(), ShellError> {
         for mut scope in stack.env_vars.drain(..) {
             for (overlay_name, mut env) in Arc::make_mut(&mut scope).drain() {
                 if let Some(env_vars) = Arc::make_mut(&mut self.env_vars).get_mut(&overlay_name) {
@@ -324,9 +320,6 @@ impl EngineState {
             }
         }
 
-        // TODO: better error
-        std::env::set_current_dir(cwd)?;
-
         if let Some(config) = stack.config.take() {
             // If config was updated in the stack, replace it.
             self.config = config;
diff --git a/crates/nu-std/src/lib.rs b/crates/nu-std/src/lib.rs
index 9944d9bf21..67c12b735d 100644
--- a/crates/nu-std/src/lib.rs
+++ b/crates/nu-std/src/lib.rs
@@ -99,8 +99,7 @@ use std pwd
 
     eval_block::<WithoutDebug>(engine_state, &mut stack, &block, pipeline_data)?;
 
-    let cwd = engine_state.cwd(Some(&stack))?;
-    engine_state.merge_env(&mut stack, cwd)?;
+    engine_state.merge_env(&mut stack)?;
 
     Ok(())
 }
diff --git a/src/config_files.rs b/src/config_files.rs
index e2d0af8131..2a685faf34 100644
--- a/src/config_files.rs
+++ b/src/config_files.rs
@@ -163,15 +163,8 @@ pub(crate) fn read_default_env_file(engine_state: &mut EngineState, stack: &mut
     );
 
     // Merge the environment in case env vars changed in the config
-    match engine_state.cwd(Some(stack)) {
-        Ok(cwd) => {
-            if let Err(e) = engine_state.merge_env(stack, cwd) {
-                report_shell_error(engine_state, &e);
-            }
-        }
-        Err(e) => {
-            report_shell_error(engine_state, &e);
-        }
+    if let Err(e) = engine_state.merge_env(stack) {
+        report_shell_error(engine_state, &e);
     }
 }
 
@@ -249,15 +242,8 @@ fn eval_default_config(
     );
 
     // Merge the environment in case env vars changed in the config
-    match engine_state.cwd(Some(stack)) {
-        Ok(cwd) => {
-            if let Err(e) = engine_state.merge_env(stack, cwd) {
-                report_shell_error(engine_state, &e);
-            }
-        }
-        Err(e) => {
-            report_shell_error(engine_state, &e);
-        }
+    if let Err(e) = engine_state.merge_env(stack) {
+        report_shell_error(engine_state, &e);
     }
 }
 
diff --git a/src/main.rs b/src/main.rs
index 303fb50e9f..839c32b66a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -21,7 +21,6 @@ use command::gather_commandline_args;
 use log::{trace, Level};
 use miette::Result;
 use nu_cli::gather_parent_env_vars;
-use nu_cmd_base::util::get_init_cwd;
 use nu_lsp::LanguageServer;
 use nu_path::canonicalize_with;
 use nu_protocol::{
@@ -44,6 +43,27 @@ fn get_engine_state() -> EngineState {
     nu_explore::add_explore_context(engine_state)
 }
 
+/// Get the directory where the Nushell executable is located.
+fn current_exe_directory() -> PathBuf {
+    let mut path = std::env::current_exe().expect("current_exe() should succeed");
+    path.pop();
+    path
+}
+
+/// Get the current working directory from the environment.
+fn current_dir_from_environment() -> PathBuf {
+    if let Ok(cwd) = std::env::current_dir() {
+        return cwd;
+    }
+    if let Ok(cwd) = std::env::var("PWD") {
+        return cwd.into();
+    }
+    if let Some(home) = nu_path::home_dir() {
+        return home.into_std_path_buf();
+    }
+    current_exe_directory()
+}
+
 fn main() -> Result<()> {
     let entire_start_time = std::time::Instant::now();
     let mut start_time = std::time::Instant::now();
@@ -54,10 +74,11 @@ fn main() -> Result<()> {
         miette_hook(x);
     }));
 
-    // Get initial current working directory.
-    let init_cwd = get_init_cwd();
     let mut engine_state = get_engine_state();
 
+    // Get the current working directory from the environment.
+    let init_cwd = current_dir_from_environment();
+
     // Custom additions
     let delta = {
         let mut working_set = nu_protocol::engine::StateWorkingSet::new(&engine_state);
@@ -319,6 +340,12 @@ fn main() -> Result<()> {
             _ => std::process::exit(1),
         }
         std::process::exit(0)
+    } else {
+        // If we're not running a testbin, set the current working directory to
+        // the location of the Nushell executable. This prevents the OS from
+        // locking the directory where the user launched Nushell.
+        std::env::set_current_dir(current_exe_directory())
+            .expect("set_current_dir() should succeed");
     }
     perf!("run test_bins", start_time, use_color);
 
diff --git a/src/test_bins.rs b/src/test_bins.rs
index efa7e9dd7d..2fef7e02b7 100644
--- a/src/test_bins.rs
+++ b/src/test_bins.rs
@@ -256,13 +256,9 @@ pub fn nu_repl() {
     for (i, line) in source_lines.iter().enumerate() {
         let mut stack = Stack::with_parent(top_stack.clone());
 
-        let cwd = engine_state
-            .cwd(Some(&stack))
-            .unwrap_or_else(|err| outcome_err(&engine_state, &err));
-
         // Before doing anything, merge the environment from the previous REPL iteration into the
         // permanent state.
-        if let Err(err) = engine_state.merge_env(&mut stack, &cwd) {
+        if let Err(err) = engine_state.merge_env(&mut stack) {
             outcome_err(&engine_state, &err);
         }
 
diff --git a/tests/shell/pipeline/commands/external.rs b/tests/shell/pipeline/commands/external.rs
index 9a19f4b3a7..461cd1638b 100644
--- a/tests/shell/pipeline/commands/external.rs
+++ b/tests/shell/pipeline/commands/external.rs
@@ -131,9 +131,9 @@ fn command_not_found_error_suggests_typo_fix() {
 #[test]
 fn command_not_found_error_recognizes_non_executable_file() {
     let actual = nu!("./Cargo.toml");
-    assert!(actual.err.contains(
-        "refers to a file that is not executable. Did you forget to to set execute permissions?"
-    ));
+    assert!(actual
+        .err
+        .contains("is neither a Nushell built-in or a known external command"));
 }
 
 #[test]

From e8c20390e0cf9169f5cba7cf0905371146169bbc Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Wed, 25 Sep 2024 18:16:54 -0500
Subject: [PATCH 0476/1072] fix ls_colors coloring in grid and ls (#13935)

# Description

After PR https://github.com/nushell/nushell/pull/12953, LS_COLORS
coloring broke in the `grid` and `ls` commands because the full path to
the files were not available. This PR restores the coloring.


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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/system/run_external.rs | 10 ++++++++-
 crates/nu-command/src/viewers/griddle.rs     |  4 +++-
 crates/nu-command/src/viewers/table.rs       | 22 +++++++++++++-------
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index 80c1c94e23..4a790fc9b4 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -623,8 +623,16 @@ mod test {
 
     #[test]
     fn test_write_pipeline_data() {
-        let engine_state = EngineState::new();
+        let mut engine_state = EngineState::new();
         let stack = Stack::new();
+        let cwd = std::env::current_dir()
+            .unwrap()
+            .into_os_string()
+            .into_string()
+            .unwrap();
+
+        // set the PWD environment variable as it's required now
+        engine_state.add_env_var("PWD".into(), Value::string(cwd, Span::test_data()));
 
         let mut buf = vec![];
         let input = PipelineData::Empty;
diff --git a/crates/nu-command/src/viewers/griddle.rs b/crates/nu-command/src/viewers/griddle.rs
index dccd856512..f75864b388 100644
--- a/crates/nu-command/src/viewers/griddle.rs
+++ b/crates/nu-command/src/viewers/griddle.rs
@@ -237,7 +237,9 @@ fn create_grid_output(
                     cell.alignment = Alignment::Left;
                     grid.add(cell);
                 } else {
-                    let style = ls_colors.style_for_path(value.clone());
+                    let no_ansi = nu_utils::strip_ansi_unlikely(&value);
+                    let path = cwd.join(no_ansi.as_ref());
+                    let style = ls_colors.style_for_path(path.clone());
                     let ansi_style = style.map(Style::to_nu_ansi_term_style).unwrap_or_default();
                     let mut cell = Cell::from(ansi_style.paint(value).to_string());
                     cell.alignment = Alignment::Left;
diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index dc52c4e094..5bdb847212 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -5,6 +5,7 @@
 use lscolors::{LsColors, Style};
 use nu_color_config::{color_from_hex, StyleComputer, TextStyle};
 use nu_engine::{command_prelude::*, env_to_string};
+use nu_path::form::Absolute;
 use nu_pretty_hex::HexConfig;
 use nu_protocol::{
     ByteStream, Config, DataSource, ListStream, PipelineMetadata, Signals, TableMode, ValueIterator,
@@ -125,7 +126,7 @@ impl Command for Table {
             let val = Value::list(supported_table_modes(), Span::test_data());
             return Ok(val.into_pipeline_data());
         }
-
+        let cwd = engine_state.cwd(Some(stack))?;
         let cfg = parse_table_config(call, engine_state, stack)?;
         let input = CmdInput::new(engine_state, stack, call, input);
 
@@ -135,7 +136,7 @@ impl Command for Table {
             let _ = nu_utils::enable_vt_processing();
         }
 
-        handle_table_command(input, cfg)
+        handle_table_command(input, cfg, cwd)
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -367,6 +368,7 @@ impl<'a> CmdInput<'a> {
 fn handle_table_command(
     mut input: CmdInput<'_>,
     cfg: TableConfig,
+    cwd: nu_path::PathBuf<Absolute>,
 ) -> Result<PipelineData, ShellError> {
     let span = input.data.span().unwrap_or(input.call.head);
     match input.data {
@@ -389,11 +391,11 @@ fn handle_table_command(
             let stream = ListStream::new(vals.into_iter(), span, signals);
             input.data = PipelineData::Empty;
 
-            handle_row_stream(input, cfg, stream, metadata)
+            handle_row_stream(input, cfg, stream, metadata, cwd)
         }
         PipelineData::ListStream(stream, metadata) => {
             input.data = PipelineData::Empty;
-            handle_row_stream(input, cfg, stream, metadata)
+            handle_row_stream(input, cfg, stream, metadata, cwd)
         }
         PipelineData::Value(Value::Record { val, .. }, ..) => {
             input.data = PipelineData::Empty;
@@ -413,7 +415,7 @@ fn handle_table_command(
             let stream =
                 ListStream::new(val.into_range_iter(span, Signals::empty()), span, signals);
             input.data = PipelineData::Empty;
-            handle_row_stream(input, cfg, stream, metadata)
+            handle_row_stream(input, cfg, stream, metadata, cwd)
         }
         x => Ok(x),
     }
@@ -605,6 +607,7 @@ fn handle_row_stream(
     cfg: TableConfig,
     stream: ListStream,
     metadata: Option<PipelineMetadata>,
+    cwd: nu_path::PathBuf<Absolute>,
 ) -> Result<PipelineData, ShellError> {
     let stream = match metadata.as_ref() {
         // First, `ls` sources:
@@ -634,7 +637,9 @@ fn handle_row_stream(
                     if let Some(value) = record.to_mut().get_mut("name") {
                         let span = value.span();
                         if let Value::String { val, .. } = value {
-                            if let Some(val) = render_path_name(val, &config, &ls_colors, span) {
+                            if let Some(val) =
+                                render_path_name(val, &config, &ls_colors, cwd.clone(), span)
+                            {
                                 *value = val;
                             }
                         }
@@ -1008,15 +1013,16 @@ fn render_path_name(
     path: &str,
     config: &Config,
     ls_colors: &LsColors,
+    cwd: nu_path::PathBuf<Absolute>,
     span: Span,
 ) -> Option<Value> {
     if !config.ls.use_ls_colors {
         return None;
     }
 
+    let fullpath = cwd.join(path);
     let stripped_path = nu_utils::strip_ansi_unlikely(path);
-
-    let metadata = std::fs::symlink_metadata(stripped_path.as_ref());
+    let metadata = std::fs::symlink_metadata(fullpath);
     let has_metadata = metadata.is_ok();
     let style =
         ls_colors.style_for_path_with_metadata(stripped_path.as_ref(), metadata.ok().as_ref());

From 8195e2d63845c9a1053cfa976046821d6e6ac302 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 26 Sep 2024 14:20:59 +0200
Subject: [PATCH 0477/1072] Bump rustix from 0.38.34 to 0.38.37 (#13878)

Notable this gets https://github.com/bytecodealliance/rustix/pull/1147
which makes things work on Android again.

Without this update latest `0.98.0` release gets stuck in a loop
outputting the below error due to the `TCGETS2` usage:

> Error: Os { code: 13, kind: PermissionDenied, message: "Permission
denied" }
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e41e74ce5a..990e9d5a19 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5432,9 +5432,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.34"
+version = "0.38.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
 dependencies = [
  "bitflags 2.6.0",
  "errno",

From 0c72f881a635e258f86a7cd4346ee842699061e1 Mon Sep 17 00:00:00 2001
From: Saurabh Shinde <37367457+saurabh10041998@users.noreply.github.com>
Date: Thu, 26 Sep 2024 20:27:37 +0530
Subject: [PATCH 0478/1072] Fix Docker image build failure (#13938)

## Description
While building the docker image under `nushell/docker` directory,
following build failure observed.


![nushell-docker-error](https://github.com/user-attachments/assets/972048d7-b001-4325-b947-93e95b98f4d1)

The problem here is the following lines of code that decide which
`nushell` binary to download, extract, and install
https://github.com/nushell/nushell/blob/main/docker/Dockerfile#L16-L19

The issue is especially with wildcard asterisk (*) which downloads both
`amd64` and `arm64` binary while building.

## Fix
Introduced build arg `TARGETARCH` which will be populated implicitly by
docker `build/buildx` which will help us to decide which binary to
download.

## User-Facing Changes
None.

## Testing Details
Tested building docker image on both `amd64` and `arm64` systems.
**amd64/x86_64**

![nushell-docker-amd64](https://github.com/user-attachments/assets/ea30b7e3-0664-4a5b-bb13-4c18cdae2a31)

**arm64**

![nushell-docker-arm64](https://github.com/user-attachments/assets/54e47051-1ee7-4695-bc6c-1e211532a545)
---
 docker/Dockerfile | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0ccfc45740..bf45834b16 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -7,13 +7,25 @@ FROM alpine
 
 LABEL maintainer=nushell
 
-RUN echo '/usr/bin/nu' >> /etc/shells \
+ARG TARGETARCH
+
+RUN set -eux; \
+    if [ "${TARGETARCH}" = "amd64" ] || [ "${TARGETARCH}" = "x86_64" ]; then \
+        echo "Downloading x86_64 binary for ${TARGETARCH}..."; \
+        arch_path="x86_64"; \
+    elif [ "${TARGETARCH}" = "arm64" ] || [ "${TARGETARCH}" = "aarch64"]; then \
+        echo "Downloading aarch64 binary for ${TARGETARCH}..."; \
+        arch_path="aarch64"; \
+    else \
+        arch_path=""; \
+    fi; \
+    echo '/usr/bin/nu' >> /etc/shells \
     && adduser -D -s /usr/bin/nu nushell \
     && mkdir -p /home/nushell/.config/nushell/ \
     && cd /tmp \
     && wget -qO - https://api.github.com/repos/nushell/nushell/releases/latest \
     | grep browser_download_url \
-    | grep musl.tar.gz \
+    | grep "${arch_path}.*.musl.tar.gz" \
     | cut -f4 -d '"' \
     | xargs -I{} wget {} \
     && tar -xzf nu* \

From d68c3ec89a8efa304246467f80140c59467ba94f Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Thu, 26 Sep 2024 14:54:42 -0400
Subject: [PATCH 0479/1072] Only ask to create config files the first time nu
 is started (#13857)

# Description

Implements #13669

When nu is started for the first time, the directory represented by
`$nu.default-config-dir` typically will not exist. In this case, Nushell
will create the directory. It will then detect that either or both
`config.nu`/`env.nu` don't exist and offer to create them.

(Existing behavior) If the user declines, the directory will still be
created (since the history file lives there as well). The
`default_config.nu` and `default_env.nu` will be loaded.

On subsequent launches, as long as the config directory continues to
exist, the user will not be prompted to recreate the config files.
Nushell will behave as if the user answered "N" to the prompt in that
`default_config.nu` and `default_env.nu` will be used.

The user can still create a `config.nu` or `env.nu` at any point, and
that will be used. In that case, `default_config.nu` and/or
`default_env.nu` will no longer be loaded (unless and until #13671 is
implemented).

# User-Facing Changes

User will no longer be prompted to create config files if they are
missing so long as the config directory exists.

## Before this change:

1. Nushell starts for the first time
2. The directory where config files are stored does not exist
3. The config files do not exist
   * User is asked whether they want to create `env.nu`
- User says, "Y", `default_env.nu` is copied to the directory as
`env.nu` (and directory is created if needed)
- User says, "n", `default_env.nu` is loaded, but no file on the
filesystem is created.

   * User is asked whether they want to create `config.nu`
- User says, "Y", `default_config.nu` is copied to the directory as
`config.nu` (and directory is created if needed)
- User says, "n", `default_config.nu` is loaded, but no file on the
filesystem is created.

4. The next time `nu` is run, if either file is missing, the user will
be prompted again for that file.

## After this change:

Steps 1 - 3 remains the same.

4. The next time `nu` is run, we check if the directory exists.  If so:
5. Do not prompt user to create any missing files **(New Behavior)**
6. `$nu.default-config-dir/env.nu` exists?
   * Yes? Use it. (Normal behavior)
   * No?  Evaluate `default_env.nu`.  (Normal behavior)
   * No file is created on the filesystem

7. `$nu.default-config-dir/config.nu` exists?
   * Yes? Use it. (Normal behavior)
   * No?  Evaluate `default_config.nu` (Normal behavior)
   * No file is created on the filesystem

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

This behavior isn't currently mentioned in the configuration doc. I'll
probably hold off on changing anything in the doc until #13671 is
implemented. Regardless, given the timing, this won't make it into a
release for at least 4 weeks.
---
 src/config_files.rs | 52 ++++++++++++++++++++++++++++++++-------------
 src/run.rs          | 30 ++++++++++++++++++++++----
 2 files changed, 63 insertions(+), 19 deletions(-)

diff --git a/src/config_files.rs b/src/config_files.rs
index 2a685faf34..1dd2a4b66d 100644
--- a/src/config_files.rs
+++ b/src/config_files.rs
@@ -27,6 +27,7 @@ pub(crate) fn read_config_file(
     stack: &mut Stack,
     config_file: Option<Spanned<String>>,
     is_env_config: bool,
+    ask_to_create: bool,
 ) {
     warn!(
         "read_config_file() config_file_specified: {:?}, is_env_config: {is_env_config}",
@@ -66,17 +67,25 @@ pub(crate) fn read_config_file(
             } else {
                 "config"
             };
-            println!(
-                "No {} file found at {}",
-                file_msg,
-                config_path.to_string_lossy()
-            );
-            println!("Would you like to create one with defaults (Y/n): ");
 
-            let mut answer = String::new();
-            std::io::stdin()
-                .read_line(&mut answer)
-                .expect("Failed to read user input");
+            let will_create_file = match ask_to_create {
+                true => {
+                    println!(
+                        "No {} file found at {}",
+                        file_msg,
+                        config_path.to_string_lossy()
+                    );
+                    println!("Would you like to create one with defaults (Y/n): ");
+
+                    let mut answer = String::new();
+                    std::io::stdin()
+                        .read_line(&mut answer)
+                        .expect("Failed to read user input");
+
+                    matches!(answer.trim(), "y" | "Y" | "")
+                }
+                _ => false,
+            };
 
             let config_file = if is_env_config {
                 get_default_env()
@@ -84,8 +93,8 @@ pub(crate) fn read_config_file(
                 get_default_config()
             };
 
-            match answer.trim() {
-                "y" | "Y" | "" => {
+            match will_create_file {
+                true => {
                     if let Ok(mut output) = File::create(&config_path) {
                         if write!(output, "{config_file}").is_ok() {
                             let config_type = if is_env_config {
@@ -226,7 +235,6 @@ fn eval_default_config(
         "eval_default_config() config_file_specified: {:?}, is_env_config: {}",
         &config_file, is_env_config
     );
-    println!("Continuing without config file");
     // Just use the contents of "default_config.nu" or "default_env.nu"
     eval_source(
         engine_state,
@@ -259,12 +267,26 @@ pub(crate) fn setup_config(
         "setup_config() config_file_specified: {:?}, env_file_specified: {:?}, login: {}",
         &config_file, &env_file, is_login_shell
     );
+
+    let ask_to_create_config = if let Some(mut config_path) = nu_path::config_dir() {
+        config_path.push(NUSHELL_FOLDER);
+        !config_path.exists()
+    } else {
+        false
+    };
+
     let result = catch_unwind(AssertUnwindSafe(|| {
         #[cfg(feature = "plugin")]
         read_plugin_file(engine_state, plugin_file, NUSHELL_FOLDER);
 
-        read_config_file(engine_state, stack, env_file, true);
-        read_config_file(engine_state, stack, config_file, false);
+        read_config_file(engine_state, stack, env_file, true, ask_to_create_config);
+        read_config_file(
+            engine_state,
+            stack,
+            config_file,
+            false,
+            ask_to_create_config,
+        );
 
         if is_login_shell {
             read_loginshell_file(engine_state, stack);
diff --git a/src/run.rs b/src/run.rs
index 068a581b72..16dbe0a5b6 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -1,8 +1,6 @@
-#[cfg(feature = "plugin")]
-use crate::config_files::NUSHELL_FOLDER;
 use crate::{
     command,
-    config_files::{self, setup_config},
+    config_files::{self, setup_config, NUSHELL_FOLDER},
 };
 use log::trace;
 #[cfg(feature = "plugin")]
@@ -26,6 +24,13 @@ pub(crate) fn run_commands(
     let mut stack = Stack::new();
     let start_time = std::time::Instant::now();
 
+    let ask_to_create_config = if let Some(mut config_path) = nu_path::config_dir() {
+        config_path.push(NUSHELL_FOLDER);
+        !config_path.exists()
+    } else {
+        false
+    };
+
     if stack.has_env_var(engine_state, "NU_DISABLE_IR") {
         stack.use_ir = false;
     }
@@ -49,6 +54,7 @@ pub(crate) fn run_commands(
                 &mut stack,
                 parsed_nu_cli_args.env_file,
                 true,
+                ask_to_create_config,
             );
         } else {
             config_files::read_default_env_file(engine_state, &mut stack)
@@ -57,6 +63,13 @@ pub(crate) fn run_commands(
         perf!("read env.nu", start_time, use_color);
 
         let start_time = std::time::Instant::now();
+        let ask_to_create_config = if let Some(mut config_path) = nu_path::config_dir() {
+            config_path.push(config_files::NUSHELL_FOLDER);
+            !config_path.exists()
+        } else {
+            false
+        };
+
         // If we have a config file parameter *OR* we have a login shell parameter, read the config file
         if parsed_nu_cli_args.config_file.is_some() || parsed_nu_cli_args.login_shell.is_some() {
             config_files::read_config_file(
@@ -64,6 +77,7 @@ pub(crate) fn run_commands(
                 &mut stack,
                 parsed_nu_cli_args.config_file,
                 false,
+                ask_to_create_config,
             );
         }
 
@@ -126,6 +140,12 @@ pub(crate) fn run_file(
     // if the --no-config-file(-n) flag is passed, do not load plugin, env, or config files
     if parsed_nu_cli_args.no_config_file.is_none() {
         let start_time = std::time::Instant::now();
+        let ask_to_create_config = if let Some(mut config_path) = nu_path::config_dir() {
+            config_path.push(config_files::NUSHELL_FOLDER);
+            !config_path.exists()
+        } else {
+            false
+        };
         #[cfg(feature = "plugin")]
         read_plugin_file(engine_state, parsed_nu_cli_args.plugin_file, NUSHELL_FOLDER);
         perf!("read plugins", start_time, use_color);
@@ -138,6 +158,7 @@ pub(crate) fn run_file(
                 &mut stack,
                 parsed_nu_cli_args.env_file,
                 true,
+                ask_to_create_config,
             );
         } else {
             config_files::read_default_env_file(engine_state, &mut stack)
@@ -151,6 +172,7 @@ pub(crate) fn run_file(
                 &mut stack,
                 parsed_nu_cli_args.config_file,
                 false,
+                ask_to_create_config,
             );
         }
         perf!("read config.nu", start_time, use_color);
@@ -208,7 +230,7 @@ pub(crate) fn run_repl(
     let ret_val = evaluate_repl(
         engine_state,
         stack,
-        config_files::NUSHELL_FOLDER,
+        NUSHELL_FOLDER,
         parsed_nu_cli_args.execute,
         parsed_nu_cli_args.no_std_lib,
         entire_start_time,

From 5bef81a0594553981ea10171778b5bed32e164fa Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Fri, 27 Sep 2024 04:54:28 -0700
Subject: [PATCH 0480/1072] Added command `polars len` for performing count(*)
 like operations. (#13941)

# Description
This request exposes the prelude::polars::len expression. It is ended
for doing fast select count(*) like operations:

<img width="626" alt="Screenshot 2024-09-26 at 18 14 45"
src="https://github.com/user-attachments/assets/74285fc6-f99c-46e0-9226-9a7d41738d78">

# User-Facing Changes
- Introduction of the `polars len` command
---
 .../src/dataframe/command/data/len.rs         | 76 +++++++++++++++++++
 .../src/dataframe/command/data/mod.rs         |  2 +
 2 files changed, 78 insertions(+)
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/data/len.rs

diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/len.rs b/crates/nu_plugin_polars/src/dataframe/command/data/len.rs
new file mode 100644
index 0000000000..f537a6baa1
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/len.rs
@@ -0,0 +1,76 @@
+use crate::{
+    values::{Column, CustomValueSupport, NuDataFrame, NuExpression},
+    PolarsPlugin,
+};
+
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{Category, Example, LabeledError, PipelineData, Signature, Span, Type, Value};
+
+#[derive(Clone)]
+pub struct ExprLen;
+
+impl PluginCommand for ExprLen {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars len"
+    }
+
+    fn description(&self) -> &str {
+        "Return the number of rows in the context. This is similar to COUNT(*) in SQL."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .input_output_type(Type::Any, Type::Custom("expression".into()))
+            .category(Category::Custom("dataframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Count the number of rows in the the dataframe.",
+                example: "[[a b]; [1 2] [3 4]] | polars into-df | polars select (polars len) | polars collect",
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![
+                            Column::new("len".to_string(), vec![Value::test_int(2)]),
+                        ],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
+            Example {
+                description: "Creates a last expression from a column",
+                example: "polars col a | polars last",
+                result: None,
+            },
+        ]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        _input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        let res: NuExpression = polars::prelude::len().into();
+        res.to_pipeline_data(plugin, engine, call.head)
+            .map_err(LabeledError::from)
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::test::test_polars_plugin_command;
+    use nu_protocol::ShellError;
+
+    #[test]
+    fn test_examples() -> Result<(), ShellError> {
+        test_polars_plugin_command(&ExprLen)
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/mod.rs b/crates/nu_plugin_polars/src/dataframe/command/data/mod.rs
index f11ac31fe4..058b277526 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/mod.rs
@@ -19,6 +19,7 @@ mod flatten;
 mod get;
 mod join;
 mod last;
+mod len;
 mod lit;
 mod pivot;
 mod query_df;
@@ -85,6 +86,7 @@ pub(crate) fn data_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin
         Box::new(UnpivotDF),
         Box::new(FirstDF),
         Box::new(LastDF),
+        Box::new(len::ExprLen),
         Box::new(RenameDF),
         Box::new(SampleDF),
         Box::new(SliceDF),

From bcaef8959c012f60c1a462cf747514adfea3a526 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Fri, 27 Sep 2024 04:54:46 -0700
Subject: [PATCH 0481/1072] Expose flag truncate-ragged-lines in `polars open`
 (#13939)

# Description
Introduces a new flag `--truncate-ragged-lines` for `polars open` that
will truncate lines that are longer than the schema.

# User-Facing Changes
- Introduction of the flag `--truncate-ragged-lines` for `polars open`
---
 .../src/dataframe/command/core/open.rs          | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/open.rs b/crates/nu_plugin_polars/src/dataframe/command/core/open.rs
index a897114999..1aae5f26e2 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/open.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/open.rs
@@ -97,6 +97,7 @@ impl PluginCommand for OpenDataFrame {
                 r#"Polars Schema in format [{name: str}]. CSV, JSON, and JSONL files"#,
                 Some('s')
             )
+            .switch("truncate-ragged-lines", "Truncate lines that are longer than the schema. CSV file", None)
             .input_output_type(Type::Any, Type::Custom("dataframe".into()))
             .category(Category::Custom("dataframe".into()))
     }
@@ -466,11 +467,11 @@ fn from_csv(
         .unwrap_or(DEFAULT_INFER_SCHEMA);
     let skip_rows: Option<usize> = call.get_flag("skip-rows")?;
     let columns: Option<Vec<String>> = call.get_flag("columns")?;
-
     let maybe_schema = call
         .get_flag("schema")?
         .map(|schema| NuSchema::try_from(&schema))
         .transpose()?;
+    let truncate_ragged_lines: bool = call.has_flag("truncate-ragged-lines")?;
 
     if !call.has_flag("eager")? {
         let csv_reader = LazyCsvReader::new(file_path);
@@ -496,14 +497,11 @@ fn from_csv(
             }
         };
 
-        let csv_reader = csv_reader.with_has_header(!no_header);
-
-        let csv_reader = match maybe_schema {
-            Some(schema) => csv_reader.with_schema(Some(schema.into())),
-            None => csv_reader,
-        };
-
-        let csv_reader = csv_reader.with_infer_schema_length(Some(infer_schema));
+        let csv_reader = csv_reader
+            .with_has_header(!no_header)
+            .with_infer_schema_length(Some(infer_schema))
+            .with_schema(maybe_schema.map(Into::into))
+            .with_truncate_ragged_lines(truncate_ragged_lines);
 
         let csv_reader = match skip_rows {
             None => csv_reader,
@@ -542,6 +540,7 @@ fn from_csv(
                             .unwrap_or(b','),
                     )
                     .with_encoding(CsvEncoding::LossyUtf8)
+                    .with_truncate_ragged_lines(truncate_ragged_lines)
             })
             .try_into_reader_with_file_path(Some(file_path.to_path_buf()))
             .map_err(|e| ShellError::GenericError {

From 497954d84c65e9c5a02cc40ef10ada5c060684c8 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Fri, 27 Sep 2024 08:52:48 -0500
Subject: [PATCH 0482/1072] ensure toolkit is using external cargo command
 (#13943)

# Description

@cptpiepmatz and I ran into a problem where `toolkit check pr` and
`toolkit clippy --verbose` wouldn't work. I tracked it down to me using
`cargo-completions.nu` out of the nu_scripts repo. It was redefining
`cargo clippy`. The fix was to ensure that all `cargo` commands in
`toolkit.nu` use the external `^cargo`.

Specifically, the problem with `cargo clippy` in `cargo-completions.nu`
is it didn't seem to allow `-- -D blah` type parameters.

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

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

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

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

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

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

diff --git a/toolkit.nu b/toolkit.nu
index 0ef56d1077..b8ba3ddb80 100644
--- a/toolkit.nu
+++ b/toolkit.nu
@@ -17,14 +17,14 @@ export def fmt [
 
     if $check {
         try {
-            cargo fmt --all -- --check
+            ^cargo fmt --all -- --check
         } catch {
             error make --unspanned {
                 msg: $"\nplease run ('toolkit fmt' | pretty-format-command) to fix formatting!"
             }
         }
     } else {
-        cargo fmt --all
+        ^cargo fmt --all
     }
 }
 
@@ -41,11 +41,11 @@ export def clippy [
 
     # If changing these settings also change CI settings in .github/workflows/ci.yml
     try {(
-        cargo clippy
+        ^cargo clippy
             --workspace
             --exclude nu_plugin_*
             --features ($features | str join ",")
-        --
+            --
             -D warnings
             -D clippy::unwrap_used
             -D clippy::unchecked_duration_subtraction
@@ -56,12 +56,12 @@ export def clippy [
     }
     # In tests we don't have to deny unwrap
     (
-        cargo clippy
+        ^cargo clippy
             --tests
             --workspace
             --exclude nu_plugin_*
             --features ($features | str join ",")
-        --
+            --
             -D warnings
     )
 
@@ -69,9 +69,9 @@ export def clippy [
         print $"running ('toolkit clippy' | pretty-format-command) on plugins"
     }
     (
-        cargo clippy
+        ^cargo clippy
             --package nu_plugin_*
-        --
+            --
             -D warnings
             -D clippy::unwrap_used
             -D clippy::unchecked_duration_subtraction
@@ -92,15 +92,15 @@ export def test [
 ] {
     if $fast {
         if $workspace {
-            cargo nextest run --all
+            ^cargo nextest run --all
         } else {
-            cargo nextest run --features ($features | str join ",")
+            ^cargo nextest run --features ($features | str join ",")
         }
     } else {
         if $workspace {
-            cargo test --workspace
+            ^cargo test --workspace
         } else {
-            cargo test --features ($features | str join ",")
+            ^cargo test --features ($features | str join ",")
         }
     }
 }
@@ -109,7 +109,7 @@ export def test [
 export def "test stdlib" [
     --extra-args: string = ''
 ] {
-    cargo run -- --no-config-file -c $"
+    ^cargo run -- --no-config-file -c $"
         use crates/nu-std/testing.nu
         testing run-tests --path crates/nu-std ($extra_args)
     "
@@ -303,7 +303,7 @@ export def "check pr" [
 
 # run Nushell from source with a right indicator
 export def run [] {
-    cargo run -- ...[
+    ^cargo run -- ...[
         -e "$env.PROMPT_COMMAND_RIGHT = $'(ansi magenta_reverse)trying Nushell inside Cargo(ansi reset)'"
     ]
 }
@@ -325,7 +325,7 @@ def build-nushell [features: string] {
     print $'(char nl)Building nushell'
     print '----------------------------'
 
-    cargo build --features $features --locked
+    ^cargo build --features $features --locked
 }
 
 def build-plugin [] {
@@ -335,7 +335,7 @@ def build-plugin [] {
     print '----------------------------'
 
     cd $"crates/($plugin)"
-    cargo build
+    ^cargo build
 }
 
 # build Nushell and plugins with some features
@@ -373,7 +373,7 @@ def install-plugin [] {
     print $'(char nl)Installing ($plugin)'
     print '----------------------------'
 
-    cargo install --path $"crates/($plugin)"
+    ^cargo install --path $"crates/($plugin)"
 }
 
 # install Nushell and features you want
@@ -382,7 +382,7 @@ export def install [
     --all # install all plugins with Nushell
 ] {
     touch crates/nu-cmd-lang/build.rs # needed to make sure `version` has the correct `commit_hash`
-    cargo install --path . --features ($features | str join ",") --locked --force
+    ^cargo install --path . --features ($features | str join ",") --locked --force
     if not $all {
         return
     }
@@ -438,23 +438,23 @@ def compute-coverage [] {
     # show env outputs .ini/.toml style description of the variables
     # In order to use from toml, we need to make sure our string literals are single quoted
     # This is especially important when running on Windows since "C:\blah" is treated as an escape
-    cargo llvm-cov show-env | str replace (char dq) (char sq) -a | from toml | load-env
+    ^cargo llvm-cov show-env | str replace (char dq) (char sq) -a | from toml | load-env
 
     print "Cleaning up coverage data"
-    cargo llvm-cov clean --workspace
+    ^cargo llvm-cov clean --workspace
 
     print "Building with workspace and profile=ci"
     # Apparently we need to explicitly build the necessary parts
     # using the `--profile=ci` is basically `debug` build with unnecessary symbols stripped
     # leads to smaller binaries and potential savings when compiling and running
-    cargo build --workspace --profile=ci
+    ^cargo build --workspace --profile=ci
 
     print "Running tests with --workspace and profile=ci"
-    cargo test --workspace --profile=ci
+    ^cargo test --workspace --profile=ci
 
     # You need to provide the used profile to find the raw data
     print "Generating coverage report as lcov.info"
-    cargo llvm-cov report --lcov --output-path lcov.info --profile=ci
+    ^cargo llvm-cov report --lcov --output-path lcov.info --profile=ci
 }
 
 # Script to generate coverage locally
@@ -512,12 +512,12 @@ export def benchmark-compare [
     # benchmark the target revision
     print $'-- Running benchmarks for ($target)'
     git checkout $target
-    cargo export $tgt_bin_dir -- bench
+    ^cargo export $tgt_bin_dir -- bench
 
     # benchmark the comparison reference revision
     print $'-- Running benchmarks for ($reference)'
     git checkout $reference
-    cargo export $ref_bin_dir -- bench
+    ^cargo export $ref_bin_dir -- bench
 
     # return back to the whatever revision before benchmarking
     print '-- Done'
@@ -547,7 +547,7 @@ export def benchmark-log [
     if $target != $current {
         git checkout $target
     }
-    cargo export $bin_dir -- bench
+    ^cargo export $bin_dir -- bench
 
     # return back to the whatever revision before benchmarking
     print '-- Done'

From 8200831b07ab87ab23c4a56a8a08251d0332b114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20K=C3=A4llberg?= <anka.213@gmail.com>
Date: Fri, 27 Sep 2024 17:39:45 +0200
Subject: [PATCH 0483/1072] Fix panic on too few arguments for custom function
 (#10395)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
Old code was comparing remaining positional arguments with total number
of arguments, where it should've compared remaining positional with
with remaining arguments of any kind. This means that if a function was
given too few arguments, `calculate_end_span` would believe that it
actually had too many arguments, since after parsing the first few
arguments, the number of remaining arguments needed were fewer than the
*total* number of arguments, of which we had used several.

Fixes #9072
Fixes: https://github.com/nushell/nushell/issues/13930
Fixes: https://github.com/nushell/nushell/issues/12069
Fixes: https://github.com/nushell/nushell/issues/8385

Extracted from #10381

## Bonus

It also improves the error handling on missing positional arguments
before keywords (no longer crashing since #9851). Instead of just giving
the keyword to the parser for the missing positional, we give an
explicit error about a missing positional argument. I would like better
descriptions than "missing var_name" though, but I'm not sure if that's
available without

Old error
```
Error: nu::parser::parse_mismatch

  × Parse mismatch during operation.
   ╭─[entry #1:1:1]
 1 │ let = if foo
   ·     ┬
   ·     ╰── expected valid variable name
   ╰────
```

New error
```
Error: nu::parser::missing_positional

  × Missing required positional argument.
   ╭─[entry #18:1:1]
 1 │ let = foo
   ·    ┬
   ·    ╰── missing var_name
   ╰────
  help: Usage: let <var_name> = <initial_value>
```

# User-Facing Changes
The program `alias = = =` is no longer accepted by the parser
---
 crates/nu-parser/src/parser.rs      | 44 +++++++++++++++++++----------
 crates/nu-protocol/src/signature.rs | 21 --------------
 tests/repl/test_parser.rs           | 26 ++++++++++++++++-
 3 files changed, 54 insertions(+), 37 deletions(-)

diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 57be8ec820..909fd75d61 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -734,22 +734,23 @@ fn calculate_end_span(
             // keywords, they get to set this by being present
 
             let positionals_between = kw_pos - positional_idx - 1;
-            if positionals_between > (kw_idx - spans_idx) {
+            if positionals_between >= (kw_idx - spans_idx) {
                 kw_idx
             } else {
                 kw_idx - positionals_between
             }
         } else {
             // Make space for the remaining require positionals, if we can
-            if signature.num_positionals_after(positional_idx) == 0 {
-                spans.len()
-            } else if positional_idx < signature.required_positional.len()
-                && spans.len() > (signature.required_positional.len() - positional_idx)
-            {
-                spans.len() - (signature.required_positional.len() - positional_idx - 1)
-            } else {
-                spans_idx + 1
-            }
+            // spans_idx < spans.len() is an invariant
+            let remaining_spans = spans.len() - (spans_idx + 1);
+            // positional_idx can be larger than required_positional.len() if we have optional args
+            let remaining_positional = signature
+                .required_positional
+                .len()
+                .saturating_sub(positional_idx + 1);
+            // Saturates to 0 when we have too few args
+            let extra_spans = remaining_spans.saturating_sub(remaining_positional);
+            spans_idx + 1 + extra_spans
         }
     }
 }
@@ -1164,11 +1165,24 @@ pub fn parse_internal_call(
         if let Some(positional) = signature.get_positional(positional_idx) {
             let end = calculate_end_span(working_set, &signature, spans, spans_idx, positional_idx);
 
-            let end = if spans.len() > spans_idx && end == spans_idx {
-                end + 1
-            } else {
-                end
-            };
+            // Missing arguments before next keyword
+            if end == spans_idx {
+                let prev_span = if spans_idx == 0 {
+                    command_span
+                } else {
+                    spans[spans_idx - 1]
+                };
+                let whitespace_span = Span::new(prev_span.end, spans[spans_idx].start);
+                working_set.error(ParseError::MissingPositional(
+                    positional.name.clone(),
+                    whitespace_span,
+                    signature.call_signature(),
+                ));
+                call.add_positional(Expression::garbage(working_set, whitespace_span));
+                positional_idx += 1;
+                continue;
+            }
+            debug_assert!(end <= spans.len());
 
             if spans[..end].is_empty() || spans_idx == end {
                 working_set.error(ParseError::MissingPositional(
diff --git a/crates/nu-protocol/src/signature.rs b/crates/nu-protocol/src/signature.rs
index 4c5cae9e03..30f8b280d1 100644
--- a/crates/nu-protocol/src/signature.rs
+++ b/crates/nu-protocol/src/signature.rs
@@ -522,27 +522,6 @@ impl Signature {
         total
     }
 
-    pub fn num_positionals_after(&self, idx: usize) -> usize {
-        let mut total = 0;
-
-        for (curr, positional) in self.required_positional.iter().enumerate() {
-            match positional.shape {
-                SyntaxShape::Keyword(..) => {
-                    // Keywords have a required argument, so account for that
-                    if curr > idx {
-                        total += 2;
-                    }
-                }
-                _ => {
-                    if curr > idx {
-                        total += 1;
-                    }
-                }
-            }
-        }
-        total
-    }
-
     /// Find the matching long flag
     pub fn get_long_flag(&self, name: &str) -> Option<Flag> {
         for flag in &self.named {
diff --git a/tests/repl/test_parser.rs b/tests/repl/test_parser.rs
index b5ab6d735a..8ccc15080a 100644
--- a/tests/repl/test_parser.rs
+++ b/tests/repl/test_parser.rs
@@ -189,7 +189,31 @@ fn assignment_with_no_var() -> TestResult {
         "mut = 'foo' | $in; $x | describe",
     ];
 
-    let expected = "valid variable";
+    let expecteds = [
+        "missing var_name",
+        "missing var_name",
+        "missing const_name",
+        "missing var_name",
+        "missing var_name",
+    ];
+
+    for (case, expected) in std::iter::zip(cases, expecteds) {
+        fail_test(case, expected)?;
+    }
+
+    Ok(())
+}
+
+#[test]
+fn too_few_arguments() -> TestResult {
+    // Test for https://github.com/nushell/nushell/issues/9072
+    let cases = [
+        "def a [b: bool, c: bool, d: float, e: float, f: float] {}; a true true 1 1",
+        "def a [b: bool, c: bool, d: float, e: float, f: float, g: float] {}; a true true 1 1",
+        "def a [b: bool, c: bool, d: float, e: float, f: float, g: float, h: float] {}; a true true 1 1",
+    ];
+
+    let expected = "missing f";
 
     for case in cases {
         fail_test(case, expected)?;

From fc61416c7942b51051051fb93e0f33efcf6e6dce Mon Sep 17 00:00:00 2001
From: Maxim Zhiburt <zhiburt@gmail.com>
Date: Sun, 29 Sep 2024 22:03:56 +0300
Subject: [PATCH 0484/1072] Fix issue with `ls | explore` coloring of file
 names (#13952)

close #13936

The fix seem to be exactly what you've @fdncred  described.
But I'd recheck that everything is good.


![image](https://github.com/user-attachments/assets/5d9ce02b-9545-4a96-9718-b19d2e5810b8)

Take care.
Have a great week.
---
 Cargo.lock                                 |  1 +
 crates/nu-explore/Cargo.toml               |  1 +
 crates/nu-explore/src/explore.rs           |  4 +++
 crates/nu-explore/src/nu_common/lscolor.rs | 31 +++++++++++++++++++---
 crates/nu-explore/src/pager/mod.rs         | 12 ++++-----
 crates/nu-explore/src/views/mod.rs         |  3 +++
 crates/nu-explore/src/views/record/mod.rs  |  2 +-
 7 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 990e9d5a19..1d6508ed14 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3245,6 +3245,7 @@ dependencies = [
  "nu-engine",
  "nu-json",
  "nu-parser",
+ "nu-path",
  "nu-pretty-hex",
  "nu-protocol",
  "nu-table",
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index f980467e32..fe9caf2aa1 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -16,6 +16,7 @@ workspace = true
 [dependencies]
 nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
 nu-parser = { path = "../nu-parser", version = "0.98.1" }
+nu-path = { path = "../nu-path", version = "0.98.1" }
 nu-color-config = { path = "../nu-color-config", version = "0.98.1" }
 nu-engine = { path = "../nu-engine", version = "0.98.1" }
 nu-table = { path = "../nu-table", version = "0.98.1" }
diff --git a/crates/nu-explore/src/explore.rs b/crates/nu-explore/src/explore.rs
index d6a59ee083..5384e0fcec 100644
--- a/crates/nu-explore/src/explore.rs
+++ b/crates/nu-explore/src/explore.rs
@@ -72,6 +72,9 @@ impl Command for Explore {
         explore_config.table.separator_style = lookup_color(&style_computer, "separator");
 
         let lscolors = create_lscolors(engine_state, stack);
+        let cwd = engine_state.cwd(Some(stack)).map_or(String::new(), |path| {
+            path.to_str().unwrap_or("").to_string()
+        });
 
         let config = PagerConfig::new(
             &nu_config,
@@ -80,6 +83,7 @@ impl Command for Explore {
             &lscolors,
             peek_value,
             tail,
+            &cwd,
         );
 
         let result = run_pager(engine_state, &mut stack.clone(), input, config);
diff --git a/crates/nu-explore/src/nu_common/lscolor.rs b/crates/nu-explore/src/nu_common/lscolor.rs
index 491d2c3f3a..393ace7883 100644
--- a/crates/nu-explore/src/nu_common/lscolor.rs
+++ b/crates/nu-explore/src/nu_common/lscolor.rs
@@ -1,7 +1,10 @@
+use std::path::Path;
+
 use super::NuText;
 use lscolors::LsColors;
 use nu_ansi_term::{Color, Style};
 use nu_engine::env_to_string;
+use nu_path::{expand_path_with, expand_to_real_path};
 use nu_protocol::engine::{EngineState, Stack};
 use nu_utils::get_ls_colors;
 
@@ -14,7 +17,7 @@ pub fn create_lscolors(engine_state: &EngineState, stack: &Stack) -> LsColors {
 }
 
 /// Colorizes any columns named "name" in the table using LS_COLORS
-pub fn lscolorize(header: &[String], data: &mut [Vec<NuText>], lscolors: &LsColors) {
+pub fn lscolorize(header: &[String], data: &mut [Vec<NuText>], cwd: &str, lscolors: &LsColors) {
     for (col, col_name) in header.iter().enumerate() {
         if col_name != "name" {
             continue;
@@ -23,7 +26,7 @@ pub fn lscolorize(header: &[String], data: &mut [Vec<NuText>], lscolors: &LsColo
         for row in data.iter_mut() {
             let (path, text_style) = &mut row[col];
 
-            let style = get_path_style(path, lscolors);
+            let style = get_path_style(path, cwd, lscolors);
             if let Some(style) = style {
                 *text_style = text_style.style(style);
             }
@@ -31,9 +34,29 @@ pub fn lscolorize(header: &[String], data: &mut [Vec<NuText>], lscolors: &LsColo
     }
 }
 
-fn get_path_style(path: &str, ls_colors: &LsColors) -> Option<Style> {
+fn get_path_style(path: &str, cwd: &str, ls_colors: &LsColors) -> Option<Style> {
     let stripped_path = nu_utils::strip_ansi_unlikely(path);
-    let style = ls_colors.style_for_str(stripped_path.as_ref());
+    let mut style = ls_colors.style_for_str(stripped_path.as_ref());
+
+    let is_likely_dir = style.is_none();
+    if is_likely_dir {
+        let mut meta = std::fs::symlink_metadata(path).ok();
+
+        if meta.is_none() {
+            let mut expanded_path = expand_to_real_path(path);
+            let try_cwd = expanded_path.as_path() == Path::new(path);
+            if try_cwd {
+                let cwd_path = format!("./{}", path);
+                expanded_path = expand_path_with(cwd_path, cwd, false);
+            }
+
+            meta = std::fs::symlink_metadata(expanded_path.as_path()).ok();
+            style = ls_colors.style_for_path_with_metadata(expanded_path.as_path(), meta.as_ref());
+        } else {
+            style = ls_colors.style_for_path_with_metadata(path, meta.as_ref());
+        }
+    }
+
     style.map(lsstyle_to_nu_style)
 }
 
diff --git a/crates/nu-explore/src/pager/mod.rs b/crates/nu-explore/src/pager/mod.rs
index d230f8a54d..2141f89cec 100644
--- a/crates/nu-explore/src/pager/mod.rs
+++ b/crates/nu-explore/src/pager/mod.rs
@@ -143,6 +143,8 @@ pub struct PagerConfig<'a> {
     // If true, when quitting output the value of the cell the cursor was on
     pub peek_value: bool,
     pub tail: bool,
+    // Just a cached dir we are working in used for color manipulations
+    pub cwd: String,
 }
 
 impl<'a> PagerConfig<'a> {
@@ -153,6 +155,7 @@ impl<'a> PagerConfig<'a> {
         lscolors: &'a LsColors,
         peek_value: bool,
         tail: bool,
+        cwd: &str,
     ) -> Self {
         Self {
             nu_config,
@@ -161,6 +164,7 @@ impl<'a> PagerConfig<'a> {
             lscolors,
             peek_value,
             tail,
+            cwd: cwd.to_string(),
         }
     }
 }
@@ -371,6 +375,7 @@ fn create_view_config<'a>(pager: &'a Pager<'_>) -> ViewConfig<'a> {
         cfg.explore_config,
         cfg.style_computer,
         cfg.lscolors,
+        &pager.config.cwd,
     )
 }
 
@@ -419,12 +424,7 @@ fn run_command(
         Command::View { mut cmd, stackable } => {
             // what we do we just replace the view.
             let value = view_stack.curr_view.as_mut().and_then(|p| p.view.exit());
-            let view_cfg = ViewConfig::new(
-                pager.config.nu_config,
-                pager.config.explore_config,
-                pager.config.style_computer,
-                pager.config.lscolors,
-            );
+            let view_cfg = create_view_config(pager);
 
             let new_view = cmd.spawn(engine_state, stack, value, &view_cfg)?;
             if let Some(view) = view_stack.curr_view.take() {
diff --git a/crates/nu-explore/src/views/mod.rs b/crates/nu-explore/src/views/mod.rs
index bdbf3129db..589134016b 100644
--- a/crates/nu-explore/src/views/mod.rs
+++ b/crates/nu-explore/src/views/mod.rs
@@ -58,6 +58,7 @@ pub struct ViewConfig<'a> {
     pub explore_config: &'a ExploreConfig,
     pub style_computer: &'a StyleComputer<'a>,
     pub lscolors: &'a LsColors,
+    pub cwd: &'a str,
 }
 
 impl<'a> ViewConfig<'a> {
@@ -66,12 +67,14 @@ impl<'a> ViewConfig<'a> {
         explore_config: &'a ExploreConfig,
         style_computer: &'a StyleComputer<'a>,
         lscolors: &'a LsColors,
+        cwd: &'a str,
     ) -> Self {
         Self {
             nu_config,
             explore_config,
             style_computer,
             lscolors,
+            cwd,
         }
     }
 }
diff --git a/crates/nu-explore/src/views/record/mod.rs b/crates/nu-explore/src/views/record/mod.rs
index 4f617686f1..f77d22a622 100644
--- a/crates/nu-explore/src/views/record/mod.rs
+++ b/crates/nu-explore/src/views/record/mod.rs
@@ -127,7 +127,7 @@ impl RecordView {
         if layer.record_text.is_none() {
             let mut data =
                 convert_records_to_string(&layer.record_values, cfg.nu_config, cfg.style_computer);
-            lscolorize(&layer.column_names, &mut data, cfg.lscolors);
+            lscolorize(&layer.column_names, &mut data, cfg.cwd, cfg.lscolors);
 
             layer.record_text = Some(data);
         }

From f0c83a445977c894c4c46ca9e1c97e3372eddd69 Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Mon, 30 Sep 2024 13:20:15 +0200
Subject: [PATCH 0485/1072] Replace raw usize IDs with new types (#13832)

# Description

In this PR I replaced most of the raw usize IDs with
[newtypes](https://doc.rust-lang.org/rust-by-example/generics/new_types.html).
Some other IDs already started using new types and in this PR I did not
want to touch them. To make the implementation less repetitive, I made
use of a generic `Id<T>` with marker structs. If this lands I would try
to move make other IDs also in this pattern.

Also at some places I needed to use `cast`, I'm not sure if the type was
incorrect and therefore casting not needed or if actually different ID
types intermingle sometimes.

# User-Facing Changes

Probably few, if you got a `DeclId` via a function and placed it later
again it will still work.
---
 .../src/completions/custom_completions.rs     |  6 +-
 crates/nu-cli/src/menus/menu_completions.rs   |  6 +-
 .../src/core_commands/overlay/use_.rs         |  4 +-
 .../nu-command/src/charting/hashable_value.rs |  3 +-
 crates/nu-command/src/debug/explain.rs        |  2 +-
 crates/nu-command/src/debug/view_ir.rs        | 20 ++--
 crates/nu-command/src/env/source_env.rs       |  5 +-
 crates/nu-command/src/formats/to/text.rs      |  2 +-
 crates/nu-command/src/misc/source.rs          |  5 +-
 crates/nu-engine/src/eval.rs                  |  8 +-
 crates/nu-engine/src/scope.rs                 | 28 +++---
 crates/nu-parser/src/parse_keywords.rs        |  2 +-
 crates/nu-parser/src/parser.rs                |  9 +-
 crates/nu-parser/tests/test_parser.rs         |  6 +-
 .../src/util/with_custom_values_in.rs         |  7 +-
 crates/nu-plugin-engine/src/context.rs        |  6 +-
 .../nu-plugin-engine/src/interface/tests.rs   |  4 +-
 .../plugin_custom_value_with_source/tests.rs  | 11 ++-
 crates/nu-plugin-protocol/src/lib.rs          |  2 +-
 .../src/plugin_custom_value/tests.rs          | 16 +++-
 .../nu-plugin/src/plugin/interface/tests.rs   | 16 ++--
 crates/nu-protocol/src/ast/call.rs            |  2 +-
 crates/nu-protocol/src/ast/expr.rs            |  4 +-
 crates/nu-protocol/src/engine/call.rs         |  2 +-
 crates/nu-protocol/src/engine/engine_state.rs | 40 ++++----
 crates/nu-protocol/src/engine/overlay.rs      | 16 ++--
 crates/nu-protocol/src/engine/stack.rs        | 54 ++++++-----
 crates/nu-protocol/src/engine/state_delta.rs  |  4 +-
 .../src/engine/state_working_set.rs           | 72 ++++++++-------
 crates/nu-protocol/src/eval_base.rs           |  6 +-
 crates/nu-protocol/src/eval_const.rs          |  7 +-
 crates/nu-protocol/src/id.rs                  | 92 +++++++++++++++++--
 crates/nu-protocol/src/ir/display.rs          | 14 +--
 crates/nu-protocol/src/parser_path.rs         | 11 ++-
 crates/nu-protocol/src/value/mod.rs           |  6 +-
 crates/nuon/src/lib.rs                        |  4 +-
 36 files changed, 317 insertions(+), 185 deletions(-)

diff --git a/crates/nu-cli/src/completions/custom_completions.rs b/crates/nu-cli/src/completions/custom_completions.rs
index 8d5512a6a9..817c7aec47 100644
--- a/crates/nu-cli/src/completions/custom_completions.rs
+++ b/crates/nu-cli/src/completions/custom_completions.rs
@@ -7,7 +7,7 @@ use nu_protocol::{
     ast::{Argument, Call, Expr, Expression},
     debugger::WithoutDebug,
     engine::{Stack, StateWorkingSet},
-    CompletionSort, PipelineData, Span, Type, Value,
+    CompletionSort, DeclId, PipelineData, Span, Type, Value,
 };
 use nu_utils::IgnoreCaseExt;
 use std::collections::HashMap;
@@ -16,12 +16,12 @@ use super::completion_common::sort_suggestions;
 
 pub struct CustomCompletion {
     stack: Stack,
-    decl_id: usize,
+    decl_id: DeclId,
     line: String,
 }
 
 impl CustomCompletion {
-    pub fn new(stack: Stack, decl_id: usize, line: String) -> Self {
+    pub fn new(stack: Stack, decl_id: DeclId, line: String) -> Self {
         Self {
             stack,
             decl_id,
diff --git a/crates/nu-cli/src/menus/menu_completions.rs b/crates/nu-cli/src/menus/menu_completions.rs
index 4c4c9f59e8..38a48afba6 100644
--- a/crates/nu-cli/src/menus/menu_completions.rs
+++ b/crates/nu-cli/src/menus/menu_completions.rs
@@ -2,7 +2,7 @@ use nu_engine::eval_block;
 use nu_protocol::{
     debugger::WithoutDebug,
     engine::{EngineState, Stack},
-    IntoPipelineData, Span, Value,
+    BlockId, IntoPipelineData, Span, Value,
 };
 use reedline::{menu_functions::parse_selection_char, Completer, Suggestion};
 use std::sync::Arc;
@@ -10,7 +10,7 @@ use std::sync::Arc;
 const SELECTION_CHAR: char = '!';
 
 pub struct NuMenuCompleter {
-    block_id: usize,
+    block_id: BlockId,
     span: Span,
     stack: Stack,
     engine_state: Arc<EngineState>,
@@ -19,7 +19,7 @@ pub struct NuMenuCompleter {
 
 impl NuMenuCompleter {
     pub fn new(
-        block_id: usize,
+        block_id: BlockId,
         span: Span,
         stack: Stack,
         engine_state: Arc<EngineState>,
diff --git a/crates/nu-cmd-lang/src/core_commands/overlay/use_.rs b/crates/nu-cmd-lang/src/core_commands/overlay/use_.rs
index 04cdb7a3da..1263fcaa2a 100644
--- a/crates/nu-cmd-lang/src/core_commands/overlay/use_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/overlay/use_.rs
@@ -2,7 +2,7 @@ use nu_engine::{
     command_prelude::*, find_in_dirs_env, get_dirs_var_from_call, get_eval_block, redirect_env,
 };
 use nu_parser::trim_quotes_str;
-use nu_protocol::{ast::Expr, engine::CommandType};
+use nu_protocol::{ast::Expr, engine::CommandType, ModuleId};
 
 use std::path::Path;
 
@@ -64,7 +64,7 @@ impl Command for OverlayUse {
         let mut name_arg: Spanned<String> = call.req(engine_state, caller_stack, 0)?;
         name_arg.item = trim_quotes_str(&name_arg.item).to_string();
 
-        let maybe_origin_module_id =
+        let maybe_origin_module_id: Option<ModuleId> =
             if let Some(overlay_expr) = call.get_parser_info(caller_stack, "overlay_expr") {
                 if let Expr::Overlay(module_id) = &overlay_expr.expr {
                     *module_id
diff --git a/crates/nu-command/src/charting/hashable_value.rs b/crates/nu-command/src/charting/hashable_value.rs
index e72f0fee5f..b74b5f7761 100644
--- a/crates/nu-command/src/charting/hashable_value.rs
+++ b/crates/nu-command/src/charting/hashable_value.rs
@@ -183,6 +183,7 @@ mod test {
     use nu_protocol::{
         ast::{CellPath, PathMember},
         engine::Closure,
+        BlockId,
     };
     use std::collections::HashSet;
 
@@ -244,7 +245,7 @@ mod test {
             Value::list(vec![Value::bool(true, span)], span),
             Value::closure(
                 Closure {
-                    block_id: 0,
+                    block_id: BlockId::new(0),
                     captures: Vec::new(),
                 },
                 span,
diff --git a/crates/nu-command/src/debug/explain.rs b/crates/nu-command/src/debug/explain.rs
index dc68b283e6..7d01727ce6 100644
--- a/crates/nu-command/src/debug/explain.rs
+++ b/crates/nu-command/src/debug/explain.rs
@@ -271,7 +271,7 @@ pub fn debug_string_without_formatting(value: &Value) -> String {
                 .join(" ")
         ),
         //TODO: It would be good to drill deeper into closures.
-        Value::Closure { val, .. } => format!("<Closure {}>", val.block_id),
+        Value::Closure { val, .. } => format!("<Closure {}>", val.block_id.get()),
         Value::Nothing { .. } => String::new(),
         Value::Error { error, .. } => format!("{error:?}"),
         Value::Binary { val, .. } => format!("{val:?}"),
diff --git a/crates/nu-command/src/debug/view_ir.rs b/crates/nu-command/src/debug/view_ir.rs
index 676285844c..1a7309de45 100644
--- a/crates/nu-command/src/debug/view_ir.rs
+++ b/crates/nu-command/src/debug/view_ir.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::{BlockId, DeclId};
 
 #[derive(Clone)]
 pub struct ViewIr;
@@ -86,7 +87,8 @@ the declaration may not be in scope.
                 let decl_id = val
                     .try_into()
                     .ok()
-                    .filter(|id| *id < engine_state.num_decls())
+                    .map(DeclId::new)
+                    .filter(|id| id.get() < engine_state.num_decls())
                     .ok_or_else(|| ShellError::IncorrectValue {
                         msg: "not a valid decl id".into(),
                         val_span: target.span(),
@@ -102,11 +104,15 @@ the declaration may not be in scope.
                 })?
             }
             // Block by ID - often shows up in IR
-            Value::Int { val, .. } => val.try_into().map_err(|_| ShellError::IncorrectValue {
-                msg: "not a valid block id".into(),
-                val_span: target.span(),
-                call_span: call.head,
-            })?,
+            Value::Int { val, .. } => {
+                val.try_into()
+                    .map(BlockId::new)
+                    .map_err(|_| ShellError::IncorrectValue {
+                        msg: "not a valid block id".into(),
+                        val_span: target.span(),
+                        call_span: call.head,
+                    })?
+            }
             // Pass through errors
             Value::Error { error, .. } => return Err(*error),
             _ => {
@@ -119,7 +125,7 @@ the declaration may not be in scope.
 
         let Some(block) = engine_state.try_get_block(block_id) else {
             return Err(ShellError::GenericError {
-                error: format!("Unknown block ID: {block_id}"),
+                error: format!("Unknown block ID: {}", block_id.get()),
                 msg: "ensure the block ID is correct and try again".into(),
                 span: Some(target.span()),
                 help: None,
diff --git a/crates/nu-command/src/env/source_env.rs b/crates/nu-command/src/env/source_env.rs
index 9768c4619f..348418c247 100644
--- a/crates/nu-command/src/env/source_env.rs
+++ b/crates/nu-command/src/env/source_env.rs
@@ -2,7 +2,7 @@ use nu_engine::{
     command_prelude::*, find_in_dirs_env, get_dirs_var_from_call, get_eval_block_with_early_return,
     redirect_env,
 };
-use nu_protocol::engine::CommandType;
+use nu_protocol::{engine::CommandType, BlockId};
 use std::path::PathBuf;
 
 /// Source a file for environment variables.
@@ -50,6 +50,7 @@ impl Command for SourceEnv {
         // Note: this hidden positional is the block_id that corresponded to the 0th position
         // it is put here by the parser
         let block_id: i64 = call.req_parser_info(engine_state, caller_stack, "block_id")?;
+        let block_id = BlockId::new(block_id as usize);
 
         // Set the currently evaluated directory (file-relative PWD)
         let file_path = if let Some(path) = find_in_dirs_env(
@@ -78,7 +79,7 @@ impl Command for SourceEnv {
         );
 
         // Evaluate the block
-        let block = engine_state.get_block(block_id as usize).clone();
+        let block = engine_state.get_block(block_id).clone();
         let mut callee_stack = caller_stack
             .gather_captures(engine_state, &block.captures)
             .reset_pipes();
diff --git a/crates/nu-command/src/formats/to/text.rs b/crates/nu-command/src/formats/to/text.rs
index 21b543d0eb..b1c1fdb1ba 100644
--- a/crates/nu-command/src/formats/to/text.rs
+++ b/crates/nu-command/src/formats/to/text.rs
@@ -118,7 +118,7 @@ fn local_into_string(value: Value, separator: &str, config: &Config) -> String {
             .map(|(x, y)| format!("{}: {}", x, local_into_string(y, ", ", config)))
             .collect::<Vec<_>>()
             .join(separator),
-        Value::Closure { val, .. } => format!("<Closure {}>", val.block_id),
+        Value::Closure { val, .. } => format!("<Closure {}>", val.block_id.get()),
         Value::Nothing { .. } => String::new(),
         Value::Error { error, .. } => format!("{error:?}"),
         Value::Binary { val, .. } => format!("{val:?}"),
diff --git a/crates/nu-command/src/misc/source.rs b/crates/nu-command/src/misc/source.rs
index df002c998a..01f971a103 100644
--- a/crates/nu-command/src/misc/source.rs
+++ b/crates/nu-command/src/misc/source.rs
@@ -1,5 +1,5 @@
 use nu_engine::{command_prelude::*, get_eval_block_with_early_return};
-use nu_protocol::engine::CommandType;
+use nu_protocol::{engine::CommandType, BlockId};
 
 /// Source a file for environment variables.
 #[derive(Clone)]
@@ -44,7 +44,8 @@ impl Command for Source {
         // Note: this hidden positional is the block_id that corresponded to the 0th position
         // it is put here by the parser
         let block_id: i64 = call.req_parser_info(engine_state, stack, "block_id")?;
-        let block = engine_state.get_block(block_id as usize).clone();
+        let block_id = BlockId::new(block_id as usize);
+        let block = engine_state.get_block(block_id).clone();
 
         let eval_block_with_early_return = get_eval_block_with_early_return(engine_state);
 
diff --git a/crates/nu-engine/src/eval.rs b/crates/nu-engine/src/eval.rs
index f0effb9a37..c365d360c6 100644
--- a/crates/nu-engine/src/eval.rs
+++ b/crates/nu-engine/src/eval.rs
@@ -10,8 +10,8 @@ use nu_protocol::{
     debugger::DebugContext,
     engine::{Closure, EngineState, Redirection, Stack, StateWorkingSet},
     eval_base::Eval,
-    ByteStreamSource, Config, DataSource, FromValue, IntoPipelineData, OutDest, PipelineData,
-    PipelineMetadata, ShellError, Span, Spanned, Type, Value, VarId, ENV_VARIABLE_ID,
+    BlockId, ByteStreamSource, Config, DataSource, FromValue, IntoPipelineData, OutDest,
+    PipelineData, PipelineMetadata, ShellError, Span, Spanned, Type, Value, VarId, ENV_VARIABLE_ID,
 };
 use nu_utils::IgnoreCaseExt;
 use std::{fs::OpenOptions, path::PathBuf, sync::Arc};
@@ -752,7 +752,7 @@ impl Eval for EvalRuntime {
     fn eval_subexpression<D: DebugContext>(
         engine_state: &EngineState,
         stack: &mut Stack,
-        block_id: usize,
+        block_id: BlockId,
         span: Span,
     ) -> Result<Value, ShellError> {
         let block = engine_state.get_block(block_id);
@@ -899,7 +899,7 @@ impl Eval for EvalRuntime {
     fn eval_row_condition_or_closure(
         engine_state: &EngineState,
         stack: &mut Stack,
-        block_id: usize,
+        block_id: BlockId,
         span: Span,
     ) -> Result<Value, ShellError> {
         let captures = engine_state
diff --git a/crates/nu-engine/src/scope.rs b/crates/nu-engine/src/scope.rs
index d9650d2c28..bbc44f5186 100644
--- a/crates/nu-engine/src/scope.rs
+++ b/crates/nu-engine/src/scope.rs
@@ -1,16 +1,16 @@
 use nu_protocol::{
     ast::Expr,
     engine::{Command, EngineState, Stack, Visibility},
-    record, ModuleId, Signature, Span, SyntaxShape, Type, Value,
+    record, DeclId, ModuleId, Signature, Span, SyntaxShape, Type, Value, VarId,
 };
 use std::{cmp::Ordering, collections::HashMap};
 
 pub struct ScopeData<'e, 's> {
     engine_state: &'e EngineState,
     stack: &'s Stack,
-    vars_map: HashMap<&'e Vec<u8>, &'e usize>,
-    decls_map: HashMap<&'e Vec<u8>, &'e usize>,
-    modules_map: HashMap<&'e Vec<u8>, &'e usize>,
+    vars_map: HashMap<&'e Vec<u8>, &'e VarId>,
+    decls_map: HashMap<&'e Vec<u8>, &'e DeclId>,
+    modules_map: HashMap<&'e Vec<u8>, &'e ModuleId>,
     visibility: Visibility,
 }
 
@@ -62,7 +62,7 @@ impl<'e, 's> ScopeData<'e, 's> {
                 Value::nothing(span)
             };
 
-            let var_id_val = Value::int(**var_id as i64, span);
+            let var_id_val = Value::int(var_id.get() as i64, span);
 
             vars.push(Value::record(
                 record! {
@@ -116,7 +116,7 @@ impl<'e, 's> ScopeData<'e, 's> {
                     "creates_scope" => Value::bool(signature.creates_scope, span),
                     "extra_description" => Value::string(decl.extra_description(), span),
                     "search_terms" => Value::string(decl.search_terms().join(", "), span),
-                    "decl_id" => Value::int(**decl_id as i64, span),
+                    "decl_id" => Value::int(decl_id.get() as i64, span),
                 };
 
                 commands.push(Value::record(record, span))
@@ -333,7 +333,7 @@ impl<'e, 's> ScopeData<'e, 's> {
                 let record = record! {
                     "name" => Value::string(String::from_utf8_lossy(command_name), span),
                     "description" => Value::string(decl.description(), span),
-                    "decl_id" => Value::int(**decl_id as i64, span),
+                    "decl_id" => Value::int(decl_id.get() as i64, span),
                 };
 
                 externals.push(Value::record(record, span))
@@ -353,7 +353,7 @@ impl<'e, 's> ScopeData<'e, 's> {
                 if let Some(alias) = decl.as_alias() {
                     let aliased_decl_id = if let Expr::Call(wrapped_call) = &alias.wrapped_call.expr
                     {
-                        Value::int(wrapped_call.decl_id as i64, span)
+                        Value::int(wrapped_call.decl_id.get() as i64, span)
                     } else {
                         Value::nothing(span)
                     };
@@ -367,7 +367,7 @@ impl<'e, 's> ScopeData<'e, 's> {
                             "name" => Value::string(String::from_utf8_lossy(&decl_name), span),
                             "expansion" => Value::string(expansion, span),
                             "description" => Value::string(alias.description(), span),
-                            "decl_id" => Value::int(decl_id as i64, span),
+                            "decl_id" => Value::int(decl_id.get() as i64, span),
                             "aliased_decl_id" => aliased_decl_id,
                         },
                         span,
@@ -395,7 +395,7 @@ impl<'e, 's> ScopeData<'e, 's> {
                     Some(Value::record(
                         record! {
                             "name" => Value::string(String::from_utf8_lossy(name_bytes), span),
-                            "decl_id" => Value::int(*decl_id as i64, span),
+                            "decl_id" => Value::int(decl_id.get() as i64, span),
                         },
                         span,
                     ))
@@ -414,7 +414,7 @@ impl<'e, 's> ScopeData<'e, 's> {
                     Some(Value::record(
                         record! {
                             "name" => Value::string(String::from_utf8_lossy(name_bytes), span),
-                            "decl_id" => Value::int(*decl_id as i64, span),
+                            "decl_id" => Value::int(decl_id.get() as i64, span),
                         },
                         span,
                     ))
@@ -433,7 +433,7 @@ impl<'e, 's> ScopeData<'e, 's> {
                     Some(Value::record(
                         record! {
                             "name" => Value::string(String::from_utf8_lossy(name_bytes), span),
-                            "decl_id" => Value::int(*decl_id as i64, span),
+                            "decl_id" => Value::int(decl_id.get() as i64, span),
                         },
                         span,
                     ))
@@ -457,7 +457,7 @@ impl<'e, 's> ScopeData<'e, 's> {
                     record! {
                         "name" => Value::string(String::from_utf8_lossy(name_bytes), span),
                         "type" => Value::string(self.engine_state.get_var(*var_id).ty.to_string(), span),
-                        "var_id" => Value::int(*var_id as i64, span),
+                        "var_id" => Value::int(var_id.get() as i64, span),
                     },
                     span,
                 )
@@ -486,7 +486,7 @@ impl<'e, 's> ScopeData<'e, 's> {
                 "has_env_block" => Value::bool(module.env_block.is_some(), span),
                 "description" => Value::string(module_desc, span),
                 "extra_description" => Value::string(module_extra_desc, span),
-                "module_id" => Value::int(*module_id as i64, span),
+                "module_id" => Value::int(module_id.get() as i64, span),
             },
             span,
         )
diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index b75a57a286..8ca5249bd2 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -3528,7 +3528,7 @@ pub fn parse_source(working_set: &mut StateWorkingSet, lite_command: &LiteComman
                             "block_id".to_string(),
                             Expression::new(
                                 working_set,
-                                Expr::Int(block_id as i64),
+                                Expr::Int(block_id.get() as i64),
                                 spans[1],
                                 Type::Any,
                             ),
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 909fd75d61..4ac161bb84 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -11,7 +11,7 @@ use itertools::Itertools;
 use log::trace;
 use nu_engine::DIR_VAR_PARSER_INFO;
 use nu_protocol::{
-    ast::*, engine::StateWorkingSet, eval_const::eval_constant, BlockId, DidYouMean, Flag,
+    ast::*, engine::StateWorkingSet, eval_const::eval_constant, BlockId, DeclId, DidYouMean, Flag,
     ParseError, PositionalArg, Signature, Span, Spanned, SyntaxShape, Type, VarId, ENV_VARIABLE_ID,
     IN_VARIABLE_ID,
 };
@@ -921,9 +921,9 @@ pub fn parse_internal_call(
     working_set: &mut StateWorkingSet,
     command_span: Span,
     spans: &[Span],
-    decl_id: usize,
+    decl_id: DeclId,
 ) -> ParsedInternalCall {
-    trace!("parsing: internal call (decl id: {})", decl_id);
+    trace!("parsing: internal call (decl id: {})", decl_id.get());
 
     let mut call = Call::new(command_span);
     call.decl_id = decl_id;
@@ -6583,6 +6583,7 @@ pub fn parse(
     let mut errors = vec![];
     for (block_idx, block) in working_set.delta.blocks.iter().enumerate() {
         let block_id = block_idx + working_set.permanent_state.num_blocks();
+        let block_id = BlockId::new(block_id);
 
         if !seen_blocks.contains_key(&block_id) {
             let mut captures = vec![];
@@ -6625,7 +6626,7 @@ pub fn parse(
         // already saved in permanent state
         if !captures.is_empty()
             && block_captures_empty
-            && block_id >= working_set.permanent_state.num_blocks()
+            && block_id.get() >= working_set.permanent_state.num_blocks()
         {
             let block = working_set.get_block_mut(block_id);
             block.captures = captures.into_iter().map(|(var_id, _)| var_id).collect();
diff --git a/crates/nu-parser/tests/test_parser.rs b/crates/nu-parser/tests/test_parser.rs
index 86511bdca1..b26ae20db9 100644
--- a/crates/nu-parser/tests/test_parser.rs
+++ b/crates/nu-parser/tests/test_parser.rs
@@ -2,7 +2,7 @@ use nu_parser::*;
 use nu_protocol::{
     ast::{Argument, Expr, Expression, ExternalArgument, PathMember, Range},
     engine::{Call, Command, EngineState, Stack, StateWorkingSet},
-    Category, ParseError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
+    Category, DeclId, ParseError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
 };
 use rstest::rstest;
 
@@ -607,7 +607,7 @@ pub fn parse_call() {
     assert!(element.redirection.is_none());
 
     if let Expr::Call(call) = &element.expr.expr {
-        assert_eq!(call.decl_id, 0);
+        assert_eq!(call.decl_id, DeclId::new(0));
     }
 }
 
@@ -661,7 +661,7 @@ pub fn parse_call_short_flag_batch_arg_allowed() {
     assert!(element.redirection.is_none());
 
     if let Expr::Call(call) = &element.expr.expr {
-        assert_eq!(call.decl_id, 0);
+        assert_eq!(call.decl_id, DeclId::new(0));
         assert_eq!(call.arguments.len(), 2);
         matches!(call.arguments[0], Argument::Named((_, None, None)));
         matches!(call.arguments[1], Argument::Named((_, None, Some(_))));
diff --git a/crates/nu-plugin-core/src/util/with_custom_values_in.rs b/crates/nu-plugin-core/src/util/with_custom_values_in.rs
index 8fcd843ac4..d5f7102568 100644
--- a/crates/nu-plugin-core/src/util/with_custom_values_in.rs
+++ b/crates/nu-plugin-core/src/util/with_custom_values_in.rs
@@ -1,5 +1,8 @@
 use nu_protocol::{CustomValue, IntoSpanned, ShellError, Spanned, Value};
 
+#[allow(unused_imports)] // both are definitely used
+use nu_protocol::{BlockId, VarId};
+
 /// Do something with all [`CustomValue`]s recursively within a `Value`. This is not limited to
 /// plugin custom values.
 pub fn with_custom_values_in<E>(
@@ -36,8 +39,8 @@ fn find_custom_values() {
         ]),
         "closure" => Value::test_closure(
             Closure {
-                block_id: 0,
-                captures: vec![(0, cv.clone()), (1, Value::test_string("foo"))]
+                block_id: BlockId::new(0),
+                captures: vec![(VarId::new(0), cv.clone()), (VarId::new(1), Value::test_string("foo"))]
             }
         ),
     });
diff --git a/crates/nu-plugin-engine/src/context.rs b/crates/nu-plugin-engine/src/context.rs
index 6b6b1a15f3..4a6af0b879 100644
--- a/crates/nu-plugin-engine/src/context.rs
+++ b/crates/nu-plugin-engine/src/context.rs
@@ -177,7 +177,7 @@ impl<'a> PluginExecutionContext for PluginExecutionCommandContext<'a> {
                 error: "Plugin misbehaving".into(),
                 msg: format!(
                     "Tried to evaluate unknown block id: {}",
-                    closure.item.block_id
+                    closure.item.block_id.get()
                 ),
                 span: Some(closure.span),
                 help: None,
@@ -226,10 +226,10 @@ impl<'a> PluginExecutionContext for PluginExecutionCommandContext<'a> {
         redirect_stdout: bool,
         redirect_stderr: bool,
     ) -> Result<PipelineData, ShellError> {
-        if decl_id >= self.engine_state.num_decls() {
+        if decl_id.get() >= self.engine_state.num_decls() {
             return Err(ShellError::GenericError {
                 error: "Plugin misbehaving".into(),
-                msg: format!("Tried to call unknown decl id: {}", decl_id),
+                msg: format!("Tried to call unknown decl id: {}", decl_id.get()),
                 span: Some(call.head),
                 help: None,
                 inner: vec![],
diff --git a/crates/nu-plugin-engine/src/interface/tests.rs b/crates/nu-plugin-engine/src/interface/tests.rs
index 31828973d3..5058a45695 100644
--- a/crates/nu-plugin-engine/src/interface/tests.rs
+++ b/crates/nu-plugin-engine/src/interface/tests.rs
@@ -17,7 +17,7 @@ use nu_plugin_protocol::{
 use nu_protocol::{
     ast::{Math, Operator},
     engine::Closure,
-    ByteStreamType, CustomValue, DataSource, IntoInterruptiblePipelineData, IntoSpanned,
+    BlockId, ByteStreamType, CustomValue, DataSource, IntoInterruptiblePipelineData, IntoSpanned,
     PipelineData, PipelineMetadata, PluginMetadata, PluginSignature, ShellError, Signals, Span,
     Spanned, Value,
 };
@@ -431,7 +431,7 @@ fn manager_consume_engine_call_forwards_to_subscriber_with_pipeline_data() -> Re
         call: EngineCall::EvalClosure {
             closure: Spanned {
                 item: Closure {
-                    block_id: 0,
+                    block_id: BlockId::new(0),
                     captures: vec![],
                 },
                 span: Span::test_data(),
diff --git a/crates/nu-plugin-engine/src/plugin_custom_value_with_source/tests.rs b/crates/nu-plugin-engine/src/plugin_custom_value_with_source/tests.rs
index fd8a81a569..0c6e33c19e 100644
--- a/crates/nu-plugin-engine/src/plugin_custom_value_with_source/tests.rs
+++ b/crates/nu-plugin-engine/src/plugin_custom_value_with_source/tests.rs
@@ -1,7 +1,9 @@
 use std::sync::Arc;
 
 use nu_plugin_protocol::test_util::{test_plugin_custom_value, TestCustomValue};
-use nu_protocol::{engine::Closure, record, CustomValue, IntoSpanned, ShellError, Span, Value};
+use nu_protocol::{
+    engine::Closure, record, BlockId, CustomValue, IntoSpanned, ShellError, Span, Value, VarId,
+};
 
 use crate::{
     test_util::test_plugin_custom_value_with_source, PluginCustomValueWithSource, PluginSource,
@@ -132,8 +134,11 @@ fn check_closure_custom_values(
 fn add_source_in_nested_closure() -> Result<(), ShellError> {
     let orig_custom_val = Value::test_custom_value(Box::new(test_plugin_custom_value()));
     let mut val = Value::test_closure(Closure {
-        block_id: 0,
-        captures: vec![(0, orig_custom_val.clone()), (1, orig_custom_val.clone())],
+        block_id: BlockId::new(0),
+        captures: vec![
+            (VarId::new(0), orig_custom_val.clone()),
+            (VarId::new(1), orig_custom_val.clone()),
+        ],
     });
     let source = Arc::new(PluginSource::new_fake("foo"));
     PluginCustomValueWithSource::add_source_in(&mut val, &source)?;
diff --git a/crates/nu-plugin-protocol/src/lib.rs b/crates/nu-plugin-protocol/src/lib.rs
index 0473b2c499..ef574456a5 100644
--- a/crates/nu-plugin-protocol/src/lib.rs
+++ b/crates/nu-plugin-protocol/src/lib.rs
@@ -627,7 +627,7 @@ pub enum EngineCallResponse<D> {
     PipelineData(D),
     Config(SharedCow<Config>),
     ValueMap(HashMap<String, Value>),
-    Identifier(usize),
+    Identifier(DeclId),
 }
 
 impl<D> EngineCallResponse<D> {
diff --git a/crates/nu-plugin-protocol/src/plugin_custom_value/tests.rs b/crates/nu-plugin-protocol/src/plugin_custom_value/tests.rs
index 5969451d85..a93e758723 100644
--- a/crates/nu-plugin-protocol/src/plugin_custom_value/tests.rs
+++ b/crates/nu-plugin-protocol/src/plugin_custom_value/tests.rs
@@ -1,7 +1,7 @@
 use crate::test_util::{expected_test_custom_value, test_plugin_custom_value, TestCustomValue};
 
 use super::PluginCustomValue;
-use nu_protocol::{engine::Closure, record, CustomValue, ShellError, Span, Value};
+use nu_protocol::{engine::Closure, record, BlockId, CustomValue, ShellError, Span, Value, VarId};
 
 fn check_record_custom_values(
     val: &Value,
@@ -156,8 +156,11 @@ fn serialize_in_list() -> Result<(), ShellError> {
 fn serialize_in_closure() -> Result<(), ShellError> {
     let orig_custom_val = Value::test_custom_value(Box::new(TestCustomValue(24)));
     let mut val = Value::test_closure(Closure {
-        block_id: 0,
-        captures: vec![(0, orig_custom_val.clone()), (1, orig_custom_val.clone())],
+        block_id: BlockId::new(0),
+        captures: vec![
+            (VarId::new(0), orig_custom_val.clone()),
+            (VarId::new(1), orig_custom_val.clone()),
+        ],
     });
     PluginCustomValue::serialize_custom_values_in(&mut val)?;
 
@@ -239,8 +242,11 @@ fn deserialize_in_list() -> Result<(), ShellError> {
 fn deserialize_in_closure() -> Result<(), ShellError> {
     let orig_custom_val = Value::test_custom_value(Box::new(test_plugin_custom_value()));
     let mut val = Value::test_closure(Closure {
-        block_id: 0,
-        captures: vec![(0, orig_custom_val.clone()), (1, orig_custom_val.clone())],
+        block_id: BlockId::new(0),
+        captures: vec![
+            (VarId::new(0), orig_custom_val.clone()),
+            (VarId::new(1), orig_custom_val.clone()),
+        ],
     });
     PluginCustomValue::deserialize_custom_values_in(&mut val)?;
 
diff --git a/crates/nu-plugin/src/plugin/interface/tests.rs b/crates/nu-plugin/src/plugin/interface/tests.rs
index f8002b2c6d..5ff9f6f6cd 100644
--- a/crates/nu-plugin/src/plugin/interface/tests.rs
+++ b/crates/nu-plugin/src/plugin/interface/tests.rs
@@ -9,8 +9,8 @@ use nu_plugin_protocol::{
     PluginCustomValue, PluginInput, PluginOutput, Protocol, ProtocolInfo, StreamData,
 };
 use nu_protocol::{
-    engine::Closure, ByteStreamType, Config, CustomValue, IntoInterruptiblePipelineData,
-    LabeledError, PipelineData, PluginSignature, ShellError, Signals, Span, Spanned, Value,
+    engine::Closure, BlockId, ByteStreamType, Config, CustomValue, IntoInterruptiblePipelineData,
+    LabeledError, PipelineData, PluginSignature, ShellError, Signals, Span, Spanned, Value, VarId,
 };
 use std::{
     collections::HashMap,
@@ -1040,8 +1040,8 @@ fn interface_eval_closure_with_stream() -> Result<(), ShellError> {
         .eval_closure_with_stream(
             &Spanned {
                 item: Closure {
-                    block_id: 42,
-                    captures: vec![(0, Value::test_int(5))],
+                    block_id: BlockId::new(42),
+                    captures: vec![(VarId::new(0), Value::test_int(5))],
                 },
                 span: Span::test_data(),
             },
@@ -1064,10 +1064,14 @@ fn interface_eval_closure_with_stream() -> Result<(), ShellError> {
                 redirect_stdout,
                 redirect_stderr,
             } => {
-                assert_eq!(42, closure.item.block_id, "closure.item.block_id");
+                assert_eq!(
+                    BlockId::new(42),
+                    closure.item.block_id,
+                    "closure.item.block_id"
+                );
                 assert_eq!(1, closure.item.captures.len(), "closure.item.captures.len");
                 assert_eq!(
-                    (0, Value::test_int(5)),
+                    (VarId::new(0), Value::test_int(5)),
                     closure.item.captures[0],
                     "closure.item.captures[0]"
                 );
diff --git a/crates/nu-protocol/src/ast/call.rs b/crates/nu-protocol/src/ast/call.rs
index 0f7b25e21f..0c42583c5c 100644
--- a/crates/nu-protocol/src/ast/call.rs
+++ b/crates/nu-protocol/src/ast/call.rs
@@ -96,7 +96,7 @@ pub struct Call {
 impl Call {
     pub fn new(head: Span) -> Call {
         Self {
-            decl_id: 0,
+            decl_id: DeclId::new(0),
             head,
             arguments: vec![],
             parser_info: HashMap::new(),
diff --git a/crates/nu-protocol/src/ast/expr.rs b/crates/nu-protocol/src/ast/expr.rs
index d6386f92dc..62a2f3ad37 100644
--- a/crates/nu-protocol/src/ast/expr.rs
+++ b/crates/nu-protocol/src/ast/expr.rs
@@ -6,7 +6,7 @@ use super::{
     Range, Table, ValueWithUnit,
 };
 use crate::{
-    ast::ImportPattern, engine::StateWorkingSet, BlockId, OutDest, Signature, Span, VarId,
+    ast::ImportPattern, engine::StateWorkingSet, BlockId, ModuleId, OutDest, Signature, Span, VarId,
 };
 
 /// An [`Expression`] AST node
@@ -47,7 +47,7 @@ pub enum Expr {
     CellPath(CellPath),
     FullCellPath(Box<FullCellPath>),
     ImportPattern(Box<ImportPattern>),
-    Overlay(Option<BlockId>), // block ID of the overlay's origin module
+    Overlay(Option<ModuleId>),
     Signature(Box<Signature>),
     StringInterpolation(Vec<Expression>),
     /// The boolean is `true` if the string is quoted.
diff --git a/crates/nu-protocol/src/engine/call.rs b/crates/nu-protocol/src/engine/call.rs
index 741e2bd87a..eebf4860cd 100644
--- a/crates/nu-protocol/src/engine/call.rs
+++ b/crates/nu-protocol/src/engine/call.rs
@@ -31,7 +31,7 @@ impl Call<'_> {
         // anyway.
         Call {
             head: span,
-            decl_id: 0,
+            decl_id: DeclId::new(0),
             inner: CallImpl::AstBox(Box::new(ast::Call::new(span))),
         }
     }
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index 6d7aff120e..28463f752b 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -93,7 +93,7 @@ pub struct EngineState {
     pub config: Arc<Config>,
     pub pipeline_externals_state: Arc<(AtomicU32, AtomicU32)>,
     pub repl_state: Arc<Mutex<ReplState>>,
-    pub table_decl_id: Option<usize>,
+    pub table_decl_id: Option<DeclId>,
     #[cfg(feature = "plugin")]
     pub plugin_path: Option<PathBuf>,
     #[cfg(feature = "plugin")]
@@ -114,9 +114,9 @@ pub struct EngineState {
 // The max number of compiled regexes to keep around in a LRU cache, arbitrarily chosen
 const REGEX_CACHE_SIZE: usize = 100; // must be nonzero, otherwise will panic
 
-pub const NU_VARIABLE_ID: usize = 0;
-pub const IN_VARIABLE_ID: usize = 1;
-pub const ENV_VARIABLE_ID: usize = 2;
+pub const NU_VARIABLE_ID: VarId = VarId::new(0);
+pub const IN_VARIABLE_ID: VarId = VarId::new(1);
+pub const ENV_VARIABLE_ID: VarId = VarId::new(2);
 // NOTE: If you add more to this list, make sure to update the > checks based on the last in the list
 
 // The first span is unknown span
@@ -144,7 +144,7 @@ impl EngineState {
             // make sure we have some default overlay:
             scope: ScopeFrame::with_empty_overlay(
                 DEFAULT_OVERLAY_NAME.as_bytes().to_vec(),
-                0,
+                ModuleId::new(0),
                 false,
             ),
             signal_handlers: None,
@@ -380,7 +380,7 @@ impl EngineState {
         let other_names = other.active_overlays.iter().map(|other_id| {
             &other
                 .overlays
-                .get(*other_id)
+                .get(other_id.get())
                 .expect("internal error: missing overlay")
                 .0
         });
@@ -410,7 +410,7 @@ impl EngineState {
         &self
             .scope
             .overlays
-            .get(overlay_id)
+            .get(overlay_id.get())
             .expect("internal error: missing overlay")
             .0
     }
@@ -419,7 +419,7 @@ impl EngineState {
         &self
             .scope
             .overlays
-            .get(overlay_id)
+            .get(overlay_id.get())
             .expect("internal error: missing overlay")
             .1
     }
@@ -763,7 +763,7 @@ impl EngineState {
 
     pub fn get_var(&self, var_id: VarId) -> &Variable {
         self.vars
-            .get(var_id)
+            .get(var_id.get())
             .expect("internal error: missing variable")
     }
 
@@ -773,12 +773,12 @@ impl EngineState {
     }
 
     pub fn generate_nu_constant(&mut self) {
-        self.vars[NU_VARIABLE_ID].const_val = Some(create_nu_constant(self, Span::unknown()));
+        self.vars[NU_VARIABLE_ID.get()].const_val = Some(create_nu_constant(self, Span::unknown()));
     }
 
     pub fn get_decl(&self, decl_id: DeclId) -> &dyn Command {
         self.decls
-            .get(decl_id)
+            .get(decl_id.get())
             .expect("internal error: missing declaration")
             .as_ref()
     }
@@ -810,7 +810,7 @@ impl EngineState {
 
     pub fn get_signature(&self, decl: &dyn Command) -> Signature {
         if let Some(block_id) = decl.block_id() {
-            *self.blocks[block_id].signature.clone()
+            *self.blocks[block_id.get()].signature.clone()
         } else {
             decl.signature()
         }
@@ -830,7 +830,7 @@ impl EngineState {
 
     pub fn get_block(&self, block_id: BlockId) -> &Arc<Block> {
         self.blocks
-            .get(block_id)
+            .get(block_id.get())
             .expect("internal error: missing block")
     }
 
@@ -840,18 +840,18 @@ impl EngineState {
     /// are normally a compiler error. This only exists to stop plugins from crashing the engine if
     /// they send us something invalid.
     pub fn try_get_block(&self, block_id: BlockId) -> Option<&Arc<Block>> {
-        self.blocks.get(block_id)
+        self.blocks.get(block_id.get())
     }
 
     pub fn get_module(&self, module_id: ModuleId) -> &Module {
         self.modules
-            .get(module_id)
+            .get(module_id.get())
             .expect("internal error: missing module")
     }
 
     pub fn get_virtual_path(&self, virtual_path_id: VirtualPathId) -> &(String, VirtualPath) {
         self.virtual_paths
-            .get(virtual_path_id)
+            .get(virtual_path_id.get())
             .expect("internal error: missing virtual path")
     }
 
@@ -879,7 +879,7 @@ impl EngineState {
             covered_span,
         });
 
-        self.num_files() - 1
+        FileId::new(self.num_files() - 1)
     }
 
     pub fn set_config_path(&mut self, key: &str, val: PathBuf) {
@@ -1065,7 +1065,7 @@ mod engine_state_tests {
         let mut engine_state = StateWorkingSet::new(&engine_state);
         let id = engine_state.add_file("test.nu".into(), &[]);
 
-        assert_eq!(id, 0);
+        assert_eq!(id, FileId::new(0));
     }
 
     #[test]
@@ -1076,8 +1076,8 @@ mod engine_state_tests {
         let mut working_set = StateWorkingSet::new(&engine_state);
         let working_set_id = working_set.add_file("child.nu".into(), &[]);
 
-        assert_eq!(parent_id, 0);
-        assert_eq!(working_set_id, 1);
+        assert_eq!(parent_id, FileId::new(0));
+        assert_eq!(working_set_id, FileId::new(1));
     }
 
     #[test]
diff --git a/crates/nu-protocol/src/engine/overlay.rs b/crates/nu-protocol/src/engine/overlay.rs
index e396e30c21..9e52cffcea 100644
--- a/crates/nu-protocol/src/engine/overlay.rs
+++ b/crates/nu-protocol/src/engine/overlay.rs
@@ -76,7 +76,7 @@ impl ScopeFrame {
     pub fn with_empty_overlay(name: Vec<u8>, origin: ModuleId, prefixed: bool) -> Self {
         Self {
             overlays: vec![(name, OverlayFrame::from_origin(origin, prefixed))],
-            active_overlays: vec![0],
+            active_overlays: vec![OverlayId::new(0)],
             removed_overlays: vec![],
             predecls: HashMap::new(),
         }
@@ -86,7 +86,7 @@ impl ScopeFrame {
         for overlay_id in self.active_overlays.iter().rev() {
             if let Some(var_id) = self
                 .overlays
-                .get(*overlay_id)
+                .get(overlay_id.get())
                 .expect("internal error: missing overlay")
                 .1
                 .vars
@@ -139,7 +139,7 @@ impl ScopeFrame {
     pub fn get_overlay_name(&self, overlay_id: OverlayId) -> &[u8] {
         &self
             .overlays
-            .get(overlay_id)
+            .get(overlay_id.get())
             .expect("internal error: missing overlay")
             .0
     }
@@ -147,7 +147,7 @@ impl ScopeFrame {
     pub fn get_overlay(&self, overlay_id: OverlayId) -> &OverlayFrame {
         &self
             .overlays
-            .get(overlay_id)
+            .get(overlay_id.get())
             .expect("internal error: missing overlay")
             .1
     }
@@ -155,19 +155,23 @@ impl ScopeFrame {
     pub fn get_overlay_mut(&mut self, overlay_id: OverlayId) -> &mut OverlayFrame {
         &mut self
             .overlays
-            .get_mut(overlay_id)
+            .get_mut(overlay_id.get())
             .expect("internal error: missing overlay")
             .1
     }
 
     pub fn find_overlay(&self, name: &[u8]) -> Option<OverlayId> {
-        self.overlays.iter().position(|(n, _)| n == name)
+        self.overlays
+            .iter()
+            .position(|(n, _)| n == name)
+            .map(OverlayId::new)
     }
 
     pub fn find_active_overlay(&self, name: &[u8]) -> Option<OverlayId> {
         self.overlays
             .iter()
             .position(|(n, _)| n == name)
+            .map(OverlayId::new)
             .filter(|id| self.active_overlays.contains(id))
     }
 }
diff --git a/crates/nu-protocol/src/engine/stack.rs b/crates/nu-protocol/src/engine/stack.rs
index 843315871a..31c1175e7c 100644
--- a/crates/nu-protocol/src/engine/stack.rs
+++ b/crates/nu-protocol/src/engine/stack.rs
@@ -734,7 +734,7 @@ impl Stack {
 mod test {
     use std::sync::Arc;
 
-    use crate::{engine::EngineState, Span, Value};
+    use crate::{engine::EngineState, Span, Value, VarId};
 
     use super::Stack;
 
@@ -749,22 +749,25 @@ mod test {
     #[test]
     fn test_children_see_inner_values() {
         let mut original = Stack::new();
-        original.add_var(0, string_value("hello"));
+        original.add_var(VarId::new(0), string_value("hello"));
 
         let cloned = Stack::with_parent(Arc::new(original));
-        assert_eq!(cloned.get_var(0, ZERO_SPAN), Ok(string_value("hello")));
+        assert_eq!(
+            cloned.get_var(VarId::new(0), ZERO_SPAN),
+            Ok(string_value("hello"))
+        );
     }
 
     #[test]
     fn test_children_dont_see_deleted_values() {
         let mut original = Stack::new();
-        original.add_var(0, string_value("hello"));
+        original.add_var(VarId::new(0), string_value("hello"));
 
         let mut cloned = Stack::with_parent(Arc::new(original));
-        cloned.remove_var(0);
+        cloned.remove_var(VarId::new(0));
 
         assert_eq!(
-            cloned.get_var(0, ZERO_SPAN),
+            cloned.get_var(VarId::new(0), ZERO_SPAN),
             Err(crate::ShellError::VariableNotFoundAtRuntime { span: ZERO_SPAN })
         );
     }
@@ -772,60 +775,69 @@ mod test {
     #[test]
     fn test_children_changes_override_parent() {
         let mut original = Stack::new();
-        original.add_var(0, string_value("hello"));
+        original.add_var(VarId::new(0), string_value("hello"));
 
         let mut cloned = Stack::with_parent(Arc::new(original));
-        cloned.add_var(0, string_value("there"));
-        assert_eq!(cloned.get_var(0, ZERO_SPAN), Ok(string_value("there")));
+        cloned.add_var(VarId::new(0), string_value("there"));
+        assert_eq!(
+            cloned.get_var(VarId::new(0), ZERO_SPAN),
+            Ok(string_value("there"))
+        );
 
-        cloned.remove_var(0);
+        cloned.remove_var(VarId::new(0));
         // the underlying value shouldn't magically re-appear
         assert_eq!(
-            cloned.get_var(0, ZERO_SPAN),
+            cloned.get_var(VarId::new(0), ZERO_SPAN),
             Err(crate::ShellError::VariableNotFoundAtRuntime { span: ZERO_SPAN })
         );
     }
     #[test]
     fn test_children_changes_persist_in_offspring() {
         let mut original = Stack::new();
-        original.add_var(0, string_value("hello"));
+        original.add_var(VarId::new(0), string_value("hello"));
 
         let mut cloned = Stack::with_parent(Arc::new(original));
-        cloned.add_var(1, string_value("there"));
+        cloned.add_var(VarId::new(1), string_value("there"));
 
-        cloned.remove_var(0);
+        cloned.remove_var(VarId::new(0));
         let cloned = Stack::with_parent(Arc::new(cloned));
 
         assert_eq!(
-            cloned.get_var(0, ZERO_SPAN),
+            cloned.get_var(VarId::new(0), ZERO_SPAN),
             Err(crate::ShellError::VariableNotFoundAtRuntime { span: ZERO_SPAN })
         );
 
-        assert_eq!(cloned.get_var(1, ZERO_SPAN), Ok(string_value("there")));
+        assert_eq!(
+            cloned.get_var(VarId::new(1), ZERO_SPAN),
+            Ok(string_value("there"))
+        );
     }
 
     #[test]
     fn test_merging_children_back_to_parent() {
         let mut original = Stack::new();
         let engine_state = EngineState::new();
-        original.add_var(0, string_value("hello"));
+        original.add_var(VarId::new(0), string_value("hello"));
 
         let original_arc = Arc::new(original);
         let mut cloned = Stack::with_parent(original_arc.clone());
-        cloned.add_var(1, string_value("there"));
+        cloned.add_var(VarId::new(1), string_value("there"));
 
-        cloned.remove_var(0);
+        cloned.remove_var(VarId::new(0));
 
         cloned.add_env_var("ADDED_IN_CHILD".to_string(), string_value("New Env Var"));
 
         let original = Stack::with_changes_from_child(original_arc, cloned);
 
         assert_eq!(
-            original.get_var(0, ZERO_SPAN),
+            original.get_var(VarId::new(0), ZERO_SPAN),
             Err(crate::ShellError::VariableNotFoundAtRuntime { span: ZERO_SPAN })
         );
 
-        assert_eq!(original.get_var(1, ZERO_SPAN), Ok(string_value("there")));
+        assert_eq!(
+            original.get_var(VarId::new(1), ZERO_SPAN),
+            Ok(string_value("there"))
+        );
 
         assert_eq!(
             original.get_env_var(&engine_state, "ADDED_IN_CHILD"),
diff --git a/crates/nu-protocol/src/engine/state_delta.rs b/crates/nu-protocol/src/engine/state_delta.rs
index 033867e4c0..0204dbe7f1 100644
--- a/crates/nu-protocol/src/engine/state_delta.rs
+++ b/crates/nu-protocol/src/engine/state_delta.rs
@@ -98,7 +98,7 @@ impl StateDelta {
             Some(
                 &mut last_scope
                     .overlays
-                    .get_mut(*last_overlay_id)
+                    .get_mut(last_overlay_id.get())
                     .expect("internal error: missing required overlay")
                     .1,
             )
@@ -117,7 +117,7 @@ impl StateDelta {
             Some(
                 &last_scope
                     .overlays
-                    .get(*last_overlay_id)
+                    .get(last_overlay_id.get())
                     .expect("internal error: missing required overlay")
                     .1,
             )
diff --git a/crates/nu-protocol/src/engine/state_working_set.rs b/crates/nu-protocol/src/engine/state_working_set.rs
index eb60f9df8b..d35318c840 100644
--- a/crates/nu-protocol/src/engine/state_working_set.rs
+++ b/crates/nu-protocol/src/engine/state_working_set.rs
@@ -4,8 +4,8 @@ use crate::{
         description::build_desc, CachedFile, Command, CommandType, EngineState, OverlayFrame,
         StateDelta, Variable, VirtualPath, Visibility,
     },
-    BlockId, Category, CompileError, Config, DeclId, FileId, GetSpan, Module, ModuleId, ParseError,
-    ParseWarning, Signature, Span, SpanId, Type, Value, VarId, VirtualPathId,
+    BlockId, Category, CompileError, Config, DeclId, FileId, GetSpan, Module, ModuleId, OverlayId,
+    ParseError, ParseWarning, Signature, Span, SpanId, Type, Value, VarId, VirtualPathId,
 };
 use core::panic;
 use std::{
@@ -92,7 +92,7 @@ impl<'a> StateWorkingSet<'a> {
             for overlay_id in scope_frame.active_overlays.iter().rev() {
                 let (overlay_name, _) = scope_frame
                     .overlays
-                    .get(*overlay_id)
+                    .get(overlay_id.get())
                     .expect("internal error: missing overlay");
 
                 names.insert(overlay_name);
@@ -112,6 +112,7 @@ impl<'a> StateWorkingSet<'a> {
 
         self.delta.decls.push(decl);
         let decl_id = self.num_decls() - 1;
+        let decl_id = DeclId::new(decl_id);
 
         self.last_overlay_mut().insert_decl(name, decl_id);
 
@@ -152,6 +153,7 @@ impl<'a> StateWorkingSet<'a> {
 
         self.delta.decls.push(decl);
         let decl_id = self.num_decls() - 1;
+        let decl_id = DeclId::new(decl_id);
 
         self.delta
             .last_scope_frame_mut()
@@ -268,7 +270,7 @@ impl<'a> StateWorkingSet<'a> {
 
         self.delta.blocks.push(block);
 
-        self.num_blocks() - 1
+        BlockId::new(self.num_blocks() - 1)
     }
 
     pub fn add_module(&mut self, name: &str, module: Module, comments: Vec<Span>) -> ModuleId {
@@ -276,6 +278,7 @@ impl<'a> StateWorkingSet<'a> {
 
         self.delta.modules.push(Arc::new(module));
         let module_id = self.num_modules() - 1;
+        let module_id = ModuleId::new(module_id);
 
         if !comments.is_empty() {
             self.delta
@@ -314,7 +317,7 @@ impl<'a> StateWorkingSet<'a> {
     }
 
     pub fn get_contents_of_file(&self, file_id: FileId) -> Option<&[u8]> {
-        if let Some(cached_file) = self.permanent_state.get_file_contents().get(file_id) {
+        if let Some(cached_file) = self.permanent_state.get_file_contents().get(file_id.get()) {
             return Some(&cached_file.content);
         }
         // The index subtraction will not underflow, if we hit the permanent state first.
@@ -322,7 +325,7 @@ impl<'a> StateWorkingSet<'a> {
         if let Some(cached_file) = self
             .delta
             .get_file_contents()
-            .get(file_id - self.permanent_state.num_files())
+            .get(file_id.get() - self.permanent_state.num_files())
         {
             return Some(&cached_file.content);
         }
@@ -335,7 +338,7 @@ impl<'a> StateWorkingSet<'a> {
         // First, look for the file to see if we already have it
         for (idx, cached_file) in self.files().enumerate() {
             if *cached_file.name == filename && &*cached_file.content == contents {
-                return idx;
+                return FileId::new(idx);
             }
         }
 
@@ -350,18 +353,19 @@ impl<'a> StateWorkingSet<'a> {
             covered_span,
         });
 
-        self.num_files() - 1
+        FileId::new(self.num_files() - 1)
     }
 
     #[must_use]
     pub fn add_virtual_path(&mut self, name: String, virtual_path: VirtualPath) -> VirtualPathId {
         self.delta.virtual_paths.push((name, virtual_path));
 
-        self.num_virtual_paths() - 1
+        VirtualPathId::new(self.num_virtual_paths() - 1)
     }
 
     pub fn get_span_for_filename(&self, filename: &str) -> Option<Span> {
         let file_id = self.files().position(|file| &*file.name == filename)?;
+        let file_id = FileId::new(file_id);
 
         Some(self.get_span_for_file(file_id))
     }
@@ -373,7 +377,7 @@ impl<'a> StateWorkingSet<'a> {
     pub fn get_span_for_file(&self, file_id: FileId) -> Span {
         let result = self
             .files()
-            .nth(file_id)
+            .nth(file_id.get())
             .expect("internal error: could not find source for previously parsed file");
 
         result.covered_span
@@ -526,7 +530,7 @@ impl<'a> StateWorkingSet<'a> {
 
     pub fn next_var_id(&self) -> VarId {
         let num_permanent_vars = self.permanent_state.num_vars();
-        num_permanent_vars + self.delta.vars.len()
+        VarId::new(num_permanent_vars + self.delta.vars.len())
     }
 
     pub fn list_variables(&self) -> Vec<&[u8]> {
@@ -635,40 +639,40 @@ impl<'a> StateWorkingSet<'a> {
 
     pub fn set_variable_type(&mut self, var_id: VarId, ty: Type) {
         let num_permanent_vars = self.permanent_state.num_vars();
-        if var_id < num_permanent_vars {
+        if var_id.get() < num_permanent_vars {
             panic!("Internal error: attempted to set into permanent state from working set")
         } else {
-            self.delta.vars[var_id - num_permanent_vars].ty = ty;
+            self.delta.vars[var_id.get() - num_permanent_vars].ty = ty;
         }
     }
 
     pub fn set_variable_const_val(&mut self, var_id: VarId, val: Value) {
         let num_permanent_vars = self.permanent_state.num_vars();
-        if var_id < num_permanent_vars {
+        if var_id.get() < num_permanent_vars {
             panic!("Internal error: attempted to set into permanent state from working set")
         } else {
-            self.delta.vars[var_id - num_permanent_vars].const_val = Some(val);
+            self.delta.vars[var_id.get() - num_permanent_vars].const_val = Some(val);
         }
     }
 
     pub fn get_variable(&self, var_id: VarId) -> &Variable {
         let num_permanent_vars = self.permanent_state.num_vars();
-        if var_id < num_permanent_vars {
+        if var_id.get() < num_permanent_vars {
             self.permanent_state.get_var(var_id)
         } else {
             self.delta
                 .vars
-                .get(var_id - num_permanent_vars)
+                .get(var_id.get() - num_permanent_vars)
                 .expect("internal error: missing variable")
         }
     }
 
     pub fn get_variable_if_possible(&self, var_id: VarId) -> Option<&Variable> {
         let num_permanent_vars = self.permanent_state.num_vars();
-        if var_id < num_permanent_vars {
+        if var_id.get() < num_permanent_vars {
             Some(self.permanent_state.get_var(var_id))
         } else {
-            self.delta.vars.get(var_id - num_permanent_vars)
+            self.delta.vars.get(var_id.get() - num_permanent_vars)
         }
     }
 
@@ -687,12 +691,12 @@ impl<'a> StateWorkingSet<'a> {
 
     pub fn get_decl(&self, decl_id: DeclId) -> &dyn Command {
         let num_permanent_decls = self.permanent_state.num_decls();
-        if decl_id < num_permanent_decls {
+        if decl_id.get() < num_permanent_decls {
             self.permanent_state.get_decl(decl_id)
         } else {
             self.delta
                 .decls
-                .get(decl_id - num_permanent_decls)
+                .get(decl_id.get() - num_permanent_decls)
                 .expect("internal error: missing declaration")
                 .as_ref()
         }
@@ -700,12 +704,12 @@ impl<'a> StateWorkingSet<'a> {
 
     pub fn get_decl_mut(&mut self, decl_id: DeclId) -> &mut Box<dyn Command> {
         let num_permanent_decls = self.permanent_state.num_decls();
-        if decl_id < num_permanent_decls {
+        if decl_id.get() < num_permanent_decls {
             panic!("internal error: can only mutate declarations in working set")
         } else {
             self.delta
                 .decls
-                .get_mut(decl_id - num_permanent_decls)
+                .get_mut(decl_id.get() - num_permanent_decls)
                 .expect("internal error: missing declaration")
         }
     }
@@ -756,36 +760,36 @@ impl<'a> StateWorkingSet<'a> {
 
     pub fn get_block(&self, block_id: BlockId) -> &Arc<Block> {
         let num_permanent_blocks = self.permanent_state.num_blocks();
-        if block_id < num_permanent_blocks {
+        if block_id.get() < num_permanent_blocks {
             self.permanent_state.get_block(block_id)
         } else {
             self.delta
                 .blocks
-                .get(block_id - num_permanent_blocks)
+                .get(block_id.get() - num_permanent_blocks)
                 .expect("internal error: missing block")
         }
     }
 
     pub fn get_module(&self, module_id: ModuleId) -> &Module {
         let num_permanent_modules = self.permanent_state.num_modules();
-        if module_id < num_permanent_modules {
+        if module_id.get() < num_permanent_modules {
             self.permanent_state.get_module(module_id)
         } else {
             self.delta
                 .modules
-                .get(module_id - num_permanent_modules)
+                .get(module_id.get() - num_permanent_modules)
                 .expect("internal error: missing module")
         }
     }
 
     pub fn get_block_mut(&mut self, block_id: BlockId) -> &mut Block {
         let num_permanent_blocks = self.permanent_state.num_blocks();
-        if block_id < num_permanent_blocks {
+        if block_id.get() < num_permanent_blocks {
             panic!("Attempt to mutate a block that is in the permanent (immutable) state")
         } else {
             self.delta
                 .blocks
-                .get_mut(block_id - num_permanent_blocks)
+                .get_mut(block_id.get() - num_permanent_blocks)
                 .map(Arc::make_mut)
                 .expect("internal error: missing block")
         }
@@ -912,7 +916,7 @@ impl<'a> StateWorkingSet<'a> {
             last_scope_frame
                 .overlays
                 .push((name, OverlayFrame::from_origin(origin, prefixed)));
-            last_scope_frame.overlays.len() - 1
+            OverlayId::new(last_scope_frame.overlays.len() - 1)
         };
 
         last_scope_frame
@@ -989,13 +993,13 @@ impl<'a> StateWorkingSet<'a> {
     pub fn find_module_by_span(&self, span: Span) -> Option<ModuleId> {
         for (id, module) in self.delta.modules.iter().enumerate() {
             if Some(span) == module.span {
-                return Some(self.permanent_state.num_modules() + id);
+                return Some(ModuleId::new(self.permanent_state.num_modules() + id));
             }
         }
 
         for (module_id, module) in self.permanent_state.modules.iter().enumerate() {
             if Some(span) == module.span {
-                return Some(module_id);
+                return Some(ModuleId::new(module_id));
             }
         }
 
@@ -1020,12 +1024,12 @@ impl<'a> StateWorkingSet<'a> {
 
     pub fn get_virtual_path(&self, virtual_path_id: VirtualPathId) -> &(String, VirtualPath) {
         let num_permanent_virtual_paths = self.permanent_state.num_virtual_paths();
-        if virtual_path_id < num_permanent_virtual_paths {
+        if virtual_path_id.get() < num_permanent_virtual_paths {
             self.permanent_state.get_virtual_path(virtual_path_id)
         } else {
             self.delta
                 .virtual_paths
-                .get(virtual_path_id - num_permanent_virtual_paths)
+                .get(virtual_path_id.get() - num_permanent_virtual_paths)
                 .expect("internal error: missing virtual path")
         }
     }
diff --git a/crates/nu-protocol/src/eval_base.rs b/crates/nu-protocol/src/eval_base.rs
index 933342f577..12070f9ca3 100644
--- a/crates/nu-protocol/src/eval_base.rs
+++ b/crates/nu-protocol/src/eval_base.rs
@@ -5,7 +5,7 @@ use crate::{
         ExternalArgument, ListItem, Math, Operator, RecordItem,
     },
     debugger::DebugContext,
-    Config, GetSpan, Range, Record, ShellError, Span, Value, VarId, ENV_VARIABLE_ID,
+    BlockId, Config, GetSpan, Range, Record, ShellError, Span, Value, VarId, ENV_VARIABLE_ID,
 };
 use std::{collections::HashMap, sync::Arc};
 
@@ -369,7 +369,7 @@ pub trait Eval {
     fn eval_subexpression<D: DebugContext>(
         state: Self::State<'_>,
         mut_state: &mut Self::MutState,
-        block_id: usize,
+        block_id: BlockId,
         span: Span,
     ) -> Result<Value, ShellError>;
 
@@ -396,7 +396,7 @@ pub trait Eval {
     fn eval_row_condition_or_closure(
         state: Self::State<'_>,
         mut_state: &mut Self::MutState,
-        block_id: usize,
+        block_id: BlockId,
         span: Span,
     ) -> Result<Value, ShellError>;
 
diff --git a/crates/nu-protocol/src/eval_const.rs b/crates/nu-protocol/src/eval_const.rs
index 72f165d195..26750b867c 100644
--- a/crates/nu-protocol/src/eval_const.rs
+++ b/crates/nu-protocol/src/eval_const.rs
@@ -7,7 +7,8 @@ use crate::{
     debugger::{DebugContext, WithoutDebug},
     engine::{EngineState, StateWorkingSet},
     eval_base::Eval,
-    record, Config, HistoryFileFormat, PipelineData, Record, ShellError, Span, Value, VarId,
+    record, BlockId, Config, HistoryFileFormat, PipelineData, Record, ShellError, Span, Value,
+    VarId,
 };
 use nu_system::os_info::{get_kernel_version, get_os_arch, get_os_family, get_os_name};
 use std::{
@@ -481,7 +482,7 @@ impl Eval for EvalConst {
     fn eval_subexpression<D: DebugContext>(
         working_set: &StateWorkingSet,
         _: &mut (),
-        block_id: usize,
+        block_id: BlockId,
         span: Span,
     ) -> Result<Value, ShellError> {
         // TODO: Allow debugging const eval
@@ -516,7 +517,7 @@ impl Eval for EvalConst {
     fn eval_row_condition_or_closure(
         _: &StateWorkingSet,
         _: &mut (),
-        _: usize,
+        _: BlockId,
         span: Span,
     ) -> Result<Value, ShellError> {
         Err(ShellError::NotAConstant { span })
diff --git a/crates/nu-protocol/src/id.rs b/crates/nu-protocol/src/id.rs
index 829ee8f36d..84600e3c0e 100644
--- a/crates/nu-protocol/src/id.rs
+++ b/crates/nu-protocol/src/id.rs
@@ -1,12 +1,90 @@
+use std::any;
+use std::fmt::{Debug, Error, Formatter};
+use std::marker::PhantomData;
+
 use serde::{Deserialize, Serialize};
 
-pub type VarId = usize;
-pub type DeclId = usize;
-pub type BlockId = usize;
-pub type ModuleId = usize;
-pub type OverlayId = usize;
-pub type FileId = usize;
-pub type VirtualPathId = usize;
+#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct Id<T> {
+    inner: usize,
+    _phantom: PhantomData<T>,
+}
+
+impl<T> Id<T> {
+    /// Creates a new `Id`.
+    ///
+    /// Using a distinct type like `Id` instead of `usize` helps us avoid mixing plain integers
+    /// with identifiers.
+    #[inline]
+    pub const fn new(inner: usize) -> Self {
+        Self {
+            inner,
+            _phantom: PhantomData,
+        }
+    }
+
+    /// Returns the inner `usize` value.
+    ///
+    /// This requires an explicit call, ensuring we only use the raw value when intended.
+    #[inline]
+    pub const fn get(self) -> usize {
+        self.inner
+    }
+}
+
+impl<T> Debug for Id<T> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> {
+        let marker = any::type_name::<T>().split("::").last().expect("not empty");
+        write!(f, "{marker}Id({})", self.inner)
+    }
+}
+
+impl<T> Serialize for Id<T> {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        self.inner.serialize(serializer)
+    }
+}
+
+impl<'de, T> Deserialize<'de> for Id<T> {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        let inner = usize::deserialize(deserializer)?;
+        Ok(Self {
+            inner,
+            _phantom: PhantomData,
+        })
+    }
+}
+
+pub mod marker {
+    #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+    pub struct Var;
+    #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+    pub struct Decl;
+    #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+    pub struct Block;
+    #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+    pub struct Module;
+    #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+    pub struct Overlay;
+    #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+    pub struct File;
+    #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+    pub struct VirtualPath;
+}
+
+pub type VarId = Id<marker::Var>;
+pub type DeclId = Id<marker::Decl>;
+pub type BlockId = Id<marker::Block>;
+pub type ModuleId = Id<marker::Module>;
+pub type OverlayId = Id<marker::Overlay>;
+pub type FileId = Id<marker::File>;
+pub type VirtualPathId = Id<marker::VirtualPath>;
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
 pub struct SpanId(pub usize); // more robust ID style used in the new parser
diff --git a/crates/nu-protocol/src/ir/display.rs b/crates/nu-protocol/src/ir/display.rs
index 0168306f8a..68ef9ebd77 100644
--- a/crates/nu-protocol/src/ir/display.rs
+++ b/crates/nu-protocol/src/ir/display.rs
@@ -276,11 +276,11 @@ impl<'a> FmtDecl<'a> {
 
 impl fmt::Display for FmtDecl<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "decl {} {:?}", self.0, self.1)
+        write!(f, "decl {} {:?}", self.0.get(), self.1)
     }
 }
 
-struct FmtVar<'a>(DeclId, Option<&'a str>);
+struct FmtVar<'a>(VarId, Option<&'a str>);
 
 impl<'a> FmtVar<'a> {
     fn new(engine_state: &'a EngineState, var_id: VarId) -> Self {
@@ -297,9 +297,9 @@ impl<'a> FmtVar<'a> {
 impl fmt::Display for FmtVar<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         if let Some(name) = self.1 {
-            write!(f, "var {} {:?}", self.0, name)
+            write!(f, "var {} {:?}", self.0.get(), name)
         } else {
-            write!(f, "var {}", self.0)
+            write!(f, "var {}", self.0.get())
         }
     }
 }
@@ -346,9 +346,9 @@ impl<'a> fmt::Display for FmtLiteral<'a> {
             Literal::Filesize(q) => write!(f, "filesize({q}b)"),
             Literal::Duration(q) => write!(f, "duration({q}ns)"),
             Literal::Binary(b) => write!(f, "binary({})", FmtData(self.data, *b)),
-            Literal::Block(id) => write!(f, "block({id})"),
-            Literal::Closure(id) => write!(f, "closure({id})"),
-            Literal::RowCondition(id) => write!(f, "row_condition({id})"),
+            Literal::Block(id) => write!(f, "block({})", id.get()),
+            Literal::Closure(id) => write!(f, "closure({})", id.get()),
+            Literal::RowCondition(id) => write!(f, "row_condition({})", id.get()),
             Literal::Range {
                 start,
                 step,
diff --git a/crates/nu-protocol/src/parser_path.rs b/crates/nu-protocol/src/parser_path.rs
index 4935d9fbe2..09e90475f9 100644
--- a/crates/nu-protocol/src/parser_path.rs
+++ b/crates/nu-protocol/src/parser_path.rs
@@ -1,4 +1,7 @@
-use crate::engine::{StateWorkingSet, VirtualPath};
+use crate::{
+    engine::{StateWorkingSet, VirtualPath},
+    FileId,
+};
 use std::{
     ffi::OsStr,
     path::{Path, PathBuf},
@@ -112,7 +115,7 @@ impl ParserPath {
                 std::fs::File::open(p).map(|f| Box::new(f) as Box<dyn std::io::Read>)
             }
             ParserPath::VirtualFile(_, file_id) => working_set
-                .get_contents_of_file(*file_id)
+                .get_contents_of_file(FileId::new(*file_id))
                 .map(|bytes| Box::new(bytes) as Box<dyn std::io::Read>)
                 .ok_or(std::io::ErrorKind::NotFound.into()),
 
@@ -136,7 +139,9 @@ impl ParserPath {
         virtual_path: &VirtualPath,
     ) -> Self {
         match virtual_path {
-            VirtualPath::File(file_id) => ParserPath::VirtualFile(PathBuf::from(name), *file_id),
+            VirtualPath::File(file_id) => {
+                ParserPath::VirtualFile(PathBuf::from(name), file_id.get())
+            }
             VirtualPath::Dir(entries) => ParserPath::VirtualDir(
                 PathBuf::from(name),
                 entries
diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs
index 80f96707af..5a6461ab18 100644
--- a/crates/nu-protocol/src/value/mod.rs
+++ b/crates/nu-protocol/src/value/mod.rs
@@ -23,7 +23,7 @@ use crate::{
     ast::{Bits, Boolean, CellPath, Comparison, Math, Operator, PathMember},
     did_you_mean,
     engine::{Closure, EngineState},
-    Config, ShellError, Signals, Span, Type,
+    BlockId, Config, ShellError, Signals, Span, Type,
 };
 use chrono::{DateTime, Datelike, FixedOffset, Locale, TimeZone};
 use chrono_humanize::HumanTime;
@@ -863,7 +863,7 @@ impl Value {
                     .collect::<Vec<_>>()
                     .join(separator)
             ),
-            Value::Closure { val, .. } => format!("<Closure {}>", val.block_id),
+            Value::Closure { val, .. } => format!("<Closure {}>", val.block_id.get()),
             Value::Nothing { .. } => String::new(),
             Value::Error { error, .. } => format!("{error:?}"),
             Value::Binary { val, .. } => format!("{val:?}"),
@@ -2029,7 +2029,7 @@ impl Value {
             Value::test_record(Record::new()),
             Value::test_list(Vec::new()),
             Value::test_closure(Closure {
-                block_id: 0,
+                block_id: BlockId::new(0),
                 captures: Vec::new(),
             }),
             Value::test_nothing(),
diff --git a/crates/nuon/src/lib.rs b/crates/nuon/src/lib.rs
index 891ccae62a..304c8f977c 100644
--- a/crates/nuon/src/lib.rs
+++ b/crates/nuon/src/lib.rs
@@ -12,7 +12,7 @@ mod tests {
     use nu_protocol::{
         ast::{CellPath, PathMember, RangeInclusion},
         engine::Closure,
-        record, IntRange, Range, Span, Value,
+        record, BlockId, IntRange, Range, Span, Value,
     };
 
     use crate::{from_nuon, to_nuon, ToStyle};
@@ -175,7 +175,7 @@ mod tests {
     fn to_nuon_errs_on_closure() {
         assert!(to_nuon(
             &Value::test_closure(Closure {
-                block_id: 0,
+                block_id: BlockId::new(0),
                 captures: vec![]
             }),
             ToStyle::Raw,

From 30a4187be4bc569b4389fc1dfd0abfa2bbe0addf Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Mon, 30 Sep 2024 11:34:29 -0500
Subject: [PATCH 0486/1072] a potential solution that may fix vt processing
 (#13961)

# Description

This PR is related #11950 and serves as another potential fix alongside
rolling it back with https://github.com/nushell/nushell/pull/13959. The
idea here is to try and properly setup the input and output console
modes. I searched through a log of GitHub code to come up with this,
including deno, wezterm, conpty, among others. It seems to work but it
would be great if someone else would be able to test. I added comments
from the consoleapi.h from windows to know what the other flags are in
case we need to make other changes.

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-utils/src/utils.rs | 74 ++++++++++++++++++++++++++----------
 1 file changed, 54 insertions(+), 20 deletions(-)

diff --git a/crates/nu-utils/src/utils.rs b/crates/nu-utils/src/utils.rs
index ee575b5640..ea5df308b6 100644
--- a/crates/nu-utils/src/utils.rs
+++ b/crates/nu-utils/src/utils.rs
@@ -1,34 +1,68 @@
+#[cfg(windows)]
+use crossterm_winapi::{ConsoleMode, Handle};
 use lscolors::LsColors;
 use std::io::{Result, Write};
 
 pub fn enable_vt_processing() -> Result<()> {
     #[cfg(windows)]
     {
-        use crossterm_winapi::{ConsoleMode, Handle};
+        let console_out_mode = ConsoleMode::from(Handle::current_out_handle()?);
+        let old_out_mode = console_out_mode.mode()?;
+        let console_in_mode = ConsoleMode::from(Handle::current_in_handle()?);
+        let old_in_mode = console_in_mode.mode()?;
 
-        pub const ENABLE_PROCESSED_OUTPUT: u32 = 0x0001;
-        pub const ENABLE_VIRTUAL_TERMINAL_INPUT: u32 = 0x0200;
-        pub const ENABLE_VIRTUAL_TERMINAL_PROCESSING: u32 = 0x0004;
-        let mask = ENABLE_VIRTUAL_TERMINAL_PROCESSING;
-
-        let console_mode = ConsoleMode::from(Handle::current_out_handle()?);
-        let old_mode = console_mode.mode()?;
-
-        // researching odd ansi behavior in windows terminal repo revealed that
-        // enable_processed_output and enable_virtual_terminal_processing should be used
-
-        if old_mode & mask == 0 {
-            console_mode.set_mode(
-                old_mode
-                    | ENABLE_PROCESSED_OUTPUT
-                    | ENABLE_VIRTUAL_TERMINAL_PROCESSING
-                    | ENABLE_VIRTUAL_TERMINAL_INPUT,
-            )?
-        }
+        enable_vt_processing_input(console_in_mode, old_in_mode)?;
+        enable_vt_processing_output(console_out_mode, old_out_mode)?;
     }
     Ok(())
 }
 
+#[cfg(windows)]
+fn enable_vt_processing_input(console_in_mode: ConsoleMode, mode: u32) -> Result<()> {
+    //
+    // Input Mode flags:
+    //
+    // #define ENABLE_PROCESSED_INPUT              0x0001
+    // #define ENABLE_LINE_INPUT                   0x0002
+    // #define ENABLE_ECHO_INPUT                   0x0004
+    // #define ENABLE_WINDOW_INPUT                 0x0008
+    // #define ENABLE_MOUSE_INPUT                  0x0010
+    // #define ENABLE_INSERT_MODE                  0x0020
+    // #define ENABLE_QUICK_EDIT_MODE              0x0040
+    // #define ENABLE_EXTENDED_FLAGS               0x0080
+    // #define ENABLE_AUTO_POSITION                0x0100
+    // #define ENABLE_VIRTUAL_TERMINAL_INPUT       0x0200
+
+    const ENABLE_PROCESSED_INPUT: u32 = 0x0001;
+    const ENABLE_LINE_INPUT: u32 = 0x0002;
+    const ENABLE_ECHO_INPUT: u32 = 0x0004;
+    const ENABLE_VIRTUAL_TERMINAL_INPUT: u32 = 0x0200;
+
+    console_in_mode.set_mode(
+        mode | ENABLE_VIRTUAL_TERMINAL_INPUT
+            & ENABLE_ECHO_INPUT
+            & ENABLE_LINE_INPUT
+            & ENABLE_PROCESSED_INPUT,
+    )
+}
+
+#[cfg(windows)]
+fn enable_vt_processing_output(console_out_mode: ConsoleMode, mode: u32) -> Result<()> {
+    //
+    // Output Mode flags:
+    //
+    // #define ENABLE_PROCESSED_OUTPUT             0x0001
+    // #define ENABLE_WRAP_AT_EOL_OUTPUT           0x0002
+    // #define ENABLE_VIRTUAL_TERMINAL_PROCESSING  0x0004
+    // #define DISABLE_NEWLINE_AUTO_RETURN         0x0008
+    // #define ENABLE_LVB_GRID_WORLDWIDE           0x0010
+
+    pub const ENABLE_PROCESSED_OUTPUT: u32 = 0x0001;
+    pub const ENABLE_VIRTUAL_TERMINAL_PROCESSING: u32 = 0x0004;
+
+    console_out_mode.set_mode(mode | ENABLE_PROCESSED_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING)
+}
+
 pub fn stdout_write_all_and_flush<T>(output: T) -> Result<()>
 where
     T: AsRef<[u8]>,

From 4bd38847c269a079d5cbb4318003f08f6b9fa4c2 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Mon, 30 Sep 2024 11:47:50 -0500
Subject: [PATCH 0487/1072] update human-date-parser crate (#13962)

# Description

closes https://github.com/nushell/nushell/issues/13759 and fixes some
odd behavior from the human-date-parser crate.

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1d6508ed14..b4caf3823d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1979,9 +1979,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "human-date-parser"
-version = "0.1.2"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5cbf96a7157cc349eeafe4595e4f283c3fcab73b5a656d8b2cc00a870a74e1a"
+checksum = "1116cf4debfe770c12168458321c4a8591b71c4c19f7100de07c84cf81701c63"
 dependencies = [
  "chrono",
  "pest",
diff --git a/Cargo.toml b/Cargo.toml
index 5ac98485e5..e951daef93 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -91,7 +91,7 @@ filesize = "0.2"
 filetime = "0.2"
 fuzzy-matcher = "0.3"
 heck = "0.5.0"
-human-date-parser = "0.1.1"
+human-date-parser = "0.2.0"
 indexmap = "2.5"
 indicatif = "0.17"
 interprocess = "2.2.0"

From 166d5fa4ffa3c5514b2d7597f3238e6828c986f9 Mon Sep 17 00:00:00 2001
From: Maxim Zhiburt <zhiburt@gmail.com>
Date: Mon, 30 Sep 2024 22:45:13 +0300
Subject: [PATCH 0488/1072] nu-exlore/ Fix :try table view (#13964)

Must be addressed @fdncred
But I would recheck.


![image](https://github.com/user-attachments/assets/657c4f63-62ae-413d-b6cc-90e918864e69)

close #13957
---
 crates/nu-explore/src/views/record/table_widget.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-explore/src/views/record/table_widget.rs b/crates/nu-explore/src/views/record/table_widget.rs
index ae39d46858..588377c9f8 100644
--- a/crates/nu-explore/src/views/record/table_widget.rs
+++ b/crates/nu-explore/src/views/record/table_widget.rs
@@ -565,7 +565,7 @@ fn render_split_line(
     style: NuStyle,
 ) -> u16 {
     if has_head {
-        render_vertical_split_line(buf, x, y, height, &[0], &[2], &[], style);
+        render_vertical_split_line(buf, x, y, height, &[y], &[y + 2], &[], style);
     } else {
         render_vertical_split_line(buf, x, y, height, &[], &[], &[], style);
     }

From 46589faaca9afae60c4b969f6dcd4315a3def9ed Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Mon, 30 Sep 2024 19:18:07 -0500
Subject: [PATCH 0489/1072] allow bools to be type checked with each other
 (#13968)

# Description

This PR allows bools to be type checked against each other.


![image](https://github.com/user-attachments/assets/64dc36f8-59bc-4e66-8380-6b693c77a2d3)

I looked for test and maybe we don't have any for type checked math
stuff. I didn't see any.

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-parser/src/type_check.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crates/nu-parser/src/type_check.rs b/crates/nu-parser/src/type_check.rs
index 6a99aef247..bf268dac1a 100644
--- a/crates/nu-parser/src/type_check.rs
+++ b/crates/nu-parser/src/type_check.rs
@@ -480,6 +480,7 @@ pub fn math_result_type(
                 (Type::Duration, Type::Duration) => (Type::Bool, None),
                 (Type::Date, Type::Date) => (Type::Bool, None),
                 (Type::Filesize, Type::Filesize) => (Type::Bool, None),
+                (Type::Bool, Type::Bool) => (Type::Bool, None),
 
                 (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
                 (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
@@ -530,6 +531,7 @@ pub fn math_result_type(
                 (Type::Duration, Type::Duration) => (Type::Bool, None),
                 (Type::Date, Type::Date) => (Type::Bool, None),
                 (Type::Filesize, Type::Filesize) => (Type::Bool, None),
+                (Type::Bool, Type::Bool) => (Type::Bool, None),
 
                 (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
                 (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
@@ -580,6 +582,7 @@ pub fn math_result_type(
                 (Type::Duration, Type::Duration) => (Type::Bool, None),
                 (Type::Date, Type::Date) => (Type::Bool, None),
                 (Type::Filesize, Type::Filesize) => (Type::Bool, None),
+                (Type::Bool, Type::Bool) => (Type::Bool, None),
 
                 (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
                 (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
@@ -630,6 +633,7 @@ pub fn math_result_type(
                 (Type::Duration, Type::Duration) => (Type::Bool, None),
                 (Type::Date, Type::Date) => (Type::Bool, None),
                 (Type::Filesize, Type::Filesize) => (Type::Bool, None),
+                (Type::Bool, Type::Bool) => (Type::Bool, None),
 
                 (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
                 (Type::Custom(a), _) => (Type::Custom(a.clone()), None),

From b2d0d9cf13f95fb51684cb1335c2754219261a12 Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Tue, 1 Oct 2024 13:23:27 +0200
Subject: [PATCH 0490/1072] Make `SpanId` and `RegId` also use new ID struct
 (#13963)

# Description
In the PR #13832 I used some newtypes for the old IDs. `SpanId` and
`RegId` already used newtypes, to streamline the code, I made them into
the same style as the other marker-based IDs.

Since `RegId` should be a bit smaller (it uses a `u32` instead of
`usize`) according to @devyn, I made the `Id` type generic with `usize`
as the default inner value.

The question still stands how `Display` should be implemented if even.

# User-Facing Changes
Users of the internal values of `RegId` or `SpanId` have breaking
changes but who outside nushell itself even uses these?

# After Submitting
The IDs will be streamlined and all type-safe.
---
 crates/nu-engine/src/compile/builder.rs       | 13 ++--
 crates/nu-engine/src/compile/mod.rs           |  2 +-
 crates/nu-engine/src/eval_ir.rs               | 11 ++--
 crates/nu-protocol/src/ast/expression.rs      |  2 +-
 crates/nu-protocol/src/debugger/profiler.rs   |  2 +-
 crates/nu-protocol/src/engine/engine_state.rs | 11 ++--
 .../src/engine/state_working_set.rs           |  6 +-
 crates/nu-protocol/src/id.rs                  | 60 ++++++++++++-------
 8 files changed, 66 insertions(+), 41 deletions(-)

diff --git a/crates/nu-engine/src/compile/builder.rs b/crates/nu-engine/src/compile/builder.rs
index cedebd0fb2..0cdf1b9dcf 100644
--- a/crates/nu-engine/src/compile/builder.rs
+++ b/crates/nu-engine/src/compile/builder.rs
@@ -58,9 +58,9 @@ impl BlockBuilder {
                 }
             })
         {
-            Ok(RegId(index as u32))
+            Ok(RegId::new(index as u32))
         } else if self.register_allocation_state.len() < (u32::MAX as usize - 2) {
-            let reg_id = RegId(self.register_allocation_state.len() as u32);
+            let reg_id = RegId::new(self.register_allocation_state.len() as u32);
             self.register_allocation_state.push(true);
             Ok(reg_id)
         } else {
@@ -73,13 +73,16 @@ impl BlockBuilder {
     /// Check if a register is initialized with a value.
     pub(crate) fn is_allocated(&self, reg_id: RegId) -> bool {
         self.register_allocation_state
-            .get(reg_id.0 as usize)
+            .get(reg_id.get() as usize)
             .is_some_and(|state| *state)
     }
 
     /// Mark a register as initialized.
     pub(crate) fn mark_register(&mut self, reg_id: RegId) -> Result<(), CompileError> {
-        if let Some(is_allocated) = self.register_allocation_state.get_mut(reg_id.0 as usize) {
+        if let Some(is_allocated) = self
+            .register_allocation_state
+            .get_mut(reg_id.get() as usize)
+        {
             *is_allocated = true;
             Ok(())
         } else {
@@ -92,7 +95,7 @@ impl BlockBuilder {
     /// Mark a register as empty, so that it can be used again by something else.
     #[track_caller]
     pub(crate) fn free_register(&mut self, reg_id: RegId) -> Result<(), CompileError> {
-        let index = reg_id.0 as usize;
+        let index = reg_id.get() as usize;
 
         if self
             .register_allocation_state
diff --git a/crates/nu-engine/src/compile/mod.rs b/crates/nu-engine/src/compile/mod.rs
index 0beea18dd1..1bdc2c6b41 100644
--- a/crates/nu-engine/src/compile/mod.rs
+++ b/crates/nu-engine/src/compile/mod.rs
@@ -18,7 +18,7 @@ use expression::compile_expression;
 use operator::*;
 use redirect::*;
 
-const BLOCK_INPUT: RegId = RegId(0);
+const BLOCK_INPUT: RegId = RegId::new(0);
 
 /// Compile Nushell pipeline abstract syntax tree (AST) to internal representation (IR) instructions
 /// for evaluation.
diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index 790016cb1b..e5a3875f83 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -113,25 +113,28 @@ impl<'a> EvalContext<'a> {
     #[inline]
     fn put_reg(&mut self, reg_id: RegId, new_value: PipelineData) {
         // log::trace!("{reg_id} <- {new_value:?}");
-        self.registers[reg_id.0 as usize] = new_value;
+        self.registers[reg_id.get() as usize] = new_value;
     }
 
     /// Borrow the contents of a register.
     #[inline]
     fn borrow_reg(&self, reg_id: RegId) -> &PipelineData {
-        &self.registers[reg_id.0 as usize]
+        &self.registers[reg_id.get() as usize]
     }
 
     /// Replace the contents of a register with `Empty` and then return the value that it contained
     #[inline]
     fn take_reg(&mut self, reg_id: RegId) -> PipelineData {
         // log::trace!("<- {reg_id}");
-        std::mem::replace(&mut self.registers[reg_id.0 as usize], PipelineData::Empty)
+        std::mem::replace(
+            &mut self.registers[reg_id.get() as usize],
+            PipelineData::Empty,
+        )
     }
 
     /// Clone data from a register. Must be collected first.
     fn clone_reg(&mut self, reg_id: RegId, error_span: Span) -> Result<PipelineData, ShellError> {
-        match &self.registers[reg_id.0 as usize] {
+        match &self.registers[reg_id.get() as usize] {
             PipelineData::Empty => Ok(PipelineData::Empty),
             PipelineData::Value(val, meta) => Ok(PipelineData::Value(val.clone(), meta.clone())),
             _ => Err(ShellError::IrEvalError {
diff --git a/crates/nu-protocol/src/ast/expression.rs b/crates/nu-protocol/src/ast/expression.rs
index faf47d42ec..e1a761ed2f 100644
--- a/crates/nu-protocol/src/ast/expression.rs
+++ b/crates/nu-protocol/src/ast/expression.rs
@@ -584,7 +584,7 @@ impl Expression {
         Expression {
             expr,
             span,
-            span_id: SpanId(0),
+            span_id: SpanId::new(0),
             ty,
             custom_completion: None,
         }
diff --git a/crates/nu-protocol/src/debugger/profiler.rs b/crates/nu-protocol/src/debugger/profiler.rs
index ea81a1b814..bffadfe5ef 100644
--- a/crates/nu-protocol/src/debugger/profiler.rs
+++ b/crates/nu-protocol/src/debugger/profiler.rs
@@ -259,7 +259,7 @@ impl Debugger for Profiler {
                     .or_else(|| {
                         instruction
                             .output_register()
-                            .map(|register| Ok(&registers[register.0 as usize]))
+                            .map(|register| Ok(&registers[register.get() as usize]))
                     })
                     .map(|result| format_result(&result, span))
             })
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index 28463f752b..665a79a329 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -120,7 +120,7 @@ pub const ENV_VARIABLE_ID: VarId = VarId::new(2);
 // NOTE: If you add more to this list, make sure to update the > checks based on the last in the list
 
 // The first span is unknown span
-pub const UNKNOWN_SPAN_ID: SpanId = SpanId(0);
+pub const UNKNOWN_SPAN_ID: SpanId = SpanId::new(0);
 
 impl EngineState {
     pub fn new() -> Self {
@@ -1027,12 +1027,15 @@ impl EngineState {
     /// Add new span and return its ID
     pub fn add_span(&mut self, span: Span) -> SpanId {
         self.spans.push(span);
-        SpanId(self.num_spans() - 1)
+        SpanId::new(self.num_spans() - 1)
     }
 
     /// Find ID of a span (should be avoided if possible)
     pub fn find_span_id(&self, span: Span) -> Option<SpanId> {
-        self.spans.iter().position(|sp| sp == &span).map(SpanId)
+        self.spans
+            .iter()
+            .position(|sp| sp == &span)
+            .map(SpanId::new)
     }
 }
 
@@ -1041,7 +1044,7 @@ impl<'a> GetSpan for &'a EngineState {
     fn get_span(&self, span_id: SpanId) -> Span {
         *self
             .spans
-            .get(span_id.0)
+            .get(span_id.get())
             .expect("internal error: missing span")
     }
 }
diff --git a/crates/nu-protocol/src/engine/state_working_set.rs b/crates/nu-protocol/src/engine/state_working_set.rs
index d35318c840..5735684f19 100644
--- a/crates/nu-protocol/src/engine/state_working_set.rs
+++ b/crates/nu-protocol/src/engine/state_working_set.rs
@@ -1037,20 +1037,20 @@ impl<'a> StateWorkingSet<'a> {
     pub fn add_span(&mut self, span: Span) -> SpanId {
         let num_permanent_spans = self.permanent_state.spans.len();
         self.delta.spans.push(span);
-        SpanId(num_permanent_spans + self.delta.spans.len() - 1)
+        SpanId::new(num_permanent_spans + self.delta.spans.len() - 1)
     }
 }
 
 impl<'a> GetSpan for &'a StateWorkingSet<'a> {
     fn get_span(&self, span_id: SpanId) -> Span {
         let num_permanent_spans = self.permanent_state.num_spans();
-        if span_id.0 < num_permanent_spans {
+        if span_id.get() < num_permanent_spans {
             self.permanent_state.get_span(span_id)
         } else {
             *self
                 .delta
                 .spans
-                .get(span_id.0 - num_permanent_spans)
+                .get(span_id.get() - num_permanent_spans)
                 .expect("internal error: missing span")
         }
     }
diff --git a/crates/nu-protocol/src/id.rs b/crates/nu-protocol/src/id.rs
index 84600e3c0e..ccbff60dda 100644
--- a/crates/nu-protocol/src/id.rs
+++ b/crates/nu-protocol/src/id.rs
@@ -1,45 +1,56 @@
 use std::any;
-use std::fmt::{Debug, Error, Formatter};
+use std::fmt::{Debug, Display, Error, Formatter};
 use std::marker::PhantomData;
 
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct Id<T> {
-    inner: usize,
-    _phantom: PhantomData<T>,
+pub struct Id<M, V = usize> {
+    inner: V,
+    _phantom: PhantomData<M>,
 }
 
-impl<T> Id<T> {
+impl<M, V> Id<M, V> {
     /// Creates a new `Id`.
     ///
     /// Using a distinct type like `Id` instead of `usize` helps us avoid mixing plain integers
     /// with identifiers.
     #[inline]
-    pub const fn new(inner: usize) -> Self {
+    pub const fn new(inner: V) -> Self {
         Self {
             inner,
             _phantom: PhantomData,
         }
     }
+}
 
-    /// Returns the inner `usize` value.
+impl<M, V> Id<M, V>
+where
+    V: Copy,
+{
+    /// Returns the inner value.
     ///
     /// This requires an explicit call, ensuring we only use the raw value when intended.
     #[inline]
-    pub const fn get(self) -> usize {
+    pub const fn get(self) -> V {
         self.inner
     }
 }
 
-impl<T> Debug for Id<T> {
+impl<M, V> Debug for Id<M, V>
+where
+    V: Display,
+{
     fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> {
-        let marker = any::type_name::<T>().split("::").last().expect("not empty");
+        let marker = any::type_name::<M>().split("::").last().expect("not empty");
         write!(f, "{marker}Id({})", self.inner)
     }
 }
 
-impl<T> Serialize for Id<T> {
+impl<M, V> Serialize for Id<M, V>
+where
+    V: Serialize,
+{
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
         S: serde::Serializer,
@@ -48,12 +59,15 @@ impl<T> Serialize for Id<T> {
     }
 }
 
-impl<'de, T> Deserialize<'de> for Id<T> {
+impl<'de, M, V> Deserialize<'de> for Id<M, V>
+where
+    V: Deserialize<'de>,
+{
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
         D: serde::Deserializer<'de>,
     {
-        let inner = usize::deserialize(deserializer)?;
+        let inner = V::deserialize(deserializer)?;
         Ok(Self {
             inner,
             _phantom: PhantomData,
@@ -76,6 +90,10 @@ pub mod marker {
     pub struct File;
     #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct VirtualPath;
+    #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+    pub struct Span;
+    #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+    pub struct Reg;
 }
 
 pub type VarId = Id<marker::Var>;
@@ -85,19 +103,17 @@ pub type ModuleId = Id<marker::Module>;
 pub type OverlayId = Id<marker::Overlay>;
 pub type FileId = Id<marker::File>;
 pub type VirtualPathId = Id<marker::VirtualPath>;
+pub type SpanId = Id<marker::Span>;
 
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
-pub struct SpanId(pub usize); // more robust ID style used in the new parser
-
-/// An ID for an [IR](crate::ir) register. `%n` is a common shorthand for `RegId(n)`.
+/// An ID for an [IR](crate::ir) register.
+///
+/// `%n` is a common shorthand for `RegId(n)`.
 ///
 /// Note: `%0` is allocated with the block input at the beginning of a compiled block.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
-#[repr(transparent)]
-pub struct RegId(pub u32);
+pub type RegId = Id<marker::Reg, u32>;
 
-impl std::fmt::Display for RegId {
+impl Display for RegId {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "%{}", self.0)
+        write!(f, "%{}", self.get())
     }
 }

From 02804ab5378aa42a289e1db83e6f02037c9efa10 Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Tue, 1 Oct 2024 19:28:14 +0800
Subject: [PATCH 0491/1072] Simplify the Dockerfile (#13974)

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

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

# Description

Works for `docker build` and `docker buildx build`
For more detail about the new Dockerfile syntax:
https://www.docker.com/blog/new-dockerfile-capabilities-v1-7-0/
---
 docker/Dockerfile | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index bf45834b16..aab1e854bc 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:latest
+
 # Git: git version 2.30.2
 # /etc/os-release: Alpine Linux v3.16
 # Kernel: Linux ca3abedc4fb1 5.17.15-76051715-generic #202206141358~1655919116~22.04~1db9e34 SMP PREEMPT Wed Jun 22 19 x86_64 Linux
@@ -8,25 +10,17 @@ FROM alpine
 LABEL maintainer=nushell
 
 ARG TARGETARCH
+ARG ARCH=${TARGETARCH/arm64/aarch64}
+ARG ARCH=${ARCH/amd64/x86_64}
 
-RUN set -eux; \
-    if [ "${TARGETARCH}" = "amd64" ] || [ "${TARGETARCH}" = "x86_64" ]; then \
-        echo "Downloading x86_64 binary for ${TARGETARCH}..."; \
-        arch_path="x86_64"; \
-    elif [ "${TARGETARCH}" = "arm64" ] || [ "${TARGETARCH}" = "aarch64"]; then \
-        echo "Downloading aarch64 binary for ${TARGETARCH}..."; \
-        arch_path="aarch64"; \
-    else \
-        arch_path=""; \
-    fi; \
-    echo '/usr/bin/nu' >> /etc/shells \
+RUN echo '/usr/bin/nu' >> /etc/shells \
     && adduser -D -s /usr/bin/nu nushell \
     && mkdir -p /home/nushell/.config/nushell/ \
     && cd /tmp \
     && wget -qO - https://api.github.com/repos/nushell/nushell/releases/latest \
     | grep browser_download_url \
-    | grep "${arch_path}.*.musl.tar.gz" \
-    | cut -f4 -d '"' \
+    | cut -d '"' -f 4 \
+    | grep ${ARCH}-unknown-linux-musl \
     | xargs -I{} wget {} \
     && tar -xzf nu* \
     && cd nu*-musl \

From a38663ec907379c9459c4ae0e66e00b6e353dc30 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Oct 2024 08:32:07 +0800
Subject: [PATCH 0492/1072] Bump actions-rust-lang/setup-rust-toolchain from
 1.10.0 to 1.10.1 (#13979)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps
[actions-rust-lang/setup-rust-toolchain](https://github.com/actions-rust-lang/setup-rust-toolchain)
from 1.10.0 to 1.10.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/releases">actions-rust-lang/setup-rust-toolchain's
releases</a>.</em></p>
<blockquote>
<h2>v1.10.1</h2>
<ul>
<li>Fix problem matcher for rustfmt output.
The format has changed since <a
href="https://redirect.github.com/rust-lang/rustfmt/pull/5971">rust-lang/rustfmt#5971</a>
and now follows the form &quot;filename:line&quot;.
Thanks to <a
href="https://github.com/0xcypher02"><code>@​0xcypher02</code></a> for
pointing out the problem.</li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/compare/v1...v1.10.1">https://github.com/actions-rust-lang/setup-rust-toolchain/compare/v1...v1.10.1</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/blob/main/CHANGELOG.md">actions-rust-lang/setup-rust-toolchain's
changelog</a>.</em></p>
<blockquote>
<h2>[1.10.1] - 2024-10-01</h2>
<ul>
<li>Fix problem matcher for rustfmt output.
The format has changed since <a
href="https://redirect.github.com/rust-lang/rustfmt/pull/5971">rust-lang/rustfmt#5971</a>
and now follows the form &quot;filename:line&quot;.
Thanks to <a
href="https://github.com/0xcypher02"><code>@​0xcypher02</code></a> for
pointing out the problem.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/commit/11df97af8e8102fd60b60a77dfbf58d40cd843b8"><code>11df97a</code></a>
Update the rustfmt problem matcher</li>
<li>See full diff in <a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/compare/v1.10.0...v1.10.1">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions-rust-lang/setup-rust-toolchain&package-manager=github_actions&previous-version=1.10.0&new-version=1.10.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/ci.yml            | 8 ++++----
 .github/workflows/nightly-build.yml | 2 +-
 .github/workflows/release.yml       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 91c3e92551..badadb56ae 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/checkout@v4.1.7
 
       - name: Setup Rust toolchain and cache
-        uses: actions-rust-lang/setup-rust-toolchain@v1.10.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
 
       - name: cargo fmt
         run: cargo fmt --all -- --check
@@ -64,7 +64,7 @@ jobs:
       - uses: actions/checkout@v4.1.7
 
       - name: Setup Rust toolchain and cache
-        uses: actions-rust-lang/setup-rust-toolchain@v1.10.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
 
       - name: Tests
         run: cargo test --workspace --profile ci --exclude nu_plugin_*
@@ -93,7 +93,7 @@ jobs:
       - uses: actions/checkout@v4.1.7
 
       - name: Setup Rust toolchain and cache
-        uses: actions-rust-lang/setup-rust-toolchain@v1.10.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
 
       - name: Install Nushell
         run: cargo install --path . --locked --no-default-features
@@ -144,7 +144,7 @@ jobs:
       - uses: actions/checkout@v4.1.7
 
       - name: Setup Rust toolchain and cache
-        uses: actions-rust-lang/setup-rust-toolchain@v1.10.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
 
       - name: Clippy
         run: cargo clippy --package nu_plugin_* -- $CLIPPY_OPTIONS
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 57f6ce678b..639938cc4c 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -131,7 +131,7 @@ jobs:
         echo "targets = ['${{matrix.target}}']" >> rust-toolchain.toml
 
     - name: Setup Rust toolchain and cache
-      uses: actions-rust-lang/setup-rust-toolchain@v1.10.0
+      uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
       # WARN: Keep the rustflags to prevent from the winget submission error: `CAQuietExec: Error 0xc0000135`
       with:
         rustflags: ''
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5684b0577f..a9443178ba 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -78,7 +78,7 @@ jobs:
         echo "targets = ['${{matrix.target}}']" >> rust-toolchain.toml
 
     - name: Setup Rust toolchain
-      uses: actions-rust-lang/setup-rust-toolchain@v1.10.0
+      uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
       # WARN: Keep the rustflags to prevent from the winget submission error: `CAQuietExec: Error 0xc0000135`
       with:
         cache: false

From 9e6ada6411b1381356efe1209c12ccb93831d7a3 Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Wed, 2 Oct 2024 08:49:59 +0800
Subject: [PATCH 0493/1072] Fix typos (#13980)

Fix typos of
https://github.com/nushell/nushell/actions/runs/11135506119/job/30945650562?pr=13978
---
 crates/nu-explore/src/views/record/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-explore/src/views/record/mod.rs b/crates/nu-explore/src/views/record/mod.rs
index f77d22a622..a4e86a8fad 100644
--- a/crates/nu-explore/src/views/record/mod.rs
+++ b/crates/nu-explore/src/views/record/mod.rs
@@ -310,7 +310,7 @@ pub struct RecordLayer {
     column_names: Vec<String>,
     // These are the raw records in the current layer. The sole reason we keep this around is so we can return the original value
     // if it's being peeked. Otherwise we could accept an iterator over it.
-    // or if it could be Clonable we could do that anyway;
+    // or if it could be Cloneable we could do that anyway;
     // cause it would keep memory footprint lower while keep everything working
     // (yee would make return O(n); we would need to traverse iterator once again; but maybe worth it)
     record_values: Vec<Vec<Value>>,

From 702dcd8581d914c5642ba5323d26dacd3bd48779 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Oct 2024 01:08:43 +0000
Subject: [PATCH 0494/1072] Bump crate-ci/typos from 1.24.6 to 1.25.0 (#13978)

---
 .github/workflows/typos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index f13bc77876..13a972e3e2 100644
--- 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.24.6
+        uses: crate-ci/typos@v1.25.0

From 52eb9c2ef364269eccf3181abaceb7afa08783db Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Wed, 2 Oct 2024 02:09:57 -0400
Subject: [PATCH 0495/1072] Update merge example (#13985)

# Description

All credit to @AlifianK for suggesting this in the doc repo
(https://github.com/nushell/nushell.github.io/pull/1571).

This updates the merge example to make it more clear by using a
different set of numbers that can't easily be confused with an `index`.
Also changes the `index` to `id` to remove the "magic column name
conversion". (#13780).

# User-Facing Changes

Help/Doc change only

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

N/A
---
 crates/nu-command/src/filters/merge.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/crates/nu-command/src/filters/merge.rs b/crates/nu-command/src/filters/merge.rs
index fa8ec9d337..e1d3095b20 100644
--- a/crates/nu-command/src/filters/merge.rs
+++ b/crates/nu-command/src/filters/merge.rs
@@ -38,21 +38,21 @@ repeating this process with row 1, and so on."#
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
-                example: "[a b c] | wrap name | merge ( [1 2 3] | wrap index )",
-                description: "Add an 'index' column to the input table",
+                example: "[a b c] | wrap name | merge ( [47 512 618] | wrap id )",
+                description: "Add an 'id' column to the input table",
                 result: Some(Value::list(
                     vec![
                         Value::test_record(record! {
                             "name" => Value::test_string("a"),
-                            "index" => Value::test_int(1),
+                            "id" => Value::test_int(47),
                         }),
                         Value::test_record(record! {
                             "name" => Value::test_string("b"),
-                            "index" => Value::test_int(2),
+                            "id" => Value::test_int(512),
                         }),
                         Value::test_record(record! {
                             "name" => Value::test_string("c"),
-                            "index" => Value::test_int(3),
+                            "id" => Value::test_int(618),
                         }),
                     ],
                     Span::test_data(),

From cf5b2aeb888dcc263a54b30e6baa0974fafb0bb0 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Wed, 2 Oct 2024 02:11:07 -0400
Subject: [PATCH 0496/1072] Update wrap example (#13986)

# Description

As with #13985, credit to @AlifianK for suggesting this in
https://github.com/nushell/nushell.github.io/pull/1572

Updates the example in `wrap` to not use 1-based, sequential numbers.

# User-Facing Changes

Help/doc only

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

N/A
---
 crates/nu-command/src/filters/wrap.rs | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/crates/nu-command/src/filters/wrap.rs b/crates/nu-command/src/filters/wrap.rs
index 6988c09f9a..f30b110803 100644
--- a/crates/nu-command/src/filters/wrap.rs
+++ b/crates/nu-command/src/filters/wrap.rs
@@ -57,31 +57,34 @@ impl Command for Wrap {
         vec![
             Example {
                 description: "Wrap a list into a table with a given column name",
-                example: "[1 2 3] | wrap num",
+                example: "[ Pachisi Mahjong Catan Carcassonne ] | wrap game",
                 result: Some(Value::test_list(vec![
                     Value::test_record(record! {
-                        "num" => Value::test_int(1),
+                        "game" => Value::test_string("Pachisi"),
                     }),
                     Value::test_record(record! {
-                        "num" => Value::test_int(2),
+                        "game" => Value::test_string("Mahjong"),
                     }),
                     Value::test_record(record! {
-                        "num" => Value::test_int(3),
+                        "game" => Value::test_string("Catan"),
+                    }),
+                    Value::test_record(record! {
+                        "game" => Value::test_string("Carcassonne"),
                     }),
                 ])),
             },
             Example {
                 description: "Wrap a range into a table with a given column name",
-                example: "1..3 | wrap num",
+                example: "4..6 | wrap num",
                 result: Some(Value::test_list(vec![
                     Value::test_record(record! {
-                        "num" => Value::test_int(1),
+                        "num" => Value::test_int(4),
                     }),
                     Value::test_record(record! {
-                        "num" => Value::test_int(2),
+                        "num" => Value::test_int(5),
                     }),
                     Value::test_record(record! {
-                        "num" => Value::test_int(3),
+                        "num" => Value::test_int(6),
                     }),
                 ])),
             },

From cebbc8232281c35703022da1cde39bee17a0e18e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Oct 2024 06:15:10 +0000
Subject: [PATCH 0497/1072] Bump once_cell from 1.19.0 to 1.20.1 (#13982)

Bumps [once_cell](https://github.com/matklad/once_cell) from 1.19.0 to
1.20.1.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/matklad/once_cell/blob/master/CHANGELOG.md">once_cell's
changelog</a>.</em></p>
<blockquote>
<h2>1.20.1</h2>
<ul>
<li>Allow using <code>race</code> module using just
<code>portable_atomic</code>, without <code>critical_section</code> and
provide
better error messages on targets without atomic CAS instruction,
<a
href="https://redirect.github.com/matklad/once_cell/pull/265">#265</a>.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/matklad/once_cell/commit/3b9bd9b87257dc732b8220507b8c162eab097a43"><code>3b9bd9b</code></a>
release 1.20.1</li>
<li><a
href="https://github.com/matklad/once_cell/commit/f61508a632745197b64968c1941f94cce054149f"><code>f61508a</code></a>
Merge pull request <a
href="https://redirect.github.com/matklad/once_cell/issues/265">#265</a>
from taiki-e/portable-atomic</li>
<li><a
href="https://github.com/matklad/once_cell/commit/449e5d7b2d57ca101e364a0596e84c792a78d674"><code>449e5d7</code></a>
Add portable-atomic feature and disable portable-atomic/critical-section
by d...</li>
<li><a
href="https://github.com/matklad/once_cell/commit/72f7c2e5faed09e84aa1ffe26c25092c87954b98"><code>72f7c2e</code></a>
Merge pull request <a
href="https://redirect.github.com/matklad/once_cell/issues/260">#260</a>
from brodycj/propagate-critical-section-to-portable-a...</li>
<li><a
href="https://github.com/matklad/once_cell/commit/be6b6238fb96da85cb0d5217f6121f4c2ba764e2"><code>be6b623</code></a>
v1.20.0</li>
<li><a
href="https://github.com/matklad/once_cell/commit/f2d95bfe79ee7f268e92d7105a95d12e06b6c748"><code>f2d95bf</code></a>
update Cargo (dev-)dependencies; update Cargo.lock.msrv</li>
<li><a
href="https://github.com/matklad/once_cell/commit/dd6b5c2909d3deccb6aabcb665de07c819411094"><code>dd6b5c2</code></a>
ci: fix TEST_BETA with TEMPORARY WORKAROUND in RUSTFLAGS</li>
<li><a
href="https://github.com/matklad/once_cell/commit/7317eae758ff76ec7681caf231397f234059aa3d"><code>7317eae</code></a>
add <code>cargo test --workspace</code> to beginning of TEST task</li>
<li><a
href="https://github.com/matklad/once_cell/commit/bd54bf7aff264a2ea8d935e5da686471320a8322"><code>bd54bf7</code></a>
fix default-features flag for parking_lot_core in dependencies</li>
<li><a
href="https://github.com/matklad/once_cell/commit/bb70b9e7e689ce2493b515dcc4a1d96088e9ad2f"><code>bb70b9e</code></a>
cargo fmt updates</li>
<li>Additional commits viewable in <a
href="https://github.com/matklad/once_cell/compare/v1.19.0...v1.20.1">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=once_cell&package-manager=cargo&previous-version=1.19.0&new-version=1.20.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 7 +++++--
 Cargo.toml | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b4caf3823d..672e8bb1e1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3878,9 +3878,12 @@ checksum = "80adb31078122c880307e9cdfd4e3361e6545c319f9b9dcafcb03acd3b51a575"
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
+dependencies = [
+ "portable-atomic",
+]
 
 [[package]]
 name = "open"
diff --git a/Cargo.toml b/Cargo.toml
index e951daef93..f500f7b788 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -118,7 +118,7 @@ nu-ansi-term = "0.50.1"
 num-format = "0.4"
 num-traits = "0.2"
 omnipath = "0.1"
-once_cell = "1.18"
+once_cell = "1.20"
 open = "5.3"
 os_pipe = { version = "1.2", features = ["io_safety"] }
 pathdiff = "0.2"

From 573a7e2c7b021824f92b78de227cafbe327529d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Oct 2024 06:17:03 +0000
Subject: [PATCH 0498/1072] Bump tempfile from 3.12.0 to 3.13.0 (#13984)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.12.0 to
3.13.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md">tempfile's
changelog</a>.</em></p>
<blockquote>
<h2>3.13.0</h2>
<ul>
<li>Add <code>with_suffix</code> constructors for easily creating new
temporary files with a specific suffix (e.g., a specific file
extension). Thanks to <a
href="https://github.com/Borgerr"><code>@​Borgerr</code></a>.</li>
<li>Update dependencies (fastrand &amp; rustix).</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/Stebalien/tempfile/commit/a354f8cb118004cb0c4c6b6aa6bb351e6c191b96"><code>a354f8c</code></a>
chore: release 3.13.0</li>
<li><a
href="https://github.com/Stebalien/tempfile/commit/d21b602fa28182468909ac44a2ac60b7f0a16f95"><code>d21b602</code></a>
chore: update deps</li>
<li><a
href="https://github.com/Stebalien/tempfile/commit/d6600da8fc542c7076a4de129e98e40cdb4bad4f"><code>d6600da</code></a>
Add for <code>with_suffix</code> (<a
href="https://redirect.github.com/Stebalien/tempfile/issues/299">#299</a>)</li>
<li><a
href="https://github.com/Stebalien/tempfile/commit/19280c588988101ea2ab796877766ca5bd23f397"><code>19280c5</code></a>
Document current default permissions for tempdirs (<a
href="https://redirect.github.com/Stebalien/tempfile/issues/296">#296</a>)</li>
<li><a
href="https://github.com/Stebalien/tempfile/commit/c5eac9f6905d23c5d6fb96df7637be5d04c3c993"><code>c5eac9f</code></a>
fix: address clippy unnecessary deref lint in test (<a
href="https://redirect.github.com/Stebalien/tempfile/issues/294">#294</a>)</li>
<li>See full diff in <a
href="https://github.com/Stebalien/tempfile/compare/v3.12.0...v3.13.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=tempfile&package-manager=cargo&previous-version=3.12.0&new-version=3.13.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 8 ++++----
 Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 672e8bb1e1..de244d4293 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1479,9 +1479,9 @@ checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c"
 
 [[package]]
 name = "fastrand"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
 
 [[package]]
 name = "fd-lock"
@@ -6156,9 +6156,9 @@ checksum = "c1bbb9f3c5c463a01705937a24fdabc5047929ac764b2d5b9cf681c1f5041ed5"
 
 [[package]]
 name = "tempfile"
-version = "3.12.0"
+version = "3.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
 dependencies = [
  "cfg-if",
  "fastrand",
diff --git a/Cargo.toml b/Cargo.toml
index f500f7b788..c000fd4c35 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -155,7 +155,7 @@ strip-ansi-escapes = "0.2.0"
 syn = "2.0"
 sysinfo = "0.30"
 tabled = { version = "0.16.0", default-features = false }
-tempfile = "3.10"
+tempfile = "3.13"
 terminal_size = "0.3"
 titlecase = "2.0"
 toml = "0.8"

From 1d6ac16530b2eca5088357b2dbac26213908dce2 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Wed, 2 Oct 2024 03:59:14 -0700
Subject: [PATCH 0499/1072] `polars into-df` struct fix (#13977)

# Description
This fixes an issue with converting to a dataframe when specifying a
struct in the schema. Things like the following now work correctly:
```nushell
 [[foo bar]; [{a: "a_0", b:"b_0"} 1] [{a: "a_1", b: "b_1" } 2]] | polars into-df -s {foo: {a: str, b: str}, bar: u8}
```
---
 .../src/dataframe/command/core/to_df.rs       | 27 +++++++---
 .../values/nu_dataframe/conversion.rs         | 50 +++++++++++++++----
 2 files changed, 58 insertions(+), 19 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/to_df.rs b/crates/nu_plugin_polars/src/dataframe/command/core/to_df.rs
index e3a9491411..066e07d01f 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/to_df.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/to_df.rs
@@ -6,6 +6,7 @@ use crate::{
 
 use crate::values::NuDataFrame;
 
+use log::debug;
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
     Category, Example, LabeledError, PipelineData, Signature, Span, SyntaxShape, Type, Value,
@@ -159,7 +160,7 @@ impl PluginCommand for ToDataFrame {
             },
             Example {
                 description: "Convert to a dataframe and provide a schema",
-                example: "{a: 1, b: {a: [1 2 3]}, c: [a b c]}| polars into-df -s {a: u8, b: {a: list<u64>}, c: list<str>}",
+                example: "[[a b c]; [1 {d: [1 2 3]} [10 11 12] ]]| polars into-df -s {a: u8, b: {d: list<u64>}, c: list<u8>}",
                 result: Some(
                     NuDataFrame::try_from_series_vec(vec![
                         Series::new("a", &[1u8]),
@@ -172,7 +173,7 @@ impl PluginCommand for ToDataFrame {
                         },
                         {
                             let dtype = DataType::List(Box::new(DataType::String));
-                            let vals = vec![AnyValue::List(Series::new("c", &["a", "b", "c"]))];
+                            let vals = vec![AnyValue::List(Series::new("c", &[10, 11, 12]))];
                             Series::from_any_values_and_dtype("c", &vals, &dtype, false)
                                 .expect("List series should not fail")
                         }
@@ -208,6 +209,8 @@ impl PluginCommand for ToDataFrame {
             .map(|schema| NuSchema::try_from(&schema))
             .transpose()?;
 
+        debug!("schema: {:?}", maybe_schema);
+
         let maybe_as_columns = call.has_flag("as-columns")?;
 
         let df = if !maybe_as_columns {
@@ -230,14 +233,22 @@ impl PluginCommand for ToDataFrame {
                                 .collect::<Vec<Column>>();
                             NuDataFrame::try_from_columns(columns, maybe_schema)?
                         }
-                        Err(_) => NuDataFrame::try_from_iter(
-                            plugin,
-                            input.into_iter(),
-                            maybe_schema.clone(),
-                        )?,
+                        Err(e) => {
+                            debug!(
+                                "Failed to build with multiple columns, attempting as series. failure:{e}"
+                            );
+                            NuDataFrame::try_from_iter(
+                                plugin,
+                                input.into_iter(),
+                                maybe_schema.clone(),
+                            )?
+                        }
                     }
                 }
-                _ => NuDataFrame::try_from_iter(plugin, input.into_iter(), maybe_schema.clone())?,
+                _ => {
+                    debug!("Other input: {input:?}");
+                    NuDataFrame::try_from_iter(plugin, input.into_iter(), maybe_schema.clone())?
+                }
             }
         };
 
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
index c01b0ae834..9cf8c30b1d 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
@@ -1,3 +1,4 @@
+use std::collections::HashMap;
 use std::ops::{Deref, DerefMut};
 
 use chrono::{DateTime, Duration, FixedOffset, NaiveTime, TimeZone, Utc};
@@ -487,25 +488,52 @@ fn typed_column_to_series(name: &str, column: TypedColumn) -> Result<Series, She
             }
             DataType::Struct(fields) => {
                 let schema = Some(NuSchema::new(Schema::from_iter(fields.clone())));
-                let mut structs: Vec<Series> = Vec::new();
+                // let mut structs: Vec<Series> = Vec::new();
+                let mut structs: HashMap<String, Series> = HashMap::new();
 
                 for v in column.values.iter() {
                     let mut column_values: ColumnMap = IndexMap::new();
                     let record = v.as_record()?;
                     insert_record(&mut column_values, record.clone(), &schema)?;
                     let df = from_parsed_columns(column_values)?;
-                    structs.push(df.as_series(Span::unknown())?);
+                    for name in df.df.get_column_names() {
+                        let series = df.df.column(name).map_err(|e| ShellError::GenericError {
+                            error: format!(
+                                "Error creating struct, could not get column name {name}: {e}"
+                            ),
+                            msg: "".into(),
+                            span: None,
+                            help: None,
+                            inner: vec![],
+                        })?;
+
+                        if let Some(v) = structs.get_mut(name) {
+                            let _ = v.append(series)
+                                .map_err(|e| ShellError::GenericError {
+                                    error: format!("Error creating struct, could not append to series for col {name}: {e}"),
+                                    msg: "".into(),
+                                    span: None,
+                                    help: None,
+                                    inner: vec![],
+                                })?;
+                        } else {
+                            structs.insert(name.to_string(), series.to_owned());
+                        }
+                    }
                 }
 
-                let chunked = StructChunked::new(column.name(), structs.as_ref()).map_err(|e| {
-                    ShellError::GenericError {
-                        error: format!("Error creating struct: {e}"),
-                        msg: "".into(),
-                        span: None,
-                        help: None,
-                        inner: vec![],
-                    }
-                })?;
+                let structs: Vec<Series> = structs.into_values().collect();
+
+                let chunked =
+                    StructChunked::new(column.name(), structs.as_slice()).map_err(|e| {
+                        ShellError::GenericError {
+                            error: format!("Error creating struct: {e}"),
+                            msg: "".into(),
+                            span: None,
+                            help: None,
+                            inner: vec![],
+                        }
+                    })?;
                 Ok(chunked.into_series())
             }
             _ => Err(ShellError::GenericError {

From 475aa4f1dda2a2635a56228b39313d18c69c09bd Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Wed, 2 Oct 2024 04:00:50 -0700
Subject: [PATCH 0500/1072] Fix `LAST_EXIT_CODE` not being set for internal
 errors (#13954)

# Description
Fixes #13949 where `$env.LAST_EXIT_CODE` was not being set for internal
errors.

# Tests + Formatting
Cannot test due to limitations with the `nu_repl` test bin.
---
 crates/nu-protocol/src/engine/stack.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crates/nu-protocol/src/engine/stack.rs b/crates/nu-protocol/src/engine/stack.rs
index 31c1175e7c..391e8633c8 100644
--- a/crates/nu-protocol/src/engine/stack.rs
+++ b/crates/nu-protocol/src/engine/stack.rs
@@ -286,6 +286,8 @@ impl Stack {
     pub fn set_last_error(&mut self, error: &ShellError) {
         if let Some(code) = error.external_exit_code() {
             self.set_last_exit_code(code.item, code.span);
+        } else {
+            self.set_last_exit_code(1, Span::unknown());
         }
     }
 

From f03ba6793e673fe7967fc09a4090ad72c3a39054 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Wed, 2 Oct 2024 04:04:18 -0700
Subject: [PATCH 0501/1072] Fix non-zero exit code errors in middle of pipeline
  (#13899)

# Description
Fixes #13868. Should come after #13885.

# User-Facing Changes
Bug fix.

# Tests + Formatting
Added a test.
---
 crates/nu-cli/src/print.rs                     |  8 +++++++-
 crates/nu-cmd-lang/src/core_commands/do_.rs    |  3 ++-
 crates/nu-cmd-lang/src/core_commands/ignore.rs |  9 +++++++--
 crates/nu-command/src/filesystem/save.rs       |  2 ++
 crates/nu-command/src/system/run_external.rs   |  9 ++++++++-
 crates/nu-protocol/src/process/child.rs        |  4 ++--
 tests/shell/pipeline/mod.rs                    | 10 +++++++++-
 7 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/crates/nu-cli/src/print.rs b/crates/nu-cli/src/print.rs
index 66e736ca4f..ffb0366242 100644
--- a/crates/nu-cli/src/print.rs
+++ b/crates/nu-cli/src/print.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::ByteStreamSource;
 
 #[derive(Clone)]
 pub struct Print;
@@ -50,7 +51,7 @@ Since this command has no output, there is no point in piping it with other comm
         engine_state: &EngineState,
         stack: &mut Stack,
         call: &Call,
-        input: PipelineData,
+        mut input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let args: Vec<Value> = call.rest(engine_state, stack, 0)?;
         let no_newline = call.has_flag(engine_state, stack, "no-newline")?;
@@ -69,6 +70,11 @@ Since this command has no output, there is no point in piping it with other comm
                 }
             }
         } else if !input.is_nothing() {
+            if let PipelineData::ByteStream(stream, _) = &mut input {
+                if let ByteStreamSource::Child(child) = stream.source_mut() {
+                    child.ignore_error(true);
+                }
+            }
             if raw {
                 input.print_raw(engine_state, no_newline, to_stderr)?;
             } else {
diff --git a/crates/nu-cmd-lang/src/core_commands/do_.rs b/crates/nu-cmd-lang/src/core_commands/do_.rs
index 3a48c66745..4fee08a79c 100644
--- a/crates/nu-cmd-lang/src/core_commands/do_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/do_.rs
@@ -147,6 +147,7 @@ impl Command for Do {
                             None
                         };
 
+                        child.ignore_error(false);
                         child.wait()?;
 
                         let mut child = ChildProcess::from_raw(None, None, None, span);
@@ -172,7 +173,7 @@ impl Command for Do {
                     ) =>
             {
                 if let ByteStreamSource::Child(child) = stream.source_mut() {
-                    child.ignore_error();
+                    child.ignore_error(true);
                 }
                 Ok(PipelineData::ByteStream(stream, metadata))
             }
diff --git a/crates/nu-cmd-lang/src/core_commands/ignore.rs b/crates/nu-cmd-lang/src/core_commands/ignore.rs
index 2b3d31ba9f..382dc4fedd 100644
--- a/crates/nu-cmd-lang/src/core_commands/ignore.rs
+++ b/crates/nu-cmd-lang/src/core_commands/ignore.rs
@@ -1,5 +1,5 @@
 use nu_engine::command_prelude::*;
-use nu_protocol::{engine::StateWorkingSet, OutDest};
+use nu_protocol::{engine::StateWorkingSet, ByteStreamSource, OutDest};
 
 #[derive(Clone)]
 pub struct Ignore;
@@ -32,8 +32,13 @@ impl Command for Ignore {
         _engine_state: &EngineState,
         _stack: &mut Stack,
         _call: &Call,
-        input: PipelineData,
+        mut input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
+        if let PipelineData::ByteStream(stream, _) = &mut input {
+            if let ByteStreamSource::Child(child) = stream.source_mut() {
+                child.ignore_error(true);
+            }
+        }
         input.drain()?;
         Ok(PipelineData::empty())
     }
diff --git a/crates/nu-command/src/filesystem/save.rs b/crates/nu-command/src/filesystem/save.rs
index f14ed25471..ec7e4140ce 100644
--- a/crates/nu-command/src/filesystem/save.rs
+++ b/crates/nu-command/src/filesystem/save.rs
@@ -182,6 +182,8 @@ impl Command for Save {
                             }
                             (None, None) => {}
                         };
+
+                        child.wait()?;
                     }
                 }
 
diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index 4a790fc9b4..8d6b4e2bf3 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -180,12 +180,19 @@ impl Command for External {
         }
 
         // Wrap the output into a `PipelineData::ByteStream`.
-        let child = ChildProcess::new(
+        let mut child = ChildProcess::new(
             child,
             merged_stream,
             matches!(stderr, OutDest::Pipe),
             call.head,
         )?;
+
+        if matches!(stdout, OutDest::Pipe | OutDest::PipeSeparate)
+            || matches!(stderr, OutDest::Pipe | OutDest::PipeSeparate)
+        {
+            child.ignore_error(true);
+        }
+
         Ok(PipelineData::ByteStream(
             ByteStream::child(child, call.head),
             None,
diff --git a/crates/nu-protocol/src/process/child.rs b/crates/nu-protocol/src/process/child.rs
index 930015742b..8c4fb55c0d 100644
--- a/crates/nu-protocol/src/process/child.rs
+++ b/crates/nu-protocol/src/process/child.rs
@@ -202,8 +202,8 @@ impl ChildProcess {
         }
     }
 
-    pub fn ignore_error(&mut self) -> &mut Self {
-        self.ignore_error = true;
+    pub fn ignore_error(&mut self, ignore: bool) -> &mut Self {
+        self.ignore_error = ignore;
         self
     }
 
diff --git a/tests/shell/pipeline/mod.rs b/tests/shell/pipeline/mod.rs
index 243dc27475..5a58134b98 100644
--- a/tests/shell/pipeline/mod.rs
+++ b/tests/shell/pipeline/mod.rs
@@ -6,6 +6,14 @@ use pretty_assertions::assert_eq;
 #[test]
 fn doesnt_break_on_utf8() {
     let actual = nu!("echo ö");
-
     assert_eq!(actual.out, "ö", "'{}' should contain ö", actual.out);
 }
+
+#[test]
+fn non_zero_exit_code_in_middle_of_pipeline_ignored() {
+    let actual = nu!("nu -c 'print a b; exit 42' | collect");
+    assert_eq!(actual.out, "ab");
+
+    let actual = nu!("nu -c 'print a b; exit 42' | nu --stdin -c 'collect'");
+    assert_eq!(actual.out, "ab");
+}

From 157494e803d100a96e4e3c3079548fd3f98596af Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Wed, 2 Oct 2024 04:05:48 -0700
Subject: [PATCH 0502/1072] Make `get_env_var` return a reference to a `Value`
 (#13987)

# Description
Title says it all, changes `EngineState::get_env_var` to return a
`Option<&'a Value>` instead of an owned `Option<Value>`. This avoids
some unnecessary clones.

I also made a similar change to the `PluginExecutionContext` trait.
---
 .../src/completions/completion_common.rs      |  2 +-
 crates/nu-cli/src/prompt.rs                   | 12 ++++-----
 crates/nu-cli/src/prompt_update.rs            |  8 ++++--
 crates/nu-cli/src/repl.rs                     | 26 ++++++++++++++-----
 crates/nu-cmd-base/src/hook.rs                | 17 +++++-------
 crates/nu-cmd-plugin/src/util.rs              |  5 ++--
 crates/nu-command/src/filesystem/cd.rs        |  2 +-
 crates/nu-command/src/network/http/client.rs  |  3 ++-
 crates/nu-command/src/viewers/griddle.rs      |  2 +-
 crates/nu-command/src/viewers/table.rs        |  2 +-
 crates/nu-engine/src/env.rs                   |  8 +++---
 crates/nu-explore/src/nu_common/lscolor.rs    |  2 +-
 crates/nu-plugin-engine/src/context.rs        |  6 ++---
 crates/nu-plugin-engine/src/interface/mod.rs  |  4 ++-
 crates/nu-protocol/src/engine/engine_state.rs |  8 +++---
 crates/nu-protocol/src/engine/stack.rs        | 16 ++++++++----
 src/test_bins.rs                              |  2 +-
 17 files changed, 74 insertions(+), 51 deletions(-)

diff --git a/crates/nu-cli/src/completions/completion_common.rs b/crates/nu-cli/src/completions/completion_common.rs
index 77ae165c73..6dd59da853 100644
--- a/crates/nu-cli/src/completions/completion_common.rs
+++ b/crates/nu-cli/src/completions/completion_common.rs
@@ -180,7 +180,7 @@ pub fn complete_item(
         && engine_state.config.use_ansi_coloring)
         .then(|| {
             let ls_colors_env_str = match stack.get_env_var(engine_state, "LS_COLORS") {
-                Some(v) => env_to_string("LS_COLORS", &v, engine_state, stack).ok(),
+                Some(v) => env_to_string("LS_COLORS", v, engine_state, stack).ok(),
                 None => None,
             };
             get_ls_colors(ls_colors_env_str)
diff --git a/crates/nu-cli/src/prompt.rs b/crates/nu-cli/src/prompt.rs
index 744640b76f..b590a4436d 100644
--- a/crates/nu-cli/src/prompt.rs
+++ b/crates/nu-cli/src/prompt.rs
@@ -1,10 +1,7 @@
 use crate::prompt_update::{
     POST_PROMPT_MARKER, PRE_PROMPT_MARKER, VSCODE_POST_PROMPT_MARKER, VSCODE_PRE_PROMPT_MARKER,
 };
-use nu_protocol::{
-    engine::{EngineState, Stack},
-    Value,
-};
+use nu_protocol::engine::{EngineState, Stack};
 #[cfg(windows)]
 use nu_utils::enable_vt_processing;
 use reedline::{
@@ -124,8 +121,11 @@ impl Prompt for NushellPrompt {
                 .replace('\n', "\r\n");
 
             if self.shell_integration_osc633 {
-                if self.stack.get_env_var(&self.engine_state, "TERM_PROGRAM")
-                    == Some(Value::test_string("vscode"))
+                if self
+                    .stack
+                    .get_env_var(&self.engine_state, "TERM_PROGRAM")
+                    .and_then(|v| v.as_str().ok())
+                    == Some("vscode")
                 {
                     // We're in vscode and we have osc633 enabled
                     format!("{VSCODE_PRE_PROMPT_MARKER}{prompt}{VSCODE_POST_PROMPT_MARKER}").into()
diff --git a/crates/nu-cli/src/prompt_update.rs b/crates/nu-cli/src/prompt_update.rs
index d96bf40b8f..95280af828 100644
--- a/crates/nu-cli/src/prompt_update.rs
+++ b/crates/nu-cli/src/prompt_update.rs
@@ -68,7 +68,7 @@ fn get_prompt_string(
         .get_env_var(engine_state, prompt)
         .and_then(|v| match v {
             Value::Closure { val, .. } => {
-                let result = ClosureEvalOnce::new(engine_state, stack, *val)
+                let result = ClosureEvalOnce::new(engine_state, stack, val.as_ref().clone())
                     .run_with_input(PipelineData::Empty);
 
                 trace!(
@@ -119,7 +119,11 @@ pub(crate) fn update_prompt(
     // Now that we have the prompt string lets ansify it.
     // <133 A><prompt><133 B><command><133 C><command output>
     let left_prompt_string = if config.shell_integration.osc633 {
-        if stack.get_env_var(engine_state, "TERM_PROGRAM") == Some(Value::test_string("vscode")) {
+        if stack
+            .get_env_var(engine_state, "TERM_PROGRAM")
+            .and_then(|v| v.as_str().ok())
+            == Some("vscode")
+        {
             // We're in vscode and we have osc633 enabled
             Some(format!(
                 "{VSCODE_PRE_PROMPT_MARKER}{configured_left_prompt_string}{VSCODE_POST_PROMPT_MARKER}"
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 087a44114d..3e2b01cfd1 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -512,8 +512,10 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
             drop(repl);
 
             if shell_integration_osc633 {
-                if stack.get_env_var(engine_state, "TERM_PROGRAM")
-                    == Some(Value::test_string("vscode"))
+                if stack
+                    .get_env_var(engine_state, "TERM_PROGRAM")
+                    .and_then(|v| v.as_str().ok())
+                    == Some("vscode")
                 {
                     start_time = Instant::now();
 
@@ -835,7 +837,7 @@ fn do_auto_cd(
 
     let shells = stack.get_env_var(engine_state, "NUSHELL_SHELLS");
     let mut shells = if let Some(v) = shells {
-        v.into_list().unwrap_or_else(|_| vec![cwd])
+        v.clone().into_list().unwrap_or_else(|_| vec![cwd])
     } else {
         vec![cwd]
     };
@@ -1027,7 +1029,11 @@ fn run_shell_integration_osc633(
     if let Ok(path) = current_dir_str(engine_state, stack) {
         // Supported escape sequences of Microsoft's Visual Studio Code (vscode)
         // https://code.visualstudio.com/docs/terminal/shell-integration#_supported-escape-sequences
-        if stack.get_env_var(engine_state, "TERM_PROGRAM") == Some(Value::test_string("vscode")) {
+        if stack
+            .get_env_var(engine_state, "TERM_PROGRAM")
+            .and_then(|v| v.as_str().ok())
+            == Some("vscode")
+        {
             let start_time = Instant::now();
 
             // If we're in vscode, run their specific ansi escape sequence.
@@ -1225,7 +1231,11 @@ fn get_command_finished_marker(
         .and_then(|e| e.as_i64().ok());
 
     if shell_integration_osc633 {
-        if stack.get_env_var(engine_state, "TERM_PROGRAM") == Some(Value::test_string("vscode")) {
+        if stack
+            .get_env_var(engine_state, "TERM_PROGRAM")
+            .and_then(|v| v.as_str().ok())
+            == Some("vscode")
+        {
             // We're in vscode and we have osc633 enabled
             format!(
                 "{}{}{}",
@@ -1274,7 +1284,11 @@ fn run_finaliziation_ansi_sequence(
 ) {
     if shell_integration_osc633 {
         // Only run osc633 if we are in vscode
-        if stack.get_env_var(engine_state, "TERM_PROGRAM") == Some(Value::test_string("vscode")) {
+        if stack
+            .get_env_var(engine_state, "TERM_PROGRAM")
+            .and_then(|v| v.as_str().ok())
+            == Some("vscode")
+        {
             let start_time = Instant::now();
 
             run_ansi_sequence(&get_command_finished_marker(
diff --git a/crates/nu-cmd-base/src/hook.rs b/crates/nu-cmd-base/src/hook.rs
index 064db0e5bc..e9637d16ad 100644
--- a/crates/nu-cmd-base/src/hook.rs
+++ b/crates/nu-cmd-base/src/hook.rs
@@ -18,17 +18,12 @@ pub fn eval_env_change_hook(
         match hook {
             Value::Record { val, .. } => {
                 for (env_name, hook_value) in &*val {
-                    let before = engine_state
-                        .previous_env_vars
-                        .get(env_name)
-                        .cloned()
-                        .unwrap_or_default();
-
-                    let after = stack
-                        .get_env_var(engine_state, env_name)
-                        .unwrap_or_default();
-
+                    let before = engine_state.previous_env_vars.get(env_name);
+                    let after = stack.get_env_var(engine_state, env_name);
                     if before != after {
+                        let before = before.cloned().unwrap_or_default();
+                        let after = after.cloned().unwrap_or_default();
+
                         eval_hook(
                             engine_state,
                             stack,
@@ -39,7 +34,7 @@ pub fn eval_env_change_hook(
                         )?;
 
                         Arc::make_mut(&mut engine_state.previous_env_vars)
-                            .insert(env_name.to_string(), after);
+                            .insert(env_name.clone(), after);
                     }
                 }
             }
diff --git a/crates/nu-cmd-plugin/src/util.rs b/crates/nu-cmd-plugin/src/util.rs
index 7d5282235f..6808a74a3c 100644
--- a/crates/nu-cmd-plugin/src/util.rs
+++ b/crates/nu-cmd-plugin/src/util.rs
@@ -95,8 +95,9 @@ pub(crate) fn get_plugin_dirs(
     let working_set = StateWorkingSet::new(engine_state);
     let value = working_set
         .find_variable(b"$NU_PLUGIN_DIRS")
-        .and_then(|var_id| working_set.get_constant(var_id).ok().cloned())
-        .or_else(|| stack.get_env_var(engine_state, "NU_PLUGIN_DIRS"));
+        .and_then(|var_id| working_set.get_constant(var_id).ok())
+        .or_else(|| stack.get_env_var(engine_state, "NU_PLUGIN_DIRS"))
+        .cloned(); // TODO: avoid this clone
 
     // Get all of the strings in the list, if possible
     value
diff --git a/crates/nu-command/src/filesystem/cd.rs b/crates/nu-command/src/filesystem/cd.rs
index ed63f06d74..2af932bcb4 100644
--- a/crates/nu-command/src/filesystem/cd.rs
+++ b/crates/nu-command/src/filesystem/cd.rs
@@ -107,7 +107,7 @@ impl Command for Cd {
         // Set OLDPWD.
         // We're using `Stack::get_env_var()` instead of `EngineState::cwd()` to avoid a conversion roundtrip.
         if let Some(oldpwd) = stack.get_env_var(engine_state, "PWD") {
-            stack.add_env_var("OLDPWD".into(), oldpwd)
+            stack.add_env_var("OLDPWD".into(), oldpwd.clone())
         }
 
         match have_permission(&path) {
diff --git a/crates/nu-command/src/network/http/client.rs b/crates/nu-command/src/network/http/client.rs
index e53a1f4413..8dd4cc5601 100644
--- a/crates/nu-command/src/network/http/client.rs
+++ b/crates/nu-command/src/network/http/client.rs
@@ -314,7 +314,7 @@ fn send_form_request(
         Value::List { ref vals, .. } => {
             if vals.len() % 2 != 0 {
                 return Err(ShellErrorOrRequestError::ShellError(ShellError::IncorrectValue {
-                    msg: "Body type 'list' for form requests requires paired values. E.g.: [foo, 10]".into(), 
+                    msg: "Body type 'list' for form requests requires paired values. E.g.: [foo, 10]".into(),
                     val_span: body.span(),
                     call_span: span,
                 }));
@@ -901,6 +901,7 @@ fn retrieve_http_proxy_from_env(engine_state: &EngineState, stack: &mut Stack) -
         .or(stack.get_env_var(engine_state, "https_proxy"))
         .or(stack.get_env_var(engine_state, "HTTPS_PROXY"))
         .or(stack.get_env_var(engine_state, "ALL_PROXY"))
+        .cloned()
         .and_then(|proxy| proxy.coerce_into_string().ok())
 }
 
diff --git a/crates/nu-command/src/viewers/griddle.rs b/crates/nu-command/src/viewers/griddle.rs
index f75864b388..2774903d0f 100644
--- a/crates/nu-command/src/viewers/griddle.rs
+++ b/crates/nu-command/src/viewers/griddle.rs
@@ -69,7 +69,7 @@ prints out the list properly."#
         let icons_param: bool = call.has_flag(engine_state, stack, "icons")?;
         let config = &stack.get_config(engine_state);
         let env_str = match stack.get_env_var(engine_state, "LS_COLORS") {
-            Some(v) => Some(env_to_string("LS_COLORS", &v, engine_state, stack)?),
+            Some(v) => Some(env_to_string("LS_COLORS", v, engine_state, stack)?),
             None => None,
         };
 
diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index 5bdb847212..44e96eb060 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -623,7 +623,7 @@ fn handle_row_stream(
             let ls_colors_env_str = match input.stack.get_env_var(input.engine_state, "LS_COLORS") {
                 Some(v) => Some(env_to_string(
                     "LS_COLORS",
-                    &v,
+                    v,
                     input.engine_state,
                     input.stack,
                 )?),
diff --git a/crates/nu-engine/src/env.rs b/crates/nu-engine/src/env.rs
index f93e78af88..c4460f4695 100644
--- a/crates/nu-engine/src/env.rs
+++ b/crates/nu-engine/src/env.rs
@@ -240,7 +240,7 @@ pub fn path_str(
         }
     }?;
 
-    env_to_string(pathname, &pathval, engine_state, stack)
+    env_to_string(pathname, pathval, engine_state, stack)
 }
 
 pub const DIR_VAR_PARSER_INFO: &str = "dirs_var";
@@ -274,7 +274,7 @@ pub fn find_in_dirs_env(
 ) -> Result<Option<PathBuf>, ShellError> {
     // Choose whether to use file-relative or PWD-relative path
     let cwd = if let Some(pwd) = stack.get_env_var(engine_state, "FILE_PWD") {
-        match env_to_string("FILE_PWD", &pwd, engine_state, stack) {
+        match env_to_string("FILE_PWD", pwd, engine_state, stack) {
             Ok(cwd) => {
                 if Path::new(&cwd).is_absolute() {
                     cwd
@@ -294,7 +294,7 @@ pub fn find_in_dirs_env(
         engine_state.cwd_as_string(Some(stack))?
     };
 
-    let check_dir = |lib_dirs: Option<Value>| -> Option<PathBuf> {
+    let check_dir = |lib_dirs: Option<&Value>| -> Option<PathBuf> {
         if let Ok(p) = canonicalize_with(filename, &cwd) {
             return Some(p);
         }
@@ -316,7 +316,7 @@ pub fn find_in_dirs_env(
             .flatten()
     };
 
-    let lib_dirs = dirs_var.and_then(|var_id| engine_state.get_var(var_id).const_val.clone());
+    let lib_dirs = dirs_var.and_then(|var_id| engine_state.get_var(var_id).const_val.as_ref());
     // TODO: remove (see #8310)
     let lib_dirs_fallback = stack.get_env_var(engine_state, "NU_LIB_DIRS");
 
diff --git a/crates/nu-explore/src/nu_common/lscolor.rs b/crates/nu-explore/src/nu_common/lscolor.rs
index 393ace7883..7a3400dae0 100644
--- a/crates/nu-explore/src/nu_common/lscolor.rs
+++ b/crates/nu-explore/src/nu_common/lscolor.rs
@@ -11,7 +11,7 @@ use nu_utils::get_ls_colors;
 pub fn create_lscolors(engine_state: &EngineState, stack: &Stack) -> LsColors {
     let colors = stack
         .get_env_var(engine_state, "LS_COLORS")
-        .and_then(|v| env_to_string("LS_COLORS", &v, engine_state, stack).ok());
+        .and_then(|v| env_to_string("LS_COLORS", v, engine_state, stack).ok());
 
     get_ls_colors(colors)
 }
diff --git a/crates/nu-plugin-engine/src/context.rs b/crates/nu-plugin-engine/src/context.rs
index 4a6af0b879..4c262fd3ed 100644
--- a/crates/nu-plugin-engine/src/context.rs
+++ b/crates/nu-plugin-engine/src/context.rs
@@ -25,7 +25,7 @@ pub trait PluginExecutionContext: Send + Sync {
     /// Get plugin configuration
     fn get_plugin_config(&self) -> Result<Option<Value>, ShellError>;
     /// Get an environment variable from `$env`
-    fn get_env_var(&self, name: &str) -> Result<Option<Value>, ShellError>;
+    fn get_env_var(&self, name: &str) -> Result<Option<&Value>, ShellError>;
     /// Get all environment variables
     fn get_env_vars(&self) -> Result<HashMap<String, Value>, ShellError>;
     /// Get current working directory
@@ -125,7 +125,7 @@ impl<'a> PluginExecutionContext for PluginExecutionCommandContext<'a> {
             }))
     }
 
-    fn get_env_var(&self, name: &str) -> Result<Option<Value>, ShellError> {
+    fn get_env_var(&self, name: &str) -> Result<Option<&Value>, ShellError> {
         Ok(self.stack.get_env_var(&self.engine_state, name))
     }
 
@@ -300,7 +300,7 @@ impl PluginExecutionContext for PluginExecutionBogusContext {
         Ok(None)
     }
 
-    fn get_env_var(&self, _name: &str) -> Result<Option<Value>, ShellError> {
+    fn get_env_var(&self, _name: &str) -> Result<Option<&Value>, ShellError> {
         Err(ShellError::NushellFailed {
             msg: "get_env_var not implemented on bogus".into(),
         })
diff --git a/crates/nu-plugin-engine/src/interface/mod.rs b/crates/nu-plugin-engine/src/interface/mod.rs
index b27ea0be3d..93d75d0ec9 100644
--- a/crates/nu-plugin-engine/src/interface/mod.rs
+++ b/crates/nu-plugin-engine/src/interface/mod.rs
@@ -1276,7 +1276,9 @@ pub(crate) fn handle_engine_call(
         }
         EngineCall::GetEnvVar(name) => {
             let value = context.get_env_var(&name)?;
-            Ok(value.map_or_else(EngineCallResponse::empty, EngineCallResponse::value))
+            Ok(value
+                .cloned()
+                .map_or_else(EngineCallResponse::empty, EngineCallResponse::value))
         }
         EngineCall::GetEnvVars => context.get_env_vars().map(EngineCallResponse::ValueMap),
         EngineCall::GetCurrentDir => {
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index 665a79a329..ec616c3403 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -935,14 +935,14 @@ impl EngineState {
         let pwd = if let Some(stack) = stack {
             stack.get_env_var(self, "PWD")
         } else {
-            self.get_env_var("PWD").cloned()
+            self.get_env_var("PWD")
         };
 
         let pwd = pwd.ok_or_else(|| error("$env.PWD not found", ""))?;
 
-        if let Value::String { val, .. } = pwd {
-            let path = AbsolutePathBuf::try_from(val)
-                .map_err(|path| error("$env.PWD is not an absolute path", path))?;
+        if let Ok(pwd) = pwd.as_str() {
+            let path = AbsolutePathBuf::try_from(pwd)
+                .map_err(|_| error("$env.PWD is not an absolute path", pwd))?;
 
             // Technically, a root path counts as "having trailing slashes", but
             // for the purpose of PWD, a root path is acceptable.
diff --git a/crates/nu-protocol/src/engine/stack.rs b/crates/nu-protocol/src/engine/stack.rs
index 391e8633c8..296c2eee55 100644
--- a/crates/nu-protocol/src/engine/stack.rs
+++ b/crates/nu-protocol/src/engine/stack.rs
@@ -211,7 +211,7 @@ impl Stack {
     ///
     /// The config will be updated with successfully parsed values even if an error occurs.
     pub fn update_config(&mut self, engine_state: &EngineState) -> Result<(), ShellError> {
-        if let Some(mut config) = self.get_env_var(engine_state, "config") {
+        if let Some(mut config) = self.get_env_var(engine_state, "config").cloned() {
             let existing_config = self.get_config(engine_state);
             let (new_config, error) = config.parse_as_config(&existing_config);
             self.config = Some(new_config.into());
@@ -451,12 +451,16 @@ impl Stack {
         result
     }
 
-    pub fn get_env_var(&self, engine_state: &EngineState, name: &str) -> Option<Value> {
+    pub fn get_env_var<'a>(
+        &'a self,
+        engine_state: &'a EngineState,
+        name: &str,
+    ) -> Option<&'a Value> {
         for scope in self.env_vars.iter().rev() {
             for active_overlay in self.active_overlays.iter().rev() {
                 if let Some(env_vars) = scope.get(active_overlay) {
                     if let Some(v) = env_vars.get(name) {
-                        return Some(v.clone());
+                        return Some(v);
                     }
                 }
             }
@@ -472,7 +476,7 @@ impl Stack {
             if !is_hidden {
                 if let Some(env_vars) = engine_state.env_vars.get(active_overlay) {
                     if let Some(v) = env_vars.get(name) {
-                        return Some(v.clone());
+                        return Some(v);
                     }
                 }
             }
@@ -842,7 +846,9 @@ mod test {
         );
 
         assert_eq!(
-            original.get_env_var(&engine_state, "ADDED_IN_CHILD"),
+            original
+                .get_env_var(&engine_state, "ADDED_IN_CHILD")
+                .cloned(),
             Some(string_value("New Env Var")),
         );
     }
diff --git a/src/test_bins.rs b/src/test_bins.rs
index 2fef7e02b7..c4ba37ed8e 100644
--- a/src/test_bins.rs
+++ b/src/test_bins.rs
@@ -348,7 +348,7 @@ pub fn nu_repl() {
                 .coerce_str()
                 .unwrap_or_else(|err| outcome_err(&engine_state, &err));
             let _ = std::env::set_current_dir(path.as_ref());
-            engine_state.add_env_var("PWD".into(), cwd);
+            engine_state.add_env_var("PWD".into(), cwd.clone());
         }
         top_stack = Arc::new(Stack::with_changes_from_child(top_stack, stack));
     }

From 00709fc5bd69083ecefe40f535702984c19ffa1a Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Thu, 3 Oct 2024 07:28:22 -0400
Subject: [PATCH 0503/1072] Improves startup time when using std-lib (#13842)

Updated summary for commit
[612e0e2](https://github.com/nushell/nushell/pull/13842/commits/612e0e21602f55092bc121bfd07f7c3bf5119e4f)
- While folks are welcome to read through the entire comments, the core
information is summarized here.

# Description

This PR drastically improves startup times of Nushell by only parsing a
single submodule of the Standard Library that provides the `banner` and
`pwd` commands. All other Standard Library commands and submodules are
parsed when imported by the user. This cuts startup times by more than
60%.

At the moment, we have stopped adding to `std-lib` because every
addition adds a small amount to the Nushell startup time.
With this change, we should once again be able to allow new
functionality to be added to the Standard Library without it impacting
`nu` startup times.

# User-Facing Changes

* Nushell now starts about 60% faster
* Breaking change: The `dirs` (Shells) aliases will return a warning
message that it will not be auto-loaded in the following release, along
with instructions on how to restore it (and disable the message)
* The `use std <submodule> *` syntax is available for convenience, but
should be avoided in scripts as it parses the entire `std` module and
all other submodules and places it in scope. The correct syntax to
*just* load a submodule is `use std/<submodule> *` (asterisk optional).
The slash is important. This will be documented.
* `use std *` can be used for convenience to load all of the library but
still incurs the full loading-time.
* `std/dirs`: Semi-breaking change. The `dirs` command replaces the
`show` command. This is more in line with the directory-stack
functionality found in other shells. Existing users will not be impacted
by this as the alias (`shells`) remains the same.

* Breaking-change: Technically a breaking change, but probably only
impacts maintainers of `std`. The virtual path for the standard library
has changed. It could previously be imported using its virtual path (and
technically, this would have been the correct way to do it):

  ```nu
  use NU_STDLIB_VIRTUAL_DIR/std
  ```

  The path is now simply `std/`:

  ```nu
  use std
  ```

  All submodules have moved accordingly.


# Timings

Comparisons below were made:

* In a temporary, clean config directory using `$env.XDG_CONFIG_HOME =
(mktemp -d)`.
* `nu` was run with a release build
* `nu` was run one time to generate the default `config.nu` (etc.) files
- Otherwise timings would include the user-prompt
* The shell was exited and then restarted several times to get timing
samples

(Note: Old timings based on 0.97 rather than 0.98, but in the range of
being accurate)

| Scenario | `$nu.startup-time` |
| --- | --- |
| 0.97.2
([aaaab8e](https://github.com/nushell/nushell/commit/aaaab8e070c644a87bbd7682099e3fe9e6a4b42a))
Without this PR | 23ms - 24ms |
| This PR with deprecated commands | 9ms - <11ms |
| This PR after deprecated commands are removed in following release |
8ms - <10ms |
| Final PR (remove deprecated), using `--no-std-lib` | 6.1ms to 6.4ms |
| Final PR (remove deprecated), using `--no-config-file` | 3.1ms - 3.6ms
|
| Final PR (remove deprecated), using `--no-config-file --no-std-lib` |
1ms - 1.5ms |

*These last two timings point to the opportunity for further
optimization (see comment in thread below (will link once I write it).*

# Implementation details for future maintenance

* `use std banner` is a ridiculously deceptive call. That call parses
and imports *all* of `std` into scope. Simply replacing it with `use
std/core *` is essentially what saves ~14-15ms. This *only* imports the
submodule with the `banner` and `pwd` commands.

* From the code-comments, the reason that `NU_STDLIB_VIRTUAL_DIR` was
used as a prefix was so that there wouldn't be an issue if a user had a
`./std/mod.nu` in the current directory. This does **not** appear to be
an issue. After removing the prefix, I tested with both a relative
module as well as one in the `$env.NU_LIB_DIRS` path, and in all cases
the *internal* `std` still took precedence.

* By removing the prefix, users can now `use std` (and variants) without
requiring that it already be parsed and in scope.

* In the next release, we'll stop autoloading the `dirs` (shells)
functionality. While this only costs an additional 1-1.5ms, I think it's
better moved to the `config.nu` where the user can optionally remove it.
The main reason is its use of aliases (which have also caused issues) -
The `n`, `p`, and `g` short-commands are valuable real-estate, and users
may want to map these to something else.

For this release, there's an `deprecated_dirs` module that is still
autoloaded. As with the top-level commands, use of these will give a
deprecation warning with instructions on how to handle going forward.

To help with this, moved the aliases to their own submodule inside the
`dirs` module.

* Also sneaks in a small change where the top-level `dirs` command is
now the replacement for `dirs show`

* Fixed a double-import of `assert` in `dirs.nu`
* The `show_banner` step is replaced with simply `banner` rather than
re-importing it.

* A `virtual_path` may now be referenced with either a forward-slash or
a backward-slash on Windows. This allows `use std/<submodule>` to work
on all platforms.

# Performance side-notes:

* Future parsing and/or IR improvements should improve performance even
further.
* While the existing load time penalty of `std-lib` was not noticeable
on many systems, Nushell runs on a wide-variety of hardware and OS
platforms. Slower platforms will naturally see a bigger jump in
performance here. For users starting multiple Nushell sessions
frequently (e.g., `tmux`, Zellij, `screen`, et. al.) it is recommended
to keep total startup time (including user configuration) under ~250ms.

# Tests + Formatting

* All tests are green

* Updated tests:
- Removed the test that confirmed that `std` was loaded (since we
don't).
- Removed the `shells` test since it is not autoloaded. Main `dirs.nu`
functionality is tested through `stdlib-test`.
- Many tests assumed that the library was fully loaded, because it was
(even though we didn't intend for it to be). Fixed those tests.
- Tests now import only the necessary submodules (e.g., `use
std/assert`, rather than `use std assert`)
- Some tests *thought* they were loading `std/log`, but were doing so
improperly. This was masked by the now-fixed "load-everything-into-scope
bug". Local CI would pass due the `$env.NU_LOG_<...>` variables being
inherited from the calling process, but would fail in the "clean" GitHub
CI environment. These tests have also been fixed.

 * Added additional tests for the changes

# After Submitting

Will update the Standard Library doc page
---
 crates/nu-cli/src/repl.rs                     |   2 +-
 .../src/engine/state_working_set.rs           |   7 +-
 crates/nu-std/src/lib.rs                      |  44 +--
 crates/nu-std/std/bench.nu                    |  71 +++++
 crates/nu-std/std/core.nu                     |  33 +++
 crates/nu-std/std/deprecated_dirs.nu          | 161 +++++++++++
 crates/nu-std/std/dirs.nu                     |  62 ++--
 crates/nu-std/std/lib.nu                      | 124 ++++++++
 crates/nu-std/std/mod.nu                      | 269 ++----------------
 crates/nu-std/testing.nu                      |   6 +-
 .../tests/logger_tests/test_basic_commands.nu |   6 +-
 .../tests/logger_tests/test_log_custom.nu     |  11 +-
 .../logger_tests/test_log_format_flag.nu      |   7 +-
 .../tests/logger_tests/test_logger_env.nu     |   5 +-
 crates/nu-std/tests/test_asserts.nu           |   1 +
 crates/nu-std/tests/test_core.nu              |   7 +
 crates/nu-std/tests/test_dirs.nu              |  20 +-
 crates/nu-std/tests/test_dt.nu                |   4 +-
 crates/nu-std/tests/test_formats.nu           |  22 +-
 crates/nu-std/tests/test_help.nu              |   4 +-
 crates/nu-std/tests/test_iter.nu              |   1 +
 .../nu-std/tests/{test_std.nu => test_lib.nu} |  36 ++-
 crates/nu-std/tests/test_setup_teardown.nu    |   4 +-
 crates/nu-std/tests/test_std_postload.nu      |  11 +
 crates/nu-std/tests/test_std_preload.nu       |  11 +
 crates/nu-std/tests/test_xml.nu               |   6 +-
 tests/repl/test_stdlib.rs                     |  12 +-
 tests/shell/environment/env.rs                |   6 +-
 28 files changed, 578 insertions(+), 375 deletions(-)
 create mode 100644 crates/nu-std/std/bench.nu
 create mode 100644 crates/nu-std/std/core.nu
 create mode 100644 crates/nu-std/std/deprecated_dirs.nu
 create mode 100644 crates/nu-std/std/lib.nu
 create mode 100644 crates/nu-std/tests/test_core.nu
 rename crates/nu-std/tests/{test_std.nu => test_lib.nu} (73%)
 create mode 100644 crates/nu-std/tests/test_std_postload.nu
 create mode 100644 crates/nu-std/tests/test_std_preload.nu

diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 3e2b01cfd1..4ea650074e 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -159,7 +159,7 @@ pub fn evaluate_repl(
         eval_source(
             engine_state,
             &mut unique_stack,
-            r#"use std banner; banner"#.as_bytes(),
+            r#"banner"#.as_bytes(),
             "show_banner",
             PipelineData::empty(),
             false,
diff --git a/crates/nu-protocol/src/engine/state_working_set.rs b/crates/nu-protocol/src/engine/state_working_set.rs
index 5735684f19..8c500ddd65 100644
--- a/crates/nu-protocol/src/engine/state_working_set.rs
+++ b/crates/nu-protocol/src/engine/state_working_set.rs
@@ -1007,14 +1007,17 @@ impl<'a> StateWorkingSet<'a> {
     }
 
     pub fn find_virtual_path(&self, name: &str) -> Option<&VirtualPath> {
+        // Platform appropriate virtual path (slashes or backslashes)
+        let virtual_path_name = Path::new(name);
+
         for (virtual_name, virtual_path) in self.delta.virtual_paths.iter().rev() {
-            if virtual_name == name {
+            if Path::new(virtual_name) == virtual_path_name {
                 return Some(virtual_path);
             }
         }
 
         for (virtual_name, virtual_path) in self.permanent_state.virtual_paths.iter().rev() {
-            if virtual_name == name {
+            if Path::new(virtual_name) == virtual_path_name {
                 return Some(virtual_path);
             }
         }
diff --git a/crates/nu-std/src/lib.rs b/crates/nu-std/src/lib.rs
index 67c12b735d..ec5ced55ec 100644
--- a/crates/nu-std/src/lib.rs
+++ b/crates/nu-std/src/lib.rs
@@ -9,30 +9,33 @@ use nu_protocol::{
 };
 use std::path::PathBuf;
 
-// Virtual std directory unlikely to appear in user's file system
-const NU_STDLIB_VIRTUAL_DIR: &str = "NU_STDLIB_VIRTUAL_DIR";
-
 pub fn load_standard_library(
     engine_state: &mut nu_protocol::engine::EngineState,
 ) -> Result<(), miette::ErrReport> {
     trace!("load_standard_library");
     let (block, delta) = {
-        // Using full virtual path to avoid potential conflicts with user having 'std' directory
-        // in their working directory.
-        let std_dir = PathBuf::from(NU_STDLIB_VIRTUAL_DIR).join("std");
+        let std_dir = PathBuf::from("std");
 
         let mut std_files = vec![
+            // Loaded at startup
+            ("core", include_str!("../std/core.nu")),
+            // std module - Loads all commands and submodules
             ("mod.nu", include_str!("../std/mod.nu")),
-            ("dirs.nu", include_str!("../std/dirs.nu")),
-            ("dt.nu", include_str!("../std/dt.nu")),
-            ("help.nu", include_str!("../std/help.nu")),
-            ("iter.nu", include_str!("../std/iter.nu")),
-            ("log.nu", include_str!("../std/log.nu")),
-            ("assert.nu", include_str!("../std/assert.nu")),
-            ("xml.nu", include_str!("../std/xml.nu")),
-            ("input.nu", include_str!("../std/input.nu")),
-            ("math.nu", include_str!("../std/math.nu")),
-            ("formats.nu", include_str!("../std/formats.nu")),
+            // std submodules
+            ("assert", include_str!("../std/assert.nu")),
+            ("bench", include_str!("../std/bench.nu")),
+            ("dirs", include_str!("../std/dirs.nu")),
+            ("dt", include_str!("../std/dt.nu")),
+            ("formats", include_str!("../std/formats.nu")),
+            ("help", include_str!("../std/help.nu")),
+            ("input", include_str!("../std/input.nu")),
+            ("iter", include_str!("../std/iter.nu")),
+            ("log", include_str!("../std/log.nu")),
+            ("math", include_str!("../std/math.nu")),
+            ("lib", include_str!("../std/lib.nu")),
+            ("xml", include_str!("../std/xml.nu")),
+            // Remove in following release
+            ("deprecated_dirs", include_str!("../std/deprecated_dirs.nu")),
         ];
 
         let mut working_set = StateWorkingSet::new(engine_state);
@@ -52,11 +55,9 @@ pub fn load_standard_library(
 
         let std_dir = std_dir.to_string_lossy().to_string();
         let source = r#"
-# Define the `std` module
-module std
-
 # Prelude
-use std dirs [
+use std/core *
+use std/deprecated_dirs [
     enter
     shells
     g
@@ -64,14 +65,13 @@ use std dirs [
     p
     dexit
 ]
-use std pwd
 "#;
 
         let _ = working_set.add_virtual_path(std_dir, VirtualPath::Dir(std_virt_paths));
 
         // Add a placeholder file to the stack of files being evaluated.
         // The name of this file doesn't matter; it's only there to set the current working directory to NU_STDLIB_VIRTUAL_DIR.
-        let placeholder = PathBuf::from(NU_STDLIB_VIRTUAL_DIR).join("loading stdlib");
+        let placeholder = PathBuf::from("load std/core");
         working_set.files = FileStack::with_file(placeholder);
 
         let block = parse(
diff --git a/crates/nu-std/std/bench.nu b/crates/nu-std/std/bench.nu
new file mode 100644
index 0000000000..61baa21a2f
--- /dev/null
+++ b/crates/nu-std/std/bench.nu
@@ -0,0 +1,71 @@
+# run a piece of `nushell` code multiple times and measure the time of execution.
+#
+# this command returns a benchmark report of the following form:
+# ```
+# record<
+#   mean: duration
+#   std: duration
+#   times: list<duration>
+# >
+# ```
+#
+# > **Note**
+# > `std bench --pretty` will return a `string`.
+#
+# # Examples
+#     measure the performance of simple addition
+#     > std bench { 1 + 2 } -n 10 | table -e
+#     ╭───────┬────────────────────╮
+#     │ mean  │ 4µs 956ns          │
+#     │ std   │ 4µs 831ns          │
+#     │       │ ╭───┬────────────╮ │
+#     │ times │ │ 0 │ 19µs 402ns │ │
+#     │       │ │ 1 │  4µs 322ns │ │
+#     │       │ │ 2 │  3µs 352ns │ │
+#     │       │ │ 3 │  2µs 966ns │ │
+#     │       │ │ 4 │        3µs │ │
+#     │       │ │ 5 │   3µs 86ns │ │
+#     │       │ │ 6 │   3µs 84ns │ │
+#     │       │ │ 7 │  3µs 604ns │ │
+#     │       │ │ 8 │   3µs 98ns │ │
+#     │       │ │ 9 │  3µs 653ns │ │
+#     │       │ ╰───┴────────────╯ │
+#     ╰───────┴────────────────────╯
+#
+#     get a pretty benchmark report
+#     > std bench { 1 + 2 } --pretty
+#     3µs 125ns +/- 2µs 408ns
+export def main [
+    code: closure  # the piece of `nushell` code to measure the performance of
+    --rounds (-n): int = 50  # the number of benchmark rounds (hopefully the more rounds the less variance)
+    --verbose (-v) # be more verbose (namely prints the progress)
+    --pretty # shows the results in human-readable format: "<mean> +/- <stddev>"
+] {
+    let times = (
+        seq 1 $rounds | each {|i|
+            if $verbose { print -n $"($i) / ($rounds)\r" }
+            timeit { do $code } | into int | into float
+        }
+    )
+
+    if $verbose { print $"($rounds) / ($rounds)" }
+
+    let report = {
+        mean: ($times | math avg | from ns)
+        min: ($times | math min | from ns)
+        max: ($times | math max | from ns)
+        std: ($times | math stddev | from ns)
+        times: ($times | each { from ns })
+    }
+
+    if $pretty {
+        $"($report.mean) +/- ($report.std)"
+    } else {
+        $report
+    }
+}
+
+# convert an integer amount of nanoseconds to a real duration
+def "from ns" [] {
+    [$in "ns"] | str join | into duration
+}
\ No newline at end of file
diff --git a/crates/nu-std/std/core.nu b/crates/nu-std/std/core.nu
new file mode 100644
index 0000000000..1a777bcd0f
--- /dev/null
+++ b/crates/nu-std/std/core.nu
@@ -0,0 +1,33 @@
+use dt [datetime-diff, pretty-print-duration]
+
+# Print a banner for nushell with information about the project
+export def banner [] {
+let dt = (datetime-diff (date now) 2019-05-10T09:59:12-07:00)
+$"(ansi green)     __  ,(ansi reset)
+(ansi green) .--\(\)°'.' (ansi reset)Welcome to (ansi green)Nushell(ansi reset),
+(ansi green)'|, . ,'   (ansi reset)based on the (ansi green)nu(ansi reset) language,
+(ansi green) !_-\(_\\    (ansi reset)where all data is structured!
+
+Please join our (ansi purple)Discord(ansi reset) community at (ansi purple)https://discord.gg/NtAbbGn(ansi reset)
+Our (ansi green_bold)GitHub(ansi reset) repository is at (ansi green_bold)https://github.com/nushell/nushell(ansi reset)
+Our (ansi green)Documentation(ansi reset) is located at (ansi green)https://nushell.sh(ansi reset)
+(ansi cyan)Tweet(ansi reset) us at (ansi cyan_bold)@nu_shell(ansi reset)
+Learn how to remove this at: (ansi green)https://nushell.sh/book/configuration.html#remove-welcome-message(ansi reset)
+
+It's been this long since (ansi green)Nushell(ansi reset)'s first commit:
+(pretty-print-duration $dt)
+
+Startup Time: ($nu.startup-time)
+"
+}
+
+# Return the current working directory
+export def pwd [
+    --physical (-P) # resolve symbolic links
+] {
+    if $physical {
+        $env.PWD | path expand
+    } else {
+        $env.PWD
+    }
+}
diff --git a/crates/nu-std/std/deprecated_dirs.nu b/crates/nu-std/std/deprecated_dirs.nu
new file mode 100644
index 0000000000..4fc4e944ba
--- /dev/null
+++ b/crates/nu-std/std/deprecated_dirs.nu
@@ -0,0 +1,161 @@
+# Maintain a list of working directories and navigate them
+
+# The directory stack.
+#
+# Exception: the entry for the current directory contains an
+# irrelevant value. Instead, the source of truth for the working
+# directory is $env.PWD. It has to be this way because cd doesn't
+# know about this module.
+#
+# Example: the following state represents a user-facing directory
+# stack of [/a, /var/tmp, /c], and we are currently in /var/tmp .
+#
+#     PWD = /var/tmp
+#     DIRS_POSITION = 1
+#     DIRS_LIST = [/a, /b, /c]
+#
+# This situation could arise if we started with [/a, /b, /c], then
+# we changed directories from /b to /var/tmp.
+export-env {
+    $env.DIRS_POSITION = 0
+    $env.DIRS_LIST = [($env.PWD | path expand)]
+}
+
+def deprecation_warning [ ] {
+print -e $"
+(ansi red)Warning:(ansi reset) The 'std dirs' module will no longer automatically
+be loaded in the next release. To continue using the Shells
+feature, and to remove this warning, please add the following
+to your config.nu:
+
+use std/dirs shells-aliases *
+
+Or see the documentation for more options.
+"
+}
+
+# Add one or more directories to the list.
+# PWD becomes first of the newly added directories.
+export def --env add [
+    ...paths: string    # directory or directories to add to working list
+] {
+    deprecation_warning
+
+    mut abspaths = []
+    for p in $paths {
+        let exp = ($p | path expand)
+        if ($exp | path type) != 'dir' {
+            let span = (metadata $p).span
+            error make {msg: "not a directory", label: {text: "not a directory", span: $span } }
+        }
+        $abspaths = ($abspaths | append $exp)
+    }
+
+    $env.DIRS_LIST = ($env.DIRS_LIST | insert ($env.DIRS_POSITION + 1) $abspaths | flatten)
+
+    _fetch 1
+}
+
+export alias enter = add
+
+# Advance to the next directory in the list or wrap to beginning.
+export def --env next [
+    N:int = 1   # number of positions to move.
+] {
+    deprecation_warning
+    _fetch $N
+}
+
+export alias n = next
+
+# Back up to the previous directory or wrap to the end.
+export def --env prev [
+    N:int = 1   # number of positions to move.
+] {
+    deprecation_warning
+    _fetch (-1 * $N)
+}
+
+export alias p = prev
+
+# Drop the current directory from the list, if it's not the only one.
+# PWD becomes the next working directory
+export def --env drop [] {
+    deprecation_warning
+    if ($env.DIRS_LIST | length) > 1 {
+        $env.DIRS_LIST = ($env.DIRS_LIST | reject $env.DIRS_POSITION)
+        if ($env.DIRS_POSITION >= ($env.DIRS_LIST | length)) {$env.DIRS_POSITION = 0}
+    }
+
+    # step to previous slot
+    _fetch -1 --forget_current --always_cd
+
+}
+
+export alias dexit = drop
+
+# Display current working directories.
+export def --env show [] {
+    deprecation_warning
+    mut out = []
+    for $p in ($env.DIRS_LIST | enumerate) {
+        let is_act_slot = $p.index == $env.DIRS_POSITION
+        $out = ($out | append [
+            [active, path];
+            [($is_act_slot),
+            (if $is_act_slot {$env.PWD} else {$p.item})   # show current PWD in lieu of active slot
+            ]
+        ])
+    }
+
+    $out
+}
+
+export alias shells = show
+
+export def --env goto [shell?: int] {
+    deprecation_warning
+    if $shell == null {
+        return (show)
+    }
+
+    if $shell < 0 or $shell >= ($env.DIRS_LIST | length) {
+        let span = (metadata $shell | get span)
+        error make {
+            msg: $"(ansi red_bold)invalid_shell_index(ansi reset)"
+            label: {
+                text: $"`shell` should be between 0 and (($env.DIRS_LIST | length) - 1)"
+                span: $span
+            }
+        }
+    }
+
+    _fetch ($shell - $env.DIRS_POSITION)
+}
+
+export alias g = goto
+
+# fetch item helper
+def --env _fetch [
+    offset: int,        # signed change to position
+    --forget_current    # true to skip saving PWD
+    --always_cd         # true to always cd
+] {
+    if not ($forget_current) {
+        # first record current working dir in current slot of ring, to track what CD may have done.
+        $env.DIRS_LIST = ($env.DIRS_LIST | upsert $env.DIRS_POSITION $env.PWD)
+    }
+
+    # figure out which entry to move to
+    # nushell 'mod' operator is really 'remainder', can return negative values.
+    # see: https://stackoverflow.com/questions/13683563/whats-the-difference-between-mod-and-remainder
+    let len = ($env.DIRS_LIST | length)
+    mut pos = ($env.DIRS_POSITION + $offset) mod $len
+    if ($pos < 0) { $pos += $len}
+
+    # if using a different position in ring, CD there.
+    if ($always_cd or $pos != $env.DIRS_POSITION) {
+        $env.DIRS_POSITION = $pos
+        cd ($env.DIRS_LIST | get $pos )
+    }
+}
diff --git a/crates/nu-std/std/dirs.nu b/crates/nu-std/std/dirs.nu
index bf935a84b9..a26128a5d7 100644
--- a/crates/nu-std/std/dirs.nu
+++ b/crates/nu-std/std/dirs.nu
@@ -22,7 +22,8 @@ export-env {
 }
 
 # Add one or more directories to the list.
-# PWD becomes first of the newly added directories.
+# The first directory listed becomes the new
+# active directory.
 export def --env add [
     ...paths: string    # directory or directories to add to working list
     ] {
@@ -38,32 +39,33 @@ export def --env add [
 
         $env.DIRS_LIST = ($env.DIRS_LIST | insert ($env.DIRS_POSITION + 1) $abspaths | flatten)
 
-
     _fetch 1
 }
 
-export alias enter = add
-
-# Advance to the next directory in the list or wrap to beginning.
+# Make the next directory on the list the active directory.
+# If the currenta ctive directory is the last in the list, 
+# then cycle to the top of the list.
 export def --env next [
     N:int = 1   # number of positions to move.
 ] {
     _fetch $N
 }
 
-export alias n = next
-
-# Back up to the previous directory or wrap to the end.
+# Make the previous directory on the list the active directory.
+# If the current active directory is the first in the list, 
+# then cycle to the end of the list.
 export def --env prev [
     N:int = 1   # number of positions to move.
 ] {
     _fetch (-1 * $N)
 }
 
-export alias p = prev
-
-# Drop the current directory from the list, if it's not the only one.
-# PWD becomes the next working directory
+# Drop the current directory from the list.
+# The previous directory in the list becomes
+# the new active directory.
+#
+# If there is only one directory in the list,
+# then this command has no effect.
 export def --env drop [] {
     if ($env.DIRS_LIST | length) > 1 {
         $env.DIRS_LIST = ($env.DIRS_LIST | reject $env.DIRS_POSITION)
@@ -75,10 +77,8 @@ export def --env drop [] {
 
 }
 
-export alias dexit = drop
-
-# Display current working directories.
-export def --env show [] {
+# Display current working directories
+export def --env main [] {
     mut out = []
     for $p in ($env.DIRS_LIST | enumerate) {
         let is_act_slot = $p.index == $env.DIRS_POSITION
@@ -93,29 +93,26 @@ export def --env show [] {
     $out
 }
 
-export alias shells = show
-
-export def --env goto [shell?: int] {
-    if $shell == null {
-        return (show)
+# Jump to directory by index
+export def --env goto [dir_idx?: int] {
+    if $dir_idx == null {
+        return (main)
     }
 
-    if $shell < 0 or $shell >= ($env.DIRS_LIST | length) {
-        let span = (metadata $shell | get span)
+    if $dir_idx < 0 or $dir_idx >= ($env.DIRS_LIST | length) {
+        let span = (metadata $dir_idx | get span)
         error make {
-            msg: $"(ansi red_bold)invalid_shell_index(ansi reset)"
+            msg: $"(ansi red_bold)invalid_dirs_index(ansi reset)"
             label: {
-                text: $"`shell` should be between 0 and (($env.DIRS_LIST | length) - 1)"
+                text: $"`idx` should be between 0 and (($env.DIRS_LIST | length) - 1)"
                 span: $span
             }
         }
     }
 
-    _fetch ($shell - $env.DIRS_POSITION)
+    _fetch ($dir_idx - $env.DIRS_POSITION)
 }
 
-export alias g = goto
-
 # fetch item helper
 def --env _fetch [
     offset: int,        # signed change to position
@@ -140,3 +137,12 @@ def --env _fetch [
         cd ($env.DIRS_LIST | get $pos )
     }
 }
+
+export module shells-aliases {
+    export alias shells = main
+    export alias enter = add
+    export alias dexit = drop
+    export alias p = prev
+    export alias n = next
+    export alias g = goto
+}
\ No newline at end of file
diff --git a/crates/nu-std/std/lib.nu b/crates/nu-std/std/lib.nu
new file mode 100644
index 0000000000..c6b332c396
--- /dev/null
+++ b/crates/nu-std/std/lib.nu
@@ -0,0 +1,124 @@
+# Add the given paths to the PATH.
+#
+# # Example
+# - adding some dummy paths to an empty PATH
+# ```nushell
+# >_ with-env { PATH: [] } {
+#     std path add "foo"
+#     std path add "bar" "baz"
+#     std path add "fooo" --append
+#
+#     assert equal $env.PATH ["bar" "baz" "foo" "fooo"]
+#
+#     print (std path add "returned" --ret)
+# }
+# ╭───┬──────────╮
+# │ 0 │ returned │
+# │ 1 │ bar      │
+# │ 2 │ baz      │
+# │ 3 │ foo      │
+# │ 4 │ fooo     │
+# ╰───┴──────────╯
+# ```
+# - adding paths based on the operating system
+# ```nushell
+# >_ std path add {linux: "foo", windows: "bar", darwin: "baz"}
+# ```
+export def --env "path add" [
+    --ret (-r)  # return $env.PATH, useful in pipelines to avoid scoping.
+    --append (-a)  # append to $env.PATH instead of prepending to.
+    ...paths  # the paths to add to $env.PATH.
+] {
+    let span = (metadata $paths).span
+    let paths = $paths | flatten
+
+    if ($paths | is-empty) or ($paths | length) == 0 {
+        error make {msg: "Empty input", label: {
+            text: "Provide at least one string or a record",
+            span: $span
+        }}
+    }
+
+    let path_name = if "PATH" in $env { "PATH" } else { "Path" }
+
+    let paths = $paths | each {|p|
+        let p = match ($p | describe | str replace --regex '<.*' '') {
+            "string" => $p,
+            "record" => { $p | get --ignore-errors $nu.os-info.name },
+        }
+
+        $p | path expand --no-symlink
+    }
+
+    if null in $paths or ($paths | is-empty) {
+        error make {msg: "Empty input", label: {
+            text: $"Received a record, that does not contain a ($nu.os-info.name) key",
+            span: $span
+        }}
+    }
+
+    load-env {$path_name: (
+        $env
+            | get $path_name
+            | split row (char esep)
+            | if $append { append $paths } else { prepend $paths }
+    )}
+
+    if $ret {
+        $env | get $path_name
+    }
+}
+
+# the cute and friendly mascot of Nushell :)
+export def ellie [] {
+    let ellie = [
+        "     __  ,",
+        " .--()°'.'",
+        "'|, . ,'",
+        " !_-(_\\",
+    ]
+
+    $ellie | str join "\n" | $"(ansi green)($in)(ansi reset)"
+}
+
+# repeat anything a bunch of times, yielding a list of *n* times the input
+#
+# # Examples
+#     repeat a string
+#     > "foo" | std repeat 3 | str join
+#     "foofoofoo"
+export def repeat [
+    n: int  # the number of repetitions, must be positive
+]: any -> list<any> {
+    let item = $in
+
+    if $n < 0 {
+        let span = metadata $n | get span
+        error make {
+            msg: $"(ansi red_bold)invalid_argument(ansi reset)"
+            label: {
+                text: $"n should be a positive integer, found ($n)"
+            	span: $span
+            }
+        }
+    }
+
+    if $n == 0 {
+        return []
+    }
+
+    1..$n | each { $item }
+}
+
+# return a null device file.
+#
+# # Examples
+#     run a command and ignore it's stderr output
+#     > cat xxx.txt e> (null-device)
+export def null-device []: nothing -> path {
+    if ($nu.os-info.name | str downcase) == "windows" {
+        '\\.\NUL'
+    } else {
+        "/dev/null"
+    }
+}
diff --git a/crates/nu-std/std/mod.nu b/crates/nu-std/std/mod.nu
index 4d4f2bb0f1..c0d49d1685 100644
--- a/crates/nu-std/std/mod.nu
+++ b/crates/nu-std/std/mod.nu
@@ -1,247 +1,28 @@
 # std.nu, `used` to load all standard library components
 
-export module assert.nu
-export module dirs.nu
-export module dt.nu
-export module formats.nu
-export module help.nu
-export module input.nu
-export module iter.nu
-export module log.nu
-export module math.nu
-export module xml.nu
-export-env {
-    use dirs.nu []
-    use log.nu []
-}
-
-use dt.nu [datetime-diff, pretty-print-duration]
-
-# Add the given paths to the PATH.
-#
-# # Example
-# - adding some dummy paths to an empty PATH
-# ```nushell
-# >_ with-env { PATH: [] } {
-#     std path add "foo"
-#     std path add "bar" "baz"
-#     std path add "fooo" --append
-#
-#     assert equal $env.PATH ["bar" "baz" "foo" "fooo"]
-#
-#     print (std path add "returned" --ret)
-# }
-# ╭───┬──────────╮
-# │ 0 │ returned │
-# │ 1 │ bar      │
-# │ 2 │ baz      │
-# │ 3 │ foo      │
-# │ 4 │ fooo     │
-# ╰───┴──────────╯
-# ```
-# - adding paths based on the operating system
-# ```nushell
-# >_ std path add {linux: "foo", windows: "bar", darwin: "baz"}
-# ```
-export def --env "path add" [
-    --ret (-r)  # return $env.PATH, useful in pipelines to avoid scoping.
-    --append (-a)  # append to $env.PATH instead of prepending to.
-    ...paths  # the paths to add to $env.PATH.
-] {
-    let span = (metadata $paths).span
-    let paths = $paths | flatten
-
-    if ($paths | is-empty) or ($paths | length) == 0 {
-        error make {msg: "Empty input", label: {
-            text: "Provide at least one string or a record",
-            span: $span
-        }}
-    }
-
-    let path_name = if "PATH" in $env { "PATH" } else { "Path" }
-
-    let paths = $paths | each {|p|
-        let p = match ($p | describe | str replace --regex '<.*' '') {
-            "string" => $p,
-            "record" => { $p | get --ignore-errors $nu.os-info.name },
-        }
-
-        $p | path expand --no-symlink
-    }
-
-    if null in $paths or ($paths | is-empty) {
-        error make {msg: "Empty input", label: {
-            text: $"Received a record, that does not contain a ($nu.os-info.name) key",
-            span: $span
-        }}
-    }
-
-    load-env {$path_name: (
-        $env
-            | get $path_name
-            | split row (char esep)
-            | if $append { append $paths } else { prepend $paths }
-    )}
-
-    if $ret {
-        $env | get $path_name
-    }
-}
-
-# convert an integer amount of nanoseconds to a real duration
-def "from ns" [] {
-    [$in "ns"] | str join | into duration
-}
-
-# run a piece of `nushell` code multiple times and measure the time of execution.
-#
-# this command returns a benchmark report of the following form:
-# ```
-# record<
-#   mean: duration
-#   std: duration
-#   times: list<duration>
-# >
-# ```
-#
-# > **Note**
-# > `std bench --pretty` will return a `string`.
-#
-# # Examples
-#     measure the performance of simple addition
-#     > std bench { 1 + 2 } -n 10 | table -e
-#     ╭───────┬────────────────────╮
-#     │ mean  │ 4µs 956ns          │
-#     │ std   │ 4µs 831ns          │
-#     │       │ ╭───┬────────────╮ │
-#     │ times │ │ 0 │ 19µs 402ns │ │
-#     │       │ │ 1 │  4µs 322ns │ │
-#     │       │ │ 2 │  3µs 352ns │ │
-#     │       │ │ 3 │  2µs 966ns │ │
-#     │       │ │ 4 │        3µs │ │
-#     │       │ │ 5 │   3µs 86ns │ │
-#     │       │ │ 6 │   3µs 84ns │ │
-#     │       │ │ 7 │  3µs 604ns │ │
-#     │       │ │ 8 │   3µs 98ns │ │
-#     │       │ │ 9 │  3µs 653ns │ │
-#     │       │ ╰───┴────────────╯ │
-#     ╰───────┴────────────────────╯
-#
-#     get a pretty benchmark report
-#     > std bench { 1 + 2 } --pretty
-#     3µs 125ns +/- 2µs 408ns
-export def bench [
-    code: closure  # the piece of `nushell` code to measure the performance of
-    --rounds (-n): int = 50  # the number of benchmark rounds (hopefully the more rounds the less variance)
-    --verbose (-v) # be more verbose (namely prints the progress)
-    --pretty # shows the results in human-readable format: "<mean> +/- <stddev>"
-] {
-    let times = (
-        seq 1 $rounds | each {|i|
-            if $verbose { print -n $"($i) / ($rounds)\r" }
-            timeit { do $code } | into int | into float
-        }
-    )
-
-    if $verbose { print $"($rounds) / ($rounds)" }
-
-    let report = {
-        mean: ($times | math avg | from ns)
-        min: ($times | math min | from ns)
-        max: ($times | math max | from ns)
-        std: ($times | math stddev | from ns)
-        times: ($times | each { from ns })
-    }
-
-    if $pretty {
-        $"($report.mean) +/- ($report.std)"
-    } else {
-        $report
-    }
-}
-
-# Print a banner for nushell with information about the project
-export def banner [] {
-let dt = (datetime-diff (date now) 2019-05-10T09:59:12-07:00)
-$"(ansi green)     __  ,(ansi reset)
-(ansi green) .--\(\)°'.' (ansi reset)Welcome to (ansi green)Nushell(ansi reset),
-(ansi green)'|, . ,'   (ansi reset)based on the (ansi green)nu(ansi reset) language,
-(ansi green) !_-\(_\\    (ansi reset)where all data is structured!
-
-Please join our (ansi purple)Discord(ansi reset) community at (ansi purple)https://discord.gg/NtAbbGn(ansi reset)
-Our (ansi green_bold)GitHub(ansi reset) repository is at (ansi green_bold)https://github.com/nushell/nushell(ansi reset)
-Our (ansi green)Documentation(ansi reset) is located at (ansi green)https://nushell.sh(ansi reset)
-(ansi cyan)Tweet(ansi reset) us at (ansi cyan_bold)@nu_shell(ansi reset)
-Learn how to remove this at: (ansi green)https://nushell.sh/book/configuration.html#remove-welcome-message(ansi reset)
-
-It's been this long since (ansi green)Nushell(ansi reset)'s first commit:
-(pretty-print-duration $dt)
-
-Startup Time: ($nu.startup-time)
-"
-}
-
-# the cute and friendly mascot of Nushell :)
-export def ellie [] {
-    let ellie = [
-        "     __  ,",
-        " .--()°'.'",
-        "'|, . ,'",
-        " !_-(_\\",
-    ]
-
-    $ellie | str join "\n" | $"(ansi green)($in)(ansi reset)"
-}
-
-# Return the current working directory
-export def pwd [
-    --physical (-P) # resolve symbolic links
-] {
-    if $physical {
-        $env.PWD | path expand
-    } else {
-        $env.PWD
-    }
-}
-
-# repeat anything a bunch of times, yielding a list of *n* times the input
-#
-# # Examples
-#     repeat a string
-#     > "foo" | std repeat 3 | str join
-#     "foofoofoo"
-export def repeat [
-    n: int  # the number of repetitions, must be positive
-]: any -> list<any> {
-    let item = $in
-
-    if $n < 0 {
-        let span = metadata $n | get span
-        error make {
-            msg: $"(ansi red_bold)invalid_argument(ansi reset)"
-            label: {
-                text: $"n should be a positive integer, found ($n)"
-            	span: $span
-            }
-        }
-    }
-
-    if $n == 0 {
-        return []
-    }
-
-    1..$n | each { $item }
-}
-
-# return a null device file.
-#
-# # Examples
-#     run a command and ignore it's stderr output
-#     > cat xxx.txt e> (null-device)
-export def null-device []: nothing -> path {
-    if ($nu.os-info.name | str downcase) == "windows" {
-        '\\.\NUL'
-    } else {
-        "/dev/null"
-    }
+# Top-level commands: ellie, repeat, null-device, and "path add"
+export use lib *
+
+# std submodules
+export module assert
+export module bench
+export module dt
+export module formats
+export module help
+export module input
+export module iter
+export module log
+export module math
+export module xml
+
+# Load main dirs command and all subcommands
+export use dirs main
+export module dirs {
+  export use dirs [
+    add
+    drop
+    next
+    prev
+    goto
+  ]
 }
diff --git a/crates/nu-std/testing.nu b/crates/nu-std/testing.nu
index 489430e462..003e1d1ebc 100644
--- a/crates/nu-std/testing.nu
+++ b/crates/nu-std/testing.nu
@@ -1,4 +1,8 @@
-use std log
+use std/log
+export-env {
+    # Place NU_FORMAT... environment variables in module-scope
+    export use std/log *
+}
 
 def "nu-complete threads" [] {
     seq 1 (sys cpu | length)
diff --git a/crates/nu-std/tests/logger_tests/test_basic_commands.nu b/crates/nu-std/tests/logger_tests/test_basic_commands.nu
index cd1d4f3e08..3e22e10bb2 100644
--- a/crates/nu-std/tests/logger_tests/test_basic_commands.nu
+++ b/crates/nu-std/tests/logger_tests/test_basic_commands.nu
@@ -1,4 +1,4 @@
-use std *
+use std/assert
 
 def run [
     system_level,
@@ -6,9 +6,9 @@ def run [
     --short
 ] {
     if $short {
-        ^$nu.current-exe --no-config-file --commands $'use std; NU_LOG_LEVEL=($system_level) std log ($message_level) --short "test message"'
+        ^$nu.current-exe --no-config-file --commands $'use std; use std/log; NU_LOG_LEVEL=($system_level) log ($message_level) --short "test message"'
     } else {
-        ^$nu.current-exe --no-config-file --commands $'use std; NU_LOG_LEVEL=($system_level) std log ($message_level) "test message"'
+        ^$nu.current-exe --no-config-file --commands $'use std; use std/log; NU_LOG_LEVEL=($system_level) log ($message_level) "test message"'
     }
     | complete | get --ignore-errors stderr
 }
diff --git a/crates/nu-std/tests/logger_tests/test_log_custom.nu b/crates/nu-std/tests/logger_tests/test_log_custom.nu
index da11150032..3965752734 100644
--- a/crates/nu-std/tests/logger_tests/test_log_custom.nu
+++ b/crates/nu-std/tests/logger_tests/test_log_custom.nu
@@ -1,5 +1,4 @@
-use std *
-use std log *
+use std/assert
 use commons.nu *
 
 def run-command [
@@ -12,12 +11,12 @@ def run-command [
 ] {
     if ($level_prefix | is-empty) {
         if ($ansi | is-empty) {
-            ^$nu.current-exe --no-config-file --commands $'use std; NU_LOG_LEVEL=($system_level) std log custom "($message)" "($format)" ($log_level)'
+            ^$nu.current-exe --no-config-file --commands $'use std/log; NU_LOG_LEVEL=($system_level) log custom "($message)" "($format)" ($log_level)'
         } else {
-            ^$nu.current-exe --no-config-file --commands $'use std; NU_LOG_LEVEL=($system_level) std log custom "($message)" "($format)" ($log_level) --ansi "($ansi)"'
+            ^$nu.current-exe --no-config-file --commands $'use std/log; NU_LOG_LEVEL=($system_level) log custom "($message)" "($format)" ($log_level) --ansi "($ansi)"'
         }
     } else {
-        ^$nu.current-exe --no-config-file --commands $'use std; NU_LOG_LEVEL=($system_level) std log custom "($message)" "($format)" ($log_level) --level-prefix "($level_prefix)" --ansi "($ansi)"'
+        ^$nu.current-exe --no-config-file --commands $'use std/log; NU_LOG_LEVEL=($system_level) log custom "($message)" "($format)" ($log_level) --level-prefix "($level_prefix)" --ansi "($ansi)"'
     }
     | complete | get --ignore-errors stderr
 }
@@ -31,6 +30,7 @@ def errors_during_deduction [] {
 
 #[test]
 def valid_calls [] {
+    use std/log *
     assert equal (run-command "DEBUG" "msg" "%MSG%" 25 --level-prefix "abc" --ansi (ansi default) | str trim --right) "msg"
     assert equal (run-command "DEBUG" "msg" "%LEVEL% %MSG%" 20 | str trim --right) $"((log-prefix).INFO) msg"
     assert equal (run-command "DEBUG" "msg" "%LEVEL% %MSG%" --level-prefix "abc" 20 | str trim --right) "abc msg"
@@ -39,6 +39,7 @@ def valid_calls [] {
 
 #[test]
 def log-level_handling [] {
+    use std/log *
     assert equal (run-command "DEBUG" "msg" "%LEVEL% %MSG%" 20 | str trim --right) $"((log-prefix).INFO) msg"
     assert equal (run-command "WARNING" "msg" "%LEVEL% %MSG%" 20 | str trim --right) ""
 }
diff --git a/crates/nu-std/tests/logger_tests/test_log_format_flag.nu b/crates/nu-std/tests/logger_tests/test_log_format_flag.nu
index 5306daabbe..112f42dbea 100644
--- a/crates/nu-std/tests/logger_tests/test_log_format_flag.nu
+++ b/crates/nu-std/tests/logger_tests/test_log_format_flag.nu
@@ -1,5 +1,6 @@
 use std *
-use std log *
+use std/log *
+use std/assert
 use commons.nu *
 
 def run-command [
@@ -10,9 +11,9 @@ def run-command [
     --short
 ] {
     if $short {
-        ^$nu.current-exe --no-config-file --commands $'use std; NU_LOG_LEVEL=($system_level) std log ($message_level) --format "($format)" --short "($message)"'
+        ^$nu.current-exe --no-config-file --commands $'use std; use std/log; NU_LOG_LEVEL=($system_level) log ($message_level) --format "($format)" --short "($message)"'
     } else {
-        ^$nu.current-exe --no-config-file --commands $'use std; NU_LOG_LEVEL=($system_level) std log ($message_level) --format "($format)" "($message)"'
+        ^$nu.current-exe --no-config-file --commands $'use std; use std/log; NU_LOG_LEVEL=($system_level) log ($message_level) --format "($format)" "($message)"'
     }
     | complete | get --ignore-errors stderr
 }
diff --git a/crates/nu-std/tests/logger_tests/test_logger_env.nu b/crates/nu-std/tests/logger_tests/test_logger_env.nu
index 9aaa75c8f6..2890dd8929 100644
--- a/crates/nu-std/tests/logger_tests/test_logger_env.nu
+++ b/crates/nu-std/tests/logger_tests/test_logger_env.nu
@@ -1,5 +1,6 @@
-use std *
-use std log *
+use std/assert
+use std/log
+use std/log *
 
 #[test]
 def env_log-ansi [] {
diff --git a/crates/nu-std/tests/test_asserts.nu b/crates/nu-std/tests/test_asserts.nu
index 2447dfda1e..bc748891ba 100644
--- a/crates/nu-std/tests/test_asserts.nu
+++ b/crates/nu-std/tests/test_asserts.nu
@@ -1,4 +1,5 @@
 use std *
+use std/assert
 
 #[test]
 def assert_basic [] {
diff --git a/crates/nu-std/tests/test_core.nu b/crates/nu-std/tests/test_core.nu
new file mode 100644
index 0000000000..eca7cddd61
--- /dev/null
+++ b/crates/nu-std/tests/test_core.nu
@@ -0,0 +1,7 @@
+use std/assert
+
+#[test]
+def banner [] {
+    use std/core
+    assert ((core banner | lines | length) == 15)
+}
diff --git a/crates/nu-std/tests/test_dirs.nu b/crates/nu-std/tests/test_dirs.nu
index df9a39d784..c3ceb772e1 100644
--- a/crates/nu-std/tests/test_dirs.nu
+++ b/crates/nu-std/tests/test_dirs.nu
@@ -1,6 +1,5 @@
-use std assert
-use std assert
-use std log
+use std/assert
+use std/log
 
 # A couple of nuances to understand when testing module that exports environment:
 # Each 'use' for that module in the test script will execute the def --env block.
@@ -48,7 +47,7 @@ def dirs_command [] {
 
     # must execute these uses for the UOT commands *after* the test and *not* just put them at top of test module.
     # the def --env gets messed up
-    use std dirs
+    use std/dirs
 
     # Stack: [BASE]
     assert equal [$c.base_path] $env.DIRS_LIST "list is just pwd after initialization"
@@ -80,7 +79,7 @@ def dirs_command [] {
     assert length $env.DIRS_LIST 2 "drop removes from list"
     assert equal $env.PWD $c.path_b "drop changes PWD to previous in list (before dropped element)"
 
-    assert equal (dirs show) [[active path]; [false $c.base_path] [true $c.path_b]] "show table contains expected information"
+    assert equal (dirs) [[active path]; [false $c.base_path] [true $c.path_b]] "show table contains expected information"
 
     # Stack becomes: [BASE]
     dirs drop
@@ -96,7 +95,7 @@ def dirs_next [] {
     cd $c.base_path
     assert equal $env.PWD $c.base_path "test setup"
 
-    use std dirs
+    use std/dirs
     cur_dir_check $c.base_path "use module test setup"
 
     dirs add $c.path_a $c.path_b
@@ -117,7 +116,7 @@ def dirs_cd [] {
     # must set PWD *before* doing `use` that will run the def --env block in dirs module.
     cd $c.base_path
 
-    use std dirs
+    use std/dirs
 
     cur_dir_check $c.base_path "use module test setup"
 
@@ -139,7 +138,7 @@ def dirs_cd [] {
 def dirs_goto_bug10696 [] {
     let $c = $in
     cd $c.base_path
-    use std dirs
+    use std/dirs
 
     dirs add $c.path_a
     cd $c.path_b
@@ -153,7 +152,7 @@ def dirs_goto_bug10696 [] {
 def dirs_goto [] {
     let $c = $in
     cd $c.base_path
-    use std dirs
+    use std/dirs
 
     # check that goto can move *from* any position in the ring *to* any other position (correctly)
 
@@ -174,4 +173,7 @@ def dirs_goto [] {
             assert equal $env.PWD ($exp_dir | get $other_pos) "goto changed working directory correctly"
         }
     }
+
+    # check that 'dirs goto' with no argument maps to `dirs` (main)
+    assert length (dirs goto) 3
 }
diff --git a/crates/nu-std/tests/test_dt.nu b/crates/nu-std/tests/test_dt.nu
index 72f608248c..28f3201839 100644
--- a/crates/nu-std/tests/test_dt.nu
+++ b/crates/nu-std/tests/test_dt.nu
@@ -1,5 +1,5 @@
-use std assert
-use std dt *
+use std/assert
+use std/dt *
 
 #[test]
 def equal_times [] {
diff --git a/crates/nu-std/tests/test_formats.nu b/crates/nu-std/tests/test_formats.nu
index 59e7ddd94c..5fc1de2d01 100644
--- a/crates/nu-std/tests/test_formats.nu
+++ b/crates/nu-std/tests/test_formats.nu
@@ -1,4 +1,4 @@
-use std assert
+use std/assert
 
 def test_data_multiline [] {
   let lines = [
@@ -19,7 +19,7 @@ def test_data_multiline [] {
 
 #[test]
 def from_ndjson_multiple_objects [] {
-  use std formats *
+  use std/formats *
   let result = test_data_multiline | from ndjson
   let expect = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}]
   assert equal $result $expect "could not convert from NDJSON"
@@ -27,7 +27,7 @@ def from_ndjson_multiple_objects [] {
 
 #[test]
 def from_ndjson_single_object [] {
-  use std formats *
+  use std/formats *
   let result = '{"a": 1}' | from ndjson
   let expect = [{a:1}]
   assert equal $result $expect "could not convert from NDJSON"
@@ -35,13 +35,13 @@ def from_ndjson_single_object [] {
 
 #[test]
 def from_ndjson_invalid_object [] {
-  use std formats *
+  use std/formats *
   assert error { '{"a":1' | from ndjson }
 }
 
 #[test]
 def from_jsonl_multiple_objects [] {
-  use std formats *
+  use std/formats *
   let result = test_data_multiline | from jsonl
   let expect = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}]
   assert equal $result $expect "could not convert from JSONL"
@@ -49,7 +49,7 @@ def from_jsonl_multiple_objects [] {
 
 #[test]
 def from_jsonl_single_object [] {
-  use std formats *
+  use std/formats *
   let result = '{"a": 1}' | from jsonl
   let expect = [{a:1}]
   assert equal $result $expect "could not convert from JSONL"
@@ -57,13 +57,13 @@ def from_jsonl_single_object [] {
 
 #[test]
 def from_jsonl_invalid_object [] {
-  use std formats *
+  use std/formats *
   assert error { '{"a":1' | from jsonl }
 }
 
 #[test]
 def to_ndjson_multiple_objects [] {
-  use std formats *
+  use std/formats *
   let result = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}] | to ndjson | str trim
   let expect = test_data_multiline
   assert equal $result $expect "could not convert to NDJSON"
@@ -71,7 +71,7 @@ def to_ndjson_multiple_objects [] {
 
 #[test]
 def to_ndjson_single_object [] {
-  use std formats *
+  use std/formats *
   let result = [{a:1}] | to ndjson | str trim
   let expect = "{\"a\":1}"
   assert equal $result $expect "could not convert to NDJSON"
@@ -79,7 +79,7 @@ def to_ndjson_single_object [] {
 
 #[test]
 def to_jsonl_multiple_objects [] {
-  use std formats *
+  use std/formats *
   let result = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}] | to jsonl | str trim
   let expect = test_data_multiline
   assert equal $result $expect "could not convert to JSONL"
@@ -87,7 +87,7 @@ def to_jsonl_multiple_objects [] {
 
 #[test]
 def to_jsonl_single_object [] {
-  use std formats *
+  use std/formats *
   let result = [{a:1}] | to jsonl | str trim
   let expect = "{\"a\":1}"
   assert equal $result $expect "could not convert to JSONL"
diff --git a/crates/nu-std/tests/test_help.nu b/crates/nu-std/tests/test_help.nu
index b82e5072ef..07ea7c6e4c 100644
--- a/crates/nu-std/tests/test_help.nu
+++ b/crates/nu-std/tests/test_help.nu
@@ -1,5 +1,5 @@
-use std assert
-use std help
+use std/assert
+use std/help
 
 #[test]
 def show_help_on_commands [] {
diff --git a/crates/nu-std/tests/test_iter.nu b/crates/nu-std/tests/test_iter.nu
index 7404d082de..2b768c3d9d 100644
--- a/crates/nu-std/tests/test_iter.nu
+++ b/crates/nu-std/tests/test_iter.nu
@@ -1,4 +1,5 @@
 use std *
+use std/assert
 
 #[test]
 def iter_find [] {
diff --git a/crates/nu-std/tests/test_std.nu b/crates/nu-std/tests/test_lib.nu
similarity index 73%
rename from crates/nu-std/tests/test_std.nu
rename to crates/nu-std/tests/test_lib.nu
index 6ac7c6b9e0..1f1720de01 100644
--- a/crates/nu-std/tests/test_std.nu
+++ b/crates/nu-std/tests/test_lib.nu
@@ -1,8 +1,8 @@
-use std
+use std/lib
 
 #[test]
 def path_add [] {
-    use std assert
+    use std/assert
 
     let path_name = if "PATH" in $env { "PATH" } else { "Path" }
 
@@ -11,19 +11,19 @@ def path_add [] {
 
         assert equal (get_path) []
 
-        std path add "/foo/"
+        lib path add "/foo/"
         assert equal (get_path) (["/foo/"] | path expand)
 
-        std path add "/bar/" "/baz/"
+        lib path add "/bar/" "/baz/"
         assert equal (get_path) (["/bar/", "/baz/", "/foo/"] | path expand)
 
         load-env {$path_name: []}
 
-        std path add "foo"
-        std path add "bar" "baz" --append
+        lib path add "foo"
+        lib path add "bar" "baz" --append
         assert equal (get_path) (["foo", "bar", "baz"] | path expand)
 
-        assert equal (std path add "fooooo" --ret) (["fooooo", "foo", "bar", "baz"] | path expand)
+        assert equal (lib path add "fooooo" --ret) (["fooooo", "foo", "bar", "baz"] | path expand)
         assert equal (get_path) (["fooooo", "foo", "bar", "baz"] | path expand)
 
         load-env {$path_name: []}
@@ -35,18 +35,18 @@ def path_add [] {
             android: "quux",
         }
 
-        std path add $target_paths
+        lib path add $target_paths
         assert equal (get_path) ([($target_paths | get $nu.os-info.name)] | path expand)
 
         load-env {$path_name: [$"(["/foo", "/bar"] | path expand | str join (char esep))"]}
-        std path add "~/foo"
+        lib path add "~/foo"
         assert equal (get_path) (["~/foo", "/foo", "/bar"] | path expand)
     }
 }
 
 #[test]
 def path_add_expand [] {
-    use std assert
+    use std/assert
 
     # random paths to avoid collision, especially if left dangling on failure
     let real_dir = $nu.temp-path | path join $"real-dir-(random chars)"
@@ -63,25 +63,21 @@ def path_add_expand [] {
     with-env {$path_name: []} {
         def get_path [] { $env | get $path_name }
 
-        std path add $link_dir
+        lib path add $link_dir
         assert equal (get_path) ([$link_dir])
     }
 
     rm $real_dir $link_dir
 }
 
-#[test]
-def banner [] {
-    std assert ((std banner | lines | length) == 15)
-}
-
 #[test]
 def repeat_things [] {
-    std assert error { "foo" | std repeat -1 }
+    use std/assert
+    assert error { "foo" | lib repeat -1 }
 
     for x in ["foo", [1 2], {a: 1}] {
-        std assert equal ($x | std repeat 0) []
-        std assert equal ($x | std repeat 1) [$x]
-        std assert equal ($x | std repeat 2) [$x $x]
+        assert equal ($x | lib repeat 0) []
+        assert equal ($x | lib repeat 1) [$x]
+        assert equal ($x | lib repeat 2) [$x $x]
     }
 }
diff --git a/crates/nu-std/tests/test_setup_teardown.nu b/crates/nu-std/tests/test_setup_teardown.nu
index 60168ab6f3..d19ba915fb 100644
--- a/crates/nu-std/tests/test_setup_teardown.nu
+++ b/crates/nu-std/tests/test_setup_teardown.nu
@@ -1,5 +1,5 @@
-use std log
-use std assert
+use std/log
+use std/assert
 
 #[before-each]
 def before-each [] {
diff --git a/crates/nu-std/tests/test_std_postload.nu b/crates/nu-std/tests/test_std_postload.nu
new file mode 100644
index 0000000000..6b1352350e
--- /dev/null
+++ b/crates/nu-std/tests/test_std_postload.nu
@@ -0,0 +1,11 @@
+use std/assert
+export use std *
+
+#[test]
+def std_post_import [] {
+  assert length (scope commands | where name == "path add") 1
+  assert length (scope commands | where name == "ellie") 1
+  assert length (scope commands | where name == "repeat") 1
+  assert length (scope commands | where name == "formats from jsonl") 1
+  assert length (scope commands | where name == "dt datetime-diff") 1
+}
\ No newline at end of file
diff --git a/crates/nu-std/tests/test_std_preload.nu b/crates/nu-std/tests/test_std_preload.nu
new file mode 100644
index 0000000000..a1f88249b6
--- /dev/null
+++ b/crates/nu-std/tests/test_std_preload.nu
@@ -0,0 +1,11 @@
+use std/assert
+
+#[test]
+def std_pre_import [] {
+  # These commands shouldn't exist without an import
+  assert length (scope commands | where name == "path add") 0
+  assert length (scope commands | where name == "ellie") 0
+  assert length (scope commands | where name == "repeat") 0
+  assert length (scope commands | where name == "from jsonl") 0
+  assert length (scope commands | where name == "datetime-diff") 0
+}
\ No newline at end of file
diff --git a/crates/nu-std/tests/test_xml.nu b/crates/nu-std/tests/test_xml.nu
index a74b6808e0..16cbb712bc 100644
--- a/crates/nu-std/tests/test_xml.nu
+++ b/crates/nu-std/tests/test_xml.nu
@@ -1,7 +1,5 @@
-use std xml xaccess
-use std xml xupdate
-use std xml xinsert
-use std assert
+use std/xml *
+use std/assert
 
 #[before-each]
 def before-each [] {
diff --git a/tests/repl/test_stdlib.rs b/tests/repl/test_stdlib.rs
index 401fd3c0aa..b15a10dd22 100644
--- a/tests/repl/test_stdlib.rs
+++ b/tests/repl/test_stdlib.rs
@@ -1,15 +1,5 @@
 use crate::repl::tests::{fail_test, run_test_std, TestResult};
 
-#[test]
-fn library_loaded() -> TestResult {
-    run_test_std("scope modules | where name == 'std' | length", "1")
-}
-
-#[test]
-fn prelude_loaded() -> TestResult {
-    run_test_std("shells | length", "1")
-}
-
 #[test]
 fn not_loaded() -> TestResult {
     fail_test("log info", "")
@@ -17,5 +7,5 @@ fn not_loaded() -> TestResult {
 
 #[test]
 fn use_command() -> TestResult {
-    run_test_std("use std assert; assert true; print 'it works'", "it works")
+    run_test_std("use std/assert; assert true; print 'it works'", "it works")
 }
diff --git a/tests/shell/environment/env.rs b/tests/shell/environment/env.rs
index e07259a500..35692fdee9 100644
--- a/tests/shell/environment/env.rs
+++ b/tests/shell/environment/env.rs
@@ -224,10 +224,10 @@ fn std_log_env_vars_are_not_overridden() {
             ("NU_LOG_DATE_FORMAT".to_string(), "%Y".to_string()),
         ],
         r#"
-            use std
+            use std/log
             print -e $env.NU_LOG_FORMAT
             print -e $env.NU_LOG_DATE_FORMAT
-            std log error "err"
+            log error "err"
         "#
     );
     assert_eq!(actual.err, "%MSG%\n%Y\nerr\n");
@@ -237,7 +237,7 @@ fn std_log_env_vars_are_not_overridden() {
 fn std_log_env_vars_have_defaults() {
     let actual = nu_with_std!(
         r#"
-            use std
+            use std/log
             print -e $env.NU_LOG_FORMAT
             print -e $env.NU_LOG_DATE_FORMAT
         "#

From e3fd4d3f8176cd8539a985e2994f229cb3337340 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 3 Oct 2024 10:10:11 -0500
Subject: [PATCH 0504/1072] since windows allows slash or backslash, allow both
 instead of MAIN_SEPARATOR (#13996)

# Description

I mean't to do this small change the other day but forgot. We probably
shouldn't be using MAIN_SEPARATOR because **\\*.rs is an illegal glob.
So, update this to just use slash.

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/filesystem/glob.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/crates/nu-command/src/filesystem/glob.rs b/crates/nu-command/src/filesystem/glob.rs
index 219853f6cb..1f475efbac 100644
--- a/crates/nu-command/src/filesystem/glob.rs
+++ b/crates/nu-command/src/filesystem/glob.rs
@@ -169,12 +169,14 @@ impl Command for Glob {
             });
         }
 
+        // below we have to check / instead of MAIN_SEPARATOR because glob uses / as separator
+        // using a glob like **\*.rs should fail because it's not a valid glob pattern
         let folder_depth = if let Some(depth) = depth {
             depth
         } else if glob_pattern.contains("**") {
             usize::MAX
-        } else if glob_pattern.contains(std::path::MAIN_SEPARATOR) {
-            glob_pattern.split(std::path::MAIN_SEPARATOR).count() + 1
+        } else if glob_pattern.contains('/') {
+            glob_pattern.split('/').count() + 1
         } else {
             1
         };

From e0bc85d0ddb4d6641cffa8567e549b105638c506 Mon Sep 17 00:00:00 2001
From: LordLightSpeed <adamkyte1@gmail.com>
Date: Thu, 3 Oct 2024 23:04:36 +0100
Subject: [PATCH 0505/1072] Update `fill.rs` to fix last example given with
 help (#13993)

Original stated it filled on the left to a width of 5 while showing the
command and output to fill on both sides to a width of 10. Changed
wording of description to match effect of example and displayed result.
---
 crates/nu-command/src/conversions/fill.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-command/src/conversions/fill.rs b/crates/nu-command/src/conversions/fill.rs
index 4ab284931f..d125ee29b2 100644
--- a/crates/nu-command/src/conversions/fill.rs
+++ b/crates/nu-command/src/conversions/fill.rs
@@ -108,7 +108,7 @@ impl Command for Fill {
             },
             Example {
                 description:
-                    "Fill a filesize on the left side to a width of 5 with the character '0'",
+                    "Fill a filesize on both sides to a width of 10 with the character '0'",
                 example: "1kib | fill --alignment middle --character '0' --width 10",
                 result: Some(Value::string("0001024000", Span::test_data())),
             },

From 1e9967c3bf738c50d5600b61e041f239c18bb274 Mon Sep 17 00:00:00 2001
From: Maxim Zhiburt <zhiburt@gmail.com>
Date: Fri, 4 Oct 2024 14:44:59 +0300
Subject: [PATCH 0506/1072] nu-table/ Fix footer truncation in case of
 head_on_border (#13998)

Hi there;

I do think it must be fixed.

I also did improve performance for a fraction in case of header on
border.
I want to believe :) I didn't bench it.
But we didn't cached the width in this code branch before.
Which was causing all data reestimation.

close #13966
cc: @fdncred
---
 crates/nu-table/src/table.rs | 92 ++++++++++++++++++++++++++----------
 1 file changed, 67 insertions(+), 25 deletions(-)

diff --git a/crates/nu-table/src/table.rs b/crates/nu-table/src/table.rs
index c4e7e7590c..0d48180a34 100644
--- a/crates/nu-table/src/table.rs
+++ b/crates/nu-table/src/table.rs
@@ -272,8 +272,6 @@ fn set_indent(table: &mut Table, left: usize, right: usize) {
 }
 
 fn set_border_head(table: &mut Table, with_footer: bool, wctrl: TableWidthCtrl) {
-    let pad = wctrl.pad;
-
     if with_footer {
         let count_rows = table.count_rows();
         let last_row_index = count_rows - 1;
@@ -288,26 +286,25 @@ fn set_border_head(table: &mut Table, with_footer: bool, wctrl: TableWidthCtrl)
         table.with(&mut head_settings);
         table.with(&mut last_row);
 
+        let head = first_row.1;
+        let footer = last_row.1;
+        let alignment = head_settings.1;
+        let head_color = head_settings.2.clone();
+        let footer_color = head_settings.2;
+
         table.with(
             Settings::default()
-                .with(wctrl)
                 .with(StripColorFromRow(0))
                 .with(StripColorFromRow(count_rows - 1))
+                .with(wctrl)
                 .with(MoveRowNext::new(0, 0))
                 .with(MoveRowPrev::new(last_row_index - 1, last_row_index))
-                .with(SetLineHeaders::new(
-                    0,
-                    first_row.1,
-                    head_settings.1,
-                    head_settings.2.clone(),
-                    pad,
-                ))
+                .with(SetLineHeaders::new(0, head, alignment, head_color))
                 .with(SetLineHeaders::new(
                     last_row_index - 1,
-                    last_row.1,
-                    head_settings.1,
-                    head_settings.2,
-                    pad,
+                    footer,
+                    alignment,
+                    footer_color,
                 )),
         );
     } else {
@@ -319,10 +316,10 @@ fn set_border_head(table: &mut Table, with_footer: bool, wctrl: TableWidthCtrl)
 
         table.with(
             Settings::default()
-                .with(wctrl)
                 .with(StripColorFromRow(0))
+                .with(wctrl)
                 .with(MoveRowNext::new(0, 0))
-                .with(SetLineHeaders::new(0, row.1, row_opts.1, row_opts.2, pad)),
+                .with(SetLineHeaders::new(0, row.1, row_opts.1, row_opts.2)),
         );
     }
 }
@@ -469,10 +466,9 @@ fn trim_as_header(
 
     // even though it's safe to trim columns by header there might be left unused space
     // so we do use it if possible prioritizing left columns
-
+    let mut widths = vec![0; headers_widths.len()];
     for (i, head_width) in headers_widths.into_iter().enumerate() {
-        let head_width = head_width - trim.pad;
-        let column_width = trim.width[i] - trim.pad; // safe to assume width is bigger then paddding
+        let column_width = trim.width[i]; // safe to assume width is bigger then paddding
 
         let mut use_width = head_width;
         if free_width > 0 {
@@ -484,15 +480,45 @@ fn trim_as_header(
             use_width += additional_width;
         }
 
+        widths[i] = use_width;
+    }
+
+    // make sure we are fit in;
+    // which is might not be the case where we need to truncate columns further then a column head width
+    let expected_width = get_total_width2(&widths, cfg);
+    if expected_width > trim.width_max {
+        let mut diff = expected_width - trim.width_max;
+        'out: loop {
+            let (biggest_column, &value) = widths
+                .iter()
+                .enumerate()
+                .max_by_key(|(_, &value)| value)
+                .expect("ok");
+            if value <= trim.pad {
+                unreachable!("theoretically must never happen at this point")
+            }
+
+            widths[biggest_column] -= 1;
+            diff -= 1;
+
+            if diff == 0 {
+                break 'out;
+            }
+        }
+    }
+
+    for (i, width) in widths.iter().cloned().enumerate() {
+        let width = width - trim.pad;
+
         match &trim.strategy {
             TrimStrategy::Wrap { try_to_keep_words } => {
-                let wrap = Width::wrap(use_width).keep_words(*try_to_keep_words);
+                let wrap = Width::wrap(width).keep_words(*try_to_keep_words);
 
                 let opt = Modify::new(Columns::single(i)).with(wrap);
                 TableOption::<VecRecords<Text<String>>, _, _>::change(opt, recs, cfg, dims);
             }
             TrimStrategy::Truncate { suffix } => {
-                let mut truncate = Width::truncate(use_width);
+                let mut truncate = Width::truncate(width);
                 if let Some(suffix) = suffix {
                     truncate = truncate.suffix(suffix).suffix_try_color(true);
                 }
@@ -502,6 +528,8 @@ fn trim_as_header(
             }
         }
     }
+
+    TableOption::change(SetDimensions(widths), recs, cfg, dims);
 }
 
 fn align_table(
@@ -982,12 +1010,13 @@ impl TableOption<NuRecords, ColoredConfig, CompleteDimensionVecRecords<'_>>
     }
 }
 
+// It's laverages a use of guuaranted cached widths before hand
+// to speed up things a bit.
 struct SetLineHeaders {
     line: usize,
     columns: Vec<String>,
     alignment: AlignmentHorizontal,
     color: Option<Color>,
-    pad: usize,
 }
 
 impl SetLineHeaders {
@@ -996,14 +1025,12 @@ impl SetLineHeaders {
         columns: Vec<String>,
         alignment: AlignmentHorizontal,
         color: Option<Color>,
-        pad: usize,
     ) -> Self {
         Self {
             line,
             columns,
             alignment,
             color,
-            pad,
         }
     }
 }
@@ -1016,11 +1043,12 @@ impl TableOption<NuRecords, ColoredConfig, CompleteDimensionVecRecords<'_>> for
         dims: &mut CompleteDimensionVecRecords<'_>,
     ) {
         let mut columns = self.columns;
+
         match dims.get_widths() {
             Some(widths) => {
                 columns = columns
                     .into_iter()
-                    .zip(widths.iter().map(|w| w - self.pad)) // it must be always safe to do
+                    .zip(widths.iter().cloned()) // it must be always safe to do
                     .map(|(s, width)| Truncate::truncate(&s, width).into_owned())
                     .collect();
             }
@@ -1029,6 +1057,8 @@ impl TableOption<NuRecords, ColoredConfig, CompleteDimensionVecRecords<'_>> for
                 // which means we are OK to leave columns as they are.
                 //
                 // but we actually always have to have widths at this point
+
+                unreachable!("must never be the case");
             }
         };
 
@@ -1042,6 +1072,10 @@ impl TableOption<NuRecords, ColoredConfig, CompleteDimensionVecRecords<'_>> for
             self.color,
         )
     }
+
+    fn hint_change(&self) -> Option<Entity> {
+        None
+    }
 }
 
 struct MoveRowNext {
@@ -1075,6 +1109,10 @@ impl TableOption<NuRecords, ColoredConfig, CompleteDimensionVecRecords<'_>> for
     ) {
         row_shift_next(recs, cfg, self.row, self.line);
     }
+
+    fn hint_change(&self) -> Option<Entity> {
+        None
+    }
 }
 
 impl TableOption<NuRecords, ColoredConfig, CompleteDimensionVecRecords<'_>> for MoveRowPrev {
@@ -1086,6 +1124,10 @@ impl TableOption<NuRecords, ColoredConfig, CompleteDimensionVecRecords<'_>> for
     ) {
         row_shift_prev(recs, cfg, self.row, self.line);
     }
+
+    fn hint_change(&self) -> Option<Entity> {
+        None
+    }
 }
 
 fn row_shift_next(recs: &mut NuRecords, cfg: &mut ColoredConfig, row: usize, line: usize) {

From 6ce20675eb4898f91551432d62165e8a4ab7f0ee Mon Sep 17 00:00:00 2001
From: Akira Baruah <akira.baruah@gmail.com>
Date: Fri, 4 Oct 2024 07:54:37 -0400
Subject: [PATCH 0507/1072] Consistent default key bindings for
 ide_completion_menu (#13955)

Updates Ctrl+p to open the ide_completion menu and otherwise advance to
the "previous" menu item.

Ctrl+n opens the ide_completion_menu and subsequently advances to the
"next" menu item. Ctrl+p should share this behavior for the "previous"
menu item. See nushell/nushell#13946 for detailed discussion.

Tested by building and running nushell without a custom config, falling
back to this default config.
---
 crates/nu-cli/src/reedline_config.rs          | 46 +++++++++++++++++++
 .../src/sample_config/default_config.nu       | 40 ++++++++--------
 2 files changed, 66 insertions(+), 20 deletions(-)

diff --git a/crates/nu-cli/src/reedline_config.rs b/crates/nu-cli/src/reedline_config.rs
index dacdca3cae..37fc6228b9 100644
--- a/crates/nu-cli/src/reedline_config.rs
+++ b/crates/nu-cli/src/reedline_config.rs
@@ -36,6 +36,41 @@ const DEFAULT_COMPLETION_MENU: &str = r#"
   }
 }"#;
 
+const DEFAULT_IDE_COMPLETION_MENU: &str = r#"
+{
+  name: ide_completion_menu
+  only_buffer_difference: false
+  marker: "| "
+  type: {
+    layout: ide
+    min_completion_width: 0,
+    max_completion_width: 50,
+    max_completion_height: 10, # will be limited by the available lines in the terminal
+    padding: 0,
+    border: true,
+    cursor_offset: 0,
+    description_mode: "prefer_right"
+    min_description_width: 0
+    max_description_width: 50
+    max_description_height: 10
+    description_offset: 1
+    # If true, the cursor pos will be corrected, so the suggestions match up with the typed text
+    #
+    # C:\> str
+    #      str join
+    #      str trim
+    #      str split
+    correct_cursor_pos: false
+  }
+  style: {
+    text: green
+    selected_text: { attr: r }
+    description_text: yellow
+    match_text: { attr: u }
+    selected_match_text: { attr: ur }
+  }
+}"#;
+
 const DEFAULT_HISTORY_MENU: &str = r#"
 {
   name: history_menu
@@ -95,6 +130,7 @@ pub(crate) fn add_menus(
     // Checking if the default menus have been added from the config file
     let default_menus = [
         ("completion_menu", DEFAULT_COMPLETION_MENU),
+        ("ide_completion_menu", DEFAULT_IDE_COMPLETION_MENU),
         ("history_menu", DEFAULT_HISTORY_MENU),
         ("help_menu", DEFAULT_HELP_MENU),
     ];
@@ -629,6 +665,16 @@ fn add_menu_keybindings(keybindings: &mut Keybindings) {
         ]),
     );
 
+    keybindings.add_binding(
+        KeyModifiers::CONTROL,
+        KeyCode::Char(' '),
+        ReedlineEvent::UntilFound(vec![
+            ReedlineEvent::Menu("ide_completion_menu".to_string()),
+            ReedlineEvent::MenuNext,
+            ReedlineEvent::Edit(vec![EditCommand::Complete]),
+        ]),
+    );
+
     keybindings.add_binding(
         KeyModifiers::SHIFT,
         KeyCode::BackTab,
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index 8d5712f603..9ee0c90c2f 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -403,10 +403,17 @@ $env.config = {
                 ]
             }
         }
+        {
+            name: completion_previous_menu
+            modifier: shift
+            keycode: backtab
+            mode: [emacs, vi_normal, vi_insert]
+            event: { send: menuprevious }
+        }
         {
             name: ide_completion_menu
             modifier: control
-            keycode: char_n
+            keycode: space
             mode: [emacs vi_normal vi_insert]
             event: {
                 until: [
@@ -430,13 +437,6 @@ $env.config = {
             mode: [emacs, vi_insert, vi_normal]
             event: { send: menu name: help_menu }
         }
-        {
-            name: completion_previous_menu
-            modifier: shift
-            keycode: backtab
-            mode: [emacs, vi_normal, vi_insert]
-            event: { send: menuprevious }
-        }
         {
             name: next_page_menu
             modifier: control
@@ -618,6 +618,18 @@ $env.config = {
             mode: [emacs, vi_normal, vi_insert]
             event: { edit: movetolineend }
         }
+        {
+            name: move_down
+            modifier: control
+            keycode: char_n
+            mode: [emacs, vi_normal, vi_insert]
+            event: {
+                until: [
+                    { send: menudown }
+                    { send: down }
+                ]
+            }
+        }
         {
             name: move_up
             modifier: control
@@ -630,18 +642,6 @@ $env.config = {
                 ]
             }
         }
-        {
-            name: move_down
-            modifier: control
-            keycode: char_t
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: menudown }
-                    { send: down }
-                ]
-            }
-        }
         {
             name: delete_one_character_backward
             modifier: none

From 29b176b719ddf59b49f88c8f2e38c6277607e061 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Fri, 4 Oct 2024 08:03:30 -0400
Subject: [PATCH 0508/1072] Updated warning message for old dirs/shells
 (#13997)

# Description

@kubouch noticed that the warning message from #13842 when using a
"Shells" alias mentioned `config.nu`, but he's using it in the prompt
which means loading it in `env.nu`. Updated the warning message to:

> ... feature, and to remove this warning, please add the following
> to your startup configuration (typically env.nu or config.nu):

# User-Facing Changes

No change in functionality - More clear instructions, hopefully.

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

Doc and release notes still to be updated for #13842
---
 crates/nu-std/std/deprecated_dirs.nu | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-std/std/deprecated_dirs.nu b/crates/nu-std/std/deprecated_dirs.nu
index 4fc4e944ba..f92b1a1790 100644
--- a/crates/nu-std/std/deprecated_dirs.nu
+++ b/crates/nu-std/std/deprecated_dirs.nu
@@ -26,7 +26,7 @@ print -e $"
 (ansi red)Warning:(ansi reset) The 'std dirs' module will no longer automatically
 be loaded in the next release. To continue using the Shells
 feature, and to remove this warning, please add the following
-to your config.nu:
+to your startup configuration (typically env.nu or config.nu):
 
 use std/dirs shells-aliases *
 

From 199aa2ad3a2f7499b87d7fe13a7de2e76469a9ba Mon Sep 17 00:00:00 2001
From: Kither <61571510+Kither12@users.noreply.github.com>
Date: Fri, 4 Oct 2024 20:44:40 +0700
Subject: [PATCH 0509/1072] escape dollarsign in tab completion (#13988)

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

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

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

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

This pr escapes file/directory names, which start with a dollar sign
since it's being interpreted as a variable.

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-cli/src/completions/completion_common.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/nu-cli/src/completions/completion_common.rs b/crates/nu-cli/src/completions/completion_common.rs
index 6dd59da853..438ce2a1f0 100644
--- a/crates/nu-cli/src/completions/completion_common.rs
+++ b/crates/nu-cli/src/completions/completion_common.rs
@@ -267,8 +267,10 @@ pub fn escape_path(path: String, dir: bool) -> String {
     let filename_contaminated = !dir && path.contains(['\'', '"', ' ', '#', '(', ')']);
     let dirname_contaminated = dir && path.contains(['\'', '"', ' ', '#']);
     let maybe_flag = path.starts_with('-');
+    let maybe_variable = path.starts_with('$');
     let maybe_number = path.parse::<f64>().is_ok();
-    if filename_contaminated || dirname_contaminated || maybe_flag || maybe_number {
+    if filename_contaminated || dirname_contaminated || maybe_flag || maybe_variable || maybe_number
+    {
         format!("`{path}`")
     } else {
         path

From baadaee0163a5066ae73509ff6052962b3422673 Mon Sep 17 00:00:00 2001
From: Vivek Kethineni <35619837+uek-1@users.noreply.github.com>
Date: Fri, 4 Oct 2024 09:54:25 -0500
Subject: [PATCH 0510/1072] Add operator completions (#13818)

# Description

This PR addresses #13676 . It adds completions for the operators listed
on https://www.nushell.sh/lang-guide/chapters/operators.html#operators
based on the type of the value before the cursor. Currently, values
created as the output of other operations will not have completions. For
example `(1 + 3)` will not have completions. When operators are
added/removed/updated the completions will have to be adjusted manually.

# User-Facing Changes
- Tab completions for operators

# Tests
Added unit tests to the new completion struct OperationCompletion for
int completions, float completions, and str completions
---
 crates/nu-cli/src/completions/completer.rs    |  48 +++++-
 crates/nu-cli/src/completions/mod.rs          |   2 +
 .../src/completions/operator_completions.rs   | 156 ++++++++++++++++++
 3 files changed, 202 insertions(+), 4 deletions(-)
 create mode 100644 crates/nu-cli/src/completions/operator_completions.rs

diff --git a/crates/nu-cli/src/completions/completer.rs b/crates/nu-cli/src/completions/completer.rs
index 079425e2a7..2845445b44 100644
--- a/crates/nu-cli/src/completions/completer.rs
+++ b/crates/nu-cli/src/completions/completer.rs
@@ -1,6 +1,6 @@
 use crate::completions::{
     CommandCompletion, Completer, CompletionOptions, CustomCompletion, DirectoryCompletion,
-    DotNuCompletion, FileCompletion, FlagCompletion, VariableCompletion,
+    DotNuCompletion, FileCompletion, FlagCompletion, OperatorCompletion, VariableCompletion,
 };
 use nu_color_config::{color_record_to_nustyle, lookup_ansi_color_style};
 use nu_engine::eval_block;
@@ -176,17 +176,32 @@ impl NuCompleter {
 
                         // Variables completion
                         if prefix.starts_with(b"$") || most_left_var.is_some() {
-                            let mut completer =
+                            let mut variable_names_completer =
                                 VariableCompletion::new(most_left_var.unwrap_or((vec![], vec![])));
 
-                            return self.process_completion(
-                                &mut completer,
+                            let mut variable_completions = self.process_completion(
+                                &mut variable_names_completer,
+                                &working_set,
+                                prefix.clone(),
+                                new_span,
+                                fake_offset,
+                                pos,
+                            );
+
+                            let mut variable_operations_completer =
+                                OperatorCompletion::new(pipeline_element.expr.clone());
+
+                            let mut variable_operations_completions = self.process_completion(
+                                &mut variable_operations_completer,
                                 &working_set,
                                 prefix,
                                 new_span,
                                 fake_offset,
                                 pos,
                             );
+
+                            variable_completions.append(&mut variable_operations_completions);
+                            return variable_completions;
                         }
 
                         // Flags completion
@@ -262,6 +277,26 @@ impl NuCompleter {
                                 } else if prev_expr_str == b"ls" {
                                     let mut completer = FileCompletion::new();
 
+                                    return self.process_completion(
+                                        &mut completer,
+                                        &working_set,
+                                        prefix,
+                                        new_span,
+                                        fake_offset,
+                                        pos,
+                                    );
+                                } else if matches!(
+                                    previous_expr.1,
+                                    FlatShape::Float
+                                        | FlatShape::Int
+                                        | FlatShape::String
+                                        | FlatShape::List
+                                        | FlatShape::Bool
+                                        | FlatShape::Variable(_)
+                                ) {
+                                    let mut completer =
+                                        OperatorCompletion::new(pipeline_element.expr.clone());
+
                                     return self.process_completion(
                                         &mut completer,
                                         &working_set,
@@ -533,6 +568,11 @@ mod completer_tests {
 
         let mut completer = NuCompleter::new(engine_state.into(), Arc::new(Stack::new()));
         let dataset = [
+            ("1 bit-sh", true, "b", vec!["bit-shl", "bit-shr"]),
+            ("1.0 bit-sh", false, "b", vec![]),
+            ("1 m", true, "m", vec!["mod"]),
+            ("1.0 m", true, "m", vec!["mod"]),
+            ("\"a\" s", true, "s", vec!["starts-with"]),
             ("sudo", false, "", Vec::new()),
             ("sudo l", true, "l", vec!["ls", "let", "lines", "loop"]),
             (" sudo", false, "", Vec::new()),
diff --git a/crates/nu-cli/src/completions/mod.rs b/crates/nu-cli/src/completions/mod.rs
index ed1510cdfb..3acb8e9bf3 100644
--- a/crates/nu-cli/src/completions/mod.rs
+++ b/crates/nu-cli/src/completions/mod.rs
@@ -8,6 +8,7 @@ mod directory_completions;
 mod dotnu_completions;
 mod file_completions;
 mod flag_completions;
+mod operator_completions;
 mod variable_completions;
 
 pub use base::{Completer, SemanticSuggestion, SuggestionKind};
@@ -19,4 +20,5 @@ pub use directory_completions::DirectoryCompletion;
 pub use dotnu_completions::DotNuCompletion;
 pub use file_completions::{file_path_completion, matches, FileCompletion};
 pub use flag_completions::FlagCompletion;
+pub use operator_completions::OperatorCompletion;
 pub use variable_completions::VariableCompletion;
diff --git a/crates/nu-cli/src/completions/operator_completions.rs b/crates/nu-cli/src/completions/operator_completions.rs
new file mode 100644
index 0000000000..84c1feb67b
--- /dev/null
+++ b/crates/nu-cli/src/completions/operator_completions.rs
@@ -0,0 +1,156 @@
+use crate::completions::{
+    Completer, CompletionOptions, MatchAlgorithm, SemanticSuggestion, SuggestionKind,
+};
+use nu_protocol::{
+    ast::{Expr, Expression},
+    engine::{Stack, StateWorkingSet},
+    Span, Type,
+};
+use reedline::Suggestion;
+
+#[derive(Clone)]
+pub struct OperatorCompletion {
+    previous_expr: Expression,
+}
+
+impl OperatorCompletion {
+    pub fn new(previous_expr: Expression) -> Self {
+        OperatorCompletion { previous_expr }
+    }
+}
+
+impl Completer for OperatorCompletion {
+    fn fetch(
+        &mut self,
+        working_set: &StateWorkingSet,
+        _stack: &Stack,
+        _prefix: Vec<u8>,
+        span: Span,
+        offset: usize,
+        _pos: usize,
+        _options: &CompletionOptions,
+    ) -> Vec<SemanticSuggestion> {
+        //Check if int, float, or string
+        let partial = std::str::from_utf8(working_set.get_span_contents(span)).unwrap_or("");
+        let op = match &self.previous_expr.expr {
+            Expr::BinaryOp(x, _, _) => &x.expr,
+            _ => {
+                return vec![];
+            }
+        };
+        let possible_operations = match op {
+            Expr::Int(_) => vec![
+                ("+", "Plus / Addition"),
+                ("-", "Minus / Subtraction"),
+                ("*", "Multiply"),
+                ("/", "Divide"),
+                ("==", "Equal"),
+                ("!=", "Not Equal"),
+                ("//", "Floor Division"),
+                ("<", "Less Than"),
+                (">", "Greater Than"),
+                ("<=", "Less Than or Equal to"),
+                (">=", "Greater Than or Equal to"),
+                ("mod", "Modulo"),
+                ("**", "Pow"),
+                ("bit-or", "bitwise or"),
+                ("bit-xor", "bitwise exclusive or"),
+                ("bit-and", "bitwise and"),
+                ("bit-shl", "bitwise shift left"),
+                ("bit-shr", "bitwise shift right"),
+            ],
+            Expr::String(_) => vec![
+                ("=~", "Regex Match / Contains"),
+                ("!~", "Not Regex Match / Not Contains"),
+                ("in", "In / Contains (doesn't use regex)"),
+                (
+                    "++",
+                    "Appends two lists, a list and a value, two strings, or two binary values",
+                ),
+                ("not-in", "Not In / Not Contains (doesn't use regex"),
+                ("starts-with", "Starts With"),
+                ("ends-with", "Ends With"),
+            ],
+            Expr::Float(_) => vec![
+                ("+", "Plus / Addition"),
+                ("-", "Minus / Subtraction"),
+                ("*", "Multiply"),
+                ("/", "Divide"),
+                ("==", "Equal"),
+                ("!=", "Not Equal"),
+                ("//", "Floor Division"),
+                ("<", "Less Than"),
+                (">", "Greater Than"),
+                ("<=", "Less Than or Equal to"),
+                (">=", "Greater Than or Equal to"),
+                ("mod", "Modulo"),
+                ("**", "Pow"),
+            ],
+            Expr::Bool(_) => vec![
+                ("and", "Checks if both values are true."),
+                ("or", "Checks if either value is true."),
+                ("xor", "Checks if one value is true and the other is false."),
+                ("not", "Negates a value or expression."),
+            ],
+            Expr::FullCellPath(path) => match path.head.expr {
+                Expr::List(_) => vec![(
+                    "++",
+                    "Appends two lists, a list and a value, two strings, or two binary values",
+                )],
+                Expr::Var(id) => get_variable_completions(id, working_set),
+                _ => vec![],
+            },
+            _ => vec![],
+        };
+
+        let match_algorithm = MatchAlgorithm::Prefix;
+        let input_fuzzy_search =
+            |(operator, _): &(&str, &str)| match_algorithm.matches_str(operator, partial);
+
+        possible_operations
+            .into_iter()
+            .filter(input_fuzzy_search)
+            .map(move |x| SemanticSuggestion {
+                suggestion: Suggestion {
+                    value: x.0.to_string(),
+                    description: Some(x.1.to_string()),
+                    span: reedline::Span::new(span.start - offset, span.end - offset),
+                    append_whitespace: true,
+                    ..Suggestion::default()
+                },
+                kind: Some(SuggestionKind::Command(
+                    nu_protocol::engine::CommandType::Builtin,
+                )),
+            })
+            .collect()
+    }
+}
+
+pub fn get_variable_completions<'a>(
+    id: nu_protocol::Id<nu_protocol::marker::Var>,
+    working_set: &StateWorkingSet,
+) -> Vec<(&'a str, &'a str)> {
+    let var = working_set.get_variable(id);
+    if !var.mutable {
+        return vec![];
+    }
+
+    match var.ty {
+        Type::List(_) | Type::String | Type::Binary => vec![
+            (
+                "++=",
+                "Appends a list, a value, a string, or a binary value to a variable.",
+            ),
+            ("=", "Assigns a value to a variable."),
+        ],
+
+        Type::Int | Type::Float => vec![
+            ("=", "Assigns a value to a variable."),
+            ("+=", "Adds a value to a variable."),
+            ("-=", "Subtracts a value from a variable."),
+            ("*=", "Multiplies a variable by a value"),
+            ("/=", "Divides a variable by a value."),
+        ],
+        _ => vec![],
+    }
+}

From 68377c176df15e62f7da64c13bf70790ccdc7744 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Sat, 5 Oct 2024 09:19:26 -0400
Subject: [PATCH 0511/1072] Remove superfluous separator when there's no flag
 description/comment (#14007)

# Description

Fixes a small side-issue in #10977 - If a command flag didn't have a
comment/description, it would still show an unnecessary separator at the
end of the line.

This fixes that, plus uses the `: ` (colon) to separate the flag from
the description. This aligns with the way that named parameters are
handled.

# User-Facing Changes

Help/doc only

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

N/A
---
 crates/nu-engine/src/documentation.rs | 4 +++-
 tests/repl/test_help.rs               | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/crates/nu-engine/src/documentation.rs b/crates/nu-engine/src/documentation.rs
index 92f2c3b925..ef00d6cf24 100644
--- a/crates/nu-engine/src/documentation.rs
+++ b/crates/nu-engine/src/documentation.rs
@@ -572,7 +572,9 @@ where
                 document_shape(arg)
             );
         }
-        let _ = write!(long_desc, " - {}", flag.desc);
+        if !flag.desc.is_empty() {
+            let _ = write!(long_desc, ": {}", flag.desc);
+        }
         if let Some(value) = &flag.default_value {
             let _ = write!(long_desc, " (default: {})", &value_formatter(value));
         }
diff --git a/tests/repl/test_help.rs b/tests/repl/test_help.rs
index 16d168587a..2fe3b5ecff 100644
--- a/tests/repl/test_help.rs
+++ b/tests/repl/test_help.rs
@@ -6,11 +6,11 @@ use rstest::rstest;
 #[case(": arga help")]
 #[case("argb help")]
 #[case("optional, default: 20")]
-#[case("- f1 switch")]
-#[case("- f2 named no default")]
-#[case("- f3 named default 3")]
+#[case(": f1 switch")]
+#[case(": f2 named no default")]
+#[case(": f3 named default 3")]
 #[case("default: 33")]
-#[case("--help - Display the help message")]
+#[case("--help: Display the help message")]
 fn can_get_help(#[case] exp_result: &str) -> TestResult {
     run_test(
         &format!(

From 6964968f1429d40614777c43f245c92d25c45c66 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Sat, 5 Oct 2024 10:03:01 -0500
Subject: [PATCH 0512/1072] update osc_633 string escaping (#14008)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

VSCode OSC 633 needs particular string escaping to function properly. I
missed some escapes during my initial implementation. This PR should
cover the escapes I missed originally.
 
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-cli/src/repl.rs | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 4ea650074e..4ecf1cbd2f 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -131,16 +131,13 @@ pub fn evaluate_repl(
         // escape a few things because this says so
         // https://code.visualstudio.com/docs/terminal/shell-integration#_vs-code-custom-sequences-osc-633-st
         let cmd_text = line_editor.current_buffer_contents().to_string();
+        let len = cmd_text.len();
+        let mut cmd_text_chars = cmd_text[0..len].chars();
+        let mut replaced_cmd_text = String::with_capacity(len);
 
-        let replaced_cmd_text = cmd_text
-            .chars()
-            .map(|c| match c {
-                '\n' => '\x0a',
-                '\r' => '\x0d',
-                '\x1b' => '\x1b',
-                _ => c,
-            })
-            .collect();
+        while let Some(c) = unescape_for_vscode(&mut cmd_text_chars) {
+            replaced_cmd_text.push(c);
+        }
 
         run_shell_integration_osc633(
             engine_state,
@@ -224,6 +221,28 @@ pub fn evaluate_repl(
     Ok(())
 }
 
+fn unescape_for_vscode(text: &mut std::str::Chars) -> Option<char> {
+    match text.next() {
+        Some('\\') => match text.next() {
+            Some('0') => Some('\x00'),  // NUL '\0' (null character)
+            Some('a') => Some('\x07'),  // BEL '\a' (bell)
+            Some('b') => Some('\x08'),  // BS  '\b' (backspace)
+            Some('t') => Some('\x09'),  // HT  '\t' (horizontal tab)
+            Some('n') => Some('\x0a'),  // LF  '\n' (new line)
+            Some('v') => Some('\x0b'),  // VT  '\v' (vertical tab)
+            Some('f') => Some('\x0c'),  // FF  '\f' (form feed)
+            Some('r') => Some('\x0d'),  // CR  '\r' (carriage ret)
+            Some(';') => Some('\x3b'),  // semi-colon
+            Some('\\') => Some('\x5c'), // backslash
+            Some('e') => Some('\x1b'),  // escape
+            Some(c) => Some(c),
+            None => None,
+        },
+        Some(c) => Some(c),
+        None => None,
+    }
+}
+
 fn get_line_editor(
     engine_state: &mut EngineState,
     nushell_path: &str,

From 27ebccce80d8dc909a4d7c44aa27b3faaa0de5b6 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Sat, 5 Oct 2024 13:42:44 -0400
Subject: [PATCH 0513/1072] Set proc/env cwd to engine_state value (#14005)

# Description

Fixes #14000 by once again calling `set_current_dir()`, but doing so
with the `cwd` from the current state, rather than the (previously
removed) argument to `merge_env()`.

# User-Facing Changes

Bug fix

# Tests + Formatting

If this looks good, I'll look at adding a test case for it.

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

N/A
---
 crates/nu-protocol/src/engine/engine_state.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index ec616c3403..71c1a58905 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -320,6 +320,10 @@ impl EngineState {
             }
         }
 
+        let cwd = self.cwd(Some(stack))?;
+        // TODO: better error
+        std::env::set_current_dir(cwd)?;
+
         if let Some(config) = stack.config.take() {
             // If config was updated in the stack, replace it.
             self.config = config;

From b1379b2b14082369415457ed77f57c8022af0cff Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Sat, 5 Oct 2024 15:55:47 -0400
Subject: [PATCH 0514/1072] Fix namespace collision in std and nupm (#14009)

# Description

Fxes https://github.com/nushell/nupm/issues/102

Not loading `std` at startup has caused an issue with nupm and std where
the `dirs` module name clashes and nupm won't load. This was technically
a preexisting bug that was previously masked. This could have been fixed
(and also should be) by changing the import statement in nupm, but the
potential for collision would remain in other (user) modules.

This PR explicitly sets the relative path for the import statements in
`std/mod.nu` so that there are no collisions.

# User-Facing Changes

Bugfix

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

N/A
---
 crates/nu-std/std/mod.nu | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/crates/nu-std/std/mod.nu b/crates/nu-std/std/mod.nu
index c0d49d1685..2669c102e8 100644
--- a/crates/nu-std/std/mod.nu
+++ b/crates/nu-std/std/mod.nu
@@ -4,21 +4,21 @@
 export use lib *
 
 # std submodules
-export module assert
-export module bench
-export module dt
-export module formats
-export module help
-export module input
-export module iter
-export module log
-export module math
-export module xml
+export module ./assert
+export module ./bench
+export module ./dt
+export module ./formats
+export module ./help
+export module ./input
+export module ./iter
+export module ./log
+export module ./math
+export module ./xml
 
 # Load main dirs command and all subcommands
-export use dirs main
-export module dirs {
-  export use dirs [
+export use ./dirs main
+export module ./dirs {
+  export use ./dirs [
     add
     drop
     next

From abcca0897eb9866758121ba5e9fe477c75fa2003 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Sat, 5 Oct 2024 19:11:17 -0400
Subject: [PATCH 0515/1072] Fix operator completion typo and increase
 consistency (#14006)

# Description

* Fixes missing closing parenthesis on `not-in` completion

Also tweaks the others to give them consistent capitalization and
punctuation:

* First word initial-case, other words lower-case
* Exception - Initial-case for "also known as" after slash or inside
parens
* No closing period for any completion help
* Word-smithing on others.  E.g., "Mod" is technically "Remainder"

# User-Facing Changes

Operator completions

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
-
# After Submitting

N/A
---
 .../src/completions/operator_completions.rs   | 102 +++++++++++-------
 1 file changed, 63 insertions(+), 39 deletions(-)

diff --git a/crates/nu-cli/src/completions/operator_completions.rs b/crates/nu-cli/src/completions/operator_completions.rs
index 84c1feb67b..c670988a29 100644
--- a/crates/nu-cli/src/completions/operator_completions.rs
+++ b/crates/nu-cli/src/completions/operator_completions.rs
@@ -40,57 +40,81 @@ impl Completer for OperatorCompletion {
         };
         let possible_operations = match op {
             Expr::Int(_) => vec![
-                ("+", "Plus / Addition"),
-                ("-", "Minus / Subtraction"),
+                ("+", "Add (Plus)"),
+                ("-", "Subtract (Minus)"),
                 ("*", "Multiply"),
                 ("/", "Divide"),
-                ("==", "Equal"),
-                ("!=", "Not Equal"),
-                ("//", "Floor Division"),
-                ("<", "Less Than"),
-                (">", "Greater Than"),
-                ("<=", "Less Than or Equal to"),
-                (">=", "Greater Than or Equal to"),
-                ("mod", "Modulo"),
-                ("**", "Pow"),
-                ("bit-or", "bitwise or"),
-                ("bit-xor", "bitwise exclusive or"),
-                ("bit-and", "bitwise and"),
-                ("bit-shl", "bitwise shift left"),
-                ("bit-shr", "bitwise shift right"),
-            ],
-            Expr::String(_) => vec![
-                ("=~", "Regex Match / Contains"),
-                ("!~", "Not Regex Match / Not Contains"),
-                ("in", "In / Contains (doesn't use regex)"),
+                ("==", "Equal to"),
+                ("!=", "Not equal to"),
+                ("//", "Floor division"),
+                ("<", "Less than"),
+                (">", "Greater than"),
+                ("<=", "Less than or equal to"),
+                (">=", "Greater than or equal to"),
+                ("mod", "Floor division remainder (Modulo)"),
+                ("**", "Power of"),
+                ("bit-or", "Bitwise OR"),
+                ("bit-xor", "Bitwise exclusive OR"),
+                ("bit-and", "Bitwise AND"),
+                ("bit-shl", "Bitwise shift left"),
+                ("bit-shr", "Bitwise shift right"),
+                ("in", "Is a member of (doesn't use regex)"),
+                ("not-in", "Is not a member of (doesn't use regex)"),
                 (
                     "++",
                     "Appends two lists, a list and a value, two strings, or two binary values",
                 ),
-                ("not-in", "Not In / Not Contains (doesn't use regex"),
-                ("starts-with", "Starts With"),
-                ("ends-with", "Ends With"),
+            ],
+            Expr::String(_) => vec![
+                ("=~", "Contains regex match"),
+                ("!~", "Does not contain regex match"),
+                (
+                    "++",
+                    "Appends two lists, a list and a value, two strings, or two binary values",
+                ),
+                ("in", "Is a member of (doesn't use regex)"),
+                ("not-in", "Is not a member of (doesn't use regex)"),
+                ("starts-with", "Starts with"),
+                ("ends-with", "Ends with"),
             ],
             Expr::Float(_) => vec![
-                ("+", "Plus / Addition"),
-                ("-", "Minus / Subtraction"),
+                ("+", "Add (Plus)"),
+                ("-", "Subtract (Minus)"),
                 ("*", "Multiply"),
                 ("/", "Divide"),
-                ("==", "Equal"),
-                ("!=", "Not Equal"),
-                ("//", "Floor Division"),
-                ("<", "Less Than"),
-                (">", "Greater Than"),
-                ("<=", "Less Than or Equal to"),
-                (">=", "Greater Than or Equal to"),
-                ("mod", "Modulo"),
-                ("**", "Pow"),
+                ("==", "Equal to"),
+                ("!=", "Not equal to"),
+                ("//", "Floor division"),
+                ("<", "Less than"),
+                (">", "Greater than"),
+                ("<=", "Less than or equal to"),
+                (">=", "Greater than or equal to"),
+                ("mod", "Floor division remainder (Modulo)"),
+                ("**", "Power of"),
+                ("in", "Is a member of (doesn't use regex)"),
+                ("not-in", "Is not a member of (doesn't use regex)"),
+                (
+                    "++",
+                    "Appends two lists, a list and a value, two strings, or two binary values",
+                ),
             ],
             Expr::Bool(_) => vec![
-                ("and", "Checks if both values are true."),
-                ("or", "Checks if either value is true."),
-                ("xor", "Checks if one value is true and the other is false."),
-                ("not", "Negates a value or expression."),
+                (
+                    "and",
+                    "Both values are true (short-circuits when first value is false)",
+                ),
+                (
+                    "or",
+                    "Either value is true (short-circuits when first value is true)",
+                ),
+                ("xor", "One value is true and the other is false"),
+                ("not", "Negates a value or expression"),
+                ("in", "Is a member of (doesn't use regex)"),
+                ("not-in", "Is not a member of (doesn't use regex)"),
+                (
+                    "++",
+                    "Appends two lists, a list and a value, two strings, or two binary values",
+                ),
             ],
             Expr::FullCellPath(path) => match path.head.expr {
                 Expr::List(_) => vec![(

From 33ae71f300f1556f85e5df8f5aabb4ba18e452fc Mon Sep 17 00:00:00 2001
From: Sergio Morales <sdmoralesma@gmail.com>
Date: Sun, 6 Oct 2024 15:50:11 +0200
Subject: [PATCH 0516/1072] Fix example for hide-env (#14013)

# Description
Fix example in documentation for hide-env

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-cmd-lang/src/core_commands/hide_env.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-cmd-lang/src/core_commands/hide_env.rs b/crates/nu-cmd-lang/src/core_commands/hide_env.rs
index adc430b168..3d47a84a36 100644
--- a/crates/nu-cmd-lang/src/core_commands/hide_env.rs
+++ b/crates/nu-cmd-lang/src/core_commands/hide_env.rs
@@ -63,7 +63,7 @@ impl Command for HideEnv {
     fn examples(&self) -> Vec<Example> {
         vec![Example {
             description: "Hide an environment variable",
-            example: r#"$env.HZ_ENV_ABC = 1; hide-env HZ_ENV_ABC; 'HZ_ENV_ABC' in (env).name"#,
+            example: r#"$env.HZ_ENV_ABC = 1; hide-env HZ_ENV_ABC; 'HZ_ENV_ABC' in $env"#,
             result: Some(Value::test_bool(false)),
         }]
     }

From d6f4e4c4fed0e76ec1a73becd54eb4eb6925e810 Mon Sep 17 00:00:00 2001
From: Kither <61571510+Kither12@users.noreply.github.com>
Date: Mon, 7 Oct 2024 01:31:37 +0700
Subject: [PATCH 0517/1072] Improve completer (#14004)

This pr does two optimization for the completer:
- Switch `sort_by` to `sort_unstable_by` on `sort_completions` function
since it reduces memory allocation and the orders of the identical
completions are not matter.
- Change `prefix` type from `Vec<u8>` to `&[u8]` to reduce cloning and
memory.
---
 crates/nu-cli/src/completions/base.rs          |  2 +-
 .../src/completions/command_completions.rs     |  6 +++---
 crates/nu-cli/src/completions/completer.rs     | 14 +++++++-------
 .../src/completions/completion_common.rs       |  4 ++--
 .../src/completions/custom_completions.rs      |  6 +++---
 .../src/completions/directory_completions.rs   |  4 ++--
 .../src/completions/dotnu_completions.rs       |  4 ++--
 .../nu-cli/src/completions/file_completions.rs |  4 ++--
 .../nu-cli/src/completions/flag_completions.rs |  8 ++++----
 .../src/completions/operator_completions.rs    |  2 +-
 .../src/completions/variable_completions.rs    | 18 +++++++++---------
 11 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/crates/nu-cli/src/completions/base.rs b/crates/nu-cli/src/completions/base.rs
index cf13dae68c..68f10a7387 100644
--- a/crates/nu-cli/src/completions/base.rs
+++ b/crates/nu-cli/src/completions/base.rs
@@ -12,7 +12,7 @@ pub trait Completer {
         &mut self,
         working_set: &StateWorkingSet,
         stack: &Stack,
-        prefix: Vec<u8>,
+        prefix: &[u8],
         span: Span,
         offset: usize,
         pos: usize,
diff --git a/crates/nu-cli/src/completions/command_completions.rs b/crates/nu-cli/src/completions/command_completions.rs
index e5c7e8f140..0086270ac5 100644
--- a/crates/nu-cli/src/completions/command_completions.rs
+++ b/crates/nu-cli/src/completions/command_completions.rs
@@ -158,7 +158,7 @@ impl Completer for CommandCompletion {
         &mut self,
         working_set: &StateWorkingSet,
         _stack: &Stack,
-        prefix: Vec<u8>,
+        prefix: &[u8],
         span: Span,
         offset: usize,
         pos: usize,
@@ -195,7 +195,7 @@ impl Completer for CommandCompletion {
         };
 
         if !subcommands.is_empty() {
-            return sort_suggestions(&String::from_utf8_lossy(&prefix), subcommands, options);
+            return sort_suggestions(&String::from_utf8_lossy(prefix), subcommands, options);
         }
 
         let config = working_set.get_config();
@@ -220,7 +220,7 @@ impl Completer for CommandCompletion {
             vec![]
         };
 
-        sort_suggestions(&String::from_utf8_lossy(&prefix), commands, options)
+        sort_suggestions(&String::from_utf8_lossy(prefix), commands, options)
     }
 }
 
diff --git a/crates/nu-cli/src/completions/completer.rs b/crates/nu-cli/src/completions/completer.rs
index 2845445b44..555d14ff27 100644
--- a/crates/nu-cli/src/completions/completer.rs
+++ b/crates/nu-cli/src/completions/completer.rs
@@ -38,7 +38,7 @@ impl NuCompleter {
         &self,
         completer: &mut T,
         working_set: &StateWorkingSet,
-        prefix: Vec<u8>,
+        prefix: &[u8],
         new_span: Span,
         offset: usize,
         pos: usize,
@@ -55,7 +55,7 @@ impl NuCompleter {
         completer.fetch(
             working_set,
             &self.stack,
-            prefix.clone(),
+            prefix,
             new_span,
             offset,
             pos,
@@ -170,9 +170,9 @@ impl NuCompleter {
                         let new_span = Span::new(flat.0.start, flat.0.end - 1);
 
                         // Parses the prefix. Completion should look up to the cursor position, not after.
-                        let mut prefix = working_set.get_span_contents(flat.0).to_vec();
+                        let mut prefix = working_set.get_span_contents(flat.0);
                         let index = pos - flat.0.start;
-                        prefix.drain(index..);
+                        prefix = &prefix[..index];
 
                         // Variables completion
                         if prefix.starts_with(b"$") || most_left_var.is_some() {
@@ -182,7 +182,7 @@ impl NuCompleter {
                             let mut variable_completions = self.process_completion(
                                 &mut variable_names_completer,
                                 &working_set,
-                                prefix.clone(),
+                                prefix,
                                 new_span,
                                 fake_offset,
                                 pos,
@@ -211,7 +211,7 @@ impl NuCompleter {
                             let result = self.process_completion(
                                 &mut completer,
                                 &working_set,
-                                prefix.clone(),
+                                prefix,
                                 new_span,
                                 fake_offset,
                                 pos,
@@ -362,7 +362,7 @@ impl NuCompleter {
                                 let mut out: Vec<_> = self.process_completion(
                                     &mut completer,
                                     &working_set,
-                                    prefix.clone(),
+                                    prefix,
                                     new_span,
                                     fake_offset,
                                     pos,
diff --git a/crates/nu-cli/src/completions/completion_common.rs b/crates/nu-cli/src/completions/completion_common.rs
index 438ce2a1f0..fc7a5fcd2c 100644
--- a/crates/nu-cli/src/completions/completion_common.rs
+++ b/crates/nu-cli/src/completions/completion_common.rs
@@ -335,7 +335,7 @@ pub fn sort_completions<T>(
         } else {
             matcher = matcher.ignore_case();
         };
-        items.sort_by(|a, b| {
+        items.sort_unstable_by(|a, b| {
             let a_str = get_value(a);
             let b_str = get_value(b);
             let a_score = matcher.fuzzy_match(a_str, prefix).unwrap_or_default();
@@ -343,7 +343,7 @@ pub fn sort_completions<T>(
             b_score.cmp(&a_score).then(a_str.cmp(b_str))
         });
     } else {
-        items.sort_by(|a, b| get_value(a).cmp(get_value(b)));
+        items.sort_unstable_by(|a, b| get_value(a).cmp(get_value(b)));
     }
 
     items
diff --git a/crates/nu-cli/src/completions/custom_completions.rs b/crates/nu-cli/src/completions/custom_completions.rs
index 817c7aec47..b6098bc85d 100644
--- a/crates/nu-cli/src/completions/custom_completions.rs
+++ b/crates/nu-cli/src/completions/custom_completions.rs
@@ -35,7 +35,7 @@ impl Completer for CustomCompletion {
         &mut self,
         working_set: &StateWorkingSet,
         _stack: &Stack,
-        prefix: Vec<u8>,
+        prefix: &[u8],
         span: Span,
         offset: usize,
         pos: usize,
@@ -126,8 +126,8 @@ impl Completer for CustomCompletion {
         let options = custom_completion_options
             .as_ref()
             .unwrap_or(completion_options);
-        let suggestions = filter(&prefix, suggestions, options);
-        sort_suggestions(&String::from_utf8_lossy(&prefix), suggestions, options)
+        let suggestions = filter(prefix, suggestions, options);
+        sort_suggestions(&String::from_utf8_lossy(prefix), suggestions, options)
     }
 }
 
diff --git a/crates/nu-cli/src/completions/directory_completions.rs b/crates/nu-cli/src/completions/directory_completions.rs
index 342cf42f4e..ea8eb89871 100644
--- a/crates/nu-cli/src/completions/directory_completions.rs
+++ b/crates/nu-cli/src/completions/directory_completions.rs
@@ -26,13 +26,13 @@ impl Completer for DirectoryCompletion {
         &mut self,
         working_set: &StateWorkingSet,
         stack: &Stack,
-        prefix: Vec<u8>,
+        prefix: &[u8],
         span: Span,
         offset: usize,
         _pos: usize,
         options: &CompletionOptions,
     ) -> Vec<SemanticSuggestion> {
-        let AdjustView { prefix, span, .. } = adjust_if_intermediate(&prefix, working_set, span);
+        let AdjustView { prefix, span, .. } = adjust_if_intermediate(prefix, working_set, span);
 
         // Filter only the folders
         #[allow(deprecated)]
diff --git a/crates/nu-cli/src/completions/dotnu_completions.rs b/crates/nu-cli/src/completions/dotnu_completions.rs
index 4a241a57b9..482c5c1d18 100644
--- a/crates/nu-cli/src/completions/dotnu_completions.rs
+++ b/crates/nu-cli/src/completions/dotnu_completions.rs
@@ -22,13 +22,13 @@ impl Completer for DotNuCompletion {
         &mut self,
         working_set: &StateWorkingSet,
         stack: &Stack,
-        prefix: Vec<u8>,
+        prefix: &[u8],
         span: Span,
         offset: usize,
         _pos: usize,
         options: &CompletionOptions,
     ) -> Vec<SemanticSuggestion> {
-        let prefix_str = String::from_utf8_lossy(&prefix).replace('`', "");
+        let prefix_str = String::from_utf8_lossy(prefix).replace('`', "");
         let mut search_dirs: Vec<String> = vec![];
 
         // If prefix_str is only a word we want to search in the current dir
diff --git a/crates/nu-cli/src/completions/file_completions.rs b/crates/nu-cli/src/completions/file_completions.rs
index 16e0c09b5c..42e1d397ea 100644
--- a/crates/nu-cli/src/completions/file_completions.rs
+++ b/crates/nu-cli/src/completions/file_completions.rs
@@ -27,7 +27,7 @@ impl Completer for FileCompletion {
         &mut self,
         working_set: &StateWorkingSet,
         stack: &Stack,
-        prefix: Vec<u8>,
+        prefix: &[u8],
         span: Span,
         offset: usize,
         _pos: usize,
@@ -37,7 +37,7 @@ impl Completer for FileCompletion {
             prefix,
             span,
             readjusted,
-        } = adjust_if_intermediate(&prefix, working_set, span);
+        } = adjust_if_intermediate(prefix, working_set, span);
 
         #[allow(deprecated)]
         let items: Vec<_> = complete_item(
diff --git a/crates/nu-cli/src/completions/flag_completions.rs b/crates/nu-cli/src/completions/flag_completions.rs
index 590929d5a0..57cd691082 100644
--- a/crates/nu-cli/src/completions/flag_completions.rs
+++ b/crates/nu-cli/src/completions/flag_completions.rs
@@ -24,7 +24,7 @@ impl Completer for FlagCompletion {
         &mut self,
         working_set: &StateWorkingSet,
         _stack: &Stack,
-        prefix: Vec<u8>,
+        prefix: &[u8],
         span: Span,
         offset: usize,
         _pos: usize,
@@ -44,7 +44,7 @@ impl Completer for FlagCompletion {
                     short.encode_utf8(&mut named);
                     named.insert(0, b'-');
 
-                    if options.match_algorithm.matches_u8(&named, &prefix) {
+                    if options.match_algorithm.matches_u8(&named, prefix) {
                         output.push(SemanticSuggestion {
                             suggestion: Suggestion {
                                 value: String::from_utf8_lossy(&named).to_string(),
@@ -70,7 +70,7 @@ impl Completer for FlagCompletion {
                 named.insert(0, b'-');
                 named.insert(0, b'-');
 
-                if options.match_algorithm.matches_u8(&named, &prefix) {
+                if options.match_algorithm.matches_u8(&named, prefix) {
                     output.push(SemanticSuggestion {
                         suggestion: Suggestion {
                             value: String::from_utf8_lossy(&named).to_string(),
@@ -88,7 +88,7 @@ impl Completer for FlagCompletion {
                 }
             }
 
-            return sort_suggestions(&String::from_utf8_lossy(&prefix), output, options);
+            return sort_suggestions(&String::from_utf8_lossy(prefix), output, options);
         }
 
         vec![]
diff --git a/crates/nu-cli/src/completions/operator_completions.rs b/crates/nu-cli/src/completions/operator_completions.rs
index c670988a29..e9e95d0799 100644
--- a/crates/nu-cli/src/completions/operator_completions.rs
+++ b/crates/nu-cli/src/completions/operator_completions.rs
@@ -24,7 +24,7 @@ impl Completer for OperatorCompletion {
         &mut self,
         working_set: &StateWorkingSet,
         _stack: &Stack,
-        _prefix: Vec<u8>,
+        _prefix: &[u8],
         span: Span,
         offset: usize,
         _pos: usize,
diff --git a/crates/nu-cli/src/completions/variable_completions.rs b/crates/nu-cli/src/completions/variable_completions.rs
index 5e8f117810..29b5393257 100644
--- a/crates/nu-cli/src/completions/variable_completions.rs
+++ b/crates/nu-cli/src/completions/variable_completions.rs
@@ -27,7 +27,7 @@ impl Completer for VariableCompletion {
         &mut self,
         working_set: &StateWorkingSet,
         stack: &Stack,
-        prefix: Vec<u8>,
+        prefix: &[u8],
         span: Span,
         offset: usize,
         _pos: usize,
@@ -42,7 +42,7 @@ impl Completer for VariableCompletion {
             end: span.end - offset,
         };
         let sublevels_count = self.var_context.1.len();
-        let prefix_str = String::from_utf8_lossy(&prefix);
+        let prefix_str = String::from_utf8_lossy(prefix);
 
         // Completions for the given variable
         if !var_str.is_empty() {
@@ -66,7 +66,7 @@ impl Completer for VariableCompletion {
                             if options.match_algorithm.matches_u8_insensitive(
                                 options.case_sensitive,
                                 suggestion.suggestion.value.as_bytes(),
-                                &prefix,
+                                prefix,
                             ) {
                                 output.push(suggestion);
                             }
@@ -80,7 +80,7 @@ impl Completer for VariableCompletion {
                         if options.match_algorithm.matches_u8_insensitive(
                             options.case_sensitive,
                             env_var.0.as_bytes(),
-                            &prefix,
+                            prefix,
                         ) {
                             output.push(SemanticSuggestion {
                                 suggestion: Suggestion {
@@ -111,7 +111,7 @@ impl Completer for VariableCompletion {
                         if options.match_algorithm.matches_u8_insensitive(
                             options.case_sensitive,
                             suggestion.suggestion.value.as_bytes(),
-                            &prefix,
+                            prefix,
                         ) {
                             output.push(suggestion);
                         }
@@ -133,7 +133,7 @@ impl Completer for VariableCompletion {
                         if options.match_algorithm.matches_u8_insensitive(
                             options.case_sensitive,
                             suggestion.suggestion.value.as_bytes(),
-                            &prefix,
+                            prefix,
                         ) {
                             output.push(suggestion);
                         }
@@ -149,7 +149,7 @@ impl Completer for VariableCompletion {
             if options.match_algorithm.matches_u8_insensitive(
                 options.case_sensitive,
                 builtin.as_bytes(),
-                &prefix,
+                prefix,
             ) {
                 output.push(SemanticSuggestion {
                     suggestion: Suggestion {
@@ -173,7 +173,7 @@ impl Completer for VariableCompletion {
                     if options.match_algorithm.matches_u8_insensitive(
                         options.case_sensitive,
                         v.0,
-                        &prefix,
+                        prefix,
                     ) {
                         output.push(SemanticSuggestion {
                             suggestion: Suggestion {
@@ -201,7 +201,7 @@ impl Completer for VariableCompletion {
                 if options.match_algorithm.matches_u8_insensitive(
                     options.case_sensitive,
                     v.0,
-                    &prefix,
+                    prefix,
                 ) {
                     output.push(SemanticSuggestion {
                         suggestion: Suggestion {

From 6dc71f5ad0d4dae57cdcf653e6a877585a0edb3d Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Sun, 6 Oct 2024 15:17:12 -0500
Subject: [PATCH 0518/1072] add unicode-width to `str stats` (#14014)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

This PR adds another type of length to `str stats`, unicode-width.
```nushell
❯ "\u{ff03}" | str stats
╭───────────────┬───╮
│ lines         │ 1 │
│ words         │ 0 │
│ bytes         │ 3 │
│ chars         │ 1 │
│ graphemes     │ 1 │
│ unicode-width │ 2 │
╰───────────────┴───╯
❯ "Amélie Amelie" | str stats
╭───────────────┬────╮
│ lines         │ 1  │
│ words         │ 2  │
│ bytes         │ 15 │
│ chars         │ 14 │
│ graphemes     │ 13 │
│ unicode-width │ 13 │
╰───────────────┴────╯
❯ '今天天气真好' | str stats
╭───────────────┬────╮
│ lines         │ 1  │
│ words         │ 6  │
│ bytes         │ 18 │
│ chars         │ 6  │
│ graphemes     │ 6  │
│ unicode-width │ 12 │
╰───────────────┴────╯
❯ "Μπορῶ νὰ φάω σπασμένα γυαλιὰ χωρὶς νὰ πάθω τίποτα." | str stats
╭───────────────┬────╮
│ lines         │ 1  │
│ words         │ 9  │
│ bytes         │ 96 │
│ chars         │ 50 │
│ graphemes     │ 50 │
│ unicode-width │ 50 │
╰───────────────┴────╯
❯ "\n" | str stats
╭───────────────┬───╮
│ lines         │ 1 │
│ words         │ 0 │
│ bytes         │ 1 │
│ chars         │ 1 │
│ graphemes     │ 1 │
│ unicode-width │ 0 │
╰───────────────┴───╯
```
The idea of this PR came from me wondering if we could replace `#` with
`\u{ff03}` in tables.

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/strings/str_/stats.rs | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/crates/nu-command/src/strings/str_/stats.rs b/crates/nu-command/src/strings/str_/stats.rs
index 48d9f95daf..586a48ffde 100644
--- a/crates/nu-command/src/strings/str_/stats.rs
+++ b/crates/nu-command/src/strings/str_/stats.rs
@@ -64,17 +64,19 @@ impl Command for SubCommand {
                         "bytes" =>     Value::test_int(38),
                         "chars" =>     Value::test_int(38),
                         "graphemes" => Value::test_int(38),
+                        "unicode-width" => Value::test_int(38),
                 })),
             },
             Example {
                 description: "Counts unicode characters",
-                example: r#"'今天天气真好' | str stats "#,
+                example: r#"'今天天气真好' | str stats"#,
                 result: Some(Value::test_record(record! {
                         "lines" =>     Value::test_int(1),
                         "words" =>     Value::test_int(6),
                         "bytes" =>     Value::test_int(18),
                         "chars" =>     Value::test_int(6),
                         "graphemes" => Value::test_int(6),
+                        "unicode-width" => Value::test_int(12),
                 })),
             },
             Example {
@@ -86,6 +88,7 @@ impl Command for SubCommand {
                         "bytes" =>     Value::test_int(15),
                         "chars" =>     Value::test_int(14),
                         "graphemes" => Value::test_int(13),
+                        "unicode-width" => Value::test_int(13),
                 })),
             },
         ]
@@ -139,6 +142,7 @@ fn counter(contents: &str, span: Span) -> Value {
         "bytes" => get_count(&counts, Counter::Bytes, span),
         "chars" => get_count(&counts, Counter::CodePoints, span),
         "graphemes" => get_count(&counts, Counter::GraphemeClusters, span),
+        "unicode-width" => get_count(&counts, Counter::UnicodeWidth, span),
     };
 
     Value::record(record, span)
@@ -208,6 +212,7 @@ impl Count for Counter {
             }
             Counter::Words => s.unicode_words().count(),
             Counter::CodePoints => s.chars().count(),
+            Counter::UnicodeWidth => unicode_width::UnicodeWidthStr::width(s),
         }
     }
 }
@@ -229,15 +234,19 @@ pub enum Counter {
 
     /// Counts unicode code points
     CodePoints,
+
+    /// Counts the width of the string
+    UnicodeWidth,
 }
 
 /// A convenience array of all counter types.
-pub const ALL_COUNTERS: [Counter; 5] = [
+pub const ALL_COUNTERS: [Counter; 6] = [
     Counter::GraphemeClusters,
     Counter::Bytes,
     Counter::Lines,
     Counter::Words,
     Counter::CodePoints,
+    Counter::UnicodeWidth,
 ];
 
 impl fmt::Display for Counter {
@@ -248,6 +257,7 @@ impl fmt::Display for Counter {
             Counter::Lines => "lines",
             Counter::Words => "words",
             Counter::CodePoints => "codepoints",
+            Counter::UnicodeWidth => "unicode-width",
         };
 
         write!(f, "{s}")
@@ -297,6 +307,7 @@ fn test_one_newline() {
     correct_counts.insert(Counter::GraphemeClusters, 1);
     correct_counts.insert(Counter::Bytes, 1);
     correct_counts.insert(Counter::CodePoints, 1);
+    correct_counts.insert(Counter::UnicodeWidth, 0);
 
     assert_eq!(correct_counts, counts);
 }
@@ -336,6 +347,7 @@ fn test_count_counts_lines() {
 
     // one more than grapheme clusters because of \r\n
     correct_counts.insert(Counter::CodePoints, 24);
+    correct_counts.insert(Counter::UnicodeWidth, 17);
 
     assert_eq!(correct_counts, counts);
 }
@@ -353,6 +365,7 @@ fn test_count_counts_words() {
     correct_counts.insert(Counter::Bytes, i_can_eat_glass.len());
     correct_counts.insert(Counter::Words, 9);
     correct_counts.insert(Counter::CodePoints, 50);
+    correct_counts.insert(Counter::UnicodeWidth, 50);
 
     assert_eq!(correct_counts, counts);
 }

From 98e0864be8650dcf4051aa86120f9a3404920b5e Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Sun, 6 Oct 2024 20:49:56 -0500
Subject: [PATCH 0519/1072] update nushell to reedline 871075e (#14017)

# Description

update nushell to the latest reedline

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

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

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

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

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

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

diff --git a/Cargo.lock b/Cargo.lock
index de244d4293..a27b84b263 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5140,7 +5140,7 @@ dependencies = [
 [[package]]
 name = "reedline"
 version = "0.35.0"
-source = "git+https://github.com/nushell/reedline?branch=main#660a5074b2bd432b47e2e0bb7cca11b4509ff3df"
+source = "git+https://github.com/nushell/reedline?branch=main#871075e62b5703cfc584e4e02b14c2473f5b0b63"
 dependencies = [
  "arboard",
  "chrono",

From 4c8b09eb97af5d93c587f7cf652cf85ffa093901 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Mon, 7 Oct 2024 02:34:47 -0400
Subject: [PATCH 0520/1072] Load env when importing with `use std *` (#14012)

# Description

After a `use std *`, the environment variables exported from the
submodules' `export-env` blocks are not available because of #13403.
This causes failures in `log` (currently) and will cause issues in
`dirs` once we stop autoloading it separately.

When the submodules are loaded separately (e.g., `use std/log`),
everything already worked correctly. While this is the preferred way of
doing it, we also want `use std *` to work properly.

This is a workaround for the standard library submodules. It is
definitely not ideal, but it can be removed when and if #13403 is fixed.

For now, we need to duplicate any environment settings in both the
submodules (when loaded with `use std/log`) and in the standard library
itself (when loaded with `use std *`). Again, this should not be
necessary, but currently is because of #13403.

# User-Facing Changes

Bug fix

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

N/A
---
 crates/nu-std/std/mod.nu | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/crates/nu-std/std/mod.nu b/crates/nu-std/std/mod.nu
index 2669c102e8..88a15d0f00 100644
--- a/crates/nu-std/std/mod.nu
+++ b/crates/nu-std/std/mod.nu
@@ -26,3 +26,14 @@ export module ./dirs {
     goto
   ]
 }
+
+# Workaround for #13403 to load export-env blocks from submodules
+export-env {
+    # log
+    $env.NU_LOG_FORMAT = $env.NU_LOG_FORMAT? | default "%ANSI_START%%DATE%|%LEVEL%|%MSG%%ANSI_STOP%"
+    $env.NU_LOG_DATE_FORMAT = $env.NU_LOG_DATE_FORMAT? | default "%Y-%m-%dT%H:%M:%S%.3f"
+    
+    # dirs
+    $env.DIRS_POSITION = 0
+    $env.DIRS_LIST = [($env.PWD | path expand)]
+}

From 2830ec008c2459bbd765fa15c5985eebcfc372bc Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Tue, 8 Oct 2024 11:01:43 +0800
Subject: [PATCH 0521/1072] Replace the old `encode base64` and `decode base64`
 with new-base64 commands (#14018)

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

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

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

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
Maybe we can deprecate `encode new-base64` and `decode new-base64`
first, to make the code clean and simple I'd rather remove the old
`encode base64` and `decode base64` and replace them with the `*
new-base64` commands.

Related PR: https://github.com/nushell/nushell/pull/13428

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

- `encode new-base64` --> `encode base64`
- `decode new-base64` --> `decode base64`

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

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

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

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

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

It's a breaking change
---
 crates/nu-command/src/default_context.rs      |   2 -
 crates/nu-command/src/strings/base/base64.rs  |  20 +-
 .../src/strings/encode_decode/base64.rs       | 377 ------------------
 .../strings/encode_decode/decode_base64.rs    | 130 ------
 .../strings/encode_decode/encode_base64.rs    | 134 -------
 .../src/strings/encode_decode/mod.rs          |   5 -
 .../nu-command/tests/commands/base/base64.rs  |  32 +-
 crates/nu-command/tests/commands/hash_/mod.rs |  39 +-
 8 files changed, 48 insertions(+), 691 deletions(-)
 delete mode 100644 crates/nu-command/src/strings/encode_decode/base64.rs
 delete mode 100644 crates/nu-command/src/strings/encode_decode/decode_base64.rs
 delete mode 100644 crates/nu-command/src/strings/encode_decode/encode_base64.rs

diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index 01858f02d6..672eea1006 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -188,8 +188,6 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             EncodeBase32Hex,
             DecodeBase64,
             EncodeBase64,
-            DecodeBase64Old,
-            EncodeBase64Old,
             DetectColumns,
             Parse,
             Split,
diff --git a/crates/nu-command/src/strings/base/base64.rs b/crates/nu-command/src/strings/base/base64.rs
index 3a1ccad9ef..9c68112b33 100644
--- a/crates/nu-command/src/strings/base/base64.rs
+++ b/crates/nu-command/src/strings/base/base64.rs
@@ -38,11 +38,11 @@ pub struct DecodeBase64;
 
 impl Command for DecodeBase64 {
     fn name(&self) -> &str {
-        "decode new-base64"
+        "decode base64"
     }
 
     fn signature(&self) -> Signature {
-        Signature::build("decode new-base64")
+        Signature::build("decode base64")
             .input_output_types(vec![(Type::String, Type::Binary)])
             .allow_variants_without_examples(true)
             .switch("url", "Decode the URL-safe Base64 version.", None)
@@ -62,17 +62,17 @@ impl Command for DecodeBase64 {
         vec![
             Example {
                 description: "Decode a Base64 string",
-                example: r#""U29tZSBEYXRh" | decode new-base64 | decode"#,
+                example: r#""U29tZSBEYXRh" | decode base64 | decode"#,
                 result: None,
             },
             Example {
                 description: "Decode arbitrary data",
-                example: r#""/w==" | decode new-base64"#,
+                example: r#""/w==" | decode base64"#,
                 result: Some(Value::test_binary(vec![0xFF])),
             },
             Example {
                 description: "Decode a URL-safe Base64 string",
-                example: r#""_w==" | decode new-base64 --url"#,
+                example: r#""_w==" | decode base64 --url"#,
                 result: Some(Value::test_binary(vec![0xFF])),
             },
         ]
@@ -109,11 +109,11 @@ pub struct EncodeBase64;
 
 impl Command for EncodeBase64 {
     fn name(&self) -> &str {
-        "encode new-base64"
+        "encode base64"
     }
 
     fn signature(&self) -> Signature {
-        Signature::build("encode new-base64")
+        Signature::build("encode base64")
             .input_output_types(vec![
                 (Type::String, Type::String),
                 (Type::Binary, Type::String),
@@ -135,17 +135,17 @@ impl Command for EncodeBase64 {
         vec![
             Example {
                 description: "Encode a string with Base64",
-                example: r#""Alphabet from A to Z" | encode new-base64"#,
+                example: r#""Alphabet from A to Z" | encode base64"#,
                 result: Some(Value::test_string("QWxwaGFiZXQgZnJvbSBBIHRvIFo=")),
             },
             Example {
                 description: "Encode arbitrary data",
-                example: r#"0x[BE EE FF] | encode new-base64"#,
+                example: r#"0x[BE EE FF] | encode base64"#,
                 result: Some(Value::test_string("vu7/")),
             },
             Example {
                 description: "Use a URL-safe alphabet",
-                example: r#"0x[BE EE FF] | encode new-base64 --url"#,
+                example: r#"0x[BE EE FF] | encode base64 --url"#,
                 result: Some(Value::test_string("vu7_")),
             },
         ]
diff --git a/crates/nu-command/src/strings/encode_decode/base64.rs b/crates/nu-command/src/strings/encode_decode/base64.rs
deleted file mode 100644
index dd9289a141..0000000000
--- a/crates/nu-command/src/strings/encode_decode/base64.rs
+++ /dev/null
@@ -1,377 +0,0 @@
-use base64::{
-    alphabet,
-    engine::{
-        general_purpose::{NO_PAD, PAD},
-        GeneralPurpose,
-    },
-    Engine,
-};
-use nu_cmd_base::input_handler::{operate as general_operate, CmdArgument};
-use nu_protocol::{
-    ast::CellPath,
-    engine::{Call, EngineState},
-    PipelineData, ShellError, Span, Spanned, Value,
-};
-
-pub const CHARACTER_SET_DESC: &str = "specify the character rules for encoding the input.\n\
-                    \tValid values are 'standard', 'standard-no-padding', 'url-safe', 'url-safe-no-padding',\
-                    'binhex', 'bcrypt', 'crypt', 'mutf7'";
-
-#[derive(Clone)]
-pub struct Base64Config {
-    pub character_set: Spanned<String>,
-    pub action_type: ActionType,
-}
-
-#[derive(Clone, Copy, PartialEq, Eq)]
-pub enum ActionType {
-    Encode,
-    Decode,
-}
-
-struct Arguments {
-    cell_paths: Option<Vec<CellPath>>,
-    binary: bool,
-    encoding_config: Base64Config,
-}
-
-impl CmdArgument for Arguments {
-    fn take_cell_paths(&mut self) -> Option<Vec<CellPath>> {
-        self.cell_paths.take()
-    }
-}
-
-pub(super) struct Base64CommandArguments {
-    pub(super) character_set: Option<Spanned<String>>,
-    pub(super) action_type: ActionType,
-    pub(super) binary: bool,
-}
-
-pub fn operate(
-    engine_state: &EngineState,
-    call: &Call,
-    input: PipelineData,
-    cell_paths: Vec<CellPath>,
-    args: Base64CommandArguments,
-) -> Result<PipelineData, ShellError> {
-    let head = call.head;
-    let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
-
-    // Default the character set to standard if the argument is not specified.
-    let character_set = match args.character_set {
-        Some(inner_tag) => inner_tag,
-        None => Spanned {
-            item: "standard".to_string(),
-            span: head, // actually this span is always useless, because default character_set is always valid.
-        },
-    };
-
-    let args = Arguments {
-        encoding_config: Base64Config {
-            character_set,
-            action_type: args.action_type,
-        },
-        binary: args.binary,
-        cell_paths,
-    };
-
-    general_operate(action, args, input, call.head, engine_state.signals())
-}
-
-fn action(
-    input: &Value,
-    // only used for `decode` action
-    args: &Arguments,
-    command_span: Span,
-) -> Value {
-    let base64_config = &args.encoding_config;
-    let output_binary = args.binary;
-
-    let config_character_set = &base64_config.character_set;
-    let base64_engine: GeneralPurpose = match config_character_set.item.as_str() {
-        "standard" => GeneralPurpose::new(&alphabet::STANDARD, PAD),
-        "standard-no-padding" => GeneralPurpose::new(&alphabet::STANDARD, NO_PAD),
-        "url-safe" => GeneralPurpose::new(&alphabet::URL_SAFE, PAD),
-        "url-safe-no-padding" => GeneralPurpose::new(&alphabet::URL_SAFE, NO_PAD),
-        "bcrypt" => GeneralPurpose::new(&alphabet::BCRYPT, NO_PAD),
-        "binhex" => GeneralPurpose::new(&alphabet::BIN_HEX, NO_PAD),
-        "crypt" => GeneralPurpose::new(&alphabet::CRYPT, NO_PAD),
-        "mutf7" => GeneralPurpose::new(&alphabet::IMAP_MUTF7, NO_PAD),
-        not_valid => return Value::error (
-            ShellError::GenericError {
-            error: "value is not an accepted character set".into(),
-            msg: format!(
-                "{not_valid} is not a valid character-set.\nPlease use `help encode base64` to see a list of valid character sets."
-            ),
-            span: Some(config_character_set.span),
-            help: None,
-            inner: vec![],
-        }, config_character_set.span)
-    };
-    let value_span = input.span();
-    match input {
-        // Propagate existing errors.
-        Value::Error { .. } => input.clone(),
-        Value::Binary { val, .. } => match base64_config.action_type {
-            ActionType::Encode => {
-                let mut enc_vec = vec![0; val.len() * 4 / 3 + 4];
-                let bytes_written = match base64_engine.encode_slice(val, &mut enc_vec) {
-                    Ok(bytes_written) => bytes_written,
-                    Err(e) => {
-                        return Value::error(
-                            ShellError::GenericError {
-                                error: "Error encoding data".into(),
-                                msg: e.to_string(),
-                                span: Some(value_span),
-                                help: None,
-                                inner: vec![],
-                            },
-                            value_span,
-                        )
-                    }
-                };
-                enc_vec.truncate(bytes_written);
-                Value::string(std::str::from_utf8(&enc_vec).unwrap_or(""), command_span)
-            }
-            ActionType::Decode => Value::error(
-                ShellError::UnsupportedInput {
-                    msg: "Binary data can only be encoded".to_string(),
-                    input: "value originates from here".into(),
-                    msg_span: command_span,
-                    input_span: input.span(),
-                },
-                command_span,
-            ),
-        },
-        Value::String { val, .. } => {
-            match base64_config.action_type {
-                ActionType::Encode => {
-                    let mut enc_str = String::new();
-                    base64_engine.encode_string(val, &mut enc_str);
-                    Value::string(enc_str, command_span)
-                }
-
-                ActionType::Decode => {
-                    // for decode, input val may contains invalid new line character, which is ok to omitted them by default.
-                    let val = val.clone();
-                    let val = val.replace("\r\n", "").replace('\n', "");
-
-                    match base64_engine.decode(val) {
-                        Ok(decoded_value) => {
-                            if output_binary {
-                                Value::binary(decoded_value, command_span)
-                            } else {
-                                match String::from_utf8(decoded_value) {
-                                    Ok(string_value) => Value::string(string_value, command_span),
-                                    Err(e) => Value::error(
-                                        ShellError::GenericError {
-                                            error: "base64 payload isn't a valid utf-8 sequence"
-                                                .into(),
-                                            msg: e.to_string(),
-                                            span: Some(value_span),
-                                            help: Some(
-                                                "consider using the `--binary` flag".to_owned(),
-                                            ),
-                                            inner: vec![],
-                                        },
-                                        value_span,
-                                    ),
-                                }
-                            }
-                        }
-                        Err(_) => Value::error(
-                            ShellError::GenericError {
-                                error: "value could not be base64 decoded".into(),
-                                msg: format!(
-                                    "invalid base64 input for character set {}",
-                                    &config_character_set.item
-                                ),
-                                span: Some(command_span),
-                                help: None,
-                                inner: vec![],
-                            },
-                            command_span,
-                        ),
-                    }
-                }
-            }
-        }
-        other => Value::error(
-            ShellError::TypeMismatch {
-                err_message: format!("string or binary, not {}", other.get_type()),
-                span: other.span(),
-            },
-            other.span(),
-        ),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::{action, ActionType, Arguments, Base64Config};
-    use nu_protocol::{Span, Spanned, Value};
-
-    #[test]
-    fn base64_encode_standard() {
-        let word = Value::test_string("Some Data Padding");
-        let expected = Value::test_string("U29tZSBEYXRhIFBhZGRpbmc=");
-
-        let actual = action(
-            &word,
-            &Arguments {
-                encoding_config: Base64Config {
-                    character_set: Spanned {
-                        item: "standard".to_string(),
-                        span: Span::test_data(),
-                    },
-                    action_type: ActionType::Encode,
-                },
-                binary: true,
-                cell_paths: None,
-            },
-            Span::test_data(),
-        );
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn base64_encode_standard_no_padding() {
-        let word = Value::test_string("Some Data Padding");
-        let expected = Value::test_string("U29tZSBEYXRhIFBhZGRpbmc");
-
-        let actual = action(
-            &word,
-            &Arguments {
-                encoding_config: Base64Config {
-                    character_set: Spanned {
-                        item: "standard-no-padding".to_string(),
-                        span: Span::test_data(),
-                    },
-                    action_type: ActionType::Encode,
-                },
-                binary: true,
-                cell_paths: None,
-            },
-            Span::test_data(),
-        );
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn base64_encode_url_safe() {
-        let word = Value::test_string("this is for url");
-        let expected = Value::test_string("dGhpcyBpcyBmb3IgdXJs");
-
-        let actual = action(
-            &word,
-            &Arguments {
-                encoding_config: Base64Config {
-                    character_set: Spanned {
-                        item: "url-safe".to_string(),
-                        span: Span::test_data(),
-                    },
-                    action_type: ActionType::Encode,
-                },
-                binary: true,
-                cell_paths: None,
-            },
-            Span::test_data(),
-        );
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn base64_decode_binhex() {
-        let word = Value::test_string(r#"B5"LD@jSCAJJG'9cG!"#);
-        let expected = Value::binary(b"a binhex test".as_slice(), Span::test_data());
-
-        let actual = action(
-            &word,
-            &Arguments {
-                encoding_config: Base64Config {
-                    character_set: Spanned {
-                        item: "binhex".to_string(),
-                        span: Span::test_data(),
-                    },
-                    action_type: ActionType::Decode,
-                },
-                binary: true,
-                cell_paths: None,
-            },
-            Span::test_data(),
-        );
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn base64_decode_binhex_with_new_line_input() {
-        let word = Value::test_string("B5\"LD@jSC\nAJJG'9cG!");
-        let expected = Value::binary(b"a binhex test".as_slice(), Span::test_data());
-
-        let actual = action(
-            &word,
-            &Arguments {
-                encoding_config: Base64Config {
-                    character_set: Spanned {
-                        item: "binhex".to_string(),
-                        span: Span::test_data(),
-                    },
-                    action_type: ActionType::Decode,
-                },
-                binary: true,
-                cell_paths: None,
-            },
-            Span::test_data(),
-        );
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn base64_encode_binary() {
-        let word = Value::binary(vec![77, 97, 110], Span::test_data());
-        let expected = Value::test_string("TWFu");
-
-        let actual = action(
-            &word,
-            &Arguments {
-                encoding_config: Base64Config {
-                    character_set: Spanned {
-                        item: "standard".to_string(),
-                        span: Span::test_data(),
-                    },
-                    action_type: ActionType::Encode,
-                },
-                binary: true,
-                cell_paths: None,
-            },
-            Span::test_data(),
-        );
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn base64_decode_binary_expect_error() {
-        let word = Value::binary(vec![77, 97, 110], Span::test_data());
-
-        let actual = action(
-            &word,
-            &Arguments {
-                encoding_config: Base64Config {
-                    character_set: Spanned {
-                        item: "standard".to_string(),
-                        span: Span::test_data(),
-                    },
-                    action_type: ActionType::Decode,
-                },
-                binary: true,
-                cell_paths: None,
-            },
-            Span::test_data(),
-        );
-
-        match actual {
-            Value::Error { .. } => {}
-            _ => panic!("the result should be Value::Error"),
-        }
-    }
-}
diff --git a/crates/nu-command/src/strings/encode_decode/decode_base64.rs b/crates/nu-command/src/strings/encode_decode/decode_base64.rs
deleted file mode 100644
index f3c2b7fcde..0000000000
--- a/crates/nu-command/src/strings/encode_decode/decode_base64.rs
+++ /dev/null
@@ -1,130 +0,0 @@
-use super::base64::{operate, ActionType, Base64CommandArguments, CHARACTER_SET_DESC};
-use nu_engine::command_prelude::*;
-use nu_protocol::report_shell_warning;
-
-#[derive(Clone)]
-pub struct DecodeBase64Old;
-
-impl Command for DecodeBase64Old {
-    fn name(&self) -> &str {
-        "decode base64"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("decode base64")
-            .input_output_types(vec![
-                (Type::String, Type::Any),
-                (
-                    Type::List(Box::new(Type::String)),
-                    Type::List(Box::new(Type::Any)),
-                ),
-                (Type::table(), Type::table()),
-                (Type::record(), Type::record()),
-            ])
-            .allow_variants_without_examples(true)
-            .named(
-                "character-set",
-                SyntaxShape::String,
-                CHARACTER_SET_DESC,
-                Some('c'),
-            )
-            .switch(
-                "binary",
-                "Output a binary value instead of decoding payload as UTF-8",
-                Some('b'),
-            )
-            .rest(
-                "rest",
-                SyntaxShape::CellPath,
-                "For a data structure input, decode data at the given cell paths.",
-            )
-            .category(Category::Hash)
-    }
-
-    fn description(&self) -> &str {
-        "Base64 decode a value."
-    }
-
-    fn extra_description(&self) -> &str {
-        r#"Will attempt to decode binary payload as an UTF-8 string by default. Use the `--binary(-b)` argument to force binary output."#
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Base64 decode a value and output as UTF-8 string",
-                example: "'U29tZSBEYXRh' | decode base64",
-                result: Some(Value::test_string("Some Data")),
-            },
-            Example {
-                description: "Base64 decode a value and output as binary",
-                example: "'U29tZSBEYXRh' | decode base64 --binary",
-                result: Some(Value::binary(
-                    [0x53, 0x6f, 0x6d, 0x65, 0x20, 0x44, 0x61, 0x74, 0x61],
-                    Span::test_data(),
-                )),
-            },
-        ]
-    }
-
-    fn is_const(&self) -> bool {
-        true
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        report_shell_warning(
-            engine_state,
-            &ShellError::Deprecated {
-                old_command: "decode base64".into(),
-                new_suggestion: "the new `decode new-base64` version".into(),
-                span: call.head,
-                url: "`help decode new-base64`".into(),
-            },
-        );
-
-        let character_set: Option<Spanned<String>> =
-            call.get_flag(engine_state, stack, "character-set")?;
-        let binary = call.has_flag(engine_state, stack, "binary")?;
-        let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
-        let args = Base64CommandArguments {
-            action_type: ActionType::Decode,
-            binary,
-            character_set,
-        };
-        operate(engine_state, call, input, cell_paths, args)
-    }
-
-    fn run_const(
-        &self,
-        working_set: &StateWorkingSet,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let character_set: Option<Spanned<String>> =
-            call.get_flag_const(working_set, "character-set")?;
-        let binary = call.has_flag_const(working_set, "binary")?;
-        let cell_paths: Vec<CellPath> = call.rest_const(working_set, 0)?;
-        let args = Base64CommandArguments {
-            action_type: ActionType::Decode,
-            binary,
-            character_set,
-        };
-        operate(working_set.permanent(), call, input, cell_paths, args)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        crate::test_examples(DecodeBase64Old)
-    }
-}
diff --git a/crates/nu-command/src/strings/encode_decode/encode_base64.rs b/crates/nu-command/src/strings/encode_decode/encode_base64.rs
deleted file mode 100644
index 0181f94aef..0000000000
--- a/crates/nu-command/src/strings/encode_decode/encode_base64.rs
+++ /dev/null
@@ -1,134 +0,0 @@
-use super::base64::{operate, ActionType, Base64CommandArguments, CHARACTER_SET_DESC};
-use nu_engine::command_prelude::*;
-use nu_protocol::report_shell_warning;
-
-#[derive(Clone)]
-pub struct EncodeBase64Old;
-
-impl Command for EncodeBase64Old {
-    fn name(&self) -> &str {
-        "encode base64"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("encode base64")
-            .input_output_types(vec![
-                (Type::String, Type::String),
-                (Type::Binary, Type::String),
-                (
-                    Type::List(Box::new(Type::String)),
-                    Type::List(Box::new(Type::String)),
-                ),
-                (
-                    Type::List(Box::new(Type::Binary)),
-                    Type::List(Box::new(Type::String)),
-                ),
-                // Relaxed for heterogeneous list.
-                // Should be removed as soon as the type system supports better restrictions
-                (
-                    Type::List(Box::new(Type::Any)),
-                    Type::List(Box::new(Type::String)),
-                ),
-                (Type::table(), Type::table()),
-                (Type::record(), Type::record()),
-            ])
-            .allow_variants_without_examples(true)
-            .named(
-                "character-set",
-                SyntaxShape::String,
-                CHARACTER_SET_DESC,
-                Some('c'),
-            )
-            .rest(
-                "rest",
-                SyntaxShape::CellPath,
-                "For a data structure input, encode data at the given cell paths.",
-            )
-            .category(Category::Hash)
-    }
-
-    fn description(&self) -> &str {
-        "Encode a string or binary value using Base64."
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Encode binary data",
-                example: "0x[09 F9 11 02 9D 74 E3 5B D8 41 56 C5 63 56 88 C0] | encode base64",
-                result: Some(Value::test_string("CfkRAp1041vYQVbFY1aIwA==")),
-            },
-            Example {
-                description: "Encode a string with default settings",
-                example: "'Some Data' | encode base64",
-                result: Some(Value::test_string("U29tZSBEYXRh")),
-            },
-            Example {
-                description: "Encode a string with the binhex character set",
-                example: "'Some Data' | encode base64 --character-set binhex",
-                result: Some(Value::test_string(r#"8fpYC5"%BA4K"#)),
-            },
-        ]
-    }
-
-    fn is_const(&self) -> bool {
-        true
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        report_shell_warning(
-            engine_state,
-            &ShellError::Deprecated {
-                old_command: "encode base64".into(),
-                new_suggestion: "the new `encode new-base64` version".into(),
-                span: call.head,
-                url: "`help encode new-base64`".into(),
-            },
-        );
-
-        let character_set: Option<Spanned<String>> =
-            call.get_flag(engine_state, stack, "character-set")?;
-        let binary = call.has_flag(engine_state, stack, "binary")?;
-        let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
-        let args = Base64CommandArguments {
-            action_type: ActionType::Encode,
-            binary,
-            character_set,
-        };
-        operate(engine_state, call, input, cell_paths, args)
-    }
-
-    fn run_const(
-        &self,
-        working_set: &StateWorkingSet,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let character_set: Option<Spanned<String>> =
-            call.get_flag_const(working_set, "character-set")?;
-        let binary = call.has_flag_const(working_set, "binary")?;
-        let cell_paths: Vec<CellPath> = call.rest_const(working_set, 0)?;
-        let args = Base64CommandArguments {
-            action_type: ActionType::Encode,
-            binary,
-            character_set,
-        };
-        operate(working_set.permanent(), call, input, cell_paths, args)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        crate::test_examples(EncodeBase64Old)
-    }
-}
diff --git a/crates/nu-command/src/strings/encode_decode/mod.rs b/crates/nu-command/src/strings/encode_decode/mod.rs
index 5dde14e0f2..350fbf779c 100644
--- a/crates/nu-command/src/strings/encode_decode/mod.rs
+++ b/crates/nu-command/src/strings/encode_decode/mod.rs
@@ -1,11 +1,6 @@
-mod base64;
 mod decode;
-mod decode_base64;
 mod encode;
-mod encode_base64;
 mod encoding;
 
 pub use self::decode::Decode;
-pub use self::decode_base64::DecodeBase64Old;
 pub use self::encode::Encode;
-pub use self::encode_base64::EncodeBase64Old;
diff --git a/crates/nu-command/tests/commands/base/base64.rs b/crates/nu-command/tests/commands/base/base64.rs
index ac3554352c..5100667c81 100644
--- a/crates/nu-command/tests/commands/base/base64.rs
+++ b/crates/nu-command/tests/commands/base/base64.rs
@@ -2,18 +2,18 @@ use nu_test_support::nu;
 
 #[test]
 fn canonical() {
-    super::test_canonical("new-base64");
-    super::test_canonical("new-base64 --url");
-    super::test_canonical("new-base64 --nopad");
-    super::test_canonical("new-base64 --url --nopad");
+    super::test_canonical("base64");
+    super::test_canonical("base64 --url");
+    super::test_canonical("base64 --nopad");
+    super::test_canonical("base64 --url --nopad");
 }
 
 #[test]
 fn const_() {
-    super::test_const("new-base64");
-    super::test_const("new-base64 --url");
-    super::test_const("new-base64 --nopad");
-    super::test_const("new-base64 --url --nopad");
+    super::test_const("base64");
+    super::test_const("base64 --url");
+    super::test_const("base64 --nopad");
+    super::test_const("base64 --url --nopad");
 }
 
 #[test]
@@ -21,7 +21,7 @@ fn encode() {
     let text = "Ș̗͙̂̏o̲̲̗͗̌͊m̝̊̓́͂ë̡̦̞̤́̌̈́̀ ̥̝̪̎̿ͅf̧̪̻͉͗̈́̍̆u̮̝͌̈́ͅn̹̞̈́̊k̮͇̟͎̂͘y̧̲̠̾̆̕ͅ ̙͖̭͔̂̐t̞́́͘e̢̨͕̽x̥͋t͍̑̔͝";
     let encoded = "U8yCzI/MpsyXzZlvzZfMjM2KzLLMssyXbcyKzJPMgc2CzJ1lzYTMjM2EzIDMpsyhzJ7MpCDMjsy/zYXMpcydzKpmzZfNhMyNzIbMqsy7zKfNiXXNjM2EzK7Mnc2Fbs2EzIrMucyea82YzILMrs2HzJ/NjnnMvsyVzIbNhcyyzKfMoCDMgsyQzJnNlsytzZR0zIHNmMyBzJ5lzL3Mos2VzKh4zYvMpXTMkcyUzZ3NjQ==";
 
-    let outcome = nu!("'{}' | encode new-base64", text);
+    let outcome = nu!("'{}' | encode base64", text);
     assert_eq!(outcome.out, encoded);
 }
 
@@ -30,7 +30,7 @@ fn decode_string() {
     let text = "Very important data";
     let encoded = "VmVyeSBpbXBvcnRhbnQgZGF0YQ==";
 
-    let outcome = nu!("'{}' | decode new-base64 | decode", encoded);
+    let outcome = nu!("'{}' | decode base64 | decode", encoded);
     assert_eq!(outcome.out, text);
 }
 
@@ -40,10 +40,10 @@ fn decode_pad_nopad() {
     let encoded_pad = "4oCdwqUuw6RAwrBiWsO2wqI=";
     let encoded_nopad = "4oCdwqUuw6RAwrBiWsO2wqI";
 
-    let outcome = nu!("'{}' | decode new-base64 | decode", encoded_pad);
+    let outcome = nu!("'{}' | decode base64 | decode", encoded_pad);
     assert_eq!(outcome.out, text);
 
-    let outcome = nu!("'{}' | decode new-base64 --nopad | decode", encoded_nopad);
+    let outcome = nu!("'{}' | decode base64 --nopad | decode", encoded_nopad);
     assert_eq!(outcome.out, text);
 }
 
@@ -53,10 +53,10 @@ fn decode_url() {
     let encoded = "cDpn15jdvt+rdCs/";
     let encoded_url = "cDpn15jdvt-rdCs_";
 
-    let outcome = nu!("'{}' | decode new-base64 | decode", encoded);
+    let outcome = nu!("'{}' | decode base64 | decode", encoded);
     assert_eq!(outcome.out, text);
 
-    let outcome = nu!("'{}' | decode new-base64 --url | decode", encoded_url);
+    let outcome = nu!("'{}' | decode base64 --url | decode", encoded_url);
     assert_eq!(outcome.out, text);
 }
 
@@ -65,9 +65,9 @@ fn reject_pad_nopad() {
     let encoded_nopad = "YQ";
     let encoded_pad = "YQ==";
 
-    let outcome = nu!("'{}' | decode new-base64", encoded_nopad);
+    let outcome = nu!("'{}' | decode base64", encoded_nopad);
     assert!(!outcome.err.is_empty());
 
-    let outcome = nu!("'{}' | decode new-base64 --nopad", encoded_pad);
+    let outcome = nu!("'{}' | decode base64 --nopad", encoded_pad);
     assert!(!outcome.err.is_empty())
 }
diff --git a/crates/nu-command/tests/commands/hash_/mod.rs b/crates/nu-command/tests/commands/hash_/mod.rs
index 76ae86f6e7..1f09b5ec52 100644
--- a/crates/nu-command/tests/commands/hash_/mod.rs
+++ b/crates/nu-command/tests/commands/hash_/mod.rs
@@ -10,43 +10,48 @@ fn base64_defaults_to_encoding_with_standard_character_type() {
 }
 
 #[test]
-fn base64_encode_characterset_binhex() {
+fn base64_defaults_to_encoding_with_nopad() {
     let actual = nu!(r#"
-        echo 'username:password' | encode base64 --character-set binhex
+        echo 'username:password' | encode base64 --nopad
         "#);
 
-    assert_eq!(actual.out, "GA0PFQjKE@8kF'&cFhG[FQ3");
+    assert_eq!(actual.out, "dXNlcm5hbWU6cGFzc3dvcmQ");
 }
 
 #[test]
-fn error_when_invalid_character_set_given() {
+fn base64_decode_value() {
     let actual = nu!(r#"
-        echo 'username:password' | encode base64 --character-set 'this is invalid'
+        echo 'YWJjeHl6' | decode base64 | decode
         "#);
 
-    assert!(actual
-        .err
-        .contains("this is invalid is not a valid character-set"));
+    assert_eq!(actual.out, "abcxyz");
 }
 
 #[test]
-fn base64_decode_characterset_binhex() {
-    let actual = nu!(
-        r#""GA0PFQjKE@8kF'&cFhG[FQ3" | decode base64 --character-set binhex --binary | decode utf-8"#
-    );
+fn base64_decode_with_nopad() {
+    let actual = nu!(r#"
+        echo 'R29vZCBsdWNrIHRvIHlvdQ' | decode base64 --nopad | decode
+        "#);
 
-    assert_eq!(actual.out, "username:password");
+    assert_eq!(actual.out, "Good luck to you");
+}
+
+#[test]
+fn base64_decode_with_url() {
+    let actual = nu!(r#"
+        echo 'vu7_' | decode base64 --url | decode
+        "#);
+
+    assert_eq!(actual.out, "¾îÿ");
 }
 
 #[test]
 fn error_invalid_decode_value() {
     let actual = nu!(r#"
-        echo "this should not be a valid encoded value" | decode base64 --character-set url-safe
+        echo "this should not be a valid encoded value" | decode base64
         "#);
 
-    assert!(actual
-        .err
-        .contains("invalid base64 input for character set url-safe"));
+    assert!(actual.err.contains("nu::shell::incorrect_value"));
 }
 
 #[test]

From 55c3fc9141f3709c2e0ab607e291ba27d9e65fa0 Mon Sep 17 00:00:00 2001
From: JustForFun88 <100504524+JustForFun88@users.noreply.github.com>
Date: Tue, 8 Oct 2024 17:42:15 +0500
Subject: [PATCH 0522/1072] Improve keybinding parsing for Unicode support
 (#14020)

# Description

This pull request enhances the `add_parsed_keybinding` function to
provide greater flexibility in specifying keycodes for keybindings in
Nushell. Previously, the function only supported specifying keycodes
directly through character notation (e.g., `char_e` for the character
`e`). This limited users to a small set of keybindings, especially in
scenarios where specific non-English characters were needed.

With this new version, users can also specify characters using their
Unicode codes, such as `char_u003B` for the semicolon (`;`), providing a
more flexible approach to customization, for example like this:

```nushell
{
    name: move_to_line_end_or_take_history_hint
    modifier: shift
    keycode: char_u003B # char_;
    mode: vi_normal
    event: {
        until: [
            { send: historyhintcomplete }
            { edit: movetolineend }
        ]
    }
}
```

# User-Facing Changes

Added support for specifying keycodes using Unicode codes, e.g.,
char_u002C (comma - `,`):

```nushell
{
    name: <command_name>, # name of the command
    modifier: none,       # key modifier
    keycode: char_u002C,  # Unicode code for the comma (',')
    mode: vi_normal,      # mode in which this binding should work
    event: {
        send: <action>    # action to be performed
    }
}
```
---
 crates/nu-cli/src/reedline_config.rs | 118 +++++++++++++++------------
 1 file changed, 65 insertions(+), 53 deletions(-)

diff --git a/crates/nu-cli/src/reedline_config.rs b/crates/nu-cli/src/reedline_config.rs
index 37fc6228b9..48140b4427 100644
--- a/crates/nu-cli/src/reedline_config.rs
+++ b/crates/nu-cli/src/reedline_config.rs
@@ -833,64 +833,76 @@ fn add_parsed_keybinding(
         }
     };
 
-    let keycode = match keybinding
+    let keycode_str = keybinding
         .keycode
         .to_expanded_string("", config)
-        .to_ascii_lowercase()
-        .as_str()
-    {
-        "backspace" => KeyCode::Backspace,
-        "enter" => KeyCode::Enter,
-        c if c.starts_with("char_") => {
-            let mut char_iter = c.chars().skip(5);
-            let pos1 = char_iter.next();
-            let pos2 = char_iter.next();
+        .to_ascii_lowercase();
 
-            let char = if let (Some(char), None) = (pos1, pos2) {
-                char
-            } else {
+    let keycode = if let Some(rest) = keycode_str.strip_prefix("char_") {
+        let error = |exp: &str, value| ShellError::UnsupportedConfigValue {
+            expected: exp.to_string(),
+            value,
+            span: keybinding.keycode.span(),
+        };
+
+        let mut char_iter = rest.chars();
+        let char = match (char_iter.next(), char_iter.next()) {
+            (Some(char), None) => char,
+            (Some('u'), Some(_)) => {
+                // This will never panic as we know there are at least two symbols
+                let Ok(code_point) = u32::from_str_radix(&rest[1..], 16) else {
+                    return Err(error("valid hex code in keycode", keycode_str));
+                };
+
+                char::from_u32(code_point).ok_or(error("valid Unicode code point", keycode_str))?
+            }
+            _ => {
+                return Err(error(
+                    "format 'char_<char>' or 'char_u<hex code>'",
+                    keycode_str,
+                ))
+            }
+        };
+
+        KeyCode::Char(char)
+    } else {
+        match keycode_str.as_str() {
+            "backspace" => KeyCode::Backspace,
+            "enter" => KeyCode::Enter,
+            "space" => KeyCode::Char(' '),
+            "down" => KeyCode::Down,
+            "up" => KeyCode::Up,
+            "left" => KeyCode::Left,
+            "right" => KeyCode::Right,
+            "home" => KeyCode::Home,
+            "end" => KeyCode::End,
+            "pageup" => KeyCode::PageUp,
+            "pagedown" => KeyCode::PageDown,
+            "tab" => KeyCode::Tab,
+            "backtab" => KeyCode::BackTab,
+            "delete" => KeyCode::Delete,
+            "insert" => KeyCode::Insert,
+            c if c.starts_with('f') => {
+                let fn_num: u8 = c[1..]
+                    .parse()
+                    .ok()
+                    .filter(|num| matches!(num, 1..=20))
+                    .ok_or(ShellError::UnsupportedConfigValue {
+                        expected: "(f1|f2|...|f20)".to_string(),
+                        value: format!("unknown function key: {c}"),
+                        span: keybinding.keycode.span(),
+                    })?;
+                KeyCode::F(fn_num)
+            }
+            "null" => KeyCode::Null,
+            "esc" | "escape" => KeyCode::Esc,
+            _ => {
                 return Err(ShellError::UnsupportedConfigValue {
-                    expected: "char_<CHAR: unicode codepoint>".to_string(),
-                    value: c.to_string(),
+                    expected: "crossterm KeyCode".to_string(),
+                    value: keybinding.keycode.to_abbreviated_string(config),
                     span: keybinding.keycode.span(),
-                });
-            };
-
-            KeyCode::Char(char)
-        }
-        "space" => KeyCode::Char(' '),
-        "down" => KeyCode::Down,
-        "up" => KeyCode::Up,
-        "left" => KeyCode::Left,
-        "right" => KeyCode::Right,
-        "home" => KeyCode::Home,
-        "end" => KeyCode::End,
-        "pageup" => KeyCode::PageUp,
-        "pagedown" => KeyCode::PageDown,
-        "tab" => KeyCode::Tab,
-        "backtab" => KeyCode::BackTab,
-        "delete" => KeyCode::Delete,
-        "insert" => KeyCode::Insert,
-        c if c.starts_with('f') => {
-            let fn_num: u8 = c[1..]
-                .parse()
-                .ok()
-                .filter(|num| matches!(num, 1..=20))
-                .ok_or(ShellError::UnsupportedConfigValue {
-                    expected: "(f1|f2|...|f20)".to_string(),
-                    value: format!("unknown function key: {c}"),
-                    span: keybinding.keycode.span(),
-                })?;
-            KeyCode::F(fn_num)
-        }
-        "null" => KeyCode::Null,
-        "esc" | "escape" => KeyCode::Esc,
-        _ => {
-            return Err(ShellError::UnsupportedConfigValue {
-                expected: "crossterm KeyCode".to_string(),
-                value: keybinding.keycode.to_abbreviated_string(config),
-                span: keybinding.keycode.span(),
-            })
+                })
+            }
         }
     };
     if let Some(event) = parse_event(&keybinding.event, config)? {

From 397499b106e37210c6bf7c4aaf22e60f332ee858 Mon Sep 17 00:00:00 2001
From: 1256-bits <104160323+1256-bits@users.noreply.github.com>
Date: Tue, 8 Oct 2024 13:55:20 +0000
Subject: [PATCH 0523/1072] Add ls colors to cjs and mjs files (#14028)

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

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

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

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
Add ls color highlighting for *.cjs and *.mjs files in line with regular
*.js files
Add an icon to *.cjs files in line with *.js and *.mjs files
---
 crates/nu-command/src/viewers/icons.rs | 1 +
 crates/nu-utils/src/utils.rs           | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/crates/nu-command/src/viewers/icons.rs b/crates/nu-command/src/viewers/icons.rs
index 6443063e7b..db3adb153c 100644
--- a/crates/nu-command/src/viewers/icons.rs
+++ b/crates/nu-command/src/viewers/icons.rs
@@ -201,6 +201,7 @@ pub fn icon_for_file(file_path: &Path, span: Span) -> Result<char, ShellError> {
             "cc" => '\u{e61d}',             // 
             "cert" => '\u{eafa}',           // 
             "cfg" => '\u{e615}',            // 
+            "cjs" => '\u{e74e}',            // 
             "class" => '\u{e256}',          // 
             "clj" => '\u{e768}',            // 
             "cljs" => '\u{e76a}',           // 
diff --git a/crates/nu-utils/src/utils.rs b/crates/nu-utils/src/utils.rs
index ea5df308b6..472afc92f7 100644
--- a/crates/nu-utils/src/utils.rs
+++ b/crates/nu-utils/src/utils.rs
@@ -155,6 +155,8 @@ pub fn get_ls_colors(lscolors_env_string: Option<String>) -> LsColors {
                 "*.rb=0;38;5;48",
                 "*.md=0;38;5;185",
                 "*.js=0;38;5;48",
+                "*.cjs=0;38;5;48",
+                "*.mjs=0;38;5;48",
                 "*.go=0;38;5;48",
                 "*.vb=0;38;5;48",
                 "*.hi=0;38;5;243",

From ba4becc61cd9cf242b9a4483b1e90fd91460f232 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Oct 2024 17:07:21 -0700
Subject: [PATCH 0524/1072] Bump indexmap from 2.5.0 to 2.6.0 (#13983)

Bumps [indexmap](https://github.com/indexmap-rs/indexmap) from 2.5.0 to
2.6.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/indexmap-rs/indexmap/blob/master/RELEASES.md">indexmap's
changelog</a>.</em></p>
<blockquote>
<h2>2.6.0 (2024-10-01)</h2>
<ul>
<li>Implemented <code>Clone</code> for <code>map::IntoIter</code> and
<code>set::IntoIter</code>.</li>
<li>Updated the <code>hashbrown</code> dependency to version 0.15.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/bf0362ba25ad3cade401e8314c9ab7aafc638db8"><code>bf0362b</code></a>
Merge pull request <a
href="https://redirect.github.com/indexmap-rs/indexmap/issues/354">#354</a>
from cuviper/release-2.6.0</li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/bd0b4f7c8c7fd636c1c8d04c62d3daf944e9f8b4"><code>bd0b4f7</code></a>
Add all release dates</li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/53400496f4a6a97ebdca9f9fb374d1d617cf9148"><code>5340049</code></a>
Release 2.6.0</li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/7f8022912acccb69ca165f4601e0c1350258a992"><code>7f80229</code></a>
Merge pull request <a
href="https://redirect.github.com/indexmap-rs/indexmap/issues/343">#343</a>
from cuviper/hash_table</li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/e577bf2556a40cb85d3befceeead50ee77ae508d"><code>e577bf2</code></a>
Use <code>hashbrown::HashTable</code> instead of
<code>RawTable</code></li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/09b48ec3b33820fb4c41a06c4260441e4d223cb9"><code>09b48ec</code></a>
Merge pull request <a
href="https://redirect.github.com/indexmap-rs/indexmap/issues/353">#353</a>
from cuviper/move_index</li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/267b83d701b4d010e01089aa528e26f31c244293"><code>267b83d</code></a>
Add an explicit bounds check in <code>move_index</code></li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/d74a4daffbfffba72c1e07fcb5c45a449c5b36e1"><code>d74a4da</code></a>
Merge pull request <a
href="https://redirect.github.com/indexmap-rs/indexmap/issues/349">#349</a>
from waywardmonkeys/improve-doc-formatting</li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/5b0ed20b872618b0e57fa91f85228a174164fce8"><code>5b0ed20</code></a>
docs: Improve doc formatting with backticks</li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/15518f3152bf1eac80d9fd62c4a7010ea68acc00"><code>15518f3</code></a>
Merge pull request <a
href="https://redirect.github.com/indexmap-rs/indexmap/issues/348">#348</a>
from cuviper/clone-intoiter</li>
<li>Additional commits viewable in <a
href="https://github.com/indexmap-rs/indexmap/compare/2.5.0...2.6.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=indexmap&package-manager=cargo&previous-version=2.5.0&new-version=2.6.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jack Wright <jack.wright@disqo.com>
---
 Cargo.lock                         | 13 ++++++++++---
 Cargo.toml                         |  2 +-
 crates/nu_plugin_polars/Cargo.toml |  5 ++++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a27b84b263..cc40db6fa8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1865,6 +1865,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+
 [[package]]
 name = "hashlink"
 version = "0.9.1"
@@ -2074,12 +2080,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.0",
  "serde",
 ]
 
@@ -3586,6 +3592,7 @@ dependencies = [
  "chrono-tz 0.9.0",
  "env_logger 0.11.5",
  "fancy-regex",
+ "hashbrown 0.14.5",
  "indexmap",
  "log",
  "mimalloc",
diff --git a/Cargo.toml b/Cargo.toml
index c000fd4c35..5126492c43 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -92,7 +92,7 @@ filetime = "0.2"
 fuzzy-matcher = "0.3"
 heck = "0.5.0"
 human-date-parser = "0.2.0"
-indexmap = "2.5"
+indexmap = "2.6"
 indicatif = "0.17"
 interprocess = "2.2.0"
 is_executable = "1.0"
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 200e096c85..5a3efef27e 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -26,7 +26,7 @@ nu-utils = { path = "../nu-utils", version = "0.98.1" }
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
 chrono-tz = "0.9"
 fancy-regex = { workspace = true }
-indexmap = { version = "2.5" }
+indexmap = { version = "2.6" }
 mimalloc = { version = "0.1.42" }
 num = {version = "0.4"}
 serde = { version = "1.0", features = ["derive"] }
@@ -41,6 +41,9 @@ env_logger = "0.11.3"
 log.workspace = true
 uuid = { version = "1.10", features = ["v4", "serde"] }
 
+# Do to a compile error with polars, this included to force the raw dependency
+hashbrown = { version = "0.14", features = ["rayon", "ahash", "serde", "raw"] }
+
 [dependencies.polars]
 features = [
 	"arg_where",

From 99798ace7dc2a307708f6a087f2d0bb033aaf4e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Oct 2024 09:52:36 +0800
Subject: [PATCH 0525/1072] Bump crate-ci/typos from 1.25.0 to 1.26.0 (#14031)

Bumps [crate-ci/typos](https://github.com/crate-ci/typos) from 1.25.0 to
1.26.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/crate-ci/typos/releases">crate-ci/typos's
releases</a>.</em></p>
<blockquote>
<h2>v1.26.0</h2>
<h2>[1.26.0] - 2024-10-07</h2>
<h3>Compatibility</h3>
<ul>
<li><em>(pre-commit)</em> Requires 3.2+</li>
</ul>
<h3>Fixes</h3>
<ul>
<li><em>(pre-commit)</em> Resolve deprecations in 4.0 about deprecated
stage names</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/crate-ci/typos/blob/master/CHANGELOG.md">crate-ci/typos's
changelog</a>.</em></p>
<blockquote>
<h2>[1.26.0] - 2024-10-07</h2>
<h3>Compatibility</h3>
<ul>
<li><em>(pre-commit)</em> Requires 3.2+</li>
</ul>
<h3>Fixes</h3>
<ul>
<li><em>(pre-commit)</em> Resolve deprecations in 4.0 about deprecated
stage names</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/crate-ci/typos/commit/6802cc60d4e7f78b9d5454f6cf3935c042d5e1e3"><code>6802cc6</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/caa55026aee3d2cdcaf1f9b0c258651dbb01c283"><code>caa5502</code></a>
docs: Update changelog</li>
<li><a
href="https://github.com/crate-ci/typos/commit/2114c1924169510820bc12e59427851514624ac2"><code>2114c19</code></a>
Merge pull request <a
href="https://redirect.github.com/crate-ci/typos/issues/1114">#1114</a>
from tobiasraabe/patch-1</li>
<li><a
href="https://github.com/crate-ci/typos/commit/9de7b2c6bed6e32c6b34ed91702ac6eaba138a99"><code>9de7b2c</code></a>
Updates stage names in <code>.pre-commit-hooks.yaml</code>.</li>
<li><a
href="https://github.com/crate-ci/typos/commit/14f49f455cf3b6a38841665e82c3b9135b91c929"><code>14f49f4</code></a>
Merge pull request <a
href="https://redirect.github.com/crate-ci/typos/issues/1105">#1105</a>
from crate-ci/renovate/unicode-width-0.x</li>
<li><a
href="https://github.com/crate-ci/typos/commit/58ffa4baefb10b607bbc30bd16f7fe8a4446a643"><code>58ffa4b</code></a>
Merge pull request <a
href="https://redirect.github.com/crate-ci/typos/issues/1108">#1108</a>
from crate-ci/renovate/stable-1.x</li>
<li><a
href="https://github.com/crate-ci/typos/commit/003cb769377a25a6c659c67429585644c5321348"><code>003cb76</code></a>
chore(deps): Update dependency STABLE to v1.81.0</li>
<li><a
href="https://github.com/crate-ci/typos/commit/bc00184a2367b7d354946b042483a30d92e012e9"><code>bc00184</code></a>
chore(deps): Update Rust crate unicode-width to 0.2.0</li>
<li>See full diff in <a
href="https://github.com/crate-ci/typos/compare/v1.25.0...v1.26.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=crate-ci/typos&package-manager=github_actions&previous-version=1.25.0&new-version=1.26.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/typos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index 13a972e3e2..c7f3178825 100644
--- 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.25.0
+        uses: crate-ci/typos@v1.26.0

From ad31f1cf26bd217f4ec1b9a7f99eeba50e2aad6d Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Wed, 9 Oct 2024 09:03:33 -0400
Subject: [PATCH 0526/1072] Fix `dirs` removal warning (#14029)

# Description

* Primary purpose is to fix an issue with a missing escaped opening
parenthesis in the warning message when running an old `dirs` alias.
This was creating an error condition from improper interpolation.

Also

* Incorporates #13842 feedback from @kubouch by renaming `std/lib` to
`std/util`
* Removes duplication of code in `export-env`
* Renames submodule exports to `std/<submodule>` rather than
`./<submodule>` - No user-facing change other than `view files` appears
"prettier".
* In #13842, I converted the test cases to use `use std/<module>`
syntax. Previously, the tests were (effectively) using `use std *` (due
to pre-existing bugs, now fixed).

So "before", we only had test coverage on `use std *`, and "after" we
only had test coverage on `use std/<module>`. I've started adding test
cases so that we have coverage on *both* scenarios going forward.

For now, `formats` and `util` have been updated with tests for both
scenarios. I'll continue adding the others in future PRs.

# User-Facing Changes

No user-facing changes - Bug fix, refactor, and test cases only

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

Still working on updating the Doc. I ran into the `dirs` issue while
writing it and rabbit-trailed to fix it in this PR.
---
 crates/nu-std/src/lib.rs                      |  2 +-
 crates/nu-std/std/deprecated_dirs.nu          |  2 +-
 crates/nu-std/std/mod.nu                      | 37 ++++----
 crates/nu-std/std/{lib.nu => util.nu}         |  0
 crates/nu-std/tests/test_formats.nu           | 12 +--
 crates/nu-std/tests/test_std_formats.nu       | 86 +++++++++++++++++++
 .../tests/{test_lib.nu => test_std_util.nu}   | 26 +++---
 crates/nu-std/tests/test_util.nu              | 83 ++++++++++++++++++
 8 files changed, 202 insertions(+), 46 deletions(-)
 rename crates/nu-std/std/{lib.nu => util.nu} (100%)
 create mode 100644 crates/nu-std/tests/test_std_formats.nu
 rename crates/nu-std/tests/{test_lib.nu => test_std_util.nu} (76%)
 create mode 100644 crates/nu-std/tests/test_util.nu

diff --git a/crates/nu-std/src/lib.rs b/crates/nu-std/src/lib.rs
index ec5ced55ec..2857290f41 100644
--- a/crates/nu-std/src/lib.rs
+++ b/crates/nu-std/src/lib.rs
@@ -32,7 +32,7 @@ pub fn load_standard_library(
             ("iter", include_str!("../std/iter.nu")),
             ("log", include_str!("../std/log.nu")),
             ("math", include_str!("../std/math.nu")),
-            ("lib", include_str!("../std/lib.nu")),
+            ("util", include_str!("../std/util.nu")),
             ("xml", include_str!("../std/xml.nu")),
             // Remove in following release
             ("deprecated_dirs", include_str!("../std/deprecated_dirs.nu")),
diff --git a/crates/nu-std/std/deprecated_dirs.nu b/crates/nu-std/std/deprecated_dirs.nu
index f92b1a1790..6bdc007851 100644
--- a/crates/nu-std/std/deprecated_dirs.nu
+++ b/crates/nu-std/std/deprecated_dirs.nu
@@ -26,7 +26,7 @@ print -e $"
 (ansi red)Warning:(ansi reset) The 'std dirs' module will no longer automatically
 be loaded in the next release. To continue using the Shells
 feature, and to remove this warning, please add the following
-to your startup configuration (typically env.nu or config.nu):
+to your startup configuration \(typically env.nu or config.nu\):
 
 use std/dirs shells-aliases *
 
diff --git a/crates/nu-std/std/mod.nu b/crates/nu-std/std/mod.nu
index 88a15d0f00..4d1e74e72d 100644
--- a/crates/nu-std/std/mod.nu
+++ b/crates/nu-std/std/mod.nu
@@ -1,24 +1,24 @@
 # std.nu, `used` to load all standard library components
 
 # Top-level commands: ellie, repeat, null-device, and "path add"
-export use lib *
+export use std/util *
 
 # std submodules
-export module ./assert
-export module ./bench
-export module ./dt
-export module ./formats
-export module ./help
-export module ./input
-export module ./iter
-export module ./log
-export module ./math
-export module ./xml
+export module std/assert
+export module std/bench
+export module std/dt
+export module std/formats
+export module std/help
+export module std/input
+export module std/iter
+export module std/log
+export module std/math
+export module std/xml
 
 # Load main dirs command and all subcommands
-export use ./dirs main
-export module ./dirs {
-  export use ./dirs [
+export use std/dirs main
+export module dirs {
+  export use std/dirs [
     add
     drop
     next
@@ -29,11 +29,6 @@ export module ./dirs {
 
 # Workaround for #13403 to load export-env blocks from submodules
 export-env {
-    # log
-    $env.NU_LOG_FORMAT = $env.NU_LOG_FORMAT? | default "%ANSI_START%%DATE%|%LEVEL%|%MSG%%ANSI_STOP%"
-    $env.NU_LOG_DATE_FORMAT = $env.NU_LOG_DATE_FORMAT? | default "%Y-%m-%dT%H:%M:%S%.3f"
-    
-    # dirs
-    $env.DIRS_POSITION = 0
-    $env.DIRS_LIST = [($env.PWD | path expand)]
+    use std/log []
+    use std/dirs []
 }
diff --git a/crates/nu-std/std/lib.nu b/crates/nu-std/std/util.nu
similarity index 100%
rename from crates/nu-std/std/lib.nu
rename to crates/nu-std/std/util.nu
diff --git a/crates/nu-std/tests/test_formats.nu b/crates/nu-std/tests/test_formats.nu
index 5fc1de2d01..f54598bf08 100644
--- a/crates/nu-std/tests/test_formats.nu
+++ b/crates/nu-std/tests/test_formats.nu
@@ -1,4 +1,6 @@
+# Test std/formats when importing module-only
 use std/assert
+use std/formats *
 
 def test_data_multiline [] {
   let lines = [
@@ -19,7 +21,6 @@ def test_data_multiline [] {
 
 #[test]
 def from_ndjson_multiple_objects [] {
-  use std/formats *
   let result = test_data_multiline | from ndjson
   let expect = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}]
   assert equal $result $expect "could not convert from NDJSON"
@@ -27,7 +28,6 @@ def from_ndjson_multiple_objects [] {
 
 #[test]
 def from_ndjson_single_object [] {
-  use std/formats *
   let result = '{"a": 1}' | from ndjson
   let expect = [{a:1}]
   assert equal $result $expect "could not convert from NDJSON"
@@ -35,13 +35,11 @@ def from_ndjson_single_object [] {
 
 #[test]
 def from_ndjson_invalid_object [] {
-  use std/formats *
   assert error { '{"a":1' | from ndjson }
 }
 
 #[test]
 def from_jsonl_multiple_objects [] {
-  use std/formats *
   let result = test_data_multiline | from jsonl
   let expect = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}]
   assert equal $result $expect "could not convert from JSONL"
@@ -49,7 +47,6 @@ def from_jsonl_multiple_objects [] {
 
 #[test]
 def from_jsonl_single_object [] {
-  use std/formats *
   let result = '{"a": 1}' | from jsonl
   let expect = [{a:1}]
   assert equal $result $expect "could not convert from JSONL"
@@ -57,13 +54,11 @@ def from_jsonl_single_object [] {
 
 #[test]
 def from_jsonl_invalid_object [] {
-  use std/formats *
   assert error { '{"a":1' | from jsonl }
 }
 
 #[test]
 def to_ndjson_multiple_objects [] {
-  use std/formats *
   let result = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}] | to ndjson | str trim
   let expect = test_data_multiline
   assert equal $result $expect "could not convert to NDJSON"
@@ -71,7 +66,6 @@ def to_ndjson_multiple_objects [] {
 
 #[test]
 def to_ndjson_single_object [] {
-  use std/formats *
   let result = [{a:1}] | to ndjson | str trim
   let expect = "{\"a\":1}"
   assert equal $result $expect "could not convert to NDJSON"
@@ -79,7 +73,6 @@ def to_ndjson_single_object [] {
 
 #[test]
 def to_jsonl_multiple_objects [] {
-  use std/formats *
   let result = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}] | to jsonl | str trim
   let expect = test_data_multiline
   assert equal $result $expect "could not convert to JSONL"
@@ -87,7 +80,6 @@ def to_jsonl_multiple_objects [] {
 
 #[test]
 def to_jsonl_single_object [] {
-  use std/formats *
   let result = [{a:1}] | to jsonl | str trim
   let expect = "{\"a\":1}"
   assert equal $result $expect "could not convert to JSONL"
diff --git a/crates/nu-std/tests/test_std_formats.nu b/crates/nu-std/tests/test_std_formats.nu
new file mode 100644
index 0000000000..f23590c5a0
--- /dev/null
+++ b/crates/nu-std/tests/test_std_formats.nu
@@ -0,0 +1,86 @@
+# Test std/formats when importing `use std *`
+use std *
+
+def test_data_multiline [] {
+  use std *
+  let lines = [
+    "{\"a\":1}",
+    "{\"a\":2}",
+    "{\"a\":3}",
+    "{\"a\":4}",
+    "{\"a\":5}",
+    "{\"a\":6}",
+  ]
+
+  if $nu.os-info.name == "windows" {
+    $lines | str join "\r\n"
+  } else {
+    $lines | str join "\n"
+  }
+}
+
+#[test]
+def from_ndjson_multiple_objects [] {
+  let result = test_data_multiline | formats from ndjson
+  let expect = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}]
+  assert equal $result $expect "could not convert from NDJSON"
+}
+
+#[test]
+def from_ndjson_single_object [] {
+  let result = '{"a": 1}' | formats from ndjson
+  let expect = [{a:1}]
+  assert equal $result $expect "could not convert from NDJSON"
+}
+
+#[test]
+def from_ndjson_invalid_object [] {
+  assert error { '{"a":1' | formats from ndjson }
+}
+
+#[test]
+def from_jsonl_multiple_objects [] {
+  let result = test_data_multiline | formats from jsonl
+  let expect = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}]
+  assert equal $result $expect "could not convert from JSONL"
+}
+
+#[test]
+def from_jsonl_single_object [] {
+  let result = '{"a": 1}' | formats from jsonl
+  let expect = [{a:1}]
+  assert equal $result $expect "could not convert from JSONL"
+}
+
+#[test]
+def from_jsonl_invalid_object [] {
+  assert error { '{"a":1' | formats from jsonl }
+}
+
+#[test]
+def to_ndjson_multiple_objects [] {
+  let result = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}] | formats to ndjson | str trim
+  let expect = test_data_multiline
+  assert equal $result $expect "could not convert to NDJSON"
+}
+
+#[test]
+def to_ndjson_single_object [] {
+  let result = [{a:1}] | formats to ndjson | str trim
+  let expect = "{\"a\":1}"
+  assert equal $result $expect "could not convert to NDJSON"
+}
+
+#[test]
+def to_jsonl_multiple_objects [] {
+  let result = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}] | formats to jsonl | str trim
+  let expect = test_data_multiline
+  assert equal $result $expect "could not convert to JSONL"
+}
+
+#[test]
+def to_jsonl_single_object [] {
+  let result = [{a:1}] | formats to jsonl | str trim
+  let expect = "{\"a\":1}"
+  assert equal $result $expect "could not convert to JSONL"
+}
diff --git a/crates/nu-std/tests/test_lib.nu b/crates/nu-std/tests/test_std_util.nu
similarity index 76%
rename from crates/nu-std/tests/test_lib.nu
rename to crates/nu-std/tests/test_std_util.nu
index 1f1720de01..2ba4fb3950 100644
--- a/crates/nu-std/tests/test_lib.nu
+++ b/crates/nu-std/tests/test_std_util.nu
@@ -1,4 +1,4 @@
-use std/lib
+use std *
 
 #[test]
 def path_add [] {
@@ -11,19 +11,19 @@ def path_add [] {
 
         assert equal (get_path) []
 
-        lib path add "/foo/"
+        path add "/foo/"
         assert equal (get_path) (["/foo/"] | path expand)
 
-        lib path add "/bar/" "/baz/"
+        path add "/bar/" "/baz/"
         assert equal (get_path) (["/bar/", "/baz/", "/foo/"] | path expand)
 
         load-env {$path_name: []}
 
-        lib path add "foo"
-        lib path add "bar" "baz" --append
+        path add "foo"
+        path add "bar" "baz" --append
         assert equal (get_path) (["foo", "bar", "baz"] | path expand)
 
-        assert equal (lib path add "fooooo" --ret) (["fooooo", "foo", "bar", "baz"] | path expand)
+        assert equal (path add "fooooo" --ret) (["fooooo", "foo", "bar", "baz"] | path expand)
         assert equal (get_path) (["fooooo", "foo", "bar", "baz"] | path expand)
 
         load-env {$path_name: []}
@@ -35,11 +35,11 @@ def path_add [] {
             android: "quux",
         }
 
-        lib path add $target_paths
+        path add $target_paths
         assert equal (get_path) ([($target_paths | get $nu.os-info.name)] | path expand)
 
         load-env {$path_name: [$"(["/foo", "/bar"] | path expand | str join (char esep))"]}
-        lib path add "~/foo"
+        path add "~/foo"
         assert equal (get_path) (["~/foo", "/foo", "/bar"] | path expand)
     }
 }
@@ -63,7 +63,7 @@ def path_add_expand [] {
     with-env {$path_name: []} {
         def get_path [] { $env | get $path_name }
 
-        lib path add $link_dir
+        path add $link_dir
         assert equal (get_path) ([$link_dir])
     }
 
@@ -73,11 +73,11 @@ def path_add_expand [] {
 #[test]
 def repeat_things [] {
     use std/assert
-    assert error { "foo" | lib repeat -1 }
+    assert error { "foo" | repeat -1 }
 
     for x in ["foo", [1 2], {a: 1}] {
-        assert equal ($x | lib repeat 0) []
-        assert equal ($x | lib repeat 1) [$x]
-        assert equal ($x | lib repeat 2) [$x $x]
+        assert equal ($x | repeat 0) []
+        assert equal ($x | repeat 1) [$x]
+        assert equal ($x | repeat 2) [$x $x]
     }
 }
diff --git a/crates/nu-std/tests/test_util.nu b/crates/nu-std/tests/test_util.nu
new file mode 100644
index 0000000000..fe819bc400
--- /dev/null
+++ b/crates/nu-std/tests/test_util.nu
@@ -0,0 +1,83 @@
+use std/util *
+
+#[test]
+def path_add [] {
+    use std/assert
+
+    let path_name = if "PATH" in $env { "PATH" } else { "Path" }
+
+    with-env {$path_name: []} {
+        def get_path [] { $env | get $path_name }
+
+        assert equal (get_path) []
+
+        path add "/foo/"
+        assert equal (get_path) (["/foo/"] | path expand)
+
+        path add "/bar/" "/baz/"
+        assert equal (get_path) (["/bar/", "/baz/", "/foo/"] | path expand)
+
+        load-env {$path_name: []}
+
+        path add "foo"
+        path add "bar" "baz" --append
+        assert equal (get_path) (["foo", "bar", "baz"] | path expand)
+
+        assert equal (path add "fooooo" --ret) (["fooooo", "foo", "bar", "baz"] | path expand)
+        assert equal (get_path) (["fooooo", "foo", "bar", "baz"] | path expand)
+
+        load-env {$path_name: []}
+
+        let target_paths = {
+            linux: "foo",
+            windows: "bar",
+            macos: "baz",
+            android: "quux",
+        }
+
+        path add $target_paths
+        assert equal (get_path) ([($target_paths | get $nu.os-info.name)] | path expand)
+
+        load-env {$path_name: [$"(["/foo", "/bar"] | path expand | str join (char esep))"]}
+        path add "~/foo"
+        assert equal (get_path) (["~/foo", "/foo", "/bar"] | path expand)
+    }
+}
+
+#[test]
+def path_add_expand [] {
+    use std/assert
+
+    # random paths to avoid collision, especially if left dangling on failure
+    let real_dir = $nu.temp-path | path join $"real-dir-(random chars)"
+    let link_dir = $nu.temp-path | path join $"link-dir-(random chars)"
+    mkdir $real_dir
+    let path_name = if $nu.os-info.family == 'windows' {
+        mklink /D $link_dir $real_dir
+        "Path"
+    } else {
+        ln -s $real_dir $link_dir | ignore
+        "PATH"
+    }
+
+    with-env {$path_name: []} {
+        def get_path [] { $env | get $path_name }
+
+        path add $link_dir
+        assert equal (get_path) ([$link_dir])
+    }
+
+    rm $real_dir $link_dir
+}
+
+#[test]
+def repeat_things [] {
+    use std/assert
+    assert error { "foo" | repeat -1 }
+
+    for x in ["foo", [1 2], {a: 1}] {
+        assert equal ($x | repeat 0) []
+        assert equal ($x | repeat 1) [$x]
+        assert equal ($x | repeat 2) [$x $x]
+    }
+}

From d67120be190c09598befda2e056c6ce271ede0bf Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Wed, 9 Oct 2024 09:07:34 -0500
Subject: [PATCH 0527/1072] update to reedline 5e556bfd (#14034)

# Description

This PR updates nushell to the latest commit 5e556bfd.

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

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

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

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

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

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

diff --git a/Cargo.lock b/Cargo.lock
index cc40db6fa8..ced79abfdb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5147,7 +5147,7 @@ dependencies = [
 [[package]]
 name = "reedline"
 version = "0.35.0"
-source = "git+https://github.com/nushell/reedline?branch=main#871075e62b5703cfc584e4e02b14c2473f5b0b63"
+source = "git+https://github.com/nushell/reedline?branch=main#5e556bfd2855420e782e1753da13a4fcb798f2c7"
 dependencies = [
  "arboard",
  "chrono",

From 2979595cc5223ce98d106893cccd55982895d5b5 Mon Sep 17 00:00:00 2001
From: "Tristan P." <65556393+quadristan@users.noreply.github.com>
Date: Wed, 9 Oct 2024 20:35:56 +0200
Subject: [PATCH 0528/1072] [str replace] add exemple for escaped regexes
 (#14038)

# Description

This is a follow-up of
https://github.com/nushell/nushell.github.io/pull/1584

The goal is to provide the user understanding of how to escape strings

# User-Facing Changes
Nothing except documentation

# Tests + Formatting

 I don't know why but these two tests are failing on my system:

- `test_std_util path_add`
- `commands::umkdir::mkdir_umask_permission`

Since I hardly believe it is linked to my changes, I will let your CI
check it. Meanwhile, I will check my system, highly likely that it is
something something related to me recently switching shells, hacking my
way through prompts environments, etc.


# After Submitting

Will check how to re-generate the [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged
---
 crates/nu-command/src/strings/str_/replace.rs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/crates/nu-command/src/strings/str_/replace.rs b/crates/nu-command/src/strings/str_/replace.rs
index c15d0003aa..a893a88c62 100644
--- a/crates/nu-command/src/strings/str_/replace.rs
+++ b/crates/nu-command/src/strings/str_/replace.rs
@@ -156,12 +156,17 @@ impl Command for SubCommand {
                 result: Some(Value::test_string("my_library.nu")),
             },
             Example {
-                description: "Find and replace all occurrences of find string using regular expression",
+                description: "Find and replace contents with capture group using regular expression, with escapes",
+                example: "'hello=world' | str replace -r '\\$?(?<varname>.*)=(?<value>.*)' '$$$varname = $value'",
+                result: Some(Value::test_string("$hello = world")),
+            },
+            Example {
+                description: "Find and replace all occurrences of found string using regular expression",
                 example: "'abc abc abc' | str replace --all --regex 'b' 'z'",
                 result: Some(Value::test_string("azc azc azc")),
             },
             Example {
-                description: "Find and replace all occurrences of find string in table using regular expression",
+                description: "Find and replace all occurrences of found string in table using regular expression",
                 example:
                     "[[ColA ColB ColC]; [abc abc ads]] | str replace --all --regex 'b' 'z' ColA ColC",
                 result: Some(Value::test_list (
@@ -173,7 +178,7 @@ impl Command for SubCommand {
                 )),
             },
             Example {
-                description: "Find and replace all occurrences of find string in record using regular expression",
+                description: "Find and replace all occurrences of found string in record using regular expression",
                 example:
                     "{ KeyA: abc, KeyB: abc, KeyC: ads } | str replace --all --regex 'b' 'z' KeyA KeyC",
                 result: Some(Value::test_record(record! {

From 36c1073441ef3e198e5ef1d60b157eddfc0a19b5 Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Wed, 9 Oct 2024 22:18:16 -0400
Subject: [PATCH 0529/1072] Rework sorting and add cell path and closure
 comparators to `sort-by` (#13154)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

Closes #12535
Implements sort-by functionality of #8322
Fixes sort-by part of #8667

This PR does two main things: add a new cell path and closure parameter
to `sort-by`, and attempt to make Nushell's sorting behavior
well-defined.

## `sort-by` features

The `columns` parameter is replaced with a `comparator` parameter, which
can be a cell path or a closure. Examples are from docs PR.

1. Cell paths

The basic interactive usage of `sort-by` is the same. For example, `ls |
sort-by modified` still works the same as before. It is not quite a
drop-in replacement, see [behavior changes](#behavior-changes).

   Here's an example of how the cell path comparator might be useful:

   ```nu
   > let cities = [
{name: 'New York', info: { established: 1624, population: 18_819_000 } }
{name: 'Kyoto', info: { established: 794, population: 37_468_000 } }
{name: 'São Paulo', info: { established: 1554, population: 21_650_000 }
}
   ]
   > $cities | sort-by info.established
   ╭───┬───────────┬────────────────────────────╮
   │ # │   name    │            info            │
   ├───┼───────────┼────────────────────────────┤
   │ 0 │ Kyoto     │ ╭─────────────┬──────────╮ │
   │   │           │ │ established │ 794      │ │
   │   │           │ │ population  │ 37468000 │ │
   │   │           │ ╰─────────────┴──────────╯ │
   │ 1 │ São Paulo │ ╭─────────────┬──────────╮ │
   │   │           │ │ established │ 1554     │ │
   │   │           │ │ population  │ 21650000 │ │
   │   │           │ ╰─────────────┴──────────╯ │
   │ 2 │ New York  │ ╭─────────────┬──────────╮ │
   │   │           │ │ established │ 1624     │ │
   │   │           │ │ population  │ 18819000 │ │
   │   │           │ ╰─────────────┴──────────╯ │
   ╰───┴───────────┴────────────────────────────╯
   ```

2. Key closures

You can supply a closure which will transform each value into a sorting
key (without changing the underlying data). Here's an example of a key
closure, where we want to sort a list of assignments by their average
grade:

   ```nu
   > let assignments = [
       {name: 'Homework 1', grades: [97 89 86 92 89] }
       {name: 'Homework 2', grades: [91 100 60 82 91] }
       {name: 'Exam 1', grades: [78 88 78 53 90] }
       {name: 'Project', grades: [92 81 82 84 83] }
   ]
   > $assignments | sort-by { get grades | math avg }
   ╭───┬────────────┬───────────────────────╮
   │ # │    name    │        grades         │
   ├───┼────────────┼───────────────────────┤
   │ 0 │ Exam 1     │ [78, 88, 78, 53, 90]  │
   │ 1 │ Project    │ [92, 81, 82, 84, 83]  │
   │ 2 │ Homework 2 │ [91, 100, 60, 82, 91] │
   │ 3 │ Homework 1 │ [97, 89, 86, 92, 89]  │
   ╰───┴────────────┴───────────────────────╯
   ```

3. Custom sort closure

The `--custom`, or `-c`, flag will tell `sort-by` to interpret closures
as custom sort closures. A custom sort closure has two parameters, and
returns a boolean. The closure should return `true` if the first
parameter comes _before_ the second parameter in the sort order.

For a simple example, we could rewrite a cell path sort as a custom sort
(see
[here](https://github.com/nushell/nushell.github.io/pull/1568/files#diff-a7a233e66a361d8665caf3887eb71d4288000001f401670c72b95cc23a948e86R231)
for a more complex example):

   ```nu
   > ls | sort-by -c {|a, b| $a.size < $b.size }
   ╭───┬─────────────────────┬──────┬──────────┬────────────────╮
   │ # │        name         │ type │   size   │    modified    │
   ├───┼─────────────────────┼──────┼──────────┼────────────────┤
   │ 0 │ my-secret-plans.txt │ file │    100 B │ 10 minutes ago │
   │ 1 │ shopping_list.txt   │ file │    100 B │ 2 months ago   │
   │ 2 │ myscript.nu         │ file │  1.1 KiB │ 2 weeks ago    │
   │ 3 │ bigfile.img         │ file │ 10.0 MiB │ 3 weeks ago    │
   ╰───┴─────────────────────┴──────┴──────────┴────────────────╯
   ```


## Making sort more consistent

I think it's important for something as essential as `sort` to have
well-defined semantics. This PR contains some changes to try to make the
behavior of `sort` and `sort-by` consistent. In addition, after working
with the internals of sorting code, I have a much deeper understanding
of all of the edge cases. Here is my attempt to try to better define
some of the semantics of sorting (if you are just interested in changes,
skip to "User-Facing changes")

- `sort`, `sort -v`, and `sort-by` now all work the same. Each
individual sort implementation has been refactored into two functions in
`sort_utils.rs`: `sort`, and `sort_by`. These can also be used in other
parts of Nushell where values need to be sorted.
  - `sort` and `sort-by` used to handle `-i` and `-n` differently.
- `sort -n` would consider all values which can't be coerced into a
string to be equal
- `sort-by -i` and `sort-by -n` would only work if all values were
strings
- In this PR, insensitive sort only affects comparison between strings,
and natural sort only applies to numbers and strings (see below).
- (not a change) Before and after this PR, `sort` and `sort-by` support
sorting mixed types. There was a lot of discussion about potentially
making `sort` and `sort-by` only work on lists of homogeneous types, but
the general consensus was that `sort` should not error just because its
input contains incompatible types.
- In order to try to make working with data containing `null` values
easier, I changed the PartialOrd order to sort `Nothing` values to the
end of a list, regardless of what other types the list contains. Before,
`null` would be sorted before `Binary`, `CellPath`, and `Custom` values.
- (not a change) When sorted, lists of mixed types will contain sorted
values of each type in order, for the most part
- (not a change) For example, `[0x[1] (date now) "a" ("yesterday" | into
datetime) "b" 0x[0]]` will be sorted as `["a", "b", a day ago, now, [0],
[1]]`, where sorted strings appear first, then sorted datetimes, etc.
- (not a change) The exception to this is `Int`s and `Float`s, which
will intermix, `Strings` and `Glob`s, which will intermix, and `None` as
described above. Additionally, natural sort will intermix strings with
ints and floats (see below).
- Natural sort no longer coerce all inputs to strings.
- I did originally make natural only apply to strings, but @fdncred
pointed out that the previous behavior also allowed you to sort numeric
strings with numbers. This seems like a useful feature if we are trying
to support sorting with mixed types, so I settled on coercing only
numbers (int, float). This can be reverted if people don't like it.
- Here is an example of this behavior in action, which is the same
before and after this PR:
      ```nushell
      $ [1 "4" 3 "2"] | sort --natural
      ╭───┬───╮
      │ 0 │ 1 │
      │ 1 │ 2 │
      │ 2 │ 3 │
      │ 3 │ 4 │
      ╰───┴───╯
      ```



# User-Facing Changes

## New features

- Replaces the `columns` string parameter of `sort-by` with a cell path
or a closure.
  - The cell path parameter works exactly as you would expect
- By default, the `closure` parameter acts as a "key sort"; that is,
each element is transformed by the closure into a sorting key
- With the `--custom` (`-c`) parameter, you can define a comparison
function for completely custom sorting order.

## Behavior changes

<details>
<summary><code>sort -v</code> does not coerce record values to
strings</summary>

This was a bit of a surprising behavior, and is now unified with the
behavior of `sort` and `sort-by`. Here's an example where you can
observe the values being implicitly coerced into strings for sorting, as
they are sorted like strings rather than numbers:

Old behavior:

```nushell
$ {foo: 9 bar: 10} | sort -v
╭─────┬────╮
│ bar │ 10 │
│ foo │ 9  │
╰─────┴────╯
```

New behavior:

```nushell
$ {foo: 9 bar: 10} | sort -v
╭─────┬────╮
│ foo │ 9  │
│ bar │ 10 │
╰─────┴────╯
```

</details>


<details>
<summary>Changed <code>sort-by</code> parameters from
<code>string</code> to <code>cell-path</code> or <code>closure</code>.
Typical interactive usage is the same as before, but if passing a
variable to <code>sort-by</code> it must be a cell path (or closure),
not a string</summary>

Old behavior:

```nushell
$ let sort = "modified"
$ ls | sort-by $sort
╭───┬──────┬──────┬──────┬────────────────╮
│ # │ name │ type │ size │    modified    │
├───┼──────┼──────┼──────┼────────────────┤
│ 0 │ foo  │ file │  0 B │ 10 hours ago   │
│ 1 │ bar  │ file │  0 B │ 35 seconds ago │
╰───┴──────┴──────┴──────┴────────────────╯
```

New behavior:

```nushell
$ let sort = "modified"
$ ls | sort-by $sort
Error: nu::shell::type_mismatch

  × Type mismatch.
   ╭─[entry #10:1:14]
 1 │ ls | sort-by $sort
   ·              ──┬──
   ·                ╰── Cannot sort using a value which is not a cell path or closure
   ╰────
$ let sort = $."modified"
$ ls | sort-by $sort
╭───┬──────┬──────┬──────┬───────────────╮
│ # │ name │ type │ size │   modified    │
├───┼──────┼──────┼──────┼───────────────┤
│ 0 │ foo  │ file │  0 B │ 10 hours ago  │
│ 1 │ bar  │ file │  0 B │ 2 minutes ago │
╰───┴──────┴──────┴──────┴───────────────╯
```
</details>

<details>
<summary>Insensitve and natural sorting behavior reworked</summary>

Previously, the `-i` and `-n` worked differently for `sort` and
`sort-by` (see "Making sort more consistent"). Here are examples of how
these options result in different sorts now:

1. `sort -n`
- Old behavior (types other than numbers, strings, dates, and binary
sorted incorrectly)
      ```nushell
      $ [2sec 1sec] | sort -n
      ╭───┬──────╮
      │ 0 │ 2sec │
      │ 1 │ 1sec │
      ╰───┴──────╯
      ```
    - New behavior
      ```nushell
      $ [2sec 1sec] | sort -n
      ╭───┬──────╮
      │ 0 │ 1sec │
      │ 1 │ 2sec │
      ╰───┴──────╯
      ```

2. `sort-by -i`
- Old behavior (uppercase words appear before lowercase words as they
would in a typical sort, indicating this is not actually an insensitive
sort)
     ```nushell
     $ ["BAR" "bar" "foo" 2 "FOO" 1] | wrap a | sort-by -i a
     ╭───┬─────╮
     │ # │  a  │
     ├───┼─────┤
     │ 0 │   1 │
     │ 1 │   2 │
     │ 2 │ BAR │
     │ 3 │ FOO │
     │ 4 │ bar │
     │ 5 │ foo │
     ╰───┴─────╯
     ```
- New behavior (strings are sorted stably, indicating this is an
insensitive sort)
     ```nushell
     $ ["BAR" "bar" "foo" 2 "FOO" 1] | wrap a | sort-by -i a
     ╭───┬─────╮
     │ # │  a  │
     ├───┼─────┤
     │ 0 │   1 │
     │ 1 │   2 │
     │ 2 │ BAR │
     │ 3 │ bar │
     │ 4 │ foo │
     │ 5 │ FOO │
     ╰───┴─────╯
     ```

3. `sort-by -n`
- Old behavior (natural sort does not work when data contains non-string
values)
     ```nushell
     $ ["10" 8 "9"] | wrap a | sort-by -n a
     ╭───┬────╮
     │ # │ a  │
     ├───┼────┤
     │ 0 │  8 │
     │ 1 │ 10 │
     │ 2 │ 9  │
     ╰───┴────╯
     ```
   - New behavior
     ```nushell
     $ ["10" 8 "9"] | wrap a | sort-by -n a
     ╭───┬────╮
     │ # │ a  │
     ├───┼────┤
     │ 0 │  8 │
     │ 1 │ 9  │
     │ 2 │ 10 │
     ╰───┴────╯
     ```

</details>

<details>
<summary>
Sorting a list of non-record values with a non-existent column/path now
errors instead of sorting the values directly (<code>sort</code> should
be used for this, not <code>sort-by</code>)
</summary>

Old behavior:

```nushell
$ [2 1] | sort-by foo
╭───┬───╮
│ 0 │ 1 │
│ 1 │ 2 │
╰───┴───╯
```

New behavior:

```nushell
$ [2 1] | sort-by foo
Error: nu::shell::incompatible_path_access

  × Data cannot be accessed with a cell path
   ╭─[entry #29:1:17]
 1 │ [2 1] | sort-by foo
   ·                 ─┬─
   ·                  ╰── int doesn't support cell paths
   ╰────
```

</details>

<details>
<summary><code>sort</code> and <code>sort-by</code> output
<code>List</code> instead of <code>ListStream</code> </summary>

This isn't a meaningful change (unless I misunderstand the purpose of
ListStream), since `sort` and `sort-by` both need to collect in order to
do the sorting anyway, but is user observable.

Old behavior:

```nushell
$ ls | sort | describe -d
╭──────────┬───────────────────╮
│ type     │ stream            │
│ origin   │ nushell           │
│ subtype  │ {record 3 fields} │
│ metadata │ {record 1 field}  │
╰──────────┴───────────────────╯
```

```nushell
$ ls | sort-by name | describe -d
╭──────────┬───────────────────╮
│ type     │ stream            │
│ origin   │ nushell           │
│ subtype  │ {record 3 fields} │
│ metadata │ {record 1 field}  │
╰──────────┴───────────────────╯
```

New behavior:


```nushell
ls | sort | describe -d
╭────────┬─────────────────╮
│ type   │ list            │
│ length │ 22              │
│ values │ [table 22 rows] │
╰────────┴─────────────────╯
```

```nushell
$ ls | sort-by name | describe -d
╭────────┬─────────────────╮
│ type   │ list            │
│ length │ 22              │
│ values │ [table 22 rows] │
╰────────┴─────────────────╯
```

</details>

- `sort` now errors when nothing is piped in (`sort-by` already did
this)

# Tests + Formatting

I added lots of unit tests on the new sort implementation to enforce new
sort behaviors and prevent regressions.

# After Submitting

See [docs PR](https://github.com/nushell/nushell.github.io/pull/1568),
which is ~2/3 finished.

---------

Co-authored-by: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Co-authored-by: Ian Manske <ian.manske@pm.me>
---
 crates/nu-command/src/filters/sort.rs    | 345 ++++----------
 crates/nu-command/src/filters/sort_by.rs |  99 +++-
 crates/nu-command/src/sort_utils.rs      | 569 ++++++++++-------------
 crates/nu-command/tests/commands/sort.rs |  14 +
 crates/nu-command/tests/main.rs          |   1 +
 crates/nu-command/tests/sort_utils.rs    | 554 ++++++++++++++++++++++
 crates/nu-protocol/src/value/mod.rs      | 318 +++++++------
 7 files changed, 1158 insertions(+), 742 deletions(-)
 create mode 100644 crates/nu-command/tests/sort_utils.rs

diff --git a/crates/nu-command/src/filters/sort.rs b/crates/nu-command/src/filters/sort.rs
index aae00037c4..8b8c2e6d60 100644
--- a/crates/nu-command/src/filters/sort.rs
+++ b/crates/nu-command/src/filters/sort.rs
@@ -1,8 +1,7 @@
-use alphanumeric_sort::compare_str;
 use nu_engine::command_prelude::*;
+use nu_protocol::ast::PathMember;
 
-use nu_utils::IgnoreCaseExt;
-use std::cmp::Ordering;
+use crate::Comparator;
 
 #[derive(Clone)]
 pub struct Sort;
@@ -14,10 +13,13 @@ impl Command for Sort {
 
     fn signature(&self) -> nu_protocol::Signature {
         Signature::build("sort")
-        .input_output_types(vec![(
-            Type::List(Box::new(Type::Any)),
-            Type::List(Box::new(Type::Any)),
-        ), (Type::record(), Type::record()),])
+            .input_output_types(vec![
+                (
+                    Type::List(Box::new(Type::Any)),
+                    Type::List(Box::new(Type::Any))
+                ),
+                (Type::record(), Type::record())
+            ])
     .switch("reverse", "Sort in reverse order", Some('r'))
             .switch(
                 "ignore-case",
@@ -45,67 +47,66 @@ impl Command for Sort {
         vec![
             Example {
                 example: "[2 0 1] | sort",
-                description: "sort the list by increasing value",
-                result: Some(Value::list(
-                    vec![Value::test_int(0), Value::test_int(1), Value::test_int(2)],
-                    Span::test_data(),
-                )),
+                description: "Sort the list by increasing value",
+                result: Some(Value::test_list(vec![
+                    Value::test_int(0),
+                    Value::test_int(1),
+                    Value::test_int(2),
+                ])),
             },
             Example {
                 example: "[2 0 1] | sort --reverse",
-                description: "sort the list by decreasing value",
-                result: Some(Value::list(
-                    vec![Value::test_int(2), Value::test_int(1), Value::test_int(0)],
-                    Span::test_data(),
-                )),
+                description: "Sort the list by decreasing value",
+                result: Some(Value::test_list(vec![
+                    Value::test_int(2),
+                    Value::test_int(1),
+                    Value::test_int(0),
+                ])),
             },
             Example {
                 example: "[betty amy sarah] | sort",
-                description: "sort a list of strings",
-                result: Some(Value::list(
-                    vec![
-                        Value::test_string("amy"),
-                        Value::test_string("betty"),
-                        Value::test_string("sarah"),
-                    ],
-                    Span::test_data(),
-                )),
+                description: "Sort a list of strings",
+                result: Some(Value::test_list(vec![
+                    Value::test_string("amy"),
+                    Value::test_string("betty"),
+                    Value::test_string("sarah"),
+                ])),
             },
             Example {
                 example: "[betty amy sarah] | sort --reverse",
-                description: "sort a list of strings in reverse",
-                result: Some(Value::list(
-                    vec![
-                        Value::test_string("sarah"),
-                        Value::test_string("betty"),
-                        Value::test_string("amy"),
-                    ],
-                    Span::test_data(),
-                )),
+                description: "Sort a list of strings in reverse",
+                result: Some(Value::test_list(vec![
+                    Value::test_string("sarah"),
+                    Value::test_string("betty"),
+                    Value::test_string("amy"),
+                ])),
             },
             Example {
                 description: "Sort strings (case-insensitive)",
                 example: "[airplane Truck Car] | sort -i",
-                result: Some(Value::list(
-                    vec![
-                        Value::test_string("airplane"),
-                        Value::test_string("Car"),
-                        Value::test_string("Truck"),
-                    ],
-                    Span::test_data(),
-                )),
+                result: Some(Value::test_list(vec![
+                    Value::test_string("airplane"),
+                    Value::test_string("Car"),
+                    Value::test_string("Truck"),
+                ])),
             },
             Example {
                 description: "Sort strings (reversed case-insensitive)",
                 example: "[airplane Truck Car] | sort -i -r",
-                result: Some(Value::list(
-                    vec![
-                        Value::test_string("Truck"),
-                        Value::test_string("Car"),
-                        Value::test_string("airplane"),
-                    ],
-                    Span::test_data(),
-                )),
+                result: Some(Value::test_list(vec![
+                    Value::test_string("Truck"),
+                    Value::test_string("Car"),
+                    Value::test_string("airplane"),
+                ])),
+            },
+            Example {
+                description: "Sort alphanumeric strings in natural order",
+                example: "[foo1 foo10 foo9] | sort -n",
+                result: Some(Value::test_list(vec![
+                    Value::test_string("foo1"),
+                    Value::test_string("foo9"),
+                    Value::test_string("foo10"),
+                ])),
             },
             Example {
                 description: "Sort record by key (case-insensitive)",
@@ -134,233 +135,65 @@ impl Command for Sort {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let head = call.head;
         let reverse = call.has_flag(engine_state, stack, "reverse")?;
         let insensitive = call.has_flag(engine_state, stack, "ignore-case")?;
         let natural = call.has_flag(engine_state, stack, "natural")?;
+        let sort_by_value = call.has_flag(engine_state, stack, "values")?;
         let metadata = input.metadata();
 
         let span = input.span().unwrap_or(call.head);
-        match input {
-            // Records have two sorting methods, toggled by presence or absence of -v
-            PipelineData::Value(Value::Record { val, .. }, ..) => {
-                let sort_by_value = call.has_flag(engine_state, stack, "values")?;
-                let record = sort_record(
+        let value = input.into_value(span)?;
+        let sorted: Value = match value {
+            Value::Record { val, .. } => {
+                // Records have two sorting methods, toggled by presence or absence of -v
+                let record = crate::sort_record(
                     val.into_owned(),
-                    span,
                     sort_by_value,
                     reverse,
                     insensitive,
                     natural,
-                );
-                Ok(record.into_pipeline_data())
+                )?;
+                Value::record(record, span)
             }
-            // Other values are sorted here
-            PipelineData::Value(v, ..)
-                if !matches!(v, Value::List { .. } | Value::Range { .. }) =>
-            {
-                Ok(v.into_pipeline_data())
-            }
-            pipe_data => {
-                let mut vec: Vec<_> = pipe_data.into_iter().collect();
-
-                sort(&mut vec, head, insensitive, natural)?;
+            value @ Value::List { .. } => {
+                // If we have a table specifically, then we want to sort along each column.
+                // Record's PartialOrd impl dictates that columns are compared in alphabetical order,
+                // so we have to explicitly compare by each column.
+                let r#type = value.get_type();
+                let mut vec = value.into_list().expect("matched list above");
+                if let Type::Table(cols) = r#type {
+                    let columns: Vec<Comparator> = cols
+                        .iter()
+                        .map(|col| vec![PathMember::string(col.0.clone(), false, Span::unknown())])
+                        .map(|members| CellPath { members })
+                        .map(Comparator::CellPath)
+                        .collect();
+                    crate::sort_by(&mut vec, columns, span, insensitive, natural)?;
+                } else {
+                    crate::sort(&mut vec, insensitive, natural)?;
+                }
 
                 if reverse {
                     vec.reverse()
                 }
 
-                let iter = vec.into_iter();
-                Ok(iter.into_pipeline_data_with_metadata(
-                    head,
-                    engine_state.signals().clone(),
-                    metadata,
-                ))
+                Value::list(vec, span)
             }
-        }
-    }
-}
-
-fn sort_record(
-    record: Record,
-    rec_span: Span,
-    sort_by_value: bool,
-    reverse: bool,
-    insensitive: bool,
-    natural: bool,
-) -> Value {
-    let mut input_pairs: Vec<(String, Value)> = record.into_iter().collect();
-    input_pairs.sort_by(|a, b| {
-        // Extract the data (if sort_by_value) or the column names for comparison
-        let left_res = if sort_by_value {
-            match &a.1 {
-                Value::String { val, .. } => val.clone(),
-                val => {
-                    if let Ok(val) = val.coerce_string() {
-                        val
-                    } else {
-                        // Values that can't be turned to strings are disregarded by the sort
-                        // (same as in sort_utils.rs)
-                        return Ordering::Equal;
-                    }
-                }
+            Value::Nothing { .. } => {
+                return Err(ShellError::PipelineEmpty {
+                    dst_span: value.span(),
+                })
             }
-        } else {
-            a.0.clone()
-        };
-        let right_res = if sort_by_value {
-            match &b.1 {
-                Value::String { val, .. } => val.clone(),
-                val => {
-                    if let Ok(val) = val.coerce_string() {
-                        val
-                    } else {
-                        // Values that can't be turned to strings are disregarded by the sort
-                        // (same as in sort_utils.rs)
-                        return Ordering::Equal;
-                    }
-                }
+            _ => {
+                return Err(ShellError::PipelineMismatch {
+                    exp_input_type: "record or list".to_string(),
+                    dst_span: call.head,
+                    src_span: value.span(),
+                })
             }
-        } else {
-            b.0.clone()
         };
-
-        // Fold case if case-insensitive
-        let left = if insensitive {
-            left_res.to_folded_case()
-        } else {
-            left_res
-        };
-        let right = if insensitive {
-            right_res.to_folded_case()
-        } else {
-            right_res
-        };
-
-        if natural {
-            compare_str(left, right)
-        } else {
-            left.cmp(&right)
-        }
-    });
-
-    if reverse {
-        input_pairs.reverse();
+        Ok(sorted.into_pipeline_data_with_metadata(metadata))
     }
-
-    Value::record(input_pairs.into_iter().collect(), rec_span)
-}
-
-pub fn sort(
-    vec: &mut [Value],
-    span: Span,
-    insensitive: bool,
-    natural: bool,
-) -> Result<(), ShellError> {
-    match vec.first() {
-        Some(Value::Record { val, .. }) => {
-            let columns: Vec<String> = val.columns().cloned().collect();
-            vec.sort_by(|a, b| process(a, b, &columns, span, insensitive, natural));
-        }
-        _ => {
-            vec.sort_by(|a, b| {
-                let span_a = a.span();
-                let span_b = b.span();
-                if insensitive {
-                    let folded_left = match a {
-                        Value::String { val, .. } => Value::string(val.to_folded_case(), span_a),
-                        _ => a.clone(),
-                    };
-
-                    let folded_right = match b {
-                        Value::String { val, .. } => Value::string(val.to_folded_case(), span_b),
-                        _ => b.clone(),
-                    };
-
-                    if natural {
-                        match (
-                            folded_left.coerce_into_string(),
-                            folded_right.coerce_into_string(),
-                        ) {
-                            (Ok(left), Ok(right)) => compare_str(left, right),
-                            _ => Ordering::Equal,
-                        }
-                    } else {
-                        folded_left
-                            .partial_cmp(&folded_right)
-                            .unwrap_or(Ordering::Equal)
-                    }
-                } else if natural {
-                    match (a.coerce_str(), b.coerce_str()) {
-                        (Ok(left), Ok(right)) => compare_str(left, right),
-                        _ => Ordering::Equal,
-                    }
-                } else {
-                    a.partial_cmp(b).unwrap_or(Ordering::Equal)
-                }
-            });
-        }
-    }
-    Ok(())
-}
-
-pub fn process(
-    left: &Value,
-    right: &Value,
-    columns: &[String],
-    span: Span,
-    insensitive: bool,
-    natural: bool,
-) -> Ordering {
-    for column in columns {
-        let left_value = left.get_data_by_key(column);
-
-        let left_res = match left_value {
-            Some(left_res) => left_res,
-            None => Value::nothing(span),
-        };
-
-        let right_value = right.get_data_by_key(column);
-
-        let right_res = match right_value {
-            Some(right_res) => right_res,
-            None => Value::nothing(span),
-        };
-
-        let result = if insensitive {
-            let span_left = left_res.span();
-            let span_right = right_res.span();
-            let folded_left = match left_res {
-                Value::String { val, .. } => Value::string(val.to_folded_case(), span_left),
-                _ => left_res,
-            };
-
-            let folded_right = match right_res {
-                Value::String { val, .. } => Value::string(val.to_folded_case(), span_right),
-                _ => right_res,
-            };
-            if natural {
-                match (
-                    folded_left.coerce_into_string(),
-                    folded_right.coerce_into_string(),
-                ) {
-                    (Ok(left), Ok(right)) => compare_str(left, right),
-                    _ => Ordering::Equal,
-                }
-            } else {
-                folded_left
-                    .partial_cmp(&folded_right)
-                    .unwrap_or(Ordering::Equal)
-            }
-        } else {
-            left_res.partial_cmp(&right_res).unwrap_or(Ordering::Equal)
-        };
-        if result != Ordering::Equal {
-            return result;
-        }
-    }
-
-    Ordering::Equal
 }
 
 #[cfg(test)]
diff --git a/crates/nu-command/src/filters/sort_by.rs b/crates/nu-command/src/filters/sort_by.rs
index 440c16f490..357d3be13d 100644
--- a/crates/nu-command/src/filters/sort_by.rs
+++ b/crates/nu-command/src/filters/sort_by.rs
@@ -1,4 +1,6 @@
-use nu_engine::command_prelude::*;
+use nu_engine::{command_prelude::*, ClosureEval};
+
+use crate::Comparator;
 
 #[derive(Clone)]
 pub struct SortBy;
@@ -18,24 +20,37 @@ impl Command for SortBy {
                 (Type::record(), Type::table()),
                 (Type::table(), Type::table()),
             ])
-            .rest("columns", SyntaxShape::Any, "The column(s) to sort by.")
+            .rest(
+                "comparator",
+                SyntaxShape::OneOf(vec![
+                    SyntaxShape::CellPath,
+                    SyntaxShape::Closure(Some(vec![SyntaxShape::Any])), // key closure
+                    SyntaxShape::Closure(Some(vec![SyntaxShape::Any, SyntaxShape::Any])), // custom closure
+                ]),
+                "The cell path(s) or closure(s) to compare elements by.",
+            )
             .switch("reverse", "Sort in reverse order", Some('r'))
             .switch(
                 "ignore-case",
-                "Sort string-based columns case-insensitively",
+                "Sort string-based data case-insensitively",
                 Some('i'),
             )
             .switch(
                 "natural",
-                "Sort alphanumeric string-based columns naturally (1, 9, 10, 99, 100, ...)",
+                "Sort alphanumeric string-based data naturally (1, 9, 10, 99, 100, ...)",
                 Some('n'),
             )
+            .switch(
+                "custom",
+                "Use closures to specify a custom sort order, rather than to compute a comparison key",
+                Some('c'),
+            )
             .allow_variants_without_examples(true)
             .category(Category::Filters)
     }
 
     fn description(&self) -> &str {
-        "Sort by the given columns, in increasing order."
+        "Sort by the given cell path or closure."
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -68,6 +83,41 @@ impl Command for SortBy {
                     }),
                 ])),
             },
+            Example {
+                description: "Sort by a nested value",
+                example: "[[name info]; [Cairo {founded: 969}] [Kyoto {founded: 794}]] | sort-by info.founded",
+                result: Some(Value::test_list(vec![
+                    Value::test_record(record! {
+                        "name" => Value::test_string("Kyoto"),
+                        "info" => Value::test_record(
+                            record! { "founded" => Value::test_int(794) },
+                        )}),
+                    Value::test_record(record! {
+                        "name" => Value::test_string("Cairo"),
+                        "info" => Value::test_record(
+                            record! { "founded" => Value::test_int(969) },
+                        )})
+                ])),
+            },
+            Example {
+                description: "Sort by the last value in a list",
+                example: "[[2 50] [10 1]] | sort-by { last }",
+                result: Some(Value::test_list(vec![
+                    Value::test_list(vec![Value::test_int(10), Value::test_int(1)]),
+                    Value::test_list(vec![Value::test_int(2), Value::test_int(50)])
+                ]))
+            },
+            Example {
+                description: "Sort in a custom order",
+                example: "[7 3 2 8 4] | sort-by -c {|a, b| $a < $b}",
+                result: Some(Value::test_list(vec![
+                    Value::test_int(2),
+                    Value::test_int(3),
+                    Value::test_int(4),
+                    Value::test_int(7),
+                    Value::test_int(8),
+                ]))
+            }
         ]
     }
 
@@ -79,39 +129,60 @@ impl Command for SortBy {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
-        let columns: Vec<String> = call.rest(engine_state, stack, 0)?;
+        let comparator_vals: Vec<Value> = call.rest(engine_state, stack, 0)?;
         let reverse = call.has_flag(engine_state, stack, "reverse")?;
         let insensitive = call.has_flag(engine_state, stack, "ignore-case")?;
         let natural = call.has_flag(engine_state, stack, "natural")?;
+        let custom = call.has_flag(engine_state, stack, "custom")?;
         let metadata = input.metadata();
         let mut vec: Vec<_> = input.into_iter_strict(head)?.collect();
 
-        if columns.is_empty() {
+        if comparator_vals.is_empty() {
             return Err(ShellError::MissingParameter {
-                param_name: "columns".into(),
+                param_name: "comparator".into(),
                 span: head,
             });
         }
 
-        crate::sort(&mut vec, columns, head, insensitive, natural)?;
+        let comparators = comparator_vals
+            .into_iter()
+            .map(|val| match val {
+                Value::CellPath { val, .. } => Ok(Comparator::CellPath(val)),
+                Value::Closure { val, .. } => {
+                    let closure_eval = ClosureEval::new(engine_state, stack, *val);
+                    if custom {
+                        Ok(Comparator::CustomClosure(closure_eval))
+                    } else {
+                        Ok(Comparator::KeyClosure(closure_eval))
+                    }
+                }
+                _ => Err(ShellError::TypeMismatch {
+                    err_message: "Cannot sort using a value which is not a cell path or closure"
+                        .into(),
+                    span: val.span(),
+                }),
+            })
+            .collect::<Result<_, _>>()?;
+
+        crate::sort_by(&mut vec, comparators, head, insensitive, natural)?;
 
         if reverse {
             vec.reverse()
         }
 
-        let iter = vec.into_iter();
-        Ok(iter.into_pipeline_data_with_metadata(head, engine_state.signals().clone(), metadata))
+        let val = Value::list(vec, head);
+        Ok(val.into_pipeline_data_with_metadata(metadata))
     }
 }
 
 #[cfg(test)]
 mod test {
+    use crate::{test_examples_with_commands, Last};
+
     use super::*;
 
     #[test]
     fn test_examples() {
-        use crate::test_examples;
-
-        test_examples(SortBy {})
+        test_examples_with_commands(SortBy {}, &[&Last]);
     }
 }
diff --git a/crates/nu-command/src/sort_utils.rs b/crates/nu-command/src/sort_utils.rs
index 01bb604eac..7d70121096 100644
--- a/crates/nu-command/src/sort_utils.rs
+++ b/crates/nu-command/src/sort_utils.rs
@@ -1,351 +1,286 @@
-use alphanumeric_sort::compare_str;
-use nu_engine::column::nonexistent_column;
-use nu_protocol::{ShellError, Span, Value};
+use nu_engine::ClosureEval;
+use nu_protocol::{ast::CellPath, PipelineData, Record, ShellError, Span, Value};
 use nu_utils::IgnoreCaseExt;
 use std::cmp::Ordering;
 
-// This module includes sorting functionality that is useful in sort-by and elsewhere.
-// Eventually it would be nice to find a better home for it; sorting logic is only coupled
-// to commands for historical reasons.
+/// A specification of sort order for `sort_by`.
+///
+/// A closure comparator allows the user to return custom ordering to sort by.
+/// A cell path comparator uses the value referred to by the cell path as the sorting key.
+pub enum Comparator {
+    KeyClosure(ClosureEval),
+    CustomClosure(ClosureEval),
+    CellPath(CellPath),
+}
 
-/// Sort a value. This only makes sense for lists and list-like things,
-/// so for everything else we just return the value as-is.
-/// CustomValues are converted to their base value and then sorted.
-pub fn sort_value(
-    val: &Value,
-    sort_columns: Vec<String>,
-    ascending: bool,
-    insensitive: bool,
-    natural: bool,
-) -> Result<Value, ShellError> {
-    let span = val.span();
-    match val {
-        Value::List { vals, .. } => {
-            let mut vals = vals.clone();
-            sort(&mut vals, sort_columns, span, insensitive, natural)?;
+/// Sort a slice of `Value`s.
+///
+/// Sort has the following invariants, in order of precedence:
+/// - Null values (Nothing type) are always sorted to the end.
+/// - For natural sort, numeric values (numeric strings, ints, and floats) appear first, sorted by numeric value
+/// - Values appear by order of `Value`'s `PartialOrd`.
+/// - Sorting for values with equal ordering is stable.
+///
+/// Generally, values of different types are ordered by order of appearance in the `Value` enum.
+/// However, this is not always the case. For example, ints and floats will be grouped together since
+/// `Value`'s `PartialOrd` defines a non-decreasing ordering between non-decreasing integers and floats.
+pub fn sort(vec: &mut [Value], insensitive: bool, natural: bool) -> Result<(), ShellError> {
+    // allow the comparator function to indicate error
+    // by mutating this option captured by the closure,
+    // since sort_by closure must be infallible
+    let mut compare_err: Option<ShellError> = None;
 
-            if !ascending {
-                vals.reverse();
-            }
-
-            Ok(Value::list(vals, span))
+    vec.sort_by(|a, b| {
+        // we've already hit an error, bail out now
+        if compare_err.is_some() {
+            return Ordering::Equal;
         }
-        Value::Custom { val, .. } => {
-            let base_val = val.to_base_value(span)?;
-            sort_value(&base_val, sort_columns, ascending, insensitive, natural)
-        }
-        _ => Ok(val.to_owned()),
+
+        compare_values(a, b, insensitive, natural).unwrap_or_else(|err| {
+            compare_err.get_or_insert(err);
+            Ordering::Equal
+        })
+    });
+
+    if let Some(err) = compare_err {
+        Err(err)
+    } else {
+        Ok(())
     }
 }
 
-/// Sort a value in-place. This is more efficient than sort_value() because it
-/// avoids cloning, but it does not work for CustomValues; they are returned as-is.
-pub fn sort_value_in_place(
-    val: &mut Value,
-    sort_columns: Vec<String>,
-    ascending: bool,
-    insensitive: bool,
-    natural: bool,
-) -> Result<(), ShellError> {
-    let span = val.span();
-    if let Value::List { vals, .. } = val {
-        sort(vals, sort_columns, span, insensitive, natural)?;
-        if !ascending {
-            vals.reverse();
-        }
-    }
-    Ok(())
-}
-
-pub fn sort(
+/// Sort a slice of `Value`s by criteria specified by one or multiple `Comparator`s.
+pub fn sort_by(
     vec: &mut [Value],
-    sort_columns: Vec<String>,
-    span: Span,
+    mut comparators: Vec<Comparator>,
+    head_span: Span,
     insensitive: bool,
     natural: bool,
 ) -> Result<(), ShellError> {
-    let val_span = vec.first().map(|v| v.span()).unwrap_or(span);
-    match vec.first() {
-        Some(Value::Record { val: record, .. }) => {
-            if sort_columns.is_empty() {
-                // This uses the same format as the 'requires a column name' error in split_by.rs
-                return Err(ShellError::GenericError {
-                    error: "expected name".into(),
-                    msg: "requires a column name to sort table data".into(),
-                    span: Some(span),
-                    help: None,
-                    inner: vec![],
-                });
-            }
-
-            if let Some(nonexistent) = nonexistent_column(&sort_columns, record.columns()) {
-                return Err(ShellError::CantFindColumn {
-                    col_name: nonexistent,
-                    span: Some(span),
-                    src_span: val_span,
-                });
-            }
-
-            // check to make sure each value in each column in the record
-            // that we asked for is a string. So, first collect all the columns
-            // that we asked for into vals, then later make sure they're all
-            // strings.
-            let mut vals = vec![];
-            for item in vec.iter() {
-                for col in &sort_columns {
-                    let val = item
-                        .get_data_by_key(col)
-                        .unwrap_or_else(|| Value::nothing(Span::unknown()));
-                    vals.push(val);
-                }
-            }
-
-            let should_sort_case_insensitively = insensitive
-                && vals
-                    .iter()
-                    .all(|x| matches!(x.get_type(), nu_protocol::Type::String));
-
-            let should_sort_case_naturally = natural
-                && vals
-                    .iter()
-                    .all(|x| matches!(x.get_type(), nu_protocol::Type::String));
-
-            vec.sort_by(|a, b| {
-                compare(
-                    a,
-                    b,
-                    &sort_columns,
-                    span,
-                    should_sort_case_insensitively,
-                    should_sort_case_naturally,
-                )
-            });
-        }
-        _ => {
-            vec.sort_by(|a, b| {
-                if insensitive {
-                    let span_a = a.span();
-                    let span_b = b.span();
-                    let folded_left = match a {
-                        Value::String { val, .. } => Value::string(val.to_folded_case(), span_a),
-                        _ => a.clone(),
-                    };
-
-                    let folded_right = match b {
-                        Value::String { val, .. } => Value::string(val.to_folded_case(), span_b),
-                        _ => b.clone(),
-                    };
-
-                    if natural {
-                        match (
-                            folded_left.coerce_into_string(),
-                            folded_right.coerce_into_string(),
-                        ) {
-                            (Ok(left), Ok(right)) => compare_str(left, right),
-                            _ => Ordering::Equal,
-                        }
-                    } else {
-                        folded_left
-                            .partial_cmp(&folded_right)
-                            .unwrap_or(Ordering::Equal)
-                    }
-                } else if natural {
-                    match (a.coerce_str(), b.coerce_str()) {
-                        (Ok(left), Ok(right)) => compare_str(left, right),
-                        _ => Ordering::Equal,
-                    }
-                } else {
-                    a.partial_cmp(b).unwrap_or(Ordering::Equal)
-                }
-            });
-        }
+    if comparators.is_empty() {
+        // This uses the same format as the 'requires a column name' error in split_by.rs
+        return Err(ShellError::GenericError {
+            error: "expected name".into(),
+            msg: "requires a cell path or closure to sort data".into(),
+            span: Some(head_span),
+            help: None,
+            inner: vec![],
+        });
+    }
+
+    // allow the comparator function to indicate error
+    // by mutating this option captured by the closure,
+    // since sort_by closure must be infallible
+    let mut compare_err: Option<ShellError> = None;
+
+    vec.sort_by(|a, b| {
+        compare_by(
+            a,
+            b,
+            &mut comparators,
+            head_span,
+            insensitive,
+            natural,
+            &mut compare_err,
+        )
+    });
+
+    if let Some(err) = compare_err {
+        Err(err)
+    } else {
+        Ok(())
     }
-    Ok(())
 }
 
-pub fn compare(
+/// Sort a record's key-value pairs.
+///
+/// Can sort by key or by value.
+pub fn sort_record(
+    record: Record,
+    sort_by_value: bool,
+    reverse: bool,
+    insensitive: bool,
+    natural: bool,
+) -> Result<Record, ShellError> {
+    let mut input_pairs: Vec<(String, Value)> = record.into_iter().collect();
+
+    // allow the comparator function to indicate error
+    // by mutating this option captured by the closure,
+    // since sort_by closure must be infallible
+    let mut compare_err: Option<ShellError> = None;
+
+    if sort_by_value {
+        input_pairs.sort_by(|a, b| {
+            // we've already hit an error, bail out now
+            if compare_err.is_some() {
+                return Ordering::Equal;
+            }
+
+            compare_values(&a.1, &b.1, insensitive, natural).unwrap_or_else(|err| {
+                compare_err.get_or_insert(err);
+                Ordering::Equal
+            })
+        });
+    } else {
+        input_pairs.sort_by(|a, b| compare_strings(&a.0, &b.0, insensitive, natural));
+    };
+
+    if let Some(err) = compare_err {
+        return Err(err);
+    }
+
+    if reverse {
+        input_pairs.reverse()
+    }
+
+    Ok(input_pairs.into_iter().collect())
+}
+
+pub fn compare_by(
     left: &Value,
     right: &Value,
-    columns: &[String],
+    comparators: &mut [Comparator],
     span: Span,
     insensitive: bool,
     natural: bool,
+    error: &mut Option<ShellError>,
 ) -> Ordering {
-    for column in columns {
-        let left_value = left.get_data_by_key(column);
-
-        let left_res = match left_value {
-            Some(left_res) => left_res,
-            None => Value::nothing(span),
-        };
-
-        let right_value = right.get_data_by_key(column);
-
-        let right_res = match right_value {
-            Some(right_res) => right_res,
-            None => Value::nothing(span),
-        };
-
-        let result = if insensitive {
-            let span_left = left_res.span();
-            let span_right = right_res.span();
-            let folded_left = match left_res {
-                Value::String { val, .. } => Value::string(val.to_folded_case(), span_left),
-                _ => left_res,
-            };
-
-            let folded_right = match right_res {
-                Value::String { val, .. } => Value::string(val.to_folded_case(), span_right),
-                _ => right_res,
-            };
-            if natural {
-                match (
-                    folded_left.coerce_into_string(),
-                    folded_right.coerce_into_string(),
-                ) {
-                    (Ok(left), Ok(right)) => compare_str(left, right),
-                    _ => Ordering::Equal,
-                }
-            } else {
-                folded_left
-                    .partial_cmp(&folded_right)
-                    .unwrap_or(Ordering::Equal)
+    // we've already hit an error, bail out now
+    if error.is_some() {
+        return Ordering::Equal;
+    }
+    for cmp in comparators.iter_mut() {
+        let result = match cmp {
+            Comparator::CellPath(cell_path) => {
+                compare_cell_path(left, right, cell_path, insensitive, natural)
             }
-        } else if natural {
-            match (
-                left_res.coerce_into_string(),
-                right_res.coerce_into_string(),
-            ) {
-                (Ok(left), Ok(right)) => compare_str(left, right),
-                _ => Ordering::Equal,
+            Comparator::KeyClosure(closure) => {
+                compare_key_closure(left, right, closure, span, insensitive, natural)
+            }
+            Comparator::CustomClosure(closure) => {
+                compare_custom_closure(left, right, closure, span)
             }
-        } else {
-            left_res.partial_cmp(&right_res).unwrap_or(Ordering::Equal)
         };
-        if result != Ordering::Equal {
-            return result;
+        match result {
+            Ok(Ordering::Equal) => {}
+            Ok(ordering) => return ordering,
+            Err(err) => {
+                // don't bother continuing through the remaining comparators as we've hit an error
+                // don't overwrite if there's an existing error
+                error.get_or_insert(err);
+                return Ordering::Equal;
+            }
         }
     }
-
     Ordering::Equal
 }
 
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use nu_protocol::{record, Value};
+/// Determines whether a value should be sorted as a string
+///
+/// If we're natural sorting, we want to sort strings, integers, and floats alphanumerically, so we should string sort.
+/// Otherwise, we only want to string sort if both values are strings or globs (to enable case insensitive comparison)
+fn should_sort_as_string(val: &Value, natural: bool) -> bool {
+    matches!(
+        (val, natural),
+        (&Value::String { .. }, _)
+            | (&Value::Glob { .. }, _)
+            | (&Value::Int { .. }, true)
+            | (&Value::Float { .. }, true)
+    )
+}
 
-    #[test]
-    fn test_sort_value() {
-        let val = Value::test_list(vec![
-            Value::test_record(record! {
-            "fruit" => Value::test_string("pear"),
-            "count" => Value::test_int(3),
-            }),
-            Value::test_record(record! {
-            "fruit" => Value::test_string("orange"),
-            "count" => Value::test_int(7),
-            }),
-            Value::test_record(record! {
-            "fruit" => Value::test_string("apple"),
-            "count" => Value::test_int(9),
-            }),
-        ]);
+/// Simple wrapper around `should_sort_as_string` to determine if two values
+/// should be compared as strings.
+fn should_string_compare(left: &Value, right: &Value, natural: bool) -> bool {
+    should_sort_as_string(left, natural) && should_sort_as_string(right, natural)
+}
 
-        let sorted_alphabetically =
-            sort_value(&val, vec!["fruit".to_string()], true, false, false).unwrap();
-        assert_eq!(
-            sorted_alphabetically,
-            Value::test_list(vec![
-                Value::test_record(record! {
-                "fruit" => Value::test_string("apple"),
-                "count" => Value::test_int(9),
-                            }),
-                Value::test_record(record! {
-                "fruit" => Value::test_string("orange"),
-                "count" => Value::test_int(7),
-                            }),
-                Value::test_record(record! {
-                "fruit" => Value::test_string("pear"),
-                "count" => Value::test_int(3),
-                            }),
-            ],)
-        );
-
-        let sorted_by_count_desc =
-            sort_value(&val, vec!["count".to_string()], false, false, false).unwrap();
-        assert_eq!(
-            sorted_by_count_desc,
-            Value::test_list(vec![
-                Value::test_record(record! {
-                "fruit" => Value::test_string("apple"),
-                "count" => Value::test_int(9),
-                            }),
-                Value::test_record(record! {
-                "fruit" => Value::test_string("orange"),
-                "count" => Value::test_int(7),
-                            }),
-                Value::test_record(record! {
-                "fruit" => Value::test_string("pear"),
-                "count" => Value::test_int(3),
-                            }),
-            ],)
-        );
-    }
-
-    #[test]
-    fn test_sort_value_in_place() {
-        let mut val = Value::test_list(vec![
-            Value::test_record(record! {
-            "fruit" => Value::test_string("pear"),
-            "count" => Value::test_int(3),
-            }),
-            Value::test_record(record! {
-            "fruit" => Value::test_string("orange"),
-            "count" => Value::test_int(7),
-            }),
-            Value::test_record(record! {
-            "fruit" => Value::test_string("apple"),
-            "count" => Value::test_int(9),
-            }),
-        ]);
-
-        sort_value_in_place(&mut val, vec!["fruit".to_string()], true, false, false).unwrap();
-        assert_eq!(
-            val,
-            Value::test_list(vec![
-                Value::test_record(record! {
-                "fruit" => Value::test_string("apple"),
-                "count" => Value::test_int(9),
-                            }),
-                Value::test_record(record! {
-                "fruit" => Value::test_string("orange"),
-                "count" => Value::test_int(7),
-                            }),
-                Value::test_record(record! {
-                "fruit" => Value::test_string("pear"),
-                "count" => Value::test_int(3),
-                            }),
-            ],)
-        );
-
-        sort_value_in_place(&mut val, vec!["count".to_string()], false, false, false).unwrap();
-        assert_eq!(
-            val,
-            Value::test_list(vec![
-                Value::test_record(record! {
-                "fruit" => Value::test_string("apple"),
-                "count" => Value::test_int(9),
-                            }),
-                Value::test_record(record! {
-                "fruit" => Value::test_string("orange"),
-                "count" => Value::test_int(7),
-                            }),
-                Value::test_record(record! {
-                "fruit" => Value::test_string("pear"),
-                "count" => Value::test_int(3),
-                            }),
-            ],)
-        );
+pub fn compare_values(
+    left: &Value,
+    right: &Value,
+    insensitive: bool,
+    natural: bool,
+) -> Result<Ordering, ShellError> {
+    if should_string_compare(left, right, natural) {
+        Ok(compare_strings(
+            &left.coerce_str()?,
+            &right.coerce_str()?,
+            insensitive,
+            natural,
+        ))
+    } else {
+        Ok(left.partial_cmp(right).unwrap_or(Ordering::Equal))
     }
 }
+
+pub fn compare_strings(left: &str, right: &str, insensitive: bool, natural: bool) -> Ordering {
+    fn compare_inner<T>(left: T, right: T, natural: bool) -> Ordering
+    where
+        T: AsRef<str> + Ord,
+    {
+        if natural {
+            alphanumeric_sort::compare_str(left, right)
+        } else {
+            left.cmp(&right)
+        }
+    }
+
+    // only allocate a String if necessary for case folding
+    if insensitive {
+        compare_inner(left.to_folded_case(), right.to_folded_case(), natural)
+    } else {
+        compare_inner(left, right, natural)
+    }
+}
+
+pub fn compare_cell_path(
+    left: &Value,
+    right: &Value,
+    cell_path: &CellPath,
+    insensitive: bool,
+    natural: bool,
+) -> Result<Ordering, ShellError> {
+    let left = left.clone().follow_cell_path(&cell_path.members, false)?;
+    let right = right.clone().follow_cell_path(&cell_path.members, false)?;
+    compare_values(&left, &right, insensitive, natural)
+}
+
+pub fn compare_key_closure(
+    left: &Value,
+    right: &Value,
+    closure_eval: &mut ClosureEval,
+    span: Span,
+    insensitive: bool,
+    natural: bool,
+) -> Result<Ordering, ShellError> {
+    let left_key = closure_eval
+        .run_with_value(left.clone())?
+        .into_value(span)?;
+    let right_key = closure_eval
+        .run_with_value(right.clone())?
+        .into_value(span)?;
+    compare_values(&left_key, &right_key, insensitive, natural)
+}
+
+pub fn compare_custom_closure(
+    left: &Value,
+    right: &Value,
+    closure_eval: &mut ClosureEval,
+    span: Span,
+) -> Result<Ordering, ShellError> {
+    closure_eval
+        .add_arg(left.clone())
+        .add_arg(right.clone())
+        .run_with_input(PipelineData::Value(
+            Value::list(vec![left.clone(), right.clone()], span),
+            None,
+        ))
+        .and_then(|data| data.into_value(span))
+        .map(|val| {
+            if val.is_true() {
+                Ordering::Less
+            } else {
+                Ordering::Greater
+            }
+        })
+}
diff --git a/crates/nu-command/tests/commands/sort.rs b/crates/nu-command/tests/commands/sort.rs
index 3deeba30d0..ef9b8a003e 100644
--- a/crates/nu-command/tests/commands/sort.rs
+++ b/crates/nu-command/tests/commands/sort.rs
@@ -33,6 +33,20 @@ fn sort_primitive_values() {
     assert_eq!(actual.out, "authors = [\"The Nushell Project Developers\"]");
 }
 
+#[test]
+fn sort_table() {
+    // if a table's records are compared directly rather than holistically as a table,
+    // [100, 10, 5] will come before [100, 5, 8] because record comparison
+    // compares columns by alphabetical order, so price will be checked before quantity
+    let actual =
+        nu!("[[id, quantity, price]; [100, 10, 5], [100, 5, 8], [100, 5, 1]] | sort | to nuon");
+
+    assert_eq!(
+        actual.out,
+        r#"[[id, quantity, price]; [100, 5, 1], [100, 5, 8], [100, 10, 5]]"#
+    );
+}
+
 #[test]
 fn sort_different_types() {
     let actual = nu!("[a, 1, b, 2, c, 3, [4, 5, 6], d, 4, [1, 2, 3]] | sort | to json --raw");
diff --git a/crates/nu-command/tests/main.rs b/crates/nu-command/tests/main.rs
index 248151e74a..fa2a7168b5 100644
--- a/crates/nu-command/tests/main.rs
+++ b/crates/nu-command/tests/main.rs
@@ -6,6 +6,7 @@ use quickcheck_macros::quickcheck;
 
 mod commands;
 mod format_conversions;
+mod sort_utils;
 
 fn create_default_context() -> EngineState {
     nu_command::add_shell_command_context(nu_cmd_lang::create_default_context())
diff --git a/crates/nu-command/tests/sort_utils.rs b/crates/nu-command/tests/sort_utils.rs
new file mode 100644
index 0000000000..be305588e2
--- /dev/null
+++ b/crates/nu-command/tests/sort_utils.rs
@@ -0,0 +1,554 @@
+use nu_command::{sort, sort_by, sort_record, Comparator};
+use nu_protocol::{
+    ast::{CellPath, PathMember},
+    record, Record, Span, Value,
+};
+
+#[test]
+fn test_sort_basic() {
+    let mut list = vec![
+        Value::test_string("foo"),
+        Value::test_int(2),
+        Value::test_int(3),
+        Value::test_string("bar"),
+        Value::test_int(1),
+        Value::test_string("baz"),
+    ];
+
+    assert!(sort(&mut list, false, false).is_ok());
+    assert_eq!(
+        list,
+        vec![
+            Value::test_int(1),
+            Value::test_int(2),
+            Value::test_int(3),
+            Value::test_string("bar"),
+            Value::test_string("baz"),
+            Value::test_string("foo")
+        ]
+    );
+}
+
+#[test]
+fn test_sort_nothing() {
+    // Nothing values should always be sorted to the end of any list
+    let mut list = vec![
+        Value::test_int(1),
+        Value::test_nothing(),
+        Value::test_int(2),
+        Value::test_string("foo"),
+        Value::test_nothing(),
+        Value::test_string("bar"),
+    ];
+
+    assert!(sort(&mut list, false, false).is_ok());
+    assert_eq!(
+        list,
+        vec![
+            Value::test_int(1),
+            Value::test_int(2),
+            Value::test_string("bar"),
+            Value::test_string("foo"),
+            Value::test_nothing(),
+            Value::test_nothing()
+        ]
+    );
+
+    // Ensure that nothing values are sorted after *all* types,
+    // even types which may follow `Nothing` in the PartialOrd order
+
+    // unstable_name_collision
+    // can be switched to std intersperse when stabilized
+    let mut values: Vec<Value> =
+        itertools::intersperse(Value::test_values(), Value::test_nothing()).collect();
+
+    let nulls = values
+        .iter()
+        .filter(|item| item == &&Value::test_nothing())
+        .count();
+
+    assert!(sort(&mut values, false, false).is_ok());
+
+    // check if the last `nulls` values of the sorted list are indeed null
+    assert_eq!(&values[(nulls - 1)..], vec![Value::test_nothing(); nulls])
+}
+
+#[test]
+fn test_sort_natural_basic() {
+    let mut list = vec![
+        Value::test_string("foo99"),
+        Value::test_string("foo9"),
+        Value::test_string("foo1"),
+        Value::test_string("foo100"),
+        Value::test_string("foo10"),
+        Value::test_string("1"),
+        Value::test_string("10"),
+        Value::test_string("100"),
+        Value::test_string("9"),
+        Value::test_string("99"),
+    ];
+
+    assert!(sort(&mut list, false, false).is_ok());
+    assert_eq!(
+        list,
+        vec![
+            Value::test_string("1"),
+            Value::test_string("10"),
+            Value::test_string("100"),
+            Value::test_string("9"),
+            Value::test_string("99"),
+            Value::test_string("foo1"),
+            Value::test_string("foo10"),
+            Value::test_string("foo100"),
+            Value::test_string("foo9"),
+            Value::test_string("foo99"),
+        ]
+    );
+
+    assert!(sort(&mut list, false, true).is_ok());
+    assert_eq!(
+        list,
+        vec![
+            Value::test_string("1"),
+            Value::test_string("9"),
+            Value::test_string("10"),
+            Value::test_string("99"),
+            Value::test_string("100"),
+            Value::test_string("foo1"),
+            Value::test_string("foo9"),
+            Value::test_string("foo10"),
+            Value::test_string("foo99"),
+            Value::test_string("foo100"),
+        ]
+    );
+}
+
+#[test]
+fn test_sort_natural_mixed_types() {
+    let mut list = vec![
+        Value::test_string("1"),
+        Value::test_int(99),
+        Value::test_int(1),
+        Value::test_float(1000.0),
+        Value::test_int(9),
+        Value::test_string("9"),
+        Value::test_int(100),
+        Value::test_string("99"),
+        Value::test_float(2.0),
+        Value::test_string("100"),
+        Value::test_int(10),
+        Value::test_string("10"),
+    ];
+
+    assert!(sort(&mut list, false, false).is_ok());
+    assert_eq!(
+        list,
+        vec![
+            Value::test_int(1),
+            Value::test_float(2.0),
+            Value::test_int(9),
+            Value::test_int(10),
+            Value::test_int(99),
+            Value::test_int(100),
+            Value::test_float(1000.0),
+            Value::test_string("1"),
+            Value::test_string("10"),
+            Value::test_string("100"),
+            Value::test_string("9"),
+            Value::test_string("99")
+        ]
+    );
+
+    assert!(sort(&mut list, false, true).is_ok());
+    assert_eq!(
+        list,
+        vec![
+            Value::test_int(1),
+            Value::test_string("1"),
+            Value::test_float(2.0),
+            Value::test_int(9),
+            Value::test_string("9"),
+            Value::test_int(10),
+            Value::test_string("10"),
+            Value::test_int(99),
+            Value::test_string("99"),
+            Value::test_int(100),
+            Value::test_string("100"),
+            Value::test_float(1000.0),
+        ]
+    );
+}
+
+#[test]
+fn test_sort_natural_no_numeric_values() {
+    // If list contains no numeric strings, it should be sorted the
+    // same with or without natural sorting
+    let mut normal = vec![
+        Value::test_string("golf"),
+        Value::test_bool(false),
+        Value::test_string("alfa"),
+        Value::test_string("echo"),
+        Value::test_int(7),
+        Value::test_int(10),
+        Value::test_bool(true),
+        Value::test_string("uniform"),
+        Value::test_int(3),
+        Value::test_string("tango"),
+    ];
+    let mut natural = normal.clone();
+
+    assert!(sort(&mut normal, false, false).is_ok());
+    assert!(sort(&mut natural, false, true).is_ok());
+    assert_eq!(normal, natural);
+}
+
+#[test]
+fn test_sort_natural_type_order() {
+    // This test is to prevent regression to a previous natural sort behavior
+    // where values of different types would be intermixed.
+    // Only numeric values (ints, floats, and numeric strings) should be intermixed
+    //
+    // This list would previously be incorrectly sorted like this:
+    // ╭────┬─────────╮
+    // │  0 │       1 │
+    // │  1 │ golf    │
+    // │  2 │ false   │
+    // │  3 │       7 │
+    // │  4 │      10 │
+    // │  5 │ alfa    │
+    // │  6 │ true    │
+    // │  7 │ uniform │
+    // │  8 │ true    │
+    // │  9 │       3 │
+    // │ 10 │ false   │
+    // │ 11 │ tango   │
+    // ╰────┴─────────╯
+
+    let mut list = vec![
+        Value::test_string("golf"),
+        Value::test_int(1),
+        Value::test_bool(false),
+        Value::test_string("alfa"),
+        Value::test_int(7),
+        Value::test_int(10),
+        Value::test_bool(true),
+        Value::test_string("uniform"),
+        Value::test_bool(true),
+        Value::test_int(3),
+        Value::test_bool(false),
+        Value::test_string("tango"),
+    ];
+
+    assert!(sort(&mut list, false, true).is_ok());
+    assert_eq!(
+        list,
+        vec![
+            Value::test_bool(false),
+            Value::test_bool(false),
+            Value::test_bool(true),
+            Value::test_bool(true),
+            Value::test_int(1),
+            Value::test_int(3),
+            Value::test_int(7),
+            Value::test_int(10),
+            Value::test_string("alfa"),
+            Value::test_string("golf"),
+            Value::test_string("tango"),
+            Value::test_string("uniform")
+        ]
+    );
+
+    // Only ints, floats, and numeric strings should be intermixed
+    // While binary primitives and datetimes can be coerced into strings, it doesn't make sense to sort them with numbers
+    // Binary primitives can hold multiple values, not just one, so shouldn't be compared to single values
+    // Datetimes don't have a single obvious numeric representation, and if we chose one it would be ambiguous to the user
+
+    let year_three = chrono::NaiveDate::from_ymd_opt(3, 1, 1)
+        .unwrap()
+        .and_hms_opt(0, 0, 0)
+        .unwrap()
+        .and_utc();
+
+    let mut list = vec![
+        Value::test_int(10),
+        Value::test_float(6.0),
+        Value::test_int(1),
+        Value::test_binary([3]),
+        Value::test_string("2"),
+        Value::test_date(year_three.into()),
+        Value::test_int(4),
+        Value::test_binary([52]),
+        Value::test_float(9.0),
+        Value::test_string("5"),
+        Value::test_date(chrono::DateTime::UNIX_EPOCH.into()),
+        Value::test_int(7),
+        Value::test_string("8"),
+        Value::test_float(3.0),
+        Value::test_string("foobar"),
+    ];
+    assert!(sort(&mut list, false, true).is_ok());
+    assert_eq!(
+        list,
+        vec![
+            Value::test_int(1),
+            Value::test_string("2"),
+            Value::test_float(3.0),
+            Value::test_int(4),
+            Value::test_string("5"),
+            Value::test_float(6.0),
+            Value::test_int(7),
+            Value::test_string("8"),
+            Value::test_float(9.0),
+            Value::test_int(10),
+            Value::test_string("foobar"),
+            // the ordering of date and binary here may change if the PartialOrd order is changed,
+            // but they should not be intermixed with the above
+            Value::test_date(year_three.into()),
+            Value::test_date(chrono::DateTime::UNIX_EPOCH.into()),
+            Value::test_binary([3]),
+            Value::test_binary([52]),
+        ]
+    );
+}
+
+#[test]
+fn test_sort_insensitive() {
+    // Test permutations between insensitive and natural
+    // Ensure that strings with equal insensitive orderings
+    // are sorted stably. (FOO then foo, bar then BAR)
+    let source = vec![
+        Value::test_string("FOO"),
+        Value::test_string("foo"),
+        Value::test_int(100),
+        Value::test_string("9"),
+        Value::test_string("bar"),
+        Value::test_int(10),
+        Value::test_string("baz"),
+        Value::test_string("BAR"),
+    ];
+    let mut list;
+
+    // sensitive + non-natural
+    list = source.clone();
+    assert!(sort(&mut list, false, false).is_ok());
+    assert_eq!(
+        list,
+        vec![
+            Value::test_int(10),
+            Value::test_int(100),
+            Value::test_string("9"),
+            Value::test_string("BAR"),
+            Value::test_string("FOO"),
+            Value::test_string("bar"),
+            Value::test_string("baz"),
+            Value::test_string("foo"),
+        ]
+    );
+
+    // sensitive + natural
+    list = source.clone();
+    assert!(sort(&mut list, false, true).is_ok());
+    assert_eq!(
+        list,
+        vec![
+            Value::test_string("9"),
+            Value::test_int(10),
+            Value::test_int(100),
+            Value::test_string("BAR"),
+            Value::test_string("FOO"),
+            Value::test_string("bar"),
+            Value::test_string("baz"),
+            Value::test_string("foo"),
+        ]
+    );
+
+    // insensitive + non-natural
+    list = source.clone();
+    assert!(sort(&mut list, true, false).is_ok());
+    assert_eq!(
+        list,
+        vec![
+            Value::test_int(10),
+            Value::test_int(100),
+            Value::test_string("9"),
+            Value::test_string("bar"),
+            Value::test_string("BAR"),
+            Value::test_string("baz"),
+            Value::test_string("FOO"),
+            Value::test_string("foo"),
+        ]
+    );
+
+    // insensitive + natural
+    list = source.clone();
+    assert!(sort(&mut list, true, true).is_ok());
+    assert_eq!(
+        list,
+        vec![
+            Value::test_string("9"),
+            Value::test_int(10),
+            Value::test_int(100),
+            Value::test_string("bar"),
+            Value::test_string("BAR"),
+            Value::test_string("baz"),
+            Value::test_string("FOO"),
+            Value::test_string("foo"),
+        ]
+    );
+}
+
+// Helper function to assert that two records are equal
+// with their key-value pairs in the same order
+fn assert_record_eq(a: Record, b: Record) {
+    assert_eq!(
+        a.into_iter().collect::<Vec<_>>(),
+        b.into_iter().collect::<Vec<_>>(),
+    )
+}
+
+#[test]
+fn test_sort_record_keys() {
+    // Basic record sort test
+    let record = record! {
+        "golf" => Value::test_string("bar"),
+        "alfa" => Value::test_string("foo"),
+        "echo" => Value::test_int(123),
+    };
+
+    let sorted = sort_record(record, false, false, false, false).unwrap();
+    assert_record_eq(
+        sorted,
+        record! {
+            "alfa" => Value::test_string("foo"),
+            "echo" => Value::test_int(123),
+            "golf" => Value::test_string("bar"),
+        },
+    );
+}
+
+#[test]
+fn test_sort_record_values() {
+    // This test is to prevent a regression where integers and strings would be
+    // intermixed non-naturally when sorting a record by value without the natural flag:
+    //
+    // This record would previously be incorrectly sorted like this:
+    // ╭─────────┬─────╮
+    // │ alfa    │ 1   │
+    // │ charlie │ 1   │
+    // │ india   │ 10  │
+    // │ juliett │ 10  │
+    // │ foxtrot │ 100 │
+    // │ hotel   │ 100 │
+    // │ delta   │ 9   │
+    // │ echo    │ 9   │
+    // │ bravo   │ 99  │
+    // │ golf    │ 99  │
+    // ╰─────────┴─────╯
+
+    let record = record! {
+        "alfa" => Value::test_string("1"),
+        "bravo" => Value::test_int(99),
+        "charlie" => Value::test_int(1),
+        "delta" => Value::test_int(9),
+        "echo" => Value::test_string("9"),
+        "foxtrot" => Value::test_int(100),
+        "golf" => Value::test_string("99"),
+        "hotel" => Value::test_string("100"),
+        "india" => Value::test_int(10),
+        "juliett" => Value::test_string("10"),
+    };
+
+    // non-natural sort
+    let sorted = sort_record(record.clone(), true, false, false, false).unwrap();
+    assert_record_eq(
+        sorted,
+        record! {
+            "charlie" => Value::test_int(1),
+            "delta" => Value::test_int(9),
+            "india" => Value::test_int(10),
+            "bravo" => Value::test_int(99),
+            "foxtrot" => Value::test_int(100),
+            "alfa" => Value::test_string("1"),
+            "juliett" => Value::test_string("10"),
+            "hotel" => Value::test_string("100"),
+            "echo" => Value::test_string("9"),
+            "golf" => Value::test_string("99"),
+        },
+    );
+
+    // natural sort
+    let sorted = sort_record(record.clone(), true, false, false, true).unwrap();
+    assert_record_eq(
+        sorted,
+        record! {
+            "alfa" => Value::test_string("1"),
+            "charlie" => Value::test_int(1),
+            "delta" => Value::test_int(9),
+            "echo" => Value::test_string("9"),
+            "india" => Value::test_int(10),
+            "juliett" => Value::test_string("10"),
+            "bravo" => Value::test_int(99),
+            "golf" => Value::test_string("99"),
+            "foxtrot" => Value::test_int(100),
+            "hotel" => Value::test_string("100"),
+        },
+    );
+}
+
+#[test]
+fn test_sort_equivalent() {
+    // Ensure that sort, sort_by, and record sort have equivalent sorting logic
+    let phonetic = vec![
+        "alfa", "bravo", "charlie", "delta", "echo", "foxtrot", "golf", "hotel", "india",
+        "juliett", "kilo", "lima", "mike", "november", "oscar", "papa", "quebec", "romeo",
+        "sierra", "tango", "uniform", "victor", "whiskey", "xray", "yankee", "zulu",
+    ];
+
+    // filter out errors, since we can't sort_by on those
+    let mut values: Vec<Value> = Value::test_values()
+        .into_iter()
+        .filter(|val| !matches!(val, Value::Error { .. }))
+        .collect();
+
+    // reverse sort test values
+    values.sort_by(|a, b| b.partial_cmp(a).unwrap());
+
+    let mut list = values.clone();
+    let mut table: Vec<Value> = values
+        .clone()
+        .into_iter()
+        .map(|val| Value::test_record(record! { "value" => val }))
+        .collect();
+    let record = Record::from_iter(phonetic.into_iter().map(str::to_string).zip(values));
+
+    let comparator = Comparator::CellPath(CellPath {
+        members: vec![PathMember::String {
+            val: "value".to_string(),
+            span: Span::test_data(),
+            optional: false,
+        }],
+    });
+
+    assert!(sort(&mut list, false, false).is_ok());
+    assert!(sort_by(
+        &mut table,
+        vec![comparator],
+        Span::test_data(),
+        false,
+        false
+    )
+    .is_ok());
+
+    let record_sorted = sort_record(record.clone(), true, false, false, false).unwrap();
+    let record_vals: Vec<Value> = record_sorted.into_iter().map(|pair| pair.1).collect();
+
+    let table_vals: Vec<Value> = table
+        .clone()
+        .into_iter()
+        .map(|record| record.into_record().unwrap().remove("value").unwrap())
+        .collect();
+
+    assert_eq!(list, record_vals);
+    assert_eq!(record_vals, table_vals);
+    // list == table_vals by transitive property
+}
diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs
index 5a6461ab18..ea7e258f3f 100644
--- a/crates/nu-protocol/src/value/mod.rs
+++ b/crates/nu-protocol/src/value/mod.rs
@@ -68,6 +68,21 @@ pub enum Value {
         #[serde(rename = "span")]
         internal_span: Span,
     },
+    String {
+        val: String,
+        // note: spans are being refactored out of Value
+        // please use .span() instead of matching this span value
+        #[serde(rename = "span")]
+        internal_span: Span,
+    },
+    Glob {
+        val: String,
+        no_expand: bool,
+        // note: spans are being refactored out of Value
+        // please use .span() instead of matching this span value
+        #[serde(rename = "span")]
+        internal_span: Span,
+    },
     Filesize {
         val: i64,
         // note: spans are being refactored out of Value
@@ -96,21 +111,6 @@ pub enum Value {
         #[serde(rename = "span")]
         internal_span: Span,
     },
-    String {
-        val: String,
-        // note: spans are being refactored out of Value
-        // please use .span() instead of matching this span value
-        #[serde(rename = "span")]
-        internal_span: Span,
-    },
-    Glob {
-        val: String,
-        no_expand: bool,
-        // note: spans are being refactored out of Value
-        // please use .span() instead of matching this span value
-        #[serde(rename = "span")]
-        internal_span: Span,
-    },
     Record {
         val: SharedCow<Record>,
         // note: spans are being refactored out of Value
@@ -132,12 +132,6 @@ pub enum Value {
         #[serde(rename = "span")]
         internal_span: Span,
     },
-    Nothing {
-        // note: spans are being refactored out of Value
-        // please use .span() instead of matching this span value
-        #[serde(rename = "span")]
-        internal_span: Span,
-    },
     Error {
         error: Box<ShellError>,
         // note: spans are being refactored out of Value
@@ -166,6 +160,12 @@ pub enum Value {
         #[serde(rename = "span")]
         internal_span: Span,
     },
+    Nothing {
+        // note: spans are being refactored out of Value
+        // please use .span() instead of matching this span value
+        #[serde(rename = "span")]
+        internal_span: Span,
+    },
 }
 
 impl Clone for Value {
@@ -370,6 +370,7 @@ impl Value {
     /// - `Int`
     /// - `Float`
     /// - `String`
+    /// - `Glob`
     /// - `Binary` (only if valid utf-8)
     /// - `Date`
     ///
@@ -382,6 +383,7 @@ impl Value {
     ///             Value::Int { .. }
     ///                 | Value::Float { .. }
     ///                 | Value::String { .. }
+    ///                 | Value::Glob { .. }
     ///                 | Value::Binary { .. }
     ///                 | Value::Date { .. }
     ///         ),
@@ -394,6 +396,7 @@ impl Value {
             Value::Int { val, .. } => Ok(Cow::Owned(val.to_string())),
             Value::Float { val, .. } => Ok(Cow::Owned(val.to_string())),
             Value::String { val, .. } => Ok(Cow::Borrowed(val)),
+            Value::Glob { val, .. } => Ok(Cow::Borrowed(val)),
             Value::Binary { val, .. } => match std::str::from_utf8(val) {
                 Ok(s) => Ok(Cow::Borrowed(s)),
                 Err(_) => self.cant_convert_to("string"),
@@ -420,6 +423,7 @@ impl Value {
     /// - `Int`
     /// - `Float`
     /// - `String`
+    /// - `Glob`
     /// - `Binary` (only if valid utf-8)
     /// - `Date`
     ///
@@ -432,6 +436,7 @@ impl Value {
     ///             Value::Int { .. }
     ///                 | Value::Float { .. }
     ///                 | Value::String { .. }
+    ///                 | Value::Glob { .. }
     ///                 | Value::Binary { .. }
     ///                 | Value::Date { .. }
     ///         ),
@@ -449,6 +454,7 @@ impl Value {
     /// - `Int`
     /// - `Float`
     /// - `String`
+    /// - `Glob`
     /// - `Binary` (only if valid utf-8)
     /// - `Date`
     ///
@@ -461,6 +467,7 @@ impl Value {
     ///             Value::Int { .. }
     ///                 | Value::Float { .. }
     ///                 | Value::String { .. }
+    ///                 | Value::Glob { .. }
     ///                 | Value::Binary { .. }
     ///                 | Value::Date { .. }
     ///         ),
@@ -474,6 +481,7 @@ impl Value {
             Value::Int { val, .. } => Ok(val.to_string()),
             Value::Float { val, .. } => Ok(val.to_string()),
             Value::String { val, .. } => Ok(val),
+            Value::Glob { val, .. } => Ok(val),
             Value::Binary { val, .. } => match String::from_utf8(val) {
                 Ok(s) => Ok(s),
                 Err(err) => Value::binary(err.into_bytes(), span).cant_convert_to("string"),
@@ -2073,183 +2081,183 @@ impl PartialOrd for Value {
                 Value::Bool { val: rhs, .. } => lhs.partial_cmp(rhs),
                 Value::Int { .. } => Some(Ordering::Less),
                 Value::Float { .. } => Some(Ordering::Less),
+                Value::String { .. } => Some(Ordering::Less),
+                Value::Glob { .. } => Some(Ordering::Less),
                 Value::Filesize { .. } => Some(Ordering::Less),
                 Value::Duration { .. } => Some(Ordering::Less),
                 Value::Date { .. } => Some(Ordering::Less),
                 Value::Range { .. } => Some(Ordering::Less),
-                Value::String { .. } => Some(Ordering::Less),
-                Value::Glob { .. } => Some(Ordering::Less),
                 Value::Record { .. } => Some(Ordering::Less),
                 Value::List { .. } => Some(Ordering::Less),
                 Value::Closure { .. } => Some(Ordering::Less),
-                Value::Nothing { .. } => Some(Ordering::Less),
                 Value::Error { .. } => Some(Ordering::Less),
                 Value::Binary { .. } => Some(Ordering::Less),
                 Value::CellPath { .. } => Some(Ordering::Less),
                 Value::Custom { .. } => Some(Ordering::Less),
+                Value::Nothing { .. } => Some(Ordering::Less),
             },
             (Value::Int { val: lhs, .. }, rhs) => match rhs {
                 Value::Bool { .. } => Some(Ordering::Greater),
                 Value::Int { val: rhs, .. } => lhs.partial_cmp(rhs),
                 Value::Float { val: rhs, .. } => compare_floats(*lhs as f64, *rhs),
+                Value::String { .. } => Some(Ordering::Less),
+                Value::Glob { .. } => Some(Ordering::Less),
                 Value::Filesize { .. } => Some(Ordering::Less),
                 Value::Duration { .. } => Some(Ordering::Less),
                 Value::Date { .. } => Some(Ordering::Less),
                 Value::Range { .. } => Some(Ordering::Less),
-                Value::String { .. } => Some(Ordering::Less),
-                Value::Glob { .. } => Some(Ordering::Less),
                 Value::Record { .. } => Some(Ordering::Less),
                 Value::List { .. } => Some(Ordering::Less),
                 Value::Closure { .. } => Some(Ordering::Less),
-                Value::Nothing { .. } => Some(Ordering::Less),
                 Value::Error { .. } => Some(Ordering::Less),
                 Value::Binary { .. } => Some(Ordering::Less),
                 Value::CellPath { .. } => Some(Ordering::Less),
                 Value::Custom { .. } => Some(Ordering::Less),
+                Value::Nothing { .. } => Some(Ordering::Less),
             },
             (Value::Float { val: lhs, .. }, rhs) => match rhs {
                 Value::Bool { .. } => Some(Ordering::Greater),
                 Value::Int { val: rhs, .. } => compare_floats(*lhs, *rhs as f64),
                 Value::Float { val: rhs, .. } => compare_floats(*lhs, *rhs),
+                Value::String { .. } => Some(Ordering::Less),
+                Value::Glob { .. } => Some(Ordering::Less),
                 Value::Filesize { .. } => Some(Ordering::Less),
                 Value::Duration { .. } => Some(Ordering::Less),
                 Value::Date { .. } => Some(Ordering::Less),
                 Value::Range { .. } => Some(Ordering::Less),
-                Value::String { .. } => Some(Ordering::Less),
-                Value::Glob { .. } => Some(Ordering::Less),
                 Value::Record { .. } => Some(Ordering::Less),
                 Value::List { .. } => Some(Ordering::Less),
                 Value::Closure { .. } => Some(Ordering::Less),
-                Value::Nothing { .. } => Some(Ordering::Less),
                 Value::Error { .. } => Some(Ordering::Less),
                 Value::Binary { .. } => Some(Ordering::Less),
                 Value::CellPath { .. } => Some(Ordering::Less),
                 Value::Custom { .. } => Some(Ordering::Less),
-            },
-            (Value::Filesize { val: lhs, .. }, rhs) => match rhs {
-                Value::Bool { .. } => Some(Ordering::Greater),
-                Value::Int { .. } => Some(Ordering::Greater),
-                Value::Float { .. } => Some(Ordering::Greater),
-                Value::Filesize { val: rhs, .. } => lhs.partial_cmp(rhs),
-                Value::Duration { .. } => Some(Ordering::Less),
-                Value::Date { .. } => Some(Ordering::Less),
-                Value::Range { .. } => Some(Ordering::Less),
-                Value::String { .. } => Some(Ordering::Less),
-                Value::Glob { .. } => Some(Ordering::Less),
-                Value::Record { .. } => Some(Ordering::Less),
-                Value::List { .. } => Some(Ordering::Less),
-                Value::Closure { .. } => Some(Ordering::Less),
                 Value::Nothing { .. } => Some(Ordering::Less),
-                Value::Error { .. } => Some(Ordering::Less),
-                Value::Binary { .. } => Some(Ordering::Less),
-                Value::CellPath { .. } => Some(Ordering::Less),
-                Value::Custom { .. } => Some(Ordering::Less),
-            },
-            (Value::Duration { val: lhs, .. }, rhs) => match rhs {
-                Value::Bool { .. } => Some(Ordering::Greater),
-                Value::Int { .. } => Some(Ordering::Greater),
-                Value::Float { .. } => Some(Ordering::Greater),
-                Value::Filesize { .. } => Some(Ordering::Greater),
-                Value::Duration { val: rhs, .. } => lhs.partial_cmp(rhs),
-                Value::Date { .. } => Some(Ordering::Less),
-                Value::Range { .. } => Some(Ordering::Less),
-                Value::String { .. } => Some(Ordering::Less),
-                Value::Glob { .. } => Some(Ordering::Less),
-                Value::Record { .. } => Some(Ordering::Less),
-                Value::List { .. } => Some(Ordering::Less),
-                Value::Closure { .. } => Some(Ordering::Less),
-                Value::Nothing { .. } => Some(Ordering::Less),
-                Value::Error { .. } => Some(Ordering::Less),
-                Value::Binary { .. } => Some(Ordering::Less),
-                Value::CellPath { .. } => Some(Ordering::Less),
-                Value::Custom { .. } => Some(Ordering::Less),
-            },
-            (Value::Date { val: lhs, .. }, rhs) => match rhs {
-                Value::Bool { .. } => Some(Ordering::Greater),
-                Value::Int { .. } => Some(Ordering::Greater),
-                Value::Float { .. } => Some(Ordering::Greater),
-                Value::Filesize { .. } => Some(Ordering::Greater),
-                Value::Duration { .. } => Some(Ordering::Greater),
-                Value::Date { val: rhs, .. } => lhs.partial_cmp(rhs),
-                Value::Range { .. } => Some(Ordering::Less),
-                Value::String { .. } => Some(Ordering::Less),
-                Value::Glob { .. } => Some(Ordering::Less),
-                Value::Record { .. } => Some(Ordering::Less),
-                Value::List { .. } => Some(Ordering::Less),
-                Value::Closure { .. } => Some(Ordering::Less),
-                Value::Nothing { .. } => Some(Ordering::Less),
-                Value::Error { .. } => Some(Ordering::Less),
-                Value::Binary { .. } => Some(Ordering::Less),
-                Value::CellPath { .. } => Some(Ordering::Less),
-                Value::Custom { .. } => Some(Ordering::Less),
-            },
-            (Value::Range { val: lhs, .. }, rhs) => match rhs {
-                Value::Bool { .. } => Some(Ordering::Greater),
-                Value::Int { .. } => Some(Ordering::Greater),
-                Value::Float { .. } => Some(Ordering::Greater),
-                Value::Filesize { .. } => Some(Ordering::Greater),
-                Value::Duration { .. } => Some(Ordering::Greater),
-                Value::Date { .. } => Some(Ordering::Greater),
-                Value::Range { val: rhs, .. } => lhs.partial_cmp(rhs),
-                Value::String { .. } => Some(Ordering::Less),
-                Value::Glob { .. } => Some(Ordering::Less),
-                Value::Record { .. } => Some(Ordering::Less),
-                Value::List { .. } => Some(Ordering::Less),
-                Value::Closure { .. } => Some(Ordering::Less),
-                Value::Nothing { .. } => Some(Ordering::Less),
-                Value::Error { .. } => Some(Ordering::Less),
-                Value::Binary { .. } => Some(Ordering::Less),
-                Value::CellPath { .. } => Some(Ordering::Less),
-                Value::Custom { .. } => Some(Ordering::Less),
             },
             (Value::String { val: lhs, .. }, rhs) => match rhs {
                 Value::Bool { .. } => Some(Ordering::Greater),
                 Value::Int { .. } => Some(Ordering::Greater),
                 Value::Float { .. } => Some(Ordering::Greater),
-                Value::Filesize { .. } => Some(Ordering::Greater),
-                Value::Duration { .. } => Some(Ordering::Greater),
-                Value::Date { .. } => Some(Ordering::Greater),
-                Value::Range { .. } => Some(Ordering::Greater),
                 Value::String { val: rhs, .. } => lhs.partial_cmp(rhs),
                 Value::Glob { val: rhs, .. } => lhs.partial_cmp(rhs),
+                Value::Filesize { .. } => Some(Ordering::Less),
+                Value::Duration { .. } => Some(Ordering::Less),
+                Value::Date { .. } => Some(Ordering::Less),
+                Value::Range { .. } => Some(Ordering::Less),
                 Value::Record { .. } => Some(Ordering::Less),
                 Value::List { .. } => Some(Ordering::Less),
                 Value::Closure { .. } => Some(Ordering::Less),
-                Value::Nothing { .. } => Some(Ordering::Less),
                 Value::Error { .. } => Some(Ordering::Less),
                 Value::Binary { .. } => Some(Ordering::Less),
                 Value::CellPath { .. } => Some(Ordering::Less),
                 Value::Custom { .. } => Some(Ordering::Less),
+                Value::Nothing { .. } => Some(Ordering::Less),
             },
             (Value::Glob { val: lhs, .. }, rhs) => match rhs {
                 Value::Bool { .. } => Some(Ordering::Greater),
                 Value::Int { .. } => Some(Ordering::Greater),
                 Value::Float { .. } => Some(Ordering::Greater),
-                Value::Filesize { .. } => Some(Ordering::Greater),
-                Value::Duration { .. } => Some(Ordering::Greater),
-                Value::Date { .. } => Some(Ordering::Greater),
-                Value::Range { .. } => Some(Ordering::Greater),
                 Value::String { val: rhs, .. } => lhs.partial_cmp(rhs),
                 Value::Glob { val: rhs, .. } => lhs.partial_cmp(rhs),
+                Value::Filesize { .. } => Some(Ordering::Less),
+                Value::Duration { .. } => Some(Ordering::Less),
+                Value::Date { .. } => Some(Ordering::Less),
+                Value::Range { .. } => Some(Ordering::Less),
                 Value::Record { .. } => Some(Ordering::Less),
                 Value::List { .. } => Some(Ordering::Less),
                 Value::Closure { .. } => Some(Ordering::Less),
-                Value::Nothing { .. } => Some(Ordering::Less),
                 Value::Error { .. } => Some(Ordering::Less),
                 Value::Binary { .. } => Some(Ordering::Less),
                 Value::CellPath { .. } => Some(Ordering::Less),
                 Value::Custom { .. } => Some(Ordering::Less),
+                Value::Nothing { .. } => Some(Ordering::Less),
+            },
+            (Value::Filesize { val: lhs, .. }, rhs) => match rhs {
+                Value::Bool { .. } => Some(Ordering::Greater),
+                Value::Int { .. } => Some(Ordering::Greater),
+                Value::Float { .. } => Some(Ordering::Greater),
+                Value::String { .. } => Some(Ordering::Greater),
+                Value::Glob { .. } => Some(Ordering::Greater),
+                Value::Filesize { val: rhs, .. } => lhs.partial_cmp(rhs),
+                Value::Duration { .. } => Some(Ordering::Less),
+                Value::Date { .. } => Some(Ordering::Less),
+                Value::Range { .. } => Some(Ordering::Less),
+                Value::Record { .. } => Some(Ordering::Less),
+                Value::List { .. } => Some(Ordering::Less),
+                Value::Closure { .. } => Some(Ordering::Less),
+                Value::Error { .. } => Some(Ordering::Less),
+                Value::Binary { .. } => Some(Ordering::Less),
+                Value::CellPath { .. } => Some(Ordering::Less),
+                Value::Custom { .. } => Some(Ordering::Less),
+                Value::Nothing { .. } => Some(Ordering::Less),
+            },
+            (Value::Duration { val: lhs, .. }, rhs) => match rhs {
+                Value::Bool { .. } => Some(Ordering::Greater),
+                Value::Int { .. } => Some(Ordering::Greater),
+                Value::Float { .. } => Some(Ordering::Greater),
+                Value::String { .. } => Some(Ordering::Greater),
+                Value::Glob { .. } => Some(Ordering::Greater),
+                Value::Filesize { .. } => Some(Ordering::Greater),
+                Value::Duration { val: rhs, .. } => lhs.partial_cmp(rhs),
+                Value::Date { .. } => Some(Ordering::Less),
+                Value::Range { .. } => Some(Ordering::Less),
+                Value::Record { .. } => Some(Ordering::Less),
+                Value::List { .. } => Some(Ordering::Less),
+                Value::Closure { .. } => Some(Ordering::Less),
+                Value::Error { .. } => Some(Ordering::Less),
+                Value::Binary { .. } => Some(Ordering::Less),
+                Value::CellPath { .. } => Some(Ordering::Less),
+                Value::Custom { .. } => Some(Ordering::Less),
+                Value::Nothing { .. } => Some(Ordering::Less),
+            },
+            (Value::Date { val: lhs, .. }, rhs) => match rhs {
+                Value::Bool { .. } => Some(Ordering::Greater),
+                Value::Int { .. } => Some(Ordering::Greater),
+                Value::Float { .. } => Some(Ordering::Greater),
+                Value::String { .. } => Some(Ordering::Greater),
+                Value::Glob { .. } => Some(Ordering::Greater),
+                Value::Filesize { .. } => Some(Ordering::Greater),
+                Value::Duration { .. } => Some(Ordering::Greater),
+                Value::Date { val: rhs, .. } => lhs.partial_cmp(rhs),
+                Value::Range { .. } => Some(Ordering::Less),
+                Value::Record { .. } => Some(Ordering::Less),
+                Value::List { .. } => Some(Ordering::Less),
+                Value::Closure { .. } => Some(Ordering::Less),
+                Value::Error { .. } => Some(Ordering::Less),
+                Value::Binary { .. } => Some(Ordering::Less),
+                Value::CellPath { .. } => Some(Ordering::Less),
+                Value::Custom { .. } => Some(Ordering::Less),
+                Value::Nothing { .. } => Some(Ordering::Less),
+            },
+            (Value::Range { val: lhs, .. }, rhs) => match rhs {
+                Value::Bool { .. } => Some(Ordering::Greater),
+                Value::Int { .. } => Some(Ordering::Greater),
+                Value::Float { .. } => Some(Ordering::Greater),
+                Value::String { .. } => Some(Ordering::Greater),
+                Value::Glob { .. } => Some(Ordering::Greater),
+                Value::Filesize { .. } => Some(Ordering::Greater),
+                Value::Duration { .. } => Some(Ordering::Greater),
+                Value::Date { .. } => Some(Ordering::Greater),
+                Value::Range { val: rhs, .. } => lhs.partial_cmp(rhs),
+                Value::Record { .. } => Some(Ordering::Less),
+                Value::List { .. } => Some(Ordering::Less),
+                Value::Closure { .. } => Some(Ordering::Less),
+                Value::Error { .. } => Some(Ordering::Less),
+                Value::Binary { .. } => Some(Ordering::Less),
+                Value::CellPath { .. } => Some(Ordering::Less),
+                Value::Custom { .. } => Some(Ordering::Less),
+                Value::Nothing { .. } => Some(Ordering::Less),
             },
             (Value::Record { val: lhs, .. }, rhs) => match rhs {
                 Value::Bool { .. } => Some(Ordering::Greater),
                 Value::Int { .. } => Some(Ordering::Greater),
                 Value::Float { .. } => Some(Ordering::Greater),
+                Value::String { .. } => Some(Ordering::Greater),
+                Value::Glob { .. } => Some(Ordering::Greater),
                 Value::Filesize { .. } => Some(Ordering::Greater),
                 Value::Duration { .. } => Some(Ordering::Greater),
                 Value::Date { .. } => Some(Ordering::Greater),
                 Value::Range { .. } => Some(Ordering::Greater),
-                Value::String { .. } => Some(Ordering::Greater),
-                Value::Glob { .. } => Some(Ordering::Greater),
                 Value::Record { val: rhs, .. } => {
                     // reorder cols and vals to make more logically compare.
                     // more general, if two record have same col and values,
@@ -2279,127 +2287,127 @@ impl PartialOrd for Value {
                 }
                 Value::List { .. } => Some(Ordering::Less),
                 Value::Closure { .. } => Some(Ordering::Less),
-                Value::Nothing { .. } => Some(Ordering::Less),
                 Value::Error { .. } => Some(Ordering::Less),
                 Value::Binary { .. } => Some(Ordering::Less),
                 Value::CellPath { .. } => Some(Ordering::Less),
                 Value::Custom { .. } => Some(Ordering::Less),
+                Value::Nothing { .. } => Some(Ordering::Less),
             },
             (Value::List { vals: lhs, .. }, rhs) => match rhs {
                 Value::Bool { .. } => Some(Ordering::Greater),
                 Value::Int { .. } => Some(Ordering::Greater),
                 Value::Float { .. } => Some(Ordering::Greater),
+                Value::String { .. } => Some(Ordering::Greater),
+                Value::Glob { .. } => Some(Ordering::Greater),
                 Value::Filesize { .. } => Some(Ordering::Greater),
                 Value::Duration { .. } => Some(Ordering::Greater),
                 Value::Date { .. } => Some(Ordering::Greater),
                 Value::Range { .. } => Some(Ordering::Greater),
-                Value::String { .. } => Some(Ordering::Greater),
-                Value::Glob { .. } => Some(Ordering::Greater),
                 Value::Record { .. } => Some(Ordering::Greater),
                 Value::List { vals: rhs, .. } => lhs.partial_cmp(rhs),
                 Value::Closure { .. } => Some(Ordering::Less),
-                Value::Nothing { .. } => Some(Ordering::Less),
                 Value::Error { .. } => Some(Ordering::Less),
                 Value::Binary { .. } => Some(Ordering::Less),
                 Value::CellPath { .. } => Some(Ordering::Less),
                 Value::Custom { .. } => Some(Ordering::Less),
+                Value::Nothing { .. } => Some(Ordering::Less),
             },
             (Value::Closure { val: lhs, .. }, rhs) => match rhs {
                 Value::Bool { .. } => Some(Ordering::Greater),
                 Value::Int { .. } => Some(Ordering::Greater),
                 Value::Float { .. } => Some(Ordering::Greater),
+                Value::String { .. } => Some(Ordering::Greater),
+                Value::Glob { .. } => Some(Ordering::Greater),
                 Value::Filesize { .. } => Some(Ordering::Greater),
                 Value::Duration { .. } => Some(Ordering::Greater),
                 Value::Date { .. } => Some(Ordering::Greater),
                 Value::Range { .. } => Some(Ordering::Greater),
-                Value::String { .. } => Some(Ordering::Greater),
-                Value::Glob { .. } => Some(Ordering::Greater),
                 Value::Record { .. } => Some(Ordering::Greater),
                 Value::List { .. } => Some(Ordering::Greater),
                 Value::Closure { val: rhs, .. } => lhs.block_id.partial_cmp(&rhs.block_id),
+                Value::Error { .. } => Some(Ordering::Less),
+                Value::Binary { .. } => Some(Ordering::Less),
+                Value::CellPath { .. } => Some(Ordering::Less),
+                Value::Custom { .. } => Some(Ordering::Less),
                 Value::Nothing { .. } => Some(Ordering::Less),
-                Value::Error { .. } => Some(Ordering::Less),
-                Value::Binary { .. } => Some(Ordering::Less),
-                Value::CellPath { .. } => Some(Ordering::Less),
-                Value::Custom { .. } => Some(Ordering::Less),
-            },
-            (Value::Nothing { .. }, rhs) => match rhs {
-                Value::Bool { .. } => Some(Ordering::Greater),
-                Value::Int { .. } => Some(Ordering::Greater),
-                Value::Float { .. } => Some(Ordering::Greater),
-                Value::Filesize { .. } => Some(Ordering::Greater),
-                Value::Duration { .. } => Some(Ordering::Greater),
-                Value::Date { .. } => Some(Ordering::Greater),
-                Value::Range { .. } => Some(Ordering::Greater),
-                Value::String { .. } => Some(Ordering::Greater),
-                Value::Glob { .. } => Some(Ordering::Greater),
-                Value::Record { .. } => Some(Ordering::Greater),
-                Value::List { .. } => Some(Ordering::Greater),
-                Value::Closure { .. } => Some(Ordering::Greater),
-                Value::Nothing { .. } => Some(Ordering::Equal),
-                Value::Error { .. } => Some(Ordering::Less),
-                Value::Binary { .. } => Some(Ordering::Less),
-                Value::CellPath { .. } => Some(Ordering::Less),
-                Value::Custom { .. } => Some(Ordering::Less),
             },
             (Value::Error { .. }, rhs) => match rhs {
                 Value::Bool { .. } => Some(Ordering::Greater),
                 Value::Int { .. } => Some(Ordering::Greater),
                 Value::Float { .. } => Some(Ordering::Greater),
+                Value::String { .. } => Some(Ordering::Greater),
+                Value::Glob { .. } => Some(Ordering::Greater),
                 Value::Filesize { .. } => Some(Ordering::Greater),
                 Value::Duration { .. } => Some(Ordering::Greater),
                 Value::Date { .. } => Some(Ordering::Greater),
                 Value::Range { .. } => Some(Ordering::Greater),
-                Value::String { .. } => Some(Ordering::Greater),
-                Value::Glob { .. } => Some(Ordering::Greater),
                 Value::Record { .. } => Some(Ordering::Greater),
                 Value::List { .. } => Some(Ordering::Greater),
                 Value::Closure { .. } => Some(Ordering::Greater),
-                Value::Nothing { .. } => Some(Ordering::Greater),
                 Value::Error { .. } => Some(Ordering::Equal),
                 Value::Binary { .. } => Some(Ordering::Less),
                 Value::CellPath { .. } => Some(Ordering::Less),
                 Value::Custom { .. } => Some(Ordering::Less),
+                Value::Nothing { .. } => Some(Ordering::Less),
             },
             (Value::Binary { val: lhs, .. }, rhs) => match rhs {
                 Value::Bool { .. } => Some(Ordering::Greater),
                 Value::Int { .. } => Some(Ordering::Greater),
                 Value::Float { .. } => Some(Ordering::Greater),
+                Value::String { .. } => Some(Ordering::Greater),
+                Value::Glob { .. } => Some(Ordering::Greater),
                 Value::Filesize { .. } => Some(Ordering::Greater),
                 Value::Duration { .. } => Some(Ordering::Greater),
                 Value::Date { .. } => Some(Ordering::Greater),
                 Value::Range { .. } => Some(Ordering::Greater),
-                Value::String { .. } => Some(Ordering::Greater),
-                Value::Glob { .. } => Some(Ordering::Greater),
                 Value::Record { .. } => Some(Ordering::Greater),
                 Value::List { .. } => Some(Ordering::Greater),
                 Value::Closure { .. } => Some(Ordering::Greater),
-                Value::Nothing { .. } => Some(Ordering::Greater),
                 Value::Error { .. } => Some(Ordering::Greater),
                 Value::Binary { val: rhs, .. } => lhs.partial_cmp(rhs),
                 Value::CellPath { .. } => Some(Ordering::Less),
                 Value::Custom { .. } => Some(Ordering::Less),
+                Value::Nothing { .. } => Some(Ordering::Less),
             },
             (Value::CellPath { val: lhs, .. }, rhs) => match rhs {
                 Value::Bool { .. } => Some(Ordering::Greater),
                 Value::Int { .. } => Some(Ordering::Greater),
                 Value::Float { .. } => Some(Ordering::Greater),
+                Value::String { .. } => Some(Ordering::Greater),
+                Value::Glob { .. } => Some(Ordering::Greater),
                 Value::Filesize { .. } => Some(Ordering::Greater),
                 Value::Duration { .. } => Some(Ordering::Greater),
                 Value::Date { .. } => Some(Ordering::Greater),
                 Value::Range { .. } => Some(Ordering::Greater),
-                Value::String { .. } => Some(Ordering::Greater),
-                Value::Glob { .. } => Some(Ordering::Greater),
                 Value::Record { .. } => Some(Ordering::Greater),
                 Value::List { .. } => Some(Ordering::Greater),
                 Value::Closure { .. } => Some(Ordering::Greater),
-                Value::Nothing { .. } => Some(Ordering::Greater),
                 Value::Error { .. } => Some(Ordering::Greater),
                 Value::Binary { .. } => Some(Ordering::Greater),
                 Value::CellPath { val: rhs, .. } => lhs.partial_cmp(rhs),
                 Value::Custom { .. } => Some(Ordering::Less),
+                Value::Nothing { .. } => Some(Ordering::Less),
             },
             (Value::Custom { val: lhs, .. }, rhs) => lhs.partial_cmp(rhs),
+            (Value::Nothing { .. }, rhs) => match rhs {
+                Value::Bool { .. } => Some(Ordering::Greater),
+                Value::Int { .. } => Some(Ordering::Greater),
+                Value::Float { .. } => Some(Ordering::Greater),
+                Value::String { .. } => Some(Ordering::Greater),
+                Value::Glob { .. } => Some(Ordering::Greater),
+                Value::Filesize { .. } => Some(Ordering::Greater),
+                Value::Duration { .. } => Some(Ordering::Greater),
+                Value::Date { .. } => Some(Ordering::Greater),
+                Value::Range { .. } => Some(Ordering::Greater),
+                Value::Record { .. } => Some(Ordering::Greater),
+                Value::List { .. } => Some(Ordering::Greater),
+                Value::Closure { .. } => Some(Ordering::Greater),
+                Value::Error { .. } => Some(Ordering::Greater),
+                Value::Binary { .. } => Some(Ordering::Greater),
+                Value::CellPath { .. } => Some(Ordering::Greater),
+                Value::Custom { .. } => Some(Ordering::Greater),
+                Value::Nothing { .. } => Some(Ordering::Equal),
+            },
         }
     }
 }

From 52f646d8db9266a0d5aaeba5877576f9b3bbf746 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 10 Oct 2024 06:38:26 -0500
Subject: [PATCH 0530/1072] fix format date by getting the env vars properly
 (#14037)

# Description

This PR is from a [discussion in
Discord](https://discord.com/channels/601130461678272522/988303282931912704/1292900183742611466).
The gist is that `format date` didn't respect the $env.LC_TIME env var.
The reason for this is because it was using std::env::var which doesn't
understand nushell's env. Now, this should work.

![image](https://github.com/user-attachments/assets/e4d494b1-9f2b-4993-9729-244e0c47ef0c)


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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/strings/format/date.rs | 78 ++++++++++++++------
 1 file changed, 55 insertions(+), 23 deletions(-)

diff --git a/crates/nu-command/src/strings/format/date.rs b/crates/nu-command/src/strings/format/date.rs
index fd398753d7..658823aa6a 100644
--- a/crates/nu-command/src/strings/format/date.rs
+++ b/crates/nu-command/src/strings/format/date.rs
@@ -88,7 +88,25 @@ impl Command for FormatDate {
     ) -> Result<PipelineData, ShellError> {
         let list = call.has_flag(engine_state, stack, "list")?;
         let format = call.opt::<Spanned<String>>(engine_state, stack, 0)?;
-        run(engine_state, call, input, list, format)
+
+        // get the locale first so we can use the proper get_env_var functions since this is a const command
+        // we can override the locale by setting $env.NU_TEST_LOCALE_OVERRIDE or $env.LC_TIME
+        let locale = if let Some(loc) = engine_state
+            .get_env_var(LOCALE_OVERRIDE_ENV_VAR)
+            .or_else(|| engine_state.get_env_var("LC_TIME"))
+        {
+            let locale_str = loc.as_str()?.split('.').next().unwrap_or("en_US");
+            locale_str.try_into().unwrap_or(Locale::en_US)
+        } else {
+            get_system_locale_string()
+                .map(|l| l.replace('-', "_"))
+                .unwrap_or_else(|| String::from("en_US"))
+                .as_str()
+                .try_into()
+                .unwrap_or(Locale::en_US)
+        };
+
+        run(engine_state, call, input, list, format, locale)
     }
 
     fn run_const(
@@ -99,7 +117,25 @@ impl Command for FormatDate {
     ) -> Result<PipelineData, ShellError> {
         let list = call.has_flag_const(working_set, "list")?;
         let format = call.opt_const::<Spanned<String>>(working_set, 0)?;
-        run(working_set.permanent(), call, input, list, format)
+
+        // get the locale first so we can use the proper get_env_var functions since this is a const command
+        // we can override the locale by setting $env.NU_TEST_LOCALE_OVERRIDE or $env.LC_TIME
+        let locale = if let Some(loc) = working_set
+            .get_env_var(LOCALE_OVERRIDE_ENV_VAR)
+            .or_else(|| working_set.get_env_var("LC_TIME"))
+        {
+            let locale_str = loc.as_str()?.split('.').next().unwrap_or("en_US");
+            locale_str.try_into().unwrap_or(Locale::en_US)
+        } else {
+            get_system_locale_string()
+                .map(|l| l.replace('-', "_"))
+                .unwrap_or_else(|| String::from("en_US"))
+                .as_str()
+                .try_into()
+                .unwrap_or(Locale::en_US)
+        };
+
+        run(working_set.permanent(), call, input, list, format, locale)
     }
 }
 
@@ -109,6 +145,7 @@ fn run(
     input: PipelineData,
     list: bool,
     format: Option<Spanned<String>>,
+    locale: Locale,
 ) -> Result<PipelineData, ShellError> {
     let head = call.head;
     if list {
@@ -124,34 +161,23 @@ fn run(
     }
     input.map(
         move |value| match &format {
-            Some(format) => format_helper(value, format.item.as_str(), format.span, head),
+            Some(format) => format_helper(value, format.item.as_str(), format.span, head, locale),
             None => format_helper_rfc2822(value, head),
         },
         engine_state.signals(),
     )
 }
 
-fn format_from<Tz: TimeZone>(date_time: DateTime<Tz>, formatter: &str, span: Span) -> Value
+fn format_from<Tz: TimeZone>(
+    date_time: DateTime<Tz>,
+    formatter: &str,
+    span: Span,
+    locale: Locale,
+) -> Value
 where
     Tz::Offset: Display,
 {
     let mut formatter_buf = String::new();
-    // Format using locale LC_TIME
-    let locale = if let Ok(l) =
-        std::env::var(LOCALE_OVERRIDE_ENV_VAR).or_else(|_| std::env::var("LC_TIME"))
-    {
-        let locale_str = l.split('.').next().unwrap_or("en_US");
-        locale_str.try_into().unwrap_or(Locale::en_US)
-    } else {
-        // LC_ALL > LC_CTYPE > LANG
-        // Not locale present, default to en_US
-        get_system_locale_string()
-            .map(|l| l.replace('-', "_")) // `chrono::Locale` needs something like `xx_xx`, rather than `xx-xx`
-            .unwrap_or_else(|| String::from("en_US"))
-            .as_str()
-            .try_into()
-            .unwrap_or(Locale::en_US)
-    };
     let format = date_time.format_localized(formatter, locale);
 
     match formatter_buf.write_fmt(format_args!("{format}")) {
@@ -166,14 +192,20 @@ where
     }
 }
 
-fn format_helper(value: Value, formatter: &str, formatter_span: Span, head_span: Span) -> Value {
+fn format_helper(
+    value: Value,
+    formatter: &str,
+    formatter_span: Span,
+    head_span: Span,
+    locale: Locale,
+) -> Value {
     match value {
-        Value::Date { val, .. } => format_from(val, formatter, formatter_span),
+        Value::Date { val, .. } => format_from(val, formatter, formatter_span, locale),
         Value::String { val, .. } => {
             let dt = parse_date_from_string(&val, formatter_span);
 
             match dt {
-                Ok(x) => format_from(x, formatter, formatter_span),
+                Ok(x) => format_from(x, formatter, formatter_span, locale),
                 Err(e) => e,
             }
         }

From 2a3805c164a15e37d3ff4f11a9acfdcbde9a3b03 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Thu, 10 Oct 2024 07:56:37 -0400
Subject: [PATCH 0531/1072] Virtual std module subdirectories (#14040)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

Uses "normal" module `std/<submodule>/mod.nu` instead of renaming the
files (as requested in #13842).

# User-Facing Changes

No user-facing changes other than in `view files` results. Imports
remain the same after this PR.

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

Also manually confirmed that it does not interfere with nupm, since we
did have a conflict at one point (and it's not possible to test here).

# Performance Tests

## Linux

### Nushell Startup - No config

```nu
bench --pretty -n 200  { <path_to>/nu -c "exit" }
```

| Release | Startup Time |
| --- | --- |
| 0.98.0 | 22ms 730µs 768ns +/- 1ms 515µs 942ns
| This commit | 9ms 312µs 68ns +/- 709µs 378ns
| Yesterday's nightly | 9ms 230µs 953ns +/- 9ms 67µs 689ns

### Nushell Startup - Load full standard library

Measures relative impact of a full `use std *`, which isn't recommended,
but worth tracking.

```nu
bench --pretty -n 200  { <path_to>/nu -c "use std *; exit" }
```

| Release | Startup Time |
| --- | --- |
| 0.98.0 | 23ms 10µs 636ns +/- 1ms 277µs 854ns
| This commit | 26ms 922µs 769ns +/- 562µs 538ns
| Yesterday's nightly | 28ms 133µs 95ns +/- 761µs 943ns
| `deprecated_dirs` removal PR * | 23ms 610µs 333ns +/- 369µs 436ns

\* Current increase is partially due to double-loading `dirs` with
removal warning in older version.

# After Submitting

Still TODO - Update standard library doc
---
 crates/nu-std/src/lib.rs                      | 114 +++++++++++-------
 .../nu-std/std/{assert.nu => assert/mod.nu}   |   0
 crates/nu-std/std/{bench.nu => bench/mod.nu}  |   0
 crates/nu-std/std/{core.nu => core/mod.nu}    |   2 +-
 .../mod.nu}                                   |   0
 crates/nu-std/std/{dirs.nu => dirs/mod.nu}    |   0
 crates/nu-std/std/{dt.nu => dt/mod.nu}        |   0
 .../nu-std/std/{formats.nu => formats/mod.nu} |   0
 crates/nu-std/std/{help.nu => help/mod.nu}    |   0
 crates/nu-std/std/{input.nu => input/mod.nu}  |   0
 crates/nu-std/std/{iter.nu => iter/mod.nu}    |   0
 crates/nu-std/std/{log.nu => log/mod.nu}      |   0
 crates/nu-std/std/{math.nu => math/mod.nu}    |   0
 crates/nu-std/std/{util.nu => util/mod.nu}    |   0
 crates/nu-std/std/{xml.nu => xml/mod.nu}      |   0
 15 files changed, 72 insertions(+), 44 deletions(-)
 rename crates/nu-std/std/{assert.nu => assert/mod.nu} (100%)
 rename crates/nu-std/std/{bench.nu => bench/mod.nu} (100%)
 rename crates/nu-std/std/{core.nu => core/mod.nu} (96%)
 rename crates/nu-std/std/{deprecated_dirs.nu => deprecated_dirs/mod.nu} (100%)
 rename crates/nu-std/std/{dirs.nu => dirs/mod.nu} (100%)
 rename crates/nu-std/std/{dt.nu => dt/mod.nu} (100%)
 rename crates/nu-std/std/{formats.nu => formats/mod.nu} (100%)
 rename crates/nu-std/std/{help.nu => help/mod.nu} (100%)
 rename crates/nu-std/std/{input.nu => input/mod.nu} (100%)
 rename crates/nu-std/std/{iter.nu => iter/mod.nu} (100%)
 rename crates/nu-std/std/{log.nu => log/mod.nu} (100%)
 rename crates/nu-std/std/{math.nu => math/mod.nu} (100%)
 rename crates/nu-std/std/{util.nu => util/mod.nu} (100%)
 rename crates/nu-std/std/{xml.nu => xml/mod.nu} (100%)

diff --git a/crates/nu-std/src/lib.rs b/crates/nu-std/src/lib.rs
index 2857290f41..09585b8697 100644
--- a/crates/nu-std/src/lib.rs
+++ b/crates/nu-std/src/lib.rs
@@ -5,55 +5,85 @@ use nu_parser::parse;
 use nu_protocol::{
     debugger::WithoutDebug,
     engine::{FileStack, Stack, StateWorkingSet, VirtualPath},
-    report_parse_error, PipelineData,
+    report_parse_error, PipelineData, VirtualPathId,
 };
 use std::path::PathBuf;
 
+fn create_virt_file(working_set: &mut StateWorkingSet, name: &str, content: &str) -> VirtualPathId {
+    let sanitized_name = PathBuf::from(name).to_string_lossy().to_string();
+    let file_id = working_set.add_file(sanitized_name.clone(), content.as_bytes());
+
+    working_set.add_virtual_path(sanitized_name, VirtualPath::File(file_id))
+}
+
 pub fn load_standard_library(
     engine_state: &mut nu_protocol::engine::EngineState,
 ) -> Result<(), miette::ErrReport> {
     trace!("load_standard_library");
+
+    let mut working_set = StateWorkingSet::new(engine_state);
+    // Contents of the std virtual directory
+    let mut std_virt_paths = vec![];
+
+    // std/mod.nu
+    let std_mod_virt_file_id = create_virt_file(
+        &mut working_set,
+        "std/mod.nu",
+        include_str!("../std/mod.nu"),
+    );
+    std_virt_paths.push(std_mod_virt_file_id);
+
+    // Submodules/subdirectories ... std/<module>/mod.nu
+    let mut std_submodules = vec![
+        // Loaded at startup - Not technically part of std
+        ("mod.nu", "std/core", include_str!("../std/core/mod.nu")),
+        // std submodules
+        ("mod.nu", "std/assert", include_str!("../std/assert/mod.nu")),
+        ("mod.nu", "std/bench", include_str!("../std/bench/mod.nu")),
+        ("mod.nu", "std/dirs", include_str!("../std/dirs/mod.nu")),
+        ("mod.nu", "std/dt", include_str!("../std/dt/mod.nu")),
+        (
+            "mod.nu",
+            "std/formats",
+            include_str!("../std/formats/mod.nu"),
+        ),
+        ("mod.nu", "std/help", include_str!("../std/help/mod.nu")),
+        ("mod.nu", "std/input", include_str!("../std/input/mod.nu")),
+        ("mod.nu", "std/iter", include_str!("../std/iter/mod.nu")),
+        ("mod.nu", "std/log", include_str!("../std/log/mod.nu")),
+        ("mod.nu", "std/math", include_str!("../std/math/mod.nu")),
+        ("mod.nu", "std/util", include_str!("../std/util/mod.nu")),
+        ("mod.nu", "std/xml", include_str!("../std/xml/mod.nu")),
+        // Remove in following release
+        (
+            "mod.nu",
+            "std/deprecated_dirs",
+            include_str!("../std/deprecated_dirs/mod.nu"),
+        ),
+    ];
+
+    for (filename, std_subdir_name, content) in std_submodules.drain(..) {
+        let mod_dir = PathBuf::from(std_subdir_name);
+        let name = mod_dir.join(filename);
+        let virt_file_id = create_virt_file(&mut working_set, &name.to_string_lossy(), content);
+
+        // Place file in virtual subdir
+        let mod_dir_filelist = vec![virt_file_id];
+
+        let virt_dir_id = working_set.add_virtual_path(
+            mod_dir.to_string_lossy().to_string(),
+            VirtualPath::Dir(mod_dir_filelist),
+        );
+        // Add the subdir to the list of paths in std
+        std_virt_paths.push(virt_dir_id);
+    }
+
+    // Create std virtual dir with all subdirs and files
+    let std_dir = PathBuf::from("std").to_string_lossy().to_string();
+    let _ = working_set.add_virtual_path(std_dir, VirtualPath::Dir(std_virt_paths));
+
+    // Load prelude
     let (block, delta) = {
-        let std_dir = PathBuf::from("std");
-
-        let mut std_files = vec![
-            // Loaded at startup
-            ("core", include_str!("../std/core.nu")),
-            // std module - Loads all commands and submodules
-            ("mod.nu", include_str!("../std/mod.nu")),
-            // std submodules
-            ("assert", include_str!("../std/assert.nu")),
-            ("bench", include_str!("../std/bench.nu")),
-            ("dirs", include_str!("../std/dirs.nu")),
-            ("dt", include_str!("../std/dt.nu")),
-            ("formats", include_str!("../std/formats.nu")),
-            ("help", include_str!("../std/help.nu")),
-            ("input", include_str!("../std/input.nu")),
-            ("iter", include_str!("../std/iter.nu")),
-            ("log", include_str!("../std/log.nu")),
-            ("math", include_str!("../std/math.nu")),
-            ("util", include_str!("../std/util.nu")),
-            ("xml", include_str!("../std/xml.nu")),
-            // Remove in following release
-            ("deprecated_dirs", include_str!("../std/deprecated_dirs.nu")),
-        ];
-
-        let mut working_set = StateWorkingSet::new(engine_state);
-        let mut std_virt_paths = vec![];
-
-        for (name, content) in std_files.drain(..) {
-            let name = std_dir.join(name);
-
-            let file_id =
-                working_set.add_file(name.to_string_lossy().to_string(), content.as_bytes());
-            let virtual_file_id = working_set.add_virtual_path(
-                name.to_string_lossy().to_string(),
-                VirtualPath::File(file_id),
-            );
-            std_virt_paths.push(virtual_file_id);
-        }
-
-        let std_dir = std_dir.to_string_lossy().to_string();
         let source = r#"
 # Prelude
 use std/core *
@@ -67,8 +97,6 @@ use std/deprecated_dirs [
 ]
 "#;
 
-        let _ = working_set.add_virtual_path(std_dir, VirtualPath::Dir(std_virt_paths));
-
         // Add a placeholder file to the stack of files being evaluated.
         // The name of this file doesn't matter; it's only there to set the current working directory to NU_STDLIB_VIRTUAL_DIR.
         let placeholder = PathBuf::from("load std/core");
diff --git a/crates/nu-std/std/assert.nu b/crates/nu-std/std/assert/mod.nu
similarity index 100%
rename from crates/nu-std/std/assert.nu
rename to crates/nu-std/std/assert/mod.nu
diff --git a/crates/nu-std/std/bench.nu b/crates/nu-std/std/bench/mod.nu
similarity index 100%
rename from crates/nu-std/std/bench.nu
rename to crates/nu-std/std/bench/mod.nu
diff --git a/crates/nu-std/std/core.nu b/crates/nu-std/std/core/mod.nu
similarity index 96%
rename from crates/nu-std/std/core.nu
rename to crates/nu-std/std/core/mod.nu
index 1a777bcd0f..3e28937dad 100644
--- a/crates/nu-std/std/core.nu
+++ b/crates/nu-std/std/core/mod.nu
@@ -1,4 +1,4 @@
-use dt [datetime-diff, pretty-print-duration]
+use std/dt [datetime-diff, pretty-print-duration]
 
 # Print a banner for nushell with information about the project
 export def banner [] {
diff --git a/crates/nu-std/std/deprecated_dirs.nu b/crates/nu-std/std/deprecated_dirs/mod.nu
similarity index 100%
rename from crates/nu-std/std/deprecated_dirs.nu
rename to crates/nu-std/std/deprecated_dirs/mod.nu
diff --git a/crates/nu-std/std/dirs.nu b/crates/nu-std/std/dirs/mod.nu
similarity index 100%
rename from crates/nu-std/std/dirs.nu
rename to crates/nu-std/std/dirs/mod.nu
diff --git a/crates/nu-std/std/dt.nu b/crates/nu-std/std/dt/mod.nu
similarity index 100%
rename from crates/nu-std/std/dt.nu
rename to crates/nu-std/std/dt/mod.nu
diff --git a/crates/nu-std/std/formats.nu b/crates/nu-std/std/formats/mod.nu
similarity index 100%
rename from crates/nu-std/std/formats.nu
rename to crates/nu-std/std/formats/mod.nu
diff --git a/crates/nu-std/std/help.nu b/crates/nu-std/std/help/mod.nu
similarity index 100%
rename from crates/nu-std/std/help.nu
rename to crates/nu-std/std/help/mod.nu
diff --git a/crates/nu-std/std/input.nu b/crates/nu-std/std/input/mod.nu
similarity index 100%
rename from crates/nu-std/std/input.nu
rename to crates/nu-std/std/input/mod.nu
diff --git a/crates/nu-std/std/iter.nu b/crates/nu-std/std/iter/mod.nu
similarity index 100%
rename from crates/nu-std/std/iter.nu
rename to crates/nu-std/std/iter/mod.nu
diff --git a/crates/nu-std/std/log.nu b/crates/nu-std/std/log/mod.nu
similarity index 100%
rename from crates/nu-std/std/log.nu
rename to crates/nu-std/std/log/mod.nu
diff --git a/crates/nu-std/std/math.nu b/crates/nu-std/std/math/mod.nu
similarity index 100%
rename from crates/nu-std/std/math.nu
rename to crates/nu-std/std/math/mod.nu
diff --git a/crates/nu-std/std/util.nu b/crates/nu-std/std/util/mod.nu
similarity index 100%
rename from crates/nu-std/std/util.nu
rename to crates/nu-std/std/util/mod.nu
diff --git a/crates/nu-std/std/xml.nu b/crates/nu-std/std/xml/mod.nu
similarity index 100%
rename from crates/nu-std/std/xml.nu
rename to crates/nu-std/std/xml/mod.nu

From 5002d87af471685b5bde1b866d3e4a74b87c2f88 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Thu, 10 Oct 2024 20:54:00 +0800
Subject: [PATCH 0532/1072] fix $env.FILE_PWD and $env.CURRENT_FILE inside
 `use` (#13958)

# Description
Fixes: #13425

Similar to `source-env`, `use` command should also remove `FILE_PWD` and
`CURRENT_FILE` after evaluating code block in the module file.

And user input can be a directory, in this case, we need to use the
return value of `find_in_dirs_env` carefully, so in case, I renamed
`maybe_file_path` to `maybe_file_path_or_dir` to emphasize it.

# User-Facing Changes
`$env.FILE_PWD` and `$env.CURRENT_FILE` will be more reliable to use.

# Tests + Formatting
Added 2 test cases.

# After Submitting
NaN
---
 crates/nu-cmd-lang/src/core_commands/use_.rs | 30 +++++++++----
 crates/nu-command/tests/commands/use_.rs     | 44 ++++++++++++++++++++
 2 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/crates/nu-cmd-lang/src/core_commands/use_.rs b/crates/nu-cmd-lang/src/core_commands/use_.rs
index 8035cc81fe..d822e0c955 100644
--- a/crates/nu-cmd-lang/src/core_commands/use_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/use_.rs
@@ -98,15 +98,21 @@ This command is a parser keyword. For details, check:
                     engine_state.get_span_contents(import_pattern.head.span),
                 );
 
-                let maybe_file_path = find_in_dirs_env(
+                let maybe_file_path_or_dir = find_in_dirs_env(
                     &module_arg_str,
                     engine_state,
                     caller_stack,
                     get_dirs_var_from_call(caller_stack, call),
                 )?;
-                let maybe_parent = maybe_file_path
-                    .as_ref()
-                    .and_then(|path| path.parent().map(|p| p.to_path_buf()));
+                // module_arg_str maybe a directory, in this case
+                // find_in_dirs_env returns a directory.
+                let maybe_parent = maybe_file_path_or_dir.as_ref().and_then(|path| {
+                    if path.is_dir() {
+                        Some(path.to_path_buf())
+                    } else {
+                        path.parent().map(|p| p.to_path_buf())
+                    }
+                });
 
                 let mut callee_stack = caller_stack
                     .gather_captures(engine_state, &block.captures)
@@ -118,9 +124,15 @@ This command is a parser keyword. For details, check:
                     callee_stack.add_env_var("FILE_PWD".to_string(), file_pwd);
                 }
 
-                if let Some(file_path) = maybe_file_path {
-                    let file_path = Value::string(file_path.to_string_lossy(), call.head);
-                    callee_stack.add_env_var("CURRENT_FILE".to_string(), file_path);
+                if let Some(path) = maybe_file_path_or_dir {
+                    let module_file_path = if path.is_dir() {
+                        // the existence of `mod.nu` is verified in parsing time
+                        // so it's safe to use it here.
+                        Value::string(path.join("mod.nu").to_string_lossy(), call.head)
+                    } else {
+                        Value::string(path.to_string_lossy(), call.head)
+                    };
+                    callee_stack.add_env_var("CURRENT_FILE".to_string(), module_file_path);
                 }
 
                 let eval_block = get_eval_block(engine_state);
@@ -130,6 +142,10 @@ This command is a parser keyword. For details, check:
 
                 // Merge the block's environment to the current stack
                 redirect_env(engine_state, caller_stack, &callee_stack);
+
+                // File-reative PWD is useless after eval file block.
+                caller_stack.remove_env_var(engine_state, "FILE_PWD");
+                caller_stack.remove_env_var(engine_state, "CURRENT_FILE");
             }
         } else {
             return Err(ShellError::GenericError {
diff --git a/crates/nu-command/tests/commands/use_.rs b/crates/nu-command/tests/commands/use_.rs
index 2895e1635f..2822be83c7 100644
--- a/crates/nu-command/tests/commands/use_.rs
+++ b/crates/nu-command/tests/commands/use_.rs
@@ -308,3 +308,47 @@ fn can_use_sub_subname_from_submodule() {
     let actual = nu!(inp);
     assert_eq!(actual.out, "bar")
 }
+
+#[test]
+fn test_use_with_printing_file_pwd() {
+    Playground::setup("use_with_printing_file_pwd", |dirs, nu| {
+        let file = dirs.test().join("mod.nu");
+        nu.with_files(&[FileWithContent(
+            file.as_os_str().to_str().unwrap(),
+            r#"
+                export-env {
+                    print $env.FILE_PWD
+                }
+            "#,
+        )]);
+
+        let actual = nu!(
+            cwd: dirs.test(),
+            "use ."
+        );
+
+        assert_eq!(actual.out, dirs.test().to_string_lossy());
+    });
+}
+
+#[test]
+fn test_use_with_printing_current_file() {
+    Playground::setup("use_with_printing_current_file", |dirs, nu| {
+        let file = dirs.test().join("mod.nu");
+        nu.with_files(&[FileWithContent(
+            file.as_os_str().to_str().unwrap(),
+            r#"
+                export-env {
+                    print $env.CURRENT_FILE
+                }
+            "#,
+        )]);
+
+        let actual = nu!(
+            cwd: dirs.test(),
+            "use ."
+        );
+
+        assert_eq!(actual.out, dirs.test().join("mod.nu").to_string_lossy());
+    });
+}

From 1d15bbc95b8d56a421f64f185ede0f029e183302 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Thu, 10 Oct 2024 20:57:30 +0800
Subject: [PATCH 0533/1072] Making nushell works better with external args
 which surrounded by backtick quotes (#13910)

# Description
Fixes: #13431
Fixes: #13578

The issue happened because nushell thinks external program name and
external arg with totally same rule. But actually they are a little bit
different.
When parsing external program name, backtick is a thing and it should be
keeped.
But when parsing external args, backtick is just a mark that it's a
**bareword which may contain space**. So in this context, it's already
useless.

# User-Facing Changes
After the pr, the following command will work as intended.
```nushell
> ^echo `"hello"`
hello
```

# Tests + Formatting
Added 3 test cases.
---
 crates/nu-parser/src/parser.rs        | 24 ++++++++++++++++++++----
 crates/nu-parser/tests/test_parser.rs | 15 +++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 4ac161bb84..5a35c95e72 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -240,10 +240,26 @@ fn parse_unknown_arg(
 /// string, where each balanced pair of quotes is parsed as a separate part of the string, and then
 /// concatenated together.
 ///
+/// `keep_surround_backtick_quote` should be true when parsing it as command name.  Or else it
+/// should be false.
+///
 /// For example, `-foo="bar\nbaz"` becomes `$"-foo=bar\nbaz"`
-fn parse_external_string(working_set: &mut StateWorkingSet, span: Span) -> Expression {
-    let contents = &working_set.get_span_contents(span);
+fn parse_external_string(
+    working_set: &mut StateWorkingSet,
+    mut span: Span,
+    keep_surround_bakctick_quote: bool,
+) -> Expression {
+    let mut contents = working_set.get_span_contents(span);
 
+    if !keep_surround_bakctick_quote
+        && contents.len() > 1
+        && contents.starts_with(b"`")
+        && contents.ends_with(b"`")
+    {
+        contents = &contents[1..contents.len() - 1];
+        // backtick quote is useless in this case, so span is required to updated.
+        span = Span::new(span.start + 1, span.end - 1);
+    }
     if contents.starts_with(b"r#") {
         parse_raw_string(working_set, span)
     } else if contents
@@ -441,7 +457,7 @@ fn parse_regular_external_arg(working_set: &mut StateWorkingSet, span: Span) ->
     } else if contents.starts_with(b"[") {
         parse_list_expression(working_set, span, &SyntaxShape::Any)
     } else {
-        parse_external_string(working_set, span)
+        parse_external_string(working_set, span, false)
     }
 }
 
@@ -463,7 +479,7 @@ pub fn parse_external_call(working_set: &mut StateWorkingSet, spans: &[Span]) ->
         let arg = parse_expression(working_set, &[head_span]);
         Box::new(arg)
     } else {
-        Box::new(parse_external_string(working_set, head_span))
+        Box::new(parse_external_string(working_set, head_span, true))
     };
 
     let args = spans[1..]
diff --git a/crates/nu-parser/tests/test_parser.rs b/crates/nu-parser/tests/test_parser.rs
index b26ae20db9..1ac3d7e900 100644
--- a/crates/nu-parser/tests/test_parser.rs
+++ b/crates/nu-parser/tests/test_parser.rs
@@ -1021,6 +1021,11 @@ pub fn test_external_call_head_interpolated_string(
     r#"{a:1,b:c,c:d}"#,
     "value with single quote and double quote"
 )]
+#[case(
+    r#"^foo `hello world`"#,
+    r#"hello world"#,
+    "value is surrounded by backtick quote"
+)]
 pub fn test_external_call_arg_glob(#[case] input: &str, #[case] expected: &str, #[case] tag: &str) {
     test_external_call(input, tag, |name, args| {
         match &name.expr {
@@ -1115,6 +1120,16 @@ pub fn test_external_call_arg_raw_string(
     r#"foo\external call"#,
     "double quote with backslash"
 )]
+#[case(
+    r#"^foo `"hello world"`"#,
+    r#"hello world"#,
+    "value is surrounded by backtick quote, with inner double quote"
+)]
+#[case(
+    r#"^foo `'hello world'`"#,
+    r#"hello world"#,
+    "value is surrounded by backtick quote, with inner single quote"
+)]
 pub fn test_external_call_arg_string(
     #[case] input: &str,
     #[case] expected: &str,

From 3bedbd06693fa706be1bcfbab94273276ada4d79 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Thu, 10 Oct 2024 10:58:37 -0400
Subject: [PATCH 0534/1072] Respect `use_ansi_coloring` setting in `banner`
 (#14049)

# Description

Partial fix for #14043 - If `$env.config.use_ansi_coloring` is `false`,
strip the ansi coloring before displaying.

# User-Facing Changes

Bug fix

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

N/A
---
 crates/nu-std/std/core/mod.nu | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/crates/nu-std/std/core/mod.nu b/crates/nu-std/std/core/mod.nu
index 3e28937dad..2c4a863426 100644
--- a/crates/nu-std/std/core/mod.nu
+++ b/crates/nu-std/std/core/mod.nu
@@ -3,7 +3,8 @@ use std/dt [datetime-diff, pretty-print-duration]
 # Print a banner for nushell with information about the project
 export def banner [] {
 let dt = (datetime-diff (date now) 2019-05-10T09:59:12-07:00)
-$"(ansi green)     __  ,(ansi reset)
+
+let banner_msg = $"(ansi green)     __  ,(ansi reset)
 (ansi green) .--\(\)°'.' (ansi reset)Welcome to (ansi green)Nushell(ansi reset),
 (ansi green)'|, . ,'   (ansi reset)based on the (ansi green)nu(ansi reset) language,
 (ansi green) !_-\(_\\    (ansi reset)where all data is structured!
@@ -19,6 +20,11 @@ It's been this long since (ansi green)Nushell(ansi reset)'s first commit:
 
 Startup Time: ($nu.startup-time)
 "
+
+match $env.config?.use_ansi_coloring? {
+    false => { $banner_msg | ansi strip }
+    _ => $banner_msg
+}
 }
 
 # Return the current working directory

From 69e4abad0ff42a1270e47e50192d9ccbe50bc3cf Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 10 Oct 2024 12:55:01 -0500
Subject: [PATCH 0535/1072] hard-code selection color to be `reverse` (#14052)

# Description

This PR makes visual selection in Nushell a little bit more readable.

### Before

![image](https://github.com/user-attachments/assets/3020abd2-c02c-4f16-b68a-cbe72278cbc8)

### After

![image](https://github.com/user-attachments/assets/fcf919fa-bc02-449b-b5bc-ed05959cc7de)

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-cli/src/repl.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 4ecf1cbd2f..718f85f9b6 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -376,7 +376,11 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
                 .to_string_lossy()
                 .to_string(),
         ))
-        .with_cursor_config(cursor_config);
+        .with_cursor_config(cursor_config)
+        .with_visual_selection_style(nu_ansi_term::Style {
+            is_reverse: true,
+            ..Default::default()
+        });
 
     perf!("reedline builder", start_time, use_color);
 

From e43632fd954c544b20cb9e7d80c144917cf22546 Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Fri, 11 Oct 2024 11:16:22 +0800
Subject: [PATCH 0536/1072] Create Sha256sum file for each release binary
 (#14050)

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

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

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

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

Create Sha256sum file for each release binary
A test release could be found here:
https://github.com/nushell/nightly/releases/tag/0.98.2
---
 .github/workflows/release.yml | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a9443178ba..76a247ff7a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ defaults:
     shell: bash
 
 jobs:
-  standard:
+  release:
     name: Nu
 
     strategy:
@@ -107,3 +107,26 @@ jobs:
         files: ${{ steps.nu.outputs.archive }}
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  sha256sum:
+    needs: release
+    name: Create Sha256sum
+    runs-on: ubuntu-latest
+    steps:
+    - name: Download Release Archives
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: >-
+        gh release download ${{ github.ref_name }}
+        --repo ${{ github.repository }}
+        --pattern '*'
+        --dir release
+    - name: Create Checksums
+      run: cd release && shasum -a 256 * > ../SHA256SUMS
+    - name: Publish Checksums
+      uses: softprops/action-gh-release@v2.0.8
+      with:
+        draft: true
+        files: SHA256SUMS
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 44be445b579b001c9ba2fd93dbccd44e895a2d65 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Fri, 11 Oct 2024 14:45:42 +0800
Subject: [PATCH 0537/1072] Revert "fix $env.FILE_PWD and $env.CURRENT_FILE
 inside `use` (#13958)" (#14057)

This reverts commit 5002d87af471685b5bde1b866d3e4a74b87c2f88 from pr
#13958

It seems that something unexpected happened from
[@ealap](https://github.com/ealap)'s report. Thanks!

Reopen: #13425
---
 crates/nu-cmd-lang/src/core_commands/use_.rs | 30 ++++---------
 crates/nu-command/tests/commands/use_.rs     | 44 --------------------
 2 files changed, 7 insertions(+), 67 deletions(-)

diff --git a/crates/nu-cmd-lang/src/core_commands/use_.rs b/crates/nu-cmd-lang/src/core_commands/use_.rs
index d822e0c955..8035cc81fe 100644
--- a/crates/nu-cmd-lang/src/core_commands/use_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/use_.rs
@@ -98,21 +98,15 @@ This command is a parser keyword. For details, check:
                     engine_state.get_span_contents(import_pattern.head.span),
                 );
 
-                let maybe_file_path_or_dir = find_in_dirs_env(
+                let maybe_file_path = find_in_dirs_env(
                     &module_arg_str,
                     engine_state,
                     caller_stack,
                     get_dirs_var_from_call(caller_stack, call),
                 )?;
-                // module_arg_str maybe a directory, in this case
-                // find_in_dirs_env returns a directory.
-                let maybe_parent = maybe_file_path_or_dir.as_ref().and_then(|path| {
-                    if path.is_dir() {
-                        Some(path.to_path_buf())
-                    } else {
-                        path.parent().map(|p| p.to_path_buf())
-                    }
-                });
+                let maybe_parent = maybe_file_path
+                    .as_ref()
+                    .and_then(|path| path.parent().map(|p| p.to_path_buf()));
 
                 let mut callee_stack = caller_stack
                     .gather_captures(engine_state, &block.captures)
@@ -124,15 +118,9 @@ This command is a parser keyword. For details, check:
                     callee_stack.add_env_var("FILE_PWD".to_string(), file_pwd);
                 }
 
-                if let Some(path) = maybe_file_path_or_dir {
-                    let module_file_path = if path.is_dir() {
-                        // the existence of `mod.nu` is verified in parsing time
-                        // so it's safe to use it here.
-                        Value::string(path.join("mod.nu").to_string_lossy(), call.head)
-                    } else {
-                        Value::string(path.to_string_lossy(), call.head)
-                    };
-                    callee_stack.add_env_var("CURRENT_FILE".to_string(), module_file_path);
+                if let Some(file_path) = maybe_file_path {
+                    let file_path = Value::string(file_path.to_string_lossy(), call.head);
+                    callee_stack.add_env_var("CURRENT_FILE".to_string(), file_path);
                 }
 
                 let eval_block = get_eval_block(engine_state);
@@ -142,10 +130,6 @@ This command is a parser keyword. For details, check:
 
                 // Merge the block's environment to the current stack
                 redirect_env(engine_state, caller_stack, &callee_stack);
-
-                // File-reative PWD is useless after eval file block.
-                caller_stack.remove_env_var(engine_state, "FILE_PWD");
-                caller_stack.remove_env_var(engine_state, "CURRENT_FILE");
             }
         } else {
             return Err(ShellError::GenericError {
diff --git a/crates/nu-command/tests/commands/use_.rs b/crates/nu-command/tests/commands/use_.rs
index 2822be83c7..2895e1635f 100644
--- a/crates/nu-command/tests/commands/use_.rs
+++ b/crates/nu-command/tests/commands/use_.rs
@@ -308,47 +308,3 @@ fn can_use_sub_subname_from_submodule() {
     let actual = nu!(inp);
     assert_eq!(actual.out, "bar")
 }
-
-#[test]
-fn test_use_with_printing_file_pwd() {
-    Playground::setup("use_with_printing_file_pwd", |dirs, nu| {
-        let file = dirs.test().join("mod.nu");
-        nu.with_files(&[FileWithContent(
-            file.as_os_str().to_str().unwrap(),
-            r#"
-                export-env {
-                    print $env.FILE_PWD
-                }
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            "use ."
-        );
-
-        assert_eq!(actual.out, dirs.test().to_string_lossy());
-    });
-}
-
-#[test]
-fn test_use_with_printing_current_file() {
-    Playground::setup("use_with_printing_current_file", |dirs, nu| {
-        let file = dirs.test().join("mod.nu");
-        nu.with_files(&[FileWithContent(
-            file.as_os_str().to_str().unwrap(),
-            r#"
-                export-env {
-                    print $env.CURRENT_FILE
-                }
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            "use ."
-        );
-
-        assert_eq!(actual.out, dirs.test().join("mod.nu").to_string_lossy());
-    });
-}

From 2df91e7f926ca7dc54a565d236c35d8c3dbfc508 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Fri, 11 Oct 2024 04:41:24 -0700
Subject: [PATCH 0538/1072] Removed CustomValue portion of CustomValue type
 name strings.  (#14054)

# Description

This changes the names returned by CustomValue::name() of the various
custom value structs to just say the name of the thing they represent.
For instance "DataFrameCustomValue" is not just "DataFrame".

# User-Facing Changes
- Places such as or errors where NuDataFrameCustomValue would be seen,
now just shows as NuDataFrame.
---
 .../src/dataframe/values/nu_dataframe/custom_value.rs           | 2 +-
 .../src/dataframe/values/nu_lazyframe/custom_value.rs           | 2 +-
 .../src/dataframe/values/nu_lazygroupby/custom_value.rs         | 2 +-
 .../src/dataframe/values/nu_when/custom_value.rs                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/custom_value.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/custom_value.rs
index b94f812dac..5913ba56d3 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/custom_value.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/custom_value.rs
@@ -27,7 +27,7 @@ impl CustomValue for NuDataFrameCustomValue {
     }
 
     fn type_name(&self) -> String {
-        "NuDataFrameCustomValue".into()
+        "NuDataFrame".into()
     }
 
     fn to_base_value(&self, span: Span) -> Result<Value, ShellError> {
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/custom_value.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/custom_value.rs
index b3cd9500dd..abce1a9e7b 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/custom_value.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/custom_value.rs
@@ -27,7 +27,7 @@ impl CustomValue for NuLazyFrameCustomValue {
     }
 
     fn type_name(&self) -> String {
-        "NuLazyFrameCustomValue".into()
+        "NuLazyFrame".into()
     }
 
     fn to_base_value(&self, span: Span) -> Result<Value, ShellError> {
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_lazygroupby/custom_value.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_lazygroupby/custom_value.rs
index 03327259bb..47cbad1cb4 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_lazygroupby/custom_value.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_lazygroupby/custom_value.rs
@@ -19,7 +19,7 @@ impl CustomValue for NuLazyGroupByCustomValue {
     }
 
     fn type_name(&self) -> String {
-        "NuLazyGroupByCustomValue".into()
+        "NuLazyGroupBy".into()
     }
 
     fn to_base_value(&self, span: Span) -> Result<Value, ShellError> {
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_when/custom_value.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_when/custom_value.rs
index 5d64bbf011..c8d1303d66 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_when/custom_value.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_when/custom_value.rs
@@ -20,7 +20,7 @@ impl CustomValue for NuWhenCustomValue {
     }
 
     fn type_name(&self) -> String {
-        "NuWhenCustomValue".into()
+        "NuWhen".into()
     }
 
     fn to_base_value(&self, span: Span) -> Result<Value, ShellError> {

From a95c2198a69f9f308e15bb00d239b36ed6e27cd3 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Fri, 11 Oct 2024 04:43:12 -0700
Subject: [PATCH 0539/1072] Remove `group` command (#14056)

# Description

Removes the `group` command that was deprecated back in 0.96.0 with
#13377.

# User-Facing Changes

Breaking change, removed `group` command.
---
 crates/nu-command/src/default_context.rs |   1 -
 crates/nu-command/src/filters/group.rs   | 132 -----------------------
 crates/nu-command/src/filters/mod.rs     |   2 -
 crates/nu-command/tests/commands/each.rs |   2 +-
 4 files changed, 1 insertion(+), 136 deletions(-)
 delete mode 100644 crates/nu-command/src/filters/group.rs

diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index 672eea1006..43fb8394c5 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -46,7 +46,6 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             First,
             Flatten,
             Get,
-            Group,
             GroupBy,
             Headers,
             Insert,
diff --git a/crates/nu-command/src/filters/group.rs b/crates/nu-command/src/filters/group.rs
deleted file mode 100644
index 34b70f697a..0000000000
--- a/crates/nu-command/src/filters/group.rs
+++ /dev/null
@@ -1,132 +0,0 @@
-use nu_engine::command_prelude::*;
-use nu_protocol::{report_shell_warning, ValueIterator};
-
-#[derive(Clone)]
-pub struct Group;
-
-impl Command for Group {
-    fn name(&self) -> &str {
-        "group"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("group")
-            // TODO: It accepts Table also, but currently there is no Table
-            // example. Perhaps Table should be a subtype of List, in which case
-            // the current signature would suffice even when a Table example
-            // exists.
-            .input_output_types(vec![(
-                Type::List(Box::new(Type::Any)),
-                Type::List(Box::new(Type::List(Box::new(Type::Any)))),
-            )])
-            .required("group_size", SyntaxShape::Int, "The size of each group.")
-            .category(Category::Filters)
-    }
-
-    fn description(&self) -> &str {
-        "Groups input into groups of `group_size`."
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        let stream_test_1 = vec![
-            Value::list(
-                vec![Value::test_int(1), Value::test_int(2)],
-                Span::test_data(),
-            ),
-            Value::list(
-                vec![Value::test_int(3), Value::test_int(4)],
-                Span::test_data(),
-            ),
-        ];
-
-        vec![Example {
-            example: "[1 2 3 4] | group 2",
-            description: "Group the a list by pairs",
-            result: Some(Value::list(stream_test_1, Span::test_data())),
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let head = call.head;
-
-        report_shell_warning(
-            engine_state,
-            &ShellError::Deprecated {
-                old_command: "group".into(),
-                new_suggestion: "the new `chunks` command".into(),
-                span: head,
-                url: "`help chunks`".into(),
-            },
-        );
-
-        let group_size: Spanned<usize> = call.req(engine_state, stack, 0)?;
-        let metadata = input.metadata();
-
-        let each_group_iterator = EachGroupIterator {
-            group_size: group_size.item,
-            input: Box::new(input.into_iter()),
-            span: head,
-        };
-
-        Ok(each_group_iterator.into_pipeline_data_with_metadata(
-            head,
-            engine_state.signals().clone(),
-            metadata,
-        ))
-    }
-}
-
-struct EachGroupIterator {
-    group_size: usize,
-    input: ValueIterator,
-    span: Span,
-}
-
-impl Iterator for EachGroupIterator {
-    type Item = Value;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let mut group = vec![];
-        let mut current_count = 0;
-
-        loop {
-            let item = self.input.next();
-
-            match item {
-                Some(v) => {
-                    group.push(v);
-
-                    current_count += 1;
-                    if current_count >= self.group_size {
-                        break;
-                    }
-                }
-                None => break,
-            }
-        }
-
-        if group.is_empty() {
-            return None;
-        }
-
-        Some(Value::list(group, self.span))
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        use crate::test_examples;
-
-        test_examples(Group {})
-    }
-}
diff --git a/crates/nu-command/src/filters/mod.rs b/crates/nu-command/src/filters/mod.rs
index 4ffb0fc6db..8b56bf7a87 100644
--- a/crates/nu-command/src/filters/mod.rs
+++ b/crates/nu-command/src/filters/mod.rs
@@ -15,7 +15,6 @@ mod find;
 mod first;
 mod flatten;
 mod get;
-mod group;
 mod group_by;
 mod headers;
 mod insert;
@@ -73,7 +72,6 @@ pub use find::Find;
 pub use first::First;
 pub use flatten::Flatten;
 pub use get::Get;
-pub use group::Group;
 pub use group_by::GroupBy;
 pub use headers::Headers;
 pub use insert::Insert;
diff --git a/crates/nu-command/tests/commands/each.rs b/crates/nu-command/tests/commands/each.rs
index 65b922bb6e..b3c04af0a4 100644
--- a/crates/nu-command/tests/commands/each.rs
+++ b/crates/nu-command/tests/commands/each.rs
@@ -9,7 +9,7 @@ fn each_works_separately() {
 
 #[test]
 fn each_group_works() {
-    let actual = nu!("echo [1 2 3 4 5 6] | group 3 | to json --raw");
+    let actual = nu!("echo [1 2 3 4 5 6] | chunks 3 | to json --raw");
 
     assert_eq!(actual.out, "[[1,2,3],[4,5,6]]");
 }

From 9f714e62cbba75ad91585ea73eac51bb29aebd3b Mon Sep 17 00:00:00 2001
From: "Tristan P." <65556393+quadristan@users.noreply.github.com>
Date: Fri, 11 Oct 2024 14:13:42 +0200
Subject: [PATCH 0540/1072] [umkdir][tests] get umask instead of assuming it
 (#14046)

# Description

Contributors to this projects will have a test failure if their `umask`
is not set to `0022`.

Apparently on Debian (at least on my install), it is set to `0002` which
makes my test fail. While `0022` is safer than the value I have, I want
to reduce the amount if issue new contributors could have.

I am making this test not assuming anything and instead, reading the
user umask.

# Related discussion

I see that the `umask` command implementation has been discussed in
#12256 . We could use this and enforce a umask for tests who rely on
this. I believe however (let me know what you think) that hard coded
values are harder to read in the test.



# User-Facing Changes
N/A

# Tests + Formatting
All green on my side after this MR :+1:


# After Submitting
Documentation is not impacted

---------

Co-authored-by: Stefan Holderbach <sholderbach@users.noreply.github.com>
---
 crates/nu-command/tests/commands/umkdir.rs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/crates/nu-command/tests/commands/umkdir.rs b/crates/nu-command/tests/commands/umkdir.rs
index fdaaf4f721..ea90735ce4 100644
--- a/crates/nu-command/tests/commands/umkdir.rs
+++ b/crates/nu-command/tests/commands/umkdir.rs
@@ -2,6 +2,9 @@ use nu_test_support::fs::files_exist_at;
 use nu_test_support::playground::Playground;
 use nu_test_support::{nu, pipeline};
 
+#[cfg(not(windows))]
+use uucore::mode;
+
 #[test]
 fn creates_directory() {
     Playground::setup("mkdir_test_1", |dirs, _| {
@@ -145,10 +148,13 @@ fn mkdir_umask_permission() {
             .permissions()
             .mode();
 
+        let umask = mode::get_umask();
+        let default_mode = 0o40777;
+        let expected: u32 = default_mode & !umask;
+
         assert_eq!(
-            actual, 0o40755,
-            "Most *nix systems have 0o00022 as the umask. \
-            So directory permission should be 0o40755 = 0o40777 & (!0o00022)"
+            actual, expected,
+            "Umask should have been applied to created folder"
         );
     })
 }

From bcb7ef48b622d91acdb7aa2e9f61b5a80dfd3d81 Mon Sep 17 00:00:00 2001
From: Piotr Kufel <qfel@users.noreply.github.com>
Date: Fri, 11 Oct 2024 05:51:50 -0700
Subject: [PATCH 0541/1072] Reduce duplication in history path construction
 (#13475)

# Description
Currently there is a bit of chaos regarding construction of history file
paths. Various pieces of code across a number of crates reimplement the
same/similar logic:
- There is `get_history_path`, but it requires a directory parameter (it
really just joins it with a file name).
- Some places use a const for the directory parameter, others use a
string literal - in all cases the value seems to be `"nushell"`.
- Some places assume the `"nushell"` value, other plumb it down from
close to the top of the call stack.
- Some places use a constant for history file names while others assume
it.

This PR tries to make it so that the history/config path format is
defined in a single places and so dependencies on it are easier to
follow:
- It removes `get_history_path` and adds a `file_path` method to
`HistoryConfig` instead (an extra motivation being, this is a convenient
place that can be used from all creates that need a history file path)
- Adds a `nu_config_dir` function that returns the nushell configuration
directory.
- Updates existing code to rely on the above, effectively removing
duplicate uses of `"nushell"` and `NUSHELL_FOLDER` and assumptions about
file names associated with different history formats

# User-Facing Changes
None
---
 .../nu-cli/src/commands/history/history_.rs   | 30 ++++---------
 crates/nu-cli/src/config_files.rs             | 45 +++++--------------
 crates/nu-cli/src/repl.rs                     | 19 +++-----
 .../nu-command/src/env/config/config_reset.rs |  8 +---
 crates/nu-path/src/helpers.rs                 | 32 +++++++------
 crates/nu-path/src/lib.rs                     |  2 +-
 crates/nu-protocol/src/config/history.rs      | 19 ++++++++
 crates/nu-protocol/src/eval_const.rs          |  7 +--
 src/config_files.rs                           | 20 +++------
 src/main.rs                                   |  9 +---
 src/run.rs                                    | 32 ++++---------
 tests/repl/test_config_path.rs                |  4 +-
 12 files changed, 82 insertions(+), 145 deletions(-)

diff --git a/crates/nu-cli/src/commands/history/history_.rs b/crates/nu-cli/src/commands/history/history_.rs
index fc1ed1b516..f5289e24a4 100644
--- a/crates/nu-cli/src/commands/history/history_.rs
+++ b/crates/nu-cli/src/commands/history/history_.rs
@@ -39,27 +39,15 @@ impl Command for History {
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
 
-        let Some(history) = engine_state.history_config() else {
-            return Ok(PipelineData::empty());
-        };
-
-        // todo for sqlite history this command should be an alias to `open ~/.config/nushell/history.sqlite3 | get history`
-        if let Some(config_path) = nu_path::config_dir() {
+        if let Some(history) = engine_state.history_config() {
+            // todo for sqlite history this command should be an alias to `open ~/.config/nushell/history.sqlite3 | get history`
+            let Some(history_path) = history.file_path() else {
+                return Err(ShellError::ConfigDirNotFound { span: Some(head) });
+            };
             let clear = call.has_flag(engine_state, stack, "clear")?;
             let long = call.has_flag(engine_state, stack, "long")?;
             let signals = engine_state.signals().clone();
 
-            let mut history_path = config_path;
-            history_path.push("nushell");
-            match history.file_format {
-                HistoryFileFormat::Sqlite => {
-                    history_path.push("history.sqlite3");
-                }
-                HistoryFileFormat::Plaintext => {
-                    history_path.push("history.txt");
-                }
-            }
-
             if clear {
                 let _ = std::fs::remove_file(history_path);
                 // TODO: FIXME also clear the auxiliary files when using sqlite
@@ -67,17 +55,16 @@ impl Command for History {
             } else {
                 let history_reader: Option<Box<dyn ReedlineHistory>> = match history.file_format {
                     HistoryFileFormat::Sqlite => {
-                        SqliteBackedHistory::with_file(history_path.clone().into(), None, None)
+                        SqliteBackedHistory::with_file(history_path.clone(), None, None)
                             .map(|inner| {
                                 let boxed: Box<dyn ReedlineHistory> = Box::new(inner);
                                 boxed
                             })
                             .ok()
                     }
-
                     HistoryFileFormat::Plaintext => FileBackedHistory::with_file(
                         history.max_size as usize,
-                        history_path.clone().into(),
+                        history_path.clone(),
                     )
                     .map(|inner| {
                         let boxed: Box<dyn ReedlineHistory> = Box::new(inner);
@@ -85,7 +72,6 @@ impl Command for History {
                     })
                     .ok(),
                 };
-
                 match history.file_format {
                     HistoryFileFormat::Plaintext => Ok(history_reader
                         .and_then(|h| {
@@ -126,7 +112,7 @@ impl Command for History {
                 }
             }
         } else {
-            Err(ShellError::ConfigDirNotFound { span: Some(head) })
+            Ok(PipelineData::empty())
         }
     }
 
diff --git a/crates/nu-cli/src/config_files.rs b/crates/nu-cli/src/config_files.rs
index 998686d870..7627252acc 100644
--- a/crates/nu-cli/src/config_files.rs
+++ b/crates/nu-cli/src/config_files.rs
@@ -5,7 +5,7 @@ use nu_path::canonicalize_with;
 use nu_protocol::{engine::StateWorkingSet, ParseError, PluginRegistryFile, Spanned};
 use nu_protocol::{
     engine::{EngineState, Stack},
-    report_shell_error, HistoryFileFormat, PipelineData,
+    report_shell_error, PipelineData,
 };
 #[cfg(feature = "plugin")]
 use nu_utils::perf;
@@ -16,15 +16,8 @@ const PLUGIN_FILE: &str = "plugin.msgpackz";
 #[cfg(feature = "plugin")]
 const OLD_PLUGIN_FILE: &str = "plugin.nu";
 
-const HISTORY_FILE_TXT: &str = "history.txt";
-const HISTORY_FILE_SQLITE: &str = "history.sqlite3";
-
 #[cfg(feature = "plugin")]
-pub fn read_plugin_file(
-    engine_state: &mut EngineState,
-    plugin_file: Option<Spanned<String>>,
-    storage_path: &str,
-) {
+pub fn read_plugin_file(engine_state: &mut EngineState, plugin_file: Option<Spanned<String>>) {
     use nu_protocol::ShellError;
     use std::path::Path;
 
@@ -52,7 +45,7 @@ pub fn read_plugin_file(
     let mut start_time = std::time::Instant::now();
     // Reading signatures from plugin registry file
     // The plugin.msgpackz file stores the parsed signature collected from each registered plugin
-    add_plugin_file(engine_state, plugin_file.clone(), storage_path);
+    add_plugin_file(engine_state, plugin_file.clone());
     perf!(
         "add plugin file to engine_state",
         start_time,
@@ -70,8 +63,7 @@ pub fn read_plugin_file(
                     log::warn!("Plugin file not found: {}", plugin_path.display());
 
                     // Try migration of an old plugin file if this wasn't a custom plugin file
-                    if plugin_file.is_none() && migrate_old_plugin_file(engine_state, storage_path)
-                    {
+                    if plugin_file.is_none() && migrate_old_plugin_file(engine_state) {
                         let Ok(file) = std::fs::File::open(&plugin_path) else {
                             log::warn!("Failed to load newly migrated plugin file");
                             return;
@@ -159,11 +151,7 @@ pub fn read_plugin_file(
 }
 
 #[cfg(feature = "plugin")]
-pub fn add_plugin_file(
-    engine_state: &mut EngineState,
-    plugin_file: Option<Spanned<String>>,
-    storage_path: &str,
-) {
+pub fn add_plugin_file(engine_state: &mut EngineState, plugin_file: Option<Spanned<String>>) {
     use std::path::Path;
 
     use nu_protocol::report_parse_error;
@@ -189,9 +177,8 @@ pub fn add_plugin_file(
                     ),
                 );
             }
-        } else if let Some(mut plugin_path) = nu_path::config_dir() {
+        } else if let Some(plugin_path) = nu_path::nu_config_dir() {
             // Path to store plugins signatures
-            plugin_path.push(storage_path);
             let mut plugin_path =
                 canonicalize_with(&plugin_path, &cwd).unwrap_or(plugin_path.into());
             plugin_path.push(PLUGIN_FILE);
@@ -235,19 +222,8 @@ pub fn eval_config_contents(
     }
 }
 
-pub(crate) fn get_history_path(storage_path: &str, mode: HistoryFileFormat) -> Option<PathBuf> {
-    nu_path::config_dir().map(|mut history_path| {
-        history_path.push(storage_path);
-        history_path.push(match mode {
-            HistoryFileFormat::Plaintext => HISTORY_FILE_TXT,
-            HistoryFileFormat::Sqlite => HISTORY_FILE_SQLITE,
-        });
-        history_path.into()
-    })
-}
-
 #[cfg(feature = "plugin")]
-pub fn migrate_old_plugin_file(engine_state: &EngineState, storage_path: &str) -> bool {
+pub fn migrate_old_plugin_file(engine_state: &EngineState) -> bool {
     use nu_protocol::{
         PluginExample, PluginIdentity, PluginRegistryItem, PluginRegistryItemData, PluginSignature,
         ShellError,
@@ -260,10 +236,9 @@ pub fn migrate_old_plugin_file(engine_state: &EngineState, storage_path: &str) -
         return false;
     };
 
-    let Some(config_dir) = nu_path::config_dir().and_then(|mut dir| {
-        dir.push(storage_path);
-        nu_path::canonicalize_with(dir, &cwd).ok()
-    }) else {
+    let Some(config_dir) =
+        nu_path::nu_config_dir().and_then(|dir| nu_path::canonicalize_with(dir, &cwd).ok())
+    else {
         return false;
     };
 
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 718f85f9b6..ed2b3a2510 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -50,7 +50,6 @@ use sysinfo::System;
 pub fn evaluate_repl(
     engine_state: &mut EngineState,
     stack: Stack,
-    nushell_path: &str,
     prerun_command: Option<Spanned<String>>,
     load_std_lib: Option<Spanned<String>>,
     entire_start_time: Instant,
@@ -97,7 +96,7 @@ pub fn evaluate_repl(
 
     unique_stack.set_last_exit_code(0, Span::unknown());
 
-    let mut line_editor = get_line_editor(engine_state, nushell_path, use_color)?;
+    let mut line_editor = get_line_editor(engine_state, use_color)?;
     let temp_file = temp_dir().join(format!("{}.nu", uuid::Uuid::new_v4()));
 
     if let Some(s) = prerun_command {
@@ -213,7 +212,7 @@ pub fn evaluate_repl(
             }
             Err(_) => {
                 // line_editor is lost in the error case so reconstruct a new one
-                line_editor = get_line_editor(engine_state, nushell_path, use_color)?;
+                line_editor = get_line_editor(engine_state, use_color)?;
             }
         }
     }
@@ -243,11 +242,7 @@ fn unescape_for_vscode(text: &mut std::str::Chars) -> Option<char> {
     }
 }
 
-fn get_line_editor(
-    engine_state: &mut EngineState,
-    nushell_path: &str,
-    use_color: bool,
-) -> Result<Reedline> {
+fn get_line_editor(engine_state: &mut EngineState, use_color: bool) -> Result<Reedline> {
     let mut start_time = std::time::Instant::now();
     let mut line_editor = Reedline::create();
 
@@ -258,7 +253,7 @@ fn get_line_editor(
     if let Some(history) = engine_state.history_config() {
         start_time = std::time::Instant::now();
 
-        line_editor = setup_history(nushell_path, engine_state, line_editor, history)?;
+        line_editor = setup_history(engine_state, line_editor, history)?;
 
         perf!("setup history", start_time, use_color);
     }
@@ -1121,7 +1116,6 @@ fn flush_engine_state_repl_buffer(engine_state: &mut EngineState, line_editor: &
 /// Setup history management for Reedline
 ///
 fn setup_history(
-    nushell_path: &str,
     engine_state: &mut EngineState,
     line_editor: Reedline,
     history: HistoryConfig,
@@ -1133,7 +1127,7 @@ fn setup_history(
         None
     };
 
-    if let Some(path) = crate::config_files::get_history_path(nushell_path, history.file_format) {
+    if let Some(path) = history.file_path() {
         return update_line_editor_history(
             engine_state,
             path,
@@ -1409,8 +1403,7 @@ fn trailing_slash_looks_like_path() {
 fn are_session_ids_in_sync() {
     let engine_state = &mut EngineState::new();
     let history = engine_state.history_config().unwrap();
-    let history_path =
-        crate::config_files::get_history_path("nushell", history.file_format).unwrap();
+    let history_path = history.file_path().unwrap();
     let line_editor = reedline::Reedline::create();
     let history_session_id = reedline::Reedline::create_history_session_id();
     let line_editor = update_line_editor_history(
diff --git a/crates/nu-command/src/env/config/config_reset.rs b/crates/nu-command/src/env/config/config_reset.rs
index a185072d67..8cf45d21bc 100644
--- a/crates/nu-command/src/env/config/config_reset.rs
+++ b/crates/nu-command/src/env/config/config_reset.rs
@@ -45,13 +45,9 @@ impl Command for ConfigReset {
         let only_env = call.has_flag(engine_state, stack, "env")?;
         let no_backup = call.has_flag(engine_state, stack, "without-backup")?;
         let span = call.head;
-        let mut config_path = match nu_path::config_dir() {
-            Some(path) => path,
-            None => {
-                return Err(ShellError::ConfigDirNotFound { span: None });
-            }
+        let Some(config_path) = nu_path::nu_config_dir() else {
+            return Err(ShellError::ConfigDirNotFound { span: None });
         };
-        config_path.push("nushell");
         if !only_env {
             let mut nu_config = config_path.clone();
             nu_config.push("config.nu");
diff --git a/crates/nu-path/src/helpers.rs b/crates/nu-path/src/helpers.rs
index b36d59971e..931b3f9d07 100644
--- a/crates/nu-path/src/helpers.rs
+++ b/crates/nu-path/src/helpers.rs
@@ -1,3 +1,5 @@
+use std::path::PathBuf;
+
 use crate::AbsolutePathBuf;
 
 pub fn home_dir() -> Option<AbsolutePathBuf> {
@@ -6,27 +8,29 @@ pub fn home_dir() -> Option<AbsolutePathBuf> {
 
 /// Return the data directory for the current platform or XDG_DATA_HOME if specified.
 pub fn data_dir() -> Option<AbsolutePathBuf> {
-    std::env::var("XDG_DATA_HOME")
-        .ok()
-        .and_then(|path| AbsolutePathBuf::try_from(path).ok())
-        .or_else(|| dirs::data_dir().and_then(|path| AbsolutePathBuf::try_from(path).ok()))
-        .map(|path| path.canonicalize().map(Into::into).unwrap_or(path))
+    configurable_dir_path("XDG_DATA_HOME", dirs::data_dir)
 }
 
 /// Return the cache directory for the current platform or XDG_CACHE_HOME if specified.
 pub fn cache_dir() -> Option<AbsolutePathBuf> {
-    std::env::var("XDG_CACHE_HOME")
-        .ok()
-        .and_then(|path| AbsolutePathBuf::try_from(path).ok())
-        .or_else(|| dirs::cache_dir().and_then(|path| AbsolutePathBuf::try_from(path).ok()))
-        .map(|path| path.canonicalize().map(Into::into).unwrap_or(path))
+    configurable_dir_path("XDG_CACHE_HOME", dirs::cache_dir)
 }
 
-/// Return the config directory for the current platform or XDG_CONFIG_HOME if specified.
-pub fn config_dir() -> Option<AbsolutePathBuf> {
-    std::env::var("XDG_CONFIG_HOME")
+/// Return the nushell config directory.
+pub fn nu_config_dir() -> Option<AbsolutePathBuf> {
+    configurable_dir_path("XDG_CONFIG_HOME", dirs::config_dir).map(|mut p| {
+        p.push("nushell");
+        p
+    })
+}
+
+fn configurable_dir_path(
+    name: &'static str,
+    dir: impl FnOnce() -> Option<PathBuf>,
+) -> Option<AbsolutePathBuf> {
+    std::env::var(name)
         .ok()
         .and_then(|path| AbsolutePathBuf::try_from(path).ok())
-        .or_else(|| dirs::config_dir().and_then(|path| AbsolutePathBuf::try_from(path).ok()))
+        .or_else(|| dir().and_then(|path| AbsolutePathBuf::try_from(path).ok()))
         .map(|path| path.canonicalize().map(Into::into).unwrap_or(path))
 }
diff --git a/crates/nu-path/src/lib.rs b/crates/nu-path/src/lib.rs
index 524a6aed4e..cf31a5789f 100644
--- a/crates/nu-path/src/lib.rs
+++ b/crates/nu-path/src/lib.rs
@@ -11,7 +11,7 @@ mod trailing_slash;
 
 pub use components::components;
 pub use expansions::{canonicalize_with, expand_path_with, expand_to_real_path, locate_in_dirs};
-pub use helpers::{cache_dir, config_dir, data_dir, home_dir};
+pub use helpers::{cache_dir, data_dir, home_dir, nu_config_dir};
 pub use path::*;
 pub use tilde::expand_tilde;
 pub use trailing_slash::{has_trailing_slash, strip_trailing_slash};
diff --git a/crates/nu-protocol/src/config/history.rs b/crates/nu-protocol/src/config/history.rs
index 56418ae0a1..911a05ab16 100644
--- a/crates/nu-protocol/src/config/history.rs
+++ b/crates/nu-protocol/src/config/history.rs
@@ -9,6 +9,16 @@ pub enum HistoryFileFormat {
     Plaintext,
 }
 
+impl HistoryFileFormat {
+    pub fn default_file_name(self) -> std::path::PathBuf {
+        match self {
+            HistoryFileFormat::Plaintext => "history.txt",
+            HistoryFileFormat::Sqlite => "history.sqlite3",
+        }
+        .into()
+    }
+}
+
 impl FromStr for HistoryFileFormat {
     type Err = &'static str;
 
@@ -29,6 +39,15 @@ pub struct HistoryConfig {
     pub isolation: bool,
 }
 
+impl HistoryConfig {
+    pub fn file_path(&self) -> Option<std::path::PathBuf> {
+        nu_path::nu_config_dir().map(|mut history_path| {
+            history_path.push(self.file_format.default_file_name());
+            history_path.into()
+        })
+    }
+}
+
 impl Default for HistoryConfig {
     fn default() -> Self {
         Self {
diff --git a/crates/nu-protocol/src/eval_const.rs b/crates/nu-protocol/src/eval_const.rs
index 26750b867c..695c044a79 100644
--- a/crates/nu-protocol/src/eval_const.rs
+++ b/crates/nu-protocol/src/eval_const.rs
@@ -34,11 +34,8 @@ pub(crate) fn create_nu_constant(engine_state: &EngineState, span: Span) -> Valu
 
     let mut record = Record::new();
 
-    let config_path = match nu_path::config_dir() {
-        Some(mut path) => {
-            path.push("nushell");
-            Ok(canonicalize_path(engine_state, path.as_ref()))
-        }
+    let config_path = match nu_path::nu_config_dir() {
+        Some(path) => Ok(canonicalize_path(engine_state, path.as_ref())),
         None => Err(Value::error(
             ShellError::ConfigDirNotFound { span: Some(span) },
             span,
diff --git a/src/config_files.rs b/src/config_files.rs
index 1dd2a4b66d..7631a951bc 100644
--- a/src/config_files.rs
+++ b/src/config_files.rs
@@ -17,7 +17,6 @@ use std::{
     sync::Arc,
 };
 
-pub(crate) const NUSHELL_FOLDER: &str = "nushell";
 const CONFIG_FILE: &str = "config.nu";
 const ENV_FILE: &str = "env.nu";
 const LOGINSHELL_FILE: &str = "login.nu";
@@ -48,9 +47,7 @@ pub(crate) fn read_config_file(
                 report_shell_error(engine_state, &e);
             }
         }
-    } else if let Some(mut config_path) = nu_path::config_dir() {
-        config_path.push(NUSHELL_FOLDER);
-
+    } else if let Some(mut config_path) = nu_path::nu_config_dir() {
         // Create config directory if it does not exist
         if !config_path.exists() {
             if let Err(err) = std::fs::create_dir_all(&config_path) {
@@ -141,8 +138,7 @@ pub(crate) fn read_loginshell_file(engine_state: &mut EngineState, stack: &mut S
     );
 
     // read and execute loginshell file if exists
-    if let Some(mut config_path) = nu_path::config_dir() {
-        config_path.push(NUSHELL_FOLDER);
+    if let Some(mut config_path) = nu_path::nu_config_dir() {
         config_path.push(LOGINSHELL_FILE);
 
         warn!("loginshell_file: {}", config_path.display());
@@ -268,16 +264,11 @@ pub(crate) fn setup_config(
         &config_file, &env_file, is_login_shell
     );
 
-    let ask_to_create_config = if let Some(mut config_path) = nu_path::config_dir() {
-        config_path.push(NUSHELL_FOLDER);
-        !config_path.exists()
-    } else {
-        false
-    };
+    let ask_to_create_config = nu_path::nu_config_dir().map_or(false, |p| !p.exists());
 
     let result = catch_unwind(AssertUnwindSafe(|| {
         #[cfg(feature = "plugin")]
-        read_plugin_file(engine_state, plugin_file, NUSHELL_FOLDER);
+        read_plugin_file(engine_state, plugin_file);
 
         read_config_file(engine_state, stack, env_file, true, ask_to_create_config);
         read_config_file(
@@ -315,8 +306,7 @@ pub(crate) fn set_config_path(
     );
     let config_path = match config_file {
         Some(s) => canonicalize_with(&s.item, cwd).ok(),
-        None => nu_path::config_dir().map(|mut p| {
-            p.push(NUSHELL_FOLDER);
+        None => nu_path::nu_config_dir().map(|p| {
             let mut p = canonicalize_with(&p, cwd).unwrap_or(p.into());
             p.push(default_config_name);
             canonicalize_with(&p, cwd).unwrap_or(p)
diff --git a/src/main.rs b/src/main.rs
index 839c32b66a..b7c5a6a173 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -98,14 +98,7 @@ fn main() -> Result<()> {
     // Set default NU_LIB_DIRS and NU_PLUGIN_DIRS here before the env.nu is processed. If
     // the env.nu file exists, these values will be overwritten, if it does not exist, or
     // there is an error reading it, these values will be used.
-    let nushell_config_path = if let Some(mut path) = nu_path::config_dir() {
-        path.push("nushell");
-        path.into()
-    } else {
-        // Not really sure what to default this to if nu_path::config_dir() returns None
-        std::path::PathBuf::new()
-    };
-
+    let nushell_config_path: PathBuf = nu_path::nu_config_dir().map(Into::into).unwrap_or_default();
     if let Ok(xdg_config_home) = std::env::var("XDG_CONFIG_HOME") {
         if !xdg_config_home.is_empty() {
             if nushell_config_path
diff --git a/src/run.rs b/src/run.rs
index 16dbe0a5b6..84b5f7df4a 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -1,6 +1,6 @@
 use crate::{
     command,
-    config_files::{self, setup_config, NUSHELL_FOLDER},
+    config_files::{self, setup_config},
 };
 use log::trace;
 #[cfg(feature = "plugin")]
@@ -21,16 +21,11 @@ pub(crate) fn run_commands(
     entire_start_time: std::time::Instant,
 ) {
     trace!("run_commands");
-    let mut stack = Stack::new();
+
     let start_time = std::time::Instant::now();
+    let ask_to_create_config = nu_path::nu_config_dir().map_or(false, |p| !p.exists());
 
-    let ask_to_create_config = if let Some(mut config_path) = nu_path::config_dir() {
-        config_path.push(NUSHELL_FOLDER);
-        !config_path.exists()
-    } else {
-        false
-    };
-
+    let mut stack = Stack::new();
     if stack.has_env_var(engine_state, "NU_DISABLE_IR") {
         stack.use_ir = false;
     }
@@ -42,7 +37,7 @@ pub(crate) fn run_commands(
     // if the --no-config-file(-n) flag is passed, do not load plugin, env, or config files
     if parsed_nu_cli_args.no_config_file.is_none() {
         #[cfg(feature = "plugin")]
-        read_plugin_file(engine_state, parsed_nu_cli_args.plugin_file, NUSHELL_FOLDER);
+        read_plugin_file(engine_state, parsed_nu_cli_args.plugin_file);
 
         perf!("read plugins", start_time, use_color);
 
@@ -63,12 +58,7 @@ pub(crate) fn run_commands(
         perf!("read env.nu", start_time, use_color);
 
         let start_time = std::time::Instant::now();
-        let ask_to_create_config = if let Some(mut config_path) = nu_path::config_dir() {
-            config_path.push(config_files::NUSHELL_FOLDER);
-            !config_path.exists()
-        } else {
-            false
-        };
+        let ask_to_create_config = nu_path::nu_config_dir().map_or(false, |p| !p.exists());
 
         // If we have a config file parameter *OR* we have a login shell parameter, read the config file
         if parsed_nu_cli_args.config_file.is_some() || parsed_nu_cli_args.login_shell.is_some() {
@@ -140,14 +130,9 @@ pub(crate) fn run_file(
     // if the --no-config-file(-n) flag is passed, do not load plugin, env, or config files
     if parsed_nu_cli_args.no_config_file.is_none() {
         let start_time = std::time::Instant::now();
-        let ask_to_create_config = if let Some(mut config_path) = nu_path::config_dir() {
-            config_path.push(config_files::NUSHELL_FOLDER);
-            !config_path.exists()
-        } else {
-            false
-        };
+        let ask_to_create_config = nu_path::nu_config_dir().map_or(false, |p| !p.exists());
         #[cfg(feature = "plugin")]
-        read_plugin_file(engine_state, parsed_nu_cli_args.plugin_file, NUSHELL_FOLDER);
+        read_plugin_file(engine_state, parsed_nu_cli_args.plugin_file);
         perf!("read plugins", start_time, use_color);
 
         let start_time = std::time::Instant::now();
@@ -230,7 +215,6 @@ pub(crate) fn run_repl(
     let ret_val = evaluate_repl(
         engine_state,
         stack,
-        NUSHELL_FOLDER,
         parsed_nu_cli_args.execute,
         parsed_nu_cli_args.no_std_lib,
         entire_start_time,
diff --git a/tests/repl/test_config_path.rs b/tests/repl/test_config_path.rs
index 6bee043765..c812f3404c 100644
--- a/tests/repl/test_config_path.rs
+++ b/tests/repl/test_config_path.rs
@@ -140,8 +140,8 @@ fn test_config_path_helper(
 #[test]
 fn test_default_config_path() {
     Playground::setup("default_config_path", |_, playground| {
-        let config_dir = nu_path::config_dir().expect("Could not get config directory");
-        test_config_path_helper(playground, config_dir.join("nushell"));
+        let config_dir = nu_path::nu_config_dir().expect("Could not get config directory");
+        test_config_path_helper(playground, config_dir);
     });
 }
 

From df0a1748026be33244f770c38daed9c6b0b09d54 Mon Sep 17 00:00:00 2001
From: Solomon <git@solomonvictorino.com>
Date: Fri, 11 Oct 2024 12:53:39 +0000
Subject: [PATCH 0542/1072] fix unknown_command when parsing certain strings
 with equal signs (#14053)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

Prevents errors when `=` is used before the end of:

- strings in lists/records (with a symbol adjacent to the quotes)
- raw strings

```
> ["=a"]
Error: nu::parser::unknown_command

  × Unknown command.
   ╭─[entry #9:1:1]
 1 │ ["=a"]
   · ───┬──
   ·    ╰── unknown command
   ╰────
```

```
> r#'=a'#
Error: nu::parser::unknown_command

  × Unknown command.
   ╭─[entry #5:1:1]
 1 │ r#'=a'#
   · ───┬───
   ·    ╰── unknown command
   ╰────
```

Closes #13902, closes #13901, closes #9879, closes #6401, closes #5806

# User-Facing Changes

Variable names in environment shorthand assignments must satisfy
`is_identifier`.
---
 crates/nu-parser/src/parser.rs | 14 +++++++++----
 tests/repl/test_parser.rs      | 37 +++++++++++++++++++++++++++++++++-
 2 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 5a35c95e72..232fc50b3d 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -2943,6 +2943,10 @@ pub fn parse_string_strict(working_set: &mut StateWorkingSet, span: Span) -> Exp
             working_set.error(ParseError::Unclosed("\'".into(), span));
             return garbage(working_set, span);
         }
+        if bytes.starts_with(b"r#") && (bytes.len() == 1 || !bytes.ends_with(b"#")) {
+            working_set.error(ParseError::Unclosed("r#".into(), span));
+            return garbage(working_set, span);
+        }
     }
 
     let (bytes, quoted) = if (bytes.starts_with(b"\"") && bytes.ends_with(b"\"") && bytes.len() > 1)
@@ -5396,10 +5400,12 @@ pub fn parse_expression(working_set: &mut StateWorkingSet, spans: &[Span]) -> Ex
 
             let starting_error_count = working_set.parse_errors.len();
 
-            let lhs = parse_string_strict(
-                working_set,
-                Span::new(spans[pos].start, spans[pos].start + point - 1),
-            );
+            let lhs_span = Span::new(spans[pos].start, spans[pos].start + point - 1);
+            if !is_identifier(working_set.get_span_contents(lhs_span)) {
+                break;
+            }
+
+            let lhs = parse_string_strict(working_set, lhs_span);
             let rhs = if spans[pos].start + point < spans[pos].end {
                 let rhs_span = Span::new(spans[pos].start + point, spans[pos].end);
 
diff --git a/tests/repl/test_parser.rs b/tests/repl/test_parser.rs
index 8ccc15080a..f77d431110 100644
--- a/tests/repl/test_parser.rs
+++ b/tests/repl/test_parser.rs
@@ -176,7 +176,14 @@ fn bad_var_name() -> TestResult {
 
 #[test]
 fn bad_var_name2() -> TestResult {
-    fail_test(r#"let $foo-bar = 4"#, "valid variable")
+    fail_test(r#"let $foo-bar = 4"#, "valid variable")?;
+    fail_test(r#"foo-bar=4 true"#, "Command `foo-bar=4` not found")
+}
+
+#[test]
+fn bad_var_name3() -> TestResult {
+    fail_test(r#"let $=foo = 4"#, "valid variable")?;
+    fail_test(r#"=foo=4 true"#, "Command `=foo=4` not found")
 }
 
 #[test]
@@ -267,6 +274,34 @@ fn string_interp_with_equals() -> TestResult {
     )
 }
 
+#[test]
+fn raw_string_with_equals() -> TestResult {
+    run_test(
+        r#"let query_prefix = r#'https://api.github.com/search/issues?q=repo:nushell/'#; $query_prefix"#,
+        "https://api.github.com/search/issues?q=repo:nushell/",
+    )
+}
+
+#[test]
+fn list_quotes_with_equals() -> TestResult {
+    run_test(
+        r#"["https://api.github.com/search/issues?q=repo:nushell/"] | get 0"#,
+        "https://api.github.com/search/issues?q=repo:nushell/",
+    )
+}
+
+#[test]
+fn record_quotes_with_equals() -> TestResult {
+    run_test(r#"{"a=":b} | get a="#, "b")?;
+    run_test(r#"{"=a":b} | get =a"#, "b")?;
+
+    run_test(r#"{a:"=b"} | get a"#, "=b")?;
+    run_test(r#"{a:"b="} | get a"#, "b=")?;
+
+    run_test(r#"{a:b,"=c":d} | get =c"#, "d")?;
+    run_test(r#"{a:b,"c=":d} | get c="#, "d")
+}
+
 #[test]
 fn recursive_parse() -> TestResult {
     run_test(r#"def c [] { c }; echo done"#, "done")

From 02313e6819177cab4208bf89f3c77d3f961c8505 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Fri, 11 Oct 2024 11:14:58 -0400
Subject: [PATCH 0543/1072] Fix --header-row description (#14065)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

The help description on `transpose --header-row/-r` appears to be wrong
(and now that I understand that, it probably explains why it's confused
me for so long).

It currently says:

```
 -r, --header-row - treat the first row as column names
```

This just looks wrong - The first **row** of the input data is not
considered. It's the first **column** that is used to create the
header-row of the transposed table.

For example:

To record using `-dr`:

```nu
[[col-names         values ];
 [foo                  1   ]
 [bar                  5   ]
 [baz                  7   ]
 [cat                  -12 ]
] | transpose -dr

╭─────┬─────╮
│ foo │ 1   │
│ bar │ 5   │
│ baz │ 7   │
│ cat │ -12 │
╰─────┴─────╯
```

To table using `-r`:

```nu
[[col-names         values ];
 [foo                  1   ]
 [bar                  5   ]
 [baz                  7   ]
 [cat                  -12 ]
] | transpose -r

╭───┬─────┬─────┬─────┬─────╮
│ # │ foo │ bar │ baz │ cat │
├───┼─────┼─────┼─────┼─────┤
│ 0 │   1 │   5 │   7 │ -12 │
╰───┴─────┴─────┴─────┴─────╯
```

# User-Facing Changes

Updates the help description to:

```
-r, --header-row - use the first input column as the table header-row (or keynames when combined with --as-record)
```

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

N/A
---
 crates/nu-command/src/filters/transpose.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-command/src/filters/transpose.rs b/crates/nu-command/src/filters/transpose.rs
index 2ca6958199..c14a134076 100644
--- a/crates/nu-command/src/filters/transpose.rs
+++ b/crates/nu-command/src/filters/transpose.rs
@@ -25,7 +25,7 @@ impl Command for Transpose {
             ])
             .switch(
                 "header-row",
-                "treat the first row as column names",
+                "treat the first column as the header-row (column names)",
                 Some('r'),
             )
             .switch(

From fce6146576dda0cbce4f091317176bb8b67fed07 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Fri, 11 Oct 2024 09:40:32 -0700
Subject: [PATCH 0544/1072] Refactor config updates (#13802)

# Description
This PR standardizes updates to the config through a new
`UpdateFromValue` trait. For now, this trait is private in case we need
to make changes to it.

Note that this PR adds some additional `ShellError` cases to create
standard error messages for config errors. A follow-up PR will move
usages of the old error cases to these new ones. This PR also uses
`Type::custom` in lots of places (e.g., for string enums). Not sure if
this is something we want to encourage.

# User-Facing Changes
Should be none.
---
 crates/nu-cli/src/reedline_config.rs          | 414 +++++-----
 crates/nu-cmd-base/src/hook.rs                |  48 +-
 crates/nu-color-config/src/style_computer.rs  |  15 +-
 crates/nu-command/src/network/url/join.rs     |  12 +-
 crates/nu-protocol/src/config/completer.rs    |  83 --
 crates/nu-protocol/src/config/completions.rs  | 151 ++++
 .../nu-protocol/src/config/datetime_format.rs |  31 +
 .../nu-protocol/src/config/display_errors.rs  |  23 +
 crates/nu-protocol/src/config/error.rs        |  85 ++
 crates/nu-protocol/src/config/filesize.rs     |  23 +
 crates/nu-protocol/src/config/helper.rs       | 277 ++++---
 crates/nu-protocol/src/config/history.rs      |  35 +-
 crates/nu-protocol/src/config/hooks.rs        |  59 +-
 crates/nu-protocol/src/config/ls.rs           |  23 +
 crates/nu-protocol/src/config/mod.rs          | 731 +++---------------
 crates/nu-protocol/src/config/output.rs       |  10 +-
 crates/nu-protocol/src/config/plugin_gc.rs    | 164 ++--
 crates/nu-protocol/src/config/prelude.rs      |   3 +-
 crates/nu-protocol/src/config/reedline.rs     | 126 +--
 crates/nu-protocol/src/config/rm.rs           |  22 +
 .../src/config/shell_integration.rs           |  28 +
 crates/nu-protocol/src/config/table.rs        | 266 ++++---
 crates/nu-protocol/src/engine/stack.rs        |  13 +-
 crates/nu-protocol/src/errors/cli_error.rs    |  14 +-
 crates/nu-protocol/src/errors/config_error.rs |  56 ++
 crates/nu-protocol/src/errors/mod.rs          |   2 +
 crates/nu-protocol/src/errors/shell_error.rs  |  67 +-
 crates/nu-protocol/src/ty.rs                  |   4 +
 crates/nu-protocol/tests/into_config.rs       |  12 +-
 src/test_bins.rs                              |  17 +-
 tests/hooks/mod.rs                            |  12 +-
 tests/repl/test_config.rs                     |   4 +-
 32 files changed, 1343 insertions(+), 1487 deletions(-)
 delete mode 100644 crates/nu-protocol/src/config/completer.rs
 create mode 100644 crates/nu-protocol/src/config/completions.rs
 create mode 100644 crates/nu-protocol/src/config/error.rs
 create mode 100644 crates/nu-protocol/src/errors/config_error.rs

diff --git a/crates/nu-cli/src/reedline_config.rs b/crates/nu-cli/src/reedline_config.rs
index 48140b4427..80ae28b103 100644
--- a/crates/nu-cli/src/reedline_config.rs
+++ b/crates/nu-cli/src/reedline_config.rs
@@ -5,11 +5,10 @@ use nu_color_config::{color_record_to_nustyle, lookup_ansi_color_style};
 use nu_engine::eval_block;
 use nu_parser::parse;
 use nu_protocol::{
-    create_menus,
     debugger::WithoutDebug,
     engine::{EngineState, Stack, StateWorkingSet},
-    extract_value, Config, EditBindings, ParsedKeybinding, ParsedMenu, PipelineData, Record,
-    ShellError, Span, Value,
+    extract_value, Config, EditBindings, FromValue, ParsedKeybinding, ParsedMenu, PipelineData,
+    Record, ShellError, Span, Type, Value,
 };
 use reedline::{
     default_emacs_keybindings, default_vi_insert_keybindings, default_vi_normal_keybindings,
@@ -173,15 +172,13 @@ pub(crate) fn add_menus(
 
     for res in menu_eval_results.into_iter() {
         if let PipelineData::Value(value, None) = res {
-            for menu in create_menus(&value)? {
-                line_editor = add_menu(
-                    line_editor,
-                    &menu,
-                    new_engine_state_ref.clone(),
-                    stack,
-                    config.clone(),
-                )?;
-            }
+            line_editor = add_menu(
+                line_editor,
+                &ParsedMenu::from_value(value)?,
+                new_engine_state_ref.clone(),
+                stack,
+                config.clone(),
+            )?;
         }
     }
 
@@ -204,22 +201,22 @@ fn add_menu(
             "list" => add_list_menu(line_editor, menu, engine_state, stack, config),
             "ide" => add_ide_menu(line_editor, menu, engine_state, stack, config),
             "description" => add_description_menu(line_editor, menu, engine_state, stack, config),
-            _ => Err(ShellError::UnsupportedConfigValue {
-                expected: "columnar, list, ide or description".to_string(),
-                value: menu.r#type.to_abbreviated_string(&config),
-                span: menu.r#type.span(),
+            str => Err(ShellError::InvalidValue {
+                valid: "'columnar', 'list', 'ide', or 'description'".into(),
+                actual: format!("'{str}'"),
+                span,
             }),
         }
     } else {
-        Err(ShellError::UnsupportedConfigValue {
-            expected: "only record type".to_string(),
-            value: menu.r#type.to_abbreviated_string(&config),
-            span: menu.r#type.span(),
+        Err(ShellError::RuntimeTypeMismatch {
+            expected: Type::record(),
+            actual: menu.r#type.get_type(),
+            span,
         })
     }
 }
 
-fn get_style(record: &Record, name: &str, span: Span) -> Option<Style> {
+fn get_style(record: &Record, name: &'static str, span: Span) -> Option<Style> {
     extract_value(name, record, span)
         .ok()
         .map(|text| match text {
@@ -298,30 +295,23 @@ pub(crate) fn add_columnar_menu(
     let only_buffer_difference = menu.only_buffer_difference.as_bool()?;
     columnar_menu = columnar_menu.with_only_buffer_difference(only_buffer_difference);
 
-    let span = menu.source.span();
-    match &menu.source {
-        Value::Nothing { .. } => {
-            Ok(line_editor.with_menu(ReedlineMenu::EngineCompleter(Box::new(columnar_menu))))
-        }
-        Value::Closure { val, .. } => {
-            let menu_completer = NuMenuCompleter::new(
-                val.block_id,
-                span,
-                stack.captures_to_stack(val.captures.clone()),
-                engine_state,
-                only_buffer_difference,
-            );
-            Ok(line_editor.with_menu(ReedlineMenu::WithCompleter {
-                menu: Box::new(columnar_menu),
-                completer: Box::new(menu_completer),
-            }))
-        }
-        _ => Err(ShellError::UnsupportedConfigValue {
-            expected: "block or omitted value".to_string(),
-            value: menu.source.to_abbreviated_string(config),
+    let completer = if let Some(closure) = &menu.source {
+        let menu_completer = NuMenuCompleter::new(
+            closure.block_id,
             span,
-        }),
-    }
+            stack.captures_to_stack(closure.captures.clone()),
+            engine_state,
+            only_buffer_difference,
+        );
+        ReedlineMenu::WithCompleter {
+            menu: Box::new(columnar_menu),
+            completer: Box::new(menu_completer),
+        }
+    } else {
+        ReedlineMenu::EngineCompleter(Box::new(columnar_menu))
+    };
+
+    Ok(line_editor.with_menu(completer))
 }
 
 // Adds a search menu to the line editor
@@ -354,30 +344,23 @@ pub(crate) fn add_list_menu(
     let only_buffer_difference = menu.only_buffer_difference.as_bool()?;
     list_menu = list_menu.with_only_buffer_difference(only_buffer_difference);
 
-    let span = menu.source.span();
-    match &menu.source {
-        Value::Nothing { .. } => {
-            Ok(line_editor.with_menu(ReedlineMenu::HistoryMenu(Box::new(list_menu))))
+    let completer = if let Some(closure) = &menu.source {
+        let menu_completer = NuMenuCompleter::new(
+            closure.block_id,
+            span,
+            stack.captures_to_stack(closure.captures.clone()),
+            engine_state,
+            only_buffer_difference,
+        );
+        ReedlineMenu::WithCompleter {
+            menu: Box::new(list_menu),
+            completer: Box::new(menu_completer),
         }
-        Value::Closure { val, .. } => {
-            let menu_completer = NuMenuCompleter::new(
-                val.block_id,
-                span,
-                stack.captures_to_stack(val.captures.clone()),
-                engine_state,
-                only_buffer_difference,
-            );
-            Ok(line_editor.with_menu(ReedlineMenu::WithCompleter {
-                menu: Box::new(list_menu),
-                completer: Box::new(menu_completer),
-            }))
-        }
-        _ => Err(ShellError::UnsupportedConfigValue {
-            expected: "block or omitted value".to_string(),
-            value: menu.source.to_abbreviated_string(&config),
-            span: menu.source.span(),
-        }),
-    }
+    } else {
+        ReedlineMenu::HistoryMenu(Box::new(list_menu))
+    };
+
+    Ok(line_editor.with_menu(completer))
 }
 
 // Adds an IDE menu to the line editor
@@ -452,9 +435,9 @@ pub(crate) fn add_ide_menu(
                         vertical,
                     )
                 } else {
-                    return Err(ShellError::UnsupportedConfigValue {
-                        expected: "bool or record".to_string(),
-                        value: border.to_abbreviated_string(&config),
+                    return Err(ShellError::RuntimeTypeMismatch {
+                        expected: Type::custom("bool or record"),
+                        actual: border.get_type(),
                         span: border.span(),
                     });
                 }
@@ -475,10 +458,10 @@ pub(crate) fn add_ide_menu(
                 "left" => ide_menu.with_description_mode(DescriptionMode::Left),
                 "right" => ide_menu.with_description_mode(DescriptionMode::Right),
                 "prefer_right" => ide_menu.with_description_mode(DescriptionMode::PreferRight),
-                _ => {
-                    return Err(ShellError::UnsupportedConfigValue {
-                        expected: "\"left\", \"right\" or \"prefer_right\"".to_string(),
-                        value: description_mode.to_abbreviated_string(&config),
+                str => {
+                    return Err(ShellError::InvalidValue {
+                        valid: "'left', 'right', or 'prefer_right'".into(),
+                        actual: format!("'{str}'"),
                         span: description_mode.span(),
                     });
                 }
@@ -535,30 +518,23 @@ pub(crate) fn add_ide_menu(
     let only_buffer_difference = menu.only_buffer_difference.as_bool()?;
     ide_menu = ide_menu.with_only_buffer_difference(only_buffer_difference);
 
-    let span = menu.source.span();
-    match &menu.source {
-        Value::Nothing { .. } => {
-            Ok(line_editor.with_menu(ReedlineMenu::EngineCompleter(Box::new(ide_menu))))
-        }
-        Value::Closure { val, .. } => {
-            let menu_completer = NuMenuCompleter::new(
-                val.block_id,
-                span,
-                stack.captures_to_stack(val.captures.clone()),
-                engine_state,
-                only_buffer_difference,
-            );
-            Ok(line_editor.with_menu(ReedlineMenu::WithCompleter {
-                menu: Box::new(ide_menu),
-                completer: Box::new(menu_completer),
-            }))
-        }
-        _ => Err(ShellError::UnsupportedConfigValue {
-            expected: "block or omitted value".to_string(),
-            value: menu.source.to_abbreviated_string(&config),
+    let completer = if let Some(closure) = &menu.source {
+        let menu_completer = NuMenuCompleter::new(
+            closure.block_id,
             span,
-        }),
-    }
+            stack.captures_to_stack(closure.captures.clone()),
+            engine_state,
+            only_buffer_difference,
+        );
+        ReedlineMenu::WithCompleter {
+            menu: Box::new(ide_menu),
+            completer: Box::new(menu_completer),
+        }
+    } else {
+        ReedlineMenu::EngineCompleter(Box::new(ide_menu))
+    };
+
+    Ok(line_editor.with_menu(completer))
 }
 
 // Adds a description menu to the line editor
@@ -623,34 +599,27 @@ pub(crate) fn add_description_menu(
     let only_buffer_difference = menu.only_buffer_difference.as_bool()?;
     description_menu = description_menu.with_only_buffer_difference(only_buffer_difference);
 
-    let span = menu.source.span();
-    match &menu.source {
-        Value::Nothing { .. } => {
-            let completer = Box::new(NuHelpCompleter::new(engine_state, config));
-            Ok(line_editor.with_menu(ReedlineMenu::WithCompleter {
-                menu: Box::new(description_menu),
-                completer,
-            }))
+    let completer = if let Some(closure) = &menu.source {
+        let menu_completer = NuMenuCompleter::new(
+            closure.block_id,
+            span,
+            stack.captures_to_stack(closure.captures.clone()),
+            engine_state,
+            only_buffer_difference,
+        );
+        ReedlineMenu::WithCompleter {
+            menu: Box::new(description_menu),
+            completer: Box::new(menu_completer),
         }
-        Value::Closure { val, .. } => {
-            let menu_completer = NuMenuCompleter::new(
-                val.block_id,
-                span,
-                stack.captures_to_stack(val.captures.clone()),
-                engine_state,
-                only_buffer_difference,
-            );
-            Ok(line_editor.with_menu(ReedlineMenu::WithCompleter {
-                menu: Box::new(description_menu),
-                completer: Box::new(menu_completer),
-            }))
+    } else {
+        let menu_completer = NuHelpCompleter::new(engine_state, config);
+        ReedlineMenu::WithCompleter {
+            menu: Box::new(description_menu),
+            completer: Box::new(menu_completer),
         }
-        _ => Err(ShellError::UnsupportedConfigValue {
-            expected: "closure or omitted value".to_string(),
-            value: menu.source.to_abbreviated_string(&config),
-            span: menu.source.span(),
-        }),
-    }
+    };
+
+    Ok(line_editor.with_menu(completer))
 }
 
 fn add_menu_keybindings(keybindings: &mut Keybindings) {
@@ -774,9 +743,9 @@ fn add_keybinding(
             "emacs" => add_parsed_keybinding(emacs_keybindings, keybinding, config),
             "vi_insert" => add_parsed_keybinding(insert_keybindings, keybinding, config),
             "vi_normal" => add_parsed_keybinding(normal_keybindings, keybinding, config),
-            m => Err(ShellError::UnsupportedConfigValue {
-                expected: "emacs, vi_insert or vi_normal".to_string(),
-                value: m.to_string(),
+            str => Err(ShellError::InvalidValue {
+                valid: "'emacs', 'vi_insert', or 'vi_normal'".into(),
+                actual: format!("'{str}'"),
                 span,
             }),
         },
@@ -794,9 +763,9 @@ fn add_keybinding(
 
             Ok(())
         }
-        v => Err(ShellError::UnsupportedConfigValue {
-            expected: "string or list of strings".to_string(),
-            value: v.to_abbreviated_string(config),
+        v => Err(ShellError::RuntimeTypeMismatch {
+            expected: Type::custom("string or list<string>"),
+            actual: v.get_type(),
             span: v.span(),
         }),
     }
@@ -807,14 +776,17 @@ fn add_parsed_keybinding(
     keybinding: &ParsedKeybinding,
     config: &Config,
 ) -> Result<(), ShellError> {
-    let modifier_string = keybinding
-        .modifier
-        .to_expanded_string("", config)
-        .to_ascii_lowercase();
+    let Ok(modifier_str) = keybinding.modifier.as_str().map(str::to_ascii_lowercase) else {
+        return Err(ShellError::RuntimeTypeMismatch {
+            expected: Type::String,
+            actual: keybinding.modifier.get_type(),
+            span: keybinding.modifier.span(),
+        });
+    };
 
     let mut modifier = KeyModifiers::NONE;
-    if modifier_string != "none" {
-        for part in modifier_string.split('_') {
+    if modifier_str != "none" {
+        for part in modifier_str.split('_') {
             match part {
                 "control" => modifier |= KeyModifiers::CONTROL,
                 "shift" => modifier |= KeyModifiers::SHIFT,
@@ -822,26 +794,30 @@ fn add_parsed_keybinding(
                 "super" => modifier |= KeyModifiers::SUPER,
                 "hyper" => modifier |= KeyModifiers::HYPER,
                 "meta" => modifier |= KeyModifiers::META,
-                _ => {
-                    return Err(ShellError::UnsupportedConfigValue {
-                        expected: "CONTROL, SHIFT, ALT, SUPER, HYPER, META or NONE".to_string(),
-                        value: keybinding.modifier.to_abbreviated_string(config),
+                str => {
+                    return Err(ShellError::InvalidValue {
+                        valid: "'control', 'shift', 'alt', 'super', 'hyper', 'meta', or 'none'"
+                            .into(),
+                        actual: format!("'{str}'"),
                         span: keybinding.modifier.span(),
-                    })
+                    });
                 }
             }
         }
+    }
+
+    let Ok(keycode) = keybinding.keycode.as_str() else {
+        return Err(ShellError::RuntimeTypeMismatch {
+            expected: Type::String,
+            actual: keybinding.keycode.get_type(),
+            span: keybinding.keycode.span(),
+        });
     };
 
-    let keycode_str = keybinding
-        .keycode
-        .to_expanded_string("", config)
-        .to_ascii_lowercase();
-
-    let keycode = if let Some(rest) = keycode_str.strip_prefix("char_") {
-        let error = |exp: &str, value| ShellError::UnsupportedConfigValue {
-            expected: exp.to_string(),
-            value,
+    let keycode = if let Some(rest) = keycode.strip_prefix("char_") {
+        let error = |valid: &str, actual: &str| ShellError::InvalidValue {
+            valid: valid.into(),
+            actual: actual.into(),
             span: keybinding.keycode.span(),
         };
 
@@ -851,22 +827,17 @@ fn add_parsed_keybinding(
             (Some('u'), Some(_)) => {
                 // This will never panic as we know there are at least two symbols
                 let Ok(code_point) = u32::from_str_radix(&rest[1..], 16) else {
-                    return Err(error("valid hex code in keycode", keycode_str));
+                    return Err(error("a valid hex code", keycode));
                 };
 
-                char::from_u32(code_point).ok_or(error("valid Unicode code point", keycode_str))?
-            }
-            _ => {
-                return Err(error(
-                    "format 'char_<char>' or 'char_u<hex code>'",
-                    keycode_str,
-                ))
+                char::from_u32(code_point).ok_or(error("a valid Unicode code point", keycode))?
             }
+            _ => return Err(error("'char_<char>' or 'char_u<hex code>'", keycode)),
         };
 
         KeyCode::Char(char)
     } else {
-        match keycode_str.as_str() {
+        match keycode {
             "backspace" => KeyCode::Backspace,
             "enter" => KeyCode::Enter,
             "space" => KeyCode::Char(' '),
@@ -882,29 +853,28 @@ fn add_parsed_keybinding(
             "backtab" => KeyCode::BackTab,
             "delete" => KeyCode::Delete,
             "insert" => KeyCode::Insert,
-            c if c.starts_with('f') => {
-                let fn_num: u8 = c[1..]
-                    .parse()
-                    .ok()
-                    .filter(|num| matches!(num, 1..=20))
-                    .ok_or(ShellError::UnsupportedConfigValue {
-                        expected: "(f1|f2|...|f20)".to_string(),
-                        value: format!("unknown function key: {c}"),
-                        span: keybinding.keycode.span(),
-                    })?;
-                KeyCode::F(fn_num)
-            }
+            c if c.starts_with('f') => c[1..]
+                .parse()
+                .ok()
+                .filter(|num| (1..=20).contains(num))
+                .map(KeyCode::F)
+                .ok_or(ShellError::InvalidValue {
+                    valid: "'f1', 'f2', ..., or 'f20'".into(),
+                    actual: format!("'{c}'"),
+                    span: keybinding.keycode.span(),
+                })?,
             "null" => KeyCode::Null,
             "esc" | "escape" => KeyCode::Esc,
-            _ => {
-                return Err(ShellError::UnsupportedConfigValue {
-                    expected: "crossterm KeyCode".to_string(),
-                    value: keybinding.keycode.to_abbreviated_string(config),
+            str => {
+                return Err(ShellError::InvalidValue {
+                    valid: "a crossterm KeyCode".into(),
+                    actual: format!("'{str}'"),
                     span: keybinding.keycode.span(),
-                })
+                });
             }
         }
     };
+
     if let Some(event) = parse_event(&keybinding.event, config)? {
         keybindings.add_binding(modifier, keycode, event);
     } else {
@@ -926,8 +896,8 @@ impl<'config> EventType<'config> {
             .map(Self::Send)
             .or_else(|_| extract_value("edit", record, span).map(Self::Edit))
             .or_else(|_| extract_value("until", record, span).map(Self::Until))
-            .map_err(|_| ShellError::MissingConfigValue {
-                missing_value: "send, edit or until".to_string(),
+            .map_err(|_| ShellError::MissingRequiredColumn {
+                column: "'send', 'edit', or 'until'",
                 span,
             })
     }
@@ -965,9 +935,9 @@ fn parse_event(value: &Value, config: &Config) -> Result<Option<ReedlineEvent>,
                         .iter()
                         .map(|value| match parse_event(value, config) {
                             Ok(inner) => match inner {
-                                None => Err(ShellError::UnsupportedConfigValue {
-                                    expected: "List containing valid events".to_string(),
-                                    value: "Nothing value (null)".to_string(),
+                                None => Err(ShellError::RuntimeTypeMismatch {
+                                    expected: Type::custom("record or table"),
+                                    actual: value.get_type(),
                                     span: value.span(),
                                 }),
                                 Some(event) => Ok(event),
@@ -978,9 +948,9 @@ fn parse_event(value: &Value, config: &Config) -> Result<Option<ReedlineEvent>,
 
                     Ok(Some(ReedlineEvent::UntilFound(events)))
                 }
-                v => Err(ShellError::UnsupportedConfigValue {
-                    expected: "list of events".to_string(),
-                    value: v.to_abbreviated_string(config),
+                v => Err(ShellError::RuntimeTypeMismatch {
+                    expected: Type::list(Type::Any),
+                    actual: v.get_type(),
                     span: v.span(),
                 }),
             },
@@ -990,9 +960,9 @@ fn parse_event(value: &Value, config: &Config) -> Result<Option<ReedlineEvent>,
                 .iter()
                 .map(|value| match parse_event(value, config) {
                     Ok(inner) => match inner {
-                        None => Err(ShellError::UnsupportedConfigValue {
-                            expected: "List containing valid events".to_string(),
-                            value: "Nothing value (null)".to_string(),
+                        None => Err(ShellError::RuntimeTypeMismatch {
+                            expected: Type::custom("record or table"),
+                            actual: value.get_type(),
                             span: value.span(),
                         }),
                         Some(event) => Ok(event),
@@ -1004,9 +974,9 @@ fn parse_event(value: &Value, config: &Config) -> Result<Option<ReedlineEvent>,
             Ok(Some(ReedlineEvent::Multiple(events)))
         }
         Value::Nothing { .. } => Ok(None),
-        v => Err(ShellError::UnsupportedConfigValue {
-            expected: "record or list of records, null to unbind key".to_string(),
-            value: v.to_abbreviated_string(config),
+        v => Err(ShellError::RuntimeTypeMismatch {
+            expected: Type::custom("record, table, or nothing"),
+            actual: v.get_type(),
             span: v.span(),
         }),
     }
@@ -1055,12 +1025,12 @@ fn event_from_record(
             let cmd = extract_value("cmd", record, span)?;
             ReedlineEvent::ExecuteHostCommand(cmd.to_expanded_string("", config))
         }
-        v => {
-            return Err(ShellError::UnsupportedConfigValue {
-                expected: "Reedline event".to_string(),
-                value: v.to_string(),
+        str => {
+            return Err(ShellError::InvalidValue {
+                valid: "a reedline event".into(),
+                actual: format!("'{str}'"),
                 span,
-            })
+            });
         }
     };
 
@@ -1153,7 +1123,7 @@ fn edit_from_record(
         }
         "insertchar" => {
             let value = extract_value("value", record, span)?;
-            let char = extract_char(value, config)?;
+            let char = extract_char(value)?;
             EditCommand::InsertChar(char)
         }
         "insertstring" => {
@@ -1190,17 +1160,17 @@ fn edit_from_record(
         "redo" => EditCommand::Redo,
         "cutrightuntil" => {
             let value = extract_value("value", record, span)?;
-            let char = extract_char(value, config)?;
+            let char = extract_char(value)?;
             EditCommand::CutRightUntil(char)
         }
         "cutrightbefore" => {
             let value = extract_value("value", record, span)?;
-            let char = extract_char(value, config)?;
+            let char = extract_char(value)?;
             EditCommand::CutRightBefore(char)
         }
         "moverightuntil" => {
             let value = extract_value("value", record, span)?;
-            let char = extract_char(value, config)?;
+            let char = extract_char(value)?;
             let select = extract_value("select", record, span)
                 .and_then(|value| value.as_bool())
                 .unwrap_or(false);
@@ -1208,7 +1178,7 @@ fn edit_from_record(
         }
         "moverightbefore" => {
             let value = extract_value("value", record, span)?;
-            let char = extract_char(value, config)?;
+            let char = extract_char(value)?;
             let select = extract_value("select", record, span)
                 .and_then(|value| value.as_bool())
                 .unwrap_or(false);
@@ -1216,17 +1186,17 @@ fn edit_from_record(
         }
         "cutleftuntil" => {
             let value = extract_value("value", record, span)?;
-            let char = extract_char(value, config)?;
+            let char = extract_char(value)?;
             EditCommand::CutLeftUntil(char)
         }
         "cutleftbefore" => {
             let value = extract_value("value", record, span)?;
-            let char = extract_char(value, config)?;
+            let char = extract_char(value)?;
             EditCommand::CutLeftBefore(char)
         }
         "moveleftuntil" => {
             let value = extract_value("value", record, span)?;
-            let char = extract_char(value, config)?;
+            let char = extract_char(value)?;
             let select = extract_value("select", record, span)
                 .and_then(|value| value.as_bool())
                 .unwrap_or(false);
@@ -1234,7 +1204,7 @@ fn edit_from_record(
         }
         "moveleftbefore" => {
             let value = extract_value("value", record, span)?;
-            let char = extract_char(value, config)?;
+            let char = extract_char(value)?;
             let select = extract_value("select", record, span)
                 .and_then(|value| value.as_bool())
                 .unwrap_or(false);
@@ -1251,28 +1221,36 @@ fn edit_from_record(
         #[cfg(feature = "system-clipboard")]
         "pastesystem" => EditCommand::PasteSystem,
         "selectall" => EditCommand::SelectAll,
-        e => {
-            return Err(ShellError::UnsupportedConfigValue {
-                expected: "reedline EditCommand".to_string(),
-                value: e.to_string(),
+        str => {
+            return Err(ShellError::InvalidValue {
+                valid: "a reedline EditCommand".into(),
+                actual: format!("'{str}'"),
                 span,
-            })
+            });
         }
     };
 
     Ok(edit)
 }
 
-fn extract_char(value: &Value, config: &Config) -> Result<char, ShellError> {
-    let span = value.span();
-    value
-        .to_expanded_string("", config)
-        .chars()
-        .next()
-        .ok_or_else(|| ShellError::MissingConfigValue {
-            missing_value: "char to insert".to_string(),
-            span,
+fn extract_char(value: &Value) -> Result<char, ShellError> {
+    if let Ok(str) = value.as_str() {
+        let mut chars = str.chars();
+        match (chars.next(), chars.next()) {
+            (Some(c), None) => Ok(c),
+            _ => Err(ShellError::InvalidValue {
+                valid: "a single character".into(),
+                actual: format!("'{str}'"),
+                span: value.span(),
+            }),
+        }
+    } else {
+        Err(ShellError::RuntimeTypeMismatch {
+            expected: Type::String,
+            actual: value.get_type(),
+            span: value.span(),
         })
+    }
 }
 
 #[cfg(test)]
@@ -1401,7 +1379,7 @@ mod test {
 
         let span = Span::test_data();
         let b = EventType::try_from_record(&event, span);
-        assert!(matches!(b, Err(ShellError::MissingConfigValue { .. })));
+        assert!(matches!(b, Err(ShellError::MissingRequiredColumn { .. })));
     }
 
     #[test]
diff --git a/crates/nu-cmd-base/src/hook.rs b/crates/nu-cmd-base/src/hook.rs
index e9637d16ad..4983dbdc8f 100644
--- a/crates/nu-cmd-base/src/hook.rs
+++ b/crates/nu-cmd-base/src/hook.rs
@@ -86,11 +86,12 @@ pub fn eval_hook(
                 );
                 if let Some(err) = working_set.parse_errors.first() {
                     report_parse_error(&working_set, err);
-
-                    return Err(ShellError::UnsupportedConfigValue {
-                        expected: "valid source code".into(),
-                        value: "source code with syntax errors".into(),
-                        span,
+                    return Err(ShellError::GenericError {
+                        error: format!("Failed to run {hook_name} hook"),
+                        msg: "source code has errors".into(),
+                        span: Some(span),
+                        help: None,
+                        inner: Vec::new(),
                     });
                 }
 
@@ -161,10 +162,10 @@ pub fn eval_hook(
                             {
                                 val
                             } else {
-                                return Err(ShellError::UnsupportedConfigValue {
-                                    expected: "boolean output".to_string(),
-                                    value: "other PipelineData variant".to_string(),
-                                    span: other_span,
+                                return Err(ShellError::RuntimeTypeMismatch {
+                                    expected: Type::Bool,
+                                    actual: pipeline_data.get_type(),
+                                    span: pipeline_data.span().unwrap_or(other_span),
                                 });
                             }
                         }
@@ -173,9 +174,9 @@ pub fn eval_hook(
                         }
                     }
                 } else {
-                    return Err(ShellError::UnsupportedConfigValue {
-                        expected: "block".to_string(),
-                        value: format!("{}", condition.get_type()),
+                    return Err(ShellError::RuntimeTypeMismatch {
+                        expected: Type::Closure,
+                        actual: condition.get_type(),
                         span: other_span,
                     });
                 }
@@ -218,11 +219,12 @@ pub fn eval_hook(
                             );
                             if let Some(err) = working_set.parse_errors.first() {
                                 report_parse_error(&working_set, err);
-
-                                return Err(ShellError::UnsupportedConfigValue {
-                                    expected: "valid source code".into(),
-                                    value: "source code with syntax errors".into(),
-                                    span: source_span,
+                                return Err(ShellError::GenericError {
+                                    error: format!("Failed to run {hook_name} hook"),
+                                    msg: "source code has errors".into(),
+                                    span: Some(span),
+                                    help: None,
+                                    inner: Vec::new(),
                                 });
                             }
 
@@ -257,9 +259,9 @@ pub fn eval_hook(
                         run_hook(engine_state, stack, val, input, arguments, source_span)?;
                     }
                     other => {
-                        return Err(ShellError::UnsupportedConfigValue {
-                            expected: "block or string".to_string(),
-                            value: format!("{}", other.get_type()),
+                        return Err(ShellError::RuntimeTypeMismatch {
+                            expected: Type::custom("string or closure"),
+                            actual: other.get_type(),
                             span: source_span,
                         });
                     }
@@ -270,9 +272,9 @@ pub fn eval_hook(
             output = run_hook(engine_state, stack, val, input, arguments, span)?;
         }
         other => {
-            return Err(ShellError::UnsupportedConfigValue {
-                expected: "string, block, record, or list of commands".into(),
-                value: format!("{}", other.get_type()),
+            return Err(ShellError::RuntimeTypeMismatch {
+                expected: Type::custom("string, closure, record, or list"),
+                actual: other.get_type(),
                 span: other.span(),
             });
         }
diff --git a/crates/nu-color-config/src/style_computer.rs b/crates/nu-color-config/src/style_computer.rs
index edc8786a53..660156fe26 100644
--- a/crates/nu-color-config/src/style_computer.rs
+++ b/crates/nu-color-config/src/style_computer.rs
@@ -2,9 +2,8 @@ use crate::{color_record_to_nustyle, lookup_ansi_color_style, text_style::Alignm
 use nu_ansi_term::{Color, Style};
 use nu_engine::ClosureEvalOnce;
 use nu_protocol::{
-    cli_error::CliError,
-    engine::{Closure, EngineState, Stack, StateWorkingSet},
-    Span, Value,
+    engine::{Closure, EngineState, Stack},
+    report_shell_error, Span, Value,
 };
 use std::{
     collections::HashMap,
@@ -70,14 +69,8 @@ impl<'a> StyleComputer<'a> {
                             _ => Style::default(),
                         }
                     }
-                    // This is basically a copy of nu_cli::report_error(), but that isn't usable due to
-                    // dependencies. While crudely spitting out a bunch of errors like this is not ideal,
-                    // currently hook closure errors behave roughly the same.
-                    Err(e) => {
-                        eprintln!(
-                            "Error: {:?}",
-                            CliError(&e, &StateWorkingSet::new(self.engine_state))
-                        );
+                    Err(err) => {
+                        report_shell_error(self.engine_state, &err);
                         Style::default()
                     }
                 }
diff --git a/crates/nu-command/src/network/url/join.rs b/crates/nu-command/src/network/url/join.rs
index 82f9e21914..9be5de38e6 100644
--- a/crates/nu-command/src/network/url/join.rs
+++ b/crates/nu-command/src/network/url/join.rs
@@ -300,14 +300,14 @@ impl UrlComponents {
             return Ok(true);
         }
         match key {
-            "host" => Err(ShellError::UnsupportedConfigValue {
-                expected: "non-empty string".into(),
-                value: "empty string".into(),
+            "host" => Err(ShellError::InvalidValue {
+                valid: "a non-empty string".into(),
+                actual: format!("'{s}'"),
                 span: value_span,
             }),
-            "scheme" => Err(ShellError::UnsupportedConfigValue {
-                expected: "non-empty string".into(),
-                value: "empty string".into(),
+            "scheme" => Err(ShellError::InvalidValue {
+                valid: "a non-empty string".into(),
+                actual: format!("'{s}'"),
                 span: value_span,
             }),
             _ => Ok(false),
diff --git a/crates/nu-protocol/src/config/completer.rs b/crates/nu-protocol/src/config/completer.rs
deleted file mode 100644
index 1494c375a6..0000000000
--- a/crates/nu-protocol/src/config/completer.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-use super::prelude::*;
-use crate as nu_protocol;
-use crate::engine::Closure;
-
-#[derive(Clone, Copy, Debug, Default, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
-pub enum CompletionAlgorithm {
-    #[default]
-    Prefix,
-    Fuzzy,
-}
-
-impl FromStr for CompletionAlgorithm {
-    type Err = &'static str;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s.to_ascii_lowercase().as_str() {
-            "prefix" => Ok(Self::Prefix),
-            "fuzzy" => Ok(Self::Fuzzy),
-            _ => Err("expected either 'prefix' or 'fuzzy'"),
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug, Default, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
-pub enum CompletionSort {
-    #[default]
-    Smart,
-    Alphabetical,
-}
-
-impl FromStr for CompletionSort {
-    type Err = &'static str;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s.to_ascii_lowercase().as_str() {
-            "smart" => Ok(Self::Smart),
-            "alphabetical" => Ok(Self::Alphabetical),
-            _ => Err("expected either 'smart' or 'alphabetical'"),
-        }
-    }
-}
-
-#[derive(Clone, Debug, IntoValue, Serialize, Deserialize)]
-pub struct ExternalCompleterConfig {
-    pub enable: bool,
-    pub max_results: i64,
-    pub completer: Option<Closure>,
-}
-
-impl Default for ExternalCompleterConfig {
-    fn default() -> Self {
-        Self {
-            enable: true,
-            max_results: 100,
-            completer: None,
-        }
-    }
-}
-
-#[derive(Clone, Debug, IntoValue, Serialize, Deserialize)]
-pub struct CompleterConfig {
-    pub sort: CompletionSort,
-    pub case_sensitive: bool,
-    pub quick: bool,
-    pub partial: bool,
-    pub algorithm: CompletionAlgorithm,
-    pub external: ExternalCompleterConfig,
-    pub use_ls_colors: bool,
-}
-
-impl Default for CompleterConfig {
-    fn default() -> Self {
-        Self {
-            sort: CompletionSort::default(),
-            case_sensitive: false,
-            quick: true,
-            partial: true,
-            algorithm: CompletionAlgorithm::default(),
-            external: ExternalCompleterConfig::default(),
-            use_ls_colors: true,
-        }
-    }
-}
diff --git a/crates/nu-protocol/src/config/completions.rs b/crates/nu-protocol/src/config/completions.rs
new file mode 100644
index 0000000000..74c4567d17
--- /dev/null
+++ b/crates/nu-protocol/src/config/completions.rs
@@ -0,0 +1,151 @@
+use super::{config_update_string_enum, prelude::*};
+use crate as nu_protocol;
+use crate::engine::Closure;
+
+#[derive(Clone, Copy, Debug, Default, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CompletionAlgorithm {
+    #[default]
+    Prefix,
+    Fuzzy,
+}
+
+impl FromStr for CompletionAlgorithm {
+    type Err = &'static str;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s.to_ascii_lowercase().as_str() {
+            "prefix" => Ok(Self::Prefix),
+            "fuzzy" => Ok(Self::Fuzzy),
+            _ => Err("'prefix' or 'fuzzy'"),
+        }
+    }
+}
+
+impl UpdateFromValue for CompletionAlgorithm {
+    fn update(&mut self, value: &Value, path: &mut ConfigPath, errors: &mut ConfigErrors) {
+        config_update_string_enum(self, value, path, errors)
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CompletionSort {
+    #[default]
+    Smart,
+    Alphabetical,
+}
+
+impl FromStr for CompletionSort {
+    type Err = &'static str;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s.to_ascii_lowercase().as_str() {
+            "smart" => Ok(Self::Smart),
+            "alphabetical" => Ok(Self::Alphabetical),
+            _ => Err("'smart' or 'alphabetical'"),
+        }
+    }
+}
+
+impl UpdateFromValue for CompletionSort {
+    fn update(&mut self, value: &Value, path: &mut ConfigPath, errors: &mut ConfigErrors) {
+        config_update_string_enum(self, value, path, errors)
+    }
+}
+
+#[derive(Clone, Debug, IntoValue, Serialize, Deserialize)]
+pub struct ExternalCompleterConfig {
+    pub enable: bool,
+    pub max_results: i64,
+    pub completer: Option<Closure>,
+}
+
+impl Default for ExternalCompleterConfig {
+    fn default() -> Self {
+        Self {
+            enable: true,
+            max_results: 100,
+            completer: None,
+        }
+    }
+}
+
+impl UpdateFromValue for ExternalCompleterConfig {
+    fn update<'a>(
+        &mut self,
+        value: &'a Value,
+        path: &mut ConfigPath<'a>,
+        errors: &mut ConfigErrors,
+    ) {
+        let Value::Record { val: record, .. } = value else {
+            errors.type_mismatch(path, Type::record(), value);
+            return;
+        };
+
+        for (col, val) in record.iter() {
+            let path = &mut path.push(col);
+            match col.as_str() {
+                "completer" => match val {
+                    Value::Nothing { .. } => self.completer = None,
+                    Value::Closure { val, .. } => self.completer = Some(val.as_ref().clone()),
+                    _ => errors.type_mismatch(path, Type::custom("closure or nothing"), val),
+                },
+                "max_results" => self.max_results.update(val, path, errors),
+                "enable" => self.enable.update(val, path, errors),
+                _ => errors.unknown_option(path, val),
+            }
+        }
+    }
+}
+
+#[derive(Clone, Debug, IntoValue, Serialize, Deserialize)]
+pub struct CompletionConfig {
+    pub sort: CompletionSort,
+    pub case_sensitive: bool,
+    pub quick: bool,
+    pub partial: bool,
+    pub algorithm: CompletionAlgorithm,
+    pub external: ExternalCompleterConfig,
+    pub use_ls_colors: bool,
+}
+
+impl Default for CompletionConfig {
+    fn default() -> Self {
+        Self {
+            sort: CompletionSort::default(),
+            case_sensitive: false,
+            quick: true,
+            partial: true,
+            algorithm: CompletionAlgorithm::default(),
+            external: ExternalCompleterConfig::default(),
+            use_ls_colors: true,
+        }
+    }
+}
+
+impl UpdateFromValue for CompletionConfig {
+    fn update<'a>(
+        &mut self,
+        value: &'a Value,
+        path: &mut ConfigPath<'a>,
+        errors: &mut ConfigErrors,
+    ) {
+        let Value::Record { val: record, .. } = value else {
+            errors.type_mismatch(path, Type::record(), value);
+            return;
+        };
+
+        for (col, val) in record.iter() {
+            let path = &mut path.push(col);
+            match col.as_str() {
+                "sort" => self.sort.update(val, path, errors),
+                "quick" => self.quick.update(val, path, errors),
+                "partial" => self.partial.update(val, path, errors),
+                "algorithm" => self.algorithm.update(val, path, errors),
+                "case_sensitive" => self.case_sensitive.update(val, path, errors),
+                "external" => self.external.update(val, path, errors),
+                "use_ls_colors" => self.use_ls_colors.update(val, path, errors),
+                _ => errors.unknown_option(path, val),
+            }
+        }
+    }
+}
diff --git a/crates/nu-protocol/src/config/datetime_format.rs b/crates/nu-protocol/src/config/datetime_format.rs
index 1157302c8a..228e9e2214 100644
--- a/crates/nu-protocol/src/config/datetime_format.rs
+++ b/crates/nu-protocol/src/config/datetime_format.rs
@@ -6,3 +6,34 @@ pub struct DatetimeFormatConfig {
     pub normal: Option<String>,
     pub table: Option<String>,
 }
+
+impl UpdateFromValue for DatetimeFormatConfig {
+    fn update<'a>(
+        &mut self,
+        value: &'a Value,
+        path: &mut ConfigPath<'a>,
+        errors: &mut ConfigErrors,
+    ) {
+        let Value::Record { val: record, .. } = value else {
+            errors.type_mismatch(path, Type::record(), value);
+            return;
+        };
+
+        for (col, val) in record.iter() {
+            let path = &mut path.push(col);
+            match col.as_str() {
+                "normal" => match val {
+                    Value::Nothing { .. } => self.normal = None,
+                    Value::String { val, .. } => self.normal = Some(val.clone()),
+                    _ => errors.type_mismatch(path, Type::custom("string or nothing"), val),
+                },
+                "table" => match val {
+                    Value::Nothing { .. } => self.table = None,
+                    Value::String { val, .. } => self.table = Some(val.clone()),
+                    _ => errors.type_mismatch(path, Type::custom("string or nothing"), val),
+                },
+                _ => errors.unknown_option(path, val),
+            }
+        }
+    }
+}
diff --git a/crates/nu-protocol/src/config/display_errors.rs b/crates/nu-protocol/src/config/display_errors.rs
index 6dbad874d2..82b7a56415 100644
--- a/crates/nu-protocol/src/config/display_errors.rs
+++ b/crates/nu-protocol/src/config/display_errors.rs
@@ -27,3 +27,26 @@ impl Default for DisplayErrors {
         }
     }
 }
+
+impl UpdateFromValue for DisplayErrors {
+    fn update<'a>(
+        &mut self,
+        value: &'a Value,
+        path: &mut ConfigPath<'a>,
+        errors: &mut ConfigErrors,
+    ) {
+        let Value::Record { val: record, .. } = value else {
+            errors.type_mismatch(path, Type::record(), value);
+            return;
+        };
+
+        for (col, val) in record.iter() {
+            let path = &mut path.push(col);
+            match col.as_str() {
+                "exit_code" => self.exit_code.update(val, path, errors),
+                "termination_signal" => self.termination_signal.update(val, path, errors),
+                _ => errors.unknown_option(path, val),
+            }
+        }
+    }
+}
diff --git a/crates/nu-protocol/src/config/error.rs b/crates/nu-protocol/src/config/error.rs
new file mode 100644
index 0000000000..b13dceeb02
--- /dev/null
+++ b/crates/nu-protocol/src/config/error.rs
@@ -0,0 +1,85 @@
+use super::ConfigPath;
+use crate::{Config, ConfigError, ShellError, Span, Type, Value};
+
+#[derive(Debug)]
+pub(super) struct ConfigErrors<'a> {
+    config: &'a Config,
+    errors: Vec<ConfigError>,
+}
+
+impl<'a> ConfigErrors<'a> {
+    pub fn new(config: &'a Config) -> Self {
+        Self {
+            config,
+            errors: Vec::new(),
+        }
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.errors.is_empty()
+    }
+
+    pub fn error(&mut self, error: ConfigError) {
+        self.errors.push(error);
+    }
+
+    pub fn type_mismatch(&mut self, path: &ConfigPath, expected: Type, actual: &Value) {
+        self.error(ConfigError::TypeMismatch {
+            path: path.to_string(),
+            expected,
+            actual: actual.get_type(),
+            span: actual.span(),
+        });
+    }
+
+    pub fn invalid_value(
+        &mut self,
+        path: &ConfigPath,
+        expected: impl Into<String>,
+        actual: &Value,
+    ) {
+        self.error(ConfigError::InvalidValue {
+            path: path.to_string(),
+            valid: expected.into(),
+            actual: if let Ok(str) = actual.as_str() {
+                format!("'{str}'")
+            } else {
+                actual.to_abbreviated_string(self.config)
+            },
+            span: actual.span(),
+        });
+    }
+
+    pub fn missing_column(&mut self, path: &ConfigPath, column: &'static str, span: Span) {
+        self.error(ConfigError::MissingRequiredColumn {
+            path: path.to_string(),
+            column,
+            span,
+        })
+    }
+
+    pub fn unknown_option(&mut self, path: &ConfigPath, value: &Value) {
+        self.error(ConfigError::UnknownOption {
+            path: path.to_string(),
+            span: value.span(),
+        });
+    }
+
+    pub fn deprecated_option(&mut self, path: &ConfigPath, suggestion: &'static str, span: Span) {
+        self.error(ConfigError::Deprecated {
+            path: path.to_string(),
+            suggestion,
+            span,
+        });
+    }
+
+    pub fn into_shell_error(self) -> Option<ShellError> {
+        if self.is_empty() {
+            None
+        } else {
+            Some(ShellError::InvalidConfig {
+                errors: self.errors,
+            })
+        }
+    }
+}
diff --git a/crates/nu-protocol/src/config/filesize.rs b/crates/nu-protocol/src/config/filesize.rs
index f7dc37b0f3..8c80f0f72c 100644
--- a/crates/nu-protocol/src/config/filesize.rs
+++ b/crates/nu-protocol/src/config/filesize.rs
@@ -15,3 +15,26 @@ impl Default for FilesizeConfig {
         }
     }
 }
+
+impl UpdateFromValue for FilesizeConfig {
+    fn update<'a>(
+        &mut self,
+        value: &'a Value,
+        path: &mut ConfigPath<'a>,
+        errors: &mut ConfigErrors,
+    ) {
+        let Value::Record { val: record, .. } = value else {
+            errors.type_mismatch(path, Type::record(), value);
+            return;
+        };
+
+        for (col, val) in record.iter() {
+            let path = &mut path.push(col);
+            match col.as_str() {
+                "metric" => self.metric.update(val, path, errors),
+                "format" => self.format.update(val, path, errors),
+                _ => errors.unknown_option(path, val),
+            }
+        }
+    }
+}
diff --git a/crates/nu-protocol/src/config/helper.rs b/crates/nu-protocol/src/config/helper.rs
index aead7ea3fe..e52ae6d83f 100644
--- a/crates/nu-protocol/src/config/helper.rs
+++ b/crates/nu-protocol/src/config/helper.rs
@@ -1,132 +1,171 @@
-use crate::{IntoValue, Record, ShellError, Span, Value};
-use std::{collections::HashMap, fmt::Display, str::FromStr};
+use super::error::ConfigErrors;
+use crate::{Record, ShellError, Span, Type, Value};
+use std::{
+    borrow::Borrow,
+    collections::HashMap,
+    fmt::{self, Display},
+    hash::Hash,
+    ops::{Deref, DerefMut},
+    str::FromStr,
+};
 
-pub(super) fn process_string_enum<T, E>(
-    config_point: &mut T,
-    config_path: &[&str],
-    value: &mut Value,
-    errors: &mut Vec<ShellError>,
-) where
-    T: FromStr<Err = E> + Clone + IntoValue,
-    E: Display,
+pub(super) struct ConfigPath<'a> {
+    components: Vec<&'a str>,
+}
+
+impl<'a> ConfigPath<'a> {
+    pub fn new() -> Self {
+        Self {
+            components: vec!["$env.config"],
+        }
+    }
+
+    pub fn push(&mut self, key: &'a str) -> ConfigPathScope<'_, 'a> {
+        self.components.push(key);
+        ConfigPathScope { inner: self }
+    }
+}
+
+impl Display for ConfigPath<'_> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.components.join("."))
+    }
+}
+
+pub(super) struct ConfigPathScope<'whole, 'part> {
+    inner: &'whole mut ConfigPath<'part>,
+}
+
+impl Drop for ConfigPathScope<'_, '_> {
+    fn drop(&mut self) {
+        self.inner.components.pop();
+    }
+}
+
+impl<'a> Deref for ConfigPathScope<'_, 'a> {
+    type Target = ConfigPath<'a>;
+
+    fn deref(&self) -> &Self::Target {
+        self.inner
+    }
+}
+
+impl DerefMut for ConfigPathScope<'_, '_> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        self.inner
+    }
+}
+
+pub(super) trait UpdateFromValue: Sized {
+    fn update<'a>(
+        &mut self,
+        value: &'a Value,
+        path: &mut ConfigPath<'a>,
+        errors: &mut ConfigErrors,
+    );
+}
+
+impl UpdateFromValue for Value {
+    fn update(&mut self, value: &Value, _path: &mut ConfigPath, _errors: &mut ConfigErrors) {
+        *self = value.clone();
+    }
+}
+
+impl UpdateFromValue for bool {
+    fn update(&mut self, value: &Value, path: &mut ConfigPath, errors: &mut ConfigErrors) {
+        if let Ok(val) = value.as_bool() {
+            *self = val;
+        } else {
+            errors.type_mismatch(path, Type::Bool, value);
+        }
+    }
+}
+
+impl UpdateFromValue for i64 {
+    fn update(&mut self, value: &Value, path: &mut ConfigPath, errors: &mut ConfigErrors) {
+        if let Ok(val) = value.as_int() {
+            *self = val;
+        } else {
+            errors.type_mismatch(path, Type::Int, value);
+        }
+    }
+}
+
+impl UpdateFromValue for usize {
+    fn update(&mut self, value: &Value, path: &mut ConfigPath, errors: &mut ConfigErrors) {
+        if let Ok(val) = value.as_int() {
+            if let Ok(val) = val.try_into() {
+                *self = val;
+            } else {
+                errors.invalid_value(path, "a non-negative integer", value);
+            }
+        } else {
+            errors.type_mismatch(path, Type::Int, value);
+        }
+    }
+}
+
+impl UpdateFromValue for String {
+    fn update(&mut self, value: &Value, path: &mut ConfigPath, errors: &mut ConfigErrors) {
+        if let Ok(val) = value.as_str() {
+            *self = val.into();
+        } else {
+            errors.type_mismatch(path, Type::String, value);
+        }
+    }
+}
+
+impl<K, V> UpdateFromValue for HashMap<K, V>
+where
+    K: Borrow<str> + for<'a> From<&'a str> + Eq + Hash,
+    V: Default + UpdateFromValue,
 {
-    let span = value.span();
-    if let Ok(v) = value.coerce_str() {
-        match v.parse() {
-            Ok(format) => {
-                *config_point = format;
-            }
-            Err(err) => {
-                errors.push(ShellError::GenericError {
-                    error: "Error while applying config changes".into(),
-                    msg: format!(
-                        "unrecognized $env.config.{} option '{v}'",
-                        config_path.join(".")
-                    ),
-                    span: Some(span),
-                    help: Some(err.to_string()),
-                    inner: vec![],
-                });
-                // Reconstruct
-                *value = config_point.clone().into_value(span);
-            }
+    fn update<'a>(
+        &mut self,
+        value: &'a Value,
+        path: &mut ConfigPath<'a>,
+        errors: &mut ConfigErrors,
+    ) {
+        if let Ok(record) = value.as_record() {
+            *self = record
+                .iter()
+                .map(|(key, val)| {
+                    let mut old = self.remove(key).unwrap_or_default();
+                    old.update(val, &mut path.push(key), errors);
+                    (key.as_str().into(), old)
+                })
+                .collect();
+        } else {
+            errors.type_mismatch(path, Type::record(), value);
+        }
+    }
+}
+
+pub(super) fn config_update_string_enum<T>(
+    choice: &mut T,
+    value: &Value,
+    path: &mut ConfigPath,
+    errors: &mut ConfigErrors,
+) where
+    T: FromStr,
+    T::Err: Display,
+{
+    if let Ok(str) = value.as_str() {
+        match str.parse() {
+            Ok(val) => *choice = val,
+            Err(err) => errors.invalid_value(path, err.to_string(), value),
         }
     } else {
-        errors.push(ShellError::GenericError {
-            error: "Error while applying config changes".into(),
-            msg: format!("$env.config.{} should be a string", config_path.join(".")),
-            span: Some(span),
-            help: Some("This value will be ignored.".into()),
-            inner: vec![],
-        });
-        // Reconstruct
-        *value = config_point.clone().into_value(span);
+        errors.type_mismatch(path, Type::String, value);
     }
 }
 
-pub(super) fn process_bool_config(
-    value: &mut Value,
-    errors: &mut Vec<ShellError>,
-    config_point: &mut bool,
-) {
-    if let Ok(b) = value.as_bool() {
-        *config_point = b;
-    } else {
-        errors.push(ShellError::GenericError {
-            error: "Error while applying config changes".into(),
-            msg: "should be a bool".to_string(),
-            span: Some(value.span()),
-            help: Some("This value will be ignored.".into()),
-            inner: vec![],
-        });
-        // Reconstruct
-        *value = Value::bool(*config_point, value.span());
-    }
-}
-
-pub(super) fn process_int_config(
-    value: &mut Value,
-    errors: &mut Vec<ShellError>,
-    config_point: &mut i64,
-) {
-    if let Ok(b) = value.as_int() {
-        *config_point = b;
-    } else {
-        errors.push(ShellError::GenericError {
-            error: "Error while applying config changes".into(),
-            msg: "should be an int".into(),
-            span: Some(value.span()),
-            help: Some("This value will be ignored.".into()),
-            inner: vec![],
-        });
-        // Reconstruct
-        *value = Value::int(*config_point, value.span());
-    }
-}
-
-pub(super) fn report_invalid_key(keys: &[&str], span: Span, errors: &mut Vec<ShellError>) {
-    // Because Value::Record discards all of the spans of its
-    // column names (by storing them as Strings), the key name cannot be provided
-    // as a value, even in key errors.
-    errors.push(ShellError::GenericError {
-        error: "Error while applying config changes".into(),
-        msg: format!(
-            "$env.config.{} is an unknown config setting",
-            keys.join(".")
-        ),
-        span: Some(span),
-        help: Some("This value will not appear in your $env.config record.".into()),
-        inner: vec![],
-    });
-}
-
-pub(super) fn report_invalid_value(msg: &str, span: Span, errors: &mut Vec<ShellError>) {
-    errors.push(ShellError::GenericError {
-        error: "Error while applying config changes".into(),
-        msg: msg.into(),
-        span: Some(span),
-        help: Some("This value will be ignored.".into()),
-        inner: vec![],
-    });
-}
-
-pub(super) fn create_map(value: &Value) -> Result<HashMap<String, Value>, ShellError> {
-    Ok(value
-        .as_record()?
-        .iter()
-        .map(|(k, v)| (k.clone(), v.clone()))
-        .collect())
-}
-
 pub fn extract_value<'record>(
-    name: &str,
+    column: &'static str,
     record: &'record Record,
     span: Span,
 ) -> Result<&'record Value, ShellError> {
     record
-        .get(name)
-        .ok_or_else(|| ShellError::MissingConfigValue {
-            missing_value: name.to_string(),
-            span,
-        })
+        .get(column)
+        .ok_or_else(|| ShellError::MissingRequiredColumn { column, span })
 }
diff --git a/crates/nu-protocol/src/config/history.rs b/crates/nu-protocol/src/config/history.rs
index 911a05ab16..8f7af7c4a5 100644
--- a/crates/nu-protocol/src/config/history.rs
+++ b/crates/nu-protocol/src/config/history.rs
@@ -1,4 +1,4 @@
-use super::prelude::*;
+use super::{config_update_string_enum, prelude::*};
 use crate as nu_protocol;
 
 #[derive(Clone, Copy, Debug, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
@@ -26,11 +26,17 @@ impl FromStr for HistoryFileFormat {
         match s.to_ascii_lowercase().as_str() {
             "sqlite" => Ok(Self::Sqlite),
             "plaintext" => Ok(Self::Plaintext),
-            _ => Err("expected either 'sqlite' or 'plaintext'"),
+            _ => Err("'sqlite' or 'plaintext'"),
         }
     }
 }
 
+impl UpdateFromValue for HistoryFileFormat {
+    fn update(&mut self, value: &Value, path: &mut ConfigPath, errors: &mut ConfigErrors) {
+        config_update_string_enum(self, value, path, errors)
+    }
+}
+
 #[derive(Clone, Copy, Debug, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
 pub struct HistoryConfig {
     pub max_size: i64,
@@ -58,3 +64,28 @@ impl Default for HistoryConfig {
         }
     }
 }
+
+impl UpdateFromValue for HistoryConfig {
+    fn update<'a>(
+        &mut self,
+        value: &'a Value,
+        path: &mut ConfigPath<'a>,
+        errors: &mut ConfigErrors,
+    ) {
+        let Value::Record { val: record, .. } = value else {
+            errors.type_mismatch(path, Type::record(), value);
+            return;
+        };
+
+        for (col, val) in record.iter() {
+            let path = &mut path.push(col);
+            match col.as_str() {
+                "isolation" => self.isolation.update(val, path, errors),
+                "sync_on_enter" => self.sync_on_enter.update(val, path, errors),
+                "max_size" => self.max_size.update(val, path, errors),
+                "file_format" => self.file_format.update(val, path, errors),
+                _ => errors.unknown_option(path, val),
+            }
+        }
+    }
+}
diff --git a/crates/nu-protocol/src/config/hooks.rs b/crates/nu-protocol/src/config/hooks.rs
index c0e3aa3329..9b9860a87d 100644
--- a/crates/nu-protocol/src/config/hooks.rs
+++ b/crates/nu-protocol/src/config/hooks.rs
@@ -1,6 +1,5 @@
 use super::prelude::*;
 use crate as nu_protocol;
-use crate::ShellError;
 
 /// Definition of a parsed hook from the config object
 #[derive(Clone, Debug, IntoValue, PartialEq, Serialize, Deserialize)]
@@ -33,36 +32,36 @@ impl Default for Hooks {
     }
 }
 
-/// Parse the hooks to find the blocks to run when the hooks fire
-pub(super) fn create_hooks(value: &Value) -> Result<Hooks, ShellError> {
-    let span = value.span();
-    match value {
-        Value::Record { val, .. } => {
-            let mut hooks = Hooks::new();
-
-            for (col, val) in &**val {
-                match col.as_str() {
-                    "pre_prompt" => hooks.pre_prompt = Some(val.clone()),
-                    "pre_execution" => hooks.pre_execution = Some(val.clone()),
-                    "env_change" => hooks.env_change = Some(val.clone()),
-                    "display_output" => hooks.display_output = Some(val.clone()),
-                    "command_not_found" => hooks.command_not_found = Some(val.clone()),
-                    x => {
-                        return Err(ShellError::UnsupportedConfigValue {
-                            expected: "'pre_prompt', 'pre_execution', 'env_change', 'display_output', 'command_not_found'".into(),
-                            value: x.into(),
-                            span
-                        });
-                    }
-                }
+impl UpdateFromValue for Hooks {
+    fn update<'a>(
+        &mut self,
+        value: &'a Value,
+        path: &mut ConfigPath<'a>,
+        errors: &mut ConfigErrors,
+    ) {
+        fn update_option(field: &mut Option<Value>, value: &Value) {
+            if value.is_nothing() {
+                *field = None;
+            } else {
+                *field = Some(value.clone());
+            }
+        }
+
+        let Value::Record { val: record, .. } = value else {
+            errors.type_mismatch(path, Type::record(), value);
+            return;
+        };
+
+        for (col, val) in record.iter() {
+            let path = &mut path.push(col);
+            match col.as_str() {
+                "pre_prompt" => update_option(&mut self.pre_prompt, val),
+                "pre_execution" => update_option(&mut self.pre_execution, val),
+                "env_change" => update_option(&mut self.env_change, val),
+                "display_output" => update_option(&mut self.display_output, val),
+                "command_not_found" => update_option(&mut self.command_not_found, val),
+                _ => errors.unknown_option(path, val),
             }
-
-            Ok(hooks)
         }
-        _ => Err(ShellError::UnsupportedConfigValue {
-            expected: "record for 'hooks' config".into(),
-            value: "non-record value".into(),
-            span,
-        }),
     }
 }
diff --git a/crates/nu-protocol/src/config/ls.rs b/crates/nu-protocol/src/config/ls.rs
index 522163d9a1..061e390dd6 100644
--- a/crates/nu-protocol/src/config/ls.rs
+++ b/crates/nu-protocol/src/config/ls.rs
@@ -15,3 +15,26 @@ impl Default for LsConfig {
         }
     }
 }
+
+impl UpdateFromValue for LsConfig {
+    fn update<'a>(
+        &mut self,
+        value: &'a Value,
+        path: &mut ConfigPath<'a>,
+        errors: &mut ConfigErrors,
+    ) {
+        let Value::Record { val: record, .. } = value else {
+            errors.type_mismatch(path, Type::record(), value);
+            return;
+        };
+
+        for (col, val) in record.iter() {
+            let path = &mut path.push(col);
+            match col.as_str() {
+                "use_ls_colors" => self.use_ls_colors.update(val, path, errors),
+                "clickable_links" => self.clickable_links.update(val, path, errors),
+                _ => errors.unknown_option(path, val),
+            }
+        }
+    }
+}
diff --git a/crates/nu-protocol/src/config/mod.rs b/crates/nu-protocol/src/config/mod.rs
index e30892474c..c66c41e455 100644
--- a/crates/nu-protocol/src/config/mod.rs
+++ b/crates/nu-protocol/src/config/mod.rs
@@ -1,35 +1,32 @@
 //! Module containing the internal representation of user configuration
-use self::helper::*;
-use self::hooks::*;
 
-use crate::{IntoValue, ShellError, Span, Value};
-use reedline::create_keybindings;
-use serde::{Deserialize, Serialize};
+use crate as nu_protocol;
+use crate::FromValue;
+use helper::*;
+use prelude::*;
 use std::collections::HashMap;
-use table::try_parse_trim_strategy;
 
-pub use self::completer::{
-    CompleterConfig, CompletionAlgorithm, CompletionSort, ExternalCompleterConfig,
+pub use completions::{
+    CompletionAlgorithm, CompletionConfig, CompletionSort, ExternalCompleterConfig,
 };
-pub use self::datetime_format::DatetimeFormatConfig;
-pub use self::display_errors::DisplayErrors;
-pub use self::filesize::FilesizeConfig;
-pub use self::helper::extract_value;
-pub use self::history::{HistoryConfig, HistoryFileFormat};
-pub use self::hooks::Hooks;
-pub use self::ls::LsConfig;
-pub use self::output::ErrorStyle;
-pub use self::plugin_gc::{PluginGcConfig, PluginGcConfigs};
-pub use self::reedline::{
-    create_menus, CursorShapeConfig, EditBindings, NuCursorShape, ParsedKeybinding, ParsedMenu,
-};
-pub use self::rm::RmConfig;
-pub use self::shell_integration::ShellIntegrationConfig;
-pub use self::table::{FooterMode, TableConfig, TableIndexMode, TableMode, TrimStrategy};
+pub use datetime_format::DatetimeFormatConfig;
+pub use display_errors::DisplayErrors;
+pub use filesize::FilesizeConfig;
+pub use helper::extract_value;
+pub use history::{HistoryConfig, HistoryFileFormat};
+pub use hooks::Hooks;
+pub use ls::LsConfig;
+pub use output::ErrorStyle;
+pub use plugin_gc::{PluginGcConfig, PluginGcConfigs};
+pub use reedline::{CursorShapeConfig, EditBindings, NuCursorShape, ParsedKeybinding, ParsedMenu};
+pub use rm::RmConfig;
+pub use shell_integration::ShellIntegrationConfig;
+pub use table::{FooterMode, TableConfig, TableIndexMode, TableMode, TrimStrategy};
 
-mod completer;
+mod completions;
 mod datetime_format;
 mod display_errors;
+mod error;
 mod filesize;
 mod helper;
 mod history;
@@ -43,7 +40,7 @@ mod rm;
 mod shell_integration;
 mod table;
 
-#[derive(Serialize, Deserialize, Clone, Debug)]
+#[derive(Clone, Debug, IntoValue, Serialize, Deserialize)]
 pub struct Config {
     pub filesize: FilesizeConfig,
     pub table: TableConfig,
@@ -53,7 +50,7 @@ pub struct Config {
     pub float_precision: i64,
     pub recursion_limit: i64,
     pub use_ansi_coloring: bool,
-    pub completions: CompleterConfig,
+    pub completions: CompletionConfig,
     pub edit_mode: EditBindings,
     pub history: HistoryConfig,
     pub keybindings: Vec<ParsedKeybinding>,
@@ -97,7 +94,7 @@ impl Default for Config {
 
             history: HistoryConfig::default(),
 
-            completions: CompleterConfig::default(),
+            completions: CompletionConfig::default(),
 
             recursion_limit: 50,
 
@@ -135,630 +132,104 @@ impl Default for Config {
     }
 }
 
-impl Value {
-    /// Parse the given [`Value`] as a configuration record, and recover encountered mistakes
-    ///
-    /// If any given (sub)value is detected as impossible, this value will be restored to the value
-    /// in `existing_config`, thus mutates `self`.
-    ///
-    /// Returns a new [`Config`] (that is in a valid state) and if encountered the [`ShellError`]
-    /// containing all observed inner errors.
-    pub fn parse_as_config(&mut self, existing_config: &Config) -> (Config, Option<ShellError>) {
-        // Clone the passed-in config rather than mutating it.
-        let mut config = existing_config.clone();
-
-        // Vec for storing errors. Current Nushell behaviour (Dec 2022) is that having some typo
-        // like `"always_trash": tru` in your config.nu's `$env.config` record shouldn't abort all
-        // config parsing there and then. Thus, errors are simply collected one-by-one and wrapped
-        // in a GenericError at the end.
-        let mut errors = vec![];
-
-        // Config record (self) mutation rules:
-        // * When parsing a config Record, if a config key error occurs, remove the key.
-        // * When parsing a config Record, if a config value error occurs, replace the value
-        // with a reconstructed Nu value for the current (unaltered) configuration for that setting.
-        // For instance:
-        // `$env.config.ls.use_ls_colors = 2` results in an error, so the current `use_ls_colors`
-        // config setting is converted to a `Value::Boolean` and inserted in the record in place of
-        // the `2`.
-
-        let Value::Record { val, .. } = self else {
-            return (
-                config,
-                Some(ShellError::GenericError {
-                    error: "Error while applying config changes".into(),
-                    msg: "$env.config is not a record".into(),
-                    span: Some(self.span()),
-                    help: None,
-                    inner: vec![],
-                }),
-            );
+impl UpdateFromValue for Config {
+    fn update<'a>(
+        &mut self,
+        value: &'a Value,
+        path: &mut ConfigPath<'a>,
+        errors: &mut ConfigErrors,
+    ) {
+        let Value::Record { val: record, .. } = value else {
+            errors.type_mismatch(path, Type::record(), value);
+            return;
         };
 
-        val.to_mut().retain_mut(|key, value| {
-            let span = value.span();
-            match key {
-                "ls" => {
-                    if let Value::Record { val, .. } = value {
-                        val.to_mut().retain_mut(|key2, value| {
-                            let span = value.span();
-                            match key2 {
-                                "use_ls_colors" => {
-                                    process_bool_config(value, &mut errors, &mut config.ls.use_ls_colors);
-                                }
-                                "clickable_links" => {
-                                    process_bool_config(value, &mut errors, &mut config.ls.clickable_links);
-                                }
-                                _ => {
-                                    report_invalid_key(&[key, key2], span, &mut errors);
-                                    return false;
-                                }
-                            }
-                            true
-                        });
-                    } else {
-                        report_invalid_value("should be a record", span, &mut errors);
-                        *value = config.ls.into_value(span);
-                    }
-                }
-                "rm" => {
-                    if let Value::Record { val, .. } = value {
-                        val.to_mut().retain_mut(|key2, value| {
-                            let span = value.span();
-                            match key2 {
-                                "always_trash" => {
-                                    process_bool_config(value, &mut errors, &mut config.rm.always_trash);
-                                }
-                                _ => {
-                                    report_invalid_key(&[key, key2], span, &mut errors);
-                                    return false;
-                                }
-                            };
-                            true
-                        });
-                    } else {
-                        report_invalid_value("should be a record", span, &mut errors);
-                        *value = config.rm.into_value(span);
-                    }
-                }
-                "history" => {
-                    let history = &mut config.history;
-                    if let Value::Record { val, .. } = value {
-                        val.to_mut().retain_mut(|key2, value| {
-                            let span = value.span();
-                            match key2 {
-                                "isolation" => {
-                                    process_bool_config(value, &mut errors, &mut history.isolation);
-                                }
-                                "sync_on_enter" => {
-                                    process_bool_config(value, &mut errors, &mut history.sync_on_enter);
-                                }
-                                "max_size" => {
-                                    process_int_config(value, &mut errors, &mut history.max_size);
-                                }
-                                "file_format" => {
-                                    process_string_enum(
-                                        &mut history.file_format,
-                                        &[key, key2],
-                                        value,
-                                        &mut errors
-                                    );
-                                }
-                                _ => {
-                                    report_invalid_key(&[key, key2], span, &mut errors);
-                                    return false;
-                                }
-                            };
-                            true
-                        });
-                    } else {
-                        report_invalid_value("should be a record", span, &mut errors);
-                        *value = config.history.into_value(span);
-                    }
-                }
-                "completions" => {
-                    if let Value::Record { val, .. } = value {
-                        val.to_mut().retain_mut(|key2, value| {
-                            let span = value.span();
-                            match key2 {
-                                "quick" => {
-                                    process_bool_config(value, &mut errors, &mut config.completions.quick);
-                                }
-                                "partial" => {
-                                    process_bool_config(value, &mut errors, &mut config.completions.partial);
-                                }
-                                "algorithm" => {
-                                    process_string_enum(
-                                        &mut config.completions.algorithm,
-                                        &[key, key2],
-                                        value,
-                                        &mut errors
-                                    );
-                                }
-                                "case_sensitive" => {
-                                    process_bool_config(value, &mut errors, &mut config.completions.case_sensitive);
-                                }
-                                "sort" => {
-                                    process_string_enum(
-                                        &mut config.completions.sort,
-                                        &[key, key2],
-                                        value,
-                                        &mut errors
-                                    );
-                                }
-                                "external" => {
-                                    if let Value::Record { val, .. } = value {
-                                        val.to_mut().retain_mut(|key3, value| {
-                                            let span = value.span();
-                                            match key3 {
-                                                "max_results" => {
-                                                    process_int_config(value, &mut errors, &mut config.completions.external.max_results);
-                                                }
-                                                "completer" => {
-                                                    if let Ok(v) = value.as_closure() {
-                                                        config.completions.external.completer = Some(v.clone())
-                                                    } else {
-                                                        match value {
-                                                            Value::Nothing { .. } => {}
-                                                            _ => {
-                                                                report_invalid_value("should be a closure or null", span, &mut errors);
-                                                                *value = config.completions.external.completer.clone().into_value(span);
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                                "enable" => {
-                                                    process_bool_config(value, &mut errors, &mut config.completions.external.enable);
-                                                }
-                                                _ => {
-                                                    report_invalid_key(&[key, key2, key3], span, &mut errors);
-                                                    return false;
-                                                }
-                                            };
-                                            true
-                                        });
-                                    } else {
-                                        report_invalid_value("should be a record", span, &mut errors);
-                                        *value = config.completions.external.clone().into_value(span);
-                                    }
-                                }
-                                "use_ls_colors" => {
-                                    process_bool_config(value, &mut errors, &mut config.completions.use_ls_colors);
-                                }
-                                _ => {
-                                    report_invalid_key(&[key, key2], span, &mut errors);
-                                    return false;
-                                }
-                            };
-                            true
-                        });
-                    } else {
-                        report_invalid_value("should be a record", span, &mut errors);
-                        *value = config.completions.clone().into_value(span);
-                    }
-                }
-                "cursor_shape" => {
-                    if let Value::Record { val, .. } = value {
-                        val.to_mut().retain_mut(|key2, value| {
-                            let span = value.span();
-                            let config_point = match key2 {
-                                "vi_insert" => &mut config.cursor_shape.vi_insert,
-                                "vi_normal" => &mut config.cursor_shape.vi_normal,
-                                "emacs" => &mut config.cursor_shape.emacs,
-                                _ => {
-                                    report_invalid_key(&[key, key2], span, &mut errors);
-                                    return false;
-                                }
-                            };
-                            process_string_enum(
-                                config_point,
-                                &[key, key2],
-                                value,
-                                &mut errors
-                            );
-                            true
-                        });
-                    } else {
-                        report_invalid_value("should be a record", span, &mut errors);
-                        *value = config.cursor_shape.into_value(span);
-                    }
-                }
-                "table" => {
-                    if let Value::Record { val, .. } = value {
-                        val.to_mut().retain_mut(|key2, value| {
-                            let span = value.span();
-                            match key2 {
-                                "mode" => {
-                                    process_string_enum(
-                                        &mut config.table.mode,
-                                        &[key, key2],
-                                        value,
-                                        &mut errors
-                                    );
-                                }
-                                "header_on_separator" => {
-                                    process_bool_config(value, &mut errors, &mut config.table.header_on_separator);
-                                }
-                                "padding" => match value {
-                                    Value::Int { val, .. } => {
-                                        if *val < 0 {
-                                            report_invalid_value("expected a unsigned integer", span, &mut errors);
-                                            *value = config.table.padding.into_value(span);
-                                        } else {
-                                            config.table.padding.left = *val as usize;
-                                            config.table.padding.right = *val as usize;
-                                        }
-                                    }
-                                    Value::Record { val, .. } => {
-                                        let mut invalid = false;
-                                        val.to_mut().retain(|key3, value| {
-                                            match key3 {
-                                                "left" => {
-                                                    match value.as_int() {
-                                                        Ok(val) if val >= 0 => {
-                                                            config.table.padding.left = val as usize;
-                                                        }
-                                                        _ => {
-                                                            report_invalid_value("expected a unsigned integer >= 0", span, &mut errors);
-                                                            invalid = true;
-                                                        }
-                                                    }
-                                                }
-                                                "right" => {
-                                                    match value.as_int() {
-                                                        Ok(val) if val >= 0 => {
-                                                            config.table.padding.right = val as usize;
-                                                        }
-                                                        _ => {
-                                                            report_invalid_value("expected a unsigned integer >= 0", span, &mut errors);
-                                                            invalid = true;
-                                                        }
-                                                    }
-                                                }
-                                                _ => {
-                                                    report_invalid_key(&[key, key2, key3], span, &mut errors);
-                                                    return false;
-                                                }
-                                            };
-                                            true
-                                        });
-                                        if invalid {
-                                            *value = config.table.padding.into_value(span);
-                                        }
-                                    }
-                                    _ => {
-                                        report_invalid_value("expected a unsigned integer or a record", span, &mut errors);
-                                        *value = config.table.padding.into_value(span);
-                                    }
-                                },
-                                "index_mode" => {
-                                    process_string_enum(
-                                        &mut config.table.index_mode,
-                                        &[key, key2],
-                                        value,
-                                        &mut errors
-                                    );
-                                }
-                                "trim" => {
-                                    match try_parse_trim_strategy(value, &mut errors) {
-                                        Ok(v) => config.table.trim = v,
-                                        Err(e) => {
-                                            // try_parse_trim_strategy() already adds its own errors
-                                            errors.push(e);
-                                            *value = config.table.trim.clone().into_value(span);
-                                        }
-                                    }
-                                }
-                                "show_empty" => {
-                                    process_bool_config(value, &mut errors, &mut config.table.show_empty);
-                                }
-                                "abbreviated_row_count" => {
-                                    match *value {
-                                        Value::Int { val, .. } => {
-                                            if val >= 0 {
-                                                config.table.abbreviated_row_count = Some(val as usize);
-                                            } else {
-                                                report_invalid_value("should be an int unsigned", span, &mut errors);
-                                                *value = config.table.abbreviated_row_count.map(|count| Value::int(count as i64, span)).unwrap_or(Value::nothing(span));
-                                            }
-                                        }
-                                        Value::Nothing { .. } => {
-                                            config.table.abbreviated_row_count = None;
-                                        }
-                                        _ => {
-                                            report_invalid_value("should be an int", span, &mut errors);
-                                            *value = config.table.abbreviated_row_count.map(|count| Value::int(count as i64, span)).unwrap_or(Value::nothing(span))
-                                        }
-                                    }
-                                }
-                                _ => {
-                                    report_invalid_key(&[key, key2], span, &mut errors);
-                                    return false;
-                                }
-                            };
-                            true
-                        });
-                    } else {
-                        report_invalid_value("should be a record", span, &mut errors);
-                        *value = config.table.clone().into_value(span);
-                    }
-                }
-                "filesize" => {
-                    if let Value::Record { val, .. } = value {
-                        val.to_mut().retain_mut(|key2, value| {
-                            let span = value.span();
-                            match key2 {
-                                "metric" => {
-                                    process_bool_config(value, &mut errors, &mut config.filesize.metric);
-                                }
-                                "format" => {
-                                    if let Ok(v) = value.coerce_str() {
-                                        config.filesize.format = v.to_lowercase();
-                                    } else {
-                                        report_invalid_value("should be a string", span, &mut errors);
-                                        *value = Value::string(config.filesize.format.clone(), span);
-                                    }
-                                }
-                                _ => {
-                                    report_invalid_key(&[key, key2], span, &mut errors);
-                                    return false;
-                                }
-                            };
-                            true
-                        })
-                    } else {
-                        report_invalid_value("should be a record", span, &mut errors);
-                        *value = config.filesize.clone().into_value(span);
-                    }
-                }
-                "explore" => {
-                    if let Ok(map) = create_map(value) {
-                        config.explore = map;
-                    } else {
-                        report_invalid_value("should be a record", span, &mut errors);
-                        *value = config.explore.clone().into_value(span);
-                    }
-                }
-                // Misc. options
-                "color_config" => {
-                    if let Ok(map) = create_map(value) {
-                        config.color_config = map;
-                    } else {
-                        report_invalid_value("should be a record", span, &mut errors);
-                        *value = config.color_config.clone().into_value(span);
-                    }
-                }
+        for (col, val) in record.iter() {
+            let path = &mut path.push(col);
+            match col.as_str() {
+                "ls" => self.ls.update(val, path, errors),
+                "rm" => self.rm.update(val, path, errors),
+                "history" => self.history.update(val, path, errors),
+                "completions" => self.completions.update(val, path, errors),
+                "cursor_shape" => self.cursor_shape.update(val, path, errors),
+                "table" => self.table.update(val, path, errors),
+                "filesize" => self.filesize.update(val, path, errors),
+                "explore" => self.explore.update(val, path, errors),
+                "color_config" => self.color_config.update(val, path, errors),
                 "use_grid_icons" => {
                     // TODO: delete it after 0.99
-                    report_invalid_value(
-                        "`use_grid_icons` is deleted, you should delete the key, and use `grid -i` in such case.",
-                        span,
-                        &mut errors
-                    );
+                    errors.deprecated_option(path, "use `grid -i`", val.span());
                 }
-                "footer_mode" => {
-                    process_string_enum(
-                        &mut config.footer_mode,
-                        &[key],
-                        value,
-                        &mut errors
-                    );
-                }
-                "float_precision" => {
-                    process_int_config(value, &mut errors, &mut config.float_precision);
-                }
-                "use_ansi_coloring" => {
-                    process_bool_config(value, &mut errors, &mut config.use_ansi_coloring);
-                }
-                "edit_mode" => {
-                    process_string_enum(
-                        &mut config.edit_mode,
-                        &[key],
-                        value,
-                        &mut errors
-                    );
-                }
-                "shell_integration" => {
-                    if let Value::Record { val, .. } = value {
-                        val.to_mut().retain_mut(|key2, value| {
-                            let span = value.span();
-                            match key2 {
-                                "osc2" => {
-                                    process_bool_config(value, &mut errors, &mut config.shell_integration.osc2);
-                                }
-                                "osc7" => {
-                                    process_bool_config(value, &mut errors, &mut config.shell_integration.osc7);
-                                }
-                                "osc8" => {
-                                    process_bool_config(value, &mut errors, &mut config.shell_integration.osc8);
-                                }
-                                "osc9_9" => {
-                                    process_bool_config(value, &mut errors, &mut config.shell_integration.osc9_9);
-                                }
-                                "osc133" => {
-                                    process_bool_config(value, &mut errors, &mut config.shell_integration.osc133);
-                                }
-                                "osc633" => {
-                                    process_bool_config(value, &mut errors, &mut config.shell_integration.osc633);
-                                }
-                                "reset_application_mode" => {
-                                    process_bool_config(value, &mut errors, &mut config.shell_integration.reset_application_mode);
-                                }
-                                _ => {
-                                    report_invalid_key(&[key, key2], span, &mut errors);
-                                    return false;
-                                }
-                            };
-                            true
-                        })
-                    } else {
-                        report_invalid_value("boolean value is deprecated, should be a record. see `config nu --default`.", span, &mut errors);
-                        *value = config.shell_integration.into_value(span);
-                    }
-                }
-                "buffer_editor" => match value {
+                "footer_mode" => self.footer_mode.update(val, path, errors),
+                "float_precision" => self.float_precision.update(val, path, errors),
+                "use_ansi_coloring" => self.use_ansi_coloring.update(val, path, errors),
+                "edit_mode" => self.edit_mode.update(val, path, errors),
+                "shell_integration" => self.shell_integration.update(val, path, errors),
+                "buffer_editor" => match val {
                     Value::Nothing { .. } | Value::String { .. } => {
-                        config.buffer_editor = value.clone();
+                        self.buffer_editor = val.clone();
                     }
                     Value::List { vals, .. }
                         if vals.iter().all(|val| matches!(val, Value::String { .. })) =>
                     {
-                        config.buffer_editor = value.clone();
-                    }
-                    _ => {
-                        report_invalid_value("should be a string, list<string>, or null", span, &mut errors);
-                        *value = config.buffer_editor.clone();
+                        self.buffer_editor = val.clone();
                     }
+                    _ => errors.type_mismatch(
+                        path,
+                        Type::custom("string, list<string>, or nothing"),
+                        val,
+                    ),
                 },
-                "show_banner" => {
-                    process_bool_config(value, &mut errors, &mut config.show_banner);
-                }
-                "display_errors" => {
-                    if let Value::Record { val, .. } = value {
-                        val.to_mut().retain_mut(|key2, value| {
-                            let span = value.span();
-                            match key2 {
-                                "exit_code" => {
-                                    process_bool_config(value, &mut errors, &mut config.display_errors.exit_code);
-                                }
-                                "termination_signal" => {
-                                    process_bool_config(value, &mut errors, &mut config.display_errors.termination_signal);
-                                }
-                                _ => {
-                                    report_invalid_key(&[key, key2], span, &mut errors);
-                                    return false;
-                                }
-                            };
-                            true
-                        });
-                    } else {
-                        report_invalid_value("should be a record", span, &mut errors);
-                        *value = config.display_errors.into_value(span);
-                    }
-                }
-                "render_right_prompt_on_last_line" => {
-                    process_bool_config(value, &mut errors, &mut config.render_right_prompt_on_last_line);
-                }
-                "bracketed_paste" => {
-                    process_bool_config(value, &mut errors, &mut config.bracketed_paste);
-                }
-                "use_kitty_protocol" => {
-                    process_bool_config(value, &mut errors, &mut config.use_kitty_protocol);
-                }
+                "show_banner" => self.show_banner.update(val, path, errors),
+                "display_errors" => self.display_errors.update(val, path, errors),
+                "render_right_prompt_on_last_line" => self
+                    .render_right_prompt_on_last_line
+                    .update(val, path, errors),
+                "bracketed_paste" => self.bracketed_paste.update(val, path, errors),
+                "use_kitty_protocol" => self.use_kitty_protocol.update(val, path, errors),
                 "highlight_resolved_externals" => {
-                    process_bool_config(value, &mut errors, &mut config.highlight_resolved_externals);
+                    self.highlight_resolved_externals.update(val, path, errors)
                 }
-                "plugins" => {
-                    if let Ok(map) = create_map(value) {
-                        config.plugins = map;
-                    } else {
-                        report_invalid_value("should be a record", span, &mut errors);
-                        *value = config.plugins.clone().into_value(span);
-                    }
-                }
-                "plugin_gc" => {
-                    config.plugin_gc.process(&[key], value, &mut errors);
-                }
-                "menus" => match create_menus(value) {
-                    Ok(map) => config.menus = map,
-                    Err(e) => {
-                        report_invalid_value("should be a valid list of menus", span, &mut errors);
-                        errors.push(e);
-                        *value = config.menus.clone().into_value(span);
-                    }
+                "plugins" => self.plugins.update(val, path, errors),
+                "plugin_gc" => self.plugin_gc.update(val, path, errors),
+                "menus" => match Vec::from_value(val.clone()) {
+                    Ok(menus) => self.menus = menus,
+                    Err(err) => errors.error(err.into()),
                 },
-                "keybindings" => match create_keybindings(value) {
-                    Ok(keybindings) => config.keybindings = keybindings,
-                    Err(e) => {
-                        report_invalid_value("should be a valid keybindings list", span, &mut errors);
-                        errors.push(e);
-                        *value = config.keybindings.clone().into_value(span);
-                    }
+                "keybindings" => match Vec::from_value(val.clone()) {
+                    Ok(keybindings) => self.keybindings = keybindings,
+                    Err(err) => errors.error(err.into()),
                 },
-                "hooks" => match create_hooks(value) {
-                    Ok(hooks) => config.hooks = hooks,
-                    Err(e) => {
-                        report_invalid_value("should be a valid hooks list", span, &mut errors);
-                        errors.push(e);
-                        *value = config.hooks.clone().into_value(span);
-                    }
-                },
-                "datetime_format" => {
-                    if let Value::Record { val, .. } = value {
-                        val.to_mut().retain_mut(|key2, value|
-                            {
-                            let span = value.span();
-                            match key2 {
-                                "normal" => {
-                                    if let Ok(v) = value.coerce_string() {
-                                        config.datetime_format.normal = Some(v);
-                                    } else {
-                                        report_invalid_value("should be a string", span, &mut errors);
-                                    }
-                                }
-                                "table" => {
-                                    if let Ok(v) = value.coerce_string() {
-                                        config.datetime_format.table = Some(v);
-                                    } else {
-                                        report_invalid_value("should be a string", span, &mut errors);
-                                    }
-                                }
-                                _ => {
-                                    report_invalid_key(&[key, key2], span, &mut errors);
-                                    return false;
-                                }
-                            };
-                            true
-                        })
-                    } else {
-                        report_invalid_value("should be a record", span, &mut errors);
-                        *value = config.datetime_format.clone().into_value(span);
-                    }
-                }
-                "error_style" => {
-                    process_string_enum(
-                        &mut config.error_style,
-                        &[key],
-                        value,
-                        &mut errors
-                    );
-                }
+                "hooks" => self.hooks.update(val, path, errors),
+                "datetime_format" => self.datetime_format.update(val, path, errors),
+                "error_style" => self.error_style.update(val, path, errors),
                 "recursion_limit" => {
-                    if let Value::Int { val, internal_span } = value {
-                        if val > &mut 1 {
-                            config.recursion_limit = *val;
+                    if let Ok(limit) = val.as_int() {
+                        if limit > 1 {
+                            self.recursion_limit = limit;
                         } else {
-                            report_invalid_value("should be a integer greater than 1", span, &mut errors);
-                            *value = Value::Int { val: 50, internal_span: *internal_span };
+                            errors.invalid_value(path, "an int greater than 1", val);
                         }
                     } else {
-                        report_invalid_value("should be a integer greater than 1", span, &mut errors);
-                        *value = Value::Int { val: 50, internal_span: value.span() };
+                        errors.type_mismatch(path, Type::Int, val);
                     }
                 }
-                // Catch all
-                _ => {
-                    report_invalid_key(&[key], span, &mut errors);
-                    return false;
-                }
-            };
-            true
-        });
-
-        // Return the config and the vec of errors.
-        (
-            config,
-            if !errors.is_empty() {
-                Some(ShellError::GenericError {
-                    error: "Config record contains invalid values or unknown settings".into(),
-                    msg: "".into(),
-                    span: None,
-                    help: None,
-                    inner: errors,
-                })
-            } else {
-                None
-            },
-        )
+                _ => errors.unknown_option(path, val),
+            }
+        }
+    }
+}
+
+impl Config {
+    pub fn update_from_value(&mut self, old: &Config, value: &Value) -> Option<ShellError> {
+        // Current behaviour is that config errors are displayed, but do not prevent the rest
+        // of the config from being updated (fields with errors are skipped/not updated).
+        // Errors are simply collected one-by-one and wrapped into a ShellError variant at the end.
+        let mut errors = ConfigErrors::new(old);
+        let mut path = ConfigPath::new();
+
+        self.update(value, &mut path, &mut errors);
+
+        errors.into_shell_error()
     }
 }
diff --git a/crates/nu-protocol/src/config/output.rs b/crates/nu-protocol/src/config/output.rs
index c2340c9963..8db3467d6e 100644
--- a/crates/nu-protocol/src/config/output.rs
+++ b/crates/nu-protocol/src/config/output.rs
@@ -1,4 +1,4 @@
-use super::prelude::*;
+use super::{config_update_string_enum, prelude::*};
 use crate as nu_protocol;
 
 #[derive(Clone, Copy, Debug, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
@@ -14,7 +14,13 @@ impl FromStr for ErrorStyle {
         match s.to_ascii_lowercase().as_str() {
             "fancy" => Ok(Self::Fancy),
             "plain" => Ok(Self::Plain),
-            _ => Err("expected either 'fancy' or 'plain'"),
+            _ => Err("'fancy' or 'plain'"),
         }
     }
 }
+
+impl UpdateFromValue for ErrorStyle {
+    fn update(&mut self, value: &Value, path: &mut ConfigPath, errors: &mut ConfigErrors) {
+        config_update_string_enum(self, value, path, errors)
+    }
+}
diff --git a/crates/nu-protocol/src/config/plugin_gc.rs b/crates/nu-protocol/src/config/plugin_gc.rs
index 240b65349a..94e4b5aee4 100644
--- a/crates/nu-protocol/src/config/plugin_gc.rs
+++ b/crates/nu-protocol/src/config/plugin_gc.rs
@@ -1,7 +1,5 @@
-use super::helper::{process_bool_config, report_invalid_key, report_invalid_value};
 use super::prelude::*;
 use crate as nu_protocol;
-use crate::ShellError;
 use std::collections::HashMap;
 
 /// Configures when plugins should be stopped if inactive
@@ -19,79 +17,28 @@ impl PluginGcConfigs {
     pub fn get(&self, plugin_name: &str) -> &PluginGcConfig {
         self.plugins.get(plugin_name).unwrap_or(&self.default)
     }
-
-    pub(super) fn process(
-        &mut self,
-        path: &[&str],
-        value: &mut Value,
-        errors: &mut Vec<ShellError>,
-    ) {
-        if let Value::Record { val, .. } = value {
-            // Handle resets to default if keys are missing
-            if !val.contains("default") {
-                self.default = PluginGcConfig::default();
-            }
-            if !val.contains("plugins") {
-                self.plugins = HashMap::new();
-            }
-
-            val.to_mut().retain_mut(|key, value| {
-                let span = value.span();
-                match key {
-                    "default" => {
-                        self.default
-                            .process(&join_path(path, &["default"]), value, errors)
-                    }
-                    "plugins" => process_plugins(
-                        &join_path(path, &["plugins"]),
-                        value,
-                        errors,
-                        &mut self.plugins,
-                    ),
-                    _ => {
-                        report_invalid_key(&join_path(path, &[key]), span, errors);
-                        return false;
-                    }
-                }
-                true
-            });
-        } else {
-            report_invalid_value("should be a record", value.span(), errors);
-            *value = self.clone().into_value(value.span());
-        }
-    }
 }
 
-fn process_plugins(
-    path: &[&str],
-    value: &mut Value,
-    errors: &mut Vec<ShellError>,
-    plugins: &mut HashMap<String, PluginGcConfig>,
-) {
-    if let Value::Record { val, .. } = value {
-        // Remove any plugin configs that aren't in the value
-        plugins.retain(|key, _| val.contains(key));
+impl UpdateFromValue for PluginGcConfigs {
+    fn update<'a>(
+        &mut self,
+        value: &'a Value,
+        path: &mut ConfigPath<'a>,
+        errors: &mut ConfigErrors,
+    ) {
+        let Value::Record { val: record, .. } = value else {
+            errors.type_mismatch(path, Type::record(), value);
+            return;
+        };
 
-        val.to_mut().retain_mut(|key, value| {
-            if matches!(value, Value::Record { .. }) {
-                plugins.entry(key.to_owned()).or_default().process(
-                    &join_path(path, &[key]),
-                    value,
-                    errors,
-                );
-                true
-            } else {
-                report_invalid_value("should be a record", value.span(), errors);
-                if let Some(conf) = plugins.get(key) {
-                    // Reconstruct the value if it existed before
-                    *value = conf.clone().into_value(value.span());
-                    true
-                } else {
-                    // Remove it if it didn't
-                    false
-                }
+        for (col, val) in record.iter() {
+            let path = &mut path.push(col);
+            match col.as_str() {
+                "default" => self.default.update(val, path, errors),
+                "plugins" => self.plugins.update(val, path, errors),
+                _ => errors.unknown_option(path, val),
             }
-        });
+        }
     }
 }
 
@@ -123,57 +70,43 @@ impl IntoValue for PluginGcConfig {
     }
 }
 
-impl PluginGcConfig {
-    fn process(&mut self, path: &[&str], value: &mut Value, errors: &mut Vec<ShellError>) {
-        if let Value::Record { val, .. } = value {
-            // Handle resets to default if keys are missing
-            if !val.contains("enabled") {
-                self.enabled = PluginGcConfig::default().enabled;
-            }
-            if !val.contains("stop_after") {
-                self.stop_after = PluginGcConfig::default().stop_after;
-            }
+impl UpdateFromValue for PluginGcConfig {
+    fn update<'a>(
+        &mut self,
+        value: &'a Value,
+        path: &mut ConfigPath<'a>,
+        errors: &mut ConfigErrors,
+    ) {
+        let Value::Record { val: record, .. } = value else {
+            errors.type_mismatch(path, Type::record(), value);
+            return;
+        };
 
-            val.to_mut().retain_mut(|key, value| {
-                let span = value.span();
-                match key {
-                    "enabled" => process_bool_config(value, errors, &mut self.enabled),
-                    "stop_after" => match value {
-                        Value::Duration { val, .. } => {
-                            if *val >= 0 {
-                                self.stop_after = *val;
-                            } else {
-                                report_invalid_value("must not be negative", span, errors);
-                                *val = self.stop_after;
-                            }
+        for (col, val) in record.iter() {
+            let path = &mut path.push(col);
+            match col.as_str() {
+                "enabled" => self.enabled.update(val, path, errors),
+                "stop_after" => {
+                    if let Ok(duration) = val.as_duration() {
+                        if duration >= 0 {
+                            self.stop_after = duration;
+                        } else {
+                            errors.invalid_value(path, "a non-negative duration", val);
                         }
-                        _ => {
-                            report_invalid_value("should be a duration", span, errors);
-                            *value = Value::duration(self.stop_after, span);
-                        }
-                    },
-                    _ => {
-                        report_invalid_key(&join_path(path, &[key]), span, errors);
-                        return false;
+                    } else {
+                        errors.type_mismatch(path, Type::Duration, val);
                     }
                 }
-                true
-            })
-        } else {
-            report_invalid_value("should be a record", value.span(), errors);
-            *value = self.clone().into_value(value.span());
+                _ => errors.unknown_option(path, val),
+            }
         }
     }
 }
 
-fn join_path<'a>(a: &[&'a str], b: &[&'a str]) -> Vec<&'a str> {
-    a.iter().copied().chain(b.iter().copied()).collect()
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
-    use nu_protocol::{record, Span};
+    use crate::{record, Config, Span};
 
     fn test_pair() -> (PluginGcConfigs, Value) {
         (
@@ -208,11 +141,12 @@ mod tests {
     }
 
     #[test]
-    fn process() {
-        let (expected, mut input) = test_pair();
-        let mut errors = vec![];
+    fn update() {
+        let (expected, input) = test_pair();
+        let config = Config::default();
+        let mut errors = ConfigErrors::new(&config);
         let mut result = PluginGcConfigs::default();
-        result.process(&[], &mut input, &mut errors);
+        result.update(&input, &mut ConfigPath::new(), &mut errors);
         assert!(errors.is_empty(), "errors: {errors:#?}");
         assert_eq!(expected, result);
     }
diff --git a/crates/nu-protocol/src/config/prelude.rs b/crates/nu-protocol/src/config/prelude.rs
index 8bc100cb90..5b2266557d 100644
--- a/crates/nu-protocol/src/config/prelude.rs
+++ b/crates/nu-protocol/src/config/prelude.rs
@@ -1,3 +1,4 @@
-pub use crate::{record, IntoValue, Span, Value};
+pub(super) use super::{error::ConfigErrors, ConfigPath, UpdateFromValue};
+pub use crate::{record, IntoValue, ShellError, Span, Type, Value};
 pub use serde::{Deserialize, Serialize};
 pub use std::str::FromStr;
diff --git a/crates/nu-protocol/src/config/reedline.rs b/crates/nu-protocol/src/config/reedline.rs
index 65129cf176..330998c202 100644
--- a/crates/nu-protocol/src/config/reedline.rs
+++ b/crates/nu-protocol/src/config/reedline.rs
@@ -1,9 +1,9 @@
-use super::{extract_value, prelude::*};
+use super::{config_update_string_enum, prelude::*};
 use crate as nu_protocol;
-use crate::ShellError;
+use crate::{engine::Closure, FromValue};
 
 /// Definition of a parsed keybinding from the config object
-#[derive(Clone, Debug, IntoValue, Serialize, Deserialize)]
+#[derive(Clone, Debug, FromValue, IntoValue, Serialize, Deserialize)]
 pub struct ParsedKeybinding {
     pub modifier: Value,
     pub keycode: Value,
@@ -12,14 +12,14 @@ pub struct ParsedKeybinding {
 }
 
 /// Definition of a parsed menu from the config object
-#[derive(Clone, Debug, IntoValue, Serialize, Deserialize)]
+#[derive(Clone, Debug, FromValue, IntoValue, Serialize, Deserialize)]
 pub struct ParsedMenu {
     pub name: Value,
     pub marker: Value,
     pub only_buffer_difference: Value,
     pub style: Value,
     pub r#type: Value,
-    pub source: Value,
+    pub source: Option<Closure>,
 }
 
 /// Definition of a Nushell CursorShape (to be mapped to crossterm::cursor::CursorShape)
@@ -47,11 +47,17 @@ impl FromStr for NuCursorShape {
         "blink_block" => Ok(NuCursorShape::BlinkBlock),
         "blink_underscore" => Ok(NuCursorShape::BlinkUnderscore),
         "inherit" => Ok(NuCursorShape::Inherit),
-        _ => Err("expected either 'line', 'block', 'underscore', 'blink_line', 'blink_block', 'blink_underscore' or 'inherit'"),
+        _ => Err("'line', 'block', 'underscore', 'blink_line', 'blink_block', 'blink_underscore' or 'inherit'"),
         }
     }
 }
 
+impl UpdateFromValue for NuCursorShape {
+    fn update(&mut self, value: &Value, path: &mut ConfigPath, errors: &mut ConfigErrors) {
+        config_update_string_enum(self, value, path, errors)
+    }
+}
+
 #[derive(Clone, Copy, Debug, Default, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
 pub struct CursorShapeConfig {
     pub emacs: NuCursorShape,
@@ -59,6 +65,30 @@ pub struct CursorShapeConfig {
     pub vi_normal: NuCursorShape,
 }
 
+impl UpdateFromValue for CursorShapeConfig {
+    fn update<'a>(
+        &mut self,
+        value: &'a Value,
+        path: &mut ConfigPath<'a>,
+        errors: &mut ConfigErrors,
+    ) {
+        let Value::Record { val: record, .. } = value else {
+            errors.type_mismatch(path, Type::record(), value);
+            return;
+        };
+
+        for (col, val) in record.iter() {
+            let path = &mut path.push(col);
+            match col.as_str() {
+                "vi_insert" => self.vi_insert.update(val, path, errors),
+                "vi_normal" => self.vi_normal.update(val, path, errors),
+                "emacs" => self.emacs.update(val, path, errors),
+                _ => errors.unknown_option(path, val),
+            }
+        }
+    }
+}
+
 #[derive(Clone, Copy, Debug, Default, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
 pub enum EditBindings {
     Vi,
@@ -73,89 +103,13 @@ impl FromStr for EditBindings {
         match s.to_ascii_lowercase().as_str() {
             "vi" => Ok(Self::Vi),
             "emacs" => Ok(Self::Emacs),
-            _ => Err("expected either 'emacs' or 'vi'"),
+            _ => Err("'emacs' or 'vi'"),
         }
     }
 }
 
-/// Parses the config object to extract the strings that will compose a keybinding for reedline
-pub(super) fn create_keybindings(value: &Value) -> Result<Vec<ParsedKeybinding>, ShellError> {
-    let span = value.span();
-    match value {
-        Value::Record { val, .. } => {
-            // Finding the modifier value in the record
-            let modifier = extract_value("modifier", val, span)?.clone();
-            let keycode = extract_value("keycode", val, span)?.clone();
-            let mode = extract_value("mode", val, span)?.clone();
-            let event = extract_value("event", val, span)?.clone();
-
-            let keybinding = ParsedKeybinding {
-                modifier,
-                keycode,
-                mode,
-                event,
-            };
-
-            // We return a menu to be able to do recursion on the same function
-            Ok(vec![keybinding])
-        }
-        Value::List { vals, .. } => {
-            let res = vals
-                .iter()
-                .map(create_keybindings)
-                .collect::<Result<Vec<Vec<ParsedKeybinding>>, ShellError>>();
-
-            let res = res?
-                .into_iter()
-                .flatten()
-                .collect::<Vec<ParsedKeybinding>>();
-
-            Ok(res)
-        }
-        _ => Ok(Vec::new()),
-    }
-}
-
-/// Parses the config object to extract the strings that will compose a keybinding for reedline
-pub fn create_menus(value: &Value) -> Result<Vec<ParsedMenu>, ShellError> {
-    let span = value.span();
-    match value {
-        Value::Record { val, .. } => {
-            // Finding the modifier value in the record
-            let name = extract_value("name", val, span)?.clone();
-            let marker = extract_value("marker", val, span)?.clone();
-            let only_buffer_difference =
-                extract_value("only_buffer_difference", val, span)?.clone();
-            let style = extract_value("style", val, span)?.clone();
-            let r#type = extract_value("type", val, span)?.clone();
-
-            // Source is an optional value
-            let source = match extract_value("source", val, span) {
-                Ok(source) => source.clone(),
-                Err(_) => Value::nothing(span),
-            };
-
-            let menu = ParsedMenu {
-                name,
-                only_buffer_difference,
-                marker,
-                style,
-                r#type,
-                source,
-            };
-
-            Ok(vec![menu])
-        }
-        Value::List { vals, .. } => {
-            let res = vals
-                .iter()
-                .map(create_menus)
-                .collect::<Result<Vec<Vec<ParsedMenu>>, ShellError>>();
-
-            let res = res?.into_iter().flatten().collect::<Vec<ParsedMenu>>();
-
-            Ok(res)
-        }
-        _ => Ok(Vec::new()),
+impl UpdateFromValue for EditBindings {
+    fn update(&mut self, value: &Value, path: &mut ConfigPath, errors: &mut ConfigErrors) {
+        config_update_string_enum(self, value, path, errors)
     }
 }
diff --git a/crates/nu-protocol/src/config/rm.rs b/crates/nu-protocol/src/config/rm.rs
index 1d7beca04e..a0cfd31fbf 100644
--- a/crates/nu-protocol/src/config/rm.rs
+++ b/crates/nu-protocol/src/config/rm.rs
@@ -14,3 +14,25 @@ impl Default for RmConfig {
         }
     }
 }
+
+impl UpdateFromValue for RmConfig {
+    fn update<'a>(
+        &mut self,
+        value: &'a Value,
+        path: &mut ConfigPath<'a>,
+        errors: &mut ConfigErrors,
+    ) {
+        let Value::Record { val: record, .. } = value else {
+            errors.type_mismatch(path, Type::record(), value);
+            return;
+        };
+
+        for (col, val) in record.iter() {
+            let path = &mut path.push(col);
+            match col.as_str() {
+                "always_trash" => self.always_trash.update(val, path, errors),
+                _ => errors.unknown_option(path, val),
+            }
+        }
+    }
+}
diff --git a/crates/nu-protocol/src/config/shell_integration.rs b/crates/nu-protocol/src/config/shell_integration.rs
index aa8ab85e9f..d812b34652 100644
--- a/crates/nu-protocol/src/config/shell_integration.rs
+++ b/crates/nu-protocol/src/config/shell_integration.rs
@@ -26,3 +26,31 @@ impl Default for ShellIntegrationConfig {
         }
     }
 }
+
+impl UpdateFromValue for ShellIntegrationConfig {
+    fn update<'a>(
+        &mut self,
+        value: &'a Value,
+        path: &mut ConfigPath<'a>,
+        errors: &mut ConfigErrors,
+    ) {
+        let Value::Record { val: record, .. } = value else {
+            errors.type_mismatch(path, Type::record(), value);
+            return;
+        };
+
+        for (col, val) in record.iter() {
+            let path = &mut path.push(col);
+            match col.as_str() {
+                "osc2" => self.osc2.update(val, path, errors),
+                "osc7" => self.osc7.update(val, path, errors),
+                "osc8" => self.osc8.update(val, path, errors),
+                "osc9_9" => self.osc9_9.update(val, path, errors),
+                "osc133" => self.osc133.update(val, path, errors),
+                "osc633" => self.osc633.update(val, path, errors),
+                "reset_application_mode" => self.reset_application_mode.update(val, path, errors),
+                _ => errors.unknown_option(path, val),
+            }
+        }
+    }
+}
diff --git a/crates/nu-protocol/src/config/table.rs b/crates/nu-protocol/src/config/table.rs
index ac752e267c..c1c763c08e 100644
--- a/crates/nu-protocol/src/config/table.rs
+++ b/crates/nu-protocol/src/config/table.rs
@@ -1,6 +1,5 @@
-use super::prelude::*;
+use super::{config_update_string_enum, prelude::*};
 use crate as nu_protocol;
-use crate::ShellError;
 
 #[derive(Clone, Copy, Debug, Default, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
 pub enum TableMode {
@@ -45,11 +44,17 @@ impl FromStr for TableMode {
             "restructured" => Ok(Self::Restructured),
             "ascii_rounded" => Ok(Self::AsciiRounded),
             "basic_compact" => Ok(Self::BasicCompact),
-            _ => Err("expected either 'basic', 'thin', 'light', 'compact', 'with_love', 'compact_double', 'rounded', 'reinforced', 'heavy', 'none', 'psql', 'markdown', 'dots', 'restructured', 'ascii_rounded', or 'basic_compact'"),
+            _ => Err("'basic', 'thin', 'light', 'compact', 'with_love', 'compact_double', 'rounded', 'reinforced', 'heavy', 'none', 'psql', 'markdown', 'dots', 'restructured', 'ascii_rounded', or 'basic_compact'"),
         }
     }
 }
 
+impl UpdateFromValue for TableMode {
+    fn update(&mut self, value: &Value, path: &mut ConfigPath, errors: &mut ConfigErrors) {
+        config_update_string_enum(self, value, path, errors)
+    }
+}
+
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum FooterMode {
     /// Never show the footer
@@ -70,13 +75,30 @@ impl FromStr for FooterMode {
             "always" => Ok(FooterMode::Always),
             "never" => Ok(FooterMode::Never),
             "auto" => Ok(FooterMode::Auto),
-            x => {
-                if let Ok(count) = x.parse() {
-                    Ok(FooterMode::RowCount(count))
+            _ => Err("'never', 'always', 'auto', or int"),
+        }
+    }
+}
+
+impl UpdateFromValue for FooterMode {
+    fn update(&mut self, value: &Value, path: &mut ConfigPath, errors: &mut ConfigErrors) {
+        match value {
+            Value::String { val, .. } => match val.parse() {
+                Ok(val) => *self = val,
+                Err(err) => errors.invalid_value(path, err.to_string(), value),
+            },
+            &Value::Int { val, .. } => {
+                if val >= 0 {
+                    *self = Self::RowCount(val as u64);
                 } else {
-                    Err("expected either 'never', 'always', 'auto' or a row count")
+                    errors.invalid_value(path, "a non-negative integer", value);
                 }
             }
+            _ => errors.type_mismatch(
+                path,
+                Type::custom("'never', 'always', 'auto', or int"),
+                value,
+            ),
         }
     }
 }
@@ -87,7 +109,7 @@ impl IntoValue for FooterMode {
             FooterMode::Always => "always".into_value(span),
             FooterMode::Never => "never".into_value(span),
             FooterMode::Auto => "auto".into_value(span),
-            FooterMode::RowCount(c) => c.to_string().into_value(span),
+            FooterMode::RowCount(c) => (c as i64).into_value(span),
         }
     }
 }
@@ -110,11 +132,17 @@ impl FromStr for TableIndexMode {
             "always" => Ok(TableIndexMode::Always),
             "never" => Ok(TableIndexMode::Never),
             "auto" => Ok(TableIndexMode::Auto),
-            _ => Err("expected either 'never', 'always' or 'auto'"),
+            _ => Err("'never', 'always' or 'auto'"),
         }
     }
 }
 
+impl UpdateFromValue for TableIndexMode {
+    fn update(&mut self, value: &Value, path: &mut ConfigPath, errors: &mut ConfigErrors) {
+        config_update_string_enum(self, value, path, errors)
+    }
+}
+
 /// A Table view configuration, for a situation where
 /// we need to limit cell width in order to adjust for a terminal size.
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
@@ -159,93 +187,6 @@ impl Default for TrimStrategy {
     }
 }
 
-pub(super) fn try_parse_trim_strategy(
-    value: &Value,
-    errors: &mut Vec<ShellError>,
-) -> Result<TrimStrategy, ShellError> {
-    let map = value.as_record().map_err(|e| ShellError::GenericError {
-        error: "Error while applying config changes".into(),
-        msg: "$env.config.table.trim is not a record".into(),
-        span: Some(value.span()),
-        help: Some("Please consult the documentation for configuring Nushell.".into()),
-        inner: vec![e],
-    })?;
-
-    let mut methodology = match map.get("methodology") {
-        Some(value) => match try_parse_trim_methodology(value) {
-            Some(methodology) => methodology,
-            None => return Ok(TrimStrategy::default()),
-        },
-        None => {
-            errors.push(ShellError::GenericError {
-                error: "Error while applying config changes".into(),
-                msg: "$env.config.table.trim.methodology was not provided".into(),
-                span: Some(value.span()),
-                help: Some("Please consult the documentation for configuring Nushell.".into()),
-                inner: vec![],
-            });
-            return Ok(TrimStrategy::default());
-        }
-    };
-
-    match &mut methodology {
-        TrimStrategy::Wrap { try_to_keep_words } => {
-            if let Some(value) = map.get("wrapping_try_keep_words") {
-                if let Ok(b) = value.as_bool() {
-                    *try_to_keep_words = b;
-                } else {
-                    errors.push(ShellError::GenericError {
-                        error: "Error while applying config changes".into(),
-                        msg: "$env.config.table.trim.wrapping_try_keep_words is not a bool".into(),
-                        span: Some(value.span()),
-                        help: Some(
-                            "Please consult the documentation for configuring Nushell.".into(),
-                        ),
-                        inner: vec![],
-                    });
-                }
-            }
-        }
-        TrimStrategy::Truncate { suffix } => {
-            if let Some(value) = map.get("truncating_suffix") {
-                if let Ok(v) = value.coerce_string() {
-                    *suffix = Some(v);
-                } else {
-                    errors.push(ShellError::GenericError {
-                        error: "Error while applying config changes".into(),
-                        msg: "$env.config.table.trim.truncating_suffix is not a string".into(),
-                        span: Some(value.span()),
-                        help: Some(
-                            "Please consult the documentation for configuring Nushell.".into(),
-                        ),
-                        inner: vec![],
-                    });
-                }
-            }
-        }
-    }
-
-    Ok(methodology)
-}
-
-fn try_parse_trim_methodology(value: &Value) -> Option<TrimStrategy> {
-    if let Ok(value) = value.coerce_str() {
-        match value.to_lowercase().as_str() {
-        "wrapping" => {
-            return Some(TrimStrategy::Wrap {
-                try_to_keep_words: false,
-            });
-        }
-        "truncating" => return Some(TrimStrategy::Truncate { suffix: None }),
-        _ => eprintln!("unrecognized $config.table.trim.methodology value; expected either 'truncating' or 'wrapping'"),
-    }
-    } else {
-        eprintln!("$env.config.table.trim.methodology is not a string")
-    }
-
-    None
-}
-
 impl IntoValue for TrimStrategy {
     fn into_value(self, span: Span) -> Value {
         match self {
@@ -266,6 +207,70 @@ impl IntoValue for TrimStrategy {
     }
 }
 
+impl UpdateFromValue for TrimStrategy {
+    fn update<'a>(
+        &mut self,
+        value: &'a Value,
+        path: &mut ConfigPath<'a>,
+        errors: &mut ConfigErrors,
+    ) {
+        let Value::Record { val: record, .. } = value else {
+            errors.type_mismatch(path, Type::record(), value);
+            return;
+        };
+
+        let Some(methodology) = record.get("methodology") else {
+            errors.missing_column(path, "methodology", value.span());
+            return;
+        };
+
+        match methodology.as_str() {
+            Ok("wrapping") => {
+                let mut try_to_keep_words = if let &mut Self::Wrap { try_to_keep_words } = self {
+                    try_to_keep_words
+                } else {
+                    false
+                };
+                for (col, val) in record.iter() {
+                    let path = &mut path.push(col);
+                    match col.as_str() {
+                        "wrapping_try_keep_words" => try_to_keep_words.update(val, path, errors),
+                        "methodology" | "truncating_suffix" => (),
+                        _ => errors.unknown_option(path, val),
+                    }
+                }
+                *self = Self::Wrap { try_to_keep_words };
+            }
+            Ok("truncating") => {
+                let mut suffix = if let Self::Truncate { suffix } = self {
+                    suffix.take()
+                } else {
+                    None
+                };
+                for (col, val) in record.iter() {
+                    let path = &mut path.push(col);
+                    match col.as_str() {
+                        "truncating_suffix" => match val {
+                            Value::Nothing { .. } => suffix = None,
+                            Value::String { val, .. } => suffix = Some(val.clone()),
+                            _ => errors.type_mismatch(path, Type::String, val),
+                        },
+                        "methodology" | "wrapping_try_keep_words" => (),
+                        _ => errors.unknown_option(path, val),
+                    }
+                }
+                *self = Self::Truncate { suffix };
+            }
+            Ok(_) => errors.invalid_value(
+                &path.push("methodology"),
+                "'wrapping' or 'truncating'",
+                methodology,
+            ),
+            Err(_) => errors.type_mismatch(&path.push("methodology"), Type::String, methodology),
+        }
+    }
+}
+
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct TableIndent {
     pub left: usize,
@@ -288,6 +293,37 @@ impl Default for TableIndent {
     }
 }
 
+impl UpdateFromValue for TableIndent {
+    fn update<'a>(
+        &mut self,
+        value: &'a Value,
+        path: &mut ConfigPath<'a>,
+        errors: &mut ConfigErrors,
+    ) {
+        match value {
+            &Value::Int { val, .. } => {
+                if let Ok(val) = val.try_into() {
+                    self.left = val;
+                    self.right = val;
+                } else {
+                    errors.invalid_value(path, "a non-negative integer", value);
+                }
+            }
+            Value::Record { val: record, .. } => {
+                for (col, val) in record.iter() {
+                    let path = &mut path.push(col);
+                    match col.as_str() {
+                        "left" => self.left.update(val, path, errors),
+                        "right" => self.right.update(val, path, errors),
+                        _ => errors.unknown_option(path, val),
+                    }
+                }
+            }
+            _ => errors.type_mismatch(path, Type::custom("int or record"), value),
+        }
+    }
+}
+
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct TableConfig {
     pub mode: TableMode,
@@ -332,3 +368,41 @@ impl Default for TableConfig {
         }
     }
 }
+
+impl UpdateFromValue for TableConfig {
+    fn update<'a>(
+        &mut self,
+        value: &'a Value,
+        path: &mut ConfigPath<'a>,
+        errors: &mut ConfigErrors,
+    ) {
+        let Value::Record { val: record, .. } = value else {
+            errors.type_mismatch(path, Type::record(), value);
+            return;
+        };
+
+        for (col, val) in record.iter() {
+            let path = &mut path.push(col);
+            match col.as_str() {
+                "mode" => self.mode.update(val, path, errors),
+                "index_mode" => self.index_mode.update(val, path, errors),
+                "show_empty" => self.show_empty.update(val, path, errors),
+                "trim" => self.trim.update(val, path, errors),
+                "header_on_separator" => self.header_on_separator.update(val, path, errors),
+                "padding" => self.padding.update(val, path, errors),
+                "abbreviated_row_count" => match val {
+                    Value::Nothing { .. } => self.abbreviated_row_count = None,
+                    &Value::Int { val: count, .. } => {
+                        if let Ok(count) = count.try_into() {
+                            self.abbreviated_row_count = Some(count);
+                        } else {
+                            errors.invalid_value(path, "a non-negative integer", val);
+                        }
+                    }
+                    _ => errors.type_mismatch(path, Type::custom("int or nothing"), val),
+                },
+                _ => errors.unknown_option(path, val),
+            }
+        }
+    }
+}
diff --git a/crates/nu-protocol/src/engine/stack.rs b/crates/nu-protocol/src/engine/stack.rs
index 296c2eee55..f84fae5148 100644
--- a/crates/nu-protocol/src/engine/stack.rs
+++ b/crates/nu-protocol/src/engine/stack.rs
@@ -3,7 +3,7 @@ use crate::{
         ArgumentStack, EngineState, ErrorHandlerStack, Redirection, StackCallArgGuard,
         StackCollectValueGuard, StackIoGuard, StackOutDest, DEFAULT_OVERLAY_NAME,
     },
-    Config, OutDest, ShellError, Span, Value, VarId, ENV_VARIABLE_ID, NU_VARIABLE_ID,
+    Config, IntoValue, OutDest, ShellError, Span, Value, VarId, ENV_VARIABLE_ID, NU_VARIABLE_ID,
 };
 use std::{
     collections::{HashMap, HashSet},
@@ -211,12 +211,13 @@ impl Stack {
     ///
     /// The config will be updated with successfully parsed values even if an error occurs.
     pub fn update_config(&mut self, engine_state: &EngineState) -> Result<(), ShellError> {
-        if let Some(mut config) = self.get_env_var(engine_state, "config").cloned() {
-            let existing_config = self.get_config(engine_state);
-            let (new_config, error) = config.parse_as_config(&existing_config);
-            self.config = Some(new_config.into());
+        if let Some(value) = self.get_env_var(engine_state, "config") {
+            let old = self.get_config(engine_state);
+            let mut config = (*old).clone();
+            let error = config.update_from_value(&old, value);
             // The config value is modified by the update, so we should add it again
-            self.add_env_var("config".into(), config);
+            self.add_env_var("config".into(), config.clone().into_value(value.span()));
+            self.config = Some(config.into());
             match error {
                 None => Ok(()),
                 Some(err) => Err(err),
diff --git a/crates/nu-protocol/src/errors/cli_error.rs b/crates/nu-protocol/src/errors/cli_error.rs
index 8335f787fb..5680ab172c 100644
--- a/crates/nu-protocol/src/errors/cli_error.rs
+++ b/crates/nu-protocol/src/errors/cli_error.rs
@@ -15,8 +15,8 @@ use thiserror::Error;
 /// forwards most methods, except for `.source_code()`, which we provide.
 #[derive(Error)]
 #[error("{0}")]
-pub struct CliError<'src>(
-    pub &'src (dyn miette::Diagnostic + Send + Sync + 'static),
+struct CliError<'src>(
+    pub &'src dyn miette::Diagnostic,
     pub &'src StateWorkingSet<'src>,
 );
 
@@ -48,10 +48,7 @@ pub fn report_compile_error(working_set: &StateWorkingSet, error: &CompileError)
     report_error(working_set, error);
 }
 
-fn report_error(
-    working_set: &StateWorkingSet,
-    error: &(dyn miette::Diagnostic + Send + Sync + 'static),
-) {
+fn report_error(working_set: &StateWorkingSet, error: &dyn miette::Diagnostic) {
     eprintln!("Error: {:?}", CliError(error, working_set));
     // reset vt processing, aka ansi because illbehaved externals can break it
     #[cfg(windows)]
@@ -60,10 +57,7 @@ fn report_error(
     }
 }
 
-fn report_warning(
-    working_set: &StateWorkingSet,
-    error: &(dyn miette::Diagnostic + Send + Sync + 'static),
-) {
+fn report_warning(working_set: &StateWorkingSet, error: &dyn miette::Diagnostic) {
     eprintln!("Warning: {:?}", CliError(error, working_set));
     // reset vt processing, aka ansi because illbehaved externals can break it
     #[cfg(windows)]
diff --git a/crates/nu-protocol/src/errors/config_error.rs b/crates/nu-protocol/src/errors/config_error.rs
new file mode 100644
index 0000000000..ab1cedfb22
--- /dev/null
+++ b/crates/nu-protocol/src/errors/config_error.rs
@@ -0,0 +1,56 @@
+use crate::{ShellError, Span, Type};
+use miette::Diagnostic;
+use thiserror::Error;
+
+/// The errors that may occur when updating the config
+#[derive(Clone, Debug, PartialEq, Error, Diagnostic)]
+pub enum ConfigError {
+    #[error("Type mismatch at {path}")]
+    #[diagnostic(code(nu::shell::type_mismatch))]
+    TypeMismatch {
+        path: String,
+        expected: Type,
+        actual: Type,
+        #[label = "expected {expected}, but got {actual}"]
+        span: Span,
+    },
+    #[error("Invalid value for {path}")]
+    #[diagnostic(code(nu::shell::invalid_value))]
+    InvalidValue {
+        path: String,
+        valid: String,
+        actual: String,
+        #[label = "expected {valid}, but got {actual}"]
+        span: Span,
+    },
+    #[error("Unknown config option: {path}")]
+    #[diagnostic(code(nu::shell::unknown_config_option))]
+    UnknownOption {
+        path: String,
+        #[label("remove this")]
+        span: Span,
+    },
+    #[error("{path} requires a '{column}' column")]
+    #[diagnostic(code(nu::shell::missing_required_column))]
+    MissingRequiredColumn {
+        path: String,
+        column: &'static str,
+        #[label("has no '{column}' column")]
+        span: Span,
+    },
+    #[error("{path} is deprecated")]
+    #[diagnostic(
+        code(nu::shell::deprecated_config_option),
+        help("please {suggestion} instead")
+    )]
+    Deprecated {
+        path: String,
+        suggestion: &'static str,
+        #[label("deprecated")]
+        span: Span,
+    },
+    // TODO: remove this
+    #[error(transparent)]
+    #[diagnostic(transparent)]
+    ShellError(#[from] ShellError),
+}
diff --git a/crates/nu-protocol/src/errors/mod.rs b/crates/nu-protocol/src/errors/mod.rs
index 17ec6bb813..2e264066a9 100644
--- a/crates/nu-protocol/src/errors/mod.rs
+++ b/crates/nu-protocol/src/errors/mod.rs
@@ -1,5 +1,6 @@
 pub mod cli_error;
 mod compile_error;
+mod config_error;
 mod labeled_error;
 mod parse_error;
 mod parse_warning;
@@ -10,6 +11,7 @@ pub use cli_error::{
     report_shell_warning,
 };
 pub use compile_error::CompileError;
+pub use config_error::ConfigError;
 pub use labeled_error::{ErrorLabel, LabeledError};
 pub use parse_error::{DidYouMean, ParseError};
 pub use parse_warning::ParseWarning;
diff --git a/crates/nu-protocol/src/errors/shell_error.rs b/crates/nu-protocol/src/errors/shell_error.rs
index 4bed5abd07..0f609061d6 100644
--- a/crates/nu-protocol/src/errors/shell_error.rs
+++ b/crates/nu-protocol/src/errors/shell_error.rs
@@ -1,13 +1,12 @@
+use crate::{
+    ast::Operator, engine::StateWorkingSet, format_shell_error, record, ConfigError, LabeledError,
+    ParseError, Span, Spanned, Type, Value,
+};
 use miette::Diagnostic;
 use serde::{Deserialize, Serialize};
 use std::{io, num::NonZeroI32};
 use thiserror::Error;
 
-use crate::{
-    ast::Operator, engine::StateWorkingSet, format_shell_error, record, LabeledError, ParseError,
-    Span, Spanned, Value,
-};
-
 /// The fundamental error type for the evaluation engine. These cases represent different kinds of errors
 /// the evaluator might face, along with helpful spans to label. An error renderer will take this error value
 /// and pass it into an error viewer to display to the user.
@@ -108,6 +107,34 @@ pub enum ShellError {
         span: Span,
     },
 
+    /// A value's type did not match the expected type.
+    ///
+    /// ## Resolution
+    ///
+    /// Convert the value to the correct type or provide a value of the correct type.
+    #[error("Type mismatch")]
+    #[diagnostic(code(nu::shell::type_mismatch))]
+    RuntimeTypeMismatch {
+        expected: Type,
+        actual: Type,
+        #[label = "expected {expected}, but got {actual}"]
+        span: Span,
+    },
+
+    /// A value had the correct type but is otherwise invalid.
+    ///
+    /// ## Resolution
+    ///
+    /// Ensure the value meets the criteria in the error message.
+    #[error("Invalid value")]
+    #[diagnostic(code(nu::shell::invalid_value))]
+    InvalidValue {
+        valid: String,
+        actual: String,
+        #[label = "expected {valid}, but got {actual}"]
+        span: Span,
+    },
+
     /// A command received an argument with correct type but incorrect value.
     ///
     /// ## Resolution
@@ -1085,30 +1112,28 @@ pub enum ShellError {
         span: Span,
     },
 
-    /// The value given for this configuration is not supported.
+    /// Failed to update the config due to one or more errors.
     ///
     /// ## Resolution
     ///
-    /// Refer to the specific error message for details and convert values as needed.
-    #[error("Unsupported config value")]
-    #[diagnostic(code(nu::shell::unsupported_config_value))]
-    UnsupportedConfigValue {
-        expected: String,
-        value: String,
-        #[label("expected {expected}, got {value}")]
-        span: Span,
+    /// Refer to the error messages for specific details.
+    #[error("Encountered {} error(s) when updating config", errors.len())]
+    #[diagnostic(code(nu::shell::invalid_config))]
+    InvalidConfig {
+        #[related]
+        errors: Vec<ConfigError>,
     },
 
-    /// An expected configuration value is not present.
+    /// A value was missing a required column.
     ///
     /// ## Resolution
     ///
-    /// Refer to the specific error message and add the configuration value to your config file as needed.
-    #[error("Missing config value")]
-    #[diagnostic(code(nu::shell::missing_config_value))]
-    MissingConfigValue {
-        missing_value: String,
-        #[label("missing {missing_value}")]
+    /// Make sure the value has the required column.
+    #[error("Value is missing a required '{column}' column")]
+    #[diagnostic(code(nu::shell::missing_required_column))]
+    MissingRequiredColumn {
+        column: &'static str,
+        #[label("has no '{column}' column")]
         span: Span,
     },
 
diff --git a/crates/nu-protocol/src/ty.rs b/crates/nu-protocol/src/ty.rs
index 7c004d81de..55da6422b9 100644
--- a/crates/nu-protocol/src/ty.rs
+++ b/crates/nu-protocol/src/ty.rs
@@ -48,6 +48,10 @@ impl Type {
         Self::Table([].into())
     }
 
+    pub fn custom(name: impl Into<Box<str>>) -> Self {
+        Self::Custom(name.into())
+    }
+
     pub fn is_subtype(&self, other: &Type) -> bool {
         // Structural subtyping
         let is_subtype_collection = |this: &[(String, Type)], that: &[(String, Type)]| {
diff --git a/crates/nu-protocol/tests/into_config.rs b/crates/nu-protocol/tests/into_config.rs
index 7995ea63c5..63d7eb8b22 100644
--- a/crates/nu-protocol/tests/into_config.rs
+++ b/crates/nu-protocol/tests/into_config.rs
@@ -52,7 +52,7 @@ fn config_add_unsupported_key() {
 
     assert!(actual
         .err
-        .contains("$env.config.foo is an unknown config setting"));
+        .contains("Unknown config option: $env.config.foo"));
 }
 
 #[test]
@@ -61,7 +61,7 @@ fn config_add_unsupported_type() {
         r#"$env.config.ls = '' "#,
         r#";"#]));
 
-    assert!(actual.err.contains("should be a record"));
+    assert!(actual.err.contains("Type mismatch"));
 }
 
 #[test]
@@ -70,12 +70,8 @@ fn config_add_unsupported_value() {
         r#"$env.config.history.file_format = ''"#,
         r#";"#]));
 
-    assert!(actual
-        .err
-        .contains("unrecognized $env.config.history.file_format option ''"));
-    assert!(actual
-        .err
-        .contains("expected either 'sqlite' or 'plaintext'"));
+    assert!(actual.err.contains("Invalid value"));
+    assert!(actual.err.contains("expected 'sqlite' or 'plaintext'"));
 }
 
 #[test]
diff --git a/src/test_bins.rs b/src/test_bins.rs
index c4ba37ed8e..9752114977 100644
--- a/src/test_bins.rs
+++ b/src/test_bins.rs
@@ -2,10 +2,9 @@ use nu_cmd_base::hook::{eval_env_change_hook, eval_hook};
 use nu_engine::eval_block;
 use nu_parser::parse;
 use nu_protocol::{
-    cli_error::CliError,
     debugger::WithoutDebug,
     engine::{EngineState, Stack, StateWorkingSet},
-    PipelineData, Value,
+    report_parse_error, report_shell_error, PipelineData, ShellError, Value,
 };
 use nu_std::load_standard_library;
 use std::{
@@ -209,20 +208,13 @@ pub fn chop() {
     std::process::exit(0);
 }
 
-fn outcome_err(
-    engine_state: &EngineState,
-    error: &(dyn miette::Diagnostic + Send + Sync + 'static),
-) -> ! {
-    let working_set = StateWorkingSet::new(engine_state);
-
-    eprintln!("Error: {:?}", CliError(error, &working_set));
-
+fn outcome_err(engine_state: &EngineState, error: &ShellError) -> ! {
+    report_shell_error(engine_state, error);
     std::process::exit(1);
 }
 
 fn outcome_ok(msg: String) -> ! {
     println!("{msg}");
-
     std::process::exit(0);
 }
 
@@ -320,7 +312,8 @@ pub fn nu_repl() {
             );
 
             if let Some(err) = working_set.parse_errors.first() {
-                outcome_err(&engine_state, err);
+                report_parse_error(&working_set, err);
+                std::process::exit(1);
             }
             (block, working_set.render())
         };
diff --git a/tests/hooks/mod.rs b/tests/hooks/mod.rs
index af71b9941f..4fc7490106 100644
--- a/tests/hooks/mod.rs
+++ b/tests/hooks/mod.rs
@@ -441,7 +441,7 @@ fn err_hook_wrong_env_type_1() {
     let actual_repl = nu!(nu_repl_code(inp));
     dbg!(&actual_repl.err);
 
-    assert!(actual_repl.err.contains("unsupported_config_value"));
+    assert!(actual_repl.err.contains("Type mismatch"));
     assert_eq!(actual_repl.out, "");
 }
 
@@ -458,7 +458,7 @@ fn err_hook_wrong_env_type_2() {
 
     let actual_repl = nu!(nu_repl_code(inp));
 
-    assert!(actual_repl.err.contains("type_mismatch"));
+    assert!(actual_repl.err.contains("Type mismatch"));
     assert_eq!(actual_repl.out, "");
 }
 
@@ -480,7 +480,7 @@ fn err_hook_wrong_env_type_3() {
 
     let actual_repl = nu!(nu_repl_code(inp));
 
-    assert!(actual_repl.err.contains("unsupported_config_value"));
+    assert!(actual_repl.err.contains("Type mismatch"));
     assert_eq!(actual_repl.out, "");
 }
 
@@ -503,7 +503,7 @@ fn err_hook_non_boolean_condition_output() {
 
     let actual_repl = nu!(nu_repl_code(inp));
 
-    assert!(actual_repl.err.contains("unsupported_config_value"));
+    assert!(actual_repl.err.contains("Type mismatch"));
     assert_eq!(actual_repl.out, "");
 }
 
@@ -526,7 +526,7 @@ fn err_hook_non_condition_not_a_block() {
 
     let actual_repl = nu!(nu_repl_code(inp));
 
-    assert!(actual_repl.err.contains("unsupported_config_value"));
+    assert!(actual_repl.err.contains("Type mismatch"));
     assert_eq!(actual_repl.out, "");
 }
 
@@ -548,7 +548,7 @@ fn err_hook_parse_error() {
 
     let actual_repl = nu!(nu_repl_code(inp));
 
-    assert!(actual_repl.err.contains("unsupported_config_value"));
+    assert!(actual_repl.err.contains("source code has errors"));
     assert_eq!(actual_repl.out, "");
 }
 
diff --git a/tests/repl/test_config.rs b/tests/repl/test_config.rs
index 6c0ba6180f..839b795b48 100644
--- a/tests/repl/test_config.rs
+++ b/tests/repl/test_config.rs
@@ -119,7 +119,7 @@ fn mutate_nu_config_plugin() -> TestResult {
 
 #[test]
 fn reject_nu_config_plugin_non_record() -> TestResult {
-    fail_test(r#"$env.config.plugins = 5"#, "should be a record")
+    fail_test(r#"$env.config.plugins = 5"#, "Type mismatch")
 }
 
 #[test]
@@ -151,7 +151,7 @@ fn mutate_nu_config_plugin_gc_default_stop_after_negative() -> TestResult {
             $env.config.plugin_gc.default.stop_after = -1sec
             $env.config.plugin_gc.default.stop_after
         "#,
-        "must not be negative",
+        "expected a non-negative duration",
     )
 }
 

From 389e7d25022e9d07959373a6efc3db8d88f1f033 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Fri, 11 Oct 2024 13:36:09 -0500
Subject: [PATCH 0545/1072] make `FooterMode::Auto` work (#14063)

# Description

@Yethal discovered that `FooterMode::Auto` in the config as
`$env.config.footer_mode = auto` did not work. This PR attempts to fix
that problem by implementing the auto algorithm that was already
supposed to work.

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock                             |  1 +
 crates/nu-protocol/src/config/table.rs |  2 +-
 crates/nu-table/Cargo.toml             |  1 +
 crates/nu-table/src/common.rs          | 20 ++++++++++++++++++--
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ced79abfdb..8d35cea895 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3493,6 +3493,7 @@ dependencies = [
  "nu-utils",
  "once_cell",
  "tabled",
+ "terminal_size",
 ]
 
 [[package]]
diff --git a/crates/nu-protocol/src/config/table.rs b/crates/nu-protocol/src/config/table.rs
index c1c763c08e..7dbe1dd9d2 100644
--- a/crates/nu-protocol/src/config/table.rs
+++ b/crates/nu-protocol/src/config/table.rs
@@ -63,7 +63,7 @@ pub enum FooterMode {
     Always,
     /// Only show the footer if there are more than RowCount rows
     RowCount(u64),
-    /// Calculate the screen height, calculate row count, if display will be bigger than screen, add the footer
+    /// Calculate the screen height and row count, if screen height is larger than row count, don't show footer
     Auto,
 }
 
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index f9aeaca041..33554ae795 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -22,6 +22,7 @@ nu-ansi-term = { workspace = true }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 tabled = { workspace = true, features = ["ansi"], default-features = false }
+terminal_size = { workspace = true }
 
 [dev-dependencies]
 # nu-test-support = { path="../nu-test-support", version = "0.98.1"  }
diff --git a/crates/nu-table/src/common.rs b/crates/nu-table/src/common.rs
index b15874d7c8..3a793a690e 100644
--- a/crates/nu-table/src/common.rs
+++ b/crates/nu-table/src/common.rs
@@ -3,6 +3,7 @@ use crate::{
 };
 use nu_color_config::{Alignment, StyleComputer, TextStyle};
 use nu_protocol::{Config, FooterMode, ShellError, Span, TableMode, TrimStrategy, Value};
+use terminal_size::{terminal_size, Height, Width};
 
 pub type NuText = (String, TextStyle);
 pub type TableResult = Result<Option<TableOutput>, ShellError>;
@@ -194,6 +195,21 @@ fn with_footer(config: &Config, with_header: bool, count_records: usize) -> bool
 }
 
 fn need_footer(config: &Config, count_records: u64) -> bool {
-    matches!(config.footer_mode, FooterMode::RowCount(limit) if count_records > limit)
-        || matches!(config.footer_mode, FooterMode::Always)
+    match config.footer_mode {
+        // Only show the footer if there are more than RowCount rows
+        FooterMode::RowCount(limit) => count_records > limit,
+        // Always show the footer
+        FooterMode::Always => true,
+        // Never show the footer
+        FooterMode::Never => false,
+        // Calculate the screen height and row count, if screen height is larger than row count, don't show footer
+        FooterMode::Auto => {
+            let (_width, height) = match terminal_size() {
+                Some((w, h)) => (Width(w.0).0 as u64, Height(h.0).0 as u64),
+                None => (Width(0).0 as u64, Height(0).0 as u64),
+            };
+
+            height <= count_records
+        }
+    }
 }

From 0e3a8c552ce14743be5841493c1394617fbe299f Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Fri, 11 Oct 2024 14:57:32 -0400
Subject: [PATCH 0546/1072] Correct wording from previous PR (#14066)

# Description

Apologies - The updated wording I used in the last PR *description* was
not what I actually pushed. I failed to commit and push the last update.
This PR fixes the code to reflect what was described in #14065:

```
-r, --header-row - use the first input column as the table header-row (or keynames when combined with --as-record)
```

# User-Facing Changes

Help/doc only

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

(And visually confirmed help changes ;-))

# After Submitting

N/A
---
 crates/nu-command/src/filters/transpose.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-command/src/filters/transpose.rs b/crates/nu-command/src/filters/transpose.rs
index c14a134076..813a4733b2 100644
--- a/crates/nu-command/src/filters/transpose.rs
+++ b/crates/nu-command/src/filters/transpose.rs
@@ -25,7 +25,7 @@ impl Command for Transpose {
             ])
             .switch(
                 "header-row",
-                "treat the first column as the header-row (column names)",
+                "use the first input column as the table header-row (or keynames when combined with --as-record)",
                 Some('r'),
             )
             .switch(

From de08b68ba8c6473313b27325fe110ac48f242e6a Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Fri, 11 Oct 2024 23:37:10 -0700
Subject: [PATCH 0547/1072] Fix `try` printing when it is not the last pipeline
 element  (#13992)

# Description

Fixes #13991. This was done by more clearly separating the case when a
pipeline is drained vs when it is being written (to a file).

I also added an `OutDest::Print` case which might not be strictly
necessary, but is a helpful addition.

# User-Facing Changes

Bug fix.

# Tests + Formatting

Added a test.

# After Submitting

There are still a few redirection bugs that I found, but they require
larger code changes, so I'll leave them until after the release.
---
 crates/nu-cmd-lang/src/core_commands/try_.rs  |  2 +-
 crates/nu-command/src/filters/tee.rs          | 10 +-
 crates/nu-command/tests/commands/try_.rs      | 13 ++-
 crates/nu-engine/src/compile/builder.rs       |  2 +-
 crates/nu-engine/src/compile/keyword.rs       |  2 +-
 crates/nu-engine/src/compile/redirect.rs      |  3 +-
 crates/nu-engine/src/eval.rs                  | 46 ++++-----
 crates/nu-engine/src/eval_ir.rs               | 24 +++--
 .../nu-protocol/src/engine/stack_out_dest.rs  |  4 +-
 crates/nu-protocol/src/ir/display.rs          |  5 +-
 crates/nu-protocol/src/ir/mod.rs              |  7 +-
 .../nu-protocol/src/pipeline/byte_stream.rs   | 94 +-----------------
 crates/nu-protocol/src/pipeline/out_dest.rs   | 12 ++-
 .../nu-protocol/src/pipeline/pipeline_data.rs | 97 ++++++++++---------
 14 files changed, 127 insertions(+), 194 deletions(-)

diff --git a/crates/nu-cmd-lang/src/core_commands/try_.rs b/crates/nu-cmd-lang/src/core_commands/try_.rs
index 9e5196c650..ccf0d41f3b 100644
--- a/crates/nu-cmd-lang/src/core_commands/try_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/try_.rs
@@ -63,7 +63,7 @@ impl Command for Try {
         let eval_block = get_eval_block(engine_state);
 
         let result = eval_block(engine_state, stack, try_block, input)
-            .and_then(|pipeline| pipeline.write_to_out_dests(engine_state, stack));
+            .and_then(|pipeline| pipeline.drain_to_out_dests(engine_state, stack));
 
         match result {
             Err(err) => run_catch(err, head, catch_block, engine_state, stack, eval_block),
diff --git a/crates/nu-command/src/filters/tee.rs b/crates/nu-command/src/filters/tee.rs
index 02afdc5271..a6f0027016 100644
--- a/crates/nu-command/src/filters/tee.rs
+++ b/crates/nu-command/src/filters/tee.rs
@@ -163,7 +163,7 @@ use it in your pipeline."#
                                     Ok(None)
                                 }
                                 OutDest::Null => copy_on_thread(tee, io::sink(), &info).map(Some),
-                                OutDest::Inherit => {
+                                OutDest::Print | OutDest::Inherit => {
                                     copy_on_thread(tee, io::stderr(), &info).map(Some)
                                 }
                                 OutDest::File(file) => {
@@ -181,7 +181,9 @@ use it in your pipeline."#
                                     Ok(())
                                 }
                                 OutDest::Null => copy_pipe(stdout, io::sink(), &info),
-                                OutDest::Inherit => copy_pipe(stdout, io::stdout(), &info),
+                                OutDest::Print | OutDest::Inherit => {
+                                    copy_pipe(stdout, io::stdout(), &info)
+                                }
                                 OutDest::File(file) => copy_pipe(stdout, file.as_ref(), &info),
                             }?;
                         }
@@ -198,7 +200,7 @@ use it in your pipeline."#
                                 OutDest::Null => {
                                     copy_pipe_on_thread(stderr, io::sink(), &info).map(Some)
                                 }
-                                OutDest::Inherit => {
+                                OutDest::Print | OutDest::Inherit => {
                                     copy_pipe_on_thread(stderr, io::stderr(), &info).map(Some)
                                 }
                                 OutDest::File(file) => {
@@ -218,7 +220,7 @@ use it in your pipeline."#
                                     Ok(())
                                 }
                                 OutDest::Null => copy(tee, io::sink(), &info),
-                                OutDest::Inherit => copy(tee, io::stdout(), &info),
+                                OutDest::Print | OutDest::Inherit => copy(tee, io::stdout(), &info),
                                 OutDest::File(file) => copy(tee, file.as_ref(), &info),
                             }?;
                         }
diff --git a/crates/nu-command/tests/commands/try_.rs b/crates/nu-command/tests/commands/try_.rs
index dc8c7ba5f8..487fd034b5 100644
--- a/crates/nu-command/tests/commands/try_.rs
+++ b/crates/nu-command/tests/commands/try_.rs
@@ -107,13 +107,22 @@ fn exit_code_available_in_catch() {
 }
 
 #[test]
-fn try_catches_exit_code_in_assignment() {
+fn catches_exit_code_in_assignment() {
     let actual = nu!("let x = try { nu -c 'exit 42' } catch { |e| $e.exit_code }; $x");
     assert_eq!(actual.out, "42");
 }
 
 #[test]
-fn try_catches_exit_code_in_expr() {
+fn catches_exit_code_in_expr() {
     let actual = nu!("print (try { nu -c 'exit 42' } catch { |e| $e.exit_code })");
     assert_eq!(actual.out, "42");
 }
+
+#[test]
+fn prints_only_if_last_pipeline() {
+    let actual = nu!("try { 'should not print' }; 'last value'");
+    assert_eq!(actual.out, "last value");
+
+    let actual = nu!("try { ['should not print'] | every 1 }; 'last value'");
+    assert_eq!(actual.out, "last value");
+}
diff --git a/crates/nu-engine/src/compile/builder.rs b/crates/nu-engine/src/compile/builder.rs
index 0cdf1b9dcf..0e2e943053 100644
--- a/crates/nu-engine/src/compile/builder.rs
+++ b/crates/nu-engine/src/compile/builder.rs
@@ -205,7 +205,7 @@ impl BlockBuilder {
             Instruction::Span { src_dst } => allocate(&[*src_dst], &[*src_dst]),
             Instruction::Drop { src } => allocate(&[*src], &[]),
             Instruction::Drain { src } => allocate(&[*src], &[]),
-            Instruction::WriteToOutDests { src } => allocate(&[*src], &[]),
+            Instruction::DrainIfEnd { src } => allocate(&[*src], &[]),
             Instruction::LoadVariable { dst, var_id: _ } => allocate(&[], &[*dst]),
             Instruction::StoreVariable { var_id: _, src } => allocate(&[*src], &[]),
             Instruction::DropVariable { var_id: _ } => Ok(()),
diff --git a/crates/nu-engine/src/compile/keyword.rs b/crates/nu-engine/src/compile/keyword.rs
index 62c5b7108a..b7f378f592 100644
--- a/crates/nu-engine/src/compile/keyword.rs
+++ b/crates/nu-engine/src/compile/keyword.rs
@@ -473,7 +473,7 @@ pub(crate) fn compile_try(
     if let Some(mode) = redirect_modes.err {
         builder.push(mode.map(|mode| Instruction::RedirectErr { mode }))?;
     }
-    builder.push(Instruction::WriteToOutDests { src: io_reg }.into_spanned(call.head))?;
+    builder.push(Instruction::DrainIfEnd { src: io_reg }.into_spanned(call.head))?;
     builder.push(Instruction::PopErrorHandler.into_spanned(call.head))?;
 
     // Jump over the failure case
diff --git a/crates/nu-engine/src/compile/redirect.rs b/crates/nu-engine/src/compile/redirect.rs
index eaedd65213..101cc9077c 100644
--- a/crates/nu-engine/src/compile/redirect.rs
+++ b/crates/nu-engine/src/compile/redirect.rs
@@ -151,7 +151,8 @@ pub(crate) fn out_dest_to_redirect_mode(
             OutDest::PipeSeparate => Ok(RedirectMode::PipeSeparate),
             OutDest::Value => Ok(RedirectMode::Value),
             OutDest::Null => Ok(RedirectMode::Null),
-            OutDest::Inherit => Ok(RedirectMode::Inherit),
+            OutDest::Print => Ok(RedirectMode::Print),
+            OutDest::Inherit => Err(CompileError::InvalidRedirectMode { span }),
             OutDest::File(_) => Err(CompileError::InvalidRedirectMode { span }),
         })
         .transpose()
diff --git a/crates/nu-engine/src/eval.rs b/crates/nu-engine/src/eval.rs
index c365d360c6..3e5ad239fe 100644
--- a/crates/nu-engine/src/eval.rs
+++ b/crates/nu-engine/src/eval.rs
@@ -395,13 +395,13 @@ fn eval_element_with_input_inner<D: DebugContext>(
 ) -> Result<PipelineData, ShellError> {
     let data = eval_expression_with_input::<D>(engine_state, stack, &element.expr, input)?;
 
-    if let Some(redirection) = element.redirection.as_ref() {
-        let is_external = if let PipelineData::ByteStream(stream, ..) = &data {
-            matches!(stream.source(), ByteStreamSource::Child(..))
-        } else {
-            false
-        };
+    let is_external = if let PipelineData::ByteStream(stream, ..) = &data {
+        matches!(stream.source(), ByteStreamSource::Child(..))
+    } else {
+        false
+    };
 
+    if let Some(redirection) = element.redirection.as_ref() {
         if !is_external {
             match redirection {
                 &PipelineRedirection::Single {
@@ -437,30 +437,24 @@ fn eval_element_with_input_inner<D: DebugContext>(
         }
     }
 
-    let has_stdout_file = matches!(stack.pipe_stdout(), Some(OutDest::File(_)));
-
-    let data = match &data {
-        PipelineData::Value(..) | PipelineData::ListStream(..) => {
-            if has_stdout_file {
-                data.write_to_out_dests(engine_state, stack)?;
+    let data = if let Some(OutDest::File(file)) = stack.pipe_stdout() {
+        match &data {
+            PipelineData::Value(..) | PipelineData::ListStream(..) => {
+                data.write_to(file.as_ref())?;
                 PipelineData::Empty
-            } else {
-                data
             }
-        }
-        PipelineData::ByteStream(stream, ..) => {
-            let write = match stream.source() {
-                ByteStreamSource::Read(_) | ByteStreamSource::File(_) => has_stdout_file,
-                ByteStreamSource::Child(_) => false,
-            };
-            if write {
-                data.write_to_out_dests(engine_state, stack)?;
-                PipelineData::Empty
-            } else {
-                data
+            PipelineData::ByteStream(..) => {
+                if !is_external {
+                    data.write_to(file.as_ref())?;
+                    PipelineData::Empty
+                } else {
+                    data
+                }
             }
+            PipelineData::Empty => PipelineData::Empty,
         }
-        PipelineData::Empty => PipelineData::Empty,
+    } else {
+        data
     };
 
     Ok(data)
diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index e5a3875f83..233b01c33f 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -322,13 +322,13 @@ fn eval_instruction<D: DebugContext>(
             let data = ctx.take_reg(*src);
             drain(ctx, data)
         }
-        Instruction::WriteToOutDests { src } => {
+        Instruction::DrainIfEnd { src } => {
             let data = ctx.take_reg(*src);
             let res = {
                 let stack = &mut ctx
                     .stack
                     .push_redirection(ctx.redirect_out.clone(), ctx.redirect_err.clone());
-                data.write_to_out_dests(ctx.engine_state, stack)?
+                data.drain_to_out_dests(ctx.engine_state, stack)?
             };
             ctx.put_reg(*src, res);
             Ok(Continue)
@@ -507,14 +507,19 @@ fn eval_instruction<D: DebugContext>(
                     msg: format!("Tried to write to file #{file_num}, but it is not open"),
                     span: Some(*span),
                 })?;
-            let result = {
-                let mut stack = ctx
-                    .stack
-                    .push_redirection(Some(Redirection::File(file)), None);
-                src.write_to_out_dests(ctx.engine_state, &mut stack)?
+            let is_external = if let PipelineData::ByteStream(stream, ..) = &src {
+                matches!(stream.source(), ByteStreamSource::Child(..))
+            } else {
+                false
             };
-            // Abort execution if there's an exit code from a failed external
-            drain(ctx, result)
+            if let Err(err) = src.write_to(file.as_ref()) {
+                if is_external {
+                    ctx.stack.set_last_error(&err);
+                }
+                Err(err)?
+            } else {
+                Ok(Continue)
+            }
         }
         Instruction::CloseFile { file_num } => {
             if ctx.files[*file_num as usize].take().is_some() {
@@ -1421,6 +1426,7 @@ fn eval_redirection(
         RedirectMode::Value => Ok(Some(Redirection::Pipe(OutDest::Value))),
         RedirectMode::Null => Ok(Some(Redirection::Pipe(OutDest::Null))),
         RedirectMode::Inherit => Ok(Some(Redirection::Pipe(OutDest::Inherit))),
+        RedirectMode::Print => Ok(Some(Redirection::Pipe(OutDest::Print))),
         RedirectMode::File { file_num } => {
             let file = ctx
                 .files
diff --git a/crates/nu-protocol/src/engine/stack_out_dest.rs b/crates/nu-protocol/src/engine/stack_out_dest.rs
index b11177ec3a..98944aa233 100644
--- a/crates/nu-protocol/src/engine/stack_out_dest.rs
+++ b/crates/nu-protocol/src/engine/stack_out_dest.rs
@@ -62,8 +62,8 @@ pub(crate) struct StackOutDest {
 impl StackOutDest {
     pub(crate) fn new() -> Self {
         Self {
-            pipe_stdout: None,
-            pipe_stderr: None,
+            pipe_stdout: Some(OutDest::Print),
+            pipe_stderr: Some(OutDest::Print),
             stdout: OutDest::Inherit,
             stderr: OutDest::Inherit,
             parent_stdout: None,
diff --git a/crates/nu-protocol/src/ir/display.rs b/crates/nu-protocol/src/ir/display.rs
index 68ef9ebd77..bc275f0bc5 100644
--- a/crates/nu-protocol/src/ir/display.rs
+++ b/crates/nu-protocol/src/ir/display.rs
@@ -92,8 +92,8 @@ impl<'a> fmt::Display for FmtInstruction<'a> {
             Instruction::Drain { src } => {
                 write!(f, "{:WIDTH$} {src}", "drain")
             }
-            Instruction::WriteToOutDests { src } => {
-                write!(f, "{:WIDTH$} {src}", "write-to-out-dests")
+            Instruction::DrainIfEnd { src } => {
+                write!(f, "{:WIDTH$} {src}", "drain-if-end")
             }
             Instruction::LoadVariable { dst, var_id } => {
                 let var = FmtVar::new(self.engine_state, *var_id);
@@ -312,6 +312,7 @@ impl fmt::Display for RedirectMode {
             RedirectMode::Value => write!(f, "value"),
             RedirectMode::Null => write!(f, "null"),
             RedirectMode::Inherit => write!(f, "inherit"),
+            RedirectMode::Print => write!(f, "print"),
             RedirectMode::File { file_num } => write!(f, "file({file_num})"),
             RedirectMode::Caller => write!(f, "caller"),
         }
diff --git a/crates/nu-protocol/src/ir/mod.rs b/crates/nu-protocol/src/ir/mod.rs
index 8c1bb52240..428a2667e0 100644
--- a/crates/nu-protocol/src/ir/mod.rs
+++ b/crates/nu-protocol/src/ir/mod.rs
@@ -123,9 +123,9 @@ pub enum Instruction {
     /// code, and invokes any available error handler with Empty, or if not available, returns an
     /// exit-code-only stream, leaving the block.
     Drain { src: RegId },
-    /// Write to the output destinations in the stack
+    /// Drain the value/stream in a register and discard only if this is the last pipeline element.
     // TODO: see if it's possible to remove this
-    WriteToOutDests { src: RegId },
+    DrainIfEnd { src: RegId },
     /// Load the value of a variable into the `dst` register
     LoadVariable { dst: RegId, var_id: VarId },
     /// Store the value of a variable from the `src` register
@@ -290,7 +290,7 @@ impl Instruction {
             Instruction::Span { src_dst } => Some(src_dst),
             Instruction::Drop { .. } => None,
             Instruction::Drain { .. } => None,
-            Instruction::WriteToOutDests { .. } => None,
+            Instruction::DrainIfEnd { .. } => None,
             Instruction::LoadVariable { dst, .. } => Some(dst),
             Instruction::StoreVariable { .. } => None,
             Instruction::DropVariable { .. } => None,
@@ -450,6 +450,7 @@ pub enum RedirectMode {
     Value,
     Null,
     Inherit,
+    Print,
     /// Use the given numbered file.
     File {
         file_num: u32,
diff --git a/crates/nu-protocol/src/pipeline/byte_stream.rs b/crates/nu-protocol/src/pipeline/byte_stream.rs
index 0dc03b3091..8e46402a1d 100644
--- a/crates/nu-protocol/src/pipeline/byte_stream.rs
+++ b/crates/nu-protocol/src/pipeline/byte_stream.rs
@@ -1,7 +1,7 @@
 //! Module managing the streaming of raw bytes between pipeline elements
 use crate::{
     process::{ChildPipe, ChildProcess},
-    ErrSpan, IntoSpanned, OutDest, PipelineData, ShellError, Signals, Span, Type, Value,
+    ErrSpan, IntoSpanned, PipelineData, ShellError, Signals, Span, Type, Value,
 };
 use serde::{Deserialize, Serialize};
 #[cfg(unix)]
@@ -13,7 +13,6 @@ use std::{
     fs::File,
     io::{self, BufRead, BufReader, Cursor, ErrorKind, Read, Write},
     process::Stdio,
-    thread,
 };
 
 /// The source of bytes for a [`ByteStream`].
@@ -600,80 +599,6 @@ impl ByteStream {
         }
         Ok(())
     }
-
-    pub(crate) fn write_to_out_dests(
-        self,
-        stdout: &OutDest,
-        stderr: &OutDest,
-    ) -> Result<(), ShellError> {
-        let span = self.span;
-        let signals = &self.signals;
-
-        match self.stream {
-            ByteStreamSource::Read(read) => {
-                write_to_out_dest(read, stdout, true, span, signals)?;
-            }
-            ByteStreamSource::File(file) => match stdout {
-                OutDest::Pipe | OutDest::PipeSeparate | OutDest::Value | OutDest::Null => {}
-                OutDest::Inherit => {
-                    copy_with_signals(file, io::stdout(), span, signals)?;
-                }
-                OutDest::File(f) => {
-                    copy_with_signals(file, f.as_ref(), span, signals)?;
-                }
-            },
-            ByteStreamSource::Child(mut child) => {
-                match (child.stdout.take(), child.stderr.take()) {
-                    (Some(out), Some(err)) => {
-                        // To avoid deadlocks, we must spawn a separate thread to wait on stderr.
-                        thread::scope(|s| {
-                            let err_thread = thread::Builder::new()
-                                .name("stderr writer".into())
-                                .spawn_scoped(s, || match err {
-                                    ChildPipe::Pipe(pipe) => {
-                                        write_to_out_dest(pipe, stderr, false, span, signals)
-                                    }
-                                    ChildPipe::Tee(tee) => {
-                                        write_to_out_dest(tee, stderr, false, span, signals)
-                                    }
-                                })
-                                .err_span(span);
-
-                            match out {
-                                ChildPipe::Pipe(pipe) => {
-                                    write_to_out_dest(pipe, stdout, true, span, signals)
-                                }
-                                ChildPipe::Tee(tee) => {
-                                    write_to_out_dest(tee, stdout, true, span, signals)
-                                }
-                            }?;
-
-                            if let Ok(result) = err_thread?.join() {
-                                result?;
-                            } else {
-                                // thread panicked, which should not happen
-                                debug_assert!(false)
-                            }
-
-                            Ok::<_, ShellError>(())
-                        })?;
-                    }
-                    (Some(out), None) => {
-                        // single output stream, we can consume directly
-                        write_to_out_dest(out, stdout, true, span, signals)?;
-                    }
-                    (None, Some(err)) => {
-                        // single output stream, we can consume directly
-                        write_to_out_dest(err, stderr, false, span, signals)?;
-                    }
-                    (None, None) => {}
-                }
-                child.wait()?;
-            }
-        }
-
-        Ok(())
-    }
 }
 
 impl From<ByteStream> for PipelineData {
@@ -962,23 +887,6 @@ fn trim_end_newline(string: &mut String) {
     }
 }
 
-fn write_to_out_dest(
-    read: impl Read,
-    stream: &OutDest,
-    stdout: bool,
-    span: Span,
-    signals: &Signals,
-) -> Result<(), ShellError> {
-    match stream {
-        OutDest::Pipe | OutDest::PipeSeparate | OutDest::Value => return Ok(()),
-        OutDest::Null => copy_with_signals(read, io::sink(), span, signals),
-        OutDest::Inherit if stdout => copy_with_signals(read, io::stdout(), span, signals),
-        OutDest::Inherit => copy_with_signals(read, io::stderr(), span, signals),
-        OutDest::File(file) => copy_with_signals(read, file.as_ref(), span, signals),
-    }?;
-    Ok(())
-}
-
 #[cfg(unix)]
 pub(crate) fn convert_file<T: From<OwnedFd>>(file: impl Into<OwnedFd>) -> T {
     file.into().into()
diff --git a/crates/nu-protocol/src/pipeline/out_dest.rs b/crates/nu-protocol/src/pipeline/out_dest.rs
index 8ea8395378..c993f7b0d8 100644
--- a/crates/nu-protocol/src/pipeline/out_dest.rs
+++ b/crates/nu-protocol/src/pipeline/out_dest.rs
@@ -25,10 +25,16 @@ pub enum OutDest {
     ///
     /// This will forward output to the null device for the platform.
     Null,
-    /// Output to nushell's stdout or stderr.
+    /// Output to nushell's stdout or stderr (only for external commands).
     ///
-    /// This causes external commands to inherit nushell's stdout or stderr.
+    /// This causes external commands to inherit nushell's stdout or stderr. This also causes
+    /// [`ListStream`](crate::ListStream)s to be drained, but not to be printed.
     Inherit,
+    /// Print to nushell's stdout or stderr.
+    ///
+    /// This is just like `Inherit`, except that [`ListStream`](crate::ListStream)s and
+    /// [`Value`](crate::Value)s are also printed.
+    Print,
     /// Redirect output to a file.
     File(Arc<File>), // Arc<File>, since we sometimes need to clone `OutDest` into iterators, etc.
 }
@@ -52,7 +58,7 @@ impl TryFrom<&OutDest> for Stdio {
         match out_dest {
             OutDest::Pipe | OutDest::PipeSeparate | OutDest::Value => Ok(Self::piped()),
             OutDest::Null => Ok(Self::null()),
-            OutDest::Inherit => Ok(Self::inherit()),
+            OutDest::Print | OutDest::Inherit => Ok(Self::inherit()),
             OutDest::File(file) => Ok(file.try_clone()?.into()),
         }
     }
diff --git a/crates/nu-protocol/src/pipeline/pipeline_data.rs b/crates/nu-protocol/src/pipeline/pipeline_data.rs
index 45704e2cf4..827f6e31a7 100644
--- a/crates/nu-protocol/src/pipeline/pipeline_data.rs
+++ b/crates/nu-protocol/src/pipeline/pipeline_data.rs
@@ -165,66 +165,71 @@ impl PipelineData {
         }
     }
 
-    /// Writes all values or redirects all output to the current [`OutDest`]s in `stack`.
+    /// Drain and write this [`PipelineData`] to `dest`.
     ///
-    /// For [`OutDest::Pipe`] and [`OutDest::PipeSeparate`], this will return the `PipelineData` as
-    /// is without consuming input and without writing anything.
+    /// Values are converted to bytes and separated by newlines if this is a `ListStream`.
+    pub fn write_to(self, mut dest: impl Write) -> Result<(), ShellError> {
+        match self {
+            PipelineData::Empty => Ok(()),
+            PipelineData::Value(value, ..) => {
+                let bytes = value_to_bytes(value)?;
+                dest.write_all(&bytes)?;
+                dest.flush()?;
+                Ok(())
+            }
+            PipelineData::ListStream(stream, ..) => {
+                for value in stream {
+                    let bytes = value_to_bytes(value)?;
+                    dest.write_all(&bytes)?;
+                    dest.write_all(b"\n")?;
+                }
+                dest.flush()?;
+                Ok(())
+            }
+            PipelineData::ByteStream(stream, ..) => stream.write_to(dest),
+        }
+    }
+
+    /// Drain this [`PipelineData`] according to the current stdout [`OutDest`]s in `stack`.
     ///
-    /// For the other [`OutDest`]s, the given `PipelineData` will be completely consumed
-    /// and `PipelineData::Empty` will be returned (assuming no errors).
-    pub fn write_to_out_dests(
+    /// For [`OutDest::Pipe`] and [`OutDest::PipeSeparate`], this will return the [`PipelineData`]
+    /// as is. For [`OutDest::Value`], this will collect into a value and return it. For
+    /// [`OutDest::Print`], the [`PipelineData`] is drained and printed. Otherwise, the
+    /// [`PipelineData`] is drained, but only printed if it is the output of an external command.
+    pub fn drain_to_out_dests(
         self,
         engine_state: &EngineState,
         stack: &mut Stack,
-    ) -> Result<PipelineData, ShellError> {
-        match (self, stack.stdout()) {
-            (PipelineData::Empty, ..) => {}
-            (data, OutDest::Pipe | OutDest::PipeSeparate) => return Ok(data),
-            (data, OutDest::Value) => {
-                let metadata = data.metadata();
-                let span = data.span().unwrap_or(Span::unknown());
-                return data
-                    .into_value(span)
-                    .map(|val| PipelineData::Value(val, metadata));
+    ) -> Result<Self, ShellError> {
+        match stack.pipe_stdout().unwrap_or(&OutDest::Inherit) {
+            OutDest::Print => {
+                self.print(engine_state, stack, false, false)?;
+                Ok(Self::Empty)
             }
-            (PipelineData::ByteStream(stream, ..), stdout) => {
-                stream.write_to_out_dests(stdout, stack.stderr())?;
+            OutDest::Pipe | OutDest::PipeSeparate => Ok(self),
+            OutDest::Value => {
+                let metadata = self.metadata();
+                let span = self.span().unwrap_or(Span::unknown());
+                self.into_value(span).map(|val| Self::Value(val, metadata))
             }
-            (PipelineData::Value(..), OutDest::Null) => {}
-            (PipelineData::ListStream(stream, ..), OutDest::Null) => {
-                // we need to drain the stream in case there are external commands in the pipeline
-                stream.drain()?;
+            OutDest::File(file) => {
+                self.write_to(file.as_ref())?;
+                Ok(Self::Empty)
             }
-            (PipelineData::Value(value, ..), OutDest::File(file)) => {
-                let bytes = value_to_bytes(value)?;
-                let mut file = file.as_ref();
-                file.write_all(&bytes)?;
-                file.flush()?;
-            }
-            (PipelineData::ListStream(stream, ..), OutDest::File(file)) => {
-                let mut file = file.as_ref();
-                // use BufWriter here?
-                for value in stream {
-                    let bytes = value_to_bytes(value)?;
-                    file.write_all(&bytes)?;
-                    file.write_all(b"\n")?;
-                }
-                file.flush()?;
-            }
-            (data @ (PipelineData::Value(..) | PipelineData::ListStream(..)), OutDest::Inherit) => {
-                data.print(engine_state, stack, false, false)?;
+            OutDest::Null | OutDest::Inherit => {
+                self.drain()?;
+                Ok(Self::Empty)
             }
         }
-        Ok(PipelineData::Empty)
     }
 
     pub fn drain(self) -> Result<(), ShellError> {
         match self {
-            PipelineData::Empty => Ok(()),
-            PipelineData::Value(Value::Error { error, .. }, ..) => Err(*error),
-            PipelineData::Value(..) => Ok(()),
-            PipelineData::ListStream(stream, ..) => stream.drain(),
-            PipelineData::ByteStream(stream, ..) => stream.drain(),
+            Self::Empty => Ok(()),
+            Self::Value(Value::Error { error, .. }, ..) => Err(*error),
+            Self::Value(..) => Ok(()),
+            Self::ListStream(stream, ..) => stream.drain(),
+            Self::ByteStream(stream, ..) => stream.drain(),
         }
     }
 

From e32e55938b4d3205c2277fed533c131743d0a8a5 Mon Sep 17 00:00:00 2001
From: Piotr Kufel <qfel@users.noreply.github.com>
Date: Fri, 11 Oct 2024 23:44:49 -0700
Subject: [PATCH 0548/1072] Reduce nesting in the history command code (#14069)

# Description

This is a purely cosmetic change to make the code read more linearly.

# User-Facing Changes

None.
---
 .../nu-cli/src/commands/history/history_.rs   | 134 +++++++++---------
 1 file changed, 66 insertions(+), 68 deletions(-)

diff --git a/crates/nu-cli/src/commands/history/history_.rs b/crates/nu-cli/src/commands/history/history_.rs
index f5289e24a4..602574229e 100644
--- a/crates/nu-cli/src/commands/history/history_.rs
+++ b/crates/nu-cli/src/commands/history/history_.rs
@@ -39,80 +39,78 @@ impl Command for History {
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
 
-        if let Some(history) = engine_state.history_config() {
-            // todo for sqlite history this command should be an alias to `open ~/.config/nushell/history.sqlite3 | get history`
-            let Some(history_path) = history.file_path() else {
-                return Err(ShellError::ConfigDirNotFound { span: Some(head) });
-            };
-            let clear = call.has_flag(engine_state, stack, "clear")?;
-            let long = call.has_flag(engine_state, stack, "long")?;
-            let signals = engine_state.signals().clone();
+        let Some(history) = engine_state.history_config() else {
+            return Ok(PipelineData::empty());
+        };
+        // todo for sqlite history this command should be an alias to `open ~/.config/nushell/history.sqlite3 | get history`
+        let Some(history_path) = history.file_path() else {
+            return Err(ShellError::ConfigDirNotFound { span: Some(head) });
+        };
 
-            if clear {
-                let _ = std::fs::remove_file(history_path);
-                // TODO: FIXME also clear the auxiliary files when using sqlite
-                Ok(PipelineData::empty())
-            } else {
-                let history_reader: Option<Box<dyn ReedlineHistory>> = match history.file_format {
-                    HistoryFileFormat::Sqlite => {
-                        SqliteBackedHistory::with_file(history_path.clone(), None, None)
-                            .map(|inner| {
-                                let boxed: Box<dyn ReedlineHistory> = Box::new(inner);
-                                boxed
-                            })
-                            .ok()
-                    }
-                    HistoryFileFormat::Plaintext => FileBackedHistory::with_file(
-                        history.max_size as usize,
-                        history_path.clone(),
-                    )
+        if call.has_flag(engine_state, stack, "clear")? {
+            let _ = std::fs::remove_file(history_path);
+            // TODO: FIXME also clear the auxiliary files when using sqlite
+            return Ok(PipelineData::empty());
+        }
+
+        let long = call.has_flag(engine_state, stack, "long")?;
+        let signals = engine_state.signals().clone();
+        let history_reader: Option<Box<dyn ReedlineHistory>> = match history.file_format {
+            HistoryFileFormat::Sqlite => {
+                SqliteBackedHistory::with_file(history_path.clone(), None, None)
                     .map(|inner| {
                         let boxed: Box<dyn ReedlineHistory> = Box::new(inner);
                         boxed
                     })
-                    .ok(),
-                };
-                match history.file_format {
-                    HistoryFileFormat::Plaintext => Ok(history_reader
-                        .and_then(|h| {
-                            h.search(SearchQuery::everything(SearchDirection::Forward, None))
-                                .ok()
-                        })
-                        .map(move |entries| {
-                            entries.into_iter().enumerate().map(move |(idx, entry)| {
-                                Value::record(
-                                    record! {
-                                        "command" => Value::string(entry.command_line, head),
-                                        "index" => Value::int(idx as i64, head),
-                                    },
-                                    head,
-                                )
-                            })
-                        })
-                        .ok_or(ShellError::FileNotFound {
-                            file: history_path.display().to_string(),
-                            span: head,
-                        })?
-                        .into_pipeline_data(head, signals)),
-                    HistoryFileFormat::Sqlite => Ok(history_reader
-                        .and_then(|h| {
-                            h.search(SearchQuery::everything(SearchDirection::Forward, None))
-                                .ok()
-                        })
-                        .map(move |entries| {
-                            entries.into_iter().enumerate().map(move |(idx, entry)| {
-                                create_history_record(idx, entry, long, head)
-                            })
-                        })
-                        .ok_or(ShellError::FileNotFound {
-                            file: history_path.display().to_string(),
-                            span: head,
-                        })?
-                        .into_pipeline_data(head, signals)),
-                }
+                    .ok()
             }
-        } else {
-            Ok(PipelineData::empty())
+            HistoryFileFormat::Plaintext => {
+                FileBackedHistory::with_file(history.max_size as usize, history_path.clone())
+                    .map(|inner| {
+                        let boxed: Box<dyn ReedlineHistory> = Box::new(inner);
+                        boxed
+                    })
+                    .ok()
+            }
+        };
+        match history.file_format {
+            HistoryFileFormat::Plaintext => Ok(history_reader
+                .and_then(|h| {
+                    h.search(SearchQuery::everything(SearchDirection::Forward, None))
+                        .ok()
+                })
+                .map(move |entries| {
+                    entries.into_iter().enumerate().map(move |(idx, entry)| {
+                        Value::record(
+                            record! {
+                                "command" => Value::string(entry.command_line, head),
+                                "index" => Value::int(idx as i64, head),
+                            },
+                            head,
+                        )
+                    })
+                })
+                .ok_or(ShellError::FileNotFound {
+                    file: history_path.display().to_string(),
+                    span: head,
+                })?
+                .into_pipeline_data(head, signals)),
+            HistoryFileFormat::Sqlite => Ok(history_reader
+                .and_then(|h| {
+                    h.search(SearchQuery::everything(SearchDirection::Forward, None))
+                        .ok()
+                })
+                .map(move |entries| {
+                    entries
+                        .into_iter()
+                        .enumerate()
+                        .map(move |(idx, entry)| create_history_record(idx, entry, long, head))
+                })
+                .ok_or(ShellError::FileNotFound {
+                    file: history_path.display().to_string(),
+                    span: head,
+                })?
+                .into_pipeline_data(head, signals)),
         }
     }
 

From d83781ddec52a806d81c6563b0a5cc393b61803b Mon Sep 17 00:00:00 2001
From: Solomon <git@solomonvictorino.com>
Date: Sat, 12 Oct 2024 06:49:05 +0000
Subject: [PATCH 0549/1072] support filesize arguments in `random`
 `binary`/`chars` (#14068)

Closes #13920

# User-Facing Changes

`random binary` and `random chars` now support filesize arguments:

```nushell
random binary 1kb
random chars --length 1kb
```
---
 crates/nu-command/src/random/binary.rs        | 23 ++++++++++++++-----
 crates/nu-command/src/random/chars.rs         |  7 +++++-
 .../tests/commands/random/binary.rs           | 21 +++++++++++++++++
 .../nu-command/tests/commands/random/chars.rs | 10 ++++++++
 .../nu-command/tests/commands/random/mod.rs   |  1 +
 5 files changed, 55 insertions(+), 7 deletions(-)
 create mode 100644 crates/nu-command/tests/commands/random/binary.rs

diff --git a/crates/nu-command/src/random/binary.rs b/crates/nu-command/src/random/binary.rs
index 136afc6e11..539796b8c5 100644
--- a/crates/nu-command/src/random/binary.rs
+++ b/crates/nu-command/src/random/binary.rs
@@ -14,7 +14,11 @@ impl Command for SubCommand {
         Signature::build("random binary")
             .input_output_types(vec![(Type::Nothing, Type::Binary)])
             .allow_variants_without_examples(true)
-            .required("length", SyntaxShape::Int, "Length of the output binary.")
+            .required(
+                "length",
+                SyntaxShape::OneOf(vec![SyntaxShape::Int, SyntaxShape::Filesize]),
+                "Length of the output binary.",
+            )
             .category(Category::Random)
     }
 
@@ -43,11 +47,18 @@ impl Command for SubCommand {
     }
 
     fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Generate 16 random bytes",
-            example: "random binary 16",
-            result: None,
-        }]
+        vec![
+            Example {
+                description: "Generate 16 random bytes",
+                example: "random binary 16",
+                result: None,
+            },
+            Example {
+                description: "Generate 1 random kilobyte",
+                example: "random binary 1kb",
+                result: None,
+            },
+        ]
     }
 }
 
diff --git a/crates/nu-command/src/random/chars.rs b/crates/nu-command/src/random/chars.rs
index e2a1282f9e..d445a4aab8 100644
--- a/crates/nu-command/src/random/chars.rs
+++ b/crates/nu-command/src/random/chars.rs
@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .allow_variants_without_examples(true)
             .named(
                 "length",
-                SyntaxShape::Int,
+                SyntaxShape::OneOf(vec![SyntaxShape::Int, SyntaxShape::Filesize]),
                 "Number of chars (default 25)",
                 Some('l'),
             )
@@ -58,6 +58,11 @@ impl Command for SubCommand {
                 example: "random chars --length 20",
                 result: None,
             },
+            Example {
+                description: "Generate one kilobyte of random chars",
+                example: "random chars --length 1kb",
+                result: None,
+            },
         ]
     }
 }
diff --git a/crates/nu-command/tests/commands/random/binary.rs b/crates/nu-command/tests/commands/random/binary.rs
new file mode 100644
index 0000000000..9b8137eff2
--- /dev/null
+++ b/crates/nu-command/tests/commands/random/binary.rs
@@ -0,0 +1,21 @@
+use nu_test_support::nu;
+
+#[test]
+fn generates_bytes_of_specified_length() {
+    let actual = nu!(r#"
+        random binary 16 | bytes length
+        "#);
+
+    let result = actual.out;
+    assert_eq!(result, "16");
+}
+
+#[test]
+fn generates_bytes_of_specified_filesize() {
+    let actual = nu!(r#"
+        random binary 1kb | bytes length
+        "#);
+
+    let result = actual.out;
+    assert_eq!(result, "1000");
+}
diff --git a/crates/nu-command/tests/commands/random/chars.rs b/crates/nu-command/tests/commands/random/chars.rs
index 4b5b0a9ef4..9b4c433b95 100644
--- a/crates/nu-command/tests/commands/random/chars.rs
+++ b/crates/nu-command/tests/commands/random/chars.rs
@@ -9,3 +9,13 @@ fn generates_chars_of_specified_length() {
     let result = actual.out;
     assert_eq!(result, "15");
 }
+
+#[test]
+fn generates_chars_of_specified_filesize() {
+    let actual = nu!(r#"
+        random chars --length 1kb | str stats | get bytes
+        "#);
+
+    let result = actual.out;
+    assert_eq!(result, "1000");
+}
diff --git a/crates/nu-command/tests/commands/random/mod.rs b/crates/nu-command/tests/commands/random/mod.rs
index a879b524b8..c16b2e18b8 100644
--- a/crates/nu-command/tests/commands/random/mod.rs
+++ b/crates/nu-command/tests/commands/random/mod.rs
@@ -1,3 +1,4 @@
+mod binary;
 mod bool;
 mod chars;
 mod dice;

From 1f47d72e86343b5776eb177c9891002a1e8d1297 Mon Sep 17 00:00:00 2001
From: Piotr Kufel <qfel@users.noreply.github.com>
Date: Sat, 12 Oct 2024 14:42:27 -0700
Subject: [PATCH 0550/1072] Add the `history import` command (#13450)

# Description

Adds a simple command for importing history between different file
formats. It essentially opens the history of the format opposite of the
one currently selected, and writes new items to the current history. It
also supports piping, because why not.

As more history backends are added, this may need to be extended -
either make the source explicit, or autodetect based on existing files.
For now it should be good though.

This should replace some of the work-arounds mentioned in
https://github.com/nushell/nushell/issues/9403.

I suspect it will have at least one problem:
https://github.com/nushell/nushell/issues/9403 mentions the history file
might be locked on Windows. That being said, I was able to successfully
import plaintext history into sqlite on Linux, so the command should be
functional at least in that environment.

The locking issue could be solved later by plumbing reedline history to
the command (so that it doesn't have to reopen it). But first, I want to
get some general input on the approach.

# User-Facing Changes
New command: `history import`

# Tests + Formatting
There's a unit test, but didn't add a proper integration test yet. Not
entirely sure how - I see there's the `nu!` macro for that, but not sure
how feasible it's to inspect history generated by commands ran that way.
Could use a hint.2
---
 crates/nu-cli/src/commands/default_context.rs |   1 +
 crates/nu-cli/src/commands/history/fields.rs  |  10 +
 .../nu-cli/src/commands/history/history_.rs   |  31 +-
 .../src/commands/history/history_import.rs    | 332 ++++++++++++++++++
 crates/nu-cli/src/commands/history/mod.rs     |   3 +
 crates/nu-cli/src/commands/mod.rs             |   2 +-
 .../nu-cli/tests/commands/history_import.rs   | 186 ++++++++++
 crates/nu-cli/tests/commands/mod.rs           |   1 +
 crates/nu-test-support/src/macros.rs          |  16 +-
 9 files changed, 564 insertions(+), 18 deletions(-)
 create mode 100644 crates/nu-cli/src/commands/history/fields.rs
 create mode 100644 crates/nu-cli/src/commands/history/history_import.rs
 create mode 100644 crates/nu-cli/tests/commands/history_import.rs

diff --git a/crates/nu-cli/src/commands/default_context.rs b/crates/nu-cli/src/commands/default_context.rs
index 0c1c459c20..ad19f18d94 100644
--- a/crates/nu-cli/src/commands/default_context.rs
+++ b/crates/nu-cli/src/commands/default_context.rs
@@ -17,6 +17,7 @@ pub fn add_cli_context(mut engine_state: EngineState) -> EngineState {
             CommandlineGetCursor,
             CommandlineSetCursor,
             History,
+            HistoryImport,
             HistorySession,
             Keybindings,
             KeybindingsDefault,
diff --git a/crates/nu-cli/src/commands/history/fields.rs b/crates/nu-cli/src/commands/history/fields.rs
new file mode 100644
index 0000000000..f14a3e81ca
--- /dev/null
+++ b/crates/nu-cli/src/commands/history/fields.rs
@@ -0,0 +1,10 @@
+// Each const is named after a HistoryItem field, and the value is the field name to be displayed to
+// the user (or accept during import).
+pub const COMMAND_LINE: &str = "command";
+pub const ID: &str = "item_id";
+pub const START_TIMESTAMP: &str = "start_timestamp";
+pub const HOSTNAME: &str = "hostname";
+pub const CWD: &str = "cwd";
+pub const EXIT_STATUS: &str = "exit_status";
+pub const DURATION: &str = "duration";
+pub const SESSION_ID: &str = "session_id";
diff --git a/crates/nu-cli/src/commands/history/history_.rs b/crates/nu-cli/src/commands/history/history_.rs
index 602574229e..c31317882a 100644
--- a/crates/nu-cli/src/commands/history/history_.rs
+++ b/crates/nu-cli/src/commands/history/history_.rs
@@ -5,6 +5,8 @@ use reedline::{
     SqliteBackedHistory,
 };
 
+use super::fields;
+
 #[derive(Clone)]
 pub struct History;
 
@@ -83,7 +85,8 @@ impl Command for History {
                     entries.into_iter().enumerate().map(move |(idx, entry)| {
                         Value::record(
                             record! {
-                                "command" => Value::string(entry.command_line, head),
+                                fields::COMMAND_LINE => Value::string(entry.command_line, head),
+                                // TODO: This name is inconsistent with create_history_record.
                                 "index" => Value::int(idx as i64, head),
                             },
                             head,
@@ -175,14 +178,14 @@ fn create_history_record(idx: usize, entry: HistoryItem, long: bool, head: Span)
     if long {
         Value::record(
             record! {
-                "item_id" => item_id_value,
-                "start_timestamp" => start_timestamp_value,
-                "command" => command_value,
-                "session_id" => session_id_value,
-                "hostname" => hostname_value,
-                "cwd" => cwd_value,
-                "duration" => duration_value,
-                "exit_status" => exit_status_value,
+                fields::ID => item_id_value,
+                fields::START_TIMESTAMP => start_timestamp_value,
+                fields::COMMAND_LINE => command_value,
+                fields::SESSION_ID => session_id_value,
+                fields::HOSTNAME => hostname_value,
+                fields::CWD => cwd_value,
+                fields::DURATION => duration_value,
+                fields::EXIT_STATUS => exit_status_value,
                 "idx" => index_value,
             },
             head,
@@ -190,11 +193,11 @@ fn create_history_record(idx: usize, entry: HistoryItem, long: bool, head: Span)
     } else {
         Value::record(
             record! {
-                "start_timestamp" => start_timestamp_value,
-                "command" => command_value,
-                "cwd" => cwd_value,
-                "duration" => duration_value,
-                "exit_status" => exit_status_value,
+                fields::START_TIMESTAMP => start_timestamp_value,
+                fields::COMMAND_LINE => command_value,
+                fields::CWD => cwd_value,
+                fields::DURATION => duration_value,
+                fields::EXIT_STATUS => exit_status_value,
             },
             head,
         )
diff --git a/crates/nu-cli/src/commands/history/history_import.rs b/crates/nu-cli/src/commands/history/history_import.rs
new file mode 100644
index 0000000000..71daeac58c
--- /dev/null
+++ b/crates/nu-cli/src/commands/history/history_import.rs
@@ -0,0 +1,332 @@
+use nu_engine::command_prelude::*;
+use nu_protocol::HistoryFileFormat;
+
+use reedline::{
+    FileBackedHistory, History, HistoryItem, HistoryItemId, ReedlineError, SearchQuery,
+    SqliteBackedHistory,
+};
+
+use super::fields;
+
+#[derive(Clone)]
+pub struct HistoryImport;
+
+impl Command for HistoryImport {
+    fn name(&self) -> &str {
+        "history import"
+    }
+
+    fn description(&self) -> &str {
+        "Import command line history"
+    }
+
+    fn extra_description(&self) -> &str {
+        r#"Can import history from input, either successive command lines or more detailed records. If providing records, available fields are:
+    command_line, id, start_timestamp, hostname, cwd, duration, exit_status.
+
+If no input is provided, will import all history items from existing history in the other format: if current history is stored in sqlite, it will store it in plain text and vice versa."#
+    }
+
+    fn signature(&self) -> nu_protocol::Signature {
+        Signature::build("history import")
+            .category(Category::History)
+            .input_output_types(vec![
+                (Type::Nothing, Type::Nothing),
+                (Type::List(Box::new(Type::String)), Type::Nothing),
+                (Type::table(), Type::Nothing),
+            ])
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                example: "history import",
+                description:
+                    "Append all items from history in the other format to the current history",
+                result: None,
+            },
+            Example {
+                example: "echo foo | history import",
+                description: "Append `foo` to the current history",
+                result: None,
+            },
+            Example {
+                example: "[[ command_line cwd ]; [ foo /home ]] | history import",
+                description: "Append `foo` ran from `/home` to the current history",
+                result: None,
+            },
+        ]
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        _stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let ok = Ok(Value::nothing(call.head).into_pipeline_data());
+
+        let Some(history) = engine_state.history_config() else {
+            return ok;
+        };
+        let Some(current_history_path) = history.file_path() else {
+            return Err(ShellError::ConfigDirNotFound {
+                span: Some(call.head),
+            });
+        };
+
+        match input {
+            PipelineData::Empty => {
+                let other_format = match history.file_format {
+                    HistoryFileFormat::Sqlite => HistoryFileFormat::Plaintext,
+                    HistoryFileFormat::Plaintext => HistoryFileFormat::Sqlite,
+                };
+                let src = new_backend(other_format, None)?;
+                let mut dst = new_backend(history.file_format, Some(current_history_path))?;
+                let items = src
+                    .search(SearchQuery::everything(
+                        reedline::SearchDirection::Forward,
+                        None,
+                    ))
+                    .map_err(error_from_reedline)?
+                    .into_iter()
+                    .map(Ok);
+                import(dst.as_mut(), items)
+            }
+            _ => {
+                let input = input.into_iter().map(item_from_value);
+                import(
+                    new_backend(history.file_format, Some(current_history_path))?.as_mut(),
+                    input,
+                )
+            }
+        }?;
+
+        ok
+    }
+}
+
+fn new_backend(
+    format: HistoryFileFormat,
+    path: Option<std::path::PathBuf>,
+) -> Result<Box<dyn History>, ShellError> {
+    let path = match path {
+        Some(path) => path,
+        None => {
+            let Some(mut path) = nu_path::nu_config_dir() else {
+                return Err(ShellError::ConfigDirNotFound { span: None });
+            };
+            path.push(format.default_file_name());
+            path.into_std_path_buf()
+        }
+    };
+
+    fn map(
+        result: Result<impl History + 'static, ReedlineError>,
+    ) -> Result<Box<dyn History>, ShellError> {
+        result
+            .map(|x| Box::new(x) as Box<dyn History>)
+            .map_err(error_from_reedline)
+    }
+    match format {
+        // Use a reasonably large value for maximum capacity.
+        HistoryFileFormat::Plaintext => map(FileBackedHistory::with_file(0xfffffff, path)),
+        HistoryFileFormat::Sqlite => map(SqliteBackedHistory::with_file(path, None, None)),
+    }
+}
+
+fn import(
+    dst: &mut dyn History,
+    src: impl Iterator<Item = Result<HistoryItem, ShellError>>,
+) -> Result<(), ShellError> {
+    for item in src {
+        dst.save(item?).map_err(error_from_reedline)?;
+    }
+    Ok(())
+}
+
+fn error_from_reedline(e: ReedlineError) -> ShellError {
+    // TODO: Should we add a new ShellError variant?
+    ShellError::GenericError {
+        error: "Reedline error".to_owned(),
+        msg: format!("{e}"),
+        span: None,
+        help: None,
+        inner: Vec::new(),
+    }
+}
+
+fn item_from_value(v: Value) -> Result<HistoryItem, ShellError> {
+    let span = v.span();
+    match v {
+        Value::Record { val, .. } => item_from_record(val.into_owned(), span),
+        Value::String { val, .. } => Ok(HistoryItem {
+            command_line: val,
+            id: None,
+            start_timestamp: None,
+            session_id: None,
+            hostname: None,
+            cwd: None,
+            duration: None,
+            exit_status: None,
+            more_info: None,
+        }),
+        _ => Err(ShellError::UnsupportedInput {
+            msg: "Only list and record inputs are supported".to_owned(),
+            input: v.get_type().to_string(),
+            msg_span: span,
+            input_span: span,
+        }),
+    }
+}
+
+fn item_from_record(mut rec: Record, span: Span) -> Result<HistoryItem, ShellError> {
+    let cmd = match rec.remove(fields::COMMAND_LINE) {
+        Some(v) => v.as_str()?.to_owned(),
+        None => {
+            return Err(ShellError::TypeMismatch {
+                err_message: format!("missing column: {}", fields::COMMAND_LINE),
+                span,
+            })
+        }
+    };
+
+    fn get<T>(
+        rec: &mut Record,
+        field: &'static str,
+        f: impl FnOnce(Value) -> Result<T, ShellError>,
+    ) -> Result<Option<T>, ShellError> {
+        rec.remove(field).map(f).transpose()
+    }
+
+    let rec = &mut rec;
+    let item = HistoryItem {
+        command_line: cmd,
+        id: get(rec, fields::ID, |v| Ok(HistoryItemId::new(v.as_int()?)))?,
+        start_timestamp: get(rec, fields::START_TIMESTAMP, |v| Ok(v.as_date()?.to_utc()))?,
+        hostname: get(rec, fields::HOSTNAME, |v| Ok(v.as_str()?.to_owned()))?,
+        cwd: get(rec, fields::CWD, |v| Ok(v.as_str()?.to_owned()))?,
+        exit_status: get(rec, fields::EXIT_STATUS, |v| v.as_i64())?,
+        duration: get(rec, fields::DURATION, duration_from_value)?,
+        more_info: None,
+        // TODO: Currently reedline doesn't let you create session IDs.
+        session_id: None,
+    };
+
+    if !rec.is_empty() {
+        let cols = rec.columns().map(|s| s.as_str()).collect::<Vec<_>>();
+        return Err(ShellError::TypeMismatch {
+            err_message: format!("unsupported column names: {}", cols.join(", ")),
+            span,
+        });
+    }
+    Ok(item)
+}
+
+fn duration_from_value(v: Value) -> Result<std::time::Duration, ShellError> {
+    chrono::Duration::nanoseconds(v.as_duration()?)
+        .to_std()
+        .map_err(|_| ShellError::IOError {
+            msg: "negative duration not supported".to_string(),
+        })
+}
+
+#[cfg(test)]
+mod tests {
+    use chrono::DateTime;
+
+    use super::*;
+
+    #[test]
+    fn test_item_from_value_string() -> Result<(), ShellError> {
+        let item = item_from_value(Value::string("foo", Span::unknown()))?;
+        assert_eq!(
+            item,
+            HistoryItem {
+                command_line: "foo".to_string(),
+                id: None,
+                start_timestamp: None,
+                session_id: None,
+                hostname: None,
+                cwd: None,
+                duration: None,
+                exit_status: None,
+                more_info: None
+            }
+        );
+        Ok(())
+    }
+
+    #[test]
+    fn test_item_from_value_record() {
+        let span = Span::unknown();
+        let rec = new_record(&[
+            ("command", Value::string("foo", span)),
+            ("item_id", Value::int(1, span)),
+            (
+                "start_timestamp",
+                Value::date(
+                    DateTime::parse_from_rfc3339("1996-12-19T16:39:57-08:00").unwrap(),
+                    span,
+                ),
+            ),
+            ("hostname", Value::string("localhost", span)),
+            ("cwd", Value::string("/home/test", span)),
+            ("duration", Value::duration(100_000_000, span)),
+            ("exit_status", Value::int(42, span)),
+        ]);
+        let item = item_from_value(rec).unwrap();
+        assert_eq!(
+            item,
+            HistoryItem {
+                command_line: "foo".to_string(),
+                id: Some(HistoryItemId::new(1)),
+                start_timestamp: Some(
+                    DateTime::parse_from_rfc3339("1996-12-19T16:39:57-08:00")
+                        .unwrap()
+                        .to_utc()
+                ),
+                hostname: Some("localhost".to_string()),
+                cwd: Some("/home/test".to_string()),
+                duration: Some(std::time::Duration::from_nanos(100_000_000)),
+                exit_status: Some(42),
+
+                session_id: None,
+                more_info: None
+            }
+        );
+    }
+
+    #[test]
+    fn test_item_from_value_record_extra_field() {
+        let span = Span::unknown();
+        let rec = new_record(&[
+            ("command_line", Value::string("foo", span)),
+            ("id_nonexistent", Value::int(1, span)),
+        ]);
+        assert!(item_from_value(rec).is_err());
+    }
+
+    #[test]
+    fn test_item_from_value_record_bad_type() {
+        let span = Span::unknown();
+        let rec = new_record(&[
+            ("command_line", Value::string("foo", span)),
+            ("id", Value::string("one".to_string(), span)),
+        ]);
+        assert!(item_from_value(rec).is_err());
+    }
+
+    fn new_record(rec: &[(&'static str, Value)]) -> Value {
+        let span = Span::unknown();
+        let rec = Record::from_raw_cols_vals(
+            rec.iter().map(|(col, _)| col.to_string()).collect(),
+            rec.iter().map(|(_, val)| val.clone()).collect(),
+            span,
+            span,
+        )
+        .unwrap();
+        Value::record(rec, span)
+    }
+}
diff --git a/crates/nu-cli/src/commands/history/mod.rs b/crates/nu-cli/src/commands/history/mod.rs
index be7d1fc11f..c36b560307 100644
--- a/crates/nu-cli/src/commands/history/mod.rs
+++ b/crates/nu-cli/src/commands/history/mod.rs
@@ -1,5 +1,8 @@
+mod fields;
 mod history_;
+mod history_import;
 mod history_session;
 
 pub use history_::History;
+pub use history_import::HistoryImport;
 pub use history_session::HistorySession;
diff --git a/crates/nu-cli/src/commands/mod.rs b/crates/nu-cli/src/commands/mod.rs
index f63724e95f..4a9dd9ef21 100644
--- a/crates/nu-cli/src/commands/mod.rs
+++ b/crates/nu-cli/src/commands/mod.rs
@@ -7,7 +7,7 @@ mod keybindings_list;
 mod keybindings_listen;
 
 pub use commandline::{Commandline, CommandlineEdit, CommandlineGetCursor, CommandlineSetCursor};
-pub use history::{History, HistorySession};
+pub use history::{History, HistoryImport, HistorySession};
 pub use keybindings::Keybindings;
 pub use keybindings_default::KeybindingsDefault;
 pub use keybindings_list::KeybindingsList;
diff --git a/crates/nu-cli/tests/commands/history_import.rs b/crates/nu-cli/tests/commands/history_import.rs
new file mode 100644
index 0000000000..c92260f457
--- /dev/null
+++ b/crates/nu-cli/tests/commands/history_import.rs
@@ -0,0 +1,186 @@
+use nu_test_support::{nu, Outcome};
+use reedline::{
+    FileBackedHistory, History, HistoryItem, HistoryItemId, ReedlineError, SearchQuery,
+    SqliteBackedHistory,
+};
+use tempfile::TempDir;
+
+struct Test {
+    cfg_dir: TempDir,
+}
+
+impl Test {
+    fn new(history_format: &'static str) -> Self {
+        let cfg_dir = tempfile::Builder::new()
+            .prefix("history_import_test")
+            .tempdir()
+            .unwrap();
+        // Assigning to $env.config.history.file_format seems to work only in startup
+        // configuration.
+        std::fs::write(
+            cfg_dir.path().join("env.nu"),
+            format!("$env.config.history.file_format = {history_format:?}"),
+        )
+        .unwrap();
+        Self { cfg_dir }
+    }
+
+    fn nu(&self, cmd: &'static str) -> Outcome {
+        let env = [(
+            "XDG_CONFIG_HOME".to_string(),
+            self.cfg_dir.path().to_str().unwrap().to_string(),
+        )];
+        let env_config = self.cfg_dir.path().join("env.nu");
+        nu!(envs: env, env_config: env_config, cmd)
+    }
+
+    fn open_plaintext(&self) -> Result<FileBackedHistory, ReedlineError> {
+        FileBackedHistory::with_file(100, self.cfg_dir.path().join("nushell").join("history.txt"))
+    }
+
+    fn open_sqlite(&self) -> Result<SqliteBackedHistory, ReedlineError> {
+        SqliteBackedHistory::with_file(
+            self.cfg_dir.path().join("nushell").join("history.sqlite3"),
+            None,
+            None,
+        )
+    }
+}
+
+fn query_all(history: impl History) -> Result<Vec<HistoryItem>, ReedlineError> {
+    history.search(SearchQuery::everything(
+        reedline::SearchDirection::Forward,
+        None,
+    ))
+}
+
+fn save_all(mut history: impl History, items: Vec<HistoryItem>) -> Result<(), ReedlineError> {
+    for item in items {
+        history.save(item)?;
+    }
+    Ok(())
+}
+
+const EMPTY_ITEM: HistoryItem = HistoryItem {
+    command_line: String::new(),
+    id: None,
+    start_timestamp: None,
+    session_id: None,
+    hostname: None,
+    cwd: None,
+    duration: None,
+    exit_status: None,
+    more_info: None,
+};
+
+#[test]
+fn history_import_pipe_string() {
+    let test = Test::new("plaintext");
+    let outcome = test.nu("echo bar | history import");
+
+    assert!(outcome.status.success());
+    assert_eq!(
+        query_all(test.open_plaintext().unwrap()).unwrap(),
+        vec![HistoryItem {
+            id: Some(HistoryItemId::new(0)),
+            command_line: "bar".to_string(),
+            ..EMPTY_ITEM
+        }]
+    );
+}
+
+#[test]
+fn history_import_pipe_record() {
+    let test = Test::new("sqlite");
+    let outcome = test.nu("[[item_id command]; [42 some_command]] | history import");
+
+    assert!(outcome.status.success());
+    assert_eq!(
+        query_all(test.open_sqlite().unwrap()).unwrap(),
+        vec![HistoryItem {
+            id: Some(HistoryItemId::new(42)),
+            command_line: "some_command".to_string(),
+            ..EMPTY_ITEM
+        }]
+    );
+}
+
+#[test]
+fn history_import_plain_to_sqlite() {
+    let test = Test::new("sqlite");
+    save_all(
+        test.open_plaintext().unwrap(),
+        vec![
+            HistoryItem {
+                id: Some(HistoryItemId::new(0)),
+                command_line: "foo".to_string(),
+                ..EMPTY_ITEM
+            },
+            HistoryItem {
+                id: Some(HistoryItemId::new(1)),
+                command_line: "bar".to_string(),
+                ..EMPTY_ITEM
+            },
+        ],
+    )
+    .unwrap();
+
+    let outcome = test.nu("history import");
+    assert!(outcome.status.success());
+    assert_eq!(
+        query_all(test.open_sqlite().unwrap()).unwrap(),
+        vec![
+            HistoryItem {
+                id: Some(HistoryItemId::new(0)),
+                command_line: "foo".to_string(),
+                ..EMPTY_ITEM
+            },
+            HistoryItem {
+                id: Some(HistoryItemId::new(1)),
+                command_line: "bar".to_string(),
+                ..EMPTY_ITEM
+            }
+        ]
+    );
+}
+
+#[test]
+fn history_import_sqlite_to_plain() {
+    let test = Test::new("plaintext");
+    save_all(
+        test.open_sqlite().unwrap(),
+        vec![
+            HistoryItem {
+                id: Some(HistoryItemId::new(0)),
+                command_line: "foo".to_string(),
+                hostname: Some("host".to_string()),
+                ..EMPTY_ITEM
+            },
+            HistoryItem {
+                id: Some(HistoryItemId::new(1)),
+                command_line: "bar".to_string(),
+                cwd: Some("/home/test".to_string()),
+                ..EMPTY_ITEM
+            },
+        ],
+    )
+    .unwrap();
+
+    let outcome = test.nu("history import");
+    assert!(outcome.status.success());
+    assert_eq!(
+        query_all(test.open_plaintext().unwrap()).unwrap(),
+        vec![
+            HistoryItem {
+                id: Some(HistoryItemId::new(0)),
+                command_line: "foo".to_string(),
+                ..EMPTY_ITEM
+            },
+            HistoryItem {
+                id: Some(HistoryItemId::new(1)),
+                command_line: "bar".to_string(),
+                ..EMPTY_ITEM
+            },
+        ]
+    );
+}
diff --git a/crates/nu-cli/tests/commands/mod.rs b/crates/nu-cli/tests/commands/mod.rs
index 087791302e..9eb18e3280 100644
--- a/crates/nu-cli/tests/commands/mod.rs
+++ b/crates/nu-cli/tests/commands/mod.rs
@@ -1,2 +1,3 @@
+mod history_import;
 mod keybindings_list;
 mod nu_highlight;
diff --git a/crates/nu-test-support/src/macros.rs b/crates/nu-test-support/src/macros.rs
index 2547b1f4c8..1ae7ce593e 100644
--- a/crates/nu-test-support/src/macros.rs
+++ b/crates/nu-test-support/src/macros.rs
@@ -234,7 +234,7 @@ macro_rules! nu_with_plugins {
 }
 
 use crate::{Outcome, NATIVE_PATH_ENV_VAR};
-use nu_path::{AbsolutePath, AbsolutePathBuf, Path};
+use nu_path::{AbsolutePath, AbsolutePathBuf, Path, PathBuf};
 use std::{
     ffi::OsStr,
     process::{Command, Stdio},
@@ -248,6 +248,10 @@ pub struct NuOpts {
     pub envs: Option<Vec<(String, String)>>,
     pub collapse_output: Option<bool>,
     pub use_ir: Option<bool>,
+    // Note: At the time this was added, passing in a file path was more convenient. However,
+    // passing in file contents seems like a better API - consider this when adding new uses of
+    // this field.
+    pub env_config: Option<PathBuf>,
 }
 
 pub fn nu_run_test(opts: NuOpts, commands: impl AsRef<str>, with_std: bool) -> Outcome {
@@ -278,8 +282,14 @@ pub fn nu_run_test(opts: NuOpts, commands: impl AsRef<str>, with_std: bool) -> O
         command.envs(envs);
     }
 
-    // Ensure that the user's config doesn't interfere with the tests
-    command.arg("--no-config-file");
+    match opts.env_config {
+        Some(path) => command.arg("--env-config").arg(path),
+        // TODO: This seems unnecessary: the code that runs for integration tests
+        // (run_commands) loads startup configs only if they are specified via flags explicitly or
+        // the shell is started as logging shell (which it is not in this case).
+        None => command.arg("--no-config-file"),
+    };
+
     if !with_std {
         command.arg("--no-std-lib");
     }

From bdbcf829673c0a51805499832c20fab8a010733d Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Sat, 12 Oct 2024 21:43:24 -0500
Subject: [PATCH 0551/1072] Revert "Add the `history import` command" (#14077)

---
 crates/nu-cli/src/commands/default_context.rs |   1 -
 crates/nu-cli/src/commands/history/fields.rs  |  10 -
 .../nu-cli/src/commands/history/history_.rs   |  31 +-
 .../src/commands/history/history_import.rs    | 332 ------------------
 crates/nu-cli/src/commands/history/mod.rs     |   3 -
 crates/nu-cli/src/commands/mod.rs             |   2 +-
 .../nu-cli/tests/commands/history_import.rs   | 186 ----------
 crates/nu-cli/tests/commands/mod.rs           |   1 -
 crates/nu-test-support/src/macros.rs          |  16 +-
 9 files changed, 18 insertions(+), 564 deletions(-)
 delete mode 100644 crates/nu-cli/src/commands/history/fields.rs
 delete mode 100644 crates/nu-cli/src/commands/history/history_import.rs
 delete mode 100644 crates/nu-cli/tests/commands/history_import.rs

diff --git a/crates/nu-cli/src/commands/default_context.rs b/crates/nu-cli/src/commands/default_context.rs
index ad19f18d94..0c1c459c20 100644
--- a/crates/nu-cli/src/commands/default_context.rs
+++ b/crates/nu-cli/src/commands/default_context.rs
@@ -17,7 +17,6 @@ pub fn add_cli_context(mut engine_state: EngineState) -> EngineState {
             CommandlineGetCursor,
             CommandlineSetCursor,
             History,
-            HistoryImport,
             HistorySession,
             Keybindings,
             KeybindingsDefault,
diff --git a/crates/nu-cli/src/commands/history/fields.rs b/crates/nu-cli/src/commands/history/fields.rs
deleted file mode 100644
index f14a3e81ca..0000000000
--- a/crates/nu-cli/src/commands/history/fields.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// Each const is named after a HistoryItem field, and the value is the field name to be displayed to
-// the user (or accept during import).
-pub const COMMAND_LINE: &str = "command";
-pub const ID: &str = "item_id";
-pub const START_TIMESTAMP: &str = "start_timestamp";
-pub const HOSTNAME: &str = "hostname";
-pub const CWD: &str = "cwd";
-pub const EXIT_STATUS: &str = "exit_status";
-pub const DURATION: &str = "duration";
-pub const SESSION_ID: &str = "session_id";
diff --git a/crates/nu-cli/src/commands/history/history_.rs b/crates/nu-cli/src/commands/history/history_.rs
index c31317882a..602574229e 100644
--- a/crates/nu-cli/src/commands/history/history_.rs
+++ b/crates/nu-cli/src/commands/history/history_.rs
@@ -5,8 +5,6 @@ use reedline::{
     SqliteBackedHistory,
 };
 
-use super::fields;
-
 #[derive(Clone)]
 pub struct History;
 
@@ -85,8 +83,7 @@ impl Command for History {
                     entries.into_iter().enumerate().map(move |(idx, entry)| {
                         Value::record(
                             record! {
-                                fields::COMMAND_LINE => Value::string(entry.command_line, head),
-                                // TODO: This name is inconsistent with create_history_record.
+                                "command" => Value::string(entry.command_line, head),
                                 "index" => Value::int(idx as i64, head),
                             },
                             head,
@@ -178,14 +175,14 @@ fn create_history_record(idx: usize, entry: HistoryItem, long: bool, head: Span)
     if long {
         Value::record(
             record! {
-                fields::ID => item_id_value,
-                fields::START_TIMESTAMP => start_timestamp_value,
-                fields::COMMAND_LINE => command_value,
-                fields::SESSION_ID => session_id_value,
-                fields::HOSTNAME => hostname_value,
-                fields::CWD => cwd_value,
-                fields::DURATION => duration_value,
-                fields::EXIT_STATUS => exit_status_value,
+                "item_id" => item_id_value,
+                "start_timestamp" => start_timestamp_value,
+                "command" => command_value,
+                "session_id" => session_id_value,
+                "hostname" => hostname_value,
+                "cwd" => cwd_value,
+                "duration" => duration_value,
+                "exit_status" => exit_status_value,
                 "idx" => index_value,
             },
             head,
@@ -193,11 +190,11 @@ fn create_history_record(idx: usize, entry: HistoryItem, long: bool, head: Span)
     } else {
         Value::record(
             record! {
-                fields::START_TIMESTAMP => start_timestamp_value,
-                fields::COMMAND_LINE => command_value,
-                fields::CWD => cwd_value,
-                fields::DURATION => duration_value,
-                fields::EXIT_STATUS => exit_status_value,
+                "start_timestamp" => start_timestamp_value,
+                "command" => command_value,
+                "cwd" => cwd_value,
+                "duration" => duration_value,
+                "exit_status" => exit_status_value,
             },
             head,
         )
diff --git a/crates/nu-cli/src/commands/history/history_import.rs b/crates/nu-cli/src/commands/history/history_import.rs
deleted file mode 100644
index 71daeac58c..0000000000
--- a/crates/nu-cli/src/commands/history/history_import.rs
+++ /dev/null
@@ -1,332 +0,0 @@
-use nu_engine::command_prelude::*;
-use nu_protocol::HistoryFileFormat;
-
-use reedline::{
-    FileBackedHistory, History, HistoryItem, HistoryItemId, ReedlineError, SearchQuery,
-    SqliteBackedHistory,
-};
-
-use super::fields;
-
-#[derive(Clone)]
-pub struct HistoryImport;
-
-impl Command for HistoryImport {
-    fn name(&self) -> &str {
-        "history import"
-    }
-
-    fn description(&self) -> &str {
-        "Import command line history"
-    }
-
-    fn extra_description(&self) -> &str {
-        r#"Can import history from input, either successive command lines or more detailed records. If providing records, available fields are:
-    command_line, id, start_timestamp, hostname, cwd, duration, exit_status.
-
-If no input is provided, will import all history items from existing history in the other format: if current history is stored in sqlite, it will store it in plain text and vice versa."#
-    }
-
-    fn signature(&self) -> nu_protocol::Signature {
-        Signature::build("history import")
-            .category(Category::History)
-            .input_output_types(vec![
-                (Type::Nothing, Type::Nothing),
-                (Type::List(Box::new(Type::String)), Type::Nothing),
-                (Type::table(), Type::Nothing),
-            ])
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                example: "history import",
-                description:
-                    "Append all items from history in the other format to the current history",
-                result: None,
-            },
-            Example {
-                example: "echo foo | history import",
-                description: "Append `foo` to the current history",
-                result: None,
-            },
-            Example {
-                example: "[[ command_line cwd ]; [ foo /home ]] | history import",
-                description: "Append `foo` ran from `/home` to the current history",
-                result: None,
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        _stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let ok = Ok(Value::nothing(call.head).into_pipeline_data());
-
-        let Some(history) = engine_state.history_config() else {
-            return ok;
-        };
-        let Some(current_history_path) = history.file_path() else {
-            return Err(ShellError::ConfigDirNotFound {
-                span: Some(call.head),
-            });
-        };
-
-        match input {
-            PipelineData::Empty => {
-                let other_format = match history.file_format {
-                    HistoryFileFormat::Sqlite => HistoryFileFormat::Plaintext,
-                    HistoryFileFormat::Plaintext => HistoryFileFormat::Sqlite,
-                };
-                let src = new_backend(other_format, None)?;
-                let mut dst = new_backend(history.file_format, Some(current_history_path))?;
-                let items = src
-                    .search(SearchQuery::everything(
-                        reedline::SearchDirection::Forward,
-                        None,
-                    ))
-                    .map_err(error_from_reedline)?
-                    .into_iter()
-                    .map(Ok);
-                import(dst.as_mut(), items)
-            }
-            _ => {
-                let input = input.into_iter().map(item_from_value);
-                import(
-                    new_backend(history.file_format, Some(current_history_path))?.as_mut(),
-                    input,
-                )
-            }
-        }?;
-
-        ok
-    }
-}
-
-fn new_backend(
-    format: HistoryFileFormat,
-    path: Option<std::path::PathBuf>,
-) -> Result<Box<dyn History>, ShellError> {
-    let path = match path {
-        Some(path) => path,
-        None => {
-            let Some(mut path) = nu_path::nu_config_dir() else {
-                return Err(ShellError::ConfigDirNotFound { span: None });
-            };
-            path.push(format.default_file_name());
-            path.into_std_path_buf()
-        }
-    };
-
-    fn map(
-        result: Result<impl History + 'static, ReedlineError>,
-    ) -> Result<Box<dyn History>, ShellError> {
-        result
-            .map(|x| Box::new(x) as Box<dyn History>)
-            .map_err(error_from_reedline)
-    }
-    match format {
-        // Use a reasonably large value for maximum capacity.
-        HistoryFileFormat::Plaintext => map(FileBackedHistory::with_file(0xfffffff, path)),
-        HistoryFileFormat::Sqlite => map(SqliteBackedHistory::with_file(path, None, None)),
-    }
-}
-
-fn import(
-    dst: &mut dyn History,
-    src: impl Iterator<Item = Result<HistoryItem, ShellError>>,
-) -> Result<(), ShellError> {
-    for item in src {
-        dst.save(item?).map_err(error_from_reedline)?;
-    }
-    Ok(())
-}
-
-fn error_from_reedline(e: ReedlineError) -> ShellError {
-    // TODO: Should we add a new ShellError variant?
-    ShellError::GenericError {
-        error: "Reedline error".to_owned(),
-        msg: format!("{e}"),
-        span: None,
-        help: None,
-        inner: Vec::new(),
-    }
-}
-
-fn item_from_value(v: Value) -> Result<HistoryItem, ShellError> {
-    let span = v.span();
-    match v {
-        Value::Record { val, .. } => item_from_record(val.into_owned(), span),
-        Value::String { val, .. } => Ok(HistoryItem {
-            command_line: val,
-            id: None,
-            start_timestamp: None,
-            session_id: None,
-            hostname: None,
-            cwd: None,
-            duration: None,
-            exit_status: None,
-            more_info: None,
-        }),
-        _ => Err(ShellError::UnsupportedInput {
-            msg: "Only list and record inputs are supported".to_owned(),
-            input: v.get_type().to_string(),
-            msg_span: span,
-            input_span: span,
-        }),
-    }
-}
-
-fn item_from_record(mut rec: Record, span: Span) -> Result<HistoryItem, ShellError> {
-    let cmd = match rec.remove(fields::COMMAND_LINE) {
-        Some(v) => v.as_str()?.to_owned(),
-        None => {
-            return Err(ShellError::TypeMismatch {
-                err_message: format!("missing column: {}", fields::COMMAND_LINE),
-                span,
-            })
-        }
-    };
-
-    fn get<T>(
-        rec: &mut Record,
-        field: &'static str,
-        f: impl FnOnce(Value) -> Result<T, ShellError>,
-    ) -> Result<Option<T>, ShellError> {
-        rec.remove(field).map(f).transpose()
-    }
-
-    let rec = &mut rec;
-    let item = HistoryItem {
-        command_line: cmd,
-        id: get(rec, fields::ID, |v| Ok(HistoryItemId::new(v.as_int()?)))?,
-        start_timestamp: get(rec, fields::START_TIMESTAMP, |v| Ok(v.as_date()?.to_utc()))?,
-        hostname: get(rec, fields::HOSTNAME, |v| Ok(v.as_str()?.to_owned()))?,
-        cwd: get(rec, fields::CWD, |v| Ok(v.as_str()?.to_owned()))?,
-        exit_status: get(rec, fields::EXIT_STATUS, |v| v.as_i64())?,
-        duration: get(rec, fields::DURATION, duration_from_value)?,
-        more_info: None,
-        // TODO: Currently reedline doesn't let you create session IDs.
-        session_id: None,
-    };
-
-    if !rec.is_empty() {
-        let cols = rec.columns().map(|s| s.as_str()).collect::<Vec<_>>();
-        return Err(ShellError::TypeMismatch {
-            err_message: format!("unsupported column names: {}", cols.join(", ")),
-            span,
-        });
-    }
-    Ok(item)
-}
-
-fn duration_from_value(v: Value) -> Result<std::time::Duration, ShellError> {
-    chrono::Duration::nanoseconds(v.as_duration()?)
-        .to_std()
-        .map_err(|_| ShellError::IOError {
-            msg: "negative duration not supported".to_string(),
-        })
-}
-
-#[cfg(test)]
-mod tests {
-    use chrono::DateTime;
-
-    use super::*;
-
-    #[test]
-    fn test_item_from_value_string() -> Result<(), ShellError> {
-        let item = item_from_value(Value::string("foo", Span::unknown()))?;
-        assert_eq!(
-            item,
-            HistoryItem {
-                command_line: "foo".to_string(),
-                id: None,
-                start_timestamp: None,
-                session_id: None,
-                hostname: None,
-                cwd: None,
-                duration: None,
-                exit_status: None,
-                more_info: None
-            }
-        );
-        Ok(())
-    }
-
-    #[test]
-    fn test_item_from_value_record() {
-        let span = Span::unknown();
-        let rec = new_record(&[
-            ("command", Value::string("foo", span)),
-            ("item_id", Value::int(1, span)),
-            (
-                "start_timestamp",
-                Value::date(
-                    DateTime::parse_from_rfc3339("1996-12-19T16:39:57-08:00").unwrap(),
-                    span,
-                ),
-            ),
-            ("hostname", Value::string("localhost", span)),
-            ("cwd", Value::string("/home/test", span)),
-            ("duration", Value::duration(100_000_000, span)),
-            ("exit_status", Value::int(42, span)),
-        ]);
-        let item = item_from_value(rec).unwrap();
-        assert_eq!(
-            item,
-            HistoryItem {
-                command_line: "foo".to_string(),
-                id: Some(HistoryItemId::new(1)),
-                start_timestamp: Some(
-                    DateTime::parse_from_rfc3339("1996-12-19T16:39:57-08:00")
-                        .unwrap()
-                        .to_utc()
-                ),
-                hostname: Some("localhost".to_string()),
-                cwd: Some("/home/test".to_string()),
-                duration: Some(std::time::Duration::from_nanos(100_000_000)),
-                exit_status: Some(42),
-
-                session_id: None,
-                more_info: None
-            }
-        );
-    }
-
-    #[test]
-    fn test_item_from_value_record_extra_field() {
-        let span = Span::unknown();
-        let rec = new_record(&[
-            ("command_line", Value::string("foo", span)),
-            ("id_nonexistent", Value::int(1, span)),
-        ]);
-        assert!(item_from_value(rec).is_err());
-    }
-
-    #[test]
-    fn test_item_from_value_record_bad_type() {
-        let span = Span::unknown();
-        let rec = new_record(&[
-            ("command_line", Value::string("foo", span)),
-            ("id", Value::string("one".to_string(), span)),
-        ]);
-        assert!(item_from_value(rec).is_err());
-    }
-
-    fn new_record(rec: &[(&'static str, Value)]) -> Value {
-        let span = Span::unknown();
-        let rec = Record::from_raw_cols_vals(
-            rec.iter().map(|(col, _)| col.to_string()).collect(),
-            rec.iter().map(|(_, val)| val.clone()).collect(),
-            span,
-            span,
-        )
-        .unwrap();
-        Value::record(rec, span)
-    }
-}
diff --git a/crates/nu-cli/src/commands/history/mod.rs b/crates/nu-cli/src/commands/history/mod.rs
index c36b560307..be7d1fc11f 100644
--- a/crates/nu-cli/src/commands/history/mod.rs
+++ b/crates/nu-cli/src/commands/history/mod.rs
@@ -1,8 +1,5 @@
-mod fields;
 mod history_;
-mod history_import;
 mod history_session;
 
 pub use history_::History;
-pub use history_import::HistoryImport;
 pub use history_session::HistorySession;
diff --git a/crates/nu-cli/src/commands/mod.rs b/crates/nu-cli/src/commands/mod.rs
index 4a9dd9ef21..f63724e95f 100644
--- a/crates/nu-cli/src/commands/mod.rs
+++ b/crates/nu-cli/src/commands/mod.rs
@@ -7,7 +7,7 @@ mod keybindings_list;
 mod keybindings_listen;
 
 pub use commandline::{Commandline, CommandlineEdit, CommandlineGetCursor, CommandlineSetCursor};
-pub use history::{History, HistoryImport, HistorySession};
+pub use history::{History, HistorySession};
 pub use keybindings::Keybindings;
 pub use keybindings_default::KeybindingsDefault;
 pub use keybindings_list::KeybindingsList;
diff --git a/crates/nu-cli/tests/commands/history_import.rs b/crates/nu-cli/tests/commands/history_import.rs
deleted file mode 100644
index c92260f457..0000000000
--- a/crates/nu-cli/tests/commands/history_import.rs
+++ /dev/null
@@ -1,186 +0,0 @@
-use nu_test_support::{nu, Outcome};
-use reedline::{
-    FileBackedHistory, History, HistoryItem, HistoryItemId, ReedlineError, SearchQuery,
-    SqliteBackedHistory,
-};
-use tempfile::TempDir;
-
-struct Test {
-    cfg_dir: TempDir,
-}
-
-impl Test {
-    fn new(history_format: &'static str) -> Self {
-        let cfg_dir = tempfile::Builder::new()
-            .prefix("history_import_test")
-            .tempdir()
-            .unwrap();
-        // Assigning to $env.config.history.file_format seems to work only in startup
-        // configuration.
-        std::fs::write(
-            cfg_dir.path().join("env.nu"),
-            format!("$env.config.history.file_format = {history_format:?}"),
-        )
-        .unwrap();
-        Self { cfg_dir }
-    }
-
-    fn nu(&self, cmd: &'static str) -> Outcome {
-        let env = [(
-            "XDG_CONFIG_HOME".to_string(),
-            self.cfg_dir.path().to_str().unwrap().to_string(),
-        )];
-        let env_config = self.cfg_dir.path().join("env.nu");
-        nu!(envs: env, env_config: env_config, cmd)
-    }
-
-    fn open_plaintext(&self) -> Result<FileBackedHistory, ReedlineError> {
-        FileBackedHistory::with_file(100, self.cfg_dir.path().join("nushell").join("history.txt"))
-    }
-
-    fn open_sqlite(&self) -> Result<SqliteBackedHistory, ReedlineError> {
-        SqliteBackedHistory::with_file(
-            self.cfg_dir.path().join("nushell").join("history.sqlite3"),
-            None,
-            None,
-        )
-    }
-}
-
-fn query_all(history: impl History) -> Result<Vec<HistoryItem>, ReedlineError> {
-    history.search(SearchQuery::everything(
-        reedline::SearchDirection::Forward,
-        None,
-    ))
-}
-
-fn save_all(mut history: impl History, items: Vec<HistoryItem>) -> Result<(), ReedlineError> {
-    for item in items {
-        history.save(item)?;
-    }
-    Ok(())
-}
-
-const EMPTY_ITEM: HistoryItem = HistoryItem {
-    command_line: String::new(),
-    id: None,
-    start_timestamp: None,
-    session_id: None,
-    hostname: None,
-    cwd: None,
-    duration: None,
-    exit_status: None,
-    more_info: None,
-};
-
-#[test]
-fn history_import_pipe_string() {
-    let test = Test::new("plaintext");
-    let outcome = test.nu("echo bar | history import");
-
-    assert!(outcome.status.success());
-    assert_eq!(
-        query_all(test.open_plaintext().unwrap()).unwrap(),
-        vec![HistoryItem {
-            id: Some(HistoryItemId::new(0)),
-            command_line: "bar".to_string(),
-            ..EMPTY_ITEM
-        }]
-    );
-}
-
-#[test]
-fn history_import_pipe_record() {
-    let test = Test::new("sqlite");
-    let outcome = test.nu("[[item_id command]; [42 some_command]] | history import");
-
-    assert!(outcome.status.success());
-    assert_eq!(
-        query_all(test.open_sqlite().unwrap()).unwrap(),
-        vec![HistoryItem {
-            id: Some(HistoryItemId::new(42)),
-            command_line: "some_command".to_string(),
-            ..EMPTY_ITEM
-        }]
-    );
-}
-
-#[test]
-fn history_import_plain_to_sqlite() {
-    let test = Test::new("sqlite");
-    save_all(
-        test.open_plaintext().unwrap(),
-        vec![
-            HistoryItem {
-                id: Some(HistoryItemId::new(0)),
-                command_line: "foo".to_string(),
-                ..EMPTY_ITEM
-            },
-            HistoryItem {
-                id: Some(HistoryItemId::new(1)),
-                command_line: "bar".to_string(),
-                ..EMPTY_ITEM
-            },
-        ],
-    )
-    .unwrap();
-
-    let outcome = test.nu("history import");
-    assert!(outcome.status.success());
-    assert_eq!(
-        query_all(test.open_sqlite().unwrap()).unwrap(),
-        vec![
-            HistoryItem {
-                id: Some(HistoryItemId::new(0)),
-                command_line: "foo".to_string(),
-                ..EMPTY_ITEM
-            },
-            HistoryItem {
-                id: Some(HistoryItemId::new(1)),
-                command_line: "bar".to_string(),
-                ..EMPTY_ITEM
-            }
-        ]
-    );
-}
-
-#[test]
-fn history_import_sqlite_to_plain() {
-    let test = Test::new("plaintext");
-    save_all(
-        test.open_sqlite().unwrap(),
-        vec![
-            HistoryItem {
-                id: Some(HistoryItemId::new(0)),
-                command_line: "foo".to_string(),
-                hostname: Some("host".to_string()),
-                ..EMPTY_ITEM
-            },
-            HistoryItem {
-                id: Some(HistoryItemId::new(1)),
-                command_line: "bar".to_string(),
-                cwd: Some("/home/test".to_string()),
-                ..EMPTY_ITEM
-            },
-        ],
-    )
-    .unwrap();
-
-    let outcome = test.nu("history import");
-    assert!(outcome.status.success());
-    assert_eq!(
-        query_all(test.open_plaintext().unwrap()).unwrap(),
-        vec![
-            HistoryItem {
-                id: Some(HistoryItemId::new(0)),
-                command_line: "foo".to_string(),
-                ..EMPTY_ITEM
-            },
-            HistoryItem {
-                id: Some(HistoryItemId::new(1)),
-                command_line: "bar".to_string(),
-                ..EMPTY_ITEM
-            },
-        ]
-    );
-}
diff --git a/crates/nu-cli/tests/commands/mod.rs b/crates/nu-cli/tests/commands/mod.rs
index 9eb18e3280..087791302e 100644
--- a/crates/nu-cli/tests/commands/mod.rs
+++ b/crates/nu-cli/tests/commands/mod.rs
@@ -1,3 +1,2 @@
-mod history_import;
 mod keybindings_list;
 mod nu_highlight;
diff --git a/crates/nu-test-support/src/macros.rs b/crates/nu-test-support/src/macros.rs
index 1ae7ce593e..2547b1f4c8 100644
--- a/crates/nu-test-support/src/macros.rs
+++ b/crates/nu-test-support/src/macros.rs
@@ -234,7 +234,7 @@ macro_rules! nu_with_plugins {
 }
 
 use crate::{Outcome, NATIVE_PATH_ENV_VAR};
-use nu_path::{AbsolutePath, AbsolutePathBuf, Path, PathBuf};
+use nu_path::{AbsolutePath, AbsolutePathBuf, Path};
 use std::{
     ffi::OsStr,
     process::{Command, Stdio},
@@ -248,10 +248,6 @@ pub struct NuOpts {
     pub envs: Option<Vec<(String, String)>>,
     pub collapse_output: Option<bool>,
     pub use_ir: Option<bool>,
-    // Note: At the time this was added, passing in a file path was more convenient. However,
-    // passing in file contents seems like a better API - consider this when adding new uses of
-    // this field.
-    pub env_config: Option<PathBuf>,
 }
 
 pub fn nu_run_test(opts: NuOpts, commands: impl AsRef<str>, with_std: bool) -> Outcome {
@@ -282,14 +278,8 @@ pub fn nu_run_test(opts: NuOpts, commands: impl AsRef<str>, with_std: bool) -> O
         command.envs(envs);
     }
 
-    match opts.env_config {
-        Some(path) => command.arg("--env-config").arg(path),
-        // TODO: This seems unnecessary: the code that runs for integration tests
-        // (run_commands) loads startup configs only if they are specified via flags explicitly or
-        // the shell is started as logging shell (which it is not in this case).
-        None => command.arg("--no-config-file"),
-    };
-
+    // Ensure that the user's config doesn't interfere with the tests
+    command.arg("--no-config-file");
     if !with_std {
         command.arg("--no-std-lib");
     }

From a11c9e9d7030faea2b5ecd356c7ee09657af0ca9 Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Sun, 13 Oct 2024 08:01:03 -0400
Subject: [PATCH 0552/1072] Ratelimit save command progress bar updates
 (#14075)

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

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

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

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

Currently, the `save -p` command updates the progress animation each
time any data is written. This PR rate limits the animation so it
doesn't play as fast.

Here's an asciinema of [current
behavior](https://asciinema.org/a/8RWrWTozQSceqx6tYY7kzblqj) and
[proposed behavior](https://asciinema.org/a/E1pi0gMwMwFcxVHOy9Fv1Kk6R).

# User-Facing Changes

* `save -p` progress bar has a smoother animation

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
N/A
---
 crates/nu-command/src/filesystem/save.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/crates/nu-command/src/filesystem/save.rs b/crates/nu-command/src/filesystem/save.rs
index ec7e4140ce..6fda754341 100644
--- a/crates/nu-command/src/filesystem/save.rs
+++ b/crates/nu-command/src/filesystem/save.rs
@@ -12,6 +12,7 @@ use std::{
     io::{self, BufRead, BufReader, Read, Write},
     path::{Path, PathBuf},
     thread,
+    time::{Duration, Instant},
 };
 
 #[derive(Clone)]
@@ -482,7 +483,7 @@ fn stream_to_file(
 
         let mut bar = progress_bar::NuProgressBar::new(known_size);
 
-        // TODO: reduce the number of progress bar updates?
+        let mut last_update = Instant::now();
 
         let mut reader = BufReader::new(source);
 
@@ -499,7 +500,10 @@ fn stream_to_file(
                     let len = buf.len();
                     reader.consume(len);
                     bytes_processed += len as u64;
-                    bar.update_bar(bytes_processed);
+                    if last_update.elapsed() >= Duration::from_millis(75) {
+                        bar.update_bar(bytes_processed);
+                        last_update = Instant::now();
+                    }
                 }
                 Err(e) if e.kind() == io::ErrorKind::Interrupted => continue,
                 Err(e) => break Err(e),

From a0f38f8845383f3f9f6d11ae9f8766000ac8a680 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Sun, 13 Oct 2024 12:31:09 -0700
Subject: [PATCH 0553/1072] Fix deleted lowercase in keybinding parsing
 (#14081)

# Description
Adds back the `to_ascii_lowercase` deleted in #13802. Also fixes the
error messages having the lowercased value instead of the original
value.
---
 crates/nu-cli/src/reedline_config.rs | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/crates/nu-cli/src/reedline_config.rs b/crates/nu-cli/src/reedline_config.rs
index 80ae28b103..1b09e59166 100644
--- a/crates/nu-cli/src/reedline_config.rs
+++ b/crates/nu-cli/src/reedline_config.rs
@@ -776,7 +776,7 @@ fn add_parsed_keybinding(
     keybinding: &ParsedKeybinding,
     config: &Config,
 ) -> Result<(), ShellError> {
-    let Ok(modifier_str) = keybinding.modifier.as_str().map(str::to_ascii_lowercase) else {
+    let Ok(modifier_str) = keybinding.modifier.as_str() else {
         return Err(ShellError::RuntimeTypeMismatch {
             expected: Type::String,
             actual: keybinding.modifier.get_type(),
@@ -785,20 +785,20 @@ fn add_parsed_keybinding(
     };
 
     let mut modifier = KeyModifiers::NONE;
-    if modifier_str != "none" {
+    if !str::eq_ignore_ascii_case(modifier_str, "none") {
         for part in modifier_str.split('_') {
-            match part {
+            match part.to_ascii_lowercase().as_str() {
                 "control" => modifier |= KeyModifiers::CONTROL,
                 "shift" => modifier |= KeyModifiers::SHIFT,
                 "alt" => modifier |= KeyModifiers::ALT,
                 "super" => modifier |= KeyModifiers::SUPER,
                 "hyper" => modifier |= KeyModifiers::HYPER,
                 "meta" => modifier |= KeyModifiers::META,
-                str => {
+                _ => {
                     return Err(ShellError::InvalidValue {
                         valid: "'control', 'shift', 'alt', 'super', 'hyper', 'meta', or 'none'"
                             .into(),
-                        actual: format!("'{str}'"),
+                        actual: format!("'{part}'"),
                         span: keybinding.modifier.span(),
                     });
                 }
@@ -814,7 +814,9 @@ fn add_parsed_keybinding(
         });
     };
 
-    let keycode = if let Some(rest) = keycode.strip_prefix("char_") {
+    let keycode_lower = keycode.to_ascii_lowercase();
+
+    let keycode = if let Some(rest) = keycode_lower.strip_prefix("char_") {
         let error = |valid: &str, actual: &str| ShellError::InvalidValue {
             valid: valid.into(),
             actual: actual.into(),
@@ -837,7 +839,7 @@ fn add_parsed_keybinding(
 
         KeyCode::Char(char)
     } else {
-        match keycode {
+        match keycode_lower.as_str() {
             "backspace" => KeyCode::Backspace,
             "enter" => KeyCode::Enter,
             "space" => KeyCode::Char(' '),
@@ -860,15 +862,15 @@ fn add_parsed_keybinding(
                 .map(KeyCode::F)
                 .ok_or(ShellError::InvalidValue {
                     valid: "'f1', 'f2', ..., or 'f20'".into(),
-                    actual: format!("'{c}'"),
+                    actual: format!("'{keycode}'"),
                     span: keybinding.keycode.span(),
                 })?,
             "null" => KeyCode::Null,
             "esc" | "escape" => KeyCode::Esc,
-            str => {
+            _ => {
                 return Err(ShellError::InvalidValue {
                     valid: "a crossterm KeyCode".into(),
-                    actual: format!("'{str}'"),
+                    actual: format!("'{keycode}'"),
                     span: keybinding.keycode.span(),
                 });
             }

From 639bd4fc2eec0134f70a2bbda771f7a0b558ebc4 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Mon, 14 Oct 2024 22:57:30 +0800
Subject: [PATCH 0554/1072] change display_error.exit_code to false (#13873)

The idea comes from @amtoine, I think it would be good to keey
`display_error.exit_code` same value, if user is using default config or
using no config file at all.
---
 crates/nu-command/tests/commands/do_.rs         | 15 +++++++++------
 crates/nu-protocol/src/config/display_errors.rs |  2 +-
 tests/shell/pipeline/commands/external.rs       |  6 ++++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/crates/nu-command/tests/commands/do_.rs b/crates/nu-command/tests/commands/do_.rs
index fe7959acb4..bbce5648db 100644
--- a/crates/nu-command/tests/commands/do_.rs
+++ b/crates/nu-command/tests/commands/do_.rs
@@ -9,25 +9,28 @@ fn capture_errors_works() {
     assert!(actual.err.contains("column_not_found"));
 }
 
+// TODO: need to add tests under display_error.exit_code = true
 #[test]
 fn capture_errors_works_for_external() {
     let actual = nu!("do -c {nu --testbin fail}");
-    assert!(actual.err.contains("exited with code"));
-    assert_eq!(actual.out, "");
+    assert!(!actual.status.success());
+    assert!(!actual.err.contains("exited with code"));
 }
 
+// TODO: need to add tests under display_error.exit_code = true
 #[test]
 fn capture_errors_works_for_external_with_pipeline() {
     let actual = nu!("do -c {nu --testbin fail} | echo `text`");
-    assert!(actual.err.contains("exited with code"));
-    assert_eq!(actual.out, "");
+    assert!(!actual.status.success());
+    assert!(!actual.err.contains("exited with code"));
 }
 
+// TODO: need to add tests under display_error.exit_code = true
 #[test]
 fn capture_errors_works_for_external_with_semicolon() {
     let actual = nu!(r#"do -c {nu --testbin fail}; echo `text`"#);
-    assert!(actual.err.contains("exited with code"));
-    assert_eq!(actual.out, "");
+    assert!(!actual.status.success());
+    assert!(!actual.err.contains("exited with code"));
 }
 
 #[test]
diff --git a/crates/nu-protocol/src/config/display_errors.rs b/crates/nu-protocol/src/config/display_errors.rs
index 82b7a56415..45239deda9 100644
--- a/crates/nu-protocol/src/config/display_errors.rs
+++ b/crates/nu-protocol/src/config/display_errors.rs
@@ -22,7 +22,7 @@ impl DisplayErrors {
 impl Default for DisplayErrors {
     fn default() -> Self {
         Self {
-            exit_code: true,
+            exit_code: false,
             termination_signal: true,
         }
     }
diff --git a/tests/shell/pipeline/commands/external.rs b/tests/shell/pipeline/commands/external.rs
index 461cd1638b..d92785b51c 100644
--- a/tests/shell/pipeline/commands/external.rs
+++ b/tests/shell/pipeline/commands/external.rs
@@ -627,16 +627,18 @@ fn exit_code_stops_execution_closure() {
     assert!(actual.err.contains("exited with code 1"));
 }
 
+// TODO: need to add tests under display_error.exit_code = true
 #[test]
 fn exit_code_stops_execution_custom_command() {
     let actual = nu!("def cmd [] { nu -c 'exit 42'; 'ok1' }; cmd; print 'ok2'");
     assert!(actual.out.is_empty());
-    assert!(actual.err.contains("exited with code 42"));
+    assert!(!actual.err.contains("exited with code 42"));
 }
 
+// TODO: need to add tests under display_error.exit_code = true
 #[test]
 fn exit_code_stops_execution_for_loop() {
     let actual = nu!("for x in [0 1] { nu -c 'exit 42'; print $x }");
     assert!(actual.out.is_empty());
-    assert!(actual.err.contains("exited with code 42"));
+    assert!(!actual.err.contains("exited with code 42"));
 }

From b99affba4b42a678b3ecdb58b6c206d75cefc317 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Tue, 15 Oct 2024 11:05:57 -0700
Subject: [PATCH 0555/1072] bumping reedline to version 0.36 (#14093)

---
 Cargo.lock | 5 +++--
 Cargo.toml | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8d35cea895..86c407f9f2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5147,8 +5147,9 @@ dependencies = [
 
 [[package]]
 name = "reedline"
-version = "0.35.0"
-source = "git+https://github.com/nushell/reedline?branch=main#5e556bfd2855420e782e1753da13a4fcb798f2c7"
+version = "0.36.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57016fc0ec4c651a05cb80fb1200b7c3518afcc2f769edffe15aca2363395c15"
 dependencies = [
  "arboard",
  "chrono",
diff --git a/Cargo.toml b/Cargo.toml
index 5126492c43..8e2d3825ce 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -137,7 +137,7 @@ rand = "0.8"
 rand_chacha = "0.3.1"
 ratatui = "0.26"
 rayon = "1.10"
-reedline = "0.35.0"
+reedline = "0.36.0"
 regex = "1.9.5"
 rmp = "0.8"
 rmp-serde = "1.3"
@@ -313,7 +313,7 @@ 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`

From 91ff57faa7921223fe54b3cfca2e324d36c7018d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C5=BD=C3=A1dn=C3=ADk?= <kubouch@gmail.com>
Date: Tue, 15 Oct 2024 22:01:08 +0300
Subject: [PATCH 0556/1072] Bump to version 0.99.0 (#14094)

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

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

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

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

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock                                    | 74 +++++++++----------
 Cargo.toml                                    | 42 +++++------
 crates/nu-cli/Cargo.toml                      | 26 +++----
 crates/nu-cmd-base/Cargo.toml                 | 12 +--
 crates/nu-cmd-extra/Cargo.toml                | 22 +++---
 crates/nu-cmd-lang/Cargo.toml                 | 12 +--
 crates/nu-cmd-plugin/Cargo.toml               | 12 +--
 crates/nu-color-config/Cargo.toml             | 10 +--
 crates/nu-command/Cargo.toml                  | 36 ++++-----
 crates/nu-derive-value/Cargo.toml             |  4 +-
 crates/nu-engine/Cargo.toml                   | 12 +--
 crates/nu-explore/Cargo.toml                  | 22 +++---
 crates/nu-glob/Cargo.toml                     |  4 +-
 crates/nu-json/Cargo.toml                     |  8 +-
 crates/nu-lsp/Cargo.toml                      | 16 ++--
 crates/nu-parser/Cargo.toml                   | 12 +--
 crates/nu-path/Cargo.toml                     |  4 +-
 crates/nu-plugin-core/Cargo.toml              |  8 +-
 crates/nu-plugin-engine/Cargo.toml            | 16 ++--
 crates/nu-plugin-protocol/Cargo.toml          |  8 +-
 crates/nu-plugin-test-support/Cargo.toml      | 20 ++---
 crates/nu-plugin/Cargo.toml                   | 14 ++--
 crates/nu-pretty-hex/Cargo.toml               |  4 +-
 crates/nu-protocol/Cargo.toml                 | 14 ++--
 crates/nu-std/Cargo.toml                      | 10 +--
 crates/nu-system/Cargo.toml                   |  4 +-
 crates/nu-table/Cargo.toml                    | 12 +--
 crates/nu-term-grid/Cargo.toml                |  6 +-
 crates/nu-test-support/Cargo.toml             | 10 +--
 crates/nu-utils/Cargo.toml                    |  4 +-
 .../src/sample_config/default_config.nu       |  4 +-
 .../nu-utils/src/sample_config/default_env.nu |  4 +-
 crates/nu_plugin_custom_values/Cargo.toml     |  6 +-
 crates/nu_plugin_example/Cargo.toml           | 10 +--
 crates/nu_plugin_formats/Cargo.toml           |  8 +-
 crates/nu_plugin_gstat/Cargo.toml             |  8 +-
 crates/nu_plugin_inc/Cargo.toml               |  8 +-
 .../nu_plugin_nu_example.nu                   |  4 +-
 crates/nu_plugin_polars/Cargo.toml            | 22 +++---
 .../nu_plugin_python_example.py               |  4 +-
 crates/nu_plugin_query/Cargo.toml             |  8 +-
 crates/nu_plugin_stress_internals/Cargo.toml  |  4 +-
 crates/nuon/Cargo.toml                        | 10 +--
 43 files changed, 279 insertions(+), 279 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 86c407f9f2..038c8e9804 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2944,7 +2944,7 @@ dependencies = [
 
 [[package]]
 name = "nu"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "assert_cmd",
  "crossterm 0.28.1",
@@ -2999,7 +2999,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cli"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "chrono",
  "crossterm 0.28.1",
@@ -3034,7 +3034,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-base"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "indexmap",
  "miette",
@@ -3046,7 +3046,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-extra"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "fancy-regex",
  "heck",
@@ -3071,7 +3071,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-lang"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "itertools 0.13.0",
  "nu-engine",
@@ -3083,7 +3083,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-plugin"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "itertools 0.13.0",
  "nu-engine",
@@ -3094,7 +3094,7 @@ dependencies = [
 
 [[package]]
 name = "nu-color-config"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "nu-ansi-term",
  "nu-engine",
@@ -3106,7 +3106,7 @@ dependencies = [
 
 [[package]]
 name = "nu-command"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "alphanumeric-sort",
  "base64 0.22.1",
@@ -3216,7 +3216,7 @@ dependencies = [
 
 [[package]]
 name = "nu-derive-value"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -3227,7 +3227,7 @@ dependencies = [
 
 [[package]]
 name = "nu-engine"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "log",
  "nu-glob",
@@ -3239,7 +3239,7 @@ dependencies = [
 
 [[package]]
 name = "nu-explore"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "ansi-str",
  "anyhow",
@@ -3265,14 +3265,14 @@ dependencies = [
 
 [[package]]
 name = "nu-glob"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "doc-comment",
 ]
 
 [[package]]
 name = "nu-json"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "fancy-regex",
  "linked-hash-map",
@@ -3285,7 +3285,7 @@ dependencies = [
 
 [[package]]
 name = "nu-lsp"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "assert-json-diff",
  "crossbeam-channel",
@@ -3306,7 +3306,7 @@ dependencies = [
 
 [[package]]
 name = "nu-parser"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "bytesize",
  "chrono",
@@ -3322,7 +3322,7 @@ dependencies = [
 
 [[package]]
 name = "nu-path"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "dirs",
  "omnipath",
@@ -3331,7 +3331,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "log",
  "nix 0.29.0",
@@ -3347,7 +3347,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-core"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "interprocess",
  "log",
@@ -3361,7 +3361,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-engine"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "log",
  "nu-engine",
@@ -3377,7 +3377,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-protocol"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "nu-protocol",
  "nu-utils",
@@ -3389,7 +3389,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-test-support"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "nu-ansi-term",
  "nu-cmd-lang",
@@ -3407,7 +3407,7 @@ dependencies = [
 
 [[package]]
 name = "nu-pretty-hex"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "heapless",
  "nu-ansi-term",
@@ -3416,7 +3416,7 @@ dependencies = [
 
 [[package]]
 name = "nu-protocol"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "brotli",
  "byte-unit",
@@ -3454,7 +3454,7 @@ dependencies = [
 
 [[package]]
 name = "nu-std"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "log",
  "miette",
@@ -3465,7 +3465,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "chrono",
  "itertools 0.13.0",
@@ -3483,7 +3483,7 @@ dependencies = [
 
 [[package]]
 name = "nu-table"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "fancy-regex",
  "nu-ansi-term",
@@ -3498,7 +3498,7 @@ dependencies = [
 
 [[package]]
 name = "nu-term-grid"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "nu-utils",
  "unicode-width",
@@ -3506,7 +3506,7 @@ dependencies = [
 
 [[package]]
 name = "nu-test-support"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -3518,7 +3518,7 @@ dependencies = [
 
 [[package]]
 name = "nu-utils"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "crossterm_winapi",
  "log",
@@ -3544,7 +3544,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_example"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "nu-cmd-lang",
  "nu-plugin",
@@ -3554,7 +3554,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_formats"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "chrono",
  "eml-parser",
@@ -3569,7 +3569,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_gstat"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "git2",
  "nu-plugin",
@@ -3578,7 +3578,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_inc"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -3587,7 +3587,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_polars"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "chrono",
  "chrono-tz 0.9.0",
@@ -3622,7 +3622,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_query"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "gjson",
  "nu-plugin",
@@ -3637,7 +3637,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_stress_internals"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "interprocess",
  "serde",
@@ -3751,7 +3751,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "nuon"
-version = "0.98.1"
+version = "0.99.0"
 dependencies = [
  "chrono",
  "fancy-regex",
diff --git a/Cargo.toml b/Cargo.toml
index 8e2d3825ce..50ec615502 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
 rust-version = "1.79.0"
-version = "0.98.1"
+version = "0.99.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -189,22 +189,22 @@ unchecked_duration_subtraction = "warn"
 workspace = true
 
 [dependencies]
-nu-cli = { path = "./crates/nu-cli", version = "0.98.1" }
-nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.98.1" }
-nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.98.1" }
-nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.98.1", optional = true }
-nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.98.1" }
-nu-command = { path = "./crates/nu-command", version = "0.98.1" }
-nu-engine = { path = "./crates/nu-engine", version = "0.98.1" }
-nu-explore = { path = "./crates/nu-explore", version = "0.98.1" }
-nu-lsp = { path = "./crates/nu-lsp/", version = "0.98.1" }
-nu-parser = { path = "./crates/nu-parser", version = "0.98.1" }
-nu-path = { path = "./crates/nu-path", version = "0.98.1" }
-nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.98.1" }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.98.1" }
-nu-std = { path = "./crates/nu-std", version = "0.98.1" }
-nu-system = { path = "./crates/nu-system", version = "0.98.1" }
-nu-utils = { path = "./crates/nu-utils", version = "0.98.1" }
+nu-cli = { path = "./crates/nu-cli", version = "0.99.0" }
+nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.99.0" }
+nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.99.0" }
+nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.99.0", optional = true }
+nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.99.0" }
+nu-command = { path = "./crates/nu-command", version = "0.99.0" }
+nu-engine = { path = "./crates/nu-engine", version = "0.99.0" }
+nu-explore = { path = "./crates/nu-explore", version = "0.99.0" }
+nu-lsp = { path = "./crates/nu-lsp/", version = "0.99.0" }
+nu-parser = { path = "./crates/nu-parser", version = "0.99.0" }
+nu-path = { path = "./crates/nu-path", version = "0.99.0" }
+nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.99.0" }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.99.0" }
+nu-std = { path = "./crates/nu-std", version = "0.99.0" }
+nu-system = { path = "./crates/nu-system", version = "0.99.0" }
+nu-utils = { path = "./crates/nu-utils", version = "0.99.0" }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
 crossterm = { workspace = true }
@@ -234,9 +234,9 @@ nix = { workspace = true, default-features = false, features = [
 ] }
 
 [dev-dependencies]
-nu-test-support = { path = "./crates/nu-test-support", version = "0.98.1" }
-nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.98.1" }
-nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.98.1" }
+nu-test-support = { path = "./crates/nu-test-support", version = "0.99.0" }
+nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.99.0" }
+nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.99.0" }
 assert_cmd = "2.0"
 dirs = { workspace = true }
 tango-bench = "0.6"
@@ -320,4 +320,4 @@ bench = false
 # Run individual benchmarks like `cargo bench -- <regex>` e.g. `cargo bench -- parse`
 [[bench]]
 name = "benchmarks"
-harness = false
+harness = false
\ No newline at end of file
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 4d258f9254..f59fbb8edf 100644
--- 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.98.1"
+version = "0.99.0"
 
 [lib]
 bench = false
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.1" }
-nu-command = { path = "../nu-command", version = "0.98.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.98.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.0" }
+nu-command = { path = "../nu-command", version = "0.99.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.99.0" }
 rstest = { workspace = true, default-features = false }
 tempfile = { workspace = true }
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.98.1" }
-nu-engine = { path = "../nu-engine", version = "0.98.1" }
-nu-path = { path = "../nu-path", version = "0.98.1" }
-nu-parser = { path = "../nu-parser", version = "0.98.1" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.98.1", optional = true }
-nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
-nu-utils = { path = "../nu-utils", version = "0.98.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.98.1" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.99.0" }
+nu-engine = { path = "../nu-engine", version = "0.99.0" }
+nu-path = { path = "../nu-path", version = "0.99.0" }
+nu-parser = { path = "../nu-parser", version = "0.99.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.99.0", optional = true }
+nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
+nu-utils = { path = "../nu-utils", version = "0.99.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.99.0" }
 nu-ansi-term = { workspace = true }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
@@ -49,4 +49,4 @@ plugin = ["nu-plugin-engine"]
 system-clipboard = ["reedline/system_clipboard"]
 
 [lints]
-workspace = true
+workspace = true
\ No newline at end of file
diff --git a/crates/nu-cmd-base/Cargo.toml b/crates/nu-cmd-base/Cargo.toml
index ce105d6f91..a50a7d29f2 100644
--- a/crates/nu-cmd-base/Cargo.toml
+++ b/crates/nu-cmd-base/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-base"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-base"
-version = "0.98.1"
+version = "0.99.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,12 +13,12 @@ version = "0.98.1"
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.98.1" }
-nu-parser = { path = "../nu-parser", version = "0.98.1" }
-nu-path = { path = "../nu-path", version = "0.98.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
+nu-engine = { path = "../nu-engine", version = "0.99.0" }
+nu-parser = { path = "../nu-parser", version = "0.99.0" }
+nu-path = { path = "../nu-path", version = "0.99.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
 
 indexmap = { workspace = true }
 miette = { workspace = true }
 
-[dev-dependencies]
+[dev-dependencies]
\ No newline at end of file
diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml
index 40fd2d71e6..7a21b2382b 100644
--- 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.98.1"
+version = "0.99.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,13 +16,13 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.98.1" }
-nu-engine = { path = "../nu-engine", version = "0.98.1" }
-nu-json = { version = "0.98.1", path = "../nu-json" }
-nu-parser = { path = "../nu-parser", version = "0.98.1" }
-nu-pretty-hex = { version = "0.98.1", path = "../nu-pretty-hex" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
-nu-utils = { path = "../nu-utils", version = "0.98.1" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.99.0" }
+nu-engine = { path = "../nu-engine", version = "0.99.0" }
+nu-json = { version = "0.99.0", path = "../nu-json" }
+nu-parser = { path = "../nu-parser", version = "0.99.0" }
+nu-pretty-hex = { version = "0.99.0", path = "../nu-pretty-hex" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
+nu-utils = { path = "../nu-utils", version = "0.99.0" }
 
 # Potential dependencies for extras
 heck = { workspace = true }
@@ -36,6 +36,6 @@ v_htmlescape = { workspace = true }
 itertools = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.1" }
-nu-command = { path = "../nu-command", version = "0.98.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.98.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.0" }
+nu-command = { path = "../nu-command", version = "0.99.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.99.0" }
\ No newline at end of file
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index af00333b72..85ba6e8416 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -6,7 +6,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-lang"
 edition = "2021"
 license = "MIT"
 name = "nu-cmd-lang"
-version = "0.98.1"
+version = "0.99.0"
 
 [lib]
 bench = false
@@ -15,10 +15,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.98.1" }
-nu-parser = { path = "../nu-parser", version = "0.98.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
-nu-utils = { path = "../nu-utils", version = "0.98.1" }
+nu-engine = { path = "../nu-engine", version = "0.99.0" }
+nu-parser = { path = "../nu-parser", version = "0.99.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
+nu-utils = { path = "../nu-utils", version = "0.99.0" }
 
 itertools = { workspace = true }
 shadow-rs = { version = "0.35", default-features = false }
@@ -31,4 +31,4 @@ mimalloc = []
 trash-support = []
 sqlite = []
 static-link-openssl = []
-system-clipboard = []
+system-clipboard = []
\ No newline at end of file
diff --git a/crates/nu-cmd-plugin/Cargo.toml b/crates/nu-cmd-plugin/Cargo.toml
index d91e4284ff..60f8abe046 100644
--- a/crates/nu-cmd-plugin/Cargo.toml
+++ b/crates/nu-cmd-plugin/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-plugin"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-plugin"
-version = "0.98.1"
+version = "0.99.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,11 +13,11 @@ version = "0.98.1"
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.98.1" }
-nu-path = { path = "../nu-path", version = "0.98.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.1", features = ["plugin"] }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.98.1" }
+nu-engine = { path = "../nu-engine", version = "0.99.0" }
+nu-path = { path = "../nu-path", version = "0.99.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.0", features = ["plugin"] }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.99.0" }
 
 itertools = { workspace = true }
 
-[dev-dependencies]
+[dev-dependencies]
\ No newline at end of file
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index 80e1f82d81..d0dc953da6 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-color-confi
 edition = "2021"
 license = "MIT"
 name = "nu-color-config"
-version = "0.98.1"
+version = "0.99.0"
 
 [lib]
 bench = false
@@ -14,12 +14,12 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
-nu-engine = { path = "../nu-engine", version = "0.98.1" }
-nu-json = { path = "../nu-json", version = "0.98.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
+nu-engine = { path = "../nu-engine", version = "0.99.0" }
+nu-json = { path = "../nu-json", version = "0.99.0" }
 nu-ansi-term = { workspace = true }
 
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.98.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.99.0" }
\ No newline at end of file
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index b18ecb04fe..77f12594bd 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-command"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
-version = "0.98.1"
+version = "0.99.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,21 +16,21 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.98.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.98.1" }
-nu-engine = { path = "../nu-engine", version = "0.98.1" }
-nu-glob = { path = "../nu-glob", version = "0.98.1" }
-nu-json = { path = "../nu-json", version = "0.98.1" }
-nu-parser = { path = "../nu-parser", version = "0.98.1" }
-nu-path = { path = "../nu-path", version = "0.98.1" }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.98.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
-nu-system = { path = "../nu-system", version = "0.98.1" }
-nu-table = { path = "../nu-table", version = "0.98.1" }
-nu-term-grid = { path = "../nu-term-grid", version = "0.98.1" }
-nu-utils = { path = "../nu-utils", version = "0.98.1" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.99.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.99.0" }
+nu-engine = { path = "../nu-engine", version = "0.99.0" }
+nu-glob = { path = "../nu-glob", version = "0.99.0" }
+nu-json = { path = "../nu-json", version = "0.99.0" }
+nu-parser = { path = "../nu-parser", version = "0.99.0" }
+nu-path = { path = "../nu-path", version = "0.99.0" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.99.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
+nu-system = { path = "../nu-system", version = "0.99.0" }
+nu-table = { path = "../nu-table", version = "0.99.0" }
+nu-term-grid = { path = "../nu-term-grid", version = "0.99.0" }
+nu-utils = { path = "../nu-utils", version = "0.99.0" }
 nu-ansi-term = { workspace = true }
-nuon = { path = "../nuon", version = "0.98.1" }
+nuon = { path = "../nuon", version = "0.99.0" }
 
 alphanumeric-sort = { workspace = true }
 base64 = { workspace = true }
@@ -139,8 +139,8 @@ sqlite = ["rusqlite"]
 trash-support = ["trash"]
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.98.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.99.0" }
 
 dirs = { workspace = true }
 mockito = { workspace = true, default-features = false }
@@ -149,4 +149,4 @@ quickcheck_macros = { workspace = true }
 rstest = { workspace = true, default-features = false }
 pretty_assertions = { workspace = true }
 tempfile = { workspace = true }
-rand_chacha = { workspace = true }
+rand_chacha = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-derive-value/Cargo.toml b/crates/nu-derive-value/Cargo.toml
index 5d8e421ae0..4909c69da8 100644
--- a/crates/nu-derive-value/Cargo.toml
+++ b/crates/nu-derive-value/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-derive-value"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-derive-value"
-version = "0.98.1"
+version = "0.99.0"
 
 [lib]
 proc-macro = true
@@ -21,4 +21,4 @@ proc-macro2 = { workspace = true }
 syn = { workspace = true }
 quote = { workspace = true }
 proc-macro-error = { workspace = true }
-heck = { workspace = true }
+heck = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index dadf71ed43..7d0487dbab 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-engine"
 edition = "2021"
 license = "MIT"
 name = "nu-engine"
-version = "0.98.1"
+version = "0.99.0"
 
 [lib]
 bench = false
@@ -14,12 +14,12 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.98.1" }
-nu-path = { path = "../nu-path", version = "0.98.1" }
-nu-glob = { path = "../nu-glob", version = "0.98.1" }
-nu-utils = { path = "../nu-utils", version = "0.98.1" }
+nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.99.0" }
+nu-path = { path = "../nu-path", version = "0.99.0" }
+nu-glob = { path = "../nu-glob", version = "0.99.0" }
+nu-utils = { path = "../nu-utils", version = "0.99.0" }
 log = { workspace = true }
 terminal_size = { workspace = true }
 
 [features]
-plugin = []
+plugin = []
\ No newline at end of file
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index fe9caf2aa1..a0a34ca09b 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-explore"
 edition = "2021"
 license = "MIT"
 name = "nu-explore"
-version = "0.98.1"
+version = "0.99.0"
 
 [lib]
 bench = false
@@ -14,16 +14,16 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
-nu-parser = { path = "../nu-parser", version = "0.98.1" }
-nu-path = { path = "../nu-path", version = "0.98.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.98.1" }
-nu-engine = { path = "../nu-engine", version = "0.98.1" }
-nu-table = { path = "../nu-table", version = "0.98.1" }
-nu-json = { path = "../nu-json", version = "0.98.1" }
-nu-utils = { path = "../nu-utils", version = "0.98.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
+nu-parser = { path = "../nu-parser", version = "0.99.0" }
+nu-path = { path = "../nu-path", version = "0.99.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.99.0" }
+nu-engine = { path = "../nu-engine", version = "0.99.0" }
+nu-table = { path = "../nu-table", version = "0.99.0" }
+nu-json = { path = "../nu-json", version = "0.99.0" }
+nu-utils = { path = "../nu-utils", version = "0.99.0" }
 nu-ansi-term = { workspace = true }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.98.1" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.99.0" }
 
 anyhow = { workspace = true }
 log = { workspace = true }
@@ -36,4 +36,4 @@ ansi-str = { workspace = true }
 unicode-width = { workspace = true }
 lscolors = { workspace = true, default-features = false, features = [
   "nu-ansi-term",
-] }
+] }
\ No newline at end of file
diff --git a/crates/nu-glob/Cargo.toml b/crates/nu-glob/Cargo.toml
index fe268f8152..212c403046 100644
--- a/crates/nu-glob/Cargo.toml
+++ b/crates/nu-glob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-glob"
-version = "0.98.1"
+version = "0.99.0"
 authors = ["The Nushell Project Developers", "The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 description = """
@@ -17,4 +17,4 @@ bench = false
 doc-comment = "0.3"
 
 [lints]
-workspace = true
+workspace = true
\ No newline at end of file
diff --git a/crates/nu-json/Cargo.toml b/crates/nu-json/Cargo.toml
index bf4bdc101d..6ae1893cea 100644
--- a/crates/nu-json/Cargo.toml
+++ b/crates/nu-json/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-json"
 edition = "2021"
 license = "MIT"
 name = "nu-json"
-version = "0.98.1"
+version = "0.99.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -26,10 +26,10 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.98.1" }
-nu-path = { path = "../nu-path", version = "0.98.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.99.0" }
+nu-path = { path = "../nu-path", version = "0.99.0" }
 serde_json = "1.0"
 fancy-regex = "0.13.0"
 
 [lints]
-workspace = true
+workspace = true
\ No newline at end of file
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index e485b5590c..a257f01d21 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -3,14 +3,14 @@ authors = ["The Nushell Project Developers"]
 description = "Nushell's integrated LSP server"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-lsp"
 name = "nu-lsp"
-version = "0.98.1"
+version = "0.99.0"
 edition = "2021"
 license = "MIT"
 
 [dependencies]
-nu-cli = { path = "../nu-cli", version = "0.98.1" }
-nu-parser = { path = "../nu-parser", version = "0.98.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
+nu-cli = { path = "../nu-cli", version = "0.99.0" }
+nu-parser = { path = "../nu-parser", version = "0.99.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
 
 reedline = { workspace = true }
 
@@ -23,11 +23,11 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.1" }
-nu-command = { path = "../nu-command", version = "0.98.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.98.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.0" }
+nu-command = { path = "../nu-command", version = "0.99.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.99.0" }
 
 assert-json-diff = "2.0"
 
 [lints]
-workspace = true
+workspace = true
\ No newline at end of file
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index d9386921e4..516fe1e417 100644
--- a/crates/nu-parser/Cargo.toml
+++ b/crates/nu-parser/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-parser"
 edition = "2021"
 license = "MIT"
 name = "nu-parser"
-version = "0.98.1"
+version = "0.99.0"
 exclude = ["/fuzz"]
 
 [lib]
@@ -15,10 +15,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.98.1" }
-nu-path = { path = "../nu-path", version = "0.98.1" }
-nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.98.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
+nu-engine = { path = "../nu-engine", version = "0.99.0" }
+nu-path = { path = "../nu-path", version = "0.99.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.99.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
 
 bytesize = { workspace = true }
 chrono = { default-features = false, features = ['std'], workspace = true }
@@ -30,4 +30,4 @@ serde_json = { workspace = true }
 rstest = { workspace = true, default-features = false }
 
 [features]
-plugin = ["nu-plugin-engine"]
+plugin = ["nu-plugin-engine"]
\ No newline at end of file
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index 4c844a8150..6ab41d299e 100644
--- a/crates/nu-path/Cargo.toml
+++ b/crates/nu-path/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-path"
 edition = "2021"
 license = "MIT"
 name = "nu-path"
-version = "0.98.1"
+version = "0.99.0"
 exclude = ["/fuzz"]
 
 [lib]
@@ -21,4 +21,4 @@ omnipath = { workspace = true }
 pwd = { workspace = true }
 
 [lints]
-workspace = true
+workspace = true
\ No newline at end of file
diff --git a/crates/nu-plugin-core/Cargo.toml b/crates/nu-plugin-core/Cargo.toml
index d1815ba7cb..1c55aaf722 100644
--- a/crates/nu-plugin-core/Cargo.toml
+++ b/crates/nu-plugin-core/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-core
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-core"
-version = "0.98.1"
+version = "0.99.0"
 
 [lib]
 bench = false
@@ -14,8 +14,8 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.98.1", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.99.0", default-features = false }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true }
@@ -28,4 +28,4 @@ default = ["local-socket"]
 local-socket = ["interprocess", "nu-plugin-protocol/local-socket"]
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows = { workspace = true }
+windows = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-plugin-engine/Cargo.toml b/crates/nu-plugin-engine/Cargo.toml
index 1c3fa52beb..bdbc03b815 100644
--- a/crates/nu-plugin-engine/Cargo.toml
+++ b/crates/nu-plugin-engine/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-engi
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-engine"
-version = "0.98.1"
+version = "0.99.0"
 
 [lib]
 bench = false
@@ -14,12 +14,12 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.98.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
-nu-system = { path = "../nu-system", version = "0.98.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.98.1" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.98.1", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.98.1" }
+nu-engine = { path = "../nu-engine", version = "0.99.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
+nu-system = { path = "../nu-system", version = "0.99.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.99.0" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.99.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.99.0" }
 
 serde = { workspace = true }
 log = { workspace = true }
@@ -35,4 +35,4 @@ local-socket = ["nu-plugin-core/local-socket"]
 windows = { workspace = true, features = [
   # For setting process creation flags
   "Win32_System_Threading",
-] }
+] }
\ No newline at end of file
diff --git a/crates/nu-plugin-protocol/Cargo.toml b/crates/nu-plugin-protocol/Cargo.toml
index 3c6befc763..2421657bdb 100644
--- a/crates/nu-plugin-protocol/Cargo.toml
+++ b/crates/nu-plugin-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-prot
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-protocol"
-version = "0.98.1"
+version = "0.99.0"
 
 [lib]
 bench = false
@@ -14,8 +14,8 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.98.1", features = ["plugin"] }
-nu-utils = { path = "../nu-utils", version = "0.98.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.0", features = ["plugin"] }
+nu-utils = { path = "../nu-utils", version = "0.99.0" }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
@@ -24,4 +24,4 @@ typetag = "0.2"
 
 [features]
 default = ["local-socket"]
-local-socket = []
+local-socket = []
\ No newline at end of file
diff --git a/crates/nu-plugin-test-support/Cargo.toml b/crates/nu-plugin-test-support/Cargo.toml
index 53d309eb66..052d5aba2a 100644
--- a/crates/nu-plugin-test-support/Cargo.toml
+++ b/crates/nu-plugin-test-support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-plugin-test-support"
-version = "0.98.1"
+version = "0.99.0"
 edition = "2021"
 license = "MIT"
 description = "Testing support for Nushell plugins"
@@ -15,17 +15,17 @@ workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.98.1", features = ["plugin"] }
-nu-protocol = { path = "../nu-protocol", version = "0.98.1", features = ["plugin"] }
-nu-parser = { path = "../nu-parser", version = "0.98.1", features = ["plugin"] }
-nu-plugin = { path = "../nu-plugin", version = "0.98.1" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.98.1" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.98.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.98.1" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.1" }
+nu-engine = { path = "../nu-engine", version = "0.99.0", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.99.0", features = ["plugin"] }
+nu-parser = { path = "../nu-parser", version = "0.99.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.99.0" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.99.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.99.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.99.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.0" }
 nu-ansi-term = { workspace = true }
 similar = "2.6"
 
 [dev-dependencies]
 typetag = "0.2"
-serde = "1.0"
+serde = "1.0"
\ No newline at end of file
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index 258c0af220..1deda76b04 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin"
 edition = "2021"
 license = "MIT"
 name = "nu-plugin"
-version = "0.98.1"
+version = "0.99.0"
 
 [lib]
 bench = false
@@ -14,11 +14,11 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.98.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.98.1" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.98.1", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.98.1" }
+nu-engine = { path = "../nu-engine", version = "0.99.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.99.0" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.99.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.99.0" }
 
 log = { workspace = true }
 thiserror = "1.0"
@@ -33,4 +33,4 @@ local-socket = ["nu-plugin-core/local-socket"]
 
 [target.'cfg(target_family = "unix")'.dependencies]
 # For setting the process group ID (EnterForeground / LeaveForeground)
-nix = { workspace = true, default-features = false, features = ["process"] }
+nix = { workspace = true, default-features = false, features = ["process"] }
\ No newline at end of file
diff --git a/crates/nu-pretty-hex/Cargo.toml b/crates/nu-pretty-hex/Cargo.toml
index 3be55f0cdb..a464d70713 100644
--- a/crates/nu-pretty-hex/Cargo.toml
+++ b/crates/nu-pretty-hex/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-pretty-hex"
 edition = "2021"
 license = "MIT"
 name = "nu-pretty-hex"
-version = "0.98.1"
+version = "0.99.0"
 
 [lib]
 doctest = false
@@ -21,4 +21,4 @@ nu-ansi-term = { workspace = true }
 
 [dev-dependencies]
 heapless = { version = "0.8", default-features = false }
-rand = "0.8"
+rand = "0.8"
\ No newline at end of file
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index b8dcbe4607..46b76e0796 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-protocol"
 edition = "2021"
 license = "MIT"
 name = "nu-protocol"
-version = "0.98.1"
+version = "0.99.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,10 +16,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.98.1" }
-nu-path = { path = "../nu-path", version = "0.98.1" }
-nu-system = { path = "../nu-system", version = "0.98.1" }
-nu-derive-value = { path = "../nu-derive-value", version = "0.98.1" }
+nu-utils = { path = "../nu-utils", version = "0.99.0" }
+nu-path = { path = "../nu-path", version = "0.99.0" }
+nu-system = { path = "../nu-system", version = "0.99.0" }
+nu-derive-value = { path = "../nu-derive-value", version = "0.99.0" }
 
 brotli = { workspace = true, optional = true }
 bytes = { workspace = true }
@@ -57,11 +57,11 @@ plugin = [
 serde_json = { workspace = true }
 strum = "0.26"
 strum_macros = "0.26"
-nu-test-support = { path = "../nu-test-support", version = "0.98.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.99.0" }
 pretty_assertions = { workspace = true }
 rstest = { workspace = true }
 tempfile = { workspace = true }
 os_pipe = { workspace = true }
 
 [package.metadata.docs.rs]
-all-features = true
+all-features = true
\ No newline at end of file
diff --git a/crates/nu-std/Cargo.toml b/crates/nu-std/Cargo.toml
index 838506e605..a313827f31 100644
--- a/crates/nu-std/Cargo.toml
+++ b/crates/nu-std/Cargo.toml
@@ -5,15 +5,15 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-std"
 edition = "2021"
 license = "MIT"
 name = "nu-std"
-version = "0.98.1"
+version = "0.99.0"
 
 [dependencies]
-nu-parser = { version = "0.98.1", path = "../nu-parser" }
-nu-protocol = { version = "0.98.1", path = "../nu-protocol" }
-nu-engine = { version = "0.98.1", path = "../nu-engine" }
+nu-parser = { version = "0.99.0", path = "../nu-parser" }
+nu-protocol = { version = "0.99.0", path = "../nu-protocol" }
+nu-engine = { version = "0.99.0", path = "../nu-engine" }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
 
 log = "0.4"
 
 [lints]
-workspace = true
+workspace = true
\ No newline at end of file
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index 25a38d36cf..95eedf4a71 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["The Nushell Project Developers", "procs creators"]
 description = "Nushell system querying"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-system"
 name = "nu-system"
-version = "0.98.1"
+version = "0.99.0"
 edition = "2021"
 license = "MIT"
 
@@ -48,4 +48,4 @@ windows = { workspace = true, features = [
   "Win32_System_SystemInformation",
   "Win32_System_Threading",
   "Win32_UI_Shell",
-]}
+]}
\ No newline at end of file
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index 33554ae795..1de6bc5c75 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-table"
 edition = "2021"
 license = "MIT"
 name = "nu-table"
-version = "0.98.1"
+version = "0.99.0"
 
 [lib]
 bench = false
@@ -14,10 +14,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
-nu-utils = { path = "../nu-utils", version = "0.98.1" }
-nu-engine = { path = "../nu-engine", version = "0.98.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.98.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
+nu-utils = { path = "../nu-utils", version = "0.99.0" }
+nu-engine = { path = "../nu-engine", version = "0.99.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.99.0" }
 nu-ansi-term = { workspace = true }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
@@ -25,4 +25,4 @@ tabled = { workspace = true, features = ["ansi"], default-features = false }
 terminal_size = { workspace = true }
 
 [dev-dependencies]
-# nu-test-support = { path="../nu-test-support", version = "0.98.1"  }
+# nu-test-support = { path="../nu-test-support", version = "0.99.0"  }
\ No newline at end of file
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index 50e1cd19e3..4e5ff6c338 100644
--- a/crates/nu-term-grid/Cargo.toml
+++ b/crates/nu-term-grid/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-term-grid"
 edition = "2021"
 license = "MIT"
 name = "nu-term-grid"
-version = "0.98.1"
+version = "0.99.0"
 
 [lib]
 bench = false
@@ -14,6 +14,6 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.98.1" }
+nu-utils = { path = "../nu-utils", version = "0.99.0" }
 
-unicode-width = { workspace = true }
+unicode-width = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml
index a4ae4564ec..0dfca25ec9 100644
--- a/crates/nu-test-support/Cargo.toml
+++ b/crates/nu-test-support/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-test-suppor
 edition = "2021"
 license = "MIT"
 name = "nu-test-support"
-version = "0.98.1"
+version = "0.99.0"
 
 [lib]
 doctest = false
@@ -15,10 +15,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-path = { path = "../nu-path", version = "0.98.1" }
-nu-glob = { path = "../nu-glob", version = "0.98.1" }
-nu-utils = { path = "../nu-utils", version = "0.98.1" }
+nu-path = { path = "../nu-path", version = "0.99.0" }
+nu-glob = { path = "../nu-glob", version = "0.99.0" }
+nu-utils = { path = "../nu-utils", version = "0.99.0" }
 
 num-format = { workspace = true }
 which = { workspace = true }
-tempfile = { workspace = true }
+tempfile = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index 74239ea7ac..4565fb9daf 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-utils"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-utils"
-version = "0.98.1"
+version = "0.99.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
@@ -32,4 +32,4 @@ crossterm_winapi = "0.9"
 nix = { workspace = true, default-features = false, features = ["user", "fs"] }
 
 [lints]
-workspace = true
+workspace = true
\ No newline at end of file
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index 9ee0c90c2f..35dec65d9c 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -1,6 +1,6 @@
 # Nushell Config File
 #
-# version = "0.98.1"
+# version = "0.99.0"
 
 # For more information on defining custom themes, see
 # https://www.nushell.sh/book/coloring_and_theming.html
@@ -895,4 +895,4 @@ $env.config = {
             event: { edit: selectall }
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/crates/nu-utils/src/sample_config/default_env.nu b/crates/nu-utils/src/sample_config/default_env.nu
index 13191681e1..8c5282e9e6 100644
--- a/crates/nu-utils/src/sample_config/default_env.nu
+++ b/crates/nu-utils/src/sample_config/default_env.nu
@@ -1,6 +1,6 @@
 # Nushell Environment Config File
 #
-# version = "0.98.1"
+# version = "0.99.0"
 
 def create_left_prompt [] {
     let dir = match (do --ignore-shell-errors { $env.PWD | path relative-to $nu.home-path }) {
@@ -98,4 +98,4 @@ $env.NU_PLUGIN_DIRS = [
 # $env.PATH = ($env.PATH | uniq)
 
 # To load from a custom file you can use:
-# source ($nu.default-config-dir | path join 'custom.nu')
+# source ($nu.default-config-dir | path join 'custom.nu')
\ No newline at end of file
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index 491976b4c3..bdb437373f 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -10,10 +10,10 @@ name = "nu_plugin_custom_values"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.98.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.99.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.0", features = ["plugin"] }
 serde = { workspace = true }
 typetag = "0.2"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.98.1" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.99.0" }
\ No newline at end of file
diff --git a/crates/nu_plugin_example/Cargo.toml b/crates/nu_plugin_example/Cargo.toml
index 638d583173..5dcd8a5754 100644
--- a/crates/nu_plugin_example/Cargo.toml
+++ b/crates/nu_plugin_example/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_exam
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_example"
-version = "0.98.1"
+version = "0.99.0"
 
 [[bin]]
 name = "nu_plugin_example"
@@ -15,9 +15,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.98.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.99.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.0", features = ["plugin"] }
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.98.1" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.1" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.99.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.0" }
\ No newline at end of file
diff --git a/crates/nu_plugin_formats/Cargo.toml b/crates/nu_plugin_formats/Cargo.toml
index fbbbaaac50..5b2dd7dad3 100644
--- a/crates/nu_plugin_formats/Cargo.toml
+++ b/crates/nu_plugin_formats/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_form
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_formats"
-version = "0.98.1"
+version = "0.99.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.98.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.99.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.0", features = ["plugin"] }
 
 indexmap = { workspace = true }
 eml-parser = "0.1"
@@ -20,4 +20,4 @@ plist = "1.7"
 chrono = "0.4"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.98.1" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.99.0" }
\ No newline at end of file
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index 9f84d2661b..c0fbbadbff 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gsta
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_gstat"
-version = "0.98.1"
+version = "0.99.0"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_gstat"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.98.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.99.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
 
-git2 = "0.19"
+git2 = "0.19"
\ No newline at end of file
diff --git a/crates/nu_plugin_inc/Cargo.toml b/crates/nu_plugin_inc/Cargo.toml
index 15f385b2e7..9f10815d7d 100644
--- a/crates/nu_plugin_inc/Cargo.toml
+++ b/crates/nu_plugin_inc/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_inc"
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_inc"
-version = "0.98.1"
+version = "0.99.0"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_inc"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.98.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.99.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.0", features = ["plugin"] }
 
-semver = "1.0"
+semver = "1.0"
\ No newline at end of file
diff --git a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
index d277ef5ed8..02a746aa09 100755
--- a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
+++ b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
@@ -6,7 +6,7 @@
 # it also allows us to test the plugin interface with something manually implemented in a scripting
 # language without adding any extra dependencies to our tests.
 
-const NUSHELL_VERSION = "0.98.1"
+const NUSHELL_VERSION = "0.99.0"
 const PLUGIN_VERSION = "0.1.1" # bump if you change commands!
 
 def main [--stdio] {
@@ -264,4 +264,4 @@ def start_plugin [] {
     }) |
     each { from json | handle_input } |
     ignore
-}
+}
\ No newline at end of file
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 5a3efef27e..0dbfe12dd7 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu_plugin_polars"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_polars"
-version = "0.98.1"
+version = "0.99.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -17,10 +17,10 @@ bench = false
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
-nu-plugin = { path = "../nu-plugin", version = "0.98.1" }
-nu-path = { path = "../nu-path", version = "0.98.1" }
-nu-utils = { path = "../nu-utils", version = "0.98.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
+nu-plugin = { path = "../nu-plugin", version = "0.99.0" }
+nu-path = { path = "../nu-path", version = "0.99.0" }
+nu-utils = { path = "../nu-utils", version = "0.99.0" }
 
 # Potential dependencies for extras
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
@@ -83,9 +83,9 @@ optional = false
 version = "0.41"
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.98.1" }
-nu-engine = { path = "../nu-engine", version = "0.98.1" }
-nu-parser = { path = "../nu-parser", version = "0.98.1" }
-nu-command = { path = "../nu-command", version = "0.98.1" }
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.98.1" }
-tempfile.workspace = true
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.0" }
+nu-engine = { path = "../nu-engine", version = "0.99.0" }
+nu-parser = { path = "../nu-parser", version = "0.99.0" }
+nu-command = { path = "../nu-command", version = "0.99.0" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.99.0" }
+tempfile.workspace = true
\ No newline at end of file
diff --git a/crates/nu_plugin_python/nu_plugin_python_example.py b/crates/nu_plugin_python/nu_plugin_python_example.py
index 945d365eec..ee9857ecbe 100755
--- a/crates/nu_plugin_python/nu_plugin_python_example.py
+++ b/crates/nu_plugin_python/nu_plugin_python_example.py
@@ -27,7 +27,7 @@ import sys
 import json
 
 
-NUSHELL_VERSION = "0.98.1"
+NUSHELL_VERSION = "0.99.0"
 PLUGIN_VERSION = "0.1.1"  # bump if you change commands!
 
 
@@ -265,4 +265,4 @@ if __name__ == "__main__":
     if len(sys.argv) == 2 and sys.argv[1] == "--stdio":
         plugin()
     else:
-        print("Run me from inside nushell!")
+        print("Run me from inside nushell!")
\ No newline at end of file
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index 71146ee9bf..c721d76683 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_quer
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_query"
-version = "0.98.1"
+version = "0.99.0"
 
 [lib]
 doctest = false
@@ -16,8 +16,8 @@ name = "nu_plugin_query"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.98.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.99.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
 
 gjson = "0.8"
 scraper = { default-features = false, version = "0.20" }
@@ -25,4 +25,4 @@ sxd-document = "0.3"
 sxd-xpath = "0.4"
 webpage = { version = "2.0.1", features = ["serde"] }
 serde_json.workspace = true
-serde.workspace = true
+serde.workspace = true
\ No newline at end of file
diff --git a/crates/nu_plugin_stress_internals/Cargo.toml b/crates/nu_plugin_stress_internals/Cargo.toml
index ddd4da61e9..319247987e 100644
--- a/crates/nu_plugin_stress_internals/Cargo.toml
+++ b/crates/nu_plugin_stress_internals/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_stre
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_stress_internals"
-version = "0.98.1"
+version = "0.99.0"
 
 [[bin]]
 name = "nu_plugin_stress_internals"
@@ -16,4 +16,4 @@ bench = false
 # assumptions about the serialized format
 serde = { workspace = true }
 serde_json = { workspace = true }
-interprocess = { workspace = true }
+interprocess = { workspace = true }
\ No newline at end of file
diff --git a/crates/nuon/Cargo.toml b/crates/nuon/Cargo.toml
index d6f6307f0a..f78bc6954f 100644
--- a/crates/nuon/Cargo.toml
+++ b/crates/nuon/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nuon"
 edition = "2021"
 license = "MIT"
 name = "nuon"
-version = "0.98.1"
+version = "0.99.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-parser = { path = "../nu-parser", version = "0.98.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.98.1" }
-nu-engine = { path = "../nu-engine", version = "0.98.1" }
+nu-parser = { path = "../nu-parser", version = "0.99.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
+nu-engine = { path = "../nu-engine", version = "0.99.0" }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 
@@ -20,4 +20,4 @@ fancy-regex = { workspace = true }
 chrono = { workspace = true }
 
 [lints]
-workspace = true
+workspace = true
\ No newline at end of file

From 9d25b2f29ab178c7dd514b90fe4575156f6a7b60 Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Wed, 16 Oct 2024 15:45:34 +0800
Subject: [PATCH 0557/1072] Add a workflow to set milestone for a merged PR
 automatically (#14084)

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

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

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

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

Add a workflow to set milestone for a merged PR automatically.

A example action run log looks like:
https://github.com/hustcer/milestone-action/actions/runs/11320750633/job/31478761283


[`hustcer/milestone-action`](https://github.com/hustcer/milestone-action)
is a Github action powered by `nushell`, and still in active
development, so I will use `main` branch for easily to try new changes
---
 .github/workflows/milestone.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 .github/workflows/milestone.yml

diff --git a/.github/workflows/milestone.yml b/.github/workflows/milestone.yml
new file mode 100644
index 0000000000..1897f2f617
--- /dev/null
+++ b/.github/workflows/milestone.yml
@@ -0,0 +1,18 @@
+# Description:
+#   - Update milestone of a merged PR
+
+name: Milestone Action
+on:
+  pull_request_target:
+    types: [closed]
+
+jobs:
+  update-milestone:
+    runs-on: ubuntu-latest
+    name: Milestone Update
+    if: ${{github.event.pull_request.merged == true}}
+    steps:
+      - name: Set Milestone
+        uses: hustcer/milestone-action@main
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 59d6dee3b3d908d44d4fea514625c6bb74afaabd Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Wed, 16 Oct 2024 19:23:37 -0700
Subject: [PATCH 0558/1072] Bump to version `0.99.1` (#14100)

Post-release patch bump.
---
 Cargo.lock                                    | 74 +++++++++----------
 Cargo.toml                                    | 40 +++++-----
 crates/nu-cli/Cargo.toml                      | 24 +++---
 crates/nu-cmd-base/Cargo.toml                 | 10 +--
 crates/nu-cmd-extra/Cargo.toml                | 22 +++---
 crates/nu-cmd-lang/Cargo.toml                 | 10 +--
 crates/nu-cmd-plugin/Cargo.toml               | 10 +--
 crates/nu-color-config/Cargo.toml             | 10 +--
 crates/nu-command/Cargo.toml                  | 34 ++++-----
 crates/nu-derive-value/Cargo.toml             |  2 +-
 crates/nu-engine/Cargo.toml                   | 10 +--
 crates/nu-explore/Cargo.toml                  | 20 ++---
 crates/nu-glob/Cargo.toml                     |  2 +-
 crates/nu-json/Cargo.toml                     |  6 +-
 crates/nu-lsp/Cargo.toml                      | 14 ++--
 crates/nu-parser/Cargo.toml                   | 10 +--
 crates/nu-path/Cargo.toml                     |  2 +-
 crates/nu-plugin-core/Cargo.toml              |  6 +-
 crates/nu-plugin-engine/Cargo.toml            | 14 ++--
 crates/nu-plugin-protocol/Cargo.toml          |  6 +-
 crates/nu-plugin-test-support/Cargo.toml      | 18 ++---
 crates/nu-plugin/Cargo.toml                   | 12 +--
 crates/nu-pretty-hex/Cargo.toml               |  2 +-
 crates/nu-protocol/Cargo.toml                 | 12 +--
 crates/nu-std/Cargo.toml                      |  8 +-
 crates/nu-system/Cargo.toml                   |  2 +-
 crates/nu-table/Cargo.toml                    | 12 +--
 crates/nu-term-grid/Cargo.toml                |  4 +-
 crates/nu-test-support/Cargo.toml             |  8 +-
 crates/nu-utils/Cargo.toml                    |  2 +-
 .../src/sample_config/default_config.nu       |  2 +-
 .../nu-utils/src/sample_config/default_env.nu |  2 +-
 crates/nu_plugin_custom_values/Cargo.toml     |  6 +-
 crates/nu_plugin_example/Cargo.toml           | 10 +--
 crates/nu_plugin_formats/Cargo.toml           |  8 +-
 crates/nu_plugin_gstat/Cargo.toml             |  6 +-
 crates/nu_plugin_inc/Cargo.toml               |  6 +-
 .../nu_plugin_nu_example.nu                   |  2 +-
 crates/nu_plugin_polars/Cargo.toml            | 20 ++---
 .../nu_plugin_python_example.py               |  2 +-
 crates/nu_plugin_query/Cargo.toml             |  6 +-
 crates/nu_plugin_stress_internals/Cargo.toml  |  2 +-
 crates/nuon/Cargo.toml                        |  8 +-
 43 files changed, 243 insertions(+), 243 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 038c8e9804..d6f1e35bd1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2944,7 +2944,7 @@ dependencies = [
 
 [[package]]
 name = "nu"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "assert_cmd",
  "crossterm 0.28.1",
@@ -2999,7 +2999,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cli"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "chrono",
  "crossterm 0.28.1",
@@ -3034,7 +3034,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-base"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "indexmap",
  "miette",
@@ -3046,7 +3046,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-extra"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "fancy-regex",
  "heck",
@@ -3071,7 +3071,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-lang"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "itertools 0.13.0",
  "nu-engine",
@@ -3083,7 +3083,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-plugin"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "itertools 0.13.0",
  "nu-engine",
@@ -3094,7 +3094,7 @@ dependencies = [
 
 [[package]]
 name = "nu-color-config"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "nu-ansi-term",
  "nu-engine",
@@ -3106,7 +3106,7 @@ dependencies = [
 
 [[package]]
 name = "nu-command"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "alphanumeric-sort",
  "base64 0.22.1",
@@ -3216,7 +3216,7 @@ dependencies = [
 
 [[package]]
 name = "nu-derive-value"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -3227,7 +3227,7 @@ dependencies = [
 
 [[package]]
 name = "nu-engine"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "log",
  "nu-glob",
@@ -3239,7 +3239,7 @@ dependencies = [
 
 [[package]]
 name = "nu-explore"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "ansi-str",
  "anyhow",
@@ -3265,14 +3265,14 @@ dependencies = [
 
 [[package]]
 name = "nu-glob"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "doc-comment",
 ]
 
 [[package]]
 name = "nu-json"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "fancy-regex",
  "linked-hash-map",
@@ -3285,7 +3285,7 @@ dependencies = [
 
 [[package]]
 name = "nu-lsp"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "assert-json-diff",
  "crossbeam-channel",
@@ -3306,7 +3306,7 @@ dependencies = [
 
 [[package]]
 name = "nu-parser"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "bytesize",
  "chrono",
@@ -3322,7 +3322,7 @@ dependencies = [
 
 [[package]]
 name = "nu-path"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "dirs",
  "omnipath",
@@ -3331,7 +3331,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "log",
  "nix 0.29.0",
@@ -3347,7 +3347,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-core"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "interprocess",
  "log",
@@ -3361,7 +3361,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-engine"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "log",
  "nu-engine",
@@ -3377,7 +3377,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-protocol"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "nu-protocol",
  "nu-utils",
@@ -3389,7 +3389,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-test-support"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "nu-ansi-term",
  "nu-cmd-lang",
@@ -3407,7 +3407,7 @@ dependencies = [
 
 [[package]]
 name = "nu-pretty-hex"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "heapless",
  "nu-ansi-term",
@@ -3416,7 +3416,7 @@ dependencies = [
 
 [[package]]
 name = "nu-protocol"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "brotli",
  "byte-unit",
@@ -3454,7 +3454,7 @@ dependencies = [
 
 [[package]]
 name = "nu-std"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "log",
  "miette",
@@ -3465,7 +3465,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "chrono",
  "itertools 0.13.0",
@@ -3483,7 +3483,7 @@ dependencies = [
 
 [[package]]
 name = "nu-table"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "fancy-regex",
  "nu-ansi-term",
@@ -3498,7 +3498,7 @@ dependencies = [
 
 [[package]]
 name = "nu-term-grid"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "nu-utils",
  "unicode-width",
@@ -3506,7 +3506,7 @@ dependencies = [
 
 [[package]]
 name = "nu-test-support"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -3518,7 +3518,7 @@ dependencies = [
 
 [[package]]
 name = "nu-utils"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "crossterm_winapi",
  "log",
@@ -3544,7 +3544,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_example"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "nu-cmd-lang",
  "nu-plugin",
@@ -3554,7 +3554,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_formats"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "chrono",
  "eml-parser",
@@ -3569,7 +3569,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_gstat"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "git2",
  "nu-plugin",
@@ -3578,7 +3578,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_inc"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -3587,7 +3587,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_polars"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "chrono",
  "chrono-tz 0.9.0",
@@ -3622,7 +3622,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_query"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "gjson",
  "nu-plugin",
@@ -3637,7 +3637,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_stress_internals"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "interprocess",
  "serde",
@@ -3751,7 +3751,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "nuon"
-version = "0.99.0"
+version = "0.99.1"
 dependencies = [
  "chrono",
  "fancy-regex",
diff --git a/Cargo.toml b/Cargo.toml
index 50ec615502..2dabcfd7bf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
 rust-version = "1.79.0"
-version = "0.99.0"
+version = "0.99.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -189,22 +189,22 @@ unchecked_duration_subtraction = "warn"
 workspace = true
 
 [dependencies]
-nu-cli = { path = "./crates/nu-cli", version = "0.99.0" }
-nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.99.0" }
-nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.99.0" }
-nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.99.0", optional = true }
-nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.99.0" }
-nu-command = { path = "./crates/nu-command", version = "0.99.0" }
-nu-engine = { path = "./crates/nu-engine", version = "0.99.0" }
-nu-explore = { path = "./crates/nu-explore", version = "0.99.0" }
-nu-lsp = { path = "./crates/nu-lsp/", version = "0.99.0" }
-nu-parser = { path = "./crates/nu-parser", version = "0.99.0" }
-nu-path = { path = "./crates/nu-path", version = "0.99.0" }
-nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.99.0" }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.99.0" }
-nu-std = { path = "./crates/nu-std", version = "0.99.0" }
-nu-system = { path = "./crates/nu-system", version = "0.99.0" }
-nu-utils = { path = "./crates/nu-utils", version = "0.99.0" }
+nu-cli = { path = "./crates/nu-cli", version = "0.99.1" }
+nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.99.1" }
+nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.99.1" }
+nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.99.1", optional = true }
+nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.99.1" }
+nu-command = { path = "./crates/nu-command", version = "0.99.1" }
+nu-engine = { path = "./crates/nu-engine", version = "0.99.1" }
+nu-explore = { path = "./crates/nu-explore", version = "0.99.1" }
+nu-lsp = { path = "./crates/nu-lsp/", version = "0.99.1" }
+nu-parser = { path = "./crates/nu-parser", version = "0.99.1" }
+nu-path = { path = "./crates/nu-path", version = "0.99.1" }
+nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.99.1" }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.99.1" }
+nu-std = { path = "./crates/nu-std", version = "0.99.1" }
+nu-system = { path = "./crates/nu-system", version = "0.99.1" }
+nu-utils = { path = "./crates/nu-utils", version = "0.99.1" }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
 crossterm = { workspace = true }
@@ -234,9 +234,9 @@ nix = { workspace = true, default-features = false, features = [
 ] }
 
 [dev-dependencies]
-nu-test-support = { path = "./crates/nu-test-support", version = "0.99.0" }
-nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.99.0" }
-nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.99.0" }
+nu-test-support = { path = "./crates/nu-test-support", version = "0.99.1" }
+nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.99.1" }
+nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.99.1" }
 assert_cmd = "2.0"
 dirs = { workspace = true }
 tango-bench = "0.6"
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index f59fbb8edf..1e9b9ef3f8 100644
--- 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.99.0"
+version = "0.99.1"
 
 [lib]
 bench = false
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.0" }
-nu-command = { path = "../nu-command", version = "0.99.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.99.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.1" }
+nu-command = { path = "../nu-command", version = "0.99.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.99.1" }
 rstest = { workspace = true, default-features = false }
 tempfile = { workspace = true }
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.99.0" }
-nu-engine = { path = "../nu-engine", version = "0.99.0" }
-nu-path = { path = "../nu-path", version = "0.99.0" }
-nu-parser = { path = "../nu-parser", version = "0.99.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.99.0", optional = true }
-nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
-nu-utils = { path = "../nu-utils", version = "0.99.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.99.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.99.1" }
+nu-engine = { path = "../nu-engine", version = "0.99.1" }
+nu-path = { path = "../nu-path", version = "0.99.1" }
+nu-parser = { path = "../nu-parser", version = "0.99.1" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.99.1", optional = true }
+nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
+nu-utils = { path = "../nu-utils", version = "0.99.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.99.1" }
 nu-ansi-term = { workspace = true }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
diff --git a/crates/nu-cmd-base/Cargo.toml b/crates/nu-cmd-base/Cargo.toml
index a50a7d29f2..f3e1e3a328 100644
--- a/crates/nu-cmd-base/Cargo.toml
+++ b/crates/nu-cmd-base/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-base"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-base"
-version = "0.99.0"
+version = "0.99.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,10 +13,10 @@ version = "0.99.0"
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.99.0" }
-nu-parser = { path = "../nu-parser", version = "0.99.0" }
-nu-path = { path = "../nu-path", version = "0.99.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
+nu-engine = { path = "../nu-engine", version = "0.99.1" }
+nu-parser = { path = "../nu-parser", version = "0.99.1" }
+nu-path = { path = "../nu-path", version = "0.99.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
 
 indexmap = { workspace = true }
 miette = { workspace = true }
diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml
index 7a21b2382b..cc809bbbae 100644
--- 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.99.0"
+version = "0.99.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,13 +16,13 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.99.0" }
-nu-engine = { path = "../nu-engine", version = "0.99.0" }
-nu-json = { version = "0.99.0", path = "../nu-json" }
-nu-parser = { path = "../nu-parser", version = "0.99.0" }
-nu-pretty-hex = { version = "0.99.0", path = "../nu-pretty-hex" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
-nu-utils = { path = "../nu-utils", version = "0.99.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.99.1" }
+nu-engine = { path = "../nu-engine", version = "0.99.1" }
+nu-json = { version = "0.99.1", path = "../nu-json" }
+nu-parser = { path = "../nu-parser", version = "0.99.1" }
+nu-pretty-hex = { version = "0.99.1", path = "../nu-pretty-hex" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
+nu-utils = { path = "../nu-utils", version = "0.99.1" }
 
 # Potential dependencies for extras
 heck = { workspace = true }
@@ -36,6 +36,6 @@ v_htmlescape = { workspace = true }
 itertools = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.0" }
-nu-command = { path = "../nu-command", version = "0.99.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.99.0" }
\ No newline at end of file
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.1" }
+nu-command = { path = "../nu-command", version = "0.99.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.99.1" }
\ No newline at end of file
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index 85ba6e8416..e743d30a13 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -6,7 +6,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-lang"
 edition = "2021"
 license = "MIT"
 name = "nu-cmd-lang"
-version = "0.99.0"
+version = "0.99.1"
 
 [lib]
 bench = false
@@ -15,10 +15,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.99.0" }
-nu-parser = { path = "../nu-parser", version = "0.99.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
-nu-utils = { path = "../nu-utils", version = "0.99.0" }
+nu-engine = { path = "../nu-engine", version = "0.99.1" }
+nu-parser = { path = "../nu-parser", version = "0.99.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
+nu-utils = { path = "../nu-utils", version = "0.99.1" }
 
 itertools = { workspace = true }
 shadow-rs = { version = "0.35", default-features = false }
diff --git a/crates/nu-cmd-plugin/Cargo.toml b/crates/nu-cmd-plugin/Cargo.toml
index 60f8abe046..1f1aa26707 100644
--- a/crates/nu-cmd-plugin/Cargo.toml
+++ b/crates/nu-cmd-plugin/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-plugin"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-plugin"
-version = "0.99.0"
+version = "0.99.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,10 +13,10 @@ version = "0.99.0"
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.99.0" }
-nu-path = { path = "../nu-path", version = "0.99.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.0", features = ["plugin"] }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.99.0" }
+nu-engine = { path = "../nu-engine", version = "0.99.1" }
+nu-path = { path = "../nu-path", version = "0.99.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.1", features = ["plugin"] }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.99.1" }
 
 itertools = { workspace = true }
 
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index d0dc953da6..6a2f94711b 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-color-confi
 edition = "2021"
 license = "MIT"
 name = "nu-color-config"
-version = "0.99.0"
+version = "0.99.1"
 
 [lib]
 bench = false
@@ -14,12 +14,12 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
-nu-engine = { path = "../nu-engine", version = "0.99.0" }
-nu-json = { path = "../nu-json", version = "0.99.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
+nu-engine = { path = "../nu-engine", version = "0.99.1" }
+nu-json = { path = "../nu-json", version = "0.99.1" }
 nu-ansi-term = { workspace = true }
 
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.99.0" }
\ No newline at end of file
+nu-test-support = { path = "../nu-test-support", version = "0.99.1" }
\ No newline at end of file
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 77f12594bd..e2d3c69bdd 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-command"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
-version = "0.99.0"
+version = "0.99.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,21 +16,21 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.99.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.99.0" }
-nu-engine = { path = "../nu-engine", version = "0.99.0" }
-nu-glob = { path = "../nu-glob", version = "0.99.0" }
-nu-json = { path = "../nu-json", version = "0.99.0" }
-nu-parser = { path = "../nu-parser", version = "0.99.0" }
-nu-path = { path = "../nu-path", version = "0.99.0" }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.99.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
-nu-system = { path = "../nu-system", version = "0.99.0" }
-nu-table = { path = "../nu-table", version = "0.99.0" }
-nu-term-grid = { path = "../nu-term-grid", version = "0.99.0" }
-nu-utils = { path = "../nu-utils", version = "0.99.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.99.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.99.1" }
+nu-engine = { path = "../nu-engine", version = "0.99.1" }
+nu-glob = { path = "../nu-glob", version = "0.99.1" }
+nu-json = { path = "../nu-json", version = "0.99.1" }
+nu-parser = { path = "../nu-parser", version = "0.99.1" }
+nu-path = { path = "../nu-path", version = "0.99.1" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.99.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
+nu-system = { path = "../nu-system", version = "0.99.1" }
+nu-table = { path = "../nu-table", version = "0.99.1" }
+nu-term-grid = { path = "../nu-term-grid", version = "0.99.1" }
+nu-utils = { path = "../nu-utils", version = "0.99.1" }
 nu-ansi-term = { workspace = true }
-nuon = { path = "../nuon", version = "0.99.0" }
+nuon = { path = "../nuon", version = "0.99.1" }
 
 alphanumeric-sort = { workspace = true }
 base64 = { workspace = true }
@@ -139,8 +139,8 @@ sqlite = ["rusqlite"]
 trash-support = ["trash"]
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.99.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.99.1" }
 
 dirs = { workspace = true }
 mockito = { workspace = true, default-features = false }
diff --git a/crates/nu-derive-value/Cargo.toml b/crates/nu-derive-value/Cargo.toml
index 4909c69da8..e84045e803 100644
--- a/crates/nu-derive-value/Cargo.toml
+++ b/crates/nu-derive-value/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-derive-value"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-derive-value"
-version = "0.99.0"
+version = "0.99.1"
 
 [lib]
 proc-macro = true
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index 7d0487dbab..f019c065bb 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-engine"
 edition = "2021"
 license = "MIT"
 name = "nu-engine"
-version = "0.99.0"
+version = "0.99.1"
 
 [lib]
 bench = false
@@ -14,10 +14,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.99.0" }
-nu-path = { path = "../nu-path", version = "0.99.0" }
-nu-glob = { path = "../nu-glob", version = "0.99.0" }
-nu-utils = { path = "../nu-utils", version = "0.99.0" }
+nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.99.1" }
+nu-path = { path = "../nu-path", version = "0.99.1" }
+nu-glob = { path = "../nu-glob", version = "0.99.1" }
+nu-utils = { path = "../nu-utils", version = "0.99.1" }
 log = { workspace = true }
 terminal_size = { workspace = true }
 
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index a0a34ca09b..832601b204 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-explore"
 edition = "2021"
 license = "MIT"
 name = "nu-explore"
-version = "0.99.0"
+version = "0.99.1"
 
 [lib]
 bench = false
@@ -14,16 +14,16 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
-nu-parser = { path = "../nu-parser", version = "0.99.0" }
-nu-path = { path = "../nu-path", version = "0.99.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.99.0" }
-nu-engine = { path = "../nu-engine", version = "0.99.0" }
-nu-table = { path = "../nu-table", version = "0.99.0" }
-nu-json = { path = "../nu-json", version = "0.99.0" }
-nu-utils = { path = "../nu-utils", version = "0.99.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
+nu-parser = { path = "../nu-parser", version = "0.99.1" }
+nu-path = { path = "../nu-path", version = "0.99.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.99.1" }
+nu-engine = { path = "../nu-engine", version = "0.99.1" }
+nu-table = { path = "../nu-table", version = "0.99.1" }
+nu-json = { path = "../nu-json", version = "0.99.1" }
+nu-utils = { path = "../nu-utils", version = "0.99.1" }
 nu-ansi-term = { workspace = true }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.99.0" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.99.1" }
 
 anyhow = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-glob/Cargo.toml b/crates/nu-glob/Cargo.toml
index 212c403046..75d8d9c21c 100644
--- a/crates/nu-glob/Cargo.toml
+++ b/crates/nu-glob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-glob"
-version = "0.99.0"
+version = "0.99.1"
 authors = ["The Nushell Project Developers", "The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 description = """
diff --git a/crates/nu-json/Cargo.toml b/crates/nu-json/Cargo.toml
index 6ae1893cea..22a9663c27 100644
--- a/crates/nu-json/Cargo.toml
+++ b/crates/nu-json/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-json"
 edition = "2021"
 license = "MIT"
 name = "nu-json"
-version = "0.99.0"
+version = "0.99.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -26,8 +26,8 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.99.0" }
-nu-path = { path = "../nu-path", version = "0.99.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.99.1" }
+nu-path = { path = "../nu-path", version = "0.99.1" }
 serde_json = "1.0"
 fancy-regex = "0.13.0"
 
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index a257f01d21..efabb1ec3f 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -3,14 +3,14 @@ authors = ["The Nushell Project Developers"]
 description = "Nushell's integrated LSP server"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-lsp"
 name = "nu-lsp"
-version = "0.99.0"
+version = "0.99.1"
 edition = "2021"
 license = "MIT"
 
 [dependencies]
-nu-cli = { path = "../nu-cli", version = "0.99.0" }
-nu-parser = { path = "../nu-parser", version = "0.99.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
+nu-cli = { path = "../nu-cli", version = "0.99.1" }
+nu-parser = { path = "../nu-parser", version = "0.99.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
 
 reedline = { workspace = true }
 
@@ -23,9 +23,9 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.0" }
-nu-command = { path = "../nu-command", version = "0.99.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.99.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.1" }
+nu-command = { path = "../nu-command", version = "0.99.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.99.1" }
 
 assert-json-diff = "2.0"
 
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index 516fe1e417..b39bd32c4e 100644
--- a/crates/nu-parser/Cargo.toml
+++ b/crates/nu-parser/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-parser"
 edition = "2021"
 license = "MIT"
 name = "nu-parser"
-version = "0.99.0"
+version = "0.99.1"
 exclude = ["/fuzz"]
 
 [lib]
@@ -15,10 +15,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.99.0" }
-nu-path = { path = "../nu-path", version = "0.99.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.99.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
+nu-engine = { path = "../nu-engine", version = "0.99.1" }
+nu-path = { path = "../nu-path", version = "0.99.1" }
+nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.99.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
 
 bytesize = { workspace = true }
 chrono = { default-features = false, features = ['std'], workspace = true }
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index 6ab41d299e..f2cd5c686d 100644
--- a/crates/nu-path/Cargo.toml
+++ b/crates/nu-path/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-path"
 edition = "2021"
 license = "MIT"
 name = "nu-path"
-version = "0.99.0"
+version = "0.99.1"
 exclude = ["/fuzz"]
 
 [lib]
diff --git a/crates/nu-plugin-core/Cargo.toml b/crates/nu-plugin-core/Cargo.toml
index 1c55aaf722..4737fe7f71 100644
--- a/crates/nu-plugin-core/Cargo.toml
+++ b/crates/nu-plugin-core/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-core
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-core"
-version = "0.99.0"
+version = "0.99.1"
 
 [lib]
 bench = false
@@ -14,8 +14,8 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.99.0", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.99.1", default-features = false }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true }
diff --git a/crates/nu-plugin-engine/Cargo.toml b/crates/nu-plugin-engine/Cargo.toml
index bdbc03b815..8ff87c7cf6 100644
--- a/crates/nu-plugin-engine/Cargo.toml
+++ b/crates/nu-plugin-engine/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-engi
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-engine"
-version = "0.99.0"
+version = "0.99.1"
 
 [lib]
 bench = false
@@ -14,12 +14,12 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.99.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
-nu-system = { path = "../nu-system", version = "0.99.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.99.0" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.99.0", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.99.0" }
+nu-engine = { path = "../nu-engine", version = "0.99.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
+nu-system = { path = "../nu-system", version = "0.99.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.99.1" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.99.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.99.1" }
 
 serde = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-plugin-protocol/Cargo.toml b/crates/nu-plugin-protocol/Cargo.toml
index 2421657bdb..357cca0969 100644
--- a/crates/nu-plugin-protocol/Cargo.toml
+++ b/crates/nu-plugin-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-prot
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-protocol"
-version = "0.99.0"
+version = "0.99.1"
 
 [lib]
 bench = false
@@ -14,8 +14,8 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.99.0", features = ["plugin"] }
-nu-utils = { path = "../nu-utils", version = "0.99.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.1", features = ["plugin"] }
+nu-utils = { path = "../nu-utils", version = "0.99.1" }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
diff --git a/crates/nu-plugin-test-support/Cargo.toml b/crates/nu-plugin-test-support/Cargo.toml
index 052d5aba2a..ee662784a7 100644
--- a/crates/nu-plugin-test-support/Cargo.toml
+++ b/crates/nu-plugin-test-support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-plugin-test-support"
-version = "0.99.0"
+version = "0.99.1"
 edition = "2021"
 license = "MIT"
 description = "Testing support for Nushell plugins"
@@ -15,14 +15,14 @@ workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.99.0", features = ["plugin"] }
-nu-protocol = { path = "../nu-protocol", version = "0.99.0", features = ["plugin"] }
-nu-parser = { path = "../nu-parser", version = "0.99.0", features = ["plugin"] }
-nu-plugin = { path = "../nu-plugin", version = "0.99.0" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.99.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.99.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.99.0" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.0" }
+nu-engine = { path = "../nu-engine", version = "0.99.1", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.99.1", features = ["plugin"] }
+nu-parser = { path = "../nu-parser", version = "0.99.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.99.1" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.99.1" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.99.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.99.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.1" }
 nu-ansi-term = { workspace = true }
 similar = "2.6"
 
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index 1deda76b04..f8d2b1a636 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin"
 edition = "2021"
 license = "MIT"
 name = "nu-plugin"
-version = "0.99.0"
+version = "0.99.1"
 
 [lib]
 bench = false
@@ -14,11 +14,11 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.99.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.99.0" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.99.0", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.99.0" }
+nu-engine = { path = "../nu-engine", version = "0.99.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.99.1" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.99.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.99.1" }
 
 log = { workspace = true }
 thiserror = "1.0"
diff --git a/crates/nu-pretty-hex/Cargo.toml b/crates/nu-pretty-hex/Cargo.toml
index a464d70713..59fefefad4 100644
--- a/crates/nu-pretty-hex/Cargo.toml
+++ b/crates/nu-pretty-hex/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-pretty-hex"
 edition = "2021"
 license = "MIT"
 name = "nu-pretty-hex"
-version = "0.99.0"
+version = "0.99.1"
 
 [lib]
 doctest = false
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 46b76e0796..5556ce4755 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-protocol"
 edition = "2021"
 license = "MIT"
 name = "nu-protocol"
-version = "0.99.0"
+version = "0.99.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,10 +16,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.99.0" }
-nu-path = { path = "../nu-path", version = "0.99.0" }
-nu-system = { path = "../nu-system", version = "0.99.0" }
-nu-derive-value = { path = "../nu-derive-value", version = "0.99.0" }
+nu-utils = { path = "../nu-utils", version = "0.99.1" }
+nu-path = { path = "../nu-path", version = "0.99.1" }
+nu-system = { path = "../nu-system", version = "0.99.1" }
+nu-derive-value = { path = "../nu-derive-value", version = "0.99.1" }
 
 brotli = { workspace = true, optional = true }
 bytes = { workspace = true }
@@ -57,7 +57,7 @@ plugin = [
 serde_json = { workspace = true }
 strum = "0.26"
 strum_macros = "0.26"
-nu-test-support = { path = "../nu-test-support", version = "0.99.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.99.1" }
 pretty_assertions = { workspace = true }
 rstest = { workspace = true }
 tempfile = { workspace = true }
diff --git a/crates/nu-std/Cargo.toml b/crates/nu-std/Cargo.toml
index a313827f31..c4acfc22b3 100644
--- a/crates/nu-std/Cargo.toml
+++ b/crates/nu-std/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-std"
 edition = "2021"
 license = "MIT"
 name = "nu-std"
-version = "0.99.0"
+version = "0.99.1"
 
 [dependencies]
-nu-parser = { version = "0.99.0", path = "../nu-parser" }
-nu-protocol = { version = "0.99.0", path = "../nu-protocol" }
-nu-engine = { version = "0.99.0", path = "../nu-engine" }
+nu-parser = { version = "0.99.1", path = "../nu-parser" }
+nu-protocol = { version = "0.99.1", path = "../nu-protocol" }
+nu-engine = { version = "0.99.1", path = "../nu-engine" }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
 
 log = "0.4"
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index 95eedf4a71..e2f054afb2 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["The Nushell Project Developers", "procs creators"]
 description = "Nushell system querying"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-system"
 name = "nu-system"
-version = "0.99.0"
+version = "0.99.1"
 edition = "2021"
 license = "MIT"
 
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index 1de6bc5c75..fd0ff56617 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-table"
 edition = "2021"
 license = "MIT"
 name = "nu-table"
-version = "0.99.0"
+version = "0.99.1"
 
 [lib]
 bench = false
@@ -14,10 +14,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
-nu-utils = { path = "../nu-utils", version = "0.99.0" }
-nu-engine = { path = "../nu-engine", version = "0.99.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.99.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
+nu-utils = { path = "../nu-utils", version = "0.99.1" }
+nu-engine = { path = "../nu-engine", version = "0.99.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.99.1" }
 nu-ansi-term = { workspace = true }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
@@ -25,4 +25,4 @@ tabled = { workspace = true, features = ["ansi"], default-features = false }
 terminal_size = { workspace = true }
 
 [dev-dependencies]
-# nu-test-support = { path="../nu-test-support", version = "0.99.0"  }
\ No newline at end of file
+# nu-test-support = { path="../nu-test-support", version = "0.99.1"  }
\ No newline at end of file
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index 4e5ff6c338..9a139a122e 100644
--- a/crates/nu-term-grid/Cargo.toml
+++ b/crates/nu-term-grid/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-term-grid"
 edition = "2021"
 license = "MIT"
 name = "nu-term-grid"
-version = "0.99.0"
+version = "0.99.1"
 
 [lib]
 bench = false
@@ -14,6 +14,6 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.99.0" }
+nu-utils = { path = "../nu-utils", version = "0.99.1" }
 
 unicode-width = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml
index 0dfca25ec9..a465aa5870 100644
--- a/crates/nu-test-support/Cargo.toml
+++ b/crates/nu-test-support/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-test-suppor
 edition = "2021"
 license = "MIT"
 name = "nu-test-support"
-version = "0.99.0"
+version = "0.99.1"
 
 [lib]
 doctest = false
@@ -15,9 +15,9 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-path = { path = "../nu-path", version = "0.99.0" }
-nu-glob = { path = "../nu-glob", version = "0.99.0" }
-nu-utils = { path = "../nu-utils", version = "0.99.0" }
+nu-path = { path = "../nu-path", version = "0.99.1" }
+nu-glob = { path = "../nu-glob", version = "0.99.1" }
+nu-utils = { path = "../nu-utils", version = "0.99.1" }
 
 num-format = { workspace = true }
 which = { workspace = true }
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index 4565fb9daf..9d71578a4e 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-utils"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-utils"
-version = "0.99.0"
+version = "0.99.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index 35dec65d9c..e9188c46cb 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -1,6 +1,6 @@
 # Nushell Config File
 #
-# version = "0.99.0"
+# version = "0.99.1"
 
 # For more information on defining custom themes, see
 # https://www.nushell.sh/book/coloring_and_theming.html
diff --git a/crates/nu-utils/src/sample_config/default_env.nu b/crates/nu-utils/src/sample_config/default_env.nu
index 8c5282e9e6..0ed67b1787 100644
--- a/crates/nu-utils/src/sample_config/default_env.nu
+++ b/crates/nu-utils/src/sample_config/default_env.nu
@@ -1,6 +1,6 @@
 # Nushell Environment Config File
 #
-# version = "0.99.0"
+# version = "0.99.1"
 
 def create_left_prompt [] {
     let dir = match (do --ignore-shell-errors { $env.PWD | path relative-to $nu.home-path }) {
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index bdb437373f..0b99891116 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -10,10 +10,10 @@ name = "nu_plugin_custom_values"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.99.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.99.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.1", features = ["plugin"] }
 serde = { workspace = true }
 typetag = "0.2"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.99.0" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.99.1" }
\ No newline at end of file
diff --git a/crates/nu_plugin_example/Cargo.toml b/crates/nu_plugin_example/Cargo.toml
index 5dcd8a5754..e177def2cb 100644
--- a/crates/nu_plugin_example/Cargo.toml
+++ b/crates/nu_plugin_example/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_exam
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_example"
-version = "0.99.0"
+version = "0.99.1"
 
 [[bin]]
 name = "nu_plugin_example"
@@ -15,9 +15,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.99.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.99.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.1", features = ["plugin"] }
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.99.0" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.0" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.99.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.1" }
\ No newline at end of file
diff --git a/crates/nu_plugin_formats/Cargo.toml b/crates/nu_plugin_formats/Cargo.toml
index 5b2dd7dad3..cbd54c76e8 100644
--- a/crates/nu_plugin_formats/Cargo.toml
+++ b/crates/nu_plugin_formats/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_form
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_formats"
-version = "0.99.0"
+version = "0.99.1"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.99.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.99.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.1", features = ["plugin"] }
 
 indexmap = { workspace = true }
 eml-parser = "0.1"
@@ -20,4 +20,4 @@ plist = "1.7"
 chrono = "0.4"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.99.0" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.99.1" }
\ No newline at end of file
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index c0fbbadbff..e661982ebe 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gsta
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_gstat"
-version = "0.99.0"
+version = "0.99.1"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_gstat"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.99.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
+nu-plugin = { path = "../nu-plugin", version = "0.99.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
 
 git2 = "0.19"
\ No newline at end of file
diff --git a/crates/nu_plugin_inc/Cargo.toml b/crates/nu_plugin_inc/Cargo.toml
index 9f10815d7d..6dd47fac6d 100644
--- a/crates/nu_plugin_inc/Cargo.toml
+++ b/crates/nu_plugin_inc/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_inc"
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_inc"
-version = "0.99.0"
+version = "0.99.1"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_inc"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.99.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.99.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.1", features = ["plugin"] }
 
 semver = "1.0"
\ No newline at end of file
diff --git a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
index 02a746aa09..6e7307480a 100755
--- a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
+++ b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
@@ -6,7 +6,7 @@
 # it also allows us to test the plugin interface with something manually implemented in a scripting
 # language without adding any extra dependencies to our tests.
 
-const NUSHELL_VERSION = "0.99.0"
+const NUSHELL_VERSION = "0.99.1"
 const PLUGIN_VERSION = "0.1.1" # bump if you change commands!
 
 def main [--stdio] {
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 0dbfe12dd7..abbb9f54f7 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu_plugin_polars"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_polars"
-version = "0.99.0"
+version = "0.99.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -17,10 +17,10 @@ bench = false
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
-nu-plugin = { path = "../nu-plugin", version = "0.99.0" }
-nu-path = { path = "../nu-path", version = "0.99.0" }
-nu-utils = { path = "../nu-utils", version = "0.99.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.99.1" }
+nu-path = { path = "../nu-path", version = "0.99.1" }
+nu-utils = { path = "../nu-utils", version = "0.99.1" }
 
 # Potential dependencies for extras
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
@@ -83,9 +83,9 @@ optional = false
 version = "0.41"
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.0" }
-nu-engine = { path = "../nu-engine", version = "0.99.0" }
-nu-parser = { path = "../nu-parser", version = "0.99.0" }
-nu-command = { path = "../nu-command", version = "0.99.0" }
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.99.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.1" }
+nu-engine = { path = "../nu-engine", version = "0.99.1" }
+nu-parser = { path = "../nu-parser", version = "0.99.1" }
+nu-command = { path = "../nu-command", version = "0.99.1" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.99.1" }
 tempfile.workspace = true
\ No newline at end of file
diff --git a/crates/nu_plugin_python/nu_plugin_python_example.py b/crates/nu_plugin_python/nu_plugin_python_example.py
index ee9857ecbe..206808eca0 100755
--- a/crates/nu_plugin_python/nu_plugin_python_example.py
+++ b/crates/nu_plugin_python/nu_plugin_python_example.py
@@ -27,7 +27,7 @@ import sys
 import json
 
 
-NUSHELL_VERSION = "0.99.0"
+NUSHELL_VERSION = "0.99.1"
 PLUGIN_VERSION = "0.1.1"  # bump if you change commands!
 
 
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index c721d76683..80040e860c 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_quer
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_query"
-version = "0.99.0"
+version = "0.99.1"
 
 [lib]
 doctest = false
@@ -16,8 +16,8 @@ name = "nu_plugin_query"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.99.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
+nu-plugin = { path = "../nu-plugin", version = "0.99.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
 
 gjson = "0.8"
 scraper = { default-features = false, version = "0.20" }
diff --git a/crates/nu_plugin_stress_internals/Cargo.toml b/crates/nu_plugin_stress_internals/Cargo.toml
index 319247987e..d72e39bf2a 100644
--- a/crates/nu_plugin_stress_internals/Cargo.toml
+++ b/crates/nu_plugin_stress_internals/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_stre
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_stress_internals"
-version = "0.99.0"
+version = "0.99.1"
 
 [[bin]]
 name = "nu_plugin_stress_internals"
diff --git a/crates/nuon/Cargo.toml b/crates/nuon/Cargo.toml
index f78bc6954f..075212464d 100644
--- a/crates/nuon/Cargo.toml
+++ b/crates/nuon/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nuon"
 edition = "2021"
 license = "MIT"
 name = "nuon"
-version = "0.99.0"
+version = "0.99.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-parser = { path = "../nu-parser", version = "0.99.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
-nu-engine = { path = "../nu-engine", version = "0.99.0" }
+nu-parser = { path = "../nu-parser", version = "0.99.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
+nu-engine = { path = "../nu-engine", version = "0.99.1" }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 

From c9d54f821b249e0f482df944c94518b8d97e41a6 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Wed, 16 Oct 2024 19:24:14 -0700
Subject: [PATCH 0559/1072] Implemented `polars unnest` (#14104)

# Description
Provides the ability to decomes struct columns into seperate columns for
each field:
<img width="655" alt="Screenshot 2024-10-16 at 09 57 22"
src="https://github.com/user-attachments/assets/6706bd36-8d38-4365-b58d-ba82f2d5ba9a">

# User-Facing Changes
- provides a new command `polars unnest` for decomposing struct fields
into separate columns.
---
 .../src/dataframe/command/data/mod.rs         |   2 +
 .../src/dataframe/command/data/unnest.rs      | 145 ++++++++++++++++++
 2 files changed, 147 insertions(+)
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/data/unnest.rs

diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/mod.rs b/crates/nu_plugin_polars/src/dataframe/command/data/mod.rs
index 058b277526..0857fff1da 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/mod.rs
@@ -32,6 +32,7 @@ mod sort_by_expr;
 pub mod sql_context;
 pub mod sql_expr;
 mod take;
+mod unnest;
 mod unpivot;
 mod with_column;
 use filter::LazyFilter;
@@ -109,5 +110,6 @@ pub(crate) fn data_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin
         Box::new(LazyFilter),
         Box::new(Shift),
         Box::new(Unique),
+        Box::new(unnest::UnnestDF),
     ]
 }
diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/unnest.rs b/crates/nu_plugin_polars/src/dataframe/command/data/unnest.rs
new file mode 100644
index 0000000000..585bb28fc5
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/unnest.rs
@@ -0,0 +1,145 @@
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{
+    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape,
+};
+use polars::df;
+
+use crate::{
+    values::{CustomValueSupport, NuLazyFrame, PolarsPluginObject},
+    PolarsPlugin,
+};
+
+use crate::values::NuDataFrame;
+
+#[derive(Clone)]
+pub struct UnnestDF;
+
+impl PluginCommand for UnnestDF {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars unnest"
+    }
+
+    fn description(&self) -> &str {
+        "Decompose struct columns into separate columns for each of their fields. The new columns will be inserted into the dataframe at the location of the struct column."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .rest("cols", SyntaxShape::String, "columns to unnest")
+            .category(Category::Custom("dataframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Unnest a dataframe",
+                example: r#"[[id person]; [1 {name: "Bob", age: 36}] [2 {name: "Betty", age: 63}]] 
+                    | polars into-df -s {id: i64, person: {name: str, age: u8}} 
+                    | polars unnest person
+                    | polars get id name age
+                    | polars sort-by id"#,
+                result: Some(
+                    NuDataFrame::from(
+                        df!(
+                            "id" => [1, 2],
+                            "name" => ["Bob", "Betty"],
+                            "age" => [36, 63]
+                        )
+                        .expect("Should be able to create a simple dataframe"),
+                    )
+                    .into_value(Span::test_data()),
+                ),
+            },
+            Example {
+                description: "Unnest a lazy dataframe",
+                example: r#"[[id person]; [1 {name: "Bob", age: 36}] [2 {name: "Betty", age: 63}]] 
+                    | polars into-df -s {id: i64, person: {name: str, age: u8}} 
+                    | polars into-lazy 
+                    | polars unnest person
+                    | polars select (polars col id) (polars col name) (polars col age)
+                    | polars collect
+                    | polars sort-by id"#,
+                result: Some(
+                    NuDataFrame::from(
+                        df!(
+                            "id" => [1, 2],
+                            "name" => ["Bob", "Betty"],
+                            "age" => [36, 63]
+                        )
+                        .expect("Should be able to create a simple dataframe"),
+                    )
+                    .into_value(Span::test_data()),
+                ),
+            },
+        ]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        match PolarsPluginObject::try_from_pipeline(plugin, input, call.head)? {
+            PolarsPluginObject::NuDataFrame(df) => command_eager(plugin, engine, call, df),
+            PolarsPluginObject::NuLazyFrame(lazy) => command_lazy(plugin, engine, call, lazy),
+            _ => Err(ShellError::GenericError {
+                error: "Must be a dataframe or lazy dataframe".into(),
+                msg: "".into(),
+                span: Some(call.head),
+                help: None,
+                inner: vec![],
+            }),
+        }
+        .map_err(LabeledError::from)
+    }
+}
+
+fn command_eager(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    df: NuDataFrame,
+) -> Result<PipelineData, ShellError> {
+    let cols = call.rest::<String>(0)?;
+    let polars = df.to_polars();
+    let result: NuDataFrame = polars
+        .unnest(cols)
+        .map_err(|e| ShellError::GenericError {
+            error: format!("Error unnesting dataframe: {e}"),
+            msg: "".into(),
+            span: Some(call.head),
+            help: None,
+            inner: vec![],
+        })?
+        .into();
+    result.to_pipeline_data(plugin, engine, call.head)
+}
+
+fn command_lazy(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    df: NuLazyFrame,
+) -> Result<PipelineData, ShellError> {
+    let cols = call.rest::<String>(0)?;
+
+    let polars = df.to_polars();
+    let result: NuLazyFrame = polars.unnest(cols).into();
+    result.to_pipeline_data(plugin, engine, call.head)
+}
+
+#[cfg(test)]
+mod test {
+    use crate::test::test_polars_plugin_command;
+
+    use super::*;
+
+    #[test]
+    fn test_examples() -> Result<(), ShellError> {
+        test_polars_plugin_command(&UnnestDF)
+    }
+}

From 0209992f6cec208ab3b249e1c77820aa22670945 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Wed, 16 Oct 2024 19:24:45 -0700
Subject: [PATCH 0560/1072] Make `plugin list` read state from plugin registry
 file as well (#14085)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

[Context on
Discord](https://discord.com/channels/601130461678272522/855947301380947968/1292279795035668583)

**This is a breaking change, due to the removal of `is_running`.**

Some users find the `plugin list` command confusing, because it doesn't
show anything different after running `plugin add` or `plugin rm`. This
modifies the `plugin list` command to also look at the plugin registry
file to give some idea of how the plugins in engine state differ from
those in the plugin registry file.

The following values of `status` are now produced instead of
`is_running`:

- `added`: The plugin is present in the plugin registry file, but not in
the engine.
- `loaded`: The plugin is present both in the plugin registry file and
in the engine, but is not running.
- `running`: The plugin is currently running, and the `pid` column
should contain its process ID.
- `modified`: The plugin state present in the plugin registry file is
different from the state in the engine.
- `removed`: The plugin is still loaded in the engine, but is not
present in the plugin registry file.
- `invalid`: The data in the plugin registry file couldn't be
deserialized, and the plugin most likely needs to be added again.

Example (`commands` omitted):

```
╭──────┬─────────────────────┬────────────┬───────────┬──────────┬─────────────────────────────────────────────────────┬─────────╮
│    # │        name         │  version   │  status   │   pid    │                      filename                       │  shell  │
├──────┼─────────────────────┼────────────┼───────────┼──────────┼─────────────────────────────────────────────────────┼─────────┤
│    0 │ custom_values       │ 0.1.0      │ loaded    │          │ /home/devyn/.cargo/bin/nu_plugin_custom_values      │         │
│    1 │ dbus                │ 0.11.0     │ loaded    │          │ /home/devyn/.cargo/bin/nu_plugin_dbus               │         │
│    2 │ example             │ 0.98.1     │ loaded    │          │ /home/devyn/.cargo/bin/nu_plugin_example            │         │
│    3 │ explore_ir          │ 0.3.0      │ loaded    │          │ /home/devyn/.cargo/bin/nu_plugin_explore_ir         │         │
│    4 │ formats             │ 0.98.1     │ loaded    │          │ /home/devyn/.cargo/bin/nu_plugin_formats            │         │
│    5 │ gstat               │ 0.98.1     │ running   │   236662 │ /home/devyn/.cargo/bin/nu_plugin_gstat              │         │
│    6 │ inc                 │ 0.98.1     │ loaded    │          │ /home/devyn/.cargo/bin/nu_plugin_inc                │         │
│    7 │ polars              │ 0.98.1     │ added     │          │ /home/devyn/.cargo/bin/nu_plugin_polars             │         │
│    8 │ query               │ 0.98.1     │ removed   │          │ /home/devyn/.cargo/bin/nu_plugin_query              │         │
│    9 │ stress_internals    │ 0.98.1     │ loaded    │          │ /home/devyn/.cargo/bin/nu_plugin_stress_internals   │         │
╰──────┴─────────────────────┴────────────┴───────────┴──────────┴─────────────────────────────────────────────────────┴─────────╯

```

# User-Facing Changes

To `plugin list`:

* **Breaking:** The `is_running` column is removed and replaced with
`status`. Use `status == running` to filter equivalently.
* The `--plugin-config` from other plugin management commands is now
supported.
* Added an `--engine` flag which behaves more or less like before, and
doesn't load the plugin registry file at all.
* Added a `--registry` flag which only checks the plugin registry file.
All plugins appear as `added` since there is no state to compare with.

Because the default is to check both, the `plugin list` command might be
a little bit slower. If you don't need to check the plugin registry
file, the `--engine` flag does not load the plugin registry file at all,
so it should be just as fast as before.

# Tests + Formatting

Added tests for `added` and `removed` statuses. `modified` and `invalid`
are a bit more tricky so I didn't try.

# After Submitting

- [ ] update documentation that references the `plugin list` command
- [ ] release notes
---
 .../nu-cmd-plugin/src/commands/plugin/add.rs  |   2 +-
 .../nu-cmd-plugin/src/commands/plugin/list.rs | 281 ++++++++++++++----
 .../nu-cmd-plugin/src/commands/plugin/rm.rs   |   2 +-
 crates/nu-cmd-plugin/src/util.rs              |  60 +++-
 tests/plugin_persistence/mod.rs               |  22 +-
 tests/plugins/registry_file.rs                |  53 +++-
 6 files changed, 339 insertions(+), 81 deletions(-)

diff --git a/crates/nu-cmd-plugin/src/commands/plugin/add.rs b/crates/nu-cmd-plugin/src/commands/plugin/add.rs
index c12f486668..c603ddbb8c 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/add.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/add.rs
@@ -119,7 +119,7 @@ apparent the next time `nu` is next launched with that plugin registry file.
         let metadata = interface.get_metadata()?;
         let commands = interface.get_signature()?;
 
-        modify_plugin_file(engine_state, stack, call.head, custom_path, |contents| {
+        modify_plugin_file(engine_state, stack, call.head, &custom_path, |contents| {
             // Update the file with the received metadata and signatures
             let item = PluginRegistryItem::new(plugin.identity(), metadata, commands);
             contents.upsert_plugin(item);
diff --git a/crates/nu-cmd-plugin/src/commands/plugin/list.rs b/crates/nu-cmd-plugin/src/commands/plugin/list.rs
index 3fbf55b23c..367a532ef3 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/list.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/list.rs
@@ -1,5 +1,8 @@
-use itertools::Itertools;
+use itertools::{EitherOrBoth, Itertools};
 use nu_engine::command_prelude::*;
+use nu_protocol::{IntoValue, PluginRegistryItemData};
+
+use crate::util::read_plugin_file;
 
 #[derive(Clone)]
 pub struct PluginList;
@@ -17,7 +20,7 @@ impl Command for PluginList {
                     [
                         ("name".into(), Type::String),
                         ("version".into(), Type::String),
-                        ("is_running".into(), Type::Bool),
+                        ("status".into(), Type::String),
                         ("pid".into(), Type::Int),
                         ("filename".into(), Type::String),
                         ("shell".into(), Type::String),
@@ -26,11 +29,54 @@ impl Command for PluginList {
                     .into(),
                 ),
             )
+            .named(
+                "plugin-config",
+                SyntaxShape::Filepath,
+                "Use a plugin registry file other than the one set in `$nu.plugin-path`",
+                None,
+            )
+            .switch(
+                "engine",
+                "Show info for plugins that are loaded into the engine only.",
+                Some('e'),
+            )
+            .switch(
+                "registry",
+                "Show info for plugins from the registry file only.",
+                Some('r'),
+            )
             .category(Category::Plugin)
     }
 
     fn description(&self) -> &str {
-        "List installed plugins."
+        "List loaded and installed plugins."
+    }
+
+    fn extra_description(&self) -> &str {
+        r#"
+The `status` column will contain one of the following values:
+
+- `added`:    The plugin is present in the plugin registry file, but not in
+              the engine.
+- `loaded`:   The plugin is present both in the plugin registry file and in
+              the engine, but is not running.
+- `running`:  The plugin is currently running, and the `pid` column should
+              contain its process ID.
+- `modified`: The plugin state present in the plugin registry file is different
+              from the state in the engine.
+- `removed`:  The plugin is still loaded in the engine, but is not present in
+              the plugin registry file.
+- `invalid`:  The data in the plugin registry file couldn't be deserialized,
+              and the plugin most likely needs to be added again.
+
+`running` takes priority over any other status. Unless `--registry` is used
+or the plugin has not been loaded yet, the values of `version`, `filename`,
+`shell`, and `commands` reflect the values in the engine and not the ones in
+the plugin registry file.
+
+See also: `plugin use`
+"#
+        .trim()
     }
 
     fn search_terms(&self) -> Vec<&str> {
@@ -45,7 +91,7 @@ impl Command for PluginList {
                 result: Some(Value::test_list(vec![Value::test_record(record! {
                     "name" => Value::test_string("inc"),
                     "version" => Value::test_string(env!("CARGO_PKG_VERSION")),
-                    "is_running" => Value::test_bool(true),
+                    "status" => Value::test_string("running"),
                     "pid" => Value::test_int(106480),
                     "filename" => if cfg!(windows) {
                         Value::test_string(r"C:\nu\plugins\nu_plugin_inc.exe")
@@ -67,58 +113,189 @@ impl Command for PluginList {
     fn run(
         &self,
         engine_state: &EngineState,
-        _stack: &mut Stack,
+        stack: &mut Stack,
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let head = call.head;
+        let custom_path = call.get_flag(engine_state, stack, "plugin-config")?;
+        let engine_mode = call.has_flag(engine_state, stack, "engine")?;
+        let registry_mode = call.has_flag(engine_state, stack, "registry")?;
 
-        // Group plugin decls by plugin identity
-        let decls = engine_state.plugin_decls().into_group_map_by(|decl| {
-            decl.plugin_identity()
-                .expect("plugin decl should have identity")
-        });
+        let plugins_info = match (engine_mode, registry_mode) {
+            // --engine and --registry together is equivalent to the default.
+            (false, false) | (true, true) => {
+                if engine_state.plugin_path.is_some() || custom_path.is_some() {
+                    let plugins_in_engine = get_plugins_in_engine(engine_state);
+                    let plugins_in_registry =
+                        get_plugins_in_registry(engine_state, stack, call.head, &custom_path)?;
+                    merge_plugin_info(plugins_in_engine, plugins_in_registry)
+                } else {
+                    // Don't produce error when running nu --no-config-file
+                    get_plugins_in_engine(engine_state)
+                }
+            }
+            (true, false) => get_plugins_in_engine(engine_state),
+            (false, true) => get_plugins_in_registry(engine_state, stack, call.head, &custom_path)?,
+        };
 
-        // Build plugins list
-        let list = engine_state.plugins().iter().map(|plugin| {
-            // Find commands that belong to the plugin
-            let commands = decls.get(plugin.identity())
-                .into_iter()
-                .flat_map(|decls| {
-                    decls.iter().map(|decl| Value::string(decl.name(), head))
-                })
-                .collect();
-
-            let pid = plugin
-                .pid()
-                .map(|p| Value::int(p as i64, head))
-                .unwrap_or(Value::nothing(head));
-
-            let shell = plugin
-                .identity()
-                .shell()
-                .map(|s| Value::string(s.to_string_lossy(), head))
-                .unwrap_or(Value::nothing(head));
-
-            let metadata = plugin.metadata();
-            let version = metadata
-                .and_then(|m| m.version)
-                .map(|s| Value::string(s, head))
-                .unwrap_or(Value::nothing(head));
-
-            let record = record! {
-                "name" => Value::string(plugin.identity().name(), head),
-                "version" => version,
-                "is_running" => Value::bool(plugin.is_running(), head),
-                "pid" => pid,
-                "filename" => Value::string(plugin.identity().filename().to_string_lossy(), head),
-                "shell" => shell,
-                "commands" => Value::list(commands, head),
-            };
-
-            Value::record(record, head)
-        }).collect();
-
-        Ok(Value::list(list, head).into_pipeline_data())
+        Ok(plugins_info.into_value(call.head).into_pipeline_data())
+    }
+}
+
+#[derive(Debug, Clone, IntoValue, PartialOrd, Ord, PartialEq, Eq)]
+struct PluginInfo {
+    name: String,
+    version: Option<String>,
+    status: PluginStatus,
+    pid: Option<u32>,
+    filename: String,
+    shell: Option<String>,
+    commands: Vec<String>,
+}
+
+#[derive(Debug, Clone, Copy, IntoValue, PartialOrd, Ord, PartialEq, Eq)]
+#[nu_value(rename_all = "snake_case")]
+enum PluginStatus {
+    Added,
+    Loaded,
+    Running,
+    Modified,
+    Removed,
+    Invalid,
+}
+
+fn get_plugins_in_engine(engine_state: &EngineState) -> Vec<PluginInfo> {
+    // Group plugin decls by plugin identity
+    let decls = engine_state.plugin_decls().into_group_map_by(|decl| {
+        decl.plugin_identity()
+            .expect("plugin decl should have identity")
+    });
+
+    // Build plugins list
+    engine_state
+        .plugins()
+        .iter()
+        .map(|plugin| {
+            // Find commands that belong to the plugin
+            let commands = decls
+                .get(plugin.identity())
+                .into_iter()
+                .flat_map(|decls| decls.iter().map(|decl| decl.name().to_owned()))
+                .sorted()
+                .collect();
+
+            PluginInfo {
+                name: plugin.identity().name().into(),
+                version: plugin.metadata().and_then(|m| m.version),
+                status: if plugin.pid().is_some() {
+                    PluginStatus::Running
+                } else {
+                    PluginStatus::Loaded
+                },
+                pid: plugin.pid(),
+                filename: plugin.identity().filename().to_string_lossy().into_owned(),
+                shell: plugin
+                    .identity()
+                    .shell()
+                    .map(|path| path.to_string_lossy().into_owned()),
+                commands,
+            }
+        })
+        .sorted()
+        .collect()
+}
+
+fn get_plugins_in_registry(
+    engine_state: &EngineState,
+    stack: &mut Stack,
+    span: Span,
+    custom_path: &Option<Spanned<String>>,
+) -> Result<Vec<PluginInfo>, ShellError> {
+    let plugin_file_contents = read_plugin_file(engine_state, stack, span, custom_path)?;
+
+    let plugins_info = plugin_file_contents
+        .plugins
+        .into_iter()
+        .map(|plugin| {
+            let mut info = PluginInfo {
+                name: plugin.name,
+                version: None,
+                status: PluginStatus::Added,
+                pid: None,
+                filename: plugin.filename.to_string_lossy().into_owned(),
+                shell: plugin.shell.map(|path| path.to_string_lossy().into_owned()),
+                commands: vec![],
+            };
+
+            if let PluginRegistryItemData::Valid { metadata, commands } = plugin.data {
+                info.version = metadata.version;
+                info.commands = commands
+                    .into_iter()
+                    .map(|command| command.sig.name)
+                    .sorted()
+                    .collect();
+            } else {
+                info.status = PluginStatus::Invalid;
+            }
+            info
+        })
+        .sorted()
+        .collect();
+
+    Ok(plugins_info)
+}
+
+/// If no options are provided, the command loads from both the plugin list in the engine and what's
+/// in the registry file. We need to reconcile the two to set the proper states and make sure that
+/// new plugins that were added to the plugin registry file show up.
+fn merge_plugin_info(
+    from_engine: Vec<PluginInfo>,
+    from_registry: Vec<PluginInfo>,
+) -> Vec<PluginInfo> {
+    from_engine
+        .into_iter()
+        .merge_join_by(from_registry, |info_a, info_b| {
+            info_a.name.cmp(&info_b.name)
+        })
+        .map(|either_or_both| match either_or_both {
+            // Exists in the engine, but not in the registry file
+            EitherOrBoth::Left(info) => PluginInfo {
+                status: match info.status {
+                    PluginStatus::Running => info.status,
+                    // The plugin is not in the registry file, so it should be marked as `removed`
+                    _ => PluginStatus::Removed,
+                },
+                ..info
+            },
+            // Exists in the registry file, but not in the engine
+            EitherOrBoth::Right(info) => info,
+            // Exists in both
+            EitherOrBoth::Both(info_engine, info_registry) => PluginInfo {
+                status: match (info_engine.status, info_registry.status) {
+                    // Above all, `running` should be displayed if the plugin is running
+                    (PluginStatus::Running, _) => PluginStatus::Running,
+                    // `invalid` takes precedence over other states because the user probably wants
+                    // to fix it
+                    (_, PluginStatus::Invalid) => PluginStatus::Invalid,
+                    // Display `modified` if the state in the registry is different somehow
+                    _ if info_engine.is_modified(&info_registry) => PluginStatus::Modified,
+                    // Otherwise, `loaded` (it's not running)
+                    _ => PluginStatus::Loaded,
+                },
+                ..info_engine
+            },
+        })
+        .sorted()
+        .collect()
+}
+
+impl PluginInfo {
+    /// True if the plugin info shows some kind of change (other than status/pid) relative to the
+    /// other
+    fn is_modified(&self, other: &PluginInfo) -> bool {
+        self.name != other.name
+            || self.filename != other.filename
+            || self.shell != other.shell
+            || self.commands != other.commands
     }
 }
diff --git a/crates/nu-cmd-plugin/src/commands/plugin/rm.rs b/crates/nu-cmd-plugin/src/commands/plugin/rm.rs
index 33557836c0..a82b41524a 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/rm.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/rm.rs
@@ -87,7 +87,7 @@ fixed with `plugin add`.
 
         let filename = canonicalize_possible_filename_arg(engine_state, stack, &name.item);
 
-        modify_plugin_file(engine_state, stack, call.head, custom_path, |contents| {
+        modify_plugin_file(engine_state, stack, call.head, &custom_path, |contents| {
             if let Some(index) = contents
                 .plugins
                 .iter()
diff --git a/crates/nu-cmd-plugin/src/util.rs b/crates/nu-cmd-plugin/src/util.rs
index 6808a74a3c..80d1a766b4 100644
--- a/crates/nu-cmd-plugin/src/util.rs
+++ b/crates/nu-cmd-plugin/src/util.rs
@@ -6,18 +6,17 @@ use std::{
     path::PathBuf,
 };
 
-pub(crate) fn modify_plugin_file(
+fn get_plugin_registry_file_path(
     engine_state: &EngineState,
     stack: &mut Stack,
     span: Span,
-    custom_path: Option<Spanned<String>>,
-    operate: impl FnOnce(&mut PluginRegistryFile) -> Result<(), ShellError>,
-) -> Result<(), ShellError> {
+    custom_path: &Option<Spanned<String>>,
+) -> Result<PathBuf, ShellError> {
     #[allow(deprecated)]
     let cwd = current_dir(engine_state, stack)?;
 
-    let plugin_registry_file_path = if let Some(ref custom_path) = custom_path {
-        nu_path::expand_path_with(&custom_path.item, cwd, true)
+    if let Some(ref custom_path) = custom_path {
+        Ok(nu_path::expand_path_with(&custom_path.item, cwd, true))
     } else {
         engine_state
             .plugin_path
@@ -28,8 +27,53 @@ pub(crate) fn modify_plugin_file(
                 span: Some(span),
                 help: Some("you may be running `nu` with --no-config-file".into()),
                 inner: vec![],
-            })?
-    };
+            })
+    }
+}
+
+pub(crate) fn read_plugin_file(
+    engine_state: &EngineState,
+    stack: &mut Stack,
+    span: Span,
+    custom_path: &Option<Spanned<String>>,
+) -> Result<PluginRegistryFile, ShellError> {
+    let plugin_registry_file_path =
+        get_plugin_registry_file_path(engine_state, stack, span, custom_path)?;
+
+    let file_span = custom_path.as_ref().map(|p| p.span).unwrap_or(span);
+
+    // Try to read the plugin file if it exists
+    if fs::metadata(&plugin_registry_file_path).is_ok_and(|m| m.len() > 0) {
+        PluginRegistryFile::read_from(
+            File::open(&plugin_registry_file_path).map_err(|err| ShellError::IOErrorSpanned {
+                msg: format!(
+                    "failed to read `{}`: {}",
+                    plugin_registry_file_path.display(),
+                    err
+                ),
+                span: file_span,
+            })?,
+            Some(file_span),
+        )
+    } else if let Some(path) = custom_path {
+        Err(ShellError::FileNotFound {
+            file: path.item.clone(),
+            span: path.span,
+        })
+    } else {
+        Ok(PluginRegistryFile::default())
+    }
+}
+
+pub(crate) fn modify_plugin_file(
+    engine_state: &EngineState,
+    stack: &mut Stack,
+    span: Span,
+    custom_path: &Option<Spanned<String>>,
+    operate: impl FnOnce(&mut PluginRegistryFile) -> Result<(), ShellError>,
+) -> Result<(), ShellError> {
+    let plugin_registry_file_path =
+        get_plugin_registry_file_path(engine_state, stack, span, custom_path)?;
 
     let file_span = custom_path.as_ref().map(|p| p.span).unwrap_or(span);
 
diff --git a/tests/plugin_persistence/mod.rs b/tests/plugin_persistence/mod.rs
index 6729c657c7..587e4d480f 100644
--- a/tests/plugin_persistence/mod.rs
+++ b/tests/plugin_persistence/mod.rs
@@ -12,7 +12,7 @@ fn plugin_list_shows_installed_plugins() {
         plugins: [("nu_plugin_inc"), ("nu_plugin_custom_values")],
         r#"(plugin list).name | str join ','"#
     );
-    assert_eq!("inc,custom_values", out.out);
+    assert_eq!("custom_values,inc", out.out);
     assert!(out.status.success());
 }
 
@@ -34,15 +34,15 @@ fn plugin_keeps_running_after_calling_it() {
         plugin: ("nu_plugin_inc"),
         r#"
             plugin stop inc
-            (plugin list).0.is_running | print
+            (plugin list).0.status == running | print
             print ";"
             "2.0.0" | inc -m | ignore
-            (plugin list).0.is_running | print
+            (plugin list).0.status == running | print
         "#
     );
     assert_eq!(
         "false;true", out.out,
-        "plugin list didn't show is_running = true"
+        "plugin list didn't show status = running"
     );
     assert!(out.status.success());
 }
@@ -244,7 +244,7 @@ fn plugin_gc_can_be_configured_to_stop_plugins_immediately() {
             $env.config.plugin_gc = { default: { stop_after: 0sec } }
             "2.3.0" | inc -M
             sleep 100ms
-            (plugin list | where name == inc).0.is_running
+            (plugin list | where name == inc).0.status == running
         "#
     );
     assert!(out.status.success());
@@ -261,7 +261,7 @@ fn plugin_gc_can_be_configured_to_stop_plugins_immediately() {
             }
             "2.3.0" | inc -M
             sleep 100ms
-            (plugin list | where name == inc).0.is_running
+            (plugin list | where name == inc).0.status == running
         "#
     );
     assert!(out.status.success());
@@ -281,7 +281,7 @@ fn plugin_gc_can_be_configured_to_stop_plugins_after_delay() {
             while $cond {
                 sleep 100ms
                 $cond = (
-                    (plugin list | where name == inc).0.is_running and
+                    (plugin list | where name == inc).0.status == running and
                     ((date now) - $start) < 5sec
                 )
             }
@@ -310,7 +310,7 @@ fn plugin_gc_can_be_configured_to_stop_plugins_after_delay() {
             while $cond {
                 sleep 100ms
                 $cond = (
-                    (plugin list | where name == inc).0.is_running and
+                    (plugin list | where name == inc).0.status == running and
                     ((date now) - $start) < 5sec
                 )
             }
@@ -333,7 +333,7 @@ fn plugin_gc_can_be_configured_as_disabled() {
         r#"
             $env.config.plugin_gc = { default: { enabled: false, stop_after: 0sec } }
             "2.3.0" | inc -M
-            (plugin list | where name == inc).0.is_running
+            (plugin list | where name == inc).0.status == running
         "#
     );
     assert!(out.status.success());
@@ -350,7 +350,7 @@ fn plugin_gc_can_be_configured_as_disabled() {
                 }
             }
             "2.3.0" | inc -M
-            (plugin list | where name == inc).0.is_running
+            (plugin list | where name == inc).0.status == running
         "#
     );
     assert!(out.status.success());
@@ -367,7 +367,7 @@ fn plugin_gc_can_be_disabled_by_plugin() {
             $env.config.plugin_gc = { default: { stop_after: 0sec } }
             example one 1 foo | ignore # ensure we've run the plugin with the new config
             sleep 100ms
-            (plugin list | where name == example).0.is_running
+            (plugin list | where name == example).0.status == running
         "#
     );
     assert!(out.status.success());
diff --git a/tests/plugins/registry_file.rs b/tests/plugins/registry_file.rs
index 2cb1473b6f..a2ca8735f0 100644
--- a/tests/plugins/registry_file.rs
+++ b/tests/plugins/registry_file.rs
@@ -37,7 +37,7 @@ fn plugin_add_then_restart_nu() {
                     --config $nu.config-path
                     --env-config $nu.env-path
                     --plugin-config $nu.plugin-path
-                    --commands 'plugin list | get name | to json --raw'
+                    --commands 'plugin list --engine | get name | to json --raw'
             )
         ", example_plugin_path().display())
     );
@@ -69,7 +69,7 @@ fn plugin_add_in_nu_plugin_dirs_const() {
                         --config $nu.config-path
                         --env-config $nu.env-path
                         --plugin-config $nu.plugin-path
-                        --commands 'plugin list | get name | to json --raw'
+                        --commands 'plugin list --engine | get name | to json --raw'
                 )
             "#,
             dirname.display(),
@@ -103,7 +103,7 @@ fn plugin_add_in_nu_plugin_dirs_env() {
                         --config $nu.config-path
                         --env-config $nu.env-path
                         --plugin-config $nu.plugin-path
-                        --commands 'plugin list | get name | to json --raw'
+                        --commands 'plugin list --engine | get name | to json --raw'
                 )
             "#,
             dirname.display(),
@@ -199,7 +199,7 @@ fn plugin_rm_then_restart_nu() {
                 "--plugin-config",
                 "test-plugin-file.msgpackz",
                 "--commands",
-                "plugin list | get name | to json --raw",
+                "plugin list --engine | get name | to json --raw",
             ])
             .assert()
             .success()
@@ -364,7 +364,7 @@ fn warning_on_invalid_plugin_item() {
                 "--plugin-config",
                 "test-plugin-file.msgpackz",
                 "--commands",
-                "plugin list | get name | to json --raw",
+                "plugin list --engine | get name | to json --raw",
             ])
             .output()
             .expect("failed to run nu");
@@ -412,6 +412,43 @@ fn plugin_use_error_not_found() {
     })
 }
 
+#[test]
+fn plugin_shows_up_in_default_plugin_list_after_add() {
+    let example_plugin_path = example_plugin_path();
+    let result = nu_with_plugins!(
+        cwd: ".",
+        plugins: [],
+        &format!(r#"
+            plugin add '{}'
+            plugin list | get status | to json --raw
+        "#, example_plugin_path.display())
+    );
+    assert!(result.status.success());
+    assert_eq!(r#"["added"]"#, result.out);
+}
+
+#[test]
+fn plugin_shows_removed_after_removing() {
+    let example_plugin_path = example_plugin_path();
+    let result = nu_with_plugins!(
+        cwd: ".",
+        plugins: [],
+        &format!(r#"
+            plugin add '{}'
+            plugin list | get status | to json --raw
+            (
+                ^$nu.current-exe
+                    --config $nu.config-path
+                    --env-config $nu.env-path
+                    --plugin-config $nu.plugin-path
+                    --commands 'plugin rm example; plugin list | get status | to json --raw'
+            )
+        "#, example_plugin_path.display())
+    );
+    assert!(result.status.success());
+    assert_eq!(r#"["removed"]"#, result.out);
+}
+
 #[test]
 fn plugin_add_and_then_use() {
     let example_plugin_path = example_plugin_path();
@@ -425,7 +462,7 @@ fn plugin_add_and_then_use() {
                     --config $nu.config-path
                     --env-config $nu.env-path
                     --plugin-config $nu.plugin-path
-                    --commands 'plugin use example; plugin list | get name | to json --raw'
+                    --commands 'plugin use example; plugin list --engine | get name | to json --raw'
             )
         "#, example_plugin_path.display())
     );
@@ -446,7 +483,7 @@ fn plugin_add_and_then_use_by_filename() {
                     --config $nu.config-path
                     --env-config $nu.env-path
                     --plugin-config $nu.plugin-path
-                    --commands 'plugin use '{0}'; plugin list | get name | to json --raw'
+                    --commands 'plugin use '{0}'; plugin list --engine | get name | to json --raw'
             )
         "#, example_plugin_path.display())
     );
@@ -471,7 +508,7 @@ fn plugin_add_then_use_with_custom_path() {
             cwd: dirs.test(),
             r#"
                 plugin use --plugin-config test-plugin-file.msgpackz example
-                plugin list | get name | to json --raw
+                plugin list --engine | get name | to json --raw
             "#
         );
 

From 2eef42c6b9ed28092cafe1c4696ac26894b332da Mon Sep 17 00:00:00 2001
From: Solomon <git@solomonvictorino.com>
Date: Thu, 17 Oct 2024 02:25:17 +0000
Subject: [PATCH 0561/1072] run ensure_flag_arg_type for short flag values
 (#14074)

Closes #13654

# User-Facing Changes

- Short flags are now fully type-checked,
  including null and record signatures for literal arguments:

```nushell
def test [-v: record<l: int>] {};
test -v null # error
test -v {l: ""} # error

def test2 [-v: int] {};
let v = ""
test2 -v $v # error
```

- `polars unpivot` `--index`/`--on` and `into value --columns`
now accept `list` values
---
 .../nu-command/src/conversions/into/value.rs  |  2 +-
 crates/nu-parser/src/parser.rs                | 23 ++++++++-----------
 .../src/dataframe/command/data/unpivot.rs     |  4 ++--
 tests/repl/test_custom_commands.rs            | 18 ++++++++++++---
 4 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/crates/nu-command/src/conversions/into/value.rs b/crates/nu-command/src/conversions/into/value.rs
index 52e5ab339c..99b1daf4b7 100644
--- a/crates/nu-command/src/conversions/into/value.rs
+++ b/crates/nu-command/src/conversions/into/value.rs
@@ -18,7 +18,7 @@ impl Command for IntoValue {
             .input_output_types(vec![(Type::table(), Type::table())])
             .named(
                 "columns",
-                SyntaxShape::Table(vec![]),
+                SyntaxShape::List(Box::new(SyntaxShape::Any)),
                 "list of columns to update",
                 Some('c'),
             )
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 232fc50b3d..64a5086628 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -1067,30 +1067,27 @@ pub fn parse_internal_call(
                     if let Some(arg_shape) = flag.arg {
                         if let Some(arg) = spans.get(spans_idx + 1) {
                             let arg = parse_value(working_set, *arg, &arg_shape);
+                            let (arg_name, val_expression) = ensure_flag_arg_type(
+                                working_set,
+                                flag.long.clone(),
+                                arg.clone(),
+                                &arg_shape,
+                                spans[spans_idx],
+                            );
 
                             if flag.long.is_empty() {
                                 if let Some(short) = flag.short {
                                     call.add_named((
-                                        Spanned {
-                                            item: String::new(),
-                                            span: spans[spans_idx],
-                                        },
+                                        arg_name,
                                         Some(Spanned {
                                             item: short.to_string(),
                                             span: spans[spans_idx],
                                         }),
-                                        Some(arg),
+                                        Some(val_expression),
                                     ));
                                 }
                             } else {
-                                call.add_named((
-                                    Spanned {
-                                        item: flag.long.clone(),
-                                        span: spans[spans_idx],
-                                    },
-                                    None,
-                                    Some(arg),
-                                ));
+                                call.add_named((arg_name, None, Some(val_expression)));
                             }
                             spans_idx += 1;
                         } else {
diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/unpivot.rs b/crates/nu_plugin_polars/src/dataframe/command/data/unpivot.rs
index 5235305de2..ffbbd66916 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/unpivot.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/unpivot.rs
@@ -31,13 +31,13 @@ impl PluginCommand for UnpivotDF {
         Signature::build(self.name())
             .required_named(
                 "index",
-                SyntaxShape::Table(vec![]),
+                SyntaxShape::List(Box::new(SyntaxShape::Any)),
                 "column names for unpivoting",
                 Some('i'),
             )
             .required_named(
                 "on",
-                SyntaxShape::Table(vec![]),
+                SyntaxShape::List(Box::new(SyntaxShape::Any)),
                 "column names used as value columns",
                 Some('o'),
             )
diff --git a/tests/repl/test_custom_commands.rs b/tests/repl/test_custom_commands.rs
index 1710b35913..a93d3fbba8 100644
--- a/tests/repl/test_custom_commands.rs
+++ b/tests/repl/test_custom_commands.rs
@@ -1,6 +1,7 @@
 use crate::repl::tests::{fail_test, run_test, run_test_contains, TestResult};
 use nu_test_support::nu;
 use pretty_assertions::assert_eq;
+use rstest::rstest;
 
 #[test]
 fn no_scope_leak1() -> TestResult {
@@ -73,10 +74,21 @@ fn custom_switch1() -> TestResult {
     )
 }
 
-#[test]
-fn custom_flag_with_type_checking() -> TestResult {
+#[rstest]
+fn custom_flag_with_type_checking(
+    #[values(
+        ("int", "\"3\""),
+        ("int", "null"),
+        ("record<i: int>", "{i: \"\"}"),
+        ("list<int>", "[\"\"]")
+    )]
+    type_sig_value: (&str, &str),
+    #[values("--dry-run", "-d")] flag: &str,
+) -> TestResult {
+    let (type_sig, value) = type_sig_value;
+
     fail_test(
-        r#"def florb [--dry-run: int] { $dry_run }; let y = "3"; florb --dry-run=$y"#,
+        &format!("def florb [{flag}: {type_sig}] {{}}; let y = {value}; florb {flag} $y"),
         "type_mismatch",
     )
 }

From 71b49c337469bd9e14f50e80cdb72c09c82abc03 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Thu, 17 Oct 2024 10:25:45 +0800
Subject: [PATCH 0562/1072] `use` command: Don't create a variable with empty
 record if it doesn't define any constants (#14051)

# Description
Fixes: #13967

The key changes lays in `nu-protocol/src/module.rs`, when resolving
import pattern, nushell only needs to bring `$module` with a record
value if it defines any constants.

# User-Facing Changes
```nushell
module spam {}
use spam
```
Will no longer create a `$spam` variable with an empty record.

# Tests + Formatting
Adjusted some tests and added some tests.
---
 crates/nu-protocol/src/module.rs | 29 ++++++++++++----------
 tests/const_/mod.rs              | 41 +++++++++++++++++++++-----------
 tests/repl/test_modules.rs       |  5 ++++
 3 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/crates/nu-protocol/src/module.rs b/crates/nu-protocol/src/module.rs
index 6b4aec0c60..02bac131dc 100644
--- a/crates/nu-protocol/src/module.rs
+++ b/crates/nu-protocol/src/module.rs
@@ -161,20 +161,25 @@ impl Module {
             }
 
             let span = self.span.unwrap_or(backup_span);
-            let const_record = Value::record(
-                const_rows
-                    .into_iter()
-                    .map(|(name, val)| (String::from_utf8_lossy(&name).to_string(), val))
-                    .collect(),
-                span,
-            );
+
+            // only needs to bring `$module` with a record value if it defines any constants.
+            let constants = if const_rows.is_empty() {
+                vec![]
+            } else {
+                vec![(
+                    final_name.clone(),
+                    Value::record(
+                        const_rows
+                            .into_iter()
+                            .map(|(name, val)| (String::from_utf8_lossy(&name).to_string(), val))
+                            .collect(),
+                        span,
+                    ),
+                )]
+            };
 
             return (
-                ResolvedImportPattern::new(
-                    decls,
-                    vec![(final_name.clone(), self_id)],
-                    vec![(final_name, const_record)],
-                ),
+                ResolvedImportPattern::new(decls, vec![(final_name.clone(), self_id)], constants),
                 errors,
             );
         };
diff --git a/tests/const_/mod.rs b/tests/const_/mod.rs
index f736b785ca..0c4ff5d77c 100644
--- a/tests/const_/mod.rs
+++ b/tests/const_/mod.rs
@@ -238,13 +238,30 @@ fn complex_const_export() {
     let actual = nu!(&inp.join("; "));
     assert_eq!(actual.out, "eats");
 
-    let inp = &[
-        MODULE_SETUP,
-        "use spam",
-        "($spam.eggs.bacon.none | is-empty)",
-    ];
+    let inp = &[MODULE_SETUP, "use spam", "'none' in $spam.eggs.bacon"];
     let actual = nu!(&inp.join("; "));
-    assert_eq!(actual.out, "true");
+    assert_eq!(actual.out, "false");
+}
+
+#[test]
+fn only_nested_module_have_const() {
+    let setup = r#"
+        module spam {
+            export module eggs {
+                export module bacon {
+                    export const viking = 'eats'
+                    export module none {}
+                }
+            }
+        }
+    "#;
+    let inp = &[setup, "use spam", "$spam.eggs.bacon.viking"];
+    let actual = nu!(&inp.join("; "));
+    assert_eq!(actual.out, "eats");
+
+    let inp = &[setup, "use spam", "'none' in $spam.eggs.bacon"];
+    let actual = nu!(&inp.join("; "));
+    assert_eq!(actual.out, "false");
 }
 
 #[test]
@@ -261,20 +278,16 @@ fn complex_const_glob_export() {
     let actual = nu!(&inp.join("; "));
     assert_eq!(actual.out, "eats");
 
-    let inp = &[MODULE_SETUP, "use spam *", "($eggs.bacon.none | is-empty)"];
+    let inp = &[MODULE_SETUP, "use spam *", "'none' in $eggs.bacon"];
     let actual = nu!(&inp.join("; "));
-    assert_eq!(actual.out, "true");
+    assert_eq!(actual.out, "false");
 }
 
 #[test]
 fn complex_const_drill_export() {
-    let inp = &[
-        MODULE_SETUP,
-        "use spam eggs bacon none",
-        "($none | is-empty)",
-    ];
+    let inp = &[MODULE_SETUP, "use spam eggs bacon none", "$none"];
     let actual = nu!(&inp.join("; "));
-    assert_eq!(actual.out, "true");
+    assert!(actual.err.contains("variable not found"));
 }
 
 #[test]
diff --git a/tests/repl/test_modules.rs b/tests/repl/test_modules.rs
index dd62c74b77..289efd291a 100644
--- a/tests/repl/test_modules.rs
+++ b/tests/repl/test_modules.rs
@@ -120,6 +120,11 @@ fn export_consts() -> TestResult {
     )
 }
 
+#[test]
+fn dont_export_module_name_as_a_variable() -> TestResult {
+    fail_test(r#"module spam { }; use spam; $spam"#, "variable not found")
+}
+
 #[test]
 fn func_use_consts() -> TestResult {
     run_test(

From 6230a62e9e44dcb0cf5f029d7036e645fc36d416 Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Thu, 17 Oct 2024 05:19:59 -0400
Subject: [PATCH 0563/1072] Add count to uniq search terms (#14108)

Adds "count" to uniq's search terms, to facilitate discovery of the
`--count` option
---
 crates/nu-command/src/filters/uniq.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-command/src/filters/uniq.rs b/crates/nu-command/src/filters/uniq.rs
index a22d62b89e..3a82e73aa1 100644
--- a/crates/nu-command/src/filters/uniq.rs
+++ b/crates/nu-command/src/filters/uniq.rs
@@ -46,7 +46,7 @@ impl Command for Uniq {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["distinct", "deduplicate"]
+        vec!["distinct", "deduplicate", "count"]
     }
 
     fn run(

From 043d1ed9fbd9fe146994be1c4b23b15e36b44477 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 17 Oct 2024 09:15:42 -0500
Subject: [PATCH 0564/1072] add `like` and `not-like` operators as synonyms for
 the regex operators `=~` and `!~` (#14072)

# Description

This PR adds `like` as a synonym for `=~` and `not-like` as a synonym
for `!~`. This is mainly a quality-of-life change to help those people
who think in sql.


![image](https://github.com/user-attachments/assets/a0b142cd-30c9-487d-b755-d6da0a0874ec)

closes #13261

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-cli/src/completions/operator_completions.rs | 2 ++
 crates/nu-parser/src/parser.rs                        | 4 ++--
 crates/nu-protocol/src/ast/operator.rs                | 4 ++--
 crates/nu-std/std/help/mod.nu                         | 6 +++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/crates/nu-cli/src/completions/operator_completions.rs b/crates/nu-cli/src/completions/operator_completions.rs
index e9e95d0799..460e7f590b 100644
--- a/crates/nu-cli/src/completions/operator_completions.rs
+++ b/crates/nu-cli/src/completions/operator_completions.rs
@@ -67,7 +67,9 @@ impl Completer for OperatorCompletion {
             ],
             Expr::String(_) => vec![
                 ("=~", "Contains regex match"),
+                ("like", "Contains regex match"),
                 ("!~", "Does not contain regex match"),
+                ("not-like", "Does not contain regex match"),
                 (
                     "++",
                     "Appends two lists, a list and a value, two strings, or two binary values",
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 64a5086628..d2ed11188a 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -5018,8 +5018,8 @@ pub fn parse_operator(working_set: &mut StateWorkingSet, span: Span) -> Expressi
         b"<=" => Operator::Comparison(Comparison::LessThanOrEqual),
         b">" => Operator::Comparison(Comparison::GreaterThan),
         b">=" => Operator::Comparison(Comparison::GreaterThanOrEqual),
-        b"=~" => Operator::Comparison(Comparison::RegexMatch),
-        b"!~" => Operator::Comparison(Comparison::NotRegexMatch),
+        b"=~" | b"like" => Operator::Comparison(Comparison::RegexMatch),
+        b"!~" | b"not-like" => Operator::Comparison(Comparison::NotRegexMatch),
         b"+" => Operator::Math(Math::Plus),
         b"++" => Operator::Math(Math::Append),
         b"-" => Operator::Math(Math::Minus),
diff --git a/crates/nu-protocol/src/ast/operator.rs b/crates/nu-protocol/src/ast/operator.rs
index 713c6c0060..8c2e59d93a 100644
--- a/crates/nu-protocol/src/ast/operator.rs
+++ b/crates/nu-protocol/src/ast/operator.rs
@@ -115,8 +115,8 @@ impl Display for Operator {
             Operator::Comparison(Comparison::NotEqual) => write!(f, "!="),
             Operator::Comparison(Comparison::LessThan) => write!(f, "<"),
             Operator::Comparison(Comparison::GreaterThan) => write!(f, ">"),
-            Operator::Comparison(Comparison::RegexMatch) => write!(f, "=~"),
-            Operator::Comparison(Comparison::NotRegexMatch) => write!(f, "!~"),
+            Operator::Comparison(Comparison::RegexMatch) => write!(f, "=~ or like"),
+            Operator::Comparison(Comparison::NotRegexMatch) => write!(f, "!~ or not-like"),
             Operator::Comparison(Comparison::LessThanOrEqual) => write!(f, "<="),
             Operator::Comparison(Comparison::GreaterThanOrEqual) => write!(f, ">="),
             Operator::Comparison(Comparison::StartsWith) => write!(f, "starts-with"),
diff --git a/crates/nu-std/std/help/mod.nu b/crates/nu-std/std/help/mod.nu
index d608ae8bcb..089bbff7f8 100644
--- a/crates/nu-std/std/help/mod.nu
+++ b/crates/nu-std/std/help/mod.nu
@@ -47,8 +47,8 @@ def get-all-operators [] { return [
     [Comparison, <=, LessThanOrEqual, "Checks if a value is less than or equal to another.", 80]
     [Comparison, >, GreaterThan, "Checks if a value is greater than another.", 80]
     [Comparison, >=, GreaterThanOrEqual, "Checks if a value is greater than or equal to another.", 80]
-    [Comparison, =~, RegexMatch, "Checks if a value matches a regular expression.", 80]
-    [Comparison, !~, NotRegexMatch, "Checks if a value does not match a regular expression.", 80]
+    [Comparison, '=~ or like', RegexMatch, "Checks if a value matches a regular expression.", 80]
+    [Comparison, '!~ or not-like', NotRegexMatch, "Checks if a value does not match a regular expression.", 80]
     [Comparison, in, In, "Checks if a value is in a list or string.", 80]
     [Comparison, not-in, NotIn, "Checks if a value is not in a list or string.", 80]
     [Comparison, starts-with, StartsWith, "Checks if a string starts with another.", 80]
@@ -771,7 +771,7 @@ You can also learn more at (ansi default_italic)(ansi light_cyan_underline)https
 
     let modules = (try { modules $target_item --find $find })
     if not ($modules | is-empty) { return $modules }
-    
+
     if ($find | is-not-empty) {
         print -e $"No help results found mentioning: ($find)"
         return []

From 868029f6553a946bc3754f6b152df4b8f2cea839 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Thu, 17 Oct 2024 10:01:08 -0700
Subject: [PATCH 0565/1072] Update to rust 1.80.1 (#14106)

This can be merged on 10/17 once 1.82.0 is out.

---------

Co-authored-by: Wind <WindSoilder@outlook.com>
---
 Cargo.toml                                   | 4 ++--
 crates/nu-plugin/src/plugin/interface/mod.rs | 3 +--
 rust-toolchain.toml                          | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 2dabcfd7bf..9e758041a6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ homepage = "https://www.nushell.sh"
 license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
-rust-version = "1.79.0"
+rust-version = "1.80.1"
 version = "0.99.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -320,4 +320,4 @@ bench = false
 # Run individual benchmarks like `cargo bench -- <regex>` e.g. `cargo bench -- parse`
 [[bench]]
 name = "benchmarks"
-harness = false
\ No newline at end of file
+harness = false
diff --git a/crates/nu-plugin/src/plugin/interface/mod.rs b/crates/nu-plugin/src/plugin/interface/mod.rs
index fc40b9c732..be7b2e0dfc 100644
--- a/crates/nu-plugin/src/plugin/interface/mod.rs
+++ b/crates/nu-plugin/src/plugin/interface/mod.rs
@@ -1091,8 +1091,7 @@ fn set_pgrp_from_enter_foreground(pgrp: i64) -> Result<(), ShellError> {
 fn set_pgrp_from_enter_foreground(_pgrp: i64) -> Result<(), ShellError> {
     Err(ShellError::NushellFailed {
         msg: concat!(
-            "EnterForeground asked plugin to join process group, but not supported on ",
-            cfg!(target_os)
+            "EnterForeground asked plugin to join process group, but this is not supported on non UNIX platforms.",
         )
         .into(),
     })
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index bb2f1fcb35..183da649b8 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -16,4 +16,4 @@ profile = "default"
 # use in nushell, we may opt to use the bleeding edge stable version of rust.
 # I believe rust is on a 6 week release cycle and nushell is on a 4 week release cycle.
 # So, every two nushell releases, this version number should be bumped by one.
-channel = "1.79.0"
+channel = "1.80.1"

From 5e784d38eb88dcfa41182dda1a5ed47f031ab688 Mon Sep 17 00:00:00 2001
From: YizhePKU <yizhe@pku.edu.cn>
Date: Fri, 18 Oct 2024 01:12:45 +0800
Subject: [PATCH 0566/1072] Reduce duplicate dependencies on the `windows`
 crate (#14105)

Nushell currently depends on three different versions of the `windows`
crate: `0.44.0`, `0.52.0`, and `0.54.0`. This PR bumps several
dependencies so that the `nu` binary only depends on `0.56.0`.

On my machine, this PR makes `cargo build` about 10% faster.

The polars plugin still uses its own version of the `windows` crate
though, which is not ideal. We'll need to bump the `polars` crate to fix
that, but it breaks a lot of our code. (`polars 1.0` release anyone?)
---
 Cargo.lock                          | 166 +++++++++++-----------------
 Cargo.toml                          |   6 +-
 crates/nu-command/src/debug/info.rs |   6 +-
 3 files changed, 69 insertions(+), 109 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d6f1e35bd1..424914e606 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2611,15 +2611,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "malloc_buf"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "markup5ever"
 version = "0.12.1"
@@ -3025,7 +3016,7 @@ dependencies = [
  "percent-encoding",
  "reedline",
  "rstest",
- "sysinfo",
+ "sysinfo 0.32.0",
  "tempfile",
  "unicode-segmentation",
  "uuid",
@@ -3187,7 +3178,7 @@ dependencies = [
  "serde_urlencoded",
  "serde_yaml",
  "sha2",
- "sysinfo",
+ "sysinfo 0.32.0",
  "tabled",
  "tempfile",
  "terminal_size",
@@ -3210,7 +3201,7 @@ dependencies = [
  "v_htmlescape",
  "wax",
  "which",
- "windows 0.54.0",
+ "windows 0.56.0",
  "winreg",
 ]
 
@@ -3356,7 +3347,7 @@ dependencies = [
  "rmp-serde",
  "serde",
  "serde_json",
- "windows 0.54.0",
+ "windows 0.56.0",
 ]
 
 [[package]]
@@ -3372,7 +3363,7 @@ dependencies = [
  "nu-utils",
  "serde",
  "typetag",
- "windows 0.54.0",
+ "windows 0.56.0",
 ]
 
 [[package]]
@@ -3477,8 +3468,8 @@ dependencies = [
  "ntapi",
  "once_cell",
  "procfs",
- "sysinfo",
- "windows 0.54.0",
+ "sysinfo 0.32.0",
+ "windows 0.56.0",
 ]
 
 [[package]]
@@ -3761,15 +3752,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "objc"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
-dependencies = [
- "malloc_buf",
-]
-
 [[package]]
 name = "objc-sys"
 version = "0.3.5"
@@ -4729,7 +4711,7 @@ dependencies = [
  "rayon",
  "smartstring",
  "stacker",
- "sysinfo",
+ "sysinfo 0.30.13",
  "version_check",
 ]
 
@@ -6115,10 +6097,23 @@ dependencies = [
  "libc",
  "ntapi",
  "once_cell",
- "rayon",
  "windows 0.52.0",
 ]
 
+[[package]]
+name = "sysinfo"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3b5ae3f4f7d64646c46c4cae4e3f01d1c5d255c7406fdd7c7f999a94e488791"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+ "memchr",
+ "ntapi",
+ "rayon",
+ "windows 0.56.0",
+]
+
 [[package]]
 name = "tabled"
 version = "0.16.0"
@@ -6442,18 +6437,19 @@ dependencies = [
 
 [[package]]
 name = "trash"
-version = "3.3.1"
+version = "5.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c658458d46d9d5a153a3b5cdd88d8579ad50d4fb85d53961e4526c8fc7c55a57"
+checksum = "33caf2a9be1812a263a4bfce74d2de225fcde12ee7b77001361abd2b34ffdcc4"
 dependencies = [
  "chrono",
  "libc",
  "log",
- "objc",
+ "objc2",
+ "objc2-foundation",
  "once_cell",
  "scopeguard",
- "url",
- "windows 0.44.0",
+ "urlencoding",
+ "windows 0.56.0",
 ]
 
 [[package]]
@@ -6642,6 +6638,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "urlencoding"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
+
 [[package]]
 name = "utf-8"
 version = "0.7.6"
@@ -7083,15 +7085,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "windows"
-version = "0.44.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
-dependencies = [
- "windows-targets 0.42.2",
-]
-
 [[package]]
 name = "windows"
 version = "0.52.0"
@@ -7104,11 +7097,11 @@ dependencies = [
 
 [[package]]
 name = "windows"
-version = "0.54.0"
+version = "0.56.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
+checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132"
 dependencies = [
- "windows-core 0.54.0",
+ "windows-core 0.56.0",
  "windows-targets 0.52.6",
 ]
 
@@ -7123,14 +7116,38 @@ dependencies = [
 
 [[package]]
 name = "windows-core"
-version = "0.54.0"
+version = "0.56.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
+checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6"
 dependencies = [
+ "windows-implement",
+ "windows-interface",
  "windows-result",
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-implement"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.75",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.75",
+]
+
 [[package]]
 name = "windows-result"
 version = "0.1.2"
@@ -7180,21 +7197,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-targets"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -7226,12 +7228,6 @@ dependencies = [
  "windows_x86_64_msvc 0.52.6",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -7250,12 +7246,6 @@ version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -7274,12 +7264,6 @@ version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -7304,12 +7288,6 @@ version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -7328,12 +7306,6 @@ version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
@@ -7346,12 +7318,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
@@ -7370,12 +7336,6 @@ version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
diff --git a/Cargo.toml b/Cargo.toml
index 9e758041a6..f1052e229b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -153,13 +153,13 @@ serde_yaml = "0.9"
 sha2 = "0.10"
 strip-ansi-escapes = "0.2.0"
 syn = "2.0"
-sysinfo = "0.30"
+sysinfo = "0.32"
 tabled = { version = "0.16.0", default-features = false }
 tempfile = "3.13"
 terminal_size = "0.3"
 titlecase = "2.0"
 toml = "0.8"
-trash = "3.3"
+trash = "5.1"
 umask = "2.1"
 unicode-segmentation = "1.12"
 unicode-width = "0.1"
@@ -176,7 +176,7 @@ uuid = "1.10.0"
 v_htmlescape = "0.15.0"
 wax = "0.6"
 which = "6.0.0"
-windows = "0.54"
+windows = "0.56"
 windows-sys = "0.48"
 winreg = "0.52"
 
diff --git a/crates/nu-command/src/debug/info.rs b/crates/nu-command/src/debug/info.rs
index da4689738e..2a680ae20d 100644
--- a/crates/nu-command/src/debug/info.rs
+++ b/crates/nu-command/src/debug/info.rs
@@ -101,7 +101,7 @@ fn all_columns(span: Span) -> Value {
         let environment = {
             let mut env_rec = Record::new();
             for val in p.environ() {
-                if let Some((key, value)) = val.split_once('=') {
+                if let Some((key, value)) = val.to_string_lossy().split_once('=') {
                     let is_env_var_a_list = {
                         {
                             #[cfg(target_family = "windows")]
@@ -146,8 +146,8 @@ fn all_columns(span: Span) -> Value {
                 "root" => root,
                 "cwd" => cwd,
                 "exe_path" => exe_path,
-                "command" => Value::string(p.cmd().join(" "), span),
-                "name" => Value::string(p.name(), span),
+                "command" => Value::string(p.cmd().join(std::ffi::OsStr::new(" ")).to_string_lossy(), span),
+                "name" => Value::string(p.name().to_string_lossy(), span),
                 "environment" => environment,
             },
             span,

From 299d199150e2974ad22e415afcde6fede14d768b Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 17 Oct 2024 16:14:01 -0500
Subject: [PATCH 0567/1072] allow `group-by` and `split-by` to work with other
 values (#14086)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

This PR updates `group-by` and `split-by` to allow other nushell Values
to be used, namely bools.

### Before
```nushell
❯ [false, false, true, false, true, false] | group-by | table -e
Error: nu::shell::cant_convert

  × Can't convert to string.
   ╭─[entry #1:1:2]
 1 │ [false, false, true, false, true, false] | group-by | table -e
   ·  ──┬──
   ·    ╰── can't convert bool to string
   ╰────
```
### After
```nushell
❯ [false, false, true, false, true, false] | group-by | table -e
╭───────┬───────────────╮
│       │ ╭───┬───────╮ │
│ false │ │ 0 │ false │ │
│       │ │ 1 │ false │ │
│       │ │ 2 │ false │ │
│       │ │ 3 │ false │ │
│       │ ╰───┴───────╯ │
│       │ ╭───┬──────╮  │
│ true  │ │ 0 │ true │  │
│       │ │ 1 │ true │  │
│       │ ╰───┴──────╯  │
╰───────┴───────────────╯
```

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/filters/group_by.rs    | 40 ++++++++++++---
 crates/nu-command/src/filters/split_by.rs    | 21 ++++----
 crates/nu-command/tests/commands/group_by.rs | 52 +++++++++-----------
 3 files changed, 70 insertions(+), 43 deletions(-)

diff --git a/crates/nu-command/src/filters/group_by.rs b/crates/nu-command/src/filters/group_by.rs
index 78789c606a..74a19c38e3 100644
--- a/crates/nu-command/src/filters/group_by.rs
+++ b/crates/nu-command/src/filters/group_by.rs
@@ -38,6 +38,14 @@ impl Command for GroupBy {
         "Splits a list or table into groups, and returns a record containing those groups."
     }
 
+    fn extra_description(&self) -> &str {
+        r#"the group-by command makes some assumptions:
+    - if the input data is not a string, the grouper will convert the key to string but the values will remain in their original format. e.g. with bools, "true" and true would be in the same group (see example).
+    - datetime is formatted based on your configuration setting. use `format date` to change the format.
+    - filesize is formatted based on your configuration setting. use `format filesize` to change the format.
+    - some nushell values are not supported, such as closures."#
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -114,6 +122,20 @@ impl Command for GroupBy {
                     }),
                 ])),
             },
+            Example {
+                description: "Group bools, whether they are strings or actual bools",
+                example: r#"[true "true" false "false"] | group-by"#,
+                result: Some(Value::test_record(record! {
+                    "true" => Value::test_list(vec![
+                        Value::test_bool(true),
+                        Value::test_string("true"),
+                    ]),
+                    "false" => Value::test_list(vec![
+                        Value::test_bool(false),
+                        Value::test_string("false"),
+                    ]),
+                })),
+            }
         ]
     }
 }
@@ -127,6 +149,7 @@ pub fn group_by(
     let head = call.head;
     let grouper: Option<Value> = call.opt(engine_state, stack, 0)?;
     let to_table = call.has_flag(engine_state, stack, "to-table")?;
+    let config = engine_state.get_config();
 
     let values: Vec<Value> = input.into_iter().collect();
     if values.is_empty() {
@@ -137,7 +160,7 @@ pub fn group_by(
         Some(grouper) => {
             let span = grouper.span();
             match grouper {
-                Value::CellPath { val, .. } => group_cell_path(val, values)?,
+                Value::CellPath { val, .. } => group_cell_path(val, values, config)?,
                 Value::Closure { val, .. } => {
                     group_closure(values, span, *val, engine_state, stack)?
                 }
@@ -149,7 +172,7 @@ pub fn group_by(
                 }
             }
         }
-        None => group_no_grouper(values)?,
+        None => group_no_grouper(values, config)?,
     };
 
     let value = if to_table {
@@ -164,6 +187,7 @@ pub fn group_by(
 fn group_cell_path(
     column_name: CellPath,
     values: Vec<Value>,
+    config: &nu_protocol::Config,
 ) -> Result<IndexMap<String, Vec<Value>>, ShellError> {
     let mut groups = IndexMap::<_, Vec<_>>::new();
 
@@ -176,18 +200,21 @@ fn group_cell_path(
             continue; // likely the result of a failed optional access, ignore this value
         }
 
-        let key = key.coerce_string()?;
+        let key = key.to_abbreviated_string(config);
         groups.entry(key).or_default().push(value);
     }
 
     Ok(groups)
 }
 
-fn group_no_grouper(values: Vec<Value>) -> Result<IndexMap<String, Vec<Value>>, ShellError> {
+fn group_no_grouper(
+    values: Vec<Value>,
+    config: &nu_protocol::Config,
+) -> Result<IndexMap<String, Vec<Value>>, ShellError> {
     let mut groups = IndexMap::<_, Vec<_>>::new();
 
     for value in values.into_iter() {
-        let key = value.coerce_string()?;
+        let key = value.to_abbreviated_string(config);
         groups.entry(key).or_default().push(value);
     }
 
@@ -203,12 +230,13 @@ fn group_closure(
 ) -> Result<IndexMap<String, Vec<Value>>, ShellError> {
     let mut groups = IndexMap::<_, Vec<_>>::new();
     let mut closure = ClosureEval::new(engine_state, stack, closure);
+    let config = engine_state.get_config();
 
     for value in values {
         let key = closure
             .run_with_value(value.clone())?
             .into_value(span)?
-            .coerce_into_string()?;
+            .to_abbreviated_string(config);
 
         groups.entry(key).or_default().push(value);
     }
diff --git a/crates/nu-command/src/filters/split_by.rs b/crates/nu-command/src/filters/split_by.rs
index 7a5898e608..217918cf91 100644
--- a/crates/nu-command/src/filters/split_by.rs
+++ b/crates/nu-command/src/filters/split_by.rs
@@ -84,16 +84,16 @@ pub fn split_by(
     input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
     let name = call.head;
-
+    let config = engine_state.get_config();
     let splitter: Option<Value> = call.opt(engine_state, stack, 0)?;
 
     match splitter {
         Some(v) => {
             let splitter = Some(Spanned {
-                item: v.coerce_into_string()?,
+                item: v.to_abbreviated_string(config),
                 span: name,
             });
-            Ok(split(splitter.as_ref(), input, name)?)
+            Ok(split(splitter.as_ref(), input, name, config)?)
         }
         // This uses the same format as the 'requires a column name' error in sort_utils.rs
         None => Err(ShellError::GenericError {
@@ -110,6 +110,7 @@ pub fn split(
     column_name: Option<&Spanned<String>>,
     values: PipelineData,
     span: Span,
+    config: &nu_protocol::Config,
 ) -> Result<PipelineData, ShellError> {
     let grouper = if let Some(column_name) = column_name {
         Grouper::ByColumn(Some(column_name.clone()))
@@ -127,7 +128,7 @@ pub fn split(
                 };
 
                 match group_key {
-                    Some(group_key) => Ok(group_key.coerce_string()?),
+                    Some(group_key) => Ok(group_key.to_abbreviated_string(config)),
                     None => Err(ShellError::CantFindColumn {
                         col_name: column_name.item.to_string(),
                         span: Some(column_name.span),
@@ -136,12 +137,12 @@ pub fn split(
                 }
             };
 
-            data_split(values, Some(&block), span)
+            data_split(values, Some(&block), span, config)
         }
         Grouper::ByColumn(None) => {
-            let block = move |_, row: &Value| row.coerce_string();
+            let block = move |_, row: &Value| Ok(row.to_abbreviated_string(config));
 
-            data_split(values, Some(&block), span)
+            data_split(values, Some(&block), span, config)
         }
     }
 }
@@ -151,6 +152,7 @@ fn data_group(
     values: &Value,
     grouper: Option<&dyn Fn(usize, &Value) -> Result<String, ShellError>>,
     span: Span,
+    config: &nu_protocol::Config,
 ) -> Result<Value, ShellError> {
     let mut groups: IndexMap<String, Vec<Value>> = IndexMap::new();
 
@@ -158,7 +160,7 @@ fn data_group(
         let group_key = if let Some(ref grouper) = grouper {
             grouper(idx, &value)
         } else {
-            value.coerce_string()
+            Ok(value.to_abbreviated_string(config))
         };
 
         let group = groups.entry(group_key?).or_default();
@@ -179,6 +181,7 @@ pub fn data_split(
     value: PipelineData,
     splitter: Option<&dyn Fn(usize, &Value) -> Result<String, ShellError>>,
     dst_span: Span,
+    config: &nu_protocol::Config,
 ) -> Result<PipelineData, ShellError> {
     let mut splits = indexmap::IndexMap::new();
 
@@ -188,7 +191,7 @@ pub fn data_split(
             match v {
                 Value::Record { val: grouped, .. } => {
                     for (outer_key, list) in grouped.into_owned() {
-                        match data_group(&list, splitter, span) {
+                        match data_group(&list, splitter, span, config) {
                             Ok(grouped_vals) => {
                                 if let Value::Record { val: sub, .. } = grouped_vals {
                                     for (inner_key, subset) in sub.into_owned() {
diff --git a/crates/nu-command/tests/commands/group_by.rs b/crates/nu-command/tests/commands/group_by.rs
index c6d0903c94..232bbcba0f 100644
--- a/crates/nu-command/tests/commands/group_by.rs
+++ b/crates/nu-command/tests/commands/group_by.rs
@@ -23,37 +23,33 @@ fn groups() {
 
 #[test]
 fn errors_if_given_unknown_column_name() {
-    let sample = r#"
-                {
-                    "nu": {
-                        "committers": [
-                            {"name": "Andrés N. Robalino"},
-                            {"name": "JT Turner"},
-                            {"name": "Yehuda Katz"}
-                        ],
-                        "releases": [
-                            {"version": "0.2"}
-                            {"version": "0.8"},
-                            {"version": "0.9999999"}
-                        ],
-                        "0xATYKARNU": [
-                            ["Th", "e", " "],
-                            ["BIG", " ", "UnO"],
-                            ["punto", "cero"]
-                        ]
-                    }
-                }
-            "#;
+    let sample = r#"{
+    "nu": {
+        "committers": [
+            {"name": "Andrés N. Robalino"},
+            {"name": "JT Turner"},
+            {"name": "Yehuda Katz"}
+        ],
+        "releases": [
+            {"version": "0.2"}
+            {"version": "0.8"},
+            {"version": "0.9999999"}
+        ],
+        "0xATYKARNU": [
+            ["Th", "e", " "],
+            ["BIG", " ", "UnO"],
+            ["punto", "cero"]
+        ]
+    }
+}
+"#;
 
     let actual = nu!(pipeline(&format!(
-        r#"
-                '{sample}'
-                | from json
-                | group-by {{|| get nu.releases.version }}
-            "#
+        r#"'{sample}'
+    | from json
+    | group-by {{|| get nu.releases.missing_column }}"#
     )));
-
-    assert!(actual.err.contains("can't convert list<string> to string"));
+    assert!(actual.err.contains("cannot find column"));
 }
 
 #[test]

From e735bd475f53b62e30a3e4a041e21462db63ac47 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 17 Oct 2024 20:16:38 -0500
Subject: [PATCH 0568/1072] add rendered and json error messages in try/catch
 (#14082)

# Description

This PR adds a couple more options for dealing with try/catch errors. It
adds a `json` version of the error and a `rendered` version of the
error. It also respects the error_style configuration point.

![image](https://github.com/user-attachments/assets/32574f07-f511-40c0-8b57-de5f6f13a9c4)


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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-cmd-lang/src/core_commands/try_.rs  |  6 ++++-
 crates/nu-command/tests/commands/try_.rs      | 17 ++++++++++++++
 crates/nu-engine/src/eval_ir.rs               | 17 ++++++++++++--
 crates/nu-protocol/Cargo.toml                 |  1 +
 .../nu-protocol/src/errors/labeled_error.rs   | 17 ++++++++++++++
 crates/nu-protocol/src/errors/shell_error.rs  | 22 +++++++++++++++++--
 6 files changed, 75 insertions(+), 5 deletions(-)

diff --git a/crates/nu-cmd-lang/src/core_commands/try_.rs b/crates/nu-cmd-lang/src/core_commands/try_.rs
index ccf0d41f3b..c7242550a7 100644
--- a/crates/nu-cmd-lang/src/core_commands/try_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/try_.rs
@@ -107,7 +107,11 @@ fn run_catch(
 
     if let Some(catch) = catch {
         stack.set_last_error(&error);
-        let error = error.into_value(span);
+        let fancy_errors = match engine_state.get_config().error_style {
+            nu_protocol::ErrorStyle::Fancy => true,
+            nu_protocol::ErrorStyle::Plain => false,
+        };
+        let error = error.into_value(span, fancy_errors);
         let block = engine_state.get_block(catch.block_id);
         // Put the error value in the positional closure var
         if let Some(var) = block.signature.get_positional(0) {
diff --git a/crates/nu-command/tests/commands/try_.rs b/crates/nu-command/tests/commands/try_.rs
index 487fd034b5..7e6952d2b9 100644
--- a/crates/nu-command/tests/commands/try_.rs
+++ b/crates/nu-command/tests/commands/try_.rs
@@ -126,3 +126,20 @@ fn prints_only_if_last_pipeline() {
     let actual = nu!("try { ['should not print'] | every 1 }; 'last value'");
     assert_eq!(actual.out, "last value");
 }
+
+#[test]
+fn get_error_columns() {
+    let actual = nu!(" try { non_existent_command } catch {|err| $err} | columns | to json -r");
+    assert_eq!(
+        actual.out,
+        "[\"msg\",\"debug\",\"raw\",\"rendered\",\"json\"]"
+    );
+}
+
+#[test]
+fn get_json_error() {
+    let actual = nu!("try { non_existent_command } catch {|err| $err} | get json | from json | update labels.span {{start: 0 end: 0}} | to json -r");
+    assert_eq!(
+        actual.out, "{\"msg\":\"External command failed\",\"labels\":[{\"text\":\"Command `non_existent_command` not found\",\"span\":{\"start\":0,\"end\":0}}],\"code\":\"nu::shell::external_command\",\"url\":null,\"help\":\"`non_existent_command` is neither a Nushell built-in or a known external command\",\"inner\":[]}"
+    );
+}
diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index 233b01c33f..8d809f182e 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -220,8 +220,17 @@ fn eval_ir_block_impl<D: DebugContext>(
             }
             Err(err) => {
                 if let Some(error_handler) = ctx.stack.error_handlers.pop(ctx.error_handler_base) {
+                    let fancy_errors = match ctx.engine_state.get_config().error_style {
+                        nu_protocol::ErrorStyle::Fancy => true,
+                        nu_protocol::ErrorStyle::Plain => false,
+                    };
                     // If an error handler is set, branch there
-                    prepare_error_handler(ctx, error_handler, Some(err.into_spanned(*span)));
+                    prepare_error_handler(
+                        ctx,
+                        error_handler,
+                        Some(err.into_spanned(*span)),
+                        fancy_errors,
+                    );
                     pc = error_handler.handler_index;
                 } else {
                     // If not, exit the block with the error
@@ -246,6 +255,7 @@ fn prepare_error_handler(
     ctx: &mut EvalContext<'_>,
     error_handler: ErrorHandler,
     error: Option<Spanned<ShellError>>,
+    fancy_errors: bool,
 ) {
     if let Some(reg_id) = error_handler.error_register {
         if let Some(error) = error {
@@ -254,7 +264,10 @@ fn prepare_error_handler(
             // Create the error value and put it in the register
             ctx.put_reg(
                 reg_id,
-                error.item.into_value(error.span).into_pipeline_data(),
+                error
+                    .item
+                    .into_value(error.span, fancy_errors)
+                    .into_pipeline_data(),
             );
         } else {
             // Set the register to empty
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 5556ce4755..e5deba5fa2 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -35,6 +35,7 @@ miette = { workspace = true, features = ["fancy-no-backtrace"] }
 num-format = { workspace = true }
 rmp-serde = { workspace = true, optional = true }
 serde = { workspace = true }
+serde_json = { workspace = true }
 thiserror = "1.0"
 typetag = "0.2"
 os_pipe = { workspace = true, features = ["io_safety"] }
diff --git a/crates/nu-protocol/src/errors/labeled_error.rs b/crates/nu-protocol/src/errors/labeled_error.rs
index c76a6c78dd..a207178415 100644
--- a/crates/nu-protocol/src/errors/labeled_error.rs
+++ b/crates/nu-protocol/src/errors/labeled_error.rs
@@ -139,6 +139,23 @@ impl LabeledError {
         self
     }
 
+    pub fn render_error_to_string(diag: impl miette::Diagnostic, fancy_errors: bool) -> String {
+        let theme = if fancy_errors {
+            miette::GraphicalTheme::unicode()
+        } else {
+            miette::GraphicalTheme::none()
+        };
+
+        let mut out = String::new();
+        miette::GraphicalReportHandler::new()
+            .with_width(80)
+            .with_theme(theme)
+            .render_report(&mut out, &diag)
+            .unwrap_or_default();
+
+        out
+    }
+
     /// Create a [`LabeledError`] from a type that implements [`miette::Diagnostic`].
     ///
     /// # Example
diff --git a/crates/nu-protocol/src/errors/shell_error.rs b/crates/nu-protocol/src/errors/shell_error.rs
index 0f609061d6..49ece8323a 100644
--- a/crates/nu-protocol/src/errors/shell_error.rs
+++ b/crates/nu-protocol/src/errors/shell_error.rs
@@ -1474,13 +1474,16 @@ impl ShellError {
         self.external_exit_code().map(|e| e.item).unwrap_or(1)
     }
 
-    pub fn into_value(self, span: Span) -> Value {
+    pub fn into_value(self, span: Span, fancy_errors: bool) -> Value {
         let exit_code = self.external_exit_code();
 
         let mut record = record! {
             "msg" => Value::string(self.to_string(), span),
             "debug" => Value::string(format!("{self:?}"), span),
-            "raw" => Value::error(self, span),
+            "raw" => Value::error(self.clone(), span),
+            // "labeled_error" => Value::string(LabeledError::from_diagnostic_and_render(self.clone()), span),
+            "rendered" => Value::string(ShellError::render_error_to_string(self.clone(), fancy_errors), span),
+            "json" => Value::string(serde_json::to_string(&self).expect("Could not serialize error"), span),
         };
 
         if let Some(code) = exit_code {
@@ -1499,6 +1502,21 @@ impl ShellError {
             span,
         )
     }
+    pub fn render_error_to_string(diag: impl miette::Diagnostic, fancy_errors: bool) -> String {
+        let theme = if fancy_errors {
+            miette::GraphicalTheme::unicode()
+        } else {
+            miette::GraphicalTheme::none()
+        };
+        let mut out = String::new();
+        miette::GraphicalReportHandler::new()
+            .with_width(80)
+            .with_theme(theme)
+            .render_report(&mut out, &diag)
+            .unwrap_or_default();
+
+        out
+    }
 }
 
 impl From<io::Error> for ShellError {

From 28b6db115aad135a83924a0bd84367f249b7c244 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Thu, 17 Oct 2024 19:51:14 -0700
Subject: [PATCH 0569/1072] Revert PRs for 0.99.1 patch (#14119)

# Description

Temporarily reverts PRs merged after the 0.99.1 bump.
---
 Cargo.lock                                    | 166 ++++++-----
 Cargo.toml                                    |  10 +-
 .../src/completions/operator_completions.rs   |   2 -
 crates/nu-cmd-lang/src/core_commands/try_.rs  |   6 +-
 .../nu-cmd-plugin/src/commands/plugin/add.rs  |   2 +-
 .../nu-cmd-plugin/src/commands/plugin/list.rs | 263 +++---------------
 .../nu-cmd-plugin/src/commands/plugin/rm.rs   |   2 +-
 crates/nu-cmd-plugin/src/util.rs              |  60 +---
 .../nu-command/src/conversions/into/value.rs  |   2 +-
 crates/nu-command/src/debug/info.rs           |   6 +-
 crates/nu-command/src/filters/group_by.rs     |  40 +--
 crates/nu-command/src/filters/split_by.rs     |  21 +-
 crates/nu-command/src/filters/uniq.rs         |   2 +-
 crates/nu-command/tests/commands/group_by.rs  |  52 ++--
 crates/nu-command/tests/commands/try_.rs      |  17 --
 crates/nu-engine/src/eval_ir.rs               |  17 +-
 crates/nu-parser/src/parser.rs                |  27 +-
 crates/nu-plugin/src/plugin/interface/mod.rs  |   3 +-
 crates/nu-protocol/Cargo.toml                 |   1 -
 crates/nu-protocol/src/ast/operator.rs        |   4 +-
 .../nu-protocol/src/errors/labeled_error.rs   |  17 --
 crates/nu-protocol/src/errors/shell_error.rs  |  22 +-
 crates/nu-protocol/src/module.rs              |  29 +-
 crates/nu-std/std/help/mod.nu                 |   6 +-
 .../src/dataframe/command/data/mod.rs         |   2 -
 .../src/dataframe/command/data/unnest.rs      | 145 ----------
 .../src/dataframe/command/data/unpivot.rs     |   4 +-
 rust-toolchain.toml                           |   2 +-
 tests/const_/mod.rs                           |  41 +--
 tests/plugin_persistence/mod.rs               |  22 +-
 tests/plugins/registry_file.rs                |  53 +---
 tests/repl/test_custom_commands.rs            |  18 +-
 tests/repl/test_modules.rs                    |   5 -
 33 files changed, 287 insertions(+), 782 deletions(-)
 delete mode 100644 crates/nu_plugin_polars/src/dataframe/command/data/unnest.rs

diff --git a/Cargo.lock b/Cargo.lock
index 424914e606..d6f1e35bd1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2611,6 +2611,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "malloc_buf"
+version = "0.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "markup5ever"
 version = "0.12.1"
@@ -3016,7 +3025,7 @@ dependencies = [
  "percent-encoding",
  "reedline",
  "rstest",
- "sysinfo 0.32.0",
+ "sysinfo",
  "tempfile",
  "unicode-segmentation",
  "uuid",
@@ -3178,7 +3187,7 @@ dependencies = [
  "serde_urlencoded",
  "serde_yaml",
  "sha2",
- "sysinfo 0.32.0",
+ "sysinfo",
  "tabled",
  "tempfile",
  "terminal_size",
@@ -3201,7 +3210,7 @@ dependencies = [
  "v_htmlescape",
  "wax",
  "which",
- "windows 0.56.0",
+ "windows 0.54.0",
  "winreg",
 ]
 
@@ -3347,7 +3356,7 @@ dependencies = [
  "rmp-serde",
  "serde",
  "serde_json",
- "windows 0.56.0",
+ "windows 0.54.0",
 ]
 
 [[package]]
@@ -3363,7 +3372,7 @@ dependencies = [
  "nu-utils",
  "serde",
  "typetag",
- "windows 0.56.0",
+ "windows 0.54.0",
 ]
 
 [[package]]
@@ -3468,8 +3477,8 @@ dependencies = [
  "ntapi",
  "once_cell",
  "procfs",
- "sysinfo 0.32.0",
- "windows 0.56.0",
+ "sysinfo",
+ "windows 0.54.0",
 ]
 
 [[package]]
@@ -3752,6 +3761,15 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "objc"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
+dependencies = [
+ "malloc_buf",
+]
+
 [[package]]
 name = "objc-sys"
 version = "0.3.5"
@@ -4711,7 +4729,7 @@ dependencies = [
  "rayon",
  "smartstring",
  "stacker",
- "sysinfo 0.30.13",
+ "sysinfo",
  "version_check",
 ]
 
@@ -6097,21 +6115,8 @@ dependencies = [
  "libc",
  "ntapi",
  "once_cell",
- "windows 0.52.0",
-]
-
-[[package]]
-name = "sysinfo"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b5ae3f4f7d64646c46c4cae4e3f01d1c5d255c7406fdd7c7f999a94e488791"
-dependencies = [
- "core-foundation-sys",
- "libc",
- "memchr",
- "ntapi",
  "rayon",
- "windows 0.56.0",
+ "windows 0.52.0",
 ]
 
 [[package]]
@@ -6437,19 +6442,18 @@ dependencies = [
 
 [[package]]
 name = "trash"
-version = "5.1.1"
+version = "3.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33caf2a9be1812a263a4bfce74d2de225fcde12ee7b77001361abd2b34ffdcc4"
+checksum = "c658458d46d9d5a153a3b5cdd88d8579ad50d4fb85d53961e4526c8fc7c55a57"
 dependencies = [
  "chrono",
  "libc",
  "log",
- "objc2",
- "objc2-foundation",
+ "objc",
  "once_cell",
  "scopeguard",
- "urlencoding",
- "windows 0.56.0",
+ "url",
+ "windows 0.44.0",
 ]
 
 [[package]]
@@ -6638,12 +6642,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "urlencoding"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
-
 [[package]]
 name = "utf-8"
 version = "0.7.6"
@@ -7085,6 +7083,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows"
+version = "0.44.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
 [[package]]
 name = "windows"
 version = "0.52.0"
@@ -7097,11 +7104,11 @@ dependencies = [
 
 [[package]]
 name = "windows"
-version = "0.56.0"
+version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132"
+checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
 dependencies = [
- "windows-core 0.56.0",
+ "windows-core 0.54.0",
  "windows-targets 0.52.6",
 ]
 
@@ -7116,38 +7123,14 @@ dependencies = [
 
 [[package]]
 name = "windows-core"
-version = "0.56.0"
+version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6"
+checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
 dependencies = [
- "windows-implement",
- "windows-interface",
  "windows-result",
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-implement"
-version = "0.56.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "windows-interface"
-version = "0.56.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
 [[package]]
 name = "windows-result"
 version = "0.1.2"
@@ -7197,6 +7180,21 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -7228,6 +7226,12 @@ dependencies = [
  "windows_x86_64_msvc 0.52.6",
 ]
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -7246,6 +7250,12 @@ version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -7264,6 +7274,12 @@ version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -7288,6 +7304,12 @@ version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -7306,6 +7328,12 @@ version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
@@ -7318,6 +7346,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
@@ -7336,6 +7370,12 @@ version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
diff --git a/Cargo.toml b/Cargo.toml
index f1052e229b..2dabcfd7bf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ homepage = "https://www.nushell.sh"
 license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
-rust-version = "1.80.1"
+rust-version = "1.79.0"
 version = "0.99.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -153,13 +153,13 @@ serde_yaml = "0.9"
 sha2 = "0.10"
 strip-ansi-escapes = "0.2.0"
 syn = "2.0"
-sysinfo = "0.32"
+sysinfo = "0.30"
 tabled = { version = "0.16.0", default-features = false }
 tempfile = "3.13"
 terminal_size = "0.3"
 titlecase = "2.0"
 toml = "0.8"
-trash = "5.1"
+trash = "3.3"
 umask = "2.1"
 unicode-segmentation = "1.12"
 unicode-width = "0.1"
@@ -176,7 +176,7 @@ uuid = "1.10.0"
 v_htmlescape = "0.15.0"
 wax = "0.6"
 which = "6.0.0"
-windows = "0.56"
+windows = "0.54"
 windows-sys = "0.48"
 winreg = "0.52"
 
@@ -320,4 +320,4 @@ bench = false
 # Run individual benchmarks like `cargo bench -- <regex>` e.g. `cargo bench -- parse`
 [[bench]]
 name = "benchmarks"
-harness = false
+harness = false
\ No newline at end of file
diff --git a/crates/nu-cli/src/completions/operator_completions.rs b/crates/nu-cli/src/completions/operator_completions.rs
index 460e7f590b..e9e95d0799 100644
--- a/crates/nu-cli/src/completions/operator_completions.rs
+++ b/crates/nu-cli/src/completions/operator_completions.rs
@@ -67,9 +67,7 @@ impl Completer for OperatorCompletion {
             ],
             Expr::String(_) => vec![
                 ("=~", "Contains regex match"),
-                ("like", "Contains regex match"),
                 ("!~", "Does not contain regex match"),
-                ("not-like", "Does not contain regex match"),
                 (
                     "++",
                     "Appends two lists, a list and a value, two strings, or two binary values",
diff --git a/crates/nu-cmd-lang/src/core_commands/try_.rs b/crates/nu-cmd-lang/src/core_commands/try_.rs
index c7242550a7..ccf0d41f3b 100644
--- a/crates/nu-cmd-lang/src/core_commands/try_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/try_.rs
@@ -107,11 +107,7 @@ fn run_catch(
 
     if let Some(catch) = catch {
         stack.set_last_error(&error);
-        let fancy_errors = match engine_state.get_config().error_style {
-            nu_protocol::ErrorStyle::Fancy => true,
-            nu_protocol::ErrorStyle::Plain => false,
-        };
-        let error = error.into_value(span, fancy_errors);
+        let error = error.into_value(span);
         let block = engine_state.get_block(catch.block_id);
         // Put the error value in the positional closure var
         if let Some(var) = block.signature.get_positional(0) {
diff --git a/crates/nu-cmd-plugin/src/commands/plugin/add.rs b/crates/nu-cmd-plugin/src/commands/plugin/add.rs
index c603ddbb8c..c12f486668 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/add.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/add.rs
@@ -119,7 +119,7 @@ apparent the next time `nu` is next launched with that plugin registry file.
         let metadata = interface.get_metadata()?;
         let commands = interface.get_signature()?;
 
-        modify_plugin_file(engine_state, stack, call.head, &custom_path, |contents| {
+        modify_plugin_file(engine_state, stack, call.head, custom_path, |contents| {
             // Update the file with the received metadata and signatures
             let item = PluginRegistryItem::new(plugin.identity(), metadata, commands);
             contents.upsert_plugin(item);
diff --git a/crates/nu-cmd-plugin/src/commands/plugin/list.rs b/crates/nu-cmd-plugin/src/commands/plugin/list.rs
index 367a532ef3..3fbf55b23c 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/list.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/list.rs
@@ -1,8 +1,5 @@
-use itertools::{EitherOrBoth, Itertools};
+use itertools::Itertools;
 use nu_engine::command_prelude::*;
-use nu_protocol::{IntoValue, PluginRegistryItemData};
-
-use crate::util::read_plugin_file;
 
 #[derive(Clone)]
 pub struct PluginList;
@@ -20,7 +17,7 @@ impl Command for PluginList {
                     [
                         ("name".into(), Type::String),
                         ("version".into(), Type::String),
-                        ("status".into(), Type::String),
+                        ("is_running".into(), Type::Bool),
                         ("pid".into(), Type::Int),
                         ("filename".into(), Type::String),
                         ("shell".into(), Type::String),
@@ -29,54 +26,11 @@ impl Command for PluginList {
                     .into(),
                 ),
             )
-            .named(
-                "plugin-config",
-                SyntaxShape::Filepath,
-                "Use a plugin registry file other than the one set in `$nu.plugin-path`",
-                None,
-            )
-            .switch(
-                "engine",
-                "Show info for plugins that are loaded into the engine only.",
-                Some('e'),
-            )
-            .switch(
-                "registry",
-                "Show info for plugins from the registry file only.",
-                Some('r'),
-            )
             .category(Category::Plugin)
     }
 
     fn description(&self) -> &str {
-        "List loaded and installed plugins."
-    }
-
-    fn extra_description(&self) -> &str {
-        r#"
-The `status` column will contain one of the following values:
-
-- `added`:    The plugin is present in the plugin registry file, but not in
-              the engine.
-- `loaded`:   The plugin is present both in the plugin registry file and in
-              the engine, but is not running.
-- `running`:  The plugin is currently running, and the `pid` column should
-              contain its process ID.
-- `modified`: The plugin state present in the plugin registry file is different
-              from the state in the engine.
-- `removed`:  The plugin is still loaded in the engine, but is not present in
-              the plugin registry file.
-- `invalid`:  The data in the plugin registry file couldn't be deserialized,
-              and the plugin most likely needs to be added again.
-
-`running` takes priority over any other status. Unless `--registry` is used
-or the plugin has not been loaded yet, the values of `version`, `filename`,
-`shell`, and `commands` reflect the values in the engine and not the ones in
-the plugin registry file.
-
-See also: `plugin use`
-"#
-        .trim()
+        "List installed plugins."
     }
 
     fn search_terms(&self) -> Vec<&str> {
@@ -91,7 +45,7 @@ See also: `plugin use`
                 result: Some(Value::test_list(vec![Value::test_record(record! {
                     "name" => Value::test_string("inc"),
                     "version" => Value::test_string(env!("CARGO_PKG_VERSION")),
-                    "status" => Value::test_string("running"),
+                    "is_running" => Value::test_bool(true),
                     "pid" => Value::test_int(106480),
                     "filename" => if cfg!(windows) {
                         Value::test_string(r"C:\nu\plugins\nu_plugin_inc.exe")
@@ -113,189 +67,58 @@ See also: `plugin use`
     fn run(
         &self,
         engine_state: &EngineState,
-        stack: &mut Stack,
+        _stack: &mut Stack,
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let custom_path = call.get_flag(engine_state, stack, "plugin-config")?;
-        let engine_mode = call.has_flag(engine_state, stack, "engine")?;
-        let registry_mode = call.has_flag(engine_state, stack, "registry")?;
+        let head = call.head;
 
-        let plugins_info = match (engine_mode, registry_mode) {
-            // --engine and --registry together is equivalent to the default.
-            (false, false) | (true, true) => {
-                if engine_state.plugin_path.is_some() || custom_path.is_some() {
-                    let plugins_in_engine = get_plugins_in_engine(engine_state);
-                    let plugins_in_registry =
-                        get_plugins_in_registry(engine_state, stack, call.head, &custom_path)?;
-                    merge_plugin_info(plugins_in_engine, plugins_in_registry)
-                } else {
-                    // Don't produce error when running nu --no-config-file
-                    get_plugins_in_engine(engine_state)
-                }
-            }
-            (true, false) => get_plugins_in_engine(engine_state),
-            (false, true) => get_plugins_in_registry(engine_state, stack, call.head, &custom_path)?,
-        };
+        // Group plugin decls by plugin identity
+        let decls = engine_state.plugin_decls().into_group_map_by(|decl| {
+            decl.plugin_identity()
+                .expect("plugin decl should have identity")
+        });
 
-        Ok(plugins_info.into_value(call.head).into_pipeline_data())
-    }
-}
-
-#[derive(Debug, Clone, IntoValue, PartialOrd, Ord, PartialEq, Eq)]
-struct PluginInfo {
-    name: String,
-    version: Option<String>,
-    status: PluginStatus,
-    pid: Option<u32>,
-    filename: String,
-    shell: Option<String>,
-    commands: Vec<String>,
-}
-
-#[derive(Debug, Clone, Copy, IntoValue, PartialOrd, Ord, PartialEq, Eq)]
-#[nu_value(rename_all = "snake_case")]
-enum PluginStatus {
-    Added,
-    Loaded,
-    Running,
-    Modified,
-    Removed,
-    Invalid,
-}
-
-fn get_plugins_in_engine(engine_state: &EngineState) -> Vec<PluginInfo> {
-    // Group plugin decls by plugin identity
-    let decls = engine_state.plugin_decls().into_group_map_by(|decl| {
-        decl.plugin_identity()
-            .expect("plugin decl should have identity")
-    });
-
-    // Build plugins list
-    engine_state
-        .plugins()
-        .iter()
-        .map(|plugin| {
+        // Build plugins list
+        let list = engine_state.plugins().iter().map(|plugin| {
             // Find commands that belong to the plugin
-            let commands = decls
-                .get(plugin.identity())
+            let commands = decls.get(plugin.identity())
                 .into_iter()
-                .flat_map(|decls| decls.iter().map(|decl| decl.name().to_owned()))
-                .sorted()
+                .flat_map(|decls| {
+                    decls.iter().map(|decl| Value::string(decl.name(), head))
+                })
                 .collect();
 
-            PluginInfo {
-                name: plugin.identity().name().into(),
-                version: plugin.metadata().and_then(|m| m.version),
-                status: if plugin.pid().is_some() {
-                    PluginStatus::Running
-                } else {
-                    PluginStatus::Loaded
-                },
-                pid: plugin.pid(),
-                filename: plugin.identity().filename().to_string_lossy().into_owned(),
-                shell: plugin
-                    .identity()
-                    .shell()
-                    .map(|path| path.to_string_lossy().into_owned()),
-                commands,
-            }
-        })
-        .sorted()
-        .collect()
-}
+            let pid = plugin
+                .pid()
+                .map(|p| Value::int(p as i64, head))
+                .unwrap_or(Value::nothing(head));
 
-fn get_plugins_in_registry(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    span: Span,
-    custom_path: &Option<Spanned<String>>,
-) -> Result<Vec<PluginInfo>, ShellError> {
-    let plugin_file_contents = read_plugin_file(engine_state, stack, span, custom_path)?;
+            let shell = plugin
+                .identity()
+                .shell()
+                .map(|s| Value::string(s.to_string_lossy(), head))
+                .unwrap_or(Value::nothing(head));
 
-    let plugins_info = plugin_file_contents
-        .plugins
-        .into_iter()
-        .map(|plugin| {
-            let mut info = PluginInfo {
-                name: plugin.name,
-                version: None,
-                status: PluginStatus::Added,
-                pid: None,
-                filename: plugin.filename.to_string_lossy().into_owned(),
-                shell: plugin.shell.map(|path| path.to_string_lossy().into_owned()),
-                commands: vec![],
+            let metadata = plugin.metadata();
+            let version = metadata
+                .and_then(|m| m.version)
+                .map(|s| Value::string(s, head))
+                .unwrap_or(Value::nothing(head));
+
+            let record = record! {
+                "name" => Value::string(plugin.identity().name(), head),
+                "version" => version,
+                "is_running" => Value::bool(plugin.is_running(), head),
+                "pid" => pid,
+                "filename" => Value::string(plugin.identity().filename().to_string_lossy(), head),
+                "shell" => shell,
+                "commands" => Value::list(commands, head),
             };
 
-            if let PluginRegistryItemData::Valid { metadata, commands } = plugin.data {
-                info.version = metadata.version;
-                info.commands = commands
-                    .into_iter()
-                    .map(|command| command.sig.name)
-                    .sorted()
-                    .collect();
-            } else {
-                info.status = PluginStatus::Invalid;
-            }
-            info
-        })
-        .sorted()
-        .collect();
+            Value::record(record, head)
+        }).collect();
 
-    Ok(plugins_info)
-}
-
-/// If no options are provided, the command loads from both the plugin list in the engine and what's
-/// in the registry file. We need to reconcile the two to set the proper states and make sure that
-/// new plugins that were added to the plugin registry file show up.
-fn merge_plugin_info(
-    from_engine: Vec<PluginInfo>,
-    from_registry: Vec<PluginInfo>,
-) -> Vec<PluginInfo> {
-    from_engine
-        .into_iter()
-        .merge_join_by(from_registry, |info_a, info_b| {
-            info_a.name.cmp(&info_b.name)
-        })
-        .map(|either_or_both| match either_or_both {
-            // Exists in the engine, but not in the registry file
-            EitherOrBoth::Left(info) => PluginInfo {
-                status: match info.status {
-                    PluginStatus::Running => info.status,
-                    // The plugin is not in the registry file, so it should be marked as `removed`
-                    _ => PluginStatus::Removed,
-                },
-                ..info
-            },
-            // Exists in the registry file, but not in the engine
-            EitherOrBoth::Right(info) => info,
-            // Exists in both
-            EitherOrBoth::Both(info_engine, info_registry) => PluginInfo {
-                status: match (info_engine.status, info_registry.status) {
-                    // Above all, `running` should be displayed if the plugin is running
-                    (PluginStatus::Running, _) => PluginStatus::Running,
-                    // `invalid` takes precedence over other states because the user probably wants
-                    // to fix it
-                    (_, PluginStatus::Invalid) => PluginStatus::Invalid,
-                    // Display `modified` if the state in the registry is different somehow
-                    _ if info_engine.is_modified(&info_registry) => PluginStatus::Modified,
-                    // Otherwise, `loaded` (it's not running)
-                    _ => PluginStatus::Loaded,
-                },
-                ..info_engine
-            },
-        })
-        .sorted()
-        .collect()
-}
-
-impl PluginInfo {
-    /// True if the plugin info shows some kind of change (other than status/pid) relative to the
-    /// other
-    fn is_modified(&self, other: &PluginInfo) -> bool {
-        self.name != other.name
-            || self.filename != other.filename
-            || self.shell != other.shell
-            || self.commands != other.commands
+        Ok(Value::list(list, head).into_pipeline_data())
     }
 }
diff --git a/crates/nu-cmd-plugin/src/commands/plugin/rm.rs b/crates/nu-cmd-plugin/src/commands/plugin/rm.rs
index a82b41524a..33557836c0 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/rm.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/rm.rs
@@ -87,7 +87,7 @@ fixed with `plugin add`.
 
         let filename = canonicalize_possible_filename_arg(engine_state, stack, &name.item);
 
-        modify_plugin_file(engine_state, stack, call.head, &custom_path, |contents| {
+        modify_plugin_file(engine_state, stack, call.head, custom_path, |contents| {
             if let Some(index) = contents
                 .plugins
                 .iter()
diff --git a/crates/nu-cmd-plugin/src/util.rs b/crates/nu-cmd-plugin/src/util.rs
index 80d1a766b4..6808a74a3c 100644
--- a/crates/nu-cmd-plugin/src/util.rs
+++ b/crates/nu-cmd-plugin/src/util.rs
@@ -6,17 +6,18 @@ use std::{
     path::PathBuf,
 };
 
-fn get_plugin_registry_file_path(
+pub(crate) fn modify_plugin_file(
     engine_state: &EngineState,
     stack: &mut Stack,
     span: Span,
-    custom_path: &Option<Spanned<String>>,
-) -> Result<PathBuf, ShellError> {
+    custom_path: Option<Spanned<String>>,
+    operate: impl FnOnce(&mut PluginRegistryFile) -> Result<(), ShellError>,
+) -> Result<(), ShellError> {
     #[allow(deprecated)]
     let cwd = current_dir(engine_state, stack)?;
 
-    if let Some(ref custom_path) = custom_path {
-        Ok(nu_path::expand_path_with(&custom_path.item, cwd, true))
+    let plugin_registry_file_path = if let Some(ref custom_path) = custom_path {
+        nu_path::expand_path_with(&custom_path.item, cwd, true)
     } else {
         engine_state
             .plugin_path
@@ -27,53 +28,8 @@ fn get_plugin_registry_file_path(
                 span: Some(span),
                 help: Some("you may be running `nu` with --no-config-file".into()),
                 inner: vec![],
-            })
-    }
-}
-
-pub(crate) fn read_plugin_file(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    span: Span,
-    custom_path: &Option<Spanned<String>>,
-) -> Result<PluginRegistryFile, ShellError> {
-    let plugin_registry_file_path =
-        get_plugin_registry_file_path(engine_state, stack, span, custom_path)?;
-
-    let file_span = custom_path.as_ref().map(|p| p.span).unwrap_or(span);
-
-    // Try to read the plugin file if it exists
-    if fs::metadata(&plugin_registry_file_path).is_ok_and(|m| m.len() > 0) {
-        PluginRegistryFile::read_from(
-            File::open(&plugin_registry_file_path).map_err(|err| ShellError::IOErrorSpanned {
-                msg: format!(
-                    "failed to read `{}`: {}",
-                    plugin_registry_file_path.display(),
-                    err
-                ),
-                span: file_span,
-            })?,
-            Some(file_span),
-        )
-    } else if let Some(path) = custom_path {
-        Err(ShellError::FileNotFound {
-            file: path.item.clone(),
-            span: path.span,
-        })
-    } else {
-        Ok(PluginRegistryFile::default())
-    }
-}
-
-pub(crate) fn modify_plugin_file(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    span: Span,
-    custom_path: &Option<Spanned<String>>,
-    operate: impl FnOnce(&mut PluginRegistryFile) -> Result<(), ShellError>,
-) -> Result<(), ShellError> {
-    let plugin_registry_file_path =
-        get_plugin_registry_file_path(engine_state, stack, span, custom_path)?;
+            })?
+    };
 
     let file_span = custom_path.as_ref().map(|p| p.span).unwrap_or(span);
 
diff --git a/crates/nu-command/src/conversions/into/value.rs b/crates/nu-command/src/conversions/into/value.rs
index 99b1daf4b7..52e5ab339c 100644
--- a/crates/nu-command/src/conversions/into/value.rs
+++ b/crates/nu-command/src/conversions/into/value.rs
@@ -18,7 +18,7 @@ impl Command for IntoValue {
             .input_output_types(vec![(Type::table(), Type::table())])
             .named(
                 "columns",
-                SyntaxShape::List(Box::new(SyntaxShape::Any)),
+                SyntaxShape::Table(vec![]),
                 "list of columns to update",
                 Some('c'),
             )
diff --git a/crates/nu-command/src/debug/info.rs b/crates/nu-command/src/debug/info.rs
index 2a680ae20d..da4689738e 100644
--- a/crates/nu-command/src/debug/info.rs
+++ b/crates/nu-command/src/debug/info.rs
@@ -101,7 +101,7 @@ fn all_columns(span: Span) -> Value {
         let environment = {
             let mut env_rec = Record::new();
             for val in p.environ() {
-                if let Some((key, value)) = val.to_string_lossy().split_once('=') {
+                if let Some((key, value)) = val.split_once('=') {
                     let is_env_var_a_list = {
                         {
                             #[cfg(target_family = "windows")]
@@ -146,8 +146,8 @@ fn all_columns(span: Span) -> Value {
                 "root" => root,
                 "cwd" => cwd,
                 "exe_path" => exe_path,
-                "command" => Value::string(p.cmd().join(std::ffi::OsStr::new(" ")).to_string_lossy(), span),
-                "name" => Value::string(p.name().to_string_lossy(), span),
+                "command" => Value::string(p.cmd().join(" "), span),
+                "name" => Value::string(p.name(), span),
                 "environment" => environment,
             },
             span,
diff --git a/crates/nu-command/src/filters/group_by.rs b/crates/nu-command/src/filters/group_by.rs
index 74a19c38e3..78789c606a 100644
--- a/crates/nu-command/src/filters/group_by.rs
+++ b/crates/nu-command/src/filters/group_by.rs
@@ -38,14 +38,6 @@ impl Command for GroupBy {
         "Splits a list or table into groups, and returns a record containing those groups."
     }
 
-    fn extra_description(&self) -> &str {
-        r#"the group-by command makes some assumptions:
-    - if the input data is not a string, the grouper will convert the key to string but the values will remain in their original format. e.g. with bools, "true" and true would be in the same group (see example).
-    - datetime is formatted based on your configuration setting. use `format date` to change the format.
-    - filesize is formatted based on your configuration setting. use `format filesize` to change the format.
-    - some nushell values are not supported, such as closures."#
-    }
-
     fn run(
         &self,
         engine_state: &EngineState,
@@ -122,20 +114,6 @@ impl Command for GroupBy {
                     }),
                 ])),
             },
-            Example {
-                description: "Group bools, whether they are strings or actual bools",
-                example: r#"[true "true" false "false"] | group-by"#,
-                result: Some(Value::test_record(record! {
-                    "true" => Value::test_list(vec![
-                        Value::test_bool(true),
-                        Value::test_string("true"),
-                    ]),
-                    "false" => Value::test_list(vec![
-                        Value::test_bool(false),
-                        Value::test_string("false"),
-                    ]),
-                })),
-            }
         ]
     }
 }
@@ -149,7 +127,6 @@ pub fn group_by(
     let head = call.head;
     let grouper: Option<Value> = call.opt(engine_state, stack, 0)?;
     let to_table = call.has_flag(engine_state, stack, "to-table")?;
-    let config = engine_state.get_config();
 
     let values: Vec<Value> = input.into_iter().collect();
     if values.is_empty() {
@@ -160,7 +137,7 @@ pub fn group_by(
         Some(grouper) => {
             let span = grouper.span();
             match grouper {
-                Value::CellPath { val, .. } => group_cell_path(val, values, config)?,
+                Value::CellPath { val, .. } => group_cell_path(val, values)?,
                 Value::Closure { val, .. } => {
                     group_closure(values, span, *val, engine_state, stack)?
                 }
@@ -172,7 +149,7 @@ pub fn group_by(
                 }
             }
         }
-        None => group_no_grouper(values, config)?,
+        None => group_no_grouper(values)?,
     };
 
     let value = if to_table {
@@ -187,7 +164,6 @@ pub fn group_by(
 fn group_cell_path(
     column_name: CellPath,
     values: Vec<Value>,
-    config: &nu_protocol::Config,
 ) -> Result<IndexMap<String, Vec<Value>>, ShellError> {
     let mut groups = IndexMap::<_, Vec<_>>::new();
 
@@ -200,21 +176,18 @@ fn group_cell_path(
             continue; // likely the result of a failed optional access, ignore this value
         }
 
-        let key = key.to_abbreviated_string(config);
+        let key = key.coerce_string()?;
         groups.entry(key).or_default().push(value);
     }
 
     Ok(groups)
 }
 
-fn group_no_grouper(
-    values: Vec<Value>,
-    config: &nu_protocol::Config,
-) -> Result<IndexMap<String, Vec<Value>>, ShellError> {
+fn group_no_grouper(values: Vec<Value>) -> Result<IndexMap<String, Vec<Value>>, ShellError> {
     let mut groups = IndexMap::<_, Vec<_>>::new();
 
     for value in values.into_iter() {
-        let key = value.to_abbreviated_string(config);
+        let key = value.coerce_string()?;
         groups.entry(key).or_default().push(value);
     }
 
@@ -230,13 +203,12 @@ fn group_closure(
 ) -> Result<IndexMap<String, Vec<Value>>, ShellError> {
     let mut groups = IndexMap::<_, Vec<_>>::new();
     let mut closure = ClosureEval::new(engine_state, stack, closure);
-    let config = engine_state.get_config();
 
     for value in values {
         let key = closure
             .run_with_value(value.clone())?
             .into_value(span)?
-            .to_abbreviated_string(config);
+            .coerce_into_string()?;
 
         groups.entry(key).or_default().push(value);
     }
diff --git a/crates/nu-command/src/filters/split_by.rs b/crates/nu-command/src/filters/split_by.rs
index 217918cf91..7a5898e608 100644
--- a/crates/nu-command/src/filters/split_by.rs
+++ b/crates/nu-command/src/filters/split_by.rs
@@ -84,16 +84,16 @@ pub fn split_by(
     input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
     let name = call.head;
-    let config = engine_state.get_config();
+
     let splitter: Option<Value> = call.opt(engine_state, stack, 0)?;
 
     match splitter {
         Some(v) => {
             let splitter = Some(Spanned {
-                item: v.to_abbreviated_string(config),
+                item: v.coerce_into_string()?,
                 span: name,
             });
-            Ok(split(splitter.as_ref(), input, name, config)?)
+            Ok(split(splitter.as_ref(), input, name)?)
         }
         // This uses the same format as the 'requires a column name' error in sort_utils.rs
         None => Err(ShellError::GenericError {
@@ -110,7 +110,6 @@ pub fn split(
     column_name: Option<&Spanned<String>>,
     values: PipelineData,
     span: Span,
-    config: &nu_protocol::Config,
 ) -> Result<PipelineData, ShellError> {
     let grouper = if let Some(column_name) = column_name {
         Grouper::ByColumn(Some(column_name.clone()))
@@ -128,7 +127,7 @@ pub fn split(
                 };
 
                 match group_key {
-                    Some(group_key) => Ok(group_key.to_abbreviated_string(config)),
+                    Some(group_key) => Ok(group_key.coerce_string()?),
                     None => Err(ShellError::CantFindColumn {
                         col_name: column_name.item.to_string(),
                         span: Some(column_name.span),
@@ -137,12 +136,12 @@ pub fn split(
                 }
             };
 
-            data_split(values, Some(&block), span, config)
+            data_split(values, Some(&block), span)
         }
         Grouper::ByColumn(None) => {
-            let block = move |_, row: &Value| Ok(row.to_abbreviated_string(config));
+            let block = move |_, row: &Value| row.coerce_string();
 
-            data_split(values, Some(&block), span, config)
+            data_split(values, Some(&block), span)
         }
     }
 }
@@ -152,7 +151,6 @@ fn data_group(
     values: &Value,
     grouper: Option<&dyn Fn(usize, &Value) -> Result<String, ShellError>>,
     span: Span,
-    config: &nu_protocol::Config,
 ) -> Result<Value, ShellError> {
     let mut groups: IndexMap<String, Vec<Value>> = IndexMap::new();
 
@@ -160,7 +158,7 @@ fn data_group(
         let group_key = if let Some(ref grouper) = grouper {
             grouper(idx, &value)
         } else {
-            Ok(value.to_abbreviated_string(config))
+            value.coerce_string()
         };
 
         let group = groups.entry(group_key?).or_default();
@@ -181,7 +179,6 @@ pub fn data_split(
     value: PipelineData,
     splitter: Option<&dyn Fn(usize, &Value) -> Result<String, ShellError>>,
     dst_span: Span,
-    config: &nu_protocol::Config,
 ) -> Result<PipelineData, ShellError> {
     let mut splits = indexmap::IndexMap::new();
 
@@ -191,7 +188,7 @@ pub fn data_split(
             match v {
                 Value::Record { val: grouped, .. } => {
                     for (outer_key, list) in grouped.into_owned() {
-                        match data_group(&list, splitter, span, config) {
+                        match data_group(&list, splitter, span) {
                             Ok(grouped_vals) => {
                                 if let Value::Record { val: sub, .. } = grouped_vals {
                                     for (inner_key, subset) in sub.into_owned() {
diff --git a/crates/nu-command/src/filters/uniq.rs b/crates/nu-command/src/filters/uniq.rs
index 3a82e73aa1..a22d62b89e 100644
--- a/crates/nu-command/src/filters/uniq.rs
+++ b/crates/nu-command/src/filters/uniq.rs
@@ -46,7 +46,7 @@ impl Command for Uniq {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["distinct", "deduplicate", "count"]
+        vec!["distinct", "deduplicate"]
     }
 
     fn run(
diff --git a/crates/nu-command/tests/commands/group_by.rs b/crates/nu-command/tests/commands/group_by.rs
index 232bbcba0f..c6d0903c94 100644
--- a/crates/nu-command/tests/commands/group_by.rs
+++ b/crates/nu-command/tests/commands/group_by.rs
@@ -23,33 +23,37 @@ fn groups() {
 
 #[test]
 fn errors_if_given_unknown_column_name() {
-    let sample = r#"{
-    "nu": {
-        "committers": [
-            {"name": "Andrés N. Robalino"},
-            {"name": "JT Turner"},
-            {"name": "Yehuda Katz"}
-        ],
-        "releases": [
-            {"version": "0.2"}
-            {"version": "0.8"},
-            {"version": "0.9999999"}
-        ],
-        "0xATYKARNU": [
-            ["Th", "e", " "],
-            ["BIG", " ", "UnO"],
-            ["punto", "cero"]
-        ]
-    }
-}
-"#;
+    let sample = r#"
+                {
+                    "nu": {
+                        "committers": [
+                            {"name": "Andrés N. Robalino"},
+                            {"name": "JT Turner"},
+                            {"name": "Yehuda Katz"}
+                        ],
+                        "releases": [
+                            {"version": "0.2"}
+                            {"version": "0.8"},
+                            {"version": "0.9999999"}
+                        ],
+                        "0xATYKARNU": [
+                            ["Th", "e", " "],
+                            ["BIG", " ", "UnO"],
+                            ["punto", "cero"]
+                        ]
+                    }
+                }
+            "#;
 
     let actual = nu!(pipeline(&format!(
-        r#"'{sample}'
-    | from json
-    | group-by {{|| get nu.releases.missing_column }}"#
+        r#"
+                '{sample}'
+                | from json
+                | group-by {{|| get nu.releases.version }}
+            "#
     )));
-    assert!(actual.err.contains("cannot find column"));
+
+    assert!(actual.err.contains("can't convert list<string> to string"));
 }
 
 #[test]
diff --git a/crates/nu-command/tests/commands/try_.rs b/crates/nu-command/tests/commands/try_.rs
index 7e6952d2b9..487fd034b5 100644
--- a/crates/nu-command/tests/commands/try_.rs
+++ b/crates/nu-command/tests/commands/try_.rs
@@ -126,20 +126,3 @@ fn prints_only_if_last_pipeline() {
     let actual = nu!("try { ['should not print'] | every 1 }; 'last value'");
     assert_eq!(actual.out, "last value");
 }
-
-#[test]
-fn get_error_columns() {
-    let actual = nu!(" try { non_existent_command } catch {|err| $err} | columns | to json -r");
-    assert_eq!(
-        actual.out,
-        "[\"msg\",\"debug\",\"raw\",\"rendered\",\"json\"]"
-    );
-}
-
-#[test]
-fn get_json_error() {
-    let actual = nu!("try { non_existent_command } catch {|err| $err} | get json | from json | update labels.span {{start: 0 end: 0}} | to json -r");
-    assert_eq!(
-        actual.out, "{\"msg\":\"External command failed\",\"labels\":[{\"text\":\"Command `non_existent_command` not found\",\"span\":{\"start\":0,\"end\":0}}],\"code\":\"nu::shell::external_command\",\"url\":null,\"help\":\"`non_existent_command` is neither a Nushell built-in or a known external command\",\"inner\":[]}"
-    );
-}
diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index 8d809f182e..233b01c33f 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -220,17 +220,8 @@ fn eval_ir_block_impl<D: DebugContext>(
             }
             Err(err) => {
                 if let Some(error_handler) = ctx.stack.error_handlers.pop(ctx.error_handler_base) {
-                    let fancy_errors = match ctx.engine_state.get_config().error_style {
-                        nu_protocol::ErrorStyle::Fancy => true,
-                        nu_protocol::ErrorStyle::Plain => false,
-                    };
                     // If an error handler is set, branch there
-                    prepare_error_handler(
-                        ctx,
-                        error_handler,
-                        Some(err.into_spanned(*span)),
-                        fancy_errors,
-                    );
+                    prepare_error_handler(ctx, error_handler, Some(err.into_spanned(*span)));
                     pc = error_handler.handler_index;
                 } else {
                     // If not, exit the block with the error
@@ -255,7 +246,6 @@ fn prepare_error_handler(
     ctx: &mut EvalContext<'_>,
     error_handler: ErrorHandler,
     error: Option<Spanned<ShellError>>,
-    fancy_errors: bool,
 ) {
     if let Some(reg_id) = error_handler.error_register {
         if let Some(error) = error {
@@ -264,10 +254,7 @@ fn prepare_error_handler(
             // Create the error value and put it in the register
             ctx.put_reg(
                 reg_id,
-                error
-                    .item
-                    .into_value(error.span, fancy_errors)
-                    .into_pipeline_data(),
+                error.item.into_value(error.span).into_pipeline_data(),
             );
         } else {
             // Set the register to empty
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index d2ed11188a..232fc50b3d 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -1067,27 +1067,30 @@ pub fn parse_internal_call(
                     if let Some(arg_shape) = flag.arg {
                         if let Some(arg) = spans.get(spans_idx + 1) {
                             let arg = parse_value(working_set, *arg, &arg_shape);
-                            let (arg_name, val_expression) = ensure_flag_arg_type(
-                                working_set,
-                                flag.long.clone(),
-                                arg.clone(),
-                                &arg_shape,
-                                spans[spans_idx],
-                            );
 
                             if flag.long.is_empty() {
                                 if let Some(short) = flag.short {
                                     call.add_named((
-                                        arg_name,
+                                        Spanned {
+                                            item: String::new(),
+                                            span: spans[spans_idx],
+                                        },
                                         Some(Spanned {
                                             item: short.to_string(),
                                             span: spans[spans_idx],
                                         }),
-                                        Some(val_expression),
+                                        Some(arg),
                                     ));
                                 }
                             } else {
-                                call.add_named((arg_name, None, Some(val_expression)));
+                                call.add_named((
+                                    Spanned {
+                                        item: flag.long.clone(),
+                                        span: spans[spans_idx],
+                                    },
+                                    None,
+                                    Some(arg),
+                                ));
                             }
                             spans_idx += 1;
                         } else {
@@ -5018,8 +5021,8 @@ pub fn parse_operator(working_set: &mut StateWorkingSet, span: Span) -> Expressi
         b"<=" => Operator::Comparison(Comparison::LessThanOrEqual),
         b">" => Operator::Comparison(Comparison::GreaterThan),
         b">=" => Operator::Comparison(Comparison::GreaterThanOrEqual),
-        b"=~" | b"like" => Operator::Comparison(Comparison::RegexMatch),
-        b"!~" | b"not-like" => Operator::Comparison(Comparison::NotRegexMatch),
+        b"=~" => Operator::Comparison(Comparison::RegexMatch),
+        b"!~" => Operator::Comparison(Comparison::NotRegexMatch),
         b"+" => Operator::Math(Math::Plus),
         b"++" => Operator::Math(Math::Append),
         b"-" => Operator::Math(Math::Minus),
diff --git a/crates/nu-plugin/src/plugin/interface/mod.rs b/crates/nu-plugin/src/plugin/interface/mod.rs
index be7b2e0dfc..fc40b9c732 100644
--- a/crates/nu-plugin/src/plugin/interface/mod.rs
+++ b/crates/nu-plugin/src/plugin/interface/mod.rs
@@ -1091,7 +1091,8 @@ fn set_pgrp_from_enter_foreground(pgrp: i64) -> Result<(), ShellError> {
 fn set_pgrp_from_enter_foreground(_pgrp: i64) -> Result<(), ShellError> {
     Err(ShellError::NushellFailed {
         msg: concat!(
-            "EnterForeground asked plugin to join process group, but this is not supported on non UNIX platforms.",
+            "EnterForeground asked plugin to join process group, but not supported on ",
+            cfg!(target_os)
         )
         .into(),
     })
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index e5deba5fa2..5556ce4755 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -35,7 +35,6 @@ miette = { workspace = true, features = ["fancy-no-backtrace"] }
 num-format = { workspace = true }
 rmp-serde = { workspace = true, optional = true }
 serde = { workspace = true }
-serde_json = { workspace = true }
 thiserror = "1.0"
 typetag = "0.2"
 os_pipe = { workspace = true, features = ["io_safety"] }
diff --git a/crates/nu-protocol/src/ast/operator.rs b/crates/nu-protocol/src/ast/operator.rs
index 8c2e59d93a..713c6c0060 100644
--- a/crates/nu-protocol/src/ast/operator.rs
+++ b/crates/nu-protocol/src/ast/operator.rs
@@ -115,8 +115,8 @@ impl Display for Operator {
             Operator::Comparison(Comparison::NotEqual) => write!(f, "!="),
             Operator::Comparison(Comparison::LessThan) => write!(f, "<"),
             Operator::Comparison(Comparison::GreaterThan) => write!(f, ">"),
-            Operator::Comparison(Comparison::RegexMatch) => write!(f, "=~ or like"),
-            Operator::Comparison(Comparison::NotRegexMatch) => write!(f, "!~ or not-like"),
+            Operator::Comparison(Comparison::RegexMatch) => write!(f, "=~"),
+            Operator::Comparison(Comparison::NotRegexMatch) => write!(f, "!~"),
             Operator::Comparison(Comparison::LessThanOrEqual) => write!(f, "<="),
             Operator::Comparison(Comparison::GreaterThanOrEqual) => write!(f, ">="),
             Operator::Comparison(Comparison::StartsWith) => write!(f, "starts-with"),
diff --git a/crates/nu-protocol/src/errors/labeled_error.rs b/crates/nu-protocol/src/errors/labeled_error.rs
index a207178415..c76a6c78dd 100644
--- a/crates/nu-protocol/src/errors/labeled_error.rs
+++ b/crates/nu-protocol/src/errors/labeled_error.rs
@@ -139,23 +139,6 @@ impl LabeledError {
         self
     }
 
-    pub fn render_error_to_string(diag: impl miette::Diagnostic, fancy_errors: bool) -> String {
-        let theme = if fancy_errors {
-            miette::GraphicalTheme::unicode()
-        } else {
-            miette::GraphicalTheme::none()
-        };
-
-        let mut out = String::new();
-        miette::GraphicalReportHandler::new()
-            .with_width(80)
-            .with_theme(theme)
-            .render_report(&mut out, &diag)
-            .unwrap_or_default();
-
-        out
-    }
-
     /// Create a [`LabeledError`] from a type that implements [`miette::Diagnostic`].
     ///
     /// # Example
diff --git a/crates/nu-protocol/src/errors/shell_error.rs b/crates/nu-protocol/src/errors/shell_error.rs
index 49ece8323a..0f609061d6 100644
--- a/crates/nu-protocol/src/errors/shell_error.rs
+++ b/crates/nu-protocol/src/errors/shell_error.rs
@@ -1474,16 +1474,13 @@ impl ShellError {
         self.external_exit_code().map(|e| e.item).unwrap_or(1)
     }
 
-    pub fn into_value(self, span: Span, fancy_errors: bool) -> Value {
+    pub fn into_value(self, span: Span) -> Value {
         let exit_code = self.external_exit_code();
 
         let mut record = record! {
             "msg" => Value::string(self.to_string(), span),
             "debug" => Value::string(format!("{self:?}"), span),
-            "raw" => Value::error(self.clone(), span),
-            // "labeled_error" => Value::string(LabeledError::from_diagnostic_and_render(self.clone()), span),
-            "rendered" => Value::string(ShellError::render_error_to_string(self.clone(), fancy_errors), span),
-            "json" => Value::string(serde_json::to_string(&self).expect("Could not serialize error"), span),
+            "raw" => Value::error(self, span),
         };
 
         if let Some(code) = exit_code {
@@ -1502,21 +1499,6 @@ impl ShellError {
             span,
         )
     }
-    pub fn render_error_to_string(diag: impl miette::Diagnostic, fancy_errors: bool) -> String {
-        let theme = if fancy_errors {
-            miette::GraphicalTheme::unicode()
-        } else {
-            miette::GraphicalTheme::none()
-        };
-        let mut out = String::new();
-        miette::GraphicalReportHandler::new()
-            .with_width(80)
-            .with_theme(theme)
-            .render_report(&mut out, &diag)
-            .unwrap_or_default();
-
-        out
-    }
 }
 
 impl From<io::Error> for ShellError {
diff --git a/crates/nu-protocol/src/module.rs b/crates/nu-protocol/src/module.rs
index 02bac131dc..6b4aec0c60 100644
--- a/crates/nu-protocol/src/module.rs
+++ b/crates/nu-protocol/src/module.rs
@@ -161,25 +161,20 @@ impl Module {
             }
 
             let span = self.span.unwrap_or(backup_span);
-
-            // only needs to bring `$module` with a record value if it defines any constants.
-            let constants = if const_rows.is_empty() {
-                vec![]
-            } else {
-                vec![(
-                    final_name.clone(),
-                    Value::record(
-                        const_rows
-                            .into_iter()
-                            .map(|(name, val)| (String::from_utf8_lossy(&name).to_string(), val))
-                            .collect(),
-                        span,
-                    ),
-                )]
-            };
+            let const_record = Value::record(
+                const_rows
+                    .into_iter()
+                    .map(|(name, val)| (String::from_utf8_lossy(&name).to_string(), val))
+                    .collect(),
+                span,
+            );
 
             return (
-                ResolvedImportPattern::new(decls, vec![(final_name.clone(), self_id)], constants),
+                ResolvedImportPattern::new(
+                    decls,
+                    vec![(final_name.clone(), self_id)],
+                    vec![(final_name, const_record)],
+                ),
                 errors,
             );
         };
diff --git a/crates/nu-std/std/help/mod.nu b/crates/nu-std/std/help/mod.nu
index 089bbff7f8..d608ae8bcb 100644
--- a/crates/nu-std/std/help/mod.nu
+++ b/crates/nu-std/std/help/mod.nu
@@ -47,8 +47,8 @@ def get-all-operators [] { return [
     [Comparison, <=, LessThanOrEqual, "Checks if a value is less than or equal to another.", 80]
     [Comparison, >, GreaterThan, "Checks if a value is greater than another.", 80]
     [Comparison, >=, GreaterThanOrEqual, "Checks if a value is greater than or equal to another.", 80]
-    [Comparison, '=~ or like', RegexMatch, "Checks if a value matches a regular expression.", 80]
-    [Comparison, '!~ or not-like', NotRegexMatch, "Checks if a value does not match a regular expression.", 80]
+    [Comparison, =~, RegexMatch, "Checks if a value matches a regular expression.", 80]
+    [Comparison, !~, NotRegexMatch, "Checks if a value does not match a regular expression.", 80]
     [Comparison, in, In, "Checks if a value is in a list or string.", 80]
     [Comparison, not-in, NotIn, "Checks if a value is not in a list or string.", 80]
     [Comparison, starts-with, StartsWith, "Checks if a string starts with another.", 80]
@@ -771,7 +771,7 @@ You can also learn more at (ansi default_italic)(ansi light_cyan_underline)https
 
     let modules = (try { modules $target_item --find $find })
     if not ($modules | is-empty) { return $modules }
-
+    
     if ($find | is-not-empty) {
         print -e $"No help results found mentioning: ($find)"
         return []
diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/mod.rs b/crates/nu_plugin_polars/src/dataframe/command/data/mod.rs
index 0857fff1da..058b277526 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/mod.rs
@@ -32,7 +32,6 @@ mod sort_by_expr;
 pub mod sql_context;
 pub mod sql_expr;
 mod take;
-mod unnest;
 mod unpivot;
 mod with_column;
 use filter::LazyFilter;
@@ -110,6 +109,5 @@ pub(crate) fn data_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin
         Box::new(LazyFilter),
         Box::new(Shift),
         Box::new(Unique),
-        Box::new(unnest::UnnestDF),
     ]
 }
diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/unnest.rs b/crates/nu_plugin_polars/src/dataframe/command/data/unnest.rs
deleted file mode 100644
index 585bb28fc5..0000000000
--- a/crates/nu_plugin_polars/src/dataframe/command/data/unnest.rs
+++ /dev/null
@@ -1,145 +0,0 @@
-use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
-use nu_protocol::{
-    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape,
-};
-use polars::df;
-
-use crate::{
-    values::{CustomValueSupport, NuLazyFrame, PolarsPluginObject},
-    PolarsPlugin,
-};
-
-use crate::values::NuDataFrame;
-
-#[derive(Clone)]
-pub struct UnnestDF;
-
-impl PluginCommand for UnnestDF {
-    type Plugin = PolarsPlugin;
-
-    fn name(&self) -> &str {
-        "polars unnest"
-    }
-
-    fn description(&self) -> &str {
-        "Decompose struct columns into separate columns for each of their fields. The new columns will be inserted into the dataframe at the location of the struct column."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .rest("cols", SyntaxShape::String, "columns to unnest")
-            .category(Category::Custom("dataframe".into()))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Unnest a dataframe",
-                example: r#"[[id person]; [1 {name: "Bob", age: 36}] [2 {name: "Betty", age: 63}]] 
-                    | polars into-df -s {id: i64, person: {name: str, age: u8}} 
-                    | polars unnest person
-                    | polars get id name age
-                    | polars sort-by id"#,
-                result: Some(
-                    NuDataFrame::from(
-                        df!(
-                            "id" => [1, 2],
-                            "name" => ["Bob", "Betty"],
-                            "age" => [36, 63]
-                        )
-                        .expect("Should be able to create a simple dataframe"),
-                    )
-                    .into_value(Span::test_data()),
-                ),
-            },
-            Example {
-                description: "Unnest a lazy dataframe",
-                example: r#"[[id person]; [1 {name: "Bob", age: 36}] [2 {name: "Betty", age: 63}]] 
-                    | polars into-df -s {id: i64, person: {name: str, age: u8}} 
-                    | polars into-lazy 
-                    | polars unnest person
-                    | polars select (polars col id) (polars col name) (polars col age)
-                    | polars collect
-                    | polars sort-by id"#,
-                result: Some(
-                    NuDataFrame::from(
-                        df!(
-                            "id" => [1, 2],
-                            "name" => ["Bob", "Betty"],
-                            "age" => [36, 63]
-                        )
-                        .expect("Should be able to create a simple dataframe"),
-                    )
-                    .into_value(Span::test_data()),
-                ),
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        plugin: &Self::Plugin,
-        engine: &EngineInterface,
-        call: &EvaluatedCall,
-        input: PipelineData,
-    ) -> Result<PipelineData, LabeledError> {
-        match PolarsPluginObject::try_from_pipeline(plugin, input, call.head)? {
-            PolarsPluginObject::NuDataFrame(df) => command_eager(plugin, engine, call, df),
-            PolarsPluginObject::NuLazyFrame(lazy) => command_lazy(plugin, engine, call, lazy),
-            _ => Err(ShellError::GenericError {
-                error: "Must be a dataframe or lazy dataframe".into(),
-                msg: "".into(),
-                span: Some(call.head),
-                help: None,
-                inner: vec![],
-            }),
-        }
-        .map_err(LabeledError::from)
-    }
-}
-
-fn command_eager(
-    plugin: &PolarsPlugin,
-    engine: &EngineInterface,
-    call: &EvaluatedCall,
-    df: NuDataFrame,
-) -> Result<PipelineData, ShellError> {
-    let cols = call.rest::<String>(0)?;
-    let polars = df.to_polars();
-    let result: NuDataFrame = polars
-        .unnest(cols)
-        .map_err(|e| ShellError::GenericError {
-            error: format!("Error unnesting dataframe: {e}"),
-            msg: "".into(),
-            span: Some(call.head),
-            help: None,
-            inner: vec![],
-        })?
-        .into();
-    result.to_pipeline_data(plugin, engine, call.head)
-}
-
-fn command_lazy(
-    plugin: &PolarsPlugin,
-    engine: &EngineInterface,
-    call: &EvaluatedCall,
-    df: NuLazyFrame,
-) -> Result<PipelineData, ShellError> {
-    let cols = call.rest::<String>(0)?;
-
-    let polars = df.to_polars();
-    let result: NuLazyFrame = polars.unnest(cols).into();
-    result.to_pipeline_data(plugin, engine, call.head)
-}
-
-#[cfg(test)]
-mod test {
-    use crate::test::test_polars_plugin_command;
-
-    use super::*;
-
-    #[test]
-    fn test_examples() -> Result<(), ShellError> {
-        test_polars_plugin_command(&UnnestDF)
-    }
-}
diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/unpivot.rs b/crates/nu_plugin_polars/src/dataframe/command/data/unpivot.rs
index ffbbd66916..5235305de2 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/unpivot.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/unpivot.rs
@@ -31,13 +31,13 @@ impl PluginCommand for UnpivotDF {
         Signature::build(self.name())
             .required_named(
                 "index",
-                SyntaxShape::List(Box::new(SyntaxShape::Any)),
+                SyntaxShape::Table(vec![]),
                 "column names for unpivoting",
                 Some('i'),
             )
             .required_named(
                 "on",
-                SyntaxShape::List(Box::new(SyntaxShape::Any)),
+                SyntaxShape::Table(vec![]),
                 "column names used as value columns",
                 Some('o'),
             )
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 183da649b8..bb2f1fcb35 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -16,4 +16,4 @@ profile = "default"
 # use in nushell, we may opt to use the bleeding edge stable version of rust.
 # I believe rust is on a 6 week release cycle and nushell is on a 4 week release cycle.
 # So, every two nushell releases, this version number should be bumped by one.
-channel = "1.80.1"
+channel = "1.79.0"
diff --git a/tests/const_/mod.rs b/tests/const_/mod.rs
index 0c4ff5d77c..f736b785ca 100644
--- a/tests/const_/mod.rs
+++ b/tests/const_/mod.rs
@@ -238,30 +238,13 @@ fn complex_const_export() {
     let actual = nu!(&inp.join("; "));
     assert_eq!(actual.out, "eats");
 
-    let inp = &[MODULE_SETUP, "use spam", "'none' in $spam.eggs.bacon"];
+    let inp = &[
+        MODULE_SETUP,
+        "use spam",
+        "($spam.eggs.bacon.none | is-empty)",
+    ];
     let actual = nu!(&inp.join("; "));
-    assert_eq!(actual.out, "false");
-}
-
-#[test]
-fn only_nested_module_have_const() {
-    let setup = r#"
-        module spam {
-            export module eggs {
-                export module bacon {
-                    export const viking = 'eats'
-                    export module none {}
-                }
-            }
-        }
-    "#;
-    let inp = &[setup, "use spam", "$spam.eggs.bacon.viking"];
-    let actual = nu!(&inp.join("; "));
-    assert_eq!(actual.out, "eats");
-
-    let inp = &[setup, "use spam", "'none' in $spam.eggs.bacon"];
-    let actual = nu!(&inp.join("; "));
-    assert_eq!(actual.out, "false");
+    assert_eq!(actual.out, "true");
 }
 
 #[test]
@@ -278,16 +261,20 @@ fn complex_const_glob_export() {
     let actual = nu!(&inp.join("; "));
     assert_eq!(actual.out, "eats");
 
-    let inp = &[MODULE_SETUP, "use spam *", "'none' in $eggs.bacon"];
+    let inp = &[MODULE_SETUP, "use spam *", "($eggs.bacon.none | is-empty)"];
     let actual = nu!(&inp.join("; "));
-    assert_eq!(actual.out, "false");
+    assert_eq!(actual.out, "true");
 }
 
 #[test]
 fn complex_const_drill_export() {
-    let inp = &[MODULE_SETUP, "use spam eggs bacon none", "$none"];
+    let inp = &[
+        MODULE_SETUP,
+        "use spam eggs bacon none",
+        "($none | is-empty)",
+    ];
     let actual = nu!(&inp.join("; "));
-    assert!(actual.err.contains("variable not found"));
+    assert_eq!(actual.out, "true");
 }
 
 #[test]
diff --git a/tests/plugin_persistence/mod.rs b/tests/plugin_persistence/mod.rs
index 587e4d480f..6729c657c7 100644
--- a/tests/plugin_persistence/mod.rs
+++ b/tests/plugin_persistence/mod.rs
@@ -12,7 +12,7 @@ fn plugin_list_shows_installed_plugins() {
         plugins: [("nu_plugin_inc"), ("nu_plugin_custom_values")],
         r#"(plugin list).name | str join ','"#
     );
-    assert_eq!("custom_values,inc", out.out);
+    assert_eq!("inc,custom_values", out.out);
     assert!(out.status.success());
 }
 
@@ -34,15 +34,15 @@ fn plugin_keeps_running_after_calling_it() {
         plugin: ("nu_plugin_inc"),
         r#"
             plugin stop inc
-            (plugin list).0.status == running | print
+            (plugin list).0.is_running | print
             print ";"
             "2.0.0" | inc -m | ignore
-            (plugin list).0.status == running | print
+            (plugin list).0.is_running | print
         "#
     );
     assert_eq!(
         "false;true", out.out,
-        "plugin list didn't show status = running"
+        "plugin list didn't show is_running = true"
     );
     assert!(out.status.success());
 }
@@ -244,7 +244,7 @@ fn plugin_gc_can_be_configured_to_stop_plugins_immediately() {
             $env.config.plugin_gc = { default: { stop_after: 0sec } }
             "2.3.0" | inc -M
             sleep 100ms
-            (plugin list | where name == inc).0.status == running
+            (plugin list | where name == inc).0.is_running
         "#
     );
     assert!(out.status.success());
@@ -261,7 +261,7 @@ fn plugin_gc_can_be_configured_to_stop_plugins_immediately() {
             }
             "2.3.0" | inc -M
             sleep 100ms
-            (plugin list | where name == inc).0.status == running
+            (plugin list | where name == inc).0.is_running
         "#
     );
     assert!(out.status.success());
@@ -281,7 +281,7 @@ fn plugin_gc_can_be_configured_to_stop_plugins_after_delay() {
             while $cond {
                 sleep 100ms
                 $cond = (
-                    (plugin list | where name == inc).0.status == running and
+                    (plugin list | where name == inc).0.is_running and
                     ((date now) - $start) < 5sec
                 )
             }
@@ -310,7 +310,7 @@ fn plugin_gc_can_be_configured_to_stop_plugins_after_delay() {
             while $cond {
                 sleep 100ms
                 $cond = (
-                    (plugin list | where name == inc).0.status == running and
+                    (plugin list | where name == inc).0.is_running and
                     ((date now) - $start) < 5sec
                 )
             }
@@ -333,7 +333,7 @@ fn plugin_gc_can_be_configured_as_disabled() {
         r#"
             $env.config.plugin_gc = { default: { enabled: false, stop_after: 0sec } }
             "2.3.0" | inc -M
-            (plugin list | where name == inc).0.status == running
+            (plugin list | where name == inc).0.is_running
         "#
     );
     assert!(out.status.success());
@@ -350,7 +350,7 @@ fn plugin_gc_can_be_configured_as_disabled() {
                 }
             }
             "2.3.0" | inc -M
-            (plugin list | where name == inc).0.status == running
+            (plugin list | where name == inc).0.is_running
         "#
     );
     assert!(out.status.success());
@@ -367,7 +367,7 @@ fn plugin_gc_can_be_disabled_by_plugin() {
             $env.config.plugin_gc = { default: { stop_after: 0sec } }
             example one 1 foo | ignore # ensure we've run the plugin with the new config
             sleep 100ms
-            (plugin list | where name == example).0.status == running
+            (plugin list | where name == example).0.is_running
         "#
     );
     assert!(out.status.success());
diff --git a/tests/plugins/registry_file.rs b/tests/plugins/registry_file.rs
index a2ca8735f0..2cb1473b6f 100644
--- a/tests/plugins/registry_file.rs
+++ b/tests/plugins/registry_file.rs
@@ -37,7 +37,7 @@ fn plugin_add_then_restart_nu() {
                     --config $nu.config-path
                     --env-config $nu.env-path
                     --plugin-config $nu.plugin-path
-                    --commands 'plugin list --engine | get name | to json --raw'
+                    --commands 'plugin list | get name | to json --raw'
             )
         ", example_plugin_path().display())
     );
@@ -69,7 +69,7 @@ fn plugin_add_in_nu_plugin_dirs_const() {
                         --config $nu.config-path
                         --env-config $nu.env-path
                         --plugin-config $nu.plugin-path
-                        --commands 'plugin list --engine | get name | to json --raw'
+                        --commands 'plugin list | get name | to json --raw'
                 )
             "#,
             dirname.display(),
@@ -103,7 +103,7 @@ fn plugin_add_in_nu_plugin_dirs_env() {
                         --config $nu.config-path
                         --env-config $nu.env-path
                         --plugin-config $nu.plugin-path
-                        --commands 'plugin list --engine | get name | to json --raw'
+                        --commands 'plugin list | get name | to json --raw'
                 )
             "#,
             dirname.display(),
@@ -199,7 +199,7 @@ fn plugin_rm_then_restart_nu() {
                 "--plugin-config",
                 "test-plugin-file.msgpackz",
                 "--commands",
-                "plugin list --engine | get name | to json --raw",
+                "plugin list | get name | to json --raw",
             ])
             .assert()
             .success()
@@ -364,7 +364,7 @@ fn warning_on_invalid_plugin_item() {
                 "--plugin-config",
                 "test-plugin-file.msgpackz",
                 "--commands",
-                "plugin list --engine | get name | to json --raw",
+                "plugin list | get name | to json --raw",
             ])
             .output()
             .expect("failed to run nu");
@@ -412,43 +412,6 @@ fn plugin_use_error_not_found() {
     })
 }
 
-#[test]
-fn plugin_shows_up_in_default_plugin_list_after_add() {
-    let example_plugin_path = example_plugin_path();
-    let result = nu_with_plugins!(
-        cwd: ".",
-        plugins: [],
-        &format!(r#"
-            plugin add '{}'
-            plugin list | get status | to json --raw
-        "#, example_plugin_path.display())
-    );
-    assert!(result.status.success());
-    assert_eq!(r#"["added"]"#, result.out);
-}
-
-#[test]
-fn plugin_shows_removed_after_removing() {
-    let example_plugin_path = example_plugin_path();
-    let result = nu_with_plugins!(
-        cwd: ".",
-        plugins: [],
-        &format!(r#"
-            plugin add '{}'
-            plugin list | get status | to json --raw
-            (
-                ^$nu.current-exe
-                    --config $nu.config-path
-                    --env-config $nu.env-path
-                    --plugin-config $nu.plugin-path
-                    --commands 'plugin rm example; plugin list | get status | to json --raw'
-            )
-        "#, example_plugin_path.display())
-    );
-    assert!(result.status.success());
-    assert_eq!(r#"["removed"]"#, result.out);
-}
-
 #[test]
 fn plugin_add_and_then_use() {
     let example_plugin_path = example_plugin_path();
@@ -462,7 +425,7 @@ fn plugin_add_and_then_use() {
                     --config $nu.config-path
                     --env-config $nu.env-path
                     --plugin-config $nu.plugin-path
-                    --commands 'plugin use example; plugin list --engine | get name | to json --raw'
+                    --commands 'plugin use example; plugin list | get name | to json --raw'
             )
         "#, example_plugin_path.display())
     );
@@ -483,7 +446,7 @@ fn plugin_add_and_then_use_by_filename() {
                     --config $nu.config-path
                     --env-config $nu.env-path
                     --plugin-config $nu.plugin-path
-                    --commands 'plugin use '{0}'; plugin list --engine | get name | to json --raw'
+                    --commands 'plugin use '{0}'; plugin list | get name | to json --raw'
             )
         "#, example_plugin_path.display())
     );
@@ -508,7 +471,7 @@ fn plugin_add_then_use_with_custom_path() {
             cwd: dirs.test(),
             r#"
                 plugin use --plugin-config test-plugin-file.msgpackz example
-                plugin list --engine | get name | to json --raw
+                plugin list | get name | to json --raw
             "#
         );
 
diff --git a/tests/repl/test_custom_commands.rs b/tests/repl/test_custom_commands.rs
index a93d3fbba8..1710b35913 100644
--- a/tests/repl/test_custom_commands.rs
+++ b/tests/repl/test_custom_commands.rs
@@ -1,7 +1,6 @@
 use crate::repl::tests::{fail_test, run_test, run_test_contains, TestResult};
 use nu_test_support::nu;
 use pretty_assertions::assert_eq;
-use rstest::rstest;
 
 #[test]
 fn no_scope_leak1() -> TestResult {
@@ -74,21 +73,10 @@ fn custom_switch1() -> TestResult {
     )
 }
 
-#[rstest]
-fn custom_flag_with_type_checking(
-    #[values(
-        ("int", "\"3\""),
-        ("int", "null"),
-        ("record<i: int>", "{i: \"\"}"),
-        ("list<int>", "[\"\"]")
-    )]
-    type_sig_value: (&str, &str),
-    #[values("--dry-run", "-d")] flag: &str,
-) -> TestResult {
-    let (type_sig, value) = type_sig_value;
-
+#[test]
+fn custom_flag_with_type_checking() -> TestResult {
     fail_test(
-        &format!("def florb [{flag}: {type_sig}] {{}}; let y = {value}; florb {flag} $y"),
+        r#"def florb [--dry-run: int] { $dry_run }; let y = "3"; florb --dry-run=$y"#,
         "type_mismatch",
     )
 }
diff --git a/tests/repl/test_modules.rs b/tests/repl/test_modules.rs
index 289efd291a..dd62c74b77 100644
--- a/tests/repl/test_modules.rs
+++ b/tests/repl/test_modules.rs
@@ -120,11 +120,6 @@ fn export_consts() -> TestResult {
     )
 }
 
-#[test]
-fn dont_export_module_name_as_a_variable() -> TestResult {
-    fail_test(r#"module spam { }; use spam; $spam"#, "variable not found")
-}
-
 #[test]
 fn func_use_consts() -> TestResult {
     run_test(

From e911ff4d67e5342f325d825745f6f5c01504d6e6 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Thu, 17 Oct 2024 20:05:58 -0700
Subject: [PATCH 0570/1072] Fix return setting last exit code (#14120)

# Description

Fixes #14113 and #14112.

# Tests + Formatting

Added a test.
---
 crates/nu-cli/src/util.rs                    | 2 +-
 crates/nu-command/tests/commands/return_.rs  | 6 ++++++
 crates/nu-protocol/src/engine/stack.rs       | 4 ++--
 crates/nu-protocol/src/errors/shell_error.rs | 7 +++++--
 src/run.rs                                   | 4 ++--
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/crates/nu-cli/src/util.rs b/crates/nu-cli/src/util.rs
index 038d0d0312..9848bb6051 100644
--- a/crates/nu-cli/src/util.rs
+++ b/crates/nu-cli/src/util.rs
@@ -221,7 +221,7 @@ pub fn eval_source(
             report_shell_error(engine_state, &err);
             let code = err.exit_code();
             stack.set_last_error(&err);
-            code
+            code.unwrap_or(0)
         }
     };
 
diff --git a/crates/nu-command/tests/commands/return_.rs b/crates/nu-command/tests/commands/return_.rs
index 708103d184..7e9b9ab739 100644
--- a/crates/nu-command/tests/commands/return_.rs
+++ b/crates/nu-command/tests/commands/return_.rs
@@ -32,3 +32,9 @@ fn return_works_in_script_with_def_main() {
     );
     assert!(actual.err.is_empty());
 }
+
+#[test]
+fn return_does_not_set_last_exit_code() {
+    let actual = nu!("hide-env LAST_EXIT_CODE; do --env { return 42 }; $env.LAST_EXIT_CODE?");
+    assert!(matches!(actual.out.as_str(), ""));
+}
diff --git a/crates/nu-protocol/src/engine/stack.rs b/crates/nu-protocol/src/engine/stack.rs
index f84fae5148..3102e3a84e 100644
--- a/crates/nu-protocol/src/engine/stack.rs
+++ b/crates/nu-protocol/src/engine/stack.rs
@@ -287,8 +287,8 @@ impl Stack {
     pub fn set_last_error(&mut self, error: &ShellError) {
         if let Some(code) = error.external_exit_code() {
             self.set_last_exit_code(code.item, code.span);
-        } else {
-            self.set_last_exit_code(1, Span::unknown());
+        } else if let Some(code) = error.exit_code() {
+            self.set_last_exit_code(code, Span::unknown());
         }
     }
 
diff --git a/crates/nu-protocol/src/errors/shell_error.rs b/crates/nu-protocol/src/errors/shell_error.rs
index 0f609061d6..0061d63602 100644
--- a/crates/nu-protocol/src/errors/shell_error.rs
+++ b/crates/nu-protocol/src/errors/shell_error.rs
@@ -1470,8 +1470,11 @@ impl ShellError {
         Some(Spanned { item, span })
     }
 
-    pub fn exit_code(&self) -> i32 {
-        self.external_exit_code().map(|e| e.item).unwrap_or(1)
+    pub fn exit_code(&self) -> Option<i32> {
+        match self {
+            Self::Return { .. } | Self::Break { .. } | Self::Continue { .. } => None,
+            _ => self.external_exit_code().map(|e| e.item).or(Some(1)),
+        }
     }
 
     pub fn into_value(self, span: Span) -> Value {
diff --git a/src/run.rs b/src/run.rs
index 84b5f7df4a..14c737c613 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -104,7 +104,7 @@ pub(crate) fn run_commands(
 
     if let Err(err) = result {
         report_shell_error(engine_state, &err);
-        std::process::exit(err.exit_code());
+        std::process::exit(err.exit_code().unwrap_or(0));
     }
 }
 
@@ -178,7 +178,7 @@ pub(crate) fn run_file(
 
     if let Err(err) = result {
         report_shell_error(engine_state, &err);
-        std::process::exit(err.exit_code());
+        std::process::exit(err.exit_code().unwrap_or(0));
     }
 }
 

From 8812072f065be283df3e9a81f3945d0364f2f247 Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Sun, 20 Oct 2024 10:45:05 +0800
Subject: [PATCH 0571/1072] Add milestone to a closed issue that has a merged
 PR fix automatically (#14131)

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

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

# Description

Use https://github.com/marketplace/actions/milestone-action to add
milestone to a closed issue that has a merged PR fix automatically
---
 .github/workflows/milestone.yml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/milestone.yml b/.github/workflows/milestone.yml
index 1897f2f617..7a4d483ee1 100644
--- a/.github/workflows/milestone.yml
+++ b/.github/workflows/milestone.yml
@@ -1,8 +1,11 @@
 # Description:
-#   - Update milestone of a merged PR
+#   - Add milestone to a merged PR automatically
+#   - Add milestone to a closed issue that has a merged PR fix (if any)
 
 name: Milestone Action
 on:
+  issues:
+    types: [closed]
   pull_request_target:
     types: [closed]
 
@@ -10,9 +13,18 @@ jobs:
   update-milestone:
     runs-on: ubuntu-latest
     name: Milestone Update
-    if: ${{github.event.pull_request.merged == true}}
     steps:
-      - name: Set Milestone
+      - name: Set Milestone for PR
         uses: hustcer/milestone-action@main
+        if: github.event.pull_request.merged == true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      # Bind milestone to closed issue that has a merged PR fix
+      - name: Set Milestone for Issue
+        uses: hustcer/milestone-action@main
+        if: github.event.issue.state == 'closed'
+        with:
+          action: bind-issue
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From f061c9a30ea9b03a32bb009c12134c5e2aff1829 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Sun, 20 Oct 2024 23:12:41 +0200
Subject: [PATCH 0572/1072] Bump to 0.99.2 (#14136)

---
 Cargo.lock                                    | 74 +++++++++----------
 Cargo.toml                                    | 40 +++++-----
 crates/nu-cli/Cargo.toml                      | 24 +++---
 crates/nu-cmd-base/Cargo.toml                 | 10 +--
 crates/nu-cmd-extra/Cargo.toml                | 22 +++---
 crates/nu-cmd-lang/Cargo.toml                 | 10 +--
 crates/nu-cmd-plugin/Cargo.toml               | 10 +--
 crates/nu-color-config/Cargo.toml             | 10 +--
 crates/nu-command/Cargo.toml                  | 34 ++++-----
 crates/nu-derive-value/Cargo.toml             |  2 +-
 crates/nu-engine/Cargo.toml                   | 10 +--
 crates/nu-explore/Cargo.toml                  | 20 ++---
 crates/nu-glob/Cargo.toml                     |  2 +-
 crates/nu-json/Cargo.toml                     |  6 +-
 crates/nu-lsp/Cargo.toml                      | 14 ++--
 crates/nu-parser/Cargo.toml                   | 10 +--
 crates/nu-path/Cargo.toml                     |  2 +-
 crates/nu-plugin-core/Cargo.toml              |  6 +-
 crates/nu-plugin-engine/Cargo.toml            | 14 ++--
 crates/nu-plugin-protocol/Cargo.toml          |  6 +-
 crates/nu-plugin-test-support/Cargo.toml      | 18 ++---
 crates/nu-plugin/Cargo.toml                   | 12 +--
 crates/nu-pretty-hex/Cargo.toml               |  2 +-
 crates/nu-protocol/Cargo.toml                 | 12 +--
 crates/nu-std/Cargo.toml                      |  8 +-
 crates/nu-system/Cargo.toml                   |  2 +-
 crates/nu-table/Cargo.toml                    | 12 +--
 crates/nu-term-grid/Cargo.toml                |  4 +-
 crates/nu-test-support/Cargo.toml             |  8 +-
 crates/nu-utils/Cargo.toml                    |  2 +-
 .../src/sample_config/default_config.nu       |  2 +-
 .../nu-utils/src/sample_config/default_env.nu |  2 +-
 crates/nu_plugin_custom_values/Cargo.toml     |  6 +-
 crates/nu_plugin_example/Cargo.toml           | 10 +--
 crates/nu_plugin_formats/Cargo.toml           |  8 +-
 crates/nu_plugin_gstat/Cargo.toml             |  6 +-
 crates/nu_plugin_inc/Cargo.toml               |  6 +-
 .../nu_plugin_nu_example.nu                   |  2 +-
 crates/nu_plugin_polars/Cargo.toml            | 20 ++---
 .../nu_plugin_python_example.py               |  2 +-
 crates/nu_plugin_query/Cargo.toml             |  6 +-
 crates/nu_plugin_stress_internals/Cargo.toml  |  2 +-
 crates/nuon/Cargo.toml                        |  8 +-
 43 files changed, 243 insertions(+), 243 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d6f1e35bd1..f8992529f9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2944,7 +2944,7 @@ dependencies = [
 
 [[package]]
 name = "nu"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "assert_cmd",
  "crossterm 0.28.1",
@@ -2999,7 +2999,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cli"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "chrono",
  "crossterm 0.28.1",
@@ -3034,7 +3034,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-base"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "indexmap",
  "miette",
@@ -3046,7 +3046,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-extra"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "fancy-regex",
  "heck",
@@ -3071,7 +3071,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-lang"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "itertools 0.13.0",
  "nu-engine",
@@ -3083,7 +3083,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-plugin"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "itertools 0.13.0",
  "nu-engine",
@@ -3094,7 +3094,7 @@ dependencies = [
 
 [[package]]
 name = "nu-color-config"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "nu-ansi-term",
  "nu-engine",
@@ -3106,7 +3106,7 @@ dependencies = [
 
 [[package]]
 name = "nu-command"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "alphanumeric-sort",
  "base64 0.22.1",
@@ -3216,7 +3216,7 @@ dependencies = [
 
 [[package]]
 name = "nu-derive-value"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -3227,7 +3227,7 @@ dependencies = [
 
 [[package]]
 name = "nu-engine"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "log",
  "nu-glob",
@@ -3239,7 +3239,7 @@ dependencies = [
 
 [[package]]
 name = "nu-explore"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "ansi-str",
  "anyhow",
@@ -3265,14 +3265,14 @@ dependencies = [
 
 [[package]]
 name = "nu-glob"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "doc-comment",
 ]
 
 [[package]]
 name = "nu-json"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "fancy-regex",
  "linked-hash-map",
@@ -3285,7 +3285,7 @@ dependencies = [
 
 [[package]]
 name = "nu-lsp"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "assert-json-diff",
  "crossbeam-channel",
@@ -3306,7 +3306,7 @@ dependencies = [
 
 [[package]]
 name = "nu-parser"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "bytesize",
  "chrono",
@@ -3322,7 +3322,7 @@ dependencies = [
 
 [[package]]
 name = "nu-path"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "dirs",
  "omnipath",
@@ -3331,7 +3331,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "log",
  "nix 0.29.0",
@@ -3347,7 +3347,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-core"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "interprocess",
  "log",
@@ -3361,7 +3361,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-engine"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "log",
  "nu-engine",
@@ -3377,7 +3377,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-protocol"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "nu-protocol",
  "nu-utils",
@@ -3389,7 +3389,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-test-support"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "nu-ansi-term",
  "nu-cmd-lang",
@@ -3407,7 +3407,7 @@ dependencies = [
 
 [[package]]
 name = "nu-pretty-hex"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "heapless",
  "nu-ansi-term",
@@ -3416,7 +3416,7 @@ dependencies = [
 
 [[package]]
 name = "nu-protocol"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "brotli",
  "byte-unit",
@@ -3454,7 +3454,7 @@ dependencies = [
 
 [[package]]
 name = "nu-std"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "log",
  "miette",
@@ -3465,7 +3465,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "chrono",
  "itertools 0.13.0",
@@ -3483,7 +3483,7 @@ dependencies = [
 
 [[package]]
 name = "nu-table"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "fancy-regex",
  "nu-ansi-term",
@@ -3498,7 +3498,7 @@ dependencies = [
 
 [[package]]
 name = "nu-term-grid"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "nu-utils",
  "unicode-width",
@@ -3506,7 +3506,7 @@ dependencies = [
 
 [[package]]
 name = "nu-test-support"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -3518,7 +3518,7 @@ dependencies = [
 
 [[package]]
 name = "nu-utils"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "crossterm_winapi",
  "log",
@@ -3544,7 +3544,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_example"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "nu-cmd-lang",
  "nu-plugin",
@@ -3554,7 +3554,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_formats"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "chrono",
  "eml-parser",
@@ -3569,7 +3569,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_gstat"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "git2",
  "nu-plugin",
@@ -3578,7 +3578,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_inc"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -3587,7 +3587,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_polars"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "chrono",
  "chrono-tz 0.9.0",
@@ -3622,7 +3622,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_query"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "gjson",
  "nu-plugin",
@@ -3637,7 +3637,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_stress_internals"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "interprocess",
  "serde",
@@ -3751,7 +3751,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "nuon"
-version = "0.99.1"
+version = "0.99.2"
 dependencies = [
  "chrono",
  "fancy-regex",
diff --git a/Cargo.toml b/Cargo.toml
index 2dabcfd7bf..82bbf99d37 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
 rust-version = "1.79.0"
-version = "0.99.1"
+version = "0.99.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -189,22 +189,22 @@ unchecked_duration_subtraction = "warn"
 workspace = true
 
 [dependencies]
-nu-cli = { path = "./crates/nu-cli", version = "0.99.1" }
-nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.99.1" }
-nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.99.1" }
-nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.99.1", optional = true }
-nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.99.1" }
-nu-command = { path = "./crates/nu-command", version = "0.99.1" }
-nu-engine = { path = "./crates/nu-engine", version = "0.99.1" }
-nu-explore = { path = "./crates/nu-explore", version = "0.99.1" }
-nu-lsp = { path = "./crates/nu-lsp/", version = "0.99.1" }
-nu-parser = { path = "./crates/nu-parser", version = "0.99.1" }
-nu-path = { path = "./crates/nu-path", version = "0.99.1" }
-nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.99.1" }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.99.1" }
-nu-std = { path = "./crates/nu-std", version = "0.99.1" }
-nu-system = { path = "./crates/nu-system", version = "0.99.1" }
-nu-utils = { path = "./crates/nu-utils", version = "0.99.1" }
+nu-cli = { path = "./crates/nu-cli", version = "0.99.2" }
+nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.99.2" }
+nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.99.2" }
+nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.99.2", optional = true }
+nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.99.2" }
+nu-command = { path = "./crates/nu-command", version = "0.99.2" }
+nu-engine = { path = "./crates/nu-engine", version = "0.99.2" }
+nu-explore = { path = "./crates/nu-explore", version = "0.99.2" }
+nu-lsp = { path = "./crates/nu-lsp/", version = "0.99.2" }
+nu-parser = { path = "./crates/nu-parser", version = "0.99.2" }
+nu-path = { path = "./crates/nu-path", version = "0.99.2" }
+nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.99.2" }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.99.2" }
+nu-std = { path = "./crates/nu-std", version = "0.99.2" }
+nu-system = { path = "./crates/nu-system", version = "0.99.2" }
+nu-utils = { path = "./crates/nu-utils", version = "0.99.2" }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
 crossterm = { workspace = true }
@@ -234,9 +234,9 @@ nix = { workspace = true, default-features = false, features = [
 ] }
 
 [dev-dependencies]
-nu-test-support = { path = "./crates/nu-test-support", version = "0.99.1" }
-nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.99.1" }
-nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.99.1" }
+nu-test-support = { path = "./crates/nu-test-support", version = "0.99.2" }
+nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.99.2" }
+nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.99.2" }
 assert_cmd = "2.0"
 dirs = { workspace = true }
 tango-bench = "0.6"
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 1e9b9ef3f8..4fa99ada52 100644
--- 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.99.1"
+version = "0.99.2"
 
 [lib]
 bench = false
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.1" }
-nu-command = { path = "../nu-command", version = "0.99.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.99.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.2" }
+nu-command = { path = "../nu-command", version = "0.99.2" }
+nu-test-support = { path = "../nu-test-support", version = "0.99.2" }
 rstest = { workspace = true, default-features = false }
 tempfile = { workspace = true }
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.99.1" }
-nu-engine = { path = "../nu-engine", version = "0.99.1" }
-nu-path = { path = "../nu-path", version = "0.99.1" }
-nu-parser = { path = "../nu-parser", version = "0.99.1" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.99.1", optional = true }
-nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
-nu-utils = { path = "../nu-utils", version = "0.99.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.99.1" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.99.2" }
+nu-engine = { path = "../nu-engine", version = "0.99.2" }
+nu-path = { path = "../nu-path", version = "0.99.2" }
+nu-parser = { path = "../nu-parser", version = "0.99.2" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.99.2", optional = true }
+nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
+nu-utils = { path = "../nu-utils", version = "0.99.2" }
+nu-color-config = { path = "../nu-color-config", version = "0.99.2" }
 nu-ansi-term = { workspace = true }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
diff --git a/crates/nu-cmd-base/Cargo.toml b/crates/nu-cmd-base/Cargo.toml
index f3e1e3a328..558ab9d9ea 100644
--- a/crates/nu-cmd-base/Cargo.toml
+++ b/crates/nu-cmd-base/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-base"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-base"
-version = "0.99.1"
+version = "0.99.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,10 +13,10 @@ version = "0.99.1"
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.99.1" }
-nu-parser = { path = "../nu-parser", version = "0.99.1" }
-nu-path = { path = "../nu-path", version = "0.99.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
+nu-engine = { path = "../nu-engine", version = "0.99.2" }
+nu-parser = { path = "../nu-parser", version = "0.99.2" }
+nu-path = { path = "../nu-path", version = "0.99.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
 
 indexmap = { workspace = true }
 miette = { workspace = true }
diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml
index cc809bbbae..81dfc9ede2 100644
--- 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.99.1"
+version = "0.99.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,13 +16,13 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.99.1" }
-nu-engine = { path = "../nu-engine", version = "0.99.1" }
-nu-json = { version = "0.99.1", path = "../nu-json" }
-nu-parser = { path = "../nu-parser", version = "0.99.1" }
-nu-pretty-hex = { version = "0.99.1", path = "../nu-pretty-hex" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
-nu-utils = { path = "../nu-utils", version = "0.99.1" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.99.2" }
+nu-engine = { path = "../nu-engine", version = "0.99.2" }
+nu-json = { version = "0.99.2", path = "../nu-json" }
+nu-parser = { path = "../nu-parser", version = "0.99.2" }
+nu-pretty-hex = { version = "0.99.2", path = "../nu-pretty-hex" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
+nu-utils = { path = "../nu-utils", version = "0.99.2" }
 
 # Potential dependencies for extras
 heck = { workspace = true }
@@ -36,6 +36,6 @@ v_htmlescape = { workspace = true }
 itertools = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.1" }
-nu-command = { path = "../nu-command", version = "0.99.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.99.1" }
\ No newline at end of file
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.2" }
+nu-command = { path = "../nu-command", version = "0.99.2" }
+nu-test-support = { path = "../nu-test-support", version = "0.99.2" }
\ No newline at end of file
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index e743d30a13..0c5905c65e 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -6,7 +6,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-lang"
 edition = "2021"
 license = "MIT"
 name = "nu-cmd-lang"
-version = "0.99.1"
+version = "0.99.2"
 
 [lib]
 bench = false
@@ -15,10 +15,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.99.1" }
-nu-parser = { path = "../nu-parser", version = "0.99.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
-nu-utils = { path = "../nu-utils", version = "0.99.1" }
+nu-engine = { path = "../nu-engine", version = "0.99.2" }
+nu-parser = { path = "../nu-parser", version = "0.99.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
+nu-utils = { path = "../nu-utils", version = "0.99.2" }
 
 itertools = { workspace = true }
 shadow-rs = { version = "0.35", default-features = false }
diff --git a/crates/nu-cmd-plugin/Cargo.toml b/crates/nu-cmd-plugin/Cargo.toml
index 1f1aa26707..9d1b9aede4 100644
--- a/crates/nu-cmd-plugin/Cargo.toml
+++ b/crates/nu-cmd-plugin/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-plugin"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-plugin"
-version = "0.99.1"
+version = "0.99.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,10 +13,10 @@ version = "0.99.1"
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.99.1" }
-nu-path = { path = "../nu-path", version = "0.99.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.1", features = ["plugin"] }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.99.1" }
+nu-engine = { path = "../nu-engine", version = "0.99.2" }
+nu-path = { path = "../nu-path", version = "0.99.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.2", features = ["plugin"] }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.99.2" }
 
 itertools = { workspace = true }
 
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index 6a2f94711b..85925f22da 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-color-confi
 edition = "2021"
 license = "MIT"
 name = "nu-color-config"
-version = "0.99.1"
+version = "0.99.2"
 
 [lib]
 bench = false
@@ -14,12 +14,12 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
-nu-engine = { path = "../nu-engine", version = "0.99.1" }
-nu-json = { path = "../nu-json", version = "0.99.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
+nu-engine = { path = "../nu-engine", version = "0.99.2" }
+nu-json = { path = "../nu-json", version = "0.99.2" }
 nu-ansi-term = { workspace = true }
 
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.99.1" }
\ No newline at end of file
+nu-test-support = { path = "../nu-test-support", version = "0.99.2" }
\ No newline at end of file
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index e2d3c69bdd..a4b65b49fb 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-command"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
-version = "0.99.1"
+version = "0.99.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,21 +16,21 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.99.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.99.1" }
-nu-engine = { path = "../nu-engine", version = "0.99.1" }
-nu-glob = { path = "../nu-glob", version = "0.99.1" }
-nu-json = { path = "../nu-json", version = "0.99.1" }
-nu-parser = { path = "../nu-parser", version = "0.99.1" }
-nu-path = { path = "../nu-path", version = "0.99.1" }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.99.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
-nu-system = { path = "../nu-system", version = "0.99.1" }
-nu-table = { path = "../nu-table", version = "0.99.1" }
-nu-term-grid = { path = "../nu-term-grid", version = "0.99.1" }
-nu-utils = { path = "../nu-utils", version = "0.99.1" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.99.2" }
+nu-color-config = { path = "../nu-color-config", version = "0.99.2" }
+nu-engine = { path = "../nu-engine", version = "0.99.2" }
+nu-glob = { path = "../nu-glob", version = "0.99.2" }
+nu-json = { path = "../nu-json", version = "0.99.2" }
+nu-parser = { path = "../nu-parser", version = "0.99.2" }
+nu-path = { path = "../nu-path", version = "0.99.2" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.99.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
+nu-system = { path = "../nu-system", version = "0.99.2" }
+nu-table = { path = "../nu-table", version = "0.99.2" }
+nu-term-grid = { path = "../nu-term-grid", version = "0.99.2" }
+nu-utils = { path = "../nu-utils", version = "0.99.2" }
 nu-ansi-term = { workspace = true }
-nuon = { path = "../nuon", version = "0.99.1" }
+nuon = { path = "../nuon", version = "0.99.2" }
 
 alphanumeric-sort = { workspace = true }
 base64 = { workspace = true }
@@ -139,8 +139,8 @@ sqlite = ["rusqlite"]
 trash-support = ["trash"]
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.99.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.2" }
+nu-test-support = { path = "../nu-test-support", version = "0.99.2" }
 
 dirs = { workspace = true }
 mockito = { workspace = true, default-features = false }
diff --git a/crates/nu-derive-value/Cargo.toml b/crates/nu-derive-value/Cargo.toml
index e84045e803..84d46076d7 100644
--- a/crates/nu-derive-value/Cargo.toml
+++ b/crates/nu-derive-value/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-derive-value"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-derive-value"
-version = "0.99.1"
+version = "0.99.2"
 
 [lib]
 proc-macro = true
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index f019c065bb..47afe10bb2 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-engine"
 edition = "2021"
 license = "MIT"
 name = "nu-engine"
-version = "0.99.1"
+version = "0.99.2"
 
 [lib]
 bench = false
@@ -14,10 +14,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.99.1" }
-nu-path = { path = "../nu-path", version = "0.99.1" }
-nu-glob = { path = "../nu-glob", version = "0.99.1" }
-nu-utils = { path = "../nu-utils", version = "0.99.1" }
+nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.99.2" }
+nu-path = { path = "../nu-path", version = "0.99.2" }
+nu-glob = { path = "../nu-glob", version = "0.99.2" }
+nu-utils = { path = "../nu-utils", version = "0.99.2" }
 log = { workspace = true }
 terminal_size = { workspace = true }
 
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index 832601b204..4a62816379 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-explore"
 edition = "2021"
 license = "MIT"
 name = "nu-explore"
-version = "0.99.1"
+version = "0.99.2"
 
 [lib]
 bench = false
@@ -14,16 +14,16 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
-nu-parser = { path = "../nu-parser", version = "0.99.1" }
-nu-path = { path = "../nu-path", version = "0.99.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.99.1" }
-nu-engine = { path = "../nu-engine", version = "0.99.1" }
-nu-table = { path = "../nu-table", version = "0.99.1" }
-nu-json = { path = "../nu-json", version = "0.99.1" }
-nu-utils = { path = "../nu-utils", version = "0.99.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
+nu-parser = { path = "../nu-parser", version = "0.99.2" }
+nu-path = { path = "../nu-path", version = "0.99.2" }
+nu-color-config = { path = "../nu-color-config", version = "0.99.2" }
+nu-engine = { path = "../nu-engine", version = "0.99.2" }
+nu-table = { path = "../nu-table", version = "0.99.2" }
+nu-json = { path = "../nu-json", version = "0.99.2" }
+nu-utils = { path = "../nu-utils", version = "0.99.2" }
 nu-ansi-term = { workspace = true }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.99.1" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.99.2" }
 
 anyhow = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-glob/Cargo.toml b/crates/nu-glob/Cargo.toml
index 75d8d9c21c..30b3b7654d 100644
--- a/crates/nu-glob/Cargo.toml
+++ b/crates/nu-glob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-glob"
-version = "0.99.1"
+version = "0.99.2"
 authors = ["The Nushell Project Developers", "The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 description = """
diff --git a/crates/nu-json/Cargo.toml b/crates/nu-json/Cargo.toml
index 22a9663c27..e04dc5612a 100644
--- a/crates/nu-json/Cargo.toml
+++ b/crates/nu-json/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-json"
 edition = "2021"
 license = "MIT"
 name = "nu-json"
-version = "0.99.1"
+version = "0.99.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -26,8 +26,8 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.99.1" }
-nu-path = { path = "../nu-path", version = "0.99.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.99.2" }
+nu-path = { path = "../nu-path", version = "0.99.2" }
 serde_json = "1.0"
 fancy-regex = "0.13.0"
 
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index efabb1ec3f..4aecc2834b 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -3,14 +3,14 @@ authors = ["The Nushell Project Developers"]
 description = "Nushell's integrated LSP server"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-lsp"
 name = "nu-lsp"
-version = "0.99.1"
+version = "0.99.2"
 edition = "2021"
 license = "MIT"
 
 [dependencies]
-nu-cli = { path = "../nu-cli", version = "0.99.1" }
-nu-parser = { path = "../nu-parser", version = "0.99.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
+nu-cli = { path = "../nu-cli", version = "0.99.2" }
+nu-parser = { path = "../nu-parser", version = "0.99.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
 
 reedline = { workspace = true }
 
@@ -23,9 +23,9 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.1" }
-nu-command = { path = "../nu-command", version = "0.99.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.99.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.2" }
+nu-command = { path = "../nu-command", version = "0.99.2" }
+nu-test-support = { path = "../nu-test-support", version = "0.99.2" }
 
 assert-json-diff = "2.0"
 
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index b39bd32c4e..0c331563fa 100644
--- a/crates/nu-parser/Cargo.toml
+++ b/crates/nu-parser/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-parser"
 edition = "2021"
 license = "MIT"
 name = "nu-parser"
-version = "0.99.1"
+version = "0.99.2"
 exclude = ["/fuzz"]
 
 [lib]
@@ -15,10 +15,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.99.1" }
-nu-path = { path = "../nu-path", version = "0.99.1" }
-nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.99.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
+nu-engine = { path = "../nu-engine", version = "0.99.2" }
+nu-path = { path = "../nu-path", version = "0.99.2" }
+nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.99.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
 
 bytesize = { workspace = true }
 chrono = { default-features = false, features = ['std'], workspace = true }
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index f2cd5c686d..b451a21f75 100644
--- a/crates/nu-path/Cargo.toml
+++ b/crates/nu-path/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-path"
 edition = "2021"
 license = "MIT"
 name = "nu-path"
-version = "0.99.1"
+version = "0.99.2"
 exclude = ["/fuzz"]
 
 [lib]
diff --git a/crates/nu-plugin-core/Cargo.toml b/crates/nu-plugin-core/Cargo.toml
index 4737fe7f71..2f038be2a5 100644
--- a/crates/nu-plugin-core/Cargo.toml
+++ b/crates/nu-plugin-core/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-core
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-core"
-version = "0.99.1"
+version = "0.99.2"
 
 [lib]
 bench = false
@@ -14,8 +14,8 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.99.1", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.99.2", default-features = false }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true }
diff --git a/crates/nu-plugin-engine/Cargo.toml b/crates/nu-plugin-engine/Cargo.toml
index 8ff87c7cf6..6c59229074 100644
--- a/crates/nu-plugin-engine/Cargo.toml
+++ b/crates/nu-plugin-engine/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-engi
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-engine"
-version = "0.99.1"
+version = "0.99.2"
 
 [lib]
 bench = false
@@ -14,12 +14,12 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.99.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
-nu-system = { path = "../nu-system", version = "0.99.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.99.1" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.99.1", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.99.1" }
+nu-engine = { path = "../nu-engine", version = "0.99.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
+nu-system = { path = "../nu-system", version = "0.99.2" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.99.2" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.99.2", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.99.2" }
 
 serde = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-plugin-protocol/Cargo.toml b/crates/nu-plugin-protocol/Cargo.toml
index 357cca0969..a98aca5fa4 100644
--- a/crates/nu-plugin-protocol/Cargo.toml
+++ b/crates/nu-plugin-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-prot
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-protocol"
-version = "0.99.1"
+version = "0.99.2"
 
 [lib]
 bench = false
@@ -14,8 +14,8 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.99.1", features = ["plugin"] }
-nu-utils = { path = "../nu-utils", version = "0.99.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.2", features = ["plugin"] }
+nu-utils = { path = "../nu-utils", version = "0.99.2" }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
diff --git a/crates/nu-plugin-test-support/Cargo.toml b/crates/nu-plugin-test-support/Cargo.toml
index ee662784a7..880c9b87a7 100644
--- a/crates/nu-plugin-test-support/Cargo.toml
+++ b/crates/nu-plugin-test-support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-plugin-test-support"
-version = "0.99.1"
+version = "0.99.2"
 edition = "2021"
 license = "MIT"
 description = "Testing support for Nushell plugins"
@@ -15,14 +15,14 @@ workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.99.1", features = ["plugin"] }
-nu-protocol = { path = "../nu-protocol", version = "0.99.1", features = ["plugin"] }
-nu-parser = { path = "../nu-parser", version = "0.99.1", features = ["plugin"] }
-nu-plugin = { path = "../nu-plugin", version = "0.99.1" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.99.1" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.99.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.99.1" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.1" }
+nu-engine = { path = "../nu-engine", version = "0.99.2", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.99.2", features = ["plugin"] }
+nu-parser = { path = "../nu-parser", version = "0.99.2", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.99.2" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.99.2" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.99.2" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.99.2" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.2" }
 nu-ansi-term = { workspace = true }
 similar = "2.6"
 
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index f8d2b1a636..69c4c76f58 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin"
 edition = "2021"
 license = "MIT"
 name = "nu-plugin"
-version = "0.99.1"
+version = "0.99.2"
 
 [lib]
 bench = false
@@ -14,11 +14,11 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.99.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.99.1" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.99.1", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.99.1" }
+nu-engine = { path = "../nu-engine", version = "0.99.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.99.2" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.99.2", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.99.2" }
 
 log = { workspace = true }
 thiserror = "1.0"
diff --git a/crates/nu-pretty-hex/Cargo.toml b/crates/nu-pretty-hex/Cargo.toml
index 59fefefad4..534f9d4304 100644
--- a/crates/nu-pretty-hex/Cargo.toml
+++ b/crates/nu-pretty-hex/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-pretty-hex"
 edition = "2021"
 license = "MIT"
 name = "nu-pretty-hex"
-version = "0.99.1"
+version = "0.99.2"
 
 [lib]
 doctest = false
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 5556ce4755..45bec3c28f 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-protocol"
 edition = "2021"
 license = "MIT"
 name = "nu-protocol"
-version = "0.99.1"
+version = "0.99.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,10 +16,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.99.1" }
-nu-path = { path = "../nu-path", version = "0.99.1" }
-nu-system = { path = "../nu-system", version = "0.99.1" }
-nu-derive-value = { path = "../nu-derive-value", version = "0.99.1" }
+nu-utils = { path = "../nu-utils", version = "0.99.2" }
+nu-path = { path = "../nu-path", version = "0.99.2" }
+nu-system = { path = "../nu-system", version = "0.99.2" }
+nu-derive-value = { path = "../nu-derive-value", version = "0.99.2" }
 
 brotli = { workspace = true, optional = true }
 bytes = { workspace = true }
@@ -57,7 +57,7 @@ plugin = [
 serde_json = { workspace = true }
 strum = "0.26"
 strum_macros = "0.26"
-nu-test-support = { path = "../nu-test-support", version = "0.99.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.99.2" }
 pretty_assertions = { workspace = true }
 rstest = { workspace = true }
 tempfile = { workspace = true }
diff --git a/crates/nu-std/Cargo.toml b/crates/nu-std/Cargo.toml
index c4acfc22b3..a96728bb8f 100644
--- a/crates/nu-std/Cargo.toml
+++ b/crates/nu-std/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-std"
 edition = "2021"
 license = "MIT"
 name = "nu-std"
-version = "0.99.1"
+version = "0.99.2"
 
 [dependencies]
-nu-parser = { version = "0.99.1", path = "../nu-parser" }
-nu-protocol = { version = "0.99.1", path = "../nu-protocol" }
-nu-engine = { version = "0.99.1", path = "../nu-engine" }
+nu-parser = { version = "0.99.2", path = "../nu-parser" }
+nu-protocol = { version = "0.99.2", path = "../nu-protocol" }
+nu-engine = { version = "0.99.2", path = "../nu-engine" }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
 
 log = "0.4"
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index e2f054afb2..bf83b9155e 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["The Nushell Project Developers", "procs creators"]
 description = "Nushell system querying"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-system"
 name = "nu-system"
-version = "0.99.1"
+version = "0.99.2"
 edition = "2021"
 license = "MIT"
 
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index fd0ff56617..2bce1125f1 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-table"
 edition = "2021"
 license = "MIT"
 name = "nu-table"
-version = "0.99.1"
+version = "0.99.2"
 
 [lib]
 bench = false
@@ -14,10 +14,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
-nu-utils = { path = "../nu-utils", version = "0.99.1" }
-nu-engine = { path = "../nu-engine", version = "0.99.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.99.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
+nu-utils = { path = "../nu-utils", version = "0.99.2" }
+nu-engine = { path = "../nu-engine", version = "0.99.2" }
+nu-color-config = { path = "../nu-color-config", version = "0.99.2" }
 nu-ansi-term = { workspace = true }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
@@ -25,4 +25,4 @@ tabled = { workspace = true, features = ["ansi"], default-features = false }
 terminal_size = { workspace = true }
 
 [dev-dependencies]
-# nu-test-support = { path="../nu-test-support", version = "0.99.1"  }
\ No newline at end of file
+# nu-test-support = { path="../nu-test-support", version = "0.99.2"  }
\ No newline at end of file
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index 9a139a122e..70d4ae3cd7 100644
--- a/crates/nu-term-grid/Cargo.toml
+++ b/crates/nu-term-grid/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-term-grid"
 edition = "2021"
 license = "MIT"
 name = "nu-term-grid"
-version = "0.99.1"
+version = "0.99.2"
 
 [lib]
 bench = false
@@ -14,6 +14,6 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.99.1" }
+nu-utils = { path = "../nu-utils", version = "0.99.2" }
 
 unicode-width = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml
index a465aa5870..3bacc808b2 100644
--- a/crates/nu-test-support/Cargo.toml
+++ b/crates/nu-test-support/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-test-suppor
 edition = "2021"
 license = "MIT"
 name = "nu-test-support"
-version = "0.99.1"
+version = "0.99.2"
 
 [lib]
 doctest = false
@@ -15,9 +15,9 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-path = { path = "../nu-path", version = "0.99.1" }
-nu-glob = { path = "../nu-glob", version = "0.99.1" }
-nu-utils = { path = "../nu-utils", version = "0.99.1" }
+nu-path = { path = "../nu-path", version = "0.99.2" }
+nu-glob = { path = "../nu-glob", version = "0.99.2" }
+nu-utils = { path = "../nu-utils", version = "0.99.2" }
 
 num-format = { workspace = true }
 which = { workspace = true }
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index 9d71578a4e..5f1f3a22ba 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-utils"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-utils"
-version = "0.99.1"
+version = "0.99.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index e9188c46cb..44afdb8644 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -1,6 +1,6 @@
 # Nushell Config File
 #
-# version = "0.99.1"
+# version = "0.99.2"
 
 # For more information on defining custom themes, see
 # https://www.nushell.sh/book/coloring_and_theming.html
diff --git a/crates/nu-utils/src/sample_config/default_env.nu b/crates/nu-utils/src/sample_config/default_env.nu
index 0ed67b1787..172afcb37c 100644
--- a/crates/nu-utils/src/sample_config/default_env.nu
+++ b/crates/nu-utils/src/sample_config/default_env.nu
@@ -1,6 +1,6 @@
 # Nushell Environment Config File
 #
-# version = "0.99.1"
+# version = "0.99.2"
 
 def create_left_prompt [] {
     let dir = match (do --ignore-shell-errors { $env.PWD | path relative-to $nu.home-path }) {
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index 0b99891116..ef494a9355 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -10,10 +10,10 @@ name = "nu_plugin_custom_values"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.99.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.99.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.2", features = ["plugin"] }
 serde = { workspace = true }
 typetag = "0.2"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.99.1" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.99.2" }
\ No newline at end of file
diff --git a/crates/nu_plugin_example/Cargo.toml b/crates/nu_plugin_example/Cargo.toml
index e177def2cb..b75b9bd584 100644
--- a/crates/nu_plugin_example/Cargo.toml
+++ b/crates/nu_plugin_example/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_exam
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_example"
-version = "0.99.1"
+version = "0.99.2"
 
 [[bin]]
 name = "nu_plugin_example"
@@ -15,9 +15,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.99.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.99.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.2", features = ["plugin"] }
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.99.1" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.1" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.99.2" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.2" }
\ No newline at end of file
diff --git a/crates/nu_plugin_formats/Cargo.toml b/crates/nu_plugin_formats/Cargo.toml
index cbd54c76e8..96e89a468e 100644
--- a/crates/nu_plugin_formats/Cargo.toml
+++ b/crates/nu_plugin_formats/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_form
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_formats"
-version = "0.99.1"
+version = "0.99.2"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.99.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.99.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.2", features = ["plugin"] }
 
 indexmap = { workspace = true }
 eml-parser = "0.1"
@@ -20,4 +20,4 @@ plist = "1.7"
 chrono = "0.4"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.99.1" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.99.2" }
\ No newline at end of file
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index e661982ebe..80aea009c3 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gsta
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_gstat"
-version = "0.99.1"
+version = "0.99.2"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_gstat"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.99.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.99.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
 
 git2 = "0.19"
\ No newline at end of file
diff --git a/crates/nu_plugin_inc/Cargo.toml b/crates/nu_plugin_inc/Cargo.toml
index 6dd47fac6d..9ff3051a8e 100644
--- a/crates/nu_plugin_inc/Cargo.toml
+++ b/crates/nu_plugin_inc/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_inc"
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_inc"
-version = "0.99.1"
+version = "0.99.2"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_inc"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.99.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.99.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.2", features = ["plugin"] }
 
 semver = "1.0"
\ No newline at end of file
diff --git a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
index 6e7307480a..9967348c6d 100755
--- a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
+++ b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
@@ -6,7 +6,7 @@
 # it also allows us to test the plugin interface with something manually implemented in a scripting
 # language without adding any extra dependencies to our tests.
 
-const NUSHELL_VERSION = "0.99.1"
+const NUSHELL_VERSION = "0.99.2"
 const PLUGIN_VERSION = "0.1.1" # bump if you change commands!
 
 def main [--stdio] {
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index abbb9f54f7..e91928869a 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu_plugin_polars"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_polars"
-version = "0.99.1"
+version = "0.99.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -17,10 +17,10 @@ bench = false
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
-nu-plugin = { path = "../nu-plugin", version = "0.99.1" }
-nu-path = { path = "../nu-path", version = "0.99.1" }
-nu-utils = { path = "../nu-utils", version = "0.99.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
+nu-plugin = { path = "../nu-plugin", version = "0.99.2" }
+nu-path = { path = "../nu-path", version = "0.99.2" }
+nu-utils = { path = "../nu-utils", version = "0.99.2" }
 
 # Potential dependencies for extras
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
@@ -83,9 +83,9 @@ optional = false
 version = "0.41"
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.1" }
-nu-engine = { path = "../nu-engine", version = "0.99.1" }
-nu-parser = { path = "../nu-parser", version = "0.99.1" }
-nu-command = { path = "../nu-command", version = "0.99.1" }
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.99.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.2" }
+nu-engine = { path = "../nu-engine", version = "0.99.2" }
+nu-parser = { path = "../nu-parser", version = "0.99.2" }
+nu-command = { path = "../nu-command", version = "0.99.2" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.99.2" }
 tempfile.workspace = true
\ No newline at end of file
diff --git a/crates/nu_plugin_python/nu_plugin_python_example.py b/crates/nu_plugin_python/nu_plugin_python_example.py
index 206808eca0..fdad98ecd8 100755
--- a/crates/nu_plugin_python/nu_plugin_python_example.py
+++ b/crates/nu_plugin_python/nu_plugin_python_example.py
@@ -27,7 +27,7 @@ import sys
 import json
 
 
-NUSHELL_VERSION = "0.99.1"
+NUSHELL_VERSION = "0.99.2"
 PLUGIN_VERSION = "0.1.1"  # bump if you change commands!
 
 
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index 80040e860c..c4df8257e9 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_quer
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_query"
-version = "0.99.1"
+version = "0.99.2"
 
 [lib]
 doctest = false
@@ -16,8 +16,8 @@ name = "nu_plugin_query"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.99.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.99.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
 
 gjson = "0.8"
 scraper = { default-features = false, version = "0.20" }
diff --git a/crates/nu_plugin_stress_internals/Cargo.toml b/crates/nu_plugin_stress_internals/Cargo.toml
index d72e39bf2a..b61acf4d3e 100644
--- a/crates/nu_plugin_stress_internals/Cargo.toml
+++ b/crates/nu_plugin_stress_internals/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_stre
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_stress_internals"
-version = "0.99.1"
+version = "0.99.2"
 
 [[bin]]
 name = "nu_plugin_stress_internals"
diff --git a/crates/nuon/Cargo.toml b/crates/nuon/Cargo.toml
index 075212464d..795f72b9ef 100644
--- a/crates/nuon/Cargo.toml
+++ b/crates/nuon/Cargo.toml
@@ -5,14 +5,14 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nuon"
 edition = "2021"
 license = "MIT"
 name = "nuon"
-version = "0.99.1"
+version = "0.99.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-parser = { path = "../nu-parser", version = "0.99.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.1" }
-nu-engine = { path = "../nu-engine", version = "0.99.1" }
+nu-parser = { path = "../nu-parser", version = "0.99.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
+nu-engine = { path = "../nu-engine", version = "0.99.2" }
 once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 

From f787d272e6c2b4d93c8fa5501804cb6747c05da4 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Wed, 16 Oct 2024 19:24:14 -0700
Subject: [PATCH 0573/1072] Implemented `polars unnest` (#14104)

# Description
Provides the ability to decomes struct columns into seperate columns for
each field:
<img width="655" alt="Screenshot 2024-10-16 at 09 57 22"
src="https://github.com/user-attachments/assets/6706bd36-8d38-4365-b58d-ba82f2d5ba9a">

# User-Facing Changes
- provides a new command `polars unnest` for decomposing struct fields
into separate columns.
---
 .../src/dataframe/command/data/mod.rs         |   2 +
 .../src/dataframe/command/data/unnest.rs      | 145 ++++++++++++++++++
 2 files changed, 147 insertions(+)
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/data/unnest.rs

diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/mod.rs b/crates/nu_plugin_polars/src/dataframe/command/data/mod.rs
index 058b277526..0857fff1da 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/mod.rs
@@ -32,6 +32,7 @@ mod sort_by_expr;
 pub mod sql_context;
 pub mod sql_expr;
 mod take;
+mod unnest;
 mod unpivot;
 mod with_column;
 use filter::LazyFilter;
@@ -109,5 +110,6 @@ pub(crate) fn data_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin
         Box::new(LazyFilter),
         Box::new(Shift),
         Box::new(Unique),
+        Box::new(unnest::UnnestDF),
     ]
 }
diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/unnest.rs b/crates/nu_plugin_polars/src/dataframe/command/data/unnest.rs
new file mode 100644
index 0000000000..585bb28fc5
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/unnest.rs
@@ -0,0 +1,145 @@
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{
+    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape,
+};
+use polars::df;
+
+use crate::{
+    values::{CustomValueSupport, NuLazyFrame, PolarsPluginObject},
+    PolarsPlugin,
+};
+
+use crate::values::NuDataFrame;
+
+#[derive(Clone)]
+pub struct UnnestDF;
+
+impl PluginCommand for UnnestDF {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars unnest"
+    }
+
+    fn description(&self) -> &str {
+        "Decompose struct columns into separate columns for each of their fields. The new columns will be inserted into the dataframe at the location of the struct column."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .rest("cols", SyntaxShape::String, "columns to unnest")
+            .category(Category::Custom("dataframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Unnest a dataframe",
+                example: r#"[[id person]; [1 {name: "Bob", age: 36}] [2 {name: "Betty", age: 63}]] 
+                    | polars into-df -s {id: i64, person: {name: str, age: u8}} 
+                    | polars unnest person
+                    | polars get id name age
+                    | polars sort-by id"#,
+                result: Some(
+                    NuDataFrame::from(
+                        df!(
+                            "id" => [1, 2],
+                            "name" => ["Bob", "Betty"],
+                            "age" => [36, 63]
+                        )
+                        .expect("Should be able to create a simple dataframe"),
+                    )
+                    .into_value(Span::test_data()),
+                ),
+            },
+            Example {
+                description: "Unnest a lazy dataframe",
+                example: r#"[[id person]; [1 {name: "Bob", age: 36}] [2 {name: "Betty", age: 63}]] 
+                    | polars into-df -s {id: i64, person: {name: str, age: u8}} 
+                    | polars into-lazy 
+                    | polars unnest person
+                    | polars select (polars col id) (polars col name) (polars col age)
+                    | polars collect
+                    | polars sort-by id"#,
+                result: Some(
+                    NuDataFrame::from(
+                        df!(
+                            "id" => [1, 2],
+                            "name" => ["Bob", "Betty"],
+                            "age" => [36, 63]
+                        )
+                        .expect("Should be able to create a simple dataframe"),
+                    )
+                    .into_value(Span::test_data()),
+                ),
+            },
+        ]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        match PolarsPluginObject::try_from_pipeline(plugin, input, call.head)? {
+            PolarsPluginObject::NuDataFrame(df) => command_eager(plugin, engine, call, df),
+            PolarsPluginObject::NuLazyFrame(lazy) => command_lazy(plugin, engine, call, lazy),
+            _ => Err(ShellError::GenericError {
+                error: "Must be a dataframe or lazy dataframe".into(),
+                msg: "".into(),
+                span: Some(call.head),
+                help: None,
+                inner: vec![],
+            }),
+        }
+        .map_err(LabeledError::from)
+    }
+}
+
+fn command_eager(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    df: NuDataFrame,
+) -> Result<PipelineData, ShellError> {
+    let cols = call.rest::<String>(0)?;
+    let polars = df.to_polars();
+    let result: NuDataFrame = polars
+        .unnest(cols)
+        .map_err(|e| ShellError::GenericError {
+            error: format!("Error unnesting dataframe: {e}"),
+            msg: "".into(),
+            span: Some(call.head),
+            help: None,
+            inner: vec![],
+        })?
+        .into();
+    result.to_pipeline_data(plugin, engine, call.head)
+}
+
+fn command_lazy(
+    plugin: &PolarsPlugin,
+    engine: &EngineInterface,
+    call: &EvaluatedCall,
+    df: NuLazyFrame,
+) -> Result<PipelineData, ShellError> {
+    let cols = call.rest::<String>(0)?;
+
+    let polars = df.to_polars();
+    let result: NuLazyFrame = polars.unnest(cols).into();
+    result.to_pipeline_data(plugin, engine, call.head)
+}
+
+#[cfg(test)]
+mod test {
+    use crate::test::test_polars_plugin_command;
+
+    use super::*;
+
+    #[test]
+    fn test_examples() -> Result<(), ShellError> {
+        test_polars_plugin_command(&UnnestDF)
+    }
+}

From 3af575cce79cc7bb8fc5e731644df0a74312f614 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Wed, 16 Oct 2024 19:24:45 -0700
Subject: [PATCH 0574/1072] Make `plugin list` read state from plugin registry
 file as well (#14085)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

[Context on
Discord](https://discord.com/channels/601130461678272522/855947301380947968/1292279795035668583)

**This is a breaking change, due to the removal of `is_running`.**

Some users find the `plugin list` command confusing, because it doesn't
show anything different after running `plugin add` or `plugin rm`. This
modifies the `plugin list` command to also look at the plugin registry
file to give some idea of how the plugins in engine state differ from
those in the plugin registry file.

The following values of `status` are now produced instead of
`is_running`:

- `added`: The plugin is present in the plugin registry file, but not in
the engine.
- `loaded`: The plugin is present both in the plugin registry file and
in the engine, but is not running.
- `running`: The plugin is currently running, and the `pid` column
should contain its process ID.
- `modified`: The plugin state present in the plugin registry file is
different from the state in the engine.
- `removed`: The plugin is still loaded in the engine, but is not
present in the plugin registry file.
- `invalid`: The data in the plugin registry file couldn't be
deserialized, and the plugin most likely needs to be added again.

Example (`commands` omitted):

```
╭──────┬─────────────────────┬────────────┬───────────┬──────────┬─────────────────────────────────────────────────────┬─────────╮
│    # │        name         │  version   │  status   │   pid    │                      filename                       │  shell  │
├──────┼─────────────────────┼────────────┼───────────┼──────────┼─────────────────────────────────────────────────────┼─────────┤
│    0 │ custom_values       │ 0.1.0      │ loaded    │          │ /home/devyn/.cargo/bin/nu_plugin_custom_values      │         │
│    1 │ dbus                │ 0.11.0     │ loaded    │          │ /home/devyn/.cargo/bin/nu_plugin_dbus               │         │
│    2 │ example             │ 0.98.1     │ loaded    │          │ /home/devyn/.cargo/bin/nu_plugin_example            │         │
│    3 │ explore_ir          │ 0.3.0      │ loaded    │          │ /home/devyn/.cargo/bin/nu_plugin_explore_ir         │         │
│    4 │ formats             │ 0.98.1     │ loaded    │          │ /home/devyn/.cargo/bin/nu_plugin_formats            │         │
│    5 │ gstat               │ 0.98.1     │ running   │   236662 │ /home/devyn/.cargo/bin/nu_plugin_gstat              │         │
│    6 │ inc                 │ 0.98.1     │ loaded    │          │ /home/devyn/.cargo/bin/nu_plugin_inc                │         │
│    7 │ polars              │ 0.98.1     │ added     │          │ /home/devyn/.cargo/bin/nu_plugin_polars             │         │
│    8 │ query               │ 0.98.1     │ removed   │          │ /home/devyn/.cargo/bin/nu_plugin_query              │         │
│    9 │ stress_internals    │ 0.98.1     │ loaded    │          │ /home/devyn/.cargo/bin/nu_plugin_stress_internals   │         │
╰──────┴─────────────────────┴────────────┴───────────┴──────────┴─────────────────────────────────────────────────────┴─────────╯

```

# User-Facing Changes

To `plugin list`:

* **Breaking:** The `is_running` column is removed and replaced with
`status`. Use `status == running` to filter equivalently.
* The `--plugin-config` from other plugin management commands is now
supported.
* Added an `--engine` flag which behaves more or less like before, and
doesn't load the plugin registry file at all.
* Added a `--registry` flag which only checks the plugin registry file.
All plugins appear as `added` since there is no state to compare with.

Because the default is to check both, the `plugin list` command might be
a little bit slower. If you don't need to check the plugin registry
file, the `--engine` flag does not load the plugin registry file at all,
so it should be just as fast as before.

# Tests + Formatting

Added tests for `added` and `removed` statuses. `modified` and `invalid`
are a bit more tricky so I didn't try.

# After Submitting

- [ ] update documentation that references the `plugin list` command
- [ ] release notes
---
 .../nu-cmd-plugin/src/commands/plugin/add.rs  |   2 +-
 .../nu-cmd-plugin/src/commands/plugin/list.rs | 281 ++++++++++++++----
 .../nu-cmd-plugin/src/commands/plugin/rm.rs   |   2 +-
 crates/nu-cmd-plugin/src/util.rs              |  60 +++-
 tests/plugin_persistence/mod.rs               |  22 +-
 tests/plugins/registry_file.rs                |  53 +++-
 6 files changed, 339 insertions(+), 81 deletions(-)

diff --git a/crates/nu-cmd-plugin/src/commands/plugin/add.rs b/crates/nu-cmd-plugin/src/commands/plugin/add.rs
index c12f486668..c603ddbb8c 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/add.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/add.rs
@@ -119,7 +119,7 @@ apparent the next time `nu` is next launched with that plugin registry file.
         let metadata = interface.get_metadata()?;
         let commands = interface.get_signature()?;
 
-        modify_plugin_file(engine_state, stack, call.head, custom_path, |contents| {
+        modify_plugin_file(engine_state, stack, call.head, &custom_path, |contents| {
             // Update the file with the received metadata and signatures
             let item = PluginRegistryItem::new(plugin.identity(), metadata, commands);
             contents.upsert_plugin(item);
diff --git a/crates/nu-cmd-plugin/src/commands/plugin/list.rs b/crates/nu-cmd-plugin/src/commands/plugin/list.rs
index 3fbf55b23c..367a532ef3 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/list.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/list.rs
@@ -1,5 +1,8 @@
-use itertools::Itertools;
+use itertools::{EitherOrBoth, Itertools};
 use nu_engine::command_prelude::*;
+use nu_protocol::{IntoValue, PluginRegistryItemData};
+
+use crate::util::read_plugin_file;
 
 #[derive(Clone)]
 pub struct PluginList;
@@ -17,7 +20,7 @@ impl Command for PluginList {
                     [
                         ("name".into(), Type::String),
                         ("version".into(), Type::String),
-                        ("is_running".into(), Type::Bool),
+                        ("status".into(), Type::String),
                         ("pid".into(), Type::Int),
                         ("filename".into(), Type::String),
                         ("shell".into(), Type::String),
@@ -26,11 +29,54 @@ impl Command for PluginList {
                     .into(),
                 ),
             )
+            .named(
+                "plugin-config",
+                SyntaxShape::Filepath,
+                "Use a plugin registry file other than the one set in `$nu.plugin-path`",
+                None,
+            )
+            .switch(
+                "engine",
+                "Show info for plugins that are loaded into the engine only.",
+                Some('e'),
+            )
+            .switch(
+                "registry",
+                "Show info for plugins from the registry file only.",
+                Some('r'),
+            )
             .category(Category::Plugin)
     }
 
     fn description(&self) -> &str {
-        "List installed plugins."
+        "List loaded and installed plugins."
+    }
+
+    fn extra_description(&self) -> &str {
+        r#"
+The `status` column will contain one of the following values:
+
+- `added`:    The plugin is present in the plugin registry file, but not in
+              the engine.
+- `loaded`:   The plugin is present both in the plugin registry file and in
+              the engine, but is not running.
+- `running`:  The plugin is currently running, and the `pid` column should
+              contain its process ID.
+- `modified`: The plugin state present in the plugin registry file is different
+              from the state in the engine.
+- `removed`:  The plugin is still loaded in the engine, but is not present in
+              the plugin registry file.
+- `invalid`:  The data in the plugin registry file couldn't be deserialized,
+              and the plugin most likely needs to be added again.
+
+`running` takes priority over any other status. Unless `--registry` is used
+or the plugin has not been loaded yet, the values of `version`, `filename`,
+`shell`, and `commands` reflect the values in the engine and not the ones in
+the plugin registry file.
+
+See also: `plugin use`
+"#
+        .trim()
     }
 
     fn search_terms(&self) -> Vec<&str> {
@@ -45,7 +91,7 @@ impl Command for PluginList {
                 result: Some(Value::test_list(vec![Value::test_record(record! {
                     "name" => Value::test_string("inc"),
                     "version" => Value::test_string(env!("CARGO_PKG_VERSION")),
-                    "is_running" => Value::test_bool(true),
+                    "status" => Value::test_string("running"),
                     "pid" => Value::test_int(106480),
                     "filename" => if cfg!(windows) {
                         Value::test_string(r"C:\nu\plugins\nu_plugin_inc.exe")
@@ -67,58 +113,189 @@ impl Command for PluginList {
     fn run(
         &self,
         engine_state: &EngineState,
-        _stack: &mut Stack,
+        stack: &mut Stack,
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let head = call.head;
+        let custom_path = call.get_flag(engine_state, stack, "plugin-config")?;
+        let engine_mode = call.has_flag(engine_state, stack, "engine")?;
+        let registry_mode = call.has_flag(engine_state, stack, "registry")?;
 
-        // Group plugin decls by plugin identity
-        let decls = engine_state.plugin_decls().into_group_map_by(|decl| {
-            decl.plugin_identity()
-                .expect("plugin decl should have identity")
-        });
+        let plugins_info = match (engine_mode, registry_mode) {
+            // --engine and --registry together is equivalent to the default.
+            (false, false) | (true, true) => {
+                if engine_state.plugin_path.is_some() || custom_path.is_some() {
+                    let plugins_in_engine = get_plugins_in_engine(engine_state);
+                    let plugins_in_registry =
+                        get_plugins_in_registry(engine_state, stack, call.head, &custom_path)?;
+                    merge_plugin_info(plugins_in_engine, plugins_in_registry)
+                } else {
+                    // Don't produce error when running nu --no-config-file
+                    get_plugins_in_engine(engine_state)
+                }
+            }
+            (true, false) => get_plugins_in_engine(engine_state),
+            (false, true) => get_plugins_in_registry(engine_state, stack, call.head, &custom_path)?,
+        };
 
-        // Build plugins list
-        let list = engine_state.plugins().iter().map(|plugin| {
-            // Find commands that belong to the plugin
-            let commands = decls.get(plugin.identity())
-                .into_iter()
-                .flat_map(|decls| {
-                    decls.iter().map(|decl| Value::string(decl.name(), head))
-                })
-                .collect();
-
-            let pid = plugin
-                .pid()
-                .map(|p| Value::int(p as i64, head))
-                .unwrap_or(Value::nothing(head));
-
-            let shell = plugin
-                .identity()
-                .shell()
-                .map(|s| Value::string(s.to_string_lossy(), head))
-                .unwrap_or(Value::nothing(head));
-
-            let metadata = plugin.metadata();
-            let version = metadata
-                .and_then(|m| m.version)
-                .map(|s| Value::string(s, head))
-                .unwrap_or(Value::nothing(head));
-
-            let record = record! {
-                "name" => Value::string(plugin.identity().name(), head),
-                "version" => version,
-                "is_running" => Value::bool(plugin.is_running(), head),
-                "pid" => pid,
-                "filename" => Value::string(plugin.identity().filename().to_string_lossy(), head),
-                "shell" => shell,
-                "commands" => Value::list(commands, head),
-            };
-
-            Value::record(record, head)
-        }).collect();
-
-        Ok(Value::list(list, head).into_pipeline_data())
+        Ok(plugins_info.into_value(call.head).into_pipeline_data())
+    }
+}
+
+#[derive(Debug, Clone, IntoValue, PartialOrd, Ord, PartialEq, Eq)]
+struct PluginInfo {
+    name: String,
+    version: Option<String>,
+    status: PluginStatus,
+    pid: Option<u32>,
+    filename: String,
+    shell: Option<String>,
+    commands: Vec<String>,
+}
+
+#[derive(Debug, Clone, Copy, IntoValue, PartialOrd, Ord, PartialEq, Eq)]
+#[nu_value(rename_all = "snake_case")]
+enum PluginStatus {
+    Added,
+    Loaded,
+    Running,
+    Modified,
+    Removed,
+    Invalid,
+}
+
+fn get_plugins_in_engine(engine_state: &EngineState) -> Vec<PluginInfo> {
+    // Group plugin decls by plugin identity
+    let decls = engine_state.plugin_decls().into_group_map_by(|decl| {
+        decl.plugin_identity()
+            .expect("plugin decl should have identity")
+    });
+
+    // Build plugins list
+    engine_state
+        .plugins()
+        .iter()
+        .map(|plugin| {
+            // Find commands that belong to the plugin
+            let commands = decls
+                .get(plugin.identity())
+                .into_iter()
+                .flat_map(|decls| decls.iter().map(|decl| decl.name().to_owned()))
+                .sorted()
+                .collect();
+
+            PluginInfo {
+                name: plugin.identity().name().into(),
+                version: plugin.metadata().and_then(|m| m.version),
+                status: if plugin.pid().is_some() {
+                    PluginStatus::Running
+                } else {
+                    PluginStatus::Loaded
+                },
+                pid: plugin.pid(),
+                filename: plugin.identity().filename().to_string_lossy().into_owned(),
+                shell: plugin
+                    .identity()
+                    .shell()
+                    .map(|path| path.to_string_lossy().into_owned()),
+                commands,
+            }
+        })
+        .sorted()
+        .collect()
+}
+
+fn get_plugins_in_registry(
+    engine_state: &EngineState,
+    stack: &mut Stack,
+    span: Span,
+    custom_path: &Option<Spanned<String>>,
+) -> Result<Vec<PluginInfo>, ShellError> {
+    let plugin_file_contents = read_plugin_file(engine_state, stack, span, custom_path)?;
+
+    let plugins_info = plugin_file_contents
+        .plugins
+        .into_iter()
+        .map(|plugin| {
+            let mut info = PluginInfo {
+                name: plugin.name,
+                version: None,
+                status: PluginStatus::Added,
+                pid: None,
+                filename: plugin.filename.to_string_lossy().into_owned(),
+                shell: plugin.shell.map(|path| path.to_string_lossy().into_owned()),
+                commands: vec![],
+            };
+
+            if let PluginRegistryItemData::Valid { metadata, commands } = plugin.data {
+                info.version = metadata.version;
+                info.commands = commands
+                    .into_iter()
+                    .map(|command| command.sig.name)
+                    .sorted()
+                    .collect();
+            } else {
+                info.status = PluginStatus::Invalid;
+            }
+            info
+        })
+        .sorted()
+        .collect();
+
+    Ok(plugins_info)
+}
+
+/// If no options are provided, the command loads from both the plugin list in the engine and what's
+/// in the registry file. We need to reconcile the two to set the proper states and make sure that
+/// new plugins that were added to the plugin registry file show up.
+fn merge_plugin_info(
+    from_engine: Vec<PluginInfo>,
+    from_registry: Vec<PluginInfo>,
+) -> Vec<PluginInfo> {
+    from_engine
+        .into_iter()
+        .merge_join_by(from_registry, |info_a, info_b| {
+            info_a.name.cmp(&info_b.name)
+        })
+        .map(|either_or_both| match either_or_both {
+            // Exists in the engine, but not in the registry file
+            EitherOrBoth::Left(info) => PluginInfo {
+                status: match info.status {
+                    PluginStatus::Running => info.status,
+                    // The plugin is not in the registry file, so it should be marked as `removed`
+                    _ => PluginStatus::Removed,
+                },
+                ..info
+            },
+            // Exists in the registry file, but not in the engine
+            EitherOrBoth::Right(info) => info,
+            // Exists in both
+            EitherOrBoth::Both(info_engine, info_registry) => PluginInfo {
+                status: match (info_engine.status, info_registry.status) {
+                    // Above all, `running` should be displayed if the plugin is running
+                    (PluginStatus::Running, _) => PluginStatus::Running,
+                    // `invalid` takes precedence over other states because the user probably wants
+                    // to fix it
+                    (_, PluginStatus::Invalid) => PluginStatus::Invalid,
+                    // Display `modified` if the state in the registry is different somehow
+                    _ if info_engine.is_modified(&info_registry) => PluginStatus::Modified,
+                    // Otherwise, `loaded` (it's not running)
+                    _ => PluginStatus::Loaded,
+                },
+                ..info_engine
+            },
+        })
+        .sorted()
+        .collect()
+}
+
+impl PluginInfo {
+    /// True if the plugin info shows some kind of change (other than status/pid) relative to the
+    /// other
+    fn is_modified(&self, other: &PluginInfo) -> bool {
+        self.name != other.name
+            || self.filename != other.filename
+            || self.shell != other.shell
+            || self.commands != other.commands
     }
 }
diff --git a/crates/nu-cmd-plugin/src/commands/plugin/rm.rs b/crates/nu-cmd-plugin/src/commands/plugin/rm.rs
index 33557836c0..a82b41524a 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/rm.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/rm.rs
@@ -87,7 +87,7 @@ fixed with `plugin add`.
 
         let filename = canonicalize_possible_filename_arg(engine_state, stack, &name.item);
 
-        modify_plugin_file(engine_state, stack, call.head, custom_path, |contents| {
+        modify_plugin_file(engine_state, stack, call.head, &custom_path, |contents| {
             if let Some(index) = contents
                 .plugins
                 .iter()
diff --git a/crates/nu-cmd-plugin/src/util.rs b/crates/nu-cmd-plugin/src/util.rs
index 6808a74a3c..80d1a766b4 100644
--- a/crates/nu-cmd-plugin/src/util.rs
+++ b/crates/nu-cmd-plugin/src/util.rs
@@ -6,18 +6,17 @@ use std::{
     path::PathBuf,
 };
 
-pub(crate) fn modify_plugin_file(
+fn get_plugin_registry_file_path(
     engine_state: &EngineState,
     stack: &mut Stack,
     span: Span,
-    custom_path: Option<Spanned<String>>,
-    operate: impl FnOnce(&mut PluginRegistryFile) -> Result<(), ShellError>,
-) -> Result<(), ShellError> {
+    custom_path: &Option<Spanned<String>>,
+) -> Result<PathBuf, ShellError> {
     #[allow(deprecated)]
     let cwd = current_dir(engine_state, stack)?;
 
-    let plugin_registry_file_path = if let Some(ref custom_path) = custom_path {
-        nu_path::expand_path_with(&custom_path.item, cwd, true)
+    if let Some(ref custom_path) = custom_path {
+        Ok(nu_path::expand_path_with(&custom_path.item, cwd, true))
     } else {
         engine_state
             .plugin_path
@@ -28,8 +27,53 @@ pub(crate) fn modify_plugin_file(
                 span: Some(span),
                 help: Some("you may be running `nu` with --no-config-file".into()),
                 inner: vec![],
-            })?
-    };
+            })
+    }
+}
+
+pub(crate) fn read_plugin_file(
+    engine_state: &EngineState,
+    stack: &mut Stack,
+    span: Span,
+    custom_path: &Option<Spanned<String>>,
+) -> Result<PluginRegistryFile, ShellError> {
+    let plugin_registry_file_path =
+        get_plugin_registry_file_path(engine_state, stack, span, custom_path)?;
+
+    let file_span = custom_path.as_ref().map(|p| p.span).unwrap_or(span);
+
+    // Try to read the plugin file if it exists
+    if fs::metadata(&plugin_registry_file_path).is_ok_and(|m| m.len() > 0) {
+        PluginRegistryFile::read_from(
+            File::open(&plugin_registry_file_path).map_err(|err| ShellError::IOErrorSpanned {
+                msg: format!(
+                    "failed to read `{}`: {}",
+                    plugin_registry_file_path.display(),
+                    err
+                ),
+                span: file_span,
+            })?,
+            Some(file_span),
+        )
+    } else if let Some(path) = custom_path {
+        Err(ShellError::FileNotFound {
+            file: path.item.clone(),
+            span: path.span,
+        })
+    } else {
+        Ok(PluginRegistryFile::default())
+    }
+}
+
+pub(crate) fn modify_plugin_file(
+    engine_state: &EngineState,
+    stack: &mut Stack,
+    span: Span,
+    custom_path: &Option<Spanned<String>>,
+    operate: impl FnOnce(&mut PluginRegistryFile) -> Result<(), ShellError>,
+) -> Result<(), ShellError> {
+    let plugin_registry_file_path =
+        get_plugin_registry_file_path(engine_state, stack, span, custom_path)?;
 
     let file_span = custom_path.as_ref().map(|p| p.span).unwrap_or(span);
 
diff --git a/tests/plugin_persistence/mod.rs b/tests/plugin_persistence/mod.rs
index 6729c657c7..587e4d480f 100644
--- a/tests/plugin_persistence/mod.rs
+++ b/tests/plugin_persistence/mod.rs
@@ -12,7 +12,7 @@ fn plugin_list_shows_installed_plugins() {
         plugins: [("nu_plugin_inc"), ("nu_plugin_custom_values")],
         r#"(plugin list).name | str join ','"#
     );
-    assert_eq!("inc,custom_values", out.out);
+    assert_eq!("custom_values,inc", out.out);
     assert!(out.status.success());
 }
 
@@ -34,15 +34,15 @@ fn plugin_keeps_running_after_calling_it() {
         plugin: ("nu_plugin_inc"),
         r#"
             plugin stop inc
-            (plugin list).0.is_running | print
+            (plugin list).0.status == running | print
             print ";"
             "2.0.0" | inc -m | ignore
-            (plugin list).0.is_running | print
+            (plugin list).0.status == running | print
         "#
     );
     assert_eq!(
         "false;true", out.out,
-        "plugin list didn't show is_running = true"
+        "plugin list didn't show status = running"
     );
     assert!(out.status.success());
 }
@@ -244,7 +244,7 @@ fn plugin_gc_can_be_configured_to_stop_plugins_immediately() {
             $env.config.plugin_gc = { default: { stop_after: 0sec } }
             "2.3.0" | inc -M
             sleep 100ms
-            (plugin list | where name == inc).0.is_running
+            (plugin list | where name == inc).0.status == running
         "#
     );
     assert!(out.status.success());
@@ -261,7 +261,7 @@ fn plugin_gc_can_be_configured_to_stop_plugins_immediately() {
             }
             "2.3.0" | inc -M
             sleep 100ms
-            (plugin list | where name == inc).0.is_running
+            (plugin list | where name == inc).0.status == running
         "#
     );
     assert!(out.status.success());
@@ -281,7 +281,7 @@ fn plugin_gc_can_be_configured_to_stop_plugins_after_delay() {
             while $cond {
                 sleep 100ms
                 $cond = (
-                    (plugin list | where name == inc).0.is_running and
+                    (plugin list | where name == inc).0.status == running and
                     ((date now) - $start) < 5sec
                 )
             }
@@ -310,7 +310,7 @@ fn plugin_gc_can_be_configured_to_stop_plugins_after_delay() {
             while $cond {
                 sleep 100ms
                 $cond = (
-                    (plugin list | where name == inc).0.is_running and
+                    (plugin list | where name == inc).0.status == running and
                     ((date now) - $start) < 5sec
                 )
             }
@@ -333,7 +333,7 @@ fn plugin_gc_can_be_configured_as_disabled() {
         r#"
             $env.config.plugin_gc = { default: { enabled: false, stop_after: 0sec } }
             "2.3.0" | inc -M
-            (plugin list | where name == inc).0.is_running
+            (plugin list | where name == inc).0.status == running
         "#
     );
     assert!(out.status.success());
@@ -350,7 +350,7 @@ fn plugin_gc_can_be_configured_as_disabled() {
                 }
             }
             "2.3.0" | inc -M
-            (plugin list | where name == inc).0.is_running
+            (plugin list | where name == inc).0.status == running
         "#
     );
     assert!(out.status.success());
@@ -367,7 +367,7 @@ fn plugin_gc_can_be_disabled_by_plugin() {
             $env.config.plugin_gc = { default: { stop_after: 0sec } }
             example one 1 foo | ignore # ensure we've run the plugin with the new config
             sleep 100ms
-            (plugin list | where name == example).0.is_running
+            (plugin list | where name == example).0.status == running
         "#
     );
     assert!(out.status.success());
diff --git a/tests/plugins/registry_file.rs b/tests/plugins/registry_file.rs
index 2cb1473b6f..a2ca8735f0 100644
--- a/tests/plugins/registry_file.rs
+++ b/tests/plugins/registry_file.rs
@@ -37,7 +37,7 @@ fn plugin_add_then_restart_nu() {
                     --config $nu.config-path
                     --env-config $nu.env-path
                     --plugin-config $nu.plugin-path
-                    --commands 'plugin list | get name | to json --raw'
+                    --commands 'plugin list --engine | get name | to json --raw'
             )
         ", example_plugin_path().display())
     );
@@ -69,7 +69,7 @@ fn plugin_add_in_nu_plugin_dirs_const() {
                         --config $nu.config-path
                         --env-config $nu.env-path
                         --plugin-config $nu.plugin-path
-                        --commands 'plugin list | get name | to json --raw'
+                        --commands 'plugin list --engine | get name | to json --raw'
                 )
             "#,
             dirname.display(),
@@ -103,7 +103,7 @@ fn plugin_add_in_nu_plugin_dirs_env() {
                         --config $nu.config-path
                         --env-config $nu.env-path
                         --plugin-config $nu.plugin-path
-                        --commands 'plugin list | get name | to json --raw'
+                        --commands 'plugin list --engine | get name | to json --raw'
                 )
             "#,
             dirname.display(),
@@ -199,7 +199,7 @@ fn plugin_rm_then_restart_nu() {
                 "--plugin-config",
                 "test-plugin-file.msgpackz",
                 "--commands",
-                "plugin list | get name | to json --raw",
+                "plugin list --engine | get name | to json --raw",
             ])
             .assert()
             .success()
@@ -364,7 +364,7 @@ fn warning_on_invalid_plugin_item() {
                 "--plugin-config",
                 "test-plugin-file.msgpackz",
                 "--commands",
-                "plugin list | get name | to json --raw",
+                "plugin list --engine | get name | to json --raw",
             ])
             .output()
             .expect("failed to run nu");
@@ -412,6 +412,43 @@ fn plugin_use_error_not_found() {
     })
 }
 
+#[test]
+fn plugin_shows_up_in_default_plugin_list_after_add() {
+    let example_plugin_path = example_plugin_path();
+    let result = nu_with_plugins!(
+        cwd: ".",
+        plugins: [],
+        &format!(r#"
+            plugin add '{}'
+            plugin list | get status | to json --raw
+        "#, example_plugin_path.display())
+    );
+    assert!(result.status.success());
+    assert_eq!(r#"["added"]"#, result.out);
+}
+
+#[test]
+fn plugin_shows_removed_after_removing() {
+    let example_plugin_path = example_plugin_path();
+    let result = nu_with_plugins!(
+        cwd: ".",
+        plugins: [],
+        &format!(r#"
+            plugin add '{}'
+            plugin list | get status | to json --raw
+            (
+                ^$nu.current-exe
+                    --config $nu.config-path
+                    --env-config $nu.env-path
+                    --plugin-config $nu.plugin-path
+                    --commands 'plugin rm example; plugin list | get status | to json --raw'
+            )
+        "#, example_plugin_path.display())
+    );
+    assert!(result.status.success());
+    assert_eq!(r#"["removed"]"#, result.out);
+}
+
 #[test]
 fn plugin_add_and_then_use() {
     let example_plugin_path = example_plugin_path();
@@ -425,7 +462,7 @@ fn plugin_add_and_then_use() {
                     --config $nu.config-path
                     --env-config $nu.env-path
                     --plugin-config $nu.plugin-path
-                    --commands 'plugin use example; plugin list | get name | to json --raw'
+                    --commands 'plugin use example; plugin list --engine | get name | to json --raw'
             )
         "#, example_plugin_path.display())
     );
@@ -446,7 +483,7 @@ fn plugin_add_and_then_use_by_filename() {
                     --config $nu.config-path
                     --env-config $nu.env-path
                     --plugin-config $nu.plugin-path
-                    --commands 'plugin use '{0}'; plugin list | get name | to json --raw'
+                    --commands 'plugin use '{0}'; plugin list --engine | get name | to json --raw'
             )
         "#, example_plugin_path.display())
     );
@@ -471,7 +508,7 @@ fn plugin_add_then_use_with_custom_path() {
             cwd: dirs.test(),
             r#"
                 plugin use --plugin-config test-plugin-file.msgpackz example
-                plugin list | get name | to json --raw
+                plugin list --engine | get name | to json --raw
             "#
         );
 

From b0427ca9ffae2623a352f3ef4b193e50216fd21c Mon Sep 17 00:00:00 2001
From: Solomon <git@solomonvictorino.com>
Date: Thu, 17 Oct 2024 02:25:17 +0000
Subject: [PATCH 0575/1072] run ensure_flag_arg_type for short flag values
 (#14074)

Closes #13654

# User-Facing Changes

- Short flags are now fully type-checked,
  including null and record signatures for literal arguments:

```nushell
def test [-v: record<l: int>] {};
test -v null # error
test -v {l: ""} # error

def test2 [-v: int] {};
let v = ""
test2 -v $v # error
```

- `polars unpivot` `--index`/`--on` and `into value --columns`
now accept `list` values
---
 .../nu-command/src/conversions/into/value.rs  |  2 +-
 crates/nu-parser/src/parser.rs                | 23 ++++++++-----------
 .../src/dataframe/command/data/unpivot.rs     |  4 ++--
 tests/repl/test_custom_commands.rs            | 18 ++++++++++++---
 4 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/crates/nu-command/src/conversions/into/value.rs b/crates/nu-command/src/conversions/into/value.rs
index 52e5ab339c..99b1daf4b7 100644
--- a/crates/nu-command/src/conversions/into/value.rs
+++ b/crates/nu-command/src/conversions/into/value.rs
@@ -18,7 +18,7 @@ impl Command for IntoValue {
             .input_output_types(vec![(Type::table(), Type::table())])
             .named(
                 "columns",
-                SyntaxShape::Table(vec![]),
+                SyntaxShape::List(Box::new(SyntaxShape::Any)),
                 "list of columns to update",
                 Some('c'),
             )
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 232fc50b3d..64a5086628 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -1067,30 +1067,27 @@ pub fn parse_internal_call(
                     if let Some(arg_shape) = flag.arg {
                         if let Some(arg) = spans.get(spans_idx + 1) {
                             let arg = parse_value(working_set, *arg, &arg_shape);
+                            let (arg_name, val_expression) = ensure_flag_arg_type(
+                                working_set,
+                                flag.long.clone(),
+                                arg.clone(),
+                                &arg_shape,
+                                spans[spans_idx],
+                            );
 
                             if flag.long.is_empty() {
                                 if let Some(short) = flag.short {
                                     call.add_named((
-                                        Spanned {
-                                            item: String::new(),
-                                            span: spans[spans_idx],
-                                        },
+                                        arg_name,
                                         Some(Spanned {
                                             item: short.to_string(),
                                             span: spans[spans_idx],
                                         }),
-                                        Some(arg),
+                                        Some(val_expression),
                                     ));
                                 }
                             } else {
-                                call.add_named((
-                                    Spanned {
-                                        item: flag.long.clone(),
-                                        span: spans[spans_idx],
-                                    },
-                                    None,
-                                    Some(arg),
-                                ));
+                                call.add_named((arg_name, None, Some(val_expression)));
                             }
                             spans_idx += 1;
                         } else {
diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/unpivot.rs b/crates/nu_plugin_polars/src/dataframe/command/data/unpivot.rs
index 5235305de2..ffbbd66916 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/unpivot.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/unpivot.rs
@@ -31,13 +31,13 @@ impl PluginCommand for UnpivotDF {
         Signature::build(self.name())
             .required_named(
                 "index",
-                SyntaxShape::Table(vec![]),
+                SyntaxShape::List(Box::new(SyntaxShape::Any)),
                 "column names for unpivoting",
                 Some('i'),
             )
             .required_named(
                 "on",
-                SyntaxShape::Table(vec![]),
+                SyntaxShape::List(Box::new(SyntaxShape::Any)),
                 "column names used as value columns",
                 Some('o'),
             )
diff --git a/tests/repl/test_custom_commands.rs b/tests/repl/test_custom_commands.rs
index 1710b35913..a93d3fbba8 100644
--- a/tests/repl/test_custom_commands.rs
+++ b/tests/repl/test_custom_commands.rs
@@ -1,6 +1,7 @@
 use crate::repl::tests::{fail_test, run_test, run_test_contains, TestResult};
 use nu_test_support::nu;
 use pretty_assertions::assert_eq;
+use rstest::rstest;
 
 #[test]
 fn no_scope_leak1() -> TestResult {
@@ -73,10 +74,21 @@ fn custom_switch1() -> TestResult {
     )
 }
 
-#[test]
-fn custom_flag_with_type_checking() -> TestResult {
+#[rstest]
+fn custom_flag_with_type_checking(
+    #[values(
+        ("int", "\"3\""),
+        ("int", "null"),
+        ("record<i: int>", "{i: \"\"}"),
+        ("list<int>", "[\"\"]")
+    )]
+    type_sig_value: (&str, &str),
+    #[values("--dry-run", "-d")] flag: &str,
+) -> TestResult {
+    let (type_sig, value) = type_sig_value;
+
     fail_test(
-        r#"def florb [--dry-run: int] { $dry_run }; let y = "3"; florb --dry-run=$y"#,
+        &format!("def florb [{flag}: {type_sig}] {{}}; let y = {value}; florb {flag} $y"),
         "type_mismatch",
     )
 }

From d7014e671d89fda280110456c87068131cde53dc Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Thu, 17 Oct 2024 10:25:45 +0800
Subject: [PATCH 0576/1072] `use` command: Don't create a variable with empty
 record if it doesn't define any constants (#14051)

# Description
Fixes: #13967

The key changes lays in `nu-protocol/src/module.rs`, when resolving
import pattern, nushell only needs to bring `$module` with a record
value if it defines any constants.

# User-Facing Changes
```nushell
module spam {}
use spam
```
Will no longer create a `$spam` variable with an empty record.

# Tests + Formatting
Adjusted some tests and added some tests.
---
 crates/nu-protocol/src/module.rs | 29 ++++++++++++----------
 tests/const_/mod.rs              | 41 +++++++++++++++++++++-----------
 tests/repl/test_modules.rs       |  5 ++++
 3 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/crates/nu-protocol/src/module.rs b/crates/nu-protocol/src/module.rs
index 6b4aec0c60..02bac131dc 100644
--- a/crates/nu-protocol/src/module.rs
+++ b/crates/nu-protocol/src/module.rs
@@ -161,20 +161,25 @@ impl Module {
             }
 
             let span = self.span.unwrap_or(backup_span);
-            let const_record = Value::record(
-                const_rows
-                    .into_iter()
-                    .map(|(name, val)| (String::from_utf8_lossy(&name).to_string(), val))
-                    .collect(),
-                span,
-            );
+
+            // only needs to bring `$module` with a record value if it defines any constants.
+            let constants = if const_rows.is_empty() {
+                vec![]
+            } else {
+                vec![(
+                    final_name.clone(),
+                    Value::record(
+                        const_rows
+                            .into_iter()
+                            .map(|(name, val)| (String::from_utf8_lossy(&name).to_string(), val))
+                            .collect(),
+                        span,
+                    ),
+                )]
+            };
 
             return (
-                ResolvedImportPattern::new(
-                    decls,
-                    vec![(final_name.clone(), self_id)],
-                    vec![(final_name, const_record)],
-                ),
+                ResolvedImportPattern::new(decls, vec![(final_name.clone(), self_id)], constants),
                 errors,
             );
         };
diff --git a/tests/const_/mod.rs b/tests/const_/mod.rs
index f736b785ca..0c4ff5d77c 100644
--- a/tests/const_/mod.rs
+++ b/tests/const_/mod.rs
@@ -238,13 +238,30 @@ fn complex_const_export() {
     let actual = nu!(&inp.join("; "));
     assert_eq!(actual.out, "eats");
 
-    let inp = &[
-        MODULE_SETUP,
-        "use spam",
-        "($spam.eggs.bacon.none | is-empty)",
-    ];
+    let inp = &[MODULE_SETUP, "use spam", "'none' in $spam.eggs.bacon"];
     let actual = nu!(&inp.join("; "));
-    assert_eq!(actual.out, "true");
+    assert_eq!(actual.out, "false");
+}
+
+#[test]
+fn only_nested_module_have_const() {
+    let setup = r#"
+        module spam {
+            export module eggs {
+                export module bacon {
+                    export const viking = 'eats'
+                    export module none {}
+                }
+            }
+        }
+    "#;
+    let inp = &[setup, "use spam", "$spam.eggs.bacon.viking"];
+    let actual = nu!(&inp.join("; "));
+    assert_eq!(actual.out, "eats");
+
+    let inp = &[setup, "use spam", "'none' in $spam.eggs.bacon"];
+    let actual = nu!(&inp.join("; "));
+    assert_eq!(actual.out, "false");
 }
 
 #[test]
@@ -261,20 +278,16 @@ fn complex_const_glob_export() {
     let actual = nu!(&inp.join("; "));
     assert_eq!(actual.out, "eats");
 
-    let inp = &[MODULE_SETUP, "use spam *", "($eggs.bacon.none | is-empty)"];
+    let inp = &[MODULE_SETUP, "use spam *", "'none' in $eggs.bacon"];
     let actual = nu!(&inp.join("; "));
-    assert_eq!(actual.out, "true");
+    assert_eq!(actual.out, "false");
 }
 
 #[test]
 fn complex_const_drill_export() {
-    let inp = &[
-        MODULE_SETUP,
-        "use spam eggs bacon none",
-        "($none | is-empty)",
-    ];
+    let inp = &[MODULE_SETUP, "use spam eggs bacon none", "$none"];
     let actual = nu!(&inp.join("; "));
-    assert_eq!(actual.out, "true");
+    assert!(actual.err.contains("variable not found"));
 }
 
 #[test]
diff --git a/tests/repl/test_modules.rs b/tests/repl/test_modules.rs
index dd62c74b77..289efd291a 100644
--- a/tests/repl/test_modules.rs
+++ b/tests/repl/test_modules.rs
@@ -120,6 +120,11 @@ fn export_consts() -> TestResult {
     )
 }
 
+#[test]
+fn dont_export_module_name_as_a_variable() -> TestResult {
+    fail_test(r#"module spam { }; use spam; $spam"#, "variable not found")
+}
+
 #[test]
 fn func_use_consts() -> TestResult {
     run_test(

From 5758993e9fc72881703038ad40b939f0b2336139 Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Thu, 17 Oct 2024 05:19:59 -0400
Subject: [PATCH 0577/1072] Add count to uniq search terms (#14108)

Adds "count" to uniq's search terms, to facilitate discovery of the
`--count` option
---
 crates/nu-command/src/filters/uniq.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-command/src/filters/uniq.rs b/crates/nu-command/src/filters/uniq.rs
index a22d62b89e..3a82e73aa1 100644
--- a/crates/nu-command/src/filters/uniq.rs
+++ b/crates/nu-command/src/filters/uniq.rs
@@ -46,7 +46,7 @@ impl Command for Uniq {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["distinct", "deduplicate"]
+        vec!["distinct", "deduplicate", "count"]
     }
 
     fn run(

From 7e055810b191795cbefffee5243df244f9b9bc93 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 17 Oct 2024 09:15:42 -0500
Subject: [PATCH 0578/1072] add `like` and `not-like` operators as synonyms for
 the regex operators `=~` and `!~` (#14072)

# Description

This PR adds `like` as a synonym for `=~` and `not-like` as a synonym
for `!~`. This is mainly a quality-of-life change to help those people
who think in sql.


![image](https://github.com/user-attachments/assets/a0b142cd-30c9-487d-b755-d6da0a0874ec)

closes #13261

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-cli/src/completions/operator_completions.rs | 2 ++
 crates/nu-parser/src/parser.rs                        | 4 ++--
 crates/nu-protocol/src/ast/operator.rs                | 4 ++--
 crates/nu-std/std/help/mod.nu                         | 6 +++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/crates/nu-cli/src/completions/operator_completions.rs b/crates/nu-cli/src/completions/operator_completions.rs
index e9e95d0799..460e7f590b 100644
--- a/crates/nu-cli/src/completions/operator_completions.rs
+++ b/crates/nu-cli/src/completions/operator_completions.rs
@@ -67,7 +67,9 @@ impl Completer for OperatorCompletion {
             ],
             Expr::String(_) => vec![
                 ("=~", "Contains regex match"),
+                ("like", "Contains regex match"),
                 ("!~", "Does not contain regex match"),
+                ("not-like", "Does not contain regex match"),
                 (
                     "++",
                     "Appends two lists, a list and a value, two strings, or two binary values",
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 64a5086628..d2ed11188a 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -5018,8 +5018,8 @@ pub fn parse_operator(working_set: &mut StateWorkingSet, span: Span) -> Expressi
         b"<=" => Operator::Comparison(Comparison::LessThanOrEqual),
         b">" => Operator::Comparison(Comparison::GreaterThan),
         b">=" => Operator::Comparison(Comparison::GreaterThanOrEqual),
-        b"=~" => Operator::Comparison(Comparison::RegexMatch),
-        b"!~" => Operator::Comparison(Comparison::NotRegexMatch),
+        b"=~" | b"like" => Operator::Comparison(Comparison::RegexMatch),
+        b"!~" | b"not-like" => Operator::Comparison(Comparison::NotRegexMatch),
         b"+" => Operator::Math(Math::Plus),
         b"++" => Operator::Math(Math::Append),
         b"-" => Operator::Math(Math::Minus),
diff --git a/crates/nu-protocol/src/ast/operator.rs b/crates/nu-protocol/src/ast/operator.rs
index 713c6c0060..8c2e59d93a 100644
--- a/crates/nu-protocol/src/ast/operator.rs
+++ b/crates/nu-protocol/src/ast/operator.rs
@@ -115,8 +115,8 @@ impl Display for Operator {
             Operator::Comparison(Comparison::NotEqual) => write!(f, "!="),
             Operator::Comparison(Comparison::LessThan) => write!(f, "<"),
             Operator::Comparison(Comparison::GreaterThan) => write!(f, ">"),
-            Operator::Comparison(Comparison::RegexMatch) => write!(f, "=~"),
-            Operator::Comparison(Comparison::NotRegexMatch) => write!(f, "!~"),
+            Operator::Comparison(Comparison::RegexMatch) => write!(f, "=~ or like"),
+            Operator::Comparison(Comparison::NotRegexMatch) => write!(f, "!~ or not-like"),
             Operator::Comparison(Comparison::LessThanOrEqual) => write!(f, "<="),
             Operator::Comparison(Comparison::GreaterThanOrEqual) => write!(f, ">="),
             Operator::Comparison(Comparison::StartsWith) => write!(f, "starts-with"),
diff --git a/crates/nu-std/std/help/mod.nu b/crates/nu-std/std/help/mod.nu
index d608ae8bcb..089bbff7f8 100644
--- a/crates/nu-std/std/help/mod.nu
+++ b/crates/nu-std/std/help/mod.nu
@@ -47,8 +47,8 @@ def get-all-operators [] { return [
     [Comparison, <=, LessThanOrEqual, "Checks if a value is less than or equal to another.", 80]
     [Comparison, >, GreaterThan, "Checks if a value is greater than another.", 80]
     [Comparison, >=, GreaterThanOrEqual, "Checks if a value is greater than or equal to another.", 80]
-    [Comparison, =~, RegexMatch, "Checks if a value matches a regular expression.", 80]
-    [Comparison, !~, NotRegexMatch, "Checks if a value does not match a regular expression.", 80]
+    [Comparison, '=~ or like', RegexMatch, "Checks if a value matches a regular expression.", 80]
+    [Comparison, '!~ or not-like', NotRegexMatch, "Checks if a value does not match a regular expression.", 80]
     [Comparison, in, In, "Checks if a value is in a list or string.", 80]
     [Comparison, not-in, NotIn, "Checks if a value is not in a list or string.", 80]
     [Comparison, starts-with, StartsWith, "Checks if a string starts with another.", 80]
@@ -771,7 +771,7 @@ You can also learn more at (ansi default_italic)(ansi light_cyan_underline)https
 
     let modules = (try { modules $target_item --find $find })
     if not ($modules | is-empty) { return $modules }
-    
+
     if ($find | is-not-empty) {
         print -e $"No help results found mentioning: ($find)"
         return []

From 7c5dcbb3fc221788b5f4bb8dc874e2acc8c3da1a Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Thu, 17 Oct 2024 10:01:08 -0700
Subject: [PATCH 0579/1072] Update to rust 1.80.1 (#14106)

This can be merged on 10/17 once 1.82.0 is out.

---------

Co-authored-by: Wind <WindSoilder@outlook.com>
---
 Cargo.toml                                   | 4 ++--
 crates/nu-plugin/src/plugin/interface/mod.rs | 3 +--
 rust-toolchain.toml                          | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 82bbf99d37..b45160c9a5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ homepage = "https://www.nushell.sh"
 license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
-rust-version = "1.79.0"
+rust-version = "1.80.1"
 version = "0.99.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -320,4 +320,4 @@ bench = false
 # Run individual benchmarks like `cargo bench -- <regex>` e.g. `cargo bench -- parse`
 [[bench]]
 name = "benchmarks"
-harness = false
\ No newline at end of file
+harness = false
diff --git a/crates/nu-plugin/src/plugin/interface/mod.rs b/crates/nu-plugin/src/plugin/interface/mod.rs
index fc40b9c732..be7b2e0dfc 100644
--- a/crates/nu-plugin/src/plugin/interface/mod.rs
+++ b/crates/nu-plugin/src/plugin/interface/mod.rs
@@ -1091,8 +1091,7 @@ fn set_pgrp_from_enter_foreground(pgrp: i64) -> Result<(), ShellError> {
 fn set_pgrp_from_enter_foreground(_pgrp: i64) -> Result<(), ShellError> {
     Err(ShellError::NushellFailed {
         msg: concat!(
-            "EnterForeground asked plugin to join process group, but not supported on ",
-            cfg!(target_os)
+            "EnterForeground asked plugin to join process group, but this is not supported on non UNIX platforms.",
         )
         .into(),
     })
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index bb2f1fcb35..183da649b8 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -16,4 +16,4 @@ profile = "default"
 # use in nushell, we may opt to use the bleeding edge stable version of rust.
 # I believe rust is on a 6 week release cycle and nushell is on a 4 week release cycle.
 # So, every two nushell releases, this version number should be bumped by one.
-channel = "1.79.0"
+channel = "1.80.1"

From 740fe942c12e97b253f69831aaa67011ec57d3a7 Mon Sep 17 00:00:00 2001
From: YizhePKU <yizhe@pku.edu.cn>
Date: Fri, 18 Oct 2024 01:12:45 +0800
Subject: [PATCH 0580/1072] Reduce duplicate dependencies on the `windows`
 crate (#14105)

Nushell currently depends on three different versions of the `windows`
crate: `0.44.0`, `0.52.0`, and `0.54.0`. This PR bumps several
dependencies so that the `nu` binary only depends on `0.56.0`.

On my machine, this PR makes `cargo build` about 10% faster.

The polars plugin still uses its own version of the `windows` crate
though, which is not ideal. We'll need to bump the `polars` crate to fix
that, but it breaks a lot of our code. (`polars 1.0` release anyone?)
---
 Cargo.lock                          | 166 +++++++++++-----------------
 Cargo.toml                          |   6 +-
 crates/nu-command/src/debug/info.rs |   6 +-
 3 files changed, 69 insertions(+), 109 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f8992529f9..cfbcb63c46 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2611,15 +2611,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "malloc_buf"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "markup5ever"
 version = "0.12.1"
@@ -3025,7 +3016,7 @@ dependencies = [
  "percent-encoding",
  "reedline",
  "rstest",
- "sysinfo",
+ "sysinfo 0.32.0",
  "tempfile",
  "unicode-segmentation",
  "uuid",
@@ -3187,7 +3178,7 @@ dependencies = [
  "serde_urlencoded",
  "serde_yaml",
  "sha2",
- "sysinfo",
+ "sysinfo 0.32.0",
  "tabled",
  "tempfile",
  "terminal_size",
@@ -3210,7 +3201,7 @@ dependencies = [
  "v_htmlescape",
  "wax",
  "which",
- "windows 0.54.0",
+ "windows 0.56.0",
  "winreg",
 ]
 
@@ -3356,7 +3347,7 @@ dependencies = [
  "rmp-serde",
  "serde",
  "serde_json",
- "windows 0.54.0",
+ "windows 0.56.0",
 ]
 
 [[package]]
@@ -3372,7 +3363,7 @@ dependencies = [
  "nu-utils",
  "serde",
  "typetag",
- "windows 0.54.0",
+ "windows 0.56.0",
 ]
 
 [[package]]
@@ -3477,8 +3468,8 @@ dependencies = [
  "ntapi",
  "once_cell",
  "procfs",
- "sysinfo",
- "windows 0.54.0",
+ "sysinfo 0.32.0",
+ "windows 0.56.0",
 ]
 
 [[package]]
@@ -3761,15 +3752,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "objc"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
-dependencies = [
- "malloc_buf",
-]
-
 [[package]]
 name = "objc-sys"
 version = "0.3.5"
@@ -4729,7 +4711,7 @@ dependencies = [
  "rayon",
  "smartstring",
  "stacker",
- "sysinfo",
+ "sysinfo 0.30.13",
  "version_check",
 ]
 
@@ -6115,10 +6097,23 @@ dependencies = [
  "libc",
  "ntapi",
  "once_cell",
- "rayon",
  "windows 0.52.0",
 ]
 
+[[package]]
+name = "sysinfo"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3b5ae3f4f7d64646c46c4cae4e3f01d1c5d255c7406fdd7c7f999a94e488791"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+ "memchr",
+ "ntapi",
+ "rayon",
+ "windows 0.56.0",
+]
+
 [[package]]
 name = "tabled"
 version = "0.16.0"
@@ -6442,18 +6437,19 @@ dependencies = [
 
 [[package]]
 name = "trash"
-version = "3.3.1"
+version = "5.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c658458d46d9d5a153a3b5cdd88d8579ad50d4fb85d53961e4526c8fc7c55a57"
+checksum = "33caf2a9be1812a263a4bfce74d2de225fcde12ee7b77001361abd2b34ffdcc4"
 dependencies = [
  "chrono",
  "libc",
  "log",
- "objc",
+ "objc2",
+ "objc2-foundation",
  "once_cell",
  "scopeguard",
- "url",
- "windows 0.44.0",
+ "urlencoding",
+ "windows 0.56.0",
 ]
 
 [[package]]
@@ -6642,6 +6638,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "urlencoding"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
+
 [[package]]
 name = "utf-8"
 version = "0.7.6"
@@ -7083,15 +7085,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "windows"
-version = "0.44.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
-dependencies = [
- "windows-targets 0.42.2",
-]
-
 [[package]]
 name = "windows"
 version = "0.52.0"
@@ -7104,11 +7097,11 @@ dependencies = [
 
 [[package]]
 name = "windows"
-version = "0.54.0"
+version = "0.56.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
+checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132"
 dependencies = [
- "windows-core 0.54.0",
+ "windows-core 0.56.0",
  "windows-targets 0.52.6",
 ]
 
@@ -7123,14 +7116,38 @@ dependencies = [
 
 [[package]]
 name = "windows-core"
-version = "0.54.0"
+version = "0.56.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
+checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6"
 dependencies = [
+ "windows-implement",
+ "windows-interface",
  "windows-result",
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-implement"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.75",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.75",
+]
+
 [[package]]
 name = "windows-result"
 version = "0.1.2"
@@ -7180,21 +7197,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-targets"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -7226,12 +7228,6 @@ dependencies = [
  "windows_x86_64_msvc 0.52.6",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -7250,12 +7246,6 @@ version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -7274,12 +7264,6 @@ version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -7304,12 +7288,6 @@ version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -7328,12 +7306,6 @@ version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
@@ -7346,12 +7318,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
@@ -7370,12 +7336,6 @@ version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
diff --git a/Cargo.toml b/Cargo.toml
index b45160c9a5..7ad7d9f5c3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -153,13 +153,13 @@ serde_yaml = "0.9"
 sha2 = "0.10"
 strip-ansi-escapes = "0.2.0"
 syn = "2.0"
-sysinfo = "0.30"
+sysinfo = "0.32"
 tabled = { version = "0.16.0", default-features = false }
 tempfile = "3.13"
 terminal_size = "0.3"
 titlecase = "2.0"
 toml = "0.8"
-trash = "3.3"
+trash = "5.1"
 umask = "2.1"
 unicode-segmentation = "1.12"
 unicode-width = "0.1"
@@ -176,7 +176,7 @@ uuid = "1.10.0"
 v_htmlescape = "0.15.0"
 wax = "0.6"
 which = "6.0.0"
-windows = "0.54"
+windows = "0.56"
 windows-sys = "0.48"
 winreg = "0.52"
 
diff --git a/crates/nu-command/src/debug/info.rs b/crates/nu-command/src/debug/info.rs
index da4689738e..2a680ae20d 100644
--- a/crates/nu-command/src/debug/info.rs
+++ b/crates/nu-command/src/debug/info.rs
@@ -101,7 +101,7 @@ fn all_columns(span: Span) -> Value {
         let environment = {
             let mut env_rec = Record::new();
             for val in p.environ() {
-                if let Some((key, value)) = val.split_once('=') {
+                if let Some((key, value)) = val.to_string_lossy().split_once('=') {
                     let is_env_var_a_list = {
                         {
                             #[cfg(target_family = "windows")]
@@ -146,8 +146,8 @@ fn all_columns(span: Span) -> Value {
                 "root" => root,
                 "cwd" => cwd,
                 "exe_path" => exe_path,
-                "command" => Value::string(p.cmd().join(" "), span),
-                "name" => Value::string(p.name(), span),
+                "command" => Value::string(p.cmd().join(std::ffi::OsStr::new(" ")).to_string_lossy(), span),
+                "name" => Value::string(p.name().to_string_lossy(), span),
                 "environment" => environment,
             },
             span,

From 7f2f67238fb225663f5b0f047ba979fbb35edd03 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 17 Oct 2024 16:14:01 -0500
Subject: [PATCH 0581/1072] allow `group-by` and `split-by` to work with other
 values (#14086)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

This PR updates `group-by` and `split-by` to allow other nushell Values
to be used, namely bools.

### Before
```nushell
❯ [false, false, true, false, true, false] | group-by | table -e
Error: nu::shell::cant_convert

  × Can't convert to string.
   ╭─[entry #1:1:2]
 1 │ [false, false, true, false, true, false] | group-by | table -e
   ·  ──┬──
   ·    ╰── can't convert bool to string
   ╰────
```
### After
```nushell
❯ [false, false, true, false, true, false] | group-by | table -e
╭───────┬───────────────╮
│       │ ╭───┬───────╮ │
│ false │ │ 0 │ false │ │
│       │ │ 1 │ false │ │
│       │ │ 2 │ false │ │
│       │ │ 3 │ false │ │
│       │ ╰───┴───────╯ │
│       │ ╭───┬──────╮  │
│ true  │ │ 0 │ true │  │
│       │ │ 1 │ true │  │
│       │ ╰───┴──────╯  │
╰───────┴───────────────╯
```

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/filters/group_by.rs    | 40 ++++++++++++---
 crates/nu-command/src/filters/split_by.rs    | 21 ++++----
 crates/nu-command/tests/commands/group_by.rs | 52 +++++++++-----------
 3 files changed, 70 insertions(+), 43 deletions(-)

diff --git a/crates/nu-command/src/filters/group_by.rs b/crates/nu-command/src/filters/group_by.rs
index 78789c606a..74a19c38e3 100644
--- a/crates/nu-command/src/filters/group_by.rs
+++ b/crates/nu-command/src/filters/group_by.rs
@@ -38,6 +38,14 @@ impl Command for GroupBy {
         "Splits a list or table into groups, and returns a record containing those groups."
     }
 
+    fn extra_description(&self) -> &str {
+        r#"the group-by command makes some assumptions:
+    - if the input data is not a string, the grouper will convert the key to string but the values will remain in their original format. e.g. with bools, "true" and true would be in the same group (see example).
+    - datetime is formatted based on your configuration setting. use `format date` to change the format.
+    - filesize is formatted based on your configuration setting. use `format filesize` to change the format.
+    - some nushell values are not supported, such as closures."#
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,
@@ -114,6 +122,20 @@ impl Command for GroupBy {
                     }),
                 ])),
             },
+            Example {
+                description: "Group bools, whether they are strings or actual bools",
+                example: r#"[true "true" false "false"] | group-by"#,
+                result: Some(Value::test_record(record! {
+                    "true" => Value::test_list(vec![
+                        Value::test_bool(true),
+                        Value::test_string("true"),
+                    ]),
+                    "false" => Value::test_list(vec![
+                        Value::test_bool(false),
+                        Value::test_string("false"),
+                    ]),
+                })),
+            }
         ]
     }
 }
@@ -127,6 +149,7 @@ pub fn group_by(
     let head = call.head;
     let grouper: Option<Value> = call.opt(engine_state, stack, 0)?;
     let to_table = call.has_flag(engine_state, stack, "to-table")?;
+    let config = engine_state.get_config();
 
     let values: Vec<Value> = input.into_iter().collect();
     if values.is_empty() {
@@ -137,7 +160,7 @@ pub fn group_by(
         Some(grouper) => {
             let span = grouper.span();
             match grouper {
-                Value::CellPath { val, .. } => group_cell_path(val, values)?,
+                Value::CellPath { val, .. } => group_cell_path(val, values, config)?,
                 Value::Closure { val, .. } => {
                     group_closure(values, span, *val, engine_state, stack)?
                 }
@@ -149,7 +172,7 @@ pub fn group_by(
                 }
             }
         }
-        None => group_no_grouper(values)?,
+        None => group_no_grouper(values, config)?,
     };
 
     let value = if to_table {
@@ -164,6 +187,7 @@ pub fn group_by(
 fn group_cell_path(
     column_name: CellPath,
     values: Vec<Value>,
+    config: &nu_protocol::Config,
 ) -> Result<IndexMap<String, Vec<Value>>, ShellError> {
     let mut groups = IndexMap::<_, Vec<_>>::new();
 
@@ -176,18 +200,21 @@ fn group_cell_path(
             continue; // likely the result of a failed optional access, ignore this value
         }
 
-        let key = key.coerce_string()?;
+        let key = key.to_abbreviated_string(config);
         groups.entry(key).or_default().push(value);
     }
 
     Ok(groups)
 }
 
-fn group_no_grouper(values: Vec<Value>) -> Result<IndexMap<String, Vec<Value>>, ShellError> {
+fn group_no_grouper(
+    values: Vec<Value>,
+    config: &nu_protocol::Config,
+) -> Result<IndexMap<String, Vec<Value>>, ShellError> {
     let mut groups = IndexMap::<_, Vec<_>>::new();
 
     for value in values.into_iter() {
-        let key = value.coerce_string()?;
+        let key = value.to_abbreviated_string(config);
         groups.entry(key).or_default().push(value);
     }
 
@@ -203,12 +230,13 @@ fn group_closure(
 ) -> Result<IndexMap<String, Vec<Value>>, ShellError> {
     let mut groups = IndexMap::<_, Vec<_>>::new();
     let mut closure = ClosureEval::new(engine_state, stack, closure);
+    let config = engine_state.get_config();
 
     for value in values {
         let key = closure
             .run_with_value(value.clone())?
             .into_value(span)?
-            .coerce_into_string()?;
+            .to_abbreviated_string(config);
 
         groups.entry(key).or_default().push(value);
     }
diff --git a/crates/nu-command/src/filters/split_by.rs b/crates/nu-command/src/filters/split_by.rs
index 7a5898e608..217918cf91 100644
--- a/crates/nu-command/src/filters/split_by.rs
+++ b/crates/nu-command/src/filters/split_by.rs
@@ -84,16 +84,16 @@ pub fn split_by(
     input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
     let name = call.head;
-
+    let config = engine_state.get_config();
     let splitter: Option<Value> = call.opt(engine_state, stack, 0)?;
 
     match splitter {
         Some(v) => {
             let splitter = Some(Spanned {
-                item: v.coerce_into_string()?,
+                item: v.to_abbreviated_string(config),
                 span: name,
             });
-            Ok(split(splitter.as_ref(), input, name)?)
+            Ok(split(splitter.as_ref(), input, name, config)?)
         }
         // This uses the same format as the 'requires a column name' error in sort_utils.rs
         None => Err(ShellError::GenericError {
@@ -110,6 +110,7 @@ pub fn split(
     column_name: Option<&Spanned<String>>,
     values: PipelineData,
     span: Span,
+    config: &nu_protocol::Config,
 ) -> Result<PipelineData, ShellError> {
     let grouper = if let Some(column_name) = column_name {
         Grouper::ByColumn(Some(column_name.clone()))
@@ -127,7 +128,7 @@ pub fn split(
                 };
 
                 match group_key {
-                    Some(group_key) => Ok(group_key.coerce_string()?),
+                    Some(group_key) => Ok(group_key.to_abbreviated_string(config)),
                     None => Err(ShellError::CantFindColumn {
                         col_name: column_name.item.to_string(),
                         span: Some(column_name.span),
@@ -136,12 +137,12 @@ pub fn split(
                 }
             };
 
-            data_split(values, Some(&block), span)
+            data_split(values, Some(&block), span, config)
         }
         Grouper::ByColumn(None) => {
-            let block = move |_, row: &Value| row.coerce_string();
+            let block = move |_, row: &Value| Ok(row.to_abbreviated_string(config));
 
-            data_split(values, Some(&block), span)
+            data_split(values, Some(&block), span, config)
         }
     }
 }
@@ -151,6 +152,7 @@ fn data_group(
     values: &Value,
     grouper: Option<&dyn Fn(usize, &Value) -> Result<String, ShellError>>,
     span: Span,
+    config: &nu_protocol::Config,
 ) -> Result<Value, ShellError> {
     let mut groups: IndexMap<String, Vec<Value>> = IndexMap::new();
 
@@ -158,7 +160,7 @@ fn data_group(
         let group_key = if let Some(ref grouper) = grouper {
             grouper(idx, &value)
         } else {
-            value.coerce_string()
+            Ok(value.to_abbreviated_string(config))
         };
 
         let group = groups.entry(group_key?).or_default();
@@ -179,6 +181,7 @@ pub fn data_split(
     value: PipelineData,
     splitter: Option<&dyn Fn(usize, &Value) -> Result<String, ShellError>>,
     dst_span: Span,
+    config: &nu_protocol::Config,
 ) -> Result<PipelineData, ShellError> {
     let mut splits = indexmap::IndexMap::new();
 
@@ -188,7 +191,7 @@ pub fn data_split(
             match v {
                 Value::Record { val: grouped, .. } => {
                     for (outer_key, list) in grouped.into_owned() {
-                        match data_group(&list, splitter, span) {
+                        match data_group(&list, splitter, span, config) {
                             Ok(grouped_vals) => {
                                 if let Value::Record { val: sub, .. } = grouped_vals {
                                     for (inner_key, subset) in sub.into_owned() {
diff --git a/crates/nu-command/tests/commands/group_by.rs b/crates/nu-command/tests/commands/group_by.rs
index c6d0903c94..232bbcba0f 100644
--- a/crates/nu-command/tests/commands/group_by.rs
+++ b/crates/nu-command/tests/commands/group_by.rs
@@ -23,37 +23,33 @@ fn groups() {
 
 #[test]
 fn errors_if_given_unknown_column_name() {
-    let sample = r#"
-                {
-                    "nu": {
-                        "committers": [
-                            {"name": "Andrés N. Robalino"},
-                            {"name": "JT Turner"},
-                            {"name": "Yehuda Katz"}
-                        ],
-                        "releases": [
-                            {"version": "0.2"}
-                            {"version": "0.8"},
-                            {"version": "0.9999999"}
-                        ],
-                        "0xATYKARNU": [
-                            ["Th", "e", " "],
-                            ["BIG", " ", "UnO"],
-                            ["punto", "cero"]
-                        ]
-                    }
-                }
-            "#;
+    let sample = r#"{
+    "nu": {
+        "committers": [
+            {"name": "Andrés N. Robalino"},
+            {"name": "JT Turner"},
+            {"name": "Yehuda Katz"}
+        ],
+        "releases": [
+            {"version": "0.2"}
+            {"version": "0.8"},
+            {"version": "0.9999999"}
+        ],
+        "0xATYKARNU": [
+            ["Th", "e", " "],
+            ["BIG", " ", "UnO"],
+            ["punto", "cero"]
+        ]
+    }
+}
+"#;
 
     let actual = nu!(pipeline(&format!(
-        r#"
-                '{sample}'
-                | from json
-                | group-by {{|| get nu.releases.version }}
-            "#
+        r#"'{sample}'
+    | from json
+    | group-by {{|| get nu.releases.missing_column }}"#
     )));
-
-    assert!(actual.err.contains("can't convert list<string> to string"));
+    assert!(actual.err.contains("cannot find column"));
 }
 
 #[test]

From 8c8f795e9e8da080a1a3e1f22af5869d3c6dacd5 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 17 Oct 2024 20:16:38 -0500
Subject: [PATCH 0582/1072] add rendered and json error messages in try/catch
 (#14082)

# Description

This PR adds a couple more options for dealing with try/catch errors. It
adds a `json` version of the error and a `rendered` version of the
error. It also respects the error_style configuration point.

![image](https://github.com/user-attachments/assets/32574f07-f511-40c0-8b57-de5f6f13a9c4)


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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-cmd-lang/src/core_commands/try_.rs  |  6 ++++-
 crates/nu-command/tests/commands/try_.rs      | 17 ++++++++++++++
 crates/nu-engine/src/eval_ir.rs               | 17 ++++++++++++--
 crates/nu-protocol/Cargo.toml                 |  1 +
 .../nu-protocol/src/errors/labeled_error.rs   | 17 ++++++++++++++
 crates/nu-protocol/src/errors/shell_error.rs  | 22 +++++++++++++++++--
 6 files changed, 75 insertions(+), 5 deletions(-)

diff --git a/crates/nu-cmd-lang/src/core_commands/try_.rs b/crates/nu-cmd-lang/src/core_commands/try_.rs
index ccf0d41f3b..c7242550a7 100644
--- a/crates/nu-cmd-lang/src/core_commands/try_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/try_.rs
@@ -107,7 +107,11 @@ fn run_catch(
 
     if let Some(catch) = catch {
         stack.set_last_error(&error);
-        let error = error.into_value(span);
+        let fancy_errors = match engine_state.get_config().error_style {
+            nu_protocol::ErrorStyle::Fancy => true,
+            nu_protocol::ErrorStyle::Plain => false,
+        };
+        let error = error.into_value(span, fancy_errors);
         let block = engine_state.get_block(catch.block_id);
         // Put the error value in the positional closure var
         if let Some(var) = block.signature.get_positional(0) {
diff --git a/crates/nu-command/tests/commands/try_.rs b/crates/nu-command/tests/commands/try_.rs
index 487fd034b5..7e6952d2b9 100644
--- a/crates/nu-command/tests/commands/try_.rs
+++ b/crates/nu-command/tests/commands/try_.rs
@@ -126,3 +126,20 @@ fn prints_only_if_last_pipeline() {
     let actual = nu!("try { ['should not print'] | every 1 }; 'last value'");
     assert_eq!(actual.out, "last value");
 }
+
+#[test]
+fn get_error_columns() {
+    let actual = nu!(" try { non_existent_command } catch {|err| $err} | columns | to json -r");
+    assert_eq!(
+        actual.out,
+        "[\"msg\",\"debug\",\"raw\",\"rendered\",\"json\"]"
+    );
+}
+
+#[test]
+fn get_json_error() {
+    let actual = nu!("try { non_existent_command } catch {|err| $err} | get json | from json | update labels.span {{start: 0 end: 0}} | to json -r");
+    assert_eq!(
+        actual.out, "{\"msg\":\"External command failed\",\"labels\":[{\"text\":\"Command `non_existent_command` not found\",\"span\":{\"start\":0,\"end\":0}}],\"code\":\"nu::shell::external_command\",\"url\":null,\"help\":\"`non_existent_command` is neither a Nushell built-in or a known external command\",\"inner\":[]}"
+    );
+}
diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index 233b01c33f..8d809f182e 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -220,8 +220,17 @@ fn eval_ir_block_impl<D: DebugContext>(
             }
             Err(err) => {
                 if let Some(error_handler) = ctx.stack.error_handlers.pop(ctx.error_handler_base) {
+                    let fancy_errors = match ctx.engine_state.get_config().error_style {
+                        nu_protocol::ErrorStyle::Fancy => true,
+                        nu_protocol::ErrorStyle::Plain => false,
+                    };
                     // If an error handler is set, branch there
-                    prepare_error_handler(ctx, error_handler, Some(err.into_spanned(*span)));
+                    prepare_error_handler(
+                        ctx,
+                        error_handler,
+                        Some(err.into_spanned(*span)),
+                        fancy_errors,
+                    );
                     pc = error_handler.handler_index;
                 } else {
                     // If not, exit the block with the error
@@ -246,6 +255,7 @@ fn prepare_error_handler(
     ctx: &mut EvalContext<'_>,
     error_handler: ErrorHandler,
     error: Option<Spanned<ShellError>>,
+    fancy_errors: bool,
 ) {
     if let Some(reg_id) = error_handler.error_register {
         if let Some(error) = error {
@@ -254,7 +264,10 @@ fn prepare_error_handler(
             // Create the error value and put it in the register
             ctx.put_reg(
                 reg_id,
-                error.item.into_value(error.span).into_pipeline_data(),
+                error
+                    .item
+                    .into_value(error.span, fancy_errors)
+                    .into_pipeline_data(),
             );
         } else {
             // Set the register to empty
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 45bec3c28f..635874e0b0 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -35,6 +35,7 @@ miette = { workspace = true, features = ["fancy-no-backtrace"] }
 num-format = { workspace = true }
 rmp-serde = { workspace = true, optional = true }
 serde = { workspace = true }
+serde_json = { workspace = true }
 thiserror = "1.0"
 typetag = "0.2"
 os_pipe = { workspace = true, features = ["io_safety"] }
diff --git a/crates/nu-protocol/src/errors/labeled_error.rs b/crates/nu-protocol/src/errors/labeled_error.rs
index c76a6c78dd..a207178415 100644
--- a/crates/nu-protocol/src/errors/labeled_error.rs
+++ b/crates/nu-protocol/src/errors/labeled_error.rs
@@ -139,6 +139,23 @@ impl LabeledError {
         self
     }
 
+    pub fn render_error_to_string(diag: impl miette::Diagnostic, fancy_errors: bool) -> String {
+        let theme = if fancy_errors {
+            miette::GraphicalTheme::unicode()
+        } else {
+            miette::GraphicalTheme::none()
+        };
+
+        let mut out = String::new();
+        miette::GraphicalReportHandler::new()
+            .with_width(80)
+            .with_theme(theme)
+            .render_report(&mut out, &diag)
+            .unwrap_or_default();
+
+        out
+    }
+
     /// Create a [`LabeledError`] from a type that implements [`miette::Diagnostic`].
     ///
     /// # Example
diff --git a/crates/nu-protocol/src/errors/shell_error.rs b/crates/nu-protocol/src/errors/shell_error.rs
index 0061d63602..024c515b09 100644
--- a/crates/nu-protocol/src/errors/shell_error.rs
+++ b/crates/nu-protocol/src/errors/shell_error.rs
@@ -1477,13 +1477,16 @@ impl ShellError {
         }
     }
 
-    pub fn into_value(self, span: Span) -> Value {
+    pub fn into_value(self, span: Span, fancy_errors: bool) -> Value {
         let exit_code = self.external_exit_code();
 
         let mut record = record! {
             "msg" => Value::string(self.to_string(), span),
             "debug" => Value::string(format!("{self:?}"), span),
-            "raw" => Value::error(self, span),
+            "raw" => Value::error(self.clone(), span),
+            // "labeled_error" => Value::string(LabeledError::from_diagnostic_and_render(self.clone()), span),
+            "rendered" => Value::string(ShellError::render_error_to_string(self.clone(), fancy_errors), span),
+            "json" => Value::string(serde_json::to_string(&self).expect("Could not serialize error"), span),
         };
 
         if let Some(code) = exit_code {
@@ -1502,6 +1505,21 @@ impl ShellError {
             span,
         )
     }
+    pub fn render_error_to_string(diag: impl miette::Diagnostic, fancy_errors: bool) -> String {
+        let theme = if fancy_errors {
+            miette::GraphicalTheme::unicode()
+        } else {
+            miette::GraphicalTheme::none()
+        };
+        let mut out = String::new();
+        miette::GraphicalReportHandler::new()
+            .with_width(80)
+            .with_theme(theme)
+            .render_report(&mut out, &diag)
+            .unwrap_or_default();
+
+        out
+    }
 }
 
 impl From<io::Error> for ShellError {

From 8d4426f2f8eee16ee60253b659bad1b0dc2a02fc Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Mon, 21 Oct 2024 05:54:18 -0500
Subject: [PATCH 0583/1072] add is_const to `help commands` and `scope
 commands` (#14125)

# Description

This PR adds `is_const` to `help commands` and `scope commands` so we
can see which commands are const commands.


![image](https://github.com/user-attachments/assets/f2269f9d-5042-40e4-b506-34d69096fcd1)
---
 crates/nu-command/src/help/help_commands.rs | 1 +
 crates/nu-engine/src/scope.rs               | 1 +
 2 files changed, 2 insertions(+)

diff --git a/crates/nu-command/src/help/help_commands.rs b/crates/nu-command/src/help/help_commands.rs
index d7571b9c07..f0f8df9c02 100644
--- a/crates/nu-command/src/help/help_commands.rs
+++ b/crates/nu-command/src/help/help_commands.rs
@@ -220,6 +220,7 @@ fn build_help_commands(engine_state: &EngineState, span: Span) -> Vec<Value> {
             "params" => param_table,
             "input_output" => input_output_table,
             "search_terms" => Value::string(search_terms.join(", "), span),
+            "is_const" => Value::bool(decl.is_const(), span),
         };
 
         found_cmds_vec.push(Value::record(record, span));
diff --git a/crates/nu-engine/src/scope.rs b/crates/nu-engine/src/scope.rs
index bbc44f5186..62acd6a9a7 100644
--- a/crates/nu-engine/src/scope.rs
+++ b/crates/nu-engine/src/scope.rs
@@ -113,6 +113,7 @@ impl<'e, 's> ScopeData<'e, 's> {
                     "examples" => Value::list(examples, span),
                     "type" => Value::string(decl.command_type().to_string(), span),
                     "is_sub" => Value::bool(decl.is_sub(), span),
+                    "is_const" => Value::bool(decl.is_const(), span),
                     "creates_scope" => Value::bool(signature.creates_scope, span),
                     "extra_description" => Value::string(decl.extra_description(), span),
                     "search_terms" => Value::string(decl.search_terms().join(", "), span),

From 9ad6d13982a289f77bb2f11bf5b21d37c6098f89 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Mon, 21 Oct 2024 12:55:03 +0200
Subject: [PATCH 0584/1072] Add slice as a search term on `range` (#14128)

Not to be confused with `seq` which is similar to our range type,
`range` does a slice based on a range.
---
 crates/nu-command/src/filters/range.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-command/src/filters/range.rs b/crates/nu-command/src/filters/range.rs
index d2a539b9ad..35d6fddd3f 100644
--- a/crates/nu-command/src/filters/range.rs
+++ b/crates/nu-command/src/filters/range.rs
@@ -25,7 +25,7 @@ impl Command for Range {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["filter", "head", "tail"]
+        vec!["filter", "head", "tail", "slice"]
     }
 
     fn examples(&self) -> Vec<Example> {

From 09ab583f64b62274f1f05713be36f87a5b038d2a Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Mon, 21 Oct 2024 11:55:30 -0500
Subject: [PATCH 0585/1072] add `start_time` to `ps -l` on macos (#14127)

# Description

This PR adds `start_time` to the MacOS `ps -l` command. Was requested in
discord. `start_time` is displayed in `Local` time.


![image](https://github.com/user-attachments/assets/b3743cde-af43-4756-9e2a-54689104fb25)


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

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

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

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

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

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

/cc @cablehead
---
 crates/nu-command/src/system/ps.rs | 6 ++++++
 crates/nu-system/src/macos.rs      | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/crates/nu-command/src/system/ps.rs b/crates/nu-command/src/system/ps.rs
index 6f39061dab..cece41e56f 100644
--- a/crates/nu-command/src/system/ps.rs
+++ b/crates/nu-command/src/system/ps.rs
@@ -1,3 +1,5 @@
+#[cfg(target_os = "macos")]
+use chrono::{Local, TimeZone};
 #[cfg(windows)]
 use itertools::Itertools;
 use nu_engine::command_prelude::*;
@@ -175,6 +177,10 @@ fn run_ps(
             #[cfg(target_os = "macos")]
             {
                 record.push("cwd", Value::string(proc.cwd(), span));
+                let timestamp = Local
+                    .timestamp_nanos(proc.start_time * 1_000_000_000)
+                    .into();
+                record.push("start_time", Value::date(timestamp, span));
             }
         }
 
diff --git a/crates/nu-system/src/macos.rs b/crates/nu-system/src/macos.rs
index e9b927c1fe..8d6ab59d4b 100644
--- a/crates/nu-system/src/macos.rs
+++ b/crates/nu-system/src/macos.rs
@@ -25,6 +25,7 @@ pub struct ProcessInfo {
     pub curr_res: Option<RUsageInfoV2>,
     pub prev_res: Option<RUsageInfoV2>,
     pub interval: Duration,
+    pub start_time: i64,
 }
 
 pub fn collect_proc(interval: Duration, _with_thread: bool) -> Vec<ProcessInfo> {
@@ -94,6 +95,7 @@ pub fn collect_proc(interval: Duration, _with_thread: bool) -> Vec<ProcessInfo>
         let curr_time = Instant::now();
         let interval = curr_time.saturating_duration_since(prev_time);
         let ppid = curr_task.pbsd.pbi_ppid as i32;
+        let start_time = curr_task.pbsd.pbi_start_tvsec as i64;
 
         let proc = ProcessInfo {
             pid,
@@ -107,6 +109,7 @@ pub fn collect_proc(interval: Duration, _with_thread: bool) -> Vec<ProcessInfo>
             curr_res,
             prev_res,
             interval,
+            start_time,
         };
 
         ret.push(proc);

From 1dbd431117a1f93f3c5b9c676a9c44dd0f57f429 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Mon, 21 Oct 2024 14:57:58 -0500
Subject: [PATCH 0586/1072] try and fix osc633 escaping yet again (#14140)

# Description

This PR is meant to fix the escaping in the osc633 implementation from
[PR 14008](https://github.com/nushell/nushell/pull/14008) that is
specifically for vscode. The idea is to try and follow these rules
better.
https://code.visualstudio.com/docs/terminal/shell-integration#_vs-code-custom-sequences-osc-633-st

Previously, it wouldn't escape all the characters and would only escape
characters while typing escape characters. Now it should take what was
typed and escape it if necessary.
---
 crates/nu-cli/src/repl.rs | 115 ++++++++++++++++++++++++++------------
 1 file changed, 78 insertions(+), 37 deletions(-)

diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index ed2b3a2510..1498d0a572 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -130,13 +130,8 @@ pub fn evaluate_repl(
         // escape a few things because this says so
         // https://code.visualstudio.com/docs/terminal/shell-integration#_vs-code-custom-sequences-osc-633-st
         let cmd_text = line_editor.current_buffer_contents().to_string();
-        let len = cmd_text.len();
-        let mut cmd_text_chars = cmd_text[0..len].chars();
-        let mut replaced_cmd_text = String::with_capacity(len);
 
-        while let Some(c) = unescape_for_vscode(&mut cmd_text_chars) {
-            replaced_cmd_text.push(c);
-        }
+        let replaced_cmd_text = escape_special_vscode_bytes(&cmd_text)?;
 
         run_shell_integration_osc633(
             engine_state,
@@ -220,26 +215,41 @@ pub fn evaluate_repl(
     Ok(())
 }
 
-fn unescape_for_vscode(text: &mut std::str::Chars) -> Option<char> {
-    match text.next() {
-        Some('\\') => match text.next() {
-            Some('0') => Some('\x00'),  // NUL '\0' (null character)
-            Some('a') => Some('\x07'),  // BEL '\a' (bell)
-            Some('b') => Some('\x08'),  // BS  '\b' (backspace)
-            Some('t') => Some('\x09'),  // HT  '\t' (horizontal tab)
-            Some('n') => Some('\x0a'),  // LF  '\n' (new line)
-            Some('v') => Some('\x0b'),  // VT  '\v' (vertical tab)
-            Some('f') => Some('\x0c'),  // FF  '\f' (form feed)
-            Some('r') => Some('\x0d'),  // CR  '\r' (carriage ret)
-            Some(';') => Some('\x3b'),  // semi-colon
-            Some('\\') => Some('\x5c'), // backslash
-            Some('e') => Some('\x1b'),  // escape
-            Some(c) => Some(c),
-            None => None,
-        },
-        Some(c) => Some(c),
-        None => None,
-    }
+fn escape_special_vscode_bytes(input: &str) -> Result<String, ShellError> {
+    let bytes = input
+        .chars()
+        .flat_map(|c| {
+            let mut buf = [0; 4]; // Buffer to hold UTF-8 bytes of the character
+            let c_bytes = c.encode_utf8(&mut buf); // Get UTF-8 bytes for the character
+
+            if c_bytes.len() == 1 {
+                let byte = c_bytes.as_bytes()[0];
+
+                match byte {
+                    // Escape bytes below 0x20
+                    b if b < 0x20 => format!("\\x{:02X}", byte).into_bytes(),
+                    // Escape semicolon as \x3B
+                    b';' => "\\x3B".to_string().into_bytes(),
+                    // Escape backslash as \\
+                    b'\\' => "\\\\".to_string().into_bytes(),
+                    // Otherwise, return the character unchanged
+                    _ => vec![byte],
+                }
+            } else {
+                // pass through multi-byte characters unchanged
+                c_bytes.bytes().collect()
+            }
+        })
+        .collect();
+
+    String::from_utf8(bytes).map_err(|err| ShellError::CantConvert {
+        to_type: "string".to_string(),
+        from_type: "bytes".to_string(),
+        span: Span::unknown(),
+        help: Some(format!(
+            "Error {err}, Unable to convert {input} to escaped bytes"
+        )),
+    })
 }
 
 fn get_line_editor(engine_state: &mut EngineState, use_color: bool) -> Result<Reedline> {
@@ -1069,16 +1079,8 @@ fn run_shell_integration_osc633(
 
             // 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();
+            let replaced_cmd_text =
+                escape_special_vscode_bytes(&repl_cmd_line_text).unwrap_or(repl_cmd_line_text);
 
             //OSC 633 ; E ; <commandline> [; <nonce] ST - Explicitly set the command line with an optional nonce.
             run_ansi_sequence(&format!(
@@ -1421,7 +1423,7 @@ fn are_session_ids_in_sync() {
 
 #[cfg(test)]
 mod test_auto_cd {
-    use super::{do_auto_cd, parse_operation, ReplOperation};
+    use super::{do_auto_cd, escape_special_vscode_bytes, parse_operation, ReplOperation};
     use nu_path::AbsolutePath;
     use nu_protocol::engine::{EngineState, Stack};
     use tempfile::tempdir;
@@ -1571,4 +1573,43 @@ mod test_auto_cd {
         let input = if cfg!(windows) { r"foo\" } else { "foo/" };
         check(tempdir, input, dir);
     }
+
+    #[test]
+    fn escape_vscode_semicolon_test() {
+        let input = r#"now;is"#;
+        let expected = r#"now\x3Bis"#;
+        let actual = escape_special_vscode_bytes(input).unwrap();
+        assert_eq!(expected, actual);
+    }
+
+    #[test]
+    fn escape_vscode_backslash_test() {
+        let input = r#"now\is"#;
+        let expected = r#"now\\is"#;
+        let actual = escape_special_vscode_bytes(input).unwrap();
+        assert_eq!(expected, actual);
+    }
+
+    #[test]
+    fn escape_vscode_linefeed_test() {
+        let input = "now\nis";
+        let expected = r#"now\x0Ais"#;
+        let actual = escape_special_vscode_bytes(input).unwrap();
+        assert_eq!(expected, actual);
+    }
+
+    #[test]
+    fn escape_vscode_tab_null_cr_test() {
+        let input = "now\t\0\ris";
+        let expected = r#"now\x09\x00\x0Dis"#;
+        let actual = escape_special_vscode_bytes(input).unwrap();
+        assert_eq!(expected, actual);
+    }
+
+    #[test]
+    fn escape_vscode_multibyte_ok() {
+        let input = "now🍪is";
+        let actual = escape_special_vscode_bytes(input).unwrap();
+        assert_eq!(input, actual);
+    }
 }

From ee97c0081879143aaa7b2bf1f50f29899cb25044 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Mon, 21 Oct 2024 21:59:52 +0200
Subject: [PATCH 0587/1072] Make contributor image wider (#14138)

With this many contributors you otherwise have to scroll really far to
get down to the license info.

The alternative would be to limit the number of faces we show, but it is
cool to have them all (as long as the generated svg doesn't take too
long to load or generate)
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9b88a92528..66988a104d 100644
--- a/README.md
+++ b/README.md
@@ -229,7 +229,7 @@ Please submit an issue or PR to be added to this list.
 See [Contributing](CONTRIBUTING.md) for details. Thanks to all the people who already contributed!
 
 <a href="https://github.com/nushell/nushell/graphs/contributors">
-  <img src="https://contributors-img.web.app/image?repo=nushell/nushell&max=750" />
+  <img src="https://contributors-img.web.app/image?repo=nushell/nushell&max=750&columns=20" />
 </a>
 
 ## License

From 4968b6b9d0572c8bf9e97e26731e6d1234cb799a Mon Sep 17 00:00:00 2001
From: Solomon <git@solomonvictorino.com>
Date: Tue, 22 Oct 2024 09:54:31 +0000
Subject: [PATCH 0588/1072] fix error when exporting consts with type
 signatures in modules (#14118)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #14023

# Description

- Prevents "failed to find added variable" when modules export constants
  with type signatures:

```nushell
> module foo { export const bar: int = 2 }
Error: nu::parser::unknown_state

  × Internal error.
   ╭─[entry #1:1:21]
 1 │ module foo { export const bar: int = 2 }
   ·                     ─────────┬────────
   ·                              ╰── failed to find added variable
```

- Returns `name_is_builtin_var` errors for names with type signatures:

```nushell
> let env: string = "";
Error: nu::parser::name_is_builtin_var

  × `env` used as variable name.
   ╭─[entry #1:1:5]
 1 │ let env: string = "";
   ·     ─┬─
   ·      ╰── already a builtin variable
```
---
 crates/nu-command/tests/commands/let_.rs | 11 +++---
 crates/nu-command/tests/commands/mut_.rs | 11 +++---
 crates/nu-parser/src/parse_keywords.rs   | 50 ++++++++++++++----------
 crates/nu-parser/src/parser.rs           | 20 ++++------
 tests/repl/test_modules.rs               |  4 ++
 5 files changed, 53 insertions(+), 43 deletions(-)

diff --git a/crates/nu-command/tests/commands/let_.rs b/crates/nu-command/tests/commands/let_.rs
index e05d34d258..d81fb9401c 100644
--- a/crates/nu-command/tests/commands/let_.rs
+++ b/crates/nu-command/tests/commands/let_.rs
@@ -1,10 +1,11 @@
 use nu_test_support::nu;
+use rstest::rstest;
 
-#[test]
-fn let_name_builtin_var() {
-    let actual = nu!("let in = 3");
-
-    assert!(actual
+#[rstest]
+#[case("let in = 3")]
+#[case("let in: int = 3")]
+fn let_name_builtin_var(#[case] assignment: &str) {
+    assert!(nu!(assignment)
         .err
         .contains("'in' is the name of a builtin Nushell variable"));
 }
diff --git a/crates/nu-command/tests/commands/mut_.rs b/crates/nu-command/tests/commands/mut_.rs
index 7078cd1df1..e66348f8f2 100644
--- a/crates/nu-command/tests/commands/mut_.rs
+++ b/crates/nu-command/tests/commands/mut_.rs
@@ -1,4 +1,5 @@
 use nu_test_support::nu;
+use rstest::rstest;
 
 #[test]
 fn mut_variable() {
@@ -7,11 +8,11 @@ fn mut_variable() {
     assert_eq!(actual.out, "4");
 }
 
-#[test]
-fn mut_name_builtin_var() {
-    let actual = nu!("mut in = 3");
-
-    assert!(actual
+#[rstest]
+#[case("mut in = 3")]
+#[case("mut in: int = 3")]
+fn mut_name_builtin_var(#[case] assignment: &str) {
+    assert!(nu!(assignment)
         .err
         .contains("'in' is the name of a builtin Nushell variable"));
 }
diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index 8ca5249bd2..3292405cab 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -1204,7 +1204,7 @@ pub fn parse_export_in_block(
     match full_name {
         "export alias" => parse_alias(working_set, lite_command, None),
         "export def" => parse_def(working_set, lite_command, None).0,
-        "export const" => parse_const(working_set, &lite_command.parts[1..]),
+        "export const" => parse_const(working_set, &lite_command.parts[1..]).0,
         "export use" => parse_use(working_set, lite_command, None).0,
         "export module" => parse_module(working_set, lite_command, None).0,
         "export extern" => parse_extern(working_set, lite_command, None),
@@ -1514,7 +1514,7 @@ pub fn parse_export_in_module(
                 result
             }
             b"const" => {
-                let pipeline = parse_const(working_set, &spans[1..]);
+                let (pipeline, var_name_span) = parse_const(working_set, &spans[1..]);
                 let export_const_decl_id = if let Some(id) = working_set.find_decl(b"export const")
                 {
                     id
@@ -1542,8 +1542,8 @@ pub fn parse_export_in_module(
 
                 let mut result = vec![];
 
-                if let Some(var_name_span) = spans.get(2) {
-                    let var_name = working_set.get_span_contents(*var_name_span);
+                if let Some(var_name_span) = var_name_span {
+                    let var_name = working_set.get_span_contents(var_name_span);
                     let var_name = trim_quotes(var_name);
 
                     if let Some(var_id) = working_set.find_variable(var_name) {
@@ -1762,7 +1762,7 @@ pub fn parse_module_block(
                 }
                 b"const" => block
                     .pipelines
-                    .push(parse_const(working_set, &command.parts)),
+                    .push(parse_const(working_set, &command.parts).0),
                 b"extern" => block
                     .pipelines
                     .push(parse_extern(working_set, command, None)),
@@ -3154,7 +3154,8 @@ pub fn parse_let(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipeline
     garbage_pipeline(working_set, spans)
 }
 
-pub fn parse_const(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipeline {
+/// Additionally returns a span encompassing the variable name, if successful.
+pub fn parse_const(working_set: &mut StateWorkingSet, spans: &[Span]) -> (Pipeline, Option<Span>) {
     trace!("parsing: const");
 
     // JT: Disabling check_name because it doesn't work with optional types in the declaration
@@ -3271,28 +3272,37 @@ pub fn parse_const(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipelin
                     let call = Box::new(Call {
                         decl_id,
                         head: spans[0],
-                        arguments: vec![Argument::Positional(lvalue), Argument::Positional(rvalue)],
+                        arguments: vec![
+                            Argument::Positional(lvalue.clone()),
+                            Argument::Positional(rvalue),
+                        ],
                         parser_info: HashMap::new(),
                     });
 
-                    return Pipeline::from_vec(vec![Expression::new(
-                        working_set,
-                        Expr::Call(call),
-                        Span::concat(spans),
-                        Type::Any,
-                    )]);
+                    return (
+                        Pipeline::from_vec(vec![Expression::new(
+                            working_set,
+                            Expr::Call(call),
+                            Span::concat(spans),
+                            Type::Any,
+                        )]),
+                        Some(lvalue.span),
+                    );
                 }
             }
         }
         let ParsedInternalCall { call, output } =
             parse_internal_call(working_set, spans[0], &spans[1..], decl_id);
 
-        return Pipeline::from_vec(vec![Expression::new(
-            working_set,
-            Expr::Call(call),
-            Span::concat(spans),
-            output,
-        )]);
+        return (
+            Pipeline::from_vec(vec![Expression::new(
+                working_set,
+                Expr::Call(call),
+                Span::concat(spans),
+                output,
+            )]),
+            None,
+        );
     } else {
         working_set.error(ParseError::UnknownState(
             "internal error: let or const statements not found in core language".into(),
@@ -3305,7 +3315,7 @@ pub fn parse_const(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipelin
         Span::concat(spans),
     ));
 
-    garbage_pipeline(working_set, spans)
+    (garbage_pipeline(working_set, spans), None)
 }
 
 pub fn parse_mut(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipeline {
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index d2ed11188a..c0bf4f59ff 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -3113,7 +3113,8 @@ pub fn parse_var_with_opt_type(
     spans_idx: &mut usize,
     mutable: bool,
 ) -> (Expression, Option<Type>) {
-    let bytes = working_set.get_span_contents(spans[*spans_idx]).to_vec();
+    let name_span = spans[*spans_idx];
+    let bytes = working_set.get_span_contents(name_span).to_vec();
 
     if bytes.contains(&b' ')
         || bytes.contains(&b'"')
@@ -3125,9 +3126,11 @@ pub fn parse_var_with_opt_type(
     }
 
     if bytes.ends_with(b":") {
+        let name_span = Span::new(name_span.start, name_span.end - 1);
+        let var_name = bytes[0..(bytes.len() - 1)].to_vec();
+
         // We end with colon, so the next span should be the type
         if *spans_idx + 1 < spans.len() {
-            let span_beginning = *spans_idx;
             *spans_idx += 1;
             // signature like record<a: int b: int> is broken into multiple spans due to
             // whitespaces. Collect the rest into one span and work on it
@@ -3144,8 +3147,6 @@ pub fn parse_var_with_opt_type(
             let ty = parse_type(working_set, &type_bytes, tokens[0].span);
             *spans_idx = spans.len() - 1;
 
-            let var_name = bytes[0..(bytes.len() - 1)].to_vec();
-
             if !is_variable(&var_name) {
                 working_set.error(ParseError::Expected(
                     "valid variable name",
@@ -3157,17 +3158,10 @@ pub fn parse_var_with_opt_type(
             let id = working_set.add_variable(var_name, spans[*spans_idx - 1], ty.clone(), mutable);
 
             (
-                Expression::new(
-                    working_set,
-                    Expr::VarDecl(id),
-                    Span::concat(&spans[span_beginning..*spans_idx + 1]),
-                    ty.clone(),
-                ),
+                Expression::new(working_set, Expr::VarDecl(id), name_span, ty.clone()),
                 Some(ty),
             )
         } else {
-            let var_name = bytes[0..(bytes.len() - 1)].to_vec();
-
             if !is_variable(&var_name) {
                 working_set.error(ParseError::Expected(
                     "valid variable name",
@@ -5615,7 +5609,7 @@ pub fn parse_builtin_commands(
                 .parts_including_redirection()
                 .collect::<Vec<Span>>(),
         ),
-        b"const" => parse_const(working_set, &lite_command.parts),
+        b"const" => parse_const(working_set, &lite_command.parts).0,
         b"mut" => parse_mut(
             working_set,
             &lite_command
diff --git a/tests/repl/test_modules.rs b/tests/repl/test_modules.rs
index 289efd291a..c2fc6b8dc2 100644
--- a/tests/repl/test_modules.rs
+++ b/tests/repl/test_modules.rs
@@ -117,6 +117,10 @@ fn export_consts() -> TestResult {
     run_test(
         r#"module spam { export const b = 3; }; use spam b; $b"#,
         "3",
+    )?;
+    run_test(
+        r#"module spam { export const b: int = 3; }; use spam b; $b"#,
+        "3",
     )
 }
 

From f738932bbdbe5067d12b12b505798f9748a5932d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20Tri=C3=B1anes?= <hi@joaquint.io>
Date: Tue, 22 Oct 2024 17:34:41 +0200
Subject: [PATCH 0589/1072] Fix range contains (#14011)

# Description

This PR changes the range contains logic to take the step into account.

```nushell
# before
2 in 1..3.. # true

# now
2 in 1..3.. # false
```

---

I encountered another issue while adding tests. Due to floating point
precision, `2.1 in 1..1.1..3` will return `false`. The floating point
error is even bigger than `f64::EPSILON` (`0.09999999999999876` vs
`2.220446049250313e-16`). This issue disappears with bigger numbers.

I tried a different algorithm (checking if the estimated number of steps
is close enough to any integer) but the results are still pretty bad:

```rust
let n_steps = (value - self.start) / self.step; // 14.999999999999988
(n_steps - n_steps.round()).abs() < f64::EPSILON // returns false
```

Maybe it can be shipped like this, the REPL already has floating point
errors (`1.1 - 1` returns `0.10000000000000009`). Or maybe there's a way
to fix this that I didn't think of. I'm open to ideas! But in any case
performing this kind of checks on a range of floats seems more niche
than doing it on a range of ints.

# User-Facing Changes

Code that depended on this behavior to check if a number is between
`start` and `end` will potentially return a different value.

# Tests + Formatting

# After Submitting
---
 crates/nu-protocol/src/value/range.rs | 62 ++++++++++++++++-----------
 tests/repl/test_ranges.rs             | 42 +++++++++++++++++-
 2 files changed, 79 insertions(+), 25 deletions(-)

diff --git a/crates/nu-protocol/src/value/range.rs b/crates/nu-protocol/src/value/range.rs
index 6ec7ce16ad..77aa5a60ef 100644
--- a/crates/nu-protocol/src/value/range.rs
+++ b/crates/nu-protocol/src/value/range.rs
@@ -95,20 +95,27 @@ mod int_range {
 
         pub fn contains(&self, value: i64) -> bool {
             if self.step < 0 {
-                value <= self.start
-                    && match self.end {
-                        Bound::Included(end) => value >= end,
-                        Bound::Excluded(end) => value > end,
-                        Bound::Unbounded => true,
-                    }
+                // Decreasing range
+                if value > self.start {
+                    return false;
+                }
+                match self.end {
+                    Bound::Included(end) if value < end => return false,
+                    Bound::Excluded(end) if value <= end => return false,
+                    _ => {}
+                };
             } else {
-                self.start <= value
-                    && match self.end {
-                        Bound::Included(end) => value <= end,
-                        Bound::Excluded(end) => value < end,
-                        Bound::Unbounded => true,
-                    }
+                // Increasing range
+                if value < self.start {
+                    return false;
+                }
+                match self.end {
+                    Bound::Included(end) if value > end => return false,
+                    Bound::Excluded(end) if value >= end => return false,
+                    _ => {}
+                };
             }
+            (value - self.start) % self.step == 0
         }
 
         pub fn into_range_iter(self, signals: Signals) -> Iter {
@@ -330,20 +337,27 @@ mod float_range {
 
         pub fn contains(&self, value: f64) -> bool {
             if self.step < 0.0 {
-                value <= self.start
-                    && match self.end {
-                        Bound::Included(end) => value >= end,
-                        Bound::Excluded(end) => value > end,
-                        Bound::Unbounded => true,
-                    }
+                // Decreasing range
+                if value > self.start {
+                    return false;
+                }
+                match self.end {
+                    Bound::Included(end) if value <= end => return false,
+                    Bound::Excluded(end) if value < end => return false,
+                    _ => {}
+                };
             } else {
-                self.start <= value
-                    && match self.end {
-                        Bound::Included(end) => value <= end,
-                        Bound::Excluded(end) => value < end,
-                        Bound::Unbounded => true,
-                    }
+                // Increasing range
+                if value < self.start {
+                    return false;
+                }
+                match self.end {
+                    Bound::Included(end) if value >= end => return false,
+                    Bound::Excluded(end) if value > end => return false,
+                    _ => {}
+                };
             }
+            ((value - self.start) % self.step).abs() < f64::EPSILON
         }
 
         pub fn into_range_iter(self, signals: Signals) -> Iter {
diff --git a/tests/repl/test_ranges.rs b/tests/repl/test_ranges.rs
index 96f59eea84..8e7a557738 100644
--- a/tests/repl/test_ranges.rs
+++ b/tests/repl/test_ranges.rs
@@ -7,7 +7,7 @@ fn int_in_inc_range() -> TestResult {
 
 #[test]
 fn int_in_dec_range() -> TestResult {
-    run_test(r#"1 in 9.42..-4"#, "true")
+    run_test(r#"1 in 9..-4.42"#, "true")
 }
 
 #[test]
@@ -15,6 +15,16 @@ fn int_in_exclusive_range() -> TestResult {
     run_test(r#"3 in 0..<3"#, "false")
 }
 
+#[test]
+fn float_in_inc_range() -> TestResult {
+    run_test(r#"1.58 in -4.42..9"#, "true")
+}
+
+#[test]
+fn float_in_dec_range() -> TestResult {
+    run_test(r#"1.42 in 9.42..-4.42"#, "true")
+}
+
 #[test]
 fn non_number_in_range() -> TestResult {
     fail_test(r#"'a' in 1..3"#, "subset comparison is not supported")
@@ -34,3 +44,33 @@ fn range_and_reduction() -> TestResult {
 fn zip_ranges() -> TestResult {
     run_test(r#"1..3 | zip 4..6 | get 2.1"#, "6")
 }
+
+#[test]
+fn int_in_stepped_range() -> TestResult {
+    run_test(r#"7 in 1..3..15"#, "true")
+}
+
+#[test]
+fn int_in_unbounded_stepped_range() -> TestResult {
+    run_test(r#"1000001 in 1..3.."#, "true")
+}
+
+#[test]
+fn int_not_in_unbounded_stepped_range() -> TestResult {
+    run_test(r#"2 in 1..3.."#, "false")
+}
+
+#[test]
+fn float_in_stepped_range() -> TestResult {
+    run_test(r#"5.5 in 1..1.5..10"#, "true")
+}
+
+#[test]
+fn float_in_unbounded_stepped_range() -> TestResult {
+    run_test(r#"100.5 in 1..1.5.."#, "true")
+}
+
+#[test]
+fn float_not_in_unbounded_stepped_range() -> TestResult {
+    run_test(r#"2.1 in 1.2..3.."#, "false")
+}

From f3a1dfef95b1f7fd1ff44d22479e423d89e753bd Mon Sep 17 00:00:00 2001
From: Kither <61571510+Kither12@users.noreply.github.com>
Date: Tue, 22 Oct 2024 22:37:03 +0700
Subject: [PATCH 0590/1072] Fix panic if tokens are placed after a redirection
 (#14035)

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

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

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

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

The `concat` function from `span.rs` assumes that two consecutive span
intervals must overlap. But when parsing `let` and `mut` expressions, we
call `parts_including_redirection` which chains two slices of span and
leads to the above condition not holding. So my solution here is to sort
them after chaining.


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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-parser/src/lite_parser.rs   | 14 +++++++++-----
 crates/nu-parser/tests/test_parser.rs | 12 ++++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/crates/nu-parser/src/lite_parser.rs b/crates/nu-parser/src/lite_parser.rs
index 0be57a7c9a..1a89271af2 100644
--- a/crates/nu-parser/src/lite_parser.rs
+++ b/crates/nu-parser/src/lite_parser.rs
@@ -136,11 +136,15 @@ impl LiteCommand {
     }
 
     pub fn parts_including_redirection(&self) -> impl Iterator<Item = Span> + '_ {
-        self.parts.iter().copied().chain(
-            self.redirection
-                .iter()
-                .flat_map(|redirection| redirection.spans()),
-        )
+        self.parts
+            .iter()
+            .copied()
+            .chain(
+                self.redirection
+                    .iter()
+                    .flat_map(|redirection| redirection.spans()),
+            )
+            .sorted_unstable_by_key(|a| (a.start, a.end))
     }
 }
 
diff --git a/crates/nu-parser/tests/test_parser.rs b/crates/nu-parser/tests/test_parser.rs
index 1ac3d7e900..c0722d64e4 100644
--- a/crates/nu-parser/tests/test_parser.rs
+++ b/crates/nu-parser/tests/test_parser.rs
@@ -1243,6 +1243,18 @@ fn test_nothing_comparison_eq() {
     assert!(matches!(&element.expr.expr, Expr::BinaryOp(..)));
 }
 
+#[rstest]
+#[case(b"let a o> file = 1")]
+#[case(b"mut a o> file = 1")]
+fn test_redirection_inside_letmut_no_panic(#[case] phase: &[u8]) {
+    let engine_state = EngineState::new();
+    let mut working_set = StateWorkingSet::new(&engine_state);
+    working_set.add_decl(Box::new(Let));
+    working_set.add_decl(Box::new(Mut));
+
+    parse(&mut working_set, None, phase, true);
+}
+
 #[rstest]
 #[case(b"let a = 1 err> /dev/null")]
 #[case(b"let a = 1 out> /dev/null")]

From 04fed82e5ea5b2ac29705dbb96284e53a9a025b5 Mon Sep 17 00:00:00 2001
From: Adam Schmalhofer <code@adaschma.name>
Date: Tue, 22 Oct 2024 17:38:25 +0200
Subject: [PATCH 0591/1072] Feature `url build_query` accepts records with
 lists of strings (#14073)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

# Description

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

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

Swagger supports lists (a.k.a arrays) in query parameters:

https://swagger.io/docs/specification/v3_0/serialization/
It supports three different styles:
- explode=true
- spaceDelimited
- pipeDelimited
With explode=true being the default and hence most common. It is the
hardest to use inside of nushell, as the others are just a `string join`
away. This commit adds lists with the explode=true format.

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

Before:

: {a[]: [one two three], b: four} | url build-query
Error: nu::shell::unsupported_input
× Unsupported input
╭─[entry #33:1:1]
1 │ {a[]: [one two three], b: four} | url build-query
· ───────────────┬─────────────── ───────┬───────
· │ ╰── Expected a record with string values
· ╰── value originates from here
       ╰────

After:

: {a[]: [one two three], b: four} | url build-query
    a%5B%5D=one&a%5B%5D=two&a%5B%5D=three&b=four


Despite reading CONTRIBUTING.md I didn't get approval before making the
change. My judgment is that this doesn't qualify as being "change
something significantly".

# Tests + Formatting

I added the Example instance for the automatic tests. I couldn't figure
out how to add an Example for the error case, so I did that with manual
testing. E.g.:

: {a[]: [one two [three]], b: four} | url build-query

Error: nu::shell::unsupported_input


× Unsupported input

╭─[entry #3:1:1]

1 │ {a[]: [one two [three]], b: four} | url build-query

· ────────────────┬──────────────── ───────┬───────

· │ ╰── Expected a record with list of string values

· ╰── value originates from here

       ╰────

: {a[]: [one two 3hr], b: four} | url build-query

Error: nu::shell::unsupported_input


× Unsupported input

╭─[entry #4:1:1]

1 │ {a[]: [one two 3hr], b: four} | url build-query

· ──────────────┬────────────── ───────┬───────

· │ ╰── Expected a record with list of string values

· ╰── value originates from here

       ╰────
<!--
Don't forget to add tests that cover your changes.

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

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

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

I ran the four cargo commands on my local machine. I had to run the
tests with:

LANG=C and -j 1 and even then I got one failure:

thread 'commands::umkdir::mkdir_umask_permission' panicked at
crates/nu-command/tests/commands/umkdir.rs:148:9:
assertion `left == right` failed: Most *nix systems have 0o00022 as the
umask. So directory permission should be 0o40755 = 0o
40777 & (!0o00022)
left: 16893
    right: 16877

but this isn't related to this change (I seem to not be running most
*nix system; and don't have a lot of RAM for the number of cores). The
other three cargo commands didn't have errors or warnings.

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

I will add the new example to [the
documentation](https://github.com/nushell/nushell.github.io).

# Open questions / possible future work

Things I noticed, and would like to mention and am open to adding, but
don't think I am deep enough in nushell to do them pro-actively.

## Add an argument for the other query parameter list styles

I don't know how frequent they are and I currently don't need them, so
following KISS I didn't add them.

## long input_span marked

In e.g.:

: {a[]: [one two 3hr], b: four} | url build-query

Error: nu::shell::unsupported_input


× Unsupported input

╭─[entry #4:1:1]

1 │ {a[]: [one two 3hr], b: four} | url build-query

· ──────────────┬────────────── ───────┬───────

· │ ╰── Expected a record with list of string values

· ╰── value originates from here

       ╰────

the entire record is marked as input_span instead of just the "3hr" that
is causing the problem. Changing that would be trivial, but I'm not deep
enough into nushell to understand all the consequences of changing that.


## Error message says string values despite accepting numbers etc.

The error message said it only accepted strings despite accepting
numbers etc. (anything it can coerce into string). I couldn't find a
good wording myself and that was how it was before. I simply added a
"list of strings".
---
 .../nu-command/src/network/url/build_query.rs | 59 ++++++++++++-------
 1 file changed, 39 insertions(+), 20 deletions(-)

diff --git a/crates/nu-command/src/network/url/build_query.rs b/crates/nu-command/src/network/url/build_query.rs
index 1daabb507f..8b563a2bbd 100644
--- a/crates/nu-command/src/network/url/build_query.rs
+++ b/crates/nu-command/src/network/url/build_query.rs
@@ -42,6 +42,11 @@ impl Command for SubCommand {
                 example: r#"{a:"AT&T", b: "AT T"} | url build-query"#,
                 result: Some(Value::test_string("a=AT%26T&b=AT+T")),
             },
+            Example {
+                description: "Outputs a query string representing the contents of this record",
+                example: r#"{a: ["one", "two"], b: "three"} | url build-query"#,
+                result: Some(Value::test_string("a=one&a=two&b=three")),
+            },
         ]
     }
 
@@ -66,30 +71,44 @@ fn to_url(input: PipelineData, head: Span) -> Result<PipelineData, ShellError> {
                 Value::Record { ref val, .. } => {
                     let mut row_vec = vec![];
                     for (k, v) in &**val {
-                        match v.coerce_string() {
-                            Ok(s) => {
-                                row_vec.push((k.clone(), s));
-                            }
-                            _ => {
-                                return Err(ShellError::UnsupportedInput {
-                                    msg: "Expected a record with string values".to_string(),
-                                    input: "value originates from here".into(),
-                                    msg_span: head,
-                                    input_span: span,
-                                });
+                        match v {
+                            Value::List { ref vals, .. } => {
+                                for v_item in vals {
+                                    row_vec.push((
+                                        k.clone(),
+                                        v_item.coerce_string().map_err(|_| {
+                                            ShellError::UnsupportedInput {
+                                                msg: "Expected a record with list of string values"
+                                                    .to_string(),
+                                                input: "value originates from here".into(),
+                                                msg_span: head,
+                                                input_span: span,
+                                            }
+                                        })?,
+                                    ));
+                                }
                             }
+                            _ => row_vec.push((
+                                k.clone(),
+                                v.coerce_string()
+                                    .map_err(|_| ShellError::UnsupportedInput {
+                                        msg:
+                                            "Expected a record with string or list of string values"
+                                                .to_string(),
+                                        input: "value originates from here".into(),
+                                        msg_span: head,
+                                        input_span: span,
+                                    })?,
+                            )),
                         }
                     }
 
-                    match serde_urlencoded::to_string(row_vec) {
-                        Ok(s) => Ok(s),
-                        _ => Err(ShellError::CantConvert {
-                            to_type: "URL".into(),
-                            from_type: value.get_type().to_string(),
-                            span: head,
-                            help: None,
-                        }),
-                    }
+                    serde_urlencoded::to_string(row_vec).map_err(|_| ShellError::CantConvert {
+                        to_type: "URL".into(),
+                        from_type: value.get_type().to_string(),
+                        span: head,
+                        help: None,
+                    })
                 }
                 // Propagate existing errors
                 Value::Error { error, .. } => Err(*error),

From 3f75b6b371a8befc8b1b25d693265144b0344b13 Mon Sep 17 00:00:00 2001
From: Solomon <git@solomonvictorino.com>
Date: Tue, 22 Oct 2024 15:40:45 +0000
Subject: [PATCH 0592/1072] error when closure param lists aren't terminated by
 `|` (#14095)

Fixes #13757, fixes #9562

# User-Facing Changes

- `unclosed |` is returned for malformed closure parameters:

```
{ |a }
```

- Parameter list closing pipes are highlighted as part of the closure
---
 crates/nu-parser/src/parser.rs |  3 ++-
 tests/repl/test_signatures.rs  | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index c0bf4f59ff..faf0a94c24 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -4594,7 +4594,7 @@ pub fn parse_closure_expression(
                 } = token.1
                 {
                     end_span = Some(span);
-                    amt_to_skip = token.0;
+                    amt_to_skip += token.0;
                     break;
                 }
             }
@@ -4602,6 +4602,7 @@ pub fn parse_closure_expression(
             let end_point = if let Some(span) = end_span {
                 span.end
             } else {
+                working_set.error(ParseError::Unclosed("|".into(), Span::new(end, end)));
                 end
             };
 
diff --git a/tests/repl/test_signatures.rs b/tests/repl/test_signatures.rs
index 5e265974d5..25b22ee1be 100644
--- a/tests/repl/test_signatures.rs
+++ b/tests/repl/test_signatures.rs
@@ -1,4 +1,5 @@
 use crate::repl::tests::{fail_test, run_test, TestResult};
+use rstest::rstest;
 
 #[test]
 fn list_annotations() -> TestResult {
@@ -375,3 +376,12 @@ fn table_annotations_with_extra_characters() -> TestResult {
     let expected = "Extra characters in the parameter name";
     fail_test(input, expected)
 }
+
+#[rstest]
+#[case("{ |a $a }")]
+#[case("{ |a, b $a + $b }")]
+#[case("do { |a $a } 1")]
+#[case("do { |a $a } 1 2")]
+fn closure_param_list_not_terminated(#[case] input: &str) -> TestResult {
+    fail_test(input, "unclosed |")
+}

From 9870c7c9a63d8fecbf42173a7c25ee43bb87fcc2 Mon Sep 17 00:00:00 2001
From: PhotonBursted <inquiries@photonbur.st>
Date: Tue, 22 Oct 2024 18:30:48 +0200
Subject: [PATCH 0593/1072] Defensive handling of errors when transposing
 (#14096)

# Description
This PR aims to close #14027, in which it was noticed that the transpose
command "swallows" error messages.

*Note that in exploring the linked issue, [other situations were
identified](https://github.com/nushell/nushell/issues/14027#issuecomment-2414602880)
which also produce inconsistent behaviour. These have knowingly been
omitted from this PR, to minimize its scope, and since they seem to have
a different cause. It's probably best to make a separate issue/PR in
which to tackle a broader scan of error handling, with a suspected
relation to streams.*

# User-Facing Changes
The user will see errors from deeper in the pipeline, in case the errors
originated there.

# Tests + Formatting
Toolkit PR check was run successfully.

One test was added, covering this exact situation, in order to prevent
regressions.
The bug is relatively obscure, so it may be prone to reappear during
refactorings.
---
 crates/nu-command/src/filters/transpose.rs    |  6 ++++++
 crates/nu-command/tests/commands/transpose.rs | 12 ++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/crates/nu-command/src/filters/transpose.rs b/crates/nu-command/src/filters/transpose.rs
index 813a4733b2..873a21c90d 100644
--- a/crates/nu-command/src/filters/transpose.rs
+++ b/crates/nu-command/src/filters/transpose.rs
@@ -175,6 +175,12 @@ pub fn transpose(
 
     let metadata = input.metadata();
     let input: Vec<_> = input.into_iter().collect();
+    // Ensure error values are propagated
+    for i in input.iter() {
+        if let Value::Error { .. } = i {
+            return Ok(i.clone().into_pipeline_data_with_metadata(metadata));
+        }
+    }
 
     let descs = get_columns(&input);
 
diff --git a/crates/nu-command/tests/commands/transpose.rs b/crates/nu-command/tests/commands/transpose.rs
index a155319bfc..29a7632af3 100644
--- a/crates/nu-command/tests/commands/transpose.rs
+++ b/crates/nu-command/tests/commands/transpose.rs
@@ -20,3 +20,15 @@ fn row_but_all() {
 
     assert!(actual.out.contains("foo: [1, 2]"));
 }
+
+#[test]
+fn throw_inner_error() {
+    let error_msg = "This message should show up";
+    let error = format!("(error make {{ msg: \"{}\" }})", error_msg);
+    let actual = nu!(format!(
+        "[[key value]; [foo 1] [foo 2] [{} 3]] | transpose",
+        error
+    ));
+
+    assert!(actual.err.contains(error.as_str()));
+}

From e05f3876321ddcf0a7bd65b6420254345b38675f Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Tue, 22 Oct 2024 11:57:41 -0500
Subject: [PATCH 0594/1072] update to reedline commit 9cb1128 (#14146)

# Description

Update to the latest reedline commit.

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

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

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

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

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

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

diff --git a/Cargo.lock b/Cargo.lock
index cfbcb63c46..489414d4a3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5130,8 +5130,7 @@ dependencies = [
 [[package]]
 name = "reedline"
 version = "0.36.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57016fc0ec4c651a05cb80fb1200b7c3518afcc2f769edffe15aca2363395c15"
+source = "git+https://github.com/nushell/reedline?branch=main#9cb1128aaab8f5c19ec37b94ac1a86a91915827f"
 dependencies = [
  "arboard",
  "chrono",
diff --git a/Cargo.toml b/Cargo.toml
index 7ad7d9f5c3..e121b77d92 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -313,7 +313,7 @@ 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`

From 09c94950158898782e16c66ac410caa7f2d9e8ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Oct 2024 13:53:53 +0800
Subject: [PATCH 0595/1072] Bump bytes from 1.7.1 to 1.8.0 (#14156)

Bumps [bytes](https://github.com/tokio-rs/bytes) from 1.7.1 to 1.8.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/tokio-rs/bytes/releases">bytes's
releases</a>.</em></p>
<blockquote>
<h2>Bytes 1.8.0</h2>
<h1>1.8.0 (October 21, 2024)</h1>
<ul>
<li>Guarantee address in <code>split_off</code>/<code>split_to</code>
for empty slices (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/740">#740</a>)</li>
</ul>
<h2>Bytes 1.7.2</h2>
<h1>1.7.2 (September 17, 2024)</h1>
<h3>Fixed</h3>
<ul>
<li>Fix default impl of <code>Buf::{get_int, get_int_le}</code> (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/732">#732</a>)</li>
</ul>
<h3>Documented</h3>
<ul>
<li>Fix double spaces in comments and doc comments (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/731">#731</a>)</li>
</ul>
<h3>Internal changes</h3>
<ul>
<li>Ensure BytesMut::advance reduces capacity (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/728">#728</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/tokio-rs/bytes/blob/master/CHANGELOG.md">bytes's
changelog</a>.</em></p>
<blockquote>
<h1>1.8.0 (October 21, 2024)</h1>
<ul>
<li>Guarantee address in <code>split_off</code>/<code>split_to</code>
for empty slices (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/740">#740</a>)</li>
</ul>
<h1>1.7.2 (September 17, 2024)</h1>
<h3>Fixed</h3>
<ul>
<li>Fix default impl of <code>Buf::{get_int, get_int_le}</code> (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/732">#732</a>)</li>
</ul>
<h3>Documented</h3>
<ul>
<li>Fix double spaces in comments and doc comments (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/731">#731</a>)</li>
</ul>
<h3>Internal changes</h3>
<ul>
<li>Ensure BytesMut::advance reduces capacity (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/728">#728</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/tokio-rs/bytes/commit/c45697ce4230777aa8467db7ef91e89f282a539f"><code>c45697c</code></a>
chore: prepare bytes v1.8.0 (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/741">#741</a>)</li>
<li><a
href="https://github.com/tokio-rs/bytes/commit/0ac54ca706dfc039cc738962581bba4793860605"><code>0ac54ca</code></a>
Guarantee address in split_off/split_to for empty slices (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/740">#740</a>)</li>
<li><a
href="https://github.com/tokio-rs/bytes/commit/d7c1d658d90c922eeee1dbc29bc6f6fd9a1a1a66"><code>d7c1d65</code></a>
chore: prepare bytes v1.7.2 (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/736">#736</a>)</li>
<li><a
href="https://github.com/tokio-rs/bytes/commit/ac46ebdd464144cecd7463a96ca9eb347458ae94"><code>ac46ebd</code></a>
ci: update nightly to nightly-2024-09-15 (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/734">#734</a>)</li>
<li><a
href="https://github.com/tokio-rs/bytes/commit/79fb85323cf4cf14d9b85f487b65fc147030cf4b"><code>79fb853</code></a>
fix: apply sign extension when decoding int (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/732">#732</a>)</li>
<li><a
href="https://github.com/tokio-rs/bytes/commit/291df5acc94b82a48765e67eeb1c1a2074539e68"><code>291df5a</code></a>
Fix double spaces in comments and doc comments (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/731">#731</a>)</li>
<li><a
href="https://github.com/tokio-rs/bytes/commit/ed7d5ff39e39c2802c0fa9e2fc308f6a3e0beda7"><code>ed7d5ff</code></a>
test: ensure BytesMut::advance reduces capacity (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/728">#728</a>)</li>
<li>See full diff in <a
href="https://github.com/tokio-rs/bytes/compare/v1.7.1...v1.8.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=bytes&package-manager=cargo&previous-version=1.7.1&new-version=1.8.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 489414d4a3..422dfafffd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -581,9 +581,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
 
 [[package]]
 name = "bytesize"

From e7c4597ad01b00127c858c51f3b735249589fed3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Oct 2024 13:54:16 +0800
Subject: [PATCH 0596/1072] Bump uuid from 1.10.0 to 1.11.0 (#14155)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.10.0 to 1.11.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/uuid-rs/uuid/releases">uuid's
releases</a>.</em></p>
<blockquote>
<h2>1.11.0</h2>
<h2>What's Changed</h2>
<ul>
<li>Upgrade zerocopy to 0.8 by <a
href="https://github.com/yotamofek"><code>@​yotamofek</code></a> in <a
href="https://redirect.github.com/uuid-rs/uuid/pull/771">uuid-rs/uuid#771</a></li>
<li>Prepare for 1.11.0 release by <a
href="https://github.com/KodrAus"><code>@​KodrAus</code></a> in <a
href="https://redirect.github.com/uuid-rs/uuid/pull/772">uuid-rs/uuid#772</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/yotamofek"><code>@​yotamofek</code></a>
made their first contribution in <a
href="https://redirect.github.com/uuid-rs/uuid/pull/771">uuid-rs/uuid#771</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/uuid-rs/uuid/compare/1.10.0...1.11.0">https://github.com/uuid-rs/uuid/compare/1.10.0...1.11.0</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/uuid-rs/uuid/commit/4473398413f7e3f4103374559b8d038b4801329a"><code>4473398</code></a>
Merge pull request <a
href="https://redirect.github.com/uuid-rs/uuid/issues/772">#772</a> from
uuid-rs/cargo/1.11.0</li>
<li><a
href="https://github.com/uuid-rs/uuid/commit/59fbb1e695f087a9457c6c259fe41c5123f1b595"><code>59fbb1e</code></a>
prepare for 1.11.0 release</li>
<li><a
href="https://github.com/uuid-rs/uuid/commit/d9b34e7c93ce82ee84aa92ff6b8efcc82cd003c2"><code>d9b34e7</code></a>
Merge pull request <a
href="https://redirect.github.com/uuid-rs/uuid/issues/771">#771</a> from
yotamofek/zerocopy_0.8</li>
<li><a
href="https://github.com/uuid-rs/uuid/commit/14b24206c6e72a47f442de2f3cc50f9ebace267d"><code>14b2420</code></a>
Upgrade zerocopy to 0.8</li>
<li>See full diff in <a
href="https://github.com/uuid-rs/uuid/compare/1.10.0...1.11.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=uuid&package-manager=cargo&previous-version=1.10.0&new-version=1.11.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                         | 4 ++--
 Cargo.toml                         | 2 +-
 crates/nu_plugin_polars/Cargo.toml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 422dfafffd..54a861d765 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6775,9 +6775,9 @@ checksum = "96f26868814bf1ca9deec910a08007c93eb1d8e407ce36451999d4c1c1ea6767"
 
 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
 dependencies = [
  "getrandom",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index e121b77d92..b9042f7c1b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -172,7 +172,7 @@ uu_mv = "0.0.27"
 uu_whoami = "0.0.27"
 uu_uname = "0.0.27"
 uucore = "0.0.27"
-uuid = "1.10.0"
+uuid = "1.11.0"
 v_htmlescape = "0.15.0"
 wax = "0.6"
 which = "6.0.0"
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index e91928869a..b05d8d6811 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -39,7 +39,7 @@ polars-utils = { version = "0.41"}
 typetag = "0.2"
 env_logger = "0.11.3"
 log.workspace = true
-uuid = { version = "1.10", features = ["v4", "serde"] }
+uuid = { version = "1.11", features = ["v4", "serde"] }
 
 # Do to a compile error with polars, this included to force the raw dependency
 hashbrown = { version = "0.14", features = ["rayon", "ahash", "serde", "raw"] }

From ae54d05930d5e579e378ba5f447c1c12df81e0d4 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Wed, 23 Oct 2024 10:14:24 -0700
Subject: [PATCH 0597/1072] Upgrade to polars 0.43 (#14148)

Upgrades the polars plugin to polars version 0.43
---
 Cargo.lock                                    | 223 ++++++++++--------
 crates/nu_plugin_polars/Cargo.toml            |  83 +++----
 crates/nu_plugin_polars/src/cache/get.rs      |   5 +-
 .../command/aggregation/cumulative.rs         |   8 +-
 .../dataframe/command/aggregation/rolling.rs  |   2 +-
 .../command/aggregation/value_counts.rs       |   2 +-
 .../src/dataframe/command/boolean/arg_true.rs |   2 +-
 .../command/boolean/is_duplicated.rs          |   2 +-
 .../src/dataframe/command/boolean/is_in.rs    |   2 +-
 .../dataframe/command/boolean/is_not_null.rs  |   2 +-
 .../src/dataframe/command/boolean/is_null.rs  |   2 +-
 .../dataframe/command/boolean/is_unique.rs    |   2 +-
 .../src/dataframe/command/boolean/set.rs      |   2 +-
 .../src/dataframe/command/core/columns.rs     |   2 +-
 .../src/dataframe/command/core/open.rs        |  12 +-
 .../src/dataframe/command/core/summary.rs     |   7 +-
 .../src/dataframe/command/core/to_df.rs       |  18 +-
 .../dataframe/command/data/drop_duplicates.rs |   4 +-
 .../src/dataframe/command/data/dummies.rs     |  14 +-
 .../src/dataframe/command/data/mod.rs         |   3 +-
 .../src/dataframe/command/data/rename.rs      |   2 +-
 .../src/dataframe/command/data/sample.rs      |  14 +-
 .../src/dataframe/command/data/sql_context.rs |   7 +-
 .../src/dataframe/command/data/unique.rs      |  18 +-
 .../src/dataframe/command/data/unpivot.rs     |  34 +--
 .../src/dataframe/command/data/with_column.rs |   2 +-
 .../src/dataframe/command/datetime/as_date.rs |   2 +-
 .../dataframe/command/datetime/as_datetime.rs |   2 +-
 .../dataframe/command/datetime/datepart.rs    |  16 +-
 .../src/dataframe/command/datetime/get_day.rs |   2 +-
 .../dataframe/command/datetime/get_hour.rs    |   9 +-
 .../dataframe/command/datetime/get_minute.rs  |   9 +-
 .../dataframe/command/datetime/get_month.rs   |   2 +-
 .../command/datetime/get_nanosecond.rs        |   9 +-
 .../dataframe/command/datetime/get_ordinal.rs |   9 +-
 .../dataframe/command/datetime/get_second.rs  |   9 +-
 .../dataframe/command/datetime/get_week.rs    |   9 +-
 .../dataframe/command/datetime/get_weekday.rs |   2 +-
 .../dataframe/command/datetime/get_year.rs    |   9 +-
 .../src/dataframe/command/index/arg_max.rs    |   4 +-
 .../src/dataframe/command/index/arg_min.rs    |   4 +-
 .../src/dataframe/command/index/arg_sort.rs   |   2 +-
 .../src/dataframe/command/index/arg_unique.rs |   2 +-
 .../dataframe/command/index/set_with_idx.rs   |   2 +-
 .../src/dataframe/command/string/replace.rs   |   2 +-
 .../dataframe/command/string/replace_all.rs   |   2 +-
 .../src/dataframe/command/string/str_join.rs  |   2 +-
 .../src/dataframe/command/string/str_slice.rs |   8 +-
 .../dataframe/command/string/to_lowercase.rs  |   2 +-
 .../dataframe/command/string/to_uppercase.rs  |   2 +-
 .../nu_plugin_polars/src/dataframe/utils.rs   |  16 ++
 .../values/nu_dataframe/between_values.rs     |  28 +--
 .../values/nu_dataframe/conversion.rs         | 188 ++++++++-------
 .../src/dataframe/values/nu_dataframe/mod.rs  |   7 +-
 .../values/nu_dataframe/operations.rs         |   4 +-
 .../src/dataframe/values/nu_expression/mod.rs |   4 +-
 .../src/dataframe/values/nu_lazyframe/mod.rs  |  19 +-
 .../src/dataframe/values/nu_schema.rs         |  23 +-
 .../src/dataframe/values/utils.rs             |  44 ++++
 59 files changed, 530 insertions(+), 398 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 54a861d765..8c94206cd1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -487,6 +487,17 @@ dependencies = [
  "brotli-decompressor",
 ]
 
+[[package]]
+name = "brotli"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+ "brotli-decompressor",
+]
+
 [[package]]
 name = "brotli-decompressor"
 version = "4.0.1"
@@ -720,12 +731,12 @@ dependencies = [
 
 [[package]]
 name = "chrono-tz"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb"
+checksum = "cd6dd8046d00723a59a2f8c5f295c515b9bb9a331ee4f8f3d4dd49e428acd3b6"
 dependencies = [
  "chrono",
- "chrono-tz-build 0.3.0",
+ "chrono-tz-build 0.4.0",
  "phf 0.11.2",
 ]
 
@@ -742,12 +753,11 @@ dependencies = [
 
 [[package]]
 name = "chrono-tz-build"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1"
+checksum = "e94fea34d77a245229e7746bd2beb786cd2a896f306ff491fb8cecb3074b10a7"
 dependencies = [
  "parse-zoneinfo",
- "phf 0.11.2",
  "phf_codegen 0.11.2",
 ]
 
@@ -871,6 +881,21 @@ dependencies = [
  "static_assertions",
 ]
 
+[[package]]
+name = "compact_str"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6050c3a16ddab2e412160b31f2c871015704239bca62f72f6e5f0be631d3f644"
+dependencies = [
+ "castaway",
+ "cfg-if",
+ "itoa",
+ "rustversion",
+ "ryu",
+ "serde",
+ "static_assertions",
+]
+
 [[package]]
 name = "console"
 version = "0.15.8"
@@ -1570,12 +1595,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
-[[package]]
-name = "foreign_vec"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee1b05cbd864bcaecbd3455d6d967862d446e4ebfc3c2e5e5b9841e53cba6673"
-
 [[package]]
 name = "form_urlencoded"
 version = "1.2.1"
@@ -3102,7 +3121,7 @@ dependencies = [
  "alphanumeric-sort",
  "base64 0.22.1",
  "bracoxide",
- "brotli",
+ "brotli 5.0.0",
  "byteorder",
  "bytesize",
  "calamine",
@@ -3201,7 +3220,7 @@ dependencies = [
  "v_htmlescape",
  "wax",
  "which",
- "windows 0.56.0",
+ "windows",
  "winreg",
 ]
 
@@ -3347,7 +3366,7 @@ dependencies = [
  "rmp-serde",
  "serde",
  "serde_json",
- "windows 0.56.0",
+ "windows",
 ]
 
 [[package]]
@@ -3363,7 +3382,7 @@ dependencies = [
  "nu-utils",
  "serde",
  "typetag",
- "windows 0.56.0",
+ "windows",
 ]
 
 [[package]]
@@ -3409,7 +3428,7 @@ dependencies = [
 name = "nu-protocol"
 version = "0.99.2"
 dependencies = [
- "brotli",
+ "brotli 5.0.0",
  "byte-unit",
  "bytes",
  "chrono",
@@ -3469,7 +3488,7 @@ dependencies = [
  "once_cell",
  "procfs",
  "sysinfo 0.32.0",
- "windows 0.56.0",
+ "windows",
 ]
 
 [[package]]
@@ -3581,7 +3600,7 @@ name = "nu_plugin_polars"
 version = "0.99.2"
 dependencies = [
  "chrono",
- "chrono-tz 0.9.0",
+ "chrono-tz 0.10.0",
  "env_logger 0.11.5",
  "fancy-regex",
  "hashbrown 0.14.5",
@@ -4263,9 +4282,9 @@ dependencies = [
 
 [[package]]
 name = "polars"
-version = "0.41.3"
+version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e3351ea4570e54cd556e6755b78fe7a2c85368d820c0307cca73c96e796a7ba"
+checksum = "0e248cf2f0069277f8fe80d413cfb9240c7dd1cfa382b5674c1b4afa57222747"
 dependencies = [
  "getrandom",
  "polars-arrow",
@@ -4283,9 +4302,9 @@ dependencies = [
 
 [[package]]
 name = "polars-arrow"
-version = "0.41.3"
+version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba65fc4bcabbd64fca01fd30e759f8b2043f0963c57619e331d4b534576c0b47"
+checksum = "2981d5b2f34c84069a39fceca0d36dffeb97db8cadba101e7ea6605c8d42294d"
 dependencies = [
  "ahash 0.8.11",
  "atoi",
@@ -4298,7 +4317,6 @@ dependencies = [
  "either",
  "ethnum",
  "fast-float",
- "foreign_vec",
  "futures",
  "getrandom",
  "hashbrown 0.14.5",
@@ -4307,8 +4325,10 @@ dependencies = [
  "lz4",
  "multiversion",
  "num-traits",
+ "parking_lot",
  "polars-arrow-format",
  "polars-error",
+ "polars-schema",
  "polars-utils",
  "ryu",
  "serde",
@@ -4331,9 +4351,9 @@ dependencies = [
 
 [[package]]
 name = "polars-compute"
-version = "0.41.3"
+version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f099516af30ac9ae4b4480f4ad02aa017d624f2f37b7a16ad4e9ba52f7e5269"
+checksum = "5a97b2a5c9b880ab7e52553c40a336fdb6e3244bf896b4d4917700defe8085d5"
 dependencies = [
  "bytemuck",
  "either",
@@ -4347,9 +4367,9 @@ dependencies = [
 
 [[package]]
 name = "polars-core"
-version = "0.41.3"
+version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2439484be228b8c302328e2f953e64cfd93930636e5c7ceed90339ece7fef6c"
+checksum = "d5bc2cadcca904a9dc4d2c2b437c346712806e9a678bf17c7e94ebf622faae76"
 dependencies = [
  "ahash 0.8.11",
  "bitflags 2.6.0",
@@ -4366,6 +4386,7 @@ dependencies = [
  "polars-compute",
  "polars-error",
  "polars-row",
+ "polars-schema",
  "polars-utils",
  "rand",
  "rand_distr",
@@ -4373,7 +4394,6 @@ dependencies = [
  "regex",
  "serde",
  "serde_json",
- "smartstring",
  "thiserror",
  "version_check",
  "xxhash-rust",
@@ -4381,9 +4401,9 @@ dependencies = [
 
 [[package]]
 name = "polars-error"
-version = "0.41.3"
+version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c9b06dfbe79cabe50a7f0a90396864b5ee2c0e0f8d6a9353b2343c29c56e937"
+checksum = "56b0a8eb9b1e56a4640de6887d613cb4de73c4e09d491f3b779855d4c3bcb9ba"
 dependencies = [
  "avro-schema",
  "polars-arrow-format",
@@ -4394,14 +4414,15 @@ dependencies = [
 
 [[package]]
 name = "polars-expr"
-version = "0.41.3"
+version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9c630385a56a867c410a20f30772d088f90ec3d004864562b84250b35268f97"
+checksum = "34e9c0e8c7ba93aac64051b92dc68eac5a0e9543cf44ca784467db2c035821fe"
 dependencies = [
  "ahash 0.8.11",
  "bitflags 2.6.0",
  "once_cell",
  "polars-arrow",
+ "polars-compute",
  "polars-core",
  "polars-io",
  "polars-ops",
@@ -4409,14 +4430,13 @@ dependencies = [
  "polars-time",
  "polars-utils",
  "rayon",
- "smartstring",
 ]
 
 [[package]]
 name = "polars-io"
-version = "0.41.3"
+version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d7363cd14e4696a28b334a56bd11013ff49cc96064818ab3f91a126e453462d"
+checksum = "454ebbebe1cb8cb4768adca44b8fc9431abc3c91d5927f6824e73f916bced911"
 dependencies = [
  "ahash 0.8.11",
  "async-trait",
@@ -4426,6 +4446,8 @@ dependencies = [
  "fast-float",
  "flate2",
  "futures",
+ "glob",
+ "hashbrown 0.14.5",
  "home",
  "itoa",
  "memchr",
@@ -4438,16 +4460,15 @@ dependencies = [
  "polars-error",
  "polars-json",
  "polars-parquet",
+ "polars-schema",
  "polars-time",
  "polars-utils",
  "rayon",
  "regex",
  "ryu",
  "serde",
- "serde_json",
  "simd-json",
  "simdutf8",
- "smartstring",
  "tokio",
  "tokio-util",
  "zstd",
@@ -4455,9 +4476,9 @@ dependencies = [
 
 [[package]]
 name = "polars-json"
-version = "0.41.3"
+version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "543d7d3853f2c52dbfedee9ebf0d58c4ff3b92aadee5309150b2d14df49d6253"
+checksum = "4ca086fbbff6e46efbc97032e93f92690c1fc9c662fd5e1f13a42922bd7d3aa4"
 dependencies = [
  "ahash 0.8.11",
  "chrono",
@@ -4476,13 +4497,12 @@ dependencies = [
 
 [[package]]
 name = "polars-lazy"
-version = "0.41.3"
+version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03877e74e42b5340ae52ded705f6d5d14563d90554c9177b01b91ed2412a56ed"
+checksum = "7e61c062e833d2376de0a4cf745504449215cbf499cea293cb592e674ffb39ca"
 dependencies = [
  "ahash 0.8.11",
  "bitflags 2.6.0",
- "glob",
  "memchr",
  "once_cell",
  "polars-arrow",
@@ -4497,16 +4517,16 @@ dependencies = [
  "polars-time",
  "polars-utils",
  "rayon",
- "smartstring",
  "version_check",
 ]
 
 [[package]]
 name = "polars-mem-engine"
-version = "0.41.3"
+version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dea9e17771af750c94bf959885e4b3f5b14149576c62ef3ec1c9ef5827b2a30f"
+checksum = "c0643812829cc990e1533a5bf48c21a1b3eaa46aabf2967b0f53f99097cbc74c"
 dependencies = [
+ "memmap2",
  "polars-arrow",
  "polars-core",
  "polars-error",
@@ -4522,9 +4542,9 @@ dependencies = [
 
 [[package]]
 name = "polars-ops"
-version = "0.41.3"
+version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6066552eb577d43b307027fb38096910b643ffb2c89a21628c7e41caf57848d0"
+checksum = "5ac14a136d87bea798f3db51d5987556deb2293da34bfc8b105ebffa05f6e810"
 dependencies = [
  "ahash 0.8.11",
  "argminmax",
@@ -4544,6 +4564,7 @@ dependencies = [
  "polars-core",
  "polars-error",
  "polars-json",
+ "polars-schema",
  "polars-utils",
  "rand",
  "rand_distr",
@@ -4551,24 +4572,25 @@ dependencies = [
  "regex",
  "serde",
  "serde_json",
- "smartstring",
  "unicode-reverse",
  "version_check",
 ]
 
 [[package]]
 name = "polars-parquet"
-version = "0.41.3"
+version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b35b2592a2e7ef7ce9942dc2120dc4576142626c0e661668e4c6b805042e461"
+checksum = "491f5af321169259d5b1294c9fe8ed89faaeac34b4dec4abcedc0d1b3d11013a"
 dependencies = [
  "ahash 0.8.11",
  "async-stream",
  "base64 0.22.1",
- "brotli",
+ "brotli 6.0.0",
+ "bytemuck",
  "ethnum",
  "flate2",
  "futures",
+ "hashbrown 0.14.5",
  "lz4",
  "num-traits",
  "parquet-format-safe",
@@ -4585,13 +4607,14 @@ dependencies = [
 
 [[package]]
 name = "polars-pipe"
-version = "0.41.3"
+version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "021bce7768c330687d735340395a77453aa18dd70d57c184cbb302311e87c1b9"
+checksum = "29215c31f599295cc0f803c42fc812cc518db6d5ed4d6c7cc03daf3976a0add5"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-queue",
  "enum_dispatch",
+ "futures",
  "hashbrown 0.14.5",
  "num-traits",
  "polars-arrow",
@@ -4604,22 +4627,25 @@ dependencies = [
  "polars-row",
  "polars-utils",
  "rayon",
- "smartstring",
  "uuid",
  "version_check",
 ]
 
 [[package]]
 name = "polars-plan"
-version = "0.41.3"
+version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "220d0d7c02d1c4375802b2813dbedcd1a184df39c43b74689e729ede8d5c2921"
+checksum = "e3f728df4bc643492a2057a0a125c7e550cbcfe35b391444653ad294be9ab190"
 dependencies = [
  "ahash 0.8.11",
+ "bitflags 2.6.0",
  "bytemuck",
+ "bytes",
+ "chrono",
  "chrono-tz 0.8.6",
  "either",
  "hashbrown 0.14.5",
+ "memmap2",
  "once_cell",
  "percent-encoding",
  "polars-arrow",
@@ -4634,16 +4660,15 @@ dependencies = [
  "recursive",
  "regex",
  "serde",
- "smartstring",
  "strum_macros",
  "version_check",
 ]
 
 [[package]]
 name = "polars-row"
-version = "0.41.3"
+version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1d70d87a2882a64a43b431aea1329cb9a2c4100547c95c417cc426bb82408b3"
+checksum = "4eb931f0929ca7498b3ed5056357d2d364cad42cce95383a7e3983dbceb4bed1"
 dependencies = [
  "bytemuck",
  "polars-arrow",
@@ -4652,10 +4677,23 @@ dependencies = [
 ]
 
 [[package]]
-name = "polars-sql"
-version = "0.41.3"
+name = "polars-schema"
+version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6fc1c9b778862f09f4a347f768dfdd3d0ba9957499d306d83c7103e0fa8dc5b"
+checksum = "9c7e1234b942d3244024ecbac9c7f5a48a52a815f8ca4b9d075fbba16afb1a39"
+dependencies = [
+ "indexmap",
+ "polars-error",
+ "polars-utils",
+ "serde",
+ "version_check",
+]
+
+[[package]]
+name = "polars-sql"
+version = "0.43.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce52bfd2ef1e2e18ac26d7d7ea3f9132b199cff06d975156703fa5badcfae187"
 dependencies = [
  "hex",
  "once_cell",
@@ -4666,6 +4704,7 @@ dependencies = [
  "polars-ops",
  "polars-plan",
  "polars-time",
+ "polars-utils",
  "rand",
  "serde",
  "serde_json",
@@ -4674,9 +4713,9 @@ dependencies = [
 
 [[package]]
 name = "polars-time"
-version = "0.41.3"
+version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "179f98313a15c0bfdbc8cc0f1d3076d08d567485b9952d46439f94fbc3085df5"
+checksum = "9925ab75e1d859ae2283ca09d7683198b0b9ff5afecd03f2c9180f3e36e35056"
 dependencies = [
  "atoi",
  "bytemuck",
@@ -4691,27 +4730,30 @@ dependencies = [
  "polars-utils",
  "regex",
  "serde",
- "smartstring",
 ]
 
 [[package]]
 name = "polars-utils"
-version = "0.41.3"
+version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53e6dd89fcccb1ec1a62f752c9a9f2d482a85e9255153f46efecc617b4996d50"
+checksum = "b44846e1fc6ae1dfdc7f65a37af7d270d0a6a17a58fff76716561f5b887a8ad7"
 dependencies = [
  "ahash 0.8.11",
  "bytemuck",
+ "bytes",
+ "compact_str 0.8.0",
  "hashbrown 0.14.5",
  "indexmap",
+ "libc",
+ "memmap2",
  "num-traits",
  "once_cell",
  "polars-error",
  "raw-cpuid",
  "rayon",
- "smartstring",
+ "serde",
  "stacker",
- "sysinfo 0.30.13",
+ "sysinfo 0.31.4",
  "version_check",
 ]
 
@@ -5040,7 +5082,7 @@ checksum = "f44c9e68fd46eda15c646fbb85e1040b657a58cdc8c98db1d97a55930d991eef"
 dependencies = [
  "bitflags 2.6.0",
  "cassowary",
- "compact_str",
+ "compact_str 0.7.1",
  "crossterm 0.27.0",
  "itertools 0.12.1",
  "lru",
@@ -5822,18 +5864,6 @@ version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
-[[package]]
-name = "smartstring"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29"
-dependencies = [
- "autocfg",
- "serde",
- "static_assertions",
- "version_check",
-]
-
 [[package]]
 name = "smawk"
 version = "0.3.2"
@@ -5858,9 +5888,9 @@ dependencies = [
 
 [[package]]
 name = "sqlparser"
-version = "0.47.0"
+version = "0.49.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "295e9930cd7a97e58ca2a070541a3ca502b17f5d1fa7157376d0fabd85324f25"
+checksum = "a4a404d0e14905361b918cb8afdb73605e25c1d5029312bd9785142dcb3aa49e"
 dependencies = [
  "log",
 ]
@@ -6087,16 +6117,15 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.30.13"
+version = "0.31.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3"
+checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be"
 dependencies = [
- "cfg-if",
  "core-foundation-sys",
  "libc",
+ "memchr",
  "ntapi",
- "once_cell",
- "windows 0.52.0",
+ "windows",
 ]
 
 [[package]]
@@ -6110,7 +6139,7 @@ dependencies = [
  "memchr",
  "ntapi",
  "rayon",
- "windows 0.56.0",
+ "windows",
 ]
 
 [[package]]
@@ -6448,7 +6477,7 @@ dependencies = [
  "once_cell",
  "scopeguard",
  "urlencoding",
- "windows 0.56.0",
+ "windows",
 ]
 
 [[package]]
@@ -7084,16 +7113,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "windows"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
-dependencies = [
- "windows-core 0.52.0",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows"
 version = "0.56.0"
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index b05d8d6811..52a51dc3f4 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -24,18 +24,18 @@ nu-utils = { path = "../nu-utils", version = "0.99.2" }
 
 # Potential dependencies for extras
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
-chrono-tz = "0.9"
+chrono-tz = "0.10"
 fancy-regex = { workspace = true }
 indexmap = { version = "2.6" }
 mimalloc = { version = "0.1.42" }
 num = {version = "0.4"}
 serde = { version = "1.0", features = ["derive"] }
-sqlparser = { version = "0.47"}
-polars-io = { version = "0.41", features = ["avro"]}
-polars-arrow = { version = "0.41"}
-polars-ops = { version = "0.41", features = ["pivot"]}
-polars-plan = { version = "0.41", features = ["regex"]}
-polars-utils = { version = "0.41"}
+sqlparser = { version = "0.49"}
+polars-io = { version = "0.43", features = ["avro"]}
+polars-arrow = { version = "0.43"}
+polars-ops = { version = "0.43", features = ["pivot"]}
+polars-plan = { version = "0.43", features = ["regex"]}
+polars-utils = { version = "0.43"}
 typetag = "0.2"
 env_logger = "0.11.3"
 log.workspace = true
@@ -46,41 +46,42 @@ hashbrown = { version = "0.14", features = ["rayon", "ahash", "serde", "raw"] }
 
 [dependencies.polars]
 features = [
-	"arg_where",
-	"checked_arithmetic",
-	"concat_str",
-	"cross_join",
-	"csv",
-	"cum_agg",
-	"default",
-	"dtype-categorical",
-	"dtype-datetime",
-	"dtype-struct",
-	"dtype-decimal",
-	"dtype-i8",
-	"dtype-i16",
-	"dtype-u8",
-	"dtype-u16",
-	"dynamic_group_by",
-	"ipc",
-	"is_in",
-	"json",
-	"lazy",
-	"object",
-	"parquet",
-	"random",
-	"rolling_window",
-	"rows",
-	"serde",
-	"serde-lazy",
-	"strings",
-	"string_to_integer",
-	"streaming",
-	"temporal",
-	"to_dummies",
+    "arg_where",
+    "checked_arithmetic",
+    "concat_str",
+    "cross_join",
+    "csv",
+    "cum_agg",
+    "default",
+    "dtype-categorical",
+    "dtype-datetime",
+    "dtype-struct",
+    "dtype-decimal",
+    "dtype-i8",
+    "dtype-i16",
+    "dtype-u8",
+    "dtype-u16",
+    "dynamic_group_by",
+    "ipc",
+    "is_in",
+    "json",
+    "lazy",
+    "object",
+    "parquet",
+    "pivot",
+    "random",
+    "rolling_window",
+    "rows",
+    "serde",
+    "serde-lazy",
+    "strings",
+    "string_to_integer",
+    "streaming",
+    "temporal",
+    "to_dummies",
 ]
 optional = false
-version = "0.41"
+version = "0.43"
 
 [dev-dependencies]
 nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.2" }
@@ -88,4 +89,4 @@ nu-engine = { path = "../nu-engine", version = "0.99.2" }
 nu-parser = { path = "../nu-parser", version = "0.99.2" }
 nu-command = { path = "../nu-command", version = "0.99.2" }
 nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.99.2" }
-tempfile.workspace = true
\ No newline at end of file
+tempfile.workspace = true
diff --git a/crates/nu_plugin_polars/src/cache/get.rs b/crates/nu_plugin_polars/src/cache/get.rs
index 843e21305a..b034b38c3f 100644
--- a/crates/nu_plugin_polars/src/cache/get.rs
+++ b/crates/nu_plugin_polars/src/cache/get.rs
@@ -42,7 +42,10 @@ impl PluginCommand for CacheGet {
     polars store-ls | get key | first | polars store-get $in"#,
             result: Some(
                 NuDataFrame::try_from_series_vec(
-                    vec![Series::new("a", &[1_i64, 3]), Series::new("b", &[2_i64, 4])],
+                    vec![
+                        Series::new("a".into(), &[1_i64, 3]),
+                        Series::new("b".into(), &[2_i64, 4]),
+                    ],
                     Span::test_data(),
                 )
                 .expect("could not create dataframe")
diff --git a/crates/nu_plugin_polars/src/dataframe/command/aggregation/cumulative.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/cumulative.rs
index 7d68391dfb..77ffa7cc96 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/aggregation/cumulative.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/cumulative.rs
@@ -82,9 +82,9 @@ impl PluginCommand for Cumulative {
         vec![
             Example {
                 description: "Cumulative sum for a column",
-                example: "[[a]; [1] [2] [3] [4] [5]] 
-                    | polars into-df 
-                    | polars select (polars col a | polars cumulative sum | polars as cum_a) 
+                example: "[[a]; [1] [2] [3] [4] [5]]
+                    | polars into-df
+                    | polars select (polars col a | polars cumulative sum | polars as cum_a)
                     | polars collect",
                 result: Some(
                     NuDataFrame::try_from_columns(
@@ -234,7 +234,7 @@ fn command_df(
     })?;
 
     let name = format!("{}_{}", series.name(), cum_type.to_str());
-    res.rename(&name);
+    res.rename(name.into());
 
     let df = NuDataFrame::try_from_series_vec(vec![res.into_series()], call.head)?;
     df.to_pipeline_data(plugin, engine, call.head)
diff --git a/crates/nu_plugin_polars/src/dataframe/command/aggregation/rolling.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/rolling.rs
index 05e7df6040..70bfaee8b5 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/aggregation/rolling.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/rolling.rs
@@ -169,7 +169,7 @@ fn command(
     })?;
 
     let name = format!("{}_{}", series.name(), roll_type.to_str());
-    res.rename(&name);
+    res.rename(name.into());
 
     let df = NuDataFrame::try_from_series_vec(vec![res.into_series()], call.head)?;
     df.to_pipeline_data(plugin, engine, call.head)
diff --git a/crates/nu_plugin_polars/src/dataframe/command/aggregation/value_counts.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/value_counts.rs
index dd3fc57261..064e308e80 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/aggregation/value_counts.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/value_counts.rs
@@ -92,7 +92,7 @@ fn command(
     let series = df.as_series(call.head)?;
 
     let res = series
-        .value_counts(sort, parallel, column, normalize)
+        .value_counts(sort, parallel, column.into(), normalize)
         .map_err(|e| ShellError::GenericError {
             error: "Error calculating value counts values".into(),
             msg: e.to_string(),
diff --git a/crates/nu_plugin_polars/src/dataframe/command/boolean/arg_true.rs b/crates/nu_plugin_polars/src/dataframe/command/boolean/arg_true.rs
index 0cb8f75c03..5ce1152bf4 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/boolean/arg_true.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/boolean/arg_true.rs
@@ -84,7 +84,7 @@ fn command(
 
     match columns.first() {
         Some(column) => {
-            let expression = arg_where(col(column).eq(true)).alias("arg_true");
+            let expression = arg_where(col((*column).clone()).eq(true)).alias("arg_true");
             let res: NuDataFrame = df
                 .as_ref()
                 .clone()
diff --git a/crates/nu_plugin_polars/src/dataframe/command/boolean/is_duplicated.rs b/crates/nu_plugin_polars/src/dataframe/command/boolean/is_duplicated.rs
index 97709730a9..c482b58aab 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/boolean/is_duplicated.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/boolean/is_duplicated.rs
@@ -112,7 +112,7 @@ fn command(
         })?
         .into_series();
 
-    res.rename("is_duplicated");
+    res.rename("is_duplicated".into());
 
     let df = NuDataFrame::try_from_series_vec(vec![res], call.head)?;
     df.to_pipeline_data(plugin, engine, call.head)
diff --git a/crates/nu_plugin_polars/src/dataframe/command/boolean/is_in.rs b/crates/nu_plugin_polars/src/dataframe/command/boolean/is_in.rs
index d2359c9d12..7400c48bc9 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/boolean/is_in.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/boolean/is_in.rs
@@ -178,7 +178,7 @@ fn command_df(
         })?
         .into_series();
 
-    res.rename("is_in");
+    res.rename("is_in".into());
 
     let mut new_df = NuDataFrame::try_from_series_vec(vec![res.into_series()], call.head)?;
     new_df.from_lazy = df.from_lazy;
diff --git a/crates/nu_plugin_polars/src/dataframe/command/boolean/is_not_null.rs b/crates/nu_plugin_polars/src/dataframe/command/boolean/is_not_null.rs
index 242870bcb8..b14602b9e1 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/boolean/is_not_null.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/boolean/is_not_null.rs
@@ -108,7 +108,7 @@ fn command(
     df: NuDataFrame,
 ) -> Result<PipelineData, ShellError> {
     let mut res = df.as_series(call.head)?.is_not_null();
-    res.rename("is_not_null");
+    res.rename("is_not_null".into());
 
     let df = NuDataFrame::try_from_series_vec(vec![res.into_series()], call.head)?;
     df.to_pipeline_data(plugin, engine, call.head)
diff --git a/crates/nu_plugin_polars/src/dataframe/command/boolean/is_null.rs b/crates/nu_plugin_polars/src/dataframe/command/boolean/is_null.rs
index 69f751d74e..4eaf2643a2 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/boolean/is_null.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/boolean/is_null.rs
@@ -110,7 +110,7 @@ fn command(
     df: NuDataFrame,
 ) -> Result<PipelineData, ShellError> {
     let mut res = df.as_series(call.head)?.is_null();
-    res.rename("is_null");
+    res.rename("is_null".into());
 
     let df = NuDataFrame::try_from_series_vec(vec![res.into_series()], call.head)?;
     df.to_pipeline_data(plugin, engine, call.head)
diff --git a/crates/nu_plugin_polars/src/dataframe/command/boolean/is_unique.rs b/crates/nu_plugin_polars/src/dataframe/command/boolean/is_unique.rs
index b6438c5bf8..f0aa293a34 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/boolean/is_unique.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/boolean/is_unique.rs
@@ -112,7 +112,7 @@ fn command(
         })?
         .into_series();
 
-    res.rename("is_unique");
+    res.rename("is_unique".into());
 
     let df = NuDataFrame::try_from_series_vec(vec![res], call.head)?;
     df.to_pipeline_data(plugin, engine, call.head)
diff --git a/crates/nu_plugin_polars/src/dataframe/command/boolean/set.rs b/crates/nu_plugin_polars/src/dataframe/command/boolean/set.rs
index d38508ad51..28d6be0ce2 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/boolean/set.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/boolean/set.rs
@@ -175,7 +175,7 @@ fn command(
             })?;
 
             let mut res = res.into_series();
-            res.rename("string");
+            res.rename("string".into());
 
             NuDataFrame::try_from_series_vec(vec![res.into_series()], call.head)
         }
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/columns.rs b/crates/nu_plugin_polars/src/dataframe/command/core/columns.rs
index ceb9975dfe..9ece088c1c 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/columns.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/columns.rs
@@ -59,7 +59,7 @@ fn command(
         .as_ref()
         .get_column_names()
         .iter()
-        .map(|v| Value::string(*v, call.head))
+        .map(|v| Value::string(v.as_str(), call.head))
         .collect();
 
     let names = Value::list(names, call.head);
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/open.rs b/crates/nu_plugin_polars/src/dataframe/command/core/open.rs
index 1aae5f26e2..ad430c6885 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/open.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/open.rs
@@ -24,7 +24,7 @@ use polars::{
     lazy::frame::LazyJsonLineReader,
     prelude::{
         CsvEncoding, IpcReader, JsonFormat, JsonReader, LazyCsvReader, LazyFileListReader,
-        LazyFrame, ParquetReader, ScanArgsIpc, ScanArgsParquet, SerReader,
+        LazyFrame, ParquetReader, PlSmallStr, ScanArgsIpc, ScanArgsParquet, SerReader,
     },
 };
 
@@ -190,6 +190,7 @@ fn from_parquet(
             use_statistics: false,
             hive_options: HiveOptions::default(),
             glob: true,
+            include_file_paths: None,
         };
 
         let df: NuLazyFrame = LazyFrame::scan_parquet(file, args)
@@ -286,8 +287,9 @@ fn from_arrow(
             cache: true,
             rechunk: false,
             row_index: None,
-            memory_map: true,
             cloud_options: None,
+            include_file_paths: None,
+            hive_options: HiveOptions::default(),
         };
 
         let df: NuLazyFrame = LazyFrame::scan_ipc(file, args)
@@ -530,7 +532,11 @@ fn from_csv(
             .with_infer_schema_length(Some(infer_schema))
             .with_skip_rows(skip_rows.unwrap_or_default())
             .with_schema(maybe_schema.map(|s| s.into()))
-            .with_columns(columns.map(|v| Arc::from(v.into_boxed_slice())))
+            .with_columns(
+                columns
+                    .map(|v| v.iter().map(PlSmallStr::from).collect::<Vec<PlSmallStr>>())
+                    .map(|v| Arc::from(v.into_boxed_slice())),
+            )
             .map_parse_options(|options| {
                 options
                     .with_separator(
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/summary.rs b/crates/nu_plugin_polars/src/dataframe/command/core/summary.rs
index f9156560d2..8710b9bc01 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/summary.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/summary.rs
@@ -177,7 +177,8 @@ fn command(
 
     let df = NuDataFrame::try_from_pipeline_coerce(plugin, input, call.head)?;
 
-    let names = ChunkedArray::<StringType>::from_slice_options("descriptor", &labels).into_series();
+    let names =
+        ChunkedArray::<StringType>::from_slice_options("descriptor".into(), &labels).into_series();
 
     let head = std::iter::once(names);
 
@@ -201,7 +202,7 @@ fn command(
                 .map(|q| {
                     col.quantile_reduce(q, QuantileInterpolOptions::default())
                         .ok()
-                        .map(|s| s.into_series("quantile"))
+                        .map(|s| s.into_series("quantile".into()))
                         .and_then(|ca| ca.cast(&DataType::Float64).ok())
                         .and_then(|ca| match ca.get(0) {
                             Ok(AnyValue::Float64(v)) => Some(v),
@@ -217,7 +218,7 @@ fn command(
             descriptors.push(max);
 
             let name = format!("{} ({})", col.name(), col.dtype());
-            ChunkedArray::<Float64Type>::from_slice_options(&name, &descriptors).into_series()
+            ChunkedArray::<Float64Type>::from_slice_options(name.into(), &descriptors).into_series()
         });
 
     let res = head.chain(tail).collect::<Vec<Series>>();
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/to_df.rs b/crates/nu_plugin_polars/src/dataframe/command/core/to_df.rs
index 066e07d01f..e99dfa83d9 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/to_df.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/to_df.rs
@@ -163,18 +163,18 @@ impl PluginCommand for ToDataFrame {
                 example: "[[a b c]; [1 {d: [1 2 3]} [10 11 12] ]]| polars into-df -s {a: u8, b: {d: list<u64>}, c: list<u8>}",
                 result: Some(
                     NuDataFrame::try_from_series_vec(vec![
-                        Series::new("a", &[1u8]),
+                        Series::new("a".into(), &[1u8]),
                         {
-                            let dtype = DataType::Struct(vec![Field::new("a", DataType::List(Box::new(DataType::UInt64)))]);
+                            let dtype = DataType::Struct(vec![Field::new("a".into(), DataType::List(Box::new(DataType::UInt64)))]);
                             let vals = vec![AnyValue::StructOwned(
-                                Box::new((vec![AnyValue::List(Series::new("a", &[1u64, 2, 3]))], vec![Field::new("a", DataType::String)]))); 1];
-                            Series::from_any_values_and_dtype("b", &vals, &dtype, false)
+                                Box::new((vec![AnyValue::List(Series::new("a".into(), &[1u64, 2, 3]))], vec![Field::new("a".into(), DataType::String)]))); 1];
+                            Series::from_any_values_and_dtype("b".into(), &vals, &dtype, false)
                                 .expect("Struct series should not fail")
                         },
                         {
                             let dtype = DataType::List(Box::new(DataType::String));
-                            let vals = vec![AnyValue::List(Series::new("c", &[10, 11, 12]))];
-                            Series::from_any_values_and_dtype("c", &vals, &dtype, false)
+                            let vals = vec![AnyValue::List(Series::new("c".into(), &[10, 11, 12]))];
+                            Series::from_any_values_and_dtype("c".into(), &vals, &dtype, false)
                                 .expect("List series should not fail")
                         }
                     ], Span::test_data())
@@ -186,9 +186,9 @@ impl PluginCommand for ToDataFrame {
                 description: "Convert to a dataframe and provide a schema that adds a new column",
                 example: r#"[[a b]; [1 "foo"] [2 "bar"]] | polars into-df -s {a: u8, b:str, c:i64} | polars fill-null 3"#,
                 result: Some(NuDataFrame::try_from_series_vec(vec![
-                        Series::new("a", [1u8, 2]),
-                        Series::new("b", ["foo", "bar"]),
-                        Series::new("c", [3i64, 3]),
+                        Series::new("a".into(), [1u8, 2]),
+                        Series::new("b".into(), ["foo", "bar"]),
+                        Series::new("c".into(), [3i64, 3]),
                     ], Span::test_data())
                     .expect("simple df for test should not fail")
                     .into_value(Span::test_data()),
diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/drop_duplicates.rs b/crates/nu_plugin_polars/src/dataframe/command/data/drop_duplicates.rs
index 4ea26a78b5..94ccfde498 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/drop_duplicates.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/drop_duplicates.rs
@@ -49,7 +49,7 @@ impl PluginCommand for DropDuplicates {
     fn examples(&self) -> Vec<Example> {
         vec![Example {
             description: "drop duplicates",
-            example: "[[a b]; [1 2] [3 4] [1 2]] | polars into-df 
+            example: "[[a b]; [1 2] [3 4] [1 2]] | polars into-df
                 | polars drop-duplicates
                 | polars sort-by a",
             result: Some(
@@ -103,7 +103,7 @@ fn command(
 
     let polars_df = df
         .as_ref()
-        .unique(subset_slice, keep_strategy, None)
+        .unique_stable(subset_slice, keep_strategy, None)
         .map_err(|e| ShellError::GenericError {
             error: "Error dropping duplicates".into(),
             msg: e.to_string(),
diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/dummies.rs b/crates/nu_plugin_polars/src/dataframe/command/data/dummies.rs
index 684cda772d..2dc305c2f4 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/dummies.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/dummies.rs
@@ -38,10 +38,10 @@ impl PluginCommand for Dummies {
                 result: Some(
                     NuDataFrame::try_from_series_vec(
                         vec![
-                            Series::new("a_1", &[1_u8, 0]),
-                            Series::new("a_3", &[0_u8, 1]),
-                            Series::new("b_2", &[1_u8, 0]),
-                            Series::new("b_4", &[0_u8, 1]),
+                            Series::new("a_1".into(), &[1_u8, 0]),
+                            Series::new("a_3".into(), &[0_u8, 1]),
+                            Series::new("b_2".into(), &[1_u8, 0]),
+                            Series::new("b_4".into(), &[0_u8, 1]),
                         ],
                         Span::test_data(),
                     )
@@ -55,9 +55,9 @@ impl PluginCommand for Dummies {
                 result: Some(
                     NuDataFrame::try_from_series_vec(
                         vec![
-                            Series::new("0_1", &[1_u8, 0, 0, 0, 0]),
-                            Series::new("0_2", &[0_u8, 1, 1, 0, 0]),
-                            Series::new("0_3", &[0_u8, 0, 0, 1, 1]),
+                            Series::new("0_1".into(), &[1_u8, 0, 0, 0, 0]),
+                            Series::new("0_2".into(), &[0_u8, 1, 1, 0, 0]),
+                            Series::new("0_3".into(), &[0_u8, 0, 0, 1, 1]),
                         ],
                         Span::test_data(),
                     )
diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/mod.rs b/crates/nu_plugin_polars/src/dataframe/command/data/mod.rs
index 0857fff1da..6089e3c858 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/mod.rs
@@ -69,7 +69,6 @@ pub use slice::SliceDF;
 use sort_by_expr::LazySortBy;
 pub use take::TakeDF;
 pub use unique::Unique;
-pub use unpivot::UnpivotDF;
 pub use with_column::WithColumn;
 
 pub(crate) fn data_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin>>> {
@@ -84,7 +83,7 @@ pub(crate) fn data_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin
         Box::new(filter_with::FilterWith),
         Box::new(GetDF),
         Box::new(pivot::PivotDF),
-        Box::new(UnpivotDF),
+        Box::new(unpivot::Unpivot),
         Box::new(FirstDF),
         Box::new(LastDF),
         Box::new(len::ExprLen),
diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/rename.rs b/crates/nu_plugin_polars/src/dataframe/command/data/rename.rs
index 485c440818..ae7e93b6b8 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/rename.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/rename.rs
@@ -150,7 +150,7 @@ fn command_eager(
 
     for (from, to) in columns.iter().zip(new_names.iter()) {
         polars_df
-            .rename(from, to)
+            .rename(from, to.into())
             .map_err(|e| ShellError::GenericError {
                 error: "Error renaming".into(),
                 msg: e.to_string(),
diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/sample.rs b/crates/nu_plugin_polars/src/dataframe/command/data/sample.rs
index b334c2cbc4..9157973d84 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/sample.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/sample.rs
@@ -114,7 +114,12 @@ fn command(
     let df = match (rows, fraction) {
         (Some(rows), None) => df
             .as_ref()
-            .sample_n(&Series::new("s", &[rows.item]), replace, shuffle, seed)
+            .sample_n(
+                &Series::new("s".into(), &[rows.item]),
+                replace,
+                shuffle,
+                seed,
+            )
             .map_err(|e| ShellError::GenericError {
                 error: "Error creating sample".into(),
                 msg: e.to_string(),
@@ -124,7 +129,12 @@ fn command(
             }),
         (None, Some(frac)) => df
             .as_ref()
-            .sample_frac(&Series::new("frac", &[frac.item]), replace, shuffle, seed)
+            .sample_frac(
+                &Series::new("frac".into(), &[frac.item]),
+                replace,
+                shuffle,
+                seed,
+            )
             .map_err(|e| ShellError::GenericError {
                 error: "Error creating sample".into(),
                 msg: e.to_string(),
diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/sql_context.rs b/crates/nu_plugin_polars/src/dataframe/command/data/sql_context.rs
index 3349736702..59e6c47258 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/sql_context.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/sql_context.rs
@@ -98,11 +98,11 @@ impl SQLContext {
         // Check for group by
         // After projection since there might be number.
         let group_by = match &select_stmt.group_by {
-                GroupByExpr::All =>
+                GroupByExpr::All(_) =>
                   Err(
                       PolarsError::ComputeError("Group-By Error: Only positive number or expression are supported, not all".into())
                   )?,
-                GroupByExpr::Expressions(expressions) => expressions
+                GroupByExpr::Expressions(expressions, _) => expressions
             }
             .iter()
             .map(
@@ -171,7 +171,8 @@ impl SQLContext {
                         .schema()
                         .get_at_index(shm_p)
                         .unwrap_or((&"".into(), &DataType::Null))
-                        .0)
+                        .0
+                        .clone())
                 })
                 .collect::<Vec<_>>();
             agg_df.select(final_proj)
diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/unique.rs b/crates/nu_plugin_polars/src/dataframe/command/data/unique.rs
index ebc854a211..142039e973 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/unique.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/unique.rs
@@ -1,5 +1,8 @@
 use crate::{
-    dataframe::{utils::extract_strings, values::NuLazyFrame},
+    dataframe::{
+        utils::{extract_sm_strs, extract_strings},
+        values::NuLazyFrame,
+    },
     values::{cant_convert_err, CustomValueSupport, PolarsPluginObject, PolarsPluginType},
     PolarsPlugin,
 };
@@ -179,12 +182,7 @@ fn command_lazy(
 ) -> Result<PipelineData, ShellError> {
     let last = call.has_flag("last")?;
     let maintain = call.has_flag("maintain-order")?;
-
     let subset: Option<Value> = call.get_flag("subset")?;
-    let subset = match subset {
-        Some(value) => Some(extract_strings(value)?),
-        None => None,
-    };
 
     let strategy = if last {
         UniqueKeepStrategy::Last
@@ -194,8 +192,16 @@ fn command_lazy(
 
     let lazy = lazy.to_polars();
     let lazy: NuLazyFrame = if maintain {
+        let subset = match subset {
+            Some(value) => Some(extract_strings(value)?),
+            None => None,
+        };
         lazy.unique(subset, strategy).into()
     } else {
+        let subset = match subset {
+            Some(value) => Some(extract_sm_strs(value)?),
+            None => None,
+        };
         lazy.unique_stable(subset, strategy).into()
     };
     lazy.to_pipeline_data(plugin, engine, call.head)
diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/unpivot.rs b/crates/nu_plugin_polars/src/dataframe/command/data/unpivot.rs
index ffbbd66916..77ca9973c5 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/unpivot.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/unpivot.rs
@@ -3,20 +3,21 @@ use nu_protocol::{
     Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Spanned,
     SyntaxShape, Type, Value,
 };
-use polars::frame::explode::UnpivotArgs;
+use polars::{frame::explode::UnpivotArgsIR, prelude::UnpivotArgsDSL};
+use polars_ops::pivot::UnpivotDF;
 
 use crate::{
     dataframe::values::utils::convert_columns_string,
-    values::{CustomValueSupport, NuLazyFrame, PolarsPluginObject},
+    values::{utils::convert_columns_sm_str, CustomValueSupport, NuLazyFrame, PolarsPluginObject},
     PolarsPlugin,
 };
 
 use crate::values::{Column, NuDataFrame};
 
 #[derive(Clone)]
-pub struct UnpivotDF;
+pub struct Unpivot;
 
-impl PluginCommand for UnpivotDF {
+impl PluginCommand for Unpivot {
     type Plugin = PolarsPlugin;
 
     fn name(&self) -> &str {
@@ -57,11 +58,6 @@ impl PluginCommand for UnpivotDF {
                 Type::Custom("dataframe".into()),
                 Type::Custom("dataframe".into()),
             )
-            .switch(
-                "streamable",
-                "Whether or not to use the polars streaming engine. Only valid for lazy dataframes",
-                Some('t'),
-            )
             .category(Category::Custom("dataframe".into()))
     }
 
@@ -220,14 +216,11 @@ fn command_eager(
     check_column_datatypes(df.as_ref(), &index_col_string, index_col_span)?;
     check_column_datatypes(df.as_ref(), &on_col_string, on_col_span)?;
 
-    let streamable = call.has_flag("streamable")?;
-
-    let args = UnpivotArgs {
+    let args = UnpivotArgsIR {
         on: on_col_string.iter().map(Into::into).collect(),
         index: index_col_string.iter().map(Into::into).collect(),
         variable_name: variable_name.map(|s| s.item.into()),
         value_name: value_name.map(|s| s.item.into()),
-        streamable,
     };
 
     let res = df
@@ -254,20 +247,17 @@ fn command_lazy(
     let index_col: Vec<Value> = call.get_flag("index")?.expect("required value");
     let on_col: Vec<Value> = call.get_flag("on")?.expect("required value");
 
-    let (index_col_string, _index_col_span) = convert_columns_string(index_col, call.head)?;
-    let (on_col_string, _on_col_span) = convert_columns_string(on_col, call.head)?;
+    let (index_col_string, _index_col_span) = convert_columns_sm_str(index_col, call.head)?;
+    let (on_col_string, _on_col_span) = convert_columns_sm_str(on_col, call.head)?;
 
     let value_name: Option<String> = call.get_flag("value-name")?;
     let variable_name: Option<String> = call.get_flag("variable-name")?;
 
-    let streamable = call.has_flag("streamable")?;
-
-    let unpivot_args = UnpivotArgs {
-        on: on_col_string.iter().map(Into::into).collect(),
-        index: index_col_string.iter().map(Into::into).collect(),
+    let unpivot_args = UnpivotArgsDSL {
+        on: on_col_string.iter().cloned().map(Into::into).collect(),
+        index: index_col_string.iter().cloned().map(Into::into).collect(),
         value_name: value_name.map(Into::into),
         variable_name: variable_name.map(Into::into),
-        streamable,
     };
 
     let polars_df = df.to_polars().unpivot(unpivot_args);
@@ -341,6 +331,6 @@ mod test {
 
     #[test]
     fn test_examples() -> Result<(), ShellError> {
-        test_polars_plugin_command(&UnpivotDF)
+        test_polars_plugin_command(&Unpivot)
     }
 }
diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/with_column.rs b/crates/nu_plugin_polars/src/dataframe/command/data/with_column.rs
index f7c6deccf8..4806450601 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/with_column.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/with_column.rs
@@ -153,7 +153,7 @@ fn command_eager(
             None => other.name().to_string(),
         };
 
-        let series = other.rename(&name).clone();
+        let series = other.rename(name.into()).clone();
 
         let mut polars_df = df.to_polars();
         polars_df
diff --git a/crates/nu_plugin_polars/src/dataframe/command/datetime/as_date.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/as_date.rs
index e5c12280d1..41dadd8646 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/datetime/as_date.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/datetime/as_date.rs
@@ -101,7 +101,7 @@ fn command(
         })?
         .into_series();
 
-    res.rename("date");
+    res.rename("date".into());
 
     let df = NuDataFrame::try_from_series_vec(vec![res], call.head)?;
     df.to_pipeline_data(plugin, engine, call.head)
diff --git a/crates/nu_plugin_polars/src/dataframe/command/datetime/as_datetime.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/as_datetime.rs
index 05f28c00af..a38779927f 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/datetime/as_datetime.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/datetime/as_datetime.rs
@@ -202,7 +202,7 @@ fn command(
         })?
         .into_series();
 
-    res.rename("datetime");
+    res.rename("datetime".into());
     let df = NuDataFrame::try_from_series_vec(vec![res], call.head)?;
     df.to_pipeline_data(plugin, engine, call.head)
 }
diff --git a/crates/nu_plugin_polars/src/dataframe/command/datetime/datepart.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/datepart.rs
index 12841db43f..c374ac82f5 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/datetime/datepart.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/datetime/datepart.rs
@@ -80,16 +80,16 @@ impl PluginCommand for ExprDatePart {
                 result: Some(
                     NuDataFrame::try_from_series_vec(
                         vec![
-                            Series::new("datetime", &[dt.timestamp_nanos_opt()])
+                            Series::new("datetime".into(), &[dt.timestamp_nanos_opt()])
                                 .cast(&DataType::Datetime(TimeUnit::Nanoseconds, None))
                                 .expect("Error casting to datetime type"),
-                            Series::new("datetime_year", &[2021_i64]), // i32 was coerced to i64
-                            Series::new("datetime_month", &[12_i8]),
-                            Series::new("datetime_day", &[30_i8]),
-                            Series::new("datetime_hour", &[1_i8]),
-                            Series::new("datetime_minute", &[2_i8]),
-                            Series::new("datetime_second", &[3_i8]),
-                            Series::new("datetime_ns", &[123456789_i64]), // i32 was coerced to i64
+                            Series::new("datetime_year".into(), &[2021_i64]), // i32 was coerced to i64
+                            Series::new("datetime_month".into(), &[12_i8]),
+                            Series::new("datetime_day".into(), &[30_i8]),
+                            Series::new("datetime_hour".into(), &[1_i8]),
+                            Series::new("datetime_minute".into(), &[2_i8]),
+                            Series::new("datetime_second".into(), &[3_i8]),
+                            Series::new("datetime_ns".into(), &[123456789_i64]), // i32 was coerced to i64
                         ],
                         Span::test_data(),
                     )
diff --git a/crates/nu_plugin_polars/src/dataframe/command/datetime/get_day.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_day.rs
index 014b345aa2..ca9c365cd1 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/datetime/get_day.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_day.rs
@@ -41,7 +41,7 @@ impl PluginCommand for GetDay {
     let df = ([$dt $dt] | polars into-df);
     $df | polars get-day"#,
             result: Some(
-                NuDataFrame::try_from_series(Series::new("0", &[4i8, 4]), Span::test_data())
+                NuDataFrame::try_from_series(Series::new("0".into(), &[4i8, 4]), Span::test_data())
                     .expect("simple df for test should not fail")
                     .into_value(Span::test_data()),
             ),
diff --git a/crates/nu_plugin_polars/src/dataframe/command/datetime/get_hour.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_hour.rs
index 0ff5c2d0b7..b924df973d 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/datetime/get_hour.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_hour.rs
@@ -41,9 +41,12 @@ impl PluginCommand for GetHour {
     let df = ([$dt $dt] | polars into-df);
     $df | polars get-hour"#,
             result: Some(
-                NuDataFrame::try_from_series(Series::new("0", &[16i8, 16]), Span::test_data())
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
+                NuDataFrame::try_from_series(
+                    Series::new("0".into(), &[16i8, 16]),
+                    Span::test_data(),
+                )
+                .expect("simple df for test should not fail")
+                .into_value(Span::test_data()),
             ),
         }]
     }
diff --git a/crates/nu_plugin_polars/src/dataframe/command/datetime/get_minute.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_minute.rs
index a1505bf25b..aac0507dff 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/datetime/get_minute.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_minute.rs
@@ -39,9 +39,12 @@ impl PluginCommand for GetMinute {
     let df = ([$dt $dt] | polars into-df);
     $df | polars get-minute"#,
             result: Some(
-                NuDataFrame::try_from_series(Series::new("0", &[39i8, 39]), Span::test_data())
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
+                NuDataFrame::try_from_series(
+                    Series::new("0".into(), &[39i8, 39]),
+                    Span::test_data(),
+                )
+                .expect("simple df for test should not fail")
+                .into_value(Span::test_data()),
             ),
         }]
     }
diff --git a/crates/nu_plugin_polars/src/dataframe/command/datetime/get_month.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_month.rs
index 5ce06aee68..60d9400e51 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/datetime/get_month.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_month.rs
@@ -41,7 +41,7 @@ impl PluginCommand for GetMonth {
     let df = ([$dt $dt] | polars into-df);
     $df | polars get-month"#,
             result: Some(
-                NuDataFrame::try_from_series(Series::new("0", &[8i8, 8]), Span::test_data())
+                NuDataFrame::try_from_series(Series::new("0".into(), &[8i8, 8]), Span::test_data())
                     .expect("simple df for test should not fail")
                     .into_value(Span::test_data()),
             ),
diff --git a/crates/nu_plugin_polars/src/dataframe/command/datetime/get_nanosecond.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_nanosecond.rs
index e5431dd7c7..1a683e92bd 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/datetime/get_nanosecond.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_nanosecond.rs
@@ -41,9 +41,12 @@ impl PluginCommand for GetNanosecond {
     let df = ([$dt $dt] | polars into-df);
     $df | polars get-nanosecond"#,
             result: Some(
-                NuDataFrame::try_from_series(Series::new("0", &[0i32, 0]), Span::test_data())
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
+                NuDataFrame::try_from_series(
+                    Series::new("0".into(), &[0i32, 0]),
+                    Span::test_data(),
+                )
+                .expect("simple df for test should not fail")
+                .into_value(Span::test_data()),
             ),
         }]
     }
diff --git a/crates/nu_plugin_polars/src/dataframe/command/datetime/get_ordinal.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_ordinal.rs
index 8120751466..1c62c2b2ca 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/datetime/get_ordinal.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_ordinal.rs
@@ -41,9 +41,12 @@ impl PluginCommand for GetOrdinal {
     let df = ([$dt $dt] | polars into-df);
     $df | polars get-ordinal"#,
             result: Some(
-                NuDataFrame::try_from_series(Series::new("0", &[217i16, 217]), Span::test_data())
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
+                NuDataFrame::try_from_series(
+                    Series::new("0".into(), &[217i16, 217]),
+                    Span::test_data(),
+                )
+                .expect("simple df for test should not fail")
+                .into_value(Span::test_data()),
             ),
         }]
     }
diff --git a/crates/nu_plugin_polars/src/dataframe/command/datetime/get_second.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_second.rs
index 4764bd1968..c80eefbe4b 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/datetime/get_second.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_second.rs
@@ -41,9 +41,12 @@ impl PluginCommand for GetSecond {
     let df = ([$dt $dt] | polars into-df);
     $df | polars get-second"#,
             result: Some(
-                NuDataFrame::try_from_series(Series::new("0", &[18i8, 18]), Span::test_data())
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
+                NuDataFrame::try_from_series(
+                    Series::new("0".into(), &[18i8, 18]),
+                    Span::test_data(),
+                )
+                .expect("simple df for test should not fail")
+                .into_value(Span::test_data()),
             ),
         }]
     }
diff --git a/crates/nu_plugin_polars/src/dataframe/command/datetime/get_week.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_week.rs
index 4418a51f3a..7cde91af76 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/datetime/get_week.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_week.rs
@@ -41,9 +41,12 @@ impl PluginCommand for GetWeek {
     let df = ([$dt $dt] | polars into-df);
     $df | polars get-week"#,
             result: Some(
-                NuDataFrame::try_from_series(Series::new("0", &[32i8, 32]), Span::test_data())
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
+                NuDataFrame::try_from_series(
+                    Series::new("0".into(), &[32i8, 32]),
+                    Span::test_data(),
+                )
+                .expect("simple df for test should not fail")
+                .into_value(Span::test_data()),
             ),
         }]
     }
diff --git a/crates/nu_plugin_polars/src/dataframe/command/datetime/get_weekday.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_weekday.rs
index 6863f161f7..a480779c8a 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/datetime/get_weekday.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_weekday.rs
@@ -41,7 +41,7 @@ impl PluginCommand for GetWeekDay {
     let df = ([$dt $dt] | polars into-df);
     $df | polars get-weekday"#,
             result: Some(
-                NuDataFrame::try_from_series(Series::new("0", &[2i8, 2]), Span::test_data())
+                NuDataFrame::try_from_series(Series::new("0".into(), &[2i8, 2]), Span::test_data())
                     .expect("simple df for test should not fail")
                     .into_value(Span::test_data()),
             ),
diff --git a/crates/nu_plugin_polars/src/dataframe/command/datetime/get_year.rs b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_year.rs
index 70c516a03b..b057e95af2 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/datetime/get_year.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/datetime/get_year.rs
@@ -41,9 +41,12 @@ impl PluginCommand for GetYear {
     let df = ([$dt $dt] | polars into-df);
     $df | polars get-year"#,
             result: Some(
-                NuDataFrame::try_from_series(Series::new("0", &[2020i32, 2020]), Span::test_data())
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
+                NuDataFrame::try_from_series(
+                    Series::new("0".into(), &[2020i32, 2020]),
+                    Span::test_data(),
+                )
+                .expect("simple df for test should not fail")
+                .into_value(Span::test_data()),
             ),
         }]
     }
diff --git a/crates/nu_plugin_polars/src/dataframe/command/index/arg_max.rs b/crates/nu_plugin_polars/src/dataframe/command/index/arg_max.rs
index de81281bda..62294359fe 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/index/arg_max.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/index/arg_max.rs
@@ -72,8 +72,8 @@ fn command(
 
     let res = series.arg_max();
     let chunked = match res {
-        Some(index) => UInt32Chunked::from_slice("arg_max", &[index as u32]),
-        None => UInt32Chunked::from_slice("arg_max", &[]),
+        Some(index) => UInt32Chunked::from_slice("arg_max".into(), &[index as u32]),
+        None => UInt32Chunked::from_slice("arg_max".into(), &[]),
     };
 
     let res = chunked.into_series();
diff --git a/crates/nu_plugin_polars/src/dataframe/command/index/arg_min.rs b/crates/nu_plugin_polars/src/dataframe/command/index/arg_min.rs
index 5df4cbaa17..bc0c29409b 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/index/arg_min.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/index/arg_min.rs
@@ -72,8 +72,8 @@ fn command(
 
     let res = series.arg_min();
     let chunked = match res {
-        Some(index) => UInt32Chunked::from_slice("arg_min", &[index as u32]),
-        None => UInt32Chunked::from_slice("arg_min", &[]),
+        Some(index) => UInt32Chunked::from_slice("arg_min".into(), &[index as u32]),
+        None => UInt32Chunked::from_slice("arg_min".into(), &[]),
     };
 
     let res = chunked.into_series();
diff --git a/crates/nu_plugin_polars/src/dataframe/command/index/arg_sort.rs b/crates/nu_plugin_polars/src/dataframe/command/index/arg_sort.rs
index 06359f4354..88c4bafc81 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/index/arg_sort.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/index/arg_sort.rs
@@ -119,7 +119,7 @@ fn command(
         .as_series(call.head)?
         .arg_sort(sort_options)
         .into_series();
-    res.rename("arg_sort");
+    res.rename("arg_sort".into());
 
     let df = NuDataFrame::try_from_series_vec(vec![res], call.head)?;
     df.to_pipeline_data(plugin, engine, call.head)
diff --git a/crates/nu_plugin_polars/src/dataframe/command/index/arg_unique.rs b/crates/nu_plugin_polars/src/dataframe/command/index/arg_unique.rs
index ef2946bfab..8e527e6620 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/index/arg_unique.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/index/arg_unique.rs
@@ -83,7 +83,7 @@ fn command(
             inner: vec![],
         })?
         .into_series();
-    res.rename("arg_unique");
+    res.rename("arg_unique".into());
 
     let df = NuDataFrame::try_from_series_vec(vec![res], call.head)?;
     df.to_pipeline_data(plugin, engine, call.head)
diff --git a/crates/nu_plugin_polars/src/dataframe/command/index/set_with_idx.rs b/crates/nu_plugin_polars/src/dataframe/command/index/set_with_idx.rs
index 52a8894556..ff128b0796 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/index/set_with_idx.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/index/set_with_idx.rs
@@ -195,7 +195,7 @@ fn command(
                 })?;
 
             let mut res = res.into_series();
-            res.rename("string");
+            res.rename("string".into());
 
             NuDataFrame::try_from_series_vec(vec![res.into_series()], call.head)
         }
diff --git a/crates/nu_plugin_polars/src/dataframe/command/string/replace.rs b/crates/nu_plugin_polars/src/dataframe/command/string/replace.rs
index c0fa1d2358..3eeaf4f43c 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/string/replace.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/string/replace.rs
@@ -184,7 +184,7 @@ fn command_df(
             inner: vec![],
         })?;
 
-    res.rename(series.name());
+    res.rename(series.name().to_owned());
 
     let df = NuDataFrame::try_from_series_vec(vec![res.into_series()], call.head)?;
     df.to_pipeline_data(plugin, engine, call.head)
diff --git a/crates/nu_plugin_polars/src/dataframe/command/string/replace_all.rs b/crates/nu_plugin_polars/src/dataframe/command/string/replace_all.rs
index 13799818ee..25dfb24de2 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/string/replace_all.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/string/replace_all.rs
@@ -185,7 +185,7 @@ fn command_df(
                 inner: vec![],
             })?;
 
-    res.rename(series.name());
+    res.rename(series.name().to_owned());
 
     let df = NuDataFrame::try_from_series_vec(vec![res.into_series()], call.head)?;
     df.to_pipeline_data(plugin, engine_state, call.head)
diff --git a/crates/nu_plugin_polars/src/dataframe/command/string/str_join.rs b/crates/nu_plugin_polars/src/dataframe/command/string/str_join.rs
index ba74af60ec..120cfa3920 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/string/str_join.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/string/str_join.rs
@@ -159,7 +159,7 @@ fn command_df(
 
     let mut res = chunked.concat(other_chunked);
 
-    res.rename(series.name());
+    res.rename(series.name().to_owned());
 
     let df = NuDataFrame::try_from_series_vec(vec![res.into_series()], call.head)?;
     df.to_pipeline_data(plugin, engine, call.head)
diff --git a/crates/nu_plugin_polars/src/dataframe/command/string/str_slice.rs b/crates/nu_plugin_polars/src/dataframe/command/string/str_slice.rs
index f51b42c3d0..4db8ac0f67 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/string/str_slice.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/string/str_slice.rs
@@ -160,12 +160,12 @@ fn command_df(
     df: NuDataFrame,
 ) -> Result<PipelineData, ShellError> {
     let start: i64 = call.req(0)?;
-    let start = Series::new("", &[start]);
+    let start = Series::new("".into(), &[start]);
 
     let length: Option<i64> = call.get_flag("length")?;
     let length = match length {
-        Some(v) => Series::new("", &[v as u64]),
-        None => Series::new_null("", 1),
+        Some(v) => Series::new("".into(), &[v as u64]),
+        None => Series::new_null("".into(), 1),
     };
 
     let series = df.as_series(call.head)?;
@@ -187,7 +187,7 @@ fn command_df(
             help: None,
             inner: vec![],
         })?
-        .with_name(series.name());
+        .with_name(series.name().to_owned());
 
     let df = NuDataFrame::try_from_series_vec(vec![res.into_series()], call.head)?;
     df.to_pipeline_data(plugin, engine, call.head)
diff --git a/crates/nu_plugin_polars/src/dataframe/command/string/to_lowercase.rs b/crates/nu_plugin_polars/src/dataframe/command/string/to_lowercase.rs
index 972446214a..042341cc9f 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/string/to_lowercase.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/string/to_lowercase.rs
@@ -137,7 +137,7 @@ fn command_df(
     })?;
 
     let mut res = casted.to_lowercase();
-    res.rename(series.name());
+    res.rename(series.name().to_owned());
 
     let df = NuDataFrame::try_from_series_vec(vec![res.into_series()], call.head)?;
     df.to_pipeline_data(plugin, engine, call.head)
diff --git a/crates/nu_plugin_polars/src/dataframe/command/string/to_uppercase.rs b/crates/nu_plugin_polars/src/dataframe/command/string/to_uppercase.rs
index b973c0fb30..8b50542fc2 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/string/to_uppercase.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/string/to_uppercase.rs
@@ -141,7 +141,7 @@ fn command_df(
     })?;
 
     let mut res = casted.to_uppercase();
-    res.rename(series.name());
+    res.rename(series.name().clone());
 
     let df = NuDataFrame::try_from_series_vec(vec![res.into_series()], call.head)?;
     df.to_pipeline_data(plugin, engine, call.head)
diff --git a/crates/nu_plugin_polars/src/dataframe/utils.rs b/crates/nu_plugin_polars/src/dataframe/utils.rs
index db99d550a9..8a5056a3c0 100644
--- a/crates/nu_plugin_polars/src/dataframe/utils.rs
+++ b/crates/nu_plugin_polars/src/dataframe/utils.rs
@@ -1,4 +1,5 @@
 use nu_protocol::{FromValue, ShellError, Value};
+use polars::prelude::PlSmallStr;
 
 pub fn extract_strings(value: Value) -> Result<Vec<String>, ShellError> {
     let span = value.span();
@@ -14,3 +15,18 @@ pub fn extract_strings(value: Value) -> Result<Vec<String>, ShellError> {
         }),
     }
 }
+
+pub fn extract_sm_strs(value: Value) -> Result<Vec<PlSmallStr>, ShellError> {
+    let span = value.span();
+    match (
+        <String as FromValue>::from_value(value.clone()),
+        <Vec<String> as FromValue>::from_value(value),
+    ) {
+        (Ok(col), Err(_)) => Ok(vec![col.into()]),
+        (Err(_), Ok(cols)) => Ok(cols.iter().map(PlSmallStr::from).collect()),
+        _ => Err(ShellError::IncompatibleParametersSingle {
+            msg: "Expected a string or list of strings".into(),
+            span,
+        }),
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/between_values.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/between_values.rs
index c92e657fb9..382ae12de2 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/between_values.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/between_values.rs
@@ -49,7 +49,7 @@ pub(super) fn compute_between_series(
                 inner: vec![],
             })?;
             let name = format!("sum_{}_{}", lhs.name(), rhs.name());
-            res.rename(&name);
+            res.rename(name.into());
             NuDataFrame::try_from_series(res, operation_span)
         }
         Operator::Math(Math::Minus) => {
@@ -61,7 +61,7 @@ pub(super) fn compute_between_series(
                 inner: vec![],
             })?;
             let name = format!("sub_{}_{}", lhs.name(), rhs.name());
-            res.rename(&name);
+            res.rename(name.into());
             NuDataFrame::try_from_series(res, operation_span)
         }
         Operator::Math(Math::Multiply) => {
@@ -73,7 +73,7 @@ pub(super) fn compute_between_series(
                 inner: vec![],
             })?;
             let name = format!("mul_{}_{}", lhs.name(), rhs.name());
-            res.rename(&name);
+            res.rename(name.into());
             NuDataFrame::try_from_series(res, operation_span)
         }
         Operator::Math(Math::Divide) => {
@@ -81,7 +81,7 @@ pub(super) fn compute_between_series(
             match res {
                 Ok(mut res) => {
                     let name = format!("div_{}_{}", lhs.name(), rhs.name());
-                    res.rename(&name);
+                    res.rename(name.into());
                     NuDataFrame::try_from_series(res, operation_span)
                 }
                 Err(e) => Err(ShellError::GenericError {
@@ -132,7 +132,7 @@ pub(super) fn compute_between_series(
                     (Ok(l), Ok(r)) => {
                         let mut res = l.bitand(r).into_series();
                         let name = format!("and_{}_{}", lhs.name(), rhs.name());
-                        res.rename(&name);
+                        res.rename(name.into());
                         NuDataFrame::try_from_series(res, operation_span)
                     }
                     _ => Err(ShellError::GenericError {
@@ -161,7 +161,7 @@ pub(super) fn compute_between_series(
                     (Ok(l), Ok(r)) => {
                         let mut res = l.bitor(r).into_series();
                         let name = format!("or_{}_{}", lhs.name(), rhs.name());
-                        res.rename(&name);
+                        res.rename(name.into());
                         NuDataFrame::try_from_series(res, operation_span)
                     }
                     _ => Err(ShellError::GenericError {
@@ -211,7 +211,7 @@ where
         })?
         .into_series();
 
-    res.rename(name);
+    res.rename(name.into());
     Ok(res)
 }
 
@@ -815,7 +815,7 @@ mod test {
 
     #[test]
     fn test_compute_between_series_comparisons() {
-        let series = Series::new("c", &[1, 2]);
+        let series = Series::new("c".into(), &[1, 2]);
         let df = NuDataFrame::try_from_series_vec(vec![series], Span::test_data())
             .expect("should be able to create a simple dataframe");
 
@@ -848,7 +848,7 @@ mod test {
         let result = result
             .as_series(Span::test_data())
             .expect("should be convert to a series");
-        assert_eq!(result, Series::new("neq_c_c", &[false, false]));
+        assert_eq!(result, Series::new("neq_c_c".into(), &[false, false]));
 
         let op = Spanned {
             item: Operator::Comparison(Comparison::Equal),
@@ -859,7 +859,7 @@ mod test {
         let result = result
             .as_series(Span::test_data())
             .expect("should be convert to a series");
-        assert_eq!(result, Series::new("eq_c_c", &[true, true]));
+        assert_eq!(result, Series::new("eq_c_c".into(), &[true, true]));
 
         let op = Spanned {
             item: Operator::Comparison(Comparison::LessThan),
@@ -870,7 +870,7 @@ mod test {
         let result = result
             .as_series(Span::test_data())
             .expect("should be convert to a series");
-        assert_eq!(result, Series::new("lt_c_c", &[false, false]));
+        assert_eq!(result, Series::new("lt_c_c".into(), &[false, false]));
 
         let op = Spanned {
             item: Operator::Comparison(Comparison::LessThanOrEqual),
@@ -881,7 +881,7 @@ mod test {
         let result = result
             .as_series(Span::test_data())
             .expect("should be convert to a series");
-        assert_eq!(result, Series::new("lte_c_c", &[true, true]));
+        assert_eq!(result, Series::new("lte_c_c".into(), &[true, true]));
 
         let op = Spanned {
             item: Operator::Comparison(Comparison::GreaterThan),
@@ -892,7 +892,7 @@ mod test {
         let result = result
             .as_series(Span::test_data())
             .expect("should be convert to a series");
-        assert_eq!(result, Series::new("gt_c_c", &[false, false]));
+        assert_eq!(result, Series::new("gt_c_c".into(), &[false, false]));
 
         let op = Spanned {
             item: Operator::Comparison(Comparison::GreaterThanOrEqual),
@@ -903,6 +903,6 @@ mod test {
         let result = result
             .as_series(Span::test_data())
             .expect("should be convert to a series");
-        assert_eq!(result, Series::new("gte_c_c", &[true, true]));
+        assert_eq!(result, Series::new("gte_c_c".into(), &[true, true]));
     }
 }
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
index 9cf8c30b1d..54bcbde843 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
@@ -7,14 +7,14 @@ use indexmap::map::{Entry, IndexMap};
 use polars::chunked_array::builder::AnonymousOwnedListBuilder;
 use polars::chunked_array::object::builder::ObjectChunkedBuilder;
 use polars::chunked_array::ChunkedArray;
-use polars::datatypes::AnyValue;
+use polars::datatypes::{AnyValue, PlSmallStr};
 use polars::export::arrow::Either;
 use polars::prelude::{
-    DataFrame, DataType, DatetimeChunked, Float32Type, Float64Type, Int16Type, Int32Type,
-    Int64Type, Int8Type, IntoSeries, ListBooleanChunkedBuilder, ListBuilderTrait,
+    ChunkAnyValue, DataFrame, DataType, DatetimeChunked, Float32Type, Float64Type, Int16Type,
+    Int32Type, Int64Type, Int8Type, IntoSeries, ListBooleanChunkedBuilder, ListBuilderTrait,
     ListPrimitiveChunkedBuilder, ListStringChunkedBuilder, ListType, NamedFrom, NewChunkedArray,
-    ObjectType, PolarsError, Schema, Series, StructChunked, TemporalMethods, TimeUnit, UInt16Type,
-    UInt32Type, UInt64Type, UInt8Type,
+    ObjectType, PolarsError, Schema, SchemaExt, Series, StructChunked, TemporalMethods, TimeUnit,
+    UInt16Type, UInt32Type, UInt64Type, UInt8Type,
 };
 
 use nu_protocol::{Record, ShellError, Span, Value};
@@ -67,27 +67,27 @@ macro_rules! value_to_primitive {
 
 #[derive(Debug)]
 pub struct Column {
-    name: String,
+    name: PlSmallStr,
     values: Vec<Value>,
 }
 
 impl Column {
-    pub fn new(name: impl Into<String>, values: Vec<Value>) -> Self {
+    pub fn new(name: impl Into<PlSmallStr>, values: Vec<Value>) -> Self {
         Self {
             name: name.into(),
             values,
         }
     }
 
-    pub fn new_empty(name: String) -> Self {
+    pub fn new_empty(name: PlSmallStr) -> Self {
         Self {
             name,
             values: Vec::new(),
         }
     }
 
-    pub fn name(&self) -> &str {
-        self.name.as_str()
+    pub fn name(&self) -> &PlSmallStr {
+        &self.name
     }
 }
 
@@ -121,7 +121,7 @@ pub struct TypedColumn {
 }
 
 impl TypedColumn {
-    fn new_empty(name: String) -> Self {
+    fn new_empty(name: PlSmallStr) -> Self {
         Self {
             column: Column::new_empty(name),
             column_type: None,
@@ -143,7 +143,7 @@ impl DerefMut for TypedColumn {
     }
 }
 
-pub type ColumnMap = IndexMap<String, TypedColumn>;
+pub type ColumnMap = IndexMap<PlSmallStr, TypedColumn>;
 
 pub fn create_column(
     series: &Series,
@@ -153,7 +153,7 @@ pub fn create_column(
 ) -> Result<Column, ShellError> {
     let size = to_row - from_row;
     let values = series_to_values(series, Some(from_row), Some(size), span)?;
-    Ok(Column::new(series.name(), values))
+    Ok(Column::new(series.name().clone(), values))
 }
 
 // Adds a separator to the vector of values using the column names from the
@@ -168,7 +168,7 @@ pub fn add_separator(values: &mut Vec<Value>, df: &DataFrame, has_index: bool, s
 
     for name in df.get_column_names() {
         // there should only be one index field
-        record.push(name, Value::string("...", span))
+        record.push(name.as_str(), Value::string("...", span))
     }
 
     values.push(Value::record(record, span));
@@ -181,7 +181,7 @@ pub fn insert_record(
     maybe_schema: &Option<NuSchema>,
 ) -> Result<(), ShellError> {
     for (col, value) in record {
-        insert_value(value, col, column_values, maybe_schema)?;
+        insert_value(value, col.into(), column_values, maybe_schema)?;
     }
 
     Ok(())
@@ -189,7 +189,7 @@ pub fn insert_record(
 
 pub fn insert_value(
     value: Value,
-    key: String,
+    key: PlSmallStr,
     column_values: &mut ColumnMap,
     maybe_schema: &Option<NuSchema>,
 ) -> Result<(), ShellError> {
@@ -201,7 +201,7 @@ pub fn insert_value(
     // If we have a schema, use that for determining how things should be added to each column
     if let Some(schema) = maybe_schema {
         if let Some(field) = schema.schema.get_field(&key) {
-            col_val.column_type = Some(field.data_type().clone());
+            col_val.column_type = Some(field.dtype().clone());
             col_val.values.push(value);
             Ok(())
         } else {
@@ -219,7 +219,7 @@ pub fn insert_value(
     else if col_val.values.is_empty() {
         if let Some(schema) = maybe_schema {
             if let Some(field) = schema.schema.get_field(&key) {
-                col_val.column_type = Some(field.data_type().clone());
+                col_val.column_type = Some(field.dtype().clone());
             }
         }
 
@@ -284,7 +284,7 @@ fn value_to_data_type(value: &Value) -> DataType {
     }
 }
 
-fn typed_column_to_series(name: &str, column: TypedColumn) -> Result<Series, ShellError> {
+fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Series, ShellError> {
     if let Some(column_type) = &column.column_type {
         match column_type {
             DataType::Float32 => {
@@ -426,13 +426,13 @@ fn typed_column_to_series(name: &str, column: TypedColumn) -> Result<Series, She
                 Ok(Series::new(name, series_values?))
             }
             DataType::List(list_type) => {
-                match input_type_list_to_series(name, list_type.as_ref(), &column.values) {
+                match input_type_list_to_series(&name, list_type.as_ref(), &column.values) {
                     Ok(series) => Ok(series),
                     Err(_) => {
                         // An error case will occur when there are lists of mixed types.
                         // If this happens, fallback to object list
                         input_type_list_to_series(
-                            name,
+                            &name,
                             &DataType::Object("unknown", None),
                             &column.values,
                         )
@@ -489,7 +489,7 @@ fn typed_column_to_series(name: &str, column: TypedColumn) -> Result<Series, She
             DataType::Struct(fields) => {
                 let schema = Some(NuSchema::new(Schema::from_iter(fields.clone())));
                 // let mut structs: Vec<Series> = Vec::new();
-                let mut structs: HashMap<String, Series> = HashMap::new();
+                let mut structs: HashMap<PlSmallStr, Series> = HashMap::new();
 
                 for v in column.values.iter() {
                     let mut column_values: ColumnMap = IndexMap::new();
@@ -517,7 +517,7 @@ fn typed_column_to_series(name: &str, column: TypedColumn) -> Result<Series, She
                                     inner: vec![],
                                 })?;
                         } else {
-                            structs.insert(name.to_string(), series.to_owned());
+                            structs.insert(name.clone(), series.to_owned());
                         }
                     }
                 }
@@ -525,15 +525,14 @@ fn typed_column_to_series(name: &str, column: TypedColumn) -> Result<Series, She
                 let structs: Vec<Series> = structs.into_values().collect();
 
                 let chunked =
-                    StructChunked::new(column.name(), structs.as_slice()).map_err(|e| {
-                        ShellError::GenericError {
+                    StructChunked::from_series(column.name().to_owned(), structs.as_slice())
+                        .map_err(|e| ShellError::GenericError {
                             error: format!("Error creating struct: {e}"),
                             msg: "".into(),
                             span: None,
                             help: None,
                             inner: vec![],
-                        }
-                    })?;
+                        })?;
                 Ok(chunked.into_series())
             }
             _ => Err(ShellError::GenericError {
@@ -561,7 +560,7 @@ fn typed_column_to_series(name: &str, column: TypedColumn) -> Result<Series, She
 pub fn from_parsed_columns(column_values: ColumnMap) -> Result<NuDataFrame, ShellError> {
     let mut df_series: Vec<Series> = Vec::new();
     for (name, column) in column_values {
-        let series = typed_column_to_series(&name, column)?;
+        let series = typed_column_to_series(name, column)?;
         df_series.push(series);
     }
 
@@ -576,7 +575,7 @@ pub fn from_parsed_columns(column_values: ColumnMap) -> Result<NuDataFrame, Shel
         })
 }
 
-fn value_to_series(name: &str, values: &[Value]) -> Result<Series, ShellError> {
+fn value_to_series(name: PlSmallStr, values: &[Value]) -> Result<Series, ShellError> {
     let mut builder = ObjectChunkedBuilder::<DataFrameValue>::new(name, values.len());
 
     for v in values {
@@ -588,7 +587,7 @@ fn value_to_series(name: &str, values: &[Value]) -> Result<Series, ShellError> {
 }
 
 fn input_type_list_to_series(
-    name: &str,
+    name: &PlSmallStr,
     data_type: &DataType,
     values: &[Value],
 ) -> Result<Series, ShellError> {
@@ -605,7 +604,7 @@ fn input_type_list_to_series(
     macro_rules! primitive_list_series {
         ($list_type:ty, $vec_type:tt) => {{
             let mut builder = ListPrimitiveChunkedBuilder::<$list_type>::new(
-                name,
+                name.clone(),
                 values.len(),
                 VALUES_CAPACITY,
                 data_type.clone(),
@@ -628,7 +627,8 @@ fn input_type_list_to_series(
     match *data_type {
         // list of boolean values
         DataType::Boolean => {
-            let mut builder = ListBooleanChunkedBuilder::new(name, values.len(), VALUES_CAPACITY);
+            let mut builder =
+                ListBooleanChunkedBuilder::new(name.clone(), values.len(), VALUES_CAPACITY);
             for v in values {
                 let value_list = v
                     .as_list()?
@@ -653,7 +653,8 @@ fn input_type_list_to_series(
         DataType::Float32 => primitive_list_series!(Float32Type, f32),
         DataType::Float64 => primitive_list_series!(Float64Type, f64),
         DataType::String => {
-            let mut builder = ListStringChunkedBuilder::new(name, values.len(), VALUES_CAPACITY);
+            let mut builder =
+                ListStringChunkedBuilder::new(name.clone(), values.len(), VALUES_CAPACITY);
             for v in values {
                 let value_list = v
                     .as_list()?
@@ -668,7 +669,7 @@ fn input_type_list_to_series(
         }
         DataType::Date => {
             let mut builder = AnonymousOwnedListBuilder::new(
-                name,
+                name.clone(),
                 values.len(),
                 Some(DataType::Datetime(TimeUnit::Nanoseconds, None)),
             );
@@ -682,7 +683,7 @@ fn input_type_list_to_series(
                         None
                     }
                 });
-                let dt_chunked = ChunkedArray::<Int64Type>::from_iter_options(&list_name, it)
+                let dt_chunked = ChunkedArray::<Int64Type>::from_iter_options(list_name.into(), it)
                     .into_datetime(TimeUnit::Nanoseconds, None);
 
                 builder
@@ -702,7 +703,7 @@ fn input_type_list_to_series(
             Ok(input_type_list_to_series(name, sub_list_type, values)?)
         }
         // treat everything else as an object
-        _ => Ok(value_to_series(name, values)?),
+        _ => Ok(value_to_series(name.clone(), values)?),
     }
 }
 
@@ -1142,7 +1143,7 @@ fn series_to_values(
             .collect::<Result<Vec<Value>, ShellError>>()?;
             Ok(values)
         }
-        DataType::Struct(polar_fields) => {
+        DataType::Struct(_) => {
             let casted = series.struct_().map_err(|e| ShellError::GenericError {
                 error: "Error casting column to struct".into(),
                 msg: "".to_string(),
@@ -1150,26 +1151,29 @@ fn series_to_values(
                 help: Some(e.to_string()),
                 inner: Vec::new(),
             })?;
-            let it = casted.into_iter();
-            let values: Result<Vec<Value>, ShellError> =
-                if let (Some(size), Some(from_row)) = (maybe_size, maybe_from_row) {
-                    Either::Left(it.skip(from_row).take(size))
-                } else {
-                    Either::Right(it)
-                }
-                .map(|any_values| {
-                    let record = polar_fields
-                        .iter()
-                        .zip(any_values)
-                        .map(|(field, val)| {
-                            any_value_to_value(val, span).map(|val| (field.name.to_string(), val))
-                        })
-                        .collect::<Result<_, _>>()?;
 
-                    Ok(Value::record(record, span))
-                })
-                .collect();
-            values
+            let range = if let (Some(size), Some(from_row)) = (maybe_size, maybe_from_row) {
+                from_row..(from_row + size)
+            } else {
+                0..casted.len()
+            };
+
+            let mut values = Vec::with_capacity(casted.len());
+
+            for i in range {
+                let val = casted
+                    .get_any_value(i)
+                    .map_err(|e| ShellError::GenericError {
+                        error: format!("Could not get struct value for index {i} - {e}"),
+                        msg: "".into(),
+                        span: None,
+                        help: None,
+                        inner: vec![],
+                    })?;
+                values.push(any_value_to_value(&val, span)?)
+            }
+
+            Ok(values)
         }
         DataType::Time => {
             let casted =
@@ -1300,7 +1304,7 @@ fn nanos_from_timeunit(a: i64, time_unit: TimeUnit) -> i64 {
 
 fn datetime_from_epoch_nanos(
     nanos: i64,
-    timezone: &Option<String>,
+    timezone: &Option<PlSmallStr>,
     span: Span,
 ) -> Result<DateTime<FixedOffset>, ShellError> {
     let tz: Tz = if let Some(polars_tz) = timezone {
@@ -1355,6 +1359,7 @@ where
 mod tests {
     use indexmap::indexmap;
     use nu_protocol::record;
+    use polars::datatypes::CompatLevel;
     use polars::export::arrow::array::{BooleanArray, PrimitiveArray};
     use polars::prelude::Field;
     use polars_io::prelude::StructArray;
@@ -1374,7 +1379,7 @@ mod tests {
             ),
         ];
         let column = Column {
-            name: "foo".to_string(),
+            name: "foo".into(),
             values: values.clone(),
         };
         let typed_column = TypedColumn {
@@ -1382,7 +1387,7 @@ mod tests {
             column_type: Some(DataType::List(Box::new(DataType::String))),
         };
 
-        let column_map = indexmap!("foo".to_string() => typed_column);
+        let column_map = indexmap!("foo".into() => typed_column);
         let parsed_df = from_parsed_columns(column_map)?;
         let parsed_columns = parsed_df.columns(Span::test_data())?;
         assert_eq!(parsed_columns.len(), 1);
@@ -1521,7 +1526,7 @@ mod tests {
             Value::date(test_time, span)
         );
 
-        let test_list_series = Series::new("int series", &[1, 2, 3]);
+        let test_list_series = Series::new("int series".into(), &[1, 2, 3]);
         let comparison_list_series = Value::list(
             vec![
                 Value::int(1, span),
@@ -1541,8 +1546,8 @@ mod tests {
         let field_name_0 = "num_field";
         let field_name_1 = "bool_field";
         let fields = vec![
-            Field::new(field_name_0, DataType::Int32),
-            Field::new(field_name_1, DataType::Boolean),
+            Field::new(field_name_0.into(), DataType::Int32),
+            Field::new(field_name_1.into(), DataType::Boolean),
         ];
         let test_owned_struct = AnyValue::StructOwned(Box::new((values, fields.clone())));
         let comparison_owned_record = Value::test_record(record!(
@@ -1557,7 +1562,7 @@ mod tests {
         let test_int_arr = PrimitiveArray::from([Some(1_i32)]);
         let test_bool_arr = BooleanArray::from([Some(true)]);
         let test_struct_arr = StructArray::new(
-            DataType::Struct(fields.clone()).to_arrow(true),
+            DataType::Struct(fields.clone()).to_arrow(CompatLevel::newest()),
             vec![Box::new(test_int_arr), Box::new(test_bool_arr)],
             None,
         );
@@ -1586,9 +1591,12 @@ mod tests {
             column_type: Some(DataType::Float32),
         };
 
-        let result = typed_column_to_series("foo", column)?;
+        let result = typed_column_to_series("foo".into(), column)?;
 
-        assert_eq!(result, Series::new("name", [Some(1.1f32), Some(2.0), None]));
+        assert_eq!(
+            result,
+            Series::new("name".into(), [Some(1.1f32), Some(2.0), None])
+        );
         Ok(())
     }
 
@@ -1606,9 +1614,12 @@ mod tests {
             column_type: Some(DataType::Float64),
         };
 
-        let result = typed_column_to_series("foo", column)?;
+        let result = typed_column_to_series("foo".into(), column)?;
 
-        assert_eq!(result, Series::new("name", [Some(1.1f64), Some(2.0), None]));
+        assert_eq!(
+            result,
+            Series::new("name".into(), [Some(1.1f64), Some(2.0), None])
+        );
         Ok(())
     }
 
@@ -1619,9 +1630,9 @@ mod tests {
             column_type: Some(DataType::UInt8),
         };
 
-        let result = typed_column_to_series("foo", column)?;
+        let result = typed_column_to_series("foo".into(), column)?;
 
-        assert_eq!(result, Series::new("name", [Some(1u8), None]));
+        assert_eq!(result, Series::new("name".into(), [Some(1u8), None]));
         Ok(())
     }
 
@@ -1632,9 +1643,9 @@ mod tests {
             column_type: Some(DataType::UInt16),
         };
 
-        let result = typed_column_to_series("foo", column)?;
+        let result = typed_column_to_series("foo".into(), column)?;
 
-        assert_eq!(result, Series::new("name", [Some(1u16), None]));
+        assert_eq!(result, Series::new("name".into(), [Some(1u16), None]));
         Ok(())
     }
 
@@ -1645,9 +1656,9 @@ mod tests {
             column_type: Some(DataType::UInt32),
         };
 
-        let result = typed_column_to_series("foo", column)?;
+        let result = typed_column_to_series("foo".into(), column)?;
 
-        assert_eq!(result, Series::new("name", [Some(1u32), None]));
+        assert_eq!(result, Series::new("name".into(), [Some(1u32), None]));
         Ok(())
     }
 
@@ -1658,9 +1669,9 @@ mod tests {
             column_type: Some(DataType::UInt64),
         };
 
-        let result = typed_column_to_series("foo", column)?;
+        let result = typed_column_to_series("foo".into(), column)?;
 
-        assert_eq!(result, Series::new("name", [Some(1u64), None]));
+        assert_eq!(result, Series::new("name".into(), [Some(1u64), None]));
         Ok(())
     }
 
@@ -1671,9 +1682,9 @@ mod tests {
             column_type: Some(DataType::Int8),
         };
 
-        let result = typed_column_to_series("foo", column)?;
+        let result = typed_column_to_series("foo".into(), column)?;
 
-        assert_eq!(result, Series::new("name", [Some(1i8), None]));
+        assert_eq!(result, Series::new("name".into(), [Some(1i8), None]));
         Ok(())
     }
 
@@ -1684,9 +1695,9 @@ mod tests {
             column_type: Some(DataType::Int16),
         };
 
-        let result = typed_column_to_series("foo", column)?;
+        let result = typed_column_to_series("foo".into(), column)?;
 
-        assert_eq!(result, Series::new("name", [Some(1i16), None]));
+        assert_eq!(result, Series::new("name".into(), [Some(1i16), None]));
         Ok(())
     }
 
@@ -1697,9 +1708,9 @@ mod tests {
             column_type: Some(DataType::Int32),
         };
 
-        let result = typed_column_to_series("foo", column)?;
+        let result = typed_column_to_series("foo".into(), column)?;
 
-        assert_eq!(result, Series::new("name", [Some(1i32), None]));
+        assert_eq!(result, Series::new("name".into(), [Some(1i32), None]));
         Ok(())
     }
 
@@ -1710,9 +1721,9 @@ mod tests {
             column_type: Some(DataType::Int64),
         };
 
-        let result = typed_column_to_series("foo", column)?;
+        let result = typed_column_to_series("foo".into(), column)?;
 
-        assert_eq!(result, Series::new("name", [Some(1i64), None]));
+        assert_eq!(result, Series::new("name".into(), [Some(1i64), None]));
         Ok(())
     }
 
@@ -1730,9 +1741,12 @@ mod tests {
             column_type: Some(DataType::Boolean),
         };
 
-        let result = typed_column_to_series("foo", column)?;
+        let result = typed_column_to_series("foo".into(), column)?;
 
-        assert_eq!(result, Series::new("name", [Some(true), Some(false), None]));
+        assert_eq!(
+            result,
+            Series::new("name".into(), [Some(true), Some(false), None])
+        );
         Ok(())
     }
 
@@ -1746,11 +1760,11 @@ mod tests {
             column_type: Some(DataType::String),
         };
 
-        let result = typed_column_to_series("foo", column)?;
+        let result = typed_column_to_series("foo".into(), column)?;
 
         assert_eq!(
             result,
-            Series::new("name", [Some("barbaz".to_string()), None])
+            Series::new("name".into(), [Some("barbaz".to_string()), None])
         );
         Ok(())
     }
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs
index e782cb9265..1848a69166 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs
@@ -181,7 +181,7 @@ impl NuDataFrame {
                 )?,
                 _ => {
                     let key = "0".to_string();
-                    conversion::insert_value(value, key, &mut column_values, &maybe_schema)?
+                    conversion::insert_value(value, key.into(), &mut column_values, &maybe_schema)?
                 }
             }
         }
@@ -209,7 +209,7 @@ impl NuDataFrame {
         let mut column_values: ColumnMap = IndexMap::new();
 
         for column in columns {
-            let name = column.name().to_string();
+            let name = column.name().clone();
             for value in column {
                 conversion::insert_value(value, name.clone(), &mut column_values, &maybe_schema)?;
             }
@@ -493,10 +493,9 @@ fn add_missing_columns(
             })
             .collect();
 
-        // todo - fix
         let missing_exprs: Vec<Expr> = missing
             .iter()
-            .map(|(name, dtype)| lit(Null {}).cast((*dtype).to_owned()).alias(name))
+            .map(|(name, dtype)| lit(Null {}).cast((*dtype).to_owned()).alias(*name))
             .collect();
 
         let df = if !missing.is_empty() {
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/operations.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/operations.rs
index c471fc05b8..6e7590e2fc 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/operations.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/operations.rs
@@ -126,7 +126,7 @@ impl NuDataFrame {
                     .iter()
                     .chain(other.df.get_columns())
                     .map(|s| {
-                        let name = if columns.contains(&s.name()) {
+                        let name = if columns.contains(&s.name().as_str()) {
                             format!("{}_{}", s.name(), "x")
                         } else {
                             columns.push(s.name());
@@ -134,7 +134,7 @@ impl NuDataFrame {
                         };
 
                         let mut series = s.clone();
-                        series.rename(&name);
+                        series.rename(name.into());
                         series
                     })
                     .collect::<Vec<Series>>();
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_expression/mod.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_expression/mod.rs
index af00ca94a5..f0800c9ad2 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_expression/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_expression/mod.rs
@@ -146,7 +146,7 @@ pub fn expr_to_value(expr: &Expr, span: Span) -> Result<Value, ShellError> {
         Expr::Alias(expr, alias) => Ok(Value::record(
             record! {
                 "expr" => expr_to_value(expr.as_ref(), span)?,
-                "alias" => Value::string(alias.as_ref(), span),
+                "alias" => Value::string(alias.as_str(), span),
             },
             span,
         )),
@@ -271,7 +271,7 @@ pub fn expr_to_value(expr: &Expr, span: Span) -> Result<Value, ShellError> {
         )),
         Expr::Cast {
             expr,
-            data_type,
+            dtype: data_type,
             options,
         } => {
             let cast_option_str = match options {
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/mod.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/mod.rs
index dad72cab74..679c913eb6 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/mod.rs
@@ -83,16 +83,15 @@ impl NuLazyFrame {
     }
 
     pub fn schema(&mut self) -> Result<NuSchema, ShellError> {
-        let internal_schema =
-            Arc::make_mut(&mut self.lazy)
-                .schema()
-                .map_err(|e| ShellError::GenericError {
-                    error: "Error getting schema from lazy frame".into(),
-                    msg: e.to_string(),
-                    span: None,
-                    help: None,
-                    inner: vec![],
-                })?;
+        let internal_schema = Arc::make_mut(&mut self.lazy)
+            .collect_schema()
+            .map_err(|e| ShellError::GenericError {
+                error: "Error getting schema from lazy frame".into(),
+                msg: e.to_string(),
+                span: None,
+                help: None,
+                inner: vec![],
+            })?;
         Ok(internal_schema.into())
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_schema.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_schema.rs
index 5a30d40cd4..481eb917b9 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_schema.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_schema.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use nu_protocol::{ShellError, Span, Value};
 use polars::{
     datatypes::UnknownKind,
-    prelude::{DataType, Field, Schema, SchemaRef, TimeUnit},
+    prelude::{DataType, Field, PlSmallStr, Schema, SchemaExt, SchemaRef, TimeUnit},
 };
 
 #[derive(Debug, Clone)]
@@ -49,7 +49,7 @@ fn fields_to_value(fields: impl Iterator<Item = Field>, span: Span) -> Value {
     let record = fields
         .map(|field| {
             let col = field.name().to_string();
-            let val = dtype_to_value(field.data_type(), span);
+            let val = dtype_to_value(field.dtype(), span);
             (col, val)
         })
         .collect();
@@ -78,11 +78,11 @@ fn value_to_fields(value: &Value, span: Span) -> Result<Vec<Field>, ShellError>
             Value::Record { .. } => {
                 let fields = value_to_fields(val, span)?;
                 let dtype = DataType::Struct(fields);
-                Ok(Field::new(col, dtype))
+                Ok(Field::new(col.into(), dtype))
             }
             _ => {
                 let dtype = str_to_dtype(&val.coerce_string()?, span)?;
-                Ok(Field::new(col, dtype))
+                Ok(Field::new(col.into(), dtype))
             }
         })
         .collect::<Result<Vec<Field>, ShellError>>()?;
@@ -150,7 +150,10 @@ pub fn str_to_dtype(dtype: &str, span: Span) -> Result<DataType, ShellError> {
             } else {
                 Some(next.to_string())
             };
-            Ok(DataType::Datetime(time_unit, timezone))
+            Ok(DataType::Datetime(
+                time_unit,
+                timezone.map(PlSmallStr::from),
+            ))
         }
         _ if dtype.starts_with("duration") => {
             let inner = dtype.trim_start_matches("duration<").trim_end_matches('>');
@@ -215,13 +218,13 @@ mod test {
 
         let schema = value_to_schema(&value, Span::unknown()).unwrap();
         let expected = Schema::from_iter(vec![
-            Field::new("name", DataType::String),
-            Field::new("age", DataType::Int32),
+            Field::new("name".into(), DataType::String),
+            Field::new("age".into(), DataType::Int32),
             Field::new(
-                "address",
+                "address".into(),
                 DataType::Struct(vec![
-                    Field::new("street", DataType::String),
-                    Field::new("city", DataType::String),
+                    Field::new("street".into(), DataType::String),
+                    Field::new("city".into(), DataType::String),
                 ]),
             ),
         ]);
diff --git a/crates/nu_plugin_polars/src/dataframe/values/utils.rs b/crates/nu_plugin_polars/src/dataframe/values/utils.rs
index 6a51821c2f..52704b82cf 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/utils.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/utils.rs
@@ -1,4 +1,5 @@
 use nu_protocol::{ShellError, Span, Spanned, Value};
+use polars::prelude::PlSmallStr;
 
 // Default value used when selecting rows from dataframe
 pub const DEFAULT_ROWS: usize = 5;
@@ -88,3 +89,46 @@ pub(crate) fn convert_columns_string(
 
     Ok((res, col_span))
 }
+
+// Converts a Vec<Value> to a Vec<String> with a Span marking the whole
+// location of the columns for error referencing
+// todo - fix
+#[allow(dead_code)]
+pub(crate) fn convert_columns_sm_str(
+    columns: Vec<Value>,
+    span: Span,
+) -> Result<(Vec<PlSmallStr>, Span), ShellError> {
+    // First column span
+    let mut col_span = columns
+        .first()
+        .ok_or_else(|| ShellError::GenericError {
+            error: "Empty column list".into(),
+            msg: "Empty list found for command".into(),
+            span: Some(span),
+            help: None,
+            inner: vec![],
+        })
+        .map(|v| v.span())?;
+
+    let res = columns
+        .into_iter()
+        .map(|value| {
+            let span = value.span();
+            match value {
+                Value::String { val, .. } => {
+                    col_span = col_span.merge(span);
+                    Ok(val.into())
+                }
+                _ => Err(ShellError::GenericError {
+                    error: "Incorrect column format".into(),
+                    msg: "Only string as column name".into(),
+                    span: Some(span),
+                    help: None,
+                    inner: vec![],
+                }),
+            }
+        })
+        .collect::<Result<Vec<PlSmallStr>, _>>()?;
+
+    Ok((res, col_span))
+}

From 3a685049da531526341c23a693f2f4eca32fda30 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Wed, 23 Oct 2024 12:23:41 -0500
Subject: [PATCH 0598/1072] add `name` to `$env.config.keybindings` (#14159)

# Description

This PR adds the `name` column back to keybindings.


This may be considered a hack since the reedline keybinding has no spot
for name, but it seems to work.
---
 crates/nu-cli/src/reedline_config.rs      | 4 ++++
 crates/nu-protocol/src/config/reedline.rs | 1 +
 2 files changed, 5 insertions(+)

diff --git a/crates/nu-cli/src/reedline_config.rs b/crates/nu-cli/src/reedline_config.rs
index 1b09e59166..55179ab0ae 100644
--- a/crates/nu-cli/src/reedline_config.rs
+++ b/crates/nu-cli/src/reedline_config.rs
@@ -711,6 +711,7 @@ pub(crate) fn create_keybindings(config: &Config) -> Result<KeybindingsMode, She
     }
     for keybinding in parsed_keybindings {
         add_keybinding(
+            &keybinding.name,
             &keybinding.mode,
             keybinding,
             config,
@@ -729,7 +730,9 @@ pub(crate) fn create_keybindings(config: &Config) -> Result<KeybindingsMode, She
     }
 }
 
+#[allow(clippy::only_used_in_recursion)]
 fn add_keybinding(
+    name: &Option<Value>,
     mode: &Value,
     keybinding: &ParsedKeybinding,
     config: &Config,
@@ -752,6 +755,7 @@ fn add_keybinding(
         Value::List { vals, .. } => {
             for inner_mode in vals {
                 add_keybinding(
+                    name,
                     inner_mode,
                     keybinding,
                     config,
diff --git a/crates/nu-protocol/src/config/reedline.rs b/crates/nu-protocol/src/config/reedline.rs
index 330998c202..1694619e99 100644
--- a/crates/nu-protocol/src/config/reedline.rs
+++ b/crates/nu-protocol/src/config/reedline.rs
@@ -5,6 +5,7 @@ use crate::{engine::Closure, FromValue};
 /// Definition of a parsed keybinding from the config object
 #[derive(Clone, Debug, FromValue, IntoValue, Serialize, Deserialize)]
 pub struct ParsedKeybinding {
+    pub name: Option<Value>,
     pub modifier: Value,
     pub keycode: Value,
     pub event: Value,

From 619211c1bfc4ed4e23befccbd445ec6cbccc39d5 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Wed, 23 Oct 2024 19:40:37 +0200
Subject: [PATCH 0599/1072] Bump `brotli` to 6.0.0 (#14161)

This deduplicates our dependency on `brotli`
---
 Cargo.lock | 17 +++--------------
 Cargo.toml |  2 +-
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8c94206cd1..560aa76c9d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -476,17 +476,6 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ada7f35ca622a86a4d6c27be2633fc6c243ecc834859628fcce0681d8e76e1c8"
 
-[[package]]
-name = "brotli"
-version = "5.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19483b140a7ac7174d34b5a581b406c64f84da5409d3e09cf4fff604f9270e67"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
- "brotli-decompressor",
-]
-
 [[package]]
 name = "brotli"
 version = "6.0.0"
@@ -3121,7 +3110,7 @@ dependencies = [
  "alphanumeric-sort",
  "base64 0.22.1",
  "bracoxide",
- "brotli 5.0.0",
+ "brotli",
  "byteorder",
  "bytesize",
  "calamine",
@@ -3428,7 +3417,7 @@ dependencies = [
 name = "nu-protocol"
 version = "0.99.2"
 dependencies = [
- "brotli 5.0.0",
+ "brotli",
  "byte-unit",
  "bytes",
  "chrono",
@@ -4585,7 +4574,7 @@ dependencies = [
  "ahash 0.8.11",
  "async-stream",
  "base64 0.22.1",
- "brotli 6.0.0",
+ "brotli",
  "bytemuck",
  "ethnum",
  "flate2",
diff --git a/Cargo.toml b/Cargo.toml
index b9042f7c1b..92cfba87e3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -67,7 +67,7 @@ ansi-str = "0.8"
 anyhow = "1.0.82"
 base64 = "0.22.1"
 bracoxide = "0.1.2"
-brotli = "5.0"
+brotli = "6.0"
 byteorder = "1.5"
 bytes = "1"
 bytesize = "1.3"

From 3ec1c403208568d8301b8414042d4f6a560462df Mon Sep 17 00:00:00 2001
From: Maxim Zhiburt <zhiburt@gmail.com>
Date: Wed, 23 Oct 2024 20:45:47 +0300
Subject: [PATCH 0600/1072] Introduce footer_inheritance option (#14070)

```nu
$env.config.table.footer_inheritance = true
```

close #14060
---
 crates/nu-command/src/viewers/table.rs        |   2 +-
 crates/nu-command/tests/commands/table.rs     |  36 ++++
 crates/nu-protocol/src/config/table.rs        |   4 +
 crates/nu-table/src/common.rs                 |   5 +-
 crates/nu-table/src/types/expanded.rs         | 201 +++++++++++++-----
 crates/nu-table/src/types/general.rs          |   6 +-
 crates/nu-table/src/types/mod.rs              |  34 ++-
 .../src/sample_config/default_config.nu       |   1 +
 8 files changed, 222 insertions(+), 67 deletions(-)

diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index 44e96eb060..a9e7361a9e 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -1088,7 +1088,7 @@ fn create_empty_placeholder(
     let data = vec![vec![cell]];
     let mut table = NuTable::from(data);
     table.set_data_style(TextStyle::default().dimmed());
-    let out = TableOutput::new(table, false, false);
+    let out = TableOutput::new(table, false, false, false);
 
     let style_computer = &StyleComputer::from_config(engine_state, stack);
     let config = create_nu_table_config(&config, style_computer, &out, false, TableMode::default());
diff --git a/crates/nu-command/tests/commands/table.rs b/crates/nu-command/tests/commands/table.rs
index 24484b1206..96ae395e47 100644
--- a/crates/nu-command/tests/commands/table.rs
+++ b/crates/nu-command/tests/commands/table.rs
@@ -2905,3 +2905,39 @@ fn table_general_header_on_separator_issue1() {
     let actual = nu!("$env.config.table.header_on_separator = true; [['Llll oo Bbbbbbbb' 'Bbbbbbbb Aaaa' Nnnnnn Ggggg 'Xxxxx Llllllll #' Bbb 'Pppp Ccccc' 'Rrrrrrrr Dddd' Rrrrrr 'Rrrrrr Ccccc II' 'Rrrrrr Ccccc Ppppppp II' 'Pppppp Dddddddd Tttt' 'Pppppp Dddddddd Dddd' 'Rrrrrrrrr Trrrrrr' 'Pppppp Ppppp Dddd' 'Ppppp Dddd' Hhhh]; [RRRRRRR FFFFFFFF UUUU VV 202407160001 BBB 1 '7/16/2024' '' AAA-1111 AAA-1111-11 '7 YEARS' 2555 'RRRRRRRR DDDD' '7/16/2031' '7/16/2031' NN]] | table --width=87 --theme basic");
     assert_eq!(actual.out, "+-#-+-Llll oo Bbbbbbbb-+-Bbbbbbbb Aaaa-+-Nnnnnn-+-Ggggg-+-Xxxxx Llllllll #-+-...-+| 0 | RRRRRRR          | FFFFFFFF      | UUUU   | VV    |     202407160001 | ... |+---+------------------+---------------+--------+-------+------------------+-----+");
 }
+
+#[test]
+fn table_footer_inheritance() {
+    let table1 = format!(
+        "[ [ head1, head2, head3 ]; {} ]",
+        (0..212)
+            .map(|_| "[ 79 79 79 ]")
+            .collect::<Vec<_>>()
+            .join(" ")
+    );
+
+    let structure = format!(
+        "{{\
+        field0: [ [ y1, y2, y3 ]; [ 1 2 3 ] [ 79 79 79 ] [ {{ f1: 'a string', f2: 1000 }}, 1, 2 ] ],\
+        field1: [ a, b, c ],\
+        field2: [ 123, 234, 345 ],\
+        field3: {},\
+        field4: {{ f1: 1, f2: 3, f3: {{ f1: f1, f2: f2, f3: f3 }} }},\
+        field5: [ [ x1, x2, x3 ]; [ 1 2 3 ] [ 79 79 79 ] [ {{ f1: 'a string', f2: 1000 }}, 1, 2 ] ],\
+    }}",
+        table1
+    );
+    let actual = nu!(format!(
+        "$env.config.table.footer_inheritance = true; {structure} | table --width=80 --expand"
+    ));
+
+    assert_eq!(actual.out.match_indices("head1").count(), 2);
+    assert_eq!(actual.out.match_indices("head2").count(), 2);
+    assert_eq!(actual.out.match_indices("head3").count(), 2);
+    assert_eq!(actual.out.match_indices("y1").count(), 1);
+    assert_eq!(actual.out.match_indices("y2").count(), 1);
+    assert_eq!(actual.out.match_indices("y3").count(), 1);
+    assert_eq!(actual.out.match_indices("x1").count(), 1);
+    assert_eq!(actual.out.match_indices("x2").count(), 1);
+    assert_eq!(actual.out.match_indices("x3").count(), 1);
+}
diff --git a/crates/nu-protocol/src/config/table.rs b/crates/nu-protocol/src/config/table.rs
index 7dbe1dd9d2..e88f4ea88f 100644
--- a/crates/nu-protocol/src/config/table.rs
+++ b/crates/nu-protocol/src/config/table.rs
@@ -333,6 +333,7 @@ pub struct TableConfig {
     pub trim: TrimStrategy,
     pub header_on_separator: bool,
     pub abbreviated_row_count: Option<usize>,
+    pub footer_inheritance: bool,
 }
 
 impl IntoValue for TableConfig {
@@ -350,6 +351,7 @@ impl IntoValue for TableConfig {
             "trim" => self.trim.into_value(span),
             "header_on_separator" => self.header_on_separator.into_value(span),
             "abbreviated_row_count" => abbv_count,
+            "footer_inheritance" => self.footer_inheritance.into_value(span),
         }
         .into_value(span)
     }
@@ -365,6 +367,7 @@ impl Default for TableConfig {
             header_on_separator: false,
             padding: TableIndent::default(),
             abbreviated_row_count: None,
+            footer_inheritance: false,
         }
     }
 }
@@ -401,6 +404,7 @@ impl UpdateFromValue for TableConfig {
                     }
                     _ => errors.type_mismatch(path, Type::custom("int or nothing"), val),
                 },
+                "footer_inheritance" => self.footer_inheritance.update(val, path, errors),
                 _ => errors.unknown_option(path, val),
             }
         }
diff --git a/crates/nu-table/src/common.rs b/crates/nu-table/src/common.rs
index 3a793a690e..d18e053a1c 100644
--- a/crates/nu-table/src/common.rs
+++ b/crates/nu-table/src/common.rs
@@ -18,9 +18,12 @@ pub fn create_nu_table_config(
     expand: bool,
     mode: TableMode,
 ) -> NuTableConfig {
+    let with_footer = (config.table.footer_inheritance && out.with_footer)
+        || with_footer(config, out.with_header, out.table.count_rows());
+
     NuTableConfig {
         theme: load_theme(mode),
-        with_footer: with_footer(config, out.with_header, out.table.count_rows()),
+        with_footer,
         with_index: out.with_index,
         with_header: out.with_header,
         split_color: Some(lookup_separator_color(comp)),
diff --git a/crates/nu-table/src/types/expanded.rs b/crates/nu-table/src/types/expanded.rs
index 81215a89c3..a0b6cd0ff2 100644
--- a/crates/nu-table/src/types/expanded.rs
+++ b/crates/nu-table/src/types/expanded.rs
@@ -5,7 +5,7 @@ use crate::{
         NuText, StringResult, TableResult, INDEX_COLUMN_NAME,
     },
     string_width,
-    types::has_index,
+    types::{has_footer, has_index},
     NuTable, NuTableCell, TableOpts, TableOutput,
 };
 use nu_color_config::{Alignment, StyleComputer, TextStyle};
@@ -31,11 +31,12 @@ impl ExpandedTable {
     }
 
     pub fn build_value(self, item: &Value, opts: TableOpts<'_>) -> NuText {
-        expanded_table_entry2(item, Cfg { opts, format: self })
+        let cell = expanded_table_entry2(item, Cfg { opts, format: self });
+        (cell.text, cell.style)
     }
 
     pub fn build_map(self, record: &Record, opts: TableOpts<'_>) -> StringResult {
-        expanded_table_kv(record, Cfg { opts, format: self })
+        expanded_table_kv(record, Cfg { opts, format: self }).map(|cell| cell.map(|cell| cell.text))
     }
 
     pub fn build_list(self, vals: &[Value], opts: TableOpts<'_>) -> StringResult {
@@ -58,6 +59,39 @@ struct Cfg<'a> {
     format: ExpandedTable,
 }
 
+#[derive(Debug, Clone)]
+struct CellOutput {
+    text: String,
+    style: TextStyle,
+    is_big: bool,
+    is_expanded: bool,
+}
+
+impl CellOutput {
+    fn new(text: String, style: TextStyle, is_big: bool, is_expanded: bool) -> Self {
+        Self {
+            text,
+            style,
+            is_big,
+            is_expanded,
+        }
+    }
+
+    fn clean(text: String, is_big: bool, is_expanded: bool) -> Self {
+        Self::new(text, Default::default(), is_big, is_expanded)
+    }
+
+    fn text(text: String) -> Self {
+        Self::styled((text, Default::default()))
+    }
+
+    fn styled(text: NuText) -> Self {
+        Self::new(text.0, text.1, false, false)
+    }
+}
+
+type CellResult = Result<Option<CellOutput>, ShellError>;
+
 fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
     const PADDING_SPACE: usize = 2;
     const SPLIT_LINE_SPACE: usize = 1;
@@ -83,6 +117,7 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
 
     let with_index = has_index(&cfg.opts, &headers);
     let row_offset = cfg.opts.index_offset;
+    let mut is_footer_used = false;
 
     // The header with the INDEX is removed from the table headers since
     // it is added to the natural table index
@@ -148,21 +183,25 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
             }
 
             let inner_cfg = update_config(cfg.clone(), available_width);
-            let (mut text, style) = expanded_table_entry2(item, inner_cfg);
+            let mut cell = expanded_table_entry2(item, inner_cfg);
 
-            let value_width = string_width(&text);
+            let value_width = string_width(&cell.text);
             if value_width > available_width {
                 // it must only happen when a string is produced, so we can safely wrap it.
                 // (it might be string table representation as well) (I guess I mean default { table ...} { list ...})
                 //
                 // todo: Maybe convert_to_table2_entry could do for strings to not mess caller code?
 
-                text = wrap_text(&text, available_width, cfg.opts.config);
+                cell.text = wrap_text(&cell.text, available_width, cfg.opts.config);
             }
 
-            let value = NuTableCell::new(text);
+            let value = NuTableCell::new(cell.text);
             data[row].push(value);
-            data_styles.insert((row, with_index as usize), style);
+            data_styles.insert((row, with_index as usize), cell.style);
+
+            if cell.is_big {
+                is_footer_used = cell.is_big;
+            }
         }
 
         let mut table = NuTable::from(data);
@@ -170,7 +209,12 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
         table.set_index_style(get_index_style(cfg.opts.style_computer));
         set_data_styles(&mut table, data_styles);
 
-        return Ok(Some(TableOutput::new(table, false, with_index)));
+        return Ok(Some(TableOutput::new(
+            table,
+            false,
+            with_index,
+            is_footer_used,
+        )));
     }
 
     if !headers.is_empty() {
@@ -233,22 +277,26 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
             }
 
             let inner_cfg = update_config(cfg.clone(), available);
-            let (mut text, style) = expanded_table_entry(item, header.as_str(), inner_cfg);
+            let mut cell = expanded_table_entry(item, header.as_str(), inner_cfg);
 
-            let mut value_width = string_width(&text);
+            let mut value_width = string_width(&cell.text);
             if value_width > available {
                 // it must only happen when a string is produced, so we can safely wrap it.
                 // (it might be string table representation as well)
 
-                text = wrap_text(&text, available, cfg.opts.config);
+                cell.text = wrap_text(&cell.text, available, cfg.opts.config);
                 value_width = available;
             }
 
             column_width = max(column_width, value_width);
 
-            let value = NuTableCell::new(text);
+            let value = NuTableCell::new(cell.text);
             data[row + 1].push(value);
-            data_styles.insert((row + 1, col + with_index as usize), style);
+            data_styles.insert((row + 1, col + with_index as usize), cell.style);
+
+            if cell.is_big {
+                is_footer_used = cell.is_big;
+            }
         }
 
         let head_cell = NuTableCell::new(header);
@@ -326,10 +374,12 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
     table.set_indent(cfg.opts.indent.0, cfg.opts.indent.1);
     set_data_styles(&mut table, data_styles);
 
-    Ok(Some(TableOutput::new(table, true, with_index)))
+    let has_footer = is_footer_used || has_footer(&cfg.opts, table.count_rows() as u64);
+
+    Ok(Some(TableOutput::new(table, true, with_index, has_footer)))
 }
 
-fn expanded_table_kv(record: &Record, cfg: Cfg<'_>) -> StringResult {
+fn expanded_table_kv(record: &Record, cfg: Cfg<'_>) -> CellResult {
     let theme = load_theme(cfg.opts.mode);
     let key_width = record
         .columns()
@@ -345,11 +395,13 @@ fn expanded_table_kv(record: &Record, cfg: Cfg<'_>) -> StringResult {
 
     let value_width = cfg.opts.width - key_width - count_borders - padding - padding;
 
+    let mut with_footer = false;
+
     let mut data = Vec::with_capacity(record.len());
     for (key, value) in record {
         cfg.opts.signals.check(cfg.opts.span)?;
 
-        let (value, is_expanded) = match expand_table_value(value, value_width, &cfg)? {
+        let cell = match expand_table_value(value, value_width, &cfg)? {
             Some(val) => val,
             None => return Ok(None),
         };
@@ -358,35 +410,40 @@ fn expanded_table_kv(record: &Record, cfg: Cfg<'_>) -> StringResult {
         // we could use Padding for it but,
         // the easiest way to do so is just push a new_line char before
         let mut key = key.to_owned();
-        if !key.is_empty() && is_expanded && theme.has_top() {
+        if !key.is_empty() && cell.is_expanded && theme.has_top() {
             key.insert(0, '\n');
         }
 
         let key = NuTableCell::new(key);
-        let val = NuTableCell::new(value);
+        let val = NuTableCell::new(cell.text);
         let row = vec![key, val];
 
         data.push(row);
+
+        if cell.is_big {
+            with_footer = cell.is_big;
+        }
     }
 
     let mut table = NuTable::from(data);
     table.set_index_style(get_key_style(&cfg));
     table.set_indent(cfg.opts.indent.0, cfg.opts.indent.1);
 
-    let out = TableOutput::new(table, false, true);
+    let out = TableOutput::new(table, false, true, with_footer);
 
     maybe_expand_table(out, cfg.opts.width, &cfg.opts)
+        .map(|value| value.map(|value| CellOutput::clean(value, with_footer, false)))
 }
 
 // the flag is used as an optimization to not do `value.lines().count()` search.
-fn expand_table_value(
-    value: &Value,
-    value_width: usize,
-    cfg: &Cfg<'_>,
-) -> Result<Option<(String, bool)>, ShellError> {
+fn expand_table_value(value: &Value, value_width: usize, cfg: &Cfg<'_>) -> CellResult {
     let is_limited = matches!(cfg.format.expand_limit, Some(0));
     if is_limited {
-        return Ok(Some((value_to_string_clean(value, cfg), false)));
+        return Ok(Some(CellOutput::clean(
+            value_to_string_clean(value, cfg),
+            false,
+            false,
+        )));
     }
 
     let span = value.span();
@@ -400,42 +457,46 @@ fn expand_table_value(
                     let cfg = create_table_cfg(cfg, &out);
                     let value = out.table.draw(cfg, value_width);
                     match value {
-                        Some(result) => Ok(Some((result, true))),
+                        Some(value) => Ok(Some(CellOutput::clean(value, out.with_footer, true))),
                         None => Ok(None),
                     }
                 }
                 None => {
                     // it means that the list is empty
-                    Ok(Some((
-                        value_to_wrapped_string(value, cfg, value_width),
-                        false,
-                    )))
+                    Ok(Some(CellOutput::text(value_to_wrapped_string(
+                        value,
+                        cfg,
+                        value_width,
+                    ))))
                 }
             }
         }
         Value::Record { val: record, .. } => {
             if record.is_empty() {
                 // Like list case return styled string instead of empty value
-                return Ok(Some((
-                    value_to_wrapped_string(value, cfg, value_width),
-                    false,
-                )));
+                return Ok(Some(CellOutput::text(value_to_wrapped_string(
+                    value,
+                    cfg,
+                    value_width,
+                ))));
             }
 
             let inner_cfg = update_config(dive_options(cfg, span), value_width);
             let result = expanded_table_kv(record, inner_cfg)?;
             match result {
-                Some(result) => Ok(Some((result, true))),
-                None => Ok(Some((
-                    value_to_wrapped_string(value, cfg, value_width),
-                    false,
-                ))),
+                Some(result) => Ok(Some(CellOutput::clean(result.text, result.is_big, true))),
+                None => Ok(Some(CellOutput::text(value_to_wrapped_string(
+                    value,
+                    cfg,
+                    value_width,
+                )))),
             }
         }
-        _ => {
-            let text = value_to_wrapped_string_clean(value, cfg, value_width);
-            Ok(Some((text, false)))
-        }
+        _ => Ok(Some(CellOutput::text(value_to_wrapped_string_clean(
+            value,
+            cfg,
+            value_width,
+        )))),
     }
 }
 
@@ -443,27 +504,35 @@ fn get_key_style(cfg: &Cfg<'_>) -> TextStyle {
     get_header_style(cfg.opts.style_computer).alignment(Alignment::Left)
 }
 
-fn expanded_table_entry(item: &Value, header: &str, cfg: Cfg<'_>) -> NuText {
+fn expanded_table_entry(item: &Value, header: &str, cfg: Cfg<'_>) -> CellOutput {
     match item {
         Value::Record { val, .. } => match val.get(header) {
             Some(val) => expanded_table_entry2(val, cfg),
-            None => error_sign(cfg.opts.style_computer),
+            None => CellOutput::styled(error_sign(cfg.opts.style_computer)),
         },
         _ => expanded_table_entry2(item, cfg),
     }
 }
 
-fn expanded_table_entry2(item: &Value, cfg: Cfg<'_>) -> NuText {
+fn expanded_table_entry2(item: &Value, cfg: Cfg<'_>) -> CellOutput {
     let is_limit_reached = matches!(cfg.format.expand_limit, Some(0));
     if is_limit_reached {
-        return nu_value_to_string_clean(item, cfg.opts.config, cfg.opts.style_computer);
+        return CellOutput::styled(nu_value_to_string_clean(
+            item,
+            cfg.opts.config,
+            cfg.opts.style_computer,
+        ));
     }
 
     let span = item.span();
     match &item {
         Value::Record { val: record, .. } => {
             if record.is_empty() {
-                return nu_value_to_string(item, cfg.opts.config, cfg.opts.style_computer);
+                return CellOutput::styled(nu_value_to_string(
+                    item,
+                    cfg.opts.config,
+                    cfg.opts.style_computer,
+                ));
             }
 
             // we verify what is the structure of a Record cause it might represent
@@ -471,18 +540,22 @@ fn expanded_table_entry2(item: &Value, cfg: Cfg<'_>) -> NuText {
             let table = expanded_table_kv(record, inner_cfg);
 
             match table {
-                Ok(Some(table)) => (table, TextStyle::default()),
-                _ => nu_value_to_string(item, cfg.opts.config, cfg.opts.style_computer),
+                Ok(Some(table)) => table,
+                _ => CellOutput::styled(nu_value_to_string(
+                    item,
+                    cfg.opts.config,
+                    cfg.opts.style_computer,
+                )),
             }
         }
         Value::List { vals, .. } => {
             if cfg.format.flatten && is_simple_list(vals) {
-                return value_list_to_string(
+                return CellOutput::styled(value_list_to_string(
                     vals,
                     cfg.opts.config,
                     cfg.opts.style_computer,
                     &cfg.format.flatten_sep,
-                );
+                ));
             }
 
             let inner_cfg = dive_options(&cfg, span);
@@ -490,17 +563,31 @@ fn expanded_table_entry2(item: &Value, cfg: Cfg<'_>) -> NuText {
 
             let out = match table {
                 Ok(Some(out)) => out,
-                _ => return nu_value_to_string(item, cfg.opts.config, cfg.opts.style_computer),
+                _ => {
+                    return CellOutput::styled(nu_value_to_string(
+                        item,
+                        cfg.opts.config,
+                        cfg.opts.style_computer,
+                    ))
+                }
             };
 
             let table_config = create_table_cfg(&cfg, &out);
             let table = out.table.draw(table_config, usize::MAX);
             match table {
-                Some(table) => (table, TextStyle::default()),
-                None => nu_value_to_string(item, cfg.opts.config, cfg.opts.style_computer),
+                Some(table) => CellOutput::clean(table, out.with_footer, false),
+                None => CellOutput::styled(nu_value_to_string(
+                    item,
+                    cfg.opts.config,
+                    cfg.opts.style_computer,
+                )),
             }
         }
-        _ => nu_value_to_string_clean(item, cfg.opts.config, cfg.opts.style_computer),
+        _ => CellOutput::styled(nu_value_to_string_clean(
+            item,
+            cfg.opts.config,
+            cfg.opts.style_computer,
+        )),
     }
 }
 
diff --git a/crates/nu-table/src/types/general.rs b/crates/nu-table/src/types/general.rs
index f7bd24f2e2..ba0a1ceefa 100644
--- a/crates/nu-table/src/types/general.rs
+++ b/crates/nu-table/src/types/general.rs
@@ -57,7 +57,7 @@ fn kv_table(record: &Record, opts: TableOpts<'_>) -> StringResult {
     let mut table = NuTable::from(data);
     table.set_index_style(TextStyle::default_field());
 
-    let mut out = TableOutput::new(table, false, true);
+    let mut out = TableOutput::new(table, false, true, false);
 
     let left = opts.config.table.padding.left;
     let right = opts.config.table.padding.right;
@@ -82,7 +82,7 @@ fn table(input: &[Value], opts: &TableOpts<'_>) -> TableResult {
     let with_header = !headers.is_empty();
     if !with_header {
         let table = to_table_with_no_header(input, with_index, row_offset, opts)?;
-        let table = table.map(|table| TableOutput::new(table, false, with_index));
+        let table = table.map(|table| TableOutput::new(table, false, with_index, false));
         return Ok(table);
     }
 
@@ -98,7 +98,7 @@ fn table(input: &[Value], opts: &TableOpts<'_>) -> TableResult {
         .collect();
 
     let table = to_table_with_header(input, &headers, with_index, row_offset, opts)?;
-    let table = table.map(|table| TableOutput::new(table, true, with_index));
+    let table = table.map(|table| TableOutput::new(table, true, with_index, false));
 
     Ok(table)
 }
diff --git a/crates/nu-table/src/types/mod.rs b/crates/nu-table/src/types/mod.rs
index 571dda26ab..adbe56bf27 100644
--- a/crates/nu-table/src/types/mod.rs
+++ b/crates/nu-table/src/types/mod.rs
@@ -1,3 +1,9 @@
+use terminal_size::{terminal_size, Height, Width};
+
+use crate::{common::INDEX_COLUMN_NAME, NuTable};
+use nu_color_config::StyleComputer;
+use nu_protocol::{Config, FooterMode, Signals, Span, TableIndexMode, TableMode};
+
 mod collapse;
 mod expanded;
 mod general;
@@ -6,22 +12,20 @@ pub use collapse::CollapsedTable;
 pub use expanded::ExpandedTable;
 pub use general::JustTable;
 
-use crate::{common::INDEX_COLUMN_NAME, NuTable};
-use nu_color_config::StyleComputer;
-use nu_protocol::{Config, Signals, Span, TableIndexMode, TableMode};
-
 pub struct TableOutput {
     pub table: NuTable,
     pub with_header: bool,
     pub with_index: bool,
+    pub with_footer: bool,
 }
 
 impl TableOutput {
-    pub fn new(table: NuTable, with_header: bool, with_index: bool) -> Self {
+    pub fn new(table: NuTable, with_header: bool, with_index: bool, with_footer: bool) -> Self {
         Self {
             table,
             with_header,
             with_index,
+            with_footer,
         }
     }
 }
@@ -75,3 +79,23 @@ fn has_index(opts: &TableOpts<'_>, headers: &[String]) -> bool {
 
     with_index && !opts.index_remove
 }
+
+fn has_footer(opts: &TableOpts<'_>, count_records: u64) -> bool {
+    match opts.config.footer_mode {
+        // Only show the footer if there are more than RowCount rows
+        FooterMode::RowCount(limit) => count_records > limit,
+        // Always show the footer
+        FooterMode::Always => true,
+        // Never show the footer
+        FooterMode::Never => false,
+        // Calculate the screen height and row count, if screen height is larger than row count, don't show footer
+        FooterMode::Auto => {
+            let (_width, height) = match terminal_size() {
+                Some((w, h)) => (Width(w.0).0 as u64, Height(h.0).0 as u64),
+                None => (Width(0).0 as u64, Height(0).0 as u64),
+            };
+
+            height <= count_records
+        }
+    }
+}
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index 44afdb8644..5271932221 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -169,6 +169,7 @@ $env.config = {
             truncating_suffix: "..." # A suffix used by the 'truncating' methodology
         }
         header_on_separator: false # show header text on separator/border line
+        footer_inheritance: false # render footer in parent table if child is big enough (extended table option)
         # abbreviated_row_count: 10 # limit data rows from top and bottom after reaching a set point
     }
 

From abb6fca5e3ac5e32919de8b856583846b8426bf1 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Wed, 23 Oct 2024 16:49:51 -0500
Subject: [PATCH 0601/1072] make adding newlines with `to text` more consistent
 and opt-out-able (#14158)

# Description

This PR tries to make `to text` more consistent with how it adds
newlines and also gives you an opt-out --no-newline option.

![image](https://github.com/user-attachments/assets/e4976ce6-c685-47a4-8470-4947970daf47)


I wasn't sure how to change the `PipelineData::ByteStream` match arm. I
figure something needs to be done there but I'm not sure how to do it.


# User-Facing Changes
newlines are more consistent.

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/formats/to/text.rs | 26 ++++++++++++++++++++----
 crates/nu-command/tests/commands/save.rs |  2 +-
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/crates/nu-command/src/formats/to/text.rs b/crates/nu-command/src/formats/to/text.rs
index b1c1fdb1ba..3b365d6649 100644
--- a/crates/nu-command/src/formats/to/text.rs
+++ b/crates/nu-command/src/formats/to/text.rs
@@ -21,6 +21,11 @@ impl Command for ToText {
     fn signature(&self) -> Signature {
         Signature::build("to text")
             .input_output_types(vec![(Type::Any, Type::String)])
+            .switch(
+                "no-newline",
+                "Do not append a newline to the end of the text",
+                Some('n'),
+            )
             .category(Category::Formats)
     }
 
@@ -36,6 +41,7 @@ impl Command for ToText {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let span = call.head;
+        let no_newline = call.has_flag(engine_state, stack, "no-newline")?;
         let input = input.try_expand_range()?;
         let config = stack.get_config(engine_state);
 
@@ -43,7 +49,12 @@ impl Command for ToText {
             PipelineData::Empty => Ok(Value::string(String::new(), span)
                 .into_pipeline_data_with_metadata(update_metadata(None))),
             PipelineData::Value(value, ..) => {
-                let str = local_into_string(value, LINE_ENDING, &config);
+                let is_compound_type = matches!(value, Value::List { .. } | Value::Record { .. });
+                let mut str = local_into_string(value, LINE_ENDING, &config);
+                if is_compound_type && !no_newline {
+                    str.push_str(LINE_ENDING);
+                }
+
                 Ok(
                     Value::string(str, span)
                         .into_pipeline_data_with_metadata(update_metadata(None)),
@@ -53,7 +64,9 @@ impl Command for ToText {
                 let span = stream.span();
                 let iter = stream.into_inner().map(move |value| {
                     let mut str = local_into_string(value, LINE_ENDING, &config);
-                    str.push_str(LINE_ENDING);
+                    if !no_newline {
+                        str.push_str(LINE_ENDING);
+                    }
                     str
                 });
                 Ok(PipelineData::ByteStream(
@@ -75,8 +88,13 @@ impl Command for ToText {
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
-                description: "Outputs data as simple text",
-                example: "1 | to text",
+                description: "Outputs data as simple text with a newline",
+                example: "[1] | to text",
+                result: Some(Value::test_string("1".to_string() + LINE_ENDING)),
+            },
+            Example {
+                description: "Outputs data as simple text without a newline",
+                example: "[1] | to text --no-newline",
                 result: Some(Value::test_string("1")),
             },
             Example {
diff --git a/crates/nu-command/tests/commands/save.rs b/crates/nu-command/tests/commands/save.rs
index 85076099bf..6b77160bee 100644
--- a/crates/nu-command/tests/commands/save.rs
+++ b/crates/nu-command/tests/commands/save.rs
@@ -415,7 +415,7 @@ fn save_with_custom_converter() {
 
         nu!(cwd: dirs.test(), pipeline(
             r#"
-                def "to ndjson" []: any -> string { each { to json --raw } | to text } ;
+                def "to ndjson" []: any -> string { each { to json --raw } | to text --no-newline } ;
                 {a: 1, b: 2} | save test.ndjson
             "#
         ));

From af9c31152a3926c5c85bb67e1125cdb52abe3ace Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Wed, 23 Oct 2024 16:50:15 -0500
Subject: [PATCH 0602/1072] Add metadata on `open --raw` with bytestreams
 (#14141)

# Description

This PR closes #14137 and allows the display hook to be set on byte
streams. So, with a hook like this below.
```nushell
display_output: {
    metadata access {|meta| match $meta.content_type? {
        "application/x-nuscript" | "application/x-nuon" | "text/x-nushell" => { nu-highlight },
        "application/json" => { ^bat --language=json --color=always --style=plain --paging=never },
        _ => {},
        }
    } | table
}
```
You could type `open toolkit.nu` and the text of toolkit.nu would be
highlighted by nu-highlight. This PR also changes the way content-type
is assigned with `open`. Previously it would only assign it if `--raw`
was specified.

Lastly, it changes the `is_external()` function to only say
`ByteStreamSource::Child`'s are external instead of both Child and
`ByteStreamSource::File`. Again, this was to allow the hook to function
properly. I'm not sure what negative ramifications changing
`is_external()` could have, but there may be some?

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-cli/src/util.rs                     | 27 +++++++++++++------
 crates/nu-command/src/filesystem/open.rs      |  6 +++++
 crates/nu-command/tests/commands/open.rs      |  2 +-
 .../nu-protocol/src/pipeline/byte_stream.rs   |  5 +---
 4 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/crates/nu-cli/src/util.rs b/crates/nu-cli/src/util.rs
index 9848bb6051..0285664fb9 100644
--- a/crates/nu-cli/src/util.rs
+++ b/crates/nu-cli/src/util.rs
@@ -282,8 +282,22 @@ fn evaluate_source(
     }?;
 
     if let PipelineData::ByteStream(..) = pipeline {
-        pipeline.print(engine_state, stack, false, false)
-    } else if let Some(hook) = engine_state.get_config().hooks.display_output.clone() {
+        // run the display hook on bytestreams too
+        run_display_hook(engine_state, stack, pipeline, false)
+    } else {
+        run_display_hook(engine_state, stack, pipeline, true)
+    }?;
+
+    Ok(false)
+}
+
+fn run_display_hook(
+    engine_state: &mut EngineState,
+    stack: &mut Stack,
+    pipeline: PipelineData,
+    no_newline: bool,
+) -> Result<(), ShellError> {
+    if let Some(hook) = engine_state.get_config().hooks.display_output.clone() {
         let pipeline = eval_hook(
             engine_state,
             stack,
@@ -292,14 +306,11 @@ fn evaluate_source(
             &hook,
             "display_output",
         )?;
-        pipeline.print(engine_state, stack, false, false)
+        pipeline.print(engine_state, stack, no_newline, false)
     } else {
-        pipeline.print(engine_state, stack, true, false)
-    }?;
-
-    Ok(false)
+        pipeline.print(engine_state, stack, no_newline, false)
+    }
 }
-
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/crates/nu-command/src/filesystem/open.rs b/crates/nu-command/src/filesystem/open.rs
index ea2a253a2a..855272d978 100644
--- a/crates/nu-command/src/filesystem/open.rs
+++ b/crates/nu-command/src/filesystem/open.rs
@@ -146,6 +146,9 @@ impl Command for Open {
                         }
                     };
 
+                    // Assigning content type should only happen in raw mode. Otherwise, the content
+                    // will potentially be in one of the built-in nushell `from xxx` formats and therefore
+                    // cease to be in the original content-type.... or so I'm told. :)
                     let content_type = if raw {
                         path.extension()
                             .map(|ext| ext.to_string_lossy().to_string())
@@ -283,6 +286,9 @@ fn detect_content_type(extension: &str) -> Option<String> {
     match extension {
         // Per RFC-9512, application/yaml should be used
         "yaml" | "yml" => Some("application/yaml".to_string()),
+        "nu" => Some("application/x-nuscript".to_string()),
+        "json" | "jsonl" | "ndjson" => Some("application/json".to_string()),
+        "nuon" => Some("application/x-nuon".to_string()),
         _ => mime_guess::from_ext(extension)
             .first()
             .map(|mime| mime.to_string()),
diff --git a/crates/nu-command/tests/commands/open.rs b/crates/nu-command/tests/commands/open.rs
index b50c6c9e6c..c3e7db137f 100644
--- a/crates/nu-command/tests/commands/open.rs
+++ b/crates/nu-command/tests/commands/open.rs
@@ -394,7 +394,7 @@ fn test_content_types_with_open_raw() {
         let result = nu!(cwd: dirs.formats(), "open --raw sample_data.xlsx | metadata");
         assert!(result.out.contains("vnd.openxmlformats-officedocument"));
         let result = nu!(cwd: dirs.formats(), "open --raw sample_def.nu | metadata");
-        assert!(!result.out.contains("content_type"));
+        assert!(result.out.contains("application/x-nuscript"));
         let result = nu!(cwd: dirs.formats(), "open --raw sample.eml | metadata");
         assert!(result.out.contains("message/rfc822"));
         let result = nu!(cwd: dirs.formats(), "open --raw cargo_sample.toml | metadata");
diff --git a/crates/nu-protocol/src/pipeline/byte_stream.rs b/crates/nu-protocol/src/pipeline/byte_stream.rs
index 8e46402a1d..da78b9c836 100644
--- a/crates/nu-protocol/src/pipeline/byte_stream.rs
+++ b/crates/nu-protocol/src/pipeline/byte_stream.rs
@@ -41,10 +41,7 @@ impl ByteStreamSource {
 
     /// Source is a `Child` or `File`, rather than `Read`. Currently affects trimming
     fn is_external(&self) -> bool {
-        matches!(
-            self,
-            ByteStreamSource::File(..) | ByteStreamSource::Child(..)
-        )
+        matches!(self, ByteStreamSource::Child(..))
     }
 }
 

From 69d81cc065731b2e69fcda7e7c58cc4d67047117 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 24 Oct 2024 12:06:49 -0500
Subject: [PATCH 0603/1072] add command_type to help (#14165)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

This PR adds an indicator when listing subcommands. That indicator tells
whether the command is a plugin, alias, or custom_command.

![image](https://github.com/user-attachments/assets/02889f8a-17b4-4678-bb44-3a487b3d1066)

I changed some of the API to make this work a little easier, namely
`get_signatures()` is now `get_signatures_and_declids()`. It was used in
only one other place (run-external), so I thought it was fine to change
it.

There is a long-standing issue with aliases where they reference the
command name instead of the alias name. This PR doesn't fix that bug.
Example.
```nushell
❯ alias "str fill" = str wrap
```
```nushell
❯ str
... other stuff
Subcommands:

  str wrap (alias) - Alias for `str wrap`
  str wrap (plugin) - Wrap text passed into pipeline.

```


# User-Facing Changes
Slightly different output of subcommands.
---
 crates/nu-command/src/system/run_external.rs  |  6 ++---
 crates/nu-engine/src/documentation.rs         | 26 ++++++++++++++-----
 crates/nu-protocol/src/engine/engine_state.rs |  6 ++---
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index 8d6b4e2bf3..b38650894c 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -449,8 +449,8 @@ pub fn command_not_found(
     }
 
     // Try to match the name with the search terms of existing commands.
-    let signatures = engine_state.get_signatures(false);
-    if let Some(sig) = signatures.iter().find(|sig| {
+    let signatures = engine_state.get_signatures_and_declids(false);
+    if let Some((sig, _)) = signatures.iter().find(|(sig, _)| {
         sig.search_terms
             .iter()
             .any(|term| term.to_folded_case() == name.to_folded_case())
@@ -463,7 +463,7 @@ pub fn command_not_found(
     }
 
     // Try a fuzzy search on the names of all existing commands.
-    if let Some(cmd) = did_you_mean(signatures.iter().map(|sig| &sig.name), name) {
+    if let Some(cmd) = did_you_mean(signatures.iter().map(|(sig, _)| &sig.name), name) {
         // The user is invoking an external command with the same name as a
         // built-in command. Remind them of this.
         if cmd == name {
diff --git a/crates/nu-engine/src/documentation.rs b/crates/nu-engine/src/documentation.rs
index ef00d6cf24..81add7af4d 100644
--- a/crates/nu-engine/src/documentation.rs
+++ b/crates/nu-engine/src/documentation.rs
@@ -2,6 +2,7 @@ use crate::eval_call;
 use nu_protocol::{
     ast::{Argument, Call, Expr, Expression, RecordItem},
     debugger::WithoutDebug,
+    engine::CommandType,
     engine::{Command, EngineState, Stack, UNKNOWN_SPAN_ID},
     record, Category, Config, Example, IntoPipelineData, PipelineData, PositionalArg, Signature,
     Span, SpanId, Spanned, SyntaxShape, Type, Value,
@@ -112,16 +113,29 @@ fn get_documentation(
     //   - https://github.com/nushell/nushell/issues/11447
     //   - https://github.com/nushell/nushell/issues/11625
     let mut subcommands = vec![];
-    let signatures = engine_state.get_signatures(true);
-    for sig in signatures {
+    let signatures = engine_state.get_signatures_and_declids(true);
+    for (sig, decl_id) in signatures {
+        let command_type = engine_state.get_decl(decl_id).command_type();
+
         // Don't display removed/deprecated commands in the Subcommands list
         if sig.name.starts_with(&format!("{cmd_name} "))
             && !matches!(sig.category, Category::Removed)
         {
-            subcommands.push(format!(
-                "  {help_subcolor_one}{}{RESET} - {}",
-                sig.name, sig.description
-            ));
+            // If it's a plugin, alias, or custom command, display that information in the help
+            if command_type == CommandType::Plugin
+                || command_type == CommandType::Alias
+                || command_type == CommandType::Custom
+            {
+                subcommands.push(format!(
+                    "  {help_subcolor_one}{} {help_section_name}({}){RESET} - {}",
+                    sig.name, command_type, sig.description
+                ));
+            } else {
+                subcommands.push(format!(
+                    "  {help_subcolor_one}{}{RESET} - {}",
+                    sig.name, sig.description
+                ));
+            }
         }
     }
 
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index 71c1a58905..9704509de1 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -820,14 +820,14 @@ impl EngineState {
         }
     }
 
-    /// Get signatures of all commands within scope.
-    pub fn get_signatures(&self, include_hidden: bool) -> Vec<Signature> {
+    /// Get signatures of all commands within scope with their decl ids.
+    pub fn get_signatures_and_declids(&self, include_hidden: bool) -> Vec<(Signature, DeclId)> {
         self.get_decls_sorted(include_hidden)
             .into_iter()
             .map(|(_, id)| {
                 let decl = self.get_decl(id);
 
-                self.get_signature(decl).update_from_command(decl)
+                (self.get_signature(decl).update_from_command(decl), id)
             })
             .collect()
     }

From eedf833b6f43cb205742f17f254f355d8a152dd3 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Mon, 28 Oct 2024 07:42:18 -0400
Subject: [PATCH 0604/1072] Send both 2J and 3J on clear (#14181)

Fixes #14176

# Description

Since the Linux `/usr/bin/clear` binary doesn't exhibit the issue in
#14176, I checked to see what ANSI escapes it is emitting:

```nu
nu -c '^clear; "111\n222\n333"' | less
# or
bash -c 'clear -x; echo -e "111\n222\n333"' | less
```

Both show the same thing:

```
ESC[HESC[2JESC[3J111
222
333
(END)
```

This is the equivalent of:

```nu
$"(ansi home)(ansi clear_entire_screen)(ansi clear_entire_screen_plus_buffer)111\n222\n333"
```

However, our internal `clear` is sending only the Home and 3J. While
this *should*, in theory, work, it's (a) clear that it doesn't, and (b)
`/usr/bin/clear` seemingly knows this and already has the solution (or
at least workaround). From looking at the `ncurses` source, it appears
it is getting this information from the terminal capabilities. That
said, support for `2J` and `3J` is fairly universal, and it's what we
send in `clear` and `clear --keep-scrollback` anyway, so there's no harm
AFAICT in sending both like `/usr/bin/clear` does.

Also tested and fixes the issue on Windows. Note that PowerShell
`Clear-Host` also did not have the issue.

Side-note: It's interesting that on Tmux, which doesn't support 2J and
3J, that `/usr/bin/clear` knows this and doesn't send those codes,
sending just an escape-[J instead. However, Nushell's `clear`, of
course, isn't checking terminal capabilities, and is continuing to send
the unsupported codes. Fortunately this doesn't appear to cause any
issues on Tmux.

# User-Facing Changes

None, AFAICT - Bugfix only.

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

N/A
---
 crates/nu-command/src/platform/clear.rs | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/crates/nu-command/src/platform/clear.rs b/crates/nu-command/src/platform/clear.rs
index b47db161c6..21e3a3054c 100644
--- a/crates/nu-command/src/platform/clear.rs
+++ b/crates/nu-command/src/platform/clear.rs
@@ -41,14 +41,21 @@ impl Command for Clear {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let clear_type: ClearType = match call.has_flag(engine_state, stack, "keep-scrollback")? {
-            true => ClearType::All,
-            _ => ClearType::Purge,
+        match call.has_flag(engine_state, stack, "keep-scrollback")? {
+            true => {
+                std::io::stdout()
+                    .queue(MoveTo(0, 0))?
+                    .queue(ClearCommand(ClearType::All))?
+                    .flush()?;
+            }
+            _ => {
+                std::io::stdout()
+                    .queue(MoveTo(0, 0))?
+                    .queue(ClearCommand(ClearType::All))?
+                    .queue(ClearCommand(ClearType::Purge))?
+                    .flush()?;
+            }
         };
-        std::io::stdout()
-            .queue(ClearCommand(clear_type))?
-            .queue(MoveTo(0, 0))?
-            .flush()?;
 
         Ok(PipelineData::Empty)
     }

From 2c31b3db072f60869dbe49f3bb1943d76c07b21e Mon Sep 17 00:00:00 2001
From: Ofek Lev <ofekmeister@gmail.com>
Date: Tue, 29 Oct 2024 05:12:55 -0400
Subject: [PATCH 0605/1072] Ensure default config files end with a new line
 (#14192)

# Description

This allows users to immediately add new lines to the configuration in
the usual way.
---
 crates/nu-utils/src/sample_config/default_config.nu | 2 +-
 crates/nu-utils/src/sample_config/default_env.nu    | 2 +-
 crates/nu-utils/src/sample_config/sample_login.nu   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index 5271932221..2fa4a5b5bf 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -896,4 +896,4 @@ $env.config = {
             event: { edit: selectall }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/crates/nu-utils/src/sample_config/default_env.nu b/crates/nu-utils/src/sample_config/default_env.nu
index 172afcb37c..73605ef71b 100644
--- a/crates/nu-utils/src/sample_config/default_env.nu
+++ b/crates/nu-utils/src/sample_config/default_env.nu
@@ -98,4 +98,4 @@ $env.NU_PLUGIN_DIRS = [
 # $env.PATH = ($env.PATH | uniq)
 
 # To load from a custom file you can use:
-# source ($nu.default-config-dir | path join 'custom.nu')
\ No newline at end of file
+# source ($nu.default-config-dir | path join 'custom.nu')
diff --git a/crates/nu-utils/src/sample_config/sample_login.nu b/crates/nu-utils/src/sample_config/sample_login.nu
index 5231661879..8e0a651499 100644
--- a/crates/nu-utils/src/sample_config/sample_login.nu
+++ b/crates/nu-utils/src/sample_config/sample_login.nu
@@ -6,4 +6,4 @@
 $env.PROMPT_INDICATOR = {|| "(LS)> " }
 
 # Similar to env-path and config-path there is a variable containing the path to login.nu
-echo $nu.loginshell-path
\ No newline at end of file
+echo $nu.loginshell-path

From 8c2e12ad79801c98d1997f54a4b71e6ac3a6165f Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Tue, 29 Oct 2024 19:32:09 +0800
Subject: [PATCH 0606/1072] Update the dockerfile for alpine image (#14191)

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

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

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

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

Update the dockerfile for alpine image, related
https://github.com/nushell/nushell/issues/14171 :

1.  Add armv7 arch support
2. Add more opencontainers labels, see:
https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys

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

- Nushell docker images will be provided for each official release
- There will be a `nushell:nightly` tag for the latest nightly release

# After Submitting

1. The workflow that build the images will be provided in
[nushell/nightly](https://github.com/nushell/nightly) repo later
2. Alpine image will be provided as the default, we may also add Debian
images later
---
 docker/Dockerfile | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index aab1e854bc..d20ec63d91 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,18 +1,30 @@
 # syntax=docker/dockerfile:latest
 
 # Git: git version 2.30.2
-# /etc/os-release: Alpine Linux v3.16
+# /etc/os-release: Alpine Linux v3.20
 # Kernel: Linux ca3abedc4fb1 5.17.15-76051715-generic #202206141358~1655919116~22.04~1db9e34 SMP PREEMPT Wed Jun 22 19 x86_64 Linux
-# Build cmd: docker build --no-cache . -t nushell-latest
-# Other tags: nushell/alpine-nu:latest, nushell
+# Build cmd: docker build --no-cache . -t nushell:latest
+# Other tags: nushell:latest-alpine, nushell
 FROM alpine
 
-LABEL maintainer=nushell
-
 ARG TARGETARCH
 ARG ARCH=${TARGETARCH/arm64/aarch64}
+ARG ARCH=${ARCH/arm/armv7}
 ARG ARCH=${ARCH/amd64/x86_64}
 
+ARG BUILD_REF
+ARG BUILD_DATE
+LABEL maintainer="The Nushell Project Developers" \
+    org.opencontainers.image.licenses="MIT" \
+    org.opencontainers.image.title="Nushell" \
+    org.opencontainers.image.created=$BUILD_DATE \
+    org.opencontainers.image.revision=$BUILD_REF \
+    org.opencontainers.image.authors="The Nushell Project Developers" \
+    org.opencontainers.image.vendor="Nushell Project" \
+    org.opencontainers.image.description="A new type of shell" \
+    org.opencontainers.image.source="https://github.com/nushell/nushell" \
+    org.opencontainers.image.documentation="https://www.nushell.sh/book/"
+
 RUN echo '/usr/bin/nu' >> /etc/shells \
     && adduser -D -s /usr/bin/nu nushell \
     && mkdir -p /home/nushell/.config/nushell/ \
@@ -22,9 +34,10 @@ RUN echo '/usr/bin/nu' >> /etc/shells \
     | cut -d '"' -f 4 \
     | grep ${ARCH}-unknown-linux-musl \
     | xargs -I{} wget {} \
-    && tar -xzf nu* \
-    && cd nu*-musl \
-    && mv nu* /usr/bin \
+    && mkdir nu-latest && tar xvf nu-*.tar.gz --directory=nu-latest \
+    && cp -aR nu-latest/**/* /usr/bin/ \
+    # Setup default config file for nushell
+    && cd /home/nushell/.config/nushell \
     && chmod +x /usr/bin/nu \
     && chown -R nushell:nushell /home/nushell/.config/nushell \
     # Reset Nushell config to default

From 88b0982dac6256c3bd3bdf9cc41a14fa7fb7b261 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Tue, 29 Oct 2024 06:32:35 -0500
Subject: [PATCH 0607/1072] allow oem code pages to be used to decode text
 (#14187)

# Description

This PR allows oem code pages to be used in decoding by specifying the
code page number.

## Before

![image](https://github.com/user-attachments/assets/27f5d288-49f1-4743-a2fc-154f5291d190)
## After (umlauts)

![image](https://github.com/user-attachments/assets/d37c11be-b1fe-4159-822d-7d38018e1c57)

closes https://github.com/nushell/nushell/issues/14168

I abstracted the decoding a bit. Here are my function comments on
how/why.
```rust
// Since we have two different decoding mechanisms, we allow oem_cp to be
// specified by only a number like `open file | decode 850`. If this decode
// parameter parses as a usize then we assume it was intentional and use oem_cp
// crate. Otherwise, if it doesn't parse as a usize, we assume it was a string
// and use the encoding_rs crate to try and decode it.
```

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock                                    | 13 +++++
 Cargo.toml                                    |  1 +
 crates/nu-command/Cargo.toml                  |  1 +
 .../src/strings/encode_decode/decode.rs       | 56 ++++++++++++++++++-
 4 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 560aa76c9d..c0f20c0380 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3162,6 +3162,7 @@ dependencies = [
  "num-format",
  "num-traits",
  "nuon",
+ "oem_cp",
  "once_cell",
  "open",
  "os_pipe",
@@ -3868,6 +3869,18 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "oem_cp"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "330138902ab4dab09a86e6b7ab7ddeffb5f8435d52fe0df1bce8b06a17b10ee4"
+dependencies = [
+ "phf 0.11.2",
+ "phf_codegen 0.11.2",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "omnipath"
 version = "0.1.6"
diff --git a/Cargo.toml b/Cargo.toml
index 92cfba87e3..9d9078d423 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -117,6 +117,7 @@ notify-debouncer-full = { version = "0.3", default-features = false }
 nu-ansi-term = "0.50.1"
 num-format = "0.4"
 num-traits = "0.2"
+oem_cp = "2.0.0"
 omnipath = "0.1"
 once_cell = "1.20"
 open = "5.3"
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index a4b65b49fb..8d6e704ead 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -66,6 +66,7 @@ native-tls = { workspace = true }
 notify-debouncer-full = { workspace = true, default-features = false }
 num-format = { workspace = true }
 num-traits = { workspace = true }
+oem_cp = { workspace = true }
 once_cell = { workspace = true }
 open = { workspace = true }
 os_pipe = { workspace = true }
diff --git a/crates/nu-command/src/strings/encode_decode/decode.rs b/crates/nu-command/src/strings/encode_decode/decode.rs
index 99bc1b9681..169667645d 100644
--- a/crates/nu-command/src/strings/encode_decode/decode.rs
+++ b/crates/nu-command/src/strings/encode_decode/decode.rs
@@ -1,4 +1,35 @@
 use nu_engine::command_prelude::*;
+use oem_cp::decode_string_complete_table;
+use once_cell::sync::Lazy;
+use std::collections::HashMap;
+
+// create a lazycell of all the code_table "Complete" code pages
+// the commented out code pages are "Incomplete", which means they
+// are stored as Option<char> and not &[char; 128]
+static OEM_DECODE: Lazy<HashMap<usize, &[char; 128]>> = Lazy::new(|| {
+    let mut m = HashMap::new();
+    m.insert(437, &oem_cp::code_table::DECODING_TABLE_CP437);
+    // m.insert(720, &oem_cp::code_table::DECODING_TABLE_CP720);
+    m.insert(737, &oem_cp::code_table::DECODING_TABLE_CP737);
+    m.insert(775, &oem_cp::code_table::DECODING_TABLE_CP775);
+
+    m.insert(850, &oem_cp::code_table::DECODING_TABLE_CP850);
+    m.insert(852, &oem_cp::code_table::DECODING_TABLE_CP852);
+    m.insert(855, &oem_cp::code_table::DECODING_TABLE_CP855);
+    // m.insert(857, &oem_cp::code_table::DECODING_TABLE_CP857);
+    m.insert(858, &oem_cp::code_table::DECODING_TABLE_CP858);
+    m.insert(860, &oem_cp::code_table::DECODING_TABLE_CP860);
+    m.insert(861, &oem_cp::code_table::DECODING_TABLE_CP861);
+    m.insert(862, &oem_cp::code_table::DECODING_TABLE_CP862);
+    m.insert(863, &oem_cp::code_table::DECODING_TABLE_CP863);
+    // m.insert(864, &oem_cp::code_table::DECODING_TABLE_CP864);
+    m.insert(865, &oem_cp::code_table::DECODING_TABLE_CP865);
+    m.insert(866, &oem_cp::code_table::DECODING_TABLE_CP866);
+    // m.insert(869, &oem_cp::code_table::DECODING_TABLE_CP869);
+    // m.insert(874, &oem_cp::code_table::DECODING_TABLE_CP874);
+
+    m
+});
 
 #[derive(Clone)]
 pub struct Decode;
@@ -84,7 +115,7 @@ fn run(
             let span = stream.span();
             let bytes = stream.into_bytes()?;
             match encoding {
-                Some(encoding_name) => super::encoding::decode(head, encoding_name, &bytes),
+                Some(encoding_name) => detect_and_decode(encoding_name, head, bytes),
                 None => super::encoding::detect_encoding_name(head, span, &bytes)
                     .map(|encoding| encoding.decode(&bytes).0.into_owned())
                     .map(|s| Value::string(s, head)),
@@ -95,7 +126,7 @@ fn run(
             let input_span = v.span();
             match v {
                 Value::Binary { val: bytes, .. } => match encoding {
-                    Some(encoding_name) => super::encoding::decode(head, encoding_name, &bytes),
+                    Some(encoding_name) => detect_and_decode(encoding_name, head, bytes),
                     None => super::encoding::detect_encoding_name(head, input_span, &bytes)
                         .map(|encoding| encoding.decode(&bytes).0.into_owned())
                         .map(|s| Value::string(s, head)),
@@ -121,6 +152,27 @@ fn run(
     }
 }
 
+// Since we have two different decoding mechanisms, we allow oem_cp to be
+// specified by only a number like `open file | decode 850`. If this decode
+// parameter parses as a usize then we assume it was intentional and use oem_cp
+// crate. Otherwise, if it doesn't parse as a usize, we assume it was a string
+// and use the encoding_rs crate to try and decode it.
+fn detect_and_decode(
+    encoding_name: Spanned<String>,
+    head: Span,
+    bytes: Vec<u8>,
+) -> Result<Value, ShellError> {
+    let dec_table_id = encoding_name.item.parse::<usize>().unwrap_or(0usize);
+    if dec_table_id == 0 {
+        super::encoding::decode(head, encoding_name, &bytes)
+    } else {
+        Ok(Value::string(
+            decode_string_complete_table(&bytes, OEM_DECODE[&dec_table_id]),
+            head,
+        ))
+    }
+}
+
 #[cfg(test)]
 mod test {
     use super::*;

From 9ebaa737aa16b3f831158b304260a5b3f1747540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Fri=C3=A3es?=
 <119532691+friaes@users.noreply.github.com>
Date: Tue, 29 Oct 2024 12:32:55 +0100
Subject: [PATCH 0608/1072] feat: stor insert accepts lists (#14175)

Closes #11433
# Description

This feature implements passing a list into `stor insert` through
pipeline.
```bash
stor create --table-name nudb --columns {bool1: bool, int1: int, float1: float} ;
[[bool1 int1 float1]; [true 5 1.1], [false 8 3.14]] | stor insert --table-name nudb
```
```bash
stor create --table-name files --columns {name: str, type: str, size: int, modified: datetime} ;
ls | stor insert --table-name files
 ```

# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
---
 crates/nu-command/src/stor/insert.rs | 99 ++++++++++++++++------------
 1 file changed, 57 insertions(+), 42 deletions(-)

diff --git a/crates/nu-command/src/stor/insert.rs b/crates/nu-command/src/stor/insert.rs
index 106e4fbffb..94b5bdf940 100644
--- a/crates/nu-command/src/stor/insert.rs
+++ b/crates/nu-command/src/stor/insert.rs
@@ -16,6 +16,7 @@ impl Command for StorInsert {
             .input_output_types(vec![
                 (Type::Nothing, Type::table()),
                 (Type::record(), Type::table()),
+                (Type::table(), Type::table()),
             ])
             .required_named(
                 "table-name",
@@ -43,7 +44,7 @@ impl Command for StorInsert {
 
     fn examples(&self) -> Vec<Example> {
         vec![Example {
-                description: "Insert data the in-memory sqlite database using a data-record of column-name and column-value pairs",
+                description: "Insert data in the in-memory sqlite database using a data-record of column-name and column-value pairs",
                 example: "stor insert --table-name nudb --data-record {bool1: true, int1: 5, float1: 1.1, str1: fdncred, datetime1: 2023-04-17}",
                 result: None,
             },
@@ -52,6 +53,16 @@ impl Command for StorInsert {
                 example: "{bool1: true, int1: 5, float1: 1.1, str1: fdncred, datetime1: 2023-04-17} | stor insert --table-name nudb",
                 result: None,
             },
+            Example {
+                description: "Insert data through pipeline input as a table literal",
+                example: "[[bool1 int1 float1]; [true 5 1.1], [false 8 3.14]] | stor insert --table-name nudb",
+                result: None,
+            },
+            Example {
+                description: "Insert ls entries",
+                example: "ls | stor insert --table-name files",
+                result: None,
+            },
         ]
     }
 
@@ -71,10 +82,11 @@ impl Command for StorInsert {
             Signals::empty(),
         ));
 
-        // Check if the record is being passed as input or using the data record parameter
-        let columns = handle(span, data_record, input)?;
+        let records = handle(span, data_record, input)?;
 
-        process(table_name, span, &db, columns)?;
+        for record in records {
+            process(table_name.clone(), span, &db, record)?;
+        }
 
         Ok(Value::custom(db, span).into_pipeline_data())
     }
@@ -84,51 +96,54 @@ fn handle(
     span: Span,
     data_record: Option<Record>,
     input: PipelineData,
-) -> Result<Record, ShellError> {
-    match input {
-        PipelineData::Empty => data_record.ok_or_else(|| ShellError::MissingParameter {
-            param_name: "requires a record".into(),
-            span,
-        }),
-        PipelineData::Value(value, ..) => {
-            // Since input is being used, check if the data record parameter is used too
-            if data_record.is_some() {
-                return Err(ShellError::GenericError {
-                    error: "Pipeline and Flag both being used".into(),
-                    msg: "Use either pipeline input or '--data-record' parameter".into(),
-                    span: Some(span),
-                    help: None,
-                    inner: vec![],
-                });
-            }
-            match value {
-                Value::Record { val, .. } => Ok(val.into_owned()),
-                val => Err(ShellError::OnlySupportsThisInputType {
-                    exp_input_type: "record".into(),
-                    wrong_type: val.get_type().to_string(),
-                    dst_span: Span::unknown(),
-                    src_span: val.span(),
-                }),
-            }
+) -> Result<Vec<Record>, ShellError> {
+    // Check for conflicting use of both pipeline input and flag
+    if let Some(record) = data_record {
+        if !matches!(input, PipelineData::Empty) {
+            return Err(ShellError::GenericError {
+                error: "Pipeline and Flag both being used".into(),
+                msg: "Use either pipeline input or '--data-record' parameter".into(),
+                span: Some(span),
+                help: None,
+                inner: vec![],
+            });
         }
+        return Ok(vec![record]);
+    }
+
+    // Handle the input types
+    let values = match input {
+        PipelineData::Empty => {
+            return Err(ShellError::MissingParameter {
+                param_name: "requires a table or a record".into(),
+                span,
+            })
+        }
+        PipelineData::ListStream(stream, ..) => stream.into_iter().collect::<Vec<_>>(),
+        PipelineData::Value(Value::List { vals, .. }, ..) => vals,
+        PipelineData::Value(val, ..) => vec![val],
         _ => {
-            if data_record.is_some() {
-                return Err(ShellError::GenericError {
-                    error: "Pipeline and Flag both being used".into(),
-                    msg: "Use either pipeline input or '--data-record' parameter".into(),
-                    span: Some(span),
-                    help: None,
-                    inner: vec![],
-                });
-            }
-            Err(ShellError::OnlySupportsThisInputType {
-                exp_input_type: "record".into(),
+            return Err(ShellError::OnlySupportsThisInputType {
+                exp_input_type: "list or record".into(),
                 wrong_type: "".into(),
                 dst_span: span,
                 src_span: span,
             })
         }
-    }
+    };
+
+    values
+        .into_iter()
+        .map(|val| match val {
+            Value::Record { val, .. } => Ok(val.into_owned()),
+            other => Err(ShellError::OnlySupportsThisInputType {
+                exp_input_type: "record".into(),
+                wrong_type: other.get_type().to_string(),
+                dst_span: Span::unknown(),
+                src_span: other.span(),
+            }),
+        })
+        .collect()
 }
 
 fn process(

From 719d9aa83cba22a8988e70728210e0e2a29e63b4 Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Tue, 29 Oct 2024 14:33:14 +0300
Subject: [PATCH 0609/1072] provide a common implementation for query string
 conversions in `url join` and `url build-query` (#14173)

Addresses one of the points in #14162

# Description

Factors out part of the `url::build_query::to_url` function into a
separate function `url::query::record_to_qs()`, which is then used in
both `url::build_query` and `url::join`.

# User-Facing Changes

Like with `url build-query` (after #14073), `url join` will allow list
values in `params` and behavior of two commands will be same.

```nushell
> {a: ["one", "two"], b: "three"} | url build-query
"a=one&a=two&b=three"

> {scheme: "http", host: "host", params: {a: ["one", "two"], b: "three"}} | url join
"http://host?a=one&a=two&b=three"
```

# Tests + Formatting

Added an example to `url join` for the new behavior.
---
 .../nu-command/src/network/url/build_query.rs | 49 ++-----------------
 crates/nu-command/src/network/url/join.rs     | 31 +++++++-----
 crates/nu-command/src/network/url/mod.rs      |  1 +
 crates/nu-command/src/network/url/query.rs    | 44 +++++++++++++++++
 4 files changed, 70 insertions(+), 55 deletions(-)
 create mode 100644 crates/nu-command/src/network/url/query.rs

diff --git a/crates/nu-command/src/network/url/build_query.rs b/crates/nu-command/src/network/url/build_query.rs
index 8b563a2bbd..11fd9aba94 100644
--- a/crates/nu-command/src/network/url/build_query.rs
+++ b/crates/nu-command/src/network/url/build_query.rs
@@ -1,5 +1,7 @@
 use nu_engine::command_prelude::*;
 
+use super::query::record_to_query_string;
+
 #[derive(Clone)]
 pub struct SubCommand;
 
@@ -38,12 +40,12 @@ impl Command for SubCommand {
                 result: Some(Value::test_string("foo=1&bar=2")),
             },
             Example {
-                description: "Outputs a query string representing the contents of this record",
+                description: "Outputs a query string representing the contents of this record, with a value that needs to be url-encoded",
                 example: r#"{a:"AT&T", b: "AT T"} | url build-query"#,
                 result: Some(Value::test_string("a=AT%26T&b=AT+T")),
             },
             Example {
-                description: "Outputs a query string representing the contents of this record",
+                description: "Outputs a query string representing the contents of this record, \"exploding\" the list into multiple parameters",
                 example: r#"{a: ["one", "two"], b: "three"} | url build-query"#,
                 result: Some(Value::test_string("a=one&a=two&b=three")),
             },
@@ -68,48 +70,7 @@ fn to_url(input: PipelineData, head: Span) -> Result<PipelineData, ShellError> {
         .map(move |value| {
             let span = value.span();
             match value {
-                Value::Record { ref val, .. } => {
-                    let mut row_vec = vec![];
-                    for (k, v) in &**val {
-                        match v {
-                            Value::List { ref vals, .. } => {
-                                for v_item in vals {
-                                    row_vec.push((
-                                        k.clone(),
-                                        v_item.coerce_string().map_err(|_| {
-                                            ShellError::UnsupportedInput {
-                                                msg: "Expected a record with list of string values"
-                                                    .to_string(),
-                                                input: "value originates from here".into(),
-                                                msg_span: head,
-                                                input_span: span,
-                                            }
-                                        })?,
-                                    ));
-                                }
-                            }
-                            _ => row_vec.push((
-                                k.clone(),
-                                v.coerce_string()
-                                    .map_err(|_| ShellError::UnsupportedInput {
-                                        msg:
-                                            "Expected a record with string or list of string values"
-                                                .to_string(),
-                                        input: "value originates from here".into(),
-                                        msg_span: head,
-                                        input_span: span,
-                                    })?,
-                            )),
-                        }
-                    }
-
-                    serde_urlencoded::to_string(row_vec).map_err(|_| ShellError::CantConvert {
-                        to_type: "URL".into(),
-                        from_type: value.get_type().to_string(),
-                        span: head,
-                        help: None,
-                    })
-                }
+                Value::Record { ref val, .. } => record_to_query_string(val, span, head),
                 // Propagate existing errors
                 Value::Error { error, .. } => Err(*error),
                 other => Err(ShellError::UnsupportedInput {
diff --git a/crates/nu-command/src/network/url/join.rs b/crates/nu-command/src/network/url/join.rs
index 9be5de38e6..3b52b1d6b0 100644
--- a/crates/nu-command/src/network/url/join.rs
+++ b/crates/nu-command/src/network/url/join.rs
@@ -1,5 +1,7 @@
 use nu_engine::command_prelude::*;
 
+use super::query::record_to_query_string;
+
 #[derive(Clone)]
 pub struct SubCommand;
 
@@ -27,7 +29,7 @@ impl Command for SubCommand {
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
-                description: "Outputs a url representing the contents of this record",
+                description: "Outputs a url representing the contents of this record, `params` and `query` fields must be equivalent",
                 example: r#"{
         "scheme": "http",
         "username": "",
@@ -47,6 +49,21 @@ impl Command for SubCommand {
                     "http://www.pixiv.net/member_illust.php?mode=medium&illust_id=99260204",
                 )),
             },
+            Example {
+                description: "Outputs a url representing the contents of this record, \"exploding\" the list in `params` into multiple parameters",
+                example: r#"{
+        "scheme": "http",
+        "username": "user",
+        "password": "pwd",
+        "host": "www.pixiv.net",
+        "port": "1234",
+        "params": {a: ["one", "two"], b: "three"},
+        "fragment": ""
+    } | url join"#,
+                result: Some(Value::test_string(
+                    "http://user:pwd@www.pixiv.net:1234?a=one&a=two&b=three",
+                )),
+            },
             Example {
                 description: "Outputs a url representing the contents of this record",
                 example: r#"{
@@ -178,16 +195,8 @@ impl UrlComponents {
 
         if key == "params" {
             return match value {
-                Value::Record { val, .. } => {
-                    let mut qs = val
-                        .into_owned()
-                        .into_iter()
-                        .map(|(k, v)| match v.coerce_into_string() {
-                            Ok(val) => Ok(format!("{k}={val}")),
-                            Err(err) => Err(err),
-                        })
-                        .collect::<Result<Vec<String>, ShellError>>()?
-                        .join("&");
+                Value::Record { ref val, .. } => {
+                    let mut qs = record_to_query_string(val, value_span, span)?;
 
                     qs = if !qs.trim().is_empty() {
                         format!("?{qs}")
diff --git a/crates/nu-command/src/network/url/mod.rs b/crates/nu-command/src/network/url/mod.rs
index 2ca22e128c..3c4a4ac970 100644
--- a/crates/nu-command/src/network/url/mod.rs
+++ b/crates/nu-command/src/network/url/mod.rs
@@ -3,6 +3,7 @@ mod decode;
 mod encode;
 mod join;
 mod parse;
+mod query;
 mod url_;
 
 pub use self::parse::SubCommand as UrlParse;
diff --git a/crates/nu-command/src/network/url/query.rs b/crates/nu-command/src/network/url/query.rs
new file mode 100644
index 0000000000..fdedb73e0a
--- /dev/null
+++ b/crates/nu-command/src/network/url/query.rs
@@ -0,0 +1,44 @@
+use nu_protocol::{Record, ShellError, Span, Type, Value};
+
+pub fn record_to_query_string(
+    record: &Record,
+    span: Span,
+    head: Span,
+) -> Result<String, ShellError> {
+    let mut row_vec = vec![];
+    for (k, v) in record {
+        match v {
+            Value::List { ref vals, .. } => {
+                for v_item in vals {
+                    row_vec.push((
+                        k.as_str(),
+                        v_item
+                            .coerce_str()
+                            .map_err(|_| ShellError::UnsupportedInput {
+                                msg: "Expected a record with list of string values".to_string(),
+                                input: "value originates from here".into(),
+                                msg_span: head,
+                                input_span: span,
+                            })?,
+                    ));
+                }
+            }
+            _ => row_vec.push((
+                k.as_str(),
+                v.coerce_str().map_err(|_| ShellError::UnsupportedInput {
+                    msg: "Expected a record with string or list of string values".to_string(),
+                    input: "value originates from here".into(),
+                    msg_span: head,
+                    input_span: span,
+                })?,
+            )),
+        }
+    }
+
+    serde_urlencoded::to_string(row_vec).map_err(|_| ShellError::CantConvert {
+        to_type: "URL".into(),
+        from_type: Type::record().to_string(),
+        span: head,
+        help: None,
+    })
+}

From f8d4adfb7af1bf08f4ece1d8b58fad8cac1e63ba Mon Sep 17 00:00:00 2001
From: Piotr Kufel <qfel@users.noreply.github.com>
Date: Tue, 29 Oct 2024 04:34:48 -0700
Subject: [PATCH 0610/1072] Add the history import command (again) (#14083)

# Description

This is mainly https://github.com/nushell/nushell/pull/13450 (which got
reverted). Additionally:
 - always clear IDs on import, disallow specifying IDs when piping
 - added extra tests
 - create backup of the history

# User-Facing Changes

New command: `history import`

# Tests + Formatting

Added mostly integration tests and a few smaller unit tests.
---
 Cargo.lock                                    |  34 ++
 crates/nu-cli/Cargo.toml                      |   1 +
 crates/nu-cli/src/commands/default_context.rs |   1 +
 crates/nu-cli/src/commands/history/fields.rs  |   9 +
 .../nu-cli/src/commands/history/history_.rs   |  29 +-
 .../src/commands/history/history_import.rs    | 418 ++++++++++++++++++
 crates/nu-cli/src/commands/history/mod.rs     |   3 +
 crates/nu-cli/src/commands/mod.rs             |   2 +-
 .../nu-cli/tests/commands/history_import.rs   | 295 ++++++++++++
 crates/nu-cli/tests/commands/mod.rs           |   1 +
 crates/nu-test-support/src/macros.rs          |  16 +-
 11 files changed, 792 insertions(+), 17 deletions(-)
 create mode 100644 crates/nu-cli/src/commands/history/fields.rs
 create mode 100644 crates/nu-cli/src/commands/history/history_import.rs
 create mode 100644 crates/nu-cli/tests/commands/history_import.rs

diff --git a/Cargo.lock b/Cargo.lock
index c0f20c0380..ac4bdb3ced 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3026,6 +3026,7 @@ dependencies = [
  "rstest",
  "sysinfo 0.32.0",
  "tempfile",
+ "test-case",
  "unicode-segmentation",
  "uuid",
  "which",
@@ -6237,6 +6238,39 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
+[[package]]
+name = "test-case"
+version = "3.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8"
+dependencies = [
+ "test-case-macros",
+]
+
+[[package]]
+name = "test-case-core"
+version = "3.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f"
+dependencies = [
+ "cfg-if",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.75",
+]
+
+[[package]]
+name = "test-case-macros"
+version = "3.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.75",
+ "test-case-core",
+]
+
 [[package]]
 name = "textwrap"
 version = "0.16.1"
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 4fa99ada52..9529691c24 100644
--- a/crates/nu-cli/Cargo.toml
+++ b/crates/nu-cli/Cargo.toml
@@ -16,6 +16,7 @@ nu-command = { path = "../nu-command", version = "0.99.2" }
 nu-test-support = { path = "../nu-test-support", version = "0.99.2" }
 rstest = { workspace = true, default-features = false }
 tempfile = { workspace = true }
+test-case = "3.3.1"
 
 [dependencies]
 nu-cmd-base = { path = "../nu-cmd-base", version = "0.99.2" }
diff --git a/crates/nu-cli/src/commands/default_context.rs b/crates/nu-cli/src/commands/default_context.rs
index 0c1c459c20..ad19f18d94 100644
--- a/crates/nu-cli/src/commands/default_context.rs
+++ b/crates/nu-cli/src/commands/default_context.rs
@@ -17,6 +17,7 @@ pub fn add_cli_context(mut engine_state: EngineState) -> EngineState {
             CommandlineGetCursor,
             CommandlineSetCursor,
             History,
+            HistoryImport,
             HistorySession,
             Keybindings,
             KeybindingsDefault,
diff --git a/crates/nu-cli/src/commands/history/fields.rs b/crates/nu-cli/src/commands/history/fields.rs
new file mode 100644
index 0000000000..a5b44224ce
--- /dev/null
+++ b/crates/nu-cli/src/commands/history/fields.rs
@@ -0,0 +1,9 @@
+// Each const is named after a HistoryItem field, and the value is the field name to be displayed to
+// the user (or accept during import).
+pub const COMMAND_LINE: &str = "command";
+pub const START_TIMESTAMP: &str = "start_timestamp";
+pub const HOSTNAME: &str = "hostname";
+pub const CWD: &str = "cwd";
+pub const EXIT_STATUS: &str = "exit_status";
+pub const DURATION: &str = "duration";
+pub const SESSION_ID: &str = "session_id";
diff --git a/crates/nu-cli/src/commands/history/history_.rs b/crates/nu-cli/src/commands/history/history_.rs
index 602574229e..40d951966e 100644
--- a/crates/nu-cli/src/commands/history/history_.rs
+++ b/crates/nu-cli/src/commands/history/history_.rs
@@ -5,6 +5,8 @@ use reedline::{
     SqliteBackedHistory,
 };
 
+use super::fields;
+
 #[derive(Clone)]
 pub struct History;
 
@@ -83,7 +85,8 @@ impl Command for History {
                     entries.into_iter().enumerate().map(move |(idx, entry)| {
                         Value::record(
                             record! {
-                                "command" => Value::string(entry.command_line, head),
+                                fields::COMMAND_LINE => Value::string(entry.command_line, head),
+                                // TODO: This name is inconsistent with create_history_record.
                                 "index" => Value::int(idx as i64, head),
                             },
                             head,
@@ -176,13 +179,13 @@ fn create_history_record(idx: usize, entry: HistoryItem, long: bool, head: Span)
         Value::record(
             record! {
                 "item_id" => item_id_value,
-                "start_timestamp" => start_timestamp_value,
-                "command" => command_value,
-                "session_id" => session_id_value,
-                "hostname" => hostname_value,
-                "cwd" => cwd_value,
-                "duration" => duration_value,
-                "exit_status" => exit_status_value,
+                fields::START_TIMESTAMP => start_timestamp_value,
+                fields::COMMAND_LINE => command_value,
+                fields::SESSION_ID => session_id_value,
+                fields::HOSTNAME => hostname_value,
+                fields::CWD => cwd_value,
+                fields::DURATION => duration_value,
+                fields::EXIT_STATUS => exit_status_value,
                 "idx" => index_value,
             },
             head,
@@ -190,11 +193,11 @@ fn create_history_record(idx: usize, entry: HistoryItem, long: bool, head: Span)
     } else {
         Value::record(
             record! {
-                "start_timestamp" => start_timestamp_value,
-                "command" => command_value,
-                "cwd" => cwd_value,
-                "duration" => duration_value,
-                "exit_status" => exit_status_value,
+                fields::START_TIMESTAMP => start_timestamp_value,
+                fields::COMMAND_LINE => command_value,
+                fields::CWD => cwd_value,
+                fields::DURATION => duration_value,
+                fields::EXIT_STATUS => exit_status_value,
             },
             head,
         )
diff --git a/crates/nu-cli/src/commands/history/history_import.rs b/crates/nu-cli/src/commands/history/history_import.rs
new file mode 100644
index 0000000000..332f5d13fc
--- /dev/null
+++ b/crates/nu-cli/src/commands/history/history_import.rs
@@ -0,0 +1,418 @@
+use std::path::{Path, PathBuf};
+
+use nu_engine::command_prelude::*;
+use nu_protocol::HistoryFileFormat;
+
+use reedline::{
+    FileBackedHistory, History, HistoryItem, ReedlineError, SearchQuery, SqliteBackedHistory,
+};
+
+use super::fields;
+
+#[derive(Clone)]
+pub struct HistoryImport;
+
+impl Command for HistoryImport {
+    fn name(&self) -> &str {
+        "history import"
+    }
+
+    fn description(&self) -> &str {
+        "Import command line history"
+    }
+
+    fn extra_description(&self) -> &str {
+        r#"Can import history from input, either successive command lines or more detailed records. If providing records, available fields are:
+    command_line, id, start_timestamp, hostname, cwd, duration, exit_status.
+
+If no input is provided, will import all history items from existing history in the other format: if current history is stored in sqlite, it will store it in plain text and vice versa.
+
+Note that history item IDs are ignored when importing from file."#
+    }
+
+    fn signature(&self) -> nu_protocol::Signature {
+        Signature::build("history import")
+            .category(Category::History)
+            .input_output_types(vec![
+                (Type::Nothing, Type::Nothing),
+                (Type::List(Box::new(Type::String)), Type::Nothing),
+                (Type::table(), Type::Nothing),
+            ])
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                example: "history import",
+                description:
+                    "Append all items from history in the other format to the current history",
+                result: None,
+            },
+            Example {
+                example: "echo foo | history import",
+                description: "Append `foo` to the current history",
+                result: None,
+            },
+            Example {
+                example: "[[ command_line cwd ]; [ foo /home ]] | history import",
+                description: "Append `foo` ran from `/home` to the current history",
+                result: None,
+            },
+        ]
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        _stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let ok = Ok(Value::nothing(call.head).into_pipeline_data());
+
+        let Some(history) = engine_state.history_config() else {
+            return ok;
+        };
+        let Some(current_history_path) = history.file_path() else {
+            return Err(ShellError::ConfigDirNotFound {
+                span: Some(call.head),
+            });
+        };
+        if let Some(bak_path) = backup(&current_history_path)? {
+            println!("Backed history to {}", bak_path.display());
+        }
+        match input {
+            PipelineData::Empty => {
+                let other_format = match history.file_format {
+                    HistoryFileFormat::Sqlite => HistoryFileFormat::Plaintext,
+                    HistoryFileFormat::Plaintext => HistoryFileFormat::Sqlite,
+                };
+                let src = new_backend(other_format, None)?;
+                let mut dst = new_backend(history.file_format, Some(current_history_path))?;
+                let items = src
+                    .search(SearchQuery::everything(
+                        reedline::SearchDirection::Forward,
+                        None,
+                    ))
+                    .map_err(error_from_reedline)?
+                    .into_iter()
+                    .map(Ok);
+                import(dst.as_mut(), items)
+            }
+            _ => {
+                let input = input.into_iter().map(item_from_value);
+                import(
+                    new_backend(history.file_format, Some(current_history_path))?.as_mut(),
+                    input,
+                )
+            }
+        }?;
+
+        ok
+    }
+}
+
+fn new_backend(
+    format: HistoryFileFormat,
+    path: Option<PathBuf>,
+) -> Result<Box<dyn History>, ShellError> {
+    let path = match path {
+        Some(path) => path,
+        None => {
+            let Some(mut path) = nu_path::nu_config_dir() else {
+                return Err(ShellError::ConfigDirNotFound { span: None });
+            };
+            path.push(format.default_file_name());
+            path.into_std_path_buf()
+        }
+    };
+
+    fn map(
+        result: Result<impl History + 'static, ReedlineError>,
+    ) -> Result<Box<dyn History>, ShellError> {
+        result
+            .map(|x| Box::new(x) as Box<dyn History>)
+            .map_err(error_from_reedline)
+    }
+    match format {
+        // Use a reasonably large value for maximum capacity.
+        HistoryFileFormat::Plaintext => map(FileBackedHistory::with_file(0xfffffff, path)),
+        HistoryFileFormat::Sqlite => map(SqliteBackedHistory::with_file(path, None, None)),
+    }
+}
+
+fn import(
+    dst: &mut dyn History,
+    src: impl Iterator<Item = Result<HistoryItem, ShellError>>,
+) -> Result<(), ShellError> {
+    for item in src {
+        let mut item = item?;
+        item.id = None;
+        dst.save(item).map_err(error_from_reedline)?;
+    }
+    Ok(())
+}
+
+fn error_from_reedline(e: ReedlineError) -> ShellError {
+    // TODO: Should we add a new ShellError variant?
+    ShellError::GenericError {
+        error: "Reedline error".to_owned(),
+        msg: format!("{e}"),
+        span: None,
+        help: None,
+        inner: Vec::new(),
+    }
+}
+
+fn item_from_value(v: Value) -> Result<HistoryItem, ShellError> {
+    let span = v.span();
+    match v {
+        Value::Record { val, .. } => item_from_record(val.into_owned(), span),
+        Value::String { val, .. } => Ok(HistoryItem {
+            command_line: val,
+            id: None,
+            start_timestamp: None,
+            session_id: None,
+            hostname: None,
+            cwd: None,
+            duration: None,
+            exit_status: None,
+            more_info: None,
+        }),
+        _ => Err(ShellError::UnsupportedInput {
+            msg: "Only list and record inputs are supported".to_owned(),
+            input: v.get_type().to_string(),
+            msg_span: span,
+            input_span: span,
+        }),
+    }
+}
+
+fn item_from_record(mut rec: Record, span: Span) -> Result<HistoryItem, ShellError> {
+    let cmd = match rec.remove(fields::COMMAND_LINE) {
+        Some(v) => v.as_str()?.to_owned(),
+        None => {
+            return Err(ShellError::TypeMismatch {
+                err_message: format!("missing column: {}", fields::COMMAND_LINE),
+                span,
+            })
+        }
+    };
+
+    fn get<T>(
+        rec: &mut Record,
+        field: &'static str,
+        f: impl FnOnce(Value) -> Result<T, ShellError>,
+    ) -> Result<Option<T>, ShellError> {
+        rec.remove(field).map(f).transpose()
+    }
+
+    let rec = &mut rec;
+    let item = HistoryItem {
+        command_line: cmd,
+        id: None,
+        start_timestamp: get(rec, fields::START_TIMESTAMP, |v| Ok(v.as_date()?.to_utc()))?,
+        hostname: get(rec, fields::HOSTNAME, |v| Ok(v.as_str()?.to_owned()))?,
+        cwd: get(rec, fields::CWD, |v| Ok(v.as_str()?.to_owned()))?,
+        exit_status: get(rec, fields::EXIT_STATUS, |v| v.as_i64())?,
+        duration: get(rec, fields::DURATION, duration_from_value)?,
+        more_info: None,
+        // TODO: Currently reedline doesn't let you create session IDs.
+        session_id: None,
+    };
+
+    if !rec.is_empty() {
+        let cols = rec.columns().map(|s| s.as_str()).collect::<Vec<_>>();
+        return Err(ShellError::TypeMismatch {
+            err_message: format!("unsupported column names: {}", cols.join(", ")),
+            span,
+        });
+    }
+    Ok(item)
+}
+
+fn duration_from_value(v: Value) -> Result<std::time::Duration, ShellError> {
+    chrono::Duration::nanoseconds(v.as_duration()?)
+        .to_std()
+        .map_err(|_| ShellError::IOError {
+            msg: "negative duration not supported".to_string(),
+        })
+}
+
+fn find_backup_path(path: &Path) -> Result<PathBuf, ShellError> {
+    let Ok(mut bak_path) = path.to_path_buf().into_os_string().into_string() else {
+        // This isn't fundamentally problem, but trying to work with OsString is a nightmare.
+        return Err(ShellError::IOError {
+            msg: "History path mush be representable as UTF-8".to_string(),
+        });
+    };
+    bak_path.push_str(".bak");
+    if !Path::new(&bak_path).exists() {
+        return Ok(bak_path.into());
+    }
+    let base_len = bak_path.len();
+    for i in 1..100 {
+        use std::fmt::Write;
+        bak_path.truncate(base_len);
+        write!(&mut bak_path, ".{i}").unwrap();
+        if !Path::new(&bak_path).exists() {
+            return Ok(PathBuf::from(bak_path));
+        }
+    }
+    Err(ShellError::IOError {
+        msg: "Too many existing backup files".to_string(),
+    })
+}
+
+fn backup(path: &Path) -> Result<Option<PathBuf>, ShellError> {
+    match path.metadata() {
+        Ok(md) if md.is_file() => (),
+        Ok(_) => {
+            return Err(ShellError::IOError {
+                msg: "history path exists but is not a file".to_string(),
+            })
+        }
+        Err(e) if e.kind() == std::io::ErrorKind::NotFound => return Ok(None),
+        Err(e) => return Err(e.into()),
+    }
+    let bak_path = find_backup_path(path)?;
+    std::fs::copy(path, &bak_path)?;
+    Ok(Some(bak_path))
+}
+
+#[cfg(test)]
+mod tests {
+    use chrono::DateTime;
+    use test_case::case;
+
+    use super::*;
+
+    #[test]
+    fn test_item_from_value_string() -> Result<(), ShellError> {
+        let item = item_from_value(Value::string("foo", Span::unknown()))?;
+        assert_eq!(
+            item,
+            HistoryItem {
+                command_line: "foo".to_string(),
+                id: None,
+                start_timestamp: None,
+                session_id: None,
+                hostname: None,
+                cwd: None,
+                duration: None,
+                exit_status: None,
+                more_info: None
+            }
+        );
+        Ok(())
+    }
+
+    #[test]
+    fn test_item_from_value_record() {
+        let span = Span::unknown();
+        let rec = new_record(&[
+            ("command", Value::string("foo", span)),
+            (
+                "start_timestamp",
+                Value::date(
+                    DateTime::parse_from_rfc3339("1996-12-19T16:39:57-08:00").unwrap(),
+                    span,
+                ),
+            ),
+            ("hostname", Value::string("localhost", span)),
+            ("cwd", Value::string("/home/test", span)),
+            ("duration", Value::duration(100_000_000, span)),
+            ("exit_status", Value::int(42, span)),
+        ]);
+        let item = item_from_value(rec).unwrap();
+        assert_eq!(
+            item,
+            HistoryItem {
+                command_line: "foo".to_string(),
+                id: None,
+                start_timestamp: Some(
+                    DateTime::parse_from_rfc3339("1996-12-19T16:39:57-08:00")
+                        .unwrap()
+                        .to_utc()
+                ),
+                hostname: Some("localhost".to_string()),
+                cwd: Some("/home/test".to_string()),
+                duration: Some(std::time::Duration::from_nanos(100_000_000)),
+                exit_status: Some(42),
+
+                session_id: None,
+                more_info: None
+            }
+        );
+    }
+
+    #[test]
+    fn test_item_from_value_record_extra_field() {
+        let span = Span::unknown();
+        let rec = new_record(&[
+            ("command_line", Value::string("foo", span)),
+            ("id_nonexistent", Value::int(1, span)),
+        ]);
+        assert!(item_from_value(rec).is_err());
+    }
+
+    #[test]
+    fn test_item_from_value_record_bad_type() {
+        let span = Span::unknown();
+        let rec = new_record(&[
+            ("command_line", Value::string("foo", span)),
+            ("id", Value::string("one".to_string(), span)),
+        ]);
+        assert!(item_from_value(rec).is_err());
+    }
+
+    fn new_record(rec: &[(&'static str, Value)]) -> Value {
+        let span = Span::unknown();
+        let rec = Record::from_raw_cols_vals(
+            rec.iter().map(|(col, _)| col.to_string()).collect(),
+            rec.iter().map(|(_, val)| val.clone()).collect(),
+            span,
+            span,
+        )
+        .unwrap();
+        Value::record(rec, span)
+    }
+
+    #[case(&["history.dat"], "history.dat.bak"; "no_backup")]
+    #[case(&["history.dat", "history.dat.bak"], "history.dat.bak.1"; "backup_exists")]
+    #[case(
+        &["history.dat", "history.dat.bak", "history.dat.bak.1"],
+        "history.dat.bak.2";
+        "multiple_backups_exists"
+    )]
+    fn test_find_backup_path(existing: &[&str], want: &str) {
+        let dir = tempfile::tempdir().unwrap();
+        for name in existing {
+            std::fs::File::create_new(dir.path().join(name)).unwrap();
+        }
+        let got = find_backup_path(&dir.path().join("history.dat")).unwrap();
+        assert_eq!(got, dir.path().join(want))
+    }
+
+    #[test]
+    fn test_backup() {
+        let dir = tempfile::tempdir().unwrap();
+        let mut history = std::fs::File::create_new(dir.path().join("history.dat")).unwrap();
+        use std::io::Write;
+        write!(&mut history, "123").unwrap();
+        let want_bak_path = dir.path().join("history.dat.bak");
+        assert_eq!(
+            backup(&dir.path().join("history.dat")),
+            Ok(Some(want_bak_path.clone()))
+        );
+        let got_data = String::from_utf8(std::fs::read(want_bak_path).unwrap()).unwrap();
+        assert_eq!(got_data, "123");
+    }
+
+    #[test]
+    fn test_backup_no_file() {
+        let dir = tempfile::tempdir().unwrap();
+        let bak_path = backup(&dir.path().join("history.dat")).unwrap();
+        assert!(bak_path.is_none());
+    }
+}
diff --git a/crates/nu-cli/src/commands/history/mod.rs b/crates/nu-cli/src/commands/history/mod.rs
index be7d1fc11f..c36b560307 100644
--- a/crates/nu-cli/src/commands/history/mod.rs
+++ b/crates/nu-cli/src/commands/history/mod.rs
@@ -1,5 +1,8 @@
+mod fields;
 mod history_;
+mod history_import;
 mod history_session;
 
 pub use history_::History;
+pub use history_import::HistoryImport;
 pub use history_session::HistorySession;
diff --git a/crates/nu-cli/src/commands/mod.rs b/crates/nu-cli/src/commands/mod.rs
index f63724e95f..4a9dd9ef21 100644
--- a/crates/nu-cli/src/commands/mod.rs
+++ b/crates/nu-cli/src/commands/mod.rs
@@ -7,7 +7,7 @@ mod keybindings_list;
 mod keybindings_listen;
 
 pub use commandline::{Commandline, CommandlineEdit, CommandlineGetCursor, CommandlineSetCursor};
-pub use history::{History, HistorySession};
+pub use history::{History, HistoryImport, HistorySession};
 pub use keybindings::Keybindings;
 pub use keybindings_default::KeybindingsDefault;
 pub use keybindings_list::KeybindingsList;
diff --git a/crates/nu-cli/tests/commands/history_import.rs b/crates/nu-cli/tests/commands/history_import.rs
new file mode 100644
index 0000000000..c20bf2624b
--- /dev/null
+++ b/crates/nu-cli/tests/commands/history_import.rs
@@ -0,0 +1,295 @@
+use nu_protocol::HistoryFileFormat;
+use nu_test_support::{nu, Outcome};
+use reedline::{
+    FileBackedHistory, History, HistoryItem, HistoryItemId, ReedlineError, SearchQuery,
+    SqliteBackedHistory,
+};
+use tempfile::TempDir;
+use test_case::case;
+
+struct Test {
+    cfg_dir: TempDir,
+}
+
+impl Test {
+    fn new(history_format: &'static str) -> Self {
+        let cfg_dir = tempfile::Builder::new()
+            .prefix("history_import_test")
+            .tempdir()
+            .unwrap();
+        // Assigning to $env.config.history.file_format seems to work only in startup
+        // configuration.
+        std::fs::write(
+            cfg_dir.path().join("env.nu"),
+            format!("$env.config.history.file_format = {history_format:?}"),
+        )
+        .unwrap();
+        Self { cfg_dir }
+    }
+
+    fn nu(&self, cmd: impl AsRef<str>) -> Outcome {
+        let env = [(
+            "XDG_CONFIG_HOME".to_string(),
+            self.cfg_dir.path().to_str().unwrap().to_string(),
+        )];
+        let env_config = self.cfg_dir.path().join("env.nu");
+        nu!(envs: env, env_config: env_config, cmd.as_ref())
+    }
+
+    fn open_plaintext(&self) -> Result<FileBackedHistory, ReedlineError> {
+        FileBackedHistory::with_file(
+            100,
+            self.cfg_dir
+                .path()
+                .join("nushell")
+                .join(HistoryFileFormat::Plaintext.default_file_name()),
+        )
+    }
+
+    fn open_sqlite(&self) -> Result<SqliteBackedHistory, ReedlineError> {
+        SqliteBackedHistory::with_file(
+            self.cfg_dir
+                .path()
+                .join("nushell")
+                .join(HistoryFileFormat::Sqlite.default_file_name()),
+            None,
+            None,
+        )
+    }
+
+    fn open_backend(&self, format: HistoryFileFormat) -> Result<Box<dyn History>, ReedlineError> {
+        fn boxed(be: impl History + 'static) -> Box<dyn History> {
+            Box::new(be)
+        }
+        use HistoryFileFormat::*;
+        match format {
+            Plaintext => self.open_plaintext().map(boxed),
+            Sqlite => self.open_sqlite().map(boxed),
+        }
+    }
+}
+
+enum HistorySource {
+    Vec(Vec<HistoryItem>),
+    Command(&'static str),
+}
+
+struct TestCase {
+    dst_format: HistoryFileFormat,
+    dst_history: Vec<HistoryItem>,
+    src_history: HistorySource,
+    want_history: Vec<HistoryItem>,
+}
+
+const EMPTY_TEST_CASE: TestCase = TestCase {
+    dst_format: HistoryFileFormat::Plaintext,
+    dst_history: Vec::new(),
+    src_history: HistorySource::Vec(Vec::new()),
+    want_history: Vec::new(),
+};
+
+impl TestCase {
+    fn run(self) {
+        use HistoryFileFormat::*;
+        let test = Test::new(match self.dst_format {
+            Plaintext => "plaintext",
+            Sqlite => "sqlite",
+        });
+        save_all(
+            &mut *test.open_backend(self.dst_format).unwrap(),
+            self.dst_history,
+        )
+        .unwrap();
+
+        let outcome = match self.src_history {
+            HistorySource::Vec(src_history) => {
+                let src_format = match self.dst_format {
+                    Plaintext => Sqlite,
+                    Sqlite => Plaintext,
+                };
+                save_all(&mut *test.open_backend(src_format).unwrap(), src_history).unwrap();
+                test.nu("history import")
+            }
+            HistorySource::Command(cmd) => {
+                let mut cmd = cmd.to_string();
+                cmd.push_str(" | history import");
+                test.nu(cmd)
+            }
+        };
+        assert!(outcome.status.success());
+        let got = query_all(&*test.open_backend(self.dst_format).unwrap()).unwrap();
+
+        // Compare just the commands first, for readability.
+        fn commands_only(items: &[HistoryItem]) -> Vec<&str> {
+            items
+                .iter()
+                .map(|item| item.command_line.as_str())
+                .collect()
+        }
+        assert_eq!(commands_only(&got), commands_only(&self.want_history));
+        // If commands match, compare full items.
+        assert_eq!(got, self.want_history);
+    }
+}
+
+fn query_all(history: &dyn History) -> Result<Vec<HistoryItem>, ReedlineError> {
+    history.search(SearchQuery::everything(
+        reedline::SearchDirection::Forward,
+        None,
+    ))
+}
+
+fn save_all(history: &mut dyn History, items: Vec<HistoryItem>) -> Result<(), ReedlineError> {
+    for item in items {
+        history.save(item)?;
+    }
+    Ok(())
+}
+
+const EMPTY_ITEM: HistoryItem = HistoryItem {
+    command_line: String::new(),
+    id: None,
+    start_timestamp: None,
+    session_id: None,
+    hostname: None,
+    cwd: None,
+    duration: None,
+    exit_status: None,
+    more_info: None,
+};
+
+#[test]
+fn history_import_pipe_string() {
+    TestCase {
+        dst_format: HistoryFileFormat::Plaintext,
+        src_history: HistorySource::Command("echo bar"),
+        want_history: vec![HistoryItem {
+            id: Some(HistoryItemId::new(0)),
+            command_line: "bar".to_string(),
+            ..EMPTY_ITEM
+        }],
+        ..EMPTY_TEST_CASE
+    }
+    .run();
+}
+
+#[test]
+fn history_import_pipe_record() {
+    TestCase {
+        dst_format: HistoryFileFormat::Sqlite,
+        src_history: HistorySource::Command("[[cwd command]; [/tmp some_command]]"),
+        want_history: vec![HistoryItem {
+            id: Some(HistoryItemId::new(1)),
+            command_line: "some_command".to_string(),
+            cwd: Some("/tmp".to_string()),
+            ..EMPTY_ITEM
+        }],
+        ..EMPTY_TEST_CASE
+    }
+    .run();
+}
+
+#[test]
+fn to_empty_plaintext() {
+    TestCase {
+        dst_format: HistoryFileFormat::Plaintext,
+        src_history: HistorySource::Vec(vec![
+            HistoryItem {
+                command_line: "foo".to_string(),
+                ..EMPTY_ITEM
+            },
+            HistoryItem {
+                command_line: "bar".to_string(),
+                ..EMPTY_ITEM
+            },
+        ]),
+        want_history: vec![
+            HistoryItem {
+                id: Some(HistoryItemId::new(0)),
+                command_line: "foo".to_string(),
+                ..EMPTY_ITEM
+            },
+            HistoryItem {
+                id: Some(HistoryItemId::new(1)),
+                command_line: "bar".to_string(),
+                ..EMPTY_ITEM
+            },
+        ],
+        ..EMPTY_TEST_CASE
+    }
+    .run()
+}
+
+#[test]
+fn to_empty_sqlite() {
+    TestCase {
+        dst_format: HistoryFileFormat::Sqlite,
+        src_history: HistorySource::Vec(vec![
+            HistoryItem {
+                command_line: "foo".to_string(),
+                ..EMPTY_ITEM
+            },
+            HistoryItem {
+                command_line: "bar".to_string(),
+                ..EMPTY_ITEM
+            },
+        ]),
+        want_history: vec![
+            HistoryItem {
+                id: Some(HistoryItemId::new(1)),
+                command_line: "foo".to_string(),
+                ..EMPTY_ITEM
+            },
+            HistoryItem {
+                id: Some(HistoryItemId::new(2)),
+                command_line: "bar".to_string(),
+                ..EMPTY_ITEM
+            },
+        ],
+        ..EMPTY_TEST_CASE
+    }
+    .run()
+}
+
+#[case(HistoryFileFormat::Plaintext; "plaintext")]
+#[case(HistoryFileFormat::Sqlite; "sqlite")]
+fn to_existing(dst_format: HistoryFileFormat) {
+    TestCase {
+        dst_format,
+        dst_history: vec![
+            HistoryItem {
+                id: Some(HistoryItemId::new(0)),
+                command_line: "original-1".to_string(),
+                ..EMPTY_ITEM
+            },
+            HistoryItem {
+                id: Some(HistoryItemId::new(1)),
+                command_line: "original-2".to_string(),
+                ..EMPTY_ITEM
+            },
+        ],
+        src_history: HistorySource::Vec(vec![HistoryItem {
+            id: Some(HistoryItemId::new(1)),
+            command_line: "new".to_string(),
+            ..EMPTY_ITEM
+        }]),
+        want_history: vec![
+            HistoryItem {
+                id: Some(HistoryItemId::new(0)),
+                command_line: "original-1".to_string(),
+                ..EMPTY_ITEM
+            },
+            HistoryItem {
+                id: Some(HistoryItemId::new(1)),
+                command_line: "original-2".to_string(),
+                ..EMPTY_ITEM
+            },
+            HistoryItem {
+                id: Some(HistoryItemId::new(2)),
+                command_line: "new".to_string(),
+                ..EMPTY_ITEM
+            },
+        ],
+    }
+    .run()
+}
diff --git a/crates/nu-cli/tests/commands/mod.rs b/crates/nu-cli/tests/commands/mod.rs
index 087791302e..9eb18e3280 100644
--- a/crates/nu-cli/tests/commands/mod.rs
+++ b/crates/nu-cli/tests/commands/mod.rs
@@ -1,2 +1,3 @@
+mod history_import;
 mod keybindings_list;
 mod nu_highlight;
diff --git a/crates/nu-test-support/src/macros.rs b/crates/nu-test-support/src/macros.rs
index 2547b1f4c8..1ae7ce593e 100644
--- a/crates/nu-test-support/src/macros.rs
+++ b/crates/nu-test-support/src/macros.rs
@@ -234,7 +234,7 @@ macro_rules! nu_with_plugins {
 }
 
 use crate::{Outcome, NATIVE_PATH_ENV_VAR};
-use nu_path::{AbsolutePath, AbsolutePathBuf, Path};
+use nu_path::{AbsolutePath, AbsolutePathBuf, Path, PathBuf};
 use std::{
     ffi::OsStr,
     process::{Command, Stdio},
@@ -248,6 +248,10 @@ pub struct NuOpts {
     pub envs: Option<Vec<(String, String)>>,
     pub collapse_output: Option<bool>,
     pub use_ir: Option<bool>,
+    // Note: At the time this was added, passing in a file path was more convenient. However,
+    // passing in file contents seems like a better API - consider this when adding new uses of
+    // this field.
+    pub env_config: Option<PathBuf>,
 }
 
 pub fn nu_run_test(opts: NuOpts, commands: impl AsRef<str>, with_std: bool) -> Outcome {
@@ -278,8 +282,14 @@ pub fn nu_run_test(opts: NuOpts, commands: impl AsRef<str>, with_std: bool) -> O
         command.envs(envs);
     }
 
-    // Ensure that the user's config doesn't interfere with the tests
-    command.arg("--no-config-file");
+    match opts.env_config {
+        Some(path) => command.arg("--env-config").arg(path),
+        // TODO: This seems unnecessary: the code that runs for integration tests
+        // (run_commands) loads startup configs only if they are specified via flags explicitly or
+        // the shell is started as logging shell (which it is not in this case).
+        None => command.arg("--no-config-file"),
+    };
+
     if !with_std {
         command.arg("--no-std-lib");
     }

From 6cdc9e3b77c15ee34064823f7e6cf163cc84affe Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Tue, 29 Oct 2024 19:35:37 +0800
Subject: [PATCH 0611/1072] Fix LSP non-ascii characters offset issues.
 (#14002)

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

you can also mention related issues, PRs or discussions!
-->
This PR is supposed to fix #13582, #11522, as well as related goto
definition/reference issues (wrong position if non ascii characters
ahead).

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

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

<img width="411" alt="image"
src="https://github.com/user-attachments/assets/9a81953c-81b2-490d-a842-14ccaefd6972">

Changes:
1. span/completion should use byte offset instead of character index
2. lsp Postions related ops in Ropey remain to use character index

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

Should be none, tested in neovim with config:
```lua
require("lspconfig").nushell.setup({
  cmd = {
    "nu",
    "-I",
    vim.fn.getcwd(),
    "--no-config-file",
    "--lsp",
  },
  filetypes = { "nu" },
})
```

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

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

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

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

tests::complete_command_with_utf_line parameters fixed to align with
true lsp requests (in character index, not byte).
As for the issue_11522.nu, manually tested:

<img width="520" alt="image"
src="https://github.com/user-attachments/assets/45496ba8-5a2d-4998-9190-d7bde31ee72c">


# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.toml                                 |   2 +-
 crates/nu-lsp/src/diagnostics.rs           |  11 +-
 crates/nu-lsp/src/lib.rs                   | 297 +++++++++++++++++----
 crates/nu-lsp/src/notification.rs          |  27 +-
 tests/fixtures/lsp/goto/command_unicode.nu |   5 +
 5 files changed, 273 insertions(+), 69 deletions(-)
 create mode 100644 tests/fixtures/lsp/goto/command_unicode.nu

diff --git a/Cargo.toml b/Cargo.toml
index 9d9078d423..0390bc956b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -103,7 +103,7 @@ log = "0.4"
 lru = "0.12"
 lscolors = { version = "0.17", default-features = false }
 lsp-server = "0.7.5"
-lsp-types = "0.95.0"
+lsp-types = { version = "0.95.0", features = ["proposed"] }
 mach2 = "0.4"
 md5 = { version = "0.10", package = "md-5" }
 miette = "7.2"
diff --git a/crates/nu-lsp/src/diagnostics.rs b/crates/nu-lsp/src/diagnostics.rs
index 423fffbf6c..e1ae63dc59 100644
--- a/crates/nu-lsp/src/diagnostics.rs
+++ b/crates/nu-lsp/src/diagnostics.rs
@@ -45,7 +45,12 @@ impl LanguageServer {
             let message = err.to_string();
 
             diagnostics.diagnostics.push(Diagnostic {
-                range: Self::span_to_range(&err.span(), rope_of_file, offset),
+                range: Self::span_to_range(
+                    &err.span(),
+                    rope_of_file,
+                    offset,
+                    &self.position_encoding,
+                ),
                 severity: Some(DiagnosticSeverity::ERROR),
                 message,
                 ..Default::default()
@@ -71,7 +76,7 @@ mod tests {
 
     #[test]
     fn publish_diagnostics_variable_does_not_exists() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -102,7 +107,7 @@ mod tests {
 
     #[test]
     fn publish_diagnostics_fixed_unknown_variable() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
diff --git a/crates/nu-lsp/src/lib.rs b/crates/nu-lsp/src/lib.rs
index d698b126e0..0fe100c6b4 100644
--- a/crates/nu-lsp/src/lib.rs
+++ b/crates/nu-lsp/src/lib.rs
@@ -4,17 +4,18 @@ use lsp_types::{
     request::{Completion, GotoDefinition, HoverRequest, Request},
     CompletionItem, CompletionItemKind, CompletionParams, CompletionResponse, CompletionTextEdit,
     GotoDefinitionParams, GotoDefinitionResponse, Hover, HoverContents, HoverParams, Location,
-    MarkupContent, MarkupKind, OneOf, Range, ServerCapabilities, TextDocumentSyncKind, TextEdit,
-    Url,
+    MarkupContent, MarkupKind, OneOf, Position, PositionEncodingKind, Range, ServerCapabilities,
+    TextDocumentSyncKind, TextEdit, Url,
 };
 use miette::{IntoDiagnostic, Result};
 use nu_cli::{NuCompleter, SuggestionKind};
 use nu_parser::{flatten_block, parse, FlatShape};
 use nu_protocol::{
-    engine::{EngineState, Stack, StateWorkingSet},
+    engine::{CachedFile, EngineState, Stack, StateWorkingSet},
     DeclId, Span, Value, VarId,
 };
 use ropey::Rope;
+use serde_json::json;
 use std::{
     collections::BTreeMap,
     path::{Path, PathBuf},
@@ -36,6 +37,7 @@ pub struct LanguageServer {
     connection: Connection,
     io_threads: Option<IoThreads>,
     ropes: BTreeMap<PathBuf, Rope>,
+    position_encoding: PositionEncodingKind,
 }
 
 impl LanguageServer {
@@ -52,9 +54,21 @@ impl LanguageServer {
             connection,
             io_threads,
             ropes: BTreeMap::new(),
+            position_encoding: PositionEncodingKind::UTF16,
         })
     }
 
+    fn get_offset_encoding(&self, initialization_params: serde_json::Value) -> String {
+        initialization_params
+            .pointer("/capabilities/offsetEncoding/0")
+            .unwrap_or(
+                initialization_params
+                    .pointer("/capabilities/offset_encoding/0")
+                    .unwrap_or(&json!("utf-16")),
+            )
+            .to_string()
+    }
+
     pub fn serve_requests(mut self, engine_state: EngineState) -> Result<()> {
         let server_capabilities = serde_json::to_value(ServerCapabilities {
             text_document_sync: Some(lsp_types::TextDocumentSyncCapability::Kind(
@@ -67,12 +81,14 @@ impl LanguageServer {
         })
         .expect("Must be serializable");
 
-        let _initialization_params = self
+        let initialization_params = self
             .connection
             .initialize_while(server_capabilities, || {
                 !engine_state.signals().interrupted()
             })
             .into_diagnostic()?;
+        self.position_encoding =
+            PositionEncodingKind::from(self.get_offset_encoding(initialization_params));
 
         while !engine_state.signals().interrupted() {
             let msg = match self
@@ -174,29 +190,78 @@ impl LanguageServer {
         }
     }
 
-    fn span_to_range(span: &Span, rope_of_file: &Rope, offset: usize) -> lsp_types::Range {
-        let line = rope_of_file.byte_to_line(span.start - offset);
-        let character = span.start - offset - rope_of_file.line_to_char(line);
-
-        let start = lsp_types::Position {
-            line: line as u32,
-            character: character as u32,
-        };
-
-        let line = rope_of_file.byte_to_line(span.end - offset);
-        let character = span.end - offset - rope_of_file.line_to_char(line);
-
-        let end = lsp_types::Position {
-            line: line as u32,
-            character: character as u32,
-        };
-
-        lsp_types::Range { start, end }
+    fn span_to_range(
+        span: &Span,
+        rope_of_file: &Rope,
+        offset: usize,
+        position_encoding: &PositionEncodingKind,
+    ) -> Range {
+        let start = Self::lsp_byte_offset_to_utf_cu_position(
+            span.start.saturating_sub(offset),
+            rope_of_file,
+            position_encoding,
+        );
+        let end = Self::lsp_byte_offset_to_utf_cu_position(
+            span.end.saturating_sub(offset),
+            rope_of_file,
+            position_encoding,
+        );
+        Range { start, end }
     }
 
-    pub fn lsp_position_to_location(position: &lsp_types::Position, rope_of_file: &Rope) -> usize {
-        let line_idx = rope_of_file.line_to_char(position.line as usize);
-        line_idx + position.character as usize
+    fn lsp_byte_offset_to_utf_cu_position(
+        offset: usize,
+        rope_of_file: &Rope,
+        position_encoding: &PositionEncodingKind,
+    ) -> Position {
+        let line = rope_of_file.try_byte_to_line(offset).unwrap_or(0);
+        match position_encoding.as_str() {
+            "\"utf-8\"" => {
+                let character = offset - rope_of_file.line_to_byte(line);
+                Position {
+                    line: line as u32,
+                    character: character as u32,
+                }
+            }
+            _ => {
+                let character = rope_of_file.char_to_utf16_cu(rope_of_file.byte_to_char(offset))
+                    - rope_of_file.char_to_utf16_cu(rope_of_file.line_to_char(line));
+                Position {
+                    line: line as u32,
+                    character: character as u32,
+                }
+            }
+        }
+    }
+
+    fn utf16_cu_position_to_char(rope_of_file: &Rope, position: &Position) -> usize {
+        let line_utf_idx =
+            rope_of_file.char_to_utf16_cu(rope_of_file.line_to_char(position.line as usize));
+        rope_of_file.utf16_cu_to_char(line_utf_idx + position.character as usize)
+    }
+
+    pub fn lsp_position_to_location(
+        position: &Position,
+        rope_of_file: &Rope,
+        position_encoding: &PositionEncodingKind,
+    ) -> usize {
+        match position_encoding.as_str() {
+            "\"utf-8\"" => rope_of_file.byte_to_char(
+                rope_of_file.line_to_byte(position.line as usize) + position.character as usize,
+            ),
+            _ => Self::utf16_cu_position_to_char(rope_of_file, position),
+        }
+    }
+
+    fn lsp_position_to_byte_offset(&self, position: &Position, rope_of_file: &Rope) -> usize {
+        match self.position_encoding.as_str() {
+            "\"utf-8\"" => {
+                rope_of_file.line_to_byte(position.line as usize) + position.character as usize
+            }
+            _ => rope_of_file
+                .try_char_to_byte(Self::utf16_cu_position_to_char(rope_of_file, position))
+                .expect("Character index out of range!"),
+        }
     }
 
     fn find_id(
@@ -240,7 +305,7 @@ impl LanguageServer {
     }
 
     fn read_in_file<'a>(
-        &mut self,
+        &self,
         engine_state: &'a mut EngineState,
         file_url: &Url,
     ) -> Option<(&Rope, &PathBuf, StateWorkingSet<'a>)> {
@@ -253,6 +318,15 @@ impl LanguageServer {
         Some((file, path, working_set))
     }
 
+    fn rope_file_from_cached_file(&mut self, cached_file: &CachedFile) -> Result<(Url, &Rope), ()> {
+        let uri = Url::from_file_path(&*cached_file.name)?;
+        let rope_of_file = self.ropes.entry(uri.to_file_path()?).or_insert_with(|| {
+            let raw_string = String::from_utf8_lossy(&cached_file.content);
+            Rope::from_str(&raw_string)
+        });
+        Ok((uri, rope_of_file))
+    }
+
     fn goto_definition(
         &mut self,
         engine_state: &mut EngineState,
@@ -270,7 +344,7 @@ impl LanguageServer {
             &mut working_set,
             path,
             file,
-            Self::lsp_position_to_location(&params.text_document_position_params.position, file),
+            self.lsp_position_to_byte_offset(&params.text_document_position_params.position, file),
         )?;
 
         match id {
@@ -280,12 +354,16 @@ impl LanguageServer {
                     if let Some(span) = &block.span {
                         for cached_file in working_set.files() {
                             if cached_file.covered_span.contains(span.start) {
+                                let position_encoding = self.position_encoding.clone();
+                                let (uri, rope_of_file) =
+                                    self.rope_file_from_cached_file(cached_file).ok()?;
                                 return Some(GotoDefinitionResponse::Scalar(Location {
-                                    uri: Url::from_file_path(&*cached_file.name).ok()?,
+                                    uri,
                                     range: Self::span_to_range(
                                         span,
-                                        file,
+                                        rope_of_file,
                                         cached_file.covered_span.start,
+                                        &position_encoding,
                                     ),
                                 }));
                             }
@@ -300,16 +378,16 @@ impl LanguageServer {
                         .covered_span
                         .contains(var.declaration_span.start)
                     {
+                        let position_encoding = self.position_encoding.clone();
+                        let (uri, rope_of_file) =
+                            self.rope_file_from_cached_file(cached_file).ok()?;
                         return Some(GotoDefinitionResponse::Scalar(Location {
-                            uri: params
-                                .text_document_position_params
-                                .text_document
-                                .uri
-                                .clone(),
+                            uri,
                             range: Self::span_to_range(
                                 &var.declaration_span,
-                                file,
+                                rope_of_file,
                                 cached_file.covered_span.start,
+                                &position_encoding,
                             ),
                         }));
                     }
@@ -333,7 +411,7 @@ impl LanguageServer {
             &mut working_set,
             path,
             file,
-            Self::lsp_position_to_location(&params.text_document_position_params.position, file),
+            self.lsp_position_to_byte_offset(&params.text_document_position_params.position, file),
         )?;
 
         match id {
@@ -552,7 +630,7 @@ impl LanguageServer {
             NuCompleter::new(Arc::new(engine_state.clone()), Arc::new(Stack::new()));
 
         let location =
-            Self::lsp_position_to_location(&params.text_document_position.position, rope_of_file);
+            self.lsp_position_to_byte_offset(&params.text_document_position.position, rope_of_file);
         let results =
             completer.fetch_completions_at(&rope_of_file.to_string()[..location], location);
         if results.is_empty() {
@@ -618,7 +696,9 @@ mod tests {
     use nu_test_support::fs::{fixtures, root};
     use std::sync::mpsc::Receiver;
 
-    pub fn initialize_language_server() -> (Connection, Receiver<Result<()>>) {
+    pub fn initialize_language_server(
+        client_offset_encoding: Option<Vec<String>>,
+    ) -> (Connection, Receiver<Result<()>>) {
         use std::sync::mpsc;
         let (client_connection, server_connection) = Connection::memory();
         let lsp_server = LanguageServer::initialize_connection(server_connection, None).unwrap();
@@ -636,6 +716,10 @@ mod tests {
                 id: 1.into(),
                 method: Initialize::METHOD.to_string(),
                 params: serde_json::to_value(InitializeParams {
+                    capabilities: lsp_types::ClientCapabilities {
+                        offset_encoding: client_offset_encoding,
+                        ..Default::default()
+                    },
                     ..Default::default()
                 })
                 .unwrap(),
@@ -659,7 +743,7 @@ mod tests {
 
     #[test]
     fn shutdown_on_request() {
-        let (client_connection, recv) = initialize_language_server();
+        let (client_connection, recv) = initialize_language_server(None);
 
         client_connection
             .sender
@@ -685,7 +769,7 @@ mod tests {
 
     #[test]
     fn goto_definition_for_none_existing_file() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut none_existent_path = root();
         none_existent_path.push("none-existent.nu");
@@ -700,7 +784,7 @@ mod tests {
                         text_document: TextDocumentIdentifier {
                             uri: Url::from_file_path(none_existent_path).unwrap(),
                         },
-                        position: lsp_types::Position {
+                        position: Position {
                             line: 0,
                             character: 0,
                         },
@@ -817,7 +901,7 @@ mod tests {
                 params: serde_json::to_value(GotoDefinitionParams {
                     text_document_position_params: TextDocumentPositionParams {
                         text_document: TextDocumentIdentifier { uri },
-                        position: lsp_types::Position { line, character },
+                        position: Position { line, character },
                     },
                     work_done_progress_params: WorkDoneProgressParams::default(),
                     partial_result_params: PartialResultParams::default(),
@@ -834,7 +918,7 @@ mod tests {
 
     #[test]
     fn goto_definition_of_variable() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -865,7 +949,7 @@ mod tests {
 
     #[test]
     fn goto_definition_of_command() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -894,9 +978,72 @@ mod tests {
         );
     }
 
+    #[test]
+    fn goto_definition_of_command_utf8() {
+        let (client_connection, _recv) =
+            initialize_language_server(Some(vec!["utf-8".to_string(), "utf-16".to_string()]));
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("goto");
+        script.push("command_unicode.nu");
+        let script = Url::from_file_path(script).unwrap();
+
+        open_unchecked(&client_connection, script.clone());
+
+        let resp = goto_definition(&client_connection, script.clone(), 4, 1);
+        let result = if let Message::Response(response) = resp {
+            response.result
+        } else {
+            panic!()
+        };
+
+        assert_json_eq!(
+            result,
+            serde_json::json!({
+               "uri": script,
+               "range": {
+                  "start": { "line": 0, "character": 28 },
+                  "end": { "line": 2, "character": 1 }
+               }
+            })
+        );
+    }
+
+    #[test]
+    fn goto_definition_of_command_utf16() {
+        let (client_connection, _recv) = initialize_language_server(None);
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("goto");
+        script.push("command_unicode.nu");
+        let script = Url::from_file_path(script).unwrap();
+
+        open_unchecked(&client_connection, script.clone());
+
+        let resp = goto_definition(&client_connection, script.clone(), 4, 1);
+        let result = if let Message::Response(response) = resp {
+            response.result
+        } else {
+            panic!()
+        };
+
+        assert_json_eq!(
+            result,
+            serde_json::json!({
+               "uri": script,
+               "range": {
+                  "start": { "line": 0, "character": 19 },
+                  "end": { "line": 2, "character": 1 }
+               }
+            })
+        );
+    }
+
     #[test]
     fn goto_definition_of_command_parameter() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -934,7 +1081,7 @@ mod tests {
                 params: serde_json::to_value(HoverParams {
                     text_document_position_params: TextDocumentPositionParams {
                         text_document: TextDocumentIdentifier { uri },
-                        position: lsp_types::Position { line, character },
+                        position: Position { line, character },
                     },
                     work_done_progress_params: WorkDoneProgressParams::default(),
                 })
@@ -950,7 +1097,7 @@ mod tests {
 
     #[test]
     fn hover_on_variable() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -977,7 +1124,7 @@ mod tests {
 
     #[test]
     fn hover_on_custom_command() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -1007,7 +1154,7 @@ mod tests {
 
     #[test]
     fn hover_on_str_join() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -1044,7 +1191,7 @@ mod tests {
                 params: serde_json::to_value(CompletionParams {
                     text_document_position: TextDocumentPositionParams {
                         text_document: TextDocumentIdentifier { uri },
-                        position: lsp_types::Position { line, character },
+                        position: Position { line, character },
                     },
                     work_done_progress_params: WorkDoneProgressParams::default(),
                     partial_result_params: PartialResultParams::default(),
@@ -1062,7 +1209,7 @@ mod tests {
 
     #[test]
     fn complete_on_variable() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -1099,7 +1246,7 @@ mod tests {
 
     #[test]
     fn complete_command_with_space() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -1136,8 +1283,9 @@ mod tests {
     }
 
     #[test]
-    fn complete_command_with_utf_line() {
-        let (client_connection, _recv) = initialize_language_server();
+    fn complete_command_with_utf8_line() {
+        let (client_connection, _recv) =
+            initialize_language_server(Some(vec!["utf-8".to_string()]));
 
         let mut script = fixtures();
         script.push("lsp");
@@ -1173,9 +1321,48 @@ mod tests {
         );
     }
 
+    #[test]
+    fn complete_command_with_utf16_line() {
+        let (client_connection, _recv) =
+            initialize_language_server(Some(vec!["utf-16".to_string()]));
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("completion");
+        script.push("utf_pipeline.nu");
+        let script = Url::from_file_path(script).unwrap();
+
+        open_unchecked(&client_connection, script.clone());
+
+        let resp = complete(&client_connection, script, 0, 13);
+        let result = if let Message::Response(response) = resp {
+            response.result
+        } else {
+            panic!()
+        };
+
+        assert_json_eq!(
+            result,
+            serde_json::json!([
+               {
+                  "label": "str trim",
+                  "detail": "Trim whitespace or specific character.",
+                  "textEdit": {
+                     "range": {
+                        "start": { "line": 0, "character": 8 },
+                        "end": { "line": 0, "character": 13 },
+                     },
+                     "newText": "str trim"
+                  },
+                  "kind": 3
+               }
+            ])
+        );
+    }
+
     #[test]
     fn complete_keyword() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
diff --git a/crates/nu-lsp/src/notification.rs b/crates/nu-lsp/src/notification.rs
index a715a67d4f..a3e563b468 100644
--- a/crates/nu-lsp/src/notification.rs
+++ b/crates/nu-lsp/src/notification.rs
@@ -64,20 +64,27 @@ impl LanguageServer {
         if let Ok(file_path) = params.text_document.uri.to_file_path() {
             for content_change in params.content_changes.into_iter() {
                 let entry = self.ropes.entry(file_path.clone());
-                match (content_change.range, content_change.range) {
-                    (Some(range), _) => {
+                match content_change.range {
+                    Some(range) => {
                         entry.and_modify(|rope| {
-                            let start = Self::lsp_position_to_location(&range.start, rope);
-                            let end = Self::lsp_position_to_location(&range.end, rope);
+                            let start = Self::lsp_position_to_location(
+                                &range.start,
+                                rope,
+                                &self.position_encoding,
+                            );
+                            let end = Self::lsp_position_to_location(
+                                &range.end,
+                                rope,
+                                &self.position_encoding,
+                            );
 
                             rope.remove(start..end);
                             rope.insert(start, &content_change.text);
                         });
                     }
-                    (None, None) => {
+                    None => {
                         entry.and_modify(|r| *r = Rope::from_str(&content_change.text));
                     }
-                    _ => {}
                 }
             }
 
@@ -99,7 +106,7 @@ mod tests {
 
     #[test]
     fn hover_correct_documentation_on_let() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -129,7 +136,7 @@ mod tests {
 
     #[test]
     fn hover_on_command_after_full_content_change() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -170,7 +177,7 @@ hello"#,
 
     #[test]
     fn hover_on_command_after_partial_content_change() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -215,7 +222,7 @@ hello"#,
 
     #[test]
     fn open_document_with_utf_char() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
diff --git a/tests/fixtures/lsp/goto/command_unicode.nu b/tests/fixtures/lsp/goto/command_unicode.nu
new file mode 100644
index 0000000000..90fd9d329b
--- /dev/null
+++ b/tests/fixtures/lsp/goto/command_unicode.nu
@@ -0,0 +1,5 @@
+def 🐚🤖啊あà [name] {
+  $"hello ($name)"
+}
+
+🐚🤖啊あà nushell

From 9083157baafac9c3a9d132e6b66016758382a048 Mon Sep 17 00:00:00 2001
From: Solomon <git@solomonvictorino.com>
Date: Tue, 29 Oct 2024 05:37:44 -0600
Subject: [PATCH 0612/1072] support table literal syntax in `join` right-table
 argument (#14190)

# Description

Makes `join` `right-table` support table literal notation instead of
parsing the column list (treated as empty data):

```diff
[{a: 1}] | join [[a]; [1]] a | to nuon
-[]
+[[a]; [1]]
```

Fixes #13537, fixes #14134
---
 crates/nu-command/src/filters/join.rs    | 2 +-
 crates/nu-command/tests/commands/join.rs | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/crates/nu-command/src/filters/join.rs b/crates/nu-command/src/filters/join.rs
index 379366d4c9..7f3bbae238 100644
--- a/crates/nu-command/src/filters/join.rs
+++ b/crates/nu-command/src/filters/join.rs
@@ -29,7 +29,7 @@ impl Command for Join {
         Signature::build("join")
             .required(
                 "right-table",
-                SyntaxShape::List(Box::new(SyntaxShape::Any)),
+                SyntaxShape::Table([].into()),
                 "The right table in the join.",
             )
             .required(
diff --git a/crates/nu-command/tests/commands/join.rs b/crates/nu-command/tests/commands/join.rs
index 69aa39f59a..a3c2bad11e 100644
--- a/crates/nu-command/tests/commands/join.rs
+++ b/crates/nu-command/tests/commands/join.rs
@@ -355,7 +355,6 @@ fn do_cases_where_result_differs_between_join_types_with_different_join_keys(joi
     }
 }
 
-#[ignore]
 #[test]
 fn test_alternative_table_syntax() {
     let join_type = "--inner";

From b8efd2a347833b279378837346bae41eab3c0a9a Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Tue, 29 Oct 2024 08:01:32 -0400
Subject: [PATCH 0613/1072] ansi name for clear-scrollback code (#14184)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Related to #14181

# Description

Our understanding of `ESC[3J` has apparently been wrong. And I say "our"
because I posted a [Super User
answer](https://superuser.com/a/1738611/1210833) a couple of years ago
with the same misconception (now fixed). In addition, the [crossterm
crate
doc](https://docs.rs/crossterm/latest/crossterm/terminal/enum.ClearType.html)
is wrong on the topic.

`ESC[3J` doesn't clear the screen plus the scrollback; it *only* clears
the scrollback. Reference the official [Xterm Control Sequences
doc](https://www.xfree86.org/4.8.0/ctlseqs.html).

> CSI P s J
>
> Erase in Display (ED)
>
> P s = 0 → Erase Below (default)
> P s = 1 → Erase Above
> P s = 2 → Erase All
> P s = 3 → Erase Saved Lines (xterm)

This also means that:

```nu
$"(ansi clear_entire_screen_plus_buffer)"
```

... doesn't.

This PR updates it to `ansi clear_scrollback_buffer` (short-code remains
the same).

# User-Facing Changes

Breaking-change: `ansi clear_entire_screen_plus_buffer` is renamed `ansi
clear_scrollback_buffer`

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

Self-documenting command via `ansi -l`
---
 crates/nu-command/src/platform/ansi/ansi_.rs     |  3 ++-
 .../nu-command/tests/commands/platform/ansi_.rs  | 16 +++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/crates/nu-command/src/platform/ansi/ansi_.rs b/crates/nu-command/src/platform/ansi/ansi_.rs
index 43fd7d83df..13c229a456 100644
--- a/crates/nu-command/src/platform/ansi/ansi_.rs
+++ b/crates/nu-command/src/platform/ansi/ansi_.rs
@@ -448,7 +448,8 @@ static CODE_LIST: Lazy<Vec<AnsiCode>> = Lazy::new(|| { vec![
     AnsiCode{ short_name: None, long_name:"clear_screen_from_cursor_to_end", code: "\x1b[0J".to_string()}, // clears from cursor until end of screen
     AnsiCode{ short_name: None, long_name:"clear_screen_from_cursor_to_beginning", code: "\x1b[1J".to_string()}, // clears from cursor to beginning of screen
     AnsiCode{ short_name: Some("cls"), long_name:"clear_entire_screen", code: "\x1b[2J".to_string()}, // clears the entire screen
-    AnsiCode{ short_name: Some("clsb"), long_name:"clear_entire_screen_plus_buffer", code: "\x1b[3J".to_string()}, // clear entire screen and delete all lines saved in the scrollback buffer
+    AnsiCode{ short_name: Some("clsb"), long_name:"clear_entire_screen_plus_buffer", code: "\x1b[2J\x1b[3J".to_string()}, // clear entire screen and delete all lines saved in the scrollback buffer
+    AnsiCode{ short_name: Some("clb"), long_name:"clear_scrollback_buffer", code: "\x1b[3J".to_string()}, // clear entire screen and delete all lines saved in the scrollback buffer
     AnsiCode{ short_name: None, long_name:"erase_line", code: "\x1b[K".to_string()},                   // clears the current line
     AnsiCode{ short_name: None, long_name:"erase_line_from_cursor_to_end", code: "\x1b[0K".to_string()}, // clears from cursor to end of line
     AnsiCode{ short_name: None, long_name:"erase_line_from_cursor_to_beginning", code: "\x1b[1K".to_string()}, // clears from cursor to start of line
diff --git a/crates/nu-command/tests/commands/platform/ansi_.rs b/crates/nu-command/tests/commands/platform/ansi_.rs
index e08ae7ebf0..c7bea5cafb 100644
--- a/crates/nu-command/tests/commands/platform/ansi_.rs
+++ b/crates/nu-command/tests/commands/platform/ansi_.rs
@@ -11,5 +11,19 @@ fn test_ansi_shows_error_on_escape() {
 fn test_ansi_list_outputs_table() {
     let actual = nu!("ansi --list | length");
 
-    assert_eq!(actual.out, "424");
+    assert_eq!(actual.out, "425");
+}
+
+#[test]
+fn test_ansi_codes() {
+    let actual = nu!("$'(ansi clear_scrollback_buffer)'");
+    assert_eq!(actual.out, "\x1b[3J");
+
+    // Currently, bg is placed before fg in the results
+    // It's okay if something internally changes this, but
+    // if so, the test case will need to be updated to:
+    // assert_eq!(actual.out, "\x1b[31;48;2;0;255;0mHello\x1b[0m");
+
+    let actual = nu!("$'(ansi { fg: red, bg: \"#00ff00\" })Hello(ansi reset)'");
+    assert_eq!(actual.out, "\x1b[48;2;0;255;0;31mHello\x1b[0m");
 }

From 3ec76af96e4e5c02ffc57e31ab4946035f99e8b4 Mon Sep 17 00:00:00 2001
From: Kieron Wilkinson <kieron.wilkinson@gmail.com>
Date: Tue, 29 Oct 2024 12:40:23 +0000
Subject: [PATCH 0614/1072] Add Debian Dockerfile (#14193)

# Description

Add Dockerfile for Debian/Ubuntu images.
Related to #14171 and PR #14191

This is largely similar to the Alpine version, however there are some
minor differences:
- I've specially added Debian Bookworm here to provide some stability
when new major versions are released. We can bump the (LTS only perhaps)
versions supported as needed.
- I moved the creation of the nushell user until later to avoid a
warning about the nu binary not (yet) being available.
- Debian doesn't come with wget or curl. I've added wget to be similar
to Alpine. I tried creating a multi-layer version to avoid installing
wget (reduced attack surface) but the image was bigger due to the extra
layer, so didn't seem worth being different.

I can transfer the relevant changes to the Alpine image if we want to
keep them easily diffable?

# User-Facing Changes

While this provides a Debian image by default. An Ubuntu image can be
created from this by changing to `FROM ubuntu:noble`. We could later
supply that as an optional argument from the build workflow to be able
to build different distros and supported versions.

# Tests + Formatting

The images produced for Debian/Ubuntu are ~75Mb bigger as listed in
`docker images`:

```
REPOSITORY                                       TAG             IMAGE ID       CREATED        SIZE
nu-alpine                                        latest          71c0216eddd9   44 years ago   167MB
nu-debian                                        latest          cce3d91fc77c   44 years ago   243MB
nu-ubuntu                                        latest          ce90497da806   44 years ago   240MB
```

I've tested a few nu commands, including polars. It seems to work okay.
It makes sense to add some container-based tests once the workflows are
available. I'll probably pick that up later when @hustcer has completed
the migration of his workflows. Perhaps invoking a nushell-based test
suite if one is available. The toolkit seems to rely on cargo and the
source being available, which of course won't work here.
---
 docker/debian.Dockerfile | 56 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 docker/debian.Dockerfile

diff --git a/docker/debian.Dockerfile b/docker/debian.Dockerfile
new file mode 100644
index 0000000000..9a510453ef
--- /dev/null
+++ b/docker/debian.Dockerfile
@@ -0,0 +1,56 @@
+# syntax=docker/dockerfile:latest
+
+# Git: git version 2.46.0
+# /etc/os-release: Debian GNU/Linux 12 (bookworm)
+# Kernel: Linux 8aa16b289a9f 5.15.153.1-microsoft-standard-WSL2 #1 SMP Fri Mar 29 23:14:13 UTC 2024 x86_64 GNU/Linux
+# Build cmd: docker build --no-cache --file debian.Dockerfile . -t nushell:latest
+# Other tags: nushell:latest-debian
+FROM debian:bookworm-slim
+
+ARG TARGETARCH
+ARG ARCH=${TARGETARCH/arm64/aarch64}
+ARG ARCH=${ARCH/arm/armv7}
+ARG ARCH=${ARCH/amd64/x86_64}
+
+ARG BUILD_REF
+ARG BUILD_DATE
+LABEL maintainer="The Nushell Project Developers" \
+    org.opencontainers.image.licenses="MIT" \
+    org.opencontainers.image.title="Nushell" \
+    org.opencontainers.image.created=$BUILD_DATE \
+    org.opencontainers.image.revision=$BUILD_REF \
+    org.opencontainers.image.authors="The Nushell Project Developers" \
+    org.opencontainers.image.vendor="Nushell Project" \
+    org.opencontainers.image.description="A new type of shell" \
+    org.opencontainers.image.source="https://github.com/nushell/nushell" \
+    org.opencontainers.image.documentation="https://www.nushell.sh/book/"
+
+RUN apt update && apt install -y wget \
+    && cd /tmp \
+    && wget -qO - https://api.github.com/repos/nushell/nushell/releases/latest \
+    | grep browser_download_url \
+    | cut -d '"' -f 4 \
+    | grep ${ARCH}-unknown-linux-gnu \
+    | xargs -I{} wget -q {} \
+    && mkdir nu-latest && tar xvf nu-*.tar.gz --directory=nu-latest \
+    && cp -aR nu-latest/**/* /usr/bin/ \
+    #  Setup nushell user
+    && echo '/usr/bin/nu' >> /etc/shells \
+    && useradd -p '' -s /usr/bin/nu nushell \
+    && mkdir -p /home/nushell/.config/nushell/ \
+    # Setup default config file for nushell
+    && cd /home/nushell/.config/nushell \
+    && chmod +x /usr/bin/nu \
+    && chown -R nushell:nushell /home/nushell/.config/nushell \
+    # Reset Nushell config to default
+    && su -c 'config reset -w' nushell \
+    && ls /usr/bin/nu_plugin* \
+    | xargs -I{} su -c 'plugin add {}' nushell \
+    && rm -rf /tmp/* \
+    && rm -rf /var/lib/apt/lists/*
+
+USER nushell
+
+WORKDIR /home/nushell
+
+ENTRYPOINT ["nu"]

From 79ea70d4ec3a86b466e1d30fed07a648dce6f008 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aaionescu@pm.me>
Date: Tue, 29 Oct 2024 13:43:26 +0100
Subject: [PATCH 0615/1072] Fix quoting in `to nuon` and refactor quoting
 functions (#14180)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

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

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

This PR fixes the quoting and escaping of column names in `to nuon`.
Before the PR, column names with quotes inside them would get quoted,
but not escaped:

```nushell
> { 'a"b': 2 } | to nuon
{ "a"b": 2 }

> { 'a"b': 2 } | to nuon | from nuon
Error:   × error when loading nuon text
   ╭─[entry #1:1:27]
 1 │ { "a\"b": 2 } | to nuon | from nuon
   ·                           ────┬────
   ·                               ╰── could not load nuon text
   ╰────

Error:   × error when parsing nuon text
   ╭─[entry #1:1:27]
 1 │ { "a\"b": 2 } | to nuon | from nuon
   ·                           ────┬────
   ·                               ╰── could not parse nuon text
   ╰────

Error:   × error when parsing
   ╭────
 1 │ {"a"b": 2}
   ·          ┬
   ·          ╰── Unexpected end of code.
   ╰────

> [['a"b']; [2] [3]] | to nuon
[["a"b"]; [2], [3]]

> [['a"b']; [2] [3]] | to nuon | from nuon
Error:   × error when loading nuon text
   ╭─[entry #1:1:32]
 1 │ [['a"b']; [2] [3]] | to nuon | from nuon
   ·                                ────┬────
   ·                                    ╰── could not load nuon text
   ╰────

Error:   × error when parsing nuon text
   ╭─[entry #1:1:32]
 1 │ [['a"b']; [2] [3]] | to nuon | from nuon
   ·                                ────┬────
   ·                                    ╰── could not parse nuon text
   ╰────

Error:   × error when parsing
   ╭────
 1 │ [["a"b"]; [2], [3]]
   ·                   ┬
   ·                   ╰── Unexpected end of code.
   ╰────
```

After this PR, the quote is escaped properly:

```nushell
> { 'a"b': 2 } | to nuon
{ "a\"b": 2 }

> { 'a"b': 2 } | to nuon | from nuon
╭─────┬───╮
│ a"b │ 2 │
╰─────┴───╯

> [['a"b']; [2] [3]] | to nuon
[["a\"b"]; [2], [3]]

> [['a"b']; [2] [3]] | to nuon | from nuon
╭─────╮
│ a"b │
├─────┤
│   2 │
│   3 │
╰─────╯
```

The cause of the issue was that `to nuon` simply wrapped column names in
`'"'` instead of calling `escape_quote_string`.

As part of this change, I also moved the functions related to quoting
(`needs_quoting` and `escape_quote_string`) into `nu-utils`, since
previously they were defined in very ad-hoc places (and, in the case of
`escape_quote_string`, it was defined multiple times with the same
body!).

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

`to nuon` now properly escapes quotes in column names.

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

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

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

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

All tests pass, including workspace and stdlib tests.

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock                           |  6 ++-
 crates/nu-cli/src/util.rs            |  4 +-
 crates/nu-parser/Cargo.toml          |  1 +
 crates/nu-parser/src/deparse.rs      | 17 +-------
 crates/nu-parser/src/lib.rs          |  2 +-
 crates/nu-test-support/src/macros.rs | 16 +------
 crates/nu-utils/Cargo.toml           |  2 +
 crates/nu-utils/src/lib.rs           |  2 +
 crates/nu-utils/src/quoting.rs       | 43 +++++++++++++++++++
 crates/nuon/Cargo.toml               |  3 +-
 crates/nuon/src/to.rs                | 62 +++++++---------------------
 src/command.rs                       |  4 +-
 12 files changed, 76 insertions(+), 86 deletions(-)
 create mode 100644 crates/nu-utils/src/quoting.rs

diff --git a/Cargo.lock b/Cargo.lock
index ac4bdb3ced..6b7f9a1fe6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3317,6 +3317,7 @@ dependencies = [
  "nu-path",
  "nu-plugin-engine",
  "nu-protocol",
+ "nu-utils",
  "rstest",
  "serde_json",
 ]
@@ -3522,10 +3523,12 @@ name = "nu-utils"
 version = "0.99.2"
 dependencies = [
  "crossterm_winapi",
+ "fancy-regex",
  "log",
  "lscolors",
  "nix 0.29.0",
  "num-format",
+ "once_cell",
  "serde",
  "strip-ansi-escapes",
  "sys-locale",
@@ -3755,11 +3758,10 @@ name = "nuon"
 version = "0.99.2"
 dependencies = [
  "chrono",
- "fancy-regex",
  "nu-engine",
  "nu-parser",
  "nu-protocol",
- "once_cell",
+ "nu-utils",
 ]
 
 [[package]]
diff --git a/crates/nu-cli/src/util.rs b/crates/nu-cli/src/util.rs
index 0285664fb9..67bc1ad8ef 100644
--- a/crates/nu-cli/src/util.rs
+++ b/crates/nu-cli/src/util.rs
@@ -1,6 +1,6 @@
 use nu_cmd_base::hook::eval_hook;
 use nu_engine::{eval_block, eval_block_with_early_return};
-use nu_parser::{escape_quote_string, lex, parse, unescape_unquote_string, Token, TokenContents};
+use nu_parser::{lex, parse, unescape_unquote_string, Token, TokenContents};
 use nu_protocol::{
     cli_error::report_compile_error,
     debugger::WithoutDebug,
@@ -10,7 +10,7 @@ use nu_protocol::{
 };
 #[cfg(windows)]
 use nu_utils::enable_vt_processing;
-use nu_utils::perf;
+use nu_utils::{escape_quote_string, perf};
 use std::path::Path;
 
 // This will collect environment variables from std::env and adds them to a stack.
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index 0c331563fa..a64acbbd0b 100644
--- a/crates/nu-parser/Cargo.toml
+++ b/crates/nu-parser/Cargo.toml
@@ -19,6 +19,7 @@ nu-engine = { path = "../nu-engine", version = "0.99.2" }
 nu-path = { path = "../nu-path", version = "0.99.2" }
 nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.99.2" }
 nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
+nu-utils = { path = "../nu-utils", version = "0.99.2" }
 
 bytesize = { workspace = true }
 chrono = { default-features = false, features = ['std'], workspace = true }
diff --git a/crates/nu-parser/src/deparse.rs b/crates/nu-parser/src/deparse.rs
index 2a6339a5cb..a06bc5b6dc 100644
--- a/crates/nu-parser/src/deparse.rs
+++ b/crates/nu-parser/src/deparse.rs
@@ -1,3 +1,5 @@
+use nu_utils::escape_quote_string;
+
 fn string_should_be_quoted(input: &str) -> bool {
     input.starts_with('$')
         || input
@@ -5,21 +7,6 @@ fn string_should_be_quoted(input: &str) -> bool {
             .any(|c| c == ' ' || c == '(' || c == '\'' || c == '`' || c == '"' || c == '\\')
 }
 
-pub fn escape_quote_string(input: &str) -> String {
-    let mut output = String::with_capacity(input.len() + 2);
-    output.push('"');
-
-    for c in input.chars() {
-        if c == '"' || c == '\\' {
-            output.push('\\');
-        }
-        output.push(c);
-    }
-
-    output.push('"');
-    output
-}
-
 // Escape rules:
 // input argument is not a flag, does not start with $ and doesn't contain special characters, it is passed as it is (foo -> foo)
 // input argument is not a flag and either starts with $ or contains special characters, quotes are added, " and \ are escaped (two \words -> "two \\words")
diff --git a/crates/nu-parser/src/lib.rs b/crates/nu-parser/src/lib.rs
index c5d69cb270..8f698f22c9 100644
--- a/crates/nu-parser/src/lib.rs
+++ b/crates/nu-parser/src/lib.rs
@@ -11,7 +11,7 @@ mod parse_shape_specs;
 mod parser;
 mod type_check;
 
-pub use deparse::{escape_for_script_arg, escape_quote_string};
+pub use deparse::escape_for_script_arg;
 pub use flatten::{
     flatten_block, flatten_expression, flatten_pipeline, flatten_pipeline_element, FlatShape,
 };
diff --git a/crates/nu-test-support/src/macros.rs b/crates/nu-test-support/src/macros.rs
index 1ae7ce593e..fdfdabd0b5 100644
--- a/crates/nu-test-support/src/macros.rs
+++ b/crates/nu-test-support/src/macros.rs
@@ -235,6 +235,7 @@ macro_rules! nu_with_plugins {
 
 use crate::{Outcome, NATIVE_PATH_ENV_VAR};
 use nu_path::{AbsolutePath, AbsolutePathBuf, Path, PathBuf};
+use nu_utils::escape_quote_string;
 use std::{
     ffi::OsStr,
     process::{Command, Stdio},
@@ -421,21 +422,6 @@ where
     Outcome::new(out, err.into_owned(), output.status)
 }
 
-fn escape_quote_string(input: &str) -> String {
-    let mut output = String::with_capacity(input.len() + 2);
-    output.push('"');
-
-    for c in input.chars() {
-        if c == '"' || c == '\\' {
-            output.push('\\');
-        }
-        output.push(c);
-    }
-
-    output.push('"');
-    output
-}
-
 fn with_exe(name: &str) -> String {
     #[cfg(windows)]
     {
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index 5f1f3a22ba..d4639805ea 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -17,9 +17,11 @@ bench = false
 bench = false
 
 [dependencies]
+fancy-regex = { workspace = true }
 lscolors = { workspace = true, default-features = false, features = ["nu-ansi-term"] }
 log = { workspace = true }
 num-format = { workspace = true }
+once_cell = { workspace = true }
 strip-ansi-escapes = { workspace = true }
 serde = { workspace = true }
 sys-locale = "0.3"
diff --git a/crates/nu-utils/src/lib.rs b/crates/nu-utils/src/lib.rs
index 0c021f1dc9..4b91d923db 100644
--- a/crates/nu-utils/src/lib.rs
+++ b/crates/nu-utils/src/lib.rs
@@ -4,6 +4,7 @@ mod deansi;
 pub mod emoji;
 pub mod filesystem;
 pub mod locale;
+mod quoting;
 mod shared_cow;
 pub mod utils;
 
@@ -18,6 +19,7 @@ pub use deansi::{
     strip_ansi_likely, strip_ansi_string_likely, strip_ansi_string_unlikely, strip_ansi_unlikely,
 };
 pub use emoji::contains_emoji;
+pub use quoting::{escape_quote_string, needs_quoting};
 pub use shared_cow::SharedCow;
 
 #[cfg(unix)]
diff --git a/crates/nu-utils/src/quoting.rs b/crates/nu-utils/src/quoting.rs
new file mode 100644
index 0000000000..f194095ee6
--- /dev/null
+++ b/crates/nu-utils/src/quoting.rs
@@ -0,0 +1,43 @@
+use fancy_regex::Regex;
+use once_cell::sync::Lazy;
+
+// This hits, in order:
+// • Any character of []:`{}#'";()|$,
+// • Any digit (\d)
+// • Any whitespace (\s)
+// • Case-insensitive sign-insensitive float "keywords" inf, infinity and nan.
+static NEEDS_QUOTING_REGEX: Lazy<Regex> = Lazy::new(|| {
+    Regex::new(r#"[\[\]:`\{\}#'";\(\)\|\$,\d\s]|(?i)^[+\-]?(inf(inity)?|nan)$"#)
+        .expect("internal error: NEEDS_QUOTING_REGEX didn't compile")
+});
+
+pub fn needs_quoting(string: &str) -> bool {
+    if string.is_empty() {
+        return true;
+    }
+    // These are case-sensitive keywords
+    match string {
+        // `true`/`false`/`null` are active keywords in JSON and NUON
+        // `&&` is denied by the nu parser for diagnostics reasons
+        // (https://github.com/nushell/nushell/pull/7241)
+        "true" | "false" | "null" | "&&" => return true,
+        _ => (),
+    };
+    // All other cases are handled here
+    NEEDS_QUOTING_REGEX.is_match(string).unwrap_or(false)
+}
+
+pub fn escape_quote_string(string: &str) -> String {
+    let mut output = String::with_capacity(string.len() + 2);
+    output.push('"');
+
+    for c in string.chars() {
+        if c == '"' || c == '\\' {
+            output.push('\\');
+        }
+        output.push(c);
+    }
+
+    output.push('"');
+    output
+}
diff --git a/crates/nuon/Cargo.toml b/crates/nuon/Cargo.toml
index 795f72b9ef..edaa2d1072 100644
--- a/crates/nuon/Cargo.toml
+++ b/crates/nuon/Cargo.toml
@@ -13,8 +13,7 @@ version = "0.99.2"
 nu-parser = { path = "../nu-parser", version = "0.99.2" }
 nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
 nu-engine = { path = "../nu-engine", version = "0.99.2" }
-once_cell = { workspace = true }
-fancy-regex = { workspace = true }
+nu-utils = { path = "../nu-utils", version = "0.99.2" }
 
 [dev-dependencies]
 chrono = { workspace = true }
diff --git a/crates/nuon/src/to.rs b/crates/nuon/src/to.rs
index 57f208dcc0..c2af51d0bb 100644
--- a/crates/nuon/src/to.rs
+++ b/crates/nuon/src/to.rs
@@ -1,10 +1,8 @@
 use core::fmt::Write;
-use fancy_regex::Regex;
-use once_cell::sync::Lazy;
 
 use nu_engine::get_columns;
-use nu_parser::escape_quote_string;
 use nu_protocol::{Range, ShellError, Span, Value};
+use nu_utils::{escape_quote_string, needs_quoting};
 
 use std::ops::Bound;
 
@@ -129,11 +127,12 @@ fn value_to_string(
                 let headers: Vec<String> = headers
                     .iter()
                     .map(|string| {
-                        if needs_quotes(string) {
-                            format!("{idt}\"{string}\"")
+                        let string = if needs_quoting(string) {
+                            &escape_quote_string(string)
                         } else {
-                            format!("{idt}{string}")
-                        }
+                            string
+                        };
+                        format!("{idt}{string}")
                     })
                     .collect();
                 let headers_output = headers.join(&format!(",{sep}{nl}{idt_pt}"));
@@ -199,19 +198,15 @@ fn value_to_string(
         Value::Record { val, .. } => {
             let mut collection = vec![];
             for (col, val) in &**val {
-                collection.push(if needs_quotes(col) {
-                    format!(
-                        "{idt_po}\"{}\": {}",
-                        col,
-                        value_to_string_without_quotes(val, span, depth + 1, indent)?
-                    )
+                let col = if needs_quoting(col) {
+                    &escape_quote_string(col)
                 } else {
-                    format!(
-                        "{idt_po}{}: {}",
-                        col,
-                        value_to_string_without_quotes(val, span, depth + 1, indent)?
-                    )
-                });
+                    col
+                };
+                collection.push(format!(
+                    "{idt_po}{col}: {}",
+                    value_to_string_without_quotes(val, span, depth + 1, indent)?
+                ));
             }
             Ok(format!(
                 "{{{nl}{}{nl}{idt}}}",
@@ -247,7 +242,7 @@ fn value_to_string_without_quotes(
 ) -> Result<String, ShellError> {
     match v {
         Value::String { val, .. } => Ok({
-            if needs_quotes(val) {
+            if needs_quoting(val) {
                 escape_quote_string(val)
             } else {
                 val.clone()
@@ -256,30 +251,3 @@ fn value_to_string_without_quotes(
         _ => value_to_string(v, span, depth, indent),
     }
 }
-
-// This hits, in order:
-// • Any character of []:`{}#'";()|$,
-// • Any digit (\d)
-// • Any whitespace (\s)
-// • Case-insensitive sign-insensitive float "keywords" inf, infinity and nan.
-static NEEDS_QUOTES_REGEX: Lazy<Regex> = Lazy::new(|| {
-    Regex::new(r#"[\[\]:`\{\}#'";\(\)\|\$,\d\s]|(?i)^[+\-]?(inf(inity)?|nan)$"#)
-        .expect("internal error: NEEDS_QUOTES_REGEX didn't compile")
-});
-
-fn needs_quotes(string: &str) -> bool {
-    if string.is_empty() {
-        return true;
-    }
-    // These are case-sensitive keywords
-    match string {
-        // `true`/`false`/`null` are active keywords in JSON and NUON
-        // `&&` is denied by the nu parser for diagnostics reasons
-        // (https://github.com/nushell/nushell/pull/7241)
-        // TODO: remove the extra check in the nuon codepath
-        "true" | "false" | "null" | "&&" => return true,
-        _ => (),
-    };
-    // All other cases are handled here
-    NEEDS_QUOTES_REGEX.is_match(string).unwrap_or(false)
-}
diff --git a/src/command.rs b/src/command.rs
index 2ba817ac6b..17a78e0342 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -1,11 +1,11 @@
 use nu_engine::{command_prelude::*, get_full_help};
-use nu_parser::{escape_for_script_arg, escape_quote_string, parse};
+use nu_parser::{escape_for_script_arg, parse};
 use nu_protocol::{
     ast::{Expr, Expression},
     engine::StateWorkingSet,
     report_parse_error,
 };
-use nu_utils::stdout_write_all_and_flush;
+use nu_utils::{escape_quote_string, stdout_write_all_and_flush};
 
 pub(crate) fn gather_commandline_args() -> (Vec<String>, String, Vec<String>) {
     // Would be nice if we had a way to parse this. The first flags we see will be going to nushell

From 03015ed33fd95c0df9250a284e72fd0d0c971b5f Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aaionescu@pm.me>
Date: Tue, 29 Oct 2024 14:08:55 +0100
Subject: [PATCH 0616/1072] Show `?` for optional entries when displaying
 `CellPath`s (#14042)

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

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

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

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

This PR makes the `Display` implementation for `CellPath` show a `?`
suffix on every optional entry, which makes the output consistent with
the language syntax.

Before this PR, the printing of cell paths was confusing, e.g. `$.x` and
`$.x?` were both printed as `x`. Now, the second one is printed as `x?`.

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

The formatting of cell paths now matches the syntax used to create them,
reducing confusion.

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

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

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

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

All tests pass, including `stdlib` tests.

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/tests/commands/select.rs | 11 +++++++----
 crates/nu-protocol/src/ast/cell_path.rs    | 10 ++++++++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/crates/nu-command/tests/commands/select.rs b/crates/nu-command/tests/commands/select.rs
index 004aa16d6b..f47845d6ed 100644
--- a/crates/nu-command/tests/commands/select.rs
+++ b/crates/nu-command/tests/commands/select.rs
@@ -166,7 +166,7 @@ fn select_ignores_errors_successfully1() {
 fn select_ignores_errors_successfully2() {
     let actual = nu!("[{a: 1} {a: 2} {a: 3}] | select b? | to nuon");
 
-    assert_eq!(actual.out, "[[b]; [null], [null], [null]]".to_string());
+    assert_eq!(actual.out, "[[b?]; [null], [null], [null]]".to_string());
     assert!(actual.err.is_empty());
 }
 
@@ -174,7 +174,7 @@ fn select_ignores_errors_successfully2() {
 fn select_ignores_errors_successfully3() {
     let actual = nu!("{foo: bar} | select invalid_key? | to nuon");
 
-    assert_eq!(actual.out, "{invalid_key: null}".to_string());
+    assert_eq!(actual.out, "{invalid_key?: null}".to_string());
     assert!(actual.err.is_empty());
 }
 
@@ -184,7 +184,10 @@ fn select_ignores_errors_successfully4() {
         r#""key val\na 1\nb 2\n" | lines | split column --collapse-empty " " | select foo? | to nuon"#
     );
 
-    assert_eq!(actual.out, r#"[[foo]; [null], [null], [null]]"#.to_string());
+    assert_eq!(
+        actual.out,
+        r#"[[foo?]; [null], [null], [null]]"#.to_string()
+    );
     assert!(actual.err.is_empty());
 }
 
@@ -234,7 +237,7 @@ fn ignore_errors_works() {
         [{}] | select -i $path | to nuon
         "#);
 
-    assert_eq!(actual.out, "[[foo]; [null]]");
+    assert_eq!(actual.out, "[[foo?]; [null]]");
 }
 
 #[test]
diff --git a/crates/nu-protocol/src/ast/cell_path.rs b/crates/nu-protocol/src/ast/cell_path.rs
index 0880537557..f208dd8120 100644
--- a/crates/nu-protocol/src/ast/cell_path.rs
+++ b/crates/nu-protocol/src/ast/cell_path.rs
@@ -182,8 +182,14 @@ impl Display for CellPath {
                 write!(f, ".")?;
             }
             match elem {
-                PathMember::Int { val, .. } => write!(f, "{val}")?,
-                PathMember::String { val, .. } => write!(f, "{val}")?,
+                PathMember::Int { val, optional, .. } => {
+                    let question_mark = if *optional { "?" } else { "" };
+                    write!(f, "{val}{question_mark}")?
+                }
+                PathMember::String { val, optional, .. } => {
+                    let question_mark = if *optional { "?" } else { "" };
+                    write!(f, "{val}{question_mark}")?
+                }
             }
         }
         Ok(())

From 74bd0e32cc5fef5149856616f49b796eef786aa4 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Tue, 29 Oct 2024 10:14:54 -0400
Subject: [PATCH 0617/1072] `ansi -l` includes previews of attributes (e.g.,
 bold, dimmed, blink, etc.) (#14196)

# Description

A few simple changes:

* Extends the range of previews to include the attributes - Bold,
italic, underline, etc.
* Also resets the colors before *every* preview. Previously we weren't
doing this, so the "string" theme color was bleeding into a few previews
(mostly, if not all, `bg` ones). Now the "default foreground" color is
used for any preview without an explicit foreground color.
* Moves the preview code into the `if use_ansi_coloring` block as a
stupid-nitpick optimization. There's no reason to populate the previews
when they are explicitly not shown with `use_ansi_coloring: false`.
* Moves `reset` to the bottom of the attribute list so that it isn't
previewed. This is a bit of a nitpick as well since internally we send
the same code for both a `reset` and `attr_normal` (which is correct),
but semantically a `reset` doesn't seem like a "previewable" thing,
whereas "normal" text can be demonstrated with a preview.

# User-Facing Changes

`ansi -l` now shows additional previews

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

N/A
---
 crates/nu-command/src/platform/ansi/ansi_.rs | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/crates/nu-command/src/platform/ansi/ansi_.rs b/crates/nu-command/src/platform/ansi/ansi_.rs
index 13c229a456..a7bb37036f 100644
--- a/crates/nu-command/src/platform/ansi/ansi_.rs
+++ b/crates/nu-command/src/platform/ansi/ansi_.rs
@@ -425,8 +425,6 @@ static CODE_LIST: Lazy<Vec<AnsiCode>> = Lazy::new(|| { vec![
     AnsiCode { short_name: Some("grey89"), long_name: "xterm_grey89", code: Color::Fixed(254).prefix().to_string()},
     AnsiCode { short_name: Some("grey93"), long_name: "xterm_grey93", code: Color::Fixed(255).prefix().to_string()},
 
-    AnsiCode{ short_name: None, long_name: "reset", code: "\x1b[0m".to_owned()},
-
     // Attributes
     AnsiCode { short_name: Some("n"), long_name: "attr_normal", code: Color::Green.suffix().to_string()},
     AnsiCode { short_name: Some("bo"), long_name: "attr_bold", code: Style::new().bold().prefix().to_string()},
@@ -437,6 +435,8 @@ static CODE_LIST: Lazy<Vec<AnsiCode>> = Lazy::new(|| { vec![
     AnsiCode { short_name: Some("h"), long_name: "attr_hidden", code: Style::new().hidden().prefix().to_string()},
     AnsiCode { short_name: Some("s"), long_name: "attr_strike", code: Style::new().strikethrough().prefix().to_string()},
 
+    AnsiCode{ short_name: None, long_name: "reset", code: "\x1b[0m".to_owned()},
+
     // Reference for ansi codes https://gist.github.com/fnky/458719343aabd01cfb17a3a4f7296797
     // Another good reference http://ascii-table.com/ansi-escape-sequences.php
 
@@ -842,15 +842,19 @@ fn generate_ansi_code_list(
         .map(move |(i, ansi_code)| {
             let name = Value::string(ansi_code.long_name, call_span);
             let short_name = Value::string(ansi_code.short_name.unwrap_or(""), call_span);
-            // The first 102 items in the ansi array are colors
-            let preview = if i < 389 {
-                Value::string(format!("{}NUSHELL\u{1b}[0m", &ansi_code.code), call_span)
-            } else {
-                Value::string("\u{1b}[0m", call_span)
-            };
             let code = Value::string(ansi_code.code.replace('\u{1b}', "\\e"), call_span);
 
             let record = if use_ansi_coloring {
+                // The first 397 items in the ansi array are previewable
+                let preview = if i < 397 {
+                    Value::string(
+                        format!("\u{1b}[0m{}NUSHELL\u{1b}[0m", &ansi_code.code),
+                        call_span,
+                    )
+                } else {
+                    Value::string("\u{1b}[0m", call_span)
+                };
+
                 record! {
                     "name" => name,
                     "preview" => preview,

From e104bccfb94e5572c4c138ce59121ed84456d7d0 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aaionescu@pm.me>
Date: Tue, 29 Oct 2024 17:33:46 +0100
Subject: [PATCH 0618/1072] Drop `once_cell` dependency (#14198)

This PR drops the `once_cell` dependency from all Nu crates, replacing
uses of the
[`Lazy`](https://docs.rs/once_cell/latest/once_cell/sync/struct.Lazy.html)
type with its `std` equivalent,
[`LazyLock`](https://doc.rust-lang.org/std/sync/struct.LazyLock.html).
---
 Cargo.lock                                    |  6 -----
 Cargo.toml                                    |  1 -
 crates/nu-cli/Cargo.toml                      |  1 -
 crates/nu-cli/src/repl.rs                     |  7 +++--
 crates/nu-command/Cargo.toml                  |  1 -
 .../nu-command/src/conversions/into/value.rs  | 27 ++++++++++---------
 crates/nu-command/src/platform/ansi/ansi_.rs  |  8 +++---
 crates/nu-command/src/platform/ulimit.rs      |  4 +--
 crates/nu-command/src/strings/char_.rs        |  6 ++---
 .../src/strings/encode_decode/decode.rs       |  4 +--
 crates/nu-command/src/viewers/icons.rs        |  4 +--
 crates/nu-explore/Cargo.toml                  |  1 -
 crates/nu-explore/src/commands/help.rs        |  4 +--
 crates/nu-system/Cargo.toml                   |  1 -
 crates/nu-system/src/windows.rs               |  4 +--
 crates/nu-table/Cargo.toml                    |  1 -
 crates/nu-table/src/util.rs                   | 12 +++++----
 crates/nu-utils/Cargo.toml                    |  1 -
 crates/nu-utils/src/quoting.rs                |  4 +--
 19 files changed, 44 insertions(+), 53 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6b7f9a1fe6..0237c42ca5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3020,7 +3020,6 @@ dependencies = [
  "nu-protocol",
  "nu-test-support",
  "nu-utils",
- "once_cell",
  "percent-encoding",
  "reedline",
  "rstest",
@@ -3164,7 +3163,6 @@ dependencies = [
  "num-traits",
  "nuon",
  "oem_cp",
- "once_cell",
  "open",
  "os_pipe",
  "pathdiff",
@@ -3257,7 +3255,6 @@ dependencies = [
  "nu-protocol",
  "nu-table",
  "nu-utils",
- "once_cell",
  "ratatui",
  "strip-ansi-escapes",
  "terminal_size",
@@ -3477,7 +3474,6 @@ dependencies = [
  "mach2",
  "nix 0.29.0",
  "ntapi",
- "once_cell",
  "procfs",
  "sysinfo 0.32.0",
  "windows",
@@ -3493,7 +3489,6 @@ dependencies = [
  "nu-engine",
  "nu-protocol",
  "nu-utils",
- "once_cell",
  "tabled",
  "terminal_size",
 ]
@@ -3528,7 +3523,6 @@ dependencies = [
  "lscolors",
  "nix 0.29.0",
  "num-format",
- "once_cell",
  "serde",
  "strip-ansi-escapes",
  "sys-locale",
diff --git a/Cargo.toml b/Cargo.toml
index 0390bc956b..de6aa22211 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -119,7 +119,6 @@ num-format = "0.4"
 num-traits = "0.2"
 oem_cp = "2.0.0"
 omnipath = "0.1"
-once_cell = "1.20"
 open = "5.3"
 os_pipe = { version = "1.2", features = ["io_safety"] }
 pathdiff = "0.2"
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 9529691c24..0379740168 100644
--- a/crates/nu-cli/Cargo.toml
+++ b/crates/nu-cli/Cargo.toml
@@ -38,7 +38,6 @@ is_executable = { workspace = true }
 log = { workspace = true }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
 lscolors = { workspace = true, default-features = false, features = ["nu-ansi-term"] }
-once_cell = { workspace = true }
 percent-encoding = { workspace = true }
 sysinfo = { workspace = true }
 unicode-segmentation = { workspace = true }
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 1498d0a572..4eb67f4036 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -1358,10 +1358,9 @@ fn run_finaliziation_ansi_sequence(
 
 // Absolute paths with a drive letter, like 'C:', 'D:\', 'E:\foo'
 #[cfg(windows)]
-static DRIVE_PATH_REGEX: once_cell::sync::Lazy<fancy_regex::Regex> =
-    once_cell::sync::Lazy::new(|| {
-        fancy_regex::Regex::new(r"^[a-zA-Z]:[/\\]?").expect("Internal error: regex creation")
-    });
+static DRIVE_PATH_REGEX: std::sync::LazyLock<fancy_regex::Regex> = std::sync::LazyLock::new(|| {
+    fancy_regex::Regex::new(r"^[a-zA-Z]:[/\\]?").expect("Internal error: regex creation")
+});
 
 // A best-effort "does this string look kinda like a path?" function to determine whether to auto-cd
 fn looks_like_path(orig: &str) -> bool {
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 8d6e704ead..d4d31338b3 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -67,7 +67,6 @@ notify-debouncer-full = { workspace = true, default-features = false }
 num-format = { workspace = true }
 num-traits = { workspace = true }
 oem_cp = { workspace = true }
-once_cell = { workspace = true }
 open = { workspace = true }
 os_pipe = { workspace = true }
 pathdiff = { workspace = true }
diff --git a/crates/nu-command/src/conversions/into/value.rs b/crates/nu-command/src/conversions/into/value.rs
index 99b1daf4b7..2d5ae3b17d 100644
--- a/crates/nu-command/src/conversions/into/value.rs
+++ b/crates/nu-command/src/conversions/into/value.rs
@@ -1,9 +1,9 @@
 use crate::parse_date_from_string;
 use nu_engine::command_prelude::*;
 use nu_protocol::PipelineIterator;
-use once_cell::sync::Lazy;
 use regex::{Regex, RegexBuilder};
 use std::collections::HashSet;
+use std::sync::LazyLock;
 
 #[derive(Clone)]
 pub struct IntoValue;
@@ -271,8 +271,9 @@ const DATETIME_DMY_PATTERN: &str = r#"(?x)
         $
         "#;
 
-static DATETIME_DMY_RE: Lazy<Regex> =
-    Lazy::new(|| Regex::new(DATETIME_DMY_PATTERN).expect("datetime_dmy_pattern should be valid"));
+static DATETIME_DMY_RE: LazyLock<Regex> = LazyLock::new(|| {
+    Regex::new(DATETIME_DMY_PATTERN).expect("datetime_dmy_pattern should be valid")
+});
 const DATETIME_YMD_PATTERN: &str = r#"(?x)
         ^
         ['"]?                      # optional quotes
@@ -297,8 +298,9 @@ const DATETIME_YMD_PATTERN: &str = r#"(?x)
         ['"]?                      # optional quotes
         $
         "#;
-static DATETIME_YMD_RE: Lazy<Regex> =
-    Lazy::new(|| Regex::new(DATETIME_YMD_PATTERN).expect("datetime_ymd_pattern should be valid"));
+static DATETIME_YMD_RE: LazyLock<Regex> = LazyLock::new(|| {
+    Regex::new(DATETIME_YMD_PATTERN).expect("datetime_ymd_pattern should be valid")
+});
 //2023-03-24 16:44:17.865147299 -05:00
 const DATETIME_YMDZ_PATTERN: &str = r#"(?x)
         ^
@@ -331,23 +333,24 @@ const DATETIME_YMDZ_PATTERN: &str = r#"(?x)
         ['"]?                  # optional quotes
         $
         "#;
-static DATETIME_YMDZ_RE: Lazy<Regex> =
-    Lazy::new(|| Regex::new(DATETIME_YMDZ_PATTERN).expect("datetime_ymdz_pattern should be valid"));
+static DATETIME_YMDZ_RE: LazyLock<Regex> = LazyLock::new(|| {
+    Regex::new(DATETIME_YMDZ_PATTERN).expect("datetime_ymdz_pattern should be valid")
+});
 
-static FLOAT_RE: Lazy<Regex> = Lazy::new(|| {
+static FLOAT_RE: LazyLock<Regex> = LazyLock::new(|| {
     Regex::new(r"^\s*[-+]?((\d*\.\d+)([eE][-+]?\d+)?|inf|NaN|(\d+)[eE][-+]?\d+|\d+\.)$")
         .expect("float pattern should be valid")
 });
 
-static INTEGER_RE: Lazy<Regex> =
-    Lazy::new(|| Regex::new(r"^\s*-?(\d+)$").expect("integer pattern should be valid"));
+static INTEGER_RE: LazyLock<Regex> =
+    LazyLock::new(|| Regex::new(r"^\s*-?(\d+)$").expect("integer pattern should be valid"));
 
-static INTEGER_WITH_DELIMS_RE: Lazy<Regex> = Lazy::new(|| {
+static INTEGER_WITH_DELIMS_RE: LazyLock<Regex> = LazyLock::new(|| {
     Regex::new(r"^\s*-?(\d{1,3}([,_]\d{3})+)$")
         .expect("integer with delimiters pattern should be valid")
 });
 
-static BOOLEAN_RE: Lazy<Regex> = Lazy::new(|| {
+static BOOLEAN_RE: LazyLock<Regex> = LazyLock::new(|| {
     RegexBuilder::new(r"^\s*(true)$|^(false)$")
         .case_insensitive(true)
         .build()
diff --git a/crates/nu-command/src/platform/ansi/ansi_.rs b/crates/nu-command/src/platform/ansi/ansi_.rs
index a7bb37036f..fe66cb9e15 100644
--- a/crates/nu-command/src/platform/ansi/ansi_.rs
+++ b/crates/nu-command/src/platform/ansi/ansi_.rs
@@ -1,8 +1,8 @@
 use nu_ansi_term::*;
 use nu_engine::command_prelude::*;
 use nu_protocol::{engine::StateWorkingSet, Signals};
-use once_cell::sync::Lazy;
 use std::collections::HashMap;
+use std::sync::LazyLock;
 
 #[derive(Clone)]
 pub struct AnsiCommand;
@@ -14,7 +14,7 @@ struct AnsiCode {
 }
 
 #[rustfmt::skip]
-static CODE_LIST: Lazy<Vec<AnsiCode>> = Lazy::new(|| { vec![
+static CODE_LIST: LazyLock<Vec<AnsiCode>> = LazyLock::new(|| { vec![
     AnsiCode{ short_name: Some("g"), long_name: "green", code: Color::Green.prefix().to_string()},
     AnsiCode{ short_name: Some("gb"), long_name: "green_bold", code: Color::Green.bold().prefix().to_string()},
     AnsiCode{ short_name: Some("gu"), long_name: "green_underline", code: Color::Green.underline().prefix().to_string()},
@@ -494,8 +494,8 @@ static CODE_LIST: Lazy<Vec<AnsiCode>> = Lazy::new(|| { vec![
     ]
 });
 
-static CODE_MAP: Lazy<HashMap<&'static str, &'static str>> =
-    Lazy::new(|| build_ansi_hashmap(&CODE_LIST));
+static CODE_MAP: LazyLock<HashMap<&'static str, &'static str>> =
+    LazyLock::new(|| build_ansi_hashmap(&CODE_LIST));
 
 impl Command for AnsiCommand {
     fn name(&self) -> &str {
diff --git a/crates/nu-command/src/platform/ulimit.rs b/crates/nu-command/src/platform/ulimit.rs
index 871633efc4..b908e8b3c1 100644
--- a/crates/nu-command/src/platform/ulimit.rs
+++ b/crates/nu-command/src/platform/ulimit.rs
@@ -1,7 +1,7 @@
 use nix::sys::resource::{rlim_t, Resource, RLIM_INFINITY};
 use nu_engine::command_prelude::*;
 
-use once_cell::sync::Lazy;
+use std::sync::LazyLock;
 
 /// An object contains resource related parameters
 struct ResourceInfo<'a> {
@@ -54,7 +54,7 @@ impl<'a> Default for ResourceInfo<'a> {
     }
 }
 
-static RESOURCE_ARRAY: Lazy<Vec<ResourceInfo>> = Lazy::new(|| {
+static RESOURCE_ARRAY: LazyLock<Vec<ResourceInfo>> = LazyLock::new(|| {
     let resources = [
         #[cfg(any(target_os = "freebsd", target_os = "dragonfly"))]
         (
diff --git a/crates/nu-command/src/strings/char_.rs b/crates/nu-command/src/strings/char_.rs
index 889efa2c27..ef27d221d8 100644
--- a/crates/nu-command/src/strings/char_.rs
+++ b/crates/nu-command/src/strings/char_.rs
@@ -2,8 +2,8 @@ use indexmap::{indexmap, IndexMap};
 use nu_engine::command_prelude::*;
 
 use nu_protocol::Signals;
-use once_cell::sync::Lazy;
 use std::collections::HashSet;
+use std::sync::LazyLock;
 
 // Character used to separate directories in a Path Environment variable on windows is ";"
 #[cfg(target_family = "windows")]
@@ -15,7 +15,7 @@ const ENV_PATH_SEPARATOR_CHAR: char = ':';
 #[derive(Clone)]
 pub struct Char;
 
-static CHAR_MAP: Lazy<IndexMap<&'static str, String>> = Lazy::new(|| {
+static CHAR_MAP: LazyLock<IndexMap<&'static str, String>> = LazyLock::new(|| {
     indexmap! {
         // These are some regular characters that either can't be used or
         // it's just easier to use them like this.
@@ -150,7 +150,7 @@ static CHAR_MAP: Lazy<IndexMap<&'static str, String>> = Lazy::new(|| {
     }
 });
 
-static NO_OUTPUT_CHARS: Lazy<HashSet<&'static str>> = Lazy::new(|| {
+static NO_OUTPUT_CHARS: LazyLock<HashSet<&'static str>> = LazyLock::new(|| {
     [
         // If the character is in the this set, we don't output it to prevent
         // the broken of `char --list` command table format and alignment.
diff --git a/crates/nu-command/src/strings/encode_decode/decode.rs b/crates/nu-command/src/strings/encode_decode/decode.rs
index 169667645d..485cc98671 100644
--- a/crates/nu-command/src/strings/encode_decode/decode.rs
+++ b/crates/nu-command/src/strings/encode_decode/decode.rs
@@ -1,12 +1,12 @@
 use nu_engine::command_prelude::*;
 use oem_cp::decode_string_complete_table;
-use once_cell::sync::Lazy;
 use std::collections::HashMap;
+use std::sync::LazyLock;
 
 // create a lazycell of all the code_table "Complete" code pages
 // the commented out code pages are "Incomplete", which means they
 // are stored as Option<char> and not &[char; 128]
-static OEM_DECODE: Lazy<HashMap<usize, &[char; 128]>> = Lazy::new(|| {
+static OEM_DECODE: LazyLock<HashMap<usize, &[char; 128]>> = LazyLock::new(|| {
     let mut m = HashMap::new();
     m.insert(437, &oem_cp::code_table::DECODING_TABLE_CP437);
     // m.insert(720, &oem_cp::code_table::DECODING_TABLE_CP720);
diff --git a/crates/nu-command/src/viewers/icons.rs b/crates/nu-command/src/viewers/icons.rs
index db3adb153c..5ab11ed213 100644
--- a/crates/nu-command/src/viewers/icons.rs
+++ b/crates/nu-command/src/viewers/icons.rs
@@ -1,5 +1,5 @@
 use nu_protocol::{ShellError, Span};
-use once_cell::sync::Lazy;
+use std::sync::LazyLock;
 use std::{collections::HashMap, path::Path};
 
 // Attribution: Thanks exa. Most of this file is taken from around here
@@ -84,7 +84,7 @@ impl Icons {
 //         .unwrap_or_default()
 // }
 
-static MAP_BY_NAME: Lazy<HashMap<&'static str, char>> = Lazy::new(|| {
+static MAP_BY_NAME: LazyLock<HashMap<&'static str, char>> = LazyLock::new(|| {
     [
         (".Trash", '\u{f1f8}'),             // 
         (".atom", '\u{e764}'),              // 
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index 4a62816379..da3beb68b8 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -30,7 +30,6 @@ log = { workspace = true }
 terminal_size = { workspace = true }
 strip-ansi-escapes = { workspace = true }
 crossterm = { workspace = true }
-once_cell = { workspace = true }
 ratatui = { workspace = true }
 ansi-str = { workspace = true }
 unicode-width = { workspace = true }
diff --git a/crates/nu-explore/src/commands/help.rs b/crates/nu-explore/src/commands/help.rs
index 721c2924a5..63c24969ec 100644
--- a/crates/nu-explore/src/commands/help.rs
+++ b/crates/nu-explore/src/commands/help.rs
@@ -7,7 +7,7 @@ use nu_protocol::{
     Value,
 };
 
-use once_cell::sync::Lazy;
+use std::sync::LazyLock;
 
 #[derive(Debug, Default, Clone)]
 pub struct HelpCmd {}
@@ -19,7 +19,7 @@ impl HelpCmd {
     }
 }
 
-static HELP_MESSAGE: Lazy<String> = Lazy::new(|| {
+static HELP_MESSAGE: LazyLock<String> = LazyLock::new(|| {
     let title = nu_ansi_term::Style::new().bold().underline();
     let code = nu_ansi_term::Style::new().bold().fg(Color::Blue);
 
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index bf83b9155e..4ac5cccb8d 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -34,7 +34,6 @@ mach2 = { workspace = true }
 [target.'cfg(target_os = "windows")'.dependencies]
 chrono = { workspace = true, default-features = false, features = ["clock"] }
 ntapi = "0.4"
-once_cell = { workspace = true }
 windows = { workspace = true, features = [
   "Wdk_System_SystemServices",
   "Wdk_System_Threading",
diff --git a/crates/nu-system/src/windows.rs b/crates/nu-system/src/windows.rs
index cd689b77c4..59e2a77751 100644
--- a/crates/nu-system/src/windows.rs
+++ b/crates/nu-system/src/windows.rs
@@ -8,7 +8,6 @@ use libc::c_void;
 use ntapi::ntrtl::RTL_USER_PROCESS_PARAMETERS;
 use ntapi::ntwow64::{PEB32, RTL_USER_PROCESS_PARAMETERS32};
 
-use once_cell::sync::Lazy;
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::ffi::OsString;
@@ -17,6 +16,7 @@ use std::os::windows::ffi::OsStringExt;
 use std::path::PathBuf;
 use std::ptr;
 use std::ptr::null_mut;
+use std::sync::LazyLock;
 use std::thread;
 use std::time::{Duration, Instant};
 
@@ -694,7 +694,7 @@ unsafe fn get_process_params(
     ))
 }
 
-static WINDOWS_8_1_OR_NEWER: Lazy<bool> = Lazy::new(|| unsafe {
+static WINDOWS_8_1_OR_NEWER: LazyLock<bool> = LazyLock::new(|| unsafe {
     let mut version_info: OSVERSIONINFOEXW = MaybeUninit::zeroed().assume_init();
 
     version_info.dwOSVersionInfoSize = std::mem::size_of::<OSVERSIONINFOEXW>() as u32;
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index 2bce1125f1..b0fdf92273 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -19,7 +19,6 @@ nu-utils = { path = "../nu-utils", version = "0.99.2" }
 nu-engine = { path = "../nu-engine", version = "0.99.2" }
 nu-color-config = { path = "../nu-color-config", version = "0.99.2" }
 nu-ansi-term = { workspace = true }
-once_cell = { workspace = true }
 fancy-regex = { workspace = true }
 tabled = { workspace = true, features = ["ansi"], default-features = false }
 terminal_size = { workspace = true }
diff --git a/crates/nu-table/src/util.rs b/crates/nu-table/src/util.rs
index a40d6625be..feb9a59616 100644
--- a/crates/nu-table/src/util.rs
+++ b/crates/nu-table/src/util.rs
@@ -91,12 +91,14 @@ fn colorize_lead_trail_space(
 fn colorize_space_one(text: &str, lead: Option<ANSIStr<'_>>, trail: Option<ANSIStr<'_>>) -> String {
     use fancy_regex::Captures;
     use fancy_regex::Regex;
-    use once_cell::sync::Lazy;
+    use std::sync::LazyLock;
 
-    static RE_LEADING: Lazy<Regex> =
-        Lazy::new(|| Regex::new(r"(?m)(?P<beginsp>^\s+)").expect("error with leading space regex"));
-    static RE_TRAILING: Lazy<Regex> =
-        Lazy::new(|| Regex::new(r"(?m)(?P<endsp>\s+$)").expect("error with trailing space regex"));
+    static RE_LEADING: LazyLock<Regex> = LazyLock::new(|| {
+        Regex::new(r"(?m)(?P<beginsp>^\s+)").expect("error with leading space regex")
+    });
+    static RE_TRAILING: LazyLock<Regex> = LazyLock::new(|| {
+        Regex::new(r"(?m)(?P<endsp>\s+$)").expect("error with trailing space regex")
+    });
 
     let mut buf = text.to_owned();
 
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index d4639805ea..2c2cb2b10d 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -21,7 +21,6 @@ fancy-regex = { workspace = true }
 lscolors = { workspace = true, default-features = false, features = ["nu-ansi-term"] }
 log = { workspace = true }
 num-format = { workspace = true }
-once_cell = { workspace = true }
 strip-ansi-escapes = { workspace = true }
 serde = { workspace = true }
 sys-locale = "0.3"
diff --git a/crates/nu-utils/src/quoting.rs b/crates/nu-utils/src/quoting.rs
index f194095ee6..baff52caeb 100644
--- a/crates/nu-utils/src/quoting.rs
+++ b/crates/nu-utils/src/quoting.rs
@@ -1,12 +1,12 @@
 use fancy_regex::Regex;
-use once_cell::sync::Lazy;
+use std::sync::LazyLock;
 
 // This hits, in order:
 // • Any character of []:`{}#'";()|$,
 // • Any digit (\d)
 // • Any whitespace (\s)
 // • Case-insensitive sign-insensitive float "keywords" inf, infinity and nan.
-static NEEDS_QUOTING_REGEX: Lazy<Regex> = Lazy::new(|| {
+static NEEDS_QUOTING_REGEX: LazyLock<Regex> = LazyLock::new(|| {
     Regex::new(r#"[\[\]:`\{\}#'";\(\)\|\$,\d\s]|(?i)^[+\-]?(inf(inity)?|nan)$"#)
         .expect("internal error: NEEDS_QUOTING_REGEX didn't compile")
 });

From 91da168251ae3c448eb79b08aa218fd1ca16481c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 30 Oct 2024 10:50:41 +0800
Subject: [PATCH 0619/1072] Bump crate-ci/typos from 1.26.0 to 1.26.8 (#14203)

Bumps [crate-ci/typos](https://github.com/crate-ci/typos) from 1.26.0 to
1.26.8.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/crate-ci/typos/releases">crate-ci/typos's
releases</a>.</em></p>
<blockquote>
<h2>v1.26.8</h2>
<h2>[1.26.8] - 2024-10-24</h2>
<h2>v1.26.3</h2>
<h2>[1.26.3] - 2024-10-24</h2>
<h3>Fixes</h3>
<ul>
<li>Accept <code>additionals</code></li>
</ul>
<h2>v1.26.2</h2>
<h2>[1.26.2] - 2024-10-24</h2>
<h3>Fixes</h3>
<ul>
<li>Accept <code>tesselate</code> variants</li>
</ul>
<h2>v1.26.1</h2>
<h2>[1.26.1] - 2024-10-23</h2>
<h3>Fixes</h3>
<ul>
<li>Respect <code>--force-exclude</code> for binary files</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/crate-ci/typos/blob/master/CHANGELOG.md">crate-ci/typos's
changelog</a>.</em></p>
<blockquote>
<h2>[1.26.8] - 2024-10-24</h2>
<h2>[1.26.7] - 2024-10-24</h2>
<h2>[1.26.6] - 2024-10-24</h2>
<h2>[1.26.5] - 2024-10-24</h2>
<h2>[1.26.4] - 2024-10-24</h2>
<h2>[1.26.3] - 2024-10-24</h2>
<h3>Fixes</h3>
<ul>
<li>Accept <code>additionals</code></li>
</ul>
<h2>[1.26.2] - 2024-10-24</h2>
<h3>Fixes</h3>
<ul>
<li>Accept <code>tesselate</code> variants</li>
</ul>
<h2>[1.26.1] - 2024-10-23</h2>
<h3>Fixes</h3>
<ul>
<li>Respect <code>--force-exclude</code> for binary files</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/crate-ci/typos/commit/0d9e0c2c1bd7f770f6eb90f87780848ca02fc12c"><code>0d9e0c2</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/e5385b07a020af945231c06d33ec490fb77fc7b0"><code>e5385b0</code></a>
chore(ci): Fix new release process</li>
<li><a
href="https://github.com/crate-ci/typos/commit/f08d1171e28430953c39c15beb330811e20ecfe2"><code>f08d117</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/e6e172498c285b815f8cbe3ada1bf51f02fd3b9a"><code>e6e1724</code></a>
chore(ci): Fix new release process</li>
<li><a
href="https://github.com/crate-ci/typos/commit/02afc59fd4633b33c1f7b14b96f46402477dcc75"><code>02afc59</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/f981a1cd200c62b7ce895f09d269b3ee688ccad9"><code>f981a1c</code></a>
chore(ci): Fix new release process</li>
<li><a
href="https://github.com/crate-ci/typos/commit/afbc96c5d3760227ecd31b4ed5f80415beeaaa86"><code>afbc96c</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/d3dcaaeb2d5bb61eadbd393a8803745af7c81290"><code>d3dcaae</code></a>
chore(ci): Fix new release process</li>
<li><a
href="https://github.com/crate-ci/typos/commit/fb8217bd5e6531ce9c1992dd571f7f23d8fdc9c4"><code>fb8217b</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/88ea8ea67dcd07e71f5c9e397a2669c639786dd8"><code>88ea8ea</code></a>
chore(ci): Stage releases until done</li>
<li>Additional commits viewable in <a
href="https://github.com/crate-ci/typos/compare/v1.26.0...v1.26.8">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=crate-ci/typos&package-manager=github_actions&previous-version=1.26.0&new-version=1.26.8)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/typos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index c7f3178825..3d5dd8f8e5 100644
--- 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.26.0
+        uses: crate-ci/typos@v1.26.8

From 599f16f15c10d97ad359698e925dd1d1451ba8d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 30 Oct 2024 10:51:06 +0800
Subject: [PATCH 0620/1072] Bump unicase from 2.7.0 to 2.8.0 (#14208)

Bumps [unicase](https://github.com/seanmonstar/unicase) from 2.7.0 to
2.8.0.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/seanmonstar/unicase/commit/d98191176d88ef62ffe65eda65b0b5cb70a2b1e3"><code>d981911</code></a>
v2.8.0</li>
<li><a
href="https://github.com/seanmonstar/unicase/commit/b825f9ed9f5a69f35aaa75992c596311c0faa08b"><code>b825f9e</code></a>
upgrade to unicode 16</li>
<li><a
href="https://github.com/seanmonstar/unicase/commit/a86a4669aae07c94f3fc8e9347dcf680bf895af1"><code>a86a466</code></a>
update to 2018 edition</li>
<li><a
href="https://github.com/seanmonstar/unicase/commit/8dc84ec6f13eae71c8d42e3b6e6d2c5ea249ed69"><code>8dc84ec</code></a>
Make license metadata SPDX compliant</li>
<li><a
href="https://github.com/seanmonstar/unicase/commit/07f81c14cd6a146f4b86e033999919a5159255c7"><code>07f81c1</code></a>
feat: add to_folded_case() method</li>
<li>See full diff in <a
href="https://github.com/seanmonstar/unicase/compare/v2.7.0...v2.8.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=unicase&package-manager=cargo&previous-version=2.7.0&new-version=2.8.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                 | 7 ++-----
 crates/nu-utils/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0237c42ca5..39778edb6a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6591,12 +6591,9 @@ dependencies = [
 
 [[package]]
 name = "unicase"
-version = "2.7.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
-dependencies = [
- "version_check",
-]
+checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df"
 
 [[package]]
 name = "unicode-bidi"
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index 2c2cb2b10d..a2a608fbaf 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -24,7 +24,7 @@ num-format = { workspace = true }
 strip-ansi-escapes = { workspace = true }
 serde = { workspace = true }
 sys-locale = "0.3"
-unicase = "2.7.0"
+unicase = "2.8.0"
 
 [target.'cfg(windows)'.dependencies]
 crossterm_winapi = "0.9"

From 1e2fa68db0f7e877fe9c4cd95ab16f1c0df793e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 30 Oct 2024 10:51:21 +0800
Subject: [PATCH 0621/1072] Bump fancy-regex from 0.13.0 to 0.14.0 (#14207)

Bumps [fancy-regex](https://github.com/fancy-regex/fancy-regex) from
0.13.0 to 0.14.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/fancy-regex/fancy-regex/releases">fancy-regex's
releases</a>.</em></p>
<blockquote>
<h2>0.14.0</h2>
<h3>Added</h3>
<ul>
<li>Add <code>split</code>, <code>splitn</code> methods to
<code>Regex</code> to split a string into substrings (<a
href="https://redirect.github.com/fancy-regex/fancy-regex/issues/140">#140</a>)</li>
<li>Add <code>case_insensitive</code> method to
<code>RegexBuilder</code> to force case-insensitive mode (<a
href="https://redirect.github.com/fancy-regex/fancy-regex/issues/132">#132</a>)</li>
</ul>
<h3>Changed</h3>
<ul>
<li>Bump bit-set dependency to 0.8 (<a
href="https://redirect.github.com/fancy-regex/fancy-regex/issues/139">#139</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/fancy-regex/fancy-regex/blob/main/CHANGELOG.md">fancy-regex's
changelog</a>.</em></p>
<blockquote>
<h2>[0.14.0] - 2024-10-24</h2>
<h3>Added</h3>
<ul>
<li>Add <code>split</code>, <code>splitn</code> methods to
<code>Regex</code> to split a string into substrings (<a
href="https://redirect.github.com/fancy-regex/fancy-regex/issues/140">#140</a>)</li>
<li>Add <code>case_insensitive</code> method to
<code>RegexBuilder</code> to force case-insensitive mode (<a
href="https://redirect.github.com/fancy-regex/fancy-regex/issues/132">#132</a>)</li>
</ul>
<h3>Changed</h3>
<ul>
<li>Bump bit-set dependency to 0.8 (<a
href="https://redirect.github.com/fancy-regex/fancy-regex/issues/139">#139</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/fancy-regex/fancy-regex/commit/810a8f3c1662ea33f8dbfb1864d31aa0d2da6c3c"><code>810a8f3</code></a>
Version 0.14.0</li>
<li><a
href="https://github.com/fancy-regex/fancy-regex/commit/33597bdd7bf9b6fc7829ecb2a1975fcdf9090373"><code>33597bd</code></a>
Merge pull request <a
href="https://redirect.github.com/fancy-regex/fancy-regex/issues/145">#145</a>
from fancy-regex/bump-tarpaulin</li>
<li><a
href="https://github.com/fancy-regex/fancy-regex/commit/1a6c0f813d4016ecbee776a9fbcf6bbbbb7207b9"><code>1a6c0f8</code></a>
Bump tarpaulin</li>
<li><a
href="https://github.com/fancy-regex/fancy-regex/commit/2f0f000de957764c643149fef1411639cc459d45"><code>2f0f000</code></a>
Merge pull request <a
href="https://redirect.github.com/fancy-regex/fancy-regex/issues/144">#144</a>
from k94-ishi/dev/splitn</li>
<li><a
href="https://github.com/fancy-regex/fancy-regex/commit/689a8451125d57a02841f8f0d13ca0522cfb9584"><code>689a845</code></a>
Merge pull request <a
href="https://redirect.github.com/fancy-regex/fancy-regex/issues/132">#132</a>
from jonperry-dev/casing_option</li>
<li><a
href="https://github.com/fancy-regex/fancy-regex/commit/f0183b46a639d888f1aa0ed3531b377df1e153d2"><code>f0183b4</code></a>
fix check</li>
<li><a
href="https://github.com/fancy-regex/fancy-regex/commit/988b3574937e16b39fa074d1edd0df4b2bf7b45a"><code>988b357</code></a>
fmt</li>
<li><a
href="https://github.com/fancy-regex/fancy-regex/commit/52105243c13d72f8d9b4e588fa4c6e001e0a9df5"><code>5210524</code></a>
moved tests to tests/regex_options.rs</li>
<li><a
href="https://github.com/fancy-regex/fancy-regex/commit/ce4ab06ee33d74e0204890ffa79822174b3c5cca"><code>ce4ab06</code></a>
fmt</li>
<li><a
href="https://github.com/fancy-regex/fancy-regex/commit/1039f710839fc405f339352a36826909ac7a2896"><code>1039f71</code></a>
added self to authors</li>
<li>Additional commits viewable in <a
href="https://github.com/fancy-regex/fancy-regex/compare/0.13.0...0.14.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=fancy-regex&package-manager=cargo&previous-version=0.13.0&new-version=0.14.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                | 12 ++++++------
 Cargo.toml                |  2 +-
 crates/nu-json/Cargo.toml |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 39778edb6a..0ea1445c72 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -388,18 +388,18 @@ dependencies = [
 
 [[package]]
 name = "bit-set"
-version = "0.5.3"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
+checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
 dependencies = [
  "bit-vec",
 ]
 
 [[package]]
 name = "bit-vec"
-version = "0.6.3"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
+checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
 
 [[package]]
 name = "bitflags"
@@ -1476,9 +1476,9 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
 
 [[package]]
 name = "fancy-regex"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2"
+checksum = "6e24cb5a94bcae1e5408b0effca5cd7172ea3c5755049c5f3af4cd283a165298"
 dependencies = [
  "bit-set",
  "regex-automata",
diff --git a/Cargo.toml b/Cargo.toml
index de6aa22211..59a5bb8a68 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -86,7 +86,7 @@ dirs = "5.0"
 dirs-sys = "0.4"
 dtparse = "2.0"
 encoding_rs = "0.8"
-fancy-regex = "0.13"
+fancy-regex = "0.14"
 filesize = "0.2"
 filetime = "0.2"
 fuzzy-matcher = "0.3"
diff --git a/crates/nu-json/Cargo.toml b/crates/nu-json/Cargo.toml
index e04dc5612a..a964b2d81c 100644
--- a/crates/nu-json/Cargo.toml
+++ b/crates/nu-json/Cargo.toml
@@ -29,7 +29,7 @@ serde_json = { workspace = true }
 nu-test-support = { path = "../nu-test-support", version = "0.99.2" }
 nu-path = { path = "../nu-path", version = "0.99.2" }
 serde_json = "1.0"
-fancy-regex = "0.13.0"
+fancy-regex = "0.14.0"
 
 [lints]
 workspace = true
\ No newline at end of file

From a6c2c685bc236dfbd1a75815048dac1131173b38 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 30 Oct 2024 10:51:30 +0800
Subject: [PATCH 0622/1072] Bump trash from 5.1.1 to 5.2.0 (#14206)

Bumps [trash](https://github.com/ArturKovacs/trash) from 5.1.1 to 5.2.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/ArturKovacs/trash/releases">trash's
releases</a>.</em></p>
<blockquote>
<h2>v5.2.0</h2>
<h3>New Features</h3>
<ul>
<li>
<p>Short circuiting check for empty trash
<code>is_empty()</code> is a short circuiting function that checks if
the trash is
empty on Freedesktop compatible systems and Windows.</p>
<p>The main purpose of <code>is_empty()</code> is to avoid evaluating
the entire trash
context when the caller is only interested in whether the trash is empty
or not. This is especially useful for full trashes with many items.</p>
</li>
</ul>
<h3>Commit Statistics</h3>
<ul>
<li>2 commits contributed to the release.</li>
<li>56 days passed between releases.</li>
<li>1 commit was understood as <a
href="https://www.conventionalcommits.org">conventional</a>.</li>
<li>0 issues like '(#ID)' were seen in commit messages</li>
</ul>
<h3>Commit Details</h3>
<!-- raw HTML omitted -->
<!-- raw HTML omitted -->
<ul>
<li><strong>Uncategorized</strong>
<ul>
<li>Merge pull request <a
href="https://redirect.github.com/ArturKovacs/trash/issues/120">#120</a>
from joshuamegnauth54/feat-short-circuiting-is-empty (0120bbe)</li>
<li>Short circuiting check for empty trash (6d59fa9)</li>
</ul>
</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/Byron/trash-rs/blob/master/CHANGELOG.md">trash's
changelog</a>.</em></p>
<blockquote>
<h2>5.2.0 (2024-10-26)</h2>
<h3>New Features</h3>
<ul>
<li>
<p><!-- raw HTML omitted --> Short circuiting check for empty trash
<code>is_empty()</code> is a short circuiting function that checks if
the trash is
empty on Freedesktop compatible systems and Windows.</p>
<p>The main purpose of <code>is_empty()</code> is to avoid evaluating
the entire trash
context when the caller is only interested in whether the trash is empty
or not. This is especially useful for full trashes with many items.</p>
</li>
</ul>
<h3>Commit Statistics</h3>
<!-- raw HTML omitted -->
<ul>
<li>2 commits contributed to the release.</li>
<li>56 days passed between releases.</li>
<li>1 commit was understood as <a
href="https://www.conventionalcommits.org">conventional</a>.</li>
<li>0 issues like '(#ID)' were seen in commit messages</li>
</ul>
<h3>Commit Details</h3>
<!-- raw HTML omitted -->
<!-- raw HTML omitted -->
<ul>
<li><strong>Uncategorized</strong>
<ul>
<li>Merge pull request <a
href="https://redirect.github.com/ArturKovacs/trash/issues/120">#120</a>
from joshuamegnauth54/feat-short-circuiting-is-empty (<a
href="https://github.com/Byron/trash-rs/commit/0120bbe66889e3659b9f09598f3567dd6c00d4b6"><code>0120bbe</code></a>)</li>
<li>Short circuiting check for empty trash (<a
href="https://github.com/Byron/trash-rs/commit/6d59fa939429d2eede8b7cf22b2e084bc3c546f4"><code>6d59fa9</code></a>)</li>
</ul>
</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/Byron/trash-rs/commit/1a0fc5908a29c7e648a76ca706e2aa2a40eedda6"><code>1a0fc59</code></a>
Release trash v5.2.0</li>
<li><a
href="https://github.com/Byron/trash-rs/commit/0120bbe66889e3659b9f09598f3567dd6c00d4b6"><code>0120bbe</code></a>
Merge pull request <a
href="https://redirect.github.com/ArturKovacs/trash/issues/120">#120</a>
from joshuamegnauth54/feat-short-circuiting-is-empty</li>
<li><a
href="https://github.com/Byron/trash-rs/commit/6d59fa939429d2eede8b7cf22b2e084bc3c546f4"><code>6d59fa9</code></a>
feat: Short circuiting check for empty trash</li>
<li>See full diff in <a
href="https://github.com/ArturKovacs/trash/compare/v5.1.1...v5.2.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=trash&package-manager=cargo&previous-version=5.1.1&new-version=5.2.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0ea1445c72..dd29073ab7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6497,9 +6497,9 @@ dependencies = [
 
 [[package]]
 name = "trash"
-version = "5.1.1"
+version = "5.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33caf2a9be1812a263a4bfce74d2de225fcde12ee7b77001361abd2b34ffdcc4"
+checksum = "defe1fdd4232e407b312377885a2c5396764972bddad87baf304753374a1bfc8"
 dependencies = [
  "chrono",
  "libc",
diff --git a/Cargo.toml b/Cargo.toml
index 59a5bb8a68..5cde353814 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -159,7 +159,7 @@ tempfile = "3.13"
 terminal_size = "0.3"
 titlecase = "2.0"
 toml = "0.8"
-trash = "5.1"
+trash = "5.2"
 umask = "2.1"
 unicode-segmentation = "1.12"
 unicode-width = "0.1"

From e0bb5a2bd2c3006b4298962c87e7922cce8a9313 Mon Sep 17 00:00:00 2001
From: Dom <18601956+hacker-DOM@users.noreply.github.com>
Date: Wed, 30 Oct 2024 12:22:47 +0100
Subject: [PATCH 0623/1072] Allow using function keys F21-F35 for keybindings
 (#14201)

I feel like the limitations on what can be bound are too strict.

if an app _does_ support the Kitty keyboard protocol (Neovim,
Reedline), I can map the function keys (F27-F35 as listed below).

In Reedline everything works perfectly. The issue is for some reason we
limit the keys that can be bound in Nushell, so I am unable to do that.
---
 crates/nu-cli/src/reedline_config.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/nu-cli/src/reedline_config.rs b/crates/nu-cli/src/reedline_config.rs
index 55179ab0ae..4c1594389e 100644
--- a/crates/nu-cli/src/reedline_config.rs
+++ b/crates/nu-cli/src/reedline_config.rs
@@ -862,10 +862,10 @@ fn add_parsed_keybinding(
             c if c.starts_with('f') => c[1..]
                 .parse()
                 .ok()
-                .filter(|num| (1..=20).contains(num))
+                .filter(|num| (1..=35).contains(num))
                 .map(KeyCode::F)
                 .ok_or(ShellError::InvalidValue {
-                    valid: "'f1', 'f2', ..., or 'f20'".into(),
+                    valid: "'f1', 'f2', ..., or 'f35'".into(),
                     actual: format!("'{keycode}'"),
                     span: keybinding.keycode.span(),
                 })?,

From 4200df21d399b2dc3d51493872a0b2f836f4890d Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Wed, 30 Oct 2024 19:45:15 +0800
Subject: [PATCH 0624/1072] Add RELEASE_QUERY_API build arg for Dockerfiles
 (#14209)

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

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

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

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

Add `RELEASE_QUERY_API` build arg for all Dockerfiles, with default
value set to
`https://api.github.com/repos/nushell/nushell/releases/latest`, So that
we can build the nightly images with the same Dockerfile but a different
`RELEASE_QUERY_API` build arg.

A nightly image build with the new Dockerfile could be found here:
https://github.com/orgs/nushell/packages/container/nushell/297473460?tag=nightly

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

The default behavior keep the same as before

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

Those who want to build a docker image with the nushell nightly release
installed could run:
```nu
let queryApi = http get https://api.github.com/repos/nushell/nightly/releases | sort-by -r created_at | get 0.url
docker buildx build --build-arg $'RELEASE_QUERY_API=($queryApi)' ...
```
---
 docker/Dockerfile        | 4 +++-
 docker/debian.Dockerfile | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index d20ec63d91..fff3d18ef0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -14,6 +14,8 @@ ARG ARCH=${ARCH/amd64/x86_64}
 
 ARG BUILD_REF
 ARG BUILD_DATE
+ARG RELEASE_QUERY_API="https://api.github.com/repos/nushell/nushell/releases/latest"
+
 LABEL maintainer="The Nushell Project Developers" \
     org.opencontainers.image.licenses="MIT" \
     org.opencontainers.image.title="Nushell" \
@@ -29,7 +31,7 @@ RUN echo '/usr/bin/nu' >> /etc/shells \
     && adduser -D -s /usr/bin/nu nushell \
     && mkdir -p /home/nushell/.config/nushell/ \
     && cd /tmp \
-    && wget -qO - https://api.github.com/repos/nushell/nushell/releases/latest \
+    && wget -qO - ${RELEASE_QUERY_API} \
     | grep browser_download_url \
     | cut -d '"' -f 4 \
     | grep ${ARCH}-unknown-linux-musl \
diff --git a/docker/debian.Dockerfile b/docker/debian.Dockerfile
index 9a510453ef..1e2566eddb 100644
--- a/docker/debian.Dockerfile
+++ b/docker/debian.Dockerfile
@@ -14,6 +14,8 @@ ARG ARCH=${ARCH/amd64/x86_64}
 
 ARG BUILD_REF
 ARG BUILD_DATE
+ARG RELEASE_QUERY_API="https://api.github.com/repos/nushell/nushell/releases/latest"
+
 LABEL maintainer="The Nushell Project Developers" \
     org.opencontainers.image.licenses="MIT" \
     org.opencontainers.image.title="Nushell" \
@@ -27,7 +29,7 @@ LABEL maintainer="The Nushell Project Developers" \
 
 RUN apt update && apt install -y wget \
     && cd /tmp \
-    && wget -qO - https://api.github.com/repos/nushell/nushell/releases/latest \
+    && wget -qO - ${RELEASE_QUERY_API} \
     | grep browser_download_url \
     | cut -d '"' -f 4 \
     | grep ${ARCH}-unknown-linux-gnu \

From 4907575d3df7370c73c1774b9ccb403c40c2841c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 30 Oct 2024 10:14:04 -0700
Subject: [PATCH 0625/1072] Bump chrono-tz from 0.8.6 to 0.10.0 (#14205)

Bumps [chrono-tz](https://github.com/chronotope/chrono-tz) from 0.8.6 to
0.10.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/chronotope/chrono-tz/releases">chrono-tz's
releases</a>.</em></p>
<blockquote>
<h2>chrono-tz v0.10.0: 2024b</h2>
<p><strong>TZDB</strong> version 2024b (2024-09-05).</p>
<h2>Changes</h2>
<ul>
<li>Make <code>OffsetName::abbreviation</code> return an
<code>Option</code>.
This reflects that numeric values such as <code>+11</code> are no longer
encoded in the upstream TZDB as abbreviations (<a
href="https://redirect.github.com/chronotope/chrono-tz/issues/185">#185</a>).</li>
</ul>
<h2>TZDB 2024b</h2>
<blockquote>
<p>The 2024b release of the tz code and data is available.</p>
<p>This release is prompted by the accumulated weight of many non-urgent
changes to both code and data. It changes one timestamp abbreviation,
for the long-obsolete System V setting TZ='MET'; see below. Otherwise,
the timestamps affected by this release all predate April 2008, so you
can skip this release if your application uses only tzdata and does not
use older timestamps.</p>
<p>This release contains the following changes:</p>
<h3>Briefly:</h3>
<p>Improve historical data for Mexico, Mongolia, and Portugal.
System V names are now obsolescent.
The main data form now uses %z.
The code now conforms to RFC 8536 for early timestamps.
Support POSIX.1-2024, which removes asctime_r and ctime_r.
Assume POSIX.2-1992 or later for shell scripts.
SUPPORT_C89 now defaults to 1.</p>
<h3>Changes to past timestamps</h3>
<p>Asia/Choibalsan is now an alias for Asia/Ulaanbaatar rather than
being a separate Zone with differing behavior before April 2008. This
seems better given our wildly conflicting information about Mongolia's
time zone history. (Thanks to Heitor David Pinto.)</p>
<p>Historical transitions for Mexico have been updated based on official
Mexican decrees. The affected timestamps occur during the years
1921-1927, 1931, 1945, 1949-1970, and 1981-1997. The affected zones are
America/Bahia_Banderas, America/Cancun, America/Chihuahua,
America/Ciudad_Juarez, America/Hermosillo, America/Mazatlan,
America/Merida, America/Mexico_City, America/Monterrey, America/Ojinaga,
and America/Tijuana. (Thanks to Heitor David Pinto.)</p>
<p>Historical transitions for Portugal, represented by Europe/Lisbon,
Atlantic/Azores, and Atlantic/Madeira, have been updated based on a
close reading of old Portuguese legislation, replacing previous data
mainly originating from Whitman and Shanks &amp; Pottenger. These
changes affect a few transitions in 1917-1921, 1924, and 1940 throughout
these regions by a few hours or days, and various timestamps between
1977 and 1993 depending on the region. In particular, the Azores and
Madeira did not observe DST from 1977 to 1981. Additionally, the
adoption of standard zonal time in former Portuguese colonies have been
adjusted: Africa/Maputo in 1909, and Asia/Dili by 22 minutes at the
start of 1912. (Thanks to Tim Parenti.)</p>
<h3>Changes to past tm_isdst flags</h3>
<p>The period from 1966-04-03 through 1966-10-02 in Portugal is now
modeled as DST, to more closely reflect how contemporaneous changes in
law entered into force.</p>
<h3>Changes to data</h3>
<p>Names present only for compatibility with UNIX System V (last
released in the 1990s) have been moved to 'backward'. These names, which
for post-1970 timestamps mostly just duplicate data of geographical
names, were confusing downstream uses. Names moved to 'backward' are now
links to geographical names. This affects behavior for TZ='EET' for some
pre-1981 timestamps, for TZ='CET' for some pre-1947 timestamps, and for
TZ='WET' for some pre-1996 timestamps. Also, TZ='MET' now behaves like
TZ='CET' and so uses the abbreviation &quot;CET&quot; rather than
&quot;MET&quot;. Those needing the previous TZDB behavior, which does
not match any real-world clocks, can find the old entries in 'backzone'.
(Problem reported by Justin Grant.)</p>
<p>The main source files' time zone abbreviations now use %z, supported
by zic since release 2015f and used in vanguard form since release
2022b. For example, America/Sao_Paulo now contains the zone continuation
line &quot;-3:00 Brazil %z&quot;, which is less error prone than the old
&quot;-3:00 Brazil -03/-02&quot;. This does not change the represented
data: the generated TZif files are unchanged. Rearguard form still
avoids %z, to support obsolescent parsers.</p>
<p>Asia/Almaty has been removed from zonenow.tab as it now agrees with
Asia/Tashkent for future timestamps, due to Kazakhstan's 2024-02-29 time
zone change. Similarly, America/Scoresbysund has been removed, as it now
agrees with America/Nuuk due to its 2024-03-31 time zone change.</p>
</blockquote>
<h2>chrono-tz v0.9.0: 2024a</h2>
<p><strong>TZDB</strong> version <a
href="https://mm.icann.org/pipermail/tz-announce/2024-February/000081.html">2024a</a>
(2024-02-01).</p>
<h2>Changes</h2>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/chronotope/chrono-tz/commit/8450e59393b79e5d6062e6bc6f4477903219f489"><code>8450e59</code></a>
Bump chrono-tz-build to 0.4.0</li>
<li><a
href="https://github.com/chronotope/chrono-tz/commit/6154fd2513cea759143641b7e5f563529a9d2d57"><code>6154fd2</code></a>
Bump version number to 0.10.0</li>
<li><a
href="https://github.com/chronotope/chrono-tz/commit/2d0c48978163d3a00ace75bd34f61da664335a23"><code>2d0c489</code></a>
Update tz submodule to 2024b</li>
<li><a
href="https://github.com/chronotope/chrono-tz/commit/0acd431a547f87446cd9338eb492ec8d758f59c2"><code>0acd431</code></a>
Make timezone name optional</li>
<li><a
href="https://github.com/chronotope/chrono-tz/commit/2e955104a8a951b5c1f90a47fac34eca386a48aa"><code>2e95510</code></a>
Test numeric time zone names</li>
<li><a
href="https://github.com/chronotope/chrono-tz/commit/2a675e2f845de476b5cb15fd3b6daf2e9c5c8106"><code>2a675e2</code></a>
chrono-tz-build: resolve fixme</li>
<li><a
href="https://github.com/chronotope/chrono-tz/commit/ca52db80b5d54d70a75f591066b220ee63ceb7a2"><code>ca52db8</code></a>
chrono-tz-build: make phf gated by case-insensitive feature</li>
<li><a
href="https://github.com/chronotope/chrono-tz/commit/e2f421513991659484c694266098851c584f5da9"><code>e2f4215</code></a>
Prepare parse-zoneinfo v0.3.1</li>
<li><a
href="https://github.com/chronotope/chrono-tz/commit/e6f87e20cca4584e87e62dc69ed88c144e39dc26"><code>e6f87e2</code></a>
Symlink LICENSE in parse-zoneinfo</li>
<li><a
href="https://github.com/chronotope/chrono-tz/commit/6e58ce21caabee5bc74b2e513c2764d864ee407e"><code>6e58ce2</code></a>
Remove <code>AsciiExt</code> import</li>
<li>Additional commits viewable in <a
href="https://github.com/chronotope/chrono-tz/compare/v0.8.6...v0.10.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=chrono-tz&package-manager=cargo&previous-version=0.8.6&new-version=0.10.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 26 +++++++++++++++++---------
 Cargo.toml |  2 +-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dd29073ab7..cb53d53fcb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1097,7 +1097,7 @@ dependencies = [
  "cssparser-macros",
  "dtoa-short",
  "itoa",
- "phf 0.11.2",
+ "phf 0.10.1",
  "smallvec",
 ]
 
@@ -2432,7 +2432,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -3117,7 +3117,7 @@ dependencies = [
  "chardetng",
  "chrono",
  "chrono-humanize",
- "chrono-tz 0.8.6",
+ "chrono-tz 0.10.0",
  "crossterm 0.28.1",
  "csv",
  "data-encoding",
@@ -4139,7 +4139,9 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
 dependencies = [
+ "phf_macros",
  "phf_shared 0.10.0",
+ "proc-macro-hack",
 ]
 
 [[package]]
@@ -4148,7 +4150,6 @@ version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
 dependencies = [
- "phf_macros",
  "phf_shared 0.11.2",
 ]
 
@@ -4194,15 +4195,16 @@ dependencies = [
 
 [[package]]
 name = "phf_macros"
-version = "0.11.2"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
+checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0"
 dependencies = [
- "phf_generator 0.11.2",
- "phf_shared 0.11.2",
+ "phf_generator 0.10.0",
+ "phf_shared 0.10.0",
+ "proc-macro-hack",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -4870,6 +4872,12 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "proc-macro-hack"
+version = "0.5.20+deprecated"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.86"
diff --git a/Cargo.toml b/Cargo.toml
index 5cde353814..8af6d422d7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -75,7 +75,7 @@ calamine = "0.24.0"
 chardetng = "0.1.17"
 chrono = { default-features = false, version = "0.4.34" }
 chrono-humanize = "0.2.3"
-chrono-tz = "0.8"
+chrono-tz = "0.10"
 crossbeam-channel = "0.5.8"
 crossterm = "0.28.1"
 csv = "1.3"

From 0a2fb137afcac68501c9b0f4607a69c0176cbce4 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Thu, 31 Oct 2024 23:13:05 +0800
Subject: [PATCH 0626/1072] don't run subcommand if it's surrounded with
 backtick quote (#14210)

# Description
Fixes: #14202
After looking into the issue, I think #13910 it's not good to cut the
span if it's in external argument.
This pr is somehow revert the change, and fix
https://github.com/nushell/nushell/issues/13431 in another way.

It introduce a new state named `State::BackTickQuote`, so if an external
arg include backtick quote, it enters the state, so backtick quote won't
be the body of a string.

# User-Facing Changes
### Before
```nushell
> ^echo `(echo aa)`
aa
> ^echo `"aa"`   # maybe it's not right to remove the inner quote.
aa
```
### After
```nushell
> ^echo `(echo aa)`
(echo aa)
> ^echo `"aa"`    # inner quote is keeped if there are backtick quote outside.
"aa"
```

# Tests + Formatting
Added 3 tests.
---
 crates/nu-parser/src/parser.rs            | 45 ++++++++++++-----------
 crates/nu-parser/tests/test_parser.rs     | 20 +++++-----
 tests/shell/pipeline/commands/external.rs | 10 +++++
 3 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index faf0a94c24..62ad19dc79 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -240,36 +240,23 @@ fn parse_unknown_arg(
 /// string, where each balanced pair of quotes is parsed as a separate part of the string, and then
 /// concatenated together.
 ///
-/// `keep_surround_backtick_quote` should be true when parsing it as command name.  Or else it
-/// should be false.
-///
 /// For example, `-foo="bar\nbaz"` becomes `$"-foo=bar\nbaz"`
-fn parse_external_string(
-    working_set: &mut StateWorkingSet,
-    mut span: Span,
-    keep_surround_bakctick_quote: bool,
-) -> Expression {
-    let mut contents = working_set.get_span_contents(span);
+fn parse_external_string(working_set: &mut StateWorkingSet, span: Span) -> Expression {
+    let contents = working_set.get_span_contents(span);
 
-    if !keep_surround_bakctick_quote
-        && contents.len() > 1
-        && contents.starts_with(b"`")
-        && contents.ends_with(b"`")
-    {
-        contents = &contents[1..contents.len() - 1];
-        // backtick quote is useless in this case, so span is required to updated.
-        span = Span::new(span.start + 1, span.end - 1);
-    }
     if contents.starts_with(b"r#") {
         parse_raw_string(working_set, span)
     } else if contents
         .iter()
-        .any(|b| matches!(b, b'"' | b'\'' | b'(' | b')'))
+        .any(|b| matches!(b, b'"' | b'\'' | b'(' | b')' | b'`'))
     {
         enum State {
             Bare {
                 from: usize,
             },
+            BackTickQuote {
+                from: usize,
+            },
             Quote {
                 from: usize,
                 quote_char: u8,
@@ -320,6 +307,12 @@ fn parse_external_string(
                             continue;
                         }
                     }
+                    b'`' => {
+                        if index != *from {
+                            spans.push(make_span(*from, index))
+                        }
+                        state = State::BackTickQuote { from: index }
+                    }
                     // Continue to consume
                     _ => (),
                 },
@@ -342,13 +335,21 @@ fn parse_external_string(
                         *escaped = false;
                     }
                 },
+                State::BackTickQuote { from } => {
+                    if ch == b'`' {
+                        spans.push(make_span(*from, index + 1));
+                        state = State::Bare { from: index + 1 };
+                    }
+                }
             }
             index += 1;
         }
 
         // Add the final span
         match state {
-            State::Bare { from } | State::Quote { from, .. } => {
+            State::Bare { from }
+            | State::Quote { from, .. }
+            | State::BackTickQuote { from, .. } => {
                 if from < contents.len() {
                     spans.push(make_span(from, contents.len()));
                 }
@@ -457,7 +458,7 @@ fn parse_regular_external_arg(working_set: &mut StateWorkingSet, span: Span) ->
     } else if contents.starts_with(b"[") {
         parse_list_expression(working_set, span, &SyntaxShape::Any)
     } else {
-        parse_external_string(working_set, span, false)
+        parse_external_string(working_set, span)
     }
 }
 
@@ -479,7 +480,7 @@ pub fn parse_external_call(working_set: &mut StateWorkingSet, spans: &[Span]) ->
         let arg = parse_expression(working_set, &[head_span]);
         Box::new(arg)
     } else {
-        Box::new(parse_external_string(working_set, head_span, true))
+        Box::new(parse_external_string(working_set, head_span))
     };
 
     let args = spans[1..]
diff --git a/crates/nu-parser/tests/test_parser.rs b/crates/nu-parser/tests/test_parser.rs
index c0722d64e4..11cca19d1f 100644
--- a/crates/nu-parser/tests/test_parser.rs
+++ b/crates/nu-parser/tests/test_parser.rs
@@ -1026,6 +1026,16 @@ pub fn test_external_call_head_interpolated_string(
     r#"hello world"#,
     "value is surrounded by backtick quote"
 )]
+#[case(
+    r#"^foo `"hello world"`"#,
+    "\"hello world\"",
+    "value is surrounded by backtick quote, with inner double quote"
+)]
+#[case(
+    r#"^foo `'hello world'`"#,
+    "'hello world'",
+    "value is surrounded by backtick quote, with inner single quote"
+)]
 pub fn test_external_call_arg_glob(#[case] input: &str, #[case] expected: &str, #[case] tag: &str) {
     test_external_call(input, tag, |name, args| {
         match &name.expr {
@@ -1120,16 +1130,6 @@ pub fn test_external_call_arg_raw_string(
     r#"foo\external call"#,
     "double quote with backslash"
 )]
-#[case(
-    r#"^foo `"hello world"`"#,
-    r#"hello world"#,
-    "value is surrounded by backtick quote, with inner double quote"
-)]
-#[case(
-    r#"^foo `'hello world'`"#,
-    r#"hello world"#,
-    "value is surrounded by backtick quote, with inner single quote"
-)]
 pub fn test_external_call_arg_string(
     #[case] input: &str,
     #[case] expected: &str,
diff --git a/tests/shell/pipeline/commands/external.rs b/tests/shell/pipeline/commands/external.rs
index d92785b51c..207a94766b 100644
--- a/tests/shell/pipeline/commands/external.rs
+++ b/tests/shell/pipeline/commands/external.rs
@@ -642,3 +642,13 @@ fn exit_code_stops_execution_for_loop() {
     assert!(actual.out.is_empty());
     assert!(!actual.err.contains("exited with code 42"));
 }
+
+#[test]
+fn arg_dont_run_subcommand_if_surrounded_with_quote() {
+    let actual = nu!("nu --testbin cococo `(echo aa)`");
+    assert_eq!(actual.out, "(echo aa)");
+    let actual = nu!("nu --testbin cococo \"(echo aa)\"");
+    assert_eq!(actual.out, "(echo aa)");
+    let actual = nu!("nu --testbin cococo '(echo aa)'");
+    assert_eq!(actual.out, "(echo aa)");
+}

From d575fd1c3a873d6eb15e25393abc66b15acee24b Mon Sep 17 00:00:00 2001
From: Kieron Wilkinson <kieron.wilkinson@gmail.com>
Date: Thu, 31 Oct 2024 23:45:20 +0000
Subject: [PATCH 0627/1072] Tests for new Alpine and Debian image builds
 (#14225)

---
 docker/test_docker.nu | 153 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 153 insertions(+)
 create mode 100755 docker/test_docker.nu

diff --git a/docker/test_docker.nu b/docker/test_docker.nu
new file mode 100755
index 0000000000..c606f9563b
--- /dev/null
+++ b/docker/test_docker.nu
@@ -0,0 +1,153 @@
+#!/usr/bin/env nu
+use std assert
+
+# Usage:
+#   docker run -it --rm -v $"(pwd):/work" nushell:alpine /work/test_docker.nu
+
+def main [] {
+    let test_plan = (
+        scope commands
+            | where ($it.type == "custom")
+                and ($it.name | str starts-with "test ")
+                and not ($it.description | str starts-with "ignore")
+            | each { |test| create_execution_plan $test.name }
+            | str join ", "
+    )
+    let plan = $"run_tests [ ($test_plan) ]"
+    ^$nu.current-exe --commands $"source ($env.CURRENT_FILE); ($plan)"
+}
+
+def create_execution_plan [test: string] -> string {
+    $"{ name: \"($test)\", execute: { ($test) } }"
+}
+
+def run_tests [tests: list<record<name: string, execute: closure>>] {
+    let results = $tests | par-each { run_test $in }
+
+    print_results $results
+    print_summary $results
+
+    if ($results | any { |test| $test.result == "FAIL" }) {
+        exit 1
+    }
+}
+
+def print_results [results: list<record<name: string, result: string>>] {
+    let display_table = $results | update result { |row|
+        let emoji = if ($row.result == "PASS") { "✅" } else { "❌" }
+        $"($emoji) ($row.result)"
+    }
+
+    if ("GITHUB_ACTIONS" in $env) {
+        print ($display_table | to md --pretty)
+    } else {
+        print $display_table
+    }
+}
+
+def print_summary [results: list<record<name: string, result: string>>] -> bool {
+    let success = $results | where ($it.result == "PASS") | length
+    let failure = $results | where ($it.result == "FAIL") | length
+    let count = $results | length
+
+    if ($failure == 0) {
+        print $"\nTesting completed: ($success) of ($count) were successful"
+    } else {
+        print $"\nTesting completed: ($failure) of ($count) failed"
+    }
+}
+
+def run_test [test: record<name: string, execute: closure>] -> record<name: string, result: string, error: string> {
+    try {
+        do ($test.execute)
+        { result: $"PASS",name: $test.name, error: "" }
+    } catch { |error|
+        { result: $"FAIL", name: $test.name, error: $"($error.msg) (format_error $error.debug)" }
+    }
+}
+
+def format_error [error: string] {
+    $error
+        # Get the value for the text key in a partly non-json error message
+        | parse --regex ".+text: \"(.+)\""
+        | first
+        | get capture0
+        | str replace --all --regex "\\\\n" " "
+        | str replace --all --regex " +" " "
+}
+
+def "test nu is pid 1 to ensure it is handling interrupts" [] {
+    let process_id = ps
+        | where ($it.pid == 1)
+        | get name
+        | first
+
+    assert equal $process_id "nu"
+}
+
+def "test user is nushell" [] {
+    assert equal (whoami) "nushell"
+}
+
+def "test user is not root" [] {
+    let user_info = id
+        | parse "uid={uid}({user}) gid={gid}({group}){rest}"
+        | select uid user gid group
+
+    assert equal $user_info [
+        [uid user gid group];
+        ["1000" nushell "1000" nushell]
+    ]
+}
+
+def "test nu is added as a shell" [] {
+    let shell = cat /etc/shells
+        | lines
+        | where ($it | str contains "nu")
+        | first
+
+    assert str contains $shell "/nu"
+}
+
+def "test temp directory is cleared" [] {
+    let temp = ls /tmp
+
+    assert equal $temp []
+}
+
+def "test apt install cache is cleared on Debian-like containers" [] {
+    let distro = cat /etc/os-release
+        | lines
+        | parse "{key}={value}"
+        | where $it.key == "ID"
+        | get value
+        | first
+
+    if ($distro == "debian" or $distro == "ubuntu") {
+        let package_cache = ls /var/lib/apt/lists
+        assert equal $package_cache []
+    }
+}
+
+def "test main plugins are installed" [] {
+    let plugins = (plugin list) | get name
+
+    assert ("formats" in $plugins)
+    assert ("gstat" in $plugins)
+    assert ("inc" in $plugins)
+    assert ("polars" in $plugins)
+    assert ("query" in $plugins)
+}
+
+def "test config initialised" [] {
+    let files = ls ~/.config/nushell
+        | select name size
+        | where name ends-with '.nu'
+        | insert file { |row| $row.name | parse --regex ".+/(.+\\.nu)" | first | get capture0 }
+
+    let env_size = $files | where file == "env.nu" | get size | first
+    let config_size = $files | where file == "config.nu" | get size | first
+
+    assert greater $env_size 1KiB
+    assert greater $config_size 10KiB
+}

From 3e39fae6e1384483546d05edd838ab3f7982f6e5 Mon Sep 17 00:00:00 2001
From: Jan Klass <kissaki@posteo.de>
Date: Fri, 1 Nov 2024 17:55:21 +0100
Subject: [PATCH 0628/1072] Fix comment typos in run_external.rs (#14229)

---
 crates/nu-command/src/system/run_external.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index b38650894c..787c21bb7b 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -69,7 +69,7 @@ impl Command for External {
         };
 
         // Find the absolute path to the executable. On Windows, set the
-        // executable to "cmd.exe" if it's is a CMD internal command. If the
+        // executable to "cmd.exe" if it's a CMD internal command. If the
         // command is not found, display a helpful error message.
         let executable = if cfg!(windows) && is_cmd_internal_command(&name_str) {
             PathBuf::from("cmd.exe")
@@ -114,7 +114,7 @@ impl Command for External {
         command.args(args.into_iter().map(|s| s.item));
 
         // Configure stdout and stderr. If both are set to `OutDest::Pipe`,
-        // we'll setup a pipe that merge two streams into one.
+        // we'll setup a pipe that merges two streams into one.
         let stdout = stack.stdout();
         let stderr = stack.stderr();
         let merged_stream = if matches!(stdout, OutDest::Pipe) && matches!(stderr, OutDest::Pipe) {
@@ -534,7 +534,7 @@ fn escape_cmd_argument(arg: &Spanned<OsString>) -> Result<Cow<'_, OsStr>, ShellE
     let Spanned { item: arg, span } = arg;
     let bytes = arg.as_encoded_bytes();
     if bytes.iter().any(|b| matches!(b, b'\r' | b'\n' | b'%')) {
-        // \r and \n trunacte the rest of the arguments and % can expand environment variables
+        // \r and \n truncate the rest of the arguments and % can expand environment variables
         Err(ShellError::ExternalCommand {
             label:
                 "Arguments to CMD internal commands cannot contain new lines or percent signs '%'"

From ccab3d6b6e4697501de9ebb59110156936192468 Mon Sep 17 00:00:00 2001
From: Jan Klass <kissaki@posteo.de>
Date: Fri, 1 Nov 2024 18:02:25 +0100
Subject: [PATCH 0629/1072] Improve comment wording in run_external.rs (#14230)

verb 'setup' -> 'set up'

setup as verb [is a misspelling of set
up](https://en.wiktionary.org/wiki/setup#Verb)

* [verb: set up](https://en.wiktionary.org/wiki/set_up)
* [noun: setup](https://en.wiktionary.org/wiki/setup)

*I split this from #14229 typo corrections because 'setup' is not as
clear-cut wrong. Having read the dictionary pages (linked) I'm even more
confident in this change being correct rather than only subjectively
better.*

Co-authored-by: Stefan Holderbach <sholderbach@users.noreply.github.com>
---
 crates/nu-command/src/system/run_external.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index 787c21bb7b..013d3d8374 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -114,7 +114,7 @@ impl Command for External {
         command.args(args.into_iter().map(|s| s.item));
 
         // Configure stdout and stderr. If both are set to `OutDest::Pipe`,
-        // we'll setup a pipe that merges two streams into one.
+        // we'll set up a pipe that merges two streams into one.
         let stdout = stack.stdout();
         let stderr = stack.stderr();
         let merged_stream = if matches!(stdout, OutDest::Pipe) && matches!(stderr, OutDest::Pipe) {
@@ -129,7 +129,7 @@ impl Command for External {
         };
 
         // Configure stdin. We'll try connecting input to the child process
-        // directly. If that's not possible, we'll setup a pipe and spawn a
+        // directly. If that's not possible, we'll set up a pipe and spawn a
         // thread to copy data into the child process.
         let data_to_copy_into_stdin = match input {
             PipelineData::ByteStream(stream, metadata) => match stream.into_stdio() {

From 1c3ff179bc575a022b6fa71dfce190c522b705ce Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aaionescu@pm.me>
Date: Sat, 2 Nov 2024 16:28:10 +0100
Subject: [PATCH 0630/1072] Improve `CellPath` display output (#14197)

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

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

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

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

Fixes: #13362

This PR fixes the `Display` impl for `CellPath`, as laid out in #13362
and #14090:

```nushell
> $.0."0"
$.0."0"

> $."foo.bar".baz
$."foo.bar".baz
```

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

Cell-paths are now printed using the same `$.` notation that is used to
create them, and ambiguous column names are properly quoted.

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-color-config/src/style_computer.rs |  2 +-
 crates/nu-command/src/filters/flatten.rs     |  2 +-
 crates/nu-command/src/filters/select.rs      |  6 +--
 crates/nu-command/tests/commands/reject.rs   |  9 +++--
 crates/nu-command/tests/commands/select.rs   | 11 ++----
 crates/nu-protocol/Cargo.toml                |  1 +
 crates/nu-protocol/src/ast/cell_path.rs      | 39 ++++++++++++++++----
 crates/nu-utils/src/quoting.rs               |  4 +-
 crates/nuon/src/to.rs                        |  6 +--
 tests/repl/test_spread.rs                    |  2 +-
 10 files changed, 54 insertions(+), 28 deletions(-)

diff --git a/crates/nu-color-config/src/style_computer.rs b/crates/nu-color-config/src/style_computer.rs
index 660156fe26..8ea7fc75b7 100644
--- a/crates/nu-color-config/src/style_computer.rs
+++ b/crates/nu-color-config/src/style_computer.rs
@@ -223,7 +223,7 @@ fn test_computable_style_closure_basic() {
         ];
         let actual_repl = nu!(cwd: dirs.test(), nu_repl_code(&inp));
         assert_eq!(actual_repl.err, "");
-        assert_eq!(actual_repl.out, "[bell.obj, book.obj, candle.obj]");
+        assert_eq!(actual_repl.out, r#"["bell.obj", "book.obj", "candle.obj"]"#);
     });
 }
 
diff --git a/crates/nu-command/src/filters/flatten.rs b/crates/nu-command/src/filters/flatten.rs
index 3e285d21aa..982db17029 100644
--- a/crates/nu-command/src/filters/flatten.rs
+++ b/crates/nu-command/src/filters/flatten.rs
@@ -157,7 +157,7 @@ fn flat_value(columns: &[CellPath], item: Value, all: bool) -> Vec<Value> {
             let mut inner_table = None;
 
             for (column_index, (column, value)) in val.into_owned().into_iter().enumerate() {
-                let column_requested = columns.iter().find(|c| c.to_string() == column);
+                let column_requested = columns.iter().find(|c| c.to_column_name() == column);
                 let need_flatten = { columns.is_empty() || column_requested.is_some() };
                 let span = value.span();
 
diff --git a/crates/nu-command/src/filters/select.rs b/crates/nu-command/src/filters/select.rs
index 45b965861e..670def2d09 100644
--- a/crates/nu-command/src/filters/select.rs
+++ b/crates/nu-command/src/filters/select.rs
@@ -240,7 +240,7 @@ fn select(
                                 //FIXME: improve implementation to not clone
                                 match input_val.clone().follow_cell_path(&path.members, false) {
                                     Ok(fetcher) => {
-                                        record.push(path.to_string(), fetcher);
+                                        record.push(path.to_column_name(), fetcher);
                                         if !columns_with_value.contains(&path) {
                                             columns_with_value.push(path);
                                         }
@@ -271,7 +271,7 @@ fn select(
                             // FIXME: remove clone
                             match v.clone().follow_cell_path(&cell_path.members, false) {
                                 Ok(result) => {
-                                    record.push(cell_path.to_string(), result);
+                                    record.push(cell_path.to_column_name(), result);
                                 }
                                 Err(e) => return Err(e),
                             }
@@ -295,7 +295,7 @@ fn select(
                         //FIXME: improve implementation to not clone
                         match x.clone().follow_cell_path(&path.members, false) {
                             Ok(value) => {
-                                record.push(path.to_string(), value);
+                                record.push(path.to_column_name(), value);
                             }
                             Err(e) => return Err(e),
                         }
diff --git a/crates/nu-command/tests/commands/reject.rs b/crates/nu-command/tests/commands/reject.rs
index a6ba9dd08f..a2c052b3e1 100644
--- a/crates/nu-command/tests/commands/reject.rs
+++ b/crates/nu-command/tests/commands/reject.rs
@@ -130,7 +130,10 @@ fn reject_optional_row() {
 #[test]
 fn reject_columns_with_list_spread() {
     let actual = nu!("let arg = [type size]; [[name type size];[Cargo.toml file 10mb] [Cargo.lock file 10mb] [src dir 100mb]] | reject ...$arg | to nuon");
-    assert_eq!(actual.out, "[[name]; [Cargo.toml], [Cargo.lock], [src]]");
+    assert_eq!(
+        actual.out,
+        r#"[[name]; ["Cargo.toml"], ["Cargo.lock"], [src]]"#
+    );
 }
 
 #[test]
@@ -138,7 +141,7 @@ fn reject_rows_with_list_spread() {
     let actual = nu!("let arg = [2 0]; [[name type size];[Cargo.toml file 10mb] [Cargo.lock file 10mb] [src dir 100mb]] | reject ...$arg | to nuon");
     assert_eq!(
         actual.out,
-        "[[name, type, size]; [Cargo.lock, file, 10000000b]]"
+        r#"[[name, type, size]; ["Cargo.lock", file, 10000000b]]"#
     );
 }
 
@@ -147,7 +150,7 @@ fn reject_mixed_with_list_spread() {
     let actual = nu!("let arg = [type 2]; [[name type size];[Cargp.toml file 10mb] [ Cargo.lock file 10mb] [src dir 100mb]] | reject ...$arg | to nuon");
     assert_eq!(
         actual.out,
-        "[[name, size]; [Cargp.toml, 10000000b], [Cargo.lock, 10000000b]]"
+        r#"[[name, size]; ["Cargp.toml", 10000000b], ["Cargo.lock", 10000000b]]"#
     );
 }
 
diff --git a/crates/nu-command/tests/commands/select.rs b/crates/nu-command/tests/commands/select.rs
index f47845d6ed..004aa16d6b 100644
--- a/crates/nu-command/tests/commands/select.rs
+++ b/crates/nu-command/tests/commands/select.rs
@@ -166,7 +166,7 @@ fn select_ignores_errors_successfully1() {
 fn select_ignores_errors_successfully2() {
     let actual = nu!("[{a: 1} {a: 2} {a: 3}] | select b? | to nuon");
 
-    assert_eq!(actual.out, "[[b?]; [null], [null], [null]]".to_string());
+    assert_eq!(actual.out, "[[b]; [null], [null], [null]]".to_string());
     assert!(actual.err.is_empty());
 }
 
@@ -174,7 +174,7 @@ fn select_ignores_errors_successfully2() {
 fn select_ignores_errors_successfully3() {
     let actual = nu!("{foo: bar} | select invalid_key? | to nuon");
 
-    assert_eq!(actual.out, "{invalid_key?: null}".to_string());
+    assert_eq!(actual.out, "{invalid_key: null}".to_string());
     assert!(actual.err.is_empty());
 }
 
@@ -184,10 +184,7 @@ fn select_ignores_errors_successfully4() {
         r#""key val\na 1\nb 2\n" | lines | split column --collapse-empty " " | select foo? | to nuon"#
     );
 
-    assert_eq!(
-        actual.out,
-        r#"[[foo?]; [null], [null], [null]]"#.to_string()
-    );
+    assert_eq!(actual.out, r#"[[foo]; [null], [null], [null]]"#.to_string());
     assert!(actual.err.is_empty());
 }
 
@@ -237,7 +234,7 @@ fn ignore_errors_works() {
         [{}] | select -i $path | to nuon
         "#);
 
-    assert_eq!(actual.out, "[[foo?]; [null]]");
+    assert_eq!(actual.out, "[[foo]; [null]]");
 }
 
 #[test]
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 635874e0b0..a6b05474b1 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -59,6 +59,7 @@ serde_json = { workspace = true }
 strum = "0.26"
 strum_macros = "0.26"
 nu-test-support = { path = "../nu-test-support", version = "0.99.2" }
+nu-utils = { path = "../nu-utils", version = "0.99.2" }
 pretty_assertions = { workspace = true }
 rstest = { workspace = true }
 tempfile = { workspace = true }
diff --git a/crates/nu-protocol/src/ast/cell_path.rs b/crates/nu-protocol/src/ast/cell_path.rs
index f208dd8120..3c2e9b3dd7 100644
--- a/crates/nu-protocol/src/ast/cell_path.rs
+++ b/crates/nu-protocol/src/ast/cell_path.rs
@@ -1,5 +1,6 @@
 use super::Expression;
 use crate::Span;
+use nu_utils::{escape_quote_string, needs_quoting};
 use serde::{Deserialize, Serialize};
 use std::{cmp::Ordering, fmt::Display};
 
@@ -173,22 +174,46 @@ impl CellPath {
             member.make_optional();
         }
     }
+
+    // Formats the cell-path as a column name, i.e. without quoting and optional markers ('?').
+    pub fn to_column_name(&self) -> String {
+        let mut s = String::new();
+
+        for member in &self.members {
+            match member {
+                PathMember::Int { val, .. } => {
+                    s += &val.to_string();
+                }
+                PathMember::String { val, .. } => {
+                    s += val;
+                }
+            }
+
+            s.push('.');
+        }
+
+        s.pop(); // Easier than checking whether to insert the '.' on every iteration.
+        s
+    }
 }
 
 impl Display for CellPath {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        for (idx, elem) in self.members.iter().enumerate() {
-            if idx > 0 {
-                write!(f, ".")?;
-            }
-            match elem {
+        write!(f, "$")?;
+        for member in self.members.iter() {
+            match member {
                 PathMember::Int { val, optional, .. } => {
                     let question_mark = if *optional { "?" } else { "" };
-                    write!(f, "{val}{question_mark}")?
+                    write!(f, ".{val}{question_mark}")?
                 }
                 PathMember::String { val, optional, .. } => {
                     let question_mark = if *optional { "?" } else { "" };
-                    write!(f, "{val}{question_mark}")?
+                    let val = if needs_quoting(val) {
+                        &escape_quote_string(val)
+                    } else {
+                        val
+                    };
+                    write!(f, ".{val}{question_mark}")?
                 }
             }
         }
diff --git a/crates/nu-utils/src/quoting.rs b/crates/nu-utils/src/quoting.rs
index baff52caeb..35ca0711bd 100644
--- a/crates/nu-utils/src/quoting.rs
+++ b/crates/nu-utils/src/quoting.rs
@@ -2,12 +2,12 @@ use fancy_regex::Regex;
 use std::sync::LazyLock;
 
 // This hits, in order:
-// • Any character of []:`{}#'";()|$,
+// • Any character of []:`{}#'";()|$,.
 // • Any digit (\d)
 // • Any whitespace (\s)
 // • Case-insensitive sign-insensitive float "keywords" inf, infinity and nan.
 static NEEDS_QUOTING_REGEX: LazyLock<Regex> = LazyLock::new(|| {
-    Regex::new(r#"[\[\]:`\{\}#'";\(\)\|\$,\d\s]|(?i)^[+\-]?(inf(inity)?|nan)$"#)
+    Regex::new(r#"[\[\]:`\{\}#'";\(\)\|\$,\.\d\s]|(?i)^[+\-]?(inf(inity)?|nan)$"#)
         .expect("internal error: NEEDS_QUOTING_REGEX didn't compile")
 });
 
diff --git a/crates/nuon/src/to.rs b/crates/nuon/src/to.rs
index c2af51d0bb..b6c4f7829b 100644
--- a/crates/nuon/src/to.rs
+++ b/crates/nuon/src/to.rs
@@ -97,7 +97,7 @@ fn value_to_string(
                 Ok("false".to_string())
             }
         }
-        Value::CellPath { val, .. } => Ok(format!("$.{}", val)),
+        Value::CellPath { val, .. } => Ok(val.to_string()),
         Value::Custom { .. } => Err(ShellError::UnsupportedInput {
             msg: "custom values are currently not nuon-compatible".to_string(),
             input: "value originates from here".into(),
@@ -116,10 +116,10 @@ fn value_to_string(
             if &val.round() == val && val.is_finite() {
                 Ok(format!("{}.0", *val))
             } else {
-                Ok(format!("{}", *val))
+                Ok(val.to_string())
             }
         }
-        Value::Int { val, .. } => Ok(format!("{}", *val)),
+        Value::Int { val, .. } => Ok(val.to_string()),
         Value::List { vals, .. } => {
             let headers = get_columns(vals);
             if !headers.is_empty() && vals.iter().all(|x| x.columns().eq(headers.iter())) {
diff --git a/tests/repl/test_spread.rs b/tests/repl/test_spread.rs
index f0ce84d393..5c3311caf4 100644
--- a/tests/repl/test_spread.rs
+++ b/tests/repl/test_spread.rs
@@ -30,7 +30,7 @@ fn not_spread() -> TestResult {
     run_test(r#"def ... [x] { $x }; ... ..."#, "...").unwrap();
     run_test(
         r#"let a = 4; [... $a ... [1] ... (5) ...bare ...] | to nuon"#,
-        "[..., 4, ..., [1], ..., 5, ...bare, ...]",
+        r#"["...", 4, "...", [1], "...", 5, "...bare", "..."]"#,
     )
 }
 

From a935e0720f8688dd7241a532a750fb06a3322f20 Mon Sep 17 00:00:00 2001
From: Doru <dorminsama@gmail.com>
Date: Sun, 3 Nov 2024 01:56:05 -0300
Subject: [PATCH 0631/1072] no deref in touch (#14214)

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

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

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

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
Adds --no-deref flag to `touch`. Nice and backwards compatible, and I
get to touch symlinks. I still don't get to set their dates directly,
but maybe that'll come with utouch.

Some sadness in the implementation, since `set_symlink_file_times`
doesn't take Option values and we call it twice with the old "read"
values from reference (or now, if missing). This shouldn't be a big
concern since `touch` already did two calls if you set both mtime and
atime. Also, `--no-deref` applies both to the reference file, and to the
target file. No splitting them up, because that's silly.

Can always bikeshed. I nicked `--no-deref` from the uutils flag, and
made the short flag `-d` because it obviously can't be `-h`. I thought
of `-S` like in `glob`, for the "negative/filter out" uppercase short
letters. Ultimately I don't think it matters much.

Should fix #14212 since it's not really tied to uutils, besides the
comment about setting a `datetime` value directly.

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/filesystem/touch.rs |  91 +++++++++++++---
 crates/nu-command/tests/commands/touch.rs | 127 +++++++++++++++++++++-
 2 files changed, 203 insertions(+), 15 deletions(-)

diff --git a/crates/nu-command/src/filesystem/touch.rs b/crates/nu-command/src/filesystem/touch.rs
index 9085554bb4..b4cd808be5 100644
--- a/crates/nu-command/src/filesystem/touch.rs
+++ b/crates/nu-command/src/filesystem/touch.rs
@@ -48,6 +48,11 @@ impl Command for Touch {
                 "do not create the file if it does not exist",
                 Some('c'),
             )
+            .switch(
+                "no-deref",
+                "do not follow symlinks",
+                Some('s')
+            )
             .category(Category::FileSystem)
     }
 
@@ -64,6 +69,7 @@ impl Command for Touch {
     ) -> Result<PipelineData, ShellError> {
         let mut change_mtime: bool = call.has_flag(engine_state, stack, "modified")?;
         let mut change_atime: bool = call.has_flag(engine_state, stack, "access")?;
+        let no_follow_symlinks: bool = call.has_flag(engine_state, stack, "no-deref")?;
         let reference: Option<Spanned<String>> = call.get_flag(engine_state, stack, "reference")?;
         let no_create: bool = call.has_flag(engine_state, stack, "no-create")?;
         let files: Vec<Spanned<NuGlob>> = get_rest_for_glob_pattern(engine_state, stack, call, 0)?;
@@ -88,19 +94,29 @@ impl Command for Touch {
 
         if let Some(reference) = reference {
             let reference_path = nu_path::expand_path_with(reference.item, &cwd, true);
-            if !reference_path.exists() {
+            let exists = if no_follow_symlinks {
+                // There's no symlink_exists function, so we settle for
+                // getting direct metadata and if it's OK, it exists
+                reference_path.symlink_metadata().is_ok()
+            } else {
+                reference_path.exists()
+            };
+            if !exists {
                 return Err(ShellError::FileNotFoundCustom {
                     msg: "Reference path not found".into(),
                     span: reference.span,
                 });
             }
 
-            let metadata = reference_path
-                .metadata()
-                .map_err(|err| ShellError::IOErrorSpanned {
-                    msg: format!("Failed to read metadata: {err}"),
-                    span: reference.span,
-                })?;
+            let metadata = if no_follow_symlinks {
+                reference_path.symlink_metadata()
+            } else {
+                reference_path.metadata()
+            };
+            let metadata = metadata.map_err(|err| ShellError::IOErrorSpanned {
+                msg: format!("Failed to read metadata: {err}"),
+                span: reference.span,
+            })?;
             mtime = metadata
                 .modified()
                 .map_err(|err| ShellError::IOErrorSpanned {
@@ -117,14 +133,27 @@ impl Command for Touch {
 
         for glob in files {
             let path = expand_path_with(glob.item.as_ref(), &cwd, glob.item.is_expand());
+            let exists = if no_follow_symlinks {
+                path.symlink_metadata().is_ok()
+            } else {
+                path.exists()
+            };
 
             // If --no-create is passed and the file/dir does not exist there's nothing to do
-            if no_create && !path.exists() {
+            if no_create && !exists {
                 continue;
             }
 
-            // Create a file at the given path unless the path is a directory
-            if !path.is_dir() {
+            // If --no-deref was passed in, the behavior of touch is to error on missing
+            if no_follow_symlinks && !exists {
+                return Err(ShellError::FileNotFound {
+                    file: path.to_string_lossy().into_owned(),
+                    span: glob.span,
+                });
+            }
+
+            // Create a file at the given path unless the path is a directory (or a symlink with -d)
+            if !path.is_dir() && (!no_follow_symlinks || !path.is_symlink()) {
                 if let Err(err) = OpenOptions::new()
                     .write(true)
                     .create(true)
@@ -138,9 +167,31 @@ impl Command for Touch {
                 };
             }
 
+            // We have to inefficiently access the target metadata to not reset it
+            // in set_symlink_file_times, because the filetime doesn't expose individual methods for it
+            let get_target_metadata = || {
+                path.symlink_metadata()
+                    .map_err(|err| ShellError::IOErrorSpanned {
+                        msg: format!("Failed to read metadata: {err}"),
+                        span: glob.span,
+                    })
+            };
+
             if change_mtime {
-                if let Err(err) = filetime::set_file_mtime(&path, FileTime::from_system_time(mtime))
-                {
+                let result = if no_follow_symlinks {
+                    filetime::set_symlink_file_times(
+                        &path,
+                        if change_atime {
+                            FileTime::from_system_time(atime)
+                        } else {
+                            FileTime::from_system_time(get_target_metadata()?.accessed()?)
+                        },
+                        FileTime::from_system_time(mtime),
+                    )
+                } else {
+                    filetime::set_file_mtime(&path, FileTime::from_system_time(mtime))
+                };
+                if let Err(err) = result {
                     return Err(ShellError::ChangeModifiedTimeNotPossible {
                         msg: format!("Failed to change the modified time: {err}"),
                         span: glob.span,
@@ -149,8 +200,20 @@ impl Command for Touch {
             }
 
             if change_atime {
-                if let Err(err) = filetime::set_file_atime(&path, FileTime::from_system_time(atime))
-                {
+                let result = if no_follow_symlinks {
+                    filetime::set_symlink_file_times(
+                        &path,
+                        FileTime::from_system_time(atime),
+                        if change_mtime {
+                            FileTime::from_system_time(mtime)
+                        } else {
+                            FileTime::from_system_time(get_target_metadata()?.modified()?)
+                        },
+                    )
+                } else {
+                    filetime::set_file_atime(&path, FileTime::from_system_time(atime))
+                };
+                if let Err(err) = result {
                     return Err(ShellError::ChangeAccessTimeNotPossible {
                         msg: format!("Failed to change the access time: {err}"),
                         span: glob.span,
diff --git a/crates/nu-command/tests/commands/touch.rs b/crates/nu-command/tests/commands/touch.rs
index 10ae299a0f..b7ab06f511 100644
--- a/crates/nu-command/tests/commands/touch.rs
+++ b/crates/nu-command/tests/commands/touch.rs
@@ -1,7 +1,7 @@
 use chrono::{DateTime, Local};
 use nu_test_support::fs::{files_exist_at, Stub};
 use nu_test_support::nu;
-use nu_test_support::playground::Playground;
+use nu_test_support::playground::{Dirs, Playground};
 
 // Use 1 instead of 0 because 0 has a special meaning in Windows
 const TIME_ONE: filetime::FileTime = filetime::FileTime::from_unix_time(1, 0);
@@ -527,3 +527,128 @@ fn reference_respects_cwd() {
         assert!(path.exists());
     })
 }
+
+fn setup_symlink_fs(dirs: &Dirs, sandbox: &mut Playground<'_>) {
+    sandbox.mkdir("d");
+    sandbox.with_files(&[Stub::EmptyFile("f"), Stub::EmptyFile("d/f")]);
+    sandbox.symlink("f", "fs");
+    sandbox.symlink("d", "ds");
+    sandbox.symlink("d/f", "fds");
+
+    // sandbox.symlink does not handle symlinks to missing files well. It panics
+    // But they are useful, and they should be tested.
+    #[cfg(unix)]
+    {
+        std::os::unix::fs::symlink(dirs.test().join("m"), dirs.test().join("fms")).unwrap();
+    }
+
+    #[cfg(windows)]
+    {
+        std::os::windows::fs::symlink_file(dirs.test().join("m"), dirs.test().join("fms")).unwrap();
+    }
+
+    // Change the file times to a known "old" value for comparison
+    filetime::set_symlink_file_times(dirs.test().join("f"), TIME_ONE, TIME_ONE).unwrap();
+    filetime::set_symlink_file_times(dirs.test().join("d"), TIME_ONE, TIME_ONE).unwrap();
+    filetime::set_symlink_file_times(dirs.test().join("d/f"), TIME_ONE, TIME_ONE).unwrap();
+    filetime::set_symlink_file_times(dirs.test().join("ds"), TIME_ONE, TIME_ONE).unwrap();
+    filetime::set_symlink_file_times(dirs.test().join("fs"), TIME_ONE, TIME_ONE).unwrap();
+    filetime::set_symlink_file_times(dirs.test().join("fds"), TIME_ONE, TIME_ONE).unwrap();
+    filetime::set_symlink_file_times(dirs.test().join("fms"), TIME_ONE, TIME_ONE).unwrap();
+}
+
+fn get_times(path: &nu_path::AbsolutePath) -> (filetime::FileTime, filetime::FileTime) {
+    let metadata = path.symlink_metadata().unwrap();
+
+    (
+        filetime::FileTime::from_system_time(metadata.accessed().unwrap()),
+        filetime::FileTime::from_system_time(metadata.modified().unwrap()),
+    )
+}
+
+#[test]
+fn follow_symlinks() {
+    Playground::setup("touch_follows_symlinks", |dirs, sandbox| {
+        setup_symlink_fs(&dirs, sandbox);
+
+        let missing = dirs.test().join("m");
+        assert!(!missing.exists());
+
+        nu!(
+            cwd: dirs.test(),
+            "
+                touch fds
+                touch ds
+                touch fs
+                touch fms
+            "
+        );
+
+        // We created the missing symlink target
+        assert!(missing.exists());
+
+        // The timestamps for files and directories were changed from TIME_ONE
+        let file_times = get_times(&dirs.test().join("f"));
+        let dir_times = get_times(&dirs.test().join("d"));
+        let dir_file_times = get_times(&dirs.test().join("d/f"));
+
+        assert_ne!(file_times, (TIME_ONE, TIME_ONE));
+        assert_ne!(dir_times, (TIME_ONE, TIME_ONE));
+        assert_ne!(dir_file_times, (TIME_ONE, TIME_ONE));
+
+        // For symlinks, they remain (mostly) the same
+        // We can't test accessed times, since to reach the target file, the symlink must be accessed!
+        let file_symlink_times = get_times(&dirs.test().join("fs"));
+        let dir_symlink_times = get_times(&dirs.test().join("ds"));
+        let dir_file_symlink_times = get_times(&dirs.test().join("fds"));
+        let file_missing_symlink_times = get_times(&dirs.test().join("fms"));
+
+        assert_eq!(file_symlink_times.1, TIME_ONE);
+        assert_eq!(dir_symlink_times.1, TIME_ONE);
+        assert_eq!(dir_file_symlink_times.1, TIME_ONE);
+        assert_eq!(file_missing_symlink_times.1, TIME_ONE);
+    })
+}
+
+#[test]
+fn no_follow_symlinks() {
+    Playground::setup("touch_touches_symlinks", |dirs, sandbox| {
+        setup_symlink_fs(&dirs, sandbox);
+
+        let missing = dirs.test().join("m");
+        assert!(!missing.exists());
+
+        nu!(
+            cwd: dirs.test(),
+            "
+                touch fds -s
+                touch ds -s
+                touch fs -s
+                touch fms -s
+            "
+        );
+
+        // We did not create the missing symlink target
+        assert!(!missing.exists());
+
+        // The timestamps for files and directories remain the same
+        let file_times = get_times(&dirs.test().join("f"));
+        let dir_times = get_times(&dirs.test().join("d"));
+        let dir_file_times = get_times(&dirs.test().join("d/f"));
+
+        assert_eq!(file_times, (TIME_ONE, TIME_ONE));
+        assert_eq!(dir_times, (TIME_ONE, TIME_ONE));
+        assert_eq!(dir_file_times, (TIME_ONE, TIME_ONE));
+
+        // For symlinks, everything changed. (except their targets, and paths, and personality)
+        let file_symlink_times = get_times(&dirs.test().join("fs"));
+        let dir_symlink_times = get_times(&dirs.test().join("ds"));
+        let dir_file_symlink_times = get_times(&dirs.test().join("fds"));
+        let file_missing_symlink_times = get_times(&dirs.test().join("fms"));
+
+        assert_ne!(file_symlink_times, (TIME_ONE, TIME_ONE));
+        assert_ne!(dir_symlink_times, (TIME_ONE, TIME_ONE));
+        assert_ne!(dir_file_symlink_times, (TIME_ONE, TIME_ONE));
+        assert_ne!(file_missing_symlink_times, (TIME_ONE, TIME_ONE));
+    })
+}

From d289c773d0e1359c60e3731b8bd9627f394f89f8 Mon Sep 17 00:00:00 2001
From: Alex Kattathra Johnson
 <120033285+alex-kattathra-johnson@users.noreply.github.com>
Date: Sun, 3 Nov 2024 12:35:08 -0600
Subject: [PATCH 0632/1072] Change --max-time arg for http commands to use
 `Duration` type (#14237)

# Description
Fixes #14222. The ability to set duration unit for `--max-time` when using the `http`
command util.

Signed-off-by: Alex Johnson <alex.kattathra.johnson@gmail.com>
---
 crates/nu-command/src/network/http/client.rs  | 4 ++--
 crates/nu-command/src/network/http/delete.rs  | 4 ++--
 crates/nu-command/src/network/http/get.rs     | 4 ++--
 crates/nu-command/src/network/http/head.rs    | 4 ++--
 crates/nu-command/src/network/http/options.rs | 4 ++--
 crates/nu-command/src/network/http/patch.rs   | 4 ++--
 crates/nu-command/src/network/http/post.rs    | 4 ++--
 crates/nu-command/src/network/http/put.rs     | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/crates/nu-command/src/network/http/client.rs b/crates/nu-command/src/network/http/client.rs
index 8dd4cc5601..62dd693627 100644
--- a/crates/nu-command/src/network/http/client.rs
+++ b/crates/nu-command/src/network/http/client.rs
@@ -525,7 +525,7 @@ pub fn request_set_timeout(
     mut request: Request,
 ) -> Result<Request, ShellError> {
     if let Some(timeout) = timeout {
-        let val = timeout.as_i64()?;
+        let val = timeout.as_duration()?;
         if val.is_negative() || val < 1 {
             return Err(ShellError::TypeMismatch {
                 err_message: "Timeout value must be an int and larger than 0".to_string(),
@@ -533,7 +533,7 @@ pub fn request_set_timeout(
             });
         }
 
-        request = request.timeout(Duration::from_secs(val as u64));
+        request = request.timeout(Duration::from_nanos(val as u64));
     }
 
     Ok(request)
diff --git a/crates/nu-command/src/network/http/delete.rs b/crates/nu-command/src/network/http/delete.rs
index 27b43e2b76..b13b3846e2 100644
--- a/crates/nu-command/src/network/http/delete.rs
+++ b/crates/nu-command/src/network/http/delete.rs
@@ -43,8 +43,8 @@ impl Command for SubCommand {
             )
             .named(
                 "max-time",
-                SyntaxShape::Int,
-                "timeout period in seconds",
+                SyntaxShape::Duration,
+                "max duration before timeout occurs",
                 Some('m'),
             )
             .named(
diff --git a/crates/nu-command/src/network/http/get.rs b/crates/nu-command/src/network/http/get.rs
index f348cc9fd6..8260f76c66 100644
--- a/crates/nu-command/src/network/http/get.rs
+++ b/crates/nu-command/src/network/http/get.rs
@@ -38,8 +38,8 @@ impl Command for SubCommand {
             )
             .named(
                 "max-time",
-                SyntaxShape::Int,
-                "timeout period in seconds",
+                SyntaxShape::Duration,
+                "max duration before timeout occurs",
                 Some('m'),
             )
             .named(
diff --git a/crates/nu-command/src/network/http/head.rs b/crates/nu-command/src/network/http/head.rs
index 37d6c46ba9..99c77101af 100644
--- a/crates/nu-command/src/network/http/head.rs
+++ b/crates/nu-command/src/network/http/head.rs
@@ -38,8 +38,8 @@ impl Command for SubCommand {
             )
             .named(
                 "max-time",
-                SyntaxShape::Int,
-                "timeout period in seconds",
+                SyntaxShape::Duration,
+                "max duration before timeout occurs",
                 Some('m'),
             )
             .named(
diff --git a/crates/nu-command/src/network/http/options.rs b/crates/nu-command/src/network/http/options.rs
index 5c34be4041..cd86b5349a 100644
--- a/crates/nu-command/src/network/http/options.rs
+++ b/crates/nu-command/src/network/http/options.rs
@@ -37,8 +37,8 @@ impl Command for SubCommand {
             )
             .named(
                 "max-time",
-                SyntaxShape::Int,
-                "timeout period in seconds",
+                SyntaxShape::Duration,
+                "max duration before timeout occurs",
                 Some('m'),
             )
             .named(
diff --git a/crates/nu-command/src/network/http/patch.rs b/crates/nu-command/src/network/http/patch.rs
index eeebaf55a8..b062282b84 100644
--- a/crates/nu-command/src/network/http/patch.rs
+++ b/crates/nu-command/src/network/http/patch.rs
@@ -39,8 +39,8 @@ impl Command for SubCommand {
             )
             .named(
                 "max-time",
-                SyntaxShape::Int,
-                "timeout period in seconds",
+                SyntaxShape::Duration,
+                "max duration before timeout occurs",
                 Some('m'),
             )
             .named(
diff --git a/crates/nu-command/src/network/http/post.rs b/crates/nu-command/src/network/http/post.rs
index f38f7aeed3..fbe780294b 100644
--- a/crates/nu-command/src/network/http/post.rs
+++ b/crates/nu-command/src/network/http/post.rs
@@ -39,8 +39,8 @@ impl Command for SubCommand {
             )
             .named(
                 "max-time",
-                SyntaxShape::Int,
-                "timeout period in seconds",
+                SyntaxShape::Duration,
+                "max duration before timeout occurs",
                 Some('m'),
             )
             .named(
diff --git a/crates/nu-command/src/network/http/put.rs b/crates/nu-command/src/network/http/put.rs
index 0494f5ea0e..b3bf8b72d5 100644
--- a/crates/nu-command/src/network/http/put.rs
+++ b/crates/nu-command/src/network/http/put.rs
@@ -39,8 +39,8 @@ impl Command for SubCommand {
             )
             .named(
                 "max-time",
-                SyntaxShape::Int,
-                "timeout period in seconds",
+                SyntaxShape::Duration,
+                "max duration before timeout occurs",
                 Some('m'),
             )
             .named(

From 8b19399b1336798197088b90dd8b6a97f4261509 Mon Sep 17 00:00:00 2001
From: Solomon <git@solomonvictorino.com>
Date: Sun, 3 Nov 2024 20:39:24 -0700
Subject: [PATCH 0633/1072] support binary input in `length` (#14224)

Closes #13874

# User-Facing Changes

`length` now supports binary input:

```nushell
> random binary 1kb | length
1000
```
---
 crates/nu-command/src/filters/length.rs    | 27 ++++++++++++++++++++--
 crates/nu-command/tests/commands/length.rs | 13 +++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/crates/nu-command/src/filters/length.rs b/crates/nu-command/src/filters/length.rs
index cd64e7a5ed..3d7b739ef2 100644
--- a/crates/nu-command/src/filters/length.rs
+++ b/crates/nu-command/src/filters/length.rs
@@ -1,3 +1,5 @@
+use std::io::Read;
+
 use nu_engine::command_prelude::*;
 
 #[derive(Clone)]
@@ -9,12 +11,15 @@ impl Command for Length {
     }
 
     fn description(&self) -> &str {
-        "Count the number of items in an input list or rows in a table."
+        "Count the number of items in an input list, rows in a table, or bytes in binary data."
     }
 
     fn signature(&self) -> nu_protocol::Signature {
         Signature::build("length")
-            .input_output_types(vec![(Type::List(Box::new(Type::Any)), Type::Int)])
+            .input_output_types(vec![
+                (Type::List(Box::new(Type::Any)), Type::Int),
+                (Type::Binary, Type::Int),
+            ])
             .category(Category::Filters)
     }
 
@@ -44,6 +49,11 @@ impl Command for Length {
                 example: "[{a:1 b:2}, {a:2 b:3}] | length",
                 result: Some(Value::test_int(2)),
             },
+            Example {
+                description: "Count the number of bytes in binary data",
+                example: "0x[01 02] | length",
+                result: Some(Value::test_int(2)),
+            },
         ]
     }
 }
@@ -64,6 +74,19 @@ fn length_row(call: &Call, input: PipelineData) -> Result<PipelineData, ShellErr
                 src_span: span,
             })
         }
+        PipelineData::Value(Value::Binary { val, .. }, ..) => {
+            Ok(Value::int(val.len() as i64, call.head).into_pipeline_data())
+        }
+        PipelineData::ByteStream(stream, _) if stream.type_().is_binary_coercible() => {
+            Ok(Value::int(
+                match stream.reader() {
+                    Some(r) => r.bytes().count() as i64,
+                    None => 0,
+                },
+                call.head,
+            )
+            .into_pipeline_data())
+        }
         _ => {
             let mut count: i64 = 0;
             // Check for and propagate errors
diff --git a/crates/nu-command/tests/commands/length.rs b/crates/nu-command/tests/commands/length.rs
index b67ac452e8..52e0767f07 100644
--- a/crates/nu-command/tests/commands/length.rs
+++ b/crates/nu-command/tests/commands/length.rs
@@ -1,4 +1,6 @@
+use nu_test_support::fs::Stub::FileWithContent;
 use nu_test_support::nu;
+use nu_test_support::playground::Playground;
 
 #[test]
 fn length_columns_in_cal_table() {
@@ -20,3 +22,14 @@ fn length_fails_on_echo_record() {
 
     assert!(actual.err.contains("only_supports_this_input_type"));
 }
+
+#[test]
+fn length_byte_stream() {
+    Playground::setup("length_bytes", |dirs, sandbox| {
+        sandbox.mkdir("length_bytes");
+        sandbox.with_files(&[FileWithContent("data.txt", "😀")]);
+
+        let actual = nu!(cwd: dirs.test(), "open data.txt | length");
+        assert_eq!(actual.out, "4");
+    });
+}

From 22ca5a6b8da47523a1a3e3e2dc94e54b0e68498c Mon Sep 17 00:00:00 2001
From: Alex Kattathra Johnson
 <120033285+alex-kattathra-johnson@users.noreply.github.com>
Date: Mon, 4 Nov 2024 05:41:44 -0600
Subject: [PATCH 0634/1072] Add tests to test the `--max-age` arg in http
 commands (#14245)

- fixes #14241

Signed-off-by: Alex Johnson <alex.kattathra.johnson@gmail.com>
---
 .../tests/commands/network/http/delete.rs     | 20 ++++++++++++++++
 .../tests/commands/network/http/get.rs        | 20 ++++++++++++++++
 .../tests/commands/network/http/options.rs    | 20 ++++++++++++++++
 .../tests/commands/network/http/patch.rs      | 24 +++++++++++++++++++
 .../tests/commands/network/http/post.rs       | 24 +++++++++++++++++++
 .../tests/commands/network/http/put.rs        | 24 +++++++++++++++++++
 6 files changed, 132 insertions(+)

diff --git a/crates/nu-command/tests/commands/network/http/delete.rs b/crates/nu-command/tests/commands/network/http/delete.rs
index c284c2ccfd..2e2624122e 100644
--- a/crates/nu-command/tests/commands/network/http/delete.rs
+++ b/crates/nu-command/tests/commands/network/http/delete.rs
@@ -1,3 +1,5 @@
+use std::{thread, time::Duration};
+
 use mockito::Server;
 use nu_test_support::{nu, pipeline};
 
@@ -122,3 +124,21 @@ fn http_delete_redirect_mode_error() {
         "Redirect encountered when redirect handling mode was 'error' (301 Moved Permanently)"
     ));
 }
+
+#[test]
+fn http_delete_timeout() {
+    let mut server = Server::new();
+    let _mock = server
+        .mock("DELETE", "/")
+        .with_chunked_body(|w| {
+            thread::sleep(Duration::from_secs(1));
+            w.write_all(b"Delayed response!")
+        })
+        .create();
+
+    let actual = nu!(pipeline(
+        format!("http delete --max-time 500ms {url}", url = server.url()).as_str()
+    ));
+
+    assert!(&actual.err.contains("nu::shell::io_error"));
+}
diff --git a/crates/nu-command/tests/commands/network/http/get.rs b/crates/nu-command/tests/commands/network/http/get.rs
index e1f1132efa..e75536abb4 100644
--- a/crates/nu-command/tests/commands/network/http/get.rs
+++ b/crates/nu-command/tests/commands/network/http/get.rs
@@ -1,3 +1,5 @@
+use std::{thread, time::Duration};
+
 use mockito::Server;
 use nu_test_support::{nu, pipeline};
 
@@ -316,3 +318,21 @@ fn http_get_with_unknown_mime_type() {
 
     assert_eq!(actual.out, "[1,2,3]");
 }
+
+#[test]
+fn http_get_timeout() {
+    let mut server = Server::new();
+    let _mock = server
+        .mock("GET", "/")
+        .with_chunked_body(|w| {
+            thread::sleep(Duration::from_secs(1));
+            w.write_all(b"Delayed response!")
+        })
+        .create();
+
+    let actual = nu!(pipeline(
+        format!("http get --max-time 500ms {url}", url = server.url()).as_str()
+    ));
+
+    assert!(&actual.err.contains("nu::shell::io_error"));
+}
diff --git a/crates/nu-command/tests/commands/network/http/options.rs b/crates/nu-command/tests/commands/network/http/options.rs
index 6a49a5e1c1..82dcf33a5a 100644
--- a/crates/nu-command/tests/commands/network/http/options.rs
+++ b/crates/nu-command/tests/commands/network/http/options.rs
@@ -1,3 +1,5 @@
+use std::{thread, time::Duration};
+
 use mockito::Server;
 use nu_test_support::{nu, pipeline};
 
@@ -41,3 +43,21 @@ fn http_options_failed_due_to_server_error() {
 
     assert!(actual.err.contains("Bad request (400)"))
 }
+
+#[test]
+fn http_options_timeout() {
+    let mut server = Server::new();
+    let _mock = server
+        .mock("OPTIONS", "/")
+        .with_chunked_body(|w| {
+            thread::sleep(Duration::from_secs(1));
+            w.write_all(b"Delayed response!")
+        })
+        .create();
+
+    let actual = nu!(pipeline(
+        format!("http options --max-time 500ms {url}", url = server.url()).as_str()
+    ));
+
+    assert!(&actual.err.contains("nu::shell::io_error"));
+}
diff --git a/crates/nu-command/tests/commands/network/http/patch.rs b/crates/nu-command/tests/commands/network/http/patch.rs
index dc3a755baa..79e6a63096 100644
--- a/crates/nu-command/tests/commands/network/http/patch.rs
+++ b/crates/nu-command/tests/commands/network/http/patch.rs
@@ -1,3 +1,5 @@
+use std::{thread, time::Duration};
+
 use mockito::Server;
 use nu_test_support::{nu, pipeline};
 
@@ -162,3 +164,25 @@ fn http_patch_redirect_mode_error() {
         "Redirect encountered when redirect handling mode was 'error' (301 Moved Permanently)"
     ));
 }
+
+#[test]
+fn http_patch_timeout() {
+    let mut server = Server::new();
+    let _mock = server
+        .mock("PATCH", "/")
+        .with_chunked_body(|w| {
+            thread::sleep(Duration::from_secs(1));
+            w.write_all(b"Delayed response!")
+        })
+        .create();
+
+    let actual = nu!(pipeline(
+        format!(
+            "http patch --max-time 500ms {url} patchbody",
+            url = server.url()
+        )
+        .as_str()
+    ));
+
+    assert!(&actual.err.contains("nu::shell::io_error"));
+}
diff --git a/crates/nu-command/tests/commands/network/http/post.rs b/crates/nu-command/tests/commands/network/http/post.rs
index 44dde270c1..9d327bf167 100644
--- a/crates/nu-command/tests/commands/network/http/post.rs
+++ b/crates/nu-command/tests/commands/network/http/post.rs
@@ -1,3 +1,5 @@
+use std::{thread, time::Duration};
+
 use mockito::{Matcher, Server, ServerOpts};
 use nu_test_support::{nu, pipeline};
 
@@ -276,3 +278,25 @@ fn http_post_multipart_is_success() {
 
     assert!(actual.out.is_empty())
 }
+
+#[test]
+fn http_post_timeout() {
+    let mut server = Server::new();
+    let _mock = server
+        .mock("POST", "/")
+        .with_chunked_body(|w| {
+            thread::sleep(Duration::from_secs(1));
+            w.write_all(b"Delayed response!")
+        })
+        .create();
+
+    let actual = nu!(pipeline(
+        format!(
+            "http post --max-time 500ms {url} postbody",
+            url = server.url()
+        )
+        .as_str()
+    ));
+
+    assert!(&actual.err.contains("nu::shell::io_error"));
+}
diff --git a/crates/nu-command/tests/commands/network/http/put.rs b/crates/nu-command/tests/commands/network/http/put.rs
index 43251cd21a..3405c19bbf 100644
--- a/crates/nu-command/tests/commands/network/http/put.rs
+++ b/crates/nu-command/tests/commands/network/http/put.rs
@@ -1,3 +1,5 @@
+use std::{thread, time::Duration};
+
 use mockito::Server;
 use nu_test_support::{nu, pipeline};
 
@@ -162,3 +164,25 @@ fn http_put_redirect_mode_error() {
         "Redirect encountered when redirect handling mode was 'error' (301 Moved Permanently)"
     ));
 }
+
+#[test]
+fn http_put_timeout() {
+    let mut server = Server::new();
+    let _mock = server
+        .mock("PUT", "/")
+        .with_chunked_body(|w| {
+            thread::sleep(Duration::from_secs(1));
+            w.write_all(b"Delayed response!")
+        })
+        .create();
+
+    let actual = nu!(pipeline(
+        format!(
+            "http put --max-time 500ms {url} putbody",
+            url = server.url()
+        )
+        .as_str()
+    ));
+
+    assert!(&actual.err.contains("nu::shell::io_error"));
+}

From 20c2de9eed522543a5444c4afef891fbe8dbab9f Mon Sep 17 00:00:00 2001
From: Charles Taylor <charlestaylor95@gmail.com>
Date: Mon, 4 Nov 2024 12:03:26 -0500
Subject: [PATCH 0635/1072] Empty rest args match should be an empty list
 (#14246)

Fixes #14145

# User-Facing Changes
An empty rest match would be `null` previously. Now it will be an empty
list.
This is a breaking change for any scripts relying on the old behavior.

Example script:
```nu
match [1] {
  [_ ..$rest] => {
    match $rest {
      null => { "old" }
      [] => { "new" }
    }
  }
}
```
This expression would evaluate to "old" on current nu versions and "new"
with this patch.
---
 crates/nu-command/tests/commands/match_.rs     | 6 ++++++
 crates/nu-protocol/src/engine/pattern_match.rs | 9 +++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/crates/nu-command/tests/commands/match_.rs b/crates/nu-command/tests/commands/match_.rs
index b37d4a32e2..23e4450d2b 100644
--- a/crates/nu-command/tests/commands/match_.rs
+++ b/crates/nu-command/tests/commands/match_.rs
@@ -64,6 +64,12 @@ fn match_list_rest() {
     assert_eq!(actual.out, "single: 1 5");
 }
 
+#[test]
+fn match_list_rest_empty() {
+    let actual = nu!(r#"match [1] { [1 ..$rest] => { $rest == [] } }"#);
+    assert_eq!(actual.out, "true");
+}
+
 #[test]
 fn match_constant_1() {
     let actual = nu!(
diff --git a/crates/nu-protocol/src/engine/pattern_match.rs b/crates/nu-protocol/src/engine/pattern_match.rs
index 2a2287ea67..3284527cc6 100644
--- a/crates/nu-protocol/src/engine/pattern_match.rs
+++ b/crates/nu-protocol/src/engine/pattern_match.rs
@@ -48,13 +48,14 @@ impl Matcher for Pattern {
             Pattern::List(items) => match &value {
                 Value::List { vals, .. } => {
                     if items.len() > vals.len() {
-                        // The only we we allow this is to have a rest pattern in the n+1 position
+                        // We only allow this is to have a rest pattern in the n+1 position
                         if items.len() == (vals.len() + 1) {
                             match &items[vals.len()].pattern {
                                 Pattern::IgnoreRest => {}
-                                Pattern::Rest(var_id) => {
-                                    matches.push((*var_id, Value::nothing(items[vals.len()].span)))
-                                }
+                                Pattern::Rest(var_id) => matches.push((
+                                    *var_id,
+                                    Value::list(Vec::new(), items[vals.len()].span),
+                                )),
                                 _ => {
                                     // There is a pattern which can't skip missing values, so we fail
                                     return false;

From 9f099308346461cd8362534962e6b90afa6c034e Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Mon, 4 Nov 2024 09:03:48 -0800
Subject: [PATCH 0636/1072] Div, mod, and floor div overhaul (#14157)

# Description
Dividing two ints can currently return either an int or a float. Not
having a single return type for an operation between two types seems
problematic. Additionally, the type signature for division says that
dividing two ints returns only an int which does not match the current
implementation (it can also return a float). This PR changes division
between almost all types to return a float (except for `filesize /
number` or `duration / number`, since there are no float representations
for these types).

Currently, floor division between certain types is not implemented even
though the type signature allows it. Also, the current implementation of
floor division uses a combination of clamping and flooring rather than
simply performing floor division which this PR fixes. Additionally, the
signature was changed so that `int // float`, `float // int`, and `float
// float` now return float instead of int. This matches the automatic
float promotion in the rest of the operators (as well as how Python does
floor division which I think is the original inspiration).

Since regular division has always returned fractional values (and now
returns a float to reflect that), `mod` is now defined in terms of floor
division. That is, `D // d = q`, `D mod d = r`, and `D = d * q + r `.
This is just like the `%` operator in Python, which is also based off
floor division (at least for ints and floats). Additionally,
implementations missing from `mod`'s current type signature have been
added (`duration mod int` and `duration mod float`).

This PR also overhauls the overflow checking and errors for div, mod,
and floor div. If an operation overflows, it will now cause an error.

# User-Facing Changes
- Div now returns a float in most cases.
- Floor division now actually does floor division.
- Floor division now does automatic float promotion, returning a float
in more instances.
- Floor division now actually allows division with filesize and
durations as its type signature claimed.
- Mod is now defined and implemented in terms of floor division rather
than truncating division.
- Mod now actually allows filesize and durations as its type signature
claimed.
- Div, mod, and floor div now all have proper overflow checks.

## Examples

When the divisor and the dividend have the same sign, the quotient and
remainder will be the same as before. (Except that this PR will give
more accurate results, since it does not do an intermediate float
conversion). If the signs of the divisor and dividend are different,
then the results will be different, or rather actually correct.

Before:

```nu
let q = 8 // -3 # -3
let r = 8 mod -3 # 2
8 == $q * -3 + $r # false
```

After:

```nu
let q = 8 // -3 # -3
let r = 8 mod -3 # -1
8 == $q * -3 + $r # true
```


Before:

```nu
let q = -8 // 3 # -3
let r = -8 mod 3 # -2
-8 == $q * 3 + $r # false
```

After:

```nu
let q = -8 // 3 # -3
let r = -8 mod 3 # 1
-8 == $q * 3 + $r # true
```

# Tests + Formatting
Added a few tests.

# After Submitting
Probably update the docs.
---
 crates/nu-command/tests/commands/math/mod.rs |  36 ++
 crates/nu-parser/src/type_check.rs           |  18 +-
 crates/nu-protocol/src/errors/shell_error.rs |   5 +-
 crates/nu-protocol/src/value/mod.rs          | 499 ++++++++++++-------
 4 files changed, 375 insertions(+), 183 deletions(-)

diff --git a/crates/nu-command/tests/commands/math/mod.rs b/crates/nu-command/tests/commands/math/mod.rs
index 7918b3262a..cde6a2da35 100644
--- a/crates/nu-command/tests/commands/math/mod.rs
+++ b/crates/nu-command/tests/commands/math/mod.rs
@@ -268,6 +268,42 @@ fn modulo() {
     assert_eq!(actual.out, "1");
 }
 
+#[test]
+fn floor_div_mod() {
+    let actual = nu!("let q = 8 // -3; let r = 8 mod -3; 8 == $q * -3 + $r");
+    assert_eq!(actual.out, "true");
+
+    let actual = nu!("let q = -8 // 3; let r = -8 mod 3; -8 == $q * 3 + $r");
+    assert_eq!(actual.out, "true");
+}
+
+#[test]
+fn floor_div_mod_overflow() {
+    let actual = nu!(format!("{} // -1", i64::MIN));
+    assert!(actual.err.contains("overflow"));
+
+    let actual = nu!(format!("{} mod -1", i64::MIN));
+    assert!(actual.err.contains("overflow"));
+}
+
+#[test]
+fn floor_div_mod_zero() {
+    let actual = nu!("1 // 0");
+    assert!(actual.err.contains("zero"));
+
+    let actual = nu!("1 mod 0");
+    assert!(actual.err.contains("zero"));
+}
+
+#[test]
+fn floor_div_mod_large_num() {
+    let actual = nu!(format!("{} // {}", i64::MAX, i64::MAX / 2));
+    assert_eq!(actual.out, "2");
+
+    let actual = nu!(format!("{} mod {}", i64::MAX, i64::MAX / 2));
+    assert_eq!(actual.out, "1");
+}
+
 #[test]
 fn unit_multiplication_math() {
     let actual = nu!(pipeline(
diff --git a/crates/nu-parser/src/type_check.rs b/crates/nu-parser/src/type_check.rs
index bf268dac1a..1b66258ded 100644
--- a/crates/nu-parser/src/type_check.rs
+++ b/crates/nu-parser/src/type_check.rs
@@ -280,15 +280,15 @@ pub fn math_result_type(
                 }
             },
             Operator::Math(Math::Divide) => match (&lhs.ty, &rhs.ty) {
-                (Type::Int, Type::Int) => (Type::Int, None),
+                (Type::Int, Type::Int) => (Type::Float, None),
                 (Type::Float, Type::Int) => (Type::Float, None),
                 (Type::Int, Type::Float) => (Type::Float, None),
                 (Type::Float, Type::Float) => (Type::Float, None),
-                (Type::Number, Type::Number) => (Type::Number, None),
-                (Type::Number, Type::Int) => (Type::Number, None),
-                (Type::Int, Type::Number) => (Type::Number, None),
-                (Type::Number, Type::Float) => (Type::Number, None),
-                (Type::Float, Type::Number) => (Type::Number, None),
+                (Type::Number, Type::Number) => (Type::Float, None),
+                (Type::Number, Type::Int) => (Type::Float, None),
+                (Type::Int, Type::Number) => (Type::Float, None),
+                (Type::Number, Type::Float) => (Type::Float, None),
+                (Type::Float, Type::Number) => (Type::Float, None),
                 (Type::Filesize, Type::Filesize) => (Type::Float, None),
                 (Type::Filesize, Type::Int) => (Type::Filesize, None),
                 (Type::Filesize, Type::Float) => (Type::Filesize, None),
@@ -379,9 +379,9 @@ pub fn math_result_type(
             },
             Operator::Math(Math::FloorDivision) => match (&lhs.ty, &rhs.ty) {
                 (Type::Int, Type::Int) => (Type::Int, None),
-                (Type::Float, Type::Int) => (Type::Int, None),
-                (Type::Int, Type::Float) => (Type::Int, None),
-                (Type::Float, Type::Float) => (Type::Int, None),
+                (Type::Float, Type::Int) => (Type::Float, None),
+                (Type::Int, Type::Float) => (Type::Float, None),
+                (Type::Float, Type::Float) => (Type::Float, None),
                 (Type::Number, Type::Number) => (Type::Number, None),
                 (Type::Number, Type::Int) => (Type::Number, None),
                 (Type::Int, Type::Number) => (Type::Number, None),
diff --git a/crates/nu-protocol/src/errors/shell_error.rs b/crates/nu-protocol/src/errors/shell_error.rs
index 024c515b09..96678daef5 100644
--- a/crates/nu-protocol/src/errors/shell_error.rs
+++ b/crates/nu-protocol/src/errors/shell_error.rs
@@ -37,12 +37,13 @@ pub enum ShellError {
     /// Check the inputs to the operation and add guards for their sizes.
     /// Integers are generally of size i64, floats are generally f64.
     #[error("Operator overflow.")]
-    #[diagnostic(code(nu::shell::operator_overflow), help("{help}"))]
+    #[diagnostic(code(nu::shell::operator_overflow))]
     OperatorOverflow {
         msg: String,
         #[label = "{msg}"]
         span: Span,
-        help: String,
+        #[help]
+        help: Option<String>,
     },
 
     /// The pipelined input into a command was not of the expected type. For example, it might
diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs
index ea7e258f3f..29f75d157d 100644
--- a/crates/nu-protocol/src/value/mod.rs
+++ b/crates/nu-protocol/src/value/mod.rs
@@ -2425,7 +2425,11 @@ impl Value {
                 if let Some(val) = lhs.checked_add(*rhs) {
                     Ok(Value::int(val, span))
                 } else {
-                    Err(ShellError::OperatorOverflow { msg: "add operation overflowed".into(), span, help: "Consider using floating point values for increased range by promoting operand with 'into float'. Note: float has reduced precision!".into() })
+                    Err(ShellError::OperatorOverflow {
+                        msg: "add operation overflowed".into(),
+                        span,
+                        help: Some("Consider using floating point values for increased range by promoting operand with 'into float'. Note: float has reduced precision!".into()),
+                     })
                 }
             }
             (Value::Int { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
@@ -2448,7 +2452,7 @@ impl Value {
                     Err(ShellError::OperatorOverflow {
                         msg: "addition operation overflowed".into(),
                         span,
-                        help: "".into(),
+                        help: None,
                     })
                 }
             }
@@ -2459,7 +2463,7 @@ impl Value {
                     Err(ShellError::OperatorOverflow {
                         msg: "add operation overflowed".into(),
                         span,
-                        help: "".into(),
+                        help: None,
                     })
                 }
             }
@@ -2470,7 +2474,7 @@ impl Value {
                     Err(ShellError::OperatorOverflow {
                         msg: "add operation overflowed".into(),
                         span,
-                        help: "".into(),
+                        help: None,
                     })
                 }
             }
@@ -2534,7 +2538,11 @@ impl Value {
                 if let Some(val) = lhs.checked_sub(*rhs) {
                     Ok(Value::int(val, span))
                 } else {
-                    Err(ShellError::OperatorOverflow { msg: "subtraction operation overflowed".into(), span, help: "Consider using floating point values for increased range by promoting operand with 'into float'. Note: float has reduced precision!".into() })
+                    Err(ShellError::OperatorOverflow {
+                        msg: "subtraction operation overflowed".into(),
+                        span,
+                        help: Some("Consider using floating point values for increased range by promoting operand with 'into float'. Note: float has reduced precision!".into()),
+                    })
                 }
             }
             (Value::Int { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
@@ -2555,7 +2563,7 @@ impl Value {
                     Err(ShellError::OperatorOverflow {
                         msg: "subtraction operation overflowed".into(),
                         span,
-                        help: "".into(),
+                        help: None,
                     })
                 }
             }
@@ -2565,7 +2573,7 @@ impl Value {
                     _ => Err(ShellError::OperatorOverflow {
                         msg: "subtraction operation overflowed".into(),
                         span,
-                        help: "".into(),
+                        help: None,
                     }),
                 }
             }
@@ -2576,7 +2584,7 @@ impl Value {
                     Err(ShellError::OperatorOverflow {
                         msg: "subtraction operation overflowed".into(),
                         span,
-                        help: "".into(),
+                        help: None,
                     })
                 }
             }
@@ -2587,7 +2595,7 @@ impl Value {
                     Err(ShellError::OperatorOverflow {
                         msg: "add operation overflowed".into(),
                         span,
-                        help: "".into(),
+                        help: None,
                     })
                 }
             }
@@ -2612,7 +2620,11 @@ impl Value {
                 if let Some(val) = lhs.checked_mul(*rhs) {
                     Ok(Value::int(val, span))
                 } else {
-                    Err(ShellError::OperatorOverflow { msg: "multiply operation overflowed".into(), span, help: "Consider using floating point values for increased range by promoting operand with 'into float'. Note: float has reduced precision!".into() })
+                    Err(ShellError::OperatorOverflow {
+                        msg: "multiply operation overflowed".into(),
+                        span,
+                        help: Some("Consider using floating point values for increased range by promoting operand with 'into float'. Note: float has reduced precision!".into()),
+                    })
                 }
             }
             (Value::Int { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
@@ -2664,14 +2676,10 @@ impl Value {
     pub fn div(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
         match (self, rhs) {
             (Value::Int { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
-                if *rhs != 0 {
-                    if lhs % rhs == 0 {
-                        Ok(Value::int(lhs / rhs, span))
-                    } else {
-                        Ok(Value::float((*lhs as f64) / (*rhs as f64), span))
-                    }
-                } else {
+                if *rhs == 0 {
                     Err(ShellError::DivisionByZero { span: op })
+                } else {
+                    Ok(Value::float(*lhs as f64 / *rhs as f64, span))
                 }
             }
             (Value::Int { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
@@ -2696,57 +2704,73 @@ impl Value {
                 }
             }
             (Value::Filesize { val: lhs, .. }, Value::Filesize { val: rhs, .. }) => {
-                if *rhs != 0 {
-                    if lhs % rhs == 0 {
-                        Ok(Value::int(lhs / rhs, span))
-                    } else {
-                        Ok(Value::float((*lhs as f64) / (*rhs as f64), span))
-                    }
-                } else {
+                if *rhs == 0 {
                     Err(ShellError::DivisionByZero { span: op })
+                } else {
+                    Ok(Value::float(*lhs as f64 / *rhs as f64, span))
                 }
             }
             (Value::Filesize { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
-                if *rhs != 0 {
-                    Ok(Value::filesize(
-                        ((*lhs as f64) / (*rhs as f64)) as i64,
-                        span,
-                    ))
-                } else {
+                if let Some(val) = lhs.checked_div(*rhs) {
+                    Ok(Value::filesize(val, span))
+                } else if *rhs == 0 {
                     Err(ShellError::DivisionByZero { span: op })
+                } else {
+                    Err(ShellError::OperatorOverflow {
+                        msg: "division operation overflowed".into(),
+                        span,
+                        help: None,
+                    })
                 }
             }
             (Value::Filesize { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
                 if *rhs != 0.0 {
-                    Ok(Value::filesize((*lhs as f64 / rhs) as i64, span))
+                    let val = *lhs as f64 / rhs;
+                    if i64::MIN as f64 <= val && val <= i64::MAX as f64 {
+                        Ok(Value::filesize(val as i64, span))
+                    } else {
+                        Err(ShellError::OperatorOverflow {
+                            msg: "division operation overflowed".into(),
+                            span,
+                            help: None,
+                        })
+                    }
                 } else {
                     Err(ShellError::DivisionByZero { span: op })
                 }
             }
             (Value::Duration { val: lhs, .. }, Value::Duration { val: rhs, .. }) => {
-                if *rhs != 0 {
-                    if lhs % rhs == 0 {
-                        Ok(Value::int(lhs / rhs, span))
-                    } else {
-                        Ok(Value::float((*lhs as f64) / (*rhs as f64), span))
-                    }
-                } else {
+                if *rhs == 0 {
                     Err(ShellError::DivisionByZero { span: op })
+                } else {
+                    Ok(Value::float(*lhs as f64 / *rhs as f64, span))
                 }
             }
             (Value::Duration { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
-                if *rhs != 0 {
-                    Ok(Value::duration(
-                        ((*lhs as f64) / (*rhs as f64)) as i64,
-                        span,
-                    ))
-                } else {
+                if let Some(val) = lhs.checked_div(*rhs) {
+                    Ok(Value::duration(val, span))
+                } else if *rhs == 0 {
                     Err(ShellError::DivisionByZero { span: op })
+                } else {
+                    Err(ShellError::OperatorOverflow {
+                        msg: "division operation overflowed".into(),
+                        span,
+                        help: None,
+                    })
                 }
             }
             (Value::Duration { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
                 if *rhs != 0.0 {
-                    Ok(Value::duration(((*lhs as f64) / rhs) as i64, span))
+                    let val = *lhs as f64 / rhs;
+                    if i64::MIN as f64 <= val && val <= i64::MAX as f64 {
+                        Ok(Value::duration(val as i64, span))
+                    } else {
+                        Err(ShellError::OperatorOverflow {
+                            msg: "division operation overflowed".into(),
+                            span,
+                            help: None,
+                        })
+                    }
                 } else {
                     Err(ShellError::DivisionByZero { span: op })
                 }
@@ -2765,122 +2789,301 @@ impl Value {
         }
     }
 
-    pub fn floor_div(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
+    pub fn modulo(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
+        // Based off the unstable `div_floor` function in the std library.
+        fn checked_mod_i64(dividend: i64, divisor: i64) -> Option<i64> {
+            let remainder = dividend.checked_rem(divisor)?;
+            if (remainder > 0 && divisor < 0) || (remainder < 0 && divisor > 0) {
+                // Note that `remainder + divisor` cannot overflow, because `remainder` and
+                // `divisor` have opposite signs.
+                Some(remainder + divisor)
+            } else {
+                Some(remainder)
+            }
+        }
+
+        fn checked_mod_f64(dividend: f64, divisor: f64) -> Option<f64> {
+            if divisor == 0.0 {
+                None
+            } else {
+                let remainder = dividend % divisor;
+                if (remainder > 0.0 && divisor < 0.0) || (remainder < 0.0 && divisor > 0.0) {
+                    Some(remainder + divisor)
+                } else {
+                    Some(remainder)
+                }
+            }
+        }
+
         match (self, rhs) {
             (Value::Int { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
-                if *rhs != 0 {
-                    Ok(Value::int(
-                        (*lhs as f64 / *rhs as f64)
-                            .clamp(i64::MIN as f64, i64::MAX as f64)
-                            .floor() as i64,
-                        span,
-                    ))
-                } else {
+                if let Some(val) = checked_mod_i64(*lhs, *rhs) {
+                    Ok(Value::int(val, span))
+                } else if *rhs == 0 {
                     Err(ShellError::DivisionByZero { span: op })
+                } else {
+                    Err(ShellError::OperatorOverflow {
+                        msg: "modulo operation overflowed".into(),
+                        span,
+                        help: None,
+                    })
                 }
             }
             (Value::Int { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
-                if *rhs != 0.0 {
-                    Ok(Value::int(
-                        (*lhs as f64 / *rhs)
-                            .clamp(i64::MIN as f64, i64::MAX as f64)
-                            .floor() as i64,
-                        span,
-                    ))
+                if let Some(val) = checked_mod_f64(*lhs as f64, *rhs) {
+                    Ok(Value::float(val, span))
                 } else {
                     Err(ShellError::DivisionByZero { span: op })
                 }
             }
             (Value::Float { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
-                if *rhs != 0 {
-                    Ok(Value::int(
-                        (*lhs / *rhs as f64)
-                            .clamp(i64::MIN as f64, i64::MAX as f64)
-                            .floor() as i64,
-                        span,
-                    ))
+                if let Some(val) = checked_mod_f64(*lhs, *rhs as f64) {
+                    Ok(Value::float(val, span))
                 } else {
                     Err(ShellError::DivisionByZero { span: op })
                 }
             }
             (Value::Float { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
-                if *rhs != 0.0 {
-                    Ok(Value::int(
-                        (lhs / rhs).clamp(i64::MIN as f64, i64::MAX as f64).floor() as i64,
-                        span,
-                    ))
+                if let Some(val) = checked_mod_f64(*lhs, *rhs) {
+                    Ok(Value::float(val, span))
                 } else {
                     Err(ShellError::DivisionByZero { span: op })
                 }
             }
             (Value::Filesize { val: lhs, .. }, Value::Filesize { val: rhs, .. }) => {
-                if *rhs != 0 {
-                    Ok(Value::int(
-                        (*lhs as f64 / *rhs as f64)
-                            .clamp(i64::MIN as f64, i64::MAX as f64)
-                            .floor() as i64,
-                        span,
-                    ))
-                } else {
+                if let Some(val) = checked_mod_i64(*lhs, *rhs) {
+                    Ok(Value::filesize(val, span))
+                } else if *rhs == 0 {
                     Err(ShellError::DivisionByZero { span: op })
+                } else {
+                    Err(ShellError::OperatorOverflow {
+                        msg: "modulo operation overflowed".into(),
+                        span,
+                        help: None,
+                    })
                 }
             }
             (Value::Filesize { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
-                if *rhs != 0 {
-                    Ok(Value::filesize(
-                        ((*lhs as f64) / (*rhs as f64))
-                            .clamp(i64::MIN as f64, i64::MAX as f64)
-                            .floor() as i64,
-                        span,
-                    ))
-                } else {
+                if let Some(val) = checked_mod_i64(*lhs, *rhs) {
+                    Ok(Value::filesize(val, span))
+                } else if *rhs == 0 {
                     Err(ShellError::DivisionByZero { span: op })
+                } else {
+                    Err(ShellError::OperatorOverflow {
+                        msg: "modulo operation overflowed".into(),
+                        span,
+                        help: None,
+                    })
                 }
             }
             (Value::Filesize { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
-                if *rhs != 0.0 {
-                    Ok(Value::filesize(
-                        (*lhs as f64 / *rhs)
-                            .clamp(i64::MIN as f64, i64::MAX as f64)
-                            .floor() as i64,
-                        span,
-                    ))
+                if let Some(val) = checked_mod_f64(*lhs as f64, *rhs) {
+                    if i64::MIN as f64 <= val && val <= i64::MAX as f64 {
+                        Ok(Value::filesize(val as i64, span))
+                    } else {
+                        Err(ShellError::OperatorOverflow {
+                            msg: "modulo operation overflowed".into(),
+                            span,
+                            help: None,
+                        })
+                    }
                 } else {
                     Err(ShellError::DivisionByZero { span: op })
                 }
             }
             (Value::Duration { val: lhs, .. }, Value::Duration { val: rhs, .. }) => {
-                if *rhs != 0 {
-                    Ok(Value::int(
-                        (*lhs as f64 / *rhs as f64)
-                            .clamp(i64::MIN as f64, i64::MAX as f64)
-                            .floor() as i64,
-                        span,
-                    ))
-                } else {
+                if let Some(val) = checked_mod_i64(*lhs, *rhs) {
+                    Ok(Value::duration(val, span))
+                } else if *rhs == 0 {
                     Err(ShellError::DivisionByZero { span: op })
+                } else {
+                    Err(ShellError::OperatorOverflow {
+                        msg: "division operation overflowed".into(),
+                        span,
+                        help: None,
+                    })
                 }
             }
             (Value::Duration { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
-                if *rhs != 0 {
-                    Ok(Value::duration(
-                        (*lhs as f64 / *rhs as f64)
-                            .clamp(i64::MIN as f64, i64::MAX as f64)
-                            .floor() as i64,
+                if let Some(val) = checked_mod_i64(*lhs, *rhs) {
+                    Ok(Value::duration(val, span))
+                } else if *rhs == 0 {
+                    Err(ShellError::DivisionByZero { span: op })
+                } else {
+                    Err(ShellError::OperatorOverflow {
+                        msg: "division operation overflowed".into(),
                         span,
-                    ))
+                        help: None,
+                    })
+                }
+            }
+            (Value::Duration { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
+                if let Some(val) = checked_mod_f64(*lhs as f64, *rhs) {
+                    if i64::MIN as f64 <= val && val <= i64::MAX as f64 {
+                        Ok(Value::duration(val as i64, span))
+                    } else {
+                        Err(ShellError::OperatorOverflow {
+                            msg: "division operation overflowed".into(),
+                            span,
+                            help: None,
+                        })
+                    }
                 } else {
                     Err(ShellError::DivisionByZero { span: op })
                 }
             }
-            (Value::Duration { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
-                if *rhs != 0.0 {
-                    Ok(Value::duration(
-                        (*lhs as f64 / *rhs)
-                            .clamp(i64::MIN as f64, i64::MAX as f64)
-                            .floor() as i64,
+            (Value::Custom { val: lhs, .. }, rhs) => {
+                lhs.operation(span, Operator::Math(Math::Modulo), op, rhs)
+            }
+
+            _ => Err(ShellError::OperatorMismatch {
+                op_span: op,
+                lhs_ty: self.get_type().to_string(),
+                lhs_span: self.span(),
+                rhs_ty: rhs.get_type().to_string(),
+                rhs_span: rhs.span(),
+            }),
+        }
+    }
+
+    pub fn floor_div(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
+        // Taken from the unstable `div_floor` function in the std library.
+        fn checked_div_floor_i64(dividend: i64, divisor: i64) -> Option<i64> {
+            let quotient = dividend.checked_div(divisor)?;
+            let remainder = dividend.checked_rem(divisor)?;
+            if (remainder > 0 && divisor < 0) || (remainder < 0 && divisor > 0) {
+                // Note that `quotient - 1` cannot overflow, because:
+                //     `quotient` would have to be `i64::MIN`
+                //     => `divisor` would have to be `1`
+                //     => `remainder` would have to be `0`
+                // But `remainder == 0` is excluded from the check above.
+                Some(quotient - 1)
+            } else {
+                Some(quotient)
+            }
+        }
+
+        fn checked_div_floor_f64(dividend: f64, divisor: f64) -> Option<f64> {
+            if divisor == 0.0 {
+                None
+            } else {
+                Some((dividend / divisor).floor())
+            }
+        }
+
+        match (self, rhs) {
+            (Value::Int { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
+                if let Some(val) = checked_div_floor_i64(*lhs, *rhs) {
+                    Ok(Value::int(val, span))
+                } else if *rhs == 0 {
+                    Err(ShellError::DivisionByZero { span: op })
+                } else {
+                    Err(ShellError::OperatorOverflow {
+                        msg: "division operation overflowed".into(),
                         span,
-                    ))
+                        help: None,
+                    })
+                }
+            }
+            (Value::Int { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
+                if let Some(val) = checked_div_floor_f64(*lhs as f64, *rhs) {
+                    Ok(Value::float(val, span))
+                } else {
+                    Err(ShellError::DivisionByZero { span: op })
+                }
+            }
+            (Value::Float { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
+                if let Some(val) = checked_div_floor_f64(*lhs, *rhs as f64) {
+                    Ok(Value::float(val, span))
+                } else {
+                    Err(ShellError::DivisionByZero { span: op })
+                }
+            }
+            (Value::Float { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
+                if let Some(val) = checked_div_floor_f64(*lhs, *rhs) {
+                    Ok(Value::float(val, span))
+                } else {
+                    Err(ShellError::DivisionByZero { span: op })
+                }
+            }
+            (Value::Filesize { val: lhs, .. }, Value::Filesize { val: rhs, .. }) => {
+                if let Some(val) = checked_div_floor_i64(*lhs, *rhs) {
+                    Ok(Value::int(val, span))
+                } else if *rhs == 0 {
+                    Err(ShellError::DivisionByZero { span: op })
+                } else {
+                    Err(ShellError::OperatorOverflow {
+                        msg: "division operation overflowed".into(),
+                        span,
+                        help: None,
+                    })
+                }
+            }
+            (Value::Filesize { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
+                if let Some(val) = checked_div_floor_i64(*lhs, *rhs) {
+                    Ok(Value::filesize(val, span))
+                } else if *rhs == 0 {
+                    Err(ShellError::DivisionByZero { span: op })
+                } else {
+                    Err(ShellError::OperatorOverflow {
+                        msg: "division operation overflowed".into(),
+                        span,
+                        help: None,
+                    })
+                }
+            }
+            (Value::Filesize { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
+                if let Some(val) = checked_div_floor_f64(*lhs as f64, *rhs) {
+                    if i64::MIN as f64 <= val && val <= i64::MAX as f64 {
+                        Ok(Value::filesize(val as i64, span))
+                    } else {
+                        Err(ShellError::OperatorOverflow {
+                            msg: "division operation overflowed".into(),
+                            span,
+                            help: None,
+                        })
+                    }
+                } else {
+                    Err(ShellError::DivisionByZero { span: op })
+                }
+            }
+            (Value::Duration { val: lhs, .. }, Value::Duration { val: rhs, .. }) => {
+                if let Some(val) = checked_div_floor_i64(*lhs, *rhs) {
+                    Ok(Value::int(val, span))
+                } else if *rhs == 0 {
+                    Err(ShellError::DivisionByZero { span: op })
+                } else {
+                    Err(ShellError::OperatorOverflow {
+                        msg: "division operation overflowed".into(),
+                        span,
+                        help: None,
+                    })
+                }
+            }
+            (Value::Duration { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
+                if let Some(val) = checked_div_floor_i64(*lhs, *rhs) {
+                    Ok(Value::duration(val, span))
+                } else if *rhs == 0 {
+                    Err(ShellError::DivisionByZero { span: op })
+                } else {
+                    Err(ShellError::OperatorOverflow {
+                        msg: "division operation overflowed".into(),
+                        span,
+                        help: None,
+                    })
+                }
+            }
+            (Value::Duration { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
+                if let Some(val) = checked_div_floor_f64(*lhs as f64, *rhs) {
+                    if i64::MIN as f64 <= val && val <= i64::MAX as f64 {
+                        Ok(Value::duration(val as i64, span))
+                    } else {
+                        Err(ShellError::OperatorOverflow {
+                            msg: "division operation overflowed".into(),
+                            span,
+                            help: None,
+                        })
+                    }
                 } else {
                     Err(ShellError::DivisionByZero { span: op })
                 }
@@ -2888,7 +3091,6 @@ impl Value {
             (Value::Custom { val: lhs, .. }, rhs) => {
                 lhs.operation(self.span(), Operator::Math(Math::Divide), op, rhs)
             }
-
             _ => Err(ShellError::OperatorMismatch {
                 op_span: op,
                 lhs_ty: self.get_type().to_string(),
@@ -3334,7 +3536,7 @@ impl Value {
                         msg: "right operand to bit-shl exceeds available bits in underlying data"
                             .into(),
                         span,
-                        help: format!("Limit operand to 0 <= rhs < {}", i64::BITS),
+                        help: Some(format!("Limit operand to 0 <= rhs < {}", i64::BITS)),
                     })
                 }
             }
@@ -3363,7 +3565,7 @@ impl Value {
                         msg: "right operand to bit-shr exceeds available bits in underlying data"
                             .into(),
                         span,
-                        help: format!("Limit operand to 0 <= rhs < {}", i64::BITS),
+                        help: Some(format!("Limit operand to 0 <= rhs < {}", i64::BITS)),
                     })
                 }
             }
@@ -3434,57 +3636,6 @@ impl Value {
         }
     }
 
-    pub fn modulo(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
-        match (self, rhs) {
-            (Value::Int { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
-                if *rhs != 0 {
-                    Ok(Value::int(lhs % rhs, span))
-                } else {
-                    Err(ShellError::DivisionByZero { span: op })
-                }
-            }
-            (Value::Int { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
-                if *rhs != 0.0 {
-                    Ok(Value::float(*lhs as f64 % *rhs, span))
-                } else {
-                    Err(ShellError::DivisionByZero { span: op })
-                }
-            }
-            (Value::Float { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
-                if *rhs != 0 {
-                    Ok(Value::float(*lhs % *rhs as f64, span))
-                } else {
-                    Err(ShellError::DivisionByZero { span: op })
-                }
-            }
-            (Value::Float { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
-                if *rhs != 0.0 {
-                    Ok(Value::float(lhs % rhs, span))
-                } else {
-                    Err(ShellError::DivisionByZero { span: op })
-                }
-            }
-            (Value::Duration { val: lhs, .. }, Value::Duration { val: rhs, .. }) => {
-                if *rhs != 0 {
-                    Ok(Value::duration(lhs % rhs, span))
-                } else {
-                    Err(ShellError::DivisionByZero { span: op })
-                }
-            }
-            (Value::Custom { val: lhs, .. }, rhs) => {
-                lhs.operation(span, Operator::Math(Math::Modulo), op, rhs)
-            }
-
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            }),
-        }
-    }
-
     pub fn and(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
         match (self, rhs) {
             (Value::Bool { val: lhs, .. }, Value::Bool { val: rhs, .. }) => {
@@ -3545,7 +3696,11 @@ impl Value {
                 if let Some(val) = lhs.checked_pow(*rhs as u32) {
                     Ok(Value::int(val, span))
                 } else {
-                    Err(ShellError::OperatorOverflow { msg: "pow operation overflowed".into(), span, help: "Consider using floating point values for increased range by promoting operand with 'into float'. Note: float has reduced precision!".into() })
+                    Err(ShellError::OperatorOverflow {
+                        msg: "pow operation overflowed".into(),
+                        span,
+                        help: Some("Consider using floating point values for increased range by promoting operand with 'into float'. Note: float has reduced precision!".into()),
+                    })
                 }
             }
             (Value::Int { val: lhs, .. }, Value::Float { val: rhs, .. }) => {

From e172a621f3f51eaa99358115e34f4f2a18360e25 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Mon, 4 Nov 2024 19:07:59 +0100
Subject: [PATCH 0637/1072] Consolidate uses of `test-case` to `rstest`
 (#14250)

With #14083 a dependency on `test-case` was introduced, we already
depend on the more exp(a/e)nsive `rstest` for our macro-based test case
generation (with fixtures on top)

To save on some compilation for proc macros unify to `rstest`
---
 Cargo.lock                                    | 34 -------------------
 crates/nu-cli/Cargo.toml                      |  3 +-
 .../src/commands/history/history_import.rs    | 15 ++++----
 .../nu-cli/tests/commands/history_import.rs   |  9 ++---
 4 files changed, 12 insertions(+), 49 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cb53d53fcb..7fdb186e8d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3025,7 +3025,6 @@ dependencies = [
  "rstest",
  "sysinfo 0.32.0",
  "tempfile",
- "test-case",
  "unicode-segmentation",
  "uuid",
  "which",
@@ -6242,39 +6241,6 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
-[[package]]
-name = "test-case"
-version = "3.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8"
-dependencies = [
- "test-case-macros",
-]
-
-[[package]]
-name = "test-case-core"
-version = "3.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f"
-dependencies = [
- "cfg-if",
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "test-case-macros"
-version = "3.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
- "test-case-core",
-]
-
 [[package]]
 name = "textwrap"
 version = "0.16.1"
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 0379740168..944a485d5e 100644
--- a/crates/nu-cli/Cargo.toml
+++ b/crates/nu-cli/Cargo.toml
@@ -16,7 +16,6 @@ nu-command = { path = "../nu-command", version = "0.99.2" }
 nu-test-support = { path = "../nu-test-support", version = "0.99.2" }
 rstest = { workspace = true, default-features = false }
 tempfile = { workspace = true }
-test-case = "3.3.1"
 
 [dependencies]
 nu-cmd-base = { path = "../nu-cmd-base", version = "0.99.2" }
@@ -49,4 +48,4 @@ plugin = ["nu-plugin-engine"]
 system-clipboard = ["reedline/system_clipboard"]
 
 [lints]
-workspace = true
\ No newline at end of file
+workspace = true
diff --git a/crates/nu-cli/src/commands/history/history_import.rs b/crates/nu-cli/src/commands/history/history_import.rs
index 332f5d13fc..c59d501f2f 100644
--- a/crates/nu-cli/src/commands/history/history_import.rs
+++ b/crates/nu-cli/src/commands/history/history_import.rs
@@ -283,7 +283,7 @@ fn backup(path: &Path) -> Result<Option<PathBuf>, ShellError> {
 #[cfg(test)]
 mod tests {
     use chrono::DateTime;
-    use test_case::case;
+    use rstest::rstest;
 
     use super::*;
 
@@ -378,14 +378,11 @@ mod tests {
         Value::record(rec, span)
     }
 
-    #[case(&["history.dat"], "history.dat.bak"; "no_backup")]
-    #[case(&["history.dat", "history.dat.bak"], "history.dat.bak.1"; "backup_exists")]
-    #[case(
-        &["history.dat", "history.dat.bak", "history.dat.bak.1"],
-        "history.dat.bak.2";
-        "multiple_backups_exists"
-    )]
-    fn test_find_backup_path(existing: &[&str], want: &str) {
+    #[rstest]
+    #[case::no_backup(&["history.dat"], "history.dat.bak")]
+    #[case::backup_exists(&["history.dat", "history.dat.bak"], "history.dat.bak.1")]
+    #[case::multiple_backups_exists( &["history.dat", "history.dat.bak", "history.dat.bak.1"], "history.dat.bak.2")]
+    fn test_find_backup_path(#[case] existing: &[&str], #[case] want: &str) {
         let dir = tempfile::tempdir().unwrap();
         for name in existing {
             std::fs::File::create_new(dir.path().join(name)).unwrap();
diff --git a/crates/nu-cli/tests/commands/history_import.rs b/crates/nu-cli/tests/commands/history_import.rs
index c20bf2624b..79ebdc1cfc 100644
--- a/crates/nu-cli/tests/commands/history_import.rs
+++ b/crates/nu-cli/tests/commands/history_import.rs
@@ -4,8 +4,8 @@ use reedline::{
     FileBackedHistory, History, HistoryItem, HistoryItemId, ReedlineError, SearchQuery,
     SqliteBackedHistory,
 };
+use rstest::rstest;
 use tempfile::TempDir;
-use test_case::case;
 
 struct Test {
     cfg_dir: TempDir,
@@ -251,9 +251,10 @@ fn to_empty_sqlite() {
     .run()
 }
 
-#[case(HistoryFileFormat::Plaintext; "plaintext")]
-#[case(HistoryFileFormat::Sqlite; "sqlite")]
-fn to_existing(dst_format: HistoryFileFormat) {
+#[rstest]
+#[case::plaintext(HistoryFileFormat::Plaintext)]
+#[case::sqlite(HistoryFileFormat::Sqlite)]
+fn to_existing(#[case] dst_format: HistoryFileFormat) {
     TestCase {
         dst_format,
         dst_history: vec![

From 1e051e573d0bb0cc0201da36c6b7808665540412 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Tue, 5 Nov 2024 14:12:01 +0800
Subject: [PATCH 0638/1072] fix $env.FILE_PWD and $env.CURRENT_FILE inside use
 (#14101)

# Description
Fixes: https://github.com/nushell/nushell/issues/13425

It's just a follow up to #13958.

User input can be a directory, in this case, we need to use the return
value of `find_in_dirs_env` carefully, so in case, I renamed
maybe_file_path to maybe_file_path_or_dir to emphasize it.


# User-Facing Changes
`$env.FILE_PWD` and `$env.CURRENT_FILE` will be more reliable to use.

# Tests + Formatting
Added 2 tests
---
 crates/nu-cmd-lang/src/core_commands/use_.rs | 26 ++++++++----
 crates/nu-command/tests/commands/use_.rs     | 44 ++++++++++++++++++++
 2 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/crates/nu-cmd-lang/src/core_commands/use_.rs b/crates/nu-cmd-lang/src/core_commands/use_.rs
index 8035cc81fe..978638456e 100644
--- a/crates/nu-cmd-lang/src/core_commands/use_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/use_.rs
@@ -98,15 +98,21 @@ This command is a parser keyword. For details, check:
                     engine_state.get_span_contents(import_pattern.head.span),
                 );
 
-                let maybe_file_path = find_in_dirs_env(
+                let maybe_file_path_or_dir = find_in_dirs_env(
                     &module_arg_str,
                     engine_state,
                     caller_stack,
                     get_dirs_var_from_call(caller_stack, call),
                 )?;
-                let maybe_parent = maybe_file_path
-                    .as_ref()
-                    .and_then(|path| path.parent().map(|p| p.to_path_buf()));
+                // module_arg_str maybe a directory, in this case
+                // find_in_dirs_env returns a directory.
+                let maybe_parent = maybe_file_path_or_dir.as_ref().and_then(|path| {
+                    if path.is_dir() {
+                        Some(path.to_path_buf())
+                    } else {
+                        path.parent().map(|p| p.to_path_buf())
+                    }
+                });
 
                 let mut callee_stack = caller_stack
                     .gather_captures(engine_state, &block.captures)
@@ -118,9 +124,15 @@ This command is a parser keyword. For details, check:
                     callee_stack.add_env_var("FILE_PWD".to_string(), file_pwd);
                 }
 
-                if let Some(file_path) = maybe_file_path {
-                    let file_path = Value::string(file_path.to_string_lossy(), call.head);
-                    callee_stack.add_env_var("CURRENT_FILE".to_string(), file_path);
+                if let Some(path) = maybe_file_path_or_dir {
+                    let module_file_path = if path.is_dir() {
+                        // the existence of `mod.nu` is verified in parsing time
+                        // so it's safe to use it here.
+                        Value::string(path.join("mod.nu").to_string_lossy(), call.head)
+                    } else {
+                        Value::string(path.to_string_lossy(), call.head)
+                    };
+                    callee_stack.add_env_var("CURRENT_FILE".to_string(), module_file_path);
                 }
 
                 let eval_block = get_eval_block(engine_state);
diff --git a/crates/nu-command/tests/commands/use_.rs b/crates/nu-command/tests/commands/use_.rs
index 2895e1635f..2822be83c7 100644
--- a/crates/nu-command/tests/commands/use_.rs
+++ b/crates/nu-command/tests/commands/use_.rs
@@ -308,3 +308,47 @@ fn can_use_sub_subname_from_submodule() {
     let actual = nu!(inp);
     assert_eq!(actual.out, "bar")
 }
+
+#[test]
+fn test_use_with_printing_file_pwd() {
+    Playground::setup("use_with_printing_file_pwd", |dirs, nu| {
+        let file = dirs.test().join("mod.nu");
+        nu.with_files(&[FileWithContent(
+            file.as_os_str().to_str().unwrap(),
+            r#"
+                export-env {
+                    print $env.FILE_PWD
+                }
+            "#,
+        )]);
+
+        let actual = nu!(
+            cwd: dirs.test(),
+            "use ."
+        );
+
+        assert_eq!(actual.out, dirs.test().to_string_lossy());
+    });
+}
+
+#[test]
+fn test_use_with_printing_current_file() {
+    Playground::setup("use_with_printing_current_file", |dirs, nu| {
+        let file = dirs.test().join("mod.nu");
+        nu.with_files(&[FileWithContent(
+            file.as_os_str().to_str().unwrap(),
+            r#"
+                export-env {
+                    print $env.CURRENT_FILE
+                }
+            "#,
+        )]);
+
+        let actual = nu!(
+            cwd: dirs.test(),
+            "use ."
+        );
+
+        assert_eq!(actual.out, dirs.test().join("mod.nu").to_string_lossy());
+    });
+}

From e87a35104ae2697468896baeb56ea85dfa2b289f Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Tue, 5 Nov 2024 00:28:56 -0800
Subject: [PATCH 0639/1072] Remove `as_i64` and `as_f64` (#14258)

# Description
Turns out there are duplicate conversion functions: `as_i64` and
`as_f64`. In most cases, these can be replaced with `as_int` and
`as_float`, respectively.
---
 .../src/commands/history/history_import.rs    |  2 +-
 crates/nu-cli/src/repl.rs                     |  4 +-
 crates/nu-command/src/conversions/into/int.rs |  2 +-
 crates/nu-command/src/generators/seq_date.rs  |  8 ++--
 crates/nu-protocol/src/value/from.rs          | 29 --------------
 crates/nu-protocol/src/value/mod.rs           |  1 -
 crates/nu_plugin_example/src/commands/sum.rs  |  4 +-
 .../values/nu_dataframe/conversion.rs         | 38 +++++++++----------
 src/ide.rs                                    |  6 +--
 9 files changed, 33 insertions(+), 61 deletions(-)
 delete mode 100644 crates/nu-protocol/src/value/from.rs

diff --git a/crates/nu-cli/src/commands/history/history_import.rs b/crates/nu-cli/src/commands/history/history_import.rs
index c59d501f2f..d56bc1da03 100644
--- a/crates/nu-cli/src/commands/history/history_import.rs
+++ b/crates/nu-cli/src/commands/history/history_import.rs
@@ -214,7 +214,7 @@ fn item_from_record(mut rec: Record, span: Span) -> Result<HistoryItem, ShellErr
         start_timestamp: get(rec, fields::START_TIMESTAMP, |v| Ok(v.as_date()?.to_utc()))?,
         hostname: get(rec, fields::HOSTNAME, |v| Ok(v.as_str()?.to_owned()))?,
         cwd: get(rec, fields::CWD, |v| Ok(v.as_str()?.to_owned()))?,
-        exit_status: get(rec, fields::EXIT_STATUS, |v| v.as_i64())?,
+        exit_status: get(rec, fields::EXIT_STATUS, |v| v.as_int())?,
         duration: get(rec, fields::DURATION, duration_from_value)?,
         more_info: None,
         // TODO: Currently reedline doesn't let you create session IDs.
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 4eb67f4036..08f00727f0 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -760,7 +760,7 @@ fn fill_in_result_related_history_metadata(
                 c.duration = Some(cmd_duration);
                 c.exit_status = stack
                     .get_env_var(engine_state, "LAST_EXIT_CODE")
-                    .and_then(|e| e.as_i64().ok());
+                    .and_then(|e| e.as_int().ok());
                 c
             })
             .into_diagnostic()?; // todo: don't stop repl if error here?
@@ -1247,7 +1247,7 @@ fn get_command_finished_marker(
 ) -> String {
     let exit_code = stack
         .get_env_var(engine_state, "LAST_EXIT_CODE")
-        .and_then(|e| e.as_i64().ok());
+        .and_then(|e| e.as_int().ok());
 
     if shell_integration_osc633 {
         if stack
diff --git a/crates/nu-command/src/conversions/into/int.rs b/crates/nu-command/src/conversions/into/int.rs
index 0792719fef..f55770e7ff 100644
--- a/crates/nu-command/src/conversions/into/int.rs
+++ b/crates/nu-command/src/conversions/into/int.rs
@@ -259,7 +259,7 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
                 if radix == 10 {
                     *val as i64
                 } else {
-                    match convert_int(&Value::int(*val as i64, span), span, radix).as_i64() {
+                    match convert_int(&Value::int(*val as i64, span), span, radix).as_int() {
                         Ok(v) => v,
                         _ => {
                             return Value::error(
diff --git a/crates/nu-command/src/generators/seq_date.rs b/crates/nu-command/src/generators/seq_date.rs
index 955de5a507..7369878d1d 100644
--- a/crates/nu-command/src/generators/seq_date.rs
+++ b/crates/nu-command/src/generators/seq_date.rs
@@ -1,5 +1,6 @@
 use chrono::{Duration, Local, NaiveDate};
 use nu_engine::command_prelude::*;
+use nu_protocol::FromValue;
 
 use std::fmt::Write;
 
@@ -187,13 +188,14 @@ pub fn run_seq_dates(
 ) -> Result<Value, ShellError> {
     let today = Local::now().date_naive();
     // if cannot convert , it will return error
-    let mut step_size: i64 = increment.as_i64()?;
+    let increment_span = increment.span();
+    let mut step_size: i64 = i64::from_value(increment)?;
 
     if step_size == 0 {
         return Err(ShellError::GenericError {
             error: "increment cannot be 0".into(),
             msg: "increment cannot be 0".into(),
-            span: Some(increment.span()),
+            span: Some(increment_span),
             help: None,
             inner: vec![],
         });
@@ -264,7 +266,7 @@ pub fn run_seq_dates(
     };
 
     let mut days_to_output = match day_count {
-        Some(d) => d.as_i64()?,
+        Some(d) => i64::from_value(d)?,
         None => 0i64,
     };
 
diff --git a/crates/nu-protocol/src/value/from.rs b/crates/nu-protocol/src/value/from.rs
deleted file mode 100644
index 9519f58156..0000000000
--- a/crates/nu-protocol/src/value/from.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use crate::{ShellError, Value};
-
-impl Value {
-    pub fn as_f64(&self) -> Result<f64, ShellError> {
-        match self {
-            Value::Float { val, .. } => Ok(*val),
-            x => Err(ShellError::CantConvert {
-                to_type: "f64".into(),
-                from_type: x.get_type().to_string(),
-                span: self.span(),
-                help: None,
-            }),
-        }
-    }
-
-    pub fn as_i64(&self) -> Result<i64, ShellError> {
-        match self {
-            Value::Int { val, .. } => Ok(*val),
-            Value::Filesize { val, .. } => Ok(*val),
-            Value::Duration { val, .. } => Ok(*val),
-            x => Err(ShellError::CantConvert {
-                to_type: "i64".into(),
-                from_type: x.get_type().to_string(),
-                span: self.span(),
-                help: None,
-            }),
-        }
-    }
-}
diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs
index 29f75d157d..26d8384cee 100644
--- a/crates/nu-protocol/src/value/mod.rs
+++ b/crates/nu-protocol/src/value/mod.rs
@@ -1,7 +1,6 @@
 mod custom_value;
 mod duration;
 mod filesize;
-mod from;
 mod from_value;
 mod glob;
 mod into_value;
diff --git a/crates/nu_plugin_example/src/commands/sum.rs b/crates/nu_plugin_example/src/commands/sum.rs
index e58f27420c..afa46e1f62 100644
--- a/crates/nu_plugin_example/src/commands/sum.rs
+++ b/crates/nu_plugin_example/src/commands/sum.rs
@@ -47,9 +47,9 @@ impl PluginCommand for Sum {
     ) -> Result<PipelineData, LabeledError> {
         let mut acc = IntOrFloat::Int(0);
         for value in input {
-            if let Ok(n) = value.as_i64() {
+            if let Ok(n) = value.as_int() {
                 acc.add_i64(n);
-            } else if let Ok(n) = value.as_f64() {
+            } else if let Ok(n) = value.as_float() {
                 acc.add_f64(n);
             } else {
                 return Err(LabeledError::new("Sum only accepts ints and floats")
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
index 54bcbde843..a920aac0a3 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
@@ -34,34 +34,34 @@ const VALUES_CAPACITY: usize = 10;
 
 macro_rules! value_to_primitive {
     ($value:ident, u8) => {
-        $value.as_i64().map(|v| v as u8)
+        $value.as_int().map(|v| v as u8)
     };
     ($value:ident, u16) => {
-        $value.as_i64().map(|v| v as u16)
+        $value.as_int().map(|v| v as u16)
     };
     ($value:ident, u32) => {
-        $value.as_i64().map(|v| v as u32)
+        $value.as_int().map(|v| v as u32)
     };
     ($value:ident, u64) => {
-        $value.as_i64().map(|v| v as u64)
+        $value.as_int().map(|v| v as u64)
     };
     ($value:ident, i8) => {
-        $value.as_i64().map(|v| v as i8)
+        $value.as_int().map(|v| v as i8)
     };
     ($value:ident, i16) => {
-        $value.as_i64().map(|v| v as i16)
+        $value.as_int().map(|v| v as i16)
     };
     ($value:ident, i32) => {
-        $value.as_i64().map(|v| v as i32)
+        $value.as_int().map(|v| v as i32)
     };
     ($value:ident, i64) => {
-        $value.as_i64()
+        $value.as_int()
     };
     ($value:ident, f32) => {
-        $value.as_f64().map(|v| v as f32)
+        $value.as_float().map(|v| v as f32)
     };
     ($value:ident, f64) => {
-        $value.as_f64()
+        $value.as_float()
     };
 }
 
@@ -331,7 +331,7 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
                 let series_values: Result<Vec<_>, _> = column
                     .values
                     .iter()
-                    .map(|v| value_to_option(v, |v| v.as_i64().map(|v| v as u8)))
+                    .map(|v| value_to_option(v, |v| v.as_int().map(|v| v as u8)))
                     .collect();
                 Ok(Series::new(name, series_values?))
             }
@@ -339,7 +339,7 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
                 let series_values: Result<Vec<_>, _> = column
                     .values
                     .iter()
-                    .map(|v| value_to_option(v, |v| v.as_i64().map(|v| v as u16)))
+                    .map(|v| value_to_option(v, |v| v.as_int().map(|v| v as u16)))
                     .collect();
                 Ok(Series::new(name, series_values?))
             }
@@ -347,7 +347,7 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
                 let series_values: Result<Vec<_>, _> = column
                     .values
                     .iter()
-                    .map(|v| value_to_option(v, |v| v.as_i64().map(|v| v as u32)))
+                    .map(|v| value_to_option(v, |v| v.as_int().map(|v| v as u32)))
                     .collect();
                 Ok(Series::new(name, series_values?))
             }
@@ -355,7 +355,7 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
                 let series_values: Result<Vec<_>, _> = column
                     .values
                     .iter()
-                    .map(|v| value_to_option(v, |v| v.as_i64().map(|v| v as u64)))
+                    .map(|v| value_to_option(v, |v| v.as_int().map(|v| v as u64)))
                     .collect();
                 Ok(Series::new(name, series_values?))
             }
@@ -363,7 +363,7 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
                 let series_values: Result<Vec<_>, _> = column
                     .values
                     .iter()
-                    .map(|v| value_to_option(v, |v| v.as_i64().map(|v| v as i8)))
+                    .map(|v| value_to_option(v, |v| v.as_int().map(|v| v as i8)))
                     .collect();
                 Ok(Series::new(name, series_values?))
             }
@@ -371,7 +371,7 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
                 let series_values: Result<Vec<_>, _> = column
                     .values
                     .iter()
-                    .map(|v| value_to_option(v, |v| v.as_i64().map(|v| v as i16)))
+                    .map(|v| value_to_option(v, |v| v.as_int().map(|v| v as i16)))
                     .collect();
                 Ok(Series::new(name, series_values?))
             }
@@ -379,7 +379,7 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
                 let series_values: Result<Vec<_>, _> = column
                     .values
                     .iter()
-                    .map(|v| value_to_option(v, |v| v.as_i64().map(|v| v as i32)))
+                    .map(|v| value_to_option(v, |v| v.as_int().map(|v| v as i32)))
                     .collect();
                 Ok(Series::new(name, series_values?))
             }
@@ -387,7 +387,7 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
                 let series_values: Result<Vec<_>, _> = column
                     .values
                     .iter()
-                    .map(|v| value_to_option(v, |v| v.as_i64()))
+                    .map(|v| value_to_option(v, |v| v.as_int()))
                     .collect();
                 Ok(Series::new(name, series_values?))
             }
@@ -419,7 +419,7 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
                     .iter()
                     .map(|v| {
                         value_to_option(v, |v| {
-                            v.as_i64().map(|v| nanos_from_timeunit(v, *time_unit))
+                            v.as_duration().map(|v| nanos_from_timeunit(v, *time_unit))
                         })
                     })
                     .collect();
diff --git a/src/ide.rs b/src/ide.rs
index 85046ef0d7..bf582a8287 100644
--- a/src/ide.rs
+++ b/src/ide.rs
@@ -27,7 +27,7 @@ fn find_id(
     let block = parse(working_set, Some(file_path), file, false);
     let flattened = flatten_block(working_set, &block);
 
-    if let Ok(location) = location.as_i64() {
+    if let Ok(location) = location.as_int() {
         let location = location as usize + offset;
         for item in flattened {
             if location >= item.0.start && location < item.0.end {
@@ -80,7 +80,7 @@ pub fn check(engine_state: &mut EngineState, file_path: &str, max_errors: &Value
     let mut working_set = StateWorkingSet::new(engine_state);
     let file = std::fs::read(file_path);
 
-    let max_errors = if let Ok(max_errors) = max_errors.as_i64() {
+    let max_errors = if let Ok(max_errors) = max_errors.as_int() {
         max_errors as usize
     } else {
         100
@@ -603,7 +603,7 @@ pub fn complete(engine_reference: Arc<EngineState>, file_path: &str, location: &
             std::process::exit(1);
         });
 
-    if let Ok(location) = location.as_i64() {
+    if let Ok(location) = location.as_int() {
         let results = completer.complete(
             &String::from_utf8_lossy(&file)[..location as usize],
             location as usize,

From 62198a29c2d0aee90f92ba776cfd01acf21b7ee2 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Tue, 5 Nov 2024 00:33:54 -0800
Subject: [PATCH 0640/1072] Make `to text` line endings consistent for list
 (streams) (#14166)

# Description
Fixes #14151 where `to text` treats list streams and lists values
differently.

# User-Facing Changes
New line is always added after items in a list or record except for the
last item if the `--no-newline` flag is provided.
---
 crates/nu-command/src/formats/to/text.rs    | 68 ++++++++++++++-------
 crates/nu-command/tests/commands/to_text.rs | 57 +++++++++++++----
 2 files changed, 93 insertions(+), 32 deletions(-)

diff --git a/crates/nu-command/src/formats/to/text.rs b/crates/nu-command/src/formats/to/text.rs
index 3b365d6649..b464cb86aa 100644
--- a/crates/nu-command/src/formats/to/text.rs
+++ b/crates/nu-command/src/formats/to/text.rs
@@ -3,6 +3,7 @@ use nu_engine::command_prelude::*;
 use nu_protocol::{
     format_duration, format_filesize_from_conf, ByteStream, Config, PipelineMetadata,
 };
+use std::io::Write;
 
 const LINE_ENDING: &str = if cfg!(target_os = "windows") {
     "\r\n"
@@ -40,44 +41,69 @@ impl Command for ToText {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let span = call.head;
+        let head = call.head;
         let no_newline = call.has_flag(engine_state, stack, "no-newline")?;
         let input = input.try_expand_range()?;
         let config = stack.get_config(engine_state);
 
         match input {
-            PipelineData::Empty => Ok(Value::string(String::new(), span)
+            PipelineData::Empty => Ok(Value::string(String::new(), head)
                 .into_pipeline_data_with_metadata(update_metadata(None))),
             PipelineData::Value(value, ..) => {
-                let is_compound_type = matches!(value, Value::List { .. } | Value::Record { .. });
+                let add_trailing = !no_newline
+                    && match &value {
+                        Value::List { vals, .. } => !vals.is_empty(),
+                        Value::Record { val, .. } => !val.is_empty(),
+                        _ => false,
+                    };
                 let mut str = local_into_string(value, LINE_ENDING, &config);
-                if is_compound_type && !no_newline {
+                if add_trailing {
                     str.push_str(LINE_ENDING);
                 }
-
                 Ok(
-                    Value::string(str, span)
+                    Value::string(str, head)
                         .into_pipeline_data_with_metadata(update_metadata(None)),
                 )
             }
             PipelineData::ListStream(stream, meta) => {
                 let span = stream.span();
-                let iter = stream.into_inner().map(move |value| {
-                    let mut str = local_into_string(value, LINE_ENDING, &config);
-                    if !no_newline {
-                        str.push_str(LINE_ENDING);
-                    }
-                    str
-                });
-                Ok(PipelineData::ByteStream(
-                    ByteStream::from_iter(
-                        iter,
+                let stream = if no_newline {
+                    let mut first = true;
+                    let mut iter = stream.into_inner();
+                    ByteStream::from_fn(
                         span,
                         engine_state.signals().clone(),
                         ByteStreamType::String,
-                    ),
-                    update_metadata(meta),
-                ))
+                        move |buf| {
+                            let Some(val) = iter.next() else {
+                                return Ok(false);
+                            };
+                            if first {
+                                first = false;
+                            } else {
+                                write!(buf, "{LINE_ENDING}").err_span(head)?;
+                            }
+                            // TODO: write directly into `buf` instead of creating an intermediate
+                            // string.
+                            let str = local_into_string(val, LINE_ENDING, &config);
+                            write!(buf, "{str}").err_span(head)?;
+                            Ok(true)
+                        },
+                    )
+                } else {
+                    ByteStream::from_iter(
+                        stream.into_inner().map(move |val| {
+                            let mut str = local_into_string(val, LINE_ENDING, &config);
+                            str.push_str(LINE_ENDING);
+                            str
+                        }),
+                        span,
+                        engine_state.signals().clone(),
+                        ByteStreamType::String,
+                    )
+                };
+
+                Ok(PipelineData::ByteStream(stream, update_metadata(meta)))
             }
             PipelineData::ByteStream(stream, meta) => {
                 Ok(PipelineData::ByteStream(stream, update_metadata(meta)))
@@ -88,12 +114,12 @@ impl Command for ToText {
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
-                description: "Outputs data as simple text with a newline",
+                description: "Outputs data as simple text with a trailing newline",
                 example: "[1] | to text",
                 result: Some(Value::test_string("1".to_string() + LINE_ENDING)),
             },
             Example {
-                description: "Outputs data as simple text without a newline",
+                description: "Outputs data as simple text without a trailing newline",
                 example: "[1] | to text --no-newline",
                 result: Some(Value::test_string("1")),
             },
diff --git a/crates/nu-command/tests/commands/to_text.rs b/crates/nu-command/tests/commands/to_text.rs
index f51e3838fd..0e5873be5a 100644
--- a/crates/nu-command/tests/commands/to_text.rs
+++ b/crates/nu-command/tests/commands/to_text.rs
@@ -1,19 +1,54 @@
 use nu_test_support::nu;
 
-#[test]
-fn list_to_text() {
-    let actual = nu!(r#"["foo" "bar" "baz"] | to text"#);
+const LINE_LEN: usize = if cfg!(target_os = "windows") { 2 } else { 1 };
 
-    // these actually have newlines between them in the real world but nu! strips newlines, grr
-    assert_eq!(actual.out, "foobarbaz");
+#[test]
+fn list() {
+    // Using `str length` since nu! strips newlines, grr
+    let actual = nu!(r#"[] | to text | str length"#);
+    assert_eq!(actual.out, "0");
+
+    let actual = nu!(r#"[a] | to text | str length"#);
+    assert_eq!(actual.out, (1 + LINE_LEN).to_string());
+
+    let actual = nu!(r#"[a b] | to text | str length"#);
+    assert_eq!(actual.out, (2 * (1 + LINE_LEN)).to_string());
 }
 
-// the output should be the same when `to text` gets a ListStream instead of a Value::List
+// The output should be the same when `to text` gets a ListStream instead of a Value::List.
 #[test]
-fn list_stream_to_text() {
-    // use `each` to convert the list to a ListStream
-    let actual = nu!(r#"["foo" "bar" "baz"] | each {|i| $i} | to text"#);
+fn list_stream() {
+    let actual = nu!(r#"[] | each {} | to text | str length"#);
+    assert_eq!(actual.out, "0");
 
-    // these actually have newlines between them in the real world but nu! strips newlines, grr
-    assert_eq!(actual.out, "foobarbaz");
+    let actual = nu!(r#"[a] | each {} | to text | str length"#);
+    assert_eq!(actual.out, (1 + LINE_LEN).to_string());
+
+    let actual = nu!(r#"[a b] | each {} | to text | str length"#);
+    assert_eq!(actual.out, (2 * (1 + LINE_LEN)).to_string());
+}
+
+#[test]
+fn list_no_newline() {
+    let actual = nu!(r#"[] | to text -n | str length"#);
+    assert_eq!(actual.out, "0");
+
+    let actual = nu!(r#"[a] | to text -n | str length"#);
+    assert_eq!(actual.out, "1");
+
+    let actual = nu!(r#"[a b] | to text -n | str length"#);
+    assert_eq!(actual.out, (2 + LINE_LEN).to_string());
+}
+
+// The output should be the same when `to text` gets a ListStream instead of a Value::List.
+#[test]
+fn list_stream_no_newline() {
+    let actual = nu!(r#"[] | each {} | to text -n | str length"#);
+    assert_eq!(actual.out, "0");
+
+    let actual = nu!(r#"[a] | each {} | to text -n | str length"#);
+    assert_eq!(actual.out, "1");
+
+    let actual = nu!(r#"[a b] | each {} | to text -n | str length"#);
+    assert_eq!(actual.out, (2 + LINE_LEN).to_string());
 }

From 7a7df3e63581e4b56f6734e0d8d0036fdd4200af Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Tue, 5 Nov 2024 03:39:08 -0500
Subject: [PATCH 0641/1072] Switch to unicase's to_folded_case (#14255)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
Switch `to_folded_case` to a proper case fold instead of
`str::to_lowercase` now that unicase exposes its `to_folded_case`
method.

Rel: #10884, https://github.com/seanmonstar/unicase/issues/61

# User-Facing Changes

Case insensitive sorts now do proper case folding.

Old behavior:

```nushell
[dreißig DREISSIG] | sort -i
# => ╭───┬──────────╮
# => │ 0 │ DREISSIG │
# => │ 1 │ dreißig  │
# => ╰───┴──────────╯
```

New behavior:

```nushell
[dreißig DREISSIG] | sort -i
# => ╭───┬──────────╮
# => │ 0 │ dreißig  │
# => │ 1 │ DREISSIG │
# => ╰───┴──────────╯
```
---
 crates/nu-utils/src/casing.rs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/crates/nu-utils/src/casing.rs b/crates/nu-utils/src/casing.rs
index 6d22d6860b..5ce15eacb5 100644
--- a/crates/nu-utils/src/casing.rs
+++ b/crates/nu-utils/src/casing.rs
@@ -9,11 +9,6 @@ pub trait IgnoreCaseExt {
     /// language-invariant and consistent. Case folded text should be used
     /// solely for processing and generally should not be stored or displayed.
     ///
-    /// Note: this method might only do [`str::to_lowercase`] instead of a
-    /// full case fold, depending on how Nu is compiled. You should still
-    /// prefer using this method for generating case-insensitive strings,
-    /// though, as it expresses intent much better than `to_lowercase`.
-    ///
     /// [case folded]: <https://unicode.org/faq/casemap_charprop.html#2>
     fn to_folded_case(&self) -> String;
 
@@ -40,9 +35,7 @@ pub trait IgnoreCaseExt {
 
 impl IgnoreCaseExt for str {
     fn to_folded_case(&self) -> String {
-        // we only do to_lowercase, as unicase doesn't expose its case fold yet
-        // (seanmonstar/unicase#61) and we don't want to pull in another table
-        self.to_lowercase()
+        UniCase::new(self).to_folded_case()
     }
 
     fn eq_ignore_case(&self, other: &str) -> bool {

From a60f4541545a2c6f32187924d35a83867e4a09c6 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Tue, 5 Nov 2024 15:53:41 -0500
Subject: [PATCH 0642/1072] No longer autoload deprecated-dirs (#14242)

# Description

Follow-up to #13842. In that commit, using one of the `dirs`/`shells`
aliases would notify the user that it would no longer be autoloaded in
future releases. This is the removal stage.

Side-benefit: Additional 1ms+ load time improvement

# User-Facing Changes

Breaking-change - `dirs` aliases are no longer autoloaded.

Users can either choose to continue using the aliases by adding the
following to the startup:

```nu
use std/dirs shells-aliases *
```

Alternatively, users can use the `dirs` subcommands (rather than the
aliases) with:

```nu
use std/dirs
```
---
 crates/nu-std/src/lib.rs                 |  14 --
 crates/nu-std/std/deprecated_dirs/mod.nu | 161 -----------------------
 2 files changed, 175 deletions(-)
 delete mode 100644 crates/nu-std/std/deprecated_dirs/mod.nu

diff --git a/crates/nu-std/src/lib.rs b/crates/nu-std/src/lib.rs
index 09585b8697..ebc6ee0053 100644
--- a/crates/nu-std/src/lib.rs
+++ b/crates/nu-std/src/lib.rs
@@ -54,12 +54,6 @@ pub fn load_standard_library(
         ("mod.nu", "std/math", include_str!("../std/math/mod.nu")),
         ("mod.nu", "std/util", include_str!("../std/util/mod.nu")),
         ("mod.nu", "std/xml", include_str!("../std/xml/mod.nu")),
-        // Remove in following release
-        (
-            "mod.nu",
-            "std/deprecated_dirs",
-            include_str!("../std/deprecated_dirs/mod.nu"),
-        ),
     ];
 
     for (filename, std_subdir_name, content) in std_submodules.drain(..) {
@@ -87,14 +81,6 @@ pub fn load_standard_library(
         let source = r#"
 # Prelude
 use std/core *
-use std/deprecated_dirs [
-    enter
-    shells
-    g
-    n
-    p
-    dexit
-]
 "#;
 
         // Add a placeholder file to the stack of files being evaluated.
diff --git a/crates/nu-std/std/deprecated_dirs/mod.nu b/crates/nu-std/std/deprecated_dirs/mod.nu
deleted file mode 100644
index 6bdc007851..0000000000
--- a/crates/nu-std/std/deprecated_dirs/mod.nu
+++ /dev/null
@@ -1,161 +0,0 @@
-# Maintain a list of working directories and navigate them
-
-# The directory stack.
-#
-# Exception: the entry for the current directory contains an
-# irrelevant value. Instead, the source of truth for the working
-# directory is $env.PWD. It has to be this way because cd doesn't
-# know about this module.
-#
-# Example: the following state represents a user-facing directory
-# stack of [/a, /var/tmp, /c], and we are currently in /var/tmp .
-#
-#     PWD = /var/tmp
-#     DIRS_POSITION = 1
-#     DIRS_LIST = [/a, /b, /c]
-#
-# This situation could arise if we started with [/a, /b, /c], then
-# we changed directories from /b to /var/tmp.
-export-env {
-    $env.DIRS_POSITION = 0
-    $env.DIRS_LIST = [($env.PWD | path expand)]
-}
-
-def deprecation_warning [ ] {
-print -e $"
-(ansi red)Warning:(ansi reset) The 'std dirs' module will no longer automatically
-be loaded in the next release. To continue using the Shells
-feature, and to remove this warning, please add the following
-to your startup configuration \(typically env.nu or config.nu\):
-
-use std/dirs shells-aliases *
-
-Or see the documentation for more options.
-"
-}
-
-# Add one or more directories to the list.
-# PWD becomes first of the newly added directories.
-export def --env add [
-    ...paths: string    # directory or directories to add to working list
-] {
-    deprecation_warning
-
-    mut abspaths = []
-    for p in $paths {
-        let exp = ($p | path expand)
-        if ($exp | path type) != 'dir' {
-            let span = (metadata $p).span
-            error make {msg: "not a directory", label: {text: "not a directory", span: $span } }
-        }
-        $abspaths = ($abspaths | append $exp)
-    }
-
-    $env.DIRS_LIST = ($env.DIRS_LIST | insert ($env.DIRS_POSITION + 1) $abspaths | flatten)
-
-    _fetch 1
-}
-
-export alias enter = add
-
-# Advance to the next directory in the list or wrap to beginning.
-export def --env next [
-    N:int = 1   # number of positions to move.
-] {
-    deprecation_warning
-    _fetch $N
-}
-
-export alias n = next
-
-# Back up to the previous directory or wrap to the end.
-export def --env prev [
-    N:int = 1   # number of positions to move.
-] {
-    deprecation_warning
-    _fetch (-1 * $N)
-}
-
-export alias p = prev
-
-# Drop the current directory from the list, if it's not the only one.
-# PWD becomes the next working directory
-export def --env drop [] {
-    deprecation_warning
-    if ($env.DIRS_LIST | length) > 1 {
-        $env.DIRS_LIST = ($env.DIRS_LIST | reject $env.DIRS_POSITION)
-        if ($env.DIRS_POSITION >= ($env.DIRS_LIST | length)) {$env.DIRS_POSITION = 0}
-    }
-
-    # step to previous slot
-    _fetch -1 --forget_current --always_cd
-
-}
-
-export alias dexit = drop
-
-# Display current working directories.
-export def --env show [] {
-    deprecation_warning
-    mut out = []
-    for $p in ($env.DIRS_LIST | enumerate) {
-        let is_act_slot = $p.index == $env.DIRS_POSITION
-        $out = ($out | append [
-            [active, path];
-            [($is_act_slot),
-            (if $is_act_slot {$env.PWD} else {$p.item})   # show current PWD in lieu of active slot
-            ]
-        ])
-    }
-
-    $out
-}
-
-export alias shells = show
-
-export def --env goto [shell?: int] {
-    deprecation_warning
-    if $shell == null {
-        return (show)
-    }
-
-    if $shell < 0 or $shell >= ($env.DIRS_LIST | length) {
-        let span = (metadata $shell | get span)
-        error make {
-            msg: $"(ansi red_bold)invalid_shell_index(ansi reset)"
-            label: {
-                text: $"`shell` should be between 0 and (($env.DIRS_LIST | length) - 1)"
-                span: $span
-            }
-        }
-    }
-
-    _fetch ($shell - $env.DIRS_POSITION)
-}
-
-export alias g = goto
-
-# fetch item helper
-def --env _fetch [
-    offset: int,        # signed change to position
-    --forget_current    # true to skip saving PWD
-    --always_cd         # true to always cd
-] {
-    if not ($forget_current) {
-        # first record current working dir in current slot of ring, to track what CD may have done.
-        $env.DIRS_LIST = ($env.DIRS_LIST | upsert $env.DIRS_POSITION $env.PWD)
-    }
-
-    # figure out which entry to move to
-    # nushell 'mod' operator is really 'remainder', can return negative values.
-    # see: https://stackoverflow.com/questions/13683563/whats-the-difference-between-mod-and-remainder
-    let len = ($env.DIRS_LIST | length)
-    mut pos = ($env.DIRS_POSITION + $offset) mod $len
-    if ($pos < 0) { $pos += $len}
-
-    # if using a different position in ring, CD there.
-    if ($always_cd or $pos != $env.DIRS_POSITION) {
-        $env.DIRS_POSITION = $pos
-        cd ($env.DIRS_LIST | get $pos )
-    }
-}

From ef55367224b93497d9db5a16ecb02cece7908824 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Nov 2024 10:30:55 +0800
Subject: [PATCH 0643/1072] Bump softprops/action-gh-release from 2.0.8 to
 2.0.9 (#14273)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps
[softprops/action-gh-release](https://github.com/softprops/action-gh-release)
from 2.0.8 to 2.0.9.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/softprops/action-gh-release/releases">softprops/action-gh-release's
releases</a>.</em></p>
<blockquote>
<h2>v2.0.9</h2>
<!-- raw HTML omitted -->
<h2>What's Changed</h2>
<ul>
<li>maintenance release with updated dependencies</li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/kbakdev"><code>@​kbakdev</code></a> made
their first contribution in <a
href="https://redirect.github.com/softprops/action-gh-release/pull/521">softprops/action-gh-release#521</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/softprops/action-gh-release/compare/v2...v2.0.9">https://github.com/softprops/action-gh-release/compare/v2...v2.0.9</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md">softprops/action-gh-release's
changelog</a>.</em></p>
<blockquote>
<h2>2.0.9</h2>
<ul>
<li>maintenance release with updated dependencies</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/softprops/action-gh-release/commit/e7a8f85e1c67a31e6ed99a94b41bd0b71bbee6b8"><code>e7a8f85</code></a>
chore: release 2.0.9</li>
<li><a
href="https://github.com/softprops/action-gh-release/commit/04afa1392e42ba338276f0b186157caf99007c97"><code>04afa13</code></a>
chore(deps): bump actions/setup-node from 4.0.4 to 4.1.0 (<a
href="https://redirect.github.com/softprops/action-gh-release/issues/535">#535</a>)</li>
<li><a
href="https://github.com/softprops/action-gh-release/commit/894468a03c4eaf68d8fb44577915671344967566"><code>894468a</code></a>
chore(deps): bump actions/checkout from 4.2.1 to 4.2.2 (<a
href="https://redirect.github.com/softprops/action-gh-release/issues/534">#534</a>)</li>
<li><a
href="https://github.com/softprops/action-gh-release/commit/3bd23aa9eca0e0446f333cee94b02c2c9c876bdc"><code>3bd23aa</code></a>
chore(deps): bump <code>@​types/node</code> from 22.7.5 to 22.8.2 (<a
href="https://redirect.github.com/softprops/action-gh-release/issues/533">#533</a>)</li>
<li><a
href="https://github.com/softprops/action-gh-release/commit/21eb2f9554ab47bde7662aa1a5586d16d1d63af3"><code>21eb2f9</code></a>
chore(deps): bump <code>@​types/jest</code> from 29.5.13 to 29.5.14 (<a
href="https://redirect.github.com/softprops/action-gh-release/issues/532">#532</a>)</li>
<li><a
href="https://github.com/softprops/action-gh-release/commit/cd8b57e57218a24af14e307ad8491ec133804ef1"><code>cd8b57e</code></a>
remove unused imports (<a
href="https://redirect.github.com/softprops/action-gh-release/issues/521">#521</a>)</li>
<li><a
href="https://github.com/softprops/action-gh-release/commit/820a5adc43b026a42c57f0a28947eec308610457"><code>820a5ad</code></a>
chore(deps): bump actions/checkout from 4.2.0 to 4.2.1 (<a
href="https://redirect.github.com/softprops/action-gh-release/issues/522">#522</a>)</li>
<li><a
href="https://github.com/softprops/action-gh-release/commit/9d04f90cd87b3f3e773623ca57aecc3268b588d9"><code>9d04f90</code></a>
chore(deps): bump <code>@​octokit/plugin-throttling</code> from 9.3.1 to
9.3.2 (<a
href="https://redirect.github.com/softprops/action-gh-release/issues/523">#523</a>)</li>
<li><a
href="https://github.com/softprops/action-gh-release/commit/aaf1d5f6d5acf0bd13aa894c5c64047075d912f9"><code>aaf1d5f</code></a>
chore(deps): bump <code>@​actions/core</code> from 1.10.1 to 1.11.1 (<a
href="https://redirect.github.com/softprops/action-gh-release/issues/524">#524</a>)</li>
<li><a
href="https://github.com/softprops/action-gh-release/commit/7d33a7ecc3254026091a1eb3023db3e4cfccb4e3"><code>7d33a7e</code></a>
chore(deps): bump <code>@​types/node</code> from 22.5.5 to 22.7.5 (<a
href="https://redirect.github.com/softprops/action-gh-release/issues/525">#525</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/softprops/action-gh-release/compare/v2.0.8...v2.0.9">compare
view</a></li>
</ul>
</details>
<br />

<details>
<summary>Most Recent Ignore Conditions Applied to This Pull
Request</summary>

| Dependency Name | Ignore Conditions |
| --- | --- |
| softprops/action-gh-release | [< 0.2, > 0.1.13] |
</details>


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=softprops/action-gh-release&package-manager=github_actions&previous-version=2.0.8&new-version=2.0.9)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/nightly-build.yml | 2 +-
 .github/workflows/release.yml       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 639938cc4c..25b0caf2b9 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -170,7 +170,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.8
+      uses: softprops/action-gh-release@v2.0.9
       if: ${{ startsWith(github.repository, 'nushell/nightly') }}
       with:
         prerelease: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 76a247ff7a..783ae18868 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -100,7 +100,7 @@ jobs:
 
     # REF: https://github.com/marketplace/actions/gh-release
     - name: Publish Archive
-      uses: softprops/action-gh-release@v2.0.8
+      uses: softprops/action-gh-release@v2.0.9
       if: ${{ startsWith(github.ref, 'refs/tags/') }}
       with:
         draft: true
@@ -124,7 +124,7 @@ jobs:
     - name: Create Checksums
       run: cd release && shasum -a 256 * > ../SHA256SUMS
     - name: Publish Checksums
-      uses: softprops/action-gh-release@v2.0.8
+      uses: softprops/action-gh-release@v2.0.9
       with:
         draft: true
         files: SHA256SUMS

From 0955e8c5b6b0be77139e15277d510283f736327b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Nov 2024 10:31:21 +0800
Subject: [PATCH 0644/1072] Bump scraper from 0.20.0 to 0.21.0 (#14270)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [scraper](https://github.com/causal-agent/scraper) from 0.20.0 to
0.21.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/causal-agent/scraper/releases">scraper's
releases</a>.</em></p>
<blockquote>
<h2>0.21.0</h2>
<h2>What's Changed</h2>
<ul>
<li>Bump indexmap from 2.3.0 to 2.4.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/rust-scraper/scraper/pull/197">rust-scraper/scraper#197</a></li>
<li>Bump ego-tree from 0.6.2 to 0.7.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/rust-scraper/scraper/pull/198">rust-scraper/scraper#198</a></li>
<li>migrate once_cell::unsync::OnceCell to std::cell::OnceCell + drop
dep… by <a
href="https://github.com/LoZack19"><code>@​LoZack19</code></a> in <a
href="https://redirect.github.com/rust-scraper/scraper/pull/199">rust-scraper/scraper#199</a></li>
<li>Introduce workspaces by <a
href="https://github.com/LoZack19"><code>@​LoZack19</code></a> in <a
href="https://redirect.github.com/rust-scraper/scraper/pull/201">rust-scraper/scraper#201</a></li>
<li>Now that ego-tree's Traverse is a fused iterator, so are our Select
and Text by <a
href="https://github.com/adamreichold"><code>@​adamreichold</code></a>
in <a
href="https://redirect.github.com/rust-scraper/scraper/pull/202">rust-scraper/scraper#202</a></li>
<li>Bump indexmap from 2.4.0 to 2.5.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/rust-scraper/scraper/pull/204">rust-scraper/scraper#204</a></li>
<li>Bump ego-tree from 0.8.0 to 0.9.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/rust-scraper/scraper/pull/205">rust-scraper/scraper#205</a></li>
<li>Bump indexmap from 2.5.0 to 2.6.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/rust-scraper/scraper/pull/211">rust-scraper/scraper#211</a></li>
<li>Bump selectors, cssparser and html5ever by <a
href="https://github.com/adamreichold"><code>@​adamreichold</code></a>
in <a
href="https://redirect.github.com/rust-scraper/scraper/pull/214">rust-scraper/scraper#214</a></li>
<li>Handle missing Token::Delim variant when rendering errors by <a
href="https://github.com/adamreichold"><code>@​adamreichold</code></a>
in <a
href="https://redirect.github.com/rust-scraper/scraper/pull/213">rust-scraper/scraper#213</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/LoZack19"><code>@​LoZack19</code></a>
made their first contribution in <a
href="https://redirect.github.com/rust-scraper/scraper/pull/199">rust-scraper/scraper#199</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/rust-scraper/scraper/compare/v0.20.0...v0.21.0">https://github.com/rust-scraper/scraper/compare/v0.20.0...v0.21.0</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/rust-scraper/scraper/commit/93afdd96be2ecdea4676966f57d36f4ee4f6b4fa"><code>93afdd9</code></a>
Version 0.21.0</li>
<li><a
href="https://github.com/rust-scraper/scraper/commit/9843bc8efe14df55ac7dcc8e4604eb991fb31a28"><code>9843bc8</code></a>
Merge pull request <a
href="https://redirect.github.com/causal-agent/scraper/issues/213">#213</a>
from rust-scraper/fix-issue221</li>
<li><a
href="https://github.com/rust-scraper/scraper/commit/2ede12e4af4185e5eb9db46ea1b35715c099a554"><code>2ede12e</code></a>
Merge pull request <a
href="https://redirect.github.com/causal-agent/scraper/issues/214">#214</a>
from rust-scraper/bump-selectors</li>
<li><a
href="https://github.com/rust-scraper/scraper/commit/fddd90ed14791e16f0f459d2bee9c1eca5d90d5e"><code>fddd90e</code></a>
Bump html5ever to its current stable version and adjust our usage
accordingly</li>
<li><a
href="https://github.com/rust-scraper/scraper/commit/7d422d8f82ce4a5f3664a697567add1aae2a91f8"><code>7d422d8</code></a>
Bump selectors and cssparser to their current stable versions and adjust
our ...</li>
<li><a
href="https://github.com/rust-scraper/scraper/commit/53ac848a12a36de65da7b99793a1c49a303dfdc7"><code>53ac848</code></a>
Handle missing Token::Delim variant when rendering errors</li>
<li><a
href="https://github.com/rust-scraper/scraper/commit/e0d4ea7a3373b3a75bd79ad85af21243fac93e60"><code>e0d4ea7</code></a>
Bump indexmap from 2.5.0 to 2.6.0</li>
<li><a
href="https://github.com/rust-scraper/scraper/commit/c3735b29dcf48aa83c35bd80108bcde2d560447f"><code>c3735b2</code></a>
Merge pull request <a
href="https://redirect.github.com/causal-agent/scraper/issues/205">#205</a>
from rust-scraper/dependabot/cargo/ego-tree-0.9.0</li>
<li><a
href="https://github.com/rust-scraper/scraper/commit/faca0a96442bf1aa1ab61a252a0316f3aa0b699f"><code>faca0a9</code></a>
Merge pull request <a
href="https://redirect.github.com/causal-agent/scraper/issues/204">#204</a>
from rust-scraper/dependabot/cargo/indexmap-2.5.0</li>
<li><a
href="https://github.com/rust-scraper/scraper/commit/b945d5af6c2669f473288b99f25750d9262aae2f"><code>b945d5a</code></a>
Bump ego-tree from 0.8.0 to 0.9.0</li>
<li>Additional commits viewable in <a
href="https://github.com/causal-agent/scraper/compare/v0.20.0...v0.21.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=scraper&package-manager=cargo&previous-version=0.20.0&new-version=0.21.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                        | 127 +++++++++++++++---------------
 crates/nu_plugin_query/Cargo.toml |   2 +-
 2 files changed, 65 insertions(+), 64 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7fdb186e8d..8db2f76278 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -715,7 +715,7 @@ checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e"
 dependencies = [
  "chrono",
  "chrono-tz-build 0.2.1",
- "phf 0.11.2",
+ "phf",
 ]
 
 [[package]]
@@ -726,7 +726,7 @@ checksum = "cd6dd8046d00723a59a2f8c5f295c515b9bb9a331ee4f8f3d4dd49e428acd3b6"
 dependencies = [
  "chrono",
  "chrono-tz-build 0.4.0",
- "phf 0.11.2",
+ "phf",
 ]
 
 [[package]]
@@ -736,8 +736,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f"
 dependencies = [
  "parse-zoneinfo",
- "phf 0.11.2",
- "phf_codegen 0.11.2",
+ "phf",
+ "phf_codegen",
 ]
 
 [[package]]
@@ -747,7 +747,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e94fea34d77a245229e7746bd2beb786cd2a896f306ff491fb8cecb3074b10a7"
 dependencies = [
  "parse-zoneinfo",
- "phf_codegen 0.11.2",
+ "phf_codegen",
 ]
 
 [[package]]
@@ -1090,14 +1090,14 @@ dependencies = [
 
 [[package]]
 name = "cssparser"
-version = "0.31.2"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b3df4f93e5fbbe73ec01ec8d3f68bba73107993a5b1e7519273c32db9b0d5be"
+checksum = "b7c66d1cd8ed61bf80b38432613a7a2f09401ab8d0501110655f8b341484a3e3"
 dependencies = [
  "cssparser-macros",
  "dtoa-short",
  "itoa",
- "phf 0.10.1",
+ "phf",
  "smallvec",
 ]
 
@@ -1341,9 +1341,9 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
 [[package]]
 name = "ego-tree"
-version = "0.6.3"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12a0bb14ac04a9fcf170d0bbbef949b44cc492f4452bd20c095636956f653642"
+checksum = "7c6ba7d4eec39eaa9ab24d44a0e73a7949a1095a8b3f3abb11eddf27dbb56a53"
 
 [[package]]
 name = "either"
@@ -1939,7 +1939,21 @@ checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4"
 dependencies = [
  "log",
  "mac",
- "markup5ever",
+ "markup5ever 0.12.1",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.75",
+]
+
+[[package]]
+name = "html5ever"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e15626aaf9c351bc696217cbe29cb9b5e86c43f8a46b5e2f5c6c5cf7cb904ce"
+dependencies = [
+ "log",
+ "mac",
+ "markup5ever 0.14.0",
  "proc-macro2",
  "quote",
  "syn 2.0.75",
@@ -2432,7 +2446,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -2626,8 +2640,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45"
 dependencies = [
  "log",
- "phf 0.11.2",
- "phf_codegen 0.11.2",
+ "phf",
+ "phf_codegen",
+ "string_cache",
+ "string_cache_codegen",
+ "tendril",
+]
+
+[[package]]
+name = "markup5ever"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82c88c6129bd24319e62a0359cb6b958fa7e8be6e19bb1663bc396b90883aca5"
+dependencies = [
+ "log",
+ "phf",
+ "phf_codegen",
  "string_cache",
  "string_cache_codegen",
  "tendril",
@@ -2639,8 +2667,8 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edaa21ab3701bfee5099ade5f7e1f84553fd19228cf332f13cd6e964bf59be18"
 dependencies = [
- "html5ever",
- "markup5ever",
+ "html5ever 0.27.0",
+ "markup5ever 0.12.1",
  "tendril",
  "xml5ever",
 ]
@@ -3871,8 +3899,8 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "330138902ab4dab09a86e6b7ab7ddeffb5f8435d52fe0df1bce8b06a17b10ee4"
 dependencies = [
- "phf 0.11.2",
- "phf_codegen 0.11.2",
+ "phf",
+ "phf_codegen",
  "serde",
  "serde_json",
 ]
@@ -4132,36 +4160,16 @@ dependencies = [
  "indexmap",
 ]
 
-[[package]]
-name = "phf"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
-dependencies = [
- "phf_macros",
- "phf_shared 0.10.0",
- "proc-macro-hack",
-]
-
 [[package]]
 name = "phf"
 version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
 dependencies = [
+ "phf_macros",
  "phf_shared 0.11.2",
 ]
 
-[[package]]
-name = "phf_codegen"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
-dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
-]
-
 [[package]]
 name = "phf_codegen"
 version = "0.11.2"
@@ -4194,16 +4202,15 @@ dependencies = [
 
 [[package]]
 name = "phf_macros"
-version = "0.10.0"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0"
+checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
 dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
- "proc-macro-hack",
+ "phf_generator 0.11.2",
+ "phf_shared 0.11.2",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -4871,12 +4878,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.20+deprecated"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.86"
@@ -5538,15 +5539,15 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "scraper"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b90460b31bfe1fc07be8262e42c665ad97118d4585869de9345a84d501a9eaf0"
+checksum = "b0e749d29b2064585327af5038a5a8eb73aeebad4a3472e83531a436563f7208"
 dependencies = [
  "ahash 0.8.11",
  "cssparser",
  "ego-tree",
- "html5ever",
- "once_cell",
+ "html5ever 0.29.0",
+ "precomputed-hash",
  "selectors",
  "tendril",
 ]
@@ -5608,9 +5609,9 @@ dependencies = [
 
 [[package]]
 name = "selectors"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06"
+checksum = "fd568a4c9bb598e291a08244a5c1f5a8a6650bee243b5b0f8dbb3d9cc1d87fe8"
 dependencies = [
  "bitflags 2.6.0",
  "cssparser",
@@ -5618,8 +5619,8 @@ dependencies = [
  "fxhash",
  "log",
  "new_debug_unreachable",
- "phf 0.10.1",
- "phf_codegen 0.10.0",
+ "phf",
+ "phf_codegen",
  "precomputed-hash",
  "servo_arc",
  "smallvec",
@@ -5736,9 +5737,9 @@ dependencies = [
 
 [[package]]
 name = "servo_arc"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d036d71a959e00c77a63538b90a6c2390969f9772b096ea837205c6bd0491a44"
+checksum = "ae65c4249478a2647db249fb43e23cec56a2c8974a427e7bd8cb5a1d0964921a"
 dependencies = [
  "stable_deref_trait",
 ]
@@ -7051,7 +7052,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70862efc041d46e6bbaa82bb9c34ae0596d090e86cbd14bd9e93b36ee6802eac"
 dependencies = [
  "curl",
- "html5ever",
+ "html5ever 0.27.0",
  "markup5ever_rcdom",
  "serde",
  "serde_json",
@@ -7478,7 +7479,7 @@ checksum = "9bbb26405d8e919bc1547a5aa9abc95cbfa438f04844f5fdd9dc7596b748bf69"
 dependencies = [
  "log",
  "mac",
- "markup5ever",
+ "markup5ever 0.12.1",
 ]
 
 [[package]]
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index c4df8257e9..a6d78c7162 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -20,7 +20,7 @@ nu-plugin = { path = "../nu-plugin", version = "0.99.2" }
 nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
 
 gjson = "0.8"
-scraper = { default-features = false, version = "0.20" }
+scraper = { default-features = false, version = "0.21" }
 sxd-document = "0.3"
 sxd-xpath = "0.4"
 webpage = { version = "2.0.1", features = ["serde"] }

From 90bd8c82b72e28b9be15a5e4b786dc0dd9745453 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Nov 2024 10:31:30 +0800
Subject: [PATCH 0645/1072] Bump notify-debouncer-full from 0.3.1 to 0.3.2
 (#14271)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [notify-debouncer-full](https://github.com/notify-rs/notify) from
0.3.1 to 0.3.2.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/notify-rs/notify/releases">notify-debouncer-full's
releases</a>.</em></p>
<blockquote>
<h2>debouncer-full-0.3.2</h2>
<h2>What's Changed</h2>
<ul>
<li>FIX: ordering of debounced events could lead to a panic with Rust
1.81.0 and above by <a
href="https://github.com/dfaust"><code>@​dfaust</code></a> in <a
href="https://redirect.github.com/notify-rs/notify/pull/643">notify-rs/notify#643</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/notify-rs/notify/compare/debouncer-full-0.3.1...debouncer-full-0.3.2">https://github.com/notify-rs/notify/compare/debouncer-full-0.3.1...debouncer-full-0.3.2</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/notify-rs/notify/blob/main/CHANGELOG.md">notify-debouncer-full's
changelog</a>.</em></p>
<blockquote>
<h2>debouncer-full 0.3.2 (2024-09-29)</h2>
<ul>
<li>FIX: ordering of debounced events could lead to a panic with Rust
1.81.0 and above <a
href="https://redirect.github.com/notify-rs/notify/issues/636">#636</a></li>
</ul>
<p><a
href="https://redirect.github.com/notify-rs/notify/issues/636">#636</a>:
<a
href="https://redirect.github.com/notify-rs/notify/issues/636">notify-rs/notify#636</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/notify-rs/notify/commit/2bef540ff48885a243ab363244766a6bee873a4d"><code>2bef540</code></a>
Merge pull request <a
href="https://redirect.github.com/notify-rs/notify/issues/643">#643</a>
from dfaust/release-debouncer-full-0.3.2</li>
<li><a
href="https://github.com/notify-rs/notify/commit/ef8bc72b4bd0d8dd6f6b869f593277f9f9eac400"><code>ef8bc72</code></a>
Fix debouncer-full version number and prepare release</li>
<li><a
href="https://github.com/notify-rs/notify/commit/3606af8005f01da1bf018807a05dbbbec68d1823"><code>3606af8</code></a>
Fix compatibility with MSRV 1.60</li>
<li><a
href="https://github.com/notify-rs/notify/commit/f5c47023a6cd331715f8b43c904d1fb51ba94d80"><code>f5c4702</code></a>
Improve <code>sort_events</code> performance</li>
<li><a
href="https://github.com/notify-rs/notify/commit/8f809f71974bd895dbf6ed3f014c5320e6d33855"><code>8f809f7</code></a>
Fix ordering of debounced events</li>
<li>See full diff in <a
href="https://github.com/notify-rs/notify/compare/debouncer-full-0.3.1...debouncer-full-0.3.2">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=notify-debouncer-full&package-manager=cargo&previous-version=0.3.1&new-version=0.3.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8db2f76278..62870922e4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2940,9 +2940,9 @@ dependencies = [
 
 [[package]]
 name = "notify-debouncer-full"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f5dab59c348b9b50cf7f261960a20e389feb2713636399cd9082cd4b536154"
+checksum = "fb7fd166739789c9ff169e654dc1501373db9d80a4c3f972817c8a4d7cf8f34e"
 dependencies = [
  "file-id",
  "log",
@@ -7108,7 +7108,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]

From b968376be9d4fb21f7ba5ccc5ae1fe3b820cc22f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Nov 2024 10:48:34 +0800
Subject: [PATCH 0646/1072] Bump crate-ci/typos from 1.26.8 to 1.27.0 (#14272)

Bumps [crate-ci/typos](https://github.com/crate-ci/typos) from 1.26.8 to
1.27.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/crate-ci/typos/releases">crate-ci/typos's
releases</a>.</em></p>
<blockquote>
<h2>v1.27.0</h2>
<h2>[1.27.0] - 2024-11-01</h2>
<h3>Features</h3>
<ul>
<li>Updated the dictionary with the <a
href="https://redirect.github.com/crate-ci/typos/issues/1106">October
2024</a> changes</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/crate-ci/typos/blob/master/CHANGELOG.md">crate-ci/typos's
changelog</a>.</em></p>
<blockquote>
<h2>[1.27.0] - 2024-11-01</h2>
<h3>Features</h3>
<ul>
<li>Updated the dictionary with the <a
href="https://redirect.github.com/crate-ci/typos/issues/1106">October
2024</a> changes</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/crate-ci/typos/commit/d01f29c66d1bf1a08730750f61d86c210b0d039d"><code>d01f29c</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/52e950bb130b2bdee93bba2b1973c8f7d8ac5c46"><code>52e950b</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/19cfc03ea4e6fd581972b77eb3761351a4db7ee6"><code>19cfc03</code></a>
docs: Update changelog</li>
<li><a
href="https://github.com/crate-ci/typos/commit/f80b1564bd618fb5325b8c0d52849ac7da0bbaea"><code>f80b156</code></a>
Merge pull request <a
href="https://redirect.github.com/crate-ci/typos/issues/1140">#1140</a>
from epage/oct</li>
<li><a
href="https://github.com/crate-ci/typos/commit/6b5c8079a9416f5aba90f4cc1348921aa72d9538"><code>6b5c807</code></a>
feat(dict): Oct updates</li>
<li><a
href="https://github.com/crate-ci/typos/commit/d64f202a88f87f2e3fbbd1f5a45ab2ec3ef9b832"><code>d64f202</code></a>
chore(deps): Update compatible (<a
href="https://redirect.github.com/crate-ci/typos/issues/1137">#1137</a>)</li>
<li><a
href="https://github.com/crate-ci/typos/commit/e903c4628799da0b9fc51e03d200e4fa62ba2c0a"><code>e903c46</code></a>
Merge pull request <a
href="https://redirect.github.com/crate-ci/typos/issues/1136">#1136</a>
from PigeonF/PigeonF/push-mlqnlvmswwmp</li>
<li><a
href="https://github.com/crate-ci/typos/commit/b994765ef920d85d7a7115db2e9afce611cdcf93"><code>b994765</code></a>
chore: Fix typo &quot;potemtial&quot; -&gt; &quot;potential&quot;</li>
<li>See full diff in <a
href="https://github.com/crate-ci/typos/compare/v1.26.8...v1.27.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=crate-ci/typos&package-manager=github_actions&previous-version=1.26.8&new-version=1.27.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Wind <WindSoilder@outlook.com>
---
 .github/workflows/typos.yml  | 2 +-
 crates/nu-table/src/table.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index 3d5dd8f8e5..be6da05e82 100644
--- 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.26.8
+        uses: crate-ci/typos@v1.27.0
diff --git a/crates/nu-table/src/table.rs b/crates/nu-table/src/table.rs
index 0d48180a34..971e5b1f91 100644
--- a/crates/nu-table/src/table.rs
+++ b/crates/nu-table/src/table.rs
@@ -468,7 +468,7 @@ fn trim_as_header(
     // so we do use it if possible prioritizing left columns
     let mut widths = vec![0; headers_widths.len()];
     for (i, head_width) in headers_widths.into_iter().enumerate() {
-        let column_width = trim.width[i]; // safe to assume width is bigger then paddding
+        let column_width = trim.width[i]; // safe to assume width is bigger then padding
 
         let mut use_width = head_width;
         if free_width > 0 {

From d52ec65f18232cf70c380e1f340f727bc39100e8 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Wed, 6 Nov 2024 07:14:00 -0600
Subject: [PATCH 0647/1072] update human-date-parser conversion to use local
 timezone (#14266)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

This PR tries to fix https://github.com/nushell/nushell/issues/14195 by
setting the local time and timezone after conversion without changing
the time.

### Before
```nushell
❯ 'in 10 minutes' | into datetime
Tue, 5 Nov 2024 12:59:58 -0600 (in 9 minutes)
❯ 'yesterday' | into datetime
Sun, 3 Nov 2024 18:00:00 -0600 (2 days ago)
❯ 'tomorrow' | into datetime
Tue, 5 Nov 2024 18:00:00 -0600 (in 5 hours)
❯ 'today' | into datetime
Mon, 4 Nov 2024 18:00:00 -0600 (18 hours ago)
```

### After (these are correct)
```nushell
❯ 'in 10 minutes' | into datetime
Tue, 5 Nov 2024 12:58:44 -0600 (in 9 minutes)
❯ 'yesterday' | into datetime
Mon, 4 Nov 2024 12:49:04 -0600 (a day ago)
❯ 'tomorrow' | into datetime
Wed, 6 Nov 2024 12:49:20 -0600 (in a day)
❯ 'today' | into datetime
Tue, 5 Nov 2024 12:52:06 -0600 (now)
```

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 .../src/conversions/into/datetime.rs          | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/crates/nu-command/src/conversions/into/datetime.rs b/crates/nu-command/src/conversions/into/datetime.rs
index 68fcc31420..fd183b43bd 100644
--- a/crates/nu-command/src/conversions/into/datetime.rs
+++ b/crates/nu-command/src/conversions/into/datetime.rs
@@ -1,5 +1,5 @@
 use crate::{generate_strftime_list, parse_date_from_string};
-use chrono::{DateTime, FixedOffset, Local, NaiveDateTime, NaiveTime, TimeZone, Utc};
+use chrono::{DateTime, FixedOffset, Local, NaiveDateTime, TimeZone, Utc};
 use human_date_parser::{from_human_time, ParseResult};
 use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
@@ -275,12 +275,13 @@ fn action(input: &Value, args: &Arguments, head: Span) -> Value {
                     if let Ok(date) = from_human_time(&input_val) {
                         match date {
                             ParseResult::Date(date) => {
-                                let time = NaiveTime::from_hms_opt(0, 0, 0).expect("valid time");
+                                let time = Local::now().time();
                                 let combined = date.and_time(time);
-                                let dt_fixed = DateTime::from_naive_utc_and_offset(
-                                    combined,
-                                    *Local::now().offset(),
-                                );
+                                let local_offset = *Local::now().offset();
+                                let dt_fixed =
+                                    TimeZone::from_local_datetime(&local_offset, &combined)
+                                        .single()
+                                        .unwrap_or_default();
                                 return Value::date(dt_fixed, span);
                             }
                             ParseResult::DateTime(date) => {
@@ -289,10 +290,11 @@ fn action(input: &Value, args: &Arguments, head: Span) -> Value {
                             ParseResult::Time(time) => {
                                 let date = Local::now().date_naive();
                                 let combined = date.and_time(time);
-                                let dt_fixed = DateTime::from_naive_utc_and_offset(
-                                    combined,
-                                    *Local::now().offset(),
-                                );
+                                let local_offset = *Local::now().offset();
+                                let dt_fixed =
+                                    TimeZone::from_local_datetime(&local_offset, &combined)
+                                        .single()
+                                        .unwrap_or_default();
                                 return Value::date(dt_fixed, span);
                             }
                         }
@@ -386,13 +388,15 @@ fn action(input: &Value, args: &Arguments, head: Span) -> Value {
                 Ok(d) => Value::date ( d, head ),
                 Err(reason) => {
                     match NaiveDateTime::parse_from_str(val, &dt.0) {
-                        Ok(d) => Value::date (
-                            DateTime::from_naive_utc_and_offset(
-                                d,
-                                *Local::now().offset(),
-                            ),
-                            head,
-                        ),
+                        Ok(d) => {
+                            let local_offset = *Local::now().offset();
+                            let dt_fixed =
+                                TimeZone::from_local_datetime(&local_offset, &d)
+                                    .single()
+                                    .unwrap_or_default();
+
+                            Value::date (dt_fixed,head)
+                        }
                         Err(_) => {
                             Value::error (
                                 ShellError::CantConvert { to_type: format!("could not parse as datetime using format '{}'", dt.0), from_type: reason.to_string(), span: head, help: Some("you can use `into datetime` without a format string to enable flexible parsing".to_string()) },

From 3182adb6a0a2bee1d5e17118697ef71cb8841acb Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Wed, 6 Nov 2024 16:35:37 +0300
Subject: [PATCH 0648/1072] Url split query (#14211)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Addresses the following points from #14162

> - There is no built-in counterpart to url build-query for splitting a
query string

There is `from url`, which, due to naming, is a little hard to discover
and suffers from the following point

> - url parse can create records with duplicate keys
> - url parse's params should either:
>   - ~group the same keys into a list.~
> - instead of a record, be a key-value table. (table<key: string,
value: string>)

# Description

## `url split-query`

Counterpart to `url build-query`, splits a url encoded query string to
key value pairs, represented as `table<key: string, value: string>`

```
> "a=one&a=two&b=three" | url split-query
╭───┬─────┬───────╮
│ # │ key │ value │
├───┼─────┼───────┤
│ 0 │ a   │ one   │
│ 1 │ a   │ two   │
│ 2 │ b   │ three │
╰───┴─────┴───────╯
```

## `url parse`

The output's `param` field is now a table as well, mirroring the new
`url split-query`

```
> 'http://localhost?a=one&a=two&b=three' | url parse
╭──────────┬─────────────────────╮
│ scheme   │ http                │
│ username │                     │
│ password │                     │
│ host     │ localhost           │
│ port     │                     │
│ path     │ /                   │
│ query    │ a=one&a=two&b=three │
│ fragment │                     │
│          │ ╭───┬─────┬───────╮ │
│ params   │ │ # │ key │ value │ │
│          │ ├───┼─────┼───────┤ │
│          │ │ 0 │ a   │ one   │ │
│          │ │ 1 │ a   │ two   │ │
│          │ │ 2 │ b   │ three │ │
│          │ ╰───┴─────┴───────╯ │
╰──────────┴─────────────────────╯
```

# User-Facing Changes

- `url parse`'s output has the mentioned change, which is backwards
incompatible.
---
 crates/nu-command/src/default_context.rs      |   1 +
 crates/nu-command/src/network/url/mod.rs      |   2 +
 crates/nu-command/src/network/url/parse.rs    |  86 +++++++-------
 crates/nu-command/src/network/url/query.rs    |  25 ++++-
 .../nu-command/src/network/url/split_query.rs | 106 ++++++++++++++++++
 crates/nu-command/tests/commands/url/parse.rs |  35 +++++-
 6 files changed, 200 insertions(+), 55 deletions(-)
 create mode 100644 crates/nu-command/src/network/url/split_query.rs

diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index 43fb8394c5..ac6fb46631 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -387,6 +387,7 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             HttpOptions,
             Url,
             UrlBuildQuery,
+            UrlSplitQuery,
             UrlDecode,
             UrlEncode,
             UrlJoin,
diff --git a/crates/nu-command/src/network/url/mod.rs b/crates/nu-command/src/network/url/mod.rs
index 3c4a4ac970..35221e6291 100644
--- a/crates/nu-command/src/network/url/mod.rs
+++ b/crates/nu-command/src/network/url/mod.rs
@@ -4,6 +4,7 @@ mod encode;
 mod join;
 mod parse;
 mod query;
+mod split_query;
 mod url_;
 
 pub use self::parse::SubCommand as UrlParse;
@@ -11,4 +12,5 @@ pub use build_query::SubCommand as UrlBuildQuery;
 pub use decode::SubCommand as UrlDecode;
 pub use encode::SubCommand as UrlEncode;
 pub use join::SubCommand as UrlJoin;
+pub use split_query::SubCommand as UrlSplitQuery;
 pub use url_::Url;
diff --git a/crates/nu-command/src/network/url/parse.rs b/crates/nu-command/src/network/url/parse.rs
index 37502fd7ea..c4d8caefe0 100644
--- a/crates/nu-command/src/network/url/parse.rs
+++ b/crates/nu-command/src/network/url/parse.rs
@@ -2,6 +2,8 @@ use nu_engine::command_prelude::*;
 use nu_protocol::Config;
 use url::Url;
 
+use super::query::query_string_to_table;
+
 #[derive(Clone)]
 pub struct SubCommand;
 
@@ -53,7 +55,7 @@ impl Command for SubCommand {
     fn examples(&self) -> Vec<Example> {
         vec![Example {
             description: "Parses a url",
-            example: "'http://user123:pass567@www.example.com:8081/foo/bar?param1=section&p2=&f[name]=vldc#hello' | url parse",
+            example: "'http://user123:pass567@www.example.com:8081/foo/bar?param1=section&p2=&f[name]=vldc&f[no]=42#hello' | url parse",
             result: Some(Value::test_record(record! {
                     "scheme" =>   Value::test_string("http"),
                     "username" => Value::test_string("user123"),
@@ -61,13 +63,14 @@ impl Command for SubCommand {
                     "host" =>     Value::test_string("www.example.com"),
                     "port" =>     Value::test_string("8081"),
                     "path" =>     Value::test_string("/foo/bar"),
-                    "query" =>    Value::test_string("param1=section&p2=&f[name]=vldc"),
+                    "query" =>    Value::test_string("param1=section&p2=&f[name]=vldc&f[no]=42"),
                     "fragment" => Value::test_string("hello"),
-                    "params" =>   Value::test_record(record! {
-                        "param1" =>  Value::test_string("section"),
-                        "p2" =>      Value::test_string(""),
-                        "f[name]" => Value::test_string("vldc"),
-                    }),
+                    "params" =>   Value::test_list(vec![
+                        Value::test_record(record! {"key" => Value::test_string("param1"), "value" => Value::test_string("section") }),
+                        Value::test_record(record! {"key" => Value::test_string("p2"), "value" => Value::test_string("") }),
+                        Value::test_record(record! {"key" => Value::test_string("f[name]"), "value" => Value::test_string("vldc") }),
+                        Value::test_record(record! {"key" => Value::test_string("f[no]"), "value" => Value::test_string("42") }),
+                    ]),
             })),
         }]
     }
@@ -80,54 +83,41 @@ fn get_url_string(value: &Value, config: &Config) -> String {
 fn parse(value: Value, head: Span, config: &Config) -> Result<PipelineData, ShellError> {
     let url_string = get_url_string(&value, config);
 
-    let result_url = Url::parse(url_string.as_str());
-
     // This is the span of the original string, not the call head.
     let span = value.span();
 
-    match result_url {
-        Ok(url) => {
-            let params =
-                serde_urlencoded::from_str::<Vec<(String, String)>>(url.query().unwrap_or(""));
-            match params {
-                Ok(result) => {
-                    let params = result
-                        .into_iter()
-                        .map(|(k, v)| (k, Value::string(v, head)))
-                        .collect();
+    let url = Url::parse(url_string.as_str()).map_err(|_| ShellError::UnsupportedInput {
+        msg: "Incomplete or incorrect URL. Expected a full URL, e.g., https://www.example.com"
+            .to_string(),
+        input: "value originates from here".into(),
+        msg_span: head,
+        input_span: span,
+    })?;
 
-                    let port = url.port().map(|p| p.to_string()).unwrap_or_default();
-
-                    let record = record! {
-                        "scheme" => Value::string(url.scheme(), head),
-                        "username" => Value::string(url.username(), head),
-                        "password" => Value::string(url.password().unwrap_or(""), head),
-                        "host" => Value::string(url.host_str().unwrap_or(""), head),
-                        "port" => Value::string(port, head),
-                        "path" => Value::string(url.path(), head),
-                        "query" => Value::string(url.query().unwrap_or(""), head),
-                        "fragment" => Value::string(url.fragment().unwrap_or(""), head),
-                        "params" => Value::record(params, head),
-                    };
-
-                    Ok(PipelineData::Value(Value::record(record, head), None))
-                }
-                _ => Err(ShellError::UnsupportedInput {
-                    msg: "String not compatible with url-encoding".to_string(),
-                    input: "value originates from here".into(),
-                    msg_span: head,
-                    input_span: span,
-                }),
-            }
-        }
-        Err(_e) => Err(ShellError::UnsupportedInput {
-            msg: "Incomplete or incorrect URL. Expected a full URL, e.g., https://www.example.com"
-                .to_string(),
+    let params = query_string_to_table(url.query().unwrap_or(""), head, span).map_err(|_| {
+        ShellError::UnsupportedInput {
+            msg: "String not compatible with url-encoding".to_string(),
             input: "value originates from here".into(),
             msg_span: head,
             input_span: span,
-        }),
-    }
+        }
+    })?;
+
+    let port = url.port().map(|p| p.to_string()).unwrap_or_default();
+
+    let record = record! {
+        "scheme" => Value::string(url.scheme(), head),
+        "username" => Value::string(url.username(), head),
+        "password" => Value::string(url.password().unwrap_or(""), head),
+        "host" => Value::string(url.host_str().unwrap_or(""), head),
+        "port" => Value::string(port, head),
+        "path" => Value::string(url.path(), head),
+        "query" => Value::string(url.query().unwrap_or(""), head),
+        "fragment" => Value::string(url.fragment().unwrap_or(""), head),
+        "params" => params,
+    };
+
+    Ok(PipelineData::Value(Value::record(record, head), None))
 }
 
 #[cfg(test)]
diff --git a/crates/nu-command/src/network/url/query.rs b/crates/nu-command/src/network/url/query.rs
index fdedb73e0a..21b9f541cb 100644
--- a/crates/nu-command/src/network/url/query.rs
+++ b/crates/nu-command/src/network/url/query.rs
@@ -1,4 +1,4 @@
-use nu_protocol::{Record, ShellError, Span, Type, Value};
+use nu_protocol::{IntoValue, Record, ShellError, Span, Type, Value};
 
 pub fn record_to_query_string(
     record: &Record,
@@ -42,3 +42,26 @@ pub fn record_to_query_string(
         help: None,
     })
 }
+
+pub fn query_string_to_table(query: &str, head: Span, span: Span) -> Result<Value, ShellError> {
+    let params = serde_urlencoded::from_str::<Vec<(String, String)>>(query)
+        .map_err(|_| ShellError::UnsupportedInput {
+            msg: "String not compatible with url-encoding".to_string(),
+            input: "value originates from here".into(),
+            msg_span: head,
+            input_span: span,
+        })?
+        .into_iter()
+        .map(|(key, value)| {
+            Value::record(
+                nu_protocol::record! {
+                    "key" => key.into_value(head),
+                    "value" => value.into_value(head)
+                },
+                head,
+            )
+        })
+        .collect::<Vec<_>>();
+
+    Ok(Value::list(params, head))
+}
diff --git a/crates/nu-command/src/network/url/split_query.rs b/crates/nu-command/src/network/url/split_query.rs
new file mode 100644
index 0000000000..3fbe282515
--- /dev/null
+++ b/crates/nu-command/src/network/url/split_query.rs
@@ -0,0 +1,106 @@
+use nu_engine::command_prelude::*;
+
+use super::query::query_string_to_table;
+
+#[derive(Clone)]
+pub struct SubCommand;
+
+impl Command for SubCommand {
+    fn name(&self) -> &str {
+        "url split-query"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("url split-query")
+            .input_output_types(vec![(
+                Type::String,
+                Type::Table([("key".into(), Type::String), ("value".into(), Type::String)].into()),
+            )])
+            .category(Category::Network)
+    }
+
+    fn description(&self) -> &str {
+        "Converts query string into table applying percent-decoding."
+    }
+
+    fn search_terms(&self) -> Vec<&str> {
+        vec!["convert", "record", "table"]
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Outputs a table representing the contents of this query string",
+                example: r#""mode=normal&userid=31415" | url split-query"#,
+                result: Some(Value::test_list(vec![
+                    Value::test_record(record!{
+                        "key" => Value::test_string("mode"),
+                        "value" => Value::test_string("normal"),
+                    }),
+                    Value::test_record(record!{
+                        "key" => Value::test_string("userid"),
+                        "value" => Value::test_string("31415"),
+                    })
+                ])),
+            },
+            Example {
+                description: "Outputs a table representing the contents of this query string, url-decoding the values",
+                example: r#""a=AT%26T&b=AT+T" | url split-query"#,
+                result: Some(Value::test_list(vec![
+                    Value::test_record(record!{
+                        "key" => Value::test_string("a"),
+                        "value" => Value::test_string("AT&T"),
+                    }),
+                    Value::test_record(record!{
+                        "key" => Value::test_string("b"),
+                        "value" => Value::test_string("AT T"),
+                    }),
+                ])),
+            },
+            Example {
+                description: "Outputs a table representing the contents of this query string",
+                example: r#""a=one&a=two&b=three" | url split-query"#,
+                result: Some(Value::test_list(vec![
+                    Value::test_record(record!{
+                        "key" => Value::test_string("a"),
+                        "value" => Value::test_string("one"),
+                    }),
+                    Value::test_record(record!{
+                        "key" => Value::test_string("a"),
+                        "value" => Value::test_string("two"),
+                    }),
+                    Value::test_record(record!{
+                        "key" => Value::test_string("b"),
+                        "value" => Value::test_string("three"),
+                    }),
+                ])),
+            },
+        ]
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let value = input.into_value(call.head)?;
+        let span = value.span();
+        let query = value.to_expanded_string("", &stack.get_config(engine_state));
+        let table = query_string_to_table(&query, call.head, span)?;
+        Ok(PipelineData::Value(table, None))
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_examples() {
+        use crate::test_examples;
+
+        test_examples(SubCommand {})
+    }
+}
diff --git a/crates/nu-command/tests/commands/url/parse.rs b/crates/nu-command/tests/commands/url/parse.rs
index c24e12a041..6bd16f3722 100644
--- a/crates/nu-command/tests/commands/url/parse.rs
+++ b/crates/nu-command/tests/commands/url/parse.rs
@@ -15,7 +15,7 @@ fn url_parse_simple() {
                     path: '/',
                     query: '',
                     fragment: '',
-                    params: {}
+                    params: []
                 }
             "#
     ));
@@ -37,7 +37,7 @@ fn url_parse_with_port() {
                     path: '/',
                     query: '',
                     fragment: '',
-                    params: {}
+                    params: []
                 }
             "#
     ));
@@ -60,7 +60,7 @@ fn url_parse_with_path() {
                     path: '/def/ghj',
                     query: '',
                     fragment: '',
-                    params: {}
+                    params: []
                 }
             "#
     ));
@@ -83,7 +83,30 @@ fn url_parse_with_params() {
                     path: '/def/ghj',
                     query: 'param1=11&param2=',
                     fragment: '',
-                    params: {param1: '11', param2: ''}
+                    params: [[key, value]; ["param1", "11"], ["param2", ""]]
+                }
+            "#
+    ));
+
+    assert_eq!(actual.out, "true");
+}
+
+#[test]
+fn url_parse_with_duplicate_params() {
+    let actual = nu!(pipeline(
+        r#"
+                ("http://www.abc.com:8811/def/ghj?param1=11&param2=&param1=22"
+                | url parse)
+                == {
+                    scheme: 'http',
+                    username: '',
+                    password: '',
+                    host: 'www.abc.com',
+                    port: '8811',
+                    path: '/def/ghj',
+                    query: 'param1=11&param2=&param1=22',
+                    fragment: '',
+                    params: [[key, value]; ["param1", "11"], ["param2", ""], ["param1", "22"]]
                 }
             "#
     ));
@@ -106,7 +129,7 @@ fn url_parse_with_fragment() {
                     path: '/def/ghj',
                     query: 'param1=11&param2=',
                     fragment: 'hello-fragment',
-                    params: {param1: '11', param2: ''}
+                    params: [[key, value]; ["param1", "11"], ["param2", ""]]
                 }
             "#
     ));
@@ -129,7 +152,7 @@ fn url_parse_with_username_and_password() {
                     path: '/def/ghj',
                     query: 'param1=11&param2=',
                     fragment: 'hello-fragment',
-                    params: {param1: '11', param2: ''}
+                    params: [[key, value]; ["param1", "11"], ["param2", ""]]
                 }
             "#
     ));

From 23fba6d2eae01ee5d9b4352010d0f40ac5d42982 Mon Sep 17 00:00:00 2001
From: Solomon <git@solomonvictorino.com>
Date: Wed, 6 Nov 2024 06:36:56 -0700
Subject: [PATCH 0649/1072] correctly parse table literals as lists (#14226)

# User-Facing Changes

Table literal arguments to list parameters are now correctly parsed:

```diff
def a [l: list<any>] { $l | to nuon }; a [[a]; [2]]
-[[a]]
+[[a]; [2]]
```
---
 crates/nu-parser/src/parser.rs | 16 ++++---
 tests/repl/test_signatures.rs  | 84 ++++++++++------------------------
 2 files changed, 33 insertions(+), 67 deletions(-)

diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 62ad19dc79..9202045076 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -2312,7 +2312,7 @@ pub fn parse_full_cell_path(
         } else if bytes.starts_with(b"[") {
             trace!("parsing: table head of full cell path");
 
-            let output = parse_table_expression(working_set, head.span);
+            let output = parse_table_expression(working_set, head.span, &SyntaxShape::Any);
 
             tokens.next();
 
@@ -4120,7 +4120,11 @@ fn parse_table_row(
         .map(|exprs| (exprs, span))
 }
 
-fn parse_table_expression(working_set: &mut StateWorkingSet, span: Span) -> Expression {
+fn parse_table_expression(
+    working_set: &mut StateWorkingSet,
+    span: Span,
+    list_element_shape: &SyntaxShape,
+) -> Expression {
     let bytes = working_set.get_span_contents(span);
     let inner_span = {
         let start = if bytes.starts_with(b"[") {
@@ -4149,13 +4153,13 @@ fn parse_table_expression(working_set: &mut StateWorkingSet, span: Span) -> Expr
     // Check that we have all arguments first, before trying to parse the first
     // in order to avoid exponential parsing time
     let [first, second, rest @ ..] = &tokens[..] else {
-        return parse_list_expression(working_set, span, &SyntaxShape::Any);
+        return parse_list_expression(working_set, span, list_element_shape);
     };
     if !working_set.get_span_contents(first.span).starts_with(b"[")
         || second.contents != TokenContents::Semicolon
         || rest.is_empty()
     {
-        return parse_list_expression(working_set, span, &SyntaxShape::Any);
+        return parse_list_expression(working_set, span, list_element_shape);
     };
     let head = parse_table_row(working_set, first.span);
 
@@ -4771,7 +4775,7 @@ pub fn parse_value(
         }
         SyntaxShape::List(elem) => {
             if bytes.starts_with(b"[") {
-                parse_list_expression(working_set, span, elem)
+                parse_table_expression(working_set, span, elem)
             } else {
                 working_set.error(ParseError::Expected("list", span));
 
@@ -4780,7 +4784,7 @@ pub fn parse_value(
         }
         SyntaxShape::Table(_) => {
             if bytes.starts_with(b"[") {
-                parse_table_expression(working_set, span)
+                parse_table_expression(working_set, span, &SyntaxShape::Any)
             } else {
                 working_set.error(ParseError::Expected("table", span));
 
diff --git a/tests/repl/test_signatures.rs b/tests/repl/test_signatures.rs
index 25b22ee1be..32de87d6c7 100644
--- a/tests/repl/test_signatures.rs
+++ b/tests/repl/test_signatures.rs
@@ -271,68 +271,30 @@ fn table_annotations_none() -> TestResult {
     run_test(input, expected)
 }
 
-#[test]
-fn table_annotations() -> TestResult {
-    let input = "def run [t: table<age: int>] { $t }; run [[age]; [3]] | describe";
-    let expected = "table<age: int>";
-    run_test(input, expected)
-}
+#[rstest]
+fn table_annotations(
+    #[values(true, false)] list_annotation: bool,
+    #[values(
+        ("age: int", "age: int", "[[age]; [3]]"  ),
+        ("name: string age: int", "name: string, age: int", "[[name, age]; [nushell, 3]]"  ),
+        ("name: string, age: int", "name: string, age: int", "[[name, age]; [nushell, 3]]"  ),
+        ("name", "name: string", "[[name]; [nushell]]"),
+        ("name: string, age", "name: string, age: int", "[[name, age]; [nushell, 3]]"),
+        ("name, age", "name: string, age: int", "[[name, age]; [nushell, 3]]"),
+        ("age: any", "age: duration", "[[age]; [2wk]]"),
+        ("size", "size: filesize", "[[size]; [2mb]]")
+    )]
+    record_annotation_data: (&str, &str, &str),
+) -> TestResult {
+    let (record_annotation, inferred_type, data) = record_annotation_data;
 
-#[test]
-fn table_annotations_two_types() -> TestResult {
-    let input = "\
-def run [t: table<name: string age: int>] { $t };
-run [[name, age]; [nushell, 3]] | describe";
-    let expected = "table<name: string, age: int>";
-    run_test(input, expected)
-}
-
-#[test]
-fn table_annotations_two_types_comma_sep() -> TestResult {
-    let input = "\
-def run [t: table<name: string, age: int>] { $t };
-run [[name, age]; [nushell, 3]] | describe";
-    let expected = "table<name: string, age: int>";
-    run_test(input, expected)
-}
-
-#[test]
-fn table_annotations_key_with_no_type() -> TestResult {
-    let input = "def run [t: table<name>] { $t }; run [[name]; [nushell]] | describe";
-    let expected = "table<name: string>";
-    run_test(input, expected)
-}
-
-#[test]
-fn table_annotations_two_types_one_with_no_type() -> TestResult {
-    let input = "\
-def run [t: table<name: string, age>] { $t };
-run [[name, age]; [nushell, 3]] | describe";
-    let expected = "table<name: string, age: int>";
-    run_test(input, expected)
-}
-
-#[test]
-fn table_annotations_two_types_both_with_no_types() -> TestResult {
-    let input = "\
-def run [t: table<name, age>] { $t };
-run [[name, age]; [nushell, 3]] | describe";
-    let expected = "table<name: string, age: int>";
-    run_test(input, expected)
-}
-
-#[test]
-fn table_annotations_type_inference_1() -> TestResult {
-    let input = "def run [t: table<age: any>] { $t }; run [[age]; [2wk]] | describe";
-    let expected = "table<age: duration>";
-    run_test(input, expected)
-}
-
-#[test]
-fn table_annotations_type_inference_2() -> TestResult {
-    let input = "def run [t: table<size>] { $t }; run [[size]; [2mb]] | describe";
-    let expected = "table<size: filesize>";
-    run_test(input, expected)
+    let type_annotation = match list_annotation {
+        true => format!("list<record<{record_annotation}>>"),
+        false => format!("table<{record_annotation}>"),
+    };
+    let input = format!("def run [t: {type_annotation}] {{ $t }}; run {data} | describe");
+    let expected = format!("table<{inferred_type}>");
+    run_test(&input, &expected)
 }
 
 #[test]

From cc0259bbed9f141922b4c6f84bdc603f7e7c647c Mon Sep 17 00:00:00 2001
From: Solomon <git@solomonvictorino.com>
Date: Wed, 6 Nov 2024 06:40:29 -0700
Subject: [PATCH 0650/1072] don't include import path in args to aliased
 external commands (#14231)

Fixes #13776

# User-Facing Changes

Arguments to aliased externals no longer include nested import paths:

```diff
module foo { export alias bar = ^echo }
use foo
foo bar baz
-bar baz
+baz
```
---
 crates/nu-parser/src/parser.rs |  4 ++--
 tests/modules/mod.rs           | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 9202045076..e4d3765e17 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -1343,10 +1343,10 @@ pub fn parse_call(working_set: &mut StateWorkingSet, spans: &[Span], head: Span)
                 trace!("parsing: alias of external call");
 
                 let mut head = head.clone();
-                head.span = spans[0]; // replacing the spans preserves syntax highlighting
+                head.span = Span::concat(&spans[cmd_start..pos]); // replacing the spans preserves syntax highlighting
 
                 let mut final_args = args.clone().into_vec();
-                for arg_span in &spans[1..] {
+                for arg_span in &spans[pos..] {
                     let arg = parse_external_arg(working_set, *arg_span);
                     final_args.push(arg);
                 }
diff --git a/tests/modules/mod.rs b/tests/modules/mod.rs
index 9aa1282f21..5f73419c01 100644
--- a/tests/modules/mod.rs
+++ b/tests/modules/mod.rs
@@ -2,6 +2,7 @@ use nu_test_support::fs::Stub::{FileWithContent, FileWithContentToBeTrimmed};
 use nu_test_support::playground::Playground;
 use nu_test_support::{nu, nu_repl_code};
 use pretty_assertions::assert_eq;
+use rstest::rstest;
 
 #[test]
 fn module_private_import_decl() {
@@ -612,6 +613,29 @@ fn deep_import_patterns() {
     assert_eq!(actual.out, "foo");
 }
 
+#[rstest]
+fn deep_import_aliased_external_args(
+    #[values(
+        "use spam; spam eggs beans foo bar",
+        "use spam eggs; eggs beans foo bar",
+        "use spam eggs beans; beans foo bar",
+        "use spam eggs beans foo; foo bar"
+    )]
+    input: &str,
+) {
+    let module_decl = "
+        module spam {
+            export module eggs {
+                export module beans {
+                    export alias foo = ^echo
+                }
+            }
+        }
+    ";
+    let actual = nu!(format!("{module_decl}; {input}"));
+    assert_eq!(actual.out, "bar");
+}
+
 #[test]
 fn module_dir() {
     let import = "use samples/spam";

From c7e128eed1358c86bb2878b46a519ffab30144d5 Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Wed, 6 Nov 2024 17:09:40 +0300
Subject: [PATCH 0651/1072] add table params support to `url join` and `url
 build-query` (#14239)

Add `table<key, value>` support to `url join` for the `params` field,
and as input to `url build-query` #14162

# Description
```nushell
{
    "scheme": "http",
    "username": "usr",
    "password": "pwd",
    "host": "localhost",
    "params": [
        ["key", "value"];
        ["par_1", "aaa"],
        ["par_2", "bbb"],
        ["par_1", "ccc"],
        ["par_2", "ddd"],
    ],
    "port": "1234",
} | url join
```
```
http://usr:pwd@localhost:1234?par_1=aaa&par_2=bbb&par_1=ccc&par_2=ddd
```

---

```nushell
[
    ["key", "value"];
    ["par_1", "aaa"],
    ["par_2", "bbb"],
    ["par_1", "ccc"],
    ["par_2", "ddd"],
] | url build-query
```
```
par_1=aaa&par_2=bbb&par_1=ccc&par_2=ddd
```

# User-Facing Changes

## `url build-query`

- can no longer accept one row table input as if it were a record

---------

Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
---
 .../nu-command/src/network/url/build_query.rs | 56 ++++++------
 crates/nu-command/src/network/url/join.rs     | 73 +++++++--------
 crates/nu-command/src/network/url/query.rs    | 48 ++++++++++
 crates/nu-command/tests/commands/url/join.rs  | 88 ++++++++++++++++++-
 4 files changed, 196 insertions(+), 69 deletions(-)

diff --git a/crates/nu-command/src/network/url/build_query.rs b/crates/nu-command/src/network/url/build_query.rs
index 11fd9aba94..e11f476469 100644
--- a/crates/nu-command/src/network/url/build_query.rs
+++ b/crates/nu-command/src/network/url/build_query.rs
@@ -1,6 +1,6 @@
 use nu_engine::command_prelude::*;
 
-use super::query::record_to_query_string;
+use super::query::{record_to_query_string, table_to_query_string};
 
 #[derive(Clone)]
 pub struct SubCommand;
@@ -14,7 +14,10 @@ impl Command for SubCommand {
         Signature::build("url build-query")
             .input_output_types(vec![
                 (Type::record(), Type::String),
-                (Type::table(), Type::String),
+                (
+                    Type::Table([("key".into(), Type::Any), ("value".into(), Type::Any)].into()),
+                    Type::String,
+                ),
             ])
             .category(Category::Network)
     }
@@ -34,11 +37,6 @@ impl Command for SubCommand {
                 example: r#"{ mode:normal userid:31415 } | url build-query"#,
                 result: Some(Value::test_string("mode=normal&userid=31415")),
             },
-            Example {
-                description: "Outputs a query string representing the contents of this 1-row table",
-                example: r#"[[foo bar]; ["1" "2"]] | url build-query"#,
-                result: Some(Value::test_string("foo=1&bar=2")),
-            },
             Example {
                 description: "Outputs a query string representing the contents of this record, with a value that needs to be url-encoded",
                 example: r#"{a:"AT&T", b: "AT T"} | url build-query"#,
@@ -49,6 +47,11 @@ impl Command for SubCommand {
                 example: r#"{a: ["one", "two"], b: "three"} | url build-query"#,
                 result: Some(Value::test_string("a=one&a=two&b=three")),
             },
+            Example {
+                description: "Outputs a query string representing the contents of this table containing key-value pairs",
+                example: r#"[[key, value]; [a, one], [a, two], [b, three], [a, four]] | url build-query"#,
+                result: Some(Value::test_string("a=one&a=two&b=three&a=four")),
+            },
         ]
     }
 
@@ -60,32 +63,25 @@ impl Command for SubCommand {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
-        to_url(input, head)
+        let input_span = input.span().unwrap_or(head);
+        let value = input.into_value(input_span)?;
+        let span = value.span();
+        let output = match value {
+            Value::Record { ref val, .. } => record_to_query_string(val, span, head),
+            Value::List { ref vals, .. } => table_to_query_string(vals, span, head),
+            // Propagate existing errors
+            Value::Error { error, .. } => Err(*error),
+            other => Err(ShellError::UnsupportedInput {
+                msg: "Expected a record or table from pipeline".to_string(),
+                input: "value originates from here".into(),
+                msg_span: head,
+                input_span: other.span(),
+            }),
+        };
+        Ok(Value::string(output?, head).into_pipeline_data())
     }
 }
 
-fn to_url(input: PipelineData, head: Span) -> Result<PipelineData, ShellError> {
-    let output: Result<String, ShellError> = input
-        .into_iter()
-        .map(move |value| {
-            let span = value.span();
-            match value {
-                Value::Record { ref val, .. } => record_to_query_string(val, span, head),
-                // Propagate existing errors
-                Value::Error { error, .. } => Err(*error),
-                other => Err(ShellError::UnsupportedInput {
-                    msg: "Expected a table from pipeline".to_string(),
-                    input: "value originates from here".into(),
-                    msg_span: head,
-                    input_span: other.span(),
-                }),
-            }
-        })
-        .collect();
-
-    Ok(Value::string(output?, head).into_pipeline_data())
-}
-
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/crates/nu-command/src/network/url/join.rs b/crates/nu-command/src/network/url/join.rs
index 3b52b1d6b0..b8e120134a 100644
--- a/crates/nu-command/src/network/url/join.rs
+++ b/crates/nu-command/src/network/url/join.rs
@@ -1,6 +1,6 @@
 use nu_engine::command_prelude::*;
 
-use super::query::record_to_query_string;
+use super::query::{record_to_query_string, table_to_query_string};
 
 #[derive(Clone)]
 pub struct SubCommand;
@@ -112,7 +112,7 @@ impl Command for SubCommand {
                             .into_owned()
                             .into_iter()
                             .try_fold(UrlComponents::new(), |url, (k, v)| {
-                                url.add_component(k, v, span, engine_state)
+                                url.add_component(k, v, head, engine_state)
                             });
 
                         url_components?.to_url(span)
@@ -155,7 +155,7 @@ impl UrlComponents {
         self,
         key: String,
         value: Value,
-        span: Span,
+        head: Span,
         engine_state: &EngineState,
     ) -> Result<Self, ShellError> {
         let value_span = value.span();
@@ -194,40 +194,41 @@ impl UrlComponents {
         }
 
         if key == "params" {
-            return match value {
-                Value::Record { ref val, .. } => {
-                    let mut qs = record_to_query_string(val, value_span, span)?;
-
-                    qs = if !qs.trim().is_empty() {
-                        format!("?{qs}")
-                    } else {
-                        qs
-                    };
-
-                    if let Some(q) = self.query {
-                        if q != qs {
-                            // if query is present it means that also query_span is set.
-                            return Err(ShellError::IncompatibleParameters {
-                                left_message: format!("Mismatch, qs from params is: {qs}"),
-                                left_span: value_span,
-                                right_message: format!("instead query is: {q}"),
-                                right_span: self.query_span.unwrap_or(Span::unknown()),
-                            });
-                        }
-                    }
-
-                    Ok(Self {
-                        query: Some(qs),
-                        params_span: Some(value_span),
-                        ..self
+            let mut qs = match value {
+                Value::Record { ref val, .. } => record_to_query_string(val, value_span, head)?,
+                Value::List { ref vals, .. } => table_to_query_string(vals, value_span, head)?,
+                Value::Error { error, .. } => return Err(*error),
+                other => {
+                    return Err(ShellError::IncompatibleParametersSingle {
+                        msg: String::from("Key params has to be a record or a table"),
+                        span: other.span(),
                     })
                 }
-                Value::Error { error, .. } => Err(*error),
-                other => Err(ShellError::IncompatibleParametersSingle {
-                    msg: String::from("Key params has to be a record"),
-                    span: other.span(),
-                }),
             };
+
+            qs = if !qs.trim().is_empty() {
+                format!("?{qs}")
+            } else {
+                qs
+            };
+
+            if let Some(q) = self.query {
+                if q != qs {
+                    // if query is present it means that also query_span is set.
+                    return Err(ShellError::IncompatibleParameters {
+                        left_message: format!("Mismatch, query string from params is: {qs}"),
+                        left_span: value_span,
+                        right_message: format!("instead query is: {q}"),
+                        right_span: self.query_span.unwrap_or(Span::unknown()),
+                    });
+                }
+            }
+
+            return Ok(Self {
+                query: Some(qs),
+                params_span: Some(value_span),
+                ..self
+            });
         }
 
         // apart from port and params all other keys are strings.
@@ -267,7 +268,7 @@ impl UrlComponents {
                         return Err(ShellError::IncompatibleParameters {
                             left_message: format!("Mismatch, query param is: {s}"),
                             left_span: value_span,
-                            right_message: format!("instead qs from params is: {q}"),
+                            right_message: format!("instead query string from params is: {q}"),
                             right_span: self.params_span.unwrap_or(Span::unknown()),
                         });
                     }
@@ -293,7 +294,7 @@ impl UrlComponents {
                     &ShellError::GenericError {
                         error: format!("'{key}' is not a valid URL field"),
                         msg: format!("remove '{key}' col from input record"),
-                        span: Some(span),
+                        span: Some(value_span),
                         help: None,
                         inner: vec![],
                     },
diff --git a/crates/nu-command/src/network/url/query.rs b/crates/nu-command/src/network/url/query.rs
index 21b9f541cb..9dee687cca 100644
--- a/crates/nu-command/src/network/url/query.rs
+++ b/crates/nu-command/src/network/url/query.rs
@@ -1,3 +1,5 @@
+use std::borrow::Cow;
+
 use nu_protocol::{IntoValue, Record, ShellError, Span, Type, Value};
 
 pub fn record_to_query_string(
@@ -43,6 +45,52 @@ pub fn record_to_query_string(
     })
 }
 
+pub fn table_to_query_string(
+    table: &[Value],
+    span: Span,
+    head: Span,
+) -> Result<String, ShellError> {
+    let row_vec = table
+        .iter()
+        .map(|val| match val {
+            Value::Record { val, internal_span } => key_value_from_record(val, *internal_span),
+            _ => Err(ShellError::UnsupportedInput {
+                msg: "expected a table".into(),
+                input: "not a table, contains non-record values".into(),
+                msg_span: head,
+                input_span: span,
+            }),
+        })
+        .collect::<Result<Vec<_>, ShellError>>()?;
+
+    serde_urlencoded::to_string(row_vec).map_err(|_| ShellError::CantConvert {
+        to_type: "URL".into(),
+        from_type: Type::table().to_string(),
+        span: head,
+        help: None,
+    })
+}
+
+fn key_value_from_record(record: &Record, span: Span) -> Result<(Cow<str>, Cow<str>), ShellError> {
+    let key = record
+        .get("key")
+        .ok_or_else(|| ShellError::CantFindColumn {
+            col_name: "key".into(),
+            span: None,
+            src_span: span,
+        })?
+        .coerce_str()?;
+    let value = record
+        .get("value")
+        .ok_or_else(|| ShellError::CantFindColumn {
+            col_name: "value".into(),
+            span: None,
+            src_span: span,
+        })?
+        .coerce_str()?;
+    Ok((key, value))
+}
+
 pub fn query_string_to_table(query: &str, head: Span, span: Span) -> Result<Value, ShellError> {
     let params = serde_urlencoded::from_str::<Vec<(String, String)>>(query)
         .map_err(|_| ShellError::UnsupportedInput {
diff --git a/crates/nu-command/tests/commands/url/join.rs b/crates/nu-command/tests/commands/url/join.rs
index bafe7881f4..92257a41ff 100644
--- a/crates/nu-command/tests/commands/url/join.rs
+++ b/crates/nu-command/tests/commands/url/join.rs
@@ -156,7 +156,7 @@ fn url_join_with_different_query_and_params() {
 
     assert!(actual
         .err
-        .contains("Mismatch, qs from params is: ?par_1=aaab&par_2=bbb"));
+        .contains("Mismatch, query string from params is: ?par_1=aaab&par_2=bbb"));
     assert!(actual
         .err
         .contains("instead query is: ?par_1=aaa&par_2=bbb"));
@@ -183,7 +183,7 @@ fn url_join_with_different_query_and_params() {
         .contains("Mismatch, query param is: par_1=aaa&par_2=bbb"));
     assert!(actual
         .err
-        .contains("instead qs from params is: ?par_1=aaab&par_2=bbb"));
+        .contains("instead query string from params is: ?par_1=aaab&par_2=bbb"));
 }
 
 #[test]
@@ -201,7 +201,9 @@ fn url_join_with_invalid_params() {
             "#
     ));
 
-    assert!(actual.err.contains("Key params has to be a record"));
+    assert!(actual
+        .err
+        .contains("Key params has to be a record or a table"));
 }
 
 #[test]
@@ -346,3 +348,83 @@ fn url_join_with_empty_params() {
 
     assert_eq!(actual.out, "https://localhost/foo");
 }
+
+#[test]
+fn url_join_with_list_in_params() {
+    let actual = nu!(pipeline(
+        r#"
+            {
+                "scheme": "http",
+                "username": "usr",
+                "password": "pwd",
+                "host": "localhost",
+                "params": {
+                    "par_1": "aaa",
+                    "par_2": ["bbb", "ccc"]
+                },
+                "port": "1234",
+            } | url join
+        "#
+    ));
+
+    assert_eq!(
+        actual.out,
+        "http://usr:pwd@localhost:1234?par_1=aaa&par_2=bbb&par_2=ccc"
+    );
+}
+
+#[test]
+fn url_join_with_params_table() {
+    let actual = nu!(pipeline(
+        r#"
+            {
+                "scheme": "http",
+                "username": "usr",
+                "password": "pwd",
+                "host": "localhost",
+                "params": [
+                    ["key", "value"];
+                    ["par_1", "aaa"],
+                    ["par_2", "bbb"],
+                    ["par_1", "ccc"],
+                    ["par_2", "ddd"],
+                ],
+                "port": "1234",
+            } | url join
+        "#
+    ));
+
+    assert_eq!(
+        actual.out,
+        "http://usr:pwd@localhost:1234?par_1=aaa&par_2=bbb&par_1=ccc&par_2=ddd"
+    );
+}
+
+#[test]
+fn url_join_with_params_invalid_table() {
+    let actual = nu!(pipeline(
+        r#"
+            {
+                "scheme": "http",
+                "username": "usr",
+                "password": "pwd",
+                "host": "localhost",
+                "params": (
+                    [
+                        ["key", "value"];
+                        ["par_1", "aaa"],
+                        ["par_2", "bbb"],
+                        ["par_1", "ccc"],
+                        ["par_2", "ddd"],
+                    ] ++ ["not a record"]
+                ),
+                "port": "1234",
+            } | url join
+        "#
+    ));
+
+    assert!(actual.err.contains("expected a table"));
+    assert!(actual
+        .err
+        .contains("not a table, contains non-record values"));
+}

From ab641d9f182b5d5f803d0dd9d89c11a8e36ddca9 Mon Sep 17 00:00:00 2001
From: Bruce Weirdan <weirdan@gmail.com>
Date: Thu, 7 Nov 2024 00:01:57 +0100
Subject: [PATCH 0652/1072] Fix the order of preference for `VISUAL` and
 `EDITOR` (#14275)

# Description

The order in which Nushell consulted `$env.EDITOR` and `$env.VISUAL` was
wrong. Most other programs check `$env.VISUAL` first and then fall back
to `$env.EDITOR` (for historic reasons).

References:

*
https://wiki.archlinux.org/title/Environment_variables#Default_programs
*
https://help.ubuntu.com/community/EnvironmentVariables#Preferred_application_variables
 * https://unix.stackexchange.com/a/4861
 * https://git-scm.com/docs/git-var

# User-Facing Changes

Users will now be able to use those preferences variables the same way
they are used in other programs.

# Tests + Formatting

That part wasn't tested before, and I don't think it's necessary to test
it now.

# After Submitting

PR to the docs repo is here: nushell/nushell.github.io#1621
---
 crates/nu-cmd-base/src/util.rs                      | 4 ++--
 crates/nu-utils/src/sample_config/default_config.nu | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/nu-cmd-base/src/util.rs b/crates/nu-cmd-base/src/util.rs
index a2af4d4773..49c3f28f8b 100644
--- a/crates/nu-cmd-base/src/util.rs
+++ b/crates/nu-cmd-base/src/util.rs
@@ -78,10 +78,10 @@ pub fn get_editor(
         get_editor_commandline(&config.buffer_editor, "$env.config.buffer_editor")
     {
         Ok(buff_editor)
-    } else if let Some(value) = env_vars.get("EDITOR") {
-        get_editor_commandline(value, "$env.EDITOR")
     } else if let Some(value) = env_vars.get("VISUAL") {
         get_editor_commandline(value, "$env.VISUAL")
+    } else if let Some(value) = env_vars.get("EDITOR") {
+        get_editor_commandline(value, "$env.EDITOR")
     } else {
         Err(ShellError::GenericError {
             error: "No editor configured".into(),
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index 2fa4a5b5bf..7fd39cf460 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -238,7 +238,7 @@ $env.config = {
     color_config: $dark_theme # if you want a more interesting theme, you can replace the empty record with `$dark_theme`, `$light_theme` or another custom record
     footer_mode: 25 # always, never, number_of_rows, auto
     float_precision: 2 # the precision for displaying floats in tables
-    buffer_editor: null # command that will be used to edit the current line buffer with ctrl+o, if unset fallback to $env.EDITOR and $env.VISUAL
+    buffer_editor: null # command that will be used to edit the current line buffer with ctrl+o, if unset fallback to $env.VISUAL and $env.EDITOR
     use_ansi_coloring: true
     bracketed_paste: true # enable bracketed paste, currently useless on windows
     edit_mode: emacs # emacs, vi

From b6eda33438fe4f4b30a5ae9b2d6d3b6a466c1296 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Wed, 6 Nov 2024 17:58:22 -0600
Subject: [PATCH 0653/1072] allow != for polars (#14263)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

This PR fixes a problem where not equal in polars wasn't working with
strings.

## Before
```nushell
let a = ls | polars into-df
$a.type != "dir"
Error: nu::shell::type_mismatch

  × Type mismatch during operation.
   ╭─[entry #16:1:1]
 1 │ $a.type != "dir"
   · ─┬      ─┬ ──┬──
   ·  │       │   ╰── string
   ·  │       ╰── type mismatch for operator
   ·  ╰── NuDataFrame
   ╰────
```

## After
```nushell
let a = ls | polars into-df
$a.type != "dir"
╭──#──┬─type──╮
│ 0   │ false │
│ 1   │ false │
│ 2   │ false │
...
```

/cc @ayax79 to make sure I did this right.

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 .../src/dataframe/values/nu_dataframe/between_values.rs       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/between_values.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/between_values.rs
index 382ae12de2..7d34d6d128 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/between_values.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/between_values.rs
@@ -334,6 +334,10 @@ pub(super) fn compute_series_single_value(
             Value::Float { val, .. } => {
                 compare_series_float(&lhs, *val, ChunkedArray::not_equal, lhs_span)
             }
+            Value::String { val, .. } => {
+                let equal_pattern = format!("^{}$", fancy_regex::escape(val));
+                contains_series_pat(&lhs, &equal_pattern, lhs_span)
+            }
             Value::Date { val, .. } => compare_series_i64(
                 &lhs,
                 val.timestamp_millis(),

From b7af715f6b4e46ddb5c2a574ceedf28e2e3ba46e Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Thu, 7 Nov 2024 13:35:00 +0800
Subject: [PATCH 0654/1072] IR: Don't generate instructions for `def` and
 `export def`. (#14114)

# Description
Fixes: #14110
Fixes: #14087

I think it's ok to not generating instruction to `def` and `export def`
call. Because they just return `PipelineData::Empty` without doing
anything.

If nushell generates instructions for `def` and `export def`, nushell
will try to capture variables for these block. It's not the time to do
this.

# User-Facing Changes
```
nu -c "
def bar [] {
    let x = 1
    ($x | foo)
}
def foo [] {
    foo
}
"
```
Will no longer raise error.

# Tests + Formatting
Added 4 tests
---
 crates/nu-command/tests/commands/def.rs | 34 +++++++++++++++++++++++++
 crates/nu-engine/src/compile/call.rs    |  3 +++
 2 files changed, 37 insertions(+)

diff --git a/crates/nu-command/tests/commands/def.rs b/crates/nu-command/tests/commands/def.rs
index 0ec13c0511..c66869b479 100644
--- a/crates/nu-command/tests/commands/def.rs
+++ b/crates/nu-command/tests/commands/def.rs
@@ -292,3 +292,37 @@ fn def_env_wrapped_no_help() {
     let actual = nu!("def --wrapped foo [...rest] { echo $rest }; foo -h | to json --raw");
     assert_eq!(actual.out, r#"["-h"]"#);
 }
+
+#[test]
+fn def_recursive_func_should_work() {
+    let actual = nu!("def bar [] { let x = 1; ($x | foo) }; def foo [] { foo }");
+    assert!(actual.err.is_empty());
+
+    let actual = nu!(r#"
+def recursive [c: int] {
+    if ($c == 0) { return }
+    if ($c mod 2 > 0) {
+        $in | recursive ($c - 1)
+    } else {
+        recursive ($c - 1)
+    }
+}"#);
+    assert!(actual.err.is_empty());
+}
+
+#[test]
+fn export_def_recursive_func_should_work() {
+    let actual = nu!("export def bar [] { let x = 1; ($x | foo) }; export def foo [] { foo }");
+    assert!(actual.err.is_empty());
+
+    let actual = nu!(r#"
+export def recursive [c: int] {
+    if ($c == 0) { return }
+    if ($c mod 2 > 0) {
+        $in | recursive ($c - 1)
+    } else {
+        recursive ($c - 1)
+    }
+}"#);
+    assert!(actual.err.is_empty());
+}
diff --git a/crates/nu-engine/src/compile/call.rs b/crates/nu-engine/src/compile/call.rs
index e928b63826..4112e889b1 100644
--- a/crates/nu-engine/src/compile/call.rs
+++ b/crates/nu-engine/src/compile/call.rs
@@ -71,6 +71,9 @@ pub(crate) fn compile_call(
             "return" => {
                 return compile_return(working_set, builder, call, redirect_modes, io_reg);
             }
+            "def" | "export def" => {
+                return builder.load_empty(io_reg);
+            }
             _ => (),
         }
     }

From bdf63420d1d2eaf7e6f3aff81f950fafa272d76b Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 7 Nov 2024 07:15:57 -0600
Subject: [PATCH 0655/1072] update reedline to the latest commit (#14281)

# Description

This PR updates reedline to the latest commit. 7a1b344a.

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

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

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

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

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

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

diff --git a/Cargo.lock b/Cargo.lock
index 62870922e4..e7707cea43 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5179,7 +5179,7 @@ dependencies = [
 [[package]]
 name = "reedline"
 version = "0.36.0"
-source = "git+https://github.com/nushell/reedline?branch=main#9cb1128aaab8f5c19ec37b94ac1a86a91915827f"
+source = "git+https://github.com/nushell/reedline?branch=main#7a1b344a9f6314bc801bf82f42bf739a11a78fe3"
 dependencies = [
  "arboard",
  "chrono",

From 919d55f3fc1c74743db44050d1045799901e884e Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aaionescu@pm.me>
Date: Fri, 8 Nov 2024 07:37:38 +0100
Subject: [PATCH 0656/1072] Remove unneeded clones in `select` (#14283)

# Description

This PR removes some unneeded `clone()` calls in the implementation of
`select`.

# User-Facing Changes

There are no user-facing changes.
---
 crates/nu-command/src/filters/select.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/nu-command/src/filters/select.rs b/crates/nu-command/src/filters/select.rs
index 670def2d09..71a2389c79 100644
--- a/crates/nu-command/src/filters/select.rs
+++ b/crates/nu-command/src/filters/select.rs
@@ -64,12 +64,12 @@ produce a table, a list will produce a list, and a record will produce a record.
                 Value::String { val, .. } => {
                     let cv = CellPath {
                         members: vec![PathMember::String {
-                            val: val.clone(),
+                            val,
                             span: *col_span,
                             optional: false,
                         }],
                     };
-                    new_columns.push(cv.clone());
+                    new_columns.push(cv);
                 }
                 Value::Int { val, internal_span } => {
                     if val < 0 {
@@ -87,7 +87,7 @@ produce a table, a list will produce a list, and a record will produce a record.
                             optional: false,
                         }],
                     };
-                    new_columns.push(cv.clone());
+                    new_columns.push(cv);
                 }
                 x => {
                     return Err(ShellError::CantConvert {

From 6c7129cc0c1cdeb5a85b4aa3cefa27dc1a2eb235 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Sat, 9 Nov 2024 19:09:17 -0500
Subject: [PATCH 0657/1072] Fix multipart/form-data post example (#14291)

# Description

Thanks to @weirdan [in
Discord](https://discord.com/channels/601130461678272522/614593951969574961/1304508148207583345)
for pointing out that correct syntax for `http post --content-type
multipart/form-data`.

The existing example was incomplete, so I've updated it.

# User-Facing Changes

Doc-only

# Tests + Formatting

`toolkit test` currently seems to be broken, so relying on CI

# After Submitting

N/A
---
 crates/nu-command/src/network/http/post.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-command/src/network/http/post.rs b/crates/nu-command/src/network/http/post.rs
index fbe780294b..1d144f7d16 100644
--- a/crates/nu-command/src/network/http/post.rs
+++ b/crates/nu-command/src/network/http/post.rs
@@ -129,7 +129,7 @@ impl Command for SubCommand {
             },
             Example {
                 description: "Upload a file to example.com",
-                example: "http post --content-type multipart/form-data https://www.example.com { audio: (open -r file.mp3) }",
+                example: "http post --content-type multipart/form-data https://www.example.com { file: (open -r file.mp3 | into binary) }",
                 result: None,
             },
         ]

From 8f9b198d48633484193c6fafd74e30b4a41b0f2a Mon Sep 17 00:00:00 2001
From: "A. Taha Baki" <atahabaki.dev@pm.me>
Date: Sun, 10 Nov 2024 16:00:42 +0300
Subject: [PATCH 0658/1072] upgrade bracoxide to v0.1.4 (fixes #14290) (#14296)

I'm  sorry I'm not following the PR template but this is a quick fix.

Fixes #14290
---
 Cargo.lock                                   |  6 +++---
 Cargo.toml                                   |  2 +-
 crates/nu-command/src/strings/str_/expand.rs | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e7707cea43..e946a058e2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -472,9 +472,9 @@ dependencies = [
 
 [[package]]
 name = "bracoxide"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ada7f35ca622a86a4d6c27be2633fc6c243ecc834859628fcce0681d8e76e1c8"
+checksum = "fbc0bcb5424e8e1f29c21a00f2d222df5e8e9779732ff03f840315d8fbac708e"
 
 [[package]]
 name = "brotli"
@@ -7108,7 +7108,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 8af6d422d7..1be660ccea 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -66,7 +66,7 @@ alphanumeric-sort = "1.5"
 ansi-str = "0.8"
 anyhow = "1.0.82"
 base64 = "0.22.1"
-bracoxide = "0.1.2"
+bracoxide = "0.1.4"
 brotli = "6.0"
 byteorder = "1.5"
 bytes = "1"
diff --git a/crates/nu-command/src/strings/str_/expand.rs b/crates/nu-command/src/strings/str_/expand.rs
index 985c7fa57d..34d2feb7d8 100644
--- a/crates/nu-command/src/strings/str_/expand.rs
+++ b/crates/nu-command/src/strings/str_/expand.rs
@@ -307,6 +307,20 @@ fn str_expand(contents: &str, span: Span, value_span: Span) -> Value {
 mod tests {
     use super::*;
 
+    #[test]
+    fn test_outer_single_item() {
+        assert_eq!(
+            str_expand("{W{x,y}}", Span::test_data(), Span::test_data()),
+            Value::list(
+                vec![
+                    Value::string(String::from("Wx"), Span::test_data(),),
+                    Value::string(String::from("Wy"), Span::test_data(),)
+                ],
+                Span::test_data(),
+            )
+        );
+    }
+
     #[test]
     fn dots() {
         assert_eq!(

From 55db643048b0282b05601a47909ceae51609cd0f Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Sun, 10 Nov 2024 07:35:18 -0600
Subject: [PATCH 0659/1072] ignore without_timezone test for now (#14297)

# Description

Since the human-date-parser was switched to use the users local
timezone, this test may not be needed anymore. I've just ignored it for
now and put a comment about why it's being ignored.

There are more discussions on this topic here
https://github.com/nushell/nushell/pull/14266

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/conversions/into/datetime.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/crates/nu-command/src/conversions/into/datetime.rs b/crates/nu-command/src/conversions/into/datetime.rs
index fd183b43bd..dcb37291af 100644
--- a/crates/nu-command/src/conversions/into/datetime.rs
+++ b/crates/nu-command/src/conversions/into/datetime.rs
@@ -507,7 +507,14 @@ mod tests {
     }
 
     #[test]
+    #[ignore]
     fn takes_a_date_format_without_timezone() {
+        // Ignoring this test for now because we changed the human-date-parser to use
+        // the users timezone instead of UTC. We may continue to tweak this behavior.
+        // Another hacky solution is to set the timezone to UTC in the test, which works
+        // on MacOS and Linux but hasn't been tested on Windows. Plus it kind of defeats
+        // the purpose of a "without_timezone" test.
+        // std::env::set_var("TZ", "UTC");
         let date_str = Value::test_string("16.11.1984 8:00 am");
         let fmt_options = Some(DatetimeFormat("%d.%m.%Y %H:%M %P".to_string()));
         let args = Arguments {

From 07ad24ab974f50c6e040703a26fe1397630fce6e Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Mon, 11 Nov 2024 07:01:39 -0500
Subject: [PATCH 0660/1072] Fix ignored `into datetime` test (#14302)

# Description

Fixes test which was ignored in #14297.  Also fixes related example.

Tests now use local timezone to match actual result.

More discussion in #14266

# User-Facing Changes

Tests-only

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

N/A
---
 .../src/conversions/into/datetime.rs          | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/crates/nu-command/src/conversions/into/datetime.rs b/crates/nu-command/src/conversions/into/datetime.rs
index dcb37291af..0f6580cbc8 100644
--- a/crates/nu-command/src/conversions/into/datetime.rs
+++ b/crates/nu-command/src/conversions/into/datetime.rs
@@ -185,11 +185,13 @@ impl Command for SubCommand {
                 example: "'16.11.1984 8:00 am' | into datetime --format '%d.%m.%Y %H:%M %P'",
                 #[allow(clippy::inconsistent_digit_grouping)]
                 result: Some(Value::date(
-                    DateTime::from_naive_utc_and_offset(
-                        NaiveDateTime::parse_from_str("16.11.1984 8:00 am", "%d.%m.%Y %H:%M %P")
-                        .expect("date calculation should not fail in test"),
-                        *Local::now().offset(),
-                    ),
+                    Local
+                        .from_local_datetime(
+                            &NaiveDateTime::parse_from_str("16.11.1984 8:00 am", "%d.%m.%Y %H:%M %P")
+                                .expect("date calculation should not fail in test"),
+                        )
+                        .unwrap()
+                        .with_timezone(Local::now().offset()),
                     Span::test_data(),
                 )),
             },
@@ -524,12 +526,16 @@ mod tests {
         };
         let actual = action(&date_str, &args, Span::test_data());
         let expected = Value::date(
-            DateTime::from_naive_utc_and_offset(
-                NaiveDateTime::parse_from_str("16.11.1984 8:00 am", "%d.%m.%Y %H:%M %P").unwrap(),
-                *Local::now().offset(),
-            ),
+            Local
+                .from_local_datetime(
+                    &NaiveDateTime::parse_from_str("16.11.1984 8:00 am", "%d.%m.%Y %H:%M %P")
+                        .unwrap(),
+                )
+                .unwrap()
+                .with_timezone(Local::now().offset()),
             Span::test_data(),
         );
+
         assert_eq!(actual, expected)
     }
 

From a5413827760bf829ca024a84164105a6b74dfbaa Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Mon, 11 Nov 2024 13:49:49 -0500
Subject: [PATCH 0661/1072] Fix binary example and add one for text uploads
 (#14307)

# Description

In #14291, I misunderstood the use-case for `into binary` with `http
post`. Thanks again to @weirdan for steering me straight on that. This
reverts the example that I changed and adds a new one for uploading text
files.

# User-Facing Changes

Doc-only

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

N/A
---
 crates/nu-command/src/network/http/post.rs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/crates/nu-command/src/network/http/post.rs b/crates/nu-command/src/network/http/post.rs
index 1d144f7d16..597f9478b9 100644
--- a/crates/nu-command/src/network/http/post.rs
+++ b/crates/nu-command/src/network/http/post.rs
@@ -128,8 +128,13 @@ impl Command for SubCommand {
                 result: None,
             },
             Example {
-                description: "Upload a file to example.com",
-                example: "http post --content-type multipart/form-data https://www.example.com { file: (open -r file.mp3 | into binary) }",
+                description: "Upload a binary file to example.com",
+                example: "http post --content-type multipart/form-data https://www.example.com { file: (open -r file.mp3) }",
+                result: None,
+            },
+            Example {
+                description: "Convert a text file into binary and upload it to example.com",
+                example: "http post --content-type multipart/form-data https://www.example.com { file: (open -r file.txt | into binary) }",
                 result: None,
             },
         ]

From b857064d654424fb2c8c5b031e7807cb336e6512 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Tue, 12 Nov 2024 20:34:46 +0100
Subject: [PATCH 0662/1072] Pin reedline to `0.37.0` release (#14317)

---
 Cargo.lock | 5 +++--
 Cargo.toml | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e946a058e2..9a08767754 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5178,8 +5178,9 @@ dependencies = [
 
 [[package]]
 name = "reedline"
-version = "0.36.0"
-source = "git+https://github.com/nushell/reedline?branch=main#7a1b344a9f6314bc801bf82f42bf739a11a78fe3"
+version = "0.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9834765acaa2deedf29197f2da3d309801683beb20e25775bc0249f97a7b9a74"
 dependencies = [
  "arboard",
  "chrono",
diff --git a/Cargo.toml b/Cargo.toml
index 1be660ccea..910c5ec8d9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -137,7 +137,7 @@ rand = "0.8"
 rand_chacha = "0.3.1"
 ratatui = "0.26"
 rayon = "1.10"
-reedline = "0.36.0"
+reedline = "0.37.0"
 regex = "1.9.5"
 rmp = "0.8"
 rmp-serde = "1.3"
@@ -313,7 +313,7 @@ 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`

From c9409a2edb469f62a75588362b995c8e4fc17e50 Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Wed, 13 Nov 2024 04:22:38 +0800
Subject: [PATCH 0663/1072] Bump version to `0.100.0` (#14312)

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

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

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

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

Bump version to `0.100.0`

# User-Facing Changes

The new release `v0.100.0` is coming...
---
 Cargo.lock                                    | 74 +++++++++----------
 Cargo.toml                                    | 40 +++++-----
 crates/nu-cli/Cargo.toml                      | 24 +++---
 crates/nu-cmd-base/Cargo.toml                 | 10 +--
 crates/nu-cmd-extra/Cargo.toml                | 22 +++---
 crates/nu-cmd-lang/Cargo.toml                 | 10 +--
 crates/nu-cmd-plugin/Cargo.toml               | 10 +--
 crates/nu-color-config/Cargo.toml             | 10 +--
 crates/nu-command/Cargo.toml                  | 34 ++++-----
 crates/nu-derive-value/Cargo.toml             |  2 +-
 crates/nu-engine/Cargo.toml                   | 10 +--
 crates/nu-explore/Cargo.toml                  | 20 ++---
 crates/nu-glob/Cargo.toml                     |  2 +-
 crates/nu-json/Cargo.toml                     |  6 +-
 crates/nu-lsp/Cargo.toml                      | 14 ++--
 crates/nu-parser/Cargo.toml                   | 12 +--
 crates/nu-path/Cargo.toml                     |  2 +-
 crates/nu-plugin-core/Cargo.toml              |  6 +-
 crates/nu-plugin-engine/Cargo.toml            | 14 ++--
 crates/nu-plugin-protocol/Cargo.toml          |  6 +-
 crates/nu-plugin-test-support/Cargo.toml      | 18 ++---
 crates/nu-plugin/Cargo.toml                   | 12 +--
 crates/nu-pretty-hex/Cargo.toml               |  2 +-
 crates/nu-protocol/Cargo.toml                 | 14 ++--
 crates/nu-std/Cargo.toml                      |  8 +-
 crates/nu-system/Cargo.toml                   |  2 +-
 crates/nu-table/Cargo.toml                    | 12 +--
 crates/nu-term-grid/Cargo.toml                |  4 +-
 crates/nu-test-support/Cargo.toml             |  8 +-
 crates/nu-utils/Cargo.toml                    |  2 +-
 .../src/sample_config/default_config.nu       |  2 +-
 .../nu-utils/src/sample_config/default_env.nu |  2 +-
 crates/nu_plugin_custom_values/Cargo.toml     |  6 +-
 crates/nu_plugin_example/Cargo.toml           | 10 +--
 crates/nu_plugin_formats/Cargo.toml           |  8 +-
 crates/nu_plugin_gstat/Cargo.toml             |  6 +-
 crates/nu_plugin_inc/Cargo.toml               |  6 +-
 .../nu_plugin_nu_example.nu                   |  2 +-
 crates/nu_plugin_polars/Cargo.toml            | 20 ++---
 .../nu_plugin_python_example.py               |  2 +-
 crates/nu_plugin_query/Cargo.toml             |  6 +-
 crates/nu_plugin_stress_internals/Cargo.toml  |  2 +-
 crates/nuon/Cargo.toml                        | 10 +--
 43 files changed, 246 insertions(+), 246 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9a08767754..a60ecfc081 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2971,7 +2971,7 @@ dependencies = [
 
 [[package]]
 name = "nu"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "assert_cmd",
  "crossterm 0.28.1",
@@ -3026,7 +3026,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cli"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "chrono",
  "crossterm 0.28.1",
@@ -3060,7 +3060,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-base"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "indexmap",
  "miette",
@@ -3072,7 +3072,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-extra"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "fancy-regex",
  "heck",
@@ -3097,7 +3097,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-lang"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "itertools 0.13.0",
  "nu-engine",
@@ -3109,7 +3109,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-plugin"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "itertools 0.13.0",
  "nu-engine",
@@ -3120,7 +3120,7 @@ dependencies = [
 
 [[package]]
 name = "nu-color-config"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "nu-ansi-term",
  "nu-engine",
@@ -3132,7 +3132,7 @@ dependencies = [
 
 [[package]]
 name = "nu-command"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "alphanumeric-sort",
  "base64 0.22.1",
@@ -3242,7 +3242,7 @@ dependencies = [
 
 [[package]]
 name = "nu-derive-value"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -3253,7 +3253,7 @@ dependencies = [
 
 [[package]]
 name = "nu-engine"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "log",
  "nu-glob",
@@ -3265,7 +3265,7 @@ dependencies = [
 
 [[package]]
 name = "nu-explore"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "ansi-str",
  "anyhow",
@@ -3290,14 +3290,14 @@ dependencies = [
 
 [[package]]
 name = "nu-glob"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "doc-comment",
 ]
 
 [[package]]
 name = "nu-json"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "fancy-regex",
  "linked-hash-map",
@@ -3310,7 +3310,7 @@ dependencies = [
 
 [[package]]
 name = "nu-lsp"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "assert-json-diff",
  "crossbeam-channel",
@@ -3331,7 +3331,7 @@ dependencies = [
 
 [[package]]
 name = "nu-parser"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "bytesize",
  "chrono",
@@ -3348,7 +3348,7 @@ dependencies = [
 
 [[package]]
 name = "nu-path"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "dirs",
  "omnipath",
@@ -3357,7 +3357,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "log",
  "nix 0.29.0",
@@ -3373,7 +3373,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-core"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "interprocess",
  "log",
@@ -3387,7 +3387,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-engine"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "log",
  "nu-engine",
@@ -3403,7 +3403,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-protocol"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "nu-protocol",
  "nu-utils",
@@ -3415,7 +3415,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-test-support"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "nu-ansi-term",
  "nu-cmd-lang",
@@ -3433,7 +3433,7 @@ dependencies = [
 
 [[package]]
 name = "nu-pretty-hex"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "heapless",
  "nu-ansi-term",
@@ -3442,7 +3442,7 @@ dependencies = [
 
 [[package]]
 name = "nu-protocol"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "brotli",
  "byte-unit",
@@ -3480,7 +3480,7 @@ dependencies = [
 
 [[package]]
 name = "nu-std"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "log",
  "miette",
@@ -3491,7 +3491,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "chrono",
  "itertools 0.13.0",
@@ -3508,7 +3508,7 @@ dependencies = [
 
 [[package]]
 name = "nu-table"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "fancy-regex",
  "nu-ansi-term",
@@ -3522,7 +3522,7 @@ dependencies = [
 
 [[package]]
 name = "nu-term-grid"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "nu-utils",
  "unicode-width",
@@ -3530,7 +3530,7 @@ dependencies = [
 
 [[package]]
 name = "nu-test-support"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -3542,7 +3542,7 @@ dependencies = [
 
 [[package]]
 name = "nu-utils"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "crossterm_winapi",
  "fancy-regex",
@@ -3569,7 +3569,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_example"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "nu-cmd-lang",
  "nu-plugin",
@@ -3579,7 +3579,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_formats"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "chrono",
  "eml-parser",
@@ -3594,7 +3594,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_gstat"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "git2",
  "nu-plugin",
@@ -3603,7 +3603,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_inc"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -3612,7 +3612,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_polars"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "chrono",
  "chrono-tz 0.10.0",
@@ -3647,7 +3647,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_query"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "gjson",
  "nu-plugin",
@@ -3662,7 +3662,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_stress_internals"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "interprocess",
  "serde",
@@ -3776,7 +3776,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "nuon"
-version = "0.99.2"
+version = "0.100.0"
 dependencies = [
  "chrono",
  "nu-engine",
diff --git a/Cargo.toml b/Cargo.toml
index 910c5ec8d9..764f6b76af 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
 rust-version = "1.80.1"
-version = "0.99.2"
+version = "0.100.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -189,22 +189,22 @@ unchecked_duration_subtraction = "warn"
 workspace = true
 
 [dependencies]
-nu-cli = { path = "./crates/nu-cli", version = "0.99.2" }
-nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.99.2" }
-nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.99.2" }
-nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.99.2", optional = true }
-nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.99.2" }
-nu-command = { path = "./crates/nu-command", version = "0.99.2" }
-nu-engine = { path = "./crates/nu-engine", version = "0.99.2" }
-nu-explore = { path = "./crates/nu-explore", version = "0.99.2" }
-nu-lsp = { path = "./crates/nu-lsp/", version = "0.99.2" }
-nu-parser = { path = "./crates/nu-parser", version = "0.99.2" }
-nu-path = { path = "./crates/nu-path", version = "0.99.2" }
-nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.99.2" }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.99.2" }
-nu-std = { path = "./crates/nu-std", version = "0.99.2" }
-nu-system = { path = "./crates/nu-system", version = "0.99.2" }
-nu-utils = { path = "./crates/nu-utils", version = "0.99.2" }
+nu-cli = { path = "./crates/nu-cli", version = "0.100.0" }
+nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.100.0" }
+nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.100.0" }
+nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.100.0", optional = true }
+nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.100.0" }
+nu-command = { path = "./crates/nu-command", version = "0.100.0" }
+nu-engine = { path = "./crates/nu-engine", version = "0.100.0" }
+nu-explore = { path = "./crates/nu-explore", version = "0.100.0" }
+nu-lsp = { path = "./crates/nu-lsp/", version = "0.100.0" }
+nu-parser = { path = "./crates/nu-parser", version = "0.100.0" }
+nu-path = { path = "./crates/nu-path", version = "0.100.0" }
+nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.100.0" }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.100.0" }
+nu-std = { path = "./crates/nu-std", version = "0.100.0" }
+nu-system = { path = "./crates/nu-system", version = "0.100.0" }
+nu-utils = { path = "./crates/nu-utils", version = "0.100.0" }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
 crossterm = { workspace = true }
@@ -234,9 +234,9 @@ nix = { workspace = true, default-features = false, features = [
 ] }
 
 [dev-dependencies]
-nu-test-support = { path = "./crates/nu-test-support", version = "0.99.2" }
-nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.99.2" }
-nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.99.2" }
+nu-test-support = { path = "./crates/nu-test-support", version = "0.100.0" }
+nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.100.0" }
+nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.100.0" }
 assert_cmd = "2.0"
 dirs = { workspace = true }
 tango-bench = "0.6"
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 944a485d5e..c2336b3ab4 100644
--- 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.99.2"
+version = "0.100.0"
 
 [lib]
 bench = false
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.2" }
-nu-command = { path = "../nu-command", version = "0.99.2" }
-nu-test-support = { path = "../nu-test-support", version = "0.99.2" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.0" }
+nu-command = { path = "../nu-command", version = "0.100.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.100.0" }
 rstest = { workspace = true, default-features = false }
 tempfile = { workspace = true }
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.99.2" }
-nu-engine = { path = "../nu-engine", version = "0.99.2" }
-nu-path = { path = "../nu-path", version = "0.99.2" }
-nu-parser = { path = "../nu-parser", version = "0.99.2" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.99.2", optional = true }
-nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
-nu-utils = { path = "../nu-utils", version = "0.99.2" }
-nu-color-config = { path = "../nu-color-config", version = "0.99.2" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.100.0" }
+nu-engine = { path = "../nu-engine", version = "0.100.0" }
+nu-path = { path = "../nu-path", version = "0.100.0" }
+nu-parser = { path = "../nu-parser", version = "0.100.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.100.0", optional = true }
+nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
+nu-utils = { path = "../nu-utils", version = "0.100.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.100.0" }
 nu-ansi-term = { workspace = true }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
diff --git a/crates/nu-cmd-base/Cargo.toml b/crates/nu-cmd-base/Cargo.toml
index 558ab9d9ea..d67822c2a2 100644
--- a/crates/nu-cmd-base/Cargo.toml
+++ b/crates/nu-cmd-base/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-base"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-base"
-version = "0.99.2"
+version = "0.100.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,10 +13,10 @@ version = "0.99.2"
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.99.2" }
-nu-parser = { path = "../nu-parser", version = "0.99.2" }
-nu-path = { path = "../nu-path", version = "0.99.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
+nu-engine = { path = "../nu-engine", version = "0.100.0" }
+nu-parser = { path = "../nu-parser", version = "0.100.0" }
+nu-path = { path = "../nu-path", version = "0.100.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
 
 indexmap = { workspace = true }
 miette = { workspace = true }
diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml
index 81dfc9ede2..43a4c5645f 100644
--- 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.99.2"
+version = "0.100.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,13 +16,13 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.99.2" }
-nu-engine = { path = "../nu-engine", version = "0.99.2" }
-nu-json = { version = "0.99.2", path = "../nu-json" }
-nu-parser = { path = "../nu-parser", version = "0.99.2" }
-nu-pretty-hex = { version = "0.99.2", path = "../nu-pretty-hex" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
-nu-utils = { path = "../nu-utils", version = "0.99.2" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.100.0" }
+nu-engine = { path = "../nu-engine", version = "0.100.0" }
+nu-json = { version = "0.100.0", path = "../nu-json" }
+nu-parser = { path = "../nu-parser", version = "0.100.0" }
+nu-pretty-hex = { version = "0.100.0", path = "../nu-pretty-hex" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
+nu-utils = { path = "../nu-utils", version = "0.100.0" }
 
 # Potential dependencies for extras
 heck = { workspace = true }
@@ -36,6 +36,6 @@ v_htmlescape = { workspace = true }
 itertools = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.2" }
-nu-command = { path = "../nu-command", version = "0.99.2" }
-nu-test-support = { path = "../nu-test-support", version = "0.99.2" }
\ No newline at end of file
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.0" }
+nu-command = { path = "../nu-command", version = "0.100.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.100.0" }
\ No newline at end of file
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index 0c5905c65e..b4c6423b61 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -6,7 +6,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-lang"
 edition = "2021"
 license = "MIT"
 name = "nu-cmd-lang"
-version = "0.99.2"
+version = "0.100.0"
 
 [lib]
 bench = false
@@ -15,10 +15,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.99.2" }
-nu-parser = { path = "../nu-parser", version = "0.99.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
-nu-utils = { path = "../nu-utils", version = "0.99.2" }
+nu-engine = { path = "../nu-engine", version = "0.100.0" }
+nu-parser = { path = "../nu-parser", version = "0.100.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
+nu-utils = { path = "../nu-utils", version = "0.100.0" }
 
 itertools = { workspace = true }
 shadow-rs = { version = "0.35", default-features = false }
diff --git a/crates/nu-cmd-plugin/Cargo.toml b/crates/nu-cmd-plugin/Cargo.toml
index 9d1b9aede4..df6e2c369d 100644
--- a/crates/nu-cmd-plugin/Cargo.toml
+++ b/crates/nu-cmd-plugin/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-plugin"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-plugin"
-version = "0.99.2"
+version = "0.100.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,10 +13,10 @@ version = "0.99.2"
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.99.2" }
-nu-path = { path = "../nu-path", version = "0.99.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.2", features = ["plugin"] }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.99.2" }
+nu-engine = { path = "../nu-engine", version = "0.100.0" }
+nu-path = { path = "../nu-path", version = "0.100.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.0", features = ["plugin"] }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.100.0" }
 
 itertools = { workspace = true }
 
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index 85925f22da..7a244bb5de 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-color-confi
 edition = "2021"
 license = "MIT"
 name = "nu-color-config"
-version = "0.99.2"
+version = "0.100.0"
 
 [lib]
 bench = false
@@ -14,12 +14,12 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
-nu-engine = { path = "../nu-engine", version = "0.99.2" }
-nu-json = { path = "../nu-json", version = "0.99.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
+nu-engine = { path = "../nu-engine", version = "0.100.0" }
+nu-json = { path = "../nu-json", version = "0.100.0" }
 nu-ansi-term = { workspace = true }
 
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.99.2" }
\ No newline at end of file
+nu-test-support = { path = "../nu-test-support", version = "0.100.0" }
\ No newline at end of file
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index d4d31338b3..940e89c5d2 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-command"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
-version = "0.99.2"
+version = "0.100.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,21 +16,21 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.99.2" }
-nu-color-config = { path = "../nu-color-config", version = "0.99.2" }
-nu-engine = { path = "../nu-engine", version = "0.99.2" }
-nu-glob = { path = "../nu-glob", version = "0.99.2" }
-nu-json = { path = "../nu-json", version = "0.99.2" }
-nu-parser = { path = "../nu-parser", version = "0.99.2" }
-nu-path = { path = "../nu-path", version = "0.99.2" }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.99.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
-nu-system = { path = "../nu-system", version = "0.99.2" }
-nu-table = { path = "../nu-table", version = "0.99.2" }
-nu-term-grid = { path = "../nu-term-grid", version = "0.99.2" }
-nu-utils = { path = "../nu-utils", version = "0.99.2" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.100.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.100.0" }
+nu-engine = { path = "../nu-engine", version = "0.100.0" }
+nu-glob = { path = "../nu-glob", version = "0.100.0" }
+nu-json = { path = "../nu-json", version = "0.100.0" }
+nu-parser = { path = "../nu-parser", version = "0.100.0" }
+nu-path = { path = "../nu-path", version = "0.100.0" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.100.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
+nu-system = { path = "../nu-system", version = "0.100.0" }
+nu-table = { path = "../nu-table", version = "0.100.0" }
+nu-term-grid = { path = "../nu-term-grid", version = "0.100.0" }
+nu-utils = { path = "../nu-utils", version = "0.100.0" }
 nu-ansi-term = { workspace = true }
-nuon = { path = "../nuon", version = "0.99.2" }
+nuon = { path = "../nuon", version = "0.100.0" }
 
 alphanumeric-sort = { workspace = true }
 base64 = { workspace = true }
@@ -139,8 +139,8 @@ sqlite = ["rusqlite"]
 trash-support = ["trash"]
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.2" }
-nu-test-support = { path = "../nu-test-support", version = "0.99.2" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.100.0" }
 
 dirs = { workspace = true }
 mockito = { workspace = true, default-features = false }
diff --git a/crates/nu-derive-value/Cargo.toml b/crates/nu-derive-value/Cargo.toml
index 84d46076d7..961280c6dc 100644
--- a/crates/nu-derive-value/Cargo.toml
+++ b/crates/nu-derive-value/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-derive-value"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-derive-value"
-version = "0.99.2"
+version = "0.100.0"
 
 [lib]
 proc-macro = true
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index 47afe10bb2..78542dbfcf 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-engine"
 edition = "2021"
 license = "MIT"
 name = "nu-engine"
-version = "0.99.2"
+version = "0.100.0"
 
 [lib]
 bench = false
@@ -14,10 +14,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.99.2" }
-nu-path = { path = "../nu-path", version = "0.99.2" }
-nu-glob = { path = "../nu-glob", version = "0.99.2" }
-nu-utils = { path = "../nu-utils", version = "0.99.2" }
+nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.100.0" }
+nu-path = { path = "../nu-path", version = "0.100.0" }
+nu-glob = { path = "../nu-glob", version = "0.100.0" }
+nu-utils = { path = "../nu-utils", version = "0.100.0" }
 log = { workspace = true }
 terminal_size = { workspace = true }
 
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index da3beb68b8..620c006f2c 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-explore"
 edition = "2021"
 license = "MIT"
 name = "nu-explore"
-version = "0.99.2"
+version = "0.100.0"
 
 [lib]
 bench = false
@@ -14,16 +14,16 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
-nu-parser = { path = "../nu-parser", version = "0.99.2" }
-nu-path = { path = "../nu-path", version = "0.99.2" }
-nu-color-config = { path = "../nu-color-config", version = "0.99.2" }
-nu-engine = { path = "../nu-engine", version = "0.99.2" }
-nu-table = { path = "../nu-table", version = "0.99.2" }
-nu-json = { path = "../nu-json", version = "0.99.2" }
-nu-utils = { path = "../nu-utils", version = "0.99.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
+nu-parser = { path = "../nu-parser", version = "0.100.0" }
+nu-path = { path = "../nu-path", version = "0.100.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.100.0" }
+nu-engine = { path = "../nu-engine", version = "0.100.0" }
+nu-table = { path = "../nu-table", version = "0.100.0" }
+nu-json = { path = "../nu-json", version = "0.100.0" }
+nu-utils = { path = "../nu-utils", version = "0.100.0" }
 nu-ansi-term = { workspace = true }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.99.2" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.100.0" }
 
 anyhow = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-glob/Cargo.toml b/crates/nu-glob/Cargo.toml
index 30b3b7654d..b388c2f3ec 100644
--- a/crates/nu-glob/Cargo.toml
+++ b/crates/nu-glob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-glob"
-version = "0.99.2"
+version = "0.100.0"
 authors = ["The Nushell Project Developers", "The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 description = """
diff --git a/crates/nu-json/Cargo.toml b/crates/nu-json/Cargo.toml
index a964b2d81c..4c46d6a6ab 100644
--- a/crates/nu-json/Cargo.toml
+++ b/crates/nu-json/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-json"
 edition = "2021"
 license = "MIT"
 name = "nu-json"
-version = "0.99.2"
+version = "0.100.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -26,8 +26,8 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.99.2" }
-nu-path = { path = "../nu-path", version = "0.99.2" }
+nu-test-support = { path = "../nu-test-support", version = "0.100.0" }
+nu-path = { path = "../nu-path", version = "0.100.0" }
 serde_json = "1.0"
 fancy-regex = "0.14.0"
 
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index 4aecc2834b..0e26f4ec6b 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -3,14 +3,14 @@ authors = ["The Nushell Project Developers"]
 description = "Nushell's integrated LSP server"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-lsp"
 name = "nu-lsp"
-version = "0.99.2"
+version = "0.100.0"
 edition = "2021"
 license = "MIT"
 
 [dependencies]
-nu-cli = { path = "../nu-cli", version = "0.99.2" }
-nu-parser = { path = "../nu-parser", version = "0.99.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
+nu-cli = { path = "../nu-cli", version = "0.100.0" }
+nu-parser = { path = "../nu-parser", version = "0.100.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
 
 reedline = { workspace = true }
 
@@ -23,9 +23,9 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.2" }
-nu-command = { path = "../nu-command", version = "0.99.2" }
-nu-test-support = { path = "../nu-test-support", version = "0.99.2" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.0" }
+nu-command = { path = "../nu-command", version = "0.100.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.100.0" }
 
 assert-json-diff = "2.0"
 
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index a64acbbd0b..5a626f06a5 100644
--- a/crates/nu-parser/Cargo.toml
+++ b/crates/nu-parser/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-parser"
 edition = "2021"
 license = "MIT"
 name = "nu-parser"
-version = "0.99.2"
+version = "0.100.0"
 exclude = ["/fuzz"]
 
 [lib]
@@ -15,11 +15,11 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.99.2" }
-nu-path = { path = "../nu-path", version = "0.99.2" }
-nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.99.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
-nu-utils = { path = "../nu-utils", version = "0.99.2" }
+nu-engine = { path = "../nu-engine", version = "0.100.0" }
+nu-path = { path = "../nu-path", version = "0.100.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.100.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
+nu-utils = { path = "../nu-utils", version = "0.100.0" }
 
 bytesize = { workspace = true }
 chrono = { default-features = false, features = ['std'], workspace = true }
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index b451a21f75..634cad6c8d 100644
--- a/crates/nu-path/Cargo.toml
+++ b/crates/nu-path/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-path"
 edition = "2021"
 license = "MIT"
 name = "nu-path"
-version = "0.99.2"
+version = "0.100.0"
 exclude = ["/fuzz"]
 
 [lib]
diff --git a/crates/nu-plugin-core/Cargo.toml b/crates/nu-plugin-core/Cargo.toml
index 2f038be2a5..c5c99140c1 100644
--- a/crates/nu-plugin-core/Cargo.toml
+++ b/crates/nu-plugin-core/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-core
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-core"
-version = "0.99.2"
+version = "0.100.0"
 
 [lib]
 bench = false
@@ -14,8 +14,8 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.99.2", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.100.0", default-features = false }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true }
diff --git a/crates/nu-plugin-engine/Cargo.toml b/crates/nu-plugin-engine/Cargo.toml
index 6c59229074..55507cd794 100644
--- a/crates/nu-plugin-engine/Cargo.toml
+++ b/crates/nu-plugin-engine/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-engi
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-engine"
-version = "0.99.2"
+version = "0.100.0"
 
 [lib]
 bench = false
@@ -14,12 +14,12 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.99.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
-nu-system = { path = "../nu-system", version = "0.99.2" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.99.2" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.99.2", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.99.2" }
+nu-engine = { path = "../nu-engine", version = "0.100.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
+nu-system = { path = "../nu-system", version = "0.100.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.100.0" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.100.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.100.0" }
 
 serde = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-plugin-protocol/Cargo.toml b/crates/nu-plugin-protocol/Cargo.toml
index a98aca5fa4..05d093d6ba 100644
--- a/crates/nu-plugin-protocol/Cargo.toml
+++ b/crates/nu-plugin-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-prot
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-protocol"
-version = "0.99.2"
+version = "0.100.0"
 
 [lib]
 bench = false
@@ -14,8 +14,8 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.99.2", features = ["plugin"] }
-nu-utils = { path = "../nu-utils", version = "0.99.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.0", features = ["plugin"] }
+nu-utils = { path = "../nu-utils", version = "0.100.0" }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
diff --git a/crates/nu-plugin-test-support/Cargo.toml b/crates/nu-plugin-test-support/Cargo.toml
index 880c9b87a7..d8a044317f 100644
--- a/crates/nu-plugin-test-support/Cargo.toml
+++ b/crates/nu-plugin-test-support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-plugin-test-support"
-version = "0.99.2"
+version = "0.100.0"
 edition = "2021"
 license = "MIT"
 description = "Testing support for Nushell plugins"
@@ -15,14 +15,14 @@ workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.99.2", features = ["plugin"] }
-nu-protocol = { path = "../nu-protocol", version = "0.99.2", features = ["plugin"] }
-nu-parser = { path = "../nu-parser", version = "0.99.2", features = ["plugin"] }
-nu-plugin = { path = "../nu-plugin", version = "0.99.2" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.99.2" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.99.2" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.99.2" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.2" }
+nu-engine = { path = "../nu-engine", version = "0.100.0", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.100.0", features = ["plugin"] }
+nu-parser = { path = "../nu-parser", version = "0.100.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.100.0" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.100.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.100.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.100.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.0" }
 nu-ansi-term = { workspace = true }
 similar = "2.6"
 
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index 69c4c76f58..f9cc55a38b 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin"
 edition = "2021"
 license = "MIT"
 name = "nu-plugin"
-version = "0.99.2"
+version = "0.100.0"
 
 [lib]
 bench = false
@@ -14,11 +14,11 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.99.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.99.2" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.99.2", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.99.2" }
+nu-engine = { path = "../nu-engine", version = "0.100.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.100.0" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.100.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.100.0" }
 
 log = { workspace = true }
 thiserror = "1.0"
diff --git a/crates/nu-pretty-hex/Cargo.toml b/crates/nu-pretty-hex/Cargo.toml
index 534f9d4304..7c0e461670 100644
--- a/crates/nu-pretty-hex/Cargo.toml
+++ b/crates/nu-pretty-hex/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-pretty-hex"
 edition = "2021"
 license = "MIT"
 name = "nu-pretty-hex"
-version = "0.99.2"
+version = "0.100.0"
 
 [lib]
 doctest = false
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index a6b05474b1..70d32f18c9 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-protocol"
 edition = "2021"
 license = "MIT"
 name = "nu-protocol"
-version = "0.99.2"
+version = "0.100.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,10 +16,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.99.2" }
-nu-path = { path = "../nu-path", version = "0.99.2" }
-nu-system = { path = "../nu-system", version = "0.99.2" }
-nu-derive-value = { path = "../nu-derive-value", version = "0.99.2" }
+nu-utils = { path = "../nu-utils", version = "0.100.0" }
+nu-path = { path = "../nu-path", version = "0.100.0" }
+nu-system = { path = "../nu-system", version = "0.100.0" }
+nu-derive-value = { path = "../nu-derive-value", version = "0.100.0" }
 
 brotli = { workspace = true, optional = true }
 bytes = { workspace = true }
@@ -58,8 +58,8 @@ plugin = [
 serde_json = { workspace = true }
 strum = "0.26"
 strum_macros = "0.26"
-nu-test-support = { path = "../nu-test-support", version = "0.99.2" }
-nu-utils = { path = "../nu-utils", version = "0.99.2" }
+nu-test-support = { path = "../nu-test-support", version = "0.100.0" }
+nu-utils = { path = "../nu-utils", version = "0.100.0" }
 pretty_assertions = { workspace = true }
 rstest = { workspace = true }
 tempfile = { workspace = true }
diff --git a/crates/nu-std/Cargo.toml b/crates/nu-std/Cargo.toml
index a96728bb8f..43af76672d 100644
--- a/crates/nu-std/Cargo.toml
+++ b/crates/nu-std/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-std"
 edition = "2021"
 license = "MIT"
 name = "nu-std"
-version = "0.99.2"
+version = "0.100.0"
 
 [dependencies]
-nu-parser = { version = "0.99.2", path = "../nu-parser" }
-nu-protocol = { version = "0.99.2", path = "../nu-protocol" }
-nu-engine = { version = "0.99.2", path = "../nu-engine" }
+nu-parser = { version = "0.100.0", path = "../nu-parser" }
+nu-protocol = { version = "0.100.0", path = "../nu-protocol" }
+nu-engine = { version = "0.100.0", path = "../nu-engine" }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
 
 log = "0.4"
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index 4ac5cccb8d..009fbc041e 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["The Nushell Project Developers", "procs creators"]
 description = "Nushell system querying"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-system"
 name = "nu-system"
-version = "0.99.2"
+version = "0.100.0"
 edition = "2021"
 license = "MIT"
 
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index b0fdf92273..070d67733a 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-table"
 edition = "2021"
 license = "MIT"
 name = "nu-table"
-version = "0.99.2"
+version = "0.100.0"
 
 [lib]
 bench = false
@@ -14,14 +14,14 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
-nu-utils = { path = "../nu-utils", version = "0.99.2" }
-nu-engine = { path = "../nu-engine", version = "0.99.2" }
-nu-color-config = { path = "../nu-color-config", version = "0.99.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
+nu-utils = { path = "../nu-utils", version = "0.100.0" }
+nu-engine = { path = "../nu-engine", version = "0.100.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.100.0" }
 nu-ansi-term = { workspace = true }
 fancy-regex = { workspace = true }
 tabled = { workspace = true, features = ["ansi"], default-features = false }
 terminal_size = { workspace = true }
 
 [dev-dependencies]
-# nu-test-support = { path="../nu-test-support", version = "0.99.2"  }
\ No newline at end of file
+# nu-test-support = { path="../nu-test-support", version = "0.100.0"  }
\ No newline at end of file
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index 70d4ae3cd7..6a07fd86f6 100644
--- a/crates/nu-term-grid/Cargo.toml
+++ b/crates/nu-term-grid/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-term-grid"
 edition = "2021"
 license = "MIT"
 name = "nu-term-grid"
-version = "0.99.2"
+version = "0.100.0"
 
 [lib]
 bench = false
@@ -14,6 +14,6 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.99.2" }
+nu-utils = { path = "../nu-utils", version = "0.100.0" }
 
 unicode-width = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml
index 3bacc808b2..8643946182 100644
--- a/crates/nu-test-support/Cargo.toml
+++ b/crates/nu-test-support/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-test-suppor
 edition = "2021"
 license = "MIT"
 name = "nu-test-support"
-version = "0.99.2"
+version = "0.100.0"
 
 [lib]
 doctest = false
@@ -15,9 +15,9 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-path = { path = "../nu-path", version = "0.99.2" }
-nu-glob = { path = "../nu-glob", version = "0.99.2" }
-nu-utils = { path = "../nu-utils", version = "0.99.2" }
+nu-path = { path = "../nu-path", version = "0.100.0" }
+nu-glob = { path = "../nu-glob", version = "0.100.0" }
+nu-utils = { path = "../nu-utils", version = "0.100.0" }
 
 num-format = { workspace = true }
 which = { workspace = true }
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index a2a608fbaf..a91653e97d 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-utils"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-utils"
-version = "0.99.2"
+version = "0.100.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index 7fd39cf460..11f74f96db 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -1,6 +1,6 @@
 # Nushell Config File
 #
-# version = "0.99.2"
+# version = "0.100.0"
 
 # For more information on defining custom themes, see
 # https://www.nushell.sh/book/coloring_and_theming.html
diff --git a/crates/nu-utils/src/sample_config/default_env.nu b/crates/nu-utils/src/sample_config/default_env.nu
index 73605ef71b..ce12dc7425 100644
--- a/crates/nu-utils/src/sample_config/default_env.nu
+++ b/crates/nu-utils/src/sample_config/default_env.nu
@@ -1,6 +1,6 @@
 # Nushell Environment Config File
 #
-# version = "0.99.2"
+# version = "0.100.0"
 
 def create_left_prompt [] {
     let dir = match (do --ignore-shell-errors { $env.PWD | path relative-to $nu.home-path }) {
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index ef494a9355..426472619b 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -10,10 +10,10 @@ name = "nu_plugin_custom_values"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.99.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.2", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.100.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.0", features = ["plugin"] }
 serde = { workspace = true }
 typetag = "0.2"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.99.2" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.100.0" }
\ No newline at end of file
diff --git a/crates/nu_plugin_example/Cargo.toml b/crates/nu_plugin_example/Cargo.toml
index b75b9bd584..22be59b958 100644
--- a/crates/nu_plugin_example/Cargo.toml
+++ b/crates/nu_plugin_example/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_exam
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_example"
-version = "0.99.2"
+version = "0.100.0"
 
 [[bin]]
 name = "nu_plugin_example"
@@ -15,9 +15,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.99.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.2", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.100.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.0", features = ["plugin"] }
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.99.2" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.2" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.100.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.0" }
\ No newline at end of file
diff --git a/crates/nu_plugin_formats/Cargo.toml b/crates/nu_plugin_formats/Cargo.toml
index 96e89a468e..b334022ea1 100644
--- a/crates/nu_plugin_formats/Cargo.toml
+++ b/crates/nu_plugin_formats/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_form
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_formats"
-version = "0.99.2"
+version = "0.100.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.99.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.2", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.100.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.0", features = ["plugin"] }
 
 indexmap = { workspace = true }
 eml-parser = "0.1"
@@ -20,4 +20,4 @@ plist = "1.7"
 chrono = "0.4"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.99.2" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.100.0" }
\ No newline at end of file
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index 80aea009c3..5a423bf37e 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gsta
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_gstat"
-version = "0.99.2"
+version = "0.100.0"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_gstat"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.99.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
+nu-plugin = { path = "../nu-plugin", version = "0.100.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
 
 git2 = "0.19"
\ No newline at end of file
diff --git a/crates/nu_plugin_inc/Cargo.toml b/crates/nu_plugin_inc/Cargo.toml
index 9ff3051a8e..948115d038 100644
--- a/crates/nu_plugin_inc/Cargo.toml
+++ b/crates/nu_plugin_inc/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_inc"
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_inc"
-version = "0.99.2"
+version = "0.100.0"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_inc"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.99.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.2", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.100.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.0", features = ["plugin"] }
 
 semver = "1.0"
\ No newline at end of file
diff --git a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
index 9967348c6d..97dbb0e6f6 100755
--- a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
+++ b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
@@ -6,7 +6,7 @@
 # it also allows us to test the plugin interface with something manually implemented in a scripting
 # language without adding any extra dependencies to our tests.
 
-const NUSHELL_VERSION = "0.99.2"
+const NUSHELL_VERSION = "0.100.0"
 const PLUGIN_VERSION = "0.1.1" # bump if you change commands!
 
 def main [--stdio] {
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 52a51dc3f4..2c71945557 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu_plugin_polars"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_polars"
-version = "0.99.2"
+version = "0.100.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -17,10 +17,10 @@ bench = false
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
-nu-plugin = { path = "../nu-plugin", version = "0.99.2" }
-nu-path = { path = "../nu-path", version = "0.99.2" }
-nu-utils = { path = "../nu-utils", version = "0.99.2" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
+nu-plugin = { path = "../nu-plugin", version = "0.100.0" }
+nu-path = { path = "../nu-path", version = "0.100.0" }
+nu-utils = { path = "../nu-utils", version = "0.100.0" }
 
 # Potential dependencies for extras
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
@@ -84,9 +84,9 @@ optional = false
 version = "0.43"
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.2" }
-nu-engine = { path = "../nu-engine", version = "0.99.2" }
-nu-parser = { path = "../nu-parser", version = "0.99.2" }
-nu-command = { path = "../nu-command", version = "0.99.2" }
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.99.2" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.0" }
+nu-engine = { path = "../nu-engine", version = "0.100.0" }
+nu-parser = { path = "../nu-parser", version = "0.100.0" }
+nu-command = { path = "../nu-command", version = "0.100.0" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.100.0" }
 tempfile.workspace = true
diff --git a/crates/nu_plugin_python/nu_plugin_python_example.py b/crates/nu_plugin_python/nu_plugin_python_example.py
index fdad98ecd8..1343fcbd65 100755
--- a/crates/nu_plugin_python/nu_plugin_python_example.py
+++ b/crates/nu_plugin_python/nu_plugin_python_example.py
@@ -27,7 +27,7 @@ import sys
 import json
 
 
-NUSHELL_VERSION = "0.99.2"
+NUSHELL_VERSION = "0.100.0"
 PLUGIN_VERSION = "0.1.1"  # bump if you change commands!
 
 
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index a6d78c7162..be0be938cb 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_quer
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_query"
-version = "0.99.2"
+version = "0.100.0"
 
 [lib]
 doctest = false
@@ -16,8 +16,8 @@ name = "nu_plugin_query"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.99.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
+nu-plugin = { path = "../nu-plugin", version = "0.100.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
 
 gjson = "0.8"
 scraper = { default-features = false, version = "0.21" }
diff --git a/crates/nu_plugin_stress_internals/Cargo.toml b/crates/nu_plugin_stress_internals/Cargo.toml
index b61acf4d3e..05c50b1c73 100644
--- a/crates/nu_plugin_stress_internals/Cargo.toml
+++ b/crates/nu_plugin_stress_internals/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_stre
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_stress_internals"
-version = "0.99.2"
+version = "0.100.0"
 
 [[bin]]
 name = "nu_plugin_stress_internals"
diff --git a/crates/nuon/Cargo.toml b/crates/nuon/Cargo.toml
index edaa2d1072..4b3c0d0e43 100644
--- a/crates/nuon/Cargo.toml
+++ b/crates/nuon/Cargo.toml
@@ -5,15 +5,15 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nuon"
 edition = "2021"
 license = "MIT"
 name = "nuon"
-version = "0.99.2"
+version = "0.100.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-parser = { path = "../nu-parser", version = "0.99.2" }
-nu-protocol = { path = "../nu-protocol", version = "0.99.2" }
-nu-engine = { path = "../nu-engine", version = "0.99.2" }
-nu-utils = { path = "../nu-utils", version = "0.99.2" }
+nu-parser = { path = "../nu-parser", version = "0.100.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
+nu-engine = { path = "../nu-engine", version = "0.100.0" }
+nu-utils = { path = "../nu-utils", version = "0.100.0" }
 
 [dev-dependencies]
 chrono = { workspace = true }

From 30f98f7e64a63a159ce70f02aa6c4c1196cd9ca7 Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Wed, 13 Nov 2024 11:28:47 +0800
Subject: [PATCH 0664/1072] Downgrade softprops/action-gh-release to 2.0.5
 (#14327)

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

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

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

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
Downgrade `softprops/action-gh-release` to 2.0.5 to fix the release per
asset mess.
It works in https://github.com/nushell/nushell/actions/runs/11809766842
with the release draft:

https://github.com/nushell/nushell/releases/tag/untagged-c055298a78ddb780bd01,
more detail could be found here:
https://github.com/softprops/action-gh-release/issues/445

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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 .github/workflows/release.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 783ae18868..493719efc7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -98,9 +98,10 @@ jobs:
         TARGET: ${{ matrix.target }}
         _EXTRA_: ${{ matrix.extra }}
 
-    # REF: https://github.com/marketplace/actions/gh-release
+    # WARN: Don't upgrade this action due to the release per asset issue.
+    # See: https://github.com/softprops/action-gh-release/issues/445
     - name: Publish Archive
-      uses: softprops/action-gh-release@v2.0.9
+      uses: softprops/action-gh-release@v2.0.5
       if: ${{ startsWith(github.ref, 'refs/tags/') }}
       with:
         draft: true
@@ -124,7 +125,7 @@ jobs:
     - name: Create Checksums
       run: cd release && shasum -a 256 * > ../SHA256SUMS
     - name: Publish Checksums
-      uses: softprops/action-gh-release@v2.0.9
+      uses: softprops/action-gh-release@v2.0.5
       with:
         draft: true
         files: SHA256SUMS

From e6f55da08051f79cedd659544412497018950388 Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Thu, 14 Nov 2024 17:04:39 +0800
Subject: [PATCH 0665/1072] Bump to dev version 0.100.1 (#14328)

---
 Cargo.lock                                    | 74 +++++++++----------
 Cargo.toml                                    | 40 +++++-----
 crates/nu-cli/Cargo.toml                      | 24 +++---
 crates/nu-cmd-base/Cargo.toml                 | 10 +--
 crates/nu-cmd-extra/Cargo.toml                | 22 +++---
 crates/nu-cmd-lang/Cargo.toml                 | 10 +--
 crates/nu-cmd-plugin/Cargo.toml               | 10 +--
 crates/nu-color-config/Cargo.toml             | 10 +--
 crates/nu-command/Cargo.toml                  | 34 ++++-----
 crates/nu-derive-value/Cargo.toml             |  2 +-
 crates/nu-engine/Cargo.toml                   | 10 +--
 crates/nu-explore/Cargo.toml                  | 20 ++---
 crates/nu-glob/Cargo.toml                     |  2 +-
 crates/nu-json/Cargo.toml                     |  6 +-
 crates/nu-lsp/Cargo.toml                      | 14 ++--
 crates/nu-parser/Cargo.toml                   | 12 +--
 crates/nu-path/Cargo.toml                     |  2 +-
 crates/nu-plugin-core/Cargo.toml              |  6 +-
 crates/nu-plugin-engine/Cargo.toml            | 14 ++--
 crates/nu-plugin-protocol/Cargo.toml          |  6 +-
 crates/nu-plugin-test-support/Cargo.toml      | 18 ++---
 crates/nu-plugin/Cargo.toml                   | 12 +--
 crates/nu-pretty-hex/Cargo.toml               |  2 +-
 crates/nu-protocol/Cargo.toml                 | 14 ++--
 crates/nu-std/Cargo.toml                      |  8 +-
 crates/nu-system/Cargo.toml                   |  2 +-
 crates/nu-table/Cargo.toml                    | 12 +--
 crates/nu-term-grid/Cargo.toml                |  4 +-
 crates/nu-test-support/Cargo.toml             |  8 +-
 crates/nu-utils/Cargo.toml                    |  2 +-
 .../src/sample_config/default_config.nu       |  2 +-
 .../nu-utils/src/sample_config/default_env.nu |  2 +-
 crates/nu_plugin_custom_values/Cargo.toml     |  6 +-
 crates/nu_plugin_example/Cargo.toml           | 10 +--
 crates/nu_plugin_formats/Cargo.toml           |  8 +-
 crates/nu_plugin_gstat/Cargo.toml             |  6 +-
 crates/nu_plugin_inc/Cargo.toml               |  6 +-
 .../nu_plugin_nu_example.nu                   |  2 +-
 crates/nu_plugin_polars/Cargo.toml            | 20 ++---
 .../nu_plugin_python_example.py               |  2 +-
 crates/nu_plugin_query/Cargo.toml             |  6 +-
 crates/nu_plugin_stress_internals/Cargo.toml  |  2 +-
 crates/nuon/Cargo.toml                        | 10 +--
 43 files changed, 246 insertions(+), 246 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a60ecfc081..3a1a31f491 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2971,7 +2971,7 @@ dependencies = [
 
 [[package]]
 name = "nu"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "assert_cmd",
  "crossterm 0.28.1",
@@ -3026,7 +3026,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cli"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "chrono",
  "crossterm 0.28.1",
@@ -3060,7 +3060,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-base"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "indexmap",
  "miette",
@@ -3072,7 +3072,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-extra"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "fancy-regex",
  "heck",
@@ -3097,7 +3097,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-lang"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "itertools 0.13.0",
  "nu-engine",
@@ -3109,7 +3109,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-plugin"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "itertools 0.13.0",
  "nu-engine",
@@ -3120,7 +3120,7 @@ dependencies = [
 
 [[package]]
 name = "nu-color-config"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "nu-ansi-term",
  "nu-engine",
@@ -3132,7 +3132,7 @@ dependencies = [
 
 [[package]]
 name = "nu-command"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "alphanumeric-sort",
  "base64 0.22.1",
@@ -3242,7 +3242,7 @@ dependencies = [
 
 [[package]]
 name = "nu-derive-value"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -3253,7 +3253,7 @@ dependencies = [
 
 [[package]]
 name = "nu-engine"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "log",
  "nu-glob",
@@ -3265,7 +3265,7 @@ dependencies = [
 
 [[package]]
 name = "nu-explore"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "ansi-str",
  "anyhow",
@@ -3290,14 +3290,14 @@ dependencies = [
 
 [[package]]
 name = "nu-glob"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "doc-comment",
 ]
 
 [[package]]
 name = "nu-json"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "fancy-regex",
  "linked-hash-map",
@@ -3310,7 +3310,7 @@ dependencies = [
 
 [[package]]
 name = "nu-lsp"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "assert-json-diff",
  "crossbeam-channel",
@@ -3331,7 +3331,7 @@ dependencies = [
 
 [[package]]
 name = "nu-parser"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "bytesize",
  "chrono",
@@ -3348,7 +3348,7 @@ dependencies = [
 
 [[package]]
 name = "nu-path"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "dirs",
  "omnipath",
@@ -3357,7 +3357,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "log",
  "nix 0.29.0",
@@ -3373,7 +3373,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-core"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "interprocess",
  "log",
@@ -3387,7 +3387,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-engine"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "log",
  "nu-engine",
@@ -3403,7 +3403,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-protocol"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "nu-protocol",
  "nu-utils",
@@ -3415,7 +3415,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-test-support"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "nu-ansi-term",
  "nu-cmd-lang",
@@ -3433,7 +3433,7 @@ dependencies = [
 
 [[package]]
 name = "nu-pretty-hex"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "heapless",
  "nu-ansi-term",
@@ -3442,7 +3442,7 @@ dependencies = [
 
 [[package]]
 name = "nu-protocol"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "brotli",
  "byte-unit",
@@ -3480,7 +3480,7 @@ dependencies = [
 
 [[package]]
 name = "nu-std"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "log",
  "miette",
@@ -3491,7 +3491,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "chrono",
  "itertools 0.13.0",
@@ -3508,7 +3508,7 @@ dependencies = [
 
 [[package]]
 name = "nu-table"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "fancy-regex",
  "nu-ansi-term",
@@ -3522,7 +3522,7 @@ dependencies = [
 
 [[package]]
 name = "nu-term-grid"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "nu-utils",
  "unicode-width",
@@ -3530,7 +3530,7 @@ dependencies = [
 
 [[package]]
 name = "nu-test-support"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -3542,7 +3542,7 @@ dependencies = [
 
 [[package]]
 name = "nu-utils"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "crossterm_winapi",
  "fancy-regex",
@@ -3569,7 +3569,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_example"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "nu-cmd-lang",
  "nu-plugin",
@@ -3579,7 +3579,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_formats"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "chrono",
  "eml-parser",
@@ -3594,7 +3594,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_gstat"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "git2",
  "nu-plugin",
@@ -3603,7 +3603,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_inc"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -3612,7 +3612,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_polars"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "chrono",
  "chrono-tz 0.10.0",
@@ -3647,7 +3647,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_query"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "gjson",
  "nu-plugin",
@@ -3662,7 +3662,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_stress_internals"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "interprocess",
  "serde",
@@ -3776,7 +3776,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "nuon"
-version = "0.100.0"
+version = "0.100.1"
 dependencies = [
  "chrono",
  "nu-engine",
diff --git a/Cargo.toml b/Cargo.toml
index 764f6b76af..c84a05ee38 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
 rust-version = "1.80.1"
-version = "0.100.0"
+version = "0.100.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -189,22 +189,22 @@ unchecked_duration_subtraction = "warn"
 workspace = true
 
 [dependencies]
-nu-cli = { path = "./crates/nu-cli", version = "0.100.0" }
-nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.100.0" }
-nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.100.0" }
-nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.100.0", optional = true }
-nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.100.0" }
-nu-command = { path = "./crates/nu-command", version = "0.100.0" }
-nu-engine = { path = "./crates/nu-engine", version = "0.100.0" }
-nu-explore = { path = "./crates/nu-explore", version = "0.100.0" }
-nu-lsp = { path = "./crates/nu-lsp/", version = "0.100.0" }
-nu-parser = { path = "./crates/nu-parser", version = "0.100.0" }
-nu-path = { path = "./crates/nu-path", version = "0.100.0" }
-nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.100.0" }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.100.0" }
-nu-std = { path = "./crates/nu-std", version = "0.100.0" }
-nu-system = { path = "./crates/nu-system", version = "0.100.0" }
-nu-utils = { path = "./crates/nu-utils", version = "0.100.0" }
+nu-cli = { path = "./crates/nu-cli", version = "0.100.1" }
+nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.100.1" }
+nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.100.1" }
+nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.100.1", optional = true }
+nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.100.1" }
+nu-command = { path = "./crates/nu-command", version = "0.100.1" }
+nu-engine = { path = "./crates/nu-engine", version = "0.100.1" }
+nu-explore = { path = "./crates/nu-explore", version = "0.100.1" }
+nu-lsp = { path = "./crates/nu-lsp/", version = "0.100.1" }
+nu-parser = { path = "./crates/nu-parser", version = "0.100.1" }
+nu-path = { path = "./crates/nu-path", version = "0.100.1" }
+nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.100.1" }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.100.1" }
+nu-std = { path = "./crates/nu-std", version = "0.100.1" }
+nu-system = { path = "./crates/nu-system", version = "0.100.1" }
+nu-utils = { path = "./crates/nu-utils", version = "0.100.1" }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
 crossterm = { workspace = true }
@@ -234,9 +234,9 @@ nix = { workspace = true, default-features = false, features = [
 ] }
 
 [dev-dependencies]
-nu-test-support = { path = "./crates/nu-test-support", version = "0.100.0" }
-nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.100.0" }
-nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.100.0" }
+nu-test-support = { path = "./crates/nu-test-support", version = "0.100.1" }
+nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.100.1" }
+nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.100.1" }
 assert_cmd = "2.0"
 dirs = { workspace = true }
 tango-bench = "0.6"
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index c2336b3ab4..b91314ddcf 100644
--- 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.100.0"
+version = "0.100.1"
 
 [lib]
 bench = false
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.0" }
-nu-command = { path = "../nu-command", version = "0.100.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.100.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.1" }
+nu-command = { path = "../nu-command", version = "0.100.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.100.1" }
 rstest = { workspace = true, default-features = false }
 tempfile = { workspace = true }
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.100.0" }
-nu-engine = { path = "../nu-engine", version = "0.100.0" }
-nu-path = { path = "../nu-path", version = "0.100.0" }
-nu-parser = { path = "../nu-parser", version = "0.100.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.100.0", optional = true }
-nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
-nu-utils = { path = "../nu-utils", version = "0.100.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.100.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.100.1" }
+nu-engine = { path = "../nu-engine", version = "0.100.1" }
+nu-path = { path = "../nu-path", version = "0.100.1" }
+nu-parser = { path = "../nu-parser", version = "0.100.1" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.100.1", optional = true }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
+nu-utils = { path = "../nu-utils", version = "0.100.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.100.1" }
 nu-ansi-term = { workspace = true }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
diff --git a/crates/nu-cmd-base/Cargo.toml b/crates/nu-cmd-base/Cargo.toml
index d67822c2a2..e47dc12641 100644
--- a/crates/nu-cmd-base/Cargo.toml
+++ b/crates/nu-cmd-base/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-base"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-base"
-version = "0.100.0"
+version = "0.100.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,10 +13,10 @@ version = "0.100.0"
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.100.0" }
-nu-parser = { path = "../nu-parser", version = "0.100.0" }
-nu-path = { path = "../nu-path", version = "0.100.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
+nu-engine = { path = "../nu-engine", version = "0.100.1" }
+nu-parser = { path = "../nu-parser", version = "0.100.1" }
+nu-path = { path = "../nu-path", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
 
 indexmap = { workspace = true }
 miette = { workspace = true }
diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml
index 43a4c5645f..eec817059b 100644
--- 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.100.0"
+version = "0.100.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,13 +16,13 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.100.0" }
-nu-engine = { path = "../nu-engine", version = "0.100.0" }
-nu-json = { version = "0.100.0", path = "../nu-json" }
-nu-parser = { path = "../nu-parser", version = "0.100.0" }
-nu-pretty-hex = { version = "0.100.0", path = "../nu-pretty-hex" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
-nu-utils = { path = "../nu-utils", version = "0.100.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.100.1" }
+nu-engine = { path = "../nu-engine", version = "0.100.1" }
+nu-json = { version = "0.100.1", path = "../nu-json" }
+nu-parser = { path = "../nu-parser", version = "0.100.1" }
+nu-pretty-hex = { version = "0.100.1", path = "../nu-pretty-hex" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
+nu-utils = { path = "../nu-utils", version = "0.100.1" }
 
 # Potential dependencies for extras
 heck = { workspace = true }
@@ -36,6 +36,6 @@ v_htmlescape = { workspace = true }
 itertools = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.0" }
-nu-command = { path = "../nu-command", version = "0.100.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.100.0" }
\ No newline at end of file
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.1" }
+nu-command = { path = "../nu-command", version = "0.100.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.100.1" }
\ No newline at end of file
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index b4c6423b61..c5609e4ff8 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -6,7 +6,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-lang"
 edition = "2021"
 license = "MIT"
 name = "nu-cmd-lang"
-version = "0.100.0"
+version = "0.100.1"
 
 [lib]
 bench = false
@@ -15,10 +15,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.100.0" }
-nu-parser = { path = "../nu-parser", version = "0.100.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
-nu-utils = { path = "../nu-utils", version = "0.100.0" }
+nu-engine = { path = "../nu-engine", version = "0.100.1" }
+nu-parser = { path = "../nu-parser", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
+nu-utils = { path = "../nu-utils", version = "0.100.1" }
 
 itertools = { workspace = true }
 shadow-rs = { version = "0.35", default-features = false }
diff --git a/crates/nu-cmd-plugin/Cargo.toml b/crates/nu-cmd-plugin/Cargo.toml
index df6e2c369d..e5a9a61b1c 100644
--- a/crates/nu-cmd-plugin/Cargo.toml
+++ b/crates/nu-cmd-plugin/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-plugin"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-plugin"
-version = "0.100.0"
+version = "0.100.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,10 +13,10 @@ version = "0.100.0"
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.100.0" }
-nu-path = { path = "../nu-path", version = "0.100.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.0", features = ["plugin"] }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.100.0" }
+nu-engine = { path = "../nu-engine", version = "0.100.1" }
+nu-path = { path = "../nu-path", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1", features = ["plugin"] }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.100.1" }
 
 itertools = { workspace = true }
 
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index 7a244bb5de..abf95023cc 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-color-confi
 edition = "2021"
 license = "MIT"
 name = "nu-color-config"
-version = "0.100.0"
+version = "0.100.1"
 
 [lib]
 bench = false
@@ -14,12 +14,12 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
-nu-engine = { path = "../nu-engine", version = "0.100.0" }
-nu-json = { path = "../nu-json", version = "0.100.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
+nu-engine = { path = "../nu-engine", version = "0.100.1" }
+nu-json = { path = "../nu-json", version = "0.100.1" }
 nu-ansi-term = { workspace = true }
 
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.100.0" }
\ No newline at end of file
+nu-test-support = { path = "../nu-test-support", version = "0.100.1" }
\ No newline at end of file
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 940e89c5d2..e9c3b9a784 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-command"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
-version = "0.100.0"
+version = "0.100.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,21 +16,21 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.100.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.100.0" }
-nu-engine = { path = "../nu-engine", version = "0.100.0" }
-nu-glob = { path = "../nu-glob", version = "0.100.0" }
-nu-json = { path = "../nu-json", version = "0.100.0" }
-nu-parser = { path = "../nu-parser", version = "0.100.0" }
-nu-path = { path = "../nu-path", version = "0.100.0" }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.100.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
-nu-system = { path = "../nu-system", version = "0.100.0" }
-nu-table = { path = "../nu-table", version = "0.100.0" }
-nu-term-grid = { path = "../nu-term-grid", version = "0.100.0" }
-nu-utils = { path = "../nu-utils", version = "0.100.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.100.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.100.1" }
+nu-engine = { path = "../nu-engine", version = "0.100.1" }
+nu-glob = { path = "../nu-glob", version = "0.100.1" }
+nu-json = { path = "../nu-json", version = "0.100.1" }
+nu-parser = { path = "../nu-parser", version = "0.100.1" }
+nu-path = { path = "../nu-path", version = "0.100.1" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
+nu-system = { path = "../nu-system", version = "0.100.1" }
+nu-table = { path = "../nu-table", version = "0.100.1" }
+nu-term-grid = { path = "../nu-term-grid", version = "0.100.1" }
+nu-utils = { path = "../nu-utils", version = "0.100.1" }
 nu-ansi-term = { workspace = true }
-nuon = { path = "../nuon", version = "0.100.0" }
+nuon = { path = "../nuon", version = "0.100.1" }
 
 alphanumeric-sort = { workspace = true }
 base64 = { workspace = true }
@@ -139,8 +139,8 @@ sqlite = ["rusqlite"]
 trash-support = ["trash"]
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.100.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.100.1" }
 
 dirs = { workspace = true }
 mockito = { workspace = true, default-features = false }
diff --git a/crates/nu-derive-value/Cargo.toml b/crates/nu-derive-value/Cargo.toml
index 961280c6dc..edb3709af9 100644
--- a/crates/nu-derive-value/Cargo.toml
+++ b/crates/nu-derive-value/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-derive-value"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-derive-value"
-version = "0.100.0"
+version = "0.100.1"
 
 [lib]
 proc-macro = true
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index 78542dbfcf..dfe634d078 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-engine"
 edition = "2021"
 license = "MIT"
 name = "nu-engine"
-version = "0.100.0"
+version = "0.100.1"
 
 [lib]
 bench = false
@@ -14,10 +14,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.100.0" }
-nu-path = { path = "../nu-path", version = "0.100.0" }
-nu-glob = { path = "../nu-glob", version = "0.100.0" }
-nu-utils = { path = "../nu-utils", version = "0.100.0" }
+nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.100.1" }
+nu-path = { path = "../nu-path", version = "0.100.1" }
+nu-glob = { path = "../nu-glob", version = "0.100.1" }
+nu-utils = { path = "../nu-utils", version = "0.100.1" }
 log = { workspace = true }
 terminal_size = { workspace = true }
 
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index 620c006f2c..6ea09e3f13 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-explore"
 edition = "2021"
 license = "MIT"
 name = "nu-explore"
-version = "0.100.0"
+version = "0.100.1"
 
 [lib]
 bench = false
@@ -14,16 +14,16 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
-nu-parser = { path = "../nu-parser", version = "0.100.0" }
-nu-path = { path = "../nu-path", version = "0.100.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.100.0" }
-nu-engine = { path = "../nu-engine", version = "0.100.0" }
-nu-table = { path = "../nu-table", version = "0.100.0" }
-nu-json = { path = "../nu-json", version = "0.100.0" }
-nu-utils = { path = "../nu-utils", version = "0.100.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
+nu-parser = { path = "../nu-parser", version = "0.100.1" }
+nu-path = { path = "../nu-path", version = "0.100.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.100.1" }
+nu-engine = { path = "../nu-engine", version = "0.100.1" }
+nu-table = { path = "../nu-table", version = "0.100.1" }
+nu-json = { path = "../nu-json", version = "0.100.1" }
+nu-utils = { path = "../nu-utils", version = "0.100.1" }
 nu-ansi-term = { workspace = true }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.100.0" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.100.1" }
 
 anyhow = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-glob/Cargo.toml b/crates/nu-glob/Cargo.toml
index b388c2f3ec..25265c805a 100644
--- a/crates/nu-glob/Cargo.toml
+++ b/crates/nu-glob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-glob"
-version = "0.100.0"
+version = "0.100.1"
 authors = ["The Nushell Project Developers", "The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 description = """
diff --git a/crates/nu-json/Cargo.toml b/crates/nu-json/Cargo.toml
index 4c46d6a6ab..507ae911df 100644
--- a/crates/nu-json/Cargo.toml
+++ b/crates/nu-json/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-json"
 edition = "2021"
 license = "MIT"
 name = "nu-json"
-version = "0.100.0"
+version = "0.100.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -26,8 +26,8 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.100.0" }
-nu-path = { path = "../nu-path", version = "0.100.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.100.1" }
+nu-path = { path = "../nu-path", version = "0.100.1" }
 serde_json = "1.0"
 fancy-regex = "0.14.0"
 
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index 0e26f4ec6b..2798dc5182 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -3,14 +3,14 @@ authors = ["The Nushell Project Developers"]
 description = "Nushell's integrated LSP server"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-lsp"
 name = "nu-lsp"
-version = "0.100.0"
+version = "0.100.1"
 edition = "2021"
 license = "MIT"
 
 [dependencies]
-nu-cli = { path = "../nu-cli", version = "0.100.0" }
-nu-parser = { path = "../nu-parser", version = "0.100.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
+nu-cli = { path = "../nu-cli", version = "0.100.1" }
+nu-parser = { path = "../nu-parser", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
 
 reedline = { workspace = true }
 
@@ -23,9 +23,9 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.0" }
-nu-command = { path = "../nu-command", version = "0.100.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.100.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.1" }
+nu-command = { path = "../nu-command", version = "0.100.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.100.1" }
 
 assert-json-diff = "2.0"
 
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index 5a626f06a5..bfef11acb2 100644
--- a/crates/nu-parser/Cargo.toml
+++ b/crates/nu-parser/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-parser"
 edition = "2021"
 license = "MIT"
 name = "nu-parser"
-version = "0.100.0"
+version = "0.100.1"
 exclude = ["/fuzz"]
 
 [lib]
@@ -15,11 +15,11 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.100.0" }
-nu-path = { path = "../nu-path", version = "0.100.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.100.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
-nu-utils = { path = "../nu-utils", version = "0.100.0" }
+nu-engine = { path = "../nu-engine", version = "0.100.1" }
+nu-path = { path = "../nu-path", version = "0.100.1" }
+nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
+nu-utils = { path = "../nu-utils", version = "0.100.1" }
 
 bytesize = { workspace = true }
 chrono = { default-features = false, features = ['std'], workspace = true }
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index 634cad6c8d..22ab716d14 100644
--- a/crates/nu-path/Cargo.toml
+++ b/crates/nu-path/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-path"
 edition = "2021"
 license = "MIT"
 name = "nu-path"
-version = "0.100.0"
+version = "0.100.1"
 exclude = ["/fuzz"]
 
 [lib]
diff --git a/crates/nu-plugin-core/Cargo.toml b/crates/nu-plugin-core/Cargo.toml
index c5c99140c1..4830859708 100644
--- a/crates/nu-plugin-core/Cargo.toml
+++ b/crates/nu-plugin-core/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-core
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-core"
-version = "0.100.0"
+version = "0.100.1"
 
 [lib]
 bench = false
@@ -14,8 +14,8 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.100.0", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.100.1", default-features = false }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true }
diff --git a/crates/nu-plugin-engine/Cargo.toml b/crates/nu-plugin-engine/Cargo.toml
index 55507cd794..ec6d816f7d 100644
--- a/crates/nu-plugin-engine/Cargo.toml
+++ b/crates/nu-plugin-engine/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-engi
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-engine"
-version = "0.100.0"
+version = "0.100.1"
 
 [lib]
 bench = false
@@ -14,12 +14,12 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.100.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
-nu-system = { path = "../nu-system", version = "0.100.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.100.0" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.100.0", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.100.0" }
+nu-engine = { path = "../nu-engine", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
+nu-system = { path = "../nu-system", version = "0.100.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.100.1" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.100.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.100.1" }
 
 serde = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-plugin-protocol/Cargo.toml b/crates/nu-plugin-protocol/Cargo.toml
index 05d093d6ba..7659fec8d1 100644
--- a/crates/nu-plugin-protocol/Cargo.toml
+++ b/crates/nu-plugin-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-prot
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-protocol"
-version = "0.100.0"
+version = "0.100.1"
 
 [lib]
 bench = false
@@ -14,8 +14,8 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.100.0", features = ["plugin"] }
-nu-utils = { path = "../nu-utils", version = "0.100.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1", features = ["plugin"] }
+nu-utils = { path = "../nu-utils", version = "0.100.1" }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
diff --git a/crates/nu-plugin-test-support/Cargo.toml b/crates/nu-plugin-test-support/Cargo.toml
index d8a044317f..d0c415acd7 100644
--- a/crates/nu-plugin-test-support/Cargo.toml
+++ b/crates/nu-plugin-test-support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-plugin-test-support"
-version = "0.100.0"
+version = "0.100.1"
 edition = "2021"
 license = "MIT"
 description = "Testing support for Nushell plugins"
@@ -15,14 +15,14 @@ workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.100.0", features = ["plugin"] }
-nu-protocol = { path = "../nu-protocol", version = "0.100.0", features = ["plugin"] }
-nu-parser = { path = "../nu-parser", version = "0.100.0", features = ["plugin"] }
-nu-plugin = { path = "../nu-plugin", version = "0.100.0" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.100.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.100.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.100.0" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.0" }
+nu-engine = { path = "../nu-engine", version = "0.100.1", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1", features = ["plugin"] }
+nu-parser = { path = "../nu-parser", version = "0.100.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.100.1" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.100.1" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.100.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.100.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.1" }
 nu-ansi-term = { workspace = true }
 similar = "2.6"
 
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index f9cc55a38b..a2c328375e 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin"
 edition = "2021"
 license = "MIT"
 name = "nu-plugin"
-version = "0.100.0"
+version = "0.100.1"
 
 [lib]
 bench = false
@@ -14,11 +14,11 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.100.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.100.0" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.100.0", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.100.0" }
+nu-engine = { path = "../nu-engine", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.100.1" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.100.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.100.1" }
 
 log = { workspace = true }
 thiserror = "1.0"
diff --git a/crates/nu-pretty-hex/Cargo.toml b/crates/nu-pretty-hex/Cargo.toml
index 7c0e461670..9fda277a5d 100644
--- a/crates/nu-pretty-hex/Cargo.toml
+++ b/crates/nu-pretty-hex/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-pretty-hex"
 edition = "2021"
 license = "MIT"
 name = "nu-pretty-hex"
-version = "0.100.0"
+version = "0.100.1"
 
 [lib]
 doctest = false
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 70d32f18c9..60d6c10acc 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-protocol"
 edition = "2021"
 license = "MIT"
 name = "nu-protocol"
-version = "0.100.0"
+version = "0.100.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,10 +16,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.100.0" }
-nu-path = { path = "../nu-path", version = "0.100.0" }
-nu-system = { path = "../nu-system", version = "0.100.0" }
-nu-derive-value = { path = "../nu-derive-value", version = "0.100.0" }
+nu-utils = { path = "../nu-utils", version = "0.100.1" }
+nu-path = { path = "../nu-path", version = "0.100.1" }
+nu-system = { path = "../nu-system", version = "0.100.1" }
+nu-derive-value = { path = "../nu-derive-value", version = "0.100.1" }
 
 brotli = { workspace = true, optional = true }
 bytes = { workspace = true }
@@ -58,8 +58,8 @@ plugin = [
 serde_json = { workspace = true }
 strum = "0.26"
 strum_macros = "0.26"
-nu-test-support = { path = "../nu-test-support", version = "0.100.0" }
-nu-utils = { path = "../nu-utils", version = "0.100.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.100.1" }
+nu-utils = { path = "../nu-utils", version = "0.100.1" }
 pretty_assertions = { workspace = true }
 rstest = { workspace = true }
 tempfile = { workspace = true }
diff --git a/crates/nu-std/Cargo.toml b/crates/nu-std/Cargo.toml
index 43af76672d..a6c48cac3c 100644
--- a/crates/nu-std/Cargo.toml
+++ b/crates/nu-std/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-std"
 edition = "2021"
 license = "MIT"
 name = "nu-std"
-version = "0.100.0"
+version = "0.100.1"
 
 [dependencies]
-nu-parser = { version = "0.100.0", path = "../nu-parser" }
-nu-protocol = { version = "0.100.0", path = "../nu-protocol" }
-nu-engine = { version = "0.100.0", path = "../nu-engine" }
+nu-parser = { version = "0.100.1", path = "../nu-parser" }
+nu-protocol = { version = "0.100.1", path = "../nu-protocol" }
+nu-engine = { version = "0.100.1", path = "../nu-engine" }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
 
 log = "0.4"
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index 009fbc041e..ec435f1f3d 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["The Nushell Project Developers", "procs creators"]
 description = "Nushell system querying"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-system"
 name = "nu-system"
-version = "0.100.0"
+version = "0.100.1"
 edition = "2021"
 license = "MIT"
 
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index 070d67733a..c5ddb41f52 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-table"
 edition = "2021"
 license = "MIT"
 name = "nu-table"
-version = "0.100.0"
+version = "0.100.1"
 
 [lib]
 bench = false
@@ -14,14 +14,14 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
-nu-utils = { path = "../nu-utils", version = "0.100.0" }
-nu-engine = { path = "../nu-engine", version = "0.100.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.100.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
+nu-utils = { path = "../nu-utils", version = "0.100.1" }
+nu-engine = { path = "../nu-engine", version = "0.100.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.100.1" }
 nu-ansi-term = { workspace = true }
 fancy-regex = { workspace = true }
 tabled = { workspace = true, features = ["ansi"], default-features = false }
 terminal_size = { workspace = true }
 
 [dev-dependencies]
-# nu-test-support = { path="../nu-test-support", version = "0.100.0"  }
\ No newline at end of file
+# nu-test-support = { path="../nu-test-support", version = "0.100.1"  }
\ No newline at end of file
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index 6a07fd86f6..a9fea5e78b 100644
--- a/crates/nu-term-grid/Cargo.toml
+++ b/crates/nu-term-grid/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-term-grid"
 edition = "2021"
 license = "MIT"
 name = "nu-term-grid"
-version = "0.100.0"
+version = "0.100.1"
 
 [lib]
 bench = false
@@ -14,6 +14,6 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.100.0" }
+nu-utils = { path = "../nu-utils", version = "0.100.1" }
 
 unicode-width = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml
index 8643946182..878b31e4ec 100644
--- a/crates/nu-test-support/Cargo.toml
+++ b/crates/nu-test-support/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-test-suppor
 edition = "2021"
 license = "MIT"
 name = "nu-test-support"
-version = "0.100.0"
+version = "0.100.1"
 
 [lib]
 doctest = false
@@ -15,9 +15,9 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-path = { path = "../nu-path", version = "0.100.0" }
-nu-glob = { path = "../nu-glob", version = "0.100.0" }
-nu-utils = { path = "../nu-utils", version = "0.100.0" }
+nu-path = { path = "../nu-path", version = "0.100.1" }
+nu-glob = { path = "../nu-glob", version = "0.100.1" }
+nu-utils = { path = "../nu-utils", version = "0.100.1" }
 
 num-format = { workspace = true }
 which = { workspace = true }
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index a91653e97d..4b590e6831 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-utils"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-utils"
-version = "0.100.0"
+version = "0.100.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
index 11f74f96db..c8b398b684 100644
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ b/crates/nu-utils/src/sample_config/default_config.nu
@@ -1,6 +1,6 @@
 # Nushell Config File
 #
-# version = "0.100.0"
+# version = "0.100.1"
 
 # For more information on defining custom themes, see
 # https://www.nushell.sh/book/coloring_and_theming.html
diff --git a/crates/nu-utils/src/sample_config/default_env.nu b/crates/nu-utils/src/sample_config/default_env.nu
index ce12dc7425..fb527dc112 100644
--- a/crates/nu-utils/src/sample_config/default_env.nu
+++ b/crates/nu-utils/src/sample_config/default_env.nu
@@ -1,6 +1,6 @@
 # Nushell Environment Config File
 #
-# version = "0.100.0"
+# version = "0.100.1"
 
 def create_left_prompt [] {
     let dir = match (do --ignore-shell-errors { $env.PWD | path relative-to $nu.home-path }) {
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index 426472619b..d6e2a4f897 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -10,10 +10,10 @@ name = "nu_plugin_custom_values"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.100.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1", features = ["plugin"] }
 serde = { workspace = true }
 typetag = "0.2"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.100.0" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.100.1" }
\ No newline at end of file
diff --git a/crates/nu_plugin_example/Cargo.toml b/crates/nu_plugin_example/Cargo.toml
index 22be59b958..adeef60167 100644
--- a/crates/nu_plugin_example/Cargo.toml
+++ b/crates/nu_plugin_example/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_exam
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_example"
-version = "0.100.0"
+version = "0.100.1"
 
 [[bin]]
 name = "nu_plugin_example"
@@ -15,9 +15,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.100.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1", features = ["plugin"] }
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.100.0" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.0" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.100.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.1" }
\ No newline at end of file
diff --git a/crates/nu_plugin_formats/Cargo.toml b/crates/nu_plugin_formats/Cargo.toml
index b334022ea1..2a09d61f58 100644
--- a/crates/nu_plugin_formats/Cargo.toml
+++ b/crates/nu_plugin_formats/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_form
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_formats"
-version = "0.100.0"
+version = "0.100.1"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.100.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1", features = ["plugin"] }
 
 indexmap = { workspace = true }
 eml-parser = "0.1"
@@ -20,4 +20,4 @@ plist = "1.7"
 chrono = "0.4"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.100.0" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.100.1" }
\ No newline at end of file
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index 5a423bf37e..dcfdd32cc0 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gsta
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_gstat"
-version = "0.100.0"
+version = "0.100.1"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_gstat"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.100.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
+nu-plugin = { path = "../nu-plugin", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
 
 git2 = "0.19"
\ No newline at end of file
diff --git a/crates/nu_plugin_inc/Cargo.toml b/crates/nu_plugin_inc/Cargo.toml
index 948115d038..8870224397 100644
--- a/crates/nu_plugin_inc/Cargo.toml
+++ b/crates/nu_plugin_inc/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_inc"
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_inc"
-version = "0.100.0"
+version = "0.100.1"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_inc"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.100.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1", features = ["plugin"] }
 
 semver = "1.0"
\ No newline at end of file
diff --git a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
index 97dbb0e6f6..f13b82a711 100755
--- a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
+++ b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
@@ -6,7 +6,7 @@
 # it also allows us to test the plugin interface with something manually implemented in a scripting
 # language without adding any extra dependencies to our tests.
 
-const NUSHELL_VERSION = "0.100.0"
+const NUSHELL_VERSION = "0.100.1"
 const PLUGIN_VERSION = "0.1.1" # bump if you change commands!
 
 def main [--stdio] {
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 2c71945557..fafbb8cb7d 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu_plugin_polars"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_polars"
-version = "0.100.0"
+version = "0.100.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -17,10 +17,10 @@ bench = false
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
-nu-plugin = { path = "../nu-plugin", version = "0.100.0" }
-nu-path = { path = "../nu-path", version = "0.100.0" }
-nu-utils = { path = "../nu-utils", version = "0.100.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.100.1" }
+nu-path = { path = "../nu-path", version = "0.100.1" }
+nu-utils = { path = "../nu-utils", version = "0.100.1" }
 
 # Potential dependencies for extras
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
@@ -84,9 +84,9 @@ optional = false
 version = "0.43"
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.0" }
-nu-engine = { path = "../nu-engine", version = "0.100.0" }
-nu-parser = { path = "../nu-parser", version = "0.100.0" }
-nu-command = { path = "../nu-command", version = "0.100.0" }
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.100.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.1" }
+nu-engine = { path = "../nu-engine", version = "0.100.1" }
+nu-parser = { path = "../nu-parser", version = "0.100.1" }
+nu-command = { path = "../nu-command", version = "0.100.1" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.100.1" }
 tempfile.workspace = true
diff --git a/crates/nu_plugin_python/nu_plugin_python_example.py b/crates/nu_plugin_python/nu_plugin_python_example.py
index 1343fcbd65..b77b1a0ddd 100755
--- a/crates/nu_plugin_python/nu_plugin_python_example.py
+++ b/crates/nu_plugin_python/nu_plugin_python_example.py
@@ -27,7 +27,7 @@ import sys
 import json
 
 
-NUSHELL_VERSION = "0.100.0"
+NUSHELL_VERSION = "0.100.1"
 PLUGIN_VERSION = "0.1.1"  # bump if you change commands!
 
 
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index be0be938cb..431b728f62 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_quer
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_query"
-version = "0.100.0"
+version = "0.100.1"
 
 [lib]
 doctest = false
@@ -16,8 +16,8 @@ name = "nu_plugin_query"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.100.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
+nu-plugin = { path = "../nu-plugin", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
 
 gjson = "0.8"
 scraper = { default-features = false, version = "0.21" }
diff --git a/crates/nu_plugin_stress_internals/Cargo.toml b/crates/nu_plugin_stress_internals/Cargo.toml
index 05c50b1c73..9f5be89dc0 100644
--- a/crates/nu_plugin_stress_internals/Cargo.toml
+++ b/crates/nu_plugin_stress_internals/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_stre
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_stress_internals"
-version = "0.100.0"
+version = "0.100.1"
 
 [[bin]]
 name = "nu_plugin_stress_internals"
diff --git a/crates/nuon/Cargo.toml b/crates/nuon/Cargo.toml
index 4b3c0d0e43..4ba31b2a4a 100644
--- a/crates/nuon/Cargo.toml
+++ b/crates/nuon/Cargo.toml
@@ -5,15 +5,15 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nuon"
 edition = "2021"
 license = "MIT"
 name = "nuon"
-version = "0.100.0"
+version = "0.100.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-parser = { path = "../nu-parser", version = "0.100.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.0" }
-nu-engine = { path = "../nu-engine", version = "0.100.0" }
-nu-utils = { path = "../nu-utils", version = "0.100.0" }
+nu-parser = { path = "../nu-parser", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
+nu-engine = { path = "../nu-engine", version = "0.100.1" }
+nu-utils = { path = "../nu-utils", version = "0.100.1" }
 
 [dev-dependencies]
 chrono = { workspace = true }

From a3c145432e9bdf4b4c411da78df14ac492086dca Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Thu, 14 Nov 2024 17:05:33 +0800
Subject: [PATCH 0666/1072] Tests: add a test to make sure that function can't
 use mutable variable (#14314)

@sholderbach suggested that we need to have a test for a function can't
use mutable variable.

https://github.com/nushell/nushell/pull/14311#issuecomment-2470035194

So this pr is going to add a case for it.

---------

Co-authored-by: Stefan Holderbach <sholderbach@users.noreply.github.com>
---
 crates/nu-command/tests/commands/mut_.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/crates/nu-command/tests/commands/mut_.rs b/crates/nu-command/tests/commands/mut_.rs
index e66348f8f2..52aa9fcff1 100644
--- a/crates/nu-command/tests/commands/mut_.rs
+++ b/crates/nu-command/tests/commands/mut_.rs
@@ -141,3 +141,10 @@ fn mut_raw_string() {
     let actual = nu!(r#"mut x = r#'abc'#; $x"#);
     assert_eq!(actual.out, "abc");
 }
+
+#[test]
+fn def_should_not_mutate_mut() {
+    let actual = nu!("mut a = 3; def foo [] { $a = 4}");
+    assert!(actual.err.contains("capture of mutable variable"));
+    assert!(!actual.status.success())
+}

From f0cb2dafbbcc04897a0d2273ebf8aa3b9ae60270 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Thu, 14 Nov 2024 04:07:37 -0500
Subject: [PATCH 0667/1072] Allow duration to be added to date (#14295)

# Description

Fixes #14294 - Turned out to be a whole lot easier than I expected, but
please double-check me on this, since it's an area I haven't been in
before.

# User-Facing Changes

Allow date to be added to a duration type.

# Tests + Formatting

Tests added:

* Duration + Date is allowed
* Duration - Date is not allowed
---
 crates/nu-parser/src/type_check.rs  |  1 +
 crates/nu-protocol/src/value/mod.rs | 11 +++++++++++
 tests/repl/test_type_check.rs       | 12 ++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/crates/nu-parser/src/type_check.rs b/crates/nu-parser/src/type_check.rs
index 1b66258ded..a7de3800e2 100644
--- a/crates/nu-parser/src/type_check.rs
+++ b/crates/nu-parser/src/type_check.rs
@@ -88,6 +88,7 @@ pub fn math_result_type(
                 (Type::Float, Type::Number) => (Type::Number, None),
                 (Type::String, Type::String) => (Type::String, None),
                 (Type::Date, Type::Duration) => (Type::Date, None),
+                (Type::Duration, Type::Date) => (Type::Date, None),
                 (Type::Duration, Type::Duration) => (Type::Duration, None),
                 (Type::Filesize, Type::Filesize) => (Type::Filesize, None),
 
diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs
index 26d8384cee..1a1e8fada2 100644
--- a/crates/nu-protocol/src/value/mod.rs
+++ b/crates/nu-protocol/src/value/mod.rs
@@ -2444,6 +2444,17 @@ impl Value {
                 Ok(Value::string(lhs.to_string() + rhs, span))
             }
 
+            (Value::Duration { val: lhs, .. }, Value::Date { val: rhs, .. }) => {
+                if let Some(val) = rhs.checked_add_signed(chrono::Duration::nanoseconds(*lhs)) {
+                    Ok(Value::date(val, span))
+                } else {
+                    Err(ShellError::OperatorOverflow {
+                        msg: "addition operation overflowed".into(),
+                        span,
+                        help: None,
+                    })
+                }
+            }
             (Value::Date { val: lhs, .. }, Value::Duration { val: rhs, .. }) => {
                 if let Some(val) = lhs.checked_add_signed(chrono::Duration::nanoseconds(*rhs)) {
                     Ok(Value::date(val, span))
diff --git a/tests/repl/test_type_check.rs b/tests/repl/test_type_check.rs
index 8a00f2f486..95ef7f4323 100644
--- a/tests/repl/test_type_check.rs
+++ b/tests/repl/test_type_check.rs
@@ -37,6 +37,11 @@ fn date_minus_duration() -> TestResult {
     run_test(input, expected)
 }
 
+#[test]
+fn duration_minus_date_not_supported() -> TestResult {
+    fail_test("2day - 2023-04-22", "doesn't support these values")
+}
+
 #[test]
 fn date_plus_duration() -> TestResult {
     let input = "2023-04-18 + 2day | format date %Y-%m-%d";
@@ -44,6 +49,13 @@ fn date_plus_duration() -> TestResult {
     run_test(input, expected)
 }
 
+#[test]
+fn duration_plus_date() -> TestResult {
+    let input = "2024-11-10T00:00:00-00:00 + 4hr | format date";
+    let expected = "Sun, 10 Nov 2024 04:00:00 +0000";
+    run_test(input, expected)
+}
+
 #[test]
 fn block_not_first_class_def() -> TestResult {
     fail_test(

From 6278afde8d452f8487f7c0afd984f7b0d2ecc8e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Nov 2024 09:08:19 +0000
Subject: [PATCH 0668/1072] Bump crate-ci/typos from 1.27.0 to 1.27.3 (#14321)

---
 .github/workflows/typos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index be6da05e82..2c0fcbd771 100644
--- 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.27.0
+        uses: crate-ci/typos@v1.27.3

From 948205c8e6f0d119d3eb85dfe58dbc0a05c83e8d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Nov 2024 09:09:48 +0000
Subject: [PATCH 0669/1072] Bump serial_test from 3.1.1 to 3.2.0 (#14325)

---
 Cargo.lock | 8 ++++----
 Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3a1a31f491..779364a7a3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5713,9 +5713,9 @@ dependencies = [
 
 [[package]]
 name = "serial_test"
-version = "3.1.1"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d"
+checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9"
 dependencies = [
  "futures",
  "log",
@@ -5727,9 +5727,9 @@ dependencies = [
 
 [[package]]
 name = "serial_test_derive"
-version = "3.1.1"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67"
+checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index c84a05ee38..07a50d301a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -243,7 +243,7 @@ tango-bench = "0.6"
 pretty_assertions = { workspace = true }
 regex = { workspace = true }
 rstest = { workspace = true, default-features = false }
-serial_test = "3.1"
+serial_test = "3.2"
 tempfile = { workspace = true }
 
 [features]

From 3893fbb0b1110728fded596d2c457db8ad390bcf Mon Sep 17 00:00:00 2001
From: Solomon <git@solomonvictorino.com>
Date: Thu, 14 Nov 2024 02:13:04 -0700
Subject: [PATCH 0670/1072] skip `test_iteration_errors` if `/root` is missing
 (#14299)

# Description

`test_iteration_errors` no longer requires `/root` to exist:

```
failures:

---- test::test_iteration_errors stdout ----
thread 'test::test_iteration_errors' panicked at crates/nu-glob/src/li
b.rs:1151:13:
assertion failed: next.is_some()
```

`/root` is an optional home directory in the [File Hierarchy
Standard][1].

I encountered this while running the tests in a `guix shell` container,
which doesn't include a root user.

[1]: https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch03s14.html

# User-Facing Changes

None
---
 crates/nu-glob/src/lib.rs | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/crates/nu-glob/src/lib.rs b/crates/nu-glob/src/lib.rs
index 2a3f861983..602500fa1a 100644
--- a/crates/nu-glob/src/lib.rs
+++ b/crates/nu-glob/src/lib.rs
@@ -1144,18 +1144,28 @@ mod test {
         use std::io;
         let mut iter = glob("/root/*").unwrap();
 
-        // Skip test if running with permissions to read /root
-        if std::fs::read_dir("/root/").is_err() {
-            // GlobErrors shouldn't halt iteration
-            let next = iter.next();
-            assert!(next.is_some());
+        match std::fs::read_dir("/root/") {
+            // skip if running with permissions to read /root
+            Ok(_) => {}
 
-            let err = next.unwrap();
-            assert!(err.is_err());
+            // skip if /root doesn't exist
+            Err(err) if err.kind() == io::ErrorKind::NotFound => {
+                assert!(iter.count() == 0);
+            }
 
-            let err = err.err().unwrap();
-            assert!(err.path() == Path::new("/root"));
-            assert!(err.error().kind() == io::ErrorKind::PermissionDenied);
+            // should otherwise return a single match with permission error
+            Err(_) => {
+                // GlobErrors shouldn't halt iteration
+                let next = iter.next();
+                assert!(next.is_some());
+
+                let err = next.unwrap();
+                assert!(err.is_err());
+
+                let err = err.err().unwrap();
+                assert!(err.path() == Path::new("/root"));
+                assert!(err.error().kind() == io::ErrorKind::PermissionDenied);
+            }
         }
     }
 

From 739a7ea730e421b10106bfe3ebb0e2a0bf223964 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Nov 2024 09:20:17 +0000
Subject: [PATCH 0671/1072] Bump mockito from 1.5.0 to 1.6.1 (#14336)

---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 779364a7a3..51dfce7efc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2805,9 +2805,9 @@ dependencies = [
 
 [[package]]
 name = "mockito"
-version = "1.5.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09b34bd91b9e5c5b06338d392463e1318d683cf82ec3d3af4014609be6e2108d"
+checksum = "652cd6d169a36eaf9d1e6bce1a221130439a966d7f27858af66a33a66e9c4ee2"
 dependencies = [
  "assert-json-diff",
  "bytes",
diff --git a/Cargo.toml b/Cargo.toml
index 07a50d301a..2f0aaba5a7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -109,7 +109,7 @@ md5 = { version = "0.10", package = "md-5" }
 miette = "7.2"
 mime = "0.3.17"
 mime_guess = "2.0"
-mockito = { version = "1.5", default-features = false }
+mockito = { version = "1.6", default-features = false }
 multipart-rs = "0.1.11"
 native-tls = "0.2"
 nix = { version = "0.29", default-features = false }

From 636bae24665b815a88f6253cc4b076cf1939a407 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Nov 2024 09:32:55 +0000
Subject: [PATCH 0672/1072] Bump tempfile from 3.13.0 to 3.14.0 (#14326)

---
 Cargo.lock | 12 ++++++------
 Cargo.toml |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 51dfce7efc..7343d3c043 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2401,9 +2401,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.162"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
 
 [[package]]
 name = "libflate"
@@ -5476,9 +5476,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.37"
+version = "0.38.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+checksum = "99e4ea3e1cdc4b559b8e5650f9c8e5998e3e5c1343b4eaf034565f32318d63c0"
 dependencies = [
  "bitflags 2.6.0",
  "errno",
@@ -6196,9 +6196,9 @@ checksum = "c1bbb9f3c5c463a01705937a24fdabc5047929ac764b2d5b9cf681c1f5041ed5"
 
 [[package]]
 name = "tempfile"
-version = "3.13.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
+checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
 dependencies = [
  "cfg-if",
  "fastrand",
diff --git a/Cargo.toml b/Cargo.toml
index 2f0aaba5a7..e7318fa006 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -155,7 +155,7 @@ strip-ansi-escapes = "0.2.0"
 syn = "2.0"
 sysinfo = "0.32"
 tabled = { version = "0.16.0", default-features = false }
-tempfile = "3.13"
+tempfile = "3.14"
 terminal_size = "0.3"
 titlecase = "2.0"
 toml = "0.8"

From a84d410f117d2247acb2b33452356c5c182572db Mon Sep 17 00:00:00 2001
From: Bark <32035685+userwiths@users.noreply.github.com>
Date: Fri, 15 Nov 2024 01:39:41 +0200
Subject: [PATCH 0673/1072] Fix inconsistency in `ls` sort-order (#13875)

Fixes #13267

As we can see from the bisect done in the comments.
Bisected to https://github.com/nushell/nushell/pull/12625 /
https://github.com/nushell/nushell/commit/460a1c8f874b503cb4140619838be483600f00ce

We can see that this update brought the use of `read_dir` and for it, it
is mentioned in the [rust
docs](https://doc.rust-lang.org/std/fs/fn.read_dir.html#platform-specific-behavior)
that it does **not** provide any specific order of files.
As was the advice there, I went and applied a manual `sort` to the
entries and tested it manually on my local machine.

If required I could probably try and add tests for the order
consistency, would need some time to find my way around them, so I'm
sending the PR first.
---
 crates/nu-command/src/filesystem/ls.rs | 16 +++++++++++++---
 crates/nu-command/tests/commands/ls.rs | 24 ++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/crates/nu-command/src/filesystem/ls.rs b/crates/nu-command/src/filesystem/ls.rs
index 465fae16ff..b1b231a4a5 100644
--- a/crates/nu-command/src/filesystem/ls.rs
+++ b/crates/nu-command/src/filesystem/ls.rs
@@ -339,7 +339,7 @@ fn ls_for_one_pattern(
     let path = pattern_arg.into_spanned(p_tag);
     let (prefix, paths) = if just_read_dir {
         let expanded = nu_path::expand_path_with(path.item.as_ref(), &cwd, path.item.is_expand());
-        let paths = read_dir(&expanded)?;
+        let paths = read_dir(&expanded, use_threads)?;
         // just need to read the directory, so prefix is path itself.
         (Some(expanded), paths)
     } else {
@@ -979,10 +979,20 @@ mod windows_helper {
 #[allow(clippy::type_complexity)]
 fn read_dir(
     f: &Path,
+    use_threads: bool,
 ) -> Result<Box<dyn Iterator<Item = Result<PathBuf, ShellError>> + Send>, ShellError> {
-    let iter = f.read_dir()?.map(|d| {
+    let items = f.read_dir()?.map(|d| {
         d.map(|r| r.path())
             .map_err(|e| ShellError::IOError { msg: e.to_string() })
     });
-    Ok(Box::new(iter))
+    if !use_threads {
+        let mut collected = items.collect::<Vec<_>>();
+        collected.sort_by(|a, b| {
+            let a = a.as_ref().expect("path should be valid");
+            let b = b.as_ref().expect("path should be valid");
+            a.cmp(b)
+        });
+        return Ok(Box::new(collected.into_iter()));
+    }
+    Ok(Box::new(items))
 }
diff --git a/crates/nu-command/tests/commands/ls.rs b/crates/nu-command/tests/commands/ls.rs
index 7ac0063741..4140ea64bc 100644
--- a/crates/nu-command/tests/commands/ls.rs
+++ b/crates/nu-command/tests/commands/ls.rs
@@ -833,3 +833,27 @@ fn list_symlink_with_full_path() {
         );
     })
 }
+
+#[test]
+fn consistent_list_order() {
+    Playground::setup("ls_test_order", |dirs, sandbox| {
+        sandbox.with_files(&[
+            EmptyFile("los.txt"),
+            EmptyFile("tres.txt"),
+            EmptyFile("amigos.txt"),
+            EmptyFile("arepas.clu"),
+        ]);
+
+        let no_arg = nu!(
+            cwd: dirs.test(), pipeline(
+            "ls"
+        ));
+
+        let with_arg = nu!(
+            cwd: dirs.test(), pipeline(
+            "ls ."
+        ));
+
+        assert_eq!(no_arg.out, with_arg.out);
+    })
+}

From a04c90e22d7bc9ca8b2d023d5d771255d1a6e759 Mon Sep 17 00:00:00 2001
From: Solomon <git@solomonvictorino.com>
Date: Thu, 14 Nov 2024 21:09:02 -0700
Subject: [PATCH 0674/1072] make `ls` return "Permission denied" for CWD
 instead of empty results (#14310)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #14265

# User-Facing Changes

`ls` without a path argument now errors when the current working
directory is unreadable due to missing permissions:

```diff
mkdir foo
chmod 100 foo
cd foo
ls | to nuon
-[]
+Error:   × Permission denied
```
---
 crates/nu-command/src/filesystem/ls.rs | 68 ++++++++++----------------
 crates/nu-command/tests/commands/ls.rs | 23 +++++----
 2 files changed, 40 insertions(+), 51 deletions(-)

diff --git a/crates/nu-command/src/filesystem/ls.rs b/crates/nu-command/src/filesystem/ls.rs
index b1b231a4a5..c4944c6531 100644
--- a/crates/nu-command/src/filesystem/ls.rs
+++ b/crates/nu-command/src/filesystem/ls.rs
@@ -287,28 +287,10 @@ fn ls_for_one_pattern(
                 nu_path::expand_path_with(pat.item.as_ref(), &cwd, pat.item.is_expand());
             // Avoid checking and pushing "*" to the path when directory (do not show contents) flag is true
             if !directory && tmp_expanded.is_dir() {
-                if permission_denied(&tmp_expanded) {
-                    #[cfg(unix)]
-                    let error_msg = format!(
-                        "The permissions of {:o} do not allow access for this user",
-                        tmp_expanded
-                            .metadata()
-                            .expect("this shouldn't be called since we already know there is a dir")
-                            .permissions()
-                            .mode()
-                            & 0o0777
-                    );
-                    #[cfg(not(unix))]
-                    let error_msg = String::from("Permission denied");
-                    return Err(ShellError::GenericError {
-                        error: "Permission denied".into(),
-                        msg: error_msg,
-                        span: Some(p_tag),
-                        help: None,
-                        inner: vec![],
-                    });
-                }
-                if is_empty_dir(&tmp_expanded) {
+                if read_dir(&tmp_expanded, p_tag, use_threads)?
+                    .next()
+                    .is_none()
+                {
                     return Ok(Value::test_nothing().into_pipeline_data());
                 }
                 just_read_dir = !(pat.item.is_expand() && pat.item.as_ref().contains(GLOB_CHARS));
@@ -327,7 +309,7 @@ fn ls_for_one_pattern(
             // Avoid pushing "*" to the default path when directory (do not show contents) flag is true
             if directory {
                 (NuGlob::Expand(".".to_string()), false)
-            } else if is_empty_dir(&cwd) {
+            } else if read_dir(&cwd, p_tag, use_threads)?.next().is_none() {
                 return Ok(Value::test_nothing().into_pipeline_data());
             } else {
                 (NuGlob::Expand("*".to_string()), false)
@@ -339,7 +321,7 @@ fn ls_for_one_pattern(
     let path = pattern_arg.into_spanned(p_tag);
     let (prefix, paths) = if just_read_dir {
         let expanded = nu_path::expand_path_with(path.item.as_ref(), &cwd, path.item.is_expand());
-        let paths = read_dir(&expanded, use_threads)?;
+        let paths = read_dir(&expanded, p_tag, use_threads)?;
         // just need to read the directory, so prefix is path itself.
         (Some(expanded), paths)
     } else {
@@ -492,20 +474,6 @@ fn ls_for_one_pattern(
         .into_pipeline_data(call_span, signals.clone()))
 }
 
-fn permission_denied(dir: impl AsRef<Path>) -> bool {
-    match dir.as_ref().read_dir() {
-        Err(e) => matches!(e.kind(), std::io::ErrorKind::PermissionDenied),
-        Ok(_) => false,
-    }
-}
-
-fn is_empty_dir(dir: impl AsRef<Path>) -> bool {
-    match dir.as_ref().read_dir() {
-        Err(_) => true,
-        Ok(mut s) => s.next().is_none(),
-    }
-}
-
 fn is_hidden_dir(dir: impl AsRef<Path>) -> bool {
     #[cfg(windows)]
     {
@@ -979,12 +947,28 @@ mod windows_helper {
 #[allow(clippy::type_complexity)]
 fn read_dir(
     f: &Path,
+    span: Span,
     use_threads: bool,
 ) -> Result<Box<dyn Iterator<Item = Result<PathBuf, ShellError>> + Send>, ShellError> {
-    let items = f.read_dir()?.map(|d| {
-        d.map(|r| r.path())
-            .map_err(|e| ShellError::IOError { msg: e.to_string() })
-    });
+    let items = f
+        .read_dir()
+        .map_err(|error| {
+            if error.kind() == std::io::ErrorKind::PermissionDenied {
+                return ShellError::GenericError {
+                    error: "Permission denied".into(),
+                    msg: "The permissions may not allow access for this user".into(),
+                    span: Some(span),
+                    help: None,
+                    inner: vec![],
+                };
+            }
+
+            error.into()
+        })?
+        .map(|d| {
+            d.map(|r| r.path())
+                .map_err(|e| ShellError::IOError { msg: e.to_string() })
+        });
     if !use_threads {
         let mut collected = items.collect::<Vec<_>>();
         collected.sort_by(|a, b| {
diff --git a/crates/nu-command/tests/commands/ls.rs b/crates/nu-command/tests/commands/ls.rs
index 4140ea64bc..416a6aaf7f 100644
--- a/crates/nu-command/tests/commands/ls.rs
+++ b/crates/nu-command/tests/commands/ls.rs
@@ -378,32 +378,37 @@ fn glob_with_hidden_directory() {
 
 #[test]
 #[cfg(unix)]
-fn fails_with_ls_to_dir_without_permission() {
+fn fails_with_permission_denied() {
     Playground::setup("ls_test_1", |dirs, sandbox| {
         sandbox
             .within("dir_a")
             .with_files(&[EmptyFile("yehuda.11.txt"), EmptyFile("jt10.txt")]);
 
-        let actual = nu!(
+        let actual_with_path_arg = nu!(
             cwd: dirs.test(), pipeline(
             "
                 chmod 000 dir_a; ls dir_a
             "
         ));
 
-        let check_not_root = nu!(
+        let actual_in_cwd = nu!(
+            cwd: dirs.test(), pipeline(
+            "
+                chmod 100 dir_a; cd dir_a; ls
+            "
+        ));
+
+        let get_uid = nu!(
             cwd: dirs.test(), pipeline(
                 "
                     id -u
                 "
         ));
+        let is_root = get_uid.out == "0";
 
-        assert!(
-            actual
-                .err
-                .contains("The permissions of 0 do not allow access for this user")
-                || check_not_root.out == "0"
-        );
+        assert!(actual_with_path_arg.err.contains("Permission denied") || is_root);
+
+        assert!(actual_in_cwd.err.contains("Permission denied") || is_root);
     })
 }
 

From 215ca6c5ca445dc56478c67ed91a37f8630732b5 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Thu, 14 Nov 2024 20:09:25 -0800
Subject: [PATCH 0675/1072] Remove the `NU_DISABLE_IR` option (#14293)

# Description

Removes the `NU_DISABLE_IR` option and some code related to evaluating
blocks with the AST
evaluator.

Does not entirely remove the AST evaluator yet. We still have some
dependencies on expression
evaluation in a few minor places which will take a little bit of effort
to fix.

Also changes `debug profile` to always include instructions, because the
output is a little
confusing otherwise, and removes the different options for
instructions/exprs.

# User-Facing Changes

- `NU_DISABLE_IR` no longer has any effect, and is removed. There is no
way to use the AST
  evaluator.
- `debug profile` no longer has `--exprs`, `--instructions` options.
- `debug profile` lists `pc` and `instruction` columns by default now.

# Tests + Formatting

Eval tests fixed to only use IR.

# After Submitting

- [ ] release notes
- [ ] finish removing AST evaluator, come up with solutions for the
expression evaluation.
---
 benches/benchmarks.rs                       |   3 -
 crates/nu-cli/src/repl.rs                   |   3 -
 crates/nu-cmd-lang/src/core_commands/do_.rs |   3 -
 crates/nu-command/src/debug/profile.rs      |  67 ++---
 crates/nu-engine/src/eval.rs                | 261 +-------------------
 crates/nu-protocol/src/engine/stack.rs      |   6 -
 crates/nu-test-support/src/macros.rs        |  10 -
 src/run.rs                                  |  11 -
 src/test_bins.rs                            |   5 -
 tests/eval/mod.rs                           |  98 +++-----
 10 files changed, 81 insertions(+), 386 deletions(-)

diff --git a/benches/benchmarks.rs b/benches/benchmarks.rs
index 6eb56532a4..d6581bc255 100644
--- a/benches/benchmarks.rs
+++ b/benches/benchmarks.rs
@@ -46,9 +46,6 @@ fn setup_stack_and_engine_from_command(command: &str) -> (Stack, EngineState) {
 
     let mut stack = Stack::new();
 
-    // Support running benchmarks without IR mode
-    stack.use_ir = std::env::var_os("NU_DISABLE_IR").is_none();
-
     evaluate_commands(
         &commands,
         &mut engine,
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 08f00727f0..5440f9caa2 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -306,9 +306,6 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
     if let Err(err) = engine_state.merge_env(&mut stack) {
         report_shell_error(engine_state, &err);
     }
-    // Check whether $env.NU_DISABLE_IR is set, so that the user can change it in the REPL
-    // Temporary while IR eval is optional
-    stack.use_ir = !stack.has_env_var(engine_state, "NU_DISABLE_IR");
     perf!("merge env", start_time, use_color);
 
     start_time = std::time::Instant::now();
diff --git a/crates/nu-cmd-lang/src/core_commands/do_.rs b/crates/nu-cmd-lang/src/core_commands/do_.rs
index 4fee08a79c..5f1b42cb66 100644
--- a/crates/nu-cmd-lang/src/core_commands/do_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/do_.rs
@@ -82,9 +82,6 @@ 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_DISABLE_IR");
-
         let result = eval_block_with_early_return(engine_state, &mut callee_stack, block, input);
 
         if has_env {
diff --git a/crates/nu-command/src/debug/profile.rs b/crates/nu-command/src/debug/profile.rs
index 41eee4c183..9f72d19d7c 100644
--- a/crates/nu-command/src/debug/profile.rs
+++ b/crates/nu-command/src/debug/profile.rs
@@ -30,8 +30,6 @@ impl Command for DebugProfile {
                 "Collect pipeline element output values",
                 Some('v'),
             )
-            .switch("expr", "Collect expression types", Some('x'))
-            .switch("instructions", "Collect IR instructions", Some('i'))
             .switch("lines", "Collect line numbers", Some('l'))
             .named(
                 "max-depth",
@@ -48,37 +46,52 @@ impl Command for DebugProfile {
     }
 
     fn extra_description(&self) -> &str {
-        r#"The profiler profiles every evaluated pipeline element inside a closure, stepping into all
+        r#"The profiler profiles every evaluated instruction inside a closure, stepping into all
 commands calls and other blocks/closures.
 
 The output can be heavily customized. By default, the following columns are included:
-- depth       : Depth of the pipeline element. Each entered block adds one level of depth. How many
+- depth       : Depth of the instruction. Each entered block adds one level of depth. How many
                 blocks deep to step into is controlled with the --max-depth option.
-- id          : ID of the pipeline element
-- parent_id   : ID of the parent element
-- source      : Source code of the pipeline element. If the element has multiple lines, only the
-                first line is used and `...` is appended to the end. Full source code can be shown
-                with the  --expand-source flag.
-- duration_ms : How long it took to run the pipeline element in milliseconds.
-- (optional) span   : Span of the element. Can be viewed via the `view span` command. Enabled with
-                      the --spans flag.
-- (optional) expr   : The type of expression of the pipeline element. Enabled with the --expr flag.
-- (optional) output : The output value of the pipeline element. Enabled with the --values flag.
+- id          : ID of the instruction
+- parent_id   : ID of the instruction that created the parent scope
+- source      : Source code that generated the instruction. If the source code has multiple lines,
+                only the first line is used and `...` is appended to the end. Full source code can
+                be shown with the --expand-source flag.
+- pc          : The index of the instruction within the block.
+- instruction : The pretty printed instruction being evaluated.
+- duration_ms : How long it took to run the instruction in milliseconds.
+- (optional) span        : Span associated with the instruction. Can be viewed via the `view span`
+                           command. Enabled with the --spans flag.
+- (optional) output      : The output value of the instruction. Enabled with the --values flag.
 
-To illustrate the depth and IDs, consider `debug profile { if true { echo 'spam' } }`. There are
-three pipeline elements:
+To illustrate the depth and IDs, consider `debug profile { do { if true { echo 'spam' } } }`. A unique ID is generated each time an instruction is executed, and there are two levels of depth:
 
-depth  id  parent_id
-    0   0          0  debug profile { do { if true { 'spam' } } }
-    1   1          0  if true { 'spam' }
-    2   2          1  'spam'
+```
+depth   id   parent_id                    source                     pc            instruction                
+    0    0           0   debug profile { do { if true { 'spam' } } }  0   <start>                                   
+    1    1           0   { if true { 'spam' } }                       0   load-literal    %1, closure(2164)  
+    1    2           0   { if true { 'spam' } }                       1   push-positional %1                 
+    1    3           0   { do { if true { 'spam' } } }                2   redirect-out    caller             
+    1    4           0   { do { if true { 'spam' } } }                3   redirect-err    caller             
+    1    5           0   do                                           4   call            decl 7 "do", %0    
+    2    6           5   true                                         0   load-literal    %1, bool(true)     
+    2    7           5   if                                           1   not             %1                 
+    2    8           5   if                                           2   branch-if       %1, 5              
+    2    9           5   'spam'                                       3   load-literal    %0, string("spam") 
+    2   10           5   if                                           4   jump            6                  
+    2   11           5   { if true { 'spam' } }                       6   return          %0                 
+    1   12           0   { do { if true { 'spam' } } }                5   return          %0                 
+```
 
 Each block entered increments depth by 1 and each block left decrements it by one. This way you can
-control the profiling granularity. Passing --max-depth=1 to the above would stop at
-`if true { 'spam' }`. The id is used to identify each element. The parent_id tells you that 'spam'
-was spawned from `if true { 'spam' }` which was spawned from the root `debug profile { ... }`.
+control the profiling granularity. Passing --max-depth=1 to the above would stop inside the `do`
+at `if true { 'spam' }`. The id is used to identify each element. The parent_id tells you that the
+instructions inside the block are being executed because of `do` (5), which in turn was spawned from
+the root `debug profile { ... }`.
 
-Note: In some cases, the ordering of piepeline elements might not be intuitive. For example,
+For a better understanding of how instructions map to source code, see the `view ir` command.
+
+Note: In some cases, the ordering of pipeline elements might not be intuitive. For example,
 `[ a bb cc ] | each { $in | str length }` involves some implicit collects and lazy evaluation
 confusing the id/parent_id hierarchy. The --expr flag is helpful for investigating these issues."#
     }
@@ -94,8 +107,6 @@ confusing the id/parent_id hierarchy. The --expr flag is helpful for investigati
         let collect_spans = call.has_flag(engine_state, stack, "spans")?;
         let collect_expanded_source = call.has_flag(engine_state, stack, "expanded-source")?;
         let collect_values = call.has_flag(engine_state, stack, "values")?;
-        let collect_exprs = call.has_flag(engine_state, stack, "expr")?;
-        let collect_instructions = call.has_flag(engine_state, stack, "instructions")?;
         let collect_lines = call.has_flag(engine_state, stack, "lines")?;
         let max_depth = call
             .get_flag(engine_state, stack, "max-depth")?
@@ -108,8 +119,8 @@ confusing the id/parent_id hierarchy. The --expr flag is helpful for investigati
                 collect_source: true,
                 collect_expanded_source,
                 collect_values,
-                collect_exprs,
-                collect_instructions,
+                collect_exprs: false,
+                collect_instructions: true,
                 collect_lines,
             },
             call.span(),
diff --git a/crates/nu-engine/src/eval.rs b/crates/nu-engine/src/eval.rs
index 3e5ad239fe..fc4a88f83e 100644
--- a/crates/nu-engine/src/eval.rs
+++ b/crates/nu-engine/src/eval.rs
@@ -1,20 +1,17 @@
 use crate::eval_ir_block;
 #[allow(deprecated)]
-use crate::{current_dir, get_full_help};
+use crate::get_full_help;
 use nu_path::{expand_path_with, AbsolutePathBuf};
 use nu_protocol::{
-    ast::{
-        Assignment, Block, Call, Expr, Expression, ExternalArgument, PathMember, PipelineElement,
-        PipelineRedirection, RedirectionSource, RedirectionTarget,
-    },
+    ast::{Assignment, Block, Call, Expr, Expression, ExternalArgument, PathMember},
     debugger::DebugContext,
-    engine::{Closure, EngineState, Redirection, Stack, StateWorkingSet},
+    engine::{Closure, EngineState, Stack},
     eval_base::Eval,
-    BlockId, ByteStreamSource, Config, DataSource, FromValue, IntoPipelineData, OutDest,
-    PipelineData, PipelineMetadata, ShellError, Span, Spanned, Type, Value, VarId, ENV_VARIABLE_ID,
+    BlockId, Config, DataSource, IntoPipelineData, PipelineData, PipelineMetadata, ShellError,
+    Span, Type, Value, VarId, ENV_VARIABLE_ID,
 };
 use nu_utils::IgnoreCaseExt;
-use std::{fs::OpenOptions, path::PathBuf, sync::Arc};
+use std::sync::Arc;
 
 pub fn eval_call<D: DebugContext>(
     engine_state: &EngineState,
@@ -301,177 +298,6 @@ pub fn eval_expression_with_input<D: DebugContext>(
     Ok(input)
 }
 
-fn eval_redirection<D: DebugContext>(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    target: &RedirectionTarget,
-    next_out: Option<OutDest>,
-) -> Result<Redirection, ShellError> {
-    match target {
-        RedirectionTarget::File { expr, append, .. } => {
-            #[allow(deprecated)]
-            let cwd = current_dir(engine_state, stack)?;
-            let value = eval_expression::<D>(engine_state, stack, expr)?;
-            let path = Spanned::<PathBuf>::from_value(value)?.item;
-            let path = expand_path_with(path, cwd, true);
-
-            let mut options = OpenOptions::new();
-            if *append {
-                options.append(true);
-            } else {
-                options.write(true).truncate(true);
-            }
-            Ok(Redirection::file(options.create(true).open(path)?))
-        }
-        RedirectionTarget::Pipe { .. } => {
-            let dest = match next_out {
-                None | Some(OutDest::PipeSeparate) => OutDest::Pipe,
-                Some(next) => next,
-            };
-            Ok(Redirection::Pipe(dest))
-        }
-    }
-}
-
-fn eval_element_redirection<D: DebugContext>(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    element_redirection: Option<&PipelineRedirection>,
-    pipe_redirection: (Option<OutDest>, Option<OutDest>),
-) -> Result<(Option<Redirection>, Option<Redirection>), ShellError> {
-    let (next_out, next_err) = pipe_redirection;
-
-    if let Some(redirection) = element_redirection {
-        match redirection {
-            PipelineRedirection::Single {
-                source: RedirectionSource::Stdout,
-                target,
-            } => {
-                let stdout = eval_redirection::<D>(engine_state, stack, target, next_out)?;
-                Ok((Some(stdout), next_err.map(Redirection::Pipe)))
-            }
-            PipelineRedirection::Single {
-                source: RedirectionSource::Stderr,
-                target,
-            } => {
-                let stderr = eval_redirection::<D>(engine_state, stack, target, None)?;
-                if matches!(stderr, Redirection::Pipe(OutDest::Pipe)) {
-                    let dest = match next_out {
-                        None | Some(OutDest::PipeSeparate) => OutDest::Pipe,
-                        Some(next) => next,
-                    };
-                    // e>| redirection, don't override current stack `stdout`
-                    Ok((None, Some(Redirection::Pipe(dest))))
-                } else {
-                    Ok((next_out.map(Redirection::Pipe), Some(stderr)))
-                }
-            }
-            PipelineRedirection::Single {
-                source: RedirectionSource::StdoutAndStderr,
-                target,
-            } => {
-                let stream = eval_redirection::<D>(engine_state, stack, target, next_out)?;
-                Ok((Some(stream.clone()), Some(stream)))
-            }
-            PipelineRedirection::Separate { out, err } => {
-                let stdout = eval_redirection::<D>(engine_state, stack, out, None)?; // `out` cannot be `RedirectionTarget::Pipe`
-                let stderr = eval_redirection::<D>(engine_state, stack, err, next_out)?;
-                Ok((Some(stdout), Some(stderr)))
-            }
-        }
-    } else {
-        Ok((
-            next_out.map(Redirection::Pipe),
-            next_err.map(Redirection::Pipe),
-        ))
-    }
-}
-
-fn eval_element_with_input_inner<D: DebugContext>(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    element: &PipelineElement,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let data = eval_expression_with_input::<D>(engine_state, stack, &element.expr, input)?;
-
-    let is_external = if let PipelineData::ByteStream(stream, ..) = &data {
-        matches!(stream.source(), ByteStreamSource::Child(..))
-    } else {
-        false
-    };
-
-    if let Some(redirection) = element.redirection.as_ref() {
-        if !is_external {
-            match redirection {
-                &PipelineRedirection::Single {
-                    source: RedirectionSource::Stderr,
-                    target: RedirectionTarget::Pipe { span },
-                }
-                | &PipelineRedirection::Separate {
-                    err: RedirectionTarget::Pipe { span },
-                    ..
-                } => {
-                    return Err(ShellError::GenericError {
-                        error: "`e>|` only works on external commands".into(),
-                        msg: "`e>|` only works on external commands".into(),
-                        span: Some(span),
-                        help: None,
-                        inner: vec![],
-                    });
-                }
-                &PipelineRedirection::Single {
-                    source: RedirectionSource::StdoutAndStderr,
-                    target: RedirectionTarget::Pipe { span },
-                } => {
-                    return Err(ShellError::GenericError {
-                        error: "`o+e>|` only works on external commands".into(),
-                        msg: "`o+e>|` only works on external commands".into(),
-                        span: Some(span),
-                        help: None,
-                        inner: vec![],
-                    });
-                }
-                _ => {}
-            }
-        }
-    }
-
-    let data = if let Some(OutDest::File(file)) = stack.pipe_stdout() {
-        match &data {
-            PipelineData::Value(..) | PipelineData::ListStream(..) => {
-                data.write_to(file.as_ref())?;
-                PipelineData::Empty
-            }
-            PipelineData::ByteStream(..) => {
-                if !is_external {
-                    data.write_to(file.as_ref())?;
-                    PipelineData::Empty
-                } else {
-                    data
-                }
-            }
-            PipelineData::Empty => PipelineData::Empty,
-        }
-    } else {
-        data
-    };
-
-    Ok(data)
-}
-
-fn eval_element_with_input<D: DebugContext>(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    element: &PipelineElement,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    D::enter_element(engine_state, element);
-    let result = eval_element_with_input_inner::<D>(engine_state, stack, element, input);
-    D::leave_element(engine_state, element, &result);
-    result
-}
-
 pub fn eval_block_with_early_return<D: DebugContext>(
     engine_state: &EngineState,
     stack: &mut Stack,
@@ -484,86 +310,13 @@ pub fn eval_block_with_early_return<D: DebugContext>(
     }
 }
 
-fn eval_block_inner<D: DebugContext>(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    block: &Block,
-    mut input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    // Remove once IR is the default.
-    if stack.use_ir {
-        return eval_ir_block::<D>(engine_state, stack, block, input);
-    }
-
-    let num_pipelines = block.len();
-
-    for (pipeline_idx, pipeline) in block.pipelines.iter().enumerate() {
-        let last_pipeline = pipeline_idx >= num_pipelines - 1;
-
-        let Some((last, elements)) = pipeline.elements.split_last() else {
-            debug_assert!(false, "pipelines should have at least one element");
-            continue;
-        };
-
-        for (i, element) in elements.iter().enumerate() {
-            let next = elements.get(i + 1).unwrap_or(last);
-            let (next_out, next_err) = next.pipe_redirection(&StateWorkingSet::new(engine_state));
-            let (stdout, stderr) = eval_element_redirection::<D>(
-                engine_state,
-                stack,
-                element.redirection.as_ref(),
-                (next_out.or(Some(OutDest::Pipe)), next_err),
-            )?;
-            let stack = &mut stack.push_redirection(stdout, stderr);
-            input = eval_element_with_input::<D>(engine_state, stack, element, input)?;
-        }
-
-        if last_pipeline {
-            let (stdout, stderr) = eval_element_redirection::<D>(
-                engine_state,
-                stack,
-                last.redirection.as_ref(),
-                (stack.pipe_stdout().cloned(), stack.pipe_stderr().cloned()),
-            )?;
-            let stack = &mut stack.push_redirection(stdout, stderr);
-            input = eval_element_with_input::<D>(engine_state, stack, last, input)?;
-        } else {
-            let (stdout, stderr) = eval_element_redirection::<D>(
-                engine_state,
-                stack,
-                last.redirection.as_ref(),
-                (None, None),
-            )?;
-            let stack = &mut stack.push_redirection(stdout, stderr);
-            match eval_element_with_input::<D>(engine_state, stack, last, input)? {
-                PipelineData::ByteStream(stream, ..) => {
-                    let span = stream.span();
-                    if let Err(err) = stream.drain() {
-                        stack.set_last_error(&err);
-                        return Err(err);
-                    } else {
-                        stack.set_last_exit_code(0, span);
-                    }
-                }
-                PipelineData::ListStream(stream, ..) => stream.drain()?,
-                PipelineData::Value(..) | PipelineData::Empty => {}
-            }
-            input = PipelineData::Empty;
-        }
-    }
-
-    Ok(input)
-}
-
 pub fn eval_block<D: DebugContext>(
     engine_state: &EngineState,
     stack: &mut Stack,
     block: &Block,
     input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
-    D::enter_block(engine_state, block);
-    let result = eval_block_inner::<D>(engine_state, stack, block, input);
-    D::leave_block(engine_state, block);
+    let result = eval_ir_block::<D>(engine_state, stack, block, input);
     if let Err(err) = &result {
         stack.set_last_error(err);
     }
diff --git a/crates/nu-protocol/src/engine/stack.rs b/crates/nu-protocol/src/engine/stack.rs
index 3102e3a84e..ddd1169513 100644
--- a/crates/nu-protocol/src/engine/stack.rs
+++ b/crates/nu-protocol/src/engine/stack.rs
@@ -45,8 +45,6 @@ pub struct Stack {
     pub arguments: ArgumentStack,
     /// Error handler stack for IR evaluation
     pub error_handlers: ErrorHandlerStack,
-    /// Set true to always use IR mode
-    pub use_ir: bool,
     pub recursion_count: u64,
     pub parent_stack: Option<Arc<Stack>>,
     /// Variables that have been deleted (this is used to hide values from parent stack lookups)
@@ -78,7 +76,6 @@ impl Stack {
             active_overlays: vec![DEFAULT_OVERLAY_NAME.to_string()],
             arguments: ArgumentStack::new(),
             error_handlers: ErrorHandlerStack::new(),
-            use_ir: true,
             recursion_count: 0,
             parent_stack: None,
             parent_deletions: vec![],
@@ -99,7 +96,6 @@ impl Stack {
             active_overlays: parent.active_overlays.clone(),
             arguments: ArgumentStack::new(),
             error_handlers: ErrorHandlerStack::new(),
-            use_ir: parent.use_ir,
             recursion_count: parent.recursion_count,
             vars: vec![],
             parent_deletions: vec![],
@@ -317,7 +313,6 @@ impl Stack {
             active_overlays: self.active_overlays.clone(),
             arguments: ArgumentStack::new(),
             error_handlers: ErrorHandlerStack::new(),
-            use_ir: self.use_ir,
             recursion_count: self.recursion_count,
             parent_stack: None,
             parent_deletions: vec![],
@@ -351,7 +346,6 @@ impl Stack {
             active_overlays: self.active_overlays.clone(),
             arguments: ArgumentStack::new(),
             error_handlers: ErrorHandlerStack::new(),
-            use_ir: self.use_ir,
             recursion_count: self.recursion_count,
             parent_stack: None,
             parent_deletions: vec![],
diff --git a/crates/nu-test-support/src/macros.rs b/crates/nu-test-support/src/macros.rs
index fdfdabd0b5..f41c8cbc9d 100644
--- a/crates/nu-test-support/src/macros.rs
+++ b/crates/nu-test-support/src/macros.rs
@@ -248,7 +248,6 @@ pub struct NuOpts {
     pub locale: Option<String>,
     pub envs: Option<Vec<(String, String)>>,
     pub collapse_output: Option<bool>,
-    pub use_ir: Option<bool>,
     // Note: At the time this was added, passing in a file path was more convenient. However,
     // passing in file contents seems like a better API - consider this when adding new uses of
     // this field.
@@ -301,15 +300,6 @@ pub fn nu_run_test(opts: NuOpts, commands: impl AsRef<str>, with_std: bool) -> O
         .stdout(Stdio::piped())
         .stderr(Stdio::piped());
 
-    // Explicitly set NU_DISABLE_IR
-    if let Some(use_ir) = opts.use_ir {
-        if !use_ir {
-            command.env("NU_DISABLE_IR", "1");
-        } else {
-            command.env_remove("NU_DISABLE_IR");
-        }
-    }
-
     // Uncomment to debug the command being run:
     // println!("=== command\n{command:?}\n");
 
diff --git a/src/run.rs b/src/run.rs
index 14c737c613..1cbfbc03a2 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -26,9 +26,6 @@ pub(crate) fn run_commands(
     let ask_to_create_config = nu_path::nu_config_dir().map_or(false, |p| !p.exists());
 
     let mut stack = Stack::new();
-    if stack.has_env_var(engine_state, "NU_DISABLE_IR") {
-        stack.use_ir = false;
-    }
 
     // if the --no-config-file(-n) option is NOT passed, load the plugin file,
     // load the default env file or custom (depending on parsed_nu_cli_args.env_file),
@@ -119,10 +116,6 @@ pub(crate) fn run_file(
     trace!("run_file");
     let mut stack = Stack::new();
 
-    if stack.has_env_var(engine_state, "NU_DISABLE_IR") {
-        stack.use_ir = false;
-    }
-
     // if the --no-config-file(-n) option is NOT passed, load the plugin file,
     // load the default env file or custom (depending on parsed_nu_cli_args.env_file),
     // and maybe a custom config file (depending on parsed_nu_cli_args.config_file)
@@ -191,10 +184,6 @@ pub(crate) fn run_repl(
     let mut stack = Stack::new();
     let start_time = std::time::Instant::now();
 
-    if stack.has_env_var(engine_state, "NU_DISABLE_IR") {
-        stack.use_ir = false;
-    }
-
     if parsed_nu_cli_args.no_config_file.is_none() {
         setup_config(
             engine_state,
diff --git a/src/test_bins.rs b/src/test_bins.rs
index 9752114977..7e684d5794 100644
--- a/src/test_bins.rs
+++ b/src/test_bins.rs
@@ -236,11 +236,6 @@ pub fn nu_repl() {
     engine_state.add_env_var("PWD".into(), Value::test_string(cwd.to_string_lossy()));
     engine_state.add_env_var("PATH".into(), Value::test_string(""));
 
-    // Disable IR in tests if set
-    if std::env::var_os("NU_DISABLE_IR").is_some() {
-        Arc::make_mut(&mut top_stack).use_ir = false;
-    }
-
     let mut last_output = String::new();
 
     load_standard_library(&mut engine_state).expect("Could not load the standard library.");
diff --git a/tests/eval/mod.rs b/tests/eval/mod.rs
index f8996f0a3e..191b19eb89 100644
--- a/tests/eval/mod.rs
+++ b/tests/eval/mod.rs
@@ -31,71 +31,43 @@ enum ExpectedOut<'a> {
 use self::ExpectedOut::*;
 
 fn test_eval(source: &str, expected_out: ExpectedOut) {
-    Playground::setup("test_eval_ast", |ast_dirs, _playground| {
-        Playground::setup("test_eval_ir", |ir_dirs, _playground| {
-            let actual_ast = nu!(
-                cwd: ast_dirs.test(),
-                use_ir: false,
-                source,
-            );
-            let actual_ir = nu!(
-                cwd: ir_dirs.test(),
-                use_ir: true,
-                source,
-            );
+    Playground::setup("test_eval", |dirs, _playground| {
+        let actual = nu!(
+            cwd: dirs.test(),
+            source,
+        );
 
-            match expected_out {
-                Eq(eq) => {
-                    assert_eq!(actual_ast.out, eq);
-                    assert_eq!(actual_ir.out, eq);
-                    assert!(actual_ast.status.success());
-                    assert!(actual_ir.status.success());
-                }
-                Matches(regex) => {
-                    let compiled_regex = Regex::new(regex).expect("regex failed to compile");
-                    assert!(
-                        compiled_regex.is_match(&actual_ast.out),
-                        "AST eval out does not match: {}\n{}",
-                        regex,
-                        actual_ast.out
-                    );
-                    assert!(
-                        compiled_regex.is_match(&actual_ir.out),
-                        "IR eval out does not match: {}\n{}",
-                        regex,
-                        actual_ir.out,
-                    );
-                    assert!(actual_ast.status.success());
-                    assert!(actual_ir.status.success());
-                }
-                Error(regex) => {
-                    let compiled_regex = Regex::new(regex).expect("regex failed to compile");
-                    assert!(
-                        compiled_regex.is_match(&actual_ast.err),
-                        "AST eval err does not match: {}",
-                        regex
-                    );
-                    assert!(
-                        compiled_regex.is_match(&actual_ir.err),
-                        "IR eval err does not match: {}",
-                        regex
-                    );
-                    assert!(!actual_ast.status.success());
-                    assert!(!actual_ir.status.success());
-                }
-                FileEq(path, contents) => {
-                    let ast_contents = std::fs::read_to_string(ast_dirs.test().join(path))
-                        .expect("failed to read AST file");
-                    let ir_contents = std::fs::read_to_string(ir_dirs.test().join(path))
-                        .expect("failed to read IR file");
-                    assert_eq!(ast_contents.trim(), contents);
-                    assert_eq!(ir_contents.trim(), contents);
-                    assert!(actual_ast.status.success());
-                    assert!(actual_ir.status.success());
-                }
+        match expected_out {
+            Eq(eq) => {
+                assert_eq!(actual.out, eq);
+                assert!(actual.status.success());
             }
-            assert_eq!(actual_ast.out, actual_ir.out);
-        })
+            Matches(regex) => {
+                let compiled_regex = Regex::new(regex).expect("regex failed to compile");
+                assert!(
+                    compiled_regex.is_match(&actual.out),
+                    "eval out does not match: {}\n{}",
+                    regex,
+                    actual.out,
+                );
+                assert!(actual.status.success());
+            }
+            Error(regex) => {
+                let compiled_regex = Regex::new(regex).expect("regex failed to compile");
+                assert!(
+                    compiled_regex.is_match(&actual.err),
+                    "eval err does not match: {}",
+                    regex
+                );
+                assert!(!actual.status.success());
+            }
+            FileEq(path, contents) => {
+                let read_contents =
+                    std::fs::read_to_string(dirs.test().join(path)).expect("failed to read file");
+                assert_eq!(read_contents.trim(), contents);
+                assert!(actual.status.success());
+            }
+        }
     });
 }
 

From 9d0f69ac507b82500a71453035d7fd4f78a897bd Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Thu, 14 Nov 2024 20:10:38 -0800
Subject: [PATCH 0676/1072] Add support for converting polars decimal values to
 nushell values (#14343)

Adds support for converting from polars decimal type to nushell values.

This fix works by first converting a polars decimal series to an f64
series, then converting to Value::Float

Co-authored-by: Jack Wright <jack.wright@nike.com>
---
 .../src/dataframe/values/nu_dataframe/conversion.rs  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
index a920aac0a3..c2d64741f4 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
@@ -1201,6 +1201,18 @@ fn series_to_values(
 
             Ok(values)
         }
+        DataType::Decimal(_precision, _scale) => {
+            let casted = series
+                .cast(&DataType::Float64)
+                .map_err(|e| ShellError::GenericError {
+                    error: "Errors casting decimal column to float".into(),
+                    msg: "".into(),
+                    span: None,
+                    help: Some(e.to_string()),
+                    inner: vec![],
+                })?;
+            series_to_values(&casted, maybe_from_row, maybe_size, span)
+        }
         e => Err(ShellError::GenericError {
             error: "Error creating Dataframe".into(),
             msg: "".to_string(),

From 8c1ab7e0a3b803279e09c93c70a02e3636e0146b Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Thu, 14 Nov 2024 23:27:26 -0500
Subject: [PATCH 0677/1072] Add proper config defaults for hooks (#14341)

# Release Notes Excerpt

* Hooks now default to an empty value of the proper type (e.g., `[]` or
`{}`) when not otherwise specified

# Description

```nushell
# Start with no config
nu -n
# Populate with defaults
$env.config = {}
$env.config.hooks
```

* Before: All hooks other than `display_output` were set to `null`.
Attempting to append a hook using `++=` would fail unless it had already
been assigned.
* After:
* `pre_prompt`, `pre_execution`, and `command_not_found` are set to
empty lists. This allows the user to simply append new hooks using
`++=`.
* `env_change` is set to an empty record. This allows the user to add
new hooks using `merge`, although a "helper" command would still be
useful (TODO: stdlib).

Also fixed a typo in an error message.

# User-Facing Changes

There shouldn't be any breaking changes since (before) there were no
guarantees of the hook's value/type. Previously, users would have to
check for `null` and `default` to an empty list before appending. Any
user-strategies for dealing with the problem should continue to work
after this change.

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

Note that, for reasons I cannot ascertain, this PR appears to have
*fixed* the `command_not_found_error_recognizes_non_executable_file`
test that was previously broken by #12953. That PR essentially rewrote
the test to match the new behavior, but it no longer tested what it was
intended to test.

Now, the test is working again as designed (and as it works in the
REPL).

# After Submitting

This will be covered in the Configuration update for #14249. This PR
will simplify several examples in the doc.
---
 crates/nu-command/src/system/run_external.rs | 2 +-
 crates/nu-protocol/src/config/hooks.rs       | 9 +++++----
 tests/shell/pipeline/commands/external.rs    | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index 013d3d8374..32543716f1 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -484,7 +484,7 @@ pub fn command_not_found(
     if Path::new(name).is_file() {
         return ShellError::ExternalCommand {
                         label: format!("Command `{name}` not found"),
-                        help: format!("`{name}` refers to a file that is not executable. Did you forget to to set execute permissions?"),
+                        help: format!("`{name}` refers to a file that is not executable. Did you forget to set execute permissions?"),
                         span,
                     };
     }
diff --git a/crates/nu-protocol/src/config/hooks.rs b/crates/nu-protocol/src/config/hooks.rs
index 9b9860a87d..374b3818d6 100644
--- a/crates/nu-protocol/src/config/hooks.rs
+++ b/crates/nu-protocol/src/config/hooks.rs
@@ -1,5 +1,6 @@
 use super::prelude::*;
 use crate as nu_protocol;
+use crate::Record;
 
 /// Definition of a parsed hook from the config object
 #[derive(Clone, Debug, IntoValue, PartialEq, Serialize, Deserialize)]
@@ -14,14 +15,14 @@ pub struct Hooks {
 impl Hooks {
     pub fn new() -> Self {
         Self {
-            pre_prompt: None,
-            pre_execution: None,
-            env_change: None,
+            pre_prompt: Some(Value::list(vec![], Span::unknown())),
+            pre_execution: Some(Value::list(vec![], Span::unknown())),
+            env_change: Some(Value::record(Record::default(), Span::unknown())),
             display_output: Some(Value::string(
                 "if (term size).columns >= 100 { table -e } else { table }",
                 Span::unknown(),
             )),
-            command_not_found: None,
+            command_not_found: Some(Value::list(vec![], Span::unknown())),
         }
     }
 }
diff --git a/tests/shell/pipeline/commands/external.rs b/tests/shell/pipeline/commands/external.rs
index 207a94766b..172ac8cbfc 100644
--- a/tests/shell/pipeline/commands/external.rs
+++ b/tests/shell/pipeline/commands/external.rs
@@ -131,9 +131,9 @@ fn command_not_found_error_suggests_typo_fix() {
 #[test]
 fn command_not_found_error_recognizes_non_executable_file() {
     let actual = nu!("./Cargo.toml");
-    assert!(actual
-        .err
-        .contains("is neither a Nushell built-in or a known external command"));
+    assert!(actual.err.contains(
+        "refers to a file that is not executable. Did you forget to set execute permissions?"
+    ));
 }
 
 #[test]

From f7832c0e822a3db7546b2ddb9b6ebb952954338b Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Fri, 15 Nov 2024 06:39:42 -0600
Subject: [PATCH 0678/1072] allow nuscripts to be run again on windows with
 assoc/ftype (#14318)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

This PR tries to correct the problem of nushell scripts being made
executable on Windows systems. In order to do this, these steps need to
take place.
1. `assoc .nu=nuscript`
2. `ftype nuscript=C:\path\to\nu.exe '%1' %*`
3. modify the env var PATHEXT by appending `;.NU` at the end
 
Once those steps are done and this PR is landed, one should be able to
create a script such as this.
```nushell
❯ open im_exe.nu
def main [arg] {
  print $"Hello ($arg)!"
}
```
Then they should be able to do this to run the nushell script.
```nushell
❯ im_exe Nushell
Hello Nushell!
```

Under-the-hood, nushell is shelling out to cmd.exe in order to run the
nushell script.

# User-Facing Changes
closes #13020

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/system/run_external.rs | 31 ++++++++++++++++++--
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index 32543716f1..67b848915d 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -51,7 +51,6 @@ impl Command for External {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let cwd = engine_state.cwd(Some(stack))?;
-
         let name: Value = call.req(engine_state, stack, 0)?;
 
         let name_str: Cow<str> = match &name {
@@ -68,10 +67,36 @@ impl Command for External {
             _ => Path::new(&*name_str).to_owned(),
         };
 
+        // On Windows, the user could have run the cmd.exe built-in "assoc" command
+        // Example: "assoc .nu=nuscript" and then run the cmd.exe built-in "ftype" command
+        // Example: "ftype nuscript=C:\path\to\nu.exe '%1' %*" and then added the nushell
+        // script extension ".NU" to the PATHEXT environment variable. In this case, we use
+        // the which command, which will find the executable with or without the extension.
+        // If it "which" returns true, that means that we've found the nushell script and we
+        // believe the user wants to use the windows association to run the script. The only
+        // easy way to do this is to run cmd.exe with the script as an argument.
+        let potential_nuscript_in_windows = if cfg!(windows) {
+            // let's make sure it's a .nu scrtipt
+            if let Some(executable) = which(&expanded_name, "", cwd.as_ref()) {
+                let ext = executable
+                    .extension()
+                    .unwrap_or_default()
+                    .to_string_lossy()
+                    .to_uppercase();
+                ext == "NU"
+            } else {
+                false
+            }
+        } else {
+            false
+        };
+
         // Find the absolute path to the executable. On Windows, set the
         // executable to "cmd.exe" if it's a CMD internal command. If the
         // command is not found, display a helpful error message.
-        let executable = if cfg!(windows) && is_cmd_internal_command(&name_str) {
+        let executable = if cfg!(windows)
+            && (is_cmd_internal_command(&name_str) || potential_nuscript_in_windows)
+        {
             PathBuf::from("cmd.exe")
         } else {
             // Determine the PATH to be used and then use `which` to find it - though this has no
@@ -97,7 +122,7 @@ impl Command for External {
         // Configure args.
         let args = eval_arguments_from_call(engine_state, stack, call)?;
         #[cfg(windows)]
-        if is_cmd_internal_command(&name_str) {
+        if is_cmd_internal_command(&name_str) || potential_nuscript_in_windows {
             use std::os::windows::process::CommandExt;
 
             // The /D flag disables execution of AutoRun commands from registry.

From b6e84879b6506c1a1f4ac0b900b36c90da489d7a Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Fri, 15 Nov 2024 15:40:49 +0300
Subject: [PATCH 0679/1072] add multiple grouper support to `group-by` (#14337)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- closes #14330

Related:
- #2607
- #14019
- #14316

# Description
This PR changes `group-by` to support grouping by multiple `grouper`
arguments.

# Changes

- No grouper: no change in behavior
- Single grouper
  - `--to-table=false`: no change in behavior
  - `--to-table=true`:
    - closure grouper: named group0
    - cell-path grouper: named after the cell-path
- Multiple groupers:
  - `--to-table=false`: nested groups
- `--to-table=true`: one column for each grouper argument, followed by
the `items` column
    - columns corresponding to cell-paths are named after them
- columns corresponding to closure groupers are named `group{i}` where
`i` is the index of the grouper argument

# Examples
```nushell
> [1 3 1 3 2 1 1] | group-by
╭───┬───────────╮
│   │ ╭───┬───╮ │
│ 1 │ │ 0 │ 1 │ │
│   │ │ 1 │ 1 │ │
│   │ │ 2 │ 1 │ │
│   │ │ 3 │ 1 │ │
│   │ ╰───┴───╯ │
│   │ ╭───┬───╮ │
│ 3 │ │ 0 │ 3 │ │
│   │ │ 1 │ 3 │ │
│   │ ╰───┴───╯ │
│   │ ╭───┬───╮ │
│ 2 │ │ 0 │ 2 │ │
│   │ ╰───┴───╯ │
╰───┴───────────╯

> [1 3 1 3 2 1 1] | group-by --to-table
╭─#─┬─group─┬───items───╮
│ 0 │ 1     │ ╭───┬───╮ │
│   │       │ │ 0 │ 1 │ │
│   │       │ │ 1 │ 1 │ │
│   │       │ │ 2 │ 1 │ │
│   │       │ │ 3 │ 1 │ │
│   │       │ ╰───┴───╯ │
│ 1 │ 3     │ ╭───┬───╮ │
│   │       │ │ 0 │ 3 │ │
│   │       │ │ 1 │ 3 │ │
│   │       │ ╰───┴───╯ │
│ 2 │ 2     │ ╭───┬───╮ │
│   │       │ │ 0 │ 2 │ │
│   │       │ ╰───┴───╯ │
╰─#─┴─group─┴───items───╯

> [1 3 1 3 2 1 1] | group-by { $in >= 2 }
╭───────┬───────────╮
│       │ ╭───┬───╮ │
│ false │ │ 0 │ 1 │ │
│       │ │ 1 │ 1 │ │
│       │ │ 2 │ 1 │ │
│       │ │ 3 │ 1 │ │
│       │ ╰───┴───╯ │
│       │ ╭───┬───╮ │
│ true  │ │ 0 │ 3 │ │
│       │ │ 1 │ 3 │ │
│       │ │ 2 │ 2 │ │
│       │ ╰───┴───╯ │
╰───────┴───────────╯

> [1 3 1 3 2 1 1] | group-by { $in >= 2 } --to-table
╭─#─┬─group0─┬───items───╮
│ 0 │ false  │ ╭───┬───╮ │
│   │        │ │ 0 │ 1 │ │
│   │        │ │ 1 │ 1 │ │
│   │        │ │ 2 │ 1 │ │
│   │        │ │ 3 │ 1 │ │
│   │        │ ╰───┴───╯ │
│ 1 │ true   │ ╭───┬───╮ │
│   │        │ │ 0 │ 3 │ │
│   │        │ │ 1 │ 3 │ │
│   │        │ │ 2 │ 2 │ │
│   │        │ ╰───┴───╯ │
╰─#─┴─group0─┴───items───╯
```

```nushell
let data = [
    [name, lang, year];
    [andres, rb, "2019"],
    [jt, rs, "2019"],
    [storm, rs, "2021"]
]

> $data
╭─#─┬──name──┬─lang─┬─year─╮
│ 0 │ andres │ rb   │ 2019 │
│ 1 │ jt     │ rs   │ 2019 │
│ 2 │ storm  │ rs   │ 2021 │
╰─#─┴──name──┴─lang─┴─year─╯
```

```nushell
> $data | group-by lang
╭────┬──────────────────────────────╮
│    │ ╭─#─┬──name──┬─lang─┬─year─╮ │
│ rb │ │ 0 │ andres │ rb   │ 2019 │ │
│    │ ╰─#─┴──name──┴─lang─┴─year─╯ │
│    │ ╭─#─┬─name──┬─lang─┬─year─╮  │
│ rs │ │ 0 │ jt    │ rs   │ 2019 │  │
│    │ │ 1 │ storm │ rs   │ 2021 │  │
│    │ ╰─#─┴─name──┴─lang─┴─year─╯  │
╰────┴──────────────────────────────╯
```

Group column is now named after the grouper, to allow multiple groupers.
```nushell
> $data | group-by lang --to-table  # column names changed!
╭─#─┬─lang─┬────────────items─────────────╮
│ 0 │ rb   │ ╭─#─┬──name──┬─lang─┬─year─╮ │
│   │      │ │ 0 │ andres │ rb   │ 2019 │ │
│   │      │ ╰─#─┴──name──┴─lang─┴─year─╯ │
│ 1 │ rs   │ ╭─#─┬─name──┬─lang─┬─year─╮  │
│   │      │ │ 0 │ jt    │ rs   │ 2019 │  │
│   │      │ │ 1 │ storm │ rs   │ 2021 │  │
│   │      │ ╰─#─┴─name──┴─lang─┴─year─╯  │
╰─#─┴─lang─┴────────────items─────────────╯
```

Grouping by multiple columns makes finer grained aggregations possible.
```nushell
> $data | group-by lang year --to-table
╭─#─┬─lang─┬─year─┬────────────items─────────────╮
│ 0 │ rb   │ 2019 │ ╭─#─┬──name──┬─lang─┬─year─╮ │
│   │      │      │ │ 0 │ andres │ rb   │ 2019 │ │
│   │      │      │ ╰─#─┴──name──┴─lang─┴─year─╯ │
│ 1 │ rs   │ 2019 │ ╭─#─┬─name─┬─lang─┬─year─╮   │
│   │      │      │ │ 0 │ jt   │ rs   │ 2019 │   │
│   │      │      │ ╰─#─┴─name─┴─lang─┴─year─╯   │
│ 2 │ rs   │ 2021 │ ╭─#─┬─name──┬─lang─┬─year─╮  │
│   │      │      │ │ 0 │ storm │ rs   │ 2021 │  │
│   │      │      │ ╰─#─┴─name──┴─lang─┴─year─╯  │
╰─#─┴─lang─┴─year─┴────────────items─────────────╯
```

Grouping by multiple columns, without `--to-table` returns a nested
structure.
This is equivalent to `$data | group-by year | split-by lang`, making
`split-by` obsolete.
```nushell
> $data | group-by lang year
╭────┬─────────────────────────────────────────╮
│    │ ╭──────┬──────────────────────────────╮ │
│ rb │ │      │ ╭─#─┬──name──┬─lang─┬─year─╮ │ │
│    │ │ 2019 │ │ 0 │ andres │ rb   │ 2019 │ │ │
│    │ │      │ ╰─#─┴──name──┴─lang─┴─year─╯ │ │
│    │ ╰──────┴──────────────────────────────╯ │
│    │ ╭──────┬─────────────────────────────╮  │
│ rs │ │      │ ╭─#─┬─name─┬─lang─┬─year─╮  │  │
│    │ │ 2019 │ │ 0 │ jt   │ rs   │ 2019 │  │  │
│    │ │      │ ╰─#─┴─name─┴─lang─┴─year─╯  │  │
│    │ │      │ ╭─#─┬─name──┬─lang─┬─year─╮ │  │
│    │ │ 2021 │ │ 0 │ storm │ rs   │ 2021 │ │  │
│    │ │      │ ╰─#─┴─name──┴─lang─┴─year─╯ │  │
│    │ ╰──────┴─────────────────────────────╯  │
╰────┴─────────────────────────────────────────╯
```

From #2607:
> Here's a couple more examples without much explanation. This one shows
adding two grouping keys. I'm always wanting to add more columns when
using group-by and it just-work:tm: `gb.exe -f movies-2.csv -k 3,2 -s 7
--skip_header`
>
> ```
>  k:3                   | k:2       | count | sum:7
> -----------------------+-----------+-------+--------------------
>  20th Century Fox      | Drama     | 1     | 117.09
>  20th Century Fox      | Romance   | 1     | 39.66
>  CBS                   | Comedy    | 1     | 77.09
>  Disney                | Animation | 4     | 1264.23
>  Disney                | Comedy    | 4     | 950.27
>  Fox                   | Comedy    | 5     | 661.85
>  Independent           | Comedy    | 7     | 399.07
>  Independent           | Drama     | 4     | 69.75
>  Independent           | Romance   | 7     | 1048.75
>  Independent           | romance   | 1     | 29.37
> ...
> ```

This example can be achieved like this:
```nushell
> open movies-2.csv
  | group-by "Lead Studio" Genre --to-table
  | insert count {get items | length}
  | insert sum { get items."Worldwide Gross" | math sum}
  | reject items
  | sort-by "Lead Studio" Genre
╭─#──┬──────Lead Studio──────┬───Genre───┬─count─┬───sum───╮
│ 0  │ 20th Century Fox      │ Drama     │     1 │  117.09 │
│ 1  │ 20th Century Fox      │ Romance   │     1 │   39.66 │
│ 2  │ CBS                   │ Comedy    │     1 │   77.09 │
│ 3  │ Disney                │ Animation │     4 │ 1264.23 │
│ 4  │ Disney                │ Comedy    │     4 │  950.27 │
│ 5  │ Fox                   │ Comedy    │     5 │  661.85 │
│ 6  │ Fox                   │ comedy    │     1 │   60.72 │
│ 7  │ Independent           │ Comedy    │     7 │  399.07 │
│ 8  │ Independent           │ Drama     │     4 │   69.75 │
│ 9  │ Independent           │ Romance   │     7 │ 1048.75 │
│ 10 │ Independent           │ romance   │     1 │   29.37 │
...
```
---
 crates/nu-command/src/filters/group_by.rs | 284 +++++++++++++++++-----
 crates/nu-std/testing.nu                  |   2 +-
 2 files changed, 226 insertions(+), 60 deletions(-)

diff --git a/crates/nu-command/src/filters/group_by.rs b/crates/nu-command/src/filters/group_by.rs
index 74a19c38e3..9396de4781 100644
--- a/crates/nu-command/src/filters/group_by.rs
+++ b/crates/nu-command/src/filters/group_by.rs
@@ -1,6 +1,6 @@
 use indexmap::IndexMap;
 use nu_engine::{command_prelude::*, ClosureEval};
-use nu_protocol::engine::Closure;
+use nu_protocol::{engine::Closure, IntoValue};
 
 #[derive(Clone)]
 pub struct GroupBy;
@@ -22,7 +22,7 @@ impl Command for GroupBy {
                 "Return a table with \"groups\" and \"items\" columns",
                 None,
             )
-            .optional(
+            .rest(
                 "grouper",
                 SyntaxShape::OneOf(vec![
                     SyntaxShape::CellPath,
@@ -135,7 +135,89 @@ impl Command for GroupBy {
                         Value::test_string("false"),
                     ]),
                 })),
-            }
+            },
+            Example {
+                description: "Group items by multiple columns' values",
+                example: r#"[
+        [name, lang, year];
+        [andres, rb, "2019"],
+        [jt, rs, "2019"],
+        [storm, rs, "2021"]
+    ]
+    | group-by lang year"#,
+                result: Some(Value::test_record(record! {
+                    "rb" => Value::test_record(record! {
+                        "2019" => Value::test_list(
+                            vec![Value::test_record(record! {
+                                    "name" => Value::test_string("andres"),
+                                    "lang" => Value::test_string("rb"),
+                                    "year" => Value::test_string("2019"),
+                            })],
+                        ),
+                    }),
+                    "rs" => Value::test_record(record! {
+                            "2019" => Value::test_list(
+                                vec![Value::test_record(record! {
+                                        "name" => Value::test_string("jt"),
+                                        "lang" => Value::test_string("rs"),
+                                        "year" => Value::test_string("2019"),
+                                })],
+                            ),
+                            "2021" => Value::test_list(
+                                vec![Value::test_record(record! {
+                                        "name" => Value::test_string("storm"),
+                                        "lang" => Value::test_string("rs"),
+                                        "year" => Value::test_string("2021"),
+                                })],
+                            ),
+                    }),
+                }))
+            },
+            Example {
+                description: "Group items by multiple columns' values",
+                example: r#"[
+        [name, lang, year];
+        [andres, rb, "2019"],
+        [jt, rs, "2019"],
+        [storm, rs, "2021"]
+    ]
+    | group-by lang year --to-table"#,
+                result: Some(Value::test_list(vec![
+                    Value::test_record(record! {
+                        "lang" => Value::test_string("rb"),
+                        "year" => Value::test_string("2019"),
+                        "items" => Value::test_list(vec![
+                            Value::test_record(record! {
+                                "name" => Value::test_string("andres"),
+                                "lang" => Value::test_string("rb"),
+                                "year" => Value::test_string("2019"),
+                            })
+                        ]),
+                    }),
+                    Value::test_record(record! {
+                        "lang" => Value::test_string("rs"),
+                        "year" => Value::test_string("2019"),
+                        "items" => Value::test_list(vec![
+                            Value::test_record(record! {
+                                "name" => Value::test_string("jt"),
+                                "lang" => Value::test_string("rs"),
+                                "year" => Value::test_string("2019"),
+                            })
+                        ]),
+                    }),
+                    Value::test_record(record! {
+                        "lang" => Value::test_string("rs"),
+                        "year" => Value::test_string("2021"),
+                        "items" => Value::test_list(vec![
+                            Value::test_record(record! {
+                                "name" => Value::test_string("storm"),
+                                "lang" => Value::test_string("rs"),
+                                "year" => Value::test_string("2021"),
+                            })
+                        ]),
+                    }),
+                ]))
+            },
         ]
     }
 }
@@ -147,7 +229,7 @@ pub fn group_by(
     input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
     let head = call.head;
-    let grouper: Option<Value> = call.opt(engine_state, stack, 0)?;
+    let groupers: Vec<Value> = call.rest(engine_state, stack, 0)?;
     let to_table = call.has_flag(engine_state, stack, "to-table")?;
     let config = engine_state.get_config();
 
@@ -156,29 +238,22 @@ pub fn group_by(
         return Ok(Value::record(Record::new(), head).into_pipeline_data());
     }
 
-    let groups = match grouper {
-        Some(grouper) => {
-            let span = grouper.span();
-            match grouper {
-                Value::CellPath { val, .. } => group_cell_path(val, values, config)?,
-                Value::Closure { val, .. } => {
-                    group_closure(values, span, *val, engine_state, stack)?
-                }
-                _ => {
-                    return Err(ShellError::TypeMismatch {
-                        err_message: "unsupported grouper type".to_string(),
-                        span,
-                    })
-                }
-            }
+    let mut groupers = groupers.into_iter();
+
+    let grouped = if let Some(grouper) = groupers.next() {
+        let mut groups = Grouped::new(&grouper, values, config, engine_state, stack)?;
+        for grouper in groupers {
+            groups.subgroup(&grouper, config, engine_state, stack)?;
         }
-        None => group_no_grouper(values, config)?,
+        groups
+    } else {
+        Grouped::empty(values, config)
     };
 
     let value = if to_table {
-        groups_to_table(groups, head)
+        grouped.into_table(head)
     } else {
-        groups_to_record(groups, head)
+        grouped.into_record(head)
     };
 
     Ok(value.into_pipeline_data())
@@ -207,20 +282,6 @@ fn group_cell_path(
     Ok(groups)
 }
 
-fn group_no_grouper(
-    values: Vec<Value>,
-    config: &nu_protocol::Config,
-) -> Result<IndexMap<String, Vec<Value>>, ShellError> {
-    let mut groups = IndexMap::<_, Vec<_>>::new();
-
-    for value in values.into_iter() {
-        let key = value.to_abbreviated_string(config);
-        groups.entry(key).or_default().push(value);
-    }
-
-    Ok(groups)
-}
-
 fn group_closure(
     values: Vec<Value>,
     span: Span,
@@ -244,32 +305,137 @@ fn group_closure(
     Ok(groups)
 }
 
-fn groups_to_record(groups: IndexMap<String, Vec<Value>>, span: Span) -> Value {
-    Value::record(
-        groups
-            .into_iter()
-            .map(|(k, v)| (k, Value::list(v, span)))
-            .collect(),
-        span,
-    )
+struct Grouped {
+    grouper: Option<String>,
+    groups: Tree,
 }
 
-fn groups_to_table(groups: IndexMap<String, Vec<Value>>, span: Span) -> Value {
-    Value::list(
-        groups
-            .into_iter()
-            .map(|(group, items)| {
-                Value::record(
-                    record! {
-                        "group" => Value::string(group, span),
-                        "items" => Value::list(items, span),
-                    },
+enum Tree {
+    Leaf(IndexMap<String, Vec<Value>>),
+    Branch(IndexMap<String, Grouped>),
+}
+
+impl Grouped {
+    fn empty(values: Vec<Value>, config: &nu_protocol::Config) -> Self {
+        let mut groups = IndexMap::<_, Vec<_>>::new();
+
+        for value in values.into_iter() {
+            let key = value.to_abbreviated_string(config);
+            groups.entry(key).or_default().push(value);
+        }
+
+        Self {
+            grouper: Some("group".into()),
+            groups: Tree::Leaf(groups),
+        }
+    }
+
+    fn new(
+        grouper: &Value,
+        values: Vec<Value>,
+        config: &nu_protocol::Config,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+    ) -> Result<Self, ShellError> {
+        let span = grouper.span();
+        let groups = match grouper {
+            Value::CellPath { val, .. } => group_cell_path(val.clone(), values, config)?,
+            Value::Closure { val, .. } => {
+                group_closure(values, span, Closure::clone(val), engine_state, stack)?
+            }
+            _ => {
+                return Err(ShellError::TypeMismatch {
+                    err_message: "unsupported grouper type".to_string(),
                     span,
-                )
-            })
-            .collect(),
-        span,
-    )
+                })
+            }
+        };
+        let grouper = grouper.as_cell_path().ok().map(CellPath::to_column_name);
+        Ok(Self {
+            grouper,
+            groups: Tree::Leaf(groups),
+        })
+    }
+
+    fn subgroup(
+        &mut self,
+        grouper: &Value,
+        config: &nu_protocol::Config,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+    ) -> Result<(), ShellError> {
+        let groups = match &mut self.groups {
+            Tree::Leaf(groups) => std::mem::take(groups)
+                .into_iter()
+                .map(|(key, values)| -> Result<_, ShellError> {
+                    let leaf = Self::new(grouper, values, config, engine_state, stack)?;
+                    Ok((key, leaf))
+                })
+                .collect::<Result<IndexMap<_, _>, ShellError>>()?,
+            Tree::Branch(nested_groups) => {
+                let mut nested_groups = std::mem::take(nested_groups);
+                for v in nested_groups.values_mut() {
+                    v.subgroup(grouper, config, engine_state, stack)?;
+                }
+                nested_groups
+            }
+        };
+        self.groups = Tree::Branch(groups);
+        Ok(())
+    }
+
+    fn into_table(self, head: Span) -> Value {
+        self._into_table(head, 0)
+            .into_iter()
+            .map(|row| row.into_iter().rev().collect::<Record>().into_value(head))
+            .collect::<Vec<_>>()
+            .into_value(head)
+    }
+
+    fn _into_table(self, head: Span, index: usize) -> Vec<Record> {
+        let grouper = self.grouper.unwrap_or_else(|| format!("group{index}"));
+        match self.groups {
+            Tree::Leaf(leaf) => leaf
+                .into_iter()
+                .map(|(group, values)| {
+                    [
+                        ("items".to_string(), values.into_value(head)),
+                        (grouper.clone(), group.into_value(head)),
+                    ]
+                    .into_iter()
+                    .collect()
+                })
+                .collect::<Vec<Record>>(),
+            Tree::Branch(branch) => branch
+                .into_iter()
+                .flat_map(|(group, items)| {
+                    let mut inner = items._into_table(head, index + 1);
+                    for row in &mut inner {
+                        row.insert(grouper.clone(), group.clone().into_value(head));
+                    }
+                    inner
+                })
+                .collect(),
+        }
+    }
+
+    fn into_record(self, head: Span) -> Value {
+        match self.groups {
+            Tree::Leaf(leaf) => Value::record(
+                leaf.into_iter()
+                    .map(|(k, v)| (k, v.into_value(head)))
+                    .collect(),
+                head,
+            ),
+            Tree::Branch(branch) => {
+                let values = branch
+                    .into_iter()
+                    .map(|(k, v)| (k, v.into_record(head)))
+                    .collect();
+                Value::record(values, head)
+            }
+        }
+    }
 }
 
 #[cfg(test)]
diff --git a/crates/nu-std/testing.nu b/crates/nu-std/testing.nu
index 003e1d1ebc..7052983a21 100644
--- a/crates/nu-std/testing.nu
+++ b/crates/nu-std/testing.nu
@@ -79,7 +79,7 @@ def create-test-record [] nothing -> record<before-each: string, after-each: str
         | group-by --to-table annotation
         | update items {|x|
             $x.items.function_name
-            | if $x.group in ["test", "test-skip"] {
+            | if $x.annotation in ["test", "test-skip"] {
                 $in
             } else {
                 get 0

From 7bd801a167b2ceee87f9a1516dff61ad0ebe2a8a Mon Sep 17 00:00:00 2001
From: Ben Beasley <code@musicinmybrain.net>
Date: Fri, 15 Nov 2024 13:18:01 -0500
Subject: [PATCH 0680/1072] Update rstest from 0.18 to 0.23 (the current
 version) (#14350)

---
 Cargo.lock | 92 +++++++++++++++++++++++++++---------------------------
 Cargo.toml |  2 +-
 2 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7343d3c043..2754f5bd23 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -275,7 +275,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -286,7 +286,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -383,7 +383,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -466,7 +466,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
  "syn_derive",
 ]
 
@@ -570,7 +570,7 @@ checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -803,7 +803,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1108,7 +1108,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
 dependencies = [
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1195,7 +1195,7 @@ checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1206,7 +1206,7 @@ checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1388,7 +1388,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1680,7 +1680,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1942,7 +1942,7 @@ dependencies = [
  "markup5ever 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1956,7 +1956,7 @@ dependencies = [
  "markup5ever 0.14.0",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2726,7 +2726,7 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3248,7 +3248,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3954,7 +3954,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -4136,7 +4136,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -4210,7 +4210,7 @@ dependencies = [
  "phf_shared 0.11.2",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -5147,7 +5147,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76009fbe0614077fc1a2ce255e3a1881a2e3a3527097d5dc6d8212c585e7e38b"
 dependencies = [
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -5216,7 +5216,7 @@ checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -5352,9 +5352,9 @@ checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f"
 
 [[package]]
 name = "rstest"
-version = "0.18.2"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97eeab2f3c0a199bc4be135c36c924b6590b88c377d416494288c14f2db30199"
+checksum = "0a2c585be59b6b5dd66a9d2084aa1d8bd52fbdb806eafdeffb52791147862035"
 dependencies = [
  "rstest_macros",
  "rustc_version",
@@ -5362,9 +5362,9 @@ dependencies = [
 
 [[package]]
 name = "rstest_macros"
-version = "0.18.2"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d428f8247852f894ee1be110b375111b586d4fa431f6c46e64ba5a0dcccbe605"
+checksum = "825ea780781b15345a146be27eaefb05085e337e869bff01b4306a4fd4a9ad5a"
 dependencies = [
  "cfg-if",
  "glob",
@@ -5373,7 +5373,7 @@ dependencies = [
  "regex",
  "relative-path",
  "rustc_version",
- "syn 2.0.75",
+ "syn 2.0.87",
  "unicode-ident",
 ]
 
@@ -5412,7 +5412,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rust-embed-utils",
- "syn 2.0.75",
+ "syn 2.0.87",
  "walkdir",
 ]
 
@@ -5467,9 +5467,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustc_version"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
  "semver",
 ]
@@ -5570,7 +5570,7 @@ checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -5650,7 +5650,7 @@ checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -5674,7 +5674,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -5733,7 +5733,7 @@ checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -5910,7 +5910,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d904e7009df136af5297832a3ace3370cd14ff1546a232f4f185036c2736fcac"
 dependencies = [
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -6025,7 +6025,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -6093,9 +6093,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.75"
+version = "2.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6111,7 +6111,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -6271,7 +6271,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -6547,7 +6547,7 @@ checksum = "70b20a22c42c8f1cd23ce5e34f165d4d37038f5b663ad20fb6adbdf029172483"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -6579,9 +6579,9 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unicode-linebreak"
@@ -6925,7 +6925,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
  "wasm-bindgen-shared",
 ]
 
@@ -6947,7 +6947,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -7157,7 +7157,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -7168,7 +7168,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -7513,7 +7513,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.87",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index e7318fa006..a976aeec17 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -143,7 +143,7 @@ rmp = "0.8"
 rmp-serde = "1.3"
 ropey = "1.6.1"
 roxmltree = "0.19"
-rstest = { version = "0.18", default-features = false }
+rstest = { version = "0.23", default-features = false }
 rusqlite = "0.31"
 rust-embed = "8.5.0"
 serde = { version = "1.0" }

From 455d32d9e5512096b27c167ca57bd53dc4faf2b9 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Fri, 15 Nov 2024 19:24:39 +0100
Subject: [PATCH 0681/1072] Cut down unnecessary lint allows (#14335)

Trying to reduce lint allows either by checking if they are former false
positives or by fixing the underlying warning.

- **Remove dead `allow(dead_code)`**
- **Remove recursive dead code**
- **Remove dead code**
- **Move test only functions to test module**
  The unit tests that use them, themselves are somewhat sus in that they
mock the usage and not test specificly used methods of the
implementation, so there is a risk for divergence
- **Remove `clippy::uninit_vec` allow.**
  May have been a false positive, or the impl has changed somewhat.
We certainly want to look at the unsafe code here to vet for
correctness.
---
 crates/nu-cli/src/prompt_update.rs           |  9 ---
 crates/nu-cli/src/reedline_config.rs         |  4 --
 crates/nu-command/src/progress_bar.rs        |  5 --
 crates/nu-command/src/strings/guess_width.rs | 65 ++++++++++----------
 crates/nu-system/src/windows.rs              |  2 -
 5 files changed, 31 insertions(+), 54 deletions(-)

diff --git a/crates/nu-cli/src/prompt_update.rs b/crates/nu-cli/src/prompt_update.rs
index 95280af828..63dd9ce19d 100644
--- a/crates/nu-cli/src/prompt_update.rs
+++ b/crates/nu-cli/src/prompt_update.rs
@@ -30,30 +30,21 @@ pub(crate) const TRANSIENT_PROMPT_MULTILINE_INDICATOR: &str =
 pub(crate) const PRE_PROMPT_MARKER: &str = "\x1b]133;A\x1b\\";
 pub(crate) const POST_PROMPT_MARKER: &str = "\x1b]133;B\x1b\\";
 pub(crate) const PRE_EXECUTION_MARKER: &str = "\x1b]133;C\x1b\\";
-#[allow(dead_code)]
 pub(crate) const POST_EXECUTION_MARKER_PREFIX: &str = "\x1b]133;D;";
-#[allow(dead_code)]
 pub(crate) const POST_EXECUTION_MARKER_SUFFIX: &str = "\x1b\\";
 
 // OSC633 is the same as OSC133 but specifically for VSCode
 pub(crate) const VSCODE_PRE_PROMPT_MARKER: &str = "\x1b]633;A\x1b\\";
 pub(crate) const VSCODE_POST_PROMPT_MARKER: &str = "\x1b]633;B\x1b\\";
-#[allow(dead_code)]
 pub(crate) const VSCODE_PRE_EXECUTION_MARKER: &str = "\x1b]633;C\x1b\\";
-#[allow(dead_code)]
 //"\x1b]633;D;{}\x1b\\"
 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)]
 //"\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=";
-#[allow(dead_code)]
 pub(crate) const VSCODE_CWD_PROPERTY_MARKER_SUFFIX: &str = "\x1b\\";
 
 pub(crate) const RESET_APPLICATION_MODE: &str = "\x1b[?1l";
diff --git a/crates/nu-cli/src/reedline_config.rs b/crates/nu-cli/src/reedline_config.rs
index 4c1594389e..4012876ac0 100644
--- a/crates/nu-cli/src/reedline_config.rs
+++ b/crates/nu-cli/src/reedline_config.rs
@@ -711,7 +711,6 @@ pub(crate) fn create_keybindings(config: &Config) -> Result<KeybindingsMode, She
     }
     for keybinding in parsed_keybindings {
         add_keybinding(
-            &keybinding.name,
             &keybinding.mode,
             keybinding,
             config,
@@ -730,9 +729,7 @@ pub(crate) fn create_keybindings(config: &Config) -> Result<KeybindingsMode, She
     }
 }
 
-#[allow(clippy::only_used_in_recursion)]
 fn add_keybinding(
-    name: &Option<Value>,
     mode: &Value,
     keybinding: &ParsedKeybinding,
     config: &Config,
@@ -755,7 +752,6 @@ fn add_keybinding(
         Value::List { vals, .. } => {
             for inner_mode in vals {
                 add_keybinding(
-                    name,
                     inner_mode,
                     keybinding,
                     config,
diff --git a/crates/nu-command/src/progress_bar.rs b/crates/nu-command/src/progress_bar.rs
index db4d4e23b1..b700c1e2d9 100644
--- a/crates/nu-command/src/progress_bar.rs
+++ b/crates/nu-command/src/progress_bar.rs
@@ -45,11 +45,6 @@ impl NuProgressBar {
         self.pb.set_position(bytes_processed);
     }
 
-    #[allow(dead_code)]
-    pub fn finished_msg(&self, msg: String) {
-        self.pb.finish_with_message(msg);
-    }
-
     pub fn abandoned_msg(&self, msg: String) {
         self.pb.abandon_with_message(msg);
     }
diff --git a/crates/nu-command/src/strings/guess_width.rs b/crates/nu-command/src/strings/guess_width.rs
index 59d666dd02..2eefb7d3f0 100644
--- a/crates/nu-command/src/strings/guess_width.rs
+++ b/crates/nu-command/src/strings/guess_width.rs
@@ -291,42 +291,39 @@ fn positions_helper(blanks: &[usize], min_lines: usize) -> Vec<usize> {
     pos
 }
 
-// to_rows returns rows separated by columns.
-#[allow(dead_code)]
-fn to_rows(lines: Vec<String>, pos: Vec<usize>, trim_space: bool) -> Vec<Vec<String>> {
-    let mut rows: Vec<Vec<String>> = Vec::with_capacity(lines.len());
-    for line in lines {
-        let columns = split(&line, &pos, trim_space);
-        rows.push(columns);
-    }
-    rows
-}
-
-// to_table parses a slice of lines and returns a table.
-#[allow(dead_code)]
-pub fn to_table(lines: Vec<String>, header: usize, trim_space: bool) -> Vec<Vec<String>> {
-    let pos = positions(&lines, header, 2);
-    to_rows(lines, pos, trim_space)
-}
-
-// to_table_n parses a slice of lines and returns a table, but limits the number of splits.
-#[allow(dead_code)]
-pub fn to_table_n(
-    lines: Vec<String>,
-    header: usize,
-    num_split: usize,
-    trim_space: bool,
-) -> Vec<Vec<String>> {
-    let mut pos = positions(&lines, header, 2);
-    if pos.len() > num_split {
-        pos.truncate(num_split);
-    }
-    to_rows(lines, pos, trim_space)
-}
-
 #[cfg(test)]
 mod tests {
-    use super::{to_table, to_table_n, GuessWidth};
+    use super::*;
+
+    /// to_rows returns rows separated by columns.
+    fn to_rows(lines: Vec<String>, pos: Vec<usize>, trim_space: bool) -> Vec<Vec<String>> {
+        let mut rows: Vec<Vec<String>> = Vec::with_capacity(lines.len());
+        for line in lines {
+            let columns = split(&line, &pos, trim_space);
+            rows.push(columns);
+        }
+        rows
+    }
+
+    /// to_table parses a slice of lines and returns a table.
+    pub fn to_table(lines: Vec<String>, header: usize, trim_space: bool) -> Vec<Vec<String>> {
+        let pos = positions(&lines, header, 2);
+        to_rows(lines, pos, trim_space)
+    }
+
+    /// to_table_n parses a slice of lines and returns a table, but limits the number of splits.
+    pub fn to_table_n(
+        lines: Vec<String>,
+        header: usize,
+        num_split: usize,
+        trim_space: bool,
+    ) -> Vec<Vec<String>> {
+        let mut pos = positions(&lines, header, 2);
+        if pos.len() > num_split {
+            pos.truncate(num_split);
+        }
+        to_rows(lines, pos, trim_space)
+    }
 
     #[test]
     fn test_guess_width_ps_trim() {
diff --git a/crates/nu-system/src/windows.rs b/crates/nu-system/src/windows.rs
index 59e2a77751..cc0ab99559 100644
--- a/crates/nu-system/src/windows.rs
+++ b/crates/nu-system/src/windows.rs
@@ -471,7 +471,6 @@ unsafe fn null_terminated_wchar_to_string(slice: &[u16]) -> String {
     }
 }
 
-#[allow(clippy::uninit_vec)]
 unsafe fn get_process_data(
     handle: HANDLE,
     ptr: *const c_void,
@@ -518,7 +517,6 @@ unsafe fn get_region_size(handle: HANDLE, ptr: *const c_void) -> Result<usize, &
     Ok((meminfo.RegionSize as isize - ptr.offset_from(meminfo.BaseAddress)) as usize)
 }
 
-#[allow(clippy::uninit_vec)]
 unsafe fn ph_query_process_variable_size(
     process_handle: HANDLE,
     process_information_class: PROCESSINFOCLASS,

From ea6493c041e161f326cc2fb590010100ea6852f7 Mon Sep 17 00:00:00 2001
From: anomius <swarajpurohit@gmail.com>
Date: Sat, 16 Nov 2024 01:35:29 +0530
Subject: [PATCH 0682/1072] Seq char update will work on all char (#14261)

# Description - fixes #14174

This PR addresses a bug in the `seq char` command where the command's
behavior did not align with its help description, which stated that it
prints a sequence of ASCII characters. The initial implementation only
allowed alphabetic characters, leading to user confusion when
non-alphabetic characters (e.g., digits, punctuation) were rejected or
when unexpected behavior occurred for certain input ranges.

### Changes Made:
- **Updated the input validation**: Modified the `is_single_character`
function to accept any ASCII character instead of restricting to
alphabetic characters.
- **Enhanced error messages**: Clarified error messages to specify that
any single ASCII character is acceptable.
- **Expanded functionality**: Ensured that the command can now generate
sequences that include non-alphabetic ASCII characters.
- **Updated tests**: Added tests to cover new use cases involving
non-alphabetic characters and improved validation.

### Examples After Fix:
- `seq char '0' '9'` now outputs `['0', '1', '2', '3', '4', '5', '6',
'7', '8', '9']`
- `seq char ' ' '/'` outputs a list of characters from space to `/`
- `seq char 'A' 'z'` correctly includes alphabetic and non-alphabetic
characters between `A` and `z`

# User-Facing Changes
- Users can now input any single ASCII character for the `start` and
`end` parameters of `seq char`.
- The output will accurately include all characters within the specified
ASCII range, including digits and punctuation.

# Tests + Formatting
- Added new tests to ensure the `seq char` command supports sequences
including non-alphabetic ASCII characters.
---
 crates/nu-command/src/generators/seq_char.rs | 30 ++++++++-----
 crates/nu-command/tests/commands/seq_char.rs | 47 +++++++++++++++++++-
 2 files changed, 65 insertions(+), 12 deletions(-)

diff --git a/crates/nu-command/src/generators/seq_char.rs b/crates/nu-command/src/generators/seq_char.rs
index c0f16593d7..0f51815067 100644
--- a/crates/nu-command/src/generators/seq_char.rs
+++ b/crates/nu-command/src/generators/seq_char.rs
@@ -45,9 +45,10 @@ impl Command for SeqChar {
                 )),
             },
             Example {
-                description: "sequence a to e, and put the characters in a pipe-separated string",
+                description: "Sequence a to e, and join the characters with a pipe",
                 example: "seq char a e | str join '|'",
                 // TODO: it would be nice to test this example, but it currently breaks the input/output type tests
+                // result: Some(Value::test_string("a|b|c|d|e")),
                 result: None,
             },
         ]
@@ -65,7 +66,7 @@ impl Command for SeqChar {
 }
 
 fn is_single_character(ch: &str) -> bool {
-    ch.is_ascii() && ch.len() == 1 && ch.chars().all(char::is_alphabetic)
+    ch.is_ascii() && (ch.len() == 1)
 }
 
 fn seq_char(
@@ -79,7 +80,7 @@ fn seq_char(
     if !is_single_character(&start.item) {
         return Err(ShellError::GenericError {
             error: "seq char only accepts individual ASCII characters as parameters".into(),
-            msg: "should be 1 character long".into(),
+            msg: "input should be a single ASCII character".into(),
             span: Some(start.span),
             help: None,
             inner: vec![],
@@ -89,7 +90,7 @@ fn seq_char(
     if !is_single_character(&end.item) {
         return Err(ShellError::GenericError {
             error: "seq char only accepts individual ASCII characters as parameters".into(),
-            msg: "should be 1 character long".into(),
+            msg: "input should be a single ASCII character".into(),
             span: Some(end.span),
             help: None,
             inner: vec![],
@@ -115,18 +116,27 @@ fn seq_char(
 }
 
 fn run_seq_char(start_ch: char, end_ch: char, span: Span) -> Result<PipelineData, ShellError> {
-    let mut result_vec = vec![];
-    for current_ch in start_ch as u8..end_ch as u8 + 1 {
-        result_vec.push((current_ch as char).to_string())
-    }
-
+    let start = start_ch as u8;
+    let end = end_ch as u8;
+    let range = if start <= end {
+        start..=end
+    } else {
+        end..=start
+    };
+    let result_vec = if start <= end {
+        range.map(|c| (c as char).to_string()).collect::<Vec<_>>()
+    } else {
+        range
+            .rev()
+            .map(|c| (c as char).to_string())
+            .collect::<Vec<_>>()
+    };
     let result = result_vec
         .into_iter()
         .map(|x| Value::string(x, span))
         .collect::<Vec<Value>>();
     Ok(Value::list(result, span).into_pipeline_data())
 }
-
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/crates/nu-command/tests/commands/seq_char.rs b/crates/nu-command/tests/commands/seq_char.rs
index 6c78084b80..b59f45d39d 100644
--- a/crates/nu-command/tests/commands/seq_char.rs
+++ b/crates/nu-command/tests/commands/seq_char.rs
@@ -4,12 +4,55 @@ use nu_test_support::nu;
 fn fails_when_first_arg_is_multiple_chars() {
     let actual = nu!("seq char aa z");
 
-    assert!(actual.err.contains("should be 1 character long"));
+    assert!(actual
+        .err
+        .contains("input should be a single ASCII character"));
 }
 
 #[test]
 fn fails_when_second_arg_is_multiple_chars() {
     let actual = nu!("seq char a zz");
 
-    assert!(actual.err.contains("should be 1 character long"));
+    assert!(actual
+        .err
+        .contains("input should be a single ASCII character"));
+}
+
+#[test]
+fn generates_sequence_from_a_to_e() {
+    let actual = nu!("seq char a e | str join ''");
+
+    assert_eq!(actual.out, "abcde");
+}
+
+#[test]
+fn generates_sequence_from_e_to_a() {
+    let actual = nu!("seq char e a | str join ''");
+
+    assert_eq!(actual.out, "edcba");
+}
+
+#[test]
+fn fails_when_non_ascii_character_is_used_in_first_arg() {
+    let actual = nu!("seq char ñ z");
+
+    assert!(actual
+        .err
+        .contains("input should be a single ASCII character"));
+}
+
+#[test]
+fn fails_when_non_ascii_character_is_used_in_second_arg() {
+    let actual = nu!("seq char a ñ");
+
+    assert!(actual
+        .err
+        .contains("input should be a single ASCII character"));
+}
+
+#[test]
+fn joins_sequence_with_pipe() {
+    let actual = nu!("seq char a e | str join '|'");
+
+    assert_eq!(actual.out, "a|b|c|d|e");
 }

From 029c586717cf335ce87f187de8820942a7380a38 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Sun, 17 Nov 2024 05:47:09 -0600
Subject: [PATCH 0683/1072] fix ansi bleed over on right prompt (#14357)

# Description

In certain situations, we had ansi bleed on the right prompt. This PR
fixes that by prefixing the right prompt with an ansi reset `\x1b[0m`.

This PR also adds some --log-level warn logging so we can see the ansi
escapes that form the prompts.

Closes https://github.com/nushell/nushell/issues/14268
---
 crates/nu-cli/src/prompt_update.rs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/crates/nu-cli/src/prompt_update.rs b/crates/nu-cli/src/prompt_update.rs
index 63dd9ce19d..c033475586 100644
--- a/crates/nu-cli/src/prompt_update.rs
+++ b/crates/nu-cli/src/prompt_update.rs
@@ -1,5 +1,5 @@
 use crate::NushellPrompt;
-use log::trace;
+use log::{trace, warn};
 use nu_engine::ClosureEvalOnce;
 use nu_protocol::{
     engine::{EngineState, Stack},
@@ -80,8 +80,13 @@ fn get_prompt_string(
         })
         .and_then(|pipeline_data| {
             let output = pipeline_data.collect_string("", config).ok();
+            let ansi_output = output.map(|mut x| {
+                // Always reset the color at the start of the right prompt
+                // to ensure there is no ansi bleed over
+                if x.is_empty() && prompt == PROMPT_COMMAND_RIGHT {
+                    x.insert_str(0, "\x1b[0m")
+                };
 
-            output.map(|mut x| {
                 // Just remove the very last newline.
                 if x.ends_with('\n') {
                     x.pop();
@@ -91,7 +96,11 @@ fn get_prompt_string(
                     x.pop();
                 }
                 x
-            })
+            });
+            // Let's keep this for debugging purposes with nu --log-level warn
+            warn!("{}:{}:{} {:?}", file!(), line!(), column!(), ansi_output);
+
+            ansi_output
         })
 }
 

From 6c36bd822cd36ea871befb14c3a448bf42c7e366 Mon Sep 17 00:00:00 2001
From: Jan Klass <kissaki@posteo.de>
Date: Sun, 17 Nov 2024 19:17:35 +0100
Subject: [PATCH 0684/1072] Fix doc and code comment typos (#14366)

# User-Facing Changes

* Fixes `polars value-counts --column` help text typo
* Fixes `polars agg-groups` help text typo
---
 crates/nu-command/src/system/run_external.rs                    | 2 +-
 .../src/dataframe/command/aggregation/agg_groups.rs             | 2 +-
 .../src/dataframe/command/aggregation/value_counts.rs           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index 67b848915d..604278c676 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -76,7 +76,7 @@ impl Command for External {
         // believe the user wants to use the windows association to run the script. The only
         // easy way to do this is to run cmd.exe with the script as an argument.
         let potential_nuscript_in_windows = if cfg!(windows) {
-            // let's make sure it's a .nu scrtipt
+            // let's make sure it's a .nu script
             if let Some(executable) = which(&expanded_name, "", cwd.as_ref()) {
                 let ext = executable
                     .extension()
diff --git a/crates/nu_plugin_polars/src/dataframe/command/aggregation/agg_groups.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/agg_groups.rs
index ae12239800..a8d58bd6f0 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/aggregation/agg_groups.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/agg_groups.rs
@@ -34,7 +34,7 @@ impl PluginCommand for ExprAggGroups {
 
     fn examples(&self) -> Vec<Example> {
         vec![Example {
-            description: "Get the groiup index of the group by operations.",
+            description: "Get the group index of the group by operations.",
             example: r#"[[group value]; [one 94] [one 95] [one 96] [two 97] [two 98] [two 99]] 
                 | polars into-df 
                 | polars group-by group
diff --git a/crates/nu_plugin_polars/src/dataframe/command/aggregation/value_counts.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/value_counts.rs
index 064e308e80..57f7f3381a 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/aggregation/value_counts.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/value_counts.rs
@@ -28,7 +28,7 @@ impl PluginCommand for ValueCount {
             .named(
                 "column",
                 SyntaxShape::String,
-                "Provide a custom name for the coutn column",
+                "Provide a custom name for the count column",
                 Some('c'),
             )
             .switch("sort", "Whether or not values should be sorted", Some('s'))

From e5cec8f4ebad5796a2ce9b8155e6a0bec53b45c9 Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Mon, 18 Nov 2024 02:25:53 +0300
Subject: [PATCH 0685/1072] fix(group-by): re #14337 name collision prevention
 (#14360)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A more involved solution to the issue pointed out
[here](https://github.com/nushell/nushell/pull/14337#issuecomment-2480392373)

# Description

With `--to-table`
- cell-path groupers are used to create column names, similar to
`select`
- closure groupers result in columns named `closure_{i}` where `i` is
the index of argument, with regards to other closures i.e. first closure
grouper results in a column named `closure_0`

  Previously
  - `group-by foo {...} {...}` => `table<foo, group1, group2, items>`
  - `group-by {...} foo {...}` => `table<group0, foo, group2, items>`

  With this PR
- `group-by foo {...} {...}` => `table<foo, closure_0, closure_1,
items>`
- `group-by {...} foo {...}` => `table<closure_0, foo, closure_1,
items>`
- no grouper argument results in a `table<group, items>` as previously

On naming conflicts caused by cell-path groupers named `items` or
`closure_{i}`, an error is thrown, suggesting to use a closure in place
of a cell-path.

```nushell
❯ ls | rename items | group-by items --to-table
Error:   × grouper arguments can't be named `items`
   ╭─[entry #3:1:29]
 1 │ ls | rename items | group-by items --to-table
   ·                             ────────┬────────
   ·                                     ╰── contains `items`
   ╰────
  help: instead of a cell-path, try using a closure
```
And following the suggestion:
```nushell
❯ ls | rename items | group-by { get items } --to-table
╭─#──┬──────closure_0──────┬───────────────────────────items────────────────────────────╮
│ 0  │ CITATION.cff        │ ╭─#─┬────items─────┬─type─┬─size──┬───modified───╮         │
│    │                     │ │ 0 │ CITATION.cff │ file │ 812 B │ 3 months ago │         │
│    │                     │ ╰─#─┴────items─────┴─type─┴─size──┴───modified───╯         │
│ 1  │ CODE_OF_CONDUCT.md  │ ╭─#─┬───────items────────┬─type─┬──size───┬───modified───╮ │
...
```
---
 crates/nu-command/src/filters/group_by.rs | 167 +++++++++++++++-------
 1 file changed, 116 insertions(+), 51 deletions(-)

diff --git a/crates/nu-command/src/filters/group_by.rs b/crates/nu-command/src/filters/group_by.rs
index 9396de4781..0f56152834 100644
--- a/crates/nu-command/src/filters/group_by.rs
+++ b/crates/nu-command/src/filters/group_by.rs
@@ -1,6 +1,6 @@
 use indexmap::IndexMap;
 use nu_engine::{command_prelude::*, ClosureEval};
-use nu_protocol::{engine::Closure, IntoValue};
+use nu_protocol::{engine::Closure, FromValue, IntoValue};
 
 #[derive(Clone)]
 pub struct GroupBy;
@@ -12,10 +12,6 @@ impl Command for GroupBy {
 
     fn signature(&self) -> Signature {
         Signature::build("group-by")
-            // TODO: It accepts Table also, but currently there is no Table
-            // example. Perhaps Table should be a subtype of List, in which case
-            // the current signature would suffice even when a Table example
-            // exists.
             .input_output_types(vec![(Type::List(Box::new(Type::Any)), Type::Any)])
             .switch(
                 "to-table",
@@ -229,7 +225,7 @@ pub fn group_by(
     input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
     let head = call.head;
-    let groupers: Vec<Value> = call.rest(engine_state, stack, 0)?;
+    let groupers: Vec<Spanned<Grouper>> = call.rest(engine_state, stack, 0)?;
     let to_table = call.has_flag(engine_state, stack, "to-table")?;
     let config = engine_state.get_config();
 
@@ -238,20 +234,20 @@ pub fn group_by(
         return Ok(Value::record(Record::new(), head).into_pipeline_data());
     }
 
-    let mut groupers = groupers.into_iter();
-
-    let grouped = if let Some(grouper) = groupers.next() {
-        let mut groups = Grouped::new(&grouper, values, config, engine_state, stack)?;
-        for grouper in groupers {
-            groups.subgroup(&grouper, config, engine_state, stack)?;
+    let grouped = match &groupers[..] {
+        [first, rest @ ..] => {
+            let mut grouped = Grouped::new(first.as_ref(), values, config, engine_state, stack)?;
+            for grouper in rest {
+                grouped.subgroup(grouper.as_ref(), config, engine_state, stack)?;
+            }
+            grouped
         }
-        groups
-    } else {
-        Grouped::empty(values, config)
+        [] => Grouped::empty(values, config),
     };
 
     let value = if to_table {
-        grouped.into_table(head)
+        let column_names = groupers_to_column_names(&groupers)?;
+        grouped.into_table(&column_names, head)
     } else {
         grouped.into_record(head)
     };
@@ -259,8 +255,67 @@ pub fn group_by(
     Ok(value.into_pipeline_data())
 }
 
+fn groupers_to_column_names(groupers: &[Spanned<Grouper>]) -> Result<Vec<String>, ShellError> {
+    if groupers.is_empty() {
+        return Ok(vec!["group".into(), "items".into()]);
+    }
+
+    let mut closure_idx: usize = 0;
+    let grouper_names = groupers.iter().map(|grouper| {
+        grouper.as_ref().map(|item| match item {
+            Grouper::CellPath { val } => val.to_column_name(),
+            Grouper::Closure { .. } => {
+                closure_idx += 1;
+                format!("closure_{}", closure_idx - 1)
+            }
+        })
+    });
+
+    let mut name_set: Vec<Spanned<String>> = Vec::with_capacity(grouper_names.len());
+
+    for name in grouper_names {
+        if name.item == "items" {
+            return Err(ShellError::GenericError {
+                error: "grouper arguments can't be named `items`".into(),
+                msg: "here".into(),
+                span: Some(name.span),
+                help: Some("instead of a cell-path, try using a closure: { get items }".into()),
+                inner: vec![],
+            });
+        }
+
+        if let Some(conflicting_name) = name_set
+            .iter()
+            .find(|elem| elem.as_ref().item == name.item.as_str())
+        {
+            return Err(ShellError::GenericError {
+                error: "grouper arguments result in colliding column names".into(),
+                msg: "duplicate column names".into(),
+                span: Some(conflicting_name.span.append(name.span)),
+                help: Some(
+                    "instead of a cell-path, try using a closure or renaming columns".into(),
+                ),
+                inner: vec![ShellError::ColumnDefinedTwice {
+                    col_name: conflicting_name.item.clone(),
+                    first_use: conflicting_name.span,
+                    second_use: name.span,
+                }],
+            });
+        }
+
+        name_set.push(name);
+    }
+
+    let column_names: Vec<String> = name_set
+        .into_iter()
+        .map(|elem| elem.item)
+        .chain(["items".into()])
+        .collect();
+    Ok(column_names)
+}
+
 fn group_cell_path(
-    column_name: CellPath,
+    column_name: &CellPath,
     values: Vec<Value>,
     config: &nu_protocol::Config,
 ) -> Result<IndexMap<String, Vec<Value>>, ShellError> {
@@ -305,8 +360,25 @@ fn group_closure(
     Ok(groups)
 }
 
+enum Grouper {
+    CellPath { val: CellPath },
+    Closure { val: Box<Closure> },
+}
+
+impl FromValue for Grouper {
+    fn from_value(v: Value) -> Result<Self, ShellError> {
+        match v {
+            Value::CellPath { val, .. } => Ok(Grouper::CellPath { val }),
+            Value::Closure { val, .. } => Ok(Grouper::Closure { val }),
+            _ => Err(ShellError::TypeMismatch {
+                err_message: "unsupported grouper type".to_string(),
+                span: v.span(),
+            }),
+        }
+    }
+}
+
 struct Grouped {
-    grouper: Option<String>,
     groups: Tree,
 }
 
@@ -325,41 +397,35 @@ impl Grouped {
         }
 
         Self {
-            grouper: Some("group".into()),
             groups: Tree::Leaf(groups),
         }
     }
 
     fn new(
-        grouper: &Value,
+        grouper: Spanned<&Grouper>,
         values: Vec<Value>,
         config: &nu_protocol::Config,
         engine_state: &EngineState,
         stack: &mut Stack,
     ) -> Result<Self, ShellError> {
-        let span = grouper.span();
-        let groups = match grouper {
-            Value::CellPath { val, .. } => group_cell_path(val.clone(), values, config)?,
-            Value::Closure { val, .. } => {
-                group_closure(values, span, Closure::clone(val), engine_state, stack)?
-            }
-            _ => {
-                return Err(ShellError::TypeMismatch {
-                    err_message: "unsupported grouper type".to_string(),
-                    span,
-                })
-            }
+        let groups = match grouper.item {
+            Grouper::CellPath { val } => group_cell_path(val, values, config)?,
+            Grouper::Closure { val } => group_closure(
+                values,
+                grouper.span,
+                Closure::clone(val),
+                engine_state,
+                stack,
+            )?,
         };
-        let grouper = grouper.as_cell_path().ok().map(CellPath::to_column_name);
         Ok(Self {
-            grouper,
             groups: Tree::Leaf(groups),
         })
     }
 
     fn subgroup(
         &mut self,
-        grouper: &Value,
+        grouper: Spanned<&Grouper>,
         config: &nu_protocol::Config,
         engine_state: &EngineState,
         stack: &mut Stack,
@@ -384,34 +450,33 @@ impl Grouped {
         Ok(())
     }
 
-    fn into_table(self, head: Span) -> Value {
-        self._into_table(head, 0)
+    fn into_table(self, column_names: &[String], head: Span) -> Value {
+        self._into_table(head)
             .into_iter()
-            .map(|row| row.into_iter().rev().collect::<Record>().into_value(head))
+            .map(|row| {
+                row.into_iter()
+                    .rev()
+                    .zip(column_names)
+                    .map(|(val, key)| (key.clone(), val))
+                    .collect::<Record>()
+                    .into_value(head)
+            })
             .collect::<Vec<_>>()
             .into_value(head)
     }
 
-    fn _into_table(self, head: Span, index: usize) -> Vec<Record> {
-        let grouper = self.grouper.unwrap_or_else(|| format!("group{index}"));
+    fn _into_table(self, head: Span) -> Vec<Vec<Value>> {
         match self.groups {
             Tree::Leaf(leaf) => leaf
                 .into_iter()
-                .map(|(group, values)| {
-                    [
-                        ("items".to_string(), values.into_value(head)),
-                        (grouper.clone(), group.into_value(head)),
-                    ]
-                    .into_iter()
-                    .collect()
-                })
-                .collect::<Vec<Record>>(),
+                .map(|(group, values)| vec![(values.into_value(head)), (group.into_value(head))])
+                .collect::<Vec<Vec<Value>>>(),
             Tree::Branch(branch) => branch
                 .into_iter()
                 .flat_map(|(group, items)| {
-                    let mut inner = items._into_table(head, index + 1);
+                    let mut inner = items._into_table(head);
                     for row in &mut inner {
-                        row.insert(grouper.clone(), group.clone().into_value(head));
+                        row.push(group.clone().into_value(head));
                     }
                     inner
                 })

From 6e1118681deb507670994508b648117dc435867b Mon Sep 17 00:00:00 2001
From: Solomon <git@solomonvictorino.com>
Date: Sun, 17 Nov 2024 17:01:52 -0700
Subject: [PATCH 0686/1072] make command signature parsing more strict (#14309)

# User-Facing Changes

The parser now errors on more invalid command signatures:

```nushell
# expected parameter or flag
def foo [ bar: int: ] {}

# expected type
def foo [ bar: =  ] {}
def foo [ bar: ] {}

# expected default value
def foo [ bar = ] {}
```
---
 crates/nu-command/tests/commands/def.rs | 29 ++++++++++++++++++++++++-
 crates/nu-parser/src/parser.rs          | 25 ++++++++++++++++-----
 2 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/crates/nu-command/tests/commands/def.rs b/crates/nu-command/tests/commands/def.rs
index c66869b479..0705c0085f 100644
--- a/crates/nu-command/tests/commands/def.rs
+++ b/crates/nu-command/tests/commands/def.rs
@@ -2,6 +2,13 @@ use nu_test_support::nu;
 use nu_test_support::playground::Playground;
 use std::fs;
 
+#[test]
+fn def_with_trailing_comma() {
+    let actual = nu!("def test-command [ foo: int, ] { $foo }; test-command 1");
+
+    assert!(actual.out == "1");
+}
+
 #[test]
 fn def_with_comment() {
     Playground::setup("def_with_comment", |dirs, _| {
@@ -72,6 +79,13 @@ fn def_errors_with_comma_before_equals() {
     assert!(actual.err.contains("expected parameter"));
 }
 
+#[test]
+fn def_errors_with_colon_before_equals() {
+    let actual = nu!("def test-command [ foo: = 1 ] {}");
+
+    assert!(actual.err.contains("expected type"));
+}
+
 #[test]
 fn def_errors_with_comma_before_colon() {
     let actual = nu!("def test-command [ foo, : int ] {}");
@@ -85,7 +99,6 @@ fn def_errors_with_multiple_colons() {
     assert!(actual.err.contains("expected type"));
 }
 
-#[ignore = "This error condition is not implemented yet"]
 #[test]
 fn def_errors_with_multiple_types() {
     let actual = nu!("def test-command [ foo:int:string ] {}");
@@ -93,6 +106,20 @@ fn def_errors_with_multiple_types() {
     assert!(actual.err.contains("expected parameter"));
 }
 
+#[test]
+fn def_errors_with_trailing_colon() {
+    let actual = nu!("def test-command [ foo: int: ] {}");
+
+    assert!(actual.err.contains("expected parameter"));
+}
+
+#[test]
+fn def_errors_with_trailing_default_value() {
+    let actual = nu!("def test-command [ foo: int = ] {}");
+
+    assert!(actual.err.contains("expected default value"));
+}
+
 #[test]
 fn def_errors_with_multiple_commas() {
     let actual = nu!("def test-command [ foo,,bar ] {}");
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index e4d3765e17..7db2e112bf 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -3392,6 +3392,7 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
         Arg,
         AfterCommaArg,
         Type,
+        AfterType,
         DefaultValue,
     }
 
@@ -3425,7 +3426,9 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
     let mut args: Vec<Arg> = vec![];
     let mut parse_mode = ParseMode::Arg;
 
-    for token in &output {
+    for (index, token) in output.iter().enumerate() {
+        let last_token = index == output.len() - 1;
+
         match token {
             Token {
                 contents: crate::TokenContents::Item | crate::TokenContents::AssignmentOperator,
@@ -3437,10 +3440,12 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
                 // The : symbol separates types
                 if contents == b":" {
                     match parse_mode {
+                        ParseMode::Arg if last_token => working_set
+                            .error(ParseError::Expected("type", Span::new(span.end, span.end))),
                         ParseMode::Arg => {
                             parse_mode = ParseMode::Type;
                         }
-                        ParseMode::AfterCommaArg => {
+                        ParseMode::AfterCommaArg | ParseMode::AfterType => {
                             working_set.error(ParseError::Expected("parameter or flag", span));
                         }
                         ParseMode::Type | ParseMode::DefaultValue => {
@@ -3452,9 +3457,15 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
                 // The = symbol separates a variable from its default value
                 else if contents == b"=" {
                     match parse_mode {
-                        ParseMode::Type | ParseMode::Arg => {
+                        ParseMode::Arg | ParseMode::AfterType if last_token => working_set.error(
+                            ParseError::Expected("default value", Span::new(span.end, span.end)),
+                        ),
+                        ParseMode::Arg | ParseMode::AfterType => {
                             parse_mode = ParseMode::DefaultValue;
                         }
+                        ParseMode::Type => {
+                            working_set.error(ParseError::Expected("type", span));
+                        }
                         ParseMode::AfterCommaArg => {
                             working_set.error(ParseError::Expected("parameter or flag", span));
                         }
@@ -3467,7 +3478,9 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
                 // The , symbol separates params only
                 else if contents == b"," {
                     match parse_mode {
-                        ParseMode::Arg => parse_mode = ParseMode::AfterCommaArg,
+                        ParseMode::Arg | ParseMode::AfterType => {
+                            parse_mode = ParseMode::AfterCommaArg
+                        }
                         ParseMode::AfterCommaArg => {
                             working_set.error(ParseError::Expected("parameter or flag", span));
                         }
@@ -3480,7 +3493,7 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
                     }
                 } else {
                     match parse_mode {
-                        ParseMode::Arg | ParseMode::AfterCommaArg => {
+                        ParseMode::Arg | ParseMode::AfterCommaArg | ParseMode::AfterType => {
                             // Long flag with optional short form following with no whitespace, e.g. --output, --age(-a)
                             if contents.starts_with(b"--") && contents.len() > 2 {
                                 // Split the long flag from the short flag with the ( character as delimiter.
@@ -3790,7 +3803,7 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
                                     }
                                 }
                             }
-                            parse_mode = ParseMode::Arg;
+                            parse_mode = ParseMode::AfterType;
                         }
                         ParseMode::DefaultValue => {
                             if let Some(last) = args.last_mut() {

From f63f8cb15406c9f3f94e271f71767444763aa9a8 Mon Sep 17 00:00:00 2001
From: Yash Thakur <45539777+ysthakur@users.noreply.github.com>
Date: Sun, 17 Nov 2024 19:03:21 -0500
Subject: [PATCH 0687/1072] Add utouch command from uutils/coreutils (#11817)

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

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

Part of https://github.com/nushell/nushell/issues/11549

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

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

This PR adds a `utouch` command that uses the `touch` command from
https://github.com/uutils/coreutils. Eventually, `utouch` may be able to
replace `touch`.

The conflicts in Cargo.lock and Cargo.toml are because I'm using the
uutils/coreutils main rather than the latest release, since the changes
that expose `uu_touch`'s internal functionality aren't available in the
latest release.

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

Users will have access to a new `utouch` command with the following
flags:
todo

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock                                 |  26 +
 Cargo.toml                                 |   1 +
 crates/nu-command/Cargo.toml               |   1 +
 crates/nu-command/src/default_context.rs   |   1 +
 crates/nu-command/src/filesystem/mod.rs    |   2 +
 crates/nu-command/src/filesystem/utouch.rs | 268 ++++++++
 crates/nu-command/tests/commands/mod.rs    |   1 +
 crates/nu-command/tests/commands/utouch.rs | 740 +++++++++++++++++++++
 8 files changed, 1040 insertions(+)
 create mode 100644 crates/nu-command/src/filesystem/utouch.rs
 create mode 100644 crates/nu-command/tests/commands/utouch.rs

diff --git a/Cargo.lock b/Cargo.lock
index 2754f5bd23..884f1993d9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3229,6 +3229,7 @@ dependencies = [
  "uu_mkdir",
  "uu_mktemp",
  "uu_mv",
+ "uu_touch",
  "uu_uname",
  "uu_whoami",
  "uucore",
@@ -4081,6 +4082,17 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "parse_datetime"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8720474e3dd4af20cea8716703498b9f3b690f318fa9d9d9e2e38eaf44b96d0"
+dependencies = [
+ "chrono",
+ "nom",
+ "regex",
+]
+
 [[package]]
 name = "paste"
 version = "1.0.15"
@@ -6745,6 +6757,20 @@ dependencies = [
  "uucore",
 ]
 
+[[package]]
+name = "uu_touch"
+version = "0.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55476bec11d5b70c578233a2e94f685058e0d65fc5d66c7ed465877c15124c7c"
+dependencies = [
+ "chrono",
+ "clap",
+ "filetime",
+ "parse_datetime",
+ "uucore",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "uu_uname"
 version = "0.0.27"
diff --git a/Cargo.toml b/Cargo.toml
index a976aeec17..0297f5fdb5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -169,6 +169,7 @@ uu_cp = "0.0.27"
 uu_mkdir = "0.0.27"
 uu_mktemp = "0.0.27"
 uu_mv = "0.0.27"
+uu_touch = "0.0.28"
 uu_whoami = "0.0.27"
 uu_uname = "0.0.27"
 uucore = "0.0.27"
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index e9c3b9a784..c37954e9c1 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -96,6 +96,7 @@ uu_cp = { workspace = true }
 uu_mkdir = { workspace = true }
 uu_mktemp = { workspace = true }
 uu_mv = { workspace = true }
+uu_touch = { workspace = true }
 uu_uname = { workspace = true }
 uu_whoami = { workspace = true }
 uuid = { workspace = true, features = ["v4"] }
diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index ac6fb46631..cbbee717d4 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -230,6 +230,7 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             Rm,
             Save,
             Touch,
+            UTouch,
             Glob,
             Watch,
         };
diff --git a/crates/nu-command/src/filesystem/mod.rs b/crates/nu-command/src/filesystem/mod.rs
index acfa54fee3..089e899dda 100644
--- a/crates/nu-command/src/filesystem/mod.rs
+++ b/crates/nu-command/src/filesystem/mod.rs
@@ -12,6 +12,7 @@ mod ucp;
 mod umkdir;
 mod umv;
 mod util;
+mod utouch;
 mod watch;
 
 pub use self::open::Open;
@@ -27,4 +28,5 @@ pub use touch::Touch;
 pub use ucp::UCp;
 pub use umkdir::UMkdir;
 pub use umv::UMv;
+pub use utouch::UTouch;
 pub use watch::Watch;
diff --git a/crates/nu-command/src/filesystem/utouch.rs b/crates/nu-command/src/filesystem/utouch.rs
new file mode 100644
index 0000000000..f32364b28a
--- /dev/null
+++ b/crates/nu-command/src/filesystem/utouch.rs
@@ -0,0 +1,268 @@
+use std::io::ErrorKind;
+use std::path::PathBuf;
+
+use chrono::{DateTime, FixedOffset};
+use filetime::FileTime;
+
+use nu_engine::CallExt;
+use nu_path::expand_path_with;
+use nu_protocol::engine::{Call, Command, EngineState, Stack};
+use nu_protocol::{
+    Category, Example, NuGlob, PipelineData, ShellError, Signature, Spanned, SyntaxShape, Type,
+};
+use uu_touch::error::TouchError;
+use uu_touch::{ChangeTimes, InputFile, Options, Source};
+
+use super::util::get_rest_for_glob_pattern;
+
+#[derive(Clone)]
+pub struct UTouch;
+
+impl Command for UTouch {
+    fn name(&self) -> &str {
+        "utouch"
+    }
+
+    fn search_terms(&self) -> Vec<&str> {
+        vec!["create", "file"]
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("utouch")
+            .input_output_types(vec![ (Type::Nothing, Type::Nothing) ])
+            .rest(
+                "files",
+                SyntaxShape::OneOf(vec![SyntaxShape::GlobPattern, SyntaxShape::Filepath]),
+                "The file(s) to create. '-' is used to represent stdout."
+            )
+            .named(
+                "reference",
+                SyntaxShape::Filepath,
+                "Use the access and modification times of the reference file/directory instead of the current time",
+                Some('r'),
+            )
+            .named(
+                "timestamp",
+                SyntaxShape::DateTime,
+                "Use the given timestamp instead of the current time",
+                Some('t')
+            )
+            .named(
+                "date",
+                SyntaxShape::String,
+                "Use the given time instead of the current time. This can be a full timestamp or it can be relative to either the current time or reference file time (if given). For more information, see https://www.gnu.org/software/coreutils/manual/html_node/touch-invocation.html",
+                Some('d')
+            )
+            .switch(
+                "modified",
+                "Change only the modification time (if used with -a, access time is changed too)",
+                Some('m'),
+            )
+            .switch(
+                "access",
+                "Change only the access time (if used with -m, modification time is changed too)",
+                Some('a'),
+            )
+            .switch(
+                "no-create",
+                "Don't create the file if it doesn't exist",
+                Some('c'),
+            )
+            .switch(
+                "no-deref",
+                "Affect each symbolic link instead of any referenced file (only for systems that can change the timestamps of a symlink). Ignored if touching stdout",
+                Some('s'),
+            )
+            .category(Category::FileSystem)
+    }
+
+    fn description(&self) -> &str {
+        "Creates one or more files."
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let change_mtime: bool = call.has_flag(engine_state, stack, "modified")?;
+        let change_atime: bool = call.has_flag(engine_state, stack, "access")?;
+        let no_create: bool = call.has_flag(engine_state, stack, "no-create")?;
+        let no_deref: bool = call.has_flag(engine_state, stack, "no-dereference")?;
+        let file_globs: Vec<Spanned<NuGlob>> =
+            get_rest_for_glob_pattern(engine_state, stack, call, 0)?;
+        let cwd = engine_state.cwd(Some(stack))?;
+
+        if file_globs.is_empty() {
+            return Err(ShellError::MissingParameter {
+                param_name: "requires file paths".to_string(),
+                span: call.head,
+            });
+        }
+
+        let (reference_file, reference_span) = if let Some(reference) =
+            call.get_flag::<Spanned<PathBuf>>(engine_state, stack, "reference")?
+        {
+            (Some(reference.item), Some(reference.span))
+        } else {
+            (None, None)
+        };
+        let (date_str, date_span) =
+            if let Some(date) = call.get_flag::<Spanned<String>>(engine_state, stack, "date")? {
+                (Some(date.item), Some(date.span))
+            } else {
+                (None, None)
+            };
+        let timestamp: Option<Spanned<DateTime<FixedOffset>>> =
+            call.get_flag(engine_state, stack, "timestamp")?;
+
+        let source = if let Some(timestamp) = timestamp {
+            if let Some(reference_span) = reference_span {
+                return Err(ShellError::IncompatibleParameters {
+                    left_message: "timestamp given".to_string(),
+                    left_span: timestamp.span,
+                    right_message: "reference given".to_string(),
+                    right_span: reference_span,
+                });
+            }
+            if let Some(date_span) = date_span {
+                return Err(ShellError::IncompatibleParameters {
+                    left_message: "timestamp given".to_string(),
+                    left_span: timestamp.span,
+                    right_message: "date given".to_string(),
+                    right_span: date_span,
+                });
+            }
+            Source::Timestamp(FileTime::from_unix_time(
+                timestamp.item.timestamp(),
+                timestamp.item.timestamp_subsec_nanos(),
+            ))
+        } else if let Some(reference_file) = reference_file {
+            let reference_file = expand_path_with(reference_file, &cwd, true);
+            Source::Reference(reference_file)
+        } else {
+            Source::Now
+        };
+
+        let change_times = if change_atime && !change_mtime {
+            ChangeTimes::AtimeOnly
+        } else if change_mtime && !change_atime {
+            ChangeTimes::MtimeOnly
+        } else {
+            ChangeTimes::Both
+        };
+
+        let mut input_files = Vec::new();
+        for file_glob in &file_globs {
+            if file_glob.item.as_ref() == "-" {
+                input_files.push(InputFile::Stdout);
+            } else {
+                let path =
+                    expand_path_with(file_glob.item.as_ref(), &cwd, file_glob.item.is_expand());
+                input_files.push(InputFile::Path(path));
+            }
+        }
+
+        if let Err(err) = uu_touch::touch(
+            &input_files,
+            &Options {
+                no_create,
+                no_deref,
+                source,
+                date: date_str,
+                change_times,
+                strict: true,
+            },
+        ) {
+            let nu_err = match err {
+                TouchError::TouchFileError { path, index, error } => ShellError::GenericError {
+                    error: format!("Could not touch {}", path.display()),
+                    msg: error.to_string(),
+                    span: Some(file_globs[index].span),
+                    help: None,
+                    inner: Vec::new(),
+                },
+                TouchError::InvalidDateFormat(date) => ShellError::IncorrectValue {
+                    msg: format!("Invalid date: {}", date),
+                    val_span: date_span.expect("utouch should've been given a date"),
+                    call_span: call.head,
+                },
+                TouchError::ReferenceFileInaccessible(reference_path, io_err) => {
+                    let span =
+                        reference_span.expect("utouch should've been given a reference file");
+                    if io_err.kind() == ErrorKind::NotFound {
+                        ShellError::FileNotFound {
+                            span,
+                            file: reference_path.display().to_string(),
+                        }
+                    } else {
+                        ShellError::GenericError {
+                            error: io_err.to_string(),
+                            msg: format!("Failed to read metadata of {}", reference_path.display()),
+                            span: Some(span),
+                            help: None,
+                            inner: Vec::new(),
+                        }
+                    }
+                }
+                _ => ShellError::GenericError {
+                    error: err.to_string(),
+                    msg: err.to_string(),
+                    span: Some(call.head),
+                    help: None,
+                    inner: Vec::new(),
+                },
+            };
+            return Err(nu_err);
+        }
+
+        Ok(PipelineData::empty())
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Creates \"fixture.json\"",
+                example: "utouch fixture.json",
+                result: None,
+            },
+            Example {
+                description: "Creates files a, b and c",
+                example: "utouch a b c",
+                result: None,
+            },
+            Example {
+                description: r#"Changes the last modified time of "fixture.json" to today's date"#,
+                example: "utouch -m fixture.json",
+                result: None,
+            },
+            Example {
+                description: "Changes the last accessed and modified times of files a, b and c to the current time but yesterday",
+                example: r#"utouch -d "yesterday" a b c"#,
+                result: None,
+            },
+            Example {
+                description: r#"Changes the last modified time of files d and e to "fixture.json"'s last modified time"#,
+                example: r#"utouch -m -r fixture.json d e"#,
+                result: None,
+            },
+            Example {
+                description: r#"Changes the last accessed time of "fixture.json" to a datetime"#,
+                example: r#"utouch -a -t 2019-08-24T12:30:30 fixture.json"#,
+                result: None,
+            },
+            Example {
+                description: r#"Change the last accessed and modified times of stdout"#,
+                example: r#"utouch -"#,
+                result: None,
+            },
+            Example {
+                description: r#"Changes the last accessed and modified times of file a to 1 month before "fixture.json"'s last modified time"#,
+                example: r#"utouch -r fixture.json -d "-1 month" a"#,
+                result: None,
+            },
+        ]
+    }
+}
diff --git a/crates/nu-command/tests/commands/mod.rs b/crates/nu-command/tests/commands/mod.rs
index 63911ebfbc..678b8d8896 100644
--- a/crates/nu-command/tests/commands/mod.rs
+++ b/crates/nu-command/tests/commands/mod.rs
@@ -127,6 +127,7 @@ mod update;
 mod upsert;
 mod url;
 mod use_;
+mod utouch;
 mod where_;
 mod which;
 mod while_;
diff --git a/crates/nu-command/tests/commands/utouch.rs b/crates/nu-command/tests/commands/utouch.rs
new file mode 100644
index 0000000000..062ec7ddfc
--- /dev/null
+++ b/crates/nu-command/tests/commands/utouch.rs
@@ -0,0 +1,740 @@
+use chrono::{DateTime, Days, Local, TimeDelta, Utc};
+use filetime::FileTime;
+use nu_test_support::fs::{files_exist_at, Stub};
+use nu_test_support::nu;
+use nu_test_support::playground::{Dirs, Playground};
+use std::path::Path;
+
+// Use 1 instead of 0 because 0 has a special meaning in Windows
+const TIME_ONE: FileTime = FileTime::from_unix_time(1, 0);
+
+fn file_times(file: impl AsRef<Path>) -> (FileTime, FileTime) {
+    (
+        file.as_ref().metadata().unwrap().accessed().unwrap().into(),
+        file.as_ref().metadata().unwrap().modified().unwrap().into(),
+    )
+}
+
+fn symlink_times(path: &nu_path::AbsolutePath) -> (filetime::FileTime, filetime::FileTime) {
+    let metadata = path.symlink_metadata().unwrap();
+
+    (
+        filetime::FileTime::from_system_time(metadata.accessed().unwrap()),
+        filetime::FileTime::from_system_time(metadata.modified().unwrap()),
+    )
+}
+
+// From https://github.com/nushell/nushell/pull/14214
+fn setup_symlink_fs(dirs: &Dirs, sandbox: &mut Playground<'_>) {
+    sandbox.mkdir("d");
+    sandbox.with_files(&[Stub::EmptyFile("f"), Stub::EmptyFile("d/f")]);
+    sandbox.symlink("f", "fs");
+    sandbox.symlink("d", "ds");
+    sandbox.symlink("d/f", "fds");
+
+    // sandbox.symlink does not handle symlinks to missing files well. It panics
+    // But they are useful, and they should be tested.
+    #[cfg(unix)]
+    {
+        std::os::unix::fs::symlink(dirs.test().join("m"), dirs.test().join("fms")).unwrap();
+    }
+
+    #[cfg(windows)]
+    {
+        std::os::windows::fs::symlink_file(dirs.test().join("m"), dirs.test().join("fms")).unwrap();
+    }
+
+    // Change the file times to a known "old" value for comparison
+    filetime::set_symlink_file_times(dirs.test().join("f"), TIME_ONE, TIME_ONE).unwrap();
+    filetime::set_symlink_file_times(dirs.test().join("d"), TIME_ONE, TIME_ONE).unwrap();
+    filetime::set_symlink_file_times(dirs.test().join("d/f"), TIME_ONE, TIME_ONE).unwrap();
+    filetime::set_symlink_file_times(dirs.test().join("ds"), TIME_ONE, TIME_ONE).unwrap();
+    filetime::set_symlink_file_times(dirs.test().join("fs"), TIME_ONE, TIME_ONE).unwrap();
+    filetime::set_symlink_file_times(dirs.test().join("fds"), TIME_ONE, TIME_ONE).unwrap();
+    filetime::set_symlink_file_times(dirs.test().join("fms"), TIME_ONE, TIME_ONE).unwrap();
+}
+
+#[test]
+fn creates_a_file_when_it_doesnt_exist() {
+    Playground::setup("create_test_1", |dirs, _sandbox| {
+        nu!(
+            cwd: dirs.test(),
+            "utouch i_will_be_created.txt"
+        );
+
+        let path = dirs.test().join("i_will_be_created.txt");
+        assert!(path.exists());
+    })
+}
+
+#[test]
+fn creates_two_files() {
+    Playground::setup("create_test_2", |dirs, _sandbox| {
+        nu!(
+            cwd: dirs.test(),
+            "utouch a b"
+        );
+
+        let path = dirs.test().join("a");
+        assert!(path.exists());
+
+        let path2 = dirs.test().join("b");
+        assert!(path2.exists());
+    })
+}
+
+#[test]
+fn change_modified_time_of_file_to_today() {
+    Playground::setup("change_time_test_9", |dirs, sandbox| {
+        sandbox.with_files(&[Stub::EmptyFile("file.txt")]);
+        let path = dirs.test().join("file.txt");
+
+        // Set file.txt's times to the past before the test to make sure `utouch` actually changes the mtime to today
+        filetime::set_file_times(&path, TIME_ONE, TIME_ONE).unwrap();
+
+        nu!(
+            cwd: dirs.test(),
+            "utouch -m file.txt"
+        );
+
+        let metadata = path.metadata().unwrap();
+
+        // Check only the date since the time may not match exactly
+        let today = Local::now().date_naive();
+        let mtime_day = DateTime::<Local>::from(metadata.modified().unwrap()).date_naive();
+
+        assert_eq!(today, mtime_day);
+
+        // Check that atime remains unchanged
+        assert_eq!(
+            TIME_ONE,
+            FileTime::from_system_time(metadata.accessed().unwrap())
+        );
+    })
+}
+
+#[test]
+fn change_access_time_of_file_to_today() {
+    Playground::setup("change_time_test_18", |dirs, sandbox| {
+        sandbox.with_files(&[Stub::EmptyFile("file.txt")]);
+        let path = dirs.test().join("file.txt");
+
+        // Set file.txt's times to the past before the test to make sure `utouch` actually changes the atime to today
+        filetime::set_file_times(&path, TIME_ONE, TIME_ONE).unwrap();
+
+        nu!(
+            cwd: dirs.test(),
+            "utouch -a file.txt"
+        );
+
+        let metadata = path.metadata().unwrap();
+
+        // Check only the date since the time may not match exactly
+        let today = Local::now().date_naive();
+        let atime_day = DateTime::<Local>::from(metadata.accessed().unwrap()).date_naive();
+
+        assert_eq!(today, atime_day);
+
+        // Check that mtime remains unchanged
+        assert_eq!(
+            TIME_ONE,
+            FileTime::from_system_time(metadata.modified().unwrap())
+        );
+    })
+}
+
+#[test]
+fn change_modified_and_access_time_of_file_to_today() {
+    Playground::setup("change_time_test_27", |dirs, sandbox| {
+        sandbox.with_files(&[Stub::EmptyFile("file.txt")]);
+        let path = dirs.test().join("file.txt");
+
+        filetime::set_file_times(&path, TIME_ONE, TIME_ONE).unwrap();
+
+        nu!(
+            cwd: dirs.test(),
+            "utouch -a -m file.txt"
+        );
+
+        let metadata = path.metadata().unwrap();
+
+        // Check only the date since the time may not match exactly
+        let today = Local::now().date_naive();
+        let mtime_day = DateTime::<Local>::from(metadata.modified().unwrap()).date_naive();
+        let atime_day = DateTime::<Local>::from(metadata.accessed().unwrap()).date_naive();
+
+        assert_eq!(today, mtime_day);
+        assert_eq!(today, atime_day);
+    })
+}
+
+#[test]
+fn not_create_file_if_it_not_exists() {
+    Playground::setup("change_time_test_28", |dirs, _sandbox| {
+        let outcome = nu!(
+            cwd: dirs.test(),
+            "utouch -c file.txt"
+        );
+
+        let path = dirs.test().join("file.txt");
+
+        assert!(!path.exists());
+
+        // If --no-create is improperly handled `utouch` may error when trying to change the times of a nonexistent file
+        assert!(outcome.status.success())
+    })
+}
+
+#[test]
+fn change_file_times_if_exists_with_no_create() {
+    Playground::setup(
+        "change_file_times_if_exists_with_no_create",
+        |dirs, sandbox| {
+            sandbox.with_files(&[Stub::EmptyFile("file.txt")]);
+            let path = dirs.test().join("file.txt");
+
+            filetime::set_file_times(&path, TIME_ONE, TIME_ONE).unwrap();
+
+            nu!(
+                cwd: dirs.test(),
+                "utouch -c file.txt"
+            );
+
+            let metadata = path.metadata().unwrap();
+
+            // Check only the date since the time may not match exactly
+            let today = Local::now().date_naive();
+            let mtime_day = DateTime::<Local>::from(metadata.modified().unwrap()).date_naive();
+            let atime_day = DateTime::<Local>::from(metadata.accessed().unwrap()).date_naive();
+
+            assert_eq!(today, mtime_day);
+            assert_eq!(today, atime_day);
+        },
+    )
+}
+
+#[test]
+fn creates_file_three_dots() {
+    Playground::setup("create_test_1", |dirs, _sandbox| {
+        nu!(
+            cwd: dirs.test(),
+            "utouch file..."
+        );
+
+        let path = dirs.test().join("file...");
+        assert!(path.exists());
+    })
+}
+
+#[test]
+fn creates_file_four_dots() {
+    Playground::setup("create_test_1", |dirs, _sandbox| {
+        nu!(
+            cwd: dirs.test(),
+            "utouch file...."
+        );
+
+        let path = dirs.test().join("file....");
+        assert!(path.exists());
+    })
+}
+
+#[test]
+fn creates_file_four_dots_quotation_marks() {
+    Playground::setup("create_test_1", |dirs, _sandbox| {
+        nu!(
+            cwd: dirs.test(),
+            "utouch 'file....'"
+        );
+
+        let path = dirs.test().join("file....");
+        assert!(path.exists());
+    })
+}
+
+#[test]
+fn change_file_times_to_reference_file() {
+    Playground::setup("change_dir_times_to_reference_dir", |dirs, sandbox| {
+        sandbox.with_files(&[
+            Stub::EmptyFile("reference_file"),
+            Stub::EmptyFile("target_file"),
+        ]);
+
+        let reference = dirs.test().join("reference_file");
+        let target = dirs.test().join("target_file");
+
+        // Change the times for reference
+        filetime::set_file_times(&reference, FileTime::from_unix_time(1337, 0), TIME_ONE).unwrap();
+
+        // target should have today's date since it was just created, but reference should be different
+        assert_ne!(
+            reference.metadata().unwrap().accessed().unwrap(),
+            target.metadata().unwrap().accessed().unwrap()
+        );
+        assert_ne!(
+            reference.metadata().unwrap().modified().unwrap(),
+            target.metadata().unwrap().modified().unwrap()
+        );
+
+        nu!(
+            cwd: dirs.test(),
+            "utouch -r reference_file target_file"
+        );
+
+        assert_eq!(
+            reference.metadata().unwrap().accessed().unwrap(),
+            target.metadata().unwrap().accessed().unwrap()
+        );
+        assert_eq!(
+            reference.metadata().unwrap().modified().unwrap(),
+            target.metadata().unwrap().modified().unwrap()
+        );
+    })
+}
+
+#[test]
+fn change_file_mtime_to_reference() {
+    Playground::setup("change_file_mtime_to_reference", |dirs, sandbox| {
+        sandbox.with_files(&[
+            Stub::EmptyFile("reference_file"),
+            Stub::EmptyFile("target_file"),
+        ]);
+
+        let reference = dirs.test().join("reference_file");
+        let target = dirs.test().join("target_file");
+
+        // Change the times for reference
+        filetime::set_file_times(&reference, TIME_ONE, FileTime::from_unix_time(1337, 0)).unwrap();
+
+        // target should have today's date since it was just created, but reference should be different
+        assert_ne!(file_times(&reference), file_times(&target));
+
+        // Save target's current atime to make sure it is preserved
+        let target_original_atime = target.metadata().unwrap().accessed().unwrap();
+
+        nu!(
+            cwd: dirs.test(),
+            "utouch -mr reference_file target_file"
+        );
+
+        assert_eq!(
+            reference.metadata().unwrap().modified().unwrap(),
+            target.metadata().unwrap().modified().unwrap()
+        );
+        assert_ne!(
+            reference.metadata().unwrap().accessed().unwrap(),
+            target.metadata().unwrap().accessed().unwrap()
+        );
+        assert_eq!(
+            target_original_atime,
+            target.metadata().unwrap().accessed().unwrap()
+        );
+    })
+}
+
+// TODO when https://github.com/uutils/coreutils/issues/6629 is fixed,
+// unignore this test
+#[test]
+#[ignore]
+fn change_file_times_to_reference_file_with_date() {
+    Playground::setup(
+        "change_file_times_to_reference_file_with_date",
+        |dirs, sandbox| {
+            sandbox.with_files(&[
+                Stub::EmptyFile("reference_file"),
+                Stub::EmptyFile("target_file"),
+            ]);
+
+            let reference = dirs.test().join("reference_file");
+            let target = dirs.test().join("target_file");
+
+            let now = Utc::now();
+
+            let ref_atime = now;
+            let ref_mtime = now.checked_sub_days(Days::new(5)).unwrap();
+
+            // Change the times for reference
+            filetime::set_file_times(
+                reference,
+                FileTime::from_unix_time(ref_atime.timestamp(), ref_atime.timestamp_subsec_nanos()),
+                FileTime::from_unix_time(ref_mtime.timestamp(), ref_mtime.timestamp_subsec_nanos()),
+            )
+            .unwrap();
+
+            nu!(
+                cwd: dirs.test(),
+                r#"utouch -r reference_file -d "yesterday" target_file"#
+            );
+
+            let (got_atime, got_mtime) = file_times(target);
+            let got = (
+                DateTime::from_timestamp(got_atime.seconds(), got_atime.nanoseconds()).unwrap(),
+                DateTime::from_timestamp(got_mtime.seconds(), got_mtime.nanoseconds()).unwrap(),
+            );
+            assert_eq!(
+                (
+                    now.checked_sub_days(Days::new(1)).unwrap(),
+                    now.checked_sub_days(Days::new(6)).unwrap()
+                ),
+                got
+            );
+        },
+    )
+}
+
+#[test]
+fn change_file_times_to_timestamp() {
+    Playground::setup("change_file_times_to_timestamp", |dirs, sandbox| {
+        sandbox.with_files(&[Stub::EmptyFile("target_file")]);
+
+        let target = dirs.test().join("target_file");
+        let timestamp = DateTime::from_timestamp(TIME_ONE.unix_seconds(), TIME_ONE.nanoseconds())
+            .unwrap()
+            .to_rfc3339();
+
+        nu!(cwd: dirs.test(), format!("utouch --timestamp {} target_file", timestamp));
+
+        assert_eq!((TIME_ONE, TIME_ONE), file_times(target));
+    })
+}
+
+#[test]
+fn change_modified_time_of_dir_to_today() {
+    Playground::setup("change_dir_mtime", |dirs, sandbox| {
+        sandbox.mkdir("test_dir");
+        let path = dirs.test().join("test_dir");
+
+        filetime::set_file_mtime(&path, TIME_ONE).unwrap();
+
+        nu!(
+            cwd: dirs.test(),
+            "utouch -m test_dir"
+        );
+
+        // Check only the date since the time may not match exactly
+        let today = Local::now().date_naive();
+        let mtime_day =
+            DateTime::<Local>::from(path.metadata().unwrap().modified().unwrap()).date_naive();
+
+        assert_eq!(today, mtime_day);
+    })
+}
+
+#[test]
+fn change_access_time_of_dir_to_today() {
+    Playground::setup("change_dir_atime", |dirs, sandbox| {
+        sandbox.mkdir("test_dir");
+        let path = dirs.test().join("test_dir");
+
+        filetime::set_file_atime(&path, TIME_ONE).unwrap();
+
+        nu!(
+            cwd: dirs.test(),
+            "utouch -a test_dir"
+        );
+
+        // Check only the date since the time may not match exactly
+        let today = Local::now().date_naive();
+        let atime_day =
+            DateTime::<Local>::from(path.metadata().unwrap().accessed().unwrap()).date_naive();
+
+        assert_eq!(today, atime_day);
+    })
+}
+
+#[test]
+fn change_modified_and_access_time_of_dir_to_today() {
+    Playground::setup("change_dir_times", |dirs, sandbox| {
+        sandbox.mkdir("test_dir");
+        let path = dirs.test().join("test_dir");
+
+        filetime::set_file_times(&path, TIME_ONE, TIME_ONE).unwrap();
+
+        nu!(
+            cwd: dirs.test(),
+            "utouch -a -m test_dir"
+        );
+
+        let metadata = path.metadata().unwrap();
+
+        // Check only the date since the time may not match exactly
+        let today = Local::now().date_naive();
+        let mtime_day = DateTime::<Local>::from(metadata.modified().unwrap()).date_naive();
+        let atime_day = DateTime::<Local>::from(metadata.accessed().unwrap()).date_naive();
+
+        assert_eq!(today, mtime_day);
+        assert_eq!(today, atime_day);
+    })
+}
+
+// TODO when https://github.com/uutils/coreutils/issues/6629 is fixed,
+// unignore this test
+#[test]
+#[ignore]
+fn change_file_times_to_date() {
+    Playground::setup("change_file_times_to_date", |dirs, sandbox| {
+        sandbox.with_files(&[Stub::EmptyFile("target_file")]);
+
+        let expected = Utc::now().checked_sub_signed(TimeDelta::hours(2)).unwrap();
+        nu!(cwd: dirs.test(), "utouch -d '-2 hours' target_file");
+
+        let (got_atime, got_mtime) = file_times(dirs.test().join("target_file"));
+        let got_atime =
+            DateTime::from_timestamp(got_atime.seconds(), got_atime.nanoseconds()).unwrap();
+        let got_mtime =
+            DateTime::from_timestamp(got_mtime.seconds(), got_mtime.nanoseconds()).unwrap();
+        let threshold = TimeDelta::minutes(1);
+        assert!(
+            got_atime.signed_duration_since(expected).lt(&threshold)
+                && got_mtime.signed_duration_since(expected).lt(&threshold),
+            "Expected: {}. Got: atime={}, mtime={}",
+            expected,
+            got_atime,
+            got_mtime
+        );
+        assert!(got_mtime.signed_duration_since(expected).lt(&threshold));
+    })
+}
+
+#[test]
+fn change_dir_three_dots_times() {
+    Playground::setup("change_dir_three_dots_times", |dirs, sandbox| {
+        sandbox.mkdir("test_dir...");
+        let path = dirs.test().join("test_dir...");
+
+        filetime::set_file_times(&path, TIME_ONE, TIME_ONE).unwrap();
+
+        nu!(
+            cwd: dirs.test(),
+            "utouch test_dir..."
+        );
+
+        let metadata = path.metadata().unwrap();
+
+        // Check only the date since the time may not match exactly
+        let today = Local::now().date_naive();
+        let mtime_day = DateTime::<Local>::from(metadata.modified().unwrap()).date_naive();
+        let atime_day = DateTime::<Local>::from(metadata.accessed().unwrap()).date_naive();
+
+        assert_eq!(today, mtime_day);
+        assert_eq!(today, atime_day);
+    })
+}
+
+#[test]
+fn change_dir_times_to_reference_dir() {
+    Playground::setup("change_dir_times_to_reference_dir", |dirs, sandbox| {
+        sandbox.mkdir("reference_dir");
+        sandbox.mkdir("target_dir");
+
+        let reference = dirs.test().join("reference_dir");
+        let target = dirs.test().join("target_dir");
+
+        // Change the times for reference
+        filetime::set_file_times(&reference, FileTime::from_unix_time(1337, 0), TIME_ONE).unwrap();
+
+        // target should have today's date since it was just created, but reference should be different
+        assert_ne!(
+            reference.metadata().unwrap().accessed().unwrap(),
+            target.metadata().unwrap().accessed().unwrap()
+        );
+        assert_ne!(
+            reference.metadata().unwrap().modified().unwrap(),
+            target.metadata().unwrap().modified().unwrap()
+        );
+
+        nu!(
+            cwd: dirs.test(),
+            "utouch -r reference_dir target_dir"
+        );
+
+        assert_eq!(
+            reference.metadata().unwrap().accessed().unwrap(),
+            target.metadata().unwrap().accessed().unwrap()
+        );
+        assert_eq!(
+            reference.metadata().unwrap().modified().unwrap(),
+            target.metadata().unwrap().modified().unwrap()
+        );
+    })
+}
+
+#[test]
+fn change_dir_atime_to_reference() {
+    Playground::setup("change_dir_atime_to_reference", |dirs, sandbox| {
+        sandbox.mkdir("reference_dir");
+        sandbox.mkdir("target_dir");
+
+        let reference = dirs.test().join("reference_dir");
+        let target = dirs.test().join("target_dir");
+
+        // Change the times for reference
+        filetime::set_file_times(&reference, FileTime::from_unix_time(1337, 0), TIME_ONE).unwrap();
+
+        // target should have today's date since it was just created, but reference should be different
+        assert_ne!(
+            reference.metadata().unwrap().accessed().unwrap(),
+            target.metadata().unwrap().accessed().unwrap()
+        );
+        assert_ne!(
+            reference.metadata().unwrap().modified().unwrap(),
+            target.metadata().unwrap().modified().unwrap()
+        );
+
+        // Save target's current mtime to make sure it is preserved
+        let target_original_mtime = target.metadata().unwrap().modified().unwrap();
+
+        nu!(
+            cwd: dirs.test(),
+            "utouch -ar reference_dir target_dir"
+        );
+
+        assert_eq!(
+            reference.metadata().unwrap().accessed().unwrap(),
+            target.metadata().unwrap().accessed().unwrap()
+        );
+        assert_ne!(
+            reference.metadata().unwrap().modified().unwrap(),
+            target.metadata().unwrap().modified().unwrap()
+        );
+        assert_eq!(
+            target_original_mtime,
+            target.metadata().unwrap().modified().unwrap()
+        );
+    })
+}
+
+#[test]
+fn create_a_file_with_tilde() {
+    Playground::setup("utouch with tilde", |dirs, _| {
+        let actual = nu!(cwd: dirs.test(), "utouch '~tilde'");
+        assert!(actual.err.is_empty());
+        assert!(files_exist_at(&[Path::new("~tilde")], dirs.test()));
+
+        // pass variable
+        let actual = nu!(cwd: dirs.test(), "let f = '~tilde2'; utouch $f");
+        assert!(actual.err.is_empty());
+        assert!(files_exist_at(&[Path::new("~tilde2")], dirs.test()));
+    })
+}
+
+#[test]
+fn respects_cwd() {
+    Playground::setup("utouch_respects_cwd", |dirs, _sandbox| {
+        nu!(
+            cwd: dirs.test(),
+            "mkdir 'dir'; cd 'dir'; utouch 'i_will_be_created.txt'"
+        );
+
+        let path = dirs.test().join("dir/i_will_be_created.txt");
+        assert!(path.exists());
+    })
+}
+
+#[test]
+fn reference_respects_cwd() {
+    Playground::setup("utouch_reference_respects_cwd", |dirs, _sandbox| {
+        nu!(
+            cwd: dirs.test(),
+            "mkdir 'dir'; cd 'dir'; utouch 'ref.txt'; utouch --reference 'ref.txt' 'foo.txt'"
+        );
+
+        let path = dirs.test().join("dir/foo.txt");
+        assert!(path.exists());
+    })
+}
+
+#[test]
+fn recognizes_stdout() {
+    Playground::setup("utouch_recognizes_stdout", |dirs, _sandbox| {
+        nu!(cwd: dirs.test(), "utouch -");
+        assert!(!dirs.test().join("-").exists());
+    })
+}
+
+#[test]
+fn follow_symlinks() {
+    Playground::setup("touch_follows_symlinks", |dirs, sandbox| {
+        setup_symlink_fs(&dirs, sandbox);
+
+        let missing = dirs.test().join("m");
+        assert!(!missing.exists());
+
+        nu!(
+            cwd: dirs.test(),
+            "
+                touch fds
+                touch ds
+                touch fs
+                touch fms
+            "
+        );
+
+        // We created the missing symlink target
+        assert!(missing.exists());
+
+        // The timestamps for files and directories were changed from TIME_ONE
+        let file_times = symlink_times(&dirs.test().join("f"));
+        let dir_times = symlink_times(&dirs.test().join("d"));
+        let dir_file_times = symlink_times(&dirs.test().join("d/f"));
+
+        assert_ne!(file_times, (TIME_ONE, TIME_ONE));
+        assert_ne!(dir_times, (TIME_ONE, TIME_ONE));
+        assert_ne!(dir_file_times, (TIME_ONE, TIME_ONE));
+
+        // For symlinks, they remain (mostly) the same
+        // We can't test accessed times, since to reach the target file, the symlink must be accessed!
+        let file_symlink_times = symlink_times(&dirs.test().join("fs"));
+        let dir_symlink_times = symlink_times(&dirs.test().join("ds"));
+        let dir_file_symlink_times = symlink_times(&dirs.test().join("fds"));
+        let file_missing_symlink_times = symlink_times(&dirs.test().join("fms"));
+
+        assert_eq!(file_symlink_times.1, TIME_ONE);
+        assert_eq!(dir_symlink_times.1, TIME_ONE);
+        assert_eq!(dir_file_symlink_times.1, TIME_ONE);
+        assert_eq!(file_missing_symlink_times.1, TIME_ONE);
+    })
+}
+
+#[test]
+fn no_follow_symlinks() {
+    Playground::setup("touch_touches_symlinks", |dirs, sandbox| {
+        setup_symlink_fs(&dirs, sandbox);
+
+        let missing = dirs.test().join("m");
+        assert!(!missing.exists());
+
+        nu!(
+            cwd: dirs.test(),
+            "
+                touch fds -s
+                touch ds -s
+                touch fs -s
+                touch fms -s
+            "
+        );
+
+        // We did not create the missing symlink target
+        assert!(!missing.exists());
+
+        // The timestamps for files and directories remain the same
+        let file_times = symlink_times(&dirs.test().join("f"));
+        let dir_times = symlink_times(&dirs.test().join("d"));
+        let dir_file_times = symlink_times(&dirs.test().join("d/f"));
+
+        assert_eq!(file_times, (TIME_ONE, TIME_ONE));
+        assert_eq!(dir_times, (TIME_ONE, TIME_ONE));
+        assert_eq!(dir_file_times, (TIME_ONE, TIME_ONE));
+
+        // For symlinks, everything changed. (except their targets, and paths, and personality)
+        let file_symlink_times = symlink_times(&dirs.test().join("fs"));
+        let dir_symlink_times = symlink_times(&dirs.test().join("ds"));
+        let dir_file_symlink_times = symlink_times(&dirs.test().join("fds"));
+        let file_missing_symlink_times = symlink_times(&dirs.test().join("fms"));
+
+        assert_ne!(file_symlink_times, (TIME_ONE, TIME_ONE));
+        assert_ne!(dir_symlink_times, (TIME_ONE, TIME_ONE));
+        assert_ne!(dir_file_symlink_times, (TIME_ONE, TIME_ONE));
+        assert_ne!(file_missing_symlink_times, (TIME_ONE, TIME_ONE));
+    })
+}

From 13ce9e4f64ba324e9cd62fc3780951ab5683c205 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Sun, 17 Nov 2024 19:31:36 -0600
Subject: [PATCH 0688/1072] update uutils crates (#14371)

# Description

This PR updates the uutils/coreutils crates to the latest version. I
hard-coded debug to false, a new uu_mv parameter. It may be interesting
to add that but I just wanted to get all the uu crates on the same
version.

I had to update the tests because --no-clobber works but doesn't say
anything when it's not clobbering and previously we were checking for an
error message.


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

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock                                    | 34 +++++++++----------
 Cargo.toml                                    | 14 ++++----
 crates/nu-command/src/filesystem/umv.rs       |  1 +
 crates/nu-command/tests/commands/move_/umv.rs |  9 +++--
 crates/nu-command/tests/commands/ucp.rs       | 11 +++---
 5 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 884f1993d9..e6cef1232b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6709,9 +6709,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uu_cp"
-version = "0.0.27"
+version = "0.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb99d355ccb02e8c514e4a1d93e4aa4eedea9837de24635dfd24c165971444e"
+checksum = "e0eff79f5eacf6bb88c9afc19f3cec2ab14ad31317be1369100658b46d41e410"
 dependencies = [
  "clap",
  "filetime",
@@ -6725,9 +6725,9 @@ dependencies = [
 
 [[package]]
 name = "uu_mkdir"
-version = "0.0.27"
+version = "0.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "219588fbc146f18188781208ac4034616c51cf151677b4e1f9caf63ca8a7f2cf"
+checksum = "feba7cf875eecbb746b1c5a5a8a031ab3a00e5f44f5441643a06b78577780d3a"
 dependencies = [
  "clap",
  "uucore",
@@ -6735,9 +6735,9 @@ dependencies = [
 
 [[package]]
 name = "uu_mktemp"
-version = "0.0.27"
+version = "0.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1e79ad2c5911908fce23a6069c52ca82e1997e2ed4bf6abf2d867c79c3dc73f"
+checksum = "1a9cfd389f60e667c5ee6659beaad50bada7e710d76082c7d77ab91e04307c8f"
 dependencies = [
  "clap",
  "rand",
@@ -6747,9 +6747,9 @@ dependencies = [
 
 [[package]]
 name = "uu_mv"
-version = "0.0.27"
+version = "0.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd57c8d02f8a99ed56ed9f6fddab403ee0e2bf9e8f3a5ca8f0f9e4d6e3e392a0"
+checksum = "bf932231fccdf108f75443bab0ce17acfe49b5825d731b8a358251833be7da20"
 dependencies = [
  "clap",
  "fs_extra",
@@ -6773,9 +6773,9 @@ dependencies = [
 
 [[package]]
 name = "uu_uname"
-version = "0.0.27"
+version = "0.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad1ca90f9b292bccaad0de70e6feccac5182c6713a5e1ca72d97bf3555b608b4"
+checksum = "182b4071a2e6f7288cbbc1b1ff05c74e9dc7527b4735583d9e3cd92802b06910"
 dependencies = [
  "clap",
  "platform-info",
@@ -6784,27 +6784,27 @@ dependencies = [
 
 [[package]]
 name = "uu_whoami"
-version = "0.0.27"
+version = "0.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc7c52e42e0425710461700adc1063f468f2ba8a8ff83ee69ba661095ab7b77a"
+checksum = "5d15200414428c65f95d0b1d1226fc84f74ae80376bfe59959d93ddf57f944f5"
 dependencies = [
  "clap",
  "libc",
  "uucore",
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "uucore"
-version = "0.0.27"
+version = "0.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b54aad02cf7e96f5fafabb6b836efa73eef934783b17530095a29ffd4fdc154"
+checksum = "04ea43050c46912575654c5181f4135529e8d4003fca80803af10cdef3ca6412"
 dependencies = [
  "clap",
  "dunce",
  "glob",
  "libc",
- "nix 0.28.0",
+ "nix 0.29.0",
  "number_prefix",
  "once_cell",
  "os_display",
@@ -6812,7 +6812,7 @@ dependencies = [
  "walkdir",
  "wild",
  "winapi-util",
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
  "xattr",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 0297f5fdb5..0b796573c8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -165,14 +165,14 @@ unicode-segmentation = "1.12"
 unicode-width = "0.1"
 ureq = { version = "2.10", default-features = false }
 url = "2.2"
-uu_cp = "0.0.27"
-uu_mkdir = "0.0.27"
-uu_mktemp = "0.0.27"
-uu_mv = "0.0.27"
+uu_cp = "0.0.28"
+uu_mkdir = "0.0.28"
+uu_mktemp = "0.0.28"
+uu_mv = "0.0.28"
 uu_touch = "0.0.28"
-uu_whoami = "0.0.27"
-uu_uname = "0.0.27"
-uucore = "0.0.27"
+uu_whoami = "0.0.28"
+uu_uname = "0.0.28"
+uucore = "0.0.28"
 uuid = "1.11.0"
 v_htmlescape = "0.15.0"
 wax = "0.6"
diff --git a/crates/nu-command/src/filesystem/umv.rs b/crates/nu-command/src/filesystem/umv.rs
index 0f49a7d97d..929fc7bcbb 100644
--- a/crates/nu-command/src/filesystem/umv.rs
+++ b/crates/nu-command/src/filesystem/umv.rs
@@ -188,6 +188,7 @@ impl Command for UMv {
             target_dir: None,
             no_target_dir: false,
             strip_slashes: false,
+            debug: false,
         };
         if let Err(error) = uu_mv::mv(&files, &options) {
             return Err(ShellError::GenericError {
diff --git a/crates/nu-command/tests/commands/move_/umv.rs b/crates/nu-command/tests/commands/move_/umv.rs
index b193d5b7cb..98e2a753bf 100644
--- a/crates/nu-command/tests/commands/move_/umv.rs
+++ b/crates/nu-command/tests/commands/move_/umv.rs
@@ -513,13 +513,18 @@ fn test_mv_no_clobber() {
         sandbox.with_files(&[EmptyFile(file_a)]);
         sandbox.with_files(&[EmptyFile(file_b)]);
 
-        let actual = nu!(
+        let _ = nu!(
             cwd: dirs.test(),
             "mv -n {} {}",
             file_a,
             file_b,
         );
-        assert!(actual.err.contains("not replacing"));
+
+        let file_count = nu!(
+            cwd: dirs.test(),
+            "ls test_mv* | length | to nuon"
+        );
+        assert_eq!(file_count.out, "2");
     })
 }
 
diff --git a/crates/nu-command/tests/commands/ucp.rs b/crates/nu-command/tests/commands/ucp.rs
index eb2363e68c..e3fa2ca931 100644
--- a/crates/nu-command/tests/commands/ucp.rs
+++ b/crates/nu-command/tests/commands/ucp.rs
@@ -841,14 +841,13 @@ fn test_cp_arg_no_clobber() {
         let target = dirs.fixtures.join("cp").join(TEST_HOW_ARE_YOU_SOURCE);
         let target_hash = get_file_hash(target.display());
 
-        let actual = nu!(
-        cwd: dirs.root(),
-        "cp {} {} --no-clobber",
-        src.display(),
-        target.display()
+        let _ = nu!(
+            cwd: dirs.root(),
+            "cp {} {} --no-clobber",
+            src.display(),
+            target.display()
         );
         let after_cp_hash = get_file_hash(target.display());
-        assert!(actual.err.contains("not replacing"));
         // Check content was not clobbered
         assert_eq!(after_cp_hash, target_hash);
     });

From 6773dfce8d5326a4afed4bfdc97edb24713d24d1 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Tue, 19 Nov 2024 07:14:12 +0800
Subject: [PATCH 0689/1072] add `--default` flag to input command (#14374)

# Description
Closes: #14248

# User-Facing Changes
Added a `--default` flag to input command, and it also added an extra
output to prompt:
```
>  let x = input -d 18 "input your age"
input your age (default: 18)
> $x
18
> let x = input -d 18

> $x
18
```

# Tests + Formatting
I don't think it's easy to add a test for it :-(
---
 .../nu-command/src/platform/input/input_.rs   | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/crates/nu-command/src/platform/input/input_.rs b/crates/nu-command/src/platform/input/input_.rs
index cf46b400c0..f792db992e 100644
--- a/crates/nu-command/src/platform/input/input_.rs
+++ b/crates/nu-command/src/platform/input/input_.rs
@@ -43,6 +43,12 @@ impl Command for Input {
                 "number of characters to read; suppresses output",
                 Some('n'),
             )
+            .named(
+                "default",
+                SyntaxShape::String,
+                "default value if no input is provided",
+                Some('d'),
+            )
             .switch("suppress-output", "don't print keystroke values", Some('s'))
             .category(Category::Platform)
     }
@@ -72,8 +78,12 @@ impl Command for Input {
             });
         }
 
+        let default_val: Option<String> = call.get_flag(engine_state, stack, "default")?;
         if let Some(prompt) = &prompt {
-            print!("{prompt}");
+            match &default_val {
+                None => print!("{prompt}"),
+                Some(val) => print!("{prompt} (default: {val})"),
+            }
             let _ = std::io::stdout().flush();
         }
 
@@ -149,7 +159,10 @@ impl Command for Input {
         if !suppress_output {
             std::io::stdout().write_all(b"\n")?;
         }
-        Ok(Value::string(buf, call.head).into_pipeline_data())
+        match default_val {
+            Some(val) if buf.is_empty() => Ok(Value::string(val, call.head).into_pipeline_data()),
+            _ => Ok(Value::string(buf, call.head).into_pipeline_data()),
+        }
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -164,6 +177,11 @@ impl Command for Input {
                 example: "let user_input = (input --numchar 2)",
                 result: None,
             },
+            Example {
+                description: "Get input from the user with default value, and assign to a variable",
+                example: "let user_input = (input --default 10)",
+                result: None,
+            },
         ]
     }
 }

From 6e84ba182e2b4351c29c94241eadb5498431a6f7 Mon Sep 17 00:00:00 2001
From: Michel Lind <salimma@fedoraproject.org>
Date: Mon, 18 Nov 2024 18:26:31 -0600
Subject: [PATCH 0690/1072] Bump quick-xml to 0.37.0 (#14354)

# Description
Bump `quick-xml` to `0.37.0`.

This came about rebasing `nushell` in Fedora, which now has `quick-xml`
0.36.

There is one breaking change in 0.33 as far as `nu-command` is
concerned, in that `Event::PI` is now a dedicated `BytesPI` type:


https://github.com/tafia/quick-xml/blob/master/Changelog.md#misc-changes-5

I've tested compiling and testing locally with `0.33.0`, `0.36.0` and
`0.37.0` - but let's future-proof by requiring `0.37.0`.


# User-Facing Changes
N/A

# Tests + Formatting
No additional tests required, existing tests pass

# After Submitting
N/A

Signed-off-by: Michel Lind <salimma@fedoraproject.org>
---
 Cargo.lock                              | 1167 ++++++++++++++---------
 Cargo.toml                              |    2 +-
 crates/nu-command/src/formats/to/xml.rs |    4 +-
 3 files changed, 708 insertions(+), 465 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e6cef1232b..2821dab891 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,19 +4,13 @@ version = 3
 
 [[package]]
 name = "addr2line"
-version = "0.22.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
 [[package]]
 name = "adler2"
 version = "2.0.0"
@@ -88,9 +82,9 @@ dependencies = [
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.18"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
+checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9"
 
 [[package]]
 name = "alphanumeric-sort"
@@ -134,9 +128,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -149,49 +143,49 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.86"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
 
 [[package]]
 name = "arboard"
-version = "3.4.0"
+version = "3.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89"
+checksum = "df099ccb16cd014ff054ac1bf392c67feeef57164b05c42f037cd40f5d4357f4"
 dependencies = [
  "clipboard-win",
  "log",
@@ -258,9 +252,9 @@ dependencies = [
 
 [[package]]
 name = "async-stream"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
 dependencies = [
  "async-stream-impl",
  "futures-core",
@@ -269,9 +263,9 @@ dependencies = [
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -280,9 +274,9 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.81"
+version = "0.1.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -312,9 +306,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "avro-schema"
@@ -332,17 +326,17 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if",
  "libc",
- "miniz_oxide 0.7.4",
+ "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -354,12 +348,6 @@ dependencies = [
  "backtrace",
 ]
 
-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
 [[package]]
 name = "base64"
 version = "0.22.1"
@@ -368,16 +356,14 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bindgen"
-version = "0.69.4"
+version = "0.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
+checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f"
 dependencies = [
  "bitflags 2.6.0",
  "cexpr",
  "clang-sys",
- "itertools 0.12.1",
- "lazy_static",
- "lazycell",
+ "itertools 0.13.0",
  "proc-macro2",
  "quote",
  "regex",
@@ -448,9 +434,9 @@ dependencies = [
 
 [[package]]
 name = "borsh"
-version = "1.5.1"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed"
+checksum = "2506947f73ad44e344215ccd6403ac2ae18cd8e046e581a441bf8d199f257f03"
 dependencies = [
  "borsh-derive",
  "cfg_aliases 0.2.1",
@@ -458,16 +444,15 @@ dependencies = [
 
 [[package]]
 name = "borsh-derive"
-version = "1.5.1"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b"
+checksum = "c2593a3b8b938bd68373196c9832f516be11fa487ef4ae745eb282e6a56a7244"
 dependencies = [
  "once_cell",
  "proc-macro-crate",
  "proc-macro2",
  "quote",
  "syn 2.0.87",
- "syn_derive",
 ]
 
 [[package]]
@@ -499,9 +484,9 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
+checksum = "1a68f1f47cdf0ec8ee4b941b2eee2a80cb796db73118c0dd09ac63fbe405be22"
 dependencies = [
  "memchr",
  "regex-automata",
@@ -516,9 +501,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "byte-unit"
-version = "5.1.4"
+version = "5.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ac19bdf0b2665407c39d82dbc937e951e7e2001609f0fb32edd0af45a2d63e"
+checksum = "e1cd29c3c585209b0cbc7309bfe3ed7efd8c84c21b7af29c8bfae908f8777174"
 dependencies = [
  "rust_decimal",
  "serde",
@@ -555,18 +540,18 @@ checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce"
 
 [[package]]
 name = "bytemuck"
-version = "1.17.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31"
+checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d"
 dependencies = [
  "bytemuck_derive",
 ]
 
 [[package]]
 name = "bytemuck_derive"
-version = "1.7.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26"
+checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -625,9 +610,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.14"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932"
+checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47"
 dependencies = [
  "jobserver",
  "libc",
@@ -678,7 +663,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1f927b07c74ba84c7e5fe4db2baeb3e996ab2688992e39ac68ce3220a677c7e"
 dependencies = [
- "base64 0.22.1",
+ "base64",
  "encoding_rs",
 ]
 
@@ -773,9 +758,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.16"
+version = "4.5.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
+checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -783,22 +768,22 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.15"
+version = "4.5.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
+checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec"
 dependencies = [
  "anstream",
  "anstyle",
  "clap_lex",
  "strsim",
- "terminal_size",
+ "terminal_size 0.4.0",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.5.13"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -808,9 +793,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7"
 
 [[package]]
 name = "clipboard-win"
@@ -832,9 +817,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "colorz"
@@ -847,14 +832,14 @@ dependencies = [
 
 [[package]]
 name = "comfy-table"
-version = "7.1.1"
+version = "7.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7"
+checksum = "24f165e7b643266ea80cb858aed492ad9280e3e05ce24d4a99d7d7b889b6a4d9"
 dependencies = [
- "crossterm 0.27.0",
+ "crossterm 0.28.1",
  "strum",
  "strum_macros",
- "unicode-width",
+ "unicode-width 0.2.0",
 ]
 
 [[package]]
@@ -894,7 +879,7 @@ dependencies = [
  "encode_unicode",
  "lazy_static",
  "libc",
- "unicode-width",
+ "unicode-width 0.1.11",
  "windows-sys 0.52.0",
 ]
 
@@ -920,18 +905,18 @@ dependencies = [
 
 [[package]]
 name = "const_format"
-version = "0.2.32"
+version = "0.2.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673"
+checksum = "50c655d81ff1114fb0dcdea9225ea9f0cc712a6f8d189378e82bdf62a473a64b"
 dependencies = [
  "const_format_proc_macros",
 ]
 
 [[package]]
 name = "const_format_proc_macros"
-version = "0.2.32"
+version = "0.2.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500"
+checksum = "eff1a44b93f47b1bac19a27932f5c591e43d1ba357ee4f61526c8a25603f0eb1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -956,9 +941,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.13"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
+checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6"
 dependencies = [
  "libc",
 ]
@@ -1113,9 +1098,9 @@ dependencies = [
 
 [[package]]
 name = "csv"
-version = "1.3.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
+checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf"
 dependencies = [
  "csv-core",
  "itoa",
@@ -1144,9 +1129,9 @@ dependencies = [
 
 [[package]]
 name = "curl"
-version = "0.4.46"
+version = "0.4.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6"
+checksum = "d9fb4d13a1be2b58f14d60adba57c9834b78c62fd86c3e76a148f732686e9265"
 dependencies = [
  "curl-sys",
  "libc",
@@ -1159,9 +1144,9 @@ dependencies = [
 
 [[package]]
 name = "curl-sys"
-version = "0.4.74+curl-8.9.0"
+version = "0.4.78+curl-8.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8af10b986114528fcdc4b63b6f5f021b7057618411046a4de2ba0f0149a097bf"
+checksum = "8eec768341c5c7789611ae51cf6c459099f22e64a5d5d0ce4892434e33821eaf"
 dependencies = [
  "cc",
  "libc",
@@ -1218,7 +1203,7 @@ dependencies = [
  "console",
  "fuzzy-matcher",
  "shell-words",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -1264,6 +1249,17 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "dlib"
 version = "0.5.2"
@@ -1372,9 +1368,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.34"
+version = "0.8.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
 dependencies = [
  "cfg-if",
 ]
@@ -1452,9 +1448,9 @@ dependencies = [
 
 [[package]]
 name = "error-code"
-version = "3.2.0"
+version = "3.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b"
+checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f"
 
 [[package]]
 name = "ethnum"
@@ -1493,9 +1489,9 @@ checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c"
 
 [[package]]
 name = "fastrand"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4"
 
 [[package]]
 name = "fd-lock"
@@ -1510,11 +1506,11 @@ dependencies = [
 
 [[package]]
 name = "file-id"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6584280525fb2059cba3db2c04abf947a1a29a45ddae89f3870f8281704fafc9"
+checksum = "6bc904b9bbefcadbd8e3a9fb0d464a9b979de6324c03b3c663e8994f46a5be36"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1528,9 +1524,9 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.24"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
 dependencies = [
  "cfg-if",
  "libc",
@@ -1546,12 +1542,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.32"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666"
+checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.8.0",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -1569,6 +1565,12 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
+
 [[package]]
 name = "foreign-types"
 version = "0.3.2"
@@ -1626,9 +1628,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1641,9 +1643,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1651,15 +1653,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1668,15 +1670,15 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1685,21 +1687,21 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1766,9 +1768,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.29.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "git2"
@@ -1875,9 +1877,14 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash",
+]
 
 [[package]]
 name = "hashlink"
@@ -1995,9 +2002,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
 
 [[package]]
 name = "httpdate"
@@ -2014,7 +2021,7 @@ dependencies = [
  "chrono",
  "pest",
  "pest_derive",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -2025,9 +2032,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -2045,9 +2052,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.7"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
  "bytes",
  "futures-util",
@@ -2060,9 +2067,9 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -2087,17 +2094,146 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b7cab7543a8b7729a19e2c04309f902861293dcdae6558dfbeb634454d279f6"
 dependencies = [
- "thiserror",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
@@ -2107,21 +2243,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.0",
+ "hashbrown 0.15.1",
  "serde",
 ]
 
 [[package]]
 name = "indicatif"
-version = "0.17.8"
+version = "0.17.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
+checksum = "cbf675b85ed934d3c67b5c5469701eec7db22689d0a2139d856e0925fa28b281"
 dependencies = [
  "console",
- "instant",
  "number_prefix",
  "portable-atomic",
- "unicode-width",
+ "unicode-width 0.2.0",
+ "web-time",
 ]
 
 [[package]]
@@ -2144,15 +2280,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "interprocess"
 version = "2.2.1"
@@ -2216,9 +2343,9 @@ checksum = "06d198e9919d9822d5f7083ba8530e04de87841eaf21ead9af8f2304efd57c89"
 
 [[package]]
 name = "is_executable"
-version = "1.0.1"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa9acdc6d67b75e626ad644734e8bc6df893d9cd2a834129065d3dd6158ea9c8"
+checksum = "d4a1b5bad6f9072935961dfbf1cced2f3d129963d091b6f69f007fe04e758ae2"
 dependencies = [
  "winapi",
 ]
@@ -2285,9 +2412,9 @@ checksum = "72167d68f5fce3b8655487b8038691a3c9984ee769590f93f2a631f4ad64e4f5"
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2329,17 +2456,11 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
 [[package]]
 name = "lexical-core"
-version = "0.8.5"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46"
+checksum = "0431c65b318a590c1de6b8fd6e72798c92291d27762d94c9e6c37ed7a73d8458"
 dependencies = [
  "lexical-parse-float",
  "lexical-parse-integer",
@@ -2350,9 +2471,9 @@ dependencies = [
 
 [[package]]
 name = "lexical-parse-float"
-version = "0.8.5"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f"
+checksum = "eb17a4bdb9b418051aa59d41d65b1c9be5affab314a872e5ad7f06231fb3b4e0"
 dependencies = [
  "lexical-parse-integer",
  "lexical-util",
@@ -2361,9 +2482,9 @@ dependencies = [
 
 [[package]]
 name = "lexical-parse-integer"
-version = "0.8.6"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9"
+checksum = "5df98f4a4ab53bf8b175b363a34c7af608fe31f93cc1fb1bf07130622ca4ef61"
 dependencies = [
  "lexical-util",
  "static_assertions",
@@ -2371,18 +2492,18 @@ dependencies = [
 
 [[package]]
 name = "lexical-util"
-version = "0.8.5"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc"
+checksum = "85314db53332e5c192b6bca611fb10c114a80d1b831ddac0af1e9be1b9232ca0"
 dependencies = [
  "static_assertions",
 ]
 
 [[package]]
 name = "lexical-write-float"
-version = "0.8.5"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862"
+checksum = "6e7c3ad4e37db81c1cbe7cf34610340adc09c322871972f74877a712abc6c809"
 dependencies = [
  "lexical-util",
  "lexical-write-integer",
@@ -2391,9 +2512,9 @@ dependencies = [
 
 [[package]]
 name = "lexical-write-integer"
-version = "0.8.5"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446"
+checksum = "eb89e9f6958b83258afa3deed90b5de9ef68eef090ad5086c791cd2345610162"
 dependencies = [
  "lexical-util",
  "static_assertions",
@@ -2451,9 +2572,9 @@ dependencies = [
 
 [[package]]
 name = "libm"
-version = "0.2.8"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
 
 [[package]]
 name = "libmimalloc-sys"
@@ -2467,9 +2588,9 @@ dependencies = [
 
 [[package]]
 name = "libproc"
-version = "0.14.8"
+version = "0.14.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae9ea4b75e1a81675429dafe43441df1caea70081e82246a8cccf514884a88bb"
+checksum = "e78a09b56be5adbcad5aa1197371688dc6bb249a26da3bca2011ee2fb987ebfb"
 dependencies = [
  "bindgen",
  "errno",
@@ -2514,9 +2635,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.19"
+version = "1.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc53a7799a7496ebc9fd29f31f7df80e83c9bda5299768af5f9e59eeea74647"
+checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472"
 dependencies = [
  "cc",
  "libc",
@@ -2539,6 +2660,12 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
+[[package]]
+name = "litemap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -2557,11 +2684,11 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "lru"
-version = "0.12.4"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904"
+checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
 dependencies = [
- "hashbrown 0.14.5",
+ "hashbrown 0.15.1",
 ]
 
 [[package]]
@@ -2575,9 +2702,9 @@ dependencies = [
 
 [[package]]
 name = "lsp-server"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248f65b78f6db5d8e1b1604b4098a28b43d21a8eb1deeca22b1c421b276c7095"
+checksum = "550446e84739dcaf6d48a4a093973850669e13e8a34d8f8d64851041be267cd9"
 dependencies = [
  "crossbeam-channel",
  "log",
@@ -2600,19 +2727,18 @@ dependencies = [
 
 [[package]]
 name = "lz4"
-version = "1.26.0"
+version = "1.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "958b4caa893816eea05507c20cfe47574a43d9a697138a7872990bba8a0ece68"
+checksum = "4d1febb2b4a79ddd1980eede06a8f7902197960aa0383ffcfdd62fe723036725"
 dependencies = [
- "libc",
  "lz4-sys",
 ]
 
 [[package]]
 name = "lz4-sys"
-version = "1.10.0"
+version = "1.11.1+lz4-1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "109de74d5d2353660401699a4174a4ff23fcc649caf553df71933c7fb45ad868"
+checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6"
 dependencies = [
  "cc",
  "libc",
@@ -2709,13 +2835,13 @@ dependencies = [
  "cfg-if",
  "miette-derive",
  "owo-colors",
- "supports-color 3.0.0",
+ "supports-color 3.0.1",
  "supports-hyperlinks",
  "supports-unicode",
- "terminal_size",
+ "terminal_size 0.3.0",
  "textwrap",
- "thiserror",
- "unicode-width",
+ "thiserror 1.0.69",
+ "unicode-width 0.1.11",
 ]
 
 [[package]]
@@ -2760,15 +2886,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
-[[package]]
-name = "miniz_oxide"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.8.0"
@@ -3135,7 +3252,7 @@ name = "nu-command"
 version = "0.100.1"
 dependencies = [
  "alphanumeric-sort",
- "base64 0.22.1",
+ "base64",
  "bracoxide",
  "brotli",
  "byteorder",
@@ -3197,7 +3314,7 @@ dependencies = [
  "pretty_assertions",
  "print-positions",
  "procfs",
- "quick-xml 0.32.0",
+ "quick-xml 0.37.0",
  "quickcheck",
  "quickcheck_macros",
  "rand",
@@ -3216,13 +3333,13 @@ dependencies = [
  "sysinfo 0.32.0",
  "tabled",
  "tempfile",
- "terminal_size",
+ "terminal_size 0.3.0",
  "titlecase",
  "toml 0.8.19",
  "trash",
  "umask",
  "unicode-segmentation",
- "unicode-width",
+ "unicode-width 0.1.11",
  "ureq",
  "url",
  "uu_cp",
@@ -3237,7 +3354,7 @@ dependencies = [
  "v_htmlescape",
  "wax",
  "which",
- "windows",
+ "windows 0.56.0",
  "winreg",
 ]
 
@@ -3261,7 +3378,7 @@ dependencies = [
  "nu-path",
  "nu-protocol",
  "nu-utils",
- "terminal_size",
+ "terminal_size 0.3.0",
 ]
 
 [[package]]
@@ -3285,8 +3402,8 @@ dependencies = [
  "nu-utils",
  "ratatui",
  "strip-ansi-escapes",
- "terminal_size",
- "unicode-width",
+ "terminal_size 0.3.0",
+ "unicode-width 0.1.11",
 ]
 
 [[package]]
@@ -3368,7 +3485,7 @@ dependencies = [
  "nu-protocol",
  "nu-utils",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
  "typetag",
 ]
 
@@ -3383,7 +3500,7 @@ dependencies = [
  "rmp-serde",
  "serde",
  "serde_json",
- "windows",
+ "windows 0.56.0",
 ]
 
 [[package]]
@@ -3399,7 +3516,7 @@ dependencies = [
  "nu-utils",
  "serde",
  "typetag",
- "windows",
+ "windows 0.56.0",
 ]
 
 [[package]]
@@ -3474,7 +3591,7 @@ dependencies = [
  "strum",
  "strum_macros",
  "tempfile",
- "thiserror",
+ "thiserror 1.0.69",
  "typetag",
  "windows-sys 0.48.0",
 ]
@@ -3504,7 +3621,7 @@ dependencies = [
  "ntapi",
  "procfs",
  "sysinfo 0.32.0",
- "windows",
+ "windows 0.56.0",
 ]
 
 [[package]]
@@ -3518,7 +3635,7 @@ dependencies = [
  "nu-protocol",
  "nu-utils",
  "tabled",
- "terminal_size",
+ "terminal_size 0.3.0",
 ]
 
 [[package]]
@@ -3526,7 +3643,7 @@ name = "nu-term-grid"
 version = "0.100.1"
 dependencies = [
  "nu-utils",
- "unicode-width",
+ "unicode-width 0.1.11",
 ]
 
 [[package]]
@@ -3887,9 +4004,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.3"
+version = "0.36.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
 dependencies = [
  "memchr",
 ]
@@ -3914,18 +4031,15 @@ checksum = "80adb31078122c880307e9cdfd4e3361e6545c319f9b9dcafcb03acd3b51a575"
 
 [[package]]
 name = "once_cell"
-version = "1.20.1"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
-dependencies = [
- "portable-atomic",
-]
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "open"
-version = "5.3.0"
+version = "5.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3"
+checksum = "3ecd52f0b8d15c40ce4820aa251ed5de032e5d91fab27f7db2f40d42a8bdf69c"
 dependencies = [
  "is-wsl",
  "libc",
@@ -3934,9 +4048,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.66"
+version = "0.10.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
+checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
 dependencies = [
  "bitflags 2.6.0",
  "cfg-if",
@@ -3966,18 +4080,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-src"
-version = "300.3.1+3.3.1"
+version = "300.4.0+3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91"
+checksum = "a709e02f2b4aca747929cca5ed248880847c650233cf8b8cdc48f40aaf4898a6"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.103"
+version = "0.9.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
+checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
 dependencies = [
  "cc",
  "libc",
@@ -4008,7 +4122,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a6229bad892b46b0dcfaaeb18ad0d2e56400f5aaea05b768bde96e73676cf75"
 dependencies = [
- "unicode-width",
+ "unicode-width 0.1.11",
 ]
 
 [[package]]
@@ -4023,9 +4137,9 @@ dependencies = [
 
 [[package]]
 name = "owo-colors"
-version = "4.0.0"
+version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f"
+checksum = "fb37767f6569cd834a413442455e0f066d0d522de8630436e2a1761d9726ba56"
 
 [[package]]
 name = "papergrid"
@@ -4037,7 +4151,7 @@ dependencies = [
  "ansitok",
  "bytecount",
  "fnv",
- "unicode-width",
+ "unicode-width 0.1.11",
 ]
 
 [[package]]
@@ -4101,9 +4215,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "pathdiff"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
+checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361"
 
 [[package]]
 name = "percent-encoding"
@@ -4119,20 +4233,20 @@ checksum = "f658886ed52e196e850cfbbfddab9eaa7f6d90dd0929e264c31e5cec07e09e57"
 
 [[package]]
 name = "pest"
-version = "2.7.11"
+version = "2.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95"
+checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442"
 dependencies = [
  "memchr",
- "thiserror",
+ "thiserror 1.0.69",
  "ucd-trie",
 ]
 
 [[package]]
 name = "pest_derive"
-version = "2.7.11"
+version = "2.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a"
+checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd"
 dependencies = [
  "pest",
  "pest_generator",
@@ -4140,9 +4254,9 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.11"
+version = "2.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183"
+checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e"
 dependencies = [
  "pest",
  "pest_meta",
@@ -4153,9 +4267,9 @@ dependencies = [
 
 [[package]]
 name = "pest_meta"
-version = "2.7.11"
+version = "2.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f"
+checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d"
 dependencies = [
  "once_cell",
  "pest",
@@ -4245,9 +4359,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "pin-utils"
@@ -4257,9 +4371,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "plain"
@@ -4278,9 +4392,9 @@ dependencies = [
 
 [[package]]
 name = "platform-info"
-version = "2.0.3"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5ff316b9c4642feda973c18f0decd6c8b0919d4722566f6e4337cce0dd88217"
+checksum = "91077ffd05d058d70d79eefcd7d7f6aac34980860a7519960f7913b6563a8c3a"
 dependencies = [
  "libc",
  "winapi",
@@ -4292,7 +4406,7 @@ version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016"
 dependencies = [
- "base64 0.22.1",
+ "base64",
  "indexmap",
  "quick-xml 0.32.0",
  "serde",
@@ -4413,7 +4527,7 @@ dependencies = [
  "regex",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
  "version_check",
  "xxhash-rust",
 ]
@@ -4428,7 +4542,7 @@ dependencies = [
  "polars-arrow-format",
  "regex",
  "simdutf8",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -4567,7 +4681,7 @@ checksum = "5ac14a136d87bea798f3db51d5987556deb2293da34bfc8b105ebffa05f6e810"
 dependencies = [
  "ahash 0.8.11",
  "argminmax",
- "base64 0.22.1",
+ "base64",
  "bytemuck",
  "chrono",
  "chrono-tz 0.8.6",
@@ -4603,7 +4717,7 @@ checksum = "491f5af321169259d5b1294c9fe8ed89faaeac34b4dec4abcedc0d1b3d11013a"
 dependencies = [
  "ahash 0.8.11",
  "async-stream",
- "base64 0.22.1",
+ "base64",
  "brotli",
  "bytemuck",
  "ethnum",
@@ -4787,9 +4901,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.7.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
 
 [[package]]
 name = "powerfmt"
@@ -4841,9 +4955,9 @@ dependencies = [
 
 [[package]]
 name = "pretty_assertions"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
+checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
 dependencies = [
  "diff",
  "yansi",
@@ -4860,11 +4974,11 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.1.0"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
 dependencies = [
- "toml_edit 0.21.1",
+ "toml_edit 0.22.22",
 ]
 
 [[package]]
@@ -4892,9 +5006,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
 dependencies = [
  "unicode-ident",
 ]
@@ -4927,9 +5041,9 @@ dependencies = [
 
 [[package]]
 name = "psm"
-version = "0.1.21"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
+checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810"
 dependencies = [
  "cc",
 ]
@@ -4967,7 +5081,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72c71c0c79b9701efe4e1e4b563b2016dd4ee789eb99badcb09d61ac4b92e4a2"
 dependencies = [
  "libc",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -5003,9 +5117,18 @@ dependencies = [
 
 [[package]]
 name = "quick-xml"
-version = "0.34.0"
+version = "0.36.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4"
+checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "quick-xml"
+version = "0.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffbfb3ddf5364c9cfcd65549a1e7b801d0e8d1b14c1a1590a6408aa93cfbfa84"
 dependencies = [
  "memchr",
 ]
@@ -5110,14 +5233,14 @@ dependencies = [
  "strum",
  "unicode-segmentation",
  "unicode-truncate",
- "unicode-width",
+ "unicode-width 0.1.11",
 ]
 
 [[package]]
 name = "raw-cpuid"
-version = "11.1.0"
+version = "11.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d"
+checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -5170,9 +5293,9 @@ checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175"
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -5185,7 +5308,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
  "getrandom",
  "libredox",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -5206,9 +5329,9 @@ dependencies = [
  "strip-ansi-escapes",
  "strum",
  "strum_macros",
- "thiserror",
+ "thiserror 1.0.69",
  "unicode-segmentation",
- "unicode-width",
+ "unicode-width 0.1.11",
 ]
 
 [[package]]
@@ -5233,9 +5356,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -5245,9 +5368,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -5256,9 +5379,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "relative-path"
@@ -5277,16 +5400,16 @@ dependencies = [
 
 [[package]]
 name = "rfc2047-decoder"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e90a668c463c412c3118ae1883e18b53d812c349f5af7a06de3ba4bb0c17cc73"
+checksum = "bc36545d1021456a751b573517cb52e8c339b2f662e6b2778ef629282678de29"
 dependencies = [
- "base64 0.21.7",
+ "base64",
  "charset",
  "chumsky",
  "memchr",
  "quoted_printable",
- "thiserror",
+ "thiserror 2.0.3",
 ]
 
 [[package]]
@@ -5501,9 +5624,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
 
 [[package]]
 name = "ryu"
@@ -5522,20 +5645,20 @@ dependencies = [
 
 [[package]]
 name = "scc"
-version = "2.1.16"
+version = "2.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aeb7ac86243095b70a7920639507b71d51a63390d1ba26c4f60a552fbb914a37"
+checksum = "66b202022bb57c049555430e11fc22fea12909276a80a4c3d368da36ac1d88ed"
 dependencies = [
  "sdd",
 ]
 
 [[package]]
 name = "schannel"
-version = "0.1.23"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -5587,9 +5710,9 @@ dependencies = [
 
 [[package]]
 name = "sdd"
-version = "3.0.2"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0495e4577c672de8254beb68d01a9b62d0e8a13c099edecdbedccce3223cd29f"
+checksum = "49c1eeaf4b6a87c7479688c6d52b9f1153cedd3c489300564f932b065c6eab95"
 
 [[package]]
 name = "seahash"
@@ -5612,9 +5735,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.1"
+version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -5647,18 +5770,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.208"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.208"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5667,9 +5790,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.127"
+version = "1.0.132"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
 dependencies = [
  "indexmap",
  "itoa",
@@ -5691,9 +5814,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -5770,9 +5893,9 @@ dependencies = [
 
 [[package]]
 name = "shadow-rs"
-version = "0.35.0"
+version = "0.35.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fca0e9bdc073d7173ba993fb7886477af5df75588b57afcb4b96f21911ab0bfa"
+checksum = "f1b2328fb3ec0d5302f95915e7e77cfc2ff943714d9970bc4b66e9eacf318687"
 dependencies = [
  "const_format",
  "is_debug",
@@ -5824,9 +5947,9 @@ dependencies = [
 
 [[package]]
 name = "simd-json"
-version = "0.13.10"
+version = "0.13.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "570c430b3d902ea083097e853263ae782dfe40857d93db019a12356c8e8143fa"
+checksum = "a0228a564470f81724e30996bbc2b171713b37b15254a6440c7e2d5449b95691"
 dependencies = [
  "ahash 0.8.11",
  "getrandom",
@@ -5842,9 +5965,9 @@ dependencies = [
 
 [[package]]
 name = "simdutf8"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
 
 [[package]]
 name = "similar"
@@ -5933,15 +6056,15 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
 name = "stacker"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a5daa25ea337c85ed954c0496e3bdd2c7308cc3b24cf7b50d04876654c579f"
+checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b"
 dependencies = [
  "cc",
  "cfg-if",
  "libc",
  "psm",
- "windows-sys 0.36.1",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -5952,9 +6075,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "str_indices"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9557cb6521e8d009c51a8666f09356f4b817ba9ba0981a305bd86aee47bd35c"
+checksum = "d08889ec5408683408db66ad89e0e1f93dff55c73a4ccc71c427d5b277ee47e6"
 
 [[package]]
 name = "streaming-decompression"
@@ -6052,9 +6175,9 @@ dependencies = [
 
 [[package]]
 name = "supports-color"
-version = "3.0.0"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9829b314621dfc575df4e409e79f9d6a66a3bd707ab73f23cb4aa3a854ac854f"
+checksum = "8775305acf21c96926c900ad056abeef436701108518cf890020387236ac5a77"
 dependencies = [
  "is_ci",
 ]
@@ -6115,12 +6238,11 @@ dependencies = [
 ]
 
 [[package]]
-name = "syn_derive"
-version = "0.1.8"
+name = "synstructure"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
- "proc-macro-error",
  "proc-macro2",
  "quote",
  "syn 2.0.87",
@@ -6128,9 +6250,9 @@ dependencies = [
 
 [[package]]
 name = "sys-locale"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0"
+checksum = "8eab9a99a024a169fe8a903cf9d4a3b3601109bcc13bd9e3c6fff259138626c4"
 dependencies = [
  "libc",
 ]
@@ -6145,7 +6267,7 @@ dependencies = [
  "libc",
  "memchr",
  "ntapi",
- "windows",
+ "windows 0.57.0",
 ]
 
 [[package]]
@@ -6159,7 +6281,7 @@ dependencies = [
  "memchr",
  "ntapi",
  "rayon",
- "windows",
+ "windows 0.57.0",
 ]
 
 [[package]]
@@ -6191,7 +6313,7 @@ dependencies = [
  "rand",
  "scroll",
  "tempfile",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -6249,6 +6371,16 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "terminal_size"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef"
+dependencies = [
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "termtree"
 version = "0.4.1"
@@ -6263,23 +6395,43 @@ checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
 dependencies = [
  "smawk",
  "unicode-linebreak",
- "unicode-width",
+ "unicode-width 0.1.11",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
- "thiserror-impl",
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa"
+dependencies = [
+ "thiserror-impl 2.0.3",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6338,6 +6490,16 @@ dependencies = [
  "crunchy",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tinyvec"
 version = "1.8.0"
@@ -6366,9 +6528,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.39.3"
+version = "1.41.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5"
+checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33"
 dependencies = [
  "backtrace",
  "bytes",
@@ -6382,9 +6544,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.11"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
 dependencies = [
  "bytes",
  "futures-core",
@@ -6415,7 +6577,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.20",
+ "toml_edit 0.22.22",
 ]
 
 [[package]]
@@ -6442,26 +6604,15 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.21.1"
+version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
-dependencies = [
- "indexmap",
- "toml_datetime",
- "winnow 0.5.40",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
  "indexmap",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.18",
+ "winnow 0.6.20",
 ]
 
 [[package]]
@@ -6497,17 +6648,16 @@ dependencies = [
  "once_cell",
  "scopeguard",
  "urlencoding",
- "windows",
+ "windows 0.56.0",
 ]
 
 [[package]]
 name = "tree_magic_mini"
-version = "3.1.5"
+version = "3.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469a727cac55b41448315cc10427c069c618ac59bb6a4480283fcd811749bdc2"
+checksum = "aac5e8971f245c3389a5a76e648bfc80803ae066a1243a75db0064d7c1129d63"
 dependencies = [
  "fnv",
- "home",
  "memchr",
  "nom",
  "once_cell",
@@ -6564,9 +6714,9 @@ dependencies = [
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
+checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
 
 [[package]]
 name = "umask"
@@ -6574,7 +6724,7 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec9a46c2549e35c054e0ffe281a3a6ec0007793db4df106604d37ed3f4d73d1c"
 dependencies = [
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -6583,12 +6733,6 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df"
 
-[[package]]
-name = "unicode-bidi"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.13"
@@ -6601,15 +6745,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
 
-[[package]]
-name = "unicode-normalization"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
-
 [[package]]
 name = "unicode-reverse"
 version = "1.0.9"
@@ -6633,7 +6768,7 @@ checksum = "b3644627a5af5fa321c95b9b235a72fd24cd29c648c2c379431e6628655627bf"
 dependencies = [
  "itertools 0.13.0",
  "unicode-segmentation",
- "unicode-width",
+ "unicode-width 0.1.11",
 ]
 
 [[package]]
@@ -6643,10 +6778,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
 
 [[package]]
-name = "unicode-xid"
-version = "0.2.5"
+name = "unicode-width"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "unsafe-libyaml"
@@ -6660,7 +6801,7 @@ version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a"
 dependencies = [
- "base64 0.22.1",
+ "base64",
  "encoding_rs",
  "flate2",
  "log",
@@ -6673,9 +6814,9 @@ dependencies = [
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -6695,12 +6836,24 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
 [[package]]
 name = "utf8-width"
 version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3"
 
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -6931,9 +7084,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -6942,9 +7095,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
 dependencies = [
  "bumpalo",
  "log",
@@ -6957,9 +7110,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6967,9 +7120,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6980,9 +7133,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
 
 [[package]]
 name = "wax"
@@ -6995,15 +7148,15 @@ dependencies = [
  "nom",
  "pori",
  "regex",
- "thiserror",
+ "thiserror 1.0.69",
  "walkdir",
 ]
 
 [[package]]
 name = "wayland-backend"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993"
+checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6"
 dependencies = [
  "cc",
  "downcast-rs",
@@ -7015,9 +7168,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-client"
-version = "0.31.5"
+version = "0.31.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943"
+checksum = "b66249d3fc69f76fd74c82cc319300faa554e9d865dab1f7cd66cc20db10b280"
 dependencies = [
  "bitflags 2.6.0",
  "rustix",
@@ -7052,26 +7205,36 @@ dependencies = [
 
 [[package]]
 name = "wayland-scanner"
-version = "0.31.4"
+version = "0.31.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6"
+checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3"
 dependencies = [
  "proc-macro2",
- "quick-xml 0.34.0",
+ "quick-xml 0.36.2",
  "quote",
 ]
 
 [[package]]
 name = "wayland-sys"
-version = "0.31.4"
+version = "0.31.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148"
+checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09"
 dependencies = [
  "dlib",
  "log",
  "pkg-config",
 ]
 
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "webpage"
 version = "2.0.1"
@@ -7154,6 +7317,16 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
+dependencies = [
+ "windows-core 0.57.0",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-core"
 version = "0.52.0"
@@ -7169,8 +7342,20 @@ version = "0.56.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6"
 dependencies = [
- "windows-implement",
- "windows-interface",
+ "windows-implement 0.56.0",
+ "windows-interface 0.56.0",
+ "windows-result",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
+dependencies = [
+ "windows-implement 0.57.0",
+ "windows-interface 0.57.0",
  "windows-result",
  "windows-targets 0.52.6",
 ]
@@ -7186,6 +7371,17 @@ dependencies = [
  "syn 2.0.87",
 ]
 
+[[package]]
+name = "windows-implement"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "windows-interface"
 version = "0.56.0"
@@ -7197,6 +7393,17 @@ dependencies = [
  "syn 2.0.87",
 ]
 
+[[package]]
+name = "windows-interface"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "windows-result"
 version = "0.1.2"
@@ -7206,19 +7413,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
-dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -7289,12 +7483,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -7307,12 +7495,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -7331,12 +7513,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -7349,12 +7525,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
@@ -7379,12 +7549,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -7408,9 +7572,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.6.18"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
 dependencies = [
  "memchr",
 ]
@@ -7453,7 +7617,7 @@ dependencies = [
  "nix 0.28.0",
  "os_pipe",
  "tempfile",
- "thiserror",
+ "thiserror 1.0.69",
  "tree_magic_mini",
  "wayland-backend",
  "wayland-client",
@@ -7461,6 +7625,18 @@ dependencies = [
  "wayland-protocols-wlr",
 ]
 
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "wyz"
 version = "0.5.1"
@@ -7517,9 +7693,33 @@ checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984"
 
 [[package]]
 name = "yansi"
-version = "0.5.1"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
+
+[[package]]
+name = "yoke"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "synstructure",
+]
 
 [[package]]
 name = "zerocopy"
@@ -7542,6 +7742,49 @@ dependencies = [
  "syn 2.0.87",
 ]
 
+[[package]]
+name = "zerofrom"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "synstructure",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "zip"
 version = "0.6.6"
diff --git a/Cargo.toml b/Cargo.toml
index 0b796573c8..ad2e886ad8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -129,7 +129,7 @@ proc-macro-error = { version = "1.0", default-features = false }
 proc-macro2 = "1.0"
 procfs = "0.16.0"
 pwd = "1.3"
-quick-xml = "0.32.0"
+quick-xml = "0.37.0"
 quickcheck = "1.0"
 quickcheck_macros = "1.0"
 quote = "1.0"
diff --git a/crates/nu-command/src/formats/to/xml.rs b/crates/nu-command/src/formats/to/xml.rs
index 77708aa375..4476f654c2 100644
--- a/crates/nu-command/src/formats/to/xml.rs
+++ b/crates/nu-command/src/formats/to/xml.rs
@@ -4,7 +4,7 @@ use nu_engine::command_prelude::*;
 
 use quick_xml::{
     escape,
-    events::{BytesEnd, BytesStart, BytesText, Event},
+    events::{BytesEnd, BytesPI, BytesStart, BytesText, Event},
 };
 use std::{borrow::Cow, io::Cursor};
 
@@ -406,7 +406,7 @@ impl Job {
         let content_text = format!("{} {}", tag, content);
         // PI content must NOT be escaped
         // https://www.w3.org/TR/xml/#sec-pi
-        let pi_content = BytesText::from_escaped(content_text.as_str());
+        let pi_content = BytesPI::new(content_text.as_str());
 
         self.writer
             .write_event(Event::PI(pi_content))

From d69e13145040e25807aa9ee147d9de3fa53b5764 Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Tue, 19 Nov 2024 08:04:29 -0500
Subject: [PATCH 0691/1072] Rely on `display_output` hook for formatting values
 from evaluations (#14361)

# Description

I was reading through the documentation yesterday, when I stumbled upon
[this
section](https://www.nushell.sh/book/pipelines.html#behind-the-scenes)
explaining how command output is formatted using the `table` command. I
was surprised that this section didn't mention the `display_output`
hook, so I took a look in the code and was shocked to discovered that
the documentation was correct, and the `table` command _is_
automatically applied to printed pipelines.

This auto-tabling has two ramifications for the `display_output` hook:

1. The `table` command is called on the output of a pipeline after the
`display_output` has run, even if `display_output` contains the table
command. This means each pipeline output is roughly equivalent to the
following (using `ls` as an example):
    ```nushell
    ls | do $config.hooks.display_output | table
    ```
2. If `display_output` returns structured data, it will _still_ be
formatted through the table command.

This PR removes the auto-table when the `display_output` hook is set.
The auto-table made sense before `display_output` was introduced, but to
me, it now seems like unnecessary "automagic" which can be accomplished
using existing Nushell features.

This means that you can now pull back the curtain a bit, and replace
your `display_output` hook with an empty closure
(`$env.config.hooks.display_output = {||}`, setting it to null retains
the previous behavior) to see the values printed normally without the
table formatting. I think this is a good thing, and makes it easier to
understand Nushell fundamentals.

It is important to note that this PR does not change how `print` and
other commands (well, specifically only `watch`) print out values. They
continue to use `table` with no arguments, so changing your
config/`display_output` hook won't affect what `print`ing a value does.

Rel: [Discord
discussion](https://discord.com/channels/601130461678272522/615329862395101194/1307102690848931904)
(cc @dcarosone)

# User-Facing Changes

Pipelines are no longer automatically formatted using the `table`
command. Instead, the `display_output` hook is used to format pipeline
output. Most users should see no impact, as the default `display_output`
hook already uses the `table` command.

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting


Will update mentioned docs page to call out `display_output` hook.
---
 crates/nu-cli/src/eval_cmds.rs                |  4 +-
 crates/nu-cli/src/eval_file.rs                |  4 +-
 crates/nu-cli/src/print.rs                    | 10 +++-
 crates/nu-cli/src/util.rs                     | 57 ++++++++++---------
 crates/nu-command/src/filesystem/watch.rs     |  2 +-
 .../nu-protocol/src/pipeline/pipeline_data.rs |  9 ++-
 6 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/crates/nu-cli/src/eval_cmds.rs b/crates/nu-cli/src/eval_cmds.rs
index f0bebfc884..663185a4a2 100644
--- a/crates/nu-cli/src/eval_cmds.rs
+++ b/crates/nu-cli/src/eval_cmds.rs
@@ -9,6 +9,8 @@ use nu_protocol::{
 };
 use std::sync::Arc;
 
+use crate::util::print_pipeline;
+
 #[derive(Default)]
 pub struct EvaluateCommandsOpts {
     pub table_mode: Option<Value>,
@@ -93,7 +95,7 @@ pub fn evaluate_commands(
             t_mode.coerce_str()?.parse().unwrap_or_default();
     }
 
-    pipeline.print(engine_state, stack, no_newline, false)?;
+    print_pipeline(engine_state, stack, pipeline, no_newline)?;
 
     info!("evaluate {}:{}:{}", file!(), line!(), column!());
 
diff --git a/crates/nu-cli/src/eval_file.rs b/crates/nu-cli/src/eval_file.rs
index df75f7e4f8..7636adc8d4 100644
--- a/crates/nu-cli/src/eval_file.rs
+++ b/crates/nu-cli/src/eval_file.rs
@@ -1,4 +1,4 @@
-use crate::util::eval_source;
+use crate::util::{eval_source, print_pipeline};
 use log::{info, trace};
 use nu_engine::{convert_env_values, eval_block};
 use nu_parser::parse;
@@ -119,7 +119,7 @@ pub fn evaluate_file(
             };
 
         // Print the pipeline output of the last command of the file.
-        pipeline.print(engine_state, stack, true, false)?;
+        print_pipeline(engine_state, stack, pipeline, true)?;
 
         // Invoke the main command with arguments.
         // Arguments with whitespaces are quoted, thus can be safely concatenated by whitespace.
diff --git a/crates/nu-cli/src/print.rs b/crates/nu-cli/src/print.rs
index ffb0366242..40660ecf13 100644
--- a/crates/nu-cli/src/print.rs
+++ b/crates/nu-cli/src/print.rs
@@ -65,8 +65,12 @@ Since this command has no output, there is no point in piping it with other comm
                     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)?;
+                    arg.into_pipeline_data().print_table(
+                        engine_state,
+                        stack,
+                        no_newline,
+                        to_stderr,
+                    )?;
                 }
             }
         } else if !input.is_nothing() {
@@ -78,7 +82,7 @@ Since this command has no output, there is no point in piping it with other comm
             if raw {
                 input.print_raw(engine_state, no_newline, to_stderr)?;
             } else {
-                input.print(engine_state, stack, no_newline, to_stderr)?;
+                input.print_table(engine_state, stack, no_newline, to_stderr)?;
             }
         }
 
diff --git a/crates/nu-cli/src/util.rs b/crates/nu-cli/src/util.rs
index 67bc1ad8ef..3e69657857 100644
--- a/crates/nu-cli/src/util.rs
+++ b/crates/nu-cli/src/util.rs
@@ -201,6 +201,35 @@ fn gather_env_vars(
     }
 }
 
+/// Print a pipeline with formatting applied based on display_output hook.
+///
+/// This function should be preferred when printing values resulting from a completed evaluation.
+/// For values printed as part of a command's execution, such as values printed by the `print` command,
+/// the `PipelineData::print_table` function should be preferred instead as it is not config-dependent.
+///
+/// `no_newline` controls if we need to attach newline character to output.
+pub fn print_pipeline(
+    engine_state: &mut EngineState,
+    stack: &mut Stack,
+    pipeline: PipelineData,
+    no_newline: bool,
+) -> Result<(), ShellError> {
+    if let Some(hook) = engine_state.get_config().hooks.display_output.clone() {
+        let pipeline = eval_hook(
+            engine_state,
+            stack,
+            Some(pipeline),
+            vec![],
+            &hook,
+            "display_output",
+        )?;
+        pipeline.print_raw(engine_state, no_newline, false)
+    } else {
+        // if display_output isn't set, we should still prefer to print with some formatting
+        pipeline.print_table(engine_state, stack, no_newline, false)
+    }
+}
+
 pub fn eval_source(
     engine_state: &mut EngineState,
     stack: &mut Stack,
@@ -281,36 +310,12 @@ fn evaluate_source(
         eval_block::<WithoutDebug>(engine_state, stack, &block, input)
     }?;
 
-    if let PipelineData::ByteStream(..) = pipeline {
-        // run the display hook on bytestreams too
-        run_display_hook(engine_state, stack, pipeline, false)
-    } else {
-        run_display_hook(engine_state, stack, pipeline, true)
-    }?;
+    let no_newline = matches!(&pipeline, &PipelineData::ByteStream(..));
+    print_pipeline(engine_state, stack, pipeline, no_newline)?;
 
     Ok(false)
 }
 
-fn run_display_hook(
-    engine_state: &mut EngineState,
-    stack: &mut Stack,
-    pipeline: PipelineData,
-    no_newline: bool,
-) -> Result<(), ShellError> {
-    if let Some(hook) = engine_state.get_config().hooks.display_output.clone() {
-        let pipeline = eval_hook(
-            engine_state,
-            stack,
-            Some(pipeline),
-            vec![],
-            &hook,
-            "display_output",
-        )?;
-        pipeline.print(engine_state, stack, no_newline, false)
-    } else {
-        pipeline.print(engine_state, stack, no_newline, false)
-    }
-}
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/crates/nu-command/src/filesystem/watch.rs b/crates/nu-command/src/filesystem/watch.rs
index 6f022acca8..dd21304173 100644
--- a/crates/nu-command/src/filesystem/watch.rs
+++ b/crates/nu-command/src/filesystem/watch.rs
@@ -194,7 +194,7 @@ impl Command for Watch {
 
                 match result {
                     Ok(val) => {
-                        val.print(engine_state, stack, false, false)?;
+                        val.print_table(engine_state, stack, false, false)?;
                     }
                     Err(err) => {
                         let working_set = StateWorkingSet::new(engine_state);
diff --git a/crates/nu-protocol/src/pipeline/pipeline_data.rs b/crates/nu-protocol/src/pipeline/pipeline_data.rs
index 827f6e31a7..75449f547f 100644
--- a/crates/nu-protocol/src/pipeline/pipeline_data.rs
+++ b/crates/nu-protocol/src/pipeline/pipeline_data.rs
@@ -203,7 +203,7 @@ impl PipelineData {
     ) -> Result<Self, ShellError> {
         match stack.pipe_stdout().unwrap_or(&OutDest::Inherit) {
             OutDest::Print => {
-                self.print(engine_state, stack, false, false)?;
+                self.print_table(engine_state, stack, false, false)?;
                 Ok(Self::Empty)
             }
             OutDest::Pipe | OutDest::PipeSeparate => Ok(self),
@@ -534,11 +534,14 @@ impl PipelineData {
         }
     }
 
-    /// Consume and print self data immediately.
+    /// Consume and print self data immediately, formatted using table command.
+    ///
+    /// This does not respect the display_output hook. If a value is being printed out by a command,
+    /// this function should be used. Otherwise, `nu_cli::util::print_pipeline` should be preferred.
     ///
     /// `no_newline` controls if we need to attach newline character to output.
     /// `to_stderr` controls if data is output to stderr, when the value is false, the data is output to stdout.
-    pub fn print(
+    pub fn print_table(
         self,
         engine_state: &EngineState,
         stack: &mut Stack,

From 9cffbdb42ac90055754e36b23afc6368e34e2983 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Tue, 19 Nov 2024 21:52:58 +0800
Subject: [PATCH 0692/1072] remove deprecated warnings (#14386)

# Description
While looking into nushell deprecated relative code, I found `str
contains` have some warnings, but it should be removed.
---
 crates/nu-command/src/strings/str_/contains.rs | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/crates/nu-command/src/strings/str_/contains.rs b/crates/nu-command/src/strings/str_/contains.rs
index de91768e76..d24fac6668 100644
--- a/crates/nu-command/src/strings/str_/contains.rs
+++ b/crates/nu-command/src/strings/str_/contains.rs
@@ -77,20 +77,6 @@ impl Command for SubCommand {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        if call.has_flag_const(working_set, "not")? {
-            nu_protocol::report_shell_error(
-                working_set.permanent(),
-                &ShellError::GenericError {
-                    error: "Deprecated option".into(),
-                    msg: "`str contains --not {string}` is deprecated and will be removed in 0.95."
-                        .into(),
-                    span: Some(call.head),
-                    help: Some("Please use the `not` operator instead.".into()),
-                    inner: vec![],
-                },
-            );
-        }
-
         let cell_paths: Vec<CellPath> = call.rest_const(working_set, 1)?;
         let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
         let args = Arguments {

From b6ce907928d872957e3b47f95a9ccda80f1eed9c Mon Sep 17 00:00:00 2001
From: Maxim Zhiburt <zhiburt@gmail.com>
Date: Wed, 20 Nov 2024 00:31:28 +0300
Subject: [PATCH 0693/1072] =?UTF-8?q?nu-table/=20Do=20footer=5Finheritance?=
 =?UTF-8?q?=20by=20accouting=20for=20rows=20rather=20then=20a=20f=E2=80=A6?=
 =?UTF-8?q?=20(#14380)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

So it's my take on the comments in #14060

The change could be seen in this test.
Looks like it works :) but I haven't done a lot of testing.


https://github.com/zhiburt/nushell/blob/0b1af774157c182675e471e67c184f6080721794/crates/nu-command/tests/commands/table.rs#L3032-L3062

```nushell
$env.config.table.footer_inheritance = true;
$env.config.footer_mode = 7;
[[a b]; ['kv' {0: [[field]; [0] [1] [2] [3] [4] [5]]} ], ['data' 0], ['data' 0] ] | table --expand --width=80
```

```text
╭───┬──────┬───────────────────────╮
│ # │  a   │           b           │
├───┼──────┼───────────────────────┤
│ 0 │ kv   │ ╭───┬───────────────╮ │
│   │      │ │   │ ╭───┬───────╮ │ │
│   │      │ │ 0 │ │ # │ field │ │ │
│   │      │ │   │ ├───┼───────┤ │ │
│   │      │ │   │ │ 0 │     0 │ │ │
│   │      │ │   │ │ 1 │     1 │ │ │
│   │      │ │   │ │ 2 │     2 │ │ │
│   │      │ │   │ │ 3 │     3 │ │ │
│   │      │ │   │ │ 4 │     4 │ │ │
│   │      │ │   │ │ 5 │     5 │ │ │
│   │      │ │   │ ╰───┴───────╯ │ │
│   │      │ ╰───┴───────────────╯ │
│ 1 │ data │                     0 │
│ 2 │ data │                     0 │
├───┼──────┼───────────────────────┤
│ # │  a   │           b           │
╰───┴──────┴───────────────────────╯
```

Maybe it will also solve the issue you @fdncred encountered.

close #14060
cc: @NotTheDr01ds
---
 crates/nu-command/src/viewers/table.rs    |   2 +-
 crates/nu-command/tests/commands/table.rs | 120 ++++++++++++++++++++++
 crates/nu-table/src/common.rs             |   8 +-
 crates/nu-table/src/table.rs              |   4 +
 crates/nu-table/src/types/expanded.rs     |  57 +++++-----
 crates/nu-table/src/types/general.rs      |  13 ++-
 crates/nu-table/src/types/mod.rs          |  31 +-----
 7 files changed, 170 insertions(+), 65 deletions(-)

diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index a9e7361a9e..50db949ced 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -1088,7 +1088,7 @@ fn create_empty_placeholder(
     let data = vec![vec![cell]];
     let mut table = NuTable::from(data);
     table.set_data_style(TextStyle::default().dimmed());
-    let out = TableOutput::new(table, false, false, false);
+    let out = TableOutput::new(table, false, false, 1);
 
     let style_computer = &StyleComputer::from_config(engine_state, stack);
     let config = create_nu_table_config(&config, style_computer, &out, false, TableMode::default());
diff --git a/crates/nu-command/tests/commands/table.rs b/crates/nu-command/tests/commands/table.rs
index 96ae395e47..b9b80b9e87 100644
--- a/crates/nu-command/tests/commands/table.rs
+++ b/crates/nu-command/tests/commands/table.rs
@@ -2941,3 +2941,123 @@ fn table_footer_inheritance() {
     assert_eq!(actual.out.match_indices("x2").count(), 1);
     assert_eq!(actual.out.match_indices("x3").count(), 1);
 }
+
+#[test]
+fn table_footer_inheritance_kv_rows() {
+    let actual = nu!(
+        concat!(
+            "$env.config.table.footer_inheritance = true;",
+            "$env.config.footer_mode = 7;",
+            "[[a b]; ['kv' {0: 0, 1: 1, 2: 2, 3: 3, 4: 4} ], ['data' 0], ['data' 0] ] | table --expand --width=80",
+        )
+    );
+
+    assert_eq!(
+        actual.out,
+        "╭───┬──────┬───────────╮\
+         │ # │  a   │     b     │\
+         ├───┼──────┼───────────┤\
+         │ 0 │ kv   │ ╭───┬───╮ │\
+         │   │      │ │ 0 │ 0 │ │\
+         │   │      │ │ 1 │ 1 │ │\
+         │   │      │ │ 2 │ 2 │ │\
+         │   │      │ │ 3 │ 3 │ │\
+         │   │      │ │ 4 │ 4 │ │\
+         │   │      │ ╰───┴───╯ │\
+         │ 1 │ data │         0 │\
+         │ 2 │ data │         0 │\
+         ╰───┴──────┴───────────╯"
+    );
+
+    let actual = nu!(
+        concat!(
+            "$env.config.table.footer_inheritance = true;",
+            "$env.config.footer_mode = 7;",
+            "[[a b]; ['kv' {0: 0, 1: 1, 2: 2, 3: 3, 4: 4, 5: 5} ], ['data' 0], ['data' 0] ] | table --expand --width=80",
+        )
+    );
+
+    assert_eq!(
+        actual.out,
+        "╭───┬──────┬───────────╮\
+         │ # │  a   │     b     │\
+         ├───┼──────┼───────────┤\
+         │ 0 │ kv   │ ╭───┬───╮ │\
+         │   │      │ │ 0 │ 0 │ │\
+         │   │      │ │ 1 │ 1 │ │\
+         │   │      │ │ 2 │ 2 │ │\
+         │   │      │ │ 3 │ 3 │ │\
+         │   │      │ │ 4 │ 4 │ │\
+         │   │      │ │ 5 │ 5 │ │\
+         │   │      │ ╰───┴───╯ │\
+         │ 1 │ data │         0 │\
+         │ 2 │ data │         0 │\
+         ├───┼──────┼───────────┤\
+         │ # │  a   │     b     │\
+         ╰───┴──────┴───────────╯"
+    );
+}
+
+#[test]
+fn table_footer_inheritance_list_rows() {
+    let actual = nu!(
+        concat!(
+            "$env.config.table.footer_inheritance = true;",
+            "$env.config.footer_mode = 7;",
+            "[[a b]; ['kv' {0: [[field]; [0] [1] [2] [3] [4]]} ], ['data' 0], ['data' 0] ] | table --expand --width=80",
+        )
+    );
+
+    assert_eq!(
+        actual.out,
+        "╭───┬──────┬───────────────────────╮\
+         │ # │  a   │           b           │\
+         ├───┼──────┼───────────────────────┤\
+         │ 0 │ kv   │ ╭───┬───────────────╮ │\
+         │   │      │ │   │ ╭───┬───────╮ │ │\
+         │   │      │ │ 0 │ │ # │ field │ │ │\
+         │   │      │ │   │ ├───┼───────┤ │ │\
+         │   │      │ │   │ │ 0 │     0 │ │ │\
+         │   │      │ │   │ │ 1 │     1 │ │ │\
+         │   │      │ │   │ │ 2 │     2 │ │ │\
+         │   │      │ │   │ │ 3 │     3 │ │ │\
+         │   │      │ │   │ │ 4 │     4 │ │ │\
+         │   │      │ │   │ ╰───┴───────╯ │ │\
+         │   │      │ ╰───┴───────────────╯ │\
+         │ 1 │ data │                     0 │\
+         │ 2 │ data │                     0 │\
+         ╰───┴──────┴───────────────────────╯"
+    );
+
+    let actual = nu!(
+        concat!(
+            "$env.config.table.footer_inheritance = true;",
+            "$env.config.footer_mode = 7;",
+            "[[a b]; ['kv' {0: [[field]; [0] [1] [2] [3] [4] [5]]} ], ['data' 0], ['data' 0] ] | table --expand --width=80",
+        )
+    );
+
+    assert_eq!(
+        actual.out,
+        "╭───┬──────┬───────────────────────╮\
+         │ # │  a   │           b           │\
+         ├───┼──────┼───────────────────────┤\
+         │ 0 │ kv   │ ╭───┬───────────────╮ │\
+         │   │      │ │   │ ╭───┬───────╮ │ │\
+         │   │      │ │ 0 │ │ # │ field │ │ │\
+         │   │      │ │   │ ├───┼───────┤ │ │\
+         │   │      │ │   │ │ 0 │     0 │ │ │\
+         │   │      │ │   │ │ 1 │     1 │ │ │\
+         │   │      │ │   │ │ 2 │     2 │ │ │\
+         │   │      │ │   │ │ 3 │     3 │ │ │\
+         │   │      │ │   │ │ 4 │     4 │ │ │\
+         │   │      │ │   │ │ 5 │     5 │ │ │\
+         │   │      │ │   │ ╰───┴───────╯ │ │\
+         │   │      │ ╰───┴───────────────╯ │\
+         │ 1 │ data │                     0 │\
+         │ 2 │ data │                     0 │\
+         ├───┼──────┼───────────────────────┤\
+         │ # │  a   │           b           │\
+         ╰───┴──────┴───────────────────────╯"
+    );
+}
diff --git a/crates/nu-table/src/common.rs b/crates/nu-table/src/common.rs
index d18e053a1c..13c8f84fbc 100644
--- a/crates/nu-table/src/common.rs
+++ b/crates/nu-table/src/common.rs
@@ -18,8 +18,12 @@ pub fn create_nu_table_config(
     expand: bool,
     mode: TableMode,
 ) -> NuTableConfig {
-    let with_footer = (config.table.footer_inheritance && out.with_footer)
-        || with_footer(config, out.with_header, out.table.count_rows());
+    let mut count_rows = out.table.count_rows();
+    if config.table.footer_inheritance {
+        count_rows = out.count_rows;
+    }
+
+    let with_footer = with_footer(config, out.with_header, count_rows);
 
     NuTableConfig {
         theme: load_theme(mode),
diff --git a/crates/nu-table/src/table.rs b/crates/nu-table/src/table.rs
index 971e5b1f91..bf75e14380 100644
--- a/crates/nu-table/src/table.rs
+++ b/crates/nu-table/src/table.rs
@@ -615,12 +615,15 @@ fn load_theme(
     if let Some(style) = sep_color {
         let color = convert_style(style);
         let color = ANSIBuf::from(color);
+        // todo: use .modify(Segment::all(), color) --> it has this optimization
         table.get_config_mut().set_border_color_default(color);
     }
 
     if !with_header {
+        // todo: remove and use theme.remove_horizontal_lines();
         table.with(RemoveHorizontalLine);
     } else if with_footer {
+        // todo: remove and set it on theme rather then here...
         table.with(CopyFirstHorizontalLineAtLast);
     }
 }
@@ -1257,6 +1260,7 @@ fn remove_row(recs: &mut NuRecords, row: usize) -> Vec<String> {
     columns
 }
 
+// todo; use Format?
 struct StripColorFromRow(usize);
 
 impl TableOption<NuRecords, ColoredConfig, CompleteDimensionVecRecords<'_>> for StripColorFromRow {
diff --git a/crates/nu-table/src/types/expanded.rs b/crates/nu-table/src/types/expanded.rs
index a0b6cd0ff2..d87af74522 100644
--- a/crates/nu-table/src/types/expanded.rs
+++ b/crates/nu-table/src/types/expanded.rs
@@ -5,7 +5,7 @@ use crate::{
         NuText, StringResult, TableResult, INDEX_COLUMN_NAME,
     },
     string_width,
-    types::{has_footer, has_index},
+    types::has_index,
     NuTable, NuTableCell, TableOpts, TableOutput,
 };
 use nu_color_config::{Alignment, StyleComputer, TextStyle};
@@ -63,22 +63,22 @@ struct Cfg<'a> {
 struct CellOutput {
     text: String,
     style: TextStyle,
-    is_big: bool,
+    size: usize,
     is_expanded: bool,
 }
 
 impl CellOutput {
-    fn new(text: String, style: TextStyle, is_big: bool, is_expanded: bool) -> Self {
+    fn new(text: String, style: TextStyle, size: usize, is_expanded: bool) -> Self {
         Self {
             text,
             style,
-            is_big,
+            size,
             is_expanded,
         }
     }
 
-    fn clean(text: String, is_big: bool, is_expanded: bool) -> Self {
-        Self::new(text, Default::default(), is_big, is_expanded)
+    fn clean(text: String, size: usize, is_expanded: bool) -> Self {
+        Self::new(text, Default::default(), size, is_expanded)
     }
 
     fn text(text: String) -> Self {
@@ -86,7 +86,7 @@ impl CellOutput {
     }
 
     fn styled(text: NuText) -> Self {
-        Self::new(text.0, text.1, false, false)
+        Self::new(text.0, text.1, 1, false)
     }
 }
 
@@ -117,7 +117,7 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
 
     let with_index = has_index(&cfg.opts, &headers);
     let row_offset = cfg.opts.index_offset;
-    let mut is_footer_used = false;
+    let mut rows_count = 0usize;
 
     // The header with the INDEX is removed from the table headers since
     // it is added to the natural table index
@@ -199,9 +199,7 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
             data[row].push(value);
             data_styles.insert((row, with_index as usize), cell.style);
 
-            if cell.is_big {
-                is_footer_used = cell.is_big;
-            }
+            rows_count = rows_count.saturating_add(cell.size);
         }
 
         let mut table = NuTable::from(data);
@@ -209,12 +207,7 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
         table.set_index_style(get_index_style(cfg.opts.style_computer));
         set_data_styles(&mut table, data_styles);
 
-        return Ok(Some(TableOutput::new(
-            table,
-            false,
-            with_index,
-            is_footer_used,
-        )));
+        return Ok(Some(TableOutput::new(table, false, with_index, rows_count)));
     }
 
     if !headers.is_empty() {
@@ -269,6 +262,8 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
             }
         }
 
+        let mut column_rows = 0usize;
+
         for (row, item) in input.iter().enumerate() {
             cfg.opts.signals.check(cfg.opts.span)?;
 
@@ -294,9 +289,7 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
             data[row + 1].push(value);
             data_styles.insert((row + 1, col + with_index as usize), cell.style);
 
-            if cell.is_big {
-                is_footer_used = cell.is_big;
-            }
+            column_rows = column_rows.saturating_add(cell.size);
         }
 
         let head_cell = NuTableCell::new(header);
@@ -316,6 +309,8 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
 
         available_width -= pad_space + column_width;
         rendered_column += 1;
+
+        rows_count = std::cmp::max(rows_count, column_rows);
     }
 
     if truncate && rendered_column == 0 {
@@ -374,9 +369,7 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
     table.set_indent(cfg.opts.indent.0, cfg.opts.indent.1);
     set_data_styles(&mut table, data_styles);
 
-    let has_footer = is_footer_used || has_footer(&cfg.opts, table.count_rows() as u64);
-
-    Ok(Some(TableOutput::new(table, true, with_index, has_footer)))
+    Ok(Some(TableOutput::new(table, true, with_index, rows_count)))
 }
 
 fn expanded_table_kv(record: &Record, cfg: Cfg<'_>) -> CellResult {
@@ -395,7 +388,7 @@ fn expanded_table_kv(record: &Record, cfg: Cfg<'_>) -> CellResult {
 
     let value_width = cfg.opts.width - key_width - count_borders - padding - padding;
 
-    let mut with_footer = false;
+    let mut count_rows = 0usize;
 
     let mut data = Vec::with_capacity(record.len());
     for (key, value) in record {
@@ -420,19 +413,17 @@ fn expanded_table_kv(record: &Record, cfg: Cfg<'_>) -> CellResult {
 
         data.push(row);
 
-        if cell.is_big {
-            with_footer = cell.is_big;
-        }
+        count_rows = count_rows.saturating_add(cell.size);
     }
 
     let mut table = NuTable::from(data);
     table.set_index_style(get_key_style(&cfg));
     table.set_indent(cfg.opts.indent.0, cfg.opts.indent.1);
 
-    let out = TableOutput::new(table, false, true, with_footer);
+    let out = TableOutput::new(table, false, true, count_rows);
 
     maybe_expand_table(out, cfg.opts.width, &cfg.opts)
-        .map(|value| value.map(|value| CellOutput::clean(value, with_footer, false)))
+        .map(|value| value.map(|value| CellOutput::clean(value, count_rows, false)))
 }
 
 // the flag is used as an optimization to not do `value.lines().count()` search.
@@ -441,7 +432,7 @@ fn expand_table_value(value: &Value, value_width: usize, cfg: &Cfg<'_>) -> CellR
     if is_limited {
         return Ok(Some(CellOutput::clean(
             value_to_string_clean(value, cfg),
-            false,
+            1,
             false,
         )));
     }
@@ -457,7 +448,7 @@ fn expand_table_value(value: &Value, value_width: usize, cfg: &Cfg<'_>) -> CellR
                     let cfg = create_table_cfg(cfg, &out);
                     let value = out.table.draw(cfg, value_width);
                     match value {
-                        Some(value) => Ok(Some(CellOutput::clean(value, out.with_footer, true))),
+                        Some(value) => Ok(Some(CellOutput::clean(value, out.count_rows, true))),
                         None => Ok(None),
                     }
                 }
@@ -484,7 +475,7 @@ fn expand_table_value(value: &Value, value_width: usize, cfg: &Cfg<'_>) -> CellR
             let inner_cfg = update_config(dive_options(cfg, span), value_width);
             let result = expanded_table_kv(record, inner_cfg)?;
             match result {
-                Some(result) => Ok(Some(CellOutput::clean(result.text, result.is_big, true))),
+                Some(result) => Ok(Some(CellOutput::clean(result.text, result.size, true))),
                 None => Ok(Some(CellOutput::text(value_to_wrapped_string(
                     value,
                     cfg,
@@ -575,7 +566,7 @@ fn expanded_table_entry2(item: &Value, cfg: Cfg<'_>) -> CellOutput {
             let table_config = create_table_cfg(&cfg, &out);
             let table = out.table.draw(table_config, usize::MAX);
             match table {
-                Some(table) => CellOutput::clean(table, out.with_footer, false),
+                Some(table) => CellOutput::clean(table, out.count_rows, false),
                 None => CellOutput::styled(nu_value_to_string(
                     item,
                     cfg.opts.config,
diff --git a/crates/nu-table/src/types/general.rs b/crates/nu-table/src/types/general.rs
index ba0a1ceefa..e748b6eff2 100644
--- a/crates/nu-table/src/types/general.rs
+++ b/crates/nu-table/src/types/general.rs
@@ -56,8 +56,9 @@ fn kv_table(record: &Record, opts: TableOpts<'_>) -> StringResult {
 
     let mut table = NuTable::from(data);
     table.set_index_style(TextStyle::default_field());
+    let count_rows = table.count_rows();
 
-    let mut out = TableOutput::new(table, false, true, false);
+    let mut out = TableOutput::new(table, false, true, count_rows);
 
     let left = opts.config.table.padding.left;
     let right = opts.config.table.padding.right;
@@ -82,7 +83,10 @@ fn table(input: &[Value], opts: &TableOpts<'_>) -> TableResult {
     let with_header = !headers.is_empty();
     if !with_header {
         let table = to_table_with_no_header(input, with_index, row_offset, opts)?;
-        let table = table.map(|table| TableOutput::new(table, false, with_index, false));
+        let table = table.map(|table| {
+            let count_rows = table.count_rows();
+            TableOutput::new(table, false, with_index, count_rows)
+        });
         return Ok(table);
     }
 
@@ -98,7 +102,10 @@ fn table(input: &[Value], opts: &TableOpts<'_>) -> TableResult {
         .collect();
 
     let table = to_table_with_header(input, &headers, with_index, row_offset, opts)?;
-    let table = table.map(|table| TableOutput::new(table, true, with_index, false));
+    let table = table.map(|table| {
+        let count_rows = table.count_rows();
+        TableOutput::new(table, true, with_index, count_rows)
+    });
 
     Ok(table)
 }
diff --git a/crates/nu-table/src/types/mod.rs b/crates/nu-table/src/types/mod.rs
index adbe56bf27..829c87ed9e 100644
--- a/crates/nu-table/src/types/mod.rs
+++ b/crates/nu-table/src/types/mod.rs
@@ -1,8 +1,7 @@
-use terminal_size::{terminal_size, Height, Width};
+use nu_color_config::StyleComputer;
+use nu_protocol::{Config, Signals, Span, TableIndexMode, TableMode};
 
 use crate::{common::INDEX_COLUMN_NAME, NuTable};
-use nu_color_config::StyleComputer;
-use nu_protocol::{Config, FooterMode, Signals, Span, TableIndexMode, TableMode};
 
 mod collapse;
 mod expanded;
@@ -16,16 +15,16 @@ pub struct TableOutput {
     pub table: NuTable,
     pub with_header: bool,
     pub with_index: bool,
-    pub with_footer: bool,
+    pub count_rows: usize,
 }
 
 impl TableOutput {
-    pub fn new(table: NuTable, with_header: bool, with_index: bool, with_footer: bool) -> Self {
+    pub fn new(table: NuTable, with_header: bool, with_index: bool, count_rows: usize) -> Self {
         Self {
             table,
             with_header,
             with_index,
-            with_footer,
+            count_rows,
         }
     }
 }
@@ -79,23 +78,3 @@ fn has_index(opts: &TableOpts<'_>, headers: &[String]) -> bool {
 
     with_index && !opts.index_remove
 }
-
-fn has_footer(opts: &TableOpts<'_>, count_records: u64) -> bool {
-    match opts.config.footer_mode {
-        // Only show the footer if there are more than RowCount rows
-        FooterMode::RowCount(limit) => count_records > limit,
-        // Always show the footer
-        FooterMode::Always => true,
-        // Never show the footer
-        FooterMode::Never => false,
-        // Calculate the screen height and row count, if screen height is larger than row count, don't show footer
-        FooterMode::Auto => {
-            let (_width, height) = match terminal_size() {
-                Some((w, h)) => (Width(w.0).0 as u64, Height(h.0).0 as u64),
-                None => (Width(0).0 as u64, Height(0).0 as u64),
-            };
-
-            height <= count_records
-        }
-    }
-}

From eb0b6c87d610d222903d8c1b9a0523474e9176ff Mon Sep 17 00:00:00 2001
From: Ryan Faulhaber <ryf@sent.as>
Date: Tue, 19 Nov 2024 17:20:52 -0500
Subject: [PATCH 0694/1072] Add mac and IP address entries to `sys net`
 (#14389)

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

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

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

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

What it says on the tin, this change adds the `mac` and `ip` columns to
the `sys net` command, where `mac` is the interface mac address and `ip`
is a record containing ipv4 and ipv6 addresses as well as whether or not
the address is loopback and multicast. I thought it might be useful to
have this information available in Nushell. This change basically just
pulls extra information out of the underlying structs in the
`sysinfo::Networks` struct. Here's a screenshot from my system:

![Screenshot from 2024-11-19
11-59-54](https://github.com/user-attachments/assets/92c2d72c-b0d0-49c0-8167-9e1ce853acf1)


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

- Adds `mac` and `ip` columns to the `sys net` command, where `mac`
contains the interface's mac address and `ip` contains information
extracted from the `std::net::IpAddr` struct, including address,
protocol, whether or not the address is loopback, and whether or not
it's multicast

# Tests + Formatting
Didn't add any tests specifically, didn't seem like there were any
relevant tests. Ran existing tests and formatting.

<!--
Don't forget to add tests that cover your changes.

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

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

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->
---
 crates/nu-command/src/system/sys/net.rs | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/crates/nu-command/src/system/sys/net.rs b/crates/nu-command/src/system/sys/net.rs
index ee82f73c61..8e2ac19bf5 100644
--- a/crates/nu-command/src/system/sys/net.rs
+++ b/crates/nu-command/src/system/sys/net.rs
@@ -44,8 +44,29 @@ fn net(span: Span) -> Value {
     let networks = Networks::new_with_refreshed_list()
         .iter()
         .map(|(iface, data)| {
+            let ip_addresses = data
+                .ip_networks()
+                .iter()
+                .map(|ip| {
+                    let protocol = match ip.addr {
+                        std::net::IpAddr::V4(_) => "ipv4",
+                        std::net::IpAddr::V6(_) => "ipv6",
+                    };
+                    Value::record(
+                        record! {
+                            "address" => Value::string(ip.addr.to_string(), span),
+                            "protocol" => Value::string(protocol, span),
+                            "loop" => Value::bool(ip.addr.is_loopback(), span),
+                            "multicast" => Value::bool(ip.addr.is_multicast(), span),
+                        },
+                        span,
+                    )
+                })
+                .collect();
             let record = record! {
                 "name" => Value::string(trim_cstyle_null(iface), span),
+                "mac" => Value::string(data.mac_address().to_string(), span),
+                "ip" => Value::list(ip_addresses, span),
                 "sent" => Value::filesize(data.total_transmitted() as i64, span),
                 "recv" => Value::filesize(data.total_received() as i64, span),
             };

From 582b5f45e8cf6ffe82f5d84329eb7afcc8c40925 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Nov 2024 09:19:24 +0800
Subject: [PATCH 0695/1072] Bump shadow-rs from 0.35.2 to 0.36.0 (#14396)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [shadow-rs](https://github.com/baoyachi/shadow-rs) from 0.35.2 to
0.36.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/baoyachi/shadow-rs/releases">shadow-rs's
releases</a>.</em></p>
<blockquote>
<h2>v0.36.0</h2>
<h2>What's Changed</h2>
<ul>
<li>feat(HookExt): Add extended hook functionality with custom deny
lists by <a
href="https://github.com/baoyachi"><code>@​baoyachi</code></a> in <a
href="https://redirect.github.com/baoyachi/shadow-rs/pull/190">baoyachi/shadow-rs#190</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/baoyachi/shadow-rs/compare/v0.35.2...v0.36.0">https://github.com/baoyachi/shadow-rs/compare/v0.35.2...v0.36.0</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/909510eb5d265aaa69f605bd0e73eccbc343c785"><code>909510e</code></a>
Merge pull request <a
href="https://redirect.github.com/baoyachi/shadow-rs/issues/190">#190</a>
from baoyachi/hook_ext</li>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/bad046d7a0e012b0c4b383400bd09497a97d5e4c"><code>bad046d</code></a>
Update Cargo.toml</li>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/84096a02c0464077e55fe43fe11a891bf8a9435f"><code>84096a0</code></a>
feat(HookExt): Add extended hook functionality with custom deny
lists</li>
<li>See full diff in <a
href="https://github.com/baoyachi/shadow-rs/compare/v0.35.2...v0.36.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=shadow-rs&package-manager=cargo&previous-version=0.35.2&new-version=0.36.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                    | 4 ++--
 crates/nu-cmd-lang/Cargo.toml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2821dab891..887dfc1ffd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5893,9 +5893,9 @@ dependencies = [
 
 [[package]]
 name = "shadow-rs"
-version = "0.35.2"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1b2328fb3ec0d5302f95915e7e77cfc2ff943714d9970bc4b66e9eacf318687"
+checksum = "58cfcd0643497a9f780502063aecbcc4a3212cbe4948fd25ee8fd179c2cf9a18"
 dependencies = [
  "const_format",
  "is_debug",
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index c5609e4ff8..6e8cb824ba 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -21,10 +21,10 @@ nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
 nu-utils = { path = "../nu-utils", version = "0.100.1" }
 
 itertools = { workspace = true }
-shadow-rs = { version = "0.35", default-features = false }
+shadow-rs = { version = "0.36", default-features = false }
 
 [build-dependencies]
-shadow-rs = { version = "0.35", default-features = false }
+shadow-rs = { version = "0.36", default-features = false }
 
 [features]
 mimalloc = []

From a6e3470c6f24b781280eaa36e8d610025c588ec6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Nov 2024 09:19:37 +0800
Subject: [PATCH 0696/1072] Bump thiserror from 1.0.69 to 2.0.3 (#14394)

Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.69 to
2.0.3.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/dtolnay/thiserror/releases">thiserror's
releases</a>.</em></p>
<blockquote>
<h2>2.0.3</h2>
<ul>
<li>Support the same Path field being repeated in both Debug and Display
representation in error message (<a
href="https://redirect.github.com/dtolnay/thiserror/issues/383">#383</a>)</li>
<li>Improve error message when a format trait used in error message is
not implemented by some field (<a
href="https://redirect.github.com/dtolnay/thiserror/issues/384">#384</a>)</li>
</ul>
<h2>2.0.2</h2>
<ul>
<li>Fix hang on invalid input inside #[error(...)] attribute (<a
href="https://redirect.github.com/dtolnay/thiserror/issues/382">#382</a>)</li>
</ul>
<h2>2.0.1</h2>
<ul>
<li>Support errors that contain a dynamically sized final field (<a
href="https://redirect.github.com/dtolnay/thiserror/issues/375">#375</a>)</li>
<li>Improve inference of trait bounds for fields that are interpolated
multiple times in an error message (<a
href="https://redirect.github.com/dtolnay/thiserror/issues/377">#377</a>)</li>
</ul>
<h2>2.0.0</h2>
<h2>Breaking changes</h2>
<ul>
<li>
<p>Referencing keyword-named fields by a raw identifier like
<code>{r#type}</code> inside a format string is no longer accepted;
simply use the unraw name like <code>{type}</code> (<a
href="https://redirect.github.com/dtolnay/thiserror/issues/347">#347</a>)</p>
<p>This aligns thiserror with the standard library's formatting macros,
which gained support for implicit argument capture later than the
release of this feature in thiserror 1.x.</p>
<pre lang="rust"><code>#[derive(Error, Debug)]
#[error(&quot;... {type} ...&quot;)]  // Before: {r#type}
pub struct Error {
    pub r#type: Type,
}
</code></pre>
</li>
<li>
<p>Trait bounds are no longer inferred on fields whose value is shadowed
by an explicit named argument in a format message (<a
href="https://redirect.github.com/dtolnay/thiserror/issues/345">#345</a>)</p>
<pre lang="rust"><code>// Before: impl&lt;T: Octal&gt; Display for
Error&lt;T&gt;
// After: impl&lt;T&gt; Display for Error&lt;T&gt;
#[derive(Error, Debug)]
#[error(&quot;{thing:o}&quot;, thing = &quot;...&quot;)]
pub struct Error&lt;T&gt; {
    thing: T,
}
</code></pre>
</li>
<li>
<p>Tuple structs and tuple variants can no longer use numerical
<code>{0}</code> <code>{1}</code> access at the same time as supplying
extra positional arguments for a format message, as this makes it
ambiguous whether the number refers to a tuple field vs a different
positional arg (<a
href="https://redirect.github.com/dtolnay/thiserror/issues/354">#354</a>)</p>
<pre lang="rust"><code>#[derive(Error, Debug)]
#[error(&quot;ambiguous: {0} {}&quot;, $N)]
// ^^^ Not allowed, use #[error(&quot;... {0} {n}&quot;, n = $N)]
pub struct TupleError(i32);
</code></pre>
</li>
<li>
<p>Code containing invocations of thiserror's <code>derive(Error)</code>
must now have a direct dependency on the <code>thiserror</code> crate
regardless of the error data structure's contents (<a
href="https://redirect.github.com/dtolnay/thiserror/issues/368">#368</a>,
<a
href="https://redirect.github.com/dtolnay/thiserror/issues/369">#369</a>,
<a
href="https://redirect.github.com/dtolnay/thiserror/issues/370">#370</a>,
<a
href="https://redirect.github.com/dtolnay/thiserror/issues/372">#372</a>)</p>
</li>
</ul>
<h2>Features</h2>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/dtolnay/thiserror/commit/15fd26e476c5c7a2e7dc13209689c747b1db82a5"><code>15fd26e</code></a>
Release 2.0.3</li>
<li><a
href="https://github.com/dtolnay/thiserror/commit/70460231305d82ae9a7a60424cc4d0d22d0b6e77"><code>7046023</code></a>
Simplify how has_bonus_display is accumulated</li>
<li><a
href="https://github.com/dtolnay/thiserror/commit/9cc1d0b2514105759995dfd3c7bc4de1f0f9195b"><code>9cc1d0b</code></a>
Merge pull request <a
href="https://redirect.github.com/dtolnay/thiserror/issues/384">#384</a>
from dtolnay/nowrap</li>
<li><a
href="https://github.com/dtolnay/thiserror/commit/1d040f358a34d58139f1e1c12cec575319f16edf"><code>1d040f3</code></a>
Use Var wrapper only for Pointer formatting</li>
<li><a
href="https://github.com/dtolnay/thiserror/commit/6a6132d79bee8baf89ea0896ec6dadc3ad6b388b"><code>6a6132d</code></a>
Extend no-display ui test to cover another fmt trait</li>
<li><a
href="https://github.com/dtolnay/thiserror/commit/a061beb9dc871144239dc3489dc012f39e13847c"><code>a061beb</code></a>
Merge pull request <a
href="https://redirect.github.com/dtolnay/thiserror/issues/383">#383</a>
from dtolnay/both</li>
<li><a
href="https://github.com/dtolnay/thiserror/commit/63882935be42fbd89e7076392a4d5330e2120332"><code>6388293</code></a>
Support Display and Debug of same path in error message</li>
<li><a
href="https://github.com/dtolnay/thiserror/commit/dc0359eeecf778da2038805431c61010e7aa957e"><code>dc0359e</code></a>
Defer binding_value construction</li>
<li><a
href="https://github.com/dtolnay/thiserror/commit/520343e37d890e0a4b0c6e1427e8164c43ce1c7d"><code>520343e</code></a>
Add test of Debug and Display of paths</li>
<li><a
href="https://github.com/dtolnay/thiserror/commit/49be39dee10d7fce1d4b2f7f6b6010f2b309794e"><code>49be39d</code></a>
Release 2.0.2</li>
<li>Additional commits viewable in <a
href="https://github.com/dtolnay/thiserror/compare/1.0.69...2.0.3">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=thiserror&package-manager=cargo&previous-version=1.0.69&new-version=2.0.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                    | 4 ++--
 crates/nu-plugin/Cargo.toml   | 2 +-
 crates/nu-protocol/Cargo.toml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 887dfc1ffd..cdfa8a1ad5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3485,7 +3485,7 @@ dependencies = [
  "nu-protocol",
  "nu-utils",
  "serde",
- "thiserror 1.0.69",
+ "thiserror 2.0.3",
  "typetag",
 ]
 
@@ -3591,7 +3591,7 @@ dependencies = [
  "strum",
  "strum_macros",
  "tempfile",
- "thiserror 1.0.69",
+ "thiserror 2.0.3",
  "typetag",
  "windows-sys 0.48.0",
 ]
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index a2c328375e..2c43a86c5e 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -21,7 +21,7 @@ nu-plugin-core = { path = "../nu-plugin-core", version = "0.100.1", default-feat
 nu-utils = { path = "../nu-utils", version = "0.100.1" }
 
 log = { workspace = true }
-thiserror = "1.0"
+thiserror = "2.0"
 
 [dev-dependencies]
 serde = { workspace = true }
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 60d6c10acc..dfbcb7b307 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -36,7 +36,7 @@ num-format = { workspace = true }
 rmp-serde = { workspace = true, optional = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
-thiserror = "1.0"
+thiserror = "2.0"
 typetag = "0.2"
 os_pipe = { workspace = true, features = ["io_safety"] }
 log = { workspace = true }

From 1e7840c376695fc9096a07916e748258c80135b8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Nov 2024 09:20:47 +0800
Subject: [PATCH 0697/1072] Bump terminal_size from 0.3.0 to 0.4.0 (#14393)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [terminal_size](https://github.com/eminence/terminal-size) from
0.3.0 to 0.4.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/eminence/terminal-size/releases">terminal_size's
releases</a>.</em></p>
<blockquote>
<h2>v0.4.0</h2>
<h2>Breaking changes</h2>
<p>The big change in this release is the API change in <a
href="https://redirect.github.com/eminence/terminal-size/issues/66">#66</a>:</p>
<ul>
<li>If you were using the <code>terminal_size_using_fd</code> or
<code>terminal_size_using_handle</code> functions, these are now
deprecated and unsafe. Instead you should use the
<code>terminal_size_of</code> function, which does the same thing but is
safer.</li>
</ul>
<h2>What's Changed</h2>
<ul>
<li>Add <code>rust-version</code> in Cargo.toml by <a
href="https://github.com/cgwalters"><code>@​cgwalters</code></a> in <a
href="https://redirect.github.com/eminence/terminal-size/pull/60">eminence/terminal-size#60</a></li>
<li>Update <code>windows-sys</code> to 0.52 by <a
href="https://github.com/barrbrain"><code>@​barrbrain</code></a> in <a
href="https://redirect.github.com/eminence/terminal-size/pull/62">eminence/terminal-size#62</a></li>
<li>Update windows-sys to 0.59 by <a
href="https://github.com/eminence"><code>@​eminence</code></a> in <a
href="https://redirect.github.com/eminence/terminal-size/pull/67">eminence/terminal-size#67</a></li>
<li>Update the API for I/O safety by <a
href="https://github.com/sunfishcode"><code>@​sunfishcode</code></a> in
<a
href="https://redirect.github.com/eminence/terminal-size/pull/66">eminence/terminal-size#66</a></li>
<li>Fix typo, link to docs, update docs by <a
href="https://github.com/waywardmonkeys"><code>@​waywardmonkeys</code></a>
in <a
href="https://redirect.github.com/eminence/terminal-size/pull/63">eminence/terminal-size#63</a></li>
<li>Update CI: Use current actions, remove unused build step by <a
href="https://github.com/waywardmonkeys"><code>@​waywardmonkeys</code></a>
in <a
href="https://redirect.github.com/eminence/terminal-size/pull/64">eminence/terminal-size#64</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/cgwalters"><code>@​cgwalters</code></a>
made their first contribution in <a
href="https://redirect.github.com/eminence/terminal-size/pull/60">eminence/terminal-size#60</a></li>
<li><a href="https://github.com/barrbrain"><code>@​barrbrain</code></a>
made their first contribution in <a
href="https://redirect.github.com/eminence/terminal-size/pull/62">eminence/terminal-size#62</a></li>
<li><a
href="https://github.com/waywardmonkeys"><code>@​waywardmonkeys</code></a>
made their first contribution in <a
href="https://redirect.github.com/eminence/terminal-size/pull/63">eminence/terminal-size#63</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/eminence/terminal-size/compare/v0.3.0...v0.4.0">https://github.com/eminence/terminal-size/compare/v0.3.0...v0.4.0</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/eminence/terminal-size/commit/f6b81b5714112558ea2ab61e5151fc25ffae3ea7"><code>f6b81b5</code></a>
Bump to version 0.4.0</li>
<li><a
href="https://github.com/eminence/terminal-size/commit/5cbc616cf34cd8e2d573aa5432b56c3438ff1b64"><code>5cbc616</code></a>
Merge pull request <a
href="https://redirect.github.com/eminence/terminal-size/issues/64">#64</a>
from waywardmonkeys/update-ci</li>
<li><a
href="https://github.com/eminence/terminal-size/commit/68ceb8dc9d076671fd6154d2b9535753fc362bbd"><code>68ceb8d</code></a>
Merge pull request <a
href="https://redirect.github.com/eminence/terminal-size/issues/63">#63</a>
from waywardmonkeys/fix-typo</li>
<li><a
href="https://github.com/eminence/terminal-size/commit/53077475d535c33a24e633f32fa8c4fe65891b8f"><code>5307747</code></a>
Merge pull request <a
href="https://redirect.github.com/eminence/terminal-size/issues/66">#66</a>
from sunfishcode/main</li>
<li><a
href="https://github.com/eminence/terminal-size/commit/a29b90458018676b30e1bba02aed186bd0b3a907"><code>a29b904</code></a>
Mark <code>terminal_size_using_handle</code> as unsafe too.</li>
<li><a
href="https://github.com/eminence/terminal-size/commit/ea92388054dd64c9ad452bea2e1e667ef8462b99"><code>ea92388</code></a>
Mark <code>terminal_size_using_fd</code> as unsafe.</li>
<li><a
href="https://github.com/eminence/terminal-size/commit/78e81fa4875c8560c65e01b9adaf3022b46e7d0d"><code>78e81fa</code></a>
Merge pull request <a
href="https://redirect.github.com/eminence/terminal-size/issues/67">#67</a>
from eminence/windows-sys</li>
<li><a
href="https://github.com/eminence/terminal-size/commit/c69ff4e55f4044456fae19e615b45b76cf354002"><code>c69ff4e</code></a>
Update windows-sys to 0.59</li>
<li><a
href="https://github.com/eminence/terminal-size/commit/76b0caeb6fab68589f70192e8d2c97d383e11bb8"><code>76b0cae</code></a>
Merge pull request <a
href="https://redirect.github.com/eminence/terminal-size/issues/62">#62</a>
from barrbrain/windows-sys</li>
<li><a
href="https://github.com/eminence/terminal-size/commit/56334c3ceaf4d007d39b0b9686b3c4be253ea183"><code>56334c3</code></a>
Update the API for I/O safety</li>
<li>Additional commits viewable in <a
href="https://github.com/eminence/terminal-size/compare/v0.3.0...v0.4.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=terminal_size&package-manager=cargo&previous-version=0.3.0&new-version=0.4.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 8 ++++----
 Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cdfa8a1ad5..7f43aaada7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3333,7 +3333,7 @@ dependencies = [
  "sysinfo 0.32.0",
  "tabled",
  "tempfile",
- "terminal_size 0.3.0",
+ "terminal_size 0.4.0",
  "titlecase",
  "toml 0.8.19",
  "trash",
@@ -3378,7 +3378,7 @@ dependencies = [
  "nu-path",
  "nu-protocol",
  "nu-utils",
- "terminal_size 0.3.0",
+ "terminal_size 0.4.0",
 ]
 
 [[package]]
@@ -3402,7 +3402,7 @@ dependencies = [
  "nu-utils",
  "ratatui",
  "strip-ansi-escapes",
- "terminal_size 0.3.0",
+ "terminal_size 0.4.0",
  "unicode-width 0.1.11",
 ]
 
@@ -3635,7 +3635,7 @@ dependencies = [
  "nu-protocol",
  "nu-utils",
  "tabled",
- "terminal_size 0.3.0",
+ "terminal_size 0.4.0",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index ad2e886ad8..b9be5c59f3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -156,7 +156,7 @@ syn = "2.0"
 sysinfo = "0.32"
 tabled = { version = "0.16.0", default-features = false }
 tempfile = "3.14"
-terminal_size = "0.3"
+terminal_size = "0.4"
 titlecase = "2.0"
 toml = "0.8"
 trash = "5.2"

From 5d1eb031ebb4dec3bed95e62286e66a2fd3fea6d Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Wed, 20 Nov 2024 03:24:03 -0800
Subject: [PATCH 0698/1072] Turn compile errors into fatal errors (#14388)

# Description

Because the IR compiler was previously optional, compile errors were not
treated as fatal errors, and were just logged like parse warnings are.
This unfortunately meant that if a user encountered a compile error,
they would see "Can't evaluate block in IR mode" as the actual error in
addition to (hopefully) logging the compile error.

This changes compile errors to be treated like parse errors so that they
show up as the last error, helping users understand what's wrong a
little bit more easily.

Fixes #14333.

# User-Facing Changes
- Shouldn't see "Can't evaluate block in IR mode"
- Should only see compile error
- No evaluation should happen

# Tests + Formatting
Didn't add any tests specifically for this, but it might be good to have
at least one that checks to ensure the compile error shows up and the
"can't evaluate" error does not.
---
 crates/nu-cli/src/eval_cmds.rs | 2 +-
 crates/nu-cli/src/eval_file.rs | 2 +-
 crates/nu-cli/src/util.rs      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/nu-cli/src/eval_cmds.rs b/crates/nu-cli/src/eval_cmds.rs
index 663185a4a2..5fba00f5c9 100644
--- a/crates/nu-cli/src/eval_cmds.rs
+++ b/crates/nu-cli/src/eval_cmds.rs
@@ -74,7 +74,7 @@ pub fn evaluate_commands(
 
         if let Some(err) = working_set.compile_errors.first() {
             report_compile_error(&working_set, err);
-            // Not a fatal error, for now
+            std::process::exit(1);
         }
 
         (output, working_set.render())
diff --git a/crates/nu-cli/src/eval_file.rs b/crates/nu-cli/src/eval_file.rs
index 7636adc8d4..826b6c8eb5 100644
--- a/crates/nu-cli/src/eval_file.rs
+++ b/crates/nu-cli/src/eval_file.rs
@@ -89,7 +89,7 @@ pub fn evaluate_file(
 
     if let Some(err) = working_set.compile_errors.first() {
         report_compile_error(&working_set, err);
-        // Not a fatal error, for now
+        std::process::exit(1);
     }
 
     // Look for blocks whose name starts with "main" and replace it with the filename.
diff --git a/crates/nu-cli/src/util.rs b/crates/nu-cli/src/util.rs
index 3e69657857..7b9d783534 100644
--- a/crates/nu-cli/src/util.rs
+++ b/crates/nu-cli/src/util.rs
@@ -296,7 +296,7 @@ fn evaluate_source(
 
         if let Some(err) = working_set.compile_errors.first() {
             report_compile_error(&working_set, err);
-            // Not a fatal error, for now
+            return Ok(true);
         }
 
         (output, working_set.render())

From 42d2adc3e037d2ceb3d3708407b148efa7896c96 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Wed, 20 Nov 2024 07:55:26 -0600
Subject: [PATCH 0699/1072] allow ps1 files to be executed without
 pwsh/powershell -c file.ps1 (#14379)

# Description

This PR allows nushell to run powershell scripts easier. You can already
do `powershell -c script.ps1` but this PR takes it a step further by
doing the `powershell -c` part for you. So, if you have script.ps1 you
can execute it by running it in the command position of the repl.

![image](https://github.com/user-attachments/assets/0661a746-27d9-4d21-b576-c244ff7fab2b)

or once it's in json, just consume it with nushell.

![image](https://github.com/user-attachments/assets/38f5c5d8-3659-41f0-872b-91a14909760b)

# User-Facing Changes
Easier to run powershell scripts. It should work on Windows with
powershell.exe.

# Tests + Formatting
Added 1 test

# After Submitting


---------

Co-authored-by: Wind <WindSoilder@outlook.com>
---
 crates/nu-command/src/system/run_external.rs  | 45 +++++++++++++++++--
 .../nu-command/tests/commands/run_external.rs | 41 +++++++++++++++--
 2 files changed, 79 insertions(+), 7 deletions(-)

diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index 604278c676..ffb34bf077 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -5,6 +5,8 @@ use nu_protocol::{did_you_mean, process::ChildProcess, ByteStream, NuGlob, OutDe
 use nu_system::ForegroundChild;
 use nu_utils::IgnoreCaseExt;
 use pathdiff::diff_paths;
+#[cfg(windows)]
+use std::os::windows::process::CommandExt;
 use std::{
     borrow::Cow,
     ffi::{OsStr, OsString},
@@ -91,6 +93,22 @@ impl Command for External {
             false
         };
 
+        // let's make sure it's a .ps1 script, but only on Windows
+        let potential_powershell_script = if cfg!(windows) {
+            if let Some(executable) = which(&expanded_name, "", cwd.as_ref()) {
+                let ext = executable
+                    .extension()
+                    .unwrap_or_default()
+                    .to_string_lossy()
+                    .to_uppercase();
+                ext == "PS1"
+            } else {
+                false
+            }
+        } else {
+            false
+        };
+
         // Find the absolute path to the executable. On Windows, set the
         // executable to "cmd.exe" if it's a CMD internal command. If the
         // command is not found, display a helpful error message.
@@ -98,11 +116,16 @@ impl Command for External {
             && (is_cmd_internal_command(&name_str) || potential_nuscript_in_windows)
         {
             PathBuf::from("cmd.exe")
+        } else if cfg!(windows) && potential_powershell_script {
+            // If we're on Windows and we're trying to run a PowerShell script, we'll use
+            // `powershell.exe` to run it. We shouldn't have to check for powershell.exe because
+            // it's automatically installed on all modern windows systems.
+            PathBuf::from("powershell.exe")
         } else {
             // Determine the PATH to be used and then use `which` to find it - though this has no
             // effect if it's an absolute path already
             let paths = nu_engine::env::path_str(engine_state, stack, call.head)?;
-            let Some(executable) = which(expanded_name, &paths, cwd.as_ref()) else {
+            let Some(executable) = which(&expanded_name, &paths, cwd.as_ref()) else {
                 return Err(command_not_found(&name_str, call.head, engine_state, stack));
             };
             executable
@@ -123,15 +146,29 @@ impl Command for External {
         let args = eval_arguments_from_call(engine_state, stack, call)?;
         #[cfg(windows)]
         if is_cmd_internal_command(&name_str) || potential_nuscript_in_windows {
-            use std::os::windows::process::CommandExt;
-
             // The /D flag disables execution of AutoRun commands from registry.
             // The /C flag followed by a command name instructs CMD to execute
             // that command and quit.
-            command.args(["/D", "/C", &name_str]);
+            command.args(["/D", "/C", &expanded_name.to_string_lossy()]);
             for arg in &args {
                 command.raw_arg(escape_cmd_argument(arg)?);
             }
+        } else if potential_powershell_script {
+            use nu_path::canonicalize_with;
+
+            // canonicalize the path to the script so that tests pass
+            let canon_path = if let Ok(cwd) = engine_state.cwd_as_string(None) {
+                canonicalize_with(&expanded_name, cwd)?
+            } else {
+                // If we can't get the current working directory, just provide the expanded name
+                expanded_name
+            };
+            // The -Command flag followed by a script name instructs PowerShell to
+            // execute that script and quit.
+            command.args(["-Command", &canon_path.to_string_lossy()]);
+            for arg in &args {
+                command.raw_arg(arg.item.clone());
+            }
         } else {
             command.args(args.into_iter().map(|s| s.item));
         }
diff --git a/crates/nu-command/tests/commands/run_external.rs b/crates/nu-command/tests/commands/run_external.rs
index 17667c9bb3..8a797300f1 100644
--- a/crates/nu-command/tests/commands/run_external.rs
+++ b/crates/nu-command/tests/commands/run_external.rs
@@ -355,9 +355,9 @@ fn external_command_receives_raw_binary_data() {
 
 #[cfg(windows)]
 #[test]
-fn can_run_batch_files() {
+fn can_run_cmd_files() {
     use nu_test_support::fs::Stub::FileWithContent;
-    Playground::setup("run a Windows batch file", |dirs, sandbox| {
+    Playground::setup("run a Windows cmd file", |dirs, sandbox| {
         sandbox.with_files(&[FileWithContent(
             "foo.cmd",
             r#"
@@ -371,12 +371,30 @@ fn can_run_batch_files() {
     });
 }
 
+#[cfg(windows)]
+#[test]
+fn can_run_batch_files() {
+    use nu_test_support::fs::Stub::FileWithContent;
+    Playground::setup("run a Windows batch file", |dirs, sandbox| {
+        sandbox.with_files(&[FileWithContent(
+            "foo.bat",
+            r#"
+                @echo off
+                echo Hello World
+            "#,
+        )]);
+
+        let actual = nu!(cwd: dirs.test(), pipeline("foo.bat"));
+        assert!(actual.out.contains("Hello World"));
+    });
+}
+
 #[cfg(windows)]
 #[test]
 fn can_run_batch_files_without_cmd_extension() {
     use nu_test_support::fs::Stub::FileWithContent;
     Playground::setup(
-        "run a Windows batch file without specifying the extension",
+        "run a Windows cmd file without specifying the extension",
         |dirs, sandbox| {
             sandbox.with_files(&[FileWithContent(
                 "foo.cmd",
@@ -440,3 +458,20 @@ fn redirect_combine() {
         assert_eq!(actual.out, "FooBar");
     });
 }
+
+#[cfg(windows)]
+#[test]
+fn can_run_ps1_files() {
+    use nu_test_support::fs::Stub::FileWithContent;
+    Playground::setup("run_a_windows_ps_file", |dirs, sandbox| {
+        sandbox.with_files(&[FileWithContent(
+            "foo.ps1",
+            r#"
+                Write-Host Hello World
+            "#,
+        )]);
+
+        let actual = nu!(cwd: dirs.test(), pipeline("foo.ps1"));
+        assert!(actual.out.contains("Hello World"));
+    });
+}

From b318d588fe9abe7268e8658647ab99a555b6e3a6 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Wed, 20 Nov 2024 11:39:15 -0600
Subject: [PATCH 0700/1072] add new --flatten parameter to the ast command
 (#14400)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

By request, this PR introduces a new `--flatten` parameter to the ast
command for generating a more readable version of the AST output. This
enhancement improves usability by allowing users to easily visualize the
structure of the AST.


![image](https://github.com/user-attachments/assets/a66644ef-5fff-4d3d-a334-4e9f80edb39d)

```nushell
❯ ast 'ls | sort-by type name -i' --flatten --json
[
  {
    "content": "ls",
    "shape": "shape_internalcall",
    "span": {
      "start": 0,
      "end": 2
    }
  },
  {
    "content": "|",
    "shape": "shape_pipe",
    "span": {
      "start": 3,
      "end": 4
    }
  },
  {
    "content": "sort-by",
    "shape": "shape_internalcall",
    "span": {
      "start": 5,
      "end": 12
    }
  },
  {
    "content": "type",
    "shape": "shape_string",
    "span": {
      "start": 13,
      "end": 17
    }
  },
  {
    "content": "name",
    "shape": "shape_string",
    "span": {
      "start": 18,
      "end": 22
    }
  },
  {
    "content": "-i",
    "shape": "shape_flag",
    "span": {
      "start": 23,
      "end": 25
    }
  }
]
❯ ast 'ls | sort-by type name -i' --flatten --json --minify
[{"content":"ls","shape":"shape_internalcall","span":{"start":0,"end":2}},{"content":"|","shape":"shape_pipe","span":{"start":3,"end":4}},{"content":"sort-by","shape":"shape_internalcall","span":{"start":5,"end":12}},{"content":"type","shape":"shape_string","span":{"start":13,"end":17}},{"content":"name","shape":"shape_string","span":{"start":18,"end":22}},{"content":"-i","shape":"shape_flag","span":{"start":23,"end":25}}]
```
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

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

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

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

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

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/debug/ast.rs | 346 +++++++++++++++++++++--------
 1 file changed, 250 insertions(+), 96 deletions(-)

diff --git a/crates/nu-command/src/debug/ast.rs b/crates/nu-command/src/debug/ast.rs
index c6e405d533..45e7738c32 100644
--- a/crates/nu-command/src/debug/ast.rs
+++ b/crates/nu-command/src/debug/ast.rs
@@ -1,6 +1,7 @@
 use nu_engine::command_prelude::*;
-use nu_parser::parse;
-use nu_protocol::engine::StateWorkingSet;
+use nu_parser::{flatten_block, parse};
+use nu_protocol::{engine::StateWorkingSet, record};
+use serde_json::{json, Value as JsonValue};
 
 #[derive(Clone)]
 pub struct Ast;
@@ -16,109 +17,23 @@ impl Command for Ast {
 
     fn signature(&self) -> Signature {
         Signature::build("ast")
-            .input_output_types(vec![(Type::String, Type::record())])
+            .input_output_types(vec![
+                (Type::Nothing, Type::table()),
+                (Type::Nothing, Type::record()),
+                (Type::Nothing, Type::String),
+            ])
             .required(
                 "pipeline",
                 SyntaxShape::String,
                 "The pipeline to print the ast for.",
             )
-            .switch("json", "serialize to json", Some('j'))
-            .switch("minify", "minify the nuon or json output", Some('m'))
+            .switch("json", "Serialize to json", Some('j'))
+            .switch("minify", "Minify the nuon or json output", Some('m'))
+            .switch("flatten", "An easier to read version of the ast", Some('f'))
             .allow_variants_without_examples(true)
             .category(Category::Debug)
     }
 
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let pipeline: Spanned<String> = call.req(engine_state, stack, 0)?;
-        let to_json = call.has_flag(engine_state, stack, "json")?;
-        let minify = call.has_flag(engine_state, stack, "minify")?;
-        let mut working_set = StateWorkingSet::new(engine_state);
-        let block_output = parse(&mut working_set, None, pipeline.item.as_bytes(), false);
-        let error_output = working_set.parse_errors.first();
-        let block_span = match &block_output.span {
-            Some(span) => span,
-            None => &pipeline.span,
-        };
-        if to_json {
-            // Get the block as json
-            let serde_block_str = if minify {
-                serde_json::to_string(&*block_output)
-            } else {
-                serde_json::to_string_pretty(&*block_output)
-            };
-            let block_json = match serde_block_str {
-                Ok(json) => json,
-                Err(e) => Err(ShellError::CantConvert {
-                    to_type: "string".to_string(),
-                    from_type: "block".to_string(),
-                    span: *block_span,
-                    help: Some(format!(
-                        "Error: {e}\nCan't convert {block_output:?} to string"
-                    )),
-                })?,
-            };
-            // Get the error as json
-            let serde_error_str = if minify {
-                serde_json::to_string(&error_output)
-            } else {
-                serde_json::to_string_pretty(&error_output)
-            };
-
-            let error_json = match serde_error_str {
-                Ok(json) => json,
-                Err(e) => Err(ShellError::CantConvert {
-                    to_type: "string".to_string(),
-                    from_type: "error".to_string(),
-                    span: *block_span,
-                    help: Some(format!(
-                        "Error: {e}\nCan't convert {error_output:?} to string"
-                    )),
-                })?,
-            };
-
-            // Create a new output record, merging the block and error
-            let output_record = Value::record(
-                record! {
-                    "block" => Value::string(block_json, *block_span),
-                    "error" => Value::string(error_json, Span::test_data()),
-                },
-                pipeline.span,
-            );
-            Ok(output_record.into_pipeline_data())
-        } else {
-            let block_value = Value::string(
-                if minify {
-                    format!("{block_output:?}")
-                } else {
-                    format!("{block_output:#?}")
-                },
-                pipeline.span,
-            );
-            let error_value = Value::string(
-                if minify {
-                    format!("{error_output:?}")
-                } else {
-                    format!("{error_output:#?}")
-                },
-                pipeline.span,
-            );
-            let output_record = Value::record(
-                record! {
-                    "block" => block_value,
-                    "error" => error_value
-                },
-                pipeline.span,
-            );
-            Ok(output_record.into_pipeline_data())
-        }
-    }
-
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
@@ -147,8 +62,247 @@ impl Command for Ast {
                 example: "ast 'for x in 1..10 { echo $x ' --json --minify",
                 result: None,
             },
+            Example {
+                description: "Print the ast of a string flattened",
+                example: r#"ast "'hello'" --flatten"#,
+                result: Some(Value::test_list(vec![Value::test_record(record! {
+                    "content" => Value::test_string("'hello'"),
+                    "shape" => Value::test_string("shape_string"),
+                    "span" => Value::test_record(record! {
+                        "start" => Value::test_int(0),
+                        "end" => Value::test_int(7),}),
+                })])),
+            },
+            Example {
+                description: "Print the ast of a string flattened, as json, minified",
+                example: r#"ast "'hello'" --flatten --json --minify"#,
+                result: Some(Value::test_string(
+                    r#"[{"content":"'hello'","shape":"shape_string","span":{"start":0,"end":7}}]"#,
+                )),
+            },
+            Example {
+                description: "Print the ast of a pipeline flattened",
+                example: r#"ast 'ls | sort-by type name -i' --flatten"#,
+                result: Some(Value::test_list(vec![
+                    Value::test_record(record! {
+                        "content" => Value::test_string("ls"),
+                        "shape" => Value::test_string("shape_external"),
+                        "span" => Value::test_record(record! {
+                            "start" => Value::test_int(0),
+                            "end" => Value::test_int(2),}),
+                    }),
+                    Value::test_record(record! {
+                        "content" => Value::test_string("|"),
+                        "shape" => Value::test_string("shape_pipe"),
+                        "span" => Value::test_record(record! {
+                            "start" => Value::test_int(3),
+                            "end" => Value::test_int(4),}),
+                    }),
+                    Value::test_record(record! {
+                        "content" => Value::test_string("sort-by"),
+                        "shape" => Value::test_string("shape_internalcall"),
+                        "span" => Value::test_record(record! {
+                            "start" => Value::test_int(5),
+                            "end" => Value::test_int(12),}),
+                    }),
+                    Value::test_record(record! {
+                        "content" => Value::test_string("type"),
+                        "shape" => Value::test_string("shape_string"),
+                        "span" => Value::test_record(record! {
+                            "start" => Value::test_int(13),
+                            "end" => Value::test_int(17),}),
+                    }),
+                    Value::test_record(record! {
+                        "content" => Value::test_string("name"),
+                        "shape" => Value::test_string("shape_string"),
+                        "span" => Value::test_record(record! {
+                            "start" => Value::test_int(18),
+                            "end" => Value::test_int(22),}),
+                    }),
+                    Value::test_record(record! {
+                        "content" => Value::test_string("-i"),
+                        "shape" => Value::test_string("shape_flag"),
+                        "span" => Value::test_record(record! {
+                            "start" => Value::test_int(23),
+                            "end" => Value::test_int(25),}),
+                    }),
+                ])),
+            },
         ]
     }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let pipeline: Spanned<String> = call.req(engine_state, stack, 0)?;
+        let to_json = call.has_flag(engine_state, stack, "json")?;
+        let minify = call.has_flag(engine_state, stack, "minify")?;
+        let flatten = call.has_flag(engine_state, stack, "flatten")?;
+
+        let mut working_set = StateWorkingSet::new(engine_state);
+        let offset = working_set.next_span_start();
+        let parsed_block = parse(&mut working_set, None, pipeline.item.as_bytes(), false);
+
+        if flatten {
+            let flat = flatten_block(&working_set, &parsed_block);
+            if to_json {
+                let mut json_val: JsonValue = json!([]);
+                for (span, shape) in flat {
+                    let content =
+                        String::from_utf8_lossy(working_set.get_span_contents(span)).to_string();
+
+                    let json = json!(
+                        {
+                            "content": content,
+                            "shape": shape.to_string(),
+                            "span": {
+                                "start": span.start.checked_sub(offset),
+                                "end": span.end.checked_sub(offset),
+                            },
+                        }
+                    );
+                    json_merge(&mut json_val, &json);
+                }
+                let json_string = if minify {
+                    if let Ok(json_str) = serde_json::to_string(&json_val) {
+                        json_str
+                    } else {
+                        "{}".to_string()
+                    }
+                } else if let Ok(json_str) = serde_json::to_string_pretty(&json_val) {
+                    json_str
+                } else {
+                    "{}".to_string()
+                };
+
+                Ok(Value::string(json_string, pipeline.span).into_pipeline_data())
+            } else {
+                // let mut rec: Record = Record::new();
+                let mut rec = vec![];
+                for (span, shape) in flat {
+                    let content =
+                        String::from_utf8_lossy(working_set.get_span_contents(span)).to_string();
+                    let each_rec = record! {
+                        "content" => Value::test_string(content),
+                        "shape" => Value::test_string(shape.to_string()),
+                        "span" => Value::test_record(record!{
+                            "start" => Value::test_int(match span.start.checked_sub(offset) {
+                                Some(start) => start as i64,
+                                None => 0
+                            }),
+                            "end" => Value::test_int(match span.end.checked_sub(offset) {
+                                Some(end) => end as i64,
+                                None => 0
+                            }),
+                        }),
+                    };
+                    rec.push(Value::test_record(each_rec));
+                }
+                Ok(Value::list(rec, pipeline.span).into_pipeline_data())
+            }
+        } else {
+            let error_output = working_set.parse_errors.first();
+            let block_span = match &parsed_block.span {
+                Some(span) => span,
+                None => &pipeline.span,
+            };
+            if to_json {
+                // Get the block as json
+                let serde_block_str = if minify {
+                    serde_json::to_string(&*parsed_block)
+                } else {
+                    serde_json::to_string_pretty(&*parsed_block)
+                };
+                let block_json = match serde_block_str {
+                    Ok(json) => json,
+                    Err(e) => Err(ShellError::CantConvert {
+                        to_type: "string".to_string(),
+                        from_type: "block".to_string(),
+                        span: *block_span,
+                        help: Some(format!(
+                            "Error: {e}\nCan't convert {parsed_block:?} to string"
+                        )),
+                    })?,
+                };
+                // Get the error as json
+                let serde_error_str = if minify {
+                    serde_json::to_string(&error_output)
+                } else {
+                    serde_json::to_string_pretty(&error_output)
+                };
+
+                let error_json = match serde_error_str {
+                    Ok(json) => json,
+                    Err(e) => Err(ShellError::CantConvert {
+                        to_type: "string".to_string(),
+                        from_type: "error".to_string(),
+                        span: *block_span,
+                        help: Some(format!(
+                            "Error: {e}\nCan't convert {error_output:?} to string"
+                        )),
+                    })?,
+                };
+
+                // Create a new output record, merging the block and error
+                let output_record = Value::record(
+                    record! {
+                        "block" => Value::string(block_json, *block_span),
+                        "error" => Value::string(error_json, Span::test_data()),
+                    },
+                    pipeline.span,
+                );
+                Ok(output_record.into_pipeline_data())
+            } else {
+                let block_value = Value::string(
+                    if minify {
+                        format!("{parsed_block:?}")
+                    } else {
+                        format!("{parsed_block:#?}")
+                    },
+                    pipeline.span,
+                );
+                let error_value = Value::string(
+                    if minify {
+                        format!("{error_output:?}")
+                    } else {
+                        format!("{error_output:#?}")
+                    },
+                    pipeline.span,
+                );
+                let output_record = Value::record(
+                    record! {
+                        "block" => block_value,
+                        "error" => error_value
+                    },
+                    pipeline.span,
+                );
+                Ok(output_record.into_pipeline_data())
+            }
+        }
+    }
+}
+
+fn json_merge(a: &mut JsonValue, b: &JsonValue) {
+    match (a, b) {
+        (JsonValue::Object(ref mut a), JsonValue::Object(b)) => {
+            for (k, v) in b {
+                json_merge(a.entry(k).or_insert(JsonValue::Null), v);
+            }
+        }
+        (JsonValue::Array(ref mut a), JsonValue::Array(b)) => {
+            a.extend(b.clone());
+        }
+        (JsonValue::Array(ref mut a), JsonValue::Object(b)) => {
+            a.extend([JsonValue::Object(b.clone())]);
+        }
+        (a, b) => {
+            *a = b.clone();
+        }
+    }
 }
 
 #[cfg(test)]

From 4ed25b63a6fc3444bb870dd6fa2c5a9abb936b00 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Wed, 20 Nov 2024 17:15:15 -0500
Subject: [PATCH 0701/1072] Always load default env/config values (#14249)

# Release-Notes Short Description

* Nushell now always loads its internal `default_env.nu` before the user
`env.nu` is loaded, then loads the internal `default_config.nu` before
the user's `config.nu` is loaded. This allows for a simpler
user-configuration experience. The Configuration Chapter of the Book
will be updated soon with the new behavior.

# Description

Implements the main ideas in #13671 and a few more:

* Users can now specify only the environment and config options they
want to override in *their* `env.nu` and `config.nu`and yet still have
access to all of the defaults:
* `default_env.nu` (internally defined) will be loaded whenever (and
before) the user's `env.nu` is loaded.
* `default_config.nu` (internally defined) will be loaded whenever (and
before) the user's `config.nu` is loaded.
* No more 900+ line config out-of-the-box.
* Faster startup (again): ~40-45% improvement in launch time with a
default configuration.
* New keys that are added to the defaults in the future will
automatically be available to all users after updating Nushell. No need
to regenerate config to get the new defaults.
* It is now possible to have different internal defaults (which will be
used with `-c` and scripts) vs. REPL defaults. This would have solved
many of the user complaints about the [`display_errors`
implementation](https://www.nushell.sh/blog/2024-09-17-nushell_0_98_0.html#non-zero-exit-codes-are-now-errors-toc).
* A basic "scaffold" `config.nu` and `env.nu` are created on first
launch (if the config directory isn't present).
* Improved "out-of-the-box" experience (OOBE) - No longer asks to create
the files; the minimal scaffolding will be automatically created. If
deleted, they will not be regenerated. This provides a better
"out-of-the-box" experience for the user as they no longer have to make
this decision (without much info on the pros or cons) when first
launching.
* <s>(New: 2024-11-07) Runs the env_conversions process after the
`default_env.nu` is loaded so that users can treat `Path`/`PATH` as
lists in their own config.</s>
* (New: 2024-11-08) Given the changes in #13802, `default_config.nu`
will be a minimal file to minimize load-times. This shaves another (on
my system) ~3ms off the base launch time.
* Related: Keybindings, menus, and hooks that are already internal
defaults are no longer duplicated in `$env.config`. The documentation
will be updated to cover these scenarios.
* (New: 2024-11-08) Move existing "full" `default_config.nu` to
`sample_config.nu` for short-term "documentation" purposes.
* (New: 2024-11-18) Move the `dark-theme` and `light-theme` to Standard
Library and demonstrate their use - Also improves startup times, but
we're reaching the limit of optimization.
* (New: 2024-11-18) Extensively documented/commented `sample_env.nu` and
`sample_config.nu`. These can be displayed in-shell using (for example)
`config nu --sample | nu-highlight | less -R`. Note: Much of this will
eventually be moved to or (some) duplicated in the Doc. But for now,
this some nice in-shell doc that replaces the older
"commented/documented default".
* (New: 2024-11-20) Runs the `ENV_CONVERSIONS` process (1) after the
`default_env.nu` (allows `PATH` to be used as a list in user's `env.nu`)
and (2) before `default_config.nu` is loaded (allows user's
`ENV_CONVERSIONS` from their `env.nu` to be used in their `config.nu`).
* <s>(New: 2024-11-20) The default `ENV_CONVERSIONS` is now an empty
record. The internal Rust code handles `PATH` (and variants) conversions
regardless of the `ENV_CONVERSIONS` variable. This shaves a *very* small
amount of time off the startup.</s> Reset - Looks like there might be a
bug in `nu-enginer::env::ensure_path()` on Windows that would need to be
fixed in order for this to work.

# User-Facing Changes

By default, you shouldn't see much, if any, change when running this
with your existing configuration.

To see the greatest benefit from these changes, you'll probably want to
start with a "fresh" config. This can be easily tested using something
like:

```nushell
let temp_home = (mktemp -d)
$env.XDG_CONFIG_HOME = $temp_home
$env.XDG_DATA_HOME = $temp_home
./target/release/nu
```

You should see a message where the (mostly empty) `env.nu` and
`config.nu` are created on first start. Defaults should be the same (or
similar to) those before the PR. Please let me know if you notice any
differences.

---

Users should now specify configuration in terms of overrides of each
setting. For instance, rather than modifying `history` settings in the
monolithic `config.nu`, the following is recommended in an updated
`config.nu`:

```nu
$env.config.history = {
  file_format: sqlite,
  sync_on_enter: true
  isolation: true
  max_size: 1_000_000
}
```

or even just:

```nu
$env.config.history.file_format = sqlite
$env.config.history.isolation: true
$env.config.history.max_size = 1_000_000
```

Note: It seems many users are already appending a `source my_config.nu`
(or similar pattern) to the end of the existing `config.nu` to make
updates easier. In this case, they will likely want to remove all of the
previous defaults and just move their `my_config.nu` to `config.nu`.

Note: It should be unlikely that there are any breaking changes here,
but there's a slim chance that some code, somewhere, *expects* an
absence of certain config values. Otherwise, all config values are
available before and after this change.

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

Configuration Chapter (and related) of the doc is currently WIP and will
be finished in time for 0.101 release.
---
 .../nu-command/src/env/config/config_env.rs   |  37 +-
 crates/nu-command/src/env/config/config_nu.rs |  37 +-
 crates/nu-protocol/tests/into_config.rs       |  14 +-
 crates/nu-std/src/lib.rs                      |   1 +
 crates/nu-std/std/config/mod.nu               | 139 +++
 crates/nu-std/std/mod.nu                      |   1 +
 crates/nu-utils/src/default_files/README.md   |  82 ++
 .../src/default_files/default_config.nu       |  63 ++
 .../nu-utils/src/default_files/default_env.nu |  57 ++
 .../src/default_files/sample_config.nu        | 792 +++++++++++++++
 .../nu-utils/src/default_files/sample_env.nu  | 135 +++
 .../sample_login.nu                           |   0
 .../src/default_files/scaffold_config.nu      |  19 +
 .../src/default_files/scaffold_env.nu         |  18 +
 crates/nu-utils/src/lib.rs                    |   5 +-
 .../src/sample_config/default_config.nu       | 899 ------------------
 .../nu-utils/src/sample_config/default_env.nu | 101 --
 crates/nu-utils/src/utils.rs                  |  21 +-
 src/config_files.rs                           |  98 +-
 src/run.rs                                    |  14 +-
 tests/repl/test_config_path.rs                |   4 +-
 21 files changed, 1454 insertions(+), 1083 deletions(-)
 create mode 100644 crates/nu-std/std/config/mod.nu
 create mode 100644 crates/nu-utils/src/default_files/README.md
 create mode 100644 crates/nu-utils/src/default_files/default_config.nu
 create mode 100644 crates/nu-utils/src/default_files/default_env.nu
 create mode 100644 crates/nu-utils/src/default_files/sample_config.nu
 create mode 100644 crates/nu-utils/src/default_files/sample_env.nu
 rename crates/nu-utils/src/{sample_config => default_files}/sample_login.nu (100%)
 create mode 100644 crates/nu-utils/src/default_files/scaffold_config.nu
 create mode 100644 crates/nu-utils/src/default_files/scaffold_env.nu
 delete mode 100644 crates/nu-utils/src/sample_config/default_config.nu
 delete mode 100644 crates/nu-utils/src/sample_config/default_env.nu

diff --git a/crates/nu-command/src/env/config/config_env.rs b/crates/nu-command/src/env/config/config_env.rs
index cb4a217d9b..5331d2d3be 100644
--- a/crates/nu-command/src/env/config/config_env.rs
+++ b/crates/nu-command/src/env/config/config_env.rs
@@ -15,7 +15,16 @@ impl Command for ConfigEnv {
         Signature::build(self.name())
             .category(Category::Env)
             .input_output_types(vec![(Type::Nothing, Type::Any)])
-            .switch("default", "Print default `env.nu` file instead.", Some('d'))
+            .switch(
+                "default",
+                "Print the internal default `env.nu` file instead.",
+                Some('d'),
+            )
+            .switch(
+                "sample",
+                "Print a commented, sample `env.nu` file instead.",
+                Some('s'),
+            )
         // TODO: Signature narrower than what run actually supports theoretically
     }
 
@@ -26,18 +35,18 @@ impl Command for ConfigEnv {
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
-                description: "allow user to open and update nu env",
+                description: "open user's env.nu in the default editor",
                 example: "config env",
                 result: None,
             },
             Example {
-                description: "allow user to print default `env.nu` file",
-                example: "config env --default,",
+                description: "pretty-print a commented, sample `env.nu` that explains common settings",
+                example: "config env --sample | nu-highlight,",
                 result: None,
             },
             Example {
-                description: "allow saving the default `env.nu` locally",
-                example: "config env --default | save -f ~/.config/nushell/default_env.nu",
+                description: "pretty-print the internal `env.nu` file which is loaded before the user's environment",
+                example: "config env --default | nu-highlight,",
                 result: None,
             },
         ]
@@ -50,12 +59,28 @@ impl Command for ConfigEnv {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
+        let default_flag = call.has_flag(engine_state, stack, "default")?;
+        let sample_flag = call.has_flag(engine_state, stack, "sample")?;
+        if default_flag && sample_flag {
+            return Err(ShellError::IncompatibleParameters {
+                left_message: "can't use `--default` at the same time".into(),
+                left_span: call.get_flag_span(stack, "default").expect("has flag"),
+                right_message: "because of `--sample`".into(),
+                right_span: call.get_flag_span(stack, "sample").expect("has flag"),
+            });
+        }
         // `--default` flag handling
         if call.has_flag(engine_state, stack, "default")? {
             let head = call.head;
             return Ok(Value::string(nu_utils::get_default_env(), head).into_pipeline_data());
         }
 
+        // `--sample` flag handling
+        if sample_flag {
+            let head = call.head;
+            return Ok(Value::string(nu_utils::get_sample_env(), head).into_pipeline_data());
+        }
+
         // Find the editor executable.
         let (editor_name, editor_args) = get_editor(engine_state, stack, call.head)?;
         let paths = nu_engine::env::path_str(engine_state, stack, call.head)?;
diff --git a/crates/nu-command/src/env/config/config_nu.rs b/crates/nu-command/src/env/config/config_nu.rs
index 9969968ed2..176643a76f 100644
--- a/crates/nu-command/src/env/config/config_nu.rs
+++ b/crates/nu-command/src/env/config/config_nu.rs
@@ -17,9 +17,14 @@ impl Command for ConfigNu {
             .input_output_types(vec![(Type::Nothing, Type::Any)])
             .switch(
                 "default",
-                "Print default `config.nu` file instead.",
+                "Print the internal default `config.nu` file instead.",
                 Some('d'),
             )
+            .switch(
+                "sample",
+                "Print a commented, sample `config.nu` file instead.",
+                Some('s'),
+            )
         // TODO: Signature narrower than what run actually supports theoretically
     }
 
@@ -30,18 +35,19 @@ impl Command for ConfigNu {
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
-                description: "allow user to open and update nu config",
+                description: "open user's config.nu in the default editor",
                 example: "config nu",
                 result: None,
             },
             Example {
-                description: "allow user to print default `config.nu` file",
-                example: "config nu --default,",
+                description: "pretty-print a commented, sample `config.nu` that explains common settings",
+                example: "config nu --sample | nu-highlight",
                 result: None,
             },
             Example {
-                description: "allow saving the default `config.nu` locally",
-                example: "config nu --default | save -f ~/.config/nushell/default_config.nu",
+                description:
+                    "pretty-print the internal `config.nu` file which is loaded before user's config",
+                example: "config nu --default | nu-highlight",
                 result: None,
             },
         ]
@@ -54,12 +60,29 @@ impl Command for ConfigNu {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
+        let default_flag = call.has_flag(engine_state, stack, "default")?;
+        let sample_flag = call.has_flag(engine_state, stack, "sample")?;
+        if default_flag && sample_flag {
+            return Err(ShellError::IncompatibleParameters {
+                left_message: "can't use `--default` at the same time".into(),
+                left_span: call.get_flag_span(stack, "default").expect("has flag"),
+                right_message: "because of `--sample`".into(),
+                right_span: call.get_flag_span(stack, "sample").expect("has flag"),
+            });
+        }
+
         // `--default` flag handling
-        if call.has_flag(engine_state, stack, "default")? {
+        if default_flag {
             let head = call.head;
             return Ok(Value::string(nu_utils::get_default_config(), head).into_pipeline_data());
         }
 
+        // `--sample` flag handling
+        if sample_flag {
+            let head = call.head;
+            return Ok(Value::string(nu_utils::get_sample_config(), head).into_pipeline_data());
+        }
+
         // Find the editor executable.
         let (editor_name, editor_args) = get_editor(engine_state, stack, call.head)?;
         let paths = nu_engine::env::path_str(engine_state, stack, call.head)?;
diff --git a/crates/nu-protocol/tests/into_config.rs b/crates/nu-protocol/tests/into_config.rs
index 63d7eb8b22..3ff8d44672 100644
--- a/crates/nu-protocol/tests/into_config.rs
+++ b/crates/nu-protocol/tests/into_config.rs
@@ -35,7 +35,7 @@ fn config_affected_when_mutated() {
 
 #[test]
 fn config_affected_when_deep_mutated() {
-    let actual = nu!(cwd: "crates/nu-utils/src/sample_config", nu_repl_code(&[
+    let actual = nu!(cwd: "crates/nu-utils/src/default_files", nu_repl_code(&[
         r#"source default_config.nu"#,
         r#"$env.config.filesize.metric = true"#,
         r#"20mib | into string"#]));
@@ -45,7 +45,7 @@ fn config_affected_when_deep_mutated() {
 
 #[test]
 fn config_add_unsupported_key() {
-    let actual = nu!(cwd: "crates/nu-utils/src/sample_config", nu_repl_code(&[
+    let actual = nu!(cwd: "crates/nu-utils/src/default_files", nu_repl_code(&[
         r#"source default_config.nu"#,
         r#"$env.config.foo = 2"#,
         r#";"#]));
@@ -57,7 +57,7 @@ fn config_add_unsupported_key() {
 
 #[test]
 fn config_add_unsupported_type() {
-    let actual = nu!(cwd: "crates/nu-utils/src/sample_config", nu_repl_code(&[r#"source default_config.nu"#,
+    let actual = nu!(cwd: "crates/nu-utils/src/default_files", nu_repl_code(&[r#"source default_config.nu"#,
         r#"$env.config.ls = '' "#,
         r#";"#]));
 
@@ -66,7 +66,7 @@ fn config_add_unsupported_type() {
 
 #[test]
 fn config_add_unsupported_value() {
-    let actual = nu!(cwd: "crates/nu-utils/src/sample_config", nu_repl_code(&[r#"source default_config.nu"#,
+    let actual = nu!(cwd: "crates/nu-utils/src/default_files", nu_repl_code(&[r#"source default_config.nu"#,
         r#"$env.config.history.file_format = ''"#,
         r#";"#]));
 
@@ -77,7 +77,7 @@ fn config_add_unsupported_value() {
 #[test]
 #[ignore = "Figure out how to make test_bins::nu_repl() continue execution after shell errors"]
 fn config_unsupported_key_reverted() {
-    let actual = nu!(cwd: "crates/nu-utils/src/sample_config", nu_repl_code(&[r#"source default_config.nu"#,
+    let actual = nu!(cwd: "crates/nu-utils/src/default_files", nu_repl_code(&[r#"source default_config.nu"#,
         r#"$env.config.foo = 1"#,
         r#"'foo' in $env.config"#]));
 
@@ -87,7 +87,7 @@ fn config_unsupported_key_reverted() {
 #[test]
 #[ignore = "Figure out how to make test_bins::nu_repl() continue execution after shell errors"]
 fn config_unsupported_type_reverted() {
-    let actual = nu!(cwd: "crates/nu-utils/src/sample_config", nu_repl_code(&[r#" source default_config.nu"#,
+    let actual = nu!(cwd: "crates/nu-utils/src/default_files", nu_repl_code(&[r#" source default_config.nu"#,
         r#"$env.config.ls = ''"#,
         r#"$env.config.ls | describe"#]));
 
@@ -97,7 +97,7 @@ fn config_unsupported_type_reverted() {
 #[test]
 #[ignore = "Figure out how to make test_bins::nu_repl() continue execution after errors"]
 fn config_unsupported_value_reverted() {
-    let actual = nu!(cwd: "crates/nu-utils/src/sample_config", nu_repl_code(&[r#" source default_config.nu"#,
+    let actual = nu!(cwd: "crates/nu-utils/src/default_files", nu_repl_code(&[r#" source default_config.nu"#,
         r#"$env.config.history.file_format = 'plaintext'"#,
         r#"$env.config.history.file_format = ''"#,
         r#"$env.config.history.file_format | to json"#]));
diff --git a/crates/nu-std/src/lib.rs b/crates/nu-std/src/lib.rs
index ebc6ee0053..b03b710cfc 100644
--- a/crates/nu-std/src/lib.rs
+++ b/crates/nu-std/src/lib.rs
@@ -54,6 +54,7 @@ pub fn load_standard_library(
         ("mod.nu", "std/math", include_str!("../std/math/mod.nu")),
         ("mod.nu", "std/util", include_str!("../std/util/mod.nu")),
         ("mod.nu", "std/xml", include_str!("../std/xml/mod.nu")),
+        ("mod.nu", "std/config", include_str!("../std/config/mod.nu")),
     ];
 
     for (filename, std_subdir_name, content) in std_submodules.drain(..) {
diff --git a/crates/nu-std/std/config/mod.nu b/crates/nu-std/std/config/mod.nu
new file mode 100644
index 0000000000..b73964e8d3
--- /dev/null
+++ b/crates/nu-std/std/config/mod.nu
@@ -0,0 +1,139 @@
+# Returns a dark-mode theme that can be assigned to $env.config.color_config
+export def dark-theme [] {
+    {
+        # color for nushell primitives
+        separator: white
+        leading_trailing_space_bg: { attr: n } # no fg, no bg, attr none effectively turns this off
+        header: green_bold
+        empty: blue
+        # Closures can be used to choose colors for specific values.
+        # The value (in this case, a bool) is piped into the closure.
+        # eg) {|| if $in { 'light_cyan' } else { 'light_gray' } }
+        bool: light_cyan
+        int: white
+        filesize: cyan
+        duration: white
+        date: purple
+        range: white
+        float: white
+        string: white
+        nothing: white
+        binary: white
+        cell-path: white
+        row_index: green_bold
+        record: white
+        list: white
+        block: white
+        hints: dark_gray
+        search_result: { bg: red fg: white }
+        shape_and: purple_bold
+        shape_binary: purple_bold
+        shape_block: blue_bold
+        shape_bool: light_cyan
+        shape_closure: green_bold
+        shape_custom: green
+        shape_datetime: cyan_bold
+        shape_directory: cyan
+        shape_external: cyan
+        shape_externalarg: green_bold
+        shape_external_resolved: light_yellow_bold
+        shape_filepath: cyan
+        shape_flag: blue_bold
+        shape_float: purple_bold
+        # shapes are used to change the cli syntax highlighting
+        shape_garbage: { fg: white bg: red attr: b }
+        shape_glob_interpolation: cyan_bold
+        shape_globpattern: cyan_bold
+        shape_int: purple_bold
+        shape_internalcall: cyan_bold
+        shape_keyword: cyan_bold
+        shape_list: cyan_bold
+        shape_literal: blue
+        shape_match_pattern: green
+        shape_matching_brackets: { attr: u }
+        shape_nothing: light_cyan
+        shape_operator: yellow
+        shape_or: purple_bold
+        shape_pipe: purple_bold
+        shape_range: yellow_bold
+        shape_record: cyan_bold
+        shape_redirection: purple_bold
+        shape_signature: green_bold
+        shape_string: green
+        shape_string_interpolation: cyan_bold
+        shape_table: blue_bold
+        shape_variable: purple
+        shape_vardecl: purple
+        shape_raw_string: light_purple
+    }
+}
+
+# Returns a light-mode theme that can be assigned to $env.config.color_config
+export def light-theme [] {
+    {
+        # color for nushell primitives
+        separator: dark_gray
+        leading_trailing_space_bg: { attr: n } # no fg, no bg, attr none effectively turns this off
+        header: green_bold
+        empty: blue
+        # Closures can be used to choose colors for specific values.
+        # The value (in this case, a bool) is piped into the closure.
+        # eg) {|| if $in { 'dark_cyan' } else { 'dark_gray' } }
+        bool: dark_cyan
+        int: dark_gray
+        filesize: cyan_bold
+        duration: dark_gray
+        date: purple
+        range: dark_gray
+        float: dark_gray
+        string: dark_gray
+        nothing: dark_gray
+        binary: dark_gray
+        cell-path: dark_gray
+        row_index: green_bold
+        record: dark_gray
+        list: dark_gray
+        block: dark_gray
+        hints: dark_gray
+        search_result: { fg: white bg: red }
+        shape_and: purple_bold
+        shape_binary: purple_bold
+        shape_block: blue_bold
+        shape_bool: light_cyan
+        shape_closure: green_bold
+        shape_custom: green
+        shape_datetime: cyan_bold
+        shape_directory: cyan
+        shape_external: cyan
+        shape_externalarg: green_bold
+        shape_external_resolved: light_purple_bold
+        shape_filepath: cyan
+        shape_flag: blue_bold
+        shape_float: purple_bold
+        # shapes are used to change the cli syntax highlighting
+        shape_garbage: { fg: white bg: red attr: b }
+        shape_glob_interpolation: cyan_bold
+        shape_globpattern: cyan_bold
+        shape_int: purple_bold
+        shape_internalcall: cyan_bold
+        shape_keyword: cyan_bold
+        shape_list: cyan_bold
+        shape_literal: blue
+        shape_match_pattern: green
+        shape_matching_brackets: { attr: u }
+        shape_nothing: light_cyan
+        shape_operator: yellow
+        shape_or: purple_bold
+        shape_pipe: purple_bold
+        shape_range: yellow_bold
+        shape_record: cyan_bold
+        shape_redirection: purple_bold
+        shape_signature: green_bold
+        shape_string: green
+        shape_string_interpolation: cyan_bold
+        shape_table: blue_bold
+        shape_variable: purple
+        shape_vardecl: purple
+        shape_raw_string: light_purple
+    }
+}
\ No newline at end of file
diff --git a/crates/nu-std/std/mod.nu b/crates/nu-std/std/mod.nu
index 4d1e74e72d..89454ee1f3 100644
--- a/crates/nu-std/std/mod.nu
+++ b/crates/nu-std/std/mod.nu
@@ -14,6 +14,7 @@ export module std/iter
 export module std/log
 export module std/math
 export module std/xml
+export module std/config
 
 # Load main dirs command and all subcommands
 export use std/dirs main
diff --git a/crates/nu-utils/src/default_files/README.md b/crates/nu-utils/src/default_files/README.md
new file mode 100644
index 0000000000..2269771bbd
--- /dev/null
+++ b/crates/nu-utils/src/default_files/README.md
@@ -0,0 +1,82 @@
+# Nushell configuration files
+
+## `default_env.nu`:
+
+* The internal default environment variables (other than `$env.config`) that will be set during Nushell startup.
+* Is loaded *before* the user's `env.nu`.
+* Will be loaded during any startup where the user's `env.nu` is also loaded. For example:
+  * During normal startup with `nu`
+  * During a startup where the user specifies an alternative `env.nu` via `nu --env-config <path>`
+* Likewise, is never loaded during a startup where the user's `env.nu` would not be loaded. For example:
+  * `nu -n/--no-config`
+  * `nu -c "ls"`
+  * `nu <script.nu>`
+* Is not commented - Comments are in `sample_env.nu`.
+* Should be optimized for fastest load times.
+* Can be introspected via `config env --default | nu-highlight`
+
+## `default_config.nu`:
+
+Counterpart to `default_env.nu`.
+
+* Contains any `$env.config` values that are not set via Rust defaults.
+* Is loaded *after* the user's `env.nu`.
+* Is loaded *before* the user's `config.nu`.
+* Will be loaded during any startup where the user's `config.nu` is also loaded. For example:
+  * During normal startup with `nu`
+  * During a startup where the user specifies an alternative `config.nu` via `nu --config <path>`
+* Likewise, is never loaded during a startup where the user's `config.nu` would not be loaded. For example:
+  * `nu -n/--no-config`
+  * `nu -c "ls"`
+  * `nu <script.nu>`
+* Is not commented - Comments are in `sample_config.nu`.
+* Should be optimized for fastest load times. Whenever possible, values should be set via nu-protocol::config
+  * Exception: `color_config` values are currently set in this file so that user's can introspect the values
+  * TODO: Implement defaults for `color_config` in nu-protocol::config and remove from `default_config.nu`
+* Can be introspected via `config nu --default | nu-highlight`
+* An ideal `default_config.nu` (when all values are set via `nu-protocol::config`) will simply be:
+  ```
+  $env.config = {}
+  ```
+
+## `sample_env.nu`
+
+* A commented file documenting the most common environment variables that a user might configure in `env.nu`
+* For convenient in-shell access
+* Can be pretty-printed via `config env --sample | nu-highlight`
+* Since this file is for documentation only, include actual Nushell code without comments so that it can be pretty-printed
+* No optimization necessary - Not intended for use other than documentation.
+* Consider replacing `config env --sample` with `help env.nu` at some point.
+* Uses a mix of default values (explained) as well as other examples that users might want in their own `env.nu`
+
+## `sample_config.nu`
+
+Counterpart to `sample_env.nu`.
+
+TODO: **Not in final form**
+
+* A commented file documenting the most common environment variables that a user might configure in `config.nu`
+* For convenient in-shell access
+* Can be pretty-printed via `config nu --sample | nu-highlight`
+* Since this file is for documentation only, include actual Nushell code without comments so that it can be pretty-printed
+* No optimization necessary - Not intended for use other than documentation.
+* Consider replacing `config nu --sample` with `help config.nu` at some point.
+* Uses a mix of default values (explained) as well as other examples that users might want in their own `config.nu`
+
+## `scaffold_env.nu`
+
+* This file is used *one-time* (typically) at **first** startup
+* If the `$nu.default-config-path` directory does not exist, the directory is created and then both `scaffold_env.nu` and `scaffold_config.nu` are written to it
+* Contains only commented lines explaining the purpose of the file to the user, along with information on the `config env` command.
+
+## `scaffold_config.nu`
+
+Counterpart to `scaffold_env.nu`.
+
+* This file is used *one-time* (typically) at **first** startup
+* If the `$nu.default-config-path` directory does not exist, the directory is created and then both `scaffold_env.nu` and `scaffold_config.nu` are written to it
+* Contains only commented lines explaining the purpose of the file to the user, along with information on the `config nu` command.
+
+## `sample_login.nu`
+
+This file is not used by any Nushell code. Of course, if the user has a `login.nu`, then it will be evaluated during startup of a login shell.
\ No newline at end of file
diff --git a/crates/nu-utils/src/default_files/default_config.nu b/crates/nu-utils/src/default_files/default_config.nu
new file mode 100644
index 0000000000..d95f4b3f97
--- /dev/null
+++ b/crates/nu-utils/src/default_files/default_config.nu
@@ -0,0 +1,63 @@
+# Nushell Config File
+#
+# version = "0.100.1"
+$env.config.color_config = {
+    separator: white
+    leading_trailing_space_bg: { attr: n }
+    header: green_bold
+    empty: blue
+    bool: light_cyan
+    int: white
+    filesize: cyan
+    duration: white
+    date: purple
+    range: white
+    float: white
+    string: white
+    nothing: white
+    binary: white
+    cell-path: white
+    row_index: green_bold
+    record: white
+    list: white
+    block: white
+    hints: dark_gray
+    search_result: { bg: red fg: white }
+    shape_and: purple_bold
+    shape_binary: purple_bold
+    shape_block: blue_bold
+    shape_bool: light_cyan
+    shape_closure: green_bold
+    shape_custom: green
+    shape_datetime: cyan_bold
+    shape_directory: cyan
+    shape_external: cyan
+    shape_externalarg: green_bold
+    shape_external_resolved: light_yellow_bold
+    shape_filepath: cyan
+    shape_flag: blue_bold
+    shape_float: purple_bold
+    shape_glob_interpolation: cyan_bold
+    shape_globpattern: cyan_bold
+    shape_int: purple_bold
+    shape_internalcall: cyan_bold
+    shape_keyword: cyan_bold
+    shape_list: cyan_bold
+    shape_literal: blue
+    shape_match_pattern: green
+    shape_matching_brackets: { attr: u }
+    shape_nothing: light_cyan
+    shape_operator: yellow
+    shape_or: purple_bold
+    shape_pipe: purple_bold
+    shape_range: yellow_bold
+    shape_record: cyan_bold
+    shape_redirection: purple_bold
+    shape_signature: green_bold
+    shape_string: green
+    shape_string_interpolation: cyan_bold
+    shape_table: blue_bold
+    shape_variable: purple
+    shape_vardecl: purple
+    shape_raw_string: light_purple
+}
\ No newline at end of file
diff --git a/crates/nu-utils/src/default_files/default_env.nu b/crates/nu-utils/src/default_files/default_env.nu
new file mode 100644
index 0000000000..498c9670b3
--- /dev/null
+++ b/crates/nu-utils/src/default_files/default_env.nu
@@ -0,0 +1,57 @@
+# Default Nushell Environment Config File
+# These "sensible defaults" are set before the user's `env.nu` is loaded
+#
+# version = "0.100.1"
+
+$env.PROMPT_COMMAND = {|| 
+    let dir = match (do --ignore-shell-errors { $env.PWD | path relative-to $nu.home-path }) {
+        null => $env.PWD
+        '' => '~'
+        $relative_pwd => ([~ $relative_pwd] | path join)
+    }
+
+    let path_color = (if (is-admin) { ansi red_bold } else { ansi green_bold })
+    let separator_color = (if (is-admin) { ansi light_red_bold } else { ansi light_green_bold })
+    let path_segment = $"($path_color)($dir)(ansi reset)"
+
+    $path_segment | str replace --all (char path_sep) $"($separator_color)(char path_sep)($path_color)"
+}
+
+$env.PROMPT_INDICATOR = "> "
+$env.PROMPT_INDICATOR_VI_NORMAL = "> "
+$env.PROMPT_INDICATOR_VI_INSERT = ": "
+$env.PROMPT_MULTILINE_INDICATOR = "::: "
+
+$env.PROMPT_COMMAND_RIGHT = {|| 
+    # create a right prompt in magenta with green separators and am/pm underlined
+    let time_segment = ([
+        (ansi reset)
+        (ansi magenta)
+        (date now | format date '%x %X') # try to respect user's locale
+    ] | str join | str replace --regex --all "([/:])" $"(ansi green)${1}(ansi magenta)" |
+        str replace --regex --all "([AP]M)" $"(ansi magenta_underline)${1}")
+
+    let last_exit_code = if ($env.LAST_EXIT_CODE != 0) {([
+        (ansi rb)
+        ($env.LAST_EXIT_CODE)
+    ] | str join)
+    } else { "" }
+
+    ([$last_exit_code, (char space), $time_segment] | str join)
+}
+
+$env.ENV_CONVERSIONS = {
+    "PATH": {
+        from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
+        to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
+    }
+}
+
+$env.NU_LIB_DIRS = [
+    ($nu.default-config-dir | path join 'scripts') # add <nushell-config-dir>/scripts
+    ($nu.data-dir | path join 'completions') # default home for nushell completions
+]
+
+$env.NU_PLUGIN_DIRS = [
+    ($nu.default-config-dir | path join 'plugins') # add <nushell-config-dir>/plugins
+]
\ No newline at end of file
diff --git a/crates/nu-utils/src/default_files/sample_config.nu b/crates/nu-utils/src/default_files/sample_config.nu
new file mode 100644
index 0000000000..5a8181506c
--- /dev/null
+++ b/crates/nu-utils/src/default_files/sample_config.nu
@@ -0,0 +1,792 @@
+# Nushell Config File
+#
+# version = "0.99.2"
+#
+# A `config.nu` file is used to override default Nushell settings,
+# define (or import) custom commands, or run any other startup tasks.
+# See https://www.nushell.sh/book/configuration.html
+#
+# Nushell sets "sensible defaults" for most configuration settings, so
+# the user's `config.nu` only needs to override these defaults if
+# desired.
+#
+# This file serves as simple "in-shell" documentation for these
+# settings, or you can view a more complete discussion online at:
+# https://nushell.sh/book/configuration
+#
+# You can pretty-print and page this file using:
+# config nu --sample | nu-highlight | less -R
+
+# $env.config
+# -----------
+# The $env.config environment variable is a record containing most Nushell
+# configuration settings. Keep in mind that, as a record, setting it to a
+# new record will remove any keys which aren't in the new record. Nushell
+# will then automatically merge in the internal defaults for missing keys.
+#
+# The same holds true for keys in the $env.config which are also records
+# or lists.
+#
+# For this reason, settings are typically changed by updating the value of
+# a particular key. Merging a new config record is also possible. See the
+# Configuration chapter of the book for more information.
+
+# ------------------------
+# History-related settings
+# ------------------------
+# $env.config.history.*
+
+# file_format (string):  Either "sqlite" or "plaintext". While text-backed history
+# is currently the default for historical reasons, "sqlite" is stable and
+# provides more advanced history features.
+$env.config.history.file_format = "sqlite"
+
+# max_size (int): The maximum number of entries allowed in the history.
+# After exceeding this value, the oldest history items will be removed
+# as new commands are added.
+$env.config.history.max_size = 5_000_000
+
+# sync_on_enter (bool): Whether the plaintext history file is updated
+# each time a command is entered. If set to `false`, the plaintext history
+# is only updated/written when the shell exits. This setting has no effect
+# for SQLite-backed history.
+$env.config.history.sync_on_enter = true
+
+# isolation (bool):
+# `true`: New history from other currently-open Nushell sessions is not
+# seen when scrolling through the history using PrevHistory (typically
+# the Up key) or NextHistory (Down key)
+# `false`: All commands entered in other Nushell sessions will be mixed with
+# those from the current shell.
+# Note: Older history items (from before the current shell was started) are
+# always shown.
+# This setting only applies to SQLite-backed history
+$env.config.history.isolation = true
+
+# ----------------------
+# Miscellaneous Settings
+# ----------------------
+
+# show_banner (bool): Enable or disable the welcome banner at startup
+$env.config.show_banner = true
+
+# rm.always_trash (bool):
+# true: rm behaves as if the --trash/-t option is specified
+# false: rm behaves as if the --permanent/-p option is specified (default)
+# Explicitly calling `rm` with `--trash` or `--permanent` always override this setting
+# Note that this feature is dependent on the host OS trashcan support.
+$env.config.rm.always_trash = false
+
+# recursion_limit (int): how many times a command can call itself recursively
+# before an error will be generated.
+$env.config.recursion_limit = 50
+
+# ---------------------------
+# Commandline Editor Settings
+# ---------------------------
+
+# edit_mode (string) "vi" or "emacs" sets the editing behavior of Reedline
+edit_mode: "emacs"
+
+# Command that will be used to edit the current line buffer with Ctrl+O.
+# If unset, uses $env.VISUAL and then $env.EDITOR
+#
+# Tip: Set to "editor" to use the default editor on Unix platforms using
+#      the Alternatives system or equivalent
+buffer_editor: "editor"
+
+# cursor_shape_* (string)
+# -----------------------
+# The following variables accept a string from the following selections:
+# "block", "underscore", "line", "blink_block", "blink_underscore", "blink_line", or "inherit"
+# "inherit" skips setting cursor shape and uses the current terminal setting.
+$env.config.cursor_shape.emacs = "inherit"         # Cursor shape in emacs mode
+$env.config.cursor_shape.vi_insert = "block"       # Cursor shape in vi-insert mode
+$env.config.cursor_shape.vi_normal = "underscore"  # Cursor shape in normal vi mode
+
+# --------------------
+# Completions Behavior
+# --------------------
+# $env.config.completions.*
+# Apply to the Nushell completion system
+
+# algorithm (string): Either "prefix" or "fuzzy"
+$env.config.completions.algorithm = "prefix"
+
+# sort (string): One of "smart" or "alphabetical"
+# In "smart" mode sort order is based on the "algorithm" setting.
+# When using the "prefix" algorithm, results are alphabetically sorted.
+# When using the "fuzzy" algorithm, results are sorted based on their fuzzy score.
+$env.config.completions.sort = "smart"
+
+# case_sensitive (bool): true/false to enable/disable case-sensitive completions
+$env.config.completions.case_sensitive = false 
+
+# quick (bool):
+# true: auto-select the completion when only one remains
+# false: prevents auto-select of the final result
+$env.config.completions.quick = true
+
+# partial (bool):
+# true: Partially complete up to the best possible match
+# false: Do not partially complete
+# Partial Example: If a directory contains only files named "forage", "food", and "forest",
+#                  then typing "ls " and pressing <Tab> will partially complete the first two
+#                  letters, "f" and "o". If the directory also includes a file named "faster", 
+#                  then only "f" would be partially completed.
+$env.config.completions.partial = true
+
+# use_ls_colors (bool): When true, apply LS_COLORS to file/path/directory matches
+$env.config.completions.use_ls_colors = true
+
+# --------------------
+# External Completions
+# --------------------
+# completions.external.*: Settings related to completing external commands
+# and additional completers
+
+# external.exnable (bool)
+# true: search for external commands on the Path
+# false: disabling might be desired for performance if your path includes
+#        directories on a slower filesystem
+$env.config.completions.external.enable = true
+
+# max_results (int): Limit the number of external commands retrieved from
+# path to this value. Has no effect if `...external.enable` (above) is set to `false`
+$env.config.completions.external.max_results = 50
+
+# completer (closure with a |spans| parameter): A command to call for *argument* completions
+# to commands (internal or external). 
+#
+# The |spans| parameter is a list of strings representing the tokens (spans)
+# on the current commandline. It is always a list of at least two strings - The 
+# command being completed plus the first argument of that command ("" if no argument has
+# been partially typed yet), and additional strings for additional arguments beyond
+# the first.
+#
+# This setting is usually set to a closure which will call a third-party completion system, such
+# as Carapace. 
+#
+# Note: The following is an over-simplified completer command that will call Carapace if it
+# is installed. Please use the official Carapace completer, which can be generated automatically
+# by Carapace itself. See the Carapace documentation for the proper syntax.
+$env.config.completions.external.completer = {|spans|
+  carapace $spans.0 nushell ...$spans | from json
+}
+
+# --------------------
+# Terminal Integration
+# --------------------
+# Nushell can output a number of escape codes to enable advanced features in Terminal Emulators
+# that support them. Settings in this section enable or disable these features in Nushell.
+# Features aren't supported by your Terminal can be disabled. Features can also be disabled,
+#  of course, if there is a conflict between the Nushell and Terminal's implementation.
+
+# use_kitty_protocol (bool):
+# A keyboard enhancement protocol supported by the Kitty Terminal. Additional keybindings are
+# available when using this protocol in a supported terminal. For example, without this protocol,
+# Ctrl+I is interpreted as the Tab Key. With this protocol, Ctrl+I and Tab can be mapped separately.
+$env.config.use_kitty_protocol = false
+
+# osc2 (bool):
+# When true, the current directory and running command are shown in the terminal tab/window title.
+# Also abbreviates the directory name by prepending ~ to the home directory and its subdirectories.
+$env.config.shell_integration.osc2 = true
+
+# osc7 (bool):
+# Nushell will report the current directory to the terminal using OSC 7. This is useful when
+# spawning new tabs in the same directory.
+$env.config.shell_integration.osc7 = true
+
+# osc9_9 (bool):
+# Enables/Disables OSC 9;9 support, originally a ConEmu terminal feature. This is an
+# alternative to OSC 7 which also communicates the current path to the terminal.
+$env.config.shell_integration.osc9_9 = false
+
+# osc8 (bool):
+# When true, the `ls` command will generate clickable links that can be launched in another
+# application by the terminal.
+# Note: This setting replaces the now deprecated `ls.show_clickable_links`
+$env.config.shell.integration.osc8: true
+
+# Deprecated
+# $env.config.ls.clickable_links = true
+
+# osc133 (bool):
+# true/false to enable/disable OSC 133 support, a set of several escape sequences which
+# report the (1) starting location of the prompt, (2) ending location of the prompt,
+# (3) starting location of the command output, and (4) the exit code of the command.
+
+# originating with Final Term. These sequences report information regarding the prompt
+# location as well as command status to the terminal. This enables advanced features in
+# some terminals, including the ability to provide separate background colors for the
+# command vs. the output, collapsible output, or keybindings to scroll between prompts.
+$env.config.shell_integration.osc133 = true
+
+# osc633 (bool):
+# true/false to enable/disable OSC 633, an extension to OSC 133 for Visual Studio Code
+$env.config.shell_integration.osc633 = true
+
+# reset_application_mode (bool):
+# true/false to enable/disable sending ESC[?1l to the terminal
+# This sequence is commonly used to keep cursor key modes in sync between the local 
+# terminal and a remove SSH host.
+$env.config.shell_integration.reset_application_mode = true
+
+# bracketed_paste (bool):
+# true/false to enable/disable the bracketed-paste feature, which allows multiple-lines
+# to be pasted into Nushell at once without immediate execution. When disabled, 
+# each pasted line is executed as it is received.
+# Note that bracketed paste is not currently supported on the Windows version of
+# Nushell.
+$env.config.bracketed_paste = true
+
+# use_ansi_coloring (bool):
+# true/false to enable/disable the use of ANSI colors in Nushell internal commands.
+# When disabled, output from Nushell built-in commands will display only in the default
+# foreground color.
+# Note: Does not apply to the `ansi` command.
+$env.config.use_ansi_coloring = true
+
+# ----------------------
+# Error Display Settings
+# ----------------------
+
+# error_style (string): One of "fancy" or "plain"
+# Plain: Display plain-text errors for screen-readers
+# Fancy: Display errors using line-drawing characters to point to the span in which the
+#        problem occurred.
+$env.config.error_style = "fancy"
+
+# display_errors.exit_code (bool):
+# true: Display a Nushell error when an external command returns a non-zero exit code
+# false: Display only the error information printed by the external command itself
+# Note: Core dump errors are always printed; SIGPIPE never triggers an error
+$env.config.display_errors.exit_code = false
+
+# display_errors.termination_signal (bool):
+# true/false to enable/disable displaying a Nushell error when a child process is
+# terminated via any signal 
+$env.config.display_errors.termination_signal = true
+
+# -------------
+# Table Display
+# -------------
+# footer_mode (string or int):
+# Specifies when to display table footers with column names. Allowed values:
+# "always"
+# "never"
+# "auto": When the length of the table would scroll the header past the first line of the terminal
+# (int): When the number of table rows meets or exceeds this value
+# Note: Does not take into account rows with multiple lines themselves
+$env.config.footer_mode = 25
+
+# table.*
+# table_mode (string): 
+# One of: "default", "basic", "compact", "compact_double", "heavy", "light", "none", "reinforced",
+# "rounded", "thin", "with_love", "psql", "markdown", "dots", "restructured", "ascii_rounded",
+# or "basic_compact"
+# Can be overridden by passing a table to `| table --theme/-t`
+$env.config.table.mode = "default"
+
+# index_mode (string) - One of:
+# "never": never show the index column in a table or list
+# "always": always show the index column in tables and lists
+# "auto": show the column only when there is an explicit "index" column in the table
+# Can be overridden by passing a table to `| table --index/-i`
+$env.config.table.index_mode = "always"
+
+# show_empty (bool):
+# true: show "empty list" or "empty table" when no values exist
+# false: display no output when no values exist
+$env.config.table.show_empty = true
+
+# padding.left/right (int): The number of spaces to pad around values in each column
+$env.config.table.padding.left = 1
+$env.config.table.padding.right = 1
+
+# trim.*: The rules that will be used to display content in a table row when it would cause the
+#         table to exceed the terminal width.
+# methodology (string): One of "wrapping" or "truncating"
+# truncating_suffix (string): The text to show at the end of the row to indicate that it has
+#                             been truncated. Only valid when `methodology = "truncating"`.
+# wrapping_try_keep_words (bool): true to keep words together based on whitespace
+#                                 false to allow wrapping in the middle of a word.
+#                                 Only valid when `methodology = wrapping`.
+$env.config.table.trim = {
+  methodology: "wrapping"
+  wrapping_try_keep_words: true
+}
+# or
+$env.config.table.trim = {
+  methodology: "truncating"
+  truncating_suffix: "..."
+}
+
+# header_on_separator (bool):
+# true: Displays the column headers as part of the top (or bottom) border of the table
+# false: Displays the column header in its own row with a separator below.
+$env.config.table.header_on_separator = false
+
+# abbreviated_row_count (int or nothing):
+# If set to an int, all tables will be abbreviated to only show the first <n> and last <n> rows
+# If set to `null`, all table rows will be displayed
+# Can be overridden by passing a table to `| table --abbreviated/-a`
+$env.config.table.abbreviated_row_count
+
+# footer_inheritance (bool): Footer behavior in nested tables
+# true: If a nested table is long enough on its own to display a footer (per `footer_mode` above),
+#       then also display the footer for the parent table
+# false: Always apply `footer_mode` rules to the parent table
+$env.config.table.footer_inheritance = false
+
+# ----------------
+# Datetime Display
+# ----------------
+# datetime_format.* (string or nothing):
+# Format strings that will be used for datetime values. 
+# When set to `null`, the default behavior is to "humanize" the value (e.g., "now" or "a day ago")
+
+# datetime_format.table (string or nothing):
+# The format string (or `null`) that will be used to display a datetime value when it appears in a
+# structured value such as a table, list, or record.
+$env.config.datetime_format.table = null
+
+# datetime_format.normal (string or nothing):
+# The format string (or `null`) that will be used to display a datetime value when it appears as
+# a raw value.
+$env.config.datetime_format.normal = "%m/%d/%y %I:%M:%S%p"
+
+# ----------------
+# Filesize Display
+# ----------------
+# filesize.metric (bool): When displaying filesize values ...
+# true: Use the ISO-standard KB, MB, GB
+# false: Use the Windows-standard KiB, MiB, GiB
+$env.config.filesize.metric = false
+
+# filesize.format (string): One of either:
+# - The filesize units such as "KB", "KiB", etc. In this case, filesize values always display using
+# this unit.
+# - Or "auto": Filesizes are displayed using the closest unit. For example, 1_000_000_000b will display
+#   as 953.7 MiB (when `metric = false`) or 1.0GB (when `metric = true`)
+$env.config.filesize.format = "auto"
+
+# ---------------------
+# Miscellaneous Display
+# ---------------------
+
+# render_right_prompt_on_last_line(bool):
+# true: When using a multi-line left-prompt, the right-prompt will be displayed on the last line
+# false: The right-prompt is displayed on the first line of the left-prompt
+$env.config.render_right_prompt_on_last_line = false
+
+# float_precision (int):
+# Float values will be rounded to this precision when displaying in structured values such as lists,
+# tables, or records.
+$env.config.float_precision = 2
+
+# ls.use_ls_colors (bool):
+# true: The `ls` command will apply the $env.LS_COLORS standard to filenames
+# false: Filenames in the `ls` table will use the color_config for strings
+$env.config.ls = true
+
+# Hooks
+# -----
+# $env.config.hooks is a record containing the five different types of Nushell hooks.
+# See the Hooks documentation at https://www.nushell.sh/book/hooks for details
+#
+# Most hooks can accept a string, a closure, or a list containing strings and/or closures.
+# The display_output record can only accept a string or a closure, but never a list
+#
+# WARNING: A malformed display_output hook can suppress all Nushell output to the terminal.
+#          It can be reset by assigning an empty string as below:
+
+$env.config.hooks.pre_prompt = []          # Before each prompt is displayed
+$env.config.hooks.pre_execution = []       # After <enter> is pressed; before the commandline
+                                           # is executed
+$env.config.hooks.env_change = []          # When a specified environment variable changes
+$env.config.hooks.display_output = ""      # Before Nushell output is displayed in the terminal
+$env.config.hooks.command_not_found = []   # When a command is not found
+
+# -----------
+# Keybindings
+# -----------
+# keybindings (list): A list of user-defined keybindings
+# Nushell/Reedline keybindings can be added or overridden using this setting.
+# See https://www.nushell.sh/book/line_editor.html#keybindings for details.
+#
+# Example - Add a new Alt+. keybinding to insert the last token used on the previous commandline
+$env.config.keybindings ++= [
+  {
+    name: insert_last_token
+    modifier: alt
+    keycode: char_.
+    mode: [emacs vi_normal vi_insert]
+    event: [
+      { edit: InsertString, value: "!$" }
+      { send: Enter }
+    ]
+  }
+]
+
+# Example: Override the F1 keybinding with a user-defined help menu (see "Menus" below):
+$env.config.keybindings ++= [
+  {
+    name: help_menu
+    modifier: none
+    keycode: f1
+    mode: [emacs, vi_insert, vi_normal]
+    event: { send: menu name: help_menu }
+  }
+]
+
+# -----
+# Menus
+# -----
+# menus (list):
+#
+# Nushell/Reedline menus can be created and modified using this setting.
+# See https://www.nushell.sh/book/line_editor.html#menus for details.
+#
+# Note that menus are usually activated via keybindings, which are defined in
+# $env.config.keybindings (above).
+#
+# Simple example - Add a new Help menu to the list (note that a similar menu is already
+# defined internally):
+$env.config.menus ++= [
+    {
+        name: help_menu
+        only_buffer_difference: true
+        marker: "? "
+        type: {
+            layout: description
+            columns: 4
+            col_width: 20     # Optional value. If missing all the screen width is used to calculate column width
+            col_padding: 2
+            selection_rows: 4
+            description_rows: 10
+        }
+        style: {
+            text: green
+            selected_text: green_reverse
+            description_text: yellow
+        }
+    }
+]
+
+
+# ---------------
+# Plugin behavior
+# ---------------
+# Per-plugin configuration. See https://www.nushell.sh/contributor-book/plugins.html#configuration.
+plugins: {}
+$env.config.plugins
+$env.config.plugin_gc
+$env.config.plugin_gc.default
+$env.config.plugin_gc.default.enabled
+$env.config.plugin_gc.default.stop_after
+$env.config.plugin_gc.plugins
+    plugin_gc: {
+        # Configuration for plugin garbage collection
+        default: {
+            enabled: true # true to enable stopping of inactive plugins
+            stop_after: 10sec # how long to wait after a plugin is inactive to stop it
+        }
+        plugins: {
+            # alternate configuration for specific plugins, by name, for example:
+            #
+            # gstat: {
+            #     enabled: false
+            # }
+        }
+    }
+
+
+# -------------------------------------
+# Themes/Colors and Syntax Highlighting
+# -------------------------------------
+# For more information on defining custom themes, see
+# https://www.nushell.sh/book/coloring_and_theming.html
+
+# Use and/or contribute to the theme collection at
+# https://github.com/nushell/nu_scripts/tree/main/themes
+
+# Values:
+
+# highlight_resolved_externals (bool):
+# true: Applies the `color_config.shape_external_resolved` color (below) to external commands
+#       which are found (resolved) on the path
+# false: Applies the `color_config.shape_external` color to *all* externals simply based on whether
+#        or not they would be *parsed* as an external command based on their position.
+# Defaults to false for systems with a slower search path
+$env.config.highlight_resolved_externals = true
+
+# color_config (record): A record of shapes, types, UI elements, etc. that can be styled (e.g.,
+# colorized) in Nushell, either on the commandline itself (shapes) or in output.
+#
+# Note that this is usually set through a theme provided by a record in a custom command. For
+# instance, the standard library contains two "starter" theme commands: "dark-theme" and
+# "light-theme". For example:
+use std/config dark-theme
+$env.config.color_config = (dark-theme)
+
+# Or, individual color settings can be configured or overridden.
+# 
+# Values can be one of:
+# - A color name such as "red" (see `ansi -l` for a list)
+# - A color RGB value in the form of "#C4C9C6"
+# - A record including:
+#   * `fg` (color) 
+#   * `bg` (color)
+#   * `attr`: a string with one or more of:
+#     - 'n': normal
+#     - 'b': bold
+#     - 'u': underline
+#     - 'r': reverse
+#     - 'i': italics
+#     - 'd': dimmed
+
+# foreground, background, and cursor colors are not handled by Nushell, but can be used by 
+# custom-commands such as `theme` from the nu_scripts repository. That `theme` command can be
+# used to set the terminal foreground, background, and cursor colors.
+$env.config.color_config.foreground
+$env.config.color_config.background
+$env.config.color_config.cursor
+
+# -------------------------------------------------------------------------------------------------
+# shape_: Applies syntax highlighting based on the "shape" (inferred or declared type) of an
+# element on the commandline. Nushell's parser can identify shapes based on many criteria, often
+# as the commandline is being typed. 
+
+# shape_string: Can appear as a single-or-quoted value, a bareword string, the key of a record,
+# an argument which has been declared as a string, and other parsed strings.
+$env.config.color_config.shape_string
+
+# shape_string_interpolation: A single-or-double-quoted string interpolation. This style
+# applies to the dollar sign and quotes of the string. The elements inside the string are
+# styled according to their own shape.
+$env.config.color_config.shape_string_interpolation
+
+# shape_raw_string: a raw string literal. E.g., r#'This is a raw string'#. This style applies
+# to the entire raw string.
+$env.config.color_config.shape_raw_string
+
+# shape_record: A record-literal. This style applies to the brackets around the record. The keys
+# and values will be styled according to their individual shapes.
+$env.config.color_config.shape_record
+
+# shape_list: A list-literal. This style applies to the brackets and list separator only. The
+# items in a list are styled according to their individual shapes.
+$env.config.color_config.shape_list
+
+# shape_table: A table-literl. Color applies to the brackets, semicolon, and list separators. The
+# items in the table are style according to their individual shapes.
+$env.config.color_config.shape_table
+
+# shape_bool: A boolean-literal `true` or `false` value
+$env.config.color_config.shape_bool
+
+# shape_int: Integer literals
+$env.config.color_config.shape_int
+
+# shape_float: Float literals. E.g., 5.4
+# Also integer literals in a float-argument position
+$env.config.color_config.shape_float
+
+# shape_range: Range literals
+$env.config.color_config.shape_range
+
+# shape_binary: Binary literals
+$env.config.color_config.shape_binary
+
+# shape_datetime: Datetime literals
+$env.config.color_config.shape_datetime
+
+# shape_custom: A custom value, usually from a plugin
+$env.config.color_config.shape_custom
+
+# shape_nothing: A literal `null`
+$env.config.color_config.shape_nothing
+
+# shape_literal: Not currently used
+$env.config.color_config.shape_literal
+
+# shape_operator: An operator such as +, -, ++, in, not-in, etc.
+$env.config.color_config.shape_operator
+
+# shape_filepath: An argument that appears in the position of a `path` shape for a command
+$env.config.color_config.shape_filepath
+
+# shape_directory: A more specific 'path' shape that only accepts a directory.
+$env.config.color_config.shape_directory
+
+# shape_globpattern: An argument in the position of a glob parameter. E.g., the asterisk (or any other string) in `ls *`.
+$env.config.color_config.shape_globpattern
+
+# shape_glob_interpolation: Deprecated
+$env.config.color_config.shape_glob_interpolation
+
+# shape_garbage: When an argument is of the wrong type or cannot otherwise be parsed.
+# E.g., `ls {a: 5}` - A record argument to `ls` is 'garbage'. Also applied in real-time when
+# an expression is not (yet) properly closed.
+$env.config.color_config.shape_garbage
+
+# shape_or and shape_and: The and and or operators.
+# Note: Not currently implemented.
+$env.config.color_config.shape_or
+$env.config.color_config.shape_and
+
+# shape_variable: The *use* of a variable. E.g., `$env` or `$a`.
+$env.config.color_config.shape_variable
+
+# shape_vardecl: The *declaration* of a variable. E.g. the "a" in `let a = 5`.
+$env.config.color_config.shape_vardecl
+
+# shape_matching_brackets: When the cursor is positioned on an opening or closing bracket (e.g,
+# braces, curly braces, or parenthesis), and there is a matching opening/closing bracket, both will
+# temporarily have this style applied.
+$env.config.color_config.shape_matching_brackets
+
+# shape_pipe: The pipe `|` when used to separate expressions in a pipeline
+$env.config.color_config.shape_pipe
+
+# shape_internalcall: A known Nushell built-in or custom command in the "command position" (usually
+# the first bare word of an expression).
+$env.config.color_config.shape_internalcall
+
+# shape_external: A token in the "command position" (see above) that is not a known Nushell
+# built-in or custom command. This is assumed to be an external command.
+$env.config.color_config.shape_external
+
+# shape_external_resolved: Requires "highlight_resolved_externals" (above) to be enabled.
+# When a token matches the "external" requirement (above) and is also a *confirmed* external
+# command, this style will be applied.
+$env.config.color_config.shape_external_resolved
+
+# shape_externalarg: Arguments to an external command (whether resolved or not)
+$env.config.color_config.shape_externalarg
+
+# shape_match_pattern: The matching pattern for each arm in a match expression. Does not
+# include the guard expression (if present).
+$env.config.color_config.shape_match_pattern
+
+# shape_block: The curly-braces around a block. Expressions within the block will have their
+# their own shapes' styles applied.
+$env.config.color_config.shape_block
+
+# shape_signature: The parameter definitions and input/output types for a command signature.
+$env.config.color_config.shape_signature
+
+# shape_keyword: Not current used
+$env.config.color_config.shape_keyword
+
+# shape_closure: Styles the brackets and arguments of a closure.
+$env.config.color_config.shape_closure
+
+# shape_direction: The redirection symbols such as `o>`, `error>`, `e>|`, etc.
+$env.config.color_config.shape_redirection
+
+# shape_flag: Flags and switches to internal and custom-commands. Only the `--flag` (`-f`) portion
+# is styled. The argument to a flag will be styled using its own shape.
+$env.config.color_config.shape_flag
+
+# -------------------------------------------------------------------------------------------------
+# color.config.<type>
+# *Values* of a particular *type* can be styled differently than the *shape*.
+# Note that the style is applied only when this type is displayed in *structured* data (list,
+# record, or table). It is not currently applied to basic raw values.
+#
+# Note that some types are rarely or never seen in a context in which styling would be applied.
+# For example, a cell-path *value* is unlikely to (but can) appear in a list, record, or table.
+#
+# Tip: In addition to the styles above (fg, bg, attr), types typically accept a closure which can
+# dynamically change the style based on the *value*. For instance, the themes in the nu_scripts
+# repository will style filesizes difference in an `ls` (or other table) differently depending on
+# their magnitude.
+
+# Simple examples:
+
+# bool: A boolean value
+$env.config.color_config.bool = {||
+  if $in {
+    {
+      bg: 'light_green'
+      fg: 'white'
+      attr: 'b'
+    }
+  } else {
+    {
+      bg: 'yellow'
+      fg: 'black'
+      attr: 'b'
+    }
+  }
+}
+
+# int: An integer value
+$env.config.color_config.int = {||
+  if $in == 42 { 'green' } else { 'red' }
+}
+
+# Additional type values (without examples):
+$env.config.color_config.string      # String
+$env.config.color_config.float       # Float value
+$env.config.color_config.glob        # Glob value (must be declared)
+$env.config.color_config.binary      # Binary value
+$env.config.color_config.custom      # Custom value (often from a plugin)
+$env.config.color_config.nothing     # Not used, since a null is not displayed
+$env.config.color_config.date        # datetime value
+$env.config.color_config.filesize    # filesize value
+$env.config.color_config.list        # Not currently used. Lists are displayed using their 
+                                     # members' styles
+$env.config.color_config.record      # Not currently used. Records are displayed using their
+                                     # member's styles
+$env.config.color_config.duration    # Duration type
+$env.config.color_config.range       # Range value
+$env.config.color_config.cell-path   # Cell-path value
+$env.config.color_config.closure     # Not currently used
+$env.config.color_config.block       # Not currently used
+
+# Additional UI elements
+# hints: The (usually dimmed) style in which completion hints are displayed
+$env.config.color_config.hints
+
+# search_result: The style applied to `find` search results
+$env.config.color_config.search_result
+
+# header: The column names in a table header
+$env.config.color_config.header
+
+# separator: Used for table/list/record borders
+$env.config.color_config.separator
+
+# row_index: The `#` or `index` column of a table or list
+$env.config.color_config.row_index
+
+# empty: This style is applied to empty/missing values in a table. However, since the ❎
+# emoji is used for this purpose, there is limited styling that can be applied.
+$env.config.color_config.empty
+
+# leading_trailing_space_bg: When a string value inside structured data has leading or trailing
+# whitespace, that whitespace will be displayed using this style.
+# Use { attr: n } to disable.
+$env.config.color_config.leading_trailing_space_bg = { bg: 'red' }
+
+# ------------------------
+# `explore` command colors
+# ------------------------
+# Configure the UI colors of the `explore` command
+# Allowed values are the same as for the `color_config` options above.
+# Example:
+$env.config.explore = {
+    status_bar_background: { fg: "#1D1F21", bg: "#C4C9C6" },
+    command_bar_text: { fg: "#C4C9C6" },
+    highlight: { fg: "black", bg: "yellow" },
+    status: {
+        error: { fg: "white", bg: "red" },
+        warn: {}
+        info: {}
+    },
+    selected_cell: { bg: light_blue },
+}
diff --git a/crates/nu-utils/src/default_files/sample_env.nu b/crates/nu-utils/src/default_files/sample_env.nu
new file mode 100644
index 0000000000..84926abb2f
--- /dev/null
+++ b/crates/nu-utils/src/default_files/sample_env.nu
@@ -0,0 +1,135 @@
+# Sample Nushell Environment Config File
+#
+# Environment variables are usually configured in `env.nu`. Nushell
+# sets sensible defaults for many environment variables, so the user's
+# `env.nu` only needs to override these defaults if desired.
+#
+# This file serves as simple "in-shell" documentation for these
+# settings, or you can view a more complete discussion online at:
+# https://nushell.sh/book/configuration
+#
+# You can pretty-print and page this file using:
+# config env --sample | nu-highlight | less -R
+
+# PROMPT_*
+# --------
+# Prompt configuration
+# PROMPT_ variables accept either a string or a closure that returns a string
+
+# PROMPT_COMMAND
+# --------------
+# Defines the primary prompt. Note that the PROMPT_INDICATOR (below) is appended to this value.
+# Simple example - Static string:
+$env.PROMPT_COMMAND = "Nushell"
+# Simple example - Dynamic closure displaying the path:
+$env.PROMPT_COMMAND = {|| pwd}
+
+# PROMPT_INDICATOR*
+# -----------------
+# The prompt indicators are environmental variables that represent
+# the state of the prompt. The specified character(s) will appear
+# immediately following the PROMPT_COMMAND
+
+# When in Emacs mode (default):
+$env.PROMPT_INDICATOR = "> "
+
+# When in normal vi mode:
+$env.PROMPT_INDICATOR_VI_NORMAL = "> "
+# When in vi insert-mode:
+$env.PROMPT_INDICATOR_VI_INSERT = ": "
+
+# When a commandline extends across multiple lines:
+$env.PROMPT_MULTILINE_INDICATOR = "::: "
+
+# TRANSIENT_PROMPT_* 
+# ------------------
+# Allows a different prompt to be shown after a command has been executed.  This
+# can be useful if you have a 2-line prompt. Instead of each previously-entered
+# command taking up at least 2 lines, the transient prompt can condense it to a
+# shorter version. The following example shows a rocket emoji before each
+# previously-entered command:
+$env.TRANSIENT_PROMPT_COMMAND = "🚀 "
+$env.TRANSIENT_PROMPT_INDICATOR = ""
+$env.TRANSIENT_PROMPT_INDICATOR_VI_INSERT = ""
+$env.TRANSIENT_PROMPT_INDICATOR_VI_NORMAL = ""
+# Tip: Removing the transient multiline indicator and right-prompt can simplify
+#      copying from the terminal
+$env.TRANSIENT_PROMPT_MULTILINE_INDICATOR = ""
+$env.TRANSIENT_PROMPT_COMMAND_RIGHT = ""
+
+# ENV_CONVERSIONS
+# ---------------
+# Certain variables, such as those containing multiple paths, are often stored as a
+# colon-separated string in other shells. Nushell can convert these automatically to a
+# more convenient Nushell list.  The ENV_CONVERSIONS variable specifies how environment
+# variables are:
+# - converted from a string to a value on Nushell startup (from_string)
+# - converted from a value back to a string when running external commands (to_string)
+#
+# Note: The OS Path variable is automatically converted before env.nu loads, so it can
+# be treated a list in this file.
+# 
+# Note: Environment variables are not case-sensitive, so the following will work
+# for both Windows and Unix-like platforms.
+# 
+# By default, the internal conversion looks something like the following, so there
+# is no need to add this in your actual env.nu:
+$env.ENV_CONVERSIONS = {
+    "Path": {
+        from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
+        to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
+    }
+}
+
+# Here's an example converts the XDG_DATA_DIRS variable to and from a list:
+$env.ENV_CONVERSIONS = $env.ENV_CONVERSIONS | merge {
+    "XDG_DATA_DIRS": {
+        from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
+        to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
+    }
+}
+#
+# Other common directory-lists for conversion: TERMINFO_DIRS.
+# Note that other variable conversions take place after `config.nu` is loaded.
+
+# NU_LIB_DIRS
+# -----------
+# Directories in this environment variable are searched by the
+# `use` and `source` commands.
+#
+# By default, the `scripts` subdirectory of the default configuration
+# directory is included:
+$env.NU_LIB_DIRS = [
+    ($nu.default-config-dir | path join 'scripts') # add <nushell-config-dir>/scripts
+    ($nu.data-dir | path join 'completions') # default home for nushell completions
+]
+# You can replace (override) or append to this list:
+$env.NU_LIB_DIRS ++= ($nu.default-config-dir | path join 'modules')
+
+# NU_PLUGIN_DIRS
+# --------------
+# Directories to search for plugin binaries when calling register.
+
+# By default, the `plugins` subdirectory of the default configuration
+# directory is included:
+$env.NU_PLUGIN_DIRS = [
+    ($nu.default-config-dir | path join 'plugins') # add <nushell-config-dir>/plugins
+]
+
+# Appending to the OS path is a common configuration task.
+# Because of the previous ENV_CONVERSIONS (performed internally
+# before your env.nu loads), the path variable is a list that can 
+# be appended to using, for example:
+$env.path ++= "~/.local/bin"
+
+# Or prepend using
+$env.path = "~/.local/bin" ++ $env.path
+
+# The `path add` function from the Standard Library also provides
+# a convenience method for prepending to the path:
+use std/util "path add"
+path add "~/.local/bin"
+path add ($env.CARGO_HOME | path join "bin")
+
+# You can remove duplicate directories from the path using:
+$env.PATH = ($env.PATH | uniq)
diff --git a/crates/nu-utils/src/sample_config/sample_login.nu b/crates/nu-utils/src/default_files/sample_login.nu
similarity index 100%
rename from crates/nu-utils/src/sample_config/sample_login.nu
rename to crates/nu-utils/src/default_files/sample_login.nu
diff --git a/crates/nu-utils/src/default_files/scaffold_config.nu b/crates/nu-utils/src/default_files/scaffold_config.nu
new file mode 100644
index 0000000000..7bf7ecc632
--- /dev/null
+++ b/crates/nu-utils/src/default_files/scaffold_config.nu
@@ -0,0 +1,19 @@
+# config.nu
+#
+# This file is used to override default Nushell settings, define
+# (or import) custom commands, or run any other startup tasks.
+# See https://www.nushell.sh/book/configuration.html
+#
+# This file is loaded after env.nu and before login.nu
+# 
+# You can open this file in your default editor using:
+# config nu
+#
+# To pretty-print a sample config.nu with documentation, run:
+# config nu --sample | nu-highlight | less -R
+#
+# To pretty-print the default configuration values, run:
+# config nu --default | nu-highlight | less -R
+#
+# You can remove these comments if you want or leave
+# them for future reference.
diff --git a/crates/nu-utils/src/default_files/scaffold_env.nu b/crates/nu-utils/src/default_files/scaffold_env.nu
new file mode 100644
index 0000000000..a3ce3cab07
--- /dev/null
+++ b/crates/nu-utils/src/default_files/scaffold_env.nu
@@ -0,0 +1,18 @@
+# env.nu
+#
+# This file is typically used to add or override environment variables.
+# See https://www.nushell.sh/book/configuration.html
+#
+# This file is loaded before config.nu and login.nu
+#
+# You can open this file in your default editor using:
+# config env
+#
+# To pretty-print a sample env.nu with documentation, run:
+# config env --sample | nu-highlight | less -R
+#
+# To pretty-print the default environment values, run:
+# config env --default | nu-highlight | less -R
+#
+# You can remove these comments if you want or leave
+# them for future reference.
diff --git a/crates/nu-utils/src/lib.rs b/crates/nu-utils/src/lib.rs
index 4b91d923db..413b5f8893 100644
--- a/crates/nu-utils/src/lib.rs
+++ b/crates/nu-utils/src/lib.rs
@@ -10,8 +10,9 @@ pub mod utils;
 
 pub use locale::get_system_locale;
 pub use utils::{
-    enable_vt_processing, get_default_config, get_default_env, get_ls_colors,
-    stderr_write_all_and_flush, stdout_write_all_and_flush,
+    enable_vt_processing, get_default_config, get_default_env, get_ls_colors, get_sample_config,
+    get_sample_env, get_scaffold_config, get_scaffold_env, stderr_write_all_and_flush,
+    stdout_write_all_and_flush,
 };
 
 pub use casing::IgnoreCaseExt;
diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu
deleted file mode 100644
index c8b398b684..0000000000
--- a/crates/nu-utils/src/sample_config/default_config.nu
+++ /dev/null
@@ -1,899 +0,0 @@
-# Nushell Config File
-#
-# version = "0.100.1"
-
-# For more information on defining custom themes, see
-# https://www.nushell.sh/book/coloring_and_theming.html
-# And here is the theme collection
-# https://github.com/nushell/nu_scripts/tree/main/themes
-let dark_theme = {
-    # color for nushell primitives
-    separator: white
-    leading_trailing_space_bg: { attr: n } # no fg, no bg, attr none effectively turns this off
-    header: green_bold
-    empty: blue
-    # Closures can be used to choose colors for specific values.
-    # The value (in this case, a bool) is piped into the closure.
-    # eg) {|| if $in { 'light_cyan' } else { 'light_gray' } }
-    bool: light_cyan
-    int: white
-    filesize: cyan
-    duration: white
-    date: purple
-    range: white
-    float: white
-    string: white
-    nothing: white
-    binary: white
-    cell-path: white
-    row_index: green_bold
-    record: white
-    list: white
-    block: white
-    hints: dark_gray
-    search_result: { bg: red fg: white }
-    shape_and: purple_bold
-    shape_binary: purple_bold
-    shape_block: blue_bold
-    shape_bool: light_cyan
-    shape_closure: green_bold
-    shape_custom: green
-    shape_datetime: cyan_bold
-    shape_directory: cyan
-    shape_external: cyan
-    shape_externalarg: green_bold
-    shape_external_resolved: light_yellow_bold
-    shape_filepath: cyan
-    shape_flag: blue_bold
-    shape_float: purple_bold
-    # shapes are used to change the cli syntax highlighting
-    shape_garbage: { fg: white bg: red attr: b }
-    shape_glob_interpolation: cyan_bold
-    shape_globpattern: cyan_bold
-    shape_int: purple_bold
-    shape_internalcall: cyan_bold
-    shape_keyword: cyan_bold
-    shape_list: cyan_bold
-    shape_literal: blue
-    shape_match_pattern: green
-    shape_matching_brackets: { attr: u }
-    shape_nothing: light_cyan
-    shape_operator: yellow
-    shape_or: purple_bold
-    shape_pipe: purple_bold
-    shape_range: yellow_bold
-    shape_record: cyan_bold
-    shape_redirection: purple_bold
-    shape_signature: green_bold
-    shape_string: green
-    shape_string_interpolation: cyan_bold
-    shape_table: blue_bold
-    shape_variable: purple
-    shape_vardecl: purple
-    shape_raw_string: light_purple
-}
-
-let light_theme = {
-    # color for nushell primitives
-    separator: dark_gray
-    leading_trailing_space_bg: { attr: n } # no fg, no bg, attr none effectively turns this off
-    header: green_bold
-    empty: blue
-    # Closures can be used to choose colors for specific values.
-    # The value (in this case, a bool) is piped into the closure.
-    # eg) {|| if $in { 'dark_cyan' } else { 'dark_gray' } }
-    bool: dark_cyan
-    int: dark_gray
-    filesize: cyan_bold
-    duration: dark_gray
-    date: purple
-    range: dark_gray
-    float: dark_gray
-    string: dark_gray
-    nothing: dark_gray
-    binary: dark_gray
-    cell-path: dark_gray
-    row_index: green_bold
-    record: dark_gray
-    list: dark_gray
-    block: dark_gray
-    hints: dark_gray
-    search_result: { fg: white bg: red }
-    shape_and: purple_bold
-    shape_binary: purple_bold
-    shape_block: blue_bold
-    shape_bool: light_cyan
-    shape_closure: green_bold
-    shape_custom: green
-    shape_datetime: cyan_bold
-    shape_directory: cyan
-    shape_external: cyan
-    shape_externalarg: green_bold
-    shape_external_resolved: light_purple_bold
-    shape_filepath: cyan
-    shape_flag: blue_bold
-    shape_float: purple_bold
-    # shapes are used to change the cli syntax highlighting
-    shape_garbage: { fg: white bg: red attr: b }
-    shape_glob_interpolation: cyan_bold
-    shape_globpattern: cyan_bold
-    shape_int: purple_bold
-    shape_internalcall: cyan_bold
-    shape_keyword: cyan_bold
-    shape_list: cyan_bold
-    shape_literal: blue
-    shape_match_pattern: green
-    shape_matching_brackets: { attr: u }
-    shape_nothing: light_cyan
-    shape_operator: yellow
-    shape_or: purple_bold
-    shape_pipe: purple_bold
-    shape_range: yellow_bold
-    shape_record: cyan_bold
-    shape_redirection: purple_bold
-    shape_signature: green_bold
-    shape_string: green
-    shape_string_interpolation: cyan_bold
-    shape_table: blue_bold
-    shape_variable: purple
-    shape_vardecl: purple
-    shape_raw_string: light_purple
-}
-
-# External completer example
-# let carapace_completer = {|spans|
-#     carapace $spans.0 nushell ...$spans | from json
-# }
-
-# The default config record. This is where much of your global configuration is setup.
-$env.config = {
-    show_banner: true # true or false to enable or disable the welcome banner at startup
-
-    ls: {
-        use_ls_colors: true # use the LS_COLORS environment variable to colorize output
-        clickable_links: true # enable or disable clickable links. Your terminal has to support links.
-    }
-
-    rm: {
-        always_trash: false # always act as if -t was given. Can be overridden with -p
-    }
-
-    table: {
-        mode: rounded # basic, compact, compact_double, light, thin, with_love, rounded, reinforced, heavy, none, other
-        index_mode: always # "always" show indexes, "never" show indexes, "auto" = show indexes when a table has "index" column
-        show_empty: true # show 'empty list' and 'empty record' placeholders for command output
-        padding: { left: 1, right: 1 } # a left right padding of each column in a table
-        trim: {
-            methodology: wrapping # wrapping or truncating
-            wrapping_try_keep_words: true # A strategy used by the 'wrapping' methodology
-            truncating_suffix: "..." # A suffix used by the 'truncating' methodology
-        }
-        header_on_separator: false # show header text on separator/border line
-        footer_inheritance: false # render footer in parent table if child is big enough (extended table option)
-        # abbreviated_row_count: 10 # limit data rows from top and bottom after reaching a set point
-    }
-
-    error_style: "fancy" # "fancy" or "plain" for screen reader-friendly error messages
-
-    # Whether an error message should be printed if an error of a certain kind is triggered.
-    display_errors: {
-        exit_code: false # assume the external command prints an error message
-        # Core dump errors are always printed, and SIGPIPE never triggers an error.
-        # The setting below controls message printing for termination by all other signals.
-        termination_signal: true
-    }
-
-    # datetime_format determines what a datetime rendered in the shell would look like.
-    # Behavior without this configuration point will be to "humanize" the datetime display,
-    # showing something like "a day ago."
-    datetime_format: {
-        # normal: '%a, %d %b %Y %H:%M:%S %z'    # shows up in displays of variables or other datetime's outside of tables
-        # table: '%m/%d/%y %I:%M:%S%p'          # generally shows up in tabular outputs such as ls. commenting this out will change it to the default human readable datetime format
-    }
-
-    explore: {
-        status_bar_background: { fg: "#1D1F21", bg: "#C4C9C6" },
-        command_bar_text: { fg: "#C4C9C6" },
-        highlight: { fg: "black", bg: "yellow" },
-        status: {
-            error: { fg: "white", bg: "red" },
-            warn: {}
-            info: {}
-        },
-        selected_cell: { bg: light_blue },
-    }
-
-    history: {
-        max_size: 100_000 # Session has to be reloaded for this to take effect
-        sync_on_enter: true # Enable to share history between multiple sessions, else you have to close the session to write history to file
-        file_format: "plaintext" # "sqlite" or "plaintext"
-        isolation: false # only available with sqlite file_format. true enables history isolation, false disables it. true will allow the history to be isolated to the current session using up/down arrows. false will allow the history to be shared across all sessions.
-    }
-
-    completions: {
-        case_sensitive: false # set to true to enable case-sensitive completions
-        quick: true    # set this to false to prevent auto-selecting completions when only one remains
-        partial: true    # set this to false to prevent partial filling of the prompt
-        algorithm: "prefix"    # prefix or fuzzy
-        sort: "smart" # "smart" (alphabetical for prefix matching, fuzzy score for fuzzy matching) or "alphabetical"
-        external: {
-            enable: true # set to false to prevent nushell looking into $env.PATH to find more suggestions, `false` recommended for WSL users as this look up may be very slow
-            max_results: 100 # setting it lower can improve completion performance at the cost of omitting some options
-            completer: null # check 'carapace_completer' above as an example
-        }
-        use_ls_colors: true # set this to true to enable file/path/directory completions using LS_COLORS
-    }
-
-    filesize: {
-        metric: false # true => KB, MB, GB (ISO standard), false => KiB, MiB, GiB (Windows standard)
-        format: "auto" # b, kb, kib, mb, mib, gb, gib, tb, tib, pb, pib, eb, eib, auto
-    }
-
-    cursor_shape: {
-        emacs: line # block, underscore, line, blink_block, blink_underscore, blink_line, inherit to skip setting cursor shape (line is the default)
-        vi_insert: block # block, underscore, line, blink_block, blink_underscore, blink_line, inherit to skip setting cursor shape (block is the default)
-        vi_normal: underscore # block, underscore, line, blink_block, blink_underscore, blink_line, inherit to skip setting cursor shape (underscore is the default)
-    }
-
-    color_config: $dark_theme # if you want a more interesting theme, you can replace the empty record with `$dark_theme`, `$light_theme` or another custom record
-    footer_mode: 25 # always, never, number_of_rows, auto
-    float_precision: 2 # the precision for displaying floats in tables
-    buffer_editor: null # command that will be used to edit the current line buffer with ctrl+o, if unset fallback to $env.VISUAL and $env.EDITOR
-    use_ansi_coloring: true
-    bracketed_paste: true # enable bracketed paste, currently useless on windows
-    edit_mode: emacs # emacs, vi
-    shell_integration: {
-        # osc2 abbreviates the path if in the home_dir, sets the tab/window title, shows the running command in the tab/window title
-        osc2: true
-        # osc7 is a way to communicate the path to the terminal, this is helpful for spawning new tabs in the same directory
-        osc7: true
-        # osc8 is also implemented as the deprecated setting ls.show_clickable_links, it shows clickable links in ls output if your terminal supports it. show_clickable_links is deprecated in favor of osc8
-        osc8: true
-        # osc9_9 is from ConEmu and is starting to get wider support. It's similar to osc7 in that it communicates the path to the terminal
-        osc9_9: false
-        # osc133 is several escapes invented by Final Term which include the supported ones below.
-        # 133;A - Mark prompt start
-        # 133;B - Mark prompt end
-        # 133;C - Mark pre-execution
-        # 133;D;exit - Mark execution finished with exit code
-        # This is used to enable terminals to know where the prompt is, the command is, where the command finishes, and where the output of the command is
-        osc133: true
-        # osc633 is closely related to osc133 but only exists in visual studio code (vscode) and supports their shell integration features
-        # 633;A - Mark prompt start
-        # 633;B - Mark prompt end
-        # 633;C - Mark pre-execution
-        # 633;D;exit - Mark execution finished with exit code
-        # 633;E - Explicitly set the command line with an optional nonce
-        # 633;P;Cwd=<path> - Mark the current working directory and communicate it to the terminal
-        # and also helps with the run recent menu in vscode
-        osc633: true
-        # reset_application_mode is escape \x1b[?1l and was added to help ssh work better
-        reset_application_mode: true
-    }
-    render_right_prompt_on_last_line: false # true or false to enable or disable right prompt to be rendered on last line of the prompt.
-    use_kitty_protocol: false # enables keyboard enhancement protocol implemented by kitty console, only if your terminal support this.
-    highlight_resolved_externals: false # true enables highlighting of external commands in the repl resolved by which.
-    recursion_limit: 50 # the maximum number of times nushell allows recursion before stopping it
-
-    plugins: {} # Per-plugin configuration. See https://www.nushell.sh/contributor-book/plugins.html#configuration.
-
-    plugin_gc: {
-        # Configuration for plugin garbage collection
-        default: {
-            enabled: true # true to enable stopping of inactive plugins
-            stop_after: 10sec # how long to wait after a plugin is inactive to stop it
-        }
-        plugins: {
-            # alternate configuration for specific plugins, by name, for example:
-            #
-            # gstat: {
-            #     enabled: false
-            # }
-        }
-    }
-
-    hooks: {
-        pre_prompt: [{ null }] # run before the prompt is shown
-        pre_execution: [{ null }] # run before the repl input is run
-        env_change: {
-            PWD: [{|before, after| null }] # run if the PWD environment is different since the last repl input
-        }
-        display_output: "if (term size).columns >= 100 { table -e } else { table }" # run to display the output of a pipeline
-        command_not_found: { null } # return an error message when a command is not found
-    }
-
-    menus: [
-        # Configuration for default nushell menus
-        # Note the lack of source parameter
-        {
-            name: completion_menu
-            only_buffer_difference: false
-            marker: "| "
-            type: {
-                layout: columnar
-                columns: 4
-                col_width: 20     # Optional value. If missing all the screen width is used to calculate column width
-                col_padding: 2
-            }
-            style: {
-                text: green
-                selected_text: { attr: r }
-                description_text: yellow
-                match_text: { attr: u }
-                selected_match_text: { attr: ur }
-            }
-        }
-        {
-            name: ide_completion_menu
-            only_buffer_difference: false
-            marker: "| "
-            type: {
-                layout: ide
-                min_completion_width: 0,
-                max_completion_width: 50,
-                max_completion_height: 10, # will be limited by the available lines in the terminal
-                padding: 0,
-                border: true,
-                cursor_offset: 0,
-                description_mode: "prefer_right"
-                min_description_width: 0
-                max_description_width: 50
-                max_description_height: 10
-                description_offset: 1
-                # If true, the cursor pos will be corrected, so the suggestions match up with the typed text
-                #
-                # C:\> str
-                #      str join
-                #      str trim
-                #      str split
-                correct_cursor_pos: false
-            }
-            style: {
-                text: green
-                selected_text: { attr: r }
-                description_text: yellow
-                match_text: { attr: u }
-                selected_match_text: { attr: ur }
-            }
-        }
-        {
-            name: history_menu
-            only_buffer_difference: true
-            marker: "? "
-            type: {
-                layout: list
-                page_size: 10
-            }
-            style: {
-                text: green
-                selected_text: green_reverse
-                description_text: yellow
-            }
-        }
-        {
-            name: help_menu
-            only_buffer_difference: true
-            marker: "? "
-            type: {
-                layout: description
-                columns: 4
-                col_width: 20     # Optional value. If missing all the screen width is used to calculate column width
-                col_padding: 2
-                selection_rows: 4
-                description_rows: 10
-            }
-            style: {
-                text: green
-                selected_text: green_reverse
-                description_text: yellow
-            }
-        }
-    ]
-
-    keybindings: [
-        {
-            name: completion_menu
-            modifier: none
-            keycode: tab
-            mode: [emacs vi_normal vi_insert]
-            event: {
-                until: [
-                    { send: menu name: completion_menu }
-                    { send: menunext }
-                    { edit: complete }
-                ]
-            }
-        }
-        {
-            name: completion_previous_menu
-            modifier: shift
-            keycode: backtab
-            mode: [emacs, vi_normal, vi_insert]
-            event: { send: menuprevious }
-        }
-        {
-            name: ide_completion_menu
-            modifier: control
-            keycode: space
-            mode: [emacs vi_normal vi_insert]
-            event: {
-                until: [
-                    { send: menu name: ide_completion_menu }
-                    { send: menunext }
-                    { edit: complete }
-                ]
-            }
-        }
-        {
-            name: history_menu
-            modifier: control
-            keycode: char_r
-            mode: [emacs, vi_insert, vi_normal]
-            event: { send: menu name: history_menu }
-        }
-        {
-            name: help_menu
-            modifier: none
-            keycode: f1
-            mode: [emacs, vi_insert, vi_normal]
-            event: { send: menu name: help_menu }
-        }
-        {
-            name: next_page_menu
-            modifier: control
-            keycode: char_x
-            mode: emacs
-            event: { send: menupagenext }
-        }
-        {
-            name: undo_or_previous_page_menu
-            modifier: control
-            keycode: char_z
-            mode: emacs
-            event: {
-                until: [
-                    { send: menupageprevious }
-                    { edit: undo }
-                ]
-            }
-        }
-        {
-            name: escape
-            modifier: none
-            keycode: escape
-            mode: [emacs, vi_normal, vi_insert]
-            event: { send: esc }    # NOTE: does not appear to work
-        }
-        {
-            name: cancel_command
-            modifier: control
-            keycode: char_c
-            mode: [emacs, vi_normal, vi_insert]
-            event: { send: ctrlc }
-        }
-        {
-            name: quit_shell
-            modifier: control
-            keycode: char_d
-            mode: [emacs, vi_normal, vi_insert]
-            event: { send: ctrld }
-        }
-        {
-            name: clear_screen
-            modifier: control
-            keycode: char_l
-            mode: [emacs, vi_normal, vi_insert]
-            event: { send: clearscreen }
-        }
-        {
-            name: search_history
-            modifier: control
-            keycode: char_q
-            mode: [emacs, vi_normal, vi_insert]
-            event: { send: searchhistory }
-        }
-        {
-            name: open_command_editor
-            modifier: control
-            keycode: char_o
-            mode: [emacs, vi_normal, vi_insert]
-            event: { send: openeditor }
-        }
-        {
-            name: move_up
-            modifier: none
-            keycode: up
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: menuup }
-                    { send: up }
-                ]
-            }
-        }
-        {
-            name: move_down
-            modifier: none
-            keycode: down
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: menudown }
-                    { send: down }
-                ]
-            }
-        }
-        {
-            name: move_left
-            modifier: none
-            keycode: left
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: menuleft }
-                    { send: left }
-                ]
-            }
-        }
-        {
-            name: move_right_or_take_history_hint
-            modifier: none
-            keycode: right
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: historyhintcomplete }
-                    { send: menuright }
-                    { send: right }
-                ]
-            }
-        }
-        {
-            name: move_one_word_left
-            modifier: control
-            keycode: left
-            mode: [emacs, vi_normal, vi_insert]
-            event: { edit: movewordleft }
-        }
-        {
-            name: move_one_word_right_or_take_history_hint
-            modifier: control
-            keycode: right
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: historyhintwordcomplete }
-                    { edit: movewordright }
-                ]
-            }
-        }
-        {
-            name: move_to_line_start
-            modifier: none
-            keycode: home
-            mode: [emacs, vi_normal, vi_insert]
-            event: { edit: movetolinestart }
-        }
-        {
-            name: move_to_line_start
-            modifier: control
-            keycode: char_a
-            mode: [emacs, vi_normal, vi_insert]
-            event: { edit: movetolinestart }
-        }
-        {
-            name: move_to_line_end_or_take_history_hint
-            modifier: none
-            keycode: end
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: historyhintcomplete }
-                    { edit: movetolineend }
-                ]
-            }
-        }
-        {
-            name: move_to_line_end_or_take_history_hint
-            modifier: control
-            keycode: char_e
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: historyhintcomplete }
-                    { edit: movetolineend }
-                ]
-            }
-        }
-        {
-            name: move_to_line_start
-            modifier: control
-            keycode: home
-            mode: [emacs, vi_normal, vi_insert]
-            event: { edit: movetolinestart }
-        }
-        {
-            name: move_to_line_end
-            modifier: control
-            keycode: end
-            mode: [emacs, vi_normal, vi_insert]
-            event: { edit: movetolineend }
-        }
-        {
-            name: move_down
-            modifier: control
-            keycode: char_n
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: menudown }
-                    { send: down }
-                ]
-            }
-        }
-        {
-            name: move_up
-            modifier: control
-            keycode: char_p
-            mode: [emacs, vi_normal, vi_insert]
-            event: {
-                until: [
-                    { send: menuup }
-                    { send: up }
-                ]
-            }
-        }
-        {
-            name: delete_one_character_backward
-            modifier: none
-            keycode: backspace
-            mode: [emacs, vi_insert]
-            event: { edit: backspace }
-        }
-        {
-            name: delete_one_word_backward
-            modifier: control
-            keycode: backspace
-            mode: [emacs, vi_insert]
-            event: { edit: backspaceword }
-        }
-        {
-            name: delete_one_character_forward
-            modifier: none
-            keycode: delete
-            mode: [emacs, vi_insert]
-            event: { edit: delete }
-        }
-        {
-            name: delete_one_character_forward
-            modifier: control
-            keycode: delete
-            mode: [emacs, vi_insert]
-            event: { edit: delete }
-        }
-        {
-            name: delete_one_character_backward
-            modifier: control
-            keycode: char_h
-            mode: [emacs, vi_insert]
-            event: { edit: backspace }
-        }
-        {
-            name: delete_one_word_backward
-            modifier: control
-            keycode: char_w
-            mode: [emacs, vi_insert]
-            event: { edit: backspaceword }
-        }
-        {
-            name: move_left
-            modifier: none
-            keycode: backspace
-            mode: vi_normal
-            event: { edit: moveleft }
-        }
-        {
-            name: newline_or_run_command
-            modifier: none
-            keycode: enter
-            mode: emacs
-            event: { send: enter }
-        }
-        {
-            name: move_left
-            modifier: control
-            keycode: char_b
-            mode: emacs
-            event: {
-                until: [
-                    { send: menuleft }
-                    { send: left }
-                ]
-            }
-        }
-        {
-            name: move_right_or_take_history_hint
-            modifier: control
-            keycode: char_f
-            mode: emacs
-            event: {
-                until: [
-                    { send: historyhintcomplete }
-                    { send: menuright }
-                    { send: right }
-                ]
-            }
-        }
-        {
-            name: redo_change
-            modifier: control
-            keycode: char_g
-            mode: emacs
-            event: { edit: redo }
-        }
-        {
-            name: undo_change
-            modifier: control
-            keycode: char_z
-            mode: emacs
-            event: { edit: undo }
-        }
-        {
-            name: paste_before
-            modifier: control
-            keycode: char_y
-            mode: emacs
-            event: { edit: pastecutbufferbefore }
-        }
-        {
-            name: cut_word_left
-            modifier: control
-            keycode: char_w
-            mode: emacs
-            event: { edit: cutwordleft }
-        }
-        {
-            name: cut_line_to_end
-            modifier: control
-            keycode: char_k
-            mode: emacs
-            event: { edit: cuttolineend }
-        }
-        {
-            name: cut_line_from_start
-            modifier: control
-            keycode: char_u
-            mode: emacs
-            event: { edit: cutfromstart }
-        }
-        {
-            name: swap_graphemes
-            modifier: control
-            keycode: char_t
-            mode: emacs
-            event: { edit: swapgraphemes }
-        }
-        {
-            name: move_one_word_left
-            modifier: alt
-            keycode: left
-            mode: emacs
-            event: { edit: movewordleft }
-        }
-        {
-            name: move_one_word_right_or_take_history_hint
-            modifier: alt
-            keycode: right
-            mode: emacs
-            event: {
-                until: [
-                    { send: historyhintwordcomplete }
-                    { edit: movewordright }
-                ]
-            }
-        }
-        {
-            name: move_one_word_left
-            modifier: alt
-            keycode: char_b
-            mode: emacs
-            event: { edit: movewordleft }
-        }
-        {
-            name: move_one_word_right_or_take_history_hint
-            modifier: alt
-            keycode: char_f
-            mode: emacs
-            event: {
-                until: [
-                    { send: historyhintwordcomplete }
-                    { edit: movewordright }
-                ]
-            }
-        }
-        {
-            name: delete_one_word_forward
-            modifier: alt
-            keycode: delete
-            mode: emacs
-            event: { edit: deleteword }
-        }
-        {
-            name: delete_one_word_backward
-            modifier: alt
-            keycode: backspace
-            mode: emacs
-            event: { edit: backspaceword }
-        }
-        {
-            name: delete_one_word_backward
-            modifier: alt
-            keycode: char_m
-            mode: emacs
-            event: { edit: backspaceword }
-        }
-        {
-            name: cut_word_to_right
-            modifier: alt
-            keycode: char_d
-            mode: emacs
-            event: { edit: cutwordright }
-        }
-        {
-            name: upper_case_word
-            modifier: alt
-            keycode: char_u
-            mode: emacs
-            event: { edit: uppercaseword }
-        }
-        {
-            name: lower_case_word
-            modifier: alt
-            keycode: char_l
-            mode: emacs
-            event: { edit: lowercaseword }
-        }
-        {
-            name: capitalize_char
-            modifier: alt
-            keycode: char_c
-            mode: emacs
-            event: { edit: capitalizechar }
-        }
-        # The following bindings with `*system` events require that Nushell has
-        # been compiled with the `system-clipboard` feature.
-        # If you want to use the system clipboard for visual selection or to
-        # paste directly, uncomment the respective lines and replace the version
-        # using the internal clipboard.
-        {
-            name: copy_selection
-            modifier: control_shift
-            keycode: char_c
-            mode: emacs
-            event: { edit: copyselection }
-            # event: { edit: copyselectionsystem }
-        }
-        {
-            name: cut_selection
-            modifier: control_shift
-            keycode: char_x
-            mode: emacs
-            event: { edit: cutselection }
-            # event: { edit: cutselectionsystem }
-        }
-        # {
-        #     name: paste_system
-        #     modifier: control_shift
-        #     keycode: char_v
-        #     mode: emacs
-        #     event: { edit: pastesystem }
-        # }
-        {
-            name: select_all
-            modifier: control_shift
-            keycode: char_a
-            mode: emacs
-            event: { edit: selectall }
-        }
-    ]
-}
diff --git a/crates/nu-utils/src/sample_config/default_env.nu b/crates/nu-utils/src/sample_config/default_env.nu
deleted file mode 100644
index fb527dc112..0000000000
--- a/crates/nu-utils/src/sample_config/default_env.nu
+++ /dev/null
@@ -1,101 +0,0 @@
-# Nushell Environment Config File
-#
-# version = "0.100.1"
-
-def create_left_prompt [] {
-    let dir = match (do --ignore-shell-errors { $env.PWD | path relative-to $nu.home-path }) {
-        null => $env.PWD
-        '' => '~'
-        $relative_pwd => ([~ $relative_pwd] | path join)
-    }
-
-    let path_color = (if (is-admin) { ansi red_bold } else { ansi green_bold })
-    let separator_color = (if (is-admin) { ansi light_red_bold } else { ansi light_green_bold })
-    let path_segment = $"($path_color)($dir)(ansi reset)"
-
-    $path_segment | str replace --all (char path_sep) $"($separator_color)(char path_sep)($path_color)"
-}
-
-def create_right_prompt [] {
-    # create a right prompt in magenta with green separators and am/pm underlined
-    let time_segment = ([
-        (ansi reset)
-        (ansi magenta)
-        (date now | format date '%x %X') # try to respect user's locale
-    ] | str join | str replace --regex --all "([/:])" $"(ansi green)${1}(ansi magenta)" |
-        str replace --regex --all "([AP]M)" $"(ansi magenta_underline)${1}")
-
-    let last_exit_code = if ($env.LAST_EXIT_CODE != 0) {([
-        (ansi rb)
-        ($env.LAST_EXIT_CODE)
-    ] | str join)
-    } else { "" }
-
-    ([$last_exit_code, (char space), $time_segment] | str join)
-}
-
-# Use nushell functions to define your right and left prompt
-$env.PROMPT_COMMAND = {|| create_left_prompt }
-# FIXME: This default is not implemented in rust code as of 2023-09-08.
-$env.PROMPT_COMMAND_RIGHT = {|| create_right_prompt }
-
-# The prompt indicators are environmental variables that represent
-# the state of the prompt
-$env.PROMPT_INDICATOR = {|| "> " }
-$env.PROMPT_INDICATOR_VI_INSERT = {|| ": " }
-$env.PROMPT_INDICATOR_VI_NORMAL = {|| "> " }
-$env.PROMPT_MULTILINE_INDICATOR = {|| "::: " }
-
-# If you want previously entered commands to have a different prompt from the usual one,
-# you can uncomment one or more of the following lines.
-# This can be useful if you have a 2-line prompt and it's taking up a lot of space
-# because every command entered takes up 2 lines instead of 1. You can then uncomment
-# the line below so that previously entered commands show with a single `🚀`.
-# $env.TRANSIENT_PROMPT_COMMAND = {|| "🚀 " }
-# $env.TRANSIENT_PROMPT_INDICATOR = {|| "" }
-# $env.TRANSIENT_PROMPT_INDICATOR_VI_INSERT = {|| "" }
-# $env.TRANSIENT_PROMPT_INDICATOR_VI_NORMAL = {|| "" }
-# $env.TRANSIENT_PROMPT_MULTILINE_INDICATOR = {|| "" }
-# $env.TRANSIENT_PROMPT_COMMAND_RIGHT = {|| "" }
-
-# Specifies how environment variables are:
-# - converted from a string to a value on Nushell startup (from_string)
-# - converted from a value back to a string when running external commands (to_string)
-# Note: The conversions happen *after* config.nu is loaded
-$env.ENV_CONVERSIONS = {
-    "PATH": {
-        from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
-        to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
-    }
-    "Path": {
-        from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
-        to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
-    }
-}
-
-# Directories to search for scripts when calling source or use
-# The default for this is $nu.default-config-dir/scripts
-$env.NU_LIB_DIRS = [
-    ($nu.default-config-dir | path join 'scripts') # add <nushell-config-dir>/scripts
-    ($nu.data-dir | path join 'completions') # default home for nushell completions
-]
-
-# Directories to search for plugin binaries when calling register
-# The default for this is $nu.default-config-dir/plugins
-$env.NU_PLUGIN_DIRS = [
-    ($nu.default-config-dir | path join 'plugins') # add <nushell-config-dir>/plugins
-]
-
-# To add entries to PATH (on Windows you might use Path), you can use the following pattern:
-# $env.PATH = ($env.PATH | split row (char esep) | prepend '/some/path')
-# An alternate way to add entries to $env.PATH is to use the custom command `path add`
-# which is built into the nushell stdlib:
-# use std "path add"
-# $env.PATH = ($env.PATH | split row (char esep))
-# path add /some/path
-# path add ($env.CARGO_HOME | path join "bin")
-# path add ($env.HOME | path join ".local" "bin")
-# $env.PATH = ($env.PATH | uniq)
-
-# To load from a custom file you can use:
-# source ($nu.default-config-dir | path join 'custom.nu')
diff --git a/crates/nu-utils/src/utils.rs b/crates/nu-utils/src/utils.rs
index 472afc92f7..798e542be5 100644
--- a/crates/nu-utils/src/utils.rs
+++ b/crates/nu-utils/src/utils.rs
@@ -85,12 +85,29 @@ where
     ret
 }
 
+// See default_files/README.md for a description of these files
 pub fn get_default_env() -> &'static str {
-    include_str!("sample_config/default_env.nu")
+    include_str!("default_files/default_env.nu")
+}
+
+pub fn get_scaffold_env() -> &'static str {
+    include_str!("default_files/scaffold_env.nu")
+}
+
+pub fn get_sample_env() -> &'static str {
+    include_str!("default_files/sample_env.nu")
 }
 
 pub fn get_default_config() -> &'static str {
-    include_str!("sample_config/default_config.nu")
+    include_str!("default_files/default_config.nu")
+}
+
+pub fn get_scaffold_config() -> &'static str {
+    include_str!("default_files/scaffold_config.nu")
+}
+
+pub fn get_sample_config() -> &'static str {
+    include_str!("default_files/sample_config.nu")
 }
 
 pub fn get_ls_colors(lscolors_env_string: Option<String>) -> LsColors {
diff --git a/src/config_files.rs b/src/config_files.rs
index 7631a951bc..5c43764580 100644
--- a/src/config_files.rs
+++ b/src/config_files.rs
@@ -2,12 +2,13 @@ use log::warn;
 #[cfg(feature = "plugin")]
 use nu_cli::read_plugin_file;
 use nu_cli::{eval_config_contents, eval_source};
+use nu_engine::convert_env_values;
 use nu_path::canonicalize_with;
 use nu_protocol::{
     engine::{EngineState, Stack, StateWorkingSet},
     report_parse_error, report_shell_error, Config, ParseError, PipelineData, Spanned,
 };
-use nu_utils::{get_default_config, get_default_env};
+use nu_utils::{get_default_config, get_default_env, get_scaffold_config, get_scaffold_env, perf};
 use std::{
     fs,
     fs::File,
@@ -26,12 +27,47 @@ pub(crate) fn read_config_file(
     stack: &mut Stack,
     config_file: Option<Spanned<String>>,
     is_env_config: bool,
-    ask_to_create: bool,
+    create_scaffold: bool,
 ) {
     warn!(
         "read_config_file() config_file_specified: {:?}, is_env_config: {is_env_config}",
         &config_file
     );
+
+    if is_env_config {
+        eval_default_config(engine_state, stack, get_default_env(), is_env_config);
+
+        let start_time = std::time::Instant::now();
+        let config = engine_state.get_config();
+        let use_color = config.use_ansi_coloring;
+        // Translate environment variables from Strings to Values
+        if let Err(e) = convert_env_values(engine_state, stack) {
+            report_shell_error(engine_state, &e);
+        }
+
+        perf!(
+            "translate env vars after default_env.nu",
+            start_time,
+            use_color
+        );
+    } else {
+        let start_time = std::time::Instant::now();
+        let config = engine_state.get_config();
+        let use_color = config.use_ansi_coloring;
+        if let Err(e) = convert_env_values(engine_state, stack) {
+            report_shell_error(engine_state, &e);
+        }
+        perf!(
+            "translate env vars before default_config.nu",
+            start_time,
+            use_color
+        );
+
+        eval_default_config(engine_state, stack, get_default_config(), is_env_config);
+    };
+
+    warn!("read_config_file() loading_defaults is_env_config: {is_env_config}");
+
     // Load config startup file
     if let Some(file) = config_file {
         match engine_state.cwd_as_string(Some(stack)) {
@@ -59,41 +95,16 @@ pub(crate) fn read_config_file(
         config_path.push(if is_env_config { ENV_FILE } else { CONFIG_FILE });
 
         if !config_path.exists() {
-            let file_msg = if is_env_config {
-                "environment config"
+            let scaffold_config_file = if is_env_config {
+                get_scaffold_env()
             } else {
-                "config"
+                get_scaffold_config()
             };
 
-            let will_create_file = match ask_to_create {
-                true => {
-                    println!(
-                        "No {} file found at {}",
-                        file_msg,
-                        config_path.to_string_lossy()
-                    );
-                    println!("Would you like to create one with defaults (Y/n): ");
-
-                    let mut answer = String::new();
-                    std::io::stdin()
-                        .read_line(&mut answer)
-                        .expect("Failed to read user input");
-
-                    matches!(answer.trim(), "y" | "Y" | "")
-                }
-                _ => false,
-            };
-
-            let config_file = if is_env_config {
-                get_default_env()
-            } else {
-                get_default_config()
-            };
-
-            match will_create_file {
+            match create_scaffold {
                 true => {
                     if let Ok(mut output) = File::create(&config_path) {
-                        if write!(output, "{config_file}").is_ok() {
+                        if write!(output, "{scaffold_config_file}").is_ok() {
                             let config_type = if is_env_config {
                                 "Environment config"
                             } else {
@@ -109,17 +120,14 @@ pub(crate) fn read_config_file(
                                 "Unable to write to {}, sourcing default file instead",
                                 config_path.to_string_lossy(),
                             );
-                            eval_default_config(engine_state, stack, config_file, is_env_config);
                             return;
                         }
                     } else {
-                        eprintln!("Unable to create {config_file}, sourcing default file instead");
-                        eval_default_config(engine_state, stack, config_file, is_env_config);
+                        eprintln!("Unable to create {scaffold_config_file}");
                         return;
                     }
                 }
                 _ => {
-                    eval_default_config(engine_state, stack, config_file, is_env_config);
                     return;
                 }
             }
@@ -227,11 +235,7 @@ fn eval_default_config(
     config_file: &str,
     is_env_config: bool,
 ) {
-    warn!(
-        "eval_default_config() config_file_specified: {:?}, is_env_config: {}",
-        &config_file, is_env_config
-    );
-    // Just use the contents of "default_config.nu" or "default_env.nu"
+    warn!("eval_default_config() is_env_config: {}", is_env_config);
     eval_source(
         engine_state,
         stack,
@@ -264,20 +268,14 @@ pub(crate) fn setup_config(
         &config_file, &env_file, is_login_shell
     );
 
-    let ask_to_create_config = nu_path::nu_config_dir().map_or(false, |p| !p.exists());
+    let create_scaffold = nu_path::nu_config_dir().map_or(false, |p| !p.exists());
 
     let result = catch_unwind(AssertUnwindSafe(|| {
         #[cfg(feature = "plugin")]
         read_plugin_file(engine_state, plugin_file);
 
-        read_config_file(engine_state, stack, env_file, true, ask_to_create_config);
-        read_config_file(
-            engine_state,
-            stack,
-            config_file,
-            false,
-            ask_to_create_config,
-        );
+        read_config_file(engine_state, stack, env_file, true, create_scaffold);
+        read_config_file(engine_state, stack, config_file, false, create_scaffold);
 
         if is_login_shell {
             read_loginshell_file(engine_state, stack);
diff --git a/src/run.rs b/src/run.rs
index 1cbfbc03a2..89bad3866f 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -23,7 +23,7 @@ pub(crate) fn run_commands(
     trace!("run_commands");
 
     let start_time = std::time::Instant::now();
-    let ask_to_create_config = nu_path::nu_config_dir().map_or(false, |p| !p.exists());
+    let create_scaffold = nu_path::nu_config_dir().map_or(false, |p| !p.exists());
 
     let mut stack = Stack::new();
 
@@ -46,7 +46,7 @@ pub(crate) fn run_commands(
                 &mut stack,
                 parsed_nu_cli_args.env_file,
                 true,
-                ask_to_create_config,
+                create_scaffold,
             );
         } else {
             config_files::read_default_env_file(engine_state, &mut stack)
@@ -55,7 +55,7 @@ pub(crate) fn run_commands(
         perf!("read env.nu", start_time, use_color);
 
         let start_time = std::time::Instant::now();
-        let ask_to_create_config = nu_path::nu_config_dir().map_or(false, |p| !p.exists());
+        let create_scaffold = nu_path::nu_config_dir().map_or(false, |p| !p.exists());
 
         // If we have a config file parameter *OR* we have a login shell parameter, read the config file
         if parsed_nu_cli_args.config_file.is_some() || parsed_nu_cli_args.login_shell.is_some() {
@@ -64,7 +64,7 @@ pub(crate) fn run_commands(
                 &mut stack,
                 parsed_nu_cli_args.config_file,
                 false,
-                ask_to_create_config,
+                create_scaffold,
             );
         }
 
@@ -123,7 +123,7 @@ pub(crate) fn run_file(
     // if the --no-config-file(-n) flag is passed, do not load plugin, env, or config files
     if parsed_nu_cli_args.no_config_file.is_none() {
         let start_time = std::time::Instant::now();
-        let ask_to_create_config = nu_path::nu_config_dir().map_or(false, |p| !p.exists());
+        let create_scaffold = nu_path::nu_config_dir().map_or(false, |p| !p.exists());
         #[cfg(feature = "plugin")]
         read_plugin_file(engine_state, parsed_nu_cli_args.plugin_file);
         perf!("read plugins", start_time, use_color);
@@ -136,7 +136,7 @@ pub(crate) fn run_file(
                 &mut stack,
                 parsed_nu_cli_args.env_file,
                 true,
-                ask_to_create_config,
+                create_scaffold,
             );
         } else {
             config_files::read_default_env_file(engine_state, &mut stack)
@@ -150,7 +150,7 @@ pub(crate) fn run_file(
                 &mut stack,
                 parsed_nu_cli_args.config_file,
                 false,
-                ask_to_create_config,
+                create_scaffold,
             );
         }
         perf!("read config.nu", start_time, use_color);
diff --git a/tests/repl/test_config_path.rs b/tests/repl/test_config_path.rs
index c812f3404c..63488ecb6a 100644
--- a/tests/repl/test_config_path.rs
+++ b/tests/repl/test_config_path.rs
@@ -221,8 +221,8 @@ fn test_default_config_path_symlinked_config_files() {
 
 #[test]
 fn test_alternate_config_path() {
-    let config_file = "crates/nu-utils/src/sample_config/default_config.nu";
-    let env_file = "crates/nu-utils/src/sample_config/default_env.nu";
+    let config_file = "crates/nu-utils/src/default_files/scaffold_config.nu";
+    let env_file = "crates/nu-utils/src/default_files/scaffold_env.nu";
 
     let cwd = std::env::current_dir().expect("Could not get current working directory");
 

From d8c24936588659fed0f340543e2a7c6f5d35782e Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Thu, 21 Nov 2024 01:47:03 -0800
Subject: [PATCH 0702/1072] Deprecate `split-by` command (#14019)

# Description
I'm not quite sure what the point of the `split-by` command is. The only
example for the command seems to suggest it's an additional grouping
command. I.e., a record that seems to be the output of the `group-by`
command is passed to `split-by` which then adds an additional layer of
grouping based on a different column.

# User-Facing Changes
Breaking change, deprecated the command.
---
 crates/nu-command/src/filters/split_by.rs    | 10 ++++++++++
 crates/nu-protocol/src/errors/shell_error.rs | 13 +++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/crates/nu-command/src/filters/split_by.rs b/crates/nu-command/src/filters/split_by.rs
index 217918cf91..b42f0c820c 100644
--- a/crates/nu-command/src/filters/split_by.rs
+++ b/crates/nu-command/src/filters/split_by.rs
@@ -1,5 +1,6 @@
 use indexmap::IndexMap;
 use nu_engine::command_prelude::*;
+use nu_protocol::report_shell_warning;
 
 #[derive(Clone)]
 pub struct SplitBy;
@@ -27,6 +28,15 @@ impl Command for SplitBy {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
+        report_shell_warning(
+            engine_state,
+            &ShellError::Deprecated {
+                deprecated: "The `split_by` command",
+                suggestion: "Please use the `group-by` command instead.",
+                span: call.head,
+                help: None,
+            },
+        );
         split_by(engine_state, stack, call, input)
     }
 
diff --git a/crates/nu-protocol/src/errors/shell_error.rs b/crates/nu-protocol/src/errors/shell_error.rs
index 96678daef5..b4b6c29cee 100644
--- a/crates/nu-protocol/src/errors/shell_error.rs
+++ b/crates/nu-protocol/src/errors/shell_error.rs
@@ -1330,14 +1330,15 @@ This is an internal Nushell error, please file an issue https://github.com/nushe
         span: Span,
     },
 
-    #[error("Deprecated: {old_command}")]
-    #[diagnostic(help("for more info see {url}"))]
+    #[error("{deprecated} is deprecated and will be removed in a future release")]
+    #[diagnostic()]
     Deprecated {
-        old_command: String,
-        new_suggestion: String,
-        #[label("`{old_command}` is deprecated and will be removed in a future release. Please {new_suggestion} instead.")]
+        deprecated: &'static str,
+        suggestion: &'static str,
+        #[label("{deprecated} is deprecated. {suggestion}")]
         span: Span,
-        url: String,
+        #[help]
+        help: Option<&'static str>,
     },
 
     /// Invalid glob pattern

From e63976df7e021693f34bcb299575beeeced6e66f Mon Sep 17 00:00:00 2001
From: Marc Schreiber <info@schrieveslaach.de>
Date: Thu, 21 Nov 2024 13:31:14 +0100
Subject: [PATCH 0703/1072] Bump Calamine (#14403)

This commit upgrades calamine in order to benefit from recent
developments, e.g. ignore annotations in column headers (see
https://github.com/tafia/calamine/pull/467 for reference).
---
 Cargo.lock                                    |  62 ++++++++++++++++--
 Cargo.toml                                    |   2 +-
 .../tests/format_conversions/ods.rs           |  17 +++++
 .../formats/sample_data_with_annotation.ods   | Bin 0 -> 71562 bytes
 4 files changed, 74 insertions(+), 7 deletions(-)
 create mode 100644 tests/fixtures/formats/sample_data_with_annotation.ods

diff --git a/Cargo.lock b/Cargo.lock
index 7f43aaada7..d15ecdf729 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -181,6 +181,15 @@ version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
 
+[[package]]
+name = "arbitrary"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
+dependencies = [
+ "derive_arbitrary",
+]
+
 [[package]]
 name = "arboard"
 version = "3.4.1"
@@ -578,16 +587,15 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc"
 
 [[package]]
 name = "calamine"
-version = "0.24.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a3a315226fdc5b1c3e33521073e1712a05944bc0664d665ff1f6ff0396334da"
+checksum = "138646b9af2c5d7f1804ea4bf93afc597737d2bd4f7341d67c48b03316976eb1"
 dependencies = [
  "byteorder",
  "chrono",
  "codepage",
  "encoding_rs",
  "log",
- "once_cell",
  "quick-xml 0.31.0",
  "serde",
  "zip",
@@ -1183,6 +1191,17 @@ dependencies = [
  "syn 2.0.87",
 ]
 
+[[package]]
+name = "derive_arbitrary"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "derive_more"
 version = "0.99.18"
@@ -2676,6 +2695,12 @@ dependencies = [
  "scopeguard",
 ]
 
+[[package]]
+name = "lockfree-object-pool"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e"
+
 [[package]]
 name = "log"
 version = "0.4.22"
@@ -5945,6 +5970,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
 [[package]]
 name = "simd-json"
 version = "0.13.11"
@@ -7787,14 +7818,33 @@ dependencies = [
 
 [[package]]
 name = "zip"
-version = "0.6.6"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
+checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494"
 dependencies = [
- "byteorder",
+ "arbitrary",
  "crc32fast",
  "crossbeam-utils",
+ "displaydoc",
  "flate2",
+ "indexmap",
+ "memchr",
+ "thiserror 1.0.69",
+ "zopfli",
+]
+
+[[package]]
+name = "zopfli"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946"
+dependencies = [
+ "bumpalo",
+ "crc32fast",
+ "lockfree-object-pool",
+ "log",
+ "once_cell",
+ "simd-adler32",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index b9be5c59f3..cf836ea6e4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -71,7 +71,7 @@ brotli = "6.0"
 byteorder = "1.5"
 bytes = "1"
 bytesize = "1.3"
-calamine = "0.24.0"
+calamine = "0.26.1"
 chardetng = "0.1.17"
 chrono = { default-features = false, version = "0.4.34" }
 chrono-humanize = "0.2.3"
diff --git a/crates/nu-command/tests/format_conversions/ods.rs b/crates/nu-command/tests/format_conversions/ods.rs
index 34e3e5208c..8a69493cc4 100644
--- a/crates/nu-command/tests/format_conversions/ods.rs
+++ b/crates/nu-command/tests/format_conversions/ods.rs
@@ -29,3 +29,20 @@ fn from_ods_file_to_table_select_sheet() {
 
     assert_eq!(actual.out, "SalesOrders");
 }
+
+#[test]
+fn from_ods_file_to_table_select_sheet_with_annotations() {
+    let actual = nu!(
+        cwd: "tests/fixtures/formats", pipeline(
+        r#"
+            open sample_data_with_annotation.ods --raw
+            | from ods --sheets ["SalesOrders"]
+            | get SalesOrders
+            | get column4
+            | get 0
+        "#
+    ));
+
+    // The Units column in the sheet SalesOrders has an annotation and should be ignored.
+    assert_eq!(actual.out, "Units");
+}
diff --git a/tests/fixtures/formats/sample_data_with_annotation.ods b/tests/fixtures/formats/sample_data_with_annotation.ods
new file mode 100644
index 0000000000000000000000000000000000000000..f4b5c723ea2bc64453917d3463bcd7d185c60460
GIT binary patch
literal 71562
zcmbUH1CSui5-19fcWh(FwryKG+Ocihwr$(C?H${;{bs-Ko*VH;oc~0;m(kT-ot>Fg
zomtgY*_m>Zz#zx~0N?-scj}I6ffnpxGynhqf6F%tz|z#x(81NlP}j!B!c<?^!PMG{
z*2&6%##-0j)SkxL#?Z>ZTHn#q(8__v-p0;Q*TCMy(9l8d|3~JxnEwly-!(yND<e~5
zN4tNd*)!1ESlc+-e2Z|T{r}I0{onZPtc~pq?d|n+?fwTR`hVg4+t~kmE(dFCi~r5_
z-`>vNLD#|Y|3e>*EUa}M4FA`g{kPWs_R&Vy%FyC}Xax7aXvEY~*VxdWR>0K3QrE`*
ze=z?yL+I-38(J8C+td0#-312+|7SRTxAcDj^1Ej5;A&xLPvc@~ae=)SwZ`)3*)3pG
zBMenRHTtM=ZiL++z6KLx5Kc761BM+M7bup;H@lb0b@_Cza*=$#BdsE_=rR;PIta0v
za@1#kgiri>Qh&x&TSZ5$7pE!JQOa3sa~O{|l@~s$edXOeO**~k?Jm(r_jp5r_sKGd
zQ4i%5zugD4TcLV@j7ArdvRzxa5|%?iql_V8TdVgOw$C<SP);)`Aw@a-k(W{*J{nZ(
zalqETVbzu{3lW*|WQ_w`kI`imH56q6PegK_dN!3g0s$}hs1)HW%QW~9R44*z-KxO>
zR3;A`_gM3Y-BWXeLMCT&-dAipHB?4hdlnWPP^4eVZk5R*Y%!ld-+G7Xv&&npZR&9{
zSzAxOwRA`rkT7ox6q;LEZ?pd-QD4ibi57~3xJGIU>ua0ZK)L}l)s|1+-{9bYXpH-Y
zGnreMPreFMw%-anTq?c`C$XD9K%1&k@{&XXM1GBvp;P6u<Dys%Z7lO+r*c9#pJ7X&
zZW1V!a?b0SW0>g>F9Ezx$zO28ia<$pm{_z*v0fspbD)Bm5n?zPeP(iu9ihdGZ73;<
zugu-%Tmu`eOkH!vXUhL(|1L*H(w+tHC{)l^hKw@P7A4YYQ0Y%R#3$J7tPH{kOtf8p
zq!YQ>WTsxw5TgA$hot~4xRsKp8TKhvy`@{|iOE*4-Aw2;-B9SG*9mVvQNXgP?l8tL
zjJRsEKXI9P71Tv{qra;&@O_mSg?O5P&q)VgOB3?3oA#Y~E(Z6}F!Kl8{K<&r9Pr?o
zv@l6o(c*FCWWut~#Ow@qq3b=P;-2G%z@jkgf_ux+BdECyI|bEdDSt!BiW@Vl+Iw*J
zVJxFj7}SP`=lRACPXr5JK>DU}%|C@a2GJ3a)N5^1Cgg%+pd{v{#0-PGD$-?a3XeUR
z2r3xFl!L50Iu+Ay{%NsTZ%6=yon?`~$T+MJLM*j@V-qLA<Q7F1Mn1se42JGW7@Pr?
zfY$*=i(BK@pi8*91fqBi%~mGa85c~J17Ahb!jIi1_#Aj?Wk=G77|Wv$(;@58>j{SJ
zBO7_&Z5B_jgi!)C6oImD!lX)-%sH&q&1S*OBboC#vTmEdiObwR+YGUg*3QEMCCg23
zp%#E}dl7lw*q))+LcNUmm>WEG@0W$I0L|YgOeV#bv&^1AD<(CeuYLXvNlYg$F|uNT
z@tS)*2CKS4l-%wYvHadnK+Zyj$BCs^*E0b|yncc$FbL8??yJDJdC+@nSxn>uFw!fb
z6aX_w3dhr6STKSBH^tT?l$S@em0%ld&6sT|3=Qduf1zh}G{<NgbRijr(2%4PzibR_
zw~&cr40s5IxWxrQq5)ew3MsF!J@?5G9X3`>QW<1#rmlnKhHWKG-)aY&uMRI!l^Y;C
z-D3Ntb)e>r5{!r(RT6`&K!rv1t>~-`f?}izos&jhy)=k%anH8hlJkVyu6~5xMQz$A
ziR#hU(~2OKviroi70=|ju2m%zxcP)9MXpm}!K4#3M9Vov@eD5sve1_32@3yCF72B1
zJD3DAHCCZWpdWEWu)nCq5dv)ho$~a(P>kuPAZ?CFGdxpTak+po4P<(n=Pw<UlM2Ar
zhdY4(gsLy}98N@*q4y0tqXeknbNW?HZf>)!(&3Cy=O7AB0%64F`{0f*%i***{7kN5
z@eoJfBSqB|^Aj|}EVgq3Em_b4zikN-j(AEuV-e5SaDS>l$L%g<azfw33Nh+jS?k}>
z4x}Gr@4A!IO9XK~4x=RL{GEvY;l|vaQ$|oKLFDXeR&R`T8pdgguXd`AX{^_e3aAM$
zN>8Z+OYiGzJlemdP$KXdX-YAz{(fQxQzZt3Fxos%5a=G@1Ir~NuXhB|@Ds1cLIKSh
zeHBGZFjvgt&J4$4Y}B={vQk0trm=iQ+D#mBvb^=xY<(57<8#aVQ{B#jUJVPNnf|Dt
zS|Nmn4^0k@$CB8xK5i@Jq3}i_AvxRwb)fF7OJEfB>v<jy;q4_4`gg+7sI-2d692{e
zY&>Z^kMwZrQHs}EwYm>F%bDZvlSF~h)rJP!iB*teBkWxmkp>bi;^9j5n$;xF9H=)^
z5sw#Kyq{a)N<x(b%+{X?Vpy2QxVh1_{V6A~#m(9#G_&=At8^puu1%Q;khO9!SHHAD
zW6|zu^5PV6$nJm1P1b=WYcTtzI=99=*wF5Lyh|d}3mQ|e?<p-Tlm+q7;PG0Wg9RPn
z?7QMHXHVX3x~}CtM2&z~tcKYus?+x+)axovb;&7C1xcBLur#OTOTYZwcku``$~Z6D
zI3-&NoO1{57Wx$36gJ?uPd`?{4<?A~#dJ<xj<7pmSofs|NUqVczdiwnd9GT>%;Gn#
z8&F<wv%9?I{W1K@^(Pt6p7a|hJ{4z`>lL$eL)NNB<pZe^S!onqTevuF#{@+neV5RN
zkHam-BYk{1R(?bun0%c@Kq7b#{f}C~qh{cwqYH0zCzj5};NKUD{;+%tJk~kBC82;E
zP*D1j`LNCrWZ%;Pck^C{jJs@a*{WI31mg4vZehM1a+Ax4PM3+Ioz=yHj;<F^#@zGT
zs-CAqKg2Se)-mweKV}<mC2=*l0-=j`DMUY!ZHb#Zk@F(9oM=-(TI}a4v|A}x5=PSa
zTI!C<{dQ~*jExl1a~F?2hOwVF;f=;&iIEF(*ry12^%h*_lfXzm20n5&g8MP|+IIVe
zp7)LCtQuF-L(Y;%_J%SrmRG3FwwJc+Zj7Ac#t(=EVCaSVOqC!G3s&zRf(uPZ(Gzla
z{DPCXt8%{2*cK(WtKEZx*QuxZ72H6pn|fYFI8skizm`k9(K@cglwz7$N1s&qv*Q~c
zdmhc#`In>&-5USA7i?S`nQobL>dWjrotvxEwkwMjHM>gXEdU!GW7oH?ZLnIN?L4Q1
z!f_FLPF3+{1mJRra!k&R*Z$o7Q;aGaV<~ThW+3^3Wv}Z|nW~tfKTuDjPbdC?ljsiP
z+*7r`eYJ+qao@J_q+ekDh+Zlck!#F?dDO#mrAn+l=`x7%Og1|^CHDEj_25ph&VaDV
z<md%`<9VNSs73hb4u68TTj-!mQ;696+hf6Yks_(e{ao*bI#BDP((DDb)(fTO2=v0}
zoq1;9Wl^bNcd5gh`2E0OywRwN+4;c5hTip}S5?p5!-mnG*Vc8P8N8{NTv>&H=*oMv
zeH;b^!&?~m3gtLbeFUh|7sV$mtIK{ClC(IRY6oE^w>-)|s3;wWO*7c)%RwyT*kS*E
zYIZ&Iiu7E9gI6;TA>fV$KW+LZ1q02p&mIqpaZfybMw{kCH(#P}o@Qs_?izllX!XDm
zC-jH7U>uP_FmQYF@Mvi86s@p;6L1H+swN4txcUbEzNK1Nj(Q`r&K1;ZeXuKQ+tZ*`
zCxg&(5Q9Kd1^(t4*8>SyfhUxhfTfdKB_39U-(!Lq6;Xh;rWp;b#t%=>fy}JTk~0iB
zR6?H;b*xE#Ps4on-<lsYtTdTkp$TMgw1sWWbBML%QS&#w;9HYj1X~MhnAUCzoux|d
zC3%-uHkeDCOF}`SK{Q{An8iVW;wU>ZDGtb<@3!}Bla6ro+_-4-at9Wl=5!&U;}Btf
z0)`C`k>$7tJKg;J@)I0R_eGLV1K6=(G52w-+?<@OZW4kKrUxkm!|XFW;Xmr8E!^tp
z(u<*H7f(_u8=?Xtnx`!9#?q&ztkg6!H-$9;6@Dd9jkyn-#n_v<6gkr8USjntP%ixD
zMd8JcFaJWriXeV`U8y&g&3w$k992JAW<Yrow!d0+%`1w;oY%uGW6~!-=EP>SD7DrQ
zUa_d)rdGGCAgnrEu$ck3MLDc#ks0QG<9by7;F<L4H^K=XwMG_w&*Dn{XyQo#o_ZC1
zp+&7Ph@$BJ`ctc^KQt60R-1(UP7>LK{DoihN)F;spd4xt?ye9scWI&Pp2h7C@2K0j
z?X9UI-ixsGRnyRu6L?lNu%%$4=)iLD#vq{VK3s|v0%dx3P$z>o{L?+88+FgSuZ9)<
z=uSDKdD08|N28-Rv~n8EZ_^u$3Z`GS-`lB-9zS%|WY$IdPqEuHOY(|HT1IcTa7cpc
zhh&Qv+MyQ|)@SF{VJStgC_kpEO|I2|3~$*H1m)iz@(`}!6E7Z6FNBj=!|M*5hg;g3
zU$}CTKftp9G-TMJ0RXy{0092=8ULHZ@l60=scU6wWN7a|V`pGA89!;|PX`}x#T95c
zwaiBg3Tj6-)@qjB!yKdvN_(4zxY-pIuPk3scAEWXuS$e*E2<&=LKk}^yso78*S8&r
z$HYt;PbfLsX<7@{I98XNC~?zpZp{1(vnkq~tti;FlLDz(p)IEC^T=G%?zm(-2znRT
zY{j658lu1<entwIKJ0s7vQO<o7^%oRoaMy0KH+hPZ*Y|6)IsVtDRc%m;l=v$MM6l8
z1vvO)x5-EjGA7;0v-jp+><;U6&im(a>0DDrO)qbTKo=coZFkmOYWQz?B$~Kg>bp74
z58iAMCg@}^T*{udbGm*VebP*SVeD2nI0;$sP30TE#vC==;wp(&|5abZlgS(?AOL_r
z@c&XD)VKQdt*spX`u2YvHq8~gJ+>sz>}s7B!dLNv7TQY*X9L5<xs60M3`3Rs4y7I<
zB6=xA3&dLm**oex(>r2dpYW1E2E5QeLlfX@Ahj9*M>H)h0NrnI=GfxXbmM{v9xb!T
z4<de{(SCHPUM(*lJEAL{FK-*(p1~yXGr`S(w@36+HRt&t@mq-GnfuMAVD`5lbmazF
z#LeLQx?br%=!ebA-NNKjWp&MGhE{6r!fn|{V4pUO{cN2$(b`&C321`+D-Q41Ybjmv
z^d5tI6i-Z0ekO`mno5y34%h(D`$zCy?}ZdM9Q`*#h-pWz`j1UhX~EP==6heCx8t3>
z{`4{ZM8kMDJ9)pZy-GRmKn!g+<Fs+ns>>$;!_>`5*bSbgz#679-_%m{Hc!axSV{d@
zCe_mpEt4Vvvl=66IX?xo>TtEaN^jAwcP%SH^z*p`<TkLW<@QTNhOyD6!?SLh?$bnX
zK@b{-$pKIG8&;3U7nQZ^;QK4GPRXRQR((ac7LhW2lPfjn{?Jd(=L~E~gu)SYS9!!T
zXBs1nBR}h-^RM1`RFMCk)M~)iZMJKvGo=O~G06e}y+Ymlp{<w_c#jgITDw+=nYNd-
z*Bs(rrFLj!+L3d#(dSZV$g~rTPF}oZ3B>TQMt>NoR&)q`+a!F4XuC$lG!o&{-Gab0
zZbZH*P|Q4~6UMN<f4fxot%V|X;gB$NWT}uI!V(cvsI#MK#miRDtfrbIUSNzTs`?2@
z_*}-`NQ9a>CusU@YN<PxaS@XrR^-DS@`Cka20wZGBCw!^wkm5Uhyvt$Sck=;?iL`5
z3d2vw;$ZB1TUyI4{002?_c(L~EI?d=Jji~`MBlbwLH3;*l)4l-c(lBv1meYY`B4c9
zRUjDrdfBCOd$YMyiOGAno|F<En{;t+%;rPpG1>{jEN8v?buB3-k}aL-02kMh*pTQ!
z>^P^ez|_qZ2!UZk;D47)H=S%(fd3e}>H$`e{wt|Na8)G$!CdMUI-4J;NJn23N`b}j
z5dW5Xm~Jz8><69TpG~#=a<5wJvptrM#1ow;aY43wLuFYQp-1~rWn5E7ed0tZE_ia3
z$-Vs|iWR8@#XbtUe*B3-h&Im&JeN3Je1z}<fmH`3{nQU)=n~5U@~ER1`uuMGDVEjy
zE)zwRwZ#Dw#@D<_1&v|k{K<1`8E!$F^@=W&d6W(0f%FYR+GD)}_K(;@4!{1xN6~ac
zRlNq+k6EMNehsE(-W@rsehflq^7Jij)M6UhX}yl1p=Z*}C1Ipv<-e`ld`Gk;9roQ6
zVWafIF$sTrulm{q;EQQQzxL7xwlJGB(x0>$r_#mE6_mLMBN@|WOwoaMSSjMSXKuT~
z8Yb-0fyJ&<aRbW33WHn6GH@bTwM|V0>{-wVIfnzRhFS^QzhPaY?ld6nBwaqRY*X8r
zv*xI}Svxd`G-MvrD9dpJ77DLlkSIj_MA+1$ykgn?tu5B8Qx9E@s2`)BGD@Bz&`Nd_
zSm;3ru_`f)nMuJF%b!w=;6iCiVP3!qq05k{j~ug_Cp8pJuy2*L&b5C!jOSe6bBMph
z2G*KB$OPAF^tJz5vv3$F|Ep7+U&PsU#b3h}i?NTnya|cC-i#ga%QQ_sn6<G&PQ>(w
zxYi%l8qzVK(^(n0x$B>C&^l?p4oy=><2Xfxtz;t2E{l?MD%)W{QW_@W?yhCUD#wsn
z=S;{Y5YF^7-xb1wDLf19F!u4q(qs+?-B%?Zx=hR)={8<Mw$GAw9buJyN06H_j(()<
z4%HyF6^CZzyNWznk?xo)IfE&JpW^vS&|+ib5Iy-t!Liaou+)$Eq&OqwH&@P01JKig
zph=a_Q<J~eMCI2d8cW2=I(UboN6Z20bwU)fI1f3V;ArZE;mRYQ^Yp%UAyq)h*rXr1
zzkzu7ReP((^Llv^3Xb~e$at2Ce;C$#%a3-C8dxSc>tBnQ7nobn=_Hbh%A+?JkZa0M
zI!;MM#c3>(y}bbyh^L2N<>+u~>XQ!R^|v4A0d|u5XypsqOJcils*955kvwI7bfFwr
zx!n?3SpHle(1jQB+nor8fJ(%%INM0FcIPjf=+Qe!)-q4qNUqrdn)Hd<uqbS*iB_Cr
z0S4dz;ZwgK^V;R_lrwCox8(MT^sA)CJPDgj2b6bLV@<Bhq{llIf;T)bg6GY3vDMR!
zZ?%9i!J27`YT97h-88|nxU&ZsuAwI37<{t~f8goG`Auug)N5poWO2#aTeJ<L?ZCG%
z<`r936?u_3cCnFRcGP{>q7OY$bL9e*!|c4q%-flGk5R2PHQ{ywPcJZEMUj=P7h2o!
zt2D2kPGwp~?0m21Lr~>Q6~-JlBCS64)srR6rRWnValoe#mFfa%&!JFt7i{XFs%X;l
zT^HD*N_F%6(6}6JADOd!7)N%~4kKyyL(np<Qcc`KPtY4`f~OxMMYLr|MJ<oL@&2dS
zoJLTVP9si#9EmP6_0=@;ZYX2~w4S#z@vv@Et{Y`>i#VMRPu|lUx8Tm+%Djao{<Rlx
zHvx3BW1N&HHpxS;xpeLFB;i^K%06x{aP7RsqzwDJg);U%7j-<U^J2+)Q}$tbSa&AG
zM>mLHT^2{-6sPXj7;6F`#3bJ)@~oyo?mLC-()49@7xk#daW^u^y_HGoufdX~h}#*@
zhg}3+sVnl$dm2Baju&a=%w6q{Rhx<{6TFwEp&Lg@5MWR>OLUiP&zDhEeKC24O<;Id
za=0@};knmI)W$|}Bw@VNsnD)`t%G!d=1HWC*j2CYBeW;3K96-b41<?l1W@bnb}7X^
z9)2Ew_$^Nr>_KDRas8J;_;*5lB(^7VzPt2WX+^Oaa{|odTqAm%AS$aEI{r^CYa2Ar
z)S}sR?4FF@MWD*&5y{dMd=e)#hjfI}DDyAH*oc{uV0_d^%>z=$d#+%_7e$ETP>`u4
z<-$X80s0}N45i2bO?l;3#Kow6>da>YDo)%o)Z?4S`G>QTauN#tDN+psm#tlyhBgZE
zNzsjZI~wnEk<o+sm0s4zL!=i!)WzdZq}7m-+#|Qy3hFfr4;bB$SR-(C<%j_ln0tsw
zCA|1^{5-G``*TWsV;PH3;(ZGv;uR*S$SQv>gU1IS^jhoWb?})111vk{9SFk)_K`u4
z6>{D41kpPOzUERg!D{Mm9PIAyGMLk#3BZAYu#|aS+wPbwFi>4>7*P&RZPm4!X9{&%
zmBehqHO;Y<UTsXR1dRuocgz84$G?sp$9hbzK75ihyjst#=Zbs6kcA6Snlzy<8T*@P
ziR0(-3s9_;ncuQ@ln=~rR6}UWio-M#&Pp1HIfp-ue-tI0(*-54w!Rs3jXMq{jWyMk
z)x)JNrSD(HO>Vh6Utv&t`4bl|Kl6at^L8?zh<`>6SI=_im|ZdU@GT_VDiWXlzNs1^
znf3Tn7UShY+(~8&bP3jzQB-pRl>a7~xuqlIPNl2YICu7R2gtKTXq~d{k~3hD$f^wy
z%8zeIl*EY}5DESp*2IYI!#|)b75BKzlTsvwL2soXm<|Vk!6e_aVYV0)vd|g>GK8Cp
ztVo}{Xwwk3APtNV`C!7cL->@*R^gQNx6~^-h+PV_!13<}WNseeGN|xso54HqVD^Zd
z=y~X&9j-$~jV(D2*+TC?7l5fy^XhoJ^>>ikd!QY~d*v}aDd?P8Jz?g!tbPE3TPz~q
zgq~#nM9nrXJ<NzH2N3$A?D=$(yI*3_o|RB=eJ1cC?|g-TnEoE@`;Z}<nH@(3?^|E*
zS2T)sQo*&nI8S(fFV##Q)XB@2%}l`iv}qKeiL9yb&?}F?Aw-Wai~E%`8t~7Ip;2_H
zNxNs8?BdC)Y#9VFDOhyPp;5sYMBxk*Jp)c^o=nj|CkPUs&_s%-ZX$?+Kk3(cLwM-l
zxQP#uNesPZ1%en)kw<LR#H*lfkk<Aaon{luy1K-@)%x|=hL@vwP2wjL3d71d)aqeo
zyV+ArBg-CBz{3eU1f4<ss4TKv5M*-%j%HBWxHPq%N*h(4y(+@+0`K3_t`<!y!dt1C
zZv$@7&lWGTdIhgU*F&P9Rjy~=a#cv-xf+BWsNiNk(?g|{JxKQIyHWUk8=i)G5>yLF
z1ti=6IPN=7o__@0*g}-*S;Yq|J5%YH3WAq)A)Ay@TG`_1u+RKaBkJ;Mxj~+{NsBGI
zw^nY1Q|)QV$fN6J7^Rqp>u>Dvq6C@>hgbSqoCa^sKfiq1N8mw7qn{{<{v-Od(Q=b?
zNF<5xQj8={WS&-G4wvR-Zqi&f#!#2Mfc-8Ngd!dfJ*aRwT?fz8&jn<V`6nf%QNB!)
zasH90Mu=SZ@j+a!KM5+B`P#Cdy}{j1kd&O|baVbkYA11x3bTqbvsxo-GytXQlQ!0x
z{v-;P4|nkU4?K=1ca~?_gpk+LM~fRQsdqVeWvsLeA@FU(5TsB;%c9&7jreUfch;-v
z`Ur=8%S0gQn~q7QKg4DXJl?Slu}6-g;b-J#;~^GBLk}Wl+shdc!-}%7aKmRJTU1{V
zBy32D_3lkC)z_(i=FH=_=JgrXSS_qeHNMM6Z5rvwlU8!Xm1`D3-xJZ7n1juf-<6}9
zWon{f*V6DNbIk`YKWaeew#03~Lg%dBP~~-}uJe#-5&BwsW|{l2qJ^RmIQ!-Z3vJwm
zBMq=N?pde$^YHdtc3)N^x9+PIo0fCScc~JZR}U&?qb|A-u@m!+)z`qA#;RM?yQRA0
zs=cc0a{b(@Ia2!I9?R+n(TvDzen#$G$jn<BY|*;<HM<t22TAU>hLM_Fax7ifaHQ*I
zUjdWVQU7~x%|p_yy`A`jJoS-7Z6=(KYm}FP)|TIT?B0U}t-pOqXT@8}Pl_$(BLJnd
z|ER~gYQWdpEsSQrhqW`-D-_m4(rRr)_0ZjXz1^0V?H0Didbs$a^K9mkME4D~-ieVu
z;H**d&tp=>nTJO88CrLdcS<hXq_BUrOv*`QQmf{}=9x<FnWbQ@y3|_a!1B-ts?fXI
zbq96125J}g<wg%~(!Ft4f%D+=#>J{VZCyce)LXd5+?w4QqH*HRLwU_bca8-ljp#UB
z(TC2e^|qVnVvCf!am9nx>QmK`w+O8Pzc+oDmbGs4g7hmajxnjhvU=2RNKMB<1oj01
zdlw8^Id=8a&xj??VQ+oh_7?OgXLW$CzMCq%s%aJ~(Rv8(G<fcU0WqY4W2)!P1Lz6c
zX!sO+P|8;sZWoVsM-k_C$6|vu^Qh8gfp*6z_BvYI=BYjC@taq;arU9GPafEtiX~Lu
z{`XSCwXEretEka|$9_li0;eOjnKjs-mat>BzjXDc0ybX!>^cZR4m5&;k}r2YJJ(09
zFtzt97d7`QjUawMDi_DPBo(#@<hmp=+tJcJDl4)J+A%$F=-EYWH(&h;T_TuMVgC3;
za))hqY%3&}3BQ={dt4nsVDg^|xOmaC17CZ>O|ZvV?aIG+L9J|R<EAYcpGw%F9#&Y5
zLThfhsEj@4->cVgiDbkRov*?pI0E;2n?moJq;5A`bw)S$R*-Rb8yP~mp_x%+xdeT^
zI<_?TDC%?~re_yzp)H<Q>Ktw^d#c*og`U4bRx*&5g^c(ksWE?+A<xc4QtZ6<$)WM2
zdAYRW(QLeovze9K0P5QSa_E3gw7(igZs!<e9z6lo!R}ATt*ryQ^Ni1MbpETezq!J>
zO?@#t30QkxL(sJSry1j4J9M`ca&HtIK~K)AnoND#+nug<J-OGlIc%qUuyn0tMtVzp
zaw#$*OO6aJMZ`MVvUCk!4(vlt&6?Uw9o%_*p?Vejws@d+t>p&NB4^K=x<na;Y<Nl6
zY3umF>brIU;ADax-;dv^)EF+6CLJl>s_YEsuR#a|b+RHp*kpmWW7VzZfhkw_IlLY|
zmbXCEOL`s6UoF{vR2sqC33<2_^o+E#k^bCs?G#3-xb3jg@>laNz^ZGz+r#<7LMtvf
zbyPfuLL>SD_1fvvN7HKp(7zCndcb`CoTC|Nc<FF)3ch(Fbx6`;WEzBTds&?k86tMO
zk!rnA1TXifezMxv?*G8Z6h45-WfwG=A_;0Xh#c=}9$HmGe;$4=l6Kx|Hc{)Z!hG_h
zTw;WosMQ=ak+(|!?yP7~&hVa;>gM)pY5mZUlEs4NpT~~z<}ByxJr*g^JLK3s$M26;
z_rOC3wYi2<C-<UT^I0{~ZCCp^<1_5KgUjY&0?l+yU`VYq-XRtGX6)J`Yx&adgVmyT
z@1jRBjeGi49d>*Bnw^X(xphgFUdX!5_XvmxZ{N+T?U*uL;?)13IDg$+ciGrc#wpIa
zQkbPInz7TuP1USAvK&NGc&y^SrMc9p6us)(51+7oi=Jpj-0M;tVtqmWHfi4y486=e
zjIIb0f?$~$xqw{=GJ2>N<hB%BHZ9LEw}8i#63BsLbJ@||hVxO|(i%@%YwBL6jLJjR
zOxb4VpYO4Wk+i2Nt~w=rv53PB_7w1V$|Z~v+WjDMN-VPFmNCn=iI8VoCD87S8nt&F
zxW}e~=xvO!LWul*KC$=RVM`msh!R|QJHWaZePOXoZofm#j%uzt%z@!HC3H}SrMC5b
zI-pxTf*QxK@W!!aPe!%hB3V(P9Xh`r%Rs8TW>%38lv!vad;pSNFvB!9h$_+)H<_Z3
zT6QeGWA2JxHr?<XxJ+m|qgJ#P4ym1pb+^r~zB|5f@wj16+w}IC>Unsx?;I{Z?}SbK
zFjae{;kF|zx;{xwm;Cj@VVncoiD6%JKOOTD{S}+8sPN(tNqZlQ)i%J}7`;x#%6Ch>
zaA}DMeTMQ9vyUCFSZz%{pxDiK;wff|>#1bV)_#p4)5FzwHCJ2N<-|eN&j3sH8LY;W
zuVz(5rKGViTGIZ*7PGgy;`7}I_yrxE8Tl4NOxNp4GsZW0O<ZJC@_d@tuuMmbcfEvF
zSU~>XcckHJw!9#*bkeLiRlZ1Jl$2H5lMs>2J8QEm05B`|MIKx7X^+4Xtp5ahUPx)a
zY(VAoqLw?~&FjrZpRCO=_9#wyafr~ZlGyr&Q<k3q#hZE6d&cTA!q%{2j>{S9WkOAB
z0cL)+988*pB^kH+-lQWX(rvCh^tT@p@H7bx|8MF$f1nCz_ghHHRC9n0h5Q?<NNssk
zf3booXEia!hbMP}&8io#{?+zLWj&n<Qtu0x+hq0Q%IRO~%CDYPo=;_|AhA5a&_rrU
zUIqQ(qa|X6aw~&PYG-i66V_)A=IqYSFeeS>Bh&_%%A_1G0AWd5ko8YLjZ!498v%rP
z2!ry4yu^4r;zWqO!Q#j#3jKbWDr^TNs1)?4byKL>-a57+gI+C|+(%Ss9;zw6P?u%0
z1*&qb4e18!E;Pg&f|^?^KO+Zz#s`Fmr1FPi3LrKH(8bxI^W#e9>NxardLqR<zdc=G
zjnEt5P#%vK)*O>sG9~}i4bXyJ<@8<X^SQV@`qBl9mj~S^f#yRL<B`}h(eohkNT1sL
zpp?G5!J#+4l<zp+l0;W>i>PCG&^gQpJn1CJbYAhaA$kYm=hKq#?t|_{go>66lZ#3O
z1lDZDYX6@0@$(0(B**tgJ`pjV%LsPP`1x30X3^!tKO=*1<w*v~{0Ee&lDzOGtl&DY
z_YS0F<j(goA7vJA?_dkyeD5&>N9Ql7{Nv$R86)P`Zk`Vggm2^p7$+E0;=A{5%!N7y
zc!}8D6`2i#^cnVrXX{>L+#szkQ?5b`<A3%w+@kxoe`t#S0I-?|drp<Xj#Fp?Nc)pj
zRrK)&qB|C`8|c3`Lw2NjYM<vpinFi*mS30^V6xsR+!dKjYuybmVzOdKuL7|;?`&Nq
z8A{Fkn~S;XZMo@>32uf+@G$Xvmr9qv5q1Bq(+14)T!Z~FPEh9iQqxXa`(0{#Fob}t
z%=uZodI{-?dXQghwDW2vTL5UE&(h=~6X3RQ=JfhFPO~@Ep89jdbu;u3uKzafC@P`9
zVM13fT8cQ6H(NBZf(UFp&PAkWr-?4~0XCOnHjoI}Sm_{MVZ@k#W<kWFYu6shD!!9g
zi%#48CwSnAZ$FYOT2aiU&unOch^~wm$iQx4Z?LsGz#HeNtg|AN4wHq!bI45meYG1@
zuJQJ!zTOT`mpJ<e4#_?<LV*FZ%5wL#F2JnM5>yW*k^~-jpQS=$sbaY2<`0tbC~~!K
zAJP#Y2t+DwpfA&`Lqc*<jHFwPfD|sdf+0LtN)5z{Vqk-5%(_OQN&Jy_wXiwYu_L<{
zW6%&oJ_&5N8ukqtAVex6t`Wh!S8XG@*mn#8c4kBpjIcuR*zP>Jdz)8)C8Pk#QX1$K
zLMD>4rkZ6rX{h-GxHi#&bI;lj$yjkIrPK97&m3P~{GdNZxh9~{WzoluLK{XPYaoAg
z1>(l_5@G;HjA0A}4Tt&+vXDh|Qqau+Hg79owFRjo198jskWq;q7|F?ducFPjP;bm>
z$=vmVSQ=46_`LGrvvSA?=0&7kO*u%5XzC}kx7Am&-O#~)Rp+cO4?pQ&G>N->Zl)mJ
zrfeX!W=VPzPu#GclwU(MQKppN#jQ!1ksACY3<>=`)o)t2prfUI{OwBOipqRp^%a*O
zb`0F(jdO4flR@zdeNw%{4@%IU08|;%#!N$18F<m(8|!6(`$3#+UDK1sow31xxXQ@B
zfw7kshe|^#gH3eMF_Y*Lz0O7f=7@qE>jxB>gC7VVJQZBq&OBp*076NV2^)cq0EIEe
z@Sng;GKSuhkeD|D#vb{LQ8275#!jqm0*&ZhhELY~NMq$CAn0axYERlxJ-$nZpEhHw
zyZ@Td<)Nx!@wHdgxnM98)zbNp7_e0y+ruZy1+F!}^zKobQFyp9NBwc74&2=<Py^aN
z#Q786P52!!z8wP`DbAY65XF-&r@b?KM;{C<mlAc{#EN5R!!~9?rZ?h3+A7SbKpK?6
zLmDE=zAWO*w|EUR8jsX)MR#j*RMIwP0<0AHfo`M-9&N<{9;5-#O&pY7(Q6VY<zP(o
zqUq&1UJVx(u8%9SCtXTeG3EZ&Hi{nqq911Jux7TI8F84H@SuPbPlt0Ld_WYrgE|Xn
zf4Y>KfU!vSdgBZDZwPFnsuFMPJApFE1Mq)D5dX=5HT(|Hf5*Qf6?&~Q=#V>}C}Yyg
z>A{@(fAbY!yGblaY>2g1s=fub-K<jT_dQ-gfyEmn3R-*ZrLtOQX>MxDP`H7viRV)a
z?STmAv?3@pqqwbm_k*^TcPAXasM+cCU4MeC?jW_0U>3INSE2|g9XHz>i;U1g-^2_K
zH4#b2MKlO8RrOXQ234ELOYK5FC^ODG)akde^ABSiA3}4e*09pt=}$IpmoKz7k6}T`
z@bwa%f=7}=tcS<F9@LK>TQw7YvdBf!Q`)BKO=0Qn8&s(@Re!Sf)p6qLv3IMx1fAAw
zkeh414p5uaL^3vc#fU=ja`_gxY7D4lY;uWhXv4}5KGsa;J4f`dr1AFPjE3(Yb|p(}
zHxQ}d82>0OjF0SF?+b_neLP^p{Fw~{1g^J#ih9?r!LKr3c!2UAOX+rowZQw-yjB0c
zlxWmR18N+vl1XA3MLtNrF`r<VU?`knT@ORu)SMm%vU*<UH82%v$wBJ6Z@YwzqGRQD
zL6MM;v7hs+r%t*y=a9{kVw)VZKMoF#pXcrVf%mU1W!T<glD@;44F5Nr`JZg&llgZB
zpbP+jzlHicoGE9j@8I~IGE7TP_YeGgVPNF{_m+iDfRTYwkY1RD#>UDxR8B?|1`_jc
z+A55=n2^G^7>@6{4mjBN8M$xS<@*9*Bc^5#0D$Q5w*YP$;r>Pba1fUk{;>s(4G)N9
z3osY|4@y|of#1==#M%y^v}!`^8wKs~jS@1n*S9mZ`I}Y^fCPb0_>G7Bix;%EakVow
zHgN!`fSdT+D(pYl?*!|=q<9YBS=j*0PjC?5Payt2QM5L4aMram1kkkk`b!S=k8o3a
zeGA=hQaga=o`&deH27b%imsiNsg*H657uGuH}1#3{El||h5!#={%8Lo6STJco7N5R
zIFZ!-jRX5j_RG}4!VsY3a*h-L01rT1i2s*M#(C#T9QIP`(aYVQxsZX-B@_cvXeN<Z
zNZbfwY0|ILG6j`H$3*Fsj=qTwvCh7Z9*u}esjUXJ$v?u)j*Ue^;s){rfO=aDNUc}u
z=UrKbG+c<O0EilZaWl`+kc?y-{T~CiPkUc?nbx%t^g(|A2YC4hoHu;_bC)cP?*REP
zd>W7k$ngIIz1dWOGvs9dz;k>dJO}8%;9Z9-P@MA*Y|ADI93%e=@1qLfng0>5mT}bv
zNSfQIS6(Z|YN1f~<Cqdgt{jG7Abj3%w5i|?FL&>^(1+iRc(O15TOdyN{}I=I<WB04
zkVK?5GIxo?@|1+`G)>3u;hUo{RPPb+FgXxKpOcW=NwD&s9Fxf>$9tjIZ7hF*1U}qX
zr!^D(pRUThY(iva4k3oOJ3pJ8b=Uv$7VADgioDmHnAxJ=bWQ_we#XM#g=D6bB){{X
zS^tv8o%|#407X%m5GIAerA|=ddDT|<e>!A--RYWN%s?WsN_DxpGc@*N-CE1Au#=D2
zE>>B{(E^@W@x2RR>A^Omdf5Tkw8W%B^6;yq<-yvI(;29)Dewrx=uMF#Yd>!UoyUA9
z5j2TRit}G3Rx@m2<<1{lF?QQVo|ShW91dNbjDaQo8HB}Ya!!8v=>HO8S{=YT(YH89
zZd~0~;pkcndQ}*>C5;RIY8_aGLBmjE^C6}F`K}(S+|Qq$vXp3W9|;+y{T~ykq+V$p
z7cdmfZXC`o!dO*&CW*E;FJD;!Zks?+fzP9kT4lbS;3CNPsDH|`D|-3YY4+Bx({hQn
zm$EG@O?ZRYch|18m?Bw0V)p<g1T8j2D%+UL#fkL`lj<9c<$CAX$kF^WFkF;grUGRW
z8dA5OBe2SGZ5$u8Pl_t@Bl~=+XOemc=(0C;>Kh|4<`TflrIMz$m$j)Jnwp86tBE}x
zr+Fm19c$f_u(8B^z`=bgtn4qk6IaZ{Rucm#uTuXrt~&ZWj0HsVm!}rhPS+1!7q46z
zJkzb(!yEp{mp6ba_<#<{7pMivq^+yJfmcK{|M>JPT@^NK1PpLdjv0^^H)qtn0S<rr
z+O@Tr=63>t1Q4gO*WluUj-jB_<hNfu+~IXiSPSEy&2<_pW_lj<J5?G&7fdqURh_>u
z+ntFK%5e;$$Hc$gs&))ATmj$7X&gWggr`xa#hiNRr9BvKund<Fh6e#!LQxfFQ~x_{
zdYdPl2^<>ai752gJw_&nx^2zh2p=C=@SJ*)wvRnT_4&<?l5j-*5l4g=n;#)AOyYGq
zf>_mxeo^eXe(oh#(znXWxU=eC)YCwHbxy4FCIZ^{qQ{6q;{yT${zL$SNT?NCv_M_7
zFe@8h=1V?#0?}IFU-st6Jqq?TU@`$#Fzchs*GfJ=7sGrDdi2E~Cum4&v8vLlqY?r~
zTcYN!l@57VrclY{0MXfTMb+1b1qOyas0-gX<JDDD1quKdf1N*>|7R9o;ckV_tW?p~
zcDN@`v+(TpE-G=jtLN-`d>psvilAQ`UW)kxiuxML)e7r(k1CyY!>hqGJm6yBa!mH{
z{dD^on6^-u5Eu=8_q9HJ%bi@~EEcYD4z8i_I?~<~L#soc6VQhbihB7xB4tx*$d*l<
z!E+{G+4(wJF#l)fgbedX*lU)aGpnI9t)V$<(T2R3>FkBcZ<xTvGUHisfSKQVYC!mX
zq)j+sQnWq_7#gh2yFU12EBA1qf69VBc_!t&d#-hQo)e_Me0uKA`&Jd@zTsNoIVms-
zkm;?`@n@BmzSj%mqBAbghK6TL7-{j-q1dykk0l?O!|u$9gNuQ-sCrx+rhpoTmo`AH
zp#HqxC(>Xi9LQZa)NvCva?Yr^mWxlIaL^hjU1udC9T^^IlQPcg8jBuN9#<Sa%Xvqg
zfT)CjLJ*TO6K32b_2|&=p~Er*PeP;bL!T30f~o5&hA7QS<tL}WExRc1s?pju8$1ZC
z0C<~bXbtE`KfR!T(2m#WvkmTid|Wd_a%w$~pdipN^}k=|-tZ%JR1Qe7V<8wPOirO9
zC}Loj)=d{TWos%i>>9gb1FHC|BXVd|hWQFys@wFbFX84tJvbEo3Xz@DWnAym#7S0c
z4TMloWU<{*4}1QSIZ)4hsp}d0_8pQ$@Z@w*+v`AQqCI~k&oYuFn#)UY4J@jh)Ko)S
z@A&E(6K!i~#Sw+E&3A?JnF>mU%<mef@|g`V$O>zyA{D?A@@moME&H0xQ=Hc#pa+S>
z0otM^1_y1mr2*CcF~Y|or)pardI>ZmqnmHkCaD4r!Gb{AJ$rk4eqp&_0HEDhoYkMA
zwUcX|Pe7|Z#KnsxQ|&Y3hahSD{viNVME`*yVV!(8QG0kFVK7xTHWOqu>vTy&IeIpd
z)D94RW1RQfa%0C30_o;*mxh#@2K4%-WnEKpBVDyw6N)@B?%Hm6Q~|zLDzfBUWVQsL
zAJss?fL0O$Nj?%vR`{oU$o}$}<o3mf8e}+{^+M!v&(~k3eN}q4eR_I*N9Ulza)`@L
z_)h;UmReL>bu+cTh)1N=bR2YHE#x8j0g)!Cr84jwo!55TCV?lW381y(a~IrBPnWwM
zEdHry`50;@Zn}F!LJklmdWr;KR2o3o3>CvW2P|nRG^l<6!Ko(!OP`v_&0oVjQ(sg)
zuAqT3<-}@QQP0<VA=6eu=axYZzcErL%)PiH&wl?Zht=0dEtcusS53URVen^^D?4}#
zuryi1uM+*^jC4uU^H?P^6lWzGXZV`B#}oOhrv1m-TAGaLoJu`Z?!Qx_?<FZvh6b6d
zSit)LS!L=SdyU3cpIN7qT~hKgS6X)2fIz#=&SBb5@TXao&}D+fk#~I@rk*uq{Wan4
z%hT)`Qi{`OA2J`<KK?#2G^BV)BpiBOao;#G5EgECMG16Zh8OPUXE5TPb*sxqb<&7w
zGegrNq0tfICHDj`Ryl;OXj~yFR7Na9Z>ec=>YbsCY@3uU+x-*hFY})V{KueLu|qKd
zF@ZF?qIQ>dL;RZamc6HD1APL?PFNf`f^o-4pozcatj(I7h&kKiBo^?&yY3of{#jzZ
z^*S0@!&x|@M`{Q5LNfM>9nUF}jW>;Jto_JN<4EXro5hWohR{dOxuT=!L<K}4LN3;;
zhZl1|39yG&TKyQmj@X*Nf@0Q@N~A8Mk#w(ZAZ$WS@I%S>a%P1bZpgS{X;qShg%e6(
zhW==oGv3`HT7P;z3~U*@Ni%S3qvBT_sb_Wx!}brsJt|mfTiacTOgwPLDN_<cFU-3O
z(yq5_G_g5P?TkeOZ+dk{*T)-@1WRb!H2L&vMG;K)`u10<!yecTt)}Vf_s^IZ4Ai=<
zYX_4Vnlun|zQtW+M#RcT&(5MP!Tr0NxJC?|a`KGLJcKM3-P9>@J8gYipz!Z_8p>9@
zg}L?0>~u(PS^$$hK*f1m#+sXL9kFFnRv6mk1g5;g!~Fn#{47L@%8Ct+bl;~vKoo@?
z1}pjb<{Y6d&h8FD(?QDiq~e+JvU3*?GE`f%CSTxAE`SL(4f4F@Uv^|$psICj^CmJe
zj0=&pME$!mf{9y~eKfMRgGO<WP=jlJ+WqRK<58q%pcJujEct^Pb$hQZ$QLlYdGl1?
z;g6vgy`dA$!DS^4))|C+LAH&};wpSln3E_%QH-hE=dXWXk2VVJ(`d>-Ai+s>vweL1
zkU3$|M|hBSkAp{Gzjq@z;R7<c$P0iXx2wI^<A_GBO)QC+j5wRCrIKG&)fA$f-na2y
zP}Kvs{+*_c+2<5TO=rdg8p99T4R&N3XAR76T`!kfP)-~pBdX=PYcNq8wBx23<^8mt
zhw%5&Vu-)=;9`D+4Y8m}KgOEjaReS2#DMd@86s&~=SRd^Gl#|p)6OGKu#pO(>uTJ5
z_@XnDld#=R-mt9Kuf0rXprT?;kF8PaU)qpRHZ~bt6&(t;DXHZ2Y?$&`(DD+xbQV>`
z12?k_N%Y^VfsD$Wg<(J}MZ!Nj@Ls6l&tdQPVQ-Jv?`@~`warJghW3k(`Wfz=1uJ+v
z%&Uj=w%fAPmZGE@st%G1vrMFhUsw(?>_}YzQD_#oudR&}4c^br@U92RfjJbvM|6@0
zF=?&-G5%NtJ-O!udY1z5bJ8Ypk997oji7pKlK1VSu<<W?ozr0+PeE6b{bF%M>H5-?
zkEICnuXck^!RQC}=n4V^&!A6!tl^i(t;M09Rim-YHw0Xdncb<*5M@%~v<Omy#SzbB
zjT{XKbo9$36>s`6?f1IuS$VXrW`x~zW6DR*QNHdxmfh_nkRR<~M2iM1@s<!CB?-*>
zgfvIfiQ!bE|CpRM0nKPu+)%2%eZ22c`tSDjWdqBiDH$TMpfHWiDq_yY%>!VV=H?d(
zA4Q?=_p#~}91{?Hqa^iA2gj{~m=Kuw3t<O*s!z7YXp2;{9jFq*f(sc_JS;doQrIuB
zXK3icGTb(MISC54ovQW+@zGYj%NZ|-RM*8k?+ISkDMlr}G_!ko*Z~#>953C3*ExKn
zW=0qv3_4XMh7D4X3_A$$)+U28wmApR;CX+@*;4xiZNd4a@$`l^IMj4wN*a~@i3F~7
zhq9sBn0u~eS%L-EbU!SgDy%rt<wj&mdiY2k;kXR4Da#V$>5p5eDAm6!qulj^tFHAP
znJIm@Yb4gUQ?Pn!eOv&89OkH8GK_Pd*L%!>M2O~&GAvsK>D6`xS$JbBv_Wca<a+G7
z8ni5YF1usZ8R`C3t-C{NaFW{{iT5-JG5TTUku%4+dt>Rj-^C%iMj?m*Tpir;sDiTj
zoDNWIpv%dn7{^C0Se_W3QT~-~aFR9t*cCmC>SUJtIXG-d6p_dg@&rTz_Nw)3$qRqd
z=%>KvN-<8A=W6Z^XkM=qwI5ILc(UaC$JRoMS1$qS@E`&#q0%*tE3^t%nJ2ZA6T_<I
z%Q8KOxQ;p0=|l2Nz&~5dudTbtz$k_=&DLH!_oOw-X4Pd6Ax<kiMu=6BkO(Q}m61!^
zjk-_|m$N^d9XzkfSNF1zS#>H#6)e4L#+&`l%-PgL7A$Zfk8kwl-a)@#$c?-)5jfeF
zeekAx_I8nSVoji7f9mkoPHxBO<kprXG8=;-6?yB@e=Gqq@;X3dDQ@yhNZYI5T>D47
zeVM7Y9of|!;U$io8Igmlqng8E^SpTj?MCr0YnCDXEc8uQdC)NTPe`kr4B%uXOhVOv
zbjsdy@rb~yVP`(EcN;Q3Y>+LyWylDlq8jh3&0RIFDc-4U)_{dA<8pzo?ZA#V#2g1A
zzk5};rMl@Lu-z^fD=uFymt<ijeshnz(M`Ug53aQh&iSP=tr93BI%{H3Q6Y{gJ-Cb)
z5zQ_om1NVo%YoXF=0TXNA3-t?F@8hEdX{Zte!$}X0P{=S7g;q_8X%?!TgaX%9{4f<
zODw;Y%>!(_Oh*mqEagYp9{6j94{pX6eg6VO<Oa&_pyi)OrqQu(LiK0j1_tc5gqqpq
z&K8PjfZ!08u;&0v8U$sn#L>C?Cu5B+WZMI453R3k8Cd*bANnA+U+2`u>o26EA8?jU
zPo4#c(NF;#`;U2*%)y7haVgH`SeFm)-I@Koo(f+w$qFF^M~BSDE~W(*RpN_J6*Hw;
z3D~&z7}*aPneK0smo=7VwyIq|9I>{l^&)a-<%D!;p&H|h2}ATl;b|U6hr0Z($cOmy
zOI_%2??y@SpRS1C_bVB$IyCcsH$rrgN%HqT1sN&UU6bvy;)+mFk-Q%>Ki@=;LBqa%
z|Fm#1d=as3tsFw6Y<GUK*jt*g+R8~}k=H`=2Ww6S9-h^KxCU;B8F7h!NtAtVyk~Pf
zMcflKM!y!h7PdJbLEV<WEn?$*g=4A+*;w;mR#$YnKs4ZSJqhY~0n`x-332yg|AbgW
z1OX)0&K+6;_d=Ba;0)fL7V(J}-7O$Lu`1?z7Q5RPRBbt%HQ_X|JYW_Ztsf!k^adX2
zIoFJy`jX$n0Zo>qCnWq?m`qoG(EuYEO;leGVK0d=`B*=zG+bNJaeTOKGFF()l)`oe
z(1^BKWsKk>TM2eF)f>IF;6lv*CxV`@m3KRG9A(T9ZI~QvUIl_2CNoOUmV75(R^afb
z&>v^SzIwdE9`x)ZYDF{;Z@IA;!?4K4fb?u(DqhHyEy<Oib*2rTf0imdRphQcx6L7N
z3X#>4>Y7-`BMY}|yk7(t&+gzsw(r51-&7B5scbYOW=mS8b{}!_$PT4{lVM5tqj+4U
z%+SXOqt>zWl|Cr?Y5Hn`*ZfB1$&n}Hd$izZ!IKwb@bCZuM697(?(CLS0Kz(#fHJbm
zt!@a}!o^FA8L&lJa;&`|ZO`u{R_ji(d+G+ieBUhEbO=SnlFmvU1|~p8BqOBb4xb&W
z8@~*aq{G>RlgOY%eGKr&TIP!9yuq5eFiApFNJ>&*Y06flJU@oSqq^qm?E%l|u0YRx
z-&KI24eBuRXtf|qW=`IskiTdSO{YP>{_(vgdw6ua;CGoBlpgBv8XD3cZeD~`My60n
zK(w=nr{NoB@t%wqQ<6Q?j3`Lw<Ev@Pw763m*mD<QiJ!tmJE`P%SLWvBY!hEM2FRd0
zEw8QZ_pUlxS$K)5FW#~3&`RLtgAlQ}Ptp7+13m+yy-T^5RlEbky(&uF(IMA6Dci62
zrlI%V;15!!ZOq0e7Ra?J)v*Zy#L7m5Mf@RdrAu!x;81HzrskQVlWg(Kv$CRHueP$&
zA1L2<DQgp~DI!W*vH+HCa(RmL{QMOVsFv(D-#-TOvlWz-RF+9h_7r>7QR5a-ld{`s
zb`ABBci>vF_qY&J=6W|l2Ax7#MIRQHM|+=-28>%>uJi>OCLx7N1;b{Xwt`w47J^7B
zqU~N~{Fn-@xep;hB5=eNB~*WKNFq715O#7hrXioMFArzs&l<~yoT4O3*A;RpaM!TI
zYS3US;h7D(DfX}cF$+a4{ogql_%bF?oQhMk_S;bRfhGFUx<0L9n+$8sWuNvlD^yY4
zwO9I072*c~C7ked8v@o1wvw7r1xM&&Sgo(35Kj7QmhOpu|GG8E{{yi=PQMEu+Z=4z
z<nkc5%@{Nm*5m9j`S@ut$IgGW%|eu8L|=pK)OE6%Pf%00==cXjdjkZS#0g_Adq3fH
z@H)0C(b;m?eJHr||Jppb=F(`p#EDIrJoTW3B$p0$@9c*k4P*#x9PLnFwvmxxa8Toy
z4Skb}vTI?Vke}zPAeEurQEY6bEUiWy)Sn+pj>y2yKzTT>$M~qt<Y+*DP{V&ZhW=Z@
zqEZ%A$}i7J`y}$x7|+g3ZQJ_Jtqt9dq)|`V+gG$Znvr3f;UR~CLGMfXMJQz+XPwTM
zC&fz_6<R~Hp;%r_xqUliem<hpmSma1_63<GNGuC&@vR9QV+=}}XUdIyAFlED6`2{D
zO~vA)gzMKk%+1Hto4KE#<A^7Rw}K~7%8;g}=fItpxp7^K(NUMazGt7?!!gL1m;a0&
z9}^A{g6}-g<GXrBzw(=IEm~yl;4Zh9{)H9&fOe447dhC81A#m$*^miHdw&x>-w|6w
zVDK}67umFfZRXTf)ICWU)%oSyf6Mk}nfuo*?*FsL((hav-6yM%$AtJ)5CkN>rK=~m
zRdKLMIIK`!MGq~Koxe-==0Bs({sH56F+ySDkVokO+pSy3!3?{vLJ*%~>BB0&`(G_K
z79AQb8>NrCOG}{LJL_S%I^-ik`oy*rXtXWn{@_p=G)%p(a4Xg`OJrY_Brz<nr96BT
zvA7y>(D)po<His)P|+Z^>v3)h&QF2=?dpskhf#LlMM6bGk|?BnQt1SNgXev>)}+0i
zgxjCh`S{bA*+(fqdoSQ8f7Ztj-WjC-O9&k)6-kmmW40{_f^ROSzxbSnm4%dRS0jG+
zQN+q>N+R>AhTVH8Mb#oG=l%O_h#jpVNfb&QU1Q72udxt?#qcEJ*sw60^694?e*0ma
ztz%2zmN3}9!uC{QjXQxXGc=o$xw(Yfw<ENMYSreKzwD#0&wpnB!!ZaT2&`vPn7l}i
zj|qpku1yfU{7KN~p|v4N<P(LSEz9aXqu(Q;GvE#rSEiU8y3BU8&sMUA>ljc9tYb3G
zHsGq<nq#b7_*lI<Rd$|SPh}C!DB+=NVRi-ntk2f9H<<h29QzL}!iGSSdw7Umb2R}L
zE&?#bSO_e<W83WBHZbKbdT<wY?kd^E-=jxvW4vwhL^%SZ6>+AJamLd6N7#|Z-uo3>
zH_o%OP$8}h1i8>U_QS}9%%M`q;IY?EzD?qi0Deg_FqU!lZNv0sL8<a$LZ`LTbQ%fG
zgM>~;k!GLcD5zXWD;VuyyMm!%m%$<TrN0PI=H*TejmaPIDAqLFnk3AxZ8y?{u_lSg
z9mzd`L7}z8_k9B2A@DRoU{R{Llq-UAS>U=aC)7P}rzQ$D^?k+78xbFV)MfTj%0XSz
zZkNbX`<YpfF?oW;u&Ze|72Qx1Mw&QDNz?oVW!pBs?^6zJ$|ak@Awg{*|1B?SAlcoH
z*;tGD?0UlOI}zKvk|=(vu^CutZc%+11G-XqYK17$bUK=PUD4@ivP_|rLMe$5HbU6g
zw!yQZ>N<EO8__4IR&8p10>=^G(X;T~VhrrpC97*G*Kc*Wd%w%}Zbld#jdmJ~#BoSm
z2U94W#~h9`2L~w+9(1{VJLcxi1g#B2Lk^cOyG&0zIF2C8^5xxTJ*CyiXmugY47RN)
z2M*PW$H=(L;LtY{;&GzcuS=q?L`E6Swxr!vy-Br&))|iD;QJmW&)|CoAsm8|!{CUZ
zR1z;d5ajR~ZFMxQwxZqAMBV%ul`<cHk3XZf4MI5ho=v4>V|(EE&|ejld+qzWW7t;~
zI#Z>yln49p&eUjZ?X$Uahs-;no|2>U59Gc%sojgh>P2GN3Zj@ek?g7toq9}M4>|a)
zVe7x0q1-ea@AiBc^?M)41x5(H!VZVqjxSu9YMt!-UDT!DA<zF;pp|E+6Xhd+A}P=b
ztgZfm*7`Qt;u(^A<0NSbr<XlBBDdolb=hGuz(XIMyq=c91NxBUD|Z9cl$rA>@BST}
z|G7<VI2Rk=6fHGLD<N(sq=`X&Ua*x6@(<uR7S%zYz5)Nl@)oZ$#^mAlaje+e&sbcO
zG<IU5gOKh0jQxftiyUm>QmQ!^GO{efbxQ=k$51t6ct|ibUS@2<V`9RgTy|f|3@D%3
zN%nRnv-dJS`6S}EA4O!+Q0=p^Z4cY=pD2}*53Yt*OR~KwSzF53+RoVC&q&e;DRa*;
zAsk${#9+;1eAwmU>n`WK{I`5l%Zf4iXMHu|+8^s&yCs=h$mn*Tx&bv18wkP3XU)`y
zeBHJj3dJzY*x8Y6Zf4BQWo&Qf?NBNu%OY&s$8mhJEW$@IT`o}@@o}bIPER}7Q!eF_
zix6L~UknCg4wuLe|M)pyw4Of!v3jCkoN(g9^T1)>eTl~P&Smxf%l~)s_wr}Ou(6$T
z=YE%KH`~n5MRdFRiLpdmg3$H|g@-cMbFU*DUCYCJB>(qUi`25Ly!4Ef|B&Z$c#f}n
z{G)dE&hs_zKdlXMtk~I!xpAY(_3IJ$?`LQY<Kr&7yA_foKnOt`YxedeOLHAomO>6%
z4(-s8Wf8;uKGPF5-hKxL2EY2VdDPF)>1rM=CG2g6y)jR6(9*bW3Cprb(+DAKT(`tf
zRWi`0aosXQqdu43bQvCTDVMFs*WjCC3}jLhg&FIc8B44AnAO<NZ!jtIXVh_g9LFQe
zB8<t~J5ci(A9C?)7Nr3=JMA(tnvY>$w|!r04W(SJFgbaKABw-k#b<T<F6(lE9j}hc
z6hYU+vNgCpp(9N0oogNQ;jt|6d~EGe?l=&~Y`U{#)e_EyHre`55xcM9Mjj|dOpJv~
zi2wyCY+NdUB&LgnM+qNIOk%gOf*lyUg}m?qX5s;qWd3u7^`z6ZqcK)SGq#9S1MU6a
znEp*n|G!78DO5bviy2a6#DGOWfI$#pAt>SDll4N(4i~a)2d@0B&5!=hW9o{aJZ`@b
zagnBqR-{;I3pOGf`FR8FF-j$yTFs?abE#D9@2v3Xi$=<PhOo6Bv%Z?}XgOnTL$b4%
z5p^Uok-0S|F<2-pE5)(}#^~OR!eHA8fvc(X2?mBFV<R5pqYjg20wz!UOpLkI`o7tW
z>#&_^3f-<|Zm!MTY{cBdjD>}S$Ez(C*d?&bc~*ub$t@Pk%Uzb2BQ`fRJKKuAoh+~X
z9&4167?TemmZcCv;d_FTFSvQ%Wop{x^*1Y=KOb;vEEjKI24m>8S(9b3xt=lqFy_I-
zHnVdPo7<Xh*F0f{?tK#}Q(Enag=Lp^sBmqNI{$bA0^g!m%bn0&_lpPl!?uKxVy~`Q
zSxuRni)kEWwCa-W?Tki4_4duLtz~J1NYPqiW0-doZYe@k1Y;9Er%w5tKOJy(#$$TM
zqjG{@#UYKX!CJh=`rZ=jdn<%^NbOR|JREhx_k;qkODZ&7TznK|vfd@GU~`c(gERcu
z%miicXdO9H5$o|fYmH^rcNR%w8`94S8nB@2rbs8FOv<P?%v9wyrUxgP93BPo7ju?r
zvP_evu)ZF%u+Zh<gM|6Hl(qGgFjUX@bZBWv>Waoj%F0qiy=s&7gpg%{YlH7vlu9<`
zvY=eHSzpOmTT5BqOldSFI@ON_iS620wuQ<RrgzT>M_{}8v(;C!c;}+W>1mf>*h9F_
z-V~j#Vsj^Bc_n3WF+-&a-CK@-B`Hw=03ZNKL_t)xYzy19G0LE_!{@<5^p<~hs;O3O
zMn+uTc%#JGvtK<Ue7Bn?RGgdZaQ9Bky;}}Dn=ZyY={}HU`DA8!G2zawkooy8E2|Mn
zDoCY4Ye~5znX6_*SwB+3^o&dY;Flj~cJ}hg&dz$u#(K)qdcwheN~fNX#4c&-V?>fC
z(bX#N3n2+Sjqe&<H>FZ_xq8dt>`aME=gUl=@fbh#^;|0spV4mEdq!9CXLNfbVRtK`
z+0u_Kzs4xERtTZ7tOTtU#^jbR-;F2*f^yZSuixh8pv(A}%lXp*Gp9YKXI$*BSWoh6
z{UYBl;rk_C(?6k4k5JA^NF&+T8L8}I8G&_t-edKau?$BuAj^Q`Ae2RrIG8lyAXvw)
zW!M+?QKp2>s`zpgtpq6vK6%trh(=*3<LBm8I(XQ47$OmpmA0_QZ^6vR=$Vf&{q0<6
zJ$4}Gs4c=^geFWJ!n6(khlrsj&Qu9)-a+q{C}|g4Lr8`|-~%a|6io>S2SE&A8(h!O
zS1}9>!sWjdT=^gJ^~V>r1d?T%c2~32ve@ki<TKF_=Ex^XANj+0o}f~(>Fcv8m0sL3
z#&?C*xg%h!B{`_4%--$r;BJ>Y4<)PXl1@kF{vx(T;0prZ!t)J67_vm84HzTHQc0So
zWSKz-L8T%YtR;*LIGlMs<9uE6=4%1dlOE-AUa<9x`py`G*0}{nDT7uJMUqZ8rPVU*
z?kaBFXmkI5m*r(iyKRn~q%9CG7~2pfnr2J0xsh_?MvGgw+H7yb{=TNukw|&cj8*|h
zgKlNsVQAQ8zp056jUy_I3^{ndg%Hn{I(fQ}n@!2VK}M^kd3Z18(?4`rS&!M;O_7ol
zt%=4!7-np5hupbs=<oLkJVB}~QVoF(gEhgKGd`oE9{mI2bK8-dzzv;t#?Efa>_Wz!
zdkHsg#DwjPES5xZUOz4H1g=YOQlT+MlcxDcN{LeW@v4I<!=ouzE@reYm#_p(OuCfI
z0^5GJUpiTrmDU>9Ha_9T(kC?W$y7jpT*8+pyqxR|f(DVJY2Z^PqrVrg=`zBAl_F1<
z_~FzjN6X-lnT(xeoBR9sxjz3X?Uq6&&-!~j?rRG=r4;3*^y`cZl?%KxR;ADDXL5KH
zV{(zxYNj-sih9Fv?_QhFK5MW%FWK76(_@?zRHdaR+Kbs<fV(5$mu%vmX<JwjI51GP
z85?t%n8=@xy`7YMw?jU?9kRBOlEo6!6HrdzARG%BABhv&vvGpF|3(LF`c;L2as_w5
zJyGa{k!Ecz=IXVOfBQH>#uAn0H=%F@PGF;@LG~JI2@5C4Uvn~+OpLo+xDYTnXn!f8
zb7(n|(vV5m+Rj*Bj=6TN&HXzm%ku%9P&`pK*_eDXv%4p`dpF{fKeSm~iP_wFGCJ0_
zC61Hec{aXlQz}=eRP&|OlOBh|wq&U$Ni++K5qIuKEI)`@UrpI-NZK7m6iLdSN7-{Q
zPKptSRuoN=L`a!uqZcB<bp=6SbN)<5eMb|gB^=MERI+<n>c6}N#TY}kquAU|nSGRS
z`)<OG8xhT&gs72V0)cQXJkj&xvjiB0F&SB}O;V}Hj?|TkO{L;s2M%K+9<4Vu!ob)m
zhv0-~^z-;eUa_^>0Je7#S&Pt{CF=KV_R>Y{ffib6)YD0Nd*S7{8ob^Jd1&pyfMw7F
zO^o{pVSbG;P15dPpyL?~eZA%yjuw+D<by;N5WU%O7kz34{ocQ#&)vfGcXN^TG>6M+
zPOmMldc4$TPCr8S{U^kY1DvZRL^uISKSwpPEb<`p5U3#V2>{urh^JF7|5)>j_bkr7
z<Kp`-&dJIcNK=S9hHy`k)Q@IHj}Z#|R^G;>))PCuR$F<hBhUNxB4J(@VW`>KO1S$V
z=ChkI8!I6@>k-Y4A&T+`rBrdL4SHNW<8yAxqtXwq-<x?TNEB?ZhitA#tgkCtEkm~}
zNn%C4k+Hs)a{ob>#mgQ)xKiRrKdLc2?BV;L|JY=iCW;jGx}@3AL~YnRh}qujvbri+
zTa)bXXEd9NFf_>H&xr;VLTgVmZzZg)#C-N?m-Y3C?d^;>&hLR|ttcmxB#ON~!yi9x
zvA>;>w&3+Q0;Xqdf|C8Yj@VgdxPL$8_U$f<iy@mEDZ4w8Fj8dMk?H(tlrpTZD;j$p
z9(=ls>$`|b6^%d}umy~ddi?DDetz%+o4%_1xfaGK(lncrjg>C*vmu{cjagdBmm{Ur
zV4z%e86NR??TpXph)ubc8*ZgEtgM8ruP5y8LaUW$6OTF>JDKKMD`8_JV(TE|?YB!@
zx#Cl;p5UOK+E5SZwlzCxlMEY;KnnZB7c!Oxm7%mD!$zTrdU9e&l=y)yIm>a0ljB%|
znp2_Q8pV$<u&Wl?a~Gf6Hx|$*0{V0bH|fJIjWN(SML8JAo1Nw&XJM|x++4zgImPN)
z%;siB*fB`pd3TaZCGE8)51Tf-n*-Rc!{KdbS-IFbJ?Zf7j{;n~%GkJ{FB`@o-TjEx
zZbqi`Q3Py9VhIbaj@Gv<k^c?A%3L<X5_<}2=Gndh(5WJB#I$!K_P0ZfGLMB6mW8k_
zj6U`^z_RlP%xFWcs>w2g)?cm`q1KutQS8?hTYHk*w_@(zjaXfZ+1t+OCK7o}CK{7_
zN35+&e*baE!+Tv;79u)NFYl5&&u1AdF2}f@U~I}}VA!Ts%O_ON?w?zUwl`yzABBAU
zX~?yk31M3iMVd4<2-~7sb-8rbaQ=*@Z?J-2&NKh-?j|fRhwSbe4h{@aq)3uHQRMtW
z$liX+`mW2$y3ggyHD+eYRI4`bN%!{&NC}&3ircqhKK?_KrIm#JrbfpK;aCiuDKRqP
zGF?_wJR8UHQ7R)%Q}*^???6*;DLP$6w=0Qbjg%QyM?t1ouE42Nf^Ij@dG}R<NWPKK
z@%;eTb2%NnfwTqngNTJa!(MiSRB4bsznrJS%b&m^kH+d@f*9kai0L~RQnU(SRpM^H
z3Cclo=(}U}yn+M{9$rZjR3p5pb+U7_bY7c94R3t;A7dX2O|R84wK}3Rf@qCn*51bK
zo(EY5eZ0%8qn`lu4IBF3kzD>Iy!i{8^2Ez<@PaJSsAdP#={_rT0D%SO$cfsrauai<
zB=9^7$1zyep_})s6^){`Aq+Je8wq#rbh&;r=Chj-&3a1M&IdHtwdk)pOrG{RbFspk
z7XvPw@hSJ^LI?6CltjVis?F-Mpw^eLw3M;ElRNo#LpW$ic6KbHZb}>}g23a_CBgLc
z=jViJw-j5ODf5paHa9Z5EjVZ-?A1dyHx)ZO3Mn};37gi?ZYWll66O{a%gZr$Z-qpW
zMk$MOId?D)O4eiZZP-?H+j+Z_r|O(ZX>tecP$3gTt?XhuhJoP{jw|q<GpRlFLztV3
zxO%n2%1TJPt)3KR&%H*_ZX4Ql1yKS*LOBlrc-%(~#kpypvokJ6=b6r*$KGzn+-$_c
zT$j1okO%it_Un1l&{80%Rvpe<EOGH-z?&C6#zq~=Re>celrl_DJ1j3nJeto~UQSut
z$d}{7OcQpX)s|!`H@kbDVP?i>Y|MHh<khzV2JI0B{c)=036iu$BD*9)qMnyz=GaPo
zZf6sm^3QU<^aih$r<m%m;yk7B9Lr_M8{|y&EZtKcP8*W6K`S{R%-T=vTQP&w%qZiP
zenu*TRMHX74!q9f;5gM%zTBl$ZvC5|Pq=wA<o>Lr(UgSYQ*9OsL<+{q0~qL84>CpL
zKywhra6;r-7Q39AvWUa{e3hzTbi!upw3|;TVoj^7sdp7ws-G*+9mhf{o31j1`uXC^
zwk^sf!Ptnyg|i-3rqQXUm1w%LCXNkRW}dQk9{tuVqqo%i{KP<cmS|0<l`n_x)^k6w
zwe^$-4^!qJCA1qENt8QL97jsS&W<8V5^mq_va%G@Ze%A;3J!gZnk~u3R>IzXMyDgG
zRKycP=P)e2-BxUErOe(BxpT9{t-A>ek8<m+5EhPOF*fdU@nVU~uen@0?@}G~@k{wT
zYi}=MdfH)WMX|IbSz3(P-^&0)nriBej8vwyIw_HM$%Mlj7lJP(bfQSps7vPNVs77x
zn0*kje~_Vp;Q_(;xX0NaSC}~;Fj-dgc{aA~qjW}^q-<<zHa8XPn=xzaDN&SLcJlj0
z)3yv-+cx_LDQT+E`m4RSzHuTIVF`x3QS1>1`yHELF5-9BuA*ZN_z<XP!ppzVw@zr(
z=pI%z#hGm5+zxSmbDk{ph_HI80S!t1O3#D2hf?}3)N$T@KzjZbsnzClg08<@TTVZM
z(tkz$QDPz=-9C+YJQMK9=Nv}^)zk$1`(MGCcO7cy0>oEbNBpu_I>QckvBL<<^mAOS
zSlY%(YWWzek4&o7ip|J?gYR184`<qI|Enc*vdpl(op9$)$ZvkrW^plLZ!bk18`#Pv
zo3qmaKYpi=pZ=oC#DvH2kb@<TIZcueATy_IE}i$87;aN7b!m5ElGHqLzSUKQlo_@i
zVOb87lm6#M>g;W6?%hiH@DDBKAB7}op07kI-5Z3TZw-;ku(OlU=}4B=V;U_<9BE1=
zo1r0>>FI!}(>@c^N5wK%=VBITV-{EAXN1mi+8xF1dmU<n7H_;2P^mn3SF%jeZf7hk
zgv`!%NmFy8F#B9=2g?1uV7n(@=*DQ2j8V#e?n~{EmBobL|7(l6#gO&QlsMM(Y`_c+
zx?DIL@Y7%PapmoR@i9fYVk1Pr;ln*M6Y$1s3D*Z3xI(dikWUy6MOzeU=H|L&SuQ5u
zdk<<g>xr=RYEa?A=nQ-2ht!GLZ9HJFv&^n+KVRrP-5r+0yZwK~FGl{FGh;PIhx)Lc
zCx>8Hc#L|d=${<mjp1pgx2pJSW$x{L`i#&S(`R`@|D1`@VJ1%xbJiYbqBO){t%m0w
z9XE<$_L1bloMitXBReTdQ>0L8Kvn{kTZ1gy#;G0~OTOSjSr(j{3UGWuc{pQtEkkZe
z9xf-`Sc+-4B~f&8<U|nIRQnv<FPIpXDh|_U`|vA1=PqTq&5Wd;aep^vaa*#r1<j_S
z-To4a{5fQqqSZ{9yWipAY{I<-!`6CAV=JZ;Yr^y-zqFhrF+6&d;CdNbs}bGS$s*@z
zw9XU2cDw4CV;f^gQ^n3s%GIk8*FTH6c{8GWOsv|rMPHx8n{QV5`@bJxYSLqP*ui#=
zq8?A54!Clq%IreS?RycOj_e7YBX)K)ohYO2#zdaS<SCEpmniyNuV*YQMBKRD=FY>A
zW>@8P41x1!Tz>Lii66aRW#)VtSLD_}%MxJnadB@?vbB-0^vK}aijB=Dm&LQpaL|-A
zJNirY=hM7^jByr@<x=(fnHjuDJpEI`aG%Z1CHD8X2}PUaQ1x0o8;M{nkiCF#M?V%G
z#?3&qP}U08nX8ER2C)|2!CiS1Lxx17@E9mt%nV4Tehw3VRmMJZiDsqA^~D`F+7Tfk
z`uGa;bIy0tHeGHY$LHWJ7yKq-_RkT!7qHSA7#l3`1If^c=F|@bum3rm`?1Hsq>b&r
zJa1ovKvF_tFejMEj;q}~NmT9u-;Fd<8FF!UXoq@rXtgBU+bP$tce!z+%hFQJ!GR>}
zz1%Ged|xm!;_~{N0dHImICsvcug`w21Fq}j{v)|pnP8``Sy)UtIM9!0TuEZs+sn9n
zw~Om)97l5IOu)p1e{#s9FbEf@IOwvAj3r5$J4AmGN*XqIQao4C>1axU&G?wlrAsas
zF1QR2ml+&#7#KFVULJ9HW<qfOti{zkf`{`7yXz@Q^z6$wO*MP_85<ih>&qeKz@oqZ
z<RL(a+)?=4g@9(K7tNGuWSp_JE!o~xD0Q-6vu%sf(R`pC7_hM&p7A9c9<sS~*=J<j
z<9Y6D`}>mR<&^6;L+(Ee**VDQbn^o_j)mt5rl&owyj|wfrGV*apGrmbtf+_gI0S*f
zvEj<wRT3%KYYJ9Y5_Wg<K|Z%$8Md}kZr<!rtyqi<I!sR63=ZXOaUGjlUzyiAhZi{P
z^qpb#V4j=xt8B)bgepaUfn+ln8sR=WolQ=SRKfC|@iVZnaD|6<GC&e05xYAr;v~hg
zY=kH?TAJii?Gms1Z*s|hliE~;{^1Ivc8#jz<GM#aPp+F=yw063ktvH#sK{bT7D=}E
zGzazEe@Pj;CvuKVe6A}P9d#HUcIfZ-u!Qx@b(|P;IDO8iHjsa>TyYq)1-9>UdLlzL
zQu?L@)~Lh%yIoe6P8K>s<Q6p7$(@{^H;wRp!SIMjx#BQB;bDgg*;Nd;%M8xN{QmbL
zt=98}r&a=$*l6|qiAt8`7Rilu#loYMNAr?{{fxMkp*Y!}>FB$Lg@p*)wumB$WtqHa
zu|C;?d-VIEQn9F1o=tb4q+x44X7+x_%^M+e^D&L4dg6HfgEl{Ux5T^em$`5;pjLIB
zQ(w{M+?m{WX?-K1o9QRUi!3vAnu@i1`;=A4>5?IRtHR8T_qmh1-Q9$T4?C=^#<|r+
z8f?cR@C0WrlzI2PeomhW7#w(ZyfMbcb_Au8MSm^#wTctN@@o2coH<OA+wLgh*nBC=
z@^M~RYFtnFjQOW<r+!ZV&?L8S{R?-xzh;Y+BzM(48Exf$JBOj?#|8_7LeYZB>oB>3
z`$2}ca+#2bw3nTDplb2vg@_;gt<P)!^APY0HuolI?JX0w_lSv~6gr3JvrN8RbzFF9
zp4g_HF52nB+Z$NpbGTt2cDD~?1(c12A*iHGyq@v?|Kf7-XD&lS{)y|WFA`%pB=#VQ
z?P18C>a*ja@VP&P<3K0U>^EgE=Z+w^=Db>tI{W(>v$GK&ebnae-H28zd%{F5ghjcW
z4}fp}pu~mO0)~e_zk0mu3fz8=TEB<m+pKTLM6se?e{$x~=_npP>=K4C&1Q$c{L3K*
z25d^DXOqzdW#}KZ7(HL2ZUik6(cDc*(=VQlNYxWMo}j<qWopXj+_@6J`jyAee&&%E
zptZ>T)OtCcE?IOU3va?jm2Emrb)wKwD)&L!-HutBw-_CDn4USgpsni)YW*I6_I{1Y
zvw19G+DVD_L;iR*V!y6>Vam^b*Rd^TW=g#ER+-l>x%d@9^pq8=S`nQ4|EPP<AIp+7
zz3&(1xNFm!%FMD|)!t0c%=XOeE@!!1QX&a~fJ8|j2z}I_B?tltNFPW+!h#ZIcDcLc
z&W`Juw$;_;ZB}}7?Qs#I4{>k0x|x-kRXv)0fJB*d^W1ad#EE$0jpupZMa{(c@d}FP
z&kO$QuiE_PHy!RhK0JmDC-93`BHsUA!qTOXW^-6-_eE5ynm6BVU_`*$rX)>Udx6dn
zJ39qCI|btn&4sCiS}oWMbd>U*N;l#q-k4Zot5I+}xktCyreExm+7jzdE~;yt;m-CK
zs9Z8PG09YO0&7QC&gq+!=lyl=uRr3}y*m_*T|`x*^#qrjAM-D+{7c@Po?~I+<kIj#
zpqQKt`QZ<%TzMm+UqF8+rMuDR*Pj>UMM<kwV6yN~kOQ8}x3Hji=beOi-)$g6MgK^e
zyjGFSO$JO%27BKZ1d2vIfF%Vu8kZH7g@oOmg2xY!p9`dbNco@R-q|1!jE!l=#t#4g
zRiHA~;Wxj@M*iLqu9Ou009ziv5G@MmbYOK2o-bQARx`T2lb`Jnd2V_5u#Zv@1P~0G
zw8&2mbd>V<H8JrbKc^@xPagL9`tufFeBNh$^TlhKoL2nNpVj#2{R-2Q!ARSJA!eom
zDiy`k?Sh@c(%CsYUYNqLd25r~tCETf5KgkN5TZ_47q72p+`83bWu@G+n+Ov{(g?Wp
zMvV`?KYr}*3IVm67s^~%h^f{zfhhS;KX+{I496KicD37vUe7<Hv*5MY0I29H7m|x)
z(|-V$1li_avfJ792aWW`fhS4N%fV+tyLZgW7G=?a`Tv0Xp2j}@m}=)LS7u6X`~cqg
zr<(Ea?|0lrb&?-{@Xu*XO!1p1zu-ynkahQ*xEm7W(to$K{yT@?7g!(o93Vy?LahxS
z{2UuW@l8pb&oCa<dH;_M@BE42;tl_xzH2p8nx3S%c@bXy1I;GP&3Q8N-&ZU@Ex7qb
zpOxo1y<Yjkz@arvPQt~DlFOH09^@QFwW@jJjT+0#mT$fpP1Edl;n_2I^wcoFRI+$M
zF?M8botOxCQwf^Wg7>b%<GY&M-}L$Bs~)|cA<Ir0@hpsW8NZ<U<i;FtU2AaVO2Wm9
zLq64Tw29cyT4+L<aD7a&J6*CorpY?qQ)pCR)z2(zTP58Q!O)>gQLr!{GS>9p+3y7G
zZffp5g(NAl)*f;p-upcX3pIFq1}<NMq^T%vc&If)EojswVYr`p8KT#<JbO~`<!4=P
ze%)qm?ZwF}N#Mc-xOfpRU4q)_xTPdj$^244<NooZ_Os_1zx-{B`OB6|R~<*UsD*%P
zRk1iV&L_P;KoHR0{f17li7}l+=aNN?%Ier4#YP=kYJ;ccZN7T+OA<;NjknNxUsdG?
zbj$tqO@8t83+`@w4imRfMU%1qH9l(ogzry&%+-kr#!gvAB@89=^ATg?0i}h`u4a2Y
z;O=q{{iKiRlzVJF%RcKwE5SrVu`m~K`BF?&(Jy3lLM^Do@|cXN55%=BNOZwTyHei9
zpd^mHO#M9e7eYyNtWhVpiA!w>k^-rZ@B5XCWOg>-&9`HeHq2juC(jBVKl37k{Dkdc
zUxEduX9C`Nze>IC``M$%>pXq3OKYb});}CjF3u}Hd`B}ot%;(;_rA4N@Z?F#FMi$Q
zH(z9X8O<TI7R*crTw6-GIFm454UhFtI`n%A=EpP_$2E7g_w(NipM->@P97*$cVK0$
zWMi{neC)+6QI=V{UCYXf<@s~y_eXtOf%ls`9aUm-I^v@rPOz4RJnVMae3H`LI%8yW
z1g|~NiDW_)CfLdMka@y0^NjUujjZT-5?C>K2+AP_b+DW?`*VsJY#(Vi2#5@h6k}4D
z`xHbErz%u;r?_z=<lR3GS^8(1>eT)Ns3r~Gz4jBrxIwGy$)U^XI-ylyC4}WZ0on>r
zn%2%MB}OT<oPel{x&Ap;8)Qc_Zr)>|ah<n+DtPBlHT5M;Q2Fl7Y0A=)<%UueSXGQP
zCG(zG4krxG2~4SoLa0_bF)IIkg(uWHo<7dFb+gaLdO@0wm|zu5PQZnE#r%AD?6%Bt
zND{@ROBLqka)O{cAORk3-+mufRveEX8!jvsj5RckBLQx`uBq20ON)-{7bSORAPgj}
z9mC4=?8MBDRF2AI$>KG|4?jtG|3;0)#b`tTeQ>bUXsK9eShlAFW+pUS+a+0cOrVoG
zRyGWsqlDBWP*N~Gp_!iW?bzvP@3uVIBTg)7=AdvO3?TLtep0|h0vE;w^D~m_q#j)F
z%Lm}0MD_lily7hLx&NR`r}N@<RuY(>6U@&Erl$|PFArt7-V|>C|E+Z-iC|$#(;Pea
zA`C4V{5`C#=UC_X<j0C$R};nRkUfMDkR*~B(cpvhLsF-CWMQRyhjzbD>FnM%marO`
zS8>APB1c#5vSJ=_bL}@&!-(0%Ii?w>8hSId+?1?zcDS?ln9uHi!!!2)QQxH2zQB^a
z&L?9(;(L>Ca-o?Fg2b0YYr(|Ceo(YqS45GbIbIS)*`B}G&{2K}B?a}0Vro2Kb~d6`
zKkIbi9mte)M7rRlHK6yIvV%;>`P{Unbm+*SP6%RzvZ%-))$t3(IF?LIYOY?7sMQ^p
zFG{|-l~I_CwKd0fas2!1`-b4cg65MS*O;F1{r<}@cL`(5>N81eN8^k`N{~u&<9f)4
z@5f9}1q8w20eW*Y=gyrTU*1f)bN|K3UP-~!WXR%t%<Nc1E!KO!MZ-26^*$&mm~JTM
zCjx4TBG4svP{PG?01|SkSl_ZdU(H!t$p`~TlEXn-mN~Y!3pO_mo10#7HpHF-e7~U6
z?h{7hRPM%&W<aAEaDPW~XA5j6Bi|`0o$|IK#fx>kUWV_is$-)u&P8>dcZ>fFV<x!2
z{2O-76UunUhmNU6)eR!Dlo{-0eTSKqgGw!>AW5*(U5dtC<kFv0N!D0+`_Guaev#^U
zKyb)$SOO8_m8*QX^k2}r2hW#R5wZnQ@9?>`^@T6x2@RJ^O6N#x>&VN$BoTKRAOEj;
zd+9p!-w&xR1gO_omHZ^cv7*w1thqz4(!=i7I7CKfAi`HUCTbze7@gPI-GSBB!yWPO
z3)=0Hm6e>k5BfZKlF~bd(5RGPysnvODD*i3x+oG%O(~|PG>t|;t5uSwhrcV&Ev;6;
zvxh17nu^64#pJjeti%q!zyb)VCYo!Pz?KrJ1i$*b-NBaI=u~zjH6Jx+_~C^bZ(V9I
zH5Hs{(02k%qEO?SnR&tL7Hn^i{%o%Y%gfMeoxW`jB8WO9jWs&mI%Lw@8CVTj9h}4h
z9W=XylzZh;P7~w|3^7{;PoJi&tmb6t=<TsMlFW<;#6dv6uZbeTkk@OBmjnla+>@Ys
zX|5sAj-`3cc=N#fDocpk;3Q-XvP`hEQ*!T)<>Cdnavd7Y5$zC!Oi$1AK^P;G1wLE(
zOTJj$V!Q0owf;r3K}u0u$I1OksxSK7Ro{}eV>Z5=;|~_E@dr!ugrTNwTl^~fPkdE=
zP8KgiSwV_-d28nTd~fVS-nrUfb{h0+7`dw<G-KG7ek1hoCiw3j);hXfbHKdtY{8BY
zDO#@}m1W-w<b2RtFgqJD*3=YN5-PPWSj%T$89H5#eSd>MFh8%jab5HFb(op)L4LEc
zz?H=@R@NmuTb8_?6Gf8xc*NUpC0u_ap?Nel46LqZ+_}@H)f!Do5z_k`#Z_-e>-&C5
z7^=OX$$O4c?`kIi03ZNKL_t)QNGbNLF?>L#XpRNcXA<IFN4A|G+FvdT%kE~z$`irE
zJC1s#$<);0K&L1y?RGgbOYM(29^B3N>{ptLS2feKqsGe7cw;``Pd|##Px=(gEw=MI
zY3^9xE}5DMn0)CO_VJwsI?9EF#Te@82XHGwu9k?nL|oX#N$WE!R{FQAz&G$Pz!?S|
z4!_+c1ZauV1+KD*48FjOmvpaBkuE4ybny^R!dgL52(qmv=3WK)?e~cuY+%Q4Vw(?f
zNgt<&&R2u)8)lM}^WSU55ox@|lH;l!?B!?V)7R-={FrR!0!3vSr7GWLbM7I;tIYl$
zCT7l!p%dw|Wv@aS300sXM`Nr)vw6N+UP=in6-l$Hn4XrDr64^*DHuu~*H&^KRu%7m
zkdS4TAUK+C_hj!NP>eTWVcya18XnvU2t$drqgN$bN#-Z&T$yb!H4#y%obE{r3A(CC
z#uW9YAW4qrIpjIC+vg8@O{pldU?ic_r|tzV64*%L<mr`t&iRRMeIw`5<36iv8AWlV
zgoLo53Y>J<GGTKQ?%lIQQGrt4A-XKR#5f4NPmr~~{#BkE%EIBSq~AH7b771lO)V?y
zmM5#0`HRpP@j0aw)oPtZ6%z+zxMGD)=P{4dC%9~#%#|2f;=;pywxnQ7ZeX(e6sy0b
zPRgXq2pb`ra-A<Xf6KkrZA_j~(Nj!T=J;^-Lq48;lMB;Ls@2z17}ptxH3QN;BZ3?W
zDpIK5QBhX!tm|HU=I4YM{EWP}mq1Ff#~T6Y_Y6CmDG#6b;86-DK%o3nkfqPAn}8q)
zSzHXcb~R>h#uM@(AP$>MPu19Nm2}z#c`GA|74`9m+1ZH6$-_ZTmianv%gZ?rALews
zCud)KeaoXqJ+`(LMd1zwI>uP?+#sbO480`2EG@e`md(xmT8RoUs=$d7Y=||Av|qBb
zUGV&Q!Nn^jWoeOe-*&+mN0yDY4H%A<4<F?G@|S{68gMz4jE@I<wY7pk94lX+nNWyp
zG3z%H@@~#{mN35%5=EnVZ71P7o0+rig6+FG-~QWazWE!4i8}CB8)oi7)Cc7-eFdfW
zTR<BxML$FiK0s6+9&--UX|ZeW@Y&k`fv%=Z*JsdbzoQuA*xfZe`fb6d|5M4M=kHUb
zbLcDo8~SoVx%d=UJFu7TfI|78DlYxMQ|+@$Q3;_%8bPHKB1C`;3!a+WbhiFAvi-*-
z6W?bpUZSE-NfdYm$kY(-LUnhHN-w12+#x52Ju<Qhas6?u6BIym3}$B`I^JaU_ZC}Q
zIX7>%*xbyI|4`6HRtxG=lhns!)GPQGRjaVD;Ddp!t>dn#;IS5LZyU0V6Q$bVc`J#A
zB$C9jrYMf#SxHb63N@n<;pt}=DTOao+0fs4k;;B+jGbjgUiQG|kTwAUPNK9YU{)GX
zZFq(GX<@CG1}`t?+<WAmWX;iFP?iww(kl~|pEpR$f=ADK2;n8`W$DYbC>0?GqhVR5
z7*k-a!xR#eYVO=V5an6z%{2%206ys2HHOWyB!7u~yb{8Nak$>SM5p~z)XvW^rpJ2O
zIZ=A<*r4PWJY3nptvpA}$Lv&Ee7o{3Ynz+s-ErQVxx^1AzsJW5Z}Z0N5>cQzs3?0C
zw7Q1P9YbD>zDB7eQ6nO1M2PR8xb5qPb1`K(hc!JI6y;I8o=jC#(M-%%2<od8dK*`a
zAx+}5=Q_j2+mJO0f|#YH3YRX`iK6|*Z>8dSOcN6tYa*<z`f5Z<j-2S*ZNt;2DUTj`
z$^2;U3pfi|-|+l#kH7A831dCz`{KaX)qdb8rJyWRiaaOlY1UQ^&mQ&ZwF<Oz5cDX6
zE~MjNJ<&ZYBwOu(RtM6wJhKVzqo)P!u4S_wu(knLuJ{13R@01)=@+)^hNx5|GqVwI
z{on$Xxk*YZnVSiC<8sJ&<81x$wFf$7-;%dV?*Ghj^Di||ejU<#Izbe_iw+80)nPAx
zg}rbGC&m6^PmPGX1q1HP!D9|5a?)apr^{bZF#(nS7*}WCWnt<X0R3&py}v5C_5V1Y
zeG$-WPY}8~F8?t$b;#P^Li8A`dwzu|7-Vh+1ZBivOKUIy2#1iMq#Jxz(l0kK?Jv0h
zSW_)?%tFp=<03WPK#K1!-{Q2yg$m^YqzS+k$bpHX9kh}Ja027>V9(WiX|&t^g(-@^
zAEe~6^egMuuBEjN`AHcF6CkaoT8XIE&gVugr635rlB!yb2m;Gt4ck8Q!qMuMtgWPM
ztcKKU>ev?+2Hi$L825>5EqZC-gZL3B%aSrL4!OIY21@zuo9}w{Eu?p##du>%-2N~k
z#K75oc=!zGb<WY=E!f(~=ydm2nuk9m!9;Xgng@?_p08ViI2-)F#h3yg=oAPcaLx^a
zoIxEdBQS+xYy04H6-SIf{dMR4g0z!i%afy6DJ7u{xiB`3S#mht#aczW`GBI>#Ds%!
z<_L0^vTar|WywalMP<86(JR>PZla5jS#gCM&A0e?>1`IqXQ)K4`qB>jvv1ch5G1ig
zo$#&*C0{wn5gK&Gmo_;HDffR~6-r8~K}e)?pzs?4uYOu!V8|Crq97*LRdS)R48~lm
zpiIE%fyIR)j@2O09&lom*yA6a26^e&?HYD=4LduA;+SC6SjWa@PL`Lbrv{}JQsyry
zsZwA}iOChcuA|fTi!KFN6M#q#IqH|WquaJ*=`eG%|6Ydpx&)P=PgvPOc0-P4aC?16
zX$<mKpH|DVyd2PM`ZgMy4H=&a7z-`Uil8y(tpnoNb9v%ea`94?u?gSzs};fcxFR}(
zD>8fsflkpaX+Q4s<-d>ki~k{^=Ri_Lci%$XpM;I86hHl+u?u$wWgt%IiqiRv%0UPq
zG~}ku+VU#JW{=itAM?R~wHN4gHymI8Tf?ot60|lWtdS(d^mjhNcADrb>xl7PoJw)S
z0Vq6@7g0w#)?TR!4_ma!iY|}u<%q2vR1~A*m_${-(?G|>lCq|;2PB9?v3P-R&0(R8
zVc_E&?Cikv=bo35Wv5rE{QrrfaO~`qw0EKCX>54{^S-Devw%vJP_3$SWi|YZrHP`5
zAV^TE07gew21rZC%5smDr;3H8m`e5K&pn7bB=vRF&IF@)1kO70c23sHup<;rzYhqa
zg1Fu%ZyAbFaiD|TKvu$8Vl`)>vzyb}$|#Rhwpa~mlXeR2t&HQI4<}h#oa$m6rjt|d
zWVja#${m5v9n6ePFj0@e35s5w<>!Lkw8RDn#+idxXbVzXuudDP9x>Z*kfb4b(P2zo
z<wpDt?@hhS2bZtE+P&<-;M>J(tQs}NR8z6FCFs7UZx{s?LC^#_!i8H(FT;Kv2qlcg
zP!0Sv@w$SXgNS9Fx)!u#L5lUupfdJ9uMx&Vzkp8vWb?za^i}9t9sbWy;dB}t9#1Vm
zQSm<qzoW49Tg9GV*+E3W1ki{&#PxO5&Ll_2HDjRPcRYB|=h?H2Z@<-hMEcrN%*4fr
z>y45(W)+ujG?<$gM3K)(DJ58(4`Ke4w{#3%TcDF=maVOV`#*Pl{pT_FeyK<uhth|l
zsG-}J;PFr3s}!d1L*ogCEu1QSk2lJ5Wdi$RuyGJlLKM+cDa+{{KD+-bvYknGmM^pM
z^)%0J1#~)+o)sv3AP|rsT1%L}`)9bFanuKYjg2?3^t_z?==U9zo)4M)#&}bNL5{vf
zi-)~CbZ`Ifw0g_buKp9oDvJcc#OrF>LkI`zsi`r=SY6TWl$6H1=~w`1eCiPac@^m-
zT0pZZnHtlCr(99|KA<ceoleQtPQmI{N$&(X^za$Kj=MW;M#NahPTR26GB1_;4+jLD
z)kxb@m~wRO1t|r!W=MTJdhO*yhA0Y8sLu0@v&cRV{(hR4ho$8zgRqAVDkMpRB$Pzj
zAw`BCW?ueutaI#k44b<p#WC%vlwak|T?n~$J!Y(-sg5*8J92L8d_ADjQJBM-CR<vH
zUXDGmYL-$kJsmMSSvlk~d@=&0tgtk-K;~f8ZeljuJjpgG-0_o@%&X|EMyHaI2RXHJ
znj7QS`IF1<b7S!pNBBb+_%02WLG7+#bN86c*=vN!plJDB&izX%An0OUKv7hw2VEvY
z!B}nl-173Qu)eTm?`77F=SPuQ(oTsvrp+Wi!_nZ?c$8&Ul5X`W`y={|&LHSQkr2rW
z*RKU!x)d^ZAw~!4#5#1~=jt@G6o$RpWm<Tn#(t-u-}M1diJ*&OtQK%_JYsq(B1sMx
zs19n1#-*6#=`_K8kZUKu<7Mf2cteNmo^`aga&|+@or<9O>zw9Tz}T2(abB^spqX8W
z8J`FSJjnBn@UI@|IIyLoyKQ)Mv*h!?mi*nniRice1yulvqmM<F5m7mdd-^dph!NL*
zhMjlVq=ie;L7*c%Uq-nXdx{(6!iDp*Q4o^3oGg9Ht$TOa{NfTTU)O1WJ4y5~#P!sm
z(1AtaP=wH(#eDULkcY^L4Vb!(t31Q0%m+GF>^nG{1Jd&$hQ>6)*Jtn2rJHqGdH4)h
z^tjTP$4yDb>Q$7`sMna?5dy+cP^(DBnvzCM@LYi{4!U((jLv*pi3I5+3Wx$n6dB}6
z>ayQ67~>1iwb~^c+Xej-{AUEOi@7l9TFN0uNcRuIT4;AIt&Sb33_6HFKvjV#D`Y)`
zElc*+oWlAaClNvsC7QT$zU?<51c4SWX0(Lyjbr7Yda?H{@k@|{{yfLtEyM7@T3-vu
zS+_^_L>dTsC>^4eBv1k^?VzTb;5Z|{gK!QyUCVBJ=-~Y#eAZ2|xES-JpEOun2$`99
z`MHNdb1$`|rFSVF3?`V|lJ2CK?7*ZV1X?GIO~k~}Y2RUm6pER#7#V3+-3GmQi`MgJ
zbox7(GQ&uRJ<_ja86vYPJ=G<51=H>Vv(-7?y0*YfV-yYgyzp{wAxfmQ^z(vtKczh5
z7U@~xa);S<xC5nC5C($2AG=Bj!h&jGsV0s%KDnCxXn0SjUixCaw?o(B1kQ?clbvm0
zDKmSlyjkEEHA9!H^P)%%?X8r2RG=eE2zp=x!a#8STF8%oRO9XU8$^jFO&Lhchsrg9
ze}DboyWN6Lw<IkErS-=GDTuY8wUyG|_F2*l$qt%WX{LgJ>FMx=LYlgw&=tk_+&ELy
zimgX2gy<jJzJ9@RV6f~OSb>$j|L7CPo&^5(4bA&+hrIb-or_nhG{>M4tAYK%+1m4!
z1081_{q>yH&kUdcF98pJp$JmJa0vA<_)6ajs9?8dDf1Au6~Uzne7ptCCxaQrt13py
zy-NwX^jk=K85UoKynAN?ck?o4WrA=sqUif>76X=?9(|yKAS9rQd;T{0|NGw{KKe`a
z$A5ug3v0`PGcx`=f`Rn>pyz^8p5St@c8?X1E1qp^@bA9;8{W@yKDwltjOJ+QBNm>o
zh#*kJ6-Ag>RA>+{l+;iIVx|AP1#$-~t!<)BNiVPRs?y8fHM|#tXZ#-r11DBuJ`3W&
zGSMiA!<TGXIDyF(Wu|fN<To!5q22I*z5ty;*oLBtwVL)$=C^OkgtM*-LoJwWDw@^d
zWHIoEiaLIB$?9N-fkA+GT7KD(Jgkl88DLsVl0+knfzqe%oe7~oK_LSAl=M?eR!Xdk
z@Wae$<mCt2)1K_{t|Y`78a4HTVrBHX9pmE~W1U~cx}n@N#94(Y;uknkQYeB@QLUeS
z%BqJ6Kb(JqSo!qP^Jll&-oD3nlGBY2ZyA`Vi&Hr^-=XX~TD30E%1yp{a*wy?9hYWa
zXI96rCzA?PYAvGLCaPWKurJf=g-k8MR*pRAePsgZkMEJc3)LXi8Y9l5masrh7#2*9
zN$OR_*7oRaZdXdmzCO_z`6L9fBCcu5p23XZ%~-toUJIYqIq$AqKeMcEm2^k=g;7S(
zp9G_kk)S>nF*cP@tpy|%O{D_<eKqX+R}B|50nMhNGy-cQtP?<n6cQyPiiL=xFoSy$
z<Or0IL_$z+96uJ_n3NP(1NwIbo6k70p5Mzbl%?OgZCPC_x%ohF`I_aOcVn(yj#yd<
z(PyM4yi%Z(rk3um;mN0#+y6mu=Wi67kJMm&Xejm=BSZK*cfA_6pP;)EX)Jc(ksq}x
zJ2;)<bbeUwJ)F!BHk^}48$oLfR_4gReVg*;C3LTe$n+qVwfK<hF!4|jLVFh3u0y4Z
zXtt0GU&HugoHIBvh&Yc*-R&S}FltM|!ESGxo6mmhNpUj7OuvU}Dq@wO#Ov85R7wy<
zlIDb_KCaM#K%@ucm`?f^VgIr)K)Ywy+VLJ0uS>r9-C@WuIzvH|p<w2<q;!U+izk1~
z;cMqO1I`WkW}^oK1M~zG$DQ+F!0OIFNGOGOstx6l%YS_j+}9+M<nq8EY_<PUKI`hg
zZRqNBT6wuA%Xhn@y>kE@hQbw;P62fS?JWV$j^T<o;JXl?Mk-*jKI3bp8O^s@#GQ6d
zrdQ~)bNEVBj*%IZIo3-0vcqzJnNJ^mjdl@Z(KJcIpwj&7k(LWUXyFSFACoy8xO$+(
zFf%t)e4P!Z7;g6*tU0KBwtV;*5mCw*_X^{rv(8sYKVci$KlSrjPehR<h$K3a$jlt2
zxcKu6C<6cUlC{r?NR41Cll03GCmFtL0K!`U1c@dH713UeMS0-ITV3q`d)UUq1&BTH
z|L42txe1ND7IEux$l7Mk){fsQK5k3@B<cT9mcE`@Hn#-p+kMtI{bD!oTLJ{*6Pjx6
z^nLM_-te8Bf`@l<e)ex7ZvEey&bHXAChkdsJ)nk9<PEb3gNAex)t^SMzYE`Xv1SS`
z|C+M8f(f?<a&O^f<-?51kSik`!bYfU9Qo`+_|;D_%O6m*FHxG%Z`A;nf|L%Lkc2wm
z&CD`D5)f0Pxc39H&1v+X{IBQ_JCxxjPUSB;4m+`*?TO37$A_gV%r0(cgO$SY`Bn@2
zeu0c5=HkWIDm@QE#oS_r`Gu0?W=_9nUtZ*_sA7AXZd;t&kn48`hkr^XVD~ZzMNyLH
z$C(BCmFnwI9A&v+v#m+9)4oU+&vh9NC?h^m40sBoxU*#hb^@$I#)8^dNMj;;C5ikY
zI0<<jAAuaaz9Dh(Wr=n<_{_d|U>HCj&7$d8k~B0)EQ$2lrbXu*yB*8c2^<~c3cBSk
z?ZVJ2CtoN@aC!^_obT!#@NG6*o#Uq$$4Nv$OIbFyeg&PK7eDSD+`OBtYq7F>pTAux
z&_$DJaf8K0n4BDPY+h|UyeOd8hddj{6cT6m7=ABYQm7!(7O~e)&Yp4U8p}#i&^xKv
z(<{Mm$#we~51;0&onS+8ni3GB5QdUQBRCL9jD`?iVWz9_Dy)S<D%v_GS0z3>Ga3%a
z%TdJtqy2mM+{8<coe$A?z=Re6#y~m0y#G-`zbN_YR>{g*NvBheT(k|ts^J)N9GrFZ
zcXL(>L)IziZW(M>@b-H#*KVA?FP<yVDf^bZUGn&6j?e#6^YmAW&dPoV@Q+0i5@JzU
z1R4dD<n(}mkN{^x%I+lc;Rl3T5;h!Z_*;7QEvy~dQ6Jpb_1qj;R*~&#<fHfD&JVCp
zzK?Cs<H}@^O|lqrphOL5$R&EP9<exb90Ey*=uJW%5ikEC@tlUGFUg`ObjmGkIpFE2
zfdqXoyX5?q+3?uV=+If5H0<_Qd7Kxxr%gIa@?JCNLj5AOTK$Crkmo@d3g%`*78V8L
zQ(by}N2m1?*1uKcsp9!^#>z^c3m3wdzO>&J%F>b-p4-yz8BAJ|R5bNwNE}PTa2PQ7
zwzk$$mPhu*WeGa<E1NPNlxuj^EAv?->kLIHeOgyozqN$($_h8C%?_@ZMng$K5~|TD
zS0{acVn9Qa5~t+rorCSDemAUe^s;_%aQ$T{f|Pz`m!ccsj!e3?bd<SY$r*cAdAToY
zTA0!o)3prRe7_-_m6$xF=t|PvoFY3z)^FrJeV34gDk4-7(_<6N&P?-gcM_GZVZ$Cy
z9=Y}b1J_ZK+7^X-%+2oSglknktS@k*GS6hFNM5myi*sNNSgUa^gyU**J5N?Mc9@wv
z-*{nxe7I%!ok3!pA$4tXS2A2~AB7MOA>G+I9$HYX3WRXvxjB}j0|U<FO9;U)gLID2
zmZ+C_I9UTbJC^NDLwV)k7ar~3NB@4@v2$K;Ac*UVH{ObH$`I5I4<8h)Jk8i`mvp+m
z+WN3foGP$7#g!qLXzwb9Wk`m1?SP`Rbh?h*I+PMf1l1-iUDl^6DFNpUbc$|C`%#~}
z|7XOn|HlMpJ?R*Hkkbc3A`&8cgNsh^8J0e6LaHPL{#aTedGZF8Afhp^X-#gCSH7ae
zU`D;qPN4DzYV#`m_NSN!A5-pL#hGwmx(^ydk1i5LLY*8nVCeWQHR!Uh(}@r+ptkx`
z#-A(^EF`o-N8hxtrSZmrN#W(^2c_<%+&`uUSq7y*C3LeMz1|KRPc+Z_DbZ|5bRi;1
zDz7Eb3AA8-TCucXnVQ>Sdnb5#po6#9fBd+|(vs%=_g^Q;@oXpxORHV*@JY$~YDRyv
z$MkH><?9V5CxZduZJ1>+2RJ$hxl#qhy8~%wgfW7mc-3HMnD0AaF(#}p4}kSSl^Mll
zkobZ1c%Fk_5$cx)m+qX>?DJvB(K#E^s6(s11|y`TWoGHOJVz%r=e!45`e%!R@`x|T
zKwe&U0{UASMeo&${r#>`O*FF;73yvR-JPTu;h207Hb}8S#x3`29&bITJ^2rDjf4+X
zjpTP^i*DT@TVNEHm{+6M{tloDh<6|quU+n~wJ#*=oEaz%M}N*)DEm-$;U&fFPef=-
z>P1RuP7dUafvvTY^_7w$|IP=D6A=W0tJg!urUlh0n3~GC6Db}%?vv$)qS)V(wkpFW
z+mJR61v*1(l!GRZhJgcfr{u{~N2_hPcvbW94`Px;zd(>4g);{_t%rRcd?xtSpU2$&
zrJ`qsbSHy%7LY{5Ku$`IB1RDmwlf1F>VPGsjUpzFB-QDZt3QbO=)Zi2Rz2mpYw*q5
zFL{>U_wsImFScnUq%qw75O?PfvCrQ{bZ3e8%)T6!l$?@)2nfg+l9C;U6tj0slMN!-
zsuH~QUci+<9izDM9?xwT^I(T9y-6qTj+VJ=3vqGGF^!7_rD@S_-Q`XhQ`03gb7KS9
z`KuX6cxAn!QL8aCzQAg=U~O>hU@l}|C*x5Ru)Yp!YhHm;tEnS3!hSbcf0T3YR*z4=
z?elasqwE*lcw3N66eLweV?cV-T2iZNYPEnk))-^<3CSk#FNyUj*uz^_!>y#DtogJU
zZqYdQ(#1|fR`Z#>BUurtAevA_Qvw;}oTM%~sV2;541=!VO!rV4L946jrs@>gl#;W^
z%SB<)?UJOOP;XC>mf?#ug@LJ4pdnJn(mzH*N*Eu9=_yTrxj~T+PxvCz%-6ixX_cgD
zNf5|Gve(}i^!q(_cQ^TZ^EUr+<4c~lzNK_ea2RA6A=5f8NWF9X3vd|Qp`R`D=<(M~
zbYrG3R){APDwWf%WKV;k=FS36r(V%hRFNVeRDS#FyKdPuZqu!GD0Pi<izQ6pUApu0
zX8BGywekEhA=KVjG^*?Y@EYlG`%JeX)5aV*y|E?R?RB<VJ&H2nRp*vhg%BatistGi
zs05msam^cR5$hY7Hv`=)d9rN0C`K!?Lhm_YIayK$J#Z3NR7aAW%F@#76|8R-Jb7NS
zFs}yOwUcq?KquWSSiP(H?5{$$*Cd&;NGp)eQjjB2ghUjS6r@BbB#I1yL=&PZ=u*(9
zqBQk}V&<Kk8-Ez{qd%LXn^k!7e4bvv&u(X%G*2<M^fHTX6*i~f*2lP8Kf$(_P(_sh
zJ7C`kdK4H+D%7!P`dC5)5rRGiB_%O+gwW*5QA-?ClknE}6z}{|gU<9@)VDLrt!<RJ
zMV39n;CwaWVZ#eI*s?m(I1X?Er!+QDNS9Ic*H|rYv)-M@*gn3izFKD#!aMjj>Q$C5
z%(L>e#nY%wQ97(~dxO%^DYYzNYs;~^YS`Y&X*Lu=^Se`997R!B^33w&ZpxRx=<=(Z
z9iFTYHae4#>+c!n4oE|_7Sw8zM#Bd`Md9|VmRpU;>%c%nDf~ofouf2%Kn^~gta%@P
zP2rpz*rq!l=o~T7+WWK;Bom6tq(bVF{Vd_Ad-whkr74lBM2s+y8^T#|)`A;Kvro?@
zDUG1r7xc2zNN5eGmzRSu4wYJ>UQDGoPFa=%!NK78Aj%dRwDLsOvuqJa2@~TmJ*in)
zuF*Zl4HlrETAr^JY-|;@+9i#8z$@<PyjED}$jgGQ_9l;>-{GsZZ}`pnH`v}&0@Wps
zrct(uE2^Yoo8HJk2dqsgY|gXQ+r+y8i)xXYtg{f-2?KSmD&PAsNKv2;IIE)y2z#)X
zA$Nr5qVFDt5Yju%OXJ_EBa>Jeq-2rB9^KA63#>*IHH66y1p{7u=y2BJoWux;J>wmf
zr8ioY(h(<)H1i9`qww2;0|(((2zZndM6p8a@(}ayXp+cU%T8;Tjje)CFQ+JyQ@by}
z4p=)Z8tS~evQ}uVn4f{Mx?*lNpxrKLw_<kIQ=UG}seDtgy%XYGo!wT+Zr~NQ7Ke*6
zOrddw!y!fzmDAL)wN>)`S;2TCV0=Wu-J>{jpwqaLaJ5_Vk9Ioz_U|NL|3;JbLUgXY
zY#Tv}802*nh8#nOfC>&h@a2rC2t~bWS-4*EqyIMHjXzREi9khTTvFHh#Qsxi!5Cj`
z{smj@E$BAk{)f1)eu#Ve16*f;$izTFN{@hufCQh4ckJ5~_VBB8f6U^@P$ZFIs-E-K
zCyw|2Azb;fW_+<hJq~FkRhBB(`1JO_C;#@(*<pvS?Ln^goS9!BE5n}DJxdC*q~t<A
zMM!(E001BWNkl<Z#(c2E!sYKVdFg#r(BySS+>?`vAO0}L6eXSQlI7K$&7ES8+;#K{
zt#$NzhP9Q9Z@+F6hl0lMFwj|FNxA!No1cH$<G0`RSlcf51`FYQEvSS1+aR!vjTvTV
z4GRl?pcz)&9<oau1In_6G=r^O!*<ItF%c1-nY8I;s@C=?ioUlSH~~t+WL-1e2nlq|
zX<nxwY7^Jj>2#~mA3>&bVESOX3TH#kN|^Qao-&L%p)T0|)o>Pas|zGWLt{s5ze(xS
z`%(_J-|X49-=q*UYl_K+Ce$aleS6n&|J#zq#ge6K1(z4SrTp&;(mdnA>ND=Fea+3a
zUvRr~pR!n|p(dGczRw32e}s01r@?1DD0X>x!nqudmfGN<`G&uF6q1@<{-p9FChCn-
zrR|S{QrjrKj*%4%fgdl5*k>+Hh%gS_Ht6=N?W0N=5CjP_-t=2bS^b4A;5e;Q>jdcX
zJo574_xL`j6no+fUt|_23rx37o;PR*<K*&uI-DSG6W7*Jof@OIs;zOfcXHZW8RpXY
ziR1NV$mKU0JbBbYQ|y<UIPy7TB)c1Ro<2&reYYfzbCxbducf5MX^>@>cH8jaLB_LZ
z1(UOyxjD(w1;6VsJ|0l7TZ-wDVzJJ(Hyt1TAf?xL<hkPcn&H{=oYmz%yW0|DB6hYM
zYh6cfMg?~M*_PXe;(39)bh-@rnV)t%5ionh8}M~p$@;FL`$$o2XfNAl_%JjAg`>n_
z_J(Q)go&VD7c9L4Z~l?s?LQ8fx$ZlJA|VJut`{GpRY*VB;z4(n?WYrzcYg%8{}_66
zh`f%V#8KdIn8B(;4g!f`r%(ezt6v)jd)=-+Zn*wl$-937@BdRpbxsnEdCpEfZZg-n
zM618a>dqscbRR-@g_IQI1~ao2FH|@e(lhOa5MUKk(Gpk3K4NL{hg_I`6RkZ<=yjo5
zm0Y<Jv9Xf#<X%8OH?+Dwr8<f%=N#m@Wn-h@o11+mCL@+ETY^BK^>?=l$O}ieXSn|`
z<I`Vv`094bgO!}J+~?E;S}@j-L<d$QN(qw07pt6@&@3+>?)H0Tb%T4e*3r)_{mc%|
zd$xP>MtFuSH58e_p1__Aqk?+9WO^JX8v%g|I4Qxe@gYSZ+=<zoq26*oX?-?G;Rv-Q
zILTFf|I?f$@ODaIBZ)gjUvYc)Fbr5;-tVP^iHVSznTRkP`hbi^nmX1~$CJke5ANkm
zHUp+l;ivOm!{O+Z87tilzFGT*uU9|go82#2Puqx0aH0AJ?@xZrj~9P}6m7=T4#j55
z+D?yL^eM%t0M(I-E?ed~4>l!rnJ_zkg*Ol^P1e|#4WALhfv|g%DBwMo20lxUq12aG
z%1#I=kt+1#qOc<uiMoi1(g>AFMBzrRBhUT)0{lzm*|1*Za^9025TuNRqcr~KRc@hL
z)hsSnn4E5r)KdCsKv}-{4mm66_afF-18#nk(`e+(PWciGuWM`bBxIRobGzW1TYbL#
zqQ~4~!1e0^wIpC>T9PE*1a-)V9cHM@(vfAF)eXbSTFLXLnyvMiv?F=?B!i;ER?E`v
z9d1SE{5E2*YiMoe<R_Rz9>lrA+R9|e{6~tn+CBQclzXXTWn(DY_5-@#{TGBJNW9D9
z@K|*sWBf*sAO3e$KKMrw^_jyDL`uoT#55}S0D+|P%?`i#r6zxP4b#3vWP?GjsEa@l
zQ>8@HA2g-LGb{uFF?CAh-m&2(#KI-`(Z7VHA7~nvBjgCK%FNs~J_!C9(Y;TR&%R`Z
zd-P1|J9?qK+&nfu9SexiqHB(%FNwAiu3r5fA6@*%EKXi$yfQ;Ds;b>9Kq*Na3nnHM
ziwm%}E!o`Bbh{<_3B<JBw&TlNCDRv5-g>WKY)qr|cefhubPe|&Wqffn<=3AVtghP^
zY|1MY$=sZ#T0Qt2e2<aR5CjEM4!2tTz<e-sJml!eLmZuu<J1?UP!y7#9Zh>Tpy+Gt
z$U;sY^|2naiv_bYGmJMBFKfOCm;_W>CvDqfE##4)63`Wkki&a8y+Kf*1yfB$v!;;Z
zcSqE9&ZqK+MMXmev9?Gu{PT!;**!=ln4U|xaM2LOz5?~J-#0kAzFKhat3GdDiQ)2V
zyPb2xI>(d#Hs9>t<MZvGbGP+1%lQUHuR@$o^X{cj_@g&|!qwSntlUM`zt7I?fM*+y
z4fT|^+C1UpC1l$yZ#?7wx_y^S!qVgdoRcVQ%@}1V2Ih<-%<rV2Tha6?8v8mX&7$fH
zIJsk977My(P`x3G{j3WWzuG@Y6n1Wy-3f5jF@i9pUiJx1{d~8O)=4|Xv0gnwO2T?X
z_=*+ZlUOh_shOVZGd{mVxzZ$WA1@qewJcwJkuo_R@ZOsNQU<S-?K>^{nPqLO<nDt$
zzx}Mu_#@5kR)q^QA(ceYY=RIk%Gtf|uHeF)W_mK@&1*5eu3=}}@a?S*1Ua|w<g_1+
zUhK4rg5`cn@1?#f9_I>lR3K1+X7TL^XB{<DQcqGI-3jUKS_}oCQD__ngY{zbz)_7#
zu6^uy^FI%{_9M;2#nE!zAPCWBjP&j`dN(u5Cjnw-f}r#d+hPXU8-W@8sc|?8EEY+~
zz+Mc{Xe5rDJldt0e#rLKZPphHrY0|=lk1F<n~qgyxTZg#V(N@VV|@N>o8|Tn{SvHn
z`<2z5fYRGi3vHQiUgARYJ>FUP11`?L$#`{&NS$5X@-hhFvq#gjA@6-uCo?_Dvd4o*
zhMnExP1n-YvbJ7w?{3OxpLTik?SxC0LzH@*s{mgMsnvpq4|6{KO_#5~?z6m7((l{7
zAV(=d82ZRRisTWVg?}cKlL7C&m$0^$@oYIIw|$JUxC3%;=b*?P+nX8N8=CTpFFtY>
z_<>Te+s$~kxlKFe*mKmX6=tUeGm{C;hI(m6%xWkrV3fv`A<i8r0deq-9Yn^GlosjE
z7UaONNTNW8rB{pD@EE1o`C*Kg*d8Kdy8SD4_<739%TLGu@z*YBGy~@5BNmr5+dGo&
zZ3}ka)@(0>H~4d7tK|0W9v41SNNt#%jj7l5pp3xT?yJ|gZ10xj{SsRk#wSDS4SnkO
zqTlbb+u7x-t(*LM<4Yd3?y}k2Ax~p21UI<e_#Pk3y~~xEImRj>M#4q?2D=wZ($sNl
zOY^7$J=q?a*)hV>4tf+kX07$N%y0B~Yc*i9F-<)=`y$G@0B0lQzy#!IZ*+iB0;3#`
z96w#0eaes;R0Xd%wa1h7yM4n>YH8<=`Wez8MPXTA%~*cYC(G;$+%*4h2}&ZRL|cnI
zXTHT6jV(jGv-XR@p>qyf7;IkPoG(Cho;Hgk$<%~qaw2AIEMa#`pICS`OAXJTWqf;6
z@#`7Mm1_wX79!$Uo;h1@ouiu?y4{lgZt3};&44(Od&M~S;JnvO);H|#6y%vDi3K-r
zYQhk1+!&7Q2Y*lOZ7C`xh$8?+v!SWiJtNjQL+Liz>2&CKBJ%8Tzp<gDs3`0yy~bY2
zFmUd2#N=GSRI|m{L`LslE1vF_0||MB7)75xmXZWTHH7*^%6tDH<WK+m3i2g3&b=MY
zo&VV2!QV;JjRrbX#4wPoD-tSL#6ZsOSvY<A7zz>^SnS|h5)w3h`gD^gwBP)9xT_CH
z0;utixys_;w+~MUb={<{8Z2JB%F@Ifo$TlIvioEPtUg%iQ$RKl#yQ88$#?k&v;T^V
zi`ST%ntw&Y;L9;PpD;D;_qJ`3v)d|YcR1u*a1g_~KlkqR(N2)WFgqtnlHfH4It4|M
zvAPQ1+|2m-e{AviaYn0E9J(e?IMyffE9U1ljYfq>kNVuYEohY;OlJI`Iq;wHstC*T
zr#)7lDT)u9oY&TVx8LQ?>QjpD7~aVJMbxX~%uUvrnyk}k=$B5aMF_3>F(n`lKsraI
zS5oO(lnpsIr%Pv$Y(d$4?SW2FyeP39Zh{SW333COIamVX<q!gDHO1VV=KA%3?QKQ7
z?XbB+<1;u%C*!RhU$;la1+7lXC!b7k<w}Jx98vG<C1|w`-`-DYuk|Q88E=2kAPB1@
zi8$4J(Q57Rc=<k`uKbFhZU2@$e-4>Kx2Jh);RpQlH~s}zFI1Ur#)JM+AxSPGmL$!w
z2z~>d-GWj)92w}8%CcQefk$ATaA&*Zi-)s(a3!IhoX;*|NOj*+U5)(I&?xfs&+;H-
z2tj>x_3|P5eZx+>WF>WM7?|PoZ*P`b?%rx~=T?jCgu=hS3pne@+8J3};mokloFmYQ
zeSk1I)?~a^@LZ41x(!j}mfg*iZ@+fXxBTQEKvMBr{%6hBTML_=oaf7ZR`2wv*Fr8|
zZ!k3#yb$OpIp9_*KiBknhLx3+&ptCGiRHqD04c*$DI&ENG@F{smn+ok0j=I9PuI3s
zeLDF<pd*ujU?N7IGHdlpfsT-%Bf-?Qgv)u!TDL^}%<=5gDrFXsAyC9bQ9*4w<?2V0
z5C1IWjX%_=W0>LnzNNEkc>FWVoxio*`&mL~SrL{BcSy1>DaZgZkh6;c(K$vEQVfjH
zB5HsoRol3?|Bm4LFQ_d37TZ|o`38Jmsepj%6Q6LQcKz`EAwUR}fO>p^cjo>TF29U=
z_H(xE1|7UoLMV`R!)$$t>(k%oz4<?8Y5p3uTJt*(a^U}K@6Dd$I?^o9pZnc!>=6J0
z3jq=!!BtEuB~>cBR9U-?)yq`R*x0mLSwD=~{AKer)7I86-7{l0WmcWlS=m`t$}FW)
zQc|QS5+Jb>YarIU`Mo|5H-aEYkOU>Bq*TQ*lZY+u;@92p=bwM)oMFM8DY>v@qcWe?
zz(9+L?d^y#Jl$|oYdCBx?mY;Y_>G0M4VITRlam&f^;JyuawwINBpLg=8Cx3}pWY6+
z{dvga$1y>W9tSxh1G|q?mNcg;OiV~z*F4p++p=<+`Ndg>TjzZ~dsJqpn><JNPE$dv
zW3YQ5IXFxy6jFTu?1MZE6kBV34z@C~eieO6VWd}xC{_kszT)%NTRzq5tAiXEDkJwG
zeZ_84rlFIj9I2F<ud~UoYzV6->_ATWBfg4zxoJvV$AmN`N%a%Ts{%+Njx}L7ChSCc
z)@^h)l@UcLhwWTYuwFIrT#02FPufrja6N<B1)t_d%F0TQPz+EqM8}2af;O!oQJRen
zg;F7{R-21UA<Ih^GqVnp)6S{XbEPukIKP&|L&f2K$is&bx9>&_Iten(h%*-<92PDZ
z6koE_(N+Q5VVh6)|Amh>e$KuA265Oz41DI?CEmXNW8R&;#o}y{%88&jSCTK=HO?0=
z@=i0tj50py2W-X(-7F+~W~HK^{6A%_waL$Vzd~vsTh*x787>%J?G%3&BuU2Z)_~n@
z$>qfoPY2y`tl8O5P)bwuB?aGjp%sTA!L#yzUjzftspg=oIOwVunz}xV&9wm!zU=c)
zANII?HzGLA8|o=|j-**P@!i+U_9jV2r=!kR6QUV1%f7}!g?ubrm~#1p<r4ebJq`{c
z()7hbgj&N<TXAnSAT?lnH|Elk#r!#o`lL&-Wa9hAiTP?&m)PlLwAvYm`yqR~5f2|m
zY;VVO4i)p~^2MnsOH?YShYYTh&(Tqo5(Jt@j}(*5gvDjW`FRufj1>ez<Ru7&f}rG;
zC|T1SK2<m_Wu6I|C`%S6ElS=ukkNsBU%fo%Fz1_Gu|iTq5Ue@0_6_=>z?U}VlAv*=
z$ECkC_{0C*!+VKIUay_9aX;bL|0U(l-%9pcE^3&`Ii{>z7zn~4Y2C#kL69JZzsu``
z1mNNlJNrbX4a~QGj`j9`LwI{+GGKpS@VUt7s1BB>P;sVkjRM9g75SdsV7d9%h`34I
z?L+T#`bmV=DTW~^77NTbF7u=5zve>o8dFoVU$<#r3qrv3oQ>`I?6)l9SQ5vI)}dw)
zK&DeP`UJJJ+e_*7QwpD%Xdy9-yvVLnwy_<FX&xW@Wr0sl#XgSc+wF)izfjz{o$%2o
z0T0&#x?Od0t3zZ6GsY`QnoX$J^FZgc(-=nnqFS7FIJ#J1=TOmVMJO@!pdKDJ&7j>C
z?CinbZbGeM;(5l|0+CG9>na|t4%pq&=&<};`al51Qp)^=kmW0at5;nrl`}Gy6zDL|
zcpp0pKaW(yQJiuZtFPoLt#z(sn<+cj6nTm7&ui1m#Yn?RQY;#1rAU*MOy_jn3?R#?
z^u1O>dpDxjP4aCdLonzkv^%*_WEg2K%$qbPZK~CifwkiroSQFjZeCHV4cPA{4AKEY
z*@)CWg-r;%yBV!k#QJ*1+G@bzw#n6-MN%Os_y*214&;M@qT5xhZ6-Wgk62snvT{G-
z{{5T@XxoyhX2QAIjOiH-&jmV~OlKr2WpB{pcKac}*!vfLzWY-Eq;hcLCiC?r{`~Tv
za;e#5x^{ZdSul!tuFuV8hMi?}wzufFI}D<POlOEpqUF%x{wX}}?r=2tH51kXHDem#
zIy7t#OPa&k?{r8Bh6$#jF^v~X03>n7)<(eQnnmxeDwZh`G7nNaUB#CVLc&lp-7uM%
zvGM)Wb1=3EB_Euj&ee-70kqQWw-k@}6S_TxYl+;;Pl(~?j^~*q(Zq4amtXYw=vQq%
z{cXhhrXq?@&M|pu!SS4DnG)YMK|>hjB=gbzOZg&Fh9*u@y1hKm$+8!F1!^G41aT(O
zUoivrG|o*qaJk55Uqq~L$MpLeH4Jv1Cisld8>I9GDXmV*%EOSIYbIB&xSYSFX-+##
zOqeIKlSz`%?<*efDb}|Yj~;Y+_@Kw?J;nZBMrsHK1I=7hGJEd%Xl1lj?z#qrf{_dR
zMJe0cDJv@pcke|wj!Cs_Vp;;@44Kh9n9*3GfWyR4?l(DczR8Ngg(-{T83Wcg=4R&=
zB$uu_7`+7D>9P7x4x6926pJy_mlW^(&lbynWMVllztN4~Cj9dM4%qz6BRI0Ll6*IH
zL`%;p>lP{E89Mt&6fhtq#lj~SCJfM*{sr@gKSiJal+-;y%lHWuyt~_Ft^a^u>c3@>
zwt0K%&zSJ%p1Ur?5R}UX%ZnFjH2wzX(NEc4{X5e5fTH2@!}?$F*31Vi&R(Tbs=ujb
zeN9*ti-LFG6;w)!M%m@=mkIY*QwC{|NQKW)JGF+5jgTNn+1?Jhxae~IN|E{V7BlDa
zmxGjG+s3Ks$6P}pC5|;w1gook?%e6{<rfL7D+#;%>M3unV+d_wL{0q6WU^vXF1)(K
zPM){8tUT7DfJiE~xAWD*s2(j%HJw(>?j}5X0F4SvP1&zp+@`6f+fCWrQha(l;n7C=
zoWk;m&OSX+;hlG;SXydOtC>T)idVz7C8d&u5PG=nbNWn~Y0XhD<*<`yOI{Z$m9+aN
zz2Gc@fv-m|H;h~zw$Xr@IZZ^5PMV;j;)&V|rC{Yzie-l&j%d!g*d?3Y#{paG1J*Zk
z9g@{~!Ogb{{OCt@oTugm&y`%5cL?9|2oF6zzFp?deG_A-?eZd*`ZR@pU-57)rQJ^W
zasy_5o6)Fd6#bK*I6TyOaCD$(A0@PV31JAnZ=!V`%r$2%nsWxW`|LB;Kuj19c(}9A
zor5p<r1eX-TX&!Qg=uQa<%mWlp<XcYpRH|p20{p`)d|jti_EAkHnM=7q(c^%7-1RZ
zACcK7t29!(Ph>pii~cV$wnC0-msz$KIPbeSFX0!vZbqY?Fx61htBUr%KDAAwNb~4X
zO1T&_KONF&Dx?d$+XJ>XLmoa#QHfx>Zt>oaip<QM9_Ummu(+6uL7I6Y@VW7o0zstN
zUX8ft2qsWmT=tm1;1A~>abliXTN`liUYAcl33#{~;TK?b)?jTdB@BmmV)em{bHUG{
z`tJS_d~y$*dV+QWY~xtcqFS|>nzEk>{8At$%@l!xL6p99{Hjc_6&P#`OwOzg`VzQx
zi^fHdAH3}`NEElfh&gKK-i9Nt-Dw6MVVH7op!xVS#iLEd#Ak};w8_kjI6*xRf_#zC
z>1z5x#=&01!JeYm)nFS`sy6keOTFpi6`s#dd7fly>LiI|Q~<ud8u8Qr=a8V2A|%Yu
z+SFc<5qcUykg>Cq@OUp_x1|W43SM&pjxl^zCZ2b;`S*<lI<_sCY?|nsDQTh+WMoP)
zHJ5SWhj8sDHqFb%b6Zw<0cb}5P}AAaJovfh{?7#6b%Q80hYvF&MB!jy;Xc``&%LxV
zA`)y2EF=jUMTS9wF0@D+D~RO}k=K4f>K*1DIsnK#st*F<DB_;;F-pV~jT#zF-J3q)
zI4)(rZ|b^}OxDZn>mHlIE@5wvk}Ps_>QA^l^+Ou9X-xCmqPZH_wqSlf!*evYlz4?0
zX~paw^*K0-2vSJ0EEfjLBxDxtwxZWp?6>;t?7AEsrY!9`TsX9FU5W4K#b}l#$dVLc
zNTeyrR7Mh|bUKQ5JEPT3xqrXU?b}^8H&b?Z(-Rc(6VL*gd3cu1<dmR%h5=BXu$VV8
z-tK!~WJsB?vy-1c%SJ_UioIRUo!d|<8q^y$Uctom@`B+}-A0z_Cqh?)LB`f*%$N5<
z?yn~7?H^yT5E|P}@LfsO^SFGe!mXQC&ds`bFG!nanI0DG>RiN8L+em+xUcASQ=;hf
z?L^350{e$4Ya0n`Yq^`X=Lu|EU|IR~kFp<Ws!4|IEv<7J|Nf!k@m@x|t6yn{5rlAf
zB#<J*kQs&{u`KaI!7<Ymc%GzDH<_Kbc-#_XhuL$1WSVMr_ENNt&}mBjQH)b|*xLzs
zycw{!H{7&ICFf@B=Yn9%6f|lkOBY<CUV-jFv-4OI4K#72Psj>9+wMwfT1Rl$O4(@%
zR@XCXWkta|*%+-B?C(R=SHw|Xh+8NbOit$7ACr?dOBWp)ljg84A>S?<q>8>uh*gJ!
z&Mu#9f61M_-}0dIG5bmDsWWJ#)F>i4$pPKS$2QC-&+u6YAuuct%PvzeN_fH@K4*c@
z2I3TzSZ&5AGhrjXi#iGkHe$jw#hH*y6e<+l(+LokmDe0iOh}qdgRS-a*rU4~wXIUn
zYGtgf#Qf@4Jt_?Y>1iHs40ya1vbP7OAsI|tEM0nWMNM9BVlpvdQE!;EyJ0T;nH^hv
zXF#kp2agjTpfQt}){&ys(Ui-%D|fe_(d%aPx+xDH^!fbr4o9t=owc~=5JsAvoxyRS
zGo;Ty-9Ovij0cYtP9dPzPq7W~Y=P%W7MEP=b@NHqDULO9oS@=>&CQfYk2HseqpZ&9
z_o`CO?taRnwU~#i0m&f6u}!3zE2-O-z_Rjjc9u-D=^K=rHrH+z2$kk2>XSW6Xdft~
ze(@SkDUDJo{XXpMrTFV9^}1kk@?-`t40E;oXeduS7^FmDhUXbf)h*^P`dq&1F*~1c
zeLag@0z~3_63>zJhdNq%IOlZ^6<*Q6bOeK|1?JD$L*j{eQb#AHAWieJ8$=l!n=yCq
zggjb{I6TVRTN)X*lhCL;%+3^;n{%jE&F71wU(}9g`m5JKt!Z)NCncnx;9iQjcGKeg
zvQ1$!zp-Z@u2PzIJ7wjc6`%ZHip|?5orh%xk>uE#EdhGN@1B(hfA)7CnuL%5Idcc&
zkN-2-)Ljw|$@4-(7#X<vfXEQE4)(Yo{uY2<dc+^j{g3$8X$5|{gYcEcGL`Fp#nE8`
zna`#9o75{!4C9SA>1!glF{somZvN1x+=yw;1>CtUx%WkpM}eZ94vu}I!dzA|(~7=o
z^JvFlZ%^^bZHGp~Vs6f5?wrl^ISbF$ghwH!XW~>`qN9*rD`tCJv%aZVT@N{GD+U8a
z9P=E7`~-vsV}Mi9Oe~fuJ-3p29+oAk*KOW^zd*fiAZ5bs+W|q)JK>|!YGr)*QAn%=
zhR8T~p}_Q9UQaW6$)ssET=gg(Zzp{IX~1uPJ79MwCJc{ji3~HN+UPPrXLIHJ6mS2q
z!i~%R3+oXeFV-ClQug;1onA(yU~4Vr!RG-FSK?C@RYy=tv%Q@nWrS(=xO6FDVZj={
zfX!hYQ+^LolyP*FqIIrya?n<Mc|YXAO2FP;^5V81Vs}5`^LqiV37(S|g_p}Fm5O<)
z;Fw_uT-Tye^O>E@xcfx{VITC#KCg9NT)Oo*qjjXPtO#lLN#eXNCP|=CGpH7<Ar1cY
z>#Ni(uG}cGca*W;idlJ}*xh}xK8X-{#$dFf4EhOilybC}2OTHddDuU*<04$ogP9q4
z?>&!q->uMWI#ep7_Ri~>cB2ko_KrAcZ?kdmfZuHYGuz!Y!n9AKj~{HBN;-XqRin>8
z?R-Wr(OfTGqf*IJ{LeybX!T=u4!cB$o6y^ZEG4re5;J<<0Ce=Zp_pJ4M;zV_Xzv_h
zEXLe8cai1Ug%`Axi4Z;$O_)C~xc|B0aHw~5nw#|Ae!@TeV=LcAk`PBJahyv;)N2NY
z4bpm9RGk}wPEQxPv>fxrqeH^|B%gbp>N_Jr)AfyvgMGp0_fjT4jF_Gllq-V0LxY2Z
zjKjT<eoxWwD{ftPxcQdLjawzQ9xFcnIHKJiUQ1E{<(;VI3kM1nXZ*Sw@%bkLDWFm|
zIX~wh5iBm*NSXJIg9F9kenk5q;O@PcUw@Xey%oQ7UQ1)m(Q3e#al(I%0v68sOg9Rc
zMS)WkG%5!5YCgu!s$gu{l8cv1;9Bfsk{Lb1R-ZW4FLnMNK`BkYuZW^NxPKa1#tDzW
zEX&9F%#_X5D?UH^pv0wRm$}*8aQV6W9a>|!mSn1K((C00o^U*_?%f%1xSO!Kny`Gu
z<NSG(X47P1!o>4TEK3r{DebOe^ReQyPY3+-fA6xf5z*}?WEohFqA}Is>eVvuy*<O#
zs~)avomm+1jlY#GM`AgWg&P{T0rTe#>Ju+cjR)O~m4Au3^A8y-8JH8`000`DNkl<Z
zzce`7H5m-dp`pVlO)as91(Pu&8f%6k0TQesZy^7jf#r9|=0Ae#{~dkdH)!hsojpSb
z)cJ}MLxYhK#{upBJ}VoaV<s+sSmVOvb!HnEp1EQH7*xC_zG>2PA<JxP<q2&2tE+mx
zS;&0VP=$FUo-Zl+29ph!=A)3cEy?49gs@}sq?TU`h)u#+Fo+Yn9oXMj92}%<Zbj5q
zOl%_~?#CFmfmH}e`Y}OQ<*Va^l%4&U_(l3KPoYvWsZ<Q=lO|VhI80AF6brBJic$(}
z+n`=|xp+|$h7rXA6kNgXL5G8*0YTp(j!h1aH23aDNTHcs%b1x}Of>SXJ!xd9G$Tp!
zz2wb}l$9?-*4HEY{bSm+;~A7H7E70^T)pga^Kyx$MVCs+K)hstwGLu7)&o{n72CUt
zeyBOvP1sqFPY*zh1dIq$8=ct<2Ab_{g%CaV_hU9TES9ghTv~RSnvj%=`N%jrQhf16
zLc6W#c5|`Ft*w}?&5&+a<+VUYlpkNYLtn6CtgM9mx4%E4;7TebNuyz~wB%7L6;EXu
z36Xn>HJdh9ulua7`y3uBj*j$mx=p#zoF)uU9>XwTcG~3fC7a8aeWque7qTxMS5lvF
zxpGyJsEkS}<iY)j$GeLDAkSFIq0Pk86EzHLm6Rq`DX-Fq_J(>M7cbe|c+2C)TLms&
zbg`^s*?^<4$3}O9`+JYLzq`icc$e*9i}l_^ddbmq$IQrxi~+mB4!>Rhf~ec4Q`_RE
zxXuOp+zHBh5cKKxJKWh@<?haxtnO`c&<{wB3@uZ%e7QTMN_wO!AWBmnwk5Sqm!j=6
zU7Evn<tZ;zfe;4GDTAw*Ep{GSpcIdH(|nuYnV2PtGor(jKXe?yY|~`vqRsWUT;}Fp
z#*xbB%nKJB-g~z|Dt%-Y(%z9I*;7u{I`20@pa}x#4Rk)Q?11kJ+I`7j0CAwGlngFj
zD01tT$2;$O%+7nLETUL6vF$t%%LAPJ-7~5$GmM-eWLtR_!m%<M)m)3LSTZn8N$W6W
z_i@6P4?;FKLt6VGn_G&t_4Fj6LZ)Db`FVy#_d3%=gOuIvj88?%=6XuKqVUQRuOulK
z4K6I$y!&pEYV~ZdUnvEJqRHHx!;jvHsc6M?l5u}4X6+y$li@JBKbG5g8hPNKZ}C4n
z9-qbZl)>Dr#ib>mD_09#yXw)LwkQ-%uXW5bItKN+!E{rw-3p-_fpX9~-#+hjQ^Fu4
z6OzLt#pb3-qmjP@s#SwhNfHH`qjt*rw&LEskd@Vt-mtFIvLv;N!{S1fYnRL1e5*jS
zX}=b$@^_YgXwFznO`ETzW%ds<e*1SJ_x|4CXxnEH8-(O!Z%OWiF0t@1iOF*^c~wD5
zKp%-5I+W+4fF9tK4@v&;Z%LMafhugF6P=6uJ&kneK5nOZcE?VM(*e6%Tc|@#Z@14+
z-il8NbaGf$1=B1K9c}qWR4Bg+DixDb$)MRZxqRK_^19C_pSt|x&usSkG2t*=Ofv%`
z$}?CAf+)&}<D6;m@ZnSG&S!MIMrlf|U%gc_!eqnZ(nXKun;sW0JIpmK3THMK6@Wvd
zA^G3~&Ge+fRHeYDUmkI1rN!<>og~h?_2#x>dnct*NvKr^G#eI`GMJu1$oyhAH(`5A
zbJR`<f|Ip5e#xRa=W*@&B=6kvxPIBETryu8<N)k!MSS+_4j+A{Sb3N{VQc7&=U6mA
z9*p>h5LVEkjZzGQmp&UCA(e_nH_+GxlS09wR7`=0{r!lKKTde?AY^MRMC&}u(`qFo
z$xu(k3UWQ2pbqiL;ePK<z{>rQa>-<3!eDL=vaG`La^a=g8_ijZVp*`hZF6{Ja`*1b
z1uCD0WeILvvH9`)1#Y}uqB-Nf@Lc(RykvQ~Ky%7sy3wItf`9x~_QVZ&B>O+g=$%nN
z>;y_h$vd|k-g~de^;>1CH5=EpPE72N`$zn2?KTe|e8l#{PuVH<IdVfXeR`+YMuPGW
zX+?^`L&aX{9xD^zd;c5L#hDY7^=`M#`sNBB?fe}d?S96=flW^<k`k|$g3=no5S=8b
zV#XmRpYIq<c{426-lkqRv8?A8nnJ+L6nK^(YCE7aj(!;sw4V=jPJ{0W-o9z`-g`xE
z+$zzSd^xQ~2)KCB#`g<^;RI=~&;3J1FVQbN-DnQ#c1K0bVp!{Da^+HiAH7rN)_Wey
zR~@8)^^KHr*}`>`=h#uBY@h4qG8*U4yUd@nsh1Rux}-7fvv9$|^GsIv6`y|^^Wm?1
z++PXkv=ibadtR<X4&Bm~J7hPCC+x#^U(>m-Sdl4$0j07@p=ct2AN-)e^0Ig4Kxc${
zS@3UuU~$Rw*zgSg%P)FtcOnw2N1CPiLgs5qNi1Ek_~3n?#pM!n=Y1w8Ega{?np7hi
z{B%<?JDc&v;~pFaFsMVC_q!Abm1gx(z}Dl4d-w7!Cn53-YI91E1SY+%;PJlVpp|fR
zl#r$xDFwc7Fgf9Jb+N>aO9hq|eVo^1&Hc^-ojj%V5(;@IW&P8H2mhS1{-HyA!(^Z&
znFa?<N;E7gc7cp&=;Z9+3?<8rp|_PFLgL7jq8*Z4ze{rYSE#8^$i!oGtn+OWSDkbk
zml-%J&*(h)nMRuleGb^@-{F(J5@KDkTziL^;?gsBaa=3$4KT>RGIC)if#;bBDKSig
zQo-c>ti$1cLZ_8*upe>IN;r%py#a*1j5Nwflb5d~Uxt!z;CTYWN^zY0`(n+cG+}XJ
z)?$9zqTckW)hx<o<IH=l$M<Dmnl8=hj9c%*#JL$RU-fx(-(h=G&^k=$^iq03iV%W9
zkg@eRVs~F7&2%Vl4{<C>GdUD36jUlut=rTm92OQV&M#QZ&Us8X9em$7Q>s)56T@&R
zdLa`PP05pJkzrUv1#KyizJ(BibdcbgB`TgrH#F&m`Q(r&L3d!_T9Rr}Qg8&e%-?%i
zCP)%V97~h}#}ZVF2GUAFNT#NI^sx59D@Z)AfXvE}*<@)#5T$enDMDBnhKbY~#~Ieu
zoq_2kCAgmC?YGPL1&f8nh>f+F{q2Mx=@6xTlBk5#E=AwKElI43WV&IoFlBM=io@cf
z!^EV6<GkF<ONiVvr&6`Ke6>uW<S;oG@n9unb#;J>Aybn5R`Miee)@6p+6dn@DEg90
z87dV)ZNg<{*5UdUhjR-y)tZgtJimI?XjGQshzbpJ5tX%Zl9(bsHa@xLy2x*(l7N*!
zJ3)93My-lg3A&$xD)4NDk#;n?qVacX)Uz3wiSaU@tUrOHz()*^|IACQsL-W^0ezxw
zK#HPhS7;Qc@k^y4yYFSs(Z=^-@uDQwHfG6XYb)YlH)IfX3BrUVDq;zTqHkc?8pBRm
zSnyfA;BoDW!@`0?z2Q8^YC8?CYcM(K^5ggG)XNUdT93y&DXliNI*M-p^eEM`B)(@b
zHzS#ywV9svSzNSPUJ^{r9M?Q)t%+lW5Kt<a6n%qIAs^HAx=EwyQmqQgWvEs?$|VQS
z$p!A*qDi@&>xc;(tfHVkX)&K@;--yKiZo3q`UVBx!166@vxu9zM6sk7*+a%7^adHR
z0>iM-IwMUJJkQ4WEPN;9{5gqpMiRr*5JF-a4%McK@s7(+iZ-=NF8eKuot>D?b(=Ve
zvD_{yDv(4zN*!mY^BO!keD;EpFY$^Jt70%wH<_ETxVr4He9@s&&&4v&QcENR%+7oK
zfoM={8r*yo(t0d7I)rvRZ;$>^-^j8Rme(a!4neC<nk2MZF_}`NN)jdDyOPSBgJEU3
zKHR!h;mYL#v(paKGZxk<B`~kTw^C5jYo~0kCVce&h1~nE&|4`n=vq%~8XRCiJai$q
z$w(Ox41eb^7^-;sxagr^V6~uVP7G+he}~S^4~cs#r0NKgQa(R8&kQ0%gYmRh`0!sl
zC8R?bcldl?(Y5xmv`fXB!m->_spr2BFilC(loSglb2AR_+$zxRrnFj$wUsVw>j5i0
zlf4!My9rTO5fAb<)94|caYXaXCzWH`XZ|-rjFdrOs%}!RN-R%NF2Q8YVrs!<a>-++
z2946l5ag@2rvz-Ob*R>1VW~-{-C$*2@o*(#ZEe8zZo<w%UZ|X>#1nc$osCpMqM%gD
zy|gM7gHj3R<^=N>JQkKpTwW3^%!%Q3p1r`_b}Y&jkJ)MPo!olVuv1Jo&EJKF#H_gp
zDM(r&HBn^7bJ-0e_J&n~K_uC0nV1M_o~GF_DS86S%vZKaVj@IJv6#@Dw5S#Zrkh|n
z0@HMI6<P$9f={K8VOcH+iAn<6-Gtqv1SuU1X%Tc&lu9w(1lK(q9pADf*RGYAJ?Ald
zKH$L@AuG2-j)ESYI3nzpF}2H7-JmpO;mulHzu<EHf=jJto?55!BABMcG$jj*7SnSc
zOUsIT_j-KvQA)op2>S-kmSC?HLpJJ<oS+UHhQ#$v>J^jehRN)-V0KnAzf@x8oKLN0
z;+$eu`s5mffp2?E7UyWx>J(@Z5;H{&j~Y+|jNJFG9)cHu3c(aG<I*`w=<h3BQF~6R
zLAnN3&0*3#$D${xF0=@hgtZ#w*r19S9=~|<qAC%3Dxjr9x<;Rb7JkWQYG#H;wLUCd
ze`(8NI|j207EVb~Z6>Te9I&>cIqY_5cVoh?for-<)lA$%hUKNa`)-Bn*UQ72v9m8w
zOjA;=+ElAH(~~xp0z7)C*xJ^tZ3H~t%d<OAo}b9I+I-idUNiaOTNYQY=3{eW5^6QY
z(?N2sCkCaG#Pdw1CroB0O=f2WbMrRyOC=_!#PD-2FOnp*eL-c?;C$dxuUUX5O%swN
zWU^|~s9Cr*58srOx>fp-VoxPGwOncTT8cp=u`HJ?OG%Od({ykgi&`<|{DO66w$MrB
zbDmcNuLeJwak+TIXKlsh{=EU8n2LUs;P@efp3k6X6NZXpxL~zy1J5-v1XzY(YQmyA
zW#Z3TES-1w!IH~F!=hY%{W*DR+NCk+Fn^)M?&FB{)h?Us30vE+bD-F7<?j;1(l~{H
zpeIp1hbYuUDngKAni|*5$7plH!u3;1HTcWFtZ@DMSF`LGLFiY7{l5cz{C5L>_5TKJ
zeCV)$*FyCy!bCpt8PC;^6H+pKEHX3$5*$oi3<g6AxsQj$Bn6iLEaci>^+*@)a9H?|
zkGKC5`-4@$$|oP=6}K4~xk;y;KKWbMC{Z-)T%Z0iZ_WK7x0XI&qVmn^<NPi$(xT{h
z75#ytn@FNKMTH^#4s_arn3OopNCPm)(}+ou7Y+J;Uc(RsDJdGm2U|*P49X=*sQ`|j
z;5ri5ad3STw`Ahkxuym~QO7rdoPm_l?PT=33H^S+VJl<*Kr#qY20>nbkf>vpQl_Ec
z2>c<ltWq(Un#vhwg`!EhBq;c=f1T~4l+IB~zn>Dv2@oTsM2rg6g+LBhz&cK`5qPFS
zm}Z2-it02Igpov|u+5lC)umE(DHIGWD`zRR+bR3|DM_4>DUC34c0%q6W&k#}sj<wV
z{63&{N}Obbu||kAuXR%<I+I94Q>~fI%(!RX|4tG`rx(y^YkF;ie$ZzS4M-CgQ<{{D
z8n<9#crKNqNwt_W1HY<?Y?f)FNYm|x92|5B`UZo6!A?8osH0E;Byq0HY|7ko3qYCz
zrzEIXC36iyv0&qQ7KM_9=bNuoQtrfkcKQdXK>~pyBqk-p#m2~2Qas7%cnZuE25D}-
z<{2b$hKe%gY7;a{l@si_FbfD&pUz>QUKkJ;Vp0wC9jtU@m3)f$oSTB15(g<sq{xUd
zZHeo7RIDmhtBT{i+yWr4i^+&$O@EN(MZUd+Zof|uB&3OhZ5fn`8p|?}rbWGOQ>|KG
zNqu^RV35)}jOq6x20_gJ!<56Fj4lvl`SY_p@Jrws7G=+5;he?fgo$6Wa9yx%&C_G^
z;iHhB{zIEVFU7MZ3+Dtg(?*_6Ddf-kw9h^Fta~ZlUP{o{B(VbGp=q#zYfBtkVmJn-
z5SU4Z$~56{&pXo)#u;fUkkS}#>8D7kkW%AV7KMUEt!`tzW)}Nd<W&2Vepk`$C=T12
zL2E$V>aZ8s97gsDgJ;_kc($Yj6ip~hSrjHLyoyPs47Fm4<2YE>SKIy?nMQ{}eoccx
z#vp)$Lq+RoSnQrD;-t@DV9@Oqa>H+_u#G(UG7LerVlv${@qLM3l+4VyR4QMO$^5MZ
zI=}c2J%09o^x3;zrnBLZk?(8f(q$<oDG4STfrUaNNH8#lepU&6AjP3TxoS|G%eel(
zBwYVrV@&gqgXj)_zy2S2aPSGe&H)+fiNknq#4}pvJ@vEL%&i=r-p+~*q_SC>`5`yY
zf54yK__v&^Kf8tXeS-ob`h7vCV-gV)rzxs0F%T3Ak|fde`<g-_ry}?Jd4|m_fNcmI
z1dfv%j@ouQoM;{1R8aG3<TWgV0kqpD{eH?IP(*1)n!(flQMLiDB`6dOibdlomd%^J
zmV9FUD#hx_@bflj6U85$Pjc)Q{367|<9{7tvy<nGhs-J<pV%FRVT|tmO}1;^Pvck;
zMv_jH&=2x{n#7t&Wmty99%?@c6HFf}Wtc33A<x>L|2h#xiX_Qj-iDFkI4M$^e6>FO
zGUWZczYV<uO^1wrmfMFozMxPB2Lsp0i&tNkbvx>$JY0`RlMKhq>pvQe(cJTO`}bEJ
zzavECefH~%2)^_zt%Uw|#9jieRC8Q#B{8MOF*C|YN`}O&n^<K7$1#yo@p|*j+0pH$
z^m_T6Fk*lOu_jW$P-@gMCFZa$pisz(5w2^#F=NtiWgn(ofY~V+Jb)we0^`vJfg&O#
zz@~u296FR6Lx*zl#1Y*@BQcn{obpHiK4kuVlZnLwLfDiN$q&kZ1uF$U|Mc&PbO)T_
zHkB5+FO|^wibxE_2&{C-f_y6OvoeI8QJI~lv9N^g`On_U_YgUK-gO0*1sRG=XXv_(
zKwuaVS{tOPi(y0vky5WaXpGznLnKIIq;wF%8cvRaZ!XAz(M#8H1dRq%t0q}ylIdtz
zw{YzCEX8ph)9An7#kG9(m%PcbG}u|sH!2K$)j3BlM_=dJoIIat$|r4@D{7CP|C?^t
zyq}t;pkRRGD(WSPP91cXk?9B_Or&r|mxdTJZt@!7?{Hz=cK|u#Y#1a8hV=a3MVsaQ
z+iieV&L|U+YRGVqQev3-cDNy4JvNKJ<kAHvCx-~IpS-WXZvTE0LHfwt^LINBS|yW`
zEpau>=#kWJKIaLMB1MFOg&}N&DUjwUv-rC6%-P}l@`)g5o<TIpvY|me5s)B-J#;xA
zGULp%`OBRZ-%6k}alz#3pSmbpqsj@p_f4XX7%J||q3d}rD=#n+Xwso4kAa1OfnU)~
zURPZDi;Rmuk<=Cp+`^Dfm`-rTc$+L%#JvHBtyKp7#{>k#BzZ6+o|eYqWPmfoRAGU0
zl`C9t{sHIf%Xrqa8b04g<W$hySr(25z^JQ?UXI4_Yw^_gFie^8Cby+tAJ5*y=x3wV
z%{O^%qxSixKL0vF#hYk@ljqAPr*9&N$lE1f1ZoV!B7eR^b6qsYeRYi2#W(#N4I2zw
zay&*~UZj2+OjA&NO#{obUf*oJ1ymf(vp0;pgy0f1xChsT;DO*8972HLPOwFSy9I(f
z!QI{60t9!r0E_LyvitJf`+vUoJ@>nFPS2U?v7Vl)n(C@wbuEnu@ogz;(SEdS9V;6{
zuAI|-u?dJf7<HCC`B8J5O2zrDn9Mj`dR)H<lPNpAMQlNiFdoW8Xl_zh9Irc_m$M7T
z7&1+K|LiE8m+V9BD=Blfz2TndR@hO}V}10q_J?^saV}!6ova1|x!k4>_~79N{)$za
z{_sfXSPhv%^dilb^$|P_QWmX3Vx3sCOAO>TcT3XxD|vU<&=ayJeQRvUiyfy`ztv<%
zxp!vHuMyWBmi+7<vxOfsa-2ETa3S)p9>Udh!7_i>(N*HaIGb3~dyRUO#!1GakI54{
zR;YmY7AZ)cFllL9EHJbLL0@0c2quI%0Zeke_D?>{3bKtRTxI%JKA*Rv;#}xM=v9uc
z!1<URai5pnV#_8)E^@F=RThh>o}>iKQPy&DvxCJOq#KqPRa!&<r`Tn#gKN~DU~+&b
zuI&yVV@p5(tYXu+>x~g`TbBV;GA4TKS-{`U$kw)ZQUu#ns+r_fIIFL5^sVCIn&;sD
zkRb^Yc4XwiSFG5W7FhWA2bhEWNoTl@p9_NKJLQzg*DCH9=$xKH_`>SwpV{a>@*8l3
zlQ;OWPrO3=!R0dDGmd@(CyYL-p0k&9x)K>Cvy9<=SwRD~4M{_<zoMnVIs?-u&3G;L
zj!494GWID(zEy?uLjU$ZMcDyUYp)d0LPaR|7>U7Zg$5$=Z8pg|ABeoBU9OI~IGaAM
zUF^dYgCaFPl#$qV>Oip_ReEN2q2JgJYDP9_{`)~OyxqorXF+in$|cpp>Kez97-H(O
z_|jfD!L&6ath)S7D=~J!EZ3VFz6?H+X}eMDG$>lP9wUg8s%7%)TSU1QH`$CY7#HeZ
z%x$x+<7<4tN!J^675>xo!;`-~|2|^)621HG#Z>flV|$pBw2h!ZNK733F)=$F?{#`t
z5~y$M`{YZ$O;G29CTA$AG}c(BP`sFJpg`VH;|g@@&Fj}VTZf;XkvD(Bu(_r-3QTe+
z>V;tfBsB5=^wdjtJ)m#>lp1Mvvp&56@X+!T452uQ4zPXT>cUTh?b~8O&SYq>aC4QM
zG8p%mG=%bmL}+<@^ogS<_%2;+PaVD%D^XczjgkMSv6sl*d_mI~T1!-H*d+Wu3p98v
zocfa{uD?t@>#}Q1voFSw(y}OpV?`}akj!oI-O5K?cfwUf+(sK(1>^qHAhI4(ur3F!
zNhrsnxJm4B6S3!Fp0+^Q;-pY{$};)wiioI`2=ZsTf|n5Ful$?K*CYS=>M>3<TVqnz
z|3v}+toA;db*l0GOA~%hym;>a?!;Vj4hK#Dd);-{knrrkZ@}B#LWVB-|MmR?$=?6H
zC3tfejy{CZ%uW*6ABXU=D9NeHR=+n3R#!$wAws~wz(BY$^f376$iEBD%Z8hkySuHU
zwHueWgZ+i!N3A{KS6!Did9LACT{2kjh><u}FcYGXJH&*B{=Q}VJjOWo_NQqNr`U_P
zGMv^>o$r8f@P|pur>domB)>-wlKLv<gea^4-L<uqDhI>|IVlLZ(i70S3e$XAh3;v`
z$S;J;(?W$&s#}O{Vm~gBcpjDSU`rM()BWhAizq1XQ^F|Ee-4WX<n9nKX?A?u|C^al
z9<pcPP~frfYpHbpWct=jVbsO{a(}-lr_)%F_`SFg|8m(ErM>5kjRBv>r#26eoz@UZ
zp$d^96yDE|-gNjIZ(>JCjnq;JZm)%#UpMt<w~oM5S0<HGji_Wsx5Db~sci;X$9*)9
zF$hOi+pv4#2E$ad+HPuN{?RVM3(?EGXoD6mgDf!?40CmM)+c+WIQC8|gN*IWZI)cE
z(M2}1;+vuMm9wOOnbG)-{wy~wq(N4aZ6>E&%qaSTBUs<@&!CtkmOw|r1^p-hc%3*e
z(B2EQ-!hpj#}&V>XC@MmfK9!F3>WH$LrqCQiEltn3Af?f89dw;+FKC_y3FSEpAm)7
z%gW$Pj{&T!+_>6@@BGW)qEKWpD2dM!;oD>X{*i+W>oTXY7g+wq5rMMwx+|++qz_jk
ziFu^fgK>m&AWLyIDe|L~erHrh{YZ5c?kE|~K(!p88Rdb=;xVnLVqbzN7;&fRFoFm5
zM@7h!%|{G0o_ViyqnPw`PjeM$8?rfTZ8$-=bee1HdyAh~kYg!rLub5h5|ByIh|<Cc
z4c?&pFjbXToKml)U6J(Wpo-SZP&{a5Qg3+RPFj+?esglJKb{d)N4aN%_SYwRy&@Q-
z$RrTRu34klMSu5@+^$gD+n$U#niR275B5+v*J--NdtTZx{L`0-`X`vT7^~6_x#D0!
zC#VUlQpc<bx6*uYTM#e2I8@h*GVw=WS@}=N+|`PVvV!}lRpq?<&ZV)sg%YE5D*c13
zh%S~UtR<vwq8QxBNr|xar}_u$Aso4%eHe=3wak4~HlogM42NQhiN`e{6dQ8V-X7vr
zMtAl<$5f72HQ#Y8<ri=h<J)9dY+xQxr<yKl2kiTCp0bHc8k+M<nm23G+%c}IpAY4N
zhBTX0NNXbBH|-@n4Bb*F*7Iq%yQoJ9A<mAb;mwMja{Xb__P%juNe9siNf8qyaje*7
zA$(y%6oDmCK6)i8yQf4pBF`~n$>bv=vhu{Sc75Mfc~3(msuvL1U`L6qyTf;uRd8h@
zj&n??!>DId)7y~R;*m|%El@a~X{pMFS_%MlEd<DEV_rHXUU50bSP7};3H7{AmyBTK
z#Rf@uAsgZtmxkLmzzlKLzCZO+wb~KYiKv!!(q;$;#y8mz9$M!8Y4iJvzm@Y!$<IBx
z8G`|Hd{+L%_Q^{4dtNcij=syRVy4_7tqHTmq%hg!I`*e%W3y+bZR6WJe4amV)QnmN
z>-J4ahV0!GLlD3X6U05DtBihB$xC8k(V8N)Urv`tXQaDY8^!4uUhDN%aEQrO^=!bY
zhEp=htYV$VLYkhV-#r_G-u!v@5`0Kd!2IwwM#|#eZSE|kRc%d!G@24hT`j55G$fQD
zZVoY-^na5aL%8jV;;(3MuW?d+lQC)3(h-lOLIbKH*53@dz<Pb_(u5hqfXA<<DU{Fx
z9>};MA(MC=)R{yt>lCRMulr#^fG~$eSW>(+%S>fO>YzMg69uNnQ6K?A2~ncL6UoQ>
zK!6NS2nhEWSyN#l?Y^;dDh(L?(lFo;I!Z=S0ISBoIy6fDna1NqBfk<f3TkAHbqd=;
z54<x~Dt6s`_-t$bN0pkhnK3KCD9l_8fF{UGi8@Rho+Nn|b>x%1B|Zr4#O8Nmg&|GX
zonC@9ExLYV(~=&ov}O9<>6s!d-E_w~!tm9V(J_$1P!i%%5fF?e5D@-bkRxCq{Ffkq
zc;`2d`W^w{pF;K`$hB=e94s8oZSCE--T&R>a(1+iR998N#iGD^IR#fqQC1TH0TK98
z7BG-sY7V5Ay%7+Qp4C;f<&cn&NJvPSnVE%zgj8GrnjVr03JQ99dRl5<wUzyJ44rg!
zytExvbZqo=J>+d{Y`na@I5;M_Ie&BUjPP(x^6^cIiOpi#ZV)<clDlnDdu&U}jz~)V
zX7$_A5lhp<+|s2OH6UBkLqFC>fP5m@H-2?5B{?l6Ij2w8Z;1(Zdh^$s5aLR6XUVea
zM1Su<4{_qXc4xlx6gu%0xYd<PvsY}lvrm+josd`f{ZVU1Rr9xo>Tez0aeci-ee+2p
zi)BZ}A#;;IpTA65TQA$W%s9BLx_q5+c3AQ9TKnd;%^u6nk<QMQ!N(IXz>~qnmo6Zj
zDi6qeuN;oA5<~nkkys;^TqBX}V;HA)6tiA3y>m9;Yk{a-<_E=eZLKT=#exs&#RevM
zE)F?zu9?O!F`}*+7Iua2J&HbfSL*oH>RFZ9S{HfP*W24QxH$g`@T&LW3fvVA-E$}l
z@~jB^mY?WVA1NDipptl~_2VcYaMe8L#5ZW$w(!)g>@1-6BE+FSUh^W$<RQdw<%jP`
zaKKKcIXK(pu-N{-!~+ymtru8l5LRIkR^cDrWSv&;__M>apxr;V&oX5oAie)vczAev
zdU`}h%=hLW>0JdSB_##jZLO`XVWI1>Nt-E=>p#-gBO-QU6ZaBgchl1LBAWlkwO?iB
zA0%{KCU;$xrTlJ4U#khfE6Cn!2)}Jk|J#&s)0716%({8W6IxPoSY3ZuSAEh`aNpW`
z*3o_S5>5GYsH$)<qI5L5Wjd#Dq_}jXrEIROYPPm@xihoxs%3Jnb9u024Aj+kUORo$
zI)6Koc{9+uGE{Wa*L6P8_%PRU+c#G=xzRPb(={?O(z`k}xv;prygWR7F*<fNJ%2H@
zcE31uyR>w^ynHjWH!^jwxOg<Sa<VkF{jh$tyL<@V8Nc1xI^Es4-9P%XyT5vPvVMHA
zd~mgKbbPdb1~~>Do`Rl0M-NwL_t)o;$J0m9?ZNf!`5ol)=H>=;`*izwa|eb(?w=r#
zI~WXB(kcab;Rj4-MFTek1Z={83L-*A)(dCRBK!mS@m{^i#!g{a`Ic~osN)>NYU|TJ
zR<|M5sU#RjNW0$~$0x>-?0LL-o)p`KuNZM7EJdB3ph2Zg(e}1CUEwu|zWjT^m#&Ez
zeuZAwV2QKIgzvBDXFt%{C9_oLq;4qbmZ?~au(ma$GZpJRNI>C0r_`c=sYxH-=F+3h
z4co=NO+%fn=Sv{GUGEVXI(GYoNsc}N$_V`V7C2_gG-e7)Qv#(yt&*UZ-(W%}N-eO<
z%h<P-Vp9M}+2tc{9fYQ5cklI|H;2Hz(i|VC)3c~!Y{0$oL)X)uW#pME2zWu7;}<2=
z`)4NL#Q#AW`8?I_`E+ryLa(N}YJ$XP5A5{Zucg)xj0aBCFw;J#Z$8^~^!Gq_=9x*m
z&tXrO01uxNXu0g8{54$e6;SaKULD`{BsmS&^E#w3Hu*GqbP0IAQ)WK8NqF%T%?l~Q
zp*!4~=-#LCJvZGFL%=<x*<66v-J`eV1?XL4FXjs3CI(Chc6KR)3>_2#+$|(K5rBJk
z^-L|#wR(O`D#9TUD0H1~DU_-GDh>)|9J|Fn0`4*AJnn2A$w)=PH)ytypr#Uh81Y<O
z`$zFrgE7}Z4+6`kiI!KSlW=_CbtVmP*B6FBvCaGr+JglKJRf~&nmvt#){)2Zb+^{~
z`Ci(lahddFpXYYAy4*sTd#)A;&A!2|ChX7lOvkU`KYO5tf$)kl#sEilVtDw?$k7eE
zP{~LLdu~V71n^!0AJ>WDX_2t>5)lS}%FOLed>Es72Ecz(<~;ac8|FZNY=IZ_K-o30
zu9)HLJvTQ#ETG+2UpGtsdD3dYgVNU~*5EUCNO%cOiN?Ft^~*0yKW>ztKs`R>KJyE5
zLP-XeoaC{8kzm~LR}lbxm>P7WW_Pe>pYsxU`n(0wgG~FwL5td6lQaNHc<)~{wR)fH
z^YL*7F5{`dYSU4`grM$Bu7q!Zj=H{>ST2xdovN7o_00Roqd(3M!xP-_zwF#SP|y+i
z6Lg~IsiOvZe>9T*O!gVQyYQ~5Z*^7lGgYWvx-88n!%yBPk3->rVXqp~Zxp8;2^)Qn
z%z#cL(w<Jw<2yJz;E_nMmryOkRAu}qK8W~nKN)yC;c}!5mt%W>ZBXkED)scws-O|!
zh0lUOW02&d6X@{jjajydzOg}X+IK=y^%MMDF%Li3GBWUDfTk;|zOB8{8R^4hb}zwB
z+SWrA4Y;?Z=h6_)>3fkTiEttYo3cAgQ$2`3BGuKMuCB`YB<uo@441?nr1>O_ctWrA
zkXmesot7&RAP(24gq@D}KP$hagP6XdZhoAFmKAF~%y5f~i=RUcZoA^=JC?MZo?okj
z;m1yr(qcf+Ou?=7-of2L8`KDP>&R_XQ5rXuYf3Yumj;3mk2*g?G5yqpJwSuwq2cCs
zhyrt`{ZMfnTI><q%Vhk0ns!%-ZdWz{5GMLGb?JMas6g$%k6s-Fh2Iv&!+N>H&q2sH
zkTytLD1<Q0w5!#R19<+Hf9<h2K3n|9j46V{!|pg{D@s<NB&q`*adxYpKZ+L*+#IF*
zULAJ6T5*;u{<8;uy3+!OZ!26)VZ(rDVq4D@Kro@&br<0A;4)*|`fTDGLTe*7yrOhR
zF1^V9E(p3lo)DV@v<Yy8E%$>Kd6jb{1Qi6&obUSkuc0TTdU{J^DFt85a<c$}K=NBs
zb>Qus(-Y2U{}#L?H{RULApG3zMwz=iaAj#5tKcXb@B@GcRY-dUuM5?}?`^7iiE<e~
zD$_IirVxOq+7LZL8u64$c*DJkdf8J0y<o<K>^VK-XWE~cO2py5uorMYw_9}V9aJ=B
z#26eugB%&{N2Wi0w1p^a(CTW>1vlAbVh(zf+WvUo1|5K>-4gDL`QwI9r>RaJq~#?R
z<_6r>jZj0TXS(j^<DVz*7S<(l;21O-rl>Gx5xBJ!)~l;K()_c1y=sXbSI^Yg>7XA^
z9C1Um50H7g^GB>sir<P?ll=z+Gr+T>?$atYGh}htf|~sKJn%ZcPyz+_N}@+#?B?_}
zXiE-WnH@}cl>ly4D-4YioRB+aKRV%$I>g+3{V;PdV{&8&fv(ZOMpy82hm>NxI#I$U
z;m`3BkIRKy5BOUTd}Rb~sBfWEz%EK8IH6Iz(c}ybFzgn-($)q!%AZnj$A%EHTLYkT
zZtU1@kWlvX#RKRyI#*>FLo*Dzx^wgr)ZBd;z4iDO_hlxax(QRaEwQcl44}Pu;KQX#
zOb0O)Q0>w$V}cpvhW&obBnu!P+zyFsIYNauJs?oBp)&NYixfOXLiTQ$(|Q8Fefws6
za$8oMb`>i6xXlnRe!nc_?`+&@?9_z;%_WA?jL%4n*7y;`@SNI@iL_QGT(D!;c6D~v
zcS2`>pP;Lmnj5OkyqTHd&Jy)%oy?U01F5XVd%#sice!9f8<egaPPO0m>rc$MJTNav
zTN^Y)EcZynEC<gu&8$)4`ZamQjT;Sv_gQJslmOS=$kFsr(V(<PR+r?L!nr#S#r46*
zi=KyNA<28(t=yHXiskQFfIru?m)}SO*#*vz8F*?<r&TN$VhXQqEG_-teEdXacDU0m
zMehGj@*E0`Qxld!&cnR5wmr&rf_%|dRFi;h{KRSpdFC~L%#0J1H;fQXg&#>><k6$i
z`%$5Eq3#X$f5N&ou)r;`hjod4p$~WxqlOGCz#eCcI=KdBeP9Bs&@Ou%^P}&u@E@Zz
zYL|!o>wYkIVdJGkMwWNsA8VamZk%u6P43<BE%?=*(IfBk4GrNL;@0yM{Z>;=h(fNf
z&lkx@=!yW3`QhQ_G{i{)o$a(J0S-kCCJp{e0>X#RyoS5YCaYegw}VriLV3Y+3h-!~
zK+;WK0P{ZFEpLDt2Ne#5@&y9}V6Nr&hoH4hoEF`gY@Zh(sh_Ab%_mqc3>yV%445#1
z(9u0Vbe)+R^<3|%B@x^f0u!dfHt<Qd_?zeWMx+}|B`|}%t&{^12nA%H@hRbPLX<JF
zMle&9kg%Jc?`B+%e1)*57T{VBM9>=>TmokTBX_$Qc`i{;mNLNGpe~zrg1Ly-0g`8I
zZ^>8u6hUL8`t<>KyIB0|&)n3m&o?JEbkM6`aQ0MK&m)%pTQK$2V7x4$Eg+oYZbilE
zZQg~NQy}jcF2SS=$>v;+G*)h4&^FSJKD=F|4@i6tw^r%`{(akAG;1J(cMlABLWhkU
zas$s8;{Er~1Cr0gW&vtWB}_kF?R`dF_`n9gxk+mtJ^vJ5jd^Lh+x%yQ$1JyitHtHy
z0up+J{{((Isp-B{egzOfVS@vng#th~F&kjs1X#q!ncS(FH>TdIlZy66C<EvRkawr4
zXDt3p)F?0XN%(kVnQ4>KExH4@x&c==q9Gs5=aGU+a|~(X|Cs7aV!zOJ>H}gx^PTb*
z45JgxNQM&QV&(v)VGlf^kTd6oeTC;A$&D5i090kkRO|hf1^8y};KuK_b3QKMZ9vL^
z+c^1L5uOe3y|#l9);?DD0=IHunQD?sxL11sqN)83Pdt-+65Z-bhqq_k;y5gE41s4e
z9Q$fU(r-x*Z}7#{_~L1^AXWw4p6?a`cC)V^ayzbO8P^Bf&O?hEtkXzHa=ND-p&&1D
zP<BtW799}ITN^A1UV{$pfcqiXrQCCY*}10et{3BNjI**g6Qnh7&sTrfK`gDqjmS)%
zAE9+GYL@M<%b-1)Ff^D=zz$NUyS=f9NK2>7F@%pF(fSGidHVqdkN$F$zH&E#KQ%SQ
znH6w3ZtFdV$n^Gn%<Xava8)-kliLA+=cpxE^pE{)gA`AUtqxgv6H0dbnP=O3WyOg_
zK6-nwa{o><{;&*(c0WjfMuq&3tvvVAB(E@voWQg;@k=@RD;-)a-4&NX6`WZ{`j6`k
zkT$58Dxf9cnqOaE$}iL|yD7dmLDhB#sk_lMIGW4Y8`hQ#=>ds&f*}o<Ft2CEUigbL
za^&Su#;(Tge=$bLtePd><o*|;Hw4;KrV;Z1?Jwns`{%6gJvNl4=}qStOZo>H8=Dx2
zJlw7v5T7Gb&Tv1c7T;uzG+`?<Zw2fQp1A3?EQ60;riuk#$<RCoZGE0o176WUxA6mx
z#Q?XjSuY<XTW|SWOmyL^V}#hHT-6OX%+%fP9{!C10g!V(8nK5fU%kQL!HQh{fGfmb
zmmIklo8Z9}t;=uQ`(xob6409&8<pBQ0LgE-TJU8+){Fvtm-<_BQ<}-+`RZa*Y*}?(
zQ@~v)yWad*<k^@F|Ei+kYrlaHf<ik2K}V~t&52xOP7a;7{iml1r{0_^WQ;XCD*dr<
z+a!Y>a<J>IL!K|Is>AYLa6ll^MuO@pd+9%u?OWcqccF`S_Cr>U&CNbm9{$O79WpS0
z+(hida|7<Z*p^H(0B{R}c{ptB_-<Kv0aq`da&sSVSe{v&ml5W}j;7|Bl25P?W+d-Y
zS)S7aj(oS^4Dh4s<m0N2EWnd?^PeX}_@fnTrB@dG&zxqn*PH+U5axdw)iA=lH0h;j
zs3B_W)Rxk>VT+`4NpQ(B>yxm>Ov$|CNv)WTH74r~N7G0m#^pk;d49V-iRqpabysW1
zQ&b!2<eT5;Y%r5!0c5yMhgV>rX`7eY%>(g}a*`2SA;Gm!JpmnKntyo~uzzMgoRNb2
z=LvZ$DJz?!<8;o{spbL;Z(06)@){ss5~ww{6OM=TaX^olffjOECURJjQ~YaGu#~M_
zC=s{;(jJP@w_uGTkzQl{I;$mN9Ql=YDzZAno-)efPFuLJJR_%eG??ux<{w+O4CZ~)
zSgAQ_>v>|)KOt(Ji3pOh$D7+VtkhT?#rim`Hned@aI!#o4S{nqks)V+>d%U>oxJMz
z9g9Tsi@sb$^9+-f@=W`|9GIVZaZuY%(V$A{`Ny+J0<$_%<=Ah~phC5d!ap0X(#u<C
zg}YGR9d1+qMTJEU-#Ov6p7oCCHL}9;T7&4d7EnAZwXG41($H*@*>k7@yl2sCh3J69
zQI<4;>l8-sb@D!N=C>QmjSQb)K0Cb^x>lki|M04h5vdiQ^e^(mB?06?W66+qTGR~l
z3)oPW$Q_RbUy@eANHsJmn9#8wa)X!&4*6Z<Qbl4uAq_+*B1xS(CGrT$3Hqq6%GMlG
zqR)a%!p3hkBmHc1Efk?0{1pSj(1{5oq(lQ(a1|k-Yvu!mfh2vs+n{SwKIZqZL@zwU
zyH9LzZQ?&4p}5mOZUJeC69dr$iurBcN)v9z+-=O@j;K>+p0K2HrGu^XL|~Gad6LSt
z(A68<zC(3Wa8a%bI8#d<F6GZ<Lv%;noL{bluhF57LK!vzX9D#ES*ito#Dw}rt=#xx
z?(>#b78N?eDc7+ce$E2K_O}M~P_l<l93Dpo&6fvwbue3@zWS+H1Lf14zGP*%VIRLF
zeK>KEd%F)Ori0Hy+;#TD*cof_EgL;+I^jMgjtj58D>GTe$$g1MWl9f1qkZV5-5BI(
zlkJ4}2V!6LrkA0ICw~4YRM=Z|?}E$ctg&>2!+|Se6ejn2X_oU?PJ&}QgTL8PU*wwp
z%c;m#OdhseA|5WqqWi|}B{3|V$slip{yCuwe`^df)1}Z^CDF5$bM9(p_uwZ6biG+s
zLGv@#8l_qm7uTwP_zeZ_cWjzx#wDL|C&9CoGn0B$l6v;J=d*VKfAR0{+Njd3*XQsC
zoJ}7ZFD$IAiRp?qvfCF8AB5qv&C2%yvf<WWrdQ=U^v_l9J3>}Yv9kN(5Rg;fk8yc=
zRc(}Q?m;JLtDm2#@bIGN9YMprF6$;){8DX_$sMNa7Ze_Xn*yf;=^}T&Sv^yTIBZtv
zZ`(GU(kLpms->bE`{m0dE$Bc_Y1z}?0d_>&30l=7l?ILZR9nMeKgf-eEluD>_%8ol
z-B6;$t&kBWtgj9J$&0V;H*<5z@w)A+n>u%lzE#~OYf4u2O9mfXcj=#nP@xOymSt54
z^2!j8XS;t#|6}t!b(DjJkv(3z@n50*Xm`?yDM{9!uBE6$AMh%E=o|gI&-WNltwj~s
zx`7(Bw2qGSw!W&za&{saadw_ON6X@f*?T{UB~@eY2J=sV*GhfrK^`Brjqq%gbMW?7
zS$T?n?<O*Y<%$=LOKZY??Z<1B&kA8^Z)q|(PMJXEimQ58?vgj(x8sfh9eCen#HGXh
z$Sh76oa7qCs7br$o_QTsk!EZ8j-)8T5Lhn9z=eZ$!RIX9ibUMg0*Ti+jh^z>r*eiB
zW5T8B&|tjV)M~?~=k%5M{zz8T2Y`()oo0oyo-B8v_RwO_+6m`6EFrC-d|xBjo*+&r
z0*y9mIW|9f8+4>nJIY|F<a#M=z$FV5KL-n9GV@pf1U6uvSCqlX8~SzwWAhc6;8w4{
z>9!cu;UTL|K8Ebj$KVX;pXRy}sE{O#7wp+5!!_HqgJopYl|wAXlt#7+913*^*BDEU
z`U(2~maftM9_-X$vCLj3A^KLSS=$F2kuJoS7z=7J{)3eLC0r9;>--9YkA{R7LNByv
zzV<in$%2q*PO6h(Q0AIREX<Xcn96$1IYn|;a`9)kZcNyKFx5P3r<5Z1`Za>-g8ZJZ
zAuN0+;R|~I4$u0Js90}TmHqy2-+5Gp`prM7+gr14>aID9hW}FDkG!;nO<9a_nb$)`
zRO*#iq(whI2|CVOE1j268aVo<t)8E&`6R(P?+>7*|HTW*``nO;w-9C6J0;kE*yDff
z0|Qx|3;ky{Pw^W|I!zdJxFMH`K1`zd8SfoGc37+?egzvo81@4W?%0Gm040*&p>0p>
z0uF)S1Fmvl_w!qGB&_h&$r*PE*dCZ1re#tSJg}>Bs19n;55%*2z2h3x`7@yf{jWQd
zIiZ)f#_(1KT@Llsy6*Mv2>};ei5_w}og46N+UQn&=nh|`$aSm^*;#c%qfcXCx9H<3
z-+}~3s&6mIU}oE~@+C)`G?`ET*YaSzCUw}{&`%OYm>488u{6mVXJau`h&)-WD0r_t
z?yuVD8=ay8QoQ|mE+ElV#OTk+{9EzcK;qtS1F{O#$8!UpqmpE!O!#KiutZGW8E>RP
zy_VqA6ItVVUn0r8UdvG1pd3UPX;RETG9S#`;orT5zU0J9LFr1sB=s8wj8LkAw)(aZ
zID<?oM#oZB9|86JI&?Gdin6Z0zs499gFHchMTYyiD(?}(G5C|pv0xI_8*kypw>{{7
zQoeb~71Sp*#=H^|sX%N`qoqB`Az}FEOz4p?&{gJ(^MmC2S!RY?WY1NqPBPSMPi=E#
zl-1-l-3m(A0l9OGIFHMW?>_50B;_)}Z_3VN8eC%lf!Lr}^~|f0d(7`p^tl{K<Kkzn
zJz9a-&aHfAVJce*_geI<P_c4Zh8}Mt*w_)V$m~GfnpW$R_^e>RRY3v}b=YEh>phKL
z^?uLZGwFu5TuCYqO}0@`I;8}O{-<dLW}O^7UybS6xegt((<Vi5@dwxTpHk)nm*$ds
z=*R-28mRqU#6DdhoDDav@K5bKO3&Q$`G)}BR}UbRhPFZ}*9x5vFej;w^)Jn`<Nqz7
z|BEQyTR=4H3mQ5tU2D=itiQ-Vz&c85m%sO9pTgRPD~GZ%8>5Rg>$>c6zLLXr?H}pB
zp7Kq&fG^h`SQsE)q}a3>v7jkXlQNYnD-QZ~HK(@MFA4OJ_v}<f=oS5xSsUh-W5Bcp
zR-Hh9LRe^(C|h*EdR2I(Y3Y`n*O|jDF@i5EFj)LliqKs~@b8}vOYx0h|7n0n;%l#C
zvnJ6>FZsdTA<lAs`}L3G$GrzV{NnR+FqgL991B4vV=hsPu2uvrx*w`s$=%iRKXLsC
zO(GAI!j~{54x3~ZJSVXuF-+a%*#pqS7F`?cWlC96&QQa_;X@w?Q#SIJe+e?eRbUS8
z4D)Oa*Ac!oY=44CFnou0@Kgf7<cCNOwkC;a)lcwZV;gr&wTGt1THa=c#@R7};x*%@
z#mx$_biPN^?N$HCo7128@o4=C7R|xsz9!|hjKIpgxv!1cF59pzteVe<qGZkYi0;|*
zt6w3Ow=p<G;)^^yW~J4*is-RYGxWj&9p2(F!b-Zg%;mud#{|9_`GH$IV9~Xu0$IXz
zL`GkG^<5(8P;Jk~jld?kkk_UUaX+f%1X#L$5e!XkVgHW*ah58HG}EQyCF6YQes10C
zU&o$_Vhb`Cbo(@S*hmr~AKx*+Ly%UhviW!)??ncxvdN$M#0isNWoyUy(PuP{Sg|9O
zz%Lw-(nlJ|L(eE8Yt4eg?4RSaS{$UP04#IAs<iii^eaULPbhRHv|Pp=bnR<lyMd|E
z9vzsL_FX2Yh0kjGmiAn_VUkT4AXAP-Y@K>II%+B6fNbG<BfBPSp8u^Fp}$#ZmFoJ@
zw6iT~?4V;qD9!UQ?csZBPqA!IGKL+=)m&T-Nt@<JOOrs}9aW*ff$c#-qBxYsE*y?R
zeU5LuGBn|8SJ+Ov`-5yb_qKAIWxK+v61td|IxaC{F1p|AZ|nyqWpvXQ!~WJYRX5lW
z!iST3($jvr%F6{*y#we#F#rzO3VNQlyU?$$n>l_Z-8J<weBHIOf@_lJsx^2!(6z3N
zfBYYyw3A~HO@olxS8oo;gu4(3zasU6zi8M*vzd6+hvMDuPot35Q|)r%Qc2JDB=}i6
z+`ztx&6;8*z<!1+jwsu+Lg1S*o0sRptm7gnWtCvX2UtxwU>c6I8Ad(zbnMt+dW<(>
zkqLI&zV?pL!WghXp2jl(D*inV7uSj)Tv!&^rhVvq<7qhtCxI}?ppzO>tx@A%1amg;
zr2xLL=#2{wkFXG3@HDcAGO22e3?aJUyP%?#3TMV?^{+IyU!*7`!K=pMWQD9|`T`wt
z8fIkEGs{qHX3sip`|T+G$#Fc(V!<p4ts(CBF}C9w6TnHs@}}jXW9&jcx?~Vg3=~hm
zv8y`b80Bp0LfN7O%jD$*dwQGUU}1$A?7q)UrL_M5&x7vKGx8g?5xpCO|A54|!SWAW
zaJ&%L7Qbj*9Tl><Dzv|a%Mm%2elWJ8hkH`q;xC|9y%yquh3*3<_AV`Q>6}XY?&6no
zD1dyB8L-#Im&fA#NLaWd|L~#@cr6v`#OTort1NgvNkNYtLZc+@i>pjA>kz2}gx@|3
z6rH8CyR=3?M~XSH=l}=?pQ2T_g7S-gUlO6c{A{~`I)hJoMyx_&w2d3CR#bYnneu3*
zyS-0($o048vUu69WJ{Lfi?XNu-}>;Sew56!>bw`MPMc6Tu-d+w2547^;R(Efz&w1*
zaCdRxA7Qzh2Q()^=dZTPI97=hvu<mQN8eFD_L_u;0DBe#{L2>qx?ef9E0oRKMmh*{
zzR-);70u;3#ibD`S;NJA?w*n=jCYg0bf5cw`T75kDknDJ%=v}eA0a*(n36mCC0m+u
z91~D&QF}2RD~9I{kQws}Idd{tEU3&PA|{)4m2*_incZP=o?mCJ>#k7gdq!ENavTCY
zqkv-dtu8@Wv*O;R88mG@?mP<^n9r+iMf!)#%N(6erwdg#r+`fT!tsLiLNmx$VSR;0
z98MMgHL<oAUlXF{(-_;QB)EOzE0NUQI|HVSN~}eZ36+z~j-eNRqcJcmsq+H`(KDi`
z^p|sj58C~A+DIQvE9qah7wc<Xagt|+DENJtU!#ji5#SL~AZqgM$SjLKxgFKQj?A8+
zu6t%Otr5it0P1F)xBct1&WQ?1EGp3gW>`?taPD~I6=S)hxgxczQcYdNNMMjX0UAkf
zh-e<JHw(_tZz38l6m$lh7`hZ}RN=b7p7Km*4^q`UXW91P?lWn0+X4lPv8>iw)#}U3
zFR-vQndf9J*F-rO-1tjIH~u&y50M0EXMs&nJOL3=)VPefkzeR7;xOWDCk4sKsJN(8
z0~OkJnH&@9%@`eTs}!Eb9STs64>{o;gVIzFiqQ3kc@VIhPrF^R?OI)-$wS*!!pbI>
zlyCOR`{P7!W`#8FRgIV4jlv0@y3+%F%w|7>FJq+AH8+c}3>OkPj-o^aSc`g`o+(E2
zeWC&n4l){zIoSha&~Tx*1euO}>~~o1C}3PHCB~-~y`6jPwkPWOyE)}mIun<XR<Xs`
zr0b<?_x{4%{XF7J*JmfRU)qW;EJW~8tL|a3mWUo1TQ-<#Fue-Bva=1&&Q7vBwHNcY
z+^??MD8*N52Q*|_{J5d$hxrK1qq+h(Y1d3D0}wK8!Hi>?Xs*<VME2KpV}HLsUm|~e
zy@G(o-w4zmimnH1(MGrz3?EbtUl33;#w*0uDZ)y@$PEZluY}^_C*VXtmJ_Wej%$8u
zmH1nLr8p7Er7iUsKqmq&s7U{71`{%ZKwSX&yL-Ka5cnAxB0&vQIN<#zE_cZ&8J83k
zF1q!Q!U2o>bYm>g3%hiCo*4+w2Z3=0q#PsTL!zRQ+4!SKdx<M^<e|93=&MCbmX5tL
z)J*FzB~1uACk=`ys%5>@QU#{A=8bl%u`(~x%y%3#8<kwrjt)r2dwiA?aC8PD1Ackb
z@&HDh&3w`I(rB-AF~<ihP&|dg0Cgx<3_1X*PKcO#2Oa09HViqI(g2(<Cw7p_6>d|<
z<;@p8y3oJusQsIk@hF*iL9CYtAAJho%6p!2#8{hJ0TG8e?H>3=AyX~z@K>2m?5OS@
z`Y4gWmueQpV<dMEzIu<o!2VBN-6RQ9QN4S^>1(kKyRy;(d*#KcoKYD4+bbgi5W~0;
zUV7*sEP${|%X{3NV!gbWt_;e%s|3B9mQLy~MamCfd0c%(gjzF4On>5`!aswA%(cu7
zOX4myzHD)bsa@1Jw0ZS8crcgwe*YYgRSZ>z{Oh)7gbyT#J!Qx2WfD=2D5L?Gzq)Vb
znc8_=m&SL9=0uKFjl2TVuQ*<SZK2J%uOAv{oZR%#e?EBpxu6z-UA%A8T!(a=JjOA{
zvI`ORx2l&5t9CxI?gLoFhU9Lyx~jU^`S98lhK3gWu^!I*^p&q_#1vwIiY8REG*>LB
z3c2)V8sc<AU6U&287Ty9@<Rq=)UkXUeFwQN%+&M5BL*os=bCR6z_5r==*Ul~+LA9n
zSZ^>n_H0O#oJ?m`wT`N=u;O>1hjOtdDJ)KZ3G)KUJz3Bus#W~+oi6$8!o}+d-}96Y
z{?(t4kwa`7+3dABSMPZ9*i+H_bx3@C*mkx8%4A^<t3$7SbP-|tk;kqFcp_HhdeH}>
zMsGPtv)SSU`agM)h&q5UJY>OZxUl(+ue?+`Q4G3lx8Xygl&e#8il(`D(#X95`2+2t
z0TFcEqZ=^|%a{g*;_{0cF5fR9t@_o%Z)OEJZ>P06hs`b5(fgcM2q6kEbs0N;mPY*}
z72tval^LUYUBoA1l5qVj0c^U)Z<FH(t%k3<&{pY;-1}h`@LyM?jz8qVgJASGQ2x-u
ziV}%qJS+!6mLF`#zTAg&rn7RoZBap76d?f(2rK>W300mM$hWN8<<UHECtc8<|5^yE
z`U?n56cE;iO^qMFMFIswTYjU_GgAxG<{>xM@{}YZ-vVijDHh&TqbXMv_V;KPZ&f9)
zv1>mLu_`FvSu|;unYkBoQ($l_<Ay)cunQ5iXqAb66m%q-7+`%yPVIKU=rRkelOGpc
z(1;zGe+*YhJR!RFu{@Uy^j+t`Dz#!{(O`=kyCJ#4m%F7QBR(CZ8Ornf3>Lx?x4{?(
zz{aRz`>bVRaQ!JQ8$-*Wg&M(7t*y^0vZdqT7G+h&WcX>y^UqK3ehu;TDq-FULw7Vl
zY*vz!g#?DjNvJ#s5C9=o)zAgayU4gW=m@Q+Ii>8YM#rH;*zlFDa;i5KSM#1Z^Ow9}
ztdB8g?>=t~N$aEC)UIz^%8MVrBg6DQA8DP%la9p4e)g`L$lB$pjO&Pg7CzT>+Fl)E
zDy(=h7bW~Qp&E2J*8OLO9h<*cs2M?Mp{oP0dz-WCX5p3;jBzBuTISvbM5)w**nqIP
zXlL}nI#ZO`xh7@7WpTW)F-jRdmxOO+xPoe^0tz@{d8HK1xIYNp3pL0Yj0UH$%6NX&
z>5uegGj`w!YK@LSJVPzQh%e~r?TH*HA5{wREE|mrICug>{8w5OEYZ18FRAj4-9H&A
z*E1~x7`IJNsK{aOx_&~(;5vtwU)e+mM|AmUrsGt!rt3Y+EYdW!(6fKqt6DK#Rx{4K
zJs0)?GvO64B4~ALOXt2N^<d2<-~p-SK-ca|MbmT6yKuw&1%M{Jv(MJ_QrEY&arKbi
zPJ9o;F3DQ_W@}oLPqJZn?Tt%pX^lX4;dE0GbW02bAHJm=gHIs{|A3kvJ?XVN@ylav
zwgQZB@V?nC^?Q@=y~0w2{X}fn4}O^7N#1UK({Mu2h~o51i_Tm$M0=Up0m&e0nv-*O
z)i}e{hIkvdl^bID9uCjf8oe5dUfaEFbRlu`@ls&()c3ZdtIBr|u^8r)yyJjGgGq-(
zqt9A-#N4A)J!00fakxHahQ?|plZ>&MuT!L~eoWYMVNhw<Zd~nU-TUlOs-`+io^#%!
zzmCIhHTQMMk;a;DfXR-;!I~CQ3Oy6F(|gPwlC&eCc=Kmxt>_(Fwl2*;FTZFsCr;8_
z<N%+iW#D|uGoQ=&7Hfla{#*@FSY^BZNm?{c+N5)w2*>ipJ-rh`M_hx0@Xc0BwkOL!
z?eo)3*EmjaFEByzs#7K|m77T6e^9&TcCIp0$Cx*}nw3rMN3cv+m&}SDPDROrJBj*P
z<$rq3Am=iuXY%`sA_*`AL=<_mIH8(97IGGG!TQ|52aDJkw-`uayGu~LKG??cd(SJ5
z{ZXFSGwMBDoxy`QA#4FY|JZ}*iCI-X>&k8)&wOn<95co7GJ66Y*IUu&UGI`e=l5G>
zzgIcA0*JpQ(#2gA0Es*H_+~5LWbOkwAcddfTxMfk=p=`Mt?G=;E!QK(GBF>9dWeX3
z>7U$xh%S5&@;jXk&K@Gu`!PU&OcO(*TUmOKAK(#mt0o6xhL|?CJ#VoJ<Nfx)YTZ;=
zL!my0@6yf#s)FA{aii*Pl7LzelHk0QsnJ&UjpfG8*bY?L4kLYct|MGO>dk!20+V1T
zB<I!pYECt~(bg`x{in6k!Yg4_<`Fd&>EYd@VOzI5PBxrkRdmGruViF*Ekyn6y?Mgu
zUCf24RE}asItw}&q<$mb(1g)V@t8%GO4f(e3ao_jPd1;Q@??FKnG|u)@)p+7f~x>F
z6A9qBmSZ%VAs=k(cK|R<`1x(RaH~WlA>WZhx1F{1`OiH*5jtYZ|Cr$ZhZg>i(fXgN
z|Hn!P)K7|FaW#~d!eg>fB=Xx4x##k_f)e)Vb~w<~OYE=<j~H89d$d&_wfjQ$awEw!
zwKkT3GbKMZoKxESw-Uv5j8wHu(!$+A8Nh958_gl>yRj)tT*m%zzW5)!scWPGN6E(6
zi?YJxGZ?M#3yG}K$6<Hudle^U^1n#gH(L_TI4097ke+HhDFK>RxU~*1G^aGPA+1XX
z((>hCORq8K^75{+Y4V$>X!K^Lk^@tHTuU?%!jj<=DB&ce<5iOk49@?KmjP4_9P}0z
znYz;d%oZg*<77a9twMUxG*XaNUD%(e#syEb&4*#;y|P~t2A1Pa%i6NWI1uY+NF#oB
zB@&j_ai4FTq`u)8HA7|D%lOF);uofgU`Ic$-@KJ>Aa6(A=x^|GHXwDH`h90KI5Z@5
zs|2BNd_-H=-YeZngk9rI(JSnfI41Bp$xM9wL=gXnr<^3JK&=!Pu6j)4&X+4?LFOa3
zL?pCp&O;W@sX0)}mqJ~b9H=&;77eD{kKQ`VNAhe-D1birWD=<$AamP9jT_HWvKc8H
z(}XCD(3(E5$sGpa9LgTDZp+Uc?eO`fp(DOy6~+u>?tO*CGFM(uMzkwC6u~t7)}CCa
zm|Y@1{72sQ8)t`)3V;W$#blYZr{TBG`0IgjLi_W$eX+jUID#q2dH_W8Q4J!L<H=-w
z>xhY7>o8{7RD?Z(bv@iQoIABxbml&15lI1pp@SVYYzGTXDn?`!Qr3RL)1NS*Z+@iW
z`3hvU<0C&}OCCStX8zt^)S7=>9u>igFStj-V%%dcqT|s=!8=a|Nur|9D!Tmq{wY$h
z)-U$GFL>EV+bxN;der)@rZYUCKue#I^o8U=xn}EBOM|0wVFi?E!yX!_z)m_Ht*;V3
zc*13Di9>)81XQsdB3`L@p7#jJM+Hs+(MTuhe(tkG$X|8mBj}9aN3xaZlPLbG4+er%
zOP-+85}99qy``^ssxh;J!4G*Mkog&+Z-dz*QPNN7z7hHCZBm1hm{Pr^G8b|J^R%$t
zg3+MhxHpZk9YjuVed4^&hfI6iqaCHK<v|w6Le>-|Ht6#o@*LD<G0@FkQoG)Ip9{q3
z(1EoQs4Lrs#pXDG@p^N7DI5zq7_P^~EWc^_M@<jvJ}APZ846_IdUxmty!#@<N;rfi
z6Nw4S)8B?oQMat|ypAnZL&Y0F+lS)TmkDX0zxC>exyacF@Db}$ODl+@ueU`4>whKC
z!|+aXsl%%1gK5|3(IUuzE7smO`>%}S*-MoMsiO24Z{s6_zWCvEhZ79DcG*IfzVY*<
zDJb%SjX{)j1x#{Lh#xZhY4Ive*ig&KlCQXU^yk@)c)VqW!O1)(*}2$Y%eMD$G9%in
z5~x@ojevNJiZ^?d#lb8dYTpOs_kEmg{1gLx>1GqNikKv?HYynlbj&3=8{i(s1LgxG
zET+O&r&!H(sq-B9a6$@fURR2tsJ@*A9XtJ>>^PpIH4pSrKBeB;rReX?)3M~H2%-6W
z3)`DQ>hOie3`{Gxe$7~$?~E|A%_RA^IE>ciWRda>&W(I`6rTPe;V>80;WZ*)^!Nti
zGjdCrrFc8_ia%C&N<Z__EAlHeavQdLY#P^{ry?+pHny4qR~LqD8L0PF$(4K1SEhyB
zJT{K~_fr&KUvCc3zj-?m`o<d_*|!{hD9<2d^6!Xx1mb|c0=1`V^sq`uJb{2F1sI0?
zrP9`RjN}6{f)GP~=JCd-fnL5MTAgBD<PPR{I#EO<eTeOhoARA@^(b%YtjW{~nljZ|
zwm&^)|Add7Bh)3neL7e@s4O`rM^gV)&$4pwI{w>{<|Er;J#7ONI;`?0opI%^SuRL+
z!-2`-Y2c%z(i`#yuf{!+%U<XVY1Rbc_+2x$+6aaGx4WJ^!@HEt3(0SPOZa5G2A~br
zozoaa4Ry_4Dq4;khaHm_GxZyt5n1rG8~DHe$i#gB^+u2#zvGmgt`W_aC3Np=o&G9B
z>o!|;Y<OpCHs%eq>_qa~ba_@@0p+=?u=RVi!Syvl_0nHz516MdkNqWz#ig@5F^MBJ
zu=EX{=ff$(ZamI3hbNyCO9zO1IC*M^&N<m*7HY`4Si2%+a5l2xLqnh=`j2T_jDe*8
zx|LE0dkPPG?n1|F5^ccIEhfL>m0izfR4MHP-OQ^HX8z3M%DmY8l<$W5(q&)W;C%M#
zPI&pB60W(Nsd28*-sAbt1_pa~d1iLlp8nx2*P*HYwhvB|J1z~#|IM;cCnijsFz1th
z{(X|Q=>y*JcP_WAWmaLGs4O0FWa}tKYa)`0*!SqG<vJ&>FLv+HWn-K<2<C!5XRHEa
zY3SxuD~y~dKRyBe)3eTi6K^EiU(m?D;3lKaxJFM2CN?DB^=kKyZPB9aomr}8h0(A&
zMezr}1u(V{-~RSjgza-Ixi-3R=6%YFSu5O*XqO0e{%_DkIyd$2yjV!buS=6ye_CK}
zJnCh6CN2r@qhiTK0gyIIMpyUY-`Cfrq-}mr7lhPVwKCAFyIRH+Xn26{X0Zt%<S#m6
zn>)%KzGlWC@FXEx(Vbtb0L&e?hXB+KFw`4_7l0WIplS7cDfYs2oqeU(3M_#XFDh1`
zwgLsvS}HE=QBIJhcgF&?9kGJ{oXlsi)#yBib$f!m^n96q7SBi8&cftau=t)}|1xE4
z4ksQz7#dp09@V2ofj0{|ZT&92%5zQ->4syLF!3v5fYauCtA@?Tn|KEs{yME{vo}9s
z=&%io29$AIDXX3KV)Hhwpwr=OdaP$*j@uI=5iS{s(<&Vm*;Zd3gI5CZ!9lp-e&kp9
zqjlKNLPnxyy!a{P@jQH_kN0ZWM9NPw5j~b}_)LWhJ?Uh?KARJ>1s-9_0_!&0Cv=@i
zEtUr1*lpB$ybFi$V=JN<wORPyd%a}<T??=s6&9>183i@4Oxy){&S;+=yW+p8q@Vhl
zkM#*nzW;Y?k8lysw;@gB+Y~L<5H8mIr)JpC56CEuyZq5cFl@$IBHsRR^NtSvvSnVD
zGI`Xl1Py1>n8V@zmX%-H<+1Mq9pPnYR4nETolN|47!GTq$fcq$7&mZ26~1Vt26y;+
z-};;{{EhPf;Uu7*aSp)d8R^L&|I{F2<}XZL=;)Yt(<LwVH=dO;RMla`e)%hg`Cre~
zi+i$}#OD<o+&P%NS#1<oi#qEb0vwNm$kPMm3)k81_PR6!p@SjIGD1U|Y5bNv@<!MF
z0K=GR$qPKDA;Piz7_io?wWPh@`GIObpb`ua{{iC`H(Dtu;>0RucF<_$zYb6RkzO8i
z`PoXDuZ8}U%L=&DvqP}gv%$A!u4Y*VEP^HeC(_}6g9-g#FwqvbTy=Dh^o?KS<HsG-
z!rT_-6a3{erOJ%`0CWhuBqV!GlV^i02`+u3&_iPcGnNtZ<=`P&loCQ|ca%GR{Xyu(
z58QX{HMfKg5+at<N->G=n4L%*U;*K`L?a81!EyI4zeUA8mWKar%M;^qWg*E|3!-Z0
z<>h0>OM(YoS!e8)vpqC~aK+J|<4}8%=~$K*_-evwieS>F?&ZT>H?sR&@nE|W^KEA{
zwkTEz&09Fi#*H&K6ZJQSg>>iI@mVFs!vr-Dfb4nTjeb5{DVee`>W8JMNKBNU`^REs
z2;kR#;`|$BRAR!sXx4>0F41Ew72>eKx4(B#ITN6lDj6;WO*KLs|8H=J=qgl*5iXW2
z=s2~|Q?@m{Uvjs8DkgU&>O|jq!g-%G&<prwu(>a9<dJq%dEmOHi%^-_Mc^wGZJxx^
zB3MCsagpNDgCKde`s)&ij@bEGevN*^`|q2htpO!;cHd{$RO8JA9T~kza_gRwfaE1%
zr`5XiTbcGI%%#sQI4#pawp%qbhh$H^$m)yB?!|>Gu7=G6ORF%?5wOA%xHNx8ILBkL
z%Hgf=zTsLfW~3V*Y}v*ah4Ed?S~A@3X%xQy19}ng-Dy?&r}^}{o@z(oW9g4!vDu;6
zb~H}DBxncGau{luqx__H+u(pgwY4qc8F@xHG&!SsiN}bTDpp^0N#xgPf0THW_18gk
zH^yDUa&;Z*b!N@34EeK6lI-4Bq6L&bVL1Z{;zU<R#QR%?p&CE*eNIov9P7|uZW9#b
zEB=vpTi2K&c2`S_c%WEpP`Nc{#6u^AkAG9^H8%1)GH^PzI46-h?tE_oK;{3Gb|v6Y
zc71>B6`4Xrwk-2J_HC>+${I3=u~SVN#yVoAvOFY0)>3v^@)%5^!fWg#l?EeA)-p4N
zq%7H@VZPh*eqPnn*Z02H`=9H+?sMik|KIta|5@()T<4tM&G&gMw>*U7$+7%>nl4tJ
z7ZrNEa?2k}mb}j$Uxr3X6DHbhyh|;^67X&gdaRcCx0fL11BF+NFGF9HhLuBv`fGXy
z8nQ?i7<2RU?rEa~RXNYr<REOe54gbgqQPceYLeyqJxR(iu37$54QV-;$IEbq#$5=u
zSXU6ZhVWMCnys7e(a5LmLw)@@WUlH-f)2Y(pL}vn)(n9bglM#DGb@m_UkuK2A`L*}
zhED~)+#h1mn$HZIxKgG2$EU*uH?65;c=DdldHGM+_FTcU^QiEKCTK<d(QX}7F<mfg
zs9t#2IP(eEz;yIo)APM9C&f?DO>a!*zRwdT8Sl0sLrpYT3pzMq5-k*6huX9@Mqhl7
z^&Po$eulgoeY`><%a-5@5i8|uXw~jNC57Lp@EasEOrI<#moDn>Z=a2wM{=7mD2T;G
zbNiVRcJs(ZFduvnyGK2u(Xm=}?HPCSD*Ua|?W>{wx6d_v8J0yQ>QirQ)<9|>jmd-y
z*)Oc|lA#5=c@6eci9D{QMkQ~|p<K#&c-me^hs<4+<B=R67`Z4bc`1ppHjjOD^#)!q
z*#z88?*1lEuMbd0Vm~)%bICz*uS?G~wFS}#j%)rh;_P*wl?ly~zBngyx@YE8i7Jbv
z3bpGusTC-ti0)d%AtRv{)gM-8Hr)2bIp>%nVGZG!HVW0^6bgT6lPQbV6}D)QH@_1T
z5ref-kWCLCh|=kC0?YdmjQS^KPe1(}P)h$=#oHrUKp#YmF>el^<%;XBj6!v;jhn1F
z+t7Ji^F)LhK9pu-5%I_OsD)QI^32(cl)2)bMoa}Hkd94@bx}lcBV2hIIob#I8A~xD
zl+QdGE2U$4h;h`whEAu<gHUniUDi{dD-PLQl;+ikXR(p}Hv$v00~%%4R%<sGAg{9A
z;nQOA0=D?2<f29Wp{7?N)Nq#0o5CjL9EC~U6JpRa-6X-zL70=U1|M(XTdAv-;NU%p
z&Fox#Y3<o^DgmN3e=@&rU(iSm7w$ev>I7Z~1iUH^xoje>24OCg`&4CfJ$0m9@e)t_
zk`;p$x|x;BX`IRpYd2vNd^#=^9Y;XcM9eymUaiMf%WRrITNvDT1lnD4+Tu>{vENm#
zQaQoVZOZDm3+DB*N#UPb#+!+m9QcTchZ({AnzLN*DH1fvEPSZsiANtJ9VZ8g1<?gO
z)2|Qu7%%K$JwYu?`LKWwD9XFp-qp(*slv{Ov?lA}ZtfyIZ}xxYYca_7HRiE_(E0uK
z!$$cUg;VR7lkwz4lYKXYbXmy9)1Nw|qQ3@vHZzY7eQp;|I=9bZH_SJY{fcm-Foe#O
z5wqsil*2emTf}%G3eJ;F$?qW2?G}&5rT;PUW`eGG;#OlNWHi|a6@IaKMc01hVu4{d
zW890kV_Bdy{CvvRA-*ID#=9=zwONJD8j%J}@_{!LPISe6vr`?qtJovyrhcBK+9QoG
zSSH2#T}<W`(LzVM*XU!SGl=>!zRC>&6ejJFZ2L&Y!>KuLo(YXGrI5aAbnuWVX!c0Q
zII!0E5(>-geCaL|b0HJw%N#MuY~5A$wX?rWQEry-u~)Xw3{AkT3P41M=yq=or1&UQ
zP0rpD6jd964~s6XW9ks~@$|}1q!Kl6YRL2E&+N~`%?6cM8orLEgtv|l&3PORSssl%
z&6qf2+k%tHtDqR$)uqJq(n2SD25@R;VXiL|&$<_7eD)?D%Ft0rY6)DDSD8wksm&5(
zWAA=rRNK<qJ6tJMOg(>yZ{T$lc?LO7izjDMIS<y!%$k~a6s=mf@n^Zhx|h9#6y8!l
zlu<oy#rR(rK4aZ#YvK~TvR7dP=IeA&@((#8Hb<9L!E@CMW-uoL7_NiC$kfHhpST{)
z+gi#~fV-G=<5lYKkND&S;C6A^X7EM%y)337{N?O#@5<Z71~%25BNFga@+C@Eh<j;@
zFW(cg`|cVJycSX{DXH~Yu<4W!fo`1dg)KYeXEjOtX~y)m!P3e_v$Y&Q(J+_H?I)Ut
z?jtiU7!*!S!r?ghwV7~YYR(Bc4g7o9xoN>Qg94{0FcUehTCn!HO;r|El(JrN<s(nH
z&1><?L^Ra#f%sZ7I{HjCq*3=;YFg6e>pA-CG3!Sx^1RvKs*J14JCoMA6hj`yR)Fh>
z<t`-taJ2TH=}FB8Ern$dD?G2}Xih)xzC4saw?}zh1H2;KMw>xeiMYyWmH`QE2QQ%=
z<W1bfxBOGzLpwDG8Vpz4sBCRcH;@a4DE1T9Z_^iTotiQ%UWhx(<gP>b_gSD9cIUPM
zOOb;lPY&7QxdkhdR6}C>d>s5b-RPDz@8ZI$`osRx)-Kw5MaL8Al<5Jt^a@e8N=k~L
zi_FzoL}9Vjg4wMF0ehD(0d5vtz%Ko~1m|Ic9$+sp$dz^_dc0#@NkEboORv77)Q_jH
z*^8A#NHn>ld(BdNj^T|Bq>ok-aRuQ4qhFd+c-*RVGbuC;jUe$a9Md%5(>3HMPI-0Z
z1f6Nv?#<y34+~y}esm`$PaRJr5P1qi@iC-s))8K=Q=2R_C00;+ZX#mSyAs@5_E1Xe
z%c@fAI7Rbjwn|#5Ei=!F9x+yqR*UI8p(RoNdCV-ePyh6XrJ?rU=v^{v0_#%;xMP~^
z4PO*KTekFdV)$P}df7ySlO{|h?2=6-dd&5g^<I;~SC{rA+>=7zx=!cZaGS4dxK5C6
zPt|2jWL(y~boJOEBbp*snl+O-TeTU(@w~P!`b><9SH!Vu>jW^<+F^Tev=e7LJEQe5
z_Jax)Og?13V0ji%g}72&uQf)^@bVm{1u7KZ+@GD)Osw-JmOI?3@(*2ctP8$Rdw{W6
z0uwCxPzR}=7n~yNZESUunQcSFmC~}qOpW@GM0Ln|@d@Lo%e(5b-*e9w7ddS<I{59n
z%9h^bv49~#6d7isiW}@|a_wUpPv(G)0oP;iwW2Sq+_?8!li*C<NA@#waMkRAyrKI&
z#hu3ynf*}7k_*noll5bEhF@)l%85rgvG>Wb18xQt1*P898vYj0K!6^Y!=maKTs59*
zqF7HjDK|hn8CSKGQ@*!v<RZEMQ49rq5ZIhNYT7@_Jh2x$iF>w&nbn;N;*@Lb$PENl
zc)Y<eSV9g&y-W|k6Xso`KPqrnbCtL<nXSWUz{RqzU!0R(@b;Ta3>7L3pQSFR*Q@xN
zZCY;vC!c>kANbco>&_Hm=dW+ylK(59za7W^)~K!H+26+ht$ECjk-x<LU##)5B?ePa
z82<hEiv-{_`@h2hbO1;NH$vzsm|7Ss`6B&1-BE$qEi#}ogsb;sWxhXF?Qb_ELA>;g
zAH0B!E{cwUpO0h<nPBvF4H+A~UIQwuoRiYEwVG2oA^MM8#GLMYY7Ig?kW$l;7Cejc
zx&}9Gs>xfEbF6@n?DA76EMokQIx(9(X;M1xj4w}U$MGKpAJF7~pkeF7#KLeUhu}|Q
zCG*8S(7qI9N?kPgc(37oBa;CS2`vYI!pYsh7bghJVUay*Wsu=&wo>T3(lL<==JWkJ
zH4-1q9?yQL%K}yN1Zg?_e*J;nJ%YfK6^FhzEWx8X%da9zHn_$2X&AqFnvZ~EVRd<x
z9MWH6q1wj_?+z$D)(Q|y5(?$O#%M@ga!eOxJM!_AJ&9x8)K;lb+j_7-ZF73$aBOj8
zSgEWbM{XB>Lkqr0`^2Y+pKEUz>eS`$KNlF|Sbdl2)x<Mbm8ct{>x)W3_3@v;dx~J3
zZJ$rAom`o#blhOx;`5lXepO`61OgSaZt;0AG4p}=K--KS*L<|&6oKm4x&V@oAH>(w
z7ljS-NByYvZ8D*6BOnA2Gr;({dwSpkkXTQQU!bazKgJ*D?~C%oDg6pZ_&c1frt~+Q
z0E|ZfDlqUIGT@g;Tg)Uo@)QXEh_q$Qe}+Q;2?`d2@%jHyzW0tQPzyiW5{N}&asOeN
zynce??t?*MQNQ-g_txb91ZAsC{zyNR&o4bJw&PwPH1rc3PhX@5Do{z^6YGog5Bw$A
z_Z5GD`R^`5y1AizP(XXa>=bXCTPzpkVxbL?iZ$DUKwEq>J7NhS1!9AIP=E1^Z8yDb
zy{c7oFB@QZBtS{C#Ywg!E!-f`zXqj%^X@-tc9xfkzW_X$7Rm(T+))EU3@`}fhVjFq
z{QervepIy3`g$V`$Wj%^^83EVEC*zX!XmfEz-_JV9y;AeS7put2y=i-;k)d*<$?a}
z>4wDtokB@P`7inBO;t_rpHU5EeKl1z0~I5UEn1#!=xrZ-OZ4--4-R#F&(gN7xoy;s
yL_j-sz3cwJX@Ry;w)6jXVA^^n?1<QYrk_6{tWL7AZzbaael5UwR>cE26!broqeXQ9

literal 0
HcmV?d00001


From 2a90cb73553f74db28dbb2cd881e464214ea4936 Mon Sep 17 00:00:00 2001
From: Rikuki IX <52599939+rikukiix@users.noreply.github.com>
Date: Fri, 22 Nov 2024 05:57:33 +0800
Subject: [PATCH 0704/1072] Update SHLVL (only when interactive) on startup
 (#14404)

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

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

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

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

Make NuShell correctly inherit and update `SHLVL` from other shells
(obviously including itself) in Unix environment.

See issue #14384

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

None

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

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

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

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

New code formatted.

New feature works well in interactive usage.

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

diff --git a/src/main.rs b/src/main.rs
index b7c5a6a173..2c7b94b628 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -280,6 +280,16 @@ fn main() -> Result<()> {
         Value::string(env!("CARGO_PKG_VERSION"), Span::unknown()),
     );
 
+    // Add SHLVL if interactive
+    if engine_state.is_interactive {
+        let mut shlvl = engine_state
+            .get_env_var("SHLVL")
+            .map(|x| x.as_str().unwrap_or("0").parse::<i64>().unwrap_or(0))
+            .unwrap_or(0);
+        shlvl += 1;
+        engine_state.add_env_var("SHLVL".to_string(), Value::int(shlvl, Span::unknown()));
+    }
+
     if parsed_nu_cli_args.no_std_lib.is_none() {
         load_standard_library(&mut engine_state)?;
     }

From 5f7082f0534b70884e33d3cab19dc82687487efe Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Fri, 22 Nov 2024 00:58:31 +0300
Subject: [PATCH 0705/1072] truly flexible csv/tsv parsing (#14399)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- fixes #14398

I will properly fill out this PR and fix any tests that might break when
I have the time, this was a quick fix.

# Description

This PR makes `from csv` and `from tsv`, with the `--flexible` flag,
stop dropping extra/unexpected columns.

# User-Facing Changes

`$text`'s contents
```csv
value
1,aaa
2,bbb
3
4,ddd
5,eee,extra
```

Old behavior
```nushell
> $text | from csv --flexible --noheaders
╭─#─┬─column0─╮
│ 0 │ value   │
│ 1 │       1 │
│ 2 │       2 │
│ 3 │       3 │
│ 4 │       4 │
│ 5 │       5 │
╰─#─┴─column0─╯
```

New behavior
```nushell
> $text | from csv --flexible --noheaders
╭─#─┬─column0─┬─column1─┬─column2─╮
│ 0 │ value   │   ❎    │   ❎    │
│ 1 │       1 │ aaa     │   ❎    │
│ 2 │       2 │ bbb     │   ❎    │
│ 3 │       3 │   ❎    │   ❎    │
│ 4 │       4 │ ddd     │   ❎    │
│ 5 │       5 │ eee     │ extra   │
╰─#─┴─column0─┴─column1─┴─column2─╯
```

- The first line in a csv (or tsv) document no longer limits the number
of columns
- Missing values in columns are longer automatically filled with `null`
with this change, as a later row can introduce new columns. **BREAKING
CHANGE**

Because missing columns are different from empty columns, operations on
possibly missing columns will have to use optional access syntax e.g.
`get foo` => `get foo?`

# Tests + Formatting
Added examples that run as tests and adjusted existing tests to confirm
the new behavior.

# After Submitting

Update the workaround with fish completer mentioned
[here](https://www.nushell.sh/cookbook/external_completers.html#fish-completer)
---
 crates/nu-command/src/formats/from/csv.rs     | 25 ++++++++++-
 .../nu-command/src/formats/from/delimited.rs  | 43 ++++++++-----------
 crates/nu-command/src/formats/from/tsv.rs     | 20 ++++++++-
 .../tests/format_conversions/csv.rs           |  4 +-
 4 files changed, 62 insertions(+), 30 deletions(-)

diff --git a/crates/nu-command/src/formats/from/csv.rs b/crates/nu-command/src/formats/from/csv.rs
index 472ccf4d71..bde84c2c73 100644
--- a/crates/nu-command/src/formats/from/csv.rs
+++ b/crates/nu-command/src/formats/from/csv.rs
@@ -11,7 +11,10 @@ impl Command for FromCsv {
 
     fn signature(&self) -> Signature {
         Signature::build("from csv")
-            .input_output_types(vec![(Type::String, Type::table())])
+            .input_output_types(vec![
+                (Type::String, Type::table()),
+                (Type::String, Type::list(Type::Any)),
+            ])
             .named(
                 "separator",
                 SyntaxShape::String,
@@ -82,6 +85,26 @@ impl Command for FromCsv {
                     })],
                 ))
             },
+            Example {
+                description: "Convert comma-separated data to a table, allowing variable number of columns per row",
+                example: "\"ColA,ColB\n1,2\n3,4,5\n6\" | from csv --flexible",
+                result: Some(Value::test_list (
+                    vec![
+                        Value::test_record(record! {
+                            "ColA" => Value::test_int(1),
+                            "ColB" => Value::test_int(2),
+                        }),
+                        Value::test_record(record! {
+                            "ColA" => Value::test_int(3),
+                            "ColB" => Value::test_int(4),
+                            "column2" => Value::test_int(5),
+                        }),
+                        Value::test_record(record! {
+                            "ColA" => Value::test_int(6),
+                        }),
+                    ],
+                ))
+            },
             Example {
                 description: "Convert comma-separated data to a table, ignoring headers",
                 example: "open data.txt | from csv --noheaders",
diff --git a/crates/nu-command/src/formats/from/delimited.rs b/crates/nu-command/src/formats/from/delimited.rs
index 0fea7e082b..5dfdd4ad82 100644
--- a/crates/nu-command/src/formats/from/delimited.rs
+++ b/crates/nu-command/src/formats/from/delimited.rs
@@ -39,12 +39,7 @@ fn from_delimited_stream(
         .from_reader(input_reader);
 
     let headers = if noheaders {
-        (0..reader
-            .headers()
-            .map_err(|err| from_csv_error(err, span))?
-            .len())
-            .map(|i| format!("column{i}"))
-            .collect::<Vec<String>>()
+        vec![]
     } else {
         reader
             .headers()
@@ -54,32 +49,28 @@ fn from_delimited_stream(
             .collect()
     };
 
+    let n = headers.len();
+    let columns = headers
+        .into_iter()
+        .chain((n..).map(|i| format!("column{i}")));
     let iter = reader.into_records().map(move |row| {
         let row = match row {
             Ok(row) => row,
             Err(err) => return Value::error(from_csv_error(err, span), span),
         };
-        let columns = headers.iter().cloned();
-        let values = row
-            .into_iter()
-            .map(|s| {
-                if no_infer {
-                    Value::string(s, span)
-                } else if let Ok(i) = s.parse() {
-                    Value::int(i, span)
-                } else if let Ok(f) = s.parse() {
-                    Value::float(f, span)
-                } else {
-                    Value::string(s, span)
-                }
-            })
-            .chain(std::iter::repeat(Value::nothing(span)));
+        let columns = columns.clone();
+        let values = row.into_iter().map(|s| {
+            if no_infer {
+                Value::string(s, span)
+            } else if let Ok(i) = s.parse() {
+                Value::int(i, span)
+            } else if let Ok(f) = s.parse() {
+                Value::float(f, span)
+            } else {
+                Value::string(s, span)
+            }
+        });
 
-        // If there are more values than the number of headers,
-        // then the remaining values are ignored.
-        //
-        // Otherwise, if there are less values than headers,
-        // then `Value::nothing(span)` is used to fill the remaining columns.
         Value::record(columns.zip(values).collect(), span)
     });
 
diff --git a/crates/nu-command/src/formats/from/tsv.rs b/crates/nu-command/src/formats/from/tsv.rs
index cd3c9f97bd..09bee4803f 100644
--- a/crates/nu-command/src/formats/from/tsv.rs
+++ b/crates/nu-command/src/formats/from/tsv.rs
@@ -11,7 +11,10 @@ impl Command for FromTsv {
 
     fn signature(&self) -> Signature {
         Signature::build("from tsv")
-            .input_output_types(vec![(Type::String, Type::table())])
+            .input_output_types(vec![
+                (Type::String, Type::table()),
+                (Type::String, Type::list(Type::Any)),
+            ])
             .named(
                 "comment",
                 SyntaxShape::String,
@@ -76,6 +79,21 @@ impl Command for FromTsv {
                     })],
                 ))
             },
+            Example {
+                description: "Convert comma-separated data to a table, allowing variable number of columns per row and ignoring headers",
+                example: "\"value 1\nvalue 2\tdescription 2\" | from tsv --flexible --noheaders",
+                result: Some(Value::test_list (
+                    vec![
+                        Value::test_record(record! {
+                            "column0" => Value::test_string("value 1"),
+                        }),
+                        Value::test_record(record! {
+                            "column0" => Value::test_string("value 2"),
+                            "column1" => Value::test_string("description 2"),
+                        }),
+                    ],
+                ))
+            },
             Example {
                 description: "Create a tsv file with header columns and open it",
                 example: r#"$'c1(char tab)c2(char tab)c3(char nl)1(char tab)2(char tab)3' | save tsv-data | open tsv-data | from tsv"#,
diff --git a/crates/nu-command/tests/format_conversions/csv.rs b/crates/nu-command/tests/format_conversions/csv.rs
index f10a84b672..4f50ab1492 100644
--- a/crates/nu-command/tests/format_conversions/csv.rs
+++ b/crates/nu-command/tests/format_conversions/csv.rs
@@ -469,7 +469,7 @@ fn from_csv_test_flexible_extra_vals() {
           echo "a,b\n1,2,3" | from csv --flexible | first | values | to nuon
         "#
     ));
-    assert_eq!(actual.out, "[1, 2]");
+    assert_eq!(actual.out, "[1, 2, 3]");
 }
 
 #[test]
@@ -479,5 +479,5 @@ fn from_csv_test_flexible_missing_vals() {
           echo "a,b\n1" | from csv --flexible | first | values | to nuon
         "#
     ));
-    assert_eq!(actual.out, "[1, null]");
+    assert_eq!(actual.out, "[1]");
 }

From 671640b0a9bc58b10daea47f4dc49f725c47e523 Mon Sep 17 00:00:00 2001
From: Yash Thakur <45539777+ysthakur@users.noreply.github.com>
Date: Fri, 22 Nov 2024 07:29:00 -0500
Subject: [PATCH 0706/1072] Avoid recomputing fuzzy match scores (#13700)

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

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

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

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

This PR makes it so that when using fuzzy matching, the score isn't
recomputed when sorting. Instead, filtering and sorting suggestions is
handled by a new `NuMatcher` struct. This struct accepts suggestions
and, if they match the user's typed text, stores those suggestions
(along with their scores and values). At the end, it returns a sorted
list of suggestions.

This probably won't have a noticeable impact on performance, but it
might be helpful if we start using Nucleo in the future.

Minor change: Makes `find_commands_by_predicate` in `StateWorkingSet`
and `EngineState` take `FnMut` rather than `Fn` for the predicate.

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

When using case-insensitive matching, if you have two matches `FOO` and
`abc`, `abc` will be shown before `FOO` rather than the other way
around. I think this way makes more sense than the current behavior.
When I brought this up on Discord, WindSoilder did say it would make
sense to show uppercase matches first if the user typed, say, `F`.
However, that would be a lot more complicated to implement.

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

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

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

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

Added a test for the changes in
https://github.com/nushell/nushell/pull/13302.

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 .../src/completions/command_completions.rs    | 176 +++++++-------
 .../src/completions/completion_common.rs      | 217 ++++++++---------
 .../src/completions/completion_options.rs     | 228 ++++++++++++++----
 .../src/completions/custom_completions.rs     |  45 +---
 .../src/completions/directory_completions.rs  |  15 +-
 .../src/completions/dotnu_completions.rs      |  83 +++----
 .../src/completions/file_completions.rs       |  31 +--
 .../src/completions/flag_completions.rs       |  58 +++--
 crates/nu-cli/src/completions/mod.rs          |   2 +-
 .../src/completions/operator_completions.rs   |  24 +-
 .../src/completions/variable_completions.rs   | 156 ++++--------
 crates/nu-cli/tests/completions/mod.rs        |  23 +-
 crates/nu-protocol/src/engine/engine_state.rs |   2 +-
 .../src/engine/state_working_set.rs           |   2 +-
 14 files changed, 551 insertions(+), 511 deletions(-)

diff --git a/crates/nu-cli/src/completions/command_completions.rs b/crates/nu-cli/src/completions/command_completions.rs
index 0086270ac5..b12df4735a 100644
--- a/crates/nu-cli/src/completions/command_completions.rs
+++ b/crates/nu-cli/src/completions/command_completions.rs
@@ -1,5 +1,7 @@
+use std::collections::HashMap;
+
 use crate::{
-    completions::{Completer, CompletionOptions, MatchAlgorithm},
+    completions::{Completer, CompletionOptions},
     SuggestionKind,
 };
 use nu_parser::FlatShape;
@@ -9,7 +11,7 @@ use nu_protocol::{
 };
 use reedline::Suggestion;
 
-use super::{completion_common::sort_suggestions, SemanticSuggestion};
+use super::{completion_options::NuMatcher, SemanticSuggestion};
 
 pub struct CommandCompletion {
     flattened: Vec<(Span, FlatShape)>,
@@ -33,10 +35,11 @@ impl CommandCompletion {
     fn external_command_completion(
         &self,
         working_set: &StateWorkingSet,
-        prefix: &str,
-        match_algorithm: MatchAlgorithm,
-    ) -> Vec<String> {
-        let mut executables = vec![];
+        sugg_span: reedline::Span,
+        matched_internal: impl Fn(&str) -> bool,
+        matcher: &mut NuMatcher<String>,
+    ) -> HashMap<String, SemanticSuggestion> {
+        let mut suggs = HashMap::new();
 
         // os agnostic way to get the PATH env var
         let paths = working_set.permanent_state.get_path_env_var();
@@ -54,24 +57,38 @@ impl CommandCompletion {
                                 .completions
                                 .external
                                 .max_results
-                                > executables.len() as i64
-                                && !executables.contains(
-                                    &item
-                                        .path()
-                                        .file_name()
-                                        .map(|x| x.to_string_lossy().to_string())
-                                        .unwrap_or_default(),
-                                )
-                                && matches!(
-                                    item.path().file_name().map(|x| match_algorithm
-                                        .matches_str(&x.to_string_lossy(), prefix)),
-                                    Some(true)
-                                )
-                                && is_executable::is_executable(item.path())
+                                <= suggs.len() as i64
                             {
-                                if let Ok(name) = item.file_name().into_string() {
-                                    executables.push(name);
-                                }
+                                break;
+                            }
+                            let Ok(name) = item.file_name().into_string() else {
+                                continue;
+                            };
+                            let value = if matched_internal(&name) {
+                                format!("^{}", name)
+                            } else {
+                                name.clone()
+                            };
+                            if suggs.contains_key(&value) {
+                                continue;
+                            }
+                            if matcher.matches(&name) && is_executable::is_executable(item.path()) {
+                                // If there's an internal command with the same name, adds ^cmd to the
+                                // matcher so that both the internal and external command are included
+                                matcher.add(&name, value.clone());
+                                suggs.insert(
+                                    value.clone(),
+                                    SemanticSuggestion {
+                                        suggestion: Suggestion {
+                                            value,
+                                            span: sugg_span,
+                                            append_whitespace: true,
+                                            ..Default::default()
+                                        },
+                                        // TODO: is there a way to create a test?
+                                        kind: None,
+                                    },
+                                );
                             }
                         }
                     }
@@ -79,7 +96,7 @@ impl CommandCompletion {
             }
         }
 
-        executables
+        suggs
     }
 
     fn complete_commands(
@@ -88,68 +105,59 @@ impl CommandCompletion {
         span: Span,
         offset: usize,
         find_externals: bool,
-        match_algorithm: MatchAlgorithm,
+        options: &CompletionOptions,
     ) -> Vec<SemanticSuggestion> {
         let partial = working_set.get_span_contents(span);
+        let mut matcher = NuMatcher::new(String::from_utf8_lossy(partial), options.clone());
 
-        let filter_predicate = |command: &[u8]| match_algorithm.matches_u8(command, partial);
+        let sugg_span = reedline::Span::new(span.start - offset, span.end - offset);
 
-        let mut results = working_set
-            .find_commands_by_predicate(filter_predicate, true)
-            .into_iter()
-            .map(move |x| SemanticSuggestion {
-                suggestion: Suggestion {
-                    value: String::from_utf8_lossy(&x.0).to_string(),
-                    description: x.1,
-                    span: reedline::Span::new(span.start - offset, span.end - offset),
-                    append_whitespace: true,
-                    ..Suggestion::default()
-                },
-                kind: Some(SuggestionKind::Command(x.2)),
-            })
-            .collect::<Vec<_>>();
-
-        let partial = working_set.get_span_contents(span);
-        let partial = String::from_utf8_lossy(partial).to_string();
-
-        if find_externals {
-            let results_external = self
-                .external_command_completion(working_set, &partial, match_algorithm)
-                .into_iter()
-                .map(move |x| SemanticSuggestion {
+        let mut internal_suggs = HashMap::new();
+        let filtered_commands = working_set.find_commands_by_predicate(
+            |name| {
+                let name = String::from_utf8_lossy(name);
+                matcher.add(&name, name.to_string())
+            },
+            true,
+        );
+        for (name, description, typ) in filtered_commands {
+            let name = String::from_utf8_lossy(&name);
+            internal_suggs.insert(
+                name.to_string(),
+                SemanticSuggestion {
                     suggestion: Suggestion {
-                        value: x,
-                        span: reedline::Span::new(span.start - offset, span.end - offset),
+                        value: name.to_string(),
+                        description,
+                        span: sugg_span,
                         append_whitespace: true,
                         ..Suggestion::default()
                     },
-                    // TODO: is there a way to create a test?
-                    kind: None,
-                });
-
-            let results_strings: Vec<String> =
-                results.iter().map(|x| x.suggestion.value.clone()).collect();
-
-            for external in results_external {
-                if results_strings.contains(&external.suggestion.value) {
-                    results.push(SemanticSuggestion {
-                        suggestion: Suggestion {
-                            value: format!("^{}", external.suggestion.value),
-                            span: external.suggestion.span,
-                            append_whitespace: true,
-                            ..Suggestion::default()
-                        },
-                        kind: external.kind,
-                    })
-                } else {
-                    results.push(external)
-                }
-            }
-
-            results
-        } else {
-            results
+                    kind: Some(SuggestionKind::Command(typ)),
+                },
+            );
         }
+
+        let mut external_suggs = if find_externals {
+            self.external_command_completion(
+                working_set,
+                sugg_span,
+                |name| internal_suggs.contains_key(name),
+                &mut matcher,
+            )
+        } else {
+            HashMap::new()
+        };
+
+        let mut res = Vec::new();
+        for cmd_name in matcher.results() {
+            if let Some(sugg) = internal_suggs
+                .remove(&cmd_name)
+                .or_else(|| external_suggs.remove(&cmd_name))
+            {
+                res.push(sugg);
+            }
+        }
+        res
     }
 }
 
@@ -158,7 +166,7 @@ impl Completer for CommandCompletion {
         &mut self,
         working_set: &StateWorkingSet,
         _stack: &Stack,
-        prefix: &[u8],
+        _prefix: &[u8],
         span: Span,
         offset: usize,
         pos: usize,
@@ -188,18 +196,18 @@ impl Completer for CommandCompletion {
                 Span::new(last.0.start, pos),
                 offset,
                 false,
-                options.match_algorithm,
+                options,
             )
         } else {
             vec![]
         };
 
         if !subcommands.is_empty() {
-            return sort_suggestions(&String::from_utf8_lossy(prefix), subcommands, options);
+            return subcommands;
         }
 
         let config = working_set.get_config();
-        let commands = if matches!(self.flat_shape, nu_parser::FlatShape::External)
+        if matches!(self.flat_shape, nu_parser::FlatShape::External)
             || matches!(self.flat_shape, nu_parser::FlatShape::InternalCall(_))
             || ((span.end - span.start) == 0)
             || is_passthrough_command(working_set.delta.get_file_contents())
@@ -214,13 +222,11 @@ impl Completer for CommandCompletion {
                 span,
                 offset,
                 config.completions.external.enable,
-                options.match_algorithm,
+                options,
             )
         } else {
             vec![]
-        };
-
-        sort_suggestions(&String::from_utf8_lossy(prefix), commands, options)
+        }
     }
 }
 
diff --git a/crates/nu-cli/src/completions/completion_common.rs b/crates/nu-cli/src/completions/completion_common.rs
index fc7a5fcd2c..4b5ef857e1 100644
--- a/crates/nu-cli/src/completions/completion_common.rs
+++ b/crates/nu-cli/src/completions/completion_common.rs
@@ -1,22 +1,20 @@
-use super::MatchAlgorithm;
-use crate::{
-    completions::{matches, CompletionOptions},
-    SemanticSuggestion,
-};
-use fuzzy_matcher::{skim::SkimMatcherV2, FuzzyMatcher};
+use super::{completion_options::NuMatcher, MatchAlgorithm};
+use crate::completions::CompletionOptions;
 use nu_ansi_term::Style;
 use nu_engine::env_to_string;
 use nu_path::dots::expand_ndots;
 use nu_path::{expand_to_real_path, home_dir};
 use nu_protocol::{
     engine::{EngineState, Stack, StateWorkingSet},
-    CompletionSort, Span,
+    Span,
 };
 use nu_utils::get_ls_colors;
+use nu_utils::IgnoreCaseExt;
 use std::path::{is_separator, Component, Path, PathBuf, MAIN_SEPARATOR as SEP};
 
 #[derive(Clone, Default)]
 pub struct PathBuiltFromString {
+    cwd: PathBuf,
     parts: Vec<String>,
     isdir: bool,
 }
@@ -30,76 +28,84 @@ pub struct PathBuiltFromString {
 /// 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(
+fn complete_rec(
     partial: &[&str],
-    built: &PathBuiltFromString,
-    cwd: &Path,
+    built_paths: &[PathBuiltFromString],
     options: &CompletionOptions,
     want_directory: bool,
     isdir: bool,
 ) -> Vec<PathBuiltFromString> {
-    let mut completions = vec![];
-
     if let Some((&base, rest)) = partial.split_first() {
         if base.chars().all(|c| c == '.') && (isdir || !rest.is_empty()) {
-            let mut built = built.clone();
-            built.parts.push(base.to_string());
-            built.isdir = true;
-            return complete_rec(rest, &built, cwd, options, want_directory, isdir);
-        }
-    }
-
-    let mut built_path = cwd.to_path_buf();
-    for part in &built.parts {
-        built_path.push(part);
-    }
-
-    let Ok(result) = built_path.read_dir() else {
-        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();
-        let mut built = built.clone();
-        built.parts.push(entry_name.clone());
-        built.isdir = entry_isdir;
-
-        if !want_directory || entry_isdir {
-            entries.push((entry_name, built));
+            let built_paths: Vec<_> = built_paths
+                .iter()
+                .map(|built| {
+                    let mut built = built.clone();
+                    built.parts.push(base.to_string());
+                    built.isdir = true;
+                    built
+                })
+                .collect();
+            return complete_rec(rest, &built_paths, options, want_directory, isdir);
         }
     }
 
     let prefix = partial.first().unwrap_or(&"");
-    let sorted_entries = sort_completions(prefix, entries, options, |(entry, _)| entry);
+    let mut matcher = NuMatcher::new(prefix, options.clone());
 
-    for (entry_name, built) in sorted_entries {
+    for built in built_paths {
+        let mut path = built.cwd.clone();
+        for part in &built.parts {
+            path.push(part);
+        }
+
+        let Ok(result) = path.read_dir() else {
+            continue;
+        };
+
+        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();
+            let mut built = built.clone();
+            built.parts.push(entry_name.clone());
+            built.isdir = entry_isdir;
+
+            if !want_directory || entry_isdir {
+                matcher.add(entry_name.clone(), (entry_name, built));
+            }
+        }
+    }
+
+    let mut completions = vec![];
+    for (entry_name, built) in matcher.results() {
         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);
-                    }
+                // 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],
+                        options,
+                        want_directory,
+                        isdir,
+                    ));
+                } else {
+                    completions.push(built);
                 }
-                if entry_name.eq(base)
-                    && matches!(options.match_algorithm, MatchAlgorithm::Prefix)
-                    && isdir
-                {
-                    break;
+
+                // For https://github.com/nushell/nushell/issues/13204
+                if isdir && options.match_algorithm == MatchAlgorithm::Prefix {
+                    let exact_match = if options.case_sensitive {
+                        entry_name.eq(base)
+                    } else {
+                        entry_name.to_folded_case().eq(&base.to_folded_case())
+                    };
+                    if exact_match {
+                        break;
+                    }
                 }
             }
             None => {
@@ -147,15 +153,25 @@ fn surround_remove(partial: &str) -> String {
     partial.to_string()
 }
 
+pub struct FileSuggestion {
+    pub span: nu_protocol::Span,
+    pub path: String,
+    pub style: Option<Style>,
+    pub cwd: PathBuf,
+}
+
+/// # Parameters
+/// * `cwds` - A list of directories in which to search. The only reason this isn't a single string
+///   is because dotnu_completions searches in multiple directories at once
 pub fn complete_item(
     want_directory: bool,
     span: nu_protocol::Span,
     partial: &str,
-    cwd: &str,
+    cwds: &[impl AsRef<str>],
     options: &CompletionOptions,
     engine_state: &EngineState,
     stack: &Stack,
-) -> Vec<(nu_protocol::Span, String, Option<Style>)> {
+) -> Vec<FileSuggestion> {
     let cleaned_partial = surround_remove(partial);
     let isdir = cleaned_partial.ends_with(is_separator);
     let expanded_partial = expand_ndots(Path::new(&cleaned_partial));
@@ -175,7 +191,10 @@ pub fn complete_item(
         partial.push_str(&format!("{path_separator}."));
     }
 
-    let cwd_pathbuf = Path::new(cwd).to_path_buf();
+    let cwd_pathbufs: Vec<_> = cwds
+        .iter()
+        .map(|cwd| Path::new(cwd.as_ref()).to_path_buf())
+        .collect();
     let ls_colors = (engine_state.config.completions.use_ls_colors
         && engine_state.config.use_ansi_coloring)
         .then(|| {
@@ -186,7 +205,7 @@ pub fn complete_item(
             get_ls_colors(ls_colors_env_str)
         });
 
-    let mut cwd = cwd_pathbuf.clone();
+    let mut cwds = cwd_pathbufs.clone();
     let mut prefix_len = 0;
     let mut original_cwd = OriginalCwd::None;
 
@@ -194,19 +213,21 @@ pub fn complete_item(
     match components.peek().cloned() {
         Some(c @ Component::Prefix(..)) => {
             // windows only by definition
-            cwd = [c, Component::RootDir].iter().collect();
+            cwds = vec![[c, Component::RootDir].iter().collect()];
             prefix_len = c.as_os_str().len();
             original_cwd = OriginalCwd::Prefix(c.as_os_str().to_string_lossy().into_owned());
         }
         Some(c @ Component::RootDir) => {
             // This is kind of a hack. When joining an empty string with the rest,
             // we add the slash automagically
-            cwd = PathBuf::from(c.as_os_str());
+            cwds = vec![PathBuf::from(c.as_os_str())];
             prefix_len = 1;
             original_cwd = OriginalCwd::Prefix(String::new());
         }
         Some(Component::Normal(home)) if home.to_string_lossy() == "~" => {
-            cwd = home_dir().map(Into::into).unwrap_or(cwd_pathbuf);
+            cwds = home_dir()
+                .map(|dir| vec![dir.into()])
+                .unwrap_or(cwd_pathbufs);
             prefix_len = 1;
             original_cwd = OriginalCwd::Home;
         }
@@ -223,8 +244,14 @@ pub fn complete_item(
 
     complete_rec(
         partial.as_slice(),
-        &PathBuiltFromString::default(),
-        &cwd,
+        &cwds
+            .into_iter()
+            .map(|cwd| PathBuiltFromString {
+                cwd,
+                parts: Vec::new(),
+                isdir: false,
+            })
+            .collect::<Vec<_>>(),
         options,
         want_directory,
         isdir,
@@ -234,6 +261,7 @@ pub fn complete_item(
         if should_collapse_dots {
             p = collapse_ndots(p);
         }
+        let cwd = p.cwd.clone();
         let path = original_cwd.apply(p, path_separator);
         let style = ls_colors.as_ref().map(|lsc| {
             lsc.style_for_path_with_metadata(
@@ -245,7 +273,12 @@ pub fn complete_item(
             .map(lscolors::Style::to_nu_ansi_term_style)
             .unwrap_or_default()
         });
-        (span, escape_path(path, want_directory), style)
+        FileSuggestion {
+            span,
+            path: escape_path(path, want_directory),
+            style,
+            cwd,
+        }
     })
     .collect()
 }
@@ -310,45 +343,6 @@ pub fn adjust_if_intermediate(
     }
 }
 
-/// 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_unstable_by(|a, b| {
-            let a_str = get_value(a);
-            let b_str = get_value(b);
-            let a_score = matcher.fuzzy_match(a_str, prefix).unwrap_or_default();
-            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_unstable_by(|a, b| get_value(a).cmp(get_value(b)));
-    }
-
-    items
-}
-
 /// Collapse multiple ".." components into n-dots.
 ///
 /// It performs the reverse operation of `expand_ndots`, collapsing sequences of ".." into n-dots,
@@ -359,6 +353,7 @@ fn collapse_ndots(path: PathBuiltFromString) -> PathBuiltFromString {
     let mut result = PathBuiltFromString {
         parts: Vec::with_capacity(path.parts.len()),
         isdir: path.isdir,
+        cwd: path.cwd,
     };
 
     let mut dot_count = 0;
diff --git a/crates/nu-cli/src/completions/completion_options.rs b/crates/nu-cli/src/completions/completion_options.rs
index 880aa54fb1..9165bd32f9 100644
--- a/crates/nu-cli/src/completions/completion_options.rs
+++ b/crates/nu-cli/src/completions/completion_options.rs
@@ -1,7 +1,10 @@
 use fuzzy_matcher::{skim::SkimMatcherV2, FuzzyMatcher};
 use nu_parser::trim_quotes_str;
 use nu_protocol::{CompletionAlgorithm, CompletionSort};
-use std::fmt::Display;
+use nu_utils::IgnoreCaseExt;
+use std::{borrow::Cow, fmt::Display};
+
+use super::SemanticSuggestion;
 
 /// Describes how suggestions should be matched.
 #[derive(Copy, Clone, Debug, PartialEq)]
@@ -19,33 +22,154 @@ pub enum MatchAlgorithm {
     Fuzzy,
 }
 
-impl MatchAlgorithm {
-    /// Returns whether the `needle` search text matches the given `haystack`.
-    pub fn matches_str(&self, haystack: &str, needle: &str) -> bool {
-        let haystack = trim_quotes_str(haystack);
-        let needle = trim_quotes_str(needle);
-        match *self {
-            MatchAlgorithm::Prefix => haystack.starts_with(needle),
+pub struct NuMatcher<T> {
+    options: CompletionOptions,
+    needle: String,
+    state: State<T>,
+}
+
+enum State<T> {
+    Prefix {
+        /// Holds (haystack, item)
+        items: Vec<(String, T)>,
+    },
+    Fuzzy {
+        matcher: Box<SkimMatcherV2>,
+        /// Holds (haystack, item, score)
+        items: Vec<(String, T, i64)>,
+    },
+}
+
+/// Filters and sorts suggestions
+impl<T> NuMatcher<T> {
+    /// # Arguments
+    ///
+    /// * `needle` - The text to search for
+    pub fn new(needle: impl AsRef<str>, options: CompletionOptions) -> NuMatcher<T> {
+        let orig_needle = trim_quotes_str(needle.as_ref());
+        let lowercase_needle = if options.case_sensitive {
+            orig_needle.to_owned()
+        } else {
+            orig_needle.to_folded_case()
+        };
+        match options.match_algorithm {
+            MatchAlgorithm::Prefix => NuMatcher {
+                options,
+                needle: lowercase_needle,
+                state: State::Prefix { items: Vec::new() },
+            },
             MatchAlgorithm::Fuzzy => {
-                let matcher = SkimMatcherV2::default();
-                matcher.fuzzy_match(haystack, needle).is_some()
+                let mut matcher = SkimMatcherV2::default();
+                if options.case_sensitive {
+                    matcher = matcher.respect_case();
+                } else {
+                    matcher = matcher.ignore_case();
+                };
+                NuMatcher {
+                    options,
+                    needle: orig_needle.to_owned(),
+                    state: State::Fuzzy {
+                        matcher: Box::new(matcher),
+                        items: Vec::new(),
+                    },
+                }
             }
         }
     }
 
-    /// Returns whether the `needle` search text matches the given `haystack`.
-    pub fn matches_u8(&self, haystack: &[u8], needle: &[u8]) -> bool {
-        match *self {
-            MatchAlgorithm::Prefix => haystack.starts_with(needle),
-            MatchAlgorithm::Fuzzy => {
-                let haystack_str = String::from_utf8_lossy(haystack);
-                let needle_str = String::from_utf8_lossy(needle);
-
-                let matcher = SkimMatcherV2::default();
-                matcher.fuzzy_match(&haystack_str, &needle_str).is_some()
+    /// Returns whether or not the haystack matches the needle. If it does, `item` is added
+    /// to the list of matches (if given).
+    ///
+    /// Helper to avoid code duplication between [NuMatcher::add] and [NuMatcher::matches].
+    fn matches_aux(&mut self, haystack: &str, item: Option<T>) -> bool {
+        let haystack = trim_quotes_str(haystack);
+        match &mut self.state {
+            State::Prefix { items } => {
+                let haystack_folded = if self.options.case_sensitive {
+                    Cow::Borrowed(haystack)
+                } else {
+                    Cow::Owned(haystack.to_folded_case())
+                };
+                let matches = if self.options.positional {
+                    haystack_folded.starts_with(self.needle.as_str())
+                } else {
+                    haystack_folded.contains(self.needle.as_str())
+                };
+                if matches {
+                    if let Some(item) = item {
+                        items.push((haystack.to_string(), item));
+                    }
+                }
+                matches
+            }
+            State::Fuzzy { items, matcher } => {
+                let Some(score) = matcher.fuzzy_match(haystack, &self.needle) else {
+                    return false;
+                };
+                if let Some(item) = item {
+                    items.push((haystack.to_string(), item, score));
+                }
+                true
             }
         }
     }
+
+    /// Add the given item if the given haystack matches the needle.
+    ///
+    /// Returns whether the item was added.
+    pub fn add(&mut self, haystack: impl AsRef<str>, item: T) -> bool {
+        self.matches_aux(haystack.as_ref(), Some(item))
+    }
+
+    /// Returns whether the haystack matches the needle.
+    pub fn matches(&mut self, haystack: &str) -> bool {
+        self.matches_aux(haystack, None)
+    }
+
+    /// Get all the items that matched (sorted)
+    pub fn results(self) -> Vec<T> {
+        match self.state {
+            State::Prefix { mut items, .. } => {
+                items.sort_by(|(haystack1, _), (haystack2, _)| {
+                    let cmp_sensitive = haystack1.cmp(haystack2);
+                    if self.options.case_sensitive {
+                        cmp_sensitive
+                    } else {
+                        haystack1
+                            .to_folded_case()
+                            .cmp(&haystack2.to_folded_case())
+                            .then(cmp_sensitive)
+                    }
+                });
+                items.into_iter().map(|(_, item)| item).collect::<Vec<_>>()
+            }
+            State::Fuzzy { mut items, .. } => {
+                match self.options.sort {
+                    CompletionSort::Alphabetical => {
+                        items.sort_by(|(haystack1, _, _), (haystack2, _, _)| {
+                            haystack1.cmp(haystack2)
+                        });
+                    }
+                    CompletionSort::Smart => {
+                        items.sort_by(|(haystack1, _, score1), (haystack2, _, score2)| {
+                            score2.cmp(score1).then(haystack1.cmp(haystack2))
+                        });
+                    }
+                }
+                items
+                    .into_iter()
+                    .map(|(_, item, _)| item)
+                    .collect::<Vec<_>>()
+            }
+        }
+    }
+}
+
+impl NuMatcher<SemanticSuggestion> {
+    pub fn add_semantic_suggestion(&mut self, sugg: SemanticSuggestion) -> bool {
+        let value = sugg.suggestion.value.to_string();
+        self.add(value, sugg)
+    }
 }
 
 impl From<CompletionAlgorithm> for MatchAlgorithm {
@@ -105,35 +229,49 @@ impl Default for CompletionOptions {
 
 #[cfg(test)]
 mod test {
-    use super::MatchAlgorithm;
+    use rstest::rstest;
 
-    #[test]
-    fn match_algorithm_prefix() {
-        let algorithm = MatchAlgorithm::Prefix;
+    use super::{CompletionOptions, MatchAlgorithm, NuMatcher};
 
-        assert!(algorithm.matches_str("example text", ""));
-        assert!(algorithm.matches_str("example text", "examp"));
-        assert!(!algorithm.matches_str("example text", "text"));
-
-        assert!(algorithm.matches_u8(&[1, 2, 3], &[]));
-        assert!(algorithm.matches_u8(&[1, 2, 3], &[1, 2]));
-        assert!(!algorithm.matches_u8(&[1, 2, 3], &[2, 3]));
+    #[rstest]
+    #[case(MatchAlgorithm::Prefix, "example text", "", true)]
+    #[case(MatchAlgorithm::Prefix, "example text", "examp", true)]
+    #[case(MatchAlgorithm::Prefix, "example text", "text", false)]
+    #[case(MatchAlgorithm::Fuzzy, "example text", "", true)]
+    #[case(MatchAlgorithm::Fuzzy, "example text", "examp", true)]
+    #[case(MatchAlgorithm::Fuzzy, "example text", "ext", true)]
+    #[case(MatchAlgorithm::Fuzzy, "example text", "mplxt", true)]
+    #[case(MatchAlgorithm::Fuzzy, "example text", "mpp", false)]
+    fn match_algorithm_simple(
+        #[case] match_algorithm: MatchAlgorithm,
+        #[case] haystack: &str,
+        #[case] needle: &str,
+        #[case] should_match: bool,
+    ) {
+        let options = CompletionOptions {
+            match_algorithm,
+            ..Default::default()
+        };
+        let mut matcher = NuMatcher::new(needle, options);
+        matcher.add(haystack, haystack);
+        if should_match {
+            assert_eq!(vec![haystack], matcher.results());
+        } else {
+            assert_ne!(vec![haystack], matcher.results());
+        }
     }
 
     #[test]
-    fn match_algorithm_fuzzy() {
-        let algorithm = MatchAlgorithm::Fuzzy;
-
-        assert!(algorithm.matches_str("example text", ""));
-        assert!(algorithm.matches_str("example text", "examp"));
-        assert!(algorithm.matches_str("example text", "ext"));
-        assert!(algorithm.matches_str("example text", "mplxt"));
-        assert!(!algorithm.matches_str("example text", "mpp"));
-
-        assert!(algorithm.matches_u8(&[1, 2, 3], &[]));
-        assert!(algorithm.matches_u8(&[1, 2, 3], &[1, 2]));
-        assert!(algorithm.matches_u8(&[1, 2, 3], &[2, 3]));
-        assert!(algorithm.matches_u8(&[1, 2, 3], &[1, 3]));
-        assert!(!algorithm.matches_u8(&[1, 2, 3], &[2, 2]));
+    fn match_algorithm_fuzzy_sort_score() {
+        let options = CompletionOptions {
+            match_algorithm: MatchAlgorithm::Fuzzy,
+            ..Default::default()
+        };
+        let mut matcher = NuMatcher::new("fob", options);
+        for item in ["foo/bar", "fob", "foo bar"] {
+            matcher.add(item, item);
+        }
+        // Sort by score, then in alphabetical order
+        assert_eq!(vec!["fob", "foo bar", "foo/bar"], matcher.results());
     }
 }
diff --git a/crates/nu-cli/src/completions/custom_completions.rs b/crates/nu-cli/src/completions/custom_completions.rs
index b6098bc85d..63e65053b4 100644
--- a/crates/nu-cli/src/completions/custom_completions.rs
+++ b/crates/nu-cli/src/completions/custom_completions.rs
@@ -9,10 +9,9 @@ use nu_protocol::{
     engine::{Stack, StateWorkingSet},
     CompletionSort, DeclId, PipelineData, Span, Type, Value,
 };
-use nu_utils::IgnoreCaseExt;
 use std::collections::HashMap;
 
-use super::completion_common::sort_suggestions;
+use super::completion_options::NuMatcher;
 
 pub struct CustomCompletion {
     stack: Stack,
@@ -123,41 +122,11 @@ impl Completer for CustomCompletion {
             })
             .unwrap_or_default();
 
-        let options = custom_completion_options
-            .as_ref()
-            .unwrap_or(completion_options);
-        let suggestions = filter(prefix, suggestions, options);
-        sort_suggestions(&String::from_utf8_lossy(prefix), suggestions, options)
+        let options = custom_completion_options.unwrap_or(completion_options.clone());
+        let mut matcher = NuMatcher::new(String::from_utf8_lossy(prefix), options);
+        for sugg in suggestions {
+            matcher.add_semantic_suggestion(sugg);
+        }
+        matcher.results()
     }
 }
-
-fn filter(
-    prefix: &[u8],
-    items: Vec<SemanticSuggestion>,
-    options: &CompletionOptions,
-) -> Vec<SemanticSuggestion> {
-    items
-        .into_iter()
-        .filter(|it| match options.match_algorithm {
-            MatchAlgorithm::Prefix => match (options.case_sensitive, options.positional) {
-                (true, true) => it.suggestion.value.as_bytes().starts_with(prefix),
-                (true, false) => it
-                    .suggestion
-                    .value
-                    .contains(std::str::from_utf8(prefix).unwrap_or("")),
-                (false, positional) => {
-                    let value = it.suggestion.value.to_folded_case();
-                    let prefix = std::str::from_utf8(prefix).unwrap_or("").to_folded_case();
-                    if positional {
-                        value.starts_with(&prefix)
-                    } else {
-                        value.contains(&prefix)
-                    }
-                }
-            },
-            MatchAlgorithm::Fuzzy => options
-                .match_algorithm
-                .matches_u8(it.suggestion.value.as_bytes(), prefix),
-        })
-        .collect()
-}
diff --git a/crates/nu-cli/src/completions/directory_completions.rs b/crates/nu-cli/src/completions/directory_completions.rs
index ea8eb89871..b23b45945f 100644
--- a/crates/nu-cli/src/completions/directory_completions.rs
+++ b/crates/nu-cli/src/completions/directory_completions.rs
@@ -2,7 +2,6 @@ use crate::completions::{
     completion_common::{adjust_if_intermediate, complete_item, AdjustView},
     Completer, CompletionOptions,
 };
-use nu_ansi_term::Style;
 use nu_protocol::{
     engine::{EngineState, Stack, StateWorkingSet},
     Span,
@@ -10,7 +9,7 @@ use nu_protocol::{
 use reedline::Suggestion;
 use std::path::Path;
 
-use super::SemanticSuggestion;
+use super::{completion_common::FileSuggestion, SemanticSuggestion};
 
 #[derive(Clone, Default)]
 pub struct DirectoryCompletion {}
@@ -47,11 +46,11 @@ impl Completer for DirectoryCompletion {
         .into_iter()
         .map(move |x| SemanticSuggestion {
             suggestion: Suggestion {
-                value: x.1,
-                style: x.2,
+                value: x.path,
+                style: x.style,
                 span: reedline::Span {
-                    start: x.0.start - offset,
-                    end: x.0.end - offset,
+                    start: x.span.start - offset,
+                    end: x.span.end - offset,
                 },
                 ..Suggestion::default()
             },
@@ -92,6 +91,6 @@ pub fn directory_completion(
     options: &CompletionOptions,
     engine_state: &EngineState,
     stack: &Stack,
-) -> Vec<(nu_protocol::Span, String, Option<Style>)> {
-    complete_item(true, span, partial, cwd, options, engine_state, stack)
+) -> Vec<FileSuggestion> {
+    complete_item(true, span, partial, &[cwd], options, engine_state, stack)
 }
diff --git a/crates/nu-cli/src/completions/dotnu_completions.rs b/crates/nu-cli/src/completions/dotnu_completions.rs
index 482c5c1d18..b8134404d3 100644
--- a/crates/nu-cli/src/completions/dotnu_completions.rs
+++ b/crates/nu-cli/src/completions/dotnu_completions.rs
@@ -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::{completion_common::sort_suggestions, SemanticSuggestion};
+use super::SemanticSuggestion;
 
 #[derive(Clone, Default)]
 pub struct DotNuCompletion {}
@@ -87,49 +87,44 @@ impl Completer for DotNuCompletion {
 
         // Fetch the files filtering the ones that ends with .nu
         // and transform them into suggestions
-        let output: Vec<SemanticSuggestion> = search_dirs
-            .into_iter()
-            .flat_map(|search_dir| {
-                let completions = file_path_completion(
-                    span,
-                    &partial,
-                    &search_dir,
-                    options,
-                    working_set.permanent_state,
-                    stack,
-                );
-                completions
-                    .into_iter()
-                    .filter(move |it| {
-                        // Different base dir, so we list the .nu files or folders
-                        if !is_current_folder {
-                            it.1.ends_with(".nu") || it.1.ends_with(SEP)
-                        } else {
-                            // Lib dirs, so we filter only the .nu files or directory modules
-                            if it.1.ends_with(SEP) {
-                                Path::new(&search_dir).join(&it.1).join("mod.nu").exists()
-                            } else {
-                                it.1.ends_with(".nu")
-                            }
-                        }
-                    })
-                    .map(move |x| SemanticSuggestion {
-                        suggestion: Suggestion {
-                            value: x.1,
-                            style: x.2,
-                            span: reedline::Span {
-                                start: x.0.start - offset,
-                                end: x.0.end - offset,
-                            },
-                            append_whitespace: true,
-                            ..Suggestion::default()
-                        },
-                        // TODO????
-                        kind: None,
-                    })
-            })
-            .collect();
 
-        sort_suggestions(&prefix_str, output, options)
+        let completions = file_path_completion(
+            span,
+            &partial,
+            &search_dirs.iter().map(|d| d.as_str()).collect::<Vec<_>>(),
+            options,
+            working_set.permanent_state,
+            stack,
+        );
+        completions
+            .into_iter()
+            .filter(move |it| {
+                // Different base dir, so we list the .nu files or folders
+                if !is_current_folder {
+                    it.path.ends_with(".nu") || it.path.ends_with(SEP)
+                } else {
+                    // Lib dirs, so we filter only the .nu files or directory modules
+                    if it.path.ends_with(SEP) {
+                        Path::new(&it.cwd).join(&it.path).join("mod.nu").exists()
+                    } else {
+                        it.path.ends_with(".nu")
+                    }
+                }
+            })
+            .map(move |x| SemanticSuggestion {
+                suggestion: Suggestion {
+                    value: x.path,
+                    style: x.style,
+                    span: reedline::Span {
+                        start: x.span.start - offset,
+                        end: x.span.end - offset,
+                    },
+                    append_whitespace: true,
+                    ..Suggestion::default()
+                },
+                // TODO????
+                kind: None,
+            })
+            .collect::<Vec<_>>()
     }
 }
diff --git a/crates/nu-cli/src/completions/file_completions.rs b/crates/nu-cli/src/completions/file_completions.rs
index 42e1d397ea..5b4c546878 100644
--- a/crates/nu-cli/src/completions/file_completions.rs
+++ b/crates/nu-cli/src/completions/file_completions.rs
@@ -2,16 +2,14 @@ use crate::completions::{
     completion_common::{adjust_if_intermediate, complete_item, AdjustView},
     Completer, CompletionOptions,
 };
-use nu_ansi_term::Style;
 use nu_protocol::{
     engine::{EngineState, Stack, StateWorkingSet},
     Span,
 };
-use nu_utils::IgnoreCaseExt;
 use reedline::Suggestion;
 use std::path::Path;
 
-use super::SemanticSuggestion;
+use super::{completion_common::FileSuggestion, SemanticSuggestion};
 
 #[derive(Clone, Default)]
 pub struct FileCompletion {}
@@ -44,7 +42,7 @@ impl Completer for FileCompletion {
             readjusted,
             span,
             &prefix,
-            &working_set.permanent_state.current_work_dir(),
+            &[&working_set.permanent_state.current_work_dir()],
             options,
             working_set.permanent_state,
             stack,
@@ -52,11 +50,11 @@ impl Completer for FileCompletion {
         .into_iter()
         .map(move |x| SemanticSuggestion {
             suggestion: Suggestion {
-                value: x.1,
-                style: x.2,
+                value: x.path,
+                style: x.style,
                 span: reedline::Span {
-                    start: x.0.start - offset,
-                    end: x.0.end - offset,
+                    start: x.span.start - offset,
+                    end: x.span.end - offset,
                 },
                 ..Suggestion::default()
             },
@@ -95,21 +93,10 @@ impl Completer for FileCompletion {
 pub fn file_path_completion(
     span: nu_protocol::Span,
     partial: &str,
-    cwd: &str,
+    cwds: &[impl AsRef<str>],
     options: &CompletionOptions,
     engine_state: &EngineState,
     stack: &Stack,
-) -> Vec<(nu_protocol::Span, String, Option<Style>)> {
-    complete_item(false, span, partial, cwd, options, engine_state, stack)
-}
-
-pub fn matches(partial: &str, from: &str, options: &CompletionOptions) -> bool {
-    // Check for case sensitive
-    if !options.case_sensitive {
-        return options
-            .match_algorithm
-            .matches_str(&from.to_folded_case(), &partial.to_folded_case());
-    }
-
-    options.match_algorithm.matches_str(from, partial)
+) -> Vec<FileSuggestion> {
+    complete_item(false, span, partial, cwds, options, engine_state, stack)
 }
diff --git a/crates/nu-cli/src/completions/flag_completions.rs b/crates/nu-cli/src/completions/flag_completions.rs
index 57cd691082..1df95f04ba 100644
--- 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::{completion_common::sort_suggestions, Completer, CompletionOptions};
+use crate::completions::{completion_options::NuMatcher, Completer, CompletionOptions};
 use nu_protocol::{
     ast::{Expr, Expression},
     engine::{Stack, StateWorkingSet},
@@ -35,7 +35,7 @@ impl Completer for FlagCompletion {
             let decl = working_set.get_decl(call.decl_id);
             let sig = decl.signature();
 
-            let mut output = vec![];
+            let mut matcher = NuMatcher::new(String::from_utf8_lossy(prefix), options.clone());
 
             for named in &sig.named {
                 let flag_desc = &named.desc;
@@ -44,34 +44,7 @@ impl Completer for FlagCompletion {
                     short.encode_utf8(&mut named);
                     named.insert(0, b'-');
 
-                    if options.match_algorithm.matches_u8(&named, prefix) {
-                        output.push(SemanticSuggestion {
-                            suggestion: Suggestion {
-                                value: String::from_utf8_lossy(&named).to_string(),
-                                description: Some(flag_desc.to_string()),
-                                span: reedline::Span {
-                                    start: span.start - offset,
-                                    end: span.end - offset,
-                                },
-                                append_whitespace: true,
-                                ..Suggestion::default()
-                            },
-                            // TODO????
-                            kind: None,
-                        });
-                    }
-                }
-
-                if named.long.is_empty() {
-                    continue;
-                }
-
-                let mut named = named.long.as_bytes().to_vec();
-                named.insert(0, b'-');
-                named.insert(0, b'-');
-
-                if options.match_algorithm.matches_u8(&named, prefix) {
-                    output.push(SemanticSuggestion {
+                    matcher.add_semantic_suggestion(SemanticSuggestion {
                         suggestion: Suggestion {
                             value: String::from_utf8_lossy(&named).to_string(),
                             description: Some(flag_desc.to_string()),
@@ -86,9 +59,32 @@ impl Completer for FlagCompletion {
                         kind: None,
                     });
                 }
+
+                if named.long.is_empty() {
+                    continue;
+                }
+
+                let mut named = named.long.as_bytes().to_vec();
+                named.insert(0, b'-');
+                named.insert(0, b'-');
+
+                matcher.add_semantic_suggestion(SemanticSuggestion {
+                    suggestion: Suggestion {
+                        value: String::from_utf8_lossy(&named).to_string(),
+                        description: Some(flag_desc.to_string()),
+                        span: reedline::Span {
+                            start: span.start - offset,
+                            end: span.end - offset,
+                        },
+                        append_whitespace: true,
+                        ..Suggestion::default()
+                    },
+                    // TODO????
+                    kind: None,
+                });
             }
 
-            return sort_suggestions(&String::from_utf8_lossy(prefix), output, options);
+            return matcher.results();
         }
 
         vec![]
diff --git a/crates/nu-cli/src/completions/mod.rs b/crates/nu-cli/src/completions/mod.rs
index 3acb8e9bf3..7c9f9ff483 100644
--- a/crates/nu-cli/src/completions/mod.rs
+++ b/crates/nu-cli/src/completions/mod.rs
@@ -18,7 +18,7 @@ pub use completion_options::{CompletionOptions, MatchAlgorithm};
 pub use custom_completions::CustomCompletion;
 pub use directory_completions::DirectoryCompletion;
 pub use dotnu_completions::DotNuCompletion;
-pub use file_completions::{file_path_completion, matches, FileCompletion};
+pub use file_completions::{file_path_completion, FileCompletion};
 pub use flag_completions::FlagCompletion;
 pub use operator_completions::OperatorCompletion;
 pub use variable_completions::VariableCompletion;
diff --git a/crates/nu-cli/src/completions/operator_completions.rs b/crates/nu-cli/src/completions/operator_completions.rs
index 460e7f590b..0ce4e02e17 100644
--- a/crates/nu-cli/src/completions/operator_completions.rs
+++ b/crates/nu-cli/src/completions/operator_completions.rs
@@ -1,5 +1,5 @@
 use crate::completions::{
-    Completer, CompletionOptions, MatchAlgorithm, SemanticSuggestion, SuggestionKind,
+    completion_options::NuMatcher, Completer, CompletionOptions, SemanticSuggestion, SuggestionKind,
 };
 use nu_protocol::{
     ast::{Expr, Expression},
@@ -28,7 +28,7 @@ impl Completer for OperatorCompletion {
         span: Span,
         offset: usize,
         _pos: usize,
-        _options: &CompletionOptions,
+        options: &CompletionOptions,
     ) -> Vec<SemanticSuggestion> {
         //Check if int, float, or string
         let partial = std::str::from_utf8(working_set.get_span_contents(span)).unwrap_or("");
@@ -129,17 +129,12 @@ impl Completer for OperatorCompletion {
             _ => vec![],
         };
 
-        let match_algorithm = MatchAlgorithm::Prefix;
-        let input_fuzzy_search =
-            |(operator, _): &(&str, &str)| match_algorithm.matches_str(operator, partial);
-
-        possible_operations
-            .into_iter()
-            .filter(input_fuzzy_search)
-            .map(move |x| SemanticSuggestion {
+        let mut matcher = NuMatcher::new(partial, options.clone());
+        for (symbol, desc) in possible_operations.into_iter() {
+            matcher.add_semantic_suggestion(SemanticSuggestion {
                 suggestion: Suggestion {
-                    value: x.0.to_string(),
-                    description: Some(x.1.to_string()),
+                    value: symbol.to_string(),
+                    description: Some(desc.to_string()),
                     span: reedline::Span::new(span.start - offset, span.end - offset),
                     append_whitespace: true,
                     ..Suggestion::default()
@@ -147,8 +142,9 @@ impl Completer for OperatorCompletion {
                 kind: Some(SuggestionKind::Command(
                     nu_protocol::engine::CommandType::Builtin,
                 )),
-            })
-            .collect()
+            });
+        }
+        matcher.results()
     }
 }
 
diff --git a/crates/nu-cli/src/completions/variable_completions.rs b/crates/nu-cli/src/completions/variable_completions.rs
index 29b5393257..69e0985e80 100644
--- a/crates/nu-cli/src/completions/variable_completions.rs
+++ b/crates/nu-cli/src/completions/variable_completions.rs
@@ -1,6 +1,4 @@
-use crate::completions::{
-    Completer, CompletionOptions, MatchAlgorithm, SemanticSuggestion, SuggestionKind,
-};
+use crate::completions::{Completer, CompletionOptions, SemanticSuggestion, SuggestionKind};
 use nu_engine::{column::get_columns, eval_variable};
 use nu_protocol::{
     engine::{Stack, StateWorkingSet},
@@ -9,7 +7,7 @@ use nu_protocol::{
 use reedline::Suggestion;
 use std::str;
 
-use super::completion_common::sort_suggestions;
+use super::completion_options::NuMatcher;
 
 #[derive(Clone)]
 pub struct VariableCompletion {
@@ -33,7 +31,6 @@ impl Completer for VariableCompletion {
         _pos: usize,
         options: &CompletionOptions,
     ) -> Vec<SemanticSuggestion> {
-        let mut output = vec![];
         let builtins = ["$nu", "$in", "$env"];
         let var_str = std::str::from_utf8(&self.var_context.0).unwrap_or("");
         let var_id = working_set.find_variable(&self.var_context.0);
@@ -43,6 +40,7 @@ impl Completer for VariableCompletion {
         };
         let sublevels_count = self.var_context.1.len();
         let prefix_str = String::from_utf8_lossy(prefix);
+        let mut matcher = NuMatcher::new(prefix_str, options.clone());
 
         // Completions for the given variable
         if !var_str.is_empty() {
@@ -63,37 +61,25 @@ impl Completer for VariableCompletion {
 
                     if let Some(val) = env_vars.get(&target_var_str) {
                         for suggestion in nested_suggestions(val, &nested_levels, current_span) {
-                            if options.match_algorithm.matches_u8_insensitive(
-                                options.case_sensitive,
-                                suggestion.suggestion.value.as_bytes(),
-                                prefix,
-                            ) {
-                                output.push(suggestion);
-                            }
+                            matcher.add_semantic_suggestion(suggestion);
                         }
 
-                        return sort_suggestions(&prefix_str, output, options);
+                        return matcher.results();
                     }
                 } else {
                     // No nesting provided, return all env vars
                     for env_var in env_vars {
-                        if options.match_algorithm.matches_u8_insensitive(
-                            options.case_sensitive,
-                            env_var.0.as_bytes(),
-                            prefix,
-                        ) {
-                            output.push(SemanticSuggestion {
-                                suggestion: Suggestion {
-                                    value: env_var.0,
-                                    span: current_span,
-                                    ..Suggestion::default()
-                                },
-                                kind: Some(SuggestionKind::Type(env_var.1.get_type())),
-                            });
-                        }
+                        matcher.add_semantic_suggestion(SemanticSuggestion {
+                            suggestion: Suggestion {
+                                value: env_var.0,
+                                span: current_span,
+                                ..Suggestion::default()
+                            },
+                            kind: Some(SuggestionKind::Type(env_var.1.get_type())),
+                        });
                     }
 
-                    return sort_suggestions(&prefix_str, output, options);
+                    return matcher.results();
                 }
             }
 
@@ -108,16 +94,10 @@ impl Completer for VariableCompletion {
                 ) {
                     for suggestion in nested_suggestions(&nuval, &self.var_context.1, current_span)
                     {
-                        if options.match_algorithm.matches_u8_insensitive(
-                            options.case_sensitive,
-                            suggestion.suggestion.value.as_bytes(),
-                            prefix,
-                        ) {
-                            output.push(suggestion);
-                        }
+                        matcher.add_semantic_suggestion(suggestion);
                     }
 
-                    return sort_suggestions(&prefix_str, output, options);
+                    return matcher.results();
                 }
             }
 
@@ -130,37 +110,25 @@ impl Completer for VariableCompletion {
                 if let Ok(value) = var {
                     for suggestion in nested_suggestions(&value, &self.var_context.1, current_span)
                     {
-                        if options.match_algorithm.matches_u8_insensitive(
-                            options.case_sensitive,
-                            suggestion.suggestion.value.as_bytes(),
-                            prefix,
-                        ) {
-                            output.push(suggestion);
-                        }
+                        matcher.add_semantic_suggestion(suggestion);
                     }
 
-                    return sort_suggestions(&prefix_str, output, options);
+                    return matcher.results();
                 }
             }
         }
 
         // Variable completion (e.g: $en<tab> to complete $env)
         for builtin in builtins {
-            if options.match_algorithm.matches_u8_insensitive(
-                options.case_sensitive,
-                builtin.as_bytes(),
-                prefix,
-            ) {
-                output.push(SemanticSuggestion {
-                    suggestion: Suggestion {
-                        value: builtin.to_string(),
-                        span: current_span,
-                        ..Suggestion::default()
-                    },
-                    // TODO is there a way to get the VarId to get the type???
-                    kind: None,
-                });
-            }
+            matcher.add_semantic_suggestion(SemanticSuggestion {
+                suggestion: Suggestion {
+                    value: builtin.to_string(),
+                    span: current_span,
+                    ..Suggestion::default()
+                },
+                // TODO is there a way to get the VarId to get the type???
+                kind: None,
+            });
         }
 
         // TODO: The following can be refactored (see find_commands_by_predicate() used in
@@ -170,40 +138,7 @@ impl Completer for VariableCompletion {
         for scope_frame in working_set.delta.scope.iter().rev() {
             for overlay_frame in scope_frame.active_overlays(&mut removed_overlays).rev() {
                 for v in &overlay_frame.vars {
-                    if options.match_algorithm.matches_u8_insensitive(
-                        options.case_sensitive,
-                        v.0,
-                        prefix,
-                    ) {
-                        output.push(SemanticSuggestion {
-                            suggestion: Suggestion {
-                                value: String::from_utf8_lossy(v.0).to_string(),
-                                span: current_span,
-                                ..Suggestion::default()
-                            },
-                            kind: Some(SuggestionKind::Type(
-                                working_set.get_variable(*v.1).ty.clone(),
-                            )),
-                        });
-                    }
-                }
-            }
-        }
-
-        // Permanent state vars
-        // for scope in &self.engine_state.scope {
-        for overlay_frame in working_set
-            .permanent_state
-            .active_overlays(&removed_overlays)
-            .rev()
-        {
-            for v in &overlay_frame.vars {
-                if options.match_algorithm.matches_u8_insensitive(
-                    options.case_sensitive,
-                    v.0,
-                    prefix,
-                ) {
-                    output.push(SemanticSuggestion {
+                    matcher.add_semantic_suggestion(SemanticSuggestion {
                         suggestion: Suggestion {
                             value: String::from_utf8_lossy(v.0).to_string(),
                             span: current_span,
@@ -217,11 +152,28 @@ impl Completer for VariableCompletion {
             }
         }
 
-        output = sort_suggestions(&prefix_str, output, options);
+        // Permanent state vars
+        // for scope in &self.engine_state.scope {
+        for overlay_frame in working_set
+            .permanent_state
+            .active_overlays(&removed_overlays)
+            .rev()
+        {
+            for v in &overlay_frame.vars {
+                matcher.add_semantic_suggestion(SemanticSuggestion {
+                    suggestion: Suggestion {
+                        value: String::from_utf8_lossy(v.0).to_string(),
+                        span: current_span,
+                        ..Suggestion::default()
+                    },
+                    kind: Some(SuggestionKind::Type(
+                        working_set.get_variable(*v.1).ty.clone(),
+                    )),
+                });
+            }
+        }
 
-        output.dedup(); // TODO: Removes only consecutive duplicates, is it intended?
-
-        output
+        matcher.results()
     }
 }
 
@@ -302,13 +254,3 @@ fn recursive_value(val: &Value, sublevels: &[Vec<u8>]) -> Result<Value, Span> {
         Ok(val.clone())
     }
 }
-
-impl MatchAlgorithm {
-    pub fn matches_u8_insensitive(&self, sensitive: bool, haystack: &[u8], needle: &[u8]) -> bool {
-        if sensitive {
-            self.matches_u8(haystack, needle)
-        } else {
-            self.matches_u8(&haystack.to_ascii_lowercase(), &needle.to_ascii_lowercase())
-        }
-    }
-}
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index 8e89239663..4bcf8b55c0 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -890,8 +890,8 @@ fn subcommand_completions(mut subcommand_completer: NuCompleter) {
     match_suggestions(
         &vec![
             "foo bar".to_string(),
-            "foo aabcrr".to_string(),
             "foo abaz".to_string(),
+            "foo aabcrr".to_string(),
         ],
         &suggestions,
     );
@@ -955,8 +955,8 @@ fn flag_completions() {
         "--mime-type".into(),
         "--short-names".into(),
         "--threads".into(),
-        "-D".into(),
         "-a".into(),
+        "-D".into(),
         "-d".into(),
         "-f".into(),
         "-h".into(),
@@ -1287,7 +1287,7 @@ fn variables_completions() {
     assert_eq!(3, suggestions.len());
 
     #[cfg(windows)]
-    let expected: Vec<String> = vec!["PWD".into(), "Path".into(), "TEST".into()];
+    let expected: Vec<String> = vec!["Path".into(), "PWD".into(), "TEST".into()];
     #[cfg(not(windows))]
     let expected: Vec<String> = vec!["PATH".into(), "PWD".into(), "TEST".into()];
 
@@ -1576,6 +1576,23 @@ fn sort_fuzzy_completions_in_alphabetical_order(mut fuzzy_alpha_sort_completer:
     );
 }
 
+#[test]
+fn exact_match() {
+    let (dir, _, engine, stack) = new_partial_engine();
+
+    let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
+
+    let target_dir = format!("open {}", folder(dir.join("pArTiAL")));
+    let suggestions = completer.complete(&target_dir, target_dir.len());
+
+    // Since it's an exact match, only 'partial' should be suggested, not
+    // 'partial-a' and stuff. Implemented in #13302
+    match_suggestions(
+        &vec![file(dir.join("partial").join("hello.txt"))],
+        &suggestions,
+    );
+}
+
 #[ignore = "was reverted, still needs fixing"]
 #[rstest]
 fn alias_offset_bug_7648() {
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index 9704509de1..626033f915 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -698,7 +698,7 @@ impl EngineState {
 
     pub fn find_commands_by_predicate(
         &self,
-        predicate: impl Fn(&[u8]) -> bool,
+        mut predicate: impl FnMut(&[u8]) -> bool,
         ignore_deprecated: bool,
     ) -> Vec<(Vec<u8>, Option<String>, CommandType)> {
         let mut output = vec![];
diff --git a/crates/nu-protocol/src/engine/state_working_set.rs b/crates/nu-protocol/src/engine/state_working_set.rs
index 8c500ddd65..0d59068dbf 100644
--- a/crates/nu-protocol/src/engine/state_working_set.rs
+++ b/crates/nu-protocol/src/engine/state_working_set.rs
@@ -724,7 +724,7 @@ impl<'a> StateWorkingSet<'a> {
 
     pub fn find_commands_by_predicate(
         &self,
-        predicate: impl Fn(&[u8]) -> bool,
+        mut predicate: impl FnMut(&[u8]) -> bool,
         ignore_deprecated: bool,
     ) -> Vec<(Vec<u8>, Option<String>, CommandType)> {
         let mut output = vec![];

From 7c84634e3fae69c3daa4d65e4381a80516bc13d9 Mon Sep 17 00:00:00 2001
From: Solomon <git@solomonvictorino.com>
Date: Sat, 23 Nov 2024 14:42:00 -0700
Subject: [PATCH 0707/1072] return accurate type errors from blocks/expressions
 in type unions (#14420)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# User-Facing Changes

- `expected <type>` errors are now propagated from
  `Closure | Block | Expression` instead of falling back to
  "expected one of..." for the block:

Before:

```nushell
def foo [bar: bool] {}
if true {} else { foo 1 }
                ────┬────
                    ╰── expected one of a list of accepted shapes: [Block, Expression]
```

After:

```nushell
if true {} else { foo 1 }
                      ┬
                      ╰── expected bool
```
---
 crates/nu-parser/src/parser.rs | 119 ++++++++++++++-------------------
 tests/repl/test_type_check.rs  |  18 +++++
 2 files changed, 67 insertions(+), 70 deletions(-)

diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 7db2e112bf..4048bec2a9 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -772,6 +772,51 @@ fn calculate_end_span(
     }
 }
 
+fn parse_oneof(
+    working_set: &mut StateWorkingSet,
+    spans: &[Span],
+    spans_idx: &mut usize,
+    possible_shapes: &Vec<SyntaxShape>,
+    multispan: bool,
+) -> Expression {
+    for shape in possible_shapes {
+        let starting_error_count = working_set.parse_errors.len();
+        let value = match multispan {
+            true => parse_multispan_value(working_set, spans, spans_idx, shape),
+            false => parse_value(working_set, spans[*spans_idx], shape),
+        };
+
+        if starting_error_count == working_set.parse_errors.len() {
+            return value;
+        }
+
+        // while trying the possible shapes, ignore Expected type errors
+        // unless they're inside a block, closure, or expression
+        let propagate_error = match working_set.parse_errors.last() {
+            Some(ParseError::Expected(_, error_span))
+            | Some(ParseError::ExpectedWithStringMsg(_, error_span)) => {
+                matches!(
+                    shape,
+                    SyntaxShape::Block | SyntaxShape::Closure(_) | SyntaxShape::Expression
+                ) && *error_span != spans[*spans_idx]
+            }
+            _ => true,
+        };
+        if !propagate_error {
+            working_set.parse_errors.truncate(starting_error_count);
+        }
+    }
+
+    if working_set.parse_errors.is_empty() {
+        working_set.error(ParseError::ExpectedWithStringMsg(
+            format!("one of a list of accepted shapes: {possible_shapes:?}"),
+            spans[*spans_idx],
+        ));
+    }
+
+    Expression::garbage(working_set, spans[*spans_idx])
+}
+
 pub fn parse_multispan_value(
     working_set: &mut StateWorkingSet,
     spans: &[Span],
@@ -800,54 +845,10 @@ pub fn parse_multispan_value(
 
             arg
         }
-        SyntaxShape::OneOf(shapes) => {
-            // handle for `if` command.
-            //let block_then_exp = shapes.as_slice() == [SyntaxShape::Block, SyntaxShape::Expression];
-            for shape in shapes.iter() {
-                let starting_error_count = working_set.parse_errors.len();
-                let s = parse_multispan_value(working_set, spans, spans_idx, shape);
-
-                if starting_error_count == working_set.parse_errors.len() {
-                    return s;
-                } else if let Some(
-                    ParseError::Expected(..) | ParseError::ExpectedWithStringMsg(..),
-                ) = working_set.parse_errors.last()
-                {
-                    working_set.parse_errors.truncate(starting_error_count);
-                    continue;
-                }
-                // `if` is parsing block first and then expression.
-                // when we're writing something like `else if $a`, parsing as a
-                // block will result to error(because it's not a block)
-                //
-                // If parse as a expression also failed, user is more likely concerned
-                // about expression failure rather than "expect block failure"".
-
-                // FIXME FIXME FIXME
-                // if block_then_exp {
-                //     match &err {
-                //         Some(ParseError::Expected(expected, _)) => {
-                //             if expected.starts_with("block") {
-                //                 err = e
-                //             }
-                //         }
-                //         _ => err = err.or(e),
-                //     }
-                // } else {
-                //     err = err.or(e)
-                // }
-            }
-            let span = spans[*spans_idx];
-
-            if working_set.parse_errors.is_empty() {
-                working_set.error(ParseError::ExpectedWithStringMsg(
-                    format!("one of a list of accepted shapes: {shapes:?}"),
-                    span,
-                ));
-            }
-
-            Expression::garbage(working_set, span)
+        SyntaxShape::OneOf(possible_shapes) => {
+            parse_oneof(working_set, spans, spans_idx, possible_shapes, true)
         }
+
         SyntaxShape::Expression => {
             trace!("parsing: expression");
 
@@ -4826,29 +4827,7 @@ pub fn parse_value(
 
         SyntaxShape::ExternalArgument => parse_regular_external_arg(working_set, span),
         SyntaxShape::OneOf(possible_shapes) => {
-            for s in possible_shapes {
-                let starting_error_count = working_set.parse_errors.len();
-                let value = parse_value(working_set, span, s);
-
-                if starting_error_count == working_set.parse_errors.len() {
-                    return value;
-                } else if let Some(
-                    ParseError::Expected(..) | ParseError::ExpectedWithStringMsg(..),
-                ) = working_set.parse_errors.last()
-                {
-                    working_set.parse_errors.truncate(starting_error_count);
-                    continue;
-                }
-            }
-
-            if working_set.parse_errors.is_empty() {
-                working_set.error(ParseError::ExpectedWithStringMsg(
-                    format!("one of a list of accepted shapes: {possible_shapes:?}"),
-                    span,
-                ));
-            }
-
-            Expression::garbage(working_set, span)
+            parse_oneof(working_set, &[span], &mut 0, possible_shapes, false)
         }
 
         SyntaxShape::Any => {
diff --git a/tests/repl/test_type_check.rs b/tests/repl/test_type_check.rs
index 95ef7f4323..07a8d99495 100644
--- a/tests/repl/test_type_check.rs
+++ b/tests/repl/test_type_check.rs
@@ -1,4 +1,5 @@
 use crate::repl::tests::{fail_test, run_test, TestResult};
+use rstest::rstest;
 
 #[test]
 fn chained_operator_typecheck() -> TestResult {
@@ -154,3 +155,20 @@ fn in_variable_expression_wrong_output_type() -> TestResult {
         "expected int",
     )
 }
+
+#[rstest]
+#[case("if true {} else { foo 1 }")]
+#[case("if true {} else if (foo 1) == null { }")]
+#[case("match 1 { 0 => { foo 1 } }")]
+#[case("try { } catch { foo 1 }")]
+/// type errors should propagate from `OneOf(Block | Closure | Expression, ..)`
+fn in_oneof_block_expected_type(#[case] input: &str) -> TestResult {
+    let def = "def foo [bar: bool] {};";
+
+    fail_test(&format!("{def} {input}"), "expected bool")
+}
+
+#[test]
+fn in_oneof_block_expected_block() -> TestResult {
+    fail_test("match 1 { 0 => { try 3 } }", "expected block")
+}

From 58576630dbee46474a25e788cee7bc3737c8bf94 Mon Sep 17 00:00:00 2001
From: Beinsezii <39478211+Beinsezii@users.noreply.github.com>
Date: Sat, 23 Nov 2024 13:49:25 -0800
Subject: [PATCH 0708/1072] command/http/client use CRLF for headers join
 instead of LF (#14417)

# Description
Apparently it should be joint CRLF for the EOL marker

https://www.rfc-editor.org/rfc/rfc2616#section-2.2

Plain LF isn't particularly standardized and many backends don't
recognize it. Tested on `starlette`

# User-Facing Changes
None

# Tests + Formatting
It's two characters; everything passes

# After Submitting
Not needed
---
 crates/nu-command/src/network/http/client.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-command/src/network/http/client.rs b/crates/nu-command/src/network/http/client.rs
index 62dd693627..504cc7b632 100644
--- a/crates/nu-command/src/network/http/client.rs
+++ b/crates/nu-command/src/network/http/client.rs
@@ -376,7 +376,7 @@ fn send_multipart_request(
                         format!("Content-Length: {}", val.len()),
                     ];
                     builder
-                        .add(&mut Cursor::new(val), &headers.join("\n"))
+                        .add(&mut Cursor::new(val), &headers.join("\r\n"))
                         .map_err(err)?;
                 } else {
                     let headers = format!(r#"Content-Disposition: form-data; name="{}""#, col);

From 83d8e936ad1aade55050f9ed5c7c198c15877a94 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Sat, 23 Nov 2024 17:04:27 -0500
Subject: [PATCH 0709/1072] Fix small typos in std/dirs (#14422)

# Description

Typos in the command doc-help.
---
 crates/nu-std/std/dirs/mod.nu | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/nu-std/std/dirs/mod.nu b/crates/nu-std/std/dirs/mod.nu
index a26128a5d7..ab3403f36c 100644
--- a/crates/nu-std/std/dirs/mod.nu
+++ b/crates/nu-std/std/dirs/mod.nu
@@ -43,7 +43,7 @@ export def --env add [
 }
 
 # Make the next directory on the list the active directory.
-# If the currenta ctive directory is the last in the list, 
+# If the current active directory is the last in the list,
 # then cycle to the top of the list.
 export def --env next [
     N:int = 1   # number of positions to move.
@@ -52,7 +52,7 @@ export def --env next [
 }
 
 # Make the previous directory on the list the active directory.
-# If the current active directory is the first in the list, 
+# If the current active directory is the first in the list,
 # then cycle to the end of the list.
 export def --env prev [
     N:int = 1   # number of positions to move.

From dd3a3a2717650113d5e1986fa06feebbef9a1ef0 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Sat, 23 Nov 2024 21:37:12 -0600
Subject: [PATCH 0710/1072] remove `terminal_size` crate everywhere it makes
 sense (#14423)

# Description

This PR removes the `terminal_size` crate everywhere that it made sense.
I replaced it with crossterm's version called `size`. The places I
didn't remove it were the places that did not have a dependency on
crossterm. So, I thought it was "cheaper" to have a dep on term_size vs
crossterm in those locations.
---
 Cargo.lock                                  |  2 --
 crates/nu-command/Cargo.toml                |  1 -
 crates/nu-command/src/debug/inspect.rs      |  9 +++------
 crates/nu-command/src/platform/term_size.rs | 11 ++++-------
 crates/nu-command/src/viewers/griddle.rs    |  4 ++--
 crates/nu-command/src/viewers/table.rs      |  4 ++--
 crates/nu-explore/Cargo.toml                |  1 -
 crates/nu-explore/src/lib.rs                |  4 ++--
 8 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d15ecdf729..e57b9da8fb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3358,7 +3358,6 @@ dependencies = [
  "sysinfo 0.32.0",
  "tabled",
  "tempfile",
- "terminal_size 0.4.0",
  "titlecase",
  "toml 0.8.19",
  "trash",
@@ -3427,7 +3426,6 @@ dependencies = [
  "nu-utils",
  "ratatui",
  "strip-ansi-escapes",
- "terminal_size 0.4.0",
  "unicode-width 0.1.11",
 ]
 
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index c37954e9c1..53e39353c0 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -86,7 +86,6 @@ serde_yaml = { workspace = true }
 sha2 = { workspace = true }
 sysinfo = { workspace = true }
 tabled = { workspace = true, features = ["ansi"], default-features = false }
-terminal_size = { workspace = true }
 titlecase = { workspace = true }
 toml = { workspace = true, features = ["preserve_order"] }
 unicode-segmentation = { workspace = true }
diff --git a/crates/nu-command/src/debug/inspect.rs b/crates/nu-command/src/debug/inspect.rs
index 97217780bf..4a9f7bc4a5 100644
--- a/crates/nu-command/src/debug/inspect.rs
+++ b/crates/nu-command/src/debug/inspect.rs
@@ -1,6 +1,6 @@
 use super::inspect_table;
+use crossterm::terminal::size;
 use nu_engine::command_prelude::*;
-use terminal_size::{terminal_size, Height, Width};
 
 #[derive(Clone)]
 pub struct Inspect;
@@ -38,12 +38,9 @@ impl Command for Inspect {
         let original_input = input_val.clone();
         let description = input_val.get_type().to_string();
 
-        let (cols, _rows) = match terminal_size() {
-            Some((w, h)) => (Width(w.0), Height(h.0)),
-            None => (Width(0), Height(0)),
-        };
+        let (cols, _rows) = size().unwrap_or((0, 0));
 
-        let table = inspect_table::build_table(input_val, description, cols.0 as usize);
+        let table = inspect_table::build_table(input_val, description, cols as usize);
 
         // Note that this is printed to stderr. The reason for this is so it doesn't disrupt the regular nushell
         // tabular output. If we printed to stdout, nushell would get confused with two outputs.
diff --git a/crates/nu-command/src/platform/term_size.rs b/crates/nu-command/src/platform/term_size.rs
index a4261dee81..b41d9da6c1 100644
--- a/crates/nu-command/src/platform/term_size.rs
+++ b/crates/nu-command/src/platform/term_size.rs
@@ -1,5 +1,5 @@
+use crossterm::terminal::size;
 use nu_engine::command_prelude::*;
-use terminal_size::{terminal_size, Height, Width};
 
 #[derive(Clone)]
 pub struct TermSize;
@@ -51,15 +51,12 @@ impl Command for TermSize {
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
 
-        let (cols, rows) = match terminal_size() {
-            Some((w, h)) => (Width(w.0), Height(h.0)),
-            None => (Width(0), Height(0)),
-        };
+        let (cols, rows) = size().unwrap_or((0, 0));
 
         Ok(Value::record(
             record! {
-                "columns" => Value::int(cols.0 as i64, head),
-                "rows" => Value::int(rows.0 as i64, head),
+                "columns" => Value::int(cols as i64, head),
+                "rows" => Value::int(rows as i64, head),
             },
             head,
         )
diff --git a/crates/nu-command/src/viewers/griddle.rs b/crates/nu-command/src/viewers/griddle.rs
index 2774903d0f..730c5ec0df 100644
--- a/crates/nu-command/src/viewers/griddle.rs
+++ b/crates/nu-command/src/viewers/griddle.rs
@@ -1,12 +1,12 @@
 // use super::icons::{icon_for_file, iconify_style_ansi_to_nu};
 use super::icons::icon_for_file;
+use crossterm::terminal::size;
 use lscolors::Style;
 use nu_engine::{command_prelude::*, env_to_string};
 use nu_protocol::Config;
 use nu_term_grid::grid::{Alignment, Cell, Direction, Filling, Grid, GridOptions};
 use nu_utils::get_ls_colors;
 use std::path::Path;
-use terminal_size::{Height, Width};
 
 #[derive(Clone)]
 pub struct Griddle;
@@ -192,7 +192,7 @@ fn create_grid_output(
 
     let cols = if let Some(col) = width_param {
         col as u16
-    } else if let Some((Width(w), Height(_h))) = terminal_size::terminal_size() {
+    } else if let Ok((w, _h)) = size() {
         w
     } else {
         80u16
diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index 50db949ced..43c9ed0b8d 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -2,6 +2,7 @@
 //        overall reduce the redundant calls to StyleComputer etc.
 //        the goal is to configure it once...
 
+use crossterm::terminal::size;
 use lscolors::{LsColors, Style};
 use nu_color_config::{color_from_hex, StyleComputer, TextStyle};
 use nu_engine::{command_prelude::*, env_to_string};
@@ -22,7 +23,6 @@ use std::{
     str::FromStr,
     time::Instant,
 };
-use terminal_size::{Height, Width};
 use url::Url;
 
 const STREAM_PAGE_SIZE: usize = 1000;
@@ -30,7 +30,7 @@ const STREAM_PAGE_SIZE: usize = 1000;
 fn get_width_param(width_param: Option<i64>) -> usize {
     if let Some(col) = width_param {
         col as usize
-    } else if let Some((Width(w), Height(_))) = terminal_size::terminal_size() {
+    } else if let Ok((w, _h)) = size() {
         w as usize
     } else {
         80
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index 6ea09e3f13..e201262750 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -27,7 +27,6 @@ nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.100.1" }
 
 anyhow = { workspace = true }
 log = { workspace = true }
-terminal_size = { workspace = true }
 strip-ansi-escapes = { workspace = true }
 crossterm = { workspace = true }
 ratatui = { workspace = true }
diff --git a/crates/nu-explore/src/lib.rs b/crates/nu-explore/src/lib.rs
index d645572c89..a6d4161631 100644
--- a/crates/nu-explore/src/lib.rs
+++ b/crates/nu-explore/src/lib.rs
@@ -9,6 +9,7 @@ mod views;
 
 use anyhow::Result;
 use commands::{ExpandCmd, HelpCmd, NuCmd, QuitCmd, TableCmd, TryCmd};
+use crossterm::terminal::size;
 pub use default_context::add_explore_context;
 pub use explore::Explore;
 use explore::ExploreConfig;
@@ -19,7 +20,6 @@ use nu_protocol::{
 };
 use pager::{Page, Pager, PagerConfig};
 use registry::CommandRegistry;
-use terminal_size::{Height, Width};
 use views::{BinaryView, Orientation, Preview, RecordView};
 
 mod util {
@@ -80,7 +80,7 @@ fn create_record_view(
     }
 
     if config.tail {
-        if let Some((Width(w), Height(h))) = terminal_size::terminal_size() {
+        if let Ok((w, h)) = size() {
             view.tail(w, h);
         }
     }

From 4d3283e23555610bd5443e1e57afdd5f748d25dc Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Sun, 24 Nov 2024 10:59:54 -0800
Subject: [PATCH 0711/1072] Change append operator to concatenation operator
 (#14344)

# Description

The "append" operator currently serves as both the append operator and
the concatenation operator. This dual role creates ambiguity when
operating on nested lists.

```nu
[1 2] ++ 3     # appends a value to a list [1 2 3]
[1 2] ++ [3 4] # concatenates two lists    [1 2 3 4]

[[1 2] [3 4]] ++ [5 6]
# does this give [[1 2] [3 4] [5 6]]
# or             [[1 2] [3 4] 5 6]
```

Another problem is that `++=` can change the type of a variable:
```nu
mut str = 'hello '
$str ++= ['world']
($str | describe) == list<string>
```

Note that appending is only relevant for lists, but concatenation is
relevant for lists, strings, and binary values. Additionally, appending
can be expressed in terms of concatenation (see example below). So, this
PR changes the `++` operator to only perform concatenation.

# User-Facing Changes

Using the `++` operator with a list and a non-list value will now be a
compile time or runtime error.
```nu
mut list = []
$list ++= 1 # error
```
Instead, concatenate a list with one element:
```nu
$list ++= [1]
```
Or use `append`:
```nu
$list = $list | append 1
```

# After Submitting

Update book and docs.

---------

Co-authored-by: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
---
 .../src/completions/operator_completions.rs   | 18 +---
 crates/nu-command/src/help/help_operators.rs  | 12 +--
 .../commands/assignment/append_assign.rs      | 88 -------------------
 .../tests/commands/assignment/concat.rs       | 76 ++++++++++++++++
 .../tests/commands/assignment/mod.rs          |  2 +-
 crates/nu-command/tests/commands/math/mod.rs  | 30 +------
 crates/nu-command/tests/commands/url/join.rs  | 17 ++--
 crates/nu-engine/src/compile/operator.rs      |  2 +-
 crates/nu-engine/src/eval.rs                  |  4 +-
 crates/nu-engine/src/eval_ir.rs               |  2 +-
 crates/nu-parser/src/parser.rs                |  4 +-
 crates/nu-parser/src/type_check.rs            | 22 ++---
 .../nu-plugin-engine/src/interface/tests.rs   |  4 +-
 crates/nu-protocol/src/ast/operator.rs        | 10 +--
 crates/nu-protocol/src/eval_base.rs           |  2 +-
 crates/nu-protocol/src/value/mod.rs           | 30 ++-----
 crates/nu-std/std/help/mod.nu                 |  4 +-
 .../src/cool_custom_value.rs                  |  2 +-
 tests/const_/mod.rs                           |  1 -
 tests/eval/mod.rs                             |  2 +-
 20 files changed, 131 insertions(+), 201 deletions(-)
 delete mode 100644 crates/nu-command/tests/commands/assignment/append_assign.rs
 create mode 100644 crates/nu-command/tests/commands/assignment/concat.rs

diff --git a/crates/nu-cli/src/completions/operator_completions.rs b/crates/nu-cli/src/completions/operator_completions.rs
index 0ce4e02e17..aebb176b76 100644
--- a/crates/nu-cli/src/completions/operator_completions.rs
+++ b/crates/nu-cli/src/completions/operator_completions.rs
@@ -60,10 +60,6 @@ impl Completer for OperatorCompletion {
                 ("bit-shr", "Bitwise shift right"),
                 ("in", "Is a member of (doesn't use regex)"),
                 ("not-in", "Is not a member of (doesn't use regex)"),
-                (
-                    "++",
-                    "Appends two lists, a list and a value, two strings, or two binary values",
-                ),
             ],
             Expr::String(_) => vec![
                 ("=~", "Contains regex match"),
@@ -72,7 +68,7 @@ impl Completer for OperatorCompletion {
                 ("not-like", "Does not contain regex match"),
                 (
                     "++",
-                    "Appends two lists, a list and a value, two strings, or two binary values",
+                    "Concatenates two lists, two strings, or two binary values",
                 ),
                 ("in", "Is a member of (doesn't use regex)"),
                 ("not-in", "Is not a member of (doesn't use regex)"),
@@ -95,10 +91,6 @@ impl Completer for OperatorCompletion {
                 ("**", "Power of"),
                 ("in", "Is a member of (doesn't use regex)"),
                 ("not-in", "Is not a member of (doesn't use regex)"),
-                (
-                    "++",
-                    "Appends two lists, a list and a value, two strings, or two binary values",
-                ),
             ],
             Expr::Bool(_) => vec![
                 (
@@ -113,15 +105,11 @@ impl Completer for OperatorCompletion {
                 ("not", "Negates a value or expression"),
                 ("in", "Is a member of (doesn't use regex)"),
                 ("not-in", "Is not a member of (doesn't use regex)"),
-                (
-                    "++",
-                    "Appends two lists, a list and a value, two strings, or two binary values",
-                ),
             ],
             Expr::FullCellPath(path) => match path.head.expr {
                 Expr::List(_) => vec![(
                     "++",
-                    "Appends two lists, a list and a value, two strings, or two binary values",
+                    "Concatenates two lists, two strings, or two binary values",
                 )],
                 Expr::Var(id) => get_variable_completions(id, working_set),
                 _ => vec![],
@@ -161,7 +149,7 @@ pub fn get_variable_completions<'a>(
         Type::List(_) | Type::String | Type::Binary => vec![
             (
                 "++=",
-                "Appends a list, a value, a string, or a binary value to a variable.",
+                "Concatenates two lists, two strings, or two binary values",
             ),
             ("=", "Assigns a value to a variable."),
         ],
diff --git a/crates/nu-command/src/help/help_operators.rs b/crates/nu-command/src/help/help_operators.rs
index 28be6a68ed..28bb223e61 100644
--- a/crates/nu-command/src/help/help_operators.rs
+++ b/crates/nu-command/src/help/help_operators.rs
@@ -31,7 +31,7 @@ impl Command for HelpOperators {
         let mut operators = [
             Operator::Assignment(Assignment::Assign),
             Operator::Assignment(Assignment::PlusAssign),
-            Operator::Assignment(Assignment::AppendAssign),
+            Operator::Assignment(Assignment::ConcatAssign),
             Operator::Assignment(Assignment::MinusAssign),
             Operator::Assignment(Assignment::MultiplyAssign),
             Operator::Assignment(Assignment::DivideAssign),
@@ -48,7 +48,7 @@ impl Command for HelpOperators {
             Operator::Comparison(Comparison::StartsWith),
             Operator::Comparison(Comparison::EndsWith),
             Operator::Math(Math::Plus),
-            Operator::Math(Math::Append),
+            Operator::Math(Math::Concat),
             Operator::Math(Math::Minus),
             Operator::Math(Math::Multiply),
             Operator::Math(Math::Divide),
@@ -144,8 +144,8 @@ fn description(operator: &Operator) -> &'static str {
         Operator::Comparison(Comparison::StartsWith) => "Checks if a string starts with another.",
         Operator::Comparison(Comparison::EndsWith) => "Checks if a string ends with another.",
         Operator::Math(Math::Plus) => "Adds two values.",
-        Operator::Math(Math::Append) => {
-            "Appends two lists, a list and a value, two strings, or two binary values."
+        Operator::Math(Math::Concat) => {
+            "Concatenates two lists, two strings, or two binary values."
         }
         Operator::Math(Math::Minus) => "Subtracts two values.",
         Operator::Math(Math::Multiply) => "Multiplies two values.",
@@ -163,8 +163,8 @@ fn description(operator: &Operator) -> &'static str {
         Operator::Bits(Bits::ShiftRight) => "Bitwise shifts a value right by another.",
         Operator::Assignment(Assignment::Assign) => "Assigns a value to a variable.",
         Operator::Assignment(Assignment::PlusAssign) => "Adds a value to a variable.",
-        Operator::Assignment(Assignment::AppendAssign) => {
-            "Appends a list, a value, a string, or a binary value to a variable."
+        Operator::Assignment(Assignment::ConcatAssign) => {
+            "Concatenates two lists, two strings, or two binary values."
         }
         Operator::Assignment(Assignment::MinusAssign) => "Subtracts a value from a variable.",
         Operator::Assignment(Assignment::MultiplyAssign) => "Multiplies a variable by a value.",
diff --git a/crates/nu-command/tests/commands/assignment/append_assign.rs b/crates/nu-command/tests/commands/assignment/append_assign.rs
deleted file mode 100644
index 97abc8eb6f..0000000000
--- a/crates/nu-command/tests/commands/assignment/append_assign.rs
+++ /dev/null
@@ -1,88 +0,0 @@
-use nu_test_support::nu;
-
-#[test]
-fn append_assign_int() {
-    let actual = nu!(r#"
-            mut a = [1 2];
-            $a ++= [3 4];
-            $a == [1 2 3 4]
-        "#);
-
-    assert_eq!(actual.out, "true")
-}
-
-#[test]
-fn append_assign_string() {
-    let actual = nu!(r#"
-            mut a = [a b];
-            $a ++= [c d];
-            $a == [a b c d]
-        "#);
-
-    assert_eq!(actual.out, "true")
-}
-
-#[test]
-fn append_assign_any() {
-    let actual = nu!(r#"
-            mut a = [1 2 a];
-            $a ++= [b 3];
-            $a == [1 2 a b 3]
-        "#);
-
-    assert_eq!(actual.out, "true")
-}
-
-#[test]
-fn append_assign_both_empty() {
-    let actual = nu!(r#"
-            mut a = [];
-            $a ++= [];
-            $a == []
-        "#);
-
-    assert_eq!(actual.out, "true")
-}
-
-#[test]
-fn append_assign_type_mismatch() {
-    let actual = nu!(r#"
-            mut a = [1 2];
-            $a ++= [a];
-            $a == [1 2 "a"]
-        "#);
-
-    assert_eq!(actual.out, "true")
-}
-
-#[test]
-fn append_assign_single_element() {
-    let actual = nu!(r#"
-            mut a = ["list" "and"];
-            $a ++= "a single element";
-	    $a == ["list" "and" "a single element"]
-        "#);
-
-    assert_eq!(actual.out, "true")
-}
-
-#[test]
-fn append_assign_to_single_element() {
-    let actual = nu!(r#"
-            mut a = "string";
-            $a ++= ["and" "the" "list"];
-	    $a == ["string" "and" "the" "list"]
-        "#);
-
-    assert_eq!(actual.out, "true")
-}
-
-#[test]
-fn append_assign_single_to_single() {
-    let actual = nu!(r#"
-            mut a = 1;
-            $a ++= "and a single element";
-        "#);
-
-    assert!(actual.err.contains("nu::parser::unsupported_operation"));
-}
diff --git a/crates/nu-command/tests/commands/assignment/concat.rs b/crates/nu-command/tests/commands/assignment/concat.rs
new file mode 100644
index 0000000000..603a486f14
--- /dev/null
+++ b/crates/nu-command/tests/commands/assignment/concat.rs
@@ -0,0 +1,76 @@
+use nu_test_support::nu;
+
+#[test]
+fn concat_assign_list_int() {
+    let actual = nu!(r#"
+        mut a = [1 2];
+        $a ++= [3 4];
+        $a == [1 2 3 4]
+    "#);
+
+    assert_eq!(actual.out, "true")
+}
+
+#[test]
+fn concat_assign_list_string() {
+    let actual = nu!(r#"
+        mut a = [a b];
+        $a ++= [c d];
+        $a == [a b c d]
+    "#);
+
+    assert_eq!(actual.out, "true")
+}
+
+#[test]
+fn concat_assign_any() {
+    let actual = nu!(r#"
+        mut a = [1 2 a];
+        $a ++= [b 3];
+        $a == [1 2 a b 3]
+    "#);
+
+    assert_eq!(actual.out, "true")
+}
+
+#[test]
+fn concat_assign_both_empty() {
+    let actual = nu!(r#"
+        mut a = [];
+        $a ++= [];
+        $a == []
+    "#);
+
+    assert_eq!(actual.out, "true")
+}
+
+#[test]
+fn concat_assign_string() {
+    let actual = nu!(r#"
+        mut a = 'hello';
+        $a ++= ' world';
+        $a == 'hello world'
+    "#);
+
+    assert_eq!(actual.out, "true")
+}
+
+#[test]
+fn concat_assign_type_mismatch() {
+    let actual = nu!(r#"
+        mut a = [];
+        $a ++= 'str'
+    "#);
+
+    assert!(actual.err.contains("nu::parser::unsupported_operation"));
+}
+
+#[test]
+fn concat_assign_runtime_type_mismatch() {
+    let actual = nu!(r#"
+        mut a = [];
+        $a ++= if true { 'str' }
+    "#);
+
+    assert!(actual.err.contains("nu::shell::type_mismatch"));
+}
diff --git a/crates/nu-command/tests/commands/assignment/mod.rs b/crates/nu-command/tests/commands/assignment/mod.rs
index 8235f532f5..0859deee1a 100644
--- a/crates/nu-command/tests/commands/assignment/mod.rs
+++ b/crates/nu-command/tests/commands/assignment/mod.rs
@@ -1 +1 @@
-mod append_assign;
+mod concat;
diff --git a/crates/nu-command/tests/commands/math/mod.rs b/crates/nu-command/tests/commands/math/mod.rs
index cde6a2da35..5d04f450a4 100644
--- a/crates/nu-command/tests/commands/math/mod.rs
+++ b/crates/nu-command/tests/commands/math/mod.rs
@@ -483,7 +483,7 @@ fn compound_where_paren() {
 // TODO: these ++ tests are not really testing *math* functionality, maybe find another place for them
 
 #[test]
-fn adding_lists() {
+fn concat_lists() {
     let actual = nu!(pipeline(
         r#"
             [1 3] ++ [5 6] | to nuon
@@ -494,29 +494,7 @@ fn adding_lists() {
 }
 
 #[test]
-fn adding_list_and_value() {
-    let actual = nu!(pipeline(
-        r#"
-            [1 3] ++ 5 | to nuon
-        "#
-    ));
-
-    assert_eq!(actual.out, "[1, 3, 5]");
-}
-
-#[test]
-fn adding_value_and_list() {
-    let actual = nu!(pipeline(
-        r#"
-            1 ++ [3 5] | to nuon
-        "#
-    ));
-
-    assert_eq!(actual.out, "[1, 3, 5]");
-}
-
-#[test]
-fn adding_tables() {
+fn concat_tables() {
     let actual = nu!(pipeline(
         r#"
             [[a b]; [1 2]] ++ [[c d]; [10 11]] | to nuon
@@ -526,7 +504,7 @@ fn adding_tables() {
 }
 
 #[test]
-fn append_strings() {
+fn concat_strings() {
     let actual = nu!(pipeline(
         r#"
             "foo" ++ "bar"
@@ -536,7 +514,7 @@ fn append_strings() {
 }
 
 #[test]
-fn append_binary_values() {
+fn concat_binary_values() {
     let actual = nu!(pipeline(
         r#"
             0x[01 02] ++ 0x[03 04] | to nuon
diff --git a/crates/nu-command/tests/commands/url/join.rs b/crates/nu-command/tests/commands/url/join.rs
index 92257a41ff..086d230cc4 100644
--- a/crates/nu-command/tests/commands/url/join.rs
+++ b/crates/nu-command/tests/commands/url/join.rs
@@ -27,7 +27,7 @@ fn url_join_with_only_user() {
                     "password": "",
                     "host": "localhost",
                     "port": "",
-                } | url join 
+                } | url join
             "#
     ));
 
@@ -44,7 +44,7 @@ fn url_join_with_only_pwd() {
                     "password": "pwd",
                     "host": "localhost",
                     "port": "",
-                } | url join 
+                } | url join
             "#
     ));
 
@@ -61,7 +61,7 @@ fn url_join_with_user_and_pwd() {
                     "password": "pwd",
                     "host": "localhost",
                     "port": "",
-                } | url join 
+                } | url join
             "#
     ));
 
@@ -79,7 +79,7 @@ fn url_join_with_query() {
                     "host": "localhost",
                     "query": "par_1=aaa&par_2=bbb"
                     "port": "",
-                } | url join 
+                } | url join
             "#
     ));
 
@@ -411,12 +411,9 @@ fn url_join_with_params_invalid_table() {
                 "host": "localhost",
                 "params": (
                     [
-                        ["key", "value"];
-                        ["par_1", "aaa"],
-                        ["par_2", "bbb"],
-                        ["par_1", "ccc"],
-                        ["par_2", "ddd"],
-                    ] ++ ["not a record"]
+                        { key: foo, value: bar }
+                        "not a record"
+                    ]
                 ),
                 "port": "1234",
             } | url join
diff --git a/crates/nu-engine/src/compile/operator.rs b/crates/nu-engine/src/compile/operator.rs
index bad206358d..0f7059e027 100644
--- a/crates/nu-engine/src/compile/operator.rs
+++ b/crates/nu-engine/src/compile/operator.rs
@@ -155,7 +155,7 @@ pub(crate) fn decompose_assignment(assignment: Assignment) -> Option<Operator> {
     match assignment {
         Assignment::Assign => None,
         Assignment::PlusAssign => Some(Operator::Math(Math::Plus)),
-        Assignment::AppendAssign => Some(Operator::Math(Math::Append)),
+        Assignment::ConcatAssign => Some(Operator::Math(Math::Concat)),
         Assignment::MinusAssign => Some(Operator::Math(Math::Minus)),
         Assignment::MultiplyAssign => Some(Operator::Math(Math::Multiply)),
         Assignment::DivideAssign => Some(Operator::Math(Math::Divide)),
diff --git a/crates/nu-engine/src/eval.rs b/crates/nu-engine/src/eval.rs
index fc4a88f83e..0e3917290f 100644
--- a/crates/nu-engine/src/eval.rs
+++ b/crates/nu-engine/src/eval.rs
@@ -547,9 +547,9 @@ impl Eval for EvalRuntime {
                 let lhs = eval_expression::<D>(engine_state, stack, lhs)?;
                 lhs.div(op_span, &rhs, op_span)?
             }
-            Assignment::AppendAssign => {
+            Assignment::ConcatAssign => {
                 let lhs = eval_expression::<D>(engine_state, stack, lhs)?;
-                lhs.append(op_span, &rhs, op_span)?
+                lhs.concat(op_span, &rhs, op_span)?
             }
         };
 
diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index 8d809f182e..1aec6b30ea 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -956,7 +956,7 @@ fn binary_op(
         },
         Operator::Math(mat) => match mat {
             Math::Plus => lhs_val.add(op_span, &rhs_val, span)?,
-            Math::Append => lhs_val.append(op_span, &rhs_val, span)?,
+            Math::Concat => lhs_val.concat(op_span, &rhs_val, span)?,
             Math::Minus => lhs_val.sub(op_span, &rhs_val, span)?,
             Math::Multiply => lhs_val.mul(op_span, &rhs_val, span)?,
             Math::Divide => lhs_val.div(op_span, &rhs_val, span)?,
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 4048bec2a9..d9f534cc60 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -4887,7 +4887,7 @@ pub fn parse_assignment_operator(working_set: &mut StateWorkingSet, span: Span)
     let operator = match contents {
         b"=" => Operator::Assignment(Assignment::Assign),
         b"+=" => Operator::Assignment(Assignment::PlusAssign),
-        b"++=" => Operator::Assignment(Assignment::AppendAssign),
+        b"++=" => Operator::Assignment(Assignment::ConcatAssign),
         b"-=" => Operator::Assignment(Assignment::MinusAssign),
         b"*=" => Operator::Assignment(Assignment::MultiplyAssign),
         b"/=" => Operator::Assignment(Assignment::DivideAssign),
@@ -5013,7 +5013,7 @@ pub fn parse_operator(working_set: &mut StateWorkingSet, span: Span) -> Expressi
         b"=~" | b"like" => Operator::Comparison(Comparison::RegexMatch),
         b"!~" | b"not-like" => Operator::Comparison(Comparison::NotRegexMatch),
         b"+" => Operator::Math(Math::Plus),
-        b"++" => Operator::Math(Math::Append),
+        b"++" => Operator::Math(Math::Concat),
         b"-" => Operator::Math(Math::Minus),
         b"*" => Operator::Math(Math::Multiply),
         b"/" => Operator::Math(Math::Divide),
diff --git a/crates/nu-parser/src/type_check.rs b/crates/nu-parser/src/type_check.rs
index a7de3800e2..e5f2a22921 100644
--- a/crates/nu-parser/src/type_check.rs
+++ b/crates/nu-parser/src/type_check.rs
@@ -132,7 +132,7 @@ pub fn math_result_type(
                     )
                 }
             },
-            Operator::Math(Math::Append) => check_append(working_set, lhs, rhs, op),
+            Operator::Math(Math::Concat) => check_concat(working_set, lhs, rhs, op),
             Operator::Math(Math::Minus) => match (&lhs.ty, &rhs.ty) {
                 (Type::Int, Type::Int) => (Type::Int, None),
                 (Type::Float, Type::Int) => (Type::Float, None),
@@ -935,8 +935,8 @@ pub fn math_result_type(
                     )
                 }
             },
-            Operator::Assignment(Assignment::AppendAssign) => {
-                check_append(working_set, lhs, rhs, op)
+            Operator::Assignment(Assignment::ConcatAssign) => {
+                check_concat(working_set, lhs, rhs, op)
             }
             Operator::Assignment(_) => match (&lhs.ty, &rhs.ty) {
                 (x, y) if x == y => (Type::Nothing, None),
@@ -1085,7 +1085,7 @@ pub fn check_block_input_output(working_set: &StateWorkingSet, block: &Block) ->
     output_errors
 }
 
-fn check_append(
+fn check_concat(
     working_set: &mut StateWorkingSet,
     lhs: &Expression,
     rhs: &Expression,
@@ -1099,23 +1099,17 @@ fn check_append(
                 (Type::List(Box::new(Type::Any)), None)
             }
         }
-        (Type::List(a), b) | (b, Type::List(a)) => {
-            if a == &Box::new(b.clone()) {
-                (Type::List(a.clone()), None)
-            } else {
-                (Type::List(Box::new(Type::Any)), None)
-            }
-        }
         (Type::Table(a), Type::Table(_)) => (Type::Table(a.clone()), None),
         (Type::String, Type::String) => (Type::String, None),
         (Type::Binary, Type::Binary) => (Type::Binary, None),
         (Type::Any, _) | (_, Type::Any) => (Type::Any, None),
-        (Type::Table(_) | Type::String | Type::Binary, _) => {
+        (Type::Table(_) | Type::List(_) | Type::String | Type::Binary, _)
+        | (_, Type::Table(_) | Type::List(_) | Type::String | Type::Binary) => {
             *op = Expression::garbage(working_set, op.span);
             (
                 Type::Any,
                 Some(ParseError::UnsupportedOperationRHS(
-                    "append".into(),
+                    "concatenation".into(),
                     op.span,
                     lhs.span,
                     lhs.ty.clone(),
@@ -1129,7 +1123,7 @@ fn check_append(
             (
                 Type::Any,
                 Some(ParseError::UnsupportedOperationLHS(
-                    "append".into(),
+                    "concatenation".into(),
                     op.span,
                     lhs.span,
                     lhs.ty.clone(),
diff --git a/crates/nu-plugin-engine/src/interface/tests.rs b/crates/nu-plugin-engine/src/interface/tests.rs
index 5058a45695..4761da6824 100644
--- a/crates/nu-plugin-engine/src/interface/tests.rs
+++ b/crates/nu-plugin-engine/src/interface/tests.rs
@@ -1485,7 +1485,7 @@ fn prepare_plugin_call_custom_value_op() {
                     span,
                 },
                 CustomValueOp::Operation(
-                    Operator::Math(Math::Append).into_spanned(span),
+                    Operator::Math(Math::Concat).into_spanned(span),
                     cv_ok_val.clone(),
                 ),
             ),
@@ -1498,7 +1498,7 @@ fn prepare_plugin_call_custom_value_op() {
                     span,
                 },
                 CustomValueOp::Operation(
-                    Operator::Math(Math::Append).into_spanned(span),
+                    Operator::Math(Math::Concat).into_spanned(span),
                     cv_bad_val.clone(),
                 ),
             ),
diff --git a/crates/nu-protocol/src/ast/operator.rs b/crates/nu-protocol/src/ast/operator.rs
index 8c2e59d93a..bde866498c 100644
--- a/crates/nu-protocol/src/ast/operator.rs
+++ b/crates/nu-protocol/src/ast/operator.rs
@@ -24,7 +24,7 @@ pub enum Comparison {
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Math {
     Plus,
-    Append,
+    Concat,
     Minus,
     Multiply,
     Divide,
@@ -53,7 +53,7 @@ pub enum Bits {
 pub enum Assignment {
     Assign,
     PlusAssign,
-    AppendAssign,
+    ConcatAssign,
     MinusAssign,
     MultiplyAssign,
     DivideAssign,
@@ -90,7 +90,7 @@ impl Operator {
             | Self::Comparison(Comparison::NotEqual)
             | Self::Comparison(Comparison::In)
             | Self::Comparison(Comparison::NotIn)
-            | Self::Math(Math::Append) => 80,
+            | Self::Math(Math::Concat) => 80,
             Self::Bits(Bits::BitAnd) => 75,
             Self::Bits(Bits::BitXor) => 70,
             Self::Bits(Bits::BitOr) => 60,
@@ -107,7 +107,7 @@ impl Display for Operator {
         match self {
             Operator::Assignment(Assignment::Assign) => write!(f, "="),
             Operator::Assignment(Assignment::PlusAssign) => write!(f, "+="),
-            Operator::Assignment(Assignment::AppendAssign) => write!(f, "++="),
+            Operator::Assignment(Assignment::ConcatAssign) => write!(f, "++="),
             Operator::Assignment(Assignment::MinusAssign) => write!(f, "-="),
             Operator::Assignment(Assignment::MultiplyAssign) => write!(f, "*="),
             Operator::Assignment(Assignment::DivideAssign) => write!(f, "/="),
@@ -124,7 +124,7 @@ impl Display for Operator {
             Operator::Comparison(Comparison::In) => write!(f, "in"),
             Operator::Comparison(Comparison::NotIn) => write!(f, "not-in"),
             Operator::Math(Math::Plus) => write!(f, "+"),
-            Operator::Math(Math::Append) => write!(f, "++"),
+            Operator::Math(Math::Concat) => write!(f, "++"),
             Operator::Math(Math::Minus) => write!(f, "-"),
             Operator::Math(Math::Multiply) => write!(f, "*"),
             Operator::Math(Math::Divide) => write!(f, "/"),
diff --git a/crates/nu-protocol/src/eval_base.rs b/crates/nu-protocol/src/eval_base.rs
index 12070f9ca3..0a65c50817 100644
--- a/crates/nu-protocol/src/eval_base.rs
+++ b/crates/nu-protocol/src/eval_base.rs
@@ -238,7 +238,7 @@ pub trait Eval {
                             Math::Minus => lhs.sub(op_span, &rhs, expr_span),
                             Math::Multiply => lhs.mul(op_span, &rhs, expr_span),
                             Math::Divide => lhs.div(op_span, &rhs, expr_span),
-                            Math::Append => lhs.append(op_span, &rhs, expr_span),
+                            Math::Concat => lhs.concat(op_span, &rhs, expr_span),
                             Math::Modulo => lhs.modulo(op_span, &rhs, expr_span),
                             Math::FloorDivision => lhs.floor_div(op_span, &rhs, expr_span),
                             Math::Pow => lhs.pow(op_span, &rhs, expr_span),
diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs
index 1a1e8fada2..28b468a151 100644
--- a/crates/nu-protocol/src/value/mod.rs
+++ b/crates/nu-protocol/src/value/mod.rs
@@ -2503,34 +2503,20 @@ impl Value {
         }
     }
 
-    pub fn append(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
+    pub fn concat(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
         match (self, rhs) {
             (Value::List { vals: lhs, .. }, Value::List { vals: rhs, .. }) => {
-                let mut lhs = lhs.clone();
-                let mut rhs = rhs.clone();
-                lhs.append(&mut rhs);
-                Ok(Value::list(lhs, span))
-            }
-            (Value::List { vals: lhs, .. }, val) => {
-                let mut lhs = lhs.clone();
-                lhs.push(val.clone());
-                Ok(Value::list(lhs, span))
-            }
-            (val, Value::List { vals: rhs, .. }) => {
-                let mut rhs = rhs.clone();
-                rhs.insert(0, val.clone());
-                Ok(Value::list(rhs, span))
+                Ok(Value::list([lhs.as_slice(), rhs.as_slice()].concat(), span))
             }
             (Value::String { val: lhs, .. }, Value::String { val: rhs, .. }) => {
-                Ok(Value::string(lhs.to_string() + rhs, span))
-            }
-            (Value::Binary { val: lhs, .. }, Value::Binary { val: rhs, .. }) => {
-                let mut val = lhs.clone();
-                val.extend(rhs);
-                Ok(Value::binary(val, span))
+                Ok(Value::string([lhs.as_str(), rhs.as_str()].join(""), span))
             }
+            (Value::Binary { val: lhs, .. }, Value::Binary { val: rhs, .. }) => Ok(Value::binary(
+                [lhs.as_slice(), rhs.as_slice()].concat(),
+                span,
+            )),
             (Value::Custom { val: lhs, .. }, rhs) => {
-                lhs.operation(self.span(), Operator::Math(Math::Append), op, rhs)
+                lhs.operation(self.span(), Operator::Math(Math::Concat), op, rhs)
             }
             _ => Err(ShellError::OperatorMismatch {
                 op_span: op,
diff --git a/crates/nu-std/std/help/mod.nu b/crates/nu-std/std/help/mod.nu
index 089bbff7f8..9f13f1bb18 100644
--- a/crates/nu-std/std/help/mod.nu
+++ b/crates/nu-std/std/help/mod.nu
@@ -37,7 +37,7 @@ def get-all-operators [] { return [
 
     [Assignment, =, Assign, "Assigns a value to a variable.", 10]
     [Assignment, +=, PlusAssign, "Adds a value to a variable.", 10]
-    [Assignment, ++=, AppendAssign, "Appends a list or a value to a variable.", 10]
+    [Assignment, ++=, ConcatAssign, "Concatenate two lists, two strings, or two binary values.", 10]
     [Assignment, -=, MinusAssign, "Subtracts a value from a variable.", 10]
     [Assignment, *=, MultiplyAssign, "Multiplies a variable by a value.", 10]
     [Assignment, /=, DivideAssign, "Divides a variable by a value.", 10]
@@ -55,7 +55,7 @@ def get-all-operators [] { return [
     [Comparison, ends-with, EndsWith, "Checks if a string ends with another.", 80]
     [Comparison, not, UnaryNot, "Negates a value or expression.", 0]
     [Math, +, Plus, "Adds two values.", 90]
-    [Math, ++, Append, "Appends two lists or a list and a value.", 80]
+    [Math, ++, Concat, "Concatenate two lists, two strings, or two binary values.", 80]
     [Math, -, Minus, "Subtracts two values.", 90]
     [Math, *, Multiply, "Multiplies two values.", 95]
     [Math, /, Divide, "Divides two values.", 95]
diff --git a/crates/nu_plugin_custom_values/src/cool_custom_value.rs b/crates/nu_plugin_custom_values/src/cool_custom_value.rs
index ea0cf8ec92..cd160e0d0c 100644
--- a/crates/nu_plugin_custom_values/src/cool_custom_value.rs
+++ b/crates/nu_plugin_custom_values/src/cool_custom_value.rs
@@ -112,7 +112,7 @@ impl CustomValue for CoolCustomValue {
     ) -> Result<Value, ShellError> {
         match operator {
             // Append the string inside `cool`
-            ast::Operator::Math(ast::Math::Append) => {
+            ast::Operator::Math(ast::Math::Concat) => {
                 if let Some(right) = right
                     .as_custom_value()
                     .ok()
diff --git a/tests/const_/mod.rs b/tests/const_/mod.rs
index 0c4ff5d77c..a1744e1601 100644
--- a/tests/const_/mod.rs
+++ b/tests/const_/mod.rs
@@ -154,7 +154,6 @@ fn const_unary_operator(#[case] inp: &[&str], #[case] expect: &str) {
 #[case(&[r#"const x = "a" ++ "b" "#, "$x"], "ab")]
 #[case(&[r#"const x = [1,2] ++ [3]"#, "$x | describe"], "list<int>")]
 #[case(&[r#"const x = 0x[1,2] ++ 0x[3]"#, "$x | describe"], "binary")]
-#[case(&[r#"const x = 0x[1,2] ++ [3]"#, "$x | describe"], "list<any>")]
 #[case(&["const x = 1 < 2", "$x"], "true")]
 #[case(&["const x = (3 * 200) > (2 * 100)", "$x"], "true")]
 #[case(&["const x = (3 * 200) < (2 * 100)", "$x"], "false")]
diff --git a/tests/eval/mod.rs b/tests/eval/mod.rs
index 191b19eb89..b7ad76d32d 100644
--- a/tests/eval/mod.rs
+++ b/tests/eval/mod.rs
@@ -159,7 +159,7 @@ fn record_spread() {
 #[test]
 fn binary_op_example() {
     test_eval(
-        "(([1 2] ++ [3 4]) == [1 2 3 4]) and (([1 2 3] ++ 4) == ([1] ++ [2 3 4]))",
+        "(([1 2] ++ [3 4]) == [1 2 3 4]) and (([1] ++ [2 3 4]) == [1 2 3 4])",
         Eq("true"),
     )
 }

From 32196cfe789f9f552cf887ed902a9da74691f5dc Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Tue, 26 Nov 2024 00:13:11 +0300
Subject: [PATCH 0712/1072] Add `term query`, for querying information from
 terminals. (#14427)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Related
- #10150
- https://github.com/nushell/nushell/pull/10150#issuecomment-1721238336
- #10387
- https://github.com/nushell/nushell/pull/10387#issuecomment-1722228185

# Description
`term query`: a command for querying information from the terminal.

Prints the `$query`, and immediately starts reading raw bytes from
stdin.

The standard input will be read until the `terminator` sequence is
encountered.
The `terminator` is not removed from the output.

It also stops on <kbd>Ctrl-C</kbd> with an error.

```
Usage:
  > term query {flags} <query>

Flags:
  -h, --help: Display the help message for this command
  -t, --terminator (required parameter) <one_of(binary, string)>: stdin will be read until this sequence is encountered

Parameters:
  query <one_of(binary, string)>: The query that will be printed to stdout
```

This was previously possible with `input` until #10150.
`input` command's features such as cursor control, deleting input etc.
are useful, but interfere with this use case.

`term query` makes the following uses possible:

```nushell
# get the terminal size with ansi escape codes
def terminal-size [] {
    let response = term query (ansi size) --terminator 'R'
    # $response should look like this
    # Length: 9 (0x9) bytes | printable whitespace ascii_other non_ascii
    # 00000000:   1b 5b 33 38  3b 31 35 30  52             •[38;150R

    let sz = $response | bytes at 2..<-1 | decode
    # 38;150

    # $sz should look like 38;150
    let size = ($sz | split row ';' | each {into int})

    # output in record syntax
    {
        rows: $size.0
        columns: $size.1
    }
}
```

```nushell
# read clipboard content using OSC 52
term query $"(ansi --osc '52;c;?')(ansi st)" --terminator (ansi st)
| bytes at 7..<-2
| decode
| decode base64
| decode
```

# User-Facing Changes
- added `ansi query`

# Tests + Formatting
- Integration tests should be added if possible.
---
 crates/nu-command/src/default_context.rs      |   2 +
 crates/nu-command/src/platform/mod.rs         |   4 +-
 crates/nu-command/src/platform/term/mod.rs    |   7 +
 crates/nu-command/src/platform/term/term_.rs  |  34 +++++
 .../src/platform/term/term_query.rs           | 137 ++++++++++++++++++
 .../src/platform/{ => term}/term_size.rs      |   0
 6 files changed, 182 insertions(+), 2 deletions(-)
 create mode 100644 crates/nu-command/src/platform/term/mod.rs
 create mode 100644 crates/nu-command/src/platform/term/term_.rs
 create mode 100644 crates/nu-command/src/platform/term/term_query.rs
 rename crates/nu-command/src/platform/{ => term}/term_size.rs (100%)

diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index cbbee717d4..9903eed774 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -248,7 +248,9 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             IsTerminal,
             Kill,
             Sleep,
+            Term,
             TermSize,
+            TermQuery,
             Whoami,
         };
 
diff --git a/crates/nu-command/src/platform/mod.rs b/crates/nu-command/src/platform/mod.rs
index 16a245f87b..25df4e0c59 100644
--- a/crates/nu-command/src/platform/mod.rs
+++ b/crates/nu-command/src/platform/mod.rs
@@ -5,7 +5,7 @@ mod input;
 mod is_terminal;
 mod kill;
 mod sleep;
-mod term_size;
+mod term;
 #[cfg(unix)]
 mod ulimit;
 mod whoami;
@@ -19,7 +19,7 @@ pub use input::InputListen;
 pub use is_terminal::IsTerminal;
 pub use kill::Kill;
 pub use sleep::Sleep;
-pub use term_size::TermSize;
+pub use term::{Term, TermQuery, TermSize};
 #[cfg(unix)]
 pub use ulimit::ULimit;
 pub use whoami::Whoami;
diff --git a/crates/nu-command/src/platform/term/mod.rs b/crates/nu-command/src/platform/term/mod.rs
new file mode 100644
index 0000000000..cd37a0583b
--- /dev/null
+++ b/crates/nu-command/src/platform/term/mod.rs
@@ -0,0 +1,7 @@
+mod term_;
+mod term_query;
+mod term_size;
+
+pub use term_::Term;
+pub use term_query::TermQuery;
+pub use term_size::TermSize;
diff --git a/crates/nu-command/src/platform/term/term_.rs b/crates/nu-command/src/platform/term/term_.rs
new file mode 100644
index 0000000000..b28f226263
--- /dev/null
+++ b/crates/nu-command/src/platform/term/term_.rs
@@ -0,0 +1,34 @@
+use nu_engine::{command_prelude::*, get_full_help};
+
+#[derive(Clone)]
+pub struct Term;
+
+impl Command for Term {
+    fn name(&self) -> &str {
+        "term"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("term")
+            .category(Category::Platform)
+            .input_output_types(vec![(Type::Nothing, Type::String)])
+    }
+
+    fn description(&self) -> &str {
+        "Commands for querying information about the terminal."
+    }
+
+    fn extra_description(&self) -> &str {
+        "You must use one of the following subcommands. Using this command as-is will only produce this help message."
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        Ok(Value::string(get_full_help(self, engine_state, stack), call.head).into_pipeline_data())
+    }
+}
diff --git a/crates/nu-command/src/platform/term/term_query.rs b/crates/nu-command/src/platform/term/term_query.rs
new file mode 100644
index 0000000000..a4966edde0
--- /dev/null
+++ b/crates/nu-command/src/platform/term/term_query.rs
@@ -0,0 +1,137 @@
+use std::{
+    io::{Read, Write},
+    time::Duration,
+};
+
+use nu_engine::command_prelude::*;
+
+const CTRL_C: u8 = 3;
+
+#[derive(Clone)]
+pub struct TermQuery;
+
+impl Command for TermQuery {
+    fn name(&self) -> &str {
+        "term query"
+    }
+
+    fn description(&self) -> &str {
+        "Query the terminal for information."
+    }
+
+    fn extra_description(&self) -> &str {
+        "Print the given query, and read the immediate result from stdin.
+
+The standard input will be read right after `query` is printed, and consumed until the `terminator`
+sequence is encountered. The `terminator` is not removed from the output.
+
+If `terminator` is not supplied, input will be read until Ctrl-C is pressed."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("term query")
+            .category(Category::Platform)
+            .input_output_types(vec![(Type::Nothing, Type::Binary)])
+            .allow_variants_without_examples(true)
+            .required(
+                "query",
+                SyntaxShape::OneOf(vec![SyntaxShape::Binary, SyntaxShape::String]),
+                "The query that will be printed to stdout.",
+            )
+            .named(
+                "terminator",
+                SyntaxShape::OneOf(vec![SyntaxShape::Binary, SyntaxShape::String]),
+                "Terminator sequence for the expected reply.",
+                Some('t'),
+            )
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Get cursor position.",
+                example: r#"term query (ansi cursor_position) --terminator 'R'"#,
+                result: None,
+            },
+            Example {
+                description: "Get terminal background color.",
+                example: r#"term query $'(ansi osc)10;?(ansi st)' --terminator (ansi st)"#,
+                result: None,
+            },
+            Example {
+                description: "Read clipboard content on terminals supporting OSC-52.",
+                example: r#"term query $'(ansi osc)52;c;?(ansi st)' --terminator (ansi st)"#,
+                result: None,
+            },
+        ]
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let query: Vec<u8> = call.req(engine_state, stack, 0)?;
+        let terminator: Option<Vec<u8>> = call.get_flag(engine_state, stack, "terminator")?;
+
+        crossterm::terminal::enable_raw_mode()?;
+
+        // clear terminal events
+        while crossterm::event::poll(Duration::from_secs(0))? {
+            // If there's an event, read it to remove it from the queue
+            let _ = crossterm::event::read()?;
+        }
+
+        let mut b = [0u8; 1];
+        let mut buf = vec![];
+        let mut stdin = std::io::stdin().lock();
+
+        {
+            let mut stdout = std::io::stdout().lock();
+            stdout.write_all(&query)?;
+            stdout.flush()?;
+        }
+
+        let out = if let Some(terminator) = terminator {
+            loop {
+                if let Err(err) = stdin.read_exact(&mut b) {
+                    break Err(ShellError::from(err));
+                }
+
+                if b[0] == CTRL_C {
+                    break Err(ShellError::Interrupted { span: call.head });
+                }
+
+                buf.push(b[0]);
+
+                if buf.ends_with(&terminator) {
+                    break Ok(Value::Binary {
+                        val: buf,
+                        internal_span: call.head,
+                    }
+                    .into_pipeline_data());
+                }
+            }
+        } else {
+            loop {
+                if let Err(err) = stdin.read_exact(&mut b) {
+                    break Err(ShellError::from(err));
+                }
+
+                if b[0] == CTRL_C {
+                    break Ok(Value::Binary {
+                        val: buf,
+                        internal_span: call.head,
+                    }
+                    .into_pipeline_data());
+                }
+
+                buf.push(b[0]);
+            }
+        };
+        crossterm::terminal::disable_raw_mode()?;
+        out
+    }
+}
diff --git a/crates/nu-command/src/platform/term_size.rs b/crates/nu-command/src/platform/term/term_size.rs
similarity index 100%
rename from crates/nu-command/src/platform/term_size.rs
rename to crates/nu-command/src/platform/term/term_size.rs

From 7a9b14b49dda6ecfa0ccd8b165328c4993e53d66 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Mon, 25 Nov 2024 20:25:43 -0500
Subject: [PATCH 0713/1072] Add example for PROMPT_COMMAND_RIGHT (#14439)

# Description

I just completely left out `$env.PROMPT_COMMAND_RIGHT` in the
`sample_env.nu`. This adds it in.

# User-Facing Changes

`config env --sample` will now include doc for `PROMPT_COMMAND_RIGHT`.

# Tests + Formatting

Doc-only

# After Submitting

n/a
---
 crates/nu-utils/src/default_files/sample_env.nu | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/crates/nu-utils/src/default_files/sample_env.nu b/crates/nu-utils/src/default_files/sample_env.nu
index 84926abb2f..23dc925ccd 100644
--- a/crates/nu-utils/src/default_files/sample_env.nu
+++ b/crates/nu-utils/src/default_files/sample_env.nu
@@ -24,6 +24,11 @@ $env.PROMPT_COMMAND = "Nushell"
 # Simple example - Dynamic closure displaying the path:
 $env.PROMPT_COMMAND = {|| pwd}
 
+# PROMPT_COMMAND_RIGHT
+# --------------------
+# Defines a prompt which will appear right-aligned in the terminal
+$env.PROMPT_COMMAND_RIGHT = {|| date now | format date "%d-%a %r" }
+
 # PROMPT_INDICATOR*
 # -----------------
 # The prompt indicators are environmental variables that represent

From ac75562296b1f3bff3d3d49b79ac2b5f73f4f956 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Mon, 25 Nov 2024 21:22:18 -0500
Subject: [PATCH 0714/1072] Remove long-unused `autoenv` tests (#14436)

# Description

The `.nu-env` file feature was removed some time ago (probably in the
engine-q upgrade?). The tests, however, still remained as dead-code, so
this is just some basic clean-up.

If this feature was ever implemented again, the tests would need to be
rewritten anyway due to the changes in the way config is handled.

# User-Facing Changes

None

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
-
# After Submitting

N/A
---
 tests/shell/environment/env.rs    |  26 --
 tests/shell/environment/mod.rs    |  21 -
 tests/shell/environment/nu_env.rs | 668 ------------------------------
 3 files changed, 715 deletions(-)
 delete mode 100644 tests/shell/environment/nu_env.rs

diff --git a/tests/shell/environment/env.rs b/tests/shell/environment/env.rs
index 35692fdee9..34910fd98e 100644
--- a/tests/shell/environment/env.rs
+++ b/tests/shell/environment/env.rs
@@ -1,10 +1,7 @@
-use super::support::Trusted;
-
 use nu_test_support::fs::Stub::FileWithContent;
 use nu_test_support::playground::Playground;
 use nu_test_support::{nu, nu_repl_code, nu_with_std};
 use pretty_assertions::assert_eq;
-use serial_test::serial;
 
 #[test]
 fn env_shorthand() {
@@ -157,29 +154,6 @@ fn has_file_loc() {
     })
 }
 
-// FIXME: autoenv not currently implemented
-#[ignore]
-#[test]
-#[serial]
-fn passes_env_from_local_cfg_to_external_process() {
-    Playground::setup("autoenv_dir", |dirs, sandbox| {
-        sandbox.with_files(&[FileWithContent(
-            ".nu-env",
-            r#"[env]
-            FOO = "foo"
-            "#,
-        )]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test(), "
-                nu --testbin echo_env FOO
-            ")
-        });
-
-        assert_eq!(actual.out, "foo");
-    })
-}
-
 #[test]
 fn hides_env_in_block() {
     let inp = &[
diff --git a/tests/shell/environment/mod.rs b/tests/shell/environment/mod.rs
index faf884f166..b94b8e4346 100644
--- a/tests/shell/environment/mod.rs
+++ b/tests/shell/environment/mod.rs
@@ -1,22 +1 @@
 mod env;
-
-// FIXME: nu_env tests depend on autoenv which hasn't been ported yet
-// mod nu_env;
-
-pub mod support {
-    use nu_test_support::{nu, playground::*, Outcome};
-
-    pub struct Trusted;
-
-    impl Trusted {
-        pub fn in_path(dirs: &Dirs, block: impl FnOnce() -> Outcome) -> Outcome {
-            let for_env_manifest = dirs.test().to_string_lossy();
-
-            nu!(cwd: dirs.root(), "autoenv trust \"{}\"", for_env_manifest);
-            let out = block();
-            nu!(cwd: dirs.root(), "autoenv untrust \"{}\"", for_env_manifest);
-
-            out
-        }
-    }
-}
diff --git a/tests/shell/environment/nu_env.rs b/tests/shell/environment/nu_env.rs
deleted file mode 100644
index d249d90678..0000000000
--- a/tests/shell/environment/nu_env.rs
+++ /dev/null
@@ -1,668 +0,0 @@
-use super::support::Trusted;
-
-use nu_test_support::fs::Stub::FileWithContent;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-use pretty_assertions::assert_eq;
-
-use serial_test::serial;
-
-const SCRIPTS: &str = r#"startup = ["touch hello.txt"]
-    on_exit = ["touch bye.txt"]"#;
-
-#[test]
-#[serial]
-fn picks_up_env_keys_when_entering_trusted_directory() {
-    Playground::setup("autoenv_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            &format!(
-                "{}\n{}",
-                SCRIPTS,
-                r#"[env]
-                testkey = "testvalue"
-
-               [scriptvars]
-                myscript = "echo myval"
-            "#
-            ),
-        )]);
-
-        let expected = "testvalue";
-
-        let actual = Trusted::in_path(&dirs, || nu!(cwd: dirs.test(), "echo $env.testkey"));
-
-        assert_eq!(actual.out, expected);
-    })
-}
-
-#[test]
-#[serial]
-fn picks_up_and_lets_go_env_keys_when_entering_trusted_directory_with_implied_cd() {
-    use nu_test_support::fs::Stub::FileWithContent;
-    Playground::setup("autoenv_test", |dirs, sandbox| {
-        sandbox.mkdir("foo");
-        sandbox.mkdir("foo/bar");
-        sandbox.with_files(vec![
-            FileWithContent(
-                "foo/.nu-env",
-                r#"[env]
-               testkey = "testvalue"
-                "#,
-            ),
-            FileWithContent(
-                "foo/bar/.nu-env",
-                r#"
-                [env]
-               bar = "true"
-                "#,
-            ),
-        ]);
-        let actual = nu!(
-            cwd: dirs.test(),
-            "
-            do {autoenv trust -q foo ; = null }
-            foo
-            echo $env.testkey"
-        );
-        assert_eq!(actual.out, "testvalue");
-        //Assert testkey is gone when leaving foo
-        let actual = nu!(
-            cwd: dirs.test(),
-            "
-            do {autoenv trust -q foo; = null } ;
-            foo
-            ..
-            echo $env.testkey
-            "
-        );
-        assert!(actual.err.contains("Unknown"));
-        //Assert testkey is present also when jumping over foo
-        let actual = nu!(
-            cwd: dirs.test(),
-            "
-            do {autoenv trust -q foo; = null } ;
-            do {autoenv trust -q foo/bar; = null } ;
-            foo/bar
-            echo $env.testkey
-            echo $env.bar
-            "
-        );
-        assert_eq!(actual.out, "testvaluetrue");
-        //Assert bar removed after leaving bar
-        let actual = nu!(
-            cwd: dirs.test(),
-            "autoenv trust -q foo;
-               foo/bar
-               ../..
-               echo $env.bar"
-        );
-        assert!(actual.err.contains("Unknown"));
-    });
-}
-
-#[test]
-#[serial]
-#[ignore]
-fn picks_up_script_vars_when_entering_trusted_directory() {
-    Playground::setup("autoenv_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            &format!(
-                "{}\n{}",
-                SCRIPTS,
-                r#"[env]
-                testkey = "testvalue"
-
-               [scriptvars]
-                myscript = "echo myval"
-            "#
-            ),
-        )]);
-
-        let expected = "myval";
-
-        let actual = Trusted::in_path(&dirs, || nu!(cwd: dirs.test(), "echo $env.myscript"));
-
-        // scriptvars are not supported
-        // and why is myval expected when myscript is "echo myval"
-        assert_eq!(actual.out, expected);
-    })
-}
-
-#[test]
-#[serial]
-fn picks_up_env_keys_when_entering_trusted_directory_indirectly() {
-    Playground::setup("autoenv_test_3", |dirs, sandbox| {
-        sandbox.mkdir("crates");
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            r#"[env]
-                nu-ver = "0.30.0" "#,
-        )]);
-
-        let expected = "0.30.0";
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test().join("crates"), "
-                cd ../../autoenv_test_3
-                echo $env.nu-ver
-            ")
-        });
-
-        assert_eq!(actual.out, expected);
-    })
-}
-
-#[test]
-#[serial]
-fn entering_a_trusted_directory_runs_entry_scripts() {
-    Playground::setup("autoenv_test_4", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            &format!(
-                "{}\n{}",
-                SCRIPTS,
-                r#"[env]
-                testkey = "testvalue"
-            "#
-            ),
-        )]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test(), pipeline(r#"
-                ls
-                | where name == "hello.txt"
-                | get name
-            "#))
-        });
-
-        assert_eq!(actual.out, "hello.txt");
-    })
-}
-
-#[test]
-#[serial]
-fn leaving_a_trusted_directory_runs_exit_scripts() {
-    Playground::setup("autoenv_test_5", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            &format!(
-                "{}\n{}",
-                SCRIPTS,
-                r#"[env]
-                testkey = "testvalue"
-
-               [scriptvars]
-                myscript = "echo myval"
-            "#
-            ),
-        )]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test(), r#"
-              cd ..
-              ls autoenv_test_5 | get name | path basename | where $it == "bye.txt"
-            "#)
-        });
-
-        assert_eq!(actual.out, "bye.txt");
-    })
-}
-
-#[test]
-#[serial]
-fn entry_scripts_are_called_when_revisiting_a_trusted_directory() {
-    Playground::setup("autoenv_test_6", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            &format!(
-                "{}\n{}",
-                SCRIPTS,
-                r#"[env]
-                testkey = "testvalue"
-
-               [scriptvars]
-                myscript = "echo myval"
-            "#
-            ),
-        )]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test(), r#"
-                do { rm hello.txt | ignore } ; # Silence file deletion message from output
-                cd ..
-                cd autoenv_test_6
-                ls | where name == "hello.txt" | get name
-            "#)
-        });
-
-        assert_eq!(actual.out, "hello.txt");
-    })
-}
-
-#[test]
-#[serial]
-fn given_a_trusted_directory_with_entry_scripts_when_entering_a_subdirectory_entry_scripts_are_not_called(
-) {
-    Playground::setup("autoenv_test_7", |dirs, sandbox| {
-        sandbox.mkdir("time_to_cook_arepas");
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            &format!(
-                "{}\n{}",
-                SCRIPTS,
-                r#"[env]
-                testkey = "testvalue"
-
-               [scriptvars]
-                myscript = "echo myval"
-            "#
-            ),
-        )]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test(), r#"
-                cd time_to_cook_arepas
-                ls | where name == "hello.txt" | length
-            "#)
-        });
-
-        assert_eq!(actual.out, "0");
-    })
-}
-
-#[test]
-#[serial]
-fn given_a_trusted_directory_with_exit_scripts_when_entering_a_subdirectory_exit_scripts_are_not_called(
-) {
-    Playground::setup("autoenv_test_8", |dirs, sandbox| {
-        sandbox.mkdir("time_to_cook_arepas");
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            &format!(
-                "{}\n{}",
-                SCRIPTS,
-                r#"[env]
-                testkey = "testvalue"
-
-               [scriptvars]
-                myscript = "echo myval"
-            "#
-            ),
-        )]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test(), r#"
-                cd time_to_cook_arepas
-                ls | where name == "bye.txt" | length
-            "#)
-        });
-
-        assert_eq!(actual.out, "0");
-    })
-}
-
-#[test]
-#[serial]
-fn given_a_hierarchy_of_trusted_directories_when_entering_in_any_nested_ones_should_carry_over_variables_set_from_the_root(
-) {
-    Playground::setup("autoenv_test_9", |dirs, sandbox| {
-        sandbox.mkdir("nu_plugin_rb");
-        sandbox.with_files(vec![
-            FileWithContent(
-                ".nu-env",
-                r#"[env]
-                organization = "nushell""#,
-            ),
-            FileWithContent(
-                "nu_plugin_rb/.nu-env",
-                r#"[env]
-                language = "Ruby""#,
-            ),
-        ]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test().parent().unwrap(), "
-                do { autoenv trust -q autoenv_test_9/nu_plugin_rb ; = null } # Silence autoenv trust -q message from output
-                cd autoenv_test_9/nu_plugin_rb
-                echo $env.organization
-            ")
-        });
-
-        assert_eq!(actual.out, "nushell");
-    })
-}
-
-#[test]
-#[serial]
-fn given_a_hierarchy_of_trusted_directories_nested_ones_should_overwrite_variables_from_parent_directories(
-) {
-    Playground::setup("autoenv_test_10", |dirs, sandbox| {
-        sandbox.mkdir("nu_plugin_rb");
-        sandbox.with_files(vec![
-            FileWithContent(
-                ".nu-env",
-                r#"[env]
-                organization = "nushell""#,
-            ),
-            FileWithContent(
-                "nu_plugin_rb/.nu-env",
-                r#"[env]
-                organization = "Andrab""#,
-            ),
-        ]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test().parent().unwrap(), "
-                do { autoenv trust -q autoenv_test_10/nu_plugin_rb ; = null } # Silence autoenv trust -q message from output
-                cd autoenv_test_10/nu_plugin_rb
-                echo $env.organization
-            ")
-        });
-
-        assert_eq!(actual.out, "Andrab");
-    })
-}
-
-#[test]
-#[serial]
-#[cfg(not(windows))] //TODO figure out why this test doesn't work on windows
-fn local_config_should_not_be_added_when_running_scripts() {
-    Playground::setup("autoenv_test_10", |dirs, sandbox| {
-        sandbox.mkdir("foo");
-        sandbox.with_files(vec![
-            FileWithContent(
-                ".nu-env",
-                r#"[env]
-                organization = "nu""#,
-            ),
-            FileWithContent(
-                "foo/.nu-env",
-                r#"[env]
-                organization = "foo""#,
-            ),
-            FileWithContent(
-                "script.nu",
-                "cd foo
-                echo $env.organization",
-            ),
-        ]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test(), "
-                do { autoenv trust -q foo } # Silence autoenv trust message from output
-                nu script.nu
-            ")
-        });
-
-        assert_eq!(actual.out, "nu");
-    })
-}
-#[test]
-#[serial]
-fn given_a_hierarchy_of_trusted_directories_going_back_restores_overwritten_variables() {
-    Playground::setup("autoenv_test_11", |dirs, sandbox| {
-        sandbox.mkdir("nu_plugin_rb");
-        sandbox.with_files(vec![
-            FileWithContent(
-                ".nu-env",
-                r#"[env]
-                organization = "nushell""#,
-            ),
-            FileWithContent(
-                "nu_plugin_rb/.nu-env",
-                r#"[env]
-                organization = "Andrab""#,
-            ),
-        ]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test().parent().unwrap(), "
-                do { autoenv trust -q autoenv_test_11/nu_plugin_rb } # Silence autoenv trust message from output
-                cd autoenv_test_11
-                cd nu_plugin_rb
-                do { rm ../.nu-env | ignore } # By deleting the root nu-env we have guarantees that the variable gets restored (not by autoenv when re-entering)
-                cd ..
-                echo $env.organization
-            ")
-        });
-
-        assert_eq!(actual.out, "nushell");
-    })
-}
-
-#[test]
-#[serial]
-fn local_config_env_var_present_and_removed_correctly() {
-    use nu_test_support::fs::Stub::FileWithContent;
-    Playground::setup("autoenv_test", |dirs, sandbox| {
-        sandbox.mkdir("foo");
-        sandbox.mkdir("foo/bar");
-        sandbox.with_files(vec![FileWithContent(
-            "foo/.nu-env",
-            r#"[env]
-               testkey = "testvalue"
-                "#,
-        )]);
-        //Assert testkey is not present before entering directory
-        let actual = nu!(
-            cwd: dirs.test(),
-            "autoenv trust -q foo;
-               echo $env.testkey"
-        );
-        assert!(actual.err.contains("Unknown"));
-        //Assert testkey is present in foo
-        let actual = nu!(
-            cwd: dirs.test(),
-            "autoenv trust -q foo; cd foo
-               echo $env.testkey"
-        );
-        assert_eq!(actual.out, "testvalue");
-        //Assert testkey is present also in subdirectories
-        let actual = nu!(
-            cwd: dirs.test(),
-            "autoenv trust -q foo; cd foo
-               cd bar
-               echo $env.testkey"
-        );
-        assert_eq!(actual.out, "testvalue");
-        //Assert testkey is present also when jumping over foo
-        let actual = nu!(
-            cwd: dirs.test(),
-            "autoenv trust -q foo; cd foo/bar
-               echo $env.testkey"
-        );
-        assert_eq!(actual.out, "testvalue");
-        //Assert testkey removed after leaving foo
-        let actual = nu!(
-            cwd: dirs.test(),
-            "autoenv trust -q foo; cd foo
-               cd ..
-               echo $env.testkey"
-        );
-        assert!(actual.err.contains("Unknown"));
-    });
-}
-
-#[test]
-#[serial]
-fn local_config_env_var_gets_overwritten() {
-    use nu_test_support::fs::Stub::FileWithContent;
-    Playground::setup("autoenv_test", |dirs, sandbox| {
-        sandbox.mkdir("foo");
-        sandbox.mkdir("foo/bar");
-        sandbox.with_files(vec![
-            FileWithContent(
-                "foo/.nu-env",
-                r#"[env]
-                overwrite_me = "foo"
-                "#,
-            ),
-            FileWithContent(
-                "foo/bar/.nu-env",
-                r#"[env]
-                overwrite_me = "bar"
-                "#,
-            ),
-        ]);
-        //Assert overwrite_me is not present before entering directory
-        let actual = nu!(
-            cwd: dirs.test(),
-            "autoenv trust -q foo;
-               echo $env.overwrite_me"
-        );
-        assert!(actual.err.contains("Unknown"));
-        //Assert overwrite_me is foo in foo
-        let actual = nu!(
-            cwd: dirs.test(),
-            "autoenv trust -q foo; cd foo
-               echo $env.overwrite_me"
-        );
-        assert_eq!(actual.out, "foo");
-        //Assert overwrite_me is bar in bar
-        let actual = nu!(
-            cwd: dirs.test(),
-            "autoenv trust -q foo
-               autoenv trust -q foo/bar
-               cd foo
-               cd bar
-               echo $env.overwrite_me"
-        );
-        assert_eq!(actual.out, "bar");
-        //Assert overwrite_me is present also when jumping over foo
-        let actual = nu!(
-            cwd: dirs.test(),
-            "autoenv trust -q foo; autoenv trust -q foo/bar; cd foo/bar
-               echo $env.overwrite_me
-            "
-        );
-        assert_eq!(actual.out, "bar");
-        //Assert overwrite_me removed after leaving bar
-        let actual = nu!(
-            cwd: dirs.test(),
-            "autoenv trust -q foo; autoenv trust -q foo/bar; cd foo
-               cd bar
-               cd ..
-               echo $env.overwrite_me"
-        );
-        assert_eq!(actual.out, "foo");
-    });
-}
-
-#[test]
-#[serial]
-fn autoenv_test_entry_scripts() {
-    use nu_test_support::fs::Stub::FileWithContent;
-    Playground::setup("autoenv_test", |dirs, sandbox| {
-        sandbox.mkdir("foo/bar");
-
-        // Windows uses a different command to create an empty file so we need to have different content on windows.
-        let nu_env = if cfg!(target_os = "windows") {
-            r#"startup = ["echo nul > hello.txt"]"#
-        } else {
-            r#"startup = ["touch hello.txt"]"#
-        };
-
-        sandbox.with_files(vec![FileWithContent("foo/.nu-env", nu_env)]);
-
-        // Make sure entryscript is run when entering directory
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo
-               cd foo
-               ls | where name == "hello.txt" | get name"#
-        );
-        assert!(actual.out.contains("hello.txt"));
-
-        // Make sure entry scripts are also run when jumping over directory
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo
-               cd foo/bar
-               ls .. | where name == "../hello.txt" | get name"#
-        );
-        assert!(actual.out.contains("hello.txt"));
-
-        // Entryscripts should not run after changing to a subdirectory.
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo
-               cd foo
-               rm hello.txt
-               cd bar
-               ls .. | where name == "../hello.txt" | length"#
-        );
-        assert!(actual.out.contains('0'));
-    });
-}
-
-#[test]
-#[serial]
-fn autoenv_test_exit_scripts() {
-    use nu_test_support::fs::Stub::FileWithContent;
-    Playground::setup("autoenv_test", |dirs, sandbox| {
-        sandbox.mkdir("foo/bar");
-
-        // Windows uses a different command to create an empty file so we need to have different content on windows.
-        let nu_env = r#"on_exit = ["touch bye.txt"]"#;
-
-        sandbox.with_files(vec![FileWithContent("foo/.nu-env", nu_env)]);
-
-        // Make sure exitscript is run
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo
-               cd foo
-               cd ..
-               ls foo | where name =~ "bye.txt" | length
-               rm foo/bye.txt | ignore; cd .
-               "#
-        );
-        assert_eq!(actual.out, "1");
-
-        // Entering a subdir should not trigger exitscripts
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo
-               cd foo
-               cd bar
-               ls .. | where name =~ "bye.txt" | length"#
-        );
-        assert_eq!(actual.out, "0");
-
-        // Also run exitscripts when jumping over directory
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo
-               cd foo/bar
-               cd ../..
-               ls foo | where name =~ "bye.txt" | length
-               rm foo/bye.txt | ignore; cd ."#
-        );
-        assert_eq!(actual.out, "1");
-    });
-}
-
-#[test]
-#[serial]
-#[cfg(unix)]
-fn prepends_path_from_local_config() {
-    //If this test fails for you, make sure that your environment from which you start nu
-    //contains some env vars
-    Playground::setup("autoenv_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            r#"
-            path = ["/hi", "/nushell"]
-            "#,
-        )]);
-
-        let expected = "[\"/hi\",\"/nushell\",";
-
-        let actual = Trusted::in_path(&dirs, || nu!(cwd: dirs.test(), "echo $nu.path | to json"));
-        // assert_eq!("", actual.out);
-        assert!(actual.out.starts_with(expected));
-        assert!(actual.out.len() > expected.len());
-    })
-}

From 367fb9b5049ec33ff8ef5f856557e9a5d2603b62 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Nov 2024 09:27:47 +0800
Subject: [PATCH 0715/1072] Bump crate-ci/typos from 1.27.3 to 1.28.1 (#14447)

Bumps [crate-ci/typos](https://github.com/crate-ci/typos) from 1.27.3 to
1.28.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/crate-ci/typos/releases">crate-ci/typos's
releases</a>.</em></p>
<blockquote>
<h2>v1.28.1</h2>
<h2>[1.28.1] - 2024-11-26</h2>
<h3>Fixes</h3>
<ul>
<li>Add back in <code>lock</code> file types accidentally removed in
1.28 (<code>go.sum</code>, <code>requirements.txt</code>)</li>
</ul>
<h2>v1.28.0</h2>
<h2>[1.28.0] - 2024-11-25</h2>
<h3>Features</h3>
<ul>
<li>Updated the dictionary with the <a
href="https://redirect.github.com/crate-ci/typos/issues/1139">November
2024</a> changes</li>
<li>Add many new types and file extensions to the
<code>--type-list</code>, including ada, alire, bat, candid, carp, cml,
devicetree, dita, dockercompose, grpbuild, graphql, hare, lean, meson,
prolog, raku, reasonml, rescript, solidity, svelte, usd, v, wgsl</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/crate-ci/typos/blob/master/CHANGELOG.md">crate-ci/typos's
changelog</a>.</em></p>
<blockquote>
<h2>[1.28.1] - 2024-11-26</h2>
<h3>Fixes</h3>
<ul>
<li>Add back in <code>lock</code> file types accidentally removed in
1.28 (<code>go.sum</code>, <code>requirements.txt</code>)</li>
</ul>
<h2>[1.28.0] - 2024-11-25</h2>
<h3>Features</h3>
<ul>
<li>Updated the dictionary with the <a
href="https://redirect.github.com/crate-ci/typos/issues/1139">November
2024</a> changes</li>
<li>Add many new types and file extensions to the
<code>--type-list</code>, including ada, alire, bat, candid, carp, cml,
devicetree, dita, dockercompose, grpbuild, graphql, hare, lean, meson,
prolog, raku, reasonml, rescript, solidity, svelte, usd, v, wgsl</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/crate-ci/typos/commit/bd36f89fcd3424dcefd442894589e6ee572a59f2"><code>bd36f89</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/9b3917ceee2adf7638bb27defd8539bab4b801d9"><code>9b3917c</code></a>
docs: Update changelog</li>
<li><a
href="https://github.com/crate-ci/typos/commit/8a0dae679343edcebad73d9d10a8dc33a9f9c0e8"><code>8a0dae6</code></a>
Merge pull request <a
href="https://redirect.github.com/crate-ci/typos/issues/1159">#1159</a>
from epage/go</li>
<li><a
href="https://github.com/crate-ci/typos/commit/70f236086fee4675c2b4a67a50771e08181cddd9"><code>70f2360</code></a>
fix: Re-add go.sum, requirements.txt to 'lock' file type</li>
<li><a
href="https://github.com/crate-ci/typos/commit/78d6d2274460eb93ea511a10ce9f67d72f014f35"><code>78d6d22</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/e75389e6fb1a61544d54d2d0dfb3c3451b37ad9f"><code>e75389e</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/cd4f2950fc6fc95edfab12b007f6c4140d3406f7"><code>cd4f295</code></a>
docs: Update changelog</li>
<li><a
href="https://github.com/crate-ci/typos/commit/bdcd9c54e38e59bfa9a6a189e25f64ff4ea47e87"><code>bdcd9c5</code></a>
Merge pull request <a
href="https://redirect.github.com/crate-ci/typos/issues/1157">#1157</a>
from epage/dict</li>
<li><a
href="https://github.com/crate-ci/typos/commit/31e5b4f5b544fead1c0494d0fd4553ddfb8e7d1c"><code>31e5b4f</code></a>
feat(dict): November updates</li>
<li><a
href="https://github.com/crate-ci/typos/commit/ea6fdd13718590f1a8cde1a0bc1bcb3e0febc4e6"><code>ea6fdd1</code></a>
Merge pull request <a
href="https://redirect.github.com/crate-ci/typos/issues/1154">#1154</a>
from dseight/master</li>
<li>Additional commits viewable in <a
href="https://github.com/crate-ci/typos/compare/v1.27.3...v1.28.1">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=crate-ci/typos&package-manager=github_actions&previous-version=1.27.3&new-version=1.28.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/typos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index 2c0fcbd771..d21926517e 100644
--- 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.27.3
+        uses: crate-ci/typos@v1.28.1

From 186c08467f84f3082b1460483400b32015a8925a Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Wed, 27 Nov 2024 09:29:25 +0800
Subject: [PATCH 0716/1072] make std help more user friendly (#14347)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
Fixes:  #13159

After the change, `std help` will no-longer print out "double error"
messages.

Actually I think it's tricky to make it right. To make `help <cmd>`
keeps paging feature from fallback `man` command. I have to split
`commands` into `scope-commands` and `external-commands`.

If we don't split it, simply call `let commands = (try { commands
$target_item --find $find })` in `help main` will cause us to lost
paging feature, which is not we want.

A comment from original issue:

> If there are no objections, I'd like to remove the man page fallback
code from std help for the moment. While it's probably fixable, it's
also platform specific and requires testing on all platforms. It also
seems like a low-value add here.

Actually I think it's a beautiful feature of `std help`, so I want to
keep it here.

# User-Facing Changes
### Before
```nushell
> help commands asdfadsf
Help pages from external command asdfadsf:
No manual entry for asdfadsf
Error:   × std::help::command_not_found
   ╭─[entry #11:1:15]
 1 │ help commands asdfadsf
   ·               ────┬───
   ·                   ╰── command not found
   ╰────
```

### After
```nushell
> help commands asdfasdf
Help pages from external command asdfasdf:
No manual entry for asdfasdf
```

# Tests + Formatting
Actually it's a little hard to add test because it required user input
(especially for fallback `man` command)
---
 crates/nu-std/std/help/mod.nu | 48 ++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/crates/nu-std/std/help/mod.nu b/crates/nu-std/std/help/mod.nu
index 9f13f1bb18..85edd3790d 100644
--- a/crates/nu-std/std/help/mod.nu
+++ b/crates/nu-std/std/help/mod.nu
@@ -684,8 +684,7 @@ def build-command-page [command: record] {
     ] | flatten | str join "\n"
 }
 
-# Show help on commands.
-export def commands [
+def scope-commands [
     ...command: string@"nu-complete list-commands"  # the name of command to get help on
     --find (-f): string  # string to find in command names and description
 ] {
@@ -699,20 +698,35 @@ export def commands [
         let found_command = ($commands | where name == $target_command)
 
         if ($found_command | is-empty) {
-            try {
-                print $"(ansi default_italic)Help pages from external command ($target_command | pretty-cmd):(ansi reset)"
-                ^($env.NU_HELPER? | default "man") $target_command
-            } catch {
-                command-not-found-error (metadata $command | get span)
-            }
+            command-not-found-error (metadata $command | get span)
+        } else {
+            build-command-page ($found_command | get 0)
         }
-
-        build-command-page ($found_command | get 0)
     } else {
         $commands | select name category description signatures search_terms
     }
 }
 
+def external-commands [
+    ...command: string@"nu-complete list-commands",
+] {
+    let target_command = $command | str join " "
+    print $"(ansi default_italic)Help pages from external command ($target_command | pretty-cmd):(ansi reset)"
+    ^($env.NU_HELPER? | default "man") $target_command
+}
+
+# Show help on commands.
+export def commands [
+    ...command: string@"nu-complete list-commands"  # the name of command to get help on
+    --find (-f): string  # string to find in command names and description
+] {
+    try {
+        scope-commands ...$command --find=$find
+    } catch {
+        external-commands ...$command
+    }
+}
+
 def pretty-cmd [] {
     let cmd = $in
     $"(ansi default_dimmed)(ansi default_italic)($cmd)(ansi reset)"
@@ -763,7 +777,7 @@ You can also learn more at (ansi default_italic)(ansi light_cyan_underline)https
 
     let target_item = ($item | str join " ")
 
-    let commands = (try { commands $target_item --find $find })
+    let commands = (try { scope-commands $target_item --find $find })
     if not ($commands | is-empty) { return $commands }
 
     let aliases = (try { aliases $target_item --find $find })
@@ -776,13 +790,7 @@ You can also learn more at (ansi default_italic)(ansi light_cyan_underline)https
         print -e $"No help results found mentioning: ($find)"
         return []
     }
-
-    let span = (metadata $item | get span)
-    error make {
-        msg: ("std::help::item_not_found" | error-fmt)
-        label: {
-            text: "item not found"
-            span: $span
-        }
-    }
+    # use external tool (e.g: `man`) to search help for $target_item
+    # the stdout and stderr of external tool will follow `main` call.
+    external-commands $target_item
 }

From 4edce44689978ddbfc88841b216c4092922a54b1 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Tue, 26 Nov 2024 17:35:55 -0800
Subject: [PATCH 0717/1072] Remove `ListStream` type (#14425)

# Description
List values and list streams have the same type (`list<>`). Rather,
streaming is a separate property of the pipeline/command output. This PR
removes the unnecessary `ListStream` type.

# User-Facing Changes
Should be none, except `random dice` now has a more specific output
type.
---
 crates/nu-command/src/database/commands/into_sqlite.rs | 1 -
 crates/nu-command/src/random/dice.rs                   | 2 +-
 crates/nu-command/src/system/nu_check.rs               | 1 -
 crates/nu-parser/src/type_check.rs                     | 2 --
 crates/nu-protocol/src/pipeline/pipeline_data.rs       | 4 ++--
 crates/nu-protocol/src/ty.rs                           | 4 ----
 crates/nu_plugin_example/src/commands/for_each.rs      | 2 +-
 crates/nu_plugin_example/src/commands/generate.rs      | 2 +-
 8 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/crates/nu-command/src/database/commands/into_sqlite.rs b/crates/nu-command/src/database/commands/into_sqlite.rs
index fcfa228f3b..3236f90999 100644
--- a/crates/nu-command/src/database/commands/into_sqlite.rs
+++ b/crates/nu-command/src/database/commands/into_sqlite.rs
@@ -359,7 +359,6 @@ fn nu_value_to_sqlite_type(val: &Value) -> Result<&'static str, ShellError> {
         | Type::Custom(_)
         | Type::Error
         | Type::List(_)
-        | Type::ListStream
         | Type::Range
         | Type::Record(_)
         | Type::Signature
diff --git a/crates/nu-command/src/random/dice.rs b/crates/nu-command/src/random/dice.rs
index b11eb59e3e..32768a9937 100644
--- a/crates/nu-command/src/random/dice.rs
+++ b/crates/nu-command/src/random/dice.rs
@@ -12,7 +12,7 @@ impl Command for SubCommand {
 
     fn signature(&self) -> Signature {
         Signature::build("random dice")
-            .input_output_types(vec![(Type::Nothing, Type::ListStream)])
+            .input_output_types(vec![(Type::Nothing, Type::list(Type::Int))])
             .allow_variants_without_examples(true)
             .named(
                 "dice",
diff --git a/crates/nu-command/src/system/nu_check.rs b/crates/nu-command/src/system/nu_check.rs
index 59982dfaa7..945440cca4 100644
--- a/crates/nu-command/src/system/nu_check.rs
+++ b/crates/nu-command/src/system/nu_check.rs
@@ -15,7 +15,6 @@ impl Command for NuCheck {
         Signature::build("nu-check")
             .input_output_types(vec![
                 (Type::String, Type::Bool),
-                (Type::ListStream, Type::Bool),
                 (Type::List(Box::new(Type::Any)), Type::Bool),
             ])
             // type is string to avoid automatically canonicalizing the path
diff --git a/crates/nu-parser/src/type_check.rs b/crates/nu-parser/src/type_check.rs
index e5f2a22921..fd57acd5ca 100644
--- a/crates/nu-parser/src/type_check.rs
+++ b/crates/nu-parser/src/type_check.rs
@@ -29,8 +29,6 @@ pub fn type_compatible(lhs: &Type, rhs: &Type) -> bool {
 
     match (lhs, rhs) {
         (Type::List(c), Type::List(d)) => type_compatible(c, d),
-        (Type::ListStream, Type::List(_)) => true,
-        (Type::List(_), Type::ListStream) => true,
         (Type::List(c), Type::Table(table_fields)) => {
             if matches!(**c, Type::Any) {
                 return true;
diff --git a/crates/nu-protocol/src/pipeline/pipeline_data.rs b/crates/nu-protocol/src/pipeline/pipeline_data.rs
index 75449f547f..af56533e91 100644
--- a/crates/nu-protocol/src/pipeline/pipeline_data.rs
+++ b/crates/nu-protocol/src/pipeline/pipeline_data.rs
@@ -109,7 +109,7 @@ impl PipelineData {
     /// than would be returned by [`Value::get_type()`] on the result of
     /// [`.into_value()`](Self::into_value).
     ///
-    /// Specifically, a `ListStream` results in [`list stream`](Type::ListStream) rather than
+    /// Specifically, a `ListStream` results in `list<any>` rather than
     /// the fully complete [`list`](Type::List) type (which would require knowing the contents),
     /// and a `ByteStream` with [unknown](crate::ByteStreamType::Unknown) type results in
     /// [`any`](Type::Any) rather than [`string`](Type::String) or [`binary`](Type::Binary).
@@ -117,7 +117,7 @@ impl PipelineData {
         match self {
             PipelineData::Empty => Type::Nothing,
             PipelineData::Value(value, _) => value.get_type(),
-            PipelineData::ListStream(_, _) => Type::ListStream,
+            PipelineData::ListStream(_, _) => Type::list(Type::Any),
             PipelineData::ByteStream(stream, _) => stream.type_().into(),
         }
     }
diff --git a/crates/nu-protocol/src/ty.rs b/crates/nu-protocol/src/ty.rs
index 55da6422b9..d1b6f7140a 100644
--- a/crates/nu-protocol/src/ty.rs
+++ b/crates/nu-protocol/src/ty.rs
@@ -23,7 +23,6 @@ pub enum Type {
     Float,
     Int,
     List(Box<Type>),
-    ListStream,
     #[default]
     Nothing,
     Number,
@@ -121,7 +120,6 @@ impl Type {
             Type::Nothing => SyntaxShape::Nothing,
             Type::Record(entries) => SyntaxShape::Record(mk_shape(entries)),
             Type::Table(columns) => SyntaxShape::Table(mk_shape(columns)),
-            Type::ListStream => SyntaxShape::List(Box::new(SyntaxShape::Any)),
             Type::Any => SyntaxShape::Any,
             Type::Error => SyntaxShape::Any,
             Type::Binary => SyntaxShape::Binary,
@@ -151,7 +149,6 @@ impl Type {
             Type::Nothing => String::from("nothing"),
             Type::Number => String::from("number"),
             Type::String => String::from("string"),
-            Type::ListStream => String::from("list-stream"),
             Type::Any => String::from("any"),
             Type::Error => String::from("error"),
             Type::Binary => String::from("binary"),
@@ -209,7 +206,6 @@ impl Display for Type {
             Type::Nothing => write!(f, "nothing"),
             Type::Number => write!(f, "number"),
             Type::String => write!(f, "string"),
-            Type::ListStream => write!(f, "list-stream"),
             Type::Any => write!(f, "any"),
             Type::Error => write!(f, "error"),
             Type::Binary => write!(f, "binary"),
diff --git a/crates/nu_plugin_example/src/commands/for_each.rs b/crates/nu_plugin_example/src/commands/for_each.rs
index e66a3841dc..20bf7e9f12 100644
--- a/crates/nu_plugin_example/src/commands/for_each.rs
+++ b/crates/nu_plugin_example/src/commands/for_each.rs
@@ -23,7 +23,7 @@ impl PluginCommand for ForEach {
 
     fn signature(&self) -> Signature {
         Signature::build(self.name())
-            .input_output_type(Type::ListStream, Type::Nothing)
+            .input_output_type(Type::list(Type::Any), Type::Nothing)
             .required(
                 "closure",
                 SyntaxShape::Closure(Some(vec![SyntaxShape::Any])),
diff --git a/crates/nu_plugin_example/src/commands/generate.rs b/crates/nu_plugin_example/src/commands/generate.rs
index de63849aef..d2d4e7a5af 100644
--- a/crates/nu_plugin_example/src/commands/generate.rs
+++ b/crates/nu_plugin_example/src/commands/generate.rs
@@ -26,7 +26,7 @@ impl PluginCommand for Generate {
 
     fn signature(&self) -> Signature {
         Signature::build(self.name())
-            .input_output_type(Type::Nothing, Type::ListStream)
+            .input_output_type(Type::Nothing, Type::list(Type::Any))
             .required(
                 "initial",
                 SyntaxShape::Any,

From e0c0d39edecad231ad3823d38fb9d5505d693d85 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Wed, 27 Nov 2024 09:36:30 +0800
Subject: [PATCH 0718/1072] deprecate --ignore-shell-errors and
 --ignore-program-errors in `do`  (#14385)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
As title, this pr is going to deprecate `--ignore-shell-errors` and
`--ignore-program-errors`.

Because I think these two flags makes `do` command complicate, and it
should be easy to use `-i` instead.

# User-Facing Changes
After the pr, using these two flags will raise deprecated warning.
```nushell
> do --ignore-program-errors { ^pwd }
Error:   × Deprecated option
   ╭─[entry #2:1:1]
 1 │ do --ignore-program-errors { ^pwd }
   · ─┬
   ·  ╰── `--ignore-program-errors` is deprecated and will be removed in 0.102.0.
   ╰────
  help: Please use the `--ignore-errors(-i)`
/home/windsoilder/projects/nushell
> do --ignore-shell-errors { ^pwd }
Error:   × Deprecated option
   ╭─[entry #3:1:1]
 1 │ do --ignore-shell-errors { ^pwd }
   · ─┬
   ·  ╰── `--ignore-shell-errors` is deprecated and will be removed in 0.102.0.
   ╰────
  help: Please use the `--ignore-errors(-i)`
/home/windsoilder/projects/nushell
```

# Tests + Formatting
NaN
---
 crates/nu-cmd-lang/src/core_commands/do_.rs   | 37 ++++++++++++++-----
 crates/nu-command/tests/commands/do_.rs       |  7 ++--
 .../nu-utils/src/default_files/default_env.nu |  2 +-
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/crates/nu-cmd-lang/src/core_commands/do_.rs b/crates/nu-cmd-lang/src/core_commands/do_.rs
index 5f1b42cb66..81ea22ad39 100644
--- a/crates/nu-cmd-lang/src/core_commands/do_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/do_.rs
@@ -69,6 +69,33 @@ impl Command for Do {
         let block: Closure = call.req(engine_state, caller_stack, 0)?;
         let rest: Vec<Value> = call.rest(engine_state, caller_stack, 1)?;
         let ignore_all_errors = call.has_flag(engine_state, caller_stack, "ignore-errors")?;
+
+        if call.has_flag(engine_state, caller_stack, "ignore-shell-errors")? {
+            nu_protocol::report_shell_warning(
+                engine_state,
+                &ShellError::GenericError {
+                    error: "Deprecated option".into(),
+                    msg: "`--ignore-shell-errors` is deprecated and will be removed in 0.102.0."
+                        .into(),
+                    span: Some(call.head),
+                    help: Some("Please use the `--ignore-errors(-i)`".into()),
+                    inner: vec![],
+                },
+            );
+        }
+        if call.has_flag(engine_state, caller_stack, "ignore-program-errors")? {
+            nu_protocol::report_shell_warning(
+                engine_state,
+                &ShellError::GenericError {
+                    error: "Deprecated option".into(),
+                    msg: "`--ignore-program-errors` is deprecated and will be removed in 0.102.0."
+                        .into(),
+                    span: Some(call.head),
+                    help: Some("Please use the `--ignore-errors(-i)`".into()),
+                    inner: vec![],
+                },
+            );
+        }
         let ignore_shell_errors = ignore_all_errors
             || call.has_flag(engine_state, caller_stack, "ignore-shell-errors")?;
         let ignore_program_errors = ignore_all_errors
@@ -208,16 +235,6 @@ impl Command for Do {
                 example: r#"do --ignore-errors { thisisnotarealcommand }"#,
                 result: None,
             },
-            Example {
-                description: "Run the closure and ignore shell errors",
-                example: r#"do --ignore-shell-errors { thisisnotarealcommand }"#,
-                result: None,
-            },
-            Example {
-                description: "Run the closure and ignore external program errors",
-                example: r#"do --ignore-program-errors { nu --commands 'exit 1' }; echo "I'll still run""#,
-                result: None,
-            },
             Example {
                 description: "Abort the pipeline if a program returns a non-zero exit code",
                 example: r#"do --capture-errors { nu --commands 'exit 1' } | myscarycommand"#,
diff --git a/crates/nu-command/tests/commands/do_.rs b/crates/nu-command/tests/commands/do_.rs
index bbce5648db..1a2258cf9c 100644
--- a/crates/nu-command/tests/commands/do_.rs
+++ b/crates/nu-command/tests/commands/do_.rs
@@ -44,7 +44,7 @@ fn do_with_semicolon_break_on_failed_external() {
 fn ignore_shell_errors_works_for_external_with_semicolon() {
     let actual = nu!(r#"do -s { open asdfasdf.txt }; "text""#);
 
-    assert_eq!(actual.err, "");
+    assert!(actual.err.contains("Deprecated option"));
     assert_eq!(actual.out, "text");
 }
 
@@ -52,7 +52,7 @@ fn ignore_shell_errors_works_for_external_with_semicolon() {
 fn ignore_program_errors_works_for_external_with_semicolon() {
     let actual = nu!(r#"do -p { nu -n -c 'exit 1' }; "text""#);
 
-    assert_eq!(actual.err, "");
+    assert!(actual.err.contains("Deprecated option"));
     assert_eq!(actual.out, "text");
 }
 
@@ -80,6 +80,7 @@ fn run_closure_with_it_using() {
 #[test]
 fn waits_for_external() {
     let actual = nu!(r#"do -p { nu -c 'sleep 1sec; print before; exit 1'}; print after"#);
-    assert!(actual.err.is_empty());
+
+    assert!(actual.err.contains("Deprecated option"));
     assert_eq!(actual.out, "beforeafter");
 }
diff --git a/crates/nu-utils/src/default_files/default_env.nu b/crates/nu-utils/src/default_files/default_env.nu
index 498c9670b3..1f702d984b 100644
--- a/crates/nu-utils/src/default_files/default_env.nu
+++ b/crates/nu-utils/src/default_files/default_env.nu
@@ -4,7 +4,7 @@
 # version = "0.100.1"
 
 $env.PROMPT_COMMAND = {|| 
-    let dir = match (do --ignore-shell-errors { $env.PWD | path relative-to $nu.home-path }) {
+    let dir = match (do -i { $env.PWD | path relative-to $nu.home-path }) {
         null => $env.PWD
         '' => '~'
         $relative_pwd => ([~ $relative_pwd] | path join)

From 547c436281fff93c54feb612cd17fe88678626fa Mon Sep 17 00:00:00 2001
From: Antoine Stevan <44101798+amtoine@users.noreply.github.com>
Date: Wed, 27 Nov 2024 02:43:49 +0100
Subject: [PATCH 0719/1072] add `from ndnuon` and `to ndnuon` to stdlib
 (#14334)

# Description
i was playing with the NDNUON format and using local definitions of
`from ndnuon` and `to ndnuon` but then i thought they could live in the
standard library next to `from ndjson` and `to ndjson` :yum:

# User-Facing Changes
users can now add the following to their configs and get NDNUON ready to
go
```nushell
use std formats ["from ndnuon" "to ndnuon"]
```

# Tests + Formatting
i did simply mimic the tests for `from ndjson` and `to ndjson`, i hope
it's fine since the recent big change to the standard library

# After Submitting

---------

Co-authored-by: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
---
 crates/nu-std/std/formats/mod.nu        | 10 ++++
 crates/nu-std/tests/test_formats.nu     | 62 +++++++++++++++++++++----
 crates/nu-std/tests/test_std_formats.nu | 62 +++++++++++++++++++++----
 3 files changed, 116 insertions(+), 18 deletions(-)

diff --git a/crates/nu-std/std/formats/mod.nu b/crates/nu-std/std/formats/mod.nu
index 2f20e81451..addfa4c1c9 100644
--- a/crates/nu-std/std/formats/mod.nu
+++ b/crates/nu-std/std/formats/mod.nu
@@ -28,3 +28,13 @@ export def "to ndjson" []: any -> string {
 export def "to jsonl" []: any -> string {
     each { to json --raw } | to text
 }
+
+# Convert from NDNUON (newline-delimited NUON), to structured data
+export def "from ndnuon" []: [string -> any] {
+    lines | each { from nuon }
+}
+
+# Convert structured data to NDNUON, i.e. newline-delimited NUON
+export def "to ndnuon" []: [any -> string] {
+    each { to nuon --raw } | to text
+}
diff --git a/crates/nu-std/tests/test_formats.nu b/crates/nu-std/tests/test_formats.nu
index f54598bf08..ec1f6adb47 100644
--- a/crates/nu-std/tests/test_formats.nu
+++ b/crates/nu-std/tests/test_formats.nu
@@ -2,15 +2,26 @@
 use std/assert
 use std/formats *
 
-def test_data_multiline [] {
-  let lines = [
-    "{\"a\":1}",
-    "{\"a\":2}",
-    "{\"a\":3}",
-    "{\"a\":4}",
-    "{\"a\":5}",
-    "{\"a\":6}",
-  ]
+def test_data_multiline [--nuon] {
+  let lines = if $nuon {
+    [
+      "{a: 1}",
+      "{a: 2}",
+      "{a: 3}",
+      "{a: 4}",
+      "{a: 5}",
+      "{a: 6}",
+    ]
+  } else {
+    [
+      "{\"a\":1}",
+      "{\"a\":2}",
+      "{\"a\":3}",
+      "{\"a\":4}",
+      "{\"a\":5}",
+      "{\"a\":6}",
+    ]
+  }
 
   if $nu.os-info.name == "windows" {
     $lines | str join "\r\n"
@@ -84,3 +95,36 @@ def to_jsonl_single_object [] {
   let expect = "{\"a\":1}"
   assert equal $result $expect "could not convert to JSONL"
 }
+
+#[test]
+def from_ndnuon_multiple_objects [] {
+  let result = test_data_multiline | from ndnuon
+  let expect = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}]
+  assert equal $result $expect "could not convert from NDNUON"
+}
+
+#[test]
+def from_ndnuon_single_object [] {
+  let result = '{a: 1}' | from ndnuon
+  let expect = [{a:1}]
+  assert equal $result $expect "could not convert from NDNUON"
+}
+
+#[test]
+def from_ndnuon_invalid_object [] {
+  assert error { '{"a":1' | formats from ndnuon }
+}
+
+#[test]
+def to_ndnuon_multiple_objects [] {
+  let result = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}] | to ndnuon | str trim
+  let expect = test_data_multiline --nuon
+  assert equal $result $expect "could not convert to NDNUON"
+}
+
+#[test]
+def to_ndnuon_single_object [] {
+  let result = [{a:1}] | to ndnuon | str trim
+  let expect = "{a: 1}"
+  assert equal $result $expect "could not convert to NDNUON"
+}
diff --git a/crates/nu-std/tests/test_std_formats.nu b/crates/nu-std/tests/test_std_formats.nu
index f23590c5a0..ed6b079d7e 100644
--- a/crates/nu-std/tests/test_std_formats.nu
+++ b/crates/nu-std/tests/test_std_formats.nu
@@ -1,16 +1,27 @@
 # Test std/formats when importing `use std *`
 use std *
 
-def test_data_multiline [] {
+def test_data_multiline [--nuon] {
   use std *
-  let lines = [
-    "{\"a\":1}",
-    "{\"a\":2}",
-    "{\"a\":3}",
-    "{\"a\":4}",
-    "{\"a\":5}",
-    "{\"a\":6}",
-  ]
+  let lines = if $nuon {
+    [
+      "{a: 1}",
+      "{a: 2}",
+      "{a: 3}",
+      "{a: 4}",
+      "{a: 5}",
+      "{a: 6}",
+    ]
+  } else {
+    [
+      "{\"a\":1}",
+      "{\"a\":2}",
+      "{\"a\":3}",
+      "{\"a\":4}",
+      "{\"a\":5}",
+      "{\"a\":6}",
+    ]
+  }
 
   if $nu.os-info.name == "windows" {
     $lines | str join "\r\n"
@@ -84,3 +95,36 @@ def to_jsonl_single_object [] {
   let expect = "{\"a\":1}"
   assert equal $result $expect "could not convert to JSONL"
 }
+
+#[test]
+def from_ndnuon_multiple_objects [] {
+  let result = test_data_multiline | formats from ndnuon
+  let expect = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}]
+  assert equal $result $expect "could not convert from NDNUON"
+}
+
+#[test]
+def from_ndnuon_single_object [] {
+  let result = '{a: 1}' | formats from ndnuon
+  let expect = [{a:1}]
+  assert equal $result $expect "could not convert from NDNUON"
+}
+
+#[test]
+def from_ndnuon_invalid_object [] {
+  assert error { '{"a":1' | formats from ndnuon }
+}
+
+#[test]
+def to_ndnuon_multiple_objects [] {
+  let result = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}] | formats to ndnuon | str trim
+  let expect = test_data_multiline --nuon
+  assert equal $result $expect "could not convert to NDNUON"
+}
+
+#[test]
+def to_ndnuon_single_object [] {
+  let result = [{a:1}] | formats to ndnuon | str trim
+  let expect = "{a: 1}"
+  assert equal $result $expect "could not convert to NDNUON"
+}

From 1c18e37a7cdc1e7746f068a445521a3bbf3a0179 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Wed, 27 Nov 2024 00:52:47 -0500
Subject: [PATCH 0720/1072] Always populate config record during startup
 (#14435)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

As a bit of a follow-on to #13802 and #14249, this (pretty much a
"one-line" change) really does *always* populate the `$env.config`
record with the `nu-protocol::config` defaults during startup. This
means that an `$env.config` record is value (with defaults) even during:

* `nu -n` to suppress loading of config files
* `nu -c <commandstring>`
* `nu <script>`

# User-Facing Changes

There should be no case in which there isn't a valid `$env.config`.

* Before:

  ```nushell
  nu -c "$env.config"
  # -> Error
  ```

* After:

  ```nushell
  nu -c "$env.config"
  # -> Default $env.config record
  ```

Startup time impact is negligible (17.072µs from `perf!` on my system) -
Seems well worth it.

# Tests + Formatting

Added tests for several `-n -c` cases.

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

Config chapter update still in progress.
---
 src/main.rs                    | 11 ++++-
 tests/repl/test_config_path.rs | 78 ++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+), 2 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 2c7b94b628..bef8d07caf 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -24,8 +24,8 @@ use nu_cli::gather_parent_env_vars;
 use nu_lsp::LanguageServer;
 use nu_path::canonicalize_with;
 use nu_protocol::{
-    engine::EngineState, report_shell_error, ByteStream, PipelineData, ShellError, Span, Spanned,
-    Value,
+    engine::EngineState, report_shell_error, ByteStream, Config, IntoValue, PipelineData,
+    ShellError, Span, Spanned, Value,
 };
 use nu_std::load_standard_library;
 use nu_utils::perf;
@@ -257,6 +257,13 @@ fn main() -> Result<()> {
         perf!("acquire_terminal", start_time, use_color);
     }
 
+    start_time = std::time::Instant::now();
+    engine_state.add_env_var(
+        "config".into(),
+        Config::default().into_value(Span::unknown()),
+    );
+    perf!("$env.config setup", start_time, use_color);
+
     start_time = std::time::Instant::now();
     if let Some(include_path) = &parsed_nu_cli_args.include_path {
         let span = include_path.span;
diff --git a/tests/repl/test_config_path.rs b/tests/repl/test_config_path.rs
index 63488ecb6a..29c090db17 100644
--- a/tests/repl/test_config_path.rs
+++ b/tests/repl/test_config_path.rs
@@ -298,3 +298,81 @@ fn test_xdg_config_symlink() {
         );
     });
 }
+
+#[test]
+fn no_config_does_not_load_env_files() {
+    let nu = nu_test_support::fs::executable_path().display().to_string();
+    let cmd = format!(
+        r#"
+            {nu} -n -c "view files | where filename =~ 'env\\.nu$' | length"
+        "#
+    );
+    let actual = nu!(cmd);
+
+    assert_eq!(actual.out, "0");
+}
+
+#[test]
+fn no_config_does_not_load_config_files() {
+    let nu = nu_test_support::fs::executable_path().display().to_string();
+    let cmd = format!(
+        r#"
+            {nu} -n -c "view files | where filename =~ 'config\\.nu$' | length"
+        "#
+    );
+    let actual = nu!(cmd);
+
+    assert_eq!(actual.out, "0");
+}
+
+#[test]
+fn commandstring_does_not_load_config_files() {
+    let nu = nu_test_support::fs::executable_path().display().to_string();
+    let cmd = format!(
+        r#"
+            {nu} -c "view files | where filename =~ 'config\\.nu$' | length"
+        "#
+    );
+    let actual = nu!(cmd);
+
+    assert_eq!(actual.out, "0");
+}
+
+#[test]
+fn commandstring_does_not_load_user_env() {
+    let nu = nu_test_support::fs::executable_path().display().to_string();
+    let cmd = format!(
+        r#"
+            {nu} -c "view files | where filename =~ '[^_]env\\.nu$' | length"
+        "#
+    );
+    let actual = nu!(cmd);
+
+    assert_eq!(actual.out, "0");
+}
+
+#[test]
+fn commandstring_loads_default_env() {
+    let nu = nu_test_support::fs::executable_path().display().to_string();
+    let cmd = format!(
+        r#"
+            {nu} -c "view files | where filename =~ 'default_env\\.nu$' | length"
+        "#
+    );
+    let actual = nu!(cmd);
+
+    assert_eq!(actual.out, "1");
+}
+
+#[test]
+fn commandstring_populates_config_record() {
+    let nu = nu_test_support::fs::executable_path().display().to_string();
+    let cmd = format!(
+        r#"
+            {nu} --no-std-lib -n -c "$env.config.show_banner"
+        "#
+    );
+    let actual = nu!(cmd);
+
+    assert_eq!(actual.out, "true");
+}

From bd374735153d189ff24ee8003af4f8272c7c646c Mon Sep 17 00:00:00 2001
From: PegasusPlusUS <95586924+PegasusPlusUS@users.noreply.github.com>
Date: Wed, 27 Nov 2024 04:27:06 -0800
Subject: [PATCH 0721/1072] Fix unstable test case: One time my windows report
 drive letter as lowercase (#14451)

As I'm working on PWD-per-drive feature. Once the plugin test of env
failed. I checked the log, found sometime Windows can give drive letter
as lowercase, so the test case should be rewrite to check first letter
caseinsensitive equal, and following part normal equal.

```
assert_eq! failed at tests/plugins/env.rs:43:5
left: r"e:\Study\Nushell"
right: r"E:\Study\Nushell"
```

---------

Co-authored-by: Zhenping Zhao <pegasus.cadence@gmail.com>
---
 tests/plugins/env.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/plugins/env.rs b/tests/plugins/env.rs
index 8b307999b3..d7d1555f02 100644
--- a/tests/plugins/env.rs
+++ b/tests/plugins/env.rs
@@ -40,7 +40,17 @@ fn get_current_dir() {
         "cd tests; example env --cwd"
     );
     assert!(result.status.success());
+    #[cfg(not(windows))]
     assert_eq!(cwd, result.out);
+    #[cfg(windows)]
+    {
+        // cwd == r"e:\Study\Nushell", while result.out == r"E:\Study\Nushell"
+        assert_eq!(
+            cwd.chars().next().unwrap().to_ascii_uppercase(),
+            result.out.chars().next().unwrap().to_ascii_uppercase()
+        );
+        assert_eq!(cwd[1..], result.out[1..]);
+    }
 }
 
 #[test]

From 0aafc29fb5caf437c0e22f22ac1876f2e8857de5 Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Wed, 27 Nov 2024 15:37:21 +0300
Subject: [PATCH 0722/1072] Propagate existing errors in insert and merge
 (#14453)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
Propagate existing errors in the pipeline, rather than a type error.

# User-Facing Changes
Nothing that previously worked should be affected, this should just
change the errors.

# Tests + Formatting

- 🟢 `toolkit fmt`
- 🟢 `toolkit clippy`
- 🟢 `toolkit test`
- 🟢 `toolkit test stdlib`
---
 crates/nu-command/src/filters/insert.rs | 2 ++
 crates/nu-command/src/filters/merge.rs  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/crates/nu-command/src/filters/insert.rs b/crates/nu-command/src/filters/insert.rs
index e6f9a7d8d7..0d3a234f58 100644
--- a/crates/nu-command/src/filters/insert.rs
+++ b/crates/nu-command/src/filters/insert.rs
@@ -129,6 +129,8 @@ fn insert(
     let replacement: Value = call.req(engine_state, stack, 1)?;
 
     match input {
+        // Propagate errors in the pipeline
+        PipelineData::Value(Value::Error { error, .. }, ..) => Err(*error),
         PipelineData::Value(mut value, metadata) => {
             if let Value::Closure { val, .. } = replacement {
                 match (cell_path.members.first(), &mut value) {
diff --git a/crates/nu-command/src/filters/merge.rs b/crates/nu-command/src/filters/merge.rs
index e1d3095b20..588138fb42 100644
--- a/crates/nu-command/src/filters/merge.rs
+++ b/crates/nu-command/src/filters/merge.rs
@@ -120,6 +120,8 @@ repeating this process with row 1, and so on."#
                 PipelineData::Value(Value::Record { val: inp, .. }, ..),
                 Value::Record { val: to_merge, .. },
             ) => Ok(Value::record(do_merge(inp, &to_merge), head).into_pipeline_data()),
+            // Propagate errors in the pipeline
+            (PipelineData::Value(Value::Error { error, .. }, ..), _) => Err(*error.clone()),
             (PipelineData::Value(val, ..), ..) => {
                 // Only point the "value originates here" arrow at the merge value
                 // if it was generated from a block. Otherwise, point at the pipeline value. -Leon 2022-10-27

From 5e7263cd1a70dadc4fbe2889deff5eb8caf2b930 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Wed, 27 Nov 2024 10:42:30 -0500
Subject: [PATCH 0723/1072] Bump reedline to current main (#14455)

# Description

@fdncred mentioned that we should be dogfooding the latest Reedline
changes in Nushell. Hoping I got the steps correct.

# User-Facing Changes

New keybindings for:

* Insert Newline: <kbd>Alt</kbd>+<kbd>Enter</kbd> and
<kbd>Shift</kbd>+<kbd>Enter</kbd>
* Enter:  <kbd>Ctrl</kbd>+<kbd>J</kbd>

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
---
 Cargo.lock | 3 +--
 Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e57b9da8fb..5222241e8a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5337,8 +5337,7 @@ dependencies = [
 [[package]]
 name = "reedline"
 version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9834765acaa2deedf29197f2da3d309801683beb20e25775bc0249f97a7b9a74"
+source = "git+https://github.com/nushell/reedline?branch=main#3c46dc2c0c69476a625611a556e67ddb8439629c"
 dependencies = [
  "arboard",
  "chrono",
diff --git a/Cargo.toml b/Cargo.toml
index cf836ea6e4..bfdb2c8254 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -314,7 +314,7 @@ 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`

From a13a024ac8149ea5245a7349b96d0cfdb777b128 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Thu, 28 Nov 2024 05:43:36 +0800
Subject: [PATCH 0724/1072] update miette to 7.3 (#14454)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
The test is failed when updating miette from 7.2 to 7.3. After looking
into the test, I think it's ok to adjust test.

# User-Facing Changes
For the given custom command:
```nushell
def force_error [ x: any ] {
    error make {
        msg: "oh no!"
        label: {
            text: "here's the error"
            span: (metadata $x).span
        }
    }
}
```
### Before
```
> force_error "My error"
Error:   × oh no!
   ╭─[entry #8:1:13]
 1 │ force_error "My error"
   ·             ─────┬────
   ·                  ╰── here's the error
   ╰────

```

### After
```
> force_error "My error"
Error:
  × oh no!
   ╭─[entry #9:1:13]
 1 │ force_error "My error"
   ·             ─────┬────
   ·                  ╰── here's the error
   ╰────
```
As we can see, the message `oh no!` is output in a new line, and there
is one less trailing line. I have makes some testing, and it seems that
it only happened on `error make` command.

# Tests + Formatting
Changed 1 test

# After Submitting
NaN
---
 Cargo.lock                              | 33 ++++++-------------------
 Cargo.toml                              |  2 +-
 crates/nu-protocol/tests/test_config.rs |  2 +-
 3 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5222241e8a..feb47c46b9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -784,7 +784,7 @@ dependencies = [
  "anstyle",
  "clap_lex",
  "strsim",
- "terminal_size 0.4.0",
+ "terminal_size",
 ]
 
 [[package]]
@@ -2851,9 +2851,9 @@ dependencies = [
 
 [[package]]
 name = "miette"
-version = "7.2.0"
+version = "7.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4edc8853320c2a0dab800fbda86253c8938f6ea88510dc92c5f1ed20e794afc1"
+checksum = "317f146e2eb7021892722af37cf1b971f0a70c8406f487e24952667616192c64"
 dependencies = [
  "backtrace",
  "backtrace-ext",
@@ -2863,7 +2863,7 @@ dependencies = [
  "supports-color 3.0.1",
  "supports-hyperlinks",
  "supports-unicode",
- "terminal_size 0.3.0",
+ "terminal_size",
  "textwrap",
  "thiserror 1.0.69",
  "unicode-width 0.1.11",
@@ -2871,9 +2871,9 @@ dependencies = [
 
 [[package]]
 name = "miette-derive"
-version = "7.2.0"
+version = "7.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c"
+checksum = "23c9b935fbe1d6cbd1dac857b54a688145e2d93f48db36010514d0f612d0ad67"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3402,7 +3402,7 @@ dependencies = [
  "nu-path",
  "nu-protocol",
  "nu-utils",
- "terminal_size 0.4.0",
+ "terminal_size",
 ]
 
 [[package]]
@@ -3658,7 +3658,7 @@ dependencies = [
  "nu-protocol",
  "nu-utils",
  "tabled",
- "terminal_size 0.4.0",
+ "terminal_size",
 ]
 
 [[package]]
@@ -6035,12 +6035,6 @@ version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
-[[package]]
-name = "smawk"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
-
 [[package]]
 name = "snap"
 version = "1.1.1"
@@ -6389,16 +6383,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "terminal_size"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
-dependencies = [
- "rustix",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "terminal_size"
 version = "0.4.0"
@@ -6421,7 +6405,6 @@ version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
 dependencies = [
- "smawk",
  "unicode-linebreak",
  "unicode-width 0.1.11",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index bfdb2c8254..12d2197cad 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -106,7 +106,7 @@ lsp-server = "0.7.5"
 lsp-types = { version = "0.95.0", features = ["proposed"] }
 mach2 = "0.4"
 md5 = { version = "0.10", package = "md-5" }
-miette = "7.2"
+miette = "7.3"
 mime = "0.3.17"
 mime_guess = "2.0"
 mockito = { version = "1.6", default-features = false }
diff --git a/crates/nu-protocol/tests/test_config.rs b/crates/nu-protocol/tests/test_config.rs
index f47dda3121..eb57903685 100644
--- a/crates/nu-protocol/tests/test_config.rs
+++ b/crates/nu-protocol/tests/test_config.rs
@@ -69,7 +69,7 @@ fn fancy_default_errors() {
 
     assert_eq!(
         actual.err,
-        "Error:   \u{1b}[31m×\u{1b}[0m oh no!\n   ╭─[\u{1b}[36;1;4mline1\u{1b}[0m:1:13]\n \u{1b}[2m1\u{1b}[0m │ force_error \"My error\"\n   · \u{1b}[35;1m            ─────┬────\u{1b}[0m\n   ·                  \u{1b}[35;1m╰── \u{1b}[35;1mhere's the error\u{1b}[0m\u{1b}[0m\n   ╰────\n\n\n"
+        "Error: \n  \u{1b}[31m×\u{1b}[0m oh no!\n   ╭─[\u{1b}[36;1;4mline1:1:13\u{1b}[0m]\n \u{1b}[2m1\u{1b}[0m │ force_error \"My error\"\n   · \u{1b}[35;1m            ─────┬────\u{1b}[0m\n   ·                  \u{1b}[35;1m╰── \u{1b}[35;1mhere's the error\u{1b}[0m\u{1b}[0m\n   ╰────\n\n"
     );
 }
 

From bccff3b237891b939bf273fb7c905ade0742b18a Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Thu, 28 Nov 2024 02:04:42 -0500
Subject: [PATCH 0725/1072] Update default-files README (#14461)

# Description

Someone noticed today that I had left a TODO in the Readme. It has since
been completed and needed to be removed. Also made some other minor
fixes and wordsmithing while I was in it.

# User-Facing Changes

None

# Tests + Formatting

Clippy and fmt passed, and that should be all that matters on the
Readme.

# After Submitting

N/A
---
 crates/nu-utils/src/default_files/README.md | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/crates/nu-utils/src/default_files/README.md b/crates/nu-utils/src/default_files/README.md
index 2269771bbd..68a36b865d 100644
--- a/crates/nu-utils/src/default_files/README.md
+++ b/crates/nu-utils/src/default_files/README.md
@@ -7,10 +7,8 @@
 * Will be loaded during any startup where the user's `env.nu` is also loaded. For example:
   * During normal startup with `nu`
   * During a startup where the user specifies an alternative `env.nu` via `nu --env-config <path>`
-* Likewise, is never loaded during a startup where the user's `env.nu` would not be loaded. For example:
-  * `nu -n/--no-config`
-  * `nu -c "ls"`
-  * `nu <script.nu>`
+  * During a `nu -c <commandstring>` or `nu <script>` startup so that `ENV_CONVERSIONS` is properly handled for Windows.
+* Is *not* loaded when running with an explicit `no --no-config-file (-n)`.
 * Is not commented - Comments are in `sample_env.nu`.
 * Should be optimized for fastest load times.
 * Can be introspected via `config env --default | nu-highlight`
@@ -42,8 +40,7 @@ Counterpart to `default_env.nu`.
 ## `sample_env.nu`
 
 * A commented file documenting the most common environment variables that a user might configure in `env.nu`
-* For convenient in-shell access
-* Can be pretty-printed via `config env --sample | nu-highlight`
+* For convenient in-shell access - Can be pretty-printed via `config env --sample | nu-highlight`
 * Since this file is for documentation only, include actual Nushell code without comments so that it can be pretty-printed
 * No optimization necessary - Not intended for use other than documentation.
 * Consider replacing `config env --sample` with `help env.nu` at some point.
@@ -53,11 +50,8 @@ Counterpart to `default_env.nu`.
 
 Counterpart to `sample_env.nu`.
 
-TODO: **Not in final form**
-
 * A commented file documenting the most common environment variables that a user might configure in `config.nu`
-* For convenient in-shell access
-* Can be pretty-printed via `config nu --sample | nu-highlight`
+* For convenient in-shell access - Can be pretty-printed via `config nu --sample | nu-highlight`
 * Since this file is for documentation only, include actual Nushell code without comments so that it can be pretty-printed
 * No optimization necessary - Not intended for use other than documentation.
 * Consider replacing `config nu --sample` with `help config.nu` at some point.

From 8d1e36fa3cb2331456c82b70fd0770aa33e17b7e Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Thu, 28 Nov 2024 13:37:32 -0500
Subject: [PATCH 0726/1072] Allow inherited environment variables (#14467)

# Description

Due to #14249 loading `default_env.nu` before the user's `env.nu`,
variables that were defined there were overriding:

* Inherited values
* Some values that were set in the Rust code, such as the `NU_LIB_PATH`
when set using `--include-path`.

This change checks to see if a variable already exists, uses its value
if so, and sets the default value otherwise.

Note: `ENV_CONVERSIONS` is still "forced" to a default value regardless,
as it needs to run reliably. There's probably not much reason to inherit
it, but I'm open to the idea if there's a use-case.

# User-Facing Changes

* Before: Variables that were set in `default_env.nu` always overrode
those that were inherited from the parent process or set internally
* After: Inherited and internal environment variables will take
priority.

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

Will try to find a good place to mention this behavior in the Config
chapter updates
---
 .../nu-utils/src/default_files/default_env.nu  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/crates/nu-utils/src/default_files/default_env.nu b/crates/nu-utils/src/default_files/default_env.nu
index 1f702d984b..cb85e519ba 100644
--- a/crates/nu-utils/src/default_files/default_env.nu
+++ b/crates/nu-utils/src/default_files/default_env.nu
@@ -3,7 +3,7 @@
 #
 # version = "0.100.1"
 
-$env.PROMPT_COMMAND = {|| 
+$env.PROMPT_COMMAND = $env.PROMPT_COMMAND? | default {|| 
     let dir = match (do -i { $env.PWD | path relative-to $nu.home-path }) {
         null => $env.PWD
         '' => '~'
@@ -17,12 +17,12 @@ $env.PROMPT_COMMAND = {||
     $path_segment | str replace --all (char path_sep) $"($separator_color)(char path_sep)($path_color)"
 }
 
-$env.PROMPT_INDICATOR = "> "
-$env.PROMPT_INDICATOR_VI_NORMAL = "> "
-$env.PROMPT_INDICATOR_VI_INSERT = ": "
-$env.PROMPT_MULTILINE_INDICATOR = "::: "
+$env.PROMPT_INDICATOR = $env.PROMPT_INDICATOR? | default "> "
+$env.PROMPT_INDICATOR_VI_NORMAL = $env.PROMPT_INDICATOR_VI_NORMAL? | default "> "
+$env.PROMPT_INDICATOR_VI_INSERT = $env.PROMPT_INDICATOR_VI_INSERT? | default ": "
+$env.PROMPT_MULTILINE_INDICATOR = $env.PROMPT_MULTILINE_INDICATOR? | default "::: "
 
-$env.PROMPT_COMMAND_RIGHT = {|| 
+$env.PROMPT_COMMAND_RIGHT = $env.PROMPT_COMMAND_RIGHT? | default {|| 
     # create a right prompt in magenta with green separators and am/pm underlined
     let time_segment = ([
         (ansi reset)
@@ -47,11 +47,11 @@ $env.ENV_CONVERSIONS = {
     }
 }
 
-$env.NU_LIB_DIRS = [
+$env.NU_LIB_DIRS = $env.NU_LIB_DIRS? | default [
     ($nu.default-config-dir | path join 'scripts') # add <nushell-config-dir>/scripts
     ($nu.data-dir | path join 'completions') # default home for nushell completions
 ]
 
-$env.NU_PLUGIN_DIRS = [
+$env.NU_PLUGIN_DIRS = $env.NU_PLUGIN_DIRS | default [
     ($nu.default-config-dir | path join 'plugins') # add <nushell-config-dir>/plugins
-]
\ No newline at end of file
+]

From 6e036ca09ab7d8f170d78c2032f34822c670af14 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Fri, 29 Nov 2024 09:09:45 +0800
Subject: [PATCH 0727/1072] update unicode-width to 0.2 (#14456)

# Description
When looking into #14395, I found that `unicode-width` from 0.1 to 0.2
contains a breaking change, the mainly change is it treats newlines as
width 1. So relative tests(str stats) are broken.
But I think it's ok to adjust the test.

# User-Facing Changes
The output of `str stats` might change if there are `\n` in the input.
### Before
```nushell
> "a\nb" | str stats | get unicode-width
2
```
### After
```nushell
> "a\nb" | str stats | get unicode-width
3
```
# Tests + Formatting
Adjusted 2 tests.

# After Submitting
NaN
---
 Cargo.lock                                  | 6 +++---
 Cargo.toml                                  | 2 +-
 crates/nu-command/src/strings/str_/stats.rs | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index feb47c46b9..ecad53d2d8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3363,7 +3363,7 @@ dependencies = [
  "trash",
  "umask",
  "unicode-segmentation",
- "unicode-width 0.1.11",
+ "unicode-width 0.2.0",
  "ureq",
  "url",
  "uu_cp",
@@ -3426,7 +3426,7 @@ dependencies = [
  "nu-utils",
  "ratatui",
  "strip-ansi-escapes",
- "unicode-width 0.1.11",
+ "unicode-width 0.2.0",
 ]
 
 [[package]]
@@ -3666,7 +3666,7 @@ name = "nu-term-grid"
 version = "0.100.1"
 dependencies = [
  "nu-utils",
- "unicode-width 0.1.11",
+ "unicode-width 0.2.0",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 12d2197cad..67c9e18c41 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -162,7 +162,7 @@ toml = "0.8"
 trash = "5.2"
 umask = "2.1"
 unicode-segmentation = "1.12"
-unicode-width = "0.1"
+unicode-width = "0.2"
 ureq = { version = "2.10", default-features = false }
 url = "2.2"
 uu_cp = "0.0.28"
diff --git a/crates/nu-command/src/strings/str_/stats.rs b/crates/nu-command/src/strings/str_/stats.rs
index 586a48ffde..8722a030d4 100644
--- a/crates/nu-command/src/strings/str_/stats.rs
+++ b/crates/nu-command/src/strings/str_/stats.rs
@@ -307,7 +307,7 @@ fn test_one_newline() {
     correct_counts.insert(Counter::GraphemeClusters, 1);
     correct_counts.insert(Counter::Bytes, 1);
     correct_counts.insert(Counter::CodePoints, 1);
-    correct_counts.insert(Counter::UnicodeWidth, 0);
+    correct_counts.insert(Counter::UnicodeWidth, 1);
 
     assert_eq!(correct_counts, counts);
 }
@@ -347,7 +347,7 @@ fn test_count_counts_lines() {
 
     // one more than grapheme clusters because of \r\n
     correct_counts.insert(Counter::CodePoints, 24);
-    correct_counts.insert(Counter::UnicodeWidth, 17);
+    correct_counts.insert(Counter::UnicodeWidth, 23);
 
     assert_eq!(correct_counts, counts);
 }

From 49fb5cb1a8103268d3ac519752ffc2ded1987a98 Mon Sep 17 00:00:00 2001
From: Dziuba Maksym <19823521+DziubaMaksym@users.noreply.github.com>
Date: Fri, 29 Nov 2024 16:06:14 +0200
Subject: [PATCH 0728/1072] fix: sample_config (#14465)

path to sample_config

crates/nu-utils/src/sample_config ->
crates/nu-utils/src/default_files/sample_config.nu

---------

Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 66988a104d..698a06e4f3 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ For details about which platforms the Nushell team actively supports, see [our p
 
 ## Configuration
 
-The default configurations can be found at [sample_config](crates/nu-utils/src/sample_config)
+The default configurations can be found at [sample_config](crates/nu-utils/src/default_files)
 which are the configuration files one gets when they startup Nushell for the first time.
 
 It sets all of the default configuration to run Nushell.  From here one can

From 5f04bbbb8bac490732fcfd297112a4e47bb2fbf5 Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Fri, 29 Nov 2024 15:45:27 -0500
Subject: [PATCH 0729/1072] Make length only operate on supported input types
 (#14475)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description


Before this PR, `length` did not check its input type at run-time, so it
would attempt to calculate a length for any input with indeterminate
type (e.g., `echo` which has an `any` output type). This PR makes
`length` only work on the types specifically supported in its
input/output types (list/table, binary, and nothing), making the
behavior the same at parse-time and at run-time.

Fixes #14462

# User-Facing Changes


Length will error if passed an unsupported type:

Before (only caught at parse-time):
```nushell
"hello" | length
Error: nu::parser::input_type_mismatch

  × Command does not support string input.
   ╭─[entry #2:1:11]
 1 │ "hello" | length
   ·           ───┬──
   ·              ╰── command doesn't support string input
   ╰────

echo "hello" | length
# => 1
```

After (caught at parse-time and run-time):
```nushell
"hello" | length
Error: nu::parser::input_type_mismatch

  × Command does not support string input.
   ╭─[entry #22:1:11]
 1 │ "hello" | length
   ·           ───┬──
   ·              ╰── command doesn't support string input
   ╰────

echo "hello" | length
Error: nu::shell::only_supports_this_input_type

  × Input type not supported.
   ╭─[entry #23:1:6]
 1 │ echo "hello" | length
   ·      ───┬───   ───┬──
   ·         │         ╰── only list, table, binary, and nothing input data is supported
   ·         ╰── input type: string
   ╰────
```
---
 crates/nu-command/src/filters/length.rs | 43 ++++++++++++-------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/crates/nu-command/src/filters/length.rs b/crates/nu-command/src/filters/length.rs
index 3d7b739ef2..b643c4dfea 100644
--- a/crates/nu-command/src/filters/length.rs
+++ b/crates/nu-command/src/filters/length.rs
@@ -19,6 +19,7 @@ impl Command for Length {
             .input_output_types(vec![
                 (Type::List(Box::new(Type::Any)), Type::Int),
                 (Type::Binary, Type::Int),
+                (Type::Nothing, Type::Int),
             ])
             .category(Category::Filters)
     }
@@ -54,6 +55,11 @@ impl Command for Length {
                 example: "0x[01 02] | length",
                 result: Some(Value::test_int(2)),
             },
+            Example {
+                description: "Count the length a null value",
+                example: "null | length",
+                result: Some(Value::test_int(0)),
+            },
         ]
     }
 }
@@ -61,23 +67,19 @@ impl Command for Length {
 fn length_row(call: &Call, input: PipelineData) -> Result<PipelineData, ShellError> {
     let span = input.span().unwrap_or(call.head);
     match input {
-        PipelineData::Value(Value::Nothing { .. }, ..) => {
+        PipelineData::Empty | PipelineData::Value(Value::Nothing { .. }, ..) => {
             Ok(Value::int(0, call.head).into_pipeline_data())
         }
-        // I added this here because input_output_type() wasn't catching a record
-        // being sent in as input from echo. e.g. "echo {a:1 b:2} | length"
-        PipelineData::Value(Value::Record { .. }, ..) => {
-            Err(ShellError::OnlySupportsThisInputType {
-                exp_input_type: "list, and table".into(),
-                wrong_type: "record".into(),
-                dst_span: call.head,
-                src_span: span,
-            })
-        }
         PipelineData::Value(Value::Binary { val, .. }, ..) => {
             Ok(Value::int(val.len() as i64, call.head).into_pipeline_data())
         }
-        PipelineData::ByteStream(stream, _) if stream.type_().is_binary_coercible() => {
+        PipelineData::Value(Value::List { vals, .. }, ..) => {
+            Ok(Value::int(vals.len() as i64, call.head).into_pipeline_data())
+        }
+        PipelineData::ListStream(stream, ..) => {
+            Ok(Value::int(stream.into_iter().count() as i64, call.head).into_pipeline_data())
+        }
+        PipelineData::ByteStream(stream, ..) if stream.type_().is_binary_coercible() => {
             Ok(Value::int(
                 match stream.reader() {
                     Some(r) => r.bytes().count() as i64,
@@ -87,17 +89,12 @@ fn length_row(call: &Call, input: PipelineData) -> Result<PipelineData, ShellErr
             )
             .into_pipeline_data())
         }
-        _ => {
-            let mut count: i64 = 0;
-            // Check for and propagate errors
-            for value in input.into_iter() {
-                if let Value::Error { error, .. } = value {
-                    return Err(*error);
-                }
-                count += 1
-            }
-            Ok(Value::int(count, call.head).into_pipeline_data())
-        }
+        _ => Err(ShellError::OnlySupportsThisInputType {
+            exp_input_type: "list, table, binary, and nothing".into(),
+            wrong_type: input.get_type().to_string(),
+            dst_span: call.head,
+            src_span: span,
+        }),
     }
 }
 

From 91bb566ee68f2c241ac0035965c3d589783e4151 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Fri, 29 Nov 2024 14:46:58 -0600
Subject: [PATCH 0730/1072] udpate rust toolchain to rust 1.81.0 (#14473)

# Description

With the release of rust 1.83.0 it's time to update to rust 1.81.0.
---
 Cargo.toml                                | 2 +-
 crates/nu-cli/src/util.rs                 | 2 ++
 crates/nu-parser/src/parse_patterns.rs    | 3 ++-
 crates/nu-parser/src/parse_shape_specs.rs | 2 ++
 crates/nu-parser/src/parser.rs            | 2 ++
 crates/nu-parser/tests/test_lex.rs        | 2 ++
 rust-toolchain.toml                       | 2 +-
 7 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 67c9e18c41..86d863f76c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ homepage = "https://www.nushell.sh"
 license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
-rust-version = "1.80.1"
+rust-version = "1.81.0"
 version = "0.100.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/crates/nu-cli/src/util.rs b/crates/nu-cli/src/util.rs
index 7b9d783534..50db15a68e 100644
--- a/crates/nu-cli/src/util.rs
+++ b/crates/nu-cli/src/util.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::byte_char_slices)]
+
 use nu_cmd_base::hook::eval_hook;
 use nu_engine::{eval_block, eval_block_with_early_return};
 use nu_parser::{lex, parse, unescape_unquote_string, Token, TokenContents};
diff --git a/crates/nu-parser/src/parse_patterns.rs b/crates/nu-parser/src/parse_patterns.rs
index dc4a64ce37..6f7cb62bc2 100644
--- a/crates/nu-parser/src/parse_patterns.rs
+++ b/crates/nu-parser/src/parse_patterns.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::byte_char_slices)]
+
 use crate::{
     lex, lite_parse,
     parser::{is_variable, parse_value},
@@ -7,7 +9,6 @@ use nu_protocol::{
     engine::StateWorkingSet,
     ParseError, Span, SyntaxShape, Type, VarId,
 };
-
 pub fn garbage(span: Span) -> MatchPattern {
     MatchPattern {
         pattern: Pattern::Garbage,
diff --git a/crates/nu-parser/src/parse_shape_specs.rs b/crates/nu-parser/src/parse_shape_specs.rs
index 2a59bb8a59..20d88554dc 100644
--- a/crates/nu-parser/src/parse_shape_specs.rs
+++ b/crates/nu-parser/src/parse_shape_specs.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::byte_char_slices)]
+
 use crate::{lex::lex_signature, parser::parse_value, trim_quotes, TokenContents};
 use nu_protocol::{engine::StateWorkingSet, ParseError, Span, SyntaxShape, Type};
 
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index d9f534cc60..b6f5fa161e 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::byte_char_slices)]
+
 use crate::{
     lex::{is_assignment_operator, lex, lex_n_tokens, lex_signature, LexState},
     lite_parser::{lite_parse, LiteCommand, LitePipeline, LiteRedirection, LiteRedirectionTarget},
diff --git a/crates/nu-parser/tests/test_lex.rs b/crates/nu-parser/tests/test_lex.rs
index 22fe4c4715..a14843f3f0 100644
--- a/crates/nu-parser/tests/test_lex.rs
+++ b/crates/nu-parser/tests/test_lex.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::byte_char_slices)]
+
 use nu_parser::{lex, lex_n_tokens, lex_signature, LexState, Token, TokenContents};
 use nu_protocol::{ParseError, Span};
 
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 183da649b8..99b3fdde4d 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -16,4 +16,4 @@ profile = "default"
 # use in nushell, we may opt to use the bleeding edge stable version of rust.
 # I believe rust is on a 6 week release cycle and nushell is on a 4 week release cycle.
 # So, every two nushell releases, this version number should be bumped by one.
-channel = "1.80.1"
+channel = "1.81.0"

From 6bc695f251558c11c2771cec6226d7b1bf0f1978 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Fri, 29 Nov 2024 13:11:09 -0800
Subject: [PATCH 0731/1072] Make `Hooks` fields non-optional to match the new
 config defaults (#14345)

# Description
Follow up to #14341. Changes the fields of `Hooks` to `Vec` or `Hashmap`
to match the new config defaults.

# User-Facing Changes
Mostly the same as #14341. `pre_prompt` and `pre_execution` must now be
a list, and `env_change` must be a record.
---
 crates/nu-cli/src/repl.rs                    | 31 ++++----
 crates/nu-cmd-base/src/hook.rs               | 77 +++++++++----------
 crates/nu-command/src/system/exec.rs         |  1 +
 crates/nu-command/src/system/run_external.rs | 21 +++--
 crates/nu-protocol/src/config/hooks.rs       | 80 +++++++++++++++-----
 src/test_bins.rs                             | 41 ++++------
 tests/hooks/mod.rs                           | 26 +++----
 7 files changed, 156 insertions(+), 121 deletions(-)

diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 5440f9caa2..4bd86ddbf9 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -16,7 +16,7 @@ use crate::{
 use crossterm::cursor::SetCursorStyle;
 use log::{error, trace, warn};
 use miette::{ErrReport, IntoDiagnostic, Result};
-use nu_cmd_base::{hook::eval_hook, util::get_editor};
+use nu_cmd_base::util::get_editor;
 use nu_color_config::StyleComputer;
 #[allow(deprecated)]
 use nu_engine::{convert_env_values, current_dir_str, env_to_strings};
@@ -313,20 +313,26 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
     perf!("reset signals", start_time, use_color);
 
     start_time = std::time::Instant::now();
-    // Right before we start our prompt and take input from the user,
-    // fire the "pre_prompt" hook
-    if let Some(hook) = engine_state.get_config().hooks.pre_prompt.clone() {
-        if let Err(err) = eval_hook(engine_state, &mut stack, None, vec![], &hook, "pre_prompt") {
-            report_shell_error(engine_state, &err);
-        }
+    // Right before we start our prompt and take input from the user, fire the "pre_prompt" hook
+    if let Err(err) = hook::eval_hooks(
+        engine_state,
+        &mut stack,
+        vec![],
+        &engine_state.get_config().hooks.pre_prompt.clone(),
+        "pre_prompt",
+    ) {
+        report_shell_error(engine_state, &err);
     }
     perf!("pre-prompt hook", start_time, use_color);
 
     start_time = std::time::Instant::now();
     // Next, check all the environment variables they ask for
     // fire the "env_change" hook
-    let env_change = engine_state.get_config().hooks.env_change.clone();
-    if let Err(error) = hook::eval_env_change_hook(env_change, engine_state, &mut stack) {
+    if let Err(error) = hook::eval_env_change_hook(
+        &engine_state.get_config().hooks.env_change.clone(),
+        engine_state,
+        &mut stack,
+    ) {
         report_shell_error(engine_state, &error)
     }
     perf!("env-change hook", start_time, use_color);
@@ -511,18 +517,17 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
 
             // Right before we start running the code the user gave us, fire the `pre_execution`
             // hook
-            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 = repl_cmd_line_text.to_string();
                 drop(repl);
 
-                if let Err(err) = eval_hook(
+                if let Err(err) = hook::eval_hooks(
                     engine_state,
                     &mut stack,
-                    None,
                     vec![],
-                    &hook,
+                    &engine_state.get_config().hooks.pre_execution.clone(),
                     "pre_execution",
                 ) {
                     report_shell_error(engine_state, &err);
diff --git a/crates/nu-cmd-base/src/hook.rs b/crates/nu-cmd-base/src/hook.rs
index 4983dbdc8f..bddf63f334 100644
--- a/crates/nu-cmd-base/src/hook.rs
+++ b/crates/nu-cmd-base/src/hook.rs
@@ -7,49 +7,55 @@ use nu_protocol::{
     engine::{Closure, EngineState, Stack, StateWorkingSet},
     PipelineData, PositionalArg, ShellError, Span, Type, Value, VarId,
 };
-use std::sync::Arc;
+use std::{collections::HashMap, sync::Arc};
 
 pub fn eval_env_change_hook(
-    env_change_hook: Option<Value>,
+    env_change_hook: &HashMap<String, Vec<Value>>,
     engine_state: &mut EngineState,
     stack: &mut Stack,
 ) -> Result<(), ShellError> {
-    if let Some(hook) = env_change_hook {
-        match hook {
-            Value::Record { val, .. } => {
-                for (env_name, hook_value) in &*val {
-                    let before = engine_state.previous_env_vars.get(env_name);
-                    let after = stack.get_env_var(engine_state, env_name);
-                    if before != after {
-                        let before = before.cloned().unwrap_or_default();
-                        let after = after.cloned().unwrap_or_default();
+    for (env, hooks) in env_change_hook {
+        let before = engine_state.previous_env_vars.get(env);
+        let after = stack.get_env_var(engine_state, env);
+        if before != after {
+            let before = before.cloned().unwrap_or_default();
+            let after = after.cloned().unwrap_or_default();
 
-                        eval_hook(
-                            engine_state,
-                            stack,
-                            None,
-                            vec![("$before".into(), before), ("$after".into(), after.clone())],
-                            hook_value,
-                            "env_change",
-                        )?;
+            eval_hooks(
+                engine_state,
+                stack,
+                vec![("$before".into(), before), ("$after".into(), after.clone())],
+                hooks,
+                "env_change",
+            )?;
 
-                        Arc::make_mut(&mut engine_state.previous_env_vars)
-                            .insert(env_name.clone(), after);
-                    }
-                }
-            }
-            x => {
-                return Err(ShellError::TypeMismatch {
-                    err_message: "record for the 'env_change' hook".to_string(),
-                    span: x.span(),
-                });
-            }
+            Arc::make_mut(&mut engine_state.previous_env_vars).insert(env.clone(), after);
         }
     }
 
     Ok(())
 }
 
+pub fn eval_hooks(
+    engine_state: &mut EngineState,
+    stack: &mut Stack,
+    arguments: Vec<(String, Value)>,
+    hooks: &[Value],
+    hook_name: &str,
+) -> Result<(), ShellError> {
+    for hook in hooks {
+        eval_hook(
+            engine_state,
+            stack,
+            None,
+            arguments.clone(),
+            hook,
+            &format!("{hook_name} list, recursive"),
+        )?;
+    }
+    Ok(())
+}
+
 pub fn eval_hook(
     engine_state: &mut EngineState,
     stack: &mut Stack,
@@ -127,16 +133,7 @@ pub fn eval_hook(
             }
         }
         Value::List { vals, .. } => {
-            for val in vals {
-                eval_hook(
-                    engine_state,
-                    stack,
-                    None,
-                    arguments.clone(),
-                    val,
-                    &format!("{hook_name} list, recursive"),
-                )?;
-            }
+            eval_hooks(engine_state, stack, arguments, vals, hook_name)?;
         }
         Value::Record { val, .. } => {
             // Hooks can optionally be a record in this form:
diff --git a/crates/nu-command/src/system/exec.rs b/crates/nu-command/src/system/exec.rs
index 7bf9daecc9..8a2b24a113 100644
--- a/crates/nu-command/src/system/exec.rs
+++ b/crates/nu-command/src/system/exec.rs
@@ -45,6 +45,7 @@ On Windows based systems, Nushell will wait for the command to finish and then e
                     call.head,
                     engine_state,
                     stack,
+                    &cwd,
                 ));
             };
             executable
diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index ffb34bf077..148aa2b20d 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -1,6 +1,6 @@
 use nu_cmd_base::hook::eval_hook;
 use nu_engine::{command_prelude::*, env_to_strings, get_eval_expression};
-use nu_path::{dots::expand_ndots, expand_tilde};
+use nu_path::{dots::expand_ndots, expand_tilde, AbsolutePath};
 use nu_protocol::{did_you_mean, process::ChildProcess, ByteStream, NuGlob, OutDest, Signals};
 use nu_system::ForegroundChild;
 use nu_utils::IgnoreCaseExt;
@@ -126,7 +126,13 @@ impl Command for External {
             // effect if it's an absolute path already
             let paths = nu_engine::env::path_str(engine_state, stack, call.head)?;
             let Some(executable) = which(&expanded_name, &paths, cwd.as_ref()) else {
-                return Err(command_not_found(&name_str, call.head, engine_state, stack));
+                return Err(command_not_found(
+                    &name_str,
+                    call.head,
+                    engine_state,
+                    stack,
+                    &cwd,
+                ));
             };
             executable
         };
@@ -433,6 +439,7 @@ pub fn command_not_found(
     span: Span,
     engine_state: &EngineState,
     stack: &mut Stack,
+    cwd: &AbsolutePath,
 ) -> ShellError {
     // Run the `command_not_found` hook if there is one.
     if let Some(hook) = &stack.get_config(engine_state).hooks.command_not_found {
@@ -543,12 +550,12 @@ pub fn command_not_found(
     }
 
     // If we find a file, it's likely that the user forgot to set permissions
-    if Path::new(name).is_file() {
+    if cwd.join(name).is_file() {
         return ShellError::ExternalCommand {
-                        label: format!("Command `{name}` not found"),
-                        help: format!("`{name}` refers to a file that is not executable. Did you forget to set execute permissions?"),
-                        span,
-                    };
+            label: format!("Command `{name}` not found"),
+            help: format!("`{name}` refers to a file that is not executable. Did you forget to set execute permissions?"),
+            span,
+        };
     }
 
     // We found nothing useful. Give up and return a generic error message.
diff --git a/crates/nu-protocol/src/config/hooks.rs b/crates/nu-protocol/src/config/hooks.rs
index 374b3818d6..97d4aa759b 100644
--- a/crates/nu-protocol/src/config/hooks.rs
+++ b/crates/nu-protocol/src/config/hooks.rs
@@ -1,13 +1,13 @@
 use super::prelude::*;
 use crate as nu_protocol;
-use crate::Record;
+use std::collections::HashMap;
 
 /// Definition of a parsed hook from the config object
 #[derive(Clone, Debug, IntoValue, PartialEq, Serialize, Deserialize)]
 pub struct Hooks {
-    pub pre_prompt: Option<Value>,
-    pub pre_execution: Option<Value>,
-    pub env_change: Option<Value>,
+    pub pre_prompt: Vec<Value>,
+    pub pre_execution: Vec<Value>,
+    pub env_change: HashMap<String, Vec<Value>>,
     pub display_output: Option<Value>,
     pub command_not_found: Option<Value>,
 }
@@ -15,14 +15,14 @@ pub struct Hooks {
 impl Hooks {
     pub fn new() -> Self {
         Self {
-            pre_prompt: Some(Value::list(vec![], Span::unknown())),
-            pre_execution: Some(Value::list(vec![], Span::unknown())),
-            env_change: Some(Value::record(Record::default(), Span::unknown())),
+            pre_prompt: Vec::new(),
+            pre_execution: Vec::new(),
+            env_change: HashMap::new(),
             display_output: Some(Value::string(
                 "if (term size).columns >= 100 { table -e } else { table }",
                 Span::unknown(),
             )),
-            command_not_found: Some(Value::list(vec![], Span::unknown())),
+            command_not_found: None,
         }
     }
 }
@@ -40,14 +40,6 @@ impl UpdateFromValue for Hooks {
         path: &mut ConfigPath<'a>,
         errors: &mut ConfigErrors,
     ) {
-        fn update_option(field: &mut Option<Value>, value: &Value) {
-            if value.is_nothing() {
-                *field = None;
-            } else {
-                *field = Some(value.clone());
-            }
-        }
-
         let Value::Record { val: record, .. } = value else {
             errors.type_mismatch(path, Type::record(), value);
             return;
@@ -56,11 +48,57 @@ impl UpdateFromValue for Hooks {
         for (col, val) in record.iter() {
             let path = &mut path.push(col);
             match col.as_str() {
-                "pre_prompt" => update_option(&mut self.pre_prompt, val),
-                "pre_execution" => update_option(&mut self.pre_execution, val),
-                "env_change" => update_option(&mut self.env_change, val),
-                "display_output" => update_option(&mut self.display_output, val),
-                "command_not_found" => update_option(&mut self.command_not_found, val),
+                "pre_prompt" => {
+                    if let Ok(hooks) = val.as_list() {
+                        self.pre_prompt = hooks.into()
+                    } else {
+                        errors.type_mismatch(path, Type::list(Type::Any), val);
+                    }
+                }
+                "pre_execution" => {
+                    if let Ok(hooks) = val.as_list() {
+                        self.pre_execution = hooks.into()
+                    } else {
+                        errors.type_mismatch(path, Type::list(Type::Any), val);
+                    }
+                }
+                "env_change" => {
+                    if let Ok(record) = val.as_record() {
+                        self.env_change = record
+                            .iter()
+                            .map(|(key, val)| {
+                                let old = self.env_change.remove(key).unwrap_or_default();
+                                let new = if let Ok(hooks) = val.as_list() {
+                                    hooks.into()
+                                } else {
+                                    errors.type_mismatch(
+                                        &path.push(key),
+                                        Type::list(Type::Any),
+                                        val,
+                                    );
+                                    old
+                                };
+                                (key.as_str().into(), new)
+                            })
+                            .collect();
+                    } else {
+                        errors.type_mismatch(path, Type::record(), val);
+                    }
+                }
+                "display_output" => {
+                    self.display_output = if val.is_nothing() {
+                        None
+                    } else {
+                        Some(val.clone())
+                    }
+                }
+                "command_not_found" => {
+                    self.command_not_found = if val.is_nothing() {
+                        None
+                    } else {
+                        Some(val.clone())
+                    }
+                }
                 _ => errors.unknown_option(path, val),
             }
         }
diff --git a/src/test_bins.rs b/src/test_bins.rs
index 7e684d5794..d31fd07c57 100644
--- a/src/test_bins.rs
+++ b/src/test_bins.rs
@@ -1,4 +1,4 @@
-use nu_cmd_base::hook::{eval_env_change_hook, eval_hook};
+use nu_cmd_base::hook::{eval_env_change_hook, eval_hooks};
 use nu_engine::eval_block;
 use nu_parser::parse;
 use nu_protocol::{
@@ -250,24 +250,14 @@ pub fn nu_repl() {
         }
 
         // Check for pre_prompt hook
-        let config = engine_state.get_config();
-        if let Some(hook) = config.hooks.pre_prompt.clone() {
-            if let Err(err) = eval_hook(
-                &mut engine_state,
-                &mut stack,
-                None,
-                vec![],
-                &hook,
-                "pre_prompt",
-            ) {
-                outcome_err(&engine_state, &err);
-            }
+        let hook = engine_state.get_config().hooks.pre_prompt.clone();
+        if let Err(err) = eval_hooks(&mut engine_state, &mut stack, vec![], &hook, "pre_prompt") {
+            outcome_err(&engine_state, &err);
         }
 
         // Check for env change hook
-        let config = engine_state.get_config();
         if let Err(err) = eval_env_change_hook(
-            config.hooks.env_change.clone(),
+            &engine_state.get_config().hooks.env_change.clone(),
             &mut engine_state,
             &mut stack,
         ) {
@@ -275,7 +265,6 @@ pub fn nu_repl() {
         }
 
         // Check for pre_execution hook
-        let config = engine_state.get_config();
 
         engine_state
             .repl_state
@@ -283,17 +272,15 @@ pub fn nu_repl() {
             .expect("repl state mutex")
             .buffer = line.to_string();
 
-        if let Some(hook) = config.hooks.pre_execution.clone() {
-            if let Err(err) = eval_hook(
-                &mut engine_state,
-                &mut stack,
-                None,
-                vec![],
-                &hook,
-                "pre_execution",
-            ) {
-                outcome_err(&engine_state, &err);
-            }
+        let hook = engine_state.get_config().hooks.pre_execution.clone();
+        if let Err(err) = eval_hooks(
+            &mut engine_state,
+            &mut stack,
+            vec![],
+            &hook,
+            "pre_execution",
+        ) {
+            outcome_err(&engine_state, &err);
         }
 
         // Eval the REPL line
diff --git a/tests/hooks/mod.rs b/tests/hooks/mod.rs
index 4fc7490106..0fed2831ec 100644
--- a/tests/hooks/mod.rs
+++ b/tests/hooks/mod.rs
@@ -28,7 +28,7 @@ fn env_change_hook(name: &str, code: &str) -> String {
         "$env.config = {{
             hooks: {{
                 env_change: {{
-                    {name} : {code}
+                    {name}: [{code}]
                 }}
             }}
         }}"
@@ -40,9 +40,9 @@ fn env_change_hook_code(name: &str, code: &str) -> String {
         "$env.config = {{
             hooks: {{
                 env_change: {{
-                    {name} : {{
+                    {name}: [{{
                         code: {code}
-                    }}
+                    }}]
                 }}
             }}
         }}"
@@ -54,10 +54,10 @@ fn env_change_hook_code_condition(name: &str, condition: &str, code: &str) -> St
         "$env.config = {{
             hooks: {{
                 env_change: {{
-                    {name} : {{
+                    {name}: [{{
                         condition: {condition}
                         code: {code}
-                    }}
+                    }}]
                 }}
             }}
         }}"
@@ -68,7 +68,7 @@ fn pre_prompt_hook(code: &str) -> String {
     format!(
         "$env.config = {{
             hooks: {{
-                pre_prompt: {code}
+                pre_prompt: [{code}]
             }}
         }}"
     )
@@ -78,9 +78,9 @@ fn pre_prompt_hook_code(code: &str) -> String {
     format!(
         "$env.config = {{
             hooks: {{
-                pre_prompt: {{
+                pre_prompt: [{{
                     code: {code}
-                }}
+                }}]
             }}
         }}"
     )
@@ -90,7 +90,7 @@ fn pre_execution_hook(code: &str) -> String {
     format!(
         "$env.config = {{
             hooks: {{
-                pre_execution: {code}
+                pre_execution: [{code}]
             }}
         }}"
     )
@@ -100,9 +100,9 @@ fn pre_execution_hook_code(code: &str) -> String {
     format!(
         "$env.config = {{
             hooks: {{
-                pre_execution: {{
+                pre_execution: [{{
                     code: {code}
-                }}
+                }}]
             }}
         }}"
     )
@@ -536,9 +536,9 @@ fn err_hook_parse_error() {
         r#"$env.config = {
             hooks: {
                 env_change: {
-                    FOO : {
+                    FOO: [{
                         code: "def foo { 'foo' }"
-                    }
+                    }]
                 }
             }
         }"#,

From acca56f77ca65f66144b1fbdc47e736ee4f50ee3 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Fri, 29 Nov 2024 22:23:40 +0100
Subject: [PATCH 0732/1072] Remove unused `FlatShape`s `And`/`Or` (#14476)

# Description
This removes the need for the `shape_and` and `shape_or` entries in the
themes. We did not color those underlying FlatShapes or operators
differently.

Closes #14372
# User-Facing Changes
Our theme handling currently doesn't reject invalid entries so should
not cause an error. The non-functional nature was already documented.
---
 crates/nu-cli/src/syntax_highlight.rs               | 2 --
 crates/nu-color-config/src/shape_color.rs           | 2 --
 crates/nu-lsp/src/lib.rs                            | 1 -
 crates/nu-parser/src/flatten.rs                     | 4 ----
 crates/nu-std/std/config/mod.nu                     | 6 +-----
 crates/nu-utils/src/default_files/default_config.nu | 4 +---
 crates/nu-utils/src/default_files/sample_config.nu  | 5 -----
 7 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/crates/nu-cli/src/syntax_highlight.rs b/crates/nu-cli/src/syntax_highlight.rs
index ebd8315190..b8f7abe0c5 100644
--- a/crates/nu-cli/src/syntax_highlight.rs
+++ b/crates/nu-cli/src/syntax_highlight.rs
@@ -144,8 +144,6 @@ impl Highlighter for NuHighlighter {
                 }
                 FlatShape::Flag => add_colored_token(&shape.1, next_token),
                 FlatShape::Pipe => add_colored_token(&shape.1, next_token),
-                FlatShape::And => add_colored_token(&shape.1, next_token),
-                FlatShape::Or => add_colored_token(&shape.1, next_token),
                 FlatShape::Redirection => add_colored_token(&shape.1, next_token),
                 FlatShape::Custom(..) => add_colored_token(&shape.1, next_token),
                 FlatShape::MatchPattern => add_colored_token(&shape.1, next_token),
diff --git a/crates/nu-color-config/src/shape_color.rs b/crates/nu-color-config/src/shape_color.rs
index 8da397e914..190d44525d 100644
--- a/crates/nu-color-config/src/shape_color.rs
+++ b/crates/nu-color-config/src/shape_color.rs
@@ -5,7 +5,6 @@ use nu_protocol::{Config, Value};
 // The default colors for shapes, used when there is no config for them.
 pub fn default_shape_color(shape: &str) -> Style {
     match shape {
-        "shape_and" => Style::new().fg(Color::Purple).bold(),
         "shape_binary" => Style::new().fg(Color::Purple).bold(),
         "shape_block" => Style::new().fg(Color::Blue).bold(),
         "shape_bool" => Style::new().fg(Color::LightCyan),
@@ -30,7 +29,6 @@ pub fn default_shape_color(shape: &str) -> Style {
         "shape_match_pattern" => Style::new().fg(Color::Green),
         "shape_nothing" => Style::new().fg(Color::LightCyan),
         "shape_operator" => Style::new().fg(Color::Yellow),
-        "shape_or" => Style::new().fg(Color::Purple).bold(),
         "shape_pipe" => Style::new().fg(Color::Purple).bold(),
         "shape_range" => Style::new().fg(Color::Yellow).bold(),
         "shape_raw_string" => Style::new().fg(Color::LightMagenta).bold(),
diff --git a/crates/nu-lsp/src/lib.rs b/crates/nu-lsp/src/lib.rs
index 0fe100c6b4..d5a4938615 100644
--- a/crates/nu-lsp/src/lib.rs
+++ b/crates/nu-lsp/src/lib.rs
@@ -576,7 +576,6 @@ impl LanguageServer {
             }
             Id::Value(shape) => {
                 let hover = String::from(match shape {
-                    FlatShape::And => "and",
                     FlatShape::Binary => "binary",
                     FlatShape::Block => "block",
                     FlatShape::Bool => "bool",
diff --git a/crates/nu-parser/src/flatten.rs b/crates/nu-parser/src/flatten.rs
index 2f71ccea28..318ae00ffd 100644
--- a/crates/nu-parser/src/flatten.rs
+++ b/crates/nu-parser/src/flatten.rs
@@ -11,7 +11,6 @@ use std::fmt::{Display, Formatter, Result};
 
 #[derive(Debug, Eq, PartialEq, Ord, Clone, PartialOrd)]
 pub enum FlatShape {
-    And,
     Binary,
     Block,
     Bool,
@@ -36,7 +35,6 @@ pub enum FlatShape {
     MatchPattern,
     Nothing,
     Operator,
-    Or,
     Pipe,
     Range,
     RawString,
@@ -53,7 +51,6 @@ pub enum FlatShape {
 impl FlatShape {
     pub fn as_str(&self) -> &str {
         match self {
-            FlatShape::And => "shape_and",
             FlatShape::Binary => "shape_binary",
             FlatShape::Block => "shape_block",
             FlatShape::Bool => "shape_bool",
@@ -78,7 +75,6 @@ impl FlatShape {
             FlatShape::MatchPattern => "shape_match_pattern",
             FlatShape::Nothing => "shape_nothing",
             FlatShape::Operator => "shape_operator",
-            FlatShape::Or => "shape_or",
             FlatShape::Pipe => "shape_pipe",
             FlatShape::Range => "shape_range",
             FlatShape::RawString => "shape_raw_string",
diff --git a/crates/nu-std/std/config/mod.nu b/crates/nu-std/std/config/mod.nu
index b73964e8d3..9b00db60db 100644
--- a/crates/nu-std/std/config/mod.nu
+++ b/crates/nu-std/std/config/mod.nu
@@ -26,7 +26,6 @@ export def dark-theme [] {
         block: white
         hints: dark_gray
         search_result: { bg: red fg: white }
-        shape_and: purple_bold
         shape_binary: purple_bold
         shape_block: blue_bold
         shape_bool: light_cyan
@@ -53,7 +52,6 @@ export def dark-theme [] {
         shape_matching_brackets: { attr: u }
         shape_nothing: light_cyan
         shape_operator: yellow
-        shape_or: purple_bold
         shape_pipe: purple_bold
         shape_range: yellow_bold
         shape_record: cyan_bold
@@ -96,7 +94,6 @@ export def light-theme [] {
         block: dark_gray
         hints: dark_gray
         search_result: { fg: white bg: red }
-        shape_and: purple_bold
         shape_binary: purple_bold
         shape_block: blue_bold
         shape_bool: light_cyan
@@ -123,7 +120,6 @@ export def light-theme [] {
         shape_matching_brackets: { attr: u }
         shape_nothing: light_cyan
         shape_operator: yellow
-        shape_or: purple_bold
         shape_pipe: purple_bold
         shape_range: yellow_bold
         shape_record: cyan_bold
@@ -136,4 +132,4 @@ export def light-theme [] {
         shape_vardecl: purple
         shape_raw_string: light_purple
     }
-}
\ No newline at end of file
+}
diff --git a/crates/nu-utils/src/default_files/default_config.nu b/crates/nu-utils/src/default_files/default_config.nu
index d95f4b3f97..dcefb70fff 100644
--- a/crates/nu-utils/src/default_files/default_config.nu
+++ b/crates/nu-utils/src/default_files/default_config.nu
@@ -23,7 +23,6 @@ $env.config.color_config = {
     block: white
     hints: dark_gray
     search_result: { bg: red fg: white }
-    shape_and: purple_bold
     shape_binary: purple_bold
     shape_block: blue_bold
     shape_bool: light_cyan
@@ -48,7 +47,6 @@ $env.config.color_config = {
     shape_matching_brackets: { attr: u }
     shape_nothing: light_cyan
     shape_operator: yellow
-    shape_or: purple_bold
     shape_pipe: purple_bold
     shape_range: yellow_bold
     shape_record: cyan_bold
@@ -60,4 +58,4 @@ $env.config.color_config = {
     shape_variable: purple
     shape_vardecl: purple
     shape_raw_string: light_purple
-}
\ No newline at end of file
+}
diff --git a/crates/nu-utils/src/default_files/sample_config.nu b/crates/nu-utils/src/default_files/sample_config.nu
index 5a8181506c..143e56aae4 100644
--- a/crates/nu-utils/src/default_files/sample_config.nu
+++ b/crates/nu-utils/src/default_files/sample_config.nu
@@ -632,11 +632,6 @@ $env.config.color_config.shape_glob_interpolation
 # an expression is not (yet) properly closed.
 $env.config.color_config.shape_garbage
 
-# shape_or and shape_and: The and and or operators.
-# Note: Not currently implemented.
-$env.config.color_config.shape_or
-$env.config.color_config.shape_and
-
 # shape_variable: The *use* of a variable. E.g., `$env` or `$a`.
 $env.config.color_config.shape_variable
 

From 7f61cbbfd673dcd5e7434dd56b9d86561485a1c5 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Fri, 29 Nov 2024 13:24:17 -0800
Subject: [PATCH 0733/1072] Add `Filesize` type (#14369)

# Description
Adds a new `Filesize` type so that `FromValue` can be used to convert a
`Value::Filesize` to a `Filesize`. Currently, to extract a filesize from
a `Value` using `FromValue`, you have to extract an `i64` which coerces
`Value::Int`, `Value::Duration`, and `Value::Filesize` to an `i64`.

Having a separate type also allows us to enforce checked math to catch
overflows. Similarly, it allows us to specify other trait
implementations like `Display` in a common place.

# User-Facing Changes
Multiplication with filesizes now error on overflow. Should not be a
breaking change for plugins (i.e., serialization) since `Filesize` is
marked with `serde(transparent)`.

# Tests + Formatting
Updated some tests.
---
 crates/nu-cmd-extra/src/extra/bits/into.rs    |   2 +-
 .../nu-cmd-extra/src/extra/conversions/fmt.rs |   2 +-
 .../nu-command/src/charting/hashable_value.rs |   9 +-
 crates/nu-command/src/conversions/fill.rs     |   2 +-
 .../nu-command/src/conversions/into/binary.rs |   2 +-
 crates/nu-command/src/conversions/into/int.rs |   2 +-
 .../nu-command/src/database/values/sqlite.rs  |   2 +-
 crates/nu-command/src/formats/to/json.rs      |   2 +-
 crates/nu-command/src/formats/to/msgpack.rs   |   2 +-
 crates/nu-command/src/formats/to/toml.rs      |   2 +-
 crates/nu-command/src/formats/to/yaml.rs      |   4 +-
 crates/nu-command/src/math/avg.rs             |   2 +-
 crates/nu-command/src/math/mode.rs            |   7 +-
 crates/nu-command/src/random/binary.rs        |  24 +-
 crates/nu-command/src/random/chars.rs         |  30 +-
 .../tests/format_conversions/nuon.rs          |   6 +-
 crates/nu-parser/src/parser.rs                |  80 +++-
 crates/nu-protocol/src/ast/unit.rs            |  59 +--
 crates/nu-protocol/src/ir/mod.rs              |   8 +-
 crates/nu-protocol/src/value/filesize.rs      | 448 +++++++++++++++++-
 crates/nu-protocol/src/value/from_value.rs    |   6 +-
 crates/nu-protocol/src/value/mod.rs           | 391 ++++++++-------
 crates/nu_plugin_formats/src/to/plist.rs      |  12 +-
 crates/nuon/src/from.rs                       |  39 +-
 crates/nuon/src/lib.rs                        |   2 +-
 crates/nuon/src/to.rs                         |   4 +-
 26 files changed, 827 insertions(+), 322 deletions(-)

diff --git a/crates/nu-cmd-extra/src/extra/bits/into.rs b/crates/nu-cmd-extra/src/extra/bits/into.rs
index 7edc8d3584..3452c1eeee 100644
--- a/crates/nu-cmd-extra/src/extra/bits/into.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/into.rs
@@ -203,7 +203,7 @@ pub fn action(input: &Value, _args: &Arguments, span: Span) -> Value {
             Value::string(raw_string.trim(), span)
         }
         Value::Int { val, .. } => convert_to_smallest_number_type(*val, span),
-        Value::Filesize { val, .. } => convert_to_smallest_number_type(*val, span),
+        Value::Filesize { val, .. } => convert_to_smallest_number_type(val.get(), span),
         Value::Duration { val, .. } => convert_to_smallest_number_type(*val, span),
         Value::String { val, .. } => {
             let raw_bytes = val.as_bytes();
diff --git a/crates/nu-cmd-extra/src/extra/conversions/fmt.rs b/crates/nu-cmd-extra/src/extra/conversions/fmt.rs
index 15ca742c76..5bf2ae47a4 100644
--- a/crates/nu-cmd-extra/src/extra/conversions/fmt.rs
+++ b/crates/nu-cmd-extra/src/extra/conversions/fmt.rs
@@ -66,7 +66,7 @@ fn action(input: &Value, _args: &CellPathOnlyArgs, span: Span) -> Value {
     match input {
         Value::Float { val, .. } => fmt_it_64(*val, span),
         Value::Int { val, .. } => fmt_it(*val, span),
-        Value::Filesize { val, .. } => fmt_it(*val, span),
+        Value::Filesize { val, .. } => fmt_it(val.get(), span),
         // Propagate errors by explicitly matching them before the final case.
         Value::Error { .. } => input.clone(),
         other => Value::error(
diff --git a/crates/nu-command/src/charting/hashable_value.rs b/crates/nu-command/src/charting/hashable_value.rs
index b74b5f7761..636f5b7a05 100644
--- a/crates/nu-command/src/charting/hashable_value.rs
+++ b/crates/nu-command/src/charting/hashable_value.rs
@@ -1,5 +1,5 @@
 use chrono::{DateTime, FixedOffset};
-use nu_protocol::{ShellError, Span, Value};
+use nu_protocol::{Filesize, ShellError, Span, Value};
 use std::hash::{Hash, Hasher};
 
 /// A subset of [`Value`], which is hashable.
@@ -30,7 +30,7 @@ pub enum HashableValue {
         span: Span,
     },
     Filesize {
-        val: i64,
+        val: Filesize,
         span: Span,
     },
     Duration {
@@ -198,7 +198,10 @@ mod test {
             (Value::int(1, span), HashableValue::Int { val: 1, span }),
             (
                 Value::filesize(1, span),
-                HashableValue::Filesize { val: 1, span },
+                HashableValue::Filesize {
+                    val: 1.into(),
+                    span,
+                },
             ),
             (
                 Value::duration(1, span),
diff --git a/crates/nu-command/src/conversions/fill.rs b/crates/nu-command/src/conversions/fill.rs
index d125ee29b2..65d6b20b22 100644
--- a/crates/nu-command/src/conversions/fill.rs
+++ b/crates/nu-command/src/conversions/fill.rs
@@ -167,7 +167,7 @@ fn fill(
 fn action(input: &Value, args: &Arguments, span: Span) -> Value {
     match input {
         Value::Int { val, .. } => fill_int(*val, args, span),
-        Value::Filesize { val, .. } => fill_int(*val, args, span),
+        Value::Filesize { val, .. } => fill_int(val.get(), args, span),
         Value::Float { val, .. } => fill_float(*val, args, span),
         Value::String { val, .. } => fill_string(val, args, span),
         // Propagate errors by explicitly matching them before the final case.
diff --git a/crates/nu-command/src/conversions/into/binary.rs b/crates/nu-command/src/conversions/into/binary.rs
index d82f911506..fb549e50a7 100644
--- a/crates/nu-command/src/conversions/into/binary.rs
+++ b/crates/nu-command/src/conversions/into/binary.rs
@@ -147,7 +147,7 @@ pub fn action(input: &Value, _args: &Arguments, span: Span) -> Value {
         Value::Binary { .. } => input.clone(),
         Value::Int { val, .. } => Value::binary(val.to_ne_bytes().to_vec(), span),
         Value::Float { val, .. } => Value::binary(val.to_ne_bytes().to_vec(), span),
-        Value::Filesize { val, .. } => Value::binary(val.to_ne_bytes().to_vec(), span),
+        Value::Filesize { val, .. } => Value::binary(val.get().to_ne_bytes().to_vec(), span),
         Value::String { val, .. } => Value::binary(val.as_bytes().to_vec(), span),
         Value::Bool { val, .. } => Value::binary(i64::from(*val).to_ne_bytes().to_vec(), span),
         Value::Duration { val, .. } => Value::binary(val.to_ne_bytes().to_vec(), span),
diff --git a/crates/nu-command/src/conversions/into/int.rs b/crates/nu-command/src/conversions/into/int.rs
index f55770e7ff..67cba23090 100644
--- a/crates/nu-command/src/conversions/into/int.rs
+++ b/crates/nu-command/src/conversions/into/int.rs
@@ -253,7 +253,7 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
                 convert_int(input, span, radix)
             }
         }
-        Value::Filesize { val, .. } => Value::int(*val, span),
+        Value::Filesize { val, .. } => Value::int(val.get(), span),
         Value::Float { val, .. } => Value::int(
             {
                 if radix == 10 {
diff --git a/crates/nu-command/src/database/values/sqlite.rs b/crates/nu-command/src/database/values/sqlite.rs
index 5d0f7d1fe3..620ac95324 100644
--- a/crates/nu-command/src/database/values/sqlite.rs
+++ b/crates/nu-command/src/database/values/sqlite.rs
@@ -421,7 +421,7 @@ pub fn value_to_sql(value: Value) -> Result<Box<dyn rusqlite::ToSql>, ShellError
         Value::Bool { val, .. } => Box::new(val),
         Value::Int { val, .. } => Box::new(val),
         Value::Float { val, .. } => Box::new(val),
-        Value::Filesize { val, .. } => Box::new(val),
+        Value::Filesize { val, .. } => Box::new(val.get()),
         Value::Duration { val, .. } => Box::new(val),
         Value::Date { val, .. } => Box::new(val),
         Value::String { val, .. } => Box::new(val),
diff --git a/crates/nu-command/src/formats/to/json.rs b/crates/nu-command/src/formats/to/json.rs
index 9e68961092..27c0af856a 100644
--- a/crates/nu-command/src/formats/to/json.rs
+++ b/crates/nu-command/src/formats/to/json.rs
@@ -109,7 +109,7 @@ pub fn value_to_json_value(v: &Value) -> Result<nu_json::Value, ShellError> {
     let span = v.span();
     Ok(match v {
         Value::Bool { val, .. } => nu_json::Value::Bool(*val),
-        Value::Filesize { val, .. } => nu_json::Value::I64(*val),
+        Value::Filesize { val, .. } => nu_json::Value::I64(val.get()),
         Value::Duration { val, .. } => nu_json::Value::I64(*val),
         Value::Date { val, .. } => nu_json::Value::String(val.to_string()),
         Value::Float { val, .. } => nu_json::Value::F64(*val),
diff --git a/crates/nu-command/src/formats/to/msgpack.rs b/crates/nu-command/src/formats/to/msgpack.rs
index 537aa9efdb..f7c4c7df3d 100644
--- a/crates/nu-command/src/formats/to/msgpack.rs
+++ b/crates/nu-command/src/formats/to/msgpack.rs
@@ -168,7 +168,7 @@ pub(crate) fn write_value(
             mp::write_f64(out, *val).err_span(span)?;
         }
         Value::Filesize { val, .. } => {
-            mp::write_sint(out, *val).err_span(span)?;
+            mp::write_sint(out, val.get()).err_span(span)?;
         }
         Value::Duration { val, .. } => {
             mp::write_sint(out, *val).err_span(span)?;
diff --git a/crates/nu-command/src/formats/to/toml.rs b/crates/nu-command/src/formats/to/toml.rs
index 9e5728ef1e..5f28284904 100644
--- a/crates/nu-command/src/formats/to/toml.rs
+++ b/crates/nu-command/src/formats/to/toml.rs
@@ -47,7 +47,7 @@ fn helper(engine_state: &EngineState, v: &Value) -> Result<toml::Value, ShellErr
     Ok(match &v {
         Value::Bool { val, .. } => toml::Value::Boolean(*val),
         Value::Int { val, .. } => toml::Value::Integer(*val),
-        Value::Filesize { val, .. } => toml::Value::Integer(*val),
+        Value::Filesize { val, .. } => toml::Value::Integer(val.get()),
         Value::Duration { val, .. } => toml::Value::String(val.to_string()),
         Value::Date { val, .. } => toml::Value::Datetime(to_toml_datetime(val)),
         Value::Range { .. } => toml::Value::String("<Range>".to_string()),
diff --git a/crates/nu-command/src/formats/to/yaml.rs b/crates/nu-command/src/formats/to/yaml.rs
index 73c743a056..4fc4e62319 100644
--- a/crates/nu-command/src/formats/to/yaml.rs
+++ b/crates/nu-command/src/formats/to/yaml.rs
@@ -44,7 +44,9 @@ pub fn value_to_yaml_value(v: &Value) -> Result<serde_yaml::Value, ShellError> {
     Ok(match &v {
         Value::Bool { val, .. } => serde_yaml::Value::Bool(*val),
         Value::Int { val, .. } => serde_yaml::Value::Number(serde_yaml::Number::from(*val)),
-        Value::Filesize { val, .. } => serde_yaml::Value::Number(serde_yaml::Number::from(*val)),
+        Value::Filesize { val, .. } => {
+            serde_yaml::Value::Number(serde_yaml::Number::from(val.get()))
+        }
         Value::Duration { val, .. } => serde_yaml::Value::String(val.to_string()),
         Value::Date { val, .. } => serde_yaml::Value::String(val.to_string()),
         Value::Range { .. } => serde_yaml::Value::Null,
diff --git a/crates/nu-command/src/math/avg.rs b/crates/nu-command/src/math/avg.rs
index 07e2ed00bf..a7f6d3088a 100644
--- a/crates/nu-command/src/math/avg.rs
+++ b/crates/nu-command/src/math/avg.rs
@@ -90,7 +90,7 @@ pub fn average(values: &[Value], span: Span, head: Span) -> Result<Value, ShellE
     let total = &sum(Value::int(0, head), values.to_vec(), span, head)?;
     let span = total.span();
     match total {
-        Value::Filesize { val, .. } => Ok(Value::filesize(val / values.len() as i64, span)),
+        Value::Filesize { val, .. } => Ok(Value::filesize(val.get() / values.len() as i64, span)),
         Value::Duration { val, .. } => Ok(Value::duration(val / values.len() as i64, span)),
         _ => total.div(head, &Value::int(values.len() as i64, head), head),
     }
diff --git a/crates/nu-command/src/math/mode.rs b/crates/nu-command/src/math/mode.rs
index b89896ca88..cf4ae36b2d 100644
--- a/crates/nu-command/src/math/mode.rs
+++ b/crates/nu-command/src/math/mode.rs
@@ -142,9 +142,10 @@ pub fn mode(values: &[Value], _span: Span, head: Span) -> Result<Value, ShellErr
             Value::Float { val, .. } => {
                 Ok(HashableType::new(val.to_ne_bytes(), NumberTypes::Float))
             }
-            Value::Filesize { val, .. } => {
-                Ok(HashableType::new(val.to_ne_bytes(), NumberTypes::Filesize))
-            }
+            Value::Filesize { val, .. } => Ok(HashableType::new(
+                val.get().to_ne_bytes(),
+                NumberTypes::Filesize,
+            )),
             Value::Error { error, .. } => Err(*error.clone()),
             other => Err(ShellError::UnsupportedInput {
                 msg: "Unable to give a result with this input".to_string(),
diff --git a/crates/nu-command/src/random/binary.rs b/crates/nu-command/src/random/binary.rs
index 539796b8c5..36d0179e3a 100644
--- a/crates/nu-command/src/random/binary.rs
+++ b/crates/nu-command/src/random/binary.rs
@@ -1,5 +1,5 @@
 use nu_engine::command_prelude::*;
-
+use nu_protocol::format_filesize_from_conf;
 use rand::{thread_rng, RngCore};
 
 #[derive(Clone)]
@@ -37,7 +37,27 @@ impl Command for SubCommand {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let length = call.req(engine_state, stack, 0)?;
+        let length_val = call.req(engine_state, stack, 0)?;
+        let length = match length_val {
+            Value::Int { val, .. } => usize::try_from(val).map_err(|_| ShellError::InvalidValue {
+                valid: "a non-negative int or filesize".into(),
+                actual: val.to_string(),
+                span: length_val.span(),
+            }),
+            Value::Filesize { val, .. } => {
+                usize::try_from(val).map_err(|_| ShellError::InvalidValue {
+                    valid: "a non-negative int or filesize".into(),
+                    actual: format_filesize_from_conf(val, engine_state.get_config()),
+                    span: length_val.span(),
+                })
+            }
+            val => Err(ShellError::RuntimeTypeMismatch {
+                expected: Type::custom("int or filesize"),
+                actual: val.get_type(),
+                span: val.span(),
+            }),
+        }?;
+
         let mut rng = thread_rng();
 
         let mut out = vec![0u8; length];
diff --git a/crates/nu-command/src/random/chars.rs b/crates/nu-command/src/random/chars.rs
index d445a4aab8..e426fb5dbc 100644
--- a/crates/nu-command/src/random/chars.rs
+++ b/crates/nu-command/src/random/chars.rs
@@ -1,5 +1,5 @@
 use nu_engine::command_prelude::*;
-
+use nu_protocol::format_filesize_from_conf;
 use rand::{
     distributions::{Alphanumeric, Distribution},
     thread_rng,
@@ -73,14 +73,36 @@ fn chars(
     call: &Call,
 ) -> Result<PipelineData, ShellError> {
     let span = call.head;
-    let length: Option<usize> = call.get_flag(engine_state, stack, "length")?;
+    let length: Option<Value> = call.get_flag(engine_state, stack, "length")?;
+    let length = if let Some(length_val) = length {
+        match length_val {
+            Value::Int { val, .. } => usize::try_from(val).map_err(|_| ShellError::InvalidValue {
+                valid: "a non-negative int or filesize".into(),
+                actual: val.to_string(),
+                span: length_val.span(),
+            }),
+            Value::Filesize { val, .. } => {
+                usize::try_from(val).map_err(|_| ShellError::InvalidValue {
+                    valid: "a non-negative int or filesize".into(),
+                    actual: format_filesize_from_conf(val, engine_state.get_config()),
+                    span: length_val.span(),
+                })
+            }
+            val => Err(ShellError::RuntimeTypeMismatch {
+                expected: Type::custom("int or filesize"),
+                actual: val.get_type(),
+                span: val.span(),
+            }),
+        }?
+    } else {
+        DEFAULT_CHARS_LENGTH
+    };
 
-    let chars_length = length.unwrap_or(DEFAULT_CHARS_LENGTH);
     let mut rng = thread_rng();
 
     let random_string = Alphanumeric
         .sample_iter(&mut rng)
-        .take(chars_length)
+        .take(length)
         .map(char::from)
         .collect::<String>();
 
diff --git a/crates/nu-command/tests/format_conversions/nuon.rs b/crates/nu-command/tests/format_conversions/nuon.rs
index 8262ee8dfc..e4f6281c01 100644
--- a/crates/nu-command/tests/format_conversions/nuon.rs
+++ b/crates/nu-command/tests/format_conversions/nuon.rs
@@ -5,9 +5,9 @@ fn to_nuon_correct_compaction() {
     let actual = nu!(
         cwd: "tests/fixtures/formats", pipeline(
         r#"
-            open appveyor.yml 
-            | to nuon 
-            | str length 
+            open appveyor.yml
+            | to nuon
+            | str length
             | $in > 500
         "#
     ));
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index b6f5fa161e..b2b5756ef0 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -13,9 +13,9 @@ use itertools::Itertools;
 use log::trace;
 use nu_engine::DIR_VAR_PARSER_INFO;
 use nu_protocol::{
-    ast::*, engine::StateWorkingSet, eval_const::eval_constant, BlockId, DeclId, DidYouMean, Flag,
-    ParseError, PositionalArg, Signature, Span, Spanned, SyntaxShape, Type, VarId, ENV_VARIABLE_ID,
-    IN_VARIABLE_ID,
+    ast::*, engine::StateWorkingSet, eval_const::eval_constant, BlockId, DeclId, DidYouMean,
+    FilesizeUnit, Flag, ParseError, PositionalArg, Signature, Span, Spanned, SyntaxShape, Type,
+    VarId, ENV_VARIABLE_ID, IN_VARIABLE_ID,
 };
 use std::{
     collections::{HashMap, HashSet},
@@ -2575,19 +2575,67 @@ pub fn parse_unit_value<'res>(
 }
 
 pub const FILESIZE_UNIT_GROUPS: &[UnitGroup] = &[
-    (Unit::Kilobyte, "KB", Some((Unit::Byte, 1000))),
-    (Unit::Megabyte, "MB", Some((Unit::Kilobyte, 1000))),
-    (Unit::Gigabyte, "GB", Some((Unit::Megabyte, 1000))),
-    (Unit::Terabyte, "TB", Some((Unit::Gigabyte, 1000))),
-    (Unit::Petabyte, "PB", Some((Unit::Terabyte, 1000))),
-    (Unit::Exabyte, "EB", Some((Unit::Petabyte, 1000))),
-    (Unit::Kibibyte, "KIB", Some((Unit::Byte, 1024))),
-    (Unit::Mebibyte, "MIB", Some((Unit::Kibibyte, 1024))),
-    (Unit::Gibibyte, "GIB", Some((Unit::Mebibyte, 1024))),
-    (Unit::Tebibyte, "TIB", Some((Unit::Gibibyte, 1024))),
-    (Unit::Pebibyte, "PIB", Some((Unit::Tebibyte, 1024))),
-    (Unit::Exbibyte, "EIB", Some((Unit::Pebibyte, 1024))),
-    (Unit::Byte, "B", None),
+    (
+        Unit::Filesize(FilesizeUnit::KB),
+        "KB",
+        Some((Unit::Filesize(FilesizeUnit::B), 1000)),
+    ),
+    (
+        Unit::Filesize(FilesizeUnit::MB),
+        "MB",
+        Some((Unit::Filesize(FilesizeUnit::KB), 1000)),
+    ),
+    (
+        Unit::Filesize(FilesizeUnit::GB),
+        "GB",
+        Some((Unit::Filesize(FilesizeUnit::MB), 1000)),
+    ),
+    (
+        Unit::Filesize(FilesizeUnit::TB),
+        "TB",
+        Some((Unit::Filesize(FilesizeUnit::GB), 1000)),
+    ),
+    (
+        Unit::Filesize(FilesizeUnit::PB),
+        "PB",
+        Some((Unit::Filesize(FilesizeUnit::TB), 1000)),
+    ),
+    (
+        Unit::Filesize(FilesizeUnit::EB),
+        "EB",
+        Some((Unit::Filesize(FilesizeUnit::PB), 1000)),
+    ),
+    (
+        Unit::Filesize(FilesizeUnit::KiB),
+        "KIB",
+        Some((Unit::Filesize(FilesizeUnit::B), 1024)),
+    ),
+    (
+        Unit::Filesize(FilesizeUnit::MiB),
+        "MIB",
+        Some((Unit::Filesize(FilesizeUnit::KiB), 1024)),
+    ),
+    (
+        Unit::Filesize(FilesizeUnit::GiB),
+        "GIB",
+        Some((Unit::Filesize(FilesizeUnit::MiB), 1024)),
+    ),
+    (
+        Unit::Filesize(FilesizeUnit::TiB),
+        "TIB",
+        Some((Unit::Filesize(FilesizeUnit::GiB), 1024)),
+    ),
+    (
+        Unit::Filesize(FilesizeUnit::PiB),
+        "PIB",
+        Some((Unit::Filesize(FilesizeUnit::TiB), 1024)),
+    ),
+    (
+        Unit::Filesize(FilesizeUnit::EiB),
+        "EIB",
+        Some((Unit::Filesize(FilesizeUnit::EiB), 1024)),
+    ),
+    (Unit::Filesize(FilesizeUnit::B), "B", None),
 ];
 
 pub const DURATION_UNIT_GROUPS: &[UnitGroup] = &[
diff --git a/crates/nu-protocol/src/ast/unit.rs b/crates/nu-protocol/src/ast/unit.rs
index 0e51d8978f..ecc92806a0 100644
--- a/crates/nu-protocol/src/ast/unit.rs
+++ b/crates/nu-protocol/src/ast/unit.rs
@@ -1,24 +1,9 @@
-use crate::{ShellError, Span, Value};
+use crate::{Filesize, FilesizeUnit, IntoValue, ShellError, Span, Value};
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Unit {
-    // Filesize units: metric
-    Byte,
-    Kilobyte,
-    Megabyte,
-    Gigabyte,
-    Terabyte,
-    Petabyte,
-    Exabyte,
-
-    // Filesize units: ISO/IEC 80000
-    Kibibyte,
-    Mebibyte,
-    Gibibyte,
-    Tebibyte,
-    Pebibyte,
-    Exbibyte,
+    Filesize(FilesizeUnit),
 
     // Duration units
     Nanosecond,
@@ -34,33 +19,19 @@ pub enum Unit {
 impl Unit {
     pub fn build_value(self, size: i64, span: Span) -> Result<Value, ShellError> {
         match self {
-            Unit::Byte => Ok(Value::filesize(size, span)),
-            Unit::Kilobyte => Ok(Value::filesize(size * 1000, span)),
-            Unit::Megabyte => Ok(Value::filesize(size * 1000 * 1000, span)),
-            Unit::Gigabyte => Ok(Value::filesize(size * 1000 * 1000 * 1000, span)),
-            Unit::Terabyte => Ok(Value::filesize(size * 1000 * 1000 * 1000 * 1000, span)),
-            Unit::Petabyte => Ok(Value::filesize(
-                size * 1000 * 1000 * 1000 * 1000 * 1000,
-                span,
-            )),
-            Unit::Exabyte => Ok(Value::filesize(
-                size * 1000 * 1000 * 1000 * 1000 * 1000 * 1000,
-                span,
-            )),
-
-            Unit::Kibibyte => Ok(Value::filesize(size * 1024, span)),
-            Unit::Mebibyte => Ok(Value::filesize(size * 1024 * 1024, span)),
-            Unit::Gibibyte => Ok(Value::filesize(size * 1024 * 1024 * 1024, span)),
-            Unit::Tebibyte => Ok(Value::filesize(size * 1024 * 1024 * 1024 * 1024, span)),
-            Unit::Pebibyte => Ok(Value::filesize(
-                size * 1024 * 1024 * 1024 * 1024 * 1024,
-                span,
-            )),
-            Unit::Exbibyte => Ok(Value::filesize(
-                size * 1024 * 1024 * 1024 * 1024 * 1024 * 1024,
-                span,
-            )),
-
+            Unit::Filesize(unit) => {
+                if let Some(filesize) = Filesize::from_unit(size, unit) {
+                    Ok(filesize.into_value(span))
+                } else {
+                    Err(ShellError::GenericError {
+                        error: "filesize too large".into(),
+                        msg: "filesize too large".into(),
+                        span: Some(span),
+                        help: None,
+                        inner: vec![],
+                    })
+                }
+            }
             Unit::Nanosecond => Ok(Value::duration(size, span)),
             Unit::Microsecond => Ok(Value::duration(size * 1000, span)),
             Unit::Millisecond => Ok(Value::duration(size * 1000 * 1000, span)),
diff --git a/crates/nu-protocol/src/ir/mod.rs b/crates/nu-protocol/src/ir/mod.rs
index 428a2667e0..9d657ba080 100644
--- a/crates/nu-protocol/src/ir/mod.rs
+++ b/crates/nu-protocol/src/ir/mod.rs
@@ -1,13 +1,11 @@
-use std::{fmt, sync::Arc};
-
 use crate::{
     ast::{CellPath, Expression, Operator, Pattern, RangeInclusion},
     engine::EngineState,
-    BlockId, DeclId, RegId, Span, Value, VarId,
+    BlockId, DeclId, Filesize, RegId, Span, Value, VarId,
 };
-
 use chrono::{DateTime, FixedOffset};
 use serde::{Deserialize, Serialize};
+use std::{fmt, sync::Arc};
 
 mod call;
 mod display;
@@ -397,7 +395,7 @@ pub enum Literal {
     Bool(bool),
     Int(i64),
     Float(f64),
-    Filesize(i64),
+    Filesize(Filesize),
     Duration(i64),
     Binary(DataSlice),
     Block(BlockId),
diff --git a/crates/nu-protocol/src/value/filesize.rs b/crates/nu-protocol/src/value/filesize.rs
index 9d58c103df..9e291db5bb 100644
--- a/crates/nu-protocol/src/value/filesize.rs
+++ b/crates/nu-protocol/src/value/filesize.rs
@@ -1,13 +1,442 @@
-use crate::Config;
+use crate::{Config, FromValue, IntoValue, ShellError, Span, Type, Value};
 use byte_unit::UnitType;
 use nu_utils::get_system_locale;
 use num_format::ToFormattedString;
+use serde::{Deserialize, Serialize};
+use std::{
+    fmt,
+    iter::Sum,
+    ops::{Add, Mul, Neg, Sub},
+    str::FromStr,
+};
+use thiserror::Error;
 
-pub fn format_filesize_from_conf(num_bytes: i64, config: &Config) -> String {
+/// A signed number of bytes.
+///
+/// [`Filesize`] is a wrapper around [`i64`]. Whereas [`i64`] is a dimensionless value, [`Filesize`] represents a
+/// numerical value with a dimensional unit (byte).
+///
+/// A [`Filesize`] can be created from an [`i64`] using [`Filesize::new`] or the `From` or `Into` trait implementations.
+/// To get the underlying [`i64`] value, use [`Filesize::get`] or the `From` or `Into` trait implementations.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
+#[repr(transparent)]
+#[serde(transparent)]
+pub struct Filesize(i64);
+
+impl Filesize {
+    /// A [`Filesize`] of 0 bytes.
+    pub const ZERO: Self = Self(0);
+
+    /// The smallest possible [`Filesize`] value.
+    pub const MIN: Self = Self(i64::MIN);
+
+    /// The largest possible [`Filesize`] value.
+    pub const MAX: Self = Self(i64::MAX);
+
+    /// Create a new [`Filesize`] from a [`i64`] number of bytes.
+    pub const fn new(bytes: i64) -> Self {
+        Self(bytes)
+    }
+
+    /// Creates a [`Filesize`] from a signed multiple of a [`FilesizeUnit`].
+    ///
+    /// If the resulting number of bytes calculated by `value * unit.as_bytes()` overflows an
+    /// [`i64`], then `None` is returned.
+    pub const fn from_unit(value: i64, unit: FilesizeUnit) -> Option<Self> {
+        if let Some(bytes) = value.checked_mul(unit.as_bytes() as i64) {
+            Some(Self(bytes))
+        } else {
+            None
+        }
+    }
+
+    /// Returns the underlying [`i64`] number of bytes in a [`Filesize`].
+    pub const fn get(&self) -> i64 {
+        self.0
+    }
+
+    /// Returns true if a [`Filesize`] is positive and false if it is zero or negative.
+    pub const fn is_positive(self) -> bool {
+        self.0.is_positive()
+    }
+
+    /// Returns true if a [`Filesize`] is negative and false if it is zero or positive.
+    pub const fn is_negative(self) -> bool {
+        self.0.is_negative()
+    }
+
+    /// Returns a [`Filesize`] representing the sign of `self`.
+    /// - 0 if the filesize is zero
+    /// - 1 if the filesize is positive
+    /// - -1 if the filesize is negative
+    pub const fn signum(self) -> Self {
+        Self(self.0.signum())
+    }
+}
+
+impl From<i64> for Filesize {
+    fn from(value: i64) -> Self {
+        Self(value)
+    }
+}
+
+impl From<Filesize> for i64 {
+    fn from(filesize: Filesize) -> Self {
+        filesize.0
+    }
+}
+
+macro_rules! impl_from {
+    ($($ty:ty),* $(,)?) => {
+        $(
+            impl From<$ty> for Filesize {
+                #[inline]
+                fn from(value: $ty) -> Self {
+                    Self(value.into())
+                }
+            }
+
+            impl TryFrom<Filesize> for $ty {
+                type Error = <i64 as TryInto<$ty>>::Error;
+
+                #[inline]
+                fn try_from(filesize: Filesize) -> Result<Self, Self::Error> {
+                    filesize.0.try_into()
+                }
+            }
+        )*
+    };
+}
+
+impl_from!(u8, i8, u16, i16, u32, i32);
+
+macro_rules! impl_try_from {
+    ($($ty:ty),* $(,)?) => {
+        $(
+            impl TryFrom<$ty> for Filesize {
+                type Error = <$ty as TryInto<i64>>::Error;
+
+                #[inline]
+                fn try_from(value: $ty) -> Result<Self, Self::Error> {
+                    value.try_into().map(Self)
+                }
+            }
+
+            impl TryFrom<Filesize> for $ty {
+                type Error = <i64 as TryInto<$ty>>::Error;
+
+                #[inline]
+                fn try_from(filesize: Filesize) -> Result<Self, Self::Error> {
+                    filesize.0.try_into()
+                }
+            }
+        )*
+    };
+}
+
+impl_try_from!(u64, usize, isize);
+
+/// The error type returned when a checked conversion from a floating point type fails.
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Error)]
+pub struct TryFromFloatError(());
+
+impl fmt::Display for TryFromFloatError {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(fmt, "out of range float type conversion attempted")
+    }
+}
+
+impl TryFrom<f64> for Filesize {
+    type Error = TryFromFloatError;
+
+    #[inline]
+    fn try_from(value: f64) -> Result<Self, Self::Error> {
+        if i64::MIN as f64 <= value && value <= i64::MAX as f64 {
+            Ok(Self(value as i64))
+        } else {
+            Err(TryFromFloatError(()))
+        }
+    }
+}
+
+impl TryFrom<f32> for Filesize {
+    type Error = TryFromFloatError;
+
+    #[inline]
+    fn try_from(value: f32) -> Result<Self, Self::Error> {
+        if i64::MIN as f32 <= value && value <= i64::MAX as f32 {
+            Ok(Self(value as i64))
+        } else {
+            Err(TryFromFloatError(()))
+        }
+    }
+}
+
+impl FromValue for Filesize {
+    fn from_value(value: Value) -> Result<Self, ShellError> {
+        value.as_filesize()
+    }
+
+    fn expected_type() -> Type {
+        Type::Filesize
+    }
+}
+
+impl IntoValue for Filesize {
+    fn into_value(self, span: Span) -> Value {
+        Value::filesize(self.0, span)
+    }
+}
+
+impl Add for Filesize {
+    type Output = Option<Self>;
+
+    fn add(self, rhs: Self) -> Self::Output {
+        self.0.checked_add(rhs.0).map(Self)
+    }
+}
+
+impl Sub for Filesize {
+    type Output = Option<Self>;
+
+    fn sub(self, rhs: Self) -> Self::Output {
+        self.0.checked_sub(rhs.0).map(Self)
+    }
+}
+
+impl Mul<i64> for Filesize {
+    type Output = Option<Self>;
+
+    fn mul(self, rhs: i64) -> Self::Output {
+        self.0.checked_mul(rhs).map(Self)
+    }
+}
+
+impl Mul<Filesize> for i64 {
+    type Output = Option<Filesize>;
+
+    fn mul(self, rhs: Filesize) -> Self::Output {
+        self.checked_mul(rhs.0).map(Filesize::new)
+    }
+}
+
+impl Mul<f64> for Filesize {
+    type Output = Option<Self>;
+
+    fn mul(self, rhs: f64) -> Self::Output {
+        let bytes = ((self.0 as f64) * rhs).round();
+        if i64::MIN as f64 <= bytes && bytes <= i64::MAX as f64 {
+            Some(Self(bytes as i64))
+        } else {
+            None
+        }
+    }
+}
+
+impl Mul<Filesize> for f64 {
+    type Output = Option<Filesize>;
+
+    fn mul(self, rhs: Filesize) -> Self::Output {
+        let bytes = (self * (rhs.0 as f64)).round();
+        if i64::MIN as f64 <= bytes && bytes <= i64::MAX as f64 {
+            Some(Filesize(bytes as i64))
+        } else {
+            None
+        }
+    }
+}
+
+impl Neg for Filesize {
+    type Output = Option<Self>;
+
+    fn neg(self) -> Self::Output {
+        self.0.checked_neg().map(Self)
+    }
+}
+
+impl Sum<Filesize> for Option<Filesize> {
+    fn sum<I: Iterator<Item = Filesize>>(iter: I) -> Self {
+        let mut sum = Filesize::ZERO;
+        for filesize in iter {
+            sum = (sum + filesize)?;
+        }
+        Some(sum)
+    }
+}
+
+impl fmt::Display for Filesize {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        format_filesize(*self, "auto", Some(false)).fmt(f)
+    }
+}
+
+/// All the possible filesize units for a [`Filesize`].
+///
+/// This type contains both units with metric (SI) decimal prefixes which are powers of 10 (e.g., kB = 1000 bytes)
+/// and units with binary prefixes which are powers of 2 (e.g., KiB = 1024 bytes).
+///
+/// The number of bytes in a [`FilesizeUnit`] can be obtained using
+/// [`as_bytes`](FilesizeUnit::as_bytes).
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub enum FilesizeUnit {
+    /// One byte
+    B,
+    /// Kilobyte = 1000 bytes
+    KB,
+    /// Megabyte = 10<sup>6</sup> bytes
+    MB,
+    /// Gigabyte = 10<sup>9</sup> bytes
+    GB,
+    /// Terabyte = 10<sup>12</sup> bytes
+    TB,
+    /// Petabyte = 10<sup>15</sup> bytes
+    PB,
+    /// Exabyte = 10<sup>18</sup> bytes
+    EB,
+    /// Kibibyte = 1024 bytes
+    KiB,
+    /// Mebibyte = 2<sup>20</sup> bytes
+    MiB,
+    /// Gibibyte = 2<sup>30</sup> bytes
+    GiB,
+    /// Tebibyte = 2<sup>40</sup> bytes
+    TiB,
+    /// Pebibyte = 2<sup>50</sup> bytes
+    PiB,
+    /// Exbibyte = 2<sup>60</sup> bytes
+    EiB,
+}
+
+impl FilesizeUnit {
+    /// Returns the number of bytes in a [`FilesizeUnit`].
+    pub const fn as_bytes(&self) -> u64 {
+        match self {
+            Self::B => 1,
+            Self::KB => 10_u64.pow(3),
+            Self::MB => 10_u64.pow(6),
+            Self::GB => 10_u64.pow(9),
+            Self::TB => 10_u64.pow(12),
+            Self::PB => 10_u64.pow(15),
+            Self::EB => 10_u64.pow(18),
+            Self::KiB => 2_u64.pow(10),
+            Self::MiB => 2_u64.pow(20),
+            Self::GiB => 2_u64.pow(30),
+            Self::TiB => 2_u64.pow(40),
+            Self::PiB => 2_u64.pow(50),
+            Self::EiB => 2_u64.pow(60),
+        }
+    }
+
+    /// Convert a [`FilesizeUnit`] to a [`Filesize`].
+    ///
+    /// To create a [`Filesize`] from a multiple of a [`FilesizeUnit`] use [`Filesize::from_unit`].
+    pub const fn as_filesize(&self) -> Filesize {
+        Filesize::new(self.as_bytes() as i64)
+    }
+
+    /// Returns the abbreviated unit for a [`FilesizeUnit`] as a [`str`].
+    ///
+    /// The abbreviated unit is exactly the same as the enum case name in Rust code.
+    ///
+    /// # Examples
+    /// ```
+    /// # use nu_protocol::FilesizeUnit;
+    /// assert_eq!(FilesizeUnit::B.as_str(), "B");
+    /// assert_eq!(FilesizeUnit::KB.as_str(), "kB");
+    /// assert_eq!(FilesizeUnit::KiB.as_str(), "KiB");
+    /// ```
+    pub const fn as_str(&self) -> &'static str {
+        match self {
+            Self::B => "B",
+            Self::KB => "kB",
+            Self::MB => "MB",
+            Self::GB => "GB",
+            Self::TB => "TB",
+            Self::PB => "PB",
+            Self::EB => "EB",
+            Self::KiB => "KiB",
+            Self::MiB => "MiB",
+            Self::GiB => "GiB",
+            Self::TiB => "TiB",
+            Self::PiB => "PiB",
+            Self::EiB => "EiB",
+        }
+    }
+
+    /// Returns `true` if a [`FilesizeUnit`] has a metric (SI) decimal prefix (a power of 10).
+    ///
+    /// Note that this returns `true` for [`FilesizeUnit::B`] as well.
+    pub const fn is_decimal(&self) -> bool {
+        match self {
+            Self::B | Self::KB | Self::MB | Self::GB | Self::TB | Self::PB | Self::EB => true,
+            Self::KiB | Self::MiB | Self::GiB | Self::TiB | Self::PiB | Self::EiB => false,
+        }
+    }
+
+    /// Returns `true` if a [`FilesizeUnit`] has a binary prefix (a power of 2).
+    ///
+    /// Note that this returns `true` for [`FilesizeUnit::B`] as well.
+    pub const fn is_binary(&self) -> bool {
+        match self {
+            Self::KB | Self::MB | Self::GB | Self::TB | Self::PB | Self::EB => false,
+            Self::B | Self::KiB | Self::MiB | Self::GiB | Self::TiB | Self::PiB | Self::EiB => true,
+        }
+    }
+}
+
+impl From<FilesizeUnit> for Filesize {
+    fn from(unit: FilesizeUnit) -> Self {
+        unit.as_filesize()
+    }
+}
+
+/// An error returned when failing to parse a [`FilesizeUnit`].
+///
+/// This occurs when the string being parsed does not exactly match the name of one of the
+/// enum cases in [`FilesizeUnit`].
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Error)]
+pub struct ParseFilesizeUnitError(());
+
+impl fmt::Display for ParseFilesizeUnitError {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(fmt, "invalid filesize unit")
+    }
+}
+
+impl FromStr for FilesizeUnit {
+    type Err = ParseFilesizeUnitError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Ok(match s {
+            "B" => Self::B,
+            "kB" => Self::KB,
+            "MB" => Self::MB,
+            "GB" => Self::GB,
+            "TB" => Self::TB,
+            "PB" => Self::PB,
+            "EB" => Self::EB,
+            "KiB" => Self::KiB,
+            "MiB" => Self::MiB,
+            "GiB" => Self::GiB,
+            "TiB" => Self::TiB,
+            "PiB" => Self::PiB,
+            "EiB" => Self::EiB,
+            _ => return Err(ParseFilesizeUnitError(())),
+        })
+    }
+}
+
+impl fmt::Display for FilesizeUnit {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.as_str().fmt(f)
+    }
+}
+
+pub fn format_filesize_from_conf(filesize: Filesize, config: &Config) -> String {
     // We need to take into account config.filesize_metric so, if someone asks for KB
     // and filesize_metric is false, return KiB
     format_filesize(
-        num_bytes,
+        filesize,
         &config.filesize.format,
         Some(config.filesize.metric),
     )
@@ -16,7 +445,7 @@ pub fn format_filesize_from_conf(num_bytes: i64, config: &Config) -> String {
 // filesize_metric is explicit when printed a value according to user config;
 // other places (such as `format filesize`) don't.
 pub fn format_filesize(
-    num_bytes: i64,
+    filesize: Filesize,
     format_value: &str,
     filesize_metric: Option<bool>,
 ) -> String {
@@ -25,7 +454,7 @@ pub fn format_filesize(
     // When format_value is "auto" or an invalid value, the returned ByteUnit doesn't matter
     // and is always B.
     let filesize_unit = get_filesize_format(format_value, filesize_metric);
-    let byte = byte_unit::Byte::from_u64(num_bytes.unsigned_abs());
+    let byte = byte_unit::Byte::from_u64(filesize.0.unsigned_abs());
     let adj_byte = if let Some(unit) = filesize_unit {
         byte.get_adjusted_unit(unit)
     } else {
@@ -43,7 +472,7 @@ pub fn format_filesize(
             let locale = get_system_locale();
             let locale_byte = adj_byte.get_value() as u64;
             let locale_byte_string = locale_byte.to_formatted_string(&locale);
-            let locale_signed_byte_string = if num_bytes.is_negative() {
+            let locale_signed_byte_string = if filesize.is_negative() {
                 format!("-{locale_byte_string}")
             } else {
                 locale_byte_string
@@ -56,7 +485,7 @@ pub fn format_filesize(
             }
         }
         _ => {
-            if num_bytes.is_negative() {
+            if filesize.is_negative() {
                 format!("-{:.1}", adj_byte)
             } else {
                 format!("{:.1}", adj_byte)
@@ -116,6 +545,9 @@ mod tests {
         #[case] filesize_format: String,
         #[case] exp: &str,
     ) {
-        assert_eq!(exp, format_filesize(val, &filesize_format, filesize_metric));
+        assert_eq!(
+            exp,
+            format_filesize(Filesize::new(val), &filesize_format, filesize_metric)
+        );
     }
 }
diff --git a/crates/nu-protocol/src/value/from_value.rs b/crates/nu-protocol/src/value/from_value.rs
index 624d7dae39..fb6fc26be5 100644
--- a/crates/nu-protocol/src/value/from_value.rs
+++ b/crates/nu-protocol/src/value/from_value.rs
@@ -252,9 +252,7 @@ impl FromValue for i64 {
     fn from_value(v: Value) -> Result<Self, ShellError> {
         match v {
             Value::Int { val, .. } => Ok(val),
-            Value::Filesize { val, .. } => Ok(val),
             Value::Duration { val, .. } => Ok(val),
-
             v => Err(ShellError::CantConvert {
                 to_type: Self::expected_type().to_string(),
                 from_type: v.get_type().to_string(),
@@ -308,9 +306,7 @@ macro_rules! impl_from_value_for_uint {
                 let span = v.span();
                 const MAX: i64 = $max;
                 match v {
-                    Value::Int { val, .. }
-                    | Value::Filesize { val, .. }
-                    | Value::Duration { val, .. } => {
+                    Value::Int { val, .. } | Value::Duration { val, .. } => {
                         match val {
                             i64::MIN..=-1 => Err(ShellError::NeedsPositiveValue { span }),
                             0..=MAX => Ok(val as $type),
diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs
index 28b468a151..c12dd3d71d 100644
--- a/crates/nu-protocol/src/value/mod.rs
+++ b/crates/nu-protocol/src/value/mod.rs
@@ -83,7 +83,7 @@ pub enum Value {
         internal_span: Span,
     },
     Filesize {
-        val: i64,
+        val: Filesize,
         // note: spans are being refactored out of Value
         // please use .span() instead of matching this span value
         #[serde(rename = "span")]
@@ -301,7 +301,7 @@ impl Value {
     }
 
     /// Returns the inner `i64` filesize value or an error if this `Value` is not a filesize
-    pub fn as_filesize(&self) -> Result<i64, ShellError> {
+    pub fn as_filesize(&self) -> Result<Filesize, ShellError> {
         if let Value::Filesize { val, .. } = self {
             Ok(*val)
         } else {
@@ -1819,9 +1819,9 @@ impl Value {
         }
     }
 
-    pub fn filesize(val: i64, span: Span) -> Value {
+    pub fn filesize(val: impl Into<Filesize>, span: Span) -> Value {
         Value::Filesize {
-            val,
+            val: val.into(),
             internal_span: span,
         }
     }
@@ -1938,7 +1938,7 @@ impl Value {
 
     /// Note: Only use this for test data, *not* live data, as it will point into unknown source
     /// when used in errors.
-    pub fn test_filesize(val: i64) -> Value {
+    pub fn test_filesize(val: impl Into<Filesize>) -> Value {
         Value::filesize(val, Span::test_data())
     }
 
@@ -2478,7 +2478,7 @@ impl Value {
                 }
             }
             (Value::Filesize { val: lhs, .. }, Value::Filesize { val: rhs, .. }) => {
-                if let Some(val) = lhs.checked_add(*rhs) {
+                if let Some(val) = *lhs + *rhs {
                     Ok(Value::filesize(val, span))
                 } else {
                     Err(ShellError::OperatorOverflow {
@@ -2585,7 +2585,7 @@ impl Value {
                 }
             }
             (Value::Filesize { val: lhs, .. }, Value::Filesize { val: rhs, .. }) => {
-                if let Some(val) = lhs.checked_sub(*rhs) {
+                if let Some(val) = *lhs - *rhs {
                     Ok(Value::filesize(val, span))
                 } else {
                     Err(ShellError::OperatorOverflow {
@@ -2633,16 +2633,48 @@ impl Value {
                 Ok(Value::float(lhs * rhs, span))
             }
             (Value::Int { val: lhs, .. }, Value::Filesize { val: rhs, .. }) => {
-                Ok(Value::filesize(*lhs * *rhs, span))
+                if let Some(val) = *lhs * *rhs {
+                    Ok(Value::filesize(val, span))
+                } else {
+                    Err(ShellError::OperatorOverflow {
+                        msg: "multiply operation overflowed".into(),
+                        span,
+                        help: None,
+                    })
+                }
             }
             (Value::Filesize { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
-                Ok(Value::filesize(*lhs * *rhs, span))
+                if let Some(val) = *lhs * *rhs {
+                    Ok(Value::filesize(val, span))
+                } else {
+                    Err(ShellError::OperatorOverflow {
+                        msg: "multiply operation overflowed".into(),
+                        span,
+                        help: None,
+                    })
+                }
             }
             (Value::Float { val: lhs, .. }, Value::Filesize { val: rhs, .. }) => {
-                Ok(Value::filesize((*lhs * *rhs as f64) as i64, span))
+                if let Some(val) = *lhs * *rhs {
+                    Ok(Value::filesize(val, span))
+                } else {
+                    Err(ShellError::OperatorOverflow {
+                        msg: "multiply operation overflowed".into(),
+                        span,
+                        help: None,
+                    })
+                }
             }
             (Value::Filesize { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
-                Ok(Value::filesize((*lhs as f64 * *rhs) as i64, span))
+                if let Some(val) = *lhs * *rhs {
+                    Ok(Value::filesize(val, span))
+                } else {
+                    Err(ShellError::OperatorOverflow {
+                        msg: "multiply operation overflowed".into(),
+                        span,
+                        help: None,
+                    })
+                }
             }
             (Value::Int { val: lhs, .. }, Value::Duration { val: rhs, .. }) => {
                 Ok(Value::duration(*lhs * *rhs, span))
@@ -2700,14 +2732,14 @@ impl Value {
                 }
             }
             (Value::Filesize { val: lhs, .. }, Value::Filesize { val: rhs, .. }) => {
-                if *rhs == 0 {
+                if *rhs == Filesize::ZERO {
                     Err(ShellError::DivisionByZero { span: op })
                 } else {
-                    Ok(Value::float(*lhs as f64 / *rhs as f64, span))
+                    Ok(Value::float(lhs.get() as f64 / rhs.get() as f64, span))
                 }
             }
             (Value::Filesize { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
-                if let Some(val) = lhs.checked_div(*rhs) {
+                if let Some(val) = lhs.get().checked_div(*rhs) {
                     Ok(Value::filesize(val, span))
                 } else if *rhs == 0 {
                     Err(ShellError::DivisionByZero { span: op })
@@ -2721,9 +2753,8 @@ impl Value {
             }
             (Value::Filesize { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
                 if *rhs != 0.0 {
-                    let val = *lhs as f64 / rhs;
-                    if i64::MIN as f64 <= val && val <= i64::MAX as f64 {
-                        Ok(Value::filesize(val as i64, span))
+                    if let Ok(val) = Filesize::try_from(lhs.get() as f64 / rhs) {
+                        Ok(Value::filesize(val, span))
                     } else {
                         Err(ShellError::OperatorOverflow {
                             msg: "division operation overflowed".into(),
@@ -2785,163 +2816,6 @@ impl Value {
         }
     }
 
-    pub fn modulo(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
-        // Based off the unstable `div_floor` function in the std library.
-        fn checked_mod_i64(dividend: i64, divisor: i64) -> Option<i64> {
-            let remainder = dividend.checked_rem(divisor)?;
-            if (remainder > 0 && divisor < 0) || (remainder < 0 && divisor > 0) {
-                // Note that `remainder + divisor` cannot overflow, because `remainder` and
-                // `divisor` have opposite signs.
-                Some(remainder + divisor)
-            } else {
-                Some(remainder)
-            }
-        }
-
-        fn checked_mod_f64(dividend: f64, divisor: f64) -> Option<f64> {
-            if divisor == 0.0 {
-                None
-            } else {
-                let remainder = dividend % divisor;
-                if (remainder > 0.0 && divisor < 0.0) || (remainder < 0.0 && divisor > 0.0) {
-                    Some(remainder + divisor)
-                } else {
-                    Some(remainder)
-                }
-            }
-        }
-
-        match (self, rhs) {
-            (Value::Int { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
-                if let Some(val) = checked_mod_i64(*lhs, *rhs) {
-                    Ok(Value::int(val, span))
-                } else if *rhs == 0 {
-                    Err(ShellError::DivisionByZero { span: op })
-                } else {
-                    Err(ShellError::OperatorOverflow {
-                        msg: "modulo operation overflowed".into(),
-                        span,
-                        help: None,
-                    })
-                }
-            }
-            (Value::Int { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
-                if let Some(val) = checked_mod_f64(*lhs as f64, *rhs) {
-                    Ok(Value::float(val, span))
-                } else {
-                    Err(ShellError::DivisionByZero { span: op })
-                }
-            }
-            (Value::Float { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
-                if let Some(val) = checked_mod_f64(*lhs, *rhs as f64) {
-                    Ok(Value::float(val, span))
-                } else {
-                    Err(ShellError::DivisionByZero { span: op })
-                }
-            }
-            (Value::Float { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
-                if let Some(val) = checked_mod_f64(*lhs, *rhs) {
-                    Ok(Value::float(val, span))
-                } else {
-                    Err(ShellError::DivisionByZero { span: op })
-                }
-            }
-            (Value::Filesize { val: lhs, .. }, Value::Filesize { val: rhs, .. }) => {
-                if let Some(val) = checked_mod_i64(*lhs, *rhs) {
-                    Ok(Value::filesize(val, span))
-                } else if *rhs == 0 {
-                    Err(ShellError::DivisionByZero { span: op })
-                } else {
-                    Err(ShellError::OperatorOverflow {
-                        msg: "modulo operation overflowed".into(),
-                        span,
-                        help: None,
-                    })
-                }
-            }
-            (Value::Filesize { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
-                if let Some(val) = checked_mod_i64(*lhs, *rhs) {
-                    Ok(Value::filesize(val, span))
-                } else if *rhs == 0 {
-                    Err(ShellError::DivisionByZero { span: op })
-                } else {
-                    Err(ShellError::OperatorOverflow {
-                        msg: "modulo operation overflowed".into(),
-                        span,
-                        help: None,
-                    })
-                }
-            }
-            (Value::Filesize { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
-                if let Some(val) = checked_mod_f64(*lhs as f64, *rhs) {
-                    if i64::MIN as f64 <= val && val <= i64::MAX as f64 {
-                        Ok(Value::filesize(val as i64, span))
-                    } else {
-                        Err(ShellError::OperatorOverflow {
-                            msg: "modulo operation overflowed".into(),
-                            span,
-                            help: None,
-                        })
-                    }
-                } else {
-                    Err(ShellError::DivisionByZero { span: op })
-                }
-            }
-            (Value::Duration { val: lhs, .. }, Value::Duration { val: rhs, .. }) => {
-                if let Some(val) = checked_mod_i64(*lhs, *rhs) {
-                    Ok(Value::duration(val, span))
-                } else if *rhs == 0 {
-                    Err(ShellError::DivisionByZero { span: op })
-                } else {
-                    Err(ShellError::OperatorOverflow {
-                        msg: "division operation overflowed".into(),
-                        span,
-                        help: None,
-                    })
-                }
-            }
-            (Value::Duration { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
-                if let Some(val) = checked_mod_i64(*lhs, *rhs) {
-                    Ok(Value::duration(val, span))
-                } else if *rhs == 0 {
-                    Err(ShellError::DivisionByZero { span: op })
-                } else {
-                    Err(ShellError::OperatorOverflow {
-                        msg: "division operation overflowed".into(),
-                        span,
-                        help: None,
-                    })
-                }
-            }
-            (Value::Duration { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
-                if let Some(val) = checked_mod_f64(*lhs as f64, *rhs) {
-                    if i64::MIN as f64 <= val && val <= i64::MAX as f64 {
-                        Ok(Value::duration(val as i64, span))
-                    } else {
-                        Err(ShellError::OperatorOverflow {
-                            msg: "division operation overflowed".into(),
-                            span,
-                            help: None,
-                        })
-                    }
-                } else {
-                    Err(ShellError::DivisionByZero { span: op })
-                }
-            }
-            (Value::Custom { val: lhs, .. }, rhs) => {
-                lhs.operation(span, Operator::Math(Math::Modulo), op, rhs)
-            }
-
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            }),
-        }
-    }
-
     pub fn floor_div(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
         // Taken from the unstable `div_floor` function in the std library.
         fn checked_div_floor_i64(dividend: i64, divisor: i64) -> Option<i64> {
@@ -3003,9 +2877,9 @@ impl Value {
                 }
             }
             (Value::Filesize { val: lhs, .. }, Value::Filesize { val: rhs, .. }) => {
-                if let Some(val) = checked_div_floor_i64(*lhs, *rhs) {
+                if let Some(val) = checked_div_floor_i64(lhs.get(), rhs.get()) {
                     Ok(Value::int(val, span))
-                } else if *rhs == 0 {
+                } else if *rhs == Filesize::ZERO {
                     Err(ShellError::DivisionByZero { span: op })
                 } else {
                     Err(ShellError::OperatorOverflow {
@@ -3016,7 +2890,7 @@ impl Value {
                 }
             }
             (Value::Filesize { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
-                if let Some(val) = checked_div_floor_i64(*lhs, *rhs) {
+                if let Some(val) = checked_div_floor_i64(lhs.get(), *rhs) {
                     Ok(Value::filesize(val, span))
                 } else if *rhs == 0 {
                     Err(ShellError::DivisionByZero { span: op })
@@ -3029,9 +2903,9 @@ impl Value {
                 }
             }
             (Value::Filesize { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
-                if let Some(val) = checked_div_floor_f64(*lhs as f64, *rhs) {
-                    if i64::MIN as f64 <= val && val <= i64::MAX as f64 {
-                        Ok(Value::filesize(val as i64, span))
+                if let Some(val) = checked_div_floor_f64(lhs.get() as f64, *rhs) {
+                    if let Ok(val) = Filesize::try_from(val) {
+                        Ok(Value::filesize(val, span))
                     } else {
                         Err(ShellError::OperatorOverflow {
                             msg: "division operation overflowed".into(),
@@ -3097,6 +2971,163 @@ impl Value {
         }
     }
 
+    pub fn modulo(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
+        // Based off the unstable `div_floor` function in the std library.
+        fn checked_mod_i64(dividend: i64, divisor: i64) -> Option<i64> {
+            let remainder = dividend.checked_rem(divisor)?;
+            if (remainder > 0 && divisor < 0) || (remainder < 0 && divisor > 0) {
+                // Note that `remainder + divisor` cannot overflow, because `remainder` and
+                // `divisor` have opposite signs.
+                Some(remainder + divisor)
+            } else {
+                Some(remainder)
+            }
+        }
+
+        fn checked_mod_f64(dividend: f64, divisor: f64) -> Option<f64> {
+            if divisor == 0.0 {
+                None
+            } else {
+                let remainder = dividend % divisor;
+                if (remainder > 0.0 && divisor < 0.0) || (remainder < 0.0 && divisor > 0.0) {
+                    Some(remainder + divisor)
+                } else {
+                    Some(remainder)
+                }
+            }
+        }
+
+        match (self, rhs) {
+            (Value::Int { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
+                if let Some(val) = checked_mod_i64(*lhs, *rhs) {
+                    Ok(Value::int(val, span))
+                } else if *rhs == 0 {
+                    Err(ShellError::DivisionByZero { span: op })
+                } else {
+                    Err(ShellError::OperatorOverflow {
+                        msg: "modulo operation overflowed".into(),
+                        span,
+                        help: None,
+                    })
+                }
+            }
+            (Value::Int { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
+                if let Some(val) = checked_mod_f64(*lhs as f64, *rhs) {
+                    Ok(Value::float(val, span))
+                } else {
+                    Err(ShellError::DivisionByZero { span: op })
+                }
+            }
+            (Value::Float { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
+                if let Some(val) = checked_mod_f64(*lhs, *rhs as f64) {
+                    Ok(Value::float(val, span))
+                } else {
+                    Err(ShellError::DivisionByZero { span: op })
+                }
+            }
+            (Value::Float { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
+                if let Some(val) = checked_mod_f64(*lhs, *rhs) {
+                    Ok(Value::float(val, span))
+                } else {
+                    Err(ShellError::DivisionByZero { span: op })
+                }
+            }
+            (Value::Filesize { val: lhs, .. }, Value::Filesize { val: rhs, .. }) => {
+                if let Some(val) = checked_mod_i64(lhs.get(), rhs.get()) {
+                    Ok(Value::filesize(val, span))
+                } else if *rhs == Filesize::ZERO {
+                    Err(ShellError::DivisionByZero { span: op })
+                } else {
+                    Err(ShellError::OperatorOverflow {
+                        msg: "modulo operation overflowed".into(),
+                        span,
+                        help: None,
+                    })
+                }
+            }
+            (Value::Filesize { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
+                if let Some(val) = checked_mod_i64(lhs.get(), *rhs) {
+                    Ok(Value::filesize(val, span))
+                } else if *rhs == 0 {
+                    Err(ShellError::DivisionByZero { span: op })
+                } else {
+                    Err(ShellError::OperatorOverflow {
+                        msg: "modulo operation overflowed".into(),
+                        span,
+                        help: None,
+                    })
+                }
+            }
+            (Value::Filesize { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
+                if let Some(val) = checked_mod_f64(lhs.get() as f64, *rhs) {
+                    if let Ok(val) = Filesize::try_from(val) {
+                        Ok(Value::filesize(val, span))
+                    } else {
+                        Err(ShellError::OperatorOverflow {
+                            msg: "modulo operation overflowed".into(),
+                            span,
+                            help: None,
+                        })
+                    }
+                } else {
+                    Err(ShellError::DivisionByZero { span: op })
+                }
+            }
+            (Value::Duration { val: lhs, .. }, Value::Duration { val: rhs, .. }) => {
+                if let Some(val) = checked_mod_i64(*lhs, *rhs) {
+                    Ok(Value::duration(val, span))
+                } else if *rhs == 0 {
+                    Err(ShellError::DivisionByZero { span: op })
+                } else {
+                    Err(ShellError::OperatorOverflow {
+                        msg: "division operation overflowed".into(),
+                        span,
+                        help: None,
+                    })
+                }
+            }
+            (Value::Duration { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
+                if let Some(val) = checked_mod_i64(*lhs, *rhs) {
+                    Ok(Value::duration(val, span))
+                } else if *rhs == 0 {
+                    Err(ShellError::DivisionByZero { span: op })
+                } else {
+                    Err(ShellError::OperatorOverflow {
+                        msg: "division operation overflowed".into(),
+                        span,
+                        help: None,
+                    })
+                }
+            }
+            (Value::Duration { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
+                if let Some(val) = checked_mod_f64(*lhs as f64, *rhs) {
+                    if i64::MIN as f64 <= val && val <= i64::MAX as f64 {
+                        Ok(Value::duration(val as i64, span))
+                    } else {
+                        Err(ShellError::OperatorOverflow {
+                            msg: "division operation overflowed".into(),
+                            span,
+                            help: None,
+                        })
+                    }
+                } else {
+                    Err(ShellError::DivisionByZero { span: op })
+                }
+            }
+            (Value::Custom { val: lhs, .. }, rhs) => {
+                lhs.operation(span, Operator::Math(Math::Modulo), op, rhs)
+            }
+
+            _ => Err(ShellError::OperatorMismatch {
+                op_span: op,
+                lhs_ty: self.get_type().to_string(),
+                lhs_span: self.span(),
+                rhs_ty: rhs.get_type().to_string(),
+                rhs_span: rhs.span(),
+            }),
+        }
+    }
+
     pub fn lt(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
         if let (Value::Custom { val: lhs, .. }, rhs) = (self, rhs) {
             return lhs.operation(
diff --git a/crates/nu_plugin_formats/src/to/plist.rs b/crates/nu_plugin_formats/src/to/plist.rs
index caf039263e..b7a15e03fe 100644
--- a/crates/nu_plugin_formats/src/to/plist.rs
+++ b/crates/nu_plugin_formats/src/to/plist.rs
@@ -1,10 +1,8 @@
-use std::time::SystemTime;
-
+use crate::FormatCmdsPlugin;
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand, SimplePluginCommand};
 use nu_protocol::{Category, Example, LabeledError, Record, Signature, Span, Value as NuValue};
-use plist::{Integer, Value as PlistValue};
-
-use crate::FormatCmdsPlugin;
+use plist::Value as PlistValue;
+use std::time::SystemTime;
 
 pub(crate) struct IntoPlist;
 
@@ -68,7 +66,7 @@ fn convert_nu_value(nu_val: &NuValue) -> Result<PlistValue, LabeledError> {
         NuValue::String { val, .. } => Ok(PlistValue::String(val.to_owned())),
         NuValue::Bool { val, .. } => Ok(PlistValue::Boolean(*val)),
         NuValue::Float { val, .. } => Ok(PlistValue::Real(*val)),
-        NuValue::Int { val, .. } => Ok(PlistValue::Integer(Into::<Integer>::into(*val))),
+        NuValue::Int { val, .. } => Ok(PlistValue::Integer((*val).into())),
         NuValue::Binary { val, .. } => Ok(PlistValue::Data(val.to_owned())),
         NuValue::Record { val, .. } => convert_nu_dict(val),
         NuValue::List { vals, .. } => Ok(PlistValue::Array(
@@ -77,7 +75,7 @@ fn convert_nu_value(nu_val: &NuValue) -> Result<PlistValue, LabeledError> {
                 .collect::<Result<_, _>>()?,
         )),
         NuValue::Date { val, .. } => Ok(PlistValue::Date(SystemTime::from(val.to_owned()).into())),
-        NuValue::Filesize { val, .. } => Ok(PlistValue::Integer(Into::<Integer>::into(*val))),
+        NuValue::Filesize { val, .. } => Ok(PlistValue::Integer(val.get().into())),
         _ => Err(build_label_error(
             format!("{:?} is not convertible", nu_val),
             span,
diff --git a/crates/nuon/src/from.rs b/crates/nuon/src/from.rs
index ded1512a6a..0c94434a1a 100644
--- a/crates/nuon/src/from.rs
+++ b/crates/nuon/src/from.rs
@@ -1,7 +1,7 @@
 use nu_protocol::{
     ast::{Expr, Expression, ListItem, RecordItem},
     engine::{EngineState, StateWorkingSet},
-    Range, Record, ShellError, Span, Type, Unit, Value,
+    Filesize, IntoValue, Range, Record, ShellError, Span, Type, Unit, Value,
 };
 use std::sync::Arc;
 
@@ -9,7 +9,7 @@ use std::sync::Arc;
 ///
 // WARNING: please leave the following two trailing spaces, they matter for the documentation
 // formatting
-/// > **Note**  
+/// > **Note**
 /// > [`Span`] can be passed to [`from_nuon`] if there is context available to the caller, e.g. when
 /// > using this function in a command implementation such as
 /// > [`from nuon`](https://www.nushell.sh/commands/docs/from_nuon.html).
@@ -407,32 +407,15 @@ fn convert_to_value(
             };
 
             match value.unit.item {
-                Unit::Byte => Ok(Value::filesize(size, span)),
-                Unit::Kilobyte => Ok(Value::filesize(size * 1000, span)),
-                Unit::Megabyte => Ok(Value::filesize(size * 1000 * 1000, span)),
-                Unit::Gigabyte => Ok(Value::filesize(size * 1000 * 1000 * 1000, span)),
-                Unit::Terabyte => Ok(Value::filesize(size * 1000 * 1000 * 1000 * 1000, span)),
-                Unit::Petabyte => Ok(Value::filesize(
-                    size * 1000 * 1000 * 1000 * 1000 * 1000,
-                    span,
-                )),
-                Unit::Exabyte => Ok(Value::filesize(
-                    size * 1000 * 1000 * 1000 * 1000 * 1000 * 1000,
-                    span,
-                )),
-
-                Unit::Kibibyte => Ok(Value::filesize(size * 1024, span)),
-                Unit::Mebibyte => Ok(Value::filesize(size * 1024 * 1024, span)),
-                Unit::Gibibyte => Ok(Value::filesize(size * 1024 * 1024 * 1024, span)),
-                Unit::Tebibyte => Ok(Value::filesize(size * 1024 * 1024 * 1024 * 1024, span)),
-                Unit::Pebibyte => Ok(Value::filesize(
-                    size * 1024 * 1024 * 1024 * 1024 * 1024,
-                    span,
-                )),
-                Unit::Exbibyte => Ok(Value::filesize(
-                    size * 1024 * 1024 * 1024 * 1024 * 1024 * 1024,
-                    span,
-                )),
+                Unit::Filesize(unit) => match Filesize::from_unit(size, unit) {
+                    Some(val) => Ok(val.into_value(span)),
+                    None => Err(ShellError::OutsideSpannedLabeledError {
+                        src: original_text.into(),
+                        error: "filesize too large".into(),
+                        msg: "filesize too large".into(),
+                        span: expr.span,
+                    }),
+                },
 
                 Unit::Nanosecond => Ok(Value::duration(size, span)),
                 Unit::Microsecond => Ok(Value::duration(size * 1000, span)),
diff --git a/crates/nuon/src/lib.rs b/crates/nuon/src/lib.rs
index 304c8f977c..24a84dfd5f 100644
--- a/crates/nuon/src/lib.rs
+++ b/crates/nuon/src/lib.rs
@@ -155,7 +155,7 @@ mod tests {
     #[test]
     fn filesize() {
         nuon_end_to_end("1024b", Some(Value::test_filesize(1024)));
-        assert_eq!(from_nuon("1kib", None).unwrap(), Value::test_filesize(1024),);
+        assert_eq!(from_nuon("1kib", None).unwrap(), Value::test_filesize(1024));
     }
 
     #[test]
diff --git a/crates/nuon/src/to.rs b/crates/nuon/src/to.rs
index b6c4f7829b..b8281e8ffe 100644
--- a/crates/nuon/src/to.rs
+++ b/crates/nuon/src/to.rs
@@ -39,7 +39,7 @@ pub enum ToStyle {
 ///
 // WARNING: please leave the following two trailing spaces, they matter for the documentation
 // formatting
-/// > **Note**  
+/// > **Note**
 /// > a [`Span`] can be passed to [`to_nuon`] if there is context available to the caller, e.g. when
 /// > using this function in a command implementation such as [`to nuon`](https://www.nushell.sh/commands/docs/to_nuon.html).
 ///
@@ -110,7 +110,7 @@ fn value_to_string(
         // Propagate existing errors
         Value::Error { error, .. } => Err(*error.clone()),
         // FIXME: make filesizes use the shortest lossless representation.
-        Value::Filesize { val, .. } => Ok(format!("{}b", *val)),
+        Value::Filesize { val, .. } => Ok(format!("{}b", val.get())),
         Value::Float { val, .. } => {
             // This serialises these as 'nan', 'inf' and '-inf', respectively.
             if &val.round() == val && val.is_finite() {

From dc9e8161d9c988fa56314b52f19255650699d6bf Mon Sep 17 00:00:00 2001
From: Renan Ribeiro <55855728+cosineblast@users.noreply.github.com>
Date: Fri, 29 Nov 2024 18:37:27 -0300
Subject: [PATCH 0734/1072] Implement chunk_by operation (#14410)

# Description

This pull requests implements a new ~~partition-by~~ `chunk-by` command.
The operation takes a closure and partitions the input list into
sublists based on the return value of the closure.
- fixes #14149

Examples, tests and and documentation were added accordingly.


![image](https://github.com/user-attachments/assets/c272e2ec-9af3-4a88-832b-ddca4eb14c8f)


![image](https://github.com/user-attachments/assets/178968e7-c165-4d8c-858c-98584d653b0a)
---
 crates/nu-command/src/default_context.rs     |   1 +
 crates/nu-command/src/filters/chunk_by.rs    | 256 +++++++++++++++++++
 crates/nu-command/src/filters/mod.rs         |   2 +
 crates/nu-command/tests/commands/chunk_by.rs |  58 +++++
 crates/nu-command/tests/commands/mod.rs      |   1 +
 5 files changed, 318 insertions(+)
 create mode 100644 crates/nu-command/src/filters/chunk_by.rs
 create mode 100644 crates/nu-command/tests/commands/chunk_by.rs

diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index 9903eed774..fcca72b2f2 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -64,6 +64,7 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             Length,
             Lines,
             ParEach,
+            ChunkBy,
             Prepend,
             Range,
             Reduce,
diff --git a/crates/nu-command/src/filters/chunk_by.rs b/crates/nu-command/src/filters/chunk_by.rs
new file mode 100644
index 0000000000..18a5110918
--- /dev/null
+++ b/crates/nu-command/src/filters/chunk_by.rs
@@ -0,0 +1,256 @@
+use super::utils::chain_error_with_input;
+use nu_engine::{command_prelude::*, ClosureEval};
+use nu_protocol::engine::Closure;
+use nu_protocol::Signals;
+
+#[derive(Clone)]
+pub struct ChunkBy;
+
+impl Command for ChunkBy {
+    fn name(&self) -> &str {
+        "chunk-by"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("chunk-by")
+            .input_output_types(vec![
+                (
+                    Type::List(Box::new(Type::Any)),
+                    Type::list(Type::list(Type::Any)),
+                ),
+                (Type::Range, Type::list(Type::list(Type::Any))),
+            ])
+            .required(
+                "closure",
+                SyntaxShape::Closure(Some(vec![SyntaxShape::Any])),
+                "The closure to run.",
+            )
+            .category(Category::Filters)
+    }
+
+    fn description(&self) -> &str {
+        r#"Divides a sequence into sub-sequences based on a closure."#
+    }
+
+    fn extra_description(&self) -> &str {
+        r#"chunk-by applies the given closure to each value of the input list, and groups
+consecutive elements that share the same closure result value into lists."#
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        chunk_by(engine_state, stack, call, input)
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Chunk data into runs of larger than zero or not.",
+                example: "[1, 3, -2, -2, 0, 1, 2] | chunk-by {|it| $it >= 0 }",
+                result: Some(Value::test_list(vec![
+                    Value::test_list(vec![Value::test_int(1), Value::test_int(3)]),
+                    Value::test_list(vec![Value::test_int(-2), Value::test_int(-2)]),
+                    Value::test_list(vec![
+                        Value::test_int(0),
+                        Value::test_int(1),
+                        Value::test_int(2),
+                    ]),
+                ])),
+            },
+            Example {
+                description: "Identify repetitions in a string",
+                example: r#"[a b b c c c] | chunk-by { |it| $it }"#,
+                result: Some(Value::test_list(vec![
+                    Value::test_list(vec![Value::test_string("a")]),
+                    Value::test_list(vec![Value::test_string("b"), Value::test_string("b")]),
+                    Value::test_list(vec![
+                        Value::test_string("c"),
+                        Value::test_string("c"),
+                        Value::test_string("c"),
+                    ]),
+                ])),
+            },
+            Example {
+                description: "Chunk values of range by predicate",
+                example: r#"(0..8) | chunk-by { |it| $it // 3 }"#,
+                result: Some(Value::test_list(vec![
+                    Value::test_list(vec![
+                        Value::test_int(0),
+                        Value::test_int(1),
+                        Value::test_int(2),
+                    ]),
+                    Value::test_list(vec![
+                        Value::test_int(3),
+                        Value::test_int(4),
+                        Value::test_int(5),
+                    ]),
+                    Value::test_list(vec![
+                        Value::test_int(6),
+                        Value::test_int(7),
+                        Value::test_int(8),
+                    ]),
+                ])),
+            },
+        ]
+    }
+}
+
+struct Chunk<I, T, F, K> {
+    iterator: I,
+    last_value: Option<(T, K)>,
+    closure: F,
+    done: bool,
+    signals: Signals,
+}
+
+impl<I, T, F, K> Chunk<I, T, F, K>
+where
+    I: Iterator<Item = T>,
+    F: FnMut(&T) -> K,
+    K: PartialEq,
+{
+    fn inner_iterator_next(&mut self) -> Option<I::Item> {
+        if self.signals.interrupted() {
+            self.done = true;
+            return None;
+        }
+        self.iterator.next()
+    }
+}
+
+impl<I, T, F, K> Iterator for Chunk<I, T, F, K>
+where
+    I: Iterator<Item = T>,
+    F: FnMut(&T) -> K,
+    K: PartialEq,
+{
+    type Item = Vec<T>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.done {
+            return None;
+        }
+
+        let (head, head_key) = match self.last_value.take() {
+            None => {
+                let head = self.inner_iterator_next()?;
+
+                let key = (self.closure)(&head);
+
+                (head, key)
+            }
+
+            Some((value, key)) => (value, key),
+        };
+
+        let mut result = vec![head];
+
+        loop {
+            match self.inner_iterator_next() {
+                None => {
+                    self.done = true;
+                    return Some(result);
+                }
+                Some(value) => {
+                    let value_key = (self.closure)(&value);
+
+                    if value_key == head_key {
+                        result.push(value);
+                    } else {
+                        self.last_value = Some((value, value_key));
+                        return Some(result);
+                    }
+                }
+            }
+        }
+    }
+}
+
+/// An iterator with the semantics of the chunk_by operation.
+fn chunk_iter_by<I, T, F, K>(iterator: I, signals: Signals, closure: F) -> Chunk<I, T, F, K>
+where
+    I: Iterator<Item = T>,
+    F: FnMut(&T) -> K,
+    K: PartialEq,
+{
+    Chunk {
+        closure,
+        iterator,
+        last_value: None,
+        done: false,
+        signals,
+    }
+}
+
+pub fn chunk_by(
+    engine_state: &EngineState,
+    stack: &mut Stack,
+    call: &Call,
+    input: PipelineData,
+) -> Result<PipelineData, ShellError> {
+    let head = call.head;
+    let closure: Closure = call.req(engine_state, stack, 0)?;
+
+    let metadata = input.metadata();
+
+    match input {
+        PipelineData::Empty => Ok(PipelineData::Empty),
+        PipelineData::Value(Value::Range { .. }, ..)
+        | PipelineData::Value(Value::List { .. }, ..)
+        | PipelineData::ListStream(..) => {
+            let closure = ClosureEval::new(engine_state, stack, closure);
+
+            let result = chunk_value_stream(
+                input.into_iter(),
+                closure,
+                head,
+                engine_state.signals().clone(),
+            );
+
+            Ok(result.into_pipeline_data(head, engine_state.signals().clone()))
+        }
+
+        PipelineData::ByteStream(..) | PipelineData::Value(..) => {
+            Err(input.unsupported_input_error("list", head))
+        }
+    }
+    .map(|data| data.set_metadata(metadata))
+}
+
+fn chunk_value_stream<I>(
+    iterator: I,
+    mut closure: ClosureEval,
+    head: Span,
+    signals: Signals,
+) -> impl Iterator<Item = Value> + 'static + Send
+where
+    I: Iterator<Item = Value> + 'static + Send,
+{
+    chunk_iter_by(iterator, signals, move |value| {
+        match closure.run_with_value(value.clone()) {
+            Ok(data) => data.into_value(head).unwrap_or_else(|error| {
+                Value::error(chain_error_with_input(error, value.is_error(), head), head)
+            }),
+
+            Err(error) => Value::error(chain_error_with_input(error, value.is_error(), head), head),
+        }
+    })
+    .map(move |it| Value::list(it, head))
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_examples() {
+        use crate::test_examples;
+
+        test_examples(ChunkBy {})
+    }
+}
diff --git a/crates/nu-command/src/filters/mod.rs b/crates/nu-command/src/filters/mod.rs
index 8b56bf7a87..f5e5118390 100644
--- a/crates/nu-command/src/filters/mod.rs
+++ b/crates/nu-command/src/filters/mod.rs
@@ -1,6 +1,7 @@
 mod all;
 mod any;
 mod append;
+mod chunk_by;
 mod chunks;
 mod columns;
 mod compact;
@@ -58,6 +59,7 @@ mod zip;
 pub use all::All;
 pub use any::Any;
 pub use append::Append;
+pub use chunk_by::ChunkBy;
 pub use chunks::Chunks;
 pub use columns::Columns;
 pub use compact::Compact;
diff --git a/crates/nu-command/tests/commands/chunk_by.rs b/crates/nu-command/tests/commands/chunk_by.rs
new file mode 100644
index 0000000000..1a5a1ed043
--- /dev/null
+++ b/crates/nu-command/tests/commands/chunk_by.rs
@@ -0,0 +1,58 @@
+use nu_test_support::{nu, pipeline};
+
+#[test]
+fn chunk_by_on_empty_input_returns_empty_list() {
+    let actual = nu!("[] | chunk-by {|it| $it} | to nuon");
+    assert!(actual.err.is_empty());
+    assert_eq!(actual.out, "[]");
+}
+
+#[test]
+fn chunk_by_strings_works() {
+    let sample = r#"
+                [a a a b b b c c c a a a]
+            "#;
+
+    let actual = nu!(pipeline(&format!(
+        r#"
+                {sample}
+                | chunk-by {{|it| $it}}
+                | to nuon
+            "#
+    )));
+
+    assert_eq!(actual.out, "[[a, a, a], [b, b, b], [c, c, c], [a, a, a]]");
+}
+
+#[test]
+fn chunk_by_field_works() {
+    let sample = r#"[
+    {
+        name: bob,
+        age: 20,
+        cool: false
+    },
+    {
+        name: jane,
+        age: 30,
+        cool: false
+    },
+    {
+        name: marie,
+        age: 19,
+        cool: true
+    },
+    {
+        name: carl,
+        age: 36,
+        cool: true
+    } ]"#;
+
+    let actual = nu!(pipeline(&format!(
+        r#"{sample}
+           | chunk-by {{|it| $it.cool}}
+           | length"#
+    )));
+
+    assert_eq!(actual.out, "2");
+}
diff --git a/crates/nu-command/tests/commands/mod.rs b/crates/nu-command/tests/commands/mod.rs
index 678b8d8896..a8ffdeb917 100644
--- a/crates/nu-command/tests/commands/mod.rs
+++ b/crates/nu-command/tests/commands/mod.rs
@@ -8,6 +8,7 @@ mod break_;
 mod bytes;
 mod cal;
 mod cd;
+mod chunk_by;
 mod chunks;
 mod compact;
 mod complete;

From 817830940bd2f3b31bfda1c1b7e60c3386d3a71d Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Sat, 30 Nov 2024 06:02:21 +0800
Subject: [PATCH 0735/1072] raise ParseError if assign to a non-variable or
 non-mutable-variable (#14405)

# Description
While reviewing #14388, I think we can make some improvement on parser.

For the following code:
```nushell
let a = 3
a = 10   # should be error
$a = 10 # another error
```
I think they can raise `ParseError`, so nushell doesn't need to move
forward compiling IR block.

# User-Facing Changes
```nushell
let a = 3
a = 10
```
Will raise parse error instead of compile error.

# Tests + Formatting
Added 1 test.
---
 crates/nu-command/tests/commands/mut_.rs     | 11 +++++++++
 crates/nu-parser/src/parser.rs               | 14 +++++++++++
 crates/nu-protocol/src/errors/parse_error.rs | 26 ++++++++++++++++++++
 3 files changed, 51 insertions(+)

diff --git a/crates/nu-command/tests/commands/mut_.rs b/crates/nu-command/tests/commands/mut_.rs
index 52aa9fcff1..7c55110f5f 100644
--- a/crates/nu-command/tests/commands/mut_.rs
+++ b/crates/nu-command/tests/commands/mut_.rs
@@ -148,3 +148,14 @@ fn def_should_not_mutate_mut() {
     assert!(actual.err.contains("capture of mutable variable"));
     assert!(!actual.status.success())
 }
+
+#[test]
+fn assign_to_non_mut_variable_raises_parse_error() {
+    let actual = nu!("let x = 3; $x = 4");
+    assert!(actual
+        .err
+        .contains("parser::assignment_requires_mutable_variable"));
+
+    let actual = nu!("mut x = 3; x = 5");
+    assert!(actual.err.contains("parser::assignment_requires_variable"));
+}
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index b2b5756ef0..0f8e699729 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -4988,6 +4988,20 @@ pub fn parse_assignment_expression(
 
     // Parse the lhs and operator as usual for a math expression
     let mut lhs = parse_expression(working_set, lhs_spans);
+    // make sure that lhs is a mutable variable.
+    match &lhs.expr {
+        Expr::FullCellPath(p) => {
+            if let Expr::Var(var_id) = p.head.expr {
+                if var_id != nu_protocol::ENV_VARIABLE_ID
+                    && !working_set.get_variable(var_id).mutable
+                {
+                    working_set.error(ParseError::AssignmentRequiresMutableVar(lhs.span))
+                }
+            }
+        }
+        _ => working_set.error(ParseError::AssignmentRequiresVar(lhs.span)),
+    }
+
     let mut operator = parse_assignment_operator(working_set, op_span);
 
     // Re-parse the right-hand side as a subexpression
diff --git a/crates/nu-protocol/src/errors/parse_error.rs b/crates/nu-protocol/src/errors/parse_error.rs
index ce8522daa1..786ce97509 100644
--- a/crates/nu-protocol/src/errors/parse_error.rs
+++ b/crates/nu-protocol/src/errors/parse_error.rs
@@ -515,6 +515,30 @@ pub enum ParseError {
         help("To spread arguments, the command needs to define a multi-positional parameter in its signature, such as ...rest")
     )]
     UnexpectedSpreadArg(String, #[label = "unexpected spread argument"] Span),
+
+    /// Invalid assignment left-hand side
+    ///
+    /// ## Resolution
+    ///
+    /// Assignment requires that you assign to a mutable variable or cell path.
+    #[error("Assignment to an immutable variable.")]
+    #[diagnostic(
+        code(nu::parser::assignment_requires_mutable_variable),
+        help("declare the variable with `mut`, or shadow it again with `let`")
+    )]
+    AssignmentRequiresMutableVar(#[label("needs to be a mutable variable")] Span),
+
+    /// Invalid assignment left-hand side
+    ///
+    /// ## Resolution
+    ///
+    /// Assignment requires that you assign to a variable or variable cell path.
+    #[error("Assignment operations require a variable.")]
+    #[diagnostic(
+        code(nu::parser::assignment_requires_variable),
+        help("try assigning to a variable or a cell path of a variable")
+    )]
+    AssignmentRequiresVar(#[label("needs to be a variable")] Span),
 }
 
 impl ParseError {
@@ -603,6 +627,8 @@ impl ParseError {
             ParseError::RedirectingBuiltinCommand(_, s, _) => *s,
             ParseError::UnexpectedSpreadArg(_, s) => *s,
             ParseError::ExtraTokensAfterClosingDelimiter(s) => *s,
+            ParseError::AssignmentRequiresVar(s) => *s,
+            ParseError::AssignmentRequiresMutableVar(s) => *s,
         }
     }
 }

From e17f6d654c920792ee4d8d931364b567bb531fc2 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Fri, 29 Nov 2024 17:06:26 -0500
Subject: [PATCH 0736/1072] Deprecate `date to-record` and `date to-table`
 (#14319)

# Description

Implements #11234 based on the comments there:

* (Previously implemented): `into record` handles nanoseconds (as well
as milliseconds and microseconds, which the deprecated commands didn't
support).
* Added deprecation warning to `date to-record` and `date to-table`
* Added new example for `into record` showing the conversion to a table
* Changed `std/dt` to use `into record`
* Added "Deprecated" category back to nu-protocol::Signature
* Assigned the deprecated commands to the Deprecated category so be
categorized properly in the online Doc.

# User-Facing Changes

Deprecated command warning

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

Searched doc for existing uses of `date to-record` and `date to-table`:

* For primary English-language docs, there are no uses other than in the
auto-generated command help, which will be updated based on this PR
* Other language translations appear to have an old use in several
places and will need to be updated to match the English-language doc.
---
 crates/nu-command/src/conversions/into/record.rs |  5 +++++
 crates/nu-command/src/date/to_record.rs          | 14 +++++++++++++-
 crates/nu-command/src/date/to_table.rs           | 13 ++++++++++++-
 crates/nu-protocol/src/signature.rs              |  2 ++
 crates/nu-std/std/dt/mod.nu                      |  4 ++--
 5 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/crates/nu-command/src/conversions/into/record.rs b/crates/nu-command/src/conversions/into/record.rs
index 445d81cb86..fea5fe1e4e 100644
--- a/crates/nu-command/src/conversions/into/record.rs
+++ b/crates/nu-command/src/conversions/into/record.rs
@@ -99,6 +99,11 @@ impl Command for SubCommand {
                     "timezone" => Value::test_string("+02:00"),
                 })),
             },
+            Example {
+                description: "convert date components to table columns",
+                example: "2020-04-12T22:10:57+02:00 | into record | transpose | transpose -r",
+                result: None,
+            },
         ]
     }
 }
diff --git a/crates/nu-command/src/date/to_record.rs b/crates/nu-command/src/date/to_record.rs
index f683ca1eec..fc28ba46f5 100644
--- a/crates/nu-command/src/date/to_record.rs
+++ b/crates/nu-command/src/date/to_record.rs
@@ -1,6 +1,7 @@
 use crate::date::utils::parse_date_from_string;
 use chrono::{DateTime, Datelike, FixedOffset, Local, Timelike};
 use nu_engine::command_prelude::*;
+use nu_protocol::{report_parse_warning, ParseWarning};
 
 #[derive(Clone)]
 pub struct SubCommand;
@@ -17,7 +18,7 @@ impl Command for SubCommand {
                 (Type::String, Type::record()),
             ])
             .allow_variants_without_examples(true) // https://github.com/nushell/nushell/issues/7032
-            .category(Category::Date)
+            .category(Category::Deprecated)
     }
 
     fn description(&self) -> &str {
@@ -35,6 +36,17 @@ impl Command for SubCommand {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
+        let head = call.head;
+        report_parse_warning(
+            &StateWorkingSet::new(engine_state),
+            &ParseWarning::DeprecatedWarning {
+                old_command: "date to-record".into(),
+                new_suggestion: "see `into record` command examples".into(),
+                span: head,
+                url: "`help into record`".into(),
+            },
+        );
+
         let head = call.head;
         // This doesn't match explicit nulls
         if matches!(input, PipelineData::Empty) {
diff --git a/crates/nu-command/src/date/to_table.rs b/crates/nu-command/src/date/to_table.rs
index 1588d40063..cb635b039f 100644
--- a/crates/nu-command/src/date/to_table.rs
+++ b/crates/nu-command/src/date/to_table.rs
@@ -1,6 +1,7 @@
 use crate::date::utils::parse_date_from_string;
 use chrono::{DateTime, Datelike, FixedOffset, Local, Timelike};
 use nu_engine::command_prelude::*;
+use nu_protocol::{report_parse_warning, ParseWarning};
 
 #[derive(Clone)]
 pub struct SubCommand;
@@ -17,7 +18,7 @@ impl Command for SubCommand {
                 (Type::String, Type::table()),
             ])
             .allow_variants_without_examples(true) // https://github.com/nushell/nushell/issues/7032
-            .category(Category::Date)
+            .category(Category::Deprecated)
     }
 
     fn description(&self) -> &str {
@@ -36,6 +37,16 @@ impl Command for SubCommand {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
+        report_parse_warning(
+            &StateWorkingSet::new(engine_state),
+            &ParseWarning::DeprecatedWarning {
+                old_command: "date to-table".into(),
+                new_suggestion: "see `into record` command examples".into(),
+                span: head,
+                url: "`help into record`".into(),
+            },
+        );
+
         // This doesn't match explicit nulls
         if matches!(input, PipelineData::Empty) {
             return Err(ShellError::PipelineEmpty { dst_span: head });
diff --git a/crates/nu-protocol/src/signature.rs b/crates/nu-protocol/src/signature.rs
index 30f8b280d1..549e23743f 100644
--- a/crates/nu-protocol/src/signature.rs
+++ b/crates/nu-protocol/src/signature.rs
@@ -44,6 +44,7 @@ pub enum Category {
     Date,
     Debug,
     Default,
+    Deprecated,
     Removed,
     Env,
     Experimental,
@@ -79,6 +80,7 @@ impl std::fmt::Display for Category {
             Category::Date => "date",
             Category::Debug => "debug",
             Category::Default => "default",
+            Category::Deprecated => "deprecated",
             Category::Removed => "removed",
             Category::Env => "env",
             Category::Experimental => "experimental",
diff --git a/crates/nu-std/std/dt/mod.nu b/crates/nu-std/std/dt/mod.nu
index 7090449994..682fa9587c 100644
--- a/crates/nu-std/std/dt/mod.nu
+++ b/crates/nu-std/std/dt/mod.nu
@@ -120,8 +120,8 @@ export def datetime-diff [
             }
         }
     }
-    let from_expanded = ($later | date to-timezone utc | date to-record)
-    let to_expanded = ($earlier | date to-timezone utc | date to-record)
+    let from_expanded = ($later | date to-timezone utc | into record)
+    let to_expanded = ($earlier | date to-timezone utc | into record)
 
     mut result = { year: ($from_expanded.year - $to_expanded.year), month: ($from_expanded.month - $to_expanded.month), day:0, hour:0, minute:0, second:0, millisecond:0, microsecond:0, nanosecond:0}
 

From e1f74a6d574ecb2bd78918d9aa57651f59cf47d5 Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Fri, 29 Nov 2024 20:02:26 -0500
Subject: [PATCH 0737/1072] Add label rendering to try/catch rendered errors
 (#14477)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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



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

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

Before this PR, you can access rendered error values that are raised in
a `try/catch` block by accessing the `rendered` element of the catch
error value:
```
$ try { ls nonexist.txt } catch {|e| print "my cool error:" $e.rendered }
my cool error:
nu::shell::directory_not_found

  × Directory not found
  help: /home/rose/nonexist.txt does not exist
```

However, the rendered errors don't include the labels present in the
real rendered error, which would look like this:
```
$ ls nonexist.txt
Error: nu::shell::directory_not_found

  × Directory not found
   ╭─[entry #46:1:4]
 1 │ ls nonexist.txt
   ·    ──────┬─────
   ·          ╰── directory not found
   ╰────
  help: /home/rose/nonexist.txt does not exist
```

After this PR, the rendered error includes the labels:

```
$ try { ls nonexist.txt } catch {|e| print "my cool error:" $e.rendered }
my cool error:
Error: nu::shell::directory_not_found

  × Directory not found
   ╭─[entry #4:1:10]
 1 │ try { ls nonexist.txt } catch {|e| print "my cool error:" $e.rendered }
   ·          ──────┬─────
   ·                ╰── directory not found
   ╰────
  help: /home/rose/nonexist.txt does not exist
```

This change is accomplished by using the standard error formatting code
to render an error. This respects the error theme as before without any
extra scaffolding, but it means that e.g., the terminal size is also
respected. I think this is fine because the way the error is rendered
already changed based on config, and I think that a "rendered" error
should give back _exactly_ what would be shown to the user anyway.

@fdncred, let me know if you have any concerns with the way this is
handled since you were the one who implemented this feature in the first
place.

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

The `rendered` element of the `try`/`catch` error record now includes
labels in the error output.

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

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

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

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


# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
N/A
---
 crates/nu-cmd-lang/src/core_commands/try_.rs  |  6 +-----
 crates/nu-engine/src/eval_ir.rs               | 18 +++++------------
 .../nu-protocol/src/errors/labeled_error.rs   | 17 ----------------
 crates/nu-protocol/src/errors/shell_error.rs  | 20 ++-----------------
 4 files changed, 8 insertions(+), 53 deletions(-)

diff --git a/crates/nu-cmd-lang/src/core_commands/try_.rs b/crates/nu-cmd-lang/src/core_commands/try_.rs
index c7242550a7..4b5361c681 100644
--- a/crates/nu-cmd-lang/src/core_commands/try_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/try_.rs
@@ -107,11 +107,7 @@ fn run_catch(
 
     if let Some(catch) = catch {
         stack.set_last_error(&error);
-        let fancy_errors = match engine_state.get_config().error_style {
-            nu_protocol::ErrorStyle::Fancy => true,
-            nu_protocol::ErrorStyle::Plain => false,
-        };
-        let error = error.into_value(span, fancy_errors);
+        let error = error.into_value(&StateWorkingSet::new(engine_state), span);
         let block = engine_state.get_block(catch.block_id);
         // Put the error value in the positional closure var
         if let Some(var) = block.signature.get_positional(0) {
diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index 1aec6b30ea..ee0d8624d2 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -4,7 +4,9 @@ use nu_path::{expand_path_with, AbsolutePathBuf};
 use nu_protocol::{
     ast::{Bits, Block, Boolean, CellPath, Comparison, Math, Operator},
     debugger::DebugContext,
-    engine::{Argument, Closure, EngineState, ErrorHandler, Matcher, Redirection, Stack},
+    engine::{
+        Argument, Closure, EngineState, ErrorHandler, Matcher, Redirection, Stack, StateWorkingSet,
+    },
     ir::{Call, DataSlice, Instruction, IrAstRef, IrBlock, Literal, RedirectMode},
     ByteStreamSource, DataSource, DeclId, ErrSpan, Flag, IntoPipelineData, IntoSpanned, ListStream,
     OutDest, PipelineData, PipelineMetadata, PositionalArg, Range, Record, RegId, ShellError,
@@ -220,17 +222,8 @@ fn eval_ir_block_impl<D: DebugContext>(
             }
             Err(err) => {
                 if let Some(error_handler) = ctx.stack.error_handlers.pop(ctx.error_handler_base) {
-                    let fancy_errors = match ctx.engine_state.get_config().error_style {
-                        nu_protocol::ErrorStyle::Fancy => true,
-                        nu_protocol::ErrorStyle::Plain => false,
-                    };
                     // If an error handler is set, branch there
-                    prepare_error_handler(
-                        ctx,
-                        error_handler,
-                        Some(err.into_spanned(*span)),
-                        fancy_errors,
-                    );
+                    prepare_error_handler(ctx, error_handler, Some(err.into_spanned(*span)));
                     pc = error_handler.handler_index;
                 } else {
                     // If not, exit the block with the error
@@ -255,7 +248,6 @@ fn prepare_error_handler(
     ctx: &mut EvalContext<'_>,
     error_handler: ErrorHandler,
     error: Option<Spanned<ShellError>>,
-    fancy_errors: bool,
 ) {
     if let Some(reg_id) = error_handler.error_register {
         if let Some(error) = error {
@@ -266,7 +258,7 @@ fn prepare_error_handler(
                 reg_id,
                 error
                     .item
-                    .into_value(error.span, fancy_errors)
+                    .into_value(&StateWorkingSet::new(ctx.engine_state), error.span)
                     .into_pipeline_data(),
             );
         } else {
diff --git a/crates/nu-protocol/src/errors/labeled_error.rs b/crates/nu-protocol/src/errors/labeled_error.rs
index a207178415..c76a6c78dd 100644
--- a/crates/nu-protocol/src/errors/labeled_error.rs
+++ b/crates/nu-protocol/src/errors/labeled_error.rs
@@ -139,23 +139,6 @@ impl LabeledError {
         self
     }
 
-    pub fn render_error_to_string(diag: impl miette::Diagnostic, fancy_errors: bool) -> String {
-        let theme = if fancy_errors {
-            miette::GraphicalTheme::unicode()
-        } else {
-            miette::GraphicalTheme::none()
-        };
-
-        let mut out = String::new();
-        miette::GraphicalReportHandler::new()
-            .with_width(80)
-            .with_theme(theme)
-            .render_report(&mut out, &diag)
-            .unwrap_or_default();
-
-        out
-    }
-
     /// Create a [`LabeledError`] from a type that implements [`miette::Diagnostic`].
     ///
     /// # Example
diff --git a/crates/nu-protocol/src/errors/shell_error.rs b/crates/nu-protocol/src/errors/shell_error.rs
index b4b6c29cee..9e934e7f64 100644
--- a/crates/nu-protocol/src/errors/shell_error.rs
+++ b/crates/nu-protocol/src/errors/shell_error.rs
@@ -1479,15 +1479,14 @@ impl ShellError {
         }
     }
 
-    pub fn into_value(self, span: Span, fancy_errors: bool) -> Value {
+    pub fn into_value(self, working_set: &StateWorkingSet, span: Span) -> Value {
         let exit_code = self.external_exit_code();
 
         let mut record = record! {
             "msg" => Value::string(self.to_string(), span),
             "debug" => Value::string(format!("{self:?}"), span),
             "raw" => Value::error(self.clone(), span),
-            // "labeled_error" => Value::string(LabeledError::from_diagnostic_and_render(self.clone()), span),
-            "rendered" => Value::string(ShellError::render_error_to_string(self.clone(), fancy_errors), span),
+            "rendered" => Value::string(format_shell_error(working_set, &self), span),
             "json" => Value::string(serde_json::to_string(&self).expect("Could not serialize error"), span),
         };
 
@@ -1507,21 +1506,6 @@ impl ShellError {
             span,
         )
     }
-    pub fn render_error_to_string(diag: impl miette::Diagnostic, fancy_errors: bool) -> String {
-        let theme = if fancy_errors {
-            miette::GraphicalTheme::unicode()
-        } else {
-            miette::GraphicalTheme::none()
-        };
-        let mut out = String::new();
-        miette::GraphicalReportHandler::new()
-            .with_width(80)
-            .with_theme(theme)
-            .render_report(&mut out, &diag)
-            .unwrap_or_default();
-
-        out
-    }
 }
 
 impl From<io::Error> for ShellError {

From 0172ad8461edcbfc9c924d75fdf612ed73788823 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Fri, 29 Nov 2024 17:39:07 -0800
Subject: [PATCH 0738/1072] Upgrading to polars 0.44 (#14478)

Upgrading to polars 0.44
---
 Cargo.lock                                    | 883 +++++++++++++++---
 crates/nu_plugin_polars/Cargo.toml            |  12 +-
 .../dataframe/command/aggregation/quantile.rs |   6 +-
 .../src/dataframe/command/core/open.rs        |  19 +-
 .../src/dataframe/command/core/summary.rs     |  12 +-
 .../src/dataframe/command/data/rename.rs      |   2 +-
 .../src/dataframe/command/string/str_slice.rs |   5 +-
 .../values/nu_dataframe/between_values.rs     |   4 +-
 .../values/nu_dataframe/conversion.rs         |  87 +-
 .../src/dataframe/values/nu_dataframe/mod.rs  |  28 +-
 .../values/nu_dataframe/operations.rs         |   6 +-
 .../src/dataframe/values/nu_expression/mod.rs |   4 +-
 12 files changed, 836 insertions(+), 232 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ecad53d2d8..1e4b123f81 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -221,6 +221,12 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf7d0a018de4f6aa429b9d33d69edf69072b1c5b1cb8d3e4a5f7ef898fc3eb76"
 
+[[package]]
+name = "arrayref"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
+
 [[package]]
 name = "arrayvec"
 version = "0.5.2"
@@ -376,7 +382,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "shlex",
  "syn 2.0.87",
 ]
@@ -423,6 +429,19 @@ dependencies = [
  "wyz",
 ]
 
+[[package]]
+name = "blake3"
+version = "1.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e"
+dependencies = [
+ "arrayref",
+ "arrayvec 0.7.6",
+ "cc",
+ "cfg-if",
+ "constant_time_eq",
+]
+
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -753,6 +772,33 @@ dependencies = [
  "stacker",
 ]
 
+[[package]]
+name = "ciborium"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
+dependencies = [
+ "ciborium-io",
+ "ciborium-ll",
+ "serde",
+]
+
+[[package]]
+name = "ciborium-io"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
+
+[[package]]
+name = "ciborium-ll"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
+dependencies = [
+ "ciborium-io",
+ "half",
+]
+
 [[package]]
 name = "clang-sys"
 version = "1.8.1"
@@ -793,7 +839,7 @@ version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
 dependencies = [
- "heck",
+ "heck 0.5.0",
  "proc-macro2",
  "quote",
  "syn 2.0.87",
@@ -931,6 +977,12 @@ dependencies = [
  "unicode-xid",
 ]
 
+[[package]]
+name = "constant_time_eq"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
+
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -941,6 +993,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "core-foundation"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.7"
@@ -1571,9 +1633,9 @@ dependencies = [
 
 [[package]]
 name = "float-cmp"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
+checksum = "b09cf3155332e944990140d967ff5eceb70df778b34f77d8075db46e4704e6d8"
 dependencies = [
  "num-traits",
 ]
@@ -1614,6 +1676,16 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "fs4"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8c6b3bd49c37d2aa3f3f2220233b29a7cd23f79d1fe70e5337d25fb390793de"
+dependencies = [
+ "rustix",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "fs_extra"
 version = "1.3.0"
@@ -1854,6 +1926,16 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "half"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
+dependencies = [
+ "cfg-if",
+ "crunchy",
+]
+
 [[package]]
 name = "halfbrown"
 version = "0.2.5"
@@ -1903,6 +1985,8 @@ dependencies = [
  "allocator-api2",
  "equivalent",
  "foldhash",
+ "rayon",
+ "serde",
 ]
 
 [[package]]
@@ -1924,6 +2008,12 @@ dependencies = [
  "stable_deref_trait",
 ]
 
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -2067,6 +2157,25 @@ dependencies = [
  "pin-project-lite",
  "smallvec",
  "tokio",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.27.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
+dependencies = [
+ "futures-util",
+ "http",
+ "hyper",
+ "hyper-util",
+ "rustls",
+ "rustls-native-certs",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
 ]
 
 [[package]]
@@ -2076,12 +2185,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
  "bytes",
+ "futures-channel",
  "futures-util",
  "http",
  "http-body",
  "hyper",
  "pin-project-lite",
+ "socket2",
  "tokio",
+ "tower-service",
+ "tracing",
 ]
 
 [[package]]
@@ -2279,6 +2392,12 @@ dependencies = [
  "web-time",
 ]
 
+[[package]]
+name = "indoc"
+version = "2.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
+
 [[package]]
 name = "inotify"
 version = "0.9.6"
@@ -2318,6 +2437,12 @@ version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767"
 
+[[package]]
+name = "ipnet"
+version = "2.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
+
 [[package]]
 name = "is-docker"
 version = "0.2.0"
@@ -2475,70 +2600,6 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
-[[package]]
-name = "lexical-core"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0431c65b318a590c1de6b8fd6e72798c92291d27762d94c9e6c37ed7a73d8458"
-dependencies = [
- "lexical-parse-float",
- "lexical-parse-integer",
- "lexical-util",
- "lexical-write-float",
- "lexical-write-integer",
-]
-
-[[package]]
-name = "lexical-parse-float"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb17a4bdb9b418051aa59d41d65b1c9be5affab314a872e5ad7f06231fb3b4e0"
-dependencies = [
- "lexical-parse-integer",
- "lexical-util",
- "static_assertions",
-]
-
-[[package]]
-name = "lexical-parse-integer"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5df98f4a4ab53bf8b175b363a34c7af608fe31f93cc1fb1bf07130622ca4ef61"
-dependencies = [
- "lexical-util",
- "static_assertions",
-]
-
-[[package]]
-name = "lexical-util"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85314db53332e5c192b6bca611fb10c114a80d1b831ddac0af1e9be1b9232ca0"
-dependencies = [
- "static_assertions",
-]
-
-[[package]]
-name = "lexical-write-float"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e7c3ad4e37db81c1cbe7cf34610340adc09c322871972f74877a712abc6c809"
-dependencies = [
- "lexical-util",
- "lexical-write-integer",
- "static_assertions",
-]
-
-[[package]]
-name = "lexical-write-integer"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb89e9f6958b83258afa3deed90b5de9ef68eef090ad5086c791cd2345610162"
-dependencies = [
- "lexical-util",
- "static_assertions",
-]
-
 [[package]]
 name = "libc"
 version = "0.2.162"
@@ -2849,6 +2910,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "miette"
 version = "7.4.0"
@@ -3016,7 +3086,7 @@ dependencies = [
  "openssl-probe",
  "openssl-sys",
  "schannel",
- "security-framework",
+ "security-framework 2.11.1",
  "security-framework-sys",
  "tempfile",
 ]
@@ -3217,7 +3287,7 @@ name = "nu-cmd-extra"
 version = "0.100.1"
 dependencies = [
  "fancy-regex",
- "heck",
+ "heck 0.5.0",
  "itertools 0.13.0",
  "nu-ansi-term",
  "nu-cmd-base",
@@ -3386,7 +3456,7 @@ dependencies = [
 name = "nu-derive-value"
 version = "0.100.1"
 dependencies = [
- "heck",
+ "heck 0.5.0",
  "proc-macro-error",
  "proc-macro2",
  "quote",
@@ -3593,7 +3663,7 @@ dependencies = [
  "dirs",
  "dirs-sys",
  "fancy-regex",
- "heck",
+ "heck 0.5.0",
  "indexmap",
  "log",
  "lru",
@@ -4034,6 +4104,36 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "object_store"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6da452820c715ce78221e8202ccc599b4a52f3e1eb3eedb487b680c81a8e3f3"
+dependencies = [
+ "async-trait",
+ "base64",
+ "bytes",
+ "chrono",
+ "futures",
+ "humantime",
+ "hyper",
+ "itertools 0.13.0",
+ "md-5",
+ "parking_lot",
+ "percent-encoding",
+ "quick-xml 0.36.2",
+ "rand",
+ "reqwest",
+ "ring",
+ "serde",
+ "serde_json",
+ "snafu",
+ "tokio",
+ "tracing",
+ "url",
+ "walkdir",
+]
+
 [[package]]
 name = "oem_cp"
 version = "2.0.0"
@@ -4200,16 +4300,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "parquet-format-safe"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1131c54b167dd4e4799ce762e1ab01549ebb94d5bdd13e6ec1b467491c378e1f"
-dependencies = [
- "async-trait",
- "futures",
-]
-
 [[package]]
 name = "parse-zoneinfo"
 version = "0.3.1"
@@ -4438,9 +4528,9 @@ dependencies = [
 
 [[package]]
 name = "polars"
-version = "0.43.1"
+version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e248cf2f0069277f8fe80d413cfb9240c7dd1cfa382b5674c1b4afa57222747"
+checksum = "f65c6aa86d991a64c95416a61202f7952da2f8cccefa448f9a23c1b8f2301ecc"
 dependencies = [
  "getrandom",
  "polars-arrow",
@@ -4458,9 +4548,9 @@ dependencies = [
 
 [[package]]
 name = "polars-arrow"
-version = "0.43.1"
+version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2981d5b2f34c84069a39fceca0d36dffeb97db8cadba101e7ea6605c8d42294d"
+checksum = "87dbb24d29ddea5abb73d7954df8b8d3d4bb7f02a3e5c96d1519cdad9e816a3d"
 dependencies = [
  "ahash 0.8.11",
  "atoi",
@@ -4473,9 +4563,8 @@ dependencies = [
  "either",
  "ethnum",
  "fast-float",
- "futures",
  "getrandom",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.1",
  "itoa",
  "itoap",
  "lz4",
@@ -4491,6 +4580,7 @@ dependencies = [
  "simdutf8",
  "streaming-iterator",
  "strength_reduce",
+ "strum_macros",
  "version_check",
  "zstd",
 ]
@@ -4507,9 +4597,9 @@ dependencies = [
 
 [[package]]
 name = "polars-compute"
-version = "0.43.1"
+version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a97b2a5c9b880ab7e52553c40a336fdb6e3244bf896b4d4917700defe8085d5"
+checksum = "cbdb1071147452a4c4b25560f23d2fbaffef255b04757291131b22fc2c0d35b2"
 dependencies = [
  "bytemuck",
  "either",
@@ -4523,9 +4613,9 @@ dependencies = [
 
 [[package]]
 name = "polars-core"
-version = "0.43.1"
+version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5bc2cadcca904a9dc4d2c2b437c346712806e9a678bf17c7e94ebf622faae76"
+checksum = "dd5df9b55e614088a3270b06f8649dce76537c268d6b1ca4d9c37008b2be5949"
 dependencies = [
  "ahash 0.8.11",
  "bitflags 2.6.0",
@@ -4535,6 +4625,7 @@ dependencies = [
  "comfy-table",
  "either",
  "hashbrown 0.14.5",
+ "hashbrown 0.15.1",
  "indexmap",
  "num-traits",
  "once_cell",
@@ -4550,6 +4641,7 @@ dependencies = [
  "regex",
  "serde",
  "serde_json",
+ "strum_macros",
  "thiserror 1.0.69",
  "version_check",
  "xxhash-rust",
@@ -4557,11 +4649,12 @@ dependencies = [
 
 [[package]]
 name = "polars-error"
-version = "0.43.1"
+version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56b0a8eb9b1e56a4640de6887d613cb4de73c4e09d491f3b779855d4c3bcb9ba"
+checksum = "4643898a644f30c83737db85f942f8c8956b0c11190b39afec745218eae1746b"
 dependencies = [
  "avro-schema",
+ "object_store",
  "polars-arrow-format",
  "regex",
  "simdutf8",
@@ -4570,12 +4663,14 @@ dependencies = [
 
 [[package]]
 name = "polars-expr"
-version = "0.43.1"
+version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34e9c0e8c7ba93aac64051b92dc68eac5a0e9543cf44ca784467db2c035821fe"
+checksum = "ea1b431ed816cba1120cff200f06b962748001bbb2e615ce53cfbbdf701cc136"
 dependencies = [
  "ahash 0.8.11",
  "bitflags 2.6.0",
+ "hashbrown 0.15.1",
+ "num-traits",
  "once_cell",
  "polars-arrow",
  "polars-compute",
@@ -4583,32 +4678,37 @@ dependencies = [
  "polars-io",
  "polars-ops",
  "polars-plan",
+ "polars-row",
  "polars-time",
  "polars-utils",
+ "rand",
  "rayon",
 ]
 
 [[package]]
 name = "polars-io"
-version = "0.43.1"
+version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "454ebbebe1cb8cb4768adca44b8fc9431abc3c91d5927f6824e73f916bced911"
+checksum = "b2fab2c016635cb416b49461fd6419b0208c6c13a4fd065bd65e4a87dbb66314"
 dependencies = [
  "ahash 0.8.11",
  "async-trait",
  "atoi_simd",
+ "blake3",
  "bytes",
  "chrono",
  "fast-float",
  "flate2",
+ "fs4",
  "futures",
  "glob",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.1",
  "home",
  "itoa",
  "memchr",
  "memmap2",
  "num-traits",
+ "object_store",
  "once_cell",
  "percent-encoding",
  "polars-arrow",
@@ -4619,27 +4719,31 @@ dependencies = [
  "polars-schema",
  "polars-time",
  "polars-utils",
+ "pyo3",
  "rayon",
  "regex",
+ "reqwest",
  "ryu",
  "serde",
+ "serde_json",
  "simd-json",
  "simdutf8",
  "tokio",
  "tokio-util",
+ "url",
  "zstd",
 ]
 
 [[package]]
 name = "polars-json"
-version = "0.43.1"
+version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ca086fbbff6e46efbc97032e93f92690c1fc9c662fd5e1f13a42922bd7d3aa4"
+checksum = "d5c8c057ef04feaf34b6ce52096bdea3a766fa4725f50442078c8a4ee86397bf"
 dependencies = [
  "ahash 0.8.11",
  "chrono",
  "fallible-streaming-iterator",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.1",
  "indexmap",
  "itoa",
  "num-traits",
@@ -4653,9 +4757,9 @@ dependencies = [
 
 [[package]]
 name = "polars-lazy"
-version = "0.43.1"
+version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e61c062e833d2376de0a4cf745504449215cbf499cea293cb592e674ffb39ca"
+checksum = "4a8ca74f42e7b47cad241b36b98d991cc7fbb51b8d0695a055eb937588d1f310"
 dependencies = [
  "ahash 0.8.11",
  "bitflags 2.6.0",
@@ -4670,6 +4774,7 @@ dependencies = [
  "polars-ops",
  "polars-pipe",
  "polars-plan",
+ "polars-stream",
  "polars-time",
  "polars-utils",
  "rayon",
@@ -4678,10 +4783,11 @@ dependencies = [
 
 [[package]]
 name = "polars-mem-engine"
-version = "0.43.1"
+version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0643812829cc990e1533a5bf48c21a1b3eaa46aabf2967b0f53f99097cbc74c"
+checksum = "7a32614e5b52c9b83856d80c7e2880b79d83055bfd59969bd1d0b148f9cfdc7a"
 dependencies = [
+ "futures",
  "memmap2",
  "polars-arrow",
  "polars-core",
@@ -4693,14 +4799,16 @@ dependencies = [
  "polars-plan",
  "polars-time",
  "polars-utils",
+ "pyo3",
  "rayon",
+ "tokio",
 ]
 
 [[package]]
 name = "polars-ops"
-version = "0.43.1"
+version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ac14a136d87bea798f3db51d5987556deb2293da34bfc8b105ebffa05f6e810"
+checksum = "035c800fbe5bbd820afeb8313713ed345853bb014e0f821a4025d40cf0d60e1a"
 dependencies = [
  "ahash 0.8.11",
  "argminmax",
@@ -4709,7 +4817,7 @@ dependencies = [
  "chrono",
  "chrono-tz 0.8.6",
  "either",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.1",
  "hex",
  "indexmap",
  "jsonpath_lib_polars_vendor",
@@ -4726,17 +4834,19 @@ dependencies = [
  "rand_distr",
  "rayon",
  "regex",
+ "regex-syntax",
  "serde",
  "serde_json",
+ "strum_macros",
  "unicode-reverse",
  "version_check",
 ]
 
 [[package]]
 name = "polars-parquet"
-version = "0.43.1"
+version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "491f5af321169259d5b1294c9fe8ed89faaeac34b4dec4abcedc0d1b3d11013a"
+checksum = "91dcf1d9f048079376949eaf2e24e240b313ff4a102fb83b57c9a5f807cdca52"
 dependencies = [
  "ahash 0.8.11",
  "async-stream",
@@ -4746,13 +4856,13 @@ dependencies = [
  "ethnum",
  "flate2",
  "futures",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.1",
  "lz4",
  "num-traits",
- "parquet-format-safe",
  "polars-arrow",
  "polars-compute",
  "polars-error",
+ "polars-parquet-format",
  "polars-utils",
  "serde",
  "simdutf8",
@@ -4762,16 +4872,26 @@ dependencies = [
 ]
 
 [[package]]
-name = "polars-pipe"
-version = "0.43.1"
+name = "polars-parquet-format"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29215c31f599295cc0f803c42fc812cc518db6d5ed4d6c7cc03daf3976a0add5"
+checksum = "c025243dcfe8dbc57e94d9f82eb3bef10b565ab180d5b99bed87fd8aea319ce1"
+dependencies = [
+ "async-trait",
+ "futures",
+]
+
+[[package]]
+name = "polars-pipe"
+version = "0.44.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05936f2b3981eecb2fe74d8ef092bb75a93d2a056b3e4f339f4ac20c71c9e331"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-queue",
  "enum_dispatch",
  "futures",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.1",
  "num-traits",
  "polars-arrow",
  "polars-compute",
@@ -4789,9 +4909,9 @@ dependencies = [
 
 [[package]]
 name = "polars-plan"
-version = "0.43.1"
+version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3f728df4bc643492a2057a0a125c7e550cbcfe35b391444653ad294be9ab190"
+checksum = "23de436f33f4d1134c58f24e7059a221b957ec20730807e0ef0c80c8e4b3d06a"
 dependencies = [
  "ahash 0.8.11",
  "bitflags 2.6.0",
@@ -4799,9 +4919,12 @@ dependencies = [
  "bytes",
  "chrono",
  "chrono-tz 0.8.6",
+ "ciborium",
  "either",
- "hashbrown 0.14.5",
+ "futures",
+ "hashbrown 0.15.1",
  "memmap2",
+ "num-traits",
  "once_cell",
  "percent-encoding",
  "polars-arrow",
@@ -4812,6 +4935,7 @@ dependencies = [
  "polars-parquet",
  "polars-time",
  "polars-utils",
+ "pyo3",
  "rayon",
  "recursive",
  "regex",
@@ -4822,9 +4946,9 @@ dependencies = [
 
 [[package]]
 name = "polars-row"
-version = "0.43.1"
+version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eb931f0929ca7498b3ed5056357d2d364cad42cce95383a7e3983dbceb4bed1"
+checksum = "3823d3de3e614509bba6929798f1f3d5ae05c1cdfc4eb7029d2ec6ad77201da2"
 dependencies = [
  "bytemuck",
  "polars-arrow",
@@ -4834,9 +4958,9 @@ dependencies = [
 
 [[package]]
 name = "polars-schema"
-version = "0.43.1"
+version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c7e1234b942d3244024ecbac9c7f5a48a52a815f8ca4b9d075fbba16afb1a39"
+checksum = "d88667f770291cefa2e8cd366a54f29dc6fe362e9a263914c903db411a58ac1d"
 dependencies = [
  "indexmap",
  "polars-error",
@@ -4847,9 +4971,9 @@ dependencies = [
 
 [[package]]
 name = "polars-sql"
-version = "0.43.1"
+version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce52bfd2ef1e2e18ac26d7d7ea3f9132b199cff06d975156703fa5badcfae187"
+checksum = "69451f08363bb497407f6ebebe00bc01972a51716d20d115b75f9b5326f1f3c8"
 dependencies = [
  "hex",
  "once_cell",
@@ -4868,10 +4992,39 @@ dependencies = [
 ]
 
 [[package]]
-name = "polars-time"
-version = "0.43.1"
+name = "polars-stream"
+version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9925ab75e1d859ae2283ca09d7683198b0b9ff5afecd03f2c9180f3e36e35056"
+checksum = "188622b0a4bc4530cf91a288134254ffa065d18932e261075377914225e757c2"
+dependencies = [
+ "atomic-waker",
+ "crossbeam-deque",
+ "crossbeam-utils",
+ "futures",
+ "memmap2",
+ "parking_lot",
+ "pin-project-lite",
+ "polars-core",
+ "polars-error",
+ "polars-expr",
+ "polars-io",
+ "polars-mem-engine",
+ "polars-parquet",
+ "polars-plan",
+ "polars-utils",
+ "rand",
+ "rayon",
+ "recursive",
+ "slotmap",
+ "tokio",
+ "version_check",
+]
+
+[[package]]
+name = "polars-time"
+version = "0.44.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90f36e4d6b19f2c406faea585b9a1814f422fc5b310f65ccf8a55216df0754ef"
 dependencies = [
  "atoi",
  "bytemuck",
@@ -4886,25 +5039,27 @@ dependencies = [
  "polars-utils",
  "regex",
  "serde",
+ "strum_macros",
 ]
 
 [[package]]
 name = "polars-utils"
-version = "0.43.1"
+version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b44846e1fc6ae1dfdc7f65a37af7d270d0a6a17a58fff76716561f5b887a8ad7"
+checksum = "96186b70bda00c90b5027bf2f69193c5c40571e80d3e8ec505c22cdc8e3e39aa"
 dependencies = [
  "ahash 0.8.11",
  "bytemuck",
  "bytes",
  "compact_str 0.8.0",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.1",
  "indexmap",
  "libc",
  "memmap2",
  "num-traits",
  "once_cell",
  "polars-error",
+ "pyo3",
  "raw-cpuid",
  "rayon",
  "serde",
@@ -5107,6 +5262,69 @@ dependencies = [
  "thiserror 1.0.69",
 ]
 
+[[package]]
+name = "pyo3"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8"
+dependencies = [
+ "cfg-if",
+ "indoc",
+ "libc",
+ "memoffset",
+ "parking_lot",
+ "portable-atomic",
+ "pyo3-build-config",
+ "pyo3-ffi",
+ "pyo3-macros",
+ "unindent",
+]
+
+[[package]]
+name = "pyo3-build-config"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50"
+dependencies = [
+ "once_cell",
+ "target-lexicon",
+]
+
+[[package]]
+name = "pyo3-ffi"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403"
+dependencies = [
+ "libc",
+ "pyo3-build-config",
+]
+
+[[package]]
+name = "pyo3-macros"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c"
+dependencies = [
+ "proc-macro2",
+ "pyo3-macros-backend",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "pyo3-macros-backend"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2",
+ "pyo3-build-config",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "quick-error"
 version = "1.2.3"
@@ -5145,6 +5363,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe"
 dependencies = [
  "memchr",
+ "serde",
 ]
 
 [[package]]
@@ -5178,6 +5397,58 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "quinn"
+version = "0.11.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
+dependencies = [
+ "bytes",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash 2.0.0",
+ "rustls",
+ "socket2",
+ "thiserror 2.0.3",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "quinn-proto"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
+dependencies = [
+ "bytes",
+ "getrandom",
+ "rand",
+ "ring",
+ "rustc-hash 2.0.0",
+ "rustls",
+ "rustls-pki-types",
+ "slab",
+ "thiserror 2.0.3",
+ "tinyvec",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-udp"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d5a626c6807713b15cac82a6acaccd6043c9a5408c24baae07611fec3f243da"
+dependencies = [
+ "cfg_aliases 0.2.1",
+ "libc",
+ "once_cell",
+ "socket2",
+ "tracing",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.37"
@@ -5420,6 +5691,51 @@ dependencies = [
  "bytecheck",
 ]
 
+[[package]]
+name = "reqwest"
+version = "0.12.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
+dependencies = [
+ "base64",
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-rustls",
+ "hyper-util",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "quinn",
+ "rustls",
+ "rustls-native-certs",
+ "rustls-pemfile",
+ "rustls-pki-types",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "tokio",
+ "tokio-rustls",
+ "tokio-util",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-streams",
+ "web-sys",
+ "windows-registry",
+]
+
 [[package]]
 name = "rfc2047-decoder"
 version = "1.0.6"
@@ -5434,6 +5750,21 @@ dependencies = [
  "thiserror 2.0.3",
 ]
 
+[[package]]
+name = "ring"
+version = "0.17.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom",
+ "libc",
+ "spin",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "rkyv"
 version = "0.7.45"
@@ -5622,6 +5953,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
+[[package]]
+name = "rustc-hash"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+
 [[package]]
 name = "rustc_version"
 version = "0.4.1"
@@ -5644,6 +5981,61 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.23.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1"
+dependencies = [
+ "once_cell",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3"
+dependencies = [
+ "openssl-probe",
+ "rustls-pki-types",
+ "schannel",
+ "security-framework 3.0.1",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
+dependencies = [
+ "web-time",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.102.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.18"
@@ -5749,7 +6141,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
  "bitflags 2.6.0",
- "core-foundation",
+ "core-foundation 0.9.4",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1415a607e92bec364ea2cf9264646dcce0f91e6d65281bd6f2819cca3bf39c8"
+dependencies = [
+ "bitflags 2.6.0",
+ "core-foundation 0.10.0",
  "core-foundation-sys",
  "libc",
  "security-framework-sys",
@@ -5975,14 +6380,13 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
 
 [[package]]
 name = "simd-json"
-version = "0.13.11"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0228a564470f81724e30996bbc2b171713b37b15254a6440c7e2d5449b95691"
+checksum = "aa2bcf6c6e164e81bc7a5d49fc6988b3d515d9e8c07457d7b74ffb9324b9cd40"
 dependencies = [
  "ahash 0.8.11",
  "getrandom",
  "halfbrown",
- "lexical-core",
  "once_cell",
  "ref-cast",
  "serde",
@@ -6029,12 +6433,43 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "slotmap"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a"
+dependencies = [
+ "version_check",
+]
+
 [[package]]
 name = "smallvec"
 version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
+[[package]]
+name = "snafu"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6"
+dependencies = [
+ "doc-comment",
+ "snafu-derive",
+]
+
+[[package]]
+name = "snafu-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "snap"
 version = "1.1.1"
@@ -6051,6 +6486,12 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
 [[package]]
 name = "sqlparser"
 version = "0.49.0"
@@ -6178,13 +6619,19 @@ version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
 dependencies = [
- "heck",
+ "heck 0.5.0",
  "proc-macro2",
  "quote",
  "rustversion",
  "syn 2.0.87",
 ]
 
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
 [[package]]
 name = "supports-color"
 version = "2.1.0"
@@ -6259,6 +6706,15 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "sync_wrapper"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+dependencies = [
+ "futures-core",
+]
+
 [[package]]
 name = "synstructure"
 version = "0.13.1"
@@ -6350,6 +6806,12 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1bbb9f3c5c463a01705937a24fdabc5047929ac764b2d5b9cf681c1f5041ed5"
 
+[[package]]
+name = "target-lexicon"
+version = "0.12.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+
 [[package]]
 name = "tempfile"
 version = "3.14.0"
@@ -6550,9 +7012,32 @@ dependencies = [
  "parking_lot",
  "pin-project-lite",
  "socket2",
+ "tokio-macros",
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "tokio-macros"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+dependencies = [
+ "rustls",
+ "rustls-pki-types",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-util"
 version = "0.7.12"
@@ -6626,6 +7111,12 @@ dependencies = [
  "winnow 0.6.20",
 ]
 
+[[package]]
+name = "tower-service"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+
 [[package]]
 name = "tracing"
 version = "0.1.40"
@@ -6633,9 +7124,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
  "pin-project-lite",
+ "tracing-attributes",
  "tracing-core",
 ]
 
+[[package]]
+name = "tracing-attributes"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "tracing-core"
 version = "0.1.32"
@@ -6681,6 +7184,12 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc"
 
+[[package]]
+name = "try-lock"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+
 [[package]]
 name = "typed-arena"
 version = "1.7.0"
@@ -6800,12 +7309,24 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
+[[package]]
+name = "unindent"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
+
 [[package]]
 name = "unsafe-libyaml"
 version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
 
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
 [[package]]
 name = "ureq"
 version = "2.10.1"
@@ -7015,9 +7536,9 @@ checksum = "4e8257fbc510f0a46eb602c10215901938b5c2a7d5e70fc11483b1d3c9b5b18c"
 
 [[package]]
 name = "value-trait"
-version = "0.8.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad8db98c1e677797df21ba03fca7d3bf9bec3ca38db930954e4fe6e1ea27eb4"
+checksum = "9170e001f458781e92711d2ad666110f153e4e50bfd5cbd02db6547625714187"
 dependencies = [
  "float-cmp",
  "halfbrown",
@@ -7087,6 +7608,15 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -7119,6 +7649,18 @@ dependencies = [
  "wasm-bindgen-shared",
 ]
 
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "wasm-bindgen-macro"
 version = "0.2.95"
@@ -7148,6 +7690,19 @@ version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
 
+[[package]]
+name = "wasm-streams"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
+dependencies = [
+ "futures-util",
+ "js-sys",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
 [[package]]
 name = "wax"
 version = "0.6.0"
@@ -7236,6 +7791,16 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "web-sys"
+version = "0.3.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "web-time"
 version = "1.1.0"
@@ -7355,7 +7920,7 @@ checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6"
 dependencies = [
  "windows-implement 0.56.0",
  "windows-interface 0.56.0",
- "windows-result",
+ "windows-result 0.1.2",
  "windows-targets 0.52.6",
 ]
 
@@ -7367,7 +7932,7 @@ checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
 dependencies = [
  "windows-implement 0.57.0",
  "windows-interface 0.57.0",
- "windows-result",
+ "windows-result 0.1.2",
  "windows-targets 0.52.6",
 ]
 
@@ -7415,6 +7980,17 @@ dependencies = [
  "syn 2.0.87",
 ]
 
+[[package]]
+name = "windows-registry"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+dependencies = [
+ "windows-result 0.2.0",
+ "windows-strings",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-result"
 version = "0.1.2"
@@ -7424,6 +8000,25 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-result"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result 0.2.0",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -7774,6 +8369,12 @@ dependencies = [
  "synstructure",
 ]
 
+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+
 [[package]]
 name = "zerovec"
 version = "0.10.4"
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index fafbb8cb7d..a4f639ca13 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -31,11 +31,11 @@ mimalloc = { version = "0.1.42" }
 num = {version = "0.4"}
 serde = { version = "1.0", features = ["derive"] }
 sqlparser = { version = "0.49"}
-polars-io = { version = "0.43", features = ["avro"]}
-polars-arrow = { version = "0.43"}
-polars-ops = { version = "0.43", features = ["pivot"]}
-polars-plan = { version = "0.43", features = ["regex"]}
-polars-utils = { version = "0.43"}
+polars-io = { version = "0.44", features = ["avro"]}
+polars-arrow = { version = "0.44"}
+polars-ops = { version = "0.44", features = ["pivot"]}
+polars-plan = { version = "0.44", features = ["regex"]}
+polars-utils = { version = "0.44"}
 typetag = "0.2"
 env_logger = "0.11.3"
 log.workspace = true
@@ -81,7 +81,7 @@ features = [
     "to_dummies",
 ]
 optional = false
-version = "0.43"
+version = "0.44"
 
 [dev-dependencies]
 nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.1" }
diff --git a/crates/nu_plugin_polars/src/dataframe/command/aggregation/quantile.rs b/crates/nu_plugin_polars/src/dataframe/command/aggregation/quantile.rs
index def85a3e01..e2572012cb 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/aggregation/quantile.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/aggregation/quantile.rs
@@ -10,7 +10,7 @@ use nu_protocol::{
     Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
     Value,
 };
-use polars::prelude::{lit, QuantileInterpolOptions};
+use polars::prelude::{lit, QuantileMethod};
 
 #[derive(Clone)]
 pub struct LazyQuantile;
@@ -109,7 +109,7 @@ impl PluginCommand for LazyQuantile {
             PolarsPluginObject::NuExpression(expr) => {
                 let expr: NuExpression = expr
                     .into_polars()
-                    .quantile(lit(quantile), QuantileInterpolOptions::default())
+                    .quantile(lit(quantile), QuantileMethod::default())
                     .into();
                 expr.to_pipeline_data(plugin, engine, call.head)
             }
@@ -136,7 +136,7 @@ fn command(
     let lazy = NuLazyFrame::new(
         lazy.from_eager,
         lazy.to_polars()
-            .quantile(lit(quantile), QuantileInterpolOptions::default()),
+            .quantile(lit(quantile), QuantileMethod::default()),
     );
 
     lazy.to_pipeline_data(plugin, engine, call.head)
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/open.rs b/crates/nu_plugin_polars/src/dataframe/command/core/open.rs
index ad430c6885..856c037270 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/open.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/open.rs
@@ -28,9 +28,7 @@ use polars::{
     },
 };
 
-use polars_io::{
-    avro::AvroReader, csv::read::CsvReadOptions, prelude::ParallelStrategy, HiveOptions,
-};
+use polars_io::{avro::AvroReader, csv::read::CsvReadOptions, HiveOptions};
 
 const DEFAULT_INFER_SCHEMA: usize = 100;
 
@@ -179,20 +177,7 @@ fn from_parquet(
 ) -> Result<Value, ShellError> {
     if !call.has_flag("eager")? {
         let file: String = call.req(0)?;
-        let args = ScanArgsParquet {
-            n_rows: None,
-            cache: true,
-            parallel: ParallelStrategy::Auto,
-            rechunk: false,
-            row_index: None,
-            low_memory: false,
-            cloud_options: None,
-            use_statistics: false,
-            hive_options: HiveOptions::default(),
-            glob: true,
-            include_file_paths: None,
-        };
-
+        let args = ScanArgsParquet::default();
         let df: NuLazyFrame = LazyFrame::scan_parquet(file, args)
             .map_err(|e| ShellError::GenericError {
                 error: "Parquet reader error".into(),
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/summary.rs b/crates/nu_plugin_polars/src/dataframe/command/core/summary.rs
index 8710b9bc01..b00a8bb201 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/summary.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/summary.rs
@@ -10,8 +10,8 @@ use nu_protocol::{
 use polars::{
     chunked_array::ChunkedArray,
     prelude::{
-        AnyValue, DataFrame, DataType, Float64Type, IntoSeries, NewChunkedArray,
-        QuantileInterpolOptions, Series, StringType,
+        AnyValue, Column as PolarsColumn, DataFrame, DataType, Float64Type, IntoSeries,
+        NewChunkedArray, QuantileMethod, StringType,
     },
 };
 
@@ -184,7 +184,6 @@ fn command(
 
     let tail = df
         .as_ref()
-        .get_columns()
         .iter()
         .filter(|col| !matches!(col.dtype(), &DataType::Object("object", _)))
         .map(|col| {
@@ -200,7 +199,7 @@ fn command(
                 .clone()
                 .into_iter()
                 .map(|q| {
-                    col.quantile_reduce(q, QuantileInterpolOptions::default())
+                    col.quantile_reduce(q, QuantileMethod::default())
                         .ok()
                         .map(|s| s.into_series("quantile".into()))
                         .and_then(|ca| ca.cast(&DataType::Float64).ok())
@@ -221,7 +220,10 @@ fn command(
             ChunkedArray::<Float64Type>::from_slice_options(name.into(), &descriptors).into_series()
         });
 
-    let res = head.chain(tail).collect::<Vec<Series>>();
+    let res = head
+        .chain(tail)
+        .map(PolarsColumn::from)
+        .collect::<Vec<PolarsColumn>>();
 
     let polars_df = DataFrame::new(res).map_err(|e| ShellError::GenericError {
         error: "Dataframe Error".into(),
diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/rename.rs b/crates/nu_plugin_polars/src/dataframe/command/data/rename.rs
index ae7e93b6b8..3265a5c7fa 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/rename.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/rename.rs
@@ -185,7 +185,7 @@ fn command_lazy(
     }
 
     let lazy = lazy.to_polars();
-    let lazy: NuLazyFrame = lazy.rename(&columns, &new_names).into();
+    let lazy: NuLazyFrame = lazy.rename(&columns, &new_names, true).into();
 
     lazy.to_pipeline_data(plugin, engine, call.head)
 }
diff --git a/crates/nu_plugin_polars/src/dataframe/command/string/str_slice.rs b/crates/nu_plugin_polars/src/dataframe/command/string/str_slice.rs
index 4db8ac0f67..02d35e6984 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/string/str_slice.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/string/str_slice.rs
@@ -160,13 +160,14 @@ fn command_df(
     df: NuDataFrame,
 ) -> Result<PipelineData, ShellError> {
     let start: i64 = call.req(0)?;
-    let start = Series::new("".into(), &[start]);
+    let start = Series::new("".into(), &[start]).into();
 
     let length: Option<i64> = call.get_flag("length")?;
     let length = match length {
         Some(v) => Series::new("".into(), &[v as u64]),
         None => Series::new_null("".into(), 1),
-    };
+    }
+    .into();
 
     let series = df.as_series(call.head)?;
 
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/between_values.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/between_values.rs
index 7d34d6d128..507107c7ae 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/between_values.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/between_values.rs
@@ -5,8 +5,8 @@ use nu_protocol::{
 };
 use num::Zero;
 use polars::prelude::{
-    BooleanType, ChunkCompare, ChunkedArray, DataType, Float64Type, Int64Type, IntoSeries,
-    NumOpsDispatchChecked, PolarsError, Series, StringNameSpaceImpl,
+    BooleanType, ChunkCompareEq, ChunkCompareIneq, ChunkedArray, DataType, Float64Type, Int64Type,
+    IntoSeries, NumOpsDispatchChecked, PolarsError, Series, StringNameSpaceImpl,
 };
 use std::ops::{Add, BitAnd, BitOr, Div, Mul, Sub};
 
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
index c2d64741f4..77457dee0c 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
@@ -10,11 +10,11 @@ use polars::chunked_array::ChunkedArray;
 use polars::datatypes::{AnyValue, PlSmallStr};
 use polars::export::arrow::Either;
 use polars::prelude::{
-    ChunkAnyValue, DataFrame, DataType, DatetimeChunked, Float32Type, Float64Type, Int16Type,
-    Int32Type, Int64Type, Int8Type, IntoSeries, ListBooleanChunkedBuilder, ListBuilderTrait,
-    ListPrimitiveChunkedBuilder, ListStringChunkedBuilder, ListType, NamedFrom, NewChunkedArray,
-    ObjectType, PolarsError, Schema, SchemaExt, Series, StructChunked, TemporalMethods, TimeUnit,
-    UInt16Type, UInt32Type, UInt64Type, UInt8Type,
+    ChunkAnyValue, Column as PolarsColumn, DataFrame, DataType, DatetimeChunked, Float32Type,
+    Float64Type, Int16Type, Int32Type, Int64Type, Int8Type, IntoSeries, ListBooleanChunkedBuilder,
+    ListBuilderTrait, ListPrimitiveChunkedBuilder, ListStringChunkedBuilder, ListType, NamedFrom,
+    NewChunkedArray, ObjectType, PolarsError, Schema, SchemaExt, Series, StructChunked,
+    TemporalMethods, TimeUnit, UInt16Type, UInt32Type, UInt64Type, UInt8Type,
 };
 
 use nu_protocol::{Record, ShellError, Span, Value};
@@ -146,6 +146,16 @@ impl DerefMut for TypedColumn {
 pub type ColumnMap = IndexMap<PlSmallStr, TypedColumn>;
 
 pub fn create_column(
+    column: &PolarsColumn,
+    from_row: usize,
+    to_row: usize,
+    span: Span,
+) -> Result<Column, ShellError> {
+    let series = column.as_materialized_series();
+    create_column_from_series(series, from_row, to_row, span)
+}
+
+pub fn create_column_from_series(
     series: &Series,
     from_row: usize,
     to_row: usize,
@@ -497,15 +507,19 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
                     insert_record(&mut column_values, record.clone(), &schema)?;
                     let df = from_parsed_columns(column_values)?;
                     for name in df.df.get_column_names() {
-                        let series = df.df.column(name).map_err(|e| ShellError::GenericError {
-                            error: format!(
-                                "Error creating struct, could not get column name {name}: {e}"
-                            ),
-                            msg: "".into(),
-                            span: None,
-                            help: None,
-                            inner: vec![],
-                        })?;
+                        let series = df
+                            .df
+                            .column(name)
+                            .map_err(|e| ShellError::GenericError {
+                                error: format!(
+                                    "Error creating struct, could not get column name {name}: {e}"
+                                ),
+                                msg: "".into(),
+                                span: None,
+                                help: None,
+                                inner: vec![],
+                            })?
+                            .as_materialized_series();
 
                         if let Some(v) = structs.get_mut(name) {
                             let _ = v.append(series)
@@ -524,15 +538,18 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
 
                 let structs: Vec<Series> = structs.into_values().collect();
 
-                let chunked =
-                    StructChunked::from_series(column.name().to_owned(), structs.as_slice())
-                        .map_err(|e| ShellError::GenericError {
-                            error: format!("Error creating struct: {e}"),
-                            msg: "".into(),
-                            span: None,
-                            help: None,
-                            inner: vec![],
-                        })?;
+                let chunked = StructChunked::from_series(
+                    column.name().to_owned(),
+                    structs.len(),
+                    structs.iter(),
+                )
+                .map_err(|e| ShellError::GenericError {
+                    error: format!("Error creating struct: {e}"),
+                    msg: "".into(),
+                    span: None,
+                    help: None,
+                    inner: vec![],
+                })?;
                 Ok(chunked.into_series())
             }
             _ => Err(ShellError::GenericError {
@@ -558,13 +575,13 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
 // This data can be used to create a Series object that can initialize
 // the dataframe based on the type of data that is found
 pub fn from_parsed_columns(column_values: ColumnMap) -> Result<NuDataFrame, ShellError> {
-    let mut df_series: Vec<Series> = Vec::new();
+    let mut df_columns: Vec<PolarsColumn> = Vec::new();
     for (name, column) in column_values {
         let series = typed_column_to_series(name, column)?;
-        df_series.push(series);
+        df_columns.push(series.into());
     }
 
-    DataFrame::new(df_series)
+    DataFrame::new(df_columns)
         .map(|df| NuDataFrame::new(false, df))
         .map_err(|e| ShellError::GenericError {
             error: "Error creating dataframe".into(),
@@ -1245,7 +1262,8 @@ fn any_value_to_value(any_value: &AnyValue, span: Span) -> Result<Value, ShellEr
         }
         AnyValue::Datetime(a, time_unit, tz) => {
             let nanos = nanos_from_timeunit(*a, *time_unit);
-            datetime_from_epoch_nanos(nanos, tz, span).map(|datetime| Value::date(datetime, span))
+            datetime_from_epoch_nanos(nanos, &tz.cloned(), span)
+                .map(|datetime| Value::date(datetime, span))
         }
         AnyValue::Duration(a, time_unit) => {
             let nanos = match time_unit {
@@ -1264,17 +1282,7 @@ fn any_value_to_value(any_value: &AnyValue, span: Span) -> Result<Value, ShellEr
         }
         AnyValue::Struct(_idx, _struct_array, _s_fields) => {
             // This should convert to a StructOwned object.
-            let static_value =
-                any_value
-                    .clone()
-                    .into_static()
-                    .map_err(|e| ShellError::GenericError {
-                        error: "Cannot convert polars struct to static value".into(),
-                        msg: e.to_string(),
-                        span: Some(span),
-                        help: None,
-                        inner: Vec::new(),
-                    })?;
+            let static_value = any_value.clone().into_static();
             any_value_to_value(&static_value, span)
         }
         AnyValue::StructOwned(struct_tuple) => {
@@ -1485,7 +1493,7 @@ mod tests {
         let test_millis = 946_684_800_000;
         assert_eq!(
             any_value_to_value(
-                &AnyValue::Datetime(test_millis, TimeUnit::Milliseconds, &None),
+                &AnyValue::Datetime(test_millis, TimeUnit::Milliseconds, None),
                 span
             )?,
             Value::date(comparison_date, span)
@@ -1575,6 +1583,7 @@ mod tests {
         let test_bool_arr = BooleanArray::from([Some(true)]);
         let test_struct_arr = StructArray::new(
             DataType::Struct(fields.clone()).to_arrow(CompatLevel::newest()),
+            1,
             vec![Box::new(test_int_arr), Box::new(test_bool_arr)],
             None,
         );
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs
index 1848a69166..1138896d74 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs
@@ -8,7 +8,9 @@ pub use operations::Axis;
 
 use indexmap::map::IndexMap;
 use nu_protocol::{did_you_mean, PipelineData, Record, ShellError, Span, Value};
-use polars::prelude::{DataFrame, DataType, IntoLazy, PolarsObject, Series};
+use polars::prelude::{
+    Column as PolarsColumn, DataFrame, DataType, IntoLazy, PolarsObject, Series,
+};
 use polars_plan::prelude::{lit, Expr, Null};
 use polars_utils::total_ord::{TotalEq, TotalHash};
 use std::{
@@ -135,7 +137,7 @@ impl NuDataFrame {
     }
 
     pub fn try_from_series(series: Series, span: Span) -> Result<Self, ShellError> {
-        match DataFrame::new(vec![series]) {
+        match DataFrame::new(vec![series.into()]) {
             Ok(dataframe) => Ok(NuDataFrame::new(false, dataframe)),
             Err(e) => Err(ShellError::GenericError {
                 error: "Error creating dataframe".into(),
@@ -191,13 +193,16 @@ impl NuDataFrame {
     }
 
     pub fn try_from_series_vec(columns: Vec<Series>, span: Span) -> Result<Self, ShellError> {
-        let dataframe = DataFrame::new(columns).map_err(|e| ShellError::GenericError {
-            error: "Error creating dataframe".into(),
-            msg: format!("Unable to create DataFrame: {e}"),
-            span: Some(span),
-            help: None,
-            inner: vec![],
-        })?;
+        let columns_converted: Vec<PolarsColumn> = columns.into_iter().map(Into::into).collect();
+
+        let dataframe =
+            DataFrame::new(columns_converted).map_err(|e| ShellError::GenericError {
+                error: "Error creating dataframe".into(),
+                msg: format!("Unable to create DataFrame: {e}"),
+                span: Some(span),
+                help: None,
+                inner: vec![],
+            })?;
 
         Ok(Self::new(false, dataframe))
     }
@@ -295,14 +300,15 @@ impl NuDataFrame {
             .df
             .get_columns()
             .first()
-            .expect("We have already checked that the width is 1");
+            .expect("We have already checked that the width is 1")
+            .as_materialized_series();
 
         Ok(series.clone())
     }
 
     pub fn get_value(&self, row: usize, span: Span) -> Result<Value, ShellError> {
         let series = self.as_series(span)?;
-        let column = conversion::create_column(&series, row, row + 1, span)?;
+        let column = conversion::create_column_from_series(&series, row, row + 1, span)?;
 
         if column.len() == 0 {
             Err(ShellError::AccessEmptyContent { span })
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/operations.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/operations.rs
index 6e7590e2fc..11753f87ab 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/operations.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/operations.rs
@@ -1,5 +1,5 @@
 use nu_protocol::{ast::Operator, ShellError, Span, Spanned, Value};
-use polars::prelude::{DataFrame, Series};
+use polars::prelude::{Column as PolarsColumn, DataFrame};
 
 use crate::values::CustomValueSupport;
 use crate::PolarsPlugin;
@@ -137,7 +137,7 @@ impl NuDataFrame {
                         series.rename(name.into());
                         series
                     })
-                    .collect::<Vec<Series>>();
+                    .collect::<Vec<PolarsColumn>>();
 
                 let df_new = DataFrame::new(new_cols).map_err(|e| ShellError::GenericError {
                     error: "Error creating dataframe".into(),
@@ -195,7 +195,7 @@ impl NuDataFrame {
                             }),
                         }
                     })
-                    .collect::<Result<Vec<Series>, ShellError>>()?;
+                    .collect::<Result<Vec<PolarsColumn>, ShellError>>()?;
 
                 let df_new = DataFrame::new(new_cols).map_err(|e| ShellError::GenericError {
                     error: "Error appending dataframe".into(),
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_expression/mod.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_expression/mod.rs
index f0800c9ad2..7b60f9b1e4 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_expression/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_expression/mod.rs
@@ -215,12 +215,12 @@ pub fn expr_to_value(expr: &Expr, span: Span) -> Result<Value, ShellError> {
                 AggExpr::Quantile {
                     expr,
                     quantile,
-                    interpol,
+                    method,
                 } => Ok(Value::record(
                     record! {
                         "expr" => expr_to_value(expr.as_ref(), span)?,
                         "quantile" => expr_to_value(quantile.as_ref(), span)?,
-                        "interpol" => Value::string(format!("{interpol:?}"), span),
+                        "method" => Value::string(format!("{method:?}"), span),
                     },
                     span,
                 )),

From 07a37f9b47305c1c57f68eb081a41ebd90200b2e Mon Sep 17 00:00:00 2001
From: Yash Thakur <45539777+ysthakur@users.noreply.github.com>
Date: Fri, 29 Nov 2024 20:47:57 -0500
Subject: [PATCH 0739/1072] fix: Respect sort in custom completions (#14424)

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

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

# Description

This PR makes it so that when a custom completer sets `options.sort` to
true, completions aren't sorted. Previously, in #13311, I'd made it so
that setting `sort` to true would sort in alphabetical order, while
omitting it or setting it to false would sort it in the default order
for the chosen match algorithm (alphabetical for prefix matching, fuzzy
match score for fuzzy matching). I'd assumed that you'd always want to
sort completions and the important thing was choosing alphabetical
sorting vs the default sort order for your match algorithm. However,
this assumption was incorrect (see #13696 and [this
thread](https://discord.com/channels/601130461678272522/1302332259227144294)
in Discord).

An alternative would be to make `sort` accept `"alphabetical"`,
`"smart"`, and `"none"`/`null` rather than keeping it a boolean. But
that would be a breaking change and require more discussion, and I
wanted to keep this PR simple/small so that we can go back to the
sensible behavior as soon as possible.

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

Here are the different scenarios:
- If your custom completer returns a record with an `options` field
that's a record:
- If `options` contains `sort: true`, completions **will be sorted
according to the order set in the user's config**. Previously, they
would have been sorted in alphabetical order. This does mean that
**custom completers cannot explicitly choose to sort in alphabetical
order** anymore. I think that's an acceptable trade-off, though.
- If `options` contains `sort: false`, completions will not be sorted.
#13311 broke things so they would be sorted in the default order for the
match algorithm used. Before that PR, completions would not have been
sorted.
- If there's no `sort` option, that **will be treated as `sort: true`**.
Previously, this would have been treated as `sort: false`.
- Otherwise, nothing changes. Completions will still be sorted.

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

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

Added 1 test to make sure that completions aren't sorted with `sort:
false` explicitly set.

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 .../src/completions/custom_completions.rs     | 37 ++++++++++---------
 crates/nu-cli/tests/completions/mod.rs        | 28 ++++++++++++++
 2 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/crates/nu-cli/src/completions/custom_completions.rs b/crates/nu-cli/src/completions/custom_completions.rs
index 63e65053b4..4f19cd0eb0 100644
--- a/crates/nu-cli/src/completions/custom_completions.rs
+++ b/crates/nu-cli/src/completions/custom_completions.rs
@@ -1,13 +1,12 @@
 use crate::completions::{
-    completer::map_value_completions, Completer, CompletionOptions, MatchAlgorithm,
-    SemanticSuggestion,
+    completer::map_value_completions, Completer, CompletionOptions, SemanticSuggestion,
 };
 use nu_engine::eval_call;
 use nu_protocol::{
     ast::{Argument, Call, Expr, Expression},
     debugger::WithoutDebug,
     engine::{Stack, StateWorkingSet},
-    CompletionSort, DeclId, PipelineData, Span, Type, Value,
+    DeclId, PipelineData, Span, Type, Value,
 };
 use std::collections::HashMap;
 
@@ -68,6 +67,7 @@ impl Completer for CustomCompletion {
         );
 
         let mut custom_completion_options = None;
+        let mut should_sort = true;
 
         // Parse result
         let suggestions = result
@@ -85,10 +85,9 @@ impl Completer for CustomCompletion {
                     let options = val.get("options");
 
                     if let Some(Value::Record { val: options, .. }) = &options {
-                        let should_sort = options
-                            .get("sort")
-                            .and_then(|val| val.as_bool().ok())
-                            .unwrap_or(false);
+                        if let Some(sort) = options.get("sort").and_then(|val| val.as_bool().ok()) {
+                            should_sort = sort;
+                        }
 
                         custom_completion_options = Some(CompletionOptions {
                             case_sensitive: options
@@ -98,20 +97,16 @@ impl Completer for CustomCompletion {
                             positional: options
                                 .get("positional")
                                 .and_then(|val| val.as_bool().ok())
-                                .unwrap_or(true),
+                                .unwrap_or(completion_options.positional),
                             match_algorithm: match options.get("completion_algorithm") {
                                 Some(option) => option
                                     .coerce_string()
                                     .ok()
                                     .and_then(|option| option.try_into().ok())
-                                    .unwrap_or(MatchAlgorithm::Prefix),
+                                    .unwrap_or(completion_options.match_algorithm),
                                 None => completion_options.match_algorithm,
                             },
-                            sort: if should_sort {
-                                CompletionSort::Alphabetical
-                            } else {
-                                CompletionSort::Smart
-                            },
+                            sort: completion_options.sort,
                         });
                     }
 
@@ -124,9 +119,17 @@ impl Completer for CustomCompletion {
 
         let options = custom_completion_options.unwrap_or(completion_options.clone());
         let mut matcher = NuMatcher::new(String::from_utf8_lossy(prefix), options);
-        for sugg in suggestions {
-            matcher.add_semantic_suggestion(sugg);
+
+        if should_sort {
+            for sugg in suggestions {
+                matcher.add_semantic_suggestion(sugg);
+            }
+            matcher.results()
+        } else {
+            suggestions
+                .into_iter()
+                .filter(|sugg| matcher.matches(&sugg.suggestion.value))
+                .collect()
         }
-        matcher.results()
     }
 }
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index 4bcf8b55c0..7f6fe30430 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -88,6 +88,27 @@ fn completer_strings_with_options() -> NuCompleter {
     NuCompleter::new(Arc::new(engine), Arc::new(stack))
 }
 
+#[fixture]
+fn completer_strings_no_sort() -> NuCompleter {
+    // Create a new engine
+    let (_, _, mut engine, mut stack) = new_engine();
+    let command = r#"
+        def animals [] {
+            {
+                completions: ["zzzfoo", "foo", "not matched", "abcfoo" ],
+                options: {
+                    completion_algorithm: "fuzzy",
+                    sort: false,
+                }
+            }
+        }
+        def my-command [animal: string@animals] { print $animal }"#;
+    assert!(support::merge_input(command.as_bytes(), &mut engine, &mut stack).is_ok());
+
+    // Instantiate a new completer
+    NuCompleter::new(Arc::new(engine), Arc::new(stack))
+}
+
 #[fixture]
 fn custom_completer() -> NuCompleter {
     // Create a new engine
@@ -210,6 +231,13 @@ fn customcompletions_case_insensitive(mut completer_strings_with_options: NuComp
     match_suggestions(&expected, &suggestions);
 }
 
+#[rstest]
+fn customcompletions_no_sort(mut completer_strings_no_sort: NuCompleter) {
+    let suggestions = completer_strings_no_sort.complete("my-command foo", 14);
+    let expected: Vec<String> = vec!["zzzfoo".into(), "foo".into(), "abcfoo".into()];
+    match_suggestions(&expected, &suggestions);
+}
+
 #[test]
 fn dotnu_completions() {
     // Create a new engine

From 3d5f853b031e9b913f42e7dc556a86e11b76a9a5 Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Sat, 30 Nov 2024 14:57:11 +0100
Subject: [PATCH 0740/1072] Start to Add WASM Support Again (#14418)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
The [nushell/demo](https://github.com/nushell/demo) project successfully
demonstrated running Nushell in the browser using WASM. However, the
current version of Nushell cannot be easily built for the
`wasm32-unknown-unknown` target, the default for `wasm-bindgen`.

This PR introduces initial support for the `wasm32-unknown-unknown`
target by disabling OS-dependent features such as filesystem access, IO,
and platform/system-specific functionality. This separation is achieved
using a new `os` feature in the following crates:

 - `nu-cmd-lang`
 - `nu-command`
 - `nu-engine`
 - `nu-protocol`

The `os` feature includes all functionality that interacts with an
operating system. It is enabled by default, but can be disabled using
`--no-default-features`. All crates that depend on these core crates now
use `--no-default-features` to allow compilation for WASM.

To demonstrate compatibility, the following script builds all crates
expected to work with WASM. Direct user interaction, running external
commands, working with plugins, and features requiring `openssl` are out
of scope for now due to their complexity or reliance on C libraries,
which are difficult to compile and link in a WASM environment.

```nushell
[ # compatible crates
	"nu-cmd-base",
	"nu-cmd-extra",
	"nu-cmd-lang",
	"nu-color-config",
	"nu-command",
	"nu-derive-value",
	"nu-engine",
	"nu-glob",
	"nu-json",
	"nu-parser",
	"nu-path",
	"nu-pretty-hex",
	"nu-protocol",
	"nu-std",
	"nu-system",
	"nu-table",
	"nu-term-grid",
	"nu-utils",
	"nuon"
] | each {cargo build -p $in --target wasm32-unknown-unknown --no-default-features}
```

## Caveats
This PR has a few caveats:
1. **`miette` and `terminal-size` Dependency Issue**
`miette` depends on `terminal-size`, which uses `rustix` when the target
is not Windows. However, `rustix` requires `std::os::unix`, which is
unavailable in WASM. To address this, I opened a
[PR](https://github.com/eminence/terminal-size/pull/68) for
`terminal-size` to conditionally compile `rustix` only when the target
is Unix. For now, the `Cargo.toml` includes patches to:
    - Use my forked version of `terminal-size`.
- ~~Use an unreleased version of `miette` that depends on
`terminal-size@0.4`.~~

These patches are temporary and can be removed once the upstream changes
are merged and released.

2. **Test Output Adjustments**
Due to the slight bump in the `miette` version, one test required
adjustments to accommodate minor formatting changes in the error output,
such as shifted newlines.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
This shouldn't break anything but allows using some crates for targeting
`wasm32-unknown-unknown` to revive the demo page eventually.

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

I did not add any extra tests, I just checked that compiling works, also
when using the host target but unselecting the `os` feature.

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
~~Breaking the wasm support can be easily done by adding some `use`s or
by adding a new dependency, we should definitely add some CI that also
at least builds against wasm to make sure that building for it keep
working.~~
I added a job to build wasm.

---------

Co-authored-by: Ian Manske <ian.manske@pm.me>
---
 .github/workflows/ci.yml                      | 31 +++++++
 Cargo.lock                                    | 10 +-
 Cargo.toml                                    |  1 +
 crates/nu-cli/Cargo.toml                      |  4 +-
 crates/nu-cmd-base/Cargo.toml                 |  4 +-
 crates/nu-cmd-extra/Cargo.toml                |  6 +-
 crates/nu-cmd-lang/Cargo.toml                 | 17 +++-
 .../nu-cmd-lang/src/core_commands/describe.rs |  1 +
 crates/nu-cmd-lang/src/core_commands/do_.rs   | 17 +++-
 .../nu-cmd-lang/src/core_commands/ignore.rs   |  1 +
 .../nu-cmd-lang/src/core_commands/version.rs  | 40 ++++----
 crates/nu-cmd-lang/src/lib.rs                 |  1 +
 crates/nu-color-config/Cargo.toml             |  4 +-
 crates/nu-command/Cargo.toml                  | 91 ++++++++++++++-----
 crates/nu-command/src/debug/info.rs           |  5 +
 crates/nu-command/src/debug/inspect.rs        |  4 +-
 crates/nu-command/src/default_context.rs      | 37 +++++---
 crates/nu-command/src/env/config/config_.rs   | 80 +++++++++++++++-
 .../nu-command/src/env/config/config_env.rs   | 61 +------------
 crates/nu-command/src/env/config/config_nu.rs | 61 +------------
 .../nu-command/src/experimental/is_admin.rs   |  6 ++
 crates/nu-command/src/filesystem/save.rs      |  1 +
 crates/nu-command/src/filters/mod.rs          |  2 +
 crates/nu-command/src/filters/tee.rs          |  9 +-
 crates/nu-command/src/lib.rs                  |  9 ++
 crates/nu-command/src/network/mod.rs          |  4 +
 crates/nu-command/src/viewers/griddle.rs      |  5 +-
 crates/nu-command/src/viewers/table.rs        | 24 ++++-
 crates/nu-engine/Cargo.toml                   | 14 ++-
 crates/nu-engine/src/eval_ir.rs               | 11 ++-
 crates/nu-parser/Cargo.toml                   |  6 +-
 crates/nu-path/src/tilde.rs                   |  8 ++
 crates/nu-path/src/trailing_slash.rs          |  7 ++
 crates/nu-plugin/Cargo.toml                   |  4 +-
 crates/nu-protocol/Cargo.toml                 | 13 ++-
 crates/nu-protocol/src/errors/shell_error.rs  | 11 +++
 crates/nu-protocol/src/lib.rs                 |  2 +
 .../nu-protocol/src/pipeline/byte_stream.rs   | 34 ++++++-
 crates/nu-std/Cargo.toml                      |  4 +-
 crates/nu-table/Cargo.toml                    |  6 +-
 crates/nu-term-grid/Cargo.toml                |  2 +-
 crates/nu-utils/Cargo.toml                    |  5 +
 crates/nu-utils/src/filesystem.rs             |  1 +
 crates/nu-utils/src/lib.rs                    |  2 +-
 crates/nu-utils/src/utils.rs                  | 16 +++-
 crates/nu_plugin_custom_values/Cargo.toml     |  2 +-
 crates/nuon/Cargo.toml                        |  6 +-
 toolkit.nu                                    | 34 +++++++
 48 files changed, 490 insertions(+), 234 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index badadb56ae..f3daa9a466 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -162,3 +162,34 @@ jobs:
           else
             echo "no changes in working directory";
           fi
+
+  build-wasm:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4.1.7
+
+      - name: Setup Rust toolchain and cache
+        uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
+
+      - name: Add wasm32-unknown-unknown target
+        run: rustup target add wasm32-unknown-unknown
+
+      - run: cargo build -p nu-cmd-base --no-default-features --target wasm32-unknown-unknown
+      - run: cargo build -p nu-cmd-extra --no-default-features --target wasm32-unknown-unknown
+      - run: cargo build -p nu-cmd-lang --no-default-features --target wasm32-unknown-unknown
+      - run: cargo build -p nu-color-config --no-default-features --target wasm32-unknown-unknown
+      - run: cargo build -p nu-command --no-default-features --target wasm32-unknown-unknown
+      - run: cargo build -p nu-derive-value --no-default-features --target wasm32-unknown-unknown
+      - run: cargo build -p nu-engine --no-default-features --target wasm32-unknown-unknown
+      - run: cargo build -p nu-glob --no-default-features --target wasm32-unknown-unknown
+      - run: cargo build -p nu-json --no-default-features --target wasm32-unknown-unknown
+      - run: cargo build -p nu-parser --no-default-features --target wasm32-unknown-unknown
+      - run: cargo build -p nu-path --no-default-features --target wasm32-unknown-unknown
+      - run: cargo build -p nu-pretty-hex --no-default-features --target wasm32-unknown-unknown
+      - run: cargo build -p nu-protocol --no-default-features --target wasm32-unknown-unknown
+      - run: cargo build -p nu-std --no-default-features --target wasm32-unknown-unknown
+      - run: cargo build -p nu-system --no-default-features --target wasm32-unknown-unknown
+      - run: cargo build -p nu-table --no-default-features --target wasm32-unknown-unknown
+      - run: cargo build -p nu-term-grid --no-default-features --target wasm32-unknown-unknown
+      - run: cargo build -p nu-utils --no-default-features --target wasm32-unknown-unknown
+      - run: cargo build -p nuon --no-default-features --target wasm32-unknown-unknown
diff --git a/Cargo.lock b/Cargo.lock
index 1e4b123f81..a5399b9ddc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2647,7 +2647,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -3368,6 +3368,7 @@ dependencies = [
  "fancy-regex",
  "filesize",
  "filetime",
+ "getrandom",
  "human-date-parser",
  "indexmap",
  "indicatif",
@@ -3755,6 +3756,7 @@ dependencies = [
 name = "nu-utils"
 version = "0.100.1"
 dependencies = [
+ "crossterm 0.28.1",
  "crossterm_winapi",
  "fancy-regex",
  "log",
@@ -6847,9 +6849,9 @@ dependencies = [
 
 [[package]]
 name = "terminal_size"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef"
+checksum = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9"
 dependencies = [
  "rustix",
  "windows-sys 0.59.0",
@@ -7874,7 +7876,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 86d863f76c..c7bafe89d6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -134,6 +134,7 @@ quickcheck = "1.0"
 quickcheck_macros = "1.0"
 quote = "1.0"
 rand = "0.8"
+getrandom = "0.2" # pick same version that rand requires
 rand_chacha = "0.3.1"
 ratatui = "0.26"
 rayon = "1.10"
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index b91314ddcf..993bb1ac72 100644
--- a/crates/nu-cli/Cargo.toml
+++ b/crates/nu-cli/Cargo.toml
@@ -19,11 +19,11 @@ tempfile = { workspace = true }
 
 [dependencies]
 nu-cmd-base = { path = "../nu-cmd-base", version = "0.100.1" }
-nu-engine = { path = "../nu-engine", version = "0.100.1" }
+nu-engine = { path = "../nu-engine", version = "0.100.1", features = ["os"] }
 nu-path = { path = "../nu-path", version = "0.100.1" }
 nu-parser = { path = "../nu-parser", version = "0.100.1" }
 nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.100.1", optional = true }
-nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1", features = ["os"] }
 nu-utils = { path = "../nu-utils", version = "0.100.1" }
 nu-color-config = { path = "../nu-color-config", version = "0.100.1" }
 nu-ansi-term = { workspace = true }
diff --git a/crates/nu-cmd-base/Cargo.toml b/crates/nu-cmd-base/Cargo.toml
index e47dc12641..fb36998bbd 100644
--- a/crates/nu-cmd-base/Cargo.toml
+++ b/crates/nu-cmd-base/Cargo.toml
@@ -13,10 +13,10 @@ version = "0.100.1"
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.100.1" }
+nu-engine = { path = "../nu-engine", version = "0.100.1", default-features = false }
 nu-parser = { path = "../nu-parser", version = "0.100.1" }
 nu-path = { path = "../nu-path", version = "0.100.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1", default-features = false }
 
 indexmap = { workspace = true }
 miette = { workspace = true }
diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml
index eec817059b..b54597f35a 100644
--- a/crates/nu-cmd-extra/Cargo.toml
+++ b/crates/nu-cmd-extra/Cargo.toml
@@ -17,12 +17,12 @@ workspace = true
 
 [dependencies]
 nu-cmd-base = { path = "../nu-cmd-base", version = "0.100.1" }
-nu-engine = { path = "../nu-engine", version = "0.100.1" }
+nu-engine = { path = "../nu-engine", version = "0.100.1", default-features = false }
 nu-json = { version = "0.100.1", path = "../nu-json" }
 nu-parser = { path = "../nu-parser", version = "0.100.1" }
 nu-pretty-hex = { version = "0.100.1", path = "../nu-pretty-hex" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
-nu-utils = { path = "../nu-utils", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.100.1", default-features = false }
 
 # Potential dependencies for extras
 heck = { workspace = true }
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index 6e8cb824ba..00ba449785 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -15,10 +15,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.100.1" }
+nu-engine = { path = "../nu-engine", version = "0.100.1", default-features = false }
 nu-parser = { path = "../nu-parser", version = "0.100.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
-nu-utils = { path = "../nu-utils", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.100.1", default-features = false }
 
 itertools = { workspace = true }
 shadow-rs = { version = "0.36", default-features = false }
@@ -27,6 +27,17 @@ shadow-rs = { version = "0.36", default-features = false }
 shadow-rs = { version = "0.36", default-features = false }
 
 [features]
+default = ["os"]
+os = [
+  "nu-engine/os",
+  "nu-protocol/os",
+  "nu-utils/os",
+]
+plugin = [
+  "nu-protocol/plugin",
+  "os",
+]
+
 mimalloc = []
 trash-support = []
 sqlite = []
diff --git a/crates/nu-cmd-lang/src/core_commands/describe.rs b/crates/nu-cmd-lang/src/core_commands/describe.rs
index ec98dc896f..375a840b16 100644
--- a/crates/nu-cmd-lang/src/core_commands/describe.rs
+++ b/crates/nu-cmd-lang/src/core_commands/describe.rs
@@ -169,6 +169,7 @@ fn run(
                 let origin = match stream.source() {
                     ByteStreamSource::Read(_) => "unknown",
                     ByteStreamSource::File(_) => "file",
+                    #[cfg(feature = "os")]
                     ByteStreamSource::Child(_) => "external",
                 };
 
diff --git a/crates/nu-cmd-lang/src/core_commands/do_.rs b/crates/nu-cmd-lang/src/core_commands/do_.rs
index 81ea22ad39..05d22c6cea 100644
--- a/crates/nu-cmd-lang/src/core_commands/do_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/do_.rs
@@ -1,9 +1,8 @@
 use nu_engine::{command_prelude::*, get_eval_block_with_early_return, redirect_env};
-use nu_protocol::{
-    engine::Closure,
-    process::{ChildPipe, ChildProcess},
-    ByteStream, ByteStreamSource, OutDest,
-};
+#[cfg(feature = "os")]
+use nu_protocol::process::{ChildPipe, ChildProcess};
+use nu_protocol::{engine::Closure, ByteStream, ByteStreamSource, OutDest};
+
 use std::{
     io::{Cursor, Read},
     thread,
@@ -119,6 +118,13 @@ impl Command for Do {
         match result {
             Ok(PipelineData::ByteStream(stream, metadata)) if capture_errors => {
                 let span = stream.span();
+                #[cfg(not(feature = "os"))]
+                return Err(ShellError::DisabledOsSupport {
+                    msg: "Cannot create a thread to receive stdout message.".to_string(),
+                    span: Some(span),
+                });
+
+                #[cfg(feature = "os")]
                 match stream.into_child() {
                     Ok(mut child) => {
                         // Use a thread to receive stdout message.
@@ -196,6 +202,7 @@ impl Command for Do {
                         OutDest::Pipe | OutDest::PipeSeparate | OutDest::Value
                     ) =>
             {
+                #[cfg(feature = "os")]
                 if let ByteStreamSource::Child(child) = stream.source_mut() {
                     child.ignore_error(true);
                 }
diff --git a/crates/nu-cmd-lang/src/core_commands/ignore.rs b/crates/nu-cmd-lang/src/core_commands/ignore.rs
index 382dc4fedd..b28a9582a3 100644
--- a/crates/nu-cmd-lang/src/core_commands/ignore.rs
+++ b/crates/nu-cmd-lang/src/core_commands/ignore.rs
@@ -35,6 +35,7 @@ impl Command for Ignore {
         mut input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         if let PipelineData::ByteStream(stream, _) = &mut input {
+            #[cfg(feature = "os")]
             if let ByteStreamSource::Child(child) = stream.source_mut() {
                 child.ignore_error(true);
             }
diff --git a/crates/nu-cmd-lang/src/core_commands/version.rs b/crates/nu-cmd-lang/src/core_commands/version.rs
index f5716be6b3..9ebc43dee2 100644
--- a/crates/nu-cmd-lang/src/core_commands/version.rs
+++ b/crates/nu-cmd-lang/src/core_commands/version.rs
@@ -116,24 +116,30 @@ pub fn version(engine_state: &EngineState, span: Span) -> Result<PipelineData, S
         Value::string(features_enabled().join(", "), span),
     );
 
-    // Get a list of plugin names and versions if present
-    let installed_plugins = engine_state
-        .plugins()
-        .iter()
-        .map(|x| {
-            let name = x.identity().name();
-            if let Some(version) = x.metadata().and_then(|m| m.version) {
-                format!("{name} {version}")
-            } else {
-                name.into()
-            }
-        })
-        .collect::<Vec<_>>();
+    #[cfg(not(feature = "plugin"))]
+    let _ = engine_state;
 
-    record.push(
-        "installed_plugins",
-        Value::string(installed_plugins.join(", "), span),
-    );
+    #[cfg(feature = "plugin")]
+    {
+        // Get a list of plugin names and versions if present
+        let installed_plugins = engine_state
+            .plugins()
+            .iter()
+            .map(|x| {
+                let name = x.identity().name();
+                if let Some(version) = x.metadata().and_then(|m| m.version) {
+                    format!("{name} {version}")
+                } else {
+                    name.into()
+                }
+            })
+            .collect::<Vec<_>>();
+
+        record.push(
+            "installed_plugins",
+            Value::string(installed_plugins.join(", "), span),
+        );
+    }
 
     Ok(Value::record(record, span).into_pipeline_data())
 }
diff --git a/crates/nu-cmd-lang/src/lib.rs b/crates/nu-cmd-lang/src/lib.rs
index 41022cc231..1a46c0a350 100644
--- a/crates/nu-cmd-lang/src/lib.rs
+++ b/crates/nu-cmd-lang/src/lib.rs
@@ -1,3 +1,4 @@
+#![cfg_attr(not(feature = "os"), allow(unused))]
 #![doc = include_str!("../README.md")]
 mod core_commands;
 mod default_context;
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index abf95023cc..19faec8e1b 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -14,8 +14,8 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
-nu-engine = { path = "../nu-engine", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.100.1", default-features = false }
 nu-json = { path = "../nu-json", version = "0.100.1" }
 nu-ansi-term = { workspace = true }
 
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 53e39353c0..ce1c336153 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -18,17 +18,17 @@ workspace = true
 [dependencies]
 nu-cmd-base = { path = "../nu-cmd-base", version = "0.100.1" }
 nu-color-config = { path = "../nu-color-config", version = "0.100.1" }
-nu-engine = { path = "../nu-engine", version = "0.100.1" }
+nu-engine = { path = "../nu-engine", version = "0.100.1", default-features = false }
 nu-glob = { path = "../nu-glob", version = "0.100.1" }
 nu-json = { path = "../nu-json", version = "0.100.1" }
 nu-parser = { path = "../nu-parser", version = "0.100.1" }
 nu-path = { path = "../nu-path", version = "0.100.1" }
 nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.100.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1", default-features = false }
 nu-system = { path = "../nu-system", version = "0.100.1" }
 nu-table = { path = "../nu-table", version = "0.100.1" }
 nu-term-grid = { path = "../nu-term-grid", version = "0.100.1" }
-nu-utils = { path = "../nu-utils", version = "0.100.1" }
+nu-utils = { path = "../nu-utils", version = "0.100.1", default-features = false }
 nu-ansi-term = { workspace = true }
 nuon = { path = "../nuon", version = "0.100.1" }
 
@@ -43,7 +43,7 @@ chardetng = { workspace = true }
 chrono = { workspace = true, features = ["std", "unstable-locales", "clock"], default-features = false }
 chrono-humanize = { workspace = true }
 chrono-tz = { workspace = true }
-crossterm = { workspace = true }
+crossterm = { workspace = true, optional = true }
 csv = { workspace = true }
 dialoguer = { workspace = true, default-features = false, features = ["fuzzy-select"] }
 digest = { workspace = true, default-features = false }
@@ -61,19 +61,20 @@ lscolors = { workspace = true, default-features = false, features = ["nu-ansi-te
 md5 = { workspace = true }
 mime = { workspace = true }
 mime_guess = { workspace = true }
-multipart-rs = { workspace = true }
-native-tls = { workspace = true }
-notify-debouncer-full = { workspace = true, default-features = false }
+multipart-rs = { workspace = true, optional = true }
+native-tls = { workspace = true, optional = true }
+notify-debouncer-full = { workspace = true, default-features = false, optional = true }
 num-format = { workspace = true }
 num-traits = { workspace = true }
 oem_cp = { workspace = true }
-open = { workspace = true }
-os_pipe = { workspace = true }
+open = { workspace = true, optional = true }
+os_pipe = { workspace = true, optional = true }
 pathdiff = { workspace = true }
 percent-encoding = { workspace = true }
 print-positions = { workspace = true }
 quick-xml = { workspace = true }
-rand = { workspace = true }
+rand = { workspace = true, optional = true }
+getrandom = { workspace = true, optional = true }
 rayon = { workspace = true }
 regex = { workspace = true }
 roxmltree = { workspace = true }
@@ -89,26 +90,26 @@ tabled = { workspace = true, features = ["ansi"], default-features = false }
 titlecase = { workspace = true }
 toml = { workspace = true, features = ["preserve_order"] }
 unicode-segmentation = { workspace = true }
-ureq = { workspace = true, default-features = false, features = ["charset", "gzip", "json", "native-tls"] }
+ureq = { workspace = true, default-features = false, features = ["charset", "gzip", "json"] }
 url = { workspace = true }
-uu_cp = { workspace = true }
-uu_mkdir = { workspace = true }
-uu_mktemp = { workspace = true }
-uu_mv = { workspace = true }
-uu_touch = { workspace = true }
-uu_uname = { workspace = true }
-uu_whoami = { workspace = true }
-uuid = { workspace = true, features = ["v4"] }
+uu_cp = { workspace = true, optional = true }
+uu_mkdir = { workspace = true, optional = true }
+uu_mktemp = { workspace = true, optional = true }
+uu_mv = { workspace = true, optional = true }
+uu_touch = { workspace = true, optional = true }
+uu_uname = { workspace = true, optional = true }
+uu_whoami = { workspace = true, optional = true }
+uuid = { workspace = true, features = ["v4"], optional = true }
 v_htmlescape = { workspace = true }
 wax = { workspace = true }
-which = { workspace = true }
+which = { workspace = true, optional = true }
 unicode-width = { workspace = true }
 data-encoding = { version = "2.6.0", features = ["alloc"] }
 
 [target.'cfg(windows)'.dependencies]
 winreg = { workspace = true }
 
-[target.'cfg(not(windows))'.dependencies]
+[target.'cfg(all(not(windows), not(target_arch = "wasm32")))'.dependencies]
 uucore = { workspace = true, features = ["mode"] }
 
 [target.'cfg(unix)'.dependencies]
@@ -134,7 +135,53 @@ features = [
 workspace = true
 
 [features]
-plugin = ["nu-parser/plugin"]
+default = ["os"]
+os = [
+	# include other features
+	"js",
+	"network",
+	"nu-protocol/os", 
+	"nu-utils/os",
+
+	# os-dependant dependencies
+	"crossterm",
+	"notify-debouncer-full",
+	"open",
+	"os_pipe",
+	"uu_cp",
+	"uu_mkdir",
+	"uu_mktemp",
+	"uu_mv",
+	"uu_touch",
+	"uu_uname",
+	"uu_whoami",
+	"which",
+]
+
+# The dependencies listed below need 'getrandom'. 
+# They work with JS (usually with wasm-bindgen) or regular OS support. 
+# Hence they are also put under the 'os' feature to avoid repetition.
+js = [
+	"getrandom", 
+	"getrandom/js", 
+	"rand", 
+	"uuid",
+]
+
+# These dependencies require networking capabilities, especially the http
+# interface requires openssl which is not easy to embed into wasm,
+# using rustls could solve this issue.
+network = [
+	"multipart-rs", 
+	"native-tls",
+	"ureq/native-tls",
+	"uuid",
+]
+
+plugin = [
+	"nu-parser/plugin",
+	"os", 
+]
 sqlite = ["rusqlite"]
 trash-support = ["trash"]
 
diff --git a/crates/nu-command/src/debug/info.rs b/crates/nu-command/src/debug/info.rs
index 2a680ae20d..4912da8a1d 100644
--- a/crates/nu-command/src/debug/info.rs
+++ b/crates/nu-command/src/debug/info.rs
@@ -177,4 +177,9 @@ fn get_thread_id() -> u64 {
     {
         nix::sys::pthread::pthread_self() as u64
     }
+    #[cfg(target_arch = "wasm32")]
+    {
+        // wasm doesn't have any threads accessible, so we return 0 as a fallback
+        0
+    }
 }
diff --git a/crates/nu-command/src/debug/inspect.rs b/crates/nu-command/src/debug/inspect.rs
index 4a9f7bc4a5..f8ef63ce02 100644
--- a/crates/nu-command/src/debug/inspect.rs
+++ b/crates/nu-command/src/debug/inspect.rs
@@ -1,6 +1,6 @@
 use super::inspect_table;
-use crossterm::terminal::size;
 use nu_engine::command_prelude::*;
+use nu_utils::terminal_size;
 
 #[derive(Clone)]
 pub struct Inspect;
@@ -38,7 +38,7 @@ impl Command for Inspect {
         let original_input = input_val.clone();
         let description = input_val.get_type().to_string();
 
-        let (cols, _rows) = size().unwrap_or((0, 0));
+        let (cols, _rows) = terminal_size().unwrap_or((0, 0));
 
         let table = inspect_table::build_table(input_val, description, cols as usize);
 
diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index fcca72b2f2..0a4075c532 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -27,6 +27,10 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
         }
 
         // Filters
+        #[cfg(feature = "rand")]
+        bind_command! {
+            Shuffle
+        }
         bind_command! {
             All,
             Any,
@@ -72,7 +76,6 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             Rename,
             Reverse,
             Select,
-            Shuffle,
             Skip,
             SkipUntil,
             SkipWhile,
@@ -114,6 +117,7 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
         };
 
         // System
+        #[cfg(feature = "os")]
         bind_command! {
             Complete,
             External,
@@ -161,17 +165,20 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             ViewSpan,
         };
 
-        #[cfg(windows)]
+        #[cfg(all(feature = "os", windows))]
         bind_command! { RegistryQuery }
 
-        #[cfg(any(
-            target_os = "android",
-            target_os = "linux",
-            target_os = "freebsd",
-            target_os = "netbsd",
-            target_os = "openbsd",
-            target_os = "macos",
-            target_os = "windows"
+        #[cfg(all(
+            feature = "os",
+            any(
+                target_os = "android",
+                target_os = "linux",
+                target_os = "freebsd",
+                target_os = "netbsd",
+                target_os = "openbsd",
+                target_os = "macos",
+                target_os = "windows"
+            )
         ))]
         bind_command! { Ps };
 
@@ -219,6 +226,7 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
         };
 
         // FileSystem
+        #[cfg(feature = "os")]
         bind_command! {
             Cd,
             Ls,
@@ -237,6 +245,7 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
         };
 
         // Platform
+        #[cfg(feature = "os")]
         bind_command! {
             Ansi,
             AnsiLink,
@@ -255,7 +264,7 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             Whoami,
         };
 
-        #[cfg(unix)]
+        #[cfg(all(unix, feature = "os"))]
         bind_command! { ULimit };
 
         // Date
@@ -380,6 +389,7 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
         }
 
         // Network
+        #[cfg(feature = "network")]
         bind_command! {
             Http,
             HttpDelete,
@@ -389,6 +399,9 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             HttpPost,
             HttpPut,
             HttpOptions,
+            Port,
+        }
+        bind_command! {
             Url,
             UrlBuildQuery,
             UrlSplitQuery,
@@ -396,10 +409,10 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             UrlEncode,
             UrlJoin,
             UrlParse,
-            Port,
         }
 
         // Random
+        #[cfg(feature = "rand")]
         bind_command! {
             Random,
             RandomBool,
diff --git a/crates/nu-command/src/env/config/config_.rs b/crates/nu-command/src/env/config/config_.rs
index 207c8c8651..71afd57c5a 100644
--- a/crates/nu-command/src/env/config/config_.rs
+++ b/crates/nu-command/src/env/config/config_.rs
@@ -1,4 +1,6 @@
-use nu_engine::{command_prelude::*, get_full_help};
+use nu_cmd_base::util::get_editor;
+use nu_engine::{command_prelude::*, env_to_strings, get_full_help};
+use nu_system::ForegroundChild;
 
 #[derive(Clone)]
 pub struct ConfigMeta;
@@ -36,3 +38,79 @@ impl Command for ConfigMeta {
         vec!["options", "setup"]
     }
 }
+
+#[cfg(not(feature = "os"))]
+pub(super) fn start_editor(
+    _: &'static str,
+    _: &EngineState,
+    _: &mut Stack,
+    call: &Call,
+) -> Result<PipelineData, ShellError> {
+    Err(ShellError::DisabledOsSupport {
+        msg: "Running external commands is not available without OS support.".to_string(),
+        span: Some(call.head),
+    })
+}
+
+#[cfg(feature = "os")]
+pub(super) fn start_editor(
+    config_path: &'static str,
+    engine_state: &EngineState,
+    stack: &mut Stack,
+    call: &Call,
+) -> Result<PipelineData, ShellError> {
+    // Find the editor executable.
+    let (editor_name, editor_args) = get_editor(engine_state, stack, call.head)?;
+    let paths = nu_engine::env::path_str(engine_state, stack, call.head)?;
+    let cwd = engine_state.cwd(Some(stack))?;
+    let editor_executable =
+        crate::which(&editor_name, &paths, cwd.as_ref()).ok_or(ShellError::ExternalCommand {
+            label: format!("`{editor_name}` not found"),
+            help: "Failed to find the editor executable".into(),
+            span: call.head,
+        })?;
+
+    let Some(config_path) = engine_state.get_config_path(config_path) else {
+        return Err(ShellError::GenericError {
+            error: format!("Could not find $nu.{config_path}"),
+            msg: format!("Could not find $nu.{config_path}"),
+            span: None,
+            help: None,
+            inner: vec![],
+        });
+    };
+    let config_path = config_path.to_string_lossy().to_string();
+
+    // Create the command.
+    let mut command = std::process::Command::new(editor_executable);
+
+    // Configure PWD.
+    command.current_dir(cwd);
+
+    // Configure environment variables.
+    let envs = env_to_strings(engine_state, stack)?;
+    command.env_clear();
+    command.envs(envs);
+
+    // Configure args.
+    command.arg(config_path);
+    command.args(editor_args);
+
+    // Spawn the child process. On Unix, also put the child process to
+    // foreground if we're in an interactive session.
+    #[cfg(windows)]
+    let child = ForegroundChild::spawn(command)?;
+    #[cfg(unix)]
+    let child = ForegroundChild::spawn(
+        command,
+        engine_state.is_interactive,
+        &engine_state.pipeline_externals_state,
+    )?;
+
+    // Wrap the output into a `PipelineData::ByteStream`.
+    let child = nu_protocol::process::ChildProcess::new(child, None, false, call.head)?;
+    Ok(PipelineData::ByteStream(
+        ByteStream::child(child, call.head),
+        None,
+    ))
+}
diff --git a/crates/nu-command/src/env/config/config_env.rs b/crates/nu-command/src/env/config/config_env.rs
index 5331d2d3be..5fdc39a903 100644
--- a/crates/nu-command/src/env/config/config_env.rs
+++ b/crates/nu-command/src/env/config/config_env.rs
@@ -1,7 +1,4 @@
-use nu_cmd_base::util::get_editor;
-use nu_engine::{command_prelude::*, env_to_strings};
-use nu_protocol::{process::ChildProcess, ByteStream};
-use nu_system::ForegroundChild;
+use nu_engine::command_prelude::*;
 
 #[derive(Clone)]
 pub struct ConfigEnv;
@@ -81,60 +78,6 @@ impl Command for ConfigEnv {
             return Ok(Value::string(nu_utils::get_sample_env(), head).into_pipeline_data());
         }
 
-        // Find the editor executable.
-        let (editor_name, editor_args) = get_editor(engine_state, stack, call.head)?;
-        let paths = nu_engine::env::path_str(engine_state, stack, call.head)?;
-        let cwd = engine_state.cwd(Some(stack))?;
-        let editor_executable = crate::which(&editor_name, &paths, cwd.as_ref()).ok_or(
-            ShellError::ExternalCommand {
-                label: format!("`{editor_name}` not found"),
-                help: "Failed to find the editor executable".into(),
-                span: call.head,
-            },
-        )?;
-
-        let Some(env_path) = engine_state.get_config_path("env-path") else {
-            return Err(ShellError::GenericError {
-                error: "Could not find $nu.env-path".into(),
-                msg: "Could not find $nu.env-path".into(),
-                span: None,
-                help: None,
-                inner: vec![],
-            });
-        };
-        let env_path = env_path.to_string_lossy().to_string();
-
-        // Create the command.
-        let mut command = std::process::Command::new(editor_executable);
-
-        // Configure PWD.
-        command.current_dir(cwd);
-
-        // Configure environment variables.
-        let envs = env_to_strings(engine_state, stack)?;
-        command.env_clear();
-        command.envs(envs);
-
-        // Configure args.
-        command.arg(env_path);
-        command.args(editor_args);
-
-        // Spawn the child process. On Unix, also put the child process to
-        // foreground if we're in an interactive session.
-        #[cfg(windows)]
-        let child = ForegroundChild::spawn(command)?;
-        #[cfg(unix)]
-        let child = ForegroundChild::spawn(
-            command,
-            engine_state.is_interactive,
-            &engine_state.pipeline_externals_state,
-        )?;
-
-        // Wrap the output into a `PipelineData::ByteStream`.
-        let child = ChildProcess::new(child, None, false, call.head)?;
-        Ok(PipelineData::ByteStream(
-            ByteStream::child(child, call.head),
-            None,
-        ))
+        super::config_::start_editor("env-path", engine_state, stack, call)
     }
 }
diff --git a/crates/nu-command/src/env/config/config_nu.rs b/crates/nu-command/src/env/config/config_nu.rs
index 176643a76f..75d971f36e 100644
--- a/crates/nu-command/src/env/config/config_nu.rs
+++ b/crates/nu-command/src/env/config/config_nu.rs
@@ -1,7 +1,4 @@
-use nu_cmd_base::util::get_editor;
-use nu_engine::{command_prelude::*, env_to_strings};
-use nu_protocol::{process::ChildProcess, ByteStream};
-use nu_system::ForegroundChild;
+use nu_engine::command_prelude::*;
 
 #[derive(Clone)]
 pub struct ConfigNu;
@@ -83,60 +80,6 @@ impl Command for ConfigNu {
             return Ok(Value::string(nu_utils::get_sample_config(), head).into_pipeline_data());
         }
 
-        // Find the editor executable.
-        let (editor_name, editor_args) = get_editor(engine_state, stack, call.head)?;
-        let paths = nu_engine::env::path_str(engine_state, stack, call.head)?;
-        let cwd = engine_state.cwd(Some(stack))?;
-        let editor_executable = crate::which(&editor_name, &paths, cwd.as_ref()).ok_or(
-            ShellError::ExternalCommand {
-                label: format!("`{editor_name}` not found"),
-                help: "Failed to find the editor executable".into(),
-                span: call.head,
-            },
-        )?;
-
-        let Some(config_path) = engine_state.get_config_path("config-path") else {
-            return Err(ShellError::GenericError {
-                error: "Could not find $nu.config-path".into(),
-                msg: "Could not find $nu.config-path".into(),
-                span: None,
-                help: None,
-                inner: vec![],
-            });
-        };
-        let config_path = config_path.to_string_lossy().to_string();
-
-        // Create the command.
-        let mut command = std::process::Command::new(editor_executable);
-
-        // Configure PWD.
-        command.current_dir(cwd);
-
-        // Configure environment variables.
-        let envs = env_to_strings(engine_state, stack)?;
-        command.env_clear();
-        command.envs(envs);
-
-        // Configure args.
-        command.arg(config_path);
-        command.args(editor_args);
-
-        // Spawn the child process. On Unix, also put the child process to
-        // foreground if we're in an interactive session.
-        #[cfg(windows)]
-        let child = ForegroundChild::spawn(command)?;
-        #[cfg(unix)]
-        let child = ForegroundChild::spawn(
-            command,
-            engine_state.is_interactive,
-            &engine_state.pipeline_externals_state,
-        )?;
-
-        // Wrap the output into a `PipelineData::ByteStream`.
-        let child = ChildProcess::new(child, None, false, call.head)?;
-        Ok(PipelineData::ByteStream(
-            ByteStream::child(child, call.head),
-            None,
-        ))
+        super::config_::start_editor("config-path", engine_state, stack, call)
     }
 }
diff --git a/crates/nu-command/src/experimental/is_admin.rs b/crates/nu-command/src/experimental/is_admin.rs
index 2dbeb0e988..37434f716e 100644
--- a/crates/nu-command/src/experimental/is_admin.rs
+++ b/crates/nu-command/src/experimental/is_admin.rs
@@ -103,3 +103,9 @@ fn is_root_impl() -> bool {
 
     elevated
 }
+
+#[cfg(target_arch = "wasm32")]
+fn is_root_impl() -> bool {
+    // in wasm we don't have a user system, so technically we are never root
+    false
+}
diff --git a/crates/nu-command/src/filesystem/save.rs b/crates/nu-command/src/filesystem/save.rs
index 6fda754341..c4ae00f593 100644
--- a/crates/nu-command/src/filesystem/save.rs
+++ b/crates/nu-command/src/filesystem/save.rs
@@ -102,6 +102,7 @@ impl Command for Save {
                     ByteStreamSource::File(source) => {
                         stream_to_file(source, size, signals, file, span, progress)?;
                     }
+                    #[cfg(feature = "os")]
                     ByteStreamSource::Child(mut child) => {
                         fn write_or_consume_stderr(
                             stderr: ChildPipe,
diff --git a/crates/nu-command/src/filters/mod.rs b/crates/nu-command/src/filters/mod.rs
index f5e5118390..8eac0fc70b 100644
--- a/crates/nu-command/src/filters/mod.rs
+++ b/crates/nu-command/src/filters/mod.rs
@@ -37,6 +37,7 @@ mod reject;
 mod rename;
 mod reverse;
 mod select;
+#[cfg(feature = "rand")]
 mod shuffle;
 mod skip;
 mod sort;
@@ -95,6 +96,7 @@ pub use reject::Reject;
 pub use rename::Rename;
 pub use reverse::Reverse;
 pub use select::Select;
+#[cfg(feature = "rand")]
 pub use shuffle::Shuffle;
 pub use skip::*;
 pub use sort::Sort;
diff --git a/crates/nu-command/src/filters/tee.rs b/crates/nu-command/src/filters/tee.rs
index a6f0027016..e643939894 100644
--- a/crates/nu-command/src/filters/tee.rs
+++ b/crates/nu-command/src/filters/tee.rs
@@ -1,7 +1,9 @@
 use nu_engine::{command_prelude::*, get_eval_block_with_early_return};
+#[cfg(feature = "os")]
+use nu_protocol::process::ChildPipe;
 use nu_protocol::{
-    byte_stream::copy_with_signals, engine::Closure, process::ChildPipe, report_shell_error,
-    ByteStream, ByteStreamSource, OutDest, PipelineMetadata, Signals,
+    byte_stream::copy_with_signals, engine::Closure, report_shell_error, ByteStream,
+    ByteStreamSource, OutDest, PipelineMetadata, Signals,
 };
 use std::{
     io::{self, Read, Write},
@@ -152,6 +154,7 @@ use it in your pipeline."#
                         metadata,
                     ))
                 }
+                #[cfg(feature = "os")]
                 ByteStreamSource::Child(mut child) => {
                     let stderr_thread = if use_stderr {
                         let stderr_thread = if let Some(stderr) = child.stderr.take() {
@@ -454,6 +457,7 @@ fn copy(src: impl Read, dest: impl Write, info: &StreamInfo) -> Result<(), Shell
     Ok(())
 }
 
+#[cfg(feature = "os")]
 fn copy_pipe(pipe: ChildPipe, dest: impl Write, info: &StreamInfo) -> Result<(), ShellError> {
     match pipe {
         ChildPipe::Pipe(pipe) => copy(pipe, dest, info),
@@ -477,6 +481,7 @@ fn copy_on_thread(
         .map_err(|e| e.into_spanned(span).into())
 }
 
+#[cfg(feature = "os")]
 fn copy_pipe_on_thread(
     pipe: ChildPipe,
     dest: impl Write + Send + 'static,
diff --git a/crates/nu-command/src/lib.rs b/crates/nu-command/src/lib.rs
index 55c4974325..e3b1a7f538 100644
--- a/crates/nu-command/src/lib.rs
+++ b/crates/nu-command/src/lib.rs
@@ -1,3 +1,4 @@
+#![cfg_attr(not(feature = "os"), allow(unused))]
 #![doc = include_str!("../README.md")]
 mod bytes;
 mod charting;
@@ -8,6 +9,7 @@ mod default_context;
 mod env;
 mod example_test;
 mod experimental;
+#[cfg(feature = "os")]
 mod filesystem;
 mod filters;
 mod formats;
@@ -18,8 +20,10 @@ mod math;
 mod misc;
 mod network;
 mod path;
+#[cfg(feature = "os")]
 mod platform;
 mod progress_bar;
+#[cfg(feature = "rand")]
 mod random;
 mod removed;
 mod shells;
@@ -27,6 +31,7 @@ mod sort_utils;
 #[cfg(feature = "sqlite")]
 mod stor;
 mod strings;
+#[cfg(feature = "os")]
 mod system;
 mod viewers;
 
@@ -40,6 +45,7 @@ pub use env::*;
 #[cfg(test)]
 pub use example_test::{test_examples, test_examples_with_commands};
 pub use experimental::*;
+#[cfg(feature = "os")]
 pub use filesystem::*;
 pub use filters::*;
 pub use formats::*;
@@ -50,7 +56,9 @@ pub use math::*;
 pub use misc::*;
 pub use network::*;
 pub use path::*;
+#[cfg(feature = "os")]
 pub use platform::*;
+#[cfg(feature = "rand")]
 pub use random::*;
 pub use removed::*;
 pub use shells::*;
@@ -58,6 +66,7 @@ pub use sort_utils::*;
 #[cfg(feature = "sqlite")]
 pub use stor::*;
 pub use strings::*;
+#[cfg(feature = "os")]
 pub use system::*;
 pub use viewers::*;
 
diff --git a/crates/nu-command/src/network/mod.rs b/crates/nu-command/src/network/mod.rs
index 5ca523a1d3..ea46fd3dc8 100644
--- a/crates/nu-command/src/network/mod.rs
+++ b/crates/nu-command/src/network/mod.rs
@@ -1,8 +1,12 @@
+#[cfg(feature = "network")]
 mod http;
+#[cfg(feature = "network")]
 mod port;
 mod url;
 
+#[cfg(feature = "network")]
 pub use self::http::*;
 pub use self::url::*;
 
+#[cfg(feature = "network")]
 pub use port::SubCommand as Port;
diff --git a/crates/nu-command/src/viewers/griddle.rs b/crates/nu-command/src/viewers/griddle.rs
index 730c5ec0df..23b8259ddd 100644
--- a/crates/nu-command/src/viewers/griddle.rs
+++ b/crates/nu-command/src/viewers/griddle.rs
@@ -1,11 +1,10 @@
 // use super::icons::{icon_for_file, iconify_style_ansi_to_nu};
 use super::icons::icon_for_file;
-use crossterm::terminal::size;
 use lscolors::Style;
 use nu_engine::{command_prelude::*, env_to_string};
 use nu_protocol::Config;
 use nu_term_grid::grid::{Alignment, Cell, Direction, Filling, Grid, GridOptions};
-use nu_utils::get_ls_colors;
+use nu_utils::{get_ls_colors, terminal_size};
 use std::path::Path;
 
 #[derive(Clone)]
@@ -192,7 +191,7 @@ fn create_grid_output(
 
     let cols = if let Some(col) = width_param {
         col as u16
-    } else if let Ok((w, _h)) = size() {
+    } else if let Ok((w, _h)) = terminal_size() {
         w
     } else {
         80u16
diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index 43c9ed0b8d..1768590b65 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -2,7 +2,6 @@
 //        overall reduce the redundant calls to StyleComputer etc.
 //        the goal is to configure it once...
 
-use crossterm::terminal::size;
 use lscolors::{LsColors, Style};
 use nu_color_config::{color_from_hex, StyleComputer, TextStyle};
 use nu_engine::{command_prelude::*, env_to_string};
@@ -15,7 +14,7 @@ use nu_table::{
     common::create_nu_table_config, CollapsedTable, ExpandedTable, JustTable, NuTable, NuTableCell,
     StringResult, TableOpts, TableOutput,
 };
-use nu_utils::get_ls_colors;
+use nu_utils::{get_ls_colors, terminal_size};
 use std::{
     collections::VecDeque,
     io::{IsTerminal, Read},
@@ -30,7 +29,7 @@ const STREAM_PAGE_SIZE: usize = 1000;
 fn get_width_param(width_param: Option<i64>) -> usize {
     if let Some(col) = width_param {
         col as usize
-    } else if let Ok((w, _h)) = size() {
+    } else if let Ok((w, _h)) = terminal_size() {
         w as usize
     } else {
         80
@@ -712,6 +711,13 @@ fn make_clickable_link(
 ) -> String {
     // uri's based on this https://gist.github.com/egmontkob/eb114294efbcd5adb1944c9f3cb5feda
 
+    #[cfg(any(
+        unix,
+        windows,
+        target_os = "redox",
+        target_os = "wasi",
+        target_os = "hermit"
+    ))]
     if show_clickable_links {
         format!(
             "\x1b]8;;{}\x1b\\{}\x1b]8;;\x1b\\",
@@ -727,6 +733,18 @@ fn make_clickable_link(
             None => full_path,
         }
     }
+
+    #[cfg(not(any(
+        unix,
+        windows,
+        target_os = "redox",
+        target_os = "wasi",
+        target_os = "hermit"
+    )))]
+    match link_name {
+        Some(link_name) => link_name.to_string(),
+        None => full_path,
+    }
 }
 
 struct PagingTableCreator {
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index dfe634d078..38752422da 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -14,12 +14,20 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", features = ["plugin"], version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1", default-features = false }
 nu-path = { path = "../nu-path", version = "0.100.1" }
 nu-glob = { path = "../nu-glob", version = "0.100.1" }
-nu-utils = { path = "../nu-utils", version = "0.100.1" }
+nu-utils = { path = "../nu-utils", version = "0.100.1", default-features = false }
 log = { workspace = true }
 terminal_size = { workspace = true }
 
 [features]
-plugin = []
\ No newline at end of file
+default = ["os"]
+os = [
+  "nu-protocol/os",
+  "nu-utils/os",
+]
+plugin = [
+  "nu-protocol/plugin",
+  "os",
+]
diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index ee0d8624d2..afcb58a90a 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -8,9 +8,9 @@ use nu_protocol::{
         Argument, Closure, EngineState, ErrorHandler, Matcher, Redirection, Stack, StateWorkingSet,
     },
     ir::{Call, DataSlice, Instruction, IrAstRef, IrBlock, Literal, RedirectMode},
-    ByteStreamSource, DataSource, DeclId, ErrSpan, Flag, IntoPipelineData, IntoSpanned, ListStream,
-    OutDest, PipelineData, PipelineMetadata, PositionalArg, Range, Record, RegId, ShellError,
-    Signals, Signature, Span, Spanned, Type, Value, VarId, ENV_VARIABLE_ID,
+    DataSource, DeclId, ErrSpan, Flag, IntoPipelineData, IntoSpanned, ListStream, OutDest,
+    PipelineData, PipelineMetadata, PositionalArg, Range, Record, RegId, ShellError, Signals,
+    Signature, Span, Spanned, Type, Value, VarId, ENV_VARIABLE_ID,
 };
 use nu_utils::IgnoreCaseExt;
 
@@ -478,8 +478,9 @@ fn eval_instruction<D: DebugContext>(
             Ok(Continue)
         }
         Instruction::CheckErrRedirected { src } => match ctx.borrow_reg(*src) {
+            #[cfg(feature = "os")]
             PipelineData::ByteStream(stream, _)
-                if matches!(stream.source(), ByteStreamSource::Child(_)) =>
+                if matches!(stream.source(), nu_protocol::ByteStreamSource::Child(_)) =>
             {
                 Ok(Continue)
             }
@@ -513,7 +514,7 @@ fn eval_instruction<D: DebugContext>(
                     span: Some(*span),
                 })?;
             let is_external = if let PipelineData::ByteStream(stream, ..) = &src {
-                matches!(stream.source(), ByteStreamSource::Child(..))
+                stream.source().is_external()
             } else {
                 false
             };
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index bfef11acb2..0c15a327e6 100644
--- a/crates/nu-parser/Cargo.toml
+++ b/crates/nu-parser/Cargo.toml
@@ -15,11 +15,11 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.100.1" }
+nu-engine = { path = "../nu-engine", version = "0.100.1", default-features = false }
 nu-path = { path = "../nu-path", version = "0.100.1" }
 nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.100.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
-nu-utils = { path = "../nu-utils", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.100.1", default-features = false }
 
 bytesize = { workspace = true }
 chrono = { default-features = false, features = ['std'], workspace = true }
diff --git a/crates/nu-path/src/tilde.rs b/crates/nu-path/src/tilde.rs
index ac48bdfc3f..2420c8c17e 100644
--- a/crates/nu-path/src/tilde.rs
+++ b/crates/nu-path/src/tilde.rs
@@ -60,6 +60,7 @@ fn expand_tilde_with_home(path: impl AsRef<Path>, home: Option<PathBuf>) -> Path
     }
 }
 
+#[cfg(not(target_arch = "wasm32"))]
 fn fallback_home_dir(username: &str) -> PathBuf {
     PathBuf::from_iter([FALLBACK_USER_HOME_BASE_DIR, username])
 }
@@ -110,6 +111,13 @@ fn user_home_dir(username: &str) -> PathBuf {
     }
 }
 
+#[cfg(target_arch = "wasm32")]
+fn user_home_dir(_: &str) -> PathBuf {
+    // if WASI is used, we try to get a home dir via HOME env, otherwise we don't have a home dir
+    let home = std::env::var("HOME").unwrap_or_else(|_| "/".to_string());
+    PathBuf::from(home)
+}
+
 /// Returns true if the shell is running inside the Termux terminal emulator
 /// app.
 #[cfg(target_os = "android")]
diff --git a/crates/nu-path/src/trailing_slash.rs b/crates/nu-path/src/trailing_slash.rs
index 4daf5d45ef..6a2d08ac63 100644
--- a/crates/nu-path/src/trailing_slash.rs
+++ b/crates/nu-path/src/trailing_slash.rs
@@ -36,6 +36,13 @@ pub fn has_trailing_slash(path: &Path) -> bool {
     last == Some(&b'/')
 }
 
+/// `true` if the path has a trailing slash, including if it's the root directory.
+#[cfg(target_arch = "wasm32")]
+pub fn has_trailing_slash(path: &Path) -> bool {
+    // in the web paths are often just URLs, they are separated by forward slashes
+    path.to_str().map_or(false, |s| s.ends_with('/'))
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index 2c43a86c5e..0e6827bb19 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -14,8 +14,8 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.100.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
+nu-engine = { path = "../nu-engine", version = "0.100.1", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1", features = ["plugin"] }
 nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.100.1" }
 nu-plugin-core = { path = "../nu-plugin-core", version = "0.100.1", default-features = false }
 nu-utils = { path = "../nu-utils", version = "0.100.1" }
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index dfbcb7b307..34af0452f0 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -16,7 +16,7 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.100.1" }
+nu-utils = { path = "../nu-utils", version = "0.100.1", default-features = false }
 nu-path = { path = "../nu-path", version = "0.100.1" }
 nu-system = { path = "../nu-system", version = "0.100.1" }
 nu-derive-value = { path = "../nu-derive-value", version = "0.100.1" }
@@ -31,14 +31,14 @@ fancy-regex = { workspace = true }
 heck = { workspace = true }
 indexmap = { workspace = true }
 lru = { workspace = true }
-miette = { workspace = true, features = ["fancy-no-backtrace"] }
+miette = { workspace = true, features = ["fancy-no-backtrace"]}
 num-format = { workspace = true }
 rmp-serde = { workspace = true, optional = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 thiserror = "2.0"
 typetag = "0.2"
-os_pipe = { workspace = true, features = ["io_safety"] }
+os_pipe = { workspace = true, optional = true, features = ["io_safety"] }
 log = { workspace = true }
 
 [target.'cfg(unix)'.dependencies]
@@ -49,8 +49,15 @@ dirs-sys = { workspace = true }
 windows-sys = { workspace = true }
 
 [features]
+default = ["os"]
+os = [
+  "nu-utils/os",
+  "os_pipe",
+]
+
 plugin = [
   "brotli",
+  "os",
   "rmp-serde",
 ]
 
diff --git a/crates/nu-protocol/src/errors/shell_error.rs b/crates/nu-protocol/src/errors/shell_error.rs
index 9e934e7f64..f187dde807 100644
--- a/crates/nu-protocol/src/errors/shell_error.rs
+++ b/crates/nu-protocol/src/errors/shell_error.rs
@@ -1458,6 +1458,17 @@ On Windows, this would be %USERPROFILE%\AppData\Roaming"#
         #[label = "while running this code"]
         span: Option<Span>,
     },
+
+    #[error("OS feature is disabled: {msg}")]
+    #[diagnostic(
+        code(nu::shell::os_disabled),
+        help("You're probably running outside an OS like a browser, we cannot support this")
+    )]
+    DisabledOsSupport {
+        msg: String,
+        #[label = "while running this code"]
+        span: Option<Span>,
+    },
 }
 
 impl ShellError {
diff --git a/crates/nu-protocol/src/lib.rs b/crates/nu-protocol/src/lib.rs
index e143a19819..f916bfcf64 100644
--- a/crates/nu-protocol/src/lib.rs
+++ b/crates/nu-protocol/src/lib.rs
@@ -1,3 +1,4 @@
+#![cfg_attr(not(feature = "os"), allow(unused))]
 #![doc = include_str!("../README.md")]
 mod alias;
 pub mod ast;
@@ -17,6 +18,7 @@ pub mod parser_path;
 mod pipeline;
 #[cfg(feature = "plugin")]
 mod plugin;
+#[cfg(feature = "os")]
 pub mod process;
 mod signature;
 pub mod span;
diff --git a/crates/nu-protocol/src/pipeline/byte_stream.rs b/crates/nu-protocol/src/pipeline/byte_stream.rs
index da78b9c836..2b7c93495e 100644
--- a/crates/nu-protocol/src/pipeline/byte_stream.rs
+++ b/crates/nu-protocol/src/pipeline/byte_stream.rs
@@ -1,8 +1,7 @@
 //! Module managing the streaming of raw bytes between pipeline elements
-use crate::{
-    process::{ChildPipe, ChildProcess},
-    ErrSpan, IntoSpanned, PipelineData, ShellError, Signals, Span, Type, Value,
-};
+#[cfg(feature = "os")]
+use crate::process::{ChildPipe, ChildProcess};
+use crate::{ErrSpan, IntoSpanned, PipelineData, ShellError, Signals, Span, Type, Value};
 use serde::{Deserialize, Serialize};
 #[cfg(unix)]
 use std::os::fd::OwnedFd;
@@ -24,6 +23,7 @@ use std::{
 pub enum ByteStreamSource {
     Read(Box<dyn Read + Send + 'static>),
     File(File),
+    #[cfg(feature = "os")]
     Child(Box<ChildProcess>),
 }
 
@@ -32,6 +32,7 @@ impl ByteStreamSource {
         match self {
             ByteStreamSource::Read(read) => Some(SourceReader::Read(read)),
             ByteStreamSource::File(file) => Some(SourceReader::File(file)),
+            #[cfg(feature = "os")]
             ByteStreamSource::Child(mut child) => child.stdout.take().map(|stdout| match stdout {
                 ChildPipe::Pipe(pipe) => SourceReader::File(convert_file(pipe)),
                 ChildPipe::Tee(tee) => SourceReader::Read(tee),
@@ -40,9 +41,16 @@ impl ByteStreamSource {
     }
 
     /// Source is a `Child` or `File`, rather than `Read`. Currently affects trimming
-    fn is_external(&self) -> bool {
+    #[cfg(feature = "os")]
+    pub fn is_external(&self) -> bool {
         matches!(self, ByteStreamSource::Child(..))
     }
+
+    #[cfg(not(feature = "os"))]
+    pub fn is_external(&self) -> bool {
+        // without os support we never have externals
+        false
+    }
 }
 
 impl Debug for ByteStreamSource {
@@ -50,6 +58,7 @@ impl Debug for ByteStreamSource {
         match self {
             ByteStreamSource::Read(_) => f.debug_tuple("Read").field(&"..").finish(),
             ByteStreamSource::File(file) => f.debug_tuple("File").field(file).finish(),
+            #[cfg(feature = "os")]
             ByteStreamSource::Child(child) => f.debug_tuple("Child").field(child).finish(),
         }
     }
@@ -247,6 +256,7 @@ impl ByteStream {
     ///
     /// The type is implicitly `Unknown`, as it's not typically known whether child processes will
     /// return text or binary.
+    #[cfg(feature = "os")]
     pub fn child(child: ChildProcess, span: Span) -> Self {
         Self::new(
             ByteStreamSource::Child(Box::new(child)),
@@ -260,6 +270,7 @@ impl ByteStream {
     ///
     /// The type is implicitly `Unknown`, as it's not typically known whether stdin is text or
     /// binary.
+    #[cfg(feature = "os")]
     pub fn stdin(span: Span) -> Result<Self, ShellError> {
         let stdin = os_pipe::dup_stdin().err_span(span)?;
         let source = ByteStreamSource::File(convert_file(stdin));
@@ -271,6 +282,14 @@ impl ByteStream {
         ))
     }
 
+    #[cfg(not(feature = "os"))]
+    pub fn stdin(span: Span) -> Result<Self, ShellError> {
+        Err(ShellError::DisabledOsSupport {
+            msg: "Stdin is not supported".to_string(),
+            span: Some(span),
+        })
+    }
+
     /// Create a [`ByteStream`] from a generator function that writes data to the given buffer
     /// when called, and returns `Ok(false)` on end of stream.
     pub fn from_fn(
@@ -432,6 +451,7 @@ impl ByteStream {
         match self.stream {
             ByteStreamSource::Read(..) => Err(self),
             ByteStreamSource::File(file) => Ok(file.into()),
+            #[cfg(feature = "os")]
             ByteStreamSource::Child(child) => {
                 if let ChildProcess {
                     stdout: Some(ChildPipe::Pipe(stdout)),
@@ -453,6 +473,7 @@ impl ByteStream {
     ///
     /// This will only succeed if the [`ByteStreamSource`] of the [`ByteStream`] is [`Child`](ByteStreamSource::Child).
     /// All other cases return an `Err` with the original [`ByteStream`] in it.
+    #[cfg(feature = "os")]
     pub fn into_child(self) -> Result<ChildProcess, Self> {
         if let ByteStreamSource::Child(child) = self.stream {
             Ok(*child)
@@ -477,6 +498,7 @@ impl ByteStream {
                 file.read_to_end(&mut buf).err_span(self.span)?;
                 Ok(buf)
             }
+            #[cfg(feature = "os")]
             ByteStreamSource::Child(child) => child.into_bytes(),
         }
     }
@@ -551,6 +573,7 @@ impl ByteStream {
                 Ok(())
             }
             ByteStreamSource::File(_) => Ok(()),
+            #[cfg(feature = "os")]
             ByteStreamSource::Child(child) => child.wait(),
         }
     }
@@ -575,6 +598,7 @@ impl ByteStream {
             ByteStreamSource::File(file) => {
                 copy_with_signals(file, dest, span, signals)?;
             }
+            #[cfg(feature = "os")]
             ByteStreamSource::Child(mut child) => {
                 // All `OutDest`s except `OutDest::PipeSeparate` will cause `stderr` to be `None`.
                 // Only `save`, `tee`, and `complete` set the stderr `OutDest` to `OutDest::PipeSeparate`,
diff --git a/crates/nu-std/Cargo.toml b/crates/nu-std/Cargo.toml
index a6c48cac3c..aa39d215e0 100644
--- a/crates/nu-std/Cargo.toml
+++ b/crates/nu-std/Cargo.toml
@@ -9,8 +9,8 @@ version = "0.100.1"
 
 [dependencies]
 nu-parser = { version = "0.100.1", path = "../nu-parser" }
-nu-protocol = { version = "0.100.1", path = "../nu-protocol" }
-nu-engine = { version = "0.100.1", path = "../nu-engine" }
+nu-protocol = { version = "0.100.1", path = "../nu-protocol", default-features = false }
+nu-engine = { version = "0.100.1", path = "../nu-engine", default-features = false }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
 
 log = "0.4"
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index c5ddb41f52..ec32249de5 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -14,9 +14,9 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
-nu-utils = { path = "../nu-utils", version = "0.100.1" }
-nu-engine = { path = "../nu-engine", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.100.1", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.100.1", default-features = false }
 nu-color-config = { path = "../nu-color-config", version = "0.100.1" }
 nu-ansi-term = { workspace = true }
 fancy-regex = { workspace = true }
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index a9fea5e78b..9ef7414b73 100644
--- a/crates/nu-term-grid/Cargo.toml
+++ b/crates/nu-term-grid/Cargo.toml
@@ -14,6 +14,6 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.100.1" }
+nu-utils = { path = "../nu-utils", version = "0.100.1", default-features = false }
 
 unicode-width = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index 4b590e6831..309f5f3139 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -17,6 +17,7 @@ bench = false
 bench = false
 
 [dependencies]
+crossterm = { workspace = true, optional = true }
 fancy-regex = { workspace = true }
 lscolors = { workspace = true, default-features = false, features = ["nu-ansi-term"] }
 log = { workspace = true }
@@ -26,6 +27,10 @@ serde = { workspace = true }
 sys-locale = "0.3"
 unicase = "2.8.0"
 
+[features]
+default = ["os"]
+os = ["crossterm"]
+
 [target.'cfg(windows)'.dependencies]
 crossterm_winapi = "0.9"
 
diff --git a/crates/nu-utils/src/filesystem.rs b/crates/nu-utils/src/filesystem.rs
index 588f0fccff..4ea89c4e05 100644
--- a/crates/nu-utils/src/filesystem.rs
+++ b/crates/nu-utils/src/filesystem.rs
@@ -1,3 +1,4 @@
+#[cfg(any(windows, unix))]
 use std::path::Path;
 #[cfg(unix)]
 use {
diff --git a/crates/nu-utils/src/lib.rs b/crates/nu-utils/src/lib.rs
index 413b5f8893..a22c2e4537 100644
--- a/crates/nu-utils/src/lib.rs
+++ b/crates/nu-utils/src/lib.rs
@@ -12,7 +12,7 @@ pub use locale::get_system_locale;
 pub use utils::{
     enable_vt_processing, get_default_config, get_default_env, get_ls_colors, get_sample_config,
     get_sample_env, get_scaffold_config, get_scaffold_env, stderr_write_all_and_flush,
-    stdout_write_all_and_flush,
+    stdout_write_all_and_flush, terminal_size,
 };
 
 pub use casing::IgnoreCaseExt;
diff --git a/crates/nu-utils/src/utils.rs b/crates/nu-utils/src/utils.rs
index 798e542be5..74e5277ec4 100644
--- a/crates/nu-utils/src/utils.rs
+++ b/crates/nu-utils/src/utils.rs
@@ -1,7 +1,7 @@
 #[cfg(windows)]
 use crossterm_winapi::{ConsoleMode, Handle};
 use lscolors::LsColors;
-use std::io::{Result, Write};
+use std::io::{self, Result, Write};
 
 pub fn enable_vt_processing() -> Result<()> {
     #[cfg(windows)]
@@ -474,3 +474,17 @@ macro_rules! perf {
         }
     };
 }
+
+/// Returns the terminal size (columns, rows).
+///
+/// This utility variant allows getting a fallback value when compiling for wasm32 without having
+/// to rearrange other bits of the codebase.
+///
+/// See [`crossterm::terminal::size`].
+pub fn terminal_size() -> io::Result<(u16, u16)> {
+    #[cfg(feature = "os")]
+    return crossterm::terminal::size();
+
+    #[cfg(not(feature = "os"))]
+    return Err(io::Error::from(io::ErrorKind::Unsupported));
+}
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index d6e2a4f897..35004e1979 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -10,7 +10,7 @@ name = "nu_plugin_custom_values"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.100.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.100.1", features = [] }
 nu-protocol = { path = "../nu-protocol", version = "0.100.1", features = ["plugin"] }
 serde = { workspace = true }
 typetag = "0.2"
diff --git a/crates/nuon/Cargo.toml b/crates/nuon/Cargo.toml
index 4ba31b2a4a..7399fb3e78 100644
--- a/crates/nuon/Cargo.toml
+++ b/crates/nuon/Cargo.toml
@@ -11,9 +11,9 @@ version = "0.100.1"
 
 [dependencies]
 nu-parser = { path = "../nu-parser", version = "0.100.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
-nu-engine = { path = "../nu-engine", version = "0.100.1" }
-nu-utils = { path = "../nu-utils", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.100.1", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.100.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.100.1", default-features = false }
 
 [dev-dependencies]
 chrono = { workspace = true }
diff --git a/toolkit.nu b/toolkit.nu
index b8ba3ddb80..d848dce18e 100644
--- a/toolkit.nu
+++ b/toolkit.nu
@@ -363,6 +363,40 @@ export def build [
     }
 }
 
+# build crates for wasm
+export def "build wasm" [] {
+    ^rustup target add wasm32-unknown-unknown
+
+    # these crates should compile for wasm
+    let compatible_crates = [
+        "nu-cmd-base",
+        "nu-cmd-extra",
+        "nu-cmd-lang",
+        "nu-color-config",
+        "nu-command",
+        "nu-derive-value",
+        "nu-engine",
+        "nu-glob",
+        "nu-json",
+        "nu-parser",
+        "nu-path",
+        "nu-pretty-hex",
+        "nu-protocol",
+        "nu-std",
+        "nu-system",
+        "nu-table",
+        "nu-term-grid",
+        "nu-utils",
+        "nuon"
+    ]
+
+    for crate in $compatible_crates {
+            print $'(char nl)Building ($crate) for wasm'
+            print '----------------------------'
+        ^cargo build -p $crate --target wasm32-unknown-unknown --no-default-features
+    }
+}
+
 def "nu-complete list features" [] {
     open Cargo.toml | get features | transpose feature dependencies | get feature
 }

From 88d27fd607cabf860843981532921338264c7e30 Mon Sep 17 00:00:00 2001
From: paulie4 <paulie4@gmail.com>
Date: Sat, 30 Nov 2024 09:22:52 -0500
Subject: [PATCH 0741/1072] `explore`:  add more `less` key bindings and add
 `Transition::None` (#14468)

# Description
The `explore` command is `less`-like, but it's missing the `Emacs`
keybindings for up/down and PageUp/PageDown as well as the "q" to quit
out. When I looked into adding those additional keybindings, I noticed
there was a lot of duplicated code in the various views, so I refactored
the code into a new `trait CursorMoveHandler`. I also noticed that there
was an existing `TODO: should we add a noop transition instead of doing
Option<Transition> everywhere?` comment in the code. I went ahead and
implemented a new `Transition::None`, and that made the new `trait
CursorMoveHandler` code MUCH cleaner, in addition to making some of the
old code a little cleaner as well.

# User-Facing Changes
Users that are used to the keybindings for `less` should feel much more
comfortable using `explore`.

# Tests + Formatting
Unfortunately, there aren't any existing tests for the `explore`
command, so I didn't know where I should add new tests to cover my code
changes.

---------

Co-authored-by: paulie4 <203125+paulie4@users.noreply.github.com>
Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
---
 crates/nu-explore/src/commands/help.rs        |   7 +-
 crates/nu-explore/src/commands/nu.rs          |   2 +-
 crates/nu-explore/src/pager/mod.rs            |  87 +++---
 crates/nu-explore/src/views/binary/mod.rs     |  86 +-----
 crates/nu-explore/src/views/cursor/mod.rs     |   2 +-
 .../src/views/cursor/window_cursor_2d.rs      | 133 +++++++++
 crates/nu-explore/src/views/mod.rs            |   4 +-
 crates/nu-explore/src/views/preview.rs        |  82 ++----
 crates/nu-explore/src/views/record/mod.rs     | 265 ++++++------------
 crates/nu-explore/src/views/try.rs            |  26 +-
 10 files changed, 324 insertions(+), 370 deletions(-)

diff --git a/crates/nu-explore/src/commands/help.rs b/crates/nu-explore/src/commands/help.rs
index 63c24969ec..3083b83a9b 100644
--- a/crates/nu-explore/src/commands/help.rs
+++ b/crates/nu-explore/src/commands/help.rs
@@ -33,13 +33,14 @@ Launch Explore by piping data into it: {}
 
                    Move around:  Use the cursor keys
 Drill down into records+tables:  Press <Enter> to select a cell, move around with cursor keys, press <Enter> again
-            Go back/up a level:  Press <Esc>
+            Go back/up a level:  Press <Esc> or "q"
  Transpose (flip rows+columns):  Press "t"
  Expand (show all nested data):  Press "e"
           Open this help page :  Type ":help" then <Enter>
       Open an interactive REPL:  Type ":try" then <Enter>
-                Scroll up/down:  Use the "Page Up" and "Page Down" keys
-                  Exit Explore:  Type ":q" then <Enter>, or Ctrl+D. Alternately, press <Esc> until Explore exits
+                     Scroll up:  Press "Page Up", Ctrl+B, or Alt+V
+                   Scroll down:  Press "Page Down", Ctrl+F, or Ctrl+V
+                  Exit Explore:  Type ":q" then <Enter>, or Ctrl+D. Alternately, press <Esc> or "q" until Explore exits
 
 {}
 Most commands support search via regular expressions.
diff --git a/crates/nu-explore/src/commands/nu.rs b/crates/nu-explore/src/commands/nu.rs
index 8b5bc71f69..4bdd55318b 100644
--- a/crates/nu-explore/src/commands/nu.rs
+++ b/crates/nu-explore/src/commands/nu.rs
@@ -93,7 +93,7 @@ impl View for NuView {
         layout: &Layout,
         info: &mut crate::pager::ViewInfo,
         key: crossterm::event::KeyEvent,
-    ) -> Option<crate::pager::Transition> {
+    ) -> crate::pager::Transition {
         match self {
             NuView::Records(v) => v.handle_input(engine_state, stack, layout, info, key),
             NuView::Preview(v) => v.handle_input(engine_state, stack, layout, info, key),
diff --git a/crates/nu-explore/src/pager/mod.rs b/crates/nu-explore/src/pager/mod.rs
index 2141f89cec..2d4da2e1a7 100644
--- a/crates/nu-explore/src/pager/mod.rs
+++ b/crates/nu-explore/src/pager/mod.rs
@@ -128,10 +128,17 @@ impl<'a> Pager<'a> {
 
 #[derive(Debug, Clone)]
 pub enum Transition {
-    // TODO: should we add a noop transition instead of doing Option<Transition> everywhere?
     Ok,
     Exit,
     Cmd(String),
+    None,
+}
+
+#[derive(Debug, Clone)]
+pub enum StatusTopOrEnd {
+    Top,
+    End,
+    None,
 }
 
 #[derive(Debug, Clone)]
@@ -212,34 +219,32 @@ fn render_ui(
             view_stack.curr_view.as_mut().map(|p| &mut p.view),
         );
 
-        if let Some(transition) = transition {
-            let (exit, cmd_name) = react_to_event_result(
-                transition,
-                engine_state,
-                &commands,
-                pager,
-                &mut view_stack,
-                stack,
-                info,
-            );
+        let (exit, cmd_name) = react_to_event_result(
+            transition,
+            engine_state,
+            &commands,
+            pager,
+            &mut view_stack,
+            stack,
+            info,
+        );
 
-            if let Some(value) = exit {
-                break Ok(value);
+        if let Some(value) = exit {
+            break Ok(value);
+        }
+
+        if !cmd_name.is_empty() {
+            if let Some(r) = info.report.as_mut() {
+                r.message = cmd_name;
+                r.level = Severity::Success;
+            } else {
+                info.report = Some(Report::success(cmd_name));
             }
 
-            if !cmd_name.is_empty() {
-                if let Some(r) = info.report.as_mut() {
-                    r.message = cmd_name;
-                    r.level = Severity::Success;
-                } else {
-                    info.report = Some(Report::success(cmd_name));
-                }
-
-                let info = info.clone();
-                term.draw(|f| {
-                    draw_info(f, pager, info);
-                })?;
-            }
+            let info = info.clone();
+            term.draw(|f| {
+                draw_info(f, pager, info);
+            })?;
         }
 
         if pager.cmd_buf.run_cmd {
@@ -319,6 +324,7 @@ fn react_to_event_result(
                 }
             }
         }
+        Transition::None => (None, String::default()),
     }
 }
 
@@ -419,6 +425,7 @@ fn run_command(
                 Transition::Ok => Ok(CmdResult::new(false, false, String::new())),
                 Transition::Exit => Ok(CmdResult::new(true, false, String::new())),
                 Transition::Cmd { .. } => todo!("not used so far"),
+                Transition::None => panic!("Transition::None not expected from command.react()"),
             }
         }
         Command::View { mut cmd, stackable } => {
@@ -617,17 +624,17 @@ fn handle_events<V: View>(
     search: &mut SearchBuf,
     command: &mut CommandBuf,
     mut view: Option<&mut V>,
-) -> Option<Transition> {
+) -> Transition {
     // We are only interested in Pressed events;
     // It's crucial because there are cases where terminal MIGHT produce false events;
     // 2 events 1 for release 1 for press.
     // Want to react only on 1 of them so we do.
     let mut key = match events.next_key_press() {
         Ok(Some(key)) => key,
-        Ok(None) => return None,
+        Ok(None) => return Transition::None,
         Err(e) => {
             log::error!("Failed to read key event: {e}");
-            return None;
+            return Transition::None;
         }
     };
 
@@ -647,15 +654,15 @@ fn handle_events<V: View>(
             view.as_deref_mut(),
             key,
         );
-        if result.is_some() {
+        if !matches!(result, Transition::None) {
             return result;
         }
         match events.try_next_key_press() {
             Ok(Some(next_key)) => key = next_key,
-            Ok(None) => return None,
+            Ok(None) => return Transition::None,
             Err(e) => {
                 log::error!("Failed to peek key event: {e}");
-                return None;
+                return Transition::None;
             }
         }
     }
@@ -671,29 +678,29 @@ fn handle_event<V: View>(
     command: &mut CommandBuf,
     mut view: Option<&mut V>,
     key: KeyEvent,
-) -> Option<Transition> {
+) -> Transition {
     if handle_exit_key_event(&key) {
-        return Some(Transition::Exit);
+        return Transition::Exit;
     }
 
     if handle_general_key_events1(&key, search, command, view.as_deref_mut()) {
-        return None;
+        return Transition::None;
     }
 
     if let Some(view) = &mut view {
         let t = view.handle_input(engine_state, stack, layout, info, key);
         match t {
-            Some(Transition::Exit) => return Some(Transition::Ok),
-            Some(Transition::Cmd(cmd)) => return Some(Transition::Cmd(cmd)),
-            Some(Transition::Ok) => return None,
-            None => {}
+            Transition::Exit => return Transition::Ok,
+            Transition::Cmd(cmd) => return Transition::Cmd(cmd),
+            Transition::Ok => return Transition::None,
+            Transition::None => {}
         }
     }
 
     // was not handled so we must check our default controls
     handle_general_key_events2(&key, search, command, view, info);
 
-    None
+    Transition::None
 }
 
 fn handle_exit_key_event(key: &KeyEvent) -> bool {
diff --git a/crates/nu-explore/src/views/binary/mod.rs b/crates/nu-explore/src/views/binary/mod.rs
index 2a35b7c180..a9ba47d650 100644
--- a/crates/nu-explore/src/views/binary/mod.rs
+++ b/crates/nu-explore/src/views/binary/mod.rs
@@ -2,7 +2,7 @@
 
 mod binary_widget;
 
-use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
+use crossterm::event::KeyEvent;
 use nu_protocol::{
     engine::{EngineState, Stack},
     Value,
@@ -21,7 +21,7 @@ use crate::{
 
 use self::binary_widget::{BinarySettings, BinaryStyle, BinaryWidget};
 
-use super::{cursor::WindowCursor2D, Layout, View, ViewConfig};
+use super::{cursor::CursorMoveHandler, cursor::WindowCursor2D, Layout, View, ViewConfig};
 
 /// An interactive view that displays binary data in a hex dump format.
 /// Not finished; many aspects are still WIP.
@@ -66,15 +66,14 @@ impl View for BinaryView {
         _: &Layout,
         info: &mut ViewInfo,
         key: KeyEvent,
-    ) -> Option<Transition> {
-        let result = handle_event_view_mode(self, &key);
-
-        if matches!(&result, Some(Transition::Ok)) {
+    ) -> Transition {
+        // currently only handle_enter() in crates/nu-explore/src/views/record/mod.rs raises an Err()
+        if let Ok((Transition::Ok, ..)) = self.handle_input_key(&key) {
             let report = create_report(self.cursor);
             info.status = Some(report);
         }
 
-        None
+        Transition::None
     }
 
     fn collect_data(&self) -> Vec<NuText> {
@@ -93,6 +92,12 @@ impl View for BinaryView {
     }
 }
 
+impl CursorMoveHandler for BinaryView {
+    fn get_cursor(&mut self) -> &mut WindowCursor2D {
+        &mut self.cursor
+    }
+}
+
 fn create_binary_widget(v: &BinaryView) -> BinaryWidget<'_> {
     let start_line = v.cursor.window_origin().row;
     let count_elements =
@@ -106,73 +111,6 @@ fn create_binary_widget(v: &BinaryView) -> BinaryWidget<'_> {
     w
 }
 
-fn handle_event_view_mode(view: &mut BinaryView, key: &KeyEvent) -> Option<Transition> {
-    match key {
-        KeyEvent {
-            code: KeyCode::Char('u'),
-            modifiers: KeyModifiers::CONTROL,
-            ..
-        }
-        | KeyEvent {
-            code: KeyCode::PageUp,
-            ..
-        } => {
-            view.cursor.prev_row_page();
-
-            return Some(Transition::Ok);
-        }
-        KeyEvent {
-            code: KeyCode::Char('d'),
-            modifiers: KeyModifiers::CONTROL,
-            ..
-        }
-        | KeyEvent {
-            code: KeyCode::PageDown,
-            ..
-        } => {
-            view.cursor.next_row_page();
-
-            return Some(Transition::Ok);
-        }
-        _ => {}
-    }
-
-    match key.code {
-        KeyCode::Esc => Some(Transition::Exit),
-        KeyCode::Up | KeyCode::Char('k') => {
-            view.cursor.prev_row_i();
-
-            Some(Transition::Ok)
-        }
-        KeyCode::Down | KeyCode::Char('j') => {
-            view.cursor.next_row_i();
-
-            Some(Transition::Ok)
-        }
-        KeyCode::Left | KeyCode::Char('h') => {
-            view.cursor.prev_column_i();
-
-            Some(Transition::Ok)
-        }
-        KeyCode::Right | KeyCode::Char('l') => {
-            view.cursor.next_column_i();
-
-            Some(Transition::Ok)
-        }
-        KeyCode::Home | KeyCode::Char('g') => {
-            view.cursor.row_move_to_start();
-
-            Some(Transition::Ok)
-        }
-        KeyCode::End | KeyCode::Char('G') => {
-            view.cursor.row_move_to_end();
-
-            Some(Transition::Ok)
-        }
-        _ => None,
-    }
-}
-
 fn settings_from_config(config: &ExploreConfig) -> Settings {
     // Most of this is hardcoded for now, add it to the config later if needed
     Settings {
diff --git a/crates/nu-explore/src/views/cursor/mod.rs b/crates/nu-explore/src/views/cursor/mod.rs
index 8044b59aca..4c37b70977 100644
--- a/crates/nu-explore/src/views/cursor/mod.rs
+++ b/crates/nu-explore/src/views/cursor/mod.rs
@@ -3,7 +3,7 @@ mod window_cursor_2d;
 
 use anyhow::{bail, Result};
 pub use window_cursor::WindowCursor;
-pub use window_cursor_2d::{Position, WindowCursor2D};
+pub use window_cursor_2d::{CursorMoveHandler, Position, WindowCursor2D};
 
 /// A 1-dimensional cursor to track a position from 0 to N
 ///
diff --git a/crates/nu-explore/src/views/cursor/window_cursor_2d.rs b/crates/nu-explore/src/views/cursor/window_cursor_2d.rs
index e22ec09ce3..8dfafcd1a4 100644
--- a/crates/nu-explore/src/views/cursor/window_cursor_2d.rs
+++ b/crates/nu-explore/src/views/cursor/window_cursor_2d.rs
@@ -1,3 +1,6 @@
+use crate::pager::{StatusTopOrEnd, Transition};
+use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
+
 use super::WindowCursor;
 use anyhow::Result;
 
@@ -170,3 +173,133 @@ impl WindowCursor2D {
             .set_window_start_position(self.y.window_starts_at() - 1)
     }
 }
+
+pub trait CursorMoveHandler {
+    fn get_cursor(&mut self) -> &mut WindowCursor2D;
+
+    // standard handle_EVENT handlers that can be overwritten
+    fn handle_enter(&mut self) -> Result<Transition> {
+        Ok(Transition::None)
+    }
+    fn handle_esc(&mut self) -> Transition {
+        Transition::Exit
+    }
+    fn handle_expand(&mut self) -> Transition {
+        Transition::None
+    }
+    fn handle_left(&mut self) {
+        self.get_cursor().prev_column_i()
+    }
+    fn handle_right(&mut self) {
+        self.get_cursor().next_column_i()
+    }
+    fn handle_up(&mut self) {
+        self.get_cursor().prev_row_i()
+    }
+    fn handle_down(&mut self) {
+        self.get_cursor().next_row_i()
+    }
+    fn handle_transpose(&mut self) -> Transition {
+        Transition::None
+    }
+
+    // top-level event handler should not be overwritten
+    fn handle_input_key(&mut self, key: &KeyEvent) -> Result<(Transition, StatusTopOrEnd)> {
+        let key_combo_status = match key {
+            // PageUp supports Vi (Ctrl+b) and Emacs (Alt+v) keybindings
+            KeyEvent {
+                modifiers: KeyModifiers::CONTROL,
+                code: KeyCode::Char('b'),
+                ..
+            }
+            | KeyEvent {
+                modifiers: KeyModifiers::ALT,
+                code: KeyCode::Char('v'),
+                ..
+            }
+            | KeyEvent {
+                code: KeyCode::PageUp,
+                ..
+            } => {
+                self.get_cursor().prev_row_page();
+                StatusTopOrEnd::Top
+            }
+            // PageDown supports Vi (Ctrl+f) and Emacs (Ctrl+v) keybindings
+            KeyEvent {
+                modifiers: KeyModifiers::CONTROL,
+                code: KeyCode::Char('f'),
+                ..
+            }
+            | KeyEvent {
+                modifiers: KeyModifiers::CONTROL,
+                code: KeyCode::Char('v'),
+                ..
+            }
+            | KeyEvent {
+                code: KeyCode::PageDown,
+                ..
+            } => {
+                self.get_cursor().next_row_page();
+                self.get_cursor().prev_row();
+                StatusTopOrEnd::End
+            }
+            // Up support Emacs (Ctrl+p) keybinding
+            KeyEvent {
+                modifiers: KeyModifiers::CONTROL,
+                code: KeyCode::Char('p'),
+                ..
+            } => {
+                self.handle_up();
+                StatusTopOrEnd::Top
+            }
+            // Down support Emacs (Ctrl+n) keybinding
+            KeyEvent {
+                modifiers: KeyModifiers::CONTROL,
+                code: KeyCode::Char('n'),
+                ..
+            } => {
+                self.handle_down();
+                StatusTopOrEnd::End
+            }
+            _ => StatusTopOrEnd::None,
+        };
+        match key_combo_status {
+            StatusTopOrEnd::Top | StatusTopOrEnd::End => {
+                return Ok((Transition::Ok, key_combo_status));
+            }
+            _ => {} // not page up or page down, so don't return; continue to next match block
+        }
+
+        match key.code {
+            KeyCode::Char('q') | KeyCode::Esc => Ok((self.handle_esc(), StatusTopOrEnd::None)),
+            KeyCode::Char('i') | KeyCode::Enter => Ok((self.handle_enter()?, StatusTopOrEnd::None)),
+            KeyCode::Char('t') => Ok((self.handle_transpose(), StatusTopOrEnd::None)),
+            KeyCode::Char('e') => Ok((self.handle_expand(), StatusTopOrEnd::None)),
+            KeyCode::Up | KeyCode::Char('k') => {
+                self.handle_up();
+                Ok((Transition::Ok, StatusTopOrEnd::Top))
+            }
+            KeyCode::Down | KeyCode::Char('j') => {
+                self.handle_down();
+                Ok((Transition::Ok, StatusTopOrEnd::End))
+            }
+            KeyCode::Left | KeyCode::Char('h') => {
+                self.handle_left();
+                Ok((Transition::Ok, StatusTopOrEnd::None))
+            }
+            KeyCode::Right | KeyCode::Char('l') => {
+                self.handle_right();
+                Ok((Transition::Ok, StatusTopOrEnd::None))
+            }
+            KeyCode::Home | KeyCode::Char('g') => {
+                self.get_cursor().row_move_to_start();
+                Ok((Transition::Ok, StatusTopOrEnd::Top))
+            }
+            KeyCode::End | KeyCode::Char('G') => {
+                self.get_cursor().row_move_to_end();
+                Ok((Transition::Ok, StatusTopOrEnd::End))
+            }
+            _ => Ok((Transition::None, StatusTopOrEnd::None)),
+        }
+    }
+}
diff --git a/crates/nu-explore/src/views/mod.rs b/crates/nu-explore/src/views/mod.rs
index 589134016b..7147a74807 100644
--- a/crates/nu-explore/src/views/mod.rs
+++ b/crates/nu-explore/src/views/mod.rs
@@ -89,7 +89,7 @@ pub trait View {
         layout: &Layout,
         info: &mut ViewInfo,
         key: KeyEvent,
-    ) -> Option<Transition>;
+    ) -> Transition;
 
     fn show_data(&mut self, _: usize) -> bool {
         false
@@ -116,7 +116,7 @@ impl View for Box<dyn View> {
         layout: &Layout,
         info: &mut ViewInfo,
         key: KeyEvent,
-    ) -> Option<Transition> {
+    ) -> Transition {
         self.as_mut()
             .handle_input(engine_state, stack, layout, info, key)
     }
diff --git a/crates/nu-explore/src/views/preview.rs b/crates/nu-explore/src/views/preview.rs
index de4d710113..6b62bc0d0f 100644
--- a/crates/nu-explore/src/views/preview.rs
+++ b/crates/nu-explore/src/views/preview.rs
@@ -1,11 +1,12 @@
 use super::{
-    colored_text_widget::ColoredTextWidget, cursor::WindowCursor2D, Layout, View, ViewConfig,
+    colored_text_widget::ColoredTextWidget, cursor::CursorMoveHandler, cursor::WindowCursor2D,
+    Layout, View, ViewConfig,
 };
 use crate::{
     nu_common::{NuSpan, NuText},
-    pager::{report::Report, Frame, Transition, ViewInfo},
+    pager::{report::Report, Frame, StatusTopOrEnd, Transition, ViewInfo},
 };
-use crossterm::event::{KeyCode, KeyEvent};
+use crossterm::event::KeyEvent;
 use nu_color_config::TextStyle;
 use nu_protocol::{
     engine::{EngineState, Stack},
@@ -65,58 +66,17 @@ impl View for Preview {
         _: &Layout,
         info: &mut ViewInfo, // add this arg to draw too?
         key: KeyEvent,
-    ) -> Option<Transition> {
-        match key.code {
-            KeyCode::Left => {
-                self.cursor
-                    .prev_column_by(max(1, self.cursor.window_width_in_columns() / 2));
-
-                Some(Transition::Ok)
+    ) -> Transition {
+        match self.handle_input_key(&key) {
+            Ok((transition, status_top_or_end)) => {
+                match status_top_or_end {
+                    StatusTopOrEnd::Top => set_status_top(self, info),
+                    StatusTopOrEnd::End => set_status_end(self, info),
+                    _ => {}
+                }
+                transition
             }
-            KeyCode::Right => {
-                self.cursor
-                    .next_column_by(max(1, self.cursor.window_width_in_columns() / 2));
-
-                Some(Transition::Ok)
-            }
-            KeyCode::Up => {
-                self.cursor.prev_row_i();
-                set_status_top(self, info);
-
-                Some(Transition::Ok)
-            }
-            KeyCode::Down => {
-                self.cursor.next_row_i();
-                set_status_end(self, info);
-
-                Some(Transition::Ok)
-            }
-            KeyCode::PageUp => {
-                self.cursor.prev_row_page();
-                set_status_top(self, info);
-
-                Some(Transition::Ok)
-            }
-            KeyCode::PageDown => {
-                self.cursor.next_row_page();
-                set_status_end(self, info);
-
-                Some(Transition::Ok)
-            }
-            KeyCode::Home => {
-                self.cursor.row_move_to_start();
-                set_status_top(self, info);
-
-                Some(Transition::Ok)
-            }
-            KeyCode::End => {
-                self.cursor.row_move_to_end();
-                set_status_end(self, info);
-
-                Some(Transition::Ok)
-            }
-            KeyCode::Esc => Some(Transition::Exit),
-            _ => None,
+            _ => Transition::None, // currently only handle_enter() in crates/nu-explore/src/views/record/mod.rs raises an Err()
         }
     }
 
@@ -147,6 +107,20 @@ impl View for Preview {
     }
 }
 
+impl CursorMoveHandler for Preview {
+    fn get_cursor(&mut self) -> &mut WindowCursor2D {
+        &mut self.cursor
+    }
+    fn handle_left(&mut self) {
+        self.cursor
+            .prev_column_by(max(1, self.cursor.window_width_in_columns() / 2));
+    }
+    fn handle_right(&mut self) {
+        self.cursor
+            .next_column_by(max(1, self.cursor.window_width_in_columns() / 2));
+    }
+}
+
 fn set_status_end(view: &Preview, info: &mut ViewInfo) {
     if view.cursor.row() + 1 == view.cursor.row_limit() {
         info.status = Some(Report::info("END"));
diff --git a/crates/nu-explore/src/views/record/mod.rs b/crates/nu-explore/src/views/record/mod.rs
index a4e86a8fad..e003348258 100644
--- a/crates/nu-explore/src/views/record/mod.rs
+++ b/crates/nu-explore/src/views/record/mod.rs
@@ -2,7 +2,7 @@ mod table_widget;
 
 use self::table_widget::{TableWidget, TableWidgetState};
 use super::{
-    cursor::{Position, WindowCursor2D},
+    cursor::{CursorMoveHandler, Position, WindowCursor2D},
     util::{make_styled_string, nu_style_to_tui},
     Layout, View, ViewConfig,
 };
@@ -16,7 +16,7 @@ use crate::{
     views::ElementInfo,
 };
 use anyhow::Result;
-use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
+use crossterm::event::KeyEvent;
 use nu_color_config::StyleComputer;
 use nu_protocol::{
     engine::{EngineState, Stack},
@@ -213,26 +213,21 @@ impl View for RecordView {
         _: &Layout,
         info: &mut ViewInfo,
         key: KeyEvent,
-    ) -> Option<Transition> {
-        let result = match self.mode {
-            UIMode::View => Ok(handle_key_event_view_mode(self, &key)),
-            UIMode::Cursor => handle_key_event_cursor_mode(self, &key),
-        };
-
-        match result {
-            Ok(result) => {
-                if matches!(&result, Some(Transition::Ok) | Some(Transition::Cmd { .. })) {
+    ) -> Transition {
+        match self.handle_input_key(&key) {
+            Ok((transition, ..)) => {
+                if matches!(&transition, Transition::Ok | Transition::Cmd { .. }) {
                     let report = self.create_records_report();
                     info.status = Some(report);
                 }
 
-                result
+                transition
             }
             Err(e) => {
                 log::error!("Error handling input in RecordView: {e}");
                 let report = Report::message(e.to_string(), Severity::Err);
                 info.status = Some(report);
-                None
+                Transition::None
             }
         }
     }
@@ -372,188 +367,94 @@ impl RecordLayer {
     }
 }
 
-fn handle_key_event_view_mode(view: &mut RecordView, key: &KeyEvent) -> Option<Transition> {
-    match key {
-        KeyEvent {
-            code: KeyCode::Char('u'),
-            modifiers: KeyModifiers::CONTROL,
-            ..
-        }
-        | KeyEvent {
-            code: KeyCode::PageUp,
-            ..
-        } => {
-            view.get_top_layer_mut().cursor.prev_row_page();
-
-            return Some(Transition::Ok);
-        }
-        KeyEvent {
-            code: KeyCode::Char('d'),
-            modifiers: KeyModifiers::CONTROL,
-            ..
-        }
-        | KeyEvent {
-            code: KeyCode::PageDown,
-            ..
-        } => {
-            view.get_top_layer_mut().cursor.next_row_page();
-
-            return Some(Transition::Ok);
-        }
-        _ => {}
+impl CursorMoveHandler for RecordView {
+    fn get_cursor(&mut self) -> &mut WindowCursor2D {
+        &mut self.get_top_layer_mut().cursor
     }
+    fn handle_enter(&mut self) -> Result<Transition> {
+        match self.mode {
+            UIMode::View => self.set_cursor_mode(),
+            UIMode::Cursor => {
+                let value = self.get_current_value();
 
-    match key.code {
-        KeyCode::Esc => {
-            if view.layer_stack.len() > 1 {
-                view.layer_stack.pop();
-                view.mode = UIMode::Cursor;
+                // ...but it only makes sense to drill down into a few types of values
+                if !matches!(
+                    value,
+                    Value::Record { .. } | Value::List { .. } | Value::Custom { .. }
+                ) {
+                    return Ok(Transition::None);
+                }
 
-                Some(Transition::Ok)
-            } else {
-                Some(Transition::Exit)
+                let is_record = matches!(value, Value::Record { .. });
+                let next_layer = create_layer(value.clone())?;
+                push_layer(self, next_layer);
+
+                if is_record {
+                    self.set_top_layer_orientation(Orientation::Left);
+                } else {
+                    self.set_top_layer_orientation(self.orientation);
+                }
             }
         }
-        KeyCode::Char('i') | KeyCode::Enter => {
-            view.set_cursor_mode();
 
-            Some(Transition::Ok)
-        }
-        KeyCode::Char('t') => {
-            view.transpose();
-
-            Some(Transition::Ok)
-        }
-        KeyCode::Char('e') => Some(Transition::Cmd(String::from("expand"))),
-        KeyCode::Up | KeyCode::Char('k') => {
-            view.get_top_layer_mut().cursor.prev_row_i();
-
-            Some(Transition::Ok)
-        }
-        KeyCode::Down | KeyCode::Char('j') => {
-            view.get_top_layer_mut().cursor.next_row_i();
-
-            Some(Transition::Ok)
-        }
-        KeyCode::Left | KeyCode::Char('h') => {
-            view.get_top_layer_mut().cursor.prev_column_i();
-
-            Some(Transition::Ok)
-        }
-        KeyCode::Right | KeyCode::Char('l') => {
-            view.get_top_layer_mut().cursor.next_column_i();
-
-            Some(Transition::Ok)
-        }
-        KeyCode::Home | KeyCode::Char('g') => {
-            view.get_top_layer_mut().cursor.row_move_to_start();
-
-            Some(Transition::Ok)
-        }
-        KeyCode::End | KeyCode::Char('G') => {
-            view.get_top_layer_mut().cursor.row_move_to_end();
-
-            Some(Transition::Ok)
-        }
-        _ => None,
+        Ok(Transition::Ok)
     }
-}
-
-fn handle_key_event_cursor_mode(
-    view: &mut RecordView,
-    key: &KeyEvent,
-) -> Result<Option<Transition>> {
-    match key {
-        KeyEvent {
-            code: KeyCode::Char('u'),
-            modifiers: KeyModifiers::CONTROL,
-            ..
+    fn handle_esc(&mut self) -> Transition {
+        match self.mode {
+            UIMode::View => {
+                if self.layer_stack.len() > 1 {
+                    self.layer_stack.pop();
+                    self.mode = UIMode::Cursor;
+                } else {
+                    return Transition::Exit;
+                }
+            }
+            UIMode::Cursor => self.set_view_mode(),
         }
-        | KeyEvent {
-            code: KeyCode::PageUp,
-            ..
-        } => {
-            view.get_top_layer_mut().cursor.prev_row_page();
-
-            return Ok(Some(Transition::Ok));
-        }
-        KeyEvent {
-            code: KeyCode::Char('d'),
-            modifiers: KeyModifiers::CONTROL,
-            ..
-        }
-        | KeyEvent {
-            code: KeyCode::PageDown,
-            ..
-        } => {
-            view.get_top_layer_mut().cursor.next_row_page();
-
-            return Ok(Some(Transition::Ok));
-        }
-        _ => {}
+        Transition::Ok
     }
-
-    match key.code {
-        KeyCode::Esc => {
-            view.set_view_mode();
-
-            Ok(Some(Transition::Ok))
+    fn handle_expand(&mut self) -> Transition {
+        match self.mode {
+            UIMode::View => Transition::Cmd(String::from("expand")),
+            _ => Transition::None,
         }
-        KeyCode::Up | KeyCode::Char('k') => {
-            view.get_top_layer_mut().cursor.prev_row();
+    }
+    fn handle_transpose(&mut self) -> Transition {
+        match self.mode {
+            UIMode::View => {
+                self.transpose();
 
-            Ok(Some(Transition::Ok))
-        }
-        KeyCode::Down | KeyCode::Char('j') => {
-            view.get_top_layer_mut().cursor.next_row();
-
-            Ok(Some(Transition::Ok))
-        }
-        KeyCode::Left | KeyCode::Char('h') => {
-            view.get_top_layer_mut().cursor.prev_column();
-
-            Ok(Some(Transition::Ok))
-        }
-        KeyCode::Right | KeyCode::Char('l') => {
-            view.get_top_layer_mut().cursor.next_column();
-
-            Ok(Some(Transition::Ok))
-        }
-        KeyCode::Home | KeyCode::Char('g') => {
-            view.get_top_layer_mut().cursor.row_move_to_start();
-
-            Ok(Some(Transition::Ok))
-        }
-        KeyCode::End | KeyCode::Char('G') => {
-            view.get_top_layer_mut().cursor.row_move_to_end();
-
-            Ok(Some(Transition::Ok))
-        }
-        // Try to "drill down" into the selected value
-        KeyCode::Enter => {
-            let value = view.get_current_value();
-
-            // ...but it only makes sense to drill down into a few types of values
-            if !matches!(
-                value,
-                Value::Record { .. } | Value::List { .. } | Value::Custom { .. }
-            ) {
-                return Ok(None);
+                Transition::Ok
             }
-
-            let is_record = matches!(value, Value::Record { .. });
-            let next_layer = create_layer(value.clone())?;
-            push_layer(view, next_layer);
-
-            if is_record {
-                view.set_top_layer_orientation(Orientation::Left);
-            } else {
-                view.set_top_layer_orientation(view.orientation);
-            }
-
-            Ok(Some(Transition::Ok))
+            _ => Transition::None,
+        }
+    }
+    // for these, copy standard CursorMoveHandler for UIMode::View, but use special handling for UIMode::Cursor
+    // NOTE: https://stackoverflow.com/a/31462293/2016290 says there's plans for Rust to allow calling super functions,
+    // but not yet, and since they're all one line, it seems simpler to copy than make a lot of helper functions
+    fn handle_left(&mut self) {
+        match self.mode {
+            UIMode::View => self.get_top_layer_mut().cursor.prev_column_i(),
+            _ => self.get_top_layer_mut().cursor.prev_column(),
+        }
+    }
+    fn handle_right(&mut self) {
+        match self.mode {
+            UIMode::View => self.get_top_layer_mut().cursor.next_column_i(),
+            _ => self.get_top_layer_mut().cursor.next_column(),
+        }
+    }
+    fn handle_up(&mut self) {
+        match self.mode {
+            UIMode::View => self.get_top_layer_mut().cursor.prev_row_i(),
+            _ => self.get_top_layer_mut().cursor.prev_row(),
+        }
+    }
+    fn handle_down(&mut self) {
+        match self.mode {
+            UIMode::View => self.get_top_layer_mut().cursor.next_row_i(),
+            _ => self.get_top_layer_mut().cursor.next_row(),
         }
-        _ => Ok(None),
     }
 }
 
diff --git a/crates/nu-explore/src/views/try.rs b/crates/nu-explore/src/views/try.rs
index 099e792e38..6438909b5b 100644
--- a/crates/nu-explore/src/views/try.rs
+++ b/crates/nu-explore/src/views/try.rs
@@ -149,7 +149,7 @@ impl View for TryView {
         layout: &Layout,
         info: &mut ViewInfo,
         key: KeyEvent,
-    ) -> Option<Transition> {
+    ) -> Transition {
         if self.view_mode {
             let table = self
                 .table
@@ -160,28 +160,28 @@ impl View for TryView {
 
             if was_at_the_top && matches!(key.code, KeyCode::Up | KeyCode::PageUp) {
                 self.view_mode = false;
-                return Some(Transition::Ok);
+                return Transition::Ok;
             }
 
             if matches!(key.code, KeyCode::Tab) {
                 self.view_mode = false;
-                return Some(Transition::Ok);
+                return Transition::Ok;
             }
 
             let result = table.handle_input(engine_state, stack, layout, info, key);
 
             return match result {
-                Some(Transition::Ok | Transition::Cmd { .. }) => Some(Transition::Ok),
-                Some(Transition::Exit) => {
+                Transition::Ok | Transition::Cmd { .. } => Transition::Ok,
+                Transition::Exit => {
                     self.view_mode = false;
-                    Some(Transition::Ok)
+                    Transition::Ok
                 }
-                None => None,
+                Transition::None => Transition::None,
             };
         }
 
         match &key.code {
-            KeyCode::Esc => Some(Transition::Exit),
+            KeyCode::Esc => Transition::Exit,
             KeyCode::Backspace => {
                 if !self.command.is_empty() {
                     self.command.pop();
@@ -194,7 +194,7 @@ impl View for TryView {
                     }
                 }
 
-                Some(Transition::Ok)
+                Transition::Ok
             }
             KeyCode::Char(c) => {
                 self.command.push(*c);
@@ -206,14 +206,14 @@ impl View for TryView {
                     }
                 }
 
-                Some(Transition::Ok)
+                Transition::Ok
             }
             KeyCode::Down | KeyCode::Tab => {
                 if self.table.is_some() {
                     self.view_mode = true;
                 }
 
-                Some(Transition::Ok)
+                Transition::Ok
             }
             KeyCode::Enter => {
                 match self.try_run(engine_state, stack) {
@@ -221,9 +221,9 @@ impl View for TryView {
                     Err(err) => info.report = Some(Report::error(format!("Error: {err}"))),
                 }
 
-                Some(Transition::Ok)
+                Transition::Ok
             }
-            _ => None,
+            _ => Transition::None,
         }
     }
 

From c560bac13f9b44885a3fec3b82a1ef674dc30f1d Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Sun, 1 Dec 2024 03:56:42 -0800
Subject: [PATCH 0742/1072] Add `--long` flag for `sys cpu` (#14485)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

Fixes #14470 where the `sys cpu` command is slow. This was done by
removing the `cpu_usage` column from the default output, since it takes
400ms to calculate. Instead a `--long` flag was added that, when
provided, adds back the `cpu_usage` column.

```nu
# Before
> bench { sys cpu | length } | get mean
401ms 591µs 896ns

# After
> bench { sys cpu | length } | get mean
500µs 13ns # around 1-2ms in practice
```

# User-Facing Changes

- `sys cpu` no longer has a `cpu_usage` column by default.
- Added  a `--long` flag for `sys cpu` to add back the removed column.
---
 crates/nu-command/src/system/sys/cpu.rs | 48 +++++++++++++++----------
 crates/nu-engine/src/command_prelude.rs |  4 +--
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/crates/nu-command/src/system/sys/cpu.rs b/crates/nu-command/src/system/sys/cpu.rs
index 3243478e03..de24efd898 100644
--- a/crates/nu-command/src/system/sys/cpu.rs
+++ b/crates/nu-command/src/system/sys/cpu.rs
@@ -13,6 +13,11 @@ impl Command for SysCpu {
     fn signature(&self) -> Signature {
         Signature::build("sys cpu")
             .filter()
+            .switch(
+                "long",
+                "Get all available columns (slower, needs to sample CPU over time)",
+                Some('l'),
+            )
             .category(Category::System)
             .input_output_types(vec![(Type::Nothing, Type::table())])
     }
@@ -23,12 +28,13 @@ impl Command for SysCpu {
 
     fn run(
         &self,
-        _engine_state: &EngineState,
-        _stack: &mut Stack,
+        engine_state: &EngineState,
+        stack: &mut Stack,
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        Ok(cpu(call.head).into_pipeline_data())
+        let long = call.has_flag(engine_state, stack, "long")?;
+        Ok(cpu(long, call.head).into_pipeline_data())
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -40,38 +46,44 @@ impl Command for SysCpu {
     }
 }
 
-fn cpu(span: Span) -> Value {
+fn cpu(long: bool, span: Span) -> Value {
     let mut sys = System::new();
-    sys.refresh_cpu_specifics(CpuRefreshKind::everything());
-    // We must refresh the CPU twice a while apart to get valid usage data.
-    // In theory we could just sleep MINIMUM_CPU_UPDATE_INTERVAL, but I've noticed that
-    // that gives poor results (error of ~5%). Decided to wait 2x that long, somewhat arbitrarily
-    std::thread::sleep(MINIMUM_CPU_UPDATE_INTERVAL * 2);
-    sys.refresh_cpu_specifics(CpuRefreshKind::new().with_cpu_usage());
+    if long {
+        sys.refresh_cpu_specifics(CpuRefreshKind::everything());
+        // We must refresh the CPU twice a while apart to get valid usage data.
+        // In theory we could just sleep MINIMUM_CPU_UPDATE_INTERVAL, but I've noticed that
+        // that gives poor results (error of ~5%). Decided to wait 2x that long, somewhat arbitrarily
+        std::thread::sleep(MINIMUM_CPU_UPDATE_INTERVAL * 2);
+        sys.refresh_cpu_specifics(CpuRefreshKind::new().with_cpu_usage());
+    } else {
+        sys.refresh_cpu_specifics(CpuRefreshKind::new().with_frequency());
+    }
 
     let cpus = sys
         .cpus()
         .iter()
         .map(|cpu| {
-            // sysinfo CPU usage numbers are not very precise unless you wait a long time between refreshes.
-            // Round to 1DP (chosen somewhat arbitrarily) so people aren't misled by high-precision floats.
-            let rounded_usage = (cpu.cpu_usage() * 10.0).round() / 10.0;
-
             let load_avg = System::load_average();
             let load_avg = format!(
                 "{:.2}, {:.2}, {:.2}",
                 load_avg.one, load_avg.five, load_avg.fifteen
             );
 
-            let record = record! {
+            let mut record = record! {
                 "name" => Value::string(trim_cstyle_null(cpu.name()), span),
                 "brand" => Value::string(trim_cstyle_null(cpu.brand()), span),
-                "freq" => Value::int(cpu.frequency() as i64, span),
-                "cpu_usage" => Value::float(rounded_usage.into(), span),
-                "load_average" => Value::string(load_avg, span),
                 "vendor_id" => Value::string(trim_cstyle_null(cpu.vendor_id()), span),
+                "freq" => Value::int(cpu.frequency() as i64, span),
+                "load_average" => Value::string(load_avg, span),
             };
 
+            if long {
+                // sysinfo CPU usage numbers are not very precise unless you wait a long time between refreshes.
+                // Round to 1DP (chosen somewhat arbitrarily) so people aren't misled by high-precision floats.
+                let rounded_usage = (f64::from(cpu.cpu_usage()) * 10.0).round() / 10.0;
+                record.push("cpu_usage", rounded_usage.into_value(span));
+            }
+
             Value::record(record, span)
         })
         .collect();
diff --git a/crates/nu-engine/src/command_prelude.rs b/crates/nu-engine/src/command_prelude.rs
index e6ddb5fb91..0c5c250a27 100644
--- a/crates/nu-engine/src/command_prelude.rs
+++ b/crates/nu-engine/src/command_prelude.rs
@@ -3,6 +3,6 @@ pub use nu_protocol::{
     ast::CellPath,
     engine::{Call, Command, EngineState, Stack, StateWorkingSet},
     record, ByteStream, ByteStreamType, Category, ErrSpan, Example, IntoInterruptiblePipelineData,
-    IntoPipelineData, IntoSpanned, PipelineData, Record, ShellError, Signature, Span, Spanned,
-    SyntaxShape, Type, Value,
+    IntoPipelineData, IntoSpanned, IntoValue, PipelineData, Record, ShellError, Signature, Span,
+    Spanned, SyntaxShape, Type, Value,
 };

From c4b919b24ce3a510dff02e52f04cf3140a0ff52d Mon Sep 17 00:00:00 2001
From: Jasha Sommer-Simpson <8935917+Jasha10@users.noreply.github.com>
Date: Sun, 1 Dec 2024 06:59:40 -0500
Subject: [PATCH 0743/1072] enable test_cp_recurse on macos (#14358)

# Description

This PR enables some tests that were disabled on macos.

We shall see if the CI passes. (Update: CI has passed.)

# User-Facing Changes

Should be no user-facing changes as only a test-file is modified.

# Tests + Formatting

Test coverage should increase

Co-authored-by: Jasha <jsimpson@hiddenroad.com>
---
 crates/nu-command/tests/commands/ucp.rs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/crates/nu-command/tests/commands/ucp.rs b/crates/nu-command/tests/commands/ucp.rs
index e3fa2ca931..7834e91e7c 100644
--- a/crates/nu-command/tests/commands/ucp.rs
+++ b/crates/nu-command/tests/commands/ucp.rs
@@ -610,9 +610,7 @@ static TEST_COPY_TO_FOLDER: &str = "hello_dir/";
 static TEST_COPY_TO_FOLDER_FILE: &str = "hello_dir/hello_world.txt";
 static TEST_COPY_FROM_FOLDER: &str = "hello_dir_with_file/";
 static TEST_COPY_FROM_FOLDER_FILE: &str = "hello_dir_with_file/hello_world.txt";
-#[cfg(not(target_os = "macos"))]
 static TEST_COPY_TO_FOLDER_NEW: &str = "hello_dir_new";
-#[cfg(not(target_os = "macos"))]
 static TEST_COPY_TO_FOLDER_NEW_FILE: &str = "hello_dir_new/hello_world.txt";
 
 #[test]
@@ -707,7 +705,6 @@ fn test_cp_multiple_files() {
 }
 
 #[test]
-#[cfg(not(target_os = "macos"))]
 fn test_cp_recurse() {
     Playground::setup("ucp_test_22", |dirs, sandbox| {
         // Create the relevant target directories

From bcd85b6f3ea4d90db2fc2737b71cdd0eabf6f16d Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Sun, 1 Dec 2024 06:03:45 -0800
Subject: [PATCH 0744/1072] Remove duplicate implementations of `CallExt::rest`
 (#14484)

# Description

Removes unnecessary usages of `Call::rest_iter_flattened` and
`get_rest_for_glob_pattern` and replaces them with `CallExt::rest`.

# User-Facing Changes

None
---
 crates/nu-command/src/bytes/build_.rs        |  5 ++---
 crates/nu-command/src/filesystem/du.rs       |  3 +--
 crates/nu-command/src/filesystem/ls.rs       |  3 +--
 crates/nu-command/src/filesystem/open.rs     |  5 ++---
 crates/nu-command/src/filesystem/rm.rs       |  4 ++--
 crates/nu-command/src/filesystem/touch.rs    |  5 +----
 crates/nu-command/src/filesystem/ucp.rs      |  4 ++--
 crates/nu-command/src/filesystem/umkdir.rs   |  7 +++----
 crates/nu-command/src/filesystem/umv.rs      |  3 +--
 crates/nu-command/src/filesystem/util.rs     | 21 --------------------
 crates/nu-command/src/filesystem/utouch.rs   | 20 +++++--------------
 crates/nu-command/src/system/run_external.rs |  5 ++---
 crates/nu-engine/src/call_ext.rs             | 13 +++++-------
 13 files changed, 27 insertions(+), 71 deletions(-)

diff --git a/crates/nu-command/src/bytes/build_.rs b/crates/nu-command/src/bytes/build_.rs
index f9ca58b10f..de68632ac8 100644
--- a/crates/nu-command/src/bytes/build_.rs
+++ b/crates/nu-command/src/bytes/build_.rs
@@ -1,4 +1,4 @@
-use nu_engine::{command_prelude::*, get_eval_expression};
+use nu_engine::command_prelude::*;
 
 #[derive(Clone)]
 pub struct BytesBuild;
@@ -49,8 +49,7 @@ impl Command for BytesBuild {
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let mut output = vec![];
-        let eval_expression = get_eval_expression(engine_state);
-        for val in call.rest_iter_flattened(engine_state, stack, eval_expression, 0)? {
+        for val in call.rest::<Value>(engine_state, stack, 0)? {
             let val_span = val.span();
             match val {
                 Value::Binary { mut val, .. } => output.append(&mut val),
diff --git a/crates/nu-command/src/filesystem/du.rs b/crates/nu-command/src/filesystem/du.rs
index 6ae07974b9..0981d2c0ee 100644
--- a/crates/nu-command/src/filesystem/du.rs
+++ b/crates/nu-command/src/filesystem/du.rs
@@ -1,4 +1,3 @@
-use super::util::get_rest_for_glob_pattern;
 use crate::{DirBuilder, DirInfo, FileInfo};
 #[allow(deprecated)]
 use nu_engine::{command_prelude::*, current_dir};
@@ -101,7 +100,7 @@ impl Command for Du {
         #[allow(deprecated)]
         let current_dir = current_dir(engine_state, stack)?;
 
-        let paths = get_rest_for_glob_pattern(engine_state, stack, call, 0)?;
+        let paths = call.rest::<Spanned<NuGlob>>(engine_state, stack, 0)?;
         let paths = if !call.has_positional_args(stack, 0) {
             None
         } else {
diff --git a/crates/nu-command/src/filesystem/ls.rs b/crates/nu-command/src/filesystem/ls.rs
index c4944c6531..1e9e66c96b 100644
--- a/crates/nu-command/src/filesystem/ls.rs
+++ b/crates/nu-command/src/filesystem/ls.rs
@@ -1,4 +1,3 @@
-use super::util::get_rest_for_glob_pattern;
 use crate::{DirBuilder, DirInfo};
 use chrono::{DateTime, Local, LocalResult, TimeZone, Utc};
 use nu_engine::glob_from;
@@ -114,7 +113,7 @@ impl Command for Ls {
             call_span,
         };
 
-        let pattern_arg = get_rest_for_glob_pattern(engine_state, stack, call, 0)?;
+        let pattern_arg = call.rest::<Spanned<NuGlob>>(engine_state, stack, 0)?;
         let input_pattern_arg = if !call.has_positional_args(stack, 0) {
             None
         } else {
diff --git a/crates/nu-command/src/filesystem/open.rs b/crates/nu-command/src/filesystem/open.rs
index 855272d978..d9240cfae5 100644
--- a/crates/nu-command/src/filesystem/open.rs
+++ b/crates/nu-command/src/filesystem/open.rs
@@ -1,7 +1,6 @@
-use super::util::get_rest_for_glob_pattern;
 #[allow(deprecated)]
 use nu_engine::{command_prelude::*, current_dir, get_eval_block};
-use nu_protocol::{ast, ByteStream, DataSource, NuGlob, PipelineMetadata};
+use nu_protocol::{ast, DataSource, NuGlob, PipelineMetadata};
 use std::path::Path;
 
 #[cfg(feature = "sqlite")]
@@ -53,7 +52,7 @@ impl Command for Open {
         let call_span = call.head;
         #[allow(deprecated)]
         let cwd = current_dir(engine_state, stack)?;
-        let mut paths = get_rest_for_glob_pattern(engine_state, stack, call, 0)?;
+        let mut paths = call.rest::<Spanned<NuGlob>>(engine_state, stack, 0)?;
         let eval_block = get_eval_block(engine_state);
 
         if paths.is_empty() && !call.has_positional_args(stack, 0) {
diff --git a/crates/nu-command/src/filesystem/rm.rs b/crates/nu-command/src/filesystem/rm.rs
index 3d2c712155..9a13442aa3 100644
--- a/crates/nu-command/src/filesystem/rm.rs
+++ b/crates/nu-command/src/filesystem/rm.rs
@@ -1,4 +1,4 @@
-use super::util::{get_rest_for_glob_pattern, try_interaction};
+use super::util::try_interaction;
 #[allow(deprecated)]
 use nu_engine::{command_prelude::*, env::current_dir};
 use nu_glob::MatchOptions;
@@ -118,7 +118,7 @@ fn rm(
     let interactive = call.has_flag(engine_state, stack, "interactive")?;
     let interactive_once = call.has_flag(engine_state, stack, "interactive-once")? && !interactive;
 
-    let mut paths = get_rest_for_glob_pattern(engine_state, stack, call, 0)?;
+    let mut paths = call.rest::<Spanned<NuGlob>>(engine_state, stack, 0)?;
 
     if paths.is_empty() {
         return Err(ShellError::MissingParameter {
diff --git a/crates/nu-command/src/filesystem/touch.rs b/crates/nu-command/src/filesystem/touch.rs
index b4cd808be5..93b960d843 100644
--- a/crates/nu-command/src/filesystem/touch.rs
+++ b/crates/nu-command/src/filesystem/touch.rs
@@ -2,11 +2,8 @@ use filetime::FileTime;
 use nu_engine::command_prelude::*;
 use nu_path::expand_path_with;
 use nu_protocol::NuGlob;
-
 use std::{fs::OpenOptions, time::SystemTime};
 
-use super::util::get_rest_for_glob_pattern;
-
 #[derive(Clone)]
 pub struct Touch;
 
@@ -72,7 +69,7 @@ impl Command for Touch {
         let no_follow_symlinks: bool = call.has_flag(engine_state, stack, "no-deref")?;
         let reference: Option<Spanned<String>> = call.get_flag(engine_state, stack, "reference")?;
         let no_create: bool = call.has_flag(engine_state, stack, "no-create")?;
-        let files: Vec<Spanned<NuGlob>> = get_rest_for_glob_pattern(engine_state, stack, call, 0)?;
+        let files = call.rest::<Spanned<NuGlob>>(engine_state, stack, 0)?;
 
         let cwd = engine_state.cwd(Some(stack))?;
 
diff --git a/crates/nu-command/src/filesystem/ucp.rs b/crates/nu-command/src/filesystem/ucp.rs
index 3bc7f13325..b100a23bff 100644
--- a/crates/nu-command/src/filesystem/ucp.rs
+++ b/crates/nu-command/src/filesystem/ucp.rs
@@ -1,6 +1,6 @@
-use super::util::get_rest_for_glob_pattern;
 #[allow(deprecated)]
 use nu_engine::{command_prelude::*, current_dir};
+use nu_protocol::NuGlob;
 use std::path::PathBuf;
 use uu_cp::{BackupMode, CopyMode, UpdateMode};
 
@@ -156,7 +156,7 @@ impl Command for UCp {
             target_os = "macos"
         )))]
         let reflink_mode = uu_cp::ReflinkMode::Never;
-        let mut paths = get_rest_for_glob_pattern(engine_state, stack, call, 0)?;
+        let mut paths = call.rest::<Spanned<NuGlob>>(engine_state, stack, 0)?;
         if paths.is_empty() {
             return Err(ShellError::GenericError {
                 error: "Missing file operand".into(),
diff --git a/crates/nu-command/src/filesystem/umkdir.rs b/crates/nu-command/src/filesystem/umkdir.rs
index 6f4c77ef1b..589fd6f76d 100644
--- a/crates/nu-command/src/filesystem/umkdir.rs
+++ b/crates/nu-command/src/filesystem/umkdir.rs
@@ -1,12 +1,10 @@
 #[allow(deprecated)]
 use nu_engine::{command_prelude::*, current_dir};
-
+use nu_protocol::NuGlob;
 use uu_mkdir::mkdir;
 #[cfg(not(windows))]
 use uucore::mode;
 
-use super::util::get_rest_for_glob_pattern;
-
 #[derive(Clone)]
 pub struct UMkdir;
 
@@ -61,7 +59,8 @@ impl Command for UMkdir {
     ) -> Result<PipelineData, ShellError> {
         #[allow(deprecated)]
         let cwd = current_dir(engine_state, stack)?;
-        let mut directories = get_rest_for_glob_pattern(engine_state, stack, call, 0)?
+        let mut directories = call
+            .rest::<Spanned<NuGlob>>(engine_state, stack, 0)?
             .into_iter()
             .map(|dir| nu_path::expand_path_with(dir.item.as_ref(), &cwd, dir.item.is_expand()))
             .peekable();
diff --git a/crates/nu-command/src/filesystem/umv.rs b/crates/nu-command/src/filesystem/umv.rs
index 929fc7bcbb..cdf0c05b1f 100644
--- a/crates/nu-command/src/filesystem/umv.rs
+++ b/crates/nu-command/src/filesystem/umv.rs
@@ -1,4 +1,3 @@
-use super::util::get_rest_for_glob_pattern;
 #[allow(deprecated)]
 use nu_engine::{command_prelude::*, current_dir};
 use nu_path::expand_path_with;
@@ -100,7 +99,7 @@ impl Command for UMv {
 
         #[allow(deprecated)]
         let cwd = current_dir(engine_state, stack)?;
-        let mut paths = get_rest_for_glob_pattern(engine_state, stack, call, 0)?;
+        let mut paths = call.rest::<Spanned<NuGlob>>(engine_state, stack, 0)?;
         if paths.is_empty() {
             return Err(ShellError::GenericError {
                 error: "Missing file operand".into(),
diff --git a/crates/nu-command/src/filesystem/util.rs b/crates/nu-command/src/filesystem/util.rs
index de32d204a0..74a6fb14e9 100644
--- a/crates/nu-command/src/filesystem/util.rs
+++ b/crates/nu-command/src/filesystem/util.rs
@@ -1,6 +1,4 @@
 use dialoguer::Input;
-use nu_engine::{command_prelude::*, get_eval_expression};
-use nu_protocol::{FromValue, NuGlob};
 use std::{
     error::Error,
     path::{Path, PathBuf},
@@ -89,22 +87,3 @@ pub fn is_older(src: &Path, dst: &Path) -> Option<bool> {
         Some(src_ctime <= dst_ctime)
     }
 }
-
-/// Get rest arguments from given `call`, starts with `starting_pos`.
-///
-/// It's similar to `call.rest`, except that it always returns NuGlob.
-pub fn get_rest_for_glob_pattern(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    starting_pos: usize,
-) -> Result<Vec<Spanned<NuGlob>>, ShellError> {
-    let eval_expression = get_eval_expression(engine_state);
-
-    call.rest_iter_flattened(engine_state, stack, eval_expression, starting_pos)?
-        .into_iter()
-        // This used to be much more complex, but I think `FromValue` should be able to handle the
-        // nuance here.
-        .map(FromValue::from_value)
-        .collect()
-}
diff --git a/crates/nu-command/src/filesystem/utouch.rs b/crates/nu-command/src/filesystem/utouch.rs
index f32364b28a..51338b20e7 100644
--- a/crates/nu-command/src/filesystem/utouch.rs
+++ b/crates/nu-command/src/filesystem/utouch.rs
@@ -1,19 +1,10 @@
-use std::io::ErrorKind;
-use std::path::PathBuf;
-
 use chrono::{DateTime, FixedOffset};
 use filetime::FileTime;
-
-use nu_engine::CallExt;
+use nu_engine::command_prelude::*;
 use nu_path::expand_path_with;
-use nu_protocol::engine::{Call, Command, EngineState, Stack};
-use nu_protocol::{
-    Category, Example, NuGlob, PipelineData, ShellError, Signature, Spanned, SyntaxShape, Type,
-};
-use uu_touch::error::TouchError;
-use uu_touch::{ChangeTimes, InputFile, Options, Source};
-
-use super::util::get_rest_for_glob_pattern;
+use nu_protocol::NuGlob;
+use std::{io::ErrorKind, path::PathBuf};
+use uu_touch::{error::TouchError, ChangeTimes, InputFile, Options, Source};
 
 #[derive(Clone)]
 pub struct UTouch;
@@ -91,8 +82,7 @@ impl Command for UTouch {
         let change_atime: bool = call.has_flag(engine_state, stack, "access")?;
         let no_create: bool = call.has_flag(engine_state, stack, "no-create")?;
         let no_deref: bool = call.has_flag(engine_state, stack, "no-dereference")?;
-        let file_globs: Vec<Spanned<NuGlob>> =
-            get_rest_for_glob_pattern(engine_state, stack, call, 0)?;
+        let file_globs = call.rest::<Spanned<NuGlob>>(engine_state, stack, 0)?;
         let cwd = engine_state.cwd(Some(stack))?;
 
         if file_globs.is_empty() {
diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index 148aa2b20d..e3d74c055b 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -1,5 +1,5 @@
 use nu_cmd_base::hook::eval_hook;
-use nu_engine::{command_prelude::*, env_to_strings, get_eval_expression};
+use nu_engine::{command_prelude::*, env_to_strings};
 use nu_path::{dots::expand_ndots, expand_tilde, AbsolutePath};
 use nu_protocol::{did_you_mean, process::ChildProcess, ByteStream, NuGlob, OutDest, Signals};
 use nu_system::ForegroundChild;
@@ -295,8 +295,7 @@ pub fn eval_arguments_from_call(
     call: &Call,
 ) -> Result<Vec<Spanned<OsString>>, ShellError> {
     let cwd = engine_state.cwd(Some(stack))?;
-    let eval_expression = get_eval_expression(engine_state);
-    let call_args = call.rest_iter_flattened(engine_state, stack, eval_expression, 1)?;
+    let call_args = call.rest::<Value>(engine_state, stack, 1)?;
     let mut args: Vec<Spanned<OsString>> = Vec::with_capacity(call_args.len());
 
     for arg in call_args {
diff --git a/crates/nu-engine/src/call_ext.rs b/crates/nu-engine/src/call_ext.rs
index d3f36215e6..4473739b35 100644
--- a/crates/nu-engine/src/call_ext.rs
+++ b/crates/nu-engine/src/call_ext.rs
@@ -121,15 +121,12 @@ impl CallExt for ast::Call {
         starting_pos: usize,
     ) -> Result<Vec<T>, ShellError> {
         let stack = &mut stack.use_call_arg_out_dest();
-        let mut output = vec![];
-
-        for result in self.rest_iter_flattened(starting_pos, |expr| {
+        self.rest_iter_flattened(starting_pos, |expr| {
             eval_expression::<WithoutDebug>(engine_state, stack, expr)
-        })? {
-            output.push(FromValue::from_value(result)?);
-        }
-
-        Ok(output)
+        })?
+        .into_iter()
+        .map(FromValue::from_value)
+        .collect()
     }
 
     fn opt<T: FromValue>(

From dfec687a469a5876b1b70f7fcee2d43a3bbec1fc Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Mon, 2 Dec 2024 05:02:48 +0300
Subject: [PATCH 0745/1072] `term query`: refactor, add `--beginning` flag
 (#14446)

# Description

- Refactor code to be simpler.
- Make the mentioned changes.
- `scopeguard` is added as a direct dependency. Helps simplify the code.
Rather than roll an ad-hoc version of it myself, I thought it would be
better to use `scopeguard` as it was already an indirect dependency.

# User-Facing Changes

- Add `--beginning` flag, which is used to validate the response and
provide early errors in case of unexpected inputs.
- Both `terminator` and `beginning` sequences (when provided) are not
included in the command's output. Turns out they are almost always
removed from the output, and because they are known beforehand they can
be added back by the user.
---
 Cargo.lock                                    |  1 +
 Cargo.toml                                    |  1 +
 crates/nu-command/Cargo.toml                  |  3 +-
 .../src/platform/term/term_query.rs           | 84 +++++++++++++------
 4 files changed, 64 insertions(+), 25 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a5399b9ddc..5e93f72a58 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3421,6 +3421,7 @@ dependencies = [
  "roxmltree",
  "rstest",
  "rusqlite",
+ "scopeguard",
  "serde",
  "serde_json",
  "serde_urlencoded",
diff --git a/Cargo.toml b/Cargo.toml
index c7bafe89d6..102bd1246b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -147,6 +147,7 @@ roxmltree = "0.19"
 rstest = { version = "0.23", default-features = false }
 rusqlite = "0.31"
 rust-embed = "8.5.0"
+scopeguard = { version = "1.2.0" }
 serde = { version = "1.0" }
 serde_json = "1.0"
 serde_urlencoded = "0.7.1"
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index ce1c336153..ef88aa92e4 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -80,6 +80,7 @@ regex = { workspace = true }
 roxmltree = { workspace = true }
 rusqlite = { workspace = true, features = ["bundled", "backup", "chrono"], optional = true }
 rmp = { workspace = true }
+scopeguard = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true, features = ["preserve_order"] }
 serde_urlencoded = { workspace = true }
@@ -196,4 +197,4 @@ quickcheck_macros = { workspace = true }
 rstest = { workspace = true, default-features = false }
 pretty_assertions = { workspace = true }
 tempfile = { workspace = true }
-rand_chacha = { workspace = true }
\ No newline at end of file
+rand_chacha = { workspace = true }
diff --git a/crates/nu-command/src/platform/term/term_query.rs b/crates/nu-command/src/platform/term/term_query.rs
index a4966edde0..2cb11f1dc3 100644
--- a/crates/nu-command/src/platform/term/term_query.rs
+++ b/crates/nu-command/src/platform/term/term_query.rs
@@ -23,9 +23,12 @@ impl Command for TermQuery {
         "Print the given query, and read the immediate result from stdin.
 
 The standard input will be read right after `query` is printed, and consumed until the `terminator`
-sequence is encountered. The `terminator` is not removed from the output.
+sequence is encountered. The `terminator` is not included in the output.
 
-If `terminator` is not supplied, input will be read until Ctrl-C is pressed."
+If `terminator` is not supplied, input will be read until Ctrl-C is pressed.
+
+If `prefix` is supplied, input's initial bytes will be validated against it.
+The `prefix` is not included in the output."
     }
 
     fn signature(&self) -> Signature {
@@ -38,29 +41,45 @@ If `terminator` is not supplied, input will be read until Ctrl-C is pressed."
                 SyntaxShape::OneOf(vec![SyntaxShape::Binary, SyntaxShape::String]),
                 "The query that will be printed to stdout.",
             )
+            .named(
+                "prefix",
+                SyntaxShape::OneOf(vec![SyntaxShape::Binary, SyntaxShape::String]),
+                "Prefix sequence for the expected reply.",
+                Some('p'),
+            )
             .named(
                 "terminator",
                 SyntaxShape::OneOf(vec![SyntaxShape::Binary, SyntaxShape::String]),
                 "Terminator sequence for the expected reply.",
                 Some('t'),
             )
+            .switch(
+                "keep",
+                "Include prefix and terminator in the output.",
+                Some('k'),
+            )
     }
 
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
                 description: "Get cursor position.",
-                example: r#"term query (ansi cursor_position) --terminator 'R'"#,
+                example: r#"term query (ansi cursor_position) --prefix (ansi csi) --terminator 'R'"#,
                 result: None,
             },
             Example {
                 description: "Get terminal background color.",
-                example: r#"term query $'(ansi osc)10;?(ansi st)' --terminator (ansi st)"#,
+                example: r#"term query $'(ansi osc)10;?(ansi st)' --prefix $'(ansi osc)10;' --terminator (ansi st)"#,
+                result: None,
+            },
+            Example {
+                description: "Get terminal background color. (some terminals prefer `char bel` rather than `ansi st` as string terminator)",
+                example: r#"term query $'(ansi osc)10;?(char bel)' --prefix $'(ansi osc)10;' --terminator (char bel)"#,
                 result: None,
             },
             Example {
                 description: "Read clipboard content on terminals supporting OSC-52.",
-                example: r#"term query $'(ansi osc)52;c;?(ansi st)' --terminator (ansi st)"#,
+                example: r#"term query $'(ansi osc)52;c;?(ansi st)' --prefix $'(ansi osc)52;c;' --terminator (ansi st)"#,
                 result: None,
             },
         ]
@@ -74,9 +93,15 @@ If `terminator` is not supplied, input will be read until Ctrl-C is pressed."
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let query: Vec<u8> = call.req(engine_state, stack, 0)?;
+        let keep = call.has_flag(engine_state, stack, "keep")?;
+        let prefix: Option<Vec<u8>> = call.get_flag(engine_state, stack, "prefix")?;
+        let prefix = prefix.unwrap_or_default();
         let terminator: Option<Vec<u8>> = call.get_flag(engine_state, stack, "terminator")?;
 
         crossterm::terminal::enable_raw_mode()?;
+        scopeguard::defer! {
+            let _ = crossterm::terminal::disable_raw_mode();
+        }
 
         // clear terminal events
         while crossterm::event::poll(Duration::from_secs(0))? {
@@ -94,44 +119,55 @@ If `terminator` is not supplied, input will be read until Ctrl-C is pressed."
             stdout.flush()?;
         }
 
-        let out = if let Some(terminator) = terminator {
+        // Validate and skip prefix
+        for bc in prefix {
+            stdin.read_exact(&mut b)?;
+            if b[0] != bc {
+                return Err(ShellError::GenericError {
+                    error: "Input did not begin with expected sequence".into(),
+                    msg: "".into(),
+                    span: None,
+                    help: Some("Try running without `--prefix` and inspecting the output.".into()),
+                    inner: vec![],
+                });
+            }
+            if keep {
+                buf.push(b[0]);
+            }
+        }
+
+        if let Some(terminator) = terminator {
             loop {
-                if let Err(err) = stdin.read_exact(&mut b) {
-                    break Err(ShellError::from(err));
-                }
+                stdin.read_exact(&mut b)?;
 
                 if b[0] == CTRL_C {
-                    break Err(ShellError::Interrupted { span: call.head });
+                    return Err(ShellError::InterruptedByUser {
+                        span: Some(call.head),
+                    });
                 }
 
                 buf.push(b[0]);
 
                 if buf.ends_with(&terminator) {
-                    break Ok(Value::Binary {
-                        val: buf,
-                        internal_span: call.head,
+                    if !keep {
+                        // Remove terminator
+                        buf.drain((buf.len() - terminator.len())..);
                     }
-                    .into_pipeline_data());
+                    break;
                 }
             }
         } else {
             loop {
-                if let Err(err) = stdin.read_exact(&mut b) {
-                    break Err(ShellError::from(err));
-                }
+                stdin.read_exact(&mut b)?;
 
                 if b[0] == CTRL_C {
-                    break Ok(Value::Binary {
-                        val: buf,
-                        internal_span: call.head,
-                    }
-                    .into_pipeline_data());
+                    break;
                 }
 
                 buf.push(b[0]);
             }
         };
-        crossterm::terminal::disable_raw_mode()?;
-        out
+
+        Ok(Value::binary(buf, call.head).into_pipeline_data())
     }
 }

From 1940b36e07083f745d8a427ba84ec55988972e54 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Mon, 2 Dec 2024 06:19:20 -0600
Subject: [PATCH 0746/1072] Add environment variables for sourced files
 (#14486)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

I always wondered why the module env vars `CURRENT_FILE`, `FILE_PWD`,
`PROCESS_PATH` weren't available in the source command. I tried to add
them here. I think it could be helpful but I'm not sure. I'm also not
sure this hack is what we should do but I thought I'd put it out there
for fun.

Thoughts?

### Run Module (works as it did before)

```nushell
❯ open test_module.nu
def main [] {
  print $"$env.CURRENT_FILE = ($env.CURRENT_FILE?)"
  print $"$env.FILE_PWD = ($env.FILE_PWD?)"
  print $"$env.PROCESS_PATH = ($env.PROCESS_PATH?)"
}
❯ nu test_module.nu
$env.CURRENT_FILE = /Users/fdncred/src/nushell/test_module.nu
$env.FILE_PWD = /Users/fdncred/src/nushell
$env.PROCESS_PATH = test_module.nu
```
### Use Module (works as it did before)
```nushell
❯ open test_module2.nu
export-env {
  print $"$env.CURRENT_FILE = ($env.CURRENT_FILE?)"
  print $"$env.FILE_PWD = ($env.FILE_PWD?)"
  print $"$env.PROCESS_PATH = ($env.PROCESS_PATH?)"
}
❯ use test_module2.nu
$env.CURRENT_FILE = /Users/fdncred/src/nushell/test_module.nu
$env.FILE_PWD = /Users/fdncred/src/nushell
$env.PROCESS_PATH =
```
### Sourced non-module script (this is the new part)

> [!NOTE]
> Note: We intentionally left out PROCESS_PATH since it's supposed to
> to work like argv[0] in C, which is the name of the program being
executed.
> Since we're not executing a program, we don't need to set it.


```nushell
❯ open test_source.nu
print $"$env.CURRENT_FILE = ($env.CURRENT_FILE?)"
print $"$env.FILE_PWD = ($env.FILE_PWD?)"
print $"$env.PROCESS_PATH = ($env.PROCESS_PATH?)"
❯ source test_source.nu
$env.CURRENT_FILE = /Users/fdncred/src/nushell/test_source.nu
$env.FILE_PWD = /Users/fdncred/src/nushell
$env.PROCESS_PATH =
```

Also, what is PROCESS_PATH even supposed to be?

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/misc/source.rs   | 49 ++++++++++++++++++++++++--
 crates/nu-parser/src/parse_keywords.rs | 11 ++++++
 2 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/crates/nu-command/src/misc/source.rs b/crates/nu-command/src/misc/source.rs
index 01f971a103..a12a57ebef 100644
--- a/crates/nu-command/src/misc/source.rs
+++ b/crates/nu-command/src/misc/source.rs
@@ -1,4 +1,5 @@
 use nu_engine::{command_prelude::*, get_eval_block_with_early_return};
+use nu_path::canonicalize_with;
 use nu_protocol::{engine::CommandType, BlockId};
 
 /// Source a file for environment variables.
@@ -41,15 +42,57 @@ impl Command for Source {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        // Note: this hidden positional is the block_id that corresponded to the 0th position
-        // it is put here by the parser
+        // Note: two hidden positionals are used here that are injected by the parser:
+        // 1. The block_id that corresponded to the 0th position
+        // 2. The block_id_name that corresponded to the file name at the 0th position
         let block_id: i64 = call.req_parser_info(engine_state, stack, "block_id")?;
+        let block_id_name: String = call.req_parser_info(engine_state, stack, "block_id_name")?;
         let block_id = BlockId::new(block_id as usize);
         let block = engine_state.get_block(block_id).clone();
+        let cwd = engine_state.cwd_as_string(Some(stack))?;
+        let pb = std::path::PathBuf::from(block_id_name);
+        let parent = pb.parent().unwrap_or(std::path::Path::new(""));
+        let file_path =
+            canonicalize_with(pb.as_path(), cwd).map_err(|err| ShellError::FileNotFoundCustom {
+                msg: format!("Could not access file '{}': {err}", pb.as_path().display()),
+                span: Span::unknown(),
+            })?;
+
+        // Note: We intentionally left out PROCESS_PATH since it's supposed to
+        // to work like argv[0] in C, which is the name of the program being executed.
+        // Since we're not executing a program, we don't need to set it.
+
+        // Save the old env vars so we can restore them after the script has ran
+        let old_file_pwd = stack.get_env_var(engine_state, "FILE_PWD").cloned();
+        let old_current_file = stack.get_env_var(engine_state, "CURRENT_FILE").cloned();
+
+        // Add env vars so they are available to the script
+        stack.add_env_var(
+            "FILE_PWD".to_string(),
+            Value::string(parent.to_string_lossy(), Span::unknown()),
+        );
+        stack.add_env_var(
+            "CURRENT_FILE".to_string(),
+            Value::string(file_path.to_string_lossy(), Span::unknown()),
+        );
 
         let eval_block_with_early_return = get_eval_block_with_early_return(engine_state);
+        let return_result = eval_block_with_early_return(engine_state, stack, &block, input);
 
-        eval_block_with_early_return(engine_state, stack, &block, input)
+        // After the script has ran, restore the old values unless they didn't exist.
+        // If they didn't exist prior, remove the env vars
+        if let Some(old_file_pwd) = old_file_pwd {
+            stack.add_env_var("FILE_PWD".to_string(), old_file_pwd.clone());
+        } else {
+            stack.remove_env_var(engine_state, "FILE_PWD");
+        }
+        if let Some(old_current_file) = old_current_file {
+            stack.add_env_var("CURRENT_FILE".to_string(), old_current_file.clone());
+        } else {
+            stack.remove_env_var(engine_state, "CURRENT_FILE");
+        }
+
+        return_result
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index 3292405cab..e01743321c 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -3544,6 +3544,17 @@ pub fn parse_source(working_set: &mut StateWorkingSet, lite_command: &LiteComman
                             ),
                         );
 
+                        // store the file path as a string to be gathered later
+                        call_with_block.set_parser_info(
+                            "block_id_name".to_string(),
+                            Expression::new(
+                                working_set,
+                                Expr::Filepath(path.path_buf().display().to_string(), false),
+                                spans[1],
+                                Type::String,
+                            ),
+                        );
+
                         return Pipeline::from_vec(vec![Expression::new(
                             working_set,
                             Expr::Call(call_with_block),

From 3b0ba923e4e6a333e039ac391a2931b7dac88f2b Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Mon, 2 Dec 2024 16:02:06 +0100
Subject: [PATCH 0747/1072] Fix missing `installed_plugins` field in `version`
 command (#14488)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
In #14418 I added the `plugin` feature to the crate `nu-cmd-lang`. I
forgot to include that feature in the `nushell/plugin` feature. This
caused the `version` command to not have the `installed_plugins` field.
With this PR I fixed that.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

None 😇

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

Running `version` shows `installed_plugins` again.

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->

That should be it.
---
 Cargo.toml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 102bd1246b..dd29f8b107 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -251,13 +251,18 @@ tempfile = { workspace = true }
 
 [features]
 plugin = [
-  "nu-plugin-engine",
+  # crates
   "nu-cmd-plugin",
+  "nu-plugin-engine",
+
+  # features
   "nu-cli/plugin",
-  "nu-parser/plugin",
+  "nu-cmd-lang/plugin",
   "nu-command/plugin",
-  "nu-protocol/plugin",
   "nu-engine/plugin",
+  "nu-engine/plugin",
+  "nu-parser/plugin",
+  "nu-protocol/plugin",
 ]
 
 default = [

From c8b5909ee874bf6271f77bb3f2986b5b0d11ce53 Mon Sep 17 00:00:00 2001
From: PegasusPlusUS <95586924+PegasusPlusUS@users.noreply.github.com>
Date: Mon, 2 Dec 2024 10:17:46 -0800
Subject: [PATCH 0748/1072] Feature: PWD-per-drive to facilitate working on
 multiple drives at Windows (#14411)

This PR implements PWD-per-drive as described in discussion #14355

# Description
On Windows, CMD or PowerShell assigns each drive its own current
directory. For example, if you are in 'C:\Windows', switch to 'D:', and
navigate to 'D:\Game', you can return to 'C:\Windows' by simply typing
'C:'.

This PR enables Nushell on Windows to have the same capability, allowing
each drive to maintain its own PWD (Present Working Directory).

# User-Facing Changes
Currently, 'cd' or 'ls' only accept absolute paths if the path starts
with 'C:' or another drive letter. With PWD-per-drive, users can use
'cd' (or auto cd) and 'ls' in the same way as 'cd' and 'dir' in
PowerShell, or similarly to 'cd' and 'dir' in CMD (noting that cd in CMD
has slightly different behavior, 'cd' for another drive only changes
current directory of that drive, but does not switch there).

Interaction example on switching between drives:
```Nushell
~>D:
D:\>cd Test
D:\Test\>C:
~>D:
D:\Test\>C:
~>cd D:..
D:\>C:x/../y/../z/..
~>cd D:Test\Test
D:\Test\Test>C:
~>D:...
D:\>
```
Interaction example on auto-completion at cmd line:
```Nushell
~>cd D:\test[Enter]
D:\test>~[Enter]
~>D:[TAB]
~>D:\test[Enter]
D:\test>c:.c[TAB]
c:\users\nushell\.cargo\ c:\users\nushell\.config\
```
Interaction example on pass PWD-per-drive to child process: (Note CMD
will use it, but PowerShell will ignore it though it still prepares such
info for child process)
```Nushell
~>cd D:\Test
D:\Test>cd E:\Test
E:\Test\>~
~>CMD
Microsoft Windows [Version 10.0.22631.4460]
(c) Microsoft Corporation. All rights reserved.

C:\Users\Nushell>d:
D:\Test>e:
E:\Test>
```

# Brief Change Description

1.Added 'crates/nu-path/src/pwd_per_drive.rs' to implement a 26-slot
array mapping drive letters to PWDs. Test cases are included in the same
file, along with a doctest for the usage of PWD-per-drive.
2. Modified 'crates/nu-path/src/lib.rs' to declare module of
pwd_per_drive and export struct for PWD-per-drive.
3. Modified 'crates/nu-protocol/src/engine/stack.rs' to sync PWD when
set_cwd() is called. Add PWD-per-drive map as member. Clone between
parent and child. Stub/proxy for nu_path::expand_path_with() to
facilitate filesystem commands using PWD-per-drive.
4. Modified 'crates/nu-cli/src/repl.rs' auto_cd uses PWD-per-drive to
expand path.
5. Modified 'crates/nu-cli/src/completions/completion_common.rs' to
expand relative path when press [TAB] at command line.
6. Modified 'crates/nu-engine/src/env.rs' to collect PWD-per-drive info
as env vars for child process as CMD or PowerShell do, this can let
child process inherit PWD-per-drive info.
7. Modified 'crates/nu-engine/src/eval.rs', caller clone callee's
PWD-per-drive info, supporting 'def --env'
8. Modified 'crates/nu-engine/src/eval_ir.rs', 'def --env' support.
Remove duplicated fn redirect_env()
9. Modified 'src/run.rs', to init PWD-per-drive when startup.

filesystem commands that modified:
1. Modified 'crates/nu-command/src/filesystem/cd.rs', 1 line change to
use stackscoped PWD-per-drive.
Other commands, commit pending....

Local test def --env OK:
```nushell
E:\study\nushell> def --env env_cd_demo [] {
:::     cd ~
:::     cd D:\Project
:::     cd E:Crates
::: }
E:\study\nushell>
E:\study\nushell> def cd_no_demo [] {
:::     cd ~
:::     cd D:\Project
:::     cd E:Crates
::: }
E:\study\nushell> cd_no_demo
E:\study\nushell> C:
C:\>D:
D:\>E:
E:\study\nushell>env_cd_demo
E:\study\nushell\crates> C:
~>D:
D:\Project>E:
E:\study\nushell\crates>
```

# Tests + Formatting

- `cargo fmt --all -- --check` passed.
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used`
passed.
- `cargo test --workspace` passed on Windows developer mode and Ubuntu.
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` passed.
- nushell:
```
> use toolkit.nu  # or use an `env_change` hook to activate it automatically
> toolkit check pr
> ```
passed

---------

Co-authored-by: pegasus.cadence@gmail.com <pegasus.cadence@gmail.com>
---
 .../src/completions/completion_common.rs      |   8 +
 crates/nu-cli/src/repl.rs                     |   6 +
 crates/nu-command/src/filesystem/cd.rs        |   2 +-
 crates/nu-engine/src/env.rs                   |   3 +
 crates/nu-engine/src/eval.rs                  |   5 +
 crates/nu-engine/src/eval_ir.rs               |  34 +-
 crates/nu-path/src/lib.rs                     |   4 +
 crates/nu-path/src/pwd_per_drive.rs           | 331 ++++++++++++++++++
 crates/nu-protocol/src/engine/stack.rs        |  35 ++
 src/run.rs                                    |  31 ++
 10 files changed, 430 insertions(+), 29 deletions(-)
 create mode 100644 crates/nu-path/src/pwd_per_drive.rs

diff --git a/crates/nu-cli/src/completions/completion_common.rs b/crates/nu-cli/src/completions/completion_common.rs
index 4b5ef857e1..d96ca365eb 100644
--- a/crates/nu-cli/src/completions/completion_common.rs
+++ b/crates/nu-cli/src/completions/completion_common.rs
@@ -174,6 +174,14 @@ pub fn complete_item(
 ) -> Vec<FileSuggestion> {
     let cleaned_partial = surround_remove(partial);
     let isdir = cleaned_partial.ends_with(is_separator);
+    #[cfg(windows)]
+    let cleaned_partial = if let Some(absolute_partial) =
+        stack.pwd_per_drive.expand_pwd(Path::new(&cleaned_partial))
+    {
+        absolute_partial.display().to_string()
+    } else {
+        cleaned_partial
+    };
     let expanded_partial = expand_ndots(Path::new(&cleaned_partial));
     let should_collapse_dots = expanded_partial != Path::new(&cleaned_partial);
     let mut partial = expanded_partial.to_string_lossy().to_string();
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 4bd86ddbf9..0476435aee 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -832,6 +832,12 @@ fn do_auto_cd(
     engine_state: &mut EngineState,
     span: Span,
 ) {
+    #[cfg(windows)]
+    let path = if let Some(abs_path) = stack.pwd_per_drive.expand_pwd(path.as_path()) {
+        abs_path
+    } else {
+        path
+    };
     let path = {
         if !path.exists() {
             report_shell_error(
diff --git a/crates/nu-command/src/filesystem/cd.rs b/crates/nu-command/src/filesystem/cd.rs
index 2af932bcb4..3b5aa377fe 100644
--- a/crates/nu-command/src/filesystem/cd.rs
+++ b/crates/nu-command/src/filesystem/cd.rs
@@ -87,7 +87,7 @@ impl Command for Cd {
                             });
                         }
                     } else {
-                        let path = nu_path::expand_path_with(path_no_whitespace, &cwd, true);
+                        let path = stack.expand_path_with(path_no_whitespace, &cwd, true);
                         if !path.exists() {
                             return Err(ShellError::DirectoryNotFound {
                                 dir: path_no_whitespace.to_string(),
diff --git a/crates/nu-engine/src/env.rs b/crates/nu-engine/src/env.rs
index c4460f4695..f7aa3cf2e1 100644
--- a/crates/nu-engine/src/env.rs
+++ b/crates/nu-engine/src/env.rs
@@ -157,6 +157,9 @@ pub fn env_to_strings(
         }
     }
 
+    #[cfg(windows)]
+    stack.pwd_per_drive.get_env_vars(&mut env_vars_str);
+
     Ok(env_vars_str)
 }
 
diff --git a/crates/nu-engine/src/eval.rs b/crates/nu-engine/src/eval.rs
index 0e3917290f..d41e5753bd 100644
--- a/crates/nu-engine/src/eval.rs
+++ b/crates/nu-engine/src/eval.rs
@@ -194,6 +194,11 @@ pub fn redirect_env(engine_state: &EngineState, caller_stack: &mut Stack, callee
         caller_stack.add_env_var(var, value);
     }
 
+    #[cfg(windows)]
+    {
+        caller_stack.pwd_per_drive = callee_stack.pwd_per_drive.clone();
+    }
+
     // set config to callee config, to capture any updates to that
     caller_stack.config.clone_from(&callee_stack.config);
 }
diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index afcb58a90a..7b4c0a28f5 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -1,6 +1,6 @@
 use std::{borrow::Cow, fs::File, sync::Arc};
 
-use nu_path::{expand_path_with, AbsolutePathBuf};
+use nu_path::AbsolutePathBuf;
 use nu_protocol::{
     ast::{Bits, Block, Boolean, CellPath, Comparison, Math, Operator},
     debugger::DebugContext,
@@ -14,7 +14,7 @@ use nu_protocol::{
 };
 use nu_utils::IgnoreCaseExt;
 
-use crate::{eval::is_automatic_env_var, eval_block_with_early_return};
+use crate::{eval::is_automatic_env_var, eval_block_with_early_return, redirect_env};
 
 /// Evaluate the compiled representation of a [`Block`].
 pub fn eval_ir_block<D: DebugContext>(
@@ -870,7 +870,7 @@ fn literal_value(
                 Value::string(path, span)
             } else {
                 let cwd = ctx.engine_state.cwd(Some(ctx.stack))?;
-                let path = expand_path_with(path, cwd, true);
+                let path = ctx.stack.expand_path_with(path, cwd, true);
 
                 Value::string(path.to_string_lossy(), span)
             }
@@ -890,7 +890,7 @@ fn literal_value(
                     .cwd(Some(ctx.stack))
                     .map(AbsolutePathBuf::into_std_path_buf)
                     .unwrap_or_default();
-                let path = expand_path_with(path, cwd, true);
+                let path = ctx.stack.expand_path_with(path, cwd, true);
 
                 Value::string(path.to_string_lossy(), span)
             }
@@ -1405,7 +1405,8 @@ enum RedirectionStream {
 /// Open a file for redirection
 fn open_file(ctx: &EvalContext<'_>, path: &Value, append: bool) -> Result<Arc<File>, ShellError> {
     let path_expanded =
-        expand_path_with(path.as_str()?, ctx.engine_state.cwd(Some(ctx.stack))?, true);
+        ctx.stack
+            .expand_path_with(path.as_str()?, ctx.engine_state.cwd(Some(ctx.stack))?, true);
     let mut options = File::options();
     if append {
         options.append(true);
@@ -1485,26 +1486,3 @@ fn eval_iterate(
         eval_iterate(ctx, dst, stream, end_index)
     }
 }
-
-/// Redirect environment from the callee stack to the caller stack
-fn redirect_env(engine_state: &EngineState, caller_stack: &mut Stack, callee_stack: &Stack) {
-    // TODO: make this more efficient
-    // Grab all environment variables from the callee
-    let caller_env_vars = caller_stack.get_env_var_names(engine_state);
-
-    // remove env vars that are present in the caller but not in the callee
-    // (the callee hid them)
-    for var in caller_env_vars.iter() {
-        if !callee_stack.has_env_var(engine_state, var) {
-            caller_stack.remove_env_var(engine_state, var);
-        }
-    }
-
-    // add new env vars from callee to caller
-    for (var, value) in callee_stack.get_stack_env_vars() {
-        caller_stack.add_env_var(var, value);
-    }
-
-    // set config to callee config, to capture any updates to that
-    caller_stack.config.clone_from(&callee_stack.config);
-}
diff --git a/crates/nu-path/src/lib.rs b/crates/nu-path/src/lib.rs
index cf31a5789f..660fae4b22 100644
--- a/crates/nu-path/src/lib.rs
+++ b/crates/nu-path/src/lib.rs
@@ -6,6 +6,8 @@ pub mod expansions;
 pub mod form;
 mod helpers;
 mod path;
+#[cfg(windows)]
+pub mod pwd_per_drive;
 mod tilde;
 mod trailing_slash;
 
@@ -13,5 +15,7 @@ pub use components::components;
 pub use expansions::{canonicalize_with, expand_path_with, expand_to_real_path, locate_in_dirs};
 pub use helpers::{cache_dir, data_dir, home_dir, nu_config_dir};
 pub use path::*;
+#[cfg(windows)]
+pub use pwd_per_drive::DriveToPwdMap;
 pub use tilde::expand_tilde;
 pub use trailing_slash::{has_trailing_slash, strip_trailing_slash};
diff --git a/crates/nu-path/src/pwd_per_drive.rs b/crates/nu-path/src/pwd_per_drive.rs
new file mode 100644
index 0000000000..d7a395174f
--- /dev/null
+++ b/crates/nu-path/src/pwd_per_drive.rs
@@ -0,0 +1,331 @@
+/// Usage for pwd_per_drive on windows
+///
+/// let mut map = DriveToPwdMap::new();
+///
+/// Upon change PWD, call map.set_pwd() with absolute path
+///
+/// Call map.expand_pwd() with relative path to get absolution path
+///
+/// ```
+/// use std::path::{Path, PathBuf};
+/// use nu_path::DriveToPwdMap;
+///
+/// let mut map = DriveToPwdMap::new();
+///
+/// // Set PWD for drive C
+/// assert!(map.set_pwd(Path::new(r"C:\Users\Home")).is_ok());
+///
+/// // Expand a relative path
+/// let expanded = map.expand_pwd(Path::new("c:test"));
+/// assert_eq!(expanded, Some(PathBuf::from(r"C:\Users\Home\test")));
+///
+/// // Will NOT expand an absolute path
+/// let expanded = map.expand_pwd(Path::new(r"C:\absolute\path"));
+/// assert_eq!(expanded, None);
+///
+/// // Expand with no drive letter
+/// let expanded = map.expand_pwd(Path::new(r"\no_drive"));
+/// assert_eq!(expanded, None);
+///
+/// // Expand with no PWD set for the drive
+/// let expanded = map.expand_pwd(Path::new("D:test"));
+/// assert!(expanded.is_some());
+/// let abs_path = expanded.unwrap().as_path().to_str().expect("OK").to_string();
+/// assert!(abs_path.starts_with(r"D:\"));
+/// assert!(abs_path.ends_with(r"\test"));
+///
+/// // Get env vars for child process
+/// use std::collections::HashMap;
+/// let mut env = HashMap::<String, String>::new();
+/// map.get_env_vars(&mut env);
+/// assert_eq!(env.get("=C:").unwrap(), r"C:\Users\Home");
+/// ```
+use std::collections::HashMap;
+use std::path::{Path, PathBuf};
+
+#[derive(Debug, PartialEq)]
+pub enum PathError {
+    InvalidDriveLetter,
+    InvalidPath,
+}
+
+/// Helper to check if input path is relative path
+/// with drive letter, it can be expanded with PWD-per-drive.
+fn need_expand(path: &Path) -> bool {
+    if let Some(path_str) = path.to_str() {
+        let chars: Vec<char> = path_str.chars().collect();
+        if chars.len() >= 2 {
+            return chars[1] == ':' && (chars.len() == 2 || (chars[2] != '/' && chars[2] != '\\'));
+        }
+    }
+    false
+}
+
+#[derive(Clone, Debug)]
+pub struct DriveToPwdMap {
+    map: [Option<String>; 26], // Fixed-size array for A-Z
+}
+
+impl Default for DriveToPwdMap {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl DriveToPwdMap {
+    pub fn new() -> Self {
+        Self {
+            map: Default::default(),
+        }
+    }
+
+    pub fn env_var_for_drive(drive_letter: char) -> String {
+        let drive_letter = drive_letter.to_ascii_uppercase();
+        format!("={}:", drive_letter)
+    }
+
+    /// Collect PWD-per-drive as env vars (for child process)
+    pub fn get_env_vars(&self, env: &mut HashMap<String, String>) {
+        for (drive_index, drive_letter) in ('A'..='Z').enumerate() {
+            if let Some(pwd) = self.map[drive_index].clone() {
+                if pwd.len() > 3 {
+                    let env_var_for_drive = Self::env_var_for_drive(drive_letter);
+                    env.insert(env_var_for_drive, pwd);
+                }
+            }
+        }
+    }
+
+    /// Set the PWD for the drive letter in the absolute path.
+    /// Return PathError for error.
+    pub fn set_pwd(&mut self, path: &Path) -> Result<(), PathError> {
+        if let (Some(drive_letter), Some(path_str)) =
+            (Self::extract_drive_letter(path), path.to_str())
+        {
+            if drive_letter.is_ascii_alphabetic() {
+                let drive_letter = drive_letter.to_ascii_uppercase();
+                // Make sure saved drive letter is upper case
+                let mut c = path_str.chars();
+                match c.next() {
+                    None => Err(PathError::InvalidDriveLetter),
+                    Some(_) => {
+                        let drive_index = drive_letter as usize - 'A' as usize;
+                        let normalized_pwd = drive_letter.to_string() + c.as_str();
+                        self.map[drive_index] = Some(normalized_pwd);
+                        Ok(())
+                    }
+                }
+            } else {
+                Err(PathError::InvalidDriveLetter)
+            }
+        } else {
+            Err(PathError::InvalidPath)
+        }
+    }
+
+    /// Get the PWD for drive, if not yet, ask GetFullPathNameW() or omnipath,
+    /// or else return default r"X:\".
+    fn get_pwd(&self, drive_letter: char) -> Result<String, PathError> {
+        if drive_letter.is_ascii_alphabetic() {
+            let drive_letter = drive_letter.to_ascii_uppercase();
+            let drive_index = drive_letter as usize - 'A' as usize;
+            Ok(self.map[drive_index].clone().unwrap_or_else(|| {
+                if let Some(sys_pwd) = get_full_path_name_w(&format!("{}:", drive_letter)) {
+                    sys_pwd
+                } else {
+                    format!(r"{}:\", drive_letter)
+                }
+            }))
+        } else {
+            Err(PathError::InvalidDriveLetter)
+        }
+    }
+
+    /// Expand a relative path using the PWD-per-drive, return PathBuf
+    /// of absolute path.
+    /// Return None if path is not valid or can't get drive letter.
+    pub fn expand_pwd(&self, path: &Path) -> Option<PathBuf> {
+        if need_expand(path) {
+            let path_str = path.to_str()?;
+            if let Some(drive_letter) = Self::extract_drive_letter(path) {
+                if let Ok(pwd) = self.get_pwd(drive_letter) {
+                    // Combine current PWD with the relative path
+                    let mut base = PathBuf::from(Self::ensure_trailing_delimiter(&pwd));
+                    // need_expand() and extract_drive_letter() all ensure path_str.len() >= 2
+                    base.push(&path_str[2..]); // Join PWD with path parts after "C:"
+                    return Some(base);
+                }
+            }
+        }
+        None // Invalid path or has no drive letter
+    }
+
+    /// Helper to extract the drive letter from a path, keep case
+    ///  (e.g., `C:test` -> `C`, `d:\temp` -> `d`)
+    fn extract_drive_letter(path: &Path) -> Option<char> {
+        path.to_str()
+            .and_then(|s| s.chars().next())
+            .filter(|c| c.is_ascii_alphabetic())
+    }
+
+    /// Ensure a path has a trailing `\\` or '/'
+    fn ensure_trailing_delimiter(path: &str) -> String {
+        if !path.ends_with('\\') && !path.ends_with('/') {
+            format!(r"{}\", path)
+        } else {
+            path.to_string()
+        }
+    }
+}
+
+fn get_full_path_name_w(path_str: &str) -> Option<String> {
+    use omnipath::sys_absolute;
+    if let Ok(path_sys_abs) = sys_absolute(Path::new(path_str)) {
+        Some(path_sys_abs.to_str()?.to_string())
+    } else {
+        None
+    }
+}
+
+/// Test for Drive2PWD map
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// Test or demo usage of PWD-per-drive
+    /// In doctest, there's no get_full_path_name_w available so can't foresee
+    /// possible result, here can have more accurate test assert
+    #[test]
+    fn test_usage_for_pwd_per_drive() {
+        let mut map = DriveToPwdMap::new();
+
+        // Set PWD for drive E
+        assert!(map.set_pwd(Path::new(r"E:\Users\Home")).is_ok());
+
+        // Expand a relative path
+        let expanded = map.expand_pwd(Path::new("e:test"));
+        assert_eq!(expanded, Some(PathBuf::from(r"E:\Users\Home\test")));
+
+        // Will NOT expand an absolute path
+        let expanded = map.expand_pwd(Path::new(r"E:\absolute\path"));
+        assert_eq!(expanded, None);
+
+        // Expand with no drive letter
+        let expanded = map.expand_pwd(Path::new(r"\no_drive"));
+        assert_eq!(expanded, None);
+
+        // Expand with no PWD set for the drive
+        let expanded = map.expand_pwd(Path::new("F:test"));
+        if let Some(sys_abs) = get_full_path_name_w("F:") {
+            assert_eq!(
+                expanded,
+                Some(PathBuf::from(format!(
+                    "{}test",
+                    DriveToPwdMap::ensure_trailing_delimiter(&sys_abs)
+                )))
+            );
+        } else {
+            assert_eq!(expanded, Some(PathBuf::from(r"F:\test")));
+        }
+    }
+
+    #[test]
+    fn test_get_env_vars() {
+        let mut map = DriveToPwdMap::new();
+        map.set_pwd(Path::new(r"I:\Home")).unwrap();
+        map.set_pwd(Path::new(r"j:\User")).unwrap();
+
+        let mut env = HashMap::<String, String>::new();
+        map.get_env_vars(&mut env);
+        assert_eq!(
+            env.get(&DriveToPwdMap::env_var_for_drive('I')).unwrap(),
+            r"I:\Home"
+        );
+        assert_eq!(
+            env.get(&DriveToPwdMap::env_var_for_drive('J')).unwrap(),
+            r"J:\User"
+        );
+    }
+
+    #[test]
+    fn test_expand_pwd() {
+        let mut drive_map = DriveToPwdMap::new();
+
+        // Set PWD for drive 'M:'
+        assert_eq!(drive_map.set_pwd(Path::new(r"M:\Users")), Ok(()));
+        // or 'm:'
+        assert_eq!(drive_map.set_pwd(Path::new(r"m:\Users\Home")), Ok(()));
+
+        // Expand a relative path on "M:"
+        let expanded = drive_map.expand_pwd(Path::new(r"M:test"));
+        assert_eq!(expanded, Some(PathBuf::from(r"M:\Users\Home\test")));
+        // or on "m:"
+        let expanded = drive_map.expand_pwd(Path::new(r"m:test"));
+        assert_eq!(expanded, Some(PathBuf::from(r"M:\Users\Home\test")));
+
+        // Expand an absolute path
+        let expanded = drive_map.expand_pwd(Path::new(r"m:\absolute\path"));
+        assert_eq!(expanded, None);
+
+        // Expand with no drive letter
+        let expanded = drive_map.expand_pwd(Path::new(r"\no_drive"));
+        assert_eq!(expanded, None);
+
+        // Expand with no PWD set for the drive
+        let expanded = drive_map.expand_pwd(Path::new("N:test"));
+        if let Some(pwd_on_drive) = get_full_path_name_w("N:") {
+            assert_eq!(
+                expanded,
+                Some(PathBuf::from(format!(
+                    r"{}test",
+                    DriveToPwdMap::ensure_trailing_delimiter(&pwd_on_drive)
+                )))
+            );
+        } else {
+            assert_eq!(expanded, Some(PathBuf::from(r"N:\test")));
+        }
+    }
+
+    #[test]
+    fn test_set_and_get_pwd() {
+        let mut drive_map = DriveToPwdMap::new();
+
+        // Set PWD for drive 'O'
+        assert!(drive_map.set_pwd(Path::new(r"O:\Users")).is_ok());
+        // Or for drive 'o'
+        assert!(drive_map.set_pwd(Path::new(r"o:\Users\Example")).is_ok());
+        // Get PWD for drive 'O'
+        assert_eq!(drive_map.get_pwd('O'), Ok(r"O:\Users\Example".to_string()));
+        // or 'o'
+        assert_eq!(drive_map.get_pwd('o'), Ok(r"O:\Users\Example".to_string()));
+
+        // Get PWD for drive P (not set yet, but system might already
+        // have PWD on this drive)
+        if let Some(pwd_on_drive) = get_full_path_name_w("P:") {
+            assert_eq!(drive_map.get_pwd('P'), Ok(pwd_on_drive));
+        } else {
+            assert_eq!(drive_map.get_pwd('P'), Ok(r"P:\".to_string()));
+        }
+    }
+
+    #[test]
+    fn test_set_pwd_invalid_path() {
+        let mut drive_map = DriveToPwdMap::new();
+
+        // Invalid path (no drive letter)
+        let result = drive_map.set_pwd(Path::new(r"\InvalidPath"));
+        assert!(result.is_err());
+        assert_eq!(result.unwrap_err(), PathError::InvalidPath);
+    }
+
+    #[test]
+    fn test_get_pwd_invalid_drive() {
+        let drive_map = DriveToPwdMap::new();
+
+        // Get PWD for a drive not set (e.g., Z)
+        assert_eq!(drive_map.get_pwd('Z'), Ok(r"Z:\".to_string()));
+
+        // Invalid drive letter (non-alphabetic)
+        assert_eq!(drive_map.get_pwd('1'), Err(PathError::InvalidDriveLetter));
+    }
+}
diff --git a/crates/nu-protocol/src/engine/stack.rs b/crates/nu-protocol/src/engine/stack.rs
index ddd1169513..ba14e67817 100644
--- a/crates/nu-protocol/src/engine/stack.rs
+++ b/crates/nu-protocol/src/engine/stack.rs
@@ -8,6 +8,7 @@ use crate::{
 use std::{
     collections::{HashMap, HashSet},
     fs::File,
+    path::{Path, PathBuf},
     sync::Arc,
 };
 
@@ -52,6 +53,8 @@ pub struct Stack {
     /// Locally updated config. Use [`.get_config()`](Self::get_config) to access correctly.
     pub config: Option<Arc<Config>>,
     pub(crate) out_dest: StackOutDest,
+    #[cfg(windows)]
+    pub pwd_per_drive: nu_path::DriveToPwdMap,
 }
 
 impl Default for Stack {
@@ -81,6 +84,8 @@ impl Stack {
             parent_deletions: vec![],
             config: None,
             out_dest: StackOutDest::new(),
+            #[cfg(windows)]
+            pwd_per_drive: nu_path::DriveToPwdMap::new(),
         }
     }
 
@@ -101,6 +106,8 @@ impl Stack {
             parent_deletions: vec![],
             config: parent.config.clone(),
             out_dest: parent.out_dest.clone(),
+            #[cfg(windows)]
+            pwd_per_drive: parent.pwd_per_drive.clone(),
             parent_stack: Some(parent),
         }
     }
@@ -127,6 +134,10 @@ impl Stack {
         unique_stack.env_hidden = child.env_hidden;
         unique_stack.active_overlays = child.active_overlays;
         unique_stack.config = child.config;
+        #[cfg(windows)]
+        {
+            unique_stack.pwd_per_drive = child.pwd_per_drive.clone();
+        }
         unique_stack
     }
 
@@ -318,6 +329,8 @@ impl Stack {
             parent_deletions: vec![],
             config: self.config.clone(),
             out_dest: self.out_dest.clone(),
+            #[cfg(windows)]
+            pwd_per_drive: self.pwd_per_drive.clone(),
         }
     }
 
@@ -351,6 +364,8 @@ impl Stack {
             parent_deletions: vec![],
             config: self.config.clone(),
             out_dest: self.out_dest.clone(),
+            #[cfg(windows)]
+            pwd_per_drive: self.pwd_per_drive.clone(),
         }
     }
 
@@ -726,9 +741,29 @@ impl Stack {
             let path = nu_path::strip_trailing_slash(path);
             let value = Value::string(path.to_string_lossy(), Span::unknown());
             self.add_env_var("PWD".into(), value);
+            // Sync with PWD-per-drive
+            #[cfg(windows)]
+            {
+                let _ = self.pwd_per_drive.set_pwd(&path);
+            }
             Ok(())
         }
     }
+
+    // Helper stub/proxy for nu_path::expand_path_with::<P, Q>(path, relative_to, expand_tilde)
+    // Facilitates file system commands to easily gain the ability to expand PWD-per-drive
+    pub fn expand_path_with<P, Q>(&self, path: P, relative_to: Q, expand_tilde: bool) -> PathBuf
+    where
+        P: AsRef<Path>,
+        Q: AsRef<Path>,
+    {
+        #[cfg(windows)]
+        if let Some(absolute_path) = self.pwd_per_drive.expand_pwd(path.as_ref()) {
+            return absolute_path;
+        }
+
+        nu_path::expand_path_with::<P, Q>(path, relative_to, expand_tilde)
+    }
 }
 
 #[cfg(test)]
diff --git a/src/run.rs b/src/run.rs
index 89bad3866f..eb2a9b2e98 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -12,6 +12,30 @@ use nu_protocol::{
 };
 use nu_utils::perf;
 
+#[cfg(windows)]
+fn init_pwd_per_drive(engine_state: &EngineState, stack: &mut Stack) {
+    use nu_path::DriveToPwdMap;
+    use std::path::Path;
+
+    // Read environment for PWD-per-drive
+    for drive_letter in 'A'..='Z' {
+        let env_var = DriveToPwdMap::env_var_for_drive(drive_letter);
+        if let Some(env_pwd) = engine_state.get_env_var(&env_var) {
+            if let Ok(pwd_str) = nu_engine::env_to_string(&env_var, env_pwd, engine_state, stack) {
+                trace!("Get Env({}) {}", env_var, pwd_str);
+                let _ = stack.pwd_per_drive.set_pwd(Path::new(&pwd_str));
+                stack.remove_env_var(engine_state, &env_var);
+            }
+        }
+    }
+
+    if let Ok(abs_pwd) = engine_state.cwd(None) {
+        if let Some(abs_pwd_str) = abs_pwd.to_str() {
+            let _ = stack.pwd_per_drive.set_pwd(Path::new(abs_pwd_str));
+        }
+    }
+}
+
 pub(crate) fn run_commands(
     engine_state: &mut EngineState,
     parsed_nu_cli_args: command::NushellCliArgs,
@@ -26,6 +50,8 @@ pub(crate) fn run_commands(
     let create_scaffold = nu_path::nu_config_dir().map_or(false, |p| !p.exists());
 
     let mut stack = Stack::new();
+    #[cfg(windows)]
+    init_pwd_per_drive(engine_state, &mut stack);
 
     // if the --no-config-file(-n) option is NOT passed, load the plugin file,
     // load the default env file or custom (depending on parsed_nu_cli_args.env_file),
@@ -115,6 +141,8 @@ pub(crate) fn run_file(
 ) {
     trace!("run_file");
     let mut stack = Stack::new();
+    #[cfg(windows)]
+    init_pwd_per_drive(engine_state, &mut stack);
 
     // if the --no-config-file(-n) option is NOT passed, load the plugin file,
     // load the default env file or custom (depending on parsed_nu_cli_args.env_file),
@@ -182,6 +210,9 @@ pub(crate) fn run_repl(
 ) -> Result<(), miette::ErrReport> {
     trace!("run_repl");
     let mut stack = Stack::new();
+    #[cfg(windows)]
+    init_pwd_per_drive(engine_state, &mut stack);
+
     let start_time = std::time::Instant::now();
 
     if parsed_nu_cli_args.no_config_file.is_none() {

From a70e77ba483c103bb01b3cad6f2a9d5966ec015a Mon Sep 17 00:00:00 2001
From: Ben Beasley <code@musicinmybrain.net>
Date: Mon, 2 Dec 2024 15:20:19 -0500
Subject: [PATCH 0749/1072] Update procfs and which dependencies to their
 latest releases (#14489)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description


This simply updates `procfs` from 0.16.0 to 0.17.0 and `which` from 6.0
to 7.0 – in each case, to the latest release – with no code changes
required.



# Notes

The release notes for `procfs` 0.17.0 are at
https://github.com/eminence/procfs/releases/tag/v0.17.0.

The release notes for `which` 7.0.0 are at
https://github.com/harryfei/which-rs/releases/tag/7.0.0.
---
 Cargo.lock | 17 ++++++++---------
 Cargo.toml |  4 ++--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5e93f72a58..6f10da93e9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2647,7 +2647,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -5196,24 +5196,23 @@ dependencies = [
 
 [[package]]
 name = "procfs"
-version = "0.16.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4"
+checksum = "cc5b72d8145275d844d4b5f6d4e1eef00c8cd889edb6035c21675d1bb1f45c9f"
 dependencies = [
  "bitflags 2.6.0",
  "chrono",
  "flate2",
  "hex",
- "lazy_static",
  "procfs-core",
  "rustix",
 ]
 
 [[package]]
 name = "procfs-core"
-version = "0.16.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29"
+checksum = "239df02d8349b06fc07398a3a1697b06418223b1c7725085e801e7c0fc6a12ec"
 dependencies = [
  "bitflags 2.6.0",
  "chrono",
@@ -7830,9 +7829,9 @@ dependencies = [
 
 [[package]]
 name = "which"
-version = "6.0.3"
+version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f"
+checksum = "c9cad3279ade7346b96e38731a641d7343dd6a53d55083dd54eadfa5a1b38c6b"
 dependencies = [
  "either",
  "home",
@@ -7877,7 +7876,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index dd29f8b107..896fed28b2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -127,7 +127,7 @@ pretty_assertions = "1.4"
 print-positions = "0.6"
 proc-macro-error = { version = "1.0", default-features = false }
 proc-macro2 = "1.0"
-procfs = "0.16.0"
+procfs = "0.17.0"
 pwd = "1.3"
 quick-xml = "0.37.0"
 quickcheck = "1.0"
@@ -178,7 +178,7 @@ uucore = "0.0.28"
 uuid = "1.11.0"
 v_htmlescape = "0.15.0"
 wax = "0.6"
-which = "6.0.0"
+which = "7.0.0"
 windows = "0.56"
 windows-sys = "0.48"
 winreg = "0.52"

From c63bb81c3e6af38e4b528aac7eb6d491f0132758 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Tue, 3 Dec 2024 04:08:41 -0800
Subject: [PATCH 0750/1072] Convert Filesize to Int (#14491)

# Description
Fixes the conversion of Value::Filesize to Value::Int allowing things
like `ps | polars into-df` to work correctly.
---
 .../values/nu_dataframe/conversion.rs         | 46 ++++++++++++-------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
index 77457dee0c..7d5a4ace3f 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
@@ -34,28 +34,28 @@ const VALUES_CAPACITY: usize = 10;
 
 macro_rules! value_to_primitive {
     ($value:ident, u8) => {
-        $value.as_int().map(|v| v as u8)
+        value_to_int($value).map(|v| v as u8)
     };
     ($value:ident, u16) => {
-        $value.as_int().map(|v| v as u16)
+        value_to_int($value).map(|v| v as u16)
     };
     ($value:ident, u32) => {
-        $value.as_int().map(|v| v as u32)
+        value_to_int($value).map(|v| v as u32)
     };
     ($value:ident, u64) => {
-        $value.as_int().map(|v| v as u64)
+        value_to_int($value).map(|v| v as u64)
     };
     ($value:ident, i8) => {
-        $value.as_int().map(|v| v as i8)
+        value_to_int($value).map(|v| v as i8)
     };
     ($value:ident, i16) => {
-        $value.as_int().map(|v| v as i16)
+        value_to_int($value).map(|v| v as i16)
     };
     ($value:ident, i32) => {
-        $value.as_int().map(|v| v as i32)
+        value_to_int($value).map(|v| v as i32)
     };
     ($value:ident, i64) => {
-        $value.as_int()
+        value_to_int($value)
     };
     ($value:ident, f32) => {
         $value.as_float().map(|v| v as f32)
@@ -341,7 +341,7 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
                 let series_values: Result<Vec<_>, _> = column
                     .values
                     .iter()
-                    .map(|v| value_to_option(v, |v| v.as_int().map(|v| v as u8)))
+                    .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as u8)))
                     .collect();
                 Ok(Series::new(name, series_values?))
             }
@@ -349,7 +349,7 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
                 let series_values: Result<Vec<_>, _> = column
                     .values
                     .iter()
-                    .map(|v| value_to_option(v, |v| v.as_int().map(|v| v as u16)))
+                    .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as u16)))
                     .collect();
                 Ok(Series::new(name, series_values?))
             }
@@ -357,7 +357,7 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
                 let series_values: Result<Vec<_>, _> = column
                     .values
                     .iter()
-                    .map(|v| value_to_option(v, |v| v.as_int().map(|v| v as u32)))
+                    .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as u32)))
                     .collect();
                 Ok(Series::new(name, series_values?))
             }
@@ -365,7 +365,7 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
                 let series_values: Result<Vec<_>, _> = column
                     .values
                     .iter()
-                    .map(|v| value_to_option(v, |v| v.as_int().map(|v| v as u64)))
+                    .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as u64)))
                     .collect();
                 Ok(Series::new(name, series_values?))
             }
@@ -373,7 +373,7 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
                 let series_values: Result<Vec<_>, _> = column
                     .values
                     .iter()
-                    .map(|v| value_to_option(v, |v| v.as_int().map(|v| v as i8)))
+                    .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as i8)))
                     .collect();
                 Ok(Series::new(name, series_values?))
             }
@@ -381,7 +381,7 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
                 let series_values: Result<Vec<_>, _> = column
                     .values
                     .iter()
-                    .map(|v| value_to_option(v, |v| v.as_int().map(|v| v as i16)))
+                    .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as i16)))
                     .collect();
                 Ok(Series::new(name, series_values?))
             }
@@ -389,7 +389,7 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
                 let series_values: Result<Vec<_>, _> = column
                     .values
                     .iter()
-                    .map(|v| value_to_option(v, |v| v.as_int().map(|v| v as i32)))
+                    .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as i32)))
                     .collect();
                 Ok(Series::new(name, series_values?))
             }
@@ -397,7 +397,7 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
                 let series_values: Result<Vec<_>, _> = column
                     .values
                     .iter()
-                    .map(|v| value_to_option(v, |v| v.as_int()))
+                    .map(|v| value_to_option(v, value_to_int))
                     .collect();
                 Ok(Series::new(name, series_values?))
             }
@@ -1364,6 +1364,20 @@ fn time_from_midnight(nanos: i64, span: Span) -> Result<Value, ShellError> {
         })
 }
 
+// this takes into non-int types that we should represent as int like filesize
+fn value_to_int(value: &Value) -> Result<i64, ShellError> {
+    match value {
+        Value::Int { val, .. } => Ok(*val),
+        Value::Filesize { val, .. } => Ok((*val).into()),
+        _ => Err(ShellError::CantConvert {
+            to_type: "int".into(),
+            from_type: value.get_type().to_string(),
+            span: value.span(),
+            help: None,
+        }),
+    }
+}
+
 fn value_to_option<T, F>(value: &Value, func: F) -> Result<Option<T>, ShellError>
 where
     F: FnOnce(&Value) -> Result<T, ShellError>,

From a65a7df209300ed1ac6eac359d2aed795508b60a Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Tue, 3 Dec 2024 16:59:37 +0100
Subject: [PATCH 0751/1072] Add `remove` as a search term on `drop` commands
 (#14493)

# Description
Better discoverability of `drop` subcommands
"I want to remove items by index" -> `drop nth`
h/t @amtoine

# User-Facing Changes
More search terms
---
 crates/nu-command/src/filters/drop/column.rs | 2 +-
 crates/nu-command/src/filters/drop/drop_.rs  | 2 +-
 crates/nu-command/src/filters/drop/nth.rs    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/nu-command/src/filters/drop/column.rs b/crates/nu-command/src/filters/drop/column.rs
index f39e0e2276..b69a15b2d7 100644
--- a/crates/nu-command/src/filters/drop/column.rs
+++ b/crates/nu-command/src/filters/drop/column.rs
@@ -29,7 +29,7 @@ impl Command for DropColumn {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["delete"]
+        vec!["delete", "remove"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/filters/drop/drop_.rs b/crates/nu-command/src/filters/drop/drop_.rs
index 67abea625d..d35e191a19 100644
--- a/crates/nu-command/src/filters/drop/drop_.rs
+++ b/crates/nu-command/src/filters/drop/drop_.rs
@@ -26,7 +26,7 @@ impl Command for Drop {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["delete"]
+        vec!["delete", "remove"]
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/filters/drop/nth.rs b/crates/nu-command/src/filters/drop/nth.rs
index d2aed50332..282aa41c1d 100644
--- a/crates/nu-command/src/filters/drop/nth.rs
+++ b/crates/nu-command/src/filters/drop/nth.rs
@@ -32,7 +32,7 @@ impl Command for DropNth {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["delete"]
+        vec!["delete", "remove", "index"]
     }
 
     fn examples(&self) -> Vec<Example> {

From 424efdaafe69300f2e320746ddb55b00e6abeeb4 Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Tue, 3 Dec 2024 16:21:09 -0500
Subject: [PATCH 0752/1072] Make `glob` stream (#14495)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

Makes the `glob` command stream

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

The glob command now streams

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
N/A
---
 crates/nu-command/src/filesystem/glob.rs | 34 +++++++++++++-----------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/crates/nu-command/src/filesystem/glob.rs b/crates/nu-command/src/filesystem/glob.rs
index 1f475efbac..4a293e82fe 100644
--- a/crates/nu-command/src/filesystem/glob.rs
+++ b/crates/nu-command/src/filesystem/glob.rs
@@ -1,5 +1,5 @@
 use nu_engine::command_prelude::*;
-use nu_protocol::Signals;
+use nu_protocol::{ListStream, Signals};
 use wax::{Glob as WaxGlob, WalkBehavior, WalkEntry};
 
 #[derive(Clone)]
@@ -223,6 +223,7 @@ impl Command for Glob {
                         ..Default::default()
                     },
                 )
+                .into_owned()
                 .not(np)
                 .map_err(|err| ShellError::GenericError {
                     error: "error with glob's not pattern".into(),
@@ -249,6 +250,7 @@ impl Command for Glob {
                         ..Default::default()
                     },
                 )
+                .into_owned()
                 .flatten();
             glob_to_value(
                 engine_state.signals(),
@@ -258,11 +260,9 @@ impl Command for Glob {
                 no_symlinks,
                 span,
             )
-        }?;
+        };
 
-        Ok(result
-            .into_iter()
-            .into_pipeline_data(span, engine_state.signals().clone()))
+        Ok(result.into_pipeline_data(span, engine_state.signals().clone()))
     }
 }
 
@@ -281,29 +281,33 @@ fn convert_patterns(columns: &[Value]) -> Result<Vec<String>, ShellError> {
     Ok(res)
 }
 
-fn glob_to_value<'a>(
+fn glob_to_value(
     signals: &Signals,
-    glob_results: impl Iterator<Item = WalkEntry<'a>>,
+    glob_results: impl Iterator<Item = WalkEntry<'static>> + Send + 'static,
     no_dirs: bool,
     no_files: bool,
     no_symlinks: bool,
     span: Span,
-) -> Result<Vec<Value>, ShellError> {
-    let mut result: Vec<Value> = Vec::new();
-    for entry in glob_results {
-        signals.check(span)?;
+) -> ListStream {
+    let map_signals = signals.clone();
+    let result = glob_results.filter_map(move |entry| {
+        if let Err(err) = map_signals.check(span) {
+            return Some(Value::error(err, span));
+        };
         let file_type = entry.file_type();
 
         if !(no_dirs && file_type.is_dir()
             || no_files && file_type.is_file()
             || no_symlinks && file_type.is_symlink())
         {
-            result.push(Value::string(
+            Some(Value::string(
                 entry.into_path().to_string_lossy().to_string(),
                 span,
-            ));
+            ))
+        } else {
+            None
         }
-    }
+    });
 
-    Ok(result)
+    ListStream::new(result, span, signals.clone())
 }

From da66484578a452e78f7a8b5fa6e07cdbdd918480 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Dec 2024 09:37:19 +0800
Subject: [PATCH 0753/1072] Bump crate-ci/typos from 1.28.1 to 1.28.2 (#14503)

Bumps [crate-ci/typos](https://github.com/crate-ci/typos) from 1.28.1 to
1.28.2.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/crate-ci/typos/releases">crate-ci/typos's
releases</a>.</em></p>
<blockquote>
<h2>v1.28.2</h2>
<h2>[1.28.2] - 2024-12-02</h2>
<h3>Fixes</h3>
<ul>
<li>Don't correct <code>parametrize</code> variants</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/crate-ci/typos/blob/master/CHANGELOG.md">crate-ci/typos's
changelog</a>.</em></p>
<blockquote>
<h2>[1.28.2] - 2024-12-02</h2>
<h3>Fixes</h3>
<ul>
<li>Don't correct <code>parametrize</code> variants</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/crate-ci/typos/commit/2872c382bb9668d4baa5eade234dcbc0048ca2cf"><code>2872c38</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/6af7c259ed6423e916fe86e6ea1846007b22ef41"><code>6af7c25</code></a>
docs: Update changelog</li>
<li><a
href="https://github.com/crate-ci/typos/commit/2d9a242c9f881743719c9f6554400cf56a7a1939"><code>2d9a242</code></a>
Merge pull request <a
href="https://redirect.github.com/crate-ci/typos/issues/1165">#1165</a>
from epage/fix</li>
<li><a
href="https://github.com/crate-ci/typos/commit/97bbab80c87e70d8bd9d6b6f45725c5193612f15"><code>97bbab8</code></a>
fix(dict): Don't correct parametrized</li>
<li><a
href="https://github.com/crate-ci/typos/commit/679c99cf66e999ec06128737a9c7dc6987d465e1"><code>679c99c</code></a>
test(dict): Consistenty filter out unverified entries</li>
<li>See full diff in <a
href="https://github.com/crate-ci/typos/compare/v1.28.1...v1.28.2">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=crate-ci/typos&package-manager=github_actions&previous-version=1.28.1&new-version=1.28.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/typos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index d21926517e..3d649176db 100644
--- 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.28.1
+        uses: crate-ci/typos@v1.28.2

From 08504f6e0695a538902017923bad9b63410e26a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Dec 2024 09:37:47 +0800
Subject: [PATCH 0754/1072] Bump bytes from 1.8.0 to 1.9.0 (#14508)

Bumps [bytes](https://github.com/tokio-rs/bytes) from 1.8.0 to 1.9.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/tokio-rs/bytes/releases">bytes's
releases</a>.</em></p>
<blockquote>
<h2>Bytes v1.9.0</h2>
<h1>1.9.0 (November 27, 2024)</h1>
<h3>Added</h3>
<ul>
<li>Add <code>Bytes::from_owner</code> to enable externally-allocated
memory (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/742">#742</a>)</li>
</ul>
<h3>Documented</h3>
<ul>
<li>Fix typo in Buf::chunk() comment (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/744">#744</a>)</li>
</ul>
<h3>Internal changes</h3>
<ul>
<li>Replace BufMut::put with BufMut::put_slice in Writer impl (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/745">#745</a>)</li>
<li>Rename hex_impl! to fmt_impl! and reuse it for fmt::Debug (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/743">#743</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/tokio-rs/bytes/blob/master/CHANGELOG.md">bytes's
changelog</a>.</em></p>
<blockquote>
<h1>1.9.0 (November 27, 2024)</h1>
<h3>Added</h3>
<ul>
<li>Add <code>Bytes::from_owner</code> to enable externally-allocated
memory (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/742">#742</a>)</li>
</ul>
<h3>Documented</h3>
<ul>
<li>Fix typo in Buf::chunk() comment (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/744">#744</a>)</li>
</ul>
<h3>Internal changes</h3>
<ul>
<li>Replace BufMut::put with BufMut::put_slice in Writer impl (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/745">#745</a>)</li>
<li>Rename hex_impl! to fmt_impl! and reuse it for fmt::Debug (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/743">#743</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/tokio-rs/bytes/commit/d0a14deeb5d94839f101a02cc650a3a14949305b"><code>d0a14de</code></a>
chore: prepare bytes v1.9.0 (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/748">#748</a>)</li>
<li><a
href="https://github.com/tokio-rs/bytes/commit/54f1c26f694bb24220a846958d6e414e9298cda9"><code>54f1c26</code></a>
Rename hex_impl! to fmt_impl! and reuse it for fmt::Debug (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/743">#743</a>)</li>
<li><a
href="https://github.com/tokio-rs/bytes/commit/4cd8969e850d0a66b181c388ead281c37d360621"><code>4cd8969</code></a>
Replace <code>BufMut::put</code> with <code>BufMut::put_slice</code> in
Writer impl (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/745">#745</a>)</li>
<li><a
href="https://github.com/tokio-rs/bytes/commit/2d996a2b419ad1a29d65ba6c7e82cfe9c733595c"><code>2d996a2</code></a>
Fix typo in <code>Buf::chunk()</code> comment (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/744">#744</a>)</li>
<li><a
href="https://github.com/tokio-rs/bytes/commit/30ee8e9cba87c6d31774c100d2c9fd67ff2ad94c"><code>30ee8e9</code></a>
Add <code>Bytes::from_owner</code> (<a
href="https://redirect.github.com/tokio-rs/bytes/issues/742">#742</a>)</li>
<li>See full diff in <a
href="https://github.com/tokio-rs/bytes/compare/v1.8.0...v1.9.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=bytes&package-manager=cargo&previous-version=1.8.0&new-version=1.9.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6f10da93e9..074ee0439a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -594,9 +594,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
+checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
 
 [[package]]
 name = "bytesize"

From a980b9d0a63d7c1828ff82367b5b9191380526e4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Dec 2024 09:37:52 +0800
Subject: [PATCH 0755/1072] Bump ureq from 2.10.1 to 2.12.0 (#14507)

Bumps [ureq](https://github.com/algesten/ureq) from 2.10.1 to 2.12.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/algesten/ureq/blob/main/CHANGELOG.md">ureq's
changelog</a>.</em></p>
<blockquote>
<h1>2.12.0</h1>
<ul>
<li>Bump MSRV 1.67 -&gt; 1.71 because rustls will soon adopt it (<a
href="https://redirect.github.com/algesten/ureq/issues/905">#905</a>)</li>
<li>Unpin rustls dep (&gt;=0.23.19) (<a
href="https://redirect.github.com/algesten/ureq/issues/905">#905</a>)</li>
</ul>
<h1>2.11.0</h1>
<ul>
<li>Fixes for changes to cargo-deny (<a
href="https://redirect.github.com/algesten/ureq/issues/882">#882</a>)</li>
<li>Pin rustls dep on 0.23.19 to keep MSRV 1.67 (<a
href="https://redirect.github.com/algesten/ureq/issues/878">#878</a>)</li>
<li>Bump MSRV 1.63 -&gt; 1.67 due to time crate (<a
href="https://redirect.github.com/algesten/ureq/issues/878">#878</a>)</li>
<li>Re-export rustls (<a
href="https://redirect.github.com/algesten/ureq/issues/813">#813</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/algesten/ureq/commit/3d6048e5b0ba002eee43a5eb8d5f982c1301e8b8"><code>3d6048e</code></a>
2.12.0</li>
<li><a
href="https://github.com/algesten/ureq/commit/3e09aea94806f289e4c2244059c56be30d64d2c1"><code>3e09aea</code></a>
Fix http crate confusion</li>
<li><a
href="https://github.com/algesten/ureq/commit/cd6a0849bb7ffdca3707eec5038fa05b87b74bee"><code>cd6a084</code></a>
Github CI only run 1.71</li>
<li><a
href="https://github.com/algesten/ureq/commit/dfab2607d66687c2fdef39cadcb9912f846cdd5d"><code>dfab260</code></a>
Update readme</li>
<li><a
href="https://github.com/algesten/ureq/commit/af2143be89b54f2d42440e45f22fa983926e0056"><code>af2143b</code></a>
Update changelog</li>
<li><a
href="https://github.com/algesten/ureq/commit/feea74b3435247a6521fdfe95a84080c8480bff0"><code>feea74b</code></a>
Unpin rustls and bump MSRV to 1.71</li>
<li><a
href="https://github.com/algesten/ureq/commit/937b1da3114f07258aeaba129f8fd0f2bf6a73eb"><code>937b1da</code></a>
Update changelog</li>
<li><a
href="https://github.com/algesten/ureq/commit/a44804833c38ac710a081ea85b8ba7c3976b5386"><code>a448048</code></a>
Note in readme about MSRV</li>
<li><a
href="https://github.com/algesten/ureq/commit/24686d08298f1cb7731cee20b716a5066f7c4029"><code>24686d0</code></a>
2.11.0</li>
<li><a
href="https://github.com/algesten/ureq/commit/10869e22c0a925453dea4afd9c718606fe2dfb11"><code>10869e2</code></a>
Fix incorrect feature flags</li>
<li>Additional commits viewable in <a
href="https://github.com/algesten/ureq/compare/2.10.1...2.12.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=ureq&package-manager=cargo&previous-version=2.10.1&new-version=2.12.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 074ee0439a..ca0f0b66f3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7331,9 +7331,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "ureq"
-version = "2.10.1"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a"
+checksum = "3193f92e105038f98ae68af40c008e3c94f2f046926e0f95e6c835dc6459bac8"
 dependencies = [
  "base64",
  "encoding_rs",
diff --git a/Cargo.toml b/Cargo.toml
index 896fed28b2..57cd11a202 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -165,7 +165,7 @@ trash = "5.2"
 umask = "2.1"
 unicode-segmentation = "1.12"
 unicode-width = "0.2"
-ureq = { version = "2.10", default-features = false }
+ureq = { version = "2.12", default-features = false }
 url = "2.2"
 uu_cp = "0.0.28"
 uu_mkdir = "0.0.28"

From 5f0567f8dfe187b6de7b5bcd337820cb57f3c37e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Dec 2024 09:38:27 +0800
Subject: [PATCH 0756/1072] Bump multipart-rs from 0.1.11 to 0.1.13 (#14506)

Bumps [multipart-rs](https://github.com/feliwir/multipart-rs) from
0.1.11 to 0.1.13.
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a
href="https://github.com/feliwir/multipart-rs/commits">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=multipart-rs&package-manager=cargo&previous-version=0.1.11&new-version=0.1.13)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ca0f0b66f3..cb04cc9c8e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3040,9 +3040,9 @@ dependencies = [
 
 [[package]]
 name = "multipart-rs"
-version = "0.1.11"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ea34e5c0fa65ba84707cfaf5bf43d500f1c5a4c6c36327bf5541c5bcd17e98"
+checksum = "64cae00e7e52aa5072342ef9a2ccd71669be913c2176a81a665b1f9cd79345f2"
 dependencies = [
  "bytes",
  "futures-core",
diff --git a/Cargo.toml b/Cargo.toml
index 57cd11a202..a6c25a439a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -110,7 +110,7 @@ miette = "7.3"
 mime = "0.3.17"
 mime_guess = "2.0"
 mockito = { version = "1.6", default-features = false }
-multipart-rs = "0.1.11"
+multipart-rs = "0.1.13"
 native-tls = "0.2"
 nix = { version = "0.29", default-features = false }
 notify-debouncer-full = { version = "0.3", default-features = false }

From 88a8e986eb1272e974a3337146710ce9e57b778c Mon Sep 17 00:00:00 2001
From: Michel Lind <salimma@fedoraproject.org>
Date: Tue, 3 Dec 2024 17:40:23 -0800
Subject: [PATCH 0757/1072] Bump titlecase dependency (#14502)

# Description

v3 drops the dependency on joinery, as well as on lazy_static. The MSRV
is bumped to 1.70.0 but that is still way below what nushell requires.

# User-Facing Changes

N/A

# Tests + Formatting

All tests pass (including nu-command which is the direct user)

# After Submitting

N/A

Signed-off-by: Michel Lind <salimma@fedoraproject.org>
---
 Cargo.lock | 12 ++----------
 Cargo.toml |  2 +-
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cb04cc9c8e..47edc2b3bf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2548,12 +2548,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "joinery"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72167d68f5fce3b8655487b8038691a3c9984ee769590f93f2a631f4ad64e4f5"
-
 [[package]]
 name = "js-sys"
 version = "0.3.72"
@@ -6992,12 +6986,10 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "titlecase"
-version = "2.2.1"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38397a8cdb017cfeb48bf6c154d6de975ac69ffeed35980fde199d2ee0842042"
+checksum = "e0e20e744fbec1913fa168f3ffbef64324bbcb152c6cda8394baa79fa5ec9142"
 dependencies = [
- "joinery",
- "lazy_static",
  "regex",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index a6c25a439a..608d035420 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -159,7 +159,7 @@ sysinfo = "0.32"
 tabled = { version = "0.16.0", default-features = false }
 tempfile = "3.14"
 terminal_size = "0.4"
-titlecase = "2.0"
+titlecase = "3.0"
 toml = "0.8"
 trash = "5.2"
 umask = "2.1"

From bf457cd4fca27deb05ef78f29cb9f37b1f4fbb3b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Dec 2024 09:57:05 +0800
Subject: [PATCH 0758/1072] Bump indexmap from 2.6.0 to 2.7.0 (#14505)

Bumps [indexmap](https://github.com/indexmap-rs/indexmap) from 2.6.0 to
2.7.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/indexmap-rs/indexmap/blob/master/RELEASES.md">indexmap's
changelog</a>.</em></p>
<blockquote>
<h2>2.7.0 (2024-11-30)</h2>
<ul>
<li>Added methods <code>Entry::insert_entry</code> and
<code>VacantEntry::insert_entry</code>, returning
an <code>OccupiedEntry</code> after insertion.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/539b40115139a0394a3b84386c133810655051d2"><code>539b401</code></a>
Merge pull request <a
href="https://redirect.github.com/indexmap-rs/indexmap/issues/361">#361</a>
from cuviper/insert_entry</li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/998edb12fea0744828fd553a00d474b441f711bf"><code>998edb1</code></a>
Release 2.7.0</li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/2a0ca974171768d3bfb388e1f7963bed0078c7c6"><code>2a0ca97</code></a>
Add <code>{Entry,VacantEntry}::insert_entry</code></li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/dceb0f059864129e4bc10dca1a1110eee334c2bf"><code>dceb0f0</code></a>
Merge pull request <a
href="https://redirect.github.com/indexmap-rs/indexmap/issues/360">#360</a>
from cuviper/collect_vec_list</li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/c095322249f85d36d46c2a8d4808f3e1c70ddb08"><code>c095322</code></a>
ci: downgrade hashbrown for 1.63</li>
<li><a
href="https://github.com/indexmap-rs/indexmap/commit/7d8cef8b4bd8f9295de4fd53317946a543b2b089"><code>7d8cef8</code></a>
Use rayon-1.9.0's <code>collect_vec_list</code></li>
<li>See full diff in <a
href="https://github.com/indexmap-rs/indexmap/compare/2.6.0...2.7.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=indexmap&package-manager=cargo&previous-version=2.6.0&new-version=2.7.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                         | 4 ++--
 Cargo.toml                         | 2 +-
 crates/nu_plugin_polars/Cargo.toml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 47edc2b3bf..f10b9897e9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2370,9 +2370,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
  "equivalent",
  "hashbrown 0.15.1",
diff --git a/Cargo.toml b/Cargo.toml
index 608d035420..591947a2b3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -92,7 +92,7 @@ filetime = "0.2"
 fuzzy-matcher = "0.3"
 heck = "0.5.0"
 human-date-parser = "0.2.0"
-indexmap = "2.6"
+indexmap = "2.7"
 indicatif = "0.17"
 interprocess = "2.2.0"
 is_executable = "1.0"
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index a4f639ca13..f2d64f839a 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -26,7 +26,7 @@ nu-utils = { path = "../nu-utils", version = "0.100.1" }
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
 chrono-tz = "0.10"
 fancy-regex = { workspace = true }
-indexmap = { version = "2.6" }
+indexmap = { version = "2.7" }
 mimalloc = { version = "0.1.42" }
 num = {version = "0.4"}
 serde = { version = "1.0", features = ["derive"] }

From 217be249637f45049141a22325a5ade9980a1340 Mon Sep 17 00:00:00 2001
From: RobbingDaHood <16130319+RobbingDaHood@users.noreply.github.com>
Date: Wed, 4 Dec 2024 03:39:11 +0100
Subject: [PATCH 0759/1072] #14238 Now the file completion is triggered on a
 custom command after the first parameter. (#14481)

- this PR should close #14238

# Description
Solved as described here (First suggestion):
https://github.com/nushell/nushell/issues/14238#issuecomment-2506387012

Below I make the example from the issue, it shows that the completion
now works past the first parameter.
```
~/Projects/nushell> def list [...args] {                                                                                                  11/30/2024 03:21:24 PM
:::     $args
:::     | each {
:::         open $args
:::     }
::: }
~/Projects/nushell> cd tests/fixtures/completions/                                                                                        11/30/2024 03:25:24 PM
~/Projects/nushell/tests/fixtures/completions| list custom_completion.nu                                                                  11/30/2024 03:25:35 PM
another/               custom_completion.nu   directory_completion/  nushell
test_a/                test_b/                .hidden_file           .hidden_folder/
```

# User-Facing Changes
The changes introduced to completions in
`baadaee0163a5066ae73509ff6052962b3422673` now does not return if it did
not find "Operator completions".

This could have impact on more than just custom commands, but it could
be seemed as making everything a bit more robust.

# Tests + Formatting
I ran all of:
- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

# After Submitting
I do not think there is any need to update [the
documentation](https://github.com/nushell/nushell.github.io), right?

---------

Co-authored-by: Daniel Winther Petersen <daniel.winther.petersen@subaio.com>
---
 crates/nu-cli/src/completions/completer.rs |   5 +-
 crates/nu-cli/tests/completions/mod.rs     | 102 +++++++++++++++++++++
 2 files changed, 106 insertions(+), 1 deletion(-)

diff --git a/crates/nu-cli/src/completions/completer.rs b/crates/nu-cli/src/completions/completer.rs
index 555d14ff27..16b1673a4f 100644
--- a/crates/nu-cli/src/completions/completer.rs
+++ b/crates/nu-cli/src/completions/completer.rs
@@ -297,7 +297,7 @@ impl NuCompleter {
                                     let mut completer =
                                         OperatorCompletion::new(pipeline_element.expr.clone());
 
-                                    return self.process_completion(
+                                    let operator_suggestion = self.process_completion(
                                         &mut completer,
                                         &working_set,
                                         prefix,
@@ -305,6 +305,9 @@ impl NuCompleter {
                                         fake_offset,
                                         pos,
                                     );
+                                    if !operator_suggestion.is_empty() {
+                                        return operator_suggestion;
+                                    }
                                 }
                             }
                         }
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index 7f6fe30430..78c36cad7e 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -357,6 +357,39 @@ fn file_completions() {
     // Match the results
     match_suggestions(&expected_paths, &suggestions);
 
+    // Test completions for the current folder even with parts before the autocomplet
+    let target_dir = format!("cp somefile.txt {dir_str}{MAIN_SEPARATOR}");
+    let suggestions = completer.complete(&target_dir, target_dir.len());
+
+    // Create the expected values
+    let expected_paths: Vec<String> = vec![
+        folder(dir.join("another")),
+        file(dir.join("custom_completion.nu")),
+        folder(dir.join("directory_completion")),
+        file(dir.join("nushell")),
+        folder(dir.join("test_a")),
+        folder(dir.join("test_b")),
+        file(dir.join(".hidden_file")),
+        folder(dir.join(".hidden_folder")),
+    ];
+
+    #[cfg(windows)]
+    {
+        let separator = '/';
+        let target_dir = format!("cp somefile.txt {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);
+
     // Test completions for a file
     let target_dir = format!("cp {}", folder(dir.join("another")));
     let suggestions = completer.complete(&target_dir, target_dir.len());
@@ -391,6 +424,75 @@ fn file_completions() {
     match_suggestions(&expected_paths, &suggestions);
 }
 
+#[test]
+fn custom_command_rest_any_args_file_completions() {
+    // Create a new engine
+    let (dir, dir_str, mut engine, mut stack) = new_engine();
+    let command = r#"def list [ ...args: any ] {}"#;
+    assert!(support::merge_input(command.as_bytes(), &mut engine, &mut stack).is_ok());
+
+    // Instantiate a new completer
+    let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
+
+    // Test completions for the current folder
+    let target_dir = format!("list {dir_str}{MAIN_SEPARATOR}");
+    let suggestions = completer.complete(&target_dir, target_dir.len());
+
+    // Create the expected values
+    let expected_paths: Vec<String> = vec![
+        folder(dir.join("another")),
+        file(dir.join("custom_completion.nu")),
+        folder(dir.join("directory_completion")),
+        file(dir.join("nushell")),
+        folder(dir.join("test_a")),
+        folder(dir.join("test_b")),
+        file(dir.join(".hidden_file")),
+        folder(dir.join(".hidden_folder")),
+    ];
+
+    // Match the results
+    match_suggestions(&expected_paths, &suggestions);
+
+    // Test completions for the current folder even with parts before the autocomplet
+    let target_dir = format!("list somefile.txt {dir_str}{MAIN_SEPARATOR}");
+    let suggestions = completer.complete(&target_dir, target_dir.len());
+
+    // Create the expected values
+    let expected_paths: Vec<String> = vec![
+        folder(dir.join("another")),
+        file(dir.join("custom_completion.nu")),
+        folder(dir.join("directory_completion")),
+        file(dir.join("nushell")),
+        folder(dir.join("test_a")),
+        folder(dir.join("test_b")),
+        file(dir.join(".hidden_file")),
+        folder(dir.join(".hidden_folder")),
+    ];
+
+    // Match the results
+    match_suggestions(&expected_paths, &suggestions);
+
+    // Test completions for a file
+    let target_dir = format!("list {}", folder(dir.join("another")));
+    let suggestions = completer.complete(&target_dir, target_dir.len());
+
+    // Create the expected values
+    let expected_paths: Vec<String> = vec![file(dir.join("another").join("newfile"))];
+
+    // Match the results
+    match_suggestions(&expected_paths, &suggestions);
+
+    // Test completions for hidden files
+    let target_dir = format!("list {}", file(dir.join(".hidden_folder").join(".")));
+    let suggestions = completer.complete(&target_dir, target_dir.len());
+
+    let expected_paths: Vec<String> =
+        vec![file(dir.join(".hidden_folder").join(".hidden_subfile"))];
+
+    // Match the results
+    match_suggestions(&expected_paths, &suggestions);
+}
+
 #[cfg(windows)]
 #[test]
 fn file_completions_with_mixed_separators() {

From b2d8bd08f876ea6ad5d263547e4e090fdc57407a Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Tue, 3 Dec 2024 20:45:31 -0600
Subject: [PATCH 0760/1072] allow `select` to stream more (#14492)

# Description

closes https://github.com/nushell/nushell/issues/14487

This PR tries to allow the `select` to stream better by changing the for
loops that collected the output into a `Vec<Value>` prior to returning
it into a map that returns the data as it is processed.

One curiosity, `select` transforms the input into a `PipelineIterator`.
If I remove this code, it still passes all tests. I'm not sure all this
`PipelineIterator` code is even needed. I left it for someone to tell me
if it's necessary.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/filters/select.rs    | 91 ++++++++++------------
 crates/nu-command/tests/commands/select.rs |  3 +-
 2 files changed, 42 insertions(+), 52 deletions(-)

diff --git a/crates/nu-command/src/filters/select.rs b/crates/nu-command/src/filters/select.rs
index 71a2389c79..f630f19df8 100644
--- a/crates/nu-command/src/filters/select.rs
+++ b/crates/nu-command/src/filters/select.rs
@@ -206,7 +206,6 @@ fn select(
     let columns = new_columns;
 
     let input = if !unique_rows.is_empty() {
-        // let skip = call.has_flag(engine_state, stack, "skip")?;
         let metadata = input.metadata();
         let pipeline_iter: PipelineIterator = input.into_iter();
 
@@ -231,37 +230,31 @@ fn select(
                 Value::List {
                     vals: input_vals, ..
                 } => {
-                    let mut output = vec![];
-                    let mut columns_with_value = Vec::new();
-                    for input_val in input_vals {
-                        if !columns.is_empty() {
-                            let mut record = Record::new();
-                            for path in &columns {
-                                //FIXME: improve implementation to not clone
-                                match input_val.clone().follow_cell_path(&path.members, false) {
-                                    Ok(fetcher) => {
-                                        record.push(path.to_column_name(), fetcher);
-                                        if !columns_with_value.contains(&path) {
-                                            columns_with_value.push(path);
+                    Ok(input_vals
+                        .into_iter()
+                        .map(move |input_val| {
+                            if !columns.is_empty() {
+                                let mut record = Record::new();
+                                for path in &columns {
+                                    //FIXME: improve implementation to not clone
+                                    match input_val.clone().follow_cell_path(&path.members, false) {
+                                        Ok(fetcher) => {
+                                            record.push(path.to_column_name(), fetcher);
                                         }
-                                    }
-                                    Err(e) => {
-                                        return Err(e);
+                                        Err(e) => return Value::error(e, call_span),
                                     }
                                 }
+
+                                Value::record(record, span)
+                            } else {
+                                input_val.clone()
                             }
-
-                            output.push(Value::record(record, span))
-                        } else {
-                            output.push(input_val)
-                        }
-                    }
-
-                    Ok(output.into_iter().into_pipeline_data_with_metadata(
-                        call_span,
-                        engine_state.signals().clone(),
-                        metadata,
-                    ))
+                        })
+                        .into_pipeline_data_with_metadata(
+                            call_span,
+                            engine_state.signals().clone(),
+                            metadata,
+                        ))
                 }
                 _ => {
                     if !columns.is_empty() {
@@ -286,31 +279,29 @@ fn select(
             }
         }
         PipelineData::ListStream(stream, metadata, ..) => {
-            let mut values = vec![];
-
-            for x in stream {
-                if !columns.is_empty() {
-                    let mut record = Record::new();
-                    for path in &columns {
-                        //FIXME: improve implementation to not clone
-                        match x.clone().follow_cell_path(&path.members, false) {
-                            Ok(value) => {
-                                record.push(path.to_column_name(), value);
+            Ok(stream
+                .map(move |x| {
+                    if !columns.is_empty() {
+                        let mut record = Record::new();
+                        for path in &columns {
+                            //FIXME: improve implementation to not clone
+                            match x.clone().follow_cell_path(&path.members, false) {
+                                Ok(value) => {
+                                    record.push(path.to_column_name(), value);
+                                }
+                                Err(e) => return Value::error(e, call_span),
                             }
-                            Err(e) => return Err(e),
                         }
+                        Value::record(record, call_span)
+                    } else {
+                        x
                     }
-                    values.push(Value::record(record, call_span));
-                } else {
-                    values.push(x);
-                }
-            }
-
-            Ok(values.into_pipeline_data_with_metadata(
-                call_span,
-                engine_state.signals().clone(),
-                metadata,
-            ))
+                })
+                .into_pipeline_data_with_metadata(
+                    call_span,
+                    engine_state.signals().clone(),
+                    metadata,
+                ))
         }
         _ => Ok(PipelineData::empty()),
     }
diff --git a/crates/nu-command/tests/commands/select.rs b/crates/nu-command/tests/commands/select.rs
index 004aa16d6b..534943767f 100644
--- a/crates/nu-command/tests/commands/select.rs
+++ b/crates/nu-command/tests/commands/select.rs
@@ -63,7 +63,7 @@ fn complex_nested_columns() {
 fn fails_if_given_unknown_column_name() {
     let actual = nu!(pipeline(
         r#"
-            echo [
+            [
                 [first_name, last_name, rusty_at, type];
 
                 [Andrés Robalino '10/11/2013' A]
@@ -71,7 +71,6 @@ fn fails_if_given_unknown_column_name() {
                 [Yehuda Katz '10/11/2013' A]
             ]
             | select rrusty_at first_name
-            | length
         "#
     ));
 

From a3327122755c00ae9384320e519a1257b91d424f Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Tue, 3 Dec 2024 20:47:58 -0600
Subject: [PATCH 0761/1072] add function to make env vars case-insensitive
 (#14390)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

This PR adds a new function that allows one to get an env var
case-insensitively. I did this so we can hopefully stop having problems
when Windows has HKLM as path and HKCU as Path.

Instead of just changing every function that used the original one, I
chose the ones that I thought were specific to getting the path. I
didn't want to go all in and make every env get case insensitive, but
maybe we should? 🤷🏻‍♂️

closes #12676

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 .../src/completions/command_completions.rs    |  3 +-
 crates/nu-cli/tests/completions/mod.rs        | 10 -----
 crates/nu-engine/src/env.rs                   | 45 ++++++-------------
 crates/nu-plugin-engine/src/context.rs        |  2 +-
 crates/nu-protocol/src/engine/engine_state.rs | 15 ++-----
 crates/nu-protocol/src/engine/stack.rs        | 35 +++++++++++++++
 crates/nu-protocol/tests/test_value.rs        | 29 +++++++++++-
 7 files changed, 83 insertions(+), 56 deletions(-)

diff --git a/crates/nu-cli/src/completions/command_completions.rs b/crates/nu-cli/src/completions/command_completions.rs
index b12df4735a..ce4383483a 100644
--- a/crates/nu-cli/src/completions/command_completions.rs
+++ b/crates/nu-cli/src/completions/command_completions.rs
@@ -41,8 +41,7 @@ impl CommandCompletion {
     ) -> HashMap<String, SemanticSuggestion> {
         let mut suggs = HashMap::new();
 
-        // os agnostic way to get the PATH env var
-        let paths = working_set.permanent_state.get_path_env_var();
+        let paths = working_set.permanent_state.get_env_var_insensitive("path");
 
         if let Some(paths) = paths {
             if let Ok(paths) = paths.as_list() {
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index 78c36cad7e..e32ac8c4f2 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -1759,13 +1759,3 @@ fn alias_offset_bug_7754() {
     // This crashes before PR #7756
     let _suggestions = completer.complete("ll -a | c", 9);
 }
-
-#[test]
-fn get_path_env_var_8003() {
-    // Create a new engine
-    let (_, _, engine, _) = new_engine();
-    // Get the path env var in a platform agnostic way
-    let the_path = engine.get_path_env_var();
-    // Make sure it's not empty
-    assert!(the_path.is_some());
-}
diff --git a/crates/nu-engine/src/env.rs b/crates/nu-engine/src/env.rs
index f7aa3cf2e1..dc6c354fce 100644
--- a/crates/nu-engine/src/env.rs
+++ b/crates/nu-engine/src/env.rs
@@ -11,13 +11,6 @@ use std::{
     sync::Arc,
 };
 
-#[cfg(windows)]
-const ENV_PATH_NAME: &str = "Path";
-#[cfg(windows)]
-const ENV_PATH_NAME_SECONDARY: &str = "PATH";
-#[cfg(not(windows))]
-const ENV_PATH_NAME: &str = "PATH";
-
 const ENV_CONVERSIONS: &str = "ENV_CONVERSIONS";
 
 enum ConversionResult {
@@ -53,14 +46,14 @@ pub fn convert_env_values(engine_state: &mut EngineState, stack: &Stack) -> Resu
 
     #[cfg(not(windows))]
     {
-        error = error.or_else(|| ensure_path(&mut new_scope, ENV_PATH_NAME));
+        error = error.or_else(|| ensure_path(&mut new_scope, "PATH"));
     }
 
     #[cfg(windows)]
     {
-        let first_result = ensure_path(&mut new_scope, ENV_PATH_NAME);
+        let first_result = ensure_path(&mut new_scope, "Path");
         if first_result.is_some() {
-            let second_result = ensure_path(&mut new_scope, ENV_PATH_NAME_SECONDARY);
+            let second_result = ensure_path(&mut new_scope, "PATH");
 
             if second_result.is_some() {
                 error = error.or(first_result);
@@ -107,7 +100,7 @@ pub fn env_to_string(
         ConversionResult::CellPathError => match value.coerce_string() {
             Ok(s) => Ok(s),
             Err(_) => {
-                if env_name == ENV_PATH_NAME {
+                if env_name.to_lowercase() == "path" {
                     // Try to convert PATH/Path list to a string
                     match value {
                         Value::List { vals, .. } => {
@@ -216,31 +209,21 @@ pub fn current_dir_const(working_set: &StateWorkingSet) -> Result<PathBuf, Shell
 }
 
 /// Get the contents of path environment variable as a list of strings
-///
-/// On non-Windows: It will fetch PATH
-/// On Windows: It will try to fetch Path first but if not present, try PATH
 pub fn path_str(
     engine_state: &EngineState,
     stack: &Stack,
     span: Span,
 ) -> Result<String, ShellError> {
-    let (pathname, pathval) = match stack.get_env_var(engine_state, ENV_PATH_NAME) {
-        Some(v) => Ok((ENV_PATH_NAME, v)),
-        None => {
-            #[cfg(windows)]
-            match stack.get_env_var(engine_state, ENV_PATH_NAME_SECONDARY) {
-                Some(v) => Ok((ENV_PATH_NAME_SECONDARY, v)),
-                None => Err(ShellError::EnvVarNotFoundAtRuntime {
-                    envvar_name: ENV_PATH_NAME_SECONDARY.to_string(),
-                    span,
-                }),
-            }
-            #[cfg(not(windows))]
-            Err(ShellError::EnvVarNotFoundAtRuntime {
-                envvar_name: ENV_PATH_NAME.to_string(),
-                span,
-            })
-        }
+    let (pathname, pathval) = match stack.get_env_var_insensitive(engine_state, "path") {
+        Some(v) => Ok((if cfg!(windows) { "Path" } else { "PATH" }, v)),
+        None => Err(ShellError::EnvVarNotFoundAtRuntime {
+            envvar_name: if cfg!(windows) {
+                "Path".to_string()
+            } else {
+                "PATH".to_string()
+            },
+            span,
+        }),
     }?;
 
     env_to_string(pathname, pathval, engine_state, stack)
diff --git a/crates/nu-plugin-engine/src/context.rs b/crates/nu-plugin-engine/src/context.rs
index 4c262fd3ed..5652cf1a5f 100644
--- a/crates/nu-plugin-engine/src/context.rs
+++ b/crates/nu-plugin-engine/src/context.rs
@@ -126,7 +126,7 @@ impl<'a> PluginExecutionContext for PluginExecutionCommandContext<'a> {
     }
 
     fn get_env_var(&self, name: &str) -> Result<Option<&Value>, ShellError> {
-        Ok(self.stack.get_env_var(&self.engine_state, name))
+        Ok(self.stack.get_env_var_insensitive(&self.engine_state, name))
     }
 
     fn get_env_vars(&self) -> Result<HashMap<String, Value>, ShellError> {
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index 626033f915..716cb03ca9 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -14,6 +14,7 @@ use crate::{
 use fancy_regex::Regex;
 use lru::LruCache;
 use nu_path::AbsolutePathBuf;
+use nu_utils::IgnoreCaseExt;
 use std::{
     collections::HashMap,
     num::NonZeroUsize,
@@ -465,20 +466,12 @@ impl EngineState {
         None
     }
 
-    // Get the path environment variable in a platform agnostic way
-    pub fn get_path_env_var(&self) -> Option<&Value> {
-        let env_path_name_windows: &str = "Path";
-        let env_path_name_nix: &str = "PATH";
-
+    pub fn get_env_var_insensitive(&self, name: &str) -> Option<&Value> {
         for overlay_id in self.scope.active_overlays.iter().rev() {
             let overlay_name = String::from_utf8_lossy(self.get_overlay_name(*overlay_id));
             if let Some(env_vars) = self.env_vars.get(overlay_name.as_ref()) {
-                if let Some(val) = env_vars.get(env_path_name_nix) {
-                    return Some(val);
-                } else if let Some(val) = env_vars.get(env_path_name_windows) {
-                    return Some(val);
-                } else {
-                    return None;
+                if let Some(v) = env_vars.iter().find(|(k, _)| k.eq_ignore_case(name)) {
+                    return Some(v.1);
                 }
             }
         }
diff --git a/crates/nu-protocol/src/engine/stack.rs b/crates/nu-protocol/src/engine/stack.rs
index ba14e67817..66f59b78f6 100644
--- a/crates/nu-protocol/src/engine/stack.rs
+++ b/crates/nu-protocol/src/engine/stack.rs
@@ -5,6 +5,7 @@ use crate::{
     },
     Config, IntoValue, OutDest, ShellError, Span, Value, VarId, ENV_VARIABLE_ID, NU_VARIABLE_ID,
 };
+use nu_utils::IgnoreCaseExt;
 use std::{
     collections::{HashMap, HashSet},
     fs::File,
@@ -494,6 +495,40 @@ impl Stack {
         None
     }
 
+    // Case-Insensitive version of get_env_var
+    pub fn get_env_var_insensitive<'a>(
+        &'a self,
+        engine_state: &'a EngineState,
+        name: &str,
+    ) -> Option<&'a Value> {
+        for scope in self.env_vars.iter().rev() {
+            for active_overlay in self.active_overlays.iter().rev() {
+                if let Some(env_vars) = scope.get(active_overlay) {
+                    if let Some(v) = env_vars.iter().find(|(k, _)| k.eq_ignore_case(name)) {
+                        return Some(v.1);
+                    }
+                }
+            }
+        }
+
+        for active_overlay in self.active_overlays.iter().rev() {
+            let is_hidden = if let Some(env_hidden) = self.env_hidden.get(active_overlay) {
+                env_hidden.iter().any(|k| k.eq_ignore_case(name))
+            } else {
+                false
+            };
+
+            if !is_hidden {
+                if let Some(env_vars) = engine_state.env_vars.get(active_overlay) {
+                    if let Some(v) = env_vars.iter().find(|(k, _)| k.eq_ignore_case(name)) {
+                        return Some(v.1);
+                    }
+                }
+            }
+        }
+        None
+    }
+
     pub fn has_env_var(&self, engine_state: &EngineState, name: &str) -> bool {
         for scope in self.env_vars.iter().rev() {
             for active_overlay in self.active_overlays.iter().rev() {
diff --git a/crates/nu-protocol/tests/test_value.rs b/crates/nu-protocol/tests/test_value.rs
index 376bd81f1f..fb26bea0e2 100644
--- a/crates/nu-protocol/tests/test_value.rs
+++ b/crates/nu-protocol/tests/test_value.rs
@@ -1,4 +1,7 @@
-use nu_protocol::{Config, Span, Value};
+use nu_protocol::{
+    engine::{EngineState, Stack},
+    Config, Span, Value,
+};
 use rstest::rstest;
 
 #[test]
@@ -46,3 +49,27 @@ fn test_duration_to_string(#[case] in_ns: i64, #[case] expected: &str) {
         "expected != observed"
     );
 }
+
+#[test]
+fn test_case_insensitive_env_var() {
+    let mut engine_state = EngineState::new();
+    let stack = Stack::new();
+
+    for (name, value) in std::env::vars() {
+        engine_state.add_env_var(name, Value::test_string(value));
+    }
+
+    let path_lower = engine_state.get_env_var_insensitive("path");
+    let path_upper = engine_state.get_env_var_insensitive("PATH");
+    let path_mixed = engine_state.get_env_var_insensitive("PaTh");
+
+    assert_eq!(path_lower, path_upper);
+    assert_eq!(path_lower, path_mixed);
+
+    let stack_path_lower = stack.get_env_var_insensitive(&engine_state, "path");
+    let stack_path_upper = stack.get_env_var_insensitive(&engine_state, "PATH");
+    let stack_path_mixed = stack.get_env_var_insensitive(&engine_state, "PaTh");
+
+    assert_eq!(stack_path_lower, stack_path_upper);
+    assert_eq!(stack_path_lower, stack_path_mixed);
+}

From 05b7c1fffa24d91328414aa09d3560d01be01753 Mon Sep 17 00:00:00 2001
From: Ben Beasley <code@musicinmybrain.net>
Date: Wed, 4 Dec 2024 15:39:45 -0500
Subject: [PATCH 0762/1072] Update roxmltree from 0.19 to 0.20, the latest
 version (#14513)

# Description


This simply updates `roxmltree` from 0.19.0 to 0.20.0, the latest
release, with no code changes required.

# User-Facing Changes


N/A
---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f10b9897e9..54acf0f4c2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5830,9 +5830,9 @@ dependencies = [
 
 [[package]]
 name = "roxmltree"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f"
+checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
 
 [[package]]
 name = "rstest"
diff --git a/Cargo.toml b/Cargo.toml
index 591947a2b3..97bc58c0bd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -143,7 +143,7 @@ regex = "1.9.5"
 rmp = "0.8"
 rmp-serde = "1.3"
 ropey = "1.6.1"
-roxmltree = "0.19"
+roxmltree = "0.20"
 rstest = { version = "0.23", default-features = false }
 rusqlite = "0.31"
 rust-embed = "8.5.0"

From 3bd45c005beaa0e006bea0b5e8975b421a6f7342 Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Wed, 4 Dec 2024 20:26:48 -0500
Subject: [PATCH 0763/1072] Change tests which may invoke externals to use
 non-conflicting names (#14516)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description

Fixes #14515
Also tweaks the fix from #11261 _just in case_ someone has a `foo`
executable


# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
N/A

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/tests/commands/use_.rs |  6 +++---
 tests/overlays/mod.rs                    | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/crates/nu-command/tests/commands/use_.rs b/crates/nu-command/tests/commands/use_.rs
index 2822be83c7..cb5f262e72 100644
--- a/crates/nu-command/tests/commands/use_.rs
+++ b/crates/nu-command/tests/commands/use_.rs
@@ -284,9 +284,9 @@ fn use_main_def_known_external() {
 #[test]
 fn use_main_not_exported() {
     let inp = &[
-        r#"module spam { def main [] { "spam" } }"#,
-        r#"use spam"#,
-        r#"spam"#,
+        r#"module my-super-cool-and-unique-module-name { def main [] { "hi" } }"#,
+        r#"use my-super-cool-and-unique-module-name"#,
+        r#"my-super-cool-and-unique-module-name"#,
     ];
 
     let actual = nu!(&inp.join("; "));
diff --git a/tests/overlays/mod.rs b/tests/overlays/mod.rs
index 15697f467d..a04f44641b 100644
--- a/tests/overlays/mod.rs
+++ b/tests/overlays/mod.rs
@@ -807,10 +807,10 @@ fn overlay_can_add_renamed_overlay() {
 #[test]
 fn overlay_hide_renamed_overlay() {
     let inp = &[
-        r#"module spam { export def foo [] { "foo" } }"#,
+        r#"module spam { export def foo-command-which-does-not-conflict [] { "foo" } }"#,
         "overlay use spam as eggs",
         "overlay hide eggs",
-        "foo",
+        "foo-command-which-does-not-conflict",
     ];
 
     let actual = nu!(&inp.join("; "));
@@ -1243,9 +1243,9 @@ fn overlay_use_main_def_known_external() {
 #[test]
 fn overlay_use_main_not_exported() {
     let inp = &[
-        r#"module foo { def main [] { "foo" } }"#,
-        "overlay use foo",
-        "foo",
+        r#"module my-super-cool-and-unique-module-name { def main [] { "hi" } }"#,
+        "overlay use my-super-cool-and-unique-module-name",
+        "my-super-cool-and-unique-module-name",
     ];
 
     let actual = nu!(&inp.join("; "));
@@ -1257,11 +1257,11 @@ fn overlay_use_main_not_exported() {
 fn alias_overlay_hide() {
     let inp = &[
         "overlay new spam",
-        "def foo [] { 'foo' }",
+        "def my-epic-command-name [] { 'foo' }",
         "overlay new eggs",
         "alias oh = overlay hide",
         "oh spam",
-        "foo",
+        "my-epic-command-name",
     ];
 
     let actual = nu!(&inp.join("; "));

From 234484b6f87b2716f7b0a7d17d0fbddba9d7889d Mon Sep 17 00:00:00 2001
From: Solomon <git@solomonvictorino.com>
Date: Thu, 5 Dec 2024 06:35:15 -0700
Subject: [PATCH 0764/1072] normalize special characters in module names to
 allow variable access (#14353)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #14252

# User-Facing Changes

- Special characters in module names are replaced with underscores when
  importing constants, preventing "expected valid variable name":

```nushell
> module foo-bar { export const baz = 1 }
> use foo-bar
> $foo_bar.baz
```

- "expected valid variable name" errors now include a suggestion list:

```nushell
> module foo-bar { export const baz = 1 }
> use foo-bar
> $foo-bar
Error: nu::parser::parse_mismatch_with_did_you_mean

  × Parse mismatch during operation.
   ╭─[entry #1:1:1]
 1 │ $foo-bar;
   · ────┬───
   ·     ╰── expected valid variable name. Did you mean '$foo_bar'?
   ╰────
```
---
 crates/nu-parser/src/parser.rs               | 32 ++++++++++----------
 crates/nu-protocol/src/errors/parse_error.rs |  5 +++
 crates/nu-protocol/src/module.rs             | 31 ++++++++++++++++++-
 tests/repl/test_modules.rs                   | 23 ++++++++++++++
 4 files changed, 74 insertions(+), 17 deletions(-)

diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 0f8e699729..eecd7863a9 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -2122,7 +2122,21 @@ pub fn parse_variable_expr(working_set: &mut StateWorkingSet, span: Span) -> Exp
         String::from_utf8_lossy(contents).to_string()
     };
 
-    if let Some(id) = parse_variable(working_set, span) {
+    let bytes = working_set.get_span_contents(span);
+    let suggestion = || {
+        DidYouMean::new(
+            &working_set.list_variables(),
+            working_set.get_span_contents(span),
+        )
+    };
+    if !is_variable(bytes) {
+        working_set.error(ParseError::ExpectedWithDidYouMean(
+            "valid variable name",
+            suggestion(),
+            span,
+        ));
+        garbage(working_set, span)
+    } else if let Some(id) = working_set.find_variable(bytes) {
         Expression::new(
             working_set,
             Expr::Var(id),
@@ -2133,9 +2147,7 @@ pub fn parse_variable_expr(working_set: &mut StateWorkingSet, span: Span) -> Exp
         working_set.error(ParseError::EnvVarNotVar(name, span));
         garbage(working_set, span)
     } else {
-        let ws = &*working_set;
-        let suggestion = DidYouMean::new(&ws.list_variables(), ws.get_span_contents(span));
-        working_set.error(ParseError::VariableNotFound(suggestion, span));
+        working_set.error(ParseError::VariableNotFound(suggestion(), span));
         garbage(working_set, span)
     }
 }
@@ -5612,18 +5624,6 @@ pub fn parse_expression(working_set: &mut StateWorkingSet, spans: &[Span]) -> Ex
     }
 }
 
-pub fn parse_variable(working_set: &mut StateWorkingSet, span: Span) -> Option<VarId> {
-    let bytes = working_set.get_span_contents(span);
-
-    if is_variable(bytes) {
-        working_set.find_variable(bytes)
-    } else {
-        working_set.error(ParseError::Expected("valid variable name", span));
-
-        None
-    }
-}
-
 pub fn parse_builtin_commands(
     working_set: &mut StateWorkingSet,
     lite_command: &LiteCommand,
diff --git a/crates/nu-protocol/src/errors/parse_error.rs b/crates/nu-protocol/src/errors/parse_error.rs
index 786ce97509..f7de9f4890 100644
--- a/crates/nu-protocol/src/errors/parse_error.rs
+++ b/crates/nu-protocol/src/errors/parse_error.rs
@@ -55,6 +55,10 @@ pub enum ParseError {
     #[diagnostic(code(nu::parser::parse_mismatch_with_full_string_msg))]
     ExpectedWithStringMsg(String, #[label("expected {0}")] Span),
 
+    #[error("Parse mismatch during operation.")]
+    #[diagnostic(code(nu::parser::parse_mismatch_with_did_you_mean))]
+    ExpectedWithDidYouMean(&'static str, DidYouMean, #[label("expected {0}. {1}")] Span),
+
     #[error("Command does not support {0} input.")]
     #[diagnostic(code(nu::parser::input_type_mismatch))]
     InputMismatch(Type, #[label("command doesn't support {0} input")] Span),
@@ -551,6 +555,7 @@ impl ParseError {
             ParseError::Unbalanced(_, _, s) => *s,
             ParseError::Expected(_, s) => *s,
             ParseError::ExpectedWithStringMsg(_, s) => *s,
+            ParseError::ExpectedWithDidYouMean(_, _, s) => *s,
             ParseError::Mismatch(_, _, s) => *s,
             ParseError::UnsupportedOperationLHS(_, _, s, _) => *s,
             ParseError::UnsupportedOperationRHS(_, _, _, _, s, _) => *s,
diff --git a/crates/nu-protocol/src/module.rs b/crates/nu-protocol/src/module.rs
index 02bac131dc..0b1a371864 100644
--- a/crates/nu-protocol/src/module.rs
+++ b/crates/nu-protocol/src/module.rs
@@ -167,7 +167,7 @@ impl Module {
                 vec![]
             } else {
                 vec![(
-                    final_name.clone(),
+                    normalize_module_name(&final_name),
                     Value::record(
                         const_rows
                             .into_iter()
@@ -425,3 +425,32 @@ impl Module {
         result
     }
 }
+
+/// normalize module names for exporting as record constant
+fn normalize_module_name(bytes: &[u8]) -> Vec<u8> {
+    bytes
+        .iter()
+        .map(|x| match is_identifier_byte(*x) {
+            true => *x,
+            false => b'_',
+        })
+        .collect()
+}
+
+fn is_identifier_byte(b: u8) -> bool {
+    b != b'.'
+        && b != b'['
+        && b != b'('
+        && b != b'{'
+        && b != b'+'
+        && b != b'-'
+        && b != b'*'
+        && b != b'^'
+        && b != b'/'
+        && b != b'='
+        && b != b'!'
+        && b != b'<'
+        && b != b'>'
+        && b != b'&'
+        && b != b'|'
+}
diff --git a/tests/repl/test_modules.rs b/tests/repl/test_modules.rs
index c2fc6b8dc2..d088d4ea30 100644
--- a/tests/repl/test_modules.rs
+++ b/tests/repl/test_modules.rs
@@ -1,4 +1,5 @@
 use crate::repl::tests::{fail_test, run_test, TestResult};
+use rstest::rstest;
 
 #[test]
 fn module_def_imports_1() -> TestResult {
@@ -145,6 +146,28 @@ fn export_module_which_defined_const() -> TestResult {
     )
 }
 
+#[rstest]
+#[case("spam-mod")]
+#[case("spam/mod")]
+#[case("spam=mod")]
+fn export_module_with_normalized_var_name(#[case] name: &str) -> TestResult {
+    let def = format!(
+        "module {name} {{ export const b = 3; export module {name}2 {{ export const c = 4 }}  }}"
+    );
+    run_test(&format!("{def}; use {name}; $spam_mod.b"), "3")?;
+    run_test(&format!("{def}; use {name} *; $spam_mod2.c"), "4")
+}
+
+#[rstest]
+#[case("spam-mod")]
+#[case("spam/mod")]
+fn use_module_with_invalid_var_name(#[case] name: &str) -> TestResult {
+    fail_test(
+        &format!("module {name} {{ export const b = 3 }}; use {name}; ${name}"),
+        "expected valid variable name. Did you mean '$spam_mod'",
+    )
+}
+
 #[test]
 fn cannot_export_private_const() -> TestResult {
     fail_test(

From d97562f6e844254610349dfa2daf3cf18470b083 Mon Sep 17 00:00:00 2001
From: Antoine Stevan <44101798+amtoine@users.noreply.github.com>
Date: Thu, 5 Dec 2024 14:53:33 +0100
Subject: [PATCH 0765/1072] fix multiline strings in NDNUON (#14519)

- should close https://github.com/nushell/nushell/issues/14517

# Description
this will change `to ndnuon` so that newlines are encoded as a literal
`\n` which `from ndnuon` is already able to handle

# User-Facing Changes
users should be able to encode multiline strings in NDNUON

# Tests + Formatting
new tests have been added:
- they don't pass on the first commit
- they do pass with the fix

# After Submitting
---
 crates/nu-std/std/formats/mod.nu        |  2 +-
 crates/nu-std/tests/test_formats.nu     | 14 ++++++++++++++
 crates/nu-std/tests/test_std_formats.nu | 14 ++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/crates/nu-std/std/formats/mod.nu b/crates/nu-std/std/formats/mod.nu
index addfa4c1c9..a0484e42f4 100644
--- a/crates/nu-std/std/formats/mod.nu
+++ b/crates/nu-std/std/formats/mod.nu
@@ -36,5 +36,5 @@ export def "from ndnuon" []: [string -> any] {
 
 # Convert structured data to NDNUON, i.e. newline-delimited NUON
 export def "to ndnuon" []: [any -> string] {
-    each { to nuon --raw } | to text
+    each { to nuon --raw | str replace --all "\n" '\n' } | to text
 }
diff --git a/crates/nu-std/tests/test_formats.nu b/crates/nu-std/tests/test_formats.nu
index ec1f6adb47..44a89eeaad 100644
--- a/crates/nu-std/tests/test_formats.nu
+++ b/crates/nu-std/tests/test_formats.nu
@@ -128,3 +128,17 @@ def to_ndnuon_single_object [] {
   let expect = "{a: 1}"
   assert equal $result $expect "could not convert to NDNUON"
 }
+
+#[test]
+def to_ndnuon_multiline_strings [] {
+  let result = "foo\n\\n\nbar" | to ndnuon
+  let expect = '"foo\n\\n\nbar"'
+  assert equal $result $expect "could not convert multiline string to NDNUON"
+}
+
+#[test]
+def from_ndnuon_multiline_strings [] {
+  let result = '"foo\n\\n\nbar"' | from ndnuon
+  let expect = ["foo\n\\n\nbar"]
+  assert equal $result $expect "could not convert multiline string from NDNUON"
+}
diff --git a/crates/nu-std/tests/test_std_formats.nu b/crates/nu-std/tests/test_std_formats.nu
index ed6b079d7e..1ca7516c20 100644
--- a/crates/nu-std/tests/test_std_formats.nu
+++ b/crates/nu-std/tests/test_std_formats.nu
@@ -128,3 +128,17 @@ def to_ndnuon_single_object [] {
   let expect = "{a: 1}"
   assert equal $result $expect "could not convert to NDNUON"
 }
+
+#[test]
+def to_ndnuon_multiline_strings [] {
+  let result = "foo\n\\n\nbar" | formats to ndnuon
+  let expect = '"foo\n\\n\nbar"'
+  assert equal $result $expect "could not convert multiline string to NDNUON"
+}
+
+#[test]
+def from_ndnuon_multiline_strings [] {
+  let result = '"foo\n\\n\nbar"' | formats from ndnuon
+  let expect = ["foo\n\\n\nbar"]
+  assert equal $result $expect "could not convert multiline string from NDNUON"
+}

From f51828d049b950c8eee9fd1c5fce2e4f6d784219 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Thu, 5 Dec 2024 14:54:14 +0100
Subject: [PATCH 0766/1072] Improve `sleep` example using multiple durations
 (#14520)

It is to cheat our parser and not to repeat yourself.
---
 crates/nu-command/src/platform/sleep.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/nu-command/src/platform/sleep.rs b/crates/nu-command/src/platform/sleep.rs
index c63de6ae9d..f995ac85be 100644
--- a/crates/nu-command/src/platform/sleep.rs
+++ b/crates/nu-command/src/platform/sleep.rs
@@ -70,8 +70,8 @@ impl Command for Sleep {
                 result: Some(Value::nothing(Span::test_data())),
             },
             Example {
-                description: "Sleep for 3sec",
-                example: "sleep 1sec 1sec 1sec",
+                description: "Use multiple arguments to write a duration with multiple units, which is unsupported by duration literals",
+                example: "sleep 1min 30sec",
                 result: None,
             },
             Example {

From 4c9078ccccda3294f4789ec5a71eead0c83acf24 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 5 Dec 2024 21:36:35 -0600
Subject: [PATCH 0767/1072] add file column to `scope modules` output (#14524)

# Description

This PR adds a `file` column to the `scope modules` output table.


![image](https://github.com/user-attachments/assets/d69f3dec-3f9a-4ff9-b971-1fd533520ec7)


# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-engine/src/scope.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/nu-engine/src/scope.rs b/crates/nu-engine/src/scope.rs
index 62acd6a9a7..45f6f983fc 100644
--- a/crates/nu-engine/src/scope.rs
+++ b/crates/nu-engine/src/scope.rs
@@ -488,6 +488,7 @@ impl<'e, 's> ScopeData<'e, 's> {
                 "description" => Value::string(module_desc, span),
                 "extra_description" => Value::string(module_extra_desc, span),
                 "module_id" => Value::int(module_id.get() as i64, span),
+                "file" => Value::string(module.file.clone().map_or("unknown".to_string(), |(p, _)| p.path().to_string_lossy().to_string()), span),
             },
             span,
         )

From 81d68cd478325170c619f66ff2fa88e12497e144 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Fri, 6 Dec 2024 03:17:18 -0800
Subject: [PATCH 0768/1072] Documentation and error handling around `polars
 with-column --name` (#14527)

The `--name` flag of `polars with-column` only works when used with an
eager dataframe. I will not work with lazy dataframes and it will not
work when used with expressions (which forces a conversion to a
lazyframe). This pull request adds better documentation to the flags and
errors messages when used in cases where it will not work.
---
 .../src/dataframe/command/data/with_column.rs | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/with_column.rs b/crates/nu_plugin_polars/src/dataframe/command/data/with_column.rs
index 4806450601..637caa1776 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/with_column.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/with_column.rs
@@ -6,8 +6,8 @@ use crate::{
 };
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
-    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
-    Value,
+    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Spanned,
+    SyntaxShape, Type, Value,
 };
 
 #[derive(Clone)]
@@ -26,7 +26,7 @@ impl PluginCommand for WithColumn {
 
     fn signature(&self) -> Signature {
         Signature::build(self.name())
-            .named("name", SyntaxShape::String, "new column name", Some('n'))
+            .named("name", SyntaxShape::String, "New column name. For lazy dataframes and expressions syntax, use a `polars as` expression to name a column.", Some('n'))
             .rest(
                 "series or expressions",
                 SyntaxShape::Any,
@@ -138,6 +138,15 @@ fn command_eager(
     let column_span = new_column.span();
 
     if NuExpression::can_downcast(&new_column) {
+        if let Some(name) = call.get_flag::<Spanned<String>>("name")? {
+            return Err(ShellError::GenericError {
+            error: "Flag 'name' is unsuppored when used with expressions. Please use the `polars as` expression to name a column".into(),
+            msg: "".into(),
+            span: Some(name.span),
+            help: Some("Use a `polars as` expression to name a column".into()),
+            inner: vec![],
+        });
+        }
         let vals: Vec<Value> = call.rest(0)?;
         let value = Value::list(vals, call.head);
         let expressions = NuExpression::extract_exprs(plugin, value)?;
@@ -177,6 +186,16 @@ fn command_lazy(
     call: &EvaluatedCall,
     lazy: NuLazyFrame,
 ) -> Result<PipelineData, ShellError> {
+    if let Some(name) = call.get_flag::<Spanned<String>>("name")? {
+        return Err(ShellError::GenericError {
+            error: "Flag 'name' is unsuppored for lazy dataframes. Please use the `polars as` expression to name a column".into(),
+            msg: "".into(),
+            span: Some(name.span),
+            help: Some("Use a `polars as` expression to name a column".into()),
+            inner: vec![],
+        });
+    }
+
     let vals: Vec<Value> = call.rest(0)?;
     let value = Value::list(vals, call.head);
     let expressions = NuExpression::extract_exprs(plugin, value)?;

From cda9ae1e42bdfc487f36d489c574facfea079419 Mon Sep 17 00:00:00 2001
From: Alex Kattathra Johnson <alex.kattathra.johnson@gmail.com>
Date: Fri, 6 Dec 2024 06:03:13 -0600
Subject: [PATCH 0769/1072] Shorten --max-time in tests and use a more stable
 error check (#14494)

- fixes flakey tests from solving #14241

# Description
This is a preliminary fix for the flaky tests and also
shortened the `--max-time` in the tests.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->



---------

Signed-off-by: Alex Kattathra Johnson <alex.kattathra.johnson@gmail.com>
---
 .../tests/commands/network/http/delete.rs         | 13 ++++++++++---
 .../nu-command/tests/commands/network/http/get.rs | 13 ++++++++++---
 .../tests/commands/network/http/options.rs        | 13 ++++++++++---
 .../tests/commands/network/http/patch.rs          | 13 ++++++++++---
 .../tests/commands/network/http/post.rs           | 13 ++++++++++---
 .../nu-command/tests/commands/network/http/put.rs | 13 ++++++++++---
 crates/nu-protocol/src/errors/shell_error.rs      | 15 +++++++++------
 7 files changed, 69 insertions(+), 24 deletions(-)

diff --git a/crates/nu-command/tests/commands/network/http/delete.rs b/crates/nu-command/tests/commands/network/http/delete.rs
index 2e2624122e..ac79a4fe62 100644
--- a/crates/nu-command/tests/commands/network/http/delete.rs
+++ b/crates/nu-command/tests/commands/network/http/delete.rs
@@ -131,14 +131,21 @@ fn http_delete_timeout() {
     let _mock = server
         .mock("DELETE", "/")
         .with_chunked_body(|w| {
-            thread::sleep(Duration::from_secs(1));
+            thread::sleep(Duration::from_secs(10));
             w.write_all(b"Delayed response!")
         })
         .create();
 
     let actual = nu!(pipeline(
-        format!("http delete --max-time 500ms {url}", url = server.url()).as_str()
+        format!("http delete --max-time 100ms {url}", url = server.url()).as_str()
     ));
 
-    assert!(&actual.err.contains("nu::shell::io_error"));
+    assert!(&actual.err.contains("nu::shell::network_failure"));
+
+    #[cfg(not(target_os = "windows"))]
+    assert!(&actual.err.contains("timed out reading response"));
+    #[cfg(target_os = "windows")]
+    assert!(&actual
+        .err
+        .contains("did not properly respond after a period of time"));
 }
diff --git a/crates/nu-command/tests/commands/network/http/get.rs b/crates/nu-command/tests/commands/network/http/get.rs
index e75536abb4..87b6b93388 100644
--- a/crates/nu-command/tests/commands/network/http/get.rs
+++ b/crates/nu-command/tests/commands/network/http/get.rs
@@ -325,14 +325,21 @@ fn http_get_timeout() {
     let _mock = server
         .mock("GET", "/")
         .with_chunked_body(|w| {
-            thread::sleep(Duration::from_secs(1));
+            thread::sleep(Duration::from_secs(10));
             w.write_all(b"Delayed response!")
         })
         .create();
 
     let actual = nu!(pipeline(
-        format!("http get --max-time 500ms {url}", url = server.url()).as_str()
+        format!("http get --max-time 100ms {url}", url = server.url()).as_str()
     ));
 
-    assert!(&actual.err.contains("nu::shell::io_error"));
+    assert!(&actual.err.contains("nu::shell::network_failure"));
+
+    #[cfg(not(target_os = "windows"))]
+    assert!(&actual.err.contains("timed out reading response"));
+    #[cfg(target_os = "windows")]
+    assert!(&actual
+        .err
+        .contains("did not properly respond after a period of time"));
 }
diff --git a/crates/nu-command/tests/commands/network/http/options.rs b/crates/nu-command/tests/commands/network/http/options.rs
index 82dcf33a5a..b1478b4ecc 100644
--- a/crates/nu-command/tests/commands/network/http/options.rs
+++ b/crates/nu-command/tests/commands/network/http/options.rs
@@ -50,14 +50,21 @@ fn http_options_timeout() {
     let _mock = server
         .mock("OPTIONS", "/")
         .with_chunked_body(|w| {
-            thread::sleep(Duration::from_secs(1));
+            thread::sleep(Duration::from_secs(10));
             w.write_all(b"Delayed response!")
         })
         .create();
 
     let actual = nu!(pipeline(
-        format!("http options --max-time 500ms {url}", url = server.url()).as_str()
+        format!("http options --max-time 100ms {url}", url = server.url()).as_str()
     ));
 
-    assert!(&actual.err.contains("nu::shell::io_error"));
+    assert!(&actual.err.contains("nu::shell::network_failure"));
+
+    #[cfg(not(target_os = "windows"))]
+    assert!(&actual.err.contains("timed out reading response"));
+    #[cfg(target_os = "windows")]
+    assert!(&actual
+        .err
+        .contains("did not properly respond after a period of time"));
 }
diff --git a/crates/nu-command/tests/commands/network/http/patch.rs b/crates/nu-command/tests/commands/network/http/patch.rs
index 79e6a63096..90788f6769 100644
--- a/crates/nu-command/tests/commands/network/http/patch.rs
+++ b/crates/nu-command/tests/commands/network/http/patch.rs
@@ -171,18 +171,25 @@ fn http_patch_timeout() {
     let _mock = server
         .mock("PATCH", "/")
         .with_chunked_body(|w| {
-            thread::sleep(Duration::from_secs(1));
+            thread::sleep(Duration::from_secs(10));
             w.write_all(b"Delayed response!")
         })
         .create();
 
     let actual = nu!(pipeline(
         format!(
-            "http patch --max-time 500ms {url} patchbody",
+            "http patch --max-time 100ms {url} patchbody",
             url = server.url()
         )
         .as_str()
     ));
 
-    assert!(&actual.err.contains("nu::shell::io_error"));
+    assert!(&actual.err.contains("nu::shell::network_failure"));
+
+    #[cfg(not(target_os = "windows"))]
+    assert!(&actual.err.contains("timed out reading response"));
+    #[cfg(target_os = "windows")]
+    assert!(&actual
+        .err
+        .contains("did not properly respond after a period of time"));
 }
diff --git a/crates/nu-command/tests/commands/network/http/post.rs b/crates/nu-command/tests/commands/network/http/post.rs
index 9d327bf167..2b238573fa 100644
--- a/crates/nu-command/tests/commands/network/http/post.rs
+++ b/crates/nu-command/tests/commands/network/http/post.rs
@@ -285,18 +285,25 @@ fn http_post_timeout() {
     let _mock = server
         .mock("POST", "/")
         .with_chunked_body(|w| {
-            thread::sleep(Duration::from_secs(1));
+            thread::sleep(Duration::from_secs(10));
             w.write_all(b"Delayed response!")
         })
         .create();
 
     let actual = nu!(pipeline(
         format!(
-            "http post --max-time 500ms {url} postbody",
+            "http post --max-time 100ms {url} postbody",
             url = server.url()
         )
         .as_str()
     ));
 
-    assert!(&actual.err.contains("nu::shell::io_error"));
+    assert!(&actual.err.contains("nu::shell::network_failure"));
+
+    #[cfg(not(target_os = "windows"))]
+    assert!(&actual.err.contains("timed out reading response"));
+    #[cfg(target_os = "windows")]
+    assert!(&actual
+        .err
+        .contains("did not properly respond after a period of time"));
 }
diff --git a/crates/nu-command/tests/commands/network/http/put.rs b/crates/nu-command/tests/commands/network/http/put.rs
index 3405c19bbf..41a4bf7848 100644
--- a/crates/nu-command/tests/commands/network/http/put.rs
+++ b/crates/nu-command/tests/commands/network/http/put.rs
@@ -171,18 +171,25 @@ fn http_put_timeout() {
     let _mock = server
         .mock("PUT", "/")
         .with_chunked_body(|w| {
-            thread::sleep(Duration::from_secs(1));
+            thread::sleep(Duration::from_secs(10));
             w.write_all(b"Delayed response!")
         })
         .create();
 
     let actual = nu!(pipeline(
         format!(
-            "http put --max-time 500ms {url} putbody",
+            "http put --max-time 100ms {url} putbody",
             url = server.url()
         )
         .as_str()
     ));
 
-    assert!(&actual.err.contains("nu::shell::io_error"));
+    assert!(&actual.err.contains("nu::shell::network_failure"));
+
+    #[cfg(not(target_os = "windows"))]
+    assert!(&actual.err.contains("timed out reading response"));
+    #[cfg(target_os = "windows")]
+    assert!(&actual
+        .err
+        .contains("did not properly respond after a period of time"));
 }
diff --git a/crates/nu-protocol/src/errors/shell_error.rs b/crates/nu-protocol/src/errors/shell_error.rs
index f187dde807..f9ccc73c54 100644
--- a/crates/nu-protocol/src/errors/shell_error.rs
+++ b/crates/nu-protocol/src/errors/shell_error.rs
@@ -1544,8 +1544,8 @@ impl From<io::Error> for ShellError {
 impl From<Spanned<io::Error>> for ShellError {
     fn from(error: Spanned<io::Error>) -> Self {
         let Spanned { item: error, span } = error;
-        if error.kind() == io::ErrorKind::Other {
-            match error.into_inner() {
+        match error.kind() {
+            io::ErrorKind::Other => match error.into_inner() {
                 Some(err) => match err.downcast() {
                     Ok(err) => *err,
                     Err(err) => Self::IOErrorSpanned {
@@ -1557,12 +1557,15 @@ impl From<Spanned<io::Error>> for ShellError {
                     msg: "unknown error".into(),
                     span,
                 },
-            }
-        } else {
-            Self::IOErrorSpanned {
+            },
+            io::ErrorKind::TimedOut => Self::NetworkFailure {
                 msg: error.to_string(),
                 span,
-            }
+            },
+            _ => Self::IOErrorSpanned {
+                msg: error.to_string(),
+                span,
+            },
         }
     }
 }

From 8771872d861eeb94eec63051cb4938f6306d1dcd Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Fri, 6 Dec 2024 17:19:08 +0300
Subject: [PATCH 0770/1072] Add `path self` command for getting absolute paths
 to files at parse time (#14303)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Alternative solution to:
- #12195

The other approach:
- #14305

# Description
Adds ~`path const`~ `path self`, a parse-time only command for getting
the absolute path of the source file containing it, or any file relative
to the source file.

- Useful for any script or module that makes use of non nuscript files.
- Removes the need for `$env.CURRENT_FILE` and `$env.FILE_PWD`.
- Can be used in modules, sourced files or scripts.

# Examples

```nushell
# ~/.config/nushell/scripts/foo.nu
const paths = {
    self: (path self),
    dir: (path self .),
    sibling: (path self sibling),
    parent_dir: (path self ..),
    cousin: (path self ../cousin),
}

export def main [] {
    $paths
}
```

```nushell
> use foo.nu
> foo
╭────────────┬────────────────────────────────────────────╮
│ self       │ /home/user/.config/nushell/scripts/foo.nu  │
│ dir        │ /home/user/.config/nushell/scripts         │
│ sibling    │ /home/user/.config/nushell/scripts/sibling │
│ parent_dir │ /home/user/.config/nushell                 │
│ cousin     │ /home/user/.config/nushell/cousin          │
╰────────────┴────────────────────────────────────────────╯
```


Trying to run in a non-const context
```nushell
> path self
Error:   × this command can only run during parse-time
   ╭─[entry #1:1:1]
 1 │ path self
   · ─────┬────
   ·      ╰── can't run after parse-time
   ╰────
  help: try assigning this command's output to a const variable
```

Trying to run in the REPL i.e. not in a file
```nushell
> const foo = path self
Error:   × Error: nu::shell::file_not_found
  │
  │   × File not found
  │    ╭─[entry #3:1:13]
  │  1 │ const foo = path self
  │    ·             ─────┬────
  │    ·                  ╰── Couldn't find current file
  │    ╰────
  │
   ╭─[entry #3:1:13]
 1 │ const foo = path self
   ·             ─────┬────
   ·                  ╰── Encountered error during parse-time evaluation
   ╰────
```

# Comparison with #14305
## Pros
- Self contained implementation, does not require changes in the parser.
- More concise usage, especially with parent directories.

---------

Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
---
 crates/nu-command/src/default_context.rs |   1 +
 crates/nu-command/src/path/mod.rs        |   2 +
 crates/nu-command/src/path/self_.rs      | 129 +++++++++++++++++++++++
 3 files changed, 132 insertions(+)
 create mode 100644 crates/nu-command/src/path/self_.rs

diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index 0a4075c532..a4288c685c 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -106,6 +106,7 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
         bind_command! {
             Path,
             PathBasename,
+            PathSelf,
             PathDirname,
             PathExists,
             PathExpand,
diff --git a/crates/nu-command/src/path/mod.rs b/crates/nu-command/src/path/mod.rs
index 8a7b9a6f2c..4b6405c8d8 100644
--- a/crates/nu-command/src/path/mod.rs
+++ b/crates/nu-command/src/path/mod.rs
@@ -6,6 +6,7 @@ mod join;
 mod parse;
 pub mod path_;
 mod relative_to;
+mod self_;
 mod split;
 mod r#type;
 
@@ -18,6 +19,7 @@ pub use parse::SubCommand as PathParse;
 pub use path_::PathCommand as Path;
 pub use r#type::SubCommand as PathType;
 pub use relative_to::SubCommand as PathRelativeTo;
+pub use self_::SubCommand as PathSelf;
 pub use split::SubCommand as PathSplit;
 
 use nu_protocol::{ShellError, Span, Value};
diff --git a/crates/nu-command/src/path/self_.rs b/crates/nu-command/src/path/self_.rs
new file mode 100644
index 0000000000..242fbea7a8
--- /dev/null
+++ b/crates/nu-command/src/path/self_.rs
@@ -0,0 +1,129 @@
+use nu_engine::command_prelude::*;
+use nu_path::expand_path_with;
+use nu_protocol::engine::StateWorkingSet;
+
+#[derive(Clone)]
+pub struct SubCommand;
+
+impl Command for SubCommand {
+    fn name(&self) -> &str {
+        "path self"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("path self")
+            .input_output_type(Type::Nothing, Type::String)
+            .allow_variants_without_examples(true)
+            .optional(
+                "path",
+                SyntaxShape::Filepath,
+                "Path to get instead of the current file.",
+            )
+            .category(Category::Path)
+    }
+
+    fn description(&self) -> &str {
+        "Get the absolute path of the script or module containing this command at parse time."
+    }
+
+    fn is_const(&self) -> bool {
+        true
+    }
+
+    fn run(
+        &self,
+        _engine_state: &EngineState,
+        _stack: &mut Stack,
+        call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        Err(ShellError::GenericError {
+            error: "this command can only run during parse-time".into(),
+            msg: "can't run after parse-time".into(),
+            span: Some(call.head),
+            help: Some("try assigning this command's output to a const variable".into()),
+            inner: vec![],
+        })
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let path: Option<String> = call.opt_const(working_set, 0)?;
+        let cwd = working_set.permanent_state.cwd(None)?;
+        let current_file =
+            working_set
+                .files
+                .top()
+                .ok_or_else(|| ShellError::FileNotFoundCustom {
+                    msg: "Couldn't find current file".into(),
+                    span: call.head,
+                })?;
+
+        let out = if let Some(path) = path {
+            let dir = expand_path_with(
+                current_file
+                    .parent()
+                    .ok_or_else(|| ShellError::FileNotFoundCustom {
+                        msg: "Couldn't find current file's parent.".into(),
+                        span: call.head,
+                    })?,
+                &cwd,
+                true,
+            );
+            Value::string(
+                expand_path_with(path, dir, false).to_string_lossy(),
+                call.head,
+            )
+        } else {
+            Value::string(
+                expand_path_with(current_file, &cwd, true).to_string_lossy(),
+                call.head,
+            )
+        };
+
+        Ok(out.into_pipeline_data())
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Get the path of the current file",
+                example: r#"const current_file = path self"#,
+                result: None,
+            },
+            Example {
+                description: "Get the path of the directory containing the current file",
+                example: r#"const current_file = path self ."#,
+                result: None,
+            },
+            #[cfg(windows)]
+            Example {
+                description: "Get the absolute form of a path relative to the current file",
+                example: r#"const current_file = path self ..\foo"#,
+                result: None,
+            },
+            #[cfg(not(windows))]
+            Example {
+                description: "Get the absolute form of a path relative to the current file",
+                example: r#"const current_file = path self ../foo"#,
+                result: None,
+            },
+        ]
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_examples() {
+        use crate::test_examples;
+
+        test_examples(SubCommand {})
+    }
+}

From 941145868928524695c9ca244888c37dad2e4c45 Mon Sep 17 00:00:00 2001
From: Maxim Uvarov <maxim-uvarov@users.noreply.github.com>
Date: Fri, 6 Dec 2024 21:09:11 -0300
Subject: [PATCH 0771/1072] rewrite error message to not use the word
 `function` (#14533)

# Description

After [the discussion on
discord](https://discord.com/channels/601130461678272522/601130461678272524/1314600410882904125)
I propose to rephrase the error message to avoid using the word
`function`.

From `Return used outside of function` to `Return used outside of custom
command or closure`


![image](https://github.com/user-attachments/assets/d14331c8-e381-4b04-8709-bd6064e0791e)



# User-Facing Changes

None

# Tests + Formatting

toolkit.nu fmt is good
---
 crates/nu-protocol/src/errors/shell_error.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/nu-protocol/src/errors/shell_error.rs b/crates/nu-protocol/src/errors/shell_error.rs
index f9ccc73c54..61bd6ce11e 100644
--- a/crates/nu-protocol/src/errors/shell_error.rs
+++ b/crates/nu-protocol/src/errors/shell_error.rs
@@ -1220,10 +1220,10 @@ pub enum ShellError {
         span: Span,
     },
 
-    /// Return event, which may become an error if used outside of a function
-    #[error("Return used outside of function")]
+    /// Return event, which may become an error if used outside of a custom command or closure
+    #[error("Return used outside of custom command or closure")]
     Return {
-        #[label("used outside of function")]
+        #[label("used outside of custom command or closure")]
         span: Span,
         value: Box<Value>,
     },

From c16f49cf190ac0646e4283472dd5fa221cdad5ae Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Sat, 7 Dec 2024 07:20:46 -0600
Subject: [PATCH 0772/1072] add coreutils to search terms

---
 crates/nu-command/src/filesystem/utouch.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-command/src/filesystem/utouch.rs b/crates/nu-command/src/filesystem/utouch.rs
index 51338b20e7..b3d827f7b2 100644
--- a/crates/nu-command/src/filesystem/utouch.rs
+++ b/crates/nu-command/src/filesystem/utouch.rs
@@ -15,7 +15,7 @@ impl Command for UTouch {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["create", "file"]
+        vec!["create", "file", "coreutils"]
     }
 
     fn signature(&self) -> Signature {

From f0ecaabd7dea79aaf1c8e116d95c1df793c97fba Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Sat, 7 Dec 2024 14:28:14 +0100
Subject: [PATCH 0773/1072] Expose "to html" command (#14536)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
In this PR I exposed the struct `ToHtml` that comes from `nu-cmd-extra`.
I know this command isn't in a best state and should be changed in some
way in the future but having the struct exposed makes transforming data
to html way more simple for external tools as the `PipelineData` can
easily be placed in the `ToHtml::run` method.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

None.

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

I did `fmt` and `check` but not `test`, shouldn't break any tests
regardless.

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
For the demo page or my jupyter kernel would this make my life easiert.
---
 crates/nu-cmd-extra/src/extra/formats/mod.rs | 2 +-
 crates/nu-cmd-extra/src/extra/mod.rs         | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/crates/nu-cmd-extra/src/extra/formats/mod.rs b/crates/nu-cmd-extra/src/extra/formats/mod.rs
index 8c49349390..04c03dce49 100644
--- a/crates/nu-cmd-extra/src/extra/formats/mod.rs
+++ b/crates/nu-cmd-extra/src/extra/formats/mod.rs
@@ -2,4 +2,4 @@ mod from;
 mod to;
 
 pub(crate) use from::url::FromUrl;
-pub(crate) use to::html::ToHtml;
+pub use to::html::ToHtml;
diff --git a/crates/nu-cmd-extra/src/extra/mod.rs b/crates/nu-cmd-extra/src/extra/mod.rs
index 3936b94a0f..8204f1bd9a 100644
--- a/crates/nu-cmd-extra/src/extra/mod.rs
+++ b/crates/nu-cmd-extra/src/extra/mod.rs
@@ -9,6 +9,7 @@ mod strings;
 pub use bits::{
     Bits, BitsAnd, BitsInto, BitsNot, BitsOr, BitsRol, BitsRor, BitsShl, BitsShr, BitsXor,
 };
+pub use formats::ToHtml;
 pub use math::{MathArcCos, MathArcCosH, MathArcSin, MathArcSinH, MathArcTan, MathArcTanH};
 pub use math::{MathCos, MathCosH, MathSin, MathSinH, MathTan, MathTanH};
 pub use math::{MathExp, MathLn};
@@ -54,7 +55,8 @@ pub fn add_extra_command_context(mut engine_state: EngineState) -> EngineState {
             strings::str_::case::StrTitleCase
         );
 
-        bind_command!(formats::ToHtml, formats::FromUrl);
+        bind_command!(ToHtml, formats::FromUrl);
+
         // Bits
         bind_command! {
             Bits,

From 69fbfb939f1ed902efb0c3e7600de61ef0cc494f Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Sat, 7 Dec 2024 18:46:52 +0300
Subject: [PATCH 0774/1072] lsp and --ide-check fix for `path self` related
 diagnostics (#14538)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

fixes
[this](https://github.com/nushell/nushell/pull/14303#issuecomment-2525100480)
where lsp and ide integration would produce the following error

---

```sh
nu --ide-check 100 "/path/to/env.nu"
```
with
```nu
const const_env = path self
```
would lead to
```
Error: nu::shell::file_not_found

  × File not found
   ╭─[/path/to/env.nu:1:19]
 1 │ const const_env = path self
   ·                   ────┬────
   ·                       ╰── Couldn't find current file
   ╰────
```

# Tests + Formatting
- :green_circle: `cargo fmt --all`
- :green_circle: `cargo clippy --workspace`
---
 crates/nu-lsp/src/diagnostics.rs | 3 ++-
 crates/nu-lsp/src/lib.rs         | 3 +++
 src/ide.rs                       | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/crates/nu-lsp/src/diagnostics.rs b/crates/nu-lsp/src/diagnostics.rs
index e1ae63dc59..53b47bd2f0 100644
--- a/crates/nu-lsp/src/diagnostics.rs
+++ b/crates/nu-lsp/src/diagnostics.rs
@@ -7,7 +7,7 @@ use miette::{IntoDiagnostic, Result};
 use nu_parser::parse;
 use nu_protocol::{
     engine::{EngineState, StateWorkingSet},
-    Value,
+    Span, Value,
 };
 
 impl LanguageServer {
@@ -28,6 +28,7 @@ impl LanguageServer {
 
         let contents = rope_of_file.bytes().collect::<Vec<u8>>();
         let offset = working_set.next_span_start();
+        working_set.files.push(file_path.into(), Span::unknown())?;
         parse(
             &mut working_set,
             Some(&file_path.to_string_lossy()),
diff --git a/crates/nu-lsp/src/lib.rs b/crates/nu-lsp/src/lib.rs
index d5a4938615..3e12a24b2a 100644
--- a/crates/nu-lsp/src/lib.rs
+++ b/crates/nu-lsp/src/lib.rs
@@ -274,6 +274,9 @@ impl LanguageServer {
 
         // TODO: think about passing down the rope into the working_set
         let contents = file.bytes().collect::<Vec<u8>>();
+        let _ = working_set
+            .files
+            .push(file_path.as_ref().into(), Span::unknown());
         let block = parse(working_set, Some(&file_path), &contents, false);
         let flattened = flatten_block(working_set, &block);
 
diff --git a/src/ide.rs b/src/ide.rs
index bf582a8287..85023745fa 100644
--- a/src/ide.rs
+++ b/src/ide.rs
@@ -24,6 +24,7 @@ fn find_id(
 ) -> Option<(Id, usize, Span)> {
     let file_id = working_set.add_file(file_path.to_string(), file);
     let offset = working_set.get_span_for_file(file_id).start;
+    let _ = working_set.files.push(file_path.into(), Span::unknown());
     let block = parse(working_set, Some(file_path), file, false);
     let flattened = flatten_block(working_set, &block);
 
@@ -88,6 +89,7 @@ pub fn check(engine_state: &mut EngineState, file_path: &str, max_errors: &Value
 
     if let Ok(contents) = file {
         let offset = working_set.next_span_start();
+        let _ = working_set.files.push(file_path.into(), Span::unknown());
         let block = parse(&mut working_set, Some(file_path), &contents, false);
 
         for (idx, err) in working_set.parse_errors.iter().enumerate() {
@@ -631,6 +633,7 @@ pub fn ast(engine_state: &mut EngineState, file_path: &str) {
 
     if let Ok(contents) = file {
         let offset = working_set.next_span_start();
+        let _ = working_set.files.push(file_path.into(), Span::unknown());
         let parsed_block = parse(&mut working_set, Some(file_path), &contents, false);
 
         let flat = flatten_block(&working_set, &parsed_block);

From 9daa5f9177cf76864f9918760eaf6d15fa61da06 Mon Sep 17 00:00:00 2001
From: Jess <34199683+ratherforky@users.noreply.github.com>
Date: Sat, 7 Dec 2024 15:55:15 +0000
Subject: [PATCH 0775/1072] Fix silent failure of parsing input output types
 (#14510)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- This PR should fix/close:
  - #11266
  - #12893
  - #13736
  - #13748
  - #14170
- It doesn't fix #13736 though unfortunately. The issue there is at a
different level to this fix (I think probably in the lexing somewhere,
which I haven't touched).

# The Problem

The linked issues have many examples of the problem and the related
confusion it causes, but I'll give some more examples here for
illustration. It boils down to the following:

This doesn't type check (good):
```nu
def foo []: string -> int { false }
```

This does (bad):
```nu
def foo [] : string -> int { false }
```

Because the parser is completely ignoring all the characters. This also
compiles in 0.100.0:
```nu
def blue [] Da ba Dee da Ba da { false }
```

And this also means commands which have a completely fine type, but an
extra space before `:`, lose that type information and end up as `any ->
any`, e.g.
```nu
def foo [] : int -> int {$in + 3}
```
```bash
$ foo --help
Input/output types:
  ╭───┬───────┬────────╮
  │ # │ input │ output │
  ├───┼───────┼────────┤
  │ 0 │ any   │ any    │
  ╰───┴───────┴────────╯
```

# The Fix

Special thank you to @texastoland whose draft PR (#12358) I referenced
heavily while making this fix.

That PR seeks to fix the invalid parsing by disallowing whitespace
between `[]` and `:` in declarations, e.g. `def foo [] : int -> any {}`

This PR instead allows the whitespace while properly parsing the type
signature. I think this is the better choice for a few reasons:
- The parsing is still straightforward and the information is all there
anyway,
- It's more consistent with type annotations in other places, e.g. `do
{|nums : list<int>| $nums | describe} [ 1 2 3 ]` from the [Type
Signatures doc
page](https://www.nushell.sh/lang-guide/chapters/types/type_signatures.html)
- It's more consistent with the new nu parser, which allows `let x :
bool = false` (current nu doesn't, but this PR doesn't change that)
- It will be less disruptive and should only break code where the types
are actually wrong (if your types were correct, but you had a space
before the `:`, those declarations will still compile and now have more
type information vs. throwing an error in all cases and requiring spaces
to be deleted)
- It's the more intuitive syntax for most functional programmers like
myself (haskell/lean/coq/agda and many more either allow or require
whitespace for type annotations)

I don't use Rust a lot, so I tried to keep most things the same and the
rest I wrote as if it was Haskell (if you squint a bit). Code
review/suggestions very welcome. I added all the tests I could think of
and `toolkit check pr` gives it the all-clear.

# User-Facing Changes

This PR meets part of the goal of #13849, but doesn't do anything about
parsing signatures twice and doesn't do much to improve error messages,
it just enforces the existing errors and error messages.

This will no doubt be a breaking change, mostly because the code is
already broken and users don't realise yet (one of my personal scripts
stopped compiling after this fix because I thought `def foo [] -> string
{}` was valid syntax). It shouldn't break any type-correct code though.
---
 crates/nu-parser/src/parser.rs        | 78 ++++++++++++++++++++-------
 crates/nu-parser/tests/test_parser.rs | 37 +++++++++++++
 crates/nu-std/testing.nu              |  6 +--
 3 files changed, 99 insertions(+), 22 deletions(-)

diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index eecd7863a9..07ab35dc36 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -3361,26 +3361,66 @@ pub fn parse_input_output_types(
 }
 
 pub fn parse_full_signature(working_set: &mut StateWorkingSet, spans: &[Span]) -> Expression {
-    let arg_signature = working_set.get_span_contents(spans[0]);
-
-    if arg_signature.ends_with(b":") {
-        let mut arg_signature =
-            parse_signature(working_set, Span::new(spans[0].start, spans[0].end - 1));
-
-        let input_output_types = parse_input_output_types(working_set, &spans[1..]);
-
-        if let Expression {
-            expr: Expr::Signature(sig),
-            span: expr_span,
-            ..
-        } = &mut arg_signature
-        {
-            sig.input_output_types = input_output_types;
-            expr_span.end = Span::concat(&spans[1..]).end;
+    match spans.len() {
+        // This case should never happen. It corresponds to declarations like `def foo {}`,
+        // which should throw a 'Missing required positional argument.' before getting to this point
+        0 => {
+            working_set.error(ParseError::InternalError(
+                "failed to catch missing positional arguments".to_string(),
+                Span::concat(spans),
+            ));
+            garbage(working_set, Span::concat(spans))
+        }
+
+        // e.g. `[ b"[foo: string]" ]`
+        1 => parse_signature(working_set, spans[0]),
+
+        // This case is needed to distinguish between e.g.
+        // `[ b"[]", b"{ true }" ]` vs `[ b"[]:", b"int" ]`
+        2 if working_set.get_span_contents(spans[1]).starts_with(b"{") => {
+            parse_signature(working_set, spans[0])
+        }
+
+        // This should handle every other case, e.g.
+        // `[ b"[]:", b"int" ]`
+        // `[ b"[]", b":", b"int" ]`
+        // `[ b"[]", b":", b"int", b"->", b"bool" ]`
+        _ => {
+            let (mut arg_signature, input_output_types_pos) =
+                if working_set.get_span_contents(spans[0]).ends_with(b":") {
+                    (
+                        parse_signature(working_set, Span::new(spans[0].start, spans[0].end - 1)),
+                        1,
+                    )
+                } else if working_set.get_span_contents(spans[1]) == b":" {
+                    (parse_signature(working_set, spans[0]), 2)
+                } else {
+                    // This should be an error case, but we call parse_signature anyway
+                    // so it can handle the various possible errors
+                    // e.g. `[ b"[]", b"int" ]` or `[
+                    working_set.error(ParseError::Expected(
+                        "colon (:) before type signature",
+                        Span::concat(&spans[1..]),
+                    ));
+                    // (garbage(working_set, Span::concat(spans)), 1)
+
+                    (parse_signature(working_set, spans[0]), 1)
+                };
+
+            let input_output_types =
+                parse_input_output_types(working_set, &spans[input_output_types_pos..]);
+
+            if let Expression {
+                expr: Expr::Signature(sig),
+                span: expr_span,
+                ..
+            } = &mut arg_signature
+            {
+                sig.input_output_types = input_output_types;
+                expr_span.end = Span::concat(&spans[input_output_types_pos..]).end;
+            }
+            arg_signature
         }
-        arg_signature
-    } else {
-        parse_signature(working_set, spans[0])
     }
 }
 
diff --git a/crates/nu-parser/tests/test_parser.rs b/crates/nu-parser/tests/test_parser.rs
index 11cca19d1f..2ceabf8a1a 100644
--- a/crates/nu-parser/tests/test_parser.rs
+++ b/crates/nu-parser/tests/test_parser.rs
@@ -2460,6 +2460,7 @@ mod input_types {
 
     #[rstest]
     #[case::input_output(b"def q []: int -> int {1}", false)]
+    #[case::input_output(b"def q [x: bool]: int -> int {2}", false)]
     #[case::input_output(b"def q []: string -> string {'qwe'}", false)]
     #[case::input_output(b"def q []: nothing -> nothing {null}", false)]
     #[case::input_output(b"def q []: list<string> -> list<string> {[]}", false)]
@@ -2479,6 +2480,42 @@ mod input_types {
     #[case::input_output(b"def q []: nothing -> record<c: int e: int {{c: 1 e: 1}}", true)]
     #[case::input_output(b"def q []: record<c: int e: int -> record<a: int> {{a: 1}}", true)]
     #[case::input_output(b"def q []: nothing -> record<a: record<a: int> {{a: {a: 1}}}", true)]
+    #[case::input_output(b"def q []: int []}", true)]
+    #[case::input_output(b"def q []: bool {[]", true)]
+    // Type signature variants with whitespace between inputs and `:`
+    #[case::input_output(b"def q [] : int -> int {1}", false)]
+    #[case::input_output(b"def q [x: bool] : int -> int {2}", false)]
+    #[case::input_output(b"def q []\t   : string -> string {'qwe'}", false)]
+    #[case::input_output(b"def q []  \t : nothing -> nothing {null}", false)]
+    #[case::input_output(b"def q [] \t: list<string> -> list<string> {[]}", false)]
+    #[case::input_output(
+        b"def q []\t: record<a: int b: int> -> record<c: int e: int> {{c: 1 e: 1}}",
+        false
+    )]
+    #[case::input_output(
+        b"def q [] : table<a: int b: int> -> table<c: int e: int> {[{c: 1 e: 1}]}",
+        false
+    )]
+    #[case::input_output(
+        b"def q [] : nothing -> record<c: record<a: int b: int> e: int> {{c: {a: 1 b: 2} e: 1}}",
+        false
+    )]
+    #[case::input_output(b"def q [] : nothing -> list<string {[]}", true)]
+    #[case::input_output(b"def q [] : nothing -> record<c: int e: int {{c: 1 e: 1}}", true)]
+    #[case::input_output(b"def q [] : record<c: int e: int -> record<a: int> {{a: 1}}", true)]
+    #[case::input_output(b"def q [] : nothing -> record<a: record<a: int> {{a: {a: 1}}}", true)]
+    #[case::input_output(b"def q [] : int []}", true)]
+    #[case::input_output(b"def q [] : bool {[]", true)]
+    // No input-output type signature
+    #[case::input_output(b"def qq [] {[]}", false)]
+    #[case::input_output(b"def q [] []}", true)]
+    #[case::input_output(b"def q [] {", true)]
+    #[case::input_output(b"def q []: []}", true)]
+    #[case::input_output(b"def q [] int {}", true)]
+    #[case::input_output(b"def q [x: string, y: int] {{c: 1 e: 1}}", false)]
+    #[case::input_output(b"def q [x: string, y: int]: {}", true)]
+    #[case::input_output(b"def q [x: string, y: int] {a: {a: 1}}", true)]
+    #[case::input_output(b"def foo {3}", true)]
     #[case::vardecl(b"let a: int = 1", false)]
     #[case::vardecl(b"let a: string = 'qwe'", false)]
     #[case::vardecl(b"let a: nothing = null", false)]
diff --git a/crates/nu-std/testing.nu b/crates/nu-std/testing.nu
index 7052983a21..e409920569 100644
--- a/crates/nu-std/testing.nu
+++ b/crates/nu-std/testing.nu
@@ -28,7 +28,7 @@ def valid-annotations [] {
 # Returns a table containing the list of function names together with their annotations (comments above the declaration)
 def get-annotated [
     file: path
-] path -> table<function_name: string, annotation: string> {
+]: path -> table<function_name: string, annotation: string> {
     let raw_file = (
         open $file
         | lines
@@ -59,7 +59,7 @@ def get-annotated [
 # Annotations that allow multiple functions are of type list<string>
 # Other annotations are of type string
 # Result gets merged with the template record so that the output shape remains consistent regardless of the table content
-def create-test-record [] nothing -> record<before-each: string, after-each: string, before-all: string, after-all: string, test: list<string>, test-skip: list<string>> {
+def create-test-record []: nothing -> record<before-each: string, after-each: string, before-all: string, after-all: string, test: list<string>, test-skip: list<string>> {
     let input = $in
 
     let template_record = {
@@ -187,7 +187,7 @@ export def ($test_function_name) [] {
 def run-tests-for-module [
     module: record<file: path name: string before-each: string after-each: string before-all: string after-all: string test: list test-skip: list>
     threads: int
-] -> table<file: path, name: string, test: string, result: string> {
+]: nothing -> table<file: path, name: string, test: string, result: string> {
     let global_context = if not ($module.before-all|is-empty) {
             log info $"Running before-all for module ($module.name)"
             run-test {

From 685dc78739016d4bb92459678b75646768a690b2 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Sun, 8 Dec 2024 08:43:36 -0600
Subject: [PATCH 0776/1072] update to reedline 9eb3c2d (#14541)

# Description

This PR updates nushell to the latest commit of reedline that fixes some
rendering issues on window resize.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 54acf0f4c2..4a50d71724 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5604,7 +5604,7 @@ dependencies = [
 [[package]]
 name = "reedline"
 version = "0.37.0"
-source = "git+https://github.com/nushell/reedline?branch=main#3c46dc2c0c69476a625611a556e67ddb8439629c"
+source = "git+https://github.com/nushell/reedline?branch=main#9eb3c2dd1375119c7f6bb8ecac07b715e72fe692"
 dependencies = [
  "arboard",
  "chrono",

From 75ced3e945b8786d89c9996f5fe575cd1569f952 Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Tue, 10 Dec 2024 13:10:28 +0100
Subject: [PATCH 0777/1072] Fix `table` command when targeting WASM (#14530)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
In this PR I made the `cwd` parameter in the functions from the `table`
command not used when targeting `not(feature = "os)`. As without an OS
and therefore without filesystem we don't have any real concept of a
current working directory. This allows using the `table` command in the
WASM context.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
None.

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->
My tests timed out on the http stuff but I cannot think why this would
trigger a test failure. Let's see what the CI finds out.

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/viewers/table.rs | 56 +++++++++++++++++++++-----
 1 file changed, 46 insertions(+), 10 deletions(-)

diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index 1768590b65..da57198efb 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -125,6 +125,7 @@ impl Command for Table {
             let val = Value::list(supported_table_modes(), Span::test_data());
             return Ok(val.into_pipeline_data());
         }
+        #[cfg(feature = "os")]
         let cwd = engine_state.cwd(Some(stack))?;
         let cfg = parse_table_config(call, engine_state, stack)?;
         let input = CmdInput::new(engine_state, stack, call, input);
@@ -135,7 +136,12 @@ impl Command for Table {
             let _ = nu_utils::enable_vt_processing();
         }
 
-        handle_table_command(input, cfg, cwd)
+        handle_table_command(
+            input,
+            cfg,
+            #[cfg(feature = "os")]
+            cwd,
+        )
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -367,7 +373,7 @@ impl<'a> CmdInput<'a> {
 fn handle_table_command(
     mut input: CmdInput<'_>,
     cfg: TableConfig,
-    cwd: nu_path::PathBuf<Absolute>,
+    #[cfg(feature = "os")] cwd: nu_path::PathBuf<Absolute>,
 ) -> Result<PipelineData, ShellError> {
     let span = input.data.span().unwrap_or(input.call.head);
     match input.data {
@@ -390,11 +396,25 @@ fn handle_table_command(
             let stream = ListStream::new(vals.into_iter(), span, signals);
             input.data = PipelineData::Empty;
 
-            handle_row_stream(input, cfg, stream, metadata, cwd)
+            handle_row_stream(
+                input,
+                cfg,
+                stream,
+                metadata,
+                #[cfg(feature = "os")]
+                cwd,
+            )
         }
         PipelineData::ListStream(stream, metadata) => {
             input.data = PipelineData::Empty;
-            handle_row_stream(input, cfg, stream, metadata, cwd)
+            handle_row_stream(
+                input,
+                cfg,
+                stream,
+                metadata,
+                #[cfg(feature = "os")]
+                cwd,
+            )
         }
         PipelineData::Value(Value::Record { val, .. }, ..) => {
             input.data = PipelineData::Empty;
@@ -414,7 +434,14 @@ fn handle_table_command(
             let stream =
                 ListStream::new(val.into_range_iter(span, Signals::empty()), span, signals);
             input.data = PipelineData::Empty;
-            handle_row_stream(input, cfg, stream, metadata, cwd)
+            handle_row_stream(
+                input,
+                cfg,
+                stream,
+                metadata,
+                #[cfg(feature = "os")]
+                cwd,
+            )
         }
         x => Ok(x),
     }
@@ -606,7 +633,7 @@ fn handle_row_stream(
     cfg: TableConfig,
     stream: ListStream,
     metadata: Option<PipelineMetadata>,
-    cwd: nu_path::PathBuf<Absolute>,
+    #[cfg(feature = "os")] cwd: nu_path::PathBuf<Absolute>,
 ) -> Result<PipelineData, ShellError> {
     let stream = match metadata.as_ref() {
         // First, `ls` sources:
@@ -636,9 +663,14 @@ fn handle_row_stream(
                     if let Some(value) = record.to_mut().get_mut("name") {
                         let span = value.span();
                         if let Value::String { val, .. } = value {
-                            if let Some(val) =
-                                render_path_name(val, &config, &ls_colors, cwd.clone(), span)
-                            {
+                            if let Some(val) = render_path_name(
+                                val,
+                                &config,
+                                &ls_colors,
+                                #[cfg(feature = "os")]
+                                cwd.clone(),
+                                span,
+                            ) {
                                 *value = val;
                             }
                         }
@@ -1031,14 +1063,18 @@ fn render_path_name(
     path: &str,
     config: &Config,
     ls_colors: &LsColors,
-    cwd: nu_path::PathBuf<Absolute>,
+    #[cfg(feature = "os")] cwd: nu_path::PathBuf<Absolute>,
     span: Span,
 ) -> Option<Value> {
     if !config.ls.use_ls_colors {
         return None;
     }
 
+    #[cfg(feature = "os")]
     let fullpath = cwd.join(path);
+    #[cfg(not(feature = "os"))]
+    let fullpath = path;
+
     let stripped_path = nu_utils::strip_ansi_unlikely(path);
     let metadata = std::fs::symlink_metadata(fullpath);
     let has_metadata = metadata.is_ok();

From fc29d826146afa9b7ac1fdb6807f25129b2d2ef8 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Tue, 10 Dec 2024 07:14:43 -0500
Subject: [PATCH 0778/1072] Only run `from_string` conversion on strings
 (#14509)

# Description

#14249 loaded `convert_env_values()` several times to force more updates
to `ENV_CONVERSION`. This allows the user to treat variables as
structured data inside `config.nu` (and others).

Unfortunately, `convert_env_values()` did not originally anticipate
being called more than once, so it would attempt to re-convert values
that had already been converted. This usually leads to an error in the
conversion closure.

With this PR, values are only converted with `from_string` if they are
still strings; otherwise they are skipped and their existing value is
used.

# User-Facing Changes

No user-facing change when compared to 0.100, since closures written for
0.100's `ENV_CONVERSION` now work again without errors.

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
-
# After Submitting

Will remove the "workaround" from the Config doc preview.
---
 crates/nu-engine/src/env.rs | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/crates/nu-engine/src/env.rs b/crates/nu-engine/src/env.rs
index dc6c354fce..bec885173a 100644
--- a/crates/nu-engine/src/env.rs
+++ b/crates/nu-engine/src/env.rs
@@ -33,14 +33,20 @@ pub fn convert_env_values(engine_state: &mut EngineState, stack: &Stack) -> Resu
     let env_vars = engine_state.render_env_vars();
 
     for (name, val) in env_vars {
-        match get_converted_value(engine_state, stack, name, val, "from_string") {
-            ConversionResult::Ok(v) => {
-                let _ = new_scope.insert(name.to_string(), v);
-            }
-            ConversionResult::ConversionError(e) => error = error.or(Some(e)),
-            ConversionResult::CellPathError => {
-                let _ = new_scope.insert(name.to_string(), val.clone());
+        if let Value::String { .. } = val {
+            // Only run from_string on string values
+            match get_converted_value(engine_state, stack, name, val, "from_string") {
+                ConversionResult::Ok(v) => {
+                    let _ = new_scope.insert(name.to_string(), v);
+                }
+                ConversionResult::ConversionError(e) => error = error.or(Some(e)),
+                ConversionResult::CellPathError => {
+                    let _ = new_scope.insert(name.to_string(), val.clone());
+                }
             }
+        } else {
+            // Skip values that are already converted (not a string)
+            let _ = new_scope.insert(name.to_string(), val.clone());
         }
     }
 

From cf828146060aa891b66d9f63baad8cc3a59b0a2c Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Tue, 10 Dec 2024 07:36:05 -0500
Subject: [PATCH 0779/1072] Use const NU_LIB_DIRS in startup (#14549)

# Description

A slower, gentler alternative to #14531, in that we're just moving one
setting *out* of `default_env.nu` in this PR ;-).

All this does is transition from using `$env.NU_LIB_DIRS` in the startup
config to `const $NU_LIB_DIRS`. Also updates the `sample_env.nu` to
reflect the changes.

Details:

Before: `$env.NU_LIB_DIRS` was unnecessary set both in `main()` and in
`default_env.nu`
After: `$env.NU_LIB_DIRS` is only set in `main()`

Before: `$env.NU_LIB_DIRS` was set to `config-dir/scripts` and
`data-dir/completions`
After: `$env.NU_LIB_DIRS` is set to an empty list, and `const
NU_LIB_DIRS` is set to the directories above

Before: Using `--include-path (-I)` would set the `$env.NU_LIB_DIRS`
After: Using `--include-path (-I)` sets the constant `$NU_LIB_DIRS`

# User-Facing Changes

There shouldn't be any breaking changes here. The `$env.NU_LIBS_DIRS`
still works for most cases. There are a few areas we need to clean-up to
make sure that the const is usable (`nu-check`, et. al.) but they will
still work in the meantime with the older `$env` version.

# Tests + Formatting

* Changed the Type-check on the `$env` version.
* Added a type check for the const version.

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

Doc updates
---
 .../nu-utils/src/default_files/default_env.nu |  5 ----
 .../nu-utils/src/default_files/sample_env.nu  |  8 +++---
 src/main.rs                                   | 28 ++++++++++++++++---
 tests/repl/test_env.rs                        | 12 +++++++-
 4 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/crates/nu-utils/src/default_files/default_env.nu b/crates/nu-utils/src/default_files/default_env.nu
index cb85e519ba..f4c3f562ff 100644
--- a/crates/nu-utils/src/default_files/default_env.nu
+++ b/crates/nu-utils/src/default_files/default_env.nu
@@ -47,11 +47,6 @@ $env.ENV_CONVERSIONS = {
     }
 }
 
-$env.NU_LIB_DIRS = $env.NU_LIB_DIRS? | default [
-    ($nu.default-config-dir | path join 'scripts') # add <nushell-config-dir>/scripts
-    ($nu.data-dir | path join 'completions') # default home for nushell completions
-]
-
 $env.NU_PLUGIN_DIRS = $env.NU_PLUGIN_DIRS | default [
     ($nu.default-config-dir | path join 'plugins') # add <nushell-config-dir>/plugins
 ]
diff --git a/crates/nu-utils/src/default_files/sample_env.nu b/crates/nu-utils/src/default_files/sample_env.nu
index 23dc925ccd..f44b8e1986 100644
--- a/crates/nu-utils/src/default_files/sample_env.nu
+++ b/crates/nu-utils/src/default_files/sample_env.nu
@@ -99,17 +99,17 @@ $env.ENV_CONVERSIONS = $env.ENV_CONVERSIONS | merge {
 
 # NU_LIB_DIRS
 # -----------
-# Directories in this environment variable are searched by the
+# Directories in this constant are searched by the
 # `use` and `source` commands.
 #
 # By default, the `scripts` subdirectory of the default configuration
 # directory is included:
-$env.NU_LIB_DIRS = [
+const NU_LIB_DIRS = [
     ($nu.default-config-dir | path join 'scripts') # add <nushell-config-dir>/scripts
     ($nu.data-dir | path join 'completions') # default home for nushell completions
 ]
-# You can replace (override) or append to this list:
-$env.NU_LIB_DIRS ++= ($nu.default-config-dir | path join 'modules')
+# You can replace (override) or append to this list by shadowing the constant
+const NU_LIB_DIRS = $NU_LIB_DIRS ++ [($nu.default-config-dir | path join 'modules')]
 
 # NU_PLUGIN_DIRS
 # --------------
diff --git a/src/main.rs b/src/main.rs
index bef8d07caf..7898988844 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -25,7 +25,7 @@ use nu_lsp::LanguageServer;
 use nu_path::canonicalize_with;
 use nu_protocol::{
     engine::EngineState, report_shell_error, ByteStream, Config, IntoValue, PipelineData,
-    ShellError, Span, Spanned, Value,
+    ShellError, Span, Spanned, Type, Value,
 };
 use nu_std::load_standard_library;
 use nu_utils::perf;
@@ -147,13 +147,25 @@ fn main() -> Result<()> {
 
     let mut default_nu_lib_dirs_path = nushell_config_path.clone();
     default_nu_lib_dirs_path.push("scripts");
-    engine_state.add_env_var(
-        "NU_LIB_DIRS".to_string(),
+    // env.NU_LIB_DIRS to be replaced by constant (below) - Eventual deprecation
+    // but an empty list for now to allow older code to work
+    engine_state.add_env_var("NU_LIB_DIRS".to_string(), Value::test_list(vec![]));
+
+    let mut working_set = nu_protocol::engine::StateWorkingSet::new(&engine_state);
+    let var_id = working_set.add_variable(
+        b"$NU_LIB_DIRS".into(),
+        Span::unknown(),
+        Type::List(Box::new(Type::String)),
+        false,
+    );
+    working_set.set_variable_const_val(
+        var_id,
         Value::test_list(vec![
             Value::test_string(default_nu_lib_dirs_path.to_string_lossy()),
             Value::test_string(default_nushell_completions_path.to_string_lossy()),
         ]),
     );
+    engine_state.merge_delta(working_set.render())?;
 
     let mut default_nu_plugin_dirs_path = nushell_config_path;
     default_nu_plugin_dirs_path.push("plugins");
@@ -273,7 +285,15 @@ fn main() -> Result<()> {
             .map(|x| Value::string(x.trim().to_string(), span))
             .collect();
 
-        engine_state.add_env_var("NU_LIB_DIRS".into(), Value::list(vals, span));
+        let mut working_set = nu_protocol::engine::StateWorkingSet::new(&engine_state);
+        let var_id = working_set.add_variable(
+            b"$NU_LIB_DIRS".into(),
+            span,
+            Type::List(Box::new(Type::String)),
+            false,
+        );
+        working_set.set_variable_const_val(var_id, Value::list(vals, span));
+        engine_state.merge_delta(working_set.render())?;
     }
     perf!("NU_LIB_DIRS setup", start_time, use_color);
 
diff --git a/tests/repl/test_env.rs b/tests/repl/test_env.rs
index 7963f7580b..f0a2070c30 100644
--- a/tests/repl/test_env.rs
+++ b/tests/repl/test_env.rs
@@ -17,8 +17,18 @@ fn shorthand_env_3() -> TestResult {
 }
 
 #[test]
-fn default_nu_lib_dirs_type() {
+fn default_nu_lib_dirs_env_type() {
+    // Previously, this was a list<string>
+    // While we are transitioning to const NU_LIB_DIRS
+    // the env version will be empty, and thus a
+    // list<any>
     let actual = nu!("$env.NU_LIB_DIRS | describe");
+    assert_eq!(actual.out, "list<any>");
+}
+
+#[test]
+fn default_nu_lib_dirs_type() {
+    let actual = nu!("$NU_LIB_DIRS | describe");
     assert_eq!(actual.out, "list<string>");
 }
 

From 3515e3ee28129c8ec939c31eb4c74b8dae69debe Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Tue, 10 Dec 2024 07:36:27 -0500
Subject: [PATCH 0780/1072] Remove grid icons deprecation warning (#14526)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

Noticed this TODO, so I did as it said.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
N/A (the functionality was already removed)

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->
N/A

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
N/A

---------

Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
---
 crates/nu-protocol/src/config/error.rs | 2 ++
 crates/nu-protocol/src/config/mod.rs   | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/crates/nu-protocol/src/config/error.rs b/crates/nu-protocol/src/config/error.rs
index b13dceeb02..c8fbd3f85a 100644
--- a/crates/nu-protocol/src/config/error.rs
+++ b/crates/nu-protocol/src/config/error.rs
@@ -65,6 +65,8 @@ impl<'a> ConfigErrors<'a> {
         });
     }
 
+    // We'll probably need this again in the future so allow dead code for now
+    #[allow(dead_code)]
     pub fn deprecated_option(&mut self, path: &ConfigPath, suggestion: &'static str, span: Span) {
         self.error(ConfigError::Deprecated {
             path: path.to_string(),
diff --git a/crates/nu-protocol/src/config/mod.rs b/crates/nu-protocol/src/config/mod.rs
index c66c41e455..85ae9ce1e3 100644
--- a/crates/nu-protocol/src/config/mod.rs
+++ b/crates/nu-protocol/src/config/mod.rs
@@ -156,10 +156,6 @@ impl UpdateFromValue for Config {
                 "filesize" => self.filesize.update(val, path, errors),
                 "explore" => self.explore.update(val, path, errors),
                 "color_config" => self.color_config.update(val, path, errors),
-                "use_grid_icons" => {
-                    // TODO: delete it after 0.99
-                    errors.deprecated_option(path, "use `grid -i`", val.span());
-                }
                 "footer_mode" => self.footer_mode.update(val, path, errors),
                 "float_precision" => self.float_precision.update(val, path, errors),
                 "use_ansi_coloring" => self.use_ansi_coloring.update(val, path, errors),

From 7d2e8875e0d9c19d74501cc69bde0103a040dd2e Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Tue, 10 Dec 2024 07:08:53 -0800
Subject: [PATCH 0781/1072] Make `timeit` take only closures as an argument
 (#14483)

# Description

Fixes #14401 where expressions passed to `timeit` will execute twice.
This PR removes the expression support for `timeit`, as this behavior is
almost exclusive to `timeit` and can hinder migration to the IR
evaluator in the future. Additionally, `timeit` used to be able to take
a `block` as an argument. Blocks should probably only be allowed for
parser keywords, so this PR changes `timeit` to instead only take
closures as an argument. This also fixes an issue where environment
updates inside the `timeit` block would affect the parent scope and all
commands later in the pipeline.

```nu
> timeit { $env.FOO = 'bar' }; print $env.FOO
bar
```

# User-Facing Changes

`timeit` now only takes a closure as the first argument.

# After Submitting

Update examples in the book/docs if necessary.
---
 crates/nu-command/src/debug/timeit.rs         | 60 ++++++++-----------
 .../nu-command/tests/commands/debug/timeit.rs |  2 +-
 crates/nu-engine/src/closure_eval.rs          | 39 ++++++++++++
 3 files changed, 65 insertions(+), 36 deletions(-)

diff --git a/crates/nu-command/src/debug/timeit.rs b/crates/nu-command/src/debug/timeit.rs
index 7bb492769c..182cab87d7 100644
--- a/crates/nu-command/src/debug/timeit.rs
+++ b/crates/nu-command/src/debug/timeit.rs
@@ -1,4 +1,5 @@
-use nu_engine::{command_prelude::*, get_eval_block, get_eval_expression_with_input};
+use nu_engine::{command_prelude::*, ClosureEvalOnce};
+use nu_protocol::engine::Closure;
 use std::time::Instant;
 
 #[derive(Clone)]
@@ -10,16 +11,18 @@ impl Command for TimeIt {
     }
 
     fn description(&self) -> &str {
-        "Time the running time of a block."
+        "Time how long it takes a closure to run."
+    }
+
+    fn extra_description(&self) -> &str {
+        "Any pipeline input given to this command is passed to the closure. Note that streaming inputs may affect timing results, and it is recommended to add a `collect` command before this if the input is a stream.
+
+This command will bubble up any errors encountered when running the closure. The return pipeline of the closure is collected into a value and then discarded."
     }
 
     fn signature(&self) -> nu_protocol::Signature {
         Signature::build("timeit")
-            .required(
-                "command",
-                SyntaxShape::OneOf(vec![SyntaxShape::Block, SyntaxShape::Expression]),
-                "The command or block to run.",
-            )
+            .required("command", SyntaxShape::Closure(None), "The closure to run.")
             .input_output_types(vec![
                 (Type::Any, Type::Duration),
                 (Type::Nothing, Type::Duration),
@@ -46,51 +49,38 @@ impl Command for TimeIt {
         // reset outdest, so the command can write to stdout and stderr.
         let stack = &mut stack.push_redirection(None, None);
 
-        let command_to_run = call.positional_nth(stack, 0);
+        let closure: Closure = call.req(engine_state, stack, 0)?;
+        let closure = ClosureEvalOnce::new_preserve_out_dest(engine_state, stack, closure);
 
         // Get the start time after all other computation has been done.
         let start_time = Instant::now();
+        closure.run_with_input(input)?.into_value(call.head)?;
+        let time = start_time.elapsed();
 
-        if let Some(command_to_run) = command_to_run {
-            if let Some(block_id) = command_to_run.as_block() {
-                let eval_block = get_eval_block(engine_state);
-                let block = engine_state.get_block(block_id);
-                eval_block(engine_state, stack, block, input)?
-            } else {
-                let eval_expression_with_input = get_eval_expression_with_input(engine_state);
-                let expression = &command_to_run.clone();
-                eval_expression_with_input(engine_state, stack, expression, input)?
-            }
-        } else {
-            PipelineData::empty()
-        }
-        .into_value(call.head)?;
-
-        let end_time = Instant::now();
-
-        let output = Value::duration(
-            end_time.saturating_duration_since(start_time).as_nanos() as i64,
-            call.head,
-        );
-
+        let output = Value::duration(time.as_nanos() as i64, call.head);
         Ok(output.into_pipeline_data())
     }
 
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
-                description: "Times a command within a closure",
+                description: "Time a closure containing one command",
                 example: "timeit { sleep 500ms }",
                 result: None,
             },
             Example {
-                description: "Times a command using an existing input",
-                example: "http get https://www.nushell.sh/book/ | timeit { split chars }",
+                description: "Time a closure with an input value",
+                example: "'A really long string' | timeit { split chars }",
                 result: None,
             },
             Example {
-                description: "Times a command invocation",
-                example: "timeit ls -la",
+                description: "Time a closure with an input stream",
+                example: "open some_file.txt | collect | timeit { split chars }",
+                result: None,
+            },
+            Example {
+                description: "Time a closure containing a pipeline",
+                example: "timeit { open some_file.txt | split chars }",
                 result: None,
             },
         ]
diff --git a/crates/nu-command/tests/commands/debug/timeit.rs b/crates/nu-command/tests/commands/debug/timeit.rs
index a59f67d26a..509f5bc4e7 100644
--- a/crates/nu-command/tests/commands/debug/timeit.rs
+++ b/crates/nu-command/tests/commands/debug/timeit.rs
@@ -2,7 +2,7 @@ use nu_test_support::nu;
 
 #[test]
 fn timeit_show_stdout() {
-    let actual = nu!("let t = timeit nu --testbin cococo abcdefg");
+    let actual = nu!("let t = timeit { nu --testbin cococo abcdefg }");
     assert_eq!(actual.out, "abcdefg");
 }
 
diff --git a/crates/nu-engine/src/closure_eval.rs b/crates/nu-engine/src/closure_eval.rs
index b271d90cbe..66c6287cca 100644
--- a/crates/nu-engine/src/closure_eval.rs
+++ b/crates/nu-engine/src/closure_eval.rs
@@ -88,6 +88,29 @@ impl ClosureEval {
         }
     }
 
+    pub fn new_preserve_out_dest(
+        engine_state: &EngineState,
+        stack: &Stack,
+        closure: Closure,
+    ) -> Self {
+        let engine_state = engine_state.clone();
+        let stack = stack.captures_to_stack_preserve_out_dest(closure.captures);
+        let block = engine_state.get_block(closure.block_id).clone();
+        let env_vars = stack.env_vars.clone();
+        let env_hidden = stack.env_hidden.clone();
+        let eval = get_eval_block_with_early_return(&engine_state);
+
+        Self {
+            engine_state,
+            stack,
+            block,
+            arg_index: 0,
+            env_vars,
+            env_hidden,
+            eval,
+        }
+    }
+
     /// Sets whether to enable debugging when evaluating the closure.
     ///
     /// By default, this is controlled by the [`EngineState`] used to create this [`ClosureEval`].
@@ -189,6 +212,22 @@ impl<'a> ClosureEvalOnce<'a> {
         }
     }
 
+    pub fn new_preserve_out_dest(
+        engine_state: &'a EngineState,
+        stack: &Stack,
+        closure: Closure,
+    ) -> Self {
+        let block = engine_state.get_block(closure.block_id);
+        let eval = get_eval_block_with_early_return(engine_state);
+        Self {
+            engine_state,
+            stack: stack.captures_to_stack_preserve_out_dest(closure.captures),
+            block,
+            arg_index: 0,
+            eval,
+        }
+    }
+
     /// Sets whether to enable debugging when evaluating the closure.
     ///
     /// By default, this is controlled by the [`EngineState`] used to create this [`ClosureEvalOnce`].

From 8f9aa1a250029cf7352152703cbe34c27e05e6f2 Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Tue, 10 Dec 2024 10:27:30 -0500
Subject: [PATCH 0782/1072] Change `help commands` to use name from scope
 instead of the name from the declaration (#14490)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

Before this PR, `help commands` uses the name from a command's
declaration rather than the name in the scope. This is problematic when
trying to view the help page for the `main` command of a module. For
example, `std bench`:

```nushell
use std/bench
help bench
# => Error: nu::parser::not_found
# =>
# =>   × Not found.
# =>    ╭─[entry #10:1:6]
# =>  1 │ help bench
# =>    ·      ──┬──
# =>    ·        ╰── did not find anything under this name
# =>    ╰────
```

This can also cause confusion when importing specific commands from
modules. Furthermore, if there are multiple commands with the same name
from different modules, the help text for _both_ will appear when
querying their help text (this is especially problematic for `main`
commands, see #14033):

```nushell
use std/iter
help iter find
# => Error: nu::parser::not_found
# =>
# =>   × Not found.
# =>    ╭─[entry #3:1:6]
# =>  1│ help iter find
# =>    ·      ────┬────
# =>    ·          ╰── did not find anything under this name
# =>    ╰────
help find
# => Searches terms in the input.
# =>
# => Search terms: filter, regex, search, condition
# =>
# => Usage:
# =>   > find {flags} ...(rest)
# [...]
# => Returns the first element of the list that matches the
# => closure predicate, `null` otherwise
# [...]
# (full text omitted for brevity)
```

This PR changes `help commands` to use the name as it is in scope, so
prefixing any command in scope with `help` will show the correct help
text.


```nushell
use std/bench
help bench
# [help text for std bench]
use std/iter
help iter find
# [help text for std iter find]

use std
help std bench
# [help text for std bench]
help std iter find
# [help text for std iter find]
```

Additionally, the IR code generation for commands called with the
`--help` text has been updated to reflect this change.

This does have one side effect: when a module has a `main` command
defined, running `help <name>` (which checks `help aliases`, then `help
commands`, then `help modules`) will show the help text for the `main`
command rather than the module. The help text for the module is still
accessible with `help modules <name>`.

Fixes #10499, #10311, #11609, #13470, #14033, and #14402.
Partially fixes #10707.
Does **not** fix #11447.

# User-Facing Changes

* Help text for commands can be obtained by running `help <command
name>`, where the command name is the same thing you would type in order
to execute the command. Previously, it was the name of the function as
written in the source file.
  * For example, for the following module `spam` with command `meow`:
    ```nushell
    module spam {
        # help text
        export def meow [] {}
    }
    ```
    * Before this PR:
* Regardless of how `meow` is `use`d, the help text is viewable by
running `help meow`.
    * After this PR:
* When imported with `use spam`: The `meow` command is executed by
running `spam meow` and the `help` text is viewable by running `help
spam meow`.
* When imported with `use spam foo`: The `meow` command is executed by
running `meow` and the `help` text is viewable by running `meow`.
* When a module has a `main` command defined, `help <module name>` will
return help for the main command, rather than the module. To access the
help for the module, use `help modules <module name>`.

# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
N/A
---
 crates/nu-command/src/help/help_commands.rs   | 19 ++------
 crates/nu-command/src/help/help_externs.rs    | 19 ++------
 crates/nu-engine/src/compile/call.rs          | 11 +++--
 .../src/engine/state_working_set.rs           | 45 +++++++++++++++----
 4 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/crates/nu-command/src/help/help_commands.rs b/crates/nu-command/src/help/help_commands.rs
index f0f8df9c02..9d3ab9c924 100644
--- a/crates/nu-command/src/help/help_commands.rs
+++ b/crates/nu-command/src/help/help_commands.rs
@@ -87,21 +87,10 @@ pub fn help_commands(
             name.push_str(&r.item);
         }
 
-        let output = engine_state
-            .get_decls_sorted(false)
-            .into_iter()
-            .filter_map(|(_, decl_id)| {
-                let decl = engine_state.get_decl(decl_id);
-                (decl.name() == name).then_some(decl)
-            })
-            .map(|cmd| get_full_help(cmd, engine_state, stack))
-            .collect::<Vec<String>>();
-
-        if !output.is_empty() {
-            Ok(
-                Value::string(output.join("======================\n\n"), call.head)
-                    .into_pipeline_data(),
-            )
+        if let Some(decl) = engine_state.find_decl(name.as_bytes(), &[]) {
+            let cmd = engine_state.get_decl(decl);
+            let help_text = get_full_help(cmd, engine_state, stack);
+            Ok(Value::string(help_text, call.head).into_pipeline_data())
         } else {
             Err(ShellError::CommandNotFound {
                 span: Span::merge_many(rest.iter().map(|s| s.span)),
diff --git a/crates/nu-command/src/help/help_externs.rs b/crates/nu-command/src/help/help_externs.rs
index af07835af4..27775b416e 100644
--- a/crates/nu-command/src/help/help_externs.rs
+++ b/crates/nu-command/src/help/help_externs.rs
@@ -107,21 +107,10 @@ pub fn help_externs(
             name.push_str(&r.item);
         }
 
-        let output = engine_state
-            .get_decls_sorted(false)
-            .into_iter()
-            .filter_map(|(_, decl_id)| {
-                let decl = engine_state.get_decl(decl_id);
-                (decl.name() == name).then_some(decl)
-            })
-            .map(|cmd| get_full_help(cmd, engine_state, stack))
-            .collect::<Vec<String>>();
-
-        if !output.is_empty() {
-            Ok(
-                Value::string(output.join("======================\n\n"), call.head)
-                    .into_pipeline_data(),
-            )
+        if let Some(decl) = engine_state.find_decl(name.as_bytes(), &[]) {
+            let cmd = engine_state.get_decl(decl);
+            let help_text = get_full_help(cmd, engine_state, stack);
+            Ok(Value::string(help_text, call.head).into_pipeline_data())
         } else {
             Err(ShellError::CommandNotFound {
                 span: Span::merge_many(rest.iter().map(|s| s.span)),
diff --git a/crates/nu-engine/src/compile/call.rs b/crates/nu-engine/src/compile/call.rs
index 4112e889b1..e58a7b3efe 100644
--- a/crates/nu-engine/src/compile/call.rs
+++ b/crates/nu-engine/src/compile/call.rs
@@ -20,12 +20,11 @@ pub(crate) fn compile_call(
 
     // Check if this call has --help - if so, just redirect to `help`
     if call.named_iter().any(|(name, _, _)| name.item == "help") {
-        return compile_help(
-            working_set,
-            builder,
-            decl.name().into_spanned(call.head),
-            io_reg,
-        );
+        let name = working_set
+            .find_decl_name(call.decl_id) // check for name in scope
+            .and_then(|name| std::str::from_utf8(name).ok())
+            .unwrap_or(decl.name()); // fall back to decl's name
+        return compile_help(working_set, builder, name.into_spanned(call.head), io_reg);
     }
 
     // Try to figure out if this is a keyword call like `if`, and handle those specially
diff --git a/crates/nu-protocol/src/engine/state_working_set.rs b/crates/nu-protocol/src/engine/state_working_set.rs
index 0d59068dbf..5cbc959f63 100644
--- a/crates/nu-protocol/src/engine/state_working_set.rs
+++ b/crates/nu-protocol/src/engine/state_working_set.rs
@@ -459,21 +459,48 @@ impl<'a> StateWorkingSet<'a> {
         }
 
         // check overlay in perma
-        for overlay_frame in self
-            .permanent_state
-            .active_overlays(&removed_overlays)
-            .rev()
-        {
-            visibility.append(&overlay_frame.visibility);
+        self.permanent_state.find_decl(name, &removed_overlays)
+    }
+
+    pub fn find_decl_name(&self, decl_id: DeclId) -> Option<&[u8]> {
+        let mut removed_overlays = vec![];
+
+        let mut visibility: Visibility = Visibility::new();
+
+        for scope_frame in self.delta.scope.iter().rev() {
+            if self.search_predecls {
+                for (name, id) in scope_frame.predecls.iter() {
+                    if id == &decl_id {
+                        return Some(name);
+                    }
+                }
+            }
+
+            // check overlay in delta
+            for overlay_frame in scope_frame.active_overlays(&mut removed_overlays).rev() {
+                visibility.append(&overlay_frame.visibility);
+
+                if self.search_predecls {
+                    for (name, id) in overlay_frame.predecls.iter() {
+                        if id == &decl_id {
+                            return Some(name);
+                        }
+                    }
+                }
 
-            if let Some(decl_id) = overlay_frame.get_decl(name) {
                 if visibility.is_decl_id_visible(&decl_id) {
-                    return Some(decl_id);
+                    for (name, id) in overlay_frame.decls.iter() {
+                        if id == &decl_id {
+                            return Some(name);
+                        }
+                    }
                 }
             }
         }
 
-        None
+        // check overlay in perma
+        self.permanent_state
+            .find_decl_name(decl_id, &removed_overlays)
     }
 
     pub fn find_module(&self, name: &[u8]) -> Option<ModuleId> {

From dff6268d664f1511088394c32d424a12959c8747 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Wed, 11 Dec 2024 01:22:56 +0800
Subject: [PATCH 0783/1072] du: add `-l/--long` flag, remove `-a/--all` flag
 (#14407)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
Closes:  #14387
~To make it happen, just need to added `-l` flag to `du`, and pass it to
`DirBuilder`, `DirInfo`, `FileInfo`
Then tweak `impl From<DirInfo> for Value` and `impl From<FileInfo> for
Value` impl.~

---

Edit: this PR is going to:
1. Exclude directories and files columns by default
2. Added `-l/--long` flag to output directories and files columns
3. When running `du`, it will output the files as well. Previously it
doesn't output the size of file.

To make it happen, just need to added `-r` flag to `du`, and pass it to
`DirBuilder`, `DirInfo`, `FileInfo`
Then tweak `impl From<DirInfo> for Value` and `impl From<FileInfo> for
Value` impl.

And rename some variables.

# User-Facing Changes
`du` is no longer output `directories` and `file` columns by default,
added `-r` flag will show `directories` column, `-f` flag will show
`files` column.

```nushell
> du nushell
╭───┬────────────────────────────────────┬──────────┬──────────╮
│ # │                path                │ apparent │ physical │
├───┼────────────────────────────────────┼──────────┼──────────┤
│ 0 │ /home/windsoilder/projects/nushell │ 34.6 GiB │ 34.7 GiB │
├───┼────────────────────────────────────┼──────────┼──────────┤
│ # │                path                │ apparent │ physical │
╰───┴────────────────────────────────────┴──────────┴──────────╯
> du nushell --recursive --files # It outputs two more columns, `directories` and `files`, but the output is too long to paste here.
```
# Tests + Formatting
Added 1 test

# After Submitting
NaN
---
 crates/nu-command/src/filesystem/du.rs     | 29 ++++----
 crates/nu-command/src/platform/dir_info.rs | 83 +++++++++++++++-------
 crates/nu-command/tests/commands/du.rs     | 14 ++++
 3 files changed, 84 insertions(+), 42 deletions(-)

diff --git a/crates/nu-command/src/filesystem/du.rs b/crates/nu-command/src/filesystem/du.rs
index 0981d2c0ee..15dc0d78d6 100644
--- a/crates/nu-command/src/filesystem/du.rs
+++ b/crates/nu-command/src/filesystem/du.rs
@@ -12,8 +12,8 @@ pub struct Du;
 #[derive(Deserialize, Clone, Debug)]
 pub struct DuArgs {
     path: Option<Spanned<NuGlob>>,
-    all: bool,
     deref: bool,
+    long: bool,
     exclude: Option<Spanned<NuGlob>>,
     #[serde(rename = "max-depth")]
     max_depth: Option<Spanned<i64>>,
@@ -49,6 +49,11 @@ impl Command for Du {
                 "Dereference symlinks to their targets for size",
                 Some('r'),
             )
+            .switch(
+                "long",
+                "Get underlying directories and files for each entry",
+                Some('l'),
+            )
             .named(
                 "exclude",
                 SyntaxShape::GlobPattern,
@@ -94,8 +99,8 @@ impl Command for Du {
                 });
             }
         }
-        let all = call.has_flag(engine_state, stack, "all")?;
         let deref = call.has_flag(engine_state, stack, "deref")?;
+        let long = call.has_flag(engine_state, stack, "long")?;
         let exclude = call.get_flag(engine_state, stack, "exclude")?;
         #[allow(deprecated)]
         let current_dir = current_dir(engine_state, stack)?;
@@ -111,8 +116,8 @@ impl Command for Du {
             None => {
                 let args = DuArgs {
                     path: None,
-                    all,
                     deref,
+                    long,
                     exclude,
                     max_depth,
                     min_size,
@@ -127,8 +132,8 @@ impl Command for Du {
                 for p in paths {
                     let args = DuArgs {
                         path: Some(p),
-                        all,
                         deref,
+                        long,
                         exclude: exclude.clone(),
                         max_depth,
                         min_size,
@@ -174,7 +179,6 @@ fn du_for_one_pattern(
             })
     })?;
 
-    let include_files = args.all;
     let mut paths = match args.path {
         Some(p) => nu_engine::glob_from(&p, current_dir, span, None),
         // The * pattern should never fail.
@@ -188,17 +192,10 @@ fn du_for_one_pattern(
             None,
         ),
     }
-    .map(|f| f.1)?
-    .filter(move |p| {
-        if include_files {
-            true
-        } else {
-            matches!(p, Ok(f) if f.is_dir())
-        }
-    });
+    .map(|f| f.1)?;
 
-    let all = args.all;
     let deref = args.deref;
+    let long = args.long;
     let max_depth = args.max_depth.map(|f| f.item as u64);
     let min_size = args.min_size.map(|f| f.item as u64);
 
@@ -207,7 +204,7 @@ fn du_for_one_pattern(
         min: min_size,
         deref,
         exclude,
-        all,
+        long,
     };
 
     let mut output: Vec<Value> = vec![];
@@ -216,7 +213,7 @@ fn du_for_one_pattern(
             Ok(a) => {
                 if a.is_dir() {
                     output.push(DirInfo::new(a, &params, max_depth, span, signals)?.into());
-                } else if let Ok(v) = FileInfo::new(a, deref, span) {
+                } else if let Ok(v) = FileInfo::new(a, deref, span, params.long) {
                     output.push(v.into());
                 }
             }
diff --git a/crates/nu-command/src/platform/dir_info.rs b/crates/nu-command/src/platform/dir_info.rs
index 10ce4f5420..9b8ea1929e 100644
--- a/crates/nu-command/src/platform/dir_info.rs
+++ b/crates/nu-command/src/platform/dir_info.rs
@@ -9,7 +9,7 @@ pub struct DirBuilder {
     pub min: Option<u64>,
     pub deref: bool,
     pub exclude: Option<Pattern>,
-    pub all: bool,
+    pub long: bool,
 }
 
 impl DirBuilder {
@@ -18,14 +18,14 @@ impl DirBuilder {
         min: Option<u64>,
         deref: bool,
         exclude: Option<Pattern>,
-        all: bool,
+        long: bool,
     ) -> DirBuilder {
         DirBuilder {
             tag,
             min,
             deref,
             exclude,
-            all,
+            long,
         }
     }
 }
@@ -39,6 +39,7 @@ pub struct DirInfo {
     blocks: u64,
     path: PathBuf,
     tag: Span,
+    long: bool,
 }
 
 #[derive(Debug, Clone)]
@@ -47,10 +48,16 @@ pub struct FileInfo {
     size: u64,
     blocks: Option<u64>,
     tag: Span,
+    long: bool,
 }
 
 impl FileInfo {
-    pub fn new(path: impl Into<PathBuf>, deref: bool, tag: Span) -> Result<Self, ShellError> {
+    pub fn new(
+        path: impl Into<PathBuf>,
+        deref: bool,
+        tag: Span,
+        long: bool,
+    ) -> Result<Self, ShellError> {
         let path = path.into();
         let m = if deref {
             std::fs::metadata(&path)
@@ -67,6 +74,7 @@ impl FileInfo {
                     blocks: block_size,
                     size: d.len(),
                     tag,
+                    long,
                 })
             }
             Err(e) => Err(e.into()),
@@ -92,6 +100,7 @@ impl DirInfo {
             blocks: 0,
             tag: params.tag,
             path,
+            long: params.long,
         };
 
         match std::fs::metadata(&s.path) {
@@ -154,13 +163,13 @@ impl DirInfo {
             .as_ref()
             .map_or(true, |x| !x.matches_path(&f));
         if include {
-            match FileInfo::new(f, params.deref, self.tag) {
+            match FileInfo::new(f, params.deref, self.tag, self.long) {
                 Ok(file) => {
                     let inc = params.min.map_or(true, |s| file.size >= s);
                     if inc {
                         self.size += file.size;
                         self.blocks += file.blocks.unwrap_or(0);
-                        if params.all {
+                        if params.long {
                             self.files.push(file);
                         }
                     }
@@ -197,16 +206,27 @@ impl From<DirInfo> for Value {
         //     })
         // }
 
-        Value::record(
-            record! {
-                "path" => Value::string(d.path.display().to_string(), d.tag),
-                "apparent" => Value::filesize(d.size as i64, d.tag),
-                "physical" => Value::filesize(d.blocks as i64, d.tag),
-                "directories" => value_from_vec(d.dirs, d.tag),
-                "files" => value_from_vec(d.files, d.tag)
-            },
-            d.tag,
-        )
+        if d.long {
+            Value::record(
+                record! {
+                    "path" => Value::string(d.path.display().to_string(), d.tag),
+                    "apparent" => Value::filesize(d.size as i64, d.tag),
+                    "physical" => Value::filesize(d.blocks as i64, d.tag),
+                    "directories" => value_from_vec(d.dirs, d.tag),
+                    "files" => value_from_vec(d.files, d.tag)
+                },
+                d.tag,
+            )
+        } else {
+            Value::record(
+                record! {
+                    "path" => Value::string(d.path.display().to_string(), d.tag),
+                    "apparent" => Value::filesize(d.size as i64, d.tag),
+                    "physical" => Value::filesize(d.blocks as i64, d.tag),
+                },
+                d.tag,
+            )
+        }
     }
 }
 
@@ -215,16 +235,27 @@ impl From<FileInfo> for Value {
         // cols.push("errors".into());
         // vals.push(Value::nothing(Span::unknown()));
 
-        Value::record(
-            record! {
-                "path" => Value::string(f.path.display().to_string(), f.tag),
-                "apparent" => Value::filesize(f.size as i64, f.tag),
-                "physical" => Value::filesize(f.blocks.unwrap_or(0) as i64, f.tag),
-                "directories" => Value::nothing(Span::unknown()),
-                "files" => Value::nothing(Span::unknown()),
-            },
-            f.tag,
-        )
+        if f.long {
+            Value::record(
+                record! {
+                    "path" => Value::string(f.path.display().to_string(), f.tag),
+                    "apparent" => Value::filesize(f.size as i64, f.tag),
+                    "physical" => Value::filesize(f.blocks.unwrap_or(0) as i64, f.tag),
+                    "directories" => Value::nothing(Span::unknown()),
+                    "files" => Value::nothing(Span::unknown()),
+                },
+                f.tag,
+            )
+        } else {
+            Value::record(
+                record! {
+                    "path" => Value::string(f.path.display().to_string(), f.tag),
+                    "apparent" => Value::filesize(f.size as i64, f.tag),
+                    "physical" => Value::filesize(f.blocks.unwrap_or(0) as i64, f.tag),
+                },
+                f.tag,
+            )
+        }
     }
 }
 
diff --git a/crates/nu-command/tests/commands/du.rs b/crates/nu-command/tests/commands/du.rs
index 1e22d54f2f..c88eb546be 100644
--- a/crates/nu-command/tests/commands/du.rs
+++ b/crates/nu-command/tests/commands/du.rs
@@ -100,3 +100,17 @@ fn du_with_multiple_path() {
     let actual = nu!(cwd: "tests/fixtures", "du ...[] | length");
     assert_eq!(actual.out, "0");
 }
+
+#[test]
+fn test_du_output_columns() {
+    let actual = nu!(
+        cwd: "tests/fixtures/formats",
+        "du -m 1 | columns | str join ','"
+    );
+    assert_eq!(actual.out, "path,apparent,physical");
+    let actual = nu!(
+        cwd: "tests/fixtures/formats",
+        "du -m 1 -l | columns | str join ','"
+    );
+    assert_eq!(actual.out, "path,apparent,physical,directories,files");
+}

From e4bb248142b99ce384d6dda06f27aba7654fa568 Mon Sep 17 00:00:00 2001
From: RobbingDaHood <16130319+RobbingDaHood@users.noreply.github.com>
Date: Wed, 11 Dec 2024 02:39:36 +0100
Subject: [PATCH 0784/1072] =?UTF-8?q?For=20`#`=20to=20start=20a=20comment,?=
 =?UTF-8?q?=20then=20it=20either=20need=20to=20be=20the=20first=20chara?=
 =?UTF-8?q?=E2=80=A6=20(#14548)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR should close
1. #10327
1. #13667
1. #13810
1. #14129

# Description
For `#` to start a comment, then it either need to be the first
character of the token or prefixed with ` ` (space).

So now you can do this:
```
~/Projects/nushell> 1..10 | each {echo test#testing }                                                                                                                     12/05/2024 05:37:19 PM
╭───┬──────────────╮
│ 0 │ test#testing │
│ 1 │ test#testing │
│ 2 │ test#testing │
│ 3 │ test#testing │
│ 4 │ test#testing │
│ 5 │ test#testing │
│ 6 │ test#testing │
│ 7 │ test#testing │
│ 8 │ test#testing │
│ 9 │ test#testing │
╰───┴──────────────╯
```

# User-Facing Changes
It is a breaking change if anyone expected comments to start in the
middle of a string without any prefixing ` ` (space).

# Tests + Formatting
Did all:
- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

# After Submitting
I cant see that I need to update anything in [the
documentation](https://github.com/nushell/nushell.github.io) but please
point me in the direction if there is anything.

---------

Co-authored-by: Wind <WindSoilder@outlook.com>
---
 crates/nu-parser/src/lex.rs        |  7 +++++--
 crates/nu-parser/tests/test_lex.rs | 23 +++++++++++++++++++++++
 tests/repl/test_parser.rs          | 23 +++++++++++++++++++++++
 3 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/crates/nu-parser/src/lex.rs b/crates/nu-parser/src/lex.rs
index f0802fcd7a..04c3922154 100644
--- a/crates/nu-parser/src/lex.rs
+++ b/crates/nu-parser/src/lex.rs
@@ -51,7 +51,7 @@ impl BlockKind {
 }
 
 // A baseline token is terminated if it's not nested inside of a paired
-// delimiter and the next character is one of: `|`, `;`, `#` or any
+// delimiter and the next character is one of: `|`, `;` or any
 // whitespace.
 fn is_item_terminator(
     block_level: &[BlockKind],
@@ -115,6 +115,7 @@ pub fn lex_item(
     //   character (whitespace, `|`, `;` or `#`) is encountered, the baseline
     //   token is done.
     // - Otherwise, accumulate the character into the current baseline token.
+    let mut previous_char = None;
     while let Some(c) = input.get(*curr_offset) {
         let c = *c;
 
@@ -151,7 +152,8 @@ pub fn lex_item(
             if is_item_terminator(&block_level, c, additional_whitespace, special_tokens) {
                 break;
             }
-            in_comment = true;
+            // To start a comment, It either need to be the first character of the token or prefixed with space.
+            in_comment = previous_char.map(|pc| pc == b' ').unwrap_or(true);
         } else if c == b'\n' || c == b'\r' {
             in_comment = false;
             if is_item_terminator(&block_level, c, additional_whitespace, special_tokens) {
@@ -254,6 +256,7 @@ pub fn lex_item(
         }
 
         *curr_offset += 1;
+        previous_char = Some(c);
     }
 
     let span = Span::new(span_offset + token_start, span_offset + *curr_offset);
diff --git a/crates/nu-parser/tests/test_lex.rs b/crates/nu-parser/tests/test_lex.rs
index a14843f3f0..54ff674bb9 100644
--- a/crates/nu-parser/tests/test_lex.rs
+++ b/crates/nu-parser/tests/test_lex.rs
@@ -159,6 +159,29 @@ fn lex_comment() {
     );
 }
 
+#[test]
+fn lex_not_comment_needs_space_in_front_of_hashtag() {
+    let file = b"1..10 | each {echo test#testing }";
+
+    let output = lex(file, 0, &[], &[], false);
+
+    assert!(output.1.is_none());
+}
+
+#[test]
+fn lex_comment_with_space_in_front_of_hashtag() {
+    let file = b"1..10 | each {echo test #testing }";
+
+    let output = lex(file, 0, &[], &[], false);
+
+    assert!(output.1.is_some());
+    assert!(matches!(
+        output.1.unwrap(),
+        ParseError::UnexpectedEof(missing_token, span) if missing_token == "}"
+            && span == Span::new(33, 34)
+    ));
+}
+
 #[test]
 fn lex_is_incomplete() {
     let file = b"let x = 300 | ;";
diff --git a/tests/repl/test_parser.rs b/tests/repl/test_parser.rs
index f77d431110..05a7c512cb 100644
--- a/tests/repl/test_parser.rs
+++ b/tests/repl/test_parser.rs
@@ -169,6 +169,24 @@ fn comment_skipping_in_pipeline_3() -> TestResult {
     )
 }
 
+#[test]
+fn still_string_if_hashtag_is_middle_of_string() -> TestResult {
+    run_test(r#"echo test#testing"#, "test#testing")
+}
+
+#[test]
+fn still_string_if_hashtag_is_middle_of_string_inside_each() -> TestResult {
+    run_test(
+        r#"1..1 | each {echo test#testing } | get 0"#,
+        "test#testing",
+    )
+}
+
+#[test]
+fn still_string_if_hashtag_is_middle_of_string_inside_each_also_with_dot() -> TestResult {
+    run_test(r#"1..1 | each {echo '.#testing' } | get 0"#, ".#testing")
+}
+
 #[test]
 fn bad_var_name() -> TestResult {
     fail_test(r#"let $"foo bar" = 4"#, "can't contain")
@@ -282,6 +300,11 @@ fn raw_string_with_equals() -> TestResult {
     )
 }
 
+#[test]
+fn raw_string_with_hashtag() -> TestResult {
+    run_test(r#"r##' one # two '##"#, "one # two")
+}
+
 #[test]
 fn list_quotes_with_equals() -> TestResult {
     run_test(

From 4f20c370f90a935fc6a999f732a92dc0e928c6c9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Dec 2024 09:40:09 +0800
Subject: [PATCH 0785/1072] Bump scraper from 0.21.0 to 0.22.0 (#14557)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [scraper](https://github.com/causal-agent/scraper) from 0.21.0 to
0.22.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/causal-agent/scraper/releases">scraper's
releases</a>.</em></p>
<blockquote>
<h2>v0.22.0</h2>
<h2>What's Changed</h2>
<ul>
<li>Make current nightly version of Clippy happy. by <a
href="https://github.com/adamreichold"><code>@​adamreichold</code></a>
in <a
href="https://redirect.github.com/rust-scraper/scraper/pull/220">rust-scraper/scraper#220</a></li>
<li>RFC: Drop hash table for per-element attributes for more compact
sorted vector by <a
href="https://github.com/adamreichold"><code>@​adamreichold</code></a>
in <a
href="https://redirect.github.com/rust-scraper/scraper/pull/221">rust-scraper/scraper#221</a></li>
<li>Bump ego-tree to version 0.10.0 by <a
href="https://github.com/cfvescovo"><code>@​cfvescovo</code></a> in <a
href="https://redirect.github.com/rust-scraper/scraper/pull/222">rust-scraper/scraper#222</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/rust-scraper/scraper/compare/v0.21.0...v0.22.0">https://github.com/rust-scraper/scraper/compare/v0.21.0...v0.22.0</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/rust-scraper/scraper/commit/dcf5e0c781f6b1d9a67b48ae0bdf551b04e9bc94"><code>dcf5e0c</code></a>
Version 0.22.0</li>
<li><a
href="https://github.com/rust-scraper/scraper/commit/932ed03849adb66f5106387d9ad62c29568e2b59"><code>932ed03</code></a>
Merge pull request <a
href="https://redirect.github.com/causal-agent/scraper/issues/222">#222</a>
from rust-scraper/bump-ego-tree</li>
<li><a
href="https://github.com/rust-scraper/scraper/commit/483ecab72112d75a3bb4f8784c9a9d3b20a01507"><code>483ecab</code></a>
Bump ego-tree to version 0.10.0</li>
<li><a
href="https://github.com/rust-scraper/scraper/commit/26f04ed47c43c1c0ae4ab67af80ce50a74186978"><code>26f04ed</code></a>
Merge pull request <a
href="https://redirect.github.com/causal-agent/scraper/issues/221">#221</a>
from rust-scraper/sorted-vec-instead-of-hash-table</li>
<li><a
href="https://github.com/rust-scraper/scraper/commit/ee66ee8d23f82eae453f00b507321e2f4819fc50"><code>ee66ee8</code></a>
Drop hash table for per-element attributes for more compact sorted
vector.</li>
<li><a
href="https://github.com/rust-scraper/scraper/commit/8d3e74bf368fdd20b308bce91b7aeaf1aea886e1"><code>8d3e74b</code></a>
Merge pull request <a
href="https://redirect.github.com/causal-agent/scraper/issues/220">#220</a>
from rust-scraper/make-clippy-happy</li>
<li><a
href="https://github.com/rust-scraper/scraper/commit/47cc9de9538022f7b9eadf80be09a95f31e6149e"><code>47cc9de</code></a>
Make current nightly version of Clippy happy.</li>
<li>See full diff in <a
href="https://github.com/causal-agent/scraper/compare/v0.21.0...v0.22.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=scraper&package-manager=cargo&previous-version=0.21.0&new-version=0.22.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                        | 9 ++++-----
 crates/nu_plugin_query/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4a50d71724..fac1ad9ff1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1418,9 +1418,9 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
 [[package]]
 name = "ego-tree"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c6ba7d4eec39eaa9ab24d44a0e73a7949a1095a8b3f3abb11eddf27dbb56a53"
+checksum = "b2972feb8dffe7bc8c5463b1dacda1b0dfbed3710e50f977d965429692d74cd8"
 
 [[package]]
 name = "either"
@@ -6085,11 +6085,10 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "scraper"
-version = "0.21.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0e749d29b2064585327af5038a5a8eb73aeebad4a3472e83531a436563f7208"
+checksum = "cc3d051b884f40e309de6c149734eab57aa8cc1347992710dc80bcc1c2194c15"
 dependencies = [
- "ahash 0.8.11",
  "cssparser",
  "ego-tree",
  "html5ever 0.29.0",
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index 431b728f62..260b909c90 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -20,7 +20,7 @@ nu-plugin = { path = "../nu-plugin", version = "0.100.1" }
 nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
 
 gjson = "0.8"
-scraper = { default-features = false, version = "0.21" }
+scraper = { default-features = false, version = "0.22" }
 sxd-document = "0.3"
 sxd-xpath = "0.4"
 webpage = { version = "2.0.1", features = ["serde"] }

From 1a573d17c016be109357d91bb3bb7ab057aecc2e Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Wed, 11 Dec 2024 07:08:15 -0600
Subject: [PATCH 0786/1072] =?UTF-8?q?Revert=20"For=20`#`=20to=20start=20a?=
 =?UTF-8?q?=20comment,=20then=20it=20either=20need=20to=20be=20the=20first?=
 =?UTF-8?q?=20chara=E2=80=A6"=20(#14560)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reverts nushell/nushell#14548

I'm finding may oddities
---
 crates/nu-parser/src/lex.rs        |  7 ++-----
 crates/nu-parser/tests/test_lex.rs | 23 -----------------------
 tests/repl/test_parser.rs          | 23 -----------------------
 3 files changed, 2 insertions(+), 51 deletions(-)

diff --git a/crates/nu-parser/src/lex.rs b/crates/nu-parser/src/lex.rs
index 04c3922154..f0802fcd7a 100644
--- a/crates/nu-parser/src/lex.rs
+++ b/crates/nu-parser/src/lex.rs
@@ -51,7 +51,7 @@ impl BlockKind {
 }
 
 // A baseline token is terminated if it's not nested inside of a paired
-// delimiter and the next character is one of: `|`, `;` or any
+// delimiter and the next character is one of: `|`, `;`, `#` or any
 // whitespace.
 fn is_item_terminator(
     block_level: &[BlockKind],
@@ -115,7 +115,6 @@ pub fn lex_item(
     //   character (whitespace, `|`, `;` or `#`) is encountered, the baseline
     //   token is done.
     // - Otherwise, accumulate the character into the current baseline token.
-    let mut previous_char = None;
     while let Some(c) = input.get(*curr_offset) {
         let c = *c;
 
@@ -152,8 +151,7 @@ pub fn lex_item(
             if is_item_terminator(&block_level, c, additional_whitespace, special_tokens) {
                 break;
             }
-            // To start a comment, It either need to be the first character of the token or prefixed with space.
-            in_comment = previous_char.map(|pc| pc == b' ').unwrap_or(true);
+            in_comment = true;
         } else if c == b'\n' || c == b'\r' {
             in_comment = false;
             if is_item_terminator(&block_level, c, additional_whitespace, special_tokens) {
@@ -256,7 +254,6 @@ pub fn lex_item(
         }
 
         *curr_offset += 1;
-        previous_char = Some(c);
     }
 
     let span = Span::new(span_offset + token_start, span_offset + *curr_offset);
diff --git a/crates/nu-parser/tests/test_lex.rs b/crates/nu-parser/tests/test_lex.rs
index 54ff674bb9..a14843f3f0 100644
--- a/crates/nu-parser/tests/test_lex.rs
+++ b/crates/nu-parser/tests/test_lex.rs
@@ -159,29 +159,6 @@ fn lex_comment() {
     );
 }
 
-#[test]
-fn lex_not_comment_needs_space_in_front_of_hashtag() {
-    let file = b"1..10 | each {echo test#testing }";
-
-    let output = lex(file, 0, &[], &[], false);
-
-    assert!(output.1.is_none());
-}
-
-#[test]
-fn lex_comment_with_space_in_front_of_hashtag() {
-    let file = b"1..10 | each {echo test #testing }";
-
-    let output = lex(file, 0, &[], &[], false);
-
-    assert!(output.1.is_some());
-    assert!(matches!(
-        output.1.unwrap(),
-        ParseError::UnexpectedEof(missing_token, span) if missing_token == "}"
-            && span == Span::new(33, 34)
-    ));
-}
-
 #[test]
 fn lex_is_incomplete() {
     let file = b"let x = 300 | ;";
diff --git a/tests/repl/test_parser.rs b/tests/repl/test_parser.rs
index 05a7c512cb..f77d431110 100644
--- a/tests/repl/test_parser.rs
+++ b/tests/repl/test_parser.rs
@@ -169,24 +169,6 @@ fn comment_skipping_in_pipeline_3() -> TestResult {
     )
 }
 
-#[test]
-fn still_string_if_hashtag_is_middle_of_string() -> TestResult {
-    run_test(r#"echo test#testing"#, "test#testing")
-}
-
-#[test]
-fn still_string_if_hashtag_is_middle_of_string_inside_each() -> TestResult {
-    run_test(
-        r#"1..1 | each {echo test#testing } | get 0"#,
-        "test#testing",
-    )
-}
-
-#[test]
-fn still_string_if_hashtag_is_middle_of_string_inside_each_also_with_dot() -> TestResult {
-    run_test(r#"1..1 | each {echo '.#testing' } | get 0"#, ".#testing")
-}
-
 #[test]
 fn bad_var_name() -> TestResult {
     fail_test(r#"let $"foo bar" = 4"#, "can't contain")
@@ -300,11 +282,6 @@ fn raw_string_with_equals() -> TestResult {
     )
 }
 
-#[test]
-fn raw_string_with_hashtag() -> TestResult {
-    run_test(r#"r##' one # two '##"#, "one # two")
-}
-
 #[test]
 fn list_quotes_with_equals() -> TestResult {
     run_test(

From 0872e9c3ae4876db433002a17d4742978dd0fcd9 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Wed, 11 Dec 2024 12:41:06 -0500
Subject: [PATCH 0787/1072] Allow both NU_PLUGIN_DIRS const and env at the same
 time (#14553)

# Description

Fix #14544 and is also the reciprocal of #14549.

Before: If both a const and env `NU_PLUGIN_DIRS` were defined at the
same time, the env paths would not be used.
After: The directories from `const NU_PLUGIN_DIRS` are searched for a
matching filename, and if not found, `$env.NU_PLUGIN_DIRS` directories
will be searched.

Before: `$env.NU_PLUGIN_DIRS` was unnecessary set both in main() and in
default_env.nu
After: `$env.NU_PLUGIN_DIRS` is only set in main()

Before: `$env.NU_PLUGIN_DIRS` was set to `plugins` in the config
directory
After: `$env.NU_PLUGIN_DIRS` is set to an empty list and `const
NU_PLUGIN_DIRS` is set to the directory above.

Also updates `sample_env.nu` to use the `const`

# User-Facing Changes

Most scenarios should work just fine as there continues to be an
`$env.NU_PLUGIN_DIRS` to append to or override.

However, there is a small chance of a breaking change if someone was
*querying* the old default `$env.NU_PLUGIN_DIRS`.

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

Also updated the `env` tests and added one for the `const`.

# After Submitting

Config doc updates
---
 crates/nu-cmd-plugin/src/util.rs              | 22 ++++++++++++-------
 .../nu-utils/src/default_files/default_env.nu |  4 ----
 .../nu-utils/src/default_files/sample_env.nu  |  6 +++--
 src/main.rs                                   | 13 +++++++++--
 tests/repl/test_env.rs                        | 12 +++++++++-
 5 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/crates/nu-cmd-plugin/src/util.rs b/crates/nu-cmd-plugin/src/util.rs
index 80d1a766b4..57de225ace 100644
--- a/crates/nu-cmd-plugin/src/util.rs
+++ b/crates/nu-cmd-plugin/src/util.rs
@@ -135,18 +135,24 @@ pub(crate) fn get_plugin_dirs(
     engine_state: &EngineState,
     stack: &Stack,
 ) -> impl Iterator<Item = String> {
-    // Get the NU_PLUGIN_DIRS constant or env var
+    // Get the NU_PLUGIN_DIRS from the constant and/or env var
     let working_set = StateWorkingSet::new(engine_state);
-    let value = working_set
+    let dirs_from_const = working_set
         .find_variable(b"$NU_PLUGIN_DIRS")
         .and_then(|var_id| working_set.get_constant(var_id).ok())
-        .or_else(|| stack.get_env_var(engine_state, "NU_PLUGIN_DIRS"))
-        .cloned(); // TODO: avoid this clone
-
-    // Get all of the strings in the list, if possible
-    value
+        .cloned() // TODO: avoid this clone
         .into_iter()
         .flat_map(|value| value.into_list().ok())
         .flatten()
-        .flat_map(|list_item| list_item.coerce_into_string().ok())
+        .flat_map(|list_item| list_item.coerce_into_string().ok());
+
+    let dirs_from_env = stack
+        .get_env_var(engine_state, "NU_PLUGIN_DIRS")
+        .cloned() // TODO: avoid this clone
+        .into_iter()
+        .flat_map(|value| value.into_list().ok())
+        .flatten()
+        .flat_map(|list_item| list_item.coerce_into_string().ok());
+
+    dirs_from_const.chain(dirs_from_env)
 }
diff --git a/crates/nu-utils/src/default_files/default_env.nu b/crates/nu-utils/src/default_files/default_env.nu
index f4c3f562ff..2e2d66f0bc 100644
--- a/crates/nu-utils/src/default_files/default_env.nu
+++ b/crates/nu-utils/src/default_files/default_env.nu
@@ -46,7 +46,3 @@ $env.ENV_CONVERSIONS = {
         to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
     }
 }
-
-$env.NU_PLUGIN_DIRS = $env.NU_PLUGIN_DIRS | default [
-    ($nu.default-config-dir | path join 'plugins') # add <nushell-config-dir>/plugins
-]
diff --git a/crates/nu-utils/src/default_files/sample_env.nu b/crates/nu-utils/src/default_files/sample_env.nu
index f44b8e1986..ea323c6c22 100644
--- a/crates/nu-utils/src/default_files/sample_env.nu
+++ b/crates/nu-utils/src/default_files/sample_env.nu
@@ -113,13 +113,15 @@ const NU_LIB_DIRS = $NU_LIB_DIRS ++ [($nu.default-config-dir | path join 'module
 
 # NU_PLUGIN_DIRS
 # --------------
-# Directories to search for plugin binaries when calling register.
+# Directories to search for plugin binaries when calling add.
 
 # By default, the `plugins` subdirectory of the default configuration
 # directory is included:
-$env.NU_PLUGIN_DIRS = [
+const NU_PLUGIN_DIRS = [
     ($nu.default-config-dir | path join 'plugins') # add <nushell-config-dir>/plugins
 ]
+# You can replace (override) or append to this list by shadowing the constant
+const NU_PLUGIN_DIRS = $NU_PLUGIN_DIRS ++ [($nu.default-config-dir | path join 'plugins')]
 
 # Appending to the OS path is a common configuration task.
 # Because of the previous ENV_CONVERSIONS (performed internally
diff --git a/src/main.rs b/src/main.rs
index 7898988844..1c82e58851 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -169,12 +169,21 @@ fn main() -> Result<()> {
 
     let mut default_nu_plugin_dirs_path = nushell_config_path;
     default_nu_plugin_dirs_path.push("plugins");
-    engine_state.add_env_var(
-        "NU_PLUGIN_DIRS".to_string(),
+    engine_state.add_env_var("NU_PLUGIN_DIRS".to_string(), Value::test_list(vec![]));
+    let mut working_set = nu_protocol::engine::StateWorkingSet::new(&engine_state);
+    let var_id = working_set.add_variable(
+        b"$NU_PLUGIN_DIRS".into(),
+        Span::unknown(),
+        Type::List(Box::new(Type::String)),
+        false,
+    );
+    working_set.set_variable_const_val(
+        var_id,
         Value::test_list(vec![Value::test_string(
             default_nu_plugin_dirs_path.to_string_lossy(),
         )]),
     );
+    engine_state.merge_delta(working_set.render())?;
     // End: Default NU_LIB_DIRS, NU_PLUGIN_DIRS
 
     // This is the real secret sauce to having an in-memory sqlite db. You must
diff --git a/tests/repl/test_env.rs b/tests/repl/test_env.rs
index f0a2070c30..d540ce2fd4 100644
--- a/tests/repl/test_env.rs
+++ b/tests/repl/test_env.rs
@@ -33,7 +33,17 @@ fn default_nu_lib_dirs_type() {
 }
 
 #[test]
-fn default_nu_plugin_dirs_type() {
+fn default_nu_plugin_dirs_env_type() {
+    // Previously, this was a list<string>
+    // While we are transitioning to const NU_PLUGIN_DIRS
+    // the env version will be empty, and thus a
+    // list<any>
     let actual = nu!("$env.NU_PLUGIN_DIRS | describe");
+    assert_eq!(actual.out, "list<any>");
+}
+
+#[test]
+fn default_nu_plugin_dirs_type() {
+    let actual = nu!("$NU_PLUGIN_DIRS | describe");
     assert_eq!(actual.out, "list<string>");
 }

From 035b882db1e719e8f5e77ff8516eb977c2e290bf Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Thu, 12 Dec 2024 11:43:20 -0500
Subject: [PATCH 0788/1072] Update sample and scaffold files (#14568)

# Description

Tidying up some of the wording of the sample and scaffold files to align
with our current recommendations:

* Continue to generate a commented-only `env.nu` and `config.nu` on
first launch.
* The generated `env.nu` mentions that most configuration can be done in
`config.nu`
* The `sample_env.nu` mentions the same. I might try getting rid of
`config env --sample` entirely (it's new since 0.100 anyway).
* All configuration is now documented "in-shell" in `sample_config.nu`,
which can be viewed using `config nu --sample` - This means that
environment variables that used to be in `sample_env.nu` have been moved
to `sample_config.new`.

# User-Facing Changes

Doc-only

# Tests + Formatting

Doc-only changes, but:

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

Need to work on updates to Config chapter
---
 .../src/default_files/sample_config.nu        | 142 +++++++++++++++++
 .../nu-utils/src/default_files/sample_env.nu  | 145 +-----------------
 .../src/default_files/scaffold_env.nu         |  19 +--
 3 files changed, 158 insertions(+), 148 deletions(-)

diff --git a/crates/nu-utils/src/default_files/sample_config.nu b/crates/nu-utils/src/default_files/sample_config.nu
index 143e56aae4..ceb65835cd 100644
--- a/crates/nu-utils/src/default_files/sample_config.nu
+++ b/crates/nu-utils/src/default_files/sample_config.nu
@@ -785,3 +785,145 @@ $env.config.explore = {
     },
     selected_cell: { bg: light_blue },
 }
+
+# ---------------------------------------------------------------------------------------
+# Environment Variables
+# ---------------------------------------------------------------------------------------
+
+# In addition to the $env.config record, a number of other environment variables
+# also affect Nushell's behavior:
+
+# PROMPT_*
+# --------
+# Prompt configuration
+# PROMPT_ variables accept either a string or a closure that returns a string
+
+# PROMPT_COMMAND
+# --------------
+# Defines the primary prompt. Note that the PROMPT_INDICATOR (below) is appended to this value.
+# Simple example - Static string:
+$env.PROMPT_COMMAND = "Nushell"
+# Simple example - Dynamic closure displaying the path:
+$env.PROMPT_COMMAND = {|| pwd}
+
+# PROMPT_COMMAND_RIGHT
+# --------------------
+# Defines a prompt which will appear right-aligned in the terminal
+$env.PROMPT_COMMAND_RIGHT = {|| date now | format date "%d-%a %r" }
+
+# PROMPT_INDICATOR*
+# -----------------
+# The prompt indicators are environmental variables that represent
+# the state of the prompt. The specified character(s) will appear
+# immediately following the PROMPT_COMMAND
+
+# When in Emacs mode (default):
+$env.PROMPT_INDICATOR = "> "
+
+# When in normal vi mode:
+$env.PROMPT_INDICATOR_VI_NORMAL = "> "
+# When in vi insert-mode:
+$env.PROMPT_INDICATOR_VI_INSERT = ": "
+
+# When a commandline extends across multiple lines:
+$env.PROMPT_MULTILINE_INDICATOR = "::: "
+
+# TRANSIENT_PROMPT_* 
+# ------------------
+# Allows a different prompt to be shown after a command has been executed.  This
+# can be useful if you have a 2-line prompt. Instead of each previously-entered
+# command taking up at least 2 lines, the transient prompt can condense it to a
+# shorter version. The following example shows a rocket emoji before each
+# previously-entered command:
+$env.TRANSIENT_PROMPT_COMMAND = "🚀 "
+$env.TRANSIENT_PROMPT_INDICATOR = ""
+$env.TRANSIENT_PROMPT_INDICATOR_VI_INSERT = ""
+$env.TRANSIENT_PROMPT_INDICATOR_VI_NORMAL = ""
+# Tip: Removing the transient multiline indicator and right-prompt can simplify
+#      copying from the terminal
+$env.TRANSIENT_PROMPT_MULTILINE_INDICATOR = ""
+$env.TRANSIENT_PROMPT_COMMAND_RIGHT = ""
+
+# ENV_CONVERSIONS
+# ---------------
+# Certain variables, such as those containing multiple paths, are often stored as a
+# colon-separated string in other shells. Nushell can convert these automatically to a
+# more convenient Nushell list.  The ENV_CONVERSIONS variable specifies how environment
+# variables are:
+# - converted from a string to a value on Nushell startup (from_string)
+# - converted from a value back to a string when running external commands (to_string)
+#
+# Note: The OS Path variable is automatically converted before env.nu loads, so it can
+# be treated a list in this file.
+# 
+# Note: Environment variables are not case-sensitive, so the following will work
+# for both Windows and Unix-like platforms.
+# 
+# By default, the internal conversion looks something like the following, so there
+# is no need to add this in your actual env.nu:
+$env.ENV_CONVERSIONS = {
+    "Path": {
+        from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
+        to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
+    }
+}
+
+# Here's an example converts the XDG_DATA_DIRS variable to and from a list:
+$env.ENV_CONVERSIONS = $env.ENV_CONVERSIONS | merge {
+    "XDG_DATA_DIRS": {
+        from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
+        to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
+    }
+}
+#
+# Other common directory-lists for conversion: TERMINFO_DIRS.
+# Note that other variable conversions take place after `config.nu` is loaded.
+
+# NU_LIB_DIRS
+# -----------
+# Directories in this constant are searched by the
+# `use` and `source` commands.
+#
+# By default, the `scripts` subdirectory of the default configuration
+# directory is included:
+const NU_LIB_DIRS = [
+    ($nu.default-config-dir | path join 'scripts') # add <nushell-config-dir>/scripts
+    ($nu.data-dir | path join 'completions') # default home for nushell completions
+]
+# You can replace (override) or append to this list by shadowing the constant
+const NU_LIB_DIRS = $NU_LIB_DIRS ++ [($nu.default-config-dir | path join 'modules')]
+
+# An environment variable version of this also exists. It is searched after the constant.
+$env.NU_LIB_DIRS ++= [ ($nu.data-dir | path join "nu_scripts") ]
+
+# NU_PLUGIN_DIRS
+# --------------
+# Directories to search for plugin binaries when calling add.
+
+# By default, the `plugins` subdirectory of the default configuration
+# directory is included:
+const NU_PLUGIN_DIRS = [
+    ($nu.default-config-dir | path join 'plugins') # add <nushell-config-dir>/plugins
+]
+# You can replace (override) or append to this list by shadowing the constant
+const NU_PLUGIN_DIRS = $NU_PLUGIN_DIRS ++ [($nu.default-config-dir | path join 'plugins')]
+
+# As with NU_LIB_DIRS, an $env.NU_PLUGIN_DIRS is searched after the constant version
+
+# Appending to the OS path is a common configuration task.
+# Because of the previous ENV_CONVERSIONS (performed internally
+# before your config.nu loads), the path variable is a list that can 
+# be appended to using, for example:
+$env.path ++= "~/.local/bin"
+
+# Or prepend using
+$env.path = "~/.local/bin" ++ $env.path
+
+# The `path add` function from the Standard Library also provides
+# a convenience method for prepending to the path:
+use std/util "path add"
+path add "~/.local/bin"
+path add ($env.CARGO_HOME | path join "bin")
+
+# You can remove duplicate directories from the path using:
+$env.PATH = ($env.PATH | uniq)
diff --git a/crates/nu-utils/src/default_files/sample_env.nu b/crates/nu-utils/src/default_files/sample_env.nu
index ea323c6c22..c081c87609 100644
--- a/crates/nu-utils/src/default_files/sample_env.nu
+++ b/crates/nu-utils/src/default_files/sample_env.nu
@@ -1,142 +1,9 @@
 # Sample Nushell Environment Config File
 #
-# Environment variables are usually configured in `env.nu`. Nushell
-# sets sensible defaults for many environment variables, so the user's
-# `env.nu` only needs to override these defaults if desired.
-#
-# This file serves as simple "in-shell" documentation for these
-# settings, or you can view a more complete discussion online at:
-# https://nushell.sh/book/configuration
-#
-# You can pretty-print and page this file using:
-# config env --sample | nu-highlight | less -R
+# Previously, environment variables were typically configured in `env.nu`.
+# In general, most configuration can and should be performed in `config.nu`
+# or one of the autoload directories.
 
-# PROMPT_*
-# --------
-# Prompt configuration
-# PROMPT_ variables accept either a string or a closure that returns a string
-
-# PROMPT_COMMAND
-# --------------
-# Defines the primary prompt. Note that the PROMPT_INDICATOR (below) is appended to this value.
-# Simple example - Static string:
-$env.PROMPT_COMMAND = "Nushell"
-# Simple example - Dynamic closure displaying the path:
-$env.PROMPT_COMMAND = {|| pwd}
-
-# PROMPT_COMMAND_RIGHT
-# --------------------
-# Defines a prompt which will appear right-aligned in the terminal
-$env.PROMPT_COMMAND_RIGHT = {|| date now | format date "%d-%a %r" }
-
-# PROMPT_INDICATOR*
-# -----------------
-# The prompt indicators are environmental variables that represent
-# the state of the prompt. The specified character(s) will appear
-# immediately following the PROMPT_COMMAND
-
-# When in Emacs mode (default):
-$env.PROMPT_INDICATOR = "> "
-
-# When in normal vi mode:
-$env.PROMPT_INDICATOR_VI_NORMAL = "> "
-# When in vi insert-mode:
-$env.PROMPT_INDICATOR_VI_INSERT = ": "
-
-# When a commandline extends across multiple lines:
-$env.PROMPT_MULTILINE_INDICATOR = "::: "
-
-# TRANSIENT_PROMPT_* 
-# ------------------
-# Allows a different prompt to be shown after a command has been executed.  This
-# can be useful if you have a 2-line prompt. Instead of each previously-entered
-# command taking up at least 2 lines, the transient prompt can condense it to a
-# shorter version. The following example shows a rocket emoji before each
-# previously-entered command:
-$env.TRANSIENT_PROMPT_COMMAND = "🚀 "
-$env.TRANSIENT_PROMPT_INDICATOR = ""
-$env.TRANSIENT_PROMPT_INDICATOR_VI_INSERT = ""
-$env.TRANSIENT_PROMPT_INDICATOR_VI_NORMAL = ""
-# Tip: Removing the transient multiline indicator and right-prompt can simplify
-#      copying from the terminal
-$env.TRANSIENT_PROMPT_MULTILINE_INDICATOR = ""
-$env.TRANSIENT_PROMPT_COMMAND_RIGHT = ""
-
-# ENV_CONVERSIONS
-# ---------------
-# Certain variables, such as those containing multiple paths, are often stored as a
-# colon-separated string in other shells. Nushell can convert these automatically to a
-# more convenient Nushell list.  The ENV_CONVERSIONS variable specifies how environment
-# variables are:
-# - converted from a string to a value on Nushell startup (from_string)
-# - converted from a value back to a string when running external commands (to_string)
-#
-# Note: The OS Path variable is automatically converted before env.nu loads, so it can
-# be treated a list in this file.
-# 
-# Note: Environment variables are not case-sensitive, so the following will work
-# for both Windows and Unix-like platforms.
-# 
-# By default, the internal conversion looks something like the following, so there
-# is no need to add this in your actual env.nu:
-$env.ENV_CONVERSIONS = {
-    "Path": {
-        from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
-        to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
-    }
-}
-
-# Here's an example converts the XDG_DATA_DIRS variable to and from a list:
-$env.ENV_CONVERSIONS = $env.ENV_CONVERSIONS | merge {
-    "XDG_DATA_DIRS": {
-        from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
-        to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
-    }
-}
-#
-# Other common directory-lists for conversion: TERMINFO_DIRS.
-# Note that other variable conversions take place after `config.nu` is loaded.
-
-# NU_LIB_DIRS
-# -----------
-# Directories in this constant are searched by the
-# `use` and `source` commands.
-#
-# By default, the `scripts` subdirectory of the default configuration
-# directory is included:
-const NU_LIB_DIRS = [
-    ($nu.default-config-dir | path join 'scripts') # add <nushell-config-dir>/scripts
-    ($nu.data-dir | path join 'completions') # default home for nushell completions
-]
-# You can replace (override) or append to this list by shadowing the constant
-const NU_LIB_DIRS = $NU_LIB_DIRS ++ [($nu.default-config-dir | path join 'modules')]
-
-# NU_PLUGIN_DIRS
-# --------------
-# Directories to search for plugin binaries when calling add.
-
-# By default, the `plugins` subdirectory of the default configuration
-# directory is included:
-const NU_PLUGIN_DIRS = [
-    ($nu.default-config-dir | path join 'plugins') # add <nushell-config-dir>/plugins
-]
-# You can replace (override) or append to this list by shadowing the constant
-const NU_PLUGIN_DIRS = $NU_PLUGIN_DIRS ++ [($nu.default-config-dir | path join 'plugins')]
-
-# Appending to the OS path is a common configuration task.
-# Because of the previous ENV_CONVERSIONS (performed internally
-# before your env.nu loads), the path variable is a list that can 
-# be appended to using, for example:
-$env.path ++= "~/.local/bin"
-
-# Or prepend using
-$env.path = "~/.local/bin" ++ $env.path
-
-# The `path add` function from the Standard Library also provides
-# a convenience method for prepending to the path:
-use std/util "path add"
-path add "~/.local/bin"
-path add ($env.CARGO_HOME | path join "bin")
-
-# You can remove duplicate directories from the path using:
-$env.PATH = ($env.PATH | uniq)
+# To pretty-print the in-shell documentation for Nushell's various configuration
+# settings, you can run:
+config nu --sample | nu-highlight | less -R
\ No newline at end of file
diff --git a/crates/nu-utils/src/default_files/scaffold_env.nu b/crates/nu-utils/src/default_files/scaffold_env.nu
index a3ce3cab07..7071b9fb3d 100644
--- a/crates/nu-utils/src/default_files/scaffold_env.nu
+++ b/crates/nu-utils/src/default_files/scaffold_env.nu
@@ -1,17 +1,18 @@
 # env.nu
 #
-# This file is typically used to add or override environment variables.
+# Previously, environment variables were typically configured in `env.nu`.
+# In general, most configuration can and should be performed in `config.nu`
+# or one of the autoload directories.
+#
+# This file is generated for backwards compatibility for now.
+# It is loaded before config.nu and login.nu
+#
 # See https://www.nushell.sh/book/configuration.html
 #
-# This file is loaded before config.nu and login.nu
+# To pretty-print a sample of the configuration settings, run:
+# config nu --sample | nu-highlight | less -R
 #
-# You can open this file in your default editor using:
-# config env
-#
-# To pretty-print a sample env.nu with documentation, run:
-# config env --sample | nu-highlight | less -R
-#
-# To pretty-print the default environment values, run:
+# To pretty-print the default env.nu, run:
 # config env --default | nu-highlight | less -R
 #
 # You can remove these comments if you want or leave

From 7aacad3270c89fdc89e4cbcbf61b1769ea69bd13 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Thu, 12 Dec 2024 11:50:28 -0500
Subject: [PATCH 0789/1072] Set empty `ENV_CONVERSIONS` record by default
 (#14566)

# Description

With Windows Path case-insensitivity in place, we no longer need an
`ENV_CONVERSIONS` for `PATH`, as the
`nu_engine::env::convert_env_values()` handles it automatically.

This PR:

* Removes the default `ENV_CONVERSIONS` for path from `default_env.nu`
* Sets `ENV_CONVERSIONS` to an empty record (so it can be `merge`'d) in
`main()` instead

# User-Facing Changes

No behavioral changes - Users will now have an empty `ENV_CONVERSIONS`
at startup by default, but the behavior should not change.

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
---
 crates/nu-utils/src/default_files/default_env.nu | 7 -------
 src/main.rs                                      | 7 ++++++-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/crates/nu-utils/src/default_files/default_env.nu b/crates/nu-utils/src/default_files/default_env.nu
index 2e2d66f0bc..66b442ce7a 100644
--- a/crates/nu-utils/src/default_files/default_env.nu
+++ b/crates/nu-utils/src/default_files/default_env.nu
@@ -39,10 +39,3 @@ $env.PROMPT_COMMAND_RIGHT = $env.PROMPT_COMMAND_RIGHT? | default {||
 
     ([$last_exit_code, (char space), $time_segment] | str join)
 }
-
-$env.ENV_CONVERSIONS = {
-    "PATH": {
-        from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
-        to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
-    }
-}
diff --git a/src/main.rs b/src/main.rs
index 1c82e58851..7d39aef02b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -24,7 +24,7 @@ use nu_cli::gather_parent_env_vars;
 use nu_lsp::LanguageServer;
 use nu_path::canonicalize_with;
 use nu_protocol::{
-    engine::EngineState, report_shell_error, ByteStream, Config, IntoValue, PipelineData,
+    engine::EngineState, record, report_shell_error, ByteStream, Config, IntoValue, PipelineData,
     ShellError, Span, Spanned, Type, Value,
 };
 use nu_std::load_standard_library;
@@ -285,6 +285,11 @@ fn main() -> Result<()> {
     );
     perf!("$env.config setup", start_time, use_color);
 
+    engine_state.add_env_var(
+        "ENV_CONVERSIONS".to_string(),
+        Value::test_record(record! {}),
+    );
+
     start_time = std::time::Instant::now();
     if let Some(include_path) = &parsed_nu_cli_args.include_path {
         let span = include_path.span;

From ebce62629e9f6fa3d68ba13f27d5d672997f7850 Mon Sep 17 00:00:00 2001
From: Rikuki IX <52599939+rikukiix@users.noreply.github.com>
Date: Fri, 13 Dec 2024 01:19:03 +0800
Subject: [PATCH 0790/1072] fix: make exec command decrement SHLVL correctly
 (#14570)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

fixes #14567

Now NuShell's `exec` command will decrement `SHLVL` env value before
passing it to target executable.

It only works in interactive session, the same as `SHLVL`
initialization.

In addition, this PR also make a simple change to `SHLVL` initialization
(only remove an unnecessary type conversion).

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

None.

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

Formatted.

With interactively tested with several shells (bash, zsh, fish) and
cross-exec-ing them, it works well this time.

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/system/exec.rs | 10 ++++++++++
 src/main.rs                          |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/system/exec.rs b/crates/nu-command/src/system/exec.rs
index 8a2b24a113..e9f49b86c1 100644
--- a/crates/nu-command/src/system/exec.rs
+++ b/crates/nu-command/src/system/exec.rs
@@ -61,6 +61,16 @@ On Windows based systems, Nushell will wait for the command to finish and then e
         let envs = env_to_strings(engine_state, stack)?;
         command.env_clear();
         command.envs(envs);
+        // Decrement SHLVL as removing the current shell from the stack
+        // (only works in interactive mode, same as initialization)
+        if engine_state.is_interactive {
+            if let Some(shlvl) = engine_state.get_env_var("SHLVL") {
+                let shlvl = shlvl.as_int().unwrap_or(1) - 1;
+                command.env("SHLVL", shlvl.to_string());
+            } else {
+                command.env("SHLVL", "0");
+            }
+        }
 
         // Configure args.
         let args = crate::eval_arguments_from_call(engine_state, stack, call)?;
diff --git a/src/main.rs b/src/main.rs
index 7d39aef02b..db55db3ff2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -325,7 +325,7 @@ fn main() -> Result<()> {
     if engine_state.is_interactive {
         let mut shlvl = engine_state
             .get_env_var("SHLVL")
-            .map(|x| x.as_str().unwrap_or("0").parse::<i64>().unwrap_or(0))
+            .map(|x| x.as_int().unwrap_or(0))
             .unwrap_or(0);
         shlvl += 1;
         engine_state.add_env_var("SHLVL".to_string(), Value::int(shlvl, Span::unknown()));

From 0b9696215770f966455707560df927b394b76aaa Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Fri, 13 Dec 2024 13:40:03 +0800
Subject: [PATCH 0791/1072] run `cargo update` manually to update dependencies
 (#14569)

#14556 Seems strange to me, because it downgrade `windows-target`
version.

So In this pr I tried to update it by hand, and also run `cargo update`
manually to see how it goes
---
 Cargo.lock | 555 +++++++++++++++++++++++------------------------------
 1 file changed, 244 insertions(+), 311 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fac1ad9ff1..d37c10a46f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -82,9 +82,9 @@ dependencies = [
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.20"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "alphanumeric-sort"
@@ -177,9 +177,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.93"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
+checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7"
 
 [[package]]
 name = "arbitrary"
@@ -284,7 +284,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -295,7 +295,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -384,7 +384,7 @@ dependencies = [
  "regex",
  "rustc-hash 1.1.0",
  "shlex",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -480,7 +480,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -512,9 +512,9 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a68f1f47cdf0ec8ee4b941b2eee2a80cb796db73118c0dd09ac63fbe405be22"
+checksum = "786a307d683a5bf92e6fd5fd69a7eb613751668d1d8d67d802846dfe367c62c8"
 dependencies = [
  "memchr",
  "regex-automata",
@@ -568,9 +568,9 @@ checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce"
 
 [[package]]
 name = "bytemuck"
-version = "1.19.0"
+version = "1.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d"
+checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a"
 dependencies = [
  "bytemuck_derive",
 ]
@@ -583,7 +583,7 @@ checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -637,9 +637,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.1"
+version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47"
+checksum = "27f657647bcff5394bf56c7317665bbf790a137a50eaaa5c6bfbb9e27a518f2d"
 dependencies = [
  "jobserver",
  "libc",
@@ -696,9 +696,9 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -812,9 +812,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.21"
+version = "4.5.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f"
+checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -822,9 +822,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.21"
+version = "4.5.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec"
+checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838"
 dependencies = [
  "anstream",
  "anstyle",
@@ -842,14 +842,14 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7"
+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
 
 [[package]]
 name = "clipboard-win"
@@ -877,11 +877,11 @@ checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "colorz"
-version = "1.1.2"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc2a5df6ee18d52a36920c93a7736761c6fcffa72b9d960fd9133dd8d57c5184"
+checksum = "6ceb37c5798821e37369cb546f430f19da2f585e0364c9615ae340a9f2e6067b"
 dependencies = [
- "supports-color 2.1.0",
+ "supports-color",
 ]
 
 [[package]]
@@ -959,18 +959,18 @@ dependencies = [
 
 [[package]]
 name = "const_format"
-version = "0.2.33"
+version = "0.2.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50c655d81ff1114fb0dcdea9225ea9f0cc712a6f8d189378e82bdf62a473a64b"
+checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd"
 dependencies = [
  "const_format_proc_macros",
 ]
 
 [[package]]
 name = "const_format_proc_macros"
-version = "0.2.33"
+version = "0.2.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eff1a44b93f47b1bac19a27932f5c591e43d1ba357ee4f61526c8a25603f0eb1"
+checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1011,9 +1011,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6"
+checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
 dependencies = [
  "libc",
 ]
@@ -1109,7 +1109,7 @@ checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
 dependencies = [
  "bitflags 2.6.0",
  "crossterm_winapi",
- "mio 1.0.2",
+ "mio 1.0.3",
  "parking_lot",
  "rustix",
  "serde",
@@ -1163,7 +1163,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
 dependencies = [
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1250,7 +1250,7 @@ checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1261,7 +1261,7 @@ checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1272,7 +1272,7 @@ checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1338,7 +1338,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1465,7 +1465,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1519,12 +1519,12 @@ dependencies = [
 
 [[package]]
 name = "errno"
-version = "0.3.9"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1570,9 +1570,9 @@ checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c"
 
 [[package]]
 name = "fastrand"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
 [[package]]
 name = "fd-lock"
@@ -1773,7 +1773,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1909,9 +1909,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
+checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -1978,9 +1978,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.1"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 dependencies = [
  "allocator-api2",
  "equivalent",
@@ -2020,18 +2020,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
-[[package]]
-name = "hermit-abi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
-[[package]]
-name = "hermit-abi"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
-
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -2058,7 +2046,7 @@ dependencies = [
  "markup5ever 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2072,14 +2060,14 @@ dependencies = [
  "markup5ever 0.14.0",
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "http"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
 dependencies = [
  "bytes",
  "fnv",
@@ -2141,9 +2129,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a"
+checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -2344,7 +2332,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2375,7 +2363,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.1",
+ "hashbrown 0.15.2",
  "serde",
 ]
 
@@ -2420,9 +2408,9 @@ dependencies = [
 
 [[package]]
 name = "interprocess"
-version = "2.2.1"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2f4e4a06d42fab3e85ab1b419ad32b09eab58b901d40c57935ff92db3287a13"
+checksum = "894148491d817cb36b6f778017b8ac46b17408d522dd90f539d677ea938362eb"
 dependencies = [
  "doctest-file",
  "libc",
@@ -2452,17 +2440,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "is-terminal"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
-dependencies = [
- "hermit-abi 0.4.0",
- "libc",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "is-wsl"
 version = "0.4.0"
@@ -2529,9 +2506,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "itoap"
@@ -2550,10 +2527,11 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.72"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
+checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -2596,9 +2574,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.162"
+version = "0.2.168"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
+checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d"
 
 [[package]]
 name = "libflate"
@@ -2636,9 +2614,9 @@ dependencies = [
 
 [[package]]
 name = "libloading"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
 dependencies = [
  "cfg-if",
  "windows-targets 0.52.6",
@@ -2736,9 +2714,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "litemap"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
 
 [[package]]
 name = "lock_api"
@@ -2768,7 +2746,7 @@ version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
 dependencies = [
- "hashbrown 0.15.1",
+ "hashbrown 0.15.2",
 ]
 
 [[package]]
@@ -2924,7 +2902,7 @@ dependencies = [
  "cfg-if",
  "miette-derive",
  "owo-colors",
- "supports-color 3.0.1",
+ "supports-color",
  "supports-hyperlinks",
  "supports-unicode",
  "terminal_size",
@@ -2941,7 +2919,7 @@ checksum = "23c9b935fbe1d6cbd1dac857b54a688145e2d93f48db36010514d0f612d0ad67"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2998,11 +2976,10 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
- "hermit-abi 0.3.9",
  "libc",
  "log",
  "wasi",
@@ -3257,7 +3234,7 @@ dependencies = [
  "percent-encoding",
  "reedline",
  "rstest",
- "sysinfo 0.32.0",
+ "sysinfo 0.32.1",
  "tempfile",
  "unicode-segmentation",
  "uuid",
@@ -3404,7 +3381,7 @@ dependencies = [
  "pretty_assertions",
  "print-positions",
  "procfs",
- "quick-xml 0.37.0",
+ "quick-xml 0.37.1",
  "quickcheck",
  "quickcheck_macros",
  "rand",
@@ -3421,11 +3398,11 @@ dependencies = [
  "serde_urlencoded",
  "serde_yaml",
  "sha2",
- "sysinfo 0.32.0",
+ "sysinfo 0.32.1",
  "tabled",
  "tempfile",
  "titlecase",
- "toml 0.8.19",
+ "toml",
  "trash",
  "umask",
  "unicode-segmentation",
@@ -3456,7 +3433,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -3574,7 +3551,7 @@ dependencies = [
  "nu-protocol",
  "nu-utils",
  "serde",
- "thiserror 2.0.3",
+ "thiserror 2.0.6",
  "typetag",
 ]
 
@@ -3680,7 +3657,7 @@ dependencies = [
  "strum",
  "strum_macros",
  "tempfile",
- "thiserror 2.0.3",
+ "thiserror 2.0.6",
  "typetag",
  "windows-sys 0.48.0",
 ]
@@ -3709,7 +3686,7 @@ dependencies = [
  "nix 0.29.0",
  "ntapi",
  "procfs",
- "sysinfo 0.32.0",
+ "sysinfo 0.32.1",
  "windows 0.56.0",
 ]
 
@@ -4189,7 +4166,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -4200,9 +4177,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-src"
-version = "300.4.0+3.4.0"
+version = "300.4.1+3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a709e02f2b4aca747929cca5ed248880847c650233cf8b8cdc48f40aaf4898a6"
+checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c"
 dependencies = [
  "cc",
 ]
@@ -4325,9 +4302,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "pathdiff"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361"
+checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
 
 [[package]]
 name = "percent-encoding"
@@ -4343,20 +4320,20 @@ checksum = "f658886ed52e196e850cfbbfddab9eaa7f6d90dd0929e264c31e5cec07e09e57"
 
 [[package]]
 name = "pest"
-version = "2.7.14"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442"
+checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc"
 dependencies = [
  "memchr",
- "thiserror 1.0.69",
+ "thiserror 2.0.6",
  "ucd-trie",
 ]
 
 [[package]]
 name = "pest_derive"
-version = "2.7.14"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd"
+checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e"
 dependencies = [
  "pest",
  "pest_generator",
@@ -4364,22 +4341,22 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.14"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e"
+checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.14"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d"
+checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea"
 dependencies = [
  "once_cell",
  "pest",
@@ -4446,7 +4423,7 @@ dependencies = [
  "phf_shared 0.11.2",
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -4561,7 +4538,7 @@ dependencies = [
  "ethnum",
  "fast-float",
  "getrandom",
- "hashbrown 0.15.1",
+ "hashbrown 0.15.2",
  "itoa",
  "itoap",
  "lz4",
@@ -4622,7 +4599,7 @@ dependencies = [
  "comfy-table",
  "either",
  "hashbrown 0.14.5",
- "hashbrown 0.15.1",
+ "hashbrown 0.15.2",
  "indexmap",
  "num-traits",
  "once_cell",
@@ -4666,7 +4643,7 @@ checksum = "ea1b431ed816cba1120cff200f06b962748001bbb2e615ce53cfbbdf701cc136"
 dependencies = [
  "ahash 0.8.11",
  "bitflags 2.6.0",
- "hashbrown 0.15.1",
+ "hashbrown 0.15.2",
  "num-traits",
  "once_cell",
  "polars-arrow",
@@ -4699,7 +4676,7 @@ dependencies = [
  "fs4",
  "futures",
  "glob",
- "hashbrown 0.15.1",
+ "hashbrown 0.15.2",
  "home",
  "itoa",
  "memchr",
@@ -4740,7 +4717,7 @@ dependencies = [
  "ahash 0.8.11",
  "chrono",
  "fallible-streaming-iterator",
- "hashbrown 0.15.1",
+ "hashbrown 0.15.2",
  "indexmap",
  "itoa",
  "num-traits",
@@ -4814,7 +4791,7 @@ dependencies = [
  "chrono",
  "chrono-tz 0.8.6",
  "either",
- "hashbrown 0.15.1",
+ "hashbrown 0.15.2",
  "hex",
  "indexmap",
  "jsonpath_lib_polars_vendor",
@@ -4853,7 +4830,7 @@ dependencies = [
  "ethnum",
  "flate2",
  "futures",
- "hashbrown 0.15.1",
+ "hashbrown 0.15.2",
  "lz4",
  "num-traits",
  "polars-arrow",
@@ -4888,7 +4865,7 @@ dependencies = [
  "crossbeam-queue",
  "enum_dispatch",
  "futures",
- "hashbrown 0.15.1",
+ "hashbrown 0.15.2",
  "num-traits",
  "polars-arrow",
  "polars-compute",
@@ -4919,7 +4896,7 @@ dependencies = [
  "ciborium",
  "either",
  "futures",
- "hashbrown 0.15.1",
+ "hashbrown 0.15.2",
  "memmap2",
  "num-traits",
  "once_cell",
@@ -5049,7 +5026,7 @@ dependencies = [
  "bytemuck",
  "bytes",
  "compact_str 0.8.0",
- "hashbrown 0.15.1",
+ "hashbrown 0.15.2",
  "indexmap",
  "libc",
  "memmap2",
@@ -5076,9 +5053,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
 
 [[package]]
 name = "powerfmt"
@@ -5153,7 +5130,7 @@ version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
 dependencies = [
- "toml_edit 0.22.22",
+ "toml_edit",
 ]
 
 [[package]]
@@ -5181,9 +5158,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.89"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
  "unicode-ident",
 ]
@@ -5305,7 +5282,7 @@ dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -5318,7 +5295,7 @@ dependencies = [
  "proc-macro2",
  "pyo3-build-config",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -5364,9 +5341,9 @@ dependencies = [
 
 [[package]]
 name = "quick-xml"
-version = "0.37.0"
+version = "0.37.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffbfb3ddf5364c9cfcd65549a1e7b801d0e8d1b14c1a1590a6408aa93cfbfa84"
+checksum = "f22f29bdff3987b4d8632ef95fd6424ec7e4e0a57e2f4fc63e489e75357f6a03"
 dependencies = [
  "memchr",
 ]
@@ -5403,10 +5380,10 @@ dependencies = [
  "pin-project-lite",
  "quinn-proto",
  "quinn-udp",
- "rustc-hash 2.0.0",
+ "rustc-hash 2.1.0",
  "rustls",
  "socket2",
- "thiserror 2.0.3",
+ "thiserror 2.0.6",
  "tokio",
  "tracing",
 ]
@@ -5421,11 +5398,11 @@ dependencies = [
  "getrandom",
  "rand",
  "ring",
- "rustc-hash 2.0.0",
+ "rustc-hash 2.1.0",
  "rustls",
  "rustls-pki-types",
  "slab",
- "thiserror 2.0.3",
+ "thiserror 2.0.6",
  "tinyvec",
  "tracing",
  "web-time",
@@ -5433,9 +5410,9 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d5a626c6807713b15cac82a6acaccd6043c9a5408c24baae07611fec3f243da"
+checksum = "52cd4b1eff68bf27940dd39811292c49e007f4d0b4c357358dc9b0197be6b527"
 dependencies = [
  "cfg_aliases 0.2.1",
  "libc",
@@ -5572,7 +5549,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76009fbe0614077fc1a2ce255e3a1881a2e3a3527097d5dc6d8212c585e7e38b"
 dependencies = [
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -5583,9 +5560,9 @@ checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175"
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -5640,7 +5617,7 @@ checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -5743,7 +5720,7 @@ dependencies = [
  "chumsky",
  "memchr",
  "quoted_printable",
- "thiserror 2.0.3",
+ "thiserror 2.0.6",
 ]
 
 [[package]]
@@ -5857,7 +5834,7 @@ dependencies = [
  "regex",
  "relative-path",
  "rustc_version",
- "syn 2.0.87",
+ "syn 2.0.90",
  "unicode-ident",
 ]
 
@@ -5896,7 +5873,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rust-embed-utils",
- "syn 2.0.87",
+ "syn 2.0.90",
  "walkdir",
 ]
 
@@ -5951,9 +5928,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustc-hash"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
 
 [[package]]
 name = "rustc_version"
@@ -5966,22 +5943,22 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.40"
+version = "0.38.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99e4ea3e1cdc4b559b8e5650f9c8e5998e3e5c1343b4eaf034565f32318d63c0"
+checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
 dependencies = [
  "bitflags 2.6.0",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.19"
+version = "0.23.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1"
+checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b"
 dependencies = [
  "once_cell",
  "ring",
@@ -6064,9 +6041,9 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.26"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
 dependencies = [
  "windows-sys 0.59.0",
 ]
@@ -6114,7 +6091,7 @@ checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -6192,29 +6169,29 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.215"
+version = "1.0.216"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
+checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.215"
+version = "1.0.216"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
+checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.132"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
 dependencies = [
  "indexmap",
  "itoa",
@@ -6231,7 +6208,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -6290,7 +6267,7 @@ checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -6354,7 +6331,7 @@ checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
 dependencies = [
  "libc",
  "mio 0.8.11",
- "mio 1.0.2",
+ "mio 1.0.3",
  "signal-hook",
 ]
 
@@ -6473,9 +6450,9 @@ checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b"
 
 [[package]]
 name = "socket2"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -6503,7 +6480,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d904e7009df136af5297832a3ace3370cd14ff1546a232f4f185036c2736fcac"
 dependencies = [
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -6618,7 +6595,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -6629,28 +6606,18 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "supports-color"
-version = "2.1.0"
+version = "3.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6398cde53adc3c4557306a96ce67b302968513830a77a95b2b17305d9719a89"
-dependencies = [
- "is-terminal",
- "is_ci",
-]
-
-[[package]]
-name = "supports-color"
-version = "3.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8775305acf21c96926c900ad056abeef436701108518cf890020387236ac5a77"
+checksum = "c64fc7232dd8d2e4ac5ce4ef302b1d81e0b80d055b9d77c7c4f51f6aa4c867d6"
 dependencies = [
  "is_ci",
 ]
 
 [[package]]
 name = "supports-hyperlinks"
-version = "3.0.0"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c0a1e5168041f5f3ff68ff7d95dcb9c8749df29f6e7e89ada40dd4c9de404ee"
+checksum = "804f44ed3c63152de6a9f90acbea1a110441de43006ea51bcce8f436196a288b"
 
 [[package]]
 name = "supports-unicode"
@@ -6692,9 +6659,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.87"
+version = "2.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
+checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6718,7 +6685,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -6745,9 +6712,9 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.32.0"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b5ae3f4f7d64646c46c4cae4e3f01d1c5d255c7406fdd7c7f999a94e488791"
+checksum = "4c33cd241af0f2e9e3b5c32163b873b29956890b5342e6745b917ce9d490f4af"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -6877,11 +6844,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.3"
+version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa"
+checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47"
 dependencies = [
- "thiserror-impl 2.0.3",
+ "thiserror-impl 2.0.6",
 ]
 
 [[package]]
@@ -6892,18 +6859,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.3"
+version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
+checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -6918,9 +6885,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.36"
+version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
  "deranged",
  "itoa",
@@ -6941,9 +6908,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
 dependencies = [
  "num-conv",
  "time-core",
@@ -6994,14 +6961,14 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.41.1"
+version = "1.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33"
+checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
- "mio 1.0.2",
+ "mio 1.0.3",
  "parking_lot",
  "pin-project-lite",
  "socket2",
@@ -7017,25 +6984,24 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
 dependencies = [
  "rustls",
- "rustls-pki-types",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-util"
-version = "0.7.12"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
  "bytes",
  "futures-core",
@@ -7044,18 +7010,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "toml"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit 0.19.15",
-]
-
 [[package]]
 name = "toml"
 version = "0.8.19"
@@ -7066,7 +7020,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.22",
+ "toml_edit",
 ]
 
 [[package]]
@@ -7078,19 +7032,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "toml_edit"
-version = "0.19.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow 0.5.40",
-]
-
 [[package]]
 name = "toml_edit"
 version = "0.22.22"
@@ -7101,7 +7042,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.20",
+ "winnow",
 ]
 
 [[package]]
@@ -7112,9 +7053,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "pin-project-lite",
  "tracing-attributes",
@@ -7129,23 +7070,23 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
 ]
 
 [[package]]
 name = "trash"
-version = "5.2.0"
+version = "5.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defe1fdd4232e407b312377885a2c5396764972bddad87baf304753374a1bfc8"
+checksum = "a8e5ca62c20366b4685e3e41fba17bc7c9bbdcb82e65a89d6fda2ceea5fffd2f"
 dependencies = [
  "chrono",
  "libc",
@@ -7153,6 +7094,7 @@ dependencies = [
  "objc2",
  "objc2-foundation",
  "once_cell",
+ "percent-encoding",
  "scopeguard",
  "urlencoding",
  "windows 0.56.0",
@@ -7222,7 +7164,7 @@ checksum = "70b20a22c42c8f1cd23ce5e34f165d4d37038f5b663ad20fb6adbdf029172483"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -7248,9 +7190,9 @@ checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.13"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 
 [[package]]
 name = "unicode-linebreak"
@@ -7322,9 +7264,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "ureq"
-version = "2.12.0"
+version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3193f92e105038f98ae68af40c008e3c94f2f046926e0f95e6c835dc6459bac8"
+checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d"
 dependencies = [
  "base64",
  "encoding_rs",
@@ -7339,9 +7281,9 @@ dependencies = [
 
 [[package]]
 name = "url"
-version = "2.5.3"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -7496,9 +7438,9 @@ dependencies = [
 
 [[package]]
 name = "uucore_procs"
-version = "0.0.27"
+version = "0.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d588f57acb2ba416e072a6fa652f2e11cf727267c697d2e2d65175f3b10c41"
+checksum = "d91d598cf92275d9373e1eb0b9dcf85b730bde48186ed7db3bde713803090511"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7507,9 +7449,9 @@ dependencies = [
 
 [[package]]
 name = "uuhelp_parser"
-version = "0.0.27"
+version = "0.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96f26868814bf1ca9deec910a08007c93eb1d8e407ce36451999d4c1c1ea6767"
+checksum = "86b4d8c991cc252d4b4ea2958d0d842e36af0d1ca7f1fdc4fdce8fd0a2ff6e9c"
 
 [[package]]
 name = "uuid"
@@ -7618,9 +7560,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.95"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
+checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -7629,36 +7571,36 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.95"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
+checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.45"
+version = "0.4.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
+checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2"
 dependencies = [
  "cfg-if",
  "js-sys",
+ "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.95"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
+checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -7666,22 +7608,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.95"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
+checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.95"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
+checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
 
 [[package]]
 name = "wasm-streams"
@@ -7786,9 +7728,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.72"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
+checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -7937,7 +7879,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -7948,7 +7890,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -7959,7 +7901,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -7970,7 +7912,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -8160,15 +8102,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
-[[package]]
-name = "winnow"
-version = "0.5.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "winnow"
 version = "0.6.20"
@@ -8190,11 +8123,11 @@ dependencies = [
 
 [[package]]
 name = "winresource"
-version = "0.1.17"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77e2aaaf8cfa92078c0c0375423d631f82f2f57979c2884fdd5f604a11e45329"
+checksum = "7276691b353ad4547af8c3268488d1311f4be791ffdc0c65b8cfa8f41eed693b"
 dependencies = [
- "toml 0.7.8",
+ "toml",
  "version_check",
 ]
 
@@ -8298,9 +8231,9 @@ checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
 
 [[package]]
 name = "yoke"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
 dependencies = [
  "serde",
  "stable_deref_trait",
@@ -8310,13 +8243,13 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
  "synstructure",
 ]
 
@@ -8338,27 +8271,27 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "zerofrom"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
 dependencies = [
  "zerofrom-derive",
 ]
 
 [[package]]
 name = "zerofrom-derive"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
  "synstructure",
 ]
 
@@ -8387,14 +8320,14 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "zip"
-version = "2.2.0"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494"
+checksum = "99d52293fc86ea7cf13971b3bb81eb21683636e7ae24c729cdaf1b7c4157a352"
 dependencies = [
  "arbitrary",
  "crc32fast",
@@ -8403,7 +8336,7 @@ dependencies = [
  "flate2",
  "indexmap",
  "memchr",
- "thiserror 1.0.69",
+ "thiserror 2.0.6",
  "zopfli",
 ]
 

From 49f377688a88387010aea0a2781bbb6a69bf67d3 Mon Sep 17 00:00:00 2001
From: Solomon <git@solomonvictorino.com>
Date: Fri, 13 Dec 2024 05:55:57 -0700
Subject: [PATCH 0792/1072] support raw strings in match patterns (#14573)

Fixes #14554

# User-Facing Changes

Raw strings are now supported in match patterns:

```diff
match "foo" { r#'foo'# => true, _ => false }
-false
+true
```
---
 crates/nu-command/tests/commands/match_.rs     | 9 +++++++++
 crates/nu-protocol/src/engine/pattern_match.rs | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/tests/commands/match_.rs b/crates/nu-command/tests/commands/match_.rs
index 23e4450d2b..5d41b3291a 100644
--- a/crates/nu-command/tests/commands/match_.rs
+++ b/crates/nu-command/tests/commands/match_.rs
@@ -140,6 +140,15 @@ fn match_constant_7() {
     assert_eq!(actual.out, "success");
 }
 
+#[test]
+fn match_constant_8() {
+    let actual =
+        nu!(r#"match "foo" { r#'foo'# => { print "success" }, _ => { print "failure" } }"#);
+    // Make sure we don't see any of these values in the output
+    // As we do not auto-print loops anymore
+    assert_eq!(actual.out, "success");
+}
+
 #[test]
 fn match_null() {
     let actual = nu!(r#"match null { null => { print "success"}, _ => { print "failure" }}"#);
diff --git a/crates/nu-protocol/src/engine/pattern_match.rs b/crates/nu-protocol/src/engine/pattern_match.rs
index 3284527cc6..32c34d22d3 100644
--- a/crates/nu-protocol/src/engine/pattern_match.rs
+++ b/crates/nu-protocol/src/engine/pattern_match.rs
@@ -128,7 +128,7 @@ impl Matcher for Pattern {
                             false
                         }
                     }
-                    Expr::String(x) => {
+                    Expr::String(x) | Expr::RawString(x) => {
                         if let Value::String { val, .. } = &value {
                             x == val
                         } else {

From a7fa6d00c1a72f63ce953c3a6131d046aa4e3fee Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Fri, 13 Dec 2024 07:00:53 -0600
Subject: [PATCH 0793/1072] fix 64-bit hex number parsing (#14571)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

Closes #14521

This PR tweaks the way 64-bit hex numbers are parsed.

### Before
```nushell
❯ 0xffffffffffffffef
Error: nu::shell::external_command

  × External command failed
   ╭─[entry #1:1:1]
 1 │ 0xffffffffffffffef
   · ─────────┬────────
   ·          ╰── Command `0xffffffffffffffef` not found
   ╰────
  help: `0xffffffffffffffef` is neither a Nushell built-in or a known external command
```

### After
```nushell
❯ 0xffffffffffffffef
-17
```

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-parser/src/parser.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 07ab35dc36..d71ef77182 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -1532,7 +1532,9 @@ pub fn parse_int(working_set: &mut StateWorkingSet, span: Span) -> Expression {
         span: Span,
         radix: u32,
     ) -> Expression {
-        if let Ok(num) = i64::from_str_radix(token, radix) {
+        // Parse as a u64, then cast to i64, otherwise, for numbers like "0xffffffffffffffef",
+        // you'll get `Error parsing hex string: number too large to fit in target type`.
+        if let Ok(num) = u64::from_str_radix(token, radix).map(|val| val as i64) {
             Expression::new(working_set, Expr::Int(num), span, Type::Int)
         } else {
             working_set.error(ParseError::InvalidLiteral(

From cbf5fa6684a741598f6ba4e55835d0b89ddecdbc Mon Sep 17 00:00:00 2001
From: RobbingDaHood <16130319+RobbingDaHood@users.noreply.github.com>
Date: Fri, 13 Dec 2024 14:02:07 +0100
Subject: [PATCH 0794/1072] =?UTF-8?q?For=20`#`=20to=20start=20a=20comment,?=
 =?UTF-8?q?=20then=20it=20either=20need=20to=20be=20the=20first=20chara?=
 =?UTF-8?q?=E2=80=A6=20(#14562)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR should close
1. #10327
1. #13667
1. #13810
1. #14129

# Description
For `#` to start a comment, then it either need to be the first
character of the token or prefixed with ` ` (space).

So now you can do this:
```
~/Projects/nushell> 1..10 | each {echo test#testing }                                                                                                                     12/05/2024 05:37:19 PM
╭───┬──────────────╮
│ 0 │ test#testing │
│ 1 │ test#testing │
│ 2 │ test#testing │
│ 3 │ test#testing │
│ 4 │ test#testing │
│ 5 │ test#testing │
│ 6 │ test#testing │
│ 7 │ test#testing │
│ 8 │ test#testing │
│ 9 │ test#testing │
╰───┴──────────────╯
```

# User-Facing Changes
It is a breaking change if anyone expected comments to start in the
middle of a string without any prefixing ` ` (space).

# Tests + Formatting
Did all:
- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

# After Submitting
I cant see that I need to update anything in [the
documentation](https://github.com/nushell/nushell.github.io) but please
point me in the direction if there is anything.
---
 crates/nu-parser/src/lex.rs        | 12 ++++-----
 crates/nu-parser/tests/test_lex.rs | 23 +++++++++++++++++
 tests/repl/test_parser.rs          | 40 ++++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/crates/nu-parser/src/lex.rs b/crates/nu-parser/src/lex.rs
index f0802fcd7a..6d1adf28ef 100644
--- a/crates/nu-parser/src/lex.rs
+++ b/crates/nu-parser/src/lex.rs
@@ -51,7 +51,7 @@ impl BlockKind {
 }
 
 // A baseline token is terminated if it's not nested inside of a paired
-// delimiter and the next character is one of: `|`, `;`, `#` or any
+// delimiter and the next character is one of: `|`, `;` or any
 // whitespace.
 fn is_item_terminator(
     block_level: &[BlockKind],
@@ -115,6 +115,7 @@ pub fn lex_item(
     //   character (whitespace, `|`, `;` or `#`) is encountered, the baseline
     //   token is done.
     // - Otherwise, accumulate the character into the current baseline token.
+    let mut previous_char = None;
     while let Some(c) = input.get(*curr_offset) {
         let c = *c;
 
@@ -147,11 +148,9 @@ pub fn lex_item(
                 // Also need to check to make sure we aren't escaped
                 quote_start = None;
             }
-        } else if c == b'#' {
-            if is_item_terminator(&block_level, c, additional_whitespace, special_tokens) {
-                break;
-            }
-            in_comment = true;
+        } else if c == b'#' && !in_comment {
+            // To start a comment, It either need to be the first character of the token or prefixed with space.
+            in_comment = previous_char.map(|pc| pc == b' ').unwrap_or(true);
         } else if c == b'\n' || c == b'\r' {
             in_comment = false;
             if is_item_terminator(&block_level, c, additional_whitespace, special_tokens) {
@@ -254,6 +253,7 @@ pub fn lex_item(
         }
 
         *curr_offset += 1;
+        previous_char = Some(c);
     }
 
     let span = Span::new(span_offset + token_start, span_offset + *curr_offset);
diff --git a/crates/nu-parser/tests/test_lex.rs b/crates/nu-parser/tests/test_lex.rs
index a14843f3f0..54ff674bb9 100644
--- a/crates/nu-parser/tests/test_lex.rs
+++ b/crates/nu-parser/tests/test_lex.rs
@@ -159,6 +159,29 @@ fn lex_comment() {
     );
 }
 
+#[test]
+fn lex_not_comment_needs_space_in_front_of_hashtag() {
+    let file = b"1..10 | each {echo test#testing }";
+
+    let output = lex(file, 0, &[], &[], false);
+
+    assert!(output.1.is_none());
+}
+
+#[test]
+fn lex_comment_with_space_in_front_of_hashtag() {
+    let file = b"1..10 | each {echo test #testing }";
+
+    let output = lex(file, 0, &[], &[], false);
+
+    assert!(output.1.is_some());
+    assert!(matches!(
+        output.1.unwrap(),
+        ParseError::UnexpectedEof(missing_token, span) if missing_token == "}"
+            && span == Span::new(33, 34)
+    ));
+}
+
 #[test]
 fn lex_is_incomplete() {
     let file = b"let x = 300 | ;";
diff --git a/tests/repl/test_parser.rs b/tests/repl/test_parser.rs
index f77d431110..ddc790324a 100644
--- a/tests/repl/test_parser.rs
+++ b/tests/repl/test_parser.rs
@@ -169,6 +169,41 @@ fn comment_skipping_in_pipeline_3() -> TestResult {
     )
 }
 
+#[test]
+fn still_string_if_hashtag_is_middle_of_string() -> TestResult {
+    run_test(r#"echo test#testing"#, "test#testing")
+}
+
+#[test]
+fn non_comment_hashtag_in_comment_does_not_stop_comment() -> TestResult {
+    run_test(r#"# command_bar_text: { fg: '#C4C9C6' },"#, "")
+}
+
+#[test]
+fn non_comment_hashtag_in_comment_does_not_stop_comment_in_block() -> TestResult {
+    run_test(
+        r#"{
+        explore: {
+            # command_bar_text: { fg: '#C4C9C6' },
+        }
+    } | get explore | is-empty"#,
+        "true",
+    )
+}
+
+#[test]
+fn still_string_if_hashtag_is_middle_of_string_inside_each() -> TestResult {
+    run_test(
+        r#"1..1 | each {echo test#testing } | get 0"#,
+        "test#testing",
+    )
+}
+
+#[test]
+fn still_string_if_hashtag_is_middle_of_string_inside_each_also_with_dot() -> TestResult {
+    run_test(r#"1..1 | each {echo '.#testing' } | get 0"#, ".#testing")
+}
+
 #[test]
 fn bad_var_name() -> TestResult {
     fail_test(r#"let $"foo bar" = 4"#, "can't contain")
@@ -282,6 +317,11 @@ fn raw_string_with_equals() -> TestResult {
     )
 }
 
+#[test]
+fn raw_string_with_hashtag() -> TestResult {
+    run_test(r#"r##' one # two '##"#, "one # two")
+}
+
 #[test]
 fn list_quotes_with_equals() -> TestResult {
     run_test(

From cc0616b753f0f6f290a7108a1202970387c91690 Mon Sep 17 00:00:00 2001
From: Solomon <git@solomonvictorino.com>
Date: Fri, 13 Dec 2024 15:23:17 -0700
Subject: [PATCH 0795/1072] return const values from `scope variables` (#14577)

Fixes #14542

# User-Facing Changes

Constant values are no longer missing from `scope variables` output
when the IR evaluator is enabled:

```diff
const foo = 1
scope variables | where name == "$foo" | get value.0 | to nuon
-null
+int
```
---
 crates/nu-engine/src/scope.rs | 11 ++++++-----
 tests/repl/test_engine.rs     | 19 +++++++++++++------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/crates/nu-engine/src/scope.rs b/crates/nu-engine/src/scope.rs
index 45f6f983fc..8774a8996b 100644
--- a/crates/nu-engine/src/scope.rs
+++ b/crates/nu-engine/src/scope.rs
@@ -56,11 +56,12 @@ impl<'e, 's> ScopeData<'e, 's> {
             let var_type = Value::string(var.ty.to_string(), span);
             let is_const = Value::bool(var.const_val.is_some(), span);
 
-            let var_value = if let Ok(val) = self.stack.get_var(**var_id, span) {
-                val
-            } else {
-                Value::nothing(span)
-            };
+            let var_value = self
+                .stack
+                .get_var(**var_id, span)
+                .ok()
+                .or(var.const_val.clone())
+                .unwrap_or(Value::nothing(span));
 
             let var_id_val = Value::int(var_id.get() as i64, span);
 
diff --git a/tests/repl/test_engine.rs b/tests/repl/test_engine.rs
index 90dd1e86b0..5c2fb8e533 100644
--- a/tests/repl/test_engine.rs
+++ b/tests/repl/test_engine.rs
@@ -90,12 +90,19 @@ fn help_works_with_missing_requirements() -> TestResult {
     run_test(r#"each --help | lines | length"#, "72")
 }
 
-#[test]
-fn scope_variable() -> TestResult {
-    run_test(
-        r#"let x = 3; scope variables | where name == "$x" | get type.0"#,
-        "int",
-    )
+#[rstest]
+#[case("let x = 3", "$x", "int", "3")]
+#[case("const x = 3", "$x", "int", "3")]
+fn scope_variable(
+    #[case] var_decl: &str,
+    #[case] exp_name: &str,
+    #[case] exp_type: &str,
+    #[case] exp_value: &str,
+) -> TestResult {
+    let get_var_info =
+        format!(r#"{var_decl}; scope variables | where name == "{exp_name}" | first"#);
+    run_test(&format!(r#"{get_var_info} | get type"#), exp_type)?;
+    run_test(&format!(r#"{get_var_info} | get value"#), exp_value)
 }
 
 #[rstest]

From 05ee7ea9c78cb9ead9dbf380a1c3322d4cf226e5 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Fri, 13 Dec 2024 18:34:33 -0600
Subject: [PATCH 0796/1072] Revert "fix: make exec command decrement SHLVL
 correctly" (#14580)

Reverts nushell/nushell#14570
---
 crates/nu-command/src/system/exec.rs | 10 ----------
 src/main.rs                          |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/crates/nu-command/src/system/exec.rs b/crates/nu-command/src/system/exec.rs
index e9f49b86c1..8a2b24a113 100644
--- a/crates/nu-command/src/system/exec.rs
+++ b/crates/nu-command/src/system/exec.rs
@@ -61,16 +61,6 @@ On Windows based systems, Nushell will wait for the command to finish and then e
         let envs = env_to_strings(engine_state, stack)?;
         command.env_clear();
         command.envs(envs);
-        // Decrement SHLVL as removing the current shell from the stack
-        // (only works in interactive mode, same as initialization)
-        if engine_state.is_interactive {
-            if let Some(shlvl) = engine_state.get_env_var("SHLVL") {
-                let shlvl = shlvl.as_int().unwrap_or(1) - 1;
-                command.env("SHLVL", shlvl.to_string());
-            } else {
-                command.env("SHLVL", "0");
-            }
-        }
 
         // Configure args.
         let args = crate::eval_arguments_from_call(engine_state, stack, call)?;
diff --git a/src/main.rs b/src/main.rs
index db55db3ff2..7d39aef02b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -325,7 +325,7 @@ fn main() -> Result<()> {
     if engine_state.is_interactive {
         let mut shlvl = engine_state
             .get_env_var("SHLVL")
-            .map(|x| x.as_int().unwrap_or(0))
+            .map(|x| x.as_str().unwrap_or("0").parse::<i64>().unwrap_or(0))
             .unwrap_or(0);
         shlvl += 1;
         engine_state.add_env_var("SHLVL".to_string(), Value::int(shlvl, Span::unknown()));

From 219b44a04f0d22adfd0c733158a8228571723f5a Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Sat, 14 Dec 2024 16:36:01 -0800
Subject: [PATCH 0797/1072] Improve handling of columns with null values
 (#14588)

Addresses some null handling issues in #6882

# Description

This changes the implementation of guessing a column type when a schema
is not specified.

New behavior:
1. Use the first non-Value::Nothing value type for the columns data type
2. If the value type changes (ignoring Value::Nothing) in subsequent
values, the datatype will be changed to DataType::Object("Value", None)
3. If a column type does not have a value type,
DataType::Object("Value", None) will be assumed.
---
 .../values/nu_dataframe/conversion.rs         | 547 ++++++++----------
 1 file changed, 256 insertions(+), 291 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
index 7d5a4ace3f..d196ed8ba6 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
@@ -223,57 +223,30 @@ pub fn insert_value(
                 inner: vec![],
             })
         }
-    }
-    // Checking that the type for the value is the same
-    // for the previous value in the column
-    else if col_val.values.is_empty() {
-        if let Some(schema) = maybe_schema {
-            if let Some(field) = schema.schema.get_field(&key) {
-                col_val.column_type = Some(field.dtype().clone());
-            }
-        }
-
+    } else {
+        let current_data_type = value_to_data_type(&value);
         if col_val.column_type.is_none() {
-            col_val.column_type = Some(value_to_data_type(&value));
+            col_val.column_type = value_to_data_type(&value);
+        } else if let Some(current_data_type) = current_data_type {
+            if col_val.column_type.as_ref() != Some(&current_data_type) {
+                col_val.column_type = Some(DataType::Object("Value", None));
+            }
         }
         col_val.values.push(value);
         Ok(())
-    } else {
-        let prev_value = &col_val.values[col_val.values.len() - 1];
-
-        match (&prev_value, &value) {
-            (Value::Int { .. }, Value::Int { .. })
-            | (Value::Float { .. }, Value::Float { .. })
-            | (Value::String { .. }, Value::String { .. })
-            | (Value::Bool { .. }, Value::Bool { .. })
-            | (Value::Date { .. }, Value::Date { .. })
-            | (Value::Filesize { .. }, Value::Filesize { .. })
-            | (Value::Binary { .. }, Value::Binary { .. })
-            | (Value::Duration { .. }, Value::Duration { .. }) => col_val.values.push(value),
-            (_, Value::Nothing { .. }) => col_val.values.push(value),
-            (Value::List { .. }, _) => {
-                col_val.column_type = Some(value_to_data_type(&value));
-                col_val.values.push(value);
-            }
-            _ => {
-                col_val.column_type = Some(DataType::Object("Value", None));
-                col_val.values.push(value);
-            }
-        }
-        Ok(())
     }
 }
 
-fn value_to_data_type(value: &Value) -> DataType {
+fn value_to_data_type(value: &Value) -> Option<DataType> {
     match &value {
-        Value::Int { .. } => DataType::Int64,
-        Value::Float { .. } => DataType::Float64,
-        Value::String { .. } => DataType::String,
-        Value::Bool { .. } => DataType::Boolean,
-        Value::Date { .. } => DataType::Date,
-        Value::Duration { .. } => DataType::Duration(TimeUnit::Nanoseconds),
-        Value::Filesize { .. } => DataType::Int64,
-        Value::Binary { .. } => DataType::Binary,
+        Value::Int { .. } => Some(DataType::Int64),
+        Value::Float { .. } => Some(DataType::Float64),
+        Value::String { .. } => Some(DataType::String),
+        Value::Bool { .. } => Some(DataType::Boolean),
+        Value::Date { .. } => Some(DataType::Date),
+        Value::Duration { .. } => Some(DataType::Duration(TimeUnit::Nanoseconds)),
+        Value::Filesize { .. } => Some(DataType::Int64),
+        Value::Binary { .. } => Some(DataType::Binary),
         Value::List { vals, .. } => {
             // We need to determined the type inside of the list.
             // Since Value::List does not have any kind of
@@ -286,243 +259,247 @@ fn value_to_data_type(value: &Value) -> DataType {
                 .filter(|v| !matches!(v, Value::Nothing { .. }))
                 .map(value_to_data_type)
                 .nth(1)
+                .flatten()
                 .unwrap_or(DataType::Object("Value", None));
 
-            DataType::List(Box::new(list_type))
+            Some(DataType::List(Box::new(list_type)))
         }
-        _ => DataType::Object("Value", None),
+        _ => None,
     }
 }
 
 fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Series, ShellError> {
-    if let Some(column_type) = &column.column_type {
-        match column_type {
-            DataType::Float32 => {
-                let series_values: Result<Vec<_>, _> = column
-                    .values
-                    .iter()
-                    .map(|v| {
-                        value_to_option(v, |v| match v {
-                            Value::Float { val, .. } => Ok(*val as f32),
-                            Value::Int { val, .. } => Ok(*val as f32),
-                            x => Err(ShellError::GenericError {
-                                error: "Error converting to f32".into(),
-                                msg: "".into(),
-                                span: None,
-                                help: Some(format!("Unexpected type: {x:?}")),
-                                inner: vec![],
-                            }),
-                        })
+    let column_type = &column
+        .column_type
+        .clone()
+        .unwrap_or(DataType::Object("Value", None));
+    match column_type {
+        DataType::Float32 => {
+            let series_values: Result<Vec<_>, _> = column
+                .values
+                .iter()
+                .map(|v| {
+                    value_to_option(v, |v| match v {
+                        Value::Float { val, .. } => Ok(*val as f32),
+                        Value::Int { val, .. } => Ok(*val as f32),
+                        x => Err(ShellError::GenericError {
+                            error: "Error converting to f32".into(),
+                            msg: "".into(),
+                            span: None,
+                            help: Some(format!("Unexpected type: {x:?}")),
+                            inner: vec![],
+                        }),
                     })
-                    .collect();
-                Ok(Series::new(name, series_values?))
-            }
-            DataType::Float64 => {
-                let series_values: Result<Vec<_>, _> = column
-                    .values
-                    .iter()
-                    .map(|v| {
-                        value_to_option(v, |v| match v {
-                            Value::Float { val, .. } => Ok(*val),
-                            Value::Int { val, .. } => Ok(*val as f64),
-                            x => Err(ShellError::GenericError {
-                                error: "Error converting to f64".into(),
-                                msg: "".into(),
-                                span: None,
-                                help: Some(format!("Unexpected type: {x:?}")),
-                                inner: vec![],
-                            }),
-                        })
+                })
+                .collect();
+            Ok(Series::new(name, series_values?))
+        }
+        DataType::Float64 => {
+            let series_values: Result<Vec<_>, _> = column
+                .values
+                .iter()
+                .map(|v| {
+                    value_to_option(v, |v| match v {
+                        Value::Float { val, .. } => Ok(*val),
+                        Value::Int { val, .. } => Ok(*val as f64),
+                        x => Err(ShellError::GenericError {
+                            error: "Error converting to f64".into(),
+                            msg: "".into(),
+                            span: None,
+                            help: Some(format!("Unexpected type: {x:?}")),
+                            inner: vec![],
+                        }),
                     })
-                    .collect();
-                Ok(Series::new(name, series_values?))
-            }
-            DataType::UInt8 => {
-                let series_values: Result<Vec<_>, _> = column
-                    .values
-                    .iter()
-                    .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as u8)))
-                    .collect();
-                Ok(Series::new(name, series_values?))
-            }
-            DataType::UInt16 => {
-                let series_values: Result<Vec<_>, _> = column
-                    .values
-                    .iter()
-                    .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as u16)))
-                    .collect();
-                Ok(Series::new(name, series_values?))
-            }
-            DataType::UInt32 => {
-                let series_values: Result<Vec<_>, _> = column
-                    .values
-                    .iter()
-                    .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as u32)))
-                    .collect();
-                Ok(Series::new(name, series_values?))
-            }
-            DataType::UInt64 => {
-                let series_values: Result<Vec<_>, _> = column
-                    .values
-                    .iter()
-                    .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as u64)))
-                    .collect();
-                Ok(Series::new(name, series_values?))
-            }
-            DataType::Int8 => {
-                let series_values: Result<Vec<_>, _> = column
-                    .values
-                    .iter()
-                    .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as i8)))
-                    .collect();
-                Ok(Series::new(name, series_values?))
-            }
-            DataType::Int16 => {
-                let series_values: Result<Vec<_>, _> = column
-                    .values
-                    .iter()
-                    .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as i16)))
-                    .collect();
-                Ok(Series::new(name, series_values?))
-            }
-            DataType::Int32 => {
-                let series_values: Result<Vec<_>, _> = column
-                    .values
-                    .iter()
-                    .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as i32)))
-                    .collect();
-                Ok(Series::new(name, series_values?))
-            }
-            DataType::Int64 => {
-                let series_values: Result<Vec<_>, _> = column
-                    .values
-                    .iter()
-                    .map(|v| value_to_option(v, value_to_int))
-                    .collect();
-                Ok(Series::new(name, series_values?))
-            }
-            DataType::Boolean => {
-                let series_values: Result<Vec<_>, _> = column
-                    .values
-                    .iter()
-                    .map(|v| value_to_option(v, |v| v.as_bool()))
-                    .collect();
-                Ok(Series::new(name, series_values?))
-            }
-            DataType::String => {
-                let series_values: Result<Vec<_>, _> = column
-                    .values
-                    .iter()
-                    .map(|v| value_to_option(v, |v| v.coerce_string()))
-                    .collect();
-                Ok(Series::new(name, series_values?))
-            }
-            DataType::Binary | DataType::BinaryOffset => {
-                let series_values: Result<Vec<_>, _> =
-                    column.values.iter().map(|v| v.coerce_binary()).collect();
-                Ok(Series::new(name, series_values?))
-            }
-            DataType::Object(_, _) => value_to_series(name, &column.values),
-            DataType::Duration(time_unit) => {
-                let series_values: Result<Vec<_>, _> = column
-                    .values
-                    .iter()
-                    .map(|v| {
-                        value_to_option(v, |v| {
-                            v.as_duration().map(|v| nanos_from_timeunit(v, *time_unit))
-                        })
+                })
+                .collect();
+            Ok(Series::new(name, series_values?))
+        }
+        DataType::UInt8 => {
+            let series_values: Result<Vec<_>, _> = column
+                .values
+                .iter()
+                .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as u8)))
+                .collect();
+            Ok(Series::new(name, series_values?))
+        }
+        DataType::UInt16 => {
+            let series_values: Result<Vec<_>, _> = column
+                .values
+                .iter()
+                .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as u16)))
+                .collect();
+            Ok(Series::new(name, series_values?))
+        }
+        DataType::UInt32 => {
+            let series_values: Result<Vec<_>, _> = column
+                .values
+                .iter()
+                .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as u32)))
+                .collect();
+            Ok(Series::new(name, series_values?))
+        }
+        DataType::UInt64 => {
+            let series_values: Result<Vec<_>, _> = column
+                .values
+                .iter()
+                .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as u64)))
+                .collect();
+            Ok(Series::new(name, series_values?))
+        }
+        DataType::Int8 => {
+            let series_values: Result<Vec<_>, _> = column
+                .values
+                .iter()
+                .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as i8)))
+                .collect();
+            Ok(Series::new(name, series_values?))
+        }
+        DataType::Int16 => {
+            let series_values: Result<Vec<_>, _> = column
+                .values
+                .iter()
+                .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as i16)))
+                .collect();
+            Ok(Series::new(name, series_values?))
+        }
+        DataType::Int32 => {
+            let series_values: Result<Vec<_>, _> = column
+                .values
+                .iter()
+                .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as i32)))
+                .collect();
+            Ok(Series::new(name, series_values?))
+        }
+        DataType::Int64 => {
+            let series_values: Result<Vec<_>, _> = column
+                .values
+                .iter()
+                .map(|v| value_to_option(v, value_to_int))
+                .collect();
+            Ok(Series::new(name, series_values?))
+        }
+        DataType::Boolean => {
+            let series_values: Result<Vec<_>, _> = column
+                .values
+                .iter()
+                .map(|v| value_to_option(v, |v| v.as_bool()))
+                .collect();
+            Ok(Series::new(name, series_values?))
+        }
+        DataType::String => {
+            let series_values: Result<Vec<_>, _> = column
+                .values
+                .iter()
+                .map(|v| value_to_option(v, |v| v.coerce_string()))
+                .collect();
+            Ok(Series::new(name, series_values?))
+        }
+        DataType::Binary | DataType::BinaryOffset => {
+            let series_values: Result<Vec<_>, _> =
+                column.values.iter().map(|v| v.coerce_binary()).collect();
+            Ok(Series::new(name, series_values?))
+        }
+        DataType::Object(_, _) => value_to_series(name, &column.values),
+        DataType::Duration(time_unit) => {
+            let series_values: Result<Vec<_>, _> = column
+                .values
+                .iter()
+                .map(|v| {
+                    value_to_option(v, |v| {
+                        v.as_duration().map(|v| nanos_from_timeunit(v, *time_unit))
                     })
-                    .collect();
-                Ok(Series::new(name, series_values?))
-            }
-            DataType::List(list_type) => {
-                match input_type_list_to_series(&name, list_type.as_ref(), &column.values) {
-                    Ok(series) => Ok(series),
-                    Err(_) => {
-                        // An error case will occur when there are lists of mixed types.
-                        // If this happens, fallback to object list
-                        input_type_list_to_series(
-                            &name,
-                            &DataType::Object("unknown", None),
-                            &column.values,
-                        )
-                    }
+                })
+                .collect();
+            Ok(Series::new(name, series_values?))
+        }
+        DataType::List(list_type) => {
+            match input_type_list_to_series(&name, list_type.as_ref(), &column.values) {
+                Ok(series) => Ok(series),
+                Err(_) => {
+                    // An error case will occur when there are lists of mixed types.
+                    // If this happens, fallback to object list
+                    input_type_list_to_series(
+                        &name,
+                        &DataType::Object("unknown", None),
+                        &column.values,
+                    )
                 }
             }
-            DataType::Date => {
-                let it = column.values.iter().map(|v| {
+        }
+        DataType::Date => {
+            let it = column.values.iter().map(|v| {
+                if let Value::Date { val, .. } = &v {
+                    Some(val.timestamp_nanos_opt().unwrap_or_default())
+                } else {
+                    None
+                }
+            });
+
+            let res: DatetimeChunked = ChunkedArray::<Int64Type>::from_iter_options(name, it)
+                .into_datetime(TimeUnit::Nanoseconds, None);
+
+            Ok(res.into_series())
+        }
+        DataType::Datetime(tu, maybe_tz) => {
+            let dates = column
+                .values
+                .iter()
+                .map(|v| {
                     if let Value::Date { val, .. } = &v {
-                        Some(val.timestamp_nanos_opt().unwrap_or_default())
-                    } else {
-                        None
-                    }
-                });
-
-                let res: DatetimeChunked = ChunkedArray::<Int64Type>::from_iter_options(name, it)
-                    .into_datetime(TimeUnit::Nanoseconds, None);
-
-                Ok(res.into_series())
-            }
-            DataType::Datetime(tu, maybe_tz) => {
-                let dates = column
-                    .values
-                    .iter()
-                    .map(|v| {
-                        if let Value::Date { val, .. } = &v {
-                            // If there is a timezone specified, make sure
-                            // the value is converted to it
-                            Ok(maybe_tz
-                                .as_ref()
-                                .map(|tz| tz.parse::<Tz>().map(|tz| val.with_timezone(&tz)))
-                                .transpose()
-                                .map_err(|e| ShellError::GenericError {
-                                    error: "Error parsing timezone".into(),
-                                    msg: "".into(),
-                                    span: None,
-                                    help: Some(e.to_string()),
-                                    inner: vec![],
-                                })?
-                                .and_then(|dt| dt.timestamp_nanos_opt())
-                                .map(|nanos| nanos_from_timeunit(nanos, *tu)))
-                        } else {
-                            Ok(None)
-                        }
-                    })
-                    .collect::<Result<Vec<Option<i64>>, ShellError>>()?;
-
-                let res: DatetimeChunked =
-                    ChunkedArray::<Int64Type>::from_iter_options(name, dates.into_iter())
-                        .into_datetime(*tu, maybe_tz.clone());
-
-                Ok(res.into_series())
-            }
-            DataType::Struct(fields) => {
-                let schema = Some(NuSchema::new(Schema::from_iter(fields.clone())));
-                // let mut structs: Vec<Series> = Vec::new();
-                let mut structs: HashMap<PlSmallStr, Series> = HashMap::new();
-
-                for v in column.values.iter() {
-                    let mut column_values: ColumnMap = IndexMap::new();
-                    let record = v.as_record()?;
-                    insert_record(&mut column_values, record.clone(), &schema)?;
-                    let df = from_parsed_columns(column_values)?;
-                    for name in df.df.get_column_names() {
-                        let series = df
-                            .df
-                            .column(name)
+                        // If there is a timezone specified, make sure
+                        // the value is converted to it
+                        Ok(maybe_tz
+                            .as_ref()
+                            .map(|tz| tz.parse::<Tz>().map(|tz| val.with_timezone(&tz)))
+                            .transpose()
                             .map_err(|e| ShellError::GenericError {
-                                error: format!(
-                                    "Error creating struct, could not get column name {name}: {e}"
-                                ),
+                                error: "Error parsing timezone".into(),
                                 msg: "".into(),
                                 span: None,
-                                help: None,
+                                help: Some(e.to_string()),
                                 inner: vec![],
                             })?
-                            .as_materialized_series();
+                            .and_then(|dt| dt.timestamp_nanos_opt())
+                            .map(|nanos| nanos_from_timeunit(nanos, *tu)))
+                    } else {
+                        Ok(None)
+                    }
+                })
+                .collect::<Result<Vec<Option<i64>>, ShellError>>()?;
 
-                        if let Some(v) = structs.get_mut(name) {
-                            let _ = v.append(series)
+            let res: DatetimeChunked =
+                ChunkedArray::<Int64Type>::from_iter_options(name, dates.into_iter())
+                    .into_datetime(*tu, maybe_tz.clone());
+
+            Ok(res.into_series())
+        }
+        DataType::Struct(fields) => {
+            let schema = Some(NuSchema::new(Schema::from_iter(fields.clone())));
+            // let mut structs: Vec<Series> = Vec::new();
+            let mut structs: HashMap<PlSmallStr, Series> = HashMap::new();
+
+            for v in column.values.iter() {
+                let mut column_values: ColumnMap = IndexMap::new();
+                let record = v.as_record()?;
+                insert_record(&mut column_values, record.clone(), &schema)?;
+                let df = from_parsed_columns(column_values)?;
+                for name in df.df.get_column_names() {
+                    let series = df
+                        .df
+                        .column(name)
+                        .map_err(|e| ShellError::GenericError {
+                            error: format!(
+                                "Error creating struct, could not get column name {name}: {e}"
+                            ),
+                            msg: "".into(),
+                            span: None,
+                            help: None,
+                            inner: vec![],
+                        })?
+                        .as_materialized_series();
+
+                    if let Some(v) = structs.get_mut(name) {
+                        let _ = v.append(series)
                                 .map_err(|e| ShellError::GenericError {
                                     error: format!("Error creating struct, could not append to series for col {name}: {e}"),
                                     msg: "".into(),
@@ -530,44 +507,32 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
                                     help: None,
                                     inner: vec![],
                                 })?;
-                        } else {
-                            structs.insert(name.clone(), series.to_owned());
-                        }
+                    } else {
+                        structs.insert(name.clone(), series.to_owned());
                     }
                 }
-
-                let structs: Vec<Series> = structs.into_values().collect();
-
-                let chunked = StructChunked::from_series(
-                    column.name().to_owned(),
-                    structs.len(),
-                    structs.iter(),
-                )
-                .map_err(|e| ShellError::GenericError {
-                    error: format!("Error creating struct: {e}"),
-                    msg: "".into(),
-                    span: None,
-                    help: None,
-                    inner: vec![],
-                })?;
-                Ok(chunked.into_series())
             }
-            _ => Err(ShellError::GenericError {
-                error: format!("Error creating dataframe: Unsupported type: {column_type:?}"),
-                msg: "".into(),
-                span: None,
-                help: None,
-                inner: vec![],
-            }),
+
+            let structs: Vec<Series> = structs.into_values().collect();
+
+            let chunked =
+                StructChunked::from_series(column.name().to_owned(), structs.len(), structs.iter())
+                    .map_err(|e| ShellError::GenericError {
+                        error: format!("Error creating struct: {e}"),
+                        msg: "".into(),
+                        span: None,
+                        help: None,
+                        inner: vec![],
+                    })?;
+            Ok(chunked.into_series())
         }
-    } else {
-        Err(ShellError::GenericError {
-            error: "Passed a type column with no type".into(),
+        _ => Err(ShellError::GenericError {
+            error: format!("Error creating dataframe: Unsupported type: {column_type:?}"),
             msg: "".into(),
             span: None,
             help: None,
             inner: vec![],
-        })
+        }),
     }
 }
 

From baf86dfb0ed57aefb75962ea6cfc1552cb44c2c4 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Sat, 14 Dec 2024 21:58:47 -0600
Subject: [PATCH 0798/1072] tweak polars join for better cross joins (#14586)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

closes #14585

This PR tries to make `polars join --cross` work better. Example taken
from
https://docs.pola.rs/user-guide/transformations/joins/#cartesian-product

### Before
```nushell
❯ let tokens = [[monopoly_token]; [hat] [shoe] [boat]] | polars into-df
❯ let players = [[name, cash]; [Alice, 78] [Bob, 135]] | polars into-df
❯ $players | polars into-lazy | polars select (polars col name) | polars join --cross $tokens | polars collect
Error: nu::parser::missing_positional

  × Missing required positional argument.
   ╭─[entry #3:1:92]
 1 │ $players | polars into-lazy | polars select (polars col name) | polars join --cross $tokens
   ╰────
  help: Usage: polars join {flags} <other> <left_on> <right_on> . Use `--help` for more information.
```
### After
```nushell
❯ let players = [[name, cash]; [Alice, 78] [Bob, 135]] | polars into-df
❯ let tokens = [[monopoly_token]; [hat] [shoe] [boat]] | polars into-df
❯ $players | polars into-lazy | polars select (polars col name) | polars join --cross $tokens | polars collect
╭─#─┬─name──┬─monopoly_token─╮
│ 0 │ Alice │ hat            │
│ 1 │ Alice │ shoe           │
│ 2 │ Alice │ boat           │
│ 3 │ Bob   │ hat            │
│ 4 │ Bob   │ shoe           │
│ 5 │ Bob   │ boat           │
╰─#─┴─name──┴─monopoly_token─╯
```
Other examples
```nushell
❯ 1..3 | polars into-df | polars join --cross (4..6 | polars into-df)
╭─#─┬─0─┬─0_x─╮
│ 0 │ 1 │   4 │
│ 1 │ 1 │   5 │
│ 2 │ 1 │   6 │
│ 3 │ 2 │   4 │
│ 4 │ 2 │   5 │
│ 5 │ 2 │   6 │
│ 6 │ 3 │   4 │
│ 7 │ 3 │   5 │
│ 8 │ 3 │   6 │
╰─#─┴─0─┴─0_x─╯
❯ 1..3 | each {|x| {x: $x}} | polars into-df | polars join --cross (4..6 | each {|y| {y: $y}} | polars into-df) x y
╭─#─┬─x─┬─y─╮
│ 0 │ 1 │ 4 │
│ 1 │ 1 │ 5 │
│ 2 │ 1 │ 6 │
│ 3 │ 2 │ 4 │
│ 4 │ 2 │ 5 │
│ 5 │ 2 │ 6 │
│ 6 │ 3 │ 4 │
│ 7 │ 3 │ 5 │
│ 8 │ 3 │ 6 │
╰─#─┴─x─┴─y─╯
```
/cc @ayax79
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 .../src/dataframe/command/data/join.rs        | 96 +++++++++++++++----
 1 file changed, 76 insertions(+), 20 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/join.rs b/crates/nu_plugin_polars/src/dataframe/command/data/join.rs
index ee18e17567..b1c13fef00 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/join.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/join.rs
@@ -27,8 +27,8 @@ impl PluginCommand for LazyJoin {
     fn signature(&self) -> Signature {
         Signature::build(self.name())
             .required("other", SyntaxShape::Any, "LazyFrame to join with")
-            .required("left_on", SyntaxShape::Any, "Left column(s) to join on")
-            .required("right_on", SyntaxShape::Any, "Right column(s) to join on")
+            .optional("left_on", SyntaxShape::Any, "Left column(s) to join on")
+            .optional("right_on", SyntaxShape::Any, "Right column(s) to join on")
             .switch(
                 "inner",
                 "inner joining between lazyframes (default)",
@@ -54,8 +54,8 @@ impl PluginCommand for LazyJoin {
         vec![
             Example {
                 description: "Join two lazy dataframes",
-                example: r#"let df_a = ([[a b c];[1 "a" 0] [2 "b" 1] [1 "c" 2] [1 "c" 3]] | polars into-lazy);
-    let df_b = ([["foo" "bar" "ham"];[1 "a" "let"] [2 "c" "var"] [3 "c" "const"]] | polars into-lazy);
+                example: r#"let df_a = ([[a b c];[1 "a" 0] [2 "b" 1] [1 "c" 2] [1 "c" 3]] | polars into-lazy)
+    let df_b = ([["foo" "bar" "ham"];[1 "a" "let"] [2 "c" "var"] [3 "c" "const"]] | polars into-lazy)
     $df_a | polars join $df_b a foo | polars collect"#,
                 result: Some(
                     NuDataFrame::try_from_columns(
@@ -114,8 +114,8 @@ impl PluginCommand for LazyJoin {
             },
             Example {
                 description: "Join one eager dataframe with a lazy dataframe",
-                example: r#"let df_a = ([[a b c];[1 "a" 0] [2 "b" 1] [1 "c" 2] [1 "c" 3]] | polars into-df);
-    let df_b = ([["foo" "bar" "ham"];[1 "a" "let"] [2 "c" "var"] [3 "c" "const"]] | polars into-lazy);
+                example: r#"let df_a = ([[a b c];[1 "a" 0] [2 "b" 1] [1 "c" 2] [1 "c" 3]] | polars into-df)
+    let df_b = ([["foo" "bar" "ham"];[1 "a" "let"] [2 "c" "var"] [3 "c" "const"]] | polars into-lazy)
     $df_a | polars join $df_b a foo"#,
                 result: Some(
                     NuDataFrame::try_from_columns(
@@ -172,6 +172,43 @@ impl PluginCommand for LazyJoin {
                     .into_value(Span::test_data()),
                 ),
             },
+            Example {
+                description: "Join one eager dataframe with another using a cross join",
+                example: r#"let tokens = [[monopoly_token]; [hat] [shoe] [boat]] | polars into-df
+    let players = [[name, cash]; [Alice, 78] [Bob, 135]] | polars into-df
+    $players | polars select (polars col name) | polars join --cross $tokens | polars collect"#,
+                result: Some(
+                    NuDataFrame::try_from_columns(
+                        vec![
+                            Column::new(
+                                "name".to_string(),
+                                vec![
+                                    Value::test_string("Alice"),
+                                    Value::test_string("Alice"),
+                                    Value::test_string("Alice"),
+                                    Value::test_string("Bob"),
+                                    Value::test_string("Bob"),
+                                    Value::test_string("Bob"),
+                                ],
+                            ),
+                            Column::new(
+                                "monopoly_token".to_string(),
+                                vec![
+                                    Value::test_string("hat"),
+                                    Value::test_string("shoe"),
+                                    Value::test_string("boat"),
+                                    Value::test_string("hat"),
+                                    Value::test_string("shoe"),
+                                    Value::test_string("boat"),
+                                ],
+                            ),
+                        ],
+                        None,
+                    )
+                    .expect("simple df for test should not fail")
+                    .into_value(Span::test_data()),
+                ),
+            },
         ]
     }
 
@@ -200,11 +237,21 @@ impl PluginCommand for LazyJoin {
         let other = NuLazyFrame::try_from_value_coerce(plugin, &other)?;
         let other = other.to_polars();
 
-        let left_on: Value = call.req(1)?;
-        let left_on = NuExpression::extract_exprs(plugin, left_on)?;
+        let left_on_opt: Option<Value> = call.opt(1)?;
+        let left_on = match left_on_opt {
+            Some(left_on_value) if left || left_on_opt.is_some() => {
+                NuExpression::extract_exprs(plugin, left_on_value)?
+            }
+            _ => vec![],
+        };
 
-        let right_on: Value = call.req(2)?;
-        let right_on = NuExpression::extract_exprs(plugin, right_on)?;
+        let right_on_opt: Option<Value> = call.opt(2)?;
+        let right_on = match right_on_opt {
+            Some(right_on_value) if full || right_on_opt.is_some() => {
+                NuExpression::extract_exprs(plugin, right_on_value)?
+            }
+            _ => vec![],
+        };
 
         if left_on.len() != right_on.len() {
             let right_on: Value = call.req(2)?;
@@ -232,16 +279,25 @@ impl PluginCommand for LazyJoin {
         let lazy = NuLazyFrame::try_from_value_coerce(plugin, &value)?;
         let from_eager = lazy.from_eager;
         let lazy = lazy.to_polars();
-
-        let lazy = lazy
-            .join_builder()
-            .with(other)
-            .left_on(left_on)
-            .right_on(right_on)
-            .how(how)
-            .force_parallel(true)
-            .suffix(suffix)
-            .finish();
+        let lazy = if cross {
+            lazy.join_builder()
+                .with(other)
+                .left_on(vec![])
+                .right_on(vec![])
+                .how(how)
+                .force_parallel(true)
+                .suffix(suffix)
+                .finish()
+        } else {
+            lazy.join_builder()
+                .with(other)
+                .left_on(left_on)
+                .right_on(right_on)
+                .how(how)
+                .force_parallel(true)
+                .suffix(suffix)
+                .finish()
+        };
 
         let lazy = NuLazyFrame::new(from_eager, lazy);
         lazy.to_pipeline_data(plugin, engine, call.head)

From 3c632e96f9ec02095cc0e1485115df0a5abf123b Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Mon, 16 Dec 2024 00:26:14 +0300
Subject: [PATCH 0799/1072] docs(reduce): add example demonstrating accumulator
 as pipeline input (#14593)

# Description
Add an example to `reduce` that shows accumulator can also be accessed
pipeline input.

# User-Facing Changes
N/A

# Tests + Formatting
- :green_circle: toolkit fmt
- :green_circle: toolkit clippy
- :green_circle: toolkit test
- :green_circle: toolkit test stdlib

# After Submitting
N/A
---
 crates/nu-command/src/filters/reduce.rs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/crates/nu-command/src/filters/reduce.rs b/crates/nu-command/src/filters/reduce.rs
index ed3c61ec32..8aa77719b9 100644
--- a/crates/nu-command/src/filters/reduce.rs
+++ b/crates/nu-command/src/filters/reduce.rs
@@ -88,6 +88,15 @@ impl Command for Reduce {
                     "Concatenate a string with itself, using a range to determine the number of times.",
                 result: Some(Value::test_string("StrStrStr")),
             },
+            Example {
+                example: r#"[{a: 1} {b: 2} {c: 3}] | reduce {|it| merge $it}"#,
+                description: "Merge multiple records together, making use of the fact that the accumulated value is also supplied as pipeline input to the closure.",
+                result: Some(Value::test_record(record!(
+                    "a" => Value::test_int(1),
+                    "b" => Value::test_int(2),
+                    "c" => Value::test_int(3),
+                ))),
+            }
         ]
     }
 
@@ -135,8 +144,8 @@ mod test {
 
     #[test]
     fn test_examples() {
-        use crate::test_examples;
+        use crate::{test_examples_with_commands, Merge};
 
-        test_examples(Reduce {})
+        test_examples_with_commands(Reduce {}, &[&Merge])
     }
 }

From 3760910f0bbf58e25787ee685046cd2837924882 Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Mon, 16 Dec 2024 00:27:13 +0300
Subject: [PATCH 0800/1072] remove the deprecated index argument from filter
 commands' closure signature (#14594)

# Description

A lot of filter commands that have a closure argument (`each`, `filter`,
etc), have a wrong signature for the closure, indicating an extra int
argument for the closure.

I think they are a left over from before `enumerate` was added, used to
access iteration index. None of the commands changed in this PR actually
supply this int argument.

# User-Facing Changes
N/A

# Tests + Formatting
- :green_circle: toolkit fmt
- :green_circle: toolkit clippy
- :green_circle: toolkit test
- :green_circle: toolkit test stdlib

# After Submitting
N/A
---
 crates/nu-cmd-extra/src/extra/filters/each_while.rs | 2 +-
 crates/nu-command/src/filters/all.rs                | 2 +-
 crates/nu-command/src/filters/any.rs                | 2 +-
 crates/nu-command/src/filters/filter.rs             | 2 +-
 crates/nu-command/src/filters/par_each.rs           | 2 +-
 crates/nu-command/src/filters/reduce.rs             | 6 +-----
 crates/nu-command/src/filters/skip/skip_until.rs    | 2 +-
 crates/nu-command/src/filters/skip/skip_while.rs    | 2 +-
 crates/nu-command/src/filters/take/take_until.rs    | 2 +-
 crates/nu-command/src/filters/take/take_while.rs    | 2 +-
 10 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/crates/nu-cmd-extra/src/extra/filters/each_while.rs b/crates/nu-cmd-extra/src/extra/filters/each_while.rs
index 67f0cc9482..cc5c066185 100644
--- a/crates/nu-cmd-extra/src/extra/filters/each_while.rs
+++ b/crates/nu-cmd-extra/src/extra/filters/each_while.rs
@@ -25,7 +25,7 @@ impl Command for EachWhile {
             )])
             .required(
                 "closure",
-                SyntaxShape::Closure(Some(vec![SyntaxShape::Any, SyntaxShape::Int])),
+                SyntaxShape::Closure(Some(vec![SyntaxShape::Any])),
                 "the closure to run",
             )
             .category(Category::Filters)
diff --git a/crates/nu-command/src/filters/all.rs b/crates/nu-command/src/filters/all.rs
index e4ffdf2c87..aa36118273 100644
--- a/crates/nu-command/src/filters/all.rs
+++ b/crates/nu-command/src/filters/all.rs
@@ -14,7 +14,7 @@ impl Command for All {
             .input_output_types(vec![(Type::List(Box::new(Type::Any)), Type::Bool)])
             .required(
                 "predicate",
-                SyntaxShape::Closure(Some(vec![SyntaxShape::Any, SyntaxShape::Int])),
+                SyntaxShape::Closure(Some(vec![SyntaxShape::Any])),
                 "A closure that must evaluate to a boolean.",
             )
             .category(Category::Filters)
diff --git a/crates/nu-command/src/filters/any.rs b/crates/nu-command/src/filters/any.rs
index cd8a6b65e4..230a96ebe7 100644
--- a/crates/nu-command/src/filters/any.rs
+++ b/crates/nu-command/src/filters/any.rs
@@ -14,7 +14,7 @@ impl Command for Any {
             .input_output_types(vec![(Type::List(Box::new(Type::Any)), Type::Bool)])
             .required(
                 "predicate",
-                SyntaxShape::Closure(Some(vec![SyntaxShape::Any, SyntaxShape::Int])),
+                SyntaxShape::Closure(Some(vec![SyntaxShape::Any])),
                 "A closure that must evaluate to a boolean.",
             )
             .category(Category::Filters)
diff --git a/crates/nu-command/src/filters/filter.rs b/crates/nu-command/src/filters/filter.rs
index 93fe5a6e6d..ea7960c4d3 100644
--- a/crates/nu-command/src/filters/filter.rs
+++ b/crates/nu-command/src/filters/filter.rs
@@ -30,7 +30,7 @@ a variable. On the other hand, the "row condition" syntax is not supported."#
             ])
             .required(
                 "closure",
-                SyntaxShape::Closure(Some(vec![SyntaxShape::Any, SyntaxShape::Int])),
+                SyntaxShape::Closure(Some(vec![SyntaxShape::Any])),
                 "Predicate closure.",
             )
             .category(Category::Filters)
diff --git a/crates/nu-command/src/filters/par_each.rs b/crates/nu-command/src/filters/par_each.rs
index fc0da7d3d3..4e4d526657 100644
--- a/crates/nu-command/src/filters/par_each.rs
+++ b/crates/nu-command/src/filters/par_each.rs
@@ -38,7 +38,7 @@ impl Command for ParEach {
             )
             .required(
                 "closure",
-                SyntaxShape::Closure(Some(vec![SyntaxShape::Any, SyntaxShape::Int])),
+                SyntaxShape::Closure(Some(vec![SyntaxShape::Any])),
                 "The closure to run.",
             )
             .allow_variants_without_examples(true)
diff --git a/crates/nu-command/src/filters/reduce.rs b/crates/nu-command/src/filters/reduce.rs
index 8aa77719b9..9d17339d0e 100644
--- a/crates/nu-command/src/filters/reduce.rs
+++ b/crates/nu-command/src/filters/reduce.rs
@@ -24,11 +24,7 @@ impl Command for Reduce {
             )
             .required(
                 "closure",
-                SyntaxShape::Closure(Some(vec![
-                    SyntaxShape::Any,
-                    SyntaxShape::Any,
-                    SyntaxShape::Int,
-                ])),
+                SyntaxShape::Closure(Some(vec![SyntaxShape::Any, SyntaxShape::Any])),
                 "Reducing function.",
             )
             .allow_variants_without_examples(true)
diff --git a/crates/nu-command/src/filters/skip/skip_until.rs b/crates/nu-command/src/filters/skip/skip_until.rs
index b73c817e9b..6f9ada280c 100644
--- a/crates/nu-command/src/filters/skip/skip_until.rs
+++ b/crates/nu-command/src/filters/skip/skip_until.rs
@@ -20,7 +20,7 @@ impl Command for SkipUntil {
             ])
             .required(
                 "predicate",
-                SyntaxShape::Closure(Some(vec![SyntaxShape::Any, SyntaxShape::Int])),
+                SyntaxShape::Closure(Some(vec![SyntaxShape::Any])),
                 "The predicate that skipped element must not match.",
             )
             .category(Category::Filters)
diff --git a/crates/nu-command/src/filters/skip/skip_while.rs b/crates/nu-command/src/filters/skip/skip_while.rs
index 9423915242..494cf91558 100644
--- a/crates/nu-command/src/filters/skip/skip_while.rs
+++ b/crates/nu-command/src/filters/skip/skip_while.rs
@@ -20,7 +20,7 @@ impl Command for SkipWhile {
             ])
             .required(
                 "predicate",
-                SyntaxShape::Closure(Some(vec![SyntaxShape::Any, SyntaxShape::Int])),
+                SyntaxShape::Closure(Some(vec![SyntaxShape::Any])),
                 "The predicate that skipped element must match.",
             )
             .category(Category::Filters)
diff --git a/crates/nu-command/src/filters/take/take_until.rs b/crates/nu-command/src/filters/take/take_until.rs
index e1dcd6ceda..4e8f38a3d2 100644
--- a/crates/nu-command/src/filters/take/take_until.rs
+++ b/crates/nu-command/src/filters/take/take_until.rs
@@ -17,7 +17,7 @@ impl Command for TakeUntil {
             )])
             .required(
                 "predicate",
-                SyntaxShape::Closure(Some(vec![SyntaxShape::Any, SyntaxShape::Int])),
+                SyntaxShape::Closure(Some(vec![SyntaxShape::Any])),
                 "The predicate that element(s) must not match.",
             )
             .category(Category::Filters)
diff --git a/crates/nu-command/src/filters/take/take_while.rs b/crates/nu-command/src/filters/take/take_while.rs
index 54e9384cba..c9e218f543 100644
--- a/crates/nu-command/src/filters/take/take_while.rs
+++ b/crates/nu-command/src/filters/take/take_while.rs
@@ -20,7 +20,7 @@ impl Command for TakeWhile {
             ])
             .required(
                 "predicate",
-                SyntaxShape::Closure(Some(vec![SyntaxShape::Any, SyntaxShape::Int])),
+                SyntaxShape::Closure(Some(vec![SyntaxShape::Any])),
                 "The predicate that element(s) must match.",
             )
             .category(Category::Filters)

From cfdb4bbf255ade8ee618d722f3291082c59e66bb Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Mon, 16 Dec 2024 15:13:51 +0300
Subject: [PATCH 0801/1072] `std/iter scan`: change closure signature to be
 consistent with `reduce` (#14596)

# Description

I noticed that `std/iter scan`'s closure has the order of parameters
reversed compared to `reduce`, so changed it to be consistent.

Also it didn't have `$acc` as `$in` like `reduce`, so fixed that as
well.

# User-Facing Changes

> [!WARNING]
> This is a breaking change for all operations where order of `$it` and
`$acc` matter.

-   This is still fine.
    ```nushell
    [1 2 3] | iter scan 0 {|x, y| $x + $y}
    ```

-   This is broken
    ```nushell
    [a b c d] | iter scan "" {|x, y| [$x, $y] | str join} -n
    ```
    and should be changed to either one of these
    -   ```nushell
        [a b c d] | iter scan "" {|it, acc| [$acc, $it] | str join} -n
        ```
    -   ```nushell
        [a b c d] | iter scan "" {|it| append $it | str join} -n
        ```

# Tests + Formatting
Only change is in the std and its tests
- :green_circle: toolkit test stdlib

# After Submitting
Mention in release notes
---
 crates/nu-std/std/iter/mod.nu    | 8 +++++---
 crates/nu-std/tests/test_iter.nu | 5 ++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/crates/nu-std/std/iter/mod.nu b/crates/nu-std/std/iter/mod.nu
index 8c25269690..daa62d2dba 100644
--- a/crates/nu-std/std/iter/mod.nu
+++ b/crates/nu-std/std/iter/mod.nu
@@ -101,8 +101,9 @@ export def intersperse [ # -> list<any>
 # Returns a list of intermediate steps performed by `reduce`
 # (`fold`). It takes two arguments, an initial value to seed the
 # initial state and a closure that takes two arguments, the first
-# being the internal state and the second the list element in the
-# current iteration.
+# being the list element in the current iteration and the second
+# the internal state.
+# The internal state is also provided as pipeline input.
 #
 # # Example
 # ```
@@ -123,7 +124,8 @@ export def scan [ # -> list<any>
     --noinit(-n)         # remove the initial value from the result
 ] {                      
     reduce --fold [$init] {|it, acc|
-        $acc ++ [(do $fn ($acc | last) $it)]
+        let acc_last = $acc | last
+        $acc ++ [($acc_last | do $fn $it $acc_last)]
     }
     | if $noinit {
         $in | skip
diff --git a/crates/nu-std/tests/test_iter.nu b/crates/nu-std/tests/test_iter.nu
index 2b768c3d9d..3ace342788 100644
--- a/crates/nu-std/tests/test_iter.nu
+++ b/crates/nu-std/tests/test_iter.nu
@@ -49,7 +49,10 @@ def iter_scan [] {
     let scanned = ([1 2 3] | iter scan 0 {|x, y| $x + $y})
     assert equal $scanned [0, 1, 3, 6]
 
-    let scanned = ([a b c d] | iter scan "" {|x, y| [$x, $y] | str join} -n)
+    let scanned = ([a b c d] | iter scan "" {|it, acc| [$acc, $it] | str join} -n)
+    assert equal $scanned ["a" "ab" "abc" "abcd"]
+
+    let scanned = ([a b c d] | iter scan "" {|it, acc| append $it | str join} -n)
     assert equal $scanned ["a" "ab" "abc" "abcd"]
 }
 

From 39770d41975a0dae3cdc89802215416a4c6671e4 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Mon, 16 Dec 2024 09:18:47 -0500
Subject: [PATCH 0802/1072] Moves additional env vars out of default_env and
 updates some transient prompt vars (#14579)

# Description

With `NU_LIB_DIRS`, `NU_PLUGIN_DIRS`, and `ENV_CONVERSIONS` now moved
out of `default_env.nu`, we're down to just a few left. This moves all
non-closure `PROMPT` variables out as well (and into Rust `main()`. It
also:

* Implements #14565 and sets the default
`TRANSIENT_PROMPT_COMMAND_RIGHT` and `TRANSIENT_MULTILINE_INDICATOR` to
an empty string so that they are removed for easier copying from the
terminal.
* Reverses portions of #14249 where I was overzealous in some of the
variables that were imported
* Fixes #12096
* Will be the final fix in place, I believe, to close #13670

# User-Facing Changes

Transient prompt will now remove the right-prompt and
multiline-indicator once a commandline has been entered.

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
-
# After Submitting

Release notes addition
---
 .../nu-utils/src/default_files/default_env.nu |  5 -----
 src/main.rs                                   | 22 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/crates/nu-utils/src/default_files/default_env.nu b/crates/nu-utils/src/default_files/default_env.nu
index 66b442ce7a..ae2f1ae719 100644
--- a/crates/nu-utils/src/default_files/default_env.nu
+++ b/crates/nu-utils/src/default_files/default_env.nu
@@ -17,11 +17,6 @@ $env.PROMPT_COMMAND = $env.PROMPT_COMMAND? | default {||
     $path_segment | str replace --all (char path_sep) $"($separator_color)(char path_sep)($path_color)"
 }
 
-$env.PROMPT_INDICATOR = $env.PROMPT_INDICATOR? | default "> "
-$env.PROMPT_INDICATOR_VI_NORMAL = $env.PROMPT_INDICATOR_VI_NORMAL? | default "> "
-$env.PROMPT_INDICATOR_VI_INSERT = $env.PROMPT_INDICATOR_VI_INSERT? | default ": "
-$env.PROMPT_MULTILINE_INDICATOR = $env.PROMPT_MULTILINE_INDICATOR? | default "::: "
-
 $env.PROMPT_COMMAND_RIGHT = $env.PROMPT_COMMAND_RIGHT? | default {|| 
     # create a right prompt in magenta with green separators and am/pm underlined
     let time_segment = ([
diff --git a/src/main.rs b/src/main.rs
index 7d39aef02b..4ebc215531 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -320,9 +320,29 @@ fn main() -> Result<()> {
         "NU_VERSION".to_string(),
         Value::string(env!("CARGO_PKG_VERSION"), Span::unknown()),
     );
-
     // Add SHLVL if interactive
     if engine_state.is_interactive {
+        engine_state.add_env_var("PROMPT_INDICATOR".to_string(), Value::test_string("> "));
+        engine_state.add_env_var(
+            "PROMPT_INDICATOR_VI_NORMAL".to_string(),
+            Value::test_string("> "),
+        );
+        engine_state.add_env_var(
+            "PROMPT_INDICATOR_VI_INSERT".to_string(),
+            Value::test_string(": "),
+        );
+        engine_state.add_env_var(
+            "PROMPT_MULTILINE_INDICATOR".to_string(),
+            Value::test_string("::: "),
+        );
+        engine_state.add_env_var(
+            "TRANSIENT_PROMPT_MULTILINE_INDICATOR".to_string(),
+            Value::test_string(""),
+        );
+        engine_state.add_env_var(
+            "TRANSIENT_PROMPT_COMMAND_RIGHT".to_string(),
+            Value::test_string(""),
+        );
         let mut shlvl = engine_state
             .get_env_var("SHLVL")
             .map(|x| x.as_str().unwrap_or("0").parse::<i64>().unwrap_or(0))

From e2c4ff8180f2352fa759408b82aa49c53911c5bc Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Mon, 16 Dec 2024 13:52:07 -0600
Subject: [PATCH 0803/1072] Revert "Feature: PWD-per-drive to facilitate
 working on multiple drives at Windows" (#14598)

Reverts nushell/nushell#14411
---
 .../src/completions/completion_common.rs      |   8 -
 crates/nu-cli/src/repl.rs                     |   6 -
 crates/nu-command/src/filesystem/cd.rs        |   2 +-
 crates/nu-engine/src/env.rs                   |   3 -
 crates/nu-engine/src/eval.rs                  |   5 -
 crates/nu-engine/src/eval_ir.rs               |  34 +-
 crates/nu-path/src/lib.rs                     |   4 -
 crates/nu-path/src/pwd_per_drive.rs           | 331 ------------------
 crates/nu-protocol/src/engine/stack.rs        |  35 --
 src/run.rs                                    |  31 --
 10 files changed, 29 insertions(+), 430 deletions(-)
 delete mode 100644 crates/nu-path/src/pwd_per_drive.rs

diff --git a/crates/nu-cli/src/completions/completion_common.rs b/crates/nu-cli/src/completions/completion_common.rs
index d96ca365eb..4b5ef857e1 100644
--- a/crates/nu-cli/src/completions/completion_common.rs
+++ b/crates/nu-cli/src/completions/completion_common.rs
@@ -174,14 +174,6 @@ pub fn complete_item(
 ) -> Vec<FileSuggestion> {
     let cleaned_partial = surround_remove(partial);
     let isdir = cleaned_partial.ends_with(is_separator);
-    #[cfg(windows)]
-    let cleaned_partial = if let Some(absolute_partial) =
-        stack.pwd_per_drive.expand_pwd(Path::new(&cleaned_partial))
-    {
-        absolute_partial.display().to_string()
-    } else {
-        cleaned_partial
-    };
     let expanded_partial = expand_ndots(Path::new(&cleaned_partial));
     let should_collapse_dots = expanded_partial != Path::new(&cleaned_partial);
     let mut partial = expanded_partial.to_string_lossy().to_string();
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 0476435aee..4bd86ddbf9 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -832,12 +832,6 @@ fn do_auto_cd(
     engine_state: &mut EngineState,
     span: Span,
 ) {
-    #[cfg(windows)]
-    let path = if let Some(abs_path) = stack.pwd_per_drive.expand_pwd(path.as_path()) {
-        abs_path
-    } else {
-        path
-    };
     let path = {
         if !path.exists() {
             report_shell_error(
diff --git a/crates/nu-command/src/filesystem/cd.rs b/crates/nu-command/src/filesystem/cd.rs
index 3b5aa377fe..2af932bcb4 100644
--- a/crates/nu-command/src/filesystem/cd.rs
+++ b/crates/nu-command/src/filesystem/cd.rs
@@ -87,7 +87,7 @@ impl Command for Cd {
                             });
                         }
                     } else {
-                        let path = stack.expand_path_with(path_no_whitespace, &cwd, true);
+                        let path = nu_path::expand_path_with(path_no_whitespace, &cwd, true);
                         if !path.exists() {
                             return Err(ShellError::DirectoryNotFound {
                                 dir: path_no_whitespace.to_string(),
diff --git a/crates/nu-engine/src/env.rs b/crates/nu-engine/src/env.rs
index bec885173a..2ef7ecc1d9 100644
--- a/crates/nu-engine/src/env.rs
+++ b/crates/nu-engine/src/env.rs
@@ -156,9 +156,6 @@ pub fn env_to_strings(
         }
     }
 
-    #[cfg(windows)]
-    stack.pwd_per_drive.get_env_vars(&mut env_vars_str);
-
     Ok(env_vars_str)
 }
 
diff --git a/crates/nu-engine/src/eval.rs b/crates/nu-engine/src/eval.rs
index d41e5753bd..0e3917290f 100644
--- a/crates/nu-engine/src/eval.rs
+++ b/crates/nu-engine/src/eval.rs
@@ -194,11 +194,6 @@ pub fn redirect_env(engine_state: &EngineState, caller_stack: &mut Stack, callee
         caller_stack.add_env_var(var, value);
     }
 
-    #[cfg(windows)]
-    {
-        caller_stack.pwd_per_drive = callee_stack.pwd_per_drive.clone();
-    }
-
     // set config to callee config, to capture any updates to that
     caller_stack.config.clone_from(&callee_stack.config);
 }
diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index 7b4c0a28f5..afcb58a90a 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -1,6 +1,6 @@
 use std::{borrow::Cow, fs::File, sync::Arc};
 
-use nu_path::AbsolutePathBuf;
+use nu_path::{expand_path_with, AbsolutePathBuf};
 use nu_protocol::{
     ast::{Bits, Block, Boolean, CellPath, Comparison, Math, Operator},
     debugger::DebugContext,
@@ -14,7 +14,7 @@ use nu_protocol::{
 };
 use nu_utils::IgnoreCaseExt;
 
-use crate::{eval::is_automatic_env_var, eval_block_with_early_return, redirect_env};
+use crate::{eval::is_automatic_env_var, eval_block_with_early_return};
 
 /// Evaluate the compiled representation of a [`Block`].
 pub fn eval_ir_block<D: DebugContext>(
@@ -870,7 +870,7 @@ fn literal_value(
                 Value::string(path, span)
             } else {
                 let cwd = ctx.engine_state.cwd(Some(ctx.stack))?;
-                let path = ctx.stack.expand_path_with(path, cwd, true);
+                let path = expand_path_with(path, cwd, true);
 
                 Value::string(path.to_string_lossy(), span)
             }
@@ -890,7 +890,7 @@ fn literal_value(
                     .cwd(Some(ctx.stack))
                     .map(AbsolutePathBuf::into_std_path_buf)
                     .unwrap_or_default();
-                let path = ctx.stack.expand_path_with(path, cwd, true);
+                let path = expand_path_with(path, cwd, true);
 
                 Value::string(path.to_string_lossy(), span)
             }
@@ -1405,8 +1405,7 @@ enum RedirectionStream {
 /// Open a file for redirection
 fn open_file(ctx: &EvalContext<'_>, path: &Value, append: bool) -> Result<Arc<File>, ShellError> {
     let path_expanded =
-        ctx.stack
-            .expand_path_with(path.as_str()?, ctx.engine_state.cwd(Some(ctx.stack))?, true);
+        expand_path_with(path.as_str()?, ctx.engine_state.cwd(Some(ctx.stack))?, true);
     let mut options = File::options();
     if append {
         options.append(true);
@@ -1486,3 +1485,26 @@ fn eval_iterate(
         eval_iterate(ctx, dst, stream, end_index)
     }
 }
+
+/// Redirect environment from the callee stack to the caller stack
+fn redirect_env(engine_state: &EngineState, caller_stack: &mut Stack, callee_stack: &Stack) {
+    // TODO: make this more efficient
+    // Grab all environment variables from the callee
+    let caller_env_vars = caller_stack.get_env_var_names(engine_state);
+
+    // remove env vars that are present in the caller but not in the callee
+    // (the callee hid them)
+    for var in caller_env_vars.iter() {
+        if !callee_stack.has_env_var(engine_state, var) {
+            caller_stack.remove_env_var(engine_state, var);
+        }
+    }
+
+    // add new env vars from callee to caller
+    for (var, value) in callee_stack.get_stack_env_vars() {
+        caller_stack.add_env_var(var, value);
+    }
+
+    // set config to callee config, to capture any updates to that
+    caller_stack.config.clone_from(&callee_stack.config);
+}
diff --git a/crates/nu-path/src/lib.rs b/crates/nu-path/src/lib.rs
index 660fae4b22..cf31a5789f 100644
--- a/crates/nu-path/src/lib.rs
+++ b/crates/nu-path/src/lib.rs
@@ -6,8 +6,6 @@ pub mod expansions;
 pub mod form;
 mod helpers;
 mod path;
-#[cfg(windows)]
-pub mod pwd_per_drive;
 mod tilde;
 mod trailing_slash;
 
@@ -15,7 +13,5 @@ pub use components::components;
 pub use expansions::{canonicalize_with, expand_path_with, expand_to_real_path, locate_in_dirs};
 pub use helpers::{cache_dir, data_dir, home_dir, nu_config_dir};
 pub use path::*;
-#[cfg(windows)]
-pub use pwd_per_drive::DriveToPwdMap;
 pub use tilde::expand_tilde;
 pub use trailing_slash::{has_trailing_slash, strip_trailing_slash};
diff --git a/crates/nu-path/src/pwd_per_drive.rs b/crates/nu-path/src/pwd_per_drive.rs
deleted file mode 100644
index d7a395174f..0000000000
--- a/crates/nu-path/src/pwd_per_drive.rs
+++ /dev/null
@@ -1,331 +0,0 @@
-/// Usage for pwd_per_drive on windows
-///
-/// let mut map = DriveToPwdMap::new();
-///
-/// Upon change PWD, call map.set_pwd() with absolute path
-///
-/// Call map.expand_pwd() with relative path to get absolution path
-///
-/// ```
-/// use std::path::{Path, PathBuf};
-/// use nu_path::DriveToPwdMap;
-///
-/// let mut map = DriveToPwdMap::new();
-///
-/// // Set PWD for drive C
-/// assert!(map.set_pwd(Path::new(r"C:\Users\Home")).is_ok());
-///
-/// // Expand a relative path
-/// let expanded = map.expand_pwd(Path::new("c:test"));
-/// assert_eq!(expanded, Some(PathBuf::from(r"C:\Users\Home\test")));
-///
-/// // Will NOT expand an absolute path
-/// let expanded = map.expand_pwd(Path::new(r"C:\absolute\path"));
-/// assert_eq!(expanded, None);
-///
-/// // Expand with no drive letter
-/// let expanded = map.expand_pwd(Path::new(r"\no_drive"));
-/// assert_eq!(expanded, None);
-///
-/// // Expand with no PWD set for the drive
-/// let expanded = map.expand_pwd(Path::new("D:test"));
-/// assert!(expanded.is_some());
-/// let abs_path = expanded.unwrap().as_path().to_str().expect("OK").to_string();
-/// assert!(abs_path.starts_with(r"D:\"));
-/// assert!(abs_path.ends_with(r"\test"));
-///
-/// // Get env vars for child process
-/// use std::collections::HashMap;
-/// let mut env = HashMap::<String, String>::new();
-/// map.get_env_vars(&mut env);
-/// assert_eq!(env.get("=C:").unwrap(), r"C:\Users\Home");
-/// ```
-use std::collections::HashMap;
-use std::path::{Path, PathBuf};
-
-#[derive(Debug, PartialEq)]
-pub enum PathError {
-    InvalidDriveLetter,
-    InvalidPath,
-}
-
-/// Helper to check if input path is relative path
-/// with drive letter, it can be expanded with PWD-per-drive.
-fn need_expand(path: &Path) -> bool {
-    if let Some(path_str) = path.to_str() {
-        let chars: Vec<char> = path_str.chars().collect();
-        if chars.len() >= 2 {
-            return chars[1] == ':' && (chars.len() == 2 || (chars[2] != '/' && chars[2] != '\\'));
-        }
-    }
-    false
-}
-
-#[derive(Clone, Debug)]
-pub struct DriveToPwdMap {
-    map: [Option<String>; 26], // Fixed-size array for A-Z
-}
-
-impl Default for DriveToPwdMap {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl DriveToPwdMap {
-    pub fn new() -> Self {
-        Self {
-            map: Default::default(),
-        }
-    }
-
-    pub fn env_var_for_drive(drive_letter: char) -> String {
-        let drive_letter = drive_letter.to_ascii_uppercase();
-        format!("={}:", drive_letter)
-    }
-
-    /// Collect PWD-per-drive as env vars (for child process)
-    pub fn get_env_vars(&self, env: &mut HashMap<String, String>) {
-        for (drive_index, drive_letter) in ('A'..='Z').enumerate() {
-            if let Some(pwd) = self.map[drive_index].clone() {
-                if pwd.len() > 3 {
-                    let env_var_for_drive = Self::env_var_for_drive(drive_letter);
-                    env.insert(env_var_for_drive, pwd);
-                }
-            }
-        }
-    }
-
-    /// Set the PWD for the drive letter in the absolute path.
-    /// Return PathError for error.
-    pub fn set_pwd(&mut self, path: &Path) -> Result<(), PathError> {
-        if let (Some(drive_letter), Some(path_str)) =
-            (Self::extract_drive_letter(path), path.to_str())
-        {
-            if drive_letter.is_ascii_alphabetic() {
-                let drive_letter = drive_letter.to_ascii_uppercase();
-                // Make sure saved drive letter is upper case
-                let mut c = path_str.chars();
-                match c.next() {
-                    None => Err(PathError::InvalidDriveLetter),
-                    Some(_) => {
-                        let drive_index = drive_letter as usize - 'A' as usize;
-                        let normalized_pwd = drive_letter.to_string() + c.as_str();
-                        self.map[drive_index] = Some(normalized_pwd);
-                        Ok(())
-                    }
-                }
-            } else {
-                Err(PathError::InvalidDriveLetter)
-            }
-        } else {
-            Err(PathError::InvalidPath)
-        }
-    }
-
-    /// Get the PWD for drive, if not yet, ask GetFullPathNameW() or omnipath,
-    /// or else return default r"X:\".
-    fn get_pwd(&self, drive_letter: char) -> Result<String, PathError> {
-        if drive_letter.is_ascii_alphabetic() {
-            let drive_letter = drive_letter.to_ascii_uppercase();
-            let drive_index = drive_letter as usize - 'A' as usize;
-            Ok(self.map[drive_index].clone().unwrap_or_else(|| {
-                if let Some(sys_pwd) = get_full_path_name_w(&format!("{}:", drive_letter)) {
-                    sys_pwd
-                } else {
-                    format!(r"{}:\", drive_letter)
-                }
-            }))
-        } else {
-            Err(PathError::InvalidDriveLetter)
-        }
-    }
-
-    /// Expand a relative path using the PWD-per-drive, return PathBuf
-    /// of absolute path.
-    /// Return None if path is not valid or can't get drive letter.
-    pub fn expand_pwd(&self, path: &Path) -> Option<PathBuf> {
-        if need_expand(path) {
-            let path_str = path.to_str()?;
-            if let Some(drive_letter) = Self::extract_drive_letter(path) {
-                if let Ok(pwd) = self.get_pwd(drive_letter) {
-                    // Combine current PWD with the relative path
-                    let mut base = PathBuf::from(Self::ensure_trailing_delimiter(&pwd));
-                    // need_expand() and extract_drive_letter() all ensure path_str.len() >= 2
-                    base.push(&path_str[2..]); // Join PWD with path parts after "C:"
-                    return Some(base);
-                }
-            }
-        }
-        None // Invalid path or has no drive letter
-    }
-
-    /// Helper to extract the drive letter from a path, keep case
-    ///  (e.g., `C:test` -> `C`, `d:\temp` -> `d`)
-    fn extract_drive_letter(path: &Path) -> Option<char> {
-        path.to_str()
-            .and_then(|s| s.chars().next())
-            .filter(|c| c.is_ascii_alphabetic())
-    }
-
-    /// Ensure a path has a trailing `\\` or '/'
-    fn ensure_trailing_delimiter(path: &str) -> String {
-        if !path.ends_with('\\') && !path.ends_with('/') {
-            format!(r"{}\", path)
-        } else {
-            path.to_string()
-        }
-    }
-}
-
-fn get_full_path_name_w(path_str: &str) -> Option<String> {
-    use omnipath::sys_absolute;
-    if let Ok(path_sys_abs) = sys_absolute(Path::new(path_str)) {
-        Some(path_sys_abs.to_str()?.to_string())
-    } else {
-        None
-    }
-}
-
-/// Test for Drive2PWD map
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    /// Test or demo usage of PWD-per-drive
-    /// In doctest, there's no get_full_path_name_w available so can't foresee
-    /// possible result, here can have more accurate test assert
-    #[test]
-    fn test_usage_for_pwd_per_drive() {
-        let mut map = DriveToPwdMap::new();
-
-        // Set PWD for drive E
-        assert!(map.set_pwd(Path::new(r"E:\Users\Home")).is_ok());
-
-        // Expand a relative path
-        let expanded = map.expand_pwd(Path::new("e:test"));
-        assert_eq!(expanded, Some(PathBuf::from(r"E:\Users\Home\test")));
-
-        // Will NOT expand an absolute path
-        let expanded = map.expand_pwd(Path::new(r"E:\absolute\path"));
-        assert_eq!(expanded, None);
-
-        // Expand with no drive letter
-        let expanded = map.expand_pwd(Path::new(r"\no_drive"));
-        assert_eq!(expanded, None);
-
-        // Expand with no PWD set for the drive
-        let expanded = map.expand_pwd(Path::new("F:test"));
-        if let Some(sys_abs) = get_full_path_name_w("F:") {
-            assert_eq!(
-                expanded,
-                Some(PathBuf::from(format!(
-                    "{}test",
-                    DriveToPwdMap::ensure_trailing_delimiter(&sys_abs)
-                )))
-            );
-        } else {
-            assert_eq!(expanded, Some(PathBuf::from(r"F:\test")));
-        }
-    }
-
-    #[test]
-    fn test_get_env_vars() {
-        let mut map = DriveToPwdMap::new();
-        map.set_pwd(Path::new(r"I:\Home")).unwrap();
-        map.set_pwd(Path::new(r"j:\User")).unwrap();
-
-        let mut env = HashMap::<String, String>::new();
-        map.get_env_vars(&mut env);
-        assert_eq!(
-            env.get(&DriveToPwdMap::env_var_for_drive('I')).unwrap(),
-            r"I:\Home"
-        );
-        assert_eq!(
-            env.get(&DriveToPwdMap::env_var_for_drive('J')).unwrap(),
-            r"J:\User"
-        );
-    }
-
-    #[test]
-    fn test_expand_pwd() {
-        let mut drive_map = DriveToPwdMap::new();
-
-        // Set PWD for drive 'M:'
-        assert_eq!(drive_map.set_pwd(Path::new(r"M:\Users")), Ok(()));
-        // or 'm:'
-        assert_eq!(drive_map.set_pwd(Path::new(r"m:\Users\Home")), Ok(()));
-
-        // Expand a relative path on "M:"
-        let expanded = drive_map.expand_pwd(Path::new(r"M:test"));
-        assert_eq!(expanded, Some(PathBuf::from(r"M:\Users\Home\test")));
-        // or on "m:"
-        let expanded = drive_map.expand_pwd(Path::new(r"m:test"));
-        assert_eq!(expanded, Some(PathBuf::from(r"M:\Users\Home\test")));
-
-        // Expand an absolute path
-        let expanded = drive_map.expand_pwd(Path::new(r"m:\absolute\path"));
-        assert_eq!(expanded, None);
-
-        // Expand with no drive letter
-        let expanded = drive_map.expand_pwd(Path::new(r"\no_drive"));
-        assert_eq!(expanded, None);
-
-        // Expand with no PWD set for the drive
-        let expanded = drive_map.expand_pwd(Path::new("N:test"));
-        if let Some(pwd_on_drive) = get_full_path_name_w("N:") {
-            assert_eq!(
-                expanded,
-                Some(PathBuf::from(format!(
-                    r"{}test",
-                    DriveToPwdMap::ensure_trailing_delimiter(&pwd_on_drive)
-                )))
-            );
-        } else {
-            assert_eq!(expanded, Some(PathBuf::from(r"N:\test")));
-        }
-    }
-
-    #[test]
-    fn test_set_and_get_pwd() {
-        let mut drive_map = DriveToPwdMap::new();
-
-        // Set PWD for drive 'O'
-        assert!(drive_map.set_pwd(Path::new(r"O:\Users")).is_ok());
-        // Or for drive 'o'
-        assert!(drive_map.set_pwd(Path::new(r"o:\Users\Example")).is_ok());
-        // Get PWD for drive 'O'
-        assert_eq!(drive_map.get_pwd('O'), Ok(r"O:\Users\Example".to_string()));
-        // or 'o'
-        assert_eq!(drive_map.get_pwd('o'), Ok(r"O:\Users\Example".to_string()));
-
-        // Get PWD for drive P (not set yet, but system might already
-        // have PWD on this drive)
-        if let Some(pwd_on_drive) = get_full_path_name_w("P:") {
-            assert_eq!(drive_map.get_pwd('P'), Ok(pwd_on_drive));
-        } else {
-            assert_eq!(drive_map.get_pwd('P'), Ok(r"P:\".to_string()));
-        }
-    }
-
-    #[test]
-    fn test_set_pwd_invalid_path() {
-        let mut drive_map = DriveToPwdMap::new();
-
-        // Invalid path (no drive letter)
-        let result = drive_map.set_pwd(Path::new(r"\InvalidPath"));
-        assert!(result.is_err());
-        assert_eq!(result.unwrap_err(), PathError::InvalidPath);
-    }
-
-    #[test]
-    fn test_get_pwd_invalid_drive() {
-        let drive_map = DriveToPwdMap::new();
-
-        // Get PWD for a drive not set (e.g., Z)
-        assert_eq!(drive_map.get_pwd('Z'), Ok(r"Z:\".to_string()));
-
-        // Invalid drive letter (non-alphabetic)
-        assert_eq!(drive_map.get_pwd('1'), Err(PathError::InvalidDriveLetter));
-    }
-}
diff --git a/crates/nu-protocol/src/engine/stack.rs b/crates/nu-protocol/src/engine/stack.rs
index 66f59b78f6..ccd38cc5d3 100644
--- a/crates/nu-protocol/src/engine/stack.rs
+++ b/crates/nu-protocol/src/engine/stack.rs
@@ -9,7 +9,6 @@ use nu_utils::IgnoreCaseExt;
 use std::{
     collections::{HashMap, HashSet},
     fs::File,
-    path::{Path, PathBuf},
     sync::Arc,
 };
 
@@ -54,8 +53,6 @@ pub struct Stack {
     /// Locally updated config. Use [`.get_config()`](Self::get_config) to access correctly.
     pub config: Option<Arc<Config>>,
     pub(crate) out_dest: StackOutDest,
-    #[cfg(windows)]
-    pub pwd_per_drive: nu_path::DriveToPwdMap,
 }
 
 impl Default for Stack {
@@ -85,8 +82,6 @@ impl Stack {
             parent_deletions: vec![],
             config: None,
             out_dest: StackOutDest::new(),
-            #[cfg(windows)]
-            pwd_per_drive: nu_path::DriveToPwdMap::new(),
         }
     }
 
@@ -107,8 +102,6 @@ impl Stack {
             parent_deletions: vec![],
             config: parent.config.clone(),
             out_dest: parent.out_dest.clone(),
-            #[cfg(windows)]
-            pwd_per_drive: parent.pwd_per_drive.clone(),
             parent_stack: Some(parent),
         }
     }
@@ -135,10 +128,6 @@ impl Stack {
         unique_stack.env_hidden = child.env_hidden;
         unique_stack.active_overlays = child.active_overlays;
         unique_stack.config = child.config;
-        #[cfg(windows)]
-        {
-            unique_stack.pwd_per_drive = child.pwd_per_drive.clone();
-        }
         unique_stack
     }
 
@@ -330,8 +319,6 @@ impl Stack {
             parent_deletions: vec![],
             config: self.config.clone(),
             out_dest: self.out_dest.clone(),
-            #[cfg(windows)]
-            pwd_per_drive: self.pwd_per_drive.clone(),
         }
     }
 
@@ -365,8 +352,6 @@ impl Stack {
             parent_deletions: vec![],
             config: self.config.clone(),
             out_dest: self.out_dest.clone(),
-            #[cfg(windows)]
-            pwd_per_drive: self.pwd_per_drive.clone(),
         }
     }
 
@@ -776,29 +761,9 @@ impl Stack {
             let path = nu_path::strip_trailing_slash(path);
             let value = Value::string(path.to_string_lossy(), Span::unknown());
             self.add_env_var("PWD".into(), value);
-            // Sync with PWD-per-drive
-            #[cfg(windows)]
-            {
-                let _ = self.pwd_per_drive.set_pwd(&path);
-            }
             Ok(())
         }
     }
-
-    // Helper stub/proxy for nu_path::expand_path_with::<P, Q>(path, relative_to, expand_tilde)
-    // Facilitates file system commands to easily gain the ability to expand PWD-per-drive
-    pub fn expand_path_with<P, Q>(&self, path: P, relative_to: Q, expand_tilde: bool) -> PathBuf
-    where
-        P: AsRef<Path>,
-        Q: AsRef<Path>,
-    {
-        #[cfg(windows)]
-        if let Some(absolute_path) = self.pwd_per_drive.expand_pwd(path.as_ref()) {
-            return absolute_path;
-        }
-
-        nu_path::expand_path_with::<P, Q>(path, relative_to, expand_tilde)
-    }
 }
 
 #[cfg(test)]
diff --git a/src/run.rs b/src/run.rs
index eb2a9b2e98..89bad3866f 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -12,30 +12,6 @@ use nu_protocol::{
 };
 use nu_utils::perf;
 
-#[cfg(windows)]
-fn init_pwd_per_drive(engine_state: &EngineState, stack: &mut Stack) {
-    use nu_path::DriveToPwdMap;
-    use std::path::Path;
-
-    // Read environment for PWD-per-drive
-    for drive_letter in 'A'..='Z' {
-        let env_var = DriveToPwdMap::env_var_for_drive(drive_letter);
-        if let Some(env_pwd) = engine_state.get_env_var(&env_var) {
-            if let Ok(pwd_str) = nu_engine::env_to_string(&env_var, env_pwd, engine_state, stack) {
-                trace!("Get Env({}) {}", env_var, pwd_str);
-                let _ = stack.pwd_per_drive.set_pwd(Path::new(&pwd_str));
-                stack.remove_env_var(engine_state, &env_var);
-            }
-        }
-    }
-
-    if let Ok(abs_pwd) = engine_state.cwd(None) {
-        if let Some(abs_pwd_str) = abs_pwd.to_str() {
-            let _ = stack.pwd_per_drive.set_pwd(Path::new(abs_pwd_str));
-        }
-    }
-}
-
 pub(crate) fn run_commands(
     engine_state: &mut EngineState,
     parsed_nu_cli_args: command::NushellCliArgs,
@@ -50,8 +26,6 @@ pub(crate) fn run_commands(
     let create_scaffold = nu_path::nu_config_dir().map_or(false, |p| !p.exists());
 
     let mut stack = Stack::new();
-    #[cfg(windows)]
-    init_pwd_per_drive(engine_state, &mut stack);
 
     // if the --no-config-file(-n) option is NOT passed, load the plugin file,
     // load the default env file or custom (depending on parsed_nu_cli_args.env_file),
@@ -141,8 +115,6 @@ pub(crate) fn run_file(
 ) {
     trace!("run_file");
     let mut stack = Stack::new();
-    #[cfg(windows)]
-    init_pwd_per_drive(engine_state, &mut stack);
 
     // if the --no-config-file(-n) option is NOT passed, load the plugin file,
     // load the default env file or custom (depending on parsed_nu_cli_args.env_file),
@@ -210,9 +182,6 @@ pub(crate) fn run_repl(
 ) -> Result<(), miette::ErrReport> {
     trace!("run_repl");
     let mut stack = Stack::new();
-    #[cfg(windows)]
-    init_pwd_per_drive(engine_state, &mut stack);
-
     let start_time = std::time::Instant::now();
 
     if parsed_nu_cli_args.no_config_file.is_none() {

From 5615d21ce90f24722698fe664fa11d54073052c8 Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Tue, 17 Dec 2024 00:59:18 +0300
Subject: [PATCH 0804/1072] remove `content_type` metadata from pipeline after
 `from ...` commands (#14602)

# Description

`from ...` conversions pass along all metadata except `content_type`,
which they set to `None`.

## Rationale

`open`ing a file results in no `content_type` metadata if it can be
parsed into a nu data structure, and using `open --raw` results in
`content_type` metadata.

`from ...` commands should preserve metadata ***except*** for
`content_type`, as after parsing it's no longer that `content_type` and
just structured nu data.

These commands should return identical data *and* identical metadata

```nushell
open foo.csv
```

```nushell
open foo.csv --raw | from csv
```

# User-Facing Changes

N/A

# Tests + Formatting
- :green_circle: toolkit fmt
- :green_circle: toolkit clippy
- :green_circle: toolkit test
- :green_circle: toolkit test stdlib

# After Submitting
N/A
---
 crates/nu-command/src/formats/from/csv.rs     | 33 +++++++++++
 .../nu-command/src/formats/from/delimited.rs  |  5 +-
 crates/nu-command/src/formats/from/json.rs    | 58 ++++++++++++++-----
 crates/nu-command/src/formats/from/msgpack.rs | 40 ++++++++++++-
 .../nu-command/src/formats/from/msgpackz.rs   |  6 +-
 crates/nu-command/src/formats/from/nuon.rs    | 36 +++++++++++-
 crates/nu-command/src/formats/from/ods.rs     |  3 +-
 crates/nu-command/src/formats/from/toml.rs    | 35 ++++++++++-
 crates/nu-command/src/formats/from/tsv.rs     | 33 +++++++++++
 crates/nu-command/src/formats/from/xlsx.rs    |  3 +-
 crates/nu-command/src/formats/from/xml.rs     | 40 ++++++++++++-
 crates/nu-command/src/formats/from/yaml.rs    | 36 +++++++++++-
 12 files changed, 303 insertions(+), 25 deletions(-)

diff --git a/crates/nu-command/src/formats/from/csv.rs b/crates/nu-command/src/formats/from/csv.rs
index bde84c2c73..74b9bcd33f 100644
--- a/crates/nu-command/src/formats/from/csv.rs
+++ b/crates/nu-command/src/formats/from/csv.rs
@@ -204,12 +204,45 @@ fn from_csv(
 
 #[cfg(test)]
 mod test {
+    use nu_cmd_lang::eval_pipeline_without_terminal_expression;
+
     use super::*;
 
+    use crate::{Metadata, MetadataSet};
+
     #[test]
     fn test_examples() {
         use crate::test_examples;
 
         test_examples(FromCsv {})
     }
+
+    #[test]
+    fn test_content_type_metadata() {
+        let mut engine_state = Box::new(EngineState::new());
+        let delta = {
+            let mut working_set = StateWorkingSet::new(&engine_state);
+
+            working_set.add_decl(Box::new(FromCsv {}));
+            working_set.add_decl(Box::new(Metadata {}));
+            working_set.add_decl(Box::new(MetadataSet {}));
+
+            working_set.render()
+        };
+
+        engine_state
+            .merge_delta(delta)
+            .expect("Error merging delta");
+
+        let cmd = r#""a,b\n1,2" | metadata set --content-type 'text/csv' --datasource-ls | from csv | metadata | $in"#;
+        let result = eval_pipeline_without_terminal_expression(
+            cmd,
+            std::env::temp_dir().as_ref(),
+            &mut engine_state,
+        );
+        assert_eq!(
+            Value::test_record(record!("source" => Value::test_string("ls"))),
+            result.expect("There should be a result")
+        )
+    }
 }
diff --git a/crates/nu-command/src/formats/from/delimited.rs b/crates/nu-command/src/formats/from/delimited.rs
index 5dfdd4ad82..865bc79a41 100644
--- a/crates/nu-command/src/formats/from/delimited.rs
+++ b/crates/nu-command/src/formats/from/delimited.rs
@@ -93,9 +93,10 @@ pub(super) fn from_delimited_data(
     input: PipelineData,
     name: Span,
 ) -> Result<PipelineData, ShellError> {
+    let metadata = input.metadata().map(|md| md.with_content_type(None));
     match input {
         PipelineData::Empty => Ok(PipelineData::Empty),
-        PipelineData::Value(value, metadata) => {
+        PipelineData::Value(value, ..) => {
             let string = value.into_string()?;
             let byte_stream = ByteStream::read_string(string, name, Signals::empty());
             Ok(PipelineData::ListStream(
@@ -109,7 +110,7 @@ pub(super) fn from_delimited_data(
             dst_span: name,
             src_span: list_stream.span(),
         }),
-        PipelineData::ByteStream(byte_stream, metadata) => Ok(PipelineData::ListStream(
+        PipelineData::ByteStream(byte_stream, ..) => Ok(PipelineData::ListStream(
             from_delimited_stream(config, byte_stream, name)?,
             metadata,
         )),
diff --git a/crates/nu-command/src/formats/from/json.rs b/crates/nu-command/src/formats/from/json.rs
index e3de2cbafd..36a05ea4e1 100644
--- a/crates/nu-command/src/formats/from/json.rs
+++ b/crates/nu-command/src/formats/from/json.rs
@@ -70,23 +70,22 @@ impl Command for FromJson {
         let span = call.head;
 
         let strict = call.has_flag(engine_state, stack, "strict")?;
+        let metadata = input.metadata().map(|md| md.with_content_type(None));
 
         // TODO: turn this into a structured underline of the nu_json error
         if call.has_flag(engine_state, stack, "objects")? {
             // Return a stream of JSON values, one for each non-empty line
             match input {
-                PipelineData::Value(Value::String { val, .. }, metadata) => {
-                    Ok(PipelineData::ListStream(
-                        read_json_lines(
-                            Cursor::new(val),
-                            span,
-                            strict,
-                            engine_state.signals().clone(),
-                        ),
-                        metadata,
-                    ))
-                }
-                PipelineData::ByteStream(stream, metadata)
+                PipelineData::Value(Value::String { val, .. }, ..) => Ok(PipelineData::ListStream(
+                    read_json_lines(
+                        Cursor::new(val),
+                        span,
+                        strict,
+                        engine_state.signals().clone(),
+                    ),
+                    metadata,
+                )),
+                PipelineData::ByteStream(stream, ..)
                     if stream.type_() != ByteStreamType::Binary =>
                 {
                     if let Some(reader) = stream.reader() {
@@ -107,7 +106,7 @@ impl Command for FromJson {
             }
         } else {
             // Return a single JSON value
-            let (string_input, span, metadata) = input.collect_string_strict(span)?;
+            let (string_input, span, ..) = input.collect_string_strict(span)?;
 
             if string_input.is_empty() {
                 return Ok(Value::nothing(span).into_pipeline_data());
@@ -267,6 +266,10 @@ fn convert_string_to_value_strict(string_input: &str, span: Span) -> Result<Valu
 
 #[cfg(test)]
 mod test {
+    use nu_cmd_lang::eval_pipeline_without_terminal_expression;
+
+    use crate::{Metadata, MetadataSet};
+
     use super::*;
 
     #[test]
@@ -275,4 +278,33 @@ mod test {
 
         test_examples(FromJson {})
     }
+
+    #[test]
+    fn test_content_type_metadata() {
+        let mut engine_state = Box::new(EngineState::new());
+        let delta = {
+            let mut working_set = StateWorkingSet::new(&engine_state);
+
+            working_set.add_decl(Box::new(FromJson {}));
+            working_set.add_decl(Box::new(Metadata {}));
+            working_set.add_decl(Box::new(MetadataSet {}));
+
+            working_set.render()
+        };
+
+        engine_state
+            .merge_delta(delta)
+            .expect("Error merging delta");
+
+        let cmd = r#"'{"a":1,"b":2}' | metadata set --content-type 'application/json' --datasource-ls | from json | metadata | $in"#;
+        let result = eval_pipeline_without_terminal_expression(
+            cmd,
+            std::env::temp_dir().as_ref(),
+            &mut engine_state,
+        );
+        assert_eq!(
+            Value::test_record(record!("source" => Value::test_string("ls"))),
+            result.expect("There should be a result")
+        )
+    }
 }
diff --git a/crates/nu-command/src/formats/from/msgpack.rs b/crates/nu-command/src/formats/from/msgpack.rs
index a3538ea69f..4fe849b8fe 100644
--- a/crates/nu-command/src/formats/from/msgpack.rs
+++ b/crates/nu-command/src/formats/from/msgpack.rs
@@ -113,7 +113,8 @@ MessagePack: https://msgpack.org/
             objects,
             signals: engine_state.signals().clone(),
         };
-        match input {
+        let metadata = input.metadata().map(|md| md.with_content_type(None));
+        let out = match input {
             // Deserialize from a byte buffer
             PipelineData::Value(Value::Binary { val: bytes, .. }, _) => {
                 read_msgpack(Cursor::new(bytes), opts)
@@ -136,7 +137,8 @@ MessagePack: https://msgpack.org/
                 dst_span: call.head,
                 src_span: input.span().unwrap_or(call.head),
             }),
-        }
+        };
+        out.map(|pd| pd.set_metadata(metadata))
     }
 }
 
@@ -510,6 +512,10 @@ fn assert_eof(input: &mut impl io::Read, span: Span) -> Result<(), ShellError> {
 
 #[cfg(test)]
 mod test {
+    use nu_cmd_lang::eval_pipeline_without_terminal_expression;
+
+    use crate::{Metadata, MetadataSet, ToMsgpack};
+
     use super::*;
 
     #[test]
@@ -518,4 +524,34 @@ mod test {
 
         test_examples(FromMsgpack {})
     }
+
+    #[test]
+    fn test_content_type_metadata() {
+        let mut engine_state = Box::new(EngineState::new());
+        let delta = {
+            let mut working_set = StateWorkingSet::new(&engine_state);
+
+            working_set.add_decl(Box::new(ToMsgpack {}));
+            working_set.add_decl(Box::new(FromMsgpack {}));
+            working_set.add_decl(Box::new(Metadata {}));
+            working_set.add_decl(Box::new(MetadataSet {}));
+
+            working_set.render()
+        };
+
+        engine_state
+            .merge_delta(delta)
+            .expect("Error merging delta");
+
+        let cmd = r#"{a: 1 b: 2} | to msgpack | metadata set --datasource-ls | from msgpack | metadata | $in"#;
+        let result = eval_pipeline_without_terminal_expression(
+            cmd,
+            std::env::temp_dir().as_ref(),
+            &mut engine_state,
+        );
+        assert_eq!(
+            Value::test_record(record!("source" => Value::test_string("ls"))),
+            result.expect("There should be a result")
+        )
+    }
 }
diff --git a/crates/nu-command/src/formats/from/msgpackz.rs b/crates/nu-command/src/formats/from/msgpackz.rs
index 81cc901614..4f31f74ec6 100644
--- a/crates/nu-command/src/formats/from/msgpackz.rs
+++ b/crates/nu-command/src/formats/from/msgpackz.rs
@@ -43,7 +43,8 @@ impl Command for FromMsgpackz {
             objects,
             signals: engine_state.signals().clone(),
         };
-        match input {
+        let metadata = input.metadata().map(|md| md.with_content_type(None));
+        let out = match input {
             // Deserialize from a byte buffer
             PipelineData::Value(Value::Binary { val: bytes, .. }, _) => {
                 let reader = brotli::Decompressor::new(Cursor::new(bytes), BUFFER_SIZE);
@@ -68,6 +69,7 @@ impl Command for FromMsgpackz {
                 dst_span: call.head,
                 src_span: span,
             }),
-        }
+        };
+        out.map(|pd| pd.set_metadata(metadata))
     }
 }
diff --git a/crates/nu-command/src/formats/from/nuon.rs b/crates/nu-command/src/formats/from/nuon.rs
index 107ee9c3b4..7cb45c5721 100644
--- a/crates/nu-command/src/formats/from/nuon.rs
+++ b/crates/nu-command/src/formats/from/nuon.rs
@@ -49,7 +49,8 @@ impl Command for FromNuon {
         let (string_input, _span, metadata) = input.collect_string_strict(head)?;
 
         match nuon::from_nuon(&string_input, Some(head)) {
-            Ok(result) => Ok(result.into_pipeline_data_with_metadata(metadata)),
+            Ok(result) => Ok(result
+                .into_pipeline_data_with_metadata(metadata.map(|md| md.with_content_type(None)))),
             Err(err) => Err(ShellError::GenericError {
                 error: "error when loading nuon text".into(),
                 msg: "could not load nuon text".into(),
@@ -63,6 +64,10 @@ impl Command for FromNuon {
 
 #[cfg(test)]
 mod test {
+    use nu_cmd_lang::eval_pipeline_without_terminal_expression;
+
+    use crate::{Metadata, MetadataSet};
+
     use super::*;
 
     #[test]
@@ -71,4 +76,33 @@ mod test {
 
         test_examples(FromNuon {})
     }
+
+    #[test]
+    fn test_content_type_metadata() {
+        let mut engine_state = Box::new(EngineState::new());
+        let delta = {
+            let mut working_set = StateWorkingSet::new(&engine_state);
+
+            working_set.add_decl(Box::new(FromNuon {}));
+            working_set.add_decl(Box::new(Metadata {}));
+            working_set.add_decl(Box::new(MetadataSet {}));
+
+            working_set.render()
+        };
+
+        engine_state
+            .merge_delta(delta)
+            .expect("Error merging delta");
+
+        let cmd = r#"'[[a, b]; [1, 2]]' | metadata set --content-type 'application/x-nuon' --datasource-ls | from nuon | metadata | $in"#;
+        let result = eval_pipeline_without_terminal_expression(
+            cmd,
+            std::env::temp_dir().as_ref(),
+            &mut engine_state,
+        );
+        assert_eq!(
+            Value::test_record(record!("source" => Value::test_string("ls"))),
+            result.expect("There should be a result")
+        )
+    }
 }
diff --git a/crates/nu-command/src/formats/from/ods.rs b/crates/nu-command/src/formats/from/ods.rs
index c6f08f4481..f1f4252f1e 100644
--- a/crates/nu-command/src/formats/from/ods.rs
+++ b/crates/nu-command/src/formats/from/ods.rs
@@ -46,7 +46,8 @@ impl Command for FromOds {
             vec![]
         };
 
-        from_ods(input, head, sel_sheets)
+        let metadata = input.metadata().map(|md| md.with_content_type(None));
+        from_ods(input, head, sel_sheets).map(|pd| pd.set_metadata(metadata))
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/formats/from/toml.rs b/crates/nu-command/src/formats/from/toml.rs
index a61ced65a0..8f4242e5db 100644
--- a/crates/nu-command/src/formats/from/toml.rs
+++ b/crates/nu-command/src/formats/from/toml.rs
@@ -29,7 +29,8 @@ impl Command for FromToml {
         let span = call.head;
         let (mut string_input, span, metadata) = input.collect_string_strict(span)?;
         string_input.push('\n');
-        Ok(convert_string_to_value(string_input, span)?.into_pipeline_data_with_metadata(metadata))
+        Ok(convert_string_to_value(string_input, span)?
+            .into_pipeline_data_with_metadata(metadata.map(|md| md.with_content_type(None))))
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -144,8 +145,11 @@ pub fn convert_string_to_value(string_input: String, span: Span) -> Result<Value
 
 #[cfg(test)]
 mod tests {
+    use crate::{Metadata, MetadataSet};
+
     use super::*;
     use chrono::TimeZone;
+    use nu_cmd_lang::eval_pipeline_without_terminal_expression;
     use toml::value::Datetime;
 
     #[test]
@@ -331,4 +335,33 @@ mod tests {
 
         assert_eq!(result, reference_date);
     }
+
+    #[test]
+    fn test_content_type_metadata() {
+        let mut engine_state = Box::new(EngineState::new());
+        let delta = {
+            let mut working_set = StateWorkingSet::new(&engine_state);
+
+            working_set.add_decl(Box::new(FromToml {}));
+            working_set.add_decl(Box::new(Metadata {}));
+            working_set.add_decl(Box::new(MetadataSet {}));
+
+            working_set.render()
+        };
+
+        engine_state
+            .merge_delta(delta)
+            .expect("Error merging delta");
+
+        let cmd = r#""[a]\nb = 1\nc = 1" | metadata set --content-type 'text/x-toml' --datasource-ls | from toml | metadata | $in"#;
+        let result = eval_pipeline_without_terminal_expression(
+            cmd,
+            std::env::temp_dir().as_ref(),
+            &mut engine_state,
+        );
+        assert_eq!(
+            Value::test_record(record!("source" => Value::test_string("ls"))),
+            result.expect("There should be a result")
+        )
+    }
 }
diff --git a/crates/nu-command/src/formats/from/tsv.rs b/crates/nu-command/src/formats/from/tsv.rs
index 09bee4803f..2d77342307 100644
--- a/crates/nu-command/src/formats/from/tsv.rs
+++ b/crates/nu-command/src/formats/from/tsv.rs
@@ -165,6 +165,10 @@ fn from_tsv(
 
 #[cfg(test)]
 mod test {
+    use nu_cmd_lang::eval_pipeline_without_terminal_expression;
+
+    use crate::{Metadata, MetadataSet};
+
     use super::*;
 
     #[test]
@@ -173,4 +177,33 @@ mod test {
 
         test_examples(FromTsv {})
     }
+
+    #[test]
+    fn test_content_type_metadata() {
+        let mut engine_state = Box::new(EngineState::new());
+        let delta = {
+            let mut working_set = StateWorkingSet::new(&engine_state);
+
+            working_set.add_decl(Box::new(FromTsv {}));
+            working_set.add_decl(Box::new(Metadata {}));
+            working_set.add_decl(Box::new(MetadataSet {}));
+
+            working_set.render()
+        };
+
+        engine_state
+            .merge_delta(delta)
+            .expect("Error merging delta");
+
+        let cmd = r#""a\tb\n1\t2" | metadata set --content-type 'text/tab-separated-values' --datasource-ls | from tsv | metadata | $in"#;
+        let result = eval_pipeline_without_terminal_expression(
+            cmd,
+            std::env::temp_dir().as_ref(),
+            &mut engine_state,
+        );
+        assert_eq!(
+            Value::test_record(record!("source" => Value::test_string("ls"))),
+            result.expect("There should be a result")
+        )
+    }
 }
diff --git a/crates/nu-command/src/formats/from/xlsx.rs b/crates/nu-command/src/formats/from/xlsx.rs
index 1e02cf432c..bc486d1f18 100644
--- a/crates/nu-command/src/formats/from/xlsx.rs
+++ b/crates/nu-command/src/formats/from/xlsx.rs
@@ -47,7 +47,8 @@ impl Command for FromXlsx {
             vec![]
         };
 
-        from_xlsx(input, head, sel_sheets)
+        let metadata = input.metadata().map(|md| md.with_content_type(None));
+        from_xlsx(input, head, sel_sheets).map(|pd| pd.set_metadata(metadata))
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/formats/from/xml.rs b/crates/nu-command/src/formats/from/xml.rs
index 4c0675a109..70c1048972 100644
--- a/crates/nu-command/src/formats/from/xml.rs
+++ b/crates/nu-command/src/formats/from/xml.rs
@@ -206,7 +206,9 @@ fn from_xml(input: PipelineData, info: &ParsingInfo) -> Result<PipelineData, She
     let (concat_string, span, metadata) = input.collect_string_strict(info.span)?;
 
     match from_xml_string_to_value(&concat_string, info) {
-        Ok(x) => Ok(x.into_pipeline_data_with_metadata(metadata)),
+        Ok(x) => {
+            Ok(x.into_pipeline_data_with_metadata(metadata.map(|md| md.with_content_type(None))))
+        }
         Err(err) => Err(process_xml_parse_error(err, span)),
     }
 }
@@ -322,10 +324,14 @@ fn make_cant_convert_error(help: impl Into<String>, span: Span) -> ShellError {
 
 #[cfg(test)]
 mod tests {
+    use crate::Metadata;
+    use crate::MetadataSet;
+
     use super::*;
 
     use indexmap::indexmap;
     use indexmap::IndexMap;
+    use nu_cmd_lang::eval_pipeline_without_terminal_expression;
 
     fn string(input: impl Into<String>) -> Value {
         Value::test_string(input)
@@ -480,4 +486,36 @@ mod tests {
 
         test_examples(FromXml {})
     }
+
+    #[test]
+    fn test_content_type_metadata() {
+        let mut engine_state = Box::new(EngineState::new());
+        let delta = {
+            let mut working_set = StateWorkingSet::new(&engine_state);
+
+            working_set.add_decl(Box::new(FromXml {}));
+            working_set.add_decl(Box::new(Metadata {}));
+            working_set.add_decl(Box::new(MetadataSet {}));
+
+            working_set.render()
+        };
+
+        engine_state
+            .merge_delta(delta)
+            .expect("Error merging delta");
+
+        let cmd = r#"'<?xml version="1.0" encoding="UTF-8"?>
+<note>
+  <remember>Event</remember>
+</note>' | metadata set --content-type 'application/xml' --datasource-ls | from xml | metadata | $in"#;
+        let result = eval_pipeline_without_terminal_expression(
+            cmd,
+            std::env::temp_dir().as_ref(),
+            &mut engine_state,
+        );
+        assert_eq!(
+            Value::test_record(record!("source" => Value::test_string("ls"))),
+            result.expect("There should be a result")
+        )
+    }
 }
diff --git a/crates/nu-command/src/formats/from/yaml.rs b/crates/nu-command/src/formats/from/yaml.rs
index 5c463cc2a9..649f7e83ac 100644
--- a/crates/nu-command/src/formats/from/yaml.rs
+++ b/crates/nu-command/src/formats/from/yaml.rs
@@ -235,14 +235,19 @@ fn from_yaml(input: PipelineData, head: Span) -> Result<PipelineData, ShellError
     let (concat_string, span, metadata) = input.collect_string_strict(head)?;
 
     match from_yaml_string_to_value(&concat_string, head, span) {
-        Ok(x) => Ok(x.into_pipeline_data_with_metadata(metadata)),
+        Ok(x) => {
+            Ok(x.into_pipeline_data_with_metadata(metadata.map(|md| md.with_content_type(None))))
+        }
         Err(other) => Err(other),
     }
 }
 
 #[cfg(test)]
 mod test {
+    use crate::{Metadata, MetadataSet};
+
     use super::*;
+    use nu_cmd_lang::eval_pipeline_without_terminal_expression;
     use nu_protocol::Config;
 
     #[test]
@@ -395,4 +400,33 @@ mod test {
             assert!(result.ok().unwrap() == test_case.expected.ok().unwrap());
         }
     }
+
+    #[test]
+    fn test_content_type_metadata() {
+        let mut engine_state = Box::new(EngineState::new());
+        let delta = {
+            let mut working_set = StateWorkingSet::new(&engine_state);
+
+            working_set.add_decl(Box::new(FromYaml {}));
+            working_set.add_decl(Box::new(Metadata {}));
+            working_set.add_decl(Box::new(MetadataSet {}));
+
+            working_set.render()
+        };
+
+        engine_state
+            .merge_delta(delta)
+            .expect("Error merging delta");
+
+        let cmd = r#""a: 1\nb: 2" | metadata set --content-type 'application/yaml' --datasource-ls | from yaml | metadata | $in"#;
+        let result = eval_pipeline_without_terminal_expression(
+            cmd,
+            std::env::temp_dir().as_ref(),
+            &mut engine_state,
+        );
+        assert_eq!(
+            Value::test_record(record!("source" => Value::test_string("ls"))),
+            result.expect("There should be a result")
+        )
+    }
 }

From 6367fb6e9eb9af58e794e95f6c73854b00144bf8 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Mon, 16 Dec 2024 19:20:54 -0500
Subject: [PATCH 0805/1072] Add missing color_config settings (#14603)

# Description

Fixes #14600 by adding a default value for missing keys in
`default_config.nu`:

* `$env.config.color_config.glob`
* `$env.config.color_config.closure`

# User-Facing Changes

Will no longer error when accessing these keys.

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

N/A
---
 crates/nu-utils/src/default_files/default_config.nu | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crates/nu-utils/src/default_files/default_config.nu b/crates/nu-utils/src/default_files/default_config.nu
index dcefb70fff..ce60d29663 100644
--- a/crates/nu-utils/src/default_files/default_config.nu
+++ b/crates/nu-utils/src/default_files/default_config.nu
@@ -20,6 +20,8 @@ $env.config.color_config = {
     row_index: green_bold
     record: white
     list: white
+    closure: green_bold
+    glob:cyan_bold
     block: white
     hints: dark_gray
     search_result: { bg: red fg: white }

From d94b344342d055434868dca8860fc0a9d1bbdbfb Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Tue, 17 Dec 2024 06:26:56 -0600
Subject: [PATCH 0806/1072] =?UTF-8?q?Revert=20"For=20`#`=20to=20start=20a?=
 =?UTF-8?q?=20comment,=20then=20it=20either=20need=20to=20be=20the=20first?=
 =?UTF-8?q?=20chara=E2=80=A6"=20(#14606)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reverts nushell/nushell#14562 due to https://github.com/nushell/nushell/issues/14605
---
 crates/nu-parser/src/lex.rs        | 12 ++++-----
 crates/nu-parser/tests/test_lex.rs | 23 -----------------
 tests/repl/test_parser.rs          | 40 ------------------------------
 3 files changed, 6 insertions(+), 69 deletions(-)

diff --git a/crates/nu-parser/src/lex.rs b/crates/nu-parser/src/lex.rs
index 6d1adf28ef..f0802fcd7a 100644
--- a/crates/nu-parser/src/lex.rs
+++ b/crates/nu-parser/src/lex.rs
@@ -51,7 +51,7 @@ impl BlockKind {
 }
 
 // A baseline token is terminated if it's not nested inside of a paired
-// delimiter and the next character is one of: `|`, `;` or any
+// delimiter and the next character is one of: `|`, `;`, `#` or any
 // whitespace.
 fn is_item_terminator(
     block_level: &[BlockKind],
@@ -115,7 +115,6 @@ pub fn lex_item(
     //   character (whitespace, `|`, `;` or `#`) is encountered, the baseline
     //   token is done.
     // - Otherwise, accumulate the character into the current baseline token.
-    let mut previous_char = None;
     while let Some(c) = input.get(*curr_offset) {
         let c = *c;
 
@@ -148,9 +147,11 @@ pub fn lex_item(
                 // Also need to check to make sure we aren't escaped
                 quote_start = None;
             }
-        } else if c == b'#' && !in_comment {
-            // To start a comment, It either need to be the first character of the token or prefixed with space.
-            in_comment = previous_char.map(|pc| pc == b' ').unwrap_or(true);
+        } else if c == b'#' {
+            if is_item_terminator(&block_level, c, additional_whitespace, special_tokens) {
+                break;
+            }
+            in_comment = true;
         } else if c == b'\n' || c == b'\r' {
             in_comment = false;
             if is_item_terminator(&block_level, c, additional_whitespace, special_tokens) {
@@ -253,7 +254,6 @@ pub fn lex_item(
         }
 
         *curr_offset += 1;
-        previous_char = Some(c);
     }
 
     let span = Span::new(span_offset + token_start, span_offset + *curr_offset);
diff --git a/crates/nu-parser/tests/test_lex.rs b/crates/nu-parser/tests/test_lex.rs
index 54ff674bb9..a14843f3f0 100644
--- a/crates/nu-parser/tests/test_lex.rs
+++ b/crates/nu-parser/tests/test_lex.rs
@@ -159,29 +159,6 @@ fn lex_comment() {
     );
 }
 
-#[test]
-fn lex_not_comment_needs_space_in_front_of_hashtag() {
-    let file = b"1..10 | each {echo test#testing }";
-
-    let output = lex(file, 0, &[], &[], false);
-
-    assert!(output.1.is_none());
-}
-
-#[test]
-fn lex_comment_with_space_in_front_of_hashtag() {
-    let file = b"1..10 | each {echo test #testing }";
-
-    let output = lex(file, 0, &[], &[], false);
-
-    assert!(output.1.is_some());
-    assert!(matches!(
-        output.1.unwrap(),
-        ParseError::UnexpectedEof(missing_token, span) if missing_token == "}"
-            && span == Span::new(33, 34)
-    ));
-}
-
 #[test]
 fn lex_is_incomplete() {
     let file = b"let x = 300 | ;";
diff --git a/tests/repl/test_parser.rs b/tests/repl/test_parser.rs
index ddc790324a..f77d431110 100644
--- a/tests/repl/test_parser.rs
+++ b/tests/repl/test_parser.rs
@@ -169,41 +169,6 @@ fn comment_skipping_in_pipeline_3() -> TestResult {
     )
 }
 
-#[test]
-fn still_string_if_hashtag_is_middle_of_string() -> TestResult {
-    run_test(r#"echo test#testing"#, "test#testing")
-}
-
-#[test]
-fn non_comment_hashtag_in_comment_does_not_stop_comment() -> TestResult {
-    run_test(r#"# command_bar_text: { fg: '#C4C9C6' },"#, "")
-}
-
-#[test]
-fn non_comment_hashtag_in_comment_does_not_stop_comment_in_block() -> TestResult {
-    run_test(
-        r#"{
-        explore: {
-            # command_bar_text: { fg: '#C4C9C6' },
-        }
-    } | get explore | is-empty"#,
-        "true",
-    )
-}
-
-#[test]
-fn still_string_if_hashtag_is_middle_of_string_inside_each() -> TestResult {
-    run_test(
-        r#"1..1 | each {echo test#testing } | get 0"#,
-        "test#testing",
-    )
-}
-
-#[test]
-fn still_string_if_hashtag_is_middle_of_string_inside_each_also_with_dot() -> TestResult {
-    run_test(r#"1..1 | each {echo '.#testing' } | get 0"#, ".#testing")
-}
-
 #[test]
 fn bad_var_name() -> TestResult {
     fail_test(r#"let $"foo bar" = 4"#, "can't contain")
@@ -317,11 +282,6 @@ fn raw_string_with_equals() -> TestResult {
     )
 }
 
-#[test]
-fn raw_string_with_hashtag() -> TestResult {
-    run_test(r#"r##' one # two '##"#, "one # two")
-}
-
 #[test]
 fn list_quotes_with_equals() -> TestResult {
     run_test(

From c266e6adaf63bbd72f16a8ba6df80e6cb0d6e3d1 Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Tue, 17 Dec 2024 19:01:23 +0300
Subject: [PATCH 0807/1072] test(path self): Add tests (#14607)

# Description
Add tests for `path self`.

I wasn't very familiar with the code base, especially the testing
utilities, when I first implemented `path self`. It's been on my mind to
add tests for it since then.
---
 crates/nu-command/tests/commands/path/mod.rs  |  1 +
 .../nu-command/tests/commands/path/self_.rs   | 64 +++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 crates/nu-command/tests/commands/path/self_.rs

diff --git a/crates/nu-command/tests/commands/path/mod.rs b/crates/nu-command/tests/commands/path/mod.rs
index d14cbde181..ada11426e8 100644
--- a/crates/nu-command/tests/commands/path/mod.rs
+++ b/crates/nu-command/tests/commands/path/mod.rs
@@ -4,6 +4,7 @@ mod exists;
 mod expand;
 mod join;
 mod parse;
+mod self_;
 mod split;
 mod type_;
 
diff --git a/crates/nu-command/tests/commands/path/self_.rs b/crates/nu-command/tests/commands/path/self_.rs
new file mode 100644
index 0000000000..b0c47195c8
--- /dev/null
+++ b/crates/nu-command/tests/commands/path/self_.rs
@@ -0,0 +1,64 @@
+use std::path::Path;
+
+use itertools::Itertools;
+use nu_test_support::{fs::Stub, nu, playground::Playground};
+
+#[test]
+fn self_path_const() {
+    Playground::setup("path_self_const", |dirs, sandbox| {
+        sandbox
+            .within("scripts")
+            .with_files(&[Stub::FileWithContentToBeTrimmed(
+                "foo.nu",
+                r#"
+                    export const paths = {
+                        self: (path self),
+                        dir: (path self .),
+                        sibling: (path self sibling),
+                        parent_dir: (path self ..),
+                        cousin: (path self ../cousin),
+                    }
+                "#,
+            )]);
+
+        let actual = nu!(cwd: dirs.test(), r#"use scripts/foo.nu; $foo.paths | values | str join (char nul)"#);
+        let (self_, dir, sibling, parent_dir, cousin) = actual
+            .out
+            .split("\0")
+            .collect_tuple()
+            .expect("should have 5 NUL separated paths");
+
+        let mut pathbuf = dirs.test().to_path_buf();
+
+        pathbuf.push("scripts");
+        assert_eq!(pathbuf, Path::new(dir));
+
+        pathbuf.push("foo.nu");
+        assert_eq!(pathbuf, Path::new(self_));
+
+        pathbuf.pop();
+        pathbuf.push("sibling");
+        assert_eq!(pathbuf, Path::new(sibling));
+
+        pathbuf.pop();
+        pathbuf.pop();
+        assert_eq!(pathbuf, Path::new(parent_dir));
+
+        pathbuf.push("cousin");
+        assert_eq!(pathbuf, Path::new(cousin));
+    })
+}
+
+#[test]
+fn self_path_runtime() {
+    let actual = nu!("path self");
+    assert!(!actual.status.success());
+    assert!(actual.err.contains("can only run during parse-time"));
+}
+
+#[test]
+fn self_path_repl() {
+    let actual = nu!("const foo = path self; $foo");
+    assert!(!actual.status.success());
+    assert!(actual.err.contains("nu::shell::file_not_found"));
+}

From cc4da104e0e3994c79d0946b08b4e901b9697ba5 Mon Sep 17 00:00:00 2001
From: Perchun Pak <github@perchun.it>
Date: Tue, 17 Dec 2024 17:43:25 +0100
Subject: [PATCH 0808/1072] Fix issues in the example configs (#14601)

For some reason, it had multiple syntax errors and other issues, like
undefined options. Would be great to add a test for sourcing all example
configs, but I don't know rust

See also
https://github.com/nushell/nushell/pull/14249#discussion_r1887192408

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

CC @NotTheDr01ds
---
 .../nu-utils/src/default_files/default_env.nu |   4 +-
 .../src/default_files/sample_config.nu        | 109 +++++++++---------
 .../nu-utils/src/default_files/sample_env.nu  |   4 +-
 .../src/default_files/sample_login.nu         |   3 +
 .../src/default_files/scaffold_config.nu      |   5 +-
 .../src/default_files/scaffold_env.nu         |   3 +
 6 files changed, 72 insertions(+), 56 deletions(-)

diff --git a/crates/nu-utils/src/default_files/default_env.nu b/crates/nu-utils/src/default_files/default_env.nu
index ae2f1ae719..39dcd5c9d0 100644
--- a/crates/nu-utils/src/default_files/default_env.nu
+++ b/crates/nu-utils/src/default_files/default_env.nu
@@ -3,7 +3,7 @@
 #
 # version = "0.100.1"
 
-$env.PROMPT_COMMAND = $env.PROMPT_COMMAND? | default {|| 
+$env.PROMPT_COMMAND = $env.PROMPT_COMMAND? | default {||
     let dir = match (do -i { $env.PWD | path relative-to $nu.home-path }) {
         null => $env.PWD
         '' => '~'
@@ -17,7 +17,7 @@ $env.PROMPT_COMMAND = $env.PROMPT_COMMAND? | default {||
     $path_segment | str replace --all (char path_sep) $"($separator_color)(char path_sep)($path_color)"
 }
 
-$env.PROMPT_COMMAND_RIGHT = $env.PROMPT_COMMAND_RIGHT? | default {|| 
+$env.PROMPT_COMMAND_RIGHT = $env.PROMPT_COMMAND_RIGHT? | default {||
     # create a right prompt in magenta with green separators and am/pm underlined
     let time_segment = ([
         (ansi reset)
diff --git a/crates/nu-utils/src/default_files/sample_config.nu b/crates/nu-utils/src/default_files/sample_config.nu
index ceb65835cd..1a91b59f5e 100644
--- a/crates/nu-utils/src/default_files/sample_config.nu
+++ b/crates/nu-utils/src/default_files/sample_config.nu
@@ -1,6 +1,9 @@
-# Nushell Config File
+# Nushell Sample Config File
 #
-# version = "0.99.2"
+# Warning: This file is intended for documentation purposes only and
+# is not intended to be used as an actual configuration file as-is.
+#
+# version = "0.100.1"
 #
 # A `config.nu` file is used to override default Nushell settings,
 # define (or import) custom commands, or run any other startup tasks.
@@ -86,14 +89,14 @@ $env.config.recursion_limit = 50
 # ---------------------------
 
 # edit_mode (string) "vi" or "emacs" sets the editing behavior of Reedline
-edit_mode: "emacs"
+$env.config.edit_mode = "emacs"
 
 # Command that will be used to edit the current line buffer with Ctrl+O.
 # If unset, uses $env.VISUAL and then $env.EDITOR
 #
 # Tip: Set to "editor" to use the default editor on Unix platforms using
 #      the Alternatives system or equivalent
-buffer_editor: "editor"
+$env.config.buffer_editor = "editor"
 
 # cursor_shape_* (string)
 # -----------------------
@@ -120,7 +123,7 @@ $env.config.completions.algorithm = "prefix"
 $env.config.completions.sort = "smart"
 
 # case_sensitive (bool): true/false to enable/disable case-sensitive completions
-$env.config.completions.case_sensitive = false 
+$env.config.completions.case_sensitive = false
 
 # quick (bool):
 # true: auto-select the completion when only one remains
@@ -132,7 +135,7 @@ $env.config.completions.quick = true
 # false: Do not partially complete
 # Partial Example: If a directory contains only files named "forage", "food", and "forest",
 #                  then typing "ls " and pressing <Tab> will partially complete the first two
-#                  letters, "f" and "o". If the directory also includes a file named "faster", 
+#                  letters, "f" and "o". If the directory also includes a file named "faster",
 #                  then only "f" would be partially completed.
 $env.config.completions.partial = true
 
@@ -145,7 +148,7 @@ $env.config.completions.use_ls_colors = true
 # completions.external.*: Settings related to completing external commands
 # and additional completers
 
-# external.exnable (bool)
+# external.enable (bool)
 # true: search for external commands on the Path
 # false: disabling might be desired for performance if your path includes
 #        directories on a slower filesystem
@@ -156,16 +159,16 @@ $env.config.completions.external.enable = true
 $env.config.completions.external.max_results = 50
 
 # completer (closure with a |spans| parameter): A command to call for *argument* completions
-# to commands (internal or external). 
+# to commands (internal or external).
 #
 # The |spans| parameter is a list of strings representing the tokens (spans)
-# on the current commandline. It is always a list of at least two strings - The 
+# on the current commandline. It is always a list of at least two strings - The
 # command being completed plus the first argument of that command ("" if no argument has
 # been partially typed yet), and additional strings for additional arguments beyond
 # the first.
 #
 # This setting is usually set to a closure which will call a third-party completion system, such
-# as Carapace. 
+# as Carapace.
 #
 # Note: The following is an over-simplified completer command that will call Carapace if it
 # is installed. Please use the official Carapace completer, which can be generated automatically
@@ -206,8 +209,8 @@ $env.config.shell_integration.osc9_9 = false
 # osc8 (bool):
 # When true, the `ls` command will generate clickable links that can be launched in another
 # application by the terminal.
-# Note: This setting replaces the now deprecated `ls.show_clickable_links`
-$env.config.shell.integration.osc8: true
+# Note: This setting replaces the now deprecated `ls.clickable_links`
+$env.config.shell_integration.osc8 = true
 
 # Deprecated
 # $env.config.ls.clickable_links = true
@@ -229,13 +232,13 @@ $env.config.shell_integration.osc633 = true
 
 # reset_application_mode (bool):
 # true/false to enable/disable sending ESC[?1l to the terminal
-# This sequence is commonly used to keep cursor key modes in sync between the local 
+# This sequence is commonly used to keep cursor key modes in sync between the local
 # terminal and a remove SSH host.
 $env.config.shell_integration.reset_application_mode = true
 
 # bracketed_paste (bool):
 # true/false to enable/disable the bracketed-paste feature, which allows multiple-lines
-# to be pasted into Nushell at once without immediate execution. When disabled, 
+# to be pasted into Nushell at once without immediate execution. When disabled,
 # each pasted line is executed as it is received.
 # Note that bracketed paste is not currently supported on the Windows version of
 # Nushell.
@@ -266,7 +269,7 @@ $env.config.display_errors.exit_code = false
 
 # display_errors.termination_signal (bool):
 # true/false to enable/disable displaying a Nushell error when a child process is
-# terminated via any signal 
+# terminated via any signal
 $env.config.display_errors.termination_signal = true
 
 # -------------
@@ -282,7 +285,7 @@ $env.config.display_errors.termination_signal = true
 $env.config.footer_mode = 25
 
 # table.*
-# table_mode (string): 
+# table_mode (string):
 # One of: "default", "basic", "compact", "compact_double", "heavy", "light", "none", "reinforced",
 # "rounded", "thin", "with_love", "psql", "markdown", "dots", "restructured", "ascii_rounded",
 # or "basic_compact"
@@ -344,7 +347,7 @@ $env.config.table.footer_inheritance = false
 # Datetime Display
 # ----------------
 # datetime_format.* (string or nothing):
-# Format strings that will be used for datetime values. 
+# Format strings that will be used for datetime values.
 # When set to `null`, the default behavior is to "humanize" the value (e.g., "now" or "a day ago")
 
 # datetime_format.table (string or nothing):
@@ -389,7 +392,7 @@ $env.config.float_precision = 2
 # ls.use_ls_colors (bool):
 # true: The `ls` command will apply the $env.LS_COLORS standard to filenames
 # false: Filenames in the `ls` table will use the color_config for strings
-$env.config.ls = true
+$env.config.ls.use_ls_colors = true
 
 # Hooks
 # -----
@@ -402,12 +405,19 @@ $env.config.ls = true
 # WARNING: A malformed display_output hook can suppress all Nushell output to the terminal.
 #          It can be reset by assigning an empty string as below:
 
-$env.config.hooks.pre_prompt = []          # Before each prompt is displayed
-$env.config.hooks.pre_execution = []       # After <enter> is pressed; before the commandline
-                                           # is executed
-$env.config.hooks.env_change = []          # When a specified environment variable changes
-$env.config.hooks.display_output = ""      # Before Nushell output is displayed in the terminal
-$env.config.hooks.command_not_found = []   # When a command is not found
+# Before each prompt is displayed
+$env.config.hooks.pre_prompt = []
+# After <enter> is pressed; before the commandline is executed
+$env.config.hooks.pre_execution = []
+# When a specified environment variable changes
+$env.config.hooks.env_change = {
+    # run if the PWD environment is different since the last repl input
+    PWD: [{|before, after| null }]
+}
+# Before Nushell output is displayed in the terminal
+$env.config.hooks.display_output = "if (term size).columns >= 100 { table -e } else { table }"
+# When a command is not found
+$env.config.hooks.command_not_found = []
 
 # -----------
 # Keybindings
@@ -462,7 +472,7 @@ $env.config.menus ++= [
         type: {
             layout: description
             columns: 4
-            col_width: 20     # Optional value. If missing all the screen width is used to calculate column width
+            col_width: 20 # Optional value. If missing all the screen width is used to calculate column width
             col_padding: 2
             selection_rows: 4
             description_rows: 10
@@ -480,27 +490,22 @@ $env.config.menus ++= [
 # Plugin behavior
 # ---------------
 # Per-plugin configuration. See https://www.nushell.sh/contributor-book/plugins.html#configuration.
-plugins: {}
 $env.config.plugins
+
+# Configuration for plugin garbage collection
 $env.config.plugin_gc
 $env.config.plugin_gc.default
+# true to enable stopping of inactive plugins
 $env.config.plugin_gc.default.enabled
+# How long to wait after a plugin is inactive before stopping it
 $env.config.plugin_gc.default.stop_after
-$env.config.plugin_gc.plugins
-    plugin_gc: {
-        # Configuration for plugin garbage collection
-        default: {
-            enabled: true # true to enable stopping of inactive plugins
-            stop_after: 10sec # how long to wait after a plugin is inactive to stop it
-        }
-        plugins: {
-            # alternate configuration for specific plugins, by name, for example:
-            #
-            # gstat: {
-            #     enabled: false
-            # }
-        }
-    }
+$env.config.plugin_gc.plugins = {
+  # Alternate configuration for specific plugins, by name, for example:
+  #
+  # gstat: {
+  #     enabled: false
+  # }
+}
 
 
 # -------------------------------------
@@ -532,12 +537,12 @@ use std/config dark-theme
 $env.config.color_config = (dark-theme)
 
 # Or, individual color settings can be configured or overridden.
-# 
+#
 # Values can be one of:
 # - A color name such as "red" (see `ansi -l` for a list)
 # - A color RGB value in the form of "#C4C9C6"
 # - A record including:
-#   * `fg` (color) 
+#   * `fg` (color)
 #   * `bg` (color)
 #   * `attr`: a string with one or more of:
 #     - 'n': normal
@@ -547,7 +552,7 @@ $env.config.color_config = (dark-theme)
 #     - 'i': italics
 #     - 'd': dimmed
 
-# foreground, background, and cursor colors are not handled by Nushell, but can be used by 
+# foreground, background, and cursor colors are not handled by Nushell, but can be used by
 # custom-commands such as `theme` from the nu_scripts repository. That `theme` command can be
 # used to set the terminal foreground, background, and cursor colors.
 $env.config.color_config.foreground
@@ -557,7 +562,7 @@ $env.config.color_config.cursor
 # -------------------------------------------------------------------------------------------------
 # shape_: Applies syntax highlighting based on the "shape" (inferred or declared type) of an
 # element on the commandline. Nushell's parser can identify shapes based on many criteria, often
-# as the commandline is being typed. 
+# as the commandline is being typed.
 
 # shape_string: Can appear as a single-or-quoted value, a bareword string, the key of a record,
 # an argument which has been declared as a string, and other parsed strings.
@@ -733,7 +738,7 @@ $env.config.color_config.custom      # Custom value (often from a plugin)
 $env.config.color_config.nothing     # Not used, since a null is not displayed
 $env.config.color_config.date        # datetime value
 $env.config.color_config.filesize    # filesize value
-$env.config.color_config.list        # Not currently used. Lists are displayed using their 
+$env.config.color_config.list        # Not currently used. Lists are displayed using their
                                      # members' styles
 $env.config.color_config.record      # Not currently used. Records are displayed using their
                                      # member's styles
@@ -828,7 +833,7 @@ $env.PROMPT_INDICATOR_VI_INSERT = ": "
 # When a commandline extends across multiple lines:
 $env.PROMPT_MULTILINE_INDICATOR = "::: "
 
-# TRANSIENT_PROMPT_* 
+# TRANSIENT_PROMPT_*
 # ------------------
 # Allows a different prompt to be shown after a command has been executed.  This
 # can be useful if you have a 2-line prompt. Instead of each previously-entered
@@ -855,10 +860,10 @@ $env.TRANSIENT_PROMPT_COMMAND_RIGHT = ""
 #
 # Note: The OS Path variable is automatically converted before env.nu loads, so it can
 # be treated a list in this file.
-# 
+#
 # Note: Environment variables are not case-sensitive, so the following will work
 # for both Windows and Unix-like platforms.
-# 
+#
 # By default, the internal conversion looks something like the following, so there
 # is no need to add this in your actual env.nu:
 $env.ENV_CONVERSIONS = {
@@ -912,12 +917,12 @@ const NU_PLUGIN_DIRS = $NU_PLUGIN_DIRS ++ [($nu.default-config-dir | path join '
 
 # Appending to the OS path is a common configuration task.
 # Because of the previous ENV_CONVERSIONS (performed internally
-# before your config.nu loads), the path variable is a list that can 
+# before your config.nu loads), the path variable is a list that can
 # be appended to using, for example:
-$env.path ++= "~/.local/bin"
+$env.PATH ++= [ "~/.local/bin" ]
 
 # Or prepend using
-$env.path = "~/.local/bin" ++ $env.path
+$env.PATH = [ "~/.local/bin" ] ++ $env.PATH
 
 # The `path add` function from the Standard Library also provides
 # a convenience method for prepending to the path:
diff --git a/crates/nu-utils/src/default_files/sample_env.nu b/crates/nu-utils/src/default_files/sample_env.nu
index c081c87609..a69363cdf7 100644
--- a/crates/nu-utils/src/default_files/sample_env.nu
+++ b/crates/nu-utils/src/default_files/sample_env.nu
@@ -1,9 +1,11 @@
 # Sample Nushell Environment Config File
 #
+# version = "0.100.1"
+#
 # Previously, environment variables were typically configured in `env.nu`.
 # In general, most configuration can and should be performed in `config.nu`
 # or one of the autoload directories.
 
 # To pretty-print the in-shell documentation for Nushell's various configuration
 # settings, you can run:
-config nu --sample | nu-highlight | less -R
\ No newline at end of file
+config nu --sample | nu-highlight | less -R
diff --git a/crates/nu-utils/src/default_files/sample_login.nu b/crates/nu-utils/src/default_files/sample_login.nu
index 8e0a651499..511e3b803c 100644
--- a/crates/nu-utils/src/default_files/sample_login.nu
+++ b/crates/nu-utils/src/default_files/sample_login.nu
@@ -1,4 +1,7 @@
 # Example Nushell Loginshell Config File
+#
+# version = "0.100.1"
+#
 # - has to be as login.nu in the default config directory
 # - will be sourced after config.nu and env.nu in case of nushell started as login shell
 
diff --git a/crates/nu-utils/src/default_files/scaffold_config.nu b/crates/nu-utils/src/default_files/scaffold_config.nu
index 7bf7ecc632..fa6d834c73 100644
--- a/crates/nu-utils/src/default_files/scaffold_config.nu
+++ b/crates/nu-utils/src/default_files/scaffold_config.nu
@@ -1,11 +1,14 @@
 # config.nu
 #
+# Installed by:
+# version = "0.100.1"
+#
 # This file is used to override default Nushell settings, define
 # (or import) custom commands, or run any other startup tasks.
 # See https://www.nushell.sh/book/configuration.html
 #
 # This file is loaded after env.nu and before login.nu
-# 
+#
 # You can open this file in your default editor using:
 # config nu
 #
diff --git a/crates/nu-utils/src/default_files/scaffold_env.nu b/crates/nu-utils/src/default_files/scaffold_env.nu
index 7071b9fb3d..d7a2e00627 100644
--- a/crates/nu-utils/src/default_files/scaffold_env.nu
+++ b/crates/nu-utils/src/default_files/scaffold_env.nu
@@ -1,5 +1,8 @@
 # env.nu
 #
+# Installed by:
+# version = "0.100.1"
+#
 # Previously, environment variables were typically configured in `env.nu`.
 # In general, most configuration can and should be performed in `config.nu`
 # or one of the autoload directories.

From 981a000ee81b71692ac5d24ad7095a6460dabd94 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Tue, 17 Dec 2024 09:55:42 -0800
Subject: [PATCH 0809/1072] Added flag --coalesce-columns to allow columns to
 be coalsced on full joins (#14578)

- fixes #14572

# Description
This allowed columns to be coalesced on full joins with `polars join`,
providing functionality simlar to the old `--outer` join behavior.

# User-Facing Changes
- Provides a new flag `--coalesce-columns` on the `polars join` command
---
 .../src/dataframe/command/data/join.rs        | 33 ++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/join.rs b/crates/nu_plugin_polars/src/dataframe/command/data/join.rs
index b1c13fef00..bd140b5c2a 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/join.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/join.rs
@@ -8,7 +8,10 @@ use nu_protocol::{
     Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
     Value,
 };
-use polars::prelude::{Expr, JoinType};
+use polars::{
+    df,
+    prelude::{Expr, JoinCoalesce, JoinType},
+};
 
 #[derive(Clone)]
 pub struct LazyJoin;
@@ -37,6 +40,7 @@ impl PluginCommand for LazyJoin {
             .switch("left", "left join between lazyframes", Some('l'))
             .switch("full", "full join between lazyframes", Some('f'))
             .switch("cross", "cross join between lazyframes", Some('c'))
+            .switch("coalesce-columns", "Sets the join coalesce strategy to colesce columns. Most useful when used with --full, which will not otherwise coalesce.", None)
             .named(
                 "suffix",
                 SyntaxShape::String,
@@ -172,6 +176,24 @@ impl PluginCommand for LazyJoin {
                     .into_value(Span::test_data()),
                 ),
             },
+            Example {
+                description: "Perform a full join of two dataframes and coalesce columns",
+                example: r#"let table1 = [[A B]; ["common" "common"] ["table1" "only"]] | polars into-df
+                let table2 = [[A C]; ["common" "common"] ["table2" "only"]] | polars into-df
+                $table1 | polars join -f $table2 --coalesce-columns A A"#,
+                result: Some(
+                    NuDataFrame::new(
+                        false,
+                        df!(
+                            "A" => [Some("common"), Some("table2"), Some("table1")],
+                            "B" => [Some("common"), None, Some("only")],
+                            "C" => [Some("common"), Some("only"), None]
+                        )
+                        .expect("Should have created a DataFrame"),
+                    )
+                    .into_value(Span::test_data()),
+                ),
+            },
             Example {
                 description: "Join one eager dataframe with another using a cross join",
                 example: r#"let tokens = [[monopoly_token]; [hat] [shoe] [boat]] | polars into-df
@@ -279,9 +301,17 @@ impl PluginCommand for LazyJoin {
         let lazy = NuLazyFrame::try_from_value_coerce(plugin, &value)?;
         let from_eager = lazy.from_eager;
         let lazy = lazy.to_polars();
+
+        let coalesce = if call.has_flag("coalesce-columns")? {
+            JoinCoalesce::CoalesceColumns
+        } else {
+            JoinCoalesce::default()
+        };
+
         let lazy = if cross {
             lazy.join_builder()
                 .with(other)
+                .coalesce(coalesce)
                 .left_on(vec![])
                 .right_on(vec![])
                 .how(how)
@@ -291,6 +321,7 @@ impl PluginCommand for LazyJoin {
         } else {
             lazy.join_builder()
                 .with(other)
+                .coalesce(coalesce)
                 .left_on(left_on)
                 .right_on(right_on)
                 .how(how)

From f41c53fef117512601f5f4b91109f03aaef05cf0 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Tue, 17 Dec 2024 13:15:16 -0600
Subject: [PATCH 0810/1072] allow `view source` to take `int` as a parameter
 (#14609)

# Description

This PR allows the `view source` command to view source based on an int
value. I wrote this specifically to be able to see closures where the
text is hidden. For example:

![image](https://github.com/user-attachments/assets/d8fe2692-0951-4366-9cb9-55f20044b68a)

And then you can use those `<Closure #>` with the `view source` command
like this.

![image](https://github.com/user-attachments/assets/f428c8ad-56a9-4e72-880e-e32fb9155531)


# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/debug/view_source.rs | 24 ++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/crates/nu-command/src/debug/view_source.rs b/crates/nu-command/src/debug/view_source.rs
index 417da5ec1e..2aadd4d361 100644
--- a/crates/nu-command/src/debug/view_source.rs
+++ b/crates/nu-command/src/debug/view_source.rs
@@ -33,6 +33,22 @@ impl Command for ViewSource {
         let arg_span = arg.span();
 
         let source = match arg {
+            Value::Int { val, .. } => {
+                let block = engine_state.get_block(nu_protocol::BlockId::new(val as usize));
+                if let Some(span) = block.span {
+                    let contents = engine_state.get_span_contents(span);
+                    Ok(Value::string(String::from_utf8_lossy(contents), call.head)
+                        .into_pipeline_data())
+                } else {
+                    Err(ShellError::GenericError {
+                        error: "Cannot view int value".to_string(),
+                        msg: "the block does not have a viewable span".to_string(),
+                        span: Some(arg_span),
+                        help: None,
+                        inner: vec![],
+                    })
+                }
+            }
             Value::String { val, .. } => {
                 if let Some(decl_id) = engine_state.find_decl(val.as_bytes(), &[]) {
                     // arg is a command
@@ -130,7 +146,7 @@ impl Command for ViewSource {
                             Ok(Value::string(final_contents, call.head).into_pipeline_data())
                         } else {
                             Err(ShellError::GenericError {
-                                error: "Cannot view value".to_string(),
+                                error: "Cannot view string value".to_string(),
                                 msg: "the command does not have a viewable block span".to_string(),
                                 span: Some(arg_span),
                                 help: None,
@@ -139,7 +155,7 @@ impl Command for ViewSource {
                         }
                     } else {
                         Err(ShellError::GenericError {
-                            error: "Cannot view value".to_string(),
+                            error: "Cannot view string decl value".to_string(),
                             msg: "the command does not have a viewable block".to_string(),
                             span: Some(arg_span),
                             help: None,
@@ -155,7 +171,7 @@ impl Command for ViewSource {
                             .into_pipeline_data())
                     } else {
                         Err(ShellError::GenericError {
-                            error: "Cannot view value".to_string(),
+                            error: "Cannot view string module value".to_string(),
                             msg: "the module does not have a viewable block".to_string(),
                             span: Some(arg_span),
                             help: None,
@@ -164,7 +180,7 @@ impl Command for ViewSource {
                     }
                 } else {
                     Err(ShellError::GenericError {
-                        error: "Cannot view value".to_string(),
+                        error: "Cannot view string value".to_string(),
                         msg: "this name does not correspond to a viewable value".to_string(),
                         span: Some(arg_span),
                         help: None,

From c0ad659985d7d45c1fe0589ed84461ba38515de9 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Tue, 17 Dec 2024 15:18:23 -0500
Subject: [PATCH 0811/1072] Doc file fixes (#14608)

# Description

With great thanks to @fdncred and especially @PerchunPak (see #14601)
for finding and fixing a number of issues that I pulled in here due to
the filename changes and upcoming freeze.

This PR primarily fixes a poor wording choice in the new filenames and
`config` command options. The fact that these were called
`sample_config.nu` (etc.) and accessed via `config --sample` created a
great deal of confusion. These were never intended to be used as-is as
config files, but rather as in-shell documentation.

As such, I've renamed them:

* `sample_config.nu` becomes `doc_config.nu`
* `sample_env.nu` becomes `doc_env.nu`
* `config nu --sample` becomes `config nu --doc`
* `config env --sample` because `config env --doc`

Also the following:

* Updates `doc_config.nu` with a few additional comment-fixes on top of
@PerchunPak's changes.
* Adds version numbers to all files - Will need to update the version
script to add some files after this PR.
* Additional doc on plugin and plugin_gc configuration which I had
failed to previously completely update from the older wording
* Updated the comments in the `scaffold_*.nu` files to point people to
`help config`/`help nu` so that, if things change in the future, it will
become more difficult for the comments to be outdated.
*

# User-Facing Changes

Mostly doc.

`config nu` and `config env` changes update new behavior previously
added in 0.100.1

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

* Update configuration chapter of doc
* Update the blog entry on migrating config
* Update `bump-version.nu`
---
 .../nu-command/src/env/config/config_env.rs   | 22 +++++-----
 crates/nu-command/src/env/config/config_nu.rs | 22 +++++-----
 crates/nu-utils/src/default_files/README.md   | 18 ++++----
 .../{sample_config.nu => doc_config.nu}       | 41 ++++++++++---------
 .../{sample_env.nu => doc_env.nu}             |  6 ++-
 .../src/default_files/scaffold_config.nu      |  6 +--
 .../src/default_files/scaffold_env.nu         |  6 +--
 crates/nu-utils/src/lib.rs                    |  4 +-
 crates/nu-utils/src/utils.rs                  |  8 ++--
 9 files changed, 65 insertions(+), 68 deletions(-)
 rename crates/nu-utils/src/default_files/{sample_config.nu => doc_config.nu} (97%)
 rename crates/nu-utils/src/default_files/{sample_env.nu => doc_env.nu} (74%)

diff --git a/crates/nu-command/src/env/config/config_env.rs b/crates/nu-command/src/env/config/config_env.rs
index 5fdc39a903..f078b365d2 100644
--- a/crates/nu-command/src/env/config/config_env.rs
+++ b/crates/nu-command/src/env/config/config_env.rs
@@ -18,8 +18,8 @@ impl Command for ConfigEnv {
                 Some('d'),
             )
             .switch(
-                "sample",
-                "Print a commented, sample `env.nu` file instead.",
+                "doc",
+                "Print a commented `env.nu` with documentation instead.",
                 Some('s'),
             )
         // TODO: Signature narrower than what run actually supports theoretically
@@ -37,8 +37,8 @@ impl Command for ConfigEnv {
                 result: None,
             },
             Example {
-                description: "pretty-print a commented, sample `env.nu` that explains common settings",
-                example: "config env --sample | nu-highlight,",
+                description: "pretty-print a commented `env.nu` that explains common settings",
+                example: "config env --doc | nu-highlight,",
                 result: None,
             },
             Example {
@@ -57,13 +57,13 @@ impl Command for ConfigEnv {
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let default_flag = call.has_flag(engine_state, stack, "default")?;
-        let sample_flag = call.has_flag(engine_state, stack, "sample")?;
-        if default_flag && sample_flag {
+        let doc_flag = call.has_flag(engine_state, stack, "doc")?;
+        if default_flag && doc_flag {
             return Err(ShellError::IncompatibleParameters {
                 left_message: "can't use `--default` at the same time".into(),
                 left_span: call.get_flag_span(stack, "default").expect("has flag"),
-                right_message: "because of `--sample`".into(),
-                right_span: call.get_flag_span(stack, "sample").expect("has flag"),
+                right_message: "because of `--doc`".into(),
+                right_span: call.get_flag_span(stack, "doc").expect("has flag"),
             });
         }
         // `--default` flag handling
@@ -72,10 +72,10 @@ impl Command for ConfigEnv {
             return Ok(Value::string(nu_utils::get_default_env(), head).into_pipeline_data());
         }
 
-        // `--sample` flag handling
-        if sample_flag {
+        // `--doc` flag handling
+        if doc_flag {
             let head = call.head;
-            return Ok(Value::string(nu_utils::get_sample_env(), head).into_pipeline_data());
+            return Ok(Value::string(nu_utils::get_doc_env(), head).into_pipeline_data());
         }
 
         super::config_::start_editor("env-path", engine_state, stack, call)
diff --git a/crates/nu-command/src/env/config/config_nu.rs b/crates/nu-command/src/env/config/config_nu.rs
index 75d971f36e..66e24e2a94 100644
--- a/crates/nu-command/src/env/config/config_nu.rs
+++ b/crates/nu-command/src/env/config/config_nu.rs
@@ -18,8 +18,8 @@ impl Command for ConfigNu {
                 Some('d'),
             )
             .switch(
-                "sample",
-                "Print a commented, sample `config.nu` file instead.",
+                "doc",
+                "Print a commented `config.nu` with documentation instead.",
                 Some('s'),
             )
         // TODO: Signature narrower than what run actually supports theoretically
@@ -37,8 +37,8 @@ impl Command for ConfigNu {
                 result: None,
             },
             Example {
-                description: "pretty-print a commented, sample `config.nu` that explains common settings",
-                example: "config nu --sample | nu-highlight",
+                description: "pretty-print a commented `config.nu` that explains common settings",
+                example: "config nu --doc | nu-highlight",
                 result: None,
             },
             Example {
@@ -58,13 +58,13 @@ impl Command for ConfigNu {
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let default_flag = call.has_flag(engine_state, stack, "default")?;
-        let sample_flag = call.has_flag(engine_state, stack, "sample")?;
-        if default_flag && sample_flag {
+        let doc_flag = call.has_flag(engine_state, stack, "doc")?;
+        if default_flag && doc_flag {
             return Err(ShellError::IncompatibleParameters {
                 left_message: "can't use `--default` at the same time".into(),
                 left_span: call.get_flag_span(stack, "default").expect("has flag"),
-                right_message: "because of `--sample`".into(),
-                right_span: call.get_flag_span(stack, "sample").expect("has flag"),
+                right_message: "because of `--doc`".into(),
+                right_span: call.get_flag_span(stack, "doc").expect("has flag"),
             });
         }
 
@@ -74,10 +74,10 @@ impl Command for ConfigNu {
             return Ok(Value::string(nu_utils::get_default_config(), head).into_pipeline_data());
         }
 
-        // `--sample` flag handling
-        if sample_flag {
+        // `--doc` flag handling
+        if doc_flag {
             let head = call.head;
-            return Ok(Value::string(nu_utils::get_sample_config(), head).into_pipeline_data());
+            return Ok(Value::string(nu_utils::get_doc_config(), head).into_pipeline_data());
         }
 
         super::config_::start_editor("config-path", engine_state, stack, call)
diff --git a/crates/nu-utils/src/default_files/README.md b/crates/nu-utils/src/default_files/README.md
index 68a36b865d..926870d20a 100644
--- a/crates/nu-utils/src/default_files/README.md
+++ b/crates/nu-utils/src/default_files/README.md
@@ -9,7 +9,7 @@
   * During a startup where the user specifies an alternative `env.nu` via `nu --env-config <path>`
   * During a `nu -c <commandstring>` or `nu <script>` startup so that `ENV_CONVERSIONS` is properly handled for Windows.
 * Is *not* loaded when running with an explicit `no --no-config-file (-n)`.
-* Is not commented - Comments are in `sample_env.nu`.
+* Is not commented - Comments are in `doc_env.nu`.
 * Should be optimized for fastest load times.
 * Can be introspected via `config env --default | nu-highlight`
 
@@ -27,7 +27,7 @@ Counterpart to `default_env.nu`.
   * `nu -n/--no-config`
   * `nu -c "ls"`
   * `nu <script.nu>`
-* Is not commented - Comments are in `sample_config.nu`.
+* Is not commented - Comments are in `doc_config.nu`.
 * Should be optimized for fastest load times. Whenever possible, values should be set via nu-protocol::config
   * Exception: `color_config` values are currently set in this file so that user's can introspect the values
   * TODO: Implement defaults for `color_config` in nu-protocol::config and remove from `default_config.nu`
@@ -37,24 +37,24 @@ Counterpart to `default_env.nu`.
   $env.config = {}
   ```
 
-## `sample_env.nu`
+## `doc_env.nu`
 
 * A commented file documenting the most common environment variables that a user might configure in `env.nu`
-* For convenient in-shell access - Can be pretty-printed via `config env --sample | nu-highlight`
+* For convenient in-shell access - Can be pretty-printed via `config env --doc | nu-highlight`
 * Since this file is for documentation only, include actual Nushell code without comments so that it can be pretty-printed
 * No optimization necessary - Not intended for use other than documentation.
-* Consider replacing `config env --sample` with `help env.nu` at some point.
+* Consider replacing `config env --doc` with `help env.nu` at some point.
 * Uses a mix of default values (explained) as well as other examples that users might want in their own `env.nu`
 
-## `sample_config.nu`
+## `doc_config.nu`
 
-Counterpart to `sample_env.nu`.
+Counterpart to `doc_env.nu`.
 
 * A commented file documenting the most common environment variables that a user might configure in `config.nu`
-* For convenient in-shell access - Can be pretty-printed via `config nu --sample | nu-highlight`
+* For convenient in-shell access - Can be pretty-printed via `config nu --doc | nu-highlight`
 * Since this file is for documentation only, include actual Nushell code without comments so that it can be pretty-printed
 * No optimization necessary - Not intended for use other than documentation.
-* Consider replacing `config nu --sample` with `help config.nu` at some point.
+* Consider replacing `config nu --doc` with `help config.nu` at some point.
 * Uses a mix of default values (explained) as well as other examples that users might want in their own `config.nu`
 
 ## `scaffold_env.nu`
diff --git a/crates/nu-utils/src/default_files/sample_config.nu b/crates/nu-utils/src/default_files/doc_config.nu
similarity index 97%
rename from crates/nu-utils/src/default_files/sample_config.nu
rename to crates/nu-utils/src/default_files/doc_config.nu
index 1a91b59f5e..3f4e7e1008 100644
--- a/crates/nu-utils/src/default_files/sample_config.nu
+++ b/crates/nu-utils/src/default_files/doc_config.nu
@@ -1,4 +1,4 @@
-# Nushell Sample Config File
+# Nushell Config File Documentation
 #
 # Warning: This file is intended for documentation purposes only and
 # is not intended to be used as an actual configuration file as-is.
@@ -18,7 +18,7 @@
 # https://nushell.sh/book/configuration
 #
 # You can pretty-print and page this file using:
-# config nu --sample | nu-highlight | less -R
+# config nu --doc | nu-highlight | less -R
 
 # $env.config
 # -----------
@@ -335,7 +335,7 @@ $env.config.table.header_on_separator = false
 # If set to an int, all tables will be abbreviated to only show the first <n> and last <n> rows
 # If set to `null`, all table rows will be displayed
 # Can be overridden by passing a table to `| table --abbreviated/-a`
-$env.config.table.abbreviated_row_count
+$env.config.table.abbreviated_row_count = null
 
 # footer_inheritance (bool): Footer behavior in nested tables
 # true: If a nested table is long enough on its own to display a footer (per `footer_mode` above),
@@ -411,7 +411,7 @@ $env.config.hooks.pre_prompt = []
 $env.config.hooks.pre_execution = []
 # When a specified environment variable changes
 $env.config.hooks.env_change = {
-    # run if the PWD environment is different since the last repl input
+    # Example: Run if the PWD environment is different since the last REPL input
     PWD: [{|before, after| null }]
 }
 # Before Nushell output is displayed in the terminal
@@ -419,6 +419,10 @@ $env.config.hooks.display_output = "if (term size).columns >= 100 { table -e } e
 # When a command is not found
 $env.config.hooks.command_not_found = []
 
+# The env_change hook accepts a record with environment variable names as keys, and a list
+# of hooks to run when that variable changes
+$env.config.hooks.env_change = {}
+
 # -----------
 # Keybindings
 # -----------
@@ -472,7 +476,9 @@ $env.config.menus ++= [
         type: {
             layout: description
             columns: 4
-            col_width: 20 # Optional value. If missing all the screen width is used to calculate column width
+            # col_width is an optional value. If missing, the entire screen width is used to
+            # calculate the column width
+            col_width: 20
             col_padding: 2
             selection_rows: 4
             description_rows: 10
@@ -485,29 +491,26 @@ $env.config.menus ++= [
     }
 ]
 
-
 # ---------------
 # Plugin behavior
 # ---------------
-# Per-plugin configuration. See https://www.nushell.sh/contributor-book/plugins.html#configuration.
-$env.config.plugins
+# Per-plugin configuration. See https://www.nushell.sh/contributor-book/plugins.html#plugin-configuration
+$env.config.plugins = {}
 
-# Configuration for plugin garbage collection
-$env.config.plugin_gc
-$env.config.plugin_gc.default
-# true to enable stopping of inactive plugins
-$env.config.plugin_gc.default.enabled
-# How long to wait after a plugin is inactive before stopping it
-$env.config.plugin_gc.default.stop_after
+# Plugin garbage collection configuration
+# $env.config.plugin_gc.*
+
+# enabled (bool): true/false to enable/disable stopping inactive plugins
+$env.config.plugin_gc.default.enabled = true
+# stop_after (duration): How long to wait after a plugin is inactive before stopping it
+$env.config.plugin_gc.default.stop_after = 10sec
+# plugins (record): Alternate garbage collection configuration per-plugin.
 $env.config.plugin_gc.plugins = {
-  # Alternate configuration for specific plugins, by name, for example:
-  #
   # gstat: {
-  #     enabled: false
+  #   enabled: false
   # }
 }
 
-
 # -------------------------------------
 # Themes/Colors and Syntax Highlighting
 # -------------------------------------
diff --git a/crates/nu-utils/src/default_files/sample_env.nu b/crates/nu-utils/src/default_files/doc_env.nu
similarity index 74%
rename from crates/nu-utils/src/default_files/sample_env.nu
rename to crates/nu-utils/src/default_files/doc_env.nu
index a69363cdf7..4b1bb95a4e 100644
--- a/crates/nu-utils/src/default_files/sample_env.nu
+++ b/crates/nu-utils/src/default_files/doc_env.nu
@@ -1,4 +1,6 @@
-# Sample Nushell Environment Config File
+# Nushell Environment Config File Documentation
+#
+# version = "0.100.1"
 #
 # version = "0.100.1"
 #
@@ -8,4 +10,4 @@
 
 # To pretty-print the in-shell documentation for Nushell's various configuration
 # settings, you can run:
-config nu --sample | nu-highlight | less -R
+config nu --doc | nu-highlight | less -R
diff --git a/crates/nu-utils/src/default_files/scaffold_config.nu b/crates/nu-utils/src/default_files/scaffold_config.nu
index fa6d834c73..1ee112e3aa 100644
--- a/crates/nu-utils/src/default_files/scaffold_config.nu
+++ b/crates/nu-utils/src/default_files/scaffold_config.nu
@@ -12,11 +12,7 @@
 # You can open this file in your default editor using:
 # config nu
 #
-# To pretty-print a sample config.nu with documentation, run:
-# config nu --sample | nu-highlight | less -R
-#
-# To pretty-print the default configuration values, run:
-# config nu --default | nu-highlight | less -R
+# See `help config nu` for more options
 #
 # You can remove these comments if you want or leave
 # them for future reference.
diff --git a/crates/nu-utils/src/default_files/scaffold_env.nu b/crates/nu-utils/src/default_files/scaffold_env.nu
index d7a2e00627..3f1c4600d6 100644
--- a/crates/nu-utils/src/default_files/scaffold_env.nu
+++ b/crates/nu-utils/src/default_files/scaffold_env.nu
@@ -12,11 +12,7 @@
 #
 # See https://www.nushell.sh/book/configuration.html
 #
-# To pretty-print a sample of the configuration settings, run:
-# config nu --sample | nu-highlight | less -R
-#
-# To pretty-print the default env.nu, run:
-# config env --default | nu-highlight | less -R
+# Also see `help config env` for more options.
 #
 # You can remove these comments if you want or leave
 # them for future reference.
diff --git a/crates/nu-utils/src/lib.rs b/crates/nu-utils/src/lib.rs
index a22c2e4537..c43bda9a0e 100644
--- a/crates/nu-utils/src/lib.rs
+++ b/crates/nu-utils/src/lib.rs
@@ -10,8 +10,8 @@ pub mod utils;
 
 pub use locale::get_system_locale;
 pub use utils::{
-    enable_vt_processing, get_default_config, get_default_env, get_ls_colors, get_sample_config,
-    get_sample_env, get_scaffold_config, get_scaffold_env, stderr_write_all_and_flush,
+    enable_vt_processing, get_default_config, get_default_env, get_doc_config, get_doc_env,
+    get_ls_colors, get_scaffold_config, get_scaffold_env, stderr_write_all_and_flush,
     stdout_write_all_and_flush, terminal_size,
 };
 
diff --git a/crates/nu-utils/src/utils.rs b/crates/nu-utils/src/utils.rs
index 74e5277ec4..87d667bdd1 100644
--- a/crates/nu-utils/src/utils.rs
+++ b/crates/nu-utils/src/utils.rs
@@ -94,8 +94,8 @@ pub fn get_scaffold_env() -> &'static str {
     include_str!("default_files/scaffold_env.nu")
 }
 
-pub fn get_sample_env() -> &'static str {
-    include_str!("default_files/sample_env.nu")
+pub fn get_doc_env() -> &'static str {
+    include_str!("default_files/doc_env.nu")
 }
 
 pub fn get_default_config() -> &'static str {
@@ -106,8 +106,8 @@ pub fn get_scaffold_config() -> &'static str {
     include_str!("default_files/scaffold_config.nu")
 }
 
-pub fn get_sample_config() -> &'static str {
-    include_str!("default_files/sample_config.nu")
+pub fn get_doc_config() -> &'static str {
+    include_str!("default_files/doc_config.nu")
 }
 
 pub fn get_ls_colors(lscolors_env_string: Option<String>) -> LsColors {

From 99fe866d1247fe07a09689ce141a9685750bf620 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Tue, 17 Dec 2024 17:08:20 -0500
Subject: [PATCH 0812/1072] Remove duplicate version line (#14611)

# Description

Fixed:

* `version = "0.100.1"` line got duplicated during merge conflict
resolution - Found while updating `bump_version.nu`.

# User-Facing Changes

N/A

# Tests + Formatting

TODO

# After Submitting

N/A
---
 crates/nu-utils/src/default_files/doc_env.nu | 2 --
 1 file changed, 2 deletions(-)

diff --git a/crates/nu-utils/src/default_files/doc_env.nu b/crates/nu-utils/src/default_files/doc_env.nu
index 4b1bb95a4e..191d251734 100644
--- a/crates/nu-utils/src/default_files/doc_env.nu
+++ b/crates/nu-utils/src/default_files/doc_env.nu
@@ -2,8 +2,6 @@
 #
 # version = "0.100.1"
 #
-# version = "0.100.1"
-#
 # Previously, environment variables were typically configured in `env.nu`.
 # In general, most configuration can and should be performed in `config.nu`
 # or one of the autoload directories.

From a9caa61ef92c774342c134a405d46eaeb125b627 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Dec 2024 10:42:28 +0800
Subject: [PATCH 0813/1072] Bump crate-ci/typos from 1.28.2 to 1.28.4 (#14614)

Bumps [crate-ci/typos](https://github.com/crate-ci/typos) from 1.28.2 to
1.28.4.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/crate-ci/typos/releases">crate-ci/typos's
releases</a>.</em></p>
<blockquote>
<h2>v1.28.4</h2>
<h2>[1.28.4] - 2024-12-16</h2>
<h3>Features</h3>
<ul>
<li><code>--format sarif</code> support</li>
</ul>
<h2>v1.28.3</h2>
<h2>[1.28.3] - 2024-12-12</h2>
<h3>Fixes</h3>
<ul>
<li>Correct <code>imlementations</code>, <code>includs</code>,
<code>qurorum</code>, <code>transatctions</code>,
<code>trasnactions</code>, <code>validasted</code>,
<code>vview</code></li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/crate-ci/typos/blob/master/CHANGELOG.md">crate-ci/typos's
changelog</a>.</em></p>
<blockquote>
<h2>[1.28.4] - 2024-12-16</h2>
<h3>Features</h3>
<ul>
<li><code>--format sarif</code> support</li>
</ul>
<h2>[1.28.3] - 2024-12-12</h2>
<h3>Fixes</h3>
<ul>
<li>Correct <code>imlementations</code>, <code>includs</code>,
<code>qurorum</code>, <code>transatctions</code>,
<code>trasnactions</code>, <code>validasted</code>,
<code>vview</code></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/crate-ci/typos/commit/9d890159570d5018df91fedfa40b4730cd4a81b1"><code>9d89015</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/6b24563a993736342606b02dc6f98c7d86197fac"><code>6b24563</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/bd0a2769ae8d608b6e8152aff91e91d7d2aad0f3"><code>bd0a276</code></a>
docs: Update changelog</li>
<li><a
href="https://github.com/crate-ci/typos/commit/370109dd4d88cfe9d647eb6cc9ed23e64cc75f8a"><code>370109d</code></a>
Merge pull request <a
href="https://redirect.github.com/crate-ci/typos/issues/1047">#1047</a>
from Zxilly/sarif</li>
<li><a
href="https://github.com/crate-ci/typos/commit/63908449a70239a7719ed21f1caaca964c001470"><code>6390844</code></a>
feat: Implement sarif format reporter</li>
<li><a
href="https://github.com/crate-ci/typos/commit/32b96444b9239039a8977dc5fc82e46732b77844"><code>32b9644</code></a>
Merge pull request <a
href="https://redirect.github.com/crate-ci/typos/issues/1169">#1169</a>
from klensy/deps</li>
<li><a
href="https://github.com/crate-ci/typos/commit/720258f60bee6e05a3307b2ef7e7574d9d19f2d9"><code>720258f</code></a>
Merge pull request <a
href="https://redirect.github.com/crate-ci/typos/issues/1176">#1176</a>
from Ghaniyyat05/master</li>
<li><a
href="https://github.com/crate-ci/typos/commit/a42904ad6e5d5533d2dc478538bf379b0189d20a"><code>a42904a</code></a>
Update README.md</li>
<li><a
href="https://github.com/crate-ci/typos/commit/d1c850b2b5d502763520c25fb4a6a1128ad99bd9"><code>d1c850b</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/a491fd56c00b86bed2e822c3fbe3bb4b8f5baca3"><code>a491fd5</code></a>
chore: Release</li>
<li>Additional commits viewable in <a
href="https://github.com/crate-ci/typos/compare/v1.28.2...v1.28.4">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=crate-ci/typos&package-manager=github_actions&previous-version=1.28.2&new-version=1.28.4)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/typos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index 3d649176db..ecbd9b2134 100644
--- 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.28.2
+        uses: crate-ci/typos@v1.28.4

From 8127b5dd24908c8063c00b9aefe769224a5b05cf Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Wed, 18 Dec 2024 07:36:04 -0500
Subject: [PATCH 0814/1072] Add `merge deep` command (#14525)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
This PR adds the `merge deep` command. This allows you to merge nested
records and tables/lists within records together, instead of overwriting
them. The code for `merge` was reworked to support more general merging
of values, so `merge` and `merge deep` use the same underlying code.

`merge deep` mostly works like `merge`, except it recurses into inner
records which exist in both the input and argument rather than just
overwriting. For lists and by extension tables, `merge deep` has a
couple different strategies for merging inner lists, which can be
selected with the `--strategy` flag. These are:

- `table`: Merges tables element-wise, similarly to the merge command.
Non-table lists are not merged.
- `overwrite`: Lists and tables are overwritten with their corresponding
value from the argument, similarly to scalars.
- `append`: Lists and tables in the input are appended with the
corresponding list from the argument.
- `prepend`: Lists and tables in the input are prepended with the
corresponding list from the argument.

This can also be used with the new config changes to write a monolithic
record of _only_ the config values you want to change:
```nushell
# in config file:
const overrides = {
  history: {
    file_format: "sqlite",
    isolation: true
  }
}
# use append strategy for lists, e.g., menus keybindings
$env.config = $env.config | merge deep --strategy=append $overrides

# later, in REPL:
$env.config.history
# => ╭───────────────┬────────╮
# => │ max_size      │ 100000 │
# => │ sync_on_enter │ true   │
# => │ file_format   │ sqlite │
# => │ isolation     │ true   │
# => ╰───────────────┴────────╯
```

<details>
<summary>Performance details</summary>
For those interested, there was less than one standard deviation of
difference in startup time when setting each config item individually
versus using <code>merge deep</code>, so you can use <code>merge
deep</code> in your config at no measurable performance cost. Here's my
results:

My normal config (in 0.101 style, with each `$env.config.[...]` value
updated individually)
```nushell
bench --pretty { ./nu -l -c '' }
# => 45ms 976µs 983ns +/- 455µs 955ns
```

Equivalent config with a single `overrides` record and `merge deep -s
append`:
```nushell
bench --pretty { ./nu -l -c '' }
# => 45ms 587µs 428ns +/- 702µs 944ns
```

</details>

Huge thanks to @Bahex for designing the strategies API and helping
finish up this PR while I was sick ❤️

Related:  #12148

# User-Facing Changes

Adds the `merge deep` command to recursively merge records. For example:

```nushell
{a: {foo: 123 bar: "overwrite me"}, b: [1, 2, 3]} | merge deep {a: {bar: 456, baz: 789}, b: [4, 5, 6]}
# => ╭───┬───────────────╮
# => │   │ ╭─────┬─────╮ │
# => │ a │ │ foo │ 123 │ │
# => │   │ │ bar │ 456 │ │
# => │   │ │ baz │ 789 │ │
# => │   │ ╰─────┴─────╯ │
# => │   │ ╭───┬───╮     │
# => │ b │ │ 0 │ 4 │     │
# => │   │ │ 1 │ 5 │     │
# => │   │ │ 2 │ 6 │     │
# => │   │ ╰───┴───╯     │
# => ╰───┴───────────────╯
```

`merge deep` also has different strategies for merging inner lists and
tables. For example, you can use the `append` strategy to _merge_ the
inner `b` list instead of overwriting it.

```nushell
{a: {foo: 123 bar: "overwrite me"}, b: [1, 2, 3]} | merge deep --strategy=append {a: {bar: 456, baz: 789}, b: [4, 5, 6]}
# => ╭───┬───────────────╮
# => │   │ ╭─────┬─────╮ │
# => │ a │ │ foo │ 123 │ │
# => │   │ │ bar │ 456 │ │
# => │   │ │ baz │ 789 │ │
# => │   │ ╰─────┴─────╯ │
# => │   │ ╭───┬───╮     │
# => │ b │ │ 0 │ 1 │     │
# => │   │ │ 1 │ 2 │     │
# => │   │ │ 2 │ 3 │     │
# => │   │ │ 3 │ 4 │     │
# => │   │ │ 4 │ 5 │     │
# => │   │ │ 5 │ 6 │     │
# => │   │ ╰───┴───╯     │
# => ╰───┴───────────────╯
```

**Note to release notes writers**: Please credit @Bahex for this PR as
well 😄

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

Added tests for deep merge

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
N/A

---------

Co-authored-by: Bahex <bahey1999@gmail.com>
---
 crates/nu-command/src/default_context.rs      |   1 +
 crates/nu-command/src/filters/merge/common.rs | 174 ++++++++++++++++++
 crates/nu-command/src/filters/merge/deep.rs   | 157 ++++++++++++++++
 .../src/filters/{merge.rs => merge/merge_.rs} |  76 ++------
 crates/nu-command/src/filters/merge/mod.rs    |   6 +
 crates/nu-command/src/filters/mod.rs          |   1 +
 .../nu-command/tests/commands/merge_deep.rs   | 144 +++++++++++++++
 crates/nu-command/tests/commands/mod.rs       |   1 +
 8 files changed, 495 insertions(+), 65 deletions(-)
 create mode 100644 crates/nu-command/src/filters/merge/common.rs
 create mode 100644 crates/nu-command/src/filters/merge/deep.rs
 rename crates/nu-command/src/filters/{merge.rs => merge/merge_.rs} (52%)
 create mode 100644 crates/nu-command/src/filters/merge/mod.rs
 create mode 100644 crates/nu-command/tests/commands/merge_deep.rs

diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index a4288c685c..84abe6a643 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -61,6 +61,7 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             SplitBy,
             Take,
             Merge,
+            MergeDeep,
             Move,
             TakeWhile,
             TakeUntil,
diff --git a/crates/nu-command/src/filters/merge/common.rs b/crates/nu-command/src/filters/merge/common.rs
new file mode 100644
index 0000000000..219250d113
--- /dev/null
+++ b/crates/nu-command/src/filters/merge/common.rs
@@ -0,0 +1,174 @@
+use nu_engine::command_prelude::*;
+
+#[derive(Copy, Clone)]
+pub(crate) enum MergeStrategy {
+    /// Key-value pairs present in lhs and rhs are overwritten by values in rhs
+    Shallow,
+    /// Records are merged recursively, otherwise same behavior as shallow
+    Deep(ListMerge),
+}
+
+#[derive(Copy, Clone)]
+pub(crate) enum ListMerge {
+    /// Lists in lhs are overwritten by lists in rhs
+    Overwrite,
+    /// Lists of records are merged element-wise, other lists are overwritten by rhs
+    Elementwise,
+    /// All lists are concatenated together, lhs ++ rhs
+    Append,
+    /// All lists are concatenated together, rhs ++ lhs
+    Prepend,
+}
+
+/// Test whether a value is a list of records.
+///
+/// This includes tables and non-tables.
+fn is_list_of_records(val: &Value) -> bool {
+    match val {
+        list @ Value::List { .. } if matches!(list.get_type(), Type::Table { .. }) => true,
+        // we want to include lists of records, but not lists of mixed types
+        Value::List { vals, .. } => vals
+            .iter()
+            .map(Value::get_type)
+            .all(|val| matches!(val, Type::Record { .. })),
+        _ => false,
+    }
+}
+
+/// Typecheck a merge operation.
+///
+/// Ensures that both arguments are records, tables, or lists of non-matching records.
+pub(crate) fn typecheck_merge(lhs: &Value, rhs: &Value, head: Span) -> Result<(), ShellError> {
+    match (lhs.get_type(), rhs.get_type()) {
+        (Type::Record { .. }, Type::Record { .. }) => Ok(()),
+        (_, _) if is_list_of_records(lhs) && is_list_of_records(rhs) => Ok(()),
+        _ => Err(ShellError::PipelineMismatch {
+            exp_input_type: "input and argument to be both record or both table".to_string(),
+            dst_span: head,
+            src_span: lhs.span(),
+        }),
+    }
+}
+
+pub(crate) fn do_merge(
+    lhs: Value,
+    rhs: Value,
+    strategy: MergeStrategy,
+    span: Span,
+) -> Result<Value, ShellError> {
+    match (strategy, lhs, rhs) {
+        // Propagate errors
+        (_, Value::Error { error, .. }, _) | (_, _, Value::Error { error, .. }) => Err(*error),
+        // Shallow merge records
+        (
+            MergeStrategy::Shallow,
+            Value::Record { val: lhs, .. },
+            Value::Record { val: rhs, .. },
+        ) => Ok(Value::record(
+            merge_records(lhs.into_owned(), rhs.into_owned(), strategy, span)?,
+            span,
+        )),
+        // Deep merge records
+        (
+            MergeStrategy::Deep(_),
+            Value::Record { val: lhs, .. },
+            Value::Record { val: rhs, .. },
+        ) => Ok(Value::record(
+            merge_records(lhs.into_owned(), rhs.into_owned(), strategy, span)?,
+            span,
+        )),
+        // Merge lists by appending
+        (
+            MergeStrategy::Deep(ListMerge::Append),
+            Value::List { vals: lhs, .. },
+            Value::List { vals: rhs, .. },
+        ) => Ok(Value::list(lhs.into_iter().chain(rhs).collect(), span)),
+        // Merge lists by prepending
+        (
+            MergeStrategy::Deep(ListMerge::Prepend),
+            Value::List { vals: lhs, .. },
+            Value::List { vals: rhs, .. },
+        ) => Ok(Value::list(rhs.into_iter().chain(lhs).collect(), span)),
+        // Merge lists of records elementwise (tables and non-tables)
+        // Match on shallow since this might be a top-level table
+        (
+            MergeStrategy::Shallow | MergeStrategy::Deep(ListMerge::Elementwise),
+            lhs_list @ Value::List { .. },
+            rhs_list @ Value::List { .. },
+        ) if is_list_of_records(&lhs_list) && is_list_of_records(&rhs_list) => {
+            let lhs = lhs_list
+                .into_list()
+                .expect("Value matched as list above, but is not a list");
+            let rhs = rhs_list
+                .into_list()
+                .expect("Value matched as list above, but is not a list");
+            Ok(Value::list(merge_tables(lhs, rhs, strategy, span)?, span))
+        }
+        // Use rhs value (shallow record merge, overwrite list merge, and general scalar merge)
+        (_, _, val) => Ok(val),
+    }
+}
+
+/// Merge right-hand table into left-hand table, element-wise
+///
+/// For example:
+/// lhs = [{a: 12, b: 34}]
+/// rhs = [{a: 56, c: 78}]
+/// output = [{a: 56, b: 34, c: 78}]
+fn merge_tables(
+    lhs: Vec<Value>,
+    rhs: Vec<Value>,
+    strategy: MergeStrategy,
+    span: Span,
+) -> Result<Vec<Value>, ShellError> {
+    let mut table_iter = rhs.into_iter();
+
+    lhs.into_iter()
+        .map(move |inp| match (inp.into_record(), table_iter.next()) {
+            (Ok(rec), Some(to_merge)) => match to_merge.into_record() {
+                Ok(to_merge) => Ok(Value::record(
+                    merge_records(rec.to_owned(), to_merge.to_owned(), strategy, span)?,
+                    span,
+                )),
+                Err(error) => Ok(Value::error(error, span)),
+            },
+            (Ok(rec), None) => Ok(Value::record(rec, span)),
+            (Err(error), _) => Ok(Value::error(error, span)),
+        })
+        .collect()
+}
+
+fn merge_records(
+    mut lhs: Record,
+    rhs: Record,
+    strategy: MergeStrategy,
+    span: Span,
+) -> Result<Record, ShellError> {
+    match strategy {
+        MergeStrategy::Shallow => {
+            for (col, rval) in rhs.into_iter() {
+                lhs.insert(col, rval);
+            }
+        }
+        strategy => {
+            for (col, rval) in rhs.into_iter() {
+                // in order to both avoid cloning (possibly nested) record values and maintain the ordering of record keys, we can swap a temporary value into the source record.
+                // if we were to remove the value, the ordering would be messed up as we might not insert back into the original index
+                // it's okay to swap a temporary value in, since we know it will be replaced by the end of the function call
+                //
+                // use an error here instead of something like null so if this somehow makes it into the output, the bug will be immediately obvious
+                let failed_error = ShellError::NushellFailed {
+                    msg: "Merge failed to properly replace internal temporary value".to_owned(),
+                };
+
+                let value = match lhs.insert(&col, Value::error(failed_error, span)) {
+                    Some(lval) => do_merge(lval, rval, strategy, span)?,
+                    None => rval,
+                };
+
+                lhs.insert(col, value);
+            }
+        }
+    }
+    Ok(lhs)
+}
diff --git a/crates/nu-command/src/filters/merge/deep.rs b/crates/nu-command/src/filters/merge/deep.rs
new file mode 100644
index 0000000000..42d4cefd9d
--- /dev/null
+++ b/crates/nu-command/src/filters/merge/deep.rs
@@ -0,0 +1,157 @@
+use super::common::{do_merge, typecheck_merge, ListMerge, MergeStrategy};
+use nu_engine::command_prelude::*;
+
+#[derive(Clone)]
+pub struct MergeDeep;
+
+impl Command for MergeDeep {
+    fn name(&self) -> &str {
+        "merge deep"
+    }
+
+    fn description(&self) -> &str {
+        "Merge the input with a record or table, recursively merging values in matching columns."
+    }
+
+    fn extra_description(&self) -> &str {
+        r#"The way that key-value pairs which exist in both the input and the argument are merged depends on their types.
+
+Scalar values (like numbers and strings) in the input are overwritten by the corresponding value from the argument.
+Records in the input are merged similarly to the merge command, but recursing rather than overwriting inner records.
+
+The way lists and tables are merged is controlled by the `--strategy` flag:
+  - table: Merges tables element-wise, similarly to the merge command. Non-table lists are overwritten.
+  - overwrite: Lists and tables are overwritten with their corresponding value from the argument, similarly to scalars.
+  - append: Lists and tables in the input are appended with the corresponding list from the argument.
+  - prepend: Lists and tables in the input are prepended with the corresponding list from the argument."#
+    }
+
+    fn signature(&self) -> nu_protocol::Signature {
+        Signature::build("merge deep")
+            .input_output_types(vec![
+                (Type::record(), Type::record()),
+                (Type::table(), Type::table()),
+            ])
+            .required(
+                "value",
+                SyntaxShape::OneOf(vec![
+                    SyntaxShape::Record(vec![]),
+                    SyntaxShape::Table(vec![]),
+                    SyntaxShape::List(SyntaxShape::Any.into()),
+                ]),
+                "The new value to merge with.",
+            )
+            .category(Category::Filters)
+            .named("strategy", SyntaxShape::String, "The list merging strategy to use. One of: table (default), overwrite, append, prepend", Some('s'))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                example: "{a: 1, b: {c: 2, d: 3}} | merge deep {b: {d: 4, e: 5}}",
+                description: "Merge two records recursively",
+                result: Some(Value::test_record(record! {
+                    "a" => Value::test_int(1),
+                    "b" => Value::test_record(record! {
+                        "c" => Value::test_int(2),
+                        "d" => Value::test_int(4),
+                        "e" => Value::test_int(5),
+                    })
+                })),
+            },
+            Example {
+                example: r#"[{columnA: 0, columnB: [{B1: 1}]}] | merge deep [{columnB: [{B2: 2}]}]"#,
+                description: "Merge two tables",
+                result: Some(Value::test_list(vec![Value::test_record(record! {
+                    "columnA" => Value::test_int(0),
+                    "columnB" => Value::test_list(vec![
+                        Value::test_record(record! {
+                            "B1" => Value::test_int(1),
+                            "B2" => Value::test_int(2),
+                        })
+                    ]),
+                })])),
+            },
+            Example {
+                example: r#"{inner: [{a: 1}, {b: 2}]} | merge deep {inner: [{c: 3}]}"#,
+                description: "Merge two records and their inner tables",
+                result: Some(Value::test_record(record! {
+                    "inner" => Value::test_list(vec![
+                        Value::test_record(record! {
+                            "a" => Value::test_int(1),
+                            "c" => Value::test_int(3),
+                        }),
+                        Value::test_record(record! {
+                            "b" => Value::test_int(2),
+                        })
+                    ])
+                })),
+            },
+            Example {
+                example: r#"{inner: [{a: 1}, {b: 2}]} | merge deep {inner: [{c: 3}]} --strategy=append"#,
+                description: "Merge two records, appending their inner tables",
+                result: Some(Value::test_record(record! {
+                    "inner" => Value::test_list(vec![
+                        Value::test_record(record! {
+                            "a" => Value::test_int(1),
+                        }),
+                        Value::test_record(record! {
+                            "b" => Value::test_int(2),
+                        }),
+                        Value::test_record(record! {
+                            "c" => Value::test_int(3),
+                        }),
+                    ])
+                })),
+            },
+        ]
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let head = call.head;
+        let merge_value: Value = call.req(engine_state, stack, 0)?;
+        let strategy_flag: Option<String> = call.get_flag(engine_state, stack, "strategy")?;
+        let metadata = input.metadata();
+
+        // collect input before typechecking, so tables are detected as such
+        let input_span = input.span().unwrap_or(head);
+        let input = input.into_value(input_span)?;
+
+        let strategy = match strategy_flag.as_deref() {
+            None | Some("table") => MergeStrategy::Deep(ListMerge::Elementwise),
+            Some("append") => MergeStrategy::Deep(ListMerge::Append),
+            Some("prepend") => MergeStrategy::Deep(ListMerge::Prepend),
+            Some("overwrite") => MergeStrategy::Deep(ListMerge::Overwrite),
+            Some(_) => {
+                return Err(ShellError::IncorrectValue {
+                    msg: "The list merging strategy must be one one of: table, overwrite, append, prepend".to_string(),
+                    val_span: call.get_flag_span(stack, "strategy").unwrap_or(head),
+                    call_span: head,
+                })
+            }
+        };
+
+        typecheck_merge(&input, &merge_value, head)?;
+
+        let merged = do_merge(input, merge_value, strategy, head)?;
+        Ok(merged.into_pipeline_data_with_metadata(metadata))
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_examples() {
+        use crate::test_examples;
+
+        test_examples(MergeDeep {})
+    }
+}
diff --git a/crates/nu-command/src/filters/merge.rs b/crates/nu-command/src/filters/merge/merge_.rs
similarity index 52%
rename from crates/nu-command/src/filters/merge.rs
rename to crates/nu-command/src/filters/merge/merge_.rs
index 588138fb42..5974f13d60 100644
--- a/crates/nu-command/src/filters/merge.rs
+++ b/crates/nu-command/src/filters/merge/merge_.rs
@@ -1,3 +1,4 @@
+use super::common::{do_merge, typecheck_merge, MergeStrategy};
 use nu_engine::command_prelude::*;
 
 #[derive(Clone)]
@@ -28,8 +29,10 @@ repeating this process with row 1, and so on."#
             ])
             .required(
                 "value",
-                // Both this and `update` should have a shape more like <record> | <table> than just <any>. -Leon 2022-10-27
-                SyntaxShape::Any,
+                SyntaxShape::OneOf(vec![
+                    SyntaxShape::Record(vec![]),
+                    SyntaxShape::Table(vec![]),
+                ]),
                 "The new value to merge with.",
             )
             .category(Category::Filters)
@@ -89,74 +92,17 @@ repeating this process with row 1, and so on."#
         let merge_value: Value = call.req(engine_state, stack, 0)?;
         let metadata = input.metadata();
 
-        match (&input, merge_value) {
-            // table (list of records)
-            (
-                PipelineData::Value(Value::List { .. }, ..) | PipelineData::ListStream { .. },
-                Value::List { vals, .. },
-            ) => {
-                let mut table_iter = vals.into_iter();
+        // collect input before typechecking, so tables are detected as such
+        let input_span = input.span().unwrap_or(head);
+        let input = input.into_value(input_span)?;
 
-                let res =
-                    input
-                        .into_iter()
-                        .map(move |inp| match (inp.as_record(), table_iter.next()) {
-                            (Ok(inp), Some(to_merge)) => match to_merge.as_record() {
-                                Ok(to_merge) => Value::record(do_merge(inp, to_merge), head),
-                                Err(error) => Value::error(error, head),
-                            },
-                            (_, None) => inp,
-                            (Err(error), _) => Value::error(error, head),
-                        });
+        typecheck_merge(&input, &merge_value, head)?;
 
-                Ok(res.into_pipeline_data_with_metadata(
-                    head,
-                    engine_state.signals().clone(),
-                    metadata,
-                ))
-            }
-            // record
-            (
-                PipelineData::Value(Value::Record { val: inp, .. }, ..),
-                Value::Record { val: to_merge, .. },
-            ) => Ok(Value::record(do_merge(inp, &to_merge), head).into_pipeline_data()),
-            // Propagate errors in the pipeline
-            (PipelineData::Value(Value::Error { error, .. }, ..), _) => Err(*error.clone()),
-            (PipelineData::Value(val, ..), ..) => {
-                // Only point the "value originates here" arrow at the merge value
-                // if it was generated from a block. Otherwise, point at the pipeline value. -Leon 2022-10-27
-                let span = if val.span() == Span::test_data() {
-                    Span::new(head.start, head.start)
-                } else {
-                    val.span()
-                };
-
-                Err(ShellError::PipelineMismatch {
-                    exp_input_type: "input, and argument, to be both record or both table"
-                        .to_string(),
-                    dst_span: head,
-                    src_span: span,
-                })
-            }
-            _ => Err(ShellError::PipelineMismatch {
-                exp_input_type: "input, and argument, to be both record or both table".to_string(),
-                dst_span: head,
-                src_span: Span::new(head.start, head.start),
-            }),
-        }
+        let merged = do_merge(input, merge_value, MergeStrategy::Shallow, head)?;
+        Ok(merged.into_pipeline_data_with_metadata(metadata))
     }
 }
 
-// TODO: rewrite to mutate the input record
-fn do_merge(input_record: &Record, to_merge_record: &Record) -> Record {
-    let mut result = input_record.clone();
-
-    for (col, val) in to_merge_record {
-        result.insert(col, val.clone());
-    }
-    result
-}
-
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/crates/nu-command/src/filters/merge/mod.rs b/crates/nu-command/src/filters/merge/mod.rs
new file mode 100644
index 0000000000..36a457b221
--- /dev/null
+++ b/crates/nu-command/src/filters/merge/mod.rs
@@ -0,0 +1,6 @@
+mod common;
+pub mod deep;
+pub mod merge_;
+
+pub use deep::MergeDeep;
+pub use merge_::Merge;
diff --git a/crates/nu-command/src/filters/mod.rs b/crates/nu-command/src/filters/mod.rs
index 8eac0fc70b..373314fb18 100644
--- a/crates/nu-command/src/filters/mod.rs
+++ b/crates/nu-command/src/filters/mod.rs
@@ -87,6 +87,7 @@ pub use last::Last;
 pub use length::Length;
 pub use lines::Lines;
 pub use merge::Merge;
+pub use merge::MergeDeep;
 pub use move_::Move;
 pub use par_each::ParEach;
 pub use prepend::Prepend;
diff --git a/crates/nu-command/tests/commands/merge_deep.rs b/crates/nu-command/tests/commands/merge_deep.rs
new file mode 100644
index 0000000000..a9cc62aba8
--- /dev/null
+++ b/crates/nu-command/tests/commands/merge_deep.rs
@@ -0,0 +1,144 @@
+use nu_test_support::nu;
+
+#[test]
+fn table_strategy_table() {
+    assert_eq!(
+        nu!(
+            "{} | merge deep {} | to nuon",
+            "{inner: [{a: 1}, {b: 2}]}",
+            "{inner: [{c: 3}]}"
+        )
+        .out,
+        "{inner: [{a: 1, c: 3}, {b: 2}]}"
+    )
+}
+
+#[test]
+fn table_strategy_list() {
+    assert_eq!(
+        nu!(
+            "{} | merge deep {} | to nuon",
+            "{a: [1, 2, 3]}",
+            "{a: [4, 5, 6]}"
+        )
+        .out,
+        "{a: [4, 5, 6]}"
+    )
+}
+
+#[test]
+fn overwrite_strategy_table() {
+    assert_eq!(
+        nu!(
+            "{} | merge deep --strategy=overwrite {} | to nuon",
+            "{inner: [{a: 1}, {b: 2}]}",
+            "{inner: [[c]; [3]]}"
+        )
+        .out,
+        "{inner: [[c]; [3]]}"
+    )
+}
+
+#[test]
+fn overwrite_strategy_list() {
+    assert_eq!(
+        nu!(
+            "{} | merge deep --strategy=overwrite {} | to nuon",
+            "{a: [1, 2, 3]}",
+            "{a: [4, 5, 6]}"
+        )
+        .out,
+        "{a: [4, 5, 6]}"
+    )
+}
+
+#[test]
+fn append_strategy_table() {
+    assert_eq!(
+        nu!(
+            "{} | merge deep --strategy=append {} | to nuon",
+            "{inner: [{a: 1}, {b: 2}]}",
+            "{inner: [{c: 3}]}"
+        )
+        .out,
+        "{inner: [{a: 1}, {b: 2}, {c: 3}]}"
+    )
+}
+
+#[test]
+fn append_strategy_list() {
+    assert_eq!(
+        nu!(
+            "{} | merge deep --strategy=append {} | to nuon",
+            "{inner: [1, 2, 3]}",
+            "{inner: [4, 5, 6]}"
+        )
+        .out,
+        "{inner: [1, 2, 3, 4, 5, 6]}"
+    )
+}
+
+#[test]
+fn prepend_strategy_table() {
+    assert_eq!(
+        nu!(
+            "{} | merge deep --strategy=prepend {} | to nuon",
+            "{inner: [{a: 1}, {b: 2}]}",
+            "{inner: [{c: 3}]}"
+        )
+        .out,
+        "{inner: [{c: 3}, {a: 1}, {b: 2}]}"
+    )
+}
+
+#[test]
+fn prepend_strategy_list() {
+    assert_eq!(
+        nu!(
+            "{} | merge deep --strategy=prepend {} | to nuon",
+            "{inner: [1, 2, 3]}",
+            "{inner: [4, 5, 6]}"
+        )
+        .out,
+        "{inner: [4, 5, 6, 1, 2, 3]}"
+    )
+}
+
+#[test]
+fn record_nested_with_overwrite() {
+    assert_eq!(
+        nu!(
+            "{} | merge deep {} | to nuon",
+            "{a: {b: {c: {d: 123, e: 456}}}}",
+            "{a: {b: {c: {e: 654, f: 789}}}}"
+        )
+        .out,
+        "{a: {b: {c: {d: 123, e: 654, f: 789}}}}"
+    )
+}
+
+#[test]
+fn single_row_table() {
+    assert_eq!(
+        nu!(
+            "{} | merge deep {} | to nuon",
+            "[[a]; [{foo: [1, 2, 3]}]]",
+            "[[a]; [{bar: [4, 5, 6]}]]"
+        )
+        .out,
+        "[[a]; [{foo: [1, 2, 3], bar: [4, 5, 6]}]]"
+    )
+}
+
+#[test]
+fn multi_row_table() {
+    assert_eq!(
+        nu!(
+            "{} | merge deep {} | to nuon ",
+            "[[a b]; [{inner: {foo: abc}} {inner: {baz: ghi}}]]",
+            "[[a b]; [{inner: {bar: def}} {inner: {qux: jkl}}]]"
+        )
+        .out,
+        "[[a, b]; [{inner: {foo: abc, bar: def}}, {inner: {baz: ghi, qux: jkl}}]]"
+    )
+}
diff --git a/crates/nu-command/tests/commands/mod.rs b/crates/nu-command/tests/commands/mod.rs
index a8ffdeb917..3de3888823 100644
--- a/crates/nu-command/tests/commands/mod.rs
+++ b/crates/nu-command/tests/commands/mod.rs
@@ -66,6 +66,7 @@ mod ls;
 mod match_;
 mod math;
 mod merge;
+mod merge_deep;
 mod mktemp;
 mod move_;
 mod mut_;

From 68c2729991e52cb115af42d8fe0a6b9150977470 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Wed, 18 Dec 2024 06:41:50 -0600
Subject: [PATCH 0815/1072] add `view blocks` command (#14610)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

This PR is meant to add another nushell introspection/debug command,
`view blocks`. This command shows what is in the EngineState's memory
that is parsed and stored as blocks. Blocks may continue to grow as you
use the repl.
 

![image](https://github.com/user-attachments/assets/8a19fd56-ef15-4993-9700-a51eb8eaec7f)

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/debug/mod.rs         |  2 +
 crates/nu-command/src/debug/view_blocks.rs | 71 ++++++++++++++++++++++
 crates/nu-command/src/default_context.rs   |  1 +
 3 files changed, 74 insertions(+)
 create mode 100644 crates/nu-command/src/debug/view_blocks.rs

diff --git a/crates/nu-command/src/debug/mod.rs b/crates/nu-command/src/debug/mod.rs
index aabb20883d..50ffa46b9a 100644
--- a/crates/nu-command/src/debug/mod.rs
+++ b/crates/nu-command/src/debug/mod.rs
@@ -10,6 +10,7 @@ mod metadata_set;
 mod profile;
 mod timeit;
 mod view;
+mod view_blocks;
 mod view_files;
 mod view_ir;
 mod view_source;
@@ -27,6 +28,7 @@ pub use metadata_set::MetadataSet;
 pub use profile::DebugProfile;
 pub use timeit::TimeIt;
 pub use view::View;
+pub use view_blocks::ViewBlocks;
 pub use view_files::ViewFiles;
 pub use view_ir::ViewIr;
 pub use view_source::ViewSource;
diff --git a/crates/nu-command/src/debug/view_blocks.rs b/crates/nu-command/src/debug/view_blocks.rs
new file mode 100644
index 0000000000..a2f2f4b04a
--- /dev/null
+++ b/crates/nu-command/src/debug/view_blocks.rs
@@ -0,0 +1,71 @@
+use nu_engine::command_prelude::*;
+
+#[derive(Clone)]
+pub struct ViewBlocks;
+
+impl Command for ViewBlocks {
+    fn name(&self) -> &str {
+        "view blocks"
+    }
+
+    fn description(&self) -> &str {
+        "View the blocks registered in nushell's EngineState memory."
+    }
+
+    fn extra_description(&self) -> &str {
+        "These are blocks parsed and loaded at runtime as well as any blocks that accumulate in the repl."
+    }
+
+    fn signature(&self) -> nu_protocol::Signature {
+        Signature::build("view blocks")
+            .input_output_types(vec![(
+                Type::Nothing,
+                Type::Table(
+                    [
+                        ("block_id".into(), Type::Int),
+                        ("content".into(), Type::String),
+                        ("start".into(), Type::Int),
+                        ("end".into(), Type::Int),
+                    ]
+                    .into(),
+                ),
+            )])
+            .category(Category::Debug)
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        _stack: &mut Stack,
+        call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let mut records = vec![];
+
+        for block_id in 0..engine_state.num_blocks() {
+            let block = engine_state.get_block(nu_protocol::BlockId::new(block_id));
+
+            if let Some(span) = block.span {
+                let contents_bytes = engine_state.get_span_contents(span);
+                let contents_string = String::from_utf8_lossy(contents_bytes);
+                let cur_rec = record! {
+                    "block_id" => Value::int(block_id as i64, span),
+                    "content" => Value::string(contents_string.trim().to_string(), span),
+                    "start" => Value::int(span.start as i64, span),
+                    "end" => Value::int(span.end as i64, span),
+                };
+                records.push(Value::record(cur_rec, span));
+            }
+        }
+
+        Ok(Value::list(records, call.head).into_pipeline_data())
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![Example {
+            description: "View the blocks registered in Nushell's EngineState memory",
+            example: r#"view blocks"#,
+            result: None,
+        }]
+    }
+}
diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index 84abe6a643..3612c963c8 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -161,6 +161,7 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             MetadataSet,
             TimeIt,
             View,
+            ViewBlocks,
             ViewFiles,
             ViewIr,
             ViewSource,

From fff0c6e2cb1ff9f5daf05ac39756014bc1d07b04 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Wed, 18 Dec 2024 23:09:50 +0800
Subject: [PATCH 0816/1072] update shadow-rs to 0.37 (#14617)

---
 Cargo.lock                    | 8 ++++----
 crates/nu-cmd-lang/Cargo.toml | 6 +++---
 crates/nu-cmd-lang/build.rs   | 7 ++++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d37c10a46f..9cc6b8c04c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2458,9 +2458,9 @@ checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45"
 
 [[package]]
 name = "is_debug"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06d198e9919d9822d5f7083ba8530e04de87841eaf21ead9af8f2304efd57c89"
+checksum = "e8ea828c9d6638a5bd3d8b14e37502b4d56cae910ccf8a5b7f51c7a0eb1d0508"
 
 [[package]]
 name = "is_executable"
@@ -6292,9 +6292,9 @@ dependencies = [
 
 [[package]]
 name = "shadow-rs"
-version = "0.36.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58cfcd0643497a9f780502063aecbcc4a3212cbe4948fd25ee8fd179c2cf9a18"
+checksum = "974eb8222c62a8588bc0f02794dd1ba5b60b3ec88b58e050729d0907ed6af610"
 dependencies = [
  "const_format",
  "is_debug",
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index 00ba449785..95bf4dd342 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -21,10 +21,10 @@ nu-protocol = { path = "../nu-protocol", version = "0.100.1", default-features =
 nu-utils = { path = "../nu-utils", version = "0.100.1", default-features = false }
 
 itertools = { workspace = true }
-shadow-rs = { version = "0.36", default-features = false }
+shadow-rs = { version = "0.37", default-features = false }
 
 [build-dependencies]
-shadow-rs = { version = "0.36", default-features = false }
+shadow-rs = { version = "0.37", default-features = false }
 
 [features]
 default = ["os"]
@@ -42,4 +42,4 @@ mimalloc = []
 trash-support = []
 sqlite = []
 static-link-openssl = []
-system-clipboard = []
\ No newline at end of file
+system-clipboard = []
diff --git a/crates/nu-cmd-lang/build.rs b/crates/nu-cmd-lang/build.rs
index 0d49abde0b..8f2339bae3 100644
--- a/crates/nu-cmd-lang/build.rs
+++ b/crates/nu-cmd-lang/build.rs
@@ -1,12 +1,13 @@
 use std::process::Command;
 
-fn main() -> shadow_rs::SdResult<()> {
+fn main() {
     // Look up the current Git commit ourselves instead of relying on shadow_rs,
     // because shadow_rs does it in a really slow-to-compile way (it builds libgit2)
     let hash = get_git_hash().unwrap_or_default();
     println!("cargo:rustc-env=NU_COMMIT_HASH={hash}");
-
-    shadow_rs::new()
+    shadow_rs::ShadowBuilder::builder()
+        .build()
+        .expect("shadow builder build should success");
 }
 
 fn get_git_hash() -> Option<String> {

From e26364f8853145d5288ce5bbf88e7ed4f18040ae Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Thu, 19 Dec 2024 00:45:54 +0800
Subject: [PATCH 0817/1072] Remove `-a/-all` flag in du. (#14618)

Just noticed that I forget to remove `-a/-all` flag in `du`'s signature
in #14407

This pr is going to remove it
---
 crates/nu-command/src/filesystem/du.rs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/crates/nu-command/src/filesystem/du.rs b/crates/nu-command/src/filesystem/du.rs
index 15dc0d78d6..f90af2f8ad 100644
--- a/crates/nu-command/src/filesystem/du.rs
+++ b/crates/nu-command/src/filesystem/du.rs
@@ -39,11 +39,6 @@ impl Command for Du {
                 SyntaxShape::OneOf(vec![SyntaxShape::GlobPattern, SyntaxShape::String]),
                 "Starting directory.",
             )
-            .switch(
-                "all",
-                "Output file sizes as well as directory sizes",
-                Some('a'),
-            )
             .switch(
                 "deref",
                 "Dereference symlinks to their targets for size",

From 8f4feeb119bb7aee2df532be395621fa9fcfe6d8 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Wed, 18 Dec 2024 15:50:16 -0600
Subject: [PATCH 0818/1072] add `config flatten` command (#14621)

# Description

This is supposed to be a Quality-of-Life command that just makes some
things easier when dealing with a nushell config. Really all it does is
show you the current config in a flattened state. That's it. I was
thinking this could be useful when comparing config settings between old
and new config files. There are still room for improvements. For
instance, closures are listed as an int. They can be updated with a
`view source <int>` pipeline but that could all be built in too.


![image](https://github.com/user-attachments/assets/5d8981a3-8d03-4eb3-8361-2f3c3c560660)

The command works by getting the current configuration, serializing it
to json, then flattening that json. BTW, there's a new flatten_json.rs
in nu-utils. Theoretically all this mess could be done in a custom
command script, but it's proven to be exceedingly difficult based on the
work from discord.

Here's some more complex items to flatten.

![image](https://github.com/user-attachments/assets/b44e2ec8-cf17-41c4-bf8d-7f26317db071)

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock                                    |   1 +
 crates/nu-command/src/default_context.rs      |   1 +
 .../src/env/config/config_flatten.rs          | 150 +++++++++++
 crates/nu-command/src/env/config/config_nu.rs |   1 -
 crates/nu-command/src/env/config/mod.rs       |   3 +
 crates/nu-command/src/env/mod.rs              |   1 +
 crates/nu-utils/Cargo.toml                    |   3 +-
 crates/nu-utils/src/flatten_json.rs           | 247 ++++++++++++++++++
 crates/nu-utils/src/lib.rs                    |   2 +
 9 files changed, 407 insertions(+), 2 deletions(-)
 create mode 100644 crates/nu-command/src/env/config/config_flatten.rs
 create mode 100644 crates/nu-utils/src/flatten_json.rs

diff --git a/Cargo.lock b/Cargo.lock
index 9cc6b8c04c..c2170445a6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3736,6 +3736,7 @@ dependencies = [
  "nix 0.29.0",
  "num-format",
  "serde",
+ "serde_json",
  "strip-ansi-escapes",
  "sys-locale",
  "unicase",
diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index 3612c963c8..bcff06b5e8 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -351,6 +351,7 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             WithEnv,
             ConfigNu,
             ConfigEnv,
+            ConfigFlatten,
             ConfigMeta,
             ConfigReset,
         };
diff --git a/crates/nu-command/src/env/config/config_flatten.rs b/crates/nu-command/src/env/config/config_flatten.rs
new file mode 100644
index 0000000000..3d27f02def
--- /dev/null
+++ b/crates/nu-command/src/env/config/config_flatten.rs
@@ -0,0 +1,150 @@
+use nu_engine::command_prelude::*;
+use nu_utils::JsonFlattener; // Ensure this import is present // Ensure this import is present
+
+#[derive(Clone)]
+pub struct ConfigFlatten;
+
+impl Command for ConfigFlatten {
+    fn name(&self) -> &str {
+        "config flatten"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .category(Category::Debug)
+            .input_output_types(vec![(Type::Nothing, Type::record())])
+    }
+
+    fn description(&self) -> &str {
+        "Show the current configuration in a flattened form."
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![Example {
+            description: "Show the current configuration in a flattened form",
+            example: "config flatten",
+            result: None,
+        }]
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        _stack: &mut Stack,
+        call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        // Get the Config instance from the EngineState
+        let config = engine_state.get_config();
+        // Serialize the Config instance to JSON
+        let serialized_config =
+            serde_json::to_value(&**config).map_err(|err| ShellError::GenericError {
+                error: format!("Failed to serialize config to json: {err}"),
+                msg: "".into(),
+                span: Some(call.head),
+                help: None,
+                inner: vec![],
+            })?;
+        // Create a JsonFlattener instance with appropriate arguments
+        let flattener = JsonFlattener {
+            separator: ".",
+            alt_array_flattening: false,
+            preserve_arrays: true,
+        };
+        // Flatten the JSON value
+        let flattened_config_str = flattener.flatten(&serialized_config).to_string();
+        let flattened_values = convert_string_to_value(&flattened_config_str, call.head)?;
+
+        Ok(flattened_values.into_pipeline_data())
+    }
+}
+
+// From here below is taken from `from json`. Would be nice to have a nu-utils-value crate that could be shared
+fn convert_string_to_value(string_input: &str, span: Span) -> Result<Value, ShellError> {
+    match nu_json::from_str(string_input) {
+        Ok(value) => Ok(convert_nujson_to_value(value, span)),
+
+        Err(x) => match x {
+            nu_json::Error::Syntax(_, row, col) => {
+                let label = x.to_string();
+                let label_span = convert_row_column_to_span(row, col, string_input);
+                Err(ShellError::GenericError {
+                    error: "Error while parsing JSON text".into(),
+                    msg: "error parsing JSON text".into(),
+                    span: Some(span),
+                    help: None,
+                    inner: vec![ShellError::OutsideSpannedLabeledError {
+                        src: string_input.into(),
+                        error: "Error while parsing JSON text".into(),
+                        msg: label,
+                        span: label_span,
+                    }],
+                })
+            }
+            x => Err(ShellError::CantConvert {
+                to_type: format!("structured json data ({x})"),
+                from_type: "string".into(),
+                span,
+                help: None,
+            }),
+        },
+    }
+}
+
+fn convert_nujson_to_value(value: nu_json::Value, span: Span) -> Value {
+    match value {
+        nu_json::Value::Array(array) => Value::list(
+            array
+                .into_iter()
+                .map(|x| convert_nujson_to_value(x, span))
+                .collect(),
+            span,
+        ),
+        nu_json::Value::Bool(b) => Value::bool(b, span),
+        nu_json::Value::F64(f) => Value::float(f, span),
+        nu_json::Value::I64(i) => Value::int(i, span),
+        nu_json::Value::Null => Value::nothing(span),
+        nu_json::Value::Object(k) => Value::record(
+            k.into_iter()
+                .map(|(k, v)| (k, convert_nujson_to_value(v, span)))
+                .collect(),
+            span,
+        ),
+        nu_json::Value::U64(u) => {
+            if u > i64::MAX as u64 {
+                Value::error(
+                    ShellError::CantConvert {
+                        to_type: "i64 sized integer".into(),
+                        from_type: "value larger than i64".into(),
+                        span,
+                        help: None,
+                    },
+                    span,
+                )
+            } else {
+                Value::int(u as i64, span)
+            }
+        }
+        nu_json::Value::String(s) => Value::string(s, span),
+    }
+}
+
+// Converts row+column to a Span, assuming bytes (1-based rows)
+fn convert_row_column_to_span(row: usize, col: usize, contents: &str) -> Span {
+    let mut cur_row = 1;
+    let mut cur_col = 1;
+
+    for (offset, curr_byte) in contents.bytes().enumerate() {
+        if curr_byte == b'\n' {
+            cur_row += 1;
+            cur_col = 1;
+        }
+        if cur_row >= row && cur_col >= col {
+            return Span::new(offset, offset);
+        } else {
+            cur_col += 1;
+        }
+    }
+
+    Span::new(contents.len(), contents.len())
+}
diff --git a/crates/nu-command/src/env/config/config_nu.rs b/crates/nu-command/src/env/config/config_nu.rs
index 66e24e2a94..5295fe5247 100644
--- a/crates/nu-command/src/env/config/config_nu.rs
+++ b/crates/nu-command/src/env/config/config_nu.rs
@@ -22,7 +22,6 @@ impl Command for ConfigNu {
                 "Print a commented `config.nu` with documentation instead.",
                 Some('s'),
             )
-        // TODO: Signature narrower than what run actually supports theoretically
     }
 
     fn description(&self) -> &str {
diff --git a/crates/nu-command/src/env/config/mod.rs b/crates/nu-command/src/env/config/mod.rs
index fa6a3b4ca3..d596eb57b9 100644
--- a/crates/nu-command/src/env/config/mod.rs
+++ b/crates/nu-command/src/env/config/mod.rs
@@ -1,8 +1,11 @@
 mod config_;
 mod config_env;
+mod config_flatten;
 mod config_nu;
 mod config_reset;
+
 pub use config_::ConfigMeta;
 pub use config_env::ConfigEnv;
+pub use config_flatten::ConfigFlatten;
 pub use config_nu::ConfigNu;
 pub use config_reset::ConfigReset;
diff --git a/crates/nu-command/src/env/mod.rs b/crates/nu-command/src/env/mod.rs
index 2a72df5029..3f9312ed13 100644
--- a/crates/nu-command/src/env/mod.rs
+++ b/crates/nu-command/src/env/mod.rs
@@ -5,6 +5,7 @@ mod source_env;
 mod with_env;
 
 pub use config::ConfigEnv;
+pub use config::ConfigFlatten;
 pub use config::ConfigMeta;
 pub use config::ConfigNu;
 pub use config::ConfigReset;
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index 309f5f3139..1e6194104b 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -24,6 +24,7 @@ log = { workspace = true }
 num-format = { workspace = true }
 strip-ansi-escapes = { workspace = true }
 serde = { workspace = true }
+serde_json = { workspace = true }
 sys-locale = "0.3"
 unicase = "2.8.0"
 
@@ -38,4 +39,4 @@ crossterm_winapi = "0.9"
 nix = { workspace = true, default-features = false, features = ["user", "fs"] }
 
 [lints]
-workspace = true
\ No newline at end of file
+workspace = true
diff --git a/crates/nu-utils/src/flatten_json.rs b/crates/nu-utils/src/flatten_json.rs
new file mode 100644
index 0000000000..31972d14eb
--- /dev/null
+++ b/crates/nu-utils/src/flatten_json.rs
@@ -0,0 +1,247 @@
+use serde_json::{json, Map, Value as SerdeValue};
+
+/// JsonFlattener is the main driver when flattening JSON
+/// # Examples
+/// ```
+/// use nu_utils;
+///
+/// let flattener = nu_utils::JsonFlattener { ..Default::default() };
+/// ```
+pub struct JsonFlattener<'a> {
+    /// Alternate separator used between keys when flattening
+    /// # Examples
+    /// ```
+    /// use nu_utils;
+    /// let flattener = nu_utils::JsonFlattener { separator: "_", ..Default::default()};
+    /// ```
+    pub separator: &'a str,
+    /// Opinionated flattening format that places values in an array if the object is nested inside an array
+    /// # Examples
+    /// ```
+    /// use nu_utils;
+    /// let flattener = nu_utils::JsonFlattener { alt_array_flattening: true, ..Default::default()};
+    /// ```
+    pub alt_array_flattening: bool,
+    /// Completely flatten JSON and keep array structure in the key when flattening
+    /// # Examples
+    /// ```
+    /// use nu_utils;
+    /// let flattener = nu_utils::JsonFlattener { preserve_arrays: true, ..Default::default()};
+    /// ```
+    pub preserve_arrays: bool,
+}
+
+impl<'a> Default for JsonFlattener<'a> {
+    fn default() -> Self {
+        JsonFlattener {
+            separator: ".",
+            alt_array_flattening: false,
+            preserve_arrays: false,
+        }
+    }
+}
+
+/// This implementation defines the core usage for the `JsonFlattener` structure.
+/// # Examples
+/// ```
+/// use nu_utils;
+/// use serde_json::json;
+///
+/// let flattener = nu_utils::JsonFlattener::new();
+/// let example = json!({
+///     "a": {
+///         "b": "c"
+///     }
+///  });
+///
+/// let flattened_example = flattener.flatten(&example);
+/// ```
+impl<'a> JsonFlattener<'a> {
+    /// Returns a flattener with the default arguments
+    /// # Examples
+    /// ```
+    /// use nu_utils;
+    ///
+    /// let flattener = nu_utils::JsonFlattener::new();
+    /// ```
+    pub fn new() -> Self {
+        JsonFlattener {
+            ..Default::default()
+        }
+    }
+
+    /// Flattens JSON variants into a JSON object
+    ///
+    /// # Arguments
+    ///
+    /// * `json` - A serde_json Value to flatten
+    ///
+    /// # Examples
+    /// ```
+    /// use nu_utils;
+    /// use serde_json::json;
+    ///
+    /// let flattener = nu_utils::JsonFlattener::new();
+    /// let example = json!({
+    ///     "name": "John Doe",
+    ///     "age": 43,
+    ///     "address": {
+    ///         "street": "10 Downing Street",
+    ///         "city": "London"
+    ///     },
+    ///     "phones": [
+    ///         "+44 1234567",
+    ///         "+44 2345678"
+    ///     ]
+    ///  });
+    ///
+    /// let flattened_example = flattener.flatten(&example);
+    /// ```
+    pub fn flatten(&self, json: &SerdeValue) -> SerdeValue {
+        let mut flattened_val = Map::<String, SerdeValue>::new();
+        match json {
+            SerdeValue::Array(obj_arr) => {
+                self.flatten_array(&mut flattened_val, &"".to_string(), obj_arr)
+            }
+            SerdeValue::Object(obj_val) => {
+                self.flatten_object(&mut flattened_val, None, obj_val, false)
+            }
+            _ => self.flatten_value(&mut flattened_val, &"".to_string(), json, false),
+        }
+        SerdeValue::Object(flattened_val)
+    }
+
+    fn flatten_object(
+        &self,
+        builder: &mut Map<String, SerdeValue>,
+        identifier: Option<&String>,
+        obj: &Map<String, SerdeValue>,
+        arr: bool,
+    ) {
+        for (k, v) in obj {
+            let expanded_identifier = identifier.map_or_else(
+                || k.clone(),
+                |identifier| format!("{identifier}{}{k}", self.separator),
+            );
+
+            if expanded_identifier.contains("span.start")
+                || expanded_identifier.contains("span.end")
+            {
+                continue;
+            }
+
+            let expanded_identifier = self.filter_known_keys(&expanded_identifier);
+
+            match v {
+                SerdeValue::Object(obj_val) => {
+                    self.flatten_object(builder, Some(&expanded_identifier), obj_val, arr)
+                }
+                SerdeValue::Array(obj_arr) => {
+                    self.flatten_array(builder, &expanded_identifier, obj_arr)
+                }
+                _ => self.flatten_value(builder, &expanded_identifier, v, arr),
+            }
+        }
+    }
+
+    fn flatten_array(
+        &self,
+        builder: &mut Map<String, SerdeValue>,
+        identifier: &String,
+        obj: &[SerdeValue],
+    ) {
+        for (k, v) in obj.iter().enumerate() {
+            let with_key = format!("{identifier}{}{k}", self.separator);
+            if with_key.contains("span.start") || with_key.contains("span.end") {
+                continue;
+            }
+
+            let with_key = self.filter_known_keys(&with_key);
+
+            match v {
+                SerdeValue::Object(obj_val) => self.flatten_object(
+                    builder,
+                    Some(if self.preserve_arrays {
+                        &with_key
+                    } else {
+                        identifier
+                    }),
+                    obj_val,
+                    self.alt_array_flattening,
+                ),
+                SerdeValue::Array(obj_arr) => self.flatten_array(
+                    builder,
+                    if self.preserve_arrays {
+                        &with_key
+                    } else {
+                        identifier
+                    },
+                    obj_arr,
+                ),
+                _ => self.flatten_value(
+                    builder,
+                    if self.preserve_arrays {
+                        &with_key
+                    } else {
+                        identifier
+                    },
+                    v,
+                    self.alt_array_flattening,
+                ),
+            }
+        }
+    }
+
+    fn flatten_value(
+        &self,
+        builder: &mut Map<String, SerdeValue>,
+        identifier: &String,
+        obj: &SerdeValue,
+        arr: bool,
+    ) {
+        if let Some(v) = builder.get_mut(identifier) {
+            if let Some(arr) = v.as_array_mut() {
+                arr.push(obj.clone());
+            } else {
+                let new_val = json!(vec![v, obj]);
+                builder.remove(identifier);
+                builder.insert(identifier.to_string(), new_val);
+            }
+        } else {
+            builder.insert(
+                identifier.to_string(),
+                if arr {
+                    json!(vec![obj.clone()])
+                } else {
+                    obj.clone()
+                },
+            );
+        }
+    }
+
+    fn filter_known_keys(&self, key: &str) -> String {
+        let mut filtered_key = key.to_string();
+        if filtered_key.contains(".String.val") {
+            filtered_key = filtered_key.replace(".String.val", "");
+        }
+        if filtered_key.contains(".Record.val") {
+            filtered_key = filtered_key.replace(".Record.val", "");
+        }
+        if filtered_key.contains(".Closure.val") {
+            filtered_key = filtered_key.replace(".Closure.val", "");
+        }
+        if filtered_key.contains(".List.vals") {
+            filtered_key = filtered_key.replace(".List.vals", "");
+        }
+        if filtered_key.contains(".Int.val") {
+            filtered_key = filtered_key.replace(".Int.val", "");
+        }
+        if filtered_key.contains(".Bool.val") {
+            filtered_key = filtered_key.replace(".Bool.val", "");
+        }
+        if filtered_key.contains(".block_id") {
+            filtered_key = filtered_key.replace(".block_id", "");
+        }
+        filtered_key
+    }
+}
diff --git a/crates/nu-utils/src/lib.rs b/crates/nu-utils/src/lib.rs
index c43bda9a0e..117b6fc28b 100644
--- a/crates/nu-utils/src/lib.rs
+++ b/crates/nu-utils/src/lib.rs
@@ -3,6 +3,7 @@ mod casing;
 mod deansi;
 pub mod emoji;
 pub mod filesystem;
+pub mod flatten_json;
 pub mod locale;
 mod quoting;
 mod shared_cow;
@@ -20,6 +21,7 @@ pub use deansi::{
     strip_ansi_likely, strip_ansi_string_likely, strip_ansi_string_unlikely, strip_ansi_unlikely,
 };
 pub use emoji::contains_emoji;
+pub use flatten_json::JsonFlattener;
 pub use quoting::{escape_quote_string, needs_quoting};
 pub use shared_cow::SharedCow;
 

From 11375c19d2bb73971533b293e232cbd9ef5a025b Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Wed, 18 Dec 2024 16:19:49 -0600
Subject: [PATCH 0819/1072] better error handling for `view source` (#14624)

# Description

There is an opportunity to give a bogus block id to view source. This
makes it more resilient and not panic when an invalid block id is passed
in.


![image](https://github.com/user-attachments/assets/67ebbffc-be57-4ce3-8700-90f1ed080f9b)


# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/debug/view_source.rs | 26 ++++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/crates/nu-command/src/debug/view_source.rs b/crates/nu-command/src/debug/view_source.rs
index 2aadd4d361..c0003b5b09 100644
--- a/crates/nu-command/src/debug/view_source.rs
+++ b/crates/nu-command/src/debug/view_source.rs
@@ -34,21 +34,33 @@ impl Command for ViewSource {
 
         let source = match arg {
             Value::Int { val, .. } => {
-                let block = engine_state.get_block(nu_protocol::BlockId::new(val as usize));
-                if let Some(span) = block.span {
-                    let contents = engine_state.get_span_contents(span);
-                    Ok(Value::string(String::from_utf8_lossy(contents), call.head)
-                        .into_pipeline_data())
+                if let Some(block) =
+                    engine_state.try_get_block(nu_protocol::BlockId::new(val as usize))
+                {
+                    if let Some(span) = block.span {
+                        let contents = engine_state.get_span_contents(span);
+                        Ok(Value::string(String::from_utf8_lossy(contents), call.head)
+                            .into_pipeline_data())
+                    } else {
+                        Err(ShellError::GenericError {
+                            error: "Cannot view int value".to_string(),
+                            msg: "the block does not have a viewable span".to_string(),
+                            span: Some(arg_span),
+                            help: None,
+                            inner: vec![],
+                        })
+                    }
                 } else {
                     Err(ShellError::GenericError {
-                        error: "Cannot view int value".to_string(),
-                        msg: "the block does not have a viewable span".to_string(),
+                        error: format!("Block Id {} does not exist", arg.coerce_into_string()?),
+                        msg: "this number does not correspond to a block".to_string(),
                         span: Some(arg_span),
                         help: None,
                         inner: vec![],
                     })
                 }
             }
+
             Value::String { val, .. } => {
                 if let Some(decl_id) = engine_state.find_decl(val.as_bytes(), &[]) {
                     // arg is a command

From bf8763fc11ec0ec9ebee51c143484e11329d43ed Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Wed, 18 Dec 2024 20:43:26 -0500
Subject: [PATCH 0820/1072] Add shape_garbage (#14626)

# Description

Adds `$env.config.color_config.shape_garbage` to the default config so
that it is populated out of the box.

Thanks to @PerchunPak for finding that it was missing.

# User-Facing Changes

I think this is useful on two levels, but it will be a change for a lot
of users:

1. Accessing it won't generate an error out-of-the-box
2. Garbage errors are highlighted in reverse-red in real-time in the
REPL. This means that, for example, typing just a `$` will start out as
an error - Once a valid variable (e.g., `$env`) is completed, then the
highlight will change to the parsed shape.

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

N/A
---
 crates/nu-utils/src/default_files/default_config.nu | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/crates/nu-utils/src/default_files/default_config.nu b/crates/nu-utils/src/default_files/default_config.nu
index ce60d29663..2616598f44 100644
--- a/crates/nu-utils/src/default_files/default_config.nu
+++ b/crates/nu-utils/src/default_files/default_config.nu
@@ -60,4 +60,9 @@ $env.config.color_config = {
     shape_variable: purple
     shape_vardecl: purple
     shape_raw_string: light_purple
+    shape_garbage: {
+        fg: white
+        bg: red
+        attr: b
+    }
 }

From 4e8289d7bb2b2ade306673b452b69536d181da09 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Thu, 19 Dec 2024 09:34:06 -0500
Subject: [PATCH 0821/1072] Set `split-by` doc category to "deprecated"
 (#14633)

# Description

#14019 deprecated the `split-by` command. This sets its doc-category to
"deprecated" so that it will display that way in the in-shell and online
help

# User-Facing Changes

`split-by` will now show as a deprecated command in Help. Will also be
reported using:

```nushell
help commands | where category == deprecated
```

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

N/A
---
 crates/nu-command/src/filters/split_by.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-command/src/filters/split_by.rs b/crates/nu-command/src/filters/split_by.rs
index b42f0c820c..bbc87452af 100644
--- a/crates/nu-command/src/filters/split_by.rs
+++ b/crates/nu-command/src/filters/split_by.rs
@@ -14,7 +14,7 @@ impl Command for SplitBy {
         Signature::build("split-by")
             .input_output_types(vec![(Type::record(), Type::record())])
             .optional("splitter", SyntaxShape::Any, "The splitter value to use.")
-            .category(Category::Filters)
+            .category(Category::Deprecated)
     }
 
     fn description(&self) -> &str {

From 7029d24f4218f41a3a487ff7461a311cc88f09b9 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Thu, 19 Dec 2024 09:38:29 -0500
Subject: [PATCH 0822/1072] Add version info to startup banner (#14625)

# Description

Adds version info to the Startup Banner

# User-Facing Changes

## Before


![image](https://github.com/user-attachments/assets/de2a415f-1608-4d87-ab28-f3238cf532c3)

## After


![image](https://github.com/user-attachments/assets/db3f8419-0680-4a0b-9f09-8d9a273c4726)

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
-
# After Submitting

N/A
---
 crates/nu-std/std/core/mod.nu    | 2 ++
 crates/nu-std/tests/test_core.nu | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/nu-std/std/core/mod.nu b/crates/nu-std/std/core/mod.nu
index 2c4a863426..3a010c1fb3 100644
--- a/crates/nu-std/std/core/mod.nu
+++ b/crates/nu-std/std/core/mod.nu
@@ -3,12 +3,14 @@ use std/dt [datetime-diff, pretty-print-duration]
 # Print a banner for nushell with information about the project
 export def banner [] {
 let dt = (datetime-diff (date now) 2019-05-10T09:59:12-07:00)
+let ver = (version)
 
 let banner_msg = $"(ansi green)     __  ,(ansi reset)
 (ansi green) .--\(\)°'.' (ansi reset)Welcome to (ansi green)Nushell(ansi reset),
 (ansi green)'|, . ,'   (ansi reset)based on the (ansi green)nu(ansi reset) language,
 (ansi green) !_-\(_\\    (ansi reset)where all data is structured!
 
+Version: (ansi green)($ver.version) \(($ver.build_os)\)
 Please join our (ansi purple)Discord(ansi reset) community at (ansi purple)https://discord.gg/NtAbbGn(ansi reset)
 Our (ansi green_bold)GitHub(ansi reset) repository is at (ansi green_bold)https://github.com/nushell/nushell(ansi reset)
 Our (ansi green)Documentation(ansi reset) is located at (ansi green)https://nushell.sh(ansi reset)
diff --git a/crates/nu-std/tests/test_core.nu b/crates/nu-std/tests/test_core.nu
index eca7cddd61..654a1bcedf 100644
--- a/crates/nu-std/tests/test_core.nu
+++ b/crates/nu-std/tests/test_core.nu
@@ -3,5 +3,5 @@ use std/assert
 #[test]
 def banner [] {
     use std/core
-    assert ((core banner | lines | length) == 15)
+    assert ((core banner | lines | length) == 16)
 }

From f2e8c391a2262694131187c42dadd6920f933dd7 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 19 Dec 2024 08:43:49 -0600
Subject: [PATCH 0823/1072] lookup closures/blockids and get content in `config
 flatten` (#14635)

# Description

This PR continues to tweak `config flatten` by looking up the closures
and block_ids and extracts the content into the produced record.

Example

![image](https://github.com/user-attachments/assets/99a9db54-e477-40b2-8468-bbadcf0aa5b7)


# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 .../src/env/config/config_flatten.rs          | 59 ++++++++++++++++---
 crates/nu-utils/src/flatten_json.rs           | 14 +++--
 2 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/crates/nu-command/src/env/config/config_flatten.rs b/crates/nu-command/src/env/config/config_flatten.rs
index 3d27f02def..ee41897466 100644
--- a/crates/nu-command/src/env/config/config_flatten.rs
+++ b/crates/nu-command/src/env/config/config_flatten.rs
@@ -53,16 +53,21 @@ impl Command for ConfigFlatten {
         };
         // Flatten the JSON value
         let flattened_config_str = flattener.flatten(&serialized_config).to_string();
-        let flattened_values = convert_string_to_value(&flattened_config_str, call.head)?;
+        let flattened_values =
+            convert_string_to_value(&flattened_config_str, engine_state, call.head)?;
 
         Ok(flattened_values.into_pipeline_data())
     }
 }
 
 // From here below is taken from `from json`. Would be nice to have a nu-utils-value crate that could be shared
-fn convert_string_to_value(string_input: &str, span: Span) -> Result<Value, ShellError> {
+fn convert_string_to_value(
+    string_input: &str,
+    engine_state: &EngineState,
+    span: Span,
+) -> Result<Value, ShellError> {
     match nu_json::from_str(string_input) {
-        Ok(value) => Ok(convert_nujson_to_value(value, span)),
+        Ok(value) => Ok(convert_nujson_to_value(None, value, engine_state, span)),
 
         Err(x) => match x {
             nu_json::Error::Syntax(_, row, col) => {
@@ -91,22 +96,42 @@ fn convert_string_to_value(string_input: &str, span: Span) -> Result<Value, Shel
     }
 }
 
-fn convert_nujson_to_value(value: nu_json::Value, span: Span) -> Value {
+fn convert_nujson_to_value(
+    key: Option<String>,
+    value: nu_json::Value,
+    engine_state: &EngineState,
+    span: Span,
+) -> Value {
     match value {
         nu_json::Value::Array(array) => Value::list(
             array
                 .into_iter()
-                .map(|x| convert_nujson_to_value(x, span))
+                .map(|x| convert_nujson_to_value(key.clone(), x, engine_state, span))
                 .collect(),
             span,
         ),
         nu_json::Value::Bool(b) => Value::bool(b, span),
         nu_json::Value::F64(f) => Value::float(f, span),
-        nu_json::Value::I64(i) => Value::int(i, span),
+        nu_json::Value::I64(i) => {
+            if let Some(closure_str) = expand_closure(key.clone(), i, engine_state) {
+                Value::string(closure_str, span)
+            } else {
+                Value::int(i, span)
+            }
+        }
         nu_json::Value::Null => Value::nothing(span),
         nu_json::Value::Object(k) => Value::record(
             k.into_iter()
-                .map(|(k, v)| (k, convert_nujson_to_value(v, span)))
+                .map(|(k, v)| {
+                    let mut key = k.clone();
+                    // Keep .Closure.val and .block_id as part of the key during conversion to value
+                    let value = convert_nujson_to_value(Some(key.clone()), v, engine_state, span);
+                    // Replace .Closure.val and .block_id from the key after the conversion
+                    if key.contains(".Closure.val") || key.contains(".block_id") {
+                        key = key.replace(".Closure.val", "").replace(".block_id", "");
+                    }
+                    (key, value)
+                })
                 .collect(),
             span,
         ),
@@ -121,6 +146,8 @@ fn convert_nujson_to_value(value: nu_json::Value, span: Span) -> Value {
                     },
                     span,
                 )
+            } else if let Some(closure_str) = expand_closure(key.clone(), u as i64, engine_state) {
+                Value::string(closure_str, span)
             } else {
                 Value::int(u as i64, span)
             }
@@ -129,6 +156,24 @@ fn convert_nujson_to_value(value: nu_json::Value, span: Span) -> Value {
     }
 }
 
+// If the block_id is a real block id, then it should expand into the closure contents, otherwise return None
+fn expand_closure(
+    key: Option<String>,
+    block_id: i64,
+    engine_state: &EngineState,
+) -> Option<String> {
+    match key {
+        Some(key) if key.contains(".Closure.val") || key.contains(".block_id") => engine_state
+            .try_get_block(nu_protocol::BlockId::new(block_id as usize))
+            .and_then(|block| block.span)
+            .map(|span| {
+                let contents = engine_state.get_span_contents(span);
+                String::from_utf8_lossy(contents).to_string()
+            }),
+        _ => None,
+    }
+}
+
 // Converts row+column to a Span, assuming bytes (1-based rows)
 fn convert_row_column_to_span(row: usize, col: usize, contents: &str) -> Span {
     let mut cur_row = 1;
diff --git a/crates/nu-utils/src/flatten_json.rs b/crates/nu-utils/src/flatten_json.rs
index 31972d14eb..ed384db765 100644
--- a/crates/nu-utils/src/flatten_json.rs
+++ b/crates/nu-utils/src/flatten_json.rs
@@ -227,9 +227,6 @@ impl<'a> JsonFlattener<'a> {
         if filtered_key.contains(".Record.val") {
             filtered_key = filtered_key.replace(".Record.val", "");
         }
-        if filtered_key.contains(".Closure.val") {
-            filtered_key = filtered_key.replace(".Closure.val", "");
-        }
         if filtered_key.contains(".List.vals") {
             filtered_key = filtered_key.replace(".List.vals", "");
         }
@@ -239,9 +236,14 @@ impl<'a> JsonFlattener<'a> {
         if filtered_key.contains(".Bool.val") {
             filtered_key = filtered_key.replace(".Bool.val", "");
         }
-        if filtered_key.contains(".block_id") {
-            filtered_key = filtered_key.replace(".block_id", "");
-        }
+        // For now, let's skip replacing these because they tell us which
+        // numbers are closures and blocks which is useful for extracting the content
+        // if filtered_key.contains(".Closure.val") {
+        //     filtered_key = filtered_key.replace(".Closure.val", "");
+        // }
+        // if filtered_key.contains(".block_id") {
+        //     filtered_key = filtered_key.replace(".block_id", "");
+        // }
         filtered_key
     }
 }

From dc0ac8e91725bda11ada3daed6a97799e64d2fc5 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Thu, 19 Dec 2024 19:42:18 +0100
Subject: [PATCH 0824/1072] Remove `pub` on some command internals (#14636)

Stumbled over unnecessary `pub` `fn action` and `struct Arguments` when
reworking `into bits` in #14634

Stuff like this should be local until proven otherwise and then named
approrpiately.
---
 crates/nu-command/src/conversions/into/binary.rs   | 4 ++--
 crates/nu-command/src/conversions/into/filesize.rs | 2 +-
 crates/nu-command/src/platform/ansi/strip.rs       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/nu-command/src/conversions/into/binary.rs b/crates/nu-command/src/conversions/into/binary.rs
index fb549e50a7..3993f65d19 100644
--- a/crates/nu-command/src/conversions/into/binary.rs
+++ b/crates/nu-command/src/conversions/into/binary.rs
@@ -1,7 +1,7 @@
 use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
 
-pub struct Arguments {
+struct Arguments {
     cell_paths: Option<Vec<CellPath>>,
     compact: bool,
 }
@@ -142,7 +142,7 @@ fn into_binary(
     }
 }
 
-pub fn action(input: &Value, _args: &Arguments, span: Span) -> Value {
+fn action(input: &Value, _args: &Arguments, span: Span) -> Value {
     let value = match input {
         Value::Binary { .. } => input.clone(),
         Value::Int { val, .. } => Value::binary(val.to_ne_bytes().to_vec(), span),
diff --git a/crates/nu-command/src/conversions/into/filesize.rs b/crates/nu-command/src/conversions/into/filesize.rs
index cfbdfc6f37..98b63597e7 100644
--- a/crates/nu-command/src/conversions/into/filesize.rs
+++ b/crates/nu-command/src/conversions/into/filesize.rs
@@ -116,7 +116,7 @@ impl Command for SubCommand {
     }
 }
 
-pub fn action(input: &Value, _args: &CellPathOnlyArgs, span: Span) -> Value {
+fn action(input: &Value, _args: &CellPathOnlyArgs, span: Span) -> Value {
     let value_span = input.span();
     match input {
         Value::Filesize { .. } => input.clone(),
diff --git a/crates/nu-command/src/platform/ansi/strip.rs b/crates/nu-command/src/platform/ansi/strip.rs
index 5f172c5cdc..23063cff63 100644
--- a/crates/nu-command/src/platform/ansi/strip.rs
+++ b/crates/nu-command/src/platform/ansi/strip.rs
@@ -4,7 +4,7 @@ use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
 use nu_protocol::Config;
 
-pub struct Arguments {
+struct Arguments {
     cell_paths: Option<Vec<CellPath>>,
     config: Arc<Config>,
 }

From b48f50f018c3b15f6b8bfda92a84865144136ee7 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Thu, 19 Dec 2024 20:21:52 +0100
Subject: [PATCH 0825/1072] Remove unused `sample_login.nu` file (#14632)

This file is not made accessible to the user through any of our `config`
commands.
Thus I discussed with Douglas to delete it, to ensure it doesn't go out
of date (the version added with #14601 was not yet part of the bumping
script)

All the necessary information on how to setup a `login.nu` file is
provided in the website documentation
---
 crates/nu-utils/src/default_files/README.md       |  4 ----
 crates/nu-utils/src/default_files/sample_login.nu | 12 ------------
 2 files changed, 16 deletions(-)
 delete mode 100644 crates/nu-utils/src/default_files/sample_login.nu

diff --git a/crates/nu-utils/src/default_files/README.md b/crates/nu-utils/src/default_files/README.md
index 926870d20a..105eff773e 100644
--- a/crates/nu-utils/src/default_files/README.md
+++ b/crates/nu-utils/src/default_files/README.md
@@ -70,7 +70,3 @@ Counterpart to `scaffold_env.nu`.
 * This file is used *one-time* (typically) at **first** startup
 * If the `$nu.default-config-path` directory does not exist, the directory is created and then both `scaffold_env.nu` and `scaffold_config.nu` are written to it
 * Contains only commented lines explaining the purpose of the file to the user, along with information on the `config nu` command.
-
-## `sample_login.nu`
-
-This file is not used by any Nushell code. Of course, if the user has a `login.nu`, then it will be evaluated during startup of a login shell.
\ No newline at end of file
diff --git a/crates/nu-utils/src/default_files/sample_login.nu b/crates/nu-utils/src/default_files/sample_login.nu
deleted file mode 100644
index 511e3b803c..0000000000
--- a/crates/nu-utils/src/default_files/sample_login.nu
+++ /dev/null
@@ -1,12 +0,0 @@
-# Example Nushell Loginshell Config File
-#
-# version = "0.100.1"
-#
-# - has to be as login.nu in the default config directory
-# - will be sourced after config.nu and env.nu in case of nushell started as login shell
-
-# just as an example for overwriting of an environment variable of env.nu
-$env.PROMPT_INDICATOR = {|| "(LS)> " }
-
-# Similar to env-path and config-path there is a variable containing the path to login.nu
-echo $nu.loginshell-path

From 02fc844e40179909760a31c4ebd12bf5ea354e73 Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Fri, 20 Dec 2024 00:15:27 +0100
Subject: [PATCH 0826/1072] Fix `commands::network::http::*::*_timeout` tests
 on non-english system (#14640)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
I had issues with the following tests:
- `commands::network::http::delete::http_delete_timeout`
- `commands::network::http::get::http_get_timeout`
- `commands::network::http::options::http_options_timeout`
- `commands::network::http::patch::http_patch_timeout`
- `commands::network::http::post::http_post_timeout`
- `commands::network::http::put::http_put_timeout`

I checked what the actual issue was and my problem was that the tested
string `"did not properly respond after a period of time"` wasn't in the
actual error. This happened because my german Windows would return a
german error message which obviosly did not include that string. To fix
that I replaced the string check with the os error code that is also
part of the error message which should be language agnostic. (I hope.)

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

None.

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

\o/

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 .../nu-command/tests/commands/network/http/delete.rs  |  4 +---
 crates/nu-command/tests/commands/network/http/get.rs  |  4 +---
 crates/nu-command/tests/commands/network/http/mod.rs  | 11 +++++++++++
 .../nu-command/tests/commands/network/http/options.rs |  4 +---
 .../nu-command/tests/commands/network/http/patch.rs   |  4 +---
 crates/nu-command/tests/commands/network/http/post.rs |  4 +---
 crates/nu-command/tests/commands/network/http/put.rs  |  4 +---
 7 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/crates/nu-command/tests/commands/network/http/delete.rs b/crates/nu-command/tests/commands/network/http/delete.rs
index ac79a4fe62..ec466944de 100644
--- a/crates/nu-command/tests/commands/network/http/delete.rs
+++ b/crates/nu-command/tests/commands/network/http/delete.rs
@@ -145,7 +145,5 @@ fn http_delete_timeout() {
     #[cfg(not(target_os = "windows"))]
     assert!(&actual.err.contains("timed out reading response"));
     #[cfg(target_os = "windows")]
-    assert!(&actual
-        .err
-        .contains("did not properly respond after a period of time"));
+    assert!(&actual.err.contains(super::WINDOWS_ERROR_TIMEOUT_SLOW_LINK));
 }
diff --git a/crates/nu-command/tests/commands/network/http/get.rs b/crates/nu-command/tests/commands/network/http/get.rs
index 87b6b93388..a4245ee4db 100644
--- a/crates/nu-command/tests/commands/network/http/get.rs
+++ b/crates/nu-command/tests/commands/network/http/get.rs
@@ -339,7 +339,5 @@ fn http_get_timeout() {
     #[cfg(not(target_os = "windows"))]
     assert!(&actual.err.contains("timed out reading response"));
     #[cfg(target_os = "windows")]
-    assert!(&actual
-        .err
-        .contains("did not properly respond after a period of time"));
+    assert!(&actual.err.contains(super::WINDOWS_ERROR_TIMEOUT_SLOW_LINK));
 }
diff --git a/crates/nu-command/tests/commands/network/http/mod.rs b/crates/nu-command/tests/commands/network/http/mod.rs
index 4a96a9c5ea..07a042f674 100644
--- a/crates/nu-command/tests/commands/network/http/mod.rs
+++ b/crates/nu-command/tests/commands/network/http/mod.rs
@@ -5,3 +5,14 @@ mod options;
 mod patch;
 mod post;
 mod put;
+
+/// String representation of the Windows error code for timeouts on slow links.
+///
+/// Use this constant in tests instead of matching partial error message content,
+/// such as `"did not properly respond after a period of time"`, which can vary by language.
+/// The specific string `"(os error 10060)"` is consistent across all locales, as it represents
+/// the raw error code rather than localized text.
+///
+/// For more details, see the [Microsoft docs](https://learn.microsoft.com/en-us/troubleshoot/windows-client/networking/10060-connection-timed-out-with-proxy-server).
+#[cfg(all(test, windows))]
+const WINDOWS_ERROR_TIMEOUT_SLOW_LINK: &str = "(os error 10060)";
diff --git a/crates/nu-command/tests/commands/network/http/options.rs b/crates/nu-command/tests/commands/network/http/options.rs
index b1478b4ecc..cbe9c7bd8e 100644
--- a/crates/nu-command/tests/commands/network/http/options.rs
+++ b/crates/nu-command/tests/commands/network/http/options.rs
@@ -64,7 +64,5 @@ fn http_options_timeout() {
     #[cfg(not(target_os = "windows"))]
     assert!(&actual.err.contains("timed out reading response"));
     #[cfg(target_os = "windows")]
-    assert!(&actual
-        .err
-        .contains("did not properly respond after a period of time"));
+    assert!(&actual.err.contains(super::WINDOWS_ERROR_TIMEOUT_SLOW_LINK));
 }
diff --git a/crates/nu-command/tests/commands/network/http/patch.rs b/crates/nu-command/tests/commands/network/http/patch.rs
index 90788f6769..660f335864 100644
--- a/crates/nu-command/tests/commands/network/http/patch.rs
+++ b/crates/nu-command/tests/commands/network/http/patch.rs
@@ -189,7 +189,5 @@ fn http_patch_timeout() {
     #[cfg(not(target_os = "windows"))]
     assert!(&actual.err.contains("timed out reading response"));
     #[cfg(target_os = "windows")]
-    assert!(&actual
-        .err
-        .contains("did not properly respond after a period of time"));
+    assert!(&actual.err.contains(super::WINDOWS_ERROR_TIMEOUT_SLOW_LINK));
 }
diff --git a/crates/nu-command/tests/commands/network/http/post.rs b/crates/nu-command/tests/commands/network/http/post.rs
index 2b238573fa..99ef44acaf 100644
--- a/crates/nu-command/tests/commands/network/http/post.rs
+++ b/crates/nu-command/tests/commands/network/http/post.rs
@@ -303,7 +303,5 @@ fn http_post_timeout() {
     #[cfg(not(target_os = "windows"))]
     assert!(&actual.err.contains("timed out reading response"));
     #[cfg(target_os = "windows")]
-    assert!(&actual
-        .err
-        .contains("did not properly respond after a period of time"));
+    assert!(&actual.err.contains(super::WINDOWS_ERROR_TIMEOUT_SLOW_LINK));
 }
diff --git a/crates/nu-command/tests/commands/network/http/put.rs b/crates/nu-command/tests/commands/network/http/put.rs
index 41a4bf7848..3f3bae3998 100644
--- a/crates/nu-command/tests/commands/network/http/put.rs
+++ b/crates/nu-command/tests/commands/network/http/put.rs
@@ -189,7 +189,5 @@ fn http_put_timeout() {
     #[cfg(not(target_os = "windows"))]
     assert!(&actual.err.contains("timed out reading response"));
     #[cfg(target_os = "windows")]
-    assert!(&actual
-        .err
-        .contains("did not properly respond after a period of time"));
+    assert!(&actual.err.contains(super::WINDOWS_ERROR_TIMEOUT_SLOW_LINK));
 }

From e0685315b4e605f046b5417d851f752ff31774d1 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 19 Dec 2024 17:26:21 -0600
Subject: [PATCH 0827/1072] tweaks to `config flatten` (#14639)

# Description

@maxim-uvarov found some bugs in the new `config flatten` command. This
PR should take care of what's been identified so far.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-utils/src/flatten_json.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/crates/nu-utils/src/flatten_json.rs b/crates/nu-utils/src/flatten_json.rs
index ed384db765..2614359faa 100644
--- a/crates/nu-utils/src/flatten_json.rs
+++ b/crates/nu-utils/src/flatten_json.rs
@@ -236,6 +236,16 @@ impl<'a> JsonFlattener<'a> {
         if filtered_key.contains(".Bool.val") {
             filtered_key = filtered_key.replace(".Bool.val", "");
         }
+        if filtered_key.contains(".Truncate.suffix") {
+            filtered_key = filtered_key.replace(".Truncate.suffix", ".truncating_suffix");
+        }
+        if filtered_key.contains(".RowCount") {
+            filtered_key = filtered_key.replace(".RowCount", "");
+        }
+        if filtered_key.contains(".Wrap.try_to_keep_words") {
+            filtered_key =
+                filtered_key.replace(".Wrap.try_to_keep_words", ".wrapping_try_keep_words");
+        }
         // For now, let's skip replacing these because they tell us which
         // numbers are closures and blocks which is useful for extracting the content
         // if filtered_key.contains(".Closure.val") {

From 039d0a685a765906bc8b76d4f9a71153f29eb885 Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Fri, 20 Dec 2024 20:47:02 +0800
Subject: [PATCH 0828/1072] Fix the document CI error for `polars profile`
 command (#14642)

# Description

Fix the docs repo CI build error here:
https://github.com/nushell/nushell.github.io/actions/runs/12425087184/job/34691291790#step:5:18

The doc generated by `make_docs.nu` for `polars profile` command will
make the CI build fail due to the indention error of markdown front
matters. I used to fix it manually before, for the long run, it's better
to fix it from the source code.
---
 .../src/dataframe/command/core/profile.rs                 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/profile.rs b/crates/nu_plugin_polars/src/dataframe/command/core/profile.rs
index c975e8d321..4b7684a5b4 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/profile.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/profile.rs
@@ -30,9 +30,13 @@ impl PluginCommand for ProfileDF {
     }
 
     fn description(&self) -> &str {
-        "Profile a lazy dataframe. This will run the query and return a record containing the materialized DataFrame and a DataFrame that contains profiling information of each node that is executed.
+        "Profile a lazy dataframe."
+    }
 
-The units of the timings are microseconds."
+    fn extra_description(&self) -> &str {
+        r#"This will run the query and return a record containing the materialized DataFrame and a DataFrame that contains profiling information of each node that is executed.
+
+The units of the timings are microseconds."#
     }
 
     fn examples(&self) -> Vec<Example> {

From 5139054325b2b33862d07009c8718be2da9121c3 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Sat, 21 Dec 2024 20:11:22 +0100
Subject: [PATCH 0829/1072] Pin reedline to 0.38.0 release (#14651)

---
 Cargo.lock | 5 +++--
 Cargo.toml | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c2170445a6..258d5f2032 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5581,8 +5581,9 @@ dependencies = [
 
 [[package]]
 name = "reedline"
-version = "0.37.0"
-source = "git+https://github.com/nushell/reedline?branch=main#9eb3c2dd1375119c7f6bb8ecac07b715e72fe692"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bfa8cb0ad84c396c936d8abb814703d7042a433d2da75a0c7060cbdc89109f3"
 dependencies = [
  "arboard",
  "chrono",
diff --git a/Cargo.toml b/Cargo.toml
index 97bc58c0bd..71e6688696 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -138,7 +138,7 @@ getrandom = "0.2" # pick same version that rand requires
 rand_chacha = "0.3.1"
 ratatui = "0.26"
 rayon = "1.10"
-reedline = "0.37.0"
+reedline = "0.38.0"
 regex = "1.9.5"
 rmp = "0.8"
 rmp-serde = "1.3"
@@ -321,7 +321,7 @@ 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`

From a8890d5cca7d1854813dd147d0ed2e7cd1e3f833 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Sat, 21 Dec 2024 15:09:46 -0800
Subject: [PATCH 0830/1072] Fix potential panic in `ls` (#14655)

# Description

Fixes a potential panic in `ls`.

# User-Facing Changes

Entries in the same directory are sorted first based on whether or not
they errored. Errors will be listed first, potentially stopping the
pipeline short.
---
 crates/nu-command/src/filesystem/ls.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/crates/nu-command/src/filesystem/ls.rs b/crates/nu-command/src/filesystem/ls.rs
index 1e9e66c96b..ef16199958 100644
--- a/crates/nu-command/src/filesystem/ls.rs
+++ b/crates/nu-command/src/filesystem/ls.rs
@@ -8,13 +8,12 @@ use nu_path::{expand_path_with, expand_to_real_path};
 use nu_protocol::{DataSource, NuGlob, PipelineMetadata, Signals};
 use pathdiff::diff_paths;
 use rayon::prelude::*;
-
 #[cfg(unix)]
 use std::os::unix::fs::PermissionsExt;
 use std::{
+    cmp::Ordering,
     path::PathBuf,
-    sync::mpsc,
-    sync::{Arc, Mutex},
+    sync::{mpsc, Arc, Mutex},
     time::{SystemTime, UNIX_EPOCH},
 };
 
@@ -970,10 +969,11 @@ fn read_dir(
         });
     if !use_threads {
         let mut collected = items.collect::<Vec<_>>();
-        collected.sort_by(|a, b| {
-            let a = a.as_ref().expect("path should be valid");
-            let b = b.as_ref().expect("path should be valid");
-            a.cmp(b)
+        collected.sort_by(|a, b| match (a, b) {
+            (Ok(a), Ok(b)) => a.cmp(b),
+            (Ok(_), Err(_)) => Ordering::Greater,
+            (Err(_), Ok(_)) => Ordering::Less,
+            (Err(_), Err(_)) => Ordering::Equal,
         });
         return Ok(Box::new(collected.into_iter()));
     }

From d99905b6047112dc22abf2200ec64a65a0451e42 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Sun, 22 Dec 2024 04:55:03 -0800
Subject: [PATCH 0831/1072] Make the `--no-newline` test use `--no-config-file`
 as well (#14654)

Just a quick change: the test I made for `--no-newline` was missing
`--no-config-file`, so it could false-negative if you have problems with
your config.
---
 tests/shell/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/shell/mod.rs b/tests/shell/mod.rs
index bedfe8304e..c2df76005b 100644
--- a/tests/shell/mod.rs
+++ b/tests/shell/mod.rs
@@ -274,7 +274,7 @@ fn run_in_noninteractive_mode() {
 #[test]
 fn run_with_no_newline() {
     let child_output = std::process::Command::new(nu_test_support::fs::executable_path())
-        .args(["--no-newline", "-c", "\"hello world\""])
+        .args(["-n", "--no-newline", "-c", "\"hello world\""])
         .output()
         .expect("failed to run nu");
 

From fb2610904997f54f50ad52095948bede81695f31 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Sun, 22 Dec 2024 15:10:19 +0100
Subject: [PATCH 0832/1072] Bump version for `0.101.0` release (#14631)

It's palindromic!
---
 Cargo.lock                                    | 74 +++++++++----------
 Cargo.toml                                    | 42 +++++------
 crates/nu-cli/Cargo.toml                      | 26 +++----
 crates/nu-cmd-base/Cargo.toml                 | 10 +--
 crates/nu-cmd-extra/Cargo.toml                | 22 +++---
 crates/nu-cmd-lang/Cargo.toml                 | 12 +--
 crates/nu-cmd-plugin/Cargo.toml               | 10 +--
 crates/nu-color-config/Cargo.toml             | 10 +--
 crates/nu-command/Cargo.toml                  | 36 ++++-----
 crates/nu-derive-value/Cargo.toml             |  2 +-
 crates/nu-engine/Cargo.toml                   | 12 +--
 crates/nu-explore/Cargo.toml                  | 20 ++---
 crates/nu-glob/Cargo.toml                     |  2 +-
 crates/nu-json/Cargo.toml                     |  6 +-
 crates/nu-lsp/Cargo.toml                      | 14 ++--
 crates/nu-parser/Cargo.toml                   | 12 +--
 crates/nu-path/Cargo.toml                     |  2 +-
 crates/nu-plugin-core/Cargo.toml              |  6 +-
 crates/nu-plugin-engine/Cargo.toml            | 14 ++--
 crates/nu-plugin-protocol/Cargo.toml          |  6 +-
 crates/nu-plugin-test-support/Cargo.toml      | 18 ++---
 crates/nu-plugin/Cargo.toml                   | 12 +--
 crates/nu-pretty-hex/Cargo.toml               |  2 +-
 crates/nu-protocol/Cargo.toml                 | 14 ++--
 crates/nu-std/Cargo.toml                      |  8 +-
 crates/nu-system/Cargo.toml                   |  2 +-
 crates/nu-table/Cargo.toml                    | 12 +--
 crates/nu-term-grid/Cargo.toml                |  4 +-
 crates/nu-test-support/Cargo.toml             |  8 +-
 crates/nu-utils/Cargo.toml                    |  4 +-
 .../src/default_files/default_config.nu       |  4 +-
 .../nu-utils/src/default_files/default_env.nu |  4 +-
 .../nu-utils/src/default_files/doc_config.nu  |  4 +-
 crates/nu-utils/src/default_files/doc_env.nu  |  4 +-
 .../src/default_files/scaffold_config.nu      |  4 +-
 .../src/default_files/scaffold_env.nu         |  4 +-
 crates/nu_plugin_custom_values/Cargo.toml     |  6 +-
 crates/nu_plugin_example/Cargo.toml           | 10 +--
 crates/nu_plugin_formats/Cargo.toml           |  8 +-
 crates/nu_plugin_gstat/Cargo.toml             |  6 +-
 crates/nu_plugin_inc/Cargo.toml               |  6 +-
 .../nu_plugin_nu_example.nu                   |  2 +-
 crates/nu_plugin_polars/Cargo.toml            | 22 +++---
 .../nu_plugin_python_example.py               |  2 +-
 crates/nu_plugin_query/Cargo.toml             |  6 +-
 crates/nu_plugin_stress_internals/Cargo.toml  |  2 +-
 crates/nuon/Cargo.toml                        | 10 +--
 47 files changed, 263 insertions(+), 263 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 258d5f2032..0398b714f7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3154,7 +3154,7 @@ dependencies = [
 
 [[package]]
 name = "nu"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "assert_cmd",
  "crossterm 0.28.1",
@@ -3209,7 +3209,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cli"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "chrono",
  "crossterm 0.28.1",
@@ -3243,7 +3243,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-base"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "indexmap",
  "miette",
@@ -3255,7 +3255,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-extra"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "fancy-regex",
  "heck 0.5.0",
@@ -3280,7 +3280,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-lang"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "itertools 0.13.0",
  "nu-engine",
@@ -3292,7 +3292,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-plugin"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "itertools 0.13.0",
  "nu-engine",
@@ -3303,7 +3303,7 @@ dependencies = [
 
 [[package]]
 name = "nu-color-config"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "nu-ansi-term",
  "nu-engine",
@@ -3315,7 +3315,7 @@ dependencies = [
 
 [[package]]
 name = "nu-command"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "alphanumeric-sort",
  "base64",
@@ -3427,7 +3427,7 @@ dependencies = [
 
 [[package]]
 name = "nu-derive-value"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "heck 0.5.0",
  "proc-macro-error",
@@ -3438,7 +3438,7 @@ dependencies = [
 
 [[package]]
 name = "nu-engine"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "log",
  "nu-glob",
@@ -3450,7 +3450,7 @@ dependencies = [
 
 [[package]]
 name = "nu-explore"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "ansi-str",
  "anyhow",
@@ -3474,14 +3474,14 @@ dependencies = [
 
 [[package]]
 name = "nu-glob"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "doc-comment",
 ]
 
 [[package]]
 name = "nu-json"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "fancy-regex",
  "linked-hash-map",
@@ -3494,7 +3494,7 @@ dependencies = [
 
 [[package]]
 name = "nu-lsp"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "assert-json-diff",
  "crossbeam-channel",
@@ -3515,7 +3515,7 @@ dependencies = [
 
 [[package]]
 name = "nu-parser"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "bytesize",
  "chrono",
@@ -3532,7 +3532,7 @@ dependencies = [
 
 [[package]]
 name = "nu-path"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "dirs",
  "omnipath",
@@ -3541,7 +3541,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "log",
  "nix 0.29.0",
@@ -3557,7 +3557,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-core"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "interprocess",
  "log",
@@ -3571,7 +3571,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-engine"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "log",
  "nu-engine",
@@ -3587,7 +3587,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-protocol"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "nu-protocol",
  "nu-utils",
@@ -3599,7 +3599,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-test-support"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "nu-ansi-term",
  "nu-cmd-lang",
@@ -3617,7 +3617,7 @@ dependencies = [
 
 [[package]]
 name = "nu-pretty-hex"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "heapless",
  "nu-ansi-term",
@@ -3626,7 +3626,7 @@ dependencies = [
 
 [[package]]
 name = "nu-protocol"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "brotli",
  "byte-unit",
@@ -3664,7 +3664,7 @@ dependencies = [
 
 [[package]]
 name = "nu-std"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "log",
  "miette",
@@ -3675,7 +3675,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "chrono",
  "itertools 0.13.0",
@@ -3692,7 +3692,7 @@ dependencies = [
 
 [[package]]
 name = "nu-table"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "fancy-regex",
  "nu-ansi-term",
@@ -3706,7 +3706,7 @@ dependencies = [
 
 [[package]]
 name = "nu-term-grid"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "nu-utils",
  "unicode-width 0.2.0",
@@ -3714,7 +3714,7 @@ dependencies = [
 
 [[package]]
 name = "nu-test-support"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -3726,7 +3726,7 @@ dependencies = [
 
 [[package]]
 name = "nu-utils"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "crossterm 0.28.1",
  "crossterm_winapi",
@@ -3755,7 +3755,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_example"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "nu-cmd-lang",
  "nu-plugin",
@@ -3765,7 +3765,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_formats"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "chrono",
  "eml-parser",
@@ -3780,7 +3780,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_gstat"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "git2",
  "nu-plugin",
@@ -3789,7 +3789,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_inc"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -3798,7 +3798,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_polars"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "chrono",
  "chrono-tz 0.10.0",
@@ -3833,7 +3833,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_query"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "gjson",
  "nu-plugin",
@@ -3848,7 +3848,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_stress_internals"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "interprocess",
  "serde",
@@ -3962,7 +3962,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "nuon"
-version = "0.100.1"
+version = "0.101.0"
 dependencies = [
  "chrono",
  "nu-engine",
diff --git a/Cargo.toml b/Cargo.toml
index 71e6688696..aed23a35e0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
 rust-version = "1.81.0"
-version = "0.100.1"
+version = "0.101.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -192,22 +192,22 @@ unchecked_duration_subtraction = "warn"
 workspace = true
 
 [dependencies]
-nu-cli = { path = "./crates/nu-cli", version = "0.100.1" }
-nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.100.1" }
-nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.100.1" }
-nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.100.1", optional = true }
-nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.100.1" }
-nu-command = { path = "./crates/nu-command", version = "0.100.1" }
-nu-engine = { path = "./crates/nu-engine", version = "0.100.1" }
-nu-explore = { path = "./crates/nu-explore", version = "0.100.1" }
-nu-lsp = { path = "./crates/nu-lsp/", version = "0.100.1" }
-nu-parser = { path = "./crates/nu-parser", version = "0.100.1" }
-nu-path = { path = "./crates/nu-path", version = "0.100.1" }
-nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.100.1" }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.100.1" }
-nu-std = { path = "./crates/nu-std", version = "0.100.1" }
-nu-system = { path = "./crates/nu-system", version = "0.100.1" }
-nu-utils = { path = "./crates/nu-utils", version = "0.100.1" }
+nu-cli = { path = "./crates/nu-cli", version = "0.101.0" }
+nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.101.0" }
+nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.101.0" }
+nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.101.0", optional = true }
+nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.101.0" }
+nu-command = { path = "./crates/nu-command", version = "0.101.0" }
+nu-engine = { path = "./crates/nu-engine", version = "0.101.0" }
+nu-explore = { path = "./crates/nu-explore", version = "0.101.0" }
+nu-lsp = { path = "./crates/nu-lsp/", version = "0.101.0" }
+nu-parser = { path = "./crates/nu-parser", version = "0.101.0" }
+nu-path = { path = "./crates/nu-path", version = "0.101.0" }
+nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.101.0" }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.101.0" }
+nu-std = { path = "./crates/nu-std", version = "0.101.0" }
+nu-system = { path = "./crates/nu-system", version = "0.101.0" }
+nu-utils = { path = "./crates/nu-utils", version = "0.101.0" }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
 crossterm = { workspace = true }
@@ -237,9 +237,9 @@ nix = { workspace = true, default-features = false, features = [
 ] }
 
 [dev-dependencies]
-nu-test-support = { path = "./crates/nu-test-support", version = "0.100.1" }
-nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.100.1" }
-nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.100.1" }
+nu-test-support = { path = "./crates/nu-test-support", version = "0.101.0" }
+nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.101.0" }
+nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.101.0" }
 assert_cmd = "2.0"
 dirs = { workspace = true }
 tango-bench = "0.6"
@@ -328,4 +328,4 @@ bench = false
 # Run individual benchmarks like `cargo bench -- <regex>` e.g. `cargo bench -- parse`
 [[bench]]
 name = "benchmarks"
-harness = false
+harness = false
\ No newline at end of file
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 993bb1ac72..41de627428 100644
--- 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.100.1"
+version = "0.101.0"
 
 [lib]
 bench = false
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.1" }
-nu-command = { path = "../nu-command", version = "0.100.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.100.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.0" }
+nu-command = { path = "../nu-command", version = "0.101.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.101.0" }
 rstest = { workspace = true, default-features = false }
 tempfile = { workspace = true }
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.100.1" }
-nu-engine = { path = "../nu-engine", version = "0.100.1", features = ["os"] }
-nu-path = { path = "../nu-path", version = "0.100.1" }
-nu-parser = { path = "../nu-parser", version = "0.100.1" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.100.1", optional = true }
-nu-protocol = { path = "../nu-protocol", version = "0.100.1", features = ["os"] }
-nu-utils = { path = "../nu-utils", version = "0.100.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.100.1" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.101.0" }
+nu-engine = { path = "../nu-engine", version = "0.101.0", features = ["os"] }
+nu-path = { path = "../nu-path", version = "0.101.0" }
+nu-parser = { path = "../nu-parser", version = "0.101.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.101.0", optional = true }
+nu-protocol = { path = "../nu-protocol", version = "0.101.0", features = ["os"] }
+nu-utils = { path = "../nu-utils", version = "0.101.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.101.0" }
 nu-ansi-term = { workspace = true }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
@@ -48,4 +48,4 @@ plugin = ["nu-plugin-engine"]
 system-clipboard = ["reedline/system_clipboard"]
 
 [lints]
-workspace = true
+workspace = true
\ No newline at end of file
diff --git a/crates/nu-cmd-base/Cargo.toml b/crates/nu-cmd-base/Cargo.toml
index fb36998bbd..f27b40d265 100644
--- a/crates/nu-cmd-base/Cargo.toml
+++ b/crates/nu-cmd-base/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-base"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-base"
-version = "0.100.1"
+version = "0.101.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,10 +13,10 @@ version = "0.100.1"
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.100.1", default-features = false }
-nu-parser = { path = "../nu-parser", version = "0.100.1" }
-nu-path = { path = "../nu-path", version = "0.100.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.1", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.101.0", default-features = false }
+nu-parser = { path = "../nu-parser", version = "0.101.0" }
+nu-path = { path = "../nu-path", version = "0.101.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.0", default-features = false }
 
 indexmap = { workspace = true }
 miette = { workspace = true }
diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml
index b54597f35a..e0560d7ec9 100644
--- 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.100.1"
+version = "0.101.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,13 +16,13 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.100.1" }
-nu-engine = { path = "../nu-engine", version = "0.100.1", default-features = false }
-nu-json = { version = "0.100.1", path = "../nu-json" }
-nu-parser = { path = "../nu-parser", version = "0.100.1" }
-nu-pretty-hex = { version = "0.100.1", path = "../nu-pretty-hex" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.1", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.100.1", default-features = false }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.101.0" }
+nu-engine = { path = "../nu-engine", version = "0.101.0", default-features = false }
+nu-json = { version = "0.101.0", path = "../nu-json" }
+nu-parser = { path = "../nu-parser", version = "0.101.0" }
+nu-pretty-hex = { version = "0.101.0", path = "../nu-pretty-hex" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.101.0", default-features = false }
 
 # Potential dependencies for extras
 heck = { workspace = true }
@@ -36,6 +36,6 @@ v_htmlescape = { workspace = true }
 itertools = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.1" }
-nu-command = { path = "../nu-command", version = "0.100.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.100.1" }
\ No newline at end of file
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.0" }
+nu-command = { path = "../nu-command", version = "0.101.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.101.0" }
\ No newline at end of file
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index 95bf4dd342..458d5ef774 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -6,7 +6,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-lang"
 edition = "2021"
 license = "MIT"
 name = "nu-cmd-lang"
-version = "0.100.1"
+version = "0.101.0"
 
 [lib]
 bench = false
@@ -15,10 +15,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.100.1", default-features = false }
-nu-parser = { path = "../nu-parser", version = "0.100.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.1", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.100.1", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.101.0", default-features = false }
+nu-parser = { path = "../nu-parser", version = "0.101.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.101.0", default-features = false }
 
 itertools = { workspace = true }
 shadow-rs = { version = "0.37", default-features = false }
@@ -42,4 +42,4 @@ mimalloc = []
 trash-support = []
 sqlite = []
 static-link-openssl = []
-system-clipboard = []
+system-clipboard = []
\ No newline at end of file
diff --git a/crates/nu-cmd-plugin/Cargo.toml b/crates/nu-cmd-plugin/Cargo.toml
index e5a9a61b1c..68c2f8091c 100644
--- a/crates/nu-cmd-plugin/Cargo.toml
+++ b/crates/nu-cmd-plugin/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-plugin"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-plugin"
-version = "0.100.1"
+version = "0.101.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,10 +13,10 @@ version = "0.100.1"
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.100.1" }
-nu-path = { path = "../nu-path", version = "0.100.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.1", features = ["plugin"] }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.100.1" }
+nu-engine = { path = "../nu-engine", version = "0.101.0" }
+nu-path = { path = "../nu-path", version = "0.101.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.0", features = ["plugin"] }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.101.0" }
 
 itertools = { workspace = true }
 
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index 19faec8e1b..67f4c6d620 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-color-confi
 edition = "2021"
 license = "MIT"
 name = "nu-color-config"
-version = "0.100.1"
+version = "0.101.0"
 
 [lib]
 bench = false
@@ -14,12 +14,12 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.100.1", default-features = false }
-nu-engine = { path = "../nu-engine", version = "0.100.1", default-features = false }
-nu-json = { path = "../nu-json", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.0", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.101.0", default-features = false }
+nu-json = { path = "../nu-json", version = "0.101.0" }
 nu-ansi-term = { workspace = true }
 
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.100.1" }
\ No newline at end of file
+nu-test-support = { path = "../nu-test-support", version = "0.101.0" }
\ No newline at end of file
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index ef88aa92e4..5c1911cdbd 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-command"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
-version = "0.100.1"
+version = "0.101.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,21 +16,21 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.100.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.100.1" }
-nu-engine = { path = "../nu-engine", version = "0.100.1", default-features = false }
-nu-glob = { path = "../nu-glob", version = "0.100.1" }
-nu-json = { path = "../nu-json", version = "0.100.1" }
-nu-parser = { path = "../nu-parser", version = "0.100.1" }
-nu-path = { path = "../nu-path", version = "0.100.1" }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.100.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.1", default-features = false }
-nu-system = { path = "../nu-system", version = "0.100.1" }
-nu-table = { path = "../nu-table", version = "0.100.1" }
-nu-term-grid = { path = "../nu-term-grid", version = "0.100.1" }
-nu-utils = { path = "../nu-utils", version = "0.100.1", default-features = false }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.101.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.101.0" }
+nu-engine = { path = "../nu-engine", version = "0.101.0", default-features = false }
+nu-glob = { path = "../nu-glob", version = "0.101.0" }
+nu-json = { path = "../nu-json", version = "0.101.0" }
+nu-parser = { path = "../nu-parser", version = "0.101.0" }
+nu-path = { path = "../nu-path", version = "0.101.0" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.101.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.0", default-features = false }
+nu-system = { path = "../nu-system", version = "0.101.0" }
+nu-table = { path = "../nu-table", version = "0.101.0" }
+nu-term-grid = { path = "../nu-term-grid", version = "0.101.0" }
+nu-utils = { path = "../nu-utils", version = "0.101.0", default-features = false }
 nu-ansi-term = { workspace = true }
-nuon = { path = "../nuon", version = "0.100.1" }
+nuon = { path = "../nuon", version = "0.101.0" }
 
 alphanumeric-sort = { workspace = true }
 base64 = { workspace = true }
@@ -187,8 +187,8 @@ sqlite = ["rusqlite"]
 trash-support = ["trash"]
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.100.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.101.0" }
 
 dirs = { workspace = true }
 mockito = { workspace = true, default-features = false }
@@ -197,4 +197,4 @@ quickcheck_macros = { workspace = true }
 rstest = { workspace = true, default-features = false }
 pretty_assertions = { workspace = true }
 tempfile = { workspace = true }
-rand_chacha = { workspace = true }
+rand_chacha = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-derive-value/Cargo.toml b/crates/nu-derive-value/Cargo.toml
index edb3709af9..4d0c714423 100644
--- a/crates/nu-derive-value/Cargo.toml
+++ b/crates/nu-derive-value/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-derive-value"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-derive-value"
-version = "0.100.1"
+version = "0.101.0"
 
 [lib]
 proc-macro = true
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index 38752422da..9ea6a1d046 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-engine"
 edition = "2021"
 license = "MIT"
 name = "nu-engine"
-version = "0.100.1"
+version = "0.101.0"
 
 [lib]
 bench = false
@@ -14,10 +14,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.100.1", default-features = false }
-nu-path = { path = "../nu-path", version = "0.100.1" }
-nu-glob = { path = "../nu-glob", version = "0.100.1" }
-nu-utils = { path = "../nu-utils", version = "0.100.1", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.101.0", default-features = false }
+nu-path = { path = "../nu-path", version = "0.101.0" }
+nu-glob = { path = "../nu-glob", version = "0.101.0" }
+nu-utils = { path = "../nu-utils", version = "0.101.0", default-features = false }
 log = { workspace = true }
 terminal_size = { workspace = true }
 
@@ -30,4 +30,4 @@ os = [
 plugin = [
   "nu-protocol/plugin",
   "os",
-]
+]
\ No newline at end of file
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index e201262750..5a32d56f73 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-explore"
 edition = "2021"
 license = "MIT"
 name = "nu-explore"
-version = "0.100.1"
+version = "0.101.0"
 
 [lib]
 bench = false
@@ -14,16 +14,16 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
-nu-parser = { path = "../nu-parser", version = "0.100.1" }
-nu-path = { path = "../nu-path", version = "0.100.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.100.1" }
-nu-engine = { path = "../nu-engine", version = "0.100.1" }
-nu-table = { path = "../nu-table", version = "0.100.1" }
-nu-json = { path = "../nu-json", version = "0.100.1" }
-nu-utils = { path = "../nu-utils", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.0" }
+nu-parser = { path = "../nu-parser", version = "0.101.0" }
+nu-path = { path = "../nu-path", version = "0.101.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.101.0" }
+nu-engine = { path = "../nu-engine", version = "0.101.0" }
+nu-table = { path = "../nu-table", version = "0.101.0" }
+nu-json = { path = "../nu-json", version = "0.101.0" }
+nu-utils = { path = "../nu-utils", version = "0.101.0" }
 nu-ansi-term = { workspace = true }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.100.1" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.101.0" }
 
 anyhow = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-glob/Cargo.toml b/crates/nu-glob/Cargo.toml
index 25265c805a..1593cab976 100644
--- a/crates/nu-glob/Cargo.toml
+++ b/crates/nu-glob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-glob"
-version = "0.100.1"
+version = "0.101.0"
 authors = ["The Nushell Project Developers", "The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 description = """
diff --git a/crates/nu-json/Cargo.toml b/crates/nu-json/Cargo.toml
index 507ae911df..1a1d4fc4ba 100644
--- a/crates/nu-json/Cargo.toml
+++ b/crates/nu-json/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-json"
 edition = "2021"
 license = "MIT"
 name = "nu-json"
-version = "0.100.1"
+version = "0.101.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -26,8 +26,8 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.100.1" }
-nu-path = { path = "../nu-path", version = "0.100.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.101.0" }
+nu-path = { path = "../nu-path", version = "0.101.0" }
 serde_json = "1.0"
 fancy-regex = "0.14.0"
 
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index 2798dc5182..20adefffd7 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -3,14 +3,14 @@ authors = ["The Nushell Project Developers"]
 description = "Nushell's integrated LSP server"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-lsp"
 name = "nu-lsp"
-version = "0.100.1"
+version = "0.101.0"
 edition = "2021"
 license = "MIT"
 
 [dependencies]
-nu-cli = { path = "../nu-cli", version = "0.100.1" }
-nu-parser = { path = "../nu-parser", version = "0.100.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
+nu-cli = { path = "../nu-cli", version = "0.101.0" }
+nu-parser = { path = "../nu-parser", version = "0.101.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.0" }
 
 reedline = { workspace = true }
 
@@ -23,9 +23,9 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.1" }
-nu-command = { path = "../nu-command", version = "0.100.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.100.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.0" }
+nu-command = { path = "../nu-command", version = "0.101.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.101.0" }
 
 assert-json-diff = "2.0"
 
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index 0c15a327e6..f35fb8abed 100644
--- a/crates/nu-parser/Cargo.toml
+++ b/crates/nu-parser/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-parser"
 edition = "2021"
 license = "MIT"
 name = "nu-parser"
-version = "0.100.1"
+version = "0.101.0"
 exclude = ["/fuzz"]
 
 [lib]
@@ -15,11 +15,11 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.100.1", default-features = false }
-nu-path = { path = "../nu-path", version = "0.100.1" }
-nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.100.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.1", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.100.1", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.101.0", default-features = false }
+nu-path = { path = "../nu-path", version = "0.101.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.101.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.101.0", default-features = false }
 
 bytesize = { workspace = true }
 chrono = { default-features = false, features = ['std'], workspace = true }
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index 22ab716d14..db47f219bd 100644
--- a/crates/nu-path/Cargo.toml
+++ b/crates/nu-path/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-path"
 edition = "2021"
 license = "MIT"
 name = "nu-path"
-version = "0.100.1"
+version = "0.101.0"
 exclude = ["/fuzz"]
 
 [lib]
diff --git a/crates/nu-plugin-core/Cargo.toml b/crates/nu-plugin-core/Cargo.toml
index 4830859708..66defe06d8 100644
--- a/crates/nu-plugin-core/Cargo.toml
+++ b/crates/nu-plugin-core/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-core
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-core"
-version = "0.100.1"
+version = "0.101.0"
 
 [lib]
 bench = false
@@ -14,8 +14,8 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.100.1", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.101.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.101.0", default-features = false }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true }
diff --git a/crates/nu-plugin-engine/Cargo.toml b/crates/nu-plugin-engine/Cargo.toml
index ec6d816f7d..3b40dd7556 100644
--- a/crates/nu-plugin-engine/Cargo.toml
+++ b/crates/nu-plugin-engine/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-engi
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-engine"
-version = "0.100.1"
+version = "0.101.0"
 
 [lib]
 bench = false
@@ -14,12 +14,12 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.100.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
-nu-system = { path = "../nu-system", version = "0.100.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.100.1" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.100.1", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.100.1" }
+nu-engine = { path = "../nu-engine", version = "0.101.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.0" }
+nu-system = { path = "../nu-system", version = "0.101.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.101.0" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.101.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.101.0" }
 
 serde = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-plugin-protocol/Cargo.toml b/crates/nu-plugin-protocol/Cargo.toml
index 7659fec8d1..8716a6419f 100644
--- a/crates/nu-plugin-protocol/Cargo.toml
+++ b/crates/nu-plugin-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-prot
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-protocol"
-version = "0.100.1"
+version = "0.101.0"
 
 [lib]
 bench = false
@@ -14,8 +14,8 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.100.1", features = ["plugin"] }
-nu-utils = { path = "../nu-utils", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.0", features = ["plugin"] }
+nu-utils = { path = "../nu-utils", version = "0.101.0" }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
diff --git a/crates/nu-plugin-test-support/Cargo.toml b/crates/nu-plugin-test-support/Cargo.toml
index d0c415acd7..c8f1699b09 100644
--- a/crates/nu-plugin-test-support/Cargo.toml
+++ b/crates/nu-plugin-test-support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-plugin-test-support"
-version = "0.100.1"
+version = "0.101.0"
 edition = "2021"
 license = "MIT"
 description = "Testing support for Nushell plugins"
@@ -15,14 +15,14 @@ workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.100.1", features = ["plugin"] }
-nu-protocol = { path = "../nu-protocol", version = "0.100.1", features = ["plugin"] }
-nu-parser = { path = "../nu-parser", version = "0.100.1", features = ["plugin"] }
-nu-plugin = { path = "../nu-plugin", version = "0.100.1" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.100.1" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.100.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.100.1" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.1" }
+nu-engine = { path = "../nu-engine", version = "0.101.0", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.101.0", features = ["plugin"] }
+nu-parser = { path = "../nu-parser", version = "0.101.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.101.0" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.101.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.101.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.101.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.0" }
 nu-ansi-term = { workspace = true }
 similar = "2.6"
 
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index 0e6827bb19..85a9d26b20 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin"
 edition = "2021"
 license = "MIT"
 name = "nu-plugin"
-version = "0.100.1"
+version = "0.101.0"
 
 [lib]
 bench = false
@@ -14,11 +14,11 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.100.1", features = ["plugin"] }
-nu-protocol = { path = "../nu-protocol", version = "0.100.1", features = ["plugin"] }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.100.1" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.100.1", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.100.1" }
+nu-engine = { path = "../nu-engine", version = "0.101.0", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.101.0", features = ["plugin"] }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.101.0" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.101.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.101.0" }
 
 log = { workspace = true }
 thiserror = "2.0"
diff --git a/crates/nu-pretty-hex/Cargo.toml b/crates/nu-pretty-hex/Cargo.toml
index 9fda277a5d..6d54b8521c 100644
--- a/crates/nu-pretty-hex/Cargo.toml
+++ b/crates/nu-pretty-hex/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-pretty-hex"
 edition = "2021"
 license = "MIT"
 name = "nu-pretty-hex"
-version = "0.100.1"
+version = "0.101.0"
 
 [lib]
 doctest = false
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 34af0452f0..3cc4a63c28 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-protocol"
 edition = "2021"
 license = "MIT"
 name = "nu-protocol"
-version = "0.100.1"
+version = "0.101.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,10 +16,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.100.1", default-features = false }
-nu-path = { path = "../nu-path", version = "0.100.1" }
-nu-system = { path = "../nu-system", version = "0.100.1" }
-nu-derive-value = { path = "../nu-derive-value", version = "0.100.1" }
+nu-utils = { path = "../nu-utils", version = "0.101.0", default-features = false }
+nu-path = { path = "../nu-path", version = "0.101.0" }
+nu-system = { path = "../nu-system", version = "0.101.0" }
+nu-derive-value = { path = "../nu-derive-value", version = "0.101.0" }
 
 brotli = { workspace = true, optional = true }
 bytes = { workspace = true }
@@ -65,8 +65,8 @@ plugin = [
 serde_json = { workspace = true }
 strum = "0.26"
 strum_macros = "0.26"
-nu-test-support = { path = "../nu-test-support", version = "0.100.1" }
-nu-utils = { path = "../nu-utils", version = "0.100.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.101.0" }
+nu-utils = { path = "../nu-utils", version = "0.101.0" }
 pretty_assertions = { workspace = true }
 rstest = { workspace = true }
 tempfile = { workspace = true }
diff --git a/crates/nu-std/Cargo.toml b/crates/nu-std/Cargo.toml
index aa39d215e0..3c4a0b17e8 100644
--- a/crates/nu-std/Cargo.toml
+++ b/crates/nu-std/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-std"
 edition = "2021"
 license = "MIT"
 name = "nu-std"
-version = "0.100.1"
+version = "0.101.0"
 
 [dependencies]
-nu-parser = { version = "0.100.1", path = "../nu-parser" }
-nu-protocol = { version = "0.100.1", path = "../nu-protocol", default-features = false }
-nu-engine = { version = "0.100.1", path = "../nu-engine", default-features = false }
+nu-parser = { version = "0.101.0", path = "../nu-parser" }
+nu-protocol = { version = "0.101.0", path = "../nu-protocol", default-features = false }
+nu-engine = { version = "0.101.0", path = "../nu-engine", default-features = false }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
 
 log = "0.4"
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index ec435f1f3d..deff4b670e 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["The Nushell Project Developers", "procs creators"]
 description = "Nushell system querying"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-system"
 name = "nu-system"
-version = "0.100.1"
+version = "0.101.0"
 edition = "2021"
 license = "MIT"
 
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index ec32249de5..ab049f8efe 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-table"
 edition = "2021"
 license = "MIT"
 name = "nu-table"
-version = "0.100.1"
+version = "0.101.0"
 
 [lib]
 bench = false
@@ -14,14 +14,14 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.100.1", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.100.1", default-features = false }
-nu-engine = { path = "../nu-engine", version = "0.100.1", default-features = false }
-nu-color-config = { path = "../nu-color-config", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.101.0", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.101.0", default-features = false }
+nu-color-config = { path = "../nu-color-config", version = "0.101.0" }
 nu-ansi-term = { workspace = true }
 fancy-regex = { workspace = true }
 tabled = { workspace = true, features = ["ansi"], default-features = false }
 terminal_size = { workspace = true }
 
 [dev-dependencies]
-# nu-test-support = { path="../nu-test-support", version = "0.100.1"  }
\ No newline at end of file
+# nu-test-support = { path="../nu-test-support", version = "0.101.0"  }
\ No newline at end of file
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index 9ef7414b73..366ed5833f 100644
--- a/crates/nu-term-grid/Cargo.toml
+++ b/crates/nu-term-grid/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-term-grid"
 edition = "2021"
 license = "MIT"
 name = "nu-term-grid"
-version = "0.100.1"
+version = "0.101.0"
 
 [lib]
 bench = false
@@ -14,6 +14,6 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.100.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.101.0", default-features = false }
 
 unicode-width = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml
index 878b31e4ec..25f4c841c2 100644
--- a/crates/nu-test-support/Cargo.toml
+++ b/crates/nu-test-support/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-test-suppor
 edition = "2021"
 license = "MIT"
 name = "nu-test-support"
-version = "0.100.1"
+version = "0.101.0"
 
 [lib]
 doctest = false
@@ -15,9 +15,9 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-path = { path = "../nu-path", version = "0.100.1" }
-nu-glob = { path = "../nu-glob", version = "0.100.1" }
-nu-utils = { path = "../nu-utils", version = "0.100.1" }
+nu-path = { path = "../nu-path", version = "0.101.0" }
+nu-glob = { path = "../nu-glob", version = "0.101.0" }
+nu-utils = { path = "../nu-utils", version = "0.101.0" }
 
 num-format = { workspace = true }
 which = { workspace = true }
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index 1e6194104b..9a61a579c6 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-utils"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-utils"
-version = "0.100.1"
+version = "0.101.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
@@ -39,4 +39,4 @@ crossterm_winapi = "0.9"
 nix = { workspace = true, default-features = false, features = ["user", "fs"] }
 
 [lints]
-workspace = true
+workspace = true
\ No newline at end of file
diff --git a/crates/nu-utils/src/default_files/default_config.nu b/crates/nu-utils/src/default_files/default_config.nu
index 2616598f44..f4264b9b59 100644
--- a/crates/nu-utils/src/default_files/default_config.nu
+++ b/crates/nu-utils/src/default_files/default_config.nu
@@ -1,6 +1,6 @@
 # Nushell Config File
 #
-# version = "0.100.1"
+# version = "0.101.0"
 $env.config.color_config = {
     separator: white
     leading_trailing_space_bg: { attr: n }
@@ -65,4 +65,4 @@ $env.config.color_config = {
         bg: red
         attr: b
     }
-}
+}
\ No newline at end of file
diff --git a/crates/nu-utils/src/default_files/default_env.nu b/crates/nu-utils/src/default_files/default_env.nu
index 39dcd5c9d0..f1176bdaed 100644
--- a/crates/nu-utils/src/default_files/default_env.nu
+++ b/crates/nu-utils/src/default_files/default_env.nu
@@ -1,7 +1,7 @@
 # Default Nushell Environment Config File
 # These "sensible defaults" are set before the user's `env.nu` is loaded
 #
-# version = "0.100.1"
+# version = "0.101.0"
 
 $env.PROMPT_COMMAND = $env.PROMPT_COMMAND? | default {||
     let dir = match (do -i { $env.PWD | path relative-to $nu.home-path }) {
@@ -33,4 +33,4 @@ $env.PROMPT_COMMAND_RIGHT = $env.PROMPT_COMMAND_RIGHT? | default {||
     } else { "" }
 
     ([$last_exit_code, (char space), $time_segment] | str join)
-}
+}
\ No newline at end of file
diff --git a/crates/nu-utils/src/default_files/doc_config.nu b/crates/nu-utils/src/default_files/doc_config.nu
index 3f4e7e1008..4f2d80167d 100644
--- a/crates/nu-utils/src/default_files/doc_config.nu
+++ b/crates/nu-utils/src/default_files/doc_config.nu
@@ -3,7 +3,7 @@
 # Warning: This file is intended for documentation purposes only and
 # is not intended to be used as an actual configuration file as-is.
 #
-# version = "0.100.1"
+# version = "0.101.0"
 #
 # A `config.nu` file is used to override default Nushell settings,
 # define (or import) custom commands, or run any other startup tasks.
@@ -934,4 +934,4 @@ path add "~/.local/bin"
 path add ($env.CARGO_HOME | path join "bin")
 
 # You can remove duplicate directories from the path using:
-$env.PATH = ($env.PATH | uniq)
+$env.PATH = ($env.PATH | uniq)
\ No newline at end of file
diff --git a/crates/nu-utils/src/default_files/doc_env.nu b/crates/nu-utils/src/default_files/doc_env.nu
index 191d251734..b03dc4eec3 100644
--- a/crates/nu-utils/src/default_files/doc_env.nu
+++ b/crates/nu-utils/src/default_files/doc_env.nu
@@ -1,6 +1,6 @@
 # Nushell Environment Config File Documentation
 #
-# version = "0.100.1"
+# version = "0.101.0"
 #
 # Previously, environment variables were typically configured in `env.nu`.
 # In general, most configuration can and should be performed in `config.nu`
@@ -8,4 +8,4 @@
 
 # To pretty-print the in-shell documentation for Nushell's various configuration
 # settings, you can run:
-config nu --doc | nu-highlight | less -R
+config nu --doc | nu-highlight | less -R
\ No newline at end of file
diff --git a/crates/nu-utils/src/default_files/scaffold_config.nu b/crates/nu-utils/src/default_files/scaffold_config.nu
index 1ee112e3aa..7284830113 100644
--- a/crates/nu-utils/src/default_files/scaffold_config.nu
+++ b/crates/nu-utils/src/default_files/scaffold_config.nu
@@ -1,7 +1,7 @@
 # config.nu
 #
 # Installed by:
-# version = "0.100.1"
+# version = "0.101.0"
 #
 # This file is used to override default Nushell settings, define
 # (or import) custom commands, or run any other startup tasks.
@@ -15,4 +15,4 @@
 # See `help config nu` for more options
 #
 # You can remove these comments if you want or leave
-# them for future reference.
+# them for future reference.
\ No newline at end of file
diff --git a/crates/nu-utils/src/default_files/scaffold_env.nu b/crates/nu-utils/src/default_files/scaffold_env.nu
index 3f1c4600d6..df315c0582 100644
--- a/crates/nu-utils/src/default_files/scaffold_env.nu
+++ b/crates/nu-utils/src/default_files/scaffold_env.nu
@@ -1,7 +1,7 @@
 # env.nu
 #
 # Installed by:
-# version = "0.100.1"
+# version = "0.101.0"
 #
 # Previously, environment variables were typically configured in `env.nu`.
 # In general, most configuration can and should be performed in `config.nu`
@@ -15,4 +15,4 @@
 # Also see `help config env` for more options.
 #
 # You can remove these comments if you want or leave
-# them for future reference.
+# them for future reference.
\ No newline at end of file
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index 35004e1979..bccf5a2e87 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -10,10 +10,10 @@ name = "nu_plugin_custom_values"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.100.1", features = [] }
-nu-protocol = { path = "../nu-protocol", version = "0.100.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.101.0", features = [] }
+nu-protocol = { path = "../nu-protocol", version = "0.101.0", features = ["plugin"] }
 serde = { workspace = true }
 typetag = "0.2"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.100.1" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.101.0" }
\ No newline at end of file
diff --git a/crates/nu_plugin_example/Cargo.toml b/crates/nu_plugin_example/Cargo.toml
index adeef60167..b0f6ec3b1a 100644
--- a/crates/nu_plugin_example/Cargo.toml
+++ b/crates/nu_plugin_example/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_exam
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_example"
-version = "0.100.1"
+version = "0.101.0"
 
 [[bin]]
 name = "nu_plugin_example"
@@ -15,9 +15,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.100.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.101.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.0", features = ["plugin"] }
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.100.1" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.1" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.101.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.0" }
\ No newline at end of file
diff --git a/crates/nu_plugin_formats/Cargo.toml b/crates/nu_plugin_formats/Cargo.toml
index 2a09d61f58..d4d06210ee 100644
--- a/crates/nu_plugin_formats/Cargo.toml
+++ b/crates/nu_plugin_formats/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_form
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_formats"
-version = "0.100.1"
+version = "0.101.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.100.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.101.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.0", features = ["plugin"] }
 
 indexmap = { workspace = true }
 eml-parser = "0.1"
@@ -20,4 +20,4 @@ plist = "1.7"
 chrono = "0.4"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.100.1" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.101.0" }
\ No newline at end of file
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index dcfdd32cc0..32559361d5 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gsta
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_gstat"
-version = "0.100.1"
+version = "0.101.0"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_gstat"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.100.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.101.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.0" }
 
 git2 = "0.19"
\ No newline at end of file
diff --git a/crates/nu_plugin_inc/Cargo.toml b/crates/nu_plugin_inc/Cargo.toml
index 8870224397..aa5ffe4fa7 100644
--- a/crates/nu_plugin_inc/Cargo.toml
+++ b/crates/nu_plugin_inc/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_inc"
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_inc"
-version = "0.100.1"
+version = "0.101.0"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_inc"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.100.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.101.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.0", features = ["plugin"] }
 
 semver = "1.0"
\ No newline at end of file
diff --git a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
index f13b82a711..be7d323a31 100755
--- a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
+++ b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
@@ -6,7 +6,7 @@
 # it also allows us to test the plugin interface with something manually implemented in a scripting
 # language without adding any extra dependencies to our tests.
 
-const NUSHELL_VERSION = "0.100.1"
+const NUSHELL_VERSION = "0.101.0"
 const PLUGIN_VERSION = "0.1.1" # bump if you change commands!
 
 def main [--stdio] {
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index f2d64f839a..efe3bf4a05 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu_plugin_polars"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_polars"
-version = "0.100.1"
+version = "0.101.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -17,10 +17,10 @@ bench = false
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
-nu-plugin = { path = "../nu-plugin", version = "0.100.1" }
-nu-path = { path = "../nu-path", version = "0.100.1" }
-nu-utils = { path = "../nu-utils", version = "0.100.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.0" }
+nu-plugin = { path = "../nu-plugin", version = "0.101.0" }
+nu-path = { path = "../nu-path", version = "0.101.0" }
+nu-utils = { path = "../nu-utils", version = "0.101.0" }
 
 # Potential dependencies for extras
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
@@ -84,9 +84,9 @@ optional = false
 version = "0.44"
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.100.1" }
-nu-engine = { path = "../nu-engine", version = "0.100.1" }
-nu-parser = { path = "../nu-parser", version = "0.100.1" }
-nu-command = { path = "../nu-command", version = "0.100.1" }
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.100.1" }
-tempfile.workspace = true
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.0" }
+nu-engine = { path = "../nu-engine", version = "0.101.0" }
+nu-parser = { path = "../nu-parser", version = "0.101.0" }
+nu-command = { path = "../nu-command", version = "0.101.0" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.101.0" }
+tempfile.workspace = true
\ No newline at end of file
diff --git a/crates/nu_plugin_python/nu_plugin_python_example.py b/crates/nu_plugin_python/nu_plugin_python_example.py
index b77b1a0ddd..3937e4f59e 100755
--- a/crates/nu_plugin_python/nu_plugin_python_example.py
+++ b/crates/nu_plugin_python/nu_plugin_python_example.py
@@ -27,7 +27,7 @@ import sys
 import json
 
 
-NUSHELL_VERSION = "0.100.1"
+NUSHELL_VERSION = "0.101.0"
 PLUGIN_VERSION = "0.1.1"  # bump if you change commands!
 
 
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index 260b909c90..6aa310c0d5 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_quer
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_query"
-version = "0.100.1"
+version = "0.101.0"
 
 [lib]
 doctest = false
@@ -16,8 +16,8 @@ name = "nu_plugin_query"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.100.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.101.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.0" }
 
 gjson = "0.8"
 scraper = { default-features = false, version = "0.22" }
diff --git a/crates/nu_plugin_stress_internals/Cargo.toml b/crates/nu_plugin_stress_internals/Cargo.toml
index 9f5be89dc0..87473fcebe 100644
--- a/crates/nu_plugin_stress_internals/Cargo.toml
+++ b/crates/nu_plugin_stress_internals/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_stre
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_stress_internals"
-version = "0.100.1"
+version = "0.101.0"
 
 [[bin]]
 name = "nu_plugin_stress_internals"
diff --git a/crates/nuon/Cargo.toml b/crates/nuon/Cargo.toml
index 7399fb3e78..249555d820 100644
--- a/crates/nuon/Cargo.toml
+++ b/crates/nuon/Cargo.toml
@@ -5,15 +5,15 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nuon"
 edition = "2021"
 license = "MIT"
 name = "nuon"
-version = "0.100.1"
+version = "0.101.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-parser = { path = "../nu-parser", version = "0.100.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.100.1", default-features = false }
-nu-engine = { path = "../nu-engine", version = "0.100.1", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.100.1", default-features = false }
+nu-parser = { path = "../nu-parser", version = "0.101.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.0", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.101.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.101.0", default-features = false }
 
 [dev-dependencies]
 chrono = { workspace = true }

From d3cbcf401fcdea9c3de12cc01714dfdcb3577494 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Tue, 24 Dec 2024 23:47:00 +0100
Subject: [PATCH 0833/1072] Bump version to `0.101.1` (#14661)

---
 Cargo.lock                                    | 74 +++++++++----------
 Cargo.toml                                    | 40 +++++-----
 crates/nu-cli/Cargo.toml                      | 24 +++---
 crates/nu-cmd-base/Cargo.toml                 | 10 +--
 crates/nu-cmd-extra/Cargo.toml                | 22 +++---
 crates/nu-cmd-lang/Cargo.toml                 | 10 +--
 crates/nu-cmd-plugin/Cargo.toml               | 10 +--
 crates/nu-color-config/Cargo.toml             | 10 +--
 crates/nu-command/Cargo.toml                  | 34 ++++-----
 crates/nu-derive-value/Cargo.toml             |  2 +-
 crates/nu-engine/Cargo.toml                   | 10 +--
 crates/nu-explore/Cargo.toml                  | 20 ++---
 crates/nu-glob/Cargo.toml                     |  2 +-
 crates/nu-json/Cargo.toml                     |  6 +-
 crates/nu-lsp/Cargo.toml                      | 14 ++--
 crates/nu-parser/Cargo.toml                   | 12 +--
 crates/nu-path/Cargo.toml                     |  2 +-
 crates/nu-plugin-core/Cargo.toml              |  6 +-
 crates/nu-plugin-engine/Cargo.toml            | 14 ++--
 crates/nu-plugin-protocol/Cargo.toml          |  6 +-
 crates/nu-plugin-test-support/Cargo.toml      | 18 ++---
 crates/nu-plugin/Cargo.toml                   | 12 +--
 crates/nu-pretty-hex/Cargo.toml               |  2 +-
 crates/nu-protocol/Cargo.toml                 | 14 ++--
 crates/nu-std/Cargo.toml                      |  8 +-
 crates/nu-system/Cargo.toml                   |  2 +-
 crates/nu-table/Cargo.toml                    | 12 +--
 crates/nu-term-grid/Cargo.toml                |  4 +-
 crates/nu-test-support/Cargo.toml             |  8 +-
 crates/nu-utils/Cargo.toml                    |  2 +-
 .../src/default_files/default_config.nu       |  2 +-
 .../nu-utils/src/default_files/default_env.nu |  2 +-
 .../nu-utils/src/default_files/doc_config.nu  |  2 +-
 crates/nu-utils/src/default_files/doc_env.nu  |  2 +-
 .../src/default_files/scaffold_config.nu      |  2 +-
 .../src/default_files/scaffold_env.nu         |  2 +-
 crates/nu_plugin_custom_values/Cargo.toml     |  6 +-
 crates/nu_plugin_example/Cargo.toml           | 10 +--
 crates/nu_plugin_formats/Cargo.toml           |  8 +-
 crates/nu_plugin_gstat/Cargo.toml             |  6 +-
 crates/nu_plugin_inc/Cargo.toml               |  6 +-
 .../nu_plugin_nu_example.nu                   |  2 +-
 crates/nu_plugin_polars/Cargo.toml            | 20 ++---
 .../nu_plugin_python_example.py               |  2 +-
 crates/nu_plugin_query/Cargo.toml             |  6 +-
 crates/nu_plugin_stress_internals/Cargo.toml  |  2 +-
 crates/nuon/Cargo.toml                        | 10 +--
 47 files changed, 250 insertions(+), 250 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0398b714f7..af3ea85532 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3154,7 +3154,7 @@ dependencies = [
 
 [[package]]
 name = "nu"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "assert_cmd",
  "crossterm 0.28.1",
@@ -3209,7 +3209,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cli"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "chrono",
  "crossterm 0.28.1",
@@ -3243,7 +3243,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-base"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "indexmap",
  "miette",
@@ -3255,7 +3255,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-extra"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "fancy-regex",
  "heck 0.5.0",
@@ -3280,7 +3280,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-lang"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "itertools 0.13.0",
  "nu-engine",
@@ -3292,7 +3292,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-plugin"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "itertools 0.13.0",
  "nu-engine",
@@ -3303,7 +3303,7 @@ dependencies = [
 
 [[package]]
 name = "nu-color-config"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "nu-ansi-term",
  "nu-engine",
@@ -3315,7 +3315,7 @@ dependencies = [
 
 [[package]]
 name = "nu-command"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "alphanumeric-sort",
  "base64",
@@ -3427,7 +3427,7 @@ dependencies = [
 
 [[package]]
 name = "nu-derive-value"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "heck 0.5.0",
  "proc-macro-error",
@@ -3438,7 +3438,7 @@ dependencies = [
 
 [[package]]
 name = "nu-engine"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "log",
  "nu-glob",
@@ -3450,7 +3450,7 @@ dependencies = [
 
 [[package]]
 name = "nu-explore"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "ansi-str",
  "anyhow",
@@ -3474,14 +3474,14 @@ dependencies = [
 
 [[package]]
 name = "nu-glob"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "doc-comment",
 ]
 
 [[package]]
 name = "nu-json"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "fancy-regex",
  "linked-hash-map",
@@ -3494,7 +3494,7 @@ dependencies = [
 
 [[package]]
 name = "nu-lsp"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "assert-json-diff",
  "crossbeam-channel",
@@ -3515,7 +3515,7 @@ dependencies = [
 
 [[package]]
 name = "nu-parser"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "bytesize",
  "chrono",
@@ -3532,7 +3532,7 @@ dependencies = [
 
 [[package]]
 name = "nu-path"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "dirs",
  "omnipath",
@@ -3541,7 +3541,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "log",
  "nix 0.29.0",
@@ -3557,7 +3557,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-core"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "interprocess",
  "log",
@@ -3571,7 +3571,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-engine"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "log",
  "nu-engine",
@@ -3587,7 +3587,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-protocol"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "nu-protocol",
  "nu-utils",
@@ -3599,7 +3599,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-test-support"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "nu-ansi-term",
  "nu-cmd-lang",
@@ -3617,7 +3617,7 @@ dependencies = [
 
 [[package]]
 name = "nu-pretty-hex"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "heapless",
  "nu-ansi-term",
@@ -3626,7 +3626,7 @@ dependencies = [
 
 [[package]]
 name = "nu-protocol"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "brotli",
  "byte-unit",
@@ -3664,7 +3664,7 @@ dependencies = [
 
 [[package]]
 name = "nu-std"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "log",
  "miette",
@@ -3675,7 +3675,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "chrono",
  "itertools 0.13.0",
@@ -3692,7 +3692,7 @@ dependencies = [
 
 [[package]]
 name = "nu-table"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "fancy-regex",
  "nu-ansi-term",
@@ -3706,7 +3706,7 @@ dependencies = [
 
 [[package]]
 name = "nu-term-grid"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "nu-utils",
  "unicode-width 0.2.0",
@@ -3714,7 +3714,7 @@ dependencies = [
 
 [[package]]
 name = "nu-test-support"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -3726,7 +3726,7 @@ dependencies = [
 
 [[package]]
 name = "nu-utils"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "crossterm 0.28.1",
  "crossterm_winapi",
@@ -3755,7 +3755,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_example"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "nu-cmd-lang",
  "nu-plugin",
@@ -3765,7 +3765,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_formats"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "chrono",
  "eml-parser",
@@ -3780,7 +3780,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_gstat"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "git2",
  "nu-plugin",
@@ -3789,7 +3789,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_inc"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -3798,7 +3798,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_polars"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "chrono",
  "chrono-tz 0.10.0",
@@ -3833,7 +3833,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_query"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "gjson",
  "nu-plugin",
@@ -3848,7 +3848,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_stress_internals"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "interprocess",
  "serde",
@@ -3962,7 +3962,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "nuon"
-version = "0.101.0"
+version = "0.101.1"
 dependencies = [
  "chrono",
  "nu-engine",
diff --git a/Cargo.toml b/Cargo.toml
index aed23a35e0..36c5da2ffd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
 rust-version = "1.81.0"
-version = "0.101.0"
+version = "0.101.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -192,22 +192,22 @@ unchecked_duration_subtraction = "warn"
 workspace = true
 
 [dependencies]
-nu-cli = { path = "./crates/nu-cli", version = "0.101.0" }
-nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.101.0" }
-nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.101.0" }
-nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.101.0", optional = true }
-nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.101.0" }
-nu-command = { path = "./crates/nu-command", version = "0.101.0" }
-nu-engine = { path = "./crates/nu-engine", version = "0.101.0" }
-nu-explore = { path = "./crates/nu-explore", version = "0.101.0" }
-nu-lsp = { path = "./crates/nu-lsp/", version = "0.101.0" }
-nu-parser = { path = "./crates/nu-parser", version = "0.101.0" }
-nu-path = { path = "./crates/nu-path", version = "0.101.0" }
-nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.101.0" }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.101.0" }
-nu-std = { path = "./crates/nu-std", version = "0.101.0" }
-nu-system = { path = "./crates/nu-system", version = "0.101.0" }
-nu-utils = { path = "./crates/nu-utils", version = "0.101.0" }
+nu-cli = { path = "./crates/nu-cli", version = "0.101.1" }
+nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.101.1" }
+nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.101.1" }
+nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.101.1", optional = true }
+nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.101.1" }
+nu-command = { path = "./crates/nu-command", version = "0.101.1" }
+nu-engine = { path = "./crates/nu-engine", version = "0.101.1" }
+nu-explore = { path = "./crates/nu-explore", version = "0.101.1" }
+nu-lsp = { path = "./crates/nu-lsp/", version = "0.101.1" }
+nu-parser = { path = "./crates/nu-parser", version = "0.101.1" }
+nu-path = { path = "./crates/nu-path", version = "0.101.1" }
+nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.101.1" }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.101.1" }
+nu-std = { path = "./crates/nu-std", version = "0.101.1" }
+nu-system = { path = "./crates/nu-system", version = "0.101.1" }
+nu-utils = { path = "./crates/nu-utils", version = "0.101.1" }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
 crossterm = { workspace = true }
@@ -237,9 +237,9 @@ nix = { workspace = true, default-features = false, features = [
 ] }
 
 [dev-dependencies]
-nu-test-support = { path = "./crates/nu-test-support", version = "0.101.0" }
-nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.101.0" }
-nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.101.0" }
+nu-test-support = { path = "./crates/nu-test-support", version = "0.101.1" }
+nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.101.1" }
+nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.101.1" }
 assert_cmd = "2.0"
 dirs = { workspace = true }
 tango-bench = "0.6"
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 41de627428..00b146dba1 100644
--- 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.101.0"
+version = "0.101.1"
 
 [lib]
 bench = false
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.0" }
-nu-command = { path = "../nu-command", version = "0.101.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.101.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.1" }
+nu-command = { path = "../nu-command", version = "0.101.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.101.1" }
 rstest = { workspace = true, default-features = false }
 tempfile = { workspace = true }
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.101.0" }
-nu-engine = { path = "../nu-engine", version = "0.101.0", features = ["os"] }
-nu-path = { path = "../nu-path", version = "0.101.0" }
-nu-parser = { path = "../nu-parser", version = "0.101.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.101.0", optional = true }
-nu-protocol = { path = "../nu-protocol", version = "0.101.0", features = ["os"] }
-nu-utils = { path = "../nu-utils", version = "0.101.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.101.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.101.1" }
+nu-engine = { path = "../nu-engine", version = "0.101.1", features = ["os"] }
+nu-path = { path = "../nu-path", version = "0.101.1" }
+nu-parser = { path = "../nu-parser", version = "0.101.1" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.101.1", optional = true }
+nu-protocol = { path = "../nu-protocol", version = "0.101.1", features = ["os"] }
+nu-utils = { path = "../nu-utils", version = "0.101.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.101.1" }
 nu-ansi-term = { workspace = true }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
diff --git a/crates/nu-cmd-base/Cargo.toml b/crates/nu-cmd-base/Cargo.toml
index f27b40d265..02fc662a8a 100644
--- a/crates/nu-cmd-base/Cargo.toml
+++ b/crates/nu-cmd-base/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-base"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-base"
-version = "0.101.0"
+version = "0.101.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,10 +13,10 @@ version = "0.101.0"
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.101.0", default-features = false }
-nu-parser = { path = "../nu-parser", version = "0.101.0" }
-nu-path = { path = "../nu-path", version = "0.101.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.0", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.101.1", default-features = false }
+nu-parser = { path = "../nu-parser", version = "0.101.1" }
+nu-path = { path = "../nu-path", version = "0.101.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.1", default-features = false }
 
 indexmap = { workspace = true }
 miette = { workspace = true }
diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml
index e0560d7ec9..ec6cfae4e3 100644
--- 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.101.0"
+version = "0.101.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,13 +16,13 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.101.0" }
-nu-engine = { path = "../nu-engine", version = "0.101.0", default-features = false }
-nu-json = { version = "0.101.0", path = "../nu-json" }
-nu-parser = { path = "../nu-parser", version = "0.101.0" }
-nu-pretty-hex = { version = "0.101.0", path = "../nu-pretty-hex" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.0", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.101.0", default-features = false }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.101.1" }
+nu-engine = { path = "../nu-engine", version = "0.101.1", default-features = false }
+nu-json = { version = "0.101.1", path = "../nu-json" }
+nu-parser = { path = "../nu-parser", version = "0.101.1" }
+nu-pretty-hex = { version = "0.101.1", path = "../nu-pretty-hex" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.101.1", default-features = false }
 
 # Potential dependencies for extras
 heck = { workspace = true }
@@ -36,6 +36,6 @@ v_htmlescape = { workspace = true }
 itertools = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.0" }
-nu-command = { path = "../nu-command", version = "0.101.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.101.0" }
\ No newline at end of file
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.1" }
+nu-command = { path = "../nu-command", version = "0.101.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.101.1" }
\ No newline at end of file
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index 458d5ef774..6edef0c58a 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -6,7 +6,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-lang"
 edition = "2021"
 license = "MIT"
 name = "nu-cmd-lang"
-version = "0.101.0"
+version = "0.101.1"
 
 [lib]
 bench = false
@@ -15,10 +15,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.101.0", default-features = false }
-nu-parser = { path = "../nu-parser", version = "0.101.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.0", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.101.0", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.101.1", default-features = false }
+nu-parser = { path = "../nu-parser", version = "0.101.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.101.1", default-features = false }
 
 itertools = { workspace = true }
 shadow-rs = { version = "0.37", default-features = false }
diff --git a/crates/nu-cmd-plugin/Cargo.toml b/crates/nu-cmd-plugin/Cargo.toml
index 68c2f8091c..08c6d0c251 100644
--- a/crates/nu-cmd-plugin/Cargo.toml
+++ b/crates/nu-cmd-plugin/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-plugin"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-plugin"
-version = "0.101.0"
+version = "0.101.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,10 +13,10 @@ version = "0.101.0"
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.101.0" }
-nu-path = { path = "../nu-path", version = "0.101.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.0", features = ["plugin"] }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.101.0" }
+nu-engine = { path = "../nu-engine", version = "0.101.1" }
+nu-path = { path = "../nu-path", version = "0.101.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.1", features = ["plugin"] }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.101.1" }
 
 itertools = { workspace = true }
 
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index 67f4c6d620..8987837cf7 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-color-confi
 edition = "2021"
 license = "MIT"
 name = "nu-color-config"
-version = "0.101.0"
+version = "0.101.1"
 
 [lib]
 bench = false
@@ -14,12 +14,12 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.101.0", default-features = false }
-nu-engine = { path = "../nu-engine", version = "0.101.0", default-features = false }
-nu-json = { path = "../nu-json", version = "0.101.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.1", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.101.1", default-features = false }
+nu-json = { path = "../nu-json", version = "0.101.1" }
 nu-ansi-term = { workspace = true }
 
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.101.0" }
\ No newline at end of file
+nu-test-support = { path = "../nu-test-support", version = "0.101.1" }
\ No newline at end of file
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 5c1911cdbd..f19abf35d0 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-command"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
-version = "0.101.0"
+version = "0.101.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,21 +16,21 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.101.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.101.0" }
-nu-engine = { path = "../nu-engine", version = "0.101.0", default-features = false }
-nu-glob = { path = "../nu-glob", version = "0.101.0" }
-nu-json = { path = "../nu-json", version = "0.101.0" }
-nu-parser = { path = "../nu-parser", version = "0.101.0" }
-nu-path = { path = "../nu-path", version = "0.101.0" }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.101.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.0", default-features = false }
-nu-system = { path = "../nu-system", version = "0.101.0" }
-nu-table = { path = "../nu-table", version = "0.101.0" }
-nu-term-grid = { path = "../nu-term-grid", version = "0.101.0" }
-nu-utils = { path = "../nu-utils", version = "0.101.0", default-features = false }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.101.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.101.1" }
+nu-engine = { path = "../nu-engine", version = "0.101.1", default-features = false }
+nu-glob = { path = "../nu-glob", version = "0.101.1" }
+nu-json = { path = "../nu-json", version = "0.101.1" }
+nu-parser = { path = "../nu-parser", version = "0.101.1" }
+nu-path = { path = "../nu-path", version = "0.101.1" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.101.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.1", default-features = false }
+nu-system = { path = "../nu-system", version = "0.101.1" }
+nu-table = { path = "../nu-table", version = "0.101.1" }
+nu-term-grid = { path = "../nu-term-grid", version = "0.101.1" }
+nu-utils = { path = "../nu-utils", version = "0.101.1", default-features = false }
 nu-ansi-term = { workspace = true }
-nuon = { path = "../nuon", version = "0.101.0" }
+nuon = { path = "../nuon", version = "0.101.1" }
 
 alphanumeric-sort = { workspace = true }
 base64 = { workspace = true }
@@ -187,8 +187,8 @@ sqlite = ["rusqlite"]
 trash-support = ["trash"]
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.101.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.101.1" }
 
 dirs = { workspace = true }
 mockito = { workspace = true, default-features = false }
diff --git a/crates/nu-derive-value/Cargo.toml b/crates/nu-derive-value/Cargo.toml
index 4d0c714423..c66337429c 100644
--- a/crates/nu-derive-value/Cargo.toml
+++ b/crates/nu-derive-value/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-derive-value"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-derive-value"
-version = "0.101.0"
+version = "0.101.1"
 
 [lib]
 proc-macro = true
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index 9ea6a1d046..0d1e42a8d7 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-engine"
 edition = "2021"
 license = "MIT"
 name = "nu-engine"
-version = "0.101.0"
+version = "0.101.1"
 
 [lib]
 bench = false
@@ -14,10 +14,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.101.0", default-features = false }
-nu-path = { path = "../nu-path", version = "0.101.0" }
-nu-glob = { path = "../nu-glob", version = "0.101.0" }
-nu-utils = { path = "../nu-utils", version = "0.101.0", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.101.1", default-features = false }
+nu-path = { path = "../nu-path", version = "0.101.1" }
+nu-glob = { path = "../nu-glob", version = "0.101.1" }
+nu-utils = { path = "../nu-utils", version = "0.101.1", default-features = false }
 log = { workspace = true }
 terminal_size = { workspace = true }
 
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index 5a32d56f73..3303763302 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-explore"
 edition = "2021"
 license = "MIT"
 name = "nu-explore"
-version = "0.101.0"
+version = "0.101.1"
 
 [lib]
 bench = false
@@ -14,16 +14,16 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.101.0" }
-nu-parser = { path = "../nu-parser", version = "0.101.0" }
-nu-path = { path = "../nu-path", version = "0.101.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.101.0" }
-nu-engine = { path = "../nu-engine", version = "0.101.0" }
-nu-table = { path = "../nu-table", version = "0.101.0" }
-nu-json = { path = "../nu-json", version = "0.101.0" }
-nu-utils = { path = "../nu-utils", version = "0.101.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.1" }
+nu-parser = { path = "../nu-parser", version = "0.101.1" }
+nu-path = { path = "../nu-path", version = "0.101.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.101.1" }
+nu-engine = { path = "../nu-engine", version = "0.101.1" }
+nu-table = { path = "../nu-table", version = "0.101.1" }
+nu-json = { path = "../nu-json", version = "0.101.1" }
+nu-utils = { path = "../nu-utils", version = "0.101.1" }
 nu-ansi-term = { workspace = true }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.101.0" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.101.1" }
 
 anyhow = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-glob/Cargo.toml b/crates/nu-glob/Cargo.toml
index 1593cab976..facfce1357 100644
--- a/crates/nu-glob/Cargo.toml
+++ b/crates/nu-glob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-glob"
-version = "0.101.0"
+version = "0.101.1"
 authors = ["The Nushell Project Developers", "The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 description = """
diff --git a/crates/nu-json/Cargo.toml b/crates/nu-json/Cargo.toml
index 1a1d4fc4ba..c633d8ed71 100644
--- a/crates/nu-json/Cargo.toml
+++ b/crates/nu-json/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-json"
 edition = "2021"
 license = "MIT"
 name = "nu-json"
-version = "0.101.0"
+version = "0.101.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -26,8 +26,8 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.101.0" }
-nu-path = { path = "../nu-path", version = "0.101.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.101.1" }
+nu-path = { path = "../nu-path", version = "0.101.1" }
 serde_json = "1.0"
 fancy-regex = "0.14.0"
 
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index 20adefffd7..41f3467257 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -3,14 +3,14 @@ authors = ["The Nushell Project Developers"]
 description = "Nushell's integrated LSP server"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-lsp"
 name = "nu-lsp"
-version = "0.101.0"
+version = "0.101.1"
 edition = "2021"
 license = "MIT"
 
 [dependencies]
-nu-cli = { path = "../nu-cli", version = "0.101.0" }
-nu-parser = { path = "../nu-parser", version = "0.101.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.0" }
+nu-cli = { path = "../nu-cli", version = "0.101.1" }
+nu-parser = { path = "../nu-parser", version = "0.101.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.1" }
 
 reedline = { workspace = true }
 
@@ -23,9 +23,9 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.0" }
-nu-command = { path = "../nu-command", version = "0.101.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.101.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.1" }
+nu-command = { path = "../nu-command", version = "0.101.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.101.1" }
 
 assert-json-diff = "2.0"
 
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index f35fb8abed..044cba4076 100644
--- a/crates/nu-parser/Cargo.toml
+++ b/crates/nu-parser/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-parser"
 edition = "2021"
 license = "MIT"
 name = "nu-parser"
-version = "0.101.0"
+version = "0.101.1"
 exclude = ["/fuzz"]
 
 [lib]
@@ -15,11 +15,11 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.101.0", default-features = false }
-nu-path = { path = "../nu-path", version = "0.101.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.101.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.0", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.101.0", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.101.1", default-features = false }
+nu-path = { path = "../nu-path", version = "0.101.1" }
+nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.101.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.101.1", default-features = false }
 
 bytesize = { workspace = true }
 chrono = { default-features = false, features = ['std'], workspace = true }
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index db47f219bd..155e4168c9 100644
--- a/crates/nu-path/Cargo.toml
+++ b/crates/nu-path/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-path"
 edition = "2021"
 license = "MIT"
 name = "nu-path"
-version = "0.101.0"
+version = "0.101.1"
 exclude = ["/fuzz"]
 
 [lib]
diff --git a/crates/nu-plugin-core/Cargo.toml b/crates/nu-plugin-core/Cargo.toml
index 66defe06d8..04c2101464 100644
--- a/crates/nu-plugin-core/Cargo.toml
+++ b/crates/nu-plugin-core/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-core
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-core"
-version = "0.101.0"
+version = "0.101.1"
 
 [lib]
 bench = false
@@ -14,8 +14,8 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.101.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.101.0", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.101.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.101.1", default-features = false }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true }
diff --git a/crates/nu-plugin-engine/Cargo.toml b/crates/nu-plugin-engine/Cargo.toml
index 3b40dd7556..3971ebac62 100644
--- a/crates/nu-plugin-engine/Cargo.toml
+++ b/crates/nu-plugin-engine/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-engi
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-engine"
-version = "0.101.0"
+version = "0.101.1"
 
 [lib]
 bench = false
@@ -14,12 +14,12 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.101.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.0" }
-nu-system = { path = "../nu-system", version = "0.101.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.101.0" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.101.0", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.101.0" }
+nu-engine = { path = "../nu-engine", version = "0.101.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.1" }
+nu-system = { path = "../nu-system", version = "0.101.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.101.1" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.101.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.101.1" }
 
 serde = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-plugin-protocol/Cargo.toml b/crates/nu-plugin-protocol/Cargo.toml
index 8716a6419f..54e0f567ac 100644
--- a/crates/nu-plugin-protocol/Cargo.toml
+++ b/crates/nu-plugin-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-prot
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-protocol"
-version = "0.101.0"
+version = "0.101.1"
 
 [lib]
 bench = false
@@ -14,8 +14,8 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.101.0", features = ["plugin"] }
-nu-utils = { path = "../nu-utils", version = "0.101.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.1", features = ["plugin"] }
+nu-utils = { path = "../nu-utils", version = "0.101.1" }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
diff --git a/crates/nu-plugin-test-support/Cargo.toml b/crates/nu-plugin-test-support/Cargo.toml
index c8f1699b09..90f85b1597 100644
--- a/crates/nu-plugin-test-support/Cargo.toml
+++ b/crates/nu-plugin-test-support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-plugin-test-support"
-version = "0.101.0"
+version = "0.101.1"
 edition = "2021"
 license = "MIT"
 description = "Testing support for Nushell plugins"
@@ -15,14 +15,14 @@ workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.101.0", features = ["plugin"] }
-nu-protocol = { path = "../nu-protocol", version = "0.101.0", features = ["plugin"] }
-nu-parser = { path = "../nu-parser", version = "0.101.0", features = ["plugin"] }
-nu-plugin = { path = "../nu-plugin", version = "0.101.0" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.101.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.101.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.101.0" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.0" }
+nu-engine = { path = "../nu-engine", version = "0.101.1", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.101.1", features = ["plugin"] }
+nu-parser = { path = "../nu-parser", version = "0.101.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.101.1" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.101.1" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.101.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.101.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.1" }
 nu-ansi-term = { workspace = true }
 similar = "2.6"
 
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index 85a9d26b20..f8dd8bef9c 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin"
 edition = "2021"
 license = "MIT"
 name = "nu-plugin"
-version = "0.101.0"
+version = "0.101.1"
 
 [lib]
 bench = false
@@ -14,11 +14,11 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.101.0", features = ["plugin"] }
-nu-protocol = { path = "../nu-protocol", version = "0.101.0", features = ["plugin"] }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.101.0" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.101.0", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.101.0" }
+nu-engine = { path = "../nu-engine", version = "0.101.1", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.101.1", features = ["plugin"] }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.101.1" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.101.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.101.1" }
 
 log = { workspace = true }
 thiserror = "2.0"
diff --git a/crates/nu-pretty-hex/Cargo.toml b/crates/nu-pretty-hex/Cargo.toml
index 6d54b8521c..27b6ca4b7a 100644
--- a/crates/nu-pretty-hex/Cargo.toml
+++ b/crates/nu-pretty-hex/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-pretty-hex"
 edition = "2021"
 license = "MIT"
 name = "nu-pretty-hex"
-version = "0.101.0"
+version = "0.101.1"
 
 [lib]
 doctest = false
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 3cc4a63c28..3f2817fa78 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-protocol"
 edition = "2021"
 license = "MIT"
 name = "nu-protocol"
-version = "0.101.0"
+version = "0.101.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,10 +16,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.101.0", default-features = false }
-nu-path = { path = "../nu-path", version = "0.101.0" }
-nu-system = { path = "../nu-system", version = "0.101.0" }
-nu-derive-value = { path = "../nu-derive-value", version = "0.101.0" }
+nu-utils = { path = "../nu-utils", version = "0.101.1", default-features = false }
+nu-path = { path = "../nu-path", version = "0.101.1" }
+nu-system = { path = "../nu-system", version = "0.101.1" }
+nu-derive-value = { path = "../nu-derive-value", version = "0.101.1" }
 
 brotli = { workspace = true, optional = true }
 bytes = { workspace = true }
@@ -65,8 +65,8 @@ plugin = [
 serde_json = { workspace = true }
 strum = "0.26"
 strum_macros = "0.26"
-nu-test-support = { path = "../nu-test-support", version = "0.101.0" }
-nu-utils = { path = "../nu-utils", version = "0.101.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.101.1" }
+nu-utils = { path = "../nu-utils", version = "0.101.1" }
 pretty_assertions = { workspace = true }
 rstest = { workspace = true }
 tempfile = { workspace = true }
diff --git a/crates/nu-std/Cargo.toml b/crates/nu-std/Cargo.toml
index 3c4a0b17e8..1c557c99b7 100644
--- a/crates/nu-std/Cargo.toml
+++ b/crates/nu-std/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-std"
 edition = "2021"
 license = "MIT"
 name = "nu-std"
-version = "0.101.0"
+version = "0.101.1"
 
 [dependencies]
-nu-parser = { version = "0.101.0", path = "../nu-parser" }
-nu-protocol = { version = "0.101.0", path = "../nu-protocol", default-features = false }
-nu-engine = { version = "0.101.0", path = "../nu-engine", default-features = false }
+nu-parser = { version = "0.101.1", path = "../nu-parser" }
+nu-protocol = { version = "0.101.1", path = "../nu-protocol", default-features = false }
+nu-engine = { version = "0.101.1", path = "../nu-engine", default-features = false }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
 
 log = "0.4"
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index deff4b670e..9b0b6aab7d 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["The Nushell Project Developers", "procs creators"]
 description = "Nushell system querying"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-system"
 name = "nu-system"
-version = "0.101.0"
+version = "0.101.1"
 edition = "2021"
 license = "MIT"
 
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index ab049f8efe..05eca42edf 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-table"
 edition = "2021"
 license = "MIT"
 name = "nu-table"
-version = "0.101.0"
+version = "0.101.1"
 
 [lib]
 bench = false
@@ -14,14 +14,14 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.101.0", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.101.0", default-features = false }
-nu-engine = { path = "../nu-engine", version = "0.101.0", default-features = false }
-nu-color-config = { path = "../nu-color-config", version = "0.101.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.101.1", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.101.1", default-features = false }
+nu-color-config = { path = "../nu-color-config", version = "0.101.1" }
 nu-ansi-term = { workspace = true }
 fancy-regex = { workspace = true }
 tabled = { workspace = true, features = ["ansi"], default-features = false }
 terminal_size = { workspace = true }
 
 [dev-dependencies]
-# nu-test-support = { path="../nu-test-support", version = "0.101.0"  }
\ No newline at end of file
+# nu-test-support = { path="../nu-test-support", version = "0.101.1"  }
\ No newline at end of file
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index 366ed5833f..ea88eb78d7 100644
--- a/crates/nu-term-grid/Cargo.toml
+++ b/crates/nu-term-grid/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-term-grid"
 edition = "2021"
 license = "MIT"
 name = "nu-term-grid"
-version = "0.101.0"
+version = "0.101.1"
 
 [lib]
 bench = false
@@ -14,6 +14,6 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.101.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.101.1", default-features = false }
 
 unicode-width = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml
index 25f4c841c2..2f4c085aa0 100644
--- a/crates/nu-test-support/Cargo.toml
+++ b/crates/nu-test-support/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-test-suppor
 edition = "2021"
 license = "MIT"
 name = "nu-test-support"
-version = "0.101.0"
+version = "0.101.1"
 
 [lib]
 doctest = false
@@ -15,9 +15,9 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-path = { path = "../nu-path", version = "0.101.0" }
-nu-glob = { path = "../nu-glob", version = "0.101.0" }
-nu-utils = { path = "../nu-utils", version = "0.101.0" }
+nu-path = { path = "../nu-path", version = "0.101.1" }
+nu-glob = { path = "../nu-glob", version = "0.101.1" }
+nu-utils = { path = "../nu-utils", version = "0.101.1" }
 
 num-format = { workspace = true }
 which = { workspace = true }
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index 9a61a579c6..7dbda5d7e6 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-utils"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-utils"
-version = "0.101.0"
+version = "0.101.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
diff --git a/crates/nu-utils/src/default_files/default_config.nu b/crates/nu-utils/src/default_files/default_config.nu
index f4264b9b59..81845d23a9 100644
--- a/crates/nu-utils/src/default_files/default_config.nu
+++ b/crates/nu-utils/src/default_files/default_config.nu
@@ -1,6 +1,6 @@
 # Nushell Config File
 #
-# version = "0.101.0"
+# version = "0.101.1"
 $env.config.color_config = {
     separator: white
     leading_trailing_space_bg: { attr: n }
diff --git a/crates/nu-utils/src/default_files/default_env.nu b/crates/nu-utils/src/default_files/default_env.nu
index f1176bdaed..8ab8dfcd81 100644
--- a/crates/nu-utils/src/default_files/default_env.nu
+++ b/crates/nu-utils/src/default_files/default_env.nu
@@ -1,7 +1,7 @@
 # Default Nushell Environment Config File
 # These "sensible defaults" are set before the user's `env.nu` is loaded
 #
-# version = "0.101.0"
+# version = "0.101.1"
 
 $env.PROMPT_COMMAND = $env.PROMPT_COMMAND? | default {||
     let dir = match (do -i { $env.PWD | path relative-to $nu.home-path }) {
diff --git a/crates/nu-utils/src/default_files/doc_config.nu b/crates/nu-utils/src/default_files/doc_config.nu
index 4f2d80167d..db83e11110 100644
--- a/crates/nu-utils/src/default_files/doc_config.nu
+++ b/crates/nu-utils/src/default_files/doc_config.nu
@@ -3,7 +3,7 @@
 # Warning: This file is intended for documentation purposes only and
 # is not intended to be used as an actual configuration file as-is.
 #
-# version = "0.101.0"
+# version = "0.101.1"
 #
 # A `config.nu` file is used to override default Nushell settings,
 # define (or import) custom commands, or run any other startup tasks.
diff --git a/crates/nu-utils/src/default_files/doc_env.nu b/crates/nu-utils/src/default_files/doc_env.nu
index b03dc4eec3..0e0f4932af 100644
--- a/crates/nu-utils/src/default_files/doc_env.nu
+++ b/crates/nu-utils/src/default_files/doc_env.nu
@@ -1,6 +1,6 @@
 # Nushell Environment Config File Documentation
 #
-# version = "0.101.0"
+# version = "0.101.1"
 #
 # Previously, environment variables were typically configured in `env.nu`.
 # In general, most configuration can and should be performed in `config.nu`
diff --git a/crates/nu-utils/src/default_files/scaffold_config.nu b/crates/nu-utils/src/default_files/scaffold_config.nu
index 7284830113..3b6f92cfc1 100644
--- a/crates/nu-utils/src/default_files/scaffold_config.nu
+++ b/crates/nu-utils/src/default_files/scaffold_config.nu
@@ -1,7 +1,7 @@
 # config.nu
 #
 # Installed by:
-# version = "0.101.0"
+# version = "0.101.1"
 #
 # This file is used to override default Nushell settings, define
 # (or import) custom commands, or run any other startup tasks.
diff --git a/crates/nu-utils/src/default_files/scaffold_env.nu b/crates/nu-utils/src/default_files/scaffold_env.nu
index df315c0582..9ebc7fad11 100644
--- a/crates/nu-utils/src/default_files/scaffold_env.nu
+++ b/crates/nu-utils/src/default_files/scaffold_env.nu
@@ -1,7 +1,7 @@
 # env.nu
 #
 # Installed by:
-# version = "0.101.0"
+# version = "0.101.1"
 #
 # Previously, environment variables were typically configured in `env.nu`.
 # In general, most configuration can and should be performed in `config.nu`
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index bccf5a2e87..55d78441a4 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -10,10 +10,10 @@ name = "nu_plugin_custom_values"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.101.0", features = [] }
-nu-protocol = { path = "../nu-protocol", version = "0.101.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.101.1", features = [] }
+nu-protocol = { path = "../nu-protocol", version = "0.101.1", features = ["plugin"] }
 serde = { workspace = true }
 typetag = "0.2"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.101.0" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.101.1" }
\ No newline at end of file
diff --git a/crates/nu_plugin_example/Cargo.toml b/crates/nu_plugin_example/Cargo.toml
index b0f6ec3b1a..a783b71b1a 100644
--- a/crates/nu_plugin_example/Cargo.toml
+++ b/crates/nu_plugin_example/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_exam
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_example"
-version = "0.101.0"
+version = "0.101.1"
 
 [[bin]]
 name = "nu_plugin_example"
@@ -15,9 +15,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.101.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.101.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.1", features = ["plugin"] }
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.101.0" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.0" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.101.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.1" }
\ No newline at end of file
diff --git a/crates/nu_plugin_formats/Cargo.toml b/crates/nu_plugin_formats/Cargo.toml
index d4d06210ee..05c70c400a 100644
--- a/crates/nu_plugin_formats/Cargo.toml
+++ b/crates/nu_plugin_formats/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_form
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_formats"
-version = "0.101.0"
+version = "0.101.1"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.101.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.101.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.1", features = ["plugin"] }
 
 indexmap = { workspace = true }
 eml-parser = "0.1"
@@ -20,4 +20,4 @@ plist = "1.7"
 chrono = "0.4"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.101.0" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.101.1" }
\ No newline at end of file
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index 32559361d5..00b7b255e8 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gsta
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_gstat"
-version = "0.101.0"
+version = "0.101.1"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_gstat"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.101.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.0" }
+nu-plugin = { path = "../nu-plugin", version = "0.101.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.1" }
 
 git2 = "0.19"
\ No newline at end of file
diff --git a/crates/nu_plugin_inc/Cargo.toml b/crates/nu_plugin_inc/Cargo.toml
index aa5ffe4fa7..c99afbb5e4 100644
--- a/crates/nu_plugin_inc/Cargo.toml
+++ b/crates/nu_plugin_inc/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_inc"
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_inc"
-version = "0.101.0"
+version = "0.101.1"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_inc"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.101.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.101.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.1", features = ["plugin"] }
 
 semver = "1.0"
\ No newline at end of file
diff --git a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
index be7d323a31..680b31f0f5 100755
--- a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
+++ b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
@@ -6,7 +6,7 @@
 # it also allows us to test the plugin interface with something manually implemented in a scripting
 # language without adding any extra dependencies to our tests.
 
-const NUSHELL_VERSION = "0.101.0"
+const NUSHELL_VERSION = "0.101.1"
 const PLUGIN_VERSION = "0.1.1" # bump if you change commands!
 
 def main [--stdio] {
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index efe3bf4a05..c3e2f0583e 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu_plugin_polars"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_polars"
-version = "0.101.0"
+version = "0.101.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -17,10 +17,10 @@ bench = false
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.101.0" }
-nu-plugin = { path = "../nu-plugin", version = "0.101.0" }
-nu-path = { path = "../nu-path", version = "0.101.0" }
-nu-utils = { path = "../nu-utils", version = "0.101.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.101.1" }
+nu-path = { path = "../nu-path", version = "0.101.1" }
+nu-utils = { path = "../nu-utils", version = "0.101.1" }
 
 # Potential dependencies for extras
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
@@ -84,9 +84,9 @@ optional = false
 version = "0.44"
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.0" }
-nu-engine = { path = "../nu-engine", version = "0.101.0" }
-nu-parser = { path = "../nu-parser", version = "0.101.0" }
-nu-command = { path = "../nu-command", version = "0.101.0" }
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.101.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.1" }
+nu-engine = { path = "../nu-engine", version = "0.101.1" }
+nu-parser = { path = "../nu-parser", version = "0.101.1" }
+nu-command = { path = "../nu-command", version = "0.101.1" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.101.1" }
 tempfile.workspace = true
\ No newline at end of file
diff --git a/crates/nu_plugin_python/nu_plugin_python_example.py b/crates/nu_plugin_python/nu_plugin_python_example.py
index 3937e4f59e..87660da8cc 100755
--- a/crates/nu_plugin_python/nu_plugin_python_example.py
+++ b/crates/nu_plugin_python/nu_plugin_python_example.py
@@ -27,7 +27,7 @@ import sys
 import json
 
 
-NUSHELL_VERSION = "0.101.0"
+NUSHELL_VERSION = "0.101.1"
 PLUGIN_VERSION = "0.1.1"  # bump if you change commands!
 
 
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index 6aa310c0d5..924d260112 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_quer
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_query"
-version = "0.101.0"
+version = "0.101.1"
 
 [lib]
 doctest = false
@@ -16,8 +16,8 @@ name = "nu_plugin_query"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.101.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.0" }
+nu-plugin = { path = "../nu-plugin", version = "0.101.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.1" }
 
 gjson = "0.8"
 scraper = { default-features = false, version = "0.22" }
diff --git a/crates/nu_plugin_stress_internals/Cargo.toml b/crates/nu_plugin_stress_internals/Cargo.toml
index 87473fcebe..5236e2a659 100644
--- a/crates/nu_plugin_stress_internals/Cargo.toml
+++ b/crates/nu_plugin_stress_internals/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_stre
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_stress_internals"
-version = "0.101.0"
+version = "0.101.1"
 
 [[bin]]
 name = "nu_plugin_stress_internals"
diff --git a/crates/nuon/Cargo.toml b/crates/nuon/Cargo.toml
index 249555d820..e7686aefde 100644
--- a/crates/nuon/Cargo.toml
+++ b/crates/nuon/Cargo.toml
@@ -5,15 +5,15 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nuon"
 edition = "2021"
 license = "MIT"
 name = "nuon"
-version = "0.101.0"
+version = "0.101.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-parser = { path = "../nu-parser", version = "0.101.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.0", default-features = false }
-nu-engine = { path = "../nu-engine", version = "0.101.0", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.101.0", default-features = false }
+nu-parser = { path = "../nu-parser", version = "0.101.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.101.1", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.101.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.101.1", default-features = false }
 
 [dev-dependencies]
 chrono = { workspace = true }

From c29bcc94e7f009bb76fbba760115409dd79387d9 Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Wed, 25 Dec 2024 08:18:36 +0800
Subject: [PATCH 0834/1072] Fix docker image tests (#14671)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description

Fix the docker image tests failure here for the latest Nu release:
https://github.com/nushell/nightly/actions/runs/12476171174/job/34820607683#step:9:19

and the nightly image build failure here:
https://github.com/nushell/nightly/actions/runs/12461618928/job/34781443159#step:9:20

I have tested it locally and it should work as expected
---
 docker/test_docker.nu | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/test_docker.nu b/docker/test_docker.nu
index c606f9563b..64adbba0c9 100755
--- a/docker/test_docker.nu
+++ b/docker/test_docker.nu
@@ -17,7 +17,7 @@ def main [] {
     ^$nu.current-exe --commands $"source ($env.CURRENT_FILE); ($plan)"
 }
 
-def create_execution_plan [test: string] -> string {
+def create_execution_plan [test: string]: nothing -> string {
     $"{ name: \"($test)\", execute: { ($test) } }"
 }
 
@@ -45,7 +45,7 @@ def print_results [results: list<record<name: string, result: string>>] {
     }
 }
 
-def print_summary [results: list<record<name: string, result: string>>] -> bool {
+def print_summary [results: list<record<name: string, result: string>>]: nothing -> bool {
     let success = $results | where ($it.result == "PASS") | length
     let failure = $results | where ($it.result == "FAIL") | length
     let count = $results | length
@@ -57,7 +57,7 @@ def print_summary [results: list<record<name: string, result: string>>] -> bool
     }
 }
 
-def run_test [test: record<name: string, execute: closure>] -> record<name: string, result: string, error: string> {
+def run_test [test: record<name: string, execute: closure>]: nothing -> record<name: string, result: string, error: string> {
     try {
         do ($test.execute)
         { result: $"PASS",name: $test.name, error: "" }
@@ -149,5 +149,5 @@ def "test config initialised" [] {
     let config_size = $files | where file == "config.nu" | get size | first
 
     assert greater $env_size 1KiB
-    assert greater $config_size 10KiB
+    assert greater $config_size 1KiB
 }

From 4b1f4e63c3fb403363e149ab9a1fd6aaa327e7ba Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Wed, 25 Dec 2024 09:50:02 +0100
Subject: [PATCH 0835/1072] Replace `std::time::Instant` with
 `web_time::Instant` (#14668)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
The `std::time::Instant` type panics in the WASM context. To prevent
this, I replaced all uses of `std::time::Instant` in WASM-relevant
crates with `web_time::Instant`. This ensures commands using `Instant`
work in WASM without issues. For non-WASM targets, `web-time` simply
reexports `std::time`, so this change doesn’t affect regular builds
([docs](https://docs.rs/web-time/latest/web_time/)).

To ensure future code doesn't reintroduce `std::time::Instant` in WASM
contexts, I added a `clippy wasm` command to the toolkit. This runs
`cargo clippy` with a `clippy.toml` configured to disallow
`std::time::Instant`. Since `web-time` aliases `std::time` by default,
the `clippy.toml` is stored in `clippy/wasm` and is only loaded when
targeting WASM. I also added a new CI job that tests this too.

# User-Facing Changes

None.
---
 .github/workflows/ci.yml                    |  56 +++++++----
 Cargo.lock                                  |   3 +
 Cargo.toml                                  |   1 +
 clippy/wasm/clippy.toml                     |   3 +
 crates/nu-command/Cargo.toml                |   1 +
 crates/nu-command/src/debug/timeit.rs       |   2 +-
 crates/nu-command/src/viewers/table.rs      |   2 +-
 crates/nu-protocol/Cargo.toml               |   1 +
 crates/nu-protocol/src/debugger/profiler.rs |   2 +-
 crates/nu-system/Cargo.toml                 |   1 +
 crates/nu-system/src/windows.rs             |   3 +-
 toolkit.nu                                  | 101 +++++++++++++-------
 12 files changed, 118 insertions(+), 58 deletions(-)
 create mode 100644 clippy/wasm/clippy.toml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f3daa9a466..16d2976114 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -163,7 +163,23 @@ jobs:
             echo "no changes in working directory";
           fi
 
-  build-wasm:
+  wasm:
+    env:
+      WASM_OPTIONS: --no-default-features --target wasm32-unknown-unknown
+      CLIPPY_CONF_DIR: ${{ github.workspace }}/clippy/wasm/
+
+    strategy:
+      matrix:
+        job:
+          - name: Build WASM
+            command: cargo build
+            args:
+          - name: Clippy WASM
+            command: cargo clippy
+            args: -- $CLIPPY_OPTIONS
+
+    name: ${{ matrix.job.name }}
+
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4.1.7
@@ -174,22 +190,22 @@ jobs:
       - name: Add wasm32-unknown-unknown target
         run: rustup target add wasm32-unknown-unknown
 
-      - run: cargo build -p nu-cmd-base --no-default-features --target wasm32-unknown-unknown
-      - run: cargo build -p nu-cmd-extra --no-default-features --target wasm32-unknown-unknown
-      - run: cargo build -p nu-cmd-lang --no-default-features --target wasm32-unknown-unknown
-      - run: cargo build -p nu-color-config --no-default-features --target wasm32-unknown-unknown
-      - run: cargo build -p nu-command --no-default-features --target wasm32-unknown-unknown
-      - run: cargo build -p nu-derive-value --no-default-features --target wasm32-unknown-unknown
-      - run: cargo build -p nu-engine --no-default-features --target wasm32-unknown-unknown
-      - run: cargo build -p nu-glob --no-default-features --target wasm32-unknown-unknown
-      - run: cargo build -p nu-json --no-default-features --target wasm32-unknown-unknown
-      - run: cargo build -p nu-parser --no-default-features --target wasm32-unknown-unknown
-      - run: cargo build -p nu-path --no-default-features --target wasm32-unknown-unknown
-      - run: cargo build -p nu-pretty-hex --no-default-features --target wasm32-unknown-unknown
-      - run: cargo build -p nu-protocol --no-default-features --target wasm32-unknown-unknown
-      - run: cargo build -p nu-std --no-default-features --target wasm32-unknown-unknown
-      - run: cargo build -p nu-system --no-default-features --target wasm32-unknown-unknown
-      - run: cargo build -p nu-table --no-default-features --target wasm32-unknown-unknown
-      - run: cargo build -p nu-term-grid --no-default-features --target wasm32-unknown-unknown
-      - run: cargo build -p nu-utils --no-default-features --target wasm32-unknown-unknown
-      - run: cargo build -p nuon --no-default-features --target wasm32-unknown-unknown
+      - run: ${{ matrix.job.command }} -p nu-cmd-base $WASM_OPTIONS ${{ matrix.job.args }}
+      - run: ${{ matrix.job.command }} -p nu-cmd-extra $WASM_OPTIONS ${{ matrix.job.args }}
+      - run: ${{ matrix.job.command }} -p nu-cmd-lang $WASM_OPTIONS ${{ matrix.job.args }}
+      - run: ${{ matrix.job.command }} -p nu-color-config $WASM_OPTIONS ${{ matrix.job.args }}
+      - run: ${{ matrix.job.command }} -p nu-command $WASM_OPTIONS ${{ matrix.job.args }}
+      - run: ${{ matrix.job.command }} -p nu-derive-value $WASM_OPTIONS ${{ matrix.job.args }}
+      - run: ${{ matrix.job.command }} -p nu-engine $WASM_OPTIONS ${{ matrix.job.args }}
+      - run: ${{ matrix.job.command }} -p nu-glob $WASM_OPTIONS ${{ matrix.job.args }}
+      - run: ${{ matrix.job.command }} -p nu-json $WASM_OPTIONS ${{ matrix.job.args }}
+      - run: ${{ matrix.job.command }} -p nu-parser $WASM_OPTIONS ${{ matrix.job.args }}
+      - run: ${{ matrix.job.command }} -p nu-path $WASM_OPTIONS ${{ matrix.job.args }}
+      - run: ${{ matrix.job.command }} -p nu-pretty-hex $WASM_OPTIONS ${{ matrix.job.args }}
+      - run: ${{ matrix.job.command }} -p nu-protocol $WASM_OPTIONS ${{ matrix.job.args }}
+      - run: ${{ matrix.job.command }} -p nu-std $WASM_OPTIONS ${{ matrix.job.args }}
+      - run: ${{ matrix.job.command }} -p nu-system $WASM_OPTIONS ${{ matrix.job.args }}
+      - run: ${{ matrix.job.command }} -p nu-table $WASM_OPTIONS ${{ matrix.job.args }}
+      - run: ${{ matrix.job.command }} -p nu-term-grid $WASM_OPTIONS ${{ matrix.job.args }}
+      - run: ${{ matrix.job.command }} -p nu-utils $WASM_OPTIONS ${{ matrix.job.args }}
+      - run: ${{ matrix.job.command }} -p nuon $WASM_OPTIONS ${{ matrix.job.args }}
diff --git a/Cargo.lock b/Cargo.lock
index af3ea85532..3b8058c207 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3420,6 +3420,7 @@ dependencies = [
  "uuid",
  "v_htmlescape",
  "wax",
+ "web-time",
  "which",
  "windows 0.56.0",
  "winreg",
@@ -3659,6 +3660,7 @@ dependencies = [
  "tempfile",
  "thiserror 2.0.6",
  "typetag",
+ "web-time",
  "windows-sys 0.48.0",
 ]
 
@@ -3687,6 +3689,7 @@ dependencies = [
  "ntapi",
  "procfs",
  "sysinfo 0.32.1",
+ "web-time",
  "windows 0.56.0",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 36c5da2ffd..0948360b20 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -178,6 +178,7 @@ uucore = "0.0.28"
 uuid = "1.11.0"
 v_htmlescape = "0.15.0"
 wax = "0.6"
+web-time = "1.1.0"
 which = "7.0.0"
 windows = "0.56"
 windows-sys = "0.48"
diff --git a/clippy/wasm/clippy.toml b/clippy/wasm/clippy.toml
new file mode 100644
index 0000000000..d1092aff44
--- /dev/null
+++ b/clippy/wasm/clippy.toml
@@ -0,0 +1,3 @@
+[[disallowed-types]]
+path = "std::time::Instant"
+reason = "WASM panics if used, use `web_time::Instant` instead"
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index f19abf35d0..7e8962d195 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -106,6 +106,7 @@ wax = { workspace = true }
 which = { workspace = true, optional = true }
 unicode-width = { workspace = true }
 data-encoding = { version = "2.6.0", features = ["alloc"] }
+web-time = { workspace = true }
 
 [target.'cfg(windows)'.dependencies]
 winreg = { workspace = true }
diff --git a/crates/nu-command/src/debug/timeit.rs b/crates/nu-command/src/debug/timeit.rs
index 182cab87d7..6c372db3f6 100644
--- a/crates/nu-command/src/debug/timeit.rs
+++ b/crates/nu-command/src/debug/timeit.rs
@@ -1,6 +1,6 @@
 use nu_engine::{command_prelude::*, ClosureEvalOnce};
 use nu_protocol::engine::Closure;
-use std::time::Instant;
+use web_time::Instant;
 
 #[derive(Clone)]
 pub struct TimeIt;
diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index da57198efb..4f74e4b0a8 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -20,9 +20,9 @@ use std::{
     io::{IsTerminal, Read},
     path::PathBuf,
     str::FromStr,
-    time::Instant,
 };
 use url::Url;
+use web_time::Instant;
 
 const STREAM_PAGE_SIZE: usize = 1000;
 
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 3f2817fa78..d162999b9d 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -40,6 +40,7 @@ thiserror = "2.0"
 typetag = "0.2"
 os_pipe = { workspace = true, optional = true, features = ["io_safety"] }
 log = { workspace = true }
+web-time = { workspace = true }
 
 [target.'cfg(unix)'.dependencies]
 nix = { workspace = true, default-features = false, features = ["signal"] }
diff --git a/crates/nu-protocol/src/debugger/profiler.rs b/crates/nu-protocol/src/debugger/profiler.rs
index bffadfe5ef..70771ed50b 100644
--- a/crates/nu-protocol/src/debugger/profiler.rs
+++ b/crates/nu-protocol/src/debugger/profiler.rs
@@ -10,8 +10,8 @@ use crate::{
     ir::IrBlock,
     record, PipelineData, ShellError, Span, Value,
 };
-use std::time::Instant;
 use std::{borrow::Borrow, io::BufRead};
+use web_time::Instant;
 
 #[derive(Debug, Clone, Copy)]
 struct ElementId(usize);
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index 9b0b6aab7d..c1134e9796 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -20,6 +20,7 @@ libc = { workspace = true }
 log = { workspace = true }
 sysinfo = { workspace = true }
 itertools = { workspace = true }
+web-time = { workspace = true }
 
 [target.'cfg(target_family = "unix")'.dependencies]
 nix = { workspace = true, default-features = false, features = ["fs", "term", "process", "signal"] }
diff --git a/crates/nu-system/src/windows.rs b/crates/nu-system/src/windows.rs
index cc0ab99559..77b5b8834e 100644
--- a/crates/nu-system/src/windows.rs
+++ b/crates/nu-system/src/windows.rs
@@ -18,7 +18,8 @@ use std::ptr;
 use std::ptr::null_mut;
 use std::sync::LazyLock;
 use std::thread;
-use std::time::{Duration, Instant};
+use std::time::Duration;
+use web_time::Instant;
 
 use windows::core::{PCWSTR, PWSTR};
 
diff --git a/toolkit.nu b/toolkit.nu
index d848dce18e..8b34e9a53b 100644
--- a/toolkit.nu
+++ b/toolkit.nu
@@ -6,6 +6,8 @@
 # (**2**) catch classical flaws in the new changes with *clippy* and (**3**)
 # make sure all the tests pass.
 
+const toolkit_dir = path self .
+
 # check standard code formatting and apply the changes
 export def fmt [
     --check # do not apply the format changes, only check the syntax
@@ -363,40 +365,6 @@ export def build [
     }
 }
 
-# build crates for wasm
-export def "build wasm" [] {
-    ^rustup target add wasm32-unknown-unknown
-
-    # these crates should compile for wasm
-    let compatible_crates = [
-        "nu-cmd-base",
-        "nu-cmd-extra",
-        "nu-cmd-lang",
-        "nu-color-config",
-        "nu-command",
-        "nu-derive-value",
-        "nu-engine",
-        "nu-glob",
-        "nu-json",
-        "nu-parser",
-        "nu-path",
-        "nu-pretty-hex",
-        "nu-protocol",
-        "nu-std",
-        "nu-system",
-        "nu-table",
-        "nu-term-grid",
-        "nu-utils",
-        "nuon"
-    ]
-
-    for crate in $compatible_crates {
-            print $'(char nl)Building ($crate) for wasm'
-            print '----------------------------'
-        ^cargo build -p $crate --target wasm32-unknown-unknown --no-default-features
-    }
-}
-
 def "nu-complete list features" [] {
     open Cargo.toml | get features | transpose feature dependencies | get feature
 }
@@ -625,4 +593,69 @@ export def 'release-pkg windows' [
     }
 }
 
+# these crates should compile for wasm
+const wasm_compatible_crates = [
+    "nu-cmd-base",
+    "nu-cmd-extra",
+    "nu-cmd-lang",
+    "nu-color-config",
+    "nu-command",
+    "nu-derive-value",
+    "nu-engine",
+    "nu-glob",
+    "nu-json",
+    "nu-parser",
+    "nu-path",
+    "nu-pretty-hex",
+    "nu-protocol",
+    "nu-std",
+    "nu-system",
+    "nu-table",
+    "nu-term-grid",
+    "nu-utils",
+    "nuon"
+]
+
+def "prep wasm" [] {
+    ^rustup target add wasm32-unknown-unknown
+}
+
+# build crates for wasm
+export def "build wasm" [] {
+    prep wasm
+
+    for crate in $wasm_compatible_crates {
+        print $'(char nl)Building ($crate) for wasm'
+        print '----------------------------'
+        (
+            ^cargo build 
+                -p $crate 
+                --target wasm32-unknown-unknown 
+                --no-default-features
+        )
+    }
+}
+
+# make sure no api is used that doesn't work with wasm
+export def "clippy wasm" [] {
+    prep wasm
+
+    $env.CLIPPY_CONF_DIR = $toolkit_dir | path join clippy wasm
+
+    for crate in $wasm_compatible_crates {
+        print $'(char nl)Checking ($crate) for wasm'
+        print '----------------------------'
+        (
+            ^cargo clippy 
+                -p $crate 
+                --target wasm32-unknown-unknown 
+                --no-default-features
+                --
+                -D warnings
+                -D clippy::unwrap_used
+                -D clippy::unchecked_duration_subtraction
+        )
+    }
+}
+
 export def main [] { help toolkit }

From 35d2750757623a6314930f9a16f6b8fad40d768f Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Wed, 25 Dec 2024 04:12:53 -0800
Subject: [PATCH 0836/1072] Change how `and` and `or` operations are compiled
 to IR to support custom values (#14653)

# Description

Because `and` and `or` are short-circuiting operations in Nushell, they
must be compiled to a sequence that avoids evaluating the RHS if the LHS
is already sufficient to determine the output - i.e., `false` for `and`
and `true` for `or`. I initially implemented this with `branch-if`
instructions, simply returning the RHS if it needed to be evaluated, and
returning the short-circuited boolean value if it did not.

Example for `$a and $b`:

```
   0: load-variable          %0, var 999 "$a"
   1: branch-if              %0, 3
   2: jump                   5
   3: load-variable          %0, var 1000 "$b" # label(0), from(1:)
   4: jump                   6
   5: load-literal           %0, bool(false) # label(1), from(2:)
   6: span                   %0          # label(2), from(4:)
   7: return                 %0
```

Unfortunately, this broke polars, because using `and`/`or` on custom
values is perfectly valid and they're allowed to define that behavior
differently, and the polars plugin uses this for boolean masks. But
without using the `binary-op` instruction, that custom behavior is never
invoked. Additionally, `branch-if` requires a boolean, and custom values
are not booleans. This changes the IR to the following, using the
`match` instruction to check for the specific short-circuit value
instead, and still invoking `binary-op` otherwise:

```
   0: load-variable          %0, var 125 "$a"
   1: match                  (false), %0, 4
   2: load-variable          %1, var 124 "$b"
   3: binary-op              %0, Boolean(And), %1
   4: span                   %0          # label(0), from(1:)
   5: return                 %0
```

I've also renamed `Pattern::Value` to `Pattern::Expression` and added a
proper `Pattern::Value` variant that actually contains a `Value`
instead. I'm still hoping to remove `Pattern::Expression` eventually,
because it's kind of a hack - we don't actually evaluate the expression,
we just match it against a few cases specifically for pattern matching,
and it's one of the cases where AST leaks into IR and I want to remove
all of those cases, because AST should not leak into IR.

Fixes #14518

# User-Facing Changes

- `and` and `or` now support custom values again.
- the IR is actually a little bit cleaner, though it may be a bit
slower; `match` is more complex.

# Tests + Formatting

The existing tests pass, but I didn't add anything new. Unfortunately I
don't think there's anything built-in to trigger this, but maybe some
testcases could be added to polars to test it.
---
 crates/nu-engine/src/compile/builder.rs       | 19 +++++
 crates/nu-engine/src/compile/keyword.rs       | 12 ++-
 crates/nu-engine/src/compile/operator.rs      | 76 +++++++++----------
 crates/nu-parser/src/flatten.rs               |  4 +-
 crates/nu-parser/src/parse_patterns.rs        |  2 +-
 crates/nu-parser/src/parser.rs                |  6 +-
 crates/nu-protocol/src/ast/match_pattern.rs   | 14 +++-
 .../nu-protocol/src/engine/pattern_match.rs   |  3 +-
 crates/nu-protocol/src/ir/display.rs          |  5 +-
 9 files changed, 85 insertions(+), 56 deletions(-)

diff --git a/crates/nu-engine/src/compile/builder.rs b/crates/nu-engine/src/compile/builder.rs
index 0e2e943053..71f41ee210 100644
--- a/crates/nu-engine/src/compile/builder.rs
+++ b/crates/nu-engine/src/compile/builder.rs
@@ -1,4 +1,5 @@
 use nu_protocol::{
+    ast::Pattern,
     ir::{DataSlice, Instruction, IrAstRef, IrBlock, Literal},
     CompileError, IntoSpanned, RegId, Span, Spanned,
 };
@@ -426,6 +427,24 @@ impl BlockBuilder {
         self.push(Instruction::Jump { index: label_id.0 }.into_spanned(span))
     }
 
+    /// Add a `match` instruction
+    pub(crate) fn r#match(
+        &mut self,
+        pattern: Pattern,
+        src: RegId,
+        label_id: LabelId,
+        span: Span,
+    ) -> Result<(), CompileError> {
+        self.push(
+            Instruction::Match {
+                pattern: Box::new(pattern),
+                src,
+                index: label_id.0,
+            }
+            .into_spanned(span),
+        )
+    }
+
     /// The index that the next instruction [`.push()`](Self::push)ed will have.
     pub(crate) fn here(&self) -> usize {
         self.instructions.len()
diff --git a/crates/nu-engine/src/compile/keyword.rs b/crates/nu-engine/src/compile/keyword.rs
index b7f378f592..b22e055a21 100644
--- a/crates/nu-engine/src/compile/keyword.rs
+++ b/crates/nu-engine/src/compile/keyword.rs
@@ -197,13 +197,11 @@ pub(crate) fn compile_match(
     for (pattern, _) in match_block {
         let match_label = builder.label(None);
         match_labels.push(match_label);
-        builder.push(
-            Instruction::Match {
-                pattern: Box::new(pattern.pattern.clone()),
-                src: match_reg,
-                index: match_label.0,
-            }
-            .into_spanned(pattern.span),
+        builder.r#match(
+            pattern.pattern.clone(),
+            match_reg,
+            match_label,
+            pattern.span,
         )?;
         // Also add a label for the next match instruction or failure case
         next_labels.push(builder.label(Some(builder.here())));
diff --git a/crates/nu-engine/src/compile/operator.rs b/crates/nu-engine/src/compile/operator.rs
index 0f7059e027..735beaa10c 100644
--- a/crates/nu-engine/src/compile/operator.rs
+++ b/crates/nu-engine/src/compile/operator.rs
@@ -1,8 +1,8 @@
 use nu_protocol::{
-    ast::{Assignment, Boolean, CellPath, Expr, Expression, Math, Operator, PathMember},
+    ast::{Assignment, Boolean, CellPath, Expr, Expression, Math, Operator, PathMember, Pattern},
     engine::StateWorkingSet,
     ir::{Instruction, Literal},
-    IntoSpanned, RegId, Span, Spanned, ENV_VARIABLE_ID,
+    IntoSpanned, RegId, Span, Spanned, Value, ENV_VARIABLE_ID,
 };
 use nu_utils::IgnoreCaseExt;
 
@@ -59,56 +59,52 @@ pub(crate) fn compile_binary_op(
         )?;
 
         match op.item {
-            // `and` / `or` are short-circuiting, and we can get by with one register and a branch
-            Operator::Boolean(Boolean::And) => {
-                let true_label = builder.label(None);
-                builder.branch_if(lhs_reg, true_label, op.span)?;
+            // `and` / `or` are short-circuiting, use `match` to avoid running the RHS if LHS is
+            // the correct value. Be careful to support and/or on non-boolean values
+            Operator::Boolean(bool_op @ Boolean::And)
+            | Operator::Boolean(bool_op @ Boolean::Or) => {
+                // `and` short-circuits on false, and `or` short-circuits on true.
+                let short_circuit_value = match bool_op {
+                    Boolean::And => false,
+                    Boolean::Or => true,
+                    Boolean::Xor => unreachable!(),
+                };
 
-                // If the branch was not taken it's false, so short circuit to load false
-                let false_label = builder.label(None);
-                builder.jump(false_label, op.span)?;
+                // Short-circuit to return `lhs_reg`. `match` op does not consume `lhs_reg`.
+                let short_circuit_label = builder.label(None);
+                builder.r#match(
+                    Pattern::Value(Value::bool(short_circuit_value, op.span)),
+                    lhs_reg,
+                    short_circuit_label,
+                    op.span,
+                )?;
 
-                builder.set_label(true_label, builder.here())?;
+                // If the match failed then this was not the short-circuit value, so we have to run
+                // the RHS expression
+                let rhs_reg = builder.next_register()?;
                 compile_expression(
                     working_set,
                     builder,
                     rhs,
                     RedirectModes::value(rhs.span),
                     None,
-                    lhs_reg,
+                    rhs_reg,
                 )?;
 
-                let end_label = builder.label(None);
-                builder.jump(end_label, op.span)?;
-
-                // Consumed by `branch-if`, so we have to set it false again
-                builder.set_label(false_label, builder.here())?;
-                builder.load_literal(lhs_reg, Literal::Bool(false).into_spanned(lhs.span))?;
-
-                builder.set_label(end_label, builder.here())?;
-            }
-            Operator::Boolean(Boolean::Or) => {
-                let true_label = builder.label(None);
-                builder.branch_if(lhs_reg, true_label, op.span)?;
-
-                // If the branch was not taken it's false, so do the right-side expression
-                compile_expression(
-                    working_set,
-                    builder,
-                    rhs,
-                    RedirectModes::value(rhs.span),
-                    None,
-                    lhs_reg,
+                // It may seem intuitive that we can just return RHS here, but we do have to
+                // actually execute the binary-op in case this is not a boolean
+                builder.push(
+                    Instruction::BinaryOp {
+                        lhs_dst: lhs_reg,
+                        op: Operator::Boolean(bool_op),
+                        rhs: rhs_reg,
+                    }
+                    .into_spanned(op.span),
                 )?;
 
-                let end_label = builder.label(None);
-                builder.jump(end_label, op.span)?;
-
-                // Consumed by `branch-if`, so we have to set it true again
-                builder.set_label(true_label, builder.here())?;
-                builder.load_literal(lhs_reg, Literal::Bool(true).into_spanned(lhs.span))?;
-
-                builder.set_label(end_label, builder.here())?;
+                // In either the short-circuit case or other case, the result is in lhs_reg =
+                // out_reg
+                builder.set_label(short_circuit_label, builder.here())?;
             }
             _ => {
                 // Any other operator, via `binary-op`
diff --git a/crates/nu-parser/src/flatten.rs b/crates/nu-parser/src/flatten.rs
index 318ae00ffd..731ab52984 100644
--- a/crates/nu-parser/src/flatten.rs
+++ b/crates/nu-parser/src/flatten.rs
@@ -644,7 +644,9 @@ fn flatten_pattern_into(match_pattern: &MatchPattern, output: &mut Vec<(Span, Fl
                 output.push((match_pattern.span, FlatShape::MatchPattern));
             }
         }
-        Pattern::Value(_) => output.push((match_pattern.span, FlatShape::MatchPattern)),
+        Pattern::Expression(_) | Pattern::Value(_) => {
+            output.push((match_pattern.span, FlatShape::MatchPattern))
+        }
         Pattern::Variable(var_id) => output.push((match_pattern.span, FlatShape::VarDecl(*var_id))),
         Pattern::Rest(var_id) => output.push((match_pattern.span, FlatShape::VarDecl(*var_id))),
         Pattern::Or(patterns) => {
diff --git a/crates/nu-parser/src/parse_patterns.rs b/crates/nu-parser/src/parse_patterns.rs
index 6f7cb62bc2..05193c6696 100644
--- a/crates/nu-parser/src/parse_patterns.rs
+++ b/crates/nu-parser/src/parse_patterns.rs
@@ -40,7 +40,7 @@ pub fn parse_pattern(working_set: &mut StateWorkingSet, span: Span) -> MatchPatt
         let value = parse_value(working_set, span, &SyntaxShape::Any);
 
         MatchPattern {
-            pattern: Pattern::Value(Box::new(value)),
+            pattern: Pattern::Expression(Box::new(value)),
             guard: None,
             span,
         }
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index d71ef77182..277ce83e7f 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -6286,7 +6286,11 @@ pub fn discover_captures_in_pattern(pattern: &MatchPattern, seen: &mut Vec<VarId
             }
         }
         Pattern::Rest(var_id) => seen.push(*var_id),
-        Pattern::Value(_) | Pattern::IgnoreValue | Pattern::IgnoreRest | Pattern::Garbage => {}
+        Pattern::Expression(_)
+        | Pattern::Value(_)
+        | Pattern::IgnoreValue
+        | Pattern::IgnoreRest
+        | Pattern::Garbage => {}
     }
 }
 
diff --git a/crates/nu-protocol/src/ast/match_pattern.rs b/crates/nu-protocol/src/ast/match_pattern.rs
index ca639270aa..3bceb7c329 100644
--- a/crates/nu-protocol/src/ast/match_pattern.rs
+++ b/crates/nu-protocol/src/ast/match_pattern.rs
@@ -1,5 +1,5 @@
 use super::Expression;
-use crate::{Span, VarId};
+use crate::{Span, Value, VarId};
 use serde::{Deserialize, Serialize};
 
 /// AST Node for match arm with optional match guard
@@ -23,10 +23,12 @@ pub enum Pattern {
     Record(Vec<(String, MatchPattern)>),
     /// List destructuring
     List(Vec<MatchPattern>),
-    /// Matching against a literal
+    /// Matching against a literal (from expression result)
     // TODO: it would be nice if this didn't depend on AST
     // maybe const evaluation can get us to a Value instead?
-    Value(Box<Expression>),
+    Expression(Box<Expression>),
+    /// Matching against a literal (pure value)
+    Value(Value),
     /// binding to a variable
     Variable(VarId),
     /// the `pattern1 \ pattern2` or-pattern
@@ -62,7 +64,11 @@ impl Pattern {
                 }
             }
             Pattern::Rest(var_id) => output.push(*var_id),
-            Pattern::Value(_) | Pattern::IgnoreValue | Pattern::Garbage | Pattern::IgnoreRest => {}
+            Pattern::Expression(_)
+            | Pattern::Value(_)
+            | Pattern::IgnoreValue
+            | Pattern::Garbage
+            | Pattern::IgnoreRest => {}
         }
 
         output
diff --git a/crates/nu-protocol/src/engine/pattern_match.rs b/crates/nu-protocol/src/engine/pattern_match.rs
index 32c34d22d3..bac2fd8d17 100644
--- a/crates/nu-protocol/src/engine/pattern_match.rs
+++ b/crates/nu-protocol/src/engine/pattern_match.rs
@@ -94,7 +94,7 @@ impl Matcher for Pattern {
                 }
                 _ => false,
             },
-            Pattern::Value(pattern_value) => {
+            Pattern::Expression(pattern_value) => {
                 // TODO: Fill this out with the rest of them
                 match &pattern_value.expr {
                     Expr::Nothing => {
@@ -205,6 +205,7 @@ impl Matcher for Pattern {
                     _ => false,
                 }
             }
+            Pattern::Value(pattern_value) => value == pattern_value,
             Pattern::Or(patterns) => {
                 let mut result = false;
 
diff --git a/crates/nu-protocol/src/ir/display.rs b/crates/nu-protocol/src/ir/display.rs
index bc275f0bc5..98ea68db9d 100644
--- a/crates/nu-protocol/src/ir/display.rs
+++ b/crates/nu-protocol/src/ir/display.rs
@@ -419,11 +419,14 @@ impl<'a> fmt::Display for FmtPattern<'a> {
                 }
                 f.write_str("]")
             }
-            Pattern::Value(expr) => {
+            Pattern::Expression(expr) => {
                 let string =
                     String::from_utf8_lossy(self.engine_state.get_span_contents(expr.span));
                 f.write_str(&string)
             }
+            Pattern::Value(value) => {
+                f.write_str(&value.to_parsable_string(", ", &self.engine_state.config))
+            }
             Pattern::Variable(var_id) => {
                 let variable = FmtVar::new(self.engine_state, *var_id);
                 write!(f, "{}", variable)

From f1ce0c98fd56d2b87859995b09ea707ca0b9fb1c Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Wed, 25 Dec 2024 13:14:04 +0100
Subject: [PATCH 0837/1072] Add content type metadata to `config nu` commands
 (#14666)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
In v0.101.0 we got `config nu --default` and `config nu --doc` which
return a default config. That default config is valid `.nu`, so it
should have the metadata for it. We defined our MIME types [here in the
docs](https://www.nushell.sh/lang-guide/chapters/mime_types.html), so I
added that.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

Tools that read the metadata can now also detect that these two commands
are nushell scripts.

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/env/config/config_nu.rs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/crates/nu-command/src/env/config/config_nu.rs b/crates/nu-command/src/env/config/config_nu.rs
index 5295fe5247..ee09965aa6 100644
--- a/crates/nu-command/src/env/config/config_nu.rs
+++ b/crates/nu-command/src/env/config/config_nu.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::PipelineMetadata;
 
 #[derive(Clone)]
 pub struct ConfigNu;
@@ -70,13 +71,21 @@ impl Command for ConfigNu {
         // `--default` flag handling
         if default_flag {
             let head = call.head;
-            return Ok(Value::string(nu_utils::get_default_config(), head).into_pipeline_data());
+            return Ok(Value::string(nu_utils::get_default_config(), head)
+                .into_pipeline_data_with_metadata(
+                    PipelineMetadata::default()
+                        .with_content_type("application/x-nuscript".to_string().into()),
+                ));
         }
 
         // `--doc` flag handling
         if doc_flag {
             let head = call.head;
-            return Ok(Value::string(nu_utils::get_doc_config(), head).into_pipeline_data());
+            return Ok(Value::string(nu_utils::get_doc_config(), head)
+                .into_pipeline_data_with_metadata(
+                    PipelineMetadata::default()
+                        .with_content_type("application/x-nuscript".to_string().into()),
+                ));
         }
 
         super::config_::start_editor("config-path", engine_state, stack, call)

From f2dcae570cfa6b1b8edb9e2f4a2e3bad2f37a4bd Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Wed, 25 Dec 2024 15:14:48 +0300
Subject: [PATCH 0838/1072] Add binary input support to `chunks` (#14649)

# Description

Adds support for `Value::Binary` and `ByteStream` inputs to `chunks`.
In case of `ByteStream`, stream is not collected, and chunked as it
comes.

This works:
```nushell
open --raw /dev/urandom | chunks 4 | take 4
```

# User-Facing Changes

`chunks` can now be used on binary values and streams.

# Tests + Formatting

- :green_circle: toolkit fmt
- :green_circle: toolkit clippy
- :green_circle: toolkit test
- :green_circle: toolkit test stdlib

# After Submitting
N/A
---
 crates/nu-command/src/filters/chunks.rs | 113 +++++++++++++++++++++++-
 1 file changed, 112 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/filters/chunks.rs b/crates/nu-command/src/filters/chunks.rs
index 4db436ca25..93757c36e8 100644
--- a/crates/nu-command/src/filters/chunks.rs
+++ b/crates/nu-command/src/filters/chunks.rs
@@ -1,6 +1,9 @@
 use nu_engine::command_prelude::*;
 use nu_protocol::ListStream;
-use std::num::NonZeroUsize;
+use std::{
+    io::{BufRead, Cursor, ErrorKind},
+    num::NonZeroUsize,
+};
 
 #[derive(Clone)]
 pub struct Chunks;
@@ -15,6 +18,7 @@ impl Command for Chunks {
             .input_output_types(vec![
                 (Type::table(), Type::list(Type::table())),
                 (Type::list(Type::Any), Type::list(Type::list(Type::Any))),
+                (Type::Binary, Type::list(Type::Binary)),
             ])
             .required("chunk_size", SyntaxShape::Int, "The size of each chunk.")
             .category(Category::Filters)
@@ -72,6 +76,15 @@ impl Command for Chunks {
                     ]),
                 ])),
             },
+            Example {
+                example: "0x[11 22 33 44 55 66 77 88] | chunks 3",
+                description: "Chunk the bytes of a binary into triplets",
+                result: Some(Value::test_list(vec![
+                    Value::test_binary(vec![0x11, 0x22, 0x33]),
+                    Value::test_binary(vec![0x44, 0x55, 0x66]),
+                    Value::test_binary(vec![0x77, 0x88]),
+                ])),
+            },
         ]
     }
 
@@ -116,6 +129,43 @@ pub fn chunks(
             let stream = stream.modify(|iter| ChunksIter::new(iter, chunk_size, span));
             Ok(PipelineData::ListStream(stream, metadata))
         }
+        PipelineData::Value(Value::Binary { val, .. }, metadata) => {
+            let chunk_read = ChunkRead {
+                reader: Cursor::new(val),
+                size: chunk_size,
+            };
+            let value_stream = chunk_read.map(move |chunk| match chunk {
+                Ok(chunk) => Value::binary(chunk, span),
+                Err(e) => Value::error(e.into(), span),
+            });
+            let pipeline_data_with_metadata = value_stream.into_pipeline_data_with_metadata(
+                span,
+                engine_state.signals().clone(),
+                metadata,
+            );
+            Ok(pipeline_data_with_metadata)
+        }
+        PipelineData::ByteStream(stream, metadata) => {
+            let pipeline_data = match stream.reader() {
+                None => PipelineData::Empty,
+                Some(reader) => {
+                    let chunk_read = ChunkRead {
+                        reader,
+                        size: chunk_size,
+                    };
+                    let value_stream = chunk_read.map(move |chunk| match chunk {
+                        Ok(chunk) => Value::binary(chunk, span),
+                        Err(e) => Value::error(e.into(), span),
+                    });
+                    value_stream.into_pipeline_data_with_metadata(
+                        span,
+                        engine_state.signals().clone(),
+                        metadata,
+                    )
+                }
+            };
+            Ok(pipeline_data)
+        }
         input => Err(input.unsupported_input_error("list", span)),
     }
 }
@@ -148,10 +198,71 @@ impl<I: Iterator<Item = Value>> Iterator for ChunksIter<I> {
     }
 }
 
+struct ChunkRead<R: BufRead> {
+    reader: R,
+    size: NonZeroUsize,
+}
+
+impl<R: BufRead> Iterator for ChunkRead<R> {
+    type Item = Result<Vec<u8>, std::io::Error>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        let mut buf = Vec::with_capacity(self.size.get());
+        while buf.len() < self.size.get() {
+            let available = match self.reader.fill_buf() {
+                Ok([]) if buf.is_empty() => return None,
+                Ok([]) => return Some(Ok(buf)),
+                Ok(n) => n,
+                Err(ref e) if e.kind() == ErrorKind::Interrupted => continue,
+                Err(e) => return Some(Err(e)),
+            };
+            let needed = self.size.get() - buf.len();
+            let have = available.len().min(needed);
+            buf.extend_from_slice(&available[..have]);
+            self.reader.consume(have);
+        }
+        Some(Ok(buf))
+    }
+}
+
 #[cfg(test)]
 mod test {
+    use std::io::Read;
+
     use super::*;
 
+    #[test]
+    fn chunk_read() {
+        let s = "hello world";
+        let data = Cursor::new(s);
+        let chunk_read = ChunkRead {
+            reader: data,
+            size: NonZeroUsize::new(4).unwrap(),
+        };
+        let chunks = chunk_read.map(|e| e.unwrap()).collect::<Vec<_>>();
+        assert_eq!(
+            chunks,
+            [s[..4].as_bytes(), s[4..8].as_bytes(), s[8..].as_bytes()]
+        );
+    }
+
+    #[test]
+    fn chunk_read_stream() {
+        let s = "hello world";
+        let data = Cursor::new(&s[..3])
+            .chain(Cursor::new(&s[3..9]))
+            .chain(Cursor::new(&s[9..]));
+        let chunk_read = ChunkRead {
+            reader: data,
+            size: NonZeroUsize::new(4).unwrap(),
+        };
+        let chunks = chunk_read.map(|e| e.unwrap()).collect::<Vec<_>>();
+        assert_eq!(
+            chunks,
+            [s[..4].as_bytes(), s[4..8].as_bytes(), s[8..].as_bytes()]
+        );
+    }
+
     #[test]
     fn test_examples() {
         use crate::test_examples;

From 23ba613b002194a0cfeff2daa5177d77b3280d88 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Wed, 25 Dec 2024 04:15:50 -0800
Subject: [PATCH 0839/1072] Polars AWS S3 support (#14648)

# Description

Provides Amazon S3 support.

- Utilizes your existing AWS cli configuration.
- Supports AWS SSO
- Supports
[gimme-aws-creds](https://github.com/Nike-Inc/gimme-aws-creds).
- respects the settings of AWS_PROFILE environment variable for
selecting profile config
- AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, and AWS_REGION environment
variables for configuring without an AWS config

Usage:
```nushell
polars open s3://bucket/and/path.parquet
```

Supports:
- CSV
- Parquet
- NDJSON / json lines
- Arrow

Doesn't support:
- eager dataframes
-  Avro
- JSON
---
 Cargo.lock                                    | 594 ++++++++++++++++--
 crates/nu_plugin_polars/Cargo.toml            |  11 +-
 crates/nu_plugin_polars/src/cache/rm.rs       |   2 +-
 crates/nu_plugin_polars/src/cloud/aws.rs      |  67 ++
 crates/nu_plugin_polars/src/cloud/mod.rs      |  28 +
 .../src/dataframe/command/core/open.rs        | 191 ++++--
 .../src/dataframe/command/core/save/mod.rs    |   2 +-
 .../src/dataframe/command/core/to_lazy.rs     |   2 +-
 .../src/dataframe/values/file_type.rs         |  10 +-
 crates/nu_plugin_polars/src/lib.rs            |  30 +-
 crates/nu_plugin_polars/src/main.rs           |   9 +-
 11 files changed, 843 insertions(+), 103 deletions(-)
 create mode 100644 crates/nu_plugin_polars/src/cloud/aws.rs
 create mode 100644 crates/nu_plugin_polars/src/cloud/mod.rs

diff --git a/Cargo.lock b/Cargo.lock
index 3b8058c207..01a6592e41 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -339,6 +339,303 @@ dependencies = [
  "snap",
 ]
 
+[[package]]
+name = "aws-config"
+version = "1.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b49afaa341e8dd8577e1a2200468f98956d6eda50bcf4a53246cc00174ba924"
+dependencies = [
+ "aws-credential-types",
+ "aws-runtime",
+ "aws-sdk-sso",
+ "aws-sdk-ssooidc",
+ "aws-sdk-sts",
+ "aws-smithy-async",
+ "aws-smithy-http",
+ "aws-smithy-json",
+ "aws-smithy-runtime",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "aws-types",
+ "bytes",
+ "fastrand",
+ "hex",
+ "http 0.2.12",
+ "ring",
+ "time",
+ "tokio",
+ "tracing",
+ "url",
+ "zeroize",
+]
+
+[[package]]
+name = "aws-credential-types"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60e8f6b615cb5fc60a98132268508ad104310f0cfb25a1c22eee76efdf9154da"
+dependencies = [
+ "aws-smithy-async",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "zeroize",
+]
+
+[[package]]
+name = "aws-runtime"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a10d5c055aa540164d9561a0e2e74ad30f0dcf7393c3a92f6733ddf9c5762468"
+dependencies = [
+ "aws-credential-types",
+ "aws-sigv4",
+ "aws-smithy-async",
+ "aws-smithy-http",
+ "aws-smithy-runtime",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "aws-types",
+ "bytes",
+ "fastrand",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "tracing",
+ "uuid",
+]
+
+[[package]]
+name = "aws-sdk-sso"
+version = "1.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09677244a9da92172c8dc60109b4a9658597d4d298b188dd0018b6a66b410ca4"
+dependencies = [
+ "aws-credential-types",
+ "aws-runtime",
+ "aws-smithy-async",
+ "aws-smithy-http",
+ "aws-smithy-json",
+ "aws-smithy-runtime",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "aws-types",
+ "bytes",
+ "http 0.2.12",
+ "once_cell",
+ "regex-lite",
+ "tracing",
+]
+
+[[package]]
+name = "aws-sdk-ssooidc"
+version = "1.50.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81fea2f3a8bb3bd10932ae7ad59cc59f65f270fc9183a7e91f501dc5efbef7ee"
+dependencies = [
+ "aws-credential-types",
+ "aws-runtime",
+ "aws-smithy-async",
+ "aws-smithy-http",
+ "aws-smithy-json",
+ "aws-smithy-runtime",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "aws-types",
+ "bytes",
+ "http 0.2.12",
+ "once_cell",
+ "regex-lite",
+ "tracing",
+]
+
+[[package]]
+name = "aws-sdk-sts"
+version = "1.50.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ada54e5f26ac246dc79727def52f7f8ed38915cb47781e2a72213957dc3a7d5"
+dependencies = [
+ "aws-credential-types",
+ "aws-runtime",
+ "aws-smithy-async",
+ "aws-smithy-http",
+ "aws-smithy-json",
+ "aws-smithy-query",
+ "aws-smithy-runtime",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "aws-smithy-xml",
+ "aws-types",
+ "http 0.2.12",
+ "once_cell",
+ "regex-lite",
+ "tracing",
+]
+
+[[package]]
+name = "aws-sigv4"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5619742a0d8f253be760bfbb8e8e8368c69e3587e4637af5754e488a611499b1"
+dependencies = [
+ "aws-credential-types",
+ "aws-smithy-http",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "bytes",
+ "form_urlencoded",
+ "hex",
+ "hmac",
+ "http 0.2.12",
+ "http 1.2.0",
+ "once_cell",
+ "percent-encoding",
+ "sha2",
+ "time",
+ "tracing",
+]
+
+[[package]]
+name = "aws-smithy-async"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62220bc6e97f946ddd51b5f1361f78996e704677afc518a4ff66b7a72ea1378c"
+dependencies = [
+ "futures-util",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "aws-smithy-http"
+version = "0.60.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c8bc3e8fdc6b8d07d976e301c02fe553f72a39b7a9fea820e023268467d7ab6"
+dependencies = [
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "bytes",
+ "bytes-utils",
+ "futures-core",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "pin-utils",
+ "tracing",
+]
+
+[[package]]
+name = "aws-smithy-json"
+version = "0.60.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4683df9469ef09468dad3473d129960119a0d3593617542b7d52086c8486f2d6"
+dependencies = [
+ "aws-smithy-types",
+]
+
+[[package]]
+name = "aws-smithy-query"
+version = "0.60.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2fbd61ceb3fe8a1cb7352e42689cec5335833cd9f94103a61e98f9bb61c64bb"
+dependencies = [
+ "aws-smithy-types",
+ "urlencoding",
+]
+
+[[package]]
+name = "aws-smithy-runtime"
+version = "1.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be28bd063fa91fd871d131fc8b68d7cd4c5fa0869bea68daca50dcb1cbd76be2"
+dependencies = [
+ "aws-smithy-async",
+ "aws-smithy-http",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "bytes",
+ "fastrand",
+ "h2 0.3.26",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "http-body 1.0.1",
+ "httparse",
+ "hyper 0.14.31",
+ "hyper-rustls 0.24.2",
+ "once_cell",
+ "pin-project-lite",
+ "pin-utils",
+ "rustls 0.21.12",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "aws-smithy-runtime-api"
+version = "1.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92165296a47a812b267b4f41032ff8069ab7ff783696d217f0994a0d7ab585cd"
+dependencies = [
+ "aws-smithy-async",
+ "aws-smithy-types",
+ "bytes",
+ "http 0.2.12",
+ "http 1.2.0",
+ "pin-project-lite",
+ "tokio",
+ "tracing",
+ "zeroize",
+]
+
+[[package]]
+name = "aws-smithy-types"
+version = "1.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fbd94a32b3a7d55d3806fe27d98d3ad393050439dd05eb53ece36ec5e3d3510"
+dependencies = [
+ "base64-simd",
+ "bytes",
+ "bytes-utils",
+ "http 0.2.12",
+ "http 1.2.0",
+ "http-body 0.4.6",
+ "http-body 1.0.1",
+ "http-body-util",
+ "itoa",
+ "num-integer",
+ "pin-project-lite",
+ "pin-utils",
+ "ryu",
+ "serde",
+ "time",
+]
+
+[[package]]
+name = "aws-smithy-xml"
+version = "0.60.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab0b0166827aa700d3dc519f72f8b3a91c35d0b8d042dc5d643a91e6f80648fc"
+dependencies = [
+ "xmlparser",
+]
+
+[[package]]
+name = "aws-types"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5221b91b3e441e6675310829fd8984801b772cb1546ef6c0e54dec9f1ac13fef"
+dependencies = [
+ "aws-credential-types",
+ "aws-smithy-async",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "rustc_version",
+ "tracing",
+]
+
 [[package]]
 name = "backtrace"
 version = "0.3.74"
@@ -363,12 +660,28 @@ dependencies = [
  "backtrace",
 ]
 
+[[package]]
+name = "base64"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
 [[package]]
 name = "base64"
 version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
+[[package]]
+name = "base64-simd"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195"
+dependencies = [
+ "outref",
+ "vsimd",
+]
+
 [[package]]
 name = "bindgen"
 version = "0.70.1"
@@ -598,6 +911,16 @@ version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
 
+[[package]]
+name = "bytes-utils"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35"
+dependencies = [
+ "bytes",
+ "either",
+]
+
 [[package]]
 name = "bytesize"
 version = "1.3.0"
@@ -690,7 +1013,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1f927b07c74ba84c7e5fe4db2baeb3e996ab2688992e39ac68ce3220a677c7e"
 dependencies = [
- "base64",
+ "base64 0.22.1",
  "encoding_rs",
 ]
 
@@ -1307,6 +1630,7 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer",
  "crypto-common",
+ "subtle",
 ]
 
 [[package]]
@@ -1907,6 +2231,25 @@ dependencies = [
  "scroll",
 ]
 
+[[package]]
+name = "h2"
+version = "0.3.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http 0.2.12",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
 [[package]]
 name = "h2"
 version = "0.4.7"
@@ -1918,7 +2261,7 @@ dependencies = [
  "fnv",
  "futures-core",
  "futures-sink",
- "http",
+ "http 1.2.0",
  "indexmap",
  "slab",
  "tokio",
@@ -2026,6 +2369,15 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest",
+]
+
 [[package]]
 name = "home"
 version = "0.5.9"
@@ -2063,6 +2415,17 @@ dependencies = [
  "syn 2.0.90",
 ]
 
+[[package]]
+name = "http"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
 [[package]]
 name = "http"
 version = "1.2.0"
@@ -2074,6 +2437,17 @@ dependencies = [
  "itoa",
 ]
 
+[[package]]
+name = "http-body"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
+dependencies = [
+ "bytes",
+ "http 0.2.12",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "http-body"
 version = "1.0.1"
@@ -2081,7 +2455,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes",
- "http",
+ "http 1.2.0",
 ]
 
 [[package]]
@@ -2092,8 +2466,8 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
 dependencies = [
  "bytes",
  "futures-util",
- "http",
- "http-body",
+ "http 1.2.0",
+ "http-body 1.0.1",
  "pin-project-lite",
 ]
 
@@ -2127,6 +2501,30 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
+[[package]]
+name = "hyper"
+version = "0.14.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2 0.3.26",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "want",
+]
+
 [[package]]
 name = "hyper"
 version = "1.5.1"
@@ -2136,9 +2534,9 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2",
- "http",
- "http-body",
+ "h2 0.4.7",
+ "http 1.2.0",
+ "http-body 1.0.1",
  "httparse",
  "httpdate",
  "itoa",
@@ -2148,6 +2546,22 @@ dependencies = [
  "want",
 ]
 
+[[package]]
+name = "hyper-rustls"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
+dependencies = [
+ "futures-util",
+ "http 0.2.12",
+ "hyper 0.14.31",
+ "log",
+ "rustls 0.21.12",
+ "rustls-native-certs 0.6.3",
+ "tokio",
+ "tokio-rustls 0.24.1",
+]
+
 [[package]]
 name = "hyper-rustls"
 version = "0.27.3"
@@ -2155,14 +2569,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
 dependencies = [
  "futures-util",
- "http",
- "hyper",
+ "http 1.2.0",
+ "hyper 1.5.1",
  "hyper-util",
- "rustls",
- "rustls-native-certs",
+ "rustls 0.23.20",
+ "rustls-native-certs 0.8.1",
  "rustls-pki-types",
  "tokio",
- "tokio-rustls",
+ "tokio-rustls 0.26.1",
  "tower-service",
 ]
 
@@ -2175,9 +2589,9 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "http",
- "http-body",
- "hyper",
+ "http 1.2.0",
+ "http-body 1.0.1",
+ "hyper 1.5.1",
  "pin-project-lite",
  "socket2",
  "tokio",
@@ -2995,10 +3409,10 @@ dependencies = [
  "assert-json-diff",
  "bytes",
  "futures-util",
- "http",
- "http-body",
+ "http 1.2.0",
+ "http-body 1.0.1",
  "http-body-util",
- "hyper",
+ "hyper 1.5.1",
  "hyper-util",
  "log",
  "rand",
@@ -3318,7 +3732,7 @@ name = "nu-command"
 version = "0.101.1"
 dependencies = [
  "alphanumeric-sort",
- "base64",
+ "base64 0.22.1",
  "bracoxide",
  "brotli",
  "byteorder",
@@ -3803,6 +4217,8 @@ dependencies = [
 name = "nu_plugin_polars"
 version = "0.101.1"
 dependencies = [
+ "aws-config",
+ "aws-credential-types",
  "chrono",
  "chrono-tz 0.10.0",
  "env_logger 0.11.5",
@@ -3821,6 +4237,7 @@ dependencies = [
  "nu-protocol",
  "nu-utils",
  "num",
+ "object_store",
  "polars",
  "polars-arrow",
  "polars-io",
@@ -3830,7 +4247,9 @@ dependencies = [
  "serde",
  "sqlparser",
  "tempfile",
+ "tokio",
  "typetag",
+ "url",
  "uuid",
 ]
 
@@ -4089,12 +4508,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6da452820c715ce78221e8202ccc599b4a52f3e1eb3eedb487b680c81a8e3f3"
 dependencies = [
  "async-trait",
- "base64",
+ "base64 0.22.1",
  "bytes",
  "chrono",
  "futures",
  "humantime",
- "hyper",
+ "hyper 1.5.1",
  "itertools 0.13.0",
  "md-5",
  "parking_lot",
@@ -4236,6 +4655,12 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "outref"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a"
+
 [[package]]
 name = "owo-colors"
 version = "4.1.0"
@@ -4497,7 +4922,7 @@ version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016"
 dependencies = [
- "base64",
+ "base64 0.22.1",
  "indexmap",
  "quick-xml 0.32.0",
  "serde",
@@ -4675,6 +5100,7 @@ dependencies = [
  "blake3",
  "bytes",
  "chrono",
+ "chrono-tz 0.8.6",
  "fast-float",
  "flate2",
  "fs4",
@@ -4720,6 +5146,7 @@ checksum = "d5c8c057ef04feaf34b6ce52096bdea3a766fa4725f50442078c8a4ee86397bf"
 dependencies = [
  "ahash 0.8.11",
  "chrono",
+ "chrono-tz 0.8.6",
  "fallible-streaming-iterator",
  "hashbrown 0.15.2",
  "indexmap",
@@ -4741,6 +5168,7 @@ checksum = "4a8ca74f42e7b47cad241b36b98d991cc7fbb51b8d0695a055eb937588d1f310"
 dependencies = [
  "ahash 0.8.11",
  "bitflags 2.6.0",
+ "futures",
  "memchr",
  "once_cell",
  "polars-arrow",
@@ -4756,6 +5184,7 @@ dependencies = [
  "polars-time",
  "polars-utils",
  "rayon",
+ "tokio",
  "version_check",
 ]
 
@@ -4790,7 +5219,7 @@ checksum = "035c800fbe5bbd820afeb8313713ed345853bb014e0f821a4025d40cf0d60e1a"
 dependencies = [
  "ahash 0.8.11",
  "argminmax",
- "base64",
+ "base64 0.22.1",
  "bytemuck",
  "chrono",
  "chrono-tz 0.8.6",
@@ -4828,7 +5257,7 @@ checksum = "91dcf1d9f048079376949eaf2e24e240b313ff4a102fb83b57c9a5f807cdca52"
 dependencies = [
  "ahash 0.8.11",
  "async-stream",
- "base64",
+ "base64 0.22.1",
  "brotli",
  "bytemuck",
  "ethnum",
@@ -4881,6 +5310,7 @@ dependencies = [
  "polars-row",
  "polars-utils",
  "rayon",
+ "tokio",
  "uuid",
  "version_check",
 ]
@@ -5385,7 +5815,7 @@ dependencies = [
  "quinn-proto",
  "quinn-udp",
  "rustc-hash 2.1.0",
- "rustls",
+ "rustls 0.23.20",
  "socket2",
  "thiserror 2.0.6",
  "tokio",
@@ -5403,7 +5833,7 @@ dependencies = [
  "rand",
  "ring",
  "rustc-hash 2.1.0",
- "rustls",
+ "rustls 0.23.20",
  "rustls-pki-types",
  "slab",
  "thiserror 2.0.6",
@@ -5648,6 +6078,12 @@ dependencies = [
  "regex-syntax",
 ]
 
+[[package]]
+name = "regex-lite"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a"
+
 [[package]]
 name = "regex-syntax"
 version = "0.8.5"
@@ -5675,16 +6111,16 @@ version = "0.12.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
 dependencies = [
- "base64",
+ "base64 0.22.1",
  "bytes",
  "futures-core",
  "futures-util",
- "h2",
- "http",
- "http-body",
+ "h2 0.4.7",
+ "http 1.2.0",
+ "http-body 1.0.1",
  "http-body-util",
- "hyper",
- "hyper-rustls",
+ "hyper 1.5.1",
+ "hyper-rustls 0.27.3",
  "hyper-util",
  "ipnet",
  "js-sys",
@@ -5694,16 +6130,16 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "quinn",
- "rustls",
- "rustls-native-certs",
- "rustls-pemfile",
+ "rustls 0.23.20",
+ "rustls-native-certs 0.8.1",
+ "rustls-pemfile 2.2.0",
  "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "sync_wrapper",
  "tokio",
- "tokio-rustls",
+ "tokio-rustls 0.26.1",
  "tokio-util",
  "tower-service",
  "url",
@@ -5720,7 +6156,7 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc36545d1021456a751b573517cb52e8c339b2f662e6b2778ef629282678de29"
 dependencies = [
- "base64",
+ "base64 0.22.1",
  "charset",
  "chumsky",
  "memchr",
@@ -5959,6 +6395,18 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.21.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
+dependencies = [
+ "log",
+ "ring",
+ "rustls-webpki 0.101.7",
+ "sct",
+]
+
 [[package]]
 name = "rustls"
 version = "0.23.20"
@@ -5968,11 +6416,23 @@ dependencies = [
  "once_cell",
  "ring",
  "rustls-pki-types",
- "rustls-webpki",
+ "rustls-webpki 0.102.8",
  "subtle",
  "zeroize",
 ]
 
+[[package]]
+name = "rustls-native-certs"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
+dependencies = [
+ "openssl-probe",
+ "rustls-pemfile 1.0.4",
+ "schannel",
+ "security-framework 2.11.1",
+]
+
 [[package]]
 name = "rustls-native-certs"
 version = "0.8.1"
@@ -5985,6 +6445,15 @@ dependencies = [
  "security-framework 3.0.1",
 ]
 
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
+dependencies = [
+ "base64 0.21.7",
+]
+
 [[package]]
 name = "rustls-pemfile"
 version = "2.2.0"
@@ -6003,6 +6472,16 @@ dependencies = [
  "web-time",
 ]
 
+[[package]]
+name = "rustls-webpki"
+version = "0.101.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
 [[package]]
 name = "rustls-webpki"
 version = "0.102.8"
@@ -6099,6 +6578,16 @@ dependencies = [
  "syn 2.0.90",
 ]
 
+[[package]]
+name = "sct"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
 [[package]]
 name = "sdd"
 version = "3.0.4"
@@ -6976,6 +7465,7 @@ dependencies = [
  "mio 1.0.3",
  "parking_lot",
  "pin-project-lite",
+ "signal-hook-registry",
  "socket2",
  "tokio-macros",
  "windows-sys 0.52.0",
@@ -6992,13 +7482,23 @@ dependencies = [
  "syn 2.0.90",
 ]
 
+[[package]]
+name = "tokio-rustls"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
+dependencies = [
+ "rustls 0.21.12",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-rustls"
 version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
 dependencies = [
- "rustls",
+ "rustls 0.23.20",
  "tokio",
 ]
 
@@ -7273,7 +7773,7 @@ version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d"
 dependencies = [
- "base64",
+ "base64 0.22.1",
  "encoding_rs",
  "flate2",
  "log",
@@ -7498,6 +7998,12 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
+[[package]]
+name = "vsimd"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64"
+
 [[package]]
 name = "vte"
 version = "0.10.1"
@@ -8222,6 +8728,12 @@ dependencies = [
  "markup5ever 0.12.1",
 ]
 
+[[package]]
+name = "xmlparser"
+version = "0.13.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
+
 [[package]]
 name = "xxhash-rust"
 version = "0.8.12"
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index c3e2f0583e..665116f651 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -31,7 +31,7 @@ mimalloc = { version = "0.1.42" }
 num = {version = "0.4"}
 serde = { version = "1.0", features = ["derive"] }
 sqlparser = { version = "0.49"}
-polars-io = { version = "0.44", features = ["avro"]}
+polars-io = { version = "0.44", features = ["avro", "cloud", "aws"]}
 polars-arrow = { version = "0.44"}
 polars-ops = { version = "0.44", features = ["pivot"]}
 polars-plan = { version = "0.44", features = ["regex"]}
@@ -44,10 +44,18 @@ uuid = { version = "1.11", features = ["v4", "serde"] }
 # Do to a compile error with polars, this included to force the raw dependency
 hashbrown = { version = "0.14", features = ["rayon", "ahash", "serde", "raw"] }
 
+# Cloud support
+aws-config = { version = "1.5", features = ["sso"] }
+aws-credential-types = "1.2"
+tokio = { version = "1.41", features = ["full"] }
+object_store = { version = "0.10", default-features = false }
+url.workspace = true
+
 [dependencies.polars]
 features = [
     "arg_where",
     "checked_arithmetic",
+    "cloud",
     "concat_str",
     "cross_join",
     "csv",
@@ -77,6 +85,7 @@ features = [
     "strings",
     "string_to_integer",
     "streaming",
+    "timezones",
     "temporal",
     "to_dummies",
 ]
diff --git a/crates/nu_plugin_polars/src/cache/rm.rs b/crates/nu_plugin_polars/src/cache/rm.rs
index 537b7c6356..7b572bef50 100644
--- a/crates/nu_plugin_polars/src/cache/rm.rs
+++ b/crates/nu_plugin_polars/src/cache/rm.rs
@@ -89,7 +89,7 @@ mod test {
 
     #[test]
     fn test_remove() -> Result<(), ShellError> {
-        let plugin = PolarsPlugin::new_test_mode().into();
+        let plugin = PolarsPlugin::new_test_mode()?.into();
         let pipeline_data = PluginTest::new("polars", plugin)?
             .add_decl(Box::new(First))?
             .add_decl(Box::new(Get))?
diff --git a/crates/nu_plugin_polars/src/cloud/aws.rs b/crates/nu_plugin_polars/src/cloud/aws.rs
new file mode 100644
index 0000000000..09bd2f609e
--- /dev/null
+++ b/crates/nu_plugin_polars/src/cloud/aws.rs
@@ -0,0 +1,67 @@
+use std::error::Error;
+
+use aws_config::{BehaviorVersion, SdkConfig};
+use aws_credential_types::{provider::ProvideCredentials, Credentials};
+use nu_protocol::ShellError;
+use object_store::aws::AmazonS3ConfigKey;
+use polars_io::cloud::CloudOptions;
+
+use crate::PolarsPlugin;
+
+async fn load_aws_config() -> SdkConfig {
+    aws_config::load_defaults(BehaviorVersion::latest()).await
+}
+
+async fn aws_creds(aws_config: &SdkConfig) -> Result<Option<Credentials>, ShellError> {
+    if let Some(provider) = aws_config.credentials_provider() {
+        Ok(Some(provider.provide_credentials().await.map_err(|e| {
+            ShellError::GenericError {
+                error: format!(
+                    "Could not fetch AWS credentials: {} - {}",
+                    e,
+                    e.source()
+                        .map(|e| format!("{}", e))
+                        .unwrap_or("".to_string())
+                ),
+                msg: "".into(),
+                span: None,
+                help: None,
+                inner: vec![],
+            }
+        })?))
+    } else {
+        Ok(None)
+    }
+}
+
+async fn build_aws_cloud_configs() -> Result<Vec<(AmazonS3ConfigKey, String)>, ShellError> {
+    let sdk_config = load_aws_config().await;
+    let creds = aws_creds(&sdk_config)
+        .await?
+        .ok_or(ShellError::GenericError {
+            error: "Could not determine AWS credentials".into(),
+            msg: "".into(),
+            span: None,
+            help: None,
+            inner: vec![],
+        })?;
+
+    let mut configs = vec![
+        (AmazonS3ConfigKey::AccessKeyId, creds.access_key_id().into()),
+        (
+            AmazonS3ConfigKey::SecretAccessKey,
+            creds.secret_access_key().into(),
+        ),
+    ];
+
+    if let Some(token) = creds.session_token() {
+        configs.push((AmazonS3ConfigKey::Token, token.into()))
+    }
+
+    Ok(configs)
+}
+
+pub(crate) fn build_cloud_options(plugin: &PolarsPlugin) -> Result<CloudOptions, ShellError> {
+    let configs = plugin.runtime.block_on(build_aws_cloud_configs())?;
+    Ok(CloudOptions::default().with_aws(configs))
+}
diff --git a/crates/nu_plugin_polars/src/cloud/mod.rs b/crates/nu_plugin_polars/src/cloud/mod.rs
new file mode 100644
index 0000000000..8a3bf161f5
--- /dev/null
+++ b/crates/nu_plugin_polars/src/cloud/mod.rs
@@ -0,0 +1,28 @@
+use nu_protocol::ShellError;
+use polars_io::cloud::CloudOptions;
+use url::Url;
+
+use crate::PolarsPlugin;
+
+mod aws;
+
+enum CloudType {
+    Aws,
+}
+
+fn determine_cloud_type(url: &Url) -> Option<CloudType> {
+    match url.scheme() {
+        "s3" | "s3a" => Some(CloudType::Aws),
+        _ => None,
+    }
+}
+
+pub(crate) fn build_cloud_options(
+    plugin: &PolarsPlugin,
+    url: &Url,
+) -> Result<Option<CloudOptions>, ShellError> {
+    match determine_cloud_type(url) {
+        Some(CloudType::Aws) => aws::build_cloud_options(plugin).map(Some),
+        _ => Ok(None),
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/open.rs b/crates/nu_plugin_polars/src/dataframe/command/core/open.rs
index 856c037270..97a44d8f4f 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/open.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/open.rs
@@ -1,10 +1,13 @@
 use crate::{
+    cloud::build_cloud_options,
     dataframe::values::NuSchema,
     values::{CustomValueSupport, NuDataFrame, NuLazyFrame, PolarsFileType},
     EngineWrapper, PolarsPlugin,
 };
+use log::debug;
 use nu_path::expand_path_with;
 use nu_utils::perf;
+use url::Url;
 
 use nu_plugin::PluginCommand;
 use nu_protocol::{
@@ -12,13 +15,7 @@ use nu_protocol::{
     SyntaxShape, Type, Value,
 };
 
-use std::{
-    fs::File,
-    io::BufReader,
-    num::NonZeroUsize,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
+use std::{fmt::Debug, fs::File, io::BufReader, num::NonZeroUsize, path::PathBuf, sync::Arc};
 
 use polars::{
     lazy::frame::LazyJsonLineReader,
@@ -28,7 +25,7 @@ use polars::{
     },
 };
 
-use polars_io::{avro::AvroReader, csv::read::CsvReadOptions, HiveOptions};
+use polars_io::{avro::AvroReader, cloud::CloudOptions, csv::read::CsvReadOptions, HiveOptions};
 
 const DEFAULT_INFER_SCHEMA: usize = 100;
 
@@ -50,8 +47,8 @@ impl PluginCommand for OpenDataFrame {
         Signature::build(self.name())
             .required(
                 "file",
-                SyntaxShape::Filepath,
-                "file path to load values from",
+                SyntaxShape::String,
+                "file path or cloud url to load values from",
             )
             .switch("eager", "Open dataframe as an eager dataframe", None)
             .named(
@@ -119,34 +116,98 @@ impl PluginCommand for OpenDataFrame {
     }
 }
 
+struct Resource {
+    path: String,
+    extension: Option<String>,
+    cloud_options: Option<CloudOptions>,
+    span: Span,
+}
+
+impl Debug for Resource {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        // We can't print out the cloud options as it might have
+        // secrets in it.. So just print whether or not it was defined
+        f.debug_struct("Resource")
+            .field("path", &self.path)
+            .field("extension", &self.extension)
+            .field("has_cloud_options", &self.cloud_options.is_some())
+            .field("span", &self.span)
+            .finish()
+    }
+}
+
+impl Resource {
+    fn new(
+        plugin: &PolarsPlugin,
+        engine: &nu_plugin::EngineInterface,
+        spanned_path: &Spanned<String>,
+    ) -> Result<Self, ShellError> {
+        let mut path = spanned_path.item.clone();
+        let (path_buf, cloud_options) = if let Ok(url) = path.parse::<Url>() {
+            let cloud_options =
+                build_cloud_options(plugin, &url)?.ok_or(ShellError::GenericError {
+                    error: format!("Could not determine a supported cloud type from url: {url}"),
+                    msg: "".into(),
+                    span: None,
+                    help: None,
+                    inner: vec![],
+                })?;
+            let p: PathBuf = url.path().into();
+            (p, Some(cloud_options))
+        } else {
+            let new_path = expand_path_with(path, engine.get_current_dir()?, true);
+            path = new_path.to_string_lossy().to_string();
+            (new_path, None)
+        };
+        let extension = path_buf
+            .extension()
+            .and_then(|s| s.to_str().map(|s| s.to_string()));
+        Ok(Self {
+            path,
+            extension,
+            cloud_options,
+            span: spanned_path.span,
+        })
+    }
+}
+
 fn command(
     plugin: &PolarsPlugin,
     engine: &nu_plugin::EngineInterface,
     call: &nu_plugin::EvaluatedCall,
 ) -> Result<PipelineData, ShellError> {
-    let spanned_file: Spanned<PathBuf> = call.req(0)?;
-    let file_path = expand_path_with(&spanned_file.item, engine.get_current_dir()?, true);
-    let file_span = spanned_file.span;
+    let spanned_file: Spanned<String> = call.req(0)?;
+    debug!("file: {}", spanned_file.item);
 
+    let resource = Resource::new(plugin, engine, &spanned_file)?;
     let type_option: Option<(String, Span)> = call
         .get_flag("type")?
         .map(|t: Spanned<String>| (t.item, t.span))
-        .or_else(|| {
-            file_path
-                .extension()
-                .map(|e| (e.to_string_lossy().into_owned(), spanned_file.span))
+        .or_else(|| resource.extension.clone().map(|e| (e, resource.span)));
+    debug!("resource: {resource:?}");
+
+    let is_eager = call.has_flag("eager")?;
+
+    if is_eager && resource.cloud_options.is_some() {
+        return Err(ShellError::GenericError {
+            error: "Cloud URLs are not supported with --eager".into(),
+            msg: "".into(),
+            span: call.get_flag_span("eager"),
+            help: Some("Remove flag".into()),
+            inner: vec![],
         });
+    }
 
     match type_option {
         Some((ext, blamed)) => match PolarsFileType::from(ext.as_str()) {
             PolarsFileType::Csv | PolarsFileType::Tsv => {
-                from_csv(plugin, engine, call, &file_path, file_span)
+                from_csv(plugin, engine, call, resource, is_eager)
             }
-            PolarsFileType::Parquet => from_parquet(plugin, engine, call, &file_path, file_span),
-            PolarsFileType::Arrow => from_arrow(plugin, engine, call, &file_path, file_span),
-            PolarsFileType::Json => from_json(plugin, engine, call, &file_path, file_span),
-            PolarsFileType::NdJson => from_ndjson(plugin, engine, call, &file_path, file_span),
-            PolarsFileType::Avro => from_avro(plugin, engine, call, &file_path, file_span),
+            PolarsFileType::Parquet => from_parquet(plugin, engine, call, resource, is_eager),
+            PolarsFileType::Arrow => from_arrow(plugin, engine, call, resource, is_eager),
+            PolarsFileType::Json => from_json(plugin, engine, call, resource, is_eager),
+            PolarsFileType::NdJson => from_ndjson(plugin, engine, call, resource, is_eager),
+            PolarsFileType::Avro => from_avro(plugin, engine, call, resource, is_eager),
             _ => Err(PolarsFileType::build_unsupported_error(
                 &ext,
                 &[
@@ -172,13 +233,17 @@ fn from_parquet(
     plugin: &PolarsPlugin,
     engine: &nu_plugin::EngineInterface,
     call: &nu_plugin::EvaluatedCall,
-    file_path: &Path,
-    file_span: Span,
+    resource: Resource,
+    is_eager: bool,
 ) -> Result<Value, ShellError> {
-    if !call.has_flag("eager")? {
-        let file: String = call.req(0)?;
-        let args = ScanArgsParquet::default();
-        let df: NuLazyFrame = LazyFrame::scan_parquet(file, args)
+    let file_path = resource.path;
+    let file_span = resource.span;
+    if !is_eager {
+        let args = ScanArgsParquet {
+            cloud_options: resource.cloud_options.clone(),
+            ..Default::default()
+        };
+        let df: NuLazyFrame = LazyFrame::scan_parquet(file_path, args)
             .map_err(|e| ShellError::GenericError {
                 error: "Parquet reader error".into(),
                 msg: format!("{e:?}"),
@@ -225,11 +290,16 @@ fn from_avro(
     plugin: &PolarsPlugin,
     engine: &nu_plugin::EngineInterface,
     call: &nu_plugin::EvaluatedCall,
-    file_path: &Path,
-    file_span: Span,
+    resource: Resource,
+    _is_eager: bool, // ignore, lazy frames are not currently supported
 ) -> Result<Value, ShellError> {
-    let columns: Option<Vec<String>> = call.get_flag("columns")?;
+    let file_path = resource.path;
+    let file_span = resource.span;
+    if resource.cloud_options.is_some() {
+        return Err(cloud_not_supported(PolarsFileType::Avro, file_span));
+    }
 
+    let columns: Option<Vec<String>> = call.get_flag("columns")?;
     let r = File::open(file_path).map_err(|e| ShellError::GenericError {
         error: "Error opening file".into(),
         msg: e.to_string(),
@@ -262,22 +332,23 @@ fn from_arrow(
     plugin: &PolarsPlugin,
     engine: &nu_plugin::EngineInterface,
     call: &nu_plugin::EvaluatedCall,
-    file_path: &Path,
-    file_span: Span,
+    resource: Resource,
+    is_eager: bool,
 ) -> Result<Value, ShellError> {
-    if !call.has_flag("eager")? {
-        let file: String = call.req(0)?;
+    let file_path = resource.path;
+    let file_span = resource.span;
+    if !is_eager {
         let args = ScanArgsIpc {
             n_rows: None,
             cache: true,
             rechunk: false,
             row_index: None,
-            cloud_options: None,
+            cloud_options: resource.cloud_options.clone(),
             include_file_paths: None,
             hive_options: HiveOptions::default(),
         };
 
-        let df: NuLazyFrame = LazyFrame::scan_ipc(file, args)
+        let df: NuLazyFrame = LazyFrame::scan_ipc(file_path, args)
             .map_err(|e| ShellError::GenericError {
                 error: "IPC reader error".into(),
                 msg: format!("{e:?}"),
@@ -324,9 +395,14 @@ fn from_json(
     plugin: &PolarsPlugin,
     engine: &nu_plugin::EngineInterface,
     call: &nu_plugin::EvaluatedCall,
-    file_path: &Path,
-    file_span: Span,
+    resource: Resource,
+    _is_eager: bool, // ignore = lazy frames not currently supported
 ) -> Result<Value, ShellError> {
+    let file_path = resource.path;
+    let file_span = resource.span;
+    if resource.cloud_options.is_some() {
+        return Err(cloud_not_supported(PolarsFileType::Json, file_span));
+    }
     let file = File::open(file_path).map_err(|e| ShellError::GenericError {
         error: "Error opening file".into(),
         msg: e.to_string(),
@@ -365,9 +441,11 @@ fn from_ndjson(
     plugin: &PolarsPlugin,
     engine: &nu_plugin::EngineInterface,
     call: &nu_plugin::EvaluatedCall,
-    file_path: &Path,
-    file_span: Span,
+    resource: Resource,
+    is_eager: bool,
 ) -> Result<Value, ShellError> {
+    let file_path = resource.path;
+    let file_span = resource.span;
     let infer_schema: NonZeroUsize = call
         .get_flag("infer-schema")?
         .and_then(NonZeroUsize::new)
@@ -380,12 +458,13 @@ fn from_ndjson(
         .map(|schema| NuSchema::try_from(&schema))
         .transpose()?;
 
-    if !call.has_flag("eager")? {
+    if !is_eager {
         let start_time = std::time::Instant::now();
 
         let df = LazyJsonLineReader::new(file_path)
             .with_infer_schema_length(Some(infer_schema))
             .with_schema(maybe_schema.map(|s| s.into()))
+            .with_cloud_options(resource.cloud_options.clone())
             .finish()
             .map_err(|e| ShellError::GenericError {
                 error: format!("NDJSON reader error: {e}"),
@@ -444,9 +523,11 @@ fn from_csv(
     plugin: &PolarsPlugin,
     engine: &nu_plugin::EngineInterface,
     call: &nu_plugin::EvaluatedCall,
-    file_path: &Path,
-    file_span: Span,
+    resource: Resource,
+    is_eager: bool,
 ) -> Result<Value, ShellError> {
+    let file_path = resource.path;
+    let file_span = resource.span;
     let delimiter: Option<Spanned<String>> = call.get_flag("delimiter")?;
     let no_header: bool = call.has_flag("no-header")?;
     let infer_schema: usize = call
@@ -460,8 +541,9 @@ fn from_csv(
         .transpose()?;
     let truncate_ragged_lines: bool = call.has_flag("truncate-ragged-lines")?;
 
-    if !call.has_flag("eager")? {
-        let csv_reader = LazyCsvReader::new(file_path);
+    if !is_eager {
+        let csv_reader =
+            LazyCsvReader::new(file_path).with_cloud_options(resource.cloud_options.clone());
 
         let csv_reader = match delimiter {
             None => csv_reader,
@@ -533,7 +615,7 @@ fn from_csv(
                     .with_encoding(CsvEncoding::LossyUtf8)
                     .with_truncate_ragged_lines(truncate_ragged_lines)
             })
-            .try_into_reader_with_file_path(Some(file_path.to_path_buf()))
+            .try_into_reader_with_file_path(Some(file_path.into()))
             .map_err(|e| ShellError::GenericError {
                 error: "Error creating CSV reader".into(),
                 msg: e.to_string(),
@@ -556,3 +638,16 @@ fn from_csv(
         df.cache_and_to_value(plugin, engine, call.head)
     }
 }
+
+fn cloud_not_supported(file_type: PolarsFileType, span: Span) -> ShellError {
+    ShellError::GenericError {
+        error: format!(
+            "Cloud operations not supported for file type {}",
+            file_type.to_str()
+        ),
+        msg: "".into(),
+        span: Some(span),
+        help: None,
+        inner: vec![],
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/save/mod.rs b/crates/nu_plugin_polars/src/dataframe/command/core/save/mod.rs
index 6d92b9bd33..8619ec9d42 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/save/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/save/mod.rs
@@ -248,7 +248,7 @@ pub(crate) mod test {
         let tmp_file_str = tmp_file.to_str().expect("should be able to get file path");
 
         let cmd = format!("{cmd} {tmp_file_str}");
-        let mut plugin_test = PluginTest::new("polars", PolarsPlugin::default().into())?;
+        let mut plugin_test = PluginTest::new("polars", PolarsPlugin::new()?.into())?;
         plugin_test.engine_state_mut().add_env_var(
             "PWD".to_string(),
             Value::string(
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/to_lazy.rs b/crates/nu_plugin_polars/src/dataframe/command/core/to_lazy.rs
index 1b42d310f3..4d8bf5bfcf 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/to_lazy.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/to_lazy.rs
@@ -79,7 +79,7 @@ mod tests {
 
     #[test]
     fn test_to_lazy() -> Result<(), ShellError> {
-        let plugin: Arc<PolarsPlugin> = PolarsPlugin::new_test_mode().into();
+        let plugin: Arc<PolarsPlugin> = PolarsPlugin::new_test_mode()?.into();
         let mut plugin_test = PluginTest::new("polars", Arc::clone(&plugin))?;
         let pipeline_data = plugin_test.eval("[[a b]; [6 2] [1 4] [4 1]] | polars into-lazy")?;
         let value = pipeline_data.into_value(Span::test_data())?;
diff --git a/crates/nu_plugin_polars/src/dataframe/values/file_type.rs b/crates/nu_plugin_polars/src/dataframe/values/file_type.rs
index c46fcd7113..eee30b7be1 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/file_type.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/file_type.rs
@@ -1,5 +1,6 @@
 use nu_protocol::{ShellError, Span};
 
+#[derive(Debug, Clone, PartialEq)]
 pub enum PolarsFileType {
     Csv,
     Tsv,
@@ -23,9 +24,12 @@ impl PolarsFileType {
             .collect::<Vec<&'static str>>()
             .join(", ");
 
-        ShellError::FileNotFoundCustom {
-            msg: format!("Unsupported type {extension} expected {type_string}"),
-            span,
+        ShellError::GenericError {
+            error: format!("Unsupported type {extension} expected {type_string}"),
+            msg: "".into(),
+            span: Some(span),
+            help: None,
+            inner: vec![],
         }
     }
 
diff --git a/crates/nu_plugin_polars/src/lib.rs b/crates/nu_plugin_polars/src/lib.rs
index 342e5cd28c..d9c7e6d392 100644
--- a/crates/nu_plugin_polars/src/lib.rs
+++ b/crates/nu_plugin_polars/src/lib.rs
@@ -14,9 +14,11 @@ use log::debug;
 use nu_plugin::{EngineInterface, Plugin, PluginCommand};
 
 mod cache;
+mod cloud;
 pub mod dataframe;
 pub use dataframe::*;
 use nu_protocol::{ast::Operator, CustomValue, LabeledError, ShellError, Span, Spanned, Value};
+use tokio::runtime::Runtime;
 use values::CustomValueType;
 
 use crate::values::PolarsPluginCustomValue;
@@ -52,11 +54,27 @@ impl EngineWrapper for &EngineInterface {
     }
 }
 
-#[derive(Default)]
 pub struct PolarsPlugin {
     pub(crate) cache: Cache,
     /// For testing purposes only
     pub(crate) disable_cache_drop: bool,
+    pub(crate) runtime: Runtime,
+}
+
+impl PolarsPlugin {
+    pub fn new() -> Result<Self, ShellError> {
+        Ok(Self {
+            cache: Cache::default(),
+            disable_cache_drop: false,
+            runtime: Runtime::new().map_err(|e| ShellError::GenericError {
+                error: format!("Could not instantiate tokio: {e}"),
+                msg: "".into(),
+                span: None,
+                help: None,
+                inner: vec![],
+            })?,
+        })
+    }
 }
 
 impl Plugin for PolarsPlugin {
@@ -237,11 +255,11 @@ pub mod test {
 
     impl PolarsPlugin {
         /// Creates a new polars plugin in test mode
-        pub fn new_test_mode() -> Self {
-            PolarsPlugin {
+        pub fn new_test_mode() -> Result<Self, ShellError> {
+            Ok(PolarsPlugin {
                 disable_cache_drop: true,
-                ..PolarsPlugin::default()
-            }
+                ..PolarsPlugin::new()?
+            })
         }
     }
 
@@ -269,7 +287,7 @@ pub mod test {
         command: &impl PluginCommand,
         decls: Vec<Box<dyn Command>>,
     ) -> Result<(), ShellError> {
-        let plugin = PolarsPlugin::new_test_mode();
+        let plugin = PolarsPlugin::new_test_mode()?;
         let examples = command.examples();
 
         // we need to cache values in the examples
diff --git a/crates/nu_plugin_polars/src/main.rs b/crates/nu_plugin_polars/src/main.rs
index a930c5caab..3f880a10e4 100644
--- a/crates/nu_plugin_polars/src/main.rs
+++ b/crates/nu_plugin_polars/src/main.rs
@@ -6,5 +6,12 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
 
 fn main() {
     env_logger::init();
-    serve_plugin(&PolarsPlugin::default(), MsgPackSerializer {})
+
+    match PolarsPlugin::new() {
+        Ok(ref plugin) => serve_plugin(plugin, MsgPackSerializer {}),
+        Err(e) => {
+            eprintln!("{}", e);
+            std::process::exit(1);
+        }
+    }
 }

From 469e23cae4dd840189e9e1408672c9ef9dc97b11 Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Wed, 25 Dec 2024 16:04:43 +0300
Subject: [PATCH 0840/1072] Add `bytes split` command (#14652)

Related #10708

# Description

Add `bytes split` command. `bytes split` splits its input on the
provided separator on binary values _and_ binary streams without
collecting. The separator can be a multiple character string or multiple
byte binary.

It can be used when neither `split row` (not streaming over raw input)
nor `lines` (streaming, but can only split on newlines) is right.

The backing iterator implemented in this PR, `SplitRead`, can be used to
implement a streaming `split row` in the future.

# User-Facing Changes

`bytes split` command added, which can be used to split binary values
and raw streams using a separator.

# Tests + Formatting

- :green_circle: toolkit fmt
- :green_circle: toolkit clippy
- :green_circle: toolkit test
- :green_circle: toolkit test stdlib

# After Submitting
Mention in release notes.
---
 Cargo.lock                                    |   1 +
 Cargo.toml                                    |   1 +
 crates/nu-command/src/bytes/mod.rs            |   2 +
 crates/nu-command/src/bytes/split.rs          | 109 +++++++++
 crates/nu-command/src/default_context.rs      |   1 +
 crates/nu-protocol/Cargo.toml                 |   3 +-
 .../nu-protocol/src/pipeline/byte_stream.rs   | 206 ++++++++++++++++++
 7 files changed, 322 insertions(+), 1 deletion(-)
 create mode 100644 crates/nu-command/src/bytes/split.rs

diff --git a/Cargo.lock b/Cargo.lock
index 01a6592e41..3300716fd5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4055,6 +4055,7 @@ dependencies = [
  "indexmap",
  "log",
  "lru",
+ "memchr",
  "miette",
  "nix 0.29.0",
  "nu-derive-value",
diff --git a/Cargo.toml b/Cargo.toml
index 0948360b20..c6702371b3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -183,6 +183,7 @@ which = "7.0.0"
 windows = "0.56"
 windows-sys = "0.48"
 winreg = "0.52"
+memchr = "2.7.4"
 
 [workspace.lints.clippy]
 # Warning: workspace lints affect library code as well as tests, so don't enable lints that would be too noisy in tests like that.
diff --git a/crates/nu-command/src/bytes/mod.rs b/crates/nu-command/src/bytes/mod.rs
index 6d47bb892c..73018f3867 100644
--- a/crates/nu-command/src/bytes/mod.rs
+++ b/crates/nu-command/src/bytes/mod.rs
@@ -9,6 +9,7 @@ mod length;
 mod remove;
 mod replace;
 mod reverse;
+mod split;
 mod starts_with;
 
 pub use add::BytesAdd;
@@ -22,4 +23,5 @@ pub use length::BytesLen;
 pub use remove::BytesRemove;
 pub use replace::BytesReplace;
 pub use reverse::BytesReverse;
+pub use split::BytesSplit;
 pub use starts_with::BytesStartsWith;
diff --git a/crates/nu-command/src/bytes/split.rs b/crates/nu-command/src/bytes/split.rs
new file mode 100644
index 0000000000..40d39e63b7
--- /dev/null
+++ b/crates/nu-command/src/bytes/split.rs
@@ -0,0 +1,109 @@
+use nu_engine::command_prelude::*;
+
+#[derive(Clone)]
+pub struct BytesSplit;
+
+impl Command for BytesSplit {
+    fn name(&self) -> &str {
+        "bytes split"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("bytes split")
+            .input_output_types(vec![(Type::Binary, Type::list(Type::Binary))])
+            .required(
+                "separator",
+                SyntaxShape::OneOf(vec![SyntaxShape::Binary, SyntaxShape::String]),
+                "Bytes or string that the input will be split on (must be non-empty).",
+            )
+            .category(Category::Bytes)
+    }
+
+    fn description(&self) -> &str {
+        "Split input into multiple items using a separator."
+    }
+
+    fn search_terms(&self) -> Vec<&str> {
+        vec!["separate", "stream"]
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                example: r#"0x[66 6F 6F 20 62 61 72 20 62 61 7A 20] | bytes split 0x[20]"#,
+                description: "Split a binary value using a binary separator",
+                result: Some(Value::test_list(vec![
+                    Value::test_binary("foo"),
+                    Value::test_binary("bar"),
+                    Value::test_binary("baz"),
+                    Value::test_binary(""),
+                ])),
+            },
+            Example {
+                example: r#"0x[61 2D 2D 62 2D 2D 63] | bytes split "--""#,
+                description: "Split a binary value using a string separator",
+                result: Some(Value::test_list(vec![
+                    Value::test_binary("a"),
+                    Value::test_binary("b"),
+                    Value::test_binary("c"),
+                ])),
+            },
+        ]
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let head = call.head;
+        let Spanned {
+            item: separator,
+            span,
+        }: Spanned<Vec<u8>> = call.req(engine_state, stack, 0)?;
+
+        if separator.is_empty() {
+            return Err(ShellError::IncorrectValue {
+                msg: "Separator can't be empty".into(),
+                val_span: span,
+                call_span: call.head,
+            });
+        }
+
+        let (split_read, md) = match input {
+            PipelineData::Value(Value::Binary { val, .. }, md) => (
+                ByteStream::read_binary(val, head, engine_state.signals().clone()).split(separator),
+                md,
+            ),
+            PipelineData::ByteStream(stream, md) => (stream.split(separator), md),
+            input => {
+                let span = input.span().unwrap_or(head);
+                return Err(input.unsupported_input_error("bytes", span));
+            }
+        };
+        if let Some(split) = split_read {
+            Ok(split
+                .map(move |part| match part {
+                    Ok(val) => Value::binary(val, head),
+                    Err(err) => Value::error(err, head),
+                })
+                .into_pipeline_data_with_metadata(head, engine_state.signals().clone(), md))
+        } else {
+            Ok(PipelineData::empty())
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_examples() {
+        use crate::test_examples;
+
+        test_examples(BytesSplit {})
+    }
+}
diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index bcff06b5e8..168ee78027 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -380,6 +380,7 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
         bind_command! {
             Bytes,
             BytesLen,
+            BytesSplit,
             BytesStartsWith,
             BytesEndsWith,
             BytesReverse,
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index d162999b9d..b4a126511b 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -41,6 +41,7 @@ typetag = "0.2"
 os_pipe = { workspace = true, optional = true, features = ["io_safety"] }
 log = { workspace = true }
 web-time = { workspace = true }
+memchr = { workspace = true }
 
 [target.'cfg(unix)'.dependencies]
 nix = { workspace = true, default-features = false, features = ["signal"] }
@@ -74,4 +75,4 @@ tempfile = { workspace = true }
 os_pipe = { workspace = true }
 
 [package.metadata.docs.rs]
-all-features = true
\ No newline at end of file
+all-features = true
diff --git a/crates/nu-protocol/src/pipeline/byte_stream.rs b/crates/nu-protocol/src/pipeline/byte_stream.rs
index 2b7c93495e..e24c0753e6 100644
--- a/crates/nu-protocol/src/pipeline/byte_stream.rs
+++ b/crates/nu-protocol/src/pipeline/byte_stream.rs
@@ -415,6 +415,18 @@ impl ByteStream {
         })
     }
 
+    /// Convert the [`ByteStream`] into a [`SplitRead`] iterator where each element is a `Result<String, ShellError>`.
+    ///
+    /// Each call to [`next`](Iterator::next) reads the currently available data from the byte
+    /// stream source, until `delimiter` or the end of the stream is encountered.
+    ///
+    /// If the source of the [`ByteStream`] is [`ByteStreamSource::Child`] and the child has no stdout,
+    /// then the stream is considered empty and `None` will be returned.
+    pub fn split(self, delimiter: Vec<u8>) -> Option<SplitRead> {
+        let reader = self.stream.reader()?;
+        Some(SplitRead::new(reader, delimiter, self.span, self.signals))
+    }
+
     /// Convert the [`ByteStream`] into a [`Chunks`] iterator where each element is a `Result<Value, ShellError>`.
     ///
     /// Each call to [`next`](Iterator::next) reads the currently available data from the byte stream source,
@@ -746,6 +758,200 @@ impl Iterator for Lines {
     }
 }
 
+mod split_read {
+    use std::io::{BufRead, ErrorKind};
+
+    use memchr::memmem::Finder;
+
+    pub struct SplitRead<R> {
+        reader: Option<R>,
+        buf: Option<Vec<u8>>,
+        finder: Finder<'static>,
+    }
+
+    impl<R: BufRead> SplitRead<R> {
+        pub fn new(reader: R, delim: impl AsRef<[u8]>) -> Self {
+            // empty delimiter results in an infinite stream of empty items
+            debug_assert!(!delim.as_ref().is_empty(), "delimiter can't be empty");
+            Self {
+                reader: Some(reader),
+                buf: Some(Vec::new()),
+                finder: Finder::new(delim.as_ref()).into_owned(),
+            }
+        }
+    }
+
+    impl<R: BufRead> Iterator for SplitRead<R> {
+        type Item = Result<Vec<u8>, std::io::Error>;
+
+        fn next(&mut self) -> Option<Self::Item> {
+            let buf = self.buf.as_mut()?;
+            let mut search_start = 0usize;
+
+            loop {
+                if let Some(i) = self.finder.find(&buf[search_start..]) {
+                    let needle_idx = search_start + i;
+                    let right = buf.split_off(needle_idx + self.finder.needle().len());
+                    buf.truncate(needle_idx);
+                    let left = std::mem::replace(buf, right);
+                    return Some(Ok(left));
+                }
+
+                if let Some(mut r) = self.reader.take() {
+                    search_start = buf.len().saturating_sub(self.finder.needle().len() + 1);
+                    let available = match r.fill_buf() {
+                        Ok(n) => n,
+                        Err(ref e) if e.kind() == ErrorKind::Interrupted => continue,
+                        Err(e) => return Some(Err(e)),
+                    };
+
+                    buf.extend_from_slice(available);
+                    let used = available.len();
+                    r.consume(used);
+                    if used != 0 {
+                        self.reader = Some(r);
+                    }
+                    continue;
+                } else {
+                    return self.buf.take().map(Ok);
+                }
+            }
+        }
+    }
+
+    #[cfg(test)]
+    mod tests {
+        use super::*;
+        use std::io::{self, Cursor, Read};
+
+        #[test]
+        fn simple() {
+            let s = "foo-bar-baz";
+            let cursor = Cursor::new(String::from(s));
+            let mut split =
+                SplitRead::new(cursor, "-").map(|r| String::from_utf8(r.unwrap()).unwrap());
+
+            assert_eq!(split.next().as_deref(), Some("foo"));
+            assert_eq!(split.next().as_deref(), Some("bar"));
+            assert_eq!(split.next().as_deref(), Some("baz"));
+            assert_eq!(split.next(), None);
+        }
+
+        #[test]
+        fn with_empty_fields() -> Result<(), io::Error> {
+            let s = "\0\0foo\0\0bar\0\0\0\0baz\0\0";
+            let cursor = Cursor::new(String::from(s));
+            let mut split =
+                SplitRead::new(cursor, "\0\0").map(|r| String::from_utf8(r.unwrap()).unwrap());
+
+            assert_eq!(split.next().as_deref(), Some(""));
+            assert_eq!(split.next().as_deref(), Some("foo"));
+            assert_eq!(split.next().as_deref(), Some("bar"));
+            assert_eq!(split.next().as_deref(), Some(""));
+            assert_eq!(split.next().as_deref(), Some("baz"));
+            assert_eq!(split.next().as_deref(), Some(""));
+            assert_eq!(split.next().as_deref(), None);
+
+            Ok(())
+        }
+
+        #[test]
+        fn complex_delimiter() -> Result<(), io::Error> {
+            let s = "<|>foo<|>bar<|><|>baz<|>";
+            let cursor = Cursor::new(String::from(s));
+            let mut split =
+                SplitRead::new(cursor, "<|>").map(|r| String::from_utf8(r.unwrap()).unwrap());
+
+            assert_eq!(split.next().as_deref(), Some(""));
+            assert_eq!(split.next().as_deref(), Some("foo"));
+            assert_eq!(split.next().as_deref(), Some("bar"));
+            assert_eq!(split.next().as_deref(), Some(""));
+            assert_eq!(split.next().as_deref(), Some("baz"));
+            assert_eq!(split.next().as_deref(), Some(""));
+            assert_eq!(split.next().as_deref(), None);
+
+            Ok(())
+        }
+
+        #[test]
+        fn all_empty() -> Result<(), io::Error> {
+            let s = "<><>";
+            let cursor = Cursor::new(String::from(s));
+            let mut split =
+                SplitRead::new(cursor, "<>").map(|r| String::from_utf8(r.unwrap()).unwrap());
+
+            assert_eq!(split.next().as_deref(), Some(""));
+            assert_eq!(split.next().as_deref(), Some(""));
+            assert_eq!(split.next().as_deref(), Some(""));
+            assert_eq!(split.next(), None);
+
+            Ok(())
+        }
+
+        #[should_panic = "delimiter can't be empty"]
+        #[test]
+        fn empty_delimiter() {
+            let s = "abc";
+            let cursor = Cursor::new(String::from(s));
+            let _split = SplitRead::new(cursor, "").map(|e| e.unwrap());
+        }
+
+        #[test]
+        fn delimiter_spread_across_reads() {
+            let reader = Cursor::new("<|>foo<|")
+                .chain(Cursor::new(">bar<|><"))
+                .chain(Cursor::new("|>baz<|>"));
+
+            let mut split =
+                SplitRead::new(reader, "<|>").map(|r| String::from_utf8(r.unwrap()).unwrap());
+
+            assert_eq!(split.next().unwrap(), "");
+            assert_eq!(split.next().unwrap(), "foo");
+            assert_eq!(split.next().unwrap(), "bar");
+            assert_eq!(split.next().unwrap(), "");
+            assert_eq!(split.next().unwrap(), "baz");
+            assert_eq!(split.next().unwrap(), "");
+            assert_eq!(split.next(), None);
+        }
+    }
+}
+
+pub struct SplitRead {
+    internal: split_read::SplitRead<BufReader<SourceReader>>,
+    span: Span,
+    signals: Signals,
+}
+
+impl SplitRead {
+    fn new(
+        reader: SourceReader,
+        delimiter: impl AsRef<[u8]>,
+        span: Span,
+        signals: Signals,
+    ) -> Self {
+        Self {
+            internal: split_read::SplitRead::new(BufReader::new(reader), delimiter),
+            span,
+            signals,
+        }
+    }
+
+    pub fn span(&self) -> Span {
+        self.span
+    }
+}
+
+impl Iterator for SplitRead {
+    type Item = Result<Vec<u8>, ShellError>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.signals.interrupted() {
+            return None;
+        }
+        self.internal.next().map(|r| r.map_err(|e| e.into()))
+    }
+}
+
 /// Turn a readable stream into [`Value`]s.
 ///
 /// The `Value` type depends on the type of the stream ([`ByteStreamType`]). If `Unknown`, the

From b1da50774a381583883f40b47938220883b404a9 Mon Sep 17 00:00:00 2001
From: RobbingDaHood <16130319+RobbingDaHood@users.noreply.github.com>
Date: Wed, 25 Dec 2024 14:31:51 +0100
Subject: [PATCH 0841/1072] 14523 all comments should be prefixed with space
 tab or be beginning of token (#14616)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR should close
1. #10327
1. #13667
1. #13810
1. #14129

# Description
This got reverted https://github.com/nushell/nushell/pull/14606 because
the previous changes only considered space a whitespace and forgot about
tabs. I now added a check for any whitespace, even if it is only those
two that would be relevant.

The added test failed before the changes.

For `#` to start a comment, then it either need to be the first
character of the token or prefixed with ` ` (space).

So now you can do this:
```
~/Projects/nushell> 1..10 | each {echo test#testing }                                                                                                                     12/05/2024 05:37:19 PM
╭───┬──────────────╮
│ 0 │ test#testing │
│ 1 │ test#testing │
│ 2 │ test#testing │
│ 3 │ test#testing │
│ 4 │ test#testing │
│ 5 │ test#testing │
│ 6 │ test#testing │
│ 7 │ test#testing │
│ 8 │ test#testing │
│ 9 │ test#testing │
╰───┴──────────────╯
```

# User-Facing Changes
It is a breaking change if anyone expected comments to start in the
middle of a string without any prefixing ` ` (space).

# Tests + Formatting
Did all:
- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

# After Submitting
I cant see that I need to update anything in [the
documentation](https://github.com/nushell/nushell.github.io) but please
point me in the direction if there is anything.
---
 crates/nu-parser/src/lex.rs        | 15 ++++++-----
 crates/nu-parser/tests/test_lex.rs | 37 +++++++++++++++++++++++++++
 tests/repl/test_parser.rs          | 40 ++++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+), 6 deletions(-)

diff --git a/crates/nu-parser/src/lex.rs b/crates/nu-parser/src/lex.rs
index f0802fcd7a..b808f6eacc 100644
--- a/crates/nu-parser/src/lex.rs
+++ b/crates/nu-parser/src/lex.rs
@@ -51,7 +51,7 @@ impl BlockKind {
 }
 
 // A baseline token is terminated if it's not nested inside of a paired
-// delimiter and the next character is one of: `|`, `;`, `#` or any
+// delimiter and the next character is one of: `|`, `;` or any
 // whitespace.
 fn is_item_terminator(
     block_level: &[BlockKind],
@@ -115,6 +115,7 @@ pub fn lex_item(
     //   character (whitespace, `|`, `;` or `#`) is encountered, the baseline
     //   token is done.
     // - Otherwise, accumulate the character into the current baseline token.
+    let mut previous_char = None;
     while let Some(c) = input.get(*curr_offset) {
         let c = *c;
 
@@ -147,11 +148,12 @@ pub fn lex_item(
                 // Also need to check to make sure we aren't escaped
                 quote_start = None;
             }
-        } else if c == b'#' {
-            if is_item_terminator(&block_level, c, additional_whitespace, special_tokens) {
-                break;
-            }
-            in_comment = true;
+        } else if c == b'#' && !in_comment {
+            // To start a comment, It either need to be the first character of the token or prefixed with whitespace.
+            in_comment = previous_char
+                .map(char::from)
+                .map(char::is_whitespace)
+                .unwrap_or(true);
         } else if c == b'\n' || c == b'\r' {
             in_comment = false;
             if is_item_terminator(&block_level, c, additional_whitespace, special_tokens) {
@@ -254,6 +256,7 @@ pub fn lex_item(
         }
 
         *curr_offset += 1;
+        previous_char = Some(c);
     }
 
     let span = Span::new(span_offset + token_start, span_offset + *curr_offset);
diff --git a/crates/nu-parser/tests/test_lex.rs b/crates/nu-parser/tests/test_lex.rs
index a14843f3f0..2c1cf85bd8 100644
--- a/crates/nu-parser/tests/test_lex.rs
+++ b/crates/nu-parser/tests/test_lex.rs
@@ -159,6 +159,43 @@ fn lex_comment() {
     );
 }
 
+#[test]
+fn lex_not_comment_needs_space_in_front_of_hashtag() {
+    let file = b"1..10 | each {echo test#testing }";
+
+    let output = lex(file, 0, &[], &[], false);
+
+    assert!(output.1.is_none());
+}
+
+#[test]
+fn lex_comment_with_space_in_front_of_hashtag() {
+    let file = b"1..10 | each {echo test #testing }";
+
+    let output = lex(file, 0, &[], &[], false);
+
+    assert!(output.1.is_some());
+    assert!(matches!(
+        output.1.unwrap(),
+        ParseError::UnexpectedEof(missing_token, span) if missing_token == "}"
+            && span == Span::new(33, 34)
+    ));
+}
+
+#[test]
+fn lex_comment_with_tab_in_front_of_hashtag() {
+    let file = b"1..10 | each {echo test\t#testing }";
+
+    let output = lex(file, 0, &[], &[], false);
+
+    assert!(output.1.is_some());
+    assert!(matches!(
+        output.1.unwrap(),
+        ParseError::UnexpectedEof(missing_token, span) if missing_token == "}"
+            && span == Span::new(33, 34)
+    ));
+}
+
 #[test]
 fn lex_is_incomplete() {
     let file = b"let x = 300 | ;";
diff --git a/tests/repl/test_parser.rs b/tests/repl/test_parser.rs
index f77d431110..ddc790324a 100644
--- a/tests/repl/test_parser.rs
+++ b/tests/repl/test_parser.rs
@@ -169,6 +169,41 @@ fn comment_skipping_in_pipeline_3() -> TestResult {
     )
 }
 
+#[test]
+fn still_string_if_hashtag_is_middle_of_string() -> TestResult {
+    run_test(r#"echo test#testing"#, "test#testing")
+}
+
+#[test]
+fn non_comment_hashtag_in_comment_does_not_stop_comment() -> TestResult {
+    run_test(r#"# command_bar_text: { fg: '#C4C9C6' },"#, "")
+}
+
+#[test]
+fn non_comment_hashtag_in_comment_does_not_stop_comment_in_block() -> TestResult {
+    run_test(
+        r#"{
+        explore: {
+            # command_bar_text: { fg: '#C4C9C6' },
+        }
+    } | get explore | is-empty"#,
+        "true",
+    )
+}
+
+#[test]
+fn still_string_if_hashtag_is_middle_of_string_inside_each() -> TestResult {
+    run_test(
+        r#"1..1 | each {echo test#testing } | get 0"#,
+        "test#testing",
+    )
+}
+
+#[test]
+fn still_string_if_hashtag_is_middle_of_string_inside_each_also_with_dot() -> TestResult {
+    run_test(r#"1..1 | each {echo '.#testing' } | get 0"#, ".#testing")
+}
+
 #[test]
 fn bad_var_name() -> TestResult {
     fail_test(r#"let $"foo bar" = 4"#, "can't contain")
@@ -282,6 +317,11 @@ fn raw_string_with_equals() -> TestResult {
     )
 }
 
+#[test]
+fn raw_string_with_hashtag() -> TestResult {
+    run_test(r#"r##' one # two '##"#, "one # two")
+}
+
 #[test]
 fn list_quotes_with_equals() -> TestResult {
     run_test(

From 6ebc0fc3ffd397c5ca6c53eb69ae06ef1e523c28 Mon Sep 17 00:00:00 2001
From: Rikuki IX <52599939+rikukiix@users.noreply.github.com>
Date: Wed, 25 Dec 2024 21:35:49 +0800
Subject: [PATCH 0842/1072] Switch from serde_yaml to serde_yml (#14630)

# Description
This PR fixes #14339.

Since [serde_yaml](https://docs.rs/serde_yaml/latest/serde_yaml/) is
already deprecated, replaced it with
[serde_yml](https://doc.serdeyml.com/serde_yml/).

After this change, the `to yaml` boolean parsing issue in #14339 is also
fixed.
Now the command
```
['y' 'Y' 'yes' 'Yes' 'YES' 'n' 'N' 'no' 'No' 'No' 'on' 'On' 'ON' 'off' 'Off' 'OFF'] | to yaml
```
will return
```
- 'y'
- 'Y'
- 'yes'
- 'Yes'
- 'YES'
- 'n'
- 'N'
- 'no'
- 'No'
- 'No'
- 'on'
- 'On'
- 'ON'
- 'off'
- 'Off'
- 'OFF'
```

# User-Facing Changes

I'm not sure if the yaml spec change is a user-facing change.
---
 Cargo.lock                                    | 28 ++++++----
 Cargo.toml                                    |  2 +-
 crates/nu-command/Cargo.toml                  |  2 +-
 crates/nu-command/src/formats/from/yaml.rs    | 48 ++++++++--------
 crates/nu-command/src/formats/to/yaml.rs      | 55 +++++++++----------
 .../tests/format_conversions/yaml.rs          | 15 +++++
 6 files changed, 83 insertions(+), 67 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3300716fd5..515d8b0035 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3099,6 +3099,16 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "libyml"
+version = "0.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3302702afa434ffa30847a83305f0a69d6abd74293b6554c18ec85c7ef30c980"
+dependencies = [
+ "anyhow",
+ "version_check",
+]
+
 [[package]]
 name = "libz-sys"
 version = "1.1.20"
@@ -3810,7 +3820,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
- "serde_yaml",
+ "serde_yml",
  "sha2",
  "sysinfo 0.32.1",
  "tabled",
@@ -6728,16 +6738,18 @@ dependencies = [
 ]
 
 [[package]]
-name = "serde_yaml"
-version = "0.9.34+deprecated"
+name = "serde_yml"
+version = "0.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
+checksum = "59e2dd588bf1597a252c3b920e0143eb99b0f76e4e082f4c92ce34fbc9e71ddd"
 dependencies = [
  "indexmap",
  "itoa",
+ "libyml",
+ "memchr",
  "ryu",
  "serde",
- "unsafe-libyaml",
+ "version_check",
 ]
 
 [[package]]
@@ -7756,12 +7768,6 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
 
-[[package]]
-name = "unsafe-libyaml"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
-
 [[package]]
 name = "untrusted"
 version = "0.9.0"
diff --git a/Cargo.toml b/Cargo.toml
index c6702371b3..f23e035822 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -151,7 +151,7 @@ scopeguard = { version = "1.2.0" }
 serde = { version = "1.0" }
 serde_json = "1.0"
 serde_urlencoded = "0.7.1"
-serde_yaml = "0.9"
+serde_yml = "0.0.12"
 sha2 = "0.10"
 strip-ansi-escapes = "0.2.0"
 syn = "2.0"
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 7e8962d195..98dce2061c 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -84,7 +84,7 @@ scopeguard = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true, features = ["preserve_order"] }
 serde_urlencoded = { workspace = true }
-serde_yaml = { workspace = true }
+serde_yml = { workspace = true }
 sha2 = { workspace = true }
 sysinfo = { workspace = true }
 tabled = { workspace = true, features = ["ansi"], default-features = false }
diff --git a/crates/nu-command/src/formats/from/yaml.rs b/crates/nu-command/src/formats/from/yaml.rs
index 649f7e83ac..fb639802a0 100644
--- a/crates/nu-command/src/formats/from/yaml.rs
+++ b/crates/nu-command/src/formats/from/yaml.rs
@@ -72,7 +72,7 @@ impl Command for FromYml {
 }
 
 fn convert_yaml_value_to_nu_value(
-    v: &serde_yaml::Value,
+    v: &serde_yml::Value,
     span: Span,
     val_span: Span,
 ) -> Result<Value, ShellError> {
@@ -83,22 +83,22 @@ fn convert_yaml_value_to_nu_value(
         input_span: val_span,
     };
     Ok(match v {
-        serde_yaml::Value::Bool(b) => Value::bool(*b, span),
-        serde_yaml::Value::Number(n) if n.is_i64() => {
+        serde_yml::Value::Bool(b) => Value::bool(*b, span),
+        serde_yml::Value::Number(n) if n.is_i64() => {
             Value::int(n.as_i64().ok_or(err_not_compatible_number)?, span)
         }
-        serde_yaml::Value::Number(n) if n.is_f64() => {
+        serde_yml::Value::Number(n) if n.is_f64() => {
             Value::float(n.as_f64().ok_or(err_not_compatible_number)?, span)
         }
-        serde_yaml::Value::String(s) => Value::string(s.to_string(), span),
-        serde_yaml::Value::Sequence(a) => {
+        serde_yml::Value::String(s) => Value::string(s.to_string(), span),
+        serde_yml::Value::Sequence(a) => {
             let result: Result<Vec<Value>, ShellError> = a
                 .iter()
                 .map(|x| convert_yaml_value_to_nu_value(x, span, val_span))
                 .collect();
             Value::list(result?, span)
         }
-        serde_yaml::Value::Mapping(t) => {
+        serde_yml::Value::Mapping(t) => {
             // Using an IndexMap ensures consistent ordering
             let mut collected = IndexMap::new();
 
@@ -111,19 +111,19 @@ fn convert_yaml_value_to_nu_value(
                     input_span: val_span,
                 };
                 match (k, v) {
-                    (serde_yaml::Value::Number(k), _) => {
+                    (serde_yml::Value::Number(k), _) => {
                         collected.insert(
                             k.to_string(),
                             convert_yaml_value_to_nu_value(v, span, val_span)?,
                         );
                     }
-                    (serde_yaml::Value::Bool(k), _) => {
+                    (serde_yml::Value::Bool(k), _) => {
                         collected.insert(
                             k.to_string(),
                             convert_yaml_value_to_nu_value(v, span, val_span)?,
                         );
                     }
-                    (serde_yaml::Value::String(k), _) => {
+                    (serde_yml::Value::String(k), _) => {
                         collected.insert(
                             k.clone(),
                             convert_yaml_value_to_nu_value(v, span, val_span)?,
@@ -132,16 +132,16 @@ fn convert_yaml_value_to_nu_value(
                     // Hard-code fix for cases where "v" is a string without quotations with double curly braces
                     // e.g. k = value
                     // value: {{ something }}
-                    // Strangely, serde_yaml returns
+                    // Strangely, serde_yml returns
                     // "value" -> Mapping(Mapping { map: {Mapping(Mapping { map: {String("something"): Null} }): Null} })
-                    (serde_yaml::Value::Mapping(m), serde_yaml::Value::Null) => {
+                    (serde_yml::Value::Mapping(m), serde_yml::Value::Null) => {
                         return m
                             .iter()
                             .take(1)
                             .collect_vec()
                             .first()
                             .and_then(|e| match e {
-                                (serde_yaml::Value::String(s), serde_yaml::Value::Null) => {
+                                (serde_yml::Value::String(s), serde_yml::Value::Null) => {
                                     Some(Value::string("{{ ".to_owned() + s.as_str() + " }}", span))
                                 }
                                 _ => None,
@@ -156,22 +156,22 @@ fn convert_yaml_value_to_nu_value(
 
             Value::record(collected.into_iter().collect(), span)
         }
-        serde_yaml::Value::Tagged(t) => {
+        serde_yml::Value::Tagged(t) => {
             let tag = &t.tag;
             let value = match &t.value {
-                serde_yaml::Value::String(s) => {
+                serde_yml::Value::String(s) => {
                     let val = format!("{} {}", tag, s).trim().to_string();
                     Value::string(val, span)
                 }
-                serde_yaml::Value::Number(n) => {
+                serde_yml::Value::Number(n) => {
                     let val = format!("{} {}", tag, n).trim().to_string();
                     Value::string(val, span)
                 }
-                serde_yaml::Value::Bool(b) => {
+                serde_yml::Value::Bool(b) => {
                     let val = format!("{} {}", tag, b).trim().to_string();
                     Value::string(val, span)
                 }
-                serde_yaml::Value::Null => {
+                serde_yml::Value::Null => {
                     let val = format!("{}", tag).trim().to_string();
                     Value::string(val, span)
                 }
@@ -180,7 +180,7 @@ fn convert_yaml_value_to_nu_value(
 
             value
         }
-        serde_yaml::Value::Null => Value::nothing(span),
+        serde_yml::Value::Null => Value::nothing(span),
         x => unimplemented!("Unsupported YAML case: {:?}", x),
     })
 }
@@ -188,9 +188,9 @@ fn convert_yaml_value_to_nu_value(
 pub fn from_yaml_string_to_value(s: &str, span: Span, val_span: Span) -> Result<Value, ShellError> {
     let mut documents = vec![];
 
-    for document in serde_yaml::Deserializer::from_str(s) {
-        let v: serde_yaml::Value =
-            serde_yaml::Value::deserialize(document).map_err(|x| ShellError::UnsupportedInput {
+    for document in serde_yml::Deserializer::from_str(s) {
+        let v: serde_yml::Value =
+            serde_yml::Value::deserialize(document).map_err(|x| ShellError::UnsupportedInput {
                 msg: format!("Could not load YAML: {x}"),
                 input: "value originates from here".into(),
                 msg_span: span,
@@ -393,8 +393,8 @@ mod test {
         ];
 
         for test_case in test_cases {
-            let doc = serde_yaml::Deserializer::from_str(test_case.input);
-            let v: serde_yaml::Value = serde_yaml::Value::deserialize(doc.last().unwrap()).unwrap();
+            let doc = serde_yml::Deserializer::from_str(test_case.input);
+            let v: serde_yml::Value = serde_yml::Value::deserialize(doc.last().unwrap()).unwrap();
             let result = convert_yaml_value_to_nu_value(&v, Span::test_data(), Span::test_data());
             assert!(result.is_ok());
             assert!(result.ok().unwrap() == test_case.expected.ok().unwrap());
diff --git a/crates/nu-command/src/formats/to/yaml.rs b/crates/nu-command/src/formats/to/yaml.rs
index 4fc4e62319..d6cad362f9 100644
--- a/crates/nu-command/src/formats/to/yaml.rs
+++ b/crates/nu-command/src/formats/to/yaml.rs
@@ -40,29 +40,24 @@ impl Command for ToYaml {
     }
 }
 
-pub fn value_to_yaml_value(v: &Value) -> Result<serde_yaml::Value, ShellError> {
+pub fn value_to_yaml_value(v: &Value) -> Result<serde_yml::Value, ShellError> {
     Ok(match &v {
-        Value::Bool { val, .. } => serde_yaml::Value::Bool(*val),
-        Value::Int { val, .. } => serde_yaml::Value::Number(serde_yaml::Number::from(*val)),
-        Value::Filesize { val, .. } => {
-            serde_yaml::Value::Number(serde_yaml::Number::from(val.get()))
-        }
-        Value::Duration { val, .. } => serde_yaml::Value::String(val.to_string()),
-        Value::Date { val, .. } => serde_yaml::Value::String(val.to_string()),
-        Value::Range { .. } => serde_yaml::Value::Null,
-        Value::Float { val, .. } => serde_yaml::Value::Number(serde_yaml::Number::from(*val)),
+        Value::Bool { val, .. } => serde_yml::Value::Bool(*val),
+        Value::Int { val, .. } => serde_yml::Value::Number(serde_yml::Number::from(*val)),
+        Value::Filesize { val, .. } => serde_yml::Value::Number(serde_yml::Number::from(val.get())),
+        Value::Duration { val, .. } => serde_yml::Value::String(val.to_string()),
+        Value::Date { val, .. } => serde_yml::Value::String(val.to_string()),
+        Value::Range { .. } => serde_yml::Value::Null,
+        Value::Float { val, .. } => serde_yml::Value::Number(serde_yml::Number::from(*val)),
         Value::String { val, .. } | Value::Glob { val, .. } => {
-            serde_yaml::Value::String(val.clone())
+            serde_yml::Value::String(val.clone())
         }
         Value::Record { val, .. } => {
-            let mut m = serde_yaml::Mapping::new();
+            let mut m = serde_yml::Mapping::new();
             for (k, v) in &**val {
-                m.insert(
-                    serde_yaml::Value::String(k.clone()),
-                    value_to_yaml_value(v)?,
-                );
+                m.insert(serde_yml::Value::String(k.clone()), value_to_yaml_value(v)?);
             }
-            serde_yaml::Value::Mapping(m)
+            serde_yml::Value::Mapping(m)
         }
         Value::List { vals, .. } => {
             let mut out = vec![];
@@ -71,28 +66,28 @@ pub fn value_to_yaml_value(v: &Value) -> Result<serde_yaml::Value, ShellError> {
                 out.push(value_to_yaml_value(value)?);
             }
 
-            serde_yaml::Value::Sequence(out)
+            serde_yml::Value::Sequence(out)
         }
-        Value::Closure { .. } => serde_yaml::Value::Null,
-        Value::Nothing { .. } => serde_yaml::Value::Null,
+        Value::Closure { .. } => serde_yml::Value::Null,
+        Value::Nothing { .. } => serde_yml::Value::Null,
         Value::Error { error, .. } => return Err(*error.clone()),
-        Value::Binary { val, .. } => serde_yaml::Value::Sequence(
+        Value::Binary { val, .. } => serde_yml::Value::Sequence(
             val.iter()
-                .map(|x| serde_yaml::Value::Number(serde_yaml::Number::from(*x)))
+                .map(|x| serde_yml::Value::Number(serde_yml::Number::from(*x)))
                 .collect(),
         ),
-        Value::CellPath { val, .. } => serde_yaml::Value::Sequence(
+        Value::CellPath { val, .. } => serde_yml::Value::Sequence(
             val.members
                 .iter()
                 .map(|x| match &x {
-                    PathMember::String { val, .. } => Ok(serde_yaml::Value::String(val.clone())),
+                    PathMember::String { val, .. } => Ok(serde_yml::Value::String(val.clone())),
                     PathMember::Int { val, .. } => {
-                        Ok(serde_yaml::Value::Number(serde_yaml::Number::from(*val)))
+                        Ok(serde_yml::Value::Number(serde_yml::Number::from(*val)))
                     }
                 })
-                .collect::<Result<Vec<serde_yaml::Value>, ShellError>>()?,
+                .collect::<Result<Vec<serde_yml::Value>, ShellError>>()?,
         ),
-        Value::Custom { .. } => serde_yaml::Value::Null,
+        Value::Custom { .. } => serde_yml::Value::Null,
     })
 }
 
@@ -105,9 +100,9 @@ fn to_yaml(input: PipelineData, head: Span) -> Result<PipelineData, ShellError>
     let value = input.into_value(head)?;
 
     let yaml_value = value_to_yaml_value(&value)?;
-    match serde_yaml::to_string(&yaml_value) {
-        Ok(serde_yaml_string) => {
-            Ok(Value::string(serde_yaml_string, head)
+    match serde_yml::to_string(&yaml_value) {
+        Ok(serde_yml_string) => {
+            Ok(Value::string(serde_yml_string, head)
                 .into_pipeline_data_with_metadata(Some(metadata)))
         }
         _ => Ok(Value::error(
diff --git a/crates/nu-command/tests/format_conversions/yaml.rs b/crates/nu-command/tests/format_conversions/yaml.rs
index 57e75164ab..146890012e 100644
--- a/crates/nu-command/tests/format_conversions/yaml.rs
+++ b/crates/nu-command/tests/format_conversions/yaml.rs
@@ -48,3 +48,18 @@ fn convert_dict_to_yaml_with_integer_floats_key() {
     assert!(actual.out.contains("2.11"));
     assert!(actual.err.is_empty());
 }
+
+#[test]
+fn convert_bool_to_yaml_in_yaml_spec_1_2() {
+    let actual = nu!(pipeline(
+        r#"
+            [y n no On OFF True true false] | to yaml
+        "#
+    ));
+
+    assert_eq!(
+        actual.out,
+        "- 'y'- 'n'- 'no'- 'On'- 'OFF'- 'True'- true- false"
+    );
+    assert!(actual.err.is_empty());
+}

From 81baf53814f586cd236f87a44b55483a39c640ad Mon Sep 17 00:00:00 2001
From: Renan Ribeiro <55855728+cosineblast@users.noreply.github.com>
Date: Wed, 25 Dec 2024 10:36:02 -0300
Subject: [PATCH 0843/1072] `ls` now collects metadata in a separate thread
 (#14627)

Closes #6174

# Description

This PR aims to improve the performance of `ls` within large
directories. `ls` now delegates the metadata collection to
a thread in its thread pool.

Before:

![image](https://github.com/user-attachments/assets/1967ab78-177c-485f-9b2f-f9d625678171)

Now:

![image](https://github.com/user-attachments/assets/fc215d0a-4b26-4791-a3a1-77cecff133e2)

# User-Facing Changes

If an error occurs while file metadata is being collected in another
thread, the `ls` command now notifies the user about this error by
sending an error value through a channel (which then gets collected into
an iterator and shown to the user later on).

However, if an error occurs _while_ sending this error value to the
channel (i.e the resulting value iterator has been dropped), then the
user is not notified of this error. I think this behavior is acceptable,
since behavior only occurs when the `ls` pipeline has been dropped and
the user is no longer interested in output from `ls`.

# Tests + Formatting

I do not know if it is a good idea to test this performance with
`timeit`, since it can be unreliable.
---
 crates/nu-command/src/filesystem/ls.rs | 174 +++++++++++++------------
 1 file changed, 91 insertions(+), 83 deletions(-)

diff --git a/crates/nu-command/src/filesystem/ls.rs b/crates/nu-command/src/filesystem/ls.rs
index ef16199958..2df34af855 100644
--- a/crates/nu-command/src/filesystem/ls.rs
+++ b/crates/nu-command/src/filesystem/ls.rs
@@ -316,6 +316,7 @@ fn ls_for_one_pattern(
     };
 
     let hidden_dir_specified = is_hidden_dir(pattern_arg.as_ref());
+
     let path = pattern_arg.into_spanned(p_tag);
     let (prefix, paths) = if just_read_dir {
         let expanded = nu_path::expand_path_with(path.item.as_ref(), &cwd, path.item.is_expand());
@@ -358,40 +359,42 @@ fn ls_for_one_pattern(
     };
 
     pool.install(|| {
-        paths_peek
-            .par_bridge()
-            .filter_map(move |x| match x {
-                Ok(path) => {
-                    let metadata = match std::fs::symlink_metadata(&path) {
-                        Ok(metadata) => Some(metadata),
-                        Err(_) => None,
-                    };
-                    let hidden_dir_clone = Arc::clone(&hidden_dirs);
-                    let mut hidden_dir_mutex = hidden_dir_clone
-                        .lock()
-                        .expect("Unable to acquire lock for hidden_dirs");
-                    if path_contains_hidden_folder(&path, &hidden_dir_mutex) {
-                        return None;
-                    }
-
-                    if !all && !hidden_dir_specified && is_hidden_dir(&path) {
-                        if path.is_dir() {
-                            hidden_dir_mutex.push(path);
-                            drop(hidden_dir_mutex);
+        rayon::spawn(move || {
+            let result = paths_peek
+                .par_bridge()
+                .filter_map(move |x| match x {
+                    Ok(path) => {
+                        let metadata = match std::fs::symlink_metadata(&path) {
+                            Ok(metadata) => Some(metadata),
+                            Err(_) => None,
+                        };
+                        let hidden_dir_clone = Arc::clone(&hidden_dirs);
+                        let mut hidden_dir_mutex = hidden_dir_clone
+                            .lock()
+                            .expect("Unable to acquire lock for hidden_dirs");
+                        if path_contains_hidden_folder(&path, &hidden_dir_mutex) {
+                            return None;
                         }
-                        return None;
-                    }
 
-                    let display_name = if short_names {
-                        path.file_name().map(|os| os.to_string_lossy().to_string())
-                    } else if full_paths || absolute_path {
-                        Some(path.to_string_lossy().to_string())
-                    } else if let Some(prefix) = &prefix {
-                        if let Ok(remainder) = path.strip_prefix(prefix) {
-                            if directory {
-                                // When the path is the same as the cwd, path_diff should be "."
-                                let path_diff =
-                                    if let Some(path_diff_not_dot) = diff_paths(&path, &cwd) {
+                        if !all && !hidden_dir_specified && is_hidden_dir(&path) {
+                            if path.is_dir() {
+                                hidden_dir_mutex.push(path);
+                                drop(hidden_dir_mutex);
+                            }
+                            return None;
+                        }
+
+                        let display_name = if short_names {
+                            path.file_name().map(|os| os.to_string_lossy().to_string())
+                        } else if full_paths || absolute_path {
+                            Some(path.to_string_lossy().to_string())
+                        } else if let Some(prefix) = &prefix {
+                            if let Ok(remainder) = path.strip_prefix(prefix) {
+                                if directory {
+                                    // When the path is the same as the cwd, path_diff should be "."
+                                    let path_diff = if let Some(path_diff_not_dot) =
+                                        diff_paths(&path, &cwd)
+                                    {
                                         let path_diff_not_dot = path_diff_not_dot.to_string_lossy();
                                         if path_diff_not_dot.is_empty() {
                                             ".".to_string()
@@ -402,70 +405,75 @@ fn ls_for_one_pattern(
                                         path.to_string_lossy().to_string()
                                     };
 
-                                Some(path_diff)
-                            } else {
-                                let new_prefix = if let Some(pfx) = diff_paths(prefix, &cwd) {
-                                    pfx
+                                    Some(path_diff)
                                 } else {
-                                    prefix.to_path_buf()
-                                };
+                                    let new_prefix = if let Some(pfx) = diff_paths(prefix, &cwd) {
+                                        pfx
+                                    } else {
+                                        prefix.to_path_buf()
+                                    };
 
-                                Some(new_prefix.join(remainder).to_string_lossy().to_string())
+                                    Some(new_prefix.join(remainder).to_string_lossy().to_string())
+                                }
+                            } else {
+                                Some(path.to_string_lossy().to_string())
                             }
                         } else {
                             Some(path.to_string_lossy().to_string())
                         }
-                    } else {
-                        Some(path.to_string_lossy().to_string())
+                        .ok_or_else(|| ShellError::GenericError {
+                            error: format!("Invalid file name: {:}", path.to_string_lossy()),
+                            msg: "invalid file name".into(),
+                            span: Some(call_span),
+                            help: None,
+                            inner: vec![],
+                        });
+
+                        match display_name {
+                            Ok(name) => {
+                                let entry = dir_entry_dict(
+                                    &path,
+                                    &name,
+                                    metadata.as_ref(),
+                                    call_span,
+                                    long,
+                                    du,
+                                    &signals_clone,
+                                    use_mime_type,
+                                    args.full_paths,
+                                );
+                                match entry {
+                                    Ok(value) => Some(value),
+                                    Err(err) => Some(Value::error(err, call_span)),
+                                }
+                            }
+                            Err(err) => Some(Value::error(err, call_span)),
+                        }
                     }
-                    .ok_or_else(|| ShellError::GenericError {
-                        error: format!("Invalid file name: {:}", path.to_string_lossy()),
-                        msg: "invalid file name".into(),
+                    Err(err) => Some(Value::error(err, call_span)),
+                })
+                .try_for_each(|stream| {
+                    tx.send(stream).map_err(|e| ShellError::GenericError {
+                        error: "Error streaming data".into(),
+                        msg: e.to_string(),
                         span: Some(call_span),
                         help: None,
                         inner: vec![],
-                    });
-
-                    match display_name {
-                        Ok(name) => {
-                            let entry = dir_entry_dict(
-                                &path,
-                                &name,
-                                metadata.as_ref(),
-                                call_span,
-                                long,
-                                du,
-                                &signals_clone,
-                                use_mime_type,
-                                args.full_paths,
-                            );
-                            match entry {
-                                Ok(value) => Some(value),
-                                Err(err) => Some(Value::error(err, call_span)),
-                            }
-                        }
-                        Err(err) => Some(Value::error(err, call_span)),
-                    }
-                }
-                Err(err) => Some(Value::error(err, call_span)),
-            })
-            .try_for_each(|stream| {
-                tx.send(stream).map_err(|e| ShellError::GenericError {
-                    error: "Error streaming data".into(),
-                    msg: e.to_string(),
+                    })
+                })
+                .map_err(|err| ShellError::GenericError {
+                    error: "Unable to create a rayon pool".into(),
+                    msg: err.to_string(),
                     span: Some(call_span),
                     help: None,
                     inner: vec![],
-                })
-            })
-    })
-    .map_err(|err| ShellError::GenericError {
-        error: "Unable to create a rayon pool".into(),
-        msg: err.to_string(),
-        span: Some(call_span),
-        help: None,
-        inner: vec![],
-    })?;
+                });
+
+            if let Err(error) = result {
+                let _ = tx.send(Value::error(error, call_span));
+            }
+        });
+    });
 
     Ok(rx
         .into_iter()

From 45ff964cbd71ca3137f5d92cc29b3ffc953c7df3 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Wed, 25 Dec 2024 08:36:51 -0500
Subject: [PATCH 0844/1072] "short" Welcome Banner option (#14638)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

Adds:

```nushell
$env.config.show_banner = "short"
```

This will display *only* the startup time. That was the only information
from the banner that the user couldn't possibly include in their own
config/banner (since it is `-1ns` during startup). This allows one to
create their own banner and yet still show the startup time.

Example (can be a file named `banner.nu` in autoloads:

```nushell
$env.config.show_banner = "short"

let ver = (version)
print $"(ansi blue_bold)Nushell Release:(ansi reset) ($ver.version) \(($ver.build_os)\)"
```


![image](https://github.com/user-attachments/assets/dd9d53a2-d89a-432e-8fa3-2d65072e08b1)


---

`true` and `false` settings continue to work as they do today. `true` is
still the default.

# User-Facing Changes

New configuration option:

```nushell
$env.config.show_banner = "short"
```

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

◼️ Update doc
◼️ Update `doc_config.nu`
---
 crates/nu-cli/src/repl.rs            | 33 ++++++++++++++++++++--------
 crates/nu-protocol/src/config/mod.rs |  4 ++--
 crates/nu-std/std/core/mod.nu        | 13 ++++++++---
 3 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 4bd86ddbf9..06ecd1d49a 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -146,15 +146,30 @@ pub fn evaluate_repl(
     // Regenerate the $nu constant to contain the startup time and any other potential updates
     engine_state.generate_nu_constant();
 
-    if load_std_lib.is_none() && engine_state.get_config().show_banner {
-        eval_source(
-            engine_state,
-            &mut unique_stack,
-            r#"banner"#.as_bytes(),
-            "show_banner",
-            PipelineData::empty(),
-            false,
-        );
+    if load_std_lib.is_none() {
+        match engine_state.get_config().show_banner {
+            Value::Bool { val: false, .. } => {}
+            Value::String { ref val, .. } if val == "short" => {
+                eval_source(
+                    engine_state,
+                    &mut unique_stack,
+                    r#"banner --short"#.as_bytes(),
+                    "show short banner",
+                    PipelineData::empty(),
+                    false,
+                );
+            }
+            _ => {
+                eval_source(
+                    engine_state,
+                    &mut unique_stack,
+                    r#"banner"#.as_bytes(),
+                    "show_banner",
+                    PipelineData::empty(),
+                    false,
+                );
+            }
+        }
     }
 
     kitty_protocol_healthcheck(engine_state);
diff --git a/crates/nu-protocol/src/config/mod.rs b/crates/nu-protocol/src/config/mod.rs
index 85ae9ce1e3..d2ee40a2a0 100644
--- a/crates/nu-protocol/src/config/mod.rs
+++ b/crates/nu-protocol/src/config/mod.rs
@@ -59,7 +59,7 @@ pub struct Config {
     pub rm: RmConfig,
     pub shell_integration: ShellIntegrationConfig,
     pub buffer_editor: Value,
-    pub show_banner: bool,
+    pub show_banner: Value,
     pub bracketed_paste: bool,
     pub render_right_prompt_on_last_line: bool,
     pub explore: HashMap<String, Value>,
@@ -82,7 +82,7 @@ pub struct Config {
 impl Default for Config {
     fn default() -> Config {
         Config {
-            show_banner: true,
+            show_banner: Value::bool(true, Span::unknown()),
 
             table: TableConfig::default(),
             rm: RmConfig::default(),
diff --git a/crates/nu-std/std/core/mod.nu b/crates/nu-std/std/core/mod.nu
index 3a010c1fb3..21c30ca318 100644
--- a/crates/nu-std/std/core/mod.nu
+++ b/crates/nu-std/std/core/mod.nu
@@ -1,11 +1,17 @@
 use std/dt [datetime-diff, pretty-print-duration]
 
 # Print a banner for nushell with information about the project
-export def banner [] {
+export def banner [
+    --short    # Only show startup time
+] {
 let dt = (datetime-diff (date now) 2019-05-10T09:59:12-07:00)
 let ver = (version)
+let startup_time = $"(ansi green_bold)Startup Time: (ansi reset)($nu.startup-time)"
 
-let banner_msg = $"(ansi green)     __  ,(ansi reset)
+let banner_msg = match $short {
+    true => $"($startup_time)(char newline)"
+
+    false => $"(ansi green)     __  ,(ansi reset)
 (ansi green) .--\(\)°'.' (ansi reset)Welcome to (ansi green)Nushell(ansi reset),
 (ansi green)'|, . ,'   (ansi reset)based on the (ansi green)nu(ansi reset) language,
 (ansi green) !_-\(_\\    (ansi reset)where all data is structured!
@@ -20,8 +26,9 @@ Learn how to remove this at: (ansi green)https://nushell.sh/book/configuration.h
 It's been this long since (ansi green)Nushell(ansi reset)'s first commit:
 (pretty-print-duration $dt)
 
-Startup Time: ($nu.startup-time)
+($startup_time)
 "
+}
 
 match $env.config?.use_ansi_coloring? {
     false => { $banner_msg | ansi strip }

From 1b01598840faaa1d4a4b8e7d84b8cfd95b98b651 Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Wed, 25 Dec 2024 16:37:24 +0300
Subject: [PATCH 0845/1072] Run ENV_CONVERSIONS whenever it's modified (#14591)

- this PR should close #14514

# Description
Makes updates to `$env.ENV_CONVERSIONS` take effect immediately.

# User-Facing Changes
No breaking change, `$env.ENV_CONVERSIONS` can be set and its effect
used in the same file.

# Tests + Formatting

- :green_circle: toolkit fmt
- :green_circle: toolkit clippy
- :green_circle: toolkit test
- :green_circle: toolkit test stdlib

# After Submitting
N/A
---
 crates/nu-engine/src/compile/operator.rs |  60 +++++++-------
 crates/nu-engine/src/env.rs              | 101 +++++++++++++++--------
 crates/nu-engine/src/eval_ir.rs          |  12 ++-
 tests/shell/environment/env.rs           |  10 +++
 4 files changed, 118 insertions(+), 65 deletions(-)

diff --git a/crates/nu-engine/src/compile/operator.rs b/crates/nu-engine/src/compile/operator.rs
index 735beaa10c..d03d81b966 100644
--- a/crates/nu-engine/src/compile/operator.rs
+++ b/crates/nu-engine/src/compile/operator.rs
@@ -331,43 +331,43 @@ pub(crate) fn compile_load_env(
     path: &[PathMember],
     out_reg: RegId,
 ) -> Result<(), CompileError> {
-    if path.is_empty() {
-        builder.push(
+    match path {
+        [] => builder.push(
             Instruction::LoadVariable {
                 dst: out_reg,
                 var_id: ENV_VARIABLE_ID,
             }
             .into_spanned(span),
-        )?;
-    } else {
-        let (key, optional) = match &path[0] {
-            PathMember::String { val, optional, .. } => (builder.data(val)?, *optional),
-            PathMember::Int { span, .. } => {
-                return Err(CompileError::AccessEnvByInt { span: *span })
-            }
-        };
-        let tail = &path[1..];
-
-        if optional {
-            builder.push(Instruction::LoadEnvOpt { dst: out_reg, key }.into_spanned(span))?;
-        } else {
-            builder.push(Instruction::LoadEnv { dst: out_reg, key }.into_spanned(span))?;
+        )?,
+        [PathMember::Int { span, .. }, ..] => {
+            return Err(CompileError::AccessEnvByInt { span: *span })
         }
+        [PathMember::String {
+            val: key, optional, ..
+        }, tail @ ..] => {
+            let key = builder.data(key)?;
 
-        if !tail.is_empty() {
-            let path = builder.literal(
-                Literal::CellPath(Box::new(CellPath {
-                    members: tail.to_vec(),
-                }))
-                .into_spanned(span),
-            )?;
-            builder.push(
-                Instruction::FollowCellPath {
-                    src_dst: out_reg,
-                    path,
-                }
-                .into_spanned(span),
-            )?;
+            builder.push(if *optional {
+                Instruction::LoadEnvOpt { dst: out_reg, key }.into_spanned(span)
+            } else {
+                Instruction::LoadEnv { dst: out_reg, key }.into_spanned(span)
+            })?;
+
+            if !tail.is_empty() {
+                let path = builder.literal(
+                    Literal::CellPath(Box::new(CellPath {
+                        members: tail.to_vec(),
+                    }))
+                    .into_spanned(span),
+                )?;
+                builder.push(
+                    Instruction::FollowCellPath {
+                        src_dst: out_reg,
+                        path,
+                    }
+                    .into_spanned(span),
+                )?;
+            }
         }
     }
     Ok(())
diff --git a/crates/nu-engine/src/env.rs b/crates/nu-engine/src/env.rs
index 2ef7ecc1d9..54f800958f 100644
--- a/crates/nu-engine/src/env.rs
+++ b/crates/nu-engine/src/env.rs
@@ -3,7 +3,7 @@ use nu_path::canonicalize_with;
 use nu_protocol::{
     ast::Expr,
     engine::{Call, EngineState, Stack, StateWorkingSet},
-    ShellError, Span, Value, VarId,
+    ShellError, Span, Type, Value, VarId,
 };
 use std::{
     collections::HashMap,
@@ -11,12 +11,51 @@ use std::{
     sync::Arc,
 };
 
-const ENV_CONVERSIONS: &str = "ENV_CONVERSIONS";
+pub const ENV_CONVERSIONS: &str = "ENV_CONVERSIONS";
 
-enum ConversionResult {
-    Ok(Value),
-    ConversionError(ShellError), // Failure during the conversion itself
-    CellPathError, // Error looking up the ENV_VAR.to_/from_string fields in $env.ENV_CONVERSIONS
+enum ConversionError {
+    ShellError(ShellError),
+    CellPathError,
+}
+
+impl From<ShellError> for ConversionError {
+    fn from(value: ShellError) -> Self {
+        Self::ShellError(value)
+    }
+}
+
+/// Translate environment variables from Strings to Values.
+pub fn convert_env_vars(
+    stack: &mut Stack,
+    engine_state: &EngineState,
+    conversions: &Value,
+) -> Result<(), ShellError> {
+    let conversions = conversions.as_record()?;
+    for (key, conversion) in conversions.into_iter() {
+        if let Some(val) = stack.get_env_var_insensitive(engine_state, key) {
+            match val.get_type() {
+                Type::String => {}
+                _ => continue,
+            }
+
+            let conversion = conversion
+                .as_record()?
+                .get("from_string")
+                .ok_or(ShellError::MissingRequiredColumn {
+                    column: "from_string",
+                    span: conversion.span(),
+                })?
+                .as_closure()?;
+
+            let new_val = ClosureEvalOnce::new(engine_state, stack, conversion.clone())
+                .debug(false)
+                .run_with_value(val.clone())?
+                .into_value(val.span())?;
+
+            stack.add_env_var(key.clone(), new_val);
+        }
+    }
+    Ok(())
 }
 
 /// Translate environment variables from Strings to Values. Requires config to be already set up in
@@ -36,11 +75,11 @@ pub fn convert_env_values(engine_state: &mut EngineState, stack: &Stack) -> Resu
         if let Value::String { .. } = val {
             // Only run from_string on string values
             match get_converted_value(engine_state, stack, name, val, "from_string") {
-                ConversionResult::Ok(v) => {
+                Ok(v) => {
                     let _ = new_scope.insert(name.to_string(), v);
                 }
-                ConversionResult::ConversionError(e) => error = error.or(Some(e)),
-                ConversionResult::CellPathError => {
+                Err(ConversionError::ShellError(e)) => error = error.or(Some(e)),
+                Err(ConversionError::CellPathError) => {
                     let _ = new_scope.insert(name.to_string(), val.clone());
                 }
             }
@@ -101,9 +140,9 @@ pub fn env_to_string(
     stack: &Stack,
 ) -> Result<String, ShellError> {
     match get_converted_value(engine_state, stack, env_name, value, "to_string") {
-        ConversionResult::Ok(v) => Ok(v.coerce_into_string()?),
-        ConversionResult::ConversionError(e) => Err(e),
-        ConversionResult::CellPathError => match value.coerce_string() {
+        Ok(v) => Ok(v.coerce_into_string()?),
+        Err(ConversionError::ShellError(e)) => Err(e),
+        Err(ConversionError::CellPathError) => match value.coerce_string() {
             Ok(s) => Ok(s),
             Err(_) => {
                 if env_name.to_lowercase() == "path" {
@@ -318,28 +357,24 @@ fn get_converted_value(
     name: &str,
     orig_val: &Value,
     direction: &str,
-) -> ConversionResult {
-    let conversions = stack.get_env_var(engine_state, ENV_CONVERSIONS);
-    let conversion = conversions
-        .as_ref()
-        .and_then(|val| val.as_record().ok())
-        .and_then(|record| record.get(name))
-        .and_then(|val| val.as_record().ok())
-        .and_then(|record| record.get(direction));
+) -> Result<Value, ConversionError> {
+    let conversion = stack
+        .get_env_var(engine_state, ENV_CONVERSIONS)
+        .ok_or(ConversionError::CellPathError)?
+        .as_record()?
+        .get(name)
+        .ok_or(ConversionError::CellPathError)?
+        .as_record()?
+        .get(direction)
+        .ok_or(ConversionError::CellPathError)?
+        .as_closure()?;
 
-    if let Some(conversion) = conversion {
-        conversion
-            .as_closure()
-            .and_then(|closure| {
-                ClosureEvalOnce::new(engine_state, stack, closure.clone())
-                    .debug(false)
-                    .run_with_value(orig_val.clone())
-            })
-            .and_then(|data| data.into_value(orig_val.span()))
-            .map_or_else(ConversionResult::ConversionError, ConversionResult::Ok)
-    } else {
-        ConversionResult::CellPathError
-    }
+    Ok(
+        ClosureEvalOnce::new(engine_state, stack, conversion.clone())
+            .debug(false)
+            .run_with_value(orig_val.clone())?
+            .into_value(orig_val.span())?,
+    )
 }
 
 fn ensure_path(scope: &mut HashMap<String, Value>, env_path_name: &str) -> Option<ShellError> {
diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index afcb58a90a..34e47732b1 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -14,7 +14,9 @@ use nu_protocol::{
 };
 use nu_utils::IgnoreCaseExt;
 
-use crate::{eval::is_automatic_env_var, eval_block_with_early_return};
+use crate::{
+    convert_env_vars, eval::is_automatic_env_var, eval_block_with_early_return, ENV_CONVERSIONS,
+};
 
 /// Evaluate the compiled representation of a [`Block`].
 pub fn eval_ir_block<D: DebugContext>(
@@ -384,10 +386,16 @@ fn eval_instruction<D: DebugContext>(
 
             if !is_automatic_env_var(&key) {
                 let is_config = key == "config";
-                ctx.stack.add_env_var(key.into_owned(), value);
+                let update_conversions = key == ENV_CONVERSIONS;
+
+                ctx.stack.add_env_var(key.into_owned(), value.clone());
+
                 if is_config {
                     ctx.stack.update_config(ctx.engine_state)?;
                 }
+                if update_conversions {
+                    convert_env_vars(ctx.stack, ctx.engine_state, &value)?;
+                }
                 Ok(Continue)
             } else {
                 Err(ShellError::AutomaticEnvVarSetManually {
diff --git a/tests/shell/environment/env.rs b/tests/shell/environment/env.rs
index 34910fd98e..7e628a92e7 100644
--- a/tests/shell/environment/env.rs
+++ b/tests/shell/environment/env.rs
@@ -190,6 +190,16 @@ fn env_var_case_insensitive() {
     assert!(actual.out.contains("222"));
 }
 
+#[test]
+fn env_conversion_on_assignment() {
+    let actual = nu!(r#"
+        $env.FOO = "bar:baz:quox"
+        $env.ENV_CONVERSIONS = { FOO: { from_string: {|| split row ":"} } }
+        $env.FOO | to nuon
+    "#);
+    assert_eq!(actual.out, "[bar, baz, quox]");
+}
+
 #[test]
 fn std_log_env_vars_are_not_overridden() {
     let actual = nu_with_std!(

From 38ffcaad7ba38305bc2f3e90b6dc1f0d06ecd413 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Wed, 25 Dec 2024 21:40:02 +0800
Subject: [PATCH 0846/1072] make du streaming (#14665)

# Description
Following up for issue comment:
https://github.com/nushell/nushell/pull/14407#issuecomment-2532343036

> it looks like it just hangs when it's actually counting things

I noticed that `du` command collects output internally, so it doesn't
streaming.

This pr is trying to make it streaming

# User-Facing Changes
NaN

# Tests + Formatting
NaN
---
 crates/nu-command/src/filesystem/du.rs | 29 +++++++++++++-------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/crates/nu-command/src/filesystem/du.rs b/crates/nu-command/src/filesystem/du.rs
index f90af2f8ad..d0a2d3d5f3 100644
--- a/crates/nu-command/src/filesystem/du.rs
+++ b/crates/nu-command/src/filesystem/du.rs
@@ -165,6 +165,7 @@ fn du_for_one_pattern(
     span: Span,
     signals: &Signals,
 ) -> Result<impl Iterator<Item = Value> + Send, ShellError> {
+    let signals_clone = signals.clone();
     let exclude = args.exclude.map_or(Ok(None), move |x| {
         Pattern::new(x.item.as_ref())
             .map(Some)
@@ -174,7 +175,7 @@ fn du_for_one_pattern(
             })
     })?;
 
-    let mut paths = match args.path {
+    let paths = match args.path {
         Some(p) => nu_engine::glob_from(&p, current_dir, span, None),
         // The * pattern should never fail.
         None => nu_engine::glob_from(
@@ -202,22 +203,22 @@ fn du_for_one_pattern(
         long,
     };
 
-    let mut output: Vec<Value> = vec![];
-    for p in paths.by_ref() {
-        match p {
-            Ok(a) => {
-                if a.is_dir() {
-                    output.push(DirInfo::new(a, &params, max_depth, span, signals)?.into());
-                } else if let Ok(v) = FileInfo::new(a, deref, span, params.long) {
-                    output.push(v.into());
+    Ok(paths.filter_map(move |p| match p {
+        Ok(a) => {
+            if a.is_dir() {
+                match DirInfo::new(a, &params, max_depth, span, &signals_clone) {
+                    Ok(v) => Some(Value::from(v)),
+                    Err(_) => None,
+                }
+            } else {
+                match FileInfo::new(a, deref, span, params.long) {
+                    Ok(v) => Some(Value::from(v)),
+                    Err(_) => None,
                 }
             }
-            Err(e) => {
-                output.push(Value::error(e, span));
-            }
         }
-    }
-    Ok(output.into_iter())
+        Err(e) => Some(Value::error(e, span)),
+    }))
 }
 
 #[cfg(test)]

From 0a0475ebad1a9d73772288be026dd5780d8ea120 Mon Sep 17 00:00:00 2001
From: Renan Ribeiro <55855728+cosineblast@users.noreply.github.com>
Date: Wed, 25 Dec 2024 11:13:05 -0300
Subject: [PATCH 0847/1072] add streaming to `get` and `reject` (#14622)

Closes #14487.

# Description

`get` and `reject` now stream properly:

Before:

![image](https://github.com/user-attachments/assets/57ecb705-1f98-49a4-a47e-27bba1c6c732)

Now:

![image](https://github.com/user-attachments/assets/dc5c7fba-e1ef-46d2-bd78-fd777b9e9dad)

# User-Facing Changes

# Tests + Formatting

# After Submitting

---------

Co-authored-by: Wind <WindSoilder@outlook.com>
Co-authored-by: 132ikl <132@ikl.sh>
---
 crates/nu-command/src/filters/get.rs         | 54 ++++++++++++++++++--
 crates/nu-command/src/filters/reject.rs      | 37 +++++++++++---
 crates/nu-command/tests/commands/split_by.rs |  9 ++--
 3 files changed, 88 insertions(+), 12 deletions(-)

diff --git a/crates/nu-command/src/filters/get.rs b/crates/nu-command/src/filters/get.rs
index a79c1c48f4..3f12e66814 100644
--- a/crates/nu-command/src/filters/get.rs
+++ b/crates/nu-command/src/filters/get.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::{ast::PathMember, Signals};
 
 #[derive(Clone)]
 pub struct Get;
@@ -72,9 +73,13 @@ If multiple cell paths are given, this will produce a list of values."#
         }
 
         if rest.is_empty() {
-            input
-                .follow_cell_path(&cell_path.members, call.head, !sensitive)
-                .map(|x| x.into_pipeline_data())
+            follow_cell_path_into_stream(
+                input,
+                engine_state.signals().clone(),
+                cell_path.members,
+                call.head,
+                !sensitive,
+            )
         } else {
             let mut output = vec![];
 
@@ -94,6 +99,7 @@ If multiple cell paths are given, this will produce a list of values."#
         }
         .map(|x| x.set_metadata(metadata))
     }
+
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
@@ -139,6 +145,48 @@ If multiple cell paths are given, this will produce a list of values."#
     }
 }
 
+// the PipelineData.follow_cell_path function, when given a
+// stream, collects it into a vec before doing its job
+//
+// this is fine, since it returns a Result<Value ShellError>,
+// but if we want to follow a PipelineData into a cell path and
+// return another PipelineData, then we have to take care to
+// make sure it streams
+pub fn follow_cell_path_into_stream(
+    data: PipelineData,
+    signals: Signals,
+    cell_path: Vec<PathMember>,
+    head: Span,
+    insensitive: bool,
+) -> Result<PipelineData, ShellError> {
+    // when given an integer/indexing, we fallback to
+    // the default nushell indexing behaviour
+    let has_int_member = cell_path
+        .iter()
+        .any(|it| matches!(it, PathMember::Int { .. }));
+    match data {
+        PipelineData::ListStream(stream, ..) if !has_int_member => {
+            let result = stream
+                .into_iter()
+                .map(move |value| {
+                    let span = value.span();
+
+                    match value.follow_cell_path(&cell_path, insensitive) {
+                        Ok(v) => v,
+                        Err(error) => Value::error(error, span),
+                    }
+                })
+                .into_pipeline_data(head, signals);
+
+            Ok(result)
+        }
+
+        _ => data
+            .follow_cell_path(&cell_path, head, insensitive)
+            .map(|x| x.into_pipeline_data()),
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/crates/nu-command/src/filters/reject.rs b/crates/nu-command/src/filters/reject.rs
index 3f966e2da5..058ad1d70b 100644
--- a/crates/nu-command/src/filters/reject.rs
+++ b/crates/nu-command/src/filters/reject.rs
@@ -166,15 +166,13 @@ impl Command for Reject {
 }
 
 fn reject(
-    _engine_state: &EngineState,
+    engine_state: &EngineState,
     span: Span,
     input: PipelineData,
     cell_paths: Vec<CellPath>,
 ) -> Result<PipelineData, ShellError> {
     let mut unique_rows: HashSet<usize> = HashSet::new();
     let metadata = input.metadata();
-    let val = input.into_value(span)?;
-    let mut val = val;
     let mut new_columns = vec![];
     let mut new_rows = vec![];
     for column in cell_paths {
@@ -212,10 +210,37 @@ fn reject(
     });
 
     new_columns.append(&mut new_rows);
-    for cell_path in new_columns {
-        val.remove_data_at_cell_path(&cell_path.members)?;
+
+    match input {
+        PipelineData::ListStream(stream, ..) => {
+            let result = stream
+                .into_iter()
+                .map(move |mut value| {
+                    let span = value.span();
+
+                    for cell_path in new_columns.iter() {
+                        if let Err(error) = value.remove_data_at_cell_path(&cell_path.members) {
+                            return Value::error(error, span);
+                        }
+                    }
+
+                    value
+                })
+                .into_pipeline_data(span, engine_state.signals().clone());
+
+            Ok(result)
+        }
+
+        input => {
+            let mut val = input.into_value(span)?;
+
+            for cell_path in new_columns {
+                val.remove_data_at_cell_path(&cell_path.members)?;
+            }
+
+            Ok(val.into_pipeline_data_with_metadata(metadata))
+        }
     }
-    Ok(val.into_pipeline_data_with_metadata(metadata))
 }
 
 #[cfg(test)]
diff --git a/crates/nu-command/tests/commands/split_by.rs b/crates/nu-command/tests/commands/split_by.rs
index ab4631d079..1f648a1fcf 100644
--- a/crates/nu-command/tests/commands/split_by.rs
+++ b/crates/nu-command/tests/commands/split_by.rs
@@ -56,8 +56,11 @@ fn errors_if_non_record_input() {
             "
         ));
 
-        assert!(only_supports
-            .err
-            .contains("only Record input data is supported"));
+        assert!(
+            only_supports
+                .err
+                .contains("only Record input data is supported")
+                || only_supports.err.contains("expected: record")
+        );
     })
 }

From 38694a9850a08f82a9a887c64df55c9f561e4c61 Mon Sep 17 00:00:00 2001
From: Solomon <git@solomonvictorino.com>
Date: Thu, 26 Dec 2024 06:56:42 -0700
Subject: [PATCH 0848/1072] `cp`: disable unsupported reflink mode in freebsd
 builds (#14677)

Fixes #12627

# User-Facing Changes

Under FreeBSD, `cp` no longer errors with "--reflink is only supported
on
linux and macOS".

# Tests

The `commands::ucp` tests now pass on a FreeBSD 14.2 machine with ZFS.
---
 crates/nu-command/src/filesystem/ucp.rs | 14 ++------------
 crates/nu-command/tests/commands/ucp.rs |  8 +++++++-
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/crates/nu-command/src/filesystem/ucp.rs b/crates/nu-command/src/filesystem/ucp.rs
index b100a23bff..40315d9e78 100644
--- a/crates/nu-command/src/filesystem/ucp.rs
+++ b/crates/nu-command/src/filesystem/ucp.rs
@@ -142,19 +142,9 @@ impl Command for UCp {
         } else {
             uu_cp::OverwriteMode::Clobber(uu_cp::ClobberMode::Standard)
         };
-        #[cfg(any(
-            target_os = "linux",
-            target_os = "freebsd",
-            target_os = "android",
-            target_os = "macos"
-        ))]
+        #[cfg(any(target_os = "linux", target_os = "android", target_os = "macos"))]
         let reflink_mode = uu_cp::ReflinkMode::Auto;
-        #[cfg(not(any(
-            target_os = "linux",
-            target_os = "freebsd",
-            target_os = "android",
-            target_os = "macos"
-        )))]
+        #[cfg(not(any(target_os = "linux", target_os = "android", target_os = "macos")))]
         let reflink_mode = uu_cp::ReflinkMode::Never;
         let mut paths = call.rest::<Spanned<NuGlob>>(engine_state, stack, 0)?;
         if paths.is_empty() {
diff --git a/crates/nu-command/tests/commands/ucp.rs b/crates/nu-command/tests/commands/ucp.rs
index 7834e91e7c..fe18d9187d 100644
--- a/crates/nu-command/tests/commands/ucp.rs
+++ b/crates/nu-command/tests/commands/ucp.rs
@@ -894,13 +894,19 @@ fn test_cp_debug_default() {
         {
             panic!("{}", format!("Failure: stdout was \n{}", actual.out));
         }
-        #[cfg(any(target_os = "linux", target_os = "freebsd"))]
+        #[cfg(target_os = "linux")]
         if !actual
             .out
             .contains("copy offload: yes, reflink: unsupported, sparse detection: no")
         {
             panic!("{}", format!("Failure: stdout was \n{}", actual.out));
         }
+        #[cfg(target_os = "freebsd")]
+        if !actual.out.contains(
+            "copy offload: unsupported, reflink: unsupported, sparse detection: unsupported",
+        ) {
+            panic!("{}", format!("Failure: stdout was \n{}", actual.out));
+        }
 
         #[cfg(windows)]
         if !actual.out.contains(

From 5f3c8d45d8dc1c00e538b3fadbd772fb77ec23a7 Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Thu, 26 Dec 2024 18:00:01 +0100
Subject: [PATCH 0849/1072] Add `auto` option for `config.use_ansi_coloring`
 (#14647)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

In this PR I continued the idea of #11494, it added an `auto` option to
the ansi coloring config option, I did this too but in a more simple
approach.

So I added a new enum `UseAnsiColoring` with the three values `True`,
`False` and `Auto`. When that value is set to `auto`, the default value,
it will use `std::io::stdout().is_terminal()` to decided whether to use
ansi coloring. This allows to dynamically decide whether to print ansi
color codes or not, [cargo does it the same
way](https://github.com/rust-lang/cargo/blob/652623b779c88fe44afede28bf7f1c9c07812511/src/bin/cargo/main.rs#L72).
`True` and `False` act as overrides to the `is_terminal` check. So with
that PR it is possible to force ansi colors on the `table` command or
automatically remove them from the miette errors if no terminal is used.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

Terminal users shouldn't be affected by this change as the default value
was `true` and `is_terminal` returns for terminals `true` (duh).
Non-terminal users, that use `nu` in some embedded way or the engine
implemented in some other way (like my jupyter kernel) will now have by
default no ansi coloring and need to enable it manually if their
environment allows it.

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

The test for fancy errors expected ansi codes, since tests aren't run
"in terminal", the ansi codes got stripped away.
I added a line that forced ansi colors above it. I'm not sure if that
should be the case or if we should test against no ansi colors.

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->

This should resolve #11464 and partially #11847. This also closes
#11494.
---
 .../src/completions/completion_common.rs      |  16 +-
 crates/nu-cli/src/config_files.rs             |  20 +-
 crates/nu-cli/src/repl.rs                     |   6 +-
 crates/nu-cli/src/util.rs                     |   5 +-
 crates/nu-command/src/help/help_aliases.rs    |   2 +-
 crates/nu-command/src/help/help_modules.rs    |   2 +-
 crates/nu-command/src/platform/ansi/ansi_.rs  |  10 +-
 crates/nu-command/src/system/run_external.rs  |   6 +-
 crates/nu-command/src/viewers/griddle.rs      |   2 +-
 crates/nu-command/src/viewers/table.rs        |  31 +--
 crates/nu-engine/src/documentation.rs         |   4 +-
 .../nu-protocol/src/config/ansi_coloring.rs   | 248 ++++++++++++++++++
 crates/nu-protocol/src/config/mod.rs          |   6 +-
 crates/nu-protocol/src/config/output.rs       |   3 +-
 crates/nu-protocol/src/errors/cli_error.rs    |   2 +-
 crates/nu-protocol/src/value/mod.rs           |  69 +++++
 crates/nu-protocol/tests/test_config.rs       |   3 +-
 .../nu-utils/src/default_files/doc_config.nu  |  20 +-
 src/config_files.rs                           |   4 +-
 src/main.rs                                   |   5 +-
 src/run.rs                                    |   5 +-
 21 files changed, 411 insertions(+), 58 deletions(-)
 create mode 100644 crates/nu-protocol/src/config/ansi_coloring.rs

diff --git a/crates/nu-cli/src/completions/completion_common.rs b/crates/nu-cli/src/completions/completion_common.rs
index 4b5ef857e1..4969cbd51d 100644
--- a/crates/nu-cli/src/completions/completion_common.rs
+++ b/crates/nu-cli/src/completions/completion_common.rs
@@ -196,14 +196,14 @@ pub fn complete_item(
         .map(|cwd| Path::new(cwd.as_ref()).to_path_buf())
         .collect();
     let ls_colors = (engine_state.config.completions.use_ls_colors
-        && engine_state.config.use_ansi_coloring)
-        .then(|| {
-            let ls_colors_env_str = match stack.get_env_var(engine_state, "LS_COLORS") {
-                Some(v) => env_to_string("LS_COLORS", v, engine_state, stack).ok(),
-                None => None,
-            };
-            get_ls_colors(ls_colors_env_str)
-        });
+        && engine_state.config.use_ansi_coloring.get(engine_state))
+    .then(|| {
+        let ls_colors_env_str = match stack.get_env_var(engine_state, "LS_COLORS") {
+            Some(v) => env_to_string("LS_COLORS", v, engine_state, stack).ok(),
+            None => None,
+        };
+        get_ls_colors(ls_colors_env_str)
+    });
 
     let mut cwds = cwd_pathbufs.clone();
     let mut prefix_len = 0;
diff --git a/crates/nu-cli/src/config_files.rs b/crates/nu-cli/src/config_files.rs
index 7627252acc..28332fe998 100644
--- a/crates/nu-cli/src/config_files.rs
+++ b/crates/nu-cli/src/config_files.rs
@@ -49,7 +49,10 @@ pub fn read_plugin_file(engine_state: &mut EngineState, plugin_file: Option<Span
     perf!(
         "add plugin file to engine_state",
         start_time,
-        engine_state.get_config().use_ansi_coloring
+        engine_state
+            .get_config()
+            .use_ansi_coloring
+            .get(engine_state)
     );
 
     start_time = std::time::Instant::now();
@@ -129,7 +132,10 @@ pub fn read_plugin_file(engine_state: &mut EngineState, plugin_file: Option<Span
         perf!(
             &format!("read plugin file {}", plugin_path.display()),
             start_time,
-            engine_state.get_config().use_ansi_coloring
+            engine_state
+                .get_config()
+                .use_ansi_coloring
+                .get(engine_state)
         );
         start_time = std::time::Instant::now();
 
@@ -145,7 +151,10 @@ pub fn read_plugin_file(engine_state: &mut EngineState, plugin_file: Option<Span
         perf!(
             &format!("load plugin file {}", plugin_path.display()),
             start_time,
-            engine_state.get_config().use_ansi_coloring
+            engine_state
+                .get_config()
+                .use_ansi_coloring
+                .get(engine_state)
         );
     }
 }
@@ -345,7 +354,10 @@ pub fn migrate_old_plugin_file(engine_state: &EngineState) -> bool {
     perf!(
         "migrate old plugin file",
         start_time,
-        engine_state.get_config().use_ansi_coloring
+        engine_state
+            .get_config()
+            .use_ansi_coloring
+            .get(&engine_state)
     );
     true
 }
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 06ecd1d49a..19f4aba22f 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -61,7 +61,7 @@ pub fn evaluate_repl(
     // from the Arc. This lets us avoid copying stack variables needlessly
     let mut unique_stack = stack.clone();
     let config = engine_state.get_config();
-    let use_color = config.use_ansi_coloring;
+    let use_color = config.use_ansi_coloring.get(engine_state);
 
     confirm_stdin_is_terminal()?;
 
@@ -390,7 +390,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
         )))
         .with_quick_completions(config.completions.quick)
         .with_partial_completions(config.completions.partial)
-        .with_ansi_colors(config.use_ansi_coloring)
+        .with_ansi_colors(config.use_ansi_coloring.get(engine_state))
         .with_cwd(Some(
             engine_state
                 .cwd(None)
@@ -410,7 +410,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
     let style_computer = StyleComputer::from_config(engine_state, &stack_arc);
 
     start_time = std::time::Instant::now();
-    line_editor = if config.use_ansi_coloring {
+    line_editor = if config.use_ansi_coloring.get(engine_state) {
         line_editor.with_hinter(Box::new({
             // As of Nov 2022, "hints" color_config closures only get `null` passed in.
             let style = style_computer.compute("hints", &Value::nothing(Span::unknown()));
diff --git a/crates/nu-cli/src/util.rs b/crates/nu-cli/src/util.rs
index 50db15a68e..6b0bade8c6 100644
--- a/crates/nu-cli/src/util.rs
+++ b/crates/nu-cli/src/util.rs
@@ -265,7 +265,10 @@ pub fn eval_source(
     perf!(
         &format!("eval_source {}", &fname),
         start_time,
-        engine_state.get_config().use_ansi_coloring
+        engine_state
+            .get_config()
+            .use_ansi_coloring
+            .get(engine_state)
     );
 
     exit_code
diff --git a/crates/nu-command/src/help/help_aliases.rs b/crates/nu-command/src/help/help_aliases.rs
index 0d6d4b4f15..0e5241e6a9 100644
--- a/crates/nu-command/src/help/help_aliases.rs
+++ b/crates/nu-command/src/help/help_aliases.rs
@@ -144,7 +144,7 @@ pub fn help_aliases(
         long_desc.push_str(&format!("{G}Expansion{RESET}:\n  {alias_expansion}"));
 
         let config = stack.get_config(engine_state);
-        if !config.use_ansi_coloring {
+        if !config.use_ansi_coloring.get(engine_state) {
             long_desc = nu_utils::strip_ansi_string_likely(long_desc);
         }
 
diff --git a/crates/nu-command/src/help/help_modules.rs b/crates/nu-command/src/help/help_modules.rs
index 579bd3f768..84fff36dfb 100644
--- a/crates/nu-command/src/help/help_modules.rs
+++ b/crates/nu-command/src/help/help_modules.rs
@@ -231,7 +231,7 @@ pub fn help_modules(
         }
 
         let config = stack.get_config(engine_state);
-        if !config.use_ansi_coloring {
+        if !config.use_ansi_coloring.get(engine_state) {
             long_desc = nu_utils::strip_ansi_string_likely(long_desc);
         }
 
diff --git a/crates/nu-command/src/platform/ansi/ansi_.rs b/crates/nu-command/src/platform/ansi/ansi_.rs
index fe66cb9e15..4e40f7df3f 100644
--- a/crates/nu-command/src/platform/ansi/ansi_.rs
+++ b/crates/nu-command/src/platform/ansi/ansi_.rs
@@ -654,7 +654,10 @@ Operating system commands:
         let list: bool = call.has_flag(engine_state, stack, "list")?;
         let escape: bool = call.has_flag(engine_state, stack, "escape")?;
         let osc: bool = call.has_flag(engine_state, stack, "osc")?;
-        let use_ansi_coloring = stack.get_config(engine_state).use_ansi_coloring;
+        let use_ansi_coloring = stack
+            .get_config(engine_state)
+            .use_ansi_coloring
+            .get(engine_state);
 
         if list {
             return Ok(generate_ansi_code_list(
@@ -691,7 +694,10 @@ Operating system commands:
         let list: bool = call.has_flag_const(working_set, "list")?;
         let escape: bool = call.has_flag_const(working_set, "escape")?;
         let osc: bool = call.has_flag_const(working_set, "osc")?;
-        let use_ansi_coloring = working_set.get_config().use_ansi_coloring;
+        let use_ansi_coloring = working_set
+            .get_config()
+            .use_ansi_coloring
+            .get(working_set.permanent());
 
         if list {
             return Ok(generate_ansi_code_list(
diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index e3d74c055b..304b0fff8d 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -1,7 +1,9 @@
 use nu_cmd_base::hook::eval_hook;
 use nu_engine::{command_prelude::*, env_to_strings};
 use nu_path::{dots::expand_ndots, expand_tilde, AbsolutePath};
-use nu_protocol::{did_you_mean, process::ChildProcess, ByteStream, NuGlob, OutDest, Signals};
+use nu_protocol::{
+    did_you_mean, process::ChildProcess, ByteStream, NuGlob, OutDest, Signals, UseAnsiColoring,
+};
 use nu_system::ForegroundChild;
 use nu_utils::IgnoreCaseExt;
 use pathdiff::diff_paths;
@@ -417,7 +419,7 @@ fn write_pipeline_data(
         stack.start_collect_value();
 
         // Turn off color as we pass data through
-        Arc::make_mut(&mut engine_state.config).use_ansi_coloring = false;
+        Arc::make_mut(&mut engine_state.config).use_ansi_coloring = UseAnsiColoring::False;
 
         // Invoke the `table` command.
         let output =
diff --git a/crates/nu-command/src/viewers/griddle.rs b/crates/nu-command/src/viewers/griddle.rs
index 23b8259ddd..336026fa38 100644
--- a/crates/nu-command/src/viewers/griddle.rs
+++ b/crates/nu-command/src/viewers/griddle.rs
@@ -72,7 +72,7 @@ prints out the list properly."#
             None => None,
         };
 
-        let use_color: bool = color_param && config.use_ansi_coloring;
+        let use_color: bool = color_param && config.use_ansi_coloring.get(engine_state);
         let cwd = engine_state.cwd(Some(stack))?;
 
         match input {
diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index 4f74e4b0a8..3c699f52df 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -15,12 +15,7 @@ use nu_table::{
     StringResult, TableOpts, TableOutput,
 };
 use nu_utils::{get_ls_colors, terminal_size};
-use std::{
-    collections::VecDeque,
-    io::{IsTerminal, Read},
-    path::PathBuf,
-    str::FromStr,
-};
+use std::{collections::VecDeque, io::Read, path::PathBuf, str::FromStr};
 use url::Url;
 use web_time::Instant;
 
@@ -231,6 +226,7 @@ struct TableConfig {
     term_width: usize,
     theme: TableMode,
     abbreviation: Option<usize>,
+    use_ansi_coloring: bool,
 }
 
 impl TableConfig {
@@ -240,6 +236,7 @@ impl TableConfig {
         theme: TableMode,
         abbreviation: Option<usize>,
         index: Option<usize>,
+        use_ansi_coloring: bool,
     ) -> Self {
         Self {
             index,
@@ -247,6 +244,7 @@ impl TableConfig {
             term_width,
             abbreviation,
             theme,
+            use_ansi_coloring,
         }
     }
 }
@@ -280,12 +278,15 @@ fn parse_table_config(
 
     let term_width = get_width_param(width_param);
 
+    let use_ansi_coloring = state.get_config().use_ansi_coloring.get(state);
+
     Ok(TableConfig::new(
         table_view,
         term_width,
         theme,
         abbrivation,
         index,
+        use_ansi_coloring,
     ))
 }
 
@@ -563,7 +564,7 @@ fn handle_record(
     let result = build_table_kv(record, cfg.table_view, opts, span)?;
 
     let result = match result {
-        Some(output) => maybe_strip_color(output, &config),
+        Some(output) => maybe_strip_color(output, cfg.use_ansi_coloring),
         None => report_unsuccessful_output(input.engine_state.signals(), cfg.term_width),
     };
 
@@ -947,14 +948,9 @@ impl Iterator for PagingTableCreator {
 
         self.row_offset += batch_size;
 
-        let config = {
-            let state = &self.engine_state;
-            let stack = &self.stack;
-            stack.get_config(state)
-        };
         convert_table_to_output(
             table,
-            &config,
+            &self.cfg,
             self.engine_state.signals(),
             self.cfg.term_width,
         )
@@ -1116,9 +1112,8 @@ enum TableView {
     },
 }
 
-fn maybe_strip_color(output: String, config: &Config) -> String {
-    // the terminal is for when people do ls from vim, there should be no coloring there
-    if !config.use_ansi_coloring || !std::io::stdout().is_terminal() {
+fn maybe_strip_color(output: String, use_ansi_coloring: bool) -> String {
+    if !use_ansi_coloring {
         // Draw the table without ansi colors
         nu_utils::strip_ansi_string_likely(output)
     } else {
@@ -1154,13 +1149,13 @@ fn create_empty_placeholder(
 
 fn convert_table_to_output(
     table: Result<Option<String>, ShellError>,
-    config: &Config,
+    cfg: &TableConfig,
     signals: &Signals,
     term_width: usize,
 ) -> Option<Result<Vec<u8>, ShellError>> {
     match table {
         Ok(Some(table)) => {
-            let table = maybe_strip_color(table, config);
+            let table = maybe_strip_color(table, cfg.use_ansi_coloring);
 
             let mut bytes = table.as_bytes().to_vec();
             bytes.push(b'\n'); // nu-table tables don't come with a newline on the end
diff --git a/crates/nu-engine/src/documentation.rs b/crates/nu-engine/src/documentation.rs
index 81add7af4d..4598e1b325 100644
--- a/crates/nu-engine/src/documentation.rs
+++ b/crates/nu-engine/src/documentation.rs
@@ -258,7 +258,7 @@ fn get_documentation(
         long_desc.push_str("  ");
         long_desc.push_str(example.description);
 
-        if !nu_config.use_ansi_coloring {
+        if !nu_config.use_ansi_coloring.get(engine_state) {
             let _ = write!(long_desc, "\n  > {}\n", example.example);
         } else {
             let code_string = nu_highlight_string(example.example, engine_state, stack);
@@ -329,7 +329,7 @@ fn get_documentation(
 
     long_desc.push('\n');
 
-    if !nu_config.use_ansi_coloring {
+    if !nu_config.use_ansi_coloring.get(engine_state) {
         nu_utils::strip_ansi_string_likely(long_desc)
     } else {
         long_desc
diff --git a/crates/nu-protocol/src/config/ansi_coloring.rs b/crates/nu-protocol/src/config/ansi_coloring.rs
new file mode 100644
index 0000000000..408eee52cc
--- /dev/null
+++ b/crates/nu-protocol/src/config/ansi_coloring.rs
@@ -0,0 +1,248 @@
+use super::{ConfigErrors, ConfigPath, IntoValue, ShellError, UpdateFromValue, Value};
+use crate::{self as nu_protocol, engine::EngineState, FromValue};
+use serde::{Deserialize, Serialize};
+use std::io::IsTerminal;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, IntoValue, Serialize, Deserialize)]
+pub enum UseAnsiColoring {
+    #[default]
+    Auto,
+    True,
+    False,
+}
+
+impl UseAnsiColoring {
+    /// Determines whether ANSI colors should be used.
+    ///
+    /// This method evaluates the `UseAnsiColoring` setting and considers environment variables
+    /// (`FORCE_COLOR`, `NO_COLOR`, and `CLICOLOR`) when the value is set to `Auto`.
+    /// The configuration value (`UseAnsiColoring`) takes precedence over environment variables, as
+    /// it is more direct and internally may be modified to override ANSI coloring behavior.
+    ///
+    /// Most users should have the default value `Auto` which allows the environment variables to
+    /// control ANSI coloring.
+    /// However, when explicitly set to `True` or `False`, the environment variables are ignored.
+    ///
+    /// Behavior based on `UseAnsiColoring`:
+    /// - `True`: Forces ANSI colors to be enabled, ignoring terminal support and environment variables.
+    /// - `False`: Disables ANSI colors completely.
+    /// - `Auto`: Determines whether ANSI colors should be used based on environment variables and terminal support.
+    ///
+    /// When set to `Auto`, the following environment variables are checked in order:
+    /// 1. `FORCE_COLOR`: If set, ANSI colors are always enabled, overriding all other settings.
+    /// 2. `NO_COLOR`: If set, ANSI colors are disabled, overriding `CLICOLOR` and terminal checks.
+    /// 3. `CLICOLOR`: If set, its value determines whether ANSI colors are enabled (`1` for enabled, `0` for disabled).
+    ///
+    /// If none of these variables are set, ANSI coloring is enabled only if the standard output is
+    /// a terminal.
+    ///
+    /// By prioritizing the `UseAnsiColoring` value, we ensure predictable behavior and prevent
+    /// conflicts with internal overrides that depend on this configuration.
+    pub fn get(self, engine_state: &EngineState) -> bool {
+        let is_terminal = match self {
+            Self::Auto => std::io::stdout().is_terminal(),
+            Self::True => return true,
+            Self::False => return false,
+        };
+
+        let env_value = |env_name| {
+            engine_state
+                .get_env_var_insensitive(env_name)
+                .and_then(Value::as_env_bool)
+                .unwrap_or(false)
+        };
+
+        if env_value("force_color") {
+            return true;
+        }
+
+        if env_value("no_color") {
+            return false;
+        }
+
+        if let Some(cli_color) = engine_state.get_env_var_insensitive("clicolor") {
+            if let Some(cli_color) = cli_color.as_env_bool() {
+                return cli_color;
+            }
+        }
+
+        is_terminal
+    }
+}
+
+impl From<bool> for UseAnsiColoring {
+    fn from(value: bool) -> Self {
+        match value {
+            true => Self::True,
+            false => Self::False,
+        }
+    }
+}
+
+impl FromValue for UseAnsiColoring {
+    fn from_value(v: Value) -> Result<Self, ShellError> {
+        if let Ok(v) = v.as_bool() {
+            return Ok(v.into());
+        }
+
+        #[derive(FromValue)]
+        enum UseAnsiColoringString {
+            Auto = 0,
+            True = 1,
+            False = 2,
+        }
+
+        Ok(match UseAnsiColoringString::from_value(v)? {
+            UseAnsiColoringString::Auto => Self::Auto,
+            UseAnsiColoringString::True => Self::True,
+            UseAnsiColoringString::False => Self::False,
+        })
+    }
+}
+
+impl UpdateFromValue for UseAnsiColoring {
+    fn update<'a>(
+        &mut self,
+        value: &'a Value,
+        path: &mut ConfigPath<'a>,
+        errors: &mut ConfigErrors,
+    ) {
+        let Ok(value) = UseAnsiColoring::from_value(value.clone()) else {
+            errors.type_mismatch(path, UseAnsiColoring::expected_type(), value);
+            return;
+        };
+
+        *self = value;
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use nu_protocol::Config;
+
+    fn set_env(engine_state: &mut EngineState, name: &str, value: bool) {
+        engine_state.add_env_var(name.to_string(), Value::test_bool(value));
+    }
+
+    #[test]
+    fn test_use_ansi_coloring_true() {
+        let mut engine_state = EngineState::new();
+        engine_state.config = Config {
+            use_ansi_coloring: UseAnsiColoring::True,
+            ..Default::default()
+        }
+        .into();
+
+        // explicit `True` ignores environment variables
+        assert!(engine_state
+            .get_config()
+            .use_ansi_coloring
+            .get(&engine_state));
+
+        set_env(&mut engine_state, "clicolor", false);
+        assert!(engine_state
+            .get_config()
+            .use_ansi_coloring
+            .get(&engine_state));
+        set_env(&mut engine_state, "clicolor", true);
+        assert!(engine_state
+            .get_config()
+            .use_ansi_coloring
+            .get(&engine_state));
+        set_env(&mut engine_state, "no_color", true);
+        assert!(engine_state
+            .get_config()
+            .use_ansi_coloring
+            .get(&engine_state));
+        set_env(&mut engine_state, "force_color", true);
+        assert!(engine_state
+            .get_config()
+            .use_ansi_coloring
+            .get(&engine_state));
+    }
+
+    #[test]
+    fn test_use_ansi_coloring_false() {
+        let mut engine_state = EngineState::new();
+        engine_state.config = Config {
+            use_ansi_coloring: UseAnsiColoring::False,
+            ..Default::default()
+        }
+        .into();
+
+        // explicit `False` ignores environment variables
+        assert!(!engine_state
+            .get_config()
+            .use_ansi_coloring
+            .get(&engine_state));
+
+        set_env(&mut engine_state, "clicolor", false);
+        assert!(!engine_state
+            .get_config()
+            .use_ansi_coloring
+            .get(&engine_state));
+        set_env(&mut engine_state, "clicolor", true);
+        assert!(!engine_state
+            .get_config()
+            .use_ansi_coloring
+            .get(&engine_state));
+        set_env(&mut engine_state, "no_color", true);
+        assert!(!engine_state
+            .get_config()
+            .use_ansi_coloring
+            .get(&engine_state));
+        set_env(&mut engine_state, "force_color", true);
+        assert!(!engine_state
+            .get_config()
+            .use_ansi_coloring
+            .get(&engine_state));
+    }
+
+    #[test]
+    fn test_use_ansi_coloring_auto() {
+        let mut engine_state = EngineState::new();
+        engine_state.config = Config {
+            use_ansi_coloring: UseAnsiColoring::Auto,
+            ..Default::default()
+        }
+        .into();
+
+        // no environment variables, behavior depends on terminal state
+        let is_terminal = std::io::stdout().is_terminal();
+        assert_eq!(
+            engine_state
+                .get_config()
+                .use_ansi_coloring
+                .get(&engine_state),
+            is_terminal
+        );
+
+        // `clicolor` determines ANSI behavior if no higher-priority variables are set
+        set_env(&mut engine_state, "clicolor", true);
+        assert!(engine_state
+            .get_config()
+            .use_ansi_coloring
+            .get(&engine_state));
+
+        set_env(&mut engine_state, "clicolor", false);
+        assert!(!engine_state
+            .get_config()
+            .use_ansi_coloring
+            .get(&engine_state));
+
+        // `no_color` overrides `clicolor` and terminal state
+        set_env(&mut engine_state, "no_color", true);
+        assert!(!engine_state
+            .get_config()
+            .use_ansi_coloring
+            .get(&engine_state));
+
+        // `force_color` overrides everything
+        set_env(&mut engine_state, "force_color", true);
+        assert!(engine_state
+            .get_config()
+            .use_ansi_coloring
+            .get(&engine_state));
+    }
+}
diff --git a/crates/nu-protocol/src/config/mod.rs b/crates/nu-protocol/src/config/mod.rs
index d2ee40a2a0..6ce7335e9c 100644
--- a/crates/nu-protocol/src/config/mod.rs
+++ b/crates/nu-protocol/src/config/mod.rs
@@ -6,6 +6,7 @@ use helper::*;
 use prelude::*;
 use std::collections::HashMap;
 
+pub use ansi_coloring::UseAnsiColoring;
 pub use completions::{
     CompletionAlgorithm, CompletionConfig, CompletionSort, ExternalCompleterConfig,
 };
@@ -23,6 +24,7 @@ pub use rm::RmConfig;
 pub use shell_integration::ShellIntegrationConfig;
 pub use table::{FooterMode, TableConfig, TableIndexMode, TableMode, TrimStrategy};
 
+mod ansi_coloring;
 mod completions;
 mod datetime_format;
 mod display_errors;
@@ -49,7 +51,7 @@ pub struct Config {
     pub footer_mode: FooterMode,
     pub float_precision: i64,
     pub recursion_limit: i64,
-    pub use_ansi_coloring: bool,
+    pub use_ansi_coloring: UseAnsiColoring,
     pub completions: CompletionConfig,
     pub edit_mode: EditBindings,
     pub history: HistoryConfig,
@@ -106,7 +108,7 @@ impl Default for Config {
             footer_mode: FooterMode::RowCount(25),
             float_precision: 2,
             buffer_editor: Value::nothing(Span::unknown()),
-            use_ansi_coloring: true,
+            use_ansi_coloring: UseAnsiColoring::default(),
             bracketed_paste: true,
             edit_mode: EditBindings::default(),
 
diff --git a/crates/nu-protocol/src/config/output.rs b/crates/nu-protocol/src/config/output.rs
index 8db3467d6e..082856bdce 100644
--- a/crates/nu-protocol/src/config/output.rs
+++ b/crates/nu-protocol/src/config/output.rs
@@ -1,5 +1,6 @@
 use super::{config_update_string_enum, prelude::*};
-use crate as nu_protocol;
+
+use crate::{self as nu_protocol};
 
 #[derive(Clone, Copy, Debug, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
 pub enum ErrorStyle {
diff --git a/crates/nu-protocol/src/errors/cli_error.rs b/crates/nu-protocol/src/errors/cli_error.rs
index 5680ab172c..ecf35e247d 100644
--- a/crates/nu-protocol/src/errors/cli_error.rs
+++ b/crates/nu-protocol/src/errors/cli_error.rs
@@ -70,7 +70,7 @@ impl std::fmt::Debug for CliError<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let config = self.1.get_config();
 
-        let ansi_support = config.use_ansi_coloring;
+        let ansi_support = config.use_ansi_coloring.get(self.1.permanent());
 
         let error_style = &config.error_style;
 
diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs
index c12dd3d71d..ac663f4c49 100644
--- a/crates/nu-protocol/src/value/mod.rs
+++ b/crates/nu-protocol/src/value/mod.rs
@@ -655,6 +655,36 @@ impl Value {
         }
     }
 
+    /// Interprets this `Value` as a boolean based on typical conventions for environment values.
+    ///
+    /// The following rules are used:
+    /// - Values representing `false`:
+    ///   - Empty strings
+    ///   - The number `0` (as an integer, float or string)
+    ///   - `Nothing`
+    ///   - Explicit boolean `false`
+    /// - Values representing `true`:
+    ///   - Non-zero numbers (integer or float)
+    ///   - Non-empty strings
+    ///   - Explicit boolean `true`
+    ///
+    /// For all other, more complex variants of [`Value`], the function cannot determine a
+    /// boolean representation and returns `None`.
+    pub fn as_env_bool(&self) -> Option<bool> {
+        match self {
+            Value::Bool { val: false, .. }
+            | Value::Int { val: 0, .. }
+            | Value::Float { val: 0.0, .. }
+            | Value::Nothing { .. } => Some(false),
+            Value::String { val, .. } => match val.as_str() {
+                "" | "0" => Some(false),
+                _ => Some(true),
+            },
+            Value::Bool { .. } | Value::Int { .. } | Value::Float { .. } => Some(true),
+            _ => None,
+        }
+    }
+
     /// Returns a reference to the inner [`CustomValue`] trait object or an error if this `Value` is not a custom value
     pub fn as_custom_value(&self) -> Result<&dyn CustomValue, ShellError> {
         if let Value::Custom { val, .. } = self {
@@ -3874,4 +3904,43 @@ mod tests {
             assert_eq!("-0316-02-11T06:13:20+00:00", formatted);
         }
     }
+
+    #[test]
+    fn test_env_as_bool() {
+        // explicit false values
+        assert_eq!(Value::test_bool(false).as_env_bool(), Some(false));
+        assert_eq!(Value::test_int(0).as_env_bool(), Some(false));
+        assert_eq!(Value::test_float(0.0).as_env_bool(), Some(false));
+        assert_eq!(Value::test_string("").as_env_bool(), Some(false));
+        assert_eq!(Value::test_string("0").as_env_bool(), Some(false));
+        assert_eq!(Value::test_nothing().as_env_bool(), Some(false));
+
+        // explicit true values
+        assert_eq!(Value::test_bool(true).as_env_bool(), Some(true));
+        assert_eq!(Value::test_int(1).as_env_bool(), Some(true));
+        assert_eq!(Value::test_float(1.0).as_env_bool(), Some(true));
+        assert_eq!(Value::test_string("1").as_env_bool(), Some(true));
+
+        // implicit true values
+        assert_eq!(Value::test_int(42).as_env_bool(), Some(true));
+        assert_eq!(Value::test_float(0.5).as_env_bool(), Some(true));
+        assert_eq!(Value::test_string("not zero").as_env_bool(), Some(true));
+
+        // complex values returning None
+        assert_eq!(Value::test_record(Record::default()).as_env_bool(), None);
+        assert_eq!(
+            Value::test_list(vec![Value::test_int(1)]).as_env_bool(),
+            None
+        );
+        assert_eq!(
+            Value::test_date(
+                chrono::DateTime::parse_from_rfc3339("2024-01-01T12:00:00+00:00").unwrap(),
+            )
+            .as_env_bool(),
+            None
+        );
+        assert_eq!(Value::test_glob("*.rs").as_env_bool(), None);
+        assert_eq!(Value::test_binary(vec![1, 2, 3]).as_env_bool(), None);
+        assert_eq!(Value::test_duration(3600).as_env_bool(), None);
+    }
 }
diff --git a/crates/nu-protocol/tests/test_config.rs b/crates/nu-protocol/tests/test_config.rs
index eb57903685..81a0a7dede 100644
--- a/crates/nu-protocol/tests/test_config.rs
+++ b/crates/nu-protocol/tests/test_config.rs
@@ -53,6 +53,7 @@ fn filesize_format_auto_metric_false() {
 #[test]
 fn fancy_default_errors() {
     let code = nu_repl_code(&[
+        "$env.config.use_ansi_coloring = true",
         r#"def force_error [x] {
         error make {
             msg: "oh no!"
@@ -69,7 +70,7 @@ fn fancy_default_errors() {
 
     assert_eq!(
         actual.err,
-        "Error: \n  \u{1b}[31m×\u{1b}[0m oh no!\n   ╭─[\u{1b}[36;1;4mline1:1:13\u{1b}[0m]\n \u{1b}[2m1\u{1b}[0m │ force_error \"My error\"\n   · \u{1b}[35;1m            ─────┬────\u{1b}[0m\n   ·                  \u{1b}[35;1m╰── \u{1b}[35;1mhere's the error\u{1b}[0m\u{1b}[0m\n   ╰────\n\n"
+        "Error: \n  \u{1b}[31m×\u{1b}[0m oh no!\n   ╭─[\u{1b}[36;1;4mline2:1:13\u{1b}[0m]\n \u{1b}[2m1\u{1b}[0m │ force_error \"My error\"\n   · \u{1b}[35;1m            ─────┬────\u{1b}[0m\n   ·                  \u{1b}[35;1m╰── \u{1b}[35;1mhere's the error\u{1b}[0m\u{1b}[0m\n   ╰────\n\n"
     );
 }
 
diff --git a/crates/nu-utils/src/default_files/doc_config.nu b/crates/nu-utils/src/default_files/doc_config.nu
index db83e11110..08de7724f2 100644
--- a/crates/nu-utils/src/default_files/doc_config.nu
+++ b/crates/nu-utils/src/default_files/doc_config.nu
@@ -244,12 +244,20 @@ $env.config.shell_integration.reset_application_mode = true
 # Nushell.
 $env.config.bracketed_paste = true
 
-# use_ansi_coloring (bool):
-# true/false to enable/disable the use of ANSI colors in Nushell internal commands.
-# When disabled, output from Nushell built-in commands will display only in the default
-# foreground color.
-# Note: Does not apply to the `ansi` command.
-$env.config.use_ansi_coloring = true
+# use_ansi_coloring ("auto" or bool):
+# The default value `"auto"` dynamically determines if ANSI coloring is used.
+# It evaluates the following environment variables in decreasingly priority:
+# `FORCE_COLOR`, `NO_COLOR`, and `CLICOLOR`.
+# - If `FORCE_COLOR` is set, coloring is always enabled.
+# - If `NO_COLOR` is set, coloring is disabled.
+# - If `CLICOLOR` is set, its value (0 or 1) decides whether coloring is used.
+# If none of these are set, it checks whether the standard output is a terminal 
+# and enables coloring if it is.
+# A value of `true` or `false` overrides this behavior, explicitly enabling or 
+# disabling ANSI coloring in Nushell's internal commands.
+# When disabled, built-in commands will only use the default foreground color.
+# Note: This setting does not affect the `ansi` command.
+$env.config.use_ansi_coloring = "auto"
 
 # ----------------------
 # Error Display Settings
diff --git a/src/config_files.rs b/src/config_files.rs
index 5c43764580..6a612ea4a7 100644
--- a/src/config_files.rs
+++ b/src/config_files.rs
@@ -39,7 +39,7 @@ pub(crate) fn read_config_file(
 
         let start_time = std::time::Instant::now();
         let config = engine_state.get_config();
-        let use_color = config.use_ansi_coloring;
+        let use_color = config.use_ansi_coloring.get(engine_state);
         // Translate environment variables from Strings to Values
         if let Err(e) = convert_env_values(engine_state, stack) {
             report_shell_error(engine_state, &e);
@@ -53,7 +53,7 @@ pub(crate) fn read_config_file(
     } else {
         let start_time = std::time::Instant::now();
         let config = engine_state.get_config();
-        let use_color = config.use_ansi_coloring;
+        let use_color = config.use_ansi_coloring.get(engine_state);
         if let Err(e) = convert_env_values(engine_state, stack) {
             report_shell_error(engine_state, &e);
         }
diff --git a/src/main.rs b/src/main.rs
index 4ebc215531..bfae9c2f31 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -213,7 +213,10 @@ fn main() -> Result<()> {
 
     engine_state.history_enabled = parsed_nu_cli_args.no_history.is_none();
 
-    let use_color = engine_state.get_config().use_ansi_coloring;
+    let use_color = engine_state
+        .get_config()
+        .use_ansi_coloring
+        .get(&engine_state);
 
     // Set up logger
     if let Some(level) = parsed_nu_cli_args
diff --git a/src/run.rs b/src/run.rs
index 89bad3866f..640cc9bc35 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -197,7 +197,10 @@ pub(crate) fn run_repl(
     }
 
     // Reload use_color from config in case it's different from the default value
-    let use_color = engine_state.get_config().use_ansi_coloring;
+    let use_color = engine_state
+        .get_config()
+        .use_ansi_coloring
+        .get(engine_state);
     perf!("setup_config", start_time, use_color);
 
     let start_time = std::time::Instant::now();

From 76bbd41e43f37d4d190f7f45845ffd53505bc90f Mon Sep 17 00:00:00 2001
From: Henry Jetmundsen <32406734+hjetmundsen@users.noreply.github.com>
Date: Fri, 27 Dec 2024 06:45:52 -0500
Subject: [PATCH 0850/1072] Remove trailing slash from symlink completion
 (issue #13275) (#14667)

# Description
These changes fix #13275 where a slash is appended to completions of
symlinks pointing to directories.

# User-Facing Changes
The `/` character will no longer be appended to completions of symlinks.

Co-authored-by: Henry Jetmundsen <jet@henrys-mbp-2.lan>
---
 .../src/completions/completion_common.rs      |  2 +-
 crates/nu-cli/tests/completions/mod.rs        | 60 ++++++++++++++++---
 tests/fixtures/completions/test_a_symlink     |  1 +
 3 files changed, 55 insertions(+), 8 deletions(-)
 create mode 120000 tests/fixtures/completions/test_a_symlink

diff --git a/crates/nu-cli/src/completions/completion_common.rs b/crates/nu-cli/src/completions/completion_common.rs
index 4969cbd51d..4ab0f8f509 100644
--- a/crates/nu-cli/src/completions/completion_common.rs
+++ b/crates/nu-cli/src/completions/completion_common.rs
@@ -65,7 +65,7 @@ fn complete_rec(
 
         for entry in result.filter_map(|e| e.ok()) {
             let entry_name = entry.file_name().to_string_lossy().into_owned();
-            let entry_isdir = entry.path().is_dir();
+            let entry_isdir = entry.path().is_dir() && !entry.path().is_symlink();
             let mut built = built.clone();
             built.parts.push(entry_name.clone());
             built.isdir = entry_isdir;
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index e32ac8c4f2..18390345e4 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -176,7 +176,7 @@ fn variables_dollar_sign_with_variablecompletion() {
     let target_dir = "$ ";
     let suggestions = completer.complete(target_dir, target_dir.len());
 
-    assert_eq!(8, suggestions.len());
+    assert_eq!(9, suggestions.len());
 }
 
 #[rstest]
@@ -335,6 +335,7 @@ fn file_completions() {
         folder(dir.join("directory_completion")),
         file(dir.join("nushell")),
         folder(dir.join("test_a")),
+        file(dir.join("test_a_symlink")),
         folder(dir.join("test_b")),
         file(dir.join(".hidden_file")),
         folder(dir.join(".hidden_folder")),
@@ -368,6 +369,7 @@ fn file_completions() {
         folder(dir.join("directory_completion")),
         file(dir.join("nushell")),
         folder(dir.join("test_a")),
+        file(dir.join("test_a_symlink")),
         folder(dir.join("test_b")),
         file(dir.join(".hidden_file")),
         folder(dir.join(".hidden_folder")),
@@ -445,6 +447,7 @@ fn custom_command_rest_any_args_file_completions() {
         folder(dir.join("directory_completion")),
         file(dir.join("nushell")),
         folder(dir.join("test_a")),
+        file(dir.join("test_a_symlink")),
         folder(dir.join("test_b")),
         file(dir.join(".hidden_file")),
         folder(dir.join(".hidden_folder")),
@@ -464,6 +467,7 @@ fn custom_command_rest_any_args_file_completions() {
         folder(dir.join("directory_completion")),
         file(dir.join("nushell")),
         folder(dir.join("test_a")),
+        file(dir.join("test_a_symlink")),
         folder(dir.join("test_b")),
         file(dir.join(".hidden_file")),
         folder(dir.join(".hidden_folder")),
@@ -763,6 +767,7 @@ fn command_ls_with_filecompletion() {
         "directory_completion\\".to_string(),
         "nushell".to_string(),
         "test_a\\".to_string(),
+        "test_a_symlink".to_string(),
         "test_b\\".to_string(),
         ".hidden_file".to_string(),
         ".hidden_folder\\".to_string(),
@@ -774,6 +779,7 @@ fn command_ls_with_filecompletion() {
         "directory_completion/".to_string(),
         "nushell".to_string(),
         "test_a/".to_string(),
+        "test_a_symlink".to_string(),
         "test_b/".to_string(),
         ".hidden_file".to_string(),
         ".hidden_folder/".to_string(),
@@ -805,6 +811,7 @@ fn command_open_with_filecompletion() {
         "directory_completion\\".to_string(),
         "nushell".to_string(),
         "test_a\\".to_string(),
+        "test_a_symlink".to_string(),
         "test_b\\".to_string(),
         ".hidden_file".to_string(),
         ".hidden_folder\\".to_string(),
@@ -816,6 +823,7 @@ fn command_open_with_filecompletion() {
         "directory_completion/".to_string(),
         "nushell".to_string(),
         "test_a/".to_string(),
+        "test_a_symlink".to_string(),
         "test_b/".to_string(),
         ".hidden_file".to_string(),
         ".hidden_folder/".to_string(),
@@ -847,6 +855,7 @@ fn command_rm_with_globcompletion() {
         "directory_completion\\".to_string(),
         "nushell".to_string(),
         "test_a\\".to_string(),
+        "test_a_symlink".to_string(),
         "test_b\\".to_string(),
         ".hidden_file".to_string(),
         ".hidden_folder\\".to_string(),
@@ -858,6 +867,7 @@ fn command_rm_with_globcompletion() {
         "directory_completion/".to_string(),
         "nushell".to_string(),
         "test_a/".to_string(),
+        "test_a_symlink".to_string(),
         "test_b/".to_string(),
         ".hidden_file".to_string(),
         ".hidden_folder/".to_string(),
@@ -882,6 +892,7 @@ fn command_cp_with_globcompletion() {
         "directory_completion\\".to_string(),
         "nushell".to_string(),
         "test_a\\".to_string(),
+        "test_a_symlink".to_string(),
         "test_b\\".to_string(),
         ".hidden_file".to_string(),
         ".hidden_folder\\".to_string(),
@@ -893,6 +904,7 @@ fn command_cp_with_globcompletion() {
         "directory_completion/".to_string(),
         "nushell".to_string(),
         "test_a/".to_string(),
+        "test_a_symlink".to_string(),
         "test_b/".to_string(),
         ".hidden_file".to_string(),
         ".hidden_folder/".to_string(),
@@ -917,6 +929,7 @@ fn command_save_with_filecompletion() {
         "directory_completion\\".to_string(),
         "nushell".to_string(),
         "test_a\\".to_string(),
+        "test_a_symlink".to_string(),
         "test_b\\".to_string(),
         ".hidden_file".to_string(),
         ".hidden_folder\\".to_string(),
@@ -928,6 +941,7 @@ fn command_save_with_filecompletion() {
         "directory_completion/".to_string(),
         "nushell".to_string(),
         "test_a/".to_string(),
+        "test_a_symlink".to_string(),
         "test_b/".to_string(),
         ".hidden_file".to_string(),
         ".hidden_folder/".to_string(),
@@ -952,6 +966,7 @@ fn command_touch_with_filecompletion() {
         "directory_completion\\".to_string(),
         "nushell".to_string(),
         "test_a\\".to_string(),
+        "test_a_symlink".to_string(),
         "test_b\\".to_string(),
         ".hidden_file".to_string(),
         ".hidden_folder\\".to_string(),
@@ -963,6 +978,7 @@ fn command_touch_with_filecompletion() {
         "directory_completion/".to_string(),
         "nushell".to_string(),
         "test_a/".to_string(),
+        "test_a_symlink".to_string(),
         "test_b/".to_string(),
         ".hidden_file".to_string(),
         ".hidden_folder/".to_string(),
@@ -987,6 +1003,7 @@ fn command_watch_with_filecompletion() {
         "directory_completion\\".to_string(),
         "nushell".to_string(),
         "test_a\\".to_string(),
+        "test_a_symlink".to_string(),
         "test_b\\".to_string(),
         ".hidden_file".to_string(),
         ".hidden_folder\\".to_string(),
@@ -998,6 +1015,7 @@ fn command_watch_with_filecompletion() {
         "directory_completion/".to_string(),
         "nushell".to_string(),
         "test_a/".to_string(),
+        "test_a_symlink".to_string(),
         "test_b/".to_string(),
         ".hidden_file".to_string(),
         ".hidden_folder/".to_string(),
@@ -1452,9 +1470,17 @@ fn alias_of_command_and_flags() {
 
     let suggestions = completer.complete("ll t", 4);
     #[cfg(windows)]
-    let expected_paths: Vec<String> = vec!["test_a\\".to_string(), "test_b\\".to_string()];
+    let expected_paths: Vec<String> = vec![
+        "test_a\\".to_string(),
+        "test_a_symlink".to_string(),
+        "test_b\\".to_string(),
+    ];
     #[cfg(not(windows))]
-    let expected_paths: Vec<String> = vec!["test_a/".to_string(), "test_b/".to_string()];
+    let expected_paths: Vec<String> = vec![
+        "test_a/".to_string(),
+        "test_a_symlink".to_string(),
+        "test_b/".to_string(),
+    ];
 
     match_suggestions(&expected_paths, &suggestions)
 }
@@ -1471,9 +1497,17 @@ fn alias_of_basic_command() {
 
     let suggestions = completer.complete("ll t", 4);
     #[cfg(windows)]
-    let expected_paths: Vec<String> = vec!["test_a\\".to_string(), "test_b\\".to_string()];
+    let expected_paths: Vec<String> = vec![
+        "test_a\\".to_string(),
+        "test_a_symlink".to_string(),
+        "test_b\\".to_string(),
+    ];
     #[cfg(not(windows))]
-    let expected_paths: Vec<String> = vec!["test_a/".to_string(), "test_b/".to_string()];
+    let expected_paths: Vec<String> = vec![
+        "test_a/".to_string(),
+        "test_a_symlink".to_string(),
+        "test_b/".to_string(),
+    ];
 
     match_suggestions(&expected_paths, &suggestions)
 }
@@ -1493,9 +1527,17 @@ fn alias_of_another_alias() {
 
     let suggestions = completer.complete("lf t", 4);
     #[cfg(windows)]
-    let expected_paths: Vec<String> = vec!["test_a\\".to_string(), "test_b\\".to_string()];
+    let expected_paths: Vec<String> = vec![
+        "test_a\\".to_string(),
+        "test_a_symlink".to_string(),
+        "test_b\\".to_string(),
+    ];
     #[cfg(not(windows))]
-    let expected_paths: Vec<String> = vec!["test_a/".to_string(), "test_b/".to_string()];
+    let expected_paths: Vec<String> = vec![
+        "test_a/".to_string(),
+        "test_a_symlink".to_string(),
+        "test_b/".to_string(),
+    ];
 
     match_suggestions(&expected_paths, &suggestions)
 }
@@ -1544,6 +1586,7 @@ fn unknown_command_completion() {
         "directory_completion\\".to_string(),
         "nushell".to_string(),
         "test_a\\".to_string(),
+        "test_a_symlink".to_string(),
         "test_b\\".to_string(),
         ".hidden_file".to_string(),
         ".hidden_folder\\".to_string(),
@@ -1555,6 +1598,7 @@ fn unknown_command_completion() {
         "directory_completion/".to_string(),
         "nushell".to_string(),
         "test_a/".to_string(),
+        "test_a_symlink".to_string(),
         "test_b/".to_string(),
         ".hidden_file".to_string(),
         ".hidden_folder/".to_string(),
@@ -1606,6 +1650,7 @@ fn filecompletions_triggers_after_cursor() {
         "directory_completion\\".to_string(),
         "nushell".to_string(),
         "test_a\\".to_string(),
+        "test_a_symlink".to_string(),
         "test_b\\".to_string(),
         ".hidden_file".to_string(),
         ".hidden_folder\\".to_string(),
@@ -1617,6 +1662,7 @@ fn filecompletions_triggers_after_cursor() {
         "directory_completion/".to_string(),
         "nushell".to_string(),
         "test_a/".to_string(),
+        "test_a_symlink".to_string(),
         "test_b/".to_string(),
         ".hidden_file".to_string(),
         ".hidden_folder/".to_string(),
diff --git a/tests/fixtures/completions/test_a_symlink b/tests/fixtures/completions/test_a_symlink
new file mode 120000
index 0000000000..a4bcb06a3d
--- /dev/null
+++ b/tests/fixtures/completions/test_a_symlink
@@ -0,0 +1 @@
+test_a
\ No newline at end of file

From b2b5b89a925401c7d0d6d3d4fa075c9506ab4e2d Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Fri, 27 Dec 2024 13:58:18 +0100
Subject: [PATCH 0851/1072] Add command to get evaluated color setting (#14683)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

In #14647 I added the option `"auto"` to be a valid option for
`$env.config.use_ansi_coloring`. That improves the decision making
whether ansi colors should be used or not but that makes it hard for
custom commands to respect that value as the config might now be a
non-boolean value. To retrieve that evaluated value I added a new
command called `config use-colors` that returns an evaluated boolean
that may be used to decide if colors should be used or not.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

Scripts that previously just checked `$env.config.use_ansi_coloring`
should now use `config use-colors` for their color decision making.

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

This PR essentially only runs `UseAnsiColoring::get`, and that is highly
tested in the #14647, so I don't think this needs further testing.

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->

I'm not sure if we have any docs about that ansi coloring setup. If we
have, we should update these.
---
 crates/nu-command/src/default_context.rs      |  1 +
 .../src/env/config/config_use_colors.rs       | 41 +++++++++++++++++++
 crates/nu-command/src/env/config/mod.rs       |  2 +
 crates/nu-command/src/env/mod.rs              |  1 +
 4 files changed, 45 insertions(+)
 create mode 100644 crates/nu-command/src/env/config/config_use_colors.rs

diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index 168ee78027..df704fe369 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -354,6 +354,7 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             ConfigFlatten,
             ConfigMeta,
             ConfigReset,
+            ConfigUseColors,
         };
 
         // Math
diff --git a/crates/nu-command/src/env/config/config_use_colors.rs b/crates/nu-command/src/env/config/config_use_colors.rs
new file mode 100644
index 0000000000..28537535ee
--- /dev/null
+++ b/crates/nu-command/src/env/config/config_use_colors.rs
@@ -0,0 +1,41 @@
+use nu_engine::command_prelude::*;
+
+#[derive(Clone)]
+pub struct ConfigUseColors;
+
+impl Command for ConfigUseColors {
+    fn name(&self) -> &str {
+        "config use-colors"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .category(Category::Env)
+            .input_output_type(Type::Nothing, Type::Bool)
+    }
+
+    fn description(&self) -> &str {
+        "Get the configuration for color output."
+    }
+
+    fn extra_description(&self) -> &str {
+        r#"Use this command instead of checking `$env.config.use_ansi_coloring` to properly handle the "auto" setting, including environment variables that influence its behavior."#
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        _stack: &mut Stack,
+        call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let use_ansi_coloring = engine_state
+            .get_config()
+            .use_ansi_coloring
+            .get(engine_state);
+        Ok(PipelineData::Value(
+            Value::bool(use_ansi_coloring, call.head),
+            None,
+        ))
+    }
+}
diff --git a/crates/nu-command/src/env/config/mod.rs b/crates/nu-command/src/env/config/mod.rs
index d596eb57b9..2981aff313 100644
--- a/crates/nu-command/src/env/config/mod.rs
+++ b/crates/nu-command/src/env/config/mod.rs
@@ -3,9 +3,11 @@ mod config_env;
 mod config_flatten;
 mod config_nu;
 mod config_reset;
+mod config_use_colors;
 
 pub use config_::ConfigMeta;
 pub use config_env::ConfigEnv;
 pub use config_flatten::ConfigFlatten;
 pub use config_nu::ConfigNu;
 pub use config_reset::ConfigReset;
+pub use config_use_colors::ConfigUseColors;
diff --git a/crates/nu-command/src/env/mod.rs b/crates/nu-command/src/env/mod.rs
index 3f9312ed13..62a9e4d116 100644
--- a/crates/nu-command/src/env/mod.rs
+++ b/crates/nu-command/src/env/mod.rs
@@ -9,6 +9,7 @@ pub use config::ConfigFlatten;
 pub use config::ConfigMeta;
 pub use config::ConfigNu;
 pub use config::ConfigReset;
+pub use config::ConfigUseColors;
 pub use export_env::ExportEnv;
 pub use load_env::LoadEnv;
 pub use source_env::SourceEnv;

From 5314b31b121615bf851b67dcc2669580d604e220 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Fri, 27 Dec 2024 07:16:53 -0600
Subject: [PATCH 0852/1072] update banner command to respect use_ansi_colors
 (#14684)

# Description

This PR goes along with the recent changes by @cptpiepmatz for
[auto-color](https://github.com/nushell/nushell/pull/14647) and
[evaluation of
auto-color](https://github.com/nushell/nushell/pull/14683) which also
looks at env vars along with config settings to determine when it's
appropriate to show ansi coloring since it's more complicated than just
reading a setting or an env var.


# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-std/std/core/mod.nu | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-std/std/core/mod.nu b/crates/nu-std/std/core/mod.nu
index 21c30ca318..5ac804da5b 100644
--- a/crates/nu-std/std/core/mod.nu
+++ b/crates/nu-std/std/core/mod.nu
@@ -30,7 +30,7 @@ It's been this long since (ansi green)Nushell(ansi reset)'s first commit:
 "
 }
 
-match $env.config?.use_ansi_coloring? {
+match (config use-colors) {
     false => { $banner_msg | ansi strip }
     _ => $banner_msg
 }

From 44019241285dfa8d7e9520023020132f08cc0938 Mon Sep 17 00:00:00 2001
From: Maxim Zhiburt <zhiburt@gmail.com>
Date: Sat, 28 Dec 2024 17:19:48 +0300
Subject: [PATCH 0853/1072] Bump tabled to 0.17 (#14415)

With this comes a new `unicode-width` as I remember there was some issue
with `ratatui`.

And a bit of refactorings which are ment to reduce code lines while not
breaking anything.
Not yet complete, I think I'll try to improve some more places,
just wanted to trigger CI :smile:

And yessssssssss we have a new `unicode-width` but I sort of doubtful,
I mean the original issue with emojie.
I think it may require an additional "clean" call.
I am just saying I was not testing it with that case of complex emojies.

---------

Signed-off-by: Maxim Zhiburt <zhiburt@gmail.com>
---
 Cargo.lock                                   |  10 +-
 Cargo.toml                                   |   2 +-
 crates/nu-command/src/debug/inspect_table.rs |  13 +-
 crates/nu-command/src/viewers/table.rs       | 478 ++++++-------
 crates/nu-command/tests/commands/table.rs    |  45 +-
 crates/nu-explore/src/commands/expand.rs     |   9 +-
 crates/nu-explore/src/nu_common/table.rs     |  71 +-
 crates/nu-protocol/src/config/mod.rs         |   2 +-
 crates/nu-protocol/src/config/table.rs       |   6 +
 crates/nu-table/examples/table_demo.rs       |  12 +-
 crates/nu-table/src/common.rs                | 110 +--
 crates/nu-table/src/lib.rs                   |   3 +-
 crates/nu-table/src/table.rs                 | 706 +++++++++----------
 crates/nu-table/src/table_theme.rs           |  82 +--
 crates/nu-table/src/types/collapse.rs        |  60 +-
 crates/nu-table/src/types/expanded.rs        | 325 +++++----
 crates/nu-table/src/types/general.rs         | 244 ++++---
 crates/nu-table/src/types/mod.rs             |  32 +-
 crates/nu-table/src/unstructured_table.rs    | 257 +++----
 crates/nu-table/src/util.rs                  | 132 ++--
 crates/nu-table/tests/common.rs              |  75 +-
 crates/nu-table/tests/constrains.rs          |  84 +--
 crates/nu-table/tests/expand.rs              |  12 +-
 crates/nu-table/tests/style.rs               |  31 +-
 24 files changed, 1419 insertions(+), 1382 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 515d8b0035..194c9898da 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4680,15 +4680,15 @@ checksum = "fb37767f6569cd834a413442455e0f066d0d522de8630436e2a1761d9726ba56"
 
 [[package]]
 name = "papergrid"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7419ad52a7de9b60d33e11085a0fe3df1fbd5926aa3f93d3dd53afbc9e86725"
+checksum = "d2b0f8def1f117e13c895f3eda65a7b5650688da29d6ad04635f61bc7b92eebd"
 dependencies = [
  "ansi-str",
  "ansitok",
  "bytecount",
  "fnv",
- "unicode-width 0.1.11",
+ "unicode-width 0.2.0",
 ]
 
 [[package]]
@@ -7233,9 +7233,9 @@ dependencies = [
 
 [[package]]
 name = "tabled"
-version = "0.16.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c9303ee60b9bedf722012ea29ae3711ba13a67c9b9ae28993838b63057cb1b"
+checksum = "c6709222f3973137427ce50559cd564dc187a95b9cfe01613d2f4e93610e510a"
 dependencies = [
  "ansi-str",
  "ansitok",
diff --git a/Cargo.toml b/Cargo.toml
index f23e035822..a13c5489d8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -156,7 +156,7 @@ sha2 = "0.10"
 strip-ansi-escapes = "0.2.0"
 syn = "2.0"
 sysinfo = "0.32"
-tabled = { version = "0.16.0", default-features = false }
+tabled = { version = "0.17.0", default-features = false }
 tempfile = "3.14"
 terminal_size = "0.4"
 titlecase = "3.0"
diff --git a/crates/nu-command/src/debug/inspect_table.rs b/crates/nu-command/src/debug/inspect_table.rs
index f7195992a8..e2a2483484 100644
--- a/crates/nu-command/src/debug/inspect_table.rs
+++ b/crates/nu-command/src/debug/inspect_table.rs
@@ -1,14 +1,17 @@
-use crate::debug::inspect_table::{
-    global_horizontal_char::SetHorizontalChar, set_widths::SetWidths,
-};
+// note: Seems like could be simplified
+//       IMHO: it shall not take 300+ lines :)
+
 use nu_protocol::Value;
 use nu_table::{string_width, string_wrap};
+
 use tabled::{
     grid::config::ColoredConfig,
-    settings::{peaker::PriorityMax, width::Wrap, Settings, Style},
+    settings::{peaker::Priority, width::Wrap, Settings, Style},
     Table,
 };
 
+use self::{global_horizontal_char::SetHorizontalChar, set_widths::SetWidths};
+
 pub fn build_table(value: Value, description: String, termsize: usize) -> String {
     let (head, mut data) = util::collect_input(value);
     let count_columns = head.len();
@@ -57,7 +60,7 @@ pub fn build_table(value: Value, description: String, termsize: usize) -> String
         Settings::default()
             .with(Style::rounded().corner_top_left('├').corner_top_right('┤'))
             .with(SetWidths(widths))
-            .with(Wrap::new(width).priority(PriorityMax))
+            .with(Wrap::new(width).priority(Priority::max(true)))
             .with(SetHorizontalChar::new('┼', '┴', 11 + 2 + 1)),
     );
 
diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index 3c699f52df..263a1cea55 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -2,7 +2,12 @@
 //        overall reduce the redundant calls to StyleComputer etc.
 //        the goal is to configure it once...
 
+use std::{collections::VecDeque, io::IsTerminal, io::Read, path::PathBuf, str::FromStr};
+
 use lscolors::{LsColors, Style};
+use url::Url;
+use web_time::Instant;
+
 use nu_color_config::{color_from_hex, StyleComputer, TextStyle};
 use nu_engine::{command_prelude::*, env_to_string};
 use nu_path::form::Absolute;
@@ -11,25 +16,16 @@ use nu_protocol::{
     ByteStream, Config, DataSource, ListStream, PipelineMetadata, Signals, TableMode, ValueIterator,
 };
 use nu_table::{
-    common::create_nu_table_config, CollapsedTable, ExpandedTable, JustTable, NuTable, NuTableCell,
+    common::configure_table, CollapsedTable, ExpandedTable, JustTable, NuRecordsValue, NuTable,
     StringResult, TableOpts, TableOutput,
 };
 use nu_utils::{get_ls_colors, terminal_size};
-use std::{collections::VecDeque, io::Read, path::PathBuf, str::FromStr};
-use url::Url;
-use web_time::Instant;
+
+type ShellResult<T> = Result<T, ShellError>;
+type NuPathBuf = nu_path::PathBuf<Absolute>;
 
 const STREAM_PAGE_SIZE: usize = 1000;
-
-fn get_width_param(width_param: Option<i64>) -> usize {
-    if let Some(col) = width_param {
-        col as usize
-    } else if let Ok((w, _h)) = terminal_size() {
-        w as usize
-    } else {
-        80
-    }
-}
+const DEFAULT_TABLE_WIDTH: usize = 80;
 
 #[derive(Clone)]
 pub struct Table;
@@ -113,17 +109,15 @@ impl Command for Table {
         stack: &mut Stack,
         call: &Call,
         input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
+    ) -> ShellResult<PipelineData> {
         let list_themes: bool = call.has_flag(engine_state, stack, "list")?;
         // if list argument is present we just need to return a list of supported table themes
         if list_themes {
             let val = Value::list(supported_table_modes(), Span::test_data());
             return Ok(val.into_pipeline_data());
         }
-        #[cfg(feature = "os")]
-        let cwd = engine_state.cwd(Some(stack))?;
-        let cfg = parse_table_config(call, engine_state, stack)?;
-        let input = CmdInput::new(engine_state, stack, call, input);
+
+        let input = CmdInput::parse(engine_state, stack, call, input)?;
 
         // reset vt processing, aka ansi because illbehaved externals can break it
         #[cfg(windows)]
@@ -131,12 +125,7 @@ impl Command for Table {
             let _ = nu_utils::enable_vt_processing();
         }
 
-        handle_table_command(
-            input,
-            cfg,
-            #[cfg(feature = "os")]
-            cwd,
-        )
+        handle_table_command(input)
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -221,80 +210,127 @@ impl Command for Table {
 
 #[derive(Debug, Clone)]
 struct TableConfig {
-    index: Option<usize>,
-    table_view: TableView,
-    term_width: usize,
+    view: TableView,
+    width: usize,
     theme: TableMode,
     abbreviation: Option<usize>,
+    index: Option<usize>,
     use_ansi_coloring: bool,
 }
 
 impl TableConfig {
     fn new(
-        table_view: TableView,
-        term_width: usize,
+        view: TableView,
+        width: usize,
         theme: TableMode,
         abbreviation: Option<usize>,
         index: Option<usize>,
         use_ansi_coloring: bool,
     ) -> Self {
         Self {
-            index,
-            table_view,
-            term_width,
-            abbreviation,
+            view,
+            width,
             theme,
+            abbreviation,
+            index,
             use_ansi_coloring,
         }
     }
 }
 
+#[derive(Debug, Clone)]
+enum TableView {
+    General,
+    Collapsed,
+    Expanded {
+        limit: Option<usize>,
+        flatten: bool,
+        flatten_separator: Option<String>,
+    },
+}
+
+struct CLIArgs {
+    width: Option<i64>,
+    abbrivation: Option<usize>,
+    theme: TableMode,
+    expand: bool,
+    expand_limit: Option<usize>,
+    expand_flatten: bool,
+    expand_flatten_separator: Option<String>,
+    collapse: bool,
+    index: Option<usize>,
+    use_ansi_coloring: bool,
+}
+
 fn parse_table_config(
     call: &Call,
     state: &EngineState,
     stack: &mut Stack,
-) -> Result<TableConfig, ShellError> {
-    let width_param: Option<i64> = call.get_flag(state, stack, "width")?;
-    let expand: bool = call.has_flag(state, stack, "expand")?;
-    let expand_limit: Option<usize> = call.get_flag(state, stack, "expand-deep")?;
-    let collapse: bool = call.has_flag(state, stack, "collapse")?;
-    let flatten: bool = call.has_flag(state, stack, "flatten")?;
-    let flatten_separator: Option<String> = call.get_flag(state, stack, "flatten-separator")?;
-    let abbrivation: Option<usize> = call
-        .get_flag(state, stack, "abbreviated")?
-        .or_else(|| stack.get_config(state).table.abbreviated_row_count);
-    let table_view = match (expand, collapse) {
+) -> ShellResult<TableConfig> {
+    let args = get_cli_args(call, state, stack)?;
+    let table_view = get_table_view(&args);
+    let term_width = get_table_width(args.width);
+
+    let cfg = TableConfig::new(
+        table_view,
+        term_width,
+        args.theme,
+        args.abbrivation,
+        args.index,
+        args.use_ansi_coloring,
+    );
+
+    Ok(cfg)
+}
+
+fn get_table_view(args: &CLIArgs) -> TableView {
+    match (args.expand, args.collapse) {
         (false, false) => TableView::General,
         (_, true) => TableView::Collapsed,
         (true, _) => TableView::Expanded {
-            limit: expand_limit,
-            flatten,
-            flatten_separator,
+            limit: args.expand_limit,
+            flatten: args.expand_flatten,
+            flatten_separator: args.expand_flatten_separator.clone(),
         },
-    };
+    }
+}
+
+fn get_cli_args(call: &Call<'_>, state: &EngineState, stack: &mut Stack) -> ShellResult<CLIArgs> {
+    let width: Option<i64> = call.get_flag(state, stack, "width")?;
+    let expand: bool = call.has_flag(state, stack, "expand")?;
+    let expand_limit: Option<usize> = call.get_flag(state, stack, "expand-deep")?;
+    let expand_flatten: bool = call.has_flag(state, stack, "flatten")?;
+    let expand_flatten_separator: Option<String> =
+        call.get_flag(state, stack, "flatten-separator")?;
+    let collapse: bool = call.has_flag(state, stack, "collapse")?;
+    let abbrivation: Option<usize> = call
+        .get_flag(state, stack, "abbreviated")?
+        .or_else(|| stack.get_config(state).table.abbreviated_row_count);
     let theme =
         get_theme_flag(call, state, stack)?.unwrap_or_else(|| stack.get_config(state).table.mode);
     let index = get_index_flag(call, state, stack)?;
 
-    let term_width = get_width_param(width_param);
-
     let use_ansi_coloring = state.get_config().use_ansi_coloring.get(state);
 
-    Ok(TableConfig::new(
-        table_view,
-        term_width,
+    Ok(CLIArgs {
         theme,
         abbrivation,
+        collapse,
+        expand,
+        expand_limit,
+        expand_flatten,
+        expand_flatten_separator,
+        width,
         index,
         use_ansi_coloring,
-    ))
+    })
 }
 
 fn get_index_flag(
     call: &Call,
     state: &EngineState,
     stack: &mut Stack,
-) -> Result<Option<usize>, ShellError> {
+) -> ShellResult<Option<usize>> {
     let index: Option<Value> = call.get_flag(state, stack, "index")?;
     let value = match index {
         Some(value) => value,
@@ -335,7 +371,7 @@ fn get_theme_flag(
     call: &Call,
     state: &EngineState,
     stack: &mut Stack,
-) -> Result<Option<TableMode>, ShellError> {
+) -> ShellResult<Option<TableMode>> {
     call.get_flag(state, stack, "theme")?
         .map(|theme: String| {
             TableMode::from_str(&theme).map_err(|err| ShellError::CantConvert {
@@ -353,29 +389,36 @@ struct CmdInput<'a> {
     stack: &'a mut Stack,
     call: &'a Call<'a>,
     data: PipelineData,
+    cfg: TableConfig,
+    cwd: Option<NuPathBuf>,
 }
 
 impl<'a> CmdInput<'a> {
-    fn new(
+    fn parse(
         engine_state: &'a EngineState,
         stack: &'a mut Stack,
         call: &'a Call<'a>,
         data: PipelineData,
-    ) -> Self {
-        Self {
+    ) -> ShellResult<Self> {
+        let cfg = parse_table_config(call, engine_state, stack)?;
+        let cwd = get_cwd(engine_state, stack)?;
+
+        Ok(Self {
             engine_state,
             stack,
             call,
             data,
-        }
+            cfg,
+            cwd,
+        })
+    }
+
+    fn get_config(&self) -> std::sync::Arc<Config> {
+        self.stack.get_config(self.engine_state)
     }
 }
 
-fn handle_table_command(
-    mut input: CmdInput<'_>,
-    cfg: TableConfig,
-    #[cfg(feature = "os")] cwd: nu_path::PathBuf<Absolute>,
-) -> Result<PipelineData, ShellError> {
+fn handle_table_command(mut input: CmdInput<'_>) -> ShellResult<PipelineData> {
     let span = input.data.span().unwrap_or(input.call.head);
     match input.data {
         // Binary streams should behave as if they really are `binary` data, and printed as hex
@@ -397,29 +440,15 @@ fn handle_table_command(
             let stream = ListStream::new(vals.into_iter(), span, signals);
             input.data = PipelineData::Empty;
 
-            handle_row_stream(
-                input,
-                cfg,
-                stream,
-                metadata,
-                #[cfg(feature = "os")]
-                cwd,
-            )
+            handle_row_stream(input, stream, metadata)
         }
         PipelineData::ListStream(stream, metadata) => {
             input.data = PipelineData::Empty;
-            handle_row_stream(
-                input,
-                cfg,
-                stream,
-                metadata,
-                #[cfg(feature = "os")]
-                cwd,
-            )
+            handle_row_stream(input, stream, metadata)
         }
         PipelineData::Value(Value::Record { val, .. }, ..) => {
             input.data = PipelineData::Empty;
-            handle_record(input, cfg, val.into_owned())
+            handle_record(input, val.into_owned())
         }
         PipelineData::Value(Value::Error { error, .. }, ..) => {
             // Propagate this error outward, so that it goes to stderr
@@ -435,14 +464,7 @@ fn handle_table_command(
             let stream =
                 ListStream::new(val.into_range_iter(span, Signals::empty()), span, signals);
             input.data = PipelineData::Empty;
-            handle_row_stream(
-                input,
-                cfg,
-                stream,
-                metadata,
-                #[cfg(feature = "os")]
-                cwd,
-            )
+            handle_row_stream(input, stream, metadata)
         }
         x => Ok(x),
     }
@@ -517,60 +539,55 @@ fn pretty_hex_stream(stream: ByteStream, span: Span) -> ByteStream {
     )
 }
 
-fn handle_record(
-    input: CmdInput,
-    cfg: TableConfig,
-    mut record: Record,
-) -> Result<PipelineData, ShellError> {
-    let config = {
-        let state = input.engine_state;
-        let stack: &Stack = input.stack;
-        stack.get_config(state)
-    };
+fn handle_record(input: CmdInput, mut record: Record) -> ShellResult<PipelineData> {
     let span = input.data.span().unwrap_or(input.call.head);
-    let styles = &StyleComputer::from_config(input.engine_state, input.stack);
 
     if record.is_empty() {
         let value =
-            create_empty_placeholder("record", cfg.term_width, input.engine_state, input.stack);
+            create_empty_placeholder("record", input.cfg.width, input.engine_state, input.stack);
         let value = Value::string(value, span);
         return Ok(value.into_pipeline_data());
     };
 
-    if let Some(limit) = cfg.abbreviation {
-        let prev_len = record.len();
-        if record.len() > limit * 2 + 1 {
-            // TODO: see if the following table builders would be happy with a simple iterator
-            let mut record_iter = record.into_iter();
-            record = Record::with_capacity(limit * 2 + 1);
-            record.extend(record_iter.by_ref().take(limit));
-            record.push(String::from("..."), Value::string("...", Span::unknown()));
-            record.extend(record_iter.skip(prev_len - 2 * limit));
-        }
+    if let Some(limit) = input.cfg.abbreviation {
+        record = make_record_abbreviation(record, limit);
     }
 
-    let indent = (config.table.padding.left, config.table.padding.right);
-    let opts = TableOpts::new(
+    let config = input.get_config();
+    let opts = create_table_opts(
+        input.engine_state,
+        input.stack,
         &config,
-        styles,
-        input.engine_state.signals(),
+        &input.cfg,
         span,
-        cfg.term_width,
-        indent,
-        cfg.theme,
-        cfg.index.unwrap_or(0),
-        cfg.index.is_none(),
+        0,
     );
-    let result = build_table_kv(record, cfg.table_view, opts, span)?;
+    let result = build_table_kv(record, input.cfg.view.clone(), opts, span)?;
 
     let result = match result {
-        Some(output) => maybe_strip_color(output, cfg.use_ansi_coloring),
-        None => report_unsuccessful_output(input.engine_state.signals(), cfg.term_width),
+        Some(output) => maybe_strip_color(output, input.cfg.use_ansi_coloring),
+        None => report_unsuccessful_output(input.engine_state.signals(), input.cfg.width),
     };
 
     let val = Value::string(result, span);
+    let data = val.into_pipeline_data();
 
-    Ok(val.into_pipeline_data())
+    Ok(data)
+}
+
+fn make_record_abbreviation(mut record: Record, limit: usize) -> Record {
+    if record.len() <= limit * 2 + 1 {
+        return record;
+    }
+
+    // TODO: see if the following table builders would be happy with a simple iterator
+    let prev_len = record.len();
+    let mut record_iter = record.into_iter();
+    record = Record::with_capacity(limit * 2 + 1);
+    record.extend(record_iter.by_ref().take(limit));
+    record.push(String::from("..."), Value::string("...", Span::unknown()));
+    record.extend(record_iter.skip(prev_len - 2 * limit));
+    record
 }
 
 fn report_unsuccessful_output(signals: &Signals, term_width: usize) -> String {
@@ -608,11 +625,11 @@ fn build_table_kv(
 
 fn build_table_batch(
     vals: Vec<Value>,
-    table_view: TableView,
+    view: TableView,
     opts: TableOpts<'_>,
     span: Span,
 ) -> StringResult {
-    match table_view {
+    match view {
         TableView::General => JustTable::table(&vals, opts),
         TableView::Expanded {
             limit,
@@ -631,22 +648,17 @@ fn build_table_batch(
 
 fn handle_row_stream(
     input: CmdInput<'_>,
-    cfg: TableConfig,
     stream: ListStream,
     metadata: Option<PipelineMetadata>,
-    #[cfg(feature = "os")] cwd: nu_path::PathBuf<Absolute>,
-) -> Result<PipelineData, ShellError> {
+) -> ShellResult<PipelineData> {
+    let cfg = input.get_config();
     let stream = match metadata.as_ref() {
         // First, `ls` sources:
         Some(PipelineMetadata {
             data_source: DataSource::Ls,
             ..
         }) => {
-            let config = {
-                let state = input.engine_state;
-                let stack: &Stack = input.stack;
-                stack.get_config(state)
-            };
+            let config = cfg.clone();
             let ls_colors_env_str = match input.stack.get_env_var(input.engine_state, "LS_COLORS") {
                 Some(v) => Some(env_to_string(
                     "LS_COLORS",
@@ -664,14 +676,9 @@ fn handle_row_stream(
                     if let Some(value) = record.to_mut().get_mut("name") {
                         let span = value.span();
                         if let Value::String { val, .. } = value {
-                            if let Some(val) = render_path_name(
-                                val,
-                                &config,
-                                &ls_colors,
-                                #[cfg(feature = "os")]
-                                cwd.clone(),
-                                span,
-                            ) {
+                            if let Some(val) =
+                                render_path_name(val, &config, &ls_colors, input.cwd.clone(), span)
+                            {
                                 *value = val;
                             }
                         }
@@ -726,6 +733,7 @@ fn handle_row_stream(
         // for the values it outputs. Because engine_state is passed in, config doesn't need to.
         input.engine_state.clone(),
         input.stack.clone(),
+        input.cfg,
         cfg,
     );
     let stream = ByteStream::from_result_iter(
@@ -787,8 +795,9 @@ struct PagingTableCreator {
     stack: Stack,
     elements_displayed: usize,
     reached_end: bool,
-    cfg: TableConfig,
+    table_config: TableConfig,
     row_offset: usize,
+    config: std::sync::Arc<Config>,
 }
 
 impl PagingTableCreator {
@@ -797,114 +806,51 @@ impl PagingTableCreator {
         stream: ListStream,
         engine_state: EngineState,
         stack: Stack,
-        cfg: TableConfig,
+        table_config: TableConfig,
+        config: std::sync::Arc<Config>,
     ) -> Self {
         PagingTableCreator {
             head,
             stream: stream.into_inner(),
             engine_state,
             stack,
-            cfg,
+            config,
+            table_config,
             elements_displayed: 0,
             reached_end: false,
             row_offset: 0,
         }
     }
 
-    fn build_extended(
-        &mut self,
-        batch: Vec<Value>,
-        limit: Option<usize>,
-        flatten: bool,
-        flatten_separator: Option<String>,
-    ) -> StringResult {
+    fn build_table(&mut self, batch: Vec<Value>) -> ShellResult<Option<String>> {
         if batch.is_empty() {
             return Ok(None);
         }
 
-        let cfg = {
-            let state = &self.engine_state;
-            let stack = &self.stack;
-            stack.get_config(state)
-        };
-        let style_comp = StyleComputer::from_config(&self.engine_state, &self.stack);
-        let opts = self.create_table_opts(&cfg, &style_comp);
-        let view = TableView::Expanded {
-            limit,
-            flatten,
-            flatten_separator,
-        };
-
-        build_table_batch(batch, view, opts, self.head)
+        let opts = self.create_table_opts();
+        build_table_batch(batch, self.table_config.view.clone(), opts, self.head)
     }
 
-    fn build_collapsed(&mut self, batch: Vec<Value>) -> StringResult {
-        if batch.is_empty() {
-            return Ok(None);
-        }
-
-        let cfg = {
-            let state = &self.engine_state;
-            let stack = &self.stack;
-            stack.get_config(state)
-        };
-        let style_comp = StyleComputer::from_config(&self.engine_state, &self.stack);
-        let opts = self.create_table_opts(&cfg, &style_comp);
-
-        build_table_batch(batch, TableView::Collapsed, opts, self.head)
-    }
-
-    fn build_general(&mut self, batch: Vec<Value>) -> StringResult {
-        let cfg = {
-            let state = &self.engine_state;
-            let stack = &self.stack;
-            stack.get_config(state)
-        };
-        let style_comp = StyleComputer::from_config(&self.engine_state, &self.stack);
-        let opts = self.create_table_opts(&cfg, &style_comp);
-
-        build_table_batch(batch, TableView::General, opts, self.head)
-    }
-
-    fn create_table_opts<'a>(
-        &'a self,
-        cfg: &'a Config,
-        style_comp: &'a StyleComputer<'a>,
-    ) -> TableOpts<'a> {
-        TableOpts::new(
-            cfg,
-            style_comp,
-            self.engine_state.signals(),
+    fn create_table_opts(&self) -> TableOpts<'_> {
+        create_table_opts(
+            &self.engine_state,
+            &self.stack,
+            &self.config,
+            &self.table_config,
             self.head,
-            self.cfg.term_width,
-            (cfg.table.padding.left, cfg.table.padding.right),
-            self.cfg.theme,
-            self.cfg.index.unwrap_or(0) + self.row_offset,
-            self.cfg.index.is_none(),
+            self.row_offset,
         )
     }
-
-    fn build_table(&mut self, batch: Vec<Value>) -> Result<Option<String>, ShellError> {
-        match &self.cfg.table_view {
-            TableView::General => self.build_general(batch),
-            TableView::Collapsed => self.build_collapsed(batch),
-            TableView::Expanded {
-                limit,
-                flatten,
-                flatten_separator,
-            } => self.build_extended(batch, *limit, *flatten, flatten_separator.clone()),
-        }
-    }
 }
 
 impl Iterator for PagingTableCreator {
-    type Item = Result<Vec<u8>, ShellError>;
+    type Item = ShellResult<Vec<u8>>;
 
     fn next(&mut self) -> Option<Self::Item> {
         let batch;
         let end;
 
-        match self.cfg.abbreviation {
+        match self.table_config.abbreviation {
             Some(abbr) => {
                 (batch, _, end) =
                     stream_collect_abbriviated(&mut self.stream, abbr, self.engine_state.signals());
@@ -934,7 +880,7 @@ impl Iterator for PagingTableCreator {
                 self.elements_displayed = 1;
                 let result = create_empty_placeholder(
                     "list",
-                    self.cfg.term_width,
+                    self.table_config.width,
                     &self.engine_state,
                     &self.stack,
                 );
@@ -950,9 +896,9 @@ impl Iterator for PagingTableCreator {
 
         convert_table_to_output(
             table,
-            &self.cfg,
             self.engine_state.signals(),
-            self.cfg.term_width,
+            self.table_config.width,
+            self.table_config.use_ansi_coloring,
         )
     }
 }
@@ -1059,17 +1005,17 @@ fn render_path_name(
     path: &str,
     config: &Config,
     ls_colors: &LsColors,
-    #[cfg(feature = "os")] cwd: nu_path::PathBuf<Absolute>,
+    cwd: Option<NuPathBuf>,
     span: Span,
 ) -> Option<Value> {
     if !config.ls.use_ls_colors {
         return None;
     }
 
-    #[cfg(feature = "os")]
-    let fullpath = cwd.join(path);
-    #[cfg(not(feature = "os"))]
-    let fullpath = path;
+    let fullpath = match cwd {
+        Some(cwd) => PathBuf::from(cwd.join(path)),
+        None => PathBuf::from(path),
+    };
 
     let stripped_path = nu_utils::strip_ansi_unlikely(path);
     let metadata = std::fs::symlink_metadata(fullpath);
@@ -1101,19 +1047,9 @@ fn render_path_name(
     Some(Value::string(val, span))
 }
 
-#[derive(Debug, Clone)]
-enum TableView {
-    General,
-    Collapsed,
-    Expanded {
-        limit: Option<usize>,
-        flatten: bool,
-        flatten_separator: Option<String>,
-    },
-}
-
 fn maybe_strip_color(output: String, use_ansi_coloring: bool) -> String {
-    if !use_ansi_coloring {
+    // the terminal is for when people do ls from vim, there should be no coloring there
+    if !use_ansi_coloring || !std::io::stdout().is_terminal() {
         // Draw the table without ansi colors
         nu_utils::strip_ansi_string_likely(output)
     } else {
@@ -1133,29 +1069,29 @@ fn create_empty_placeholder(
         return String::new();
     }
 
-    let cell = NuTableCell::new(format!("empty {}", value_type_name));
+    let cell = NuRecordsValue::new(format!("empty {}", value_type_name));
     let data = vec![vec![cell]];
     let mut table = NuTable::from(data);
     table.set_data_style(TextStyle::default().dimmed());
-    let out = TableOutput::new(table, false, false, 1);
+    let mut out = TableOutput::from_table(table, false, false);
 
     let style_computer = &StyleComputer::from_config(engine_state, stack);
-    let config = create_nu_table_config(&config, style_computer, &out, false, TableMode::default());
+    configure_table(&mut out, &config, style_computer, TableMode::default());
 
     out.table
-        .draw(config, termwidth)
+        .draw(termwidth)
         .expect("Could not create empty table placeholder")
 }
 
 fn convert_table_to_output(
-    table: Result<Option<String>, ShellError>,
-    cfg: &TableConfig,
+    table: ShellResult<Option<String>>,
     signals: &Signals,
     term_width: usize,
-) -> Option<Result<Vec<u8>, ShellError>> {
+    use_ansi_coloring: bool,
+) -> Option<ShellResult<Vec<u8>>> {
     match table {
         Ok(Some(table)) => {
-            let table = maybe_strip_color(table, cfg.use_ansi_coloring);
+            let table = maybe_strip_color(table, use_ansi_coloring);
 
             let mut bytes = table.as_bytes().to_vec();
             bytes.push(b'\n'); // nu-table tables don't come with a newline on the end
@@ -1198,3 +1134,41 @@ fn supported_table_modes() -> Vec<Value> {
         Value::test_string("basic_compact"),
     ]
 }
+
+fn create_table_opts<'a>(
+    engine_state: &'a EngineState,
+    stack: &'a Stack,
+    cfg: &'a Config,
+    table_cfg: &'a TableConfig,
+    span: Span,
+    offset: usize,
+) -> TableOpts<'a> {
+    let comp = StyleComputer::from_config(engine_state, stack);
+    let signals = engine_state.signals();
+    let offset = table_cfg.index.unwrap_or(0) + offset;
+    let index = table_cfg.index.is_none();
+    let width = table_cfg.width;
+    let theme = table_cfg.theme;
+
+    TableOpts::new(cfg, comp, signals, span, width, theme, offset, index)
+}
+
+fn get_cwd(engine_state: &EngineState, stack: &mut Stack) -> ShellResult<Option<NuPathBuf>> {
+    #[cfg(feature = "os")]
+    let cwd = engine_state.cwd(Some(stack)).map(Some)?;
+
+    #[cfg(not(feature = "os"))]
+    let cwd = None;
+
+    Ok(cwd)
+}
+
+fn get_table_width(width_param: Option<i64>) -> usize {
+    if let Some(col) = width_param {
+        col as usize
+    } else if let Ok((w, _h)) = terminal_size() {
+        w as usize
+    } else {
+        DEFAULT_TABLE_WIDTH
+    }
+}
diff --git a/crates/nu-command/tests/commands/table.rs b/crates/nu-command/tests/commands/table.rs
index b9b80b9e87..586987970c 100644
--- a/crates/nu-command/tests/commands/table.rs
+++ b/crates/nu-command/tests/commands/table.rs
@@ -2867,13 +2867,52 @@ fn table_index_arg() {
 #[test]
 fn table_expand_index_arg() {
     let actual = nu!("[[a b]; [1 2] [2 [4 4]]] | table --width=80 --theme basic --expand -i false");
-    assert_eq!(actual.out, "+---+-------+| a |   b   |+---+-------+| 1 |     2 |+---+-------+| 2 | +---+ ||   | | 4 | ||   | +---+ ||   | | 4 | ||   | +---+ |+---+-------+");
+    assert_eq!(
+        actual.out,
+        "+---+-------+\
+         | a |   b   |\
+         +---+-------+\
+         | 1 |     2 |\
+         +---+-------+\
+         | 2 | +---+ |\
+         |   | | 4 | |\
+         |   | +---+ |\
+         |   | | 4 | |\
+         |   | +---+ |\
+         +---+-------+"
+    );
 
     let actual = nu!("[[a b]; [1 2] [2 [4 4]]] | table --width=80 --theme basic --expand -i true");
-    assert_eq!(actual.out, "+---+---+-----------+| # | a |     b     |+---+---+-----------+| 0 | 1 |         2 |+---+---+-----------+| 1 | 2 | +---+---+ ||   |   | | 0 | 4 | ||   |   | +---+---+ ||   |   | | 1 | 4 | ||   |   | +---+---+ |+---+---+-----------+");
+    assert_eq!(
+        actual.out,
+        "+---+---+-----------+\
+         | # | a |     b     |\
+         +---+---+-----------+\
+         | 0 | 1 |         2 |\
+         +---+---+-----------+\
+         | 1 | 2 | +---+---+ |\
+         |   |   | | 0 | 4 | |\
+         |   |   | +---+---+ |\
+         |   |   | | 1 | 4 | |\
+         |   |   | +---+---+ |\
+         +---+---+-----------+"
+    );
 
     let actual = nu!("[[a b]; [1 2] [2 [4 4]]] | table --width=80 --theme basic --expand -i 10");
-    assert_eq!(actual.out, "+----+---+-----------+|  # | a |     b     |+----+---+-----------+| 10 | 1 |         2 |+----+---+-----------+| 11 | 2 | +---+---+ ||    |   | | 0 | 4 | ||    |   | +---+---+ ||    |   | | 1 | 4 | ||    |   | +---+---+ |+----+---+-----------+");
+    assert_eq!(
+        actual.out,
+        "+----+---+-----------+\
+         |  # | a |     b     |\
+         +----+---+-----------+\
+         | 10 | 1 |         2 |\
+         +----+---+-----------+\
+         | 11 | 2 | +---+---+ |\
+         |    |   | | 0 | 4 | |\
+         |    |   | +---+---+ |\
+         |    |   | | 1 | 4 | |\
+         |    |   | +---+---+ |\
+         +----+---+-----------+"
+    );
 }
 
 #[test]
diff --git a/crates/nu-explore/src/commands/expand.rs b/crates/nu-explore/src/commands/expand.rs
index 8b03b71dc1..a62dc3538e 100644
--- a/crates/nu-explore/src/commands/expand.rs
+++ b/crates/nu-explore/src/commands/expand.rs
@@ -69,12 +69,9 @@ fn convert_value_to_string(
     } else {
         let config = engine_state.get_config();
         let style_computer = StyleComputer::from_config(engine_state, stack);
+        let table =
+            nu_common::try_build_table(value, engine_state.signals(), config, style_computer);
 
-        Ok(nu_common::try_build_table(
-            engine_state.signals(),
-            config,
-            &style_computer,
-            value,
-        ))
+        Ok(table)
     }
 }
diff --git a/crates/nu-explore/src/nu_common/table.rs b/crates/nu-explore/src/nu_common/table.rs
index 79a97ed9ca..66ea63d7ad 100644
--- a/crates/nu-explore/src/nu_common/table.rs
+++ b/crates/nu-explore/src/nu_common/table.rs
@@ -1,80 +1,57 @@
 use crate::nu_common::NuConfig;
 use nu_color_config::StyleComputer;
-use nu_protocol::{Record, Signals, Span, Value};
+use nu_protocol::{Record, Signals, Value};
 use nu_table::{
     common::{nu_value_to_string, nu_value_to_string_clean},
     ExpandedTable, TableOpts,
 };
 
 pub fn try_build_table(
+    value: Value,
     signals: &Signals,
     config: &NuConfig,
-    style_computer: &StyleComputer,
-    value: Value,
+    style_computer: StyleComputer,
 ) -> String {
     let span = value.span();
-    match value {
-        Value::List { vals, .. } => try_build_list(vals, signals, config, span, style_computer),
-        Value::Record { val, .. } => try_build_map(&val, span, style_computer, signals, config),
-        val if matches!(val, Value::String { .. }) => {
-            nu_value_to_string_clean(&val, config, style_computer).0
-        }
-        val => nu_value_to_string(&val, config, style_computer).0,
-    }
-}
-
-fn try_build_map(
-    record: &Record,
-    span: Span,
-    style_computer: &StyleComputer,
-    signals: &Signals,
-    config: &NuConfig,
-) -> String {
     let opts = TableOpts::new(
         config,
         style_computer,
         signals,
-        Span::unknown(),
+        span,
         usize::MAX,
-        (config.table.padding.left, config.table.padding.right),
         config.table.mode,
         0,
         false,
     );
-    let result = ExpandedTable::new(None, false, String::new()).build_map(record, opts);
+    match value {
+        Value::List { vals, .. } => try_build_list(vals, opts),
+        Value::Record { val, .. } => try_build_map(&val, opts),
+        val if matches!(val, Value::String { .. }) => {
+            nu_value_to_string_clean(&val, config, &opts.style_computer).0
+        }
+        val => nu_value_to_string(&val, config, &opts.style_computer).0,
+    }
+}
+
+fn try_build_map(record: &Record, opts: TableOpts<'_>) -> String {
+    let result = ExpandedTable::new(None, false, String::new()).build_map(record, opts.clone());
     match result {
         Ok(Some(result)) => result,
-        Ok(None) | Err(_) => {
-            nu_value_to_string(&Value::record(record.clone(), span), config, style_computer).0
+        _ => {
+            let value = Value::record(record.clone(), opts.span);
+            nu_value_to_string(&value, opts.config, &opts.style_computer).0
         }
     }
 }
 
-fn try_build_list(
-    vals: Vec<Value>,
-    signals: &Signals,
-    config: &NuConfig,
-    span: Span,
-    style_computer: &StyleComputer,
-) -> String {
-    let opts = TableOpts::new(
-        config,
-        style_computer,
-        signals,
-        Span::unknown(),
-        usize::MAX,
-        (config.table.padding.left, config.table.padding.right),
-        config.table.mode,
-        0,
-        false,
-    );
-
-    let result = ExpandedTable::new(None, false, String::new()).build_list(&vals, opts);
+fn try_build_list(vals: Vec<Value>, opts: TableOpts<'_>) -> String {
+    let result = ExpandedTable::new(None, false, String::new()).build_list(&vals, opts.clone());
     match result {
         Ok(Some(out)) => out,
-        Ok(None) | Err(_) => {
+        _ => {
             // it means that the list is empty
-            nu_value_to_string(&Value::list(vals, span), config, style_computer).0
+            let value = Value::list(vals, opts.span);
+            nu_value_to_string(&value, opts.config, &opts.style_computer).0
         }
     }
 }
diff --git a/crates/nu-protocol/src/config/mod.rs b/crates/nu-protocol/src/config/mod.rs
index 6ce7335e9c..42da2b3233 100644
--- a/crates/nu-protocol/src/config/mod.rs
+++ b/crates/nu-protocol/src/config/mod.rs
@@ -22,7 +22,7 @@ pub use plugin_gc::{PluginGcConfig, PluginGcConfigs};
 pub use reedline::{CursorShapeConfig, EditBindings, NuCursorShape, ParsedKeybinding, ParsedMenu};
 pub use rm::RmConfig;
 pub use shell_integration::ShellIntegrationConfig;
-pub use table::{FooterMode, TableConfig, TableIndexMode, TableMode, TrimStrategy};
+pub use table::{FooterMode, TableConfig, TableIndent, TableIndexMode, TableMode, TrimStrategy};
 
 mod ansi_coloring;
 mod completions;
diff --git a/crates/nu-protocol/src/config/table.rs b/crates/nu-protocol/src/config/table.rs
index e88f4ea88f..5c6aaf07d6 100644
--- a/crates/nu-protocol/src/config/table.rs
+++ b/crates/nu-protocol/src/config/table.rs
@@ -277,6 +277,12 @@ pub struct TableIndent {
     pub right: usize,
 }
 
+impl TableIndent {
+    pub fn new(left: usize, right: usize) -> Self {
+        Self { left, right }
+    }
+}
+
 impl IntoValue for TableIndent {
     fn into_value(self, span: Span) -> Value {
         record! {
diff --git a/crates/nu-table/examples/table_demo.rs b/crates/nu-table/examples/table_demo.rs
index 402936e8c0..581d8934ea 100644
--- a/crates/nu-table/examples/table_demo.rs
+++ b/crates/nu-table/examples/table_demo.rs
@@ -1,6 +1,6 @@
 use nu_ansi_term::{Color, Style};
 use nu_color_config::TextStyle;
-use nu_table::{NuTable, NuTableConfig, TableTheme};
+use nu_table::{NuTable, TableTheme};
 use tabled::grid::records::vec_records::Text;
 
 fn main() {
@@ -28,15 +28,11 @@ fn main() {
 
     table.set_data_style(TextStyle::basic_left());
     table.set_header_style(TextStyle::basic_center().style(Style::new().on(Color::Blue)));
-
-    let table_cfg = NuTableConfig {
-        theme: TableTheme::rounded(),
-        with_header: true,
-        ..Default::default()
-    };
+    table.set_theme(TableTheme::rounded());
+    table.set_structure(false, true, false);
 
     let output_table = table
-        .draw(table_cfg, width)
+        .draw(width)
         .unwrap_or_else(|| format!("Couldn't fit table into {width} columns!"));
 
     println!("{output_table}")
diff --git a/crates/nu-table/src/common.rs b/crates/nu-table/src/common.rs
index 13c8f84fbc..8c89fbbfe2 100644
--- a/crates/nu-table/src/common.rs
+++ b/crates/nu-table/src/common.rs
@@ -1,51 +1,57 @@
-use crate::{
-    clean_charset, colorize_space_str, string_wrap, NuTableConfig, TableOutput, TableTheme,
-};
 use nu_color_config::{Alignment, StyleComputer, TextStyle};
 use nu_protocol::{Config, FooterMode, ShellError, Span, TableMode, TrimStrategy, Value};
+
 use terminal_size::{terminal_size, Height, Width};
 
+use crate::{clean_charset, colorize_space_str, string_wrap, TableOutput, TableTheme};
+
 pub type NuText = (String, TextStyle);
 pub type TableResult = Result<Option<TableOutput>, ShellError>;
 pub type StringResult = Result<Option<String>, ShellError>;
 
 pub const INDEX_COLUMN_NAME: &str = "index";
 
-pub fn create_nu_table_config(
+pub fn configure_table(
+    out: &mut TableOutput,
     config: &Config,
     comp: &StyleComputer,
-    out: &TableOutput,
-    expand: bool,
     mode: TableMode,
-) -> NuTableConfig {
+) {
+    let with_footer = is_footer_needed(config, out);
+    let theme = load_theme(mode);
+
+    out.table.set_theme(theme);
+    out.table
+        .set_structure(out.with_index, out.with_header, with_footer);
+    out.table.set_trim(config.table.trim.clone());
+    out.table
+        .set_border_header(config.table.header_on_separator);
+    out.table.set_border_color(lookup_separator_color(comp));
+}
+
+fn is_footer_needed(config: &Config, out: &TableOutput) -> bool {
     let mut count_rows = out.table.count_rows();
     if config.table.footer_inheritance {
         count_rows = out.count_rows;
     }
 
-    let with_footer = with_footer(config, out.with_header, count_rows);
-
-    NuTableConfig {
-        theme: load_theme(mode),
-        with_footer,
-        with_index: out.with_index,
-        with_header: out.with_header,
-        split_color: Some(lookup_separator_color(comp)),
-        trim: config.table.trim.clone(),
-        header_on_border: config.table.header_on_separator,
-        expand,
-    }
+    with_footer(config, out.with_header, count_rows)
 }
 
-pub fn nu_value_to_string_colored(val: &Value, cfg: &Config, style: &StyleComputer) -> String {
-    let (mut text, value_style) = nu_value_to_string(val, cfg, style);
-    if let Some(color) = value_style.color_style {
+pub fn nu_value_to_string_colored(val: &Value, cfg: &Config, comp: &StyleComputer) -> String {
+    let (mut text, style) = nu_value_to_string(val, cfg, comp);
+
+    let is_string = matches!(val, Value::String { .. });
+    if is_string {
+        text = clean_charset(&text);
+    }
+
+    if let Some(color) = style.color_style {
         text = color.paint(text).to_string();
     }
 
-    if matches!(val, Value::String { .. }) {
-        text = clean_charset(&text);
-        colorize_space_str(&mut text, style);
+    if is_string {
+        colorize_space_str(&mut text, comp);
     }
 
     text
@@ -54,9 +60,11 @@ pub fn nu_value_to_string_colored(val: &Value, cfg: &Config, style: &StyleComput
 pub fn nu_value_to_string(val: &Value, cfg: &Config, style: &StyleComputer) -> NuText {
     let float_precision = cfg.float_precision as usize;
     let text = val.to_abbreviated_string(cfg);
-    make_styled_string(style, text, Some(val), float_precision)
+    make_styled_value(text, val, float_precision, style)
 }
 
+// todo: Expose a method which returns just style
+
 pub fn nu_value_to_string_clean(val: &Value, cfg: &Config, style_comp: &StyleComputer) -> NuText {
     let (text, style) = nu_value_to_string(val, cfg, style_comp);
     let mut text = clean_charset(&text);
@@ -66,7 +74,11 @@ pub fn nu_value_to_string_clean(val: &Value, cfg: &Config, style_comp: &StyleCom
 }
 
 pub fn error_sign(style_computer: &StyleComputer) -> (String, TextStyle) {
-    make_styled_string(style_computer, String::from("❎"), None, 0)
+    // Though holes are not the same as null, the closure for "empty" is passed a null anyway.
+
+    let text = String::from("❎");
+    let style = style_computer.compute("empty", &Value::nothing(Span::unknown()));
+    (text, TextStyle::with_style(Alignment::Center, style))
 }
 
 pub fn wrap_text(text: &str, width: usize, config: &Config) -> String {
@@ -122,36 +134,23 @@ pub fn get_empty_style(style_computer: &StyleComputer) -> NuText {
     )
 }
 
-fn make_styled_string(
-    style_computer: &StyleComputer,
+fn make_styled_value(
     text: String,
-    value: Option<&Value>, // None represents table holes.
+    value: &Value,
     float_precision: usize,
+    style_computer: &StyleComputer,
 ) -> NuText {
     match value {
-        Some(value) => {
-            match value {
-                Value::Float { .. } => {
-                    // set dynamic precision from config
-                    let precise_number = match convert_with_precision(&text, float_precision) {
-                        Ok(num) => num,
-                        Err(e) => e.to_string(),
-                    };
-                    (precise_number, style_computer.style_primitive(value))
-                }
-                _ => (text, style_computer.style_primitive(value)),
-            }
-        }
-        None => {
-            // Though holes are not the same as null, the closure for "empty" is passed a null anyway.
-            (
-                text,
-                TextStyle::with_style(
-                    Alignment::Center,
-                    style_computer.compute("empty", &Value::nothing(Span::unknown())),
-                ),
-            )
+        Value::Float { .. } => {
+            // set dynamic precision from config
+            let precise_number = match convert_with_precision(&text, float_precision) {
+                Ok(num) => num,
+                Err(e) => e.to_string(),
+            };
+
+            (precise_number, style_computer.style_primitive(value))
         }
+        _ => (text, style_computer.style_primitive(value)),
     }
 }
 
@@ -220,3 +219,10 @@ fn need_footer(config: &Config, count_records: u64) -> bool {
         }
     }
 }
+
+pub fn check_value(value: &Value) -> Result<(), ShellError> {
+    match value {
+        Value::Error { error, .. } => Err(*error.clone()),
+        _ => Ok(()),
+    }
+}
diff --git a/crates/nu-table/src/lib.rs b/crates/nu-table/src/lib.rs
index 182585f193..eb4934d87e 100644
--- a/crates/nu-table/src/lib.rs
+++ b/crates/nu-table/src/lib.rs
@@ -1,4 +1,5 @@
 #![doc = include_str!("../README.md")]
+
 mod table;
 mod table_theme;
 mod types;
@@ -9,7 +10,7 @@ pub mod common;
 
 pub use common::{StringResult, TableResult};
 pub use nu_color_config::TextStyle;
-pub use table::{NuTable, NuTableCell, NuTableConfig};
+pub use table::{NuRecordsValue, NuTable};
 pub use table_theme::TableTheme;
 pub use types::{CollapsedTable, ExpandedTable, JustTable, TableOpts, TableOutput};
 pub use unstructured_table::UnstructuredTable;
diff --git a/crates/nu-table/src/table.rs b/crates/nu-table/src/table.rs
index bf75e14380..b706a41eb2 100644
--- a/crates/nu-table/src/table.rs
+++ b/crates/nu-table/src/table.rs
@@ -1,59 +1,46 @@
-use crate::{convert_style, table_theme::TableTheme};
+use std::{cmp::min, collections::HashMap};
+
 use nu_ansi_term::Style;
 use nu_color_config::TextStyle;
-use nu_protocol::TrimStrategy;
+use nu_protocol::{TableIndent, TrimStrategy};
 use nu_utils::strip_ansi_unlikely;
-use std::{cmp::min, collections::HashMap};
+
 use tabled::{
     builder::Builder,
     grid::{
         ansi::ANSIBuf,
         colors::Colors,
-        config::{AlignmentHorizontal, ColoredConfig, Entity, EntityMap, Position},
+        config::{AlignmentHorizontal, ColoredConfig, Entity, Position},
         dimension::CompleteDimensionVecRecords,
         records::{
             vec_records::{Cell, Text, VecRecords},
-            ExactRecords, PeekableRecords, Records, Resizable,
+            ExactRecords, Records, Resizable,
         },
     },
     settings::{
+        format::FormatContent,
         formatting::AlignmentStrategy,
-        object::{Columns, Segment},
-        peaker::Peaker,
+        object::{Columns, Row, Rows},
+        peaker::Priority,
         themes::ColumnNames,
         width::Truncate,
-        Alignment, Color, Modify, Padding, Settings, TableOption, Width,
+        Alignment, Color, Format, Modify, ModifyList, Padding, Settings, TableOption, Width,
     },
     Table,
 };
 
+use crate::{convert_style, is_color_empty, table_theme::TableTheme};
+
+pub type NuRecords = VecRecords<NuRecordsValue>;
+pub type NuRecordsValue = Text<String>;
+
 /// NuTable is a table rendering implementation.
 #[derive(Debug, Clone)]
 pub struct NuTable {
     data: NuRecords,
     styles: Styles,
     alignments: Alignments,
-    indent: (usize, usize),
-}
-
-pub type NuRecords = VecRecords<NuTableCell>;
-pub type NuTableCell = Text<String>;
-
-#[derive(Debug, Default, Clone)]
-struct Styles {
-    index: ANSIBuf,
-    header: ANSIBuf,
-    data: EntityMap<ANSIBuf>,
-    data_is_set: bool,
-}
-
-#[derive(Debug, Clone)]
-struct Alignments {
-    data: AlignmentHorizontal,
-    index: AlignmentHorizontal,
-    header: AlignmentHorizontal,
-    columns: HashMap<usize, AlignmentHorizontal>,
-    cells: HashMap<Position, AlignmentHorizontal>,
+    config: TableConfig,
 }
 
 impl NuTable {
@@ -62,7 +49,6 @@ impl NuTable {
         Self {
             data: VecRecords::new(vec![vec![Text::default(); count_columns]; count_rows]),
             styles: Styles::default(),
-            indent: (1, 1),
             alignments: Alignments {
                 data: AlignmentHorizontal::Left,
                 index: AlignmentHorizontal::Right,
@@ -70,6 +56,15 @@ impl NuTable {
                 columns: HashMap::default(),
                 cells: HashMap::default(),
             },
+            config: TableConfig {
+                theme: TableTheme::basic(),
+                trim: TrimStrategy::truncate(None),
+                structure: TableStructure::new(false, false, false),
+                indent: TableIndent::new(1, 1),
+                header_on_border: false,
+                expand: false,
+                border_color: None,
+            },
         }
     }
 
@@ -87,11 +82,23 @@ impl NuTable {
         self.data[pos.0][pos.1] = Text::new(text);
     }
 
+    pub fn insert_row(&mut self, index: usize, row: Vec<String>) {
+        let data = &mut self.data[index];
+
+        for (col, text) in row.into_iter().enumerate() {
+            data[col] = Text::new(text);
+        }
+    }
+
+    pub fn set_row(&mut self, index: usize, row: Vec<NuRecordsValue>) {
+        assert_eq!(self.data[index].len(), row.len());
+        self.data[index] = row;
+    }
+
     pub fn set_column_style(&mut self, column: usize, style: TextStyle) {
         if let Some(style) = style.color_style {
-            let style = ANSIBuf::from(convert_style(style));
-            self.styles.data.insert(Entity::Column(column), style);
-            self.styles.data_is_set = true;
+            let style = convert_style(style);
+            self.styles.columns.insert(column, style);
         }
 
         let alignment = convert_alignment(style.alignment);
@@ -102,9 +109,8 @@ impl NuTable {
 
     pub fn insert_style(&mut self, pos: Position, style: TextStyle) {
         if let Some(style) = style.color_style {
-            let style = ANSIBuf::from(convert_style(style));
-            self.styles.data.insert(Entity::Cell(pos.0, pos.1), style);
-            self.styles.data_is_set = true;
+            let style = convert_style(style);
+            self.styles.cells.insert(pos, style);
         }
 
         let alignment = convert_alignment(style.alignment);
@@ -115,7 +121,7 @@ impl NuTable {
 
     pub fn set_header_style(&mut self, style: TextStyle) {
         if let Some(style) = style.color_style {
-            let style = ANSIBuf::from(convert_style(style));
+            let style = convert_style(style);
             self.styles.header = style;
         }
 
@@ -124,7 +130,7 @@ impl NuTable {
 
     pub fn set_index_style(&mut self, style: TextStyle) {
         if let Some(style) = style.color_style {
-            let style = ANSIBuf::from(convert_style(style));
+            let style = convert_style(style);
             self.styles.index = style;
         }
 
@@ -133,16 +139,39 @@ impl NuTable {
 
     pub fn set_data_style(&mut self, style: TextStyle) {
         if let Some(style) = style.color_style {
-            let style = ANSIBuf::from(convert_style(style));
-            self.styles.data.insert(Entity::Global, style);
-            self.styles.data_is_set = true;
+            let style = convert_style(style);
+            self.styles.data = style;
         }
 
         self.alignments.data = convert_alignment(style.alignment);
     }
 
-    pub fn set_indent(&mut self, left: usize, right: usize) {
-        self.indent = (left, right);
+    pub fn set_indent(&mut self, indent: TableIndent) {
+        self.config.indent = indent;
+    }
+
+    pub fn set_theme(&mut self, theme: TableTheme) {
+        self.config.theme = theme;
+    }
+
+    pub fn set_structure(&mut self, index: bool, header: bool, footer: bool) {
+        self.config.structure = TableStructure::new(index, header, footer);
+    }
+
+    pub fn set_border_header(&mut self, on: bool) {
+        self.config.header_on_border = on;
+    }
+
+    pub fn set_trim(&mut self, strategy: TrimStrategy) {
+        self.config.trim = strategy;
+    }
+
+    pub fn set_strategy(&mut self, expand: bool) {
+        self.config.expand = expand;
+    }
+
+    pub fn set_border_color(&mut self, color: Style) {
+        self.config.border_color = (!color.is_plain()).then_some(color);
     }
 
     pub fn get_records_mut(&mut self) -> &mut NuRecords {
@@ -152,21 +181,15 @@ impl NuTable {
     /// Converts a table to a String.
     ///
     /// It returns None in case where table cannot be fit to a terminal width.
-    pub fn draw(self, config: NuTableConfig, termwidth: usize) -> Option<String> {
-        build_table(
-            self.data,
-            config,
-            self.alignments,
-            self.styles,
-            termwidth,
-            self.indent,
-        )
+    pub fn draw(self, termwidth: usize) -> Option<String> {
+        build_table(self, termwidth)
     }
 
     /// Return a total table width.
-    pub fn total_width(&self, config: &NuTableConfig) -> usize {
-        let config = get_config(&config.theme, false, None);
-        let widths = build_width(&self.data, self.indent.0 + self.indent.1);
+    pub fn total_width(&self) -> usize {
+        let config = create_config(&self.config.theme, false, None);
+        let pad = indent_sum(self.config.indent);
+        let widths = build_width(&self.data, pad);
         get_total_width2(&widths, &config)
     }
 }
@@ -180,150 +203,175 @@ impl From<Vec<Vec<Text<String>>>> for NuTable {
     }
 }
 
-#[derive(Debug, Clone)]
-pub struct NuTableConfig {
-    pub theme: TableTheme,
-    pub trim: TrimStrategy,
-    pub split_color: Option<Style>,
-    pub expand: bool,
-    pub with_index: bool,
-    pub with_header: bool,
-    pub with_footer: bool,
-    pub header_on_border: bool,
+type Alignments = CellConfiguration<AlignmentHorizontal>;
+
+type Styles = CellConfiguration<Color>;
+
+#[derive(Debug, Default, Clone)]
+struct CellConfiguration<Value> {
+    data: Value,
+    index: Value,
+    header: Value,
+    columns: HashMap<usize, Value>,
+    cells: HashMap<Position, Value>,
 }
 
-impl Default for NuTableConfig {
-    fn default() -> Self {
+#[derive(Debug, Clone)]
+pub struct TableConfig {
+    theme: TableTheme,
+    trim: TrimStrategy,
+    border_color: Option<Style>,
+    expand: bool,
+    structure: TableStructure,
+    header_on_border: bool,
+    indent: TableIndent,
+}
+
+#[derive(Debug, Clone)]
+struct TableStructure {
+    with_index: bool,
+    with_header: bool,
+    with_footer: bool,
+}
+
+impl TableStructure {
+    fn new(with_index: bool, with_header: bool, with_footer: bool) -> Self {
         Self {
-            theme: TableTheme::basic(),
-            trim: TrimStrategy::truncate(None),
-            with_header: false,
-            with_index: false,
-            with_footer: false,
-            expand: false,
-            split_color: None,
-            header_on_border: false,
+            with_index,
+            with_header,
+            with_footer,
         }
     }
 }
 
-fn build_table(
-    mut data: NuRecords,
-    cfg: NuTableConfig,
-    alignments: Alignments,
-    styles: Styles,
-    termwidth: usize,
-    indent: (usize, usize),
-) -> Option<String> {
-    if data.count_columns() == 0 || data.count_rows() == 0 {
+fn build_table(mut t: NuTable, termwidth: usize) -> Option<String> {
+    if t.count_columns() == 0 || t.count_rows() == 0 {
         return Some(String::new());
     }
 
-    let pad = indent.0 + indent.1;
-    let widths = maybe_truncate_columns(&mut data, &cfg, termwidth, pad);
+    let widths = table_truncate(&mut t, termwidth)?;
+    table_insert_footer(&mut t);
+    draw_table(t, widths, termwidth)
+}
+
+fn table_insert_footer(t: &mut NuTable) {
+    if t.config.structure.with_header && t.config.structure.with_footer {
+        duplicate_row(&mut t.data, 0);
+    }
+}
+
+fn table_truncate(t: &mut NuTable, termwidth: usize) -> Option<Vec<usize>> {
+    let pad = t.config.indent.left + t.config.indent.right;
+    let widths = maybe_truncate_columns(&mut t.data, &t.config, termwidth, pad);
     if widths.is_empty() {
         return None;
     }
 
-    if cfg.with_header && cfg.with_footer {
-        duplicate_row(&mut data, 0);
-    }
-
-    draw_table(data, alignments, styles, widths, cfg, termwidth, indent)
+    Some(widths)
 }
 
-fn draw_table(
-    data: NuRecords,
-    alignments: Alignments,
-    styles: Styles,
-    widths: Vec<usize>,
-    cfg: NuTableConfig,
-    termwidth: usize,
-    indent: (usize, usize),
-) -> Option<String> {
-    let with_index = cfg.with_index;
-    let with_header = cfg.with_header && data.count_rows() > 1;
-    let with_footer = with_header && cfg.with_footer;
-    let sep_color = cfg.split_color;
-    let border_header = cfg.header_on_border;
+fn draw_table(t: NuTable, widths: Vec<usize>, termwidth: usize) -> Option<String> {
+    let structure = get_table_structure(&t.data, &t.config);
+    let sep_color = t.config.border_color;
+    let border_header = structure.with_header && t.config.header_on_border;
 
-    let data: Vec<Vec<_>> = data.into();
-    let mut table = Builder::from(data).build();
+    let data: Vec<Vec<_>> = t.data.into();
+    let mut table = Builder::from_vec(data).build();
 
-    set_indent(&mut table, indent.0, indent.1);
-    load_theme(&mut table, &cfg.theme, with_footer, with_header, sep_color);
-    align_table(&mut table, alignments, with_index, with_header, with_footer);
-    colorize_table(&mut table, styles, with_index, with_header, with_footer);
+    set_indent(&mut table, t.config.indent);
+    load_theme(&mut table, &t.config.theme, &structure, sep_color);
+    align_table(&mut table, t.alignments, &structure);
+    colorize_table(&mut table, t.styles, &structure);
 
-    let pad = indent.0 + indent.1;
-    let width_ctrl = TableWidthCtrl::new(widths, cfg, termwidth, pad);
+    let pad = indent_sum(t.config.indent);
+    let width_ctrl = WidthCtrl::new(widths, t.config, termwidth, pad);
 
-    if with_header && border_header {
-        set_border_head(&mut table, with_footer, width_ctrl);
-    } else {
-        table.with(width_ctrl);
-    }
+    adjust_table(&mut table, width_ctrl, border_header, structure.with_footer);
 
     table_to_string(table, termwidth)
 }
 
-fn set_indent(table: &mut Table, left: usize, right: usize) {
-    table.with(Padding::new(left, right, 0, 0));
+fn indent_sum(indent: TableIndent) -> usize {
+    indent.left + indent.right
 }
 
-fn set_border_head(table: &mut Table, with_footer: bool, wctrl: TableWidthCtrl) {
-    if with_footer {
-        let count_rows = table.count_rows();
-        let last_row_index = count_rows - 1;
+fn get_table_structure(data: &VecRecords<Text<String>>, cfg: &TableConfig) -> TableStructure {
+    let with_index = cfg.structure.with_index;
+    let with_header = cfg.structure.with_header && data.count_rows() > 1;
+    let with_footer = with_header && cfg.structure.with_footer;
 
-        // note: funnily last and row must be equal at this point but we do not rely on it just in case.
+    TableStructure::new(with_index, with_header, with_footer)
+}
 
-        let mut first_row = GetRow(0, Vec::new());
-        let mut head_settings = GetRowSettings(0, AlignmentHorizontal::Left, None);
-        let mut last_row = GetRow(last_row_index, Vec::new());
-
-        table.with(&mut first_row);
-        table.with(&mut head_settings);
-        table.with(&mut last_row);
-
-        let head = first_row.1;
-        let footer = last_row.1;
-        let alignment = head_settings.1;
-        let head_color = head_settings.2.clone();
-        let footer_color = head_settings.2;
-
-        table.with(
-            Settings::default()
-                .with(StripColorFromRow(0))
-                .with(StripColorFromRow(count_rows - 1))
-                .with(wctrl)
-                .with(MoveRowNext::new(0, 0))
-                .with(MoveRowPrev::new(last_row_index - 1, last_row_index))
-                .with(SetLineHeaders::new(0, head, alignment, head_color))
-                .with(SetLineHeaders::new(
-                    last_row_index - 1,
-                    footer,
-                    alignment,
-                    footer_color,
-                )),
-        );
+fn adjust_table(table: &mut Table, width_ctrl: WidthCtrl, border_header: bool, with_footer: bool) {
+    if border_header {
+        if with_footer {
+            set_border_head_with_footer(table, width_ctrl);
+        } else {
+            set_border_head(table, width_ctrl);
+        }
     } else {
-        let mut row = GetRow(0, Vec::new());
-        let mut row_opts = GetRowSettings(0, AlignmentHorizontal::Left, None);
-
-        table.with(&mut row);
-        table.with(&mut row_opts);
-
-        table.with(
-            Settings::default()
-                .with(StripColorFromRow(0))
-                .with(wctrl)
-                .with(MoveRowNext::new(0, 0))
-                .with(SetLineHeaders::new(0, row.1, row_opts.1, row_opts.2)),
-        );
+        table.with(width_ctrl);
     }
 }
 
+fn set_indent(table: &mut Table, indent: TableIndent) {
+    table.with(Padding::new(indent.left, indent.right, 0, 0));
+}
+
+fn set_border_head(table: &mut Table, wctrl: WidthCtrl) {
+    let mut row = GetRow(0, Vec::new());
+    let mut row_opts = GetRowSettings(0, AlignmentHorizontal::Left, None);
+
+    table.with(&mut row);
+    table.with(&mut row_opts);
+
+    table.with(
+        Settings::default()
+            .with(strip_color_from_row(0))
+            .with(wctrl)
+            .with(MoveRowNext::new(0, 0))
+            .with(SetLineHeaders::new(0, row.1, row_opts.1, row_opts.2)),
+    );
+}
+
+fn set_border_head_with_footer(table: &mut Table, wctrl: WidthCtrl) {
+    // note: funnily last and row must be equal at this point but we do not rely on it just in case.
+
+    let count_rows = table.count_rows();
+    let last_row_index = count_rows - 1;
+
+    let mut first_row = GetRow(0, Vec::new());
+    let mut head_settings = GetRowSettings(0, AlignmentHorizontal::Left, None);
+    let mut last_row = GetRow(last_row_index, Vec::new());
+
+    table.with(&mut first_row);
+    table.with(&mut head_settings);
+    table.with(&mut last_row);
+
+    let head = first_row.1;
+    let footer = last_row.1;
+    let alignment = head_settings.1;
+    let head_color = head_settings.2.clone();
+    let footer_color = head_settings.2;
+
+    table.with(
+        Settings::default()
+            .with(strip_color_from_row(0))
+            .with(strip_color_from_row(count_rows - 1))
+            .with(wctrl)
+            .with(MoveRowNext::new(0, 0))
+            .with(MoveRowPrev::new(last_row_index - 1, last_row_index))
+            .with(SetLineHeaders::new(0, head, alignment, head_color))
+            .with(SetLineHeaders::new(
+                last_row_index - 1,
+                footer,
+                alignment,
+                footer_color,
+            )),
+    );
+}
+
 fn table_to_string(table: Table, termwidth: usize) -> Option<String> {
     let total_width = table.total_width();
 
@@ -335,15 +383,15 @@ fn table_to_string(table: Table, termwidth: usize) -> Option<String> {
     }
 }
 
-struct TableWidthCtrl {
+struct WidthCtrl {
     width: Vec<usize>,
-    cfg: NuTableConfig,
+    cfg: TableConfig,
     width_max: usize,
     pad: usize,
 }
 
-impl TableWidthCtrl {
-    fn new(width: Vec<usize>, cfg: NuTableConfig, max: usize, pad: usize) -> Self {
+impl WidthCtrl {
+    fn new(width: Vec<usize>, cfg: TableConfig, max: usize, pad: usize) -> Self {
         Self {
             width,
             cfg,
@@ -353,7 +401,7 @@ impl TableWidthCtrl {
     }
 }
 
-impl TableOption<NuRecords, ColoredConfig, CompleteDimensionVecRecords<'_>> for TableWidthCtrl {
+impl TableOption<NuRecords, ColoredConfig, CompleteDimensionVecRecords<'_>> for WidthCtrl {
     fn change(
         self,
         rec: &mut NuRecords,
@@ -362,24 +410,24 @@ impl TableOption<NuRecords, ColoredConfig, CompleteDimensionVecRecords<'_>> for
     ) {
         let total_width = get_total_width2(&self.width, cfg);
 
-        if total_width > self.width_max {
-            let has_header = self.cfg.with_header && rec.count_rows() > 1;
-            let trim_as_head = has_header && self.cfg.header_on_border;
+        let need_truncation = total_width > self.width_max;
+        if need_truncation {
+            let has_header = self.cfg.structure.with_header && rec.count_rows() > 1;
+            let as_head = has_header && self.cfg.header_on_border;
 
-            TableTrim::new(
-                self.width,
-                self.width_max,
-                self.cfg.trim,
-                trim_as_head,
-                self.pad,
-            )
-            .change(rec, cfg, dim);
-        } else if self.cfg.expand && self.width_max > total_width {
-            let opt = (SetDimensions(self.width), Width::increase(self.width_max));
-            TableOption::<VecRecords<_>, _, _>::change(opt, rec, cfg, dim)
-        } else {
-            SetDimensions(self.width).change(rec, cfg, dim);
+            let trim = TableTrim::new(self.width, self.width_max, self.cfg.trim, as_head, self.pad);
+            trim.change(rec, cfg, dim);
+            return;
         }
+
+        let need_expansion = self.cfg.expand && self.width_max > total_width;
+        if need_expansion {
+            let opt = (SetDimensions(self.width), Width::increase(self.width_max));
+            TableOption::<VecRecords<_>, _, _>::change(opt, rec, cfg, dim);
+            return;
+        }
+
+        SetDimensions(self.width).change(rec, cfg, dim);
     }
 }
 
@@ -427,13 +475,13 @@ impl TableOption<NuRecords, ColoredConfig, CompleteDimensionVecRecords<'_>> for
             TrimStrategy::Wrap { try_to_keep_words } => {
                 let wrap = Width::wrap(self.width_max)
                     .keep_words(try_to_keep_words)
-                    .priority(PriorityMax);
+                    .priority(Priority::max(false));
 
                 let opt = (SetDimensions(self.width), wrap);
                 TableOption::<NuRecords, _, _>::change(opt, recs, cfg, dims);
             }
             TrimStrategy::Truncate { suffix } => {
-                let mut truncate = Width::truncate(self.width_max).priority(PriorityMax);
+                let mut truncate = Width::truncate(self.width_max).priority(Priority::max(false));
                 if let Some(suffix) = suffix {
                     truncate = truncate.suffix(suffix).suffix_try_color(true);
                 }
@@ -515,7 +563,7 @@ fn trim_as_header(
                 let wrap = Width::wrap(width).keep_words(*try_to_keep_words);
 
                 let opt = Modify::new(Columns::single(i)).with(wrap);
-                TableOption::<VecRecords<Text<String>>, _, _>::change(opt, recs, cfg, dims);
+                TableOption::<VecRecords<_>, _, _>::change(opt, recs, cfg, dims);
             }
             TrimStrategy::Truncate { suffix } => {
                 let mut truncate = Width::truncate(width);
@@ -524,7 +572,7 @@ fn trim_as_header(
                 }
 
                 let opt = Modify::new(Columns::single(i)).with(truncate);
-                TableOption::<VecRecords<Text<String>>, _, _>::change(opt, recs, cfg, dims);
+                TableOption::<VecRecords<_>, _, _>::change(opt, recs, cfg, dims);
             }
         }
     }
@@ -532,82 +580,75 @@ fn trim_as_header(
     TableOption::change(SetDimensions(widths), recs, cfg, dims);
 }
 
-fn align_table(
-    table: &mut Table,
-    alignments: Alignments,
-    with_index: bool,
-    with_header: bool,
-    with_footer: bool,
-) {
-    table
-        .with(Modify::new(Segment::all()).with(AlignmentStrategy::PerLine))
-        .with(SetAlignment(alignments.data, Entity::Global));
+fn align_table(table: &mut Table, alignments: Alignments, structure: &TableStructure) {
+    table.with(AlignmentStrategy::PerLine);
+    table.with(Alignment::from(alignments.data));
 
     for (column, alignment) in alignments.columns {
-        table.with(SetAlignment(alignment, Entity::Column(column)));
+        table.modify(Columns::single(column), Alignment::from(alignment));
     }
 
     for (pos, alignment) in alignments.cells {
-        table.with(SetAlignment(alignment, Entity::Cell(pos.0, pos.1)));
+        table.modify(pos, Alignment::from(alignment));
     }
 
-    if with_header {
-        table.with(SetAlignment(alignments.header, Entity::Row(0)));
+    if structure.with_header {
+        table.modify(Rows::first(), Alignment::from(alignments.header));
 
-        if with_footer {
-            table.with(SetAlignment(
-                alignments.header,
-                Entity::Row(table.count_rows() - 1),
-            ));
+        if structure.with_footer {
+            table.modify(Rows::last(), Alignment::from(alignments.header));
         }
     }
 
-    if with_index {
-        table.with(SetAlignment(alignments.index, Entity::Column(0)));
+    if structure.with_index {
+        table.modify(Columns::first(), Alignment::from(alignments.index));
     }
 }
 
-fn colorize_table(
-    table: &mut Table,
-    mut styles: Styles,
-    with_index: bool,
-    with_header: bool,
-    with_footer: bool,
-) {
-    if with_index {
-        styles.data.insert(Entity::Column(0), styles.index);
-        styles.data_is_set = true;
+fn colorize_table(table: &mut Table, styles: Styles, structure: &TableStructure) {
+    if !is_color_empty(&styles.data) {
+        table.with(styles.data);
     }
 
-    if with_header {
-        styles.data.insert(Entity::Row(0), styles.header.clone());
-        styles.data_is_set = true;
-
-        if with_footer {
-            let count_rows = table.count_rows();
-            if count_rows > 1 {
-                let last_row = count_rows - 1;
-                styles.data.insert(Entity::Row(last_row), styles.header);
-            }
+    for (column, color) in styles.columns {
+        if !is_color_empty(&color) {
+            table.modify(Columns::single(column), color);
         }
     }
 
-    if styles.data_is_set {
-        table.get_config_mut().set_colors(styles.data);
+    for (pos, color) in styles.cells {
+        if !is_color_empty(&color) {
+            table.modify(pos, color);
+        }
+    }
+
+    if structure.with_index && !is_color_empty(&styles.index) {
+        table.modify(Columns::first(), styles.index);
+    }
+
+    if structure.with_header && !is_color_empty(&styles.header) {
+        table.modify(Rows::first(), styles.header.clone());
+    }
+
+    if structure.with_footer && !is_color_empty(&styles.header) {
+        table.modify(Rows::last(), styles.header);
     }
 }
 
 fn load_theme(
     table: &mut Table,
     theme: &TableTheme,
-    with_footer: bool,
-    with_header: bool,
+    structure: &TableStructure,
     sep_color: Option<Style>,
 ) {
-    let mut theme = theme.get_theme();
+    let mut theme = theme.as_base().clone();
 
-    if !with_header {
-        theme.set_horizontal_lines(Default::default());
+    if !structure.with_header {
+        let borders = *theme.get_borders();
+        theme.remove_horizontal_lines();
+        theme.set_borders(borders);
+    } else if structure.with_footer {
+        theme_copy_horizontal_line(&mut theme, 1, table.count_rows() - 1);
     }
 
     table.with(theme);
@@ -615,29 +656,20 @@ fn load_theme(
     if let Some(style) = sep_color {
         let color = convert_style(style);
         let color = ANSIBuf::from(color);
-        // todo: use .modify(Segment::all(), color) --> it has this optimization
         table.get_config_mut().set_border_color_default(color);
     }
-
-    if !with_header {
-        // todo: remove and use theme.remove_horizontal_lines();
-        table.with(RemoveHorizontalLine);
-    } else if with_footer {
-        // todo: remove and set it on theme rather then here...
-        table.with(CopyFirstHorizontalLineAtLast);
-    }
 }
 
 fn maybe_truncate_columns(
     data: &mut NuRecords,
-    cfg: &NuTableConfig,
+    cfg: &TableConfig,
     termwidth: usize,
     pad: usize,
 ) -> Vec<usize> {
     const TERMWIDTH_THRESHOLD: usize = 120;
 
     let preserve_content = termwidth > TERMWIDTH_THRESHOLD;
-    let has_header = cfg.with_header && data.count_rows() > 1;
+    let has_header = cfg.structure.with_header && data.count_rows() > 1;
     let is_header_on_border = has_header && cfg.header_on_border;
 
     let truncate = if is_header_on_border {
@@ -661,7 +693,7 @@ fn truncate_columns_by_content(
     const MIN_ACCEPTABLE_WIDTH: usize = 3;
     const TRAILING_COLUMN_WIDTH: usize = 5;
 
-    let config = get_config(theme, false, None);
+    let config = create_config(theme, false, None);
     let mut widths = build_width(&*data, pad);
     let total_width = get_total_width2(&widths, &config);
     if total_width <= termwidth {
@@ -741,7 +773,7 @@ fn truncate_columns_by_columns(
     let acceptable_width = 10 + pad;
     let trailing_column_width = 3 + pad;
 
-    let config = get_config(theme, false, None);
+    let config = create_config(theme, false, None);
     let mut widths = build_width(&*data, pad);
     let total_width = get_total_width2(&widths, &config);
     if total_width <= termwidth {
@@ -812,7 +844,7 @@ fn truncate_columns_by_head(
 ) -> Vec<usize> {
     const TRAILING_COLUMN_WIDTH: usize = 5;
 
-    let config = get_config(theme, false, None);
+    let config = create_config(theme, false, None);
     let mut widths = build_width(&*data, pad);
     let total_width = get_total_width2(&widths, &config);
     if total_width <= termwidth {
@@ -880,18 +912,6 @@ fn truncate_columns_by_head(
     widths
 }
 
-/// The same as [`tabled::settings::peaker::PriorityMax`] but prioritizes left columns first in case
-/// of equal width.
-#[derive(Debug, Default, Clone)]
-pub struct PriorityMax;
-
-impl Peaker for PriorityMax {
-    fn peak(&mut self, _: &[usize], widths: &[usize]) -> Option<usize> {
-        let col = (0..widths.len()).rev().max_by_key(|&i| widths[i]);
-        col.filter(|&col| widths[col] != 0)
-    }
-}
-
 fn get_total_width2(widths: &[usize], cfg: &ColoredConfig) -> usize {
     let total = widths.iter().sum::<usize>();
     let countv = cfg.count_vertical(widths.len());
@@ -900,9 +920,10 @@ fn get_total_width2(widths: &[usize], cfg: &ColoredConfig) -> usize {
     total + countv + margin.left.size + margin.right.size
 }
 
-fn get_config(theme: &TableTheme, with_header: bool, color: Option<Style>) -> ColoredConfig {
+fn create_config(theme: &TableTheme, with_header: bool, color: Option<Style>) -> ColoredConfig {
+    let structure = TableStructure::new(false, with_header, false);
     let mut table = Table::new([[""]]);
-    load_theme(&mut table, theme, false, with_header, color);
+    load_theme(&mut table, theme, &structure, color);
     table.get_config().clone()
 }
 
@@ -947,14 +968,6 @@ fn convert_alignment(alignment: nu_color_config::Alignment) -> AlignmentHorizont
     }
 }
 
-struct SetAlignment(AlignmentHorizontal, Entity);
-
-impl<R, D> TableOption<R, ColoredConfig, D> for SetAlignment {
-    fn change(self, _: &mut R, cfg: &mut ColoredConfig, _: &mut D) {
-        cfg.set_alignment_horizontal(self.1, self.0);
-    }
-}
-
 struct SetDimensions(Vec<usize>);
 
 impl<R> TableOption<R, ColoredConfig, CompleteDimensionVecRecords<'_>> for SetDimensions {
@@ -1045,16 +1058,8 @@ impl TableOption<NuRecords, ColoredConfig, CompleteDimensionVecRecords<'_>> for
         cfg: &mut ColoredConfig,
         dims: &mut CompleteDimensionVecRecords<'_>,
     ) {
-        let mut columns = self.columns;
-
-        match dims.get_widths() {
-            Some(widths) => {
-                columns = columns
-                    .into_iter()
-                    .zip(widths.iter().cloned()) // it must be always safe to do
-                    .map(|(s, width)| Truncate::truncate(&s, width).into_owned())
-                    .collect();
-            }
+        let widths = match dims.get_widths() {
+            Some(widths) => widths,
             None => {
                 // we don't have widths cached; which means that NO width adjustments were done
                 // which means we are OK to leave columns as they are.
@@ -1065,15 +1070,21 @@ impl TableOption<NuRecords, ColoredConfig, CompleteDimensionVecRecords<'_>> for
             }
         };
 
-        set_column_names(
-            recs,
-            cfg,
-            dims,
-            columns,
-            self.line,
-            self.alignment,
-            self.color,
-        )
+        let columns: Vec<_> = self
+            .columns
+            .into_iter()
+            .zip(widths.iter().cloned()) // it must be always safe to do
+            .map(|(s, width)| Truncate::truncate(&s, width).into_owned())
+            .collect();
+
+        let mut names = ColumnNames::new(columns)
+            .line(self.line)
+            .alignment(Alignment::from(self.alignment));
+        if let Some(color) = self.color {
+            names = names.color(color);
+        }
+
+        names.change(recs, cfg, dims);
     }
 
     fn hint_change(&self) -> Option<Entity> {
@@ -1142,26 +1153,23 @@ fn row_shift_next(recs: &mut NuRecords, cfg: &mut ColoredConfig, row: usize, lin
         return;
     }
 
-    if !has_line {
-        let _ = remove_row(recs, row);
-        let count_rows = recs.count_rows();
-        shift_alignments_down(cfg, row, count_rows, count_columns);
-        shift_colors_down(cfg, row, count_rows, count_columns);
-        shift_lines_up(cfg, count_rows, &[line + 1]);
-        shift_lines_up(cfg, count_rows, &[count_rows]);
-        return;
-    }
-
-    let _ = remove_row(recs, row);
+    recs.remove_row(row);
     let count_rows = recs.count_rows();
+
     shift_alignments_down(cfg, row, count_rows, count_columns);
     shift_colors_down(cfg, row, count_rows, count_columns);
-    remove_lines(cfg, count_rows, &[line + 1]);
+
+    if !has_line {
+        shift_lines_up(cfg, count_rows, &[line + 1]);
+    } else {
+        remove_lines(cfg, count_rows, &[line + 1]);
+    }
+
     shift_lines_up(cfg, count_rows, &[count_rows]);
 }
 
 fn row_shift_prev(recs: &mut NuRecords, cfg: &mut ColoredConfig, row: usize, line: usize) {
-    let count_rows = recs.count_rows();
+    let mut count_rows = recs.count_rows();
     let count_columns = recs.count_columns();
     let has_line = cfg.has_horizontal(line, count_rows);
     let has_prev_line = cfg.has_horizontal(line - 1, count_rows);
@@ -1169,14 +1177,14 @@ fn row_shift_prev(recs: &mut NuRecords, cfg: &mut ColoredConfig, row: usize, lin
         return;
     }
 
+    recs.remove_row(row);
+
     if !has_line {
-        let _ = remove_row(recs, row);
-        // shift_lines_down(table, &[line - 1]);
         return;
     }
 
-    let _ = remove_row(recs, row);
-    let count_rows = count_rows - 1;
+    count_rows -= 1;
+
     shift_alignments_down(cfg, row, count_rows, count_columns);
     shift_colors_down(cfg, row, count_rows, count_columns);
     remove_lines(cfg, count_rows, &[line - 1]);
@@ -1230,73 +1238,17 @@ fn shift_lines_up(cfg: &mut ColoredConfig, count_rows: usize, lines: &[usize]) {
     }
 }
 
-fn set_column_names(
-    records: &mut NuRecords,
-    cfg: &mut ColoredConfig,
-    dims: &mut CompleteDimensionVecRecords<'_>,
-    head: Vec<String>,
-    line: usize,
-    align: AlignmentHorizontal,
-    color: Option<Color>,
-) {
-    let mut names = ColumnNames::new(head)
-        .line(line)
-        .alignment(Alignment::from(align));
-    if let Some(color) = color {
-        names = names.color(color);
-    }
-
-    ColumnNames::change(names, records, cfg, dims)
-}
-
-fn remove_row(recs: &mut NuRecords, row: usize) -> Vec<String> {
-    let count_columns = recs.count_columns();
-    let columns = (0..count_columns)
-        .map(|column| recs.get_text((row, column)).to_owned())
-        .collect::<Vec<_>>();
-
-    recs.remove_row(row);
-
-    columns
-}
-
-// todo; use Format?
-struct StripColorFromRow(usize);
-
-impl TableOption<NuRecords, ColoredConfig, CompleteDimensionVecRecords<'_>> for StripColorFromRow {
-    fn change(
-        self,
-        recs: &mut NuRecords,
-        _: &mut ColoredConfig,
-        _: &mut CompleteDimensionVecRecords<'_>,
-    ) {
-        for cell in &mut recs[self.0] {
-            *cell = Text::new(strip_ansi_unlikely(cell.as_ref()).into_owned());
-        }
+fn theme_copy_horizontal_line(theme: &mut tabled::settings::Theme, from: usize, to: usize) {
+    if let Some(line) = theme.get_horizontal_line(from) {
+        theme.insert_horizontal_line(to, *line);
     }
 }
 
-struct RemoveHorizontalLine;
-
-impl<D> TableOption<NuRecords, ColoredConfig, D> for RemoveHorizontalLine {
-    fn change(self, recs: &mut NuRecords, cfg: &mut ColoredConfig, _: &mut D) {
-        cfg.remove_horizontal_line(1, recs.count_rows());
-    }
-}
-
-struct CopyFirstHorizontalLineAtLast;
-
-impl<D> TableOption<NuRecords, ColoredConfig, D> for CopyFirstHorizontalLineAtLast {
-    fn change(self, recs: &mut NuRecords, cfg: &mut ColoredConfig, _: &mut D) {
-        if recs.count_rows() <= 2 {
-            return;
-        }
-
-        let line = match cfg.get_horizontal_line(1) {
-            Some(line) => *line,
-            None => return,
-        };
-
-        cfg.insert_horizontal_line(recs.count_rows() - 1, line);
+#[allow(clippy::type_complexity)]
+fn strip_color_from_row(row: usize) -> ModifyList<Row, FormatContent<fn(&str) -> String>> {
+    fn foo(s: &str) -> String {
+        strip_ansi_unlikely(s).into_owned()
     }
+
+    Modify::new(Rows::single(row)).with(Format::content(foo))
 }
diff --git a/crates/nu-table/src/table_theme.rs b/crates/nu-table/src/table_theme.rs
index 76bf6c71de..5c9fb2e06f 100644
--- a/crates/nu-table/src/table_theme.rs
+++ b/crates/nu-table/src/table_theme.rs
@@ -1,67 +1,63 @@
-use tabled::settings::style::{HorizontalLine, Style};
-use tabled::settings::themes::Theme;
+use tabled::settings::{
+    style::{HorizontalLine, Style},
+    themes::Theme,
+};
 
 #[derive(Debug, Clone)]
 pub struct TableTheme {
-    theme: Theme,
-    full_theme: Theme,
-    has_inner: bool,
+    base: Theme,
+    full: Theme,
 }
 
 impl TableTheme {
-    pub fn new(theme: impl Into<Theme>, full_theme: impl Into<Theme>, has_inner: bool) -> Self {
+    fn new(base: impl Into<Theme>, full: impl Into<Theme>) -> Self {
         Self {
-            theme: theme.into(),
-            full_theme: full_theme.into(),
-            has_inner,
+            base: base.into(),
+            full: full.into(),
         }
     }
 
     pub fn basic() -> TableTheme {
-        Self::new(Style::ascii(), Style::ascii(), true)
+        Self::new(Style::ascii(), Style::ascii())
     }
 
     pub fn thin() -> TableTheme {
-        Self::new(Style::modern(), Style::modern(), true)
+        Self::new(Style::modern(), Style::modern())
     }
 
     pub fn light() -> TableTheme {
         let mut theme = Theme::from_style(Style::blank());
         theme.insert_horizontal_line(1, HorizontalLine::new('─').intersection('─'));
 
-        Self::new(theme, Style::modern(), true)
+        Self::new(theme, Style::modern())
     }
 
     pub fn psql() -> TableTheme {
-        Self::new(Style::psql(), Style::psql(), true)
+        Self::new(Style::psql(), Style::psql())
     }
 
     pub fn markdown() -> TableTheme {
-        Self::new(Style::markdown(), Style::markdown(), true)
+        Self::new(Style::markdown(), Style::markdown())
     }
 
     pub fn dots() -> TableTheme {
         let theme = Style::dots().remove_horizontal();
 
-        Self::new(theme, Style::dots(), true)
+        Self::new(theme, Style::dots())
     }
 
     pub fn restructured() -> TableTheme {
-        Self::new(
-            Style::re_structured_text(),
-            Style::re_structured_text(),
-            true,
-        )
+        Self::new(Style::re_structured_text(), Style::re_structured_text())
     }
 
     pub fn ascii_rounded() -> TableTheme {
-        Self::new(Style::ascii_rounded(), Style::ascii_rounded(), true)
+        Self::new(Style::ascii_rounded(), Style::ascii_rounded())
     }
 
     pub fn basic_compact() -> TableTheme {
         let theme = Style::ascii().remove_horizontal();
 
-        Self::new(theme, Style::ascii(), true)
+        Self::new(theme, Style::ascii())
     }
 
     pub fn compact() -> TableTheme {
@@ -72,7 +68,7 @@ impl TableTheme {
             .remove_horizontal()
             .horizontals([(1, hline)]);
 
-        Self::new(theme, Style::modern(), true)
+        Self::new(theme, Style::modern())
     }
 
     pub fn with_love() -> TableTheme {
@@ -99,7 +95,7 @@ impl TableTheme {
             .intersection_left('❤')
             .intersection('❤');
 
-        Self::new(theme, full_theme, true)
+        Self::new(theme, full_theme)
     }
 
     pub fn compact_double() -> TableTheme {
@@ -112,7 +108,7 @@ impl TableTheme {
             .remove_horizontal()
             .horizontals([(1, hline)]);
 
-        Self::new(theme, Style::extended(), true)
+        Self::new(theme, Style::extended())
     }
 
     pub fn rounded() -> TableTheme {
@@ -122,7 +118,7 @@ impl TableTheme {
             .corner_bottom_left('╰')
             .corner_bottom_right('╯');
 
-        Self::new(Style::rounded(), full, true)
+        Self::new(Style::rounded(), full)
     }
 
     pub fn reinforced() -> TableTheme {
@@ -132,7 +128,7 @@ impl TableTheme {
             .corner_bottom_left('┗')
             .corner_bottom_right('┛');
 
-        Self::new(full.clone().remove_horizontal(), full, true)
+        Self::new(full.clone().remove_horizontal(), full)
     }
 
     pub fn heavy() -> TableTheme {
@@ -157,38 +153,18 @@ impl TableTheme {
             .intersection_right('┫')
             .intersection('╋');
 
-        Self::new(theme, full, true)
+        Self::new(theme, full)
     }
 
     pub fn none() -> TableTheme {
-        Self::new(Style::blank(), Style::blank(), true)
+        Self::new(Style::blank(), Style::blank())
     }
 
-    pub fn has_top(&self) -> bool {
-        self.theme.borders_has_top()
+    pub fn as_full(&self) -> &Theme {
+        &self.full
     }
 
-    pub fn has_left(&self) -> bool {
-        self.theme.borders_has_left()
-    }
-
-    pub fn has_right(&self) -> bool {
-        self.theme.borders_has_right()
-    }
-
-    pub fn has_inner(&self) -> bool {
-        self.has_inner
-    }
-
-    pub fn has_horizontals(&self) -> bool {
-        self.full_theme.get_borders().has_horizontal()
-    }
-
-    pub fn get_theme_full(&self) -> Theme {
-        self.full_theme.clone()
-    }
-
-    pub fn get_theme(&self) -> Theme {
-        self.theme.clone()
+    pub fn as_base(&self) -> &Theme {
+        &self.base
     }
 }
diff --git a/crates/nu-table/src/types/collapse.rs b/crates/nu-table/src/types/collapse.rs
index 0012c70a35..4b4ebed172 100644
--- a/crates/nu-table/src/types/collapse.rs
+++ b/crates/nu-table/src/types/collapse.rs
@@ -1,48 +1,40 @@
+use nu_ansi_term::Style;
+use nu_color_config::StyleComputer;
+use nu_protocol::{Config, Value};
+use nu_utils::SharedCow;
+
 use crate::{
     common::{get_index_style, load_theme, nu_value_to_string_clean},
     StringResult, TableOpts, UnstructuredTable,
 };
-use nu_color_config::StyleComputer;
-use nu_protocol::{Config, Record, TableMode, Value};
-use nu_utils::SharedCow;
 
 pub struct CollapsedTable;
 
 impl CollapsedTable {
     pub fn build(value: Value, opts: TableOpts<'_>) -> StringResult {
-        collapsed_table(
-            value,
-            opts.config,
-            opts.width,
-            opts.style_computer,
-            opts.mode,
-        )
+        collapsed_table(value, opts)
     }
 }
 
-fn collapsed_table(
-    mut value: Value,
-    config: &Config,
-    term_width: usize,
-    style_computer: &StyleComputer,
-    mode: TableMode,
-) -> StringResult {
-    colorize_value(&mut value, config, style_computer);
+fn collapsed_table(mut value: Value, opts: TableOpts<'_>) -> StringResult {
+    colorize_value(&mut value, opts.config, &opts.style_computer);
 
-    let theme = load_theme(mode);
-    let mut table = UnstructuredTable::new(value, config);
-    let is_empty = table.truncate(&theme, term_width);
+    let mut table = UnstructuredTable::new(value, opts.config);
+
+    let theme = load_theme(opts.mode);
+    let is_empty = table.truncate(&theme, opts.width);
     if is_empty {
         return Ok(None);
     }
 
-    let indent = (config.table.padding.left, config.table.padding.right);
-    let table = table.draw(style_computer, &theme, indent);
+    let table = table.draw(&theme, opts.config.table.padding, &opts.style_computer);
 
     Ok(Some(table))
 }
 
 fn colorize_value(value: &mut Value, config: &Config, style_computer: &StyleComputer) {
+    // todo: Remove recursion?
+
     match value {
         Value::Record { ref mut val, .. } => {
             let style = get_index_style(style_computer);
@@ -55,13 +47,11 @@ fn colorize_value(value: &mut Value, config: &Config, style_computer: &StyleComp
                     .into_iter()
                     .map(|(mut header, mut val)| {
                         colorize_value(&mut val, config, style_computer);
+                        header = colorize_text(&header, style.color_style).unwrap_or(header);
 
-                        if let Some(color) = style.color_style {
-                            header = color.paint(header).to_string();
-                        }
                         (header, val)
                     })
-                    .collect::<Record>(),
+                    .collect(),
             );
         }
         Value::List { vals, .. } => {
@@ -71,11 +61,19 @@ fn colorize_value(value: &mut Value, config: &Config, style_computer: &StyleComp
         }
         value => {
             let (text, style) = nu_value_to_string_clean(value, config, style_computer);
-            if let Some(color) = style.color_style {
-                let text = color.paint(text).to_string();
-                let span = value.span();
-                *value = Value::string(text, span);
+            if let Some(text) = colorize_text(&text, style.color_style) {
+                *value = Value::string(text, value.span());
             }
         }
     }
 }
+
+fn colorize_text(text: &str, color: Option<Style>) -> Option<String> {
+    if let Some(color) = color {
+        if !color.is_plain() {
+            return Some(color.paint(text).to_string());
+        }
+    }
+
+    None
+}
diff --git a/crates/nu-table/src/types/expanded.rs b/crates/nu-table/src/types/expanded.rs
index d87af74522..393a381646 100644
--- a/crates/nu-table/src/types/expanded.rs
+++ b/crates/nu-table/src/types/expanded.rs
@@ -1,18 +1,21 @@
+use std::{cmp::max, collections::HashMap};
+
+use nu_color_config::{Alignment, StyleComputer, TextStyle};
+use nu_engine::column::get_columns;
+use nu_protocol::{Config, Record, ShellError, Span, Value};
+
+use tabled::grid::config::Position;
+
 use crate::{
     common::{
-        create_nu_table_config, error_sign, get_header_style, get_index_style, load_theme,
+        check_value, configure_table, error_sign, get_header_style, get_index_style, load_theme,
         nu_value_to_string, nu_value_to_string_clean, nu_value_to_string_colored, wrap_text,
         NuText, StringResult, TableResult, INDEX_COLUMN_NAME,
     },
     string_width,
     types::has_index,
-    NuTable, NuTableCell, TableOpts, TableOutput,
+    NuRecordsValue, NuTable, TableOpts, TableOutput,
 };
-use nu_color_config::{Alignment, StyleComputer, TextStyle};
-use nu_engine::column::get_columns;
-use nu_protocol::{Config, Record, ShellError, Span, Value};
-use std::{cmp::max, collections::HashMap};
-use tabled::grid::config::Position;
 
 #[derive(Debug, Clone)]
 pub struct ExpandedTable {
@@ -31,25 +34,32 @@ impl ExpandedTable {
     }
 
     pub fn build_value(self, item: &Value, opts: TableOpts<'_>) -> NuText {
-        let cell = expanded_table_entry2(item, Cfg { opts, format: self });
+        let cfg = Cfg { opts, format: self };
+        let cell = expand_entry(item, cfg);
         (cell.text, cell.style)
     }
 
     pub fn build_map(self, record: &Record, opts: TableOpts<'_>) -> StringResult {
-        expanded_table_kv(record, Cfg { opts, format: self }).map(|cell| cell.map(|cell| cell.text))
+        let cfg = Cfg { opts, format: self };
+        expanded_table_kv(record, cfg).map(|cell| cell.map(|cell| cell.text))
     }
 
     pub fn build_list(self, vals: &[Value], opts: TableOpts<'_>) -> StringResult {
-        let cfg = Cfg {
-            opts: opts.clone(),
-            format: self,
-        };
-        let out = match expanded_table_list(vals, cfg)? {
+        let cfg = Cfg { opts, format: self };
+        let output = expand_list(vals, cfg.clone())?;
+        let mut output = match output {
             Some(out) => out,
             None => return Ok(None),
         };
 
-        maybe_expand_table(out, opts.width, &opts)
+        configure_table(
+            &mut output,
+            cfg.opts.config,
+            &cfg.opts.style_computer,
+            cfg.opts.mode,
+        );
+
+        maybe_expand_table(output, cfg.opts.width)
     }
 }
 
@@ -92,7 +102,7 @@ impl CellOutput {
 
 type CellResult = Result<Option<CellOutput>, ShellError>;
 
-fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
+fn expand_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
     const PADDING_SPACE: usize = 2;
     const SPLIT_LINE_SPACE: usize = 1;
     const ADDITIONAL_CELL_SPACE: usize = PADDING_SPACE + SPLIT_LINE_SPACE;
@@ -133,15 +143,12 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
 
     if with_index {
         if with_header {
-            data[0].push(NuTableCell::exact(String::from("#"), 1, vec![]));
+            data[0].push(NuRecordsValue::exact(String::from("#"), 1, vec![]));
         }
 
         for (row, item) in input.iter().enumerate() {
             cfg.opts.signals.check(cfg.opts.span)?;
-
-            if let Value::Error { error, .. } = item {
-                return Err(*error.clone());
-            }
+            check_value(item)?;
 
             let index = row + row_offset;
             let text = item
@@ -152,7 +159,7 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
                 .unwrap_or_else(|| index.to_string());
 
             let row = row + with_header as usize;
-            let value = NuTableCell::new(text);
+            let value = NuRecordsValue::new(text);
             data[row].push(value);
         }
 
@@ -177,13 +184,10 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
 
         for (row, item) in input.iter().enumerate() {
             cfg.opts.signals.check(cfg.opts.span)?;
+            check_value(item)?;
 
-            if let Value::Error { error, .. } = item {
-                return Err(*error.clone());
-            }
-
-            let inner_cfg = update_config(cfg.clone(), available_width);
-            let mut cell = expanded_table_entry2(item, inner_cfg);
+            let inner_cfg = cfg_expand_reset_table(cfg.clone(), available_width);
+            let mut cell = expand_entry(item, inner_cfg);
 
             let value_width = string_width(&cell.text);
             if value_width > available_width {
@@ -195,7 +199,7 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
                 cell.text = wrap_text(&cell.text, available_width, cfg.opts.config);
             }
 
-            let value = NuTableCell::new(cell.text);
+            let value = NuRecordsValue::new(cell.text);
             data[row].push(value);
             data_styles.insert((row, with_index as usize), cell.style);
 
@@ -203,8 +207,8 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
         }
 
         let mut table = NuTable::from(data);
-        table.set_indent(cfg.opts.indent.0, cfg.opts.indent.1);
-        table.set_index_style(get_index_style(cfg.opts.style_computer));
+        table.set_indent(cfg.opts.config.table.padding);
+        table.set_index_style(get_index_style(&cfg.opts.style_computer));
         set_data_styles(&mut table, data_styles);
 
         return Ok(Some(TableOutput::new(table, false, with_index, rows_count)));
@@ -266,13 +270,10 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
 
         for (row, item) in input.iter().enumerate() {
             cfg.opts.signals.check(cfg.opts.span)?;
+            check_value(item)?;
 
-            if let Value::Error { error, .. } = item {
-                return Err(*error.clone());
-            }
-
-            let inner_cfg = update_config(cfg.clone(), available);
-            let mut cell = expanded_table_entry(item, header.as_str(), inner_cfg);
+            let inner_cfg = cfg_expand_reset_table(cfg.clone(), available);
+            let mut cell = expand_entry_with_header(item, &header, inner_cfg);
 
             let mut value_width = string_width(&cell.text);
             if value_width > available {
@@ -285,14 +286,14 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
 
             column_width = max(column_width, value_width);
 
-            let value = NuTableCell::new(cell.text);
+            let value = NuRecordsValue::new(cell.text);
             data[row + 1].push(value);
             data_styles.insert((row + 1, col + with_index as usize), cell.style);
 
             column_rows = column_rows.saturating_add(cell.size);
         }
 
-        let head_cell = NuTableCell::new(header);
+        let head_cell = NuRecordsValue::new(header);
         data[0].push(head_cell);
 
         if column_width > available {
@@ -354,7 +355,7 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
 
         let is_last_column = widths.len() == count_columns;
         if !is_last_column {
-            let shift = NuTableCell::exact(String::from("..."), 3, vec![]);
+            let shift = NuRecordsValue::exact(String::from("..."), 3, vec![]);
             for row in &mut data {
                 row.push(shift.clone());
             }
@@ -364,9 +365,9 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
     }
 
     let mut table = NuTable::from(data);
-    table.set_index_style(get_index_style(cfg.opts.style_computer));
-    table.set_header_style(get_header_style(cfg.opts.style_computer));
-    table.set_indent(cfg.opts.indent.0, cfg.opts.indent.1);
+    table.set_index_style(get_index_style(&cfg.opts.style_computer));
+    table.set_header_style(get_header_style(&cfg.opts.style_computer));
+    table.set_indent(cfg.opts.config.table.padding);
     set_data_styles(&mut table, data_styles);
 
     Ok(Some(TableOutput::new(table, true, with_index, rows_count)))
@@ -374,13 +375,15 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
 
 fn expanded_table_kv(record: &Record, cfg: Cfg<'_>) -> CellResult {
     let theme = load_theme(cfg.opts.mode);
+    let theme = theme.as_base();
     let key_width = record
         .columns()
         .map(|col| string_width(col))
         .max()
         .unwrap_or(0);
-    let count_borders =
-        theme.has_inner() as usize + theme.has_right() as usize + theme.has_left() as usize;
+    let count_borders = theme.borders_has_vertical() as usize
+        + theme.borders_has_right() as usize
+        + theme.borders_has_left() as usize;
     let padding = 2;
     if key_width + count_borders + padding + padding > cfg.opts.width {
         return Ok(None);
@@ -394,7 +397,7 @@ fn expanded_table_kv(record: &Record, cfg: Cfg<'_>) -> CellResult {
     for (key, value) in record {
         cfg.opts.signals.check(cfg.opts.span)?;
 
-        let cell = match expand_table_value(value, value_width, &cfg)? {
+        let cell = match expand_value(value, value_width, &cfg)? {
             Some(val) => val,
             None => return Ok(None),
         };
@@ -403,12 +406,13 @@ fn expanded_table_kv(record: &Record, cfg: Cfg<'_>) -> CellResult {
         // we could use Padding for it but,
         // the easiest way to do so is just push a new_line char before
         let mut key = key.to_owned();
-        if !key.is_empty() && cell.is_expanded && theme.has_top() {
+        let is_key_on_next_line = !key.is_empty() && cell.is_expanded && theme.borders_has_top();
+        if is_key_on_next_line {
             key.insert(0, '\n');
         }
 
-        let key = NuTableCell::new(key);
-        let val = NuTableCell::new(cell.text);
+        let key = NuRecordsValue::new(key);
+        let val = NuRecordsValue::new(cell.text);
         let row = vec![key, val];
 
         data.push(row);
@@ -418,35 +422,38 @@ fn expanded_table_kv(record: &Record, cfg: Cfg<'_>) -> CellResult {
 
     let mut table = NuTable::from(data);
     table.set_index_style(get_key_style(&cfg));
-    table.set_indent(cfg.opts.indent.0, cfg.opts.indent.1);
+    table.set_indent(cfg.opts.config.table.padding);
 
-    let out = TableOutput::new(table, false, true, count_rows);
+    let mut out = TableOutput::new(table, false, true, count_rows);
 
-    maybe_expand_table(out, cfg.opts.width, &cfg.opts)
+    configure_table(
+        &mut out,
+        cfg.opts.config,
+        &cfg.opts.style_computer,
+        cfg.opts.mode,
+    );
+
+    maybe_expand_table(out, cfg.opts.width)
         .map(|value| value.map(|value| CellOutput::clean(value, count_rows, false)))
 }
 
 // the flag is used as an optimization to not do `value.lines().count()` search.
-fn expand_table_value(value: &Value, value_width: usize, cfg: &Cfg<'_>) -> CellResult {
-    let is_limited = matches!(cfg.format.expand_limit, Some(0));
-    if is_limited {
-        return Ok(Some(CellOutput::clean(
-            value_to_string_clean(value, cfg),
-            1,
-            false,
-        )));
+fn expand_value(value: &Value, width: usize, cfg: &Cfg<'_>) -> CellResult {
+    if is_limit_reached(cfg) {
+        let value = value_to_string_clean(value, cfg);
+        return Ok(Some(CellOutput::clean(value, 1, false)));
     }
 
     let span = value.span();
     match value {
         Value::List { vals, .. } => {
-            let inner_cfg = update_config(dive_options(cfg, span), value_width);
-            let table = expanded_table_list(vals, inner_cfg)?;
+            let inner_cfg = cfg_expand_reset_table(cfg_expand_next_level(cfg.clone(), span), width);
+            let table = expand_list(vals, inner_cfg)?;
 
             match table {
-                Some(out) => {
-                    let cfg = create_table_cfg(cfg, &out);
-                    let value = out.table.draw(cfg, value_width);
+                Some(mut out) => {
+                    table_apply_config(&mut out, cfg);
+                    let value = out.table.draw(width);
                     match value {
                         Some(value) => Ok(Some(CellOutput::clean(value, out.count_rows, true))),
                         None => Ok(None),
@@ -454,182 +461,157 @@ fn expand_table_value(value: &Value, value_width: usize, cfg: &Cfg<'_>) -> CellR
                 }
                 None => {
                     // it means that the list is empty
-                    Ok(Some(CellOutput::text(value_to_wrapped_string(
-                        value,
-                        cfg,
-                        value_width,
-                    ))))
+                    let value = value_to_wrapped_string(value, cfg, width);
+                    Ok(Some(CellOutput::text(value)))
                 }
             }
         }
         Value::Record { val: record, .. } => {
             if record.is_empty() {
                 // Like list case return styled string instead of empty value
-                return Ok(Some(CellOutput::text(value_to_wrapped_string(
-                    value,
-                    cfg,
-                    value_width,
-                ))));
+                let value = value_to_wrapped_string(value, cfg, width);
+                return Ok(Some(CellOutput::text(value)));
             }
 
-            let inner_cfg = update_config(dive_options(cfg, span), value_width);
+            let inner_cfg = cfg_expand_reset_table(cfg_expand_next_level(cfg.clone(), span), width);
             let result = expanded_table_kv(record, inner_cfg)?;
             match result {
                 Some(result) => Ok(Some(CellOutput::clean(result.text, result.size, true))),
-                None => Ok(Some(CellOutput::text(value_to_wrapped_string(
-                    value,
-                    cfg,
-                    value_width,
-                )))),
+                None => {
+                    let value = value_to_wrapped_string(value, cfg, width);
+                    Ok(Some(CellOutput::text(value)))
+                }
             }
         }
-        _ => Ok(Some(CellOutput::text(value_to_wrapped_string_clean(
-            value,
-            cfg,
-            value_width,
-        )))),
+        _ => {
+            let value = value_to_wrapped_string_clean(value, cfg, width);
+            Ok(Some(CellOutput::text(value)))
+        }
     }
 }
 
 fn get_key_style(cfg: &Cfg<'_>) -> TextStyle {
-    get_header_style(cfg.opts.style_computer).alignment(Alignment::Left)
+    get_header_style(&cfg.opts.style_computer).alignment(Alignment::Left)
 }
 
-fn expanded_table_entry(item: &Value, header: &str, cfg: Cfg<'_>) -> CellOutput {
+fn expand_entry_with_header(item: &Value, header: &str, cfg: Cfg<'_>) -> CellOutput {
     match item {
         Value::Record { val, .. } => match val.get(header) {
-            Some(val) => expanded_table_entry2(val, cfg),
-            None => CellOutput::styled(error_sign(cfg.opts.style_computer)),
+            Some(val) => expand_entry(val, cfg),
+            None => CellOutput::styled(error_sign(&cfg.opts.style_computer)),
         },
-        _ => expanded_table_entry2(item, cfg),
+        _ => expand_entry(item, cfg),
     }
 }
 
-fn expanded_table_entry2(item: &Value, cfg: Cfg<'_>) -> CellOutput {
-    let is_limit_reached = matches!(cfg.format.expand_limit, Some(0));
-    if is_limit_reached {
-        return CellOutput::styled(nu_value_to_string_clean(
-            item,
-            cfg.opts.config,
-            cfg.opts.style_computer,
-        ));
+fn expand_entry(item: &Value, cfg: Cfg<'_>) -> CellOutput {
+    if is_limit_reached(&cfg) {
+        let value = nu_value_to_string_clean(item, cfg.opts.config, &cfg.opts.style_computer);
+        return CellOutput::styled(value);
     }
 
     let span = item.span();
     match &item {
         Value::Record { val: record, .. } => {
             if record.is_empty() {
-                return CellOutput::styled(nu_value_to_string(
-                    item,
-                    cfg.opts.config,
-                    cfg.opts.style_computer,
-                ));
+                let value = nu_value_to_string(item, cfg.opts.config, &cfg.opts.style_computer);
+                return CellOutput::styled(value);
             }
 
             // we verify what is the structure of a Record cause it might represent
-            let inner_cfg = dive_options(&cfg, span);
+            let inner_cfg = cfg_expand_next_level(cfg.clone(), span);
             let table = expanded_table_kv(record, inner_cfg);
 
             match table {
                 Ok(Some(table)) => table,
-                _ => CellOutput::styled(nu_value_to_string(
-                    item,
-                    cfg.opts.config,
-                    cfg.opts.style_computer,
-                )),
+                _ => {
+                    let value = nu_value_to_string(item, cfg.opts.config, &cfg.opts.style_computer);
+                    CellOutput::styled(value)
+                }
             }
         }
         Value::List { vals, .. } => {
             if cfg.format.flatten && is_simple_list(vals) {
-                return CellOutput::styled(value_list_to_string(
+                let value = list_to_string(
                     vals,
                     cfg.opts.config,
-                    cfg.opts.style_computer,
+                    &cfg.opts.style_computer,
                     &cfg.format.flatten_sep,
-                ));
+                );
+                return CellOutput::text(value);
             }
 
-            let inner_cfg = dive_options(&cfg, span);
-            let table = expanded_table_list(vals, inner_cfg);
+            let inner_cfg = cfg_expand_next_level(cfg.clone(), span);
+            let table = expand_list(vals, inner_cfg);
 
-            let out = match table {
+            let mut out = match table {
                 Ok(Some(out)) => out,
                 _ => {
-                    return CellOutput::styled(nu_value_to_string(
-                        item,
-                        cfg.opts.config,
-                        cfg.opts.style_computer,
-                    ))
+                    let value = nu_value_to_string(item, cfg.opts.config, &cfg.opts.style_computer);
+                    return CellOutput::styled(value);
                 }
             };
 
-            let table_config = create_table_cfg(&cfg, &out);
-            let table = out.table.draw(table_config, usize::MAX);
+            table_apply_config(&mut out, &cfg);
+
+            let table = out.table.draw(usize::MAX);
             match table {
                 Some(table) => CellOutput::clean(table, out.count_rows, false),
-                None => CellOutput::styled(nu_value_to_string(
-                    item,
-                    cfg.opts.config,
-                    cfg.opts.style_computer,
-                )),
+                None => {
+                    let value = nu_value_to_string(item, cfg.opts.config, &cfg.opts.style_computer);
+                    CellOutput::styled(value)
+                }
             }
         }
-        _ => CellOutput::styled(nu_value_to_string_clean(
-            item,
-            cfg.opts.config,
-            cfg.opts.style_computer,
-        )),
+        _ => {
+            let value = nu_value_to_string_clean(item, cfg.opts.config, &cfg.opts.style_computer);
+            CellOutput::styled(value)
+        }
     }
 }
 
+fn is_limit_reached(cfg: &Cfg<'_>) -> bool {
+    matches!(cfg.format.expand_limit, Some(0))
+}
+
 fn is_simple_list(vals: &[Value]) -> bool {
     vals.iter()
         .all(|v| !matches!(v, Value::Record { .. } | Value::List { .. }))
 }
 
-fn value_list_to_string(
+fn list_to_string(
     vals: &[Value],
     config: &Config,
     style_computer: &StyleComputer,
-    flatten_sep: &str,
-) -> NuText {
+    sep: &str,
+) -> String {
     let mut buf = String::new();
     for (i, value) in vals.iter().enumerate() {
         if i > 0 {
-            buf.push_str(flatten_sep);
+            buf.push_str(sep);
         }
 
-        let text = nu_value_to_string_clean(value, config, style_computer).0;
+        let (text, _) = nu_value_to_string_clean(value, config, style_computer);
         buf.push_str(&text);
     }
 
-    (buf, TextStyle::default())
+    buf
 }
 
-fn dive_options<'b>(cfg: &Cfg<'b>, span: Span) -> Cfg<'b> {
-    let mut cfg = cfg.clone();
-    cfg.opts.span = span;
-    if let Some(deep) = cfg.format.expand_limit.as_mut() {
-        *deep -= 1
-    }
-
-    cfg
-}
-
-fn maybe_expand_table(out: TableOutput, term_width: usize, opts: &TableOpts<'_>) -> StringResult {
-    let mut table_config =
-        create_nu_table_config(opts.config, opts.style_computer, &out, false, opts.mode);
-    let total_width = out.table.total_width(&table_config);
+fn maybe_expand_table(mut out: TableOutput, term_width: usize) -> StringResult {
+    let total_width = out.table.total_width();
     if total_width < term_width {
         const EXPAND_THRESHOLD: f32 = 0.80;
         let used_percent = total_width as f32 / term_width as f32;
         let need_expansion = total_width < term_width && used_percent > EXPAND_THRESHOLD;
         if need_expansion {
-            table_config.expand = true;
+            out.table.set_strategy(true);
         }
     }
 
-    Ok(out.table.draw(table_config, term_width))
+    let table = out.table.draw(term_width);
+
+    Ok(table)
 }
 
 fn set_data_styles(table: &mut NuTable, styles: HashMap<Position, TextStyle>) {
@@ -638,22 +620,21 @@ fn set_data_styles(table: &mut NuTable, styles: HashMap<Position, TextStyle>) {
     }
 }
 
-fn create_table_cfg(cfg: &Cfg<'_>, out: &TableOutput) -> crate::NuTableConfig {
-    create_nu_table_config(
-        cfg.opts.config,
-        cfg.opts.style_computer,
+fn table_apply_config(out: &mut TableOutput, cfg: &Cfg<'_>) {
+    configure_table(
         out,
-        false,
+        cfg.opts.config,
+        &cfg.opts.style_computer,
         cfg.opts.mode,
     )
 }
 
 fn value_to_string(value: &Value, cfg: &Cfg<'_>) -> String {
-    nu_value_to_string(value, cfg.opts.config, cfg.opts.style_computer).0
+    nu_value_to_string(value, cfg.opts.config, &cfg.opts.style_computer).0
 }
 
 fn value_to_string_clean(value: &Value, cfg: &Cfg<'_>) -> String {
-    nu_value_to_string_clean(value, cfg.opts.config, cfg.opts.style_computer).0
+    nu_value_to_string_clean(value, cfg.opts.config, &cfg.opts.style_computer).0
 }
 
 fn value_to_wrapped_string(value: &Value, cfg: &Cfg<'_>, value_width: usize) -> String {
@@ -661,13 +642,21 @@ fn value_to_wrapped_string(value: &Value, cfg: &Cfg<'_>, value_width: usize) ->
 }
 
 fn value_to_wrapped_string_clean(value: &Value, cfg: &Cfg<'_>, value_width: usize) -> String {
-    let text = nu_value_to_string_colored(value, cfg.opts.config, cfg.opts.style_computer);
+    let text = nu_value_to_string_colored(value, cfg.opts.config, &cfg.opts.style_computer);
     wrap_text(&text, value_width, cfg.opts.config)
 }
 
-fn update_config(cfg: Cfg<'_>, width: usize) -> Cfg<'_> {
-    let mut inner_cfg = cfg.clone();
-    inner_cfg.opts.width = width;
-    inner_cfg.opts.index_offset = 0;
-    inner_cfg
+fn cfg_expand_next_level(mut cfg: Cfg<'_>, span: Span) -> Cfg<'_> {
+    cfg.opts.span = span;
+    if let Some(deep) = cfg.format.expand_limit.as_mut() {
+        *deep -= 1
+    }
+
+    cfg
+}
+
+fn cfg_expand_reset_table(mut cfg: Cfg<'_>, width: usize) -> Cfg<'_> {
+    cfg.opts.width = width;
+    cfg.opts.index_offset = 0;
+    cfg
 }
diff --git a/crates/nu-table/src/types/general.rs b/crates/nu-table/src/types/general.rs
index e748b6eff2..c2ac2a00e4 100644
--- a/crates/nu-table/src/types/general.rs
+++ b/crates/nu-table/src/types/general.rs
@@ -1,21 +1,22 @@
-use super::has_index;
-use crate::{
-    clean_charset, colorize_space,
-    common::{
-        create_nu_table_config, get_empty_style, get_header_style, get_index_style,
-        get_value_style, nu_value_to_string_colored, NuText, INDEX_COLUMN_NAME,
-    },
-    NuTable, NuTableCell, StringResult, TableOpts, TableOutput, TableResult,
-};
 use nu_color_config::TextStyle;
 use nu_engine::column::get_columns;
 use nu_protocol::{Config, Record, ShellError, Value};
 
+use crate::{
+    clean_charset, colorize_space,
+    common::{
+        check_value, configure_table, get_empty_style, get_header_style, get_index_style,
+        get_value_style, nu_value_to_string_colored, NuText, INDEX_COLUMN_NAME,
+    },
+    types::has_index,
+    NuRecordsValue, NuTable, StringResult, TableOpts, TableOutput, TableResult,
+};
+
 pub struct JustTable;
 
 impl JustTable {
     pub fn table(input: &[Value], opts: TableOpts<'_>) -> StringResult {
-        create_table(input, opts)
+        list_table(input, opts)
     }
 
     pub fn kv_table(record: &Record, opts: TableOpts<'_>) -> StringResult {
@@ -23,32 +24,32 @@ impl JustTable {
     }
 }
 
-fn create_table(input: &[Value], opts: TableOpts<'_>) -> Result<Option<String>, ShellError> {
-    match table(input, &opts)? {
-        Some(mut out) => {
-            let left = opts.config.table.padding.left;
-            let right = opts.config.table.padding.right;
-            out.table.set_indent(left, right);
+fn list_table(input: &[Value], opts: TableOpts<'_>) -> Result<Option<String>, ShellError> {
+    let mut out = match create_table(input, &opts)? {
+        Some(out) => out,
+        None => return Ok(None),
+    };
 
-            colorize_space(out.table.get_records_mut(), opts.style_computer);
+    out.table.set_indent(opts.config.table.padding);
 
-            let table_config =
-                create_nu_table_config(opts.config, opts.style_computer, &out, false, opts.mode);
-            Ok(out.table.draw(table_config, opts.width))
-        }
-        None => Ok(None),
-    }
+    colorize_space(out.table.get_records_mut(), &opts.style_computer);
+
+    configure_table(&mut out, opts.config, &opts.style_computer, opts.mode);
+    let table = out.table.draw(opts.width);
+
+    Ok(table)
 }
 
 fn kv_table(record: &Record, opts: TableOpts<'_>) -> StringResult {
     let mut data = vec![Vec::with_capacity(2); record.len()];
+
     for ((column, value), row) in record.iter().zip(data.iter_mut()) {
         opts.signals.check(opts.span)?;
 
-        let value = nu_value_to_string_colored(value, opts.config, opts.style_computer);
+        let key = NuRecordsValue::new(column.to_string());
 
-        let key = NuTableCell::new(column.to_string());
-        let value = NuTableCell::new(value);
+        let value = nu_value_to_string_colored(value, opts.config, &opts.style_computer);
+        let value = NuRecordsValue::new(value);
 
         row.push(key);
         row.push(value);
@@ -56,125 +57,144 @@ fn kv_table(record: &Record, opts: TableOpts<'_>) -> StringResult {
 
     let mut table = NuTable::from(data);
     table.set_index_style(TextStyle::default_field());
-    let count_rows = table.count_rows();
+    table.set_indent(opts.config.table.padding);
 
-    let mut out = TableOutput::new(table, false, true, count_rows);
-
-    let left = opts.config.table.padding.left;
-    let right = opts.config.table.padding.right;
-    out.table.set_indent(left, right);
-
-    let table_config =
-        create_nu_table_config(opts.config, opts.style_computer, &out, false, opts.mode);
-    let table = out.table.draw(table_config, opts.width);
+    let mut out = TableOutput::from_table(table, false, true);
+    configure_table(&mut out, opts.config, &opts.style_computer, opts.mode);
+    let table = out.table.draw(opts.width);
 
     Ok(table)
 }
 
-fn table(input: &[Value], opts: &TableOpts<'_>) -> TableResult {
+fn create_table(input: &[Value], opts: &TableOpts<'_>) -> TableResult {
     if input.is_empty() {
         return Ok(None);
     }
 
-    let mut headers = get_columns(input);
+    let headers = get_columns(input);
     let with_index = has_index(opts, &headers);
+    let with_header = !headers.is_empty();
     let row_offset = opts.index_offset;
 
-    let with_header = !headers.is_empty();
-    if !with_header {
-        let table = to_table_with_no_header(input, with_index, row_offset, opts)?;
-        let table = table.map(|table| {
-            let count_rows = table.count_rows();
-            TableOutput::new(table, false, with_index, count_rows)
-        });
-        return Ok(table);
-    }
+    let table = match (with_header, with_index) {
+        (true, true) => create_table_with_header_and_index(input, headers, row_offset, opts)?,
+        (true, false) => create_table_with_header(input, headers, opts)?,
+        (false, true) => create_table_with_no_header_and_index(input, row_offset, opts)?,
+        (false, false) => create_table_with_no_header(input, opts)?,
+    };
 
-    if with_header && with_index {
-        headers.insert(0, "#".into());
-    }
-
-    // The header with the INDEX is removed from the table headers since
-    // it is added to the natural table index
-    let headers: Vec<_> = headers
-        .into_iter()
-        .filter(|header| header != INDEX_COLUMN_NAME)
-        .collect();
-
-    let table = to_table_with_header(input, &headers, with_index, row_offset, opts)?;
-    let table = table.map(|table| {
-        let count_rows = table.count_rows();
-        TableOutput::new(table, true, with_index, count_rows)
-    });
+    let table = table.map(|table| TableOutput::from_table(table, with_header, with_index));
 
     Ok(table)
 }
 
-fn to_table_with_header(
+fn create_table_with_header(
     input: &[Value],
-    headers: &[String],
-    with_index: bool,
-    row_offset: usize,
+    headers: Vec<String>,
     opts: &TableOpts<'_>,
 ) -> Result<Option<NuTable>, ShellError> {
+    let headers = collect_headers(headers, false);
+
     let count_rows = input.len() + 1;
     let count_columns = headers.len();
     let mut table = NuTable::new(count_rows, count_columns);
-    table.set_header_style(get_header_style(opts.style_computer));
-    table.set_index_style(get_index_style(opts.style_computer));
 
-    for (i, text) in headers.iter().enumerate() {
-        table.insert((0, i), text.to_owned());
-    }
+    table.set_header_style(get_header_style(&opts.style_computer));
+    table.set_index_style(get_index_style(&opts.style_computer));
+
+    table.set_row(0, headers.clone());
 
     for (row, item) in input.iter().enumerate() {
         opts.signals.check(opts.span)?;
+        check_value(item)?;
 
-        if let Value::Error { error, .. } = item {
-            return Err(*error.clone());
-        }
+        for (col, header) in headers.iter().enumerate() {
+            let (text, style) = get_string_value_with_header(item, header.as_ref(), opts);
 
-        if with_index {
-            let text = get_table_row_index(item, opts.config, row, row_offset);
-            table.insert((row + 1, 0), text);
-        }
-
-        let skip_index = usize::from(with_index);
-        for (col, header) in headers.iter().enumerate().skip(skip_index) {
-            let (text, style) = get_string_value_with_header(item, header, opts);
-
-            table.insert((row + 1, col), text);
-            table.insert_style((row + 1, col), style);
+            let pos = (row + 1, col);
+            table.insert(pos, text);
+            table.insert_style(pos, style);
         }
     }
 
     Ok(Some(table))
 }
 
-fn to_table_with_no_header(
+fn create_table_with_header_and_index(
     input: &[Value],
-    with_index: bool,
+    headers: Vec<String>,
     row_offset: usize,
     opts: &TableOpts<'_>,
 ) -> Result<Option<NuTable>, ShellError> {
-    let mut table = NuTable::new(input.len(), with_index as usize + 1);
-    table.set_index_style(get_index_style(opts.style_computer));
+    let headers = collect_headers(headers, true);
+
+    let count_rows = input.len() + 1;
+    let count_columns = headers.len();
+    let mut table = NuTable::new(count_rows, count_columns);
+
+    table.set_header_style(get_header_style(&opts.style_computer));
+    table.set_index_style(get_index_style(&opts.style_computer));
+
+    table.set_row(0, headers.clone());
 
     for (row, item) in input.iter().enumerate() {
         opts.signals.check(opts.span)?;
+        check_value(item)?;
 
-        if let Value::Error { error, .. } = item {
-            return Err(*error.clone());
-        }
+        let text = get_table_row_index(item, opts.config, row, row_offset);
+        table.insert((row + 1, 0), text);
 
-        if with_index {
-            let text = get_table_row_index(item, opts.config, row, row_offset);
-            table.insert((row, 0), text);
+        for (col, header) in headers.iter().enumerate().skip(1) {
+            let (text, style) = get_string_value_with_header(item, header.as_ref(), opts);
+
+            let pos = (row + 1, col);
+            table.insert(pos, text);
+            table.insert_style(pos, style);
         }
+    }
+
+    Ok(Some(table))
+}
+
+fn create_table_with_no_header(
+    input: &[Value],
+    opts: &TableOpts<'_>,
+) -> Result<Option<NuTable>, ShellError> {
+    let mut table = NuTable::new(input.len(), 1);
+    table.set_index_style(get_index_style(&opts.style_computer));
+
+    for (row, item) in input.iter().enumerate() {
+        opts.signals.check(opts.span)?;
+        check_value(item)?;
 
         let (text, style) = get_string_value(item, opts);
 
-        let pos = (row, with_index as usize);
+        let pos = (row, 0);
+        table.insert(pos, text);
+        table.insert_style(pos, style);
+    }
+
+    Ok(Some(table))
+}
+
+fn create_table_with_no_header_and_index(
+    input: &[Value],
+    row_offset: usize,
+    opts: &TableOpts<'_>,
+) -> Result<Option<NuTable>, ShellError> {
+    let mut table = NuTable::new(input.len(), 1 + 1);
+    table.set_index_style(get_index_style(&opts.style_computer));
+
+    for (row, item) in input.iter().enumerate() {
+        opts.signals.check(opts.span)?;
+        check_value(item)?;
+
+        let text = get_table_row_index(item, opts.config, row, row_offset);
+        table.insert((row, 0), text);
+
+        let (text, style) = get_string_value(item, opts);
+
+        let pos = (row, 1);
         table.insert(pos, text);
         table.insert_style(pos, style);
     }
@@ -186,16 +206,17 @@ fn get_string_value_with_header(item: &Value, header: &str, opts: &TableOpts) ->
     match item {
         Value::Record { val, .. } => match val.get(header) {
             Some(value) => get_string_value(value, opts),
-            None => get_empty_style(opts.style_computer),
+            None => get_empty_style(&opts.style_computer),
         },
         value => get_string_value(value, opts),
     }
 }
 
 fn get_string_value(item: &Value, opts: &TableOpts) -> NuText {
-    let (mut text, style) = get_value_style(item, opts.config, opts.style_computer);
-    let is_string_value = matches!(item, Value::String { .. });
-    if is_string_value {
+    let (mut text, style) = get_value_style(item, opts.config, &opts.style_computer);
+
+    let is_string = matches!(item, Value::String { .. });
+    if is_string {
         text = clean_charset(&text);
     }
 
@@ -211,3 +232,24 @@ fn get_table_row_index(item: &Value, config: &Config, row: usize, offset: usize)
         _ => (row + offset).to_string(),
     }
 }
+
+fn collect_headers(headers: Vec<String>, index: bool) -> Vec<NuRecordsValue> {
+    // The header with the INDEX is removed from the table headers since
+    // it is added to the natural table index
+
+    if !index {
+        headers
+            .into_iter()
+            .filter(|header| header != INDEX_COLUMN_NAME)
+            .map(NuRecordsValue::new)
+            .collect()
+    } else {
+        let mut v = Vec::with_capacity(headers.len() + 1);
+        v.insert(0, NuRecordsValue::new("#".into()));
+        for text in headers {
+            v.push(NuRecordsValue::new(text));
+        }
+
+        v
+    }
+}
diff --git a/crates/nu-table/src/types/mod.rs b/crates/nu-table/src/types/mod.rs
index 829c87ed9e..16a1e85796 100644
--- a/crates/nu-table/src/types/mod.rs
+++ b/crates/nu-table/src/types/mod.rs
@@ -12,9 +12,14 @@ pub use expanded::ExpandedTable;
 pub use general::JustTable;
 
 pub struct TableOutput {
+    /// A table structure.
     pub table: NuTable,
+    /// A flag whether a header was present in the table.
     pub with_header: bool,
+    /// A flag whether a index was present in the table.
     pub with_index: bool,
+    /// The value may be bigger then table.count_rows(),
+    /// Specifically in case of expanded table we collect the whole structure size here.
     pub count_rows: usize,
 }
 
@@ -27,40 +32,43 @@ impl TableOutput {
             count_rows,
         }
     }
+    pub fn from_table(table: NuTable, with_header: bool, with_index: bool) -> Self {
+        let count_rows = table.count_rows();
+        Self::new(table, with_header, with_index, count_rows)
+    }
 }
 
 #[derive(Debug, Clone)]
 pub struct TableOpts<'a> {
-    signals: &'a Signals,
-    config: &'a Config,
-    style_computer: &'a StyleComputer<'a>,
-    span: Span,
-    width: usize,
-    indent: (usize, usize),
-    mode: TableMode,
-    index_offset: usize,
-    index_remove: bool,
+    pub signals: &'a Signals,
+    pub config: &'a Config,
+    pub style_computer: std::rc::Rc<StyleComputer<'a>>,
+    pub span: Span,
+    pub width: usize,
+    pub mode: TableMode,
+    pub index_offset: usize,
+    pub index_remove: bool,
 }
 
 impl<'a> TableOpts<'a> {
     #[allow(clippy::too_many_arguments)]
     pub fn new(
         config: &'a Config,
-        style_computer: &'a StyleComputer<'a>,
+        style_computer: StyleComputer<'a>,
         signals: &'a Signals,
         span: Span,
         width: usize,
-        indent: (usize, usize),
         mode: TableMode,
         index_offset: usize,
         index_remove: bool,
     ) -> Self {
+        let style_computer = std::rc::Rc::new(style_computer);
+
         Self {
             signals,
             config,
             style_computer,
             span,
-            indent,
             width,
             mode,
             index_offset,
diff --git a/crates/nu-table/src/unstructured_table.rs b/crates/nu-table/src/unstructured_table.rs
index 6f9c741e9b..be722c5e51 100644
--- a/crates/nu-table/src/unstructured_table.rs
+++ b/crates/nu-table/src/unstructured_table.rs
@@ -1,19 +1,21 @@
-use crate::{string_width, string_wrap, TableTheme};
 use nu_color_config::StyleComputer;
-use nu_protocol::{Config, Record, Span, Value};
+use nu_protocol::{Config, Record, Span, TableIndent, Value};
+
 use tabled::{
     grid::{
-        ansi::{ANSIBuf, ANSIStr},
-        config::{AlignmentHorizontal, Borders, CompactMultilineConfig},
+        ansi::ANSIStr,
+        config::{Borders, CompactMultilineConfig},
         dimension::{DimensionPriority, PoolTableDimension},
     },
-    settings::{Color, Padding, TableOption, Theme},
+    settings::{Alignment, Color, Padding, TableOption},
     tables::{PoolTable, TableValue},
 };
 
+use crate::{is_color_empty, string_width, string_wrap, TableTheme};
+
 /// UnstructuredTable has a recursive table representation of nu_protocol::Value.
 ///
-/// It doesn't support alignment and a proper width control.
+/// It doesn't support alignment and a proper width control (although it's possible to achieve).
 pub struct UnstructuredTable {
     value: TableValue,
 }
@@ -26,7 +28,7 @@ impl UnstructuredTable {
 
     pub fn truncate(&mut self, theme: &TableTheme, width: usize) -> bool {
         let mut available = width;
-        let has_vertical = theme.has_left();
+        let has_vertical = theme.as_full().borders_has_left();
         if has_vertical {
             available = available.saturating_sub(2);
         }
@@ -34,55 +36,34 @@ impl UnstructuredTable {
         truncate_table_value(&mut self.value, has_vertical, available).is_none()
     }
 
-    pub fn draw(
-        self,
-        style_computer: &StyleComputer,
-        theme: &TableTheme,
-        indent: (usize, usize),
-    ) -> String {
-        build_table(self.value, style_computer, theme, indent)
+    pub fn draw(self, theme: &TableTheme, indent: TableIndent, style: &StyleComputer) -> String {
+        build_table(self.value, style, theme, indent)
     }
 }
 
 fn build_table(
     val: TableValue,
-    style_computer: &StyleComputer,
+    style: &StyleComputer,
     theme: &TableTheme,
-    indent: (usize, usize),
+    indent: TableIndent,
 ) -> String {
     let mut table = PoolTable::from(val);
 
-    let mut theme = theme.get_theme_full();
+    let mut theme = theme.as_full().clone();
     theme.set_horizontal_lines(Default::default());
 
-    table.with(Padding::new(indent.0, indent.1, 0, 0));
-    table.with(SetRawStyle(theme));
-    table.with(SetAlignment(AlignmentHorizontal::Left));
+    table.with(Padding::new(indent.left, indent.right, 0, 0));
+    table.with(*theme.get_borders());
+    table.with(Alignment::left());
     table.with(PoolTableDimension::new(
         DimensionPriority::Last,
         DimensionPriority::Last,
     ));
 
-    // color_config closures for "separator" are just given a null.
-    let color = style_computer.compute("separator", &Value::nothing(Span::unknown()));
-    let color = color.paint(" ").to_string();
-    if let Ok(color) = Color::try_from(color) {
-        // # SAFETY
-        //
-        // It's perfectly save to do cause table does not store the reference internally.
-        // We just need this unsafe section to cope with some limitations of [`PoolTable`].
-        // Mitigation of this is definitely on a todo list.
-
-        let color: ANSIBuf = color.into();
-        let prefix = color.get_prefix();
-        let suffix = color.get_suffix();
-        let prefix: &'static str = unsafe { std::mem::transmute(prefix) };
-        let suffix: &'static str = unsafe { std::mem::transmute(suffix) };
-
-        table.with(SetBorderColor(ANSIStr::new(prefix, suffix)));
-        let table = table.to_string();
-
-        return table;
+    if let Some(color) = get_border_color(style) {
+        if !is_color_empty(&color) {
+            return build_table_with_border_color(table, color);
+        }
     }
 
     table.to_string()
@@ -99,76 +80,74 @@ fn convert_nu_value_to_table_value(value: Value, config: &Config) -> TableValue
                 build_vertical_array(vals, config)
             }
         }
-        value => {
-            let mut text = value.to_abbreviated_string(config);
-            if string_width(&text) > 50 {
-                text = string_wrap(&text, 30, false);
-            }
-
-            TableValue::Cell(text)
-        }
+        value => build_string_value(value, config),
     }
 }
 
-fn build_vertical_map(record: Record, config: &Config) -> TableValue {
-    let mut rows = Vec::with_capacity(record.len());
-    for (key, value) in record {
-        let val = convert_nu_value_to_table_value(value, config);
-        let row = TableValue::Row(vec![TableValue::Cell(key), val]);
-        rows.push(row);
+fn build_string_value(value: Value, config: &Config) -> TableValue {
+    const MAX_STRING_WIDTH: usize = 50;
+    const WRAP_STRING_WIDTH: usize = 30;
+
+    let mut text = value.to_abbreviated_string(config);
+    if string_width(&text) > MAX_STRING_WIDTH {
+        text = string_wrap(&text, WRAP_STRING_WIDTH, false);
     }
 
-    let max_key_width = rows
+    TableValue::Cell(text)
+}
+
+fn build_vertical_map(record: Record, config: &Config) -> TableValue {
+    let max_key_width = record
         .iter()
-        .map(|row| match row {
-            TableValue::Row(list) => match &list[0] {
-                TableValue::Cell(key) => string_width(key),
-                _ => unreachable!(),
-            },
-            _ => unreachable!(),
-        })
+        .map(|(k, _)| string_width(k))
         .max()
         .unwrap_or(0);
 
-    rows.iter_mut().for_each(|row| {
-        match row {
-            TableValue::Row(list) => match &mut list[0] {
-                TableValue::Cell(key) => {
-                    let width = string_width(key);
-                    let rest = max_key_width - width;
-                    key.extend(std::iter::repeat(' ').take(rest));
-                }
-                _ => unreachable!(),
-            },
-            _ => unreachable!(),
-        };
-    });
+    let mut rows = Vec::with_capacity(record.len());
+    for (mut key, value) in record {
+        string_append_to_width(&mut key, max_key_width);
+
+        let value = convert_nu_value_to_table_value(value, config);
+
+        let row = TableValue::Row(vec![TableValue::Cell(key), value]);
+        rows.push(row);
+    }
 
     TableValue::Column(rows)
 }
 
+fn string_append_to_width(key: &mut String, max: usize) {
+    let width = string_width(key);
+    let rest = max - width;
+    key.extend(std::iter::repeat(' ').take(rest));
+}
+
 fn build_vertical_array(vals: Vec<Value>, config: &Config) -> TableValue {
     let map = vals
         .into_iter()
         .map(|val| convert_nu_value_to_table_value(val, config))
-        .collect::<Vec<_>>();
+        .collect();
 
     TableValue::Column(map)
 }
 
 fn is_valid_record(vals: &[Value]) -> bool {
-    let mut first_record: Option<&Record> = None;
-    for val in vals {
+    if vals.is_empty() {
+        return true;
+    }
+
+    let first_value = match &vals[0] {
+        Value::Record { val, .. } => val,
+        _ => return false,
+    };
+
+    for val in &vals[1..] {
         match val {
             Value::Record { val, .. } => {
-                if let Some(known) = first_record {
-                    let equal = known.columns().eq(val.columns());
-                    if !equal {
-                        return false;
-                    }
-                } else {
-                    first_record = Some(val)
-                };
+                let equal = val.columns().eq(first_value.columns());
+                if !equal {
+                    return false;
+                }
             }
             _ => return false,
         }
@@ -185,30 +164,41 @@ fn count_columns_in_record(vals: &[Value]) -> usize {
 }
 
 fn build_map_from_record(vals: Vec<Value>, config: &Config) -> TableValue {
-    let mut list = vec![];
+    // assumes that we have a valid record structure (checked by is_valid_record)
 
     let head = get_columns_in_record(&vals);
-    let count_columns = head.len();
+    let mut list = Vec::with_capacity(head.len());
     for col in head {
-        list.push(vec![TableValue::Cell(col)]);
+        list.push(TableValue::Column(vec![TableValue::Cell(col)]));
     }
 
     for val in vals {
-        match val {
-            Value::Record { val, .. } => {
-                for (i, (_key, val)) in val.into_owned().into_iter().take(count_columns).enumerate()
-                {
-                    let cell = convert_nu_value_to_table_value(val, config);
-                    list[i].push(cell);
-                }
-            }
-            _ => unreachable!(),
+        let val = get_as_record(val);
+        for (i, (_, val)) in val.into_owned().into_iter().enumerate() {
+            let value = convert_nu_value_to_table_value(val, config);
+            let list = get_table_value_column_mut(&mut list[i]);
+
+            list.push(value);
         }
     }
 
-    let columns = list.into_iter().map(TableValue::Column).collect::<Vec<_>>();
+    TableValue::Row(list)
+}
 
-    TableValue::Row(columns)
+fn get_table_value_column_mut(val: &mut TableValue) -> &mut Vec<TableValue> {
+    match val {
+        TableValue::Column(row) => row,
+        _ => {
+            unreachable!();
+        }
+    }
+}
+
+fn get_as_record(val: Value) -> nu_utils::SharedCow<Record> {
+    match val {
+        Value::Record { val, .. } => val,
+        _ => unreachable!(),
+    }
 }
 
 fn get_columns_in_record(vals: &[Value]) -> Vec<String> {
@@ -218,32 +208,6 @@ fn get_columns_in_record(vals: &[Value]) -> Vec<String> {
     }
 }
 
-struct SetRawStyle(Theme);
-
-impl<R, D> TableOption<R, CompactMultilineConfig, D> for SetRawStyle {
-    fn change(self, _: &mut R, cfg: &mut CompactMultilineConfig, _: &mut D) {
-        let borders = *self.0.get_borders();
-        cfg.set_borders(borders);
-    }
-}
-
-struct SetBorderColor(ANSIStr<'static>);
-
-impl<R, D> TableOption<R, CompactMultilineConfig, D> for SetBorderColor {
-    fn change(self, _: &mut R, cfg: &mut CompactMultilineConfig, _: &mut D) {
-        let borders = Borders::filled(self.0);
-        cfg.set_borders_color(borders);
-    }
-}
-
-struct SetAlignment(AlignmentHorizontal);
-
-impl<R, D> TableOption<R, CompactMultilineConfig, D> for SetAlignment {
-    fn change(self, _: &mut R, cfg: &mut CompactMultilineConfig, _: &mut D) {
-        cfg.set_alignment_horizontal(self.0);
-    }
-}
-
 fn truncate_table_value(
     value: &mut TableValue,
     has_vertical: bool,
@@ -348,3 +312,44 @@ fn truncate_table_value(
         }
     }
 }
+
+fn build_table_with_border_color(mut table: PoolTable, color: Color) -> String {
+    // NOTE: We have this function presizely because of color_into_ansistr internals
+    // color must be alive  why we build table
+
+    let color = color_into_ansistr(&color);
+    table.with(SetBorderColor(color));
+    table.to_string()
+}
+
+fn color_into_ansistr(color: &Color) -> ANSIStr<'static> {
+    // # SAFETY
+    //
+    // It's perfectly save to do cause table does not store the reference internally.
+    // We just need this unsafe section to cope with some limitations of [`PoolTable`].
+    // Mitigation of this is definitely on a todo list.
+
+    let prefix = color.get_prefix();
+    let suffix = color.get_suffix();
+    let prefix: &'static str = unsafe { std::mem::transmute(prefix) };
+    let suffix: &'static str = unsafe { std::mem::transmute(suffix) };
+
+    ANSIStr::new(prefix, suffix)
+}
+
+struct SetBorderColor(ANSIStr<'static>);
+
+impl<R, D> TableOption<R, CompactMultilineConfig, D> for SetBorderColor {
+    fn change(self, _: &mut R, cfg: &mut CompactMultilineConfig, _: &mut D) {
+        let borders = Borders::filled(self.0);
+        cfg.set_borders_color(borders);
+    }
+}
+
+fn get_border_color(style: &StyleComputer<'_>) -> Option<Color> {
+    // color_config closures for "separator" are just given a null.
+    let color = style.compute("separator", &Value::nothing(Span::unknown()));
+    let color = color.paint(" ").to_string();
+    let color = Color::try_from(color);
+    color.ok()
+}
diff --git a/crates/nu-table/src/util.rs b/crates/nu-table/src/util.rs
index feb9a59616..4e4d06f52d 100644
--- a/crates/nu-table/src/util.rs
+++ b/crates/nu-table/src/util.rs
@@ -1,12 +1,15 @@
 use nu_color_config::StyleComputer;
+
 use tabled::{
-    builder::Builder,
     grid::{
         ansi::{ANSIBuf, ANSIStr},
         records::vec_records::Text,
         util::string::get_text_width,
     },
-    settings::{width::Truncate, Color, Modify, Padding, Style, Width},
+    settings::{
+        width::{Truncate, Wrap},
+        Color,
+    },
 };
 
 use crate::common::get_leading_trailing_space_style;
@@ -16,34 +19,21 @@ pub fn string_width(text: &str) -> usize {
 }
 
 pub fn string_wrap(text: &str, width: usize, keep_words: bool) -> String {
-    // todo: change me...
-    //
-    // well... it's not efficient to build a table to wrap a string,
-    // but ... it's better than a copy paste (is it?)
-
     if text.is_empty() {
         return String::new();
     }
 
-    let wrap = if keep_words {
-        Width::wrap(width).keep_words(true)
-    } else {
-        Width::wrap(width)
-    };
+    let text_width = string_width(text);
+    if text_width <= width {
+        return text.to_owned();
+    }
 
-    Builder::from_iter([[text]])
-        .build()
-        .with(Style::empty())
-        .with(Padding::zero())
-        .with(Modify::new((0, 0)).with(wrap))
-        .to_string()
+    Wrap::wrap(text, width, keep_words)
 }
 
 pub fn string_truncate(text: &str, width: usize) -> String {
-    // todo: change me...
-
     let line = match text.lines().next() {
-        Some(first_line) => first_line,
+        Some(line) => line,
         None => return String::new(),
     };
 
@@ -51,35 +41,77 @@ pub fn string_truncate(text: &str, width: usize) -> String {
 }
 
 pub fn clean_charset(text: &str) -> String {
-    // todo: optimize, I bet it can be done in 1 path
-    text.replace('\t', "    ").replace('\r', "")
+    // TODO: We could make an optimization to take a String and modify it
+    //       We could check if there was any changes and if not make no allocations at all and don't change the origin.
+    //       Why it's not done...
+    //       Cause I am not sure how the `if` in a loop will affect performance.
+    //       So it's better be profiled, but likely the optimization be worth it.
+    //       At least because it's a base case where we won't change anything....
+
+    // allocating at least the text size,
+    // in most cases the buf will be a copy of text anyhow.
+    //
+    // but yes sometimes we will alloc more then necessary.
+    // We could shrink it but...it will be another realloc which make no scense.
+    let mut buf = String::with_capacity(text.len());
+
+    for c in text.chars() {
+        if c == '\n' {
+            buf.push(c);
+            continue;
+        }
+
+        if c == '\t' {
+            buf.push(' ');
+            buf.push(' ');
+            buf.push(' ');
+            buf.push(' ');
+            continue;
+        }
+
+        // note: Overall maybe we shall delete this check?
+        // it was made in order to cope with emojie issue.
+        // if c < ' ' && c != '\u{1b}' {
+        //    continue;
+        // }
+
+        buf.push(c);
+    }
+
+    buf
 }
 
 pub fn colorize_space(data: &mut [Vec<Text<String>>], style_computer: &StyleComputer<'_>) {
-    if let Some(style) = get_leading_trailing_space_style(style_computer).color_style {
-        let style = ANSIBuf::from(convert_style(style));
-        let style = style.as_ref();
-        colorize_lead_trail_space(data, Some(style), Some(style));
-    }
-}
+    let style = match get_leading_trailing_space_style(style_computer).color_style {
+        Some(color) => color,
+        None => return,
+    };
 
-pub fn colorize_space_str(text: &mut String, style_computer: &StyleComputer<'_>) {
-    if let Some(style) = get_leading_trailing_space_style(style_computer).color_style {
-        let style = ANSIBuf::from(convert_style(style));
-        let style = style.as_ref();
-        *text = colorize_space_one(text, Some(style), Some(style));
-    }
-}
-
-fn colorize_lead_trail_space(
-    data: &mut [Vec<Text<String>>],
-    lead: Option<ANSIStr<'_>>,
-    trail: Option<ANSIStr<'_>>,
-) {
-    if lead.is_none() && trail.is_none() {
+    let style = ANSIBuf::from(convert_style(style));
+    let style = style.as_ref();
+    if style.is_empty() {
         return;
     }
 
+    colorize_list(data, style, style);
+}
+
+pub fn colorize_space_str(text: &mut String, style_computer: &StyleComputer<'_>) {
+    let style = match get_leading_trailing_space_style(style_computer).color_style {
+        Some(color) => color,
+        None => return,
+    };
+
+    let style = ANSIBuf::from(convert_style(style));
+    let style = style.as_ref();
+    if style.is_empty() {
+        return;
+    }
+
+    *text = colorize_space_one(text, style, style);
+}
+
+fn colorize_list(data: &mut [Vec<Text<String>>], lead: ANSIStr<'_>, trail: ANSIStr<'_>) {
     for row in data.iter_mut() {
         for cell in row {
             let buf = colorize_space_one(cell.as_ref(), lead, trail);
@@ -88,7 +120,7 @@ fn colorize_lead_trail_space(
     }
 }
 
-fn colorize_space_one(text: &str, lead: Option<ANSIStr<'_>>, trail: Option<ANSIStr<'_>>) -> String {
+fn colorize_space_one(text: &str, lead: ANSIStr<'_>, trail: ANSIStr<'_>) -> String {
     use fancy_regex::Captures;
     use fancy_regex::Regex;
     use std::sync::LazyLock;
@@ -102,20 +134,20 @@ fn colorize_space_one(text: &str, lead: Option<ANSIStr<'_>>, trail: Option<ANSIS
 
     let mut buf = text.to_owned();
 
-    if let Some(color) = &lead {
+    if !lead.is_empty() {
         buf = RE_LEADING
             .replace_all(&buf, |cap: &Captures| {
                 let spaces = cap.get(1).expect("valid").as_str();
-                format!("{}{}{}", color.get_prefix(), spaces, color.get_suffix())
+                format!("{}{}{}", lead.get_prefix(), spaces, lead.get_suffix())
             })
             .into_owned();
     }
 
-    if let Some(color) = &trail {
+    if !trail.is_empty() {
         buf = RE_TRAILING
             .replace_all(&buf, |cap: &Captures| {
                 let spaces = cap.get(1).expect("valid").as_str();
-                format!("{}{}{}", color.get_prefix(), spaces, color.get_suffix())
+                format!("{}{}{}", trail.get_prefix(), spaces, trail.get_suffix())
             })
             .into_owned();
     }
@@ -126,3 +158,7 @@ fn colorize_space_one(text: &str, lead: Option<ANSIStr<'_>>, trail: Option<ANSIS
 pub fn convert_style(style: nu_ansi_term::Style) -> Color {
     Color::new(style.prefix().to_string(), style.suffix().to_string())
 }
+
+pub fn is_color_empty(c: &Color) -> bool {
+    c.get_prefix().is_empty() && c.get_suffix().is_empty()
+}
diff --git a/crates/nu-table/tests/common.rs b/crates/nu-table/tests/common.rs
index e5c97108f2..f4ecc4641f 100644
--- a/crates/nu-table/tests/common.rs
+++ b/crates/nu-table/tests/common.rs
@@ -1,29 +1,79 @@
 #![allow(dead_code)]
 
-use nu_table::{string_width, NuTable, NuTableConfig};
+use nu_protocol::TrimStrategy;
+use nu_table::{string_width, NuTable, TableTheme};
 use tabled::grid::records::vec_records::Text;
 
+#[derive(Debug, Clone)]
 pub struct TestCase {
-    cfg: NuTableConfig,
+    theme: TableTheme,
+    with_header: bool,
+    with_footer: bool,
+    with_index: bool,
+    expand: bool,
+    strategy: TrimStrategy,
     termwidth: usize,
     expected: Option<String>,
 }
 
 impl TestCase {
-    pub fn new(cfg: NuTableConfig, termwidth: usize, expected: Option<String>) -> Self {
+    pub fn new(termwidth: usize) -> Self {
         Self {
-            cfg,
             termwidth,
-            expected,
+            expected: None,
+            theme: TableTheme::basic(),
+            with_header: false,
+            with_footer: false,
+            with_index: false,
+            expand: false,
+            strategy: TrimStrategy::truncate(None),
         }
     }
+
+    pub fn expected(mut self, value: Option<String>) -> Self {
+        self.expected = value;
+        self
+    }
+
+    pub fn theme(mut self, theme: TableTheme) -> Self {
+        self.theme = theme;
+        self
+    }
+
+    pub fn expand(mut self) -> Self {
+        self.expand = true;
+        self
+    }
+
+    pub fn header(mut self) -> Self {
+        self.with_header = true;
+        self
+    }
+
+    pub fn footer(mut self) -> Self {
+        self.with_footer = true;
+        self
+    }
+
+    pub fn index(mut self) -> Self {
+        self.with_index = true;
+        self
+    }
+
+    pub fn trim(mut self, trim: TrimStrategy) -> Self {
+        self.strategy = trim;
+        self
+    }
 }
 
 type Data = Vec<Vec<Text<String>>>;
 
-pub fn test_table<I: IntoIterator<Item = TestCase>>(data: Data, tests: I) {
+pub fn test_table<I>(data: Data, tests: I)
+where
+    I: IntoIterator<Item = TestCase>,
+{
     for (i, test) in tests.into_iter().enumerate() {
-        let actual = create_table(data.clone(), test.cfg.clone(), test.termwidth);
+        let actual = create_table(data.clone(), test.clone());
 
         assert_eq!(
             actual, test.expected,
@@ -37,9 +87,14 @@ pub fn test_table<I: IntoIterator<Item = TestCase>>(data: Data, tests: I) {
     }
 }
 
-pub fn create_table(data: Data, config: NuTableConfig, termwidth: usize) -> Option<String> {
-    let table = NuTable::from(data);
-    table.draw(config, termwidth)
+pub fn create_table(data: Data, case: TestCase) -> Option<String> {
+    let mut table = NuTable::from(data);
+    table.set_theme(case.theme);
+    table.set_structure(case.with_index, case.with_header, case.with_footer);
+    table.set_trim(case.strategy);
+    table.set_strategy(case.expand);
+
+    table.draw(case.termwidth)
 }
 
 pub fn create_row(count_columns: usize) -> Vec<Text<String>> {
diff --git a/crates/nu-table/tests/constrains.rs b/crates/nu-table/tests/constrains.rs
index e9df774976..98c908a118 100644
--- a/crates/nu-table/tests/constrains.rs
+++ b/crates/nu-table/tests/constrains.rs
@@ -1,20 +1,19 @@
 mod common;
 
-use common::{create_row, test_table, TestCase};
 use nu_protocol::TrimStrategy;
-use nu_table::{NuTable, NuTableConfig, TableTheme as theme};
+use nu_table::{NuTable, TableTheme as theme};
+
+use common::{create_row, test_table, TestCase};
+
 use tabled::grid::records::vec_records::Text;
 
 #[test]
 fn data_and_header_has_different_size_doesnt_work() {
-    let table = NuTable::from(vec![create_row(5), create_row(5), create_row(5)]);
-    let cfg = NuTableConfig {
-        theme: theme::heavy(),
-        with_header: true,
-        ..Default::default()
-    };
+    let mut table = NuTable::from(vec![create_row(5), create_row(5), create_row(5)]);
+    table.set_theme(theme::heavy());
+    table.set_structure(false, true, false);
 
-    let table = table.draw(cfg.clone(), usize::MAX);
+    let table = table.draw(usize::MAX);
 
     assert_eq!(
         table.as_deref(),
@@ -28,9 +27,11 @@ fn data_and_header_has_different_size_doesnt_work() {
         )
     );
 
-    let table = NuTable::from(vec![create_row(5), create_row(5), create_row(5)]);
+    let mut table = NuTable::from(vec![create_row(5), create_row(5), create_row(5)]);
+    table.set_theme(theme::heavy());
+    table.set_structure(false, true, false);
 
-    let table = table.draw(cfg, usize::MAX);
+    let table = table.draw(usize::MAX);
 
     assert_eq!(
         table.as_deref(),
@@ -47,30 +48,27 @@ fn data_and_header_has_different_size_doesnt_work() {
 
 #[test]
 fn termwidth_too_small() {
-    let test_loop = |config: NuTableConfig| {
-        for i in 0..10 {
-            let table = NuTable::from(vec![create_row(5), create_row(5), create_row(5)]);
-            let table = table.draw(config.clone(), i);
-
-            assert!(table.is_none());
-        }
-    };
-
-    let mut cfg = NuTableConfig {
-        theme: theme::heavy(),
-        with_header: true,
-        ..Default::default()
-    };
-
-    for case in [
+    let tests = [
         TrimStrategy::truncate(None),
         TrimStrategy::truncate(Some(String::from("**"))),
         TrimStrategy::truncate(Some(String::from(""))),
         TrimStrategy::wrap(false),
         TrimStrategy::wrap(true),
-    ] {
-        cfg.trim = case;
-        test_loop(cfg.clone());
+    ];
+
+    let data = vec![create_row(5), create_row(5), create_row(5)];
+
+    for case in tests {
+        for i in 0..10 {
+            let mut table = NuTable::from(data.clone());
+            table.set_theme(theme::heavy());
+            table.set_structure(false, true, false);
+            table.set_trim(case.clone());
+
+            let table = table.draw(i);
+
+            assert!(table.is_none());
+        }
     }
 }
 
@@ -195,30 +193,24 @@ fn width_control_test_0() {
 }
 
 fn test_width(data: Vec<Vec<Text<String>>>, tests: &[(usize, &str)]) {
-    let config = NuTableConfig {
-        theme: theme::heavy(),
-        trim: TrimStrategy::truncate(Some(String::from("..."))),
-        with_header: true,
-        ..Default::default()
-    };
-
     let tests = tests.iter().map(|&(termwidth, expected)| {
-        TestCase::new(config.clone(), termwidth, Some(expected.to_owned()))
+        TestCase::new(termwidth)
+            .theme(theme::heavy())
+            .trim(TrimStrategy::truncate(Some(String::from("..."))))
+            .header()
+            .expected(Some(expected.to_owned()))
     });
 
     test_table(data, tests);
 }
 
 fn test_trim(tests: &[(usize, Option<&str>)], trim: TrimStrategy) {
-    let config = NuTableConfig {
-        theme: theme::heavy(),
-        with_header: true,
-        trim,
-        ..Default::default()
-    };
-
     let tests = tests.iter().map(|&(termwidth, expected)| {
-        TestCase::new(config.clone(), termwidth, expected.map(|s| s.to_string()))
+        TestCase::new(termwidth)
+            .theme(theme::heavy())
+            .trim(trim.clone())
+            .header()
+            .expected(expected.map(|s| s.to_string()))
     });
 
     let data = vec![
diff --git a/crates/nu-table/tests/expand.rs b/crates/nu-table/tests/expand.rs
index c9101f3864..bf60f93852 100644
--- a/crates/nu-table/tests/expand.rs
+++ b/crates/nu-table/tests/expand.rs
@@ -1,20 +1,14 @@
 mod common;
 
-use common::{create_row, create_table};
+use common::{create_row, create_table, TestCase};
 
-use nu_table::{NuTableConfig, TableTheme as theme};
+use nu_table::TableTheme as theme;
 
 #[test]
 fn test_expand() {
     let table = create_table(
         vec![create_row(4); 3],
-        NuTableConfig {
-            theme: theme::rounded(),
-            with_header: true,
-            expand: true,
-            ..Default::default()
-        },
-        50,
+        TestCase::new(50).theme(theme::rounded()).header().expand(),
     );
 
     assert_eq!(
diff --git a/crates/nu-table/tests/style.rs b/crates/nu-table/tests/style.rs
index 942f7521ad..abbaf653f3 100644
--- a/crates/nu-table/tests/style.rs
+++ b/crates/nu-table/tests/style.rs
@@ -1,7 +1,7 @@
 mod common;
 
-use common::create_row as row;
-use nu_table::{NuTable, NuTableConfig, TableTheme as theme};
+use common::{create_row as row, TestCase};
+use nu_table::{NuTable, TableTheme as theme};
 use tabled::grid::records::vec_records::Text;
 
 #[test]
@@ -452,27 +452,18 @@ fn test_with_love() {
 }
 
 fn create_table(data: Vec<Vec<Text<String>>>, with_header: bool, theme: theme) -> String {
-    let config = NuTableConfig {
-        theme,
-        with_header,
-        ..Default::default()
-    };
+    let mut case = TestCase::new(usize::MAX).theme(theme);
+    if with_header {
+        case = case.header();
+    }
 
-    let out = common::create_table(data, config, usize::MAX);
-
-    out.expect("not expected to get None")
+    common::create_table(data, case).expect("not expected to get None")
 }
 
 fn create_table_with_size(data: Vec<Vec<Text<String>>>, with_header: bool, theme: theme) -> String {
-    let config = NuTableConfig {
-        theme,
-        with_header,
-        ..Default::default()
-    };
+    let mut table = NuTable::from(data);
+    table.set_theme(theme);
+    table.set_structure(false, with_header, false);
 
-    let table = NuTable::from(data);
-
-    table
-        .draw(config, usize::MAX)
-        .expect("not expected to get None")
+    table.draw(usize::MAX).expect("not expected to get None")
 }

From d36514a323e02e13cea7bedd7ee4b08d9550c09a Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Sat, 28 Dec 2024 22:49:25 +0100
Subject: [PATCH 0854/1072] Rename/deprecate `into bits` to `format bits`
 (#14634)

# Description
`into bits` is a bad name because it is not a traditional type cast to a
`bits` type like all the other `into` commands.

Instead it is a pretty printer generating `string` type output. Thus the
correct bucket is `format` and its subcommands.


# User-Facing Changes
`into bits` will raise a `DeprecatedWarning` suggesting the move to
`format bits`
`into bits` can be removed in `0.103.0`

# Tests + Formatting
All tests that relied on `into bits` have been updated to `format bits`
---
 crates/nu-cmd-extra/src/extra/bits/into.rs    | 154 ++---------
 crates/nu-cmd-extra/src/extra/mod.rs          |   1 +
 .../src/extra/strings/format/bits.rs          | 245 ++++++++++++++++++
 .../src/extra/strings/format/mod.rs           |   3 +
 .../commands/bits/{into.rs => format.rs}      |   4 +-
 .../nu-cmd-extra/tests/commands/bits/mod.rs   |   2 +-
 tests/repl/test_bits.rs                       |  39 +--
 7 files changed, 288 insertions(+), 160 deletions(-)
 create mode 100644 crates/nu-cmd-extra/src/extra/strings/format/bits.rs
 rename crates/nu-cmd-extra/tests/commands/bits/{into.rs => format.rs} (58%)

diff --git a/crates/nu-cmd-extra/src/extra/bits/into.rs b/crates/nu-cmd-extra/src/extra/bits/into.rs
index 3452c1eeee..631637a44e 100644
--- a/crates/nu-cmd-extra/src/extra/bits/into.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/into.rs
@@ -1,20 +1,6 @@
-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 {
-    cell_paths: Option<Vec<CellPath>>,
-}
-
-impl CmdArgument for Arguments {
-    fn take_cell_paths(&mut self) -> Option<Vec<CellPath>> {
-        self.cell_paths.take()
-    }
-}
+use nu_protocol::{report_parse_warning, ParseWarning};
 
 #[derive(Clone)]
 pub struct BitsInto;
@@ -42,15 +28,15 @@ impl Command for BitsInto {
                 SyntaxShape::CellPath,
                 "for a data structure input, convert data at the given cell paths",
             )
-            .category(Category::Conversions)
+            .category(Category::Deprecated)
     }
 
     fn description(&self) -> &str {
-        "Convert value to a binary primitive."
+        "Convert value to a binary string."
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["convert", "cast"]
+        vec![]
     }
 
     fn run(
@@ -60,7 +46,17 @@ impl Command for BitsInto {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        into_bits(engine_state, stack, call, input)
+        let head = call.head;
+        report_parse_warning(
+            &StateWorkingSet::new(engine_state),
+            &ParseWarning::DeprecatedWarning {
+                old_command: "into bits".into(),
+                new_suggestion: "use `format bits`".into(),
+                span: head,
+                url: "`help format bits`".into(),
+            },
+        );
+        crate::extra::strings::format::format_bits(engine_state, stack, call, input)
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -111,126 +107,6 @@ impl Command for BitsInto {
     }
 }
 
-fn into_bits(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let head = call.head;
-    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, metadata) = input {
-        Ok(PipelineData::ByteStream(
-            byte_stream_to_bits(stream, head),
-            metadata,
-        ))
-    } else {
-        let args = Arguments { cell_paths };
-        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)
-    }
-}
-
-fn convert_to_smallest_number_type(num: i64, span: Span) -> Value {
-    if let Some(v) = num.to_i8() {
-        let bytes = v.to_ne_bytes();
-        let mut raw_string = "".to_string();
-        for ch in bytes {
-            raw_string.push_str(&format!("{:08b} ", ch));
-        }
-        Value::string(raw_string.trim(), span)
-    } else if let Some(v) = num.to_i16() {
-        let bytes = v.to_ne_bytes();
-        let mut raw_string = "".to_string();
-        for ch in bytes {
-            raw_string.push_str(&format!("{:08b} ", ch));
-        }
-        Value::string(raw_string.trim(), span)
-    } else if let Some(v) = num.to_i32() {
-        let bytes = v.to_ne_bytes();
-        let mut raw_string = "".to_string();
-        for ch in bytes {
-            raw_string.push_str(&format!("{:08b} ", ch));
-        }
-        Value::string(raw_string.trim(), span)
-    } else {
-        let bytes = num.to_ne_bytes();
-        let mut raw_string = "".to_string();
-        for ch in bytes {
-            raw_string.push_str(&format!("{:08b} ", ch));
-        }
-        Value::string(raw_string.trim(), span)
-    }
-}
-
-pub fn action(input: &Value, _args: &Arguments, span: Span) -> Value {
-    match input {
-        Value::Binary { val, .. } => {
-            let mut raw_string = "".to_string();
-            for ch in val {
-                raw_string.push_str(&format!("{:08b} ", ch));
-            }
-            Value::string(raw_string.trim(), span)
-        }
-        Value::Int { val, .. } => convert_to_smallest_number_type(*val, span),
-        Value::Filesize { val, .. } => convert_to_smallest_number_type(val.get(), span),
-        Value::Duration { val, .. } => convert_to_smallest_number_type(*val, span),
-        Value::String { val, .. } => {
-            let raw_bytes = val.as_bytes();
-            let mut raw_string = "".to_string();
-            for ch in raw_bytes {
-                raw_string.push_str(&format!("{:08b} ", ch));
-            }
-            Value::string(raw_string.trim(), span)
-        }
-        Value::Bool { val, .. } => {
-            let v = <i64 as From<bool>>::from(*val);
-            convert_to_smallest_number_type(v, span)
-        }
-        // Propagate errors by explicitly matching them before the final case.
-        Value::Error { .. } => input.clone(),
-        other => Value::error(
-            ShellError::OnlySupportsThisInputType {
-                exp_input_type: "int, filesize, string, duration, binary, or bool".into(),
-                wrong_type: other.get_type().to_string(),
-                dst_span: span,
-                src_span: other.span(),
-            },
-            span,
-        ),
-    }
-}
-
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/crates/nu-cmd-extra/src/extra/mod.rs b/crates/nu-cmd-extra/src/extra/mod.rs
index 8204f1bd9a..0874824ac5 100644
--- a/crates/nu-cmd-extra/src/extra/mod.rs
+++ b/crates/nu-cmd-extra/src/extra/mod.rs
@@ -46,6 +46,7 @@ pub fn add_extra_command_context(mut engine_state: EngineState) -> EngineState {
 
         bind_command!(
             strings::format::FormatPattern,
+            strings::format::FormatBits,
             strings::str_::case::Str,
             strings::str_::case::StrCamelCase,
             strings::str_::case::StrKebabCase,
diff --git a/crates/nu-cmd-extra/src/extra/strings/format/bits.rs b/crates/nu-cmd-extra/src/extra/strings/format/bits.rs
new file mode 100644
index 0000000000..693c6905e8
--- /dev/null
+++ b/crates/nu-cmd-extra/src/extra/strings/format/bits.rs
@@ -0,0 +1,245 @@
+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;
+
+struct Arguments {
+    cell_paths: Option<Vec<CellPath>>,
+}
+
+impl CmdArgument for Arguments {
+    fn take_cell_paths(&mut self) -> Option<Vec<CellPath>> {
+        self.cell_paths.take()
+    }
+}
+
+#[derive(Clone)]
+pub struct FormatBits;
+
+impl Command for FormatBits {
+    fn name(&self) -> &str {
+        "format bits"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("format bits")
+            .input_output_types(vec![
+                (Type::Binary, Type::String),
+                (Type::Int, Type::String),
+                (Type::Filesize, Type::String),
+                (Type::Duration, Type::String),
+                (Type::String, Type::String),
+                (Type::Bool, Type::String),
+                (Type::table(), Type::table()),
+                (Type::record(), Type::record()),
+            ])
+            .allow_variants_without_examples(true) // TODO: supply exhaustive examples
+            .rest(
+                "rest",
+                SyntaxShape::CellPath,
+                "for a data structure input, convert data at the given cell paths",
+            )
+            .category(Category::Conversions)
+    }
+
+    fn description(&self) -> &str {
+        "Convert value to a string of binary data represented by 0 and 1."
+    }
+
+    fn search_terms(&self) -> Vec<&str> {
+        vec!["convert", "cast", "binary"]
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        format_bits(engine_state, stack, call, input)
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "convert a binary value into a string, padded to 8 places with 0s",
+                example: "0x[1] | format bits",
+                result: Some(Value::string("00000001",
+                    Span::test_data(),
+                )),
+            },
+            Example {
+                description: "convert an int into a string, padded to 8 places with 0s",
+                example: "1 | format bits",
+                result: Some(Value::string("00000001",
+                    Span::test_data(),
+                )),
+            },
+            Example {
+                description: "convert a filesize value into a string, padded to 8 places with 0s",
+                example: "1b | format bits",
+                result: Some(Value::string("00000001",
+                    Span::test_data(),
+                )),
+            },
+            Example {
+                description: "convert a duration value into a string, padded to 8 places with 0s",
+                example: "1ns | format bits",
+                result: Some(Value::string("00000001",
+                    Span::test_data(),
+                )),
+            },
+            Example {
+                description: "convert a boolean value into a string, padded to 8 places with 0s",
+                example: "true | format bits",
+                result: Some(Value::string("00000001",
+                    Span::test_data(),
+                )),
+            },
+            Example {
+                description: "convert a string into a raw binary string, padded with 0s to 8 places",
+                example: "'nushell.sh' | format bits",
+                result: Some(Value::string("01101110 01110101 01110011 01101000 01100101 01101100 01101100 00101110 01110011 01101000",
+                    Span::test_data(),
+                )),
+            },
+        ]
+    }
+}
+
+// TODO: crate public only during deprecation
+pub(crate) fn format_bits(
+    engine_state: &EngineState,
+    stack: &mut Stack,
+    call: &Call,
+    input: PipelineData,
+) -> Result<PipelineData, ShellError> {
+    let head = call.head;
+    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, metadata) = input {
+        Ok(PipelineData::ByteStream(
+            byte_stream_to_bits(stream, head),
+            metadata,
+        ))
+    } else {
+        let args = Arguments { cell_paths };
+        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)
+    }
+}
+
+fn convert_to_smallest_number_type(num: i64, span: Span) -> Value {
+    if let Some(v) = num.to_i8() {
+        let bytes = v.to_ne_bytes();
+        let mut raw_string = "".to_string();
+        for ch in bytes {
+            raw_string.push_str(&format!("{:08b} ", ch));
+        }
+        Value::string(raw_string.trim(), span)
+    } else if let Some(v) = num.to_i16() {
+        let bytes = v.to_ne_bytes();
+        let mut raw_string = "".to_string();
+        for ch in bytes {
+            raw_string.push_str(&format!("{:08b} ", ch));
+        }
+        Value::string(raw_string.trim(), span)
+    } else if let Some(v) = num.to_i32() {
+        let bytes = v.to_ne_bytes();
+        let mut raw_string = "".to_string();
+        for ch in bytes {
+            raw_string.push_str(&format!("{:08b} ", ch));
+        }
+        Value::string(raw_string.trim(), span)
+    } else {
+        let bytes = num.to_ne_bytes();
+        let mut raw_string = "".to_string();
+        for ch in bytes {
+            raw_string.push_str(&format!("{:08b} ", ch));
+        }
+        Value::string(raw_string.trim(), span)
+    }
+}
+
+fn action(input: &Value, _args: &Arguments, span: Span) -> Value {
+    match input {
+        Value::Binary { val, .. } => {
+            let mut raw_string = "".to_string();
+            for ch in val {
+                raw_string.push_str(&format!("{:08b} ", ch));
+            }
+            Value::string(raw_string.trim(), span)
+        }
+        Value::Int { val, .. } => convert_to_smallest_number_type(*val, span),
+        Value::Filesize { val, .. } => convert_to_smallest_number_type(val.get(), span),
+        Value::Duration { val, .. } => convert_to_smallest_number_type(*val, span),
+        Value::String { val, .. } => {
+            let raw_bytes = val.as_bytes();
+            let mut raw_string = "".to_string();
+            for ch in raw_bytes {
+                raw_string.push_str(&format!("{:08b} ", ch));
+            }
+            Value::string(raw_string.trim(), span)
+        }
+        Value::Bool { val, .. } => {
+            let v = <i64 as From<bool>>::from(*val);
+            convert_to_smallest_number_type(v, span)
+        }
+        // Propagate errors by explicitly matching them before the final case.
+        Value::Error { .. } => input.clone(),
+        other => Value::error(
+            ShellError::OnlySupportsThisInputType {
+                exp_input_type: "int, filesize, string, duration, binary, or bool".into(),
+                wrong_type: other.get_type().to_string(),
+                dst_span: span,
+                src_span: other.span(),
+            },
+            span,
+        ),
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_examples() {
+        use crate::test_examples;
+
+        test_examples(FormatBits {})
+    }
+}
diff --git a/crates/nu-cmd-extra/src/extra/strings/format/mod.rs b/crates/nu-cmd-extra/src/extra/strings/format/mod.rs
index 8692a912ff..8b8f45f188 100644
--- a/crates/nu-cmd-extra/src/extra/strings/format/mod.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/format/mod.rs
@@ -1,3 +1,6 @@
+mod bits;
 mod command;
 
 pub(crate) use command::FormatPattern;
+// TODO remove `format_bits` visibility after removal of into bits
+pub(crate) use bits::{format_bits, FormatBits};
diff --git a/crates/nu-cmd-extra/tests/commands/bits/into.rs b/crates/nu-cmd-extra/tests/commands/bits/format.rs
similarity index 58%
rename from crates/nu-cmd-extra/tests/commands/bits/into.rs
rename to crates/nu-cmd-extra/tests/commands/bits/format.rs
index b7e7700583..a06b6d8a68 100644
--- a/crates/nu-cmd-extra/tests/commands/bits/into.rs
+++ b/crates/nu-cmd-extra/tests/commands/bits/format.rs
@@ -2,12 +2,12 @@ use nu_test_support::nu;
 
 #[test]
 fn byte_stream_into_bits() {
-    let result = nu!("[0x[01] 0x[02 03]] | bytes collect | into bits");
+    let result = nu!("[0x[01] 0x[02 03]] | bytes collect | format 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");
+    let result = nu!("[0x[01] 0x[02 03]] | bytes collect | format bits | describe");
     assert_eq!("string (stream)", result.out);
 }
diff --git a/crates/nu-cmd-extra/tests/commands/bits/mod.rs b/crates/nu-cmd-extra/tests/commands/bits/mod.rs
index 0d4ee04b0d..863126853c 100644
--- a/crates/nu-cmd-extra/tests/commands/bits/mod.rs
+++ b/crates/nu-cmd-extra/tests/commands/bits/mod.rs
@@ -1 +1 @@
-mod into;
+mod format;
diff --git a/tests/repl/test_bits.rs b/tests/repl/test_bits.rs
index 05c7ebad05..68c610d2d6 100644
--- a/tests/repl/test_bits.rs
+++ b/tests/repl/test_bits.rs
@@ -99,7 +99,7 @@ fn bits_shift_left_list() -> TestResult {
 #[test]
 fn bits_shift_left_binary1() -> TestResult {
     run_test(
-        "0x[01 30 80] | bits shl 3 | into bits",
+        "0x[01 30 80] | bits shl 3 | format bits",
         "00001001 10000100 00000000",
     )
 }
@@ -108,7 +108,7 @@ fn bits_shift_left_binary1() -> TestResult {
 fn bits_shift_left_binary2() -> TestResult {
     // Whole byte case
     run_test(
-        "0x[01 30 80] | bits shl 8 | into bits",
+        "0x[01 30 80] | bits shl 8 | format bits",
         "00110000 10000000 00000000",
     )
 }
@@ -117,7 +117,7 @@ fn bits_shift_left_binary2() -> TestResult {
 fn bits_shift_left_binary3() -> TestResult {
     // Compared to the int case this is made inclusive of the bit count
     run_test(
-        "0x[01 30 80] | bits shl 24 | into bits",
+        "0x[01 30 80] | bits shl 24 | format bits",
         "00000000 00000000 00000000",
     )
 }
@@ -126,7 +126,7 @@ fn bits_shift_left_binary3() -> TestResult {
 fn bits_shift_left_binary4() -> TestResult {
     // Shifting by both bytes and bits
     run_test(
-        "0x[01 30 80] | bits shl 15 | into bits",
+        "0x[01 30 80] | bits shl 15 | format bits",
         "01000000 00000000 00000000",
     )
 }
@@ -134,7 +134,7 @@ fn bits_shift_left_binary4() -> TestResult {
 #[test]
 fn bits_shift_left_binary_exceeding() -> TestResult {
     // Compared to the int case this is made inclusive of the bit count
-    fail_test("0x[01 30] | bits shl 17 | into bits", "")
+    fail_test("0x[01 30] | bits shl 17 | format bits", "")
 }
 
 #[test]
@@ -185,7 +185,7 @@ fn bits_shift_right_list() -> TestResult {
 #[test]
 fn bits_shift_right_binary1() -> TestResult {
     run_test(
-        "0x[01 30 80] | bits shr 3 | into bits",
+        "0x[01 30 80] | bits shr 3 | format bits",
         "00000000 00100110 00010000",
     )
 }
@@ -194,7 +194,7 @@ fn bits_shift_right_binary1() -> TestResult {
 fn bits_shift_right_binary2() -> TestResult {
     // Whole byte case
     run_test(
-        "0x[01 30 80] | bits shr 8 | into bits",
+        "0x[01 30 80] | bits shr 8 | format bits",
         "00000000 00000001 00110000",
     )
 }
@@ -203,7 +203,7 @@ fn bits_shift_right_binary2() -> TestResult {
 fn bits_shift_right_binary3() -> TestResult {
     // Compared to the int case this is made inclusive of the bit count
     run_test(
-        "0x[01 30 80] | bits shr 24 | into bits",
+        "0x[01 30 80] | bits shr 24 | format bits",
         "00000000 00000000 00000000",
     )
 }
@@ -212,7 +212,7 @@ fn bits_shift_right_binary3() -> TestResult {
 fn bits_shift_right_binary4() -> TestResult {
     // Shifting by both bytes and bits
     run_test(
-        "0x[01 30 80] | bits shr 15 | into bits",
+        "0x[01 30 80] | bits shr 15 | format bits",
         "00000000 00000000 00000010",
     )
 }
@@ -220,7 +220,10 @@ fn bits_shift_right_binary4() -> TestResult {
 #[test]
 fn bits_shift_right_binary_exceeding() -> TestResult {
     // Compared to the int case this is made inclusive of the bit count
-    fail_test("0x[01 30] | bits shr 17 | into bits", "available bits (16)")
+    fail_test(
+        "0x[01 30] | bits shr 17 | format bits",
+        "available bits (16)",
+    )
 }
 
 #[test]
@@ -261,7 +264,7 @@ fn bits_rotate_left_exceeding2() -> TestResult {
 #[test]
 fn bits_rotate_left_binary1() -> TestResult {
     run_test(
-        "0x[01 30 80] | bits rol 3 | into bits",
+        "0x[01 30 80] | bits rol 3 | format bits",
         "00001001 10000100 00000000",
     )
 }
@@ -270,7 +273,7 @@ fn bits_rotate_left_binary1() -> TestResult {
 fn bits_rotate_left_binary2() -> TestResult {
     // Whole byte case
     run_test(
-        "0x[01 30 80] | bits rol 8 | into bits",
+        "0x[01 30 80] | bits rol 8 | format bits",
         "00110000 10000000 00000001",
     )
 }
@@ -279,7 +282,7 @@ fn bits_rotate_left_binary2() -> TestResult {
 fn bits_rotate_left_binary3() -> TestResult {
     // Compared to the int case this is made inclusive of the bit count
     run_test(
-        "0x[01 30 80] | bits rol 24 | into bits",
+        "0x[01 30 80] | bits rol 24 | format bits",
         "00000001 00110000 10000000",
     )
 }
@@ -288,7 +291,7 @@ fn bits_rotate_left_binary3() -> TestResult {
 fn bits_rotate_left_binary4() -> TestResult {
     // Shifting by both bytes and bits
     run_test(
-        "0x[01 30 80] | bits rol 15 | into bits",
+        "0x[01 30 80] | bits rol 15 | format bits",
         "01000000 00000000 10011000",
     )
 }
@@ -331,7 +334,7 @@ fn bits_rotate_right_exceeding2() -> TestResult {
 #[test]
 fn bits_rotate_right_binary1() -> TestResult {
     run_test(
-        "0x[01 30 80] | bits ror 3 | into bits",
+        "0x[01 30 80] | bits ror 3 | format bits",
         "00000000 00100110 00010000",
     )
 }
@@ -340,7 +343,7 @@ fn bits_rotate_right_binary1() -> TestResult {
 fn bits_rotate_right_binary2() -> TestResult {
     // Whole byte case
     run_test(
-        "0x[01 30 80] | bits ror 8 | into bits",
+        "0x[01 30 80] | bits ror 8 | format bits",
         "10000000 00000001 00110000",
     )
 }
@@ -349,7 +352,7 @@ fn bits_rotate_right_binary2() -> TestResult {
 fn bits_rotate_right_binary3() -> TestResult {
     // Compared to the int case this is made inclusive of the bit count
     run_test(
-        "0x[01 30 80] | bits ror 24 | into bits",
+        "0x[01 30 80] | bits ror 24 | format bits",
         "00000001 00110000 10000000",
     )
 }
@@ -358,7 +361,7 @@ fn bits_rotate_right_binary3() -> TestResult {
 fn bits_rotate_right_binary4() -> TestResult {
     // Shifting by both bytes and bits
     run_test(
-        "0x[01 30 80] | bits ror 15 | into bits",
+        "0x[01 30 80] | bits ror 15 | format bits",
         "01100001 00000000 00000010",
     )
 }

From 4ff4e3f93de89702219d1559fd8cfa9122dd14b2 Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Sun, 29 Dec 2024 00:11:19 +0100
Subject: [PATCH 0855/1072] Force installing nushell in standard lib tests to
 fix CI (#14693)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

This PR should fix the currently broken standard library tests pipeline
by force installing nushell.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 16d2976114..2976f97b54 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -96,7 +96,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
 
       - name: Install Nushell
-        run: cargo install --path . --locked --no-default-features
+        run: cargo install --path . --locked --no-default-features --force
 
       - name: Standard library tests
         run: nu -c 'use crates/nu-std/testing.nu; testing run-tests --path crates/nu-std'

From a65e5ab01de6c5b975c220147ed03bf7ab7100cd Mon Sep 17 00:00:00 2001
From: Joshua <67082011+0x4D5352@users.noreply.github.com>
Date: Sun, 29 Dec 2024 14:02:57 -0600
Subject: [PATCH 0856/1072] Improve example formatting in README.md (#14695)

# Description

Conforming the examples in the README documentation to match the new
example formatting suggested in
https://github.com/nushell/nushell.github.io/issues/1684.

# User-Facing Changes

Examples no longer have a prompt indicator, and example results are now
inside of commend blocks. This should improve the ability for users to
test out the examples when exploring nushell for the first time.

# Tests + Formatting

No tests have been added as this is purely a documentation change.
---
 README.md | 112 +++++++++++++++++++++++++++---------------------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/README.md b/README.md
index 698a06e4f3..81834052b5 100644
--- a/README.md
+++ b/README.md
@@ -95,44 +95,44 @@ Commands that work in the pipeline fit into one of three categories:
 Commands are separated by the pipe symbol (`|`) to denote a pipeline flowing left to right.
 
 ```shell
-> ls | where type == "dir" | table
-╭────┬──────────┬──────┬─────────┬───────────────╮
-│ #  │   name   │ type │  size   │   modified    │
-├────┼──────────┼──────┼─────────┼───────────────┤
-│  0 │ .cargo   │ dir  │     0 B │ 9 minutes ago │
-│  1 │ assets   │ dir  │     0 B │ 2 weeks ago   │
-│  2 │ crates   │ dir  │ 4.0 KiB │ 2 weeks ago   │
-│  3 │ docker   │ dir  │     0 B │ 2 weeks ago   │
-│  4 │ docs     │ dir  │     0 B │ 2 weeks ago   │
-│  5 │ images   │ dir  │     0 B │ 2 weeks ago   │
-│  6 │ pkg_mgrs │ dir  │     0 B │ 2 weeks ago   │
-│  7 │ samples  │ dir  │     0 B │ 2 weeks ago   │
-│  8 │ src      │ dir  │ 4.0 KiB │ 2 weeks ago   │
-│  9 │ target   │ dir  │     0 B │ a day ago     │
-│ 10 │ tests    │ dir  │ 4.0 KiB │ 2 weeks ago   │
-│ 11 │ wix      │ dir  │     0 B │ 2 weeks ago   │
-╰────┴──────────┴──────┴─────────┴───────────────╯
+ls | where type == "dir" | table
+# => ╭────┬──────────┬──────┬─────────┬───────────────╮
+# => │ #  │   name   │ type │  size   │   modified    │
+# => ├────┼──────────┼──────┼─────────┼───────────────┤
+# => │  0 │ .cargo   │ dir  │     0 B │ 9 minutes ago │
+# => │  1 │ assets   │ dir  │     0 B │ 2 weeks ago   │
+# => │  2 │ crates   │ dir  │ 4.0 KiB │ 2 weeks ago   │
+# => │  3 │ docker   │ dir  │     0 B │ 2 weeks ago   │
+# => │  4 │ docs     │ dir  │     0 B │ 2 weeks ago   │
+# => │  5 │ images   │ dir  │     0 B │ 2 weeks ago   │
+# => │  6 │ pkg_mgrs │ dir  │     0 B │ 2 weeks ago   │
+# => │  7 │ samples  │ dir  │     0 B │ 2 weeks ago   │
+# => │  8 │ src      │ dir  │ 4.0 KiB │ 2 weeks ago   │
+# => │  9 │ target   │ dir  │     0 B │ a day ago     │
+# => │ 10 │ tests    │ dir  │ 4.0 KiB │ 2 weeks ago   │
+# => │ 11 │ wix      │ dir  │     0 B │ 2 weeks ago   │
+# => ╰────┴──────────┴──────┴─────────┴───────────────╯
 ```
 
 Because most of the time you'll want to see the output of a pipeline, `table` is assumed.
 We could have also written the above:
 
 ```shell
-> ls | where type == "dir"
+ls | where type == "dir"
 ```
 
 Being able to use the same commands and compose them differently is an important philosophy in Nu.
 For example, we could use the built-in `ps` command to get a list of the running processes, using the same `where` as above.
 
 ```shell
-> ps | where cpu > 0
-╭───┬───────┬───────────┬───────┬───────────┬───────────╮
-│ # │  pid  │   name    │  cpu  │    mem    │  virtual  │
-├───┼───────┼───────────┼───────┼───────────┼───────────┤
-│ 0 │  2240 │ Slack.exe │ 16.40 │ 178.3 MiB │ 232.6 MiB │
-│ 1 │ 16948 │ Slack.exe │ 16.32 │ 205.0 MiB │ 197.9 MiB │
-│ 2 │ 17700 │ nu.exe    │  3.77 │  26.1 MiB │   8.8 MiB │
-╰───┴───────┴───────────┴───────┴───────────┴───────────╯
+ps | where cpu > 0
+# => ╭───┬───────┬───────────┬───────┬───────────┬───────────╮
+# => │ # │  pid  │   name    │  cpu  │    mem    │  virtual  │
+# => ├───┼───────┼───────────┼───────┼───────────┼───────────┤
+# => │ 0 │  2240 │ Slack.exe │ 16.40 │ 178.3 MiB │ 232.6 MiB │
+# => │ 1 │ 16948 │ Slack.exe │ 16.32 │ 205.0 MiB │ 197.9 MiB │
+# => │ 2 │ 17700 │ nu.exe    │  3.77 │  26.1 MiB │   8.8 MiB │
+# => ╰───┴───────┴───────────┴───────┴───────────┴───────────╯
 ```
 
 ### Opening files
@@ -141,46 +141,46 @@ Nu can load file and URL contents as raw text or structured data (if it recogniz
 For example, you can load a .toml file as structured data and explore it:
 
 ```shell
-> open Cargo.toml
-╭──────────────────┬────────────────────╮
-│ bin              │ [table 1 row]      │
-│ dependencies     │ {record 25 fields} │
-│ dev-dependencies │ {record 8 fields}  │
-│ features         │ {record 10 fields} │
-│ package          │ {record 13 fields} │
-│ patch            │ {record 1 field}   │
-│ profile          │ {record 3 fields}  │
-│ target           │ {record 3 fields}  │
-│ workspace        │ {record 1 field}   │
-╰──────────────────┴────────────────────╯
+open Cargo.toml
+# => ╭──────────────────┬────────────────────╮
+# => │ bin              │ [table 1 row]      │
+# => │ dependencies     │ {record 25 fields} │
+# => │ dev-dependencies │ {record 8 fields}  │
+# => │ features         │ {record 10 fields} │
+# => │ package          │ {record 13 fields} │
+# => │ patch            │ {record 1 field}   │
+# => │ profile          │ {record 3 fields}  │
+# => │ target           │ {record 3 fields}  │
+# => │ workspace        │ {record 1 field}   │
+# => ╰──────────────────┴────────────────────╯
 ```
 
 We can pipe this into a command that gets the contents of one of the columns:
 
 ```shell
-> open Cargo.toml | get package
-╭───────────────┬────────────────────────────────────╮
-│ authors       │ [list 1 item]                      │
-│ default-run   │ nu                                 │
-│ description   │ A new type of shell                │
-│ documentation │ https://www.nushell.sh/book/       │
-│ edition       │ 2018                               │
-│ exclude       │ [list 1 item]                      │
-│ homepage      │ https://www.nushell.sh             │
-│ license       │ MIT                                │
-│ metadata      │ {record 1 field}                   │
-│ name          │ nu                                 │
-│ repository    │ https://github.com/nushell/nushell │
-│ rust-version  │ 1.60                               │
-│ version       │ 0.72.0                             │
-╰───────────────┴────────────────────────────────────╯
+open Cargo.toml | get package
+# => ╭───────────────┬────────────────────────────────────╮
+# => │ authors       │ [list 1 item]                      │
+# => │ default-run   │ nu                                 │
+# => │ description   │ A new type of shell                │
+# => │ documentation │ https://www.nushell.sh/book/       │
+# => │ edition       │ 2018                               │
+# => │ exclude       │ [list 1 item]                      │
+# => │ homepage      │ https://www.nushell.sh             │
+# => │ license       │ MIT                                │
+# => │ metadata      │ {record 1 field}                   │
+# => │ name          │ nu                                 │
+# => │ repository    │ https://github.com/nushell/nushell │
+# => │ rust-version  │ 1.60                               │
+# => │ version       │ 0.72.0                             │
+# => ╰───────────────┴────────────────────────────────────╯
 ```
 
 And if needed we can drill down further:
 
 ```shell
-> open Cargo.toml | get package.version
-0.72.0
+open Cargo.toml | get package.version
+# => 0.72.0
 ```
 
 ### Plugins

From 2bcf2389aa1993c65b2353f6046a6398ce28128b Mon Sep 17 00:00:00 2001
From: David Randall <David@NiceGuyIT.biz>
Date: Sun, 29 Dec 2024 15:05:12 -0500
Subject: [PATCH 0857/1072] Reference the correct command: insert -> delete
 (#14696)

# Description
The docs reference "insert into" for the "delete" command.

# User-Facing Changes
N/A

# Tests + Formatting
I don't know of any tests for docs.
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
N/A

---------

Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
---
 crates/nu-command/src/stor/delete.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-command/src/stor/delete.rs b/crates/nu-command/src/stor/delete.rs
index 5605794f11..0630245a4d 100644
--- a/crates/nu-command/src/stor/delete.rs
+++ b/crates/nu-command/src/stor/delete.rs
@@ -16,7 +16,7 @@ impl Command for StorDelete {
             .required_named(
                 "table-name",
                 SyntaxShape::String,
-                "name of the table you want to insert into",
+                "name of the table you want to delete or delete from",
                 Some('t'),
             )
             .named(

From 378395c22cf303a8dc4226c1fe95b5e3963e56b5 Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Mon, 30 Dec 2024 03:47:06 -0500
Subject: [PATCH 0858/1072] Remove usages of internal_span (#14700)

# Description
Remove usages of `internal_span` in matches and initializers. I think
this should be the last of the usages, meaning `internal_span` can
finally be refactored out of `Value`(!?)
---
 .../support/completions_helpers.rs            |  8 +--
 .../src/conversions/into/cell_path.rs         | 13 ++--
 .../src/conversions/split_cell_path.rs        | 12 +---
 .../src/database/commands/into_sqlite.rs      | 14 ++--
 crates/nu-command/src/filters/select.rs       | 10 +--
 crates/nu-command/src/network/url/query.rs    | 19 ++---
 crates/nu-command/src/platform/ulimit.rs      | 15 ++--
 crates/nu-command/src/viewers/table.rs        |  5 +-
 crates/nu-protocol/src/engine/engine_state.rs | 11 +--
 crates/nu-protocol/src/engine/stack.rs        | 71 ++++++++++---------
 10 files changed, 84 insertions(+), 94 deletions(-)

diff --git a/crates/nu-cli/tests/completions/support/completions_helpers.rs b/crates/nu-cli/tests/completions/support/completions_helpers.rs
index 983dd778d2..83e4dfddf3 100644
--- a/crates/nu-cli/tests/completions/support/completions_helpers.rs
+++ b/crates/nu-cli/tests/completions/support/completions_helpers.rs
@@ -98,14 +98,14 @@ pub fn new_dotnu_engine() -> (AbsolutePathBuf, String, EngineState, Stack) {
 
     stack.add_env_var(
         "NU_LIB_DIRS".to_string(),
-        Value::List {
-            vals: vec![
+        Value::list(
+            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,
-        },
+            dir_span,
+        ),
     );
 
     // Merge environment into the permanent state
diff --git a/crates/nu-command/src/conversions/into/cell_path.rs b/crates/nu-command/src/conversions/into/cell_path.rs
index cd5c7773f6..4fbe732f7f 100644
--- a/crates/nu-command/src/conversions/into/cell_path.rs
+++ b/crates/nu-command/src/conversions/into/cell_path.rs
@@ -184,16 +184,11 @@ fn value_to_cell_path(value: &Value, span: Span) -> Result<Value, ShellError> {
 }
 
 fn value_to_path_member(val: &Value, span: Span) -> Result<PathMember, ShellError> {
+    let val_span = val.span();
     let member = match val {
-        Value::Int {
-            val,
-            internal_span: span,
-        } => int_to_path_member(*val, *span)?,
-        Value::String {
-            val,
-            internal_span: span,
-        } => PathMember::string(val.into(), false, *span),
-        Value::Record { val, internal_span } => record_to_path_member(val, *internal_span, span)?,
+        Value::Int { val, .. } => int_to_path_member(*val, val_span)?,
+        Value::String { val, .. } => PathMember::string(val.into(), false, val_span),
+        Value::Record { val, .. } => record_to_path_member(val, val_span, span)?,
         other => {
             return Err(ShellError::CantConvert {
                 to_type: "int or string".to_string(),
diff --git a/crates/nu-command/src/conversions/split_cell_path.rs b/crates/nu-command/src/conversions/split_cell_path.rs
index c66481bffd..27c457b356 100644
--- a/crates/nu-command/src/conversions/split_cell_path.rs
+++ b/crates/nu-command/src/conversions/split_cell_path.rs
@@ -121,11 +121,8 @@ fn split_cell_path(val: CellPath, span: Span) -> Result<Value, ShellError> {
                 | PathMember::Int { optional, span, .. } => (optional, span),
             };
             let value = match pm {
-                PathMember::String { val, .. } => Value::String { val, internal_span },
-                PathMember::Int { val, .. } => Value::Int {
-                    val: val as i64,
-                    internal_span,
-                },
+                PathMember::String { val, .. } => Value::string(val, internal_span),
+                PathMember::Int { val, .. } => Value::int(val as i64, internal_span),
             };
             Self { value, optional }
         }
@@ -142,10 +139,7 @@ fn split_cell_path(val: CellPath, span: Span) -> Result<Value, ShellError> {
         })
         .collect();
 
-    Ok(Value::List {
-        vals: members,
-        internal_span: span,
-    })
+    Ok(Value::list(members, span))
 }
 
 #[cfg(test)]
diff --git a/crates/nu-command/src/database/commands/into_sqlite.rs b/crates/nu-command/src/database/commands/into_sqlite.rs
index 3236f90999..32128c9014 100644
--- a/crates/nu-command/src/database/commands/into_sqlite.rs
+++ b/crates/nu-command/src/database/commands/into_sqlite.rs
@@ -196,13 +196,13 @@ fn action(
         PipelineData::ListStream(stream, _) => {
             insert_in_transaction(stream.into_iter(), span, table, signals)
         }
-        PipelineData::Value(
-            Value::List {
-                vals,
-                internal_span,
-            },
-            _,
-        ) => insert_in_transaction(vals.into_iter(), internal_span, table, signals),
+        PipelineData::Value(value @ Value::List { .. }, _) => {
+            let span = value.span();
+            let vals = value
+                .into_list()
+                .expect("Value matched as list above, but is not a list");
+            insert_in_transaction(vals.into_iter(), span, table, signals)
+        }
         PipelineData::Value(val, _) => {
             insert_in_transaction(std::iter::once(val), span, table, signals)
         }
diff --git a/crates/nu-command/src/filters/select.rs b/crates/nu-command/src/filters/select.rs
index f630f19df8..3e8e5cb614 100644
--- a/crates/nu-command/src/filters/select.rs
+++ b/crates/nu-command/src/filters/select.rs
@@ -56,7 +56,7 @@ produce a table, a list will produce a list, and a record will produce a record.
         let columns: Vec<Value> = call.rest(engine_state, stack, 0)?;
         let mut new_columns: Vec<CellPath> = vec![];
         for col_val in columns {
-            let col_span = &col_val.span();
+            let col_span = col_val.span();
             match col_val {
                 Value::CellPath { val, .. } => {
                     new_columns.push(val);
@@ -65,25 +65,25 @@ produce a table, a list will produce a list, and a record will produce a record.
                     let cv = CellPath {
                         members: vec![PathMember::String {
                             val,
-                            span: *col_span,
+                            span: col_span,
                             optional: false,
                         }],
                     };
                     new_columns.push(cv);
                 }
-                Value::Int { val, internal_span } => {
+                Value::Int { val, .. } => {
                     if val < 0 {
                         return Err(ShellError::CantConvert {
                             to_type: "cell path".into(),
                             from_type: "negative number".into(),
-                            span: internal_span,
+                            span: col_span,
                             help: None,
                         });
                     }
                     let cv = CellPath {
                         members: vec![PathMember::Int {
                             val: val as usize,
-                            span: *col_span,
+                            span: col_span,
                             optional: false,
                         }],
                     };
diff --git a/crates/nu-command/src/network/url/query.rs b/crates/nu-command/src/network/url/query.rs
index 9dee687cca..8fb0d2d181 100644
--- a/crates/nu-command/src/network/url/query.rs
+++ b/crates/nu-command/src/network/url/query.rs
@@ -52,14 +52,17 @@ pub fn table_to_query_string(
 ) -> Result<String, ShellError> {
     let row_vec = table
         .iter()
-        .map(|val| match val {
-            Value::Record { val, internal_span } => key_value_from_record(val, *internal_span),
-            _ => Err(ShellError::UnsupportedInput {
-                msg: "expected a table".into(),
-                input: "not a table, contains non-record values".into(),
-                msg_span: head,
-                input_span: span,
-            }),
+        .map(|val| {
+            let val_span = val.span();
+            match val {
+                Value::Record { val, .. } => key_value_from_record(val, val_span),
+                _ => Err(ShellError::UnsupportedInput {
+                    msg: "expected a table".into(),
+                    input: "not a table, contains non-record values".into(),
+                    msg_span: head,
+                    input_span: span,
+                }),
+            }
         })
         .collect::<Result<Vec<_>, ShellError>>()?;
 
diff --git a/crates/nu-command/src/platform/ulimit.rs b/crates/nu-command/src/platform/ulimit.rs
index b908e8b3c1..d823e10898 100644
--- a/crates/nu-command/src/platform/ulimit.rs
+++ b/crates/nu-command/src/platform/ulimit.rs
@@ -431,12 +431,13 @@ fn parse_limit(
     hard_limit: rlim_t,
     call_span: Span,
 ) -> Result<rlim_t, ShellError> {
+    let val_span = limit_value.span();
     match limit_value {
-        Value::Int { val, internal_span } => {
+        Value::Int { val, .. } => {
             let value = rlim_t::try_from(*val).map_err(|e| ShellError::CantConvert {
                 to_type: "rlim_t".into(),
                 from_type: "i64".into(),
-                span: *internal_span,
+                span: val_span,
                 help: Some(e.to_string()),
             })?;
 
@@ -447,25 +448,25 @@ fn parse_limit(
                 Ok(limit)
             }
         }
-        Value::Filesize { val, internal_span } => {
+        Value::Filesize { val, .. } => {
             if res.multiplier != 1024 {
                 return Err(ShellError::TypeMismatch {
                     err_message: format!(
                         "filesize is not compatible with resource {:?}",
                         res.resource
                     ),
-                    span: *internal_span,
+                    span: val_span,
                 });
             }
 
             rlim_t::try_from(*val).map_err(|e| ShellError::CantConvert {
                 to_type: "rlim_t".into(),
                 from_type: "i64".into(),
-                span: *internal_span,
+                span: val_span,
                 help: Some(e.to_string()),
             })
         }
-        Value::String { val, internal_span } => {
+        Value::String { val, .. } => {
             if val == "unlimited" {
                 Ok(RLIM_INFINITY)
             } else if val == "soft" {
@@ -479,7 +480,7 @@ fn parse_limit(
             } else {
                 return Err(ShellError::IncorrectValue {
                     msg: "Only unlimited, soft and hard are supported for strings".into(),
-                    val_span: *internal_span,
+                    val_span,
                     call_span,
                 });
             }
diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index 263a1cea55..c2c3af524f 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -336,6 +336,7 @@ fn get_index_flag(
         Some(value) => value,
         None => return Ok(Some(0)),
     };
+    let span = value.span();
 
     match value {
         Value::Bool { val, .. } => {
@@ -345,13 +346,13 @@ fn get_index_flag(
                 Ok(None)
             }
         }
-        Value::Int { val, internal_span } => {
+        Value::Int { val, .. } => {
             if val < 0 {
                 Err(ShellError::UnsupportedInput {
                     msg: String::from("got a negative integer"),
                     input: val.to_string(),
                     msg_span: call.span(),
-                    input_span: internal_span,
+                    input_span: span,
                 })
             } else {
                 Ok(Some(val as usize))
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index 716cb03ca9..8502ff91cd 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -1163,7 +1163,7 @@ mod test_cwd {
 
     use crate::{
         engine::{EngineState, Stack},
-        Span, Value,
+        Value,
     };
     use nu_path::{assert_path_eq, AbsolutePath, Path};
     use tempfile::{NamedTempFile, TempDir};
@@ -1226,14 +1226,7 @@ mod test_cwd {
     #[test]
     fn pwd_is_non_string_value() {
         let mut engine_state = EngineState::new();
-        engine_state.add_env_var(
-            "PWD".into(),
-            Value::Glob {
-                val: "*".into(),
-                no_expand: false,
-                internal_span: Span::unknown(),
-            },
-        );
+        engine_state.add_env_var("PWD".into(), Value::test_glob("*"));
         engine_state.cwd(None).unwrap_err();
     }
 
diff --git a/crates/nu-protocol/src/engine/stack.rs b/crates/nu-protocol/src/engine/stack.rs
index ccd38cc5d3..a1d50381dc 100644
--- a/crates/nu-protocol/src/engine/stack.rs
+++ b/crates/nu-protocol/src/engine/stack.rs
@@ -774,78 +774,76 @@ mod test {
 
     use super::Stack;
 
-    const ZERO_SPAN: Span = Span { start: 0, end: 0 };
-    fn string_value(s: &str) -> Value {
-        Value::String {
-            val: s.to_string(),
-            internal_span: ZERO_SPAN,
-        }
-    }
-
     #[test]
     fn test_children_see_inner_values() {
         let mut original = Stack::new();
-        original.add_var(VarId::new(0), string_value("hello"));
+        original.add_var(VarId::new(0), Value::test_string("hello"));
 
         let cloned = Stack::with_parent(Arc::new(original));
         assert_eq!(
-            cloned.get_var(VarId::new(0), ZERO_SPAN),
-            Ok(string_value("hello"))
+            cloned.get_var(VarId::new(0), Span::test_data()),
+            Ok(Value::test_string("hello"))
         );
     }
 
     #[test]
     fn test_children_dont_see_deleted_values() {
         let mut original = Stack::new();
-        original.add_var(VarId::new(0), string_value("hello"));
+        original.add_var(VarId::new(0), Value::test_string("hello"));
 
         let mut cloned = Stack::with_parent(Arc::new(original));
         cloned.remove_var(VarId::new(0));
 
         assert_eq!(
-            cloned.get_var(VarId::new(0), ZERO_SPAN),
-            Err(crate::ShellError::VariableNotFoundAtRuntime { span: ZERO_SPAN })
+            cloned.get_var(VarId::new(0), Span::test_data()),
+            Err(crate::ShellError::VariableNotFoundAtRuntime {
+                span: Span::test_data()
+            })
         );
     }
 
     #[test]
     fn test_children_changes_override_parent() {
         let mut original = Stack::new();
-        original.add_var(VarId::new(0), string_value("hello"));
+        original.add_var(VarId::new(0), Value::test_string("hello"));
 
         let mut cloned = Stack::with_parent(Arc::new(original));
-        cloned.add_var(VarId::new(0), string_value("there"));
+        cloned.add_var(VarId::new(0), Value::test_string("there"));
         assert_eq!(
-            cloned.get_var(VarId::new(0), ZERO_SPAN),
-            Ok(string_value("there"))
+            cloned.get_var(VarId::new(0), Span::test_data()),
+            Ok(Value::test_string("there"))
         );
 
         cloned.remove_var(VarId::new(0));
         // the underlying value shouldn't magically re-appear
         assert_eq!(
-            cloned.get_var(VarId::new(0), ZERO_SPAN),
-            Err(crate::ShellError::VariableNotFoundAtRuntime { span: ZERO_SPAN })
+            cloned.get_var(VarId::new(0), Span::test_data()),
+            Err(crate::ShellError::VariableNotFoundAtRuntime {
+                span: Span::test_data()
+            })
         );
     }
     #[test]
     fn test_children_changes_persist_in_offspring() {
         let mut original = Stack::new();
-        original.add_var(VarId::new(0), string_value("hello"));
+        original.add_var(VarId::new(0), Value::test_string("hello"));
 
         let mut cloned = Stack::with_parent(Arc::new(original));
-        cloned.add_var(VarId::new(1), string_value("there"));
+        cloned.add_var(VarId::new(1), Value::test_string("there"));
 
         cloned.remove_var(VarId::new(0));
         let cloned = Stack::with_parent(Arc::new(cloned));
 
         assert_eq!(
-            cloned.get_var(VarId::new(0), ZERO_SPAN),
-            Err(crate::ShellError::VariableNotFoundAtRuntime { span: ZERO_SPAN })
+            cloned.get_var(VarId::new(0), Span::test_data()),
+            Err(crate::ShellError::VariableNotFoundAtRuntime {
+                span: Span::test_data()
+            })
         );
 
         assert_eq!(
-            cloned.get_var(VarId::new(1), ZERO_SPAN),
-            Ok(string_value("there"))
+            cloned.get_var(VarId::new(1), Span::test_data()),
+            Ok(Value::test_string("there"))
         );
     }
 
@@ -853,33 +851,38 @@ mod test {
     fn test_merging_children_back_to_parent() {
         let mut original = Stack::new();
         let engine_state = EngineState::new();
-        original.add_var(VarId::new(0), string_value("hello"));
+        original.add_var(VarId::new(0), Value::test_string("hello"));
 
         let original_arc = Arc::new(original);
         let mut cloned = Stack::with_parent(original_arc.clone());
-        cloned.add_var(VarId::new(1), string_value("there"));
+        cloned.add_var(VarId::new(1), Value::test_string("there"));
 
         cloned.remove_var(VarId::new(0));
 
-        cloned.add_env_var("ADDED_IN_CHILD".to_string(), string_value("New Env Var"));
+        cloned.add_env_var(
+            "ADDED_IN_CHILD".to_string(),
+            Value::test_string("New Env Var"),
+        );
 
         let original = Stack::with_changes_from_child(original_arc, cloned);
 
         assert_eq!(
-            original.get_var(VarId::new(0), ZERO_SPAN),
-            Err(crate::ShellError::VariableNotFoundAtRuntime { span: ZERO_SPAN })
+            original.get_var(VarId::new(0), Span::test_data()),
+            Err(crate::ShellError::VariableNotFoundAtRuntime {
+                span: Span::test_data()
+            })
         );
 
         assert_eq!(
-            original.get_var(VarId::new(1), ZERO_SPAN),
-            Ok(string_value("there"))
+            original.get_var(VarId::new(1), Span::test_data()),
+            Ok(Value::test_string("there"))
         );
 
         assert_eq!(
             original
                 .get_env_var(&engine_state, "ADDED_IN_CHILD")
                 .cloned(),
-            Some(string_value("New Env Var")),
+            Some(Value::test_string("New Env Var")),
         );
     }
 }

From 1181349c22b4e95fa70c891402382cc730af8ce3 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Mon, 30 Dec 2024 23:02:57 +0100
Subject: [PATCH 0859/1072] Promote note about `internal_span` to doccomment
 (#14703)

Following #14700 we should make sure more folks are aware that you
shouldn't use `internal_span` outside of `Value` or core protocol/engine
internals.

By making it a doccomment maybe a few folks see the text in the lsp
hover etc.
---
 crates/nu-protocol/src/value/mod.rs | 68 ++++++++++++++---------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs
index ac663f4c49..73e6dd4f7a 100644
--- a/crates/nu-protocol/src/value/mod.rs
+++ b/crates/nu-protocol/src/value/mod.rs
@@ -48,120 +48,120 @@ use std::{
 pub enum Value {
     Bool {
         val: bool,
-        // note: spans are being refactored out of Value
-        // please use .span() instead of matching this span value
+        /// note: spans are being refactored out of Value
+        /// please use .span() instead of matching this span value
         #[serde(rename = "span")]
         internal_span: Span,
     },
     Int {
         val: i64,
-        // note: spans are being refactored out of Value
-        // please use .span() instead of matching this span value
+        /// note: spans are being refactored out of Value
+        /// please use .span() instead of matching this span value
         #[serde(rename = "span")]
         internal_span: Span,
     },
     Float {
         val: f64,
-        // note: spans are being refactored out of Value
-        // please use .span() instead of matching this span value
+        /// note: spans are being refactored out of Value
+        /// please use .span() instead of matching this span value
         #[serde(rename = "span")]
         internal_span: Span,
     },
     String {
         val: String,
-        // note: spans are being refactored out of Value
-        // please use .span() instead of matching this span value
+        /// note: spans are being refactored out of Value
+        /// please use .span() instead of matching this span value
         #[serde(rename = "span")]
         internal_span: Span,
     },
     Glob {
         val: String,
         no_expand: bool,
-        // note: spans are being refactored out of Value
-        // please use .span() instead of matching this span value
+        /// note: spans are being refactored out of Value
+        /// please use .span() instead of matching this span value
         #[serde(rename = "span")]
         internal_span: Span,
     },
     Filesize {
         val: Filesize,
-        // note: spans are being refactored out of Value
-        // please use .span() instead of matching this span value
+        /// note: spans are being refactored out of Value
+        /// please use .span() instead of matching this span value
         #[serde(rename = "span")]
         internal_span: Span,
     },
     Duration {
         val: i64,
-        // note: spans are being refactored out of Value
-        // please use .span() instead of matching this span value
+        /// note: spans are being refactored out of Value
+        /// please use .span() instead of matching this span value
         #[serde(rename = "span")]
         internal_span: Span,
     },
     Date {
         val: DateTime<FixedOffset>,
-        // note: spans are being refactored out of Value
-        // please use .span() instead of matching this span value
+        /// note: spans are being refactored out of Value
+        /// please use .span() instead of matching this span value
         #[serde(rename = "span")]
         internal_span: Span,
     },
     Range {
         val: Box<Range>,
-        // note: spans are being refactored out of Value
-        // please use .span() instead of matching this span value
+        /// note: spans are being refactored out of Value
+        /// please use .span() instead of matching this span value
         #[serde(rename = "span")]
         internal_span: Span,
     },
     Record {
         val: SharedCow<Record>,
-        // note: spans are being refactored out of Value
-        // please use .span() instead of matching this span value
+        /// note: spans are being refactored out of Value
+        /// please use .span() instead of matching this span value
         #[serde(rename = "span")]
         internal_span: Span,
     },
     List {
         vals: Vec<Value>,
-        // note: spans are being refactored out of Value
-        // please use .span() instead of matching this span value
+        /// note: spans are being refactored out of Value
+        /// please use .span() instead of matching this span value
         #[serde(rename = "span")]
         internal_span: Span,
     },
     Closure {
         val: Box<Closure>,
-        // note: spans are being refactored out of Value
-        // please use .span() instead of matching this span value
+        /// note: spans are being refactored out of Value
+        /// please use .span() instead of matching this span value
         #[serde(rename = "span")]
         internal_span: Span,
     },
     Error {
         error: Box<ShellError>,
-        // note: spans are being refactored out of Value
-        // please use .span() instead of matching this span value
+        /// note: spans are being refactored out of Value
+        /// please use .span() instead of matching this span value
         #[serde(rename = "span")]
         internal_span: Span,
     },
     Binary {
         val: Vec<u8>,
-        // note: spans are being refactored out of Value
-        // please use .span() instead of matching this span value
+        /// note: spans are being refactored out of Value
+        /// please use .span() instead of matching this span value
         #[serde(rename = "span")]
         internal_span: Span,
     },
     CellPath {
         val: CellPath,
-        // note: spans are being refactored out of Value
-        // please use .span() instead of matching this span value
+        /// note: spans are being refactored out of Value
+        /// please use .span() instead of matching this span value
         #[serde(rename = "span")]
         internal_span: Span,
     },
     Custom {
         val: Box<dyn CustomValue>,
-        // note: spans are being refactored out of Value
-        // please use .span() instead of matching this span value
+        /// note: spans are being refactored out of Value
+        /// please use .span() instead of matching this span value
         #[serde(rename = "span")]
         internal_span: Span,
     },
     Nothing {
-        // note: spans are being refactored out of Value
-        // please use .span() instead of matching this span value
+        /// note: spans are being refactored out of Value
+        /// please use .span() instead of matching this span value
         #[serde(rename = "span")]
         internal_span: Span,
     },

From e7877db078d9a7c7c5cab97ead8218ca851991b7 Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Tue, 31 Dec 2024 04:23:40 +0100
Subject: [PATCH 0860/1072] Coerce boolean values into strings too (#14704)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

The `Value::coerce_str` method weirdly doesn't allow coercing boolean
values into strings while commands like `true | into string` work
without issues. So I added that.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

This is technically a breaking change if a nushell library user depended
on the fact that boolean values weren't coerceable to strings. But I
doubt that really.

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
---
 crates/nu-protocol/src/value/mod.rs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs
index 73e6dd4f7a..e55f89d586 100644
--- a/crates/nu-protocol/src/value/mod.rs
+++ b/crates/nu-protocol/src/value/mod.rs
@@ -366,6 +366,7 @@ impl Value {
     /// Returns this `Value` converted to a `str` or an error if it cannot be converted
     ///
     /// Only the following `Value` cases will return an `Ok` result:
+    /// - `Bool`
     /// - `Int`
     /// - `Float`
     /// - `String`
@@ -379,7 +380,8 @@ impl Value {
     ///     assert_eq!(
     ///         matches!(
     ///             val,
-    ///             Value::Int { .. }
+    ///             Value::Bool { .. }
+    ///                 | Value::Int { .. }
     ///                 | Value::Float { .. }
     ///                 | Value::String { .. }
     ///                 | Value::Glob { .. }
@@ -392,6 +394,7 @@ impl Value {
     /// ```
     pub fn coerce_str(&self) -> Result<Cow<str>, ShellError> {
         match self {
+            Value::Bool { val, .. } => Ok(Cow::Owned(val.to_string())),
             Value::Int { val, .. } => Ok(Cow::Owned(val.to_string())),
             Value::Float { val, .. } => Ok(Cow::Owned(val.to_string())),
             Value::String { val, .. } => Ok(Cow::Borrowed(val)),
@@ -419,6 +422,7 @@ impl Value {
     /// if you do not need to keep the original `Value` around.
     ///
     /// Only the following `Value` cases will return an `Ok` result:
+    /// - `Bool`
     /// - `Int`
     /// - `Float`
     /// - `String`
@@ -432,7 +436,8 @@ impl Value {
     ///     assert_eq!(
     ///         matches!(
     ///             val,
-    ///             Value::Int { .. }
+    ///             Value::Bool { .. }
+    ///                 | Value::Int { .. }
     ///                 | Value::Float { .. }
     ///                 | Value::String { .. }
     ///                 | Value::Glob { .. }
@@ -450,6 +455,7 @@ impl Value {
     /// Returns this `Value` converted to a `String` or an error if it cannot be converted
     ///
     /// Only the following `Value` cases will return an `Ok` result:
+    /// - `Bool`
     /// - `Int`
     /// - `Float`
     /// - `String`
@@ -463,7 +469,8 @@ impl Value {
     ///     assert_eq!(
     ///         matches!(
     ///             val,
-    ///             Value::Int { .. }
+    ///             Value::Bool { .. }
+    ///                 | Value::Int { .. }
     ///                 | Value::Float { .. }
     ///                 | Value::String { .. }
     ///                 | Value::Glob { .. }
@@ -477,6 +484,7 @@ impl Value {
     pub fn coerce_into_string(self) -> Result<String, ShellError> {
         let span = self.span();
         match self {
+            Value::Bool { val, .. } => Ok(val.to_string()),
             Value::Int { val, .. } => Ok(val.to_string()),
             Value::Float { val, .. } => Ok(val.to_string()),
             Value::String { val, .. } => Ok(val),

From 4884894ddb66dd563eca3c6926c5b45fd5ea071f Mon Sep 17 00:00:00 2001
From: Rikuki IX <52599939+rikukiix@users.noreply.github.com>
Date: Tue, 31 Dec 2024 23:35:49 +0800
Subject: [PATCH 0861/1072] make exec command decrement SHLVL correctly & SHLVL
 related test (#14707)

# Description

Rework of #14570, fixing #14567.

`exec` will decrement `SHLVL` env value before passing it to target
executable (in interactive mode).

(Same as last pr, but this time there's no wrong change to current
working code)

Two `SHLVL` related tests were also added this time.
---
 crates/nu-command/src/system/exec.rs | 10 ++++++++++
 tests/shell/environment/env.rs       | 20 ++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/crates/nu-command/src/system/exec.rs b/crates/nu-command/src/system/exec.rs
index 8a2b24a113..ca0ae4d216 100644
--- a/crates/nu-command/src/system/exec.rs
+++ b/crates/nu-command/src/system/exec.rs
@@ -61,6 +61,16 @@ On Windows based systems, Nushell will wait for the command to finish and then e
         let envs = env_to_strings(engine_state, stack)?;
         command.env_clear();
         command.envs(envs);
+        // Decrement SHLVL as removing the current shell from the stack
+        // (only works in interactive mode, same as initialization)
+        if engine_state.is_interactive {
+            let shlvl = engine_state
+                .get_env_var("SHLVL")
+                .and_then(|shlvl_env| shlvl_env.coerce_str().ok()?.parse::<i64>().ok())
+                .unwrap_or(1)
+                .saturating_sub(1);
+            command.env("SHLVL", shlvl.to_string());
+        }
 
         // Configure args.
         let args = crate::eval_arguments_from_call(engine_state, stack, call)?;
diff --git a/tests/shell/environment/env.rs b/tests/shell/environment/env.rs
index 7e628a92e7..eab193684f 100644
--- a/tests/shell/environment/env.rs
+++ b/tests/shell/environment/env.rs
@@ -229,3 +229,23 @@ fn std_log_env_vars_have_defaults() {
     assert!(actual.err.contains("%MSG%"));
     assert!(actual.err.contains("%Y-"));
 }
+
+#[test]
+fn env_shlvl() {
+    let actual = nu!("
+        $env.SHLVL = 5
+        nu -i -c 'print $env.SHLVL'
+    ");
+
+    assert_eq!(actual.out, "6");
+}
+
+#[test]
+fn env_shlvl_in_exec() {
+    let actual = nu!("
+        $env.SHLVL = 29
+        nu -i -c \"exec nu -i -c 'print $env.SHLVL'\"
+    ");
+
+    assert_eq!(actual.out, "30");
+}

From a0d4ae18ee4db64b0a8412638fe7b59878516e6a Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Tue, 31 Dec 2024 16:04:23 -0600
Subject: [PATCH 0862/1072] better error message for "sum", "product", and
 "sum_of_squares" (#14711)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

This PR tries to improve a few error messages.

### Before

![image](https://github.com/user-attachments/assets/58ab3ff6-baab-4075-8746-e83cb3acab14)

### After

![image](https://github.com/user-attachments/assets/9653776a-371b-4454-b092-3cc49f1329cd)

 
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/math/reducers.rs       | 8 ++++----
 crates/nu-command/src/math/variance.rs       | 6 +++---
 crates/nu-command/tests/commands/math/sum.rs | 4 +---
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/crates/nu-command/src/math/reducers.rs b/crates/nu-command/src/math/reducers.rs
index 86d0f8d7e4..6bda6fa632 100644
--- a/crates/nu-command/src/math/reducers.rs
+++ b/crates/nu-command/src/math/reducers.rs
@@ -111,8 +111,8 @@ pub fn sum(data: Vec<Value>, span: Span, head: Span) -> Result<Value, ShellError
             Value::Error { error, .. } => return Err(*error.clone()),
             other => {
                 return Err(ShellError::UnsupportedInput {
-                    msg: "Attempted to compute the sum of a value that cannot be summed"
-                        .to_string(),
+                    msg: format!("Attempted to compute the sum of a value '{}' that cannot be summed with a type of `{}`.",
+                        other.coerce_string()?, other.get_type()),
                     input: "value originates from here".into(),
                     msg_span: head,
                     input_span: other.span(),
@@ -150,8 +150,8 @@ pub fn product(data: Vec<Value>, span: Span, head: Span) -> Result<Value, ShellE
             Value::Error { error, .. } => return Err(*error.clone()),
             other => {
                 return Err(ShellError::UnsupportedInput {
-                    msg: "Attempted to compute the product of a value that cannot be multiplied"
-                        .to_string(),
+                    msg: format!("Attempted to compute the product of a value '{}' that cannot be multiplied with a type of `{}`.",
+                        other.coerce_string()?, other.get_type()),
                     input: "value originates from here".into(),
                     msg_span: head,
                     input_span: other.span(),
diff --git a/crates/nu-command/src/math/variance.rs b/crates/nu-command/src/math/variance.rs
index 8422009230..91128e36cd 100644
--- a/crates/nu-command/src/math/variance.rs
+++ b/crates/nu-command/src/math/variance.rs
@@ -90,9 +90,9 @@ fn sum_of_squares(values: &[Value], span: Span) -> Result<Value, ShellError> {
         let v = match &value {
             Value::Int { .. } | Value::Float { .. } => Ok(value),
             Value::Error { error, .. } => Err(*error.clone()),
-            _ => Err(ShellError::UnsupportedInput {
-                msg: "Attempted to compute the sum of squares of a non-int, non-float value"
-                    .to_string(),
+            other => Err(ShellError::UnsupportedInput {
+                msg: format!("Attempted to compute the sum of squares of a non-int, non-float value '{}' with a type of `{}`.",
+                        other.coerce_string()?, other.get_type()),
                 input: "value originates from here".into(),
                 msg_span: span,
                 input_span: value.span(),
diff --git a/crates/nu-command/tests/commands/math/sum.rs b/crates/nu-command/tests/commands/math/sum.rs
index 048a12e9e3..020ce552c9 100644
--- a/crates/nu-command/tests/commands/math/sum.rs
+++ b/crates/nu-command/tests/commands/math/sum.rs
@@ -73,9 +73,7 @@ fn sum_of_a_row_containing_a_table_is_an_error() {
         cwd: "tests/fixtures/formats/",
         "open sample-sys-output.json | math sum"
     );
-    assert!(actual
-        .err
-        .contains("Attempted to compute the sum of a value that cannot be summed"));
+    assert!(actual.err.contains("can't convert record"));
 }
 
 #[test]

From 76afa743208ccd09cc749f25f8f37b55018efdba Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Tue, 31 Dec 2024 21:05:43 -0500
Subject: [PATCH 0863/1072] `open`: Assign `content_type` metadata for
 filetypes not handled with a `from` converter (#14670)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

Filetypes which are converted during `open` should not have (and have
not had) a `content_type` metadata field. However, filetypes which
aren't converted now behave the same as with `--raw` and assign the
appropriate `content_type`.

## Before

```nushell
open toolkit.nu | metadata
# => ╭────────┬────────────────────────────────────────────╮
# => │ source │ /home/ntd/src/ntd-forks/nushell/toolkit.nu │
# => ╰────────┴────────────────────────────────────────────

open --raw toolkit.nu | metadata
# => ╭──────────────┬────────────────────────────────────────────╮
# => │ source       │ /home/ntd/src/ntd-forks/nushell/toolkit.nu │
# => │ content_type │ application/x-nuscript                     │
# => ╰──────────────┴────────────────────────────────────────────╯

open script.py | metadata
# => ╭────────┬─────────────────────────────╮
# => │ source │ /home/ntd/testing/script.py │
# => ╰────────┴─────────────────────────────╯

open Cargo.toml | metadata
# => ╭────────┬────────────────────────────────────────────╮
# => │ source │ /home/ntd/src/ntd-forks/nushell/Cargo.toml │
# => ╰────────┴────────────────────────────────────────────╯
```

## After

```nushell
# Not converted, so adds content_type
open toolkit.nu | metadata
# => ╭──────────────┬────────────────────────────────────────────╮
# => │ source       │ /home/ntd/src/ntd-forks/nushell/toolkit.nu │
# => │ content_type │ application/x-nuscript                     │
# => ╰──────────────┴────────────────────────────────────────────╯

# Not converted, so adds content_type
open --raw toolkit.nu | metadata
# => ╭──────────────┬────────────────────────────────────────────╮
# => │ source       │ /home/ntd/src/ntd-forks/nushell/toolkit.nu │
# => │ content_type │ application/x-nuscript                     │
# => ╰──────────────┴────────────────────────────────────────────╯

# Not converted, so adds content_type
open script.py | metadata
# => ╭──────────────┬─────────────────────────────╮
# => │ source       │ /home/ntd/testing/script.py │
# => │ content_type │ text/plain                  │
# => ╰──────────────┴─────────────────────────────

# Converted, so does not add content_type (no change)
open Cargo.toml | metadata
# => ╭────────┬────────────────────────────────────────────╮
# => │ source │ /home/ntd/src/ntd-forks/nushell/Cargo.toml │
# => ╰────────┴────────────────────────────────────────────╯
```

# User-Facing Changes

`open <file>` assigns the appropriate content type when the filetype is
not converted via a `from <format>`.

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

N/A
---
 crates/nu-command/src/filesystem/open.rs | 29 ++++++++-------
 crates/nu-command/tests/commands/open.rs | 45 ++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 13 deletions(-)

diff --git a/crates/nu-command/src/filesystem/open.rs b/crates/nu-command/src/filesystem/open.rs
index d9240cfae5..7cbce3902b 100644
--- a/crates/nu-command/src/filesystem/open.rs
+++ b/crates/nu-command/src/filesystem/open.rs
@@ -145,22 +145,12 @@ impl Command for Open {
                         }
                     };
 
-                    // Assigning content type should only happen in raw mode. Otherwise, the content
-                    // will potentially be in one of the built-in nushell `from xxx` formats and therefore
-                    // cease to be in the original content-type.... or so I'm told. :)
-                    let content_type = if raw {
-                        path.extension()
-                            .map(|ext| ext.to_string_lossy().to_string())
-                            .and_then(|ref s| detect_content_type(s))
-                    } else {
-                        None
-                    };
-
+                    // No content_type by default - Is added later if no converter is found
                     let stream = PipelineData::ByteStream(
                         ByteStream::file(file, call_span, engine_state.signals().clone()),
                         Some(PipelineMetadata {
                             data_source: DataSource::FilePath(path.to_path_buf()),
-                            content_type,
+                            content_type: None,
                         }),
                     );
 
@@ -203,7 +193,20 @@ impl Command for Open {
                                 }
                                 })?);
                         }
-                        None => output.push(stream),
+                        None => {
+                            // If no converter was found, add content-type metadata
+                            let content_type = path
+                                .extension()
+                                .map(|ext| ext.to_string_lossy().to_string())
+                                .and_then(|ref s| detect_content_type(s));
+
+                            let stream_with_content_type =
+                                stream.set_metadata(Some(PipelineMetadata {
+                                    data_source: DataSource::FilePath(path.to_path_buf()),
+                                    content_type,
+                                }));
+                            output.push(stream_with_content_type);
+                        }
                     }
                 }
             }
diff --git a/crates/nu-command/tests/commands/open.rs b/crates/nu-command/tests/commands/open.rs
index c3e7db137f..986b621c99 100644
--- a/crates/nu-command/tests/commands/open.rs
+++ b/crates/nu-command/tests/commands/open.rs
@@ -403,3 +403,48 @@ fn test_content_types_with_open_raw() {
         assert!(result.out.contains("application/yaml"));
     })
 }
+
+#[test]
+fn test_metadata_without_raw() {
+    Playground::setup("open_files_content_type_test", |dirs, _| {
+        let result = nu!(cwd: dirs.formats(), "(open random_numbers.csv | metadata | get content_type?) == null");
+        assert_eq!(result.out, "true");
+        let result = nu!(cwd: dirs.formats(), "open random_numbers.csv | metadata | get source?");
+        assert!(result.out.contains("random_numbers.csv"));
+        let result = nu!(cwd: dirs.formats(), "(open caco3_plastics.tsv | metadata | get content_type?) == null");
+        assert_eq!(result.out, "true");
+        let result = nu!(cwd: dirs.formats(), "open caco3_plastics.tsv | metadata | get source?");
+        assert!(result.out.contains("caco3_plastics.tsv"));
+        let result = nu!(cwd: dirs.formats(), "(open sample-simple.json | metadata | get content_type?) == null");
+        assert_eq!(result.out, "true");
+        let result = nu!(cwd: dirs.formats(), "open sample-simple.json | metadata | get source?");
+        assert!(result.out.contains("sample-simple.json"));
+        // Only when not using nu_plugin_formats
+        let result = nu!(cwd: dirs.formats(), "open sample.ini | metadata");
+        assert!(result.out.contains("text/plain"));
+        let result = nu!(cwd: dirs.formats(), "open sample.ini | metadata | get source?");
+        assert!(result.out.contains("sample.ini"));
+        let result = nu!(cwd: dirs.formats(), "(open sample_data.xlsx | metadata | get content_type?) == null");
+        assert_eq!(result.out, "true");
+        let result = nu!(cwd: dirs.formats(), "open sample_data.xlsx | metadata | get source?");
+        assert!(result.out.contains("sample_data.xlsx"));
+        let result = nu!(cwd: dirs.formats(), "open sample_def.nu | metadata | get content_type?");
+        assert_eq!(result.out, "application/x-nuscript");
+        let result = nu!(cwd: dirs.formats(), "open sample_def.nu | metadata | get source?");
+        assert!(result.out.contains("sample_def"));
+        // Only when not using nu_plugin_formats
+        let result = nu!(cwd: dirs.formats(), "open sample.eml | metadata | get content_type?");
+        assert_eq!(result.out, "message/rfc822");
+        let result = nu!(cwd: dirs.formats(), "open sample.eml | metadata | get source?");
+        assert!(result.out.contains("sample.eml"));
+        let result = nu!(cwd: dirs.formats(), "(open cargo_sample.toml | metadata | get content_type?) == null");
+        assert_eq!(result.out, "true");
+        let result = nu!(cwd: dirs.formats(), "open cargo_sample.toml | metadata | get source?");
+        assert!(result.out.contains("cargo_sample.toml"));
+        let result =
+            nu!(cwd: dirs.formats(), "(open appveyor.yml | metadata | get content_type?) == null");
+        assert_eq!(result.out, "true");
+        let result = nu!(cwd: dirs.formats(), "open appveyor.yml | metadata | get source?");
+        assert!(result.out.contains("appveyor.yml"));
+    })
+}

From c6523eb8d9353a9d66ab10e0e8cd1953b3ce9e9a Mon Sep 17 00:00:00 2001
From: Maxim Zhiburt <zhiburt@gmail.com>
Date: Wed, 1 Jan 2025 17:09:23 +0300
Subject: [PATCH 0864/1072] [WIP] Try to fix tabled panic (#14710)

cc: @fdncred
---
 crates/nu-table/src/util.rs | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/crates/nu-table/src/util.rs b/crates/nu-table/src/util.rs
index 4e4d06f52d..8384ef144f 100644
--- a/crates/nu-table/src/util.rs
+++ b/crates/nu-table/src/util.rs
@@ -55,27 +55,25 @@ pub fn clean_charset(text: &str) -> String {
     // We could shrink it but...it will be another realloc which make no scense.
     let mut buf = String::with_capacity(text.len());
 
+    // note: (Left just in case)
+    // note: This check could be added in order to cope with emojie issue.
+    // if c < ' ' && c != '\u{1b}' {
+    //    continue;
+    // }
+
     for c in text.chars() {
-        if c == '\n' {
-            buf.push(c);
-            continue;
+        match c {
+            '\r' => continue,
+            '\t' => {
+                buf.push(' ');
+                buf.push(' ');
+                buf.push(' ');
+                buf.push(' ');
+            }
+            c => {
+                buf.push(c);
+            }
         }
-
-        if c == '\t' {
-            buf.push(' ');
-            buf.push(' ');
-            buf.push(' ');
-            buf.push(' ');
-            continue;
-        }
-
-        // note: Overall maybe we shall delete this check?
-        // it was made in order to cope with emojie issue.
-        // if c < ' ' && c != '\u{1b}' {
-        //    continue;
-        // }
-
-        buf.push(c);
     }
 
     buf

From f69b22f00b66f9aa9e2ce5e65f5fc8842fbc88fc Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Wed, 1 Jan 2025 17:37:50 -0600
Subject: [PATCH 0865/1072] replace regex crate with fancy_regex (#14646)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

We removed the regex crate long ago but there were a few instances where
we could not remove it because fancy-regex did not have a split/splitn,
and maybe other functions. Those functions now exist in the latest
fancy-regex crate so we can now remove it.
 
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock                                    |   3 +-
 Cargo.toml                                    |   2 +-
 crates/nu-command/Cargo.toml                  |   1 -
 .../nu-command/src/conversions/into/value.rs  | 244 ++++++++++--------
 crates/nu-command/src/help/help_.rs           |   4 +-
 crates/nu-command/src/strings/split/column.rs |   7 +-
 crates/nu-command/src/strings/split/list.rs   |   5 +-
 crates/nu-command/src/strings/split/row.rs    |  33 ++-
 tests/eval/mod.rs                             |   6 +-
 9 files changed, 181 insertions(+), 124 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 194c9898da..c9b4436c5e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3584,6 +3584,7 @@ dependencies = [
  "crossterm 0.28.1",
  "ctrlc",
  "dirs",
+ "fancy-regex",
  "log",
  "miette",
  "mimalloc",
@@ -3611,7 +3612,6 @@ dependencies = [
  "openssl",
  "pretty_assertions",
  "reedline",
- "regex",
  "rstest",
  "serde_json",
  "serial_test",
@@ -3811,7 +3811,6 @@ dependencies = [
  "rand",
  "rand_chacha",
  "rayon",
- "regex",
  "rmp",
  "roxmltree",
  "rstest",
diff --git a/Cargo.toml b/Cargo.toml
index a13c5489d8..ce52af8b67 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -246,7 +246,7 @@ assert_cmd = "2.0"
 dirs = { workspace = true }
 tango-bench = "0.6"
 pretty_assertions = { workspace = true }
-regex = { workspace = true }
+fancy-regex = { workspace = true }
 rstest = { workspace = true, default-features = false }
 serial_test = "3.2"
 tempfile = { workspace = true }
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 98dce2061c..d00ea542aa 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -76,7 +76,6 @@ quick-xml = { workspace = true }
 rand = { workspace = true, optional = true }
 getrandom = { workspace = true, optional = true }
 rayon = { workspace = true }
-regex = { workspace = true }
 roxmltree = { workspace = true }
 rusqlite = { workspace = true, features = ["bundled", "backup", "chrono"], optional = true }
 rmp = { workspace = true }
diff --git a/crates/nu-command/src/conversions/into/value.rs b/crates/nu-command/src/conversions/into/value.rs
index 2d5ae3b17d..de371e27b9 100644
--- a/crates/nu-command/src/conversions/into/value.rs
+++ b/crates/nu-command/src/conversions/into/value.rs
@@ -1,7 +1,7 @@
 use crate::parse_date_from_string;
+use fancy_regex::{Regex, RegexBuilder};
 use nu_engine::command_prelude::*;
 use nu_protocol::PipelineIterator;
-use regex::{Regex, RegexBuilder};
 use std::collections::HashSet;
 use std::sync::LazyLock;
 
@@ -143,7 +143,7 @@ fn process_cell(val: Value, display_as_filesizes: bool, span: Span) -> Result<Va
     let val_str = val.coerce_str().unwrap_or_default();
 
     // step 2: bounce string up against regexes
-    if BOOLEAN_RE.is_match(&val_str) {
+    if BOOLEAN_RE.is_match(&val_str).unwrap_or(false) {
         let bval = val_str
             .parse::<bool>()
             .map_err(|_| ShellError::CantConvert {
@@ -156,12 +156,12 @@ fn process_cell(val: Value, display_as_filesizes: bool, span: Span) -> Result<Va
             })?;
 
         Ok(Value::bool(bval, span))
-    } else if FLOAT_RE.is_match(&val_str) {
+    } else if FLOAT_RE.is_match(&val_str).unwrap_or(false) {
         let fval = val_str
             .parse::<f64>()
             .map_err(|_| ShellError::CantConvert {
-                to_type: "string".to_string(),
-                from_type: "float".to_string(),
+                to_type: "float".to_string(),
+                from_type: "string".to_string(),
                 span,
                 help: Some(format!(
                     r#""{val_str}" does not represent a valid floating point value"#
@@ -169,12 +169,12 @@ fn process_cell(val: Value, display_as_filesizes: bool, span: Span) -> Result<Va
             })?;
 
         Ok(Value::float(fval, span))
-    } else if INTEGER_RE.is_match(&val_str) {
+    } else if INTEGER_RE.is_match(&val_str).unwrap_or(false) {
         let ival = val_str
             .parse::<i64>()
             .map_err(|_| ShellError::CantConvert {
-                to_type: "string".to_string(),
-                from_type: "int".to_string(),
+                to_type: "int".to_string(),
+                from_type: "string".to_string(),
                 span,
                 help: Some(format!(
                     r#""{val_str}" does not represent a valid integer value"#
@@ -186,15 +186,15 @@ fn process_cell(val: Value, display_as_filesizes: bool, span: Span) -> Result<Va
         } else {
             Ok(Value::int(ival, span))
         }
-    } else if INTEGER_WITH_DELIMS_RE.is_match(&val_str) {
+    } else if INTEGER_WITH_DELIMS_RE.is_match(&val_str).unwrap_or(false) {
         let mut val_str = val_str.into_owned();
         val_str.retain(|x| !['_', ','].contains(&x));
 
         let ival = val_str
             .parse::<i64>()
             .map_err(|_| ShellError::CantConvert {
-                to_type: "string".to_string(),
-                from_type: "int".to_string(),
+                to_type: "int".to_string(),
+                from_type: "string".to_string(),
                 span,
                 help: Some(format!(
                     r#""{val_str}" does not represent a valid integer value"#
@@ -206,7 +206,7 @@ fn process_cell(val: Value, display_as_filesizes: bool, span: Span) -> Result<Va
         } else {
             Ok(Value::int(ival, span))
         }
-    } else if DATETIME_DMY_RE.is_match(&val_str) {
+    } else if DATETIME_DMY_RE.is_match(&val_str).unwrap_or(false) {
         let dt = parse_date_from_string(&val_str, span).map_err(|_| ShellError::CantConvert {
             to_type: "date".to_string(),
             from_type: "string".to_string(),
@@ -217,7 +217,7 @@ fn process_cell(val: Value, display_as_filesizes: bool, span: Span) -> Result<Va
         })?;
 
         Ok(Value::date(dt, span))
-    } else if DATETIME_YMD_RE.is_match(&val_str) {
+    } else if DATETIME_YMD_RE.is_match(&val_str).unwrap_or(false) {
         let dt = parse_date_from_string(&val_str, span).map_err(|_| ShellError::CantConvert {
             to_type: "date".to_string(),
             from_type: "string".to_string(),
@@ -228,7 +228,7 @@ fn process_cell(val: Value, display_as_filesizes: bool, span: Span) -> Result<Va
         })?;
 
         Ok(Value::date(dt, span))
-    } else if DATETIME_YMDZ_RE.is_match(&val_str) {
+    } else if DATETIME_YMDZ_RE.is_match(&val_str).unwrap_or(false) {
         let dt = parse_date_from_string(&val_str, span).map_err(|_| ShellError::CantConvert {
             to_type: "date".to_string(),
             from_type: "string".to_string(),
@@ -372,118 +372,154 @@ mod test {
     #[test]
     fn test_float_parse() {
         // The regex should work on all these but nushell's float parser is more strict
-        assert!(FLOAT_RE.is_match("0.1"));
-        assert!(FLOAT_RE.is_match("3.0"));
-        assert!(FLOAT_RE.is_match("3.00001"));
-        assert!(FLOAT_RE.is_match("-9.9990e-003"));
-        assert!(FLOAT_RE.is_match("9.9990e+003"));
-        assert!(FLOAT_RE.is_match("9.9990E+003"));
-        assert!(FLOAT_RE.is_match("9.9990E+003"));
-        assert!(FLOAT_RE.is_match(".5"));
-        assert!(FLOAT_RE.is_match("2.5E-10"));
-        assert!(FLOAT_RE.is_match("2.5e10"));
-        assert!(FLOAT_RE.is_match("NaN"));
-        assert!(FLOAT_RE.is_match("-NaN"));
-        assert!(FLOAT_RE.is_match("-inf"));
-        assert!(FLOAT_RE.is_match("inf"));
-        assert!(FLOAT_RE.is_match("-7e-05"));
-        assert!(FLOAT_RE.is_match("7e-05"));
-        assert!(FLOAT_RE.is_match("+7e+05"));
+        assert!(FLOAT_RE.is_match("0.1").unwrap());
+        assert!(FLOAT_RE.is_match("3.0").unwrap());
+        assert!(FLOAT_RE.is_match("3.00001").unwrap());
+        assert!(FLOAT_RE.is_match("-9.9990e-003").unwrap());
+        assert!(FLOAT_RE.is_match("9.9990e+003").unwrap());
+        assert!(FLOAT_RE.is_match("9.9990E+003").unwrap());
+        assert!(FLOAT_RE.is_match("9.9990E+003").unwrap());
+        assert!(FLOAT_RE.is_match(".5").unwrap());
+        assert!(FLOAT_RE.is_match("2.5E-10").unwrap());
+        assert!(FLOAT_RE.is_match("2.5e10").unwrap());
+        assert!(FLOAT_RE.is_match("NaN").unwrap());
+        assert!(FLOAT_RE.is_match("-NaN").unwrap());
+        assert!(FLOAT_RE.is_match("-inf").unwrap());
+        assert!(FLOAT_RE.is_match("inf").unwrap());
+        assert!(FLOAT_RE.is_match("-7e-05").unwrap());
+        assert!(FLOAT_RE.is_match("7e-05").unwrap());
+        assert!(FLOAT_RE.is_match("+7e+05").unwrap());
     }
 
     #[test]
     fn test_int_parse() {
-        assert!(INTEGER_RE.is_match("0"));
-        assert!(INTEGER_RE.is_match("1"));
-        assert!(INTEGER_RE.is_match("10"));
-        assert!(INTEGER_RE.is_match("100"));
-        assert!(INTEGER_RE.is_match("1000"));
-        assert!(INTEGER_RE.is_match("10000"));
-        assert!(INTEGER_RE.is_match("100000"));
-        assert!(INTEGER_RE.is_match("1000000"));
-        assert!(INTEGER_RE.is_match("10000000"));
-        assert!(INTEGER_RE.is_match("100000000"));
-        assert!(INTEGER_RE.is_match("1000000000"));
-        assert!(INTEGER_RE.is_match("10000000000"));
-        assert!(INTEGER_RE.is_match("100000000000"));
-        assert!(INTEGER_WITH_DELIMS_RE.is_match("1_000"));
-        assert!(INTEGER_WITH_DELIMS_RE.is_match("10_000"));
-        assert!(INTEGER_WITH_DELIMS_RE.is_match("100_000"));
-        assert!(INTEGER_WITH_DELIMS_RE.is_match("1_000_000"));
-        assert!(INTEGER_WITH_DELIMS_RE.is_match("10_000_000"));
-        assert!(INTEGER_WITH_DELIMS_RE.is_match("100_000_000"));
-        assert!(INTEGER_WITH_DELIMS_RE.is_match("1_000_000_000"));
-        assert!(INTEGER_WITH_DELIMS_RE.is_match("10_000_000_000"));
-        assert!(INTEGER_WITH_DELIMS_RE.is_match("100_000_000_000"));
-        assert!(INTEGER_WITH_DELIMS_RE.is_match("1,000"));
-        assert!(INTEGER_WITH_DELIMS_RE.is_match("10,000"));
-        assert!(INTEGER_WITH_DELIMS_RE.is_match("100,000"));
-        assert!(INTEGER_WITH_DELIMS_RE.is_match("1,000,000"));
-        assert!(INTEGER_WITH_DELIMS_RE.is_match("10,000,000"));
-        assert!(INTEGER_WITH_DELIMS_RE.is_match("100,000,000"));
-        assert!(INTEGER_WITH_DELIMS_RE.is_match("1,000,000,000"));
-        assert!(INTEGER_WITH_DELIMS_RE.is_match("10,000,000,000"));
+        assert!(INTEGER_RE.is_match("0").unwrap());
+        assert!(INTEGER_RE.is_match("1").unwrap());
+        assert!(INTEGER_RE.is_match("10").unwrap());
+        assert!(INTEGER_RE.is_match("100").unwrap());
+        assert!(INTEGER_RE.is_match("1000").unwrap());
+        assert!(INTEGER_RE.is_match("10000").unwrap());
+        assert!(INTEGER_RE.is_match("100000").unwrap());
+        assert!(INTEGER_RE.is_match("1000000").unwrap());
+        assert!(INTEGER_RE.is_match("10000000").unwrap());
+        assert!(INTEGER_RE.is_match("100000000").unwrap());
+        assert!(INTEGER_RE.is_match("1000000000").unwrap());
+        assert!(INTEGER_RE.is_match("10000000000").unwrap());
+        assert!(INTEGER_RE.is_match("100000000000").unwrap());
+        assert!(INTEGER_WITH_DELIMS_RE.is_match("1_000").unwrap());
+        assert!(INTEGER_WITH_DELIMS_RE.is_match("10_000").unwrap());
+        assert!(INTEGER_WITH_DELIMS_RE.is_match("100_000").unwrap());
+        assert!(INTEGER_WITH_DELIMS_RE.is_match("1_000_000").unwrap());
+        assert!(INTEGER_WITH_DELIMS_RE.is_match("10_000_000").unwrap());
+        assert!(INTEGER_WITH_DELIMS_RE.is_match("100_000_000").unwrap());
+        assert!(INTEGER_WITH_DELIMS_RE.is_match("1_000_000_000").unwrap());
+        assert!(INTEGER_WITH_DELIMS_RE.is_match("10_000_000_000").unwrap());
+        assert!(INTEGER_WITH_DELIMS_RE.is_match("100_000_000_000").unwrap());
+        assert!(INTEGER_WITH_DELIMS_RE.is_match("1,000").unwrap());
+        assert!(INTEGER_WITH_DELIMS_RE.is_match("10,000").unwrap());
+        assert!(INTEGER_WITH_DELIMS_RE.is_match("100,000").unwrap());
+        assert!(INTEGER_WITH_DELIMS_RE.is_match("1,000,000").unwrap());
+        assert!(INTEGER_WITH_DELIMS_RE.is_match("10,000,000").unwrap());
+        assert!(INTEGER_WITH_DELIMS_RE.is_match("100,000,000").unwrap());
+        assert!(INTEGER_WITH_DELIMS_RE.is_match("1,000,000,000").unwrap());
+        assert!(INTEGER_WITH_DELIMS_RE.is_match("10,000,000,000").unwrap());
     }
 
     #[test]
     fn test_bool_parse() {
-        assert!(BOOLEAN_RE.is_match("true"));
-        assert!(BOOLEAN_RE.is_match("false"));
-        assert!(!BOOLEAN_RE.is_match("1"));
-        assert!(!BOOLEAN_RE.is_match("0"));
+        assert!(BOOLEAN_RE.is_match("true").unwrap());
+        assert!(BOOLEAN_RE.is_match("false").unwrap());
+        assert!(!BOOLEAN_RE.is_match("1").unwrap());
+        assert!(!BOOLEAN_RE.is_match("0").unwrap());
     }
 
     #[test]
     fn test_datetime_ymdz_pattern() {
-        assert!(DATETIME_YMDZ_RE.is_match("2022-01-01T00:00:00Z"));
-        assert!(DATETIME_YMDZ_RE.is_match("2022-01-01T00:00:00.123456789Z"));
-        assert!(DATETIME_YMDZ_RE.is_match("2022-01-01T00:00:00+01:00"));
-        assert!(DATETIME_YMDZ_RE.is_match("2022-01-01T00:00:00.123456789+01:00"));
-        assert!(DATETIME_YMDZ_RE.is_match("2022-01-01T00:00:00-01:00"));
-        assert!(DATETIME_YMDZ_RE.is_match("2022-01-01T00:00:00.123456789-01:00"));
-        assert!(DATETIME_YMDZ_RE.is_match("'2022-01-01T00:00:00Z'"));
+        assert!(DATETIME_YMDZ_RE.is_match("2022-01-01T00:00:00Z").unwrap());
+        assert!(DATETIME_YMDZ_RE
+            .is_match("2022-01-01T00:00:00.123456789Z")
+            .unwrap());
+        assert!(DATETIME_YMDZ_RE
+            .is_match("2022-01-01T00:00:00+01:00")
+            .unwrap());
+        assert!(DATETIME_YMDZ_RE
+            .is_match("2022-01-01T00:00:00.123456789+01:00")
+            .unwrap());
+        assert!(DATETIME_YMDZ_RE
+            .is_match("2022-01-01T00:00:00-01:00")
+            .unwrap());
+        assert!(DATETIME_YMDZ_RE
+            .is_match("2022-01-01T00:00:00.123456789-01:00")
+            .unwrap());
+        assert!(DATETIME_YMDZ_RE.is_match("'2022-01-01T00:00:00Z'").unwrap());
 
-        assert!(!DATETIME_YMDZ_RE.is_match("2022-01-01T00:00:00"));
-        assert!(!DATETIME_YMDZ_RE.is_match("2022-01-01T00:00:00."));
-        assert!(!DATETIME_YMDZ_RE.is_match("2022-01-01T00:00:00.123456789"));
-        assert!(!DATETIME_YMDZ_RE.is_match("2022-01-01T00:00:00+01"));
-        assert!(!DATETIME_YMDZ_RE.is_match("2022-01-01T00:00:00+01:0"));
-        assert!(!DATETIME_YMDZ_RE.is_match("2022-01-01T00:00:00+1:00"));
-        assert!(!DATETIME_YMDZ_RE.is_match("2022-01-01T00:00:00.123456789+01"));
-        assert!(!DATETIME_YMDZ_RE.is_match("2022-01-01T00:00:00.123456789+01:0"));
-        assert!(!DATETIME_YMDZ_RE.is_match("2022-01-01T00:00:00.123456789+1:00"));
-        assert!(!DATETIME_YMDZ_RE.is_match("2022-01-01T00:00:00-01"));
-        assert!(!DATETIME_YMDZ_RE.is_match("2022-01-01T00:00:00-01:0"));
-        assert!(!DATETIME_YMDZ_RE.is_match("2022-01-01T00:00:00-1:00"));
-        assert!(!DATETIME_YMDZ_RE.is_match("2022-01-01T00:00:00.123456789-01"));
-        assert!(!DATETIME_YMDZ_RE.is_match("2022-01-01T00:00:00.123456789-01:0"));
-        assert!(!DATETIME_YMDZ_RE.is_match("2022-01-01T00:00:00.123456789-1:00"));
+        assert!(!DATETIME_YMDZ_RE.is_match("2022-01-01T00:00:00").unwrap());
+        assert!(!DATETIME_YMDZ_RE.is_match("2022-01-01T00:00:00.").unwrap());
+        assert!(!DATETIME_YMDZ_RE
+            .is_match("2022-01-01T00:00:00.123456789")
+            .unwrap());
+        assert!(!DATETIME_YMDZ_RE.is_match("2022-01-01T00:00:00+01").unwrap());
+        assert!(!DATETIME_YMDZ_RE
+            .is_match("2022-01-01T00:00:00+01:0")
+            .unwrap());
+        assert!(!DATETIME_YMDZ_RE
+            .is_match("2022-01-01T00:00:00+1:00")
+            .unwrap());
+        assert!(!DATETIME_YMDZ_RE
+            .is_match("2022-01-01T00:00:00.123456789+01")
+            .unwrap());
+        assert!(!DATETIME_YMDZ_RE
+            .is_match("2022-01-01T00:00:00.123456789+01:0")
+            .unwrap());
+        assert!(!DATETIME_YMDZ_RE
+            .is_match("2022-01-01T00:00:00.123456789+1:00")
+            .unwrap());
+        assert!(!DATETIME_YMDZ_RE.is_match("2022-01-01T00:00:00-01").unwrap());
+        assert!(!DATETIME_YMDZ_RE
+            .is_match("2022-01-01T00:00:00-01:0")
+            .unwrap());
+        assert!(!DATETIME_YMDZ_RE
+            .is_match("2022-01-01T00:00:00-1:00")
+            .unwrap());
+        assert!(!DATETIME_YMDZ_RE
+            .is_match("2022-01-01T00:00:00.123456789-01")
+            .unwrap());
+        assert!(!DATETIME_YMDZ_RE
+            .is_match("2022-01-01T00:00:00.123456789-01:0")
+            .unwrap());
+        assert!(!DATETIME_YMDZ_RE
+            .is_match("2022-01-01T00:00:00.123456789-1:00")
+            .unwrap());
     }
 
     #[test]
     fn test_datetime_ymd_pattern() {
-        assert!(DATETIME_YMD_RE.is_match("2022-01-01"));
-        assert!(DATETIME_YMD_RE.is_match("2022/01/01"));
-        assert!(DATETIME_YMD_RE.is_match("2022-01-01T00:00:00"));
-        assert!(DATETIME_YMD_RE.is_match("2022-01-01T00:00:00.000000000"));
-        assert!(DATETIME_YMD_RE.is_match("'2022-01-01'"));
+        assert!(DATETIME_YMD_RE.is_match("2022-01-01").unwrap());
+        assert!(DATETIME_YMD_RE.is_match("2022/01/01").unwrap());
+        assert!(DATETIME_YMD_RE.is_match("2022-01-01T00:00:00").unwrap());
+        assert!(DATETIME_YMD_RE
+            .is_match("2022-01-01T00:00:00.000000000")
+            .unwrap());
+        assert!(DATETIME_YMD_RE.is_match("'2022-01-01'").unwrap());
 
         // The regex isn't this specific, but it would be nice if it were
-        // assert!(!DATETIME_YMD_RE.is_match("2022-13-01"));
-        // assert!(!DATETIME_YMD_RE.is_match("2022-01-32"));
-        // assert!(!DATETIME_YMD_RE.is_match("2022-01-01T24:00:00"));
-        // assert!(!DATETIME_YMD_RE.is_match("2022-01-01T00:60:00"));
-        // assert!(!DATETIME_YMD_RE.is_match("2022-01-01T00:00:60"));
-        assert!(!DATETIME_YMD_RE.is_match("2022-01-01T00:00:00.0000000000"));
+        // assert!(!DATETIME_YMD_RE.is_match("2022-13-01").unwrap());
+        // assert!(!DATETIME_YMD_RE.is_match("2022-01-32").unwrap());
+        // assert!(!DATETIME_YMD_RE.is_match("2022-01-01T24:00:00").unwrap());
+        // assert!(!DATETIME_YMD_RE.is_match("2022-01-01T00:60:00").unwrap());
+        // assert!(!DATETIME_YMD_RE.is_match("2022-01-01T00:00:60").unwrap());
+        assert!(!DATETIME_YMD_RE
+            .is_match("2022-01-01T00:00:00.0000000000")
+            .unwrap());
     }
 
     #[test]
     fn test_datetime_dmy_pattern() {
-        assert!(DATETIME_DMY_RE.is_match("31-12-2021"));
-        assert!(DATETIME_DMY_RE.is_match("01/01/2022"));
-        assert!(DATETIME_DMY_RE.is_match("15-06-2023 12:30"));
-        assert!(!DATETIME_DMY_RE.is_match("2022-13-01"));
-        assert!(!DATETIME_DMY_RE.is_match("2022-01-32"));
-        assert!(!DATETIME_DMY_RE.is_match("2022-01-01 24:00"));
+        assert!(DATETIME_DMY_RE.is_match("31-12-2021").unwrap());
+        assert!(DATETIME_DMY_RE.is_match("01/01/2022").unwrap());
+        assert!(DATETIME_DMY_RE.is_match("15-06-2023 12:30").unwrap());
+        assert!(!DATETIME_DMY_RE.is_match("2022-13-01").unwrap());
+        assert!(!DATETIME_DMY_RE.is_match("2022-01-32").unwrap());
+        assert!(!DATETIME_DMY_RE.is_match("2022-01-01 24:00").unwrap());
     }
 }
diff --git a/crates/nu-command/src/help/help_.rs b/crates/nu-command/src/help/help_.rs
index ff24f84206..3cdd27a672 100644
--- a/crates/nu-command/src/help/help_.rs
+++ b/crates/nu-command/src/help/help_.rs
@@ -1,5 +1,5 @@
 use crate::help::{help_aliases, help_commands, help_modules};
-use fancy_regex::Regex;
+use fancy_regex::{escape, Regex};
 use nu_ansi_term::Style;
 use nu_engine::command_prelude::*;
 use nu_utils::IgnoreCaseExt;
@@ -193,7 +193,7 @@ pub fn highlight_search_string(
     string_style: &Style,
     highlight_style: &Style,
 ) -> Result<String, ShellError> {
-    let escaped_needle = regex::escape(needle);
+    let escaped_needle = escape(needle);
     let regex_string = format!("(?i){escaped_needle}");
     let regex = match Regex::new(&regex_string) {
         Ok(regex) => regex,
diff --git a/crates/nu-command/src/strings/split/column.rs b/crates/nu-command/src/strings/split/column.rs
index 3ed56a56ae..3f355a43c0 100644
--- a/crates/nu-command/src/strings/split/column.rs
+++ b/crates/nu-command/src/strings/split/column.rs
@@ -1,7 +1,6 @@
+use fancy_regex::{escape, Regex};
 use nu_engine::command_prelude::*;
 
-use regex::Regex;
-
 #[derive(Clone)]
 pub struct SubCommand;
 
@@ -182,7 +181,7 @@ fn split_column(
     let regex = if args.has_regex {
         Regex::new(&args.separator.item)
     } else {
-        let escaped = regex::escape(&args.separator.item);
+        let escaped = escape(&args.separator.item);
         Regex::new(&escaped)
     }
     .map_err(|e| ShellError::GenericError {
@@ -220,10 +219,12 @@ fn split_column_helper(
         let split_result: Vec<_> = match max_split {
             Some(max_split) => separator
                 .splitn(&s, max_split)
+                .filter_map(|x| x.ok())
                 .filter(|x| !(collapse_empty && x.is_empty()))
                 .collect(),
             None => separator
                 .split(&s)
+                .filter_map(|x| x.ok())
                 .filter(|x| !(collapse_empty && x.is_empty()))
                 .collect(),
         };
diff --git a/crates/nu-command/src/strings/split/list.rs b/crates/nu-command/src/strings/split/list.rs
index 82f7ec730a..d960b9a515 100644
--- a/crates/nu-command/src/strings/split/list.rs
+++ b/crates/nu-command/src/strings/split/list.rs
@@ -1,7 +1,6 @@
+use fancy_regex::Regex;
 use nu_engine::command_prelude::*;
 
-use regex::Regex;
-
 #[derive(Clone)]
 pub struct SubCommand;
 
@@ -193,7 +192,7 @@ impl Matcher {
         Ok(match self {
             Matcher::Regex(regex) => {
                 if let Ok(rhs_str) = rhs.coerce_str() {
-                    regex.is_match(&rhs_str)
+                    regex.is_match(&rhs_str).unwrap_or(false)
                 } else {
                     false
                 }
diff --git a/crates/nu-command/src/strings/split/row.rs b/crates/nu-command/src/strings/split/row.rs
index 73da7e6de8..939ac1cc7f 100644
--- a/crates/nu-command/src/strings/split/row.rs
+++ b/crates/nu-command/src/strings/split/row.rs
@@ -1,7 +1,6 @@
+use fancy_regex::{escape, Regex};
 use nu_engine::command_prelude::*;
 
-use regex::Regex;
-
 #[derive(Clone)]
 pub struct SubCommand;
 
@@ -158,7 +157,7 @@ fn split_row(
     let regex = if args.has_regex {
         Regex::new(&args.separator.item)
     } else {
-        let escaped = regex::escape(&args.separator.item);
+        let escaped = escape(&args.separator.item);
         Regex::new(&escaped)
     }
     .map_err(|e| ShellError::GenericError {
@@ -187,11 +186,35 @@ fn split_row_helper(v: &Value, regex: &Regex, max_split: Option<usize>, name: Sp
                 match max_split {
                     Some(max_split) => regex
                         .splitn(&s, max_split)
-                        .map(|x: &str| Value::string(x, v_span))
+                        .map(|x| match x {
+                            Ok(val) => Value::string(val, v_span),
+                            Err(err) => Value::error(
+                                ShellError::GenericError {
+                                    error: "Error with regular expression".into(),
+                                    msg: err.to_string(),
+                                    span: Some(v_span),
+                                    help: None,
+                                    inner: vec![],
+                                },
+                                v_span,
+                            ),
+                        })
                         .collect(),
                     None => regex
                         .split(&s)
-                        .map(|x: &str| Value::string(x, v_span))
+                        .map(|x| match x {
+                            Ok(val) => Value::string(val, v_span),
+                            Err(err) => Value::error(
+                                ShellError::GenericError {
+                                    error: "Error with regular expression".into(),
+                                    msg: err.to_string(),
+                                    span: Some(v_span),
+                                    help: None,
+                                    inner: vec![],
+                                },
+                                v_span,
+                            ),
+                        })
                         .collect(),
                 }
             } else {
diff --git a/tests/eval/mod.rs b/tests/eval/mod.rs
index b7ad76d32d..c84cdaa873 100644
--- a/tests/eval/mod.rs
+++ b/tests/eval/mod.rs
@@ -1,5 +1,5 @@
+use fancy_regex::Regex;
 use nu_test_support::{nu, playground::Playground};
-use regex::Regex;
 
 #[test]
 fn record_with_redefined_key() {
@@ -45,7 +45,7 @@ fn test_eval(source: &str, expected_out: ExpectedOut) {
             Matches(regex) => {
                 let compiled_regex = Regex::new(regex).expect("regex failed to compile");
                 assert!(
-                    compiled_regex.is_match(&actual.out),
+                    compiled_regex.is_match(&actual.out).unwrap_or(false),
                     "eval out does not match: {}\n{}",
                     regex,
                     actual.out,
@@ -55,7 +55,7 @@ fn test_eval(source: &str, expected_out: ExpectedOut) {
             Error(regex) => {
                 let compiled_regex = Regex::new(regex).expect("regex failed to compile");
                 assert!(
-                    compiled_regex.is_match(&actual.err),
+                    compiled_regex.is_match(&actual.err).unwrap_or(false),
                     "eval err does not match: {}",
                     regex
                 );

From 62bd6fe08b92873f8f01a1445087e4cdf07880ff Mon Sep 17 00:00:00 2001
From: Yash Thakur <45539777+ysthakur@users.noreply.github.com>
Date: Wed, 1 Jan 2025 19:04:17 -0500
Subject: [PATCH 0866/1072] Create nu_glob::is_glob function (#14717)

# Description

Adds an `is_glob` function to the nu-glob crate that takes a string
pattern and returns whether or not it's a glob that would be expanded by
nu-glob. Right now, this just means checking if it contains `*`, `?`, or
`[`.

Previously, this same code was duplicated in the following places:
- `ls`: Determining whether to read a folder's contents or expand a glob
- `run_external.rs` in nu-command: Arguments to externals only have
n-dots and tilde expansion applied if they weren't globs
- `glob_from` in nu-engine:
  - `glob_from` can get the prefix in a simpler way for non-globs
- If the canonical path for a non-glob path contains glob
metacharacters, it needs to be escaped
- `completion_common.rs` in nu-cli: File/folder completions containing
glob metacharacters need to be wrapped in quotes

All of these locations can use `nu_glob::is_glob` now instead of rolling
their own checks. This does mean that nu-cli now has a dependency on
nu-glob.

# User-Facing Changes

Users of nu-glob will now be able to check if a given pattern is a glob
expanded by nu-glob.

For users of Nushell, completion suggestions for files containing `]`
will no longer be wrapped in quotes if they contain no other glob
metacharacters. This is because unmatched `]`s are ignored by nu-glob,
but we used to consider such file completions contaminated anyway.

# Tests + Formatting

This is a very basic function, so I just added some doctests.

# After Submitting

This is meant to be used in
https://github.com/nushell/nushell/pull/14674.
---
 Cargo.lock                                    |  1 +
 crates/nu-cli/Cargo.toml                      |  1 +
 .../src/completions/completion_common.rs      |  3 +--
 crates/nu-command/src/filesystem/ls.rs        |  4 +---
 crates/nu-command/src/system/run_external.rs  |  6 ++----
 crates/nu-engine/src/glob_from.rs             | 10 ++++-----
 crates/nu-glob/src/lib.rs                     | 21 +++++++++++++++++++
 7 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c9b4436c5e..65d98c9fb1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3649,6 +3649,7 @@ dependencies = [
  "nu-color-config",
  "nu-command",
  "nu-engine",
+ "nu-glob",
  "nu-parser",
  "nu-path",
  "nu-plugin-engine",
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 00b146dba1..fc9b838af7 100644
--- a/crates/nu-cli/Cargo.toml
+++ b/crates/nu-cli/Cargo.toml
@@ -20,6 +20,7 @@ tempfile = { workspace = true }
 [dependencies]
 nu-cmd-base = { path = "../nu-cmd-base", version = "0.101.1" }
 nu-engine = { path = "../nu-engine", version = "0.101.1", features = ["os"] }
+nu-glob = { path = "../nu-glob", version = "0.101.1" }
 nu-path = { path = "../nu-path", version = "0.101.1" }
 nu-parser = { path = "../nu-parser", version = "0.101.1" }
 nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.101.1", optional = true }
diff --git a/crates/nu-cli/src/completions/completion_common.rs b/crates/nu-cli/src/completions/completion_common.rs
index 4ab0f8f509..6212196627 100644
--- a/crates/nu-cli/src/completions/completion_common.rs
+++ b/crates/nu-cli/src/completions/completion_common.rs
@@ -286,8 +286,7 @@ pub fn complete_item(
 // Fix files or folders with quotes or hashes
 pub fn escape_path(path: String, dir: bool) -> String {
     // make glob pattern have the highest priority.
-    let glob_contaminated = path.contains(['[', '*', ']', '?']);
-    if glob_contaminated {
+    if nu_glob::is_glob(path.as_str()) {
         return if path.contains('\'') {
             // decide to use double quote, also need to escape `"` in path
             // or else users can't do anything with completed path either.
diff --git a/crates/nu-command/src/filesystem/ls.rs b/crates/nu-command/src/filesystem/ls.rs
index 2df34af855..68f35c5294 100644
--- a/crates/nu-command/src/filesystem/ls.rs
+++ b/crates/nu-command/src/filesystem/ls.rs
@@ -33,8 +33,6 @@ struct Args {
     call_span: Span,
 }
 
-const GLOB_CHARS: &[char] = &['*', '?', '['];
-
 impl Command for Ls {
     fn name(&self) -> &str {
         "ls"
@@ -291,7 +289,7 @@ fn ls_for_one_pattern(
                 {
                     return Ok(Value::test_nothing().into_pipeline_data());
                 }
-                just_read_dir = !(pat.item.is_expand() && pat.item.as_ref().contains(GLOB_CHARS));
+                just_read_dir = !(pat.item.is_expand() && nu_glob::is_glob(pat.item.as_ref()));
             }
 
             // it's absolute path if:
diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index 304b0fff8d..af597d459c 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -340,11 +340,9 @@ fn expand_glob(
     span: Span,
     signals: &Signals,
 ) -> Result<Vec<OsString>, ShellError> {
-    const GLOB_CHARS: &[char] = &['*', '?', '['];
-
-    // For an argument that doesn't include the GLOB_CHARS, just do the `expand_tilde`
+    // For an argument that isn't a glob, just do the `expand_tilde`
     // and `expand_ndots` expansion
-    if !arg.contains(GLOB_CHARS) {
+    if !nu_glob::is_glob(arg) {
         let path = expand_ndots_safe(expand_tilde(arg));
         return Ok(vec![path.into()]);
     }
diff --git a/crates/nu-engine/src/glob_from.rs b/crates/nu-engine/src/glob_from.rs
index 2847a3c5b4..376b3c2baf 100644
--- a/crates/nu-engine/src/glob_from.rs
+++ b/crates/nu-engine/src/glob_from.rs
@@ -6,8 +6,6 @@ use std::{
     path::{Component, Path, PathBuf},
 };
 
-const GLOB_CHARS: &[char] = &['*', '?', '['];
-
 /// This function is like `nu_glob::glob` from the `glob` crate, except it is relative to a given cwd.
 ///
 /// It returns a tuple of two values: the first is an optional prefix that the expanded filenames share.
@@ -29,7 +27,7 @@ pub fn glob_from(
     ShellError,
 > {
     let no_glob_for_pattern = matches!(pattern.item, NuGlob::DoNotExpand(_));
-    let (prefix, pattern) = if pattern.item.as_ref().contains(GLOB_CHARS) {
+    let (prefix, pattern) = if nu_glob::is_glob(pattern.item.as_ref()) {
         // Pattern contains glob, split it
         let mut p = PathBuf::new();
         let path = PathBuf::from(&pattern.item.as_ref());
@@ -38,7 +36,7 @@ pub fn glob_from(
 
         for c in components {
             if let Component::Normal(os) = c {
-                if os.to_string_lossy().contains(GLOB_CHARS) {
+                if nu_glob::is_glob(os.to_string_lossy().as_ref()) {
                     break;
                 }
             }
@@ -73,8 +71,8 @@ pub fn glob_from(
             (path.parent().map(|parent| parent.to_path_buf()), path)
         } else {
             let path = if let Ok(p) = canonicalize_with(path.clone(), cwd) {
-                if p.to_string_lossy().contains(GLOB_CHARS) {
-                    // our path might contains GLOB_CHARS too
+                if nu_glob::is_glob(p.to_string_lossy().as_ref()) {
+                    // our path might contain glob metacharacters too.
                     // in such case, we need to escape our path to make
                     // glob work successfully
                     PathBuf::from(nu_glob::Pattern::escape(&p.to_string_lossy()))
diff --git a/crates/nu-glob/src/lib.rs b/crates/nu-glob/src/lib.rs
index 602500fa1a..30eec9f9e9 100644
--- a/crates/nu-glob/src/lib.rs
+++ b/crates/nu-glob/src/lib.rs
@@ -313,6 +313,27 @@ pub fn glob_with_parent(
     }
 }
 
+const GLOB_CHARS: &[char] = &['*', '?', '['];
+
+/// Returns true if the given pattern is a glob, false if it's merely text to be
+/// matched exactly.
+///
+/// ```rust
+/// assert!(nu_glob::is_glob("foo/*"));
+/// assert!(nu_glob::is_glob("foo/**/bar"));
+/// assert!(nu_glob::is_glob("foo?"));
+/// assert!(nu_glob::is_glob("foo[A]"));
+///
+/// assert!(!nu_glob::is_glob("foo"));
+/// // nu_glob will ignore an unmatched ']'
+/// assert!(!nu_glob::is_glob("foo]"));
+/// // nu_glob doesn't expand {}
+/// assert!(!nu_glob::is_glob("foo.{txt,png}"));
+/// ```
+pub fn is_glob(pattern: &str) -> bool {
+    pattern.contains(GLOB_CHARS)
+}
+
 /// A glob iteration error.
 ///
 /// This is typically returned when a particular path cannot be read

From c46ca36bcdb05e0eb663a1eac75a16071c993946 Mon Sep 17 00:00:00 2001
From: Henry Jetmundsen <32406734+hjetmundsen@users.noreply.github.com>
Date: Wed, 1 Jan 2025 17:38:15 -0800
Subject: [PATCH 0867/1072] Add glob support to utouch (issue #13623) (#14674)

# Description
These changes resolve #13623 where globs are not handled by `utouch`.

# User-Facing Changes
- Glob patterns passed to `utouch` will be resolved to all individual
files that match the pattern. For example, running `utouch *.txt` in a
directory that already has `file1.txt` and `file2.txt` is the same thing
as running `utouch file1.txt file2.txt`. All flags such as `-a`, `-m`
and `-c` will be respected.
- If a glob pattern is provided to `utouch` and doesn't match any files,
a file will be created with the literal name of the glob pattern. This
only applies to Linux/MacOS because Windows forbids creating file names
with restricted characters (see [naming a file
docs](https://learn.microsoft.com/en-us/windows/win32/fileio/naming-a-file))

---------

Co-authored-by: Henry Jetmundsen <hjetmundsen@atlassian.com>
---
 crates/nu-command/src/filesystem/utouch.rs | 53 +++++++++++++++++++++-
 crates/nu-command/tests/commands/utouch.rs | 53 ++++++++++++++++++++++
 2 files changed, 104 insertions(+), 2 deletions(-)

diff --git a/crates/nu-command/src/filesystem/utouch.rs b/crates/nu-command/src/filesystem/utouch.rs
index b3d827f7b2..4e3d32d906 100644
--- a/crates/nu-command/src/filesystem/utouch.rs
+++ b/crates/nu-command/src/filesystem/utouch.rs
@@ -1,6 +1,7 @@
 use chrono::{DateTime, FixedOffset};
 use filetime::FileTime;
 use nu_engine::command_prelude::*;
+use nu_glob::{glob, is_glob};
 use nu_path::expand_path_with;
 use nu_protocol::NuGlob;
 use std::{io::ErrorKind, path::PathBuf};
@@ -149,9 +150,52 @@ impl Command for UTouch {
             if file_glob.item.as_ref() == "-" {
                 input_files.push(InputFile::Stdout);
             } else {
-                let path =
+                let file_path =
                     expand_path_with(file_glob.item.as_ref(), &cwd, file_glob.item.is_expand());
-                input_files.push(InputFile::Path(path));
+
+                if !file_glob.item.is_expand() {
+                    input_files.push(InputFile::Path(file_path));
+                    continue;
+                }
+
+                let mut expanded_globs = glob(&file_path.to_string_lossy())
+                    .unwrap_or_else(|_| {
+                        panic!(
+                            "Failed to process file path: {}",
+                            &file_path.to_string_lossy()
+                        )
+                    })
+                    .peekable();
+
+                if expanded_globs.peek().is_none() {
+                    let file_name = file_path.file_name().unwrap_or_else(|| {
+                        panic!(
+                            "Failed to process file path: {}",
+                            &file_path.to_string_lossy()
+                        )
+                    });
+
+                    if is_glob(&file_name.to_string_lossy()) {
+                        return Err(ShellError::GenericError {
+                            error: format!(
+                                "No matches found for glob {}",
+                                file_name.to_string_lossy()
+                            ),
+                            msg: "No matches found for glob".into(),
+                            span: Some(file_glob.span),
+                            help: Some(format!(
+                                "Use quotes if you want to create a file named {}",
+                                file_name.to_string_lossy()
+                            )),
+                            inner: vec![],
+                        });
+                    }
+
+                    input_files.push(InputFile::Path(file_path));
+                    continue;
+                }
+
+                input_files.extend(expanded_globs.filter_map(Result::ok).map(InputFile::Path));
             }
         }
 
@@ -228,6 +272,11 @@ impl Command for UTouch {
                 example: "utouch -m fixture.json",
                 result: None,
             },
+            Example {
+                description: r#"Changes the last modified and accessed time of all files with the .json extension to today's date"#,
+                example: "utouch *.json",
+                result: None,
+            },
             Example {
                 description: "Changes the last accessed and modified times of files a, b and c to the current time but yesterday",
                 example: r#"utouch -d "yesterday" a b c"#,
diff --git a/crates/nu-command/tests/commands/utouch.rs b/crates/nu-command/tests/commands/utouch.rs
index 062ec7ddfc..f0c7ffbff5 100644
--- a/crates/nu-command/tests/commands/utouch.rs
+++ b/crates/nu-command/tests/commands/utouch.rs
@@ -83,6 +83,34 @@ fn creates_two_files() {
     })
 }
 
+// Windows forbids file names with reserved characters
+// https://learn.microsoft.com/en-us/windows/win32/fileio/naming-a-file
+#[test]
+#[cfg(not(windows))]
+fn creates_a_file_when_glob_is_quoted() {
+    Playground::setup("create_test_glob", |dirs, _sandbox| {
+        nu!(
+            cwd: dirs.test(),
+            "utouch '*.txt'"
+        );
+
+        let path = dirs.test().join("*.txt");
+        assert!(path.exists());
+    })
+}
+
+#[test]
+fn fails_when_glob_has_no_matches() {
+    Playground::setup("create_test_glob_no_matches", |dirs, _sandbox| {
+        let actual = nu!(
+            cwd: dirs.test(),
+            "utouch *.txt"
+        );
+
+        assert!(actual.err.contains("No matches found for glob *.txt"));
+    })
+}
+
 #[test]
 fn change_modified_time_of_file_to_today() {
     Playground::setup("change_time_test_9", |dirs, sandbox| {
@@ -168,6 +196,31 @@ fn change_modified_and_access_time_of_file_to_today() {
     })
 }
 
+#[test]
+fn change_modified_and_access_time_of_files_matching_glob_to_today() {
+    Playground::setup("change_mtime_atime_test_glob", |dirs, sandbox| {
+        sandbox.with_files(&[Stub::EmptyFile("file.txt")]);
+
+        let path = dirs.test().join("file.txt");
+        filetime::set_file_times(&path, TIME_ONE, TIME_ONE).unwrap();
+
+        nu!(
+            cwd: dirs.test(),
+            "utouch *.txt"
+        );
+
+        let metadata = path.metadata().unwrap();
+
+        // Check only the date since the time may not match exactly
+        let today = Local::now().date_naive();
+        let mtime_day = DateTime::<Local>::from(metadata.modified().unwrap()).date_naive();
+        let atime_day = DateTime::<Local>::from(metadata.accessed().unwrap()).date_naive();
+
+        assert_eq!(today, mtime_day);
+        assert_eq!(today, atime_day);
+    })
+}
+
 #[test]
 fn not_create_file_if_it_not_exists() {
     Playground::setup("change_time_test_28", |dirs, _sandbox| {

From 80788636ee8a81ee101c8dbfab4f3eeba7cb3e7a Mon Sep 17 00:00:00 2001
From: Yash Thakur <45539777+ysthakur@users.noreply.github.com>
Date: Thu, 2 Jan 2025 07:26:46 -0500
Subject: [PATCH 0868/1072] Make utouch the new touch (#14721)

# Description

This PR removes the old `touch` command in favor of the uutils/coreutils
implementation of `touch`, which we integrated in 0.101 (#11817).

It turns out that in `utouch`, the `--no-deref`/`-s` wasn't working, and
the issue had gone undetected because I accidentally made the test for
that use `touch` rather than `utouch`. This has been fixed now.

# User-Facing Changes

Our old `touch` command didn't have anything that the new uutils-based
command doesn't, and the uutils-based command actually has a little more
functionality. So nothing using `touch` should break.

Scripts using `utouch` will have to use `touch` now, but given that
`utouch` has been around for less than 2 months, I assume people haven't
really been using it.

# Tests + Formatting

The utouch tests seem to have everything from the old touch tests, so I
deleted the old touch tests.

# After Submitting

This will need to be mentioned in the release notes.
---
 crates/nu-command/src/default_context.rs   |   1 -
 crates/nu-command/src/filesystem/mod.rs    |   2 -
 crates/nu-command/src/filesystem/touch.rs  | 249 --------
 crates/nu-command/src/filesystem/utouch.rs |  29 +-
 crates/nu-command/tests/commands/mod.rs    |   1 -
 crates/nu-command/tests/commands/touch.rs  | 654 ---------------------
 crates/nu-command/tests/commands/utouch.rs |  72 +--
 7 files changed, 50 insertions(+), 958 deletions(-)
 delete mode 100644 crates/nu-command/src/filesystem/touch.rs
 delete mode 100644 crates/nu-command/tests/commands/touch.rs

diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index df704fe369..d4b08d80c1 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -241,7 +241,6 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             Start,
             Rm,
             Save,
-            Touch,
             UTouch,
             Glob,
             Watch,
diff --git a/crates/nu-command/src/filesystem/mod.rs b/crates/nu-command/src/filesystem/mod.rs
index 089e899dda..5ceb8aa0b6 100644
--- a/crates/nu-command/src/filesystem/mod.rs
+++ b/crates/nu-command/src/filesystem/mod.rs
@@ -7,7 +7,6 @@ mod open;
 mod rm;
 mod save;
 mod start;
-mod touch;
 mod ucp;
 mod umkdir;
 mod umv;
@@ -24,7 +23,6 @@ pub use mktemp::Mktemp;
 pub use rm::Rm;
 pub use save::Save;
 pub use start::Start;
-pub use touch::Touch;
 pub use ucp::UCp;
 pub use umkdir::UMkdir;
 pub use umv::UMv;
diff --git a/crates/nu-command/src/filesystem/touch.rs b/crates/nu-command/src/filesystem/touch.rs
deleted file mode 100644
index 93b960d843..0000000000
--- a/crates/nu-command/src/filesystem/touch.rs
+++ /dev/null
@@ -1,249 +0,0 @@
-use filetime::FileTime;
-use nu_engine::command_prelude::*;
-use nu_path::expand_path_with;
-use nu_protocol::NuGlob;
-use std::{fs::OpenOptions, time::SystemTime};
-
-#[derive(Clone)]
-pub struct Touch;
-
-impl Command for Touch {
-    fn name(&self) -> &str {
-        "touch"
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["create", "file"]
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("touch")
-            .input_output_types(vec![(Type::Nothing, Type::Nothing)])
-            .rest(
-                "files",
-                SyntaxShape::OneOf(vec![SyntaxShape::GlobPattern, SyntaxShape::Filepath]),
-                "The file(s) to create."
-            )
-            .named(
-                "reference",
-                SyntaxShape::String,
-                "change the file or directory time to the time of the reference file/directory",
-                Some('r'),
-            )
-            .switch(
-                "modified",
-                "change the modification time of the file or directory. If no reference file/directory is given, the current time is used",
-                Some('m'),
-            )
-            .switch(
-                "access",
-                "change the access time of the file or directory. If no reference file/directory is given, the current time is used",
-                Some('a'),
-            )
-            .switch(
-                "no-create",
-                "do not create the file if it does not exist",
-                Some('c'),
-            )
-            .switch(
-                "no-deref",
-                "do not follow symlinks",
-                Some('s')
-            )
-            .category(Category::FileSystem)
-    }
-
-    fn description(&self) -> &str {
-        "Creates one or more files."
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let mut change_mtime: bool = call.has_flag(engine_state, stack, "modified")?;
-        let mut change_atime: bool = call.has_flag(engine_state, stack, "access")?;
-        let no_follow_symlinks: bool = call.has_flag(engine_state, stack, "no-deref")?;
-        let reference: Option<Spanned<String>> = call.get_flag(engine_state, stack, "reference")?;
-        let no_create: bool = call.has_flag(engine_state, stack, "no-create")?;
-        let files = call.rest::<Spanned<NuGlob>>(engine_state, stack, 0)?;
-
-        let cwd = engine_state.cwd(Some(stack))?;
-
-        if files.is_empty() {
-            return Err(ShellError::MissingParameter {
-                param_name: "requires file paths".to_string(),
-                span: call.head,
-            });
-        }
-
-        let mut mtime = SystemTime::now();
-        let mut atime = mtime;
-
-        // Change both times if neither is specified
-        if !change_mtime && !change_atime {
-            change_mtime = true;
-            change_atime = true;
-        }
-
-        if let Some(reference) = reference {
-            let reference_path = nu_path::expand_path_with(reference.item, &cwd, true);
-            let exists = if no_follow_symlinks {
-                // There's no symlink_exists function, so we settle for
-                // getting direct metadata and if it's OK, it exists
-                reference_path.symlink_metadata().is_ok()
-            } else {
-                reference_path.exists()
-            };
-            if !exists {
-                return Err(ShellError::FileNotFoundCustom {
-                    msg: "Reference path not found".into(),
-                    span: reference.span,
-                });
-            }
-
-            let metadata = if no_follow_symlinks {
-                reference_path.symlink_metadata()
-            } else {
-                reference_path.metadata()
-            };
-            let metadata = metadata.map_err(|err| ShellError::IOErrorSpanned {
-                msg: format!("Failed to read metadata: {err}"),
-                span: reference.span,
-            })?;
-            mtime = metadata
-                .modified()
-                .map_err(|err| ShellError::IOErrorSpanned {
-                    msg: format!("Failed to read modified time: {err}"),
-                    span: reference.span,
-                })?;
-            atime = metadata
-                .accessed()
-                .map_err(|err| ShellError::IOErrorSpanned {
-                    msg: format!("Failed to read access time: {err}"),
-                    span: reference.span,
-                })?;
-        }
-
-        for glob in files {
-            let path = expand_path_with(glob.item.as_ref(), &cwd, glob.item.is_expand());
-            let exists = if no_follow_symlinks {
-                path.symlink_metadata().is_ok()
-            } else {
-                path.exists()
-            };
-
-            // If --no-create is passed and the file/dir does not exist there's nothing to do
-            if no_create && !exists {
-                continue;
-            }
-
-            // If --no-deref was passed in, the behavior of touch is to error on missing
-            if no_follow_symlinks && !exists {
-                return Err(ShellError::FileNotFound {
-                    file: path.to_string_lossy().into_owned(),
-                    span: glob.span,
-                });
-            }
-
-            // Create a file at the given path unless the path is a directory (or a symlink with -d)
-            if !path.is_dir() && (!no_follow_symlinks || !path.is_symlink()) {
-                if let Err(err) = OpenOptions::new()
-                    .write(true)
-                    .create(true)
-                    .truncate(false)
-                    .open(&path)
-                {
-                    return Err(ShellError::CreateNotPossible {
-                        msg: format!("Failed to create file: {err}"),
-                        span: glob.span,
-                    });
-                };
-            }
-
-            // We have to inefficiently access the target metadata to not reset it
-            // in set_symlink_file_times, because the filetime doesn't expose individual methods for it
-            let get_target_metadata = || {
-                path.symlink_metadata()
-                    .map_err(|err| ShellError::IOErrorSpanned {
-                        msg: format!("Failed to read metadata: {err}"),
-                        span: glob.span,
-                    })
-            };
-
-            if change_mtime {
-                let result = if no_follow_symlinks {
-                    filetime::set_symlink_file_times(
-                        &path,
-                        if change_atime {
-                            FileTime::from_system_time(atime)
-                        } else {
-                            FileTime::from_system_time(get_target_metadata()?.accessed()?)
-                        },
-                        FileTime::from_system_time(mtime),
-                    )
-                } else {
-                    filetime::set_file_mtime(&path, FileTime::from_system_time(mtime))
-                };
-                if let Err(err) = result {
-                    return Err(ShellError::ChangeModifiedTimeNotPossible {
-                        msg: format!("Failed to change the modified time: {err}"),
-                        span: glob.span,
-                    });
-                };
-            }
-
-            if change_atime {
-                let result = if no_follow_symlinks {
-                    filetime::set_symlink_file_times(
-                        &path,
-                        FileTime::from_system_time(atime),
-                        if change_mtime {
-                            FileTime::from_system_time(mtime)
-                        } else {
-                            FileTime::from_system_time(get_target_metadata()?.modified()?)
-                        },
-                    )
-                } else {
-                    filetime::set_file_atime(&path, FileTime::from_system_time(atime))
-                };
-                if let Err(err) = result {
-                    return Err(ShellError::ChangeAccessTimeNotPossible {
-                        msg: format!("Failed to change the access time: {err}"),
-                        span: glob.span,
-                    });
-                };
-            }
-        }
-
-        Ok(PipelineData::empty())
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Creates \"fixture.json\"",
-                example: "touch fixture.json",
-                result: None,
-            },
-            Example {
-                description: "Creates files a, b and c",
-                example: "touch a b c",
-                result: None,
-            },
-            Example {
-                description: r#"Changes the last modified time of "fixture.json" to today's date"#,
-                example: "touch -m fixture.json",
-                result: None,
-            },
-            Example {
-                description: r#"Changes the last modified time of file d and e to "fixture.json"'s last modified time"#,
-                example: r#"touch -m -r fixture.json d e"#,
-                result: None,
-            },
-        ]
-    }
-}
diff --git a/crates/nu-command/src/filesystem/utouch.rs b/crates/nu-command/src/filesystem/utouch.rs
index 4e3d32d906..9fbf9805de 100644
--- a/crates/nu-command/src/filesystem/utouch.rs
+++ b/crates/nu-command/src/filesystem/utouch.rs
@@ -12,7 +12,7 @@ pub struct UTouch;
 
 impl Command for UTouch {
     fn name(&self) -> &str {
-        "utouch"
+        "touch"
     }
 
     fn search_terms(&self) -> Vec<&str> {
@@ -20,7 +20,7 @@ impl Command for UTouch {
     }
 
     fn signature(&self) -> Signature {
-        Signature::build("utouch")
+        Signature::build("touch")
             .input_output_types(vec![ (Type::Nothing, Type::Nothing) ])
             .rest(
                 "files",
@@ -82,7 +82,7 @@ impl Command for UTouch {
         let change_mtime: bool = call.has_flag(engine_state, stack, "modified")?;
         let change_atime: bool = call.has_flag(engine_state, stack, "access")?;
         let no_create: bool = call.has_flag(engine_state, stack, "no-create")?;
-        let no_deref: bool = call.has_flag(engine_state, stack, "no-dereference")?;
+        let no_deref: bool = call.has_flag(engine_state, stack, "no-deref")?;
         let file_globs = call.rest::<Spanned<NuGlob>>(engine_state, stack, 0)?;
         let cwd = engine_state.cwd(Some(stack))?;
 
@@ -220,12 +220,11 @@ impl Command for UTouch {
                 },
                 TouchError::InvalidDateFormat(date) => ShellError::IncorrectValue {
                     msg: format!("Invalid date: {}", date),
-                    val_span: date_span.expect("utouch should've been given a date"),
+                    val_span: date_span.expect("touch should've been given a date"),
                     call_span: call.head,
                 },
                 TouchError::ReferenceFileInaccessible(reference_path, io_err) => {
-                    let span =
-                        reference_span.expect("utouch should've been given a reference file");
+                    let span = reference_span.expect("touch should've been given a reference file");
                     if io_err.kind() == ErrorKind::NotFound {
                         ShellError::FileNotFound {
                             span,
@@ -259,47 +258,47 @@ impl Command for UTouch {
         vec![
             Example {
                 description: "Creates \"fixture.json\"",
-                example: "utouch fixture.json",
+                example: "touch fixture.json",
                 result: None,
             },
             Example {
                 description: "Creates files a, b and c",
-                example: "utouch a b c",
+                example: "touch a b c",
                 result: None,
             },
             Example {
                 description: r#"Changes the last modified time of "fixture.json" to today's date"#,
-                example: "utouch -m fixture.json",
+                example: "touch -m fixture.json",
                 result: None,
             },
             Example {
                 description: r#"Changes the last modified and accessed time of all files with the .json extension to today's date"#,
-                example: "utouch *.json",
+                example: "touch *.json",
                 result: None,
             },
             Example {
                 description: "Changes the last accessed and modified times of files a, b and c to the current time but yesterday",
-                example: r#"utouch -d "yesterday" a b c"#,
+                example: r#"touch -d "yesterday" a b c"#,
                 result: None,
             },
             Example {
                 description: r#"Changes the last modified time of files d and e to "fixture.json"'s last modified time"#,
-                example: r#"utouch -m -r fixture.json d e"#,
+                example: r#"touch -m -r fixture.json d e"#,
                 result: None,
             },
             Example {
                 description: r#"Changes the last accessed time of "fixture.json" to a datetime"#,
-                example: r#"utouch -a -t 2019-08-24T12:30:30 fixture.json"#,
+                example: r#"touch -a -t 2019-08-24T12:30:30 fixture.json"#,
                 result: None,
             },
             Example {
                 description: r#"Change the last accessed and modified times of stdout"#,
-                example: r#"utouch -"#,
+                example: r#"touch -"#,
                 result: None,
             },
             Example {
                 description: r#"Changes the last accessed and modified times of file a to 1 month before "fixture.json"'s last modified time"#,
-                example: r#"utouch -r fixture.json -d "-1 month" a"#,
+                example: r#"touch -r fixture.json -d "-1 month" a"#,
                 result: None,
             },
         ]
diff --git a/crates/nu-command/tests/commands/mod.rs b/crates/nu-command/tests/commands/mod.rs
index 3de3888823..eb90d56d1e 100644
--- a/crates/nu-command/tests/commands/mod.rs
+++ b/crates/nu-command/tests/commands/mod.rs
@@ -112,7 +112,6 @@ mod take;
 mod tee;
 mod terminal;
 mod to_text;
-mod touch;
 mod transpose;
 mod try_;
 mod ucp;
diff --git a/crates/nu-command/tests/commands/touch.rs b/crates/nu-command/tests/commands/touch.rs
deleted file mode 100644
index b7ab06f511..0000000000
--- a/crates/nu-command/tests/commands/touch.rs
+++ /dev/null
@@ -1,654 +0,0 @@
-use chrono::{DateTime, Local};
-use nu_test_support::fs::{files_exist_at, Stub};
-use nu_test_support::nu;
-use nu_test_support::playground::{Dirs, Playground};
-
-// Use 1 instead of 0 because 0 has a special meaning in Windows
-const TIME_ONE: filetime::FileTime = filetime::FileTime::from_unix_time(1, 0);
-
-#[test]
-fn creates_a_file_when_it_doesnt_exist() {
-    Playground::setup("create_test_1", |dirs, _sandbox| {
-        nu!(
-            cwd: dirs.test(),
-            "touch i_will_be_created.txt"
-        );
-
-        let path = dirs.test().join("i_will_be_created.txt");
-        assert!(path.exists());
-    })
-}
-
-#[test]
-fn creates_two_files() {
-    Playground::setup("create_test_2", |dirs, _sandbox| {
-        nu!(
-            cwd: dirs.test(),
-            "touch a b"
-        );
-
-        let path = dirs.test().join("a");
-        assert!(path.exists());
-
-        let path2 = dirs.test().join("b");
-        assert!(path2.exists());
-    })
-}
-
-#[test]
-fn change_modified_time_of_file_to_today() {
-    Playground::setup("change_time_test_9", |dirs, sandbox| {
-        sandbox.with_files(&[Stub::EmptyFile("file.txt")]);
-        let path = dirs.test().join("file.txt");
-
-        // Set file.txt's times to the past before the test to make sure `touch` actually changes the mtime to today
-        filetime::set_file_times(&path, TIME_ONE, TIME_ONE).unwrap();
-
-        nu!(
-            cwd: dirs.test(),
-            "touch -m file.txt"
-        );
-
-        let metadata = path.metadata().unwrap();
-
-        // Check only the date since the time may not match exactly
-        let today = Local::now().date_naive();
-        let mtime_day = DateTime::<Local>::from(metadata.modified().unwrap()).date_naive();
-
-        assert_eq!(today, mtime_day);
-
-        // Check that atime remains unchanged
-        assert_eq!(
-            TIME_ONE,
-            filetime::FileTime::from_system_time(metadata.accessed().unwrap())
-        );
-    })
-}
-
-#[test]
-fn change_access_time_of_file_to_today() {
-    Playground::setup("change_time_test_18", |dirs, sandbox| {
-        sandbox.with_files(&[Stub::EmptyFile("file.txt")]);
-        let path = dirs.test().join("file.txt");
-
-        // Set file.txt's times to the past before the test to make sure `touch` actually changes the atime to today
-        filetime::set_file_times(&path, TIME_ONE, TIME_ONE).unwrap();
-
-        nu!(
-            cwd: dirs.test(),
-            "touch -a file.txt"
-        );
-
-        let metadata = path.metadata().unwrap();
-
-        // Check only the date since the time may not match exactly
-        let today = Local::now().date_naive();
-        let atime_day = DateTime::<Local>::from(metadata.accessed().unwrap()).date_naive();
-
-        assert_eq!(today, atime_day);
-
-        // Check that mtime remains unchanged
-        assert_eq!(
-            TIME_ONE,
-            filetime::FileTime::from_system_time(metadata.modified().unwrap())
-        );
-    })
-}
-
-#[test]
-fn change_modified_and_access_time_of_file_to_today() {
-    Playground::setup("change_time_test_27", |dirs, sandbox| {
-        sandbox.with_files(&[Stub::EmptyFile("file.txt")]);
-        let path = dirs.test().join("file.txt");
-
-        filetime::set_file_times(&path, TIME_ONE, TIME_ONE).unwrap();
-
-        nu!(
-            cwd: dirs.test(),
-            "touch -a -m file.txt"
-        );
-
-        let metadata = path.metadata().unwrap();
-
-        // Check only the date since the time may not match exactly
-        let today = Local::now().date_naive();
-        let mtime_day = DateTime::<Local>::from(metadata.modified().unwrap()).date_naive();
-        let atime_day = DateTime::<Local>::from(metadata.accessed().unwrap()).date_naive();
-
-        assert_eq!(today, mtime_day);
-        assert_eq!(today, atime_day);
-    })
-}
-
-#[test]
-fn not_create_file_if_it_not_exists() {
-    Playground::setup("change_time_test_28", |dirs, _sandbox| {
-        let outcome = nu!(
-            cwd: dirs.test(),
-            "touch -c file.txt"
-        );
-
-        let path = dirs.test().join("file.txt");
-
-        assert!(!path.exists());
-
-        // If --no-create is improperly handled `touch` may error when trying to change the times of a nonexistent file
-        assert!(outcome.status.success())
-    })
-}
-
-#[test]
-fn change_file_times_if_exists_with_no_create() {
-    Playground::setup(
-        "change_file_times_if_exists_with_no_create",
-        |dirs, sandbox| {
-            sandbox.with_files(&[Stub::EmptyFile("file.txt")]);
-            let path = dirs.test().join("file.txt");
-
-            filetime::set_file_times(&path, TIME_ONE, TIME_ONE).unwrap();
-
-            nu!(
-                cwd: dirs.test(),
-                "touch -c file.txt"
-            );
-
-            let metadata = path.metadata().unwrap();
-
-            // Check only the date since the time may not match exactly
-            let today = Local::now().date_naive();
-            let mtime_day = DateTime::<Local>::from(metadata.modified().unwrap()).date_naive();
-            let atime_day = DateTime::<Local>::from(metadata.accessed().unwrap()).date_naive();
-
-            assert_eq!(today, mtime_day);
-            assert_eq!(today, atime_day);
-        },
-    )
-}
-
-#[test]
-fn creates_file_three_dots() {
-    Playground::setup("create_test_1", |dirs, _sandbox| {
-        nu!(
-            cwd: dirs.test(),
-            "touch file..."
-        );
-
-        let path = dirs.test().join("file...");
-        assert!(path.exists());
-    })
-}
-
-#[test]
-fn creates_file_four_dots() {
-    Playground::setup("create_test_1", |dirs, _sandbox| {
-        nu!(
-            cwd: dirs.test(),
-            "touch file...."
-        );
-
-        let path = dirs.test().join("file....");
-        assert!(path.exists());
-    })
-}
-
-#[test]
-fn creates_file_four_dots_quotation_marks() {
-    Playground::setup("create_test_1", |dirs, _sandbox| {
-        nu!(
-            cwd: dirs.test(),
-            "touch 'file....'"
-        );
-
-        let path = dirs.test().join("file....");
-        assert!(path.exists());
-    })
-}
-
-#[test]
-fn change_file_times_to_reference_file() {
-    Playground::setup("change_dir_times_to_reference_dir", |dirs, sandbox| {
-        sandbox.with_files(&[
-            Stub::EmptyFile("reference_file"),
-            Stub::EmptyFile("target_file"),
-        ]);
-
-        let reference = dirs.test().join("reference_file");
-        let target = dirs.test().join("target_file");
-
-        // Change the times for reference
-        filetime::set_file_times(
-            &reference,
-            filetime::FileTime::from_unix_time(1337, 0),
-            TIME_ONE,
-        )
-        .unwrap();
-
-        // target should have today's date since it was just created, but reference should be different
-        assert_ne!(
-            reference.metadata().unwrap().accessed().unwrap(),
-            target.metadata().unwrap().accessed().unwrap()
-        );
-        assert_ne!(
-            reference.metadata().unwrap().modified().unwrap(),
-            target.metadata().unwrap().modified().unwrap()
-        );
-
-        nu!(
-            cwd: dirs.test(),
-            "touch -r reference_file target_file"
-        );
-
-        assert_eq!(
-            reference.metadata().unwrap().accessed().unwrap(),
-            target.metadata().unwrap().accessed().unwrap()
-        );
-        assert_eq!(
-            reference.metadata().unwrap().modified().unwrap(),
-            target.metadata().unwrap().modified().unwrap()
-        );
-    })
-}
-
-#[test]
-fn change_file_mtime_to_reference() {
-    Playground::setup("change_file_mtime_to_reference", |dirs, sandbox| {
-        sandbox.with_files(&[
-            Stub::EmptyFile("reference_file"),
-            Stub::EmptyFile("target_file"),
-        ]);
-
-        let reference = dirs.test().join("reference_file");
-        let target = dirs.test().join("target_file");
-
-        // Change the times for reference
-        filetime::set_file_times(
-            &reference,
-            TIME_ONE,
-            filetime::FileTime::from_unix_time(1337, 0),
-        )
-        .unwrap();
-
-        // target should have today's date since it was just created, but reference should be different
-        assert_ne!(
-            reference.metadata().unwrap().accessed().unwrap(),
-            target.metadata().unwrap().accessed().unwrap()
-        );
-        assert_ne!(
-            reference.metadata().unwrap().modified().unwrap(),
-            target.metadata().unwrap().modified().unwrap()
-        );
-
-        // Save target's current atime to make sure it is preserved
-        let target_original_atime = target.metadata().unwrap().accessed().unwrap();
-
-        nu!(
-            cwd: dirs.test(),
-            "touch -mr reference_file target_file"
-        );
-
-        assert_eq!(
-            reference.metadata().unwrap().modified().unwrap(),
-            target.metadata().unwrap().modified().unwrap()
-        );
-        assert_ne!(
-            reference.metadata().unwrap().accessed().unwrap(),
-            target.metadata().unwrap().accessed().unwrap()
-        );
-        assert_eq!(
-            target_original_atime,
-            target.metadata().unwrap().accessed().unwrap()
-        );
-    })
-}
-
-#[test]
-fn change_modified_time_of_dir_to_today() {
-    Playground::setup("change_dir_mtime", |dirs, sandbox| {
-        sandbox.mkdir("test_dir");
-        let path = dirs.test().join("test_dir");
-
-        filetime::set_file_mtime(&path, TIME_ONE).unwrap();
-
-        nu!(
-            cwd: dirs.test(),
-            "touch -m test_dir"
-        );
-
-        // Check only the date since the time may not match exactly
-        let today = Local::now().date_naive();
-        let mtime_day =
-            DateTime::<Local>::from(path.metadata().unwrap().modified().unwrap()).date_naive();
-
-        assert_eq!(today, mtime_day);
-    })
-}
-
-#[test]
-fn change_access_time_of_dir_to_today() {
-    Playground::setup("change_dir_atime", |dirs, sandbox| {
-        sandbox.mkdir("test_dir");
-        let path = dirs.test().join("test_dir");
-
-        filetime::set_file_atime(&path, TIME_ONE).unwrap();
-
-        nu!(
-            cwd: dirs.test(),
-            "touch -a test_dir"
-        );
-
-        // Check only the date since the time may not match exactly
-        let today = Local::now().date_naive();
-        let atime_day =
-            DateTime::<Local>::from(path.metadata().unwrap().accessed().unwrap()).date_naive();
-
-        assert_eq!(today, atime_day);
-    })
-}
-
-#[test]
-fn change_modified_and_access_time_of_dir_to_today() {
-    Playground::setup("change_dir_times", |dirs, sandbox| {
-        sandbox.mkdir("test_dir");
-        let path = dirs.test().join("test_dir");
-
-        filetime::set_file_times(&path, TIME_ONE, TIME_ONE).unwrap();
-
-        nu!(
-            cwd: dirs.test(),
-            "touch -a -m test_dir"
-        );
-
-        let metadata = path.metadata().unwrap();
-
-        // Check only the date since the time may not match exactly
-        let today = Local::now().date_naive();
-        let mtime_day = DateTime::<Local>::from(metadata.modified().unwrap()).date_naive();
-        let atime_day = DateTime::<Local>::from(metadata.accessed().unwrap()).date_naive();
-
-        assert_eq!(today, mtime_day);
-        assert_eq!(today, atime_day);
-    })
-}
-
-#[test]
-fn change_dir_three_dots_times() {
-    Playground::setup("change_dir_three_dots_times", |dirs, sandbox| {
-        sandbox.mkdir("test_dir...");
-        let path = dirs.test().join("test_dir...");
-
-        filetime::set_file_times(&path, TIME_ONE, TIME_ONE).unwrap();
-
-        nu!(
-            cwd: dirs.test(),
-            "touch test_dir..."
-        );
-
-        let metadata = path.metadata().unwrap();
-
-        // Check only the date since the time may not match exactly
-        let today = Local::now().date_naive();
-        let mtime_day = DateTime::<Local>::from(metadata.modified().unwrap()).date_naive();
-        let atime_day = DateTime::<Local>::from(metadata.accessed().unwrap()).date_naive();
-
-        assert_eq!(today, mtime_day);
-        assert_eq!(today, atime_day);
-    })
-}
-
-#[test]
-fn change_dir_times_to_reference_dir() {
-    Playground::setup("change_dir_times_to_reference_dir", |dirs, sandbox| {
-        sandbox.mkdir("reference_dir");
-        sandbox.mkdir("target_dir");
-
-        let reference = dirs.test().join("reference_dir");
-        let target = dirs.test().join("target_dir");
-
-        // Change the times for reference
-        filetime::set_file_times(
-            &reference,
-            filetime::FileTime::from_unix_time(1337, 0),
-            TIME_ONE,
-        )
-        .unwrap();
-
-        // target should have today's date since it was just created, but reference should be different
-        assert_ne!(
-            reference.metadata().unwrap().accessed().unwrap(),
-            target.metadata().unwrap().accessed().unwrap()
-        );
-        assert_ne!(
-            reference.metadata().unwrap().modified().unwrap(),
-            target.metadata().unwrap().modified().unwrap()
-        );
-
-        nu!(
-            cwd: dirs.test(),
-            "touch -r reference_dir target_dir"
-        );
-
-        assert_eq!(
-            reference.metadata().unwrap().accessed().unwrap(),
-            target.metadata().unwrap().accessed().unwrap()
-        );
-        assert_eq!(
-            reference.metadata().unwrap().modified().unwrap(),
-            target.metadata().unwrap().modified().unwrap()
-        );
-    })
-}
-
-#[test]
-fn change_dir_atime_to_reference() {
-    Playground::setup("change_dir_atime_to_reference", |dirs, sandbox| {
-        sandbox.mkdir("reference_dir");
-        sandbox.mkdir("target_dir");
-
-        let reference = dirs.test().join("reference_dir");
-        let target = dirs.test().join("target_dir");
-
-        // Change the times for reference
-        filetime::set_file_times(
-            &reference,
-            filetime::FileTime::from_unix_time(1337, 0),
-            TIME_ONE,
-        )
-        .unwrap();
-
-        // target should have today's date since it was just created, but reference should be different
-        assert_ne!(
-            reference.metadata().unwrap().accessed().unwrap(),
-            target.metadata().unwrap().accessed().unwrap()
-        );
-        assert_ne!(
-            reference.metadata().unwrap().modified().unwrap(),
-            target.metadata().unwrap().modified().unwrap()
-        );
-
-        // Save target's current mtime to make sure it is preserved
-        let target_original_mtime = target.metadata().unwrap().modified().unwrap();
-
-        nu!(
-            cwd: dirs.test(),
-            "touch -ar reference_dir target_dir"
-        );
-
-        assert_eq!(
-            reference.metadata().unwrap().accessed().unwrap(),
-            target.metadata().unwrap().accessed().unwrap()
-        );
-        assert_ne!(
-            reference.metadata().unwrap().modified().unwrap(),
-            target.metadata().unwrap().modified().unwrap()
-        );
-        assert_eq!(
-            target_original_mtime,
-            target.metadata().unwrap().modified().unwrap()
-        );
-    })
-}
-
-#[test]
-fn create_a_file_with_tilde() {
-    Playground::setup("touch with tilde", |dirs, _| {
-        let actual = nu!(cwd: dirs.test(), "touch '~tilde'");
-        assert!(actual.err.is_empty());
-        assert!(files_exist_at(&["~tilde"], dirs.test()));
-
-        // pass variable
-        let actual = nu!(cwd: dirs.test(), "let f = '~tilde2'; touch $f");
-        assert!(actual.err.is_empty());
-        assert!(files_exist_at(&["~tilde2"], dirs.test()));
-    })
-}
-
-#[test]
-fn respects_cwd() {
-    Playground::setup("touch_respects_cwd", |dirs, _sandbox| {
-        nu!(
-            cwd: dirs.test(),
-            "mkdir 'dir'; cd 'dir'; touch 'i_will_be_created.txt'"
-        );
-
-        let path = dirs.test().join("dir/i_will_be_created.txt");
-        assert!(path.exists());
-    })
-}
-
-#[test]
-fn reference_respects_cwd() {
-    Playground::setup("touch_reference_respects_cwd", |dirs, _sandbox| {
-        nu!(
-            cwd: dirs.test(),
-            "mkdir 'dir'; cd 'dir'; touch 'ref.txt'; touch --reference 'ref.txt' 'foo.txt'"
-        );
-
-        let path = dirs.test().join("dir/foo.txt");
-        assert!(path.exists());
-    })
-}
-
-fn setup_symlink_fs(dirs: &Dirs, sandbox: &mut Playground<'_>) {
-    sandbox.mkdir("d");
-    sandbox.with_files(&[Stub::EmptyFile("f"), Stub::EmptyFile("d/f")]);
-    sandbox.symlink("f", "fs");
-    sandbox.symlink("d", "ds");
-    sandbox.symlink("d/f", "fds");
-
-    // sandbox.symlink does not handle symlinks to missing files well. It panics
-    // But they are useful, and they should be tested.
-    #[cfg(unix)]
-    {
-        std::os::unix::fs::symlink(dirs.test().join("m"), dirs.test().join("fms")).unwrap();
-    }
-
-    #[cfg(windows)]
-    {
-        std::os::windows::fs::symlink_file(dirs.test().join("m"), dirs.test().join("fms")).unwrap();
-    }
-
-    // Change the file times to a known "old" value for comparison
-    filetime::set_symlink_file_times(dirs.test().join("f"), TIME_ONE, TIME_ONE).unwrap();
-    filetime::set_symlink_file_times(dirs.test().join("d"), TIME_ONE, TIME_ONE).unwrap();
-    filetime::set_symlink_file_times(dirs.test().join("d/f"), TIME_ONE, TIME_ONE).unwrap();
-    filetime::set_symlink_file_times(dirs.test().join("ds"), TIME_ONE, TIME_ONE).unwrap();
-    filetime::set_symlink_file_times(dirs.test().join("fs"), TIME_ONE, TIME_ONE).unwrap();
-    filetime::set_symlink_file_times(dirs.test().join("fds"), TIME_ONE, TIME_ONE).unwrap();
-    filetime::set_symlink_file_times(dirs.test().join("fms"), TIME_ONE, TIME_ONE).unwrap();
-}
-
-fn get_times(path: &nu_path::AbsolutePath) -> (filetime::FileTime, filetime::FileTime) {
-    let metadata = path.symlink_metadata().unwrap();
-
-    (
-        filetime::FileTime::from_system_time(metadata.accessed().unwrap()),
-        filetime::FileTime::from_system_time(metadata.modified().unwrap()),
-    )
-}
-
-#[test]
-fn follow_symlinks() {
-    Playground::setup("touch_follows_symlinks", |dirs, sandbox| {
-        setup_symlink_fs(&dirs, sandbox);
-
-        let missing = dirs.test().join("m");
-        assert!(!missing.exists());
-
-        nu!(
-            cwd: dirs.test(),
-            "
-                touch fds
-                touch ds
-                touch fs
-                touch fms
-            "
-        );
-
-        // We created the missing symlink target
-        assert!(missing.exists());
-
-        // The timestamps for files and directories were changed from TIME_ONE
-        let file_times = get_times(&dirs.test().join("f"));
-        let dir_times = get_times(&dirs.test().join("d"));
-        let dir_file_times = get_times(&dirs.test().join("d/f"));
-
-        assert_ne!(file_times, (TIME_ONE, TIME_ONE));
-        assert_ne!(dir_times, (TIME_ONE, TIME_ONE));
-        assert_ne!(dir_file_times, (TIME_ONE, TIME_ONE));
-
-        // For symlinks, they remain (mostly) the same
-        // We can't test accessed times, since to reach the target file, the symlink must be accessed!
-        let file_symlink_times = get_times(&dirs.test().join("fs"));
-        let dir_symlink_times = get_times(&dirs.test().join("ds"));
-        let dir_file_symlink_times = get_times(&dirs.test().join("fds"));
-        let file_missing_symlink_times = get_times(&dirs.test().join("fms"));
-
-        assert_eq!(file_symlink_times.1, TIME_ONE);
-        assert_eq!(dir_symlink_times.1, TIME_ONE);
-        assert_eq!(dir_file_symlink_times.1, TIME_ONE);
-        assert_eq!(file_missing_symlink_times.1, TIME_ONE);
-    })
-}
-
-#[test]
-fn no_follow_symlinks() {
-    Playground::setup("touch_touches_symlinks", |dirs, sandbox| {
-        setup_symlink_fs(&dirs, sandbox);
-
-        let missing = dirs.test().join("m");
-        assert!(!missing.exists());
-
-        nu!(
-            cwd: dirs.test(),
-            "
-                touch fds -s
-                touch ds -s
-                touch fs -s
-                touch fms -s
-            "
-        );
-
-        // We did not create the missing symlink target
-        assert!(!missing.exists());
-
-        // The timestamps for files and directories remain the same
-        let file_times = get_times(&dirs.test().join("f"));
-        let dir_times = get_times(&dirs.test().join("d"));
-        let dir_file_times = get_times(&dirs.test().join("d/f"));
-
-        assert_eq!(file_times, (TIME_ONE, TIME_ONE));
-        assert_eq!(dir_times, (TIME_ONE, TIME_ONE));
-        assert_eq!(dir_file_times, (TIME_ONE, TIME_ONE));
-
-        // For symlinks, everything changed. (except their targets, and paths, and personality)
-        let file_symlink_times = get_times(&dirs.test().join("fs"));
-        let dir_symlink_times = get_times(&dirs.test().join("ds"));
-        let dir_file_symlink_times = get_times(&dirs.test().join("fds"));
-        let file_missing_symlink_times = get_times(&dirs.test().join("fms"));
-
-        assert_ne!(file_symlink_times, (TIME_ONE, TIME_ONE));
-        assert_ne!(dir_symlink_times, (TIME_ONE, TIME_ONE));
-        assert_ne!(dir_file_symlink_times, (TIME_ONE, TIME_ONE));
-        assert_ne!(file_missing_symlink_times, (TIME_ONE, TIME_ONE));
-    })
-}
diff --git a/crates/nu-command/tests/commands/utouch.rs b/crates/nu-command/tests/commands/utouch.rs
index f0c7ffbff5..acdf62ac59 100644
--- a/crates/nu-command/tests/commands/utouch.rs
+++ b/crates/nu-command/tests/commands/utouch.rs
@@ -59,7 +59,7 @@ fn creates_a_file_when_it_doesnt_exist() {
     Playground::setup("create_test_1", |dirs, _sandbox| {
         nu!(
             cwd: dirs.test(),
-            "utouch i_will_be_created.txt"
+            "touch i_will_be_created.txt"
         );
 
         let path = dirs.test().join("i_will_be_created.txt");
@@ -72,7 +72,7 @@ fn creates_two_files() {
     Playground::setup("create_test_2", |dirs, _sandbox| {
         nu!(
             cwd: dirs.test(),
-            "utouch a b"
+            "touch a b"
         );
 
         let path = dirs.test().join("a");
@@ -91,7 +91,7 @@ fn creates_a_file_when_glob_is_quoted() {
     Playground::setup("create_test_glob", |dirs, _sandbox| {
         nu!(
             cwd: dirs.test(),
-            "utouch '*.txt'"
+            "touch '*.txt'"
         );
 
         let path = dirs.test().join("*.txt");
@@ -104,7 +104,7 @@ fn fails_when_glob_has_no_matches() {
     Playground::setup("create_test_glob_no_matches", |dirs, _sandbox| {
         let actual = nu!(
             cwd: dirs.test(),
-            "utouch *.txt"
+            "touch *.txt"
         );
 
         assert!(actual.err.contains("No matches found for glob *.txt"));
@@ -117,12 +117,12 @@ fn change_modified_time_of_file_to_today() {
         sandbox.with_files(&[Stub::EmptyFile("file.txt")]);
         let path = dirs.test().join("file.txt");
 
-        // Set file.txt's times to the past before the test to make sure `utouch` actually changes the mtime to today
+        // Set file.txt's times to the past before the test to make sure `touch` actually changes the mtime to today
         filetime::set_file_times(&path, TIME_ONE, TIME_ONE).unwrap();
 
         nu!(
             cwd: dirs.test(),
-            "utouch -m file.txt"
+            "touch -m file.txt"
         );
 
         let metadata = path.metadata().unwrap();
@@ -147,12 +147,12 @@ fn change_access_time_of_file_to_today() {
         sandbox.with_files(&[Stub::EmptyFile("file.txt")]);
         let path = dirs.test().join("file.txt");
 
-        // Set file.txt's times to the past before the test to make sure `utouch` actually changes the atime to today
+        // Set file.txt's times to the past before the test to make sure `touch` actually changes the atime to today
         filetime::set_file_times(&path, TIME_ONE, TIME_ONE).unwrap();
 
         nu!(
             cwd: dirs.test(),
-            "utouch -a file.txt"
+            "touch -a file.txt"
         );
 
         let metadata = path.metadata().unwrap();
@@ -181,7 +181,7 @@ fn change_modified_and_access_time_of_file_to_today() {
 
         nu!(
             cwd: dirs.test(),
-            "utouch -a -m file.txt"
+            "touch -a -m file.txt"
         );
 
         let metadata = path.metadata().unwrap();
@@ -206,7 +206,7 @@ fn change_modified_and_access_time_of_files_matching_glob_to_today() {
 
         nu!(
             cwd: dirs.test(),
-            "utouch *.txt"
+            "touch *.txt"
         );
 
         let metadata = path.metadata().unwrap();
@@ -226,14 +226,14 @@ fn not_create_file_if_it_not_exists() {
     Playground::setup("change_time_test_28", |dirs, _sandbox| {
         let outcome = nu!(
             cwd: dirs.test(),
-            "utouch -c file.txt"
+            "touch -c file.txt"
         );
 
         let path = dirs.test().join("file.txt");
 
         assert!(!path.exists());
 
-        // If --no-create is improperly handled `utouch` may error when trying to change the times of a nonexistent file
+        // If --no-create is improperly handled `touch` may error when trying to change the times of a nonexistent file
         assert!(outcome.status.success())
     })
 }
@@ -250,7 +250,7 @@ fn change_file_times_if_exists_with_no_create() {
 
             nu!(
                 cwd: dirs.test(),
-                "utouch -c file.txt"
+                "touch -c file.txt"
             );
 
             let metadata = path.metadata().unwrap();
@@ -271,7 +271,7 @@ fn creates_file_three_dots() {
     Playground::setup("create_test_1", |dirs, _sandbox| {
         nu!(
             cwd: dirs.test(),
-            "utouch file..."
+            "touch file..."
         );
 
         let path = dirs.test().join("file...");
@@ -284,7 +284,7 @@ fn creates_file_four_dots() {
     Playground::setup("create_test_1", |dirs, _sandbox| {
         nu!(
             cwd: dirs.test(),
-            "utouch file...."
+            "touch file...."
         );
 
         let path = dirs.test().join("file....");
@@ -297,7 +297,7 @@ fn creates_file_four_dots_quotation_marks() {
     Playground::setup("create_test_1", |dirs, _sandbox| {
         nu!(
             cwd: dirs.test(),
-            "utouch 'file....'"
+            "touch 'file....'"
         );
 
         let path = dirs.test().join("file....");
@@ -331,7 +331,7 @@ fn change_file_times_to_reference_file() {
 
         nu!(
             cwd: dirs.test(),
-            "utouch -r reference_file target_file"
+            "touch -r reference_file target_file"
         );
 
         assert_eq!(
@@ -367,7 +367,7 @@ fn change_file_mtime_to_reference() {
 
         nu!(
             cwd: dirs.test(),
-            "utouch -mr reference_file target_file"
+            "touch -mr reference_file target_file"
         );
 
         assert_eq!(
@@ -416,7 +416,7 @@ fn change_file_times_to_reference_file_with_date() {
 
             nu!(
                 cwd: dirs.test(),
-                r#"utouch -r reference_file -d "yesterday" target_file"#
+                r#"touch -r reference_file -d "yesterday" target_file"#
             );
 
             let (got_atime, got_mtime) = file_times(target);
@@ -445,7 +445,7 @@ fn change_file_times_to_timestamp() {
             .unwrap()
             .to_rfc3339();
 
-        nu!(cwd: dirs.test(), format!("utouch --timestamp {} target_file", timestamp));
+        nu!(cwd: dirs.test(), format!("touch --timestamp {} target_file", timestamp));
 
         assert_eq!((TIME_ONE, TIME_ONE), file_times(target));
     })
@@ -461,7 +461,7 @@ fn change_modified_time_of_dir_to_today() {
 
         nu!(
             cwd: dirs.test(),
-            "utouch -m test_dir"
+            "touch -m test_dir"
         );
 
         // Check only the date since the time may not match exactly
@@ -483,7 +483,7 @@ fn change_access_time_of_dir_to_today() {
 
         nu!(
             cwd: dirs.test(),
-            "utouch -a test_dir"
+            "touch -a test_dir"
         );
 
         // Check only the date since the time may not match exactly
@@ -505,7 +505,7 @@ fn change_modified_and_access_time_of_dir_to_today() {
 
         nu!(
             cwd: dirs.test(),
-            "utouch -a -m test_dir"
+            "touch -a -m test_dir"
         );
 
         let metadata = path.metadata().unwrap();
@@ -529,7 +529,7 @@ fn change_file_times_to_date() {
         sandbox.with_files(&[Stub::EmptyFile("target_file")]);
 
         let expected = Utc::now().checked_sub_signed(TimeDelta::hours(2)).unwrap();
-        nu!(cwd: dirs.test(), "utouch -d '-2 hours' target_file");
+        nu!(cwd: dirs.test(), "touch -d '-2 hours' target_file");
 
         let (got_atime, got_mtime) = file_times(dirs.test().join("target_file"));
         let got_atime =
@@ -559,7 +559,7 @@ fn change_dir_three_dots_times() {
 
         nu!(
             cwd: dirs.test(),
-            "utouch test_dir..."
+            "touch test_dir..."
         );
 
         let metadata = path.metadata().unwrap();
@@ -598,7 +598,7 @@ fn change_dir_times_to_reference_dir() {
 
         nu!(
             cwd: dirs.test(),
-            "utouch -r reference_dir target_dir"
+            "touch -r reference_dir target_dir"
         );
 
         assert_eq!(
@@ -639,7 +639,7 @@ fn change_dir_atime_to_reference() {
 
         nu!(
             cwd: dirs.test(),
-            "utouch -ar reference_dir target_dir"
+            "touch -ar reference_dir target_dir"
         );
 
         assert_eq!(
@@ -659,13 +659,13 @@ fn change_dir_atime_to_reference() {
 
 #[test]
 fn create_a_file_with_tilde() {
-    Playground::setup("utouch with tilde", |dirs, _| {
-        let actual = nu!(cwd: dirs.test(), "utouch '~tilde'");
+    Playground::setup("touch with tilde", |dirs, _| {
+        let actual = nu!(cwd: dirs.test(), "touch '~tilde'");
         assert!(actual.err.is_empty());
         assert!(files_exist_at(&[Path::new("~tilde")], dirs.test()));
 
         // pass variable
-        let actual = nu!(cwd: dirs.test(), "let f = '~tilde2'; utouch $f");
+        let actual = nu!(cwd: dirs.test(), "let f = '~tilde2'; touch $f");
         assert!(actual.err.is_empty());
         assert!(files_exist_at(&[Path::new("~tilde2")], dirs.test()));
     })
@@ -673,10 +673,10 @@ fn create_a_file_with_tilde() {
 
 #[test]
 fn respects_cwd() {
-    Playground::setup("utouch_respects_cwd", |dirs, _sandbox| {
+    Playground::setup("touch_respects_cwd", |dirs, _sandbox| {
         nu!(
             cwd: dirs.test(),
-            "mkdir 'dir'; cd 'dir'; utouch 'i_will_be_created.txt'"
+            "mkdir 'dir'; cd 'dir'; touch 'i_will_be_created.txt'"
         );
 
         let path = dirs.test().join("dir/i_will_be_created.txt");
@@ -686,10 +686,10 @@ fn respects_cwd() {
 
 #[test]
 fn reference_respects_cwd() {
-    Playground::setup("utouch_reference_respects_cwd", |dirs, _sandbox| {
+    Playground::setup("touch_reference_respects_cwd", |dirs, _sandbox| {
         nu!(
             cwd: dirs.test(),
-            "mkdir 'dir'; cd 'dir'; utouch 'ref.txt'; utouch --reference 'ref.txt' 'foo.txt'"
+            "mkdir 'dir'; cd 'dir'; touch 'ref.txt'; touch --reference 'ref.txt' 'foo.txt'"
         );
 
         let path = dirs.test().join("dir/foo.txt");
@@ -699,8 +699,8 @@ fn reference_respects_cwd() {
 
 #[test]
 fn recognizes_stdout() {
-    Playground::setup("utouch_recognizes_stdout", |dirs, _sandbox| {
-        nu!(cwd: dirs.test(), "utouch -");
+    Playground::setup("touch_recognizes_stdout", |dirs, _sandbox| {
+        nu!(cwd: dirs.test(), "touch -");
         assert!(!dirs.test().join("-").exists());
     })
 }

From 816b9a6953ef4bb76f0000ab173fa2ad808109b4 Mon Sep 17 00:00:00 2001
From: tsukimizake <shomasd@gmail.com>
Date: Fri, 3 Jan 2025 00:48:35 +0900
Subject: [PATCH 0869/1072] stop the prompt from removing the last newline
 (#14590)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
I tried to setup a multiline prompt like this.
<img width="175" alt="スクリーンショット 2024-12-15 17 45 06"
src="https://github.com/user-attachments/assets/8d00a203-b341-45ce-8427-b4d5a9d3d7c3"
/>

But when I set PROMT_COMMAND like this,

```nu
$env.PROMPT_COMMAND = {|| $"(ansi reset)(ansi magenta)(date now | format date "%Y-%m-%dT%H:%M:%S%z")\n(pwd)\n" }
```

The result is like this, due to dropping `\n` and `\r` on
`prompt_update.rs`.
<img width="185" alt="スクリーンショット 2024-12-15 17 54 21"
src="https://github.com/user-attachments/assets/5ead998e-6f87-479f-b2de-e267f0cc3acd"
/>

Currently, adding two newlines can detour the drop.
I think this drop newline makes little sense, so I removed it on this
PR.
If you don't like it, feel free to close it.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

Trailing newline of PROMPT_COMMAND is not dropped anymore.

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

This is a subtle change just on prompt string, so I think particular
test is not so necessary.

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
As far as I read
https://www.nushell.sh/book/coloring_and_theming.html#prompt-configuration-and-coloring
, the behavior seems undocumented.
---
 crates/nu-cli/src/prompt_update.rs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/crates/nu-cli/src/prompt_update.rs b/crates/nu-cli/src/prompt_update.rs
index c033475586..661b8c65f7 100644
--- a/crates/nu-cli/src/prompt_update.rs
+++ b/crates/nu-cli/src/prompt_update.rs
@@ -87,14 +87,6 @@ fn get_prompt_string(
                     x.insert_str(0, "\x1b[0m")
                 };
 
-                // Just remove the very last newline.
-                if x.ends_with('\n') {
-                    x.pop();
-                }
-
-                if x.ends_with('\r') {
-                    x.pop();
-                }
                 x
             });
             // Let's keep this for debugging purposes with nu --log-level warn

From 0d3f76ddefedd46229be200d8080f1520bb89b0f Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Thu, 2 Jan 2025 13:05:02 -0500
Subject: [PATCH 0870/1072] Remove no-longer-needed convert_env_values calls
 (#14681)

# Description

Takes advantage of #14591 to remove the now-necessary calls to
`convert_env_values()` that I added in #14249. The function is now just
called once to convert `PATH`.

Also removed the Windows-build-time checks for `ensure_path`, since
previous case-insensitivity fixes make this unnecessary as well.

# User-Facing Changes

None - #14591 now handles conversion 'on-demand'.

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

N/A
---
 crates/nu-cli/src/repl.rs   |  9 +--------
 crates/nu-engine/src/env.rs | 17 +----------------
 src/config_files.rs         | 12 ------------
 3 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 19f4aba22f..965066d2e4 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -19,7 +19,7 @@ use miette::{ErrReport, IntoDiagnostic, Result};
 use nu_cmd_base::util::get_editor;
 use nu_color_config::StyleComputer;
 #[allow(deprecated)]
-use nu_engine::{convert_env_values, current_dir_str, env_to_strings};
+use nu_engine::{current_dir_str, env_to_strings};
 use nu_parser::{lex, parse, trim_quotes_str};
 use nu_protocol::{
     config::NuCursorShape,
@@ -81,13 +81,6 @@ pub fn evaluate_repl(
         stack.clone(),
     );
 
-    let start_time = std::time::Instant::now();
-    // Translate environment variables from Strings to Values
-    if let Err(e) = convert_env_values(engine_state, &unique_stack) {
-        report_shell_error(engine_state, &e);
-    }
-    perf!("translate env vars", start_time, use_color);
-
     // seed env vars
     unique_stack.add_env_var(
         "CMD_DURATION_MS".into(),
diff --git a/crates/nu-engine/src/env.rs b/crates/nu-engine/src/env.rs
index 54f800958f..0d3fde7de6 100644
--- a/crates/nu-engine/src/env.rs
+++ b/crates/nu-engine/src/env.rs
@@ -89,22 +89,7 @@ pub fn convert_env_values(engine_state: &mut EngineState, stack: &Stack) -> Resu
         }
     }
 
-    #[cfg(not(windows))]
-    {
-        error = error.or_else(|| ensure_path(&mut new_scope, "PATH"));
-    }
-
-    #[cfg(windows)]
-    {
-        let first_result = ensure_path(&mut new_scope, "Path");
-        if first_result.is_some() {
-            let second_result = ensure_path(&mut new_scope, "PATH");
-
-            if second_result.is_some() {
-                error = error.or(first_result);
-            }
-        }
-    }
+    error = error.or_else(|| ensure_path(&mut new_scope, "PATH"));
 
     if let Ok(last_overlay_name) = &stack.last_overlay_name() {
         if let Some(env_vars) = Arc::make_mut(&mut engine_state.env_vars).get_mut(last_overlay_name)
diff --git a/src/config_files.rs b/src/config_files.rs
index 6a612ea4a7..56769cf330 100644
--- a/src/config_files.rs
+++ b/src/config_files.rs
@@ -51,18 +51,6 @@ pub(crate) fn read_config_file(
             use_color
         );
     } else {
-        let start_time = std::time::Instant::now();
-        let config = engine_state.get_config();
-        let use_color = config.use_ansi_coloring.get(engine_state);
-        if let Err(e) = convert_env_values(engine_state, stack) {
-            report_shell_error(engine_state, &e);
-        }
-        perf!(
-            "translate env vars before default_config.nu",
-            start_time,
-            use_color
-        );
-
         eval_default_config(engine_state, stack, get_default_config(), is_env_config);
     };
 

From df3892f32396fb94f8d9c10592312e3ca97614ca Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Thu, 2 Jan 2025 13:03:24 -0800
Subject: [PATCH 0871/1072] Provide the ability to split strings in columns via
 `polars str-split` (#14723)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
Provides the ability to split string columns. This will change the
column type to list<str>.

```nushell
> ❯ : [[a]; ["one,two,three"]] | polars into-df | polars select (polars col a | polars str-split ",") | polars collect
╭───┬───────────────╮
│ # │       a       │
├───┼───────────────┤
│ 0 │ ╭───┬───────╮ │
│   │ │ 0 │ one   │ │
│   │ │ 1 │ two   │ │
│   │ │ 2 │ three │ │
│   │ ╰───┴───────╯ │
╰───┴───────────────╯

> ❯ : [[a]; ["one,two,three"]] | polars into-df | polars select (polars col a | polars str-split ",") | polars schema
╭───┬───────────╮
│ a │ list<str> │
╰───┴───────────╯
```



# User-Facing Changes
- Introduces new command `polars str-split`
---
 .../src/dataframe/command/string/mod.rs       |  2 +
 .../src/dataframe/command/string/str_split.rs | 92 +++++++++++++++++++
 2 files changed, 94 insertions(+)
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/string/str_split.rs

diff --git a/crates/nu_plugin_polars/src/dataframe/command/string/mod.rs b/crates/nu_plugin_polars/src/dataframe/command/string/mod.rs
index c921fa2d79..3538878190 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/string/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/string/mod.rs
@@ -5,6 +5,7 @@ mod replace_all;
 mod str_join;
 mod str_lengths;
 mod str_slice;
+mod str_split;
 mod to_lowercase;
 mod to_uppercase;
 
@@ -27,6 +28,7 @@ pub(crate) fn string_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlug
         Box::new(Contains),
         Box::new(Replace),
         Box::new(ReplaceAll),
+        Box::new(str_split::StrSplit),
         Box::new(StrJoin),
         Box::new(StrLengths),
         Box::new(StrSlice),
diff --git a/crates/nu_plugin_polars/src/dataframe/command/string/str_split.rs b/crates/nu_plugin_polars/src/dataframe/command/string/str_split.rs
new file mode 100644
index 0000000000..7452b4d9f8
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/string/str_split.rs
@@ -0,0 +1,92 @@
+use crate::{
+    values::{CustomValueSupport, NuDataFrame, NuExpression},
+    PolarsPlugin,
+};
+
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{
+    Category, Example, LabeledError, PipelineData, Signature, Span, Spanned, SyntaxShape, Type,
+    Value,
+};
+use polars::df;
+
+#[derive(Clone)]
+pub struct StrSplit;
+
+impl PluginCommand for StrSplit {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars str-split"
+    }
+
+    fn description(&self) -> &str {
+        "Split the string by a substring. The resulting dtype is list<str>."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .required("expr", SyntaxShape::Any, "Separator expression")
+            .input_output_types(vec![(
+                Type::Custom("expression".into()),
+                Type::Custom("expression".into()),
+            )])
+            .category(Category::Custom("dataframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![Example {
+            description: "Split the string by comma, then create a new row for each string",
+            example: r#"[[a]; ["one,two,three"]] | polars into-df 
+                | polars select (polars col a | polars str-split "," | polars explode) 
+                | polars collect"#,
+            result: Some(
+                NuDataFrame::from(
+                    df!(
+                    "a" => ["one", "two", "three"]
+                    )
+                    .expect("Should be able to create a dataframe"),
+                )
+                .into_value(Span::test_data()),
+            ),
+        }]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        let separator = call.req::<Spanned<Value>>(0).and_then(|sep| {
+            let sep_expr = NuExpression::try_from_value(plugin, &sep.item)?;
+            Ok(Spanned {
+                item: sep_expr,
+                span: sep.span,
+            })
+        })?;
+
+        let expr = NuExpression::try_from_pipeline(plugin, input, call.head)?;
+        let res: NuExpression = expr
+            .into_polars()
+            .str()
+            .split(separator.item.into_polars())
+            .into();
+        res.to_pipeline_data(plugin, engine, call.head)
+            .map_err(LabeledError::from)
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use nu_protocol::ShellError;
+
+    use super::*;
+    use crate::test::test_polars_plugin_command;
+
+    #[test]
+    fn test_examples() -> Result<(), ShellError> {
+        test_polars_plugin_command(&StrSplit)
+    }
+}

From 461eb43d9d95bb565810b02f727fbf8ffd731ddb Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Thu, 2 Jan 2025 17:10:05 -0500
Subject: [PATCH 0872/1072] Add user autoload directory (#14669)

# Description

Adds a user-level (non-vendor) autoload directory:

```
($nu.default-config-dir)/autoload
```

Currently this is the only directory. We can consider adding others if
needed.

Related: As a separate PR, I'm going to try to restore the ability to
set `$env.NU_AUTOLOAD_DIRS` during startup.

# User-Facing Changes

Files in `$nu.default-config-dir/autoload` will be autoload at startup.
These files will be loaded after any vendor autoloads, so that a user
can override the vendor settings.

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

TODO; add a `$nu.user-autoload-dirs` constant.

Doc updates
---
 crates/nu-cli/tests/completions/mod.rs |  3 +-
 crates/nu-protocol/src/eval_const.rs   | 56 ++++++++++++++++++++------
 src/config_files.rs                    | 34 +++++++++-------
 3 files changed, 66 insertions(+), 27 deletions(-)

diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index 18390345e4..4ff1776d0f 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -1357,7 +1357,7 @@ fn variables_completions() {
     // Test completions for $nu
     let suggestions = completer.complete("$nu.", 4);
 
-    assert_eq!(18, suggestions.len());
+    assert_eq!(19, suggestions.len());
 
     let expected: Vec<String> = vec![
         "cache-dir".into(),
@@ -1377,6 +1377,7 @@ fn variables_completions() {
         "plugin-path".into(),
         "startup-time".into(),
         "temp-path".into(),
+        "user-autoload-dirs".into(),
         "vendor-autoload-dirs".into(),
     ];
 
diff --git a/crates/nu-protocol/src/eval_const.rs b/crates/nu-protocol/src/eval_const.rs
index 695c044a79..42bf6b4de6 100644
--- a/crates/nu-protocol/src/eval_const.rs
+++ b/crates/nu-protocol/src/eval_const.rs
@@ -194,6 +194,17 @@ pub(crate) fn create_nu_constant(engine_state: &EngineState, span: Span) -> Valu
         ),
     );
 
+    record.push(
+        "user-autoload-dirs",
+        Value::list(
+            get_user_autoload_dirs(engine_state)
+                .iter()
+                .map(|path| Value::string(path.to_string_lossy(), span))
+                .collect(),
+            span,
+        ),
+    );
+
     record.push("temp-path", {
         let canon_temp_path = canonicalize_path(engine_state, &std::env::temp_dir());
         Value::string(canon_temp_path.to_string_lossy(), span)
@@ -306,10 +317,9 @@ pub fn get_vendor_autoload_dirs(_engine_state: &EngineState) -> Vec<PathBuf> {
         .map(into_autoload_path_fn)
         .for_each(&mut append_fn);
 
-    option_env!("NU_VENDOR_AUTOLOAD_DIR")
-        .into_iter()
-        .map(PathBuf::from)
-        .for_each(&mut append_fn);
+    if let Some(path) = option_env!("NU_VENDOR_AUTOLOAD_DIR") {
+        append_fn(PathBuf::from(path));
+    }
 
     #[cfg(target_os = "macos")]
     std::env::var("XDG_DATA_HOME")
@@ -326,15 +336,37 @@ pub fn get_vendor_autoload_dirs(_engine_state: &EngineState) -> Vec<PathBuf> {
         .into_iter()
         .for_each(&mut append_fn);
 
-    dirs::data_dir()
-        .into_iter()
-        .map(into_autoload_path_fn)
-        .for_each(&mut append_fn);
+    if let Some(data_dir) = dirs::data_dir() {
+        append_fn(into_autoload_path_fn(data_dir));
+    }
 
-    std::env::var_os("NU_VENDOR_AUTOLOAD_DIR")
-        .into_iter()
-        .map(PathBuf::from)
-        .for_each(&mut append_fn);
+    if let Some(path) = std::env::var_os("NU_VENDOR_AUTOLOAD_DIR") {
+        append_fn(PathBuf::from(path));
+    }
+
+    dirs
+}
+
+pub fn get_user_autoload_dirs(_engine_state: &EngineState) -> Vec<PathBuf> {
+    // User autoload directories - Currently just `autoload` in the default
+    // configuration directory
+    let into_autoload_path_fn = |mut path: PathBuf| {
+        path.push("nushell");
+        path.push("autoload");
+        path
+    };
+
+    let mut dirs = Vec::new();
+
+    let mut append_fn = |path: PathBuf| {
+        if !dirs.contains(&path) {
+            dirs.push(path)
+        }
+    };
+
+    if let Some(config_dir) = dirs::config_dir() {
+        append_fn(into_autoload_path_fn(config_dir));
+    }
 
     dirs
 }
diff --git a/src/config_files.rs b/src/config_files.rs
index 56769cf330..3493fe0be8 100644
--- a/src/config_files.rs
+++ b/src/config_files.rs
@@ -6,6 +6,7 @@ use nu_engine::convert_env_values;
 use nu_path::canonicalize_with;
 use nu_protocol::{
     engine::{EngineState, Stack, StateWorkingSet},
+    eval_const::{get_user_autoload_dirs, get_vendor_autoload_dirs},
     report_parse_error, report_shell_error, Config, ParseError, PipelineData, Spanned,
 };
 use nu_utils::{get_default_config, get_default_env, get_scaffold_config, get_scaffold_env, perf};
@@ -197,24 +198,29 @@ pub(crate) fn read_vendor_autoload_files(engine_state: &mut EngineState, stack:
 
     // The evaluation order is first determined by the semantics of `get_vendor_autoload_dirs`
     // to determine the order of directories to evaluate
-    for autoload_dir in nu_protocol::eval_const::get_vendor_autoload_dirs(engine_state) {
-        warn!("read_vendor_autoload_files: {}", autoload_dir.display());
+    get_vendor_autoload_dirs(engine_state)
+        .iter()
+        // User autoload directories are evaluated after vendor, which means that
+        // the user can override vendor autoload files
+        .chain(get_user_autoload_dirs(engine_state).iter())
+        .for_each(|autoload_dir| {
+            warn!("read_vendor_autoload_files: {}", autoload_dir.display());
 
-        if autoload_dir.exists() {
-            // on a second levels files are lexicographically sorted by the string of the filename
-            let entries = read_and_sort_directory(&autoload_dir);
-            if let Ok(entries) = entries {
-                for entry in entries {
-                    if !entry.ends_with(".nu") {
-                        continue;
+            if autoload_dir.exists() {
+                // on a second levels files are lexicographically sorted by the string of the filename
+                let entries = read_and_sort_directory(autoload_dir);
+                if let Ok(entries) = entries {
+                    for entry in entries {
+                        if !entry.ends_with(".nu") {
+                            continue;
+                        }
+                        let path = autoload_dir.join(entry);
+                        warn!("AutoLoading: {:?}", path);
+                        eval_config_contents(path, engine_state, stack);
                     }
-                    let path = autoload_dir.join(entry);
-                    warn!("AutoLoading: {:?}", path);
-                    eval_config_contents(path, engine_state, stack);
                 }
             }
-        }
-    }
+        });
 }
 
 fn eval_default_config(

From 86f7f53f853650cb3315157f94a8034c1a777ffd Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Thu, 2 Jan 2025 23:22:04 -0500
Subject: [PATCH 0873/1072] Run SHLVL tests sequentially (#14727)

Tests for #14707 are causing hangs which are preventing `toolkit test`
from completing on some systems. This appears to be due to the use of
`-i` to force interactive mode, which is required in order to update the
`SHLVL`. Both tests are likely attempting to acquire the terminal at the
same time, and one is hanging as a result.

This is a temporary fix which runs both of these tests sequentially.
It's temporary because we need to find a solution which doesn't use
`-i`, since any other future `-it` test will cause the same situation
again.
---
 tests/shell/environment/env.rs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/shell/environment/env.rs b/tests/shell/environment/env.rs
index eab193684f..98f1e1ded8 100644
--- a/tests/shell/environment/env.rs
+++ b/tests/shell/environment/env.rs
@@ -238,10 +238,7 @@ fn env_shlvl() {
     ");
 
     assert_eq!(actual.out, "6");
-}
 
-#[test]
-fn env_shlvl_in_exec() {
     let actual = nu!("
         $env.SHLVL = 29
         nu -i -c \"exec nu -i -c 'print $env.SHLVL'\"

From 25d90fa603a5e0429091ccbfecef56e47d8e302f Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Fri, 3 Jan 2025 15:11:34 +0100
Subject: [PATCH 0874/1072] Use `Value::coerce_bool` in `into bool` (#14731)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
I realized that the `into bool` command somehow implements a conversion
into a boolean value which was very similar to my implementation of
~`Value::as_env_bool`~ `Value::coerce_bool`. To streamline that behavior
a bit, I replaced most of the implementation of `into bool` with my
~`Value::as_env_bool`~ `Value::coerce_bool` method.

Also I added a new flag called `--relaxed` which lets the command behave
more closely to the ~`Value::as_env_bool`~ `Value::coerce_bool` method
as it allows null values and is more loose to strings. ~Which now begs
the question, should I rename `Value::as_env_bool` just to
`Value::coerce_bool` which would fit the `Value::coerce_str` method
name?~ (Renamed that.)

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

The `into bool` command behaves the same but with `--relaxed` you can
also throw a `null` or some more strings at it which makes it more
ergonomic for env conversions.

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

I added some more tests to see that the strict handling works and added
some more examples to the command to showcase the `--relaxed` flag which
also gets tested.

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->

@Bahex mentioned in #14704 that it broke the zoxide script, this PR
should help to fix the issue.
---
 .../nu-command/src/conversions/into/bool.rs   | 111 ++++++++++++++----
 .../nu-protocol/src/config/ansi_coloring.rs   |   4 +-
 crates/nu-protocol/src/value/mod.rs           |  77 ++++++------
 3 files changed, 128 insertions(+), 64 deletions(-)

diff --git a/crates/nu-command/src/conversions/into/bool.rs b/crates/nu-command/src/conversions/into/bool.rs
index c1af991d95..d093e69ad8 100644
--- a/crates/nu-command/src/conversions/into/bool.rs
+++ b/crates/nu-command/src/conversions/into/bool.rs
@@ -1,4 +1,4 @@
-use nu_cmd_base::input_handler::{operate, CellPathOnlyArgs};
+use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
 
 #[derive(Clone)]
@@ -16,10 +16,16 @@ impl Command for SubCommand {
                 (Type::Number, Type::Bool),
                 (Type::String, Type::Bool),
                 (Type::Bool, Type::Bool),
+                (Type::Nothing, Type::Bool),
                 (Type::List(Box::new(Type::Any)), Type::table()),
                 (Type::table(), Type::table()),
                 (Type::record(), Type::record()),
             ])
+            .switch(
+                "relaxed",
+                "Relaxes conversion to also allow null and any strings.",
+                None,
+            )
             .allow_variants_without_examples(true)
             .rest(
                 "rest",
@@ -44,7 +50,10 @@ impl Command for SubCommand {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        into_bool(engine_state, stack, call, input)
+        let relaxed = call
+            .has_flag(engine_state, stack, "relaxed")
+            .unwrap_or(false);
+        into_bool(engine_state, stack, call, input, relaxed)
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -95,22 +104,47 @@ impl Command for SubCommand {
                 example: "'true' | into bool",
                 result: Some(Value::test_bool(true)),
             },
+            Example {
+                description: "interpret a null as false",
+                example: "null | into bool --relaxed",
+                result: Some(Value::test_bool(false)),
+            },
+            Example {
+                description: "interpret any non-false, non-zero string as true",
+                example: "'something' | into bool --relaxed",
+                result: Some(Value::test_bool(true)),
+            },
         ]
     }
 }
 
+struct IntoBoolCmdArgument {
+    cell_paths: Option<Vec<CellPath>>,
+    relaxed: bool,
+}
+
+impl CmdArgument for IntoBoolCmdArgument {
+    fn take_cell_paths(&mut self) -> Option<Vec<CellPath>> {
+        self.cell_paths.take()
+    }
+}
+
 fn into_bool(
     engine_state: &EngineState,
     stack: &mut Stack,
     call: &Call,
     input: PipelineData,
+    relaxed: bool,
 ) -> Result<PipelineData, ShellError> {
-    let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
-    let args = CellPathOnlyArgs::from(cell_paths);
+    let cell_paths = Some(call.rest(engine_state, stack, 0)?).filter(|v| !v.is_empty());
+    let args = IntoBoolCmdArgument {
+        cell_paths,
+        relaxed,
+    };
     operate(action, args, input, call.head, engine_state.signals())
 }
 
-fn string_to_boolean(s: &str, span: Span) -> Result<bool, ShellError> {
+fn strict_string_to_boolean(s: &str, span: Span) -> Result<bool, ShellError> {
     match s.trim().to_ascii_lowercase().as_str() {
         "true" => Ok(true),
         "false" => Ok(false),
@@ -132,26 +166,31 @@ fn string_to_boolean(s: &str, span: Span) -> Result<bool, ShellError> {
     }
 }
 
-fn action(input: &Value, _args: &CellPathOnlyArgs, span: Span) -> Value {
-    match input {
-        Value::Bool { .. } => input.clone(),
-        Value::Int { val, .. } => Value::bool(*val != 0, span),
-        Value::Float { val, .. } => Value::bool(val.abs() >= f64::EPSILON, span),
-        Value::String { val, .. } => match string_to_boolean(val, span) {
+fn action(input: &Value, args: &IntoBoolCmdArgument, span: Span) -> Value {
+    let err = || {
+        Value::error(
+            ShellError::OnlySupportsThisInputType {
+                exp_input_type: "bool, int, float or string".into(),
+                wrong_type: input.get_type().to_string(),
+                dst_span: span,
+                src_span: input.span(),
+            },
+            span,
+        )
+    };
+
+    match (input, args.relaxed) {
+        (Value::Error { .. } | Value::Bool { .. }, _) => input.clone(),
+        // In strict mode is this an error, while in relaxed this is just `false`
+        (Value::Nothing { .. }, false) => err(),
+        (Value::String { val, .. }, false) => match strict_string_to_boolean(val, span) {
             Ok(val) => Value::bool(val, span),
             Err(error) => Value::error(error, span),
         },
-        // Propagate errors by explicitly matching them before the final case.
-        Value::Error { .. } => input.clone(),
-        other => Value::error(
-            ShellError::OnlySupportsThisInputType {
-                exp_input_type: "bool, int, float or string".into(),
-                wrong_type: other.get_type().to_string(),
-                dst_span: span,
-                src_span: other.span(),
-            },
-            span,
-        ),
+        _ => match input.coerce_bool() {
+            Ok(val) => Value::bool(val, span),
+            Err(_) => err(),
+        },
     }
 }
 
@@ -165,4 +204,32 @@ mod test {
 
         test_examples(SubCommand {})
     }
+
+    #[test]
+    fn test_strict_handling() {
+        let span = Span::test_data();
+        let args = IntoBoolCmdArgument {
+            cell_paths: vec![].into(),
+            relaxed: false,
+        };
+
+        assert!(action(&Value::test_nothing(), &args, span).is_error());
+        assert!(action(&Value::test_string("abc"), &args, span).is_error());
+        assert!(action(&Value::test_string("true"), &args, span).is_true());
+        assert!(action(&Value::test_string("FALSE"), &args, span).is_false());
+    }
+
+    #[test]
+    fn test_relaxed_handling() {
+        let span = Span::test_data();
+        let args = IntoBoolCmdArgument {
+            cell_paths: vec![].into(),
+            relaxed: true,
+        };
+
+        assert!(action(&Value::test_nothing(), &args, span).is_false());
+        assert!(action(&Value::test_string("abc"), &args, span).is_true());
+        assert!(action(&Value::test_string("true"), &args, span).is_true());
+        assert!(action(&Value::test_string("FALSE"), &args, span).is_false());
+    }
 }
diff --git a/crates/nu-protocol/src/config/ansi_coloring.rs b/crates/nu-protocol/src/config/ansi_coloring.rs
index 408eee52cc..af016923da 100644
--- a/crates/nu-protocol/src/config/ansi_coloring.rs
+++ b/crates/nu-protocol/src/config/ansi_coloring.rs
@@ -48,7 +48,7 @@ impl UseAnsiColoring {
         let env_value = |env_name| {
             engine_state
                 .get_env_var_insensitive(env_name)
-                .and_then(Value::as_env_bool)
+                .and_then(|v| v.coerce_bool().ok())
                 .unwrap_or(false)
         };
 
@@ -61,7 +61,7 @@ impl UseAnsiColoring {
         }
 
         if let Some(cli_color) = engine_state.get_env_var_insensitive("clicolor") {
-            if let Some(cli_color) = cli_color.as_env_bool() {
+            if let Ok(cli_color) = cli_color.coerce_bool() {
                 return cli_color;
             }
         }
diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs
index e55f89d586..f3b44d93dd 100644
--- a/crates/nu-protocol/src/value/mod.rs
+++ b/crates/nu-protocol/src/value/mod.rs
@@ -667,7 +667,7 @@ impl Value {
     ///
     /// The following rules are used:
     /// - Values representing `false`:
-    ///   - Empty strings
+    ///   - Empty strings or strings that equal to "false" in any case
     ///   - The number `0` (as an integer, float or string)
     ///   - `Nothing`
     ///   - Explicit boolean `false`
@@ -677,19 +677,19 @@ impl Value {
     ///   - Explicit boolean `true`
     ///
     /// For all other, more complex variants of [`Value`], the function cannot determine a
-    /// boolean representation and returns `None`.
-    pub fn as_env_bool(&self) -> Option<bool> {
+    /// boolean representation and returns `Err`.
+    pub fn coerce_bool(&self) -> Result<bool, ShellError> {
         match self {
-            Value::Bool { val: false, .. }
-            | Value::Int { val: 0, .. }
-            | Value::Float { val: 0.0, .. }
-            | Value::Nothing { .. } => Some(false),
-            Value::String { val, .. } => match val.as_str() {
-                "" | "0" => Some(false),
-                _ => Some(true),
+            Value::Bool { val: false, .. } | Value::Int { val: 0, .. } | Value::Nothing { .. } => {
+                Ok(false)
+            }
+            Value::Float { val, .. } if val <= &f64::EPSILON => Ok(false),
+            Value::String { val, .. } => match val.trim().to_ascii_lowercase().as_str() {
+                "" | "0" | "false" => Ok(false),
+                _ => Ok(true),
             },
-            Value::Bool { .. } | Value::Int { .. } | Value::Float { .. } => Some(true),
-            _ => None,
+            Value::Bool { .. } | Value::Int { .. } | Value::Float { .. } => Ok(true),
+            _ => self.cant_convert_to("bool"),
         }
     }
 
@@ -3916,39 +3916,36 @@ mod tests {
     #[test]
     fn test_env_as_bool() {
         // explicit false values
-        assert_eq!(Value::test_bool(false).as_env_bool(), Some(false));
-        assert_eq!(Value::test_int(0).as_env_bool(), Some(false));
-        assert_eq!(Value::test_float(0.0).as_env_bool(), Some(false));
-        assert_eq!(Value::test_string("").as_env_bool(), Some(false));
-        assert_eq!(Value::test_string("0").as_env_bool(), Some(false));
-        assert_eq!(Value::test_nothing().as_env_bool(), Some(false));
+        assert_eq!(Value::test_bool(false).coerce_bool(), Ok(false));
+        assert_eq!(Value::test_int(0).coerce_bool(), Ok(false));
+        assert_eq!(Value::test_float(0.0).coerce_bool(), Ok(false));
+        assert_eq!(Value::test_string("").coerce_bool(), Ok(false));
+        assert_eq!(Value::test_string("0").coerce_bool(), Ok(false));
+        assert_eq!(Value::test_nothing().coerce_bool(), Ok(false));
 
         // explicit true values
-        assert_eq!(Value::test_bool(true).as_env_bool(), Some(true));
-        assert_eq!(Value::test_int(1).as_env_bool(), Some(true));
-        assert_eq!(Value::test_float(1.0).as_env_bool(), Some(true));
-        assert_eq!(Value::test_string("1").as_env_bool(), Some(true));
+        assert_eq!(Value::test_bool(true).coerce_bool(), Ok(true));
+        assert_eq!(Value::test_int(1).coerce_bool(), Ok(true));
+        assert_eq!(Value::test_float(1.0).coerce_bool(), Ok(true));
+        assert_eq!(Value::test_string("1").coerce_bool(), Ok(true));
 
         // implicit true values
-        assert_eq!(Value::test_int(42).as_env_bool(), Some(true));
-        assert_eq!(Value::test_float(0.5).as_env_bool(), Some(true));
-        assert_eq!(Value::test_string("not zero").as_env_bool(), Some(true));
+        assert_eq!(Value::test_int(42).coerce_bool(), Ok(true));
+        assert_eq!(Value::test_float(0.5).coerce_bool(), Ok(true));
+        assert_eq!(Value::test_string("not zero").coerce_bool(), Ok(true));
 
         // complex values returning None
-        assert_eq!(Value::test_record(Record::default()).as_env_bool(), None);
-        assert_eq!(
-            Value::test_list(vec![Value::test_int(1)]).as_env_bool(),
-            None
-        );
-        assert_eq!(
-            Value::test_date(
-                chrono::DateTime::parse_from_rfc3339("2024-01-01T12:00:00+00:00").unwrap(),
-            )
-            .as_env_bool(),
-            None
-        );
-        assert_eq!(Value::test_glob("*.rs").as_env_bool(), None);
-        assert_eq!(Value::test_binary(vec![1, 2, 3]).as_env_bool(), None);
-        assert_eq!(Value::test_duration(3600).as_env_bool(), None);
+        assert!(Value::test_record(Record::default()).coerce_bool().is_err());
+        assert!(Value::test_list(vec![Value::test_int(1)])
+            .coerce_bool()
+            .is_err());
+        assert!(Value::test_date(
+            chrono::DateTime::parse_from_rfc3339("2024-01-01T12:00:00+00:00").unwrap(),
+        )
+        .coerce_bool()
+        .is_err());
+        assert!(Value::test_glob("*.rs").coerce_bool().is_err());
+        assert!(Value::test_binary(vec![1, 2, 3]).coerce_bool().is_err());
+        assert!(Value::test_duration(3600).coerce_bool().is_err());
     }
 }

From 6325bc5e54af871ae0588c05506cc84007fc695e Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Fri, 3 Jan 2025 13:38:46 -0500
Subject: [PATCH 0875/1072] Add comment on `nu_repl` usage (#14734)

# Description

I just spent way too long trying to get `nu --testbin nu_repl
<commands>` working. That's one argument that must be called as `nu
--testbin=nu_repl <commands>` due to its implementation. This PR simply
adds a comment in `main()` noting that, hoping it will save someone else
some time in the future ;-)

# User-Facing Changes

None

# Tests + Formatting

N/A

# After Submitting

N/A
---
 src/main.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main.rs b/src/main.rs
index bfae9c2f31..8f228b5f1f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -402,6 +402,9 @@ fn main() -> Result<()> {
             "chop" => test_bins::chop(),
             "repeater" => test_bins::repeater(),
             "repeat_bytes" => test_bins::repeat_bytes(),
+            // Important: nu_repl must be called with `--testbin=nu_repl`
+            // `--testbin nu_repl` will not work due to argument count logic
+            // in test_bins.rs
             "nu_repl" => test_bins::nu_repl(),
             "input_bytes_length" => test_bins::input_bytes_length(),
             _ => std::process::exit(1),

From d702c4605a2f2fa3f814e8b4439eaf227b287698 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Fri, 3 Jan 2025 16:16:57 -0500
Subject: [PATCH 0876/1072] Increment SHLVL before run_repl() (#14732)

# Description

A follow-on to #14727:

* Instead of using `is-interactive` as the trigger for incrementing
`SHLVL`, this change puts the increment logic just before `run_repl()`
is called.
* Tests are changed to use `-e`
* Moves the `confirm_stdin_is_terminal()` call immediately **after** the
`prerun_cmd` (which executes `--execute (-e) <commandstring>`. The fact
that it was **before** that call seems to be a bug, since the error
message says *"or provide arguments to invoke a script"* even if
`--execute` was used. This change enables REPL testing using `--execute
(-e)`.
* Added a test to ensure `-c` does *not* increment SHLVL.

# User-Facing Changes

`$env.SHLVL` runs before the REPL is started, rather than when
`is-interactive`

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

N/A
---
 crates/nu-cli/src/repl.rs      |  4 +--
 src/main.rs                    | 59 +++++++++++++++++-----------------
 tests/shell/environment/env.rs | 25 ++++++++++++--
 3 files changed, 53 insertions(+), 35 deletions(-)

diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 965066d2e4..1fe5109cfc 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -63,8 +63,6 @@ pub fn evaluate_repl(
     let config = engine_state.get_config();
     let use_color = config.use_ansi_coloring.get(engine_state);
 
-    confirm_stdin_is_terminal()?;
-
     let mut entry_num = 0;
 
     // Let's grab the shell_integration configs
@@ -104,6 +102,8 @@ pub fn evaluate_repl(
         engine_state.merge_env(&mut unique_stack)?;
     }
 
+    confirm_stdin_is_terminal()?;
+
     let hostname = System::host_name();
     if shell_integration_osc2 {
         run_shell_integration_osc2(None, engine_state, &mut unique_stack, use_color);
diff --git a/src/main.rs b/src/main.rs
index 8f228b5f1f..32a602707e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -323,36 +323,6 @@ fn main() -> Result<()> {
         "NU_VERSION".to_string(),
         Value::string(env!("CARGO_PKG_VERSION"), Span::unknown()),
     );
-    // Add SHLVL if interactive
-    if engine_state.is_interactive {
-        engine_state.add_env_var("PROMPT_INDICATOR".to_string(), Value::test_string("> "));
-        engine_state.add_env_var(
-            "PROMPT_INDICATOR_VI_NORMAL".to_string(),
-            Value::test_string("> "),
-        );
-        engine_state.add_env_var(
-            "PROMPT_INDICATOR_VI_INSERT".to_string(),
-            Value::test_string(": "),
-        );
-        engine_state.add_env_var(
-            "PROMPT_MULTILINE_INDICATOR".to_string(),
-            Value::test_string("::: "),
-        );
-        engine_state.add_env_var(
-            "TRANSIENT_PROMPT_MULTILINE_INDICATOR".to_string(),
-            Value::test_string(""),
-        );
-        engine_state.add_env_var(
-            "TRANSIENT_PROMPT_COMMAND_RIGHT".to_string(),
-            Value::test_string(""),
-        );
-        let mut shlvl = engine_state
-            .get_env_var("SHLVL")
-            .map(|x| x.as_str().unwrap_or("0").parse::<i64>().unwrap_or(0))
-            .unwrap_or(0);
-        shlvl += 1;
-        engine_state.add_env_var("SHLVL".to_string(), Value::int(shlvl, Span::unknown()));
-    }
 
     if parsed_nu_cli_args.no_std_lib.is_none() {
         load_standard_library(&mut engine_state)?;
@@ -510,6 +480,35 @@ fn main() -> Result<()> {
             input,
         );
     } else {
+        // Environment variables that apply only when in REPL
+        engine_state.add_env_var("PROMPT_INDICATOR".to_string(), Value::test_string("> "));
+        engine_state.add_env_var(
+            "PROMPT_INDICATOR_VI_NORMAL".to_string(),
+            Value::test_string("> "),
+        );
+        engine_state.add_env_var(
+            "PROMPT_INDICATOR_VI_INSERT".to_string(),
+            Value::test_string(": "),
+        );
+        engine_state.add_env_var(
+            "PROMPT_MULTILINE_INDICATOR".to_string(),
+            Value::test_string("::: "),
+        );
+        engine_state.add_env_var(
+            "TRANSIENT_PROMPT_MULTILINE_INDICATOR".to_string(),
+            Value::test_string(""),
+        );
+        engine_state.add_env_var(
+            "TRANSIENT_PROMPT_COMMAND_RIGHT".to_string(),
+            Value::test_string(""),
+        );
+        let mut shlvl = engine_state
+            .get_env_var("SHLVL")
+            .map(|x| x.as_str().unwrap_or("0").parse::<i64>().unwrap_or(0))
+            .unwrap_or(0);
+        shlvl += 1;
+        engine_state.add_env_var("SHLVL".to_string(), Value::int(shlvl, Span::unknown()));
+
         run_repl(&mut engine_state, parsed_nu_cli_args, entire_start_time)?
     }
 
diff --git a/tests/shell/environment/env.rs b/tests/shell/environment/env.rs
index 98f1e1ded8..ab97eb6872 100644
--- a/tests/shell/environment/env.rs
+++ b/tests/shell/environment/env.rs
@@ -231,17 +231,36 @@ fn std_log_env_vars_have_defaults() {
 }
 
 #[test]
-fn env_shlvl() {
+fn env_shlvl_commandstring_does_not_increment() {
     let actual = nu!("
         $env.SHLVL = 5
-        nu -i -c 'print $env.SHLVL'
+        nu -c 'print $env.SHLVL; exit'
+    ");
+
+    assert_eq!(actual.out, "5");
+}
+
+// Note: Do not use -i / --interactive in tests.
+// -i attempts to acquire a terminal, and if more than one
+// test tries to obtain a terminal at the same time, the
+// test run will likely hang, at least for some users.
+// Instead, use -e / --execute with an `exit` to test REPL
+// functionality as demonstrated below.
+#[test]
+fn env_shlvl_in_repl() {
+    let actual = nu!("
+        $env.SHLVL = 5
+        nu --no-std-lib -n -e 'print $env.SHLVL; exit'
     ");
 
     assert_eq!(actual.out, "6");
+}
 
+#[test]
+fn env_shlvl_in_exec_repl() {
     let actual = nu!("
         $env.SHLVL = 29
-        nu -i -c \"exec nu -i -c 'print $env.SHLVL'\"
+        nu -c \"exec nu --no-std-lib -n -e 'print $env.SHLVL; exit'\"
     ");
 
     assert_eq!(actual.out, "30");

From 8b086d361384837aa6a03ce7d3cee3b9aab51029 Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Sat, 4 Jan 2025 16:41:03 -0500
Subject: [PATCH 0877/1072] Make `get` const (#14751)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

Makes `get` const

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

`get` is now a const command.

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
N/A
---
 crates/nu-command/src/filters/get.rs    | 135 +++++++++++++++---------
 crates/nu-command/tests/commands/get.rs |   6 ++
 2 files changed, 92 insertions(+), 49 deletions(-)

diff --git a/crates/nu-command/src/filters/get.rs b/crates/nu-command/src/filters/get.rs
index 3f12e66814..6dfc66ba56 100644
--- a/crates/nu-command/src/filters/get.rs
+++ b/crates/nu-command/src/filters/get.rs
@@ -51,55 +51,6 @@ If multiple cell paths are given, this will produce a list of values."#
             .category(Category::Filters)
     }
 
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let span = call.head;
-        let mut cell_path: CellPath = call.req(engine_state, stack, 0)?;
-        let mut rest: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
-        let ignore_errors = call.has_flag(engine_state, stack, "ignore-errors")?;
-        let sensitive = call.has_flag(engine_state, stack, "sensitive")?;
-        let metadata = input.metadata();
-
-        if ignore_errors {
-            cell_path.make_optional();
-            for path in &mut rest {
-                path.make_optional();
-            }
-        }
-
-        if rest.is_empty() {
-            follow_cell_path_into_stream(
-                input,
-                engine_state.signals().clone(),
-                cell_path.members,
-                call.head,
-                !sensitive,
-            )
-        } else {
-            let mut output = vec![];
-
-            let paths = std::iter::once(cell_path).chain(rest);
-
-            let input = input.into_value(span)?;
-
-            for path in paths {
-                let val = input.clone().follow_cell_path(&path.members, !sensitive);
-
-                output.push(val?);
-            }
-
-            Ok(output
-                .into_iter()
-                .into_pipeline_data(span, engine_state.signals().clone()))
-        }
-        .map(|x| x.set_metadata(metadata))
-    }
-
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
@@ -143,6 +94,92 @@ If multiple cell paths are given, this will produce a list of values."#
             },
         ]
     }
+
+    fn is_const(&self) -> bool {
+        true
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let cell_path: CellPath = call.req_const(working_set, 0)?;
+        let rest: Vec<CellPath> = call.rest_const(working_set, 1)?;
+        let ignore_errors = call.has_flag_const(working_set, "ignore-errors")?;
+        let sensitive = call.has_flag_const(working_set, "sensitive")?;
+        let metadata = input.metadata();
+        action(
+            input,
+            cell_path,
+            rest,
+            ignore_errors,
+            sensitive,
+            working_set.permanent().signals().clone(),
+            call.head,
+        )
+        .map(|x| x.set_metadata(metadata))
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let cell_path: CellPath = call.req(engine_state, stack, 0)?;
+        let rest: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
+        let ignore_errors = call.has_flag(engine_state, stack, "ignore-errors")?;
+        let sensitive = call.has_flag(engine_state, stack, "sensitive")?;
+        let metadata = input.metadata();
+        action(
+            input,
+            cell_path,
+            rest,
+            ignore_errors,
+            sensitive,
+            engine_state.signals().clone(),
+            call.head,
+        )
+        .map(|x| x.set_metadata(metadata))
+    }
+}
+
+fn action(
+    input: PipelineData,
+    mut cell_path: CellPath,
+    mut rest: Vec<CellPath>,
+    ignore_errors: bool,
+    sensitive: bool,
+    signals: Signals,
+    span: Span,
+) -> Result<PipelineData, ShellError> {
+    if ignore_errors {
+        cell_path.make_optional();
+        for path in &mut rest {
+            path.make_optional();
+        }
+    }
+
+    if rest.is_empty() {
+        follow_cell_path_into_stream(input, signals, cell_path.members, span, !sensitive)
+    } else {
+        let mut output = vec![];
+
+        let paths = std::iter::once(cell_path).chain(rest);
+
+        let input = input.into_value(span)?;
+
+        for path in paths {
+            let val = input.clone().follow_cell_path(&path.members, !sensitive);
+
+            output.push(val?);
+        }
+
+        Ok(output.into_iter().into_pipeline_data(span, signals))
+    }
 }
 
 // the PipelineData.follow_cell_path function, when given a
diff --git a/crates/nu-command/tests/commands/get.rs b/crates/nu-command/tests/commands/get.rs
index 049b5b2899..c5c1c02e95 100644
--- a/crates/nu-command/tests/commands/get.rs
+++ b/crates/nu-command/tests/commands/get.rs
@@ -207,3 +207,9 @@ fn ignore_multiple() {
 
     assert_eq!(actual.out, "[[null], [null]]");
 }
+
+#[test]
+fn test_const() {
+    let actual = nu!(r#"const x = [1 2 3] | get 1; $x"#);
+    assert_eq!(actual.out, "2");
+}

From b5ff46db6ab88c8a280a9f4f16cefd3aa5e4148d Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Sun, 5 Jan 2025 21:11:17 +0800
Subject: [PATCH 0878/1072] feat(lsp): use lsp-textdocument to handle utf16
 position (#14742)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

This PR replaces `ropey` with `lsp-textdocument` for easier utf16
position handling.
As a side effect, if fixes the following crashing bug:

1. create a `foo.nu` file with errors in it
2. in `bar.nu`, add code `use foo.nu *`

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

* <s>Diagnostics are now triggered only with document open/save, that's
my personal preference. Changing back to previous behavior is easy if
you guys have other concerns.</s>
* UTF-8 position encoding is not supported by lsp-textdocument, but
that's not an issue, since the previous utf-8 ropey implementation is
buggy when used in real scenarios in a text editor.

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

No new tests added, removed some utf-8 related ones.

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock                        |  47 +-
 Cargo.toml                        |   7 +-
 crates/nu-lsp/Cargo.toml          |   7 +-
 crates/nu-lsp/src/diagnostics.rs  |  48 +-
 crates/nu-lsp/src/lib.rs          | 707 +++++++++++-------------------
 crates/nu-lsp/src/notification.rs | 120 ++---
 src/main.rs                       |   2 +-
 7 files changed, 338 insertions(+), 600 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 65d98c9fb1..68234d6b4e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1964,6 +1964,15 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "fluent-uri"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -3195,16 +3204,26 @@ dependencies = [
 ]
 
 [[package]]
-name = "lsp-types"
-version = "0.95.1"
+name = "lsp-textdocument"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e34d33a8e9b006cd3fc4fe69a921affa097bae4bb65f76271f4644f9a334365"
+checksum = "d8dc223af95101fe950a871d4d567b6f98a1ecfcee5861f4b57644581aaa980d"
+dependencies = [
+ "lsp-types",
+ "serde_json",
+]
+
+[[package]]
+name = "lsp-types"
+version = "0.97.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53353550a17c04ac46c585feb189c2db82154fc84b79c7a66c96c2c644f66071"
 dependencies = [
  "bitflags 1.3.2",
+ "fluent-uri",
  "serde",
  "serde_json",
  "serde_repr",
- "url",
 ]
 
 [[package]]
@@ -3924,6 +3943,7 @@ dependencies = [
  "assert-json-diff",
  "crossbeam-channel",
  "lsp-server",
+ "lsp-textdocument",
  "lsp-types",
  "miette",
  "nu-cli",
@@ -3933,9 +3953,9 @@ dependencies = [
  "nu-protocol",
  "nu-test-support",
  "reedline",
- "ropey",
  "serde",
  "serde_json",
+ "url",
 ]
 
 [[package]]
@@ -6247,16 +6267,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "ropey"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93411e420bcd1a75ddd1dc3caf18c23155eda2c090631a85af21ba19e97093b5"
-dependencies = [
- "smallvec",
- "str_indices",
-]
-
 [[package]]
 name = "roxmltree"
 version = "0.20.0"
@@ -7015,12 +7025,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
-[[package]]
-name = "str_indices"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d08889ec5408683408db66ad89e0e1f93dff55c73a4ccc71c427d5b277ee47e6"
-
 [[package]]
 name = "streaming-decompression"
 version = "0.1.2"
@@ -7800,7 +7804,6 @@ dependencies = [
  "form_urlencoded",
  "idna",
  "percent-encoding",
- "serde",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index ce52af8b67..33a8f8f883 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -103,7 +103,8 @@ log = "0.4"
 lru = "0.12"
 lscolors = { version = "0.17", default-features = false }
 lsp-server = "0.7.5"
-lsp-types = { version = "0.95.0", features = ["proposed"] }
+lsp-types = { version = "0.97.0", features = ["proposed"] }
+lsp-textdocument = "0.4.0"
 mach2 = "0.4"
 md5 = { version = "0.10", package = "md-5" }
 miette = "7.3"
@@ -139,10 +140,8 @@ rand_chacha = "0.3.1"
 ratatui = "0.26"
 rayon = "1.10"
 reedline = "0.38.0"
-regex = "1.9.5"
 rmp = "0.8"
 rmp-serde = "1.3"
-ropey = "1.6.1"
 roxmltree = "0.20"
 rstest = { version = "0.23", default-features = false }
 rusqlite = "0.31"
@@ -330,4 +329,4 @@ bench = false
 # Run individual benchmarks like `cargo bench -- <regex>` e.g. `cargo bench -- parse`
 [[bench]]
 name = "benchmarks"
-harness = false
\ No newline at end of file
+harness = false
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index 41f3467257..829b1bd152 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -15,12 +15,13 @@ nu-protocol = { path = "../nu-protocol", version = "0.101.1" }
 reedline = { workspace = true }
 
 crossbeam-channel = { workspace = true }
-lsp-types = { workspace = true }
 lsp-server = { workspace = true }
+lsp-types = { workspace = true }
+lsp-textdocument = { workspace = true }
 miette = { workspace = true }
-ropey = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
+url = { workspace = true }
 
 [dev-dependencies]
 nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.1" }
@@ -30,4 +31,4 @@ nu-test-support = { path = "../nu-test-support", version = "0.101.1" }
 assert-json-diff = "2.0"
 
 [lints]
-workspace = true
\ No newline at end of file
+workspace = true
diff --git a/crates/nu-lsp/src/diagnostics.rs b/crates/nu-lsp/src/diagnostics.rs
index 53b47bd2f0..5f94f021a2 100644
--- a/crates/nu-lsp/src/diagnostics.rs
+++ b/crates/nu-lsp/src/diagnostics.rs
@@ -1,41 +1,24 @@
 use crate::LanguageServer;
 use lsp_types::{
     notification::{Notification, PublishDiagnostics},
-    Diagnostic, DiagnosticSeverity, PublishDiagnosticsParams, Url,
+    Diagnostic, DiagnosticSeverity, PublishDiagnosticsParams, Uri,
 };
 use miette::{IntoDiagnostic, Result};
-use nu_parser::parse;
-use nu_protocol::{
-    engine::{EngineState, StateWorkingSet},
-    Span, Value,
-};
+use nu_protocol::Value;
 
 impl LanguageServer {
-    pub(crate) fn publish_diagnostics_for_file(
-        &self,
-        uri: Url,
-        engine_state: &mut EngineState,
-    ) -> Result<()> {
+    pub(crate) fn publish_diagnostics_for_file(&mut self, uri: Uri) -> Result<()> {
+        let mut engine_state = self.engine_state.clone();
         let cwd = std::env::current_dir().expect("Could not get current working directory.");
         engine_state.add_env_var("PWD".into(), Value::test_string(cwd.to_string_lossy()));
         engine_state.generate_nu_constant();
 
-        let mut working_set = StateWorkingSet::new(engine_state);
-
-        let Some((rope_of_file, file_path)) = self.rope(&uri) else {
+        let Some((_, offset, working_set, file)) =
+            self.update_engine_state(&mut engine_state, &uri)
+        else {
             return Ok(());
         };
 
-        let contents = rope_of_file.bytes().collect::<Vec<u8>>();
-        let offset = working_set.next_span_start();
-        working_set.files.push(file_path.into(), Span::unknown())?;
-        parse(
-            &mut working_set,
-            Some(&file_path.to_string_lossy()),
-            &contents,
-            false,
-        );
-
         let mut diagnostics = PublishDiagnosticsParams {
             uri,
             diagnostics: Vec::new(),
@@ -46,12 +29,7 @@ impl LanguageServer {
             let message = err.to_string();
 
             diagnostics.diagnostics.push(Diagnostic {
-                range: Self::span_to_range(
-                    &err.span(),
-                    rope_of_file,
-                    offset,
-                    &self.position_encoding,
-                ),
+                range: Self::span_to_range(&err.span(), file, offset),
                 severity: Some(DiagnosticSeverity::ERROR),
                 message,
                 ..Default::default()
@@ -70,20 +48,20 @@ impl LanguageServer {
 #[cfg(test)]
 mod tests {
     use assert_json_diff::assert_json_eq;
-    use lsp_types::Url;
     use nu_test_support::fs::fixtures;
 
+    use crate::path_to_uri;
     use crate::tests::{initialize_language_server, open_unchecked, update};
 
     #[test]
     fn publish_diagnostics_variable_does_not_exists() {
-        let (client_connection, _recv) = initialize_language_server(None);
+        let (client_connection, _recv) = initialize_language_server();
 
         let mut script = fixtures();
         script.push("lsp");
         script.push("diagnostics");
         script.push("var.nu");
-        let script = Url::from_file_path(script).unwrap();
+        let script = path_to_uri(&script);
 
         let notification = open_unchecked(&client_connection, script.clone());
 
@@ -108,13 +86,13 @@ mod tests {
 
     #[test]
     fn publish_diagnostics_fixed_unknown_variable() {
-        let (client_connection, _recv) = initialize_language_server(None);
+        let (client_connection, _recv) = initialize_language_server();
 
         let mut script = fixtures();
         script.push("lsp");
         script.push("diagnostics");
         script.push("var.nu");
-        let script = Url::from_file_path(script).unwrap();
+        let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
         let notification = update(
diff --git a/crates/nu-lsp/src/lib.rs b/crates/nu-lsp/src/lib.rs
index 3e12a24b2a..a159447c7c 100644
--- a/crates/nu-lsp/src/lib.rs
+++ b/crates/nu-lsp/src/lib.rs
@@ -1,27 +1,28 @@
 #![doc = include_str!("../README.md")]
 use lsp_server::{Connection, IoThreads, Message, Response, ResponseError};
+use lsp_textdocument::{FullTextDocument, TextDocuments};
 use lsp_types::{
     request::{Completion, GotoDefinition, HoverRequest, Request},
     CompletionItem, CompletionItemKind, CompletionParams, CompletionResponse, CompletionTextEdit,
     GotoDefinitionParams, GotoDefinitionResponse, Hover, HoverContents, HoverParams, Location,
-    MarkupContent, MarkupKind, OneOf, Position, PositionEncodingKind, Range, ServerCapabilities,
-    TextDocumentSyncKind, TextEdit, Url,
+    MarkupContent, MarkupKind, OneOf, Range, ServerCapabilities, TextDocumentSyncKind, TextEdit,
+    Uri,
 };
 use miette::{IntoDiagnostic, Result};
 use nu_cli::{NuCompleter, SuggestionKind};
 use nu_parser::{flatten_block, parse, FlatShape};
 use nu_protocol::{
-    engine::{CachedFile, EngineState, Stack, StateWorkingSet},
+    ast::Block,
+    engine::{EngineState, Stack, StateWorkingSet},
     DeclId, Span, Value, VarId,
 };
-use ropey::Rope;
-use serde_json::json;
 use std::{
-    collections::BTreeMap,
     path::{Path, PathBuf},
+    str::FromStr,
     sync::Arc,
     time::Duration,
 };
+use url::Url;
 
 mod diagnostics;
 mod notification;
@@ -36,40 +37,49 @@ enum Id {
 pub struct LanguageServer {
     connection: Connection,
     io_threads: Option<IoThreads>,
-    ropes: BTreeMap<PathBuf, Rope>,
-    position_encoding: PositionEncodingKind,
+    docs: TextDocuments,
+    engine_state: EngineState,
+}
+
+pub fn path_to_uri<P>(path: P) -> Uri
+where
+    P: AsRef<Path>,
+{
+    Uri::from_str(
+        Url::from_file_path(path)
+            .expect("Failed to convert path to Url")
+            .as_str(),
+    )
+    .expect("Failed to convert Url to lsp_types::Uri.")
+}
+
+pub fn uri_to_path(uri: &Uri) -> PathBuf {
+    Url::from_str(uri.as_str())
+        .expect("Failed to convert Uri to Url")
+        .to_file_path()
+        .expect("Failed to convert Url to path")
 }
 
 impl LanguageServer {
-    pub fn initialize_stdio_connection() -> Result<Self> {
+    pub fn initialize_stdio_connection(engine_state: EngineState) -> Result<Self> {
         let (connection, io_threads) = Connection::stdio();
-        Self::initialize_connection(connection, Some(io_threads))
+        Self::initialize_connection(connection, Some(io_threads), engine_state)
     }
 
     fn initialize_connection(
         connection: Connection,
         io_threads: Option<IoThreads>,
+        engine_state: EngineState,
     ) -> Result<Self> {
         Ok(Self {
             connection,
             io_threads,
-            ropes: BTreeMap::new(),
-            position_encoding: PositionEncodingKind::UTF16,
+            docs: TextDocuments::new(),
+            engine_state,
         })
     }
 
-    fn get_offset_encoding(&self, initialization_params: serde_json::Value) -> String {
-        initialization_params
-            .pointer("/capabilities/offsetEncoding/0")
-            .unwrap_or(
-                initialization_params
-                    .pointer("/capabilities/offset_encoding/0")
-                    .unwrap_or(&json!("utf-16")),
-            )
-            .to_string()
-    }
-
-    pub fn serve_requests(mut self, engine_state: EngineState) -> Result<()> {
+    pub fn serve_requests(mut self) -> Result<()> {
         let server_capabilities = serde_json::to_value(ServerCapabilities {
             text_document_sync: Some(lsp_types::TextDocumentSyncCapability::Kind(
                 TextDocumentSyncKind::INCREMENTAL,
@@ -81,16 +91,14 @@ impl LanguageServer {
         })
         .expect("Must be serializable");
 
-        let initialization_params = self
+        let _ = self
             .connection
             .initialize_while(server_capabilities, || {
-                !engine_state.signals().interrupted()
+                !self.engine_state.signals().interrupted()
             })
             .into_diagnostic()?;
-        self.position_encoding =
-            PositionEncodingKind::from(self.get_offset_encoding(initialization_params));
 
-        while !engine_state.signals().interrupted() {
+        while !self.engine_state.signals().interrupted() {
             let msg = match self
                 .connection
                 .receiver
@@ -113,23 +121,16 @@ impl LanguageServer {
                         return Ok(());
                     }
 
-                    let mut engine_state = engine_state.clone();
                     let resp = match request.method.as_str() {
-                        GotoDefinition::METHOD => Self::handle_lsp_request(
-                            &mut engine_state,
-                            request,
-                            |engine_state, params| self.goto_definition(engine_state, params),
-                        ),
-                        HoverRequest::METHOD => Self::handle_lsp_request(
-                            &mut engine_state,
-                            request,
-                            |engine_state, params| self.hover(engine_state, params),
-                        ),
-                        Completion::METHOD => Self::handle_lsp_request(
-                            &mut engine_state,
-                            request,
-                            |engine_state, params| self.complete(engine_state, params),
-                        ),
+                        GotoDefinition::METHOD => {
+                            Self::handle_lsp_request(request, |params| self.goto_definition(params))
+                        }
+                        HoverRequest::METHOD => {
+                            Self::handle_lsp_request(request, |params| self.hover(params))
+                        }
+                        Completion::METHOD => {
+                            Self::handle_lsp_request(request, |params| self.complete(params))
+                        }
                         _ => {
                             continue;
                         }
@@ -143,8 +144,7 @@ impl LanguageServer {
                 Message::Response(_) => {}
                 Message::Notification(notification) => {
                     if let Some(updated_file) = self.handle_lsp_notification(notification) {
-                        let mut engine_state = engine_state.clone();
-                        self.publish_diagnostics_for_file(updated_file, &mut engine_state)?;
+                        self.publish_diagnostics_for_file(updated_file)?;
                     }
                 }
             }
@@ -157,21 +157,38 @@ impl LanguageServer {
         Ok(())
     }
 
-    fn handle_lsp_request<P, H, R>(
-        engine_state: &mut EngineState,
-        req: lsp_server::Request,
-        mut param_handler: H,
-    ) -> Response
+    pub fn update_engine_state<'a>(
+        &mut self,
+        engine_state: &'a mut EngineState,
+        uri: &Uri,
+    ) -> Option<(Arc<Block>, usize, StateWorkingSet<'a>, &FullTextDocument)> {
+        let mut working_set = StateWorkingSet::new(engine_state);
+        let file = self.docs.get_document(uri)?;
+        let file_path = uri_to_path(uri);
+        let file_path_str = file_path.to_str()?;
+        let contents = file.get_content(None).as_bytes();
+        let _ = working_set.files.push(file_path.clone(), Span::unknown());
+        let block = parse(&mut working_set, Some(file_path_str), contents, false);
+        let offset = working_set
+            .get_span_for_filename(file_path_str)
+            .unwrap_or_else(|| panic!("Failed at get_span_for_filename {}", file_path_str))
+            .start;
+        // TODO: merge delta back to engine_state?
+        // self.engine_state.merge_delta(working_set.render());
+        Some((block, offset, working_set, file))
+    }
+
+    fn handle_lsp_request<P, H, R>(req: lsp_server::Request, mut param_handler: H) -> Response
     where
         P: serde::de::DeserializeOwned,
-        H: FnMut(&mut EngineState, &P) -> Option<R>,
+        H: FnMut(&P) -> Option<R>,
         R: serde::ser::Serialize,
     {
         match serde_json::from_value::<P>(req.params) {
             Ok(params) => Response {
                 id: req.id,
                 result: Some(
-                    param_handler(engine_state, &params)
+                    param_handler(&params)
                         .and_then(|response| serde_json::to_value(response).ok())
                         .unwrap_or(serde_json::Value::Null),
                 ),
@@ -190,97 +207,17 @@ impl LanguageServer {
         }
     }
 
-    fn span_to_range(
-        span: &Span,
-        rope_of_file: &Rope,
-        offset: usize,
-        position_encoding: &PositionEncodingKind,
-    ) -> Range {
-        let start = Self::lsp_byte_offset_to_utf_cu_position(
-            span.start.saturating_sub(offset),
-            rope_of_file,
-            position_encoding,
-        );
-        let end = Self::lsp_byte_offset_to_utf_cu_position(
-            span.end.saturating_sub(offset),
-            rope_of_file,
-            position_encoding,
-        );
+    fn span_to_range(span: &Span, file: &FullTextDocument, offset: usize) -> Range {
+        let start = file.position_at(span.start.saturating_sub(offset) as u32);
+        let end = file.position_at(span.end.saturating_sub(offset) as u32);
         Range { start, end }
     }
 
-    fn lsp_byte_offset_to_utf_cu_position(
-        offset: usize,
-        rope_of_file: &Rope,
-        position_encoding: &PositionEncodingKind,
-    ) -> Position {
-        let line = rope_of_file.try_byte_to_line(offset).unwrap_or(0);
-        match position_encoding.as_str() {
-            "\"utf-8\"" => {
-                let character = offset - rope_of_file.line_to_byte(line);
-                Position {
-                    line: line as u32,
-                    character: character as u32,
-                }
-            }
-            _ => {
-                let character = rope_of_file.char_to_utf16_cu(rope_of_file.byte_to_char(offset))
-                    - rope_of_file.char_to_utf16_cu(rope_of_file.line_to_char(line));
-                Position {
-                    line: line as u32,
-                    character: character as u32,
-                }
-            }
-        }
-    }
-
-    fn utf16_cu_position_to_char(rope_of_file: &Rope, position: &Position) -> usize {
-        let line_utf_idx =
-            rope_of_file.char_to_utf16_cu(rope_of_file.line_to_char(position.line as usize));
-        rope_of_file.utf16_cu_to_char(line_utf_idx + position.character as usize)
-    }
-
-    pub fn lsp_position_to_location(
-        position: &Position,
-        rope_of_file: &Rope,
-        position_encoding: &PositionEncodingKind,
-    ) -> usize {
-        match position_encoding.as_str() {
-            "\"utf-8\"" => rope_of_file.byte_to_char(
-                rope_of_file.line_to_byte(position.line as usize) + position.character as usize,
-            ),
-            _ => Self::utf16_cu_position_to_char(rope_of_file, position),
-        }
-    }
-
-    fn lsp_position_to_byte_offset(&self, position: &Position, rope_of_file: &Rope) -> usize {
-        match self.position_encoding.as_str() {
-            "\"utf-8\"" => {
-                rope_of_file.line_to_byte(position.line as usize) + position.character as usize
-            }
-            _ => rope_of_file
-                .try_char_to_byte(Self::utf16_cu_position_to_char(rope_of_file, position))
-                .expect("Character index out of range!"),
-        }
-    }
-
     fn find_id(
-        working_set: &mut StateWorkingSet,
-        path: &Path,
-        file: &Rope,
+        flattened: Vec<(Span, FlatShape)>,
         location: usize,
+        offset: usize,
     ) -> Option<(Id, usize, Span)> {
-        let file_path = path.to_string_lossy();
-
-        // TODO: think about passing down the rope into the working_set
-        let contents = file.bytes().collect::<Vec<u8>>();
-        let _ = working_set
-            .files
-            .push(file_path.as_ref().into(), Span::unknown());
-        let block = parse(working_set, Some(&file_path), &contents, false);
-        let flattened = flatten_block(working_set, &block);
-
-        let offset = working_set.get_span_for_filename(&file_path)?.start;
         let location = location + offset;
 
         for (span, shape) in flattened {
@@ -299,122 +236,88 @@ impl LanguageServer {
         None
     }
 
-    fn rope<'a, 'b: 'a>(&'b self, file_url: &Url) -> Option<(&'a Rope, &'a PathBuf)> {
-        let file_path = file_url.to_file_path().ok()?;
-
-        self.ropes
-            .get_key_value(&file_path)
-            .map(|(path, rope)| (rope, path))
-    }
-
-    fn read_in_file<'a>(
-        &self,
-        engine_state: &'a mut EngineState,
-        file_url: &Url,
-    ) -> Option<(&Rope, &PathBuf, StateWorkingSet<'a>)> {
-        let (file, path) = self.rope(file_url)?;
-
-        engine_state.file = Some(path.to_owned());
-
-        let working_set = StateWorkingSet::new(engine_state);
-
-        Some((file, path, working_set))
-    }
-
-    fn rope_file_from_cached_file(&mut self, cached_file: &CachedFile) -> Result<(Url, &Rope), ()> {
-        let uri = Url::from_file_path(&*cached_file.name)?;
-        let rope_of_file = self.ropes.entry(uri.to_file_path()?).or_insert_with(|| {
-            let raw_string = String::from_utf8_lossy(&cached_file.content);
-            Rope::from_str(&raw_string)
-        });
-        Ok((uri, rope_of_file))
-    }
-
-    fn goto_definition(
-        &mut self,
-        engine_state: &mut EngineState,
-        params: &GotoDefinitionParams,
-    ) -> Option<GotoDefinitionResponse> {
-        let cwd = std::env::current_dir().expect("Could not get current working directory.");
-        engine_state.add_env_var("PWD".into(), Value::test_string(cwd.to_string_lossy()));
-
-        let (file, path, mut working_set) = self.read_in_file(
-            engine_state,
-            &params.text_document_position_params.text_document.uri,
-        )?;
-
-        let (id, _, _) = Self::find_id(
-            &mut working_set,
-            path,
-            file,
-            self.lsp_position_to_byte_offset(&params.text_document_position_params.position, file),
-        )?;
-
-        match id {
-            Id::Declaration(decl_id) => {
-                if let Some(block_id) = working_set.get_decl(decl_id).block_id() {
-                    let block = working_set.get_block(block_id);
-                    if let Some(span) = &block.span {
-                        for cached_file in working_set.files() {
-                            if cached_file.covered_span.contains(span.start) {
-                                let position_encoding = self.position_encoding.clone();
-                                let (uri, rope_of_file) =
-                                    self.rope_file_from_cached_file(cached_file).ok()?;
-                                return Some(GotoDefinitionResponse::Scalar(Location {
-                                    uri,
-                                    range: Self::span_to_range(
-                                        span,
-                                        rope_of_file,
-                                        cached_file.covered_span.start,
-                                        &position_encoding,
-                                    ),
-                                }));
-                            }
-                        }
-                    }
+    fn get_location_by_span(&self, working_set: &StateWorkingSet, span: &Span) -> Option<Location> {
+        for cached_file in working_set.files() {
+            if cached_file.covered_span.contains(span.start) {
+                let path = Path::new(&*cached_file.name);
+                if !(path.exists() && path.is_file()) {
+                    return None;
+                }
+                let target_uri = path_to_uri(path);
+                if let Some(doc) = self.docs.get_document(&target_uri) {
+                    return Some(Location {
+                        uri: target_uri,
+                        range: Self::span_to_range(span, doc, cached_file.covered_span.start),
+                    });
+                } else {
+                    // in case where the document is not opened yet, typically included by `nu -I`
+                    let temp_doc = FullTextDocument::new(
+                        "Unk".to_string(),
+                        0,
+                        String::from_utf8((*cached_file.content).to_vec()).expect("Invalid UTF-8"),
+                    );
+                    return Some(Location {
+                        uri: target_uri,
+                        range: Self::span_to_range(span, &temp_doc, cached_file.covered_span.start),
+                    });
                 }
             }
-            Id::Variable(var_id) => {
-                let var = working_set.get_variable(var_id);
-                for cached_file in working_set.files() {
-                    if cached_file
-                        .covered_span
-                        .contains(var.declaration_span.start)
-                    {
-                        let position_encoding = self.position_encoding.clone();
-                        let (uri, rope_of_file) =
-                            self.rope_file_from_cached_file(cached_file).ok()?;
-                        return Some(GotoDefinitionResponse::Scalar(Location {
-                            uri,
-                            range: Self::span_to_range(
-                                &var.declaration_span,
-                                rope_of_file,
-                                cached_file.covered_span.start,
-                                &position_encoding,
-                            ),
-                        }));
-                    }
-                }
-            }
-            Id::Value(_) => {}
         }
         None
     }
 
-    fn hover(&mut self, engine_state: &mut EngineState, params: &HoverParams) -> Option<Hover> {
+    fn goto_definition(&mut self, params: &GotoDefinitionParams) -> Option<GotoDefinitionResponse> {
+        let mut engine_state = self.engine_state.clone();
         let cwd = std::env::current_dir().expect("Could not get current working directory.");
         engine_state.add_env_var("PWD".into(), Value::test_string(cwd.to_string_lossy()));
 
-        let (file, path, mut working_set) = self.read_in_file(
-            engine_state,
-            &params.text_document_position_params.text_document.uri,
+        let path_uri = params
+            .text_document_position_params
+            .text_document
+            .uri
+            .to_owned();
+        let (block, file_offset, working_set, file) =
+            self.update_engine_state(&mut engine_state, &path_uri)?;
+        let flattened = flatten_block(&working_set, &block);
+        let (id, _, _) = Self::find_id(
+            flattened,
+            file.offset_at(params.text_document_position_params.position) as usize,
+            file_offset,
         )?;
 
+        let span = match id {
+            Id::Declaration(decl_id) => {
+                let block_id = working_set.get_decl(decl_id).block_id()?;
+                working_set.get_block(block_id).span
+            }
+            Id::Variable(var_id) => {
+                let var = working_set.get_variable(var_id);
+                Some(var.declaration_span)
+            }
+            _ => None,
+        }?;
+        Some(GotoDefinitionResponse::Scalar(
+            self.get_location_by_span(&working_set, &span)?,
+        ))
+    }
+
+    fn hover(&mut self, params: &HoverParams) -> Option<Hover> {
+        let mut engine_state = self.engine_state.clone();
+        let cwd = std::env::current_dir().expect("Could not get current working directory.");
+        engine_state.add_env_var("PWD".into(), Value::test_string(cwd.to_string_lossy()));
+
+        let path_uri = params
+            .text_document_position_params
+            .text_document
+            .uri
+            .to_owned();
+        let (block, file_offset, working_set, file) =
+            self.update_engine_state(&mut engine_state, &path_uri)?;
+        let flattened = flatten_block(&working_set, &block);
         let (id, _, _) = Self::find_id(
-            &mut working_set,
-            path,
-            file,
-            self.lsp_position_to_byte_offset(&params.text_document_position_params.position, file),
+            flattened,
+            file.offset_at(params.text_document_position_params.position) as usize,
+            file_offset,
         )?;
 
         match id {
@@ -615,26 +518,15 @@ impl LanguageServer {
         }
     }
 
-    fn complete(
-        &mut self,
-        engine_state: &mut EngineState,
-        params: &CompletionParams,
-    ) -> Option<CompletionResponse> {
-        let cwd = std::env::current_dir().expect("Could not get current working directory.");
-        engine_state.add_env_var("PWD".into(), Value::test_string(cwd.to_string_lossy()));
-
-        let (rope_of_file, _, _) = self.read_in_file(
-            engine_state,
-            &params.text_document_position.text_document.uri,
-        )?;
+    fn complete(&mut self, params: &CompletionParams) -> Option<CompletionResponse> {
+        let path_uri = params.text_document_position.text_document.uri.to_owned();
+        let file = self.docs.get_document(&path_uri)?;
 
         let mut completer =
-            NuCompleter::new(Arc::new(engine_state.clone()), Arc::new(Stack::new()));
+            NuCompleter::new(Arc::new(self.engine_state.clone()), Arc::new(Stack::new()));
 
-        let location =
-            self.lsp_position_to_byte_offset(&params.text_document_position.position, rope_of_file);
-        let results =
-            completer.fetch_completions_at(&rope_of_file.to_string()[..location], location);
+        let location = file.offset_at(params.text_document_position.position) as usize;
+        let results = completer.fetch_completions_at(&file.get_content(None)[..location], location);
         if results.is_empty() {
             None
         } else {
@@ -691,26 +583,23 @@ mod tests {
         },
         request::{Completion, GotoDefinition, HoverRequest, Initialize, Request, Shutdown},
         CompletionParams, DidChangeTextDocumentParams, DidOpenTextDocumentParams,
-        GotoDefinitionParams, InitializeParams, InitializedParams, PartialResultParams,
+        GotoDefinitionParams, InitializeParams, InitializedParams, PartialResultParams, Position,
         TextDocumentContentChangeEvent, TextDocumentIdentifier, TextDocumentItem,
-        TextDocumentPositionParams, Url, WorkDoneProgressParams,
+        TextDocumentPositionParams, WorkDoneProgressParams,
     };
     use nu_test_support::fs::{fixtures, root};
     use std::sync::mpsc::Receiver;
 
-    pub fn initialize_language_server(
-        client_offset_encoding: Option<Vec<String>>,
-    ) -> (Connection, Receiver<Result<()>>) {
+    pub fn initialize_language_server() -> (Connection, Receiver<Result<()>>) {
         use std::sync::mpsc;
         let (client_connection, server_connection) = Connection::memory();
-        let lsp_server = LanguageServer::initialize_connection(server_connection, None).unwrap();
+        let engine_state = nu_cmd_lang::create_default_context();
+        let engine_state = nu_command::add_shell_command_context(engine_state);
+        let lsp_server =
+            LanguageServer::initialize_connection(server_connection, None, engine_state).unwrap();
 
         let (send, recv) = mpsc::channel();
-        std::thread::spawn(move || {
-            let engine_state = nu_cmd_lang::create_default_context();
-            let engine_state = nu_command::add_shell_command_context(engine_state);
-            send.send(lsp_server.serve_requests(engine_state))
-        });
+        std::thread::spawn(move || send.send(lsp_server.serve_requests()));
 
         client_connection
             .sender
@@ -719,7 +608,6 @@ mod tests {
                 method: Initialize::METHOD.to_string(),
                 params: serde_json::to_value(InitializeParams {
                     capabilities: lsp_types::ClientCapabilities {
-                        offset_encoding: client_offset_encoding,
                         ..Default::default()
                     },
                     ..Default::default()
@@ -745,7 +633,7 @@ mod tests {
 
     #[test]
     fn shutdown_on_request() {
-        let (client_connection, recv) = initialize_language_server(None);
+        let (client_connection, recv) = initialize_language_server();
 
         client_connection
             .sender
@@ -771,7 +659,7 @@ mod tests {
 
     #[test]
     fn goto_definition_for_none_existing_file() {
-        let (client_connection, _recv) = initialize_language_server(None);
+        let (client_connection, _recv) = initialize_language_server();
 
         let mut none_existent_path = root();
         none_existent_path.push("none-existent.nu");
@@ -784,7 +672,7 @@ mod tests {
                 params: serde_json::to_value(GotoDefinitionParams {
                     text_document_position_params: TextDocumentPositionParams {
                         text_document: TextDocumentIdentifier {
-                            uri: Url::from_file_path(none_existent_path).unwrap(),
+                            uri: path_to_uri(&none_existent_path),
                         },
                         position: Position {
                             line: 0,
@@ -811,16 +699,15 @@ mod tests {
         assert_json_eq!(result, serde_json::json!(null));
     }
 
-    pub fn open_unchecked(client_connection: &Connection, uri: Url) -> lsp_server::Notification {
+    pub fn open_unchecked(client_connection: &Connection, uri: Uri) -> lsp_server::Notification {
         open(client_connection, uri).unwrap()
     }
 
     pub fn open(
         client_connection: &Connection,
-        uri: Url,
+        uri: Uri,
     ) -> Result<lsp_server::Notification, String> {
-        let text =
-            std::fs::read_to_string(uri.to_file_path().unwrap()).map_err(|e| e.to_string())?;
+        let text = std::fs::read_to_string(uri_to_path(&uri)).map_err(|e| e.to_string())?;
 
         client_connection
             .sender
@@ -852,7 +739,7 @@ mod tests {
 
     pub fn update(
         client_connection: &Connection,
-        uri: Url,
+        uri: Uri,
         text: String,
         range: Option<Range>,
     ) -> lsp_server::Notification {
@@ -863,7 +750,7 @@ mod tests {
                     method: DidChangeTextDocument::METHOD.to_string(),
                     params: serde_json::to_value(DidChangeTextDocumentParams {
                         text_document: lsp_types::VersionedTextDocumentIdentifier {
-                            uri,
+                            uri: uri.clone(),
                             version: 2,
                         },
                         content_changes: vec![TextDocumentContentChangeEvent {
@@ -891,7 +778,7 @@ mod tests {
 
     fn goto_definition(
         client_connection: &Connection,
-        uri: Url,
+        uri: Uri,
         line: u32,
         character: u32,
     ) -> Message {
@@ -920,13 +807,13 @@ mod tests {
 
     #[test]
     fn goto_definition_of_variable() {
-        let (client_connection, _recv) = initialize_language_server(None);
+        let (client_connection, _recv) = initialize_language_server();
 
         let mut script = fixtures();
         script.push("lsp");
         script.push("goto");
         script.push("var.nu");
-        let script = Url::from_file_path(script).unwrap();
+        let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
 
@@ -940,24 +827,24 @@ mod tests {
         assert_json_eq!(
             result,
             serde_json::json!({
-               "uri": script,
-               "range": {
-                  "start": { "line": 0, "character": 4 },
-                  "end": { "line": 0, "character": 12 }
-               }
+                "uri": script,
+                "range": {
+                "start": { "line": 0, "character": 4 },
+                "end": { "line": 0, "character": 12 }
+            }
             })
         );
     }
 
     #[test]
     fn goto_definition_of_command() {
-        let (client_connection, _recv) = initialize_language_server(None);
+        let (client_connection, _recv) = initialize_language_server();
 
         let mut script = fixtures();
         script.push("lsp");
         script.push("goto");
         script.push("command.nu");
-        let script = Url::from_file_path(script).unwrap();
+        let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
 
@@ -971,29 +858,28 @@ mod tests {
         assert_json_eq!(
             result,
             serde_json::json!({
-               "uri": script,
-               "range": {
-                  "start": { "line": 0, "character": 17 },
-                  "end": { "line": 2, "character": 1 }
-               }
+                "uri": script,
+                "range": {
+                "start": { "line": 0, "character": 17 },
+                "end": { "line": 2, "character": 1 }
+            }
             })
         );
     }
 
     #[test]
-    fn goto_definition_of_command_utf8() {
-        let (client_connection, _recv) =
-            initialize_language_server(Some(vec!["utf-8".to_string(), "utf-16".to_string()]));
+    fn goto_definition_of_command_unicode() {
+        let (client_connection, _recv) = initialize_language_server();
 
         let mut script = fixtures();
         script.push("lsp");
         script.push("goto");
         script.push("command_unicode.nu");
-        let script = Url::from_file_path(script).unwrap();
+        let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
 
-        let resp = goto_definition(&client_connection, script.clone(), 4, 1);
+        let resp = goto_definition(&client_connection, script.clone(), 4, 2);
         let result = if let Message::Response(response) = resp {
             response.result
         } else {
@@ -1003,55 +889,24 @@ mod tests {
         assert_json_eq!(
             result,
             serde_json::json!({
-               "uri": script,
-               "range": {
-                  "start": { "line": 0, "character": 28 },
-                  "end": { "line": 2, "character": 1 }
-               }
-            })
-        );
-    }
-
-    #[test]
-    fn goto_definition_of_command_utf16() {
-        let (client_connection, _recv) = initialize_language_server(None);
-
-        let mut script = fixtures();
-        script.push("lsp");
-        script.push("goto");
-        script.push("command_unicode.nu");
-        let script = Url::from_file_path(script).unwrap();
-
-        open_unchecked(&client_connection, script.clone());
-
-        let resp = goto_definition(&client_connection, script.clone(), 4, 1);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
-
-        assert_json_eq!(
-            result,
-            serde_json::json!({
-               "uri": script,
-               "range": {
-                  "start": { "line": 0, "character": 19 },
-                  "end": { "line": 2, "character": 1 }
-               }
+                "uri": script,
+                "range": {
+                "start": { "line": 0, "character": 19 },
+                "end": { "line": 2, "character": 1 }
+            }
             })
         );
     }
 
     #[test]
     fn goto_definition_of_command_parameter() {
-        let (client_connection, _recv) = initialize_language_server(None);
+        let (client_connection, _recv) = initialize_language_server();
 
         let mut script = fixtures();
         script.push("lsp");
         script.push("goto");
         script.push("command.nu");
-        let script = Url::from_file_path(script).unwrap();
+        let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
 
@@ -1065,16 +920,16 @@ mod tests {
         assert_json_eq!(
             result,
             serde_json::json!({
-               "uri": script,
-               "range": {
-                  "start": { "line": 0, "character": 11 },
-                  "end": { "line": 0, "character": 15 }
-               }
+                "uri": script,
+                "range": {
+                "start": { "line": 0, "character": 11 },
+                "end": { "line": 0, "character": 15 }
+            }
             })
         );
     }
 
-    pub fn hover(client_connection: &Connection, uri: Url, line: u32, character: u32) -> Message {
+    pub fn hover(client_connection: &Connection, uri: Uri, line: u32, character: u32) -> Message {
         client_connection
             .sender
             .send(Message::Request(lsp_server::Request {
@@ -1099,13 +954,13 @@ mod tests {
 
     #[test]
     fn hover_on_variable() {
-        let (client_connection, _recv) = initialize_language_server(None);
+        let (client_connection, _recv) = initialize_language_server();
 
         let mut script = fixtures();
         script.push("lsp");
         script.push("hover");
         script.push("var.nu");
-        let script = Url::from_file_path(script).unwrap();
+        let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
 
@@ -1126,13 +981,13 @@ mod tests {
 
     #[test]
     fn hover_on_custom_command() {
-        let (client_connection, _recv) = initialize_language_server(None);
+        let (client_connection, _recv) = initialize_language_server();
 
         let mut script = fixtures();
         script.push("lsp");
         script.push("hover");
         script.push("command.nu");
-        let script = Url::from_file_path(script).unwrap();
+        let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
 
@@ -1146,7 +1001,7 @@ mod tests {
         assert_json_eq!(
             result,
             serde_json::json!({
-                "contents": {
+                    "contents": {
                     "kind": "markdown",
                     "value": "Renders some greeting message\n### Usage \n```nu\n  hello {flags}\n```\n\n### Flags\n\n  `-h`, `--help` - Display the help message for this command\n\n"
                 }
@@ -1156,13 +1011,13 @@ mod tests {
 
     #[test]
     fn hover_on_str_join() {
-        let (client_connection, _recv) = initialize_language_server(None);
+        let (client_connection, _recv) = initialize_language_server();
 
         let mut script = fixtures();
         script.push("lsp");
         script.push("hover");
         script.push("command.nu");
-        let script = Url::from_file_path(script).unwrap();
+        let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
 
@@ -1176,7 +1031,7 @@ mod tests {
         assert_json_eq!(
             result,
             serde_json::json!({
-                "contents": {
+                    "contents": {
                     "kind": "markdown",
                     "value": "Concatenate multiple strings into a single string, with an optional separator between each.\n### Usage \n```nu\n  str join {flags} <separator?>\n```\n\n### Flags\n\n  `-h`, `--help` - Display the help message for this command\n\n\n### Parameters\n\n  `separator: string` - Optional separator to use when creating string.\n\n\n### Input/output types\n\n```nu\n list<any> | string\n string | string\n\n```\n### Example(s)\n  Create a string from input\n```nu\n  ['nu', 'shell'] | str join\n```\n  Create a string from input with a separator\n```nu\n  ['nu', 'shell'] | str join '-'\n```\n"
                 }
@@ -1184,7 +1039,7 @@ mod tests {
         );
     }
 
-    fn complete(client_connection: &Connection, uri: Url, line: u32, character: u32) -> Message {
+    fn complete(client_connection: &Connection, uri: Uri, line: u32, character: u32) -> Message {
         client_connection
             .sender
             .send(Message::Request(lsp_server::Request {
@@ -1211,13 +1066,13 @@ mod tests {
 
     #[test]
     fn complete_on_variable() {
-        let (client_connection, _recv) = initialize_language_server(None);
+        let (client_connection, _recv) = initialize_language_server();
 
         let mut script = fixtures();
         script.push("lsp");
         script.push("completion");
         script.push("var.nu");
-        let script = Url::from_file_path(script).unwrap();
+        let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
 
@@ -1231,30 +1086,30 @@ mod tests {
         assert_json_eq!(
             result,
             serde_json::json!([
-               {
-                  "label": "$greeting",
-                  "textEdit": {
-                     "newText": "$greeting",
-                     "range": {
-                        "start": { "character": 5, "line": 2 },
-                        "end": { "character": 9, "line": 2 }
-                     }
-                  },
-                  "kind": 6
-               }
+                {
+                    "label": "$greeting",
+                    "textEdit": {
+                    "newText": "$greeting",
+                    "range": {
+                    "start": { "character": 5, "line": 2 },
+                "end": { "character": 9, "line": 2 }
+            }
+            },
+                "kind": 6
+            }
             ])
         );
     }
 
     #[test]
     fn complete_command_with_space() {
-        let (client_connection, _recv) = initialize_language_server(None);
+        let (client_connection, _recv) = initialize_language_server();
 
         let mut script = fixtures();
         script.push("lsp");
         script.push("completion");
         script.push("command.nu");
-        let script = Url::from_file_path(script).unwrap();
+        let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
 
@@ -1268,71 +1123,31 @@ mod tests {
         assert_json_eq!(
             result,
             serde_json::json!([
-               {
-                  "label": "config nu",
-                  "detail": "Edit nu configurations.",
-                  "textEdit": {
-                     "range": {
-                        "start": { "line": 0, "character": 0 },
-                        "end": { "line": 0, "character": 8 },
-                     },
-                     "newText": "config nu"
-                  },
-                  "kind": 3
-               }
+                {
+                    "label": "config nu",
+                    "detail": "Edit nu configurations.",
+                    "textEdit": {
+                    "range": {
+                    "start": { "line": 0, "character": 0 },
+                "end": { "line": 0, "character": 8 },
+            },
+                "newText": "config nu"
+            },
+                "kind": 3
+            }
             ])
         );
     }
 
     #[test]
-    fn complete_command_with_utf8_line() {
-        let (client_connection, _recv) =
-            initialize_language_server(Some(vec!["utf-8".to_string()]));
+    fn complete_command_with_line() {
+        let (client_connection, _recv) = initialize_language_server();
 
         let mut script = fixtures();
         script.push("lsp");
         script.push("completion");
         script.push("utf_pipeline.nu");
-        let script = Url::from_file_path(script).unwrap();
-
-        open_unchecked(&client_connection, script.clone());
-
-        let resp = complete(&client_connection, script, 0, 14);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
-
-        assert_json_eq!(
-            result,
-            serde_json::json!([
-               {
-                  "label": "str trim",
-                  "detail": "Trim whitespace or specific character.",
-                  "textEdit": {
-                     "range": {
-                        "start": { "line": 0, "character": 9 },
-                        "end": { "line": 0, "character": 14 },
-                     },
-                     "newText": "str trim"
-                  },
-                  "kind": 3
-               }
-            ])
-        );
-    }
-
-    #[test]
-    fn complete_command_with_utf16_line() {
-        let (client_connection, _recv) =
-            initialize_language_server(Some(vec!["utf-16".to_string()]));
-
-        let mut script = fixtures();
-        script.push("lsp");
-        script.push("completion");
-        script.push("utf_pipeline.nu");
-        let script = Url::from_file_path(script).unwrap();
+        let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
 
@@ -1346,31 +1161,31 @@ mod tests {
         assert_json_eq!(
             result,
             serde_json::json!([
-               {
-                  "label": "str trim",
-                  "detail": "Trim whitespace or specific character.",
-                  "textEdit": {
-                     "range": {
-                        "start": { "line": 0, "character": 8 },
-                        "end": { "line": 0, "character": 13 },
-                     },
-                     "newText": "str trim"
-                  },
-                  "kind": 3
-               }
+                {
+                    "label": "str trim",
+                    "detail": "Trim whitespace or specific character.",
+                    "textEdit": {
+                    "range": {
+                    "start": { "line": 0, "character": 8 },
+                "end": { "line": 0, "character": 13 },
+            },
+                "newText": "str trim"
+            },
+                "kind": 3
+            }
             ])
         );
     }
 
     #[test]
     fn complete_keyword() {
-        let (client_connection, _recv) = initialize_language_server(None);
+        let (client_connection, _recv) = initialize_language_server();
 
         let mut script = fixtures();
         script.push("lsp");
         script.push("completion");
         script.push("keyword.nu");
-        let script = Url::from_file_path(script).unwrap();
+        let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
 
@@ -1387,14 +1202,14 @@ mod tests {
                 {
                     "label": "overlay",
                     "textEdit": {
-                        "newText": "overlay",
-                        "range": {
-                            "start": { "character": 0, "line": 0 },
-                            "end": { "character": 2, "line": 0 }
-                        }
-                    },
-                    "kind": 14
-                },
+                    "newText": "overlay",
+                    "range": {
+                    "start": { "character": 0, "line": 0 },
+                "end": { "character": 2, "line": 0 }
+            }
+            },
+                "kind": 14
+            },
             ])
         );
     }
diff --git a/crates/nu-lsp/src/notification.rs b/crates/nu-lsp/src/notification.rs
index a3e563b468..33ec9ed5de 100644
--- a/crates/nu-lsp/src/notification.rs
+++ b/crates/nu-lsp/src/notification.rs
@@ -1,10 +1,7 @@
 use lsp_types::{
-    notification::{
-        DidChangeTextDocument, DidCloseTextDocument, DidOpenTextDocument, Notification,
-    },
-    DidChangeTextDocumentParams, DidCloseTextDocumentParams, DidOpenTextDocumentParams, Url,
+    notification::{DidChangeTextDocument, DidOpenTextDocument, DidSaveTextDocument, Notification},
+    DidChangeTextDocumentParams, DidOpenTextDocumentParams, DidSaveTextDocumentParams, Uri,
 };
-use ropey::Rope;
 
 use crate::LanguageServer;
 
@@ -12,107 +9,52 @@ impl LanguageServer {
     pub(crate) fn handle_lsp_notification(
         &mut self,
         notification: lsp_server::Notification,
-    ) -> Option<Url> {
+    ) -> Option<Uri> {
+        self.docs
+            .listen(notification.method.as_str(), &notification.params);
         match notification.method.as_str() {
-            DidOpenTextDocument::METHOD => Self::handle_notification_payload::<
-                DidOpenTextDocumentParams,
-                _,
-            >(notification, |param| {
-                if let Ok(file_path) = param.text_document.uri.to_file_path() {
-                    let rope = Rope::from_str(&param.text_document.text);
-                    self.ropes.insert(file_path, rope);
-                    Some(param.text_document.uri)
-                } else {
-                    None
-                }
-            }),
+            DidOpenTextDocument::METHOD => {
+                let params: DidOpenTextDocumentParams =
+                    serde_json::from_value(notification.params.clone())
+                        .expect("Expect receive DidOpenTextDocumentParams");
+                Some(params.text_document.uri)
+            }
+            DidSaveTextDocument::METHOD => {
+                let params: DidSaveTextDocumentParams =
+                    serde_json::from_value(notification.params.clone())
+                        .expect("Expect receive DidSaveTextDocumentParams");
+                Some(params.text_document.uri)
+            }
             DidChangeTextDocument::METHOD => {
-                Self::handle_notification_payload::<DidChangeTextDocumentParams, _>(
-                    notification,
-                    |params| self.update_rope(params),
-                )
+                let params: DidChangeTextDocumentParams =
+                    serde_json::from_value(notification.params.clone())
+                        .expect("Expect receive DidChangeTextDocumentParams");
+                Some(params.text_document.uri)
             }
-            DidCloseTextDocument::METHOD => Self::handle_notification_payload::<
-                DidCloseTextDocumentParams,
-                _,
-            >(notification, |param| {
-                if let Ok(file_path) = param.text_document.uri.to_file_path() {
-                    self.ropes.remove(&file_path);
-                }
-                None
-            }),
             _ => None,
         }
     }
-
-    fn handle_notification_payload<P, H>(
-        notification: lsp_server::Notification,
-        mut param_handler: H,
-    ) -> Option<Url>
-    where
-        P: serde::de::DeserializeOwned,
-        H: FnMut(P) -> Option<Url>,
-    {
-        if let Ok(params) = serde_json::from_value::<P>(notification.params) {
-            param_handler(params)
-        } else {
-            None
-        }
-    }
-
-    fn update_rope(&mut self, params: DidChangeTextDocumentParams) -> Option<Url> {
-        if let Ok(file_path) = params.text_document.uri.to_file_path() {
-            for content_change in params.content_changes.into_iter() {
-                let entry = self.ropes.entry(file_path.clone());
-                match content_change.range {
-                    Some(range) => {
-                        entry.and_modify(|rope| {
-                            let start = Self::lsp_position_to_location(
-                                &range.start,
-                                rope,
-                                &self.position_encoding,
-                            );
-                            let end = Self::lsp_position_to_location(
-                                &range.end,
-                                rope,
-                                &self.position_encoding,
-                            );
-
-                            rope.remove(start..end);
-                            rope.insert(start, &content_change.text);
-                        });
-                    }
-                    None => {
-                        entry.and_modify(|r| *r = Rope::from_str(&content_change.text));
-                    }
-                }
-            }
-
-            Some(params.text_document.uri)
-        } else {
-            None
-        }
-    }
 }
 
 #[cfg(test)]
 mod tests {
     use assert_json_diff::assert_json_eq;
     use lsp_server::Message;
-    use lsp_types::{Range, Url};
+    use lsp_types::Range;
     use nu_test_support::fs::fixtures;
 
+    use crate::path_to_uri;
     use crate::tests::{hover, initialize_language_server, open, open_unchecked, update};
 
     #[test]
     fn hover_correct_documentation_on_let() {
-        let (client_connection, _recv) = initialize_language_server(None);
+        let (client_connection, _recv) = initialize_language_server();
 
         let mut script = fixtures();
         script.push("lsp");
         script.push("hover");
         script.push("var.nu");
-        let script = Url::from_file_path(script).unwrap();
+        let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
 
@@ -136,13 +78,13 @@ mod tests {
 
     #[test]
     fn hover_on_command_after_full_content_change() {
-        let (client_connection, _recv) = initialize_language_server(None);
+        let (client_connection, _recv) = initialize_language_server();
 
         let mut script = fixtures();
         script.push("lsp");
         script.push("hover");
         script.push("command.nu");
-        let script = Url::from_file_path(script).unwrap();
+        let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
         update(
@@ -177,13 +119,13 @@ hello"#,
 
     #[test]
     fn hover_on_command_after_partial_content_change() {
-        let (client_connection, _recv) = initialize_language_server(None);
+        let (client_connection, _recv) = initialize_language_server();
 
         let mut script = fixtures();
         script.push("lsp");
         script.push("hover");
         script.push("command.nu");
-        let script = Url::from_file_path(script).unwrap();
+        let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
         update(
@@ -222,13 +164,13 @@ hello"#,
 
     #[test]
     fn open_document_with_utf_char() {
-        let (client_connection, _recv) = initialize_language_server(None);
+        let (client_connection, _recv) = initialize_language_server();
 
         let mut script = fixtures();
         script.push("lsp");
         script.push("notifications");
         script.push("issue_11522.nu");
-        let script = Url::from_file_path(script).unwrap();
+        let script = path_to_uri(&script);
 
         let result = open(&client_connection, script);
 
diff --git a/src/main.rs b/src/main.rs
index 32a602707e..cb86557ac2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -460,7 +460,7 @@ fn main() -> Result<()> {
             );
         }
 
-        LanguageServer::initialize_stdio_connection()?.serve_requests(engine_state)?
+        LanguageServer::initialize_stdio_connection(engine_state)?.serve_requests()?
     } else if let Some(commands) = parsed_nu_cli_args.commands.clone() {
         run_commands(
             &mut engine_state,

From 87a562e24b51702de576339fca5925962d1bbeee Mon Sep 17 00:00:00 2001
From: Bark <32035685+userwiths@users.noreply.github.com>
Date: Sun, 5 Jan 2025 15:13:19 +0200
Subject: [PATCH 0879/1072] Fix root directory traversal issue (#14747)

fixes : #13729

During dot expansion, the "parent" was added even if it was after the
root (`/../../`).
Added additional check that skips appending elements to the path
representation if the parent folder is the root folder.
---
 crates/nu-path/src/dots.rs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/crates/nu-path/src/dots.rs b/crates/nu-path/src/dots.rs
index 8d6341cb46..c001451c68 100644
--- a/crates/nu-path/src/dots.rs
+++ b/crates/nu-path/src/dots.rs
@@ -60,7 +60,13 @@ pub fn expand_dots(path: impl AsRef<Path>) -> PathBuf {
             Component::CurDir if last_component_is_normal(&result) => {
                 // no-op
             }
-            _ => result.push(component),
+            _ => {
+                let prev_component = result.components().last();
+                if prev_component == Some(Component::RootDir) && component == Component::ParentDir {
+                    continue;
+                }
+                result.push(component)
+            }
         }
     }
 
@@ -215,11 +221,7 @@ mod test_expand_dots {
     #[test]
     fn backtrack_to_root() {
         let path = Path::new("/foo/bar/../../../../baz");
-        let expected = if cfg!(windows) {
-            r"\..\..\baz"
-        } else {
-            "/../../baz"
-        };
+        let expected = if cfg!(windows) { r"\baz" } else { "/baz" };
         assert_path_eq!(expand_dots(path), expected);
     }
 }

From 1b7fabd1fded850e00b17bc4ad140e8bc680d4ec Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Sun, 5 Jan 2025 16:18:19 -0500
Subject: [PATCH 0880/1072] Fix config reset to use scaffold config files
 (#14756)

In #14249, `config reset` wasn't updated to use the scaffold config files, so running `config reset` would accidentally reset the user's config to the internal defaults. This PR updates it to use the
scaffold files.
---
 crates/nu-command/src/env/config/config_reset.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/nu-command/src/env/config/config_reset.rs b/crates/nu-command/src/env/config/config_reset.rs
index 8cf45d21bc..03c022c3d7 100644
--- a/crates/nu-command/src/env/config/config_reset.rs
+++ b/crates/nu-command/src/env/config/config_reset.rs
@@ -1,7 +1,7 @@
 use chrono::Local;
 use nu_engine::command_prelude::*;
 
-use nu_utils::{get_default_config, get_default_env};
+use nu_utils::{get_scaffold_config, get_scaffold_env};
 use std::io::Write;
 
 #[derive(Clone)]
@@ -51,7 +51,7 @@ impl Command for ConfigReset {
         if !only_env {
             let mut nu_config = config_path.clone();
             nu_config.push("config.nu");
-            let config_file = get_default_config();
+            let config_file = get_scaffold_config();
             if !no_backup {
                 let mut backup_path = config_path.clone();
                 backup_path.push(format!(
@@ -77,7 +77,7 @@ impl Command for ConfigReset {
         if !only_nu {
             let mut env_config = config_path.clone();
             env_config.push("env.nu");
-            let config_file = get_default_env();
+            let config_file = get_scaffold_env();
             if !no_backup {
                 let mut backup_path = config_path.clone();
                 backup_path.push(format!("oldenv-{}.nu", Local::now().format("%F-%H-%M-%S"),));

From ed1381adc48691b16fdc07494f68cfdf4b88283b Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Sun, 5 Jan 2025 16:33:58 -0500
Subject: [PATCH 0881/1072] Change `PipelineData::into_value` to use internal
 `Value`'s span before passed in span (#14757)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

Changes the `Value` variant match arm of `PipelineData::into_value` to
use the internal `Value`'s span instead of the span passed in by the
user. This aligns more closely with the `ListStream` and `ByteStream`
match arms, which already use their internal span, and allows errors to
provide better diagnostics since the span information doesn't get lost
when `into_value` is called. At the suggestion of @cptpiepmatz, if the
`Value` has `Span::unknown` for some reason, then we replace the
`Value`'s span with the passed in span.

Before:

```nushell
{} | get foo bar
# => Error: nu::shell::column_not_found
# =>
# =>   × Cannot find column 'foo'
# =>    ╭─[entry #43:2:6]
# =>  2 │ {} | get foo bar
# =>    ·      ─┬─ ─┬─
# =>    ·       │   ╰── cannot find column 'foo'
# =>    ·       ╰── value originates here
# =>    ╰────
```

After:

```nushell
{} | get foo bar
# => Error: nu::shell::column_not_found
# =>
# =>   × Cannot find column 'foo'
# =>    ╭─[entry #2:2:1]
# =>  2 │ {} | get foo bar
# =>    · ─┬       ─┬─
# =>    ·  │        ╰── cannot find column 'foo'
# =>    ·  ╰── value originates here
# =>    ╰────
```

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

* Some errors may have more accurate info about where the value
originates from

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
N/A
---
 crates/nu-protocol/src/pipeline/pipeline_data.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/crates/nu-protocol/src/pipeline/pipeline_data.rs b/crates/nu-protocol/src/pipeline/pipeline_data.rs
index af56533e91..8979b76ba9 100644
--- a/crates/nu-protocol/src/pipeline/pipeline_data.rs
+++ b/crates/nu-protocol/src/pipeline/pipeline_data.rs
@@ -125,7 +125,13 @@ impl PipelineData {
     pub fn into_value(self, span: Span) -> Result<Value, ShellError> {
         match self {
             PipelineData::Empty => Ok(Value::nothing(span)),
-            PipelineData::Value(value, ..) => Ok(value.with_span(span)),
+            PipelineData::Value(value, ..) => {
+                if value.span() == Span::unknown() {
+                    Ok(value.with_span(span))
+                } else {
+                    Ok(value)
+                }
+            }
             PipelineData::ListStream(stream, ..) => Ok(stream.into_value()),
             PipelineData::ByteStream(stream, ..) => stream.into_value(),
         }

From 2b4c54d383014509fa2271fa40bf2c1656707b7f Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Sun, 5 Jan 2025 17:01:05 -0500
Subject: [PATCH 0882/1072] Add newline to empty list output (#14758)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

Adds a newline to the empty list output. Fixes #14748.

This does not affect the `[empty list]` text output in the REPL, just
the `print` output (to be honest, I'm not certain why, but I'm guessing
the REPL was adding an extra newline somewhere to compensate). The
`bytes.push('\n')` replicates the code from the below
`convert_table_to_output` function, which is bypassed for empty lists.

Before:
```nushell
[]
# => ╭────────────╮
# => │ empty list │
# => ╰────────────╯
print ([]) text
# => ╭────────────╮
# => │ empty list │
# => ╰────────────╯text
```

After:
```nushell
[]
# => ╭────────────╮
# => │ empty list │
# => ╰────────────╯
print ([]) text
# => ╭────────────╮
# => │ empty list │
# => ╰────────────╯
# => text
```

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

* Fixes "empty list" placeholder text output when using the `print`
command

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
N/A
---
 crates/nu-command/src/viewers/table.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index c2c3af524f..925ffbc5eb 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -885,7 +885,9 @@ impl Iterator for PagingTableCreator {
                     &self.engine_state,
                     &self.stack,
                 );
-                Some(Ok(result.into_bytes()))
+                let mut bytes = result.into_bytes();
+                bytes.push(b'\n');
+                Some(Ok(bytes))
             } else {
                 None
             };

From b60f91f722d77af8d0e800070918d12005754cf8 Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Sun, 5 Jan 2025 17:07:34 -0500
Subject: [PATCH 0883/1072] Don't expand ndots if prefixed with `./` (#14755)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
Prevents ndots from being expanded if they are prefixed with `./`, as
the agreed resolution to #13303. Only applies to externals, mirroring
the fix from #13218.

I did
[attempt](https://github.com/132ikl/nushell/tree/internal-ndots-attempt)
to apply the fix for internal commands as well, but it seems like the
path is expanded too aggressively and I haven't investigated it further
yet. `./...` gets normalized into `<pwd>/./...`, which gets normalized
into `<pwd>/...` before being handed to `expand_ndots`, and at that
point it just looks like a normal n-dots so we can't tell we shouldn't
expand.

(Fixes #13303)

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

* N-dots are no longer expanded to external command calls when prefixed
with `./`.

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->



Added tests to prevent regression.

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->

N/A
---
 crates/nu-command/src/system/run_external.rs  | 17 +-------------
 .../nu-command/tests/commands/run_external.rs | 10 ++++++++
 crates/nu-path/src/dots.rs                    | 23 +++++++++++++++++++
 crates/nu-path/src/tilde.rs                   |  1 -
 4 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index af597d459c..e4ac0ea88f 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -1,6 +1,6 @@
 use nu_cmd_base::hook::eval_hook;
 use nu_engine::{command_prelude::*, env_to_strings};
-use nu_path::{dots::expand_ndots, expand_tilde, AbsolutePath};
+use nu_path::{dots::expand_ndots_safe, expand_tilde, AbsolutePath};
 use nu_protocol::{
     did_you_mean, process::ChildProcess, ByteStream, NuGlob, OutDest, Signals, UseAnsiColoring,
 };
@@ -639,21 +639,6 @@ fn escape_cmd_argument(arg: &Spanned<OsString>) -> Result<Cow<'_, OsStr>, ShellE
     }
 }
 
-/// Expand ndots, but only if it looks like it probably contains them, because there is some lossy
-/// path normalization that happens.
-fn expand_ndots_safe(path: impl AsRef<Path>) -> PathBuf {
-    let string = path.as_ref().to_string_lossy();
-
-    // Use ndots if it contains at least `...`, since that's the minimum trigger point, and don't
-    // use it if it contains ://, because that looks like a URL scheme and the path normalization
-    // will mess with that.
-    if string.contains("...") && !string.contains("://") {
-        expand_ndots(path)
-    } else {
-        path.as_ref().to_owned()
-    }
-}
-
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/crates/nu-command/tests/commands/run_external.rs b/crates/nu-command/tests/commands/run_external.rs
index 8a797300f1..856214456c 100644
--- a/crates/nu-command/tests/commands/run_external.rs
+++ b/crates/nu-command/tests/commands/run_external.rs
@@ -247,6 +247,16 @@ fn external_command_ndots_args() {
     );
 }
 
+#[test]
+fn external_command_ndots_leading_dot_slash() {
+    // Don't expand ndots with a leading `./`
+    let actual = nu!(r#"
+        nu --testbin cococo ./... ./....
+    "#);
+
+    assert_eq!(actual.out, "./... ./....");
+}
+
 #[test]
 fn external_command_url_args() {
     // If ndots is not handled correctly, we can lose the double forward slashes that are needed
diff --git a/crates/nu-path/src/dots.rs b/crates/nu-path/src/dots.rs
index c001451c68..97a7deac02 100644
--- a/crates/nu-path/src/dots.rs
+++ b/crates/nu-path/src/dots.rs
@@ -73,6 +73,23 @@ pub fn expand_dots(path: impl AsRef<Path>) -> PathBuf {
     simiplified(&result)
 }
 
+/// Expand ndots, but only if it looks like it probably contains them, because there is some lossy
+/// path normalization that happens.
+pub fn expand_ndots_safe(path: impl AsRef<Path>) -> PathBuf {
+    let string = path.as_ref().to_string_lossy();
+
+    // Use ndots if it contains at least `...`, since that's the minimum trigger point.
+    // Don't use it if it contains ://, because that looks like a URL scheme and the path normalization
+    // will mess with that.
+    // Don't use it if it starts with `./`, as to not break golang wildcard syntax
+    // (since generally you're probably not using `./` with ndots)
+    if string.contains("...") && !string.contains("://") && !string.starts_with("./") {
+        expand_ndots(path)
+    } else {
+        path.as_ref().to_owned()
+    }
+}
+
 #[cfg(windows)]
 fn simiplified(path: &std::path::Path) -> PathBuf {
     path.to_winuser_path()
@@ -169,6 +186,12 @@ mod test_expand_ndots {
         };
         assert_path_eq!(expand_ndots(path), expected);
     }
+
+    #[test]
+    fn leading_dot_slash() {
+        let path = Path::new("./...");
+        assert_path_eq!(expand_ndots_safe(path), "./...");
+    }
 }
 
 #[cfg(test)]
diff --git a/crates/nu-path/src/tilde.rs b/crates/nu-path/src/tilde.rs
index 2420c8c17e..638a7797b6 100644
--- a/crates/nu-path/src/tilde.rs
+++ b/crates/nu-path/src/tilde.rs
@@ -152,7 +152,6 @@ fn expand_tilde_with_another_user_home(path: &Path) -> PathBuf {
 
 /// Expand tilde ("~") into a home directory if it is the first path component
 pub fn expand_tilde(path: impl AsRef<Path>) -> PathBuf {
-    // TODO: Extend this to work with "~user" style of home paths
     expand_tilde_with_home(path, dirs::home_dir())
 }
 

From ebabca575cede3b94632c8f9d52dbfb59d063754 Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Mon, 6 Jan 2025 20:30:07 +0300
Subject: [PATCH 0884/1072] small, backwards compatible enhancements to std
 (#14763)

# Description
Small, backwards compatible enhancements to the standard library.

# User-Facing Changes

- changed `iter find`, `iter find-index`: Only consume the input stream
up to the first match.
- added `log set-level`: a small convenience command for setting the log
level
- added `$null_device`: `null-device` as a const variable, would allow
conditional sourcing if #13872 is fixed

# Tests + Formatting

- :green_circle: toolkit fmt
- :green_circle: toolkit clippy
- :green_circle: toolkit test
- :green_circle: toolkit test stdlib

# After Submitting
N/A
---
 crates/nu-std/std/bench/mod.nu | 19 +++++-------
 crates/nu-std/std/iter/mod.nu  | 53 ++++++++++++----------------------
 crates/nu-std/std/log/mod.nu   | 10 +++++++
 crates/nu-std/std/util/mod.nu  | 13 +++++----
 4 files changed, 44 insertions(+), 51 deletions(-)

diff --git a/crates/nu-std/std/bench/mod.nu b/crates/nu-std/std/bench/mod.nu
index 61baa21a2f..25994ded58 100644
--- a/crates/nu-std/std/bench/mod.nu
+++ b/crates/nu-std/std/bench/mod.nu
@@ -41,21 +41,21 @@ export def main [
     --verbose (-v) # be more verbose (namely prints the progress)
     --pretty # shows the results in human-readable format: "<mean> +/- <stddev>"
 ] {
-    let times = (
+    let times: list<duration> = (
         seq 1 $rounds | each {|i|
             if $verbose { print -n $"($i) / ($rounds)\r" }
-            timeit { do $code } | into int | into float
+            timeit { do $code }
         }
     )
 
     if $verbose { print $"($rounds) / ($rounds)" }
 
     let report = {
-        mean: ($times | math avg | from ns)
-        min: ($times | math min | from ns)
-        max: ($times | math max | from ns)
-        std: ($times | math stddev | from ns)
-        times: ($times | each { from ns })
+        mean: ($times | math avg)
+        min: ($times | math min)
+        max: ($times | math max)
+        std: ($times | into int | math stddev | into int | into duration)
+        times: ($times)
     }
 
     if $pretty {
@@ -64,8 +64,3 @@ export def main [
         $report
     }
 }
-
-# convert an integer amount of nanoseconds to a real duration
-def "from ns" [] {
-    [$in "ns"] | str join | into duration
-}
\ No newline at end of file
diff --git a/crates/nu-std/std/iter/mod.nu b/crates/nu-std/std/iter/mod.nu
index daa62d2dba..ca0aaafa4d 100644
--- a/crates/nu-std/std/iter/mod.nu
+++ b/crates/nu-std/std/iter/mod.nu
@@ -21,8 +21,8 @@
 #
 # let haystack = ["shell", "abc", "around", "nushell", "std"] 
 #
-# let found = ($haystack | iter find {|it| $it starts-with "a" })
-# let not_found = ($haystack | iter find {|it| $it mod 2 == 0})
+# let found = ($haystack | iter find {|e| $e starts-with "a" })
+# let not_found = ($haystack | iter find {|e| $e mod 2 == 0})
 # 
 # assert equal $found "abc"
 # assert equal $not_found null
@@ -30,11 +30,7 @@
 export def find [ # -> any | null  
     fn: closure          # the closure used to perform the search 
 ] {
-    try {
-       filter $fn | get 0?
-    } catch {
-       null
-    }
+    filter {|e| try {do $fn $e} } | try { first }
 }
 
 # Returns the index of the first element that matches the predicate or
@@ -60,20 +56,9 @@ export def find [ # -> any | null
 export def find-index [ # -> int
     fn: closure                # the closure used to perform the search
 ] {
-    let matches = (
-        enumerate
-        | each {|it|
-            if (do $fn $it.item) {
-                $it.index
-            }
-        }
-    )
-
-    if ($matches | is-empty) {
-        -1
-    } else {
-        $matches | first
-    }
+    enumerate
+    | find {|e| $e.item | do $fn $e.item }
+    | try { get index } catch { -1 }
 }
 
 # Returns a new list with the separator between adjacent
@@ -89,8 +74,8 @@ export def find-index [ # -> int
 export def intersperse [ # -> list<any>
     separator: any              # the separator to be used
 ] {
-    reduce --fold [] {|it, acc|
-         $acc ++ [$it, $separator]
+    reduce --fold [] {|e, acc|
+         $acc ++ [$e, $separator]
     } 
     | match $in {
          [] => [],
@@ -123,9 +108,9 @@ export def scan [ # -> list<any>
     fn: closure          # the closure to perform the scan
     --noinit(-n)         # remove the initial value from the result
 ] {                      
-    reduce --fold [$init] {|it, acc|
+    reduce --fold [$init] {|e, acc|
         let acc_last = $acc | last
-        $acc ++ [($acc_last | do $fn $it $acc_last)]
+        $acc ++ [($acc_last | do $fn $e $acc_last)]
     }
     | if $noinit {
         $in | skip
@@ -142,22 +127,22 @@ export def scan [ # -> list<any>
 # ```nu
 # use std ["assert equal" "iter filter-map"]
 #
-# let res = ([2 5 "4" 7] | iter filter-map {|it| $it ** 2})
+# let res = ([2 5 "4" 7] | iter filter-map {|e| $e ** 2})
 #
 # assert equal $res [4 25 49]
 # ```
 export def filter-map [ # -> list<any>
     fn: closure                # the closure to apply to the input
 ] {
-    each {|$it|
+    each {|$e|
         try {
-            do $fn $it 
+            do $fn $e 
         } catch {
             null 
         }
     } 
-    | filter {|it|
-        $it != null
+    | filter {|e|
+        $e != null
     }
 }
 
@@ -168,14 +153,14 @@ export def filter-map [ # -> list<any>
 # use std ["assert equal" "iter flat-map"]
 #
 # let res = (
-#     [[1 2 3] [2 3 4] [5 6 7]] | iter flat-map {|it| $it | math sum}
+#     [[1 2 3] [2 3 4] [5 6 7]] | iter flat-map {|e| $e | math sum}
 # )
 # assert equal $res [6 9 18]
 # ```
 export def flat-map [ # -> list<any>
     fn: closure              # the closure to map to the nested structures
 ] {
-    each {|it| do $fn $it } | flatten
+    each {|e| do $fn $e } | flatten
 }
 
 # Zips two structures and applies a closure to each of the zips
@@ -195,8 +180,8 @@ export def zip-with [ # -> list<any>
     fn: closure              # the closure to apply to the zips
 ] {
     zip $other 
-    | each {|it|
-        reduce {|it, acc| do $fn $acc $it }
+    | each {|e|
+        reduce {|e, acc| do $fn $acc $e }
     }
 }
 
diff --git a/crates/nu-std/std/log/mod.nu b/crates/nu-std/std/log/mod.nu
index 5117460be7..2af8c1d7b7 100644
--- a/crates/nu-std/std/log/mod.nu
+++ b/crates/nu-std/std/log/mod.nu
@@ -313,3 +313,13 @@ export def custom [
         |it, acc| $acc | str replace --all $it.0 $it.1
     })
 }
+
+def "nu-complete log-level" [] {
+    log-level | transpose description value
+}
+
+# Change logging level
+export def --env set-level [level: int@"nu-complete log-level"] {
+    # Keep it as a string so it  can be passed to child processes
+    $env.NU_LOG_LEVEL = $level | into string
+}
diff --git a/crates/nu-std/std/util/mod.nu b/crates/nu-std/std/util/mod.nu
index c6b332c396..3a7e6c0dcd 100644
--- a/crates/nu-std/std/util/mod.nu
+++ b/crates/nu-std/std/util/mod.nu
@@ -110,15 +110,18 @@ export def repeat [
     1..$n | each { $item }
 }
 
+# null device file
+export const null_device = if $nu.os-info.name == "windows" {
+	'\\.\NUL'
+} else {
+	'/dev/null'
+}
+
 # return a null device file.
 #
 # # Examples
 #     run a command and ignore it's stderr output
 #     > cat xxx.txt e> (null-device)
 export def null-device []: nothing -> path {
-    if ($nu.os-info.name | str downcase) == "windows" {
-        '\\.\NUL'
-    } else {
-        "/dev/null"
-    }
+    $null_device
 }

From 9ed2ca792fc011ba8aeff1bd7473a00cad83da3c Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Mon, 6 Jan 2025 16:34:09 -0500
Subject: [PATCH 0885/1072] =?UTF-8?q?Fix=20extra=20newline=20on=20empty=20?=
 =?UTF-8?q?lists=20when=20$env.config.table.show=5Fempty=20is=E2=80=A6=20(?=
 =?UTF-8?q?#14766)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

I just noticed that #14758 adds an extra newline when
`$env.config.table.show_empty = false`. This PR makes sure the
placeholder text is non-empty before adding the newline.

Before #14758:
```nushell
$env.config.table.show_empty = false
print ([]) text
# => text
echo []
```

Before PR:
```nushell
$env.config.table.show_empty = false
print ([]) text
# =>
# => text
echo []
# =>
```

After PR:
```nushell
$env.config.table.show_empty = false
print ([]) text
# => text
echo []
```


# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

None, fix to #14758 which has not been included in a release

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
N/A
---
 crates/nu-command/src/viewers/table.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index 925ffbc5eb..9ee74e3ed6 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -886,7 +886,10 @@ impl Iterator for PagingTableCreator {
                     &self.stack,
                 );
                 let mut bytes = result.into_bytes();
-                bytes.push(b'\n');
+                // Add extra newline if show_empty is enabled
+                if !bytes.is_empty() {
+                    bytes.push(b'\n');
+                }
                 Some(Ok(bytes))
             } else {
                 None

From ac12b02437ff026bfe128c0c790ecd11cbefa2d3 Mon Sep 17 00:00:00 2001
From: Chen1Plus <122733139+Chen1Plus@users.noreply.github.com>
Date: Tue, 7 Jan 2025 07:36:42 +0800
Subject: [PATCH 0886/1072] fix wrong error msg of `save` command on windows
 (#14699)

fixes #14664

# Description

Now,

```nu
"aaa" | save -f ..
```

returns correct error message on windows.

Note that the fix introduces a TOCTOU problem, which only effects the
error message. It won't break any workload.

# User-Facing Changes

The fix won't break any workload.

# Tests + Formatting

I have run tests **only on windows**.

# After Submitting

The fix doesn't need to change documentation.
---
 crates/nu-command/src/filesystem/save.rs | 17 ++++++++++++++++-
 crates/nu-command/tests/commands/save.rs |  9 +++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/filesystem/save.rs b/crates/nu-command/src/filesystem/save.rs
index c4ae00f593..67fd1a2271 100644
--- a/crates/nu-command/src/filesystem/save.rs
+++ b/crates/nu-command/src/filesystem/save.rs
@@ -422,7 +422,22 @@ fn prepare_path(
 fn open_file(path: &Path, span: Span, append: bool) -> Result<File, ShellError> {
     let file = match (append, path.exists()) {
         (true, true) => std::fs::OpenOptions::new().append(true).open(path),
-        _ => std::fs::File::create(path),
+        _ => {
+            // This is a temporary solution until `std::fs::File::create` is fixed on Windows (rust-lang/rust#134893)
+            // A TOCTOU problem exists here, which may cause wrong error message to be shown
+            #[cfg(target_os = "windows")]
+            if path.is_dir() {
+                // It should be `io::ErrorKind::IsADirectory` but it's not available in stable yet (1.83)
+                Err(io::Error::new(
+                    io::ErrorKind::Unsupported,
+                    "Is a directory (os error 21)",
+                ))
+            } else {
+                std::fs::File::create(path)
+            }
+            #[cfg(not(target_os = "windows"))]
+            std::fs::File::create(path)
+        }
     };
 
     file.map_err(|e| ShellError::GenericError {
diff --git a/crates/nu-command/tests/commands/save.rs b/crates/nu-command/tests/commands/save.rs
index 6b77160bee..8c2ea535b7 100644
--- a/crates/nu-command/tests/commands/save.rs
+++ b/crates/nu-command/tests/commands/save.rs
@@ -525,3 +525,12 @@ fn parent_redirection_doesnt_affect_save() {
         assert_eq!(actual.trim_end(), "");
     })
 }
+
+#[test]
+fn force_save_to_dir() {
+    let actual = nu!(cwd: "crates/nu-command/tests/commands", r#"
+        "aaa" | save -f ..
+        "#);
+
+    assert!(actual.err.contains("Is a directory"));
+}

From 6eb14522b65d581e4bbe409883997869833b2860 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Mon, 6 Jan 2025 18:37:51 -0500
Subject: [PATCH 0887/1072] Remove deprecated commands (#14726)

# Description

Remove commands which were deprecated in 0.101:

* `split-by` (#14019)
* `date to-record` and `date to-table` (#14319)

# User-Facing Changes

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

TODO: `grep` (`ag`) doc repo for any usage of these commands
---
 crates/nu-command/src/date/mod.rs            |   4 -
 crates/nu-command/src/date/to_record.rs      | 148 -----------
 crates/nu-command/src/date/to_table.rs       | 146 -----------
 crates/nu-command/src/default_context.rs     |   3 -
 crates/nu-command/src/filters/mod.rs         |   2 -
 crates/nu-command/src/filters/split_by.rs    | 257 -------------------
 crates/nu-command/src/filters/uniq_by.rs     |   1 -
 crates/nu-command/src/sort_utils.rs          |   1 -
 crates/nu-command/tests/commands/mod.rs      |   1 -
 crates/nu-command/tests/commands/split_by.rs |  66 -----
 tests/repl/test_parser.rs                    |   2 +-
 11 files changed, 1 insertion(+), 630 deletions(-)
 delete mode 100644 crates/nu-command/src/date/to_record.rs
 delete mode 100644 crates/nu-command/src/date/to_table.rs
 delete mode 100644 crates/nu-command/src/filters/split_by.rs
 delete mode 100644 crates/nu-command/tests/commands/split_by.rs

diff --git a/crates/nu-command/src/date/mod.rs b/crates/nu-command/src/date/mod.rs
index dcb3d8bee8..fc0aaf95c0 100644
--- a/crates/nu-command/src/date/mod.rs
+++ b/crates/nu-command/src/date/mod.rs
@@ -3,8 +3,6 @@ mod humanize;
 mod list_timezone;
 mod now;
 mod parser;
-mod to_record;
-mod to_table;
 mod to_timezone;
 mod utils;
 
@@ -12,7 +10,5 @@ pub use date_::Date;
 pub use humanize::SubCommand as DateHumanize;
 pub use list_timezone::SubCommand as DateListTimezones;
 pub use now::SubCommand as DateNow;
-pub use to_record::SubCommand as DateToRecord;
-pub use to_table::SubCommand as DateToTable;
 pub use to_timezone::SubCommand as DateToTimezone;
 pub(crate) use utils::{generate_strftime_list, parse_date_from_string};
diff --git a/crates/nu-command/src/date/to_record.rs b/crates/nu-command/src/date/to_record.rs
deleted file mode 100644
index fc28ba46f5..0000000000
--- a/crates/nu-command/src/date/to_record.rs
+++ /dev/null
@@ -1,148 +0,0 @@
-use crate::date::utils::parse_date_from_string;
-use chrono::{DateTime, Datelike, FixedOffset, Local, Timelike};
-use nu_engine::command_prelude::*;
-use nu_protocol::{report_parse_warning, ParseWarning};
-
-#[derive(Clone)]
-pub struct SubCommand;
-
-impl Command for SubCommand {
-    fn name(&self) -> &str {
-        "date to-record"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("date to-record")
-            .input_output_types(vec![
-                (Type::Date, Type::record()),
-                (Type::String, Type::record()),
-            ])
-            .allow_variants_without_examples(true) // https://github.com/nushell/nushell/issues/7032
-            .category(Category::Deprecated)
-    }
-
-    fn description(&self) -> &str {
-        "Convert the date into a record."
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["structured", "table"]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        _stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let head = call.head;
-        report_parse_warning(
-            &StateWorkingSet::new(engine_state),
-            &ParseWarning::DeprecatedWarning {
-                old_command: "date to-record".into(),
-                new_suggestion: "see `into record` command examples".into(),
-                span: head,
-                url: "`help into record`".into(),
-            },
-        );
-
-        let head = call.head;
-        // This doesn't match explicit nulls
-        if matches!(input, PipelineData::Empty) {
-            return Err(ShellError::PipelineEmpty { dst_span: head });
-        }
-        input.map(move |value| helper(value, head), engine_state.signals())
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Convert the current date into a record.",
-                example: "date now | date to-record",
-                result: None,
-            },
-            Example {
-                description: "Convert a date string into a record.",
-                example: "'2020-04-12T22:10:57.123+02:00' | date to-record",
-                result: Some(Value::test_record(record!(
-                        "year" =>       Value::test_int(2020),
-                        "month" =>      Value::test_int(4),
-                        "day" =>        Value::test_int(12),
-                        "hour" =>       Value::test_int(22),
-                        "minute" =>     Value::test_int(10),
-                        "second" =>     Value::test_int(57),
-                        "nanosecond" => Value::test_int(123_000_000),
-                        "timezone" =>   Value::test_string("+02:00"),
-                ))),
-            },
-            Example {
-                description: "Convert a date into a record.",
-                example: "'2020-04-12 22:10:57 +0200' | into datetime | date to-record",
-                result: Some(Value::test_record(record!(
-                        "year" =>       Value::test_int(2020),
-                        "month" =>      Value::test_int(4),
-                        "day" =>        Value::test_int(12),
-                        "hour" =>       Value::test_int(22),
-                        "minute" =>     Value::test_int(10),
-                        "second" =>     Value::test_int(57),
-                        "nanosecond" => Value::test_int(0),
-                        "timezone" =>   Value::test_string("+02:00"),
-                ))),
-            },
-        ]
-    }
-}
-
-fn parse_date_into_table(date: DateTime<FixedOffset>, head: Span) -> Value {
-    Value::record(
-        record! {
-            "year" => Value::int(date.year() as i64, head),
-            "month" => Value::int(date.month() as i64, head),
-            "day" => Value::int(date.day() as i64, head),
-            "hour" => Value::int(date.hour() as i64, head),
-            "minute" => Value::int(date.minute() as i64, head),
-            "second" => Value::int(date.second() as i64, head),
-            "nanosecond" => Value::int(date.nanosecond() as i64, head),
-            "timezone" => Value::string(date.offset().to_string(), head),
-        },
-        head,
-    )
-}
-
-fn helper(val: Value, head: Span) -> Value {
-    let span = val.span();
-    match val {
-        Value::String { val, .. } => match parse_date_from_string(&val, span) {
-            Ok(date) => parse_date_into_table(date, head),
-            Err(e) => e,
-        },
-        Value::Nothing { .. } => {
-            let now = Local::now();
-            let n = now.with_timezone(now.offset());
-            parse_date_into_table(n, head)
-        }
-        Value::Date { val, .. } => parse_date_into_table(val, head),
-        _ => Value::error(
-            ShellError::OnlySupportsThisInputType {
-                exp_input_type: "date, string (that represents datetime), or nothing".into(),
-                wrong_type: val.get_type().to_string(),
-                dst_span: head,
-                src_span: span,
-            },
-            head,
-        ),
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        use crate::test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/crates/nu-command/src/date/to_table.rs b/crates/nu-command/src/date/to_table.rs
deleted file mode 100644
index cb635b039f..0000000000
--- a/crates/nu-command/src/date/to_table.rs
+++ /dev/null
@@ -1,146 +0,0 @@
-use crate::date::utils::parse_date_from_string;
-use chrono::{DateTime, Datelike, FixedOffset, Local, Timelike};
-use nu_engine::command_prelude::*;
-use nu_protocol::{report_parse_warning, ParseWarning};
-
-#[derive(Clone)]
-pub struct SubCommand;
-
-impl Command for SubCommand {
-    fn name(&self) -> &str {
-        "date to-table"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("date to-table")
-            .input_output_types(vec![
-                (Type::Date, Type::table()),
-                (Type::String, Type::table()),
-            ])
-            .allow_variants_without_examples(true) // https://github.com/nushell/nushell/issues/7032
-            .category(Category::Deprecated)
-    }
-
-    fn description(&self) -> &str {
-        "Convert the date into a structured table."
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["structured"]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        _stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let head = call.head;
-        report_parse_warning(
-            &StateWorkingSet::new(engine_state),
-            &ParseWarning::DeprecatedWarning {
-                old_command: "date to-table".into(),
-                new_suggestion: "see `into record` command examples".into(),
-                span: head,
-                url: "`help into record`".into(),
-            },
-        );
-
-        // This doesn't match explicit nulls
-        if matches!(input, PipelineData::Empty) {
-            return Err(ShellError::PipelineEmpty { dst_span: head });
-        }
-        input.map(move |value| helper(value, head), engine_state.signals())
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Convert the current date into a table.",
-                example: "date now | date to-table",
-                result: None,
-            },
-            Example {
-                description: "Convert a given date into a table.",
-                example: "2020-04-12T22:10:57.000000789+02:00 | date to-table",
-                result: Some(Value::test_list(vec![Value::test_record(record!(
-                    "year" =>       Value::test_int(2020),
-                    "month" =>      Value::test_int(4),
-                    "day" =>        Value::test_int(12),
-                    "hour" =>       Value::test_int(22),
-                    "minute" =>     Value::test_int(10),
-                    "second" =>     Value::test_int(57),
-                    "nanosecond" => Value::test_int(789),
-                    "timezone" =>   Value::test_string("+02:00".to_string()),
-                ))])),
-            },
-            Example {
-                description: "Convert a given date into a table.",
-                example: "'2020-04-12 22:10:57 +0200' | into datetime | date to-table",
-                result: Some(Value::test_list(vec![Value::test_record(record!(
-                    "year" =>       Value::test_int(2020),
-                    "month" =>      Value::test_int(4),
-                    "day" =>        Value::test_int(12),
-                    "hour" =>       Value::test_int(22),
-                    "minute" =>     Value::test_int(10),
-                    "second" =>     Value::test_int(57),
-                    "nanosecond" => Value::test_int(0),
-                    "timezone" =>   Value::test_string("+02:00".to_string()),
-                ))])),
-            },
-        ]
-    }
-}
-
-fn parse_date_into_table(date: DateTime<FixedOffset>, head: Span) -> Value {
-    let record = record! {
-        "year" => Value::int(date.year() as i64, head),
-        "month" => Value::int(date.month() as i64, head),
-        "day" => Value::int(date.day() as i64, head),
-        "hour" => Value::int(date.hour() as i64, head),
-        "minute" => Value::int(date.minute() as i64, head),
-        "second" => Value::int(date.second() as i64, head),
-        "nanosecond" => Value::int(date.nanosecond() as i64, head),
-        "timezone" => Value::string(date.offset().to_string(), head),
-    };
-
-    Value::list(vec![Value::record(record, head)], head)
-}
-
-fn helper(val: Value, head: Span) -> Value {
-    let val_span = val.span();
-    match val {
-        Value::String { val, .. } => match parse_date_from_string(&val, val_span) {
-            Ok(date) => parse_date_into_table(date, head),
-            Err(e) => e,
-        },
-        Value::Nothing { .. } => {
-            let now = Local::now();
-            let n = now.with_timezone(now.offset());
-            parse_date_into_table(n, head)
-        }
-        Value::Date { val, .. } => parse_date_into_table(val, head),
-        _ => Value::error(
-            ShellError::OnlySupportsThisInputType {
-                exp_input_type: "date, string (that represents datetime), or nothing".into(),
-                wrong_type: val.get_type().to_string(),
-                dst_span: head,
-                src_span: val_span,
-            },
-            head,
-        ),
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        use crate::test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index d4b08d80c1..4ae348eb14 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -58,7 +58,6 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             Interleave,
             Items,
             Join,
-            SplitBy,
             Take,
             Merge,
             MergeDeep,
@@ -275,8 +274,6 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             DateHumanize,
             DateListTimezones,
             DateNow,
-            DateToRecord,
-            DateToTable,
             DateToTimezone,
         };
 
diff --git a/crates/nu-command/src/filters/mod.rs b/crates/nu-command/src/filters/mod.rs
index 373314fb18..eaa9452b31 100644
--- a/crates/nu-command/src/filters/mod.rs
+++ b/crates/nu-command/src/filters/mod.rs
@@ -42,7 +42,6 @@ mod shuffle;
 mod skip;
 mod sort;
 mod sort_by;
-mod split_by;
 mod take;
 mod tee;
 mod transpose;
@@ -102,7 +101,6 @@ pub use shuffle::Shuffle;
 pub use skip::*;
 pub use sort::Sort;
 pub use sort_by::SortBy;
-pub use split_by::SplitBy;
 pub use take::*;
 pub use tee::Tee;
 pub use transpose::Transpose;
diff --git a/crates/nu-command/src/filters/split_by.rs b/crates/nu-command/src/filters/split_by.rs
deleted file mode 100644
index bbc87452af..0000000000
--- a/crates/nu-command/src/filters/split_by.rs
+++ /dev/null
@@ -1,257 +0,0 @@
-use indexmap::IndexMap;
-use nu_engine::command_prelude::*;
-use nu_protocol::report_shell_warning;
-
-#[derive(Clone)]
-pub struct SplitBy;
-
-impl Command for SplitBy {
-    fn name(&self) -> &str {
-        "split-by"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("split-by")
-            .input_output_types(vec![(Type::record(), Type::record())])
-            .optional("splitter", SyntaxShape::Any, "The splitter value to use.")
-            .category(Category::Deprecated)
-    }
-
-    fn description(&self) -> &str {
-        "Split a record into groups."
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        report_shell_warning(
-            engine_state,
-            &ShellError::Deprecated {
-                deprecated: "The `split_by` command",
-                suggestion: "Please use the `group-by` command instead.",
-                span: call.head,
-                help: None,
-            },
-        );
-        split_by(engine_state, stack, call, input)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "split items by column named \"lang\"",
-            example: r#"{
-    '2019': [
-        { name: 'andres', lang: 'rb', year: '2019' },
-        { name: 'jt', lang: 'rs', year: '2019' }
-    ],
-    '2021': [
-        { name: 'storm', lang: 'rs', 'year': '2021' }
-    ]
-    } | split-by lang"#,
-            result: Some(Value::test_record(record! {
-                    "rb" => Value::test_record(record! {
-                        "2019" => Value::test_list(
-                            vec![Value::test_record(record! {
-                                    "name" => Value::test_string("andres"),
-                                    "lang" => Value::test_string("rb"),
-                                    "year" => Value::test_string("2019"),
-                            })],
-                        ),
-                    }),
-                    "rs" => Value::test_record(record! {
-                            "2019" => Value::test_list(
-                                vec![Value::test_record(record! {
-                                        "name" => Value::test_string("jt"),
-                                        "lang" => Value::test_string("rs"),
-                                        "year" => Value::test_string("2019"),
-                                })],
-                            ),
-                            "2021" => Value::test_list(
-                                vec![Value::test_record(record! {
-                                        "name" => Value::test_string("storm"),
-                                        "lang" => Value::test_string("rs"),
-                                        "year" => Value::test_string("2021"),
-                                })],
-                            ),
-                    }),
-            })),
-        }]
-    }
-}
-
-enum Grouper {
-    ByColumn(Option<Spanned<String>>),
-}
-
-pub fn split_by(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let name = call.head;
-    let config = engine_state.get_config();
-    let splitter: Option<Value> = call.opt(engine_state, stack, 0)?;
-
-    match splitter {
-        Some(v) => {
-            let splitter = Some(Spanned {
-                item: v.to_abbreviated_string(config),
-                span: name,
-            });
-            Ok(split(splitter.as_ref(), input, name, config)?)
-        }
-        // This uses the same format as the 'requires a column name' error in sort_utils.rs
-        None => Err(ShellError::GenericError {
-            error: "expected name".into(),
-            msg: "requires a column name for splitting".into(),
-            span: Some(name),
-            help: None,
-            inner: vec![],
-        }),
-    }
-}
-
-pub fn split(
-    column_name: Option<&Spanned<String>>,
-    values: PipelineData,
-    span: Span,
-    config: &nu_protocol::Config,
-) -> Result<PipelineData, ShellError> {
-    let grouper = if let Some(column_name) = column_name {
-        Grouper::ByColumn(Some(column_name.clone()))
-    } else {
-        Grouper::ByColumn(None)
-    };
-
-    match grouper {
-        Grouper::ByColumn(Some(column_name)) => {
-            let block = move |_, row: &Value| {
-                let group_key = if let Value::Record { val: row, .. } = row {
-                    row.get(&column_name.item)
-                } else {
-                    None
-                };
-
-                match group_key {
-                    Some(group_key) => Ok(group_key.to_abbreviated_string(config)),
-                    None => Err(ShellError::CantFindColumn {
-                        col_name: column_name.item.to_string(),
-                        span: Some(column_name.span),
-                        src_span: row.span(),
-                    }),
-                }
-            };
-
-            data_split(values, Some(&block), span, config)
-        }
-        Grouper::ByColumn(None) => {
-            let block = move |_, row: &Value| Ok(row.to_abbreviated_string(config));
-
-            data_split(values, Some(&block), span, config)
-        }
-    }
-}
-
-#[allow(clippy::type_complexity)]
-fn data_group(
-    values: &Value,
-    grouper: Option<&dyn Fn(usize, &Value) -> Result<String, ShellError>>,
-    span: Span,
-    config: &nu_protocol::Config,
-) -> Result<Value, ShellError> {
-    let mut groups: IndexMap<String, Vec<Value>> = IndexMap::new();
-
-    for (idx, value) in values.clone().into_pipeline_data().into_iter().enumerate() {
-        let group_key = if let Some(ref grouper) = grouper {
-            grouper(idx, &value)
-        } else {
-            Ok(value.to_abbreviated_string(config))
-        };
-
-        let group = groups.entry(group_key?).or_default();
-        group.push(value);
-    }
-
-    Ok(Value::record(
-        groups
-            .into_iter()
-            .map(|(k, v)| (k, Value::list(v, span)))
-            .collect(),
-        span,
-    ))
-}
-
-#[allow(clippy::type_complexity)]
-pub fn data_split(
-    value: PipelineData,
-    splitter: Option<&dyn Fn(usize, &Value) -> Result<String, ShellError>>,
-    dst_span: Span,
-    config: &nu_protocol::Config,
-) -> Result<PipelineData, ShellError> {
-    let mut splits = indexmap::IndexMap::new();
-
-    match value {
-        PipelineData::Value(v, _) => {
-            let span = v.span();
-            match v {
-                Value::Record { val: grouped, .. } => {
-                    for (outer_key, list) in grouped.into_owned() {
-                        match data_group(&list, splitter, span, config) {
-                            Ok(grouped_vals) => {
-                                if let Value::Record { val: sub, .. } = grouped_vals {
-                                    for (inner_key, subset) in sub.into_owned() {
-                                        let s: &mut IndexMap<String, Value> =
-                                            splits.entry(inner_key).or_default();
-
-                                        s.insert(outer_key.clone(), subset.clone());
-                                    }
-                                }
-                            }
-                            Err(reason) => return Err(reason),
-                        }
-                    }
-                }
-                _ => {
-                    return Err(ShellError::OnlySupportsThisInputType {
-                        exp_input_type: "Record".into(),
-                        wrong_type: v.get_type().to_string(),
-                        dst_span,
-                        src_span: v.span(),
-                    })
-                }
-            }
-        }
-        PipelineData::Empty => return Err(ShellError::PipelineEmpty { dst_span }),
-        _ => {
-            return Err(ShellError::PipelineMismatch {
-                exp_input_type: "record".into(),
-                dst_span,
-                src_span: value.span().unwrap_or(Span::unknown()),
-            })
-        }
-    }
-
-    let record = splits
-        .into_iter()
-        .map(|(k, rows)| (k, Value::record(rows.into_iter().collect(), dst_span)))
-        .collect();
-
-    Ok(PipelineData::Value(Value::record(record, dst_span), None))
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        use crate::test_examples;
-
-        test_examples(SplitBy {})
-    }
-}
diff --git a/crates/nu-command/src/filters/uniq_by.rs b/crates/nu-command/src/filters/uniq_by.rs
index c092cfe6b4..8536cc41a5 100644
--- a/crates/nu-command/src/filters/uniq_by.rs
+++ b/crates/nu-command/src/filters/uniq_by.rs
@@ -110,7 +110,6 @@ fn validate(vec: &[Value], columns: &[String], span: Span) -> Result<(), ShellEr
         let val_span = v.span();
         if let Value::Record { val: record, .. } = &v {
             if columns.is_empty() {
-                // This uses the same format as the 'requires a column name' error in split_by.rs
                 return Err(ShellError::GenericError {
                     error: "expected name".into(),
                     msg: "requires a column name to filter table data".into(),
diff --git a/crates/nu-command/src/sort_utils.rs b/crates/nu-command/src/sort_utils.rs
index 7d70121096..951a93ead9 100644
--- a/crates/nu-command/src/sort_utils.rs
+++ b/crates/nu-command/src/sort_utils.rs
@@ -58,7 +58,6 @@ pub fn sort_by(
     natural: bool,
 ) -> Result<(), ShellError> {
     if comparators.is_empty() {
-        // This uses the same format as the 'requires a column name' error in split_by.rs
         return Err(ShellError::GenericError {
             error: "expected name".into(),
             msg: "requires a cell path or closure to sort data".into(),
diff --git a/crates/nu-command/tests/commands/mod.rs b/crates/nu-command/tests/commands/mod.rs
index eb90d56d1e..c772e78544 100644
--- a/crates/nu-command/tests/commands/mod.rs
+++ b/crates/nu-command/tests/commands/mod.rs
@@ -103,7 +103,6 @@ mod skip;
 mod sort;
 mod sort_by;
 mod source_env;
-mod split_by;
 mod split_column;
 mod split_row;
 mod str_;
diff --git a/crates/nu-command/tests/commands/split_by.rs b/crates/nu-command/tests/commands/split_by.rs
deleted file mode 100644
index 1f648a1fcf..0000000000
--- a/crates/nu-command/tests/commands/split_by.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-use nu_test_support::fs::Stub::EmptyFile;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn splits() {
-    let sample = r#"
-                [[first_name, last_name, rusty_at, type];
-                 [Andrés, Robalino, "10/11/2013", A],
-                 [JT, Turner, "10/12/2013", B],
-                 [Yehuda, Katz, "10/11/2013", A]]
-            "#;
-
-    let actual = nu!(pipeline(&format!(
-        r#"
-                  {sample}
-                | group-by rusty_at
-                | split-by type
-                | get A."10/11/2013"
-                | length
-            "#
-    )));
-
-    assert_eq!(actual.out, "2");
-}
-
-#[test]
-fn errors_if_no_input() {
-    Playground::setup("split_by_no_input", |dirs, _sandbox| {
-        let actual = nu!(cwd: dirs.test(), pipeline("split-by type"));
-
-        assert!(actual.err.contains("no input value was piped in"));
-    })
-}
-
-#[test]
-fn errors_if_non_record_input() {
-    Playground::setup("split_by_test_2", |dirs, sandbox| {
-        sandbox.with_files(&[
-            EmptyFile("los.txt"),
-            EmptyFile("tres.txt"),
-            EmptyFile("amigos.txt"),
-            EmptyFile("arepas.clu"),
-        ]);
-
-        let input_mismatch = nu!(cwd: dirs.test(), pipeline("5 | split-by type"));
-
-        assert!(input_mismatch.err.contains("doesn't support int input"));
-
-        let only_supports = nu!(
-            cwd: dirs.test(), pipeline(
-            "
-                ls
-                | get name
-                | split-by type
-            "
-        ));
-
-        assert!(
-            only_supports
-                .err
-                .contains("only Record input data is supported")
-                || only_supports.err.contains("expected: record")
-        );
-    })
-}
diff --git a/tests/repl/test_parser.rs b/tests/repl/test_parser.rs
index ddc790324a..988b34f18d 100644
--- a/tests/repl/test_parser.rs
+++ b/tests/repl/test_parser.rs
@@ -663,7 +663,7 @@ fn comment_in_multiple_pipelines() -> TestResult {
 
 #[test]
 fn date_literal() -> TestResult {
-    run_test(r#"2022-09-10 | date to-record | get day"#, "10")
+    run_test(r#"2022-09-10 | into record | get day"#, "10")
 }
 
 #[test]

From 9ed944312f13b9c401d56cb377dc9fd616ce11fe Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Tue, 7 Jan 2025 07:39:03 +0800
Subject: [PATCH 0888/1072] auto cd should not canonicalize symbolic path
 (#14708)

# Description
Fixes: #13158

To fix the issue for auto-cd feature, just need to use
`EngineState::cwd` instead of `nu_engine::env::current_dir_str`

# User-Facing Changes
## Before
```shell
> cd ~
> ln -s /tmp test_link; cd test_link
> ..
> $env.PWD
/
```

## After
```shell
> cd ~
> ln -s /tmp test_link; cd test_link
> ..
> $env.PWD  # it should output home directory.
```

# Tests + Formatting
Update a test under `auto_cd_symlink`
---
 crates/nu-cli/src/repl.rs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 1fe5109cfc..5d27dea59f 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -809,8 +809,10 @@ fn parse_operation(
 ) -> Result<ReplOperation, ErrReport> {
     let tokens = lex(s.as_bytes(), 0, &[], &[], false);
     // Check if this is a single call to a directory, if so auto-cd
-    #[allow(deprecated)]
-    let cwd = nu_engine::env::current_dir_str(engine_state, stack).unwrap_or_default();
+    let cwd = engine_state
+        .cwd(Some(stack))
+        .map(|p| p.to_string_lossy().to_string())
+        .unwrap_or_default();
     let mut orig = s.clone();
     if orig.starts_with('`') {
         orig = trim_quotes_str(&orig).to_string()
@@ -1570,6 +1572,13 @@ mod test_auto_cd {
         symlink(&dir, &link).unwrap();
         let input = if cfg!(windows) { r".\link" } else { "./link" };
         check(tempdir, input, link);
+
+        let dir = tempdir.join("foo").join("bar");
+        std::fs::create_dir_all(&dir).unwrap();
+        let link = tempdir.join("link2");
+        symlink(&dir, &link).unwrap();
+        let input = "..";
+        check(link, input, tempdir);
     }
 
     #[test]

From 88f44701a9b8eced8abe9f4b952d942800fece4c Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Mon, 6 Jan 2025 18:49:13 -0500
Subject: [PATCH 0889/1072] Add doccomments to `find` functions in EngineState
 and StateWorkingSet (#14750)

# Description
Adds some doccomments to some of the methods in `engine_state.rs` and
`state_working_set.rs`. Also grouped together some of the `find` methods
in `engine_state.rs`, but didn't do so in `state_working_set.rs` since
they seem to already be grouped according to decl/overlay/module.

Follow-up to #14490.

# User-Facing Changes
None

# Tests + Formatting
N/A

# After Submitting
N/A
---
 crates/nu-protocol/src/engine/engine_state.rs | 51 ++++++++++++-------
 .../src/engine/state_working_set.rs           | 14 +++++
 2 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index 8502ff91cd..328c3d7694 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -599,6 +599,9 @@ impl EngineState {
         }
     }
 
+    /// Find the [`DeclId`](nu_protocol::id::DeclId) corresponding to a declaration with `name`.
+    ///
+    /// Searches within active overlays, and filtering out overlays in `removed_overlays`.
     pub fn find_decl(&self, name: &[u8], removed_overlays: &[Vec<u8>]) -> Option<DeclId> {
         let mut visibility: Visibility = Visibility::new();
 
@@ -615,6 +618,9 @@ impl EngineState {
         None
     }
 
+    /// Find the name of the declaration corresponding to `decl_id`.
+    ///
+    /// Searches within active overlays, and filtering out overlays in `removed_overlays`.
     pub fn find_decl_name(&self, decl_id: DeclId, removed_overlays: &[Vec<u8>]) -> Option<&[u8]> {
         let mut visibility: Visibility = Visibility::new();
 
@@ -633,6 +639,33 @@ impl EngineState {
         None
     }
 
+    /// Find the [`OverlayId`](nu_protocol::id::OverlayId) corresponding to `name`.
+    ///
+    /// Searches all overlays, not just active overlays. To search only in active overlays, use [`find_active_overlay`](EngineState::find_active_overlay)
+    pub fn find_overlay(&self, name: &[u8]) -> Option<OverlayId> {
+        self.scope.find_overlay(name)
+    }
+
+    /// Find the [`OverlayId`](nu_protocol::id::OverlayId) of the active overlay corresponding to `name`.
+    ///
+    /// Searches only active overlays. To search in all overlays, use [`find_overlay`](EngineState::find_active_overlay)
+    pub fn find_active_overlay(&self, name: &[u8]) -> Option<OverlayId> {
+        self.scope.find_active_overlay(name)
+    }
+
+    /// Find the [`ModuleId`](nu_protocol::id::ModuleId) corresponding to `name`.
+    ///
+    /// Searches within active overlays, and filtering out overlays in `removed_overlays`.
+    pub fn find_module(&self, name: &[u8], removed_overlays: &[Vec<u8>]) -> Option<ModuleId> {
+        for overlay_frame in self.active_overlays(removed_overlays).rev() {
+            if let Some(module_id) = overlay_frame.modules.get(name) {
+                return Some(*module_id);
+            }
+        }
+
+        None
+    }
+
     pub fn get_module_comments(&self, module_id: ModuleId) -> Option<&[Span]> {
         self.doccomments.get_module_comments(module_id)
     }
@@ -654,16 +687,6 @@ impl EngineState {
         plugin_decls.into_iter().map(|(_, decl)| decl)
     }
 
-    pub fn find_module(&self, name: &[u8], removed_overlays: &[Vec<u8>]) -> Option<ModuleId> {
-        for overlay_frame in self.active_overlays(removed_overlays).rev() {
-            if let Some(module_id) = overlay_frame.modules.get(name) {
-                return Some(*module_id);
-            }
-        }
-
-        None
-    }
-
     pub fn which_module_has_decl(
         &self,
         decl_name: &[u8],
@@ -681,14 +704,6 @@ impl EngineState {
         None
     }
 
-    pub fn find_overlay(&self, name: &[u8]) -> Option<OverlayId> {
-        self.scope.find_overlay(name)
-    }
-
-    pub fn find_active_overlay(&self, name: &[u8]) -> Option<OverlayId> {
-        self.scope.find_active_overlay(name)
-    }
-
     pub fn find_commands_by_predicate(
         &self,
         mut predicate: impl FnMut(&[u8]) -> bool,
diff --git a/crates/nu-protocol/src/engine/state_working_set.rs b/crates/nu-protocol/src/engine/state_working_set.rs
index 5cbc959f63..f3f042ebb8 100644
--- a/crates/nu-protocol/src/engine/state_working_set.rs
+++ b/crates/nu-protocol/src/engine/state_working_set.rs
@@ -406,6 +406,7 @@ impl<'a> StateWorkingSet<'a> {
         self.delta.exit_scope();
     }
 
+    /// Find the [`DeclId`](nu_protocol::id::DeclId) corresponding to a predeclaration with `name`.
     pub fn find_predecl(&self, name: &[u8]) -> Option<DeclId> {
         let mut removed_overlays = vec![];
 
@@ -424,6 +425,10 @@ impl<'a> StateWorkingSet<'a> {
         None
     }
 
+    /// Find the [`DeclId`](nu_protocol::id::DeclId) corresponding to a declaration with `name`.
+    ///
+    /// Extends [`EngineState::find_decl`] to also search for predeclarations (if [`StateWorkingSet::search_predecls`] is set),
+    /// and declarations from scopes existing only in [`StateDelta`].
     pub fn find_decl(&self, name: &[u8]) -> Option<DeclId> {
         let mut removed_overlays = vec![];
 
@@ -462,6 +467,10 @@ impl<'a> StateWorkingSet<'a> {
         self.permanent_state.find_decl(name, &removed_overlays)
     }
 
+    /// Find the name of the declaration corresponding to `decl_id`.
+    ///
+    /// Extends [`EngineState::find_decl_name`] to also search for predeclarations (if [`StateWorkingSet::search_predecls`] is set),
+    /// and declarations from scopes existing only in [`StateDelta`].
     pub fn find_decl_name(&self, decl_id: DeclId) -> Option<&[u8]> {
         let mut removed_overlays = vec![];
 
@@ -503,6 +512,10 @@ impl<'a> StateWorkingSet<'a> {
             .find_decl_name(decl_id, &removed_overlays)
     }
 
+    /// Find the [`ModuleId`](nu_protocol::id::ModuleId) corresponding to `name`.
+    ///
+    /// Extends [`EngineState::find_module`] to also search for ,
+    /// and declarations from scopes existing only in [`StateDelta`].
     pub fn find_module(&self, name: &[u8]) -> Option<ModuleId> {
         let mut removed_overlays = vec![];
 
@@ -836,6 +849,7 @@ impl<'a> StateWorkingSet<'a> {
         self.permanent_state.has_overlay(name)
     }
 
+    /// Find the overlay corresponding to `name`.
     pub fn find_overlay(&self, name: &[u8]) -> Option<&OverlayFrame> {
         for scope_frame in self.delta.scope.iter().rev() {
             if let Some(overlay_id) = scope_frame.find_overlay(name) {

From 6260fa9f07b03736f5e88cecccb46a297574d3ab Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.dev>
Date: Mon, 6 Jan 2025 19:09:55 -0500
Subject: [PATCH 0890/1072] expand custom values on table display (#14760)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

Presently, when custom values are displayed in a table, the entire
object is stringified. e.g., a custom value that encodes a DNS message
gets displayed as:

```
❯ : dns query --timeout 30sec dead10ck.dev
╭───┬─────────────────────────────────────────────────────────────────────╮
│ 0 │ {header: {id: 58404, message_type: RESPONSE, op_code: QUERY,        │
│   │ authoritative: false, truncated: false, recursion_desired: true,    │
│   │ recursion_available: true, authentic_data: true, response_code: No  │
│   │ Error, query_count: 1, answer_count: 2, name_server_count: 0,       │
│   │ additional_count: 1}, question: {name: dead10ck.dev., type: AAAA,   │
│   │ class: IN}, answer: [{name: dead10ck.dev., type: AAAA, class: IN,   │
│   │ ttl: 1hr, rdata: 2600:1f18:6af3:9f05:f526:3a1a:611:6b22, proof:     │
│   │ indeterminate}, {name: dead10ck.dev., type: RRSIG, class: IN, ttl:  │
│   │ 1hr, rdata: AAAA ECDSAP256SHA256 2 3600 1736139412 1736128612 54894 │
│   │  dead10ck.dev. HIkACE70hxznmFTJhOZSmm42KpLC6a+qHchszMyhYjqtG6eP6bzc │
│   │ +XYYjC+UKMaf56SlwBwnpF1tetmrDwyUHw==, proof: indeterminate}],       │
│   │ authority: [], additional: [], edns: {rcode_high: 0, version: 0,    │
│   │ flags: {dnssec_ok: true}, max_payload: 1.2 KiB, opts: {}}, size:    │
│   │ 177 B}                                                              │
```

With this change, expansion to a native nushell value happens earlier so
that they get displayed as any other value does.

```
❯ : ./target/debug/nu -c 'dns query --timeout 30sec dead10ck.dev | table --
expand'
╭───┬────────────────────────────────────┬──────────────────────────┬─────╮
│ # │               header               │         question         │ ... │
├───┼────────────────────────────────────┼──────────────────────────┼─────┤
│ 0 │ ╭─────────────────────┬──────────╮ │ ╭───────┬──────────────╮ │ ... │
│   │ │ id                  │ 37707    │ │ │ name  │ dead10ck.dev │ │     │
│   │ │ message_type        │ RESPONSE │ │ │       │ .            │ │     │
│   │ │ op_code             │ QUERY    │ │ │ type  │ AAAA         │ │     │
│   │ │ authoritative       │ false    │ │ │ class │ IN           │ │     │
│   │ │ truncated           │ false    │ │ ╰───────┴──────────────╯ │     │
│   │ │ recursion_desired   │ true     │ │                          │     │
│   │ │ recursion_available │ true     │ │                          │     │
│   │ │ authentic_data      │ true     │ │                          │     │
│   │ │ response_code       │ No Error │ │                          │     │
│   │ │ query_count         │ 1        │ │                          │     │
│   │ │ answer_count        │ 2        │ │                          │     │
│   │ │ name_server_count   │ 0        │ │                          │     │
│   │ │ additional_count    │ 1        │ │                          │     │
│   │ ╰─────────────────────┴──────────╯ │                          │     │
```

# User-Facing Changes

Custom values are displayed as their native Nushell value.

# Tests + Formatting

Manual
---
 crates/nu-command/src/viewers/table.rs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index 9ee74e3ed6..e081bdb9de 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -625,11 +625,24 @@ fn build_table_kv(
 }
 
 fn build_table_batch(
-    vals: Vec<Value>,
+    mut vals: Vec<Value>,
     view: TableView,
     opts: TableOpts<'_>,
     span: Span,
 ) -> StringResult {
+    // convert each custom value to its base value so it can be properly
+    // displayed in a table
+    for val in &mut vals {
+        let span = val.span();
+
+        if let Value::Custom { val: custom, .. } = val {
+            *val = custom
+                .to_base_value(span)
+                .or_else(|err| Result::<_, ShellError>::Ok(Value::error(err, span)))
+                .expect("error converting custom value to base value")
+        }
+    }
+
     match view {
         TableView::General => JustTable::table(&vals, opts),
         TableView::Expanded {

From 1f477c8eb14567a9628bd7782fa1fadc75313b17 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Tue, 7 Jan 2025 10:28:26 -0600
Subject: [PATCH 0891/1072] fix `stor reset` when there are foreign keys
 (#14772)

# Description

This PR fixes a problem with `stor reset`. That problem was that it
called drop_all_tables which just iterated through the tables and
dropped them one by one. This works as long as there are no foreign keys
or if the tables are dropped in the "right" order. It doesn't work in
most cases since you have to know what order to drop tables in. So, this
PR turns off foreign key constraints, then drops all the tables, then
turns the foreign key constraints back on, which seems to work well...
so far. :)

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/stor/reset.rs | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/stor/reset.rs b/crates/nu-command/src/stor/reset.rs
index dc68a83188..381f2faf63 100644
--- a/crates/nu-command/src/stor/reset.rs
+++ b/crates/nu-command/src/stor/reset.rs
@@ -49,9 +49,25 @@ impl Command for StorReset {
         ));
 
         if let Ok(conn) = db.open_connection() {
+            conn.execute("PRAGMA foreign_keys = OFF", [])
+                .map_err(|err| ShellError::GenericError {
+                    error: "Failed to turn off foreign_key protections for reset".into(),
+                    msg: err.to_string(),
+                    span: Some(Span::test_data()),
+                    help: None,
+                    inner: vec![],
+                })?;
             db.drop_all_tables(&conn)
                 .map_err(|err| ShellError::GenericError {
-                    error: "Failed to open SQLite connection in memory from reset".into(),
+                    error: "Failed to drop all tables in memory from reset".into(),
+                    msg: err.to_string(),
+                    span: Some(Span::test_data()),
+                    help: None,
+                    inner: vec![],
+                })?;
+            conn.execute("PRAGMA foreign_keys = ON", [])
+                .map_err(|err| ShellError::GenericError {
+                    error: "Failed to turn on foreign_key protections for reset".into(),
                     msg: err.to_string(),
                     span: Some(Span::test_data()),
                     help: None,

From dad956b2eefec0642c8a794dc326290238213cd9 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Tue, 7 Jan 2025 11:51:22 -0600
Subject: [PATCH 0892/1072] more closure serialization (#14698)

# Description

This PR introduces a switch `--serialize` that allows serializing of
types that cannot be deserialized. Right now it only serializes closures
as strings in `to toml`, `to json`, `to nuon`, `to text`, some indirect
`to html` and `to yaml`.

A lot of the changes are just weaving the engine_state through calling
functions and the rest is just repetitive way of getting the closure
block span and grabbing the span's text.

In places where it has to report `<Closure 123>` I changed it to
`closure_123`. It always seemed like the `<>` were not very nushell-y.
This is still a breaking change.

I think this could also help with systematic translation of old config
to new config file.


# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/debug/explain.rs        | 36 +++++--
 crates/nu-command/src/debug/inspect.rs        |  4 +-
 crates/nu-command/src/debug/inspect_table.rs  | 56 +++++++----
 crates/nu-command/src/filters/uniq.rs         | 12 ++-
 crates/nu-command/src/formats/to/json.rs      | 52 ++++++++--
 crates/nu-command/src/formats/to/nuon.rs      |  8 +-
 crates/nu-command/src/formats/to/text.rs      | 65 ++++++++++--
 crates/nu-command/src/formats/to/toml.rs      | 65 +++++++++---
 crates/nu-command/src/formats/to/yaml.rs      | 59 ++++++++---
 crates/nu-command/src/network/http/client.rs  | 18 +++-
 crates/nu-command/src/network/http/delete.rs  |  1 +
 crates/nu-command/src/network/http/get.rs     |  1 +
 crates/nu-command/src/network/http/head.rs    |  9 +-
 crates/nu-command/src/network/http/options.rs |  1 +
 crates/nu-command/src/network/http/patch.rs   |  1 +
 crates/nu-command/src/network/http/post.rs    |  1 +
 crates/nu-command/src/network/http/put.rs     |  1 +
 .../tests/commands/database/into_sqlite.rs    | 14 ++-
 .../tests/format_conversions/nuon.rs          |  1 +
 crates/nu-protocol/src/value/mod.rs           |  2 +-
 crates/nuon/src/lib.rs                        | 94 +++++++++++++++---
 crates/nuon/src/to.rs                         | 99 +++++++++++++++----
 tests/eval/mod.rs                             | 22 ++++-
 23 files changed, 509 insertions(+), 113 deletions(-)

diff --git a/crates/nu-command/src/debug/explain.rs b/crates/nu-command/src/debug/explain.rs
index 7d01727ce6..190bd9cbe5 100644
--- a/crates/nu-command/src/debug/explain.rs
+++ b/crates/nu-command/src/debug/explain.rs
@@ -154,7 +154,8 @@ fn get_arguments(
                         eval_expression_fn,
                     );
                     let arg_type = "expr";
-                    let arg_value_name = debug_string_without_formatting(&evaluated_expression);
+                    let arg_value_name =
+                        debug_string_without_formatting(engine_state, &evaluated_expression);
                     let arg_value_type = &evaluated_expression.get_type().to_string();
                     let evaled_span = evaluated_expression.span();
                     let arg_value_name_span_start = evaled_span.start as i64;
@@ -174,7 +175,8 @@ fn get_arguments(
                 let arg_type = "positional";
                 let evaluated_expression =
                     get_expression_as_value(engine_state, stack, inner_expr, eval_expression_fn);
-                let arg_value_name = debug_string_without_formatting(&evaluated_expression);
+                let arg_value_name =
+                    debug_string_without_formatting(engine_state, &evaluated_expression);
                 let arg_value_type = &evaluated_expression.get_type().to_string();
                 let evaled_span = evaluated_expression.span();
                 let arg_value_name_span_start = evaled_span.start as i64;
@@ -193,7 +195,8 @@ fn get_arguments(
                 let arg_type = "unknown";
                 let evaluated_expression =
                     get_expression_as_value(engine_state, stack, inner_expr, eval_expression_fn);
-                let arg_value_name = debug_string_without_formatting(&evaluated_expression);
+                let arg_value_name =
+                    debug_string_without_formatting(engine_state, &evaluated_expression);
                 let arg_value_type = &evaluated_expression.get_type().to_string();
                 let evaled_span = evaluated_expression.span();
                 let arg_value_name_span_start = evaled_span.start as i64;
@@ -212,7 +215,8 @@ fn get_arguments(
                 let arg_type = "spread";
                 let evaluated_expression =
                     get_expression_as_value(engine_state, stack, inner_expr, eval_expression_fn);
-                let arg_value_name = debug_string_without_formatting(&evaluated_expression);
+                let arg_value_name =
+                    debug_string_without_formatting(engine_state, &evaluated_expression);
                 let arg_value_type = &evaluated_expression.get_type().to_string();
                 let evaled_span = evaluated_expression.span();
                 let arg_value_name_span_start = evaled_span.start as i64;
@@ -245,7 +249,7 @@ fn get_expression_as_value(
     }
 }
 
-pub fn debug_string_without_formatting(value: &Value) -> String {
+pub fn debug_string_without_formatting(engine_state: &EngineState, value: &Value) -> String {
     match value {
         Value::Bool { val, .. } => val.to_string(),
         Value::Int { val, .. } => val.to_string(),
@@ -259,19 +263,31 @@ pub fn debug_string_without_formatting(value: &Value) -> String {
         Value::List { vals: val, .. } => format!(
             "[{}]",
             val.iter()
-                .map(debug_string_without_formatting)
+                .map(|v| debug_string_without_formatting(engine_state, v))
                 .collect::<Vec<_>>()
                 .join(" ")
         ),
         Value::Record { val, .. } => format!(
             "{{{}}}",
             val.iter()
-                .map(|(x, y)| format!("{}: {}", x, debug_string_without_formatting(y)))
+                .map(|(x, y)| format!(
+                    "{}: {}",
+                    x,
+                    debug_string_without_formatting(engine_state, y)
+                ))
                 .collect::<Vec<_>>()
                 .join(" ")
         ),
-        //TODO: It would be good to drill deeper into closures.
-        Value::Closure { val, .. } => format!("<Closure {}>", val.block_id.get()),
+        Value::Closure { val, .. } => {
+            let block = engine_state.get_block(val.block_id);
+            if let Some(span) = block.span {
+                let contents_bytes = engine_state.get_span_contents(span);
+                let contents_string = String::from_utf8_lossy(contents_bytes);
+                contents_string.to_string()
+            } else {
+                String::new()
+            }
+        }
         Value::Nothing { .. } => String::new(),
         Value::Error { error, .. } => format!("{error:?}"),
         Value::Binary { val, .. } => format!("{val:?}"),
@@ -280,7 +296,7 @@ pub fn debug_string_without_formatting(value: &Value) -> String {
         // that critical here
         Value::Custom { val, .. } => val
             .to_base_value(value.span())
-            .map(|val| debug_string_without_formatting(&val))
+            .map(|val| debug_string_without_formatting(engine_state, &val))
             .unwrap_or_else(|_| format!("<{}>", val.type_name())),
     }
 }
diff --git a/crates/nu-command/src/debug/inspect.rs b/crates/nu-command/src/debug/inspect.rs
index f8ef63ce02..8a8fdd04f4 100644
--- a/crates/nu-command/src/debug/inspect.rs
+++ b/crates/nu-command/src/debug/inspect.rs
@@ -23,7 +23,7 @@ impl Command for Inspect {
 
     fn run(
         &self,
-        _engine_state: &EngineState,
+        engine_state: &EngineState,
         _stack: &mut Stack,
         call: &Call,
         input: PipelineData,
@@ -40,7 +40,7 @@ impl Command for Inspect {
 
         let (cols, _rows) = terminal_size().unwrap_or((0, 0));
 
-        let table = inspect_table::build_table(input_val, description, cols as usize);
+        let table = inspect_table::build_table(engine_state, input_val, description, cols as usize);
 
         // Note that this is printed to stderr. The reason for this is so it doesn't disrupt the regular nushell
         // tabular output. If we printed to stdout, nushell would get confused with two outputs.
diff --git a/crates/nu-command/src/debug/inspect_table.rs b/crates/nu-command/src/debug/inspect_table.rs
index e2a2483484..5f18eb5be3 100644
--- a/crates/nu-command/src/debug/inspect_table.rs
+++ b/crates/nu-command/src/debug/inspect_table.rs
@@ -1,19 +1,23 @@
 // note: Seems like could be simplified
 //       IMHO: it shall not take 300+ lines :)
 
+use self::{global_horizontal_char::SetHorizontalChar, set_widths::SetWidths};
+use nu_protocol::engine::EngineState;
 use nu_protocol::Value;
 use nu_table::{string_width, string_wrap};
-
 use tabled::{
     grid::config::ColoredConfig,
     settings::{peaker::Priority, width::Wrap, Settings, Style},
     Table,
 };
 
-use self::{global_horizontal_char::SetHorizontalChar, set_widths::SetWidths};
-
-pub fn build_table(value: Value, description: String, termsize: usize) -> String {
-    let (head, mut data) = util::collect_input(value);
+pub fn build_table(
+    engine_state: &EngineState,
+    value: Value,
+    description: String,
+    termsize: usize,
+) -> String {
+    let (head, mut data) = util::collect_input(engine_state, value);
     let count_columns = head.len();
     data.insert(0, head);
 
@@ -195,10 +199,14 @@ fn push_empty_column(data: &mut Vec<Vec<String>>) {
 mod util {
     use crate::debug::explain::debug_string_without_formatting;
     use nu_engine::get_columns;
+    use nu_protocol::engine::EngineState;
     use nu_protocol::Value;
 
     /// Try to build column names and a table grid.
-    pub fn collect_input(value: Value) -> (Vec<String>, Vec<Vec<String>>) {
+    pub fn collect_input(
+        engine_state: &EngineState,
+        value: Value,
+    ) -> (Vec<String>, Vec<Vec<String>>) {
         let span = value.span();
         match value {
             Value::Record { val: record, .. } => {
@@ -210,7 +218,7 @@ mod util {
                     },
                     match vals
                         .into_iter()
-                        .map(|s| debug_string_without_formatting(&s))
+                        .map(|s| debug_string_without_formatting(engine_state, &s))
                         .collect::<Vec<String>>()
                     {
                         vals if vals.is_empty() => vec![],
@@ -220,7 +228,7 @@ mod util {
             }
             Value::List { vals, .. } => {
                 let mut columns = get_columns(&vals);
-                let data = convert_records_to_dataset(&columns, vals);
+                let data = convert_records_to_dataset(engine_state, &columns, vals);
 
                 if columns.is_empty() {
                     columns = vec![String::from("")];
@@ -232,7 +240,7 @@ mod util {
                 let lines = val
                     .lines()
                     .map(|line| Value::string(line.to_string(), span))
-                    .map(|val| vec![debug_string_without_formatting(&val)])
+                    .map(|val| vec![debug_string_without_formatting(engine_state, &val)])
                     .collect();
 
                 (vec![String::from("")], lines)
@@ -240,47 +248,59 @@ mod util {
             Value::Nothing { .. } => (vec![], vec![]),
             value => (
                 vec![String::from("")],
-                vec![vec![debug_string_without_formatting(&value)]],
+                vec![vec![debug_string_without_formatting(engine_state, &value)]],
             ),
         }
     }
 
-    fn convert_records_to_dataset(cols: &[String], records: Vec<Value>) -> Vec<Vec<String>> {
+    fn convert_records_to_dataset(
+        engine_state: &EngineState,
+        cols: &[String],
+        records: Vec<Value>,
+    ) -> Vec<Vec<String>> {
         if !cols.is_empty() {
-            create_table_for_record(cols, &records)
+            create_table_for_record(engine_state, cols, &records)
         } else if cols.is_empty() && records.is_empty() {
             vec![]
         } else if cols.len() == records.len() {
             vec![records
                 .into_iter()
-                .map(|s| debug_string_without_formatting(&s))
+                .map(|s| debug_string_without_formatting(engine_state, &s))
                 .collect()]
         } else {
             records
                 .into_iter()
-                .map(|record| vec![debug_string_without_formatting(&record)])
+                .map(|record| vec![debug_string_without_formatting(engine_state, &record)])
                 .collect()
         }
     }
 
-    fn create_table_for_record(headers: &[String], items: &[Value]) -> Vec<Vec<String>> {
+    fn create_table_for_record(
+        engine_state: &EngineState,
+        headers: &[String],
+        items: &[Value],
+    ) -> Vec<Vec<String>> {
         let mut data = vec![Vec::new(); items.len()];
 
         for (i, item) in items.iter().enumerate() {
-            let row = record_create_row(headers, item);
+            let row = record_create_row(engine_state, headers, item);
             data[i] = row;
         }
 
         data
     }
 
-    fn record_create_row(headers: &[String], item: &Value) -> Vec<String> {
+    fn record_create_row(
+        engine_state: &EngineState,
+        headers: &[String],
+        item: &Value,
+    ) -> Vec<String> {
         if let Value::Record { val, .. } = item {
             headers
                 .iter()
                 .map(|col| {
                     val.get(col)
-                        .map(debug_string_without_formatting)
+                        .map(|v| debug_string_without_formatting(engine_state, v))
                         .unwrap_or_else(String::new)
                 })
                 .collect()
diff --git a/crates/nu-command/src/filters/uniq.rs b/crates/nu-command/src/filters/uniq.rs
index 3a82e73aa1..8042963d75 100644
--- a/crates/nu-command/src/filters/uniq.rs
+++ b/crates/nu-command/src/filters/uniq.rs
@@ -213,9 +213,15 @@ fn sort_attributes(val: Value) -> Value {
     }
 }
 
-fn generate_key(item: &ValueCounter) -> Result<String, ShellError> {
+fn generate_key(engine_state: &EngineState, item: &ValueCounter) -> Result<String, ShellError> {
     let value = sort_attributes(item.val_to_compare.clone()); //otherwise, keys could be different for Records
-    nuon::to_nuon(&value, nuon::ToStyle::Raw, Some(Span::unknown()))
+    nuon::to_nuon(
+        engine_state,
+        &value,
+        nuon::ToStyle::Raw,
+        Some(Span::unknown()),
+        false,
+    )
 }
 
 fn generate_results_with_count(head: Span, uniq_values: Vec<ValueCounter>) -> Vec<Value> {
@@ -264,7 +270,7 @@ pub fn uniq(
         .try_fold(
             HashMap::<String, ValueCounter>::new(),
             |mut counter, item| {
-                let key = generate_key(&item);
+                let key = generate_key(engine_state, &item);
 
                 match key {
                     Ok(key) => {
diff --git a/crates/nu-command/src/formats/to/json.rs b/crates/nu-command/src/formats/to/json.rs
index 27c0af856a..0ba5427038 100644
--- a/crates/nu-command/src/formats/to/json.rs
+++ b/crates/nu-command/src/formats/to/json.rs
@@ -25,6 +25,11 @@ impl Command for ToJson {
                 "specify indentation tab quantity",
                 Some('t'),
             )
+            .switch(
+                "serialize",
+                "serialize nushell types that cannot be deserialized",
+                Some('s'),
+            )
             .category(Category::Formats)
     }
 
@@ -42,12 +47,13 @@ impl Command for ToJson {
         let raw = call.has_flag(engine_state, stack, "raw")?;
         let use_tabs = call.get_flag(engine_state, stack, "tabs")?;
         let indent = call.get_flag(engine_state, stack, "indent")?;
+        let serialize_types = call.has_flag(engine_state, stack, "serialize")?;
 
         let span = call.head;
         // allow ranges to expand and turn into array
         let input = input.try_expand_range()?;
         let value = input.into_value(span)?;
-        let json_value = value_to_json_value(&value)?;
+        let json_value = value_to_json_value(engine_state, &value, serialize_types)?;
 
         let json_result = if raw {
             nu_json::to_string_raw(&json_value)
@@ -105,7 +111,11 @@ impl Command for ToJson {
     }
 }
 
-pub fn value_to_json_value(v: &Value) -> Result<nu_json::Value, ShellError> {
+pub fn value_to_json_value(
+    engine_state: &EngineState,
+    v: &Value,
+    serialize_types: bool,
+) -> Result<nu_json::Value, ShellError> {
     let span = v.span();
     Ok(match v {
         Value::Bool { val, .. } => nu_json::Value::Bool(*val),
@@ -127,31 +137,57 @@ pub fn value_to_json_value(v: &Value) -> Result<nu_json::Value, ShellError> {
                 .collect::<Result<Vec<nu_json::Value>, ShellError>>()?,
         ),
 
-        Value::List { vals, .. } => nu_json::Value::Array(json_list(vals)?),
+        Value::List { vals, .. } => {
+            nu_json::Value::Array(json_list(engine_state, vals, serialize_types)?)
+        }
         Value::Error { error, .. } => return Err(*error.clone()),
-        Value::Closure { .. } | Value::Range { .. } => nu_json::Value::Null,
+        Value::Closure { val, .. } => {
+            if serialize_types {
+                let block = engine_state.get_block(val.block_id);
+                if let Some(span) = block.span {
+                    let contents_bytes = engine_state.get_span_contents(span);
+                    let contents_string = String::from_utf8_lossy(contents_bytes);
+                    nu_json::Value::String(contents_string.to_string())
+                } else {
+                    nu_json::Value::String(format!(
+                        "unable to retrieve block contents for json block_id {}",
+                        val.block_id.get()
+                    ))
+                }
+            } else {
+                nu_json::Value::Null
+            }
+        }
+        Value::Range { .. } => nu_json::Value::Null,
         Value::Binary { val, .. } => {
             nu_json::Value::Array(val.iter().map(|x| nu_json::Value::U64(*x as u64)).collect())
         }
         Value::Record { val, .. } => {
             let mut m = nu_json::Map::new();
             for (k, v) in &**val {
-                m.insert(k.clone(), value_to_json_value(v)?);
+                m.insert(
+                    k.clone(),
+                    value_to_json_value(engine_state, v, serialize_types)?,
+                );
             }
             nu_json::Value::Object(m)
         }
         Value::Custom { val, .. } => {
             let collected = val.to_base_value(span)?;
-            value_to_json_value(&collected)?
+            value_to_json_value(engine_state, &collected, serialize_types)?
         }
     })
 }
 
-fn json_list(input: &[Value]) -> Result<Vec<nu_json::Value>, ShellError> {
+fn json_list(
+    engine_state: &EngineState,
+    input: &[Value],
+    serialize_types: bool,
+) -> Result<Vec<nu_json::Value>, ShellError> {
     let mut out = vec![];
 
     for value in input {
-        out.push(value_to_json_value(value)?);
+        out.push(value_to_json_value(engine_state, value, serialize_types)?);
     }
 
     Ok(out)
diff --git a/crates/nu-command/src/formats/to/nuon.rs b/crates/nu-command/src/formats/to/nuon.rs
index 8f4fc80e7f..4f7cde1d0b 100644
--- a/crates/nu-command/src/formats/to/nuon.rs
+++ b/crates/nu-command/src/formats/to/nuon.rs
@@ -28,6 +28,11 @@ impl Command for ToNuon {
                 "specify indentation tab quantity",
                 Some('t'),
             )
+            .switch(
+                "serialize",
+                "serialize nushell types that cannot be deserialized",
+                Some('s'),
+            )
             .category(Category::Formats)
     }
 
@@ -47,6 +52,7 @@ impl Command for ToNuon {
             .unwrap_or_default()
             .with_content_type(Some("application/x-nuon".into()));
 
+        let serialize_types = call.has_flag(engine_state, stack, "serialize")?;
         let style = if call.has_flag(engine_state, stack, "raw")? {
             nuon::ToStyle::Raw
         } else if let Some(t) = call.get_flag(engine_state, stack, "tabs")? {
@@ -60,7 +66,7 @@ impl Command for ToNuon {
         let span = call.head;
         let value = input.into_value(span)?;
 
-        match nuon::to_nuon(&value, style, Some(span)) {
+        match nuon::to_nuon(engine_state, &value, style, Some(span), serialize_types) {
             Ok(serde_nuon_string) => Ok(Value::string(serde_nuon_string, span)
                 .into_pipeline_data_with_metadata(Some(metadata))),
             _ => Ok(Value::error(
diff --git a/crates/nu-command/src/formats/to/text.rs b/crates/nu-command/src/formats/to/text.rs
index b464cb86aa..2069df3dd4 100644
--- a/crates/nu-command/src/formats/to/text.rs
+++ b/crates/nu-command/src/formats/to/text.rs
@@ -27,6 +27,11 @@ impl Command for ToText {
                 "Do not append a newline to the end of the text",
                 Some('n'),
             )
+            .switch(
+                "serialize",
+                "serialize nushell types that cannot be deserialized",
+                Some('s'),
+            )
             .category(Category::Formats)
     }
 
@@ -43,6 +48,7 @@ impl Command for ToText {
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
         let no_newline = call.has_flag(engine_state, stack, "no-newline")?;
+        let serialize_types = call.has_flag(engine_state, stack, "serialize")?;
         let input = input.try_expand_range()?;
         let config = stack.get_config(engine_state);
 
@@ -56,7 +62,8 @@ impl Command for ToText {
                         Value::Record { val, .. } => !val.is_empty(),
                         _ => false,
                     };
-                let mut str = local_into_string(value, LINE_ENDING, &config);
+                let mut str =
+                    local_into_string(engine_state, value, LINE_ENDING, &config, serialize_types);
                 if add_trailing {
                     str.push_str(LINE_ENDING);
                 }
@@ -70,6 +77,7 @@ impl Command for ToText {
                 let stream = if no_newline {
                     let mut first = true;
                     let mut iter = stream.into_inner();
+                    let engine_state_clone = engine_state.clone();
                     ByteStream::from_fn(
                         span,
                         engine_state.signals().clone(),
@@ -85,15 +93,28 @@ impl Command for ToText {
                             }
                             // TODO: write directly into `buf` instead of creating an intermediate
                             // string.
-                            let str = local_into_string(val, LINE_ENDING, &config);
+                            let str = local_into_string(
+                                &engine_state_clone,
+                                val,
+                                LINE_ENDING,
+                                &config,
+                                serialize_types,
+                            );
                             write!(buf, "{str}").err_span(head)?;
                             Ok(true)
                         },
                     )
                 } else {
+                    let engine_state_clone = engine_state.clone();
                     ByteStream::from_iter(
                         stream.into_inner().map(move |val| {
-                            let mut str = local_into_string(val, LINE_ENDING, &config);
+                            let mut str = local_into_string(
+                                &engine_state_clone,
+                                val,
+                                LINE_ENDING,
+                                &config,
+                                serialize_types,
+                            );
                             str.push_str(LINE_ENDING);
                             str
                         }),
@@ -137,7 +158,13 @@ impl Command for ToText {
     }
 }
 
-fn local_into_string(value: Value, separator: &str, config: &Config) -> String {
+fn local_into_string(
+    engine_state: &EngineState,
+    value: Value,
+    separator: &str,
+    config: &Config,
+    serialize_types: bool,
+) -> String {
     let span = value.span();
     match value {
         Value::Bool { val, .. } => val.to_string(),
@@ -153,16 +180,38 @@ fn local_into_string(value: Value, separator: &str, config: &Config) -> String {
         Value::Glob { val, .. } => val,
         Value::List { vals: val, .. } => val
             .into_iter()
-            .map(|x| local_into_string(x, ", ", config))
+            .map(|x| local_into_string(engine_state, x, ", ", config, serialize_types))
             .collect::<Vec<_>>()
             .join(separator),
         Value::Record { val, .. } => val
             .into_owned()
             .into_iter()
-            .map(|(x, y)| format!("{}: {}", x, local_into_string(y, ", ", config)))
+            .map(|(x, y)| {
+                format!(
+                    "{}: {}",
+                    x,
+                    local_into_string(engine_state, y, ", ", config, serialize_types)
+                )
+            })
             .collect::<Vec<_>>()
             .join(separator),
-        Value::Closure { val, .. } => format!("<Closure {}>", val.block_id.get()),
+        Value::Closure { val, .. } => {
+            if serialize_types {
+                let block = engine_state.get_block(val.block_id);
+                if let Some(span) = block.span {
+                    let contents_bytes = engine_state.get_span_contents(span);
+                    let contents_string = String::from_utf8_lossy(contents_bytes);
+                    contents_string.to_string()
+                } else {
+                    format!(
+                        "unable to retrieve block contents for text block_id {}",
+                        val.block_id.get()
+                    )
+                }
+            } else {
+                format!("closure_{}", val.block_id.get())
+            }
+        }
         Value::Nothing { .. } => String::new(),
         Value::Error { error, .. } => format!("{error:?}"),
         Value::Binary { val, .. } => format!("{val:?}"),
@@ -171,7 +220,7 @@ fn local_into_string(value: Value, separator: &str, config: &Config) -> String {
         // that critical here
         Value::Custom { val, .. } => val
             .to_base_value(span)
-            .map(|val| local_into_string(val, separator, config))
+            .map(|val| local_into_string(engine_state, val, separator, config, serialize_types))
             .unwrap_or_else(|_| format!("<{}>", val.type_name())),
     }
 }
diff --git a/crates/nu-command/src/formats/to/toml.rs b/crates/nu-command/src/formats/to/toml.rs
index 5f28284904..11630e4522 100644
--- a/crates/nu-command/src/formats/to/toml.rs
+++ b/crates/nu-command/src/formats/to/toml.rs
@@ -13,6 +13,11 @@ impl Command for ToToml {
     fn signature(&self) -> Signature {
         Signature::build("to toml")
             .input_output_types(vec![(Type::record(), Type::String)])
+            .switch(
+                "serialize",
+                "serialize nushell types that cannot be deserialized",
+                Some('s'),
+            )
             .category(Category::Formats)
     }
 
@@ -31,19 +36,24 @@ impl Command for ToToml {
     fn run(
         &self,
         engine_state: &EngineState,
-        _stack: &mut Stack,
+        stack: &mut Stack,
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
-        to_toml(engine_state, input, head)
+        let serialize_types = call.has_flag(engine_state, stack, "serialize")?;
+
+        to_toml(engine_state, input, head, serialize_types)
     }
 }
 
 // Helper method to recursively convert nu_protocol::Value -> toml::Value
 // This shouldn't be called at the top-level
-fn helper(engine_state: &EngineState, v: &Value) -> Result<toml::Value, ShellError> {
-    let span = v.span();
+fn helper(
+    engine_state: &EngineState,
+    v: &Value,
+    serialize_types: bool,
+) -> Result<toml::Value, ShellError> {
     Ok(match &v {
         Value::Bool { val, .. } => toml::Value::Boolean(*val),
         Value::Int { val, .. } => toml::Value::Integer(*val),
@@ -56,15 +66,29 @@ fn helper(engine_state: &EngineState, v: &Value) -> Result<toml::Value, ShellErr
         Value::Record { val, .. } => {
             let mut m = toml::map::Map::new();
             for (k, v) in &**val {
-                m.insert(k.clone(), helper(engine_state, v)?);
+                m.insert(k.clone(), helper(engine_state, v, serialize_types)?);
             }
             toml::Value::Table(m)
         }
-        Value::List { vals, .. } => toml::Value::Array(toml_list(engine_state, vals)?),
-        Value::Closure { .. } => {
-            let code = engine_state.get_span_contents(span);
-            let code = String::from_utf8_lossy(code).to_string();
-            toml::Value::String(code)
+        Value::List { vals, .. } => {
+            toml::Value::Array(toml_list(engine_state, vals, serialize_types)?)
+        }
+        Value::Closure { val, .. } => {
+            if serialize_types {
+                let block = engine_state.get_block(val.block_id);
+                if let Some(span) = block.span {
+                    let contents_bytes = engine_state.get_span_contents(span);
+                    let contents_string = String::from_utf8_lossy(contents_bytes);
+                    toml::Value::String(contents_string.to_string())
+                } else {
+                    toml::Value::String(format!(
+                        "unable to retrieve block contents for toml block_id {}",
+                        val.block_id.get()
+                    ))
+                }
+            } else {
+                toml::Value::String(format!("closure_{}", val.block_id.get()))
+            }
         }
         Value::Nothing { .. } => toml::Value::String("<Nothing>".to_string()),
         Value::Error { error, .. } => return Err(*error.clone()),
@@ -86,11 +110,15 @@ fn helper(engine_state: &EngineState, v: &Value) -> Result<toml::Value, ShellErr
     })
 }
 
-fn toml_list(engine_state: &EngineState, input: &[Value]) -> Result<Vec<toml::Value>, ShellError> {
+fn toml_list(
+    engine_state: &EngineState,
+    input: &[Value],
+    serialize_types: bool,
+) -> Result<Vec<toml::Value>, ShellError> {
     let mut out = vec![];
 
     for value in input {
-        out.push(helper(engine_state, value)?);
+        out.push(helper(engine_state, value, serialize_types)?);
     }
 
     Ok(out)
@@ -129,9 +157,10 @@ fn value_to_toml_value(
     engine_state: &EngineState,
     v: &Value,
     head: Span,
+    serialize_types: bool,
 ) -> Result<toml::Value, ShellError> {
     match v {
-        Value::Record { .. } => helper(engine_state, v),
+        Value::Record { .. } | Value::Closure { .. } => helper(engine_state, v, serialize_types),
         // Propagate existing errors
         Value::Error { error, .. } => Err(*error.clone()),
         _ => Err(ShellError::UnsupportedInput {
@@ -147,11 +176,12 @@ fn to_toml(
     engine_state: &EngineState,
     input: PipelineData,
     span: Span,
+    serialize_types: bool,
 ) -> Result<PipelineData, ShellError> {
     let metadata = input.metadata();
     let value = input.into_value(span)?;
 
-    let toml_value = value_to_toml_value(engine_state, &value, span)?;
+    let toml_value = value_to_toml_value(engine_state, &value, span, serialize_types)?;
     match toml_value {
         toml::Value::Array(ref vec) => match vec[..] {
             [toml::Value::Table(_)] => toml_into_pipeline_data(
@@ -218,6 +248,7 @@ mod tests {
     #[test]
     fn to_toml_creates_correct_date() {
         let engine_state = EngineState::new();
+        let serialize_types = false;
 
         let test_date = Value::date(
             chrono::FixedOffset::east_opt(60 * 120)
@@ -242,7 +273,7 @@ mod tests {
             offset: Some(toml::value::Offset::Custom { minutes: 120 }),
         });
 
-        let result = helper(&engine_state, &test_date);
+        let result = helper(&engine_state, &test_date, serialize_types);
 
         assert!(result.is_ok_and(|res| res == reference_date));
     }
@@ -254,6 +285,7 @@ mod tests {
         //
 
         let engine_state = EngineState::new();
+        let serialize_types = false;
 
         let mut m = indexmap::IndexMap::new();
         m.insert("rust".to_owned(), Value::test_string("editor"));
@@ -269,6 +301,7 @@ mod tests {
             &engine_state,
             &Value::record(m.into_iter().collect(), Span::test_data()),
             Span::test_data(),
+            serialize_types,
         )
         .expect("Expected Ok from valid TOML dictionary");
         assert_eq!(
@@ -285,12 +318,14 @@ mod tests {
             &engine_state,
             &Value::test_string("not_valid"),
             Span::test_data(),
+            serialize_types,
         )
         .expect_err("Expected non-valid toml (String) to cause error!");
         value_to_toml_value(
             &engine_state,
             &Value::list(vec![Value::test_string("1")], Span::test_data()),
             Span::test_data(),
+            serialize_types,
         )
         .expect_err("Expected non-valid toml (Table) to cause error!");
     }
diff --git a/crates/nu-command/src/formats/to/yaml.rs b/crates/nu-command/src/formats/to/yaml.rs
index d6cad362f9..977e49c389 100644
--- a/crates/nu-command/src/formats/to/yaml.rs
+++ b/crates/nu-command/src/formats/to/yaml.rs
@@ -12,6 +12,11 @@ impl Command for ToYaml {
     fn signature(&self) -> Signature {
         Signature::build("to yaml")
             .input_output_types(vec![(Type::Any, Type::String)])
+            .switch(
+                "serialize",
+                "serialize nushell types that cannot be deserialized",
+                Some('s'),
+            )
             .category(Category::Formats)
     }
 
@@ -29,18 +34,24 @@ impl Command for ToYaml {
 
     fn run(
         &self,
-        _engine_state: &EngineState,
-        _stack: &mut Stack,
+        engine_state: &EngineState,
+        stack: &mut Stack,
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
+        let serialize_types = call.has_flag(engine_state, stack, "serialize")?;
         let input = input.try_expand_range()?;
-        to_yaml(input, head)
+
+        to_yaml(engine_state, input, head, serialize_types)
     }
 }
 
-pub fn value_to_yaml_value(v: &Value) -> Result<serde_yml::Value, ShellError> {
+pub fn value_to_yaml_value(
+    engine_state: &EngineState,
+    v: &Value,
+    serialize_types: bool,
+) -> Result<serde_yml::Value, ShellError> {
     Ok(match &v {
         Value::Bool { val, .. } => serde_yml::Value::Bool(*val),
         Value::Int { val, .. } => serde_yml::Value::Number(serde_yml::Number::from(*val)),
@@ -55,7 +66,10 @@ pub fn value_to_yaml_value(v: &Value) -> Result<serde_yml::Value, ShellError> {
         Value::Record { val, .. } => {
             let mut m = serde_yml::Mapping::new();
             for (k, v) in &**val {
-                m.insert(serde_yml::Value::String(k.clone()), value_to_yaml_value(v)?);
+                m.insert(
+                    serde_yml::Value::String(k.clone()),
+                    value_to_yaml_value(engine_state, v, serialize_types)?,
+                );
             }
             serde_yml::Value::Mapping(m)
         }
@@ -63,12 +77,28 @@ pub fn value_to_yaml_value(v: &Value) -> Result<serde_yml::Value, ShellError> {
             let mut out = vec![];
 
             for value in vals {
-                out.push(value_to_yaml_value(value)?);
+                out.push(value_to_yaml_value(engine_state, value, serialize_types)?);
             }
 
             serde_yml::Value::Sequence(out)
         }
-        Value::Closure { .. } => serde_yml::Value::Null,
+        Value::Closure { val, .. } => {
+            if serialize_types {
+                let block = engine_state.get_block(val.block_id);
+                if let Some(span) = block.span {
+                    let contents_bytes = engine_state.get_span_contents(span);
+                    let contents_string = String::from_utf8_lossy(contents_bytes);
+                    serde_yml::Value::String(contents_string.to_string())
+                } else {
+                    serde_yml::Value::String(format!(
+                        "unable to retrieve block contents for yaml block_id {}",
+                        val.block_id.get()
+                    ))
+                }
+            } else {
+                serde_yml::Value::Null
+            }
+        }
         Value::Nothing { .. } => serde_yml::Value::Null,
         Value::Error { error, .. } => return Err(*error.clone()),
         Value::Binary { val, .. } => serde_yml::Value::Sequence(
@@ -91,7 +121,12 @@ pub fn value_to_yaml_value(v: &Value) -> Result<serde_yml::Value, ShellError> {
     })
 }
 
-fn to_yaml(input: PipelineData, head: Span) -> Result<PipelineData, ShellError> {
+fn to_yaml(
+    engine_state: &EngineState,
+    input: PipelineData,
+    head: Span,
+    serialize_types: bool,
+) -> Result<PipelineData, ShellError> {
     let metadata = input
         .metadata()
         .unwrap_or_default()
@@ -99,7 +134,7 @@ fn to_yaml(input: PipelineData, head: Span) -> Result<PipelineData, ShellError>
         .with_content_type(Some("application/yaml".into()));
     let value = input.into_value(head)?;
 
-    let yaml_value = value_to_yaml_value(&value)?;
+    let yaml_value = value_to_yaml_value(engine_state, &value, serialize_types)?;
     match serde_yml::to_string(&yaml_value) {
         Ok(serde_yml_string) => {
             Ok(Value::string(serde_yml_string, head)
@@ -120,11 +155,9 @@ fn to_yaml(input: PipelineData, head: Span) -> Result<PipelineData, ShellError>
 
 #[cfg(test)]
 mod test {
-    use nu_cmd_lang::eval_pipeline_without_terminal_expression;
-
-    use crate::{Get, Metadata};
-
     use super::*;
+    use crate::{Get, Metadata};
+    use nu_cmd_lang::eval_pipeline_without_terminal_expression;
 
     #[test]
     fn test_examples() {
diff --git a/crates/nu-command/src/network/http/client.rs b/crates/nu-command/src/network/http/client.rs
index 504cc7b632..a5cad69b2c 100644
--- a/crates/nu-command/src/network/http/client.rs
+++ b/crates/nu-command/src/network/http/client.rs
@@ -205,6 +205,7 @@ pub enum HttpBody {
 
 // remove once all commands have been migrated
 pub fn send_request(
+    engine_state: &EngineState,
     request: Request,
     http_body: HttpBody,
     content_type: Option<String>,
@@ -212,6 +213,9 @@ pub fn send_request(
     signals: &Signals,
 ) -> Result<Response, ShellErrorOrRequestError> {
     let request_url = request.url().to_string();
+    // hard code serialze_types to false because closures probably shouldn't be
+    // deserialized for send_request but it's required by send_json_request
+    let serialze_types = false;
 
     match http_body {
         HttpBody::None => {
@@ -238,7 +242,15 @@ pub fn send_request(
             };
 
             match body_type {
-                BodyType::Json => send_json_request(&request_url, body, req, span, signals),
+                BodyType::Json => send_json_request(
+                    engine_state,
+                    &request_url,
+                    body,
+                    req,
+                    span,
+                    signals,
+                    serialze_types,
+                ),
                 BodyType::Form => send_form_request(&request_url, body, req, span, signals),
                 BodyType::Multipart => {
                     send_multipart_request(&request_url, body, req, span, signals)
@@ -252,15 +264,17 @@ pub fn send_request(
 }
 
 fn send_json_request(
+    engine_state: &EngineState,
     request_url: &str,
     body: Value,
     req: Request,
     span: Span,
     signals: &Signals,
+    serialize_types: bool,
 ) -> Result<Response, ShellErrorOrRequestError> {
     match body {
         Value::Int { .. } | Value::Float { .. } | Value::List { .. } | Value::Record { .. } => {
-            let data = value_to_json_value(&body)?;
+            let data = value_to_json_value(engine_state, &body, serialize_types)?;
             send_cancellable_request(request_url, Box::new(|| req.send_json(data)), span, signals)
         }
         // If the body type is string, assume it is string json content.
diff --git a/crates/nu-command/src/network/http/delete.rs b/crates/nu-command/src/network/http/delete.rs
index b13b3846e2..8a931f3653 100644
--- a/crates/nu-command/src/network/http/delete.rs
+++ b/crates/nu-command/src/network/http/delete.rs
@@ -214,6 +214,7 @@ fn helper(
     request = request_add_custom_headers(args.headers, request)?;
 
     let response = send_request(
+        engine_state,
         request.clone(),
         args.data,
         args.content_type,
diff --git a/crates/nu-command/src/network/http/get.rs b/crates/nu-command/src/network/http/get.rs
index 8260f76c66..245ba3747c 100644
--- a/crates/nu-command/src/network/http/get.rs
+++ b/crates/nu-command/src/network/http/get.rs
@@ -182,6 +182,7 @@ fn helper(
     request = request_add_custom_headers(args.headers, request)?;
 
     let response = send_request(
+        engine_state,
         request.clone(),
         HttpBody::None,
         None,
diff --git a/crates/nu-command/src/network/http/head.rs b/crates/nu-command/src/network/http/head.rs
index 99c77101af..4245d77abd 100644
--- a/crates/nu-command/src/network/http/head.rs
+++ b/crates/nu-command/src/network/http/head.rs
@@ -155,7 +155,14 @@ fn helper(
     request = request_add_authorization_header(args.user, args.password, request);
     request = request_add_custom_headers(args.headers, request)?;
 
-    let response = send_request(request, HttpBody::None, None, call.head, signals);
+    let response = send_request(
+        engine_state,
+        request,
+        HttpBody::None,
+        None,
+        call.head,
+        signals,
+    );
     check_response_redirection(redirect_mode, span, &response)?;
     request_handle_response_headers(span, response)
 }
diff --git a/crates/nu-command/src/network/http/options.rs b/crates/nu-command/src/network/http/options.rs
index cd86b5349a..c8ee91d530 100644
--- a/crates/nu-command/src/network/http/options.rs
+++ b/crates/nu-command/src/network/http/options.rs
@@ -161,6 +161,7 @@ fn helper(
     request = request_add_custom_headers(args.headers, request)?;
 
     let response = send_request(
+        engine_state,
         request.clone(),
         HttpBody::None,
         None,
diff --git a/crates/nu-command/src/network/http/patch.rs b/crates/nu-command/src/network/http/patch.rs
index b062282b84..e3db71d3b1 100644
--- a/crates/nu-command/src/network/http/patch.rs
+++ b/crates/nu-command/src/network/http/patch.rs
@@ -216,6 +216,7 @@ fn helper(
     request = request_add_custom_headers(args.headers, request)?;
 
     let response = send_request(
+        engine_state,
         request.clone(),
         args.data,
         args.content_type,
diff --git a/crates/nu-command/src/network/http/post.rs b/crates/nu-command/src/network/http/post.rs
index 597f9478b9..5a23765366 100644
--- a/crates/nu-command/src/network/http/post.rs
+++ b/crates/nu-command/src/network/http/post.rs
@@ -224,6 +224,7 @@ fn helper(
     request = request_add_custom_headers(args.headers, request)?;
 
     let response = send_request(
+        engine_state,
         request.clone(),
         args.data,
         args.content_type,
diff --git a/crates/nu-command/src/network/http/put.rs b/crates/nu-command/src/network/http/put.rs
index b3bf8b72d5..a1c2aa71a3 100644
--- a/crates/nu-command/src/network/http/put.rs
+++ b/crates/nu-command/src/network/http/put.rs
@@ -215,6 +215,7 @@ fn helper(
     request = request_add_custom_headers(args.headers, request)?;
 
     let response = send_request(
+        engine_state,
         request.clone(),
         args.data,
         args.content_type,
diff --git a/crates/nu-command/tests/commands/database/into_sqlite.rs b/crates/nu-command/tests/commands/database/into_sqlite.rs
index 3de7973588..5c0f5f6c60 100644
--- a/crates/nu-command/tests/commands/database/into_sqlite.rs
+++ b/crates/nu-command/tests/commands/database/into_sqlite.rs
@@ -1,6 +1,6 @@
 use chrono::{DateTime, FixedOffset};
 use nu_path::AbsolutePathBuf;
-use nu_protocol::{ast::PathMember, record, Span, Value};
+use nu_protocol::{ast::PathMember, engine::EngineState, record, Span, Value};
 use nu_test_support::{
     fs::{line_ending, Stub},
     nu, pipeline,
@@ -298,6 +298,9 @@ fn into_sqlite_existing_db_append() {
 /// streaming pipeline instead of a simple value
 #[test]
 fn into_sqlite_big_insert() {
+    let engine_state = EngineState::new();
+    // don't serialize closures
+    let serialize_types = false;
     Playground::setup("big_insert", |dirs, playground| {
         const NUM_ROWS: usize = 10_000;
         const NUON_FILE_NAME: &str = "data.nuon";
@@ -330,7 +333,14 @@ fn into_sqlite_big_insert() {
                 )
                 .unwrap();
 
-            let nuon = nuon::to_nuon(&value, nuon::ToStyle::Raw, Some(Span::unknown())).unwrap()
+            let nuon = nuon::to_nuon(
+                &engine_state,
+                &value,
+                nuon::ToStyle::Raw,
+                Some(Span::unknown()),
+                serialize_types,
+            )
+            .unwrap()
                 + &line_ending();
 
             nuon_file.write_all(nuon.as_bytes()).unwrap();
diff --git a/crates/nu-command/tests/format_conversions/nuon.rs b/crates/nu-command/tests/format_conversions/nuon.rs
index e4f6281c01..a7a423a0d6 100644
--- a/crates/nu-command/tests/format_conversions/nuon.rs
+++ b/crates/nu-command/tests/format_conversions/nuon.rs
@@ -278,6 +278,7 @@ fn from_nuon_datetime() {
 }
 
 #[test]
+#[ignore]
 fn to_nuon_errs_on_closure() {
     let actual = nu!(pipeline(
         r#"
diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs
index f3b44d93dd..09b9a5f60a 100644
--- a/crates/nu-protocol/src/value/mod.rs
+++ b/crates/nu-protocol/src/value/mod.rs
@@ -908,7 +908,7 @@ impl Value {
                     .collect::<Vec<_>>()
                     .join(separator)
             ),
-            Value::Closure { val, .. } => format!("<Closure {}>", val.block_id.get()),
+            Value::Closure { val, .. } => format!("closure_{}", val.block_id.get()),
             Value::Nothing { .. } => String::new(),
             Value::Error { error, .. } => format!("{error:?}"),
             Value::Binary { val, .. } => format!("{val:?}"),
diff --git a/crates/nuon/src/lib.rs b/crates/nuon/src/lib.rs
index 24a84dfd5f..99525959ab 100644
--- a/crates/nuon/src/lib.rs
+++ b/crates/nuon/src/lib.rs
@@ -11,7 +11,7 @@ mod tests {
     use chrono::DateTime;
     use nu_protocol::{
         ast::{CellPath, PathMember, RangeInclusion},
-        engine::Closure,
+        engine::{Closure, EngineState},
         record, BlockId, IntRange, Range, Span, Value,
     };
 
@@ -25,11 +25,15 @@ mod tests {
     /// an optional "middle" value can be given to test what the value is between `from nuon` and
     /// `to nuon`.
     fn nuon_end_to_end(input: &str, middle: Option<Value>) {
+        let engine_state = EngineState::new();
         let val = from_nuon(input, None).unwrap();
         if let Some(m) = middle {
             assert_eq!(val, m);
         }
-        assert_eq!(to_nuon(&val, ToStyle::Raw, None).unwrap(), input);
+        assert_eq!(
+            to_nuon(&engine_state, &val, ToStyle::Raw, None, false).unwrap(),
+            input
+        );
     }
 
     #[test]
@@ -172,14 +176,19 @@ mod tests {
     }
 
     #[test]
+    #[ignore]
     fn to_nuon_errs_on_closure() {
+        let engine_state = EngineState::new();
+
         assert!(to_nuon(
+            &engine_state,
             &Value::test_closure(Closure {
                 block_id: BlockId::new(0),
                 captures: vec![]
             }),
             ToStyle::Raw,
             None,
+            false,
         )
         .unwrap_err()
         .to_string()
@@ -196,8 +205,17 @@ mod tests {
 
     #[test]
     fn binary_roundtrip() {
+        let engine_state = EngineState::new();
+
         assert_eq!(
-            to_nuon(&from_nuon("0x[1f ff]", None).unwrap(), ToStyle::Raw, None).unwrap(),
+            to_nuon(
+                &engine_state,
+                &from_nuon("0x[1f ff]", None).unwrap(),
+                ToStyle::Raw,
+                None,
+                false,
+            )
+            .unwrap(),
             "0x[1FFF]"
         );
     }
@@ -237,40 +255,79 @@ mod tests {
 
     #[test]
     fn float_doesnt_become_int() {
+        let engine_state = EngineState::new();
+
         assert_eq!(
-            to_nuon(&Value::test_float(1.0), ToStyle::Raw, None).unwrap(),
+            to_nuon(
+                &engine_state,
+                &Value::test_float(1.0),
+                ToStyle::Raw,
+                None,
+                false
+            )
+            .unwrap(),
             "1.0"
         );
     }
 
     #[test]
     fn float_inf_parsed_properly() {
+        let engine_state = EngineState::new();
+
         assert_eq!(
-            to_nuon(&Value::test_float(f64::INFINITY), ToStyle::Raw, None).unwrap(),
+            to_nuon(
+                &engine_state,
+                &Value::test_float(f64::INFINITY),
+                ToStyle::Raw,
+                None,
+                false,
+            )
+            .unwrap(),
             "inf"
         );
     }
 
     #[test]
     fn float_neg_inf_parsed_properly() {
+        let engine_state = EngineState::new();
+
         assert_eq!(
-            to_nuon(&Value::test_float(f64::NEG_INFINITY), ToStyle::Raw, None).unwrap(),
+            to_nuon(
+                &engine_state,
+                &Value::test_float(f64::NEG_INFINITY),
+                ToStyle::Raw,
+                None,
+                false,
+            )
+            .unwrap(),
             "-inf"
         );
     }
 
     #[test]
     fn float_nan_parsed_properly() {
+        let engine_state = EngineState::new();
+
         assert_eq!(
-            to_nuon(&Value::test_float(-f64::NAN), ToStyle::Raw, None).unwrap(),
+            to_nuon(
+                &engine_state,
+                &Value::test_float(-f64::NAN),
+                ToStyle::Raw,
+                None,
+                false,
+            )
+            .unwrap(),
             "NaN"
         );
     }
 
     #[test]
     fn to_nuon_converts_columns_with_spaces() {
+        let engine_state = EngineState::new();
+
         assert!(from_nuon(
             &to_nuon(
+                &engine_state,
                 &Value::test_list(vec![
                     Value::test_record(record!(
                         "a" => Value::test_int(1),
@@ -284,7 +341,8 @@ mod tests {
                     ))
                 ]),
                 ToStyle::Raw,
-                None
+                None,
+                false,
             )
             .unwrap(),
             None,
@@ -294,7 +352,15 @@ mod tests {
 
     #[test]
     fn to_nuon_quotes_empty_string() {
-        let res = to_nuon(&Value::test_string(""), ToStyle::Raw, None);
+        let engine_state = EngineState::new();
+
+        let res = to_nuon(
+            &engine_state,
+            &Value::test_string(""),
+            ToStyle::Raw,
+            None,
+            false,
+        );
         assert!(res.is_ok());
         assert_eq!(res.unwrap(), r#""""#);
     }
@@ -340,8 +406,11 @@ mod tests {
 
     #[test]
     fn does_not_quote_strings_unnecessarily() {
+        let engine_state = EngineState::new();
+
         assert_eq!(
             to_nuon(
+                &engine_state,
                 &Value::test_list(vec![
                     Value::test_record(record!(
                         "a" => Value::test_int(1),
@@ -355,7 +424,8 @@ mod tests {
                     ))
                 ]),
                 ToStyle::Raw,
-                None
+                None,
+                false,
             )
             .unwrap(),
             "[[a, b, \"c d\"]; [1, 2, 3], [4, 5, 6]]"
@@ -363,12 +433,14 @@ mod tests {
 
         assert_eq!(
             to_nuon(
+                &engine_state,
                 &Value::test_record(record!(
                     "ro name" => Value::test_string("sam"),
                     "rank" => Value::test_int(10)
                 )),
                 ToStyle::Raw,
-                None
+                None,
+                false,
             )
             .unwrap(),
             "{\"ro name\": sam, rank: 10}"
diff --git a/crates/nuon/src/to.rs b/crates/nuon/src/to.rs
index b8281e8ffe..13244bfdcd 100644
--- a/crates/nuon/src/to.rs
+++ b/crates/nuon/src/to.rs
@@ -1,7 +1,6 @@
 use core::fmt::Write;
-
 use nu_engine::get_columns;
-use nu_protocol::{Range, ShellError, Span, Value};
+use nu_protocol::{engine::EngineState, Range, ShellError, Span, Value};
 use nu_utils::{escape_quote_string, needs_quoting};
 
 use std::ops::Bound;
@@ -44,7 +43,13 @@ pub enum ToStyle {
 /// > using this function in a command implementation such as [`to nuon`](https://www.nushell.sh/commands/docs/to_nuon.html).
 ///
 /// also see [`super::from_nuon`] for the inverse operation
-pub fn to_nuon(input: &Value, style: ToStyle, span: Option<Span>) -> Result<String, ShellError> {
+pub fn to_nuon(
+    engine_state: &EngineState,
+    input: &Value,
+    style: ToStyle,
+    span: Option<Span>,
+    serialize_types: bool,
+) -> Result<String, ShellError> {
     let span = span.unwrap_or(Span::unknown());
 
     let indentation = match style {
@@ -53,16 +58,25 @@ pub fn to_nuon(input: &Value, style: ToStyle, span: Option<Span>) -> Result<Stri
         ToStyle::Spaces(s) => Some(" ".repeat(s)),
     };
 
-    let res = value_to_string(input, span, 0, indentation.as_deref())?;
+    let res = value_to_string(
+        engine_state,
+        input,
+        span,
+        0,
+        indentation.as_deref(),
+        serialize_types,
+    )?;
 
     Ok(res)
 }
 
 fn value_to_string(
+    engine_state: &EngineState,
     v: &Value,
     span: Span,
     depth: usize,
     indent: Option<&str>,
+    serialize_types: bool,
 ) -> Result<String, ShellError> {
     let (nl, sep) = get_true_separators(indent);
     let idt = get_true_indentation(depth, indent);
@@ -84,12 +98,25 @@ fn value_to_string(
             }
             Ok(format!("0x[{s}]"))
         }
-        Value::Closure { .. } => Err(ShellError::UnsupportedInput {
-            msg: "closures are currently not nuon-compatible".into(),
-            input: "value originates from here".into(),
-            msg_span: span,
-            input_span: v.span(),
-        }),
+        Value::Closure { val, .. } => {
+            if serialize_types {
+                let block = engine_state.get_block(val.block_id);
+                if let Some(span) = block.span {
+                    let contents_bytes = engine_state.get_span_contents(span);
+                    let contents_string = String::from_utf8_lossy(contents_bytes);
+                    Ok(contents_string.to_string())
+                } else {
+                    Ok(String::new())
+                }
+            } else {
+                Err(ShellError::UnsupportedInput {
+                    msg: "closures are currently not nuon-compatible".into(),
+                    input: "value originates from here".into(),
+                    msg_span: span,
+                    input_span: v.span(),
+                })
+            }
+        }
         Value::Bool { val, .. } => {
             if *val {
                 Ok("true".to_string())
@@ -144,10 +171,12 @@ fn value_to_string(
                     if let Value::Record { val, .. } = val {
                         for val in val.values() {
                             row.push(value_to_string_without_quotes(
+                                engine_state,
                                 val,
                                 span,
                                 depth + 2,
                                 indent,
+                                serialize_types,
                             )?);
                         }
                     }
@@ -165,7 +194,14 @@ fn value_to_string(
                 for val in vals {
                     collection.push(format!(
                         "{idt_po}{}",
-                        value_to_string_without_quotes(val, span, depth + 1, indent,)?
+                        value_to_string_without_quotes(
+                            engine_state,
+                            val,
+                            span,
+                            depth + 1,
+                            indent,
+                            serialize_types
+                        )?
                     ));
                 }
                 Ok(format!(
@@ -178,18 +214,38 @@ fn value_to_string(
         Value::Range { val, .. } => match **val {
             Range::IntRange(range) => Ok(range.to_string()),
             Range::FloatRange(range) => {
-                let start =
-                    value_to_string(&Value::float(range.start(), span), span, depth + 1, indent)?;
+                let start = value_to_string(
+                    engine_state,
+                    &Value::float(range.start(), span),
+                    span,
+                    depth + 1,
+                    indent,
+                    serialize_types,
+                )?;
                 match range.end() {
                     Bound::Included(end) => Ok(format!(
                         "{}..{}",
                         start,
-                        value_to_string(&Value::float(end, span), span, depth + 1, indent)?
+                        value_to_string(
+                            engine_state,
+                            &Value::float(end, span),
+                            span,
+                            depth + 1,
+                            indent,
+                            serialize_types,
+                        )?
                     )),
                     Bound::Excluded(end) => Ok(format!(
                         "{}..<{}",
                         start,
-                        value_to_string(&Value::float(end, span), span, depth + 1, indent)?
+                        value_to_string(
+                            engine_state,
+                            &Value::float(end, span),
+                            span,
+                            depth + 1,
+                            indent,
+                            serialize_types,
+                        )?
                     )),
                     Bound::Unbounded => Ok(format!("{start}..",)),
                 }
@@ -205,7 +261,14 @@ fn value_to_string(
                 };
                 collection.push(format!(
                     "{idt_po}{col}: {}",
-                    value_to_string_without_quotes(val, span, depth + 1, indent)?
+                    value_to_string_without_quotes(
+                        engine_state,
+                        val,
+                        span,
+                        depth + 1,
+                        indent,
+                        serialize_types
+                    )?
                 ));
             }
             Ok(format!(
@@ -235,10 +298,12 @@ fn get_true_separators(indent: Option<&str>) -> (String, String) {
 }
 
 fn value_to_string_without_quotes(
+    engine_state: &EngineState,
     v: &Value,
     span: Span,
     depth: usize,
     indent: Option<&str>,
+    serialize_types: bool,
 ) -> Result<String, ShellError> {
     match v {
         Value::String { val, .. } => Ok({
@@ -248,6 +313,6 @@ fn value_to_string_without_quotes(
                 val.clone()
             }
         }),
-        _ => value_to_string(v, span, depth, indent),
+        _ => value_to_string(engine_state, v, span, depth, indent, serialize_types),
     }
 }
diff --git a/tests/eval/mod.rs b/tests/eval/mod.rs
index c84cdaa873..65c26a5cc6 100644
--- a/tests/eval/mod.rs
+++ b/tests/eval/mod.rs
@@ -103,7 +103,27 @@ fn literal_binary() {
 
 #[test]
 fn literal_closure() {
-    test_eval("{||}", Matches("<Closure"))
+    test_eval("{||}", Matches("closure_"))
+}
+
+#[test]
+fn literal_closure_to_nuon() {
+    test_eval("{||} | to nuon --serialize", Eq("{||}"))
+}
+
+#[test]
+fn literal_closure_to_json() {
+    test_eval("{||} | to json --serialize", Eq("\"{||}\""))
+}
+
+#[test]
+fn literal_closure_to_toml() {
+    test_eval("{a: {||}} | to toml --serialize", Eq("a = \"{||}\""))
+}
+
+#[test]
+fn literal_closure_to_yaml() {
+    test_eval("{||} | to yaml --serialize", Eq("'{||}'"))
 }
 
 #[test]

From 787f292ca70547f3e15c80cdac5488a670858785 Mon Sep 17 00:00:00 2001
From: Yash Thakur <45539777+ysthakur@users.noreply.github.com>
Date: Tue, 7 Jan 2025 12:52:31 -0500
Subject: [PATCH 0893/1072] Custom completions: Inherit case_sensitive option
 from $env.config (#14738)

# Description

Currently, if a custom completer returns a record containing an
`options` field, but these options don't specify `case_sensitive`,
`case_sensitive` will be true. This PR instead makes the default value
whatever the user specified in `$env.config.completions.case_sensitive`.

The match algorithm option already does this. `positional` is also
inherited from the global config, although user's can't actually specify
that one themselves in `$env.config` (I'm planning on getting rid of
`positional` in a separate PR).

# User-Facing Changes

For those making custom completions, if they need matching to be done
case-sensitively and:
- their completer returns a record rather than a list,
- and the record contains an `options` field,
- and the `options` field is a record,
- and the record doesn't contain a `case_sensitive` option,

then they will need to specify `case_sensitive: true` in their custom
completer's options. Otherwise, if the user sets
`$env.config.completions.case_sensitive = false`, their custom completer
will also use case-insensitive matching.

Others shouldn't have to make any changes.

# Tests + Formatting

Updated tests to check if `case_sensitive`. Basically rewrote them,
actually. I figured it'd be better to make a single helper function that
takes completer options and completion suggestions and generates a
completer from that rather than having multiple fixtures providing
different completers.

# After Submitting

Probably needs to be noted in the release notes, but I don't think the
[docs](https://www.nushell.sh/book/custom_completions.html#options-for-custom-completions)
need to be updated.
---
 .../src/completions/custom_completions.rs     |  42 +++---
 crates/nu-cli/tests/completions/mod.rs        | 123 ++++++++++--------
 2 files changed, 89 insertions(+), 76 deletions(-)

diff --git a/crates/nu-cli/src/completions/custom_completions.rs b/crates/nu-cli/src/completions/custom_completions.rs
index 4f19cd0eb0..2a9c621192 100644
--- a/crates/nu-cli/src/completions/custom_completions.rs
+++ b/crates/nu-cli/src/completions/custom_completions.rs
@@ -66,7 +66,7 @@ impl Completer for CustomCompletion {
             PipelineData::empty(),
         );
 
-        let mut custom_completion_options = None;
+        let mut completion_options = completion_options.clone();
         let mut should_sort = true;
 
         // Parse result
@@ -89,25 +89,24 @@ impl Completer for CustomCompletion {
                             should_sort = sort;
                         }
 
-                        custom_completion_options = Some(CompletionOptions {
-                            case_sensitive: options
-                                .get("case_sensitive")
-                                .and_then(|val| val.as_bool().ok())
-                                .unwrap_or(true),
-                            positional: options
-                                .get("positional")
-                                .and_then(|val| val.as_bool().ok())
-                                .unwrap_or(completion_options.positional),
-                            match_algorithm: match options.get("completion_algorithm") {
-                                Some(option) => option
-                                    .coerce_string()
-                                    .ok()
-                                    .and_then(|option| option.try_into().ok())
-                                    .unwrap_or(completion_options.match_algorithm),
-                                None => completion_options.match_algorithm,
-                            },
-                            sort: completion_options.sort,
-                        });
+                        if let Some(case_sensitive) = options
+                            .get("case_sensitive")
+                            .and_then(|val| val.as_bool().ok())
+                        {
+                            completion_options.case_sensitive = case_sensitive;
+                        }
+                        if let Some(positional) =
+                            options.get("positional").and_then(|val| val.as_bool().ok())
+                        {
+                            completion_options.positional = positional;
+                        }
+                        if let Some(algorithm) = options
+                            .get("completion_algorithm")
+                            .and_then(|option| option.coerce_string().ok())
+                            .and_then(|option| option.try_into().ok())
+                        {
+                            completion_options.match_algorithm = algorithm;
+                        }
                     }
 
                     completions
@@ -117,8 +116,7 @@ impl Completer for CustomCompletion {
             })
             .unwrap_or_default();
 
-        let options = custom_completion_options.unwrap_or(completion_options.clone());
-        let mut matcher = NuMatcher::new(String::from_utf8_lossy(prefix), options);
+        let mut matcher = NuMatcher::new(String::from_utf8_lossy(prefix), completion_options);
 
         if should_sort {
             for sugg in suggestions {
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index 4ff1776d0f..a75ffe1d4c 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -62,50 +62,29 @@ fn extern_completer() -> NuCompleter {
     NuCompleter::new(Arc::new(engine), Arc::new(stack))
 }
 
-#[fixture]
-fn completer_strings_with_options() -> NuCompleter {
-    // Create a new engine
+fn custom_completer_with_options(
+    global_opts: &str,
+    completer_opts: &str,
+    completions: &[&str],
+) -> NuCompleter {
     let (_, _, mut engine, mut stack) = new_engine();
-    // Add record value as example
-    let record = r#"
-        # To test that the config setting has no effect on the custom completions
-        $env.config.completions.algorithm = "fuzzy"
-        def animals [] {
-            {
-                # Very rare and totally real animals
-                completions: ["Abcdef", "Foo Abcdef", "Acd Bar" ],
-                options: {
-                    completion_algorithm: "prefix",
-                    positional: false,
-                    case_sensitive: false,
-                }
-            }
-        }
-        def my-command [animal: string@animals] { print $animal }"#;
-    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack).is_ok());
-
-    // Instantiate a new completer
-    NuCompleter::new(Arc::new(engine), Arc::new(stack))
-}
-
-#[fixture]
-fn completer_strings_no_sort() -> NuCompleter {
-    // Create a new engine
-    let (_, _, mut engine, mut stack) = new_engine();
-    let command = r#"
-        def animals [] {
-            {
-                completions: ["zzzfoo", "foo", "not matched", "abcfoo" ],
-                options: {
-                    completion_algorithm: "fuzzy",
-                    sort: false,
-                }
-            }
-        }
-        def my-command [animal: string@animals] { print $animal }"#;
+    let command = format!(
+        r#"
+        {}
+        def comp [] {{
+            {{ completions: [{}], options: {{ {} }} }}
+        }}
+        def my-command [arg: string@comp] {{}}"#,
+        global_opts,
+        completions
+            .iter()
+            .map(|comp| format!("'{}'", comp))
+            .collect::<Vec<_>>()
+            .join(", "),
+        completer_opts,
+    );
     assert!(support::merge_input(command.as_bytes(), &mut engine, &mut stack).is_ok());
 
-    // Instantiate a new completer
     NuCompleter::new(Arc::new(engine), Arc::new(stack))
 }
 
@@ -217,23 +196,59 @@ fn variables_customcompletion_subcommands_with_customcompletion_2(
     match_suggestions(&expected, &suggestions);
 }
 
-#[rstest]
-fn customcompletions_substring_matching(mut completer_strings_with_options: NuCompleter) {
-    let suggestions = completer_strings_with_options.complete("my-command Abcd", 15);
+/// $env.config should be overridden by the custom completer's options
+#[test]
+fn customcompletions_override_options() {
+    let mut completer = custom_completer_with_options(
+        r#"$env.config.completions.algorithm = "fuzzy"
+           $env.config.completions.case_sensitive = false"#,
+        r#"completion_algorithm: "prefix",
+           positional: false,
+           case_sensitive: true,
+           sort: true"#,
+        &["Foo Abcdef", "Abcdef", "Acd Bar"],
+    );
+
+    // positional: false should make it do substring matching
+    // sort: true should force sorting
     let expected: Vec<String> = vec!["Abcdef".into(), "Foo Abcdef".into()];
+    let suggestions = completer.complete("my-command Abcd", 15);
+    match_suggestions(&expected, &suggestions);
+
+    // Custom options should make case-sensitive
+    let suggestions = completer.complete("my-command aBcD", 15);
+    assert!(suggestions.is_empty());
+}
+
+/// $env.config should be inherited by the custom completer's options
+#[test]
+fn customcompletions_inherit_options() {
+    let mut completer = custom_completer_with_options(
+        r#"$env.config.completions.algorithm = "fuzzy"
+           $env.config.completions.case_sensitive = false"#,
+        "",
+        &["Foo Abcdef", "Abcdef", "Acd Bar"],
+    );
+
+    // Make sure matching is fuzzy
+    let suggestions = completer.complete("my-command Acd", 14);
+    let expected: Vec<String> = vec!["Acd Bar".into(), "Abcdef".into(), "Foo Abcdef".into()];
+    match_suggestions(&expected, &suggestions);
+
+    // Custom options should make matching case insensitive
+    let suggestions = completer.complete("my-command acd", 14);
     match_suggestions(&expected, &suggestions);
 }
 
-#[rstest]
-fn customcompletions_case_insensitive(mut completer_strings_with_options: NuCompleter) {
-    let suggestions = completer_strings_with_options.complete("my-command foo", 14);
-    let expected: Vec<String> = vec!["Foo Abcdef".into()];
-    match_suggestions(&expected, &suggestions);
-}
-
-#[rstest]
-fn customcompletions_no_sort(mut completer_strings_no_sort: NuCompleter) {
-    let suggestions = completer_strings_no_sort.complete("my-command foo", 14);
+#[test]
+fn customcompletions_no_sort() {
+    let mut completer = custom_completer_with_options(
+        "",
+        r#"completion_algorithm: "fuzzy",
+           sort: false"#,
+        &["zzzfoo", "foo", "not matched", "abcfoo"],
+    );
+    let suggestions = completer.complete("my-command foo", 14);
     let expected: Vec<String> = vec!["zzzfoo".into(), "foo".into(), "abcfoo".into()];
     match_suggestions(&expected, &suggestions);
 }

From 8e41a308cd2aa50e6e23b8a3ead7c3b76e5aa57f Mon Sep 17 00:00:00 2001
From: Chetan <chetanbaliyan10@gmail.com>
Date: Tue, 7 Jan 2025 23:40:25 +0530
Subject: [PATCH 0894/1072] fix(explore): handle zero-size cursor in binary
 viewer (#14592)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
Fix cursor panic when handling size zero in binary viewer. Previously,
the cursor would panic
with arithmetic overflow when handling size 0. This PR fixes this by
using `saturating_sub`
to safely handle the edge case of size 0.

Fixes #14589

# User-Facing Changes
- Fixed panic when viewing very small binary inputs in the explore
command (when using `0x[f] | explore`)

# Tests + Formatting
Added tests to verify:
- Cursor handling of size 0
- Safe movement operations with size 0
- Edge case handling with size 1

✅ Verified all checks pass:
- `cargo fmt --all -- --check`
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used`
- `cargo test --package nu-explore --lib cursor`
---
 crates/nu-explore/src/views/cursor/mod.rs | 24 ++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/crates/nu-explore/src/views/cursor/mod.rs b/crates/nu-explore/src/views/cursor/mod.rs
index 4c37b70977..638b979897 100644
--- a/crates/nu-explore/src/views/cursor/mod.rs
+++ b/crates/nu-explore/src/views/cursor/mod.rs
@@ -36,7 +36,7 @@ impl Cursor {
 
     /// The max position the cursor can be at
     pub fn end(&self) -> usize {
-        self.size - 1
+        self.size.saturating_sub(1)
     }
 
     /// Set the position to a specific value within the bounds [0, end]
@@ -121,4 +121,26 @@ mod tests {
         cursor.move_backward(3);
         assert_eq!(cursor.position, 0);
     }
+
+    #[test]
+    fn test_cursor_size_zero_handling() {
+        let cursor = Cursor::new(0);
+        assert_eq!(cursor.end(), 0);
+
+        let mut cursor = Cursor::new(0);
+        cursor.move_forward(1);
+        assert_eq!(cursor.position, 0);
+
+        cursor.move_backward(1);
+        assert_eq!(cursor.position, 0);
+    }
+
+    #[test]
+    fn test_cursor_size_one() {
+        let mut cursor = Cursor::new(1);
+        assert_eq!(cursor.end(), 0);
+
+        cursor.move_forward(1);
+        assert_eq!(cursor.position, 0);
+    }
 }

From 16e174be7e050b3c929b65ba6f6b8ae5120a5a96 Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Tue, 7 Jan 2025 23:29:39 +0300
Subject: [PATCH 0895/1072] fix nuon conversions of range values (#14687)

# Description
Currently the step size of range values are discarded when converting to
nuon. This PR fixes that and makes `to nuon | from nuon` round trips
work.

# User-Facing Changes
`to nuon` conversion of `range` values now include the step size

# Tests + Formatting
Added some additional tests to cover inclusive/exclusive integer/float
and step size cases.
---
 .../tests/format_conversions/nuon.rs          | 59 ++++++++++++++-----
 crates/nu-protocol/src/value/format.rs        | 16 +++++
 crates/nu-protocol/src/value/mod.rs           |  1 +
 crates/nu-protocol/src/value/range.rs         | 29 +++++----
 crates/nuon/src/to.rs                         | 50 +---------------
 5 files changed, 82 insertions(+), 73 deletions(-)
 create mode 100644 crates/nu-protocol/src/value/format.rs

diff --git a/crates/nu-command/tests/format_conversions/nuon.rs b/crates/nu-command/tests/format_conversions/nuon.rs
index a7a423a0d6..ca23e6823b 100644
--- a/crates/nu-command/tests/format_conversions/nuon.rs
+++ b/crates/nu-command/tests/format_conversions/nuon.rs
@@ -179,27 +179,56 @@ fn to_nuon_records() {
 
 #[test]
 fn to_nuon_range() {
-    let actual = nu!(pipeline(
-        r#"
-            1..42
-            | to nuon
-        "#
-    ));
-
+    let actual = nu!(r#"1..42 | to nuon"#);
     assert_eq!(actual.out, "1..42");
+
+    let actual = nu!(r#"1..<42 | to nuon"#);
+    assert_eq!(actual.out, "1..<42");
+
+    let actual = nu!(r#"1..4..42 | to nuon"#);
+    assert_eq!(actual.out, "1..4..42");
+
+    let actual = nu!(r#"1..4..<42 | to nuon"#);
+    assert_eq!(actual.out, "1..4..<42");
+
+    let actual = nu!(r#"1.0..42.0 | to nuon"#);
+    assert_eq!(actual.out, "1.0..42.0");
+
+    let actual = nu!(r#"1.0..<42.0 | to nuon"#);
+    assert_eq!(actual.out, "1.0..<42.0");
+
+    let actual = nu!(r#"1.0..4.0..42.0 | to nuon"#);
+    assert_eq!(actual.out, "1.0..4.0..42.0");
+
+    let actual = nu!(r#"1.0..4.0..<42.0 | to nuon"#);
+    assert_eq!(actual.out, "1.0..4.0..<42.0");
 }
 
 #[test]
 fn from_nuon_range() {
-    let actual = nu!(pipeline(
-        r#"
-            "1..42"
-            | from nuon
-            | describe
-        "#
-    ));
+    let actual = nu!(r#"'1..42' | from nuon | to nuon"#);
+    assert_eq!(actual.out, "1..42");
 
-    assert_eq!(actual.out, "range");
+    let actual = nu!(r#"'1..<42' | from nuon | to nuon"#);
+    assert_eq!(actual.out, "1..<42");
+
+    let actual = nu!(r#"'1..4..42' | from nuon | to nuon"#);
+    assert_eq!(actual.out, "1..4..42");
+
+    let actual = nu!(r#"'1..4..<42' | from nuon | to nuon"#);
+    assert_eq!(actual.out, "1..4..<42");
+
+    let actual = nu!(r#"'1.0..42.0' | from nuon | to nuon"#);
+    assert_eq!(actual.out, "1.0..42.0");
+
+    let actual = nu!(r#"'1.0..<42.0' | from nuon | to nuon"#);
+    assert_eq!(actual.out, "1.0..<42.0");
+
+    let actual = nu!(r#"'1.0..4.0..42.0' | from nuon | to nuon"#);
+    assert_eq!(actual.out, "1.0..4.0..42.0");
+
+    let actual = nu!(r#"'1.0..4.0..<42.0' | from nuon | to nuon"#);
+    assert_eq!(actual.out, "1.0..4.0..<42.0");
 }
 
 #[test]
diff --git a/crates/nu-protocol/src/value/format.rs b/crates/nu-protocol/src/value/format.rs
new file mode 100644
index 0000000000..a4f07ffdf6
--- /dev/null
+++ b/crates/nu-protocol/src/value/format.rs
@@ -0,0 +1,16 @@
+use std::fmt::Display;
+
+/// A f64 wrapper that formats whole numbers with a decimal point.
+pub struct ObviousFloat(pub f64);
+
+impl Display for ObviousFloat {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        let val = self.0;
+        // This serialises these as 'nan', 'inf' and '-inf', respectively.
+        if val.round() == val && val.is_finite() {
+            write!(f, "{}.0", val)
+        } else {
+            write!(f, "{}", val)
+        }
+    }
+}
diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs
index 09b9a5f60a..b9c942d3b0 100644
--- a/crates/nu-protocol/src/value/mod.rs
+++ b/crates/nu-protocol/src/value/mod.rs
@@ -8,6 +8,7 @@ mod range;
 #[cfg(test)]
 mod test_derive;
 
+pub mod format;
 pub mod record;
 pub use custom_value::CustomValue;
 pub use duration::*;
diff --git a/crates/nu-protocol/src/value/range.rs b/crates/nu-protocol/src/value/range.rs
index 77aa5a60ef..c4d6d4655e 100644
--- a/crates/nu-protocol/src/value/range.rs
+++ b/crates/nu-protocol/src/value/range.rs
@@ -183,12 +183,14 @@ mod int_range {
 
     impl Display for IntRange {
         fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            // what about self.step?
-            let start = self.start;
+            write!(f, "{}..", self.start)?;
+            if self.step != 1 {
+                write!(f, "{}..", self.start + self.step)?;
+            }
             match self.end {
-                Bound::Included(end) => write!(f, "{start}..{end}"),
-                Bound::Excluded(end) => write!(f, "{start}..<{end}"),
-                Bound::Unbounded => write!(f, "{start}.."),
+                Bound::Included(end) => write!(f, "{end}"),
+                Bound::Excluded(end) => write!(f, "<{end}"),
+                Bound::Unbounded => Ok(()),
             }
         }
     }
@@ -228,7 +230,10 @@ mod int_range {
 }
 
 mod float_range {
-    use crate::{ast::RangeInclusion, IntRange, Range, ShellError, Signals, Span, Value};
+    use crate::{
+        ast::RangeInclusion, format::ObviousFloat, IntRange, Range, ShellError, Signals, Span,
+        Value,
+    };
     use serde::{Deserialize, Serialize};
     use std::{cmp::Ordering, fmt::Display, ops::Bound};
 
@@ -434,12 +439,14 @@ mod float_range {
 
     impl Display for FloatRange {
         fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            // what about self.step?
-            let start = self.start;
+            write!(f, "{}..", ObviousFloat(self.start))?;
+            if self.step != 1f64 {
+                write!(f, "{}..", ObviousFloat(self.start + self.step))?;
+            }
             match self.end {
-                Bound::Included(end) => write!(f, "{start}..{end}"),
-                Bound::Excluded(end) => write!(f, "{start}..<{end}"),
-                Bound::Unbounded => write!(f, "{start}.."),
+                Bound::Included(end) => write!(f, "{}", ObviousFloat(end)),
+                Bound::Excluded(end) => write!(f, "<{}", ObviousFloat(end)),
+                Bound::Unbounded => Ok(()),
             }
         }
     }
diff --git a/crates/nuon/src/to.rs b/crates/nuon/src/to.rs
index 13244bfdcd..332dcaf98e 100644
--- a/crates/nuon/src/to.rs
+++ b/crates/nuon/src/to.rs
@@ -1,10 +1,9 @@
 use core::fmt::Write;
 use nu_engine::get_columns;
+use nu_protocol::format::ObviousFloat;
 use nu_protocol::{engine::EngineState, Range, ShellError, Span, Value};
 use nu_utils::{escape_quote_string, needs_quoting};
 
-use std::ops::Bound;
-
 /// control the way Nushell [`Value`] is converted to NUON data
 pub enum ToStyle {
     /// no indentation at all
@@ -138,14 +137,7 @@ fn value_to_string(
         Value::Error { error, .. } => Err(*error.clone()),
         // FIXME: make filesizes use the shortest lossless representation.
         Value::Filesize { val, .. } => Ok(format!("{}b", val.get())),
-        Value::Float { val, .. } => {
-            // This serialises these as 'nan', 'inf' and '-inf', respectively.
-            if &val.round() == val && val.is_finite() {
-                Ok(format!("{}.0", *val))
-            } else {
-                Ok(val.to_string())
-            }
-        }
+        Value::Float { val, .. } => Ok(ObviousFloat(*val).to_string()),
         Value::Int { val, .. } => Ok(val.to_string()),
         Value::List { vals, .. } => {
             let headers = get_columns(vals);
@@ -213,43 +205,7 @@ fn value_to_string(
         Value::Nothing { .. } => Ok("null".to_string()),
         Value::Range { val, .. } => match **val {
             Range::IntRange(range) => Ok(range.to_string()),
-            Range::FloatRange(range) => {
-                let start = value_to_string(
-                    engine_state,
-                    &Value::float(range.start(), span),
-                    span,
-                    depth + 1,
-                    indent,
-                    serialize_types,
-                )?;
-                match range.end() {
-                    Bound::Included(end) => Ok(format!(
-                        "{}..{}",
-                        start,
-                        value_to_string(
-                            engine_state,
-                            &Value::float(end, span),
-                            span,
-                            depth + 1,
-                            indent,
-                            serialize_types,
-                        )?
-                    )),
-                    Bound::Excluded(end) => Ok(format!(
-                        "{}..<{}",
-                        start,
-                        value_to_string(
-                            engine_state,
-                            &Value::float(end, span),
-                            span,
-                            depth + 1,
-                            indent,
-                            serialize_types,
-                        )?
-                    )),
-                    Bound::Unbounded => Ok(format!("{start}..",)),
-                }
-            }
+            Range::FloatRange(range) => Ok(range.to_string()),
         },
         Value::Record { val, .. } => {
             let mut collection = vec![];

From dc52a6fec5be7bec59582e8e676d890aae5628a4 Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Tue, 7 Jan 2025 22:44:55 +0100
Subject: [PATCH 0896/1072] Handle permission denied error at
 `nu_engine::glob_from` (#14679)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

#14528 mentioned that trying to `open` a file in a directory where you
don't have read access results in a "file not found" error. I
investigated the error and could find the root issue in the
`nu_engine::glob_from` function. It uses `std::path::Path::canonicalize`
some layers down and that may return an `std::io::Error`. All these
errors were handled as "directory not found" which will be translated to
"file not found" in the `open` command. To fix this, I handled the
`PermssionDenied` error kind of the io error and passed that down. Now
trying to `open` a file from a directory with no permissions returns a
"permission denied" error.

Before/After:

![image](https://github.com/user-attachments/assets/168cea24-36a6-4c66-98c9-f7ccfa2ea826)

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

That error is fixed, so correct error message.

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->

fixes #14528
---
 crates/nu-command/src/filesystem/open.rs | 15 ++++++++++++
 crates/nu-engine/src/glob_from.rs        | 31 +++++++++++++++++-------
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/crates/nu-command/src/filesystem/open.rs b/crates/nu-command/src/filesystem/open.rs
index 7cbce3902b..db00f35d6d 100644
--- a/crates/nu-command/src/filesystem/open.rs
+++ b/crates/nu-command/src/filesystem/open.rs
@@ -91,6 +91,21 @@ impl Command for Open {
                         file: path.item.to_string(),
                         span,
                     },
+                    // that particular error in `nu_engine::glob_from` doesn't have a span attached
+                    // to it, so let's add it
+                    ShellError::GenericError {
+                        error,
+                        msg,
+                        span: _,
+                        help,
+                        inner,
+                    } if error.as_str() == "Permission denied" => ShellError::GenericError {
+                        error,
+                        msg,
+                        span: Some(arg_span),
+                        help,
+                        inner,
+                    },
                     _ => err,
                 })?
                 .1
diff --git a/crates/nu-engine/src/glob_from.rs b/crates/nu-engine/src/glob_from.rs
index 376b3c2baf..3765ab7c7b 100644
--- a/crates/nu-engine/src/glob_from.rs
+++ b/crates/nu-engine/src/glob_from.rs
@@ -3,6 +3,7 @@ use nu_path::{canonicalize_with, expand_path_with};
 use nu_protocol::{NuGlob, ShellError, Span, Spanned};
 use std::{
     fs,
+    io::ErrorKind,
     path::{Component, Path, PathBuf},
 };
 
@@ -70,20 +71,32 @@ pub fn glob_from(
         if is_symlink {
             (path.parent().map(|parent| parent.to_path_buf()), path)
         } else {
-            let path = if let Ok(p) = canonicalize_with(path.clone(), cwd) {
-                if nu_glob::is_glob(p.to_string_lossy().as_ref()) {
+            let path = match canonicalize_with(path.clone(), cwd) {
+                Ok(p) if nu_glob::is_glob(p.to_string_lossy().as_ref()) => {
                     // our path might contain glob metacharacters too.
                     // in such case, we need to escape our path to make
                     // glob work successfully
                     PathBuf::from(nu_glob::Pattern::escape(&p.to_string_lossy()))
-                } else {
-                    p
                 }
-            } else {
-                return Err(ShellError::DirectoryNotFound {
-                    dir: path.to_string_lossy().to_string(),
-                    span: pattern.span,
-                });
+                Ok(p) => p,
+                Err(err) => {
+                    return match err.kind() {
+                        ErrorKind::PermissionDenied => Err(ShellError::GenericError {
+                            error: "Permission denied".into(),
+                            msg: err.to_string(),
+                            span: None,
+                            help: None,
+                            inner: vec![],
+                        }),
+                        // Previously, all these errors were treated as "directory not found."
+                        // Now, permission denied errors are handled separately.
+                        // TODO: Refine handling of I/O errors for more precise responses.
+                        _ => Err(ShellError::DirectoryNotFound {
+                            dir: path.to_string_lossy().to_string(),
+                            span: pattern.span,
+                        }),
+                    };
+                }
             };
             (path.parent().map(|parent| parent.to_path_buf()), path)
         }

From cc4d4acc6b3488bef685a63c6418229c64f4599d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Jan 2025 13:53:02 +0000
Subject: [PATCH 0897/1072] Bump git2 from 0.19.0 to 0.20.0 (#14776)

---
 Cargo.lock                        | 8 ++++----
 crates/nu_plugin_gstat/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 68234d6b4e..b6012d4e4b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2198,9 +2198,9 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "git2"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724"
+checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff"
 dependencies = [
  "bitflags 2.6.0",
  "libc",
@@ -3023,9 +3023,9 @@ dependencies = [
 
 [[package]]
 name = "libgit2-sys"
-version = "0.17.0+1.8.1"
+version = "0.18.0+1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224"
+checksum = "e1a117465e7e1597e8febea8bb0c410f1c7fb93b1e1cddf34363f8390367ffec"
 dependencies = [
  "cc",
  "libc",
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index 00b7b255e8..6bfeea838b 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -19,4 +19,4 @@ bench = false
 nu-plugin = { path = "../nu-plugin", version = "0.101.1" }
 nu-protocol = { path = "../nu-protocol", version = "0.101.1" }
 
-git2 = "0.19"
\ No newline at end of file
+git2 = "0.20"
\ No newline at end of file

From d894c8befef29ad514ee9789e862e0fd778b8a35 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Wed, 8 Jan 2025 15:11:47 +0100
Subject: [PATCH 0898/1072] Bump typos workflow to `1.29.4` (#14782)

Fix garbage name to snakecase

Supersedes #14779
---
 .github/workflows/typos.yml                  | 2 +-
 crates/nu-command/src/generators/seq_date.rs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index ecbd9b2134..50d8edbc79 100644
--- 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.28.4
+        uses: crate-ci/typos@v1.29.4
diff --git a/crates/nu-command/src/generators/seq_date.rs b/crates/nu-command/src/generators/seq_date.rs
index 7369878d1d..4d378a73bb 100644
--- a/crates/nu-command/src/generators/seq_date.rs
+++ b/crates/nu-command/src/generators/seq_date.rs
@@ -128,12 +128,12 @@ impl Command for SeqDate {
         let days: Option<Spanned<i64>> = call.get_flag(engine_state, stack, "days")?;
         let reverse = call.has_flag(engine_state, stack, "reverse")?;
 
-        let outformat = match output_format {
+        let out_format = match output_format {
             Some(s) => Some(Value::string(s.item, s.span)),
             _ => None,
         };
 
-        let informat = match input_format {
+        let in_format = match input_format {
             Some(s) => Some(Value::string(s.item, s.span)),
             _ => None,
         };
@@ -161,7 +161,7 @@ impl Command for SeqDate {
         }
 
         Ok(run_seq_dates(
-            outformat, informat, begin, end, inc, day_count, rev, call.head,
+            out_format, in_format, begin, end, inc, day_count, rev, call.head,
         )?
         .into_pipeline_data())
     }

From 214714e0ab424a5a7408ecc71ed0643f80cbc258 Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Wed, 8 Jan 2025 17:09:47 -0500
Subject: [PATCH 0899/1072] Add run-time type checking for command pipeline
 input (#14741)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

This PR adds type checking of all command input types at run-time.
Generally, these errors should be caught by the parser, but sometimes we
can't know the type of a value at parse-time. The simplest example is
using the `echo` command, which has an output type of `any`, so
prefixing a literal with `echo` will bypass parse-time type checking.

Before this PR, each command has to individually check its input types.
This can result in scenarios where the input/output types don't match
the actual command behavior. This can cause valid usage with an
non-`any` type to become a parse-time error if a command is missing that
type in its pipeline input/output (`drop nth` and `history import` do
this before this PR). Alternatively, a command may not list a type in
its input/output types, but doesn't actually reject that type in its
code, which can have unintended side effects (`get` does this on an
empty pipeline input, and `sort` used to before #13154).

After this PR, the type of the pipeline input is checked to ensure it
matches one of the input types listed in the proceeding command's
input/output types. While each of the issues in the "before this PR"
section could be addressed with each command individually, this PR
solves this issue for _all_ commands.

**This will likely cause some breakage**, as some commands have
incorrect input/output types, and should be adjusted. Also, some scripts
may have erroneous usage of commands. In writing this PR, I discovered
that `toolkit.nu` was passing `null` values to `str join`, which doesn't
accept nothing types (if folks think it should, we can adjust it in this
PR or in a different PR). I found some issues in the standard library
and its tests. I also found that carapace's vendor script had an
incorrect chaining of `get -i`:

```nushell
let expanded_alias = (scope aliases | where name == $spans.0 | get -i 0 | get -i expansion)
```

Before this PR, if the `get -i 0` ever actually did evaluate to `null`,
the second `get` invocation would error since `get` doesn't operate on
`null` values. After this PR, this is immediately a run-time error,
alerting the user to the problematic code. As a side note, we'll need to
PR this fix (`get -i 0 | get -i expansion` -> `get -i 0.expansion`) to
carapace.

A notable exception to the type checking is commands with input type of
`nothing -> <type>`. In this case, any input type is allowed. This
allows piping values into the command without an error being thrown. For
example, `123 | echo $in` would be an error without this exception.
Additionally, custom types bypass type checking (I believe this also
happens during parsing, but not certain)

I added a `is_subtype` method to `Value` and `PipelineData`. It
functions slightly differently than `get_type().is_subtype()`, as noted
in the doccomments. Notably, it respects structural typing of lists and
tables. For example, the type of a value `[{a: 123} {a: 456, b: 789}]`
is a subtype of `table<a: int>`, whereas the type returned by
`Value::get_type` is a `list<any>`. Similarly, `PipelineData` has some
special handling for `ListStream`s and `ByteStream`s. The latter was
needed for this PR to work properly with external commands.

Here's some examples.

Before:
```nu
1..2 | drop nth 1
Error: nu::parser::input_type_mismatch

  × Command does not support range input.
   ╭─[entry #9:1:8]
 1 │ 1..2 | drop nth 1
   ·        ────┬───
   ·            ╰── command doesn't support range input
   ╰────

echo 1..2 | drop nth 1
# => ╭───┬───╮
# => │ 0 │ 1 │
# => ╰───┴───╯
```

After this PR, I've adjusted `drop nth`'s input/output types to accept
range input.

Before this PR, zip accepted any value despite not being listed in its
input/output types. This caused different behavior depending on if you
triggered a parse error or not:
```nushell
1 | zip [2]
# => Error: nu::parser::input_type_mismatch
# =>
# =>   × Command does not support int input.
# =>    ╭─[entry #3:1:5]
# =>  1 │ 1 | zip [2]
# =>    ·     ─┬─
# =>    ·      ╰── command doesn't support int input
# =>    ╰────
echo 1 | zip [2]
# => ╭───┬───────────╮
# => │ 0 │ ╭───┬───╮ │
# => │   │ │ 0 │ 1 │ │
# => │   │ │ 1 │ 2 │ │
# => │   │ ╰───┴───╯ │
# => ╰───┴───────────╯
```

After this PR, it works the same in both cases. For cases like this, if
we do decide we want `zip` or other commands to accept any input value,
then we should explicitly add that to the input types.
```nushell
1 | zip [2]
# => Error: nu::parser::input_type_mismatch
# =>
# =>   × Command does not support int input.
# =>    ╭─[entry #3:1:5]
# =>  1 │ 1 | zip [2]
# =>    ·     ─┬─
# =>    ·      ╰── command doesn't support int input
# =>    ╰────
echo 1 | zip [2]
# => Error: nu::shell::only_supports_this_input_type
# =>
# =>   × Input type not supported.
# =>    ╭─[entry #14:2:6]
# =>  2 │ echo 1 | zip [2]
# =>    ·      ┬   ─┬─
# =>    ·      │    ╰── only list<any> and range input data is supported
# =>    ·      ╰── input type: int
# =>    ╰────
```

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

**Breaking change**: The type of a command's input is now checked
against the input/output types of that command at run-time. While these
errors should mostly be caught at parse-time, in cases where they can't
be detected at parse-time they will be caught at run-time instead. This
applies to both internal commands and custom commands.

Example function and corresponding parse-time error (same before and
after PR):
```nushell
def foo []: int -> nothing {
  print $"my cool int is ($in)"
}

1 | foo
# => my cool int is 1

"evil string" | foo
# => Error: nu::parser::input_type_mismatch
# =>
# =>   × Command does not support string input.
# =>    ╭─[entry #16:1:17]
# =>  1 │ "evil string" | foo
# =>    ·                 ─┬─
# =>    ·                  ╰── command doesn't support string input
# =>    ╰────
# =>
```

Before:
```nu
echo "evil string" | foo
# => my cool int is evil string
```

After:
```nu
echo "evil string" | foo
# => Error: nu::shell::only_supports_this_input_type
# =>
# =>   × Input type not supported.
# =>    ╭─[entry #17:1:6]
# =>  1 │ echo "evil string" | foo
# =>    ·      ──────┬──────   ─┬─
# =>    ·            │          ╰── only int input data is supported
# =>    ·            ╰── input type: string
# =>    ╰────
```

Known affected internal commands which erroneously accepted any type:
* `str join`
* `zip`
* `reduce`

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`


# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
* Play whack-a-mole with the commands and scripts this will inevitably
break
---
 .../src/commands/history/history_import.rs    |   1 +
 .../nu-cmd-extra/src/extra/filters/rotate.rs  |   3 +
 crates/nu-cmd-lang/src/core_commands/do_.rs   |  23 +--
 crates/nu-cmd-lang/src/example_support.rs     |  12 +-
 .../nu-command/src/conversions/into/string.rs |   1 +
 crates/nu-command/src/filters/drop/nth.rs     |   9 +-
 crates/nu-command/src/filters/get.rs          |  15 ++
 crates/nu-command/src/filters/headers.rs      |   9 +-
 crates/nu-command/src/filters/reject.rs       |   9 +
 crates/nu-command/src/formats/from/csv.rs     |   1 -
 crates/nu-command/src/formats/from/tsv.rs     |   5 +-
 crates/nu-command/src/system/nu_check.rs      |   1 +
 crates/nu-command/tests/commands/group_by.rs  |   4 +-
 crates/nu-command/tests/commands/reduce.rs    |   2 +-
 crates/nu-command/tests/commands/split_by.rs  |  61 ++++++
 .../tests/format_conversions/csv.rs           |   2 +-
 crates/nu-engine/src/eval.rs                  |  27 +--
 crates/nu-engine/src/eval_ir.rs               |  83 +++++++-
 .../nu-protocol/src/pipeline/pipeline_data.rs |  40 ++++
 crates/nu-protocol/src/ty.rs                  |  20 +-
 crates/nu-protocol/src/value/mod.rs           | 190 ++++++++++++++++++
 crates/nu-std/testing.nu                      |   2 +-
 crates/nu-std/tests/test_iter.nu              |   4 +-
 .../src/dataframe/command/boolean/when.rs     |  11 +-
 toolkit.nu                                    |  12 +-
 25 files changed, 455 insertions(+), 92 deletions(-)
 create mode 100644 crates/nu-command/tests/commands/split_by.rs

diff --git a/crates/nu-cli/src/commands/history/history_import.rs b/crates/nu-cli/src/commands/history/history_import.rs
index d56bc1da03..7666bd7eb7 100644
--- a/crates/nu-cli/src/commands/history/history_import.rs
+++ b/crates/nu-cli/src/commands/history/history_import.rs
@@ -35,6 +35,7 @@ Note that history item IDs are ignored when importing from file."#
             .category(Category::History)
             .input_output_types(vec![
                 (Type::Nothing, Type::Nothing),
+                (Type::String, Type::Nothing),
                 (Type::List(Box::new(Type::String)), Type::Nothing),
                 (Type::table(), Type::Nothing),
             ])
diff --git a/crates/nu-cmd-extra/src/extra/filters/rotate.rs b/crates/nu-cmd-extra/src/extra/filters/rotate.rs
index 2ebe6478e4..4c25e82d37 100644
--- a/crates/nu-cmd-extra/src/extra/filters/rotate.rs
+++ b/crates/nu-cmd-extra/src/extra/filters/rotate.rs
@@ -13,6 +13,8 @@ impl Command for Rotate {
             .input_output_types(vec![
                 (Type::record(), Type::table()),
                 (Type::table(), Type::table()),
+                (Type::list(Type::Any), Type::table()),
+                (Type::String, Type::table()),
             ])
             .switch("ccw", "rotate counter clockwise", None)
             .rest(
@@ -21,6 +23,7 @@ impl Command for Rotate {
                 "the names to give columns once rotated",
             )
             .category(Category::Filters)
+            .allow_variants_without_examples(true)
     }
 
     fn description(&self) -> &str {
diff --git a/crates/nu-cmd-lang/src/core_commands/do_.rs b/crates/nu-cmd-lang/src/core_commands/do_.rs
index 05d22c6cea..62ddea5324 100644
--- a/crates/nu-cmd-lang/src/core_commands/do_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/do_.rs
@@ -294,22 +294,13 @@ fn bind_args_to(
             .expect("internal error: all custom parameters must have var_ids");
         if let Some(result) = val_iter.next() {
             let param_type = param.shape.to_type();
-            if required && !result.get_type().is_subtype(&param_type) {
-                // need to check if result is an empty list, and param_type is table or list
-                // nushell needs to pass type checking for the case.
-                let empty_list_matches = result
-                    .as_list()
-                    .map(|l| l.is_empty() && matches!(param_type, Type::List(_) | Type::Table(_)))
-                    .unwrap_or(false);
-
-                if !empty_list_matches {
-                    return Err(ShellError::CantConvert {
-                        to_type: param.shape.to_type().to_string(),
-                        from_type: result.get_type().to_string(),
-                        span: result.span(),
-                        help: None,
-                    });
-                }
+            if required && !result.is_subtype_of(&param_type) {
+                return Err(ShellError::CantConvert {
+                    to_type: param.shape.to_type().to_string(),
+                    from_type: result.get_type().to_string(),
+                    span: result.span(),
+                    help: None,
+                });
             }
             stack.add_var(var_id, result);
         } else if let Some(value) = &param.default_value {
diff --git a/crates/nu-cmd-lang/src/example_support.rs b/crates/nu-cmd-lang/src/example_support.rs
index c4d532058a..a26876b78c 100644
--- a/crates/nu-cmd-lang/src/example_support.rs
+++ b/crates/nu-cmd-lang/src/example_support.rs
@@ -19,18 +19,15 @@ pub fn check_example_input_and_output_types_match_command_signature(
 
     // Skip tests that don't have results to compare to
     if let Some(example_output) = example.result.as_ref() {
-        if let Some(example_input_type) =
+        if let Some(example_input) =
             eval_pipeline_without_terminal_expression(example.example, cwd, engine_state)
         {
-            let example_input_type = example_input_type.get_type();
-            let example_output_type = example_output.get_type();
-
             let example_matches_signature =
                 signature_input_output_types
                     .iter()
                     .any(|(sig_in_type, sig_out_type)| {
-                        example_input_type.is_subtype(sig_in_type)
-                            && example_output_type.is_subtype(sig_out_type)
+                        example_input.is_subtype_of(sig_in_type)
+                            && example_output.is_subtype_of(sig_out_type)
                             && {
                                 witnessed_type_transformations
                                     .insert((sig_in_type.clone(), sig_out_type.clone()));
@@ -38,6 +35,9 @@ pub fn check_example_input_and_output_types_match_command_signature(
                             }
                     });
 
+            let example_input_type = example_input.get_type();
+            let example_output_type = example_output.get_type();
+
             // The example type checks as a cell path operation if both:
             // 1. The command is declared to operate on cell paths.
             // 2. The example_input_type is list or record or table, and the example
diff --git a/crates/nu-command/src/conversions/into/string.rs b/crates/nu-command/src/conversions/into/string.rs
index b116de9752..f98f3aa5f8 100644
--- a/crates/nu-command/src/conversions/into/string.rs
+++ b/crates/nu-command/src/conversions/into/string.rs
@@ -38,6 +38,7 @@ impl Command for SubCommand {
                 (Type::Filesize, Type::String),
                 (Type::Date, Type::String),
                 (Type::Duration, Type::String),
+                (Type::Range, Type::String),
                 (
                     Type::List(Box::new(Type::Any)),
                     Type::List(Box::new(Type::String)),
diff --git a/crates/nu-command/src/filters/drop/nth.rs b/crates/nu-command/src/filters/drop/nth.rs
index 282aa41c1d..02d97b70a3 100644
--- a/crates/nu-command/src/filters/drop/nth.rs
+++ b/crates/nu-command/src/filters/drop/nth.rs
@@ -13,10 +13,11 @@ impl Command for DropNth {
 
     fn signature(&self) -> Signature {
         Signature::build("drop nth")
-            .input_output_types(vec![(
-                Type::List(Box::new(Type::Any)),
-                Type::List(Box::new(Type::Any)),
-            )])
+            .input_output_types(vec![
+                (Type::Range, Type::list(Type::Number)),
+                (Type::list(Type::Any), Type::list(Type::Any)),
+            ])
+            .allow_variants_without_examples(true)
             .required(
                 "row number or row range",
                 // FIXME: we can make this accept either Int or Range when we can compose SyntaxShapes
diff --git a/crates/nu-command/src/filters/get.rs b/crates/nu-command/src/filters/get.rs
index 6dfc66ba56..54f99386af 100644
--- a/crates/nu-command/src/filters/get.rs
+++ b/crates/nu-command/src/filters/get.rs
@@ -30,6 +30,7 @@ If multiple cell paths are given, this will produce a list of values."#
                 ),
                 (Type::table(), Type::Any),
                 (Type::record(), Type::Any),
+                (Type::Nothing, Type::Nothing),
             ])
             .required(
                 "cell_path",
@@ -163,6 +164,20 @@ fn action(
         }
     }
 
+    match input {
+        PipelineData::Empty => return Err(ShellError::PipelineEmpty { dst_span: span }),
+        // Allow chaining of get -i
+        PipelineData::Value(val @ Value::Nothing { .. }, ..) if !ignore_errors => {
+            return Err(ShellError::OnlySupportsThisInputType {
+                exp_input_type: "table or record".into(),
+                wrong_type: "nothing".into(),
+                dst_span: span,
+                src_span: val.span(),
+            })
+        }
+        _ => (),
+    }
+
     if rest.is_empty() {
         follow_cell_path_into_stream(input, signals, cell_path.members, span, !sensitive)
     } else {
diff --git a/crates/nu-command/src/filters/headers.rs b/crates/nu-command/src/filters/headers.rs
index 1a9de5367e..6798b3142a 100644
--- a/crates/nu-command/src/filters/headers.rs
+++ b/crates/nu-command/src/filters/headers.rs
@@ -11,14 +11,7 @@ impl Command for Headers {
 
     fn signature(&self) -> Signature {
         Signature::build(self.name())
-            .input_output_types(vec![
-                (Type::table(), Type::table()),
-                (
-                    // Tables with missing values are List<Any>
-                    Type::List(Box::new(Type::Any)),
-                    Type::table(),
-                ),
-            ])
+            .input_output_types(vec![(Type::table(), Type::table())])
             .category(Category::Filters)
     }
 
diff --git a/crates/nu-command/src/filters/reject.rs b/crates/nu-command/src/filters/reject.rs
index 058ad1d70b..e15c6b65e4 100644
--- a/crates/nu-command/src/filters/reject.rs
+++ b/crates/nu-command/src/filters/reject.rs
@@ -15,6 +15,7 @@ impl Command for Reject {
             .input_output_types(vec![
                 (Type::record(), Type::record()),
                 (Type::table(), Type::table()),
+                (Type::list(Type::Any), Type::list(Type::Any)),
             ])
             .switch(
                 "ignore-errors",
@@ -161,6 +162,14 @@ impl Command for Reject {
                     Value::test_record(record! { "name" => Value::test_string("Cargo.lock") }),
                 ])),
             },
+            Example {
+                description: "Reject item in list",
+                example: "[1 2 3] | reject 1",
+                result: Some(Value::test_list(vec![
+                    Value::test_int(1),
+                    Value::test_int(3),
+                ])),
+            },
         ]
     }
 }
diff --git a/crates/nu-command/src/formats/from/csv.rs b/crates/nu-command/src/formats/from/csv.rs
index 74b9bcd33f..8ec9ac49d3 100644
--- a/crates/nu-command/src/formats/from/csv.rs
+++ b/crates/nu-command/src/formats/from/csv.rs
@@ -13,7 +13,6 @@ impl Command for FromCsv {
         Signature::build("from csv")
             .input_output_types(vec![
                 (Type::String, Type::table()),
-                (Type::String, Type::list(Type::Any)),
             ])
             .named(
                 "separator",
diff --git a/crates/nu-command/src/formats/from/tsv.rs b/crates/nu-command/src/formats/from/tsv.rs
index 2d77342307..39fae9c010 100644
--- a/crates/nu-command/src/formats/from/tsv.rs
+++ b/crates/nu-command/src/formats/from/tsv.rs
@@ -11,10 +11,7 @@ impl Command for FromTsv {
 
     fn signature(&self) -> Signature {
         Signature::build("from tsv")
-            .input_output_types(vec![
-                (Type::String, Type::table()),
-                (Type::String, Type::list(Type::Any)),
-            ])
+            .input_output_types(vec![(Type::String, Type::table())])
             .named(
                 "comment",
                 SyntaxShape::String,
diff --git a/crates/nu-command/src/system/nu_check.rs b/crates/nu-command/src/system/nu_check.rs
index 945440cca4..ff3047a490 100644
--- a/crates/nu-command/src/system/nu_check.rs
+++ b/crates/nu-command/src/system/nu_check.rs
@@ -14,6 +14,7 @@ impl Command for NuCheck {
     fn signature(&self) -> Signature {
         Signature::build("nu-check")
             .input_output_types(vec![
+                (Type::Nothing, Type::Bool),
                 (Type::String, Type::Bool),
                 (Type::List(Box::new(Type::Any)), Type::Bool),
             ])
diff --git a/crates/nu-command/tests/commands/group_by.rs b/crates/nu-command/tests/commands/group_by.rs
index 232bbcba0f..a5b6328128 100644
--- a/crates/nu-command/tests/commands/group_by.rs
+++ b/crates/nu-command/tests/commands/group_by.rs
@@ -23,7 +23,7 @@ fn groups() {
 
 #[test]
 fn errors_if_given_unknown_column_name() {
-    let sample = r#"{
+    let sample = r#"[{
     "nu": {
         "committers": [
             {"name": "Andrés N. Robalino"},
@@ -41,7 +41,7 @@ fn errors_if_given_unknown_column_name() {
             ["punto", "cero"]
         ]
     }
-}
+}]
 "#;
 
     let actual = nu!(pipeline(&format!(
diff --git a/crates/nu-command/tests/commands/reduce.rs b/crates/nu-command/tests/commands/reduce.rs
index cf58d093bb..4e3c6caff5 100644
--- a/crates/nu-command/tests/commands/reduce.rs
+++ b/crates/nu-command/tests/commands/reduce.rs
@@ -114,7 +114,7 @@ fn error_reduce_fold_type_mismatch() {
 fn error_reduce_empty() {
     let actual = nu!(pipeline("reduce { |it, acc| $acc + $it }"));
 
-    assert!(actual.err.contains("needs input"));
+    assert!(actual.err.contains("no input value was piped in"));
 }
 
 #[test]
diff --git a/crates/nu-command/tests/commands/split_by.rs b/crates/nu-command/tests/commands/split_by.rs
new file mode 100644
index 0000000000..a458a01a25
--- /dev/null
+++ b/crates/nu-command/tests/commands/split_by.rs
@@ -0,0 +1,61 @@
+use nu_test_support::fs::Stub::EmptyFile;
+use nu_test_support::playground::Playground;
+use nu_test_support::{nu, pipeline};
+
+#[test]
+fn splits() {
+    let sample = r#"
+                [[first_name, last_name, rusty_at, type];
+                 [Andrés, Robalino, "10/11/2013", A],
+                 [JT, Turner, "10/12/2013", B],
+                 [Yehuda, Katz, "10/11/2013", A]]
+            "#;
+
+    let actual = nu!(pipeline(&format!(
+        r#"
+                  {sample}
+                | group-by rusty_at
+                | split-by type
+                | get A."10/11/2013"
+                | length
+            "#
+    )));
+
+    assert_eq!(actual.out, "2");
+}
+
+#[test]
+fn errors_if_no_input() {
+    Playground::setup("split_by_no_input", |dirs, _sandbox| {
+        let actual = nu!(cwd: dirs.test(), pipeline("split-by type"));
+
+        assert!(actual.err.contains("no input value was piped in"));
+    })
+}
+
+#[test]
+fn errors_if_non_record_input() {
+    Playground::setup("split_by_test_2", |dirs, sandbox| {
+        sandbox.with_files(&[
+            EmptyFile("los.txt"),
+            EmptyFile("tres.txt"),
+            EmptyFile("amigos.txt"),
+            EmptyFile("arepas.clu"),
+        ]);
+
+        let input_mismatch = nu!(cwd: dirs.test(), pipeline("5 | split-by type"));
+
+        assert!(input_mismatch.err.contains("doesn't support int input"));
+
+        let only_supports = nu!(
+            cwd: dirs.test(), pipeline(
+            "
+                ls
+                | get name
+                | split-by type
+            "
+        ));
+
+        assert!(only_supports.err.contains("Input type not supported"));
+    })
+}
diff --git a/crates/nu-command/tests/format_conversions/csv.rs b/crates/nu-command/tests/format_conversions/csv.rs
index 4f50ab1492..c071b3566c 100644
--- a/crates/nu-command/tests/format_conversions/csv.rs
+++ b/crates/nu-command/tests/format_conversions/csv.rs
@@ -394,7 +394,7 @@ fn list_not_table_error() {
         "#
     ));
 
-    assert!(actual.err.contains("can't convert"))
+    assert!(actual.err.contains("Input type not supported"))
 }
 
 #[test]
diff --git a/crates/nu-engine/src/eval.rs b/crates/nu-engine/src/eval.rs
index 0e3917290f..3f47e4a42e 100644
--- a/crates/nu-engine/src/eval.rs
+++ b/crates/nu-engine/src/eval.rs
@@ -8,7 +8,7 @@ use nu_protocol::{
     engine::{Closure, EngineState, Stack},
     eval_base::Eval,
     BlockId, Config, DataSource, IntoPipelineData, PipelineData, PipelineMetadata, ShellError,
-    Span, Type, Value, VarId, ENV_VARIABLE_ID,
+    Span, Value, VarId, ENV_VARIABLE_ID,
 };
 use nu_utils::IgnoreCaseExt;
 use std::sync::Arc;
@@ -65,24 +65,13 @@ pub fn eval_call<D: DebugContext>(
             if let Some(arg) = call.positional_nth(param_idx) {
                 let result = eval_expression::<D>(engine_state, caller_stack, arg)?;
                 let param_type = param.shape.to_type();
-                if required && !result.get_type().is_subtype(&param_type) {
-                    // need to check if result is an empty list, and param_type is table or list
-                    // nushell needs to pass type checking for the case.
-                    let empty_list_matches = result
-                        .as_list()
-                        .map(|l| {
-                            l.is_empty() && matches!(param_type, Type::List(_) | Type::Table(_))
-                        })
-                        .unwrap_or(false);
-
-                    if !empty_list_matches {
-                        return Err(ShellError::CantConvert {
-                            to_type: param.shape.to_type().to_string(),
-                            from_type: result.get_type().to_string(),
-                            span: result.span(),
-                            help: None,
-                        });
-                    }
+                if required && !result.is_subtype_of(&param_type) {
+                    return Err(ShellError::CantConvert {
+                        to_type: param.shape.to_type().to_string(),
+                        from_type: result.get_type().to_string(),
+                        span: result.span(),
+                        help: None,
+                    });
                 }
                 callee_stack.add_var(var_id, result);
             } else if let Some(value) = &param.default_value {
diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index 34e47732b1..0091963b53 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -1009,6 +1009,8 @@ fn eval_call<D: DebugContext>(
     let args_len = caller_stack.arguments.get_len(*args_base);
     let decl = engine_state.get_decl(decl_id);
 
+    check_input_types(&input, decl.signature(), head)?;
+
     // Set up redirect modes
     let mut caller_stack = caller_stack.push_redirection(redirect_out.take(), redirect_err.take());
 
@@ -1246,15 +1248,7 @@ fn gather_arguments(
 
 /// Type check helper. Produces `CantConvert` error if `val` is not compatible with `ty`.
 fn check_type(val: &Value, ty: &Type) -> Result<(), ShellError> {
-    if match val {
-        // An empty list is compatible with any list or table type
-        Value::List { vals, .. } if vals.is_empty() => {
-            matches!(ty, Type::Any | Type::List(_) | Type::Table(_))
-        }
-        // FIXME: the allocation that might be required here is not great, it would be nice to be
-        // able to just directly check whether a value is compatible with a type
-        _ => val.get_type().is_subtype(ty),
-    } {
+    if val.is_subtype_of(ty) {
         Ok(())
     } else {
         Err(ShellError::CantConvert {
@@ -1266,6 +1260,77 @@ fn check_type(val: &Value, ty: &Type) -> Result<(), ShellError> {
     }
 }
 
+/// Type check pipeline input against command's input types
+fn check_input_types(
+    input: &PipelineData,
+    signature: Signature,
+    head: Span,
+) -> Result<(), ShellError> {
+    let io_types = signature.input_output_types;
+
+    // If a command doesn't have any input/output types, then treat command input type as any
+    if io_types.is_empty() {
+        return Ok(());
+    }
+
+    // If a command only has a nothing input type, then allow any input data
+    match io_types.first() {
+        Some((Type::Nothing, _)) if io_types.len() == 1 => {
+            return Ok(());
+        }
+        _ => (),
+    }
+
+    // Errors and custom values bypass input type checking
+    if matches!(
+        input,
+        PipelineData::Value(Value::Error { .. } | Value::Custom { .. }, ..)
+    ) {
+        return Ok(());
+    }
+
+    // Check if the input type is compatible with *any* of the command's possible input types
+    if io_types
+        .iter()
+        .any(|(command_type, _)| input.is_subtype_of(command_type))
+    {
+        return Ok(());
+    }
+
+    let mut input_types = io_types
+        .iter()
+        .map(|(input, _)| input.to_string())
+        .collect::<Vec<String>>();
+
+    let expected_string = match input_types.len() {
+        0 => {
+            return Err(ShellError::NushellFailed {
+                msg: "Command input type strings is empty, despite being non-zero earlier"
+                    .to_string(),
+            })
+        }
+        1 => input_types.swap_remove(0),
+        2 => input_types.join(" and "),
+        _ => {
+            input_types
+                .last_mut()
+                .expect("Vector with length >2 has no elements")
+                .insert_str(0, "and ");
+            input_types.join(", ")
+        }
+    };
+
+    match input {
+        PipelineData::Empty => Err(ShellError::PipelineEmpty { dst_span: head }),
+        _ => Err(ShellError::OnlySupportsThisInputType {
+            exp_input_type: expected_string,
+            wrong_type: input.get_type().to_string(),
+            dst_span: head,
+            src_span: input.span().unwrap_or(Span::unknown()),
+        }),
+    }
+}
+
 /// Get variable from [`Stack`] or [`EngineState`]
 fn get_var(ctx: &EvalContext<'_>, var_id: VarId, span: Span) -> Result<Value, ShellError> {
     match var_id {
diff --git a/crates/nu-protocol/src/pipeline/pipeline_data.rs b/crates/nu-protocol/src/pipeline/pipeline_data.rs
index 8979b76ba9..b9d523b3da 100644
--- a/crates/nu-protocol/src/pipeline/pipeline_data.rs
+++ b/crates/nu-protocol/src/pipeline/pipeline_data.rs
@@ -122,6 +122,46 @@ impl PipelineData {
         }
     }
 
+    /// Determine if the `PipelineData` is a [subtype](https://en.wikipedia.org/wiki/Subtyping) of `other`.
+    ///
+    /// This check makes no effort to collect a stream, so it may be a different result
+    /// than would be returned by calling [`Value::is_subtype()`] on the result of
+    /// [`.into_value()`](Self::into_value).
+    ///
+    /// A `ListStream` acts the same as an empty list type: it is a subtype of any [`list`](Type::List)
+    /// or [`table`](Type::Table) type. After converting to a value, it may become a more specific type.
+    /// For example, a `ListStream` is a subtype of `list<int>` and `list<string>`.
+    /// If calling [`.into_value()`](Self::into_value) results in a `list<int>`,
+    /// then the value would not be a subtype of `list<string>`, in contrast to the original `ListStream`.
+    ///
+    /// A `ByteStream` is a subtype of [`string`](Type::String) if it is coercible into a string.
+    /// Likewise, a `ByteStream` is a subtype of [`binary`](Type::Binary) if it is coercible into a binary value.
+    pub fn is_subtype_of(&self, other: &Type) -> bool {
+        match (self, other) {
+            (_, Type::Any) => true,
+            (PipelineData::Empty, Type::Nothing) => true,
+            (PipelineData::Value(val, ..), ty) => val.is_subtype_of(ty),
+
+            // a list stream could be a list with any type, including a table
+            (PipelineData::ListStream(..), Type::List(..) | Type::Table(..)) => true,
+
+            (PipelineData::ByteStream(stream, ..), Type::String)
+                if stream.type_().is_string_coercible() =>
+            {
+                true
+            }
+            (PipelineData::ByteStream(stream, ..), Type::Binary)
+                if stream.type_().is_binary_coercible() =>
+            {
+                true
+            }
+
+            (PipelineData::Empty, _) => false,
+            (PipelineData::ListStream(..), _) => false,
+            (PipelineData::ByteStream(..), _) => false,
+        }
+    }
+
     pub fn into_value(self, span: Span) -> Result<Value, ShellError> {
         match self {
             PipelineData::Empty => Ok(Value::nothing(span)),
diff --git a/crates/nu-protocol/src/ty.rs b/crates/nu-protocol/src/ty.rs
index d1b6f7140a..8f97c6f3fc 100644
--- a/crates/nu-protocol/src/ty.rs
+++ b/crates/nu-protocol/src/ty.rs
@@ -51,7 +51,11 @@ impl Type {
         Self::Custom(name.into())
     }
 
-    pub fn is_subtype(&self, other: &Type) -> bool {
+    /// Determine of the [`Type`] is a [subtype](https://en.wikipedia.org/wiki/Subtyping) of `other`.
+    ///
+    /// This should only be used at parse-time. If you have a concrete [`Value`](crate::Value) or [`PipelineData`](crate::PipelineData),
+    /// you should use their respective [`is_subtype_of`] methods instead.
+    pub fn is_subtype_of(&self, other: &Type) -> bool {
         // Structural subtyping
         let is_subtype_collection = |this: &[(String, Type)], that: &[(String, Type)]| {
             if this.is_empty() || that.is_empty() {
@@ -61,7 +65,7 @@ impl Type {
             } else {
                 that.iter().all(|(col_y, ty_y)| {
                     if let Some((_, ty_x)) = this.iter().find(|(col_x, _)| col_x == col_y) {
-                        ty_x.is_subtype(ty_y)
+                        ty_x.is_subtype_of(ty_y)
                     } else {
                         false
                     }
@@ -74,7 +78,7 @@ impl Type {
             (Type::Float, Type::Number) => true,
             (Type::Int, Type::Number) => true,
             (_, Type::Any) => true,
-            (Type::List(t), Type::List(u)) if t.is_subtype(u) => true, // List is covariant
+            (Type::List(t), Type::List(u)) if t.is_subtype_of(u) => true, // List is covariant
             (Type::Record(this), Type::Record(that)) | (Type::Table(this), Type::Table(that)) => {
                 is_subtype_collection(this, that)
             }
@@ -227,21 +231,21 @@ mod tests {
         #[test]
         fn test_reflexivity() {
             for ty in Type::iter() {
-                assert!(ty.is_subtype(&ty));
+                assert!(ty.is_subtype_of(&ty));
             }
         }
 
         #[test]
         fn test_any_is_top_type() {
             for ty in Type::iter() {
-                assert!(ty.is_subtype(&Type::Any));
+                assert!(ty.is_subtype_of(&Type::Any));
             }
         }
 
         #[test]
         fn test_number_supertype() {
-            assert!(Type::Int.is_subtype(&Type::Number));
-            assert!(Type::Float.is_subtype(&Type::Number));
+            assert!(Type::Int.is_subtype_of(&Type::Number));
+            assert!(Type::Float.is_subtype_of(&Type::Number));
         }
 
         #[test]
@@ -250,7 +254,7 @@ mod tests {
                 for ty2 in Type::iter() {
                     let list_ty1 = Type::List(Box::new(ty1.clone()));
                     let list_ty2 = Type::List(Box::new(ty2.clone()));
-                    assert_eq!(list_ty1.is_subtype(&list_ty2), ty1.is_subtype(&ty2));
+                    assert_eq!(list_ty1.is_subtype_of(&list_ty2), ty1.is_subtype_of(&ty2));
                 }
             }
         }
diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs
index b9c942d3b0..5ffe376269 100644
--- a/crates/nu-protocol/src/value/mod.rs
+++ b/crates/nu-protocol/src/value/mod.rs
@@ -813,6 +813,66 @@ impl Value {
         }
     }
 
+    /// Determine of the [`Value`] is a [subtype](https://en.wikipedia.org/wiki/Subtyping) of `other`
+    ///
+    /// If you have a [`Value`], this method should always be used over chaining [`Value::get_type`] with [`Type::is_subtype_of`](crate::Type::is_subtype_of).
+    ///
+    /// This method is able to leverage that information encoded in a `Value` to provide more accurate
+    /// type comparison than if one were to collect the type into [`Type`](crate::Type) value with [`Value::get_type`].
+    ///
+    /// Empty lists are considered subtypes of all list<T> types.
+    ///
+    /// Lists of mixed records where some column is present in all record is a subtype of `table<column>`.
+    /// For example, `[{a: 1, b: 2}, {a: 1}]` is a subtype of `table<a: int>` (but not `table<a: int, b: int>`).
+    ///
+    /// See also: [`PipelineData::is_subtype_of`](crate::PipelineData::is_subtype_of)
+    pub fn is_subtype_of(&self, other: &Type) -> bool {
+        // records are structurally typed
+        let record_compatible = |val: &Value, other: &[(String, Type)]| match val {
+            Value::Record { val, .. } => other
+                .iter()
+                .all(|(key, ty)| val.get(key).is_some_and(|inner| inner.is_subtype_of(ty))),
+            _ => false,
+        };
+
+        // All cases matched explicitly to ensure this does not accidentally allocate `Type` if any composite types are introduced in the future
+        match (self, other) {
+            (_, Type::Any) => true,
+
+            // `Type` allocation for scalar types is trivial
+            (
+                Value::Bool { .. }
+                | Value::Int { .. }
+                | Value::Float { .. }
+                | Value::String { .. }
+                | Value::Glob { .. }
+                | Value::Filesize { .. }
+                | Value::Duration { .. }
+                | Value::Date { .. }
+                | Value::Range { .. }
+                | Value::Closure { .. }
+                | Value::Error { .. }
+                | Value::Binary { .. }
+                | Value::CellPath { .. }
+                | Value::Nothing { .. },
+                _,
+            ) => self.get_type().is_subtype_of(other),
+
+            // matching composite types
+            (val @ Value::Record { .. }, Type::Record(inner)) => record_compatible(val, inner),
+            (Value::List { vals, .. }, Type::List(inner)) => {
+                vals.iter().all(|val| val.is_subtype_of(inner))
+            }
+            (Value::List { vals, .. }, Type::Table(inner)) => {
+                vals.iter().all(|val| record_compatible(val, inner))
+            }
+            (Value::Custom { val, .. }, Type::Custom(inner)) => val.type_name() == **inner,
+
+            // non-matching composite types
+            (Value::Record { .. } | Value::List { .. } | Value::Custom { .. }, _) => false,
+        }
+    }
+
     pub fn get_data_by_key(&self, name: &str) -> Option<Value> {
         let span = self.span();
         match self {
@@ -3880,6 +3940,136 @@ mod tests {
         }
     }
 
+    mod is_subtype {
+        use crate::Type;
+
+        use super::*;
+
+        fn assert_subtype_equivalent(value: &Value, ty: &Type) {
+            assert_eq!(value.is_subtype_of(ty), value.get_type().is_subtype_of(ty));
+        }
+
+        #[test]
+        fn test_list() {
+            let ty_int_list = Type::list(Type::Int);
+            let ty_str_list = Type::list(Type::String);
+            let ty_any_list = Type::list(Type::Any);
+            let ty_list_list_int = Type::list(Type::list(Type::Int));
+
+            let list = Value::test_list(vec![
+                Value::test_int(1),
+                Value::test_int(2),
+                Value::test_int(3),
+            ]);
+
+            assert_subtype_equivalent(&list, &ty_int_list);
+            assert_subtype_equivalent(&list, &ty_str_list);
+            assert_subtype_equivalent(&list, &ty_any_list);
+
+            let list = Value::test_list(vec![
+                Value::test_int(1),
+                Value::test_string("hi"),
+                Value::test_int(3),
+            ]);
+
+            assert_subtype_equivalent(&list, &ty_int_list);
+            assert_subtype_equivalent(&list, &ty_str_list);
+            assert_subtype_equivalent(&list, &ty_any_list);
+
+            let list = Value::test_list(vec![Value::test_list(vec![Value::test_int(1)])]);
+
+            assert_subtype_equivalent(&list, &ty_list_list_int);
+
+            // The type of an empty lists is a subtype of any list or table type
+            let ty_table = Type::Table(Box::new([
+                ("a".into(), Type::Int),
+                ("b".into(), Type::Int),
+                ("c".into(), Type::Int),
+            ]));
+            let empty = Value::test_list(vec![]);
+
+            assert_subtype_equivalent(&empty, &ty_any_list);
+            assert!(empty.is_subtype_of(&ty_int_list));
+            assert!(empty.is_subtype_of(&ty_table));
+        }
+
+        #[test]
+        fn test_record() {
+            let ty_abc = Type::Record(Box::new([
+                ("a".into(), Type::Int),
+                ("b".into(), Type::Int),
+                ("c".into(), Type::Int),
+            ]));
+            let ty_ab = Type::Record(Box::new([("a".into(), Type::Int), ("b".into(), Type::Int)]));
+            let ty_inner = Type::Record(Box::new([("inner".into(), ty_abc.clone())]));
+
+            let record_abc = Value::test_record(record! {
+                "a" => Value::test_int(1),
+                "b" => Value::test_int(2),
+                "c" => Value::test_int(3),
+            });
+            let record_ab = Value::test_record(record! {
+                "a" => Value::test_int(1),
+                "b" => Value::test_int(2),
+            });
+
+            assert_subtype_equivalent(&record_abc, &ty_abc);
+            assert_subtype_equivalent(&record_abc, &ty_ab);
+            assert_subtype_equivalent(&record_ab, &ty_abc);
+            assert_subtype_equivalent(&record_ab, &ty_ab);
+
+            let record_inner = Value::test_record(record! {
+                "inner" => record_abc
+            });
+            assert_subtype_equivalent(&record_inner, &ty_inner);
+        }
+
+        #[test]
+        fn test_table() {
+            let ty_abc = Type::Table(Box::new([
+                ("a".into(), Type::Int),
+                ("b".into(), Type::Int),
+                ("c".into(), Type::Int),
+            ]));
+            let ty_ab = Type::Table(Box::new([("a".into(), Type::Int), ("b".into(), Type::Int)]));
+            let ty_list_any = Type::list(Type::Any);
+
+            let record_abc = Value::test_record(record! {
+                "a" => Value::test_int(1),
+                "b" => Value::test_int(2),
+                "c" => Value::test_int(3),
+            });
+            let record_ab = Value::test_record(record! {
+                "a" => Value::test_int(1),
+                "b" => Value::test_int(2),
+            });
+
+            let table_abc = Value::test_list(vec![record_abc.clone(), record_abc.clone()]);
+            let table_ab = Value::test_list(vec![record_ab.clone(), record_ab.clone()]);
+
+            assert_subtype_equivalent(&table_abc, &ty_abc);
+            assert_subtype_equivalent(&table_abc, &ty_ab);
+            assert_subtype_equivalent(&table_ab, &ty_abc);
+            assert_subtype_equivalent(&table_ab, &ty_ab);
+            assert_subtype_equivalent(&table_abc, &ty_list_any);
+
+            let table_mixed = Value::test_list(vec![record_abc.clone(), record_ab.clone()]);
+            assert_subtype_equivalent(&table_mixed, &ty_abc);
+            assert!(table_mixed.is_subtype_of(&ty_ab));
+
+            let ty_a = Type::Table(Box::new([("a".into(), Type::Any)]));
+            let table_mixed_types = Value::test_list(vec![
+                Value::test_record(record! {
+                    "a" => Value::test_int(1),
+                }),
+                Value::test_record(record! {
+                    "a" => Value::test_string("a"),
+                }),
+            ]);
+            assert!(table_mixed_types.is_subtype_of(&ty_a));
+        }
+    }
+
     mod into_string {
         use chrono::{DateTime, FixedOffset};
 
diff --git a/crates/nu-std/testing.nu b/crates/nu-std/testing.nu
index e409920569..71a634333a 100644
--- a/crates/nu-std/testing.nu
+++ b/crates/nu-std/testing.nu
@@ -28,7 +28,7 @@ def valid-annotations [] {
 # Returns a table containing the list of function names together with their annotations (comments above the declaration)
 def get-annotated [
     file: path
-]: path -> table<function_name: string, annotation: string> {
+]: nothing -> table<function_name: string, annotation: string> {
     let raw_file = (
         open $file
         | lines
diff --git a/crates/nu-std/tests/test_iter.nu b/crates/nu-std/tests/test_iter.nu
index 3ace342788..291ecffe90 100644
--- a/crates/nu-std/tests/test_iter.nu
+++ b/crates/nu-std/tests/test_iter.nu
@@ -37,7 +37,7 @@ def iter_intersperse [] {
     let res = (1..4 | iter intersperse 0)
     assert equal $res [1 0 2 0 3 0 4]
 
-    let res = (4 | iter intersperse 1)
+    let res = ([4] | iter intersperse 1)
     assert equal $res [4]
 }
 
@@ -92,7 +92,7 @@ def iter_zip_with [] {
 
     assert equal $res [3 5 7]
 
-    let res = (42 | iter zip-with [1 2 3] {|a, b| $a // $b})
+    let res = ([42] | iter zip-with [1 2 3] {|a, b| $a // $b})
     assert equal $res [42]
 
     let res = (2..5 | iter zip-with 4 {|a, b| $a * $b})
diff --git a/crates/nu_plugin_polars/src/dataframe/command/boolean/when.rs b/crates/nu_plugin_polars/src/dataframe/command/boolean/when.rs
index 886ee50f3b..9c6976aa54 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/boolean/when.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/boolean/when.rs
@@ -35,10 +35,13 @@ impl PluginCommand for ExprWhen {
                 SyntaxShape::Any,
                 "expression that will be applied when predicate is true",
             )
-            .input_output_type(
-                Type::Custom("expression".into()),
-                Type::Custom("expression".into()),
-            )
+            .input_output_types(vec![
+                (Type::Nothing, Type::Custom("expression".into())),
+                (
+                    Type::Custom("expression".into()),
+                    Type::Custom("expression".into()),
+                ),
+            ])
             .category(Category::Custom("expression".into()))
     }
 
diff --git a/toolkit.nu b/toolkit.nu
index 8b34e9a53b..c185f2ea7f 100644
--- a/toolkit.nu
+++ b/toolkit.nu
@@ -46,7 +46,7 @@ export def clippy [
         ^cargo clippy
             --workspace
             --exclude nu_plugin_*
-            --features ($features | str join ",")
+            --features ($features | default [] | str join ",")
             --
             -D warnings
             -D clippy::unwrap_used
@@ -62,7 +62,7 @@ export def clippy [
             --tests
             --workspace
             --exclude nu_plugin_*
-            --features ($features | str join ",")
+            --features ($features | default [] | str join ",")
             --
             -D warnings
     )
@@ -96,13 +96,13 @@ export def test [
         if $workspace {
             ^cargo nextest run --all
         } else {
-            ^cargo nextest run --features ($features | str join ",")
+            ^cargo nextest run --features ($features | default [] | str join ",")
         }
     } else {
         if $workspace {
             ^cargo test --workspace
         } else {
-            ^cargo test --features ($features | str join ",")
+            ^cargo test --features ($features | default [] | str join ",")
         }
     }
 }
@@ -345,7 +345,7 @@ export def build [
     ...features: string@"nu-complete list features"  # a space-separated list of feature to install with Nushell
     --all # build all plugins with Nushell
 ] {
-    build-nushell ($features | str join ",")
+    build-nushell ($features | default [] | str join ",")
 
     if not $all {
         return
@@ -384,7 +384,7 @@ export def install [
     --all # install all plugins with Nushell
 ] {
     touch crates/nu-cmd-lang/build.rs # needed to make sure `version` has the correct `commit_hash`
-    ^cargo install --path . --features ($features | str join ",") --locked --force
+    ^cargo install --path . --features ($features | default [] | str join ",") --locked --force
     if not $all {
         return
     }

From 5cf6dea9976ff969bfeb6c8042181d51a58597ac Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Wed, 8 Jan 2025 18:24:31 -0500
Subject: [PATCH 0900/1072] Remove file accidentally re-introduced by merge
 (#14785)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

Re-removes the tests for `split_by`, which was removed in #14726 and
accidentally re-introduced by #14741

cc @fdncred

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

N/A

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

N/A

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
N/A
---
 crates/nu-command/tests/commands/split_by.rs | 61 --------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 crates/nu-command/tests/commands/split_by.rs

diff --git a/crates/nu-command/tests/commands/split_by.rs b/crates/nu-command/tests/commands/split_by.rs
deleted file mode 100644
index a458a01a25..0000000000
--- a/crates/nu-command/tests/commands/split_by.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-use nu_test_support::fs::Stub::EmptyFile;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn splits() {
-    let sample = r#"
-                [[first_name, last_name, rusty_at, type];
-                 [Andrés, Robalino, "10/11/2013", A],
-                 [JT, Turner, "10/12/2013", B],
-                 [Yehuda, Katz, "10/11/2013", A]]
-            "#;
-
-    let actual = nu!(pipeline(&format!(
-        r#"
-                  {sample}
-                | group-by rusty_at
-                | split-by type
-                | get A."10/11/2013"
-                | length
-            "#
-    )));
-
-    assert_eq!(actual.out, "2");
-}
-
-#[test]
-fn errors_if_no_input() {
-    Playground::setup("split_by_no_input", |dirs, _sandbox| {
-        let actual = nu!(cwd: dirs.test(), pipeline("split-by type"));
-
-        assert!(actual.err.contains("no input value was piped in"));
-    })
-}
-
-#[test]
-fn errors_if_non_record_input() {
-    Playground::setup("split_by_test_2", |dirs, sandbox| {
-        sandbox.with_files(&[
-            EmptyFile("los.txt"),
-            EmptyFile("tres.txt"),
-            EmptyFile("amigos.txt"),
-            EmptyFile("arepas.clu"),
-        ]);
-
-        let input_mismatch = nu!(cwd: dirs.test(), pipeline("5 | split-by type"));
-
-        assert!(input_mismatch.err.contains("doesn't support int input"));
-
-        let only_supports = nu!(
-            cwd: dirs.test(), pipeline(
-            "
-                ls
-                | get name
-                | split-by type
-            "
-        ));
-
-        assert!(only_supports.err.contains("Input type not supported"));
-    })
-}

From 79f19f2fc7dcd0da30ec8a35008a26177afccece Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Thu, 9 Jan 2025 15:37:27 +0300
Subject: [PATCH 0901/1072] Enable conditional `source` and `use` patterns by
 allowing `null` as a no-op module (#14773)

Related:
- #14329
- #13872
- #8214

# Description & User-Facing Changes

This PR allows enables the following uses, which are all no-op.
```nushell
source null
source-env null
use null
overlay use null
```

The motivation for this change is conditional sourcing of files. For
example, with this change `login.nu` may be deprecated and replaced with
the following code in `config.nu`
```nushell
const login_module = if $nu.is-login { "login.nu" } else { null }
source $login_module
```

# Tests + Formatting
I'm hoping for CI to pass :smile:

# After Submitting
Add a part about the conditional sourcing pattern to the website.
---
 .../src/core_commands/overlay/use_.rs         |  9 ++-
 crates/nu-cmd-lang/src/core_commands/use_.rs  |  9 ++-
 crates/nu-command/src/env/source_env.rs       | 25 +++++--
 crates/nu-command/src/misc/source.rs          | 17 ++++-
 crates/nu-parser/src/parse_keywords.rs        | 70 +++++++++++++++----
 crates/nu-parser/src/parser.rs                | 10 ++-
 tests/shell/mod.rs                            | 45 ++++++++++++
 7 files changed, 160 insertions(+), 25 deletions(-)

diff --git a/crates/nu-cmd-lang/src/core_commands/overlay/use_.rs b/crates/nu-cmd-lang/src/core_commands/overlay/use_.rs
index 1263fcaa2a..189fd39daf 100644
--- a/crates/nu-cmd-lang/src/core_commands/overlay/use_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/overlay/use_.rs
@@ -24,8 +24,8 @@ impl Command for OverlayUse {
             .allow_variants_without_examples(true)
             .required(
                 "name",
-                SyntaxShape::String,
-                "Module name to use overlay for.",
+                SyntaxShape::OneOf(vec![SyntaxShape::String, SyntaxShape::Nothing]),
+                "Module name to use overlay for (`null` for no-op).",
             )
             .optional(
                 "as",
@@ -61,6 +61,11 @@ impl Command for OverlayUse {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
+        let noop = call.get_parser_info(caller_stack, "noop");
+        if noop.is_some() {
+            return Ok(PipelineData::empty());
+        }
+
         let mut name_arg: Spanned<String> = call.req(engine_state, caller_stack, 0)?;
         name_arg.item = trim_quotes_str(&name_arg.item).to_string();
 
diff --git a/crates/nu-cmd-lang/src/core_commands/use_.rs b/crates/nu-cmd-lang/src/core_commands/use_.rs
index 978638456e..3968e288de 100644
--- a/crates/nu-cmd-lang/src/core_commands/use_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/use_.rs
@@ -22,7 +22,11 @@ impl Command for Use {
         Signature::build("use")
             .input_output_types(vec![(Type::Nothing, Type::Nothing)])
             .allow_variants_without_examples(true)
-            .required("module", SyntaxShape::String, "Module or module file.")
+            .required(
+                "module",
+                SyntaxShape::OneOf(vec![SyntaxShape::String, SyntaxShape::Nothing]),
+                "Module or module file (`null` for no-op).",
+            )
             .rest(
                 "members",
                 SyntaxShape::Any,
@@ -54,6 +58,9 @@ This command is a parser keyword. For details, check:
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
+        if call.get_parser_info(caller_stack, "noop").is_some() {
+            return Ok(PipelineData::empty());
+        }
         let Some(Expression {
             expr: Expr::ImportPattern(import_pattern),
             ..
diff --git a/crates/nu-command/src/env/source_env.rs b/crates/nu-command/src/env/source_env.rs
index 348418c247..342c31aed4 100644
--- a/crates/nu-command/src/env/source_env.rs
+++ b/crates/nu-command/src/env/source_env.rs
@@ -19,8 +19,8 @@ impl Command for SourceEnv {
             .input_output_types(vec![(Type::Any, Type::Any)])
             .required(
                 "filename",
-                SyntaxShape::String, // type is string to avoid automatically canonicalizing the path
-                "The filepath to the script file to source the environment from.",
+                SyntaxShape::OneOf(vec![SyntaxShape::String, SyntaxShape::Nothing]), // type is string to avoid automatically canonicalizing the path
+                "The filepath to the script file to source the environment from (`null` for no-op).",
             )
             .category(Category::Core)
     }
@@ -45,6 +45,10 @@ impl Command for SourceEnv {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
+        if call.get_parser_info(caller_stack, "noop").is_some() {
+            return Ok(PipelineData::empty());
+        }
+
         let source_filename: Spanned<String> = call.req(engine_state, caller_stack, 0)?;
 
         // Note: this hidden positional is the block_id that corresponded to the 0th position
@@ -99,10 +103,17 @@ impl Command for SourceEnv {
     }
 
     fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Sources the environment from foo.nu in the current context",
-            example: r#"source-env foo.nu"#,
-            result: None,
-        }]
+        vec![
+            Example {
+                description: "Sources the environment from foo.nu in the current context",
+                example: r#"source-env foo.nu"#,
+                result: None,
+            },
+            Example {
+                description: "Sourcing `null` is a no-op.",
+                example: r#"source-env null"#,
+                result: None,
+            },
+        ]
     }
 }
diff --git a/crates/nu-command/src/misc/source.rs b/crates/nu-command/src/misc/source.rs
index a12a57ebef..c1be441bb0 100644
--- a/crates/nu-command/src/misc/source.rs
+++ b/crates/nu-command/src/misc/source.rs
@@ -16,8 +16,8 @@ impl Command for Source {
             .input_output_types(vec![(Type::Any, Type::Any)])
             .required(
                 "filename",
-                SyntaxShape::Filepath,
-                "The filepath to the script file to source.",
+                SyntaxShape::OneOf(vec![SyntaxShape::Filepath, SyntaxShape::Nothing]),
+                "The filepath to the script file to source (`null` for no-op).",
             )
             .category(Category::Core)
     }
@@ -42,6 +42,9 @@ impl Command for Source {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
+        if call.get_parser_info(stack, "noop").is_some() {
+            return Ok(PipelineData::empty());
+        }
         // Note: two hidden positionals are used here that are injected by the parser:
         // 1. The block_id that corresponded to the 0th position
         // 2. The block_id_name that corresponded to the file name at the 0th position
@@ -107,6 +110,16 @@ impl Command for Source {
                 example: r#"source ./foo.nu; say-hi"#,
                 result: None,
             },
+            Example {
+                description: "Sourcing `null` is a no-op.",
+                example: r#"source null"#,
+                result: None,
+            },
+            Example {
+                description: "Source can be used with const variables.",
+                example: r#"const file = if $nu.is-interactive { "interactive.nu" } else { null }; source $file"#,
+                result: None,
+            }
         ]
     }
 }
diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index e01743321c..0830545075 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -2367,18 +2367,37 @@ pub fn parse_use(
 
     let import_pattern_expr = parse_import_pattern(working_set, args_spans);
 
-    let import_pattern = if let Expression {
-        expr: Expr::ImportPattern(import_pattern),
-        ..
-    } = &import_pattern_expr
-    {
-        import_pattern.clone()
-    } else {
-        working_set.error(ParseError::UnknownState(
-            "internal error: Import pattern positional is not import pattern".into(),
-            import_pattern_expr.span,
-        ));
-        return (garbage_pipeline(working_set, spans), vec![]);
+    let import_pattern = match &import_pattern_expr {
+        Expression {
+            expr: Expr::Nothing,
+            ..
+        } => {
+            let mut call = call;
+            call.set_parser_info(
+                "noop".to_string(),
+                Expression::new_unknown(Expr::Nothing, Span::unknown(), Type::Nothing),
+            );
+            return (
+                Pipeline::from_vec(vec![Expression::new(
+                    working_set,
+                    Expr::Call(call),
+                    Span::concat(spans),
+                    Type::Any,
+                )]),
+                vec![],
+            );
+        }
+        Expression {
+            expr: Expr::ImportPattern(import_pattern),
+            ..
+        } => import_pattern.clone(),
+        _ => {
+            working_set.error(ParseError::UnknownState(
+                "internal error: Import pattern positional is not import pattern".into(),
+                import_pattern_expr.span,
+            ));
+            return (garbage_pipeline(working_set, spans), vec![]);
+        }
     };
 
     let (mut import_pattern, module, module_id) = if let Some(module_id) = import_pattern.head.id {
@@ -2755,6 +2774,19 @@ pub fn parse_overlay_use(working_set: &mut StateWorkingSet, call: Box<Call>) ->
 
     let (overlay_name, overlay_name_span) = if let Some(expr) = call.positional_nth(0) {
         match eval_constant(working_set, expr) {
+            Ok(Value::Nothing { .. }) => {
+                let mut call = call;
+                call.set_parser_info(
+                    "noop".to_string(),
+                    Expression::new_unknown(Expr::Bool(true), Span::unknown(), Type::Bool),
+                );
+                return Pipeline::from_vec(vec![Expression::new(
+                    working_set,
+                    Expr::Call(call),
+                    call_span,
+                    Type::Any,
+                )]);
+            }
             Ok(val) => match val.coerce_into_string() {
                 Ok(s) => (s, expr.span),
                 Err(err) => {
@@ -3494,6 +3526,20 @@ pub fn parse_source(working_set: &mut StateWorkingSet, lite_command: &LiteComman
                     }
                 };
 
+                if val.is_nothing() {
+                    let mut call = call;
+                    call.set_parser_info(
+                        "noop".to_string(),
+                        Expression::new_unknown(Expr::Nothing, Span::unknown(), Type::Nothing),
+                    );
+                    return Pipeline::from_vec(vec![Expression::new(
+                        working_set,
+                        Expr::Call(call),
+                        Span::concat(spans),
+                        Type::Any,
+                    )]);
+                }
+
                 let filename = match val.coerce_into_string() {
                     Ok(s) => s,
                     Err(err) => {
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 277ce83e7f..93c8cf4425 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -15,7 +15,7 @@ use nu_engine::DIR_VAR_PARSER_INFO;
 use nu_protocol::{
     ast::*, engine::StateWorkingSet, eval_const::eval_constant, BlockId, DeclId, DidYouMean,
     FilesizeUnit, Flag, ParseError, PositionalArg, Signature, Span, Spanned, SyntaxShape, Type,
-    VarId, ENV_VARIABLE_ID, IN_VARIABLE_ID,
+    Value, VarId, ENV_VARIABLE_ID, IN_VARIABLE_ID,
 };
 use std::{
     collections::{HashMap, HashSet},
@@ -3054,6 +3054,14 @@ pub fn parse_import_pattern(working_set: &mut StateWorkingSet, spans: &[Span]) -
     let head_expr = parse_value(working_set, *head_span, &SyntaxShape::Any);
 
     let (maybe_module_id, head_name) = match eval_constant(working_set, &head_expr) {
+        Ok(Value::Nothing { .. }) => {
+            return Expression::new(
+                working_set,
+                Expr::Nothing,
+                Span::concat(spans),
+                Type::Nothing,
+            );
+        }
         Ok(val) => match val.coerce_into_string() {
             Ok(s) => (working_set.find_module(s.as_bytes()), s.into_bytes()),
             Err(err) => {
diff --git a/tests/shell/mod.rs b/tests/shell/mod.rs
index c2df76005b..6f7d60aa58 100644
--- a/tests/shell/mod.rs
+++ b/tests/shell/mod.rs
@@ -335,6 +335,51 @@ fn source_empty_file() {
     })
 }
 
+#[test]
+fn source_use_null() {
+    let actual = nu!(r#"source null"#);
+    assert!(actual.out.is_empty());
+    assert!(actual.err.is_empty());
+
+    let actual = nu!(r#"source-env null"#);
+    assert!(actual.out.is_empty());
+    assert!(actual.err.is_empty());
+
+    let actual = nu!(r#"use null"#);
+    assert!(actual.out.is_empty());
+    assert!(actual.err.is_empty());
+
+    let actual = nu!(r#"overlay use null"#);
+    assert!(actual.out.is_empty());
+    assert!(actual.err.is_empty());
+}
+
+#[test]
+fn source_use_file_named_null() {
+    Playground::setup("source_file_named_null", |dirs, sandbox| {
+        sandbox.with_files(&[FileWithContent(
+            "null",
+            r#"export-env { print "hello world" }"#,
+        )]);
+
+        let actual = nu!(cwd: dirs.test(), r#"source "null""#);
+        assert!(actual.out.contains("hello world"));
+        assert!(actual.err.is_empty());
+
+        let actual = nu!(cwd: dirs.test(), r#"source-env "null""#);
+        assert!(actual.out.contains("hello world"));
+        assert!(actual.err.is_empty());
+
+        let actual = nu!(cwd: dirs.test(), r#"use "null""#);
+        assert!(actual.out.contains("hello world"));
+        assert!(actual.err.is_empty());
+
+        let actual = nu!(cwd: dirs.test(), r#"overlay use "null""#);
+        assert!(actual.out.contains("hello world"));
+        assert!(actual.err.is_empty());
+    })
+}
+
 #[test]
 fn main_script_help_uses_script_name1() {
     // Note: this test is somewhat fragile and might need to be adapted if the usage help message changes

From f360489f1ee5ea4d02349f15b813dbd74ae6a0a7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Jan 2025 13:51:08 +0100
Subject: [PATCH 0902/1072] Bump tempfile from 3.14.0 to 3.15.0 (#14777)

Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.14.0 to
3.15.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md">tempfile's
changelog</a>.</em></p>
<blockquote>
<h2>3.15.0</h2>
<p>Re-seed the per-thread RNG from system randomness when we repeatedly
fail to create temporary files (<a
href="https://redirect.github.com/Stebalien/tempfile/issues/314">#314</a>).
This resolves a potential DoS vector (<a
href="https://redirect.github.com/Stebalien/tempfile/issues/178">#178</a>)
while avoiding <code>getrandom</code> in the common case where it's
necessary. The feature is optional but enabled by default via the
<code>getrandom</code> feature.</p>
<p>For libc-free builds, you'll either need to disable this feature or
opt-in to a different <a
href="https://github.com/rust-random/getrandom?tab=readme-ov-file#opt-in-backends"><code>getrandom</code>
backend</a>.</p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/Stebalien/tempfile/commit/e7a40e3731c609a06fe959c88e8f681e31f17079"><code>e7a40e3</code></a>
Release v3.15.0</li>
<li><a
href="https://github.com/Stebalien/tempfile/commit/ea45f476d72c89ced3b978fa30de8ef648183cb7"><code>ea45f47</code></a>
feat: re-seed from system randomness on collision (<a
href="https://redirect.github.com/Stebalien/tempfile/issues/314">#314</a>)</li>
<li><a
href="https://github.com/Stebalien/tempfile/commit/16209da6e651577860f65ff0179ddb7ad071b780"><code>16209da</code></a>
Fix link to ticket in changelog (<a
href="https://redirect.github.com/Stebalien/tempfile/issues/310">#310</a>)</li>
<li><a
href="https://github.com/Stebalien/tempfile/commit/ae22b273a1bb539018c748f1613a8f2ca29038c4"><code>ae22b27</code></a>
docs: add owasp link on insecure temporary files (<a
href="https://redirect.github.com/Stebalien/tempfile/issues/309">#309</a>)</li>
<li>See full diff in <a
href="https://github.com/Stebalien/tempfile/compare/v3.14.0...v3.15.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=tempfile&package-manager=cargo&previous-version=3.14.0&new-version=3.15.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 5 +++--
 Cargo.toml | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b6012d4e4b..1ac53ad635 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7287,12 +7287,13 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tempfile"
-version = "3.14.0"
+version = "3.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
+checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704"
 dependencies = [
  "cfg-if",
  "fastrand",
+ "getrandom",
  "once_cell",
  "rustix",
  "windows-sys 0.59.0",
diff --git a/Cargo.toml b/Cargo.toml
index 33a8f8f883..53d888b118 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -156,7 +156,7 @@ strip-ansi-escapes = "0.2.0"
 syn = "2.0"
 sysinfo = "0.32"
 tabled = { version = "0.17.0", default-features = false }
-tempfile = "3.14"
+tempfile = "3.15"
 terminal_size = "0.4"
 titlecase = "3.0"
 toml = "0.8"

From 3f8dd1b7059de684b53d59622287ac854ab47c00 Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Thu, 9 Jan 2025 21:19:32 +0800
Subject: [PATCH 0903/1072] feat(lsp): document_symbols and workspace_symbols
 (#14770)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

This PR adds symbols related features to lsp
<img width="940" alt="image"
src="https://github.com/user-attachments/assets/aeaed338-133c-430a-b966-58a9bc445211"
/>

Notice that symbols of type variable may got filtered by client side
plugins

<img width="906" alt="image"
src="https://github.com/user-attachments/assets/e031b3dc-443a-486f-8a35-4415c07196d0"
/>


# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock                                    |   1 +
 crates/nu-lsp/Cargo.toml                      |   1 +
 crates/nu-lsp/src/diagnostics.rs              |  13 +-
 crates/nu-lsp/src/lib.rs                      | 135 +++--
 crates/nu-lsp/src/notification.rs             |  15 +-
 crates/nu-lsp/src/symbols.rs                  | 566 ++++++++++++++++++
 crates/nu-protocol/src/engine/state_delta.rs  |   4 +
 .../src/engine/state_working_set.rs           |   4 +
 tests/fixtures/lsp/symbols/bar.nu             |   5 +
 tests/fixtures/lsp/symbols/foo.nu             |   6 +
 10 files changed, 685 insertions(+), 65 deletions(-)
 create mode 100644 crates/nu-lsp/src/symbols.rs
 create mode 100644 tests/fixtures/lsp/symbols/bar.nu
 create mode 100644 tests/fixtures/lsp/symbols/foo.nu

diff --git a/Cargo.lock b/Cargo.lock
index 1ac53ad635..5047323322 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3942,6 +3942,7 @@ version = "0.101.1"
 dependencies = [
  "assert-json-diff",
  "crossbeam-channel",
+ "fuzzy-matcher",
  "lsp-server",
  "lsp-textdocument",
  "lsp-types",
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index 829b1bd152..91bdebc831 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -22,6 +22,7 @@ miette = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 url = { workspace = true }
+fuzzy-matcher = { workspace = true }
 
 [dev-dependencies]
 nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.1" }
diff --git a/crates/nu-lsp/src/diagnostics.rs b/crates/nu-lsp/src/diagnostics.rs
index 5f94f021a2..1fec77d541 100644
--- a/crates/nu-lsp/src/diagnostics.rs
+++ b/crates/nu-lsp/src/diagnostics.rs
@@ -1,21 +1,16 @@
-use crate::LanguageServer;
+use crate::{span_to_range, LanguageServer};
 use lsp_types::{
     notification::{Notification, PublishDiagnostics},
     Diagnostic, DiagnosticSeverity, PublishDiagnosticsParams, Uri,
 };
 use miette::{IntoDiagnostic, Result};
-use nu_protocol::Value;
 
 impl LanguageServer {
     pub(crate) fn publish_diagnostics_for_file(&mut self, uri: Uri) -> Result<()> {
-        let mut engine_state = self.engine_state.clone();
-        let cwd = std::env::current_dir().expect("Could not get current working directory.");
-        engine_state.add_env_var("PWD".into(), Value::test_string(cwd.to_string_lossy()));
+        let mut engine_state = self.new_engine_state();
         engine_state.generate_nu_constant();
 
-        let Some((_, offset, working_set, file)) =
-            self.update_engine_state(&mut engine_state, &uri)
-        else {
+        let Some((_, offset, working_set, file)) = self.parse_file(&mut engine_state, &uri) else {
             return Ok(());
         };
 
@@ -29,7 +24,7 @@ impl LanguageServer {
             let message = err.to_string();
 
             diagnostics.diagnostics.push(Diagnostic {
-                range: Self::span_to_range(&err.span(), file, offset),
+                range: span_to_range(&err.span(), file, offset),
                 severity: Some(DiagnosticSeverity::ERROR),
                 message,
                 ..Default::default()
diff --git a/crates/nu-lsp/src/lib.rs b/crates/nu-lsp/src/lib.rs
index a159447c7c..be3d6fe8a1 100644
--- a/crates/nu-lsp/src/lib.rs
+++ b/crates/nu-lsp/src/lib.rs
@@ -2,7 +2,10 @@
 use lsp_server::{Connection, IoThreads, Message, Response, ResponseError};
 use lsp_textdocument::{FullTextDocument, TextDocuments};
 use lsp_types::{
-    request::{Completion, GotoDefinition, HoverRequest, Request},
+    request::{
+        Completion, DocumentSymbolRequest, GotoDefinition, HoverRequest, Request,
+        WorkspaceSymbolRequest,
+    },
     CompletionItem, CompletionItemKind, CompletionParams, CompletionResponse, CompletionTextEdit,
     GotoDefinitionParams, GotoDefinitionResponse, Hover, HoverContents, HoverParams, Location,
     MarkupContent, MarkupKind, OneOf, Range, ServerCapabilities, TextDocumentSyncKind, TextEdit,
@@ -13,8 +16,8 @@ use nu_cli::{NuCompleter, SuggestionKind};
 use nu_parser::{flatten_block, parse, FlatShape};
 use nu_protocol::{
     ast::Block,
-    engine::{EngineState, Stack, StateWorkingSet},
-    DeclId, Span, Value, VarId,
+    engine::{CachedFile, EngineState, Stack, StateWorkingSet},
+    DeclId, ModuleId, Span, Value, VarId,
 };
 use std::{
     path::{Path, PathBuf},
@@ -22,16 +25,19 @@ use std::{
     sync::Arc,
     time::Duration,
 };
+use symbols::SymbolCache;
 use url::Url;
 
 mod diagnostics;
 mod notification;
+mod symbols;
 
 #[derive(Debug)]
 enum Id {
     Variable(VarId),
     Declaration(DeclId),
     Value(FlatShape),
+    Module(ModuleId),
 }
 
 pub struct LanguageServer {
@@ -39,12 +45,10 @@ pub struct LanguageServer {
     io_threads: Option<IoThreads>,
     docs: TextDocuments,
     engine_state: EngineState,
+    symbol_cache: SymbolCache,
 }
 
-pub fn path_to_uri<P>(path: P) -> Uri
-where
-    P: AsRef<Path>,
-{
+pub fn path_to_uri(path: impl AsRef<Path>) -> Uri {
     Uri::from_str(
         Url::from_file_path(path)
             .expect("Failed to convert path to Url")
@@ -60,6 +64,12 @@ pub fn uri_to_path(uri: &Uri) -> PathBuf {
         .expect("Failed to convert Url to path")
 }
 
+pub fn span_to_range(span: &Span, file: &FullTextDocument, offset: usize) -> Range {
+    let start = file.position_at(span.start.saturating_sub(offset) as u32);
+    let end = file.position_at(span.end.saturating_sub(offset) as u32);
+    Range { start, end }
+}
+
 impl LanguageServer {
     pub fn initialize_stdio_connection(engine_state: EngineState) -> Result<Self> {
         let (connection, io_threads) = Connection::stdio();
@@ -76,6 +86,7 @@ impl LanguageServer {
             io_threads,
             docs: TextDocuments::new(),
             engine_state,
+            symbol_cache: SymbolCache::new(),
         })
     }
 
@@ -87,6 +98,8 @@ impl LanguageServer {
             definition_provider: Some(OneOf::Left(true)),
             hover_provider: Some(lsp_types::HoverProviderCapability::Simple(true)),
             completion_provider: Some(lsp_types::CompletionOptions::default()),
+            document_symbol_provider: Some(OneOf::Left(true)),
+            workspace_symbol_provider: Some(OneOf::Left(true)),
             ..Default::default()
         })
         .expect("Must be serializable");
@@ -131,6 +144,14 @@ impl LanguageServer {
                         Completion::METHOD => {
                             Self::handle_lsp_request(request, |params| self.complete(params))
                         }
+                        DocumentSymbolRequest::METHOD => {
+                            Self::handle_lsp_request(request, |params| self.document_symbol(params))
+                        }
+                        WorkspaceSymbolRequest::METHOD => {
+                            Self::handle_lsp_request(request, |params| {
+                                self.workspace_symbol(params)
+                            })
+                        }
                         _ => {
                             continue;
                         }
@@ -144,6 +165,7 @@ impl LanguageServer {
                 Message::Response(_) => {}
                 Message::Notification(notification) => {
                     if let Some(updated_file) = self.handle_lsp_notification(notification) {
+                        self.symbol_cache.mark_dirty(updated_file.clone(), true);
                         self.publish_diagnostics_for_file(updated_file)?;
                     }
                 }
@@ -157,7 +179,13 @@ impl LanguageServer {
         Ok(())
     }
 
-    pub fn update_engine_state<'a>(
+    pub fn new_engine_state(&self) -> EngineState {
+        let mut engine_state = self.engine_state.clone();
+        engine_state.add_env_var("PWD".into(), Value::test_string("."));
+        engine_state
+    }
+
+    pub fn parse_file<'a>(
         &mut self,
         engine_state: &'a mut EngineState,
         uri: &Uri,
@@ -178,6 +206,40 @@ impl LanguageServer {
         Some((block, offset, working_set, file))
     }
 
+    fn get_location_by_span<'a>(
+        &self,
+        files: impl Iterator<Item = &'a CachedFile>,
+        span: &Span,
+    ) -> Option<Location> {
+        for cached_file in files.into_iter() {
+            if cached_file.covered_span.contains(span.start) {
+                let path = Path::new(&*cached_file.name);
+                if !(path.exists() && path.is_file()) {
+                    return None;
+                }
+                let target_uri = path_to_uri(path);
+                if let Some(doc) = self.docs.get_document(&target_uri) {
+                    return Some(Location {
+                        uri: target_uri,
+                        range: span_to_range(span, doc, cached_file.covered_span.start),
+                    });
+                } else {
+                    // in case where the document is not opened yet, typically included by `nu -I`
+                    let temp_doc = FullTextDocument::new(
+                        "nu".to_string(),
+                        0,
+                        String::from_utf8((*cached_file.content).to_vec()).expect("Invalid UTF-8"),
+                    );
+                    return Some(Location {
+                        uri: target_uri,
+                        range: span_to_range(span, &temp_doc, cached_file.covered_span.start),
+                    });
+                }
+            }
+        }
+        None
+    }
+
     fn handle_lsp_request<P, H, R>(req: lsp_server::Request, mut param_handler: H) -> Response
     where
         P: serde::de::DeserializeOwned,
@@ -207,12 +269,6 @@ impl LanguageServer {
         }
     }
 
-    fn span_to_range(span: &Span, file: &FullTextDocument, offset: usize) -> Range {
-        let start = file.position_at(span.start.saturating_sub(offset) as u32);
-        let end = file.position_at(span.end.saturating_sub(offset) as u32);
-        Range { start, end }
-    }
-
     fn find_id(
         flattened: Vec<(Span, FlatShape)>,
         location: usize,
@@ -226,7 +282,7 @@ impl LanguageServer {
                     FlatShape::Variable(var_id) | FlatShape::VarDecl(var_id) => {
                         return Some((Id::Variable(*var_id), offset, span));
                     }
-                    FlatShape::InternalCall(decl_id) => {
+                    FlatShape::InternalCall(decl_id) | FlatShape::Custom(decl_id) => {
                         return Some((Id::Declaration(*decl_id), offset, span));
                     }
                     _ => return Some((Id::Value(shape), offset, span)),
@@ -236,40 +292,8 @@ impl LanguageServer {
         None
     }
 
-    fn get_location_by_span(&self, working_set: &StateWorkingSet, span: &Span) -> Option<Location> {
-        for cached_file in working_set.files() {
-            if cached_file.covered_span.contains(span.start) {
-                let path = Path::new(&*cached_file.name);
-                if !(path.exists() && path.is_file()) {
-                    return None;
-                }
-                let target_uri = path_to_uri(path);
-                if let Some(doc) = self.docs.get_document(&target_uri) {
-                    return Some(Location {
-                        uri: target_uri,
-                        range: Self::span_to_range(span, doc, cached_file.covered_span.start),
-                    });
-                } else {
-                    // in case where the document is not opened yet, typically included by `nu -I`
-                    let temp_doc = FullTextDocument::new(
-                        "Unk".to_string(),
-                        0,
-                        String::from_utf8((*cached_file.content).to_vec()).expect("Invalid UTF-8"),
-                    );
-                    return Some(Location {
-                        uri: target_uri,
-                        range: Self::span_to_range(span, &temp_doc, cached_file.covered_span.start),
-                    });
-                }
-            }
-        }
-        None
-    }
-
     fn goto_definition(&mut self, params: &GotoDefinitionParams) -> Option<GotoDefinitionResponse> {
-        let mut engine_state = self.engine_state.clone();
-        let cwd = std::env::current_dir().expect("Could not get current working directory.");
-        engine_state.add_env_var("PWD".into(), Value::test_string(cwd.to_string_lossy()));
+        let mut engine_state = self.new_engine_state();
 
         let path_uri = params
             .text_document_position_params
@@ -277,7 +301,7 @@ impl LanguageServer {
             .uri
             .to_owned();
         let (block, file_offset, working_set, file) =
-            self.update_engine_state(&mut engine_state, &path_uri)?;
+            self.parse_file(&mut engine_state, &path_uri)?;
         let flattened = flatten_block(&working_set, &block);
         let (id, _, _) = Self::find_id(
             flattened,
@@ -294,17 +318,19 @@ impl LanguageServer {
                 let var = working_set.get_variable(var_id);
                 Some(var.declaration_span)
             }
+            Id::Module(module_id) => {
+                let module = working_set.get_module(module_id);
+                module.span
+            }
             _ => None,
         }?;
         Some(GotoDefinitionResponse::Scalar(
-            self.get_location_by_span(&working_set, &span)?,
+            self.get_location_by_span(working_set.files(), &span)?,
         ))
     }
 
     fn hover(&mut self, params: &HoverParams) -> Option<Hover> {
-        let mut engine_state = self.engine_state.clone();
-        let cwd = std::env::current_dir().expect("Could not get current working directory.");
-        engine_state.add_env_var("PWD".into(), Value::test_string(cwd.to_string_lossy()));
+        let mut engine_state = self.new_engine_state();
 
         let path_uri = params
             .text_document_position_params
@@ -312,7 +338,7 @@ impl LanguageServer {
             .uri
             .to_owned();
         let (block, file_offset, working_set, file) =
-            self.update_engine_state(&mut engine_state, &path_uri)?;
+            self.parse_file(&mut engine_state, &path_uri)?;
         let flattened = flatten_block(&working_set, &block);
         let (id, _, _) = Self::find_id(
             flattened,
@@ -515,6 +541,7 @@ impl LanguageServer {
                     range: None,
                 })
             }
+            _ => None,
         }
     }
 
diff --git a/crates/nu-lsp/src/notification.rs b/crates/nu-lsp/src/notification.rs
index 33ec9ed5de..05813f83e2 100644
--- a/crates/nu-lsp/src/notification.rs
+++ b/crates/nu-lsp/src/notification.rs
@@ -1,6 +1,10 @@
 use lsp_types::{
-    notification::{DidChangeTextDocument, DidOpenTextDocument, DidSaveTextDocument, Notification},
-    DidChangeTextDocumentParams, DidOpenTextDocumentParams, DidSaveTextDocumentParams, Uri,
+    notification::{
+        DidChangeTextDocument, DidCloseTextDocument, DidOpenTextDocument, DidSaveTextDocument,
+        Notification,
+    },
+    DidChangeTextDocumentParams, DidCloseTextDocumentParams, DidOpenTextDocumentParams,
+    DidSaveTextDocumentParams, Uri,
 };
 
 use crate::LanguageServer;
@@ -31,6 +35,13 @@ impl LanguageServer {
                         .expect("Expect receive DidChangeTextDocumentParams");
                 Some(params.text_document.uri)
             }
+            DidCloseTextDocument::METHOD => {
+                let params: DidCloseTextDocumentParams =
+                    serde_json::from_value(notification.params.clone())
+                        .expect("Expect receive DidCloseTextDocumentParams");
+                self.symbol_cache.drop(&params.text_document.uri);
+                None
+            }
             _ => None,
         }
     }
diff --git a/crates/nu-lsp/src/symbols.rs b/crates/nu-lsp/src/symbols.rs
new file mode 100644
index 0000000000..7cec5b5756
--- /dev/null
+++ b/crates/nu-lsp/src/symbols.rs
@@ -0,0 +1,566 @@
+use std::collections::{BTreeMap, HashSet};
+use std::hash::{Hash, Hasher};
+
+use crate::{path_to_uri, span_to_range, uri_to_path, Id, LanguageServer};
+use fuzzy_matcher::{skim::SkimMatcherV2, FuzzyMatcher};
+use lsp_textdocument::{FullTextDocument, TextDocuments};
+use lsp_types::{
+    DocumentSymbolParams, DocumentSymbolResponse, Location, Range, SymbolInformation, SymbolKind,
+    Uri, WorkspaceSymbolParams, WorkspaceSymbolResponse,
+};
+use nu_parser::parse;
+use nu_protocol::ModuleId;
+use nu_protocol::{
+    engine::{CachedFile, EngineState, StateWorkingSet},
+    DeclId, Span, VarId,
+};
+use std::{cmp::Ordering, path::Path};
+
+/// Struct stored in cache, uri not included
+#[derive(Clone, Debug, Eq, PartialEq)]
+struct Symbol {
+    name: String,
+    kind: SymbolKind,
+    range: Range,
+}
+
+impl Hash for Symbol {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.range.start.hash(state);
+        self.range.end.hash(state);
+    }
+}
+
+impl PartialOrd for Symbol {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl Ord for Symbol {
+    fn cmp(&self, other: &Self) -> Ordering {
+        if self.kind == other.kind {
+            return self.range.start.cmp(&other.range.start);
+        }
+        match (self.kind, other.kind) {
+            (SymbolKind::FUNCTION, _) => Ordering::Less,
+            (_, SymbolKind::FUNCTION) => Ordering::Greater,
+            _ => self.range.start.cmp(&other.range.start),
+        }
+    }
+}
+
+impl Symbol {
+    fn to_symbol_information(&self, uri: &Uri) -> SymbolInformation {
+        #[allow(deprecated)]
+        SymbolInformation {
+            location: Location {
+                uri: uri.clone(),
+                range: self.range,
+            },
+            name: self.name.to_owned(),
+            kind: self.kind,
+            container_name: None,
+            deprecated: None,
+            tags: None,
+        }
+    }
+}
+
+/// Cache symbols for each opened file to avoid repeated parsing
+pub struct SymbolCache {
+    /// Fuzzy matcher for symbol names
+    matcher: SkimMatcherV2,
+    /// File Uri --> Symbols
+    cache: BTreeMap<Uri, Vec<Symbol>>,
+    /// If marked as dirty, parse on next request
+    dirty_flags: BTreeMap<Uri, bool>,
+}
+
+impl SymbolCache {
+    pub fn new() -> Self {
+        SymbolCache {
+            matcher: SkimMatcherV2::default(),
+            cache: BTreeMap::new(),
+            dirty_flags: BTreeMap::new(),
+        }
+    }
+
+    pub fn mark_dirty(&mut self, uri: Uri, flag: bool) {
+        self.dirty_flags.insert(uri, flag);
+    }
+
+    fn get_symbol_by_id(
+        working_set: &StateWorkingSet,
+        id: Id,
+        doc: &FullTextDocument,
+        doc_span: &Span,
+    ) -> Option<Symbol> {
+        match id {
+            Id::Declaration(decl_id) => {
+                let decl = working_set.get_decl(decl_id);
+                let span = working_set.get_block(decl.block_id()?).span?;
+                // multi-doc working_set, returns None if the Id is in other files
+                if !doc_span.contains(span.start) {
+                    return None;
+                }
+                Some(Symbol {
+                    name: decl.name().to_string(),
+                    kind: SymbolKind::FUNCTION,
+                    range: span_to_range(&span, doc, doc_span.start),
+                })
+            }
+            Id::Variable(var_id) => {
+                let var = working_set.get_variable(var_id);
+                let span = var.declaration_span;
+                if !doc_span.contains(span.start) || span.end == span.start {
+                    return None;
+                }
+                let range = span_to_range(&span, doc, doc_span.start);
+                let name = doc.get_content(Some(range));
+                // TODO: better way to filter closures with type any
+                if name.contains('\r') || name.contains('\n') || name.contains('{') {
+                    return None;
+                }
+                Some(Symbol {
+                    name: name.to_string(),
+                    kind: SymbolKind::VARIABLE,
+                    range,
+                })
+            }
+            Id::Module(module_id) => {
+                let module = working_set.get_module(module_id);
+                let span = module.span?;
+                if !doc_span.contains(span.start) {
+                    return None;
+                }
+                Some(Symbol {
+                    name: String::from_utf8(module.name()).ok()?,
+                    kind: SymbolKind::MODULE,
+                    range: span_to_range(&span, doc, doc_span.start),
+                })
+            }
+            _ => None,
+        }
+    }
+
+    fn extract_all_symbols(
+        working_set: &StateWorkingSet,
+        doc: &FullTextDocument,
+        cached_file: &CachedFile,
+    ) -> Vec<Symbol> {
+        let mut all_symbols: Vec<Symbol> = (0..working_set.num_decls())
+            .filter_map(|id| {
+                Self::get_symbol_by_id(
+                    working_set,
+                    Id::Declaration(DeclId::new(id)),
+                    doc,
+                    &cached_file.covered_span,
+                )
+            })
+            .chain((0..working_set.num_vars()).filter_map(|id| {
+                Self::get_symbol_by_id(
+                    working_set,
+                    Id::Variable(VarId::new(id)),
+                    doc,
+                    &cached_file.covered_span,
+                )
+            }))
+            .chain((0..working_set.num_modules()).filter_map(|id| {
+                Self::get_symbol_by_id(
+                    working_set,
+                    Id::Module(ModuleId::new(id)),
+                    doc,
+                    &cached_file.covered_span,
+                )
+            }))
+            // TODO: same variable symbol can be duplicated with different VarId
+            .collect::<HashSet<Symbol>>()
+            .into_iter()
+            .collect();
+        all_symbols.sort();
+        all_symbols
+    }
+
+    /// Update the symbols of given uri if marked as dirty
+    pub fn update(&mut self, uri: &Uri, engine_state: &EngineState, docs: &TextDocuments) {
+        if *self.dirty_flags.get(uri).unwrap_or(&true) {
+            let mut working_set = StateWorkingSet::new(engine_state);
+            let content = docs
+                .get_document_content(uri, None)
+                .expect("Failed to get_document_content!")
+                .as_bytes();
+            parse(
+                &mut working_set,
+                Some(
+                    uri_to_path(uri)
+                        .to_str()
+                        .expect("Failed to convert pathbuf to string"),
+                ),
+                content,
+                false,
+            );
+            for cached_file in working_set.files() {
+                let path = Path::new(&*cached_file.name);
+                if !(path.exists() && path.is_file()) {
+                    continue;
+                }
+                let target_uri = path_to_uri(path);
+                let new_symbols = if let Some(doc) = docs.get_document(&target_uri) {
+                    Self::extract_all_symbols(&working_set, doc, cached_file)
+                } else {
+                    let temp_doc = FullTextDocument::new(
+                        "nu".to_string(),
+                        0,
+                        String::from_utf8((*cached_file.content).to_vec()).expect("Invalid UTF-8"),
+                    );
+                    Self::extract_all_symbols(&working_set, &temp_doc, cached_file)
+                };
+                self.cache.insert(target_uri.clone(), new_symbols);
+                self.mark_dirty(target_uri, false);
+            }
+            self.mark_dirty(uri.clone(), false);
+        };
+    }
+
+    pub fn drop(&mut self, uri: &Uri) {
+        self.cache.remove(uri);
+        self.dirty_flags.remove(uri);
+    }
+
+    pub fn update_all(&mut self, engine_state: &EngineState, docs: &TextDocuments) {
+        for uri in docs.documents().keys() {
+            self.update(uri, engine_state, docs);
+        }
+    }
+
+    pub fn get_symbols_by_uri(&self, uri: &Uri) -> Option<Vec<SymbolInformation>> {
+        Some(
+            self.cache
+                .get(uri)?
+                .iter()
+                .map(|s| s.clone().to_symbol_information(uri))
+                .collect(),
+        )
+    }
+
+    pub fn get_fuzzy_matched_symbols(&self, query: &str) -> Vec<SymbolInformation> {
+        self.cache
+            .iter()
+            .flat_map(|(uri, symbols)| symbols.iter().map(|s| s.clone().to_symbol_information(uri)))
+            .filter_map(|s| {
+                self.matcher.fuzzy_match(&s.name, query)?;
+                Some(s)
+            })
+            .collect()
+    }
+
+    pub fn any_dirty(&self) -> bool {
+        self.dirty_flags.values().any(|f| *f)
+    }
+}
+
+impl LanguageServer {
+    pub fn document_symbol(
+        &mut self,
+        params: &DocumentSymbolParams,
+    ) -> Option<DocumentSymbolResponse> {
+        let engine_state = self.new_engine_state();
+        let uri = params.text_document.uri.to_owned();
+        self.symbol_cache.update(&uri, &engine_state, &self.docs);
+        Some(DocumentSymbolResponse::Flat(
+            self.symbol_cache.get_symbols_by_uri(&uri)?,
+        ))
+    }
+
+    pub fn workspace_symbol(
+        &mut self,
+        params: &WorkspaceSymbolParams,
+    ) -> Option<WorkspaceSymbolResponse> {
+        if self.symbol_cache.any_dirty() {
+            let engine_state = self.new_engine_state();
+            self.symbol_cache.update_all(&engine_state, &self.docs);
+        }
+        Some(WorkspaceSymbolResponse::Flat(
+            self.symbol_cache
+                .get_fuzzy_matched_symbols(params.query.as_str()),
+        ))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use assert_json_diff::assert_json_eq;
+    use lsp_types::{PartialResultParams, TextDocumentIdentifier};
+    use nu_test_support::fs::fixtures;
+
+    use crate::path_to_uri;
+    use crate::tests::{initialize_language_server, open_unchecked, update};
+    use lsp_server::{Connection, Message};
+    use lsp_types::{
+        request::{DocumentSymbolRequest, Request, WorkspaceSymbolRequest},
+        DocumentSymbolParams, Uri, WorkDoneProgressParams, WorkspaceSymbolParams,
+    };
+
+    fn document_symbol_test(client_connection: &Connection, uri: Uri) -> Message {
+        client_connection
+            .sender
+            .send(Message::Request(lsp_server::Request {
+                id: 1.into(),
+                method: DocumentSymbolRequest::METHOD.to_string(),
+                params: serde_json::to_value(DocumentSymbolParams {
+                    text_document: TextDocumentIdentifier { uri },
+                    partial_result_params: PartialResultParams::default(),
+                    work_done_progress_params: WorkDoneProgressParams::default(),
+                })
+                .unwrap(),
+            }))
+            .unwrap();
+
+        client_connection
+            .receiver
+            .recv_timeout(std::time::Duration::from_secs(2))
+            .unwrap()
+    }
+
+    fn workspace_symbol_test(client_connection: &Connection, query: String) -> Message {
+        client_connection
+            .sender
+            .send(Message::Request(lsp_server::Request {
+                id: 2.into(),
+                method: WorkspaceSymbolRequest::METHOD.to_string(),
+                params: serde_json::to_value(WorkspaceSymbolParams {
+                    query,
+                    partial_result_params: PartialResultParams::default(),
+                    work_done_progress_params: WorkDoneProgressParams::default(),
+                })
+                .unwrap(),
+            }))
+            .unwrap();
+        client_connection
+            .receiver
+            .recv_timeout(std::time::Duration::from_secs(2))
+            .unwrap()
+    }
+
+    #[test]
+    fn document_symbol_basic() {
+        let (client_connection, _recv) = initialize_language_server();
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("symbols");
+        script.push("foo.nu");
+        let script = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script.clone());
+
+        let resp = document_symbol_test(&client_connection, script.clone());
+        let result = if let Message::Response(response) = resp {
+            response.result
+        } else {
+            panic!()
+        };
+
+        assert_json_eq!(
+            result,
+            serde_json::json!([
+              {
+                "name": "def_foo",
+                "kind": 12,
+                "location": {
+                  "uri": script,
+                  "range": {
+                    "start": { "line": 5, "character": 15 },
+                    "end": { "line": 5, "character": 20 }
+                  }
+                }
+              },
+              {
+                "name": "var_foo",
+                "kind": 13,
+                "location": {
+                  "uri": script,
+                  "range": {
+                    "start": { "line": 2, "character": 4 },
+                    "end": { "line": 2, "character": 11 }
+                  }
+                }
+              }
+            ])
+        );
+    }
+
+    #[test]
+    fn document_symbol_update() {
+        let (client_connection, _recv) = initialize_language_server();
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("symbols");
+        script.push("bar.nu");
+        let script = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script.clone());
+        update(
+            &client_connection,
+            script.clone(),
+            String::default(),
+            Some(lsp_types::Range {
+                start: lsp_types::Position {
+                    line: 2,
+                    character: 0,
+                },
+                end: lsp_types::Position {
+                    line: 4,
+                    character: 29,
+                },
+            }),
+        );
+
+        let resp = document_symbol_test(&client_connection, script.clone());
+        let result = if let Message::Response(response) = resp {
+            response.result
+        } else {
+            panic!()
+        };
+
+        assert_json_eq!(
+            result,
+            serde_json::json!([
+              {
+                "name": "var_bar",
+                "kind": 13,
+                "location": {
+                  "uri": script,
+                  "range": {
+                    "start": { "line": 0, "character": 13 },
+                    "end": { "line": 0, "character": 20 }
+                  }
+                }
+              }
+            ])
+        );
+    }
+
+    #[test]
+    fn workspace_symbol_current() {
+        let (client_connection, _recv) = initialize_language_server();
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("symbols");
+        script.push("foo.nu");
+        let script_foo = path_to_uri(&script);
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("symbols");
+        script.push("bar.nu");
+        let script_bar = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script_foo.clone());
+        open_unchecked(&client_connection, script_bar.clone());
+
+        let resp = workspace_symbol_test(&client_connection, "br".to_string());
+        let result = if let Message::Response(response) = resp {
+            response.result
+        } else {
+            panic!()
+        };
+
+        assert_json_eq!(
+            result,
+            serde_json::json!([
+              {
+                "name": "def_bar",
+                "kind": 12,
+                "location": {
+                  "uri": script_bar,
+                  "range": {
+                    "start": { "line": 2, "character": 22 },
+                    "end": { "line": 2, "character": 27 }
+                  }
+                }
+              },
+              {
+                "name": "var_bar",
+                "kind": 13,
+                "location": {
+                  "uri": script_bar,
+                  "range": {
+                    "start": { "line": 0, "character": 13 },
+                    "end": { "line": 0, "character": 20 }
+                  }
+                }
+              },
+              {
+                "name": "module_bar",
+                "kind": 2,
+                "location": {
+                  "uri": script_bar,
+                  "range": {
+                    "start": { "line": 4, "character": 26 },
+                    "end": { "line": 4, "character": 27 }
+                  }
+                }
+              }
+            ])
+        );
+    }
+
+    #[test]
+    fn workspace_symbol_other() {
+        let (client_connection, _recv) = initialize_language_server();
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("symbols");
+        script.push("foo.nu");
+        let script_foo = path_to_uri(&script);
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("symbols");
+        script.push("bar.nu");
+        let script_bar = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script_foo.clone());
+        open_unchecked(&client_connection, script_bar.clone());
+
+        let resp = workspace_symbol_test(&client_connection, "foo".to_string());
+        let result = if let Message::Response(response) = resp {
+            response.result
+        } else {
+            panic!()
+        };
+
+        assert_json_eq!(
+            result,
+            serde_json::json!([
+              {
+                "name": "def_foo",
+                "kind": 12,
+                "location": {
+                  "uri": script_foo,
+                  "range": {
+                    "start": { "line": 5, "character": 15 },
+                    "end": { "line": 5, "character": 20 }
+                  }
+                }
+              },
+              {
+                "name": "var_foo",
+                "kind": 13,
+                "location": {
+                  "uri": script_foo,
+                  "range": {
+                    "start": { "line": 2, "character": 4 },
+                    "end": { "line": 2, "character": 11 }
+                  }
+                }
+              }
+            ])
+        );
+    }
+}
diff --git a/crates/nu-protocol/src/engine/state_delta.rs b/crates/nu-protocol/src/engine/state_delta.rs
index 0204dbe7f1..972c5d6e93 100644
--- a/crates/nu-protocol/src/engine/state_delta.rs
+++ b/crates/nu-protocol/src/engine/state_delta.rs
@@ -64,6 +64,10 @@ impl StateDelta {
         self.virtual_paths.len()
     }
 
+    pub fn num_vars(&self) -> usize {
+        self.vars.len()
+    }
+
     pub fn num_decls(&self) -> usize {
         self.decls.len()
     }
diff --git a/crates/nu-protocol/src/engine/state_working_set.rs b/crates/nu-protocol/src/engine/state_working_set.rs
index f3f042ebb8..f9895735b8 100644
--- a/crates/nu-protocol/src/engine/state_working_set.rs
+++ b/crates/nu-protocol/src/engine/state_working_set.rs
@@ -73,6 +73,10 @@ impl<'a> StateWorkingSet<'a> {
         self.delta.num_virtual_paths() + self.permanent_state.num_virtual_paths()
     }
 
+    pub fn num_vars(&self) -> usize {
+        self.delta.num_vars() + self.permanent_state.num_vars()
+    }
+
     pub fn num_decls(&self) -> usize {
         self.delta.num_decls() + self.permanent_state.num_decls()
     }
diff --git a/tests/fixtures/lsp/symbols/bar.nu b/tests/fixtures/lsp/symbols/bar.nu
new file mode 100644
index 0000000000..f86b81241e
--- /dev/null
+++ b/tests/fixtures/lsp/symbols/bar.nu
@@ -0,0 +1,5 @@
+export const var_bar = 2
+
+export def def_bar [] { 3 }
+
+export module module_bar { }
diff --git a/tests/fixtures/lsp/symbols/foo.nu b/tests/fixtures/lsp/symbols/foo.nu
new file mode 100644
index 0000000000..9fc8112ea0
--- /dev/null
+++ b/tests/fixtures/lsp/symbols/foo.nu
@@ -0,0 +1,6 @@
+use bar.nu [ var_bar def_bar ]
+
+let var_foo = 1
+def_bar
+
+def def_foo [] { 4 }

From 3a1601de8e40eae88cdb7b00a80ee2224c335a3e Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Thu, 9 Jan 2025 18:09:16 -0500
Subject: [PATCH 0904/1072] Add flag to `debug profile` to output duration
 field as Value::Duration (#14749)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

This PR adds a flag to `debug profile` to output the duration field as
Value::Duration. Without the flag, the behavior is same as before: a
column named `duration_ms` which is `Value::Float`. With the flag, there
is instead a column named just `duration` which is `Value::Duration`.
Additionally, this PR changes the time tracking to use nanoseconds
instead of float seconds, so it can be output as either milliseconds or
`Duration` (which uses nanoseconds internally). I don't think overflow
is a concern here, because the maximum amount of time a `Duration` can
store is over 292 years, and if a Nushell instruction takes longer than
that to run then I think we might have bigger issues.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

* Adds a flag `--duration-values` to `debug profile` which the
`duration_ms` field in `debug profile` to a `duration` field which uses
proper `duration` values.

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
N/A
---
 crates/nu-command/src/debug/profile.rs      | 15 +++++++--
 crates/nu-protocol/src/debugger/profiler.rs | 34 +++++++++++++++------
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/crates/nu-command/src/debug/profile.rs b/crates/nu-command/src/debug/profile.rs
index 9f72d19d7c..6fe88e2cf2 100644
--- a/crates/nu-command/src/debug/profile.rs
+++ b/crates/nu-command/src/debug/profile.rs
@@ -1,6 +1,6 @@
 use nu_engine::{command_prelude::*, ClosureEvalOnce};
 use nu_protocol::{
-    debugger::{Profiler, ProfilerOptions},
+    debugger::{DurationMode, Profiler, ProfilerOptions},
     engine::Closure,
 };
 
@@ -31,6 +31,11 @@ impl Command for DebugProfile {
                 Some('v'),
             )
             .switch("lines", "Collect line numbers", Some('l'))
+            .switch(
+                "duration-values",
+                "Report instruction duration as duration values rather than milliseconds",
+                Some('d'),
+            )
             .named(
                 "max-depth",
                 SyntaxShape::Int,
@@ -59,7 +64,7 @@ The output can be heavily customized. By default, the following columns are incl
                 be shown with the --expand-source flag.
 - pc          : The index of the instruction within the block.
 - instruction : The pretty printed instruction being evaluated.
-- duration_ms : How long it took to run the instruction in milliseconds.
+- duration    : How long it took to run the instruction.
 - (optional) span        : Span associated with the instruction. Can be viewed via the `view span`
                            command. Enabled with the --spans flag.
 - (optional) output      : The output value of the instruction. Enabled with the --values flag.
@@ -108,10 +113,15 @@ confusing the id/parent_id hierarchy. The --expr flag is helpful for investigati
         let collect_expanded_source = call.has_flag(engine_state, stack, "expanded-source")?;
         let collect_values = call.has_flag(engine_state, stack, "values")?;
         let collect_lines = call.has_flag(engine_state, stack, "lines")?;
+        let duration_values = call.has_flag(engine_state, stack, "duration-values")?;
         let max_depth = call
             .get_flag(engine_state, stack, "max-depth")?
             .unwrap_or(2);
 
+        let duration_mode = match duration_values {
+            true => DurationMode::Value,
+            false => DurationMode::Milliseconds,
+        };
         let profiler = Profiler::new(
             ProfilerOptions {
                 max_depth,
@@ -122,6 +132,7 @@ confusing the id/parent_id hierarchy. The --expr flag is helpful for investigati
                 collect_exprs: false,
                 collect_instructions: true,
                 collect_lines,
+                duration_mode,
             },
             call.span(),
         );
diff --git a/crates/nu-protocol/src/debugger/profiler.rs b/crates/nu-protocol/src/debugger/profiler.rs
index 70771ed50b..6ac71f996f 100644
--- a/crates/nu-protocol/src/debugger/profiler.rs
+++ b/crates/nu-protocol/src/debugger/profiler.rs
@@ -20,7 +20,7 @@ struct ElementId(usize);
 #[derive(Debug, Clone)]
 struct ElementInfo {
     start: Instant,
-    duration_sec: f64,
+    duration_ns: i64,
     depth: i64,
     element_span: Span,
     element_output: Option<Value>,
@@ -33,7 +33,7 @@ impl ElementInfo {
     pub fn new(depth: i64, element_span: Span) -> Self {
         ElementInfo {
             start: Instant::now(),
-            duration_sec: 0.0,
+            duration_ns: 0,
             depth,
             element_span,
             element_output: None,
@@ -44,6 +44,13 @@ impl ElementInfo {
     }
 }
 
+/// Whether [`Profiler`] should report duration as [`Value::Duration`]
+#[derive(Debug, Clone, Copy)]
+pub enum DurationMode {
+    Milliseconds,
+    Value,
+}
+
 /// Options for [`Profiler`]
 #[derive(Debug, Clone)]
 pub struct ProfilerOptions {
@@ -55,6 +62,7 @@ pub struct ProfilerOptions {
     pub collect_exprs: bool,
     pub collect_instructions: bool,
     pub collect_lines: bool,
+    pub duration_mode: DurationMode,
 }
 
 /// Basic profiler, used in `debug profile`
@@ -71,7 +79,7 @@ impl Profiler {
     pub fn new(opts: ProfilerOptions, span: Span) -> Self {
         let first = ElementInfo {
             start: Instant::now(),
-            duration_sec: 0.0,
+            duration_ns: 0,
             depth: 0,
             element_span: span,
             element_output: opts.collect_values.then(|| Value::nothing(span)),
@@ -116,7 +124,7 @@ impl Debugger for Profiler {
             return;
         };
 
-        root_element.duration_sec = root_element.start.elapsed().as_secs_f64();
+        root_element.duration_ns = root_element.start.elapsed().as_nanos() as i64;
     }
 
     fn enter_block(&mut self, _engine_state: &EngineState, _block: &Block) {
@@ -185,7 +193,7 @@ impl Debugger for Profiler {
             return;
         };
 
-        last_element.duration_sec = last_element.start.elapsed().as_secs_f64();
+        last_element.duration_ns = last_element.start.elapsed().as_nanos() as i64;
         last_element.element_output = out_opt;
 
         self.element_stack.pop();
@@ -270,7 +278,7 @@ impl Debugger for Profiler {
             return;
         };
 
-        last_element.duration_sec = last_element.start.elapsed().as_secs_f64();
+        last_element.duration_ns = last_element.start.elapsed().as_nanos() as i64;
         last_element.element_output = out_opt;
 
         self.element_stack.pop();
@@ -475,10 +483,16 @@ fn collect_data(
         row.push("output", val.clone());
     }
 
-    row.push(
-        "duration_ms",
-        Value::float(element.duration_sec * 1e3, profiler_span),
-    );
+    match profiler.opts.duration_mode {
+        DurationMode::Milliseconds => {
+            let val = Value::float(element.duration_ns as f64 / 1000.0 / 1000.0, profiler_span);
+            row.push("duration_ms", val);
+        }
+        DurationMode::Value => {
+            let val = Value::duration(element.duration_ns, profiler_span);
+            row.push("duration", val);
+        }
+    };
 
     let mut rows = vec![Value::record(row, profiler_span)];
 

From 72d50cf8b71c952b87cc2cbd886244fa2eb4b26e Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Fri, 10 Jan 2025 11:18:44 -0500
Subject: [PATCH 0905/1072] Convert Path to `list` in main and preserve case
 (#14764)

# Description

Fixes multiple issues related to `ENV_CONVERSION` and
path-conversion-to-list.

* #14681 removed some calls to `convert_env_values()`, but we found that
this caused `nu -n` to no longer convert the path properly.
* `ENV_CONVERSIONS` have apparently never preserved case, meaning a
conversion with a key of `foo` would not update `$env.FOO` but rather
create a new environment variable with a different case.
* There was a partial code-path that attempted to solve this for `PATH`,
but it only worked for `PATH` and `Path`.
* `convert_env_values()`, which handled `ENV_CONVERSIONS` was called in
multiple places in the startup depending on flags.

This PR:

* Refactors the startup to handle the conversion in `main()` rather than
in each potential startup path
* Updates `get_env_var_insensitive()` functions added in #14390 to
return the name of the environment variable with its original case. This
allows code that updates environment variables to preserve the case.
* Makes use of the updated function in `ENV_CONVERSIONS` to preserve the
case of any updated environment variables. The `ENV_CONVERSION` key
itself is still case **insensitive**.
* Makes use of the updated function to preserve the case of the `PATH`
environment variable (normally handled separately, regardless of whether
or not there was an `ENV_CONVERSION` for it).

## Before

`env_convert_values` was run:

* Before the user `env.nu` ran, which included `nu -c <commandstring>`
and `nu <script.nu>`
* Before the REPL loaded, which included `nu -n`

## After

`env_convert_values` always runs once in `main()` before any config file
is processed or the REPL is started

# User-Facing Changes

Bug fixes

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

Added additional tests to prevent future regression.

# After Submitting

There is additional cleanup that should probably be done in
`convert_env_values()`. This function previously handled
`ENV_CONVERSIONS`, but there is no longer any need for this since
`convert_env_vars()` runs whenever `$env.ENV_CONVERSIONS` changes now.

This means that the only relevant task in the old `convert_env_values()`
is to convert the `PATH` to a list, and ensure that it is a list of
strings. It's still calling the `from_string` conversion on every
variable (just once) even though there are no `ENV_CONVERSIONS` at this
point.

Leaving that to another PR though, while we get the core issue fixed
with this one.
---
 .../src/completions/command_completions.rs    |  2 +-
 crates/nu-cli/src/eval_cmds.rs                |  5 +--
 crates/nu-cli/src/eval_file.rs                |  5 +--
 crates/nu-engine/src/env.rs                   | 31 +++++++++-------
 crates/nu-plugin-engine/src/context.rs        |  5 ++-
 .../nu-protocol/src/config/ansi_coloring.rs   |  3 +-
 crates/nu-protocol/src/engine/engine_state.rs |  8 +++--
 crates/nu-protocol/src/engine/stack.rs        | 10 ++++--
 src/config_files.rs                           | 17 +--------
 src/main.rs                                   | 25 +++++++++++--
 src/run.rs                                    |  7 ++--
 tests/shell/environment/env.rs                | 35 +++++++++++++++++--
 12 files changed, 99 insertions(+), 54 deletions(-)

diff --git a/crates/nu-cli/src/completions/command_completions.rs b/crates/nu-cli/src/completions/command_completions.rs
index ce4383483a..ca54913ea1 100644
--- a/crates/nu-cli/src/completions/command_completions.rs
+++ b/crates/nu-cli/src/completions/command_completions.rs
@@ -43,7 +43,7 @@ impl CommandCompletion {
 
         let paths = working_set.permanent_state.get_env_var_insensitive("path");
 
-        if let Some(paths) = paths {
+        if let Some((_, paths)) = paths {
             if let Ok(paths) = paths.as_list() {
                 for path in paths {
                     let path = path.coerce_str().unwrap_or_default();
diff --git a/crates/nu-cli/src/eval_cmds.rs b/crates/nu-cli/src/eval_cmds.rs
index 5fba00f5c9..c126d3c6fc 100644
--- a/crates/nu-cli/src/eval_cmds.rs
+++ b/crates/nu-cli/src/eval_cmds.rs
@@ -1,5 +1,5 @@
 use log::info;
-use nu_engine::{convert_env_values, eval_block};
+use nu_engine::eval_block;
 use nu_parser::parse;
 use nu_protocol::{
     cli_error::report_compile_error,
@@ -50,9 +50,6 @@ pub fn evaluate_commands(
         }
     }
 
-    // Translate environment variables from Strings to Values
-    convert_env_values(engine_state, stack)?;
-
     // Parse the source code
     let (block, delta) = {
         if let Some(ref t_mode) = table_mode {
diff --git a/crates/nu-cli/src/eval_file.rs b/crates/nu-cli/src/eval_file.rs
index 826b6c8eb5..aa4dbfca78 100644
--- a/crates/nu-cli/src/eval_file.rs
+++ b/crates/nu-cli/src/eval_file.rs
@@ -1,6 +1,6 @@
 use crate::util::{eval_source, print_pipeline};
 use log::{info, trace};
-use nu_engine::{convert_env_values, eval_block};
+use nu_engine::eval_block;
 use nu_parser::parse;
 use nu_path::canonicalize_with;
 use nu_protocol::{
@@ -22,9 +22,6 @@ pub fn evaluate_file(
     stack: &mut Stack,
     input: PipelineData,
 ) -> Result<(), ShellError> {
-    // Convert environment variables from Strings to Values and store them in the engine state.
-    convert_env_values(engine_state, stack)?;
-
     let cwd = engine_state.cwd_as_string(Some(stack))?;
 
     let file_path =
diff --git a/crates/nu-engine/src/env.rs b/crates/nu-engine/src/env.rs
index 0d3fde7de6..345d81d6f7 100644
--- a/crates/nu-engine/src/env.rs
+++ b/crates/nu-engine/src/env.rs
@@ -32,7 +32,9 @@ pub fn convert_env_vars(
 ) -> Result<(), ShellError> {
     let conversions = conversions.as_record()?;
     for (key, conversion) in conversions.into_iter() {
-        if let Some(val) = stack.get_env_var_insensitive(engine_state, key) {
+        if let Some((case_preserve_env_name, val)) =
+            stack.get_env_var_insensitive(engine_state, key)
+        {
             match val.get_type() {
                 Type::String => {}
                 _ => continue,
@@ -52,7 +54,7 @@ pub fn convert_env_vars(
                 .run_with_value(val.clone())?
                 .into_value(val.span())?;
 
-            stack.add_env_var(key.clone(), new_val);
+            stack.add_env_var(case_preserve_env_name.to_string(), new_val);
         }
     }
     Ok(())
@@ -64,7 +66,10 @@ pub fn convert_env_vars(
 /// It returns Option instead of Result since we do want to translate all the values we can and
 /// skip errors. This function is called in the main() so we want to keep running, we cannot just
 /// exit.
-pub fn convert_env_values(engine_state: &mut EngineState, stack: &Stack) -> Result<(), ShellError> {
+pub fn convert_env_values(
+    engine_state: &mut EngineState,
+    stack: &mut Stack,
+) -> Result<(), ShellError> {
     let mut error = None;
 
     let mut new_scope = HashMap::new();
@@ -89,7 +94,7 @@ pub fn convert_env_values(engine_state: &mut EngineState, stack: &Stack) -> Resu
         }
     }
 
-    error = error.or_else(|| ensure_path(&mut new_scope, "PATH"));
+    error = error.or_else(|| ensure_path(engine_state, stack));
 
     if let Ok(last_overlay_name) = &stack.last_overlay_name() {
         if let Some(env_vars) = Arc::make_mut(&mut engine_state.env_vars).get_mut(last_overlay_name)
@@ -242,7 +247,7 @@ pub fn path_str(
     span: Span,
 ) -> Result<String, ShellError> {
     let (pathname, pathval) = match stack.get_env_var_insensitive(engine_state, "path") {
-        Some(v) => Ok((if cfg!(windows) { "Path" } else { "PATH" }, v)),
+        Some((_, v)) => Ok((if cfg!(windows) { "Path" } else { "PATH" }, v)),
         None => Err(ShellError::EnvVarNotFoundAtRuntime {
             envvar_name: if cfg!(windows) {
                 "Path".to_string()
@@ -362,11 +367,11 @@ fn get_converted_value(
     )
 }
 
-fn ensure_path(scope: &mut HashMap<String, Value>, env_path_name: &str) -> Option<ShellError> {
+fn ensure_path(engine_state: &EngineState, stack: &mut Stack) -> Option<ShellError> {
     let mut error = None;
 
     // If PATH/Path is still a string, force-convert it to a list
-    if let Some(value) = scope.get(env_path_name) {
+    if let Some((preserve_case_name, value)) = stack.get_env_var_insensitive(engine_state, "Path") {
         let span = value.span();
         match value {
             Value::String { val, .. } => {
@@ -375,15 +380,17 @@ fn ensure_path(scope: &mut HashMap<String, Value>, env_path_name: &str) -> Optio
                     .map(|p| Value::string(p.to_string_lossy().to_string(), span))
                     .collect();
 
-                scope.insert(env_path_name.to_string(), Value::list(paths, span));
+                stack.add_env_var(preserve_case_name.to_string(), Value::list(paths, span));
             }
             Value::List { vals, .. } => {
                 // Must be a list of strings
                 if !vals.iter().all(|v| matches!(v, Value::String { .. })) {
                     error = error.or_else(|| {
                         Some(ShellError::GenericError {
-                            error: format!("Wrong {env_path_name} environment variable value"),
-                            msg: format!("{env_path_name} must be a list of strings"),
+                            error: format!(
+                                "Incorrect {preserve_case_name} environment variable value"
+                            ),
+                            msg: format!("{preserve_case_name} must be a list of strings"),
                             span: Some(span),
                             help: None,
                             inner: vec![],
@@ -398,8 +405,8 @@ fn ensure_path(scope: &mut HashMap<String, Value>, env_path_name: &str) -> Optio
 
                 error = error.or_else(|| {
                     Some(ShellError::GenericError {
-                        error: format!("Wrong {env_path_name} environment variable value"),
-                        msg: format!("{env_path_name} must be a list of strings"),
+                        error: format!("Incorrect {preserve_case_name} environment variable value"),
+                        msg: format!("{preserve_case_name} must be a list of strings"),
                         span: Some(span),
                         help: None,
                         inner: vec![],
diff --git a/crates/nu-plugin-engine/src/context.rs b/crates/nu-plugin-engine/src/context.rs
index 5652cf1a5f..5870ab7d47 100644
--- a/crates/nu-plugin-engine/src/context.rs
+++ b/crates/nu-plugin-engine/src/context.rs
@@ -126,7 +126,10 @@ impl<'a> PluginExecutionContext for PluginExecutionCommandContext<'a> {
     }
 
     fn get_env_var(&self, name: &str) -> Result<Option<&Value>, ShellError> {
-        Ok(self.stack.get_env_var_insensitive(&self.engine_state, name))
+        Ok(self
+            .stack
+            .get_env_var_insensitive(&self.engine_state, name)
+            .map(|(_, value)| value))
     }
 
     fn get_env_vars(&self) -> Result<HashMap<String, Value>, ShellError> {
diff --git a/crates/nu-protocol/src/config/ansi_coloring.rs b/crates/nu-protocol/src/config/ansi_coloring.rs
index af016923da..4cbc893faa 100644
--- a/crates/nu-protocol/src/config/ansi_coloring.rs
+++ b/crates/nu-protocol/src/config/ansi_coloring.rs
@@ -48,6 +48,7 @@ impl UseAnsiColoring {
         let env_value = |env_name| {
             engine_state
                 .get_env_var_insensitive(env_name)
+                .map(|(_, v)| v)
                 .and_then(|v| v.coerce_bool().ok())
                 .unwrap_or(false)
         };
@@ -60,7 +61,7 @@ impl UseAnsiColoring {
             return false;
         }
 
-        if let Some(cli_color) = engine_state.get_env_var_insensitive("clicolor") {
+        if let Some((_, cli_color)) = engine_state.get_env_var_insensitive("clicolor") {
             if let Ok(cli_color) = cli_color.coerce_bool() {
                 return cli_color;
             }
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index 328c3d7694..8270e4111a 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -466,12 +466,16 @@ impl EngineState {
         None
     }
 
-    pub fn get_env_var_insensitive(&self, name: &str) -> Option<&Value> {
+    // Returns Some((name, value)) if found, None otherwise.
+    // When updating environment variables, make sure to use
+    // the same case (the returned "name") as the original
+    // environment variable name.
+    pub fn get_env_var_insensitive(&self, name: &str) -> Option<(&String, &Value)> {
         for overlay_id in self.scope.active_overlays.iter().rev() {
             let overlay_name = String::from_utf8_lossy(self.get_overlay_name(*overlay_id));
             if let Some(env_vars) = self.env_vars.get(overlay_name.as_ref()) {
                 if let Some(v) = env_vars.iter().find(|(k, _)| k.eq_ignore_case(name)) {
-                    return Some(v.1);
+                    return Some((v.0, v.1));
                 }
             }
         }
diff --git a/crates/nu-protocol/src/engine/stack.rs b/crates/nu-protocol/src/engine/stack.rs
index a1d50381dc..0e8df6b654 100644
--- a/crates/nu-protocol/src/engine/stack.rs
+++ b/crates/nu-protocol/src/engine/stack.rs
@@ -481,16 +481,20 @@ impl Stack {
     }
 
     // Case-Insensitive version of get_env_var
+    // Returns Some((name, value)) if found, None otherwise.
+    // When updating environment variables, make sure to use
+    // the same case (from the returned "name") as the original
+    // environment variable name.
     pub fn get_env_var_insensitive<'a>(
         &'a self,
         engine_state: &'a EngineState,
         name: &str,
-    ) -> Option<&'a Value> {
+    ) -> Option<(&'a String, &'a Value)> {
         for scope in self.env_vars.iter().rev() {
             for active_overlay in self.active_overlays.iter().rev() {
                 if let Some(env_vars) = scope.get(active_overlay) {
                     if let Some(v) = env_vars.iter().find(|(k, _)| k.eq_ignore_case(name)) {
-                        return Some(v.1);
+                        return Some((v.0, v.1));
                     }
                 }
             }
@@ -506,7 +510,7 @@ impl Stack {
             if !is_hidden {
                 if let Some(env_vars) = engine_state.env_vars.get(active_overlay) {
                     if let Some(v) = env_vars.iter().find(|(k, _)| k.eq_ignore_case(name)) {
-                        return Some(v.1);
+                        return Some((v.0, v.1));
                     }
                 }
             }
diff --git a/src/config_files.rs b/src/config_files.rs
index 3493fe0be8..ca77113ae5 100644
--- a/src/config_files.rs
+++ b/src/config_files.rs
@@ -2,14 +2,13 @@ use log::warn;
 #[cfg(feature = "plugin")]
 use nu_cli::read_plugin_file;
 use nu_cli::{eval_config_contents, eval_source};
-use nu_engine::convert_env_values;
 use nu_path::canonicalize_with;
 use nu_protocol::{
     engine::{EngineState, Stack, StateWorkingSet},
     eval_const::{get_user_autoload_dirs, get_vendor_autoload_dirs},
     report_parse_error, report_shell_error, Config, ParseError, PipelineData, Spanned,
 };
-use nu_utils::{get_default_config, get_default_env, get_scaffold_config, get_scaffold_env, perf};
+use nu_utils::{get_default_config, get_default_env, get_scaffold_config, get_scaffold_env};
 use std::{
     fs,
     fs::File,
@@ -37,20 +36,6 @@ pub(crate) fn read_config_file(
 
     if is_env_config {
         eval_default_config(engine_state, stack, get_default_env(), is_env_config);
-
-        let start_time = std::time::Instant::now();
-        let config = engine_state.get_config();
-        let use_color = config.use_ansi_coloring.get(engine_state);
-        // Translate environment variables from Strings to Values
-        if let Err(e) = convert_env_values(engine_state, stack) {
-            report_shell_error(engine_state, &e);
-        }
-
-        perf!(
-            "translate env vars after default_env.nu",
-            start_time,
-            use_color
-        );
     } else {
         eval_default_config(engine_state, stack, get_default_config(), is_env_config);
     };
diff --git a/src/main.rs b/src/main.rs
index cb86557ac2..0e7c656fc7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -21,11 +21,13 @@ use command::gather_commandline_args;
 use log::{trace, Level};
 use miette::Result;
 use nu_cli::gather_parent_env_vars;
+use nu_engine::convert_env_values;
 use nu_lsp::LanguageServer;
 use nu_path::canonicalize_with;
 use nu_protocol::{
-    engine::EngineState, record, report_shell_error, ByteStream, Config, IntoValue, PipelineData,
-    ShellError, Span, Spanned, Type, Value,
+    engine::{EngineState, Stack},
+    record, report_shell_error, ByteStream, Config, IntoValue, PipelineData, ShellError, Span,
+    Spanned, Type, Value,
 };
 use nu_std::load_standard_library;
 use nu_utils::perf;
@@ -319,6 +321,16 @@ fn main() -> Result<()> {
     gather_parent_env_vars(&mut engine_state, init_cwd.as_ref());
     perf!("gather env vars", start_time, use_color);
 
+    let mut stack = Stack::new();
+    start_time = std::time::Instant::now();
+    let config = engine_state.get_config();
+    let use_color = config.use_ansi_coloring.get(&engine_state);
+    // Translate environment variables from Strings to Values
+    if let Err(e) = convert_env_values(&mut engine_state, &mut stack) {
+        report_shell_error(&engine_state, &e);
+    }
+    perf!("Convert path to list", start_time, use_color);
+
     engine_state.add_env_var(
         "NU_VERSION".to_string(),
         Value::string(env!("CARGO_PKG_VERSION"), Span::unknown()),
@@ -464,6 +476,7 @@ fn main() -> Result<()> {
     } else if let Some(commands) = parsed_nu_cli_args.commands.clone() {
         run_commands(
             &mut engine_state,
+            stack,
             parsed_nu_cli_args,
             use_color,
             &commands,
@@ -473,6 +486,7 @@ fn main() -> Result<()> {
     } else if !script_name.is_empty() {
         run_file(
             &mut engine_state,
+            stack,
             parsed_nu_cli_args,
             use_color,
             script_name,
@@ -509,7 +523,12 @@ fn main() -> Result<()> {
         shlvl += 1;
         engine_state.add_env_var("SHLVL".to_string(), Value::int(shlvl, Span::unknown()));
 
-        run_repl(&mut engine_state, parsed_nu_cli_args, entire_start_time)?
+        run_repl(
+            &mut engine_state,
+            stack,
+            parsed_nu_cli_args,
+            entire_start_time,
+        )?
     }
 
     Ok(())
diff --git a/src/run.rs b/src/run.rs
index 640cc9bc35..fc3bca3676 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -14,6 +14,7 @@ use nu_utils::perf;
 
 pub(crate) fn run_commands(
     engine_state: &mut EngineState,
+    mut stack: Stack,
     parsed_nu_cli_args: command::NushellCliArgs,
     use_color: bool,
     commands: &Spanned<String>,
@@ -25,8 +26,6 @@ pub(crate) fn run_commands(
     let start_time = std::time::Instant::now();
     let create_scaffold = nu_path::nu_config_dir().map_or(false, |p| !p.exists());
 
-    let mut stack = Stack::new();
-
     // if the --no-config-file(-n) option is NOT passed, load the plugin file,
     // load the default env file or custom (depending on parsed_nu_cli_args.env_file),
     // and maybe a custom config file (depending on parsed_nu_cli_args.config_file)
@@ -107,6 +106,7 @@ pub(crate) fn run_commands(
 
 pub(crate) fn run_file(
     engine_state: &mut EngineState,
+    mut stack: Stack,
     parsed_nu_cli_args: command::NushellCliArgs,
     use_color: bool,
     script_name: String,
@@ -114,7 +114,6 @@ pub(crate) fn run_file(
     input: PipelineData,
 ) {
     trace!("run_file");
-    let mut stack = Stack::new();
 
     // if the --no-config-file(-n) option is NOT passed, load the plugin file,
     // load the default env file or custom (depending on parsed_nu_cli_args.env_file),
@@ -177,11 +176,11 @@ pub(crate) fn run_file(
 
 pub(crate) fn run_repl(
     engine_state: &mut EngineState,
+    mut stack: Stack,
     parsed_nu_cli_args: command::NushellCliArgs,
     entire_start_time: std::time::Instant,
 ) -> Result<(), miette::ErrReport> {
     trace!("run_repl");
-    let mut stack = Stack::new();
     let start_time = std::time::Instant::now();
 
     if parsed_nu_cli_args.no_config_file.is_none() {
diff --git a/tests/shell/environment/env.rs b/tests/shell/environment/env.rs
index ab97eb6872..6513db1fbc 100644
--- a/tests/shell/environment/env.rs
+++ b/tests/shell/environment/env.rs
@@ -258,10 +258,39 @@ fn env_shlvl_in_repl() {
 
 #[test]
 fn env_shlvl_in_exec_repl() {
-    let actual = nu!("
+    let actual = nu!(r#"
         $env.SHLVL = 29
-        nu -c \"exec nu --no-std-lib -n -e 'print $env.SHLVL; exit'\"
-    ");
+        nu -c "exec nu --no-std-lib -n -e 'print $env.SHLVL; exit'"
+    "#);
 
     assert_eq!(actual.out, "30");
 }
+
+#[test]
+fn path_is_a_list_in_repl() {
+    let actual = nu!(r#"
+        nu -c "exec nu --no-std-lib -n -e 'print ($env.pATh | describe); exit'"
+    "#);
+
+    assert_eq!(actual.out, "list<string>");
+}
+
+#[test]
+fn path_is_a_list() {
+    let actual = nu!("
+        print ($env.path | describe)
+    ");
+
+    assert_eq!(actual.out, "list<string>");
+}
+
+#[test]
+fn path_is_a_list_in_script() {
+    Playground::setup("has_file_pwd", |dirs, sandbox| {
+        sandbox.with_files(&[FileWithContent("checkpath.nu", "$env.path | describe")]);
+
+        let actual = nu!(cwd: dirs.test(), "nu checkpath.nu");
+
+        assert!(actual.out.ends_with("list<string>"));
+    })
+}

From 8e8a60a4325e355f15f74979773eed7652321426 Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Sat, 11 Jan 2025 00:55:41 +0100
Subject: [PATCH 0906/1072] Add `"whereis"` and `"get-command"` to `which`
 search terms (#14797)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

Today i saw in the general discord channel someone ask what is the
nushell equivalent of `whereis` or `get-command`. I wanted to tell the
user to use our great search via F1 but then I realized that typing in
`whereis` or `get-command` wouldn't really find you something. So I
added these two search terms.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

None.

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

I don't think that really needs testing here :D

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/system/which_.rs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/system/which_.rs b/crates/nu-command/src/system/which_.rs
index a386590605..f5123dd3b6 100644
--- a/crates/nu-command/src/system/which_.rs
+++ b/crates/nu-command/src/system/which_.rs
@@ -25,7 +25,14 @@ impl Command for Which {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["find", "path", "location", "command"]
+        vec![
+            "find",
+            "path",
+            "location",
+            "command",
+            "whereis",     // linux binary to find binary locations in path
+            "get-command", // powershell command to find commands and binaries in path
+        ]
     }
 
     fn run(

From b9b3101bd98b376b0ab166409db89c2fc7bcd506 Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Sat, 11 Jan 2025 02:24:16 +0100
Subject: [PATCH 0907/1072] Let `table` only check for `use_ansi_coloring`
 config value (#14798)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

This PR removes the `std::io::stdout().is_terminal()` check in `table`
again. To ensure that in the future this doesn't happen again, I added a
comment and a test.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

Resets the behavior of `table` to #14647 again, after #14415 included it
again.

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

Added a new test to check for these color outputs.

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/viewers/table.rs    |  9 +++++----
 crates/nu-command/tests/commands/table.rs | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index e081bdb9de..bac035f94a 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -2,7 +2,7 @@
 //        overall reduce the redundant calls to StyleComputer etc.
 //        the goal is to configure it once...
 
-use std::{collections::VecDeque, io::IsTerminal, io::Read, path::PathBuf, str::FromStr};
+use std::{collections::VecDeque, io::Read, path::PathBuf, str::FromStr};
 
 use lscolors::{LsColors, Style};
 use url::Url;
@@ -310,7 +310,7 @@ fn get_cli_args(call: &Call<'_>, state: &EngineState, stack: &mut Stack) -> Shel
         get_theme_flag(call, state, stack)?.unwrap_or_else(|| stack.get_config(state).table.mode);
     let index = get_index_flag(call, state, stack)?;
 
-    let use_ansi_coloring = state.get_config().use_ansi_coloring.get(state);
+    let use_ansi_coloring = stack.get_config(state).use_ansi_coloring.get(state);
 
     Ok(CLIArgs {
         theme,
@@ -1067,8 +1067,9 @@ fn render_path_name(
 }
 
 fn maybe_strip_color(output: String, use_ansi_coloring: bool) -> String {
-    // the terminal is for when people do ls from vim, there should be no coloring there
-    if !use_ansi_coloring || !std::io::stdout().is_terminal() {
+    // only use `use_ansi_coloring` here, it already includes `std::io::stdout().is_terminal()`
+    // when set to "auto"
+    if !use_ansi_coloring {
         // Draw the table without ansi colors
         nu_utils::strip_ansi_string_likely(output)
     } else {
diff --git a/crates/nu-command/tests/commands/table.rs b/crates/nu-command/tests/commands/table.rs
index 586987970c..04473e1776 100644
--- a/crates/nu-command/tests/commands/table.rs
+++ b/crates/nu-command/tests/commands/table.rs
@@ -3100,3 +3100,22 @@ fn table_footer_inheritance_list_rows() {
          ╰───┴──────┴───────────────────────╯"
     );
 }
+
+/// Test checking whether automatic table rendering correctly uses ansi coloring.
+#[test]
+fn table_colors() {
+    let actual = nu!(concat!(
+        "$env.config.use_ansi_coloring = true;",
+        "{a: 1, b: 2}",
+    ));
+    assert_eq!(
+        actual.out,
+        "\u{1b}[37m╭───┬───╮\u{1b}[0m\u{1b}[37m│\u{1b}[0m \u{1b}[1;32ma\u{1b}[0m \u{1b}[37m│\u{1b}[0m \u{1b}[37m1\u{1b}[0m \u{1b}[37m│\u{1b}[0m\u{1b}[37m│\u{1b}[0m \u{1b}[1;32mb\u{1b}[0m \u{1b}[37m│\u{1b}[0m \u{1b}[37m2\u{1b}[0m \u{1b}[37m│\u{1b}[0m\u{1b}[37m╰───┴───╯\u{1b}[0m" 
+    );
+
+    let actual = nu!(concat!(
+        "$env.config.use_ansi_coloring = false;",
+        "{a: 1, b: 2}",
+    ));
+    assert_eq!(actual.out, "╭───┬───╮│ a │ 1 ││ b │ 2 │╰───┴───╯");
+}

From 827e31191dce2c4396ffa730fb1d5cae26aa020a Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Sat, 11 Jan 2025 20:53:08 +0800
Subject: [PATCH 0908/1072] fix: unknown span for special variables `$in/$it`
 (#14789)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->


This PR addresses the issue of inconsistent spans of special variables
of `$in/$in`, as discussed in
https://github.com/nushell/nushell/pull/14770#discussion_r1908729364.

Instead of making the `declaration_span` to be Option, which will cause
too many changes that we may want to avoid, this PR set the spans to be
`unknown`.


# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

No

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-lsp/src/symbols.rs       | 27 +++++++++++++++++++++++----
 crates/nu-parser/src/parser.rs     |  4 ++--
 tests/fixtures/lsp/symbols/span.nu |  3 +++
 3 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 tests/fixtures/lsp/symbols/span.nu

diff --git a/crates/nu-lsp/src/symbols.rs b/crates/nu-lsp/src/symbols.rs
index 7cec5b5756..8b76b96817 100644
--- a/crates/nu-lsp/src/symbols.rs
+++ b/crates/nu-lsp/src/symbols.rs
@@ -118,10 +118,6 @@ impl SymbolCache {
                 }
                 let range = span_to_range(&span, doc, doc_span.start);
                 let name = doc.get_content(Some(range));
-                // TODO: better way to filter closures with type any
-                if name.contains('\r') || name.contains('\n') || name.contains('{') {
-                    return None;
-                }
                 Some(Symbol {
                     name: name.to_string(),
                     kind: SymbolKind::VARIABLE,
@@ -343,6 +339,29 @@ mod tests {
             .unwrap()
     }
 
+    #[test]
+    // for variable `$in/$it`, should not appear in symbols
+    fn document_symbol_special_variables() {
+        let (client_connection, _recv) = initialize_language_server();
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("symbols");
+        script.push("span.nu");
+        let script = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script.clone());
+
+        let resp = document_symbol_test(&client_connection, script.clone());
+        let result = if let Message::Response(response) = resp {
+            response.result
+        } else {
+            panic!()
+        };
+
+        assert_json_eq!(result, serde_json::json!([]));
+    }
+
     #[test]
     fn document_symbol_basic() {
         let (client_connection, _recv) = initialize_language_server();
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 93c8cf4425..dd11edc974 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -3435,7 +3435,7 @@ pub fn parse_full_signature(working_set: &mut StateWorkingSet, spans: &[Span]) -
 }
 
 pub fn parse_row_condition(working_set: &mut StateWorkingSet, spans: &[Span]) -> Expression {
-    let var_id = working_set.add_variable(b"$it".to_vec(), Span::concat(spans), Type::Any, false);
+    let var_id = working_set.add_variable(b"$it".to_vec(), Span::unknown(), Type::Any, false);
     let expression = parse_math_expression(working_set, spans, Some(var_id));
     let span = Span::concat(spans);
 
@@ -6633,7 +6633,7 @@ fn wrap_expr_with_collect(working_set: &mut StateWorkingSet, expr: Expression) -
 
     // IN_VARIABLE_ID should get replaced with a unique variable, so that we don't have to
     // execute as a closure
-    let var_id = working_set.add_variable(b"$in".into(), expr.span, Type::Any, false);
+    let var_id = working_set.add_variable(b"$in".into(), Span::unknown(), Type::Any, false);
     let mut expr = expr.clone();
     expr.replace_in_variable(working_set, var_id);
 
diff --git a/tests/fixtures/lsp/symbols/span.nu b/tests/fixtures/lsp/symbols/span.nu
new file mode 100644
index 0000000000..3da732c79a
--- /dev/null
+++ b/tests/fixtures/lsp/symbols/span.nu
@@ -0,0 +1,3 @@
+ls | where name != foo
+ls | each { $in }
+ls | $in.name

From 902e6d7a2768399ecaac6d3c5e0711828950f43d Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Sat, 11 Jan 2025 21:00:28 +0800
Subject: [PATCH 0909/1072] Do not trigger release WF on nightly tags (#14803)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

Don't trigger release for nightly tags, more context could be found
here: https://github.com/nushell/nightly/issues/35
---
 .github/workflows/release.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 493719efc7..d11c9ab747 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,7 +7,9 @@ name: Create Release Draft
 on:
   workflow_dispatch:
   push:
-    tags: ["[0-9]+.[0-9]+.[0-9]+*"]
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+*'
+      - '!*nightly*'  # Don't trigger release for nightly tags
 
 defaults:
   run:

From c811d86dbd35e965c132e5d42879581a1064cde7 Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Sat, 11 Jan 2025 21:13:55 +0800
Subject: [PATCH 0910/1072] feat(lsp): inlay hints of variable types and
 command params (#14802)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

This PR adds inlay hints of variable types and parameter names to
lsp-server
<img width="547" alt="image"
src="https://github.com/user-attachments/assets/07a0dd84-5ecc-47df-a8a7-732631715662"
/>

Some design choices I made:
* for composite types like `record<foo: <record ...>>`, only a short
name displayed. Full signature already available through `hover`
* only parameter names of user defined commands are returned, feels too
much distraction if enabled for all builtins
* some information are lost in flattened expressions, so I implemented
my AST traversing functions, which may seem unnecessary, but I can't
find alternatives from the existing code.
* another minor change: added a line separator to current hover markdown
message.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

Users who think this feature annoying now have to manually turn it off
(or config the lsp client capabilities).

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-lsp/src/diagnostics.rs  |   3 +-
 crates/nu-lsp/src/hints.rs        | 472 ++++++++++++++++++++++++++++++
 crates/nu-lsp/src/lib.rs          |  81 +++--
 crates/nu-lsp/src/notification.rs |  32 +-
 tests/fixtures/lsp/hints/param.nu |  13 +
 tests/fixtures/lsp/hints/type.nu  |   8 +
 6 files changed, 560 insertions(+), 49 deletions(-)
 create mode 100644 crates/nu-lsp/src/hints.rs
 create mode 100644 tests/fixtures/lsp/hints/param.nu
 create mode 100644 tests/fixtures/lsp/hints/type.nu

diff --git a/crates/nu-lsp/src/diagnostics.rs b/crates/nu-lsp/src/diagnostics.rs
index 1fec77d541..b6bf751fa5 100644
--- a/crates/nu-lsp/src/diagnostics.rs
+++ b/crates/nu-lsp/src/diagnostics.rs
@@ -10,7 +10,8 @@ impl LanguageServer {
         let mut engine_state = self.new_engine_state();
         engine_state.generate_nu_constant();
 
-        let Some((_, offset, working_set, file)) = self.parse_file(&mut engine_state, &uri) else {
+        let Some((_, offset, working_set, file)) = self.parse_file(&mut engine_state, &uri, true)
+        else {
             return Ok(());
         };
 
diff --git a/crates/nu-lsp/src/hints.rs b/crates/nu-lsp/src/hints.rs
new file mode 100644
index 0000000000..2fb8c373d8
--- /dev/null
+++ b/crates/nu-lsp/src/hints.rs
@@ -0,0 +1,472 @@
+use std::sync::Arc;
+
+use crate::{span_to_range, LanguageServer};
+use lsp_textdocument::FullTextDocument;
+use lsp_types::{
+    InlayHint, InlayHintKind, InlayHintLabel, InlayHintParams, InlayHintTooltip, MarkupContent,
+    MarkupKind, Position, Range,
+};
+use nu_protocol::{
+    ast::{
+        Argument, Block, Expr, Expression, ExternalArgument, ListItem, MatchPattern, Pattern,
+        PipelineRedirection, RecordItem,
+    },
+    engine::StateWorkingSet,
+    Type,
+};
+
+/// similar to flatten_block, but allows extra map function
+fn ast_flat_map<T, E>(
+    ast: &Arc<Block>,
+    working_set: &StateWorkingSet,
+    extra_args: &E,
+    f_special: fn(&Expression, &StateWorkingSet, &E) -> Option<Vec<T>>,
+) -> Vec<T> {
+    ast.pipelines
+        .iter()
+        .flat_map(|pipeline| {
+            pipeline.elements.iter().flat_map(|element| {
+                expr_flat_map(&element.expr, working_set, extra_args, f_special)
+                    .into_iter()
+                    .chain(
+                        element
+                            .redirection
+                            .as_ref()
+                            .map(|redir| {
+                                redirect_flat_map(redir, working_set, extra_args, f_special)
+                            })
+                            .unwrap_or_default(),
+                    )
+            })
+        })
+        .collect()
+}
+
+/// generic function that do flat_map on an expression
+/// concats all recursive results on sub-expressions
+///
+/// # Arguments
+/// * `f_special` - function that overrides the default behavior
+fn expr_flat_map<T, E>(
+    expr: &Expression,
+    working_set: &StateWorkingSet,
+    extra_args: &E,
+    f_special: fn(&Expression, &StateWorkingSet, &E) -> Option<Vec<T>>,
+) -> Vec<T> {
+    // behavior overridden by f_special
+    if let Some(vec) = f_special(expr, working_set, extra_args) {
+        return vec;
+    }
+    let recur = |expr| expr_flat_map(expr, working_set, extra_args, f_special);
+    match &expr.expr {
+        Expr::RowCondition(block_id)
+        | Expr::Subexpression(block_id)
+        | Expr::Block(block_id)
+        | Expr::Closure(block_id) => {
+            let block = working_set.get_block(block_id.to_owned());
+            ast_flat_map(block, working_set, extra_args, f_special)
+        }
+        Expr::Range(range) => [&range.from, &range.next, &range.to]
+            .iter()
+            .filter_map(|e| e.as_ref())
+            .flat_map(recur)
+            .collect(),
+        Expr::Call(call) => call
+            .arguments
+            .iter()
+            .filter_map(|arg| arg.expr())
+            .flat_map(recur)
+            .collect(),
+        Expr::ExternalCall(head, args) => recur(head)
+            .into_iter()
+            .chain(args.iter().flat_map(|arg| match arg {
+                ExternalArgument::Regular(e) | ExternalArgument::Spread(e) => recur(e),
+            }))
+            .collect(),
+        Expr::UnaryNot(expr) | Expr::Collect(_, expr) => recur(expr),
+        Expr::BinaryOp(lhs, op, rhs) => recur(lhs)
+            .into_iter()
+            .chain(recur(op))
+            .chain(recur(rhs))
+            .collect(),
+        Expr::MatchBlock(matches) => matches
+            .iter()
+            .flat_map(|(pattern, expr)| {
+                match_pattern_flat_map(pattern, working_set, extra_args, f_special)
+                    .into_iter()
+                    .chain(recur(expr))
+            })
+            .collect(),
+        Expr::List(items) => items
+            .iter()
+            .flat_map(|item| match item {
+                ListItem::Item(expr) | ListItem::Spread(_, expr) => recur(expr),
+            })
+            .collect(),
+        Expr::Record(items) => items
+            .iter()
+            .flat_map(|item| match item {
+                RecordItem::Spread(_, expr) => recur(expr),
+                RecordItem::Pair(key, val) => [key, val].into_iter().flat_map(recur).collect(),
+            })
+            .collect(),
+        Expr::Table(table) => table
+            .columns
+            .iter()
+            .flat_map(recur)
+            .chain(table.rows.iter().flat_map(|row| row.iter().flat_map(recur)))
+            .collect(),
+        Expr::ValueWithUnit(vu) => recur(&vu.expr),
+        Expr::FullCellPath(fcp) => recur(&fcp.head),
+        Expr::Keyword(kw) => recur(&kw.expr),
+        Expr::StringInterpolation(vec) | Expr::GlobInterpolation(vec, _) => {
+            vec.iter().flat_map(recur).collect()
+        }
+
+        _ => Vec::new(),
+    }
+}
+
+/// flat_map on match patterns
+fn match_pattern_flat_map<T, E>(
+    pattern: &MatchPattern,
+    working_set: &StateWorkingSet,
+    extra_args: &E,
+    f_special: fn(&Expression, &StateWorkingSet, &E) -> Option<Vec<T>>,
+) -> Vec<T> {
+    let recur = |expr| expr_flat_map(expr, working_set, extra_args, f_special);
+    let recur_match = |p| match_pattern_flat_map(p, working_set, extra_args, f_special);
+    match &pattern.pattern {
+        Pattern::Expression(expr) => recur(expr),
+        Pattern::List(patterns) | Pattern::Or(patterns) => {
+            patterns.iter().flat_map(recur_match).collect()
+        }
+        Pattern::Record(entries) => entries.iter().flat_map(|(_, p)| recur_match(p)).collect(),
+        _ => Vec::new(),
+    }
+    .into_iter()
+    .chain(pattern.guard.as_ref().map(|g| recur(g)).unwrap_or_default())
+    .collect()
+}
+
+/// flat_map on redirections
+fn redirect_flat_map<T, E>(
+    redir: &PipelineRedirection,
+    working_set: &StateWorkingSet,
+    extra_args: &E,
+    f_special: fn(&Expression, &StateWorkingSet, &E) -> Option<Vec<T>>,
+) -> Vec<T> {
+    let recur = |expr| expr_flat_map(expr, working_set, extra_args, f_special);
+    match redir {
+        PipelineRedirection::Single { target, .. } => target.expr().map(recur).unwrap_or_default(),
+        PipelineRedirection::Separate { out, err } => [out, err]
+            .iter()
+            .filter_map(|t| t.expr())
+            .flat_map(recur)
+            .collect(),
+    }
+}
+
+fn extract_inlay_hints_from_expression(
+    expr: &Expression,
+    working_set: &StateWorkingSet,
+    extra_args: &(usize, &FullTextDocument),
+) -> Option<Vec<InlayHint>> {
+    let span = expr.span;
+    let (offset, file) = extra_args;
+    let recur = |expr| {
+        expr_flat_map(
+            expr,
+            working_set,
+            extra_args,
+            extract_inlay_hints_from_expression,
+        )
+    };
+    match &expr.expr {
+        Expr::VarDecl(var_id) => {
+            let position = span_to_range(&span, file, *offset).end;
+            // skip if the type is already specified in code
+            if file
+                .get_content(Some(Range {
+                    start: position,
+                    end: Position {
+                        line: position.line,
+                        character: position.character + 1,
+                    },
+                }))
+                .contains(':')
+            {
+                return Some(Vec::new());
+            }
+            let var = working_set.get_variable(*var_id);
+            let type_str_short = match var.ty {
+                Type::Custom(_) => String::from("custom"),
+                Type::Record(_) => String::from("record"),
+                Type::Table(_) => String::from("table"),
+                Type::List(_) => String::from("list"),
+                _ => var.ty.to_string(),
+            };
+            Some(vec![
+                (InlayHint {
+                    kind: Some(InlayHintKind::TYPE),
+                    label: InlayHintLabel::String(format!(": {}", type_str_short)),
+                    position,
+                    text_edits: None,
+                    tooltip: None,
+                    data: None,
+                    padding_left: None,
+                    padding_right: None,
+                }),
+            ])
+        }
+        Expr::Call(call) => {
+            let decl = working_set.get_decl(call.decl_id);
+            // skip those defined outside of the project
+            working_set.get_block(decl.block_id()?).span?;
+            let signatures = decl.signature();
+            let signatures = [
+                signatures.required_positional,
+                signatures.optional_positional,
+            ]
+            .concat();
+            let arguments = &call.arguments;
+            let mut sig_idx = 0;
+            let mut hints = Vec::new();
+            for arg in arguments {
+                match arg {
+                    // skip the rest when spread/unknown arguments encountered
+                    Argument::Spread(expr) | Argument::Unknown(expr) => {
+                        hints.extend(recur(expr));
+                        sig_idx = signatures.len();
+                        continue;
+                    }
+                    // skip current for flags
+                    Argument::Named((_, _, Some(expr))) => {
+                        hints.extend(recur(expr));
+                        continue;
+                    }
+                    Argument::Positional(expr) => {
+                        if let Some(sig) = signatures.get(sig_idx) {
+                            sig_idx += 1;
+                            let position = span_to_range(&arg.span(), file, *offset).start;
+                            hints.push(InlayHint {
+                                kind: Some(InlayHintKind::PARAMETER),
+                                label: InlayHintLabel::String(format!("{}:", sig.name)),
+                                position,
+                                text_edits: None,
+                                tooltip: Some(InlayHintTooltip::MarkupContent(MarkupContent {
+                                    kind: MarkupKind::Markdown,
+                                    value: format!("`{}: {}`", sig.shape, sig.desc),
+                                })),
+                                data: None,
+                                padding_left: None,
+                                padding_right: None,
+                            });
+                        }
+                        hints.extend(recur(expr));
+                    }
+                    _ => {
+                        continue;
+                    }
+                }
+            }
+            Some(hints)
+        }
+        _ => None,
+    }
+}
+
+impl LanguageServer {
+    pub fn get_inlay_hints(&mut self, params: &InlayHintParams) -> Option<Vec<InlayHint>> {
+        Some(self.inlay_hints.get(&params.text_document.uri)?.clone())
+    }
+
+    pub fn extract_inlay_hints(
+        &self,
+        working_set: &StateWorkingSet,
+        block: &Arc<Block>,
+        offset: usize,
+        file: &FullTextDocument,
+    ) -> Vec<InlayHint> {
+        ast_flat_map(
+            block,
+            working_set,
+            &(offset, file),
+            extract_inlay_hints_from_expression,
+        )
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use assert_json_diff::assert_json_eq;
+    use lsp_types::request::Request;
+    use nu_test_support::fs::fixtures;
+
+    use crate::path_to_uri;
+    use crate::tests::{initialize_language_server, open_unchecked};
+    use lsp_server::{Connection, Message};
+    use lsp_types::{
+        request::InlayHintRequest, InlayHintParams, Position, Range, TextDocumentIdentifier, Uri,
+        WorkDoneProgressParams,
+    };
+
+    fn send_inlay_hint_request(client_connection: &Connection, uri: Uri) -> Message {
+        client_connection
+            .sender
+            .send(Message::Request(lsp_server::Request {
+                id: 1.into(),
+                method: InlayHintRequest::METHOD.to_string(),
+                params: serde_json::to_value(InlayHintParams {
+                    text_document: TextDocumentIdentifier { uri },
+                    work_done_progress_params: WorkDoneProgressParams::default(),
+                    // all inlay hints in the file are returned anyway
+                    range: Range {
+                        start: Position {
+                            line: 0,
+                            character: 0,
+                        },
+                        end: Position {
+                            line: 0,
+                            character: 0,
+                        },
+                    },
+                })
+                .unwrap(),
+            }))
+            .unwrap();
+        client_connection
+            .receiver
+            .recv_timeout(std::time::Duration::from_secs(2))
+            .unwrap()
+    }
+
+    #[test]
+    fn inlay_hint_variable_type() {
+        let (client_connection, _recv) = initialize_language_server();
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("hints");
+        script.push("type.nu");
+        let script = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script.clone());
+
+        let resp = send_inlay_hint_request(&client_connection, script.clone());
+        let result = if let Message::Response(response) = resp {
+            response.result
+        } else {
+            panic!()
+        };
+
+        assert_json_eq!(
+            result,
+            serde_json::json!([
+                {
+                    "position": { "line": 0, "character": 7 },
+                    "label": ": int",
+                    "kind": 1
+                },
+                {
+                    "position": { "line": 1, "character": 7 },
+                    "label": ": string",
+                    "kind": 1
+                },
+                {
+                    "position": { "line": 2, "character": 8 },
+                    "label": ": bool",
+                    "kind": 1
+                },
+                {
+                    "position": { "line": 3, "character": 9 },
+                    "label": ": float",
+                    "kind": 1
+                },
+                {
+                    "position": { "line": 4, "character": 8 },
+                    "label": ": list",
+                    "kind": 1
+                },
+                {
+                    "position": { "line": 5, "character": 10 },
+                    "label": ": record",
+                    "kind": 1
+                },
+                {
+                    "position": { "line": 6, "character": 11 },
+                    "label": ": closure",
+                    "kind": 1
+                }
+            ])
+        );
+    }
+
+    #[test]
+    fn inlay_hint_parameter_names() {
+        let (client_connection, _recv) = initialize_language_server();
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("hints");
+        script.push("param.nu");
+        let script = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script.clone());
+
+        let resp = send_inlay_hint_request(&client_connection, script.clone());
+        let result = if let Message::Response(response) = resp {
+            response.result
+        } else {
+            panic!()
+        };
+
+        assert_json_eq!(
+            result,
+            serde_json::json!([
+                {
+                    "position": { "line": 9, "character": 9 },
+                    "label": "a1:",
+                    "kind": 2,
+                    "tooltip": { "kind": "markdown", "value": "`any: `" }
+                },
+                {
+                    "position": { "line": 9, "character": 11 },
+                    "label": "a2:",
+                    "kind": 2,
+                    "tooltip": { "kind": "markdown", "value": "`any: `" }
+                },
+                {
+                    "position": { "line": 9, "character": 18 },
+                    "label": "a3:",
+                    "kind": 2,
+                    "tooltip": { "kind": "markdown", "value": "`any: arg3`" }
+                },
+                {
+                    "position": { "line": 10, "character": 6 },
+                    "label": "a1:",
+                    "kind": 2,
+                    "tooltip": { "kind": "markdown", "value": "`any: `" }
+                },
+                {
+                    "position": { "line": 11, "character": 2 },
+                    "label": "a2:",
+                    "kind": 2,
+                    "tooltip": { "kind": "markdown", "value": "`any: `" }
+                },
+                {
+                    "position": { "line": 12, "character": 11 },
+                    "label": "a1:",
+                    "kind": 2,
+                    "tooltip": { "kind": "markdown", "value": "`any: `" }
+                },
+                {
+                    "position": { "line": 12, "character": 13 },
+                    "label": "a2:",
+                    "kind": 2,
+                    "tooltip": { "kind": "markdown", "value": "`any: `" }
+                }
+            ])
+        );
+    }
+}
diff --git a/crates/nu-lsp/src/lib.rs b/crates/nu-lsp/src/lib.rs
index be3d6fe8a1..60a214ac7a 100644
--- a/crates/nu-lsp/src/lib.rs
+++ b/crates/nu-lsp/src/lib.rs
@@ -3,13 +3,13 @@ use lsp_server::{Connection, IoThreads, Message, Response, ResponseError};
 use lsp_textdocument::{FullTextDocument, TextDocuments};
 use lsp_types::{
     request::{
-        Completion, DocumentSymbolRequest, GotoDefinition, HoverRequest, Request,
+        Completion, DocumentSymbolRequest, GotoDefinition, HoverRequest, InlayHintRequest, Request,
         WorkspaceSymbolRequest,
     },
     CompletionItem, CompletionItemKind, CompletionParams, CompletionResponse, CompletionTextEdit,
-    GotoDefinitionParams, GotoDefinitionResponse, Hover, HoverContents, HoverParams, Location,
-    MarkupContent, MarkupKind, OneOf, Range, ServerCapabilities, TextDocumentSyncKind, TextEdit,
-    Uri,
+    GotoDefinitionParams, GotoDefinitionResponse, Hover, HoverContents, HoverParams, InlayHint,
+    Location, MarkupContent, MarkupKind, OneOf, Range, ServerCapabilities, TextDocumentSyncKind,
+    TextEdit, Uri,
 };
 use miette::{IntoDiagnostic, Result};
 use nu_cli::{NuCompleter, SuggestionKind};
@@ -19,6 +19,7 @@ use nu_protocol::{
     engine::{CachedFile, EngineState, Stack, StateWorkingSet},
     DeclId, ModuleId, Span, Value, VarId,
 };
+use std::collections::BTreeMap;
 use std::{
     path::{Path, PathBuf},
     str::FromStr,
@@ -29,6 +30,7 @@ use symbols::SymbolCache;
 use url::Url;
 
 mod diagnostics;
+mod hints;
 mod notification;
 mod symbols;
 
@@ -46,6 +48,7 @@ pub struct LanguageServer {
     docs: TextDocuments,
     engine_state: EngineState,
     symbol_cache: SymbolCache,
+    inlay_hints: BTreeMap<Uri, Vec<InlayHint>>,
 }
 
 pub fn path_to_uri(path: impl AsRef<Path>) -> Uri {
@@ -87,6 +90,7 @@ impl LanguageServer {
             docs: TextDocuments::new(),
             engine_state,
             symbol_cache: SymbolCache::new(),
+            inlay_hints: BTreeMap::new(),
         })
     }
 
@@ -100,6 +104,7 @@ impl LanguageServer {
             completion_provider: Some(lsp_types::CompletionOptions::default()),
             document_symbol_provider: Some(OneOf::Left(true)),
             workspace_symbol_provider: Some(OneOf::Left(true)),
+            inlay_hint_provider: Some(OneOf::Left(true)),
             ..Default::default()
         })
         .expect("Must be serializable");
@@ -152,6 +157,9 @@ impl LanguageServer {
                                 self.workspace_symbol(params)
                             })
                         }
+                        InlayHintRequest::METHOD => {
+                            Self::handle_lsp_request(request, |params| self.get_inlay_hints(params))
+                        }
                         _ => {
                             continue;
                         }
@@ -189,6 +197,7 @@ impl LanguageServer {
         &mut self,
         engine_state: &'a mut EngineState,
         uri: &Uri,
+        need_hints: bool,
     ) -> Option<(Arc<Block>, usize, StateWorkingSet<'a>, &FullTextDocument)> {
         let mut working_set = StateWorkingSet::new(engine_state);
         let file = self.docs.get_document(uri)?;
@@ -197,12 +206,14 @@ impl LanguageServer {
         let contents = file.get_content(None).as_bytes();
         let _ = working_set.files.push(file_path.clone(), Span::unknown());
         let block = parse(&mut working_set, Some(file_path_str), contents, false);
-        let offset = working_set
-            .get_span_for_filename(file_path_str)
-            .unwrap_or_else(|| panic!("Failed at get_span_for_filename {}", file_path_str))
-            .start;
+        let offset = working_set.get_span_for_filename(file_path_str)?.start;
         // TODO: merge delta back to engine_state?
         // self.engine_state.merge_delta(working_set.render());
+
+        if need_hints {
+            let file_inlay_hints = self.extract_inlay_hints(&working_set, &block, offset, file);
+            self.inlay_hints.insert(uri.clone(), file_inlay_hints);
+        }
         Some((block, offset, working_set, file))
     }
 
@@ -301,7 +312,7 @@ impl LanguageServer {
             .uri
             .to_owned();
         let (block, file_offset, working_set, file) =
-            self.parse_file(&mut engine_state, &path_uri)?;
+            self.parse_file(&mut engine_state, &path_uri, false)?;
         let flattened = flatten_block(&working_set, &block);
         let (id, _, _) = Self::find_id(
             flattened,
@@ -338,7 +349,7 @@ impl LanguageServer {
             .uri
             .to_owned();
         let (block, file_offset, working_set, file) =
-            self.parse_file(&mut engine_state, &path_uri)?;
+            self.parse_file(&mut engine_state, &path_uri, false)?;
         let flattened = flatten_block(&working_set, &block);
         let (id, _, _) = Self::find_id(
             flattened,
@@ -371,7 +382,7 @@ impl LanguageServer {
                 }
 
                 // Usage
-                description.push_str("### Usage \n```nu\n");
+                description.push_str("-----\n### Usage \n```nu\n");
                 let signature = decl.signature();
                 description.push_str(&format!("  {}", signature.name));
                 if !signature.named.is_empty() {
@@ -803,7 +814,7 @@ mod tests {
         }
     }
 
-    fn goto_definition(
+    fn send_goto_definition_request(
         client_connection: &Connection,
         uri: Uri,
         line: u32,
@@ -844,7 +855,7 @@ mod tests {
 
         open_unchecked(&client_connection, script.clone());
 
-        let resp = goto_definition(&client_connection, script.clone(), 2, 12);
+        let resp = send_goto_definition_request(&client_connection, script.clone(), 2, 12);
         let result = if let Message::Response(response) = resp {
             response.result
         } else {
@@ -856,9 +867,9 @@ mod tests {
             serde_json::json!({
                 "uri": script,
                 "range": {
-                "start": { "line": 0, "character": 4 },
-                "end": { "line": 0, "character": 12 }
-            }
+                    "start": { "line": 0, "character": 4 },
+                    "end": { "line": 0, "character": 12 }
+                }
             })
         );
     }
@@ -875,7 +886,7 @@ mod tests {
 
         open_unchecked(&client_connection, script.clone());
 
-        let resp = goto_definition(&client_connection, script.clone(), 4, 1);
+        let resp = send_goto_definition_request(&client_connection, script.clone(), 4, 1);
         let result = if let Message::Response(response) = resp {
             response.result
         } else {
@@ -906,7 +917,7 @@ mod tests {
 
         open_unchecked(&client_connection, script.clone());
 
-        let resp = goto_definition(&client_connection, script.clone(), 4, 2);
+        let resp = send_goto_definition_request(&client_connection, script.clone(), 4, 2);
         let result = if let Message::Response(response) = resp {
             response.result
         } else {
@@ -937,7 +948,7 @@ mod tests {
 
         open_unchecked(&client_connection, script.clone());
 
-        let resp = goto_definition(&client_connection, script.clone(), 1, 14);
+        let resp = send_goto_definition_request(&client_connection, script.clone(), 1, 14);
         let result = if let Message::Response(response) = resp {
             response.result
         } else {
@@ -956,7 +967,12 @@ mod tests {
         );
     }
 
-    pub fn hover(client_connection: &Connection, uri: Uri, line: u32, character: u32) -> Message {
+    pub fn send_hover_request(
+        client_connection: &Connection,
+        uri: Uri,
+        line: u32,
+        character: u32,
+    ) -> Message {
         client_connection
             .sender
             .send(Message::Request(lsp_server::Request {
@@ -991,7 +1007,7 @@ mod tests {
 
         open_unchecked(&client_connection, script.clone());
 
-        let resp = hover(&client_connection, script.clone(), 2, 0);
+        let resp = send_hover_request(&client_connection, script.clone(), 2, 0);
         let result = if let Message::Response(response) = resp {
             response.result
         } else {
@@ -1018,7 +1034,7 @@ mod tests {
 
         open_unchecked(&client_connection, script.clone());
 
-        let resp = hover(&client_connection, script.clone(), 3, 0);
+        let resp = send_hover_request(&client_connection, script.clone(), 3, 0);
         let result = if let Message::Response(response) = resp {
             response.result
         } else {
@@ -1030,7 +1046,7 @@ mod tests {
             serde_json::json!({
                     "contents": {
                     "kind": "markdown",
-                    "value": "Renders some greeting message\n### Usage \n```nu\n  hello {flags}\n```\n\n### Flags\n\n  `-h`, `--help` - Display the help message for this command\n\n"
+                    "value": "Renders some greeting message\n-----\n### Usage \n```nu\n  hello {flags}\n```\n\n### Flags\n\n  `-h`, `--help` - Display the help message for this command\n\n"
                 }
             })
         );
@@ -1048,7 +1064,7 @@ mod tests {
 
         open_unchecked(&client_connection, script.clone());
 
-        let resp = hover(&client_connection, script.clone(), 5, 8);
+        let resp = send_hover_request(&client_connection, script.clone(), 5, 8);
         let result = if let Message::Response(response) = resp {
             response.result
         } else {
@@ -1060,13 +1076,18 @@ mod tests {
             serde_json::json!({
                     "contents": {
                     "kind": "markdown",
-                    "value": "Concatenate multiple strings into a single string, with an optional separator between each.\n### Usage \n```nu\n  str join {flags} <separator?>\n```\n\n### Flags\n\n  `-h`, `--help` - Display the help message for this command\n\n\n### Parameters\n\n  `separator: string` - Optional separator to use when creating string.\n\n\n### Input/output types\n\n```nu\n list<any> | string\n string | string\n\n```\n### Example(s)\n  Create a string from input\n```nu\n  ['nu', 'shell'] | str join\n```\n  Create a string from input with a separator\n```nu\n  ['nu', 'shell'] | str join '-'\n```\n"
+                    "value": "Concatenate multiple strings into a single string, with an optional separator between each.\n-----\n### Usage \n```nu\n  str join {flags} <separator?>\n```\n\n### Flags\n\n  `-h`, `--help` - Display the help message for this command\n\n\n### Parameters\n\n  `separator: string` - Optional separator to use when creating string.\n\n\n### Input/output types\n\n```nu\n list<any> | string\n string | string\n\n```\n### Example(s)\n  Create a string from input\n```nu\n  ['nu', 'shell'] | str join\n```\n  Create a string from input with a separator\n```nu\n  ['nu', 'shell'] | str join '-'\n```\n"
                 }
             })
         );
     }
 
-    fn complete(client_connection: &Connection, uri: Uri, line: u32, character: u32) -> Message {
+    fn send_complete_request(
+        client_connection: &Connection,
+        uri: Uri,
+        line: u32,
+        character: u32,
+    ) -> Message {
         client_connection
             .sender
             .send(Message::Request(lsp_server::Request {
@@ -1103,7 +1124,7 @@ mod tests {
 
         open_unchecked(&client_connection, script.clone());
 
-        let resp = complete(&client_connection, script, 2, 9);
+        let resp = send_complete_request(&client_connection, script, 2, 9);
         let result = if let Message::Response(response) = resp {
             response.result
         } else {
@@ -1140,7 +1161,7 @@ mod tests {
 
         open_unchecked(&client_connection, script.clone());
 
-        let resp = complete(&client_connection, script, 0, 8);
+        let resp = send_complete_request(&client_connection, script, 0, 8);
         let result = if let Message::Response(response) = resp {
             response.result
         } else {
@@ -1178,7 +1199,7 @@ mod tests {
 
         open_unchecked(&client_connection, script.clone());
 
-        let resp = complete(&client_connection, script, 0, 13);
+        let resp = send_complete_request(&client_connection, script, 0, 13);
         let result = if let Message::Response(response) = resp {
             response.result
         } else {
@@ -1216,7 +1237,7 @@ mod tests {
 
         open_unchecked(&client_connection, script.clone());
 
-        let resp = complete(&client_connection, script, 0, 2);
+        let resp = send_complete_request(&client_connection, script, 0, 2);
         let result = if let Message::Response(response) = resp {
             response.result
         } else {
diff --git a/crates/nu-lsp/src/notification.rs b/crates/nu-lsp/src/notification.rs
index 05813f83e2..281e40d72f 100644
--- a/crates/nu-lsp/src/notification.rs
+++ b/crates/nu-lsp/src/notification.rs
@@ -1,10 +1,8 @@
 use lsp_types::{
     notification::{
-        DidChangeTextDocument, DidCloseTextDocument, DidOpenTextDocument, DidSaveTextDocument,
-        Notification,
+        DidChangeTextDocument, DidCloseTextDocument, DidOpenTextDocument, Notification,
     },
-    DidChangeTextDocumentParams, DidCloseTextDocumentParams, DidOpenTextDocumentParams,
-    DidSaveTextDocumentParams, Uri,
+    DidChangeTextDocumentParams, DidCloseTextDocumentParams, DidOpenTextDocumentParams, Uri,
 };
 
 use crate::LanguageServer;
@@ -23,12 +21,6 @@ impl LanguageServer {
                         .expect("Expect receive DidOpenTextDocumentParams");
                 Some(params.text_document.uri)
             }
-            DidSaveTextDocument::METHOD => {
-                let params: DidSaveTextDocumentParams =
-                    serde_json::from_value(notification.params.clone())
-                        .expect("Expect receive DidSaveTextDocumentParams");
-                Some(params.text_document.uri)
-            }
             DidChangeTextDocument::METHOD => {
                 let params: DidChangeTextDocumentParams =
                     serde_json::from_value(notification.params.clone())
@@ -39,7 +31,9 @@ impl LanguageServer {
                 let params: DidCloseTextDocumentParams =
                     serde_json::from_value(notification.params.clone())
                         .expect("Expect receive DidCloseTextDocumentParams");
-                self.symbol_cache.drop(&params.text_document.uri);
+                let uri = params.text_document.uri;
+                self.symbol_cache.drop(&uri);
+                self.inlay_hints.remove(&uri);
                 None
             }
             _ => None,
@@ -55,7 +49,9 @@ mod tests {
     use nu_test_support::fs::fixtures;
 
     use crate::path_to_uri;
-    use crate::tests::{hover, initialize_language_server, open, open_unchecked, update};
+    use crate::tests::{
+        initialize_language_server, open, open_unchecked, send_hover_request, update,
+    };
 
     #[test]
     fn hover_correct_documentation_on_let() {
@@ -69,7 +65,7 @@ mod tests {
 
         open_unchecked(&client_connection, script.clone());
 
-        let resp = hover(&client_connection, script.clone(), 0, 0);
+        let resp = send_hover_request(&client_connection, script.clone(), 0, 0);
         let result = if let Message::Response(response) = resp {
             response.result
         } else {
@@ -81,7 +77,7 @@ mod tests {
             serde_json::json!({
                 "contents": {
                     "kind": "markdown",
-                    "value": "Create a variable and give it a value.\n\nThis command is a parser keyword. For details, check:\n  https://www.nushell.sh/book/thinking_in_nu.html\n### Usage \n```nu\n  let {flags} <var_name> <initial_value>\n```\n\n### Flags\n\n  `-h`, `--help` - Display the help message for this command\n\n\n### Parameters\n\n  `var_name: any` - Variable name.\n\n  `initial_value: any` - Equals sign followed by value.\n\n\n### Input/output types\n\n```nu\n any | nothing\n\n```\n### Example(s)\n  Set a variable to a value\n```nu\n  let x = 10\n```\n  Set a variable to the result of an expression\n```nu\n  let x = 10 + 100\n```\n  Set a variable based on the condition\n```nu\n  let x = if false { -1 } else { 1 }\n```\n"
+                    "value": "Create a variable and give it a value.\n\nThis command is a parser keyword. For details, check:\n  https://www.nushell.sh/book/thinking_in_nu.html\n-----\n### Usage \n```nu\n  let {flags} <var_name> <initial_value>\n```\n\n### Flags\n\n  `-h`, `--help` - Display the help message for this command\n\n\n### Parameters\n\n  `var_name: any` - Variable name.\n\n  `initial_value: any` - Equals sign followed by value.\n\n\n### Input/output types\n\n```nu\n any | nothing\n\n```\n### Example(s)\n  Set a variable to a value\n```nu\n  let x = 10\n```\n  Set a variable to the result of an expression\n```nu\n  let x = 10 + 100\n```\n  Set a variable based on the condition\n```nu\n  let x = if false { -1 } else { 1 }\n```\n"
                 }
             })
         );
@@ -110,7 +106,7 @@ hello"#,
             None,
         );
 
-        let resp = hover(&client_connection, script.clone(), 3, 0);
+        let resp = send_hover_request(&client_connection, script.clone(), 3, 0);
         let result = if let Message::Response(response) = resp {
             response.result
         } else {
@@ -122,7 +118,7 @@ hello"#,
             serde_json::json!({
                 "contents": {
                     "kind": "markdown",
-                    "value": "Renders some updated greeting message\n### Usage \n```nu\n  hello {flags}\n```\n\n### Flags\n\n  `-h`, `--help` - Display the help message for this command\n\n"
+                    "value": "Renders some updated greeting message\n-----\n### Usage \n```nu\n  hello {flags}\n```\n\n### Flags\n\n  `-h`, `--help` - Display the help message for this command\n\n"
                 }
             })
         );
@@ -155,7 +151,7 @@ hello"#,
             }),
         );
 
-        let resp = hover(&client_connection, script.clone(), 3, 0);
+        let resp = send_hover_request(&client_connection, script.clone(), 3, 0);
         let result = if let Message::Response(response) = resp {
             response.result
         } else {
@@ -167,7 +163,7 @@ hello"#,
             serde_json::json!({
                 "contents": {
                     "kind": "markdown",
-                    "value": "Renders some updated greeting message\n### Usage \n```nu\n  hello {flags}\n```\n\n### Flags\n\n  `-h`, `--help` - Display the help message for this command\n\n"
+                    "value": "Renders some updated greeting message\n-----\n### Usage \n```nu\n  hello {flags}\n```\n\n### Flags\n\n  `-h`, `--help` - Display the help message for this command\n\n"
                 }
             })
         );
diff --git a/tests/fixtures/lsp/hints/param.nu b/tests/fixtures/lsp/hints/param.nu
new file mode 100644
index 0000000000..6d9fd7e449
--- /dev/null
+++ b/tests/fixtures/lsp/hints/param.nu
@@ -0,0 +1,13 @@
+def cmd [
+  a1
+  a2
+  --flag (-f)
+  a3? # arg3
+  a4?
+  ...arg_rest
+] { }
+
+ls | cmd 1 $nu -f (
+  cmd 1
+  2
+) ...[(cmd 1 2)]
diff --git a/tests/fixtures/lsp/hints/type.nu b/tests/fixtures/lsp/hints/type.nu
new file mode 100644
index 0000000000..86e8481a5a
--- /dev/null
+++ b/tests/fixtures/lsp/hints/type.nu
@@ -0,0 +1,8 @@
+let int = 1
+let str = "hello"
+let bool = true
+let float = 1.0
+let list = [1 2 3]
+let record = {}
+let closure = {|x| $x }
+let ignored: int = 5

From 707ab1df6af650b757439c561dad44510f0d14fc Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Sat, 11 Jan 2025 07:14:55 -0600
Subject: [PATCH 0911/1072] bump to rust version 1.82 (#14795)

# Description

The PR follows our standard of bumping the rust compiler when a new one
is released.

/cc @ayax79 @sholderbach

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.toml                                    |  2 +-
 crates/nu-explore/src/commands/nu.rs          |  4 ++--
 .../nu-protocol/src/errors/labeled_error.rs   | 23 +++++++++----------
 rust-toolchain.toml                           |  2 +-
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 53d888b118..ac5361a392 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ homepage = "https://www.nushell.sh"
 license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
-rust-version = "1.81.0"
+rust-version = "1.82.0"
 version = "0.101.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/crates/nu-explore/src/commands/nu.rs b/crates/nu-explore/src/commands/nu.rs
index 4bdd55318b..05e74ea8dc 100644
--- a/crates/nu-explore/src/commands/nu.rs
+++ b/crates/nu-explore/src/commands/nu.rs
@@ -69,12 +69,12 @@ impl ViewCommand for NuCmd {
             view.set_top_layer_orientation(Orientation::Left);
         }
 
-        Ok(NuView::Records(view))
+        Ok(NuView::Records(Box::new(view)))
     }
 }
 
 pub enum NuView {
-    Records(RecordView),
+    Records(Box<RecordView>),
     Preview(Preview),
 }
 
diff --git a/crates/nu-protocol/src/errors/labeled_error.rs b/crates/nu-protocol/src/errors/labeled_error.rs
index c76a6c78dd..cdd990463b 100644
--- a/crates/nu-protocol/src/errors/labeled_error.rs
+++ b/crates/nu-protocol/src/errors/labeled_error.rs
@@ -1,11 +1,8 @@
-use std::fmt;
-
+use super::ShellError;
+use crate::Span;
 use miette::Diagnostic;
 use serde::{Deserialize, Serialize};
-
-use crate::Span;
-
-use super::ShellError;
+use std::fmt;
 
 /// A very generic type of error used for interfacing with external code, such as scripts and
 /// plugins.
@@ -18,7 +15,7 @@ pub struct LabeledError {
     pub msg: String,
     /// Labeled spans attached to the error, demonstrating to the user where the problem is.
     #[serde(default)]
-    pub labels: Vec<ErrorLabel>,
+    pub labels: Box<Vec<ErrorLabel>>,
     /// A unique machine- and search-friendly error code to associate to the error. (e.g.
     /// `nu::shell::missing_config_value`)
     #[serde(default)]
@@ -31,7 +28,7 @@ pub struct LabeledError {
     pub help: Option<String>,
     /// Errors that are related to or caused this error
     #[serde(default)]
-    pub inner: Vec<LabeledError>,
+    pub inner: Box<Vec<LabeledError>>,
 }
 
 impl LabeledError {
@@ -50,11 +47,11 @@ impl LabeledError {
     pub fn new(msg: impl Into<String>) -> LabeledError {
         LabeledError {
             msg: msg.into(),
-            labels: vec![],
+            labels: Box::new(vec![]),
             code: None,
             url: None,
             help: None,
-            inner: vec![],
+            inner: Box::new(vec![]),
         }
     }
 
@@ -161,7 +158,8 @@ impl LabeledError {
                     text: label.label().unwrap_or("").into(),
                     span: Span::new(label.offset(), label.offset() + label.len()),
                 })
-                .collect(),
+                .collect::<Vec<_>>()
+                .into(),
             code: diag.code().map(|s| s.to_string()),
             url: diag.url().map(|s| s.to_string()),
             help: diag.help().map(|s| s.to_string()),
@@ -170,7 +168,8 @@ impl LabeledError {
                 .into_iter()
                 .flatten()
                 .map(Self::from_diagnostic)
-                .collect(),
+                .collect::<Vec<_>>()
+                .into(),
         }
     }
 }
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 99b3fdde4d..3c1ce2370b 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -16,4 +16,4 @@ profile = "default"
 # use in nushell, we may opt to use the bleeding edge stable version of rust.
 # I believe rust is on a 6 week release cycle and nushell is on a 4 week release cycle.
 # So, every two nushell releases, this version number should be bumped by one.
-channel = "1.81.0"
+channel = "1.82.0"

From 0b71eb201c15464c7fd9583c2525bcce73e7faf9 Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Sat, 11 Jan 2025 22:03:53 +0800
Subject: [PATCH 0912/1072] fix(lsp): PWD env_var (#14805)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

This PR fixes an issue introduced by #14770 , as shown in
https://github.com/nushell/nushell/pull/14802#issuecomment-2585270161

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-lsp/src/diagnostics.rs      | 24 ++++++++++++++++++++++++
 crates/nu-lsp/src/lib.rs              |  3 ++-
 tests/fixtures/lsp/diagnostics/pwd.nu |  1 +
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 tests/fixtures/lsp/diagnostics/pwd.nu

diff --git a/crates/nu-lsp/src/diagnostics.rs b/crates/nu-lsp/src/diagnostics.rs
index b6bf751fa5..cdb6a35962 100644
--- a/crates/nu-lsp/src/diagnostics.rs
+++ b/crates/nu-lsp/src/diagnostics.rs
@@ -118,4 +118,28 @@ mod tests {
             })
         );
     }
+
+    #[test]
+    fn publish_diagnostics_none() {
+        let (client_connection, _recv) = initialize_language_server();
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("diagnostics");
+        script.push("pwd.nu");
+        let script = path_to_uri(&script);
+
+        let notification = open_unchecked(&client_connection, script.clone());
+
+        assert_json_eq!(
+            notification,
+            serde_json::json!({
+                "method": "textDocument/publishDiagnostics",
+                "params": {
+                    "uri": script,
+                    "diagnostics": []
+                }
+            })
+        );
+    }
 }
diff --git a/crates/nu-lsp/src/lib.rs b/crates/nu-lsp/src/lib.rs
index 60a214ac7a..0bf83e6dfe 100644
--- a/crates/nu-lsp/src/lib.rs
+++ b/crates/nu-lsp/src/lib.rs
@@ -189,7 +189,8 @@ impl LanguageServer {
 
     pub fn new_engine_state(&self) -> EngineState {
         let mut engine_state = self.engine_state.clone();
-        engine_state.add_env_var("PWD".into(), Value::test_string("."));
+        let cwd = std::env::current_dir().expect("Could not get current working directory.");
+        engine_state.add_env_var("PWD".into(), Value::test_string(cwd.to_string_lossy()));
         engine_state
     }
 
diff --git a/tests/fixtures/lsp/diagnostics/pwd.nu b/tests/fixtures/lsp/diagnostics/pwd.nu
new file mode 100644
index 0000000000..fed8808e22
--- /dev/null
+++ b/tests/fixtures/lsp/diagnostics/pwd.nu
@@ -0,0 +1 @@
+const toolkit_dir = path self .

From f05162811cac13a08f5edda7e69d90b2fc423c66 Mon Sep 17 00:00:00 2001
From: Simon Curtis <43214378+simon-curtis@users.noreply.github.com>
Date: Sat, 11 Jan 2025 21:28:08 +0000
Subject: [PATCH 0913/1072] Implementing ByteStream interuption on infinite
 stream (#13552)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

This PR should address #13530 by explicitly handling ByteStreams.

The issue can be replicated easily on linux by running:

```nushell
open /dev/urandom | into binary | bytes at ..10
```

Would leave the output hanging and with no way to cancel it, this was
likely because it was trying to collect the input stream and would not
complete.

I have also put in an error to say that using negative offsets for a
bytestream without a length cannot be used.

```nushell
~/git/nushell> open /dev/urandom | into binary | bytes at (-1)..
Error: nu::shell::incorrect_value

  × Incorrect value.
   ╭─[entry #3:1:35]
 1 │ open /dev/urandom | into binary | bytes at (-1)..
   ·                                   ────┬─── ───┬──
   ·                                       │       ╰── encountered here
   ·                                       ╰── Negative range values cannot be used with streams that don't specify a length
   ╰────
   ```

# User-Facing Changes

No operation changes, only the warning you get back for negative offsets

# Tests + Formatting

Ran `toolkit check pr ` with no errors or warnings

Manual testing of the example commands above

---------

Co-authored-by: Ian Manske <ian.manske@pm.me>
Co-authored-by: Simon Curtis <simon.curtis@candc-uk.com>
---
 crates/nu-cmd-extra/src/example_test.rs       |   7 +-
 crates/nu-cmd-lang/src/example_support.rs     |  15 +-
 crates/nu-cmd-lang/src/example_test.rs        |   7 +-
 crates/nu-command/src/bytes/at.rs             | 155 ++++++----
 crates/nu-command/src/example_test.rs         |   7 +-
 crates/nu-command/src/filters/skip/skip_.rs   |  22 +-
 crates/nu-command/src/filters/take/take_.rs   |  20 +-
 crates/nu-command/tests/commands/bytes/at.rs  |  72 +++++
 crates/nu-command/tests/commands/bytes/mod.rs |   1 +
 crates/nu-protocol/src/errors/shell_error.rs  |  12 +
 .../nu-protocol/src/pipeline/byte_stream.rs   |  76 ++++-
 crates/nu-protocol/src/value/range.rs         |  51 ++++
 crates/nu-protocol/tests/mod.rs               |   1 +
 .../nu-protocol/tests/pipeline/byte_stream.rs | 268 ++++++++++++++++++
 crates/nu-protocol/tests/pipeline/mod.rs      |   1 +
 15 files changed, 612 insertions(+), 103 deletions(-)
 create mode 100644 crates/nu-command/tests/commands/bytes/at.rs
 create mode 100644 crates/nu-protocol/tests/mod.rs
 create mode 100644 crates/nu-protocol/tests/pipeline/byte_stream.rs
 create mode 100644 crates/nu-protocol/tests/pipeline/mod.rs

diff --git a/crates/nu-cmd-extra/src/example_test.rs b/crates/nu-cmd-extra/src/example_test.rs
index 082080f8f9..9ce94bf05b 100644
--- a/crates/nu-cmd-extra/src/example_test.rs
+++ b/crates/nu-cmd-extra/src/example_test.rs
@@ -43,7 +43,12 @@ mod test_examples {
                     signature.operates_on_cell_paths(),
                 ),
             );
-            check_example_evaluates_to_expected_output(&example, cwd.as_path(), &mut engine_state);
+            check_example_evaluates_to_expected_output(
+                cmd.name(),
+                &example,
+                cwd.as_path(),
+                &mut engine_state,
+            );
         }
 
         check_all_signature_input_output_types_entries_have_examples(
diff --git a/crates/nu-cmd-lang/src/example_support.rs b/crates/nu-cmd-lang/src/example_support.rs
index a26876b78c..0ff4428d1a 100644
--- a/crates/nu-cmd-lang/src/example_support.rs
+++ b/crates/nu-cmd-lang/src/example_support.rs
@@ -139,6 +139,7 @@ pub fn eval_block(
 }
 
 pub fn check_example_evaluates_to_expected_output(
+    cmd_name: &str,
     example: &Example,
     cwd: &std::path::Path,
     engine_state: &mut Box<EngineState>,
@@ -159,11 +160,17 @@ pub fn check_example_evaluates_to_expected_output(
     // If the command you are testing requires to compare another case, then
     // you need to define its equality in the Value struct
     if let Some(expected) = example.result.as_ref() {
+        let expected = DebuggableValue(expected);
+        let result = DebuggableValue(&result);
         assert_eq!(
-            DebuggableValue(&result),
-            DebuggableValue(expected),
-            "The example result differs from the expected value",
-        )
+            result,
+            expected,
+            "Error: The result of example '{}' for the command '{}' differs from the expected value.\n\nExpected: {:?}\nActual:   {:?}\n",
+            example.description,
+            cmd_name,
+            expected,
+            result,
+        );
     }
 }
 
diff --git a/crates/nu-cmd-lang/src/example_test.rs b/crates/nu-cmd-lang/src/example_test.rs
index 09c01234f3..e66c8bf5f2 100644
--- a/crates/nu-cmd-lang/src/example_test.rs
+++ b/crates/nu-cmd-lang/src/example_test.rs
@@ -44,7 +44,12 @@ mod test_examples {
                     signature.operates_on_cell_paths(),
                 ),
             );
-            check_example_evaluates_to_expected_output(&example, cwd.as_path(), &mut engine_state);
+            check_example_evaluates_to_expected_output(
+                cmd.name(),
+                &example,
+                cwd.as_path(),
+                &mut engine_state,
+            );
         }
 
         check_all_signature_input_output_types_entries_have_examples(
diff --git a/crates/nu-command/src/bytes/at.rs b/crates/nu-command/src/bytes/at.rs
index adb4bfd9c2..9663e545a4 100644
--- a/crates/nu-command/src/bytes/at.rs
+++ b/crates/nu-command/src/bytes/at.rs
@@ -1,15 +1,14 @@
-use nu_cmd_base::{
-    input_handler::{operate, CmdArgument},
-    util,
-};
+use std::ops::Bound;
+
+use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
-use nu_protocol::Range;
+use nu_protocol::{IntRange, Range};
 
 #[derive(Clone)]
 pub struct BytesAt;
 
 struct Arguments {
-    indexes: Subbytes,
+    range: IntRange,
     cell_paths: Option<Vec<CellPath>>,
 }
 
@@ -19,15 +18,6 @@ impl CmdArgument for Arguments {
     }
 }
 
-impl From<(isize, isize)> for Subbytes {
-    fn from(input: (isize, isize)) -> Self {
-        Self(input.0, input.1)
-    }
-}
-
-#[derive(Clone, Copy)]
-struct Subbytes(isize, isize);
-
 impl Command for BytesAt {
     fn name(&self) -> &str {
         "bytes at"
@@ -44,6 +34,7 @@ impl Command for BytesAt {
                 (Type::table(), Type::table()),
                 (Type::record(), Type::record()),
             ])
+            .allow_variants_without_examples(true)
             .required("range", SyntaxShape::Range, "The range to get bytes.")
             .rest(
                 "rest",
@@ -68,86 +59,115 @@ impl Command for BytesAt {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let range: Range = call.req(engine_state, stack, 0)?;
-        let indexes = match util::process_range(&range) {
-            Ok(idxs) => idxs.into(),
-            Err(processing_error) => {
-                return Err(processing_error("could not perform subbytes", call.head));
+        let range = match call.req(engine_state, stack, 0)? {
+            Range::IntRange(range) => range,
+            _ => {
+                return Err(ShellError::UnsupportedInput {
+                    msg: "Float ranges are not supported for byte streams".into(),
+                    input: "value originates from here".into(),
+                    msg_span: call.head,
+                    input_span: call.head,
+                })
             }
         };
 
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
         let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
-        let args = Arguments {
-            indexes,
-            cell_paths,
-        };
 
-        operate(action, args, input, call.head, engine_state.signals())
+        if let PipelineData::ByteStream(stream, metadata) = input {
+            let stream = stream.slice(call.head, call.arguments_span(), range)?;
+            Ok(PipelineData::ByteStream(stream, metadata))
+        } else {
+            operate(
+                map_value,
+                Arguments { range, cell_paths },
+                input,
+                call.head,
+                engine_state.signals(),
+            )
+        }
     }
 
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
-                description: "Get a subbytes `0x[10 01]` from the bytes `0x[33 44 55 10 01 13]`",
-                example: " 0x[33 44 55 10 01 13] | bytes at 3..<4",
-                result: Some(Value::test_binary(vec![0x10])),
-            },
-            Example {
-                description: "Get a subbytes `0x[10 01 13]` from the bytes `0x[33 44 55 10 01 13]`",
-                example: " 0x[33 44 55 10 01 13] | bytes at 3..6",
-                result: Some(Value::test_binary(vec![0x10, 0x01, 0x13])),
-            },
-            Example {
-                description: "Get the remaining characters from a starting index",
-                example: " { data: 0x[33 44 55 10 01 13] } | bytes at 3.. data",
+                description: "Extract bytes starting from a specific index",
+                example: "{ data: 0x[33 44 55 10 01 13 10] } | bytes at 3.. data",
                 result: Some(Value::test_record(record! {
-                    "data" => Value::test_binary(vec![0x10, 0x01, 0x13]),
+                    "data" => Value::test_binary(vec![0x10, 0x01, 0x13, 0x10]),
                 })),
             },
             Example {
-                description: "Get the characters from the beginning until ending index",
-                example: " 0x[33 44 55 10 01 13] | bytes at ..<4",
+                description: "Slice out `0x[10 01 13]` from `0x[33 44 55 10 01 13]`",
+                example: "0x[33 44 55 10 01 13] | bytes at 3..5",
+                result: Some(Value::test_binary(vec![0x10, 0x01, 0x13])),
+            },
+            Example {
+                description: "Extract bytes from the start up to a specific index",
+                example: "0x[33 44 55 10 01 13 10] | bytes at ..4",
+                result: Some(Value::test_binary(vec![0x33, 0x44, 0x55, 0x10, 0x01])),
+            },
+            Example {
+                description: "Extract byte `0x[10]` using an exclusive end index",
+                example: "0x[33 44 55 10 01 13 10] | bytes at 3..<4",
+                result: Some(Value::test_binary(vec![0x10])),
+            },
+            Example {
+                description: "Extract bytes up to a negative index (inclusive)",
+                example: "0x[33 44 55 10 01 13 10] | bytes at ..-4",
                 result: Some(Value::test_binary(vec![0x33, 0x44, 0x55, 0x10])),
             },
             Example {
-                description:
-                    "Or the characters from the beginning until ending index inside a table",
-                example: r#" [[ColA ColB ColC]; [0x[11 12 13] 0x[14 15 16] 0x[17 18 19]]] | bytes at 1.. ColB ColC"#,
+                description: "Slice bytes across multiple table columns",
+                example: r#"[[ColA ColB ColC]; [0x[11 12 13] 0x[14 15 16] 0x[17 18 19]]] | bytes at 1.. ColB ColC"#,
                 result: Some(Value::test_list(vec![Value::test_record(record! {
                     "ColA" => Value::test_binary(vec![0x11, 0x12, 0x13]),
                     "ColB" => Value::test_binary(vec![0x15, 0x16]),
                     "ColC" => Value::test_binary(vec![0x18, 0x19]),
                 })])),
             },
+            Example {
+                description: "Extract the last three bytes using a negative start index",
+                example: "0x[33 44 55 10 01 13 10] | bytes at (-3)..",
+                result: Some(Value::test_binary(vec![0x01, 0x13, 0x10])),
+            },
         ]
     }
 }
 
-fn action(input: &Value, args: &Arguments, head: Span) -> Value {
-    let range = &args.indexes;
+fn map_value(input: &Value, args: &Arguments, head: Span) -> Value {
+    let range = &args.range;
     match input {
         Value::Binary { val, .. } => {
-            let len = val.len() as isize;
-            let start = if range.0 < 0 { range.0 + len } else { range.0 };
-            let end = if range.1 < 0 { range.1 + len } else { range.1 };
+            let len = val.len() as u64;
+            let start: u64 = range.absolute_start(len);
+            let start: usize = match start.try_into() {
+                Ok(start) => start,
+                Err(_) => {
+                    let span = input.span();
+                    return Value::error(
+                        ShellError::UnsupportedInput {
+                            msg: format!(
+                            "Absolute start position {start} was too large for your system arch."
+                        ),
+                            input: args.range.to_string(),
+                            msg_span: span,
+                            input_span: span,
+                        },
+                        head,
+                    );
+                }
+            };
 
-            if start > end {
-                Value::binary(vec![], head)
-            } else {
-                let val_iter = val.iter().skip(start as usize);
-                Value::binary(
-                    if end == isize::MAX {
-                        val_iter.copied().collect::<Vec<u8>>()
-                    } else {
-                        val_iter.take((end - start + 1) as usize).copied().collect()
-                    },
-                    head,
-                )
-            }
+            let bytes: Vec<u8> = match range.absolute_end(len) {
+                Bound::Unbounded => val[start..].into(),
+                Bound::Included(end) => val[start..=end as usize].into(),
+                Bound::Excluded(end) => val[start..end as usize].into(),
+            };
+
+            Value::binary(bytes, head)
         }
         Value::Error { .. } => input.clone(),
-
         other => Value::error(
             ShellError::UnsupportedInput {
                 msg: "Only binary values are supported".into(),
@@ -159,3 +179,14 @@ fn action(input: &Value, args: &Arguments, head: Span) -> Value {
         ),
     }
 }
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_examples() {
+        use crate::test_examples;
+        test_examples(BytesAt {})
+    }
+}
diff --git a/crates/nu-command/src/example_test.rs b/crates/nu-command/src/example_test.rs
index 4879cab0a9..dca285f835 100644
--- a/crates/nu-command/src/example_test.rs
+++ b/crates/nu-command/src/example_test.rs
@@ -61,7 +61,12 @@ mod test_examples {
                     signature.operates_on_cell_paths(),
                 ),
             );
-            check_example_evaluates_to_expected_output(&example, cwd.as_path(), &mut engine_state);
+            check_example_evaluates_to_expected_output(
+                cmd.name(),
+                &example,
+                cwd.as_path(),
+                &mut engine_state,
+            );
         }
 
         check_all_signature_input_output_types_entries_have_examples(
diff --git a/crates/nu-command/src/filters/skip/skip_.rs b/crates/nu-command/src/filters/skip/skip_.rs
index fade5a00ba..d4adca1455 100644
--- a/crates/nu-command/src/filters/skip/skip_.rs
+++ b/crates/nu-command/src/filters/skip/skip_.rs
@@ -1,6 +1,4 @@
 use nu_engine::command_prelude::*;
-use nu_protocol::Signals;
-use std::io::{self, Read};
 
 #[derive(Clone)]
 pub struct Skip;
@@ -96,22 +94,10 @@ impl Command for Skip {
             PipelineData::ByteStream(stream, metadata) => {
                 if stream.type_().is_binary_coercible() {
                     let span = stream.span();
-                    if let Some(mut reader) = stream.reader() {
-                        // Copy the number of skipped bytes into the sink before proceeding
-                        io::copy(&mut (&mut reader).take(n as u64), &mut io::sink())
-                            .err_span(span)?;
-                        Ok(PipelineData::ByteStream(
-                            ByteStream::read(
-                                reader,
-                                call.head,
-                                Signals::empty(),
-                                ByteStreamType::Binary,
-                            ),
-                            metadata,
-                        ))
-                    } else {
-                        Ok(PipelineData::Empty)
-                    }
+                    Ok(PipelineData::ByteStream(
+                        stream.skip(span, n as u64)?,
+                        metadata,
+                    ))
                 } else {
                     Err(ShellError::OnlySupportsThisInputType {
                         exp_input_type: "list, binary or range".into(),
diff --git a/crates/nu-command/src/filters/take/take_.rs b/crates/nu-command/src/filters/take/take_.rs
index 85a94fcd4b..a03b1825da 100644
--- a/crates/nu-command/src/filters/take/take_.rs
+++ b/crates/nu-command/src/filters/take/take_.rs
@@ -1,6 +1,5 @@
 use nu_engine::command_prelude::*;
 use nu_protocol::Signals;
-use std::io::Read;
 
 #[derive(Clone)]
 pub struct Take;
@@ -89,20 +88,11 @@ impl Command for Take {
             )),
             PipelineData::ByteStream(stream, metadata) => {
                 if stream.type_().is_binary_coercible() {
-                    if let Some(reader) = stream.reader() {
-                        // Just take 'rows' bytes off the stream, mimicking the binary behavior
-                        Ok(PipelineData::ByteStream(
-                            ByteStream::read(
-                                reader.take(rows_desired as u64),
-                                head,
-                                Signals::empty(),
-                                ByteStreamType::Binary,
-                            ),
-                            metadata,
-                        ))
-                    } else {
-                        Ok(PipelineData::Empty)
-                    }
+                    let span = stream.span();
+                    Ok(PipelineData::ByteStream(
+                        stream.take(span, rows_desired as u64)?,
+                        metadata,
+                    ))
                 } else {
                     Err(ShellError::OnlySupportsThisInputType {
                         exp_input_type: "list, binary or range".into(),
diff --git a/crates/nu-command/tests/commands/bytes/at.rs b/crates/nu-command/tests/commands/bytes/at.rs
new file mode 100644
index 0000000000..4a8d034b3f
--- /dev/null
+++ b/crates/nu-command/tests/commands/bytes/at.rs
@@ -0,0 +1,72 @@
+use nu_test_support::nu;
+
+#[test]
+pub fn returns_error_for_relative_range_on_infinite_stream() {
+    let actual = nu!("nu --testbin iecho 3 | bytes at ..-3");
+    assert!(
+        actual.err.contains(
+            "Relative range values cannot be used with streams that don't have a known length"
+        ),
+        "Expected error message for negative range with infinite stream"
+    );
+}
+
+#[test]
+pub fn returns_bytes_for_fixed_range_on_infinite_stream_including_end() {
+    let actual = nu!("nu --testbin iecho 3 | bytes at ..10 | decode");
+    assert_eq!(
+        actual.out, "33333",
+        "Expected bytes from index 0 to 10, but got different output"
+    );
+}
+
+#[test]
+pub fn returns_bytes_for_fixed_range_on_infinite_stream_excluding_end() {
+    let actual = nu!("nu --testbin iecho 3 | bytes at ..<9 | decode");
+    assert_eq!(
+        actual.out, "3333",
+        "Expected bytes from index 0 to 8, but got different output"
+    );
+}
+
+#[test]
+pub fn test_string_returns_correct_slice_for_simple_positive_slice() {
+    let actual = nu!("\"Hello World\" | encode utf8 | bytes at ..4 | decode");
+    assert_eq!(actual.out, "Hello");
+}
+
+#[test]
+pub fn test_string_returns_correct_slice_for_negative_start() {
+    let actual = nu!("\"Hello World\" | encode utf8 | bytes at (-5)..10 | decode");
+    assert_eq!(actual.out, "World");
+}
+
+#[test]
+pub fn test_string_returns_correct_slice_for_negative_end() {
+    let actual = nu!("\"Hello World\" | encode utf8 | bytes at ..-7 | decode");
+    assert_eq!(actual.out, "Hello");
+}
+
+#[test]
+pub fn test_string_returns_correct_slice_for_empty_slice() {
+    let actual = nu!("\"Hello World\" | encode utf8 | bytes at 5..<5 | decode");
+    assert_eq!(actual.out, "");
+}
+
+#[test]
+pub fn test_string_returns_correct_slice_for_out_of_bounds() {
+    let actual = nu!("\"Hello World\" | encode utf8 | bytes at ..20 | decode");
+    assert_eq!(actual.out, "Hello World");
+}
+
+#[test]
+pub fn test_string_returns_correct_slice_for_invalid_range() {
+    let actual = nu!("\"Hello World\" | encode utf8 | bytes at 11..5 | decode");
+    assert_eq!(actual.out, "");
+}
+
+#[test]
+pub fn test_string_returns_correct_slice_for_max_end() {
+    let actual = nu!("\"Hello World\" | encode utf8 | bytes at 6..<11 | decode");
+    assert_eq!(actual.out, "World");
+}
diff --git a/crates/nu-command/tests/commands/bytes/mod.rs b/crates/nu-command/tests/commands/bytes/mod.rs
index 10b2a494f8..f1faaef005 100644
--- a/crates/nu-command/tests/commands/bytes/mod.rs
+++ b/crates/nu-command/tests/commands/bytes/mod.rs
@@ -1 +1,2 @@
+mod at;
 mod collect;
diff --git a/crates/nu-protocol/src/errors/shell_error.rs b/crates/nu-protocol/src/errors/shell_error.rs
index 61bd6ce11e..208f2178f6 100644
--- a/crates/nu-protocol/src/errors/shell_error.rs
+++ b/crates/nu-protocol/src/errors/shell_error.rs
@@ -653,6 +653,18 @@ pub enum ShellError {
         creation_site: Span,
     },
 
+    /// Attempted to us a relative range on an infinite stream
+    ///
+    /// ## Resolution
+    ///
+    /// Ensure that either the range is absolute or the stream has a known length.
+    #[error("Relative range values cannot be used with streams that don't have a known length")]
+    #[diagnostic(code(nu::shell::relative_range_on_infinite_stream))]
+    RelativeRangeOnInfiniteStream {
+        #[label = "Relative range values cannot be used with streams that don't have a known length"]
+        span: Span,
+    },
+
     /// An error happened while performing an external command.
     ///
     /// ## Resolution
diff --git a/crates/nu-protocol/src/pipeline/byte_stream.rs b/crates/nu-protocol/src/pipeline/byte_stream.rs
index e24c0753e6..b5cbbff237 100644
--- a/crates/nu-protocol/src/pipeline/byte_stream.rs
+++ b/crates/nu-protocol/src/pipeline/byte_stream.rs
@@ -1,8 +1,9 @@
 //! Module managing the streaming of raw bytes between pipeline elements
 #[cfg(feature = "os")]
 use crate::process::{ChildPipe, ChildProcess};
-use crate::{ErrSpan, IntoSpanned, PipelineData, ShellError, Signals, Span, Type, Value};
+use crate::{ErrSpan, IntRange, IntoSpanned, PipelineData, ShellError, Signals, Span, Type, Value};
 use serde::{Deserialize, Serialize};
+use std::ops::Bound;
 #[cfg(unix)]
 use std::os::fd::OwnedFd;
 #[cfg(windows)]
@@ -220,6 +221,79 @@ impl ByteStream {
         )
     }
 
+    pub fn skip(self, span: Span, n: u64) -> Result<Self, ShellError> {
+        let known_size = self.known_size.map(|len| len.saturating_sub(n));
+        if let Some(mut reader) = self.reader() {
+            // Copy the number of skipped bytes into the sink before proceeding
+            io::copy(&mut (&mut reader).take(n), &mut io::sink()).err_span(span)?;
+            Ok(
+                ByteStream::read(reader, span, Signals::empty(), ByteStreamType::Binary)
+                    .with_known_size(known_size),
+            )
+        } else {
+            Err(ShellError::TypeMismatch {
+                err_message: "expected readable stream".into(),
+                span,
+            })
+        }
+    }
+
+    pub fn take(self, span: Span, n: u64) -> Result<Self, ShellError> {
+        let known_size = self.known_size.map(|s| s.min(n));
+        if let Some(reader) = self.reader() {
+            Ok(ByteStream::read(
+                reader.take(n),
+                span,
+                Signals::empty(),
+                ByteStreamType::Binary,
+            )
+            .with_known_size(known_size))
+        } else {
+            Err(ShellError::TypeMismatch {
+                err_message: "expected readable stream".into(),
+                span,
+            })
+        }
+    }
+
+    pub fn slice(
+        self,
+        val_span: Span,
+        call_span: Span,
+        range: IntRange,
+    ) -> Result<Self, ShellError> {
+        if let Some(len) = self.known_size {
+            let start = range.absolute_start(len);
+            let stream = self.skip(val_span, start);
+
+            match range.absolute_end(len) {
+                Bound::Unbounded => stream,
+                Bound::Included(end) | Bound::Excluded(end) if end < start => {
+                    stream.and_then(|s| s.take(val_span, 0))
+                }
+                Bound::Included(end) => {
+                    let distance = end - start + 1;
+                    stream.and_then(|s| s.take(val_span, distance.min(len)))
+                }
+                Bound::Excluded(end) => {
+                    let distance = end - start;
+                    stream.and_then(|s| s.take(val_span, distance.min(len)))
+                }
+            }
+        } else if range.is_relative() {
+            Err(ShellError::RelativeRangeOnInfiniteStream { span: call_span })
+        } else {
+            let start = range.start() as u64;
+            let stream = self.skip(val_span, start);
+
+            match range.distance() {
+                Bound::Unbounded => stream,
+                Bound::Included(distance) => stream.and_then(|s| s.take(val_span, distance)),
+                Bound::Excluded(distance) => stream.and_then(|s| s.take(val_span, distance - 1)),
+            }
+        }
+    }
+
     /// Create a [`ByteStream`] from a string. The type of the stream is always `String`.
     pub fn read_string(string: String, span: Span, signals: Signals) -> Self {
         let len = string.len();
diff --git a/crates/nu-protocol/src/value/range.rs b/crates/nu-protocol/src/value/range.rs
index c4d6d4655e..268b24b623 100644
--- a/crates/nu-protocol/src/value/range.rs
+++ b/crates/nu-protocol/src/value/range.rs
@@ -81,10 +81,46 @@ mod int_range {
             self.start
         }
 
+        // Resolves the absolute start position given the length of the input value
+        pub fn absolute_start(&self, len: u64) -> u64 {
+            let max_index = len - 1;
+            match self.start {
+                start if start < 0 => len.saturating_sub(start.unsigned_abs()),
+                start => max_index.min(start as u64),
+            }
+        }
+
+        /// Returns the distance between the start and end of the range
+        /// The result will always be 0 or positive
+        pub fn distance(&self) -> Bound<u64> {
+            match self.end {
+                Bound::Unbounded => Bound::Unbounded,
+                Bound::Included(end) if self.start > end => Bound::Included(0),
+                Bound::Excluded(end) if self.start > end => Bound::Excluded(0),
+                Bound::Included(end) => Bound::Included((end - self.start) as u64),
+                Bound::Excluded(end) => Bound::Excluded((end - self.start) as u64),
+            }
+        }
+
         pub fn end(&self) -> Bound<i64> {
             self.end
         }
 
+        pub fn absolute_end(&self, len: u64) -> Bound<u64> {
+            let max_index = len - 1;
+            match self.end {
+                Bound::Unbounded => Bound::Unbounded,
+                Bound::Included(i) => Bound::Included(match i {
+                    i if i < 0 => len.saturating_sub(i.unsigned_abs()),
+                    i => max_index.min(i as u64),
+                }),
+                Bound::Excluded(i) => Bound::Excluded(match i {
+                    i if i < 0 => len.saturating_sub(i.unsigned_abs()),
+                    i => len.min(i as u64),
+                }),
+            }
+        }
+
         pub fn step(&self) -> i64 {
             self.step
         }
@@ -93,6 +129,21 @@ mod int_range {
             self.end == Bound::Unbounded
         }
 
+        pub fn is_relative(&self) -> bool {
+            self.is_start_relative() || self.is_end_relative()
+        }
+
+        pub fn is_start_relative(&self) -> bool {
+            self.start < 0
+        }
+
+        pub fn is_end_relative(&self) -> bool {
+            match self.end {
+                Bound::Included(end) | Bound::Excluded(end) => end < 0,
+                _ => false,
+            }
+        }
+
         pub fn contains(&self, value: i64) -> bool {
             if self.step < 0 {
                 // Decreasing range
diff --git a/crates/nu-protocol/tests/mod.rs b/crates/nu-protocol/tests/mod.rs
new file mode 100644
index 0000000000..eab2e1f414
--- /dev/null
+++ b/crates/nu-protocol/tests/mod.rs
@@ -0,0 +1 @@
+mod pipeline;
diff --git a/crates/nu-protocol/tests/pipeline/byte_stream.rs b/crates/nu-protocol/tests/pipeline/byte_stream.rs
new file mode 100644
index 0000000000..3d06573461
--- /dev/null
+++ b/crates/nu-protocol/tests/pipeline/byte_stream.rs
@@ -0,0 +1,268 @@
+use nu_protocol::{ast::RangeInclusion, ByteStream, IntRange, Signals, Span, Value};
+
+#[test]
+pub fn test_simple_positive_slice_exclusive() {
+    let data = b"Hello World".to_vec();
+    let stream = ByteStream::read_binary(data, Span::test_data(), Signals::empty());
+    let sliced = stream
+        .slice(
+            Span::test_data(),
+            Span::test_data(),
+            create_range(0, 5, RangeInclusion::RightExclusive),
+        )
+        .unwrap();
+    let result = sliced.into_bytes().unwrap();
+    let result = String::from_utf8(result).unwrap();
+    assert_eq!(result, "Hello");
+}
+
+#[test]
+pub fn test_negative_start_exclusive() {
+    let data = b"Hello World".to_vec();
+    let stream = ByteStream::read_binary(data, Span::test_data(), Signals::empty());
+    let sliced = stream
+        .slice(
+            Span::test_data(),
+            Span::test_data(),
+            create_range(-5, 11, RangeInclusion::RightExclusive),
+        )
+        .unwrap();
+    let result = sliced.into_bytes().unwrap();
+    let result = String::from_utf8(result).unwrap();
+    assert_eq!(result, "World");
+}
+
+#[test]
+pub fn test_negative_end_exclusive() {
+    let data = b"Hello World".to_vec();
+    let stream = ByteStream::read_binary(data, Span::test_data(), Signals::empty());
+    let sliced = stream
+        .slice(
+            Span::test_data(),
+            Span::test_data(),
+            create_range(0, -6, RangeInclusion::RightExclusive),
+        )
+        .unwrap();
+    let result = sliced.into_bytes().unwrap();
+    let result = String::from_utf8(result).unwrap();
+    assert_eq!(result, "Hello");
+}
+
+#[test]
+pub fn test_negative_start_and_end_exclusive() {
+    let data = b"Hello World".to_vec();
+    let stream = ByteStream::read_binary(data, Span::test_data(), Signals::empty());
+    let sliced = stream
+        .slice(
+            Span::test_data(),
+            Span::test_data(),
+            create_range(-5, -2, RangeInclusion::RightExclusive),
+        )
+        .unwrap();
+    let result = sliced.into_bytes().unwrap();
+    let result = String::from_utf8(result).unwrap();
+    assert_eq!(result, "Wor");
+}
+
+#[test]
+pub fn test_empty_slice_exclusive() {
+    let data = b"Hello World".to_vec();
+    let stream = ByteStream::read_binary(data, Span::test_data(), Signals::empty());
+    let sliced = stream
+        .slice(
+            Span::test_data(),
+            Span::test_data(),
+            create_range(5, 5, RangeInclusion::RightExclusive),
+        )
+        .unwrap();
+    let result = sliced.into_bytes().unwrap();
+    let result = String::from_utf8(result).unwrap();
+    assert_eq!(result, "");
+}
+
+#[test]
+pub fn test_out_of_bounds_exclusive() {
+    let data = b"Hello World".to_vec();
+    let stream = ByteStream::read_binary(data, Span::test_data(), Signals::empty());
+    let sliced = stream
+        .slice(
+            Span::test_data(),
+            Span::test_data(),
+            create_range(0, 20, RangeInclusion::RightExclusive),
+        )
+        .unwrap();
+    let result = sliced.into_bytes().unwrap();
+    let result = String::from_utf8(result).unwrap();
+    assert_eq!(result, "Hello World");
+}
+
+#[test]
+pub fn test_invalid_range_exclusive() {
+    let data = b"Hello World".to_vec();
+    let stream = ByteStream::read_binary(data, Span::test_data(), Signals::empty());
+    let sliced = stream
+        .slice(
+            Span::test_data(),
+            Span::test_data(),
+            create_range(11, 5, RangeInclusion::RightExclusive),
+        )
+        .unwrap();
+    let result = sliced.into_bytes().unwrap();
+    let result = String::from_utf8(result).unwrap();
+    assert_eq!(result, "");
+}
+
+#[test]
+pub fn test_max_end_exclusive() {
+    let data = b"Hello World".to_vec();
+    let stream = ByteStream::read_binary(data, Span::test_data(), Signals::empty());
+    let sliced = stream
+        .slice(
+            Span::test_data(),
+            Span::test_data(),
+            create_range(6, i64::MAX, RangeInclusion::RightExclusive),
+        )
+        .unwrap();
+    let result = sliced.into_bytes().unwrap();
+    let result = String::from_utf8(result).unwrap();
+    assert_eq!(result, "World");
+}
+
+#[test]
+pub fn test_simple_positive_slice_inclusive() {
+    let data = b"Hello World".to_vec();
+    let stream = ByteStream::read_binary(data, Span::test_data(), Signals::empty());
+    let sliced = stream
+        .slice(
+            Span::test_data(),
+            Span::test_data(),
+            create_range(0, 5, RangeInclusion::RightExclusive),
+        )
+        .unwrap();
+    let result = sliced.into_bytes().unwrap();
+    let result = String::from_utf8(result).unwrap();
+    assert_eq!(result, "Hello");
+}
+
+#[test]
+pub fn test_negative_start_inclusive() {
+    let data = b"Hello World".to_vec();
+    let stream = ByteStream::read_binary(data, Span::test_data(), Signals::empty());
+    let sliced = stream
+        .slice(
+            Span::test_data(),
+            Span::test_data(),
+            create_range(-5, 11, RangeInclusion::Inclusive),
+        )
+        .unwrap();
+    let result = sliced.into_bytes().unwrap();
+    let result = String::from_utf8(result).unwrap();
+    assert_eq!(result, "World");
+}
+
+#[test]
+pub fn test_negative_end_inclusive() {
+    let data = b"Hello World".to_vec();
+    let stream = ByteStream::read_binary(data, Span::test_data(), Signals::empty());
+    let sliced = stream
+        .slice(
+            Span::test_data(),
+            Span::test_data(),
+            create_range(0, -7, RangeInclusion::Inclusive),
+        )
+        .unwrap();
+    let result = sliced.into_bytes().unwrap();
+    let result = String::from_utf8(result).unwrap();
+    assert_eq!(result, "Hello");
+}
+
+#[test]
+pub fn test_negative_start_and_end_inclusive() {
+    let data = b"Hello World".to_vec();
+    let stream = ByteStream::read_binary(data, Span::test_data(), Signals::empty());
+    let sliced = stream
+        .slice(
+            Span::test_data(),
+            Span::test_data(),
+            create_range(-5, -1, RangeInclusion::Inclusive),
+        )
+        .unwrap();
+    let result = sliced.into_bytes().unwrap();
+    let result = String::from_utf8(result).unwrap();
+    assert_eq!(result, "World");
+}
+
+#[test]
+pub fn test_empty_slice_inclusive() {
+    let data = b"Hello World".to_vec();
+    let stream = ByteStream::read_binary(data, Span::test_data(), Signals::empty());
+    let sliced = stream
+        .slice(
+            Span::test_data(),
+            Span::test_data(),
+            create_range(5, 5, RangeInclusion::Inclusive),
+        )
+        .unwrap();
+    let result = sliced.into_bytes().unwrap();
+    let result = String::from_utf8(result).unwrap();
+    assert_eq!(result, " ");
+}
+
+#[test]
+pub fn test_out_of_bounds_inclusive() {
+    let data = b"Hello World".to_vec();
+    let stream = ByteStream::read_binary(data, Span::test_data(), Signals::empty());
+    let sliced = stream
+        .slice(
+            Span::test_data(),
+            Span::test_data(),
+            create_range(0, 20, RangeInclusion::Inclusive),
+        )
+        .unwrap();
+    let result = sliced.into_bytes().unwrap();
+    let result = String::from_utf8(result).unwrap();
+    assert_eq!(result, "Hello World");
+}
+
+#[test]
+pub fn test_invalid_range_inclusive() {
+    let data = b"Hello World".to_vec();
+    let stream = ByteStream::read_binary(data, Span::test_data(), Signals::empty());
+    let sliced = stream
+        .slice(
+            Span::test_data(),
+            Span::test_data(),
+            create_range(11, 5, RangeInclusion::Inclusive),
+        )
+        .unwrap();
+    let result = sliced.into_bytes().unwrap();
+    let result = String::from_utf8(result).unwrap();
+    assert_eq!(result, "");
+}
+
+#[test]
+pub fn test_max_end_inclusive() {
+    let data = b"Hello World".to_vec();
+    let stream = ByteStream::read_binary(data, Span::test_data(), Signals::empty());
+    let sliced = stream
+        .slice(
+            Span::test_data(),
+            Span::test_data(),
+            create_range(6, i64::MAX, RangeInclusion::Inclusive),
+        )
+        .unwrap();
+    let result = sliced.into_bytes().unwrap();
+    let result = String::from_utf8(result).unwrap();
+    assert_eq!(result, "World");
+}
+
+fn create_range(start: i64, end: i64, inclusion: RangeInclusion) -> IntRange {
+    IntRange::new(
+        Value::int(start, Span::unknown()),
+        Value::nothing(Span::test_data()),
+        Value::int(end, Span::unknown()),
+        inclusion,
+        Span::unknown(),
+    )
+    .unwrap()
+}
diff --git a/crates/nu-protocol/tests/pipeline/mod.rs b/crates/nu-protocol/tests/pipeline/mod.rs
new file mode 100644
index 0000000000..a3003e8031
--- /dev/null
+++ b/crates/nu-protocol/tests/pipeline/mod.rs
@@ -0,0 +1 @@
+mod byte_stream;

From 23dc1b600a0e09279cef75f0dbf47505c37edeca Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Sun, 12 Jan 2025 12:15:19 +0800
Subject: [PATCH 0914/1072] feat(lsp): inlay hints of types in assignments
 (#14809)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

This is a complementary PR of #14802

<img width="418" alt="image"
src="https://github.com/user-attachments/assets/ddf945e4-7ef0-4c73-a9fd-e68591efce03"
/>


# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

new relative test cases

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-lsp/src/hints.rs             | 125 ++++++++++++++++---------
 crates/nu-lsp/src/symbols.rs           |  14 +--
 tests/fixtures/lsp/hints/assignment.nu |   9 ++
 tests/fixtures/lsp/hints/type.nu       |   2 +-
 4 files changed, 97 insertions(+), 53 deletions(-)
 create mode 100644 tests/fixtures/lsp/hints/assignment.nu

diff --git a/crates/nu-lsp/src/hints.rs b/crates/nu-lsp/src/hints.rs
index 2fb8c373d8..eb659f8812 100644
--- a/crates/nu-lsp/src/hints.rs
+++ b/crates/nu-lsp/src/hints.rs
@@ -8,8 +8,8 @@ use lsp_types::{
 };
 use nu_protocol::{
     ast::{
-        Argument, Block, Expr, Expression, ExternalArgument, ListItem, MatchPattern, Pattern,
-        PipelineRedirection, RecordItem,
+        Argument, Block, Expr, Expression, ExternalArgument, ListItem, MatchPattern, Operator,
+        Pattern, PipelineRedirection, RecordItem,
     },
     engine::StateWorkingSet,
     Type,
@@ -167,6 +167,16 @@ fn redirect_flat_map<T, E>(
     }
 }
 
+fn type_short_name(t: &Type) -> String {
+    match t {
+        Type::Custom(_) => String::from("custom"),
+        Type::Record(_) => String::from("record"),
+        Type::Table(_) => String::from("table"),
+        Type::List(_) => String::from("list"),
+        _ => t.to_string(),
+    }
+}
+
 fn extract_inlay_hints_from_expression(
     expr: &Expression,
     working_set: &StateWorkingSet,
@@ -183,6 +193,31 @@ fn extract_inlay_hints_from_expression(
         )
     };
     match &expr.expr {
+        Expr::BinaryOp(lhs, op, rhs) => {
+            let mut hints: Vec<InlayHint> =
+                [lhs, op, rhs].into_iter().flat_map(|e| recur(e)).collect();
+            if let Expr::Operator(Operator::Assignment(_)) = op.expr {
+                let position = span_to_range(&lhs.span, file, *offset).end;
+                let type_rhs = type_short_name(&rhs.ty);
+                let type_lhs = type_short_name(&lhs.ty);
+                let type_string = match (type_lhs.as_str(), type_rhs.as_str()) {
+                    ("any", _) => type_rhs,
+                    (_, "any") => type_lhs,
+                    _ => type_lhs,
+                };
+                hints.push(InlayHint {
+                    kind: Some(InlayHintKind::TYPE),
+                    label: InlayHintLabel::String(format!(": {}", type_string)),
+                    position,
+                    text_edits: None,
+                    tooltip: None,
+                    data: None,
+                    padding_left: None,
+                    padding_right: None,
+                })
+            }
+            Some(hints)
+        }
         Expr::VarDecl(var_id) => {
             let position = span_to_range(&span, file, *offset).end;
             // skip if the type is already specified in code
@@ -199,17 +234,11 @@ fn extract_inlay_hints_from_expression(
                 return Some(Vec::new());
             }
             let var = working_set.get_variable(*var_id);
-            let type_str_short = match var.ty {
-                Type::Custom(_) => String::from("custom"),
-                Type::Record(_) => String::from("record"),
-                Type::Table(_) => String::from("table"),
-                Type::List(_) => String::from("list"),
-                _ => var.ty.to_string(),
-            };
+            let type_string = type_short_name(&var.ty);
             Some(vec![
                 (InlayHint {
                     kind: Some(InlayHintKind::TYPE),
-                    label: InlayHintLabel::String(format!(": {}", type_str_short)),
+                    label: InlayHintLabel::String(format!(": {}", type_string)),
                     position,
                     text_edits: None,
                     tooltip: None,
@@ -363,41 +392,47 @@ mod tests {
         assert_json_eq!(
             result,
             serde_json::json!([
-                {
-                    "position": { "line": 0, "character": 7 },
-                    "label": ": int",
-                    "kind": 1
-                },
-                {
-                    "position": { "line": 1, "character": 7 },
-                    "label": ": string",
-                    "kind": 1
-                },
-                {
-                    "position": { "line": 2, "character": 8 },
-                    "label": ": bool",
-                    "kind": 1
-                },
-                {
-                    "position": { "line": 3, "character": 9 },
-                    "label": ": float",
-                    "kind": 1
-                },
-                {
-                    "position": { "line": 4, "character": 8 },
-                    "label": ": list",
-                    "kind": 1
-                },
-                {
-                    "position": { "line": 5, "character": 10 },
-                    "label": ": record",
-                    "kind": 1
-                },
-                {
-                    "position": { "line": 6, "character": 11 },
-                    "label": ": closure",
-                    "kind": 1
-                }
+                { "position": { "line": 0, "character": 9 }, "label": ": int", "kind": 1 },
+                { "position": { "line": 1, "character": 7 }, "label": ": string", "kind": 1 },
+                { "position": { "line": 2, "character": 8 }, "label": ": bool", "kind": 1 },
+                { "position": { "line": 3, "character": 9 }, "label": ": float", "kind": 1 },
+                { "position": { "line": 4, "character": 8 }, "label": ": list", "kind": 1 },
+                { "position": { "line": 5, "character": 10 }, "label": ": record", "kind": 1 },
+                { "position": { "line": 6, "character": 11 }, "label": ": closure", "kind": 1 }
+            ])
+        );
+    }
+
+    #[test]
+    fn inlay_hint_assignment_type() {
+        let (client_connection, _recv) = initialize_language_server();
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("hints");
+        script.push("assignment.nu");
+        let script = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script.clone());
+
+        let resp = send_inlay_hint_request(&client_connection, script.clone());
+        let result = if let Message::Response(response) = resp {
+            response.result
+        } else {
+            panic!()
+        };
+
+        assert_json_eq!(
+            result,
+            serde_json::json!([
+                { "position": { "line": 0, "character": 8 }, "label": ": int", "kind": 1 },
+                { "position": { "line": 1, "character": 10 }, "label": ": float", "kind": 1 },
+                { "position": { "line": 2, "character": 10 }, "label": ": table", "kind": 1 },
+                { "position": { "line": 3, "character": 9 }, "label": ": list", "kind": 1 },
+                { "position": { "line": 4, "character": 11 }, "label": ": record", "kind": 1 },
+                { "position": { "line": 6, "character": 7 }, "label": ": filesize", "kind": 1 },
+                { "position": { "line": 7, "character": 7 }, "label": ": filesize", "kind": 1 },
+                { "position": { "line": 8, "character": 4 }, "label": ": filesize", "kind": 1 }
             ])
         );
     }
diff --git a/crates/nu-lsp/src/symbols.rs b/crates/nu-lsp/src/symbols.rs
index 8b76b96817..253dcb1c5f 100644
--- a/crates/nu-lsp/src/symbols.rs
+++ b/crates/nu-lsp/src/symbols.rs
@@ -298,7 +298,7 @@ mod tests {
         DocumentSymbolParams, Uri, WorkDoneProgressParams, WorkspaceSymbolParams,
     };
 
-    fn document_symbol_test(client_connection: &Connection, uri: Uri) -> Message {
+    fn send_document_symbol_request(client_connection: &Connection, uri: Uri) -> Message {
         client_connection
             .sender
             .send(Message::Request(lsp_server::Request {
@@ -319,7 +319,7 @@ mod tests {
             .unwrap()
     }
 
-    fn workspace_symbol_test(client_connection: &Connection, query: String) -> Message {
+    fn send_workspace_symbol_request(client_connection: &Connection, query: String) -> Message {
         client_connection
             .sender
             .send(Message::Request(lsp_server::Request {
@@ -352,7 +352,7 @@ mod tests {
 
         open_unchecked(&client_connection, script.clone());
 
-        let resp = document_symbol_test(&client_connection, script.clone());
+        let resp = send_document_symbol_request(&client_connection, script.clone());
         let result = if let Message::Response(response) = resp {
             response.result
         } else {
@@ -374,7 +374,7 @@ mod tests {
 
         open_unchecked(&client_connection, script.clone());
 
-        let resp = document_symbol_test(&client_connection, script.clone());
+        let resp = send_document_symbol_request(&client_connection, script.clone());
         let result = if let Message::Response(response) = resp {
             response.result
         } else {
@@ -437,7 +437,7 @@ mod tests {
             }),
         );
 
-        let resp = document_symbol_test(&client_connection, script.clone());
+        let resp = send_document_symbol_request(&client_connection, script.clone());
         let result = if let Message::Response(response) = resp {
             response.result
         } else {
@@ -481,7 +481,7 @@ mod tests {
         open_unchecked(&client_connection, script_foo.clone());
         open_unchecked(&client_connection, script_bar.clone());
 
-        let resp = workspace_symbol_test(&client_connection, "br".to_string());
+        let resp = send_workspace_symbol_request(&client_connection, "br".to_string());
         let result = if let Message::Response(response) = resp {
             response.result
         } else {
@@ -547,7 +547,7 @@ mod tests {
         open_unchecked(&client_connection, script_foo.clone());
         open_unchecked(&client_connection, script_bar.clone());
 
-        let resp = workspace_symbol_test(&client_connection, "foo".to_string());
+        let resp = send_workspace_symbol_request(&client_connection, "foo".to_string());
         let result = if let Message::Response(response) = resp {
             response.result
         } else {
diff --git a/tests/fixtures/lsp/hints/assignment.nu b/tests/fixtures/lsp/hints/assignment.nu
new file mode 100644
index 0000000000..6e02f939fb
--- /dev/null
+++ b/tests/fixtures/lsp/hints/assignment.nu
@@ -0,0 +1,9 @@
+$env.int = 1
+$env.float = 1.1
+$env.table = [[]; []]
+$env.list ++= []
+$env.record = {}
+
+mut foo = 1kb
+let bar = 1kb
+$foo += $bar
diff --git a/tests/fixtures/lsp/hints/type.nu b/tests/fixtures/lsp/hints/type.nu
index 86e8481a5a..edbeda4ce9 100644
--- a/tests/fixtures/lsp/hints/type.nu
+++ b/tests/fixtures/lsp/hints/type.nu
@@ -1,4 +1,4 @@
-let int = 1
+const int = 1
 let str = "hello"
 let bool = true
 let float = 1.0

From e5337b50a92129a0f18c9e90e0229ba77073a8c8 Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Mon, 13 Jan 2025 21:00:01 +0800
Subject: [PATCH 0915/1072] fix(lsp): goto definition on variables in `match
 guard` (#14818)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

This PR fixes a corner case of goto definition in lsp server.

```nushell
let foo = 1
match $foo {
  _ if $foo == 1 => 1
        # |_______________ goto definition does not work here
  _ => 2
}
```

Since `match_pattern.guard` is not handled in this function (which could
be another issue).


https://github.com/nushell/nushell/blob/23dc1b600a0e09279cef75f0dbf47505c37edeca/crates/nu-parser/src/flatten.rs#L604-L658

In this PR, however, finding leaf expression at the cursor is done with
the new AST traversing helper functions.
Theoretically, this is faster as the flattening and filtering are
combined in a single scan; the difference could be negligible though.


# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

3 new test cases added, will add more if new issues found.

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-lsp/src/ast.rs           | 210 +++++++++++++++++
 crates/nu-lsp/src/goto.rs          | 344 ++++++++++++++++++++++++++++
 crates/nu-lsp/src/hints.rs         | 161 +------------
 crates/nu-lsp/src/lib.rs           | 351 +++--------------------------
 tests/fixtures/lsp/goto/collect.nu |   2 +
 tests/fixtures/lsp/goto/else.nu    |   2 +
 tests/fixtures/lsp/goto/match.nu   |   5 +
 7 files changed, 601 insertions(+), 474 deletions(-)
 create mode 100644 crates/nu-lsp/src/ast.rs
 create mode 100644 crates/nu-lsp/src/goto.rs
 create mode 100644 tests/fixtures/lsp/goto/collect.nu
 create mode 100644 tests/fixtures/lsp/goto/else.nu
 create mode 100644 tests/fixtures/lsp/goto/match.nu

diff --git a/crates/nu-lsp/src/ast.rs b/crates/nu-lsp/src/ast.rs
new file mode 100644
index 0000000000..44ea202e8a
--- /dev/null
+++ b/crates/nu-lsp/src/ast.rs
@@ -0,0 +1,210 @@
+use std::sync::Arc;
+
+use nu_protocol::{
+    ast::{
+        Block, Expr, Expression, ExternalArgument, ListItem, MatchPattern, Pattern,
+        PipelineRedirection, RecordItem,
+    },
+    engine::StateWorkingSet,
+};
+
+use crate::Id;
+
+/// similar to flatten_block, but allows extra map function
+pub fn ast_flat_map<T, E>(
+    ast: &Arc<Block>,
+    working_set: &StateWorkingSet,
+    extra_args: &E,
+    f_special: fn(&Expression, &StateWorkingSet, &E) -> Option<Vec<T>>,
+) -> Vec<T> {
+    ast.pipelines
+        .iter()
+        .flat_map(|pipeline| {
+            pipeline.elements.iter().flat_map(|element| {
+                expr_flat_map(&element.expr, working_set, extra_args, f_special)
+                    .into_iter()
+                    .chain(
+                        element
+                            .redirection
+                            .as_ref()
+                            .map(|redir| {
+                                redirect_flat_map(redir, working_set, extra_args, f_special)
+                            })
+                            .unwrap_or_default(),
+                    )
+            })
+        })
+        .collect()
+}
+
+/// generic function that do flat_map on an expression
+/// concats all recursive results on sub-expressions
+///
+/// # Arguments
+/// * `f_special` - function that overrides the default behavior
+pub fn expr_flat_map<T, E>(
+    expr: &Expression,
+    working_set: &StateWorkingSet,
+    extra_args: &E,
+    f_special: fn(&Expression, &StateWorkingSet, &E) -> Option<Vec<T>>,
+) -> Vec<T> {
+    // behavior overridden by f_special
+    if let Some(vec) = f_special(expr, working_set, extra_args) {
+        return vec;
+    }
+    let recur = |expr| expr_flat_map(expr, working_set, extra_args, f_special);
+    match &expr.expr {
+        Expr::RowCondition(block_id)
+        | Expr::Subexpression(block_id)
+        | Expr::Block(block_id)
+        | Expr::Closure(block_id) => {
+            let block = working_set.get_block(block_id.to_owned());
+            ast_flat_map(block, working_set, extra_args, f_special)
+        }
+        Expr::Range(range) => [&range.from, &range.next, &range.to]
+            .iter()
+            .filter_map(|e| e.as_ref())
+            .flat_map(recur)
+            .collect(),
+        Expr::Call(call) => call
+            .arguments
+            .iter()
+            .filter_map(|arg| arg.expr())
+            .flat_map(recur)
+            .collect(),
+        Expr::ExternalCall(head, args) => recur(head)
+            .into_iter()
+            .chain(args.iter().flat_map(|arg| match arg {
+                ExternalArgument::Regular(e) | ExternalArgument::Spread(e) => recur(e),
+            }))
+            .collect(),
+        Expr::UnaryNot(expr) | Expr::Collect(_, expr) => recur(expr),
+        Expr::BinaryOp(lhs, op, rhs) => recur(lhs)
+            .into_iter()
+            .chain(recur(op))
+            .chain(recur(rhs))
+            .collect(),
+        Expr::MatchBlock(matches) => matches
+            .iter()
+            .flat_map(|(pattern, expr)| {
+                match_pattern_flat_map(pattern, working_set, extra_args, f_special)
+                    .into_iter()
+                    .chain(recur(expr))
+            })
+            .collect(),
+        Expr::List(items) => items
+            .iter()
+            .flat_map(|item| match item {
+                ListItem::Item(expr) | ListItem::Spread(_, expr) => recur(expr),
+            })
+            .collect(),
+        Expr::Record(items) => items
+            .iter()
+            .flat_map(|item| match item {
+                RecordItem::Spread(_, expr) => recur(expr),
+                RecordItem::Pair(key, val) => [key, val].into_iter().flat_map(recur).collect(),
+            })
+            .collect(),
+        Expr::Table(table) => table
+            .columns
+            .iter()
+            .flat_map(recur)
+            .chain(table.rows.iter().flat_map(|row| row.iter().flat_map(recur)))
+            .collect(),
+        Expr::ValueWithUnit(vu) => recur(&vu.expr),
+        Expr::FullCellPath(fcp) => recur(&fcp.head),
+        Expr::Keyword(kw) => recur(&kw.expr),
+        Expr::StringInterpolation(vec) | Expr::GlobInterpolation(vec, _) => {
+            vec.iter().flat_map(recur).collect()
+        }
+
+        _ => Vec::new(),
+    }
+}
+
+/// flat_map on match patterns
+fn match_pattern_flat_map<T, E>(
+    pattern: &MatchPattern,
+    working_set: &StateWorkingSet,
+    extra_args: &E,
+    f_special: fn(&Expression, &StateWorkingSet, &E) -> Option<Vec<T>>,
+) -> Vec<T> {
+    let recur = |expr| expr_flat_map(expr, working_set, extra_args, f_special);
+    let recur_match = |p| match_pattern_flat_map(p, working_set, extra_args, f_special);
+    match &pattern.pattern {
+        Pattern::Expression(expr) => recur(expr),
+        Pattern::List(patterns) | Pattern::Or(patterns) => {
+            patterns.iter().flat_map(recur_match).collect()
+        }
+        Pattern::Record(entries) => entries.iter().flat_map(|(_, p)| recur_match(p)).collect(),
+        _ => Vec::new(),
+    }
+    .into_iter()
+    .chain(pattern.guard.as_ref().map(|g| recur(g)).unwrap_or_default())
+    .collect()
+}
+
+/// flat_map on redirections
+fn redirect_flat_map<T, E>(
+    redir: &PipelineRedirection,
+    working_set: &StateWorkingSet,
+    extra_args: &E,
+    f_special: fn(&Expression, &StateWorkingSet, &E) -> Option<Vec<T>>,
+) -> Vec<T> {
+    let recur = |expr| expr_flat_map(expr, working_set, extra_args, f_special);
+    match redir {
+        PipelineRedirection::Single { target, .. } => target.expr().map(recur).unwrap_or_default(),
+        PipelineRedirection::Separate { out, err } => [out, err]
+            .iter()
+            .filter_map(|t| t.expr())
+            .flat_map(recur)
+            .collect(),
+    }
+}
+
+fn find_id_in_expr(expr: &Expression, _: &StateWorkingSet, location: &usize) -> Option<Vec<Id>> {
+    // skip the entire expression if the location is not in it
+    if !expr.span.contains(*location) {
+        // TODO: the span of Keyword does not include its subsidiary expression
+        // resort to `expr_flat_map` if location found in its expr
+        if let Expr::Keyword(kw) = &expr.expr {
+            if kw.expr.span.contains(*location) {
+                return None;
+            }
+        }
+        return Some(Vec::new());
+    }
+    match &expr.expr {
+        Expr::Var(var_id) | Expr::VarDecl(var_id) => Some(vec![Id::Variable(*var_id)]),
+        Expr::Call(call) => {
+            if call.head.contains(*location) {
+                Some(vec![Id::Declaration(call.decl_id)])
+            } else {
+                None
+            }
+        }
+        Expr::Overlay(Some(module_id)) => Some(vec![Id::Module(*module_id)]),
+        // terminal value expressions
+        Expr::Bool(_)
+        | Expr::Binary(_)
+        | Expr::DateTime(_)
+        | Expr::Directory(_, _)
+        | Expr::Filepath(_, _)
+        | Expr::Float(_)
+        | Expr::Garbage
+        | Expr::GlobPattern(_, _)
+        | Expr::Int(_)
+        | Expr::Nothing
+        | Expr::RawString(_)
+        | Expr::Signature(_)
+        | Expr::String(_) => Some(vec![Id::Value(expr.ty.clone())]),
+        _ => None,
+    }
+}
+
+/// find the leaf node at the given location from ast
+pub fn find_id(ast: &Arc<Block>, working_set: &StateWorkingSet, location: &usize) -> Option<Id> {
+    ast_flat_map(ast, working_set, location, find_id_in_expr)
+        .first()
+        .cloned()
+}
diff --git a/crates/nu-lsp/src/goto.rs b/crates/nu-lsp/src/goto.rs
new file mode 100644
index 0000000000..7589323cab
--- /dev/null
+++ b/crates/nu-lsp/src/goto.rs
@@ -0,0 +1,344 @@
+use crate::ast::find_id;
+use crate::{Id, LanguageServer};
+use lsp_types::{GotoDefinitionParams, GotoDefinitionResponse};
+
+impl LanguageServer {
+    pub fn goto_definition(
+        &mut self,
+        params: &GotoDefinitionParams,
+    ) -> Option<GotoDefinitionResponse> {
+        let mut engine_state = self.new_engine_state();
+
+        let path_uri = params
+            .text_document_position_params
+            .text_document
+            .uri
+            .to_owned();
+        let (block, file_offset, working_set, file) =
+            self.parse_file(&mut engine_state, &path_uri, false)?;
+        let location =
+            file.offset_at(params.text_document_position_params.position) as usize + file_offset;
+        let id = find_id(&block, &working_set, &location)?;
+
+        let span = match id {
+            Id::Declaration(decl_id) => {
+                let block_id = working_set.get_decl(decl_id).block_id()?;
+                working_set.get_block(block_id).span
+            }
+            Id::Variable(var_id) => {
+                let var = working_set.get_variable(var_id);
+                Some(var.declaration_span)
+            }
+            Id::Module(module_id) => {
+                let module = working_set.get_module(module_id);
+                module.span
+            }
+            _ => None,
+        }?;
+        Some(GotoDefinitionResponse::Scalar(
+            self.get_location_by_span(working_set.files(), &span)?,
+        ))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::path_to_uri;
+    use crate::tests::{initialize_language_server, open_unchecked};
+    use assert_json_diff::assert_json_eq;
+    use lsp_server::{Connection, Message};
+    use lsp_types::request::{GotoDefinition, Request};
+    use lsp_types::{
+        GotoDefinitionParams, PartialResultParams, Position, TextDocumentIdentifier,
+        TextDocumentPositionParams, Uri, WorkDoneProgressParams,
+    };
+    use nu_test_support::fs::{fixtures, root};
+
+    fn send_goto_definition_request(
+        client_connection: &Connection,
+        uri: Uri,
+        line: u32,
+        character: u32,
+    ) -> Message {
+        client_connection
+            .sender
+            .send(Message::Request(lsp_server::Request {
+                id: 2.into(),
+                method: GotoDefinition::METHOD.to_string(),
+                params: serde_json::to_value(GotoDefinitionParams {
+                    text_document_position_params: TextDocumentPositionParams {
+                        text_document: TextDocumentIdentifier { uri },
+                        position: Position { line, character },
+                    },
+                    work_done_progress_params: WorkDoneProgressParams::default(),
+                    partial_result_params: PartialResultParams::default(),
+                })
+                .unwrap(),
+            }))
+            .unwrap();
+
+        client_connection
+            .receiver
+            .recv_timeout(std::time::Duration::from_secs(2))
+            .unwrap()
+    }
+
+    #[test]
+    fn goto_definition_for_none_existing_file() {
+        let (client_connection, _recv) = initialize_language_server();
+
+        let mut none_existent_path = root();
+        none_existent_path.push("none-existent.nu");
+
+        client_connection
+            .sender
+            .send(Message::Request(lsp_server::Request {
+                id: 2.into(),
+                method: GotoDefinition::METHOD.to_string(),
+                params: serde_json::to_value(GotoDefinitionParams {
+                    text_document_position_params: TextDocumentPositionParams {
+                        text_document: TextDocumentIdentifier {
+                            uri: path_to_uri(&none_existent_path),
+                        },
+                        position: Position {
+                            line: 0,
+                            character: 0,
+                        },
+                    },
+                    work_done_progress_params: WorkDoneProgressParams::default(),
+                    partial_result_params: PartialResultParams::default(),
+                })
+                .unwrap(),
+            }))
+            .unwrap();
+
+        let resp = client_connection
+            .receiver
+            .recv_timeout(std::time::Duration::from_secs(2))
+            .unwrap();
+        let result = if let Message::Response(response) = resp {
+            response.result
+        } else {
+            panic!()
+        };
+
+        assert_json_eq!(result, serde_json::json!(null));
+    }
+
+    #[test]
+    fn goto_definition_of_variable() {
+        let (client_connection, _recv) = initialize_language_server();
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("goto");
+        script.push("var.nu");
+        let script = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script.clone());
+
+        let resp = send_goto_definition_request(&client_connection, script.clone(), 2, 12);
+        let result = if let Message::Response(response) = resp {
+            response.result
+        } else {
+            panic!()
+        };
+
+        assert_json_eq!(
+            result,
+            serde_json::json!({
+                "uri": script,
+                "range": {
+                    "start": { "line": 0, "character": 4 },
+                    "end": { "line": 0, "character": 12 }
+                }
+            })
+        );
+    }
+
+    #[test]
+    fn goto_definition_of_command() {
+        let (client_connection, _recv) = initialize_language_server();
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("goto");
+        script.push("command.nu");
+        let script = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script.clone());
+
+        let resp = send_goto_definition_request(&client_connection, script.clone(), 4, 1);
+        let result = if let Message::Response(response) = resp {
+            response.result
+        } else {
+            panic!()
+        };
+
+        assert_json_eq!(
+            result,
+            serde_json::json!({
+                "uri": script,
+                "range": {
+                "start": { "line": 0, "character": 17 },
+                "end": { "line": 2, "character": 1 }
+            }
+            })
+        );
+    }
+
+    #[test]
+    fn goto_definition_of_command_unicode() {
+        let (client_connection, _recv) = initialize_language_server();
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("goto");
+        script.push("command_unicode.nu");
+        let script = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script.clone());
+
+        let resp = send_goto_definition_request(&client_connection, script.clone(), 4, 2);
+        let result = if let Message::Response(response) = resp {
+            response.result
+        } else {
+            panic!()
+        };
+
+        assert_json_eq!(
+            result,
+            serde_json::json!({
+                "uri": script,
+                "range": {
+                "start": { "line": 0, "character": 19 },
+                "end": { "line": 2, "character": 1 }
+            }
+            })
+        );
+    }
+
+    #[test]
+    fn goto_definition_of_command_parameter() {
+        let (client_connection, _recv) = initialize_language_server();
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("goto");
+        script.push("command.nu");
+        let script = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script.clone());
+
+        let resp = send_goto_definition_request(&client_connection, script.clone(), 1, 14);
+        let result = if let Message::Response(response) = resp {
+            response.result
+        } else {
+            panic!()
+        };
+
+        assert_json_eq!(
+            result,
+            serde_json::json!({
+                "uri": script,
+                "range": {
+                "start": { "line": 0, "character": 11 },
+                "end": { "line": 0, "character": 15 }
+            }
+            })
+        );
+    }
+
+    #[test]
+    fn goto_definition_of_variable_in_else_block() {
+        let (client_connection, _recv) = initialize_language_server();
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("goto");
+        script.push("else.nu");
+        let script = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script.clone());
+
+        let resp = send_goto_definition_request(&client_connection, script.clone(), 1, 21);
+        let result = if let Message::Response(response) = resp {
+            response.result
+        } else {
+            panic!()
+        };
+
+        assert_json_eq!(
+            result,
+            serde_json::json!({
+                "uri": script,
+                "range": {
+                    "start": { "line": 0, "character": 4 },
+                    "end": { "line": 0, "character": 7 }
+                }
+            })
+        );
+    }
+
+    #[test]
+    fn goto_definition_of_variable_in_match_guard() {
+        let (client_connection, _recv) = initialize_language_server();
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("goto");
+        script.push("match.nu");
+        let script = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script.clone());
+
+        let resp = send_goto_definition_request(&client_connection, script.clone(), 2, 9);
+        let result = if let Message::Response(response) = resp {
+            response.result
+        } else {
+            panic!()
+        };
+
+        assert_json_eq!(
+            result,
+            serde_json::json!({
+                "uri": script,
+                "range": {
+                    "start": { "line": 0, "character": 4 },
+                    "end": { "line": 0, "character": 7 }
+                }
+            })
+        );
+    }
+
+    #[test]
+    fn goto_definition_of_variable_in_each() {
+        let (client_connection, _recv) = initialize_language_server();
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("goto");
+        script.push("collect.nu");
+        let script = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script.clone());
+
+        let resp = send_goto_definition_request(&client_connection, script.clone(), 1, 16);
+        let result = if let Message::Response(response) = resp {
+            response.result
+        } else {
+            panic!()
+        };
+
+        assert_json_eq!(
+            result,
+            serde_json::json!({
+                "uri": script,
+                "range": {
+                    "start": { "line": 0, "character": 4 },
+                    "end": { "line": 0, "character": 7 }
+                }
+            })
+        );
+    }
+}
diff --git a/crates/nu-lsp/src/hints.rs b/crates/nu-lsp/src/hints.rs
index eb659f8812..136fca0371 100644
--- a/crates/nu-lsp/src/hints.rs
+++ b/crates/nu-lsp/src/hints.rs
@@ -1,5 +1,6 @@
 use std::sync::Arc;
 
+use crate::ast::{ast_flat_map, expr_flat_map};
 use crate::{span_to_range, LanguageServer};
 use lsp_textdocument::FullTextDocument;
 use lsp_types::{
@@ -7,166 +8,11 @@ use lsp_types::{
     MarkupKind, Position, Range,
 };
 use nu_protocol::{
-    ast::{
-        Argument, Block, Expr, Expression, ExternalArgument, ListItem, MatchPattern, Operator,
-        Pattern, PipelineRedirection, RecordItem,
-    },
+    ast::{Argument, Block, Expr, Expression, Operator},
     engine::StateWorkingSet,
     Type,
 };
 
-/// similar to flatten_block, but allows extra map function
-fn ast_flat_map<T, E>(
-    ast: &Arc<Block>,
-    working_set: &StateWorkingSet,
-    extra_args: &E,
-    f_special: fn(&Expression, &StateWorkingSet, &E) -> Option<Vec<T>>,
-) -> Vec<T> {
-    ast.pipelines
-        .iter()
-        .flat_map(|pipeline| {
-            pipeline.elements.iter().flat_map(|element| {
-                expr_flat_map(&element.expr, working_set, extra_args, f_special)
-                    .into_iter()
-                    .chain(
-                        element
-                            .redirection
-                            .as_ref()
-                            .map(|redir| {
-                                redirect_flat_map(redir, working_set, extra_args, f_special)
-                            })
-                            .unwrap_or_default(),
-                    )
-            })
-        })
-        .collect()
-}
-
-/// generic function that do flat_map on an expression
-/// concats all recursive results on sub-expressions
-///
-/// # Arguments
-/// * `f_special` - function that overrides the default behavior
-fn expr_flat_map<T, E>(
-    expr: &Expression,
-    working_set: &StateWorkingSet,
-    extra_args: &E,
-    f_special: fn(&Expression, &StateWorkingSet, &E) -> Option<Vec<T>>,
-) -> Vec<T> {
-    // behavior overridden by f_special
-    if let Some(vec) = f_special(expr, working_set, extra_args) {
-        return vec;
-    }
-    let recur = |expr| expr_flat_map(expr, working_set, extra_args, f_special);
-    match &expr.expr {
-        Expr::RowCondition(block_id)
-        | Expr::Subexpression(block_id)
-        | Expr::Block(block_id)
-        | Expr::Closure(block_id) => {
-            let block = working_set.get_block(block_id.to_owned());
-            ast_flat_map(block, working_set, extra_args, f_special)
-        }
-        Expr::Range(range) => [&range.from, &range.next, &range.to]
-            .iter()
-            .filter_map(|e| e.as_ref())
-            .flat_map(recur)
-            .collect(),
-        Expr::Call(call) => call
-            .arguments
-            .iter()
-            .filter_map(|arg| arg.expr())
-            .flat_map(recur)
-            .collect(),
-        Expr::ExternalCall(head, args) => recur(head)
-            .into_iter()
-            .chain(args.iter().flat_map(|arg| match arg {
-                ExternalArgument::Regular(e) | ExternalArgument::Spread(e) => recur(e),
-            }))
-            .collect(),
-        Expr::UnaryNot(expr) | Expr::Collect(_, expr) => recur(expr),
-        Expr::BinaryOp(lhs, op, rhs) => recur(lhs)
-            .into_iter()
-            .chain(recur(op))
-            .chain(recur(rhs))
-            .collect(),
-        Expr::MatchBlock(matches) => matches
-            .iter()
-            .flat_map(|(pattern, expr)| {
-                match_pattern_flat_map(pattern, working_set, extra_args, f_special)
-                    .into_iter()
-                    .chain(recur(expr))
-            })
-            .collect(),
-        Expr::List(items) => items
-            .iter()
-            .flat_map(|item| match item {
-                ListItem::Item(expr) | ListItem::Spread(_, expr) => recur(expr),
-            })
-            .collect(),
-        Expr::Record(items) => items
-            .iter()
-            .flat_map(|item| match item {
-                RecordItem::Spread(_, expr) => recur(expr),
-                RecordItem::Pair(key, val) => [key, val].into_iter().flat_map(recur).collect(),
-            })
-            .collect(),
-        Expr::Table(table) => table
-            .columns
-            .iter()
-            .flat_map(recur)
-            .chain(table.rows.iter().flat_map(|row| row.iter().flat_map(recur)))
-            .collect(),
-        Expr::ValueWithUnit(vu) => recur(&vu.expr),
-        Expr::FullCellPath(fcp) => recur(&fcp.head),
-        Expr::Keyword(kw) => recur(&kw.expr),
-        Expr::StringInterpolation(vec) | Expr::GlobInterpolation(vec, _) => {
-            vec.iter().flat_map(recur).collect()
-        }
-
-        _ => Vec::new(),
-    }
-}
-
-/// flat_map on match patterns
-fn match_pattern_flat_map<T, E>(
-    pattern: &MatchPattern,
-    working_set: &StateWorkingSet,
-    extra_args: &E,
-    f_special: fn(&Expression, &StateWorkingSet, &E) -> Option<Vec<T>>,
-) -> Vec<T> {
-    let recur = |expr| expr_flat_map(expr, working_set, extra_args, f_special);
-    let recur_match = |p| match_pattern_flat_map(p, working_set, extra_args, f_special);
-    match &pattern.pattern {
-        Pattern::Expression(expr) => recur(expr),
-        Pattern::List(patterns) | Pattern::Or(patterns) => {
-            patterns.iter().flat_map(recur_match).collect()
-        }
-        Pattern::Record(entries) => entries.iter().flat_map(|(_, p)| recur_match(p)).collect(),
-        _ => Vec::new(),
-    }
-    .into_iter()
-    .chain(pattern.guard.as_ref().map(|g| recur(g)).unwrap_or_default())
-    .collect()
-}
-
-/// flat_map on redirections
-fn redirect_flat_map<T, E>(
-    redir: &PipelineRedirection,
-    working_set: &StateWorkingSet,
-    extra_args: &E,
-    f_special: fn(&Expression, &StateWorkingSet, &E) -> Option<Vec<T>>,
-) -> Vec<T> {
-    let recur = |expr| expr_flat_map(expr, working_set, extra_args, f_special);
-    match redir {
-        PipelineRedirection::Single { target, .. } => target.expr().map(recur).unwrap_or_default(),
-        PipelineRedirection::Separate { out, err } => [out, err]
-            .iter()
-            .filter_map(|t| t.expr())
-            .flat_map(recur)
-            .collect(),
-    }
-}
-
 fn type_short_name(t: &Type) -> String {
     match t {
         Type::Custom(_) => String::from("custom"),
@@ -182,7 +28,6 @@ fn extract_inlay_hints_from_expression(
     working_set: &StateWorkingSet,
     extra_args: &(usize, &FullTextDocument),
 ) -> Option<Vec<InlayHint>> {
-    let span = expr.span;
     let (offset, file) = extra_args;
     let recur = |expr| {
         expr_flat_map(
@@ -219,7 +64,7 @@ fn extract_inlay_hints_from_expression(
             Some(hints)
         }
         Expr::VarDecl(var_id) => {
-            let position = span_to_range(&span, file, *offset).end;
+            let position = span_to_range(&expr.span, file, *offset).end;
             // skip if the type is already specified in code
             if file
                 .get_content(Some(Range {
diff --git a/crates/nu-lsp/src/lib.rs b/crates/nu-lsp/src/lib.rs
index 0bf83e6dfe..4013e3a19a 100644
--- a/crates/nu-lsp/src/lib.rs
+++ b/crates/nu-lsp/src/lib.rs
@@ -1,23 +1,20 @@
 #![doc = include_str!("../README.md")]
+use ast::find_id;
 use lsp_server::{Connection, IoThreads, Message, Response, ResponseError};
 use lsp_textdocument::{FullTextDocument, TextDocuments};
 use lsp_types::{
-    request::{
-        Completion, DocumentSymbolRequest, GotoDefinition, HoverRequest, InlayHintRequest, Request,
-        WorkspaceSymbolRequest,
-    },
-    CompletionItem, CompletionItemKind, CompletionParams, CompletionResponse, CompletionTextEdit,
-    GotoDefinitionParams, GotoDefinitionResponse, Hover, HoverContents, HoverParams, InlayHint,
-    Location, MarkupContent, MarkupKind, OneOf, Range, ServerCapabilities, TextDocumentSyncKind,
-    TextEdit, Uri,
+    request, request::Request, CompletionItem, CompletionItemKind, CompletionParams,
+    CompletionResponse, CompletionTextEdit, Hover, HoverContents, HoverParams, InlayHint, Location,
+    MarkupContent, MarkupKind, OneOf, Range, RenameOptions, ServerCapabilities,
+    TextDocumentSyncKind, TextEdit, Uri, WorkDoneProgressOptions,
 };
 use miette::{IntoDiagnostic, Result};
 use nu_cli::{NuCompleter, SuggestionKind};
-use nu_parser::{flatten_block, parse, FlatShape};
+use nu_parser::parse;
 use nu_protocol::{
     ast::Block,
     engine::{CachedFile, EngineState, Stack, StateWorkingSet},
-    DeclId, ModuleId, Span, Value, VarId,
+    DeclId, ModuleId, Span, Type, Value, VarId,
 };
 use std::collections::BTreeMap;
 use std::{
@@ -29,16 +26,18 @@ use std::{
 use symbols::SymbolCache;
 use url::Url;
 
+mod ast;
 mod diagnostics;
+mod goto;
 mod hints;
 mod notification;
 mod symbols;
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 enum Id {
     Variable(VarId),
     Declaration(DeclId),
-    Value(FlatShape),
+    Value(Type),
     Module(ModuleId),
 }
 
@@ -105,10 +104,16 @@ impl LanguageServer {
             document_symbol_provider: Some(OneOf::Left(true)),
             workspace_symbol_provider: Some(OneOf::Left(true)),
             inlay_hint_provider: Some(OneOf::Left(true)),
+            rename_provider: Some(OneOf::Right(RenameOptions {
+                prepare_provider: Some(true),
+                work_done_progress_options: WorkDoneProgressOptions {
+                    work_done_progress: Some(true),
+                },
+            })),
+            references_provider: Some(OneOf::Left(true)),
             ..Default::default()
         })
         .expect("Must be serializable");
-
         let _ = self
             .connection
             .initialize_while(server_capabilities, || {
@@ -140,24 +145,24 @@ impl LanguageServer {
                     }
 
                     let resp = match request.method.as_str() {
-                        GotoDefinition::METHOD => {
+                        request::GotoDefinition::METHOD => {
                             Self::handle_lsp_request(request, |params| self.goto_definition(params))
                         }
-                        HoverRequest::METHOD => {
+                        request::HoverRequest::METHOD => {
                             Self::handle_lsp_request(request, |params| self.hover(params))
                         }
-                        Completion::METHOD => {
+                        request::Completion::METHOD => {
                             Self::handle_lsp_request(request, |params| self.complete(params))
                         }
-                        DocumentSymbolRequest::METHOD => {
+                        request::DocumentSymbolRequest::METHOD => {
                             Self::handle_lsp_request(request, |params| self.document_symbol(params))
                         }
-                        WorkspaceSymbolRequest::METHOD => {
+                        request::WorkspaceSymbolRequest::METHOD => {
                             Self::handle_lsp_request(request, |params| {
                                 self.workspace_symbol(params)
                             })
                         }
-                        InlayHintRequest::METHOD => {
+                        request::InlayHintRequest::METHOD => {
                             Self::handle_lsp_request(request, |params| self.get_inlay_hints(params))
                         }
                         _ => {
@@ -281,66 +286,6 @@ impl LanguageServer {
         }
     }
 
-    fn find_id(
-        flattened: Vec<(Span, FlatShape)>,
-        location: usize,
-        offset: usize,
-    ) -> Option<(Id, usize, Span)> {
-        let location = location + offset;
-
-        for (span, shape) in flattened {
-            if location >= span.start && location < span.end {
-                match &shape {
-                    FlatShape::Variable(var_id) | FlatShape::VarDecl(var_id) => {
-                        return Some((Id::Variable(*var_id), offset, span));
-                    }
-                    FlatShape::InternalCall(decl_id) | FlatShape::Custom(decl_id) => {
-                        return Some((Id::Declaration(*decl_id), offset, span));
-                    }
-                    _ => return Some((Id::Value(shape), offset, span)),
-                }
-            }
-        }
-        None
-    }
-
-    fn goto_definition(&mut self, params: &GotoDefinitionParams) -> Option<GotoDefinitionResponse> {
-        let mut engine_state = self.new_engine_state();
-
-        let path_uri = params
-            .text_document_position_params
-            .text_document
-            .uri
-            .to_owned();
-        let (block, file_offset, working_set, file) =
-            self.parse_file(&mut engine_state, &path_uri, false)?;
-        let flattened = flatten_block(&working_set, &block);
-        let (id, _, _) = Self::find_id(
-            flattened,
-            file.offset_at(params.text_document_position_params.position) as usize,
-            file_offset,
-        )?;
-
-        let span = match id {
-            Id::Declaration(decl_id) => {
-                let block_id = working_set.get_decl(decl_id).block_id()?;
-                working_set.get_block(block_id).span
-            }
-            Id::Variable(var_id) => {
-                let var = working_set.get_variable(var_id);
-                Some(var.declaration_span)
-            }
-            Id::Module(module_id) => {
-                let module = working_set.get_module(module_id);
-                module.span
-            }
-            _ => None,
-        }?;
-        Some(GotoDefinitionResponse::Scalar(
-            self.get_location_by_span(working_set.files(), &span)?,
-        ))
-    }
-
     fn hover(&mut self, params: &HoverParams) -> Option<Hover> {
         let mut engine_state = self.new_engine_state();
 
@@ -351,12 +296,9 @@ impl LanguageServer {
             .to_owned();
         let (block, file_offset, working_set, file) =
             self.parse_file(&mut engine_state, &path_uri, false)?;
-        let flattened = flatten_block(&working_set, &block);
-        let (id, _, _) = Self::find_id(
-            flattened,
-            file.offset_at(params.text_document_position_params.position) as usize,
-            file_offset,
-        )?;
+        let location =
+            file.offset_at(params.text_document_position_params.position) as usize + file_offset;
+        let id = find_id(&block, &working_set, &location)?;
 
         match id {
             Id::Variable(var_id) => {
@@ -518,37 +460,9 @@ impl LanguageServer {
                     range: None,
                 })
             }
-            Id::Value(shape) => {
-                let hover = String::from(match shape {
-                    FlatShape::Binary => "binary",
-                    FlatShape::Block => "block",
-                    FlatShape::Bool => "bool",
-                    FlatShape::Closure => "closure",
-                    FlatShape::DateTime => "datetime",
-                    FlatShape::Directory => "directory",
-                    FlatShape::External => "external",
-                    FlatShape::ExternalArg => "external arg",
-                    FlatShape::Filepath => "file path",
-                    FlatShape::Flag => "flag",
-                    FlatShape::Float => "float",
-                    FlatShape::GlobPattern => "glob pattern",
-                    FlatShape::Int => "int",
-                    FlatShape::Keyword => "keyword",
-                    FlatShape::List => "list",
-                    FlatShape::MatchPattern => "match-pattern",
-                    FlatShape::Nothing => "nothing",
-                    FlatShape::Range => "range",
-                    FlatShape::Record => "record",
-                    FlatShape::String => "string",
-                    FlatShape::StringInterpolation => "string interpolation",
-                    FlatShape::Table => "table",
-                    _ => {
-                        return None;
-                    }
-                });
-
+            Id::Value(t) => {
                 Some(Hover {
-                    contents: HoverContents::Scalar(lsp_types::MarkedString::String(hover)),
+                    contents: HoverContents::Scalar(lsp_types::MarkedString::String(t.to_string())),
                     // TODO
                     range: None,
                 })
@@ -620,13 +534,13 @@ mod tests {
         notification::{
             DidChangeTextDocument, DidOpenTextDocument, Exit, Initialized, Notification,
         },
-        request::{Completion, GotoDefinition, HoverRequest, Initialize, Request, Shutdown},
-        CompletionParams, DidChangeTextDocumentParams, DidOpenTextDocumentParams,
-        GotoDefinitionParams, InitializeParams, InitializedParams, PartialResultParams, Position,
-        TextDocumentContentChangeEvent, TextDocumentIdentifier, TextDocumentItem,
-        TextDocumentPositionParams, WorkDoneProgressParams,
+        request::{Completion, HoverRequest, Initialize, Request, Shutdown},
+        CompletionParams, DidChangeTextDocumentParams, DidOpenTextDocumentParams, InitializeParams,
+        InitializedParams, PartialResultParams, Position, TextDocumentContentChangeEvent,
+        TextDocumentIdentifier, TextDocumentItem, TextDocumentPositionParams,
+        WorkDoneProgressParams,
     };
-    use nu_test_support::fs::{fixtures, root};
+    use nu_test_support::fs::fixtures;
     use std::sync::mpsc::Receiver;
 
     pub fn initialize_language_server() -> (Connection, Receiver<Result<()>>) {
@@ -696,48 +610,6 @@ mod tests {
             .is_ok());
     }
 
-    #[test]
-    fn goto_definition_for_none_existing_file() {
-        let (client_connection, _recv) = initialize_language_server();
-
-        let mut none_existent_path = root();
-        none_existent_path.push("none-existent.nu");
-
-        client_connection
-            .sender
-            .send(Message::Request(lsp_server::Request {
-                id: 2.into(),
-                method: GotoDefinition::METHOD.to_string(),
-                params: serde_json::to_value(GotoDefinitionParams {
-                    text_document_position_params: TextDocumentPositionParams {
-                        text_document: TextDocumentIdentifier {
-                            uri: path_to_uri(&none_existent_path),
-                        },
-                        position: Position {
-                            line: 0,
-                            character: 0,
-                        },
-                    },
-                    work_done_progress_params: WorkDoneProgressParams::default(),
-                    partial_result_params: PartialResultParams::default(),
-                })
-                .unwrap(),
-            }))
-            .unwrap();
-
-        let resp = client_connection
-            .receiver
-            .recv_timeout(std::time::Duration::from_secs(2))
-            .unwrap();
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
-
-        assert_json_eq!(result, serde_json::json!(null));
-    }
-
     pub fn open_unchecked(client_connection: &Connection, uri: Uri) -> lsp_server::Notification {
         open(client_connection, uri).unwrap()
     }
@@ -815,159 +687,6 @@ mod tests {
         }
     }
 
-    fn send_goto_definition_request(
-        client_connection: &Connection,
-        uri: Uri,
-        line: u32,
-        character: u32,
-    ) -> Message {
-        client_connection
-            .sender
-            .send(Message::Request(lsp_server::Request {
-                id: 2.into(),
-                method: GotoDefinition::METHOD.to_string(),
-                params: serde_json::to_value(GotoDefinitionParams {
-                    text_document_position_params: TextDocumentPositionParams {
-                        text_document: TextDocumentIdentifier { uri },
-                        position: Position { line, character },
-                    },
-                    work_done_progress_params: WorkDoneProgressParams::default(),
-                    partial_result_params: PartialResultParams::default(),
-                })
-                .unwrap(),
-            }))
-            .unwrap();
-
-        client_connection
-            .receiver
-            .recv_timeout(std::time::Duration::from_secs(2))
-            .unwrap()
-    }
-
-    #[test]
-    fn goto_definition_of_variable() {
-        let (client_connection, _recv) = initialize_language_server();
-
-        let mut script = fixtures();
-        script.push("lsp");
-        script.push("goto");
-        script.push("var.nu");
-        let script = path_to_uri(&script);
-
-        open_unchecked(&client_connection, script.clone());
-
-        let resp = send_goto_definition_request(&client_connection, script.clone(), 2, 12);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
-
-        assert_json_eq!(
-            result,
-            serde_json::json!({
-                "uri": script,
-                "range": {
-                    "start": { "line": 0, "character": 4 },
-                    "end": { "line": 0, "character": 12 }
-                }
-            })
-        );
-    }
-
-    #[test]
-    fn goto_definition_of_command() {
-        let (client_connection, _recv) = initialize_language_server();
-
-        let mut script = fixtures();
-        script.push("lsp");
-        script.push("goto");
-        script.push("command.nu");
-        let script = path_to_uri(&script);
-
-        open_unchecked(&client_connection, script.clone());
-
-        let resp = send_goto_definition_request(&client_connection, script.clone(), 4, 1);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
-
-        assert_json_eq!(
-            result,
-            serde_json::json!({
-                "uri": script,
-                "range": {
-                "start": { "line": 0, "character": 17 },
-                "end": { "line": 2, "character": 1 }
-            }
-            })
-        );
-    }
-
-    #[test]
-    fn goto_definition_of_command_unicode() {
-        let (client_connection, _recv) = initialize_language_server();
-
-        let mut script = fixtures();
-        script.push("lsp");
-        script.push("goto");
-        script.push("command_unicode.nu");
-        let script = path_to_uri(&script);
-
-        open_unchecked(&client_connection, script.clone());
-
-        let resp = send_goto_definition_request(&client_connection, script.clone(), 4, 2);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
-
-        assert_json_eq!(
-            result,
-            serde_json::json!({
-                "uri": script,
-                "range": {
-                "start": { "line": 0, "character": 19 },
-                "end": { "line": 2, "character": 1 }
-            }
-            })
-        );
-    }
-
-    #[test]
-    fn goto_definition_of_command_parameter() {
-        let (client_connection, _recv) = initialize_language_server();
-
-        let mut script = fixtures();
-        script.push("lsp");
-        script.push("goto");
-        script.push("command.nu");
-        let script = path_to_uri(&script);
-
-        open_unchecked(&client_connection, script.clone());
-
-        let resp = send_goto_definition_request(&client_connection, script.clone(), 1, 14);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
-
-        assert_json_eq!(
-            result,
-            serde_json::json!({
-                "uri": script,
-                "range": {
-                "start": { "line": 0, "character": 11 },
-                "end": { "line": 0, "character": 15 }
-            }
-            })
-        );
-    }
-
     pub fn send_hover_request(
         client_connection: &Connection,
         uri: Uri,
diff --git a/tests/fixtures/lsp/goto/collect.nu b/tests/fixtures/lsp/goto/collect.nu
new file mode 100644
index 0000000000..bfd14fcb52
--- /dev/null
+++ b/tests/fixtures/lsp/goto/collect.nu
@@ -0,0 +1,2 @@
+let foo = 1
+..2 | each { $foo }
diff --git a/tests/fixtures/lsp/goto/else.nu b/tests/fixtures/lsp/goto/else.nu
new file mode 100644
index 0000000000..04018b111c
--- /dev/null
+++ b/tests/fixtures/lsp/goto/else.nu
@@ -0,0 +1,2 @@
+let foo = 1
+if true { } else { $foo }
diff --git a/tests/fixtures/lsp/goto/match.nu b/tests/fixtures/lsp/goto/match.nu
new file mode 100644
index 0000000000..52836f2209
--- /dev/null
+++ b/tests/fixtures/lsp/goto/match.nu
@@ -0,0 +1,5 @@
+let foo = 1
+match $foo {
+  _ if $foo == 1 => 1
+  _ => 2
+}

From 737ea3940ed404489850f51bdeceeda03940ad77 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Mon, 13 Jan 2025 07:00:21 -0600
Subject: [PATCH 0916/1072] finish removing terminal_size dep (#14819)

# Description

This PR is a follow on to https://github.com/nushell/nushell/pull/14423
and finishes removing the `terminal_size` crate in favor of
`crossterm`'s `size()`.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock                            |  2 --
 Cargo.toml                            |  1 -
 crates/nu-engine/Cargo.toml           |  1 -
 crates/nu-engine/src/documentation.rs |  4 ++--
 crates/nu-table/Cargo.toml            |  1 -
 crates/nu-table/src/common.rs         | 11 ++++-------
 6 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5047323322..7247fa23b7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3889,7 +3889,6 @@ dependencies = [
  "nu-path",
  "nu-protocol",
  "nu-utils",
- "terminal_size",
 ]
 
 [[package]]
@@ -4150,7 +4149,6 @@ dependencies = [
  "nu-protocol",
  "nu-utils",
  "tabled",
- "terminal_size",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index ac5361a392..db3edcd49d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -157,7 +157,6 @@ syn = "2.0"
 sysinfo = "0.32"
 tabled = { version = "0.17.0", default-features = false }
 tempfile = "3.15"
-terminal_size = "0.4"
 titlecase = "3.0"
 toml = "0.8"
 trash = "5.2"
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index 0d1e42a8d7..3285d1ae70 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -19,7 +19,6 @@ nu-path = { path = "../nu-path", version = "0.101.1" }
 nu-glob = { path = "../nu-glob", version = "0.101.1" }
 nu-utils = { path = "../nu-utils", version = "0.101.1", default-features = false }
 log = { workspace = true }
-terminal_size = { workspace = true }
 
 [features]
 default = ["os"]
diff --git a/crates/nu-engine/src/documentation.rs b/crates/nu-engine/src/documentation.rs
index 4598e1b325..78c11bc4d0 100644
--- a/crates/nu-engine/src/documentation.rs
+++ b/crates/nu-engine/src/documentation.rs
@@ -7,8 +7,8 @@ use nu_protocol::{
     record, Category, Config, Example, IntoPipelineData, PipelineData, PositionalArg, Signature,
     Span, SpanId, Spanned, SyntaxShape, Type, Value,
 };
+use nu_utils::terminal_size;
 use std::{collections::HashMap, fmt::Write};
-use terminal_size::{Height, Width};
 
 /// ANSI style reset
 const RESET: &str = "\x1b[0m";
@@ -194,7 +194,7 @@ fn get_documentation(
     }
 
     fn get_term_width() -> usize {
-        if let Some((Width(w), Height(_))) = terminal_size::terminal_size() {
+        if let Ok((w, _h)) = terminal_size() {
             w as usize
         } else {
             80
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index 05eca42edf..e20c38ca77 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -21,7 +21,6 @@ nu-color-config = { path = "../nu-color-config", version = "0.101.1" }
 nu-ansi-term = { workspace = true }
 fancy-regex = { workspace = true }
 tabled = { workspace = true, features = ["ansi"], default-features = false }
-terminal_size = { workspace = true }
 
 [dev-dependencies]
 # nu-test-support = { path="../nu-test-support", version = "0.101.1"  }
\ No newline at end of file
diff --git a/crates/nu-table/src/common.rs b/crates/nu-table/src/common.rs
index 8c89fbbfe2..2f08e8f966 100644
--- a/crates/nu-table/src/common.rs
+++ b/crates/nu-table/src/common.rs
@@ -1,9 +1,7 @@
+use crate::{clean_charset, colorize_space_str, string_wrap, TableOutput, TableTheme};
 use nu_color_config::{Alignment, StyleComputer, TextStyle};
 use nu_protocol::{Config, FooterMode, ShellError, Span, TableMode, TrimStrategy, Value};
-
-use terminal_size::{terminal_size, Height, Width};
-
-use crate::{clean_charset, colorize_space_str, string_wrap, TableOutput, TableTheme};
+use nu_utils::terminal_size;
 
 pub type NuText = (String, TextStyle);
 pub type TableResult = Result<Option<TableOutput>, ShellError>;
@@ -211,10 +209,9 @@ fn need_footer(config: &Config, count_records: u64) -> bool {
         // Calculate the screen height and row count, if screen height is larger than row count, don't show footer
         FooterMode::Auto => {
             let (_width, height) = match terminal_size() {
-                Some((w, h)) => (Width(w.0).0 as u64, Height(h.0).0 as u64),
-                None => (Width(0).0 as u64, Height(0).0 as u64),
+                Ok((w, h)) => (w as u64, h as u64),
+                _ => (0, 0),
             };
-
             height <= count_records
         }
     }

From e1177065184d957fab4fc632d5fc21603e482bb4 Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Mon, 13 Jan 2025 22:04:17 +0800
Subject: [PATCH 0917/1072] fix(parser): span of `$it`/`$in` set to the first
 character of its scope (#14817)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

Follow-up PR of #14789
The span of `$it/$in` is set to a 0-width one with start/end pointing to
the start of its scope, mainly for error messages positioning.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-parser/src/parser.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index dd11edc974..3d9038856a 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -3435,7 +3435,8 @@ pub fn parse_full_signature(working_set: &mut StateWorkingSet, spans: &[Span]) -
 }
 
 pub fn parse_row_condition(working_set: &mut StateWorkingSet, spans: &[Span]) -> Expression {
-    let var_id = working_set.add_variable(b"$it".to_vec(), Span::unknown(), Type::Any, false);
+    let pos = spans.first().map(|s| s.start).unwrap_or(0);
+    let var_id = working_set.add_variable(b"$it".to_vec(), Span::new(pos, pos), Type::Any, false);
     let expression = parse_math_expression(working_set, spans, Some(var_id));
     let span = Span::concat(spans);
 
@@ -6633,7 +6634,12 @@ fn wrap_expr_with_collect(working_set: &mut StateWorkingSet, expr: Expression) -
 
     // IN_VARIABLE_ID should get replaced with a unique variable, so that we don't have to
     // execute as a closure
-    let var_id = working_set.add_variable(b"$in".into(), Span::unknown(), Type::Any, false);
+    let var_id = working_set.add_variable(
+        b"$in".into(),
+        Span::new(span.start, span.start),
+        Type::Any,
+        false,
+    );
     let mut expr = expr.clone();
     expr.replace_in_variable(working_set, var_id);
 

From 306e305b6597810d904432966fb5102e8c6a369c Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Tue, 14 Jan 2025 21:16:44 +0800
Subject: [PATCH 0918/1072] Add help pipe-and-redirect command.  (#14821)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
This pr is going to add a new command named `help pipe-and-redirect`.

So user can detect such feature easier.

# User-Facing Changes
Here is the output of this command:
```
╭───┬────────┬──────────────────────────────────────┬──────────────────────────────────────────────────────────────┬─────────────────────╮
│ # │ symbol │                 name                 │                         description                          │       example       │
├───┼────────┼──────────────────────────────────────┼──────────────────────────────────────────────────────────────┼─────────────────────┤
│ 0 │ |      │ pipe                                 │ pipeline stdout of a command to another command              │ ^cmd1 | ^cmd2       │
│ 1 │ e>|    │ stderr pipe                          │ pipeline stderr of a command to another command              │ ^cmd1 e>| ^cmd2     │
│ 2 │ o+e>|  │ stdout and stderr pipe               │ pipeline stdout and stderr of a command to another command   │ ^cmd1 o+e>| ^cmd2   │
│ 3 │ o>     │ redirection                          │ redirect stdout of a command, overwriting a file             │ ^cmd1 o> file.txt   │
│ 4 │ e>     │ stderr redirection                   │ redirect stderr of a command, overwriting a file             │ ^cmd1 e> file.txt   │
│ 5 │ o+e>   │ stdout and stderr redirection        │ redirect stdout and stderr of a command, overwriting a file  │ ^cmd1 o+e> file.txt │
│ 6 │ o>>    │ redirection append                   │ redirect stdout of a command, appending to a file            │ ^cmd1 o> file.txt   │
│ 7 │ e>>    │ stderr redirection append            │ redirect stderr of a command, appending to a file            │ ^cmd1 e> file.txt   │
│ 8 │ o+e>>  │ stdout and stderr redirection append │ redirect stdout and stderr of a command, appending to a file │ ^cmd1 o+e> file.txt │
│ 9 │ o>|    │                                      │ Unsupported, it's the same to `|`, use it instead            │                     │
├───┼────────┼──────────────────────────────────────┼──────────────────────────────────────────────────────────────┼─────────────────────┤
│ # │ symbol │                 name                 │                         description                          │       example       │
╰───┴────────┴──────────────────────────────────────┴──────────────────────────────────────────────────────────────┴─────────────────────╯
```

# Tests + Formatting


# After Submitting
Should update more examples in [nushell
doc](https://www.nushell.sh/lang-guide/chapters/pipelines.html) to fill
more examples
---
 crates/nu-command/src/default_context.rs      |   1 +
 .../src/help/help_pipe_and_redirect.rs        | 143 ++++++++++++++++++
 crates/nu-command/src/help/mod.rs             |   2 +
 3 files changed, 146 insertions(+)
 create mode 100644 crates/nu-command/src/help/help_pipe_and_redirect.rs

diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index 4ae348eb14..7ea6e6cdde 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -144,6 +144,7 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             HelpCommands,
             HelpModules,
             HelpOperators,
+            HelpPipeAndRedirect,
             HelpEscapes,
         };
 
diff --git a/crates/nu-command/src/help/help_pipe_and_redirect.rs b/crates/nu-command/src/help/help_pipe_and_redirect.rs
new file mode 100644
index 0000000000..11b33c5956
--- /dev/null
+++ b/crates/nu-command/src/help/help_pipe_and_redirect.rs
@@ -0,0 +1,143 @@
+use nu_engine::command_prelude::*;
+
+#[derive(Clone)]
+pub struct HelpPipeAndRedirect;
+
+impl Command for HelpPipeAndRedirect {
+    fn name(&self) -> &str {
+        "help pipe-and-redirect"
+    }
+
+    fn description(&self) -> &str {
+        "Show help on nushell pipes and redirects."
+    }
+
+    fn extra_description(&self) -> &str {
+        r#"This command contains basic usage of pipe and redirect symbol, for more detail, check:
+https://www.nushell.sh/lang-guide/chapters/pipelines.html"#
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("help pipe-and-redirect")
+            .category(Category::Core)
+            .input_output_types(vec![(Type::Nothing, Type::table())])
+            .allow_variants_without_examples(true)
+    }
+
+    fn run(
+        &self,
+        _engine_state: &EngineState,
+        _stack: &mut Stack,
+        call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let head = call.head;
+        let examples = vec![
+            HelpExamples::new(
+                "|",
+                "pipe",
+                "pipeline stdout of a command to another command",
+                "^cmd1 | ^cmd2",
+            ),
+            HelpExamples::new(
+                "e>|",
+                "stderr pipe",
+                "pipeline stderr of a command to another command",
+                "^cmd1 e>| ^cmd2",
+            ),
+            HelpExamples::new(
+                "o+e>|",
+                "stdout and stderr pipe",
+                "pipeline stdout and stderr of a command to another command",
+                "^cmd1 o+e>| ^cmd2",
+            ),
+            HelpExamples::new(
+                "o>",
+                "redirection",
+                "redirect stdout of a command, overwriting a file",
+                "^cmd1 o> file.txt",
+            ),
+            HelpExamples::new(
+                "e>",
+                "stderr redirection",
+                "redirect stderr of a command, overwriting a file",
+                "^cmd1 e> file.txt",
+            ),
+            HelpExamples::new(
+                "o+e>",
+                "stdout and stderr redirection",
+                "redirect stdout and stderr of a command, overwriting a file",
+                "^cmd1 o+e> file.txt",
+            ),
+            HelpExamples::new(
+                "o>>",
+                "redirection append",
+                "redirect stdout of a command, appending to a file",
+                "^cmd1 o> file.txt",
+            ),
+            HelpExamples::new(
+                "e>>",
+                "stderr redirection append",
+                "redirect stderr of a command, appending to a file",
+                "^cmd1 e> file.txt",
+            ),
+            HelpExamples::new(
+                "o+e>>",
+                "stdout and stderr redirection append",
+                "redirect stdout and stderr of a command, appending to a file",
+                "^cmd1 o+e> file.txt",
+            ),
+            HelpExamples::new(
+                "o>|",
+                "",
+                "UNSUPPORTED, Redirecting stdout to a pipe is the same as normal piping",
+                "",
+            ),
+        ];
+        let examples: Vec<Value> = examples
+            .into_iter()
+            .map(|x| x.into_val_record(head))
+            .collect();
+        Ok(Value::list(examples, head).into_pipeline_data())
+    }
+}
+
+struct HelpExamples {
+    symbol: String,
+    name: String,
+    description: String,
+    example: String,
+}
+
+impl HelpExamples {
+    fn new(symbol: &str, name: &str, description: &str, example: &str) -> Self {
+        Self {
+            symbol: symbol.to_string(),
+            name: name.to_string(),
+            description: description.to_string(),
+            example: example.to_string(),
+        }
+    }
+
+    fn into_val_record(self, span: Span) -> Value {
+        Value::record(
+            record! {
+                "symbol" => Value::string(self.symbol, span),
+                "name" => Value::string(self.name, span),
+                "description" => Value::string(self.description, span),
+                "example" => Value::string(self.example, span),
+            },
+            span,
+        )
+    }
+}
+
+#[cfg(test)]
+mod test {
+    #[test]
+    fn test_examples() {
+        use super::HelpPipeAndRedirect;
+        use crate::test_examples;
+        test_examples(HelpPipeAndRedirect {})
+    }
+}
diff --git a/crates/nu-command/src/help/mod.rs b/crates/nu-command/src/help/mod.rs
index 0bff55734f..9cbd187867 100644
--- a/crates/nu-command/src/help/mod.rs
+++ b/crates/nu-command/src/help/mod.rs
@@ -5,6 +5,7 @@ mod help_escapes;
 mod help_externs;
 mod help_modules;
 mod help_operators;
+mod help_pipe_and_redirect;
 
 pub use help_::Help;
 pub use help_aliases::HelpAliases;
@@ -13,6 +14,7 @@ pub use help_escapes::HelpEscapes;
 pub use help_externs::HelpExterns;
 pub use help_modules::HelpModules;
 pub use help_operators::HelpOperators;
+pub use help_pipe_and_redirect::HelpPipeAndRedirect;
 
 pub(crate) use help_::{highlight_search_in_table, highlight_search_string};
 pub(crate) use help_aliases::help_aliases;

From 301d1370c48266644f39f4638dc95beff963ba6f Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Tue, 14 Jan 2025 20:44:31 +0300
Subject: [PATCH 0919/1072] Add input support to `generate` (#14804)

- closes #8523

# Description

This PR adds pipeline input support to `generate`.
- Without input, `generate` keeps its current behavior.
- With input, each invocation of the closure is provided an item from
the input stream as pipeline input (`$in`). If/when the input stream
runs out, `generate` also stops.

Before this PR, there is no filter command that is both stateful _and_
streaming.

This PR also refactors `std/iter scan` to use `generate`, making it
streaming and more performant over larger inputs.

# User-Facing Changes
- `generate` now supports pipeline input, passing each element to the
closure as `$in` until it runs out
- `std/iter scan` is now streaming

# Tests + Formatting
Added tests to validate the new feature.

- :green_circle: toolkit fmt
- :green_circle: toolkit clippy
- :green_circle: toolkit test
- :green_circle: toolkit test stdlib

# After Submitting
N/A
---
 crates/nu-command/src/generators/generate.rs | 242 ++++++++++++-------
 crates/nu-command/tests/commands/generate.rs |  22 ++
 crates/nu-std/std/iter/mod.nu                |  16 +-
 3 files changed, 178 insertions(+), 102 deletions(-)

diff --git a/crates/nu-command/src/generators/generate.rs b/crates/nu-command/src/generators/generate.rs
index ead6bdd7c9..05a34dcbeb 100644
--- a/crates/nu-command/src/generators/generate.rs
+++ b/crates/nu-command/src/generators/generate.rs
@@ -11,10 +11,15 @@ impl Command for Generate {
 
     fn signature(&self) -> Signature {
         Signature::build("generate")
-            .input_output_types(vec![(Type::Nothing, Type::List(Box::new(Type::Any)))])
+            .input_output_types(vec![
+                (Type::Nothing, Type::list(Type::Any)),
+                (Type::list(Type::Any), Type::list(Type::Any)),
+                (Type::table(), Type::list(Type::Any)),
+                (Type::Range, Type::list(Type::Any)),
+            ])
             .required(
                 "closure",
-                SyntaxShape::Closure(Some(vec![SyntaxShape::Any])),
+                SyntaxShape::Closure(Some(vec![SyntaxShape::Any, SyntaxShape::Any])),
                 "Generator function.",
             )
             .optional("initial", SyntaxShape::Any, "Initial value.")
@@ -31,11 +36,15 @@ impl Command for Generate {
 containing two optional keys: 'out' and 'next'. Each invocation, the 'out'
 value, if present, is added to the stream. If a 'next' key is present, it is
 used as the next argument to the closure, otherwise generation stops.
-"#
+
+Additionally, if an input stream is provided, the generator closure accepts two
+arguments. On each invocation an element of the input stream is provided as the
+first argument. The second argument is the `next` value from the last invocation.
+In this case, generation also stops when the input stream stops."#
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["unfold", "stream", "yield", "expand"]
+        vec!["unfold", "stream", "yield", "expand", "state", "scan"]
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -68,6 +77,18 @@ used as the next argument to the closure, otherwise generation stops.
                     "Generate a continuous stream of Fibonacci numbers, using default parameters",
                 result: None,
             },
+            Example {
+                example:
+                    "1..5 | generate {|e, sum=0| let sum = $e + $sum; {out: $sum, next: $sum} }",
+                description: "Generate a running sum of the inputs",
+                result: Some(Value::test_list(vec![
+                    Value::test_int(1),
+                    Value::test_int(3),
+                    Value::test_int(6),
+                    Value::test_int(10),
+                    Value::test_int(15),
+                ])),
+            },
         ]
     }
 
@@ -76,7 +97,7 @@ used as the next argument to the closure, otherwise generation stops.
         engine_state: &EngineState,
         stack: &mut Stack,
         call: &Call,
-        _input: PipelineData,
+        input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
         let closure: Closure = call.req(engine_state, stack, 0)?;
@@ -84,96 +105,55 @@ used as the next argument to the closure, otherwise generation stops.
         let block = engine_state.get_block(closure.block_id);
         let mut closure = ClosureEval::new(engine_state, stack, closure);
 
-        // A type of Option<S> is used to represent state. Invocation
-        // will stop on None. Using Option<S> allows functions to output
-        // one final value before stopping.
-        let mut state = Some(get_initial_state(initial, &block.signature, call.head)?);
-        let iter = std::iter::from_fn(move || {
-            let arg = state.take()?;
+        match input {
+            PipelineData::Empty => {
+                // A type of Option<S> is used to represent state. Invocation
+                // will stop on None. Using Option<S> allows functions to output
+                // one final value before stopping.
+                let mut state = Some(get_initial_state(initial, &block.signature, call.head)?);
+                let iter = std::iter::from_fn(move || {
+                    let state_arg = state.take()?;
 
-            let (output, next_input) = match closure.run_with_value(arg) {
-                // no data -> output nothing and stop.
-                Ok(PipelineData::Empty) => (None, None),
+                    let closure_result = closure
+                        .add_arg(state_arg)
+                        .run_with_input(PipelineData::Empty);
+                    let (output, next_input) = parse_closure_result(closure_result, head);
 
-                Ok(PipelineData::Value(value, ..)) => {
-                    let span = value.span();
-                    match value {
-                        // {out: ..., next: ...} -> output and continue
-                        Value::Record { val, .. } => {
-                            let iter = val.into_owned().into_iter();
-                            let mut out = None;
-                            let mut next = None;
-                            let mut err = None;
+                    // We use `state` to control when to stop, not `output`. By wrapping
+                    // it in a `Some`, we allow the generator to output `None` as a valid output
+                    // value.
+                    state = next_input;
+                    Some(output)
+                });
 
-                            for (k, v) in iter {
-                                if k.eq_ignore_ascii_case("out") {
-                                    out = Some(v);
-                                } else if k.eq_ignore_ascii_case("next") {
-                                    next = Some(v);
-                                } else {
-                                    let error = ShellError::GenericError {
-                                        error: "Invalid block return".into(),
-                                        msg: format!("Unexpected record key '{}'", k),
-                                        span: Some(span),
-                                        help: None,
-                                        inner: vec![],
-                                    };
-                                    err = Some(Value::error(error, head));
-                                    break;
-                                }
-                            }
-
-                            if err.is_some() {
-                                (err, None)
-                            } else {
-                                (out, next)
-                            }
-                        }
-
-                        // some other value -> error and stop
-                        _ => {
-                            let error = ShellError::GenericError {
-                                error: "Invalid block return".into(),
-                                msg: format!("Expected record, found {}", value.get_type()),
-                                span: Some(span),
-                                help: None,
-                                inner: vec![],
-                            };
-
-                            (Some(Value::error(error, head)), None)
-                        }
-                    }
-                }
-
-                Ok(other) => {
-                    let error = other
-                        .into_value(head)
-                        .map(|val| ShellError::GenericError {
-                            error: "Invalid block return".into(),
-                            msg: format!("Expected record, found {}", val.get_type()),
-                            span: Some(val.span()),
-                            help: None,
-                            inner: vec![],
-                        })
-                        .unwrap_or_else(|err| err);
-
-                    (Some(Value::error(error, head)), None)
-                }
-
-                // error -> error and stop
-                Err(error) => (Some(Value::error(error, head)), None),
-            };
-
-            // We use `state` to control when to stop, not `output`. By wrapping
-            // it in a `Some`, we allow the generator to output `None` as a valid output
-            // value.
-            state = next_input;
-            Some(output)
-        });
-
-        Ok(iter
-            .flatten()
-            .into_pipeline_data(call.head, engine_state.signals().clone()))
+                Ok(iter
+                    .flatten()
+                    .into_pipeline_data(call.head, engine_state.signals().clone()))
+            }
+            input @ (PipelineData::Value(Value::Range { .. }, ..)
+            | PipelineData::Value(Value::List { .. }, ..)
+            | PipelineData::ListStream(..)) => {
+                let mut state = Some(get_initial_state(initial, &block.signature, call.head)?);
+                let iter = input.into_iter().map_while(move |item| {
+                    let state_arg = state.take()?;
+                    let closure_result = closure
+                        .add_arg(item)
+                        .add_arg(state_arg)
+                        .run_with_input(PipelineData::Empty);
+                    let (output, next_input) = parse_closure_result(closure_result, head);
+                    state = next_input;
+                    Some(output)
+                });
+                Ok(iter
+                    .flatten()
+                    .into_pipeline_data(call.head, engine_state.signals().clone()))
+            }
+            _ => Err(ShellError::PipelineMismatch {
+                exp_input_type: "nothing".to_string(),
+                dst_span: head,
+                src_span: input.span().unwrap_or(head),
+            }),
+        }
     }
 }
 
@@ -209,6 +189,84 @@ fn get_initial_state(
     }
 }
 
+fn parse_closure_result(
+    closure_result: Result<PipelineData, ShellError>,
+    head: Span,
+) -> (Option<Value>, Option<Value>) {
+    match closure_result {
+        // no data -> output nothing and stop.
+        Ok(PipelineData::Empty) => (None, None),
+
+        Ok(PipelineData::Value(value, ..)) => {
+            let span = value.span();
+            match value {
+                // {out: ..., next: ...} -> output and continue
+                Value::Record { val, .. } => {
+                    let iter = val.into_owned().into_iter();
+                    let mut out = None;
+                    let mut next = None;
+                    let mut err = None;
+
+                    for (k, v) in iter {
+                        if k.eq_ignore_ascii_case("out") {
+                            out = Some(v);
+                        } else if k.eq_ignore_ascii_case("next") {
+                            next = Some(v);
+                        } else {
+                            let error = ShellError::GenericError {
+                                error: "Invalid block return".into(),
+                                msg: format!("Unexpected record key '{}'", k),
+                                span: Some(span),
+                                help: None,
+                                inner: vec![],
+                            };
+                            err = Some(Value::error(error, head));
+                            break;
+                        }
+                    }
+
+                    if err.is_some() {
+                        (err, None)
+                    } else {
+                        (out, next)
+                    }
+                }
+
+                // some other value -> error and stop
+                _ => {
+                    let error = ShellError::GenericError {
+                        error: "Invalid block return".into(),
+                        msg: format!("Expected record, found {}", value.get_type()),
+                        span: Some(span),
+                        help: None,
+                        inner: vec![],
+                    };
+
+                    (Some(Value::error(error, head)), None)
+                }
+            }
+        }
+
+        Ok(other) => {
+            let error = other
+                .into_value(head)
+                .map(|val| ShellError::GenericError {
+                    error: "Invalid block return".into(),
+                    msg: format!("Expected record, found {}", val.get_type()),
+                    span: Some(val.span()),
+                    help: None,
+                    inner: vec![],
+                })
+                .unwrap_or_else(|err| err);
+
+            (Some(Value::error(error, head)), None)
+        }
+
+        // error -> error and stop
+        Err(error) => (Some(Value::error(error, head)), None),
+    }
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/crates/nu-command/tests/commands/generate.rs b/crates/nu-command/tests/commands/generate.rs
index 9ae3b8823e..866d587dd6 100644
--- a/crates/nu-command/tests/commands/generate.rs
+++ b/crates/nu-command/tests/commands/generate.rs
@@ -148,3 +148,25 @@ fn generate_raise_error_on_no_default_parameter_closure_and_init_val() {
     ));
     assert!(actual.err.contains("The initial value is missing"));
 }
+
+#[test]
+fn generate_allows_pipeline_input() {
+    let actual = nu!(r#"[1 2 3] | generate {|e, x=null| {out: $e, next: null}} | to nuon"#);
+    assert_eq!(actual.out, "[1, 2, 3]");
+}
+
+#[test]
+fn generate_with_input_is_streaming() {
+    let actual = nu!(pipeline(
+        r#"
+        1..10
+        | each {|x| print -en $x; $x}
+        | generate {|e, sum=0| let sum = $e + $sum; {out: $sum, next: $sum}}
+        | first 5
+        | to nuon
+        "#
+    ));
+
+    assert_eq!(actual.out, "[1, 3, 6, 10, 15]");
+    assert_eq!(actual.err, "12345");
+}
diff --git a/crates/nu-std/std/iter/mod.nu b/crates/nu-std/std/iter/mod.nu
index ca0aaafa4d..df5e03bd7b 100644
--- a/crates/nu-std/std/iter/mod.nu
+++ b/crates/nu-std/std/iter/mod.nu
@@ -107,16 +107,12 @@ export def scan [ # -> list<any>
     init: any            # initial value to seed the initial state
     fn: closure          # the closure to perform the scan
     --noinit(-n)         # remove the initial value from the result
-] {                      
-    reduce --fold [$init] {|e, acc|
-        let acc_last = $acc | last
-        $acc ++ [($acc_last | do $fn $e $acc_last)]
-    }
-    | if $noinit {
-        $in | skip
-    } else {
-        $in
-    }
+] {
+    generate {|e, acc|
+        let out = $acc | do $fn $e $acc
+        {next: $out, out: $out}
+    } $init
+    | if not $noinit { prepend $init } else { }
 }
 
 # Returns a list of values for which the supplied closure does not

From 8ce14a7c86266e4408c3b109bbddf480c342eff1 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Tue, 14 Jan 2025 16:51:30 -0600
Subject: [PATCH 0920/1072] replace icons in grid with devicons + color
 (#14827)

# Description

This PR replaces the home-grown icons in the `grid` command with the
`devicons` crate.

### Before

![image](https://github.com/user-attachments/assets/05e8de84-1655-45b9-ab88-40b8faa0d950)

### After

![image](https://github.com/user-attachments/assets/2134e92d-fba8-41f7-a630-fd83c0a9449c)


# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock                               |  10 +
 Cargo.toml                               |   1 +
 crates/nu-command/Cargo.toml             |   1 +
 crates/nu-command/src/viewers/griddle.rs |  18 +-
 crates/nu-command/src/viewers/icons.rs   | 649 -----------------------
 crates/nu-command/src/viewers/mod.rs     |   1 -
 6 files changed, 19 insertions(+), 661 deletions(-)
 delete mode 100644 crates/nu-command/src/viewers/icons.rs

diff --git a/Cargo.lock b/Cargo.lock
index 7247fa23b7..8169e0b30b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1598,6 +1598,15 @@ dependencies = [
  "syn 2.0.90",
 ]
 
+[[package]]
+name = "devicons"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830e47e2f330cf4fdd5a958dcef921b9523ffc21ab6713aa5e77ba2cce03904b"
+dependencies = [
+ "lazy_static",
+]
+
 [[package]]
 name = "dialoguer"
 version = "0.11.0"
@@ -3775,6 +3784,7 @@ dependencies = [
  "crossterm 0.28.1",
  "csv",
  "data-encoding",
+ "devicons",
  "dialoguer",
  "digest",
  "dirs",
diff --git a/Cargo.toml b/Cargo.toml
index db3edcd49d..604d2d2260 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -80,6 +80,7 @@ crossbeam-channel = "0.5.8"
 crossterm = "0.28.1"
 csv = "1.3"
 ctrlc = "3.4"
+devicons = "0.6.12"
 dialoguer = { default-features = false, version = "0.11" }
 digest = { default-features = false, version = "0.10" }
 dirs = "5.0"
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index d00ea542aa..c630e5e5fa 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -45,6 +45,7 @@ chrono-humanize = { workspace = true }
 chrono-tz = { workspace = true }
 crossterm = { workspace = true, optional = true }
 csv = { workspace = true }
+devicons = { workspace = true }
 dialoguer = { workspace = true, default-features = false, features = ["fuzzy-select"] }
 digest = { workspace = true, default-features = false }
 dtparse = { workspace = true }
diff --git a/crates/nu-command/src/viewers/griddle.rs b/crates/nu-command/src/viewers/griddle.rs
index 336026fa38..56c1cb1132 100644
--- a/crates/nu-command/src/viewers/griddle.rs
+++ b/crates/nu-command/src/viewers/griddle.rs
@@ -1,6 +1,6 @@
-// use super::icons::{icon_for_file, iconify_style_ansi_to_nu};
-use super::icons::icon_for_file;
+use devicons::icon_for_file;
 use lscolors::Style;
+use nu_color_config::lookup_ansi_color_style;
 use nu_engine::{command_prelude::*, env_to_string};
 use nu_protocol::Config;
 use nu_term_grid::grid::{Alignment, Cell, Direction, Filling, Grid, GridOptions};
@@ -214,13 +214,9 @@ fn create_grid_output(
                 if icons_param {
                     let no_ansi = nu_utils::strip_ansi_unlikely(&value);
                     let path = cwd.join(no_ansi.as_ref());
-                    let icon = icon_for_file(&path, call.head)?;
+                    let file_icon = icon_for_file(&path, &None);
                     let ls_colors_style = ls_colors.style_for_path(path);
-
-                    let icon_style = match ls_colors_style {
-                        Some(c) => c.to_nu_ansi_term_style(),
-                        None => nu_ansi_term::Style::default(),
-                    };
+                    let icon_style = lookup_ansi_color_style(file_icon.color);
 
                     let ansi_style = ls_colors_style
                         .map(Style::to_nu_ansi_term_style)
@@ -228,7 +224,7 @@ fn create_grid_output(
 
                     let item = format!(
                         "{} {}",
-                        icon_style.paint(String::from(icon)),
+                        icon_style.paint(String::from(file_icon.icon)),
                         ansi_style.paint(value)
                     );
 
@@ -247,8 +243,8 @@ fn create_grid_output(
             } else if icons_param {
                 let no_ansi = nu_utils::strip_ansi_unlikely(&value);
                 let path = cwd.join(no_ansi.as_ref());
-                let icon = icon_for_file(&path, call.head)?;
-                let item = format!("{} {}", String::from(icon), value);
+                let file_icon = icon_for_file(&path, &None);
+                let item = format!("{} {}", String::from(file_icon.icon), value);
                 let mut cell = Cell::from(item);
                 cell.alignment = Alignment::Left;
                 grid.add(cell);
diff --git a/crates/nu-command/src/viewers/icons.rs b/crates/nu-command/src/viewers/icons.rs
deleted file mode 100644
index 5ab11ed213..0000000000
--- a/crates/nu-command/src/viewers/icons.rs
+++ /dev/null
@@ -1,649 +0,0 @@
-use nu_protocol::{ShellError, Span};
-use std::sync::LazyLock;
-use std::{collections::HashMap, path::Path};
-
-// Attribution: Thanks exa. Most of this file is taken from around here
-// https://github.com/ogham/exa/blob/dbd11d38042284cc890fdd91760c2f93b65e8553/src/output/icons.rs
-
-pub trait FileIcon {
-    fn icon_file(&self, file: &Path) -> Option<char>;
-}
-
-#[derive(Copy, Clone)]
-pub enum Icons {
-    Audio,
-    Image,
-    Video,
-}
-
-impl Icons {
-    pub fn value(self) -> char {
-        match self {
-            Self::Audio => '\u{f001}',
-            Self::Image => '\u{f1c5}',
-            Self::Video => '\u{f03d}',
-        }
-    }
-}
-
-// keeping this for now in case we have to revert to ansi style instead of crossterm style
-// Helper function to convert ansi_term style to nu_ansi_term. unfortunately
-// this is necessary because ls_colors has a dependency on ansi_term vs nu_ansi_term
-// double unfortunately, now we have a dependency on both. we may have to bring
-// in ls_colors crate to nushell
-// pub fn iconify_style_ansi_to_nu<'a>(style: ansi_term::Style) -> nu_ansi_term::Style {
-//     let bg = match style.background {
-//         Some(c) => match c {
-//             ansi_term::Color::Black => Some(nu_ansi_term::Color::Black),
-//             ansi_term::Color::Red => Some(nu_ansi_term::Color::Red),
-//             ansi_term::Color::Green => Some(nu_ansi_term::Color::Green),
-//             ansi_term::Color::Yellow => Some(nu_ansi_term::Color::Yellow),
-//             ansi_term::Color::Blue => Some(nu_ansi_term::Color::Blue),
-//             ansi_term::Color::Purple => Some(nu_ansi_term::Color::Purple),
-//             ansi_term::Color::Cyan => Some(nu_ansi_term::Color::Cyan),
-//             ansi_term::Color::White => Some(nu_ansi_term::Color::White),
-//             ansi_term::Color::Fixed(f) => Some(nu_ansi_term::Color::Fixed(f)),
-//             ansi_term::Color::RGB(r, g, b) => Some(nu_ansi_term::Color::Rgb(r, g, b)),
-//         },
-//         None => None,
-//     };
-
-//     let fg = match style.foreground {
-//         Some(c) => match c {
-//             ansi_term::Color::Black => Some(nu_ansi_term::Color::Black),
-//             ansi_term::Color::Red => Some(nu_ansi_term::Color::Red),
-//             ansi_term::Color::Green => Some(nu_ansi_term::Color::Green),
-//             ansi_term::Color::Yellow => Some(nu_ansi_term::Color::Yellow),
-//             ansi_term::Color::Blue => Some(nu_ansi_term::Color::Blue),
-//             ansi_term::Color::Purple => Some(nu_ansi_term::Color::Purple),
-//             ansi_term::Color::Cyan => Some(nu_ansi_term::Color::Cyan),
-//             ansi_term::Color::White => Some(nu_ansi_term::Color::White),
-//             ansi_term::Color::Fixed(f) => Some(nu_ansi_term::Color::Fixed(f)),
-//             ansi_term::Color::RGB(r, g, b) => Some(nu_ansi_term::Color::Rgb(r, g, b)),
-//         },
-//         None => None,
-//     };
-
-//     let nu_style = nu_ansi_term::Style {
-//         foreground: fg,
-//         background: bg,
-//         is_blink: style.is_blink,
-//         is_bold: style.is_bold,
-//         is_dimmed: style.is_dimmed,
-//         is_hidden: style.is_hidden,
-//         is_italic: style.is_italic,
-//         is_underline: style.is_underline,
-//         is_reverse: style.is_reverse,
-//         is_strikethrough: style.is_strikethrough,
-//     };
-
-//     nu_style
-//         .background
-//         .or(nu_style.foreground)
-//         .map(nu_ansi_term::Style::from)
-//         .unwrap_or_default()
-// }
-
-static MAP_BY_NAME: LazyLock<HashMap<&'static str, char>> = LazyLock::new(|| {
-    [
-        (".Trash", '\u{f1f8}'),             // 
-        (".atom", '\u{e764}'),              // 
-        (".bashprofile", '\u{e615}'),       // 
-        (".bashrc", '\u{f489}'),            // 
-        (".git", '\u{f1d3}'),               // 
-        (".gitattributes", '\u{f1d3}'),     // 
-        (".gitconfig", '\u{f1d3}'),         // 
-        (".github", '\u{f408}'),            // 
-        (".gitignore", '\u{f1d3}'),         // 
-        (".gitmodules", '\u{f1d3}'),        // 
-        (".rvm", '\u{e21e}'),               // 
-        (".vimrc", '\u{e62b}'),             // 
-        (".vscode", '\u{e70c}'),            // 
-        (".zshrc", '\u{f489}'),             // 
-        ("Cargo.lock", '\u{e7a8}'),         // 
-        ("bin", '\u{e5fc}'),                // 
-        ("config", '\u{e5fc}'),             // 
-        ("docker-compose.yml", '\u{f308}'), // 
-        ("Dockerfile", '\u{f308}'),         // 
-        ("Earthfile", '\u{f0ac}'),          // 
-        ("ds_store", '\u{f179}'),           // 
-        ("gitignore_global", '\u{f1d3}'),   // 
-        ("gitlab-ci.yml", '\u{f296}'),      // 
-        ("go.mod", '\u{e626}'),             // 
-        ("go.sum", '\u{e626}'),             // 
-        ("gradle", '\u{e256}'),             // 
-        ("gradle", '\u{e70e}'),             // 
-        ("gruntfile.coffee", '\u{e611}'),   // 
-        ("gruntfile.js", '\u{e611}'),       // 
-        ("gruntfile.ls", '\u{e611}'),       // 
-        ("gulpfile.coffee", '\u{e610}'),    // 
-        ("gulpfile.js", '\u{e610}'),        // 
-        ("gulpfile.ls", '\u{e610}'),        // 
-        ("hidden", '\u{f023}'),             // 
-        ("include", '\u{e5fc}'),            // 
-        ("lib", '\u{f121}'),                // 
-        ("localized", '\u{f179}'),          // 
-        ("Makefile", '\u{e779}'),           // 
-        ("node_modules", '\u{e718}'),       // 
-        ("npmignore", '\u{e71e}'),          // 
-        ("rubydoc", '\u{e73b}'),            // 
-        ("yarn.lock", '\u{e718}'),          // 
-    ]
-    .into_iter()
-    .collect()
-});
-
-pub fn icon_for_file(file_path: &Path, span: Span) -> Result<char, ShellError> {
-    let extensions = Box::new(FileExtensions);
-    let fp = format!("{}", file_path.display());
-
-    if let Some(icon) = MAP_BY_NAME.get(&fp[..]) {
-        Ok(*icon)
-    } else if file_path.is_dir() {
-        let str = file_path
-            .file_name()
-            .ok_or_else(|| ShellError::GenericError {
-                error: "File name error".into(),
-                msg: "Unable to get file name".into(),
-                span: Some(span),
-                help: None,
-                inner: vec![],
-            })?
-            .to_str()
-            .ok_or_else(|| ShellError::GenericError {
-                error: "Unable to get str error".into(),
-                msg: "Unable to convert to str file name".into(),
-                span: Some(span),
-                help: None,
-                inner: vec![],
-            })?;
-        Ok(match str {
-            "bin" => '\u{e5fc}',   // 
-            ".git" => '\u{f1d3}',  // 
-            ".idea" => '\u{e7b5}', // 
-            _ => '\u{f115}',       // 
-        })
-    } else if let Some(icon) = extensions.icon_file(file_path) {
-        Ok(icon)
-    } else if let Some(ext) = file_path.extension().as_ref() {
-        let str = ext.to_str().ok_or_else(|| ShellError::GenericError {
-            error: "Unable to get str error".into(),
-            msg: "Unable to convert to str file name".into(),
-            span: Some(span),
-            help: None,
-            inner: vec![],
-        })?;
-        Ok(match str {
-            "a" => '\u{f17c}',              // 
-            "acf" => '\u{f1b6}',            // 
-            "ai" => '\u{e7b4}',             // 
-            "android" => '\u{e70e}',        // 
-            "apk" => '\u{e70e}',            // 
-            "apple" => '\u{f179}',          // 
-            "asm" => '\u{e637}',            // 
-            "avi" => '\u{f03d}',            // 
-            "avro" => '\u{e60b}',           // 
-            "awk" => '\u{f489}',            // 
-            "bash" => '\u{f489}',           // 
-            "bash_history" => '\u{f489}',   // 
-            "bash_profile" => '\u{f489}',   // 
-            "bashrc" => '\u{f489}',         // 
-            "bat" => '\u{ebc4}',            // 
-            "bib" => '\u{e69b}',            // 
-            "bin" => '\u{eae8}',            // 
-            "bmp" => '\u{f1c5}',            // 
-            "bst" => '\u{e69b}',            // 
-            "bz" => '\u{f410}',             // 
-            "bz2" => '\u{f410}',            // 
-            "c" => '\u{e61e}',              // 
-            "c++" => '\u{e61d}',            // 
-            "cab" => '\u{e70f}',            // 
-            "cc" => '\u{e61d}',             // 
-            "cert" => '\u{eafa}',           // 
-            "cfg" => '\u{e615}',            // 
-            "cjs" => '\u{e74e}',            // 
-            "class" => '\u{e256}',          // 
-            "clj" => '\u{e768}',            // 
-            "cljs" => '\u{e76a}',           // 
-            "cls" => '\u{e69b}',            // 
-            "cmd" => '\u{e70f}',            // 
-            "coffee" => '\u{f0f4}',         // 
-            "conf" => '\u{e615}',           // 
-            "config" => '\u{e615}',         // 
-            "cp" => '\u{e61d}',             // 
-            "cpp" => '\u{e61d}',            // 
-            "crt" => '\u{eafa}',            // 
-            "cs" => '\u{f031b}',            // 󰌛
-            "csh" => '\u{f489}',            // 
-            "cshtml" => '\u{f1fa}',         // 
-            "csproj" => '\u{f031b}',        // 󰌛
-            "css" => '\u{e749}',            // 
-            "csv" => '\u{f1c3}',            // 
-            "csx" => '\u{f031b}',           // 󰌛
-            "cu" => '\u{e64b}',             // 
-            "cxx" => '\u{e61d}',            // 
-            "d" => '\u{e7af}',              // 
-            "dart" => '\u{e798}',           // 
-            "db" => '\u{f1c0}',             // 
-            "deb" => '\u{e77d}',            // 
-            "desktop" => '\u{ebd1}',        // 
-            "diff" => '\u{f440}',           // 
-            "djvu" => '\u{f02d}',           // 
-            "dll" => '\u{e70f}',            // 
-            "doc" => '\u{f1c2}',            // 
-            "docx" => '\u{f1c2}',           // 
-            "drawio" => '\u{ebba}',         // 
-            "ds_store" => '\u{f179}',       // 
-            "DS_store" => '\u{f179}',       // 
-            "dump" => '\u{f1c0}',           // 
-            "ebook" => '\u{e28b}',          // 
-            "editorconfig" => '\u{e615}',   // 
-            "ejs" => '\u{e618}',            // 
-            "elm" => '\u{e62c}',            // 
-            "eml" => '\u{f003}',            // 
-            "env" => '\u{f462}',            // 
-            "eot" => '\u{f031}',            // 
-            "epub" => '\u{e28a}',           // 
-            "erb" => '\u{e73b}',            // 
-            "erl" => '\u{e7b1}',            // 
-            "ex" => '\u{e62d}',             // 
-            "exe" => '\u{f17a}',            // 
-            "exs" => '\u{e62d}',            // 
-            "fish" => '\u{f489}',           // 
-            "flac" => '\u{f001}',           // 
-            "flv" => '\u{f03d}',            // 
-            "font" => '\u{f031}',           // 
-            "gdoc" => '\u{f1c2}',           // 
-            "gem" => '\u{e21e}',            // 
-            "gemfile" => '\u{e21e}',        // 
-            "gemspec" => '\u{e21e}',        // 
-            "gform" => '\u{f298}',          // 
-            "gif" => '\u{f1c5}',            // 
-            "git" => '\u{f1d3}',            // 
-            "gitattributes" => '\u{f1d3}',  // 
-            "gitignore" => '\u{f1d3}',      // 
-            "gitmodules" => '\u{f1d3}',     // 
-            "go" => '\u{e626}',             // 
-            "gradle" => '\u{e70e}',         // 
-            "groovy" => '\u{e775}',         // 
-            "gsheet" => '\u{f1c3}',         // 
-            "gslides" => '\u{f1c4}',        // 
-            "guardfile" => '\u{e21e}',      // 
-            "gz" => '\u{f410}',             // 
-            "h" => '\u{f0fd}',              // 
-            "hbs" => '\u{e60f}',            // 
-            "hpp" => '\u{f0fd}',            // 
-            "hs" => '\u{e777}',             // 
-            "htm" => '\u{f13b}',            // 
-            "html" => '\u{f13b}',           // 
-            "hxx" => '\u{f0fd}',            // 
-            "ical" => '\u{eab0}',           // 
-            "icalendar" => '\u{eab0}',      // 
-            "ico" => '\u{f1c5}',            // 
-            "image" => '\u{f1c5}',          // 
-            "iml" => '\u{e7b5}',            // 
-            "ini" => '\u{f17a}',            // 
-            "ipynb" => '\u{e606}',          // 
-            "iso" => '\u{e271}',            // 
-            "jad" => '\u{e256}',            // 
-            "jar" => '\u{e204}',            // 
-            "java" => '\u{e204}',           // 
-            "jpeg" => '\u{f1c5}',           // 
-            "jpg" => '\u{f1c5}',            // 
-            "js" => '\u{e74e}',             // 
-            "json" => '\u{e60b}',           // 
-            "jsx" => '\u{e7ba}',            // 
-            "kdb" => '\u{f23e}',            // 
-            "kdbx" => '\u{f23e}',           // 
-            "key" => '\u{eb11}',            // 
-            "ko" => '\u{f17c}',             // 
-            "ksh" => '\u{f489}',            // 
-            "latex" => '\u{e69b}',          // 
-            "less" => '\u{e758}',           // 
-            "lhs" => '\u{e777}',            // 
-            "license" => '\u{f0fc3}',       // 󰿃
-            "localized" => '\u{f179}',      // 
-            "lock" => '\u{f023}',           // 
-            "log" => '\u{f18d}',            // 
-            "lua" => '\u{e620}',            // 
-            "lz" => '\u{f410}',             // 
-            "lzh" => '\u{f410}',            // 
-            "lzma" => '\u{f410}',           // 
-            "lzo" => '\u{f410}',            // 
-            "m" => '\u{e61e}',              // 
-            "ml" => '\u{e67a}',             // 
-            "mli" => '\u{e67a}',            // 
-            "mll" => '\u{e67a}',            // 
-            "mly" => '\u{e67a}',            // 
-            "mm" => '\u{e61d}',             // 
-            "m4a" => '\u{f001}',            // 
-            "magnet" => '\u{f076}',         // 
-            "markdown" => '\u{f48a}',       // 
-            "md" => '\u{f48a}',             // 
-            "mjs" => '\u{e74e}',            // 
-            "mkd" => '\u{f48a}',            // 
-            "mkv" => '\u{f03d}',            // 
-            "mobi" => '\u{e28b}',           // 
-            "mov" => '\u{f03d}',            // 
-            "mp3" => '\u{f001}',            // 
-            "mp4" => '\u{f03d}',            // 
-            "msi" => '\u{e70f}',            // 
-            "mustache" => '\u{e60f}',       // 
-            "nix" => '\u{f313}',            // 
-            "node" => '\u{f0399}',          // 󰎙
-            "npmignore" => '\u{e71e}',      // 
-            "o" => '\u{eae8}',              // 
-            "odp" => '\u{f1c4}',            // 
-            "ods" => '\u{f1c3}',            // 
-            "odt" => '\u{f1c2}',            // 
-            "ogg" => '\u{f001}',            // 
-            "ogv" => '\u{f03d}',            // 
-            "otf" => '\u{f031}',            // 
-            "out" => '\u{eb2c}',            // 
-            "patch" => '\u{f440}',          // 
-            "pdf" => '\u{f1c1}',            // 
-            "pem" => '\u{eb11}',            // 
-            "php" => '\u{e73d}',            // 
-            "pl" => '\u{e769}',             // 
-            "png" => '\u{f1c5}',            // 
-            "ppt" => '\u{f1c4}',            // 
-            "pptx" => '\u{f1c4}',           // 
-            "procfile" => '\u{e21e}',       // 
-            "properties" => '\u{e60b}',     // 
-            "ps1" => '\u{ebc7}',            // 
-            "psd" => '\u{e7b8}',            // 
-            "psd1" => '\u{ebc7}',           // 
-            "psm1" => '\u{ebc7}',           // 
-            "pxm" => '\u{f1c5}',            // 
-            "py" => '\u{e606}',             // 
-            "pyc" => '\u{e606}',            // 
-            "qcow2" => '\u{e271}',          // 
-            "r" => '\u{f25d}',              // 
-            "rakefile" => '\u{e21e}',       // 
-            "rar" => '\u{f410}',            // 
-            "razor" => '\u{f1fa}',          // 
-            "rb" => '\u{e21e}',             // 
-            "rdata" => '\u{f25d}',          // 
-            "rdb" => '\u{e76d}',            // 
-            "rdoc" => '\u{f48a}',           // 
-            "rds" => '\u{f25d}',            // 
-            "readme" => '\u{f48a}',         // 
-            "rlib" => '\u{e7a8}',           // 
-            "rmd" => '\u{f48a}',            // 
-            "rpm" => '\u{e7bb}',            // 
-            "rs" => '\u{e7a8}',             // 
-            "rspec" => '\u{e21e}',          // 
-            "rspec_parallel" => '\u{e21e}', // 
-            "rspec_status" => '\u{e21e}',   // 
-            "rss" => '\u{f09e}',            // 
-            "rtf" => '\u{f0219}',           // 󰈙
-            "ru" => '\u{e21e}',             // 
-            "rubydoc" => '\u{e73b}',        // 
-            "s" => '\u{e637}',              // 
-            "sass" => '\u{e603}',           // 
-            "scala" => '\u{e737}',          // 
-            "scss" => '\u{e749}',           // 
-            "service" => '\u{eba2}',        // 
-            "sh" => '\u{f489}',             // 
-            "shell" => '\u{f489}',          // 
-            "slim" => '\u{e73b}',           // 
-            "sln" => '\u{e70c}',            // 
-            "so" => '\u{f17c}',             // 
-            "sql" => '\u{f1c0}',            // 
-            "sqlite3" => '\u{e7c4}',        // 
-            "sty" => '\u{e69b}',            // 
-            "styl" => '\u{e600}',           // 
-            "stylus" => '\u{e600}',         // 
-            "svg" => '\u{f1c5}',            // 
-            "swift" => '\u{e755}',          // 
-            "tar" => '\u{f410}',            // 
-            "taz" => '\u{f410}',            // 
-            "tbz" => '\u{f410}',            // 
-            "tbz2" => '\u{f410}',           // 
-            "tex" => '\u{e69b}',            // 
-            "tiff" => '\u{f1c5}',           // 
-            "toml" => '\u{e615}',           // 
-            "ts" => '\u{e628}',             // 
-            "tsv" => '\u{f1c3}',            // 
-            "tsx" => '\u{e7ba}',            // 
-            "ttf" => '\u{f031}',            // 
-            "twig" => '\u{e61c}',           // 
-            "txt" => '\u{f15c}',            // 
-            "tz" => '\u{f410}',             // 
-            "tzo" => '\u{f410}',            // 
-            "unity" => '\u{e721}',          // 
-            "unity3d" => '\u{e721}',        // 
-            "vdi" => '\u{e271}',            // 
-            "vhd" => '\u{e271}',            // 
-            "video" => '\u{f03d}',          // 
-            "vim" => '\u{e62b}',            // 
-            "vmdk" => '\u{e271}',           // 
-            "vue" => '\u{f0844}',           // 󰡄
-            "war" => '\u{e256}',            // 
-            "wav" => '\u{f001}',            // 
-            "webm" => '\u{f03d}',           // 
-            "webp" => '\u{f1c5}',           // 
-            "windows" => '\u{f17a}',        // 
-            "woff" => '\u{f031}',           // 
-            "woff2" => '\u{f031}',          // 
-            "xhtml" => '\u{f13b}',          // 
-            "xls" => '\u{f1c3}',            // 
-            "xlsm" => '\u{f1c3}',           // 
-            "xlsx" => '\u{f1c3}',           // 
-            "xml" => '\u{f05c0}',           // 󰗀
-            "xul" => '\u{f05c0}',           // 󰗀
-            "xz" => '\u{f410}',             // 
-            "yaml" => '\u{f481}',           // 
-            "yml" => '\u{f481}',            // 
-            "zip" => '\u{f410}',            // 
-            "zsh" => '\u{f489}',            // 
-            "zsh-theme" => '\u{f489}',      // 
-            "zshrc" => '\u{f489}',          // 
-            "7z" => '\u{f410}',             // 
-            _ => '\u{f15b}',                // 
-        })
-    } else {
-        Ok('\u{f016}')
-    }
-}
-
-/// Whether this file’s extension is any of the strings that get passed in.
-///
-/// This will always return `false` if the file has no extension.
-pub fn extension_is_one_of(path: &Path, choices: &[&str]) -> bool {
-    match path.extension() {
-        Some(os_ext) => match os_ext.to_str() {
-            Some(ext) => choices.contains(&ext),
-            None => false,
-        },
-        None => false,
-    }
-}
-
-/// Whether this file’s name, including extension, is any of the strings
-/// that get passed in.
-// pub fn name_is_one_of(name: &str, choices: &[&str]) -> bool {
-//     choices.contains(&&name[..])
-// }
-
-#[derive(Debug, Default, PartialEq, Eq)]
-pub struct FileExtensions;
-
-// TODO: We may want to re-add these FileExtensions impl fns back. I have disabled
-// it now because it's hard coding colors which kind of defeats the LS_COLORS
-// functionality. We may want to enable and augment at some point.
-
-impl FileExtensions {
-    //     /// An “immediate” file is something that can be run or activated somehow
-    //     /// in order to kick off the build of a project. It’s usually only present
-    //     /// in directories full of source code.
-    //     #[allow(clippy::case_sensitive_file_extension_comparisons)]
-    //     #[allow(dead_code)]
-    //     fn is_immediate(&self, file_path: &Path) -> bool {
-    //         file_path
-    //             .file_name()
-    //             .unwrap()
-    //             .to_str()
-    //             .unwrap()
-    //             .to_lowercase()
-    //             .starts_with("readme")
-    //             || file_path
-    //                 .file_name()
-    //                 .unwrap()
-    //                 .to_str()
-    //                 .unwrap()
-    //                 .ends_with(".ninja")
-    //             || name_is_one_of(
-    //                 file_path.file_name().unwrap().to_str().unwrap(),
-    //                 &[
-    //                     "Makefile",
-    //                     "Cargo.toml",
-    //                     "SConstruct",
-    //                     "CMakeLists.txt",
-    //                     "build.gradle",
-    //                     "pom.xml",
-    //                     "Rakefile",
-    //                     "package.json",
-    //                     "Gruntfile.js",
-    //                     "Gruntfile.coffee",
-    //                     "BUILD",
-    //                     "BUILD.bazel",
-    //                     "WORKSPACE",
-    //                     "build.xml",
-    //                     "Podfile",
-    //                     "webpack.config.js",
-    //                     "meson.build",
-    //                     "composer.json",
-    //                     "RoboFile.php",
-    //                     "PKGBUILD",
-    //                     "Justfile",
-    //                     "Procfile",
-    //                     "Dockerfile",
-    //                     "Containerfile",
-    //                     "Vagrantfile",
-    //                     "Brewfile",
-    //                     "Gemfile",
-    //                     "Pipfile",
-    //                     "build.sbt",
-    //                     "mix.exs",
-    //                     "bsconfig.json",
-    //                     "tsconfig.json",
-    //                 ],
-    //             )
-    //     }
-
-    fn is_image(&self, file: &Path) -> bool {
-        extension_is_one_of(
-            file,
-            &[
-                "png", "jfi", "jfif", "jif", "jpe", "jpeg", "jpg", "gif", "bmp", "tiff", "tif",
-                "ppm", "pgm", "pbm", "pnm", "webp", "raw", "arw", "svg", "stl", "eps", "dvi", "ps",
-                "cbr", "jpf", "cbz", "xpm", "ico", "cr2", "orf", "nef", "heif", "avif", "jxl",
-            ],
-        )
-    }
-
-    fn is_video(&self, file: &Path) -> bool {
-        extension_is_one_of(
-            file,
-            &[
-                "avi", "flv", "m2v", "m4v", "mkv", "mov", "mp4", "mpeg", "mpg", "ogm", "ogv",
-                "vob", "wmv", "webm", "m2ts", "heic",
-            ],
-        )
-    }
-
-    fn is_music(&self, file: &Path) -> bool {
-        extension_is_one_of(file, &["aac", "m4a", "mp3", "ogg", "wma", "mka", "opus"])
-    }
-
-    // Lossless music, rather than any other kind of data...
-    fn is_lossless(&self, file: &Path) -> bool {
-        extension_is_one_of(file, &["alac", "ape", "flac", "wav"])
-    }
-
-    //     #[allow(dead_code)]
-    //     fn is_crypto(&self, file: &Path) -> bool {
-    //         extension_is_one_of(
-    //             file,
-    //             &["asc", "enc", "gpg", "pgp", "sig", "signature", "pfx", "p12"],
-    //         )
-    //     }
-
-    //     #[allow(dead_code)]
-    //     fn is_document(&self, file: &Path) -> bool {
-    //         extension_is_one_of(
-    //             file,
-    //             &[
-    //                 "djvu", "doc", "docx", "dvi", "eml", "eps", "fotd", "key", "keynote", "numbers",
-    //                 "odp", "odt", "pages", "pdf", "ppt", "pptx", "rtf", "xls", "xlsx",
-    //             ],
-    //         )
-    //     }
-
-    //     #[allow(dead_code)]
-    //     fn is_compressed(&self, file: &Path) -> bool {
-    //         extension_is_one_of(
-    //             file,
-    //             &[
-    //                 "zip", "tar", "Z", "z", "gz", "bz2", "a", "ar", "7z", "iso", "dmg", "tc", "rar",
-    //                 "par", "tgz", "xz", "txz", "lz", "tlz", "lzma", "deb", "rpm", "zst", "lz4",
-    //             ],
-    //         )
-    //     }
-
-    //     #[allow(dead_code)]
-    //     fn is_temp(&self, file: &Path) -> bool {
-    //         file.file_name().unwrap().to_str().unwrap().ends_with('~')
-    //             || (file.file_name().unwrap().to_str().unwrap().starts_with('#')
-    //                 && file.file_name().unwrap().to_str().unwrap().ends_with('#'))
-    //             || extension_is_one_of(file, &["tmp", "swp", "swo", "swn", "bak", "bkp", "bk"])
-    //     }
-
-    //     #[allow(dead_code)]
-    //     fn is_compiled(&self, file: &Path) -> bool {
-    //         if extension_is_one_of(file, &["class", "elc", "hi", "o", "pyc", "zwc", "ko"]) {
-    //             true
-    //         // } else if let Some(dir) = file.parent() {
-    //         //     file.get_source_files()
-    //         //         .iter()
-    //         // .any(|path| dir.contains(path))
-    //         } else {
-    //             false
-    //         }
-    //     }
-    // }
-
-    // impl FileColours for FileExtensions {
-    //     fn colour_file(&self, file: &Path) -> Option<Style> {
-    //         use ansi_term::Colour::*;
-
-    //         Some(match file {
-    //             f if self.is_temp(f)        => Fixed(244).normal(),
-    //             f if self.is_immediate(f)   => Yellow.bold().underline(),
-    //             f if self.is_image(f)       => Fixed(133).normal(),
-    //             f if self.is_video(f)       => Fixed(135).normal(),
-    //             f if self.is_music(f)       => Fixed(92).normal(),
-    //             f if self.is_lossless(f)    => Fixed(93).normal(),
-    //             f if self.is_crypto(f)      => Fixed(109).normal(),
-    //             f if self.is_document(f)    => Fixed(105).normal(),
-    //             f if self.is_compressed(f)  => Red.normal(),
-    //             f if self.is_compiled(f)    => Fixed(137).normal(),
-    //             _                           => return None,
-    //         })
-    //     }
-}
-
-impl FileIcon for FileExtensions {
-    fn icon_file(&self, file: &Path) -> Option<char> {
-        if self.is_music(file) || self.is_lossless(file) {
-            Some(Icons::Audio.value())
-        } else if self.is_image(file) {
-            Some(Icons::Image.value())
-        } else if self.is_video(file) {
-            Some(Icons::Video.value())
-        } else {
-            None
-        }
-    }
-}
diff --git a/crates/nu-command/src/viewers/mod.rs b/crates/nu-command/src/viewers/mod.rs
index 6aa301e190..3ff09eff39 100644
--- a/crates/nu-command/src/viewers/mod.rs
+++ b/crates/nu-command/src/viewers/mod.rs
@@ -1,5 +1,4 @@
 mod griddle;
-mod icons;
 mod table;
 
 pub use griddle::Griddle;

From d9bfcb4c094d9b2791a659695b162651e6bbc039 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Jan 2025 09:29:37 +0800
Subject: [PATCH 0921/1072] Bump uuid from 1.11.0 to 1.12.0 (#14830)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.11.0 to 1.12.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/uuid-rs/uuid/releases">uuid's
releases</a>.</em></p>
<blockquote>
<h2>1.12.0</h2>
<h2>What's Changed</h2>
<ul>
<li>feat: Add <code>NonZeroUuid</code> type for optimized
<code>Option&lt;Uuid&gt;</code> representation by <a
href="https://github.com/ab22593k"><code>@​ab22593k</code></a> in <a
href="https://redirect.github.com/uuid-rs/uuid/pull/779">uuid-rs/uuid#779</a></li>
<li>Finalize <code>NonNilUuid</code> by <a
href="https://github.com/KodrAus"><code>@​KodrAus</code></a> in <a
href="https://redirect.github.com/uuid-rs/uuid/pull/783">uuid-rs/uuid#783</a></li>
<li>Prepare for 1.12.0 release by <a
href="https://github.com/KodrAus"><code>@​KodrAus</code></a> in <a
href="https://redirect.github.com/uuid-rs/uuid/pull/784">uuid-rs/uuid#784</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/ab22593k"><code>@​ab22593k</code></a>
made their first contribution in <a
href="https://redirect.github.com/uuid-rs/uuid/pull/779">uuid-rs/uuid#779</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/uuid-rs/uuid/compare/1.11.1...1.12.0">https://github.com/uuid-rs/uuid/compare/1.11.1...1.12.0</a></p>
<h2>1.11.1</h2>
<h2>What's Changed</h2>
<ul>
<li>Finish cut off docs by <a
href="https://github.com/KodrAus"><code>@​KodrAus</code></a> in <a
href="https://redirect.github.com/uuid-rs/uuid/pull/777">uuid-rs/uuid#777</a></li>
<li>Fix links in CONTRIBUTING.md by <a
href="https://github.com/jacobggman"><code>@​jacobggman</code></a> in <a
href="https://redirect.github.com/uuid-rs/uuid/pull/778">uuid-rs/uuid#778</a></li>
<li>Update rust toolchain before building by <a
href="https://github.com/KodrAus"><code>@​KodrAus</code></a> in <a
href="https://redirect.github.com/uuid-rs/uuid/pull/781">uuid-rs/uuid#781</a></li>
<li>Prepare for 1.11.1 release by <a
href="https://github.com/KodrAus"><code>@​KodrAus</code></a> in <a
href="https://redirect.github.com/uuid-rs/uuid/pull/782">uuid-rs/uuid#782</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a
href="https://github.com/jacobggman"><code>@​jacobggman</code></a> made
their first contribution in <a
href="https://redirect.github.com/uuid-rs/uuid/pull/778">uuid-rs/uuid#778</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/uuid-rs/uuid/compare/1.11.0...1.11.1">https://github.com/uuid-rs/uuid/compare/1.11.0...1.11.1</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/uuid-rs/uuid/commit/c5f1d020f6df252b1e7c8a8f0bd95d57b0765580"><code>c5f1d02</code></a>
Merge pull request <a
href="https://redirect.github.com/uuid-rs/uuid/issues/784">#784</a> from
uuid-rs/cargo/1.12.0</li>
<li><a
href="https://github.com/uuid-rs/uuid/commit/4cfbd83dee030d3bd7ed09b8ae4a582dd441ece3"><code>4cfbd83</code></a>
fix deprecation versions</li>
<li><a
href="https://github.com/uuid-rs/uuid/commit/8f761754c0485b6fd865976892db331940f35309"><code>8f76175</code></a>
prepare for 1.12.0 release</li>
<li><a
href="https://github.com/uuid-rs/uuid/commit/358eb3438435e8277fc428556f67c3ec37acccf5"><code>358eb34</code></a>
Merge pull request <a
href="https://redirect.github.com/uuid-rs/uuid/issues/783">#783</a> from
uuid-rs/feat/non-nil</li>
<li><a
href="https://github.com/uuid-rs/uuid/commit/6c5099e7a59dbb4ae610a124f4165f2d28c9b689"><code>6c5099e</code></a>
also remove borsh from NonNilUuid for now</li>
<li><a
href="https://github.com/uuid-rs/uuid/commit/b12c6909d03d5d375eb917bd9b86899efbbbcea6"><code>b12c690</code></a>
fix up non nil docs</li>
<li><a
href="https://github.com/uuid-rs/uuid/commit/38df005749e00955d15a2aa3051fa1e1a4669e14"><code>38df005</code></a>
remove zerocopy from NonNilUuid for now</li>
<li><a
href="https://github.com/uuid-rs/uuid/commit/4021daa72f8d5986a651e8532bbe1c3120868144"><code>4021daa</code></a>
fix up zerocopy derives</li>
<li><a
href="https://github.com/uuid-rs/uuid/commit/f570b5714c6e25546022e2afe25288492cfecf39"><code>f570b57</code></a>
support equality between NonNilUuid and Uuid</li>
<li><a
href="https://github.com/uuid-rs/uuid/commit/4ffd872792bd343df4be60fb4fc780b8fa470812"><code>4ffd872</code></a>
add a few missing derives</li>
<li>Additional commits viewable in <a
href="https://github.com/uuid-rs/uuid/compare/1.11.0...1.12.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=uuid&package-manager=cargo&previous-version=1.11.0&new-version=1.12.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                         | 4 ++--
 Cargo.toml                         | 2 +-
 crates/nu_plugin_polars/Cargo.toml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8169e0b30b..1fdc6e79b3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7980,9 +7980,9 @@ checksum = "86b4d8c991cc252d4b4ea2958d0d842e36af0d1ca7f1fdc4fdce8fd0a2ff6e9c"
 
 [[package]]
 name = "uuid"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
+checksum = "744018581f9a3454a9e15beb8a33b017183f1e7c0cd170232a2d1453b23a51c4"
 dependencies = [
  "getrandom",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index 604d2d2260..1692c44ed2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -174,7 +174,7 @@ uu_touch = "0.0.28"
 uu_whoami = "0.0.28"
 uu_uname = "0.0.28"
 uucore = "0.0.28"
-uuid = "1.11.0"
+uuid = "1.12.0"
 v_htmlescape = "0.15.0"
 wax = "0.6"
 web-time = "1.1.0"
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 665116f651..cc3e87ed92 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -39,7 +39,7 @@ polars-utils = { version = "0.44"}
 typetag = "0.2"
 env_logger = "0.11.3"
 log.workspace = true
-uuid = { version = "1.11", features = ["v4", "serde"] }
+uuid = { version = "1.12", features = ["v4", "serde"] }
 
 # Do to a compile error with polars, this included to force the raw dependency
 hashbrown = { version = "0.14", features = ["rayon", "ahash", "serde", "raw"] }

From b34547334aeef82b12db77b8ed3be511262e54de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Jan 2025 09:29:52 +0800
Subject: [PATCH 0922/1072] Bump data-encoding from 2.6.0 to 2.7.0 (#14831)

Bumps [data-encoding](https://github.com/ia0/data-encoding) from 2.6.0
to 2.7.0.
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a
href="https://github.com/ia0/data-encoding/commits">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=data-encoding&package-manager=cargo&previous-version=2.6.0&new-version=2.7.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                   | 4 ++--
 crates/nu-command/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1fdc6e79b3..038ddc623f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1552,9 +1552,9 @@ dependencies = [
 
 [[package]]
 name = "data-encoding"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+checksum = "0e60eed09d8c01d3cee5b7d30acb059b76614c918fa0f992e0dd6eeb10daad6f"
 
 [[package]]
 name = "deranged"
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index c630e5e5fa..42ad13c41d 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -105,7 +105,7 @@ v_htmlescape = { workspace = true }
 wax = { workspace = true }
 which = { workspace = true, optional = true }
 unicode-width = { workspace = true }
-data-encoding = { version = "2.6.0", features = ["alloc"] }
+data-encoding = { version = "2.7.0", features = ["alloc"] }
 web-time = { workspace = true }
 
 [target.'cfg(windows)'.dependencies]

From b99a8c9d80360bbca9994dd936b06ec83163f7af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Jan 2025 09:30:09 +0800
Subject: [PATCH 0923/1072] Bump tokio from 1.42.0 to 1.43.0 (#14829)

Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.42.0 to 1.43.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/tokio-rs/tokio/releases">tokio's
releases</a>.</em></p>
<blockquote>
<h2>Tokio v1.43.0</h2>
<h1>1.43.0 (Jan 8th, 2025)</h1>
<h3>Added</h3>
<ul>
<li>net: add <code>UdpSocket::peek</code> methods (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7068">#7068</a>)</li>
<li>net: add support for Haiku OS (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7042">#7042</a>)</li>
<li>process: add <code>Command::into_std()</code> (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7014">#7014</a>)</li>
<li>signal: add <code>SignalKind::info</code> on illumos (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/6995">#6995</a>)</li>
<li>signal: add support for realtime signals on illumos (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7029">#7029</a>)</li>
</ul>
<h3>Fixed</h3>
<ul>
<li>io: don't call <code>set_len</code> before initializing vector in
<code>Blocking</code> (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7054">#7054</a>)</li>
<li>macros: suppress <code>clippy::needless_return</code> in
<code>#[tokio::main]</code> (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/6874">#6874</a>)</li>
<li>runtime: fix thread parking on WebAssembly (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7041">#7041</a>)</li>
</ul>
<h3>Changes</h3>
<ul>
<li>chore: use unsync loads for <code>unsync_load</code> (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7073">#7073</a>)</li>
<li>io: use <code>Buf::put_bytes</code> in <code>Repeat</code> read impl
(<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7055">#7055</a>)</li>
<li>task: drop the join waker of a task eagerly (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/6986">#6986</a>)</li>
</ul>
<h3>Changes to unstable APIs</h3>
<ul>
<li>metrics: improve flexibility of H2Histogram Configuration (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/6963">#6963</a>)</li>
<li>taskdump: add accessor methods for backtrace (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/6975">#6975</a>)</li>
</ul>
<h3>Documented</h3>
<ul>
<li>io: clarify <code>ReadBuf::uninit</code> allows initialized buffers
as well (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7053">#7053</a>)</li>
<li>net: fix ambiguity in <code>TcpStream::try_write_vectored</code>
docs (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7067">#7067</a>)</li>
<li>runtime: fix <code>LocalRuntime</code> doc links (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7074">#7074</a>)</li>
<li>sync: extend documentation for
<code>watch::Receiver::wait_for</code> (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7038">#7038</a>)</li>
<li>sync: fix typos in <code>OnceCell</code> docs (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7047">#7047</a>)</li>
</ul>
<p><a
href="https://redirect.github.com/tokio-rs/tokio/issues/6874">#6874</a>:
<a
href="https://redirect.github.com/tokio-rs/tokio/pull/6874">tokio-rs/tokio#6874</a>
<a
href="https://redirect.github.com/tokio-rs/tokio/issues/6963">#6963</a>:
<a
href="https://redirect.github.com/tokio-rs/tokio/pull/6963">tokio-rs/tokio#6963</a>
<a
href="https://redirect.github.com/tokio-rs/tokio/issues/6975">#6975</a>:
<a
href="https://redirect.github.com/tokio-rs/tokio/pull/6975">tokio-rs/tokio#6975</a>
<a
href="https://redirect.github.com/tokio-rs/tokio/issues/6986">#6986</a>:
<a
href="https://redirect.github.com/tokio-rs/tokio/pull/6986">tokio-rs/tokio#6986</a>
<a
href="https://redirect.github.com/tokio-rs/tokio/issues/6995">#6995</a>:
<a
href="https://redirect.github.com/tokio-rs/tokio/pull/6995">tokio-rs/tokio#6995</a>
<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7014">#7014</a>:
<a
href="https://redirect.github.com/tokio-rs/tokio/pull/7014">tokio-rs/tokio#7014</a>
<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7029">#7029</a>:
<a
href="https://redirect.github.com/tokio-rs/tokio/pull/7029">tokio-rs/tokio#7029</a>
<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7038">#7038</a>:
<a
href="https://redirect.github.com/tokio-rs/tokio/pull/7038">tokio-rs/tokio#7038</a>
<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7041">#7041</a>:
<a
href="https://redirect.github.com/tokio-rs/tokio/pull/7041">tokio-rs/tokio#7041</a>
<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7042">#7042</a>:
<a
href="https://redirect.github.com/tokio-rs/tokio/pull/7042">tokio-rs/tokio#7042</a>
<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7047">#7047</a>:
<a
href="https://redirect.github.com/tokio-rs/tokio/pull/7047">tokio-rs/tokio#7047</a>
<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7053">#7053</a>:
<a
href="https://redirect.github.com/tokio-rs/tokio/pull/7053">tokio-rs/tokio#7053</a>
<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7054">#7054</a>:
<a
href="https://redirect.github.com/tokio-rs/tokio/pull/7054">tokio-rs/tokio#7054</a>
<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7055">#7055</a>:
<a
href="https://redirect.github.com/tokio-rs/tokio/pull/7055">tokio-rs/tokio#7055</a></p>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/tokio-rs/tokio/commit/5f3296df77ad594779d1fe1a1583078ca9832daf"><code>5f3296d</code></a>
chore: prepare Tokio v1.43.0 (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7079">#7079</a>)</li>
<li><a
href="https://github.com/tokio-rs/tokio/commit/cc974a646bd3932c148e300a92fda387c23768dd"><code>cc974a6</code></a>
chore: prepare tokio-macros v2.5.0 (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7078">#7078</a>)</li>
<li><a
href="https://github.com/tokio-rs/tokio/commit/15495fd88305099d4ffa0a5583f6d8856d728ac3"><code>15495fd</code></a>
metrics: improve flexibility of H2Histogram Configuration (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/6963">#6963</a>)</li>
<li><a
href="https://github.com/tokio-rs/tokio/commit/ad4183412a0c01a9a5b92de0c2dddb5471bc2563"><code>ad41834</code></a>
io: don't call <code>set_len</code> before initializing vector in
<code>Blocking</code> (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7054">#7054</a>)</li>
<li><a
href="https://github.com/tokio-rs/tokio/commit/bd3e8577377a2b684b50fc0cb50d98f03ad09703"><code>bd3e857</code></a>
runtime: move <code>is_join_waker_set</code> assertion in
<code>unset_waker</code> (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7072">#7072</a>)</li>
<li><a
href="https://github.com/tokio-rs/tokio/commit/15f73666f18e0853fe1f730bbe8b9b1618fb1016"><code>15f7366</code></a>
runtime: fix <code>LocalRuntime</code> doc links (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7074">#7074</a>)</li>
<li><a
href="https://github.com/tokio-rs/tokio/commit/fd2048dad1ccbb047bef0325d7f38f6e945a58ac"><code>fd2048d</code></a>
ci: split miri jobs into unit and integration tests (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7071">#7071</a>)</li>
<li><a
href="https://github.com/tokio-rs/tokio/commit/e8f39157b6047025c109ab2dbcdc9b579c2fac7b"><code>e8f3915</code></a>
chore: use unsync loads for <code>unsync_load</code> (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7073">#7073</a>)</li>
<li><a
href="https://github.com/tokio-rs/tokio/commit/67f127769b8c17dda6035b9b70bbf7657d74ff09"><code>67f1277</code></a>
net: fix ambiguity in <code>TcpStream::try_write_vectored</code> docs
(<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7067">#7067</a>)</li>
<li><a
href="https://github.com/tokio-rs/tokio/commit/463502cbafdb501c703091442eb658e6241958f1"><code>463502c</code></a>
io: clarify <code>ReadBuf::uninit</code> allows initialized buffers as
well (<a
href="https://redirect.github.com/tokio-rs/tokio/issues/7053">#7053</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/tokio-rs/tokio/compare/tokio-1.42.0...tokio-1.43.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=tokio&package-manager=cargo&previous-version=1.42.0&new-version=1.43.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                         | 8 ++++----
 crates/nu_plugin_polars/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 038ddc623f..dbac886008 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7482,9 +7482,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.42.0"
+version = "1.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
 dependencies = [
  "backtrace",
  "bytes",
@@ -7500,9 +7500,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index cc3e87ed92..187eb3d124 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -47,7 +47,7 @@ hashbrown = { version = "0.14", features = ["rayon", "ahash", "serde", "raw"] }
 # Cloud support
 aws-config = { version = "1.5", features = ["sso"] }
 aws-credential-types = "1.2"
-tokio = { version = "1.41", features = ["full"] }
+tokio = { version = "1.43", features = ["full"] }
 object_store = { version = "0.10", default-features = false }
 url.workspace = true
 

From 4e1b06cb51e8fecf0b0421589c885e3b83f8f59f Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Wed, 15 Jan 2025 20:12:34 +0800
Subject: [PATCH 0924/1072] Update Nu to 0.101.0 for workflow and ping
 ubuntu-latest to 22.04 for riscv64gc build (#14835)

- [x] Update Nu to 0.101.0 for release and nightly-build workflow, test
successfully in the nightly repo for a while, e.g.:
https://github.com/nushell/nightly/actions/runs/12779907140
- [x] Pin `ubuntu-latest` to `ubuntu-22.04` for riscv64gc build due to
[Ubuntu-latest workflows will use Ubuntu-24.04
image](https://github.com/actions/runner-images/issues/10636)
- [x] Stabilize `hustcer/milestone-action@main` to
`hustcer/milestone-action@v2`
---
 .github/workflows/milestone.yml     | 2 +-
 .github/workflows/nightly-build.yml | 8 ++++----
 .github/workflows/release.yml       | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/milestone.yml b/.github/workflows/milestone.yml
index 7a4d483ee1..18eef4213d 100644
--- a/.github/workflows/milestone.yml
+++ b/.github/workflows/milestone.yml
@@ -22,7 +22,7 @@ jobs:
 
       # Bind milestone to closed issue that has a merged PR fix
       - name: Set Milestone for Issue
-        uses: hustcer/milestone-action@main
+        uses: hustcer/milestone-action@v2
         if: github.event.issue.state == 'closed'
         with:
           action: bind-issue
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 25b0caf2b9..11fb713ddb 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -39,7 +39,7 @@ jobs:
         uses: hustcer/setup-nu@v3
         if: github.repository == 'nushell/nightly'
         with:
-          version: 0.98.0
+          version: 0.101.0
 
       # Synchronize the main branch of nightly repo with the main branch of Nushell official repo
       - name: Prepare for Nightly Release
@@ -114,7 +114,7 @@ jobs:
         - target: armv7-unknown-linux-musleabihf
           os: ubuntu-22.04
         - target: riscv64gc-unknown-linux-gnu
-          os: ubuntu-latest
+          os: ubuntu-22.04
         - target: loongarch64-unknown-linux-gnu
           os: ubuntu-22.04
 
@@ -139,7 +139,7 @@ jobs:
     - name: Setup Nushell
       uses: hustcer/setup-nu@v3
       with:
-        version: 0.98.0
+        version: 0.101.0
 
     - name: Release Nu Binary
       id: nu
@@ -197,7 +197,7 @@ jobs:
       - name: Setup Nushell
         uses: hustcer/setup-nu@v3
         with:
-          version: 0.98.0
+          version: 0.101.0
 
       # Keep the last a few releases
       - name: Delete Older Releases
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d11c9ab747..2d80545121 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -66,7 +66,7 @@ jobs:
         - target: armv7-unknown-linux-musleabihf
           os: ubuntu-22.04
         - target: riscv64gc-unknown-linux-gnu
-          os: ubuntu-latest
+          os: ubuntu-22.04
         - target: loongarch64-unknown-linux-gnu
           os: ubuntu-22.04
 
@@ -89,7 +89,7 @@ jobs:
     - name: Setup Nushell
       uses: hustcer/setup-nu@v3
       with:
-        version: 0.98.0
+        version: 0.101.0
 
     - name: Release Nu Binary
       id: nu

From 46566296c02b98370729d4221370e71077f14650 Mon Sep 17 00:00:00 2001
From: Chris Denton <chris@chrisdenton.dev>
Date: Wed, 15 Jan 2025 12:21:58 +0000
Subject: [PATCH 0925/1072] Use non-canonicalized paths in shell integrations
 (#14832)

This simply replaces uses of the deprecated function `current_dir_str`
with `EngineState::cwd_as_string` in `run_shell_integration_*`
functions. The main difference being that the latter does not
canonicalize paths.

Fixes #14619
---
 crates/nu-cli/src/repl.rs | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 5d27dea59f..b8fef7355d 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -19,7 +19,7 @@ use miette::{ErrReport, IntoDiagnostic, Result};
 use nu_cmd_base::util::get_editor;
 use nu_color_config::StyleComputer;
 #[allow(deprecated)]
-use nu_engine::{current_dir_str, env_to_strings};
+use nu_engine::env_to_strings;
 use nu_parser::{lex, parse, trim_quotes_str};
 use nu_protocol::{
     config::NuCursorShape,
@@ -971,8 +971,7 @@ fn run_shell_integration_osc2(
     stack: &mut Stack,
     use_color: bool,
 ) {
-    #[allow(deprecated)]
-    if let Ok(path) = current_dir_str(engine_state, stack) {
+    if let Ok(path) = engine_state.cwd_as_string(Some(stack)) {
         let start_time = Instant::now();
 
         // Try to abbreviate string for windows title
@@ -1016,8 +1015,7 @@ fn run_shell_integration_osc7(
     stack: &mut Stack,
     use_color: bool,
 ) {
-    #[allow(deprecated)]
-    if let Ok(path) = current_dir_str(engine_state, stack) {
+    if let Ok(path) = engine_state.cwd_as_string(Some(stack)) {
         let start_time = Instant::now();
 
         // Otherwise, communicate the path as OSC 7 (often used for spawning new tabs in the same dir)
@@ -1040,8 +1038,7 @@ fn run_shell_integration_osc7(
 }
 
 fn run_shell_integration_osc9_9(engine_state: &EngineState, stack: &mut Stack, use_color: bool) {
-    #[allow(deprecated)]
-    if let Ok(path) = current_dir_str(engine_state, stack) {
+    if let Ok(path) = engine_state.cwd_as_string(Some(stack)) {
         let start_time = Instant::now();
 
         // Otherwise, communicate the path as OSC 9;9 from ConEmu (often used for spawning new tabs in the same dir)
@@ -1065,8 +1062,7 @@ fn run_shell_integration_osc633(
     use_color: bool,
     repl_cmd_line_text: String,
 ) {
-    #[allow(deprecated)]
-    if let Ok(path) = current_dir_str(engine_state, stack) {
+    if let Ok(path) = engine_state.cwd_as_string(Some(stack)) {
         // Supported escape sequences of Microsoft's Visual Studio Code (vscode)
         // https://code.visualstudio.com/docs/terminal/shell-integration#_supported-escape-sequences
         if stack

From 06938659d211ca8055bb056e3c9e055eb09d2156 Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Wed, 15 Jan 2025 17:10:28 -0500
Subject: [PATCH 0926/1072] Remove required positional arguments from
 `run-external` and `exec` (#14765)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
This PR removes the required positional argument from `run-external` and
`exec` in favor of the rest arguments, meaning lists of external
commands can be spread directly into `run-external` and `exec`. This
does have the drawback of making calling `run-external` and `exec` with
no arguments a run-time error rather than a parse error, but I don't
imagine that is an issue.

Before (for both `run-external` and `exec`):
```nushell
run-external
# => Error: nu::parser::missing_positional
# =>
# =>   × Missing required positional argument.
# =>    ╭─[entry #9:1:13]
# =>  1 │ run-external
# =>    ╰────
# =>   help: Usage: run-external <command> ...(args) . Use `--help` for more
# =>         information.

let command = ["cat" "hello.txt"]
run-external ...$command
# => Error: nu::parser::missing_positional
# =>
# =>   × Missing required positional argument.
# =>    ╭─[entry #11:1:14]
# =>  1 │ run-external ...$command
# =>    ·              ▲
# =>    ·              ╰── missing command
# =>    ╰────
# =>   help: Usage: run-external <command> ...(args) . Use `--help` for more
# =>         information.
run-external ($command | first) ...($command | skip 1)
# => hello world!
```

After (for both `run-external` and `exec`):
```nushell
run-external
# => Error: nu::shell::missing_parameter
# =>
# =>   × Missing parameter: no command given.
# =>    ╭─[entry #2:1:1]
# =>  1 │ run-external
# =>    · ──────┬─────
# =>    ·       ╰── missing parameter: no command given
# =>    ╰────
# =>

let command = ["cat" "hello.txt"]
run-external ...$command
# => hello world!
```



# User-Facing Changes
Lists can now be spread directly into `run-external` and `exec`:

```nushell
let command = [cat hello.txt]
run-external ...$command
# => hello world!
```

# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
N/A
---
 Cargo.lock                                    |  12 +
 Cargo.toml                                    |   1 +
 crates/nu-command/Cargo.toml                  |   3 +-
 crates/nu-command/src/system/exec.rs          |  30 +-
 crates/nu-command/src/system/mod.rs           |   2 +-
 crates/nu-command/src/system/run_external.rs  |  28 +-
 .../nu-command/tests/commands/run_external.rs | 330 ++++++++++--------
 7 files changed, 246 insertions(+), 160 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dbac886008..0e77f31646 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3844,6 +3844,7 @@ dependencies = [
  "rmp",
  "roxmltree",
  "rstest",
+ "rstest_reuse",
  "rusqlite",
  "scopeguard",
  "serde",
@@ -6309,6 +6310,17 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "rstest_reuse"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3a8fb4672e840a587a66fc577a5491375df51ddb88f2a2c2a792598c326fe14"
+dependencies = [
+ "quote",
+ "rand",
+ "syn 2.0.90",
+]
+
 [[package]]
 name = "rusqlite"
 version = "0.31.0"
diff --git a/Cargo.toml b/Cargo.toml
index 1692c44ed2..70b3fb369f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -145,6 +145,7 @@ rmp = "0.8"
 rmp-serde = "1.3"
 roxmltree = "0.20"
 rstest = { version = "0.23", default-features = false }
+rstest_reuse = "0.7"
 rusqlite = "0.31"
 rust-embed = "8.5.0"
 scopeguard = { version = "1.2.0" }
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 42ad13c41d..bfbd091847 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -196,6 +196,7 @@ mockito = { workspace = true, default-features = false }
 quickcheck = { workspace = true }
 quickcheck_macros = { workspace = true }
 rstest = { workspace = true, default-features = false }
+rstest_reuse = { workspace = true }
 pretty_assertions = { workspace = true }
 tempfile = { workspace = true }
-rand_chacha = { workspace = true }
\ No newline at end of file
+rand_chacha = { workspace = true }
diff --git a/crates/nu-command/src/system/exec.rs b/crates/nu-command/src/system/exec.rs
index ca0ae4d216..014f83dea8 100644
--- a/crates/nu-command/src/system/exec.rs
+++ b/crates/nu-command/src/system/exec.rs
@@ -1,3 +1,5 @@
+use std::borrow::Cow;
+
 use nu_engine::{command_prelude::*, env_to_strings};
 
 #[derive(Clone)]
@@ -11,7 +13,11 @@ impl Command for Exec {
     fn signature(&self) -> Signature {
         Signature::build("exec")
             .input_output_types(vec![(Type::Nothing, Type::Any)])
-            .required("command", SyntaxShape::String, "The command to execute.")
+            .rest(
+                "command",
+                SyntaxShape::OneOf(vec![SyntaxShape::GlobPattern, SyntaxShape::Any]),
+                "External command to run, with arguments.",
+            )
             .allows_unknown_args()
             .category(Category::System)
     }
@@ -33,15 +39,29 @@ On Windows based systems, Nushell will wait for the command to finish and then e
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let cwd = engine_state.cwd(Some(stack))?;
+        let rest = call.rest::<Value>(engine_state, stack, 0)?;
+        let name_args = rest.split_first();
+
+        let Some((name, call_args)) = name_args else {
+            return Err(ShellError::MissingParameter {
+                param_name: "no command given".into(),
+                span: call.head,
+            });
+        };
+
+        let name_str: Cow<str> = match &name {
+            Value::Glob { val, .. } => Cow::Borrowed(val),
+            Value::String { val, .. } => Cow::Borrowed(val),
+            _ => Cow::Owned(name.clone().coerce_into_string()?),
+        };
 
         // Find the absolute path to the executable. If the command is not
         // found, display a helpful error message.
-        let name: Spanned<String> = call.req(engine_state, stack, 0)?;
         let executable = {
             let paths = nu_engine::env::path_str(engine_state, stack, call.head)?;
-            let Some(executable) = crate::which(&name.item, &paths, cwd.as_ref()) else {
+            let Some(executable) = crate::which(name_str.as_ref(), &paths, cwd.as_ref()) else {
                 return Err(crate::command_not_found(
-                    &name.item,
+                    &name_str,
                     call.head,
                     engine_state,
                     stack,
@@ -73,7 +93,7 @@ On Windows based systems, Nushell will wait for the command to finish and then e
         }
 
         // Configure args.
-        let args = crate::eval_arguments_from_call(engine_state, stack, call)?;
+        let args = crate::eval_external_arguments(engine_state, stack, call_args.to_vec())?;
         command.args(args.into_iter().map(|s| s.item));
 
         // Execute the child process, replacing/terminating the current process
diff --git a/crates/nu-command/src/system/mod.rs b/crates/nu-command/src/system/mod.rs
index a87aac8a07..57a314d383 100644
--- a/crates/nu-command/src/system/mod.rs
+++ b/crates/nu-command/src/system/mod.rs
@@ -33,7 +33,7 @@ pub use nu_check::NuCheck;
 pub use ps::Ps;
 #[cfg(windows)]
 pub use registry_query::RegistryQuery;
-pub use run_external::{command_not_found, eval_arguments_from_call, which, External};
+pub use run_external::{command_not_found, eval_external_arguments, which, External};
 pub use sys::*;
 pub use uname::UName;
 pub use which_::Which;
diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index e4ac0ea88f..b917577ba9 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -34,15 +34,10 @@ impl Command for External {
     fn signature(&self) -> nu_protocol::Signature {
         Signature::build(self.name())
             .input_output_types(vec![(Type::Any, Type::Any)])
-            .required(
-                "command",
-                SyntaxShape::OneOf(vec![SyntaxShape::GlobPattern, SyntaxShape::String]),
-                "External command to run.",
-            )
             .rest(
-                "args",
+                "command",
                 SyntaxShape::OneOf(vec![SyntaxShape::GlobPattern, SyntaxShape::Any]),
-                "Arguments for external command.",
+                "External command to run, with arguments.",
             )
             .category(Category::System)
     }
@@ -55,7 +50,15 @@ impl Command for External {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let cwd = engine_state.cwd(Some(stack))?;
-        let name: Value = call.req(engine_state, stack, 0)?;
+        let rest = call.rest::<Value>(engine_state, stack, 0)?;
+        let name_args = rest.split_first();
+
+        let Some((name, call_args)) = name_args else {
+            return Err(ShellError::MissingParameter {
+                param_name: "no command given".into(),
+                span: call.head,
+            });
+        };
 
         let name_str: Cow<str> = match &name {
             Value::Glob { val, .. } => Cow::Borrowed(val),
@@ -151,7 +154,7 @@ impl Command for External {
         command.envs(envs);
 
         // Configure args.
-        let args = eval_arguments_from_call(engine_state, stack, call)?;
+        let args = eval_external_arguments(engine_state, stack, call_args.to_vec())?;
         #[cfg(windows)]
         if is_cmd_internal_command(&name_str) || potential_nuscript_in_windows {
             // The /D flag disables execution of AutoRun commands from registry.
@@ -290,14 +293,13 @@ impl Command for External {
     }
 }
 
-/// Evaluate all arguments from a call, performing expansions when necessary.
-pub fn eval_arguments_from_call(
+/// Evaluate all arguments, performing expansions when necessary.
+pub fn eval_external_arguments(
     engine_state: &EngineState,
     stack: &mut Stack,
-    call: &Call,
+    call_args: Vec<Value>,
 ) -> Result<Vec<Spanned<OsString>>, ShellError> {
     let cwd = engine_state.cwd(Some(stack))?;
-    let call_args = call.rest::<Value>(engine_state, stack, 1)?;
     let mut args: Vec<Spanned<OsString>> = Vec::with_capacity(call_args.len());
 
     for arg in call_args {
diff --git a/crates/nu-command/tests/commands/run_external.rs b/crates/nu-command/tests/commands/run_external.rs
index 856214456c..5dc68405a9 100644
--- a/crates/nu-command/tests/commands/run_external.rs
+++ b/crates/nu-command/tests/commands/run_external.rs
@@ -1,23 +1,34 @@
 use nu_test_support::fs::Stub::EmptyFile;
+use nu_test_support::nu;
 use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
+use rstest::rstest;
+use rstest_reuse::*;
 
-#[test]
-fn better_empty_redirection() {
+// Template for run-external test to ensure tests work when calling
+// the binary directly, using the caret operator, and when using
+// the run-external command
+#[template]
+#[rstest]
+#[case("")]
+#[case("^")]
+#[case("run-external ")]
+fn run_external_prefixes(#[case] prefix: &str) {}
+
+#[apply(run_external_prefixes)]
+fn better_empty_redirection(prefix: &str) {
     let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        "
-            ls | each { |it| nu --testbin cococo $it.name } | ignore
-        "
-    ));
+        cwd: "tests/fixtures/formats",
+        "ls | each {{ |it| {}nu `--testbin` cococo $it.name }} | ignore",
+        prefix
+    );
 
     eprintln!("out: {}", actual.out);
 
     assert!(!actual.out.contains('2'));
 }
 
-#[test]
-fn explicit_glob() {
+#[apply(run_external_prefixes)]
+fn explicit_glob(prefix: &str) {
     Playground::setup("external with explicit glob", |dirs, sandbox| {
         sandbox.with_files(&[
             EmptyFile("D&D_volume_1.txt"),
@@ -26,19 +37,20 @@ fn explicit_glob() {
         ]);
 
         let actual = nu!(
-            cwd: dirs.test(), pipeline(
+            cwd: dirs.test(),
             r#"
-                ^nu --testbin cococo ('*.txt' | into glob)
-            "#
-        ));
+                {}nu `--testbin` cococo ('*.txt' | into glob)
+            "#,
+            prefix
+        );
 
         assert!(actual.out.contains("D&D_volume_1.txt"));
         assert!(actual.out.contains("D&D_volume_2.txt"));
     })
 }
 
-#[test]
-fn bare_word_expand_path_glob() {
+#[apply(run_external_prefixes)]
+fn bare_word_expand_path_glob(prefix: &str) {
     Playground::setup("bare word should do the expansion", |dirs, sandbox| {
         sandbox.with_files(&[
             EmptyFile("D&D_volume_1.txt"),
@@ -47,19 +59,20 @@ fn bare_word_expand_path_glob() {
         ]);
 
         let actual = nu!(
-            cwd: dirs.test(), pipeline(
+            cwd: dirs.test(),
             "
-                ^nu --testbin cococo *.txt
-            "
-        ));
+                {}nu `--testbin` cococo *.txt
+            ",
+            prefix
+        );
 
         assert!(actual.out.contains("D&D_volume_1.txt"));
         assert!(actual.out.contains("D&D_volume_2.txt"));
     })
 }
 
-#[test]
-fn backtick_expand_path_glob() {
+#[apply(run_external_prefixes)]
+fn backtick_expand_path_glob(prefix: &str) {
     Playground::setup("backtick should do the expansion", |dirs, sandbox| {
         sandbox.with_files(&[
             EmptyFile("D&D_volume_1.txt"),
@@ -68,19 +81,20 @@ fn backtick_expand_path_glob() {
         ]);
 
         let actual = nu!(
-            cwd: dirs.test(), pipeline(
+            cwd: dirs.test(),
             r#"
-                ^nu --testbin cococo `*.txt`
-            "#
-        ));
+                {}nu `--testbin` cococo `*.txt`
+            "#,
+            prefix
+        );
 
         assert!(actual.out.contains("D&D_volume_1.txt"));
         assert!(actual.out.contains("D&D_volume_2.txt"));
     })
 }
 
-#[test]
-fn single_quote_does_not_expand_path_glob() {
+#[apply(run_external_prefixes)]
+fn single_quote_does_not_expand_path_glob(prefix: &str) {
     Playground::setup("single quote do not run the expansion", |dirs, sandbox| {
         sandbox.with_files(&[
             EmptyFile("D&D_volume_1.txt"),
@@ -89,18 +103,19 @@ fn single_quote_does_not_expand_path_glob() {
         ]);
 
         let actual = nu!(
-            cwd: dirs.test(), pipeline(
+            cwd: dirs.test(),
             r#"
-                ^nu --testbin cococo '*.txt'
-            "#
-        ));
+                {}nu `--testbin` cococo '*.txt'
+            "#,
+            prefix
+        );
 
         assert_eq!(actual.out, "*.txt");
     })
 }
 
-#[test]
-fn double_quote_does_not_expand_path_glob() {
+#[apply(run_external_prefixes)]
+fn double_quote_does_not_expand_path_glob(prefix: &str) {
     Playground::setup("double quote do not run the expansion", |dirs, sandbox| {
         sandbox.with_files(&[
             EmptyFile("D&D_volume_1.txt"),
@@ -109,44 +124,50 @@ fn double_quote_does_not_expand_path_glob() {
         ]);
 
         let actual = nu!(
-            cwd: dirs.test(), pipeline(
+            cwd: dirs.test(),
             r#"
-                ^nu --testbin cococo "*.txt"
-            "#
-        ));
+                {}nu `--testbin` cococo "*.txt"
+            "#,
+            prefix
+        );
 
         assert_eq!(actual.out, "*.txt");
     })
 }
 
-#[test]
-fn failed_command_with_semicolon_will_not_execute_following_cmds() {
+#[apply(run_external_prefixes)]
+fn failed_command_with_semicolon_will_not_execute_following_cmds(prefix: &str) {
     Playground::setup("external failed command with semicolon", |dirs, _| {
         let actual = nu!(
-            cwd: dirs.test(), pipeline(
+            cwd: dirs.test(),
             "
-                nu --testbin fail; echo done
-            "
-        ));
+                {}nu `--testbin` fail; echo done
+            ",
+            prefix
+        );
 
         assert!(!actual.out.contains("done"));
     })
 }
 
-#[test]
-fn external_args_with_quoted() {
+#[apply(run_external_prefixes)]
+fn external_args_with_quoted(prefix: &str) {
     Playground::setup("external failed command with semicolon", |dirs, _| {
         let actual = nu!(
-            cwd: dirs.test(), pipeline(
+            cwd: dirs.test(),
             r#"
-                nu --testbin cococo "foo=bar 'hi'"
-            "#
-        ));
+                {}nu `--testbin` cococo "foo=bar 'hi'"
+            "#,
+            prefix
+        );
 
         assert_eq!(actual.out, "foo=bar 'hi'");
     })
 }
 
+// don't use template for this once since echo with no prefix is an internal command
+// and arguments flags are treated as arguments to run-external
+// (but wrapping them in quotes defeats the point of test)
 #[cfg(not(windows))]
 #[test]
 fn external_arg_with_option_like_embedded_quotes() {
@@ -155,58 +176,67 @@ fn external_arg_with_option_like_embedded_quotes() {
         "external arg with option like embedded quotes",
         |dirs, _| {
             let actual = nu!(
-                cwd: dirs.test(), pipeline(
+                cwd: dirs.test(),
                 r#"
-                ^echo --foo='bar' -foo='bar'
-            "#
-            ));
+                    ^echo --foo='bar' -foo='bar'
+                "#,
+            );
 
             assert_eq!(actual.out, "--foo=bar -foo=bar");
         },
     )
 }
 
-#[test]
-fn external_arg_with_non_option_like_embedded_quotes() {
+// FIXME: parser complains about invalid characters after single quote
+#[rstest]
+#[case("")]
+#[case("^")]
+fn external_arg_with_non_option_like_embedded_quotes(#[case] prefix: &str) {
     Playground::setup(
         "external arg with non option like embedded quotes",
         |dirs, _| {
             let actual = nu!(
-                cwd: dirs.test(), pipeline(
+                cwd: dirs.test(),
                 r#"
-                ^nu --testbin cococo foo='bar' 'foo'=bar
-            "#
-            ));
+                    {}nu `--testbin` cococo foo='bar' 'foo'=bar
+                "#,
+                prefix
+            );
 
             assert_eq!(actual.out, "foo=bar foo=bar");
         },
     )
 }
 
-#[test]
-fn external_arg_with_string_interpolation() {
+// FIXME: parser bug prevents expressions from appearing within GlobPattern substrings
+#[rstest]
+#[case("")]
+#[case("^")]
+fn external_arg_with_string_interpolation(#[case] prefix: &str) {
     Playground::setup("external arg with string interpolation", |dirs, _| {
         let actual = nu!(
-            cwd: dirs.test(), pipeline(
+            cwd: dirs.test(),
             r#"
-                ^nu --testbin cococo foo=(2 + 2) $"foo=(2 + 2)" foo=$"(2 + 2)"
-            "#
-        ));
+                {}nu `--testbin` cococo foo=(2 + 2) $"foo=(2 + 2)" foo=$"(2 + 2)"
+            "#,
+            prefix
+        );
 
         assert_eq!(actual.out, "foo=4 foo=4 foo=4");
     })
 }
 
-#[test]
-fn external_arg_with_variable_name() {
+#[apply(run_external_prefixes)]
+fn external_arg_with_variable_name(prefix: &str) {
     Playground::setup("external failed command with semicolon", |dirs, _| {
         let actual = nu!(
-            cwd: dirs.test(), pipeline(
+            cwd: dirs.test(),
             r#"
                 let dump_command = "PGPASSWORD='db_secret' pg_dump -Fc -h 'db.host' -p '$db.port' -U postgres -d 'db_name' > '/tmp/dump_name'";
-                nu --testbin nonu $dump_command
-            "#
-        ));
+                {}nu `--testbin` nonu $dump_command
+            "#,
+            prefix
+        );
 
         assert_eq!(
             actual.out,
@@ -215,25 +245,29 @@ fn external_arg_with_variable_name() {
     })
 }
 
-#[test]
-fn external_command_escape_args() {
+#[apply(run_external_prefixes)]
+fn external_command_escape_args(prefix: &str) {
     Playground::setup("external failed command with semicolon", |dirs, _| {
         let actual = nu!(
-            cwd: dirs.test(), pipeline(
+            cwd: dirs.test(),
             r#"
-                nu --testbin cococo "\"abcd"
-            "#
-        ));
+                {}nu `--testbin` cococo "\"abcd"
+            "#,
+            prefix
+        );
 
         assert_eq!(actual.out, r#""abcd"#);
     })
 }
 
-#[test]
-fn external_command_ndots_args() {
-    let actual = nu!(r#"
-        nu --testbin cococo foo/. foo/.. foo/... foo/./bar foo/../bar foo/.../bar ./bar ../bar .../bar
-    "#);
+#[apply(run_external_prefixes)]
+fn external_command_ndots_args(prefix: &str) {
+    let actual = nu!(
+        r#"
+            {}nu `--testbin` cococo foo/. foo/.. foo/... foo/./bar foo/../bar foo/.../bar ./bar ../bar .../bar
+        "#,
+        prefix
+    );
 
     assert_eq!(
         actual.out,
@@ -247,23 +281,29 @@ fn external_command_ndots_args() {
     );
 }
 
-#[test]
-fn external_command_ndots_leading_dot_slash() {
+#[apply(run_external_prefixes)]
+fn external_command_ndots_leading_dot_slash(prefix: &str) {
     // Don't expand ndots with a leading `./`
-    let actual = nu!(r#"
-        nu --testbin cococo ./... ./....
-    "#);
+    let actual = nu!(
+        r#"
+            {}nu `--testbin` cococo ./... ./....
+        "#,
+        prefix
+    );
 
     assert_eq!(actual.out, "./... ./....");
 }
 
-#[test]
-fn external_command_url_args() {
+#[apply(run_external_prefixes)]
+fn external_command_url_args(prefix: &str) {
     // If ndots is not handled correctly, we can lose the double forward slashes that are needed
     // here
-    let actual = nu!(r#"
-        nu --testbin cococo http://example.com http://example.com/.../foo //foo
-    "#);
+    let actual = nu!(
+        r#"
+            {}nu `--testbin` cococo http://example.com http://example.com/.../foo //foo
+        "#,
+        prefix
+    );
 
     assert_eq!(
         actual.out,
@@ -271,12 +311,12 @@ fn external_command_url_args() {
     );
 }
 
-#[test]
+#[apply(run_external_prefixes)]
 #[cfg_attr(
     not(target_os = "linux"),
     ignore = "only runs on Linux, where controlling the HOME var is reliable"
 )]
-fn external_command_expand_tilde() {
+fn external_command_expand_tilde(prefix: &str) {
     Playground::setup("external command expand tilde", |dirs, _| {
         // Make a copy of the nu executable that we can use
         let mut src = std::fs::File::open(nu_test_support::fs::binaries().join("nu"))
@@ -302,22 +342,27 @@ fn external_command_expand_tilde() {
                 ("HOME".to_string(), dirs.test().to_string_lossy().into_owned()),
             ],
             r#"
-                ^~/test_nu --testbin cococo hello
-            "#
+                {}~/test_nu `--testbin` cococo hello
+            "#,
+            prefix
         );
         assert_eq!(actual.out, "hello");
     })
 }
 
-#[test]
-fn external_arg_expand_tilde() {
+// FIXME: parser bug prevents expressions from appearing within GlobPattern substrings
+#[rstest]
+#[case("")]
+#[case("^")]
+fn external_arg_expand_tilde(#[case] prefix: &str) {
     Playground::setup("external arg expand tilde", |dirs, _| {
         let actual = nu!(
-            cwd: dirs.test(), pipeline(
+            cwd: dirs.test(),
             r#"
-                ^nu --testbin cococo ~/foo ~/(2 + 2)
-            "#
-        ));
+                {}nu `--testbin` cococo ~/foo ~/(2 + 2)
+            "#,
+            prefix
+        );
 
         let home = dirs::home_dir().expect("failed to find home dir");
 
@@ -332,40 +377,43 @@ fn external_arg_expand_tilde() {
     })
 }
 
-#[test]
-fn external_command_not_expand_tilde_with_quotes() {
+#[apply(run_external_prefixes)]
+fn external_command_not_expand_tilde_with_quotes(prefix: &str) {
     Playground::setup(
         "external command not expand tilde with quotes",
         |dirs, _| {
-            let actual = nu!(cwd: dirs.test(), pipeline(r#"nu --testbin nonu "~""#));
+            let actual = nu!(cwd: dirs.test(), r#"{}nu `--testbin` nonu "~""#, prefix);
             assert_eq!(actual.out, r#"~"#);
         },
     )
 }
 
-#[test]
-fn external_command_expand_tilde_with_back_quotes() {
+#[apply(run_external_prefixes)]
+fn external_command_expand_tilde_with_back_quotes(prefix: &str) {
     Playground::setup(
         "external command not expand tilde with quotes",
         |dirs, _| {
-            let actual = nu!(cwd: dirs.test(), pipeline(r#"nu --testbin nonu `~`"#));
+            let actual = nu!(cwd: dirs.test(), r#"{}nu `--testbin` nonu `~`"#, prefix);
             assert!(!actual.out.contains('~'));
         },
     )
 }
 
-#[test]
-fn external_command_receives_raw_binary_data() {
+#[apply(run_external_prefixes)]
+fn external_command_receives_raw_binary_data(prefix: &str) {
     Playground::setup("external command receives raw binary data", |dirs, _| {
-        let actual =
-            nu!(cwd: dirs.test(), pipeline("0x[deadbeef] | nu --testbin input_bytes_length"));
+        let actual = nu!(
+            cwd: dirs.test(),
+            "0x[deadbeef] | {}nu `--testbin` input_bytes_length",
+            prefix
+        );
         assert_eq!(actual.out, r#"4"#);
     })
 }
 
 #[cfg(windows)]
-#[test]
-fn can_run_cmd_files() {
+#[apply(run_external_prefixes)]
+fn can_run_cmd_files(prefix: &str) {
     use nu_test_support::fs::Stub::FileWithContent;
     Playground::setup("run a Windows cmd file", |dirs, sandbox| {
         sandbox.with_files(&[FileWithContent(
@@ -376,14 +424,14 @@ fn can_run_cmd_files() {
             "#,
         )]);
 
-        let actual = nu!(cwd: dirs.test(), pipeline("foo.cmd"));
+        let actual = nu!(cwd: dirs.test(), "{}foo.cmd", prefix);
         assert!(actual.out.contains("Hello World"));
     });
 }
 
 #[cfg(windows)]
-#[test]
-fn can_run_batch_files() {
+#[apply(run_external_prefixes)]
+fn can_run_batch_files(prefix: &str) {
     use nu_test_support::fs::Stub::FileWithContent;
     Playground::setup("run a Windows batch file", |dirs, sandbox| {
         sandbox.with_files(&[FileWithContent(
@@ -394,14 +442,14 @@ fn can_run_batch_files() {
             "#,
         )]);
 
-        let actual = nu!(cwd: dirs.test(), pipeline("foo.bat"));
+        let actual = nu!(cwd: dirs.test(), "{}foo.bat", prefix);
         assert!(actual.out.contains("Hello World"));
     });
 }
 
 #[cfg(windows)]
-#[test]
-fn can_run_batch_files_without_cmd_extension() {
+#[apply(run_external_prefixes)]
+fn can_run_batch_files_without_cmd_extension(prefix: &str) {
     use nu_test_support::fs::Stub::FileWithContent;
     Playground::setup(
         "run a Windows cmd file without specifying the extension",
@@ -414,15 +462,15 @@ fn can_run_batch_files_without_cmd_extension() {
             "#,
             )]);
 
-            let actual = nu!(cwd: dirs.test(), pipeline("foo"));
+            let actual = nu!(cwd: dirs.test(), "{}foo", prefix);
             assert!(actual.out.contains("Hello World"));
         },
     );
 }
 
 #[cfg(windows)]
-#[test]
-fn can_run_batch_files_without_bat_extension() {
+#[apply(run_external_prefixes)]
+fn can_run_batch_files_without_bat_extension(prefix: &str) {
     use nu_test_support::fs::Stub::FileWithContent;
     Playground::setup(
         "run a Windows batch file without specifying the extension",
@@ -435,34 +483,36 @@ fn can_run_batch_files_without_bat_extension() {
             "#,
             )]);
 
-            let actual = nu!(cwd: dirs.test(), pipeline("foo"));
+            let actual = nu!(cwd: dirs.test(), "{}foo", prefix);
             assert!(actual.out.contains("Hello World"));
         },
     );
 }
 
-#[test]
-fn quotes_trimmed_when_shelling_out() {
+#[apply(run_external_prefixes)]
+fn quotes_trimmed_when_shelling_out(prefix: &str) {
     // regression test for a bug where we weren't trimming quotes around string args before shelling out to cmd.exe
-    let actual = nu!(pipeline(
+    let actual = nu!(
         r#"
-            nu --testbin cococo "foo"
-        "#
-    ));
+            {}nu `--testbin` cococo "foo"
+        "#,
+        prefix
+    );
 
     assert_eq!(actual.out, "foo");
 }
 
 #[cfg(not(windows))]
-#[test]
-fn redirect_combine() {
+#[apply(run_external_prefixes)]
+fn redirect_combine(prefix: &str) {
     Playground::setup("redirect_combine", |dirs, _| {
         let actual = nu!(
-            cwd: dirs.test(), pipeline(
+            cwd: dirs.test(),
             r#"
-                run-external sh ...[-c 'echo Foo; echo >&2 Bar'] o+e>| print
-            "#
-        ));
+                {}sh ...[-c 'echo Foo; echo >&2 Bar'] o+e>| print
+            "#,
+            prefix
+        );
 
         // Lines are collapsed in the nu! macro
         assert_eq!(actual.out, "FooBar");
@@ -470,8 +520,8 @@ fn redirect_combine() {
 }
 
 #[cfg(windows)]
-#[test]
-fn can_run_ps1_files() {
+#[apply(run_external_prefixes)]
+fn can_run_ps1_files(prefix: &str) {
     use nu_test_support::fs::Stub::FileWithContent;
     Playground::setup("run_a_windows_ps_file", |dirs, sandbox| {
         sandbox.with_files(&[FileWithContent(
@@ -481,7 +531,7 @@ fn can_run_ps1_files() {
             "#,
         )]);
 
-        let actual = nu!(cwd: dirs.test(), pipeline("foo.ps1"));
+        let actual = nu!(cwd: dirs.test(), "{}foo.ps1", prefix);
         assert!(actual.out.contains("Hello World"));
     });
 }

From d66f8cca4093384310e49c0edc168961646a5969 Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Thu, 16 Jan 2025 06:29:34 +0800
Subject: [PATCH 0927/1072] feat(lsp): workspace wide operations: `rename/goto
 references` (#14837)

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

goto reference:

<img width="885" alt="image"
src="https://github.com/user-attachments/assets/6f85cd10-0c2d-46b2-b99e-47a9bbf90822"
/>

rename:

<img width="483" alt="image"
src="https://github.com/user-attachments/assets/828e7586-c2b7-414d-9085-5188b10f5f5f"
/>

Caveats:
1. Module reference/rename is not supported yet
2. names in `use` command should also be renamed, which is not handled
now
3. workspace wide actions can be time-consuming, as it requires parsing
of all `**/*.nu` files in the workspace (if its text contains the name).
Added a progress bar for such requests.
4. In case these requests are triggered accidentally in a root folder
with a large depth, I hard-coded the max depth to search to 5 right now.



# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

Limited test cases

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock                          |   2 +-
 crates/nu-lsp/Cargo.toml            |   7 +-
 crates/nu-lsp/src/ast.rs            | 135 ++++++-
 crates/nu-lsp/src/diagnostics.rs    |   6 +-
 crates/nu-lsp/src/goto.rs           |  71 ++--
 crates/nu-lsp/src/hints.rs          |   6 +-
 crates/nu-lsp/src/lib.rs            | 116 ++++--
 crates/nu-lsp/src/notification.rs   |  96 ++++-
 crates/nu-lsp/src/symbols.rs        |  12 +-
 crates/nu-lsp/src/workspace.rs      | 569 ++++++++++++++++++++++++++++
 tests/fixtures/lsp/workspace/bar.nu |   7 +
 tests/fixtures/lsp/workspace/foo.nu |   7 +
 12 files changed, 937 insertions(+), 97 deletions(-)
 create mode 100644 crates/nu-lsp/src/workspace.rs
 create mode 100644 tests/fixtures/lsp/workspace/bar.nu
 create mode 100644 tests/fixtures/lsp/workspace/foo.nu

diff --git a/Cargo.lock b/Cargo.lock
index 0e77f31646..b598c5dfe5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3960,10 +3960,10 @@ dependencies = [
  "nu-cli",
  "nu-cmd-lang",
  "nu-command",
+ "nu-glob",
  "nu-parser",
  "nu-protocol",
  "nu-test-support",
- "reedline",
  "serde",
  "serde_json",
  "url",
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index 91bdebc831..5775fd8049 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -9,20 +9,19 @@ license = "MIT"
 
 [dependencies]
 nu-cli = { path = "../nu-cli", version = "0.101.1" }
+nu-glob = { path = "../nu-glob", version = "0.101.1" }
 nu-parser = { path = "../nu-parser", version = "0.101.1" }
 nu-protocol = { path = "../nu-protocol", version = "0.101.1" }
 
-reedline = { workspace = true }
-
 crossbeam-channel = { workspace = true }
+fuzzy-matcher = { workspace = true }
 lsp-server = { workspace = true }
-lsp-types = { workspace = true }
 lsp-textdocument = { workspace = true }
+lsp-types = { workspace = true }
 miette = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 url = { workspace = true }
-fuzzy-matcher = { workspace = true }
 
 [dev-dependencies]
 nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.1" }
diff --git a/crates/nu-lsp/src/ast.rs b/crates/nu-lsp/src/ast.rs
index 44ea202e8a..ad53f57f9d 100644
--- a/crates/nu-lsp/src/ast.rs
+++ b/crates/nu-lsp/src/ast.rs
@@ -2,10 +2,11 @@ use std::sync::Arc;
 
 use nu_protocol::{
     ast::{
-        Block, Expr, Expression, ExternalArgument, ListItem, MatchPattern, Pattern,
+        Argument, Block, Call, Expr, Expression, ExternalArgument, ListItem, MatchPattern, Pattern,
         PipelineRedirection, RecordItem,
     },
     engine::StateWorkingSet,
+    DeclId, Span,
 };
 
 use crate::Id;
@@ -162,7 +163,75 @@ fn redirect_flat_map<T, E>(
     }
 }
 
-fn find_id_in_expr(expr: &Expression, _: &StateWorkingSet, location: &usize) -> Option<Vec<Id>> {
+/// For situations like
+/// ```nushell
+/// def foo [] {}
+///    # |__________ location
+/// ```
+/// `def` is an internal call with name/signature/closure as its arguments
+///
+/// # Arguments
+/// - `location`: None if no `contains` check required, typically when we want to compare the `decl_id` directly
+fn try_find_id_in_def(
+    call: &Call,
+    working_set: &StateWorkingSet,
+    location: Option<&usize>,
+) -> Option<(Id, Span)> {
+    let call_name = String::from_utf8(working_set.get_span_contents(call.head).to_vec()).ok()?;
+    if !(call_name == "def" || call_name == "export def") {
+        return None;
+    };
+    let mut span = None;
+    for arg in call.arguments.iter() {
+        if location
+            .map(|pos| arg.span().contains(*pos))
+            .unwrap_or(true)
+        {
+            // String means this argument is the name
+            if let Argument::Positional(expr) = arg {
+                if let Expr::String(_) = &expr.expr {
+                    span = Some(expr.span);
+                    break;
+                }
+            }
+            // if we do care the location,
+            // reaching here means this argument is not the name
+            if location.is_some() {
+                return None;
+            }
+        }
+    }
+    let mut span = span?;
+    // adjust span if quoted
+    let text = String::from_utf8(working_set.get_span_contents(span).to_vec()).ok()?;
+    if text.len() > 1
+        && ((text.starts_with('"') && text.ends_with('"'))
+            || (text.starts_with('\'') && text.ends_with('\'')))
+    {
+        span = Span::new(span.start.saturating_add(1), span.end.saturating_sub(1));
+    }
+    let call_span = call.span();
+    // find decl_ids whose span is covered by the `def` call
+    let mut matched_ids: Vec<(Id, Span)> = (0..working_set.num_decls())
+        .filter_map(|id| {
+            let decl_id = DeclId::new(id);
+            let block_id = working_set.get_decl(decl_id).block_id()?;
+            let decl_span = working_set.get_block(block_id).span?;
+            // find those within the `def` call
+            call_span
+                .contains_span(decl_span)
+                .then_some((Id::Declaration(decl_id), decl_span))
+        })
+        .collect();
+    matched_ids.sort_by_key(|(_, s)| s.start);
+    matched_ids.first().cloned().map(|(id, _)| (id, span))
+}
+
+fn find_id_in_expr(
+    expr: &Expression,
+    working_set: &StateWorkingSet,
+    location: &usize,
+) -> Option<Vec<(Id, Span)>> {
     // skip the entire expression if the location is not in it
     if !expr.span.contains(*location) {
         // TODO: the span of Keyword does not include its subsidiary expression
@@ -174,16 +243,23 @@ fn find_id_in_expr(expr: &Expression, _: &StateWorkingSet, location: &usize) ->
         }
         return Some(Vec::new());
     }
+    let span = expr.span;
     match &expr.expr {
-        Expr::Var(var_id) | Expr::VarDecl(var_id) => Some(vec![Id::Variable(*var_id)]),
+        Expr::VarDecl(var_id) => Some(vec![(Id::Variable(*var_id), span)]),
+        // trim leading `$` sign
+        Expr::Var(var_id) => Some(vec![(
+            Id::Variable(*var_id),
+            Span::new(span.start.saturating_add(1), span.end),
+        )]),
         Expr::Call(call) => {
             if call.head.contains(*location) {
-                Some(vec![Id::Declaration(call.decl_id)])
+                Some(vec![(Id::Declaration(call.decl_id), call.head)])
             } else {
-                None
+                try_find_id_in_def(call, working_set, Some(location)).map(|p| vec![p])
             }
         }
-        Expr::Overlay(Some(module_id)) => Some(vec![Id::Module(*module_id)]),
+        // TODO: module id of `use`
+        Expr::Overlay(Some(module_id)) => Some(vec![(Id::Module(*module_id), span)]),
         // terminal value expressions
         Expr::Bool(_)
         | Expr::Binary(_)
@@ -197,14 +273,57 @@ fn find_id_in_expr(expr: &Expression, _: &StateWorkingSet, location: &usize) ->
         | Expr::Nothing
         | Expr::RawString(_)
         | Expr::Signature(_)
-        | Expr::String(_) => Some(vec![Id::Value(expr.ty.clone())]),
+        | Expr::String(_) => Some(vec![(Id::Value(expr.ty.clone()), span)]),
         _ => None,
     }
 }
 
 /// find the leaf node at the given location from ast
-pub fn find_id(ast: &Arc<Block>, working_set: &StateWorkingSet, location: &usize) -> Option<Id> {
+pub fn find_id(
+    ast: &Arc<Block>,
+    working_set: &StateWorkingSet,
+    location: &usize,
+) -> Option<(Id, Span)> {
     ast_flat_map(ast, working_set, location, find_id_in_expr)
         .first()
         .cloned()
 }
+
+// TODO: module id support
+fn find_reference_by_id_in_expr(
+    expr: &Expression,
+    working_set: &StateWorkingSet,
+    id: &Id,
+) -> Option<Vec<Span>> {
+    let recur = |expr| expr_flat_map(expr, working_set, id, find_reference_by_id_in_expr);
+    match (&expr.expr, id) {
+        (Expr::Var(vid1), Id::Variable(vid2)) if *vid1 == *vid2 => Some(vec![Span::new(
+            // we want to exclude the `$` sign for renaming
+            expr.span.start.saturating_add(1),
+            expr.span.end,
+        )]),
+        (Expr::VarDecl(vid1), Id::Variable(vid2)) if *vid1 == *vid2 => Some(vec![expr.span]),
+        (Expr::Call(call), Id::Declaration(decl_id)) => {
+            let mut occurs: Vec<Span> = call
+                .arguments
+                .iter()
+                .filter_map(|arg| arg.expr())
+                .flat_map(recur)
+                .collect();
+            if *decl_id == call.decl_id {
+                occurs.push(call.head);
+            }
+            if let Some((id_found, span_found)) = try_find_id_in_def(call, working_set, None) {
+                if id_found == *id {
+                    occurs.push(span_found);
+                }
+            }
+            Some(occurs)
+        }
+        _ => None,
+    }
+}
+
+pub fn find_reference_by_id(ast: &Arc<Block>, working_set: &StateWorkingSet, id: &Id) -> Vec<Span> {
+    ast_flat_map(ast, working_set, id, find_reference_by_id_in_expr)
+}
diff --git a/crates/nu-lsp/src/diagnostics.rs b/crates/nu-lsp/src/diagnostics.rs
index cdb6a35962..faa0e6dd33 100644
--- a/crates/nu-lsp/src/diagnostics.rs
+++ b/crates/nu-lsp/src/diagnostics.rs
@@ -51,7 +51,7 @@ mod tests {
 
     #[test]
     fn publish_diagnostics_variable_does_not_exists() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -82,7 +82,7 @@ mod tests {
 
     #[test]
     fn publish_diagnostics_fixed_unknown_variable() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -121,7 +121,7 @@ mod tests {
 
     #[test]
     fn publish_diagnostics_none() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
diff --git a/crates/nu-lsp/src/goto.rs b/crates/nu-lsp/src/goto.rs
index 7589323cab..78fb4c9067 100644
--- a/crates/nu-lsp/src/goto.rs
+++ b/crates/nu-lsp/src/goto.rs
@@ -1,8 +1,27 @@
-use crate::ast::find_id;
 use crate::{Id, LanguageServer};
 use lsp_types::{GotoDefinitionParams, GotoDefinitionResponse};
+use nu_protocol::engine::StateWorkingSet;
+use nu_protocol::Span;
 
 impl LanguageServer {
+    pub fn find_definition_span_by_id(working_set: &StateWorkingSet, id: &Id) -> Option<Span> {
+        match id {
+            Id::Declaration(decl_id) => {
+                let block_id = working_set.get_decl(*decl_id).block_id()?;
+                working_set.get_block(block_id).span
+            }
+            Id::Variable(var_id) => {
+                let var = working_set.get_variable(*var_id);
+                Some(var.declaration_span)
+            }
+            Id::Module(module_id) => {
+                let module = working_set.get_module(*module_id);
+                module.span
+            }
+            _ => None,
+        }
+    }
+
     pub fn goto_definition(
         &mut self,
         params: &GotoDefinitionParams,
@@ -14,30 +33,18 @@ impl LanguageServer {
             .text_document
             .uri
             .to_owned();
-        let (block, file_offset, working_set, file) =
-            self.parse_file(&mut engine_state, &path_uri, false)?;
-        let location =
-            file.offset_at(params.text_document_position_params.position) as usize + file_offset;
-        let id = find_id(&block, &working_set, &location)?;
+        let (working_set, id, _, _, _) = self
+            .parse_and_find(
+                &mut engine_state,
+                &path_uri,
+                params.text_document_position_params.position,
+            )
+            .ok()?;
 
-        let span = match id {
-            Id::Declaration(decl_id) => {
-                let block_id = working_set.get_decl(decl_id).block_id()?;
-                working_set.get_block(block_id).span
-            }
-            Id::Variable(var_id) => {
-                let var = working_set.get_variable(var_id);
-                Some(var.declaration_span)
-            }
-            Id::Module(module_id) => {
-                let module = working_set.get_module(module_id);
-                module.span
-            }
-            _ => None,
-        }?;
-        Some(GotoDefinitionResponse::Scalar(
-            self.get_location_by_span(working_set.files(), &span)?,
-        ))
+        Some(GotoDefinitionResponse::Scalar(self.get_location_by_span(
+            working_set.files(),
+            &Self::find_definition_span_by_id(&working_set, &id)?,
+        )?))
     }
 }
 
@@ -85,7 +92,7 @@ mod tests {
 
     #[test]
     fn goto_definition_for_none_existing_file() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut none_existent_path = root();
         none_existent_path.push("none-existent.nu");
@@ -127,7 +134,7 @@ mod tests {
 
     #[test]
     fn goto_definition_of_variable() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -158,7 +165,7 @@ mod tests {
 
     #[test]
     fn goto_definition_of_command() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -189,7 +196,7 @@ mod tests {
 
     #[test]
     fn goto_definition_of_command_unicode() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -220,7 +227,7 @@ mod tests {
 
     #[test]
     fn goto_definition_of_command_parameter() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -251,7 +258,7 @@ mod tests {
 
     #[test]
     fn goto_definition_of_variable_in_else_block() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -282,7 +289,7 @@ mod tests {
 
     #[test]
     fn goto_definition_of_variable_in_match_guard() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -313,7 +320,7 @@ mod tests {
 
     #[test]
     fn goto_definition_of_variable_in_each() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
diff --git a/crates/nu-lsp/src/hints.rs b/crates/nu-lsp/src/hints.rs
index 136fca0371..39719ad0b3 100644
--- a/crates/nu-lsp/src/hints.rs
+++ b/crates/nu-lsp/src/hints.rs
@@ -217,7 +217,7 @@ mod tests {
 
     #[test]
     fn inlay_hint_variable_type() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -250,7 +250,7 @@ mod tests {
 
     #[test]
     fn inlay_hint_assignment_type() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -284,7 +284,7 @@ mod tests {
 
     #[test]
     fn inlay_hint_parameter_names() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
diff --git a/crates/nu-lsp/src/lib.rs b/crates/nu-lsp/src/lib.rs
index 4013e3a19a..3e85723bee 100644
--- a/crates/nu-lsp/src/lib.rs
+++ b/crates/nu-lsp/src/lib.rs
@@ -3,12 +3,14 @@ use ast::find_id;
 use lsp_server::{Connection, IoThreads, Message, Response, ResponseError};
 use lsp_textdocument::{FullTextDocument, TextDocuments};
 use lsp_types::{
-    request, request::Request, CompletionItem, CompletionItemKind, CompletionParams,
-    CompletionResponse, CompletionTextEdit, Hover, HoverContents, HoverParams, InlayHint, Location,
-    MarkupContent, MarkupKind, OneOf, Range, RenameOptions, ServerCapabilities,
-    TextDocumentSyncKind, TextEdit, Uri, WorkDoneProgressOptions,
+    request::{self, Request},
+    CompletionItem, CompletionItemKind, CompletionParams, CompletionResponse, CompletionTextEdit,
+    Hover, HoverContents, HoverParams, InlayHint, Location, MarkupContent, MarkupKind, OneOf,
+    Position, Range, ReferencesOptions, RenameOptions, ServerCapabilities, TextDocumentSyncKind,
+    TextEdit, Uri, WorkDoneProgressOptions, WorkspaceFolder, WorkspaceFoldersServerCapabilities,
+    WorkspaceServerCapabilities,
 };
-use miette::{IntoDiagnostic, Result};
+use miette::{miette, IntoDiagnostic, Result};
 use nu_cli::{NuCompleter, SuggestionKind};
 use nu_parser::parse;
 use nu_protocol::{
@@ -32,9 +34,10 @@ mod goto;
 mod hints;
 mod notification;
 mod symbols;
+mod workspace;
 
-#[derive(Debug, Clone)]
-enum Id {
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub enum Id {
     Variable(VarId),
     Declaration(DeclId),
     Value(Type),
@@ -48,6 +51,9 @@ pub struct LanguageServer {
     engine_state: EngineState,
     symbol_cache: SymbolCache,
     inlay_hints: BTreeMap<Uri, Vec<InlayHint>>,
+    workspace_folders: BTreeMap<String, WorkspaceFolder>,
+    // for workspace wide requests
+    occurrences: BTreeMap<Uri, Vec<Range>>,
 }
 
 pub fn path_to_uri(path: impl AsRef<Path>) -> Uri {
@@ -90,10 +96,15 @@ impl LanguageServer {
             engine_state,
             symbol_cache: SymbolCache::new(),
             inlay_hints: BTreeMap::new(),
+            workspace_folders: BTreeMap::new(),
+            occurrences: BTreeMap::new(),
         })
     }
 
     pub fn serve_requests(mut self) -> Result<()> {
+        let work_done_progress_options = WorkDoneProgressOptions {
+            work_done_progress: Some(true),
+        };
         let server_capabilities = serde_json::to_value(ServerCapabilities {
             text_document_sync: Some(lsp_types::TextDocumentSyncCapability::Kind(
                 TextDocumentSyncKind::INCREMENTAL,
@@ -106,20 +117,28 @@ impl LanguageServer {
             inlay_hint_provider: Some(OneOf::Left(true)),
             rename_provider: Some(OneOf::Right(RenameOptions {
                 prepare_provider: Some(true),
-                work_done_progress_options: WorkDoneProgressOptions {
-                    work_done_progress: Some(true),
-                },
+                work_done_progress_options,
             })),
-            references_provider: Some(OneOf::Left(true)),
+            references_provider: Some(OneOf::Right(ReferencesOptions {
+                work_done_progress_options,
+            })),
+            workspace: Some(WorkspaceServerCapabilities {
+                workspace_folders: Some(WorkspaceFoldersServerCapabilities {
+                    supported: Some(true),
+                    change_notifications: Some(OneOf::Left(true)),
+                }),
+                ..Default::default()
+            }),
             ..Default::default()
         })
         .expect("Must be serializable");
-        let _ = self
+        let init_params = self
             .connection
             .initialize_while(server_capabilities, || {
                 !self.engine_state.signals().interrupted()
             })
             .into_diagnostic()?;
+        self.initialize_workspace_folders(init_params)?;
 
         while !self.engine_state.signals().interrupted() {
             let msg = match self
@@ -157,11 +176,24 @@ impl LanguageServer {
                         request::DocumentSymbolRequest::METHOD => {
                             Self::handle_lsp_request(request, |params| self.document_symbol(params))
                         }
+                        request::References::METHOD => {
+                            Self::handle_lsp_request(request, |params| self.references(params))
+                        }
                         request::WorkspaceSymbolRequest::METHOD => {
                             Self::handle_lsp_request(request, |params| {
                                 self.workspace_symbol(params)
                             })
                         }
+                        request::Rename::METHOD => {
+                            Self::handle_lsp_request(request, |params| self.rename(params))
+                        }
+                        request::PrepareRenameRequest::METHOD => {
+                            let id = request.id.clone();
+                            if let Err(e) = self.prepare_rename(request) {
+                                self.send_error_message(id, 2, e.to_string())?
+                            }
+                            continue;
+                        }
                         request::InlayHintRequest::METHOD => {
                             Self::handle_lsp_request(request, |params| self.get_inlay_hints(params))
                         }
@@ -199,6 +231,24 @@ impl LanguageServer {
         engine_state
     }
 
+    pub fn parse_and_find<'a>(
+        &mut self,
+        engine_state: &'a mut EngineState,
+        uri: &Uri,
+        pos: Position,
+    ) -> Result<(StateWorkingSet<'a>, Id, Span, usize, &FullTextDocument)> {
+        let (block, file_offset, mut working_set, file) = self
+            .parse_file(engine_state, uri, false)
+            .ok_or_else(|| miette!("\nFailed to parse current file"))?;
+
+        let location = file.offset_at(pos) as usize + file_offset;
+        let (id, span) = find_id(&block, &working_set, &location)
+            .ok_or_else(|| miette!("\nFailed to find current name"))?;
+        // add block to working_set for later references
+        working_set.add_block(block);
+        Ok((working_set, id, span, file_offset, file))
+    }
+
     pub fn parse_file<'a>(
         &mut self,
         engine_state: &'a mut EngineState,
@@ -231,7 +281,7 @@ impl LanguageServer {
         for cached_file in files.into_iter() {
             if cached_file.covered_span.contains(span.start) {
                 let path = Path::new(&*cached_file.name);
-                if !(path.exists() && path.is_file()) {
+                if !path.is_file() {
                     return None;
                 }
                 let target_uri = path_to_uri(path);
@@ -294,11 +344,13 @@ impl LanguageServer {
             .text_document
             .uri
             .to_owned();
-        let (block, file_offset, working_set, file) =
-            self.parse_file(&mut engine_state, &path_uri, false)?;
-        let location =
-            file.offset_at(params.text_document_position_params.position) as usize + file_offset;
-        let id = find_id(&block, &working_set, &location)?;
+        let (working_set, id, _, _, _) = self
+            .parse_and_find(
+                &mut engine_state,
+                &path_uri,
+                params.text_document_position_params.position,
+            )
+            .ok()?;
 
         match id {
             Id::Variable(var_id) => {
@@ -543,7 +595,9 @@ mod tests {
     use nu_test_support::fs::fixtures;
     use std::sync::mpsc::Receiver;
 
-    pub fn initialize_language_server() -> (Connection, Receiver<Result<()>>) {
+    pub fn initialize_language_server(
+        params: Option<InitializeParams>,
+    ) -> (Connection, Receiver<Result<()>>) {
         use std::sync::mpsc;
         let (client_connection, server_connection) = Connection::memory();
         let engine_state = nu_cmd_lang::create_default_context();
@@ -559,13 +613,7 @@ mod tests {
             .send(Message::Request(lsp_server::Request {
                 id: 1.into(),
                 method: Initialize::METHOD.to_string(),
-                params: serde_json::to_value(InitializeParams {
-                    capabilities: lsp_types::ClientCapabilities {
-                        ..Default::default()
-                    },
-                    ..Default::default()
-                })
-                .unwrap(),
+                params: serde_json::to_value(params.unwrap_or_default()).unwrap(),
             }))
             .unwrap();
         client_connection
@@ -586,7 +634,7 @@ mod tests {
 
     #[test]
     fn shutdown_on_request() {
-        let (client_connection, recv) = initialize_language_server();
+        let (client_connection, recv) = initialize_language_server(None);
 
         client_connection
             .sender
@@ -717,7 +765,7 @@ mod tests {
 
     #[test]
     fn hover_on_variable() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -744,7 +792,7 @@ mod tests {
 
     #[test]
     fn hover_on_custom_command() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -774,7 +822,7 @@ mod tests {
 
     #[test]
     fn hover_on_str_join() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -834,7 +882,7 @@ mod tests {
 
     #[test]
     fn complete_on_variable() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -871,7 +919,7 @@ mod tests {
 
     #[test]
     fn complete_command_with_space() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -909,7 +957,7 @@ mod tests {
 
     #[test]
     fn complete_command_with_line() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -947,7 +995,7 @@ mod tests {
 
     #[test]
     fn complete_keyword() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
diff --git a/crates/nu-lsp/src/notification.rs b/crates/nu-lsp/src/notification.rs
index 281e40d72f..83925230be 100644
--- a/crates/nu-lsp/src/notification.rs
+++ b/crates/nu-lsp/src/notification.rs
@@ -1,11 +1,16 @@
+use lsp_server::{Message, RequestId, Response, ResponseError};
 use lsp_types::{
     notification::{
-        DidChangeTextDocument, DidCloseTextDocument, DidOpenTextDocument, Notification,
+        DidChangeTextDocument, DidChangeWorkspaceFolders, DidCloseTextDocument,
+        DidOpenTextDocument, Notification, Progress,
     },
-    DidChangeTextDocumentParams, DidCloseTextDocumentParams, DidOpenTextDocumentParams, Uri,
+    DidChangeTextDocumentParams, DidChangeWorkspaceFoldersParams, DidCloseTextDocumentParams,
+    DidOpenTextDocumentParams, ProgressParams, ProgressParamsValue, ProgressToken, Uri,
+    WorkDoneProgress, WorkDoneProgressBegin, WorkDoneProgressEnd, WorkDoneProgressReport,
 };
 
 use crate::LanguageServer;
+use miette::{IntoDiagnostic, Result};
 
 impl LanguageServer {
     pub(crate) fn handle_lsp_notification(
@@ -36,9 +41,88 @@ impl LanguageServer {
                 self.inlay_hints.remove(&uri);
                 None
             }
+            DidChangeWorkspaceFolders::METHOD => {
+                let params: DidChangeWorkspaceFoldersParams =
+                    serde_json::from_value(notification.params.clone())
+                        .expect("Expect receive DidChangeWorkspaceFoldersParams");
+                for added in params.event.added {
+                    self.workspace_folders.insert(added.name.clone(), added);
+                }
+                for removed in params.event.removed {
+                    self.workspace_folders.remove(&removed.name);
+                }
+                None
+            }
             _ => None,
         }
     }
+
+    fn send_progress_notification(
+        &self,
+        token: ProgressToken,
+        value: WorkDoneProgress,
+    ) -> Result<()> {
+        let progress_params = ProgressParams {
+            token,
+            value: ProgressParamsValue::WorkDone(value),
+        };
+        let notification =
+            lsp_server::Notification::new(Progress::METHOD.to_string(), progress_params);
+        self.connection
+            .sender
+            .send(lsp_server::Message::Notification(notification))
+            .into_diagnostic()
+    }
+
+    pub fn send_progress_begin(&self, token: ProgressToken, title: &str) -> Result<()> {
+        self.send_progress_notification(
+            token,
+            WorkDoneProgress::Begin(WorkDoneProgressBegin {
+                title: title.to_string(),
+                percentage: Some(0),
+                ..Default::default()
+            }),
+        )
+    }
+
+    pub fn send_progress_report(
+        &self,
+        token: ProgressToken,
+        percentage: u32,
+        message: Option<String>,
+    ) -> Result<()> {
+        self.send_progress_notification(
+            token,
+            WorkDoneProgress::Report(WorkDoneProgressReport {
+                message,
+                percentage: Some(percentage),
+                ..Default::default()
+            }),
+        )
+    }
+
+    pub fn send_progress_end(&self, token: ProgressToken, message: Option<String>) -> Result<()> {
+        self.send_progress_notification(
+            token,
+            WorkDoneProgress::End(WorkDoneProgressEnd { message }),
+        )
+    }
+
+    pub fn send_error_message(&self, id: RequestId, code: i32, message: String) -> Result<()> {
+        self.connection
+            .sender
+            .send(Message::Response(Response {
+                id,
+                result: None,
+                error: Some(ResponseError {
+                    code,
+                    message,
+                    data: None,
+                }),
+            }))
+            .into_diagnostic()?;
+        Ok(())
+    }
 }
 
 #[cfg(test)]
@@ -55,7 +139,7 @@ mod tests {
 
     #[test]
     fn hover_correct_documentation_on_let() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -85,7 +169,7 @@ mod tests {
 
     #[test]
     fn hover_on_command_after_full_content_change() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -126,7 +210,7 @@ hello"#,
 
     #[test]
     fn hover_on_command_after_partial_content_change() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -171,7 +255,7 @@ hello"#,
 
     #[test]
     fn open_document_with_utf_char() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
diff --git a/crates/nu-lsp/src/symbols.rs b/crates/nu-lsp/src/symbols.rs
index 253dcb1c5f..301def0a5c 100644
--- a/crates/nu-lsp/src/symbols.rs
+++ b/crates/nu-lsp/src/symbols.rs
@@ -198,7 +198,7 @@ impl SymbolCache {
             );
             for cached_file in working_set.files() {
                 let path = Path::new(&*cached_file.name);
-                if !(path.exists() && path.is_file()) {
+                if !path.is_file() {
                     continue;
                 }
                 let target_uri = path_to_uri(path);
@@ -342,7 +342,7 @@ mod tests {
     #[test]
     // for variable `$in/$it`, should not appear in symbols
     fn document_symbol_special_variables() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -364,7 +364,7 @@ mod tests {
 
     #[test]
     fn document_symbol_basic() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -412,7 +412,7 @@ mod tests {
 
     #[test]
     fn document_symbol_update() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -464,7 +464,7 @@ mod tests {
 
     #[test]
     fn workspace_symbol_current() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
@@ -530,7 +530,7 @@ mod tests {
 
     #[test]
     fn workspace_symbol_other() {
-        let (client_connection, _recv) = initialize_language_server();
+        let (client_connection, _recv) = initialize_language_server(None);
 
         let mut script = fixtures();
         script.push("lsp");
diff --git a/crates/nu-lsp/src/workspace.rs b/crates/nu-lsp/src/workspace.rs
new file mode 100644
index 0000000000..f3ac318a2d
--- /dev/null
+++ b/crates/nu-lsp/src/workspace.rs
@@ -0,0 +1,569 @@
+use lsp_textdocument::FullTextDocument;
+use nu_parser::parse;
+use std::{
+    collections::{BTreeMap, HashMap},
+    fs,
+    path::{Path, PathBuf},
+};
+
+use crate::{
+    ast::find_reference_by_id, path_to_uri, span_to_range, uri_to_path, Id, LanguageServer,
+};
+use lsp_server::{Message, Request, Response};
+use lsp_types::{
+    Location, PrepareRenameResponse, ProgressToken, Range, ReferenceParams, RenameParams,
+    TextDocumentPositionParams, TextEdit, Uri, WorkspaceEdit, WorkspaceFolder,
+};
+use miette::{miette, IntoDiagnostic, Result};
+use nu_glob::{glob, Paths};
+use nu_protocol::{engine::StateWorkingSet, Span};
+use serde_json::Value;
+
+impl LanguageServer {
+    /// get initial workspace folders from initialization response
+    pub fn initialize_workspace_folders(&mut self, init_params: Value) -> Result<()> {
+        if let Some(array) = init_params.get("workspaceFolders") {
+            let folders: Vec<WorkspaceFolder> =
+                serde_json::from_value(array.clone()).into_diagnostic()?;
+            for folder in folders {
+                self.workspace_folders.insert(folder.name.clone(), folder);
+            }
+        }
+        Ok(())
+    }
+
+    pub fn rename(&mut self, params: &RenameParams) -> Option<WorkspaceEdit> {
+        let new_name = params.new_name.to_owned();
+        // changes in WorkspaceEdit have mutable key
+        #[allow(clippy::mutable_key_type)]
+        let changes: HashMap<Uri, Vec<TextEdit>> = self
+            .occurrences
+            .iter()
+            .map(|(uri, ranges)| {
+                (
+                    uri.clone(),
+                    ranges
+                        .iter()
+                        .map(|range| TextEdit {
+                            range: *range,
+                            new_text: new_name.clone(),
+                        })
+                        .collect(),
+                )
+            })
+            .collect();
+        Some(WorkspaceEdit {
+            changes: Some(changes),
+            ..Default::default()
+        })
+    }
+
+    /// Goto references response
+    /// TODO: WorkDoneProgress -> PartialResults
+    pub fn references(&mut self, params: &ReferenceParams) -> Option<Vec<Location>> {
+        self.occurrences = BTreeMap::new();
+        let mut engine_state = self.new_engine_state();
+        let path_uri = params.text_document_position.text_document.uri.to_owned();
+        let (mut working_set, id, span, _, _) = self
+            .parse_and_find(
+                &mut engine_state,
+                &path_uri,
+                params.text_document_position.position,
+            )
+            .ok()?;
+        self.find_reference_in_workspace(
+            &mut working_set,
+            &path_uri,
+            id,
+            span,
+            params
+                .work_done_progress_params
+                .work_done_token
+                .to_owned()
+                .unwrap_or(ProgressToken::Number(1)),
+            "Finding references ...",
+        )
+        .ok()?;
+        Some(
+            self.occurrences
+                .iter()
+                .flat_map(|(uri, ranges)| {
+                    ranges.iter().map(|range| Location {
+                        uri: uri.clone(),
+                        range: *range,
+                    })
+                })
+                .collect(),
+        )
+    }
+
+    /// 1. Parse current file to find the content at the cursor that is suitable for a workspace wide renaming
+    /// 2. Parse all nu scripts in the same workspace folder, with the variable/command name in it.
+    /// 3. Store the results in `self.occurrences` for later rename quest
+    pub fn prepare_rename(&mut self, request: Request) -> Result<()> {
+        let params: TextDocumentPositionParams =
+            serde_json::from_value(request.params).into_diagnostic()?;
+        self.occurrences = BTreeMap::new();
+
+        let mut engine_state = self.new_engine_state();
+        let path_uri = params.text_document.uri.to_owned();
+
+        let (mut working_set, id, span, file_offset, file) =
+            self.parse_and_find(&mut engine_state, &path_uri, params.position)?;
+
+        if let Id::Value(_) = id {
+            return Err(miette!("\nRename only works for variable/command."));
+        }
+        if Self::find_definition_span_by_id(&working_set, &id).is_none() {
+            return Err(miette!(
+                "\nDefinition not found.\nNot allowed to rename built-ins."
+            ));
+        }
+        let range = span_to_range(&span, file, file_offset);
+        let response = PrepareRenameResponse::Range(range);
+        self.connection
+            .sender
+            .send(Message::Response(Response {
+                id: request.id,
+                result: serde_json::to_value(response).ok(),
+                error: None,
+            }))
+            .into_diagnostic()?;
+
+        // now continue parsing on other files in the workspace
+        self.find_reference_in_workspace(
+            &mut working_set,
+            &path_uri,
+            id,
+            span,
+            ProgressToken::Number(0),
+            "Preparing rename ...",
+        )
+    }
+
+    fn find_reference_in_workspace(
+        &mut self,
+        working_set: &mut StateWorkingSet,
+        current_uri: &Uri,
+        id: Id,
+        span: Span,
+        token: ProgressToken,
+        message: &str,
+    ) -> Result<()> {
+        let current_workspace_folder = self
+            .get_workspace_folder_by_uri(current_uri)
+            .ok_or_else(|| miette!("\nCurrent file is not in any workspace"))?;
+        let scripts: Vec<PathBuf> = Self::find_nu_scripts_in_folder(&current_workspace_folder.uri)?
+            .filter_map(|p| p.ok())
+            .collect();
+        let len = scripts.len();
+
+        self.send_progress_begin(token.clone(), message)?;
+        for (i, fp) in scripts.iter().enumerate() {
+            let uri = path_to_uri(fp);
+            if let Some(file) = self.docs.get_document(&uri) {
+                Self::find_reference_in_file(working_set, file, fp, &id)
+            } else {
+                let bytes = fs::read(fp).into_diagnostic()?;
+                // skip if the file does not contain what we're looking for
+                let content_string = String::from_utf8(bytes).into_diagnostic()?;
+                let text_to_search =
+                    String::from_utf8(working_set.get_span_contents(span).to_vec())
+                        .into_diagnostic()?;
+                if !content_string.contains(&text_to_search) {
+                    continue;
+                }
+                let temp_file = FullTextDocument::new("nu".to_string(), 0, content_string);
+                Self::find_reference_in_file(working_set, &temp_file, fp, &id)
+            }
+            .and_then(|range| self.occurrences.insert(uri, range));
+            self.send_progress_report(token.clone(), (i * 100 / len) as u32, None)?
+        }
+        self.send_progress_end(token.clone(), Some("Done".to_string()))
+    }
+
+    fn find_reference_in_file(
+        working_set: &mut StateWorkingSet,
+        file: &FullTextDocument,
+        fp: &Path,
+        id: &Id,
+    ) -> Option<Vec<Range>> {
+        let fp_str = fp.to_str()?;
+        let block = parse(
+            working_set,
+            Some(fp_str),
+            file.get_content(None).as_bytes(),
+            false,
+        );
+        let file_span = working_set.get_span_for_filename(fp_str)?;
+        let offset = file_span.start;
+        let mut references: Vec<Span> = find_reference_by_id(&block, working_set, id);
+
+        // NOTE: for arguments whose declaration is in a signature
+        // which is not covered in the AST
+        if let Id::Variable(vid) = id {
+            let decl_span = working_set.get_variable(*vid).declaration_span;
+            if file_span.contains_span(decl_span)
+                && decl_span.end > decl_span.start
+                && !references.contains(&decl_span)
+            {
+                references.push(decl_span);
+            }
+        }
+        let occurs: Vec<Range> = references
+            .iter()
+            .map(|span| span_to_range(span, file, offset))
+            .collect();
+
+        // add_block to avoid repeated parsing
+        working_set.add_block(block);
+        (!occurs.is_empty()).then_some(occurs)
+    }
+
+    fn get_workspace_folder_by_uri(&self, uri: &Uri) -> Option<WorkspaceFolder> {
+        let uri_string = uri.to_string();
+        self.workspace_folders
+            .iter()
+            .find_map(|(_, folder)| {
+                uri_string
+                    .starts_with(&folder.uri.to_string())
+                    .then_some(folder)
+            })
+            .cloned()
+    }
+
+    fn find_nu_scripts_in_folder(folder_uri: &Uri) -> Result<Paths> {
+        let path = uri_to_path(folder_uri);
+        if !path.is_dir() {
+            return Err(miette!("\nworkspace folder does not exist."));
+        }
+        let pattern = format!("{}/**/*.nu", path.to_string_lossy());
+        glob(&pattern).into_diagnostic()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use assert_json_diff::assert_json_eq;
+    use lsp_server::{Connection, Message};
+    use lsp_types::RenameParams;
+    use lsp_types::{
+        request, request::Request, InitializeParams, PartialResultParams, Position,
+        ReferenceContext, ReferenceParams, TextDocumentIdentifier, TextDocumentPositionParams, Uri,
+        WorkDoneProgressParams, WorkspaceFolder,
+    };
+    use nu_test_support::fs::fixtures;
+
+    use crate::path_to_uri;
+    use crate::tests::{initialize_language_server, open_unchecked};
+
+    fn send_reference_request(
+        client_connection: &Connection,
+        uri: Uri,
+        line: u32,
+        character: u32,
+        num: usize,
+    ) -> Vec<Message> {
+        client_connection
+            .sender
+            .send(Message::Request(lsp_server::Request {
+                id: 1.into(),
+                method: request::References::METHOD.to_string(),
+                params: serde_json::to_value(ReferenceParams {
+                    text_document_position: TextDocumentPositionParams {
+                        text_document: TextDocumentIdentifier { uri },
+                        position: Position { line, character },
+                    },
+                    context: ReferenceContext {
+                        include_declaration: true,
+                    },
+                    partial_result_params: PartialResultParams::default(),
+                    work_done_progress_params: WorkDoneProgressParams::default(),
+                })
+                .unwrap(),
+            }))
+            .unwrap();
+
+        (0..num)
+            .map(|_| {
+                client_connection
+                    .receiver
+                    .recv_timeout(std::time::Duration::from_secs(2))
+                    .unwrap()
+            })
+            .collect()
+    }
+
+    fn send_rename_prepare_request(
+        client_connection: &Connection,
+        uri: Uri,
+        line: u32,
+        character: u32,
+        num: usize,
+    ) -> Vec<Message> {
+        client_connection
+            .sender
+            .send(Message::Request(lsp_server::Request {
+                id: 1.into(),
+                method: request::PrepareRenameRequest::METHOD.to_string(),
+                params: serde_json::to_value(TextDocumentPositionParams {
+                    text_document: TextDocumentIdentifier { uri: uri.clone() },
+                    position: Position { line, character },
+                })
+                .unwrap(),
+            }))
+            .unwrap();
+
+        (0..num)
+            .map(|_| {
+                client_connection
+                    .receiver
+                    .recv_timeout(std::time::Duration::from_secs(2))
+                    .unwrap()
+            })
+            .collect()
+    }
+
+    fn send_rename_request(
+        client_connection: &Connection,
+        uri: Uri,
+        line: u32,
+        character: u32,
+    ) -> Message {
+        client_connection
+            .sender
+            .send(Message::Request(lsp_server::Request {
+                id: 1.into(),
+                method: request::Rename::METHOD.to_string(),
+                params: serde_json::to_value(RenameParams {
+                    text_document_position: TextDocumentPositionParams {
+                        text_document: TextDocumentIdentifier { uri },
+                        position: Position { line, character },
+                    },
+                    new_name: "new".to_string(),
+                    work_done_progress_params: WorkDoneProgressParams::default(),
+                })
+                .unwrap(),
+            }))
+            .unwrap();
+
+        client_connection
+            .receiver
+            .recv_timeout(std::time::Duration::from_secs(2))
+            .unwrap()
+    }
+
+    #[test]
+    fn command_reference_in_workspace() {
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("workspace");
+        let (client_connection, _recv) = initialize_language_server(Some(InitializeParams {
+            workspace_folders: Some(vec![WorkspaceFolder {
+                uri: path_to_uri(&script),
+                name: "random name".to_string(),
+            }]),
+            ..Default::default()
+        }));
+        script.push("foo.nu");
+        let script = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script.clone());
+
+        let message_num = 5;
+        let messages =
+            send_reference_request(&client_connection, script.clone(), 0, 12, message_num);
+        assert_eq!(messages.len(), message_num);
+        for message in messages {
+            match message {
+                Message::Notification(n) => assert_eq!(n.method, "$/progress"),
+                Message::Response(r) => {
+                    let result = r.result.unwrap();
+                    let array = result.as_array().unwrap();
+                    assert!(array.contains(&serde_json::json!(
+                            {
+                                "uri": script.to_string().replace("foo", "bar"),
+                                "range": { "start": { "line": 4, "character": 2 }, "end": { "line": 4, "character": 7 } }
+                            }
+                        )
+                    ));
+                    assert!(array.contains(&serde_json::json!(
+                            {
+                                "uri": script.to_string(),
+                                "range": { "start": { "line": 0, "character": 11 }, "end": { "line": 0, "character": 16 } }
+                            }
+                        )
+                    ));
+                }
+                _ => panic!("unexpected message type"),
+            }
+        }
+    }
+
+    #[test]
+    fn quoted_command_reference_in_workspace() {
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("workspace");
+        let (client_connection, _recv) = initialize_language_server(Some(InitializeParams {
+            workspace_folders: Some(vec![WorkspaceFolder {
+                uri: path_to_uri(&script),
+                name: "random name".to_string(),
+            }]),
+            ..Default::default()
+        }));
+        script.push("foo.nu");
+        let script = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script.clone());
+
+        let message_num = 5;
+        let messages =
+            send_reference_request(&client_connection, script.clone(), 6, 11, message_num);
+        assert_eq!(messages.len(), message_num);
+        for message in messages {
+            match message {
+                Message::Notification(n) => assert_eq!(n.method, "$/progress"),
+                Message::Response(r) => {
+                    let result = r.result.unwrap();
+                    let array = result.as_array().unwrap();
+                    assert!(array.contains(&serde_json::json!(
+                            {
+                                "uri": script.to_string().replace("foo", "bar"),
+                                "range": { "start": { "line": 5, "character": 4 }, "end": { "line": 5, "character": 11 } }
+                            }
+                        )
+                    ));
+                    assert!(array.contains(&serde_json::json!(
+                            {
+                                "uri": script.to_string(),
+                                "range": { "start": { "line": 6, "character": 12 }, "end": { "line": 6, "character": 19 } }
+                            }
+                        )
+                    ));
+                }
+                _ => panic!("unexpected message type"),
+            }
+        }
+    }
+
+    #[test]
+    fn rename_quoted_command() {
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("workspace");
+        let (client_connection, _recv) = initialize_language_server(Some(InitializeParams {
+            workspace_folders: Some(vec![WorkspaceFolder {
+                uri: path_to_uri(&script),
+                name: "random name".to_string(),
+            }]),
+            ..Default::default()
+        }));
+        script.push("foo.nu");
+        let script = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script.clone());
+
+        let message_num = 5;
+        let messages =
+            send_rename_prepare_request(&client_connection, script.clone(), 6, 11, message_num);
+        assert_eq!(messages.len(), message_num);
+        for message in messages {
+            match message {
+                Message::Notification(n) => assert_eq!(n.method, "$/progress"),
+                Message::Response(r) => assert_json_eq!(
+                    r.result,
+                    serde_json::json!({
+                        "start": { "line": 6, "character": 12 },
+                        "end": { "line": 6, "character": 19 }
+                    }),
+                ),
+                _ => panic!("unexpected message type"),
+            }
+        }
+
+        if let Message::Response(r) = send_rename_request(&client_connection, script.clone(), 6, 11)
+        {
+            let changes = r.result.unwrap()["changes"].clone();
+            assert_json_eq!(
+                changes[script.to_string()],
+                serde_json::json!([
+                    {
+                        "range": { "start": { "line": 6, "character": 12 }, "end": { "line": 6, "character": 19 } },
+                        "newText": "new"
+                    }
+                ])
+            );
+            assert_json_eq!(
+                changes[script.to_string().replace("foo", "bar")],
+                serde_json::json!([
+                       {
+                           "range": { "start": { "line": 5, "character": 4 }, "end": { "line": 5, "character": 11 } },
+                           "newText": "new"
+                       }
+                ])
+            );
+        } else {
+            panic!()
+        }
+    }
+
+    #[test]
+    fn rename_command_argument() {
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("workspace");
+        let (client_connection, _recv) = initialize_language_server(Some(InitializeParams {
+            workspace_folders: Some(vec![WorkspaceFolder {
+                uri: path_to_uri(&script),
+                name: "random name".to_string(),
+            }]),
+            ..Default::default()
+        }));
+        script.push("foo.nu");
+        let script = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script.clone());
+
+        let message_num = 4;
+        let messages =
+            send_rename_prepare_request(&client_connection, script.clone(), 3, 5, message_num);
+        assert_eq!(messages.len(), message_num);
+        for message in messages {
+            match message {
+                Message::Notification(n) => assert_eq!(n.method, "$/progress"),
+                Message::Response(r) => assert_json_eq!(
+                    r.result,
+                    serde_json::json!({
+                        "start": { "line": 3, "character": 3 },
+                        "end": { "line": 3, "character": 8 }
+                    }),
+                ),
+                _ => panic!("unexpected message type"),
+            }
+        }
+
+        if let Message::Response(r) = send_rename_request(&client_connection, script.clone(), 3, 5)
+        {
+            assert_json_eq!(
+                r.result,
+                serde_json::json!({
+                    "changes": {
+                        script.to_string(): [
+                            {
+                                "range": { "start": { "line": 3, "character": 3 }, "end": { "line": 3, "character": 8 } },
+                                "newText": "new"
+                            },
+                            {
+                                "range": { "start": { "line": 1, "character": 2 }, "end": { "line": 1, "character": 7 } },
+                                "newText": "new"
+                            }
+                        ]
+                    }
+                }),
+            )
+        } else {
+            panic!()
+        }
+    }
+}
diff --git a/tests/fixtures/lsp/workspace/bar.nu b/tests/fixtures/lsp/workspace/bar.nu
new file mode 100644
index 0000000000..947043d791
--- /dev/null
+++ b/tests/fixtures/lsp/workspace/bar.nu
@@ -0,0 +1,7 @@
+use foo.nu [ foooo "foo str" ]
+
+export def "bar str" [
+] {
+  foooo 3
+  | foo str
+}
diff --git a/tests/fixtures/lsp/workspace/foo.nu b/tests/fixtures/lsp/workspace/foo.nu
new file mode 100644
index 0000000000..4b9adcf642
--- /dev/null
+++ b/tests/fixtures/lsp/workspace/foo.nu
@@ -0,0 +1,7 @@
+export def foooo [
+  param: int
+] {
+  $param
+}
+
+export def "foo str" [] { "foo" }

From 6eff420e1778dddeec8fa9b3f6296c23409ed370 Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Thu, 16 Jan 2025 22:59:39 +0300
Subject: [PATCH 0928/1072] fix error propagation in `export-env` (#14847)

- fixes #14801

# Description

- Fixed the issue
- Added some comments mirroring the ones used in `export-env` handling
in `use`
- Added two tests to prevent regressions

# User-Facing Changes

# Tests + Formatting

- :green_circle: toolkit fmt
- :green_circle: toolkit clippy
- :green_circle: toolkit test
- :green_circle: toolkit test stdlib

# After Submitting
---
 crates/nu-command/src/env/export_env.rs |  4 +++-
 tests/repl/test_modules.rs              | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/env/export_env.rs b/crates/nu-command/src/env/export_env.rs
index 7c0072b5d4..af7719383a 100644
--- a/crates/nu-command/src/env/export_env.rs
+++ b/crates/nu-command/src/env/export_env.rs
@@ -57,8 +57,10 @@ impl Command for ExportEnv {
 
         let eval_block = get_eval_block(engine_state);
 
-        let _ = eval_block(engine_state, &mut callee_stack, block, input);
+        // Run the block (discard the result)
+        let _ = eval_block(engine_state, &mut callee_stack, block, input)?;
 
+        // Merge the block's environment to the current stack
         redirect_env(engine_state, caller_stack, &callee_stack);
 
         Ok(PipelineData::empty())
diff --git a/tests/repl/test_modules.rs b/tests/repl/test_modules.rs
index d088d4ea30..9ededf8f73 100644
--- a/tests/repl/test_modules.rs
+++ b/tests/repl/test_modules.rs
@@ -187,3 +187,19 @@ fn test_lexical_binding() -> TestResult {
         "3",
     )
 }
+
+#[test]
+fn propagate_errors_in_export_env_on_use() -> TestResult {
+    fail_test(
+        r#"module foo { export-env { error make -u { msg: "error in export-env"} } }; use foo"#,
+        "error in export-env",
+    )
+}
+
+#[test]
+fn propagate_errors_in_export_env_when_run() -> TestResult {
+    fail_test(
+        r#"export-env { error make -u { msg: "error in export-env" } }"#,
+        "error in export-env",
+    )
+}

From 058730868491979ff3c9470fc2738b97f7f6aed2 Mon Sep 17 00:00:00 2001
From: Tyarel <98483313+Tyarel8@users.noreply.github.com>
Date: Thu, 16 Jan 2025 23:38:42 +0100
Subject: [PATCH 0929/1072] `into datetime`: noop when input is a datetime
 (#14845)

# Description

- Closes #14839

When the input to `into datetime` is a datetime, it will return it like
other `into` commands.
# User-Facing Changes

Before, using `into datetime` with a datetime as input would return an
error, now it will return the input.
# Tests + Formatting

Added test `takes_datetime`.
# After Submitting

Doc file is automatically generated.
---
 .../src/conversions/into/datetime.rs          | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/crates/nu-command/src/conversions/into/datetime.rs b/crates/nu-command/src/conversions/into/datetime.rs
index 0f6580cbc8..85e1be0880 100644
--- a/crates/nu-command/src/conversions/into/datetime.rs
+++ b/crates/nu-command/src/conversions/into/datetime.rs
@@ -59,6 +59,7 @@ impl Command for SubCommand {
     fn signature(&self) -> Signature {
         Signature::build("into datetime")
         .input_output_types(vec![
+            (Type::Date, Type::Date),
             (Type::Int, Type::Date),
             (Type::String, Type::Date),
             (Type::List(Box::new(Type::String)), Type::List(Box::new(Type::Date))),
@@ -208,6 +209,12 @@ impl Command for SubCommand {
                 #[allow(clippy::inconsistent_digit_grouping)]
                 result: example_result_1(1614434140_000000000),
             },
+            Example {
+                description: "Leave it as it is when the input is already a datetime",
+                example: "1614434140 * 1_000_000_000 | into datetime | into datetime",
+                #[allow(clippy::inconsistent_digit_grouping)]
+                result: example_result_1(1614434140_000000000),
+            },
             Example {
                 description: "Convert list of timestamps to datetimes",
                 example: r#"["2023-03-30 10:10:07 -05:00", "2023-05-05 13:43:49 -05:00", "2023-06-05 01:37:42 -05:00"] | into datetime"#,
@@ -267,6 +274,11 @@ fn action(input: &Value, args: &Arguments, head: Span) -> Value {
     let timezone = &args.zone_options;
     let dateformat = &args.format_options;
 
+    // noop if the input is already a datetime
+    if matches!(input, Value::Date { .. }) {
+        return input.clone();
+    }
+
     // Let's try dtparse first
     if matches!(input, Value::String { .. }) && dateformat.is_none() {
         let span = input.span();
@@ -636,6 +648,26 @@ mod tests {
         assert_eq!(actual, expected)
     }
 
+    #[test]
+    fn takes_datetime() {
+        let timezone_option = Some(Spanned {
+            item: Zone::Local,
+            span: Span::test_data(),
+        });
+        let args = Arguments {
+            zone_options: timezone_option,
+            format_options: None,
+            cell_paths: None,
+        };
+        let expected = Value::date(
+            Local.timestamp_opt(1614434140, 0).unwrap().into(),
+            Span::test_data(),
+        );
+        let actual = action(&expected, &args, Span::test_data());
+
+        assert_eq!(actual, expected)
+    }
+
     #[test]
     fn takes_timestamp_without_timezone() {
         let date_str = Value::test_string("1614434140000000000");

From 089c5221cc9f85f72b1656b43122e0d616c2e48e Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Fri, 17 Jan 2025 15:20:00 +0300
Subject: [PATCH 0930/1072] Add new operators `has` and `not-has` (#14841)

# Description
This PR add 2 new operators, `has` and `not-has`. They are basically
`in` and `not-in` with the order of operands swapped.

Motivation for this was the awkward way of searching for rows that
contain an item using `where`

```nushell
[[name, children]; [foo, [a, b, c]], [bar [d, e, f]]]
| where ("e" in $it.children)
```
vs
```nushell
[[name, children]; [foo, [a, b, c]], [bar [d, e, f]]]
| where children has "e"
```

# User-Facing Changes
Added `has` and `not-has` operators, mirroring `in` and `not-in`.

# Tests + Formatting

- :green_circle: toolkit fmt
- :green_circle: toolkit clippy
- :green_circle: toolkit test
- :green_circle: toolkit test stdlib

# After Submitting
---
 .../src/completions/operator_completions.rs   | 12 ++-
 crates/nu-command/src/help/help_operators.rs  |  6 ++
 crates/nu-command/tests/commands/where_.rs    | 22 ++++++
 crates/nu-engine/src/eval_ir.rs               |  2 +
 crates/nu-parser/src/parser.rs                |  4 +-
 crates/nu-parser/src/type_check.rs            | 76 ++++++++++---------
 crates/nu-protocol/src/ast/operator.rs        |  6 ++
 crates/nu-protocol/src/eval_base.rs           |  2 +
 crates/nu-protocol/src/value/mod.rs           |  8 ++
 9 files changed, 97 insertions(+), 41 deletions(-)

diff --git a/crates/nu-cli/src/completions/operator_completions.rs b/crates/nu-cli/src/completions/operator_completions.rs
index aebb176b76..0e5e1d9c90 100644
--- a/crates/nu-cli/src/completions/operator_completions.rs
+++ b/crates/nu-cli/src/completions/operator_completions.rs
@@ -107,10 +107,14 @@ impl Completer for OperatorCompletion {
                 ("not-in", "Is not a member of (doesn't use regex)"),
             ],
             Expr::FullCellPath(path) => match path.head.expr {
-                Expr::List(_) => vec![(
-                    "++",
-                    "Concatenates two lists, two strings, or two binary values",
-                )],
+                Expr::List(_) => vec![
+                    (
+                        "++",
+                        "Concatenates two lists, two strings, or two binary values",
+                    ),
+                    ("has", "Contains a value of (doesn't use regex)"),
+                    ("not-has", "Does not contain a value of (doesn't use regex)"),
+                ],
                 Expr::Var(id) => get_variable_completions(id, working_set),
                 _ => vec![],
             },
diff --git a/crates/nu-command/src/help/help_operators.rs b/crates/nu-command/src/help/help_operators.rs
index 28bb223e61..9000bdacad 100644
--- a/crates/nu-command/src/help/help_operators.rs
+++ b/crates/nu-command/src/help/help_operators.rs
@@ -141,6 +141,12 @@ fn description(operator: &Operator) -> &'static str {
         Operator::Comparison(Comparison::NotIn) => {
             "Checks if a value is not in a list, is not part of a string, or is not a key in a record."
         }
+        Operator::Comparison(Comparison::Has) => {
+            "Checks if a list contains a value, a string contains another, or if a record has a key."
+        }
+        Operator::Comparison(Comparison::NotHas) => {
+            "Checks if a list does not contain a value, a string does not contain another, or if a record does not have a key."
+        }
         Operator::Comparison(Comparison::StartsWith) => "Checks if a string starts with another.",
         Operator::Comparison(Comparison::EndsWith) => "Checks if a string ends with another.",
         Operator::Math(Math::Plus) => "Adds two values.",
diff --git a/crates/nu-command/tests/commands/where_.rs b/crates/nu-command/tests/commands/where_.rs
index 870d74fbc6..7c1fa37f23 100644
--- a/crates/nu-command/tests/commands/where_.rs
+++ b/crates/nu-command/tests/commands/where_.rs
@@ -187,3 +187,25 @@ fn where_gt_null() {
     let actual = nu!("[{foo: 123} {}] | where foo? > 10 | to nuon");
     assert_eq!(actual.out, "[[foo]; [123]]");
 }
+
+#[test]
+fn has_operator() {
+    let actual = nu!(
+        r#"[[name, children]; [foo, [a, b]], [bar [b, c]], [baz, [c, d]]] | where children has "a" | to nuon"#
+    );
+    assert_eq!(actual.out, r#"[[name, children]; [foo, [a, b]]]"#);
+
+    let actual = nu!(
+        r#"[[name, children]; [foo, [a, b]], [bar [b, c]], [baz, [c, d]]] | where children not-has "a" | to nuon"#
+    );
+    assert_eq!(
+        actual.out,
+        r#"[[name, children]; [bar, [b, c]], [baz, [c, d]]]"#
+    );
+
+    let actual = nu!(r#"{foo: 1} has foo"#);
+    assert_eq!(actual.out, "true");
+
+    let actual = nu!(r#"{foo: 1} has bar "#);
+    assert_eq!(actual.out, "false");
+}
diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index 0091963b53..20672484fa 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -952,6 +952,8 @@ fn binary_op(
             }
             Comparison::In => lhs_val.r#in(op_span, &rhs_val, span)?,
             Comparison::NotIn => lhs_val.not_in(op_span, &rhs_val, span)?,
+            Comparison::Has => lhs_val.has(op_span, &rhs_val, span)?,
+            Comparison::NotHas => lhs_val.not_has(op_span, &rhs_val, span)?,
             Comparison::StartsWith => lhs_val.starts_with(op_span, &rhs_val, span)?,
             Comparison::EndsWith => lhs_val.ends_with(op_span, &rhs_val, span)?,
         },
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 3d9038856a..6f4b1e1b81 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -5147,6 +5147,8 @@ pub fn parse_operator(working_set: &mut StateWorkingSet, span: Span) -> Expressi
         b"//" => Operator::Math(Math::FloorDivision),
         b"in" => Operator::Comparison(Comparison::In),
         b"not-in" => Operator::Comparison(Comparison::NotIn),
+        b"has" => Operator::Comparison(Comparison::Has),
+        b"not-has" => Operator::Comparison(Comparison::NotHas),
         b"mod" => Operator::Math(Math::Modulo),
         b"bit-or" => Operator::Bits(Bits::BitOr),
         b"bit-xor" => Operator::Bits(Bits::BitXor),
@@ -5187,7 +5189,7 @@ pub fn parse_operator(working_set: &mut StateWorkingSet, span: Span) -> Expressi
         b"contains" => {
             working_set.error(ParseError::UnknownOperator(
                 "contains",
-                "Did you mean '$string =~ $pattern' or '$element in $container'?",
+                "Did you mean 'has'?",
                 span,
             ));
             return garbage(working_set, span);
diff --git a/crates/nu-parser/src/type_check.rs b/crates/nu-parser/src/type_check.rs
index fd57acd5ca..413a3c3218 100644
--- a/crates/nu-parser/src/type_check.rs
+++ b/crates/nu-parser/src/type_check.rs
@@ -821,7 +821,7 @@ pub fn math_result_type(
                     )
                 }
             },
-            Operator::Comparison(Comparison::In) => match (&lhs.ty, &rhs.ty) {
+            Operator::Comparison(Comparison::In | Comparison::NotIn) => match (&lhs.ty, &rhs.ty) {
                 (t, Type::List(u)) if type_compatible(t, u) => (Type::Bool, None),
                 (Type::Int | Type::Float | Type::Number, Type::Range) => (Type::Bool, None),
                 (Type::String, Type::String) => (Type::Bool, None),
@@ -859,44 +859,48 @@ pub fn math_result_type(
                     )
                 }
             },
-            Operator::Comparison(Comparison::NotIn) => match (&lhs.ty, &rhs.ty) {
-                (t, Type::List(u)) if type_compatible(t, u) => (Type::Bool, None),
-                (Type::Int | Type::Float | Type::Number, Type::Range) => (Type::Bool, None),
-                (Type::String, Type::String) => (Type::Bool, None),
-                (Type::String, Type::Record(_)) => (Type::Bool, None),
+            Operator::Comparison(Comparison::Has | Comparison::NotHas) => {
+                let container = lhs;
+                let element = rhs;
+                match (&element.ty, &container.ty) {
+                    (t, Type::List(u)) if type_compatible(t, u) => (Type::Bool, None),
+                    (Type::Int | Type::Float | Type::Number, Type::Range) => (Type::Bool, None),
+                    (Type::String, Type::String) => (Type::Bool, None),
+                    (Type::String, Type::Record(_)) => (Type::Bool, None),
 
-                (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
-                (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
+                    (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
+                    (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
 
-                (Type::Any, _) => (Type::Bool, None),
-                (_, Type::Any) => (Type::Bool, None),
-                (Type::Int | Type::Float | Type::String, _) => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationRHS(
-                            "subset comparison".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                            rhs.span,
-                            rhs.ty.clone(),
-                        )),
-                    )
+                    (Type::Any, _) => (Type::Bool, None),
+                    (_, Type::Any) => (Type::Bool, None),
+                    (Type::Int | Type::Float | Type::String, _) => {
+                        *op = Expression::garbage(working_set, op.span);
+                        (
+                            Type::Any,
+                            Some(ParseError::UnsupportedOperationLHS(
+                                "subset comparison".into(),
+                                op.span,
+                                element.span,
+                                element.ty.clone(),
+                            )),
+                        )
+                    }
+                    _ => {
+                        *op = Expression::garbage(working_set, op.span);
+                        (
+                            Type::Any,
+                            Some(ParseError::UnsupportedOperationRHS(
+                                "subset comparison".into(),
+                                op.span,
+                                element.span,
+                                element.ty.clone(),
+                                container.span,
+                                container.ty.clone(),
+                            )),
+                        )
+                    }
                 }
-                _ => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationLHS(
-                            "subset comparison".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                        )),
-                    )
-                }
-            },
+            }
             Operator::Bits(Bits::ShiftLeft)
             | Operator::Bits(Bits::ShiftRight)
             | Operator::Bits(Bits::BitOr)
diff --git a/crates/nu-protocol/src/ast/operator.rs b/crates/nu-protocol/src/ast/operator.rs
index bde866498c..0f6fd0b556 100644
--- a/crates/nu-protocol/src/ast/operator.rs
+++ b/crates/nu-protocol/src/ast/operator.rs
@@ -17,6 +17,8 @@ pub enum Comparison {
     NotRegexMatch,
     In,
     NotIn,
+    Has,
+    NotHas,
     StartsWith,
     EndsWith,
 }
@@ -90,6 +92,8 @@ impl Operator {
             | Self::Comparison(Comparison::NotEqual)
             | Self::Comparison(Comparison::In)
             | Self::Comparison(Comparison::NotIn)
+            | Self::Comparison(Comparison::Has)
+            | Self::Comparison(Comparison::NotHas)
             | Self::Math(Math::Concat) => 80,
             Self::Bits(Bits::BitAnd) => 75,
             Self::Bits(Bits::BitXor) => 70,
@@ -123,6 +127,8 @@ impl Display for Operator {
             Operator::Comparison(Comparison::EndsWith) => write!(f, "ends-with"),
             Operator::Comparison(Comparison::In) => write!(f, "in"),
             Operator::Comparison(Comparison::NotIn) => write!(f, "not-in"),
+            Operator::Comparison(Comparison::Has) => write!(f, "has"),
+            Operator::Comparison(Comparison::NotHas) => write!(f, "not-has"),
             Operator::Math(Math::Plus) => write!(f, "+"),
             Operator::Math(Math::Concat) => write!(f, "++"),
             Operator::Math(Math::Minus) => write!(f, "-"),
diff --git a/crates/nu-protocol/src/eval_base.rs b/crates/nu-protocol/src/eval_base.rs
index 0a65c50817..65f4dd7da0 100644
--- a/crates/nu-protocol/src/eval_base.rs
+++ b/crates/nu-protocol/src/eval_base.rs
@@ -256,6 +256,8 @@ pub trait Eval {
                             Comparison::NotEqual => lhs.ne(op_span, &rhs, expr_span),
                             Comparison::In => lhs.r#in(op_span, &rhs, expr_span),
                             Comparison::NotIn => lhs.not_in(op_span, &rhs, expr_span),
+                            Comparison::Has => lhs.has(op_span, &rhs, expr_span),
+                            Comparison::NotHas => lhs.not_has(op_span, &rhs, expr_span),
                             Comparison::StartsWith => lhs.starts_with(op_span, &rhs, expr_span),
                             Comparison::EndsWith => lhs.ends_with(op_span, &rhs, expr_span),
                             Comparison::RegexMatch => {
diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs
index 5ffe376269..58cde75b50 100644
--- a/crates/nu-protocol/src/value/mod.rs
+++ b/crates/nu-protocol/src/value/mod.rs
@@ -3540,6 +3540,14 @@ impl Value {
         }
     }
 
+    pub fn has(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
+        rhs.r#in(op, self, span)
+    }
+
+    pub fn not_has(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
+        rhs.r#not_in(op, self, span)
+    }
+
     pub fn regex_match(
         &self,
         engine_state: &EngineState,

From 4dcaf2a201fafe274904e1972e9148d981697a8c Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Fri, 17 Jan 2025 13:21:32 +0100
Subject: [PATCH 0931/1072] Rename/deprecate `range` to `slice` (#14825)

# Description
As the `range` command has an ambiguous name (does it construct a range
type?, does it iterate a range like `seq`) replace it with a more
descriptive verb of what it does: `slice`

Closes #14130
# User-Facing Changes
`range` is now deprecated and replaced in whole by `slice` with the same
behavior.
`range` will be removed in `0.103.0`

# Tests + Formatting
Tests have been updated to use `slice`

# After submitting

- [ ] prepare PR for `nu_scripts` (several usages of `range` to be
fixed)
- [ ] update documentation usages of `range` after release
---
 crates/nu-command/src/default_context.rs      |   1 +
 crates/nu-command/src/filters/mod.rs          |   2 +
 crates/nu-command/src/filters/range.rs        |  78 ++--------
 crates/nu-command/src/filters/slice.rs        | 144 ++++++++++++++++++
 crates/nu-command/tests/commands/mod.rs       |   2 +-
 .../tests/commands/{range.rs => slice.rs}     |  12 +-
 tests/repl/test_engine.rs                     |   2 +-
 7 files changed, 167 insertions(+), 74 deletions(-)
 create mode 100644 crates/nu-command/src/filters/slice.rs
 rename crates/nu-command/tests/commands/{range.rs => slice.rs} (83%)

diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index 7ea6e6cdde..ca06a4c04d 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -79,6 +79,7 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             Skip,
             SkipUntil,
             SkipWhile,
+            Slice,
             Sort,
             SortBy,
             SplitList,
diff --git a/crates/nu-command/src/filters/mod.rs b/crates/nu-command/src/filters/mod.rs
index eaa9452b31..ed1e9d8614 100644
--- a/crates/nu-command/src/filters/mod.rs
+++ b/crates/nu-command/src/filters/mod.rs
@@ -40,6 +40,7 @@ mod select;
 #[cfg(feature = "rand")]
 mod shuffle;
 mod skip;
+mod slice;
 mod sort;
 mod sort_by;
 mod take;
@@ -99,6 +100,7 @@ pub use select::Select;
 #[cfg(feature = "rand")]
 pub use shuffle::Shuffle;
 pub use skip::*;
+pub use slice::Slice;
 pub use sort::Sort;
 pub use sort_by::SortBy;
 pub use take::*;
diff --git a/crates/nu-command/src/filters/range.rs b/crates/nu-command/src/filters/range.rs
index 35d6fddd3f..74ca8e1186 100644
--- a/crates/nu-command/src/filters/range.rs
+++ b/crates/nu-command/src/filters/range.rs
@@ -1,6 +1,5 @@
 use nu_engine::command_prelude::*;
-use nu_protocol::Range as NumRange;
-use std::ops::Bound;
+use nu_protocol::{report_parse_warning, ParseWarning};
 
 #[derive(Clone)]
 pub struct Range;
@@ -17,7 +16,7 @@ impl Command for Range {
                 Type::List(Box::new(Type::Any)),
             )])
             .required("rows", SyntaxShape::Range, "Range of rows to return.")
-            .category(Category::Filters)
+            .category(Category::Deprecated)
     }
 
     fn description(&self) -> &str {
@@ -65,69 +64,16 @@ impl Command for Range {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
-        let metadata = input.metadata();
-        let rows: Spanned<NumRange> = call.req(engine_state, stack, 0)?;
-
-        match rows.item {
-            NumRange::IntRange(range) => {
-                let start = range.start();
-                let end = match range.end() {
-                    Bound::Included(end) => end,
-                    Bound::Excluded(end) => end - 1,
-                    Bound::Unbounded => {
-                        if range.step() < 0 {
-                            i64::MIN
-                        } else {
-                            i64::MAX
-                        }
-                    }
-                };
-
-                // only collect the input if we have any negative indices
-                if start < 0 || end < 0 {
-                    let v: Vec<_> = input.into_iter().collect();
-                    let vlen: i64 = v.len() as i64;
-
-                    let from = if start < 0 {
-                        (vlen + start) as usize
-                    } else {
-                        start as usize
-                    };
-
-                    let to = if end < 0 {
-                        (vlen + end) as usize
-                    } else if end > v.len() as i64 {
-                        v.len()
-                    } else {
-                        end as usize
-                    };
-
-                    if from > to {
-                        Ok(PipelineData::Value(Value::nothing(head), None))
-                    } else {
-                        let iter = v.into_iter().skip(from).take(to - from + 1);
-                        Ok(iter.into_pipeline_data(head, engine_state.signals().clone()))
-                    }
-                } else {
-                    let from = start as usize;
-                    let to = end as usize;
-
-                    if from > to {
-                        Ok(PipelineData::Value(Value::nothing(head), None))
-                    } else {
-                        let iter = input.into_iter().skip(from).take(to - from + 1);
-                        Ok(iter.into_pipeline_data(head, engine_state.signals().clone()))
-                    }
-                }
-                .map(|x| x.set_metadata(metadata))
-            }
-            NumRange::FloatRange(_) => Err(ShellError::UnsupportedInput {
-                msg: "float range".into(),
-                input: "value originates from here".into(),
-                msg_span: call.head,
-                input_span: rows.span,
-            }),
-        }
+        report_parse_warning(
+            &StateWorkingSet::new(engine_state),
+            &ParseWarning::DeprecatedWarning {
+                old_command: "range".into(),
+                new_suggestion: "use `slice`".into(),
+                span: head,
+                url: "`help slice`".into(),
+            },
+        );
+        super::Slice::run(&super::Slice, engine_state, stack, call, input)
     }
 }
 
diff --git a/crates/nu-command/src/filters/slice.rs b/crates/nu-command/src/filters/slice.rs
new file mode 100644
index 0000000000..e3f49a4bb3
--- /dev/null
+++ b/crates/nu-command/src/filters/slice.rs
@@ -0,0 +1,144 @@
+use nu_engine::command_prelude::*;
+use nu_protocol::Range;
+use std::ops::Bound;
+
+#[derive(Clone)]
+pub struct Slice;
+
+impl Command for Slice {
+    fn name(&self) -> &str {
+        "slice"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("slice")
+            .input_output_types(vec![(
+                Type::List(Box::new(Type::Any)),
+                Type::List(Box::new(Type::Any)),
+            )])
+            .required("rows", SyntaxShape::Range, "Range of rows to return.")
+            .category(Category::Filters)
+    }
+
+    fn description(&self) -> &str {
+        "Return only the selected rows."
+    }
+
+    fn search_terms(&self) -> Vec<&str> {
+        vec!["filter", "head", "tail", "range"]
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                example: "[0,1,2,3,4,5] | slice 4..5",
+                description: "Get the last 2 items",
+                result: Some(Value::list(
+                    vec![Value::test_int(4), Value::test_int(5)],
+                    Span::test_data(),
+                )),
+            },
+            Example {
+                example: "[0,1,2,3,4,5] | slice (-2)..",
+                description: "Get the last 2 items",
+                result: Some(Value::list(
+                    vec![Value::test_int(4), Value::test_int(5)],
+                    Span::test_data(),
+                )),
+            },
+            Example {
+                example: "[0,1,2,3,4,5] | slice (-3)..-2",
+                description: "Get the next to last 2 items",
+                result: Some(Value::list(
+                    vec![Value::test_int(3), Value::test_int(4)],
+                    Span::test_data(),
+                )),
+            },
+        ]
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let head = call.head;
+        let metadata = input.metadata();
+        let rows: Spanned<Range> = call.req(engine_state, stack, 0)?;
+
+        match rows.item {
+            Range::IntRange(range) => {
+                let start = range.start();
+                let end = match range.end() {
+                    Bound::Included(end) => end,
+                    Bound::Excluded(end) => end - 1,
+                    Bound::Unbounded => {
+                        if range.step() < 0 {
+                            i64::MIN
+                        } else {
+                            i64::MAX
+                        }
+                    }
+                };
+
+                // only collect the input if we have any negative indices
+                if start < 0 || end < 0 {
+                    let v: Vec<_> = input.into_iter().collect();
+                    let vlen: i64 = v.len() as i64;
+
+                    let from = if start < 0 {
+                        (vlen + start) as usize
+                    } else {
+                        start as usize
+                    };
+
+                    let to = if end < 0 {
+                        (vlen + end) as usize
+                    } else if end > v.len() as i64 {
+                        v.len()
+                    } else {
+                        end as usize
+                    };
+
+                    if from > to {
+                        Ok(PipelineData::Value(Value::nothing(head), None))
+                    } else {
+                        let iter = v.into_iter().skip(from).take(to - from + 1);
+                        Ok(iter.into_pipeline_data(head, engine_state.signals().clone()))
+                    }
+                } else {
+                    let from = start as usize;
+                    let to = end as usize;
+
+                    if from > to {
+                        Ok(PipelineData::Value(Value::nothing(head), None))
+                    } else {
+                        let iter = input.into_iter().skip(from).take(to - from + 1);
+                        Ok(iter.into_pipeline_data(head, engine_state.signals().clone()))
+                    }
+                }
+                .map(|x| x.set_metadata(metadata))
+            }
+            Range::FloatRange(_) => Err(ShellError::UnsupportedInput {
+                msg: "float range".into(),
+                input: "value originates from here".into(),
+                msg_span: call.head,
+                input_span: rows.span,
+            }),
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_examples() {
+        use crate::test_examples;
+
+        test_examples(Slice {})
+    }
+}
diff --git a/crates/nu-command/tests/commands/mod.rs b/crates/nu-command/tests/commands/mod.rs
index c772e78544..73d5d4577a 100644
--- a/crates/nu-command/tests/commands/mod.rs
+++ b/crates/nu-command/tests/commands/mod.rs
@@ -82,7 +82,6 @@ mod print;
 #[cfg(feature = "sqlite")]
 mod query;
 mod random;
-mod range;
 mod redirection;
 mod reduce;
 mod reject;
@@ -100,6 +99,7 @@ mod seq;
 mod seq_char;
 mod seq_date;
 mod skip;
+mod slice;
 mod sort;
 mod sort_by;
 mod source_env;
diff --git a/crates/nu-command/tests/commands/range.rs b/crates/nu-command/tests/commands/slice.rs
similarity index 83%
rename from crates/nu-command/tests/commands/range.rs
rename to crates/nu-command/tests/commands/slice.rs
index 5135de6f20..d7639ad8dc 100644
--- a/crates/nu-command/tests/commands/range.rs
+++ b/crates/nu-command/tests/commands/slice.rs
@@ -4,7 +4,7 @@ use nu_test_support::{nu, pipeline};
 
 #[test]
 fn selects_a_row() {
-    Playground::setup("range_test_1", |dirs, sandbox| {
+    Playground::setup("slice_test_1", |dirs, sandbox| {
         sandbox.with_files(&[EmptyFile("notes.txt"), EmptyFile("tests.txt")]);
 
         let actual = nu!(
@@ -12,7 +12,7 @@ fn selects_a_row() {
             "
                 ls
                 | sort-by name
-                | range 0..0
+                | slice 0..0
                 | get name.0
             "
         ));
@@ -23,7 +23,7 @@ fn selects_a_row() {
 
 #[test]
 fn selects_some_rows() {
-    Playground::setup("range_test_2", |dirs, sandbox| {
+    Playground::setup("slice_test_2", |dirs, sandbox| {
         sandbox.with_files(&[
             EmptyFile("notes.txt"),
             EmptyFile("tests.txt"),
@@ -35,7 +35,7 @@ fn selects_some_rows() {
             "
                 ls
                 | get name
-                | range 1..2
+                | slice 1..2
                 | length
             "
         ));
@@ -46,7 +46,7 @@ fn selects_some_rows() {
 
 #[test]
 fn negative_indices() {
-    Playground::setup("range_test_negative_indices", |dirs, sandbox| {
+    Playground::setup("slice_test_negative_indices", |dirs, sandbox| {
         sandbox.with_files(&[
             EmptyFile("notes.txt"),
             EmptyFile("tests.txt"),
@@ -58,7 +58,7 @@ fn negative_indices() {
             "
                 ls
                 | get name
-                | range (-1..)
+                | slice (-1..)
                 | length
             "
         ));
diff --git a/tests/repl/test_engine.rs b/tests/repl/test_engine.rs
index 5c2fb8e533..d89a722bec 100644
--- a/tests/repl/test_engine.rs
+++ b/tests/repl/test_engine.rs
@@ -441,7 +441,7 @@ fn better_operator_spans() -> TestResult {
 
 #[test]
 fn range_right_exclusive() -> TestResult {
-    run_test(r#"[1, 4, 5, 8, 9] | range 1..<3 | math sum"#, "9")
+    run_test(r#"[1, 4, 5, 8, 9] | slice 1..<3 | math sum"#, "9")
 }
 
 /// Issue #7872

From 87599366362b6960ed6fb02987c20260560f558e Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Fri, 17 Jan 2025 20:21:59 +0800
Subject: [PATCH 0932/1072] Fix variable names that end in a duration suffix
 can't be on the right part of a range (#14848)

# Description
Fixes: #14844

The issue occurs when nushell is parsing a value with
`SyntaxShape::Any`, it checks `Duration` and `Filesize` first, then
`Range`. Nushell raises errors too early while parsing
`Duration/Filesize`.

This pr changes the order of parsing to fix the issue.

# User-Facing Changes

The following code should be able to run after this pr
```nushell
let runs = 10;
1..$runs
```

# Tests + Formatting
Added 2 tests, one for filesize, one for duration.

# After Submitting
NaN
---
 crates/nu-parser/src/parser.rs |  2 +-
 tests/repl/test_parser.rs      | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 6f4b1e1b81..4ef6b1f2b1 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -4950,9 +4950,9 @@ pub fn parse_value(
             } else {
                 let shapes = [
                     SyntaxShape::Binary,
+                    SyntaxShape::Range,
                     SyntaxShape::Filesize,
                     SyntaxShape::Duration,
-                    SyntaxShape::Range,
                     SyntaxShape::DateTime,
                     SyntaxShape::Int,
                     SyntaxShape::Number,
diff --git a/tests/repl/test_parser.rs b/tests/repl/test_parser.rs
index 988b34f18d..47529c69f0 100644
--- a/tests/repl/test_parser.rs
+++ b/tests/repl/test_parser.rs
@@ -94,6 +94,16 @@ fn range_iteration2() -> TestResult {
     run_test("4..1 | each { |y| $y + 100 } | get 3", "101")
 }
 
+#[test]
+fn range_ends_with_duration_suffix_variable_name() -> TestResult {
+    run_test("let runs = 10; 1..$runs | math sum", "55")
+}
+
+#[test]
+fn range_ends_with_filesize_suffix_variable_name() -> TestResult {
+    run_test("let sizekb = 10; 1..$sizekb | math sum", "55")
+}
+
 #[test]
 fn simple_value_iteration() -> TestResult {
     run_test("4 | each { |it| $it + 10 }", "14")

From 75105033b25a03b70b839dd707c951eb978f1082 Mon Sep 17 00:00:00 2001
From: Yash Thakur <45539777+ysthakur@users.noreply.github.com>
Date: Fri, 17 Jan 2025 07:24:00 -0500
Subject: [PATCH 0933/1072] Use nucleo instead of skim for completions (#14846)

# Description

This PR replaces `SkimMatcherV2` from the
[fuzzy-matcher](https://docs.rs/fuzzy-matcher/latest/fuzzy_matcher/)
crate with the
[nucleo-matcher](https://docs.rs/nucleo-matcher/latest/nucleo_matcher/)
crate for doing fuzzy matching. This touches both our completion code in
`nu-cli` and symbol filtering in `nu-lsp`.

Nucleo should give us better performance than Skim. In the event that we
decide to use the Nucleo frontend ([crate
docs](https://docs.rs/nucleo/latest/nucleo/)) too, it also works on
Windows, unlike [Skim](https://github.com/skim-rs/skim), which appears
to only support Linux and MacOS.

Unfortunately, we still have an indirect dependency on `fuzzy-matcher`,
because the [`dialoguer`](https://github.com/console-rs/dialoguer) crate
uses it.

# User-Facing Changes

No breaking changes. Suggestions will be sorted differently, because
Nucleo uses a different algorithm from Skim for matching/scoring.
Hopefully, the new sorting will generally make more sense.

# Tests + Formatting

In `nu-cli`, modified an existing test, but didn't test performance. I
haven't tested `nu-lsp` manually, but existing tests pass.

I did manually do `ls /nix/store/<TAB>`, `ls /nix/store/d<TAB>`, etc.,
but didn't notice Nucleo being faster (my `/nix/store` folder has 34136
items at the time of writing).
---
 Cargo.lock                                    | 14 +++-
 Cargo.toml                                    |  2 +-
 crates/nu-cli/Cargo.toml                      |  4 +-
 .../src/completions/completion_options.rs     | 64 ++++++++++++-------
 crates/nu-cli/tests/completions/mod.rs        | 49 ++++++--------
 crates/nu-lsp/Cargo.toml                      |  2 +-
 crates/nu-lsp/src/symbols.rs                  | 19 ++++--
 7 files changed, 90 insertions(+), 64 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b598c5dfe5..8bbc01b159 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3666,7 +3666,6 @@ dependencies = [
  "chrono",
  "crossterm 0.28.1",
  "fancy-regex",
- "fuzzy-matcher",
  "is_executable",
  "log",
  "lscolors",
@@ -3684,6 +3683,7 @@ dependencies = [
  "nu-protocol",
  "nu-test-support",
  "nu-utils",
+ "nucleo-matcher",
  "percent-encoding",
  "reedline",
  "rstest",
@@ -3952,7 +3952,6 @@ version = "0.101.1"
 dependencies = [
  "assert-json-diff",
  "crossbeam-channel",
- "fuzzy-matcher",
  "lsp-server",
  "lsp-textdocument",
  "lsp-types",
@@ -3964,6 +3963,7 @@ dependencies = [
  "nu-parser",
  "nu-protocol",
  "nu-test-support",
+ "nucleo-matcher",
  "serde",
  "serde_json",
  "url",
@@ -4318,6 +4318,16 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "nucleo-matcher"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf33f538733d1a5a3494b836ba913207f14d9d4a1d3cd67030c5061bdd2cac85"
+dependencies = [
+ "memchr",
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "num"
 version = "0.4.3"
diff --git a/Cargo.toml b/Cargo.toml
index 70b3fb369f..c9614ba5b1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -90,7 +90,6 @@ encoding_rs = "0.8"
 fancy-regex = "0.14"
 filesize = "0.2"
 filetime = "0.2"
-fuzzy-matcher = "0.3"
 heck = "0.5.0"
 human-date-parser = "0.2.0"
 indexmap = "2.7"
@@ -117,6 +116,7 @@ native-tls = "0.2"
 nix = { version = "0.29", default-features = false }
 notify-debouncer-full = { version = "0.3", default-features = false }
 nu-ansi-term = "0.50.1"
+nucleo-matcher = "0.3"
 num-format = "0.4"
 num-traits = "0.2"
 oem_cp = "2.0.0"
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index fc9b838af7..01f749b322 100644
--- a/crates/nu-cli/Cargo.toml
+++ b/crates/nu-cli/Cargo.toml
@@ -33,11 +33,11 @@ reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 chrono = { default-features = false, features = ["std"], workspace = true }
 crossterm = { workspace = true }
 fancy-regex = { workspace = true }
-fuzzy-matcher = { workspace = true }
 is_executable = { workspace = true }
 log = { workspace = true }
-miette = { workspace = true, features = ["fancy-no-backtrace"] }
 lscolors = { workspace = true, default-features = false, features = ["nu-ansi-term"] }
+miette = { workspace = true, features = ["fancy-no-backtrace"] }
+nucleo-matcher = { workspace = true }
 percent-encoding = { workspace = true }
 sysinfo = { workspace = true }
 unicode-segmentation = { workspace = true }
diff --git a/crates/nu-cli/src/completions/completion_options.rs b/crates/nu-cli/src/completions/completion_options.rs
index 9165bd32f9..58fea194ec 100644
--- a/crates/nu-cli/src/completions/completion_options.rs
+++ b/crates/nu-cli/src/completions/completion_options.rs
@@ -1,7 +1,10 @@
-use fuzzy_matcher::{skim::SkimMatcherV2, FuzzyMatcher};
 use nu_parser::trim_quotes_str;
 use nu_protocol::{CompletionAlgorithm, CompletionSort};
 use nu_utils::IgnoreCaseExt;
+use nucleo_matcher::{
+    pattern::{AtomKind, CaseMatching, Normalization, Pattern},
+    Config, Matcher, Utf32Str,
+};
 use std::{borrow::Cow, fmt::Display};
 
 use super::SemanticSuggestion;
@@ -34,9 +37,10 @@ enum State<T> {
         items: Vec<(String, T)>,
     },
     Fuzzy {
-        matcher: Box<SkimMatcherV2>,
+        matcher: Matcher,
+        pat: Pattern,
         /// Holds (haystack, item, score)
-        items: Vec<(String, T, i64)>,
+        items: Vec<(String, T, u32)>,
     },
 }
 
@@ -46,30 +50,37 @@ impl<T> NuMatcher<T> {
     ///
     /// * `needle` - The text to search for
     pub fn new(needle: impl AsRef<str>, options: CompletionOptions) -> NuMatcher<T> {
-        let orig_needle = trim_quotes_str(needle.as_ref());
-        let lowercase_needle = if options.case_sensitive {
-            orig_needle.to_owned()
-        } else {
-            orig_needle.to_folded_case()
-        };
+        let needle = trim_quotes_str(needle.as_ref());
         match options.match_algorithm {
-            MatchAlgorithm::Prefix => NuMatcher {
-                options,
-                needle: lowercase_needle,
-                state: State::Prefix { items: Vec::new() },
-            },
-            MatchAlgorithm::Fuzzy => {
-                let mut matcher = SkimMatcherV2::default();
-                if options.case_sensitive {
-                    matcher = matcher.respect_case();
+            MatchAlgorithm::Prefix => {
+                let lowercase_needle = if options.case_sensitive {
+                    needle.to_owned()
                 } else {
-                    matcher = matcher.ignore_case();
+                    needle.to_folded_case()
                 };
                 NuMatcher {
                     options,
-                    needle: orig_needle.to_owned(),
+                    needle: lowercase_needle,
+                    state: State::Prefix { items: Vec::new() },
+                }
+            }
+            MatchAlgorithm::Fuzzy => {
+                let pat = Pattern::new(
+                    needle,
+                    if options.case_sensitive {
+                        CaseMatching::Respect
+                    } else {
+                        CaseMatching::Ignore
+                    },
+                    Normalization::Smart,
+                    AtomKind::Fuzzy,
+                );
+                NuMatcher {
+                    options,
+                    needle: needle.to_owned(),
                     state: State::Fuzzy {
-                        matcher: Box::new(matcher),
+                        matcher: Matcher::new(Config::DEFAULT),
+                        pat,
                         items: Vec::new(),
                     },
                 }
@@ -102,8 +113,15 @@ impl<T> NuMatcher<T> {
                 }
                 matches
             }
-            State::Fuzzy { items, matcher } => {
-                let Some(score) = matcher.fuzzy_match(haystack, &self.needle) else {
+            State::Fuzzy {
+                matcher,
+                pat,
+                items,
+            } => {
+                let mut haystack_buf = Vec::new();
+                let haystack_utf32 = Utf32Str::new(trim_quotes_str(haystack), &mut haystack_buf);
+                let mut indices = Vec::new();
+                let Some(score) = pat.indices(haystack_utf32, matcher, &mut indices) else {
                     return false;
                 };
                 if let Some(item) = item {
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index a75ffe1d4c..fc2cc160b3 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -111,25 +111,6 @@ fn custom_completer() -> NuCompleter {
     NuCompleter::new(Arc::new(engine), Arc::new(stack))
 }
 
-#[fixture]
-fn subcommand_completer() -> NuCompleter {
-    // Create a new engine
-    let (_, _, 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).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 {
@@ -1040,24 +1021,32 @@ fn command_watch_with_filecompletion() {
 }
 
 #[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,
-    );
+fn subcommand_completions() {
+    let (_, _, mut engine, mut stack) = new_engine();
+    let commands = r#"
+            $env.config.completions.algorithm = "fuzzy"
+            def foo-test-command [] {}
+            def "foo-test-command bar" [] {}
+            def "foo-test-command aagap bcr" [] {}
+            def "food bar" [] {}
+        "#;
+    assert!(support::merge_input(commands.as_bytes(), &mut engine, &mut stack).is_ok());
+    let mut subcommand_completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
 
-    let prefix = "foo b";
+    let prefix = "fod br";
     let suggestions = subcommand_completer.complete(prefix, prefix.len());
     match_suggestions(
         &vec![
-            "foo bar".to_string(),
-            "foo abaz".to_string(),
-            "foo aabcrr".to_string(),
+            "food bar".to_string(),
+            "foo-test-command aagap bcr".to_string(),
+            "foo-test-command bar".to_string(),
         ],
         &suggestions,
     );
+
+    let prefix = "foot bar";
+    let suggestions = subcommand_completer.complete(prefix, prefix.len());
+    match_suggestions(&vec!["foo-test-command bar".to_string()], &suggestions);
 }
 
 #[test]
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index 5775fd8049..33a15c8ebb 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -14,11 +14,11 @@ nu-parser = { path = "../nu-parser", version = "0.101.1" }
 nu-protocol = { path = "../nu-protocol", version = "0.101.1" }
 
 crossbeam-channel = { workspace = true }
-fuzzy-matcher = { workspace = true }
 lsp-server = { workspace = true }
 lsp-textdocument = { workspace = true }
 lsp-types = { workspace = true }
 miette = { workspace = true }
+nucleo-matcher = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 url = { workspace = true }
diff --git a/crates/nu-lsp/src/symbols.rs b/crates/nu-lsp/src/symbols.rs
index 301def0a5c..604c867e01 100644
--- a/crates/nu-lsp/src/symbols.rs
+++ b/crates/nu-lsp/src/symbols.rs
@@ -2,7 +2,6 @@ use std::collections::{BTreeMap, HashSet};
 use std::hash::{Hash, Hasher};
 
 use crate::{path_to_uri, span_to_range, uri_to_path, Id, LanguageServer};
-use fuzzy_matcher::{skim::SkimMatcherV2, FuzzyMatcher};
 use lsp_textdocument::{FullTextDocument, TextDocuments};
 use lsp_types::{
     DocumentSymbolParams, DocumentSymbolResponse, Location, Range, SymbolInformation, SymbolKind,
@@ -14,6 +13,8 @@ use nu_protocol::{
     engine::{CachedFile, EngineState, StateWorkingSet},
     DeclId, Span, VarId,
 };
+use nucleo_matcher::pattern::{AtomKind, CaseMatching, Normalization, Pattern};
+use nucleo_matcher::{Config, Matcher, Utf32Str};
 use std::{cmp::Ordering, path::Path};
 
 /// Struct stored in cache, uri not included
@@ -70,7 +71,7 @@ impl Symbol {
 /// Cache symbols for each opened file to avoid repeated parsing
 pub struct SymbolCache {
     /// Fuzzy matcher for symbol names
-    matcher: SkimMatcherV2,
+    matcher: Matcher,
     /// File Uri --> Symbols
     cache: BTreeMap<Uri, Vec<Symbol>>,
     /// If marked as dirty, parse on next request
@@ -80,7 +81,7 @@ pub struct SymbolCache {
 impl SymbolCache {
     pub fn new() -> Self {
         SymbolCache {
-            matcher: SkimMatcherV2::default(),
+            matcher: Matcher::new(Config::DEFAULT),
             cache: BTreeMap::new(),
             dirty_flags: BTreeMap::new(),
         }
@@ -240,12 +241,20 @@ impl SymbolCache {
         )
     }
 
-    pub fn get_fuzzy_matched_symbols(&self, query: &str) -> Vec<SymbolInformation> {
+    pub fn get_fuzzy_matched_symbols(&mut self, query: &str) -> Vec<SymbolInformation> {
+        let pat = Pattern::new(
+            query,
+            CaseMatching::Smart,
+            Normalization::Smart,
+            AtomKind::Fuzzy,
+        );
         self.cache
             .iter()
             .flat_map(|(uri, symbols)| symbols.iter().map(|s| s.clone().to_symbol_information(uri)))
             .filter_map(|s| {
-                self.matcher.fuzzy_match(&s.name, query)?;
+                let mut buf = Vec::new();
+                let name = Utf32Str::new(&s.name, &mut buf);
+                pat.score(name, &mut self.matcher)?;
                 Some(s)
             })
             .collect()

From 3f5ebd75b6e1506f06509bc29a4807be1bc25049 Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Fri, 17 Jan 2025 23:57:35 +0800
Subject: [PATCH 0934/1072] feat(lsp): cancellable heavy requests (#14851)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

`tower-lsp` seems not well-maintained, I ended up with a dedicated
thread for heavy computing and message passing to cancel it on any new
request.

During the progress, interrupting with edits or new requests.

<img width="522" alt="image"
src="https://github.com/user-attachments/assets/b263d73d-8ea3-4b26-a7b7-e0b30462d1af"
/>

Goto references are still blocking, with a hard timeout of 5 seconds.
Only locations found within the time limit are returned. Technically,
reference requests allow for responses with partial results, which means
instant responsiveness. However, the `lsp_types` crate hasn’t enabled
this. I believe I can still enable it with some JSON manipulation, but
I’ll leave it for future work.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

Need some clever way to test the cancellation, no test cases added yet.

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-lsp/src/diagnostics.rs  |  14 +-
 crates/nu-lsp/src/goto.rs         |   2 +-
 crates/nu-lsp/src/lib.rs          |  88 ++++++--
 crates/nu-lsp/src/notification.rs |  13 +-
 crates/nu-lsp/src/symbols.rs      |   6 +-
 crates/nu-lsp/src/workspace.rs    | 323 ++++++++++++++++++++----------
 6 files changed, 312 insertions(+), 134 deletions(-)

diff --git a/crates/nu-lsp/src/diagnostics.rs b/crates/nu-lsp/src/diagnostics.rs
index faa0e6dd33..8e37191b0a 100644
--- a/crates/nu-lsp/src/diagnostics.rs
+++ b/crates/nu-lsp/src/diagnostics.rs
@@ -3,24 +3,30 @@ use lsp_types::{
     notification::{Notification, PublishDiagnostics},
     Diagnostic, DiagnosticSeverity, PublishDiagnosticsParams, Uri,
 };
-use miette::{IntoDiagnostic, Result};
+use miette::{miette, IntoDiagnostic, Result};
 
 impl LanguageServer {
     pub(crate) fn publish_diagnostics_for_file(&mut self, uri: Uri) -> Result<()> {
         let mut engine_state = self.new_engine_state();
         engine_state.generate_nu_constant();
 
-        let Some((_, offset, working_set, file)) = self.parse_file(&mut engine_state, &uri, true)
-        else {
+        let Some((_, offset, working_set)) = self.parse_file(&mut engine_state, &uri, true) else {
             return Ok(());
         };
 
         let mut diagnostics = PublishDiagnosticsParams {
-            uri,
+            uri: uri.clone(),
             diagnostics: Vec::new(),
             version: None,
         };
 
+        let docs = match self.docs.lock() {
+            Ok(it) => it,
+            Err(err) => return Err(miette!(err.to_string())),
+        };
+        let file = docs
+            .get_document(&uri)
+            .ok_or_else(|| miette!("\nFailed to get document"))?;
         for err in working_set.parse_errors.iter() {
             let message = err.to_string();
 
diff --git a/crates/nu-lsp/src/goto.rs b/crates/nu-lsp/src/goto.rs
index 78fb4c9067..72e576d674 100644
--- a/crates/nu-lsp/src/goto.rs
+++ b/crates/nu-lsp/src/goto.rs
@@ -33,7 +33,7 @@ impl LanguageServer {
             .text_document
             .uri
             .to_owned();
-        let (working_set, id, _, _, _) = self
+        let (working_set, id, _, _) = self
             .parse_and_find(
                 &mut engine_state,
                 &path_uri,
diff --git a/crates/nu-lsp/src/lib.rs b/crates/nu-lsp/src/lib.rs
index 3e85723bee..b6759fe99e 100644
--- a/crates/nu-lsp/src/lib.rs
+++ b/crates/nu-lsp/src/lib.rs
@@ -1,5 +1,6 @@
 #![doc = include_str!("../README.md")]
 use ast::find_id;
+use crossbeam_channel::{Receiver, Sender};
 use lsp_server::{Connection, IoThreads, Message, Response, ResponseError};
 use lsp_textdocument::{FullTextDocument, TextDocuments};
 use lsp_types::{
@@ -18,7 +19,7 @@ use nu_protocol::{
     engine::{CachedFile, EngineState, Stack, StateWorkingSet},
     DeclId, ModuleId, Span, Type, Value, VarId,
 };
-use std::collections::BTreeMap;
+use std::{collections::BTreeMap, sync::Mutex};
 use std::{
     path::{Path, PathBuf},
     str::FromStr,
@@ -27,6 +28,7 @@ use std::{
 };
 use symbols::SymbolCache;
 use url::Url;
+use workspace::{InternalMessage, RangePerDoc};
 
 mod ast;
 mod diagnostics;
@@ -47,13 +49,14 @@ pub enum Id {
 pub struct LanguageServer {
     connection: Connection,
     io_threads: Option<IoThreads>,
-    docs: TextDocuments,
+    docs: Arc<Mutex<TextDocuments>>,
     engine_state: EngineState,
     symbol_cache: SymbolCache,
     inlay_hints: BTreeMap<Uri, Vec<InlayHint>>,
     workspace_folders: BTreeMap<String, WorkspaceFolder>,
     // for workspace wide requests
     occurrences: BTreeMap<Uri, Vec<Range>>,
+    channels: Option<(Sender<bool>, Arc<Receiver<InternalMessage>>)>,
 }
 
 pub fn path_to_uri(path: impl AsRef<Path>) -> Uri {
@@ -92,12 +95,13 @@ impl LanguageServer {
         Ok(Self {
             connection,
             io_threads,
-            docs: TextDocuments::new(),
+            docs: Arc::new(Mutex::new(TextDocuments::new())),
             engine_state,
             symbol_cache: SymbolCache::new(),
             inlay_hints: BTreeMap::new(),
             workspace_folders: BTreeMap::new(),
             occurrences: BTreeMap::new(),
+            channels: None,
         })
     }
 
@@ -141,12 +145,19 @@ impl LanguageServer {
         self.initialize_workspace_folders(init_params)?;
 
         while !self.engine_state.signals().interrupted() {
+            // first check new messages from child thread
+            self.handle_internal_messages()?;
+
             let msg = match self
                 .connection
                 .receiver
                 .recv_timeout(Duration::from_secs(1))
             {
-                Ok(msg) => msg,
+                Ok(msg) => {
+                    // cancel execution if other messages received before job done
+                    self.cancel_background_thread();
+                    msg
+                }
                 Err(crossbeam_channel::RecvTimeoutError::Timeout) => {
                     continue;
                 }
@@ -177,7 +188,9 @@ impl LanguageServer {
                             Self::handle_lsp_request(request, |params| self.document_symbol(params))
                         }
                         request::References::METHOD => {
-                            Self::handle_lsp_request(request, |params| self.references(params))
+                            Self::handle_lsp_request(request, |params| {
+                                self.references(params, 5000)
+                            })
                         }
                         request::WorkspaceSymbolRequest::METHOD => {
                             Self::handle_lsp_request(request, |params| {
@@ -224,6 +237,42 @@ impl LanguageServer {
         Ok(())
     }
 
+    /// Send a cancel message to a running bg thread
+    pub fn cancel_background_thread(&mut self) {
+        if let Some((sender, _)) = &self.channels {
+            sender.send(true).ok();
+        }
+    }
+
+    /// Check results from background thread
+    pub fn handle_internal_messages(&mut self) -> Result<bool> {
+        let mut reset = false;
+        if let Some((_, receiver)) = &self.channels {
+            for im in receiver.try_iter() {
+                match im {
+                    InternalMessage::RangeMessage(RangePerDoc { uri, ranges }) => {
+                        self.occurrences.insert(uri, ranges);
+                    }
+                    InternalMessage::OnGoing(token, progress) => {
+                        self.send_progress_report(token, progress, None)?;
+                    }
+                    InternalMessage::Finished(token) => {
+                        reset = true;
+                        self.send_progress_end(token, Some("Finished.".to_string()))?;
+                    }
+                    InternalMessage::Cancelled(token) => {
+                        reset = true;
+                        self.send_progress_end(token, Some("interrupted.".to_string()))?;
+                    }
+                }
+            }
+        }
+        if reset {
+            self.channels = None;
+        }
+        Ok(reset)
+    }
+
     pub fn new_engine_state(&self) -> EngineState {
         let mut engine_state = self.engine_state.clone();
         let cwd = std::env::current_dir().expect("Could not get current working directory.");
@@ -236,17 +285,24 @@ impl LanguageServer {
         engine_state: &'a mut EngineState,
         uri: &Uri,
         pos: Position,
-    ) -> Result<(StateWorkingSet<'a>, Id, Span, usize, &FullTextDocument)> {
-        let (block, file_offset, mut working_set, file) = self
+    ) -> Result<(StateWorkingSet<'a>, Id, Span, usize)> {
+        let (block, file_offset, mut working_set) = self
             .parse_file(engine_state, uri, false)
             .ok_or_else(|| miette!("\nFailed to parse current file"))?;
 
+        let docs = match self.docs.lock() {
+            Ok(it) => it,
+            Err(err) => return Err(miette!(err.to_string())),
+        };
+        let file = docs
+            .get_document(uri)
+            .ok_or_else(|| miette!("\nFailed to get document"))?;
         let location = file.offset_at(pos) as usize + file_offset;
         let (id, span) = find_id(&block, &working_set, &location)
             .ok_or_else(|| miette!("\nFailed to find current name"))?;
         // add block to working_set for later references
         working_set.add_block(block);
-        Ok((working_set, id, span, file_offset, file))
+        Ok((working_set, id, span, file_offset))
     }
 
     pub fn parse_file<'a>(
@@ -254,9 +310,10 @@ impl LanguageServer {
         engine_state: &'a mut EngineState,
         uri: &Uri,
         need_hints: bool,
-    ) -> Option<(Arc<Block>, usize, StateWorkingSet<'a>, &FullTextDocument)> {
+    ) -> Option<(Arc<Block>, usize, StateWorkingSet<'a>)> {
         let mut working_set = StateWorkingSet::new(engine_state);
-        let file = self.docs.get_document(uri)?;
+        let docs = self.docs.lock().ok()?;
+        let file = docs.get_document(uri)?;
         let file_path = uri_to_path(uri);
         let file_path_str = file_path.to_str()?;
         let contents = file.get_content(None).as_bytes();
@@ -270,7 +327,7 @@ impl LanguageServer {
             let file_inlay_hints = self.extract_inlay_hints(&working_set, &block, offset, file);
             self.inlay_hints.insert(uri.clone(), file_inlay_hints);
         }
-        Some((block, offset, working_set, file))
+        Some((block, offset, working_set))
     }
 
     fn get_location_by_span<'a>(
@@ -285,10 +342,10 @@ impl LanguageServer {
                     return None;
                 }
                 let target_uri = path_to_uri(path);
-                if let Some(doc) = self.docs.get_document(&target_uri) {
+                if let Some(file) = self.docs.lock().ok()?.get_document(&target_uri) {
                     return Some(Location {
                         uri: target_uri,
-                        range: span_to_range(span, doc, cached_file.covered_span.start),
+                        range: span_to_range(span, file, cached_file.covered_span.start),
                     });
                 } else {
                     // in case where the document is not opened yet, typically included by `nu -I`
@@ -344,7 +401,7 @@ impl LanguageServer {
             .text_document
             .uri
             .to_owned();
-        let (working_set, id, _, _, _) = self
+        let (working_set, id, _, _) = self
             .parse_and_find(
                 &mut engine_state,
                 &path_uri,
@@ -525,7 +582,8 @@ impl LanguageServer {
 
     fn complete(&mut self, params: &CompletionParams) -> Option<CompletionResponse> {
         let path_uri = params.text_document_position.text_document.uri.to_owned();
-        let file = self.docs.get_document(&path_uri)?;
+        let docs = self.docs.lock().ok()?;
+        let file = docs.get_document(&path_uri)?;
 
         let mut completer =
             NuCompleter::new(Arc::new(self.engine_state.clone()), Arc::new(Stack::new()));
diff --git a/crates/nu-lsp/src/notification.rs b/crates/nu-lsp/src/notification.rs
index 83925230be..399d1237f6 100644
--- a/crates/nu-lsp/src/notification.rs
+++ b/crates/nu-lsp/src/notification.rs
@@ -17,8 +17,8 @@ impl LanguageServer {
         &mut self,
         notification: lsp_server::Notification,
     ) -> Option<Uri> {
-        self.docs
-            .listen(notification.method.as_str(), &notification.params);
+        let mut docs = self.docs.lock().ok()?;
+        docs.listen(notification.method.as_str(), &notification.params);
         match notification.method.as_str() {
             DidOpenTextDocument::METHOD => {
                 let params: DidOpenTextDocumentParams =
@@ -57,7 +57,7 @@ impl LanguageServer {
         }
     }
 
-    fn send_progress_notification(
+    pub fn send_progress_notification(
         &self,
         token: ProgressToken,
         value: WorkDoneProgress,
@@ -74,12 +74,13 @@ impl LanguageServer {
             .into_diagnostic()
     }
 
-    pub fn send_progress_begin(&self, token: ProgressToken, title: &str) -> Result<()> {
+    pub fn send_progress_begin(&self, token: ProgressToken, title: String) -> Result<()> {
         self.send_progress_notification(
             token,
             WorkDoneProgress::Begin(WorkDoneProgressBegin {
-                title: title.to_string(),
+                title,
                 percentage: Some(0),
+                cancellable: Some(true),
                 ..Default::default()
             }),
         )
@@ -95,8 +96,8 @@ impl LanguageServer {
             token,
             WorkDoneProgress::Report(WorkDoneProgressReport {
                 message,
+                cancellable: Some(true),
                 percentage: Some(percentage),
-                ..Default::default()
             }),
         )
     }
diff --git a/crates/nu-lsp/src/symbols.rs b/crates/nu-lsp/src/symbols.rs
index 604c867e01..625a0250d3 100644
--- a/crates/nu-lsp/src/symbols.rs
+++ b/crates/nu-lsp/src/symbols.rs
@@ -272,7 +272,8 @@ impl LanguageServer {
     ) -> Option<DocumentSymbolResponse> {
         let engine_state = self.new_engine_state();
         let uri = params.text_document.uri.to_owned();
-        self.symbol_cache.update(&uri, &engine_state, &self.docs);
+        let docs = self.docs.lock().ok()?;
+        self.symbol_cache.update(&uri, &engine_state, &docs);
         Some(DocumentSymbolResponse::Flat(
             self.symbol_cache.get_symbols_by_uri(&uri)?,
         ))
@@ -284,7 +285,8 @@ impl LanguageServer {
     ) -> Option<WorkspaceSymbolResponse> {
         if self.symbol_cache.any_dirty() {
             let engine_state = self.new_engine_state();
-            self.symbol_cache.update_all(&engine_state, &self.docs);
+            let docs = self.docs.lock().ok()?;
+            self.symbol_cache.update_all(&engine_state, &docs);
         }
         Some(WorkspaceSymbolResponse::Flat(
             self.symbol_cache
diff --git a/crates/nu-lsp/src/workspace.rs b/crates/nu-lsp/src/workspace.rs
index f3ac318a2d..8161719e61 100644
--- a/crates/nu-lsp/src/workspace.rs
+++ b/crates/nu-lsp/src/workspace.rs
@@ -4,11 +4,13 @@ use std::{
     collections::{BTreeMap, HashMap},
     fs,
     path::{Path, PathBuf},
+    sync::Arc,
 };
 
 use crate::{
     ast::find_reference_by_id, path_to_uri, span_to_range, uri_to_path, Id, LanguageServer,
 };
+use crossbeam_channel::{Receiver, Sender};
 use lsp_server::{Message, Request, Response};
 use lsp_types::{
     Location, PrepareRenameResponse, ProgressToken, Range, ReferenceParams, RenameParams,
@@ -16,9 +18,75 @@ use lsp_types::{
 };
 use miette::{miette, IntoDiagnostic, Result};
 use nu_glob::{glob, Paths};
-use nu_protocol::{engine::StateWorkingSet, Span};
+use nu_protocol::{
+    engine::{EngineState, StateWorkingSet},
+    Span,
+};
 use serde_json::Value;
 
+/// Message type indicating ranges of interest in each doc
+#[derive(Debug)]
+pub struct RangePerDoc {
+    pub uri: Uri,
+    pub ranges: Vec<Range>,
+}
+
+/// Message sent from background thread to main
+#[derive(Debug)]
+pub enum InternalMessage {
+    RangeMessage(RangePerDoc),
+    Cancelled(ProgressToken),
+    Finished(ProgressToken),
+    OnGoing(ProgressToken, u32),
+}
+
+fn find_nu_scripts_in_folder(folder_uri: &Uri) -> Result<Paths> {
+    let path = uri_to_path(folder_uri);
+    if !path.is_dir() {
+        return Err(miette!("\nworkspace folder does not exist."));
+    }
+    let pattern = format!("{}/**/*.nu", path.to_string_lossy());
+    glob(&pattern).into_diagnostic()
+}
+
+fn find_reference_in_file(
+    working_set: &mut StateWorkingSet,
+    file: &FullTextDocument,
+    fp: &Path,
+    id: &Id,
+) -> Option<Vec<Range>> {
+    let fp_str = fp.to_str()?;
+    let block = parse(
+        working_set,
+        Some(fp_str),
+        file.get_content(None).as_bytes(),
+        false,
+    );
+    let file_span = working_set.get_span_for_filename(fp_str)?;
+    let offset = file_span.start;
+    let mut references: Vec<Span> = find_reference_by_id(&block, working_set, id);
+
+    // NOTE: for arguments whose declaration is in a signature
+    // which is not covered in the AST
+    if let Id::Variable(vid) = id {
+        let decl_span = working_set.get_variable(*vid).declaration_span;
+        if file_span.contains_span(decl_span)
+            && decl_span.end > decl_span.start
+            && !references.contains(&decl_span)
+        {
+            references.push(decl_span);
+        }
+    }
+    let occurs: Vec<Range> = references
+        .iter()
+        .map(|span| span_to_range(span, file, offset))
+        .collect();
+
+    // add_block to avoid repeated parsing
+    working_set.add_block(block);
+    (!occurs.is_empty()).then_some(occurs)
+}
+
 impl LanguageServer {
     /// get initial workspace folders from initialization response
     pub fn initialize_workspace_folders(&mut self, init_params: Value) -> Result<()> {
@@ -32,6 +100,8 @@ impl LanguageServer {
         Ok(())
     }
 
+    /// The rename request only happens after the client received a `PrepareRenameResponse`,
+    /// and a new name typed in, could happen before ranges ready for all files in the workspace folder
     pub fn rename(&mut self, params: &RenameParams) -> Option<WorkspaceEdit> {
         let new_name = params.new_name.to_owned();
         // changes in WorkspaceEdit have mutable key
@@ -59,31 +129,55 @@ impl LanguageServer {
     }
 
     /// Goto references response
-    /// TODO: WorkDoneProgress -> PartialResults
-    pub fn references(&mut self, params: &ReferenceParams) -> Option<Vec<Location>> {
+    /// # Arguments
+    /// - `timeout`: timeout in milliseconds, when timeout
+    ///    1. Respond with all ranges found so far
+    ///    2. Cancel the background thread
+    pub fn references(&mut self, params: &ReferenceParams, timeout: u128) -> Option<Vec<Location>> {
         self.occurrences = BTreeMap::new();
         let mut engine_state = self.new_engine_state();
         let path_uri = params.text_document_position.text_document.uri.to_owned();
-        let (mut working_set, id, span, _, _) = self
+        let (working_set, id, span, _) = self
             .parse_and_find(
                 &mut engine_state,
                 &path_uri,
                 params.text_document_position.position,
             )
             .ok()?;
-        self.find_reference_in_workspace(
-            &mut working_set,
-            &path_uri,
-            id,
-            span,
-            params
-                .work_done_progress_params
-                .work_done_token
-                .to_owned()
-                .unwrap_or(ProgressToken::Number(1)),
-            "Finding references ...",
-        )
-        .ok()?;
+        // have to clone it again in order to move to another thread
+        let mut engine_state = self.new_engine_state();
+        engine_state.merge_delta(working_set.render()).ok()?;
+        let current_workspace_folder = self.get_workspace_folder_by_uri(&path_uri)?;
+        let token = params
+            .work_done_progress_params
+            .work_done_token
+            .to_owned()
+            .unwrap_or(ProgressToken::Number(1));
+        self.channels = self
+            .find_reference_in_workspace(
+                engine_state,
+                current_workspace_folder,
+                id,
+                span,
+                token.clone(),
+                "Finding references ...".to_string(),
+            )
+            .ok();
+        // TODO: WorkDoneProgress -> PartialResults for quicker response
+        // currently not enabled by `lsp_types` but hackable in `server_capabilities` json
+        let time_start = std::time::Instant::now();
+        loop {
+            if self.handle_internal_messages().ok()? {
+                break;
+            }
+            if time_start.elapsed().as_millis() > timeout {
+                self.send_progress_end(token, Some("Timeout".to_string()))
+                    .ok()?;
+                self.cancel_background_thread();
+                self.channels = None;
+                break;
+            }
+        }
         Some(
             self.occurrences
                 .iter()
@@ -108,7 +202,7 @@ impl LanguageServer {
         let mut engine_state = self.new_engine_state();
         let path_uri = params.text_document.uri.to_owned();
 
-        let (mut working_set, id, span, file_offset, file) =
+        let (working_set, id, span, file_offset) =
             self.parse_and_find(&mut engine_state, &path_uri, params.position)?;
 
         if let Id::Value(_) = id {
@@ -119,6 +213,14 @@ impl LanguageServer {
                 "\nDefinition not found.\nNot allowed to rename built-ins."
             ));
         }
+
+        let docs = match self.docs.lock() {
+            Ok(it) => it,
+            Err(err) => return Err(miette!(err.to_string())),
+        };
+        let file = docs
+            .get_document(&path_uri)
+            .ok_or_else(|| miette!("\nFailed to get document"))?;
         let range = span_to_range(&span, file, file_offset);
         let response = PrepareRenameResponse::Range(range);
         self.connection
@@ -130,94 +232,112 @@ impl LanguageServer {
             }))
             .into_diagnostic()?;
 
+        // have to clone it again in order to move to another thread
+        let mut engine_state = self.new_engine_state();
+        engine_state
+            .merge_delta(working_set.render())
+            .into_diagnostic()?;
+        let current_workspace_folder = self
+            .get_workspace_folder_by_uri(&path_uri)
+            .ok_or_else(|| miette!("\nCurrent file is not in any workspace"))?;
         // now continue parsing on other files in the workspace
-        self.find_reference_in_workspace(
-            &mut working_set,
-            &path_uri,
-            id,
-            span,
-            ProgressToken::Number(0),
-            "Preparing rename ...",
-        )
+        self.channels = self
+            .find_reference_in_workspace(
+                engine_state,
+                current_workspace_folder,
+                id,
+                span,
+                ProgressToken::Number(0),
+                "Preparing rename ...".to_string(),
+            )
+            .ok();
+        Ok(())
     }
 
     fn find_reference_in_workspace(
-        &mut self,
-        working_set: &mut StateWorkingSet,
-        current_uri: &Uri,
+        &self,
+        engine_state: EngineState,
+        current_workspace_folder: WorkspaceFolder,
         id: Id,
         span: Span,
         token: ProgressToken,
-        message: &str,
-    ) -> Result<()> {
-        let current_workspace_folder = self
-            .get_workspace_folder_by_uri(current_uri)
-            .ok_or_else(|| miette!("\nCurrent file is not in any workspace"))?;
-        let scripts: Vec<PathBuf> = Self::find_nu_scripts_in_folder(&current_workspace_folder.uri)?
-            .filter_map(|p| p.ok())
-            .collect();
-        let len = scripts.len();
-
+        message: String,
+    ) -> Result<(Sender<bool>, Arc<Receiver<InternalMessage>>)> {
+        let (data_sender, data_receiver) = crossbeam_channel::unbounded::<InternalMessage>();
+        let (cancel_sender, cancel_receiver) = crossbeam_channel::bounded::<bool>(1);
+        let engine_state = Arc::new(engine_state);
+        let docs = self.docs.clone();
         self.send_progress_begin(token.clone(), message)?;
-        for (i, fp) in scripts.iter().enumerate() {
-            let uri = path_to_uri(fp);
-            if let Some(file) = self.docs.get_document(&uri) {
-                Self::find_reference_in_file(working_set, file, fp, &id)
-            } else {
-                let bytes = fs::read(fp).into_diagnostic()?;
-                // skip if the file does not contain what we're looking for
-                let content_string = String::from_utf8(bytes).into_diagnostic()?;
-                let text_to_search =
-                    String::from_utf8(working_set.get_span_contents(span).to_vec())
-                        .into_diagnostic()?;
-                if !content_string.contains(&text_to_search) {
-                    continue;
+
+        std::thread::spawn(move || -> Result<()> {
+            let mut working_set = StateWorkingSet::new(&engine_state);
+            let scripts: Vec<PathBuf> =
+                match find_nu_scripts_in_folder(&current_workspace_folder.uri) {
+                    Ok(it) => it,
+                    Err(_) => {
+                        data_sender
+                            .send(InternalMessage::Cancelled(token.clone()))
+                            .ok();
+                        return Ok(());
+                    }
                 }
-                let temp_file = FullTextDocument::new("nu".to_string(), 0, content_string);
-                Self::find_reference_in_file(working_set, &temp_file, fp, &id)
+                .filter_map(|p| p.ok())
+                .collect();
+            let len = scripts.len();
+
+            for (i, fp) in scripts.iter().enumerate() {
+                // std::thread::sleep(std::time::Duration::from_millis(500));
+                // cancel the loop on cancellation message from main thread
+                if cancel_receiver.try_recv().is_ok() {
+                    data_sender
+                        .send(InternalMessage::Cancelled(token.clone()))
+                        .into_diagnostic()?;
+                    return Ok(());
+                }
+                let percentage = (i * 100 / len) as u32;
+                let uri = path_to_uri(fp);
+                let docs = match docs.lock() {
+                    Ok(it) => it,
+                    Err(err) => return Err(miette!(err.to_string())),
+                };
+                let file = if let Some(file) = docs.get_document(&uri) {
+                    file
+                } else {
+                    let bytes = match fs::read(fp) {
+                        Ok(it) => it,
+                        Err(_) => {
+                            // continue on fs error
+                            continue;
+                        }
+                    };
+                    // skip if the file does not contain what we're looking for
+                    let content_string = String::from_utf8_lossy(&bytes);
+                    let text_to_search =
+                        String::from_utf8_lossy(working_set.get_span_contents(span));
+                    if !content_string.contains(text_to_search.as_ref()) {
+                        // progress without any data
+                        data_sender
+                            .send(InternalMessage::OnGoing(token.clone(), percentage))
+                            .into_diagnostic()?;
+                        continue;
+                    }
+                    &FullTextDocument::new("nu".to_string(), 0, content_string.into())
+                };
+                let _ = find_reference_in_file(&mut working_set, file, fp, &id).map(|ranges| {
+                    data_sender
+                        .send(InternalMessage::RangeMessage(RangePerDoc { uri, ranges }))
+                        .ok();
+                    data_sender
+                        .send(InternalMessage::OnGoing(token.clone(), percentage))
+                        .ok();
+                });
             }
-            .and_then(|range| self.occurrences.insert(uri, range));
-            self.send_progress_report(token.clone(), (i * 100 / len) as u32, None)?
-        }
-        self.send_progress_end(token.clone(), Some("Done".to_string()))
-    }
-
-    fn find_reference_in_file(
-        working_set: &mut StateWorkingSet,
-        file: &FullTextDocument,
-        fp: &Path,
-        id: &Id,
-    ) -> Option<Vec<Range>> {
-        let fp_str = fp.to_str()?;
-        let block = parse(
-            working_set,
-            Some(fp_str),
-            file.get_content(None).as_bytes(),
-            false,
-        );
-        let file_span = working_set.get_span_for_filename(fp_str)?;
-        let offset = file_span.start;
-        let mut references: Vec<Span> = find_reference_by_id(&block, working_set, id);
-
-        // NOTE: for arguments whose declaration is in a signature
-        // which is not covered in the AST
-        if let Id::Variable(vid) = id {
-            let decl_span = working_set.get_variable(*vid).declaration_span;
-            if file_span.contains_span(decl_span)
-                && decl_span.end > decl_span.start
-                && !references.contains(&decl_span)
-            {
-                references.push(decl_span);
-            }
-        }
-        let occurs: Vec<Range> = references
-            .iter()
-            .map(|span| span_to_range(span, file, offset))
-            .collect();
-
-        // add_block to avoid repeated parsing
-        working_set.add_block(block);
-        (!occurs.is_empty()).then_some(occurs)
+            data_sender
+                .send(InternalMessage::Finished(token.clone()))
+                .into_diagnostic()?;
+            Ok(())
+        });
+        Ok((cancel_sender, Arc::new(data_receiver)))
     }
 
     fn get_workspace_folder_by_uri(&self, uri: &Uri) -> Option<WorkspaceFolder> {
@@ -231,15 +351,6 @@ impl LanguageServer {
             })
             .cloned()
     }
-
-    fn find_nu_scripts_in_folder(folder_uri: &Uri) -> Result<Paths> {
-        let path = uri_to_path(folder_uri);
-        if !path.is_dir() {
-            return Err(miette!("\nworkspace folder does not exist."));
-        }
-        let pattern = format!("{}/**/*.nu", path.to_string_lossy());
-        glob(&pattern).into_diagnostic()
-    }
 }
 
 #[cfg(test)]
@@ -525,7 +636,7 @@ mod tests {
 
         open_unchecked(&client_connection, script.clone());
 
-        let message_num = 4;
+        let message_num = 5;
         let messages =
             send_rename_prepare_request(&client_connection, script.clone(), 3, 5, message_num);
         assert_eq!(messages.len(), message_num);

From 500cd35ad2d4d9a5fc5e0d551622e2ba78640b37 Mon Sep 17 00:00:00 2001
From: Solomon <git@solomonvictorino.com>
Date: Sun, 19 Jan 2025 14:46:48 -0700
Subject: [PATCH 0935/1072] update uutils crates to `0.0.29` (#14867)

Closes #13082, closes #13508
---
 Cargo.lock | 41 +++++++++++++++++++++--------------------
 Cargo.toml | 16 ++++++++--------
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8bbc01b159..a9c9ca4992 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7876,9 +7876,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uu_cp"
-version = "0.0.28"
+version = "0.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0eff79f5eacf6bb88c9afc19f3cec2ab14ad31317be1369100658b46d41e410"
+checksum = "235439f8efcff799cbdb90992cb5b1845dce903c1569efc8d9b46417c83f5aa8"
 dependencies = [
  "clap",
  "filetime",
@@ -7892,9 +7892,9 @@ dependencies = [
 
 [[package]]
 name = "uu_mkdir"
-version = "0.0.28"
+version = "0.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feba7cf875eecbb746b1c5a5a8a031ab3a00e5f44f5441643a06b78577780d3a"
+checksum = "ea0a30620d88a7ea16b522e1fe63ebb61f87f05fd63ade00938a024807356952"
 dependencies = [
  "clap",
  "uucore",
@@ -7902,9 +7902,9 @@ dependencies = [
 
 [[package]]
 name = "uu_mktemp"
-version = "0.0.28"
+version = "0.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a9cfd389f60e667c5ee6659beaad50bada7e710d76082c7d77ab91e04307c8f"
+checksum = "e1db7648ff064cdfe8a0e6ef9546de3b03e34cefa270b783de7736a8470473cc"
 dependencies = [
  "clap",
  "rand",
@@ -7914,9 +7914,9 @@ dependencies = [
 
 [[package]]
 name = "uu_mv"
-version = "0.0.28"
+version = "0.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf932231fccdf108f75443bab0ce17acfe49b5825d731b8a358251833be7da20"
+checksum = "92ab8c17ac7153adaa0176924319827cfb240cf48e4260283facfdb37e776071"
 dependencies = [
  "clap",
  "fs_extra",
@@ -7926,9 +7926,9 @@ dependencies = [
 
 [[package]]
 name = "uu_touch"
-version = "0.0.28"
+version = "0.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55476bec11d5b70c578233a2e94f685058e0d65fc5d66c7ed465877c15124c7c"
+checksum = "3adc774c7961272cd2feeb95f2bf2e0b8f7b8ccd5fbcf49727d0de1eab804b67"
 dependencies = [
  "chrono",
  "clap",
@@ -7940,9 +7940,9 @@ dependencies = [
 
 [[package]]
 name = "uu_uname"
-version = "0.0.28"
+version = "0.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "182b4071a2e6f7288cbbc1b1ff05c74e9dc7527b4735583d9e3cd92802b06910"
+checksum = "95a942626aec03d4f4d972b10e00f9ddcdced1933658076eccafea5a20fdafb8"
 dependencies = [
  "clap",
  "platform-info",
@@ -7951,9 +7951,9 @@ dependencies = [
 
 [[package]]
 name = "uu_whoami"
-version = "0.0.28"
+version = "0.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d15200414428c65f95d0b1d1226fc84f74ae80376bfe59959d93ddf57f944f5"
+checksum = "a812f7a838c9375c15ed13b66048df2c632c1ac3ec613dabb28c648019c6d018"
 dependencies = [
  "clap",
  "libc",
@@ -7963,13 +7963,14 @@ dependencies = [
 
 [[package]]
 name = "uucore"
-version = "0.0.28"
+version = "0.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04ea43050c46912575654c5181f4135529e8d4003fca80803af10cdef3ca6412"
+checksum = "50e0dc1598d959a08f24cea4d9e992f7ca874bd4ac80746683272afd37603b5e"
 dependencies = [
  "clap",
  "dunce",
  "glob",
+ "lazy_static",
  "libc",
  "nix 0.29.0",
  "number_prefix",
@@ -7985,9 +7986,9 @@ dependencies = [
 
 [[package]]
 name = "uucore_procs"
-version = "0.0.28"
+version = "0.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d91d598cf92275d9373e1eb0b9dcf85b730bde48186ed7db3bde713803090511"
+checksum = "27d3de33ab2b56c0437cca084a2aeb1d46c56d138ab6341c009a90018a9a1c5f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7996,9 +7997,9 @@ dependencies = [
 
 [[package]]
 name = "uuhelp_parser"
-version = "0.0.28"
+version = "0.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b4d8c991cc252d4b4ea2958d0d842e36af0d1ca7f1fdc4fdce8fd0a2ff6e9c"
+checksum = "0cf4c8b31abfb5dc79940d6ca8000a1a6aa42f38711cdeaacb95850c69924cbc"
 
 [[package]]
 name = "uuid"
diff --git a/Cargo.toml b/Cargo.toml
index c9614ba5b1..18042e20a4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -167,14 +167,14 @@ unicode-segmentation = "1.12"
 unicode-width = "0.2"
 ureq = { version = "2.12", default-features = false }
 url = "2.2"
-uu_cp = "0.0.28"
-uu_mkdir = "0.0.28"
-uu_mktemp = "0.0.28"
-uu_mv = "0.0.28"
-uu_touch = "0.0.28"
-uu_whoami = "0.0.28"
-uu_uname = "0.0.28"
-uucore = "0.0.28"
+uu_cp = "0.0.29"
+uu_mkdir = "0.0.29"
+uu_mktemp = "0.0.29"
+uu_mv = "0.0.29"
+uu_touch = "0.0.29"
+uu_whoami = "0.0.29"
+uu_uname = "0.0.29"
+uucore = "0.0.29"
 uuid = "1.12.0"
 v_htmlescape = "0.15.0"
 wax = "0.6"

From ee84435a0eedff47f13d4a05caf05941c618ac40 Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Tue, 21 Jan 2025 03:03:03 +0800
Subject: [PATCH 0936/1072] fix(lsp): missing references in `use` command
 (#14861)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

This PR fixes the issue of the missing references in `use` command

<img width="832" alt="image"
src="https://github.com/user-attachments/assets/f67cd4b3-2e50-4dda-b2ed-c41aee86d3e9"
/>

However, as described in [this
discussion](https://github.com/nushell/nushell/discussions/14854), the
returned reference list is still not complete due to the inconsistent
IDs.

As a side effect, `hover/goto def` now also works on the `use` command
arguments

<img width="752" alt="image"
src="https://github.com/user-attachments/assets/e0abdc9e-097a-44c2-9084-8d7905ae1d5e"
/>

Actions including `goto def/hover/references/rename` now work with
module (maybe some edge cases of `overlay` are not covered)

<img width="571" alt="image"
src="https://github.com/user-attachments/assets/b4edb9b7-1540-4c52-bf8b-145bc6a1ad4a"
/>

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->


# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

Added
1. the test for heavy requests cancellation.
2. expected Edit for the missing ref of `use` to the existing rename
test.
3. `goto/hover` on module name


# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-lsp/src/ast.rs              | 339 +++++++++++++++++++-------
 crates/nu-lsp/src/goto.rs             |  62 +++++
 crates/nu-lsp/src/hints.rs            |  23 +-
 crates/nu-lsp/src/lib.rs              |  82 +++++--
 crates/nu-lsp/src/workspace.rs        | 118 +++++++--
 tests/fixtures/lsp/goto/module.nu     |   4 +
 tests/fixtures/lsp/goto/use_module.nu |   1 +
 7 files changed, 490 insertions(+), 139 deletions(-)
 create mode 100644 tests/fixtures/lsp/goto/module.nu
 create mode 100644 tests/fixtures/lsp/goto/use_module.nu

diff --git a/crates/nu-lsp/src/ast.rs b/crates/nu-lsp/src/ast.rs
index ad53f57f9d..bee0c007f3 100644
--- a/crates/nu-lsp/src/ast.rs
+++ b/crates/nu-lsp/src/ast.rs
@@ -1,36 +1,35 @@
-use std::sync::Arc;
-
 use nu_protocol::{
     ast::{
         Argument, Block, Call, Expr, Expression, ExternalArgument, ListItem, MatchPattern, Pattern,
         PipelineRedirection, RecordItem,
     },
     engine::StateWorkingSet,
-    DeclId, Span,
+    Span,
 };
+use std::{path::PathBuf, sync::Arc};
 
 use crate::Id;
 
 /// similar to flatten_block, but allows extra map function
-pub fn ast_flat_map<T, E>(
-    ast: &Arc<Block>,
-    working_set: &StateWorkingSet,
-    extra_args: &E,
-    f_special: fn(&Expression, &StateWorkingSet, &E) -> Option<Vec<T>>,
-) -> Vec<T> {
+pub fn ast_flat_map<'a, T, F>(
+    ast: &'a Arc<Block>,
+    working_set: &'a StateWorkingSet,
+    f_special: &F,
+) -> Vec<T>
+where
+    F: Fn(&'a Expression) -> Option<Vec<T>>,
+{
     ast.pipelines
         .iter()
         .flat_map(|pipeline| {
             pipeline.elements.iter().flat_map(|element| {
-                expr_flat_map(&element.expr, working_set, extra_args, f_special)
+                expr_flat_map(&element.expr, working_set, f_special)
                     .into_iter()
                     .chain(
                         element
                             .redirection
                             .as_ref()
-                            .map(|redir| {
-                                redirect_flat_map(redir, working_set, extra_args, f_special)
-                            })
+                            .map(|redir| redirect_flat_map(redir, working_set, f_special))
                             .unwrap_or_default(),
                     )
             })
@@ -43,24 +42,26 @@ pub fn ast_flat_map<T, E>(
 ///
 /// # Arguments
 /// * `f_special` - function that overrides the default behavior
-pub fn expr_flat_map<T, E>(
-    expr: &Expression,
-    working_set: &StateWorkingSet,
-    extra_args: &E,
-    f_special: fn(&Expression, &StateWorkingSet, &E) -> Option<Vec<T>>,
-) -> Vec<T> {
+pub fn expr_flat_map<'a, T, F>(
+    expr: &'a Expression,
+    working_set: &'a StateWorkingSet,
+    f_special: &F,
+) -> Vec<T>
+where
+    F: Fn(&'a Expression) -> Option<Vec<T>>,
+{
     // behavior overridden by f_special
-    if let Some(vec) = f_special(expr, working_set, extra_args) {
+    if let Some(vec) = f_special(expr) {
         return vec;
     }
-    let recur = |expr| expr_flat_map(expr, working_set, extra_args, f_special);
+    let recur = |expr| expr_flat_map(expr, working_set, f_special);
     match &expr.expr {
         Expr::RowCondition(block_id)
         | Expr::Subexpression(block_id)
         | Expr::Block(block_id)
         | Expr::Closure(block_id) => {
             let block = working_set.get_block(block_id.to_owned());
-            ast_flat_map(block, working_set, extra_args, f_special)
+            ast_flat_map(block, working_set, f_special)
         }
         Expr::Range(range) => [&range.from, &range.next, &range.to]
             .iter()
@@ -88,7 +89,7 @@ pub fn expr_flat_map<T, E>(
         Expr::MatchBlock(matches) => matches
             .iter()
             .flat_map(|(pattern, expr)| {
-                match_pattern_flat_map(pattern, working_set, extra_args, f_special)
+                match_pattern_flat_map(pattern, working_set, f_special)
                     .into_iter()
                     .chain(recur(expr))
             })
@@ -124,14 +125,16 @@ pub fn expr_flat_map<T, E>(
 }
 
 /// flat_map on match patterns
-fn match_pattern_flat_map<T, E>(
-    pattern: &MatchPattern,
-    working_set: &StateWorkingSet,
-    extra_args: &E,
-    f_special: fn(&Expression, &StateWorkingSet, &E) -> Option<Vec<T>>,
-) -> Vec<T> {
-    let recur = |expr| expr_flat_map(expr, working_set, extra_args, f_special);
-    let recur_match = |p| match_pattern_flat_map(p, working_set, extra_args, f_special);
+fn match_pattern_flat_map<'a, T, F>(
+    pattern: &'a MatchPattern,
+    working_set: &'a StateWorkingSet,
+    f_special: &F,
+) -> Vec<T>
+where
+    F: Fn(&'a Expression) -> Option<Vec<T>>,
+{
+    let recur = |expr| expr_flat_map(expr, working_set, f_special);
+    let recur_match = |p| match_pattern_flat_map(p, working_set, f_special);
     match &pattern.pattern {
         Pattern::Expression(expr) => recur(expr),
         Pattern::List(patterns) | Pattern::Or(patterns) => {
@@ -146,13 +149,15 @@ fn match_pattern_flat_map<T, E>(
 }
 
 /// flat_map on redirections
-fn redirect_flat_map<T, E>(
-    redir: &PipelineRedirection,
-    working_set: &StateWorkingSet,
-    extra_args: &E,
-    f_special: fn(&Expression, &StateWorkingSet, &E) -> Option<Vec<T>>,
-) -> Vec<T> {
-    let recur = |expr| expr_flat_map(expr, working_set, extra_args, f_special);
+fn redirect_flat_map<'a, T, F>(
+    redir: &'a PipelineRedirection,
+    working_set: &'a StateWorkingSet,
+    f_special: &F,
+) -> Vec<T>
+where
+    F: Fn(&'a Expression) -> Option<Vec<T>>,
+{
+    let recur = |expr| expr_flat_map(expr, working_set, f_special);
     match redir {
         PipelineRedirection::Single { target, .. } => target.expr().map(recur).unwrap_or_default(),
         PipelineRedirection::Separate { out, err } => [out, err]
@@ -163,6 +168,19 @@ fn redirect_flat_map<T, E>(
     }
 }
 
+/// Adjust span if quoted
+fn strip_quotes(span: Span, working_set: &StateWorkingSet) -> Span {
+    let text = String::from_utf8_lossy(working_set.get_span_contents(span));
+    if text.len() > 1
+        && ((text.starts_with('"') && text.ends_with('"'))
+            || (text.starts_with('\'') && text.ends_with('\'')))
+    {
+        Span::new(span.start.saturating_add(1), span.end.saturating_sub(1))
+    } else {
+        span
+    }
+}
+
 /// For situations like
 /// ```nushell
 /// def foo [] {}
@@ -171,22 +189,21 @@ fn redirect_flat_map<T, E>(
 /// `def` is an internal call with name/signature/closure as its arguments
 ///
 /// # Arguments
-/// - `location`: None if no `contains` check required, typically when we want to compare the `decl_id` directly
+/// - `location`: None if no `contains` check required
+/// - `id`: None if no id equal check required
 fn try_find_id_in_def(
     call: &Call,
     working_set: &StateWorkingSet,
     location: Option<&usize>,
+    id_ref: Option<&Id>,
 ) -> Option<(Id, Span)> {
-    let call_name = String::from_utf8(working_set.get_span_contents(call.head).to_vec()).ok()?;
-    if !(call_name == "def" || call_name == "export def") {
+    let call_name = working_set.get_span_contents(call.head);
+    if call_name != "def".as_bytes() && call_name != "export def".as_bytes() {
         return None;
     };
     let mut span = None;
     for arg in call.arguments.iter() {
-        if location
-            .map(|pos| arg.span().contains(*pos))
-            .unwrap_or(true)
-        {
+        if location.map_or(true, |pos| arg.span().contains(*pos)) {
             // String means this argument is the name
             if let Argument::Positional(expr) = arg {
                 if let Expr::String(_) = &expr.expr {
@@ -201,30 +218,180 @@ fn try_find_id_in_def(
             }
         }
     }
-    let mut span = span?;
-    // adjust span if quoted
-    let text = String::from_utf8(working_set.get_span_contents(span).to_vec()).ok()?;
-    if text.len() > 1
-        && ((text.starts_with('"') && text.ends_with('"'))
-            || (text.starts_with('\'') && text.ends_with('\'')))
-    {
-        span = Span::new(span.start.saturating_add(1), span.end.saturating_sub(1));
+    let span = strip_quotes(span?, working_set);
+    let name = working_set.get_span_contents(span);
+    let decl_id = Id::Declaration(working_set.find_decl(name)?);
+    id_ref
+        .map_or(true, |id_r| decl_id == *id_r)
+        .then_some((decl_id, span))
+}
+
+/// For situations like
+/// ```nushell
+/// module foo {}
+///       # |__________ location
+/// ```
+/// `module` is an internal call with name/signature/closure as its arguments
+///
+/// # Arguments
+/// - `location`: None if no `contains` check required
+/// - `id`: None if no id equal check required
+fn try_find_id_in_mod(
+    call: &Call,
+    working_set: &StateWorkingSet,
+    location: Option<&usize>,
+    id_ref: Option<&Id>,
+) -> Option<(Id, Span)> {
+    let call_name = working_set.get_span_contents(call.head);
+    if call_name != "module".as_bytes() && call_name != "export module".as_bytes() {
+        return None;
+    };
+    let check_location = |span: &Span| location.map_or(true, |pos| span.contains(*pos));
+
+    call.arguments.first().and_then(|arg| {
+        if !check_location(&arg.span()) {
+            return None;
+        }
+        match arg {
+            Argument::Positional(expr) => {
+                let name = expr.as_string()?;
+                let module_id = working_set.find_module(name.as_bytes())?;
+                let found_id = Id::Module(module_id);
+                let found_span = strip_quotes(arg.span(), working_set);
+                id_ref
+                    .map_or(true, |id_r| found_id == *id_r)
+                    .then_some((found_id, found_span))
+            }
+            _ => None,
+        }
+    })
+}
+
+/// Find id in use command
+/// `use foo.nu bar` or `use foo.nu [bar baz]`
+/// NOTE: `call.parser_info` contains a 'import_pattern' field for `use` commands,
+/// but sometimes it is missing, so fall back to `call_name == "use"` here.
+/// One drawback is that the `module_id` is harder to get
+///
+/// # Arguments
+/// - `location`: None if no `contains` check required
+/// - `id`: None if no id equal check required
+fn try_find_id_in_use(
+    call: &Call,
+    working_set: &StateWorkingSet,
+    location: Option<&usize>,
+    id: Option<&Id>,
+) -> Option<(Id, Span)> {
+    let call_name = working_set.get_span_contents(call.head);
+    if call_name != "use".as_bytes() {
+        return None;
     }
-    let call_span = call.span();
-    // find decl_ids whose span is covered by the `def` call
-    let mut matched_ids: Vec<(Id, Span)> = (0..working_set.num_decls())
-        .filter_map(|id| {
-            let decl_id = DeclId::new(id);
-            let block_id = working_set.get_decl(decl_id).block_id()?;
-            let decl_span = working_set.get_block(block_id).span?;
-            // find those within the `def` call
-            call_span
-                .contains_span(decl_span)
-                .then_some((Id::Declaration(decl_id), decl_span))
+    let find_by_name = |name: &str| {
+        match id {
+            Some(Id::Variable(var_id_ref)) => {
+                if let Some(var_id) = working_set.find_variable(name.as_bytes()) {
+                    if var_id == *var_id_ref {
+                        return Some(Id::Variable(var_id));
+                    }
+                }
+            }
+            Some(Id::Declaration(decl_id_ref)) => {
+                if let Some(decl_id) = working_set.find_decl(name.as_bytes()) {
+                    if decl_id == *decl_id_ref {
+                        return Some(Id::Declaration(decl_id));
+                    }
+                }
+            }
+            Some(Id::Module(module_id_ref)) => {
+                if let Some(module_id) = working_set.find_module(name.as_bytes()) {
+                    if module_id == *module_id_ref {
+                        return Some(Id::Module(module_id));
+                    }
+                }
+            }
+            None => {
+                if let Some(var_id) = working_set.find_variable(name.as_bytes()) {
+                    return Some(Id::Variable(var_id));
+                }
+                if let Some(decl_id) = working_set.find_decl(name.as_bytes()) {
+                    return Some(Id::Declaration(decl_id));
+                }
+                if let Some(module_id) = working_set.find_module(name.as_bytes()) {
+                    return Some(Id::Module(module_id));
+                }
+            }
+            _ => (),
+        }
+        None
+    };
+    let check_location = |span: &Span| location.map_or(true, |pos| span.contains(*pos));
+    let get_module_id = |span: Span| {
+        let span = strip_quotes(span, working_set);
+        let name = String::from_utf8_lossy(working_set.get_span_contents(span));
+        let path = PathBuf::from(name.as_ref());
+        let stem = path.file_stem().and_then(|fs| fs.to_str()).unwrap_or(&name);
+        let module_id = working_set.find_module(stem.as_bytes())?;
+        let found_id = Id::Module(module_id);
+        id.map_or(true, |id_r| found_id == *id_r)
+            .then_some((found_id, span))
+    };
+
+    // Get module id if required
+    let module_name = call.arguments.first()?;
+    let span = module_name.span();
+    if let Some(Id::Module(_)) = id {
+        // still need to check the second argument
+        if let Some(res) = get_module_id(span) {
+            return Some(res);
+        }
+    }
+    if let Some(pos) = location {
+        if span.contains(*pos) {
+            return get_module_id(span);
+        }
+    }
+
+    let search_in_list_items = |items: &Vec<ListItem>| {
+        items.iter().find_map(|item| {
+            let item_expr = item.expr();
+            check_location(&item_expr.span)
+                .then_some(item_expr)
+                .and_then(|e| {
+                    let name = e.as_string()?;
+                    Some((
+                        find_by_name(&name)?,
+                        strip_quotes(item_expr.span, working_set),
+                    ))
+                })
         })
-        .collect();
-    matched_ids.sort_by_key(|(_, s)| s.start);
-    matched_ids.first().cloned().map(|(id, _)| (id, span))
+    };
+
+    // the imported name is always at the second argument
+    if let Argument::Positional(expr) = call.arguments.get(1)? {
+        if check_location(&expr.span) {
+            match &expr.expr {
+                Expr::String(name) => {
+                    if let Some(id) = find_by_name(name) {
+                        return Some((id, strip_quotes(expr.span, working_set)));
+                    }
+                }
+                Expr::List(items) => {
+                    if let Some(res) = search_in_list_items(items) {
+                        return Some(res);
+                    }
+                }
+                Expr::FullCellPath(fcp) => {
+                    if let Expr::List(items) = &fcp.head.expr {
+                        if let Some(res) = search_in_list_items(items) {
+                            return Some(res);
+                        }
+                    }
+                }
+                _ => (),
+            }
+        }
+    }
+    None
 }
 
 fn find_id_in_expr(
@@ -255,10 +422,12 @@ fn find_id_in_expr(
             if call.head.contains(*location) {
                 Some(vec![(Id::Declaration(call.decl_id), call.head)])
             } else {
-                try_find_id_in_def(call, working_set, Some(location)).map(|p| vec![p])
+                try_find_id_in_def(call, working_set, Some(location), None)
+                    .or(try_find_id_in_mod(call, working_set, Some(location), None))
+                    .or(try_find_id_in_use(call, working_set, Some(location), None))
+                    .map(|p| vec![p])
             }
         }
-        // TODO: module id of `use`
         Expr::Overlay(Some(module_id)) => Some(vec![(Id::Module(*module_id), span)]),
         // terminal value expressions
         Expr::Bool(_)
@@ -284,18 +453,17 @@ pub fn find_id(
     working_set: &StateWorkingSet,
     location: &usize,
 ) -> Option<(Id, Span)> {
-    ast_flat_map(ast, working_set, location, find_id_in_expr)
-        .first()
-        .cloned()
+    let closure = |e| find_id_in_expr(e, working_set, location);
+    ast_flat_map(ast, working_set, &closure).first().cloned()
 }
 
-// TODO: module id support
 fn find_reference_by_id_in_expr(
     expr: &Expression,
     working_set: &StateWorkingSet,
     id: &Id,
 ) -> Option<Vec<Span>> {
-    let recur = |expr| expr_flat_map(expr, working_set, id, find_reference_by_id_in_expr);
+    let closure = |e| find_reference_by_id_in_expr(e, working_set, id);
+    let recur = |expr| expr_flat_map(expr, working_set, &closure);
     match (&expr.expr, id) {
         (Expr::Var(vid1), Id::Variable(vid2)) if *vid1 == *vid2 => Some(vec![Span::new(
             // we want to exclude the `$` sign for renaming
@@ -303,21 +471,26 @@ fn find_reference_by_id_in_expr(
             expr.span.end,
         )]),
         (Expr::VarDecl(vid1), Id::Variable(vid2)) if *vid1 == *vid2 => Some(vec![expr.span]),
-        (Expr::Call(call), Id::Declaration(decl_id)) => {
+        // also interested in `var_id` in call.arguments of `use` command
+        // and `module_id` in `module` command
+        (Expr::Call(call), _) => {
             let mut occurs: Vec<Span> = call
                 .arguments
                 .iter()
                 .filter_map(|arg| arg.expr())
                 .flat_map(recur)
                 .collect();
-            if *decl_id == call.decl_id {
-                occurs.push(call.head);
-            }
-            if let Some((id_found, span_found)) = try_find_id_in_def(call, working_set, None) {
-                if id_found == *id {
-                    occurs.push(span_found);
+            if let Id::Declaration(decl_id) = id {
+                if *decl_id == call.decl_id {
+                    occurs.push(call.head);
                 }
             }
+            if let Some((_, span_found)) = try_find_id_in_def(call, working_set, None, Some(id))
+                .or(try_find_id_in_mod(call, working_set, None, Some(id)))
+                .or(try_find_id_in_use(call, working_set, None, Some(id)))
+            {
+                occurs.push(span_found);
+            }
             Some(occurs)
         }
         _ => None,
@@ -325,5 +498,7 @@ fn find_reference_by_id_in_expr(
 }
 
 pub fn find_reference_by_id(ast: &Arc<Block>, working_set: &StateWorkingSet, id: &Id) -> Vec<Span> {
-    ast_flat_map(ast, working_set, id, find_reference_by_id_in_expr)
+    ast_flat_map(ast, working_set, &|e| {
+        find_reference_by_id_in_expr(e, working_set, id)
+    })
 }
diff --git a/crates/nu-lsp/src/goto.rs b/crates/nu-lsp/src/goto.rs
index 72e576d674..a1a5527675 100644
--- a/crates/nu-lsp/src/goto.rs
+++ b/crates/nu-lsp/src/goto.rs
@@ -348,4 +348,66 @@ mod tests {
             })
         );
     }
+
+    #[test]
+    fn goto_definition_of_module() {
+        let (client_connection, _recv) = initialize_language_server(None);
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("goto");
+        script.push("module.nu");
+        let script = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script.clone());
+
+        let resp = send_goto_definition_request(&client_connection, script.clone(), 3, 15);
+        let result = if let Message::Response(response) = resp {
+            response.result
+        } else {
+            panic!()
+        };
+
+        assert_json_eq!(
+            result,
+            serde_json::json!({
+                "uri": script,
+                "range": {
+                    "start": { "line": 1, "character": 29 },
+                    "end": { "line": 1, "character": 30 }
+                }
+            })
+        );
+    }
+
+    #[test]
+    fn goto_definition_of_module_in_another_file() {
+        let (client_connection, _recv) = initialize_language_server(None);
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("goto");
+        script.push("use_module.nu");
+        let script = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script.clone());
+
+        let resp = send_goto_definition_request(&client_connection, script.clone(), 0, 23);
+        let result = if let Message::Response(response) = resp {
+            response.result
+        } else {
+            panic!()
+        };
+
+        assert_json_eq!(
+            result,
+            serde_json::json!({
+                "uri": script.to_string().replace("use_module", "module"),
+                "range": {
+                    "start": { "line": 1, "character": 29 },
+                    "end": { "line": 1, "character": 30 }
+                }
+            })
+        );
+    }
 }
diff --git a/crates/nu-lsp/src/hints.rs b/crates/nu-lsp/src/hints.rs
index 39719ad0b3..44f4ab66b7 100644
--- a/crates/nu-lsp/src/hints.rs
+++ b/crates/nu-lsp/src/hints.rs
@@ -26,17 +26,11 @@ fn type_short_name(t: &Type) -> String {
 fn extract_inlay_hints_from_expression(
     expr: &Expression,
     working_set: &StateWorkingSet,
-    extra_args: &(usize, &FullTextDocument),
+    offset: &usize,
+    file: &FullTextDocument,
 ) -> Option<Vec<InlayHint>> {
-    let (offset, file) = extra_args;
-    let recur = |expr| {
-        expr_flat_map(
-            expr,
-            working_set,
-            extra_args,
-            extract_inlay_hints_from_expression,
-        )
-    };
+    let closure = |e| extract_inlay_hints_from_expression(e, working_set, offset, file);
+    let recur = |expr| expr_flat_map(expr, working_set, &closure);
     match &expr.expr {
         Expr::BinaryOp(lhs, op, rhs) => {
             let mut hints: Vec<InlayHint> =
@@ -162,12 +156,9 @@ impl LanguageServer {
         offset: usize,
         file: &FullTextDocument,
     ) -> Vec<InlayHint> {
-        ast_flat_map(
-            block,
-            working_set,
-            &(offset, file),
-            extract_inlay_hints_from_expression,
-        )
+        ast_flat_map(block, working_set, &|e| {
+            extract_inlay_hints_from_expression(e, working_set, &offset, file)
+        })
     }
 }
 
diff --git a/crates/nu-lsp/src/lib.rs b/crates/nu-lsp/src/lib.rs
index b6759fe99e..94c3d1ff0d 100644
--- a/crates/nu-lsp/src/lib.rs
+++ b/crates/nu-lsp/src/lib.rs
@@ -409,16 +409,23 @@ impl LanguageServer {
             )
             .ok()?;
 
+        let markdown_hover = |content: String| {
+            Some(Hover {
+                contents: HoverContents::Markup(MarkupContent {
+                    kind: MarkupKind::Markdown,
+                    value: content,
+                }),
+                // TODO
+                range: None,
+            })
+        };
+
         match id {
             Id::Variable(var_id) => {
                 let var = working_set.get_variable(var_id);
-                let contents = format!("{}{}", if var.mutable { "mutable " } else { "" }, var.ty);
-
-                Some(Hover {
-                    contents: HoverContents::Scalar(lsp_types::MarkedString::String(contents)),
-                    // TODO
-                    range: None,
-                })
+                let contents =
+                    format!("{} `{}`", if var.mutable { "mutable " } else { "" }, var.ty);
+                markdown_hover(contents)
             }
             Id::Declaration(decl_id) => {
                 let decl = working_set.get_decl(decl_id);
@@ -559,24 +566,19 @@ impl LanguageServer {
                         ));
                     }
                 }
-
-                Some(Hover {
-                    contents: HoverContents::Markup(MarkupContent {
-                        kind: MarkupKind::Markdown,
-                        value: description,
-                    }),
-                    // TODO
-                    range: None,
-                })
+                markdown_hover(description)
             }
-            Id::Value(t) => {
-                Some(Hover {
-                    contents: HoverContents::Scalar(lsp_types::MarkedString::String(t.to_string())),
-                    // TODO
-                    range: None,
-                })
+            Id::Module(module_id) => {
+                let mut description = String::new();
+                for cmt_span in working_set.get_module_comments(module_id)? {
+                    description.push_str(
+                        String::from_utf8_lossy(working_set.get_span_contents(*cmt_span)).as_ref(),
+                    );
+                    description.push('\n');
+                }
+                markdown_hover(description)
             }
-            _ => None,
+            Id::Value(t) => markdown_hover(format!("`{}`", t)),
         }
     }
 
@@ -842,9 +844,7 @@ mod tests {
 
         assert_json_eq!(
             result,
-            serde_json::json!({
-                "contents": "table"
-            })
+            serde_json::json!({ "contents": { "kind": "markdown", "value": " `table`" } })
         );
     }
 
@@ -908,6 +908,36 @@ mod tests {
         );
     }
 
+    #[test]
+    fn hover_on_module() {
+        let (client_connection, _recv) = initialize_language_server(None);
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("goto");
+        script.push("module.nu");
+        let script = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script.clone());
+
+        let resp = send_hover_request(&client_connection, script.clone(), 3, 12);
+        let result = if let Message::Response(response) = resp {
+            response.result
+        } else {
+            panic!()
+        };
+
+        assert_eq!(
+            result
+                .unwrap()
+                .pointer("/contents/value")
+                .unwrap()
+                .to_string()
+                .replace("\\r", ""),
+            "\"# module doc\\n\""
+        );
+    }
+
     fn send_complete_request(
         client_connection: &Connection,
         uri: Uri,
diff --git a/crates/nu-lsp/src/workspace.rs b/crates/nu-lsp/src/workspace.rs
index 8161719e61..37eb81182c 100644
--- a/crates/nu-lsp/src/workspace.rs
+++ b/crates/nu-lsp/src/workspace.rs
@@ -286,7 +286,8 @@ impl LanguageServer {
             let len = scripts.len();
 
             for (i, fp) in scripts.iter().enumerate() {
-                // std::thread::sleep(std::time::Duration::from_millis(500));
+                #[cfg(test)]
+                std::thread::sleep(std::time::Duration::from_millis(200));
                 // cancel the loop on cancellation message from main thread
                 if cancel_receiver.try_recv().is_ok() {
                     data_sender
@@ -366,7 +367,7 @@ mod tests {
     use nu_test_support::fs::fixtures;
 
     use crate::path_to_uri;
-    use crate::tests::{initialize_language_server, open_unchecked};
+    use crate::tests::{initialize_language_server, open_unchecked, send_hover_request};
 
     fn send_reference_request(
         client_connection: &Connection,
@@ -411,6 +412,7 @@ mod tests {
         line: u32,
         character: u32,
         num: usize,
+        immediate_cancellation: bool,
     ) -> Vec<Message> {
         client_connection
             .sender
@@ -425,6 +427,11 @@ mod tests {
             }))
             .unwrap();
 
+        // use a hover request to interrupt
+        if immediate_cancellation {
+            send_hover_request(client_connection, uri.clone(), line, character);
+        }
+
         (0..num)
             .map(|_| {
                 client_connection
@@ -576,8 +583,14 @@ mod tests {
         open_unchecked(&client_connection, script.clone());
 
         let message_num = 5;
-        let messages =
-            send_rename_prepare_request(&client_connection, script.clone(), 6, 11, message_num);
+        let messages = send_rename_prepare_request(
+            &client_connection,
+            script.clone(),
+            6,
+            11,
+            message_num,
+            false,
+        );
         assert_eq!(messages.len(), message_num);
         for message in messages {
             match message {
@@ -605,15 +618,23 @@ mod tests {
                     }
                 ])
             );
-            assert_json_eq!(
-                changes[script.to_string().replace("foo", "bar")],
-                serde_json::json!([
-                       {
-                           "range": { "start": { "line": 5, "character": 4 }, "end": { "line": 5, "character": 11 } },
-                           "newText": "new"
-                       }
-                ])
-            );
+            let changs_bar = changes[script.to_string().replace("foo", "bar")]
+                .as_array()
+                .unwrap();
+            assert!(
+                changs_bar.contains(
+                &serde_json::json!({
+                    "range": { "start": { "line": 5, "character": 4 }, "end": { "line": 5, "character": 11 } },
+                    "newText": "new"
+                })
+            ));
+            assert!(
+                changs_bar.contains(
+                &serde_json::json!({
+                    "range": { "start": { "line": 0, "character": 20 }, "end": { "line": 0, "character": 27 } },
+                    "newText": "new"
+                })
+            ));
         } else {
             panic!()
         }
@@ -637,8 +658,14 @@ mod tests {
         open_unchecked(&client_connection, script.clone());
 
         let message_num = 5;
-        let messages =
-            send_rename_prepare_request(&client_connection, script.clone(), 3, 5, message_num);
+        let messages = send_rename_prepare_request(
+            &client_connection,
+            script.clone(),
+            3,
+            5,
+            message_num,
+            false,
+        );
         assert_eq!(messages.len(), message_num);
         for message in messages {
             match message {
@@ -677,4 +704,65 @@ mod tests {
             panic!()
         }
     }
+
+    #[test]
+    fn rename_cancelled() {
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("workspace");
+        let (client_connection, _recv) = initialize_language_server(Some(InitializeParams {
+            workspace_folders: Some(vec![WorkspaceFolder {
+                uri: path_to_uri(&script),
+                name: "random name".to_string(),
+            }]),
+            ..Default::default()
+        }));
+        script.push("foo.nu");
+        let script = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script.clone());
+
+        let message_num = 3;
+        let messages = send_rename_prepare_request(
+            &client_connection,
+            script.clone(),
+            6,
+            11,
+            message_num,
+            true,
+        );
+        assert_eq!(messages.len(), message_num);
+        if let Some(Message::Notification(cancel_notification)) = &messages.last() {
+            assert_json_eq!(
+                cancel_notification.params["value"],
+                serde_json::json!({ "kind": "end", "message": "interrupted." })
+            );
+        } else {
+            panic!("Progress not cancelled");
+        };
+        for message in messages {
+            match message {
+                Message::Notification(n) => assert_eq!(n.method, "$/progress"),
+                // the response of the preempting hover request
+                Message::Response(r) => assert_json_eq!(
+                    r.result,
+                    serde_json::json!({
+                            "contents": {
+                            "kind": "markdown",
+                            "value": "\n-----\n### Usage \n```nu\n  foo str {flags}\n```\n\n### Flags\n\n  `-h`, `--help` - Display the help message for this command\n\n"
+                        }
+                    }),
+                ),
+                _ => panic!("unexpected message type"),
+            }
+        }
+
+        if let Message::Response(r) = send_rename_request(&client_connection, script.clone(), 6, 11)
+        {
+            // should not return any changes
+            assert_json_eq!(r.result.unwrap()["changes"], serde_json::json!({}));
+        } else {
+            panic!()
+        }
+    }
 }
diff --git a/tests/fixtures/lsp/goto/module.nu b/tests/fixtures/lsp/goto/module.nu
new file mode 100644
index 0000000000..028045db7a
--- /dev/null
+++ b/tests/fixtures/lsp/goto/module.nu
@@ -0,0 +1,4 @@
+# module doc
+export module "module name" { }
+
+use "module name"
diff --git a/tests/fixtures/lsp/goto/use_module.nu b/tests/fixtures/lsp/goto/use_module.nu
new file mode 100644
index 0000000000..0bbc2e19a5
--- /dev/null
+++ b/tests/fixtures/lsp/goto/use_module.nu
@@ -0,0 +1 @@
+use module.nu "module name"

From b97d89adb6c13122dd2539f9ab93623d8d9e81e8 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Mon, 20 Jan 2025 17:49:07 -0500
Subject: [PATCH 0937/1072] Fix retrieval of config directory for user
 autoloads (#14877)

# Description

Fixes an issue with #14669 - I mistakenly used `dirs::config_dir()` when
it should be `nu_path::config_dir()`. This allows `XDG_CONFIG_DIR` to
specify the location properly.

# User-Facing Changes

Fix: If `XDG_CONFIG_DIR` is set, it will be used for the `autoload`
location.

# Tests + Formatting

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

N/A
---
 crates/nu-protocol/src/eval_const.rs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/crates/nu-protocol/src/eval_const.rs b/crates/nu-protocol/src/eval_const.rs
index 42bf6b4de6..b6506a7151 100644
--- a/crates/nu-protocol/src/eval_const.rs
+++ b/crates/nu-protocol/src/eval_const.rs
@@ -350,12 +350,6 @@ pub fn get_vendor_autoload_dirs(_engine_state: &EngineState) -> Vec<PathBuf> {
 pub fn get_user_autoload_dirs(_engine_state: &EngineState) -> Vec<PathBuf> {
     // User autoload directories - Currently just `autoload` in the default
     // configuration directory
-    let into_autoload_path_fn = |mut path: PathBuf| {
-        path.push("nushell");
-        path.push("autoload");
-        path
-    };
-
     let mut dirs = Vec::new();
 
     let mut append_fn = |path: PathBuf| {
@@ -364,8 +358,8 @@ pub fn get_user_autoload_dirs(_engine_state: &EngineState) -> Vec<PathBuf> {
         }
     };
 
-    if let Some(config_dir) = dirs::config_dir() {
-        append_fn(into_autoload_path_fn(config_dir));
+    if let Some(config_dir) = nu_path::nu_config_dir() {
+        append_fn(config_dir.join("autoload").into());
     }
 
     dirs

From 0e418688d4e805c81abe8ae461a45220c539176d Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Tue, 21 Jan 2025 07:35:34 -0500
Subject: [PATCH 0938/1072] Rename `fmt` to `format number` (#14875)

# Description
This PR renames `fmt` to `format number`, to bring it in line with
similar value formatting commands and make it more discoverable.


# User-Facing Changes
* The `fmt` command is now `format number`. A deprecation warning will
be thrown if you use `fmt`.


# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
N/A
---
 .../nu-cmd-extra/src/extra/conversions/fmt.rs |  78 ++---------
 crates/nu-cmd-extra/src/extra/mod.rs          |   1 +
 .../src/extra/strings/format/mod.rs           |   3 +
 .../src/extra/strings/format/number.rs        | 126 ++++++++++++++++++
 4 files changed, 143 insertions(+), 65 deletions(-)
 create mode 100644 crates/nu-cmd-extra/src/extra/strings/format/number.rs

diff --git a/crates/nu-cmd-extra/src/extra/conversions/fmt.rs b/crates/nu-cmd-extra/src/extra/conversions/fmt.rs
index 5bf2ae47a4..0626698fc6 100644
--- a/crates/nu-cmd-extra/src/extra/conversions/fmt.rs
+++ b/crates/nu-cmd-extra/src/extra/conversions/fmt.rs
@@ -1,5 +1,5 @@
-use nu_cmd_base::input_handler::{operate, CellPathOnlyArgs};
 use nu_engine::command_prelude::*;
+use nu_protocol::{report_parse_warning, ParseWarning};
 
 #[derive(Clone)]
 pub struct Fmt;
@@ -16,11 +16,11 @@ impl Command for Fmt {
     fn signature(&self) -> nu_protocol::Signature {
         Signature::build("fmt")
             .input_output_types(vec![(Type::Number, Type::record())])
-            .category(Category::Conversions)
+            .category(Category::Deprecated)
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["display", "render", "format"]
+        vec![]
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -47,72 +47,20 @@ impl Command for Fmt {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        fmt(engine_state, stack, call, input)
-    }
-}
-
-fn fmt(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
-    let args = CellPathOnlyArgs::from(cell_paths);
-    operate(action, args, input, call.head, engine_state.signals())
-}
-
-fn action(input: &Value, _args: &CellPathOnlyArgs, span: Span) -> Value {
-    match input {
-        Value::Float { val, .. } => fmt_it_64(*val, span),
-        Value::Int { val, .. } => fmt_it(*val, span),
-        Value::Filesize { val, .. } => fmt_it(val.get(), span),
-        // Propagate errors by explicitly matching them before the final case.
-        Value::Error { .. } => input.clone(),
-        other => Value::error(
-            ShellError::OnlySupportsThisInputType {
-                exp_input_type: "float, int, or filesize".into(),
-                wrong_type: other.get_type().to_string(),
-                dst_span: span,
-                src_span: other.span(),
+        let head = call.head;
+        report_parse_warning(
+            &StateWorkingSet::new(engine_state),
+            &ParseWarning::DeprecatedWarning {
+                old_command: "fmt".into(),
+                new_suggestion: "use `format number`".into(),
+                span: head,
+                url: "`help format number`".into(),
             },
-            span,
-        ),
+        );
+        crate::extra::strings::format::format_number(engine_state, stack, call, input)
     }
 }
 
-fn fmt_it(num: i64, span: Span) -> Value {
-    Value::record(
-        record! {
-            "binary" => Value::string(format!("{num:#b}"), span),
-            "debug" => Value::string(format!("{num:#?}"), span),
-            "display" => Value::string(format!("{num}"), span),
-            "lowerexp" => Value::string(format!("{num:#e}"), span),
-            "lowerhex" => Value::string(format!("{num:#x}"), span),
-            "octal" => Value::string(format!("{num:#o}"), span),
-            "upperexp" => Value::string(format!("{num:#E}"), span),
-            "upperhex" => Value::string(format!("{num:#X}"), span),
-        },
-        span,
-    )
-}
-
-fn fmt_it_64(num: f64, span: Span) -> Value {
-    Value::record(
-        record! {
-            "binary" => Value::string(format!("{:b}", num.to_bits()), span),
-            "debug" => Value::string(format!("{num:#?}"), span),
-            "display" => Value::string(format!("{num}"), span),
-            "lowerexp" => Value::string(format!("{num:#e}"), span),
-            "lowerhex" => Value::string(format!("{:0x}", num.to_bits()), span),
-            "octal" => Value::string(format!("{:0o}", num.to_bits()), span),
-            "upperexp" => Value::string(format!("{num:#E}"), span),
-            "upperhex" => Value::string(format!("{:0X}", num.to_bits()), span),
-        },
-        span,
-    )
-}
-
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/crates/nu-cmd-extra/src/extra/mod.rs b/crates/nu-cmd-extra/src/extra/mod.rs
index 0874824ac5..f2a457222a 100644
--- a/crates/nu-cmd-extra/src/extra/mod.rs
+++ b/crates/nu-cmd-extra/src/extra/mod.rs
@@ -47,6 +47,7 @@ pub fn add_extra_command_context(mut engine_state: EngineState) -> EngineState {
         bind_command!(
             strings::format::FormatPattern,
             strings::format::FormatBits,
+            strings::format::FormatNumber,
             strings::str_::case::Str,
             strings::str_::case::StrCamelCase,
             strings::str_::case::StrKebabCase,
diff --git a/crates/nu-cmd-extra/src/extra/strings/format/mod.rs b/crates/nu-cmd-extra/src/extra/strings/format/mod.rs
index 8b8f45f188..9f1ed1e997 100644
--- a/crates/nu-cmd-extra/src/extra/strings/format/mod.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/format/mod.rs
@@ -1,6 +1,9 @@
 mod bits;
 mod command;
+mod number;
 
 pub(crate) use command::FormatPattern;
 // TODO remove `format_bits` visibility after removal of into bits
 pub(crate) use bits::{format_bits, FormatBits};
+// TODO remove `format_number` visibility after removal of into bits
+pub(crate) use number::{format_number, FormatNumber};
diff --git a/crates/nu-cmd-extra/src/extra/strings/format/number.rs b/crates/nu-cmd-extra/src/extra/strings/format/number.rs
new file mode 100644
index 0000000000..e99d19606d
--- /dev/null
+++ b/crates/nu-cmd-extra/src/extra/strings/format/number.rs
@@ -0,0 +1,126 @@
+use nu_cmd_base::input_handler::{operate, CellPathOnlyArgs};
+use nu_engine::command_prelude::*;
+
+#[derive(Clone)]
+pub struct FormatNumber;
+
+impl Command for FormatNumber {
+    fn name(&self) -> &str {
+        "format number"
+    }
+
+    fn description(&self) -> &str {
+        "Format a number."
+    }
+
+    fn signature(&self) -> nu_protocol::Signature {
+        Signature::build("format number")
+            .input_output_types(vec![(Type::Number, Type::record())])
+            .category(Category::Conversions)
+    }
+
+    fn search_terms(&self) -> Vec<&str> {
+        vec!["display", "render", "format"]
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![Example {
+            description: "Get a record containing multiple formats for the number 42",
+            example: "42 | format number",
+            result: Some(Value::test_record(record! {
+                    "binary" =>   Value::test_string("0b101010"),
+                    "debug" =>    Value::test_string("42"),
+                    "display" =>  Value::test_string("42"),
+                    "lowerexp" => Value::test_string("4.2e1"),
+                    "lowerhex" => Value::test_string("0x2a"),
+                    "octal" =>    Value::test_string("0o52"),
+                    "upperexp" => Value::test_string("4.2E1"),
+                    "upperhex" => Value::test_string("0x2A"),
+            })),
+        }]
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        format_number(engine_state, stack, call, input)
+    }
+}
+
+pub(crate) fn format_number(
+    engine_state: &EngineState,
+    stack: &mut Stack,
+    call: &Call,
+    input: PipelineData,
+) -> Result<PipelineData, ShellError> {
+    let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
+    let args = CellPathOnlyArgs::from(cell_paths);
+    operate(action, args, input, call.head, engine_state.signals())
+}
+
+fn action(input: &Value, _args: &CellPathOnlyArgs, span: Span) -> Value {
+    match input {
+        Value::Float { val, .. } => format_f64(*val, span),
+        Value::Int { val, .. } => format_i64(*val, span),
+        Value::Filesize { val, .. } => format_i64(val.get(), span),
+        // Propagate errors by explicitly matching them before the final case.
+        Value::Error { .. } => input.clone(),
+        other => Value::error(
+            ShellError::OnlySupportsThisInputType {
+                exp_input_type: "float, int, or filesize".into(),
+                wrong_type: other.get_type().to_string(),
+                dst_span: span,
+                src_span: other.span(),
+            },
+            span,
+        ),
+    }
+}
+
+fn format_i64(num: i64, span: Span) -> Value {
+    Value::record(
+        record! {
+            "binary" => Value::string(format!("{num:#b}"), span),
+            "debug" => Value::string(format!("{num:#?}"), span),
+            "display" => Value::string(format!("{num}"), span),
+            "lowerexp" => Value::string(format!("{num:#e}"), span),
+            "lowerhex" => Value::string(format!("{num:#x}"), span),
+            "octal" => Value::string(format!("{num:#o}"), span),
+            "upperexp" => Value::string(format!("{num:#E}"), span),
+            "upperhex" => Value::string(format!("{num:#X}"), span),
+        },
+        span,
+    )
+}
+
+fn format_f64(num: f64, span: Span) -> Value {
+    Value::record(
+        record! {
+            "binary" => Value::string(format!("{:b}", num.to_bits()), span),
+            "debug" => Value::string(format!("{num:#?}"), span),
+            "display" => Value::string(format!("{num}"), span),
+            "lowerexp" => Value::string(format!("{num:#e}"), span),
+            "lowerhex" => Value::string(format!("{:0x}", num.to_bits()), span),
+            "octal" => Value::string(format!("{:0o}", num.to_bits()), span),
+            "upperexp" => Value::string(format!("{num:#E}"), span),
+            "upperhex" => Value::string(format!("{:0X}", num.to_bits()), span),
+        },
+        span,
+    )
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_examples() {
+        use crate::test_examples;
+
+        test_examples(FormatNumber {})
+    }
+}

From 2bd345c3672b1bdb3cbac7c9ba397e35c335d2de Mon Sep 17 00:00:00 2001
From: Tyarel <98483313+Tyarel8@users.noreply.github.com>
Date: Tue, 21 Jan 2025 16:50:53 +0100
Subject: [PATCH 0939/1072] `into glob`: noop when input is glob (#14882)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
https://github.com/nushell/nushell/pull/14845#issuecomment-2596371878

When the input to `into glob` is a glob, it will return it like other
into commands.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
Before, using `into glob` with a glob as input would return an error,
now it will return the input.

<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/conversions/into/glob.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/crates/nu-command/src/conversions/into/glob.rs b/crates/nu-command/src/conversions/into/glob.rs
index 9ee8d2a361..e935476900 100644
--- a/crates/nu-command/src/conversions/into/glob.rs
+++ b/crates/nu-command/src/conversions/into/glob.rs
@@ -22,6 +22,7 @@ impl Command for SubCommand {
     fn signature(&self) -> Signature {
         Signature::build("into glob")
             .input_output_types(vec![
+                (Type::Glob, Type::Glob),
                 (Type::String, Type::Glob),
                 (
                     Type::List(Box::new(Type::String)),
@@ -64,6 +65,11 @@ impl Command for SubCommand {
                 example: "'1234' | into glob",
                 result: Some(Value::test_glob("1234")),
             },
+            Example {
+                description: "convert glob to glob",
+                example: "'1234' | into glob | into glob",
+                result: Some(Value::test_glob("1234")),
+            },
             Example {
                 description: "convert filepath to glob",
                 example: "ls Cargo.toml | get name | into glob",
@@ -94,6 +100,7 @@ fn glob_helper(
 fn action(input: &Value, _args: &Arguments, span: Span) -> Value {
     match input {
         Value::String { val, .. } => Value::glob(val.to_string(), false, span),
+        Value::Glob { .. } => input.clone(),
         x => Value::error(
             ShellError::CantConvert {
                 to_type: String::from("glob"),

From 379d89369c6b14c1244208430d257293e384a19d Mon Sep 17 00:00:00 2001
From: Tyarel <98483313+Tyarel8@users.noreply.github.com>
Date: Tue, 21 Jan 2025 17:11:40 +0100
Subject: [PATCH 0940/1072] `into cell-path`: noop when input is cell-path
 (#14881)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
https://github.com/nushell/nushell/pull/14845#issuecomment-2596371878

When the input to `into cell-path` is a cell-path, it will return it
like other into commands.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
Before, using `into cell-path` with a cell-path as input would return an
error, now it will return the input.

<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 .../src/conversions/into/cell_path.rs           | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/crates/nu-command/src/conversions/into/cell_path.rs b/crates/nu-command/src/conversions/into/cell_path.rs
index 4fbe732f7f..d96d76deab 100644
--- a/crates/nu-command/src/conversions/into/cell_path.rs
+++ b/crates/nu-command/src/conversions/into/cell_path.rs
@@ -12,6 +12,7 @@ impl Command for IntoCellPath {
     fn signature(&self) -> nu_protocol::Signature {
         Signature::build("into cell-path")
             .input_output_types(vec![
+                (Type::CellPath, Type::CellPath),
                 (Type::Int, Type::CellPath),
                 (Type::List(Box::new(Type::Any)), Type::CellPath),
                 (
@@ -56,6 +57,13 @@ impl Command for IntoCellPath {
                     members: vec![PathMember::test_int(5, false)],
                 })),
             },
+            Example {
+                description: "Convert cell path into cell path",
+                example: "5 | into cell-path | into cell-path",
+                result: Some(Value::test_cell_path(CellPath {
+                    members: vec![PathMember::test_int(5, false)],
+                })),
+            },
             Example {
                 description: "Convert string into cell path",
                 example: "'some.path' | split row '.' | into cell-path",
@@ -96,7 +104,7 @@ fn into_cell_path(call: &Call, input: PipelineData) -> Result<PipelineData, Shel
     let head = call.head;
 
     match input {
-        PipelineData::Value(value, _) => Ok(value_to_cell_path(&value, head)?.into_pipeline_data()),
+        PipelineData::Value(value, _) => Ok(value_to_cell_path(value, head)?.into_pipeline_data()),
         PipelineData::ListStream(stream, ..) => {
             let list: Vec<_> = stream.into_iter().collect();
             Ok(list_to_cell_path(&list, head)?.into_pipeline_data())
@@ -170,10 +178,11 @@ fn record_to_path_member(
     Ok(member)
 }
 
-fn value_to_cell_path(value: &Value, span: Span) -> Result<Value, ShellError> {
+fn value_to_cell_path(value: Value, span: Span) -> Result<Value, ShellError> {
     match value {
-        Value::Int { val, .. } => Ok(int_to_cell_path(*val, span)),
-        Value::List { vals, .. } => list_to_cell_path(vals, span),
+        Value::CellPath { .. } => Ok(value),
+        Value::Int { val, .. } => Ok(int_to_cell_path(val, span)),
+        Value::List { vals, .. } => list_to_cell_path(&vals, span),
         other => Err(ShellError::OnlySupportsThisInputType {
             exp_input_type: "int, list".into(),
             wrong_type: other.get_type().to_string(),

From 0666b3784f44e5b4bf3401b98d4f5a47979df51b Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Tue, 21 Jan 2025 12:54:52 -0500
Subject: [PATCH 0941/1072] Use `$nu.data-dir` as last directory for vendor
 autoloads on all platforms (#14879)

# Description

Should fix #14872.

## Before

The vendor autoload code in #13382 used `dirs::data_dir()`
(from the `dirs` crate), leading to a different behavior when
`XDG_DATA_HOME` is set on each platform.

* On Linux, the `dirs` crate automatically uses `XDG_DATA_HOME` for
`dirs::data_dir()`, so everything worked as expected.
* On macOS, `dirs` doesn't use the XDG spec, but the vendor autoload
code from #13382 specifically added `XDG_DATA_HOME`. However, even if
`XDG_DATA_HOME` was set, vendor autoloads would still use the `dirs`
version *as well*.
* On Windows, `XDG_DATA_HOME` was ignored completely by vendor
autoloads, even though `$nu.data-dirs` was respecting it.

## After

This PR uses `nu::data_dirs()` on all platforms. `nu::data_dirs()`
respects `XDG_DATA_HOME` (if set) on all platforms.

# User-Facing Changes

Might be a breaking change if someone was depending on the old behavior,
but the doc already specified the behavior in this PR.
---
 crates/nu-protocol/src/eval_const.rs | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/crates/nu-protocol/src/eval_const.rs b/crates/nu-protocol/src/eval_const.rs
index b6506a7151..9abe0a1ea6 100644
--- a/crates/nu-protocol/src/eval_const.rs
+++ b/crates/nu-protocol/src/eval_const.rs
@@ -265,8 +265,7 @@ pub fn get_vendor_autoload_dirs(_engine_state: &EngineState) -> Vec<PathBuf> {
     // <dir>/nushell/vendor/autoload for every dir in XDG_DATA_DIRS in reverse order on platforms other than windows. If XDG_DATA_DIRS is not set, it falls back to <PREFIX>/share if PREFIX ends in local, or <PREFIX>/local/share:<PREFIX>/share otherwise. If PREFIX is not set, fall back to /usr/local/share:/usr/share.
     // %ProgramData%\nushell\vendor\autoload on windows
     // NU_VENDOR_AUTOLOAD_DIR from compile time, if env var is set at compile time
-    // if on macOS, additionally check XDG_DATA_HOME, which `dirs` is only doing on Linux
-    // <data_dir>/nushell/vendor/autoload of the current user according to the `dirs` crate
+    // <$nu.data_dir>/vendor/autoload
     // NU_VENDOR_AUTOLOAD_DIR at runtime, if env var is set
 
     let into_autoload_path_fn = |mut path: PathBuf| {
@@ -321,23 +320,8 @@ pub fn get_vendor_autoload_dirs(_engine_state: &EngineState) -> Vec<PathBuf> {
         append_fn(PathBuf::from(path));
     }
 
-    #[cfg(target_os = "macos")]
-    std::env::var("XDG_DATA_HOME")
-        .ok()
-        .map(PathBuf::from)
-        .or_else(|| {
-            dirs::home_dir().map(|mut home| {
-                home.push(".local");
-                home.push("share");
-                home
-            })
-        })
-        .map(into_autoload_path_fn)
-        .into_iter()
-        .for_each(&mut append_fn);
-
-    if let Some(data_dir) = dirs::data_dir() {
-        append_fn(into_autoload_path_fn(data_dir));
+    if let Some(data_dir) = nu_path::data_dir() {
+        append_fn(PathBuf::from(data_dir).join("vendor").join("autoload"));
     }
 
     if let Some(path) = std::env::var_os("NU_VENDOR_AUTOLOAD_DIR") {

From cdb082e92d8634cc14908c234ccd51a9082a533e Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Tue, 21 Jan 2025 15:39:39 -0500
Subject: [PATCH 0942/1072] Improve example for epoch -> datetime (#14886)

Better example for `into datetime` with Unix epoch
---
 crates/nu-command/src/conversions/into/datetime.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/nu-command/src/conversions/into/datetime.rs b/crates/nu-command/src/conversions/into/datetime.rs
index 85e1be0880..2b274c3ea5 100644
--- a/crates/nu-command/src/conversions/into/datetime.rs
+++ b/crates/nu-command/src/conversions/into/datetime.rs
@@ -205,13 +205,13 @@ impl Command for SubCommand {
             },
             Example {
                 description: "Convert standard (seconds) unix timestamp to a UTC datetime",
-                example: "1614434140 * 1_000_000_000 | into datetime",
+                example: "1614434140 | into datetime -f '%s'",
                 #[allow(clippy::inconsistent_digit_grouping)]
                 result: example_result_1(1614434140_000000000),
             },
             Example {
-                description: "Leave it as it is when the input is already a datetime",
-                example: "1614434140 * 1_000_000_000 | into datetime | into datetime",
+                description: "Using a datetime as input simply returns the value",
+                example: "2021-02-27T13:55:40 | into datetime",
                 #[allow(clippy::inconsistent_digit_grouping)]
                 result: example_result_1(1614434140_000000000),
             },

From 84c720daf50f9f256e8a5914efc0c846eb1ea7bc Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Wed, 22 Jan 2025 20:25:30 +0800
Subject: [PATCH 0943/1072] fix(lsp): renaming of flag variables (#14890)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

This PR fixes a bug: renaming on a flag variable removes the leading
`--` in the signature.

<img width="257" alt="image"
src="https://github.com/user-attachments/assets/767c62de-f3a0-4a07-9786-61b21e8cfcb6"
/>

Gets the following before this PR:

```nushell
export def foooo [
  p: int
] {
  $p
}
```

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock                          |  5 ++-
 Cargo.toml                          |  2 +-
 crates/nu-lsp/src/ast.rs            |  2 +-
 crates/nu-lsp/src/workspace.rs      | 59 +++++++++++++++++------------
 tests/fixtures/lsp/workspace/foo.nu |  2 +-
 5 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a9c9ca4992..c0a8bab642 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3202,13 +3202,14 @@ dependencies = [
 
 [[package]]
 name = "lsp-server"
-version = "0.7.7"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "550446e84739dcaf6d48a4a093973850669e13e8a34d8f8d64851041be267cd9"
+checksum = "9462c4dc73e17f971ec1f171d44bfffb72e65a130117233388a0ebc7ec5656f9"
 dependencies = [
  "crossbeam-channel",
  "log",
  "serde",
+ "serde_derive",
  "serde_json",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 18042e20a4..c4c2b03237 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -102,7 +102,7 @@ libproc = "0.14"
 log = "0.4"
 lru = "0.12"
 lscolors = { version = "0.17", default-features = false }
-lsp-server = "0.7.5"
+lsp-server = "0.7.8"
 lsp-types = { version = "0.97.0", features = ["proposed"] }
 lsp-textdocument = "0.4.0"
 mach2 = "0.4"
diff --git a/crates/nu-lsp/src/ast.rs b/crates/nu-lsp/src/ast.rs
index bee0c007f3..d8b1a9acfc 100644
--- a/crates/nu-lsp/src/ast.rs
+++ b/crates/nu-lsp/src/ast.rs
@@ -198,7 +198,7 @@ fn try_find_id_in_def(
     id_ref: Option<&Id>,
 ) -> Option<(Id, Span)> {
     let call_name = working_set.get_span_contents(call.head);
-    if call_name != "def".as_bytes() && call_name != "export def".as_bytes() {
+    if call_name != b"def" && call_name != b"export def" {
         return None;
     };
     let mut span = None;
diff --git a/crates/nu-lsp/src/workspace.rs b/crates/nu-lsp/src/workspace.rs
index 37eb81182c..979f09a42b 100644
--- a/crates/nu-lsp/src/workspace.rs
+++ b/crates/nu-lsp/src/workspace.rs
@@ -54,37 +54,18 @@ fn find_reference_in_file(
     file: &FullTextDocument,
     fp: &Path,
     id: &Id,
-) -> Option<Vec<Range>> {
-    let fp_str = fp.to_str()?;
+) -> Option<Vec<Span>> {
     let block = parse(
         working_set,
-        Some(fp_str),
+        fp.to_str(),
         file.get_content(None).as_bytes(),
         false,
     );
-    let file_span = working_set.get_span_for_filename(fp_str)?;
-    let offset = file_span.start;
-    let mut references: Vec<Span> = find_reference_by_id(&block, working_set, id);
-
-    // NOTE: for arguments whose declaration is in a signature
-    // which is not covered in the AST
-    if let Id::Variable(vid) = id {
-        let decl_span = working_set.get_variable(*vid).declaration_span;
-        if file_span.contains_span(decl_span)
-            && decl_span.end > decl_span.start
-            && !references.contains(&decl_span)
-        {
-            references.push(decl_span);
-        }
-    }
-    let occurs: Vec<Range> = references
-        .iter()
-        .map(|span| span_to_range(span, file, offset))
-        .collect();
+    let references: Vec<Span> = find_reference_by_id(&block, working_set, id);
 
     // add_block to avoid repeated parsing
     working_set.add_block(block);
-    (!occurs.is_empty()).then_some(occurs)
+    (!references.is_empty()).then_some(references)
 }
 
 impl LanguageServer {
@@ -284,6 +265,7 @@ impl LanguageServer {
                 .filter_map(|p| p.ok())
                 .collect();
             let len = scripts.len();
+            let definition_span = Self::find_definition_span_by_id(&working_set, &id);
 
             for (i, fp) in scripts.iter().enumerate() {
                 #[cfg(test)]
@@ -324,7 +306,34 @@ impl LanguageServer {
                     }
                     &FullTextDocument::new("nu".to_string(), 0, content_string.into())
                 };
-                let _ = find_reference_in_file(&mut working_set, file, fp, &id).map(|ranges| {
+                let _ = find_reference_in_file(&mut working_set, file, fp, &id).map(|mut refs| {
+                    let file_span = working_set
+                        .get_span_for_filename(fp.to_string_lossy().as_ref())
+                        .unwrap_or(Span::unknown());
+                    // NOTE: for arguments whose declaration is in a signature
+                    // which is not covered in the AST
+                    if let (Id::Variable(_), Some(decl_span)) = (&id, definition_span) {
+                        if file_span.contains_span(decl_span)
+                            && decl_span.end > decl_span.start
+                            && !refs.contains(&decl_span)
+                        {
+                            let leading_dashes = working_set
+                                .get_span_contents(decl_span)
+                                .iter()
+                                // remove leading dashes for flags
+                                .take_while(|c| *c == &b'-')
+                                .count();
+                            let start = decl_span.start + leading_dashes;
+                            refs.push(Span {
+                                start,
+                                end: start + span.end - span.start,
+                            });
+                        }
+                    }
+                    let ranges = refs
+                        .iter()
+                        .map(|span| span_to_range(span, file, file_span.start))
+                        .collect();
                     data_sender
                         .send(InternalMessage::RangeMessage(RangePerDoc { uri, ranges }))
                         .ok();
@@ -693,7 +702,7 @@ mod tests {
                                 "newText": "new"
                             },
                             {
-                                "range": { "start": { "line": 1, "character": 2 }, "end": { "line": 1, "character": 7 } },
+                                "range": { "start": { "line": 1, "character": 4 }, "end": { "line": 1, "character": 9 } },
                                 "newText": "new"
                             }
                         ]
diff --git a/tests/fixtures/lsp/workspace/foo.nu b/tests/fixtures/lsp/workspace/foo.nu
index 4b9adcf642..30c4326f68 100644
--- a/tests/fixtures/lsp/workspace/foo.nu
+++ b/tests/fixtures/lsp/workspace/foo.nu
@@ -1,5 +1,5 @@
 export def foooo [
-  param: int
+  --param(-p): int
 ] {
   $param
 }

From 28ca0e7116c4b026806ec3ca2513ce912f3a9d12 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Jan 2025 20:36:24 +0800
Subject: [PATCH 0944/1072] Bump similar from 2.6.0 to 2.7.0 (#14888)

Bumps [similar](https://github.com/mitsuhiko/similar) from 2.6.0 to
2.7.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/mitsuhiko/similar/blob/main/CHANGELOG.md">similar's
changelog</a>.</em></p>
<blockquote>
<h2>2.7.0</h2>
<ul>
<li>Add optional support for <code>web-time</code> to support web WASM
targets. <a
href="https://redirect.github.com/mitsuhiko/similar/issues/73">#73</a></li>
<li>Crate will no longer panic wheh deadlines are used in WASM. At worst
deadlines are silently ignored.  To enforce deadlines enable the
<code>wasm32_web_time</code> feature. <a
href="https://redirect.github.com/mitsuhiko/similar/issues/74">#74</a></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/mitsuhiko/similar/commit/28c146b628119065e9a4dae569eaa570a4632c17"><code>28c146b</code></a>
2.7.0</li>
<li><a
href="https://github.com/mitsuhiko/similar/commit/3ec4464a26a31f08bf3e7c1769e7a3725daab052"><code>3ec4464</code></a>
Added another changelog entry</li>
<li><a
href="https://github.com/mitsuhiko/similar/commit/50777681726d979157f3a990d7f4bd6e036ddb2b"><code>5077768</code></a>
Add wasm tests (<a
href="https://redirect.github.com/mitsuhiko/similar/issues/74">#74</a>)</li>
<li><a
href="https://github.com/mitsuhiko/similar/commit/2b2881a3758d11ce390ea61f8989aff3e03228ce"><code>2b2881a</code></a>
Added web-time changelog entry</li>
<li><a
href="https://github.com/mitsuhiko/similar/commit/177ce9e700e4b281bd9607e6463aafe35e615fb8"><code>177ce9e</code></a>
Add wasm32_web_time feature (<a
href="https://redirect.github.com/mitsuhiko/similar/issues/73">#73</a>)</li>
<li><a
href="https://github.com/mitsuhiko/similar/commit/717757e156f1aa450bf92c29f92217806380bfe9"><code>717757e</code></a>
Another clippy fix</li>
<li><a
href="https://github.com/mitsuhiko/similar/commit/157f01564defbbf8a7f6b77135e09a7d834db547"><code>157f015</code></a>
Make clippy happier (<a
href="https://redirect.github.com/mitsuhiko/similar/issues/72">#72</a>)</li>
<li>See full diff in <a
href="https://github.com/mitsuhiko/similar/compare/2.6.0...2.7.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=similar&package-manager=cargo&previous-version=2.6.0&new-version=2.7.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                               | 4 ++--
 crates/nu-plugin-test-support/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c0a8bab642..03304fcdc5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6924,9 +6924,9 @@ checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
 
 [[package]]
 name = "similar"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e"
+checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa"
 
 [[package]]
 name = "simplelog"
diff --git a/crates/nu-plugin-test-support/Cargo.toml b/crates/nu-plugin-test-support/Cargo.toml
index 90f85b1597..8e220af0ce 100644
--- a/crates/nu-plugin-test-support/Cargo.toml
+++ b/crates/nu-plugin-test-support/Cargo.toml
@@ -24,7 +24,7 @@ nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.101.1" }
 nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.101.1" }
 nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.1" }
 nu-ansi-term = { workspace = true }
-similar = "2.6"
+similar = "2.7"
 
 [dev-dependencies]
 typetag = "0.2"

From 9a0ae7c4c0efaa2be670234319c6ac695cb0ad63 Mon Sep 17 00:00:00 2001
From: Maxim Zhiburt <zhiburt@gmail.com>
Date: Wed, 22 Jan 2025 15:49:25 +0300
Subject: [PATCH 0945/1072] Fix #14842 (#14885)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Sorry was a little bit busy

close #14842

I've added a test but I'd check if it solved it.

cc: @fdncred

__________________________

**Unrelated**

Recently got a pretty good format idea
(https://github.com/zhiburt/tabled/issues/472)
Just wanna highlight that we could probably experiment with it, if it
being a bit elaborated.

It's sort of KV table which nushell already has,
But it's more for a default table where each row/record being rendered
as a KV table.

It's not something super nice I guess but maybe it could get some
appliance.
So yes pointing it out just in case.

Like these.

```
┌──────────────┬───────────────────────────────────────────────┐
│ Field        │ Value                                         │
├──────────────┼───────────────────────────────────────────────┤
│ Company      │ INTEL CORP                                    │
├──────────────┼───────────────────────────────────────────────┤
│ Street       │ 2200 MISSION COLLEGE BLVD, RNB-4-151          │
├──────────────┼───────────────────────────────────────────────┤
│ City         │ SANTA CLARA                                   │
├──────────────┼───────────────────────────────────────────────┤
│ ZIP code     │ 95054                                         │
┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫
│ Company      │ Apple Inc.                                    │
├──────────────┼───────────────────────────────────────────────┤
│ Street       │ ONE APPLE PARK WAY                            │
├──────────────┼───────────────────────────────────────────────┤
│ City         │ CUPERTINO                                     │
├──────────────┼───────────────────────────────────────────────┤
│ ZIP code     │ 95014                                         │
└──────────────┴───────────────────────────────────────────────┘


┌──────────────────────────────────────────────────────────────┐
│                         INTEL CORP                           │
├──────────────┬───────────────────────────────────────────────┤
│ Street       │ 2200 MISSION COLLEGE BLVD, RNB-4-151          │
├──────────────┼───────────────────────────────────────────────┤
│ City         │ SANTA CLARA                                   │
├──────────────┼───────────────────────────────────────────────┤
│ ZIP code     │ 95054                                         │
├──────────────┴───────────────────────────────────────────────┤
│                         Apple Inc.                           │
├──────────────┬───────────────────────────────────────────────┤
│ Street       │ ONE APPLE PARK WAY                            │
├──────────────┼───────────────────────────────────────────────┤
│ City         │ CUPERTINO                                     │
├──────────────┼───────────────────────────────────────────────┤
│ ZIP code     │ 95014                                         │
└──────────────┴───────────────────────────────────────────────┘

```

PS: Now thinking about it,
it's sort of like doing a iteration over rows and building a current KV
table,
Which is interesting cause we could do it row by row, in which case
doing CTRLC would not ruin build but got some data rendered.
All though it's a different kind of approach. Just saying.
---
 crates/nu-command/tests/commands/table.rs | 30 +++++++++++++++++++++++
 crates/nu-table/src/types/general.rs      | 27 +++++++++++---------
 2 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/crates/nu-command/tests/commands/table.rs b/crates/nu-command/tests/commands/table.rs
index 04473e1776..41bd1ec531 100644
--- a/crates/nu-command/tests/commands/table.rs
+++ b/crates/nu-command/tests/commands/table.rs
@@ -3119,3 +3119,33 @@ fn table_colors() {
     ));
     assert_eq!(actual.out, "╭───┬───╮│ a │ 1 ││ b │ 2 │╰───┴───╯");
 }
+
+#[test]
+fn table_index() {
+    let actual = nu!("[[ index     var ]; [ abc         1 ] [ def         2 ] [ ghi         3 ]] | table --width=80");
+    assert_eq!(
+        actual.out,
+        "╭─────┬─────╮\
+         │   # │ var │\
+         ├─────┼─────┤\
+         │ abc │   1 │\
+         │ def │   2 │\
+         │ ghi │   3 │\
+         ╰─────┴─────╯"
+    );
+}
+
+#[test]
+fn table_index_expand() {
+    let actual = nu!("[[ index     var ]; [ abc         1 ] [ def         2 ] [ ghi         3 ]] | table --width=80 --expand");
+    assert_eq!(
+        actual.out,
+        "╭─────┬─────╮\
+         │   # │ var │\
+         ├─────┼─────┤\
+         │ abc │   1 │\
+         │ def │   2 │\
+         │ ghi │   3 │\
+         ╰─────┴─────╯"
+    );
+}
diff --git a/crates/nu-table/src/types/general.rs b/crates/nu-table/src/types/general.rs
index c2ac2a00e4..81d4906783 100644
--- a/crates/nu-table/src/types/general.rs
+++ b/crates/nu-table/src/types/general.rs
@@ -236,20 +236,25 @@ fn get_table_row_index(item: &Value, config: &Config, row: usize, offset: usize)
 fn collect_headers(headers: Vec<String>, index: bool) -> Vec<NuRecordsValue> {
     // The header with the INDEX is removed from the table headers since
     // it is added to the natural table index
-
-    if !index {
-        headers
-            .into_iter()
-            .filter(|header| header != INDEX_COLUMN_NAME)
-            .map(NuRecordsValue::new)
-            .collect()
+    let length = if index {
+        headers.len() + 1
     } else {
-        let mut v = Vec::with_capacity(headers.len() + 1);
+        headers.len()
+    };
+
+    let mut v = Vec::with_capacity(length);
+
+    if index {
         v.insert(0, NuRecordsValue::new("#".into()));
-        for text in headers {
-            v.push(NuRecordsValue::new(text));
+    }
+
+    for text in headers {
+        if text == INDEX_COLUMN_NAME {
+            continue;
         }
 
-        v
+        v.push(NuRecordsValue::new(text));
     }
+
+    v
 }

From 73c08fcb2b9a55c8ef426f36e74f7ca0f75bad6a Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Wed, 22 Jan 2025 21:24:07 +0800
Subject: [PATCH 0946/1072] fix(parser): missing span of the entire block of a
 module file (#14889)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

A simple method found by @tmillr to solve [this
issue](https://github.com/nushell/nushell/discussions/14854)

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

I didn't find a suitable place in `nu-parser` to add the test case,
placed in `nu-lsp` instead.

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-lsp/src/workspace.rs         | 29 ++++++++++++++++++++++++++
 crates/nu-parser/src/parse_keywords.rs |  1 +
 2 files changed, 30 insertions(+)

diff --git a/crates/nu-lsp/src/workspace.rs b/crates/nu-lsp/src/workspace.rs
index 979f09a42b..dc3bb7330a 100644
--- a/crates/nu-lsp/src/workspace.rs
+++ b/crates/nu-lsp/src/workspace.rs
@@ -373,6 +373,8 @@ mod tests {
         ReferenceContext, ReferenceParams, TextDocumentIdentifier, TextDocumentPositionParams, Uri,
         WorkDoneProgressParams, WorkspaceFolder,
     };
+    use nu_parser::parse;
+    use nu_protocol::engine::StateWorkingSet;
     use nu_test_support::fs::fixtures;
 
     use crate::path_to_uri;
@@ -774,4 +776,31 @@ mod tests {
             panic!()
         }
     }
+
+    #[test]
+    fn existence_of_module_block() {
+        let mut script_path = fixtures();
+        script_path.push("lsp");
+        script_path.push("workspace");
+        let mut engine_state = nu_cmd_lang::create_default_context();
+        engine_state.add_env_var(
+            "PWD".into(),
+            nu_protocol::Value::test_string(script_path.to_str().unwrap()),
+        );
+        script_path.push("bar.nu");
+        let mut working_set = StateWorkingSet::new(&engine_state);
+        parse(
+            &mut working_set,
+            script_path.to_str(),
+            std::fs::read(script_path.clone()).unwrap().as_slice(),
+            false,
+        );
+
+        script_path.pop();
+        script_path.push("foo.nu");
+        let span_foo = working_set
+            .get_span_for_filename(script_path.to_str().unwrap())
+            .unwrap();
+        assert!(working_set.find_block_by_span(span_foo).is_some())
+    }
 }
diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index 0830545075..997084569b 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -1742,6 +1742,7 @@ pub fn parse_module_block(
     let mut module = Module::from_span(module_name.to_vec(), span);
 
     let mut block = Block::new_with_capacity(output.block.len());
+    block.span = Some(span);
 
     for pipeline in output.block.iter() {
         if pipeline.commands.len() == 1 {

From befeddad59e2dace0e687d7eed8ca961dc570412 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Wed, 22 Jan 2025 11:19:46 -0500
Subject: [PATCH 0947/1072] Add correct path from data-dir (#14894)

Fix issue in #14879 with incorrect subdirectory.
Before: Appended `vendor/autoload`
After: Appends `nushell/vendor/autoload`
---
 crates/nu-protocol/src/eval_const.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-protocol/src/eval_const.rs b/crates/nu-protocol/src/eval_const.rs
index 9abe0a1ea6..25f5d8404a 100644
--- a/crates/nu-protocol/src/eval_const.rs
+++ b/crates/nu-protocol/src/eval_const.rs
@@ -321,7 +321,7 @@ pub fn get_vendor_autoload_dirs(_engine_state: &EngineState) -> Vec<PathBuf> {
     }
 
     if let Some(data_dir) = nu_path::data_dir() {
-        append_fn(PathBuf::from(data_dir).join("vendor").join("autoload"));
+        append_fn(into_autoload_path_fn(PathBuf::from(data_dir)));
     }
 
     if let Some(path) = std::env::var_os("NU_VENDOR_AUTOLOAD_DIR") {

From 93e121782ccab575382dc20fb3bf7754403b38ec Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Thu, 23 Jan 2025 06:24:51 +0000
Subject: [PATCH 0948/1072] Improve and fix filesize formatting/display
 (#14397)

# Description

This PR cleans up the code surrounding formatting and displaying file
sizes.
- The `byte_unit` crate we use for file size units displays kilobytes as
`KB`, which is not the SI or ISO/IEC standard. Rather it should be `kB`,
so this fixes #8872. On some systems, `KB` actually means `KiB`, so this
avoids any potential confusion.
- The `byte_unit` crate, when displaying file sizes, casts integers to
floats which will lose precision for large file sizes. This PR adds a
custom `Display` implementation for `Filesize` that can give an exact
string representation of a `Filesize` for metric/SI units.
- This PR also removes the dependency on the `byte_unit` crate which
brought in several other dependencies.

Additionally, this PR makes some changes to the config for filesize
formatting (`$env.config.filesize`).
- The previous filesize config had the `metric` and `format` options. If
a metric (SI) unit was set in `format`, but `metric` was set to false,
then the `metric` option would take precedence and convert `format` to
the corresponding binary unit (or vice versa). E.g., `{ format: kB,
metric: false }` => `KiB`. Instead, this PR adds the `unit` option to
replace the `format` and `metric` options. `unit` can be set to a fixed
file size unit like `kB` or `KiB`, or it can be set to one of the
special options: `binary` or `metric`. These options tells nushell to
format file sizes using an appropriately scaled metric or binary unit
(examples below).
  ```nushell
  # precision = null

  # unit = kB
  1kB  # 1 kB
  1KiB # 1.024 kB

  # unit = KiB
  1kB  # 0.9765625 KiB
  1KiB # 1 KiB

  # unit = metric
  1000B     # 1 kB
  1024B     # 1.024 kB
  10_000MB  # 10 GB
  10_240MiB # 10.73741824 GB

  # unit = binary
  1000B     # 1000 B
  1024B     # 1 KiB
  10_000MB  # 9.313225746154785 GiB
  10_240MiB # 10 GiB
  ```
- In addition, this PR also adds the `precision` option to the filesize
config. It determines how many digits to show after the decimal point.
If set to null, then everything after the decimal point is shown.
- The default filesize config is `{ unit: metric, precision: 1 }`.

# User-Facing Changes

- Commands that use the config to format file sizes will follow the
changes described above (e.g., `table`, `into string`, `to text`, etc.).
- The file size unit/format passed to `format filesize` is now case
sensitive. An error with the valid units is shown if the case does not
match.
- `$env.config.filesize.format` and `$env.config.filesize.metric` are
deprecated and replaced by `$env.config.filesize.unit`.
- A new `$env.config.filesize.precision` option was added.

# Tests + Formatting

Mostly updated test expected outputs.

# After Submitting

This PR does not change the way NUON serializes file sizes, because that
would require changing the nu parser to be able to losslessly decode the
new, exact string representation introduced in this PR.

Similarly, this PR also does not change the file size parsing in any
way. Although the file size units provided to `format filesize` or the
filesize config are now case-sensitive, the same is not yet true for
file size literals in nushell code.
---
 Cargo.lock                                    | 225 +-----------
 .../nu-command/src/conversions/into/string.rs |   4 +-
 crates/nu-command/src/formats/to/text.rs      |   6 +-
 crates/nu-command/src/random/binary.rs        |   3 +-
 crates/nu-command/src/random/chars.rs         |   3 +-
 .../nu-command/src/strings/format/filesize.rs |  44 +--
 crates/nu-command/tests/commands/format.rs    |   8 +-
 .../tests/commands/into_filesize.rs           |  69 ++--
 crates/nu-command/tests/commands/math/mod.rs  |  45 +--
 crates/nu-command/tests/commands/ucp.rs       |   2 +-
 crates/nu-protocol/Cargo.toml                 |   1 -
 crates/nu-protocol/src/config/filesize.rs     |  90 ++++-
 crates/nu-protocol/src/value/filesize.rs      | 324 ++++++++++++------
 crates/nu-protocol/src/value/mod.rs           |   2 +-
 crates/nu-protocol/tests/into_config.rs       |  14 +-
 crates/nu-protocol/tests/test_config.rs       |  38 +-
 crates/nu-test-support/src/playground/play.rs |   2 +-
 .../nu-utils/src/default_files/doc_config.nu  |  27 +-
 tests/const_/mod.rs                           |   4 +-
 tests/eval/mod.rs                             |   2 +-
 tests/repl/test_config.rs                     |   4 +-
 tests/repl/test_parser.rs                     |   4 +-
 tests/shell/pipeline/commands/internal.rs     |  54 +--
 23 files changed, 431 insertions(+), 544 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 03304fcdc5..7fe1c822b7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -23,17 +23,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
 
-[[package]]
-name = "ahash"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
-dependencies = [
- "getrandom",
- "once_cell",
- "version_check",
-]
-
 [[package]]
 name = "ahash"
 version = "0.8.11"
@@ -730,18 +719,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "bitvec"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
-dependencies = [
- "funty",
- "radium",
- "tap",
- "wyz",
-]
-
 [[package]]
 name = "blake3"
 version = "1.5.5"
@@ -773,29 +750,6 @@ dependencies = [
  "objc2",
 ]
 
-[[package]]
-name = "borsh"
-version = "1.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2506947f73ad44e344215ccd6403ac2ae18cd8e046e581a441bf8d199f257f03"
-dependencies = [
- "borsh-derive",
- "cfg_aliases 0.2.1",
-]
-
-[[package]]
-name = "borsh-derive"
-version = "1.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2593a3b8b938bd68373196c9832f516be11fa487ef4ae745eb282e6a56a7244"
-dependencies = [
- "once_cell",
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
 [[package]]
 name = "bracoxide"
 version = "0.1.4"
@@ -840,39 +794,6 @@ version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
-[[package]]
-name = "byte-unit"
-version = "5.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cd29c3c585209b0cbc7309bfe3ed7efd8c84c21b7af29c8bfae908f8777174"
-dependencies = [
- "rust_decimal",
- "serde",
- "utf8-width",
-]
-
-[[package]]
-name = "bytecheck"
-version = "0.6.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2"
-dependencies = [
- "bytecheck_derive",
- "ptr_meta",
- "simdutf8",
-]
-
-[[package]]
-name = "bytecheck_derive"
-version = "0.6.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "bytecount"
 version = "0.6.8"
@@ -2043,12 +1964,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "funty"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
-
 [[package]]
 name = "futf"
 version = "0.1.5"
@@ -2316,22 +2231,13 @@ dependencies = [
  "byteorder",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-dependencies = [
- "ahash 0.7.8",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
- "ahash 0.8.11",
+ "ahash",
  "allocator-api2",
  "rayon",
  "serde",
@@ -4086,7 +3992,6 @@ name = "nu-protocol"
 version = "0.101.1"
 dependencies = [
  "brotli",
- "byte-unit",
  "bytes",
  "chrono",
  "chrono-humanize",
@@ -5007,7 +4912,7 @@ version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87dbb24d29ddea5abb73d7954df8b8d3d4bb7f02a3e5c96d1519cdad9e816a3d"
 dependencies = [
- "ahash 0.8.11",
+ "ahash",
  "atoi",
  "atoi_simd",
  "avro-schema",
@@ -5072,7 +4977,7 @@ version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd5df9b55e614088a3270b06f8649dce76537c268d6b1ca4d9c37008b2be5949"
 dependencies = [
- "ahash 0.8.11",
+ "ahash",
  "bitflags 2.6.0",
  "bytemuck",
  "chrono",
@@ -5122,7 +5027,7 @@ version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea1b431ed816cba1120cff200f06b962748001bbb2e615ce53cfbbdf701cc136"
 dependencies = [
- "ahash 0.8.11",
+ "ahash",
  "bitflags 2.6.0",
  "hashbrown 0.15.2",
  "num-traits",
@@ -5146,7 +5051,7 @@ version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2fab2c016635cb416b49461fd6419b0208c6c13a4fd065bd65e4a87dbb66314"
 dependencies = [
- "ahash 0.8.11",
+ "ahash",
  "async-trait",
  "atoi_simd",
  "blake3",
@@ -5196,7 +5101,7 @@ version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5c8c057ef04feaf34b6ce52096bdea3a766fa4725f50442078c8a4ee86397bf"
 dependencies = [
- "ahash 0.8.11",
+ "ahash",
  "chrono",
  "chrono-tz 0.8.6",
  "fallible-streaming-iterator",
@@ -5218,7 +5123,7 @@ version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a8ca74f42e7b47cad241b36b98d991cc7fbb51b8d0695a055eb937588d1f310"
 dependencies = [
- "ahash 0.8.11",
+ "ahash",
  "bitflags 2.6.0",
  "futures",
  "memchr",
@@ -5269,7 +5174,7 @@ version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "035c800fbe5bbd820afeb8313713ed345853bb014e0f821a4025d40cf0d60e1a"
 dependencies = [
- "ahash 0.8.11",
+ "ahash",
  "argminmax",
  "base64 0.22.1",
  "bytemuck",
@@ -5307,7 +5212,7 @@ version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91dcf1d9f048079376949eaf2e24e240b313ff4a102fb83b57c9a5f807cdca52"
 dependencies = [
- "ahash 0.8.11",
+ "ahash",
  "async-stream",
  "base64 0.22.1",
  "brotli",
@@ -5373,7 +5278,7 @@ version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23de436f33f4d1134c58f24e7059a221b957ec20730807e0ef0c80c8e4b3d06a"
 dependencies = [
- "ahash 0.8.11",
+ "ahash",
  "bitflags 2.6.0",
  "bytemuck",
  "bytes",
@@ -5508,7 +5413,7 @@ version = "0.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96186b70bda00c90b5027bf2f69193c5c40571e80d3e8ec505c22cdc8e3e39aa"
 dependencies = [
- "ahash 0.8.11",
+ "ahash",
  "bytemuck",
  "bytes",
  "compact_str 0.8.0",
@@ -5610,15 +5515,6 @@ dependencies = [
  "unicode-segmentation",
 ]
 
-[[package]]
-name = "proc-macro-crate"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
-dependencies = [
- "toml_edit",
-]
-
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -5685,26 +5581,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "ptr_meta"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1"
-dependencies = [
- "ptr_meta_derive",
-]
-
-[[package]]
-name = "ptr_meta_derive"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "pure-rust-locales"
 version = "0.8.1"
@@ -5923,12 +5799,6 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "640c9bd8497b02465aeef5375144c26062e0dcd5939dfcbb0f5db76cb8c17c73"
 
-[[package]]
-name = "radium"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
-
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -6148,15 +6018,6 @@ version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
 
-[[package]]
-name = "rend"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c"
-dependencies = [
- "bytecheck",
-]
-
 [[package]]
 name = "reqwest"
 version = "0.12.9"
@@ -6231,35 +6092,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "rkyv"
-version = "0.7.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b"
-dependencies = [
- "bitvec",
- "bytecheck",
- "bytes",
- "hashbrown 0.12.3",
- "ptr_meta",
- "rend",
- "rkyv_derive",
- "seahash",
- "tinyvec",
- "uuid",
-]
-
-[[package]]
-name = "rkyv_derive"
-version = "0.7.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "rle-decode-fast"
 version = "1.0.3"
@@ -6399,13 +6231,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555"
 dependencies = [
  "arrayvec 0.7.6",
- "borsh",
- "bytes",
  "num-traits",
- "rand",
- "rkyv",
- "serde",
- "serde_json",
 ]
 
 [[package]]
@@ -6647,12 +6473,6 @@ version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49c1eeaf4b6a87c7479688c6d52b9f1153cedd3c489300564f932b065c6eab95"
 
-[[package]]
-name = "seahash"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
-
 [[package]]
 name = "security-framework"
 version = "2.11.1"
@@ -6905,7 +6725,7 @@ version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa2bcf6c6e164e81bc7a5d49fc6988b3d515d9e8c07457d7b74ffb9324b9cd40"
 dependencies = [
- "ahash 0.8.11",
+ "ahash",
  "getrandom",
  "halfbrown",
  "once_cell",
@@ -7299,12 +7119,6 @@ dependencies = [
  "thiserror 1.0.69",
 ]
 
-[[package]]
-name = "tap"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
-
 [[package]]
 name = "target-features"
 version = "0.1.6"
@@ -7857,12 +7671,6 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
 
-[[package]]
-name = "utf8-width"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3"
-
 [[package]]
 name = "utf8_iter"
 version = "1.0.4"
@@ -8724,15 +8532,6 @@ version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
 
-[[package]]
-name = "wyz"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
-dependencies = [
- "tap",
-]
-
 [[package]]
 name = "x11rb"
 version = "0.13.1"
diff --git a/crates/nu-command/src/conversions/into/string.rs b/crates/nu-command/src/conversions/into/string.rs
index f98f3aa5f8..460f6d973d 100644
--- a/crates/nu-command/src/conversions/into/string.rs
+++ b/crates/nu-command/src/conversions/into/string.rs
@@ -128,8 +128,8 @@ impl Command for SubCommand {
             },
             Example {
                 description: "convert filesize to string",
-                example: "1KiB | into string",
-                result: Some(Value::test_string("1.0 KiB")),
+                example: "1kB | into string",
+                result: Some(Value::test_string("1.0 kB")),
             },
             Example {
                 description: "convert duration to string",
diff --git a/crates/nu-command/src/formats/to/text.rs b/crates/nu-command/src/formats/to/text.rs
index 2069df3dd4..2fc3046e4e 100644
--- a/crates/nu-command/src/formats/to/text.rs
+++ b/crates/nu-command/src/formats/to/text.rs
@@ -1,8 +1,6 @@
 use chrono_humanize::HumanTime;
 use nu_engine::command_prelude::*;
-use nu_protocol::{
-    format_duration, format_filesize_from_conf, ByteStream, Config, PipelineMetadata,
-};
+use nu_protocol::{format_duration, ByteStream, Config, PipelineMetadata};
 use std::io::Write;
 
 const LINE_ENDING: &str = if cfg!(target_os = "windows") {
@@ -170,7 +168,7 @@ fn local_into_string(
         Value::Bool { val, .. } => val.to_string(),
         Value::Int { val, .. } => val.to_string(),
         Value::Float { val, .. } => val.to_string(),
-        Value::Filesize { val, .. } => format_filesize_from_conf(val, config),
+        Value::Filesize { val, .. } => config.filesize.display(val).to_string(),
         Value::Duration { val, .. } => format_duration(val),
         Value::Date { val, .. } => {
             format!("{} ({})", val.to_rfc2822(), HumanTime::from(val))
diff --git a/crates/nu-command/src/random/binary.rs b/crates/nu-command/src/random/binary.rs
index 36d0179e3a..2ef67e0f18 100644
--- a/crates/nu-command/src/random/binary.rs
+++ b/crates/nu-command/src/random/binary.rs
@@ -1,5 +1,4 @@
 use nu_engine::command_prelude::*;
-use nu_protocol::format_filesize_from_conf;
 use rand::{thread_rng, RngCore};
 
 #[derive(Clone)]
@@ -47,7 +46,7 @@ impl Command for SubCommand {
             Value::Filesize { val, .. } => {
                 usize::try_from(val).map_err(|_| ShellError::InvalidValue {
                     valid: "a non-negative int or filesize".into(),
-                    actual: format_filesize_from_conf(val, engine_state.get_config()),
+                    actual: engine_state.get_config().filesize.display(val).to_string(),
                     span: length_val.span(),
                 })
             }
diff --git a/crates/nu-command/src/random/chars.rs b/crates/nu-command/src/random/chars.rs
index e426fb5dbc..409d5e5c37 100644
--- a/crates/nu-command/src/random/chars.rs
+++ b/crates/nu-command/src/random/chars.rs
@@ -1,5 +1,4 @@
 use nu_engine::command_prelude::*;
-use nu_protocol::format_filesize_from_conf;
 use rand::{
     distributions::{Alphanumeric, Distribution},
     thread_rng,
@@ -84,7 +83,7 @@ fn chars(
             Value::Filesize { val, .. } => {
                 usize::try_from(val).map_err(|_| ShellError::InvalidValue {
                     valid: "a non-negative int or filesize".into(),
-                    actual: format_filesize_from_conf(val, engine_state.get_config()),
+                    actual: engine_state.get_config().filesize.display(val).to_string(),
                     span: length_val.span(),
                 })
             }
diff --git a/crates/nu-command/src/strings/format/filesize.rs b/crates/nu-command/src/strings/format/filesize.rs
index d6f898fee8..77c45fcac0 100644
--- a/crates/nu-command/src/strings/format/filesize.rs
+++ b/crates/nu-command/src/strings/format/filesize.rs
@@ -1,9 +1,9 @@
 use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
-use nu_protocol::{engine::StateWorkingSet, format_filesize};
+use nu_protocol::{engine::StateWorkingSet, FilesizeUnit};
 
 struct Arguments {
-    format_value: String,
+    format: FilesizeUnit,
     cell_paths: Option<Vec<CellPath>>,
 }
 
@@ -61,16 +61,10 @@ impl Command for FormatFilesize {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let format_value = call
-            .req::<Value>(engine_state, stack, 0)?
-            .coerce_into_string()?
-            .to_ascii_lowercase();
+        let format = parse_filesize_unit(call.req::<Spanned<String>>(engine_state, stack, 0)?)?;
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
         let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
-        let arg = Arguments {
-            format_value,
-            cell_paths,
-        };
+        let arg = Arguments { format, cell_paths };
         operate(
             format_value_impl,
             arg,
@@ -86,16 +80,10 @@ impl Command for FormatFilesize {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let format_value = call
-            .req_const::<Value>(working_set, 0)?
-            .coerce_into_string()?
-            .to_ascii_lowercase();
+        let format = parse_filesize_unit(call.req_const::<Spanned<String>>(working_set, 0)?)?;
         let cell_paths: Vec<CellPath> = call.rest_const(working_set, 1)?;
         let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
-        let arg = Arguments {
-            format_value,
-            cell_paths,
-        };
+        let arg = Arguments { format, cell_paths };
         operate(
             format_value_impl,
             arg,
@@ -119,21 +107,27 @@ impl Command for FormatFilesize {
             },
             Example {
                 description: "Convert the size data to MB",
-                example: "4Gb | format filesize MB",
-                result: Some(Value::test_string("4000.0 MB")),
+                example: "4GB | format filesize MB",
+                result: Some(Value::test_string("4000 MB")),
             },
         ]
     }
 }
 
+fn parse_filesize_unit(format: Spanned<String>) -> Result<FilesizeUnit, ShellError> {
+    format.item.parse().map_err(|_| ShellError::InvalidValue {
+        valid:
+            "'B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', or 'EiB'"
+                .into(),
+        actual: format.item,
+        span: format.span,
+    })
+}
+
 fn format_value_impl(val: &Value, arg: &Arguments, span: Span) -> Value {
     let value_span = val.span();
     match val {
-        Value::Filesize { val, .. } => Value::string(
-            // don't need to concern about metric, we just format units by what user input.
-            format_filesize(*val, &arg.format_value, None),
-            span,
-        ),
+        Value::Filesize { val, .. } => Value::string(val.display(arg.format).to_string(), span),
         Value::Error { .. } => val.clone(),
         _ => Value::error(
             ShellError::OnlySupportsThisInputType {
diff --git a/crates/nu-command/tests/commands/format.rs b/crates/nu-command/tests/commands/format.rs
index 6084faf1e4..7304ed0a77 100644
--- a/crates/nu-command/tests/commands/format.rs
+++ b/crates/nu-command/tests/commands/format.rs
@@ -76,13 +76,13 @@ fn format_filesize_works() {
             cwd: dirs.test(), pipeline(
             "
                 ls
-                | format filesize KB size
+                | format filesize kB size
                 | get size
                 | first
             "
         ));
 
-        assert_eq!(actual.out, "0.0 KB");
+        assert_eq!(actual.out, "0 kB");
     })
 }
 
@@ -105,10 +105,10 @@ fn format_filesize_works_with_nonempty_files() {
             );
 
             #[cfg(not(windows))]
-            assert_eq!(actual.out, "25");
+            assert_eq!(actual.out, "25 B");
 
             #[cfg(windows)]
-            assert_eq!(actual.out, "27");
+            assert_eq!(actual.out, "27 B");
         },
     )
 }
diff --git a/crates/nu-command/tests/commands/into_filesize.rs b/crates/nu-command/tests/commands/into_filesize.rs
index 6a72c76b5d..6ed6047935 100644
--- a/crates/nu-command/tests/commands/into_filesize.rs
+++ b/crates/nu-command/tests/commands/into_filesize.rs
@@ -1,30 +1,27 @@
 use nu_test_support::{nu, pipeline};
 
 #[test]
-fn into_filesize_int() {
+fn int() {
     let actual = nu!("1 | into filesize");
 
     assert!(actual.out.contains("1 B"));
 }
 
 #[test]
-fn into_filesize_float() {
+fn float() {
     let actual = nu!("1.2 | into filesize");
 
     assert!(actual.out.contains("1 B"));
 }
 
 #[test]
-fn into_filesize_str() {
-    let actual = nu!(r#"
-        '2000' | into filesize
-        "#);
-
-    assert!(actual.out.contains("2.0 KiB"));
+fn str() {
+    let actual = nu!("'2000' | into filesize");
+    assert!(actual.out.contains("2.0 kB"));
 }
 
 #[test]
-fn into_filesize_str_newline() {
+fn str_newline() {
     let actual = nu!(pipeline(
         r#"
         "2000
@@ -32,11 +29,11 @@ fn into_filesize_str_newline() {
         "#
     ));
 
-    assert!(actual.out.contains("2.0 KiB"));
+    assert!(actual.out.contains("2.0 kB"));
 }
 
 #[test]
-fn into_filesize_str_many_newlines() {
+fn str_many_newlines() {
     let actual = nu!(pipeline(
         r#"
         "2000
@@ -45,88 +42,88 @@ fn into_filesize_str_many_newlines() {
         "#
     ));
 
-    assert!(actual.out.contains("2.0 KiB"));
+    assert!(actual.out.contains("2.0 kB"));
 }
 
 #[test]
-fn into_filesize_filesize() {
-    let actual = nu!("3kib | into filesize");
+fn filesize() {
+    let actual = nu!("3kB | into filesize");
 
-    assert!(actual.out.contains("3.0 KiB"));
+    assert!(actual.out.contains("3.0 kB"));
 }
 
 #[test]
-fn into_filesize_negative_filesize() {
-    let actual = nu!("-3kib | into filesize");
+fn negative_filesize() {
+    let actual = nu!("-3kB | into filesize");
 
-    assert!(actual.out.contains("-3.0 KiB"));
+    assert!(actual.out.contains("-3.0 kB"));
 }
 
 #[test]
-fn into_filesize_negative_str_filesize() {
-    let actual = nu!("'-3kib' | into filesize");
+fn negative_str_filesize() {
+    let actual = nu!("'-3kB' | into filesize");
 
-    assert!(actual.out.contains("-3.0 KiB"));
+    assert!(actual.out.contains("-3.0 kB"));
 }
 
 #[test]
-fn into_filesize_wrong_negative_str_filesize() {
-    let actual = nu!("'--3kib' | into filesize");
+fn wrong_negative_str_filesize() {
+    let actual = nu!("'--3kB' | into filesize");
 
     assert!(actual.err.contains("can't convert string to filesize"));
 }
 
 #[test]
-fn into_filesize_large_negative_str_filesize() {
-    let actual = nu!("'-10000PiB' | into filesize");
+fn large_negative_str_filesize() {
+    let actual = nu!("'-10000PB' | into filesize");
 
     assert!(actual.err.contains("can't convert string to filesize"));
 }
 
 #[test]
-fn into_filesize_negative_str() {
+fn negative_str() {
     let actual = nu!("'-1' | into filesize");
 
     assert!(actual.out.contains("-1 B"));
 }
 
 #[test]
-fn into_filesize_wrong_negative_str() {
+fn wrong_negative_str() {
     let actual = nu!("'--1' | into filesize");
 
     assert!(actual.err.contains("can't convert string to filesize"));
 }
 
 #[test]
-fn into_filesize_positive_str_filesize() {
-    let actual = nu!("'+1Kib' | into filesize");
+fn positive_str_filesize() {
+    let actual = nu!("'+1kB' | into filesize");
 
-    assert!(actual.out.contains("1.0 KiB"));
+    assert!(actual.out.contains("1.0 kB"));
 }
 
 #[test]
-fn into_filesize_wrong_positive_str_filesize() {
-    let actual = nu!("'++1Kib' | into filesize");
+fn wrong_positive_str_filesize() {
+    let actual = nu!("'++1kB' | into filesize");
 
     assert!(actual.err.contains("can't convert string to filesize"));
 }
 
 #[test]
-fn into_filesize_large_positive_str_filesize() {
-    let actual = nu!("'+10000PiB' | into filesize");
+fn large_positive_str_filesize() {
+    let actual = nu!("'+10000PB' | into filesize");
 
     assert!(actual.err.contains("can't convert string to filesize"));
 }
 
 #[test]
-fn into_filesize_positive_str() {
+fn positive_str() {
     let actual = nu!("'+1' | into filesize");
 
     assert!(actual.out.contains("1 B"));
 }
 
 #[test]
-fn into_filesize_wrong_positive_str() {
+fn wrong_positive_str() {
     let actual = nu!("'++1' | into filesize");
 
     assert!(actual.err.contains("can't convert string to filesize"));
diff --git a/crates/nu-command/tests/commands/math/mod.rs b/crates/nu-command/tests/commands/math/mod.rs
index 5d04f450a4..5d383b9d9d 100644
--- a/crates/nu-command/tests/commands/math/mod.rs
+++ b/crates/nu-command/tests/commands/math/mod.rs
@@ -306,57 +306,32 @@ fn floor_div_mod_large_num() {
 
 #[test]
 fn unit_multiplication_math() {
-    let actual = nu!(pipeline(
-        r#"
-            1mb * 2
-        "#
-    ));
-
-    assert_eq!(actual.out, "1.9 MiB");
+    let actual = nu!("1MB * 2");
+    assert_eq!(actual.out, "2.0 MB");
 }
 
 #[test]
 fn unit_multiplication_float_math() {
-    let actual = nu!(pipeline(
-        r#"
-            1mb * 1.2
-        "#
-    ));
-
-    assert_eq!(actual.out, "1.1 MiB");
+    let actual = nu!("1MB * 1.2");
+    assert_eq!(actual.out, "1.2 MB");
 }
 
 #[test]
 fn unit_float_floor_division_math() {
-    let actual = nu!(pipeline(
-        r#"
-            1mb // 3.0
-        "#
-    ));
-
-    assert_eq!(actual.out, "325.5 KiB");
+    let actual = nu!("1MB // 3.0");
+    assert_eq!(actual.out, "333.3 kB");
 }
 
 #[test]
 fn unit_division_math() {
-    let actual = nu!(pipeline(
-        r#"
-            1mb / 4
-        "#
-    ));
-
-    assert_eq!(actual.out, "244.1 KiB");
+    let actual = nu!("1MB / 4");
+    assert_eq!(actual.out, "250.0 kB");
 }
 
 #[test]
 fn unit_float_division_math() {
-    let actual = nu!(pipeline(
-        r#"
-            1mb / 3.1
-        "#
-    ));
-
-    assert_eq!(actual.out, "315.0 KiB");
+    let actual = nu!("1MB / 3.2");
+    assert_eq!(actual.out, "312.5 kB");
 }
 
 #[test]
diff --git a/crates/nu-command/tests/commands/ucp.rs b/crates/nu-command/tests/commands/ucp.rs
index fe18d9187d..9b4cdce889 100644
--- a/crates/nu-command/tests/commands/ucp.rs
+++ b/crates/nu-command/tests/commands/ucp.rs
@@ -854,7 +854,7 @@ fn test_cp_arg_no_clobber() {
 fn test_cp_arg_no_clobber_twice() {
     Playground::setup("ucp_test_29", |dirs, sandbox| {
         sandbox.with_files(&[
-            EmptyFile("source.txt"),
+            FileWithContent("source.txt", "fake data"),
             FileWithContent("source_with_body.txt", "some-body"),
         ]);
         nu!(
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index b4a126511b..384b677d1b 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -23,7 +23,6 @@ nu-derive-value = { path = "../nu-derive-value", version = "0.101.1" }
 
 brotli = { workspace = true, optional = true }
 bytes = { workspace = true }
-byte-unit = { version = "5.1" }
 chrono = { workspace = true, features = [ "serde", "std", "unstable-locales" ], default-features = false }
 chrono-humanize = { workspace = true }
 dirs = { workspace = true }
diff --git a/crates/nu-protocol/src/config/filesize.rs b/crates/nu-protocol/src/config/filesize.rs
index 8c80f0f72c..75f27961c1 100644
--- a/crates/nu-protocol/src/config/filesize.rs
+++ b/crates/nu-protocol/src/config/filesize.rs
@@ -1,17 +1,70 @@
-use super::prelude::*;
-use crate as nu_protocol;
+use super::{config_update_string_enum, prelude::*};
+use crate::{DisplayFilesize, Filesize, FilesizeUnit};
 
-#[derive(Clone, Debug, IntoValue, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub enum FilesizeFormatUnit {
+    Metric,
+    Binary,
+    Unit(FilesizeUnit),
+}
+
+impl From<FilesizeUnit> for FilesizeFormatUnit {
+    fn from(unit: FilesizeUnit) -> Self {
+        Self::Unit(unit)
+    }
+}
+
+impl FromStr for FilesizeFormatUnit {
+    type Err = &'static str;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "metric" => Ok(Self::Metric),
+            "binary" => Ok(Self::Binary),
+            _ => {
+                if let Ok(unit) = s.parse() {
+                    Ok(Self::Unit(unit))
+                } else {
+                    Err("'metric', 'binary', 'B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', or 'EiB'")
+                }
+            }
+        }
+    }
+}
+
+impl IntoValue for FilesizeFormatUnit {
+    fn into_value(self, span: Span) -> Value {
+        match self {
+            FilesizeFormatUnit::Metric => "metric",
+            FilesizeFormatUnit::Binary => "binary",
+            FilesizeFormatUnit::Unit(unit) => unit.as_str(),
+        }
+        .into_value(span)
+    }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct FilesizeConfig {
-    pub metric: bool,
-    pub format: String,
+    pub unit: FilesizeFormatUnit,
+    pub precision: Option<usize>,
+}
+
+impl FilesizeConfig {
+    pub fn display(&self, filesize: Filesize) -> DisplayFilesize {
+        let unit = match self.unit {
+            FilesizeFormatUnit::Metric => filesize.largest_metric_unit(),
+            FilesizeFormatUnit::Binary => filesize.largest_binary_unit(),
+            FilesizeFormatUnit::Unit(unit) => unit,
+        };
+        filesize.display(unit).precision(self.precision)
+    }
 }
 
 impl Default for FilesizeConfig {
     fn default() -> Self {
         Self {
-            metric: false,
-            format: "auto".into(),
+            unit: FilesizeFormatUnit::Metric,
+            precision: Some(1),
         }
     }
 }
@@ -31,10 +84,29 @@ impl UpdateFromValue for FilesizeConfig {
         for (col, val) in record.iter() {
             let path = &mut path.push(col);
             match col.as_str() {
-                "metric" => self.metric.update(val, path, errors),
-                "format" => self.format.update(val, path, errors),
+                "unit" => config_update_string_enum(&mut self.unit, val, path, errors),
+                "precision" => match *val {
+                    Value::Nothing { .. } => self.precision = None,
+                    Value::Int { val, .. } if val >= 0 => self.precision = Some(val as usize),
+                    Value::Int { .. } => errors.invalid_value(path, "a non-negative integer", val),
+                    _ => errors.type_mismatch(path, Type::custom("int or nothing"), val),
+                },
+                "format" | "metric" => {
+                    // TODO: remove after next release
+                    errors.deprecated_option(path, "set $env.config.filesize.unit", val.span())
+                }
                 _ => errors.unknown_option(path, val),
             }
         }
     }
 }
+
+impl IntoValue for FilesizeConfig {
+    fn into_value(self, span: Span) -> Value {
+        record! {
+            "unit" => self.unit.into_value(span),
+            "precision" => self.precision.map(|x| x as i64).into_value(span),
+        }
+        .into_value(span)
+    }
+}
diff --git a/crates/nu-protocol/src/value/filesize.rs b/crates/nu-protocol/src/value/filesize.rs
index 9e291db5bb..f1cc97430b 100644
--- a/crates/nu-protocol/src/value/filesize.rs
+++ b/crates/nu-protocol/src/value/filesize.rs
@@ -1,7 +1,4 @@
-use crate::{Config, FromValue, IntoValue, ShellError, Span, Type, Value};
-use byte_unit::UnitType;
-use nu_utils::get_system_locale;
-use num_format::ToFormattedString;
+use crate::{FromValue, IntoValue, ShellError, Span, Type, Value};
 use serde::{Deserialize, Serialize};
 use std::{
     fmt,
@@ -66,12 +63,108 @@ impl Filesize {
     }
 
     /// Returns a [`Filesize`] representing the sign of `self`.
-    /// - 0 if the filesize is zero
-    /// - 1 if the filesize is positive
-    /// - -1 if the filesize is negative
+    /// - 0 if the file size is zero
+    /// - 1 if the file size is positive
+    /// - -1 if the file size is negative
     pub const fn signum(self) -> Self {
         Self(self.0.signum())
     }
+
+    /// Returns the largest [`FilesizeUnit`] with a metric prefix that is smaller than or equal to `self`.
+    ///
+    /// # Examples
+    /// ```
+    /// # use nu_protocol::{Filesize, FilesizeUnit};
+    ///
+    /// let filesize = Filesize::from(FilesizeUnit::KB);
+    /// assert_eq!(filesize.largest_metric_unit(), FilesizeUnit::KB);
+    ///
+    /// let filesize = Filesize::new(FilesizeUnit::KB.as_bytes() as i64 - 1);
+    /// assert_eq!(filesize.largest_metric_unit(), FilesizeUnit::B);
+    ///
+    /// let filesize = Filesize::from(FilesizeUnit::KiB);
+    /// assert_eq!(filesize.largest_metric_unit(), FilesizeUnit::KB);
+    /// ```
+    pub const fn largest_metric_unit(&self) -> FilesizeUnit {
+        const KB: u64 = FilesizeUnit::KB.as_bytes();
+        const MB: u64 = FilesizeUnit::MB.as_bytes();
+        const GB: u64 = FilesizeUnit::GB.as_bytes();
+        const TB: u64 = FilesizeUnit::TB.as_bytes();
+        const PB: u64 = FilesizeUnit::PB.as_bytes();
+        const EB: u64 = FilesizeUnit::EB.as_bytes();
+
+        match self.0.unsigned_abs() {
+            0..KB => FilesizeUnit::B,
+            KB..MB => FilesizeUnit::KB,
+            MB..GB => FilesizeUnit::MB,
+            GB..TB => FilesizeUnit::GB,
+            TB..PB => FilesizeUnit::TB,
+            PB..EB => FilesizeUnit::PB,
+            EB.. => FilesizeUnit::EB,
+        }
+    }
+
+    /// Returns the largest [`FilesizeUnit`] with a binary prefix that is smaller than or equal to `self`.
+    ///
+    /// # Examples
+    /// ```
+    /// # use nu_protocol::{Filesize, FilesizeUnit};
+    ///
+    /// let filesize = Filesize::from(FilesizeUnit::KiB);
+    /// assert_eq!(filesize.largest_binary_unit(), FilesizeUnit::KiB);
+    ///
+    /// let filesize = Filesize::new(FilesizeUnit::KiB.as_bytes() as i64 - 1);
+    /// assert_eq!(filesize.largest_binary_unit(), FilesizeUnit::B);
+    ///
+    /// let filesize = Filesize::from(FilesizeUnit::MB);
+    /// assert_eq!(filesize.largest_binary_unit(), FilesizeUnit::KiB);
+    /// ```
+    pub const fn largest_binary_unit(&self) -> FilesizeUnit {
+        const KIB: u64 = FilesizeUnit::KiB.as_bytes();
+        const MIB: u64 = FilesizeUnit::MiB.as_bytes();
+        const GIB: u64 = FilesizeUnit::GiB.as_bytes();
+        const TIB: u64 = FilesizeUnit::TiB.as_bytes();
+        const PIB: u64 = FilesizeUnit::PiB.as_bytes();
+        const EIB: u64 = FilesizeUnit::EiB.as_bytes();
+
+        match self.0.unsigned_abs() {
+            0..KIB => FilesizeUnit::B,
+            KIB..MIB => FilesizeUnit::KiB,
+            MIB..GIB => FilesizeUnit::MiB,
+            GIB..TIB => FilesizeUnit::GiB,
+            TIB..PIB => FilesizeUnit::TiB,
+            PIB..EIB => FilesizeUnit::PiB,
+            EIB.. => FilesizeUnit::EiB,
+        }
+    }
+
+    /// Returns a struct that can be used to display a [`Filesize`] scaled to the given
+    /// [`FilesizeUnit`].
+    ///
+    /// You can use [`largest_binary_unit`](Filesize::largest_binary_unit) or
+    /// [`largest_metric_unit`](Filesize::largest_metric_unit) to automatically determine a
+    /// [`FilesizeUnit`] of appropriate scale for a specific [`Filesize`].
+    ///
+    /// The default [`Display`](fmt::Display) implementation for [`Filesize`] is
+    /// `self.display(self.largest_metric_unit())`.
+    ///
+    /// # Examples
+    /// ```
+    /// # use nu_protocol::{Filesize, FilesizeUnit};
+    /// let filesize = Filesize::from_unit(4, FilesizeUnit::KiB).unwrap();
+    ///
+    /// assert_eq!(filesize.display(FilesizeUnit::B).to_string(), "4096 B");
+    /// assert_eq!(filesize.display(FilesizeUnit::KiB).to_string(), "4 KiB");
+    /// assert_eq!(filesize.display(filesize.largest_binary_unit()).to_string(), "4 KiB");
+    /// assert_eq!(filesize.display(filesize.largest_metric_unit()).to_string(), "4.096 kB");
+    /// ```
+    pub fn display(&self, unit: FilesizeUnit) -> DisplayFilesize {
+        DisplayFilesize {
+            filesize: *self,
+            unit,
+            precision: None,
+        }
+    }
 }
 
 impl From<i64> for Filesize {
@@ -266,13 +359,13 @@ impl Sum<Filesize> for Option<Filesize> {
 
 impl fmt::Display for Filesize {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        format_filesize(*self, "auto", Some(false)).fmt(f)
+        write!(f, "{}", self.display(self.largest_metric_unit()))
     }
 }
 
 /// All the possible filesize units for a [`Filesize`].
 ///
-/// This type contains both units with metric (SI) decimal prefixes which are powers of 10 (e.g., kB = 1000 bytes)
+/// This type contains both units with metric (SI) prefixes which are powers of 10 (e.g., kB = 1000 bytes)
 /// and units with binary prefixes which are powers of 2 (e.g., KiB = 1024 bytes).
 ///
 /// The number of bytes in a [`FilesizeUnit`] can be obtained using
@@ -334,9 +427,10 @@ impl FilesizeUnit {
         Filesize::new(self.as_bytes() as i64)
     }
 
-    /// Returns the abbreviated unit for a [`FilesizeUnit`] as a [`str`].
+    /// Returns the symbol [`str`] for a [`FilesizeUnit`].
     ///
-    /// The abbreviated unit is exactly the same as the enum case name in Rust code.
+    /// The symbol is exactly the same as the enum case name in Rust code except for
+    /// [`FilesizeUnit::KB`] which is `kB`.
     ///
     /// # Examples
     /// ```
@@ -363,10 +457,10 @@ impl FilesizeUnit {
         }
     }
 
-    /// Returns `true` if a [`FilesizeUnit`] has a metric (SI) decimal prefix (a power of 10).
+    /// Returns `true` if a [`FilesizeUnit`] has a metric (SI) prefix (a power of 10).
     ///
     /// Note that this returns `true` for [`FilesizeUnit::B`] as well.
-    pub const fn is_decimal(&self) -> bool {
+    pub const fn is_metric(&self) -> bool {
         match self {
             Self::B | Self::KB | Self::MB | Self::GB | Self::TB | Self::PB | Self::EB => true,
             Self::KiB | Self::MiB | Self::GiB | Self::TiB | Self::PiB | Self::EiB => false,
@@ -390,7 +484,7 @@ impl From<FilesizeUnit> for Filesize {
     }
 }
 
-/// An error returned when failing to parse a [`FilesizeUnit`].
+/// The error returned when failing to parse a [`FilesizeUnit`].
 ///
 /// This occurs when the string being parsed does not exactly match the name of one of the
 /// enum cases in [`FilesizeUnit`].
@@ -399,7 +493,7 @@ pub struct ParseFilesizeUnitError(());
 
 impl fmt::Display for ParseFilesizeUnitError {
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(fmt, "invalid filesize unit")
+        write!(fmt, "invalid file size unit")
     }
 }
 
@@ -432,97 +526,86 @@ impl fmt::Display for FilesizeUnit {
     }
 }
 
-pub fn format_filesize_from_conf(filesize: Filesize, config: &Config) -> String {
-    // We need to take into account config.filesize_metric so, if someone asks for KB
-    // and filesize_metric is false, return KiB
-    format_filesize(
-        filesize,
-        &config.filesize.format,
-        Some(config.filesize.metric),
-    )
+#[derive(Debug)]
+pub struct DisplayFilesize {
+    filesize: Filesize,
+    unit: FilesizeUnit,
+    precision: Option<usize>,
 }
 
-// filesize_metric is explicit when printed a value according to user config;
-// other places (such as `format filesize`) don't.
-pub fn format_filesize(
-    filesize: Filesize,
-    format_value: &str,
-    filesize_metric: Option<bool>,
-) -> String {
-    // Allow the user to specify how they want their numbers formatted
-
-    // When format_value is "auto" or an invalid value, the returned ByteUnit doesn't matter
-    // and is always B.
-    let filesize_unit = get_filesize_format(format_value, filesize_metric);
-    let byte = byte_unit::Byte::from_u64(filesize.0.unsigned_abs());
-    let adj_byte = if let Some(unit) = filesize_unit {
-        byte.get_adjusted_unit(unit)
-    } else {
-        // When filesize_metric is None, format_value should never be "auto", so this
-        // unwrap_or() should always work.
-        byte.get_appropriate_unit(if filesize_metric.unwrap_or(false) {
-            UnitType::Decimal
-        } else {
-            UnitType::Binary
-        })
-    };
-
-    match adj_byte.get_unit() {
-        byte_unit::Unit::B => {
-            let locale = get_system_locale();
-            let locale_byte = adj_byte.get_value() as u64;
-            let locale_byte_string = locale_byte.to_formatted_string(&locale);
-            let locale_signed_byte_string = if filesize.is_negative() {
-                format!("-{locale_byte_string}")
-            } else {
-                locale_byte_string
-            };
-
-            if filesize_unit.is_none() {
-                format!("{locale_signed_byte_string} B")
-            } else {
-                locale_signed_byte_string
-            }
-        }
-        _ => {
-            if filesize.is_negative() {
-                format!("-{:.1}", adj_byte)
-            } else {
-                format!("{:.1}", adj_byte)
-            }
-        }
+impl DisplayFilesize {
+    pub fn precision(mut self, precision: impl Into<Option<usize>>) -> Self {
+        self.precision = precision.into();
+        self
     }
 }
 
-/// Get the filesize unit, or None if format is "auto"
-fn get_filesize_format(
-    format_value: &str,
-    filesize_metric: Option<bool>,
-) -> Option<byte_unit::Unit> {
-    // filesize_metric always overrides the unit of filesize_format.
-    let metric = filesize_metric.unwrap_or(!format_value.ends_with("ib"));
+impl fmt::Display for DisplayFilesize {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let Self {
+            filesize: Filesize(filesize),
+            unit,
+            precision,
+        } = *self;
+        let precision = precision.or(f.precision());
+        match unit {
+            FilesizeUnit::B => write!(f, "{filesize} B"),
+            FilesizeUnit::KiB
+            | FilesizeUnit::MiB
+            | FilesizeUnit::GiB
+            | FilesizeUnit::TiB
+            | FilesizeUnit::PiB
+            | FilesizeUnit::EiB => {
+                // This won't give exact results for large filesizes and/or units.
+                let val = filesize as f64 / unit.as_bytes() as f64;
+                if let Some(precision) = precision {
+                    write!(f, "{val:.precision$} {unit}")
+                } else {
+                    write!(f, "{val} {unit}")
+                }
+            }
+            FilesizeUnit::KB
+            | FilesizeUnit::GB
+            | FilesizeUnit::MB
+            | FilesizeUnit::TB
+            | FilesizeUnit::PB
+            | FilesizeUnit::EB => {
+                // Format an exact, possibly fractional, string representation of `filesize`.
+                let bytes = unit.as_bytes() as i64;
+                let whole = filesize / bytes;
+                let fract = (filesize % bytes).unsigned_abs();
+                if precision == Some(0) || (precision.is_none() && fract == 0) {
+                    write!(f, "{whole} {unit}")
+                } else {
+                    // fract <= bytes by nature of `%` and bytes <= EB = 10 ^ 18
+                    // So, the longest string for the fractional portion can be 18 characters.
+                    let buf = &mut [b'0'; 18];
+                    let stop = precision.unwrap_or(usize::MAX).min(buf.len());
+                    let bytes = bytes.unsigned_abs();
+                    let mut fract = fract * 10;
+                    let mut i = 0;
+                    loop {
+                        let q = fract / bytes;
+                        let r = fract % bytes;
+                        debug_assert!(q < 10);
+                        buf[i] += q as u8;
+                        i += 1;
+                        if r == 0 || i >= stop {
+                            break;
+                        }
+                        fract = r * 10;
+                    }
 
-    if metric {
-        match format_value {
-            "b" => Some(byte_unit::Unit::B),
-            "kb" | "kib" => Some(byte_unit::Unit::KB),
-            "mb" | "mib" => Some(byte_unit::Unit::MB),
-            "gb" | "gib" => Some(byte_unit::Unit::GB),
-            "tb" | "tib" => Some(byte_unit::Unit::TB),
-            "pb" | "pib" => Some(byte_unit::Unit::TB),
-            "eb" | "eib" => Some(byte_unit::Unit::EB),
-            _ => None,
-        }
-    } else {
-        match format_value {
-            "b" => Some(byte_unit::Unit::B),
-            "kb" | "kib" => Some(byte_unit::Unit::KiB),
-            "mb" | "mib" => Some(byte_unit::Unit::MiB),
-            "gb" | "gib" => Some(byte_unit::Unit::GiB),
-            "tb" | "tib" => Some(byte_unit::Unit::TiB),
-            "pb" | "pib" => Some(byte_unit::Unit::TiB),
-            "eb" | "eib" => Some(byte_unit::Unit::EiB),
-            _ => None,
+                    // Safety: all the characters in `buf` are valid UTF-8.
+                    let fract = unsafe { std::str::from_utf8_unchecked(&buf[..i]) };
+
+                    if let Some(p) = precision {
+                        write!(f, "{whole}.{fract:0<p$} {unit}")
+                    } else {
+                        write!(f, "{whole}.{fract} {unit}")
+                    }
+                }
+            }
         }
     }
 }
@@ -533,21 +616,36 @@ mod tests {
     use rstest::rstest;
 
     #[rstest]
-    #[case(1000, Some(true), "auto", "1.0 KB")]
-    #[case(1000, Some(false), "auto", "1,000 B")]
-    #[case(1000, Some(false), "kb", "1.0 KiB")]
-    #[case(3000, Some(false), "auto", "2.9 KiB")]
-    #[case(3_000_000, None, "auto", "2.9 MiB")]
-    #[case(3_000_000, None, "kib", "2929.7 KiB")]
-    fn test_filesize(
-        #[case] val: i64,
-        #[case] filesize_metric: Option<bool>,
-        #[case] filesize_format: String,
-        #[case] exp: &str,
-    ) {
+    #[case(1024, FilesizeUnit::KB, "1.024 kB")]
+    #[case(1024, FilesizeUnit::B, "1024 B")]
+    #[case(1024, FilesizeUnit::KiB, "1 KiB")]
+    #[case(3_000_000, FilesizeUnit::MB, "3 MB")]
+    #[case(3_000_000, FilesizeUnit::KB, "3000 kB")]
+    fn display_unit(#[case] bytes: i64, #[case] unit: FilesizeUnit, #[case] exp: &str) {
+        assert_eq!(exp, Filesize::new(bytes).display(unit).to_string());
+    }
+
+    #[rstest]
+    #[case(1000, "1000 B")]
+    #[case(1024, "1 KiB")]
+    #[case(1025, "1.0009765625 KiB")]
+    fn display_auto_binary(#[case] val: i64, #[case] exp: &str) {
+        let filesize = Filesize::new(val);
         assert_eq!(
             exp,
-            format_filesize(Filesize::new(val), &filesize_format, filesize_metric)
+            filesize.display(filesize.largest_binary_unit()).to_string(),
+        );
+    }
+
+    #[rstest]
+    #[case(999, "999 B")]
+    #[case(1000, "1 kB")]
+    #[case(1024, "1.024 kB")]
+    fn display_auto_metric(#[case] val: i64, #[case] exp: &str) {
+        let filesize = Filesize::new(val);
+        assert_eq!(
+            exp,
+            filesize.display(filesize.largest_metric_unit()).to_string(),
         );
     }
 }
diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs
index 58cde75b50..09ec0fb04f 100644
--- a/crates/nu-protocol/src/value/mod.rs
+++ b/crates/nu-protocol/src/value/mod.rs
@@ -936,7 +936,7 @@ impl Value {
             Value::Bool { val, .. } => val.to_string(),
             Value::Int { val, .. } => val.to_string(),
             Value::Float { val, .. } => val.to_string(),
-            Value::Filesize { val, .. } => format_filesize_from_conf(*val, config),
+            Value::Filesize { val, .. } => config.filesize.display(*val).to_string(),
             Value::Duration { val, .. } => format_duration(*val),
             Value::Date { val, .. } => match &config.datetime_format.normal {
                 Some(format) => self.format_datetime(val, format),
diff --git a/crates/nu-protocol/tests/into_config.rs b/crates/nu-protocol/tests/into_config.rs
index 3ff8d44672..eae14141cf 100644
--- a/crates/nu-protocol/tests/into_config.rs
+++ b/crates/nu-protocol/tests/into_config.rs
@@ -25,22 +25,22 @@ fn config_preserved_after_do() {
 #[test]
 fn config_affected_when_mutated() {
     let actual = nu!(nu_repl_code(&[
-        r#"$env.config = { filesize: { metric: false, format:"auto" } }"#,
-        r#"$env.config = { filesize: { metric: true, format:"auto" } }"#,
-        "20mib | into string"
+        r#"$env.config = { filesize: { unit: binary } }"#,
+        r#"$env.config = { filesize: { unit: metric } }"#,
+        "20MB | into string"
     ]));
 
-    assert_eq!(actual.out, "21.0 MB");
+    assert_eq!(actual.out, "20.0 MB");
 }
 
 #[test]
 fn config_affected_when_deep_mutated() {
     let actual = nu!(cwd: "crates/nu-utils/src/default_files", nu_repl_code(&[
         r#"source default_config.nu"#,
-        r#"$env.config.filesize.metric = true"#,
-        r#"20mib | into string"#]));
+        r#"$env.config.filesize.unit = 'binary'"#,
+        r#"20MiB | into string"#]));
 
-    assert_eq!(actual.out, "21.0 MB");
+    assert_eq!(actual.out, "20.0 MiB");
 }
 
 #[test]
diff --git a/crates/nu-protocol/tests/test_config.rs b/crates/nu-protocol/tests/test_config.rs
index 81a0a7dede..f6d0aef67d 100644
--- a/crates/nu-protocol/tests/test_config.rs
+++ b/crates/nu-protocol/tests/test_config.rs
@@ -1,53 +1,43 @@
 use nu_test_support::{nu, nu_repl_code};
 
 #[test]
-fn filesize_metric_true() {
+fn filesize_mb() {
     let code = &[
-        r#"$env.config = { filesize: { metric: true, format:"mb" } }"#,
-        r#"20mib | into string"#,
+        r#"$env.config = { filesize: { unit: MB } }"#,
+        r#"20MB | into string"#,
     ];
     let actual = nu!(nu_repl_code(code));
-    assert_eq!(actual.out, "21.0 MB");
+    assert_eq!(actual.out, "20.0 MB");
 }
 
 #[test]
-fn filesize_metric_false() {
+fn filesize_mib() {
     let code = &[
-        r#"$env.config = { filesize: { metric: false, format:"mib" } }"#,
-        r#"20mib | into string"#,
+        r#"$env.config = { filesize: { unit: MiB } }"#,
+        r#"20MiB | into string"#,
     ];
     let actual = nu!(nu_repl_code(code));
     assert_eq!(actual.out, "20.0 MiB");
 }
 
 #[test]
-fn filesize_metric_overrides_format() {
+fn filesize_format_decimal() {
     let code = &[
-        r#"$env.config = { filesize: { metric: false, format:"mb" } }"#,
-        r#"20mib | into string"#,
-    ];
-    let actual = nu!(nu_repl_code(code));
-    assert_eq!(actual.out, "20.0 MiB");
-}
-
-#[test]
-fn filesize_format_auto_metric_true() {
-    let code = &[
-        r#"$env.config = { filesize: { metric: true, format:"auto" } }"#,
-        r#"[2mb 2gb 2tb] | into string | to nuon"#,
+        r#"$env.config = { filesize: { unit: metric } }"#,
+        r#"[2MB 2GB 2TB] | into string | to nuon"#,
     ];
     let actual = nu!(nu_repl_code(code));
     assert_eq!(actual.out, r#"["2.0 MB", "2.0 GB", "2.0 TB"]"#);
 }
 
 #[test]
-fn filesize_format_auto_metric_false() {
+fn filesize_format_binary() {
     let code = &[
-        r#"$env.config = { filesize: { metric: false, format:"auto" } }"#,
-        r#"[2mb 2gb 2tb] | into string | to nuon"#,
+        r#"$env.config = { filesize: { unit: binary } }"#,
+        r#"[2MiB 2GiB 2TiB] | into string | to nuon"#,
     ];
     let actual = nu!(nu_repl_code(code));
-    assert_eq!(actual.out, r#"["1.9 MiB", "1.9 GiB", "1.8 TiB"]"#);
+    assert_eq!(actual.out, r#"["2.0 MiB", "2.0 GiB", "2.0 TiB"]"#);
 }
 
 #[test]
diff --git a/crates/nu-test-support/src/playground/play.rs b/crates/nu-test-support/src/playground/play.rs
index 12295c2690..a876fbd3dc 100644
--- a/crates/nu-test-support/src/playground/play.rs
+++ b/crates/nu-test-support/src/playground/play.rs
@@ -187,7 +187,7 @@ impl<'a> Playground<'a> {
                 let mut permission_set = false;
                 let mut write_able = true;
                 let (file_name, contents) = match *f {
-                    Stub::EmptyFile(name) => (name, "fake data".to_string()),
+                    Stub::EmptyFile(name) => (name, String::new()),
                     Stub::FileWithContent(name, content) => (name, content.to_string()),
                     Stub::FileWithContentToBeTrimmed(name, content) => (
                         name,
diff --git a/crates/nu-utils/src/default_files/doc_config.nu b/crates/nu-utils/src/default_files/doc_config.nu
index 08de7724f2..1a2443960f 100644
--- a/crates/nu-utils/src/default_files/doc_config.nu
+++ b/crates/nu-utils/src/default_files/doc_config.nu
@@ -251,9 +251,9 @@ $env.config.bracketed_paste = true
 # - If `FORCE_COLOR` is set, coloring is always enabled.
 # - If `NO_COLOR` is set, coloring is disabled.
 # - If `CLICOLOR` is set, its value (0 or 1) decides whether coloring is used.
-# If none of these are set, it checks whether the standard output is a terminal 
+# If none of these are set, it checks whether the standard output is a terminal
 # and enables coloring if it is.
-# A value of `true` or `false` overrides this behavior, explicitly enabling or 
+# A value of `true` or `false` overrides this behavior, explicitly enabling or
 # disabling ANSI coloring in Nushell's internal commands.
 # When disabled, built-in commands will only use the default foreground color.
 # Note: This setting does not affect the `ansi` command.
@@ -371,17 +371,18 @@ $env.config.datetime_format.normal = "%m/%d/%y %I:%M:%S%p"
 # ----------------
 # Filesize Display
 # ----------------
-# filesize.metric (bool): When displaying filesize values ...
-# true: Use the ISO-standard KB, MB, GB
-# false: Use the Windows-standard KiB, MiB, GiB
-$env.config.filesize.metric = false
+# filesize.unit (string): One of either:
+# - A filesize unit: "B", "kB", "KiB", "MB", "MiB", "GB", "GiB", "TB", "TiB", "PB", "PiB", "EB", or "EiB".
+# - An automatically scaled unit: "metric" or "binary".
+# "metric" will use units with metric (SI) prefixes like kB, MB, or GB.
+# "binary" will use units with binary prefixes like KiB, MiB, or GiB.
+# Otherwise, setting this to one of the filesize units will use that particular unit when displaying all file sizes.
+$env.config.filesize.unit = 'metric'
 
-# filesize.format (string): One of either:
-# - The filesize units such as "KB", "KiB", etc. In this case, filesize values always display using
-# this unit.
-# - Or "auto": Filesizes are displayed using the closest unit. For example, 1_000_000_000b will display
-#   as 953.7 MiB (when `metric = false`) or 1.0GB (when `metric = true`)
-$env.config.filesize.format = "auto"
+# filesize.precision (int or nothing):
+# The number of digits to display after the decimal point for file sizes.
+# When set to `null`, all digits after the decimal point will be displayed.
+$env.config.filesize.precision = 1
 
 # ---------------------
 # Miscellaneous Display
@@ -942,4 +943,4 @@ path add "~/.local/bin"
 path add ($env.CARGO_HOME | path join "bin")
 
 # You can remove duplicate directories from the path using:
-$env.PATH = ($env.PATH | uniq)
\ No newline at end of file
+$env.PATH = ($env.PATH | uniq)
diff --git a/tests/const_/mod.rs b/tests/const_/mod.rs
index a1744e1601..fec81eba78 100644
--- a/tests/const_/mod.rs
+++ b/tests/const_/mod.rs
@@ -122,8 +122,8 @@ fn const_string_interpolation_date() {
 
 #[test]
 fn const_string_interpolation_filesize() {
-    let actual = nu!(r#"const s = $"(2kb)"; $s"#);
-    assert_eq!(actual.out, "2.0 KiB");
+    let actual = nu!(r#"const s = $"(2kB)"; $s"#);
+    assert_eq!(actual.out, "2.0 kB");
 }
 
 #[test]
diff --git a/tests/eval/mod.rs b/tests/eval/mod.rs
index 65c26a5cc6..db954df231 100644
--- a/tests/eval/mod.rs
+++ b/tests/eval/mod.rs
@@ -88,7 +88,7 @@ fn literal_float() {
 
 #[test]
 fn literal_filesize() {
-    test_eval("30MiB", Eq("30.0 MiB"))
+    test_eval("30MB", Eq("30.0 MB"))
 }
 
 #[test]
diff --git a/tests/repl/test_config.rs b/tests/repl/test_config.rs
index 839b795b48..f798d05606 100644
--- a/tests/repl/test_config.rs
+++ b/tests/repl/test_config.rs
@@ -95,8 +95,8 @@ fn mutate_nu_config_nested_history() -> TestResult {
 #[test]
 fn mutate_nu_config_nested_filesize() -> TestResult {
     run_test_std(
-        r#"$env.config.filesize.format = 'kb'; $env.config.filesize.format"#,
-        "kb",
+        r#"$env.config.filesize.unit = 'kB'; $env.config.filesize.unit"#,
+        "kB",
     )
 }
 
diff --git a/tests/repl/test_parser.rs b/tests/repl/test_parser.rs
index 47529c69f0..e40c27dbab 100644
--- a/tests/repl/test_parser.rs
+++ b/tests/repl/test_parser.rs
@@ -791,12 +791,12 @@ fn duration_with_faulty_number() -> TestResult {
 
 #[test]
 fn filesize_with_underscores_1() -> TestResult {
-    run_test("420_mb", "400.5 MiB")
+    run_test("420_MB", "420.0 MB")
 }
 
 #[test]
 fn filesize_with_underscores_2() -> TestResult {
-    run_test("1_000_000B", "976.6 KiB")
+    run_test("1_000_000B", "1.0 MB")
 }
 
 #[test]
diff --git a/tests/shell/pipeline/commands/internal.rs b/tests/shell/pipeline/commands/internal.rs
index 59c9f31fce..833dcaab8d 100644
--- a/tests/shell/pipeline/commands/internal.rs
+++ b/tests/shell/pipeline/commands/internal.rs
@@ -764,66 +764,32 @@ fn range_with_mixed_types() {
 
 #[test]
 fn filesize_math() {
-    let actual = nu!("
-        100 * 10kib
-        ");
-
-    assert_eq!(actual.out, "1000.0 KiB");
-    // why 1000.0 KB instead of 1.0 MB?
-    // looks like `byte.get_appropriate_unit(false)` behaves this way
+    let actual = nu!("100 * 10kB");
+    assert_eq!(actual.out, "1.0 MB");
 }
 
 #[test]
 fn filesize_math2() {
-    let actual = nu!("
-        100 / 10kb
-        ");
-
+    let actual = nu!("100 / 10kb");
     assert!(actual.err.contains("doesn't support"));
 }
 
 #[test]
 fn filesize_math3() {
-    let actual = nu!("
-        100kib / 10
-        ");
-
-    assert_eq!(actual.out, "10.0 KiB");
+    let actual = nu!("100kB / 10");
+    assert_eq!(actual.out, "10.0 kB");
 }
+
 #[test]
 fn filesize_math4() {
-    let actual = nu!("
-        100kib * 5
-        ");
-
-    assert_eq!(actual.out, "500.0 KiB");
+    let actual = nu!("100kB * 5");
+    assert_eq!(actual.out, "500.0 kB");
 }
 
 #[test]
 fn filesize_math5() {
-    let actual = nu!("
-        1000 * 1kib
-        ");
-
-    assert_eq!(actual.out, "1000.0 KiB");
-}
-
-#[test]
-fn filesize_math6() {
-    let actual = nu!("
-        1000 * 1mib
-        ");
-
-    assert_eq!(actual.out, "1000.0 MiB");
-}
-
-#[test]
-fn filesize_math7() {
-    let actual = nu!("
-        1000 * 1gib
-        ");
-
-    assert_eq!(actual.out, "1000.0 GiB");
+    let actual = nu!("100 * 1kB");
+    assert_eq!(actual.out, "100.0 kB");
 }
 
 #[test]

From f0f6b3a3e5c443614e7f3ac1977454d46096d10f Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Thu, 23 Jan 2025 19:44:23 +0800
Subject: [PATCH 0949/1072] feat(lsp): document highlight (#14898)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

This is a minor feature that highlights all occurrences of current
variable/command in current file:

<img width="346" alt="image"
src="https://github.com/user-attachments/assets/f1078e79-d02e-480e-b84a-84efb222c9a4"
/>

Since this kind of request happens a lot with fixed document content, to
avoid unnecessary parsing, this PR caches the `StateDelta` to the
server.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

Can be disabled on the client side.

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

Implementation is directly borrowed from `references`, only one simple
test case added.

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-lsp/src/ast.rs                     | 101 +++++-------
 crates/nu-lsp/src/diagnostics.rs             |   4 +-
 crates/nu-lsp/src/lib.rs                     | 129 +++++++++------
 crates/nu-lsp/src/symbols.rs                 |  21 +--
 crates/nu-lsp/src/workspace.rs               | 159 ++++++++++++++++---
 crates/nu-protocol/src/engine/state_delta.rs |   1 +
 tests/fixtures/lsp/symbols/foo.nu            |   2 +-
 7 files changed, 264 insertions(+), 153 deletions(-)

diff --git a/crates/nu-lsp/src/ast.rs b/crates/nu-lsp/src/ast.rs
index d8b1a9acfc..e0925cab47 100644
--- a/crates/nu-lsp/src/ast.rs
+++ b/crates/nu-lsp/src/ast.rs
@@ -286,43 +286,22 @@ fn try_find_id_in_use(
     if call_name != "use".as_bytes() {
         return None;
     }
-    let find_by_name = |name: &str| {
-        match id {
-            Some(Id::Variable(var_id_ref)) => {
-                if let Some(var_id) = working_set.find_variable(name.as_bytes()) {
-                    if var_id == *var_id_ref {
-                        return Some(Id::Variable(var_id));
-                    }
-                }
-            }
-            Some(Id::Declaration(decl_id_ref)) => {
-                if let Some(decl_id) = working_set.find_decl(name.as_bytes()) {
-                    if decl_id == *decl_id_ref {
-                        return Some(Id::Declaration(decl_id));
-                    }
-                }
-            }
-            Some(Id::Module(module_id_ref)) => {
-                if let Some(module_id) = working_set.find_module(name.as_bytes()) {
-                    if module_id == *module_id_ref {
-                        return Some(Id::Module(module_id));
-                    }
-                }
-            }
-            None => {
-                if let Some(var_id) = working_set.find_variable(name.as_bytes()) {
-                    return Some(Id::Variable(var_id));
-                }
-                if let Some(decl_id) = working_set.find_decl(name.as_bytes()) {
-                    return Some(Id::Declaration(decl_id));
-                }
-                if let Some(module_id) = working_set.find_module(name.as_bytes()) {
-                    return Some(Id::Module(module_id));
-                }
-            }
-            _ => (),
-        }
-        None
+    let find_by_name = |name: &[u8]| match id {
+        Some(Id::Variable(var_id_ref)) => working_set
+            .find_variable(name)
+            .and_then(|var_id| (var_id == *var_id_ref).then_some(Id::Variable(var_id))),
+        Some(Id::Declaration(decl_id_ref)) => working_set
+            .find_decl(name)
+            .and_then(|decl_id| (decl_id == *decl_id_ref).then_some(Id::Declaration(decl_id))),
+        Some(Id::Module(module_id_ref)) => working_set
+            .find_module(name)
+            .and_then(|module_id| (module_id == *module_id_ref).then_some(Id::Module(module_id))),
+        None => working_set
+            .find_variable(name)
+            .map(Id::Variable)
+            .or(working_set.find_decl(name).map(Id::Declaration))
+            .or(working_set.find_module(name).map(Id::Module)),
+        _ => None,
     };
     let check_location = |span: &Span| location.map_or(true, |pos| span.contains(*pos));
     let get_module_id = |span: Span| {
@@ -330,8 +309,7 @@ fn try_find_id_in_use(
         let name = String::from_utf8_lossy(working_set.get_span_contents(span));
         let path = PathBuf::from(name.as_ref());
         let stem = path.file_stem().and_then(|fs| fs.to_str()).unwrap_or(&name);
-        let module_id = working_set.find_module(stem.as_bytes())?;
-        let found_id = Id::Module(module_id);
+        let found_id = Id::Module(working_set.find_module(stem.as_bytes())?);
         id.map_or(true, |id_r| found_id == *id_r)
             .then_some((found_id, span))
     };
@@ -359,7 +337,7 @@ fn try_find_id_in_use(
                 .and_then(|e| {
                     let name = e.as_string()?;
                     Some((
-                        find_by_name(&name)?,
+                        find_by_name(name.as_bytes())?,
                         strip_quotes(item_expr.span, working_set),
                     ))
                 })
@@ -367,31 +345,25 @@ fn try_find_id_in_use(
     };
 
     // the imported name is always at the second argument
-    if let Argument::Positional(expr) = call.arguments.get(1)? {
-        if check_location(&expr.span) {
-            match &expr.expr {
-                Expr::String(name) => {
-                    if let Some(id) = find_by_name(name) {
-                        return Some((id, strip_quotes(expr.span, working_set)));
-                    }
-                }
-                Expr::List(items) => {
-                    if let Some(res) = search_in_list_items(items) {
-                        return Some(res);
-                    }
-                }
-                Expr::FullCellPath(fcp) => {
-                    if let Expr::List(items) = &fcp.head.expr {
-                        if let Some(res) = search_in_list_items(items) {
-                            return Some(res);
-                        }
-                    }
-                }
-                _ => (),
-            }
-        }
+    let Argument::Positional(expr) = call.arguments.get(1)? else {
+        return None;
+    };
+    if !check_location(&expr.span) {
+        return None;
+    }
+    match &expr.expr {
+        Expr::String(name) => {
+            find_by_name(name.as_bytes()).map(|id| (id, strip_quotes(expr.span, working_set)))
+        }
+        Expr::List(items) => search_in_list_items(items),
+        Expr::FullCellPath(fcp) => {
+            let Expr::List(items) = &fcp.head.expr else {
+                return None;
+            };
+            search_in_list_items(items)
+        }
+        _ => None,
     }
-    None
 }
 
 fn find_id_in_expr(
@@ -483,6 +455,7 @@ fn find_reference_by_id_in_expr(
             if let Id::Declaration(decl_id) = id {
                 if *decl_id == call.decl_id {
                     occurs.push(call.head);
+                    return Some(occurs);
                 }
             }
             if let Some((_, span_found)) = try_find_id_in_def(call, working_set, None, Some(id))
diff --git a/crates/nu-lsp/src/diagnostics.rs b/crates/nu-lsp/src/diagnostics.rs
index 8e37191b0a..632521b024 100644
--- a/crates/nu-lsp/src/diagnostics.rs
+++ b/crates/nu-lsp/src/diagnostics.rs
@@ -10,7 +10,7 @@ impl LanguageServer {
         let mut engine_state = self.new_engine_state();
         engine_state.generate_nu_constant();
 
-        let Some((_, offset, working_set)) = self.parse_file(&mut engine_state, &uri, true) else {
+        let Some((_, span, working_set)) = self.parse_file(&mut engine_state, &uri, true) else {
             return Ok(());
         };
 
@@ -31,7 +31,7 @@ impl LanguageServer {
             let message = err.to_string();
 
             diagnostics.diagnostics.push(Diagnostic {
-                range: span_to_range(&err.span(), file, offset),
+                range: span_to_range(&err.span(), file, span.start),
                 severity: Some(DiagnosticSeverity::ERROR),
                 message,
                 ..Default::default()
diff --git a/crates/nu-lsp/src/lib.rs b/crates/nu-lsp/src/lib.rs
index 94c3d1ff0d..788afd9e0e 100644
--- a/crates/nu-lsp/src/lib.rs
+++ b/crates/nu-lsp/src/lib.rs
@@ -16,7 +16,7 @@ use nu_cli::{NuCompleter, SuggestionKind};
 use nu_parser::parse;
 use nu_protocol::{
     ast::Block,
-    engine::{CachedFile, EngineState, Stack, StateWorkingSet},
+    engine::{CachedFile, EngineState, Stack, StateDelta, StateWorkingSet},
     DeclId, ModuleId, Span, Type, Value, VarId,
 };
 use std::{collections::BTreeMap, sync::Mutex};
@@ -50,13 +50,17 @@ pub struct LanguageServer {
     connection: Connection,
     io_threads: Option<IoThreads>,
     docs: Arc<Mutex<TextDocuments>>,
-    engine_state: EngineState,
+    initial_engine_state: EngineState,
     symbol_cache: SymbolCache,
     inlay_hints: BTreeMap<Uri, Vec<InlayHint>>,
     workspace_folders: BTreeMap<String, WorkspaceFolder>,
-    // for workspace wide requests
+    /// for workspace wide requests
     occurrences: BTreeMap<Uri, Vec<Range>>,
     channels: Option<(Sender<bool>, Arc<Receiver<InternalMessage>>)>,
+    /// set to true when text changes
+    need_parse: bool,
+    /// cache `StateDelta` to avoid repeated parsing
+    cached_state_delta: Option<StateDelta>,
 }
 
 pub fn path_to_uri(path: impl AsRef<Path>) -> Uri {
@@ -96,12 +100,14 @@ impl LanguageServer {
             connection,
             io_threads,
             docs: Arc::new(Mutex::new(TextDocuments::new())),
-            engine_state,
+            initial_engine_state: engine_state,
             symbol_cache: SymbolCache::new(),
             inlay_hints: BTreeMap::new(),
             workspace_folders: BTreeMap::new(),
             occurrences: BTreeMap::new(),
             channels: None,
+            need_parse: true,
+            cached_state_delta: None,
         })
     }
 
@@ -110,22 +116,22 @@ impl LanguageServer {
             work_done_progress: Some(true),
         };
         let server_capabilities = serde_json::to_value(ServerCapabilities {
-            text_document_sync: Some(lsp_types::TextDocumentSyncCapability::Kind(
-                TextDocumentSyncKind::INCREMENTAL,
-            )),
-            definition_provider: Some(OneOf::Left(true)),
-            hover_provider: Some(lsp_types::HoverProviderCapability::Simple(true)),
             completion_provider: Some(lsp_types::CompletionOptions::default()),
+            definition_provider: Some(OneOf::Left(true)),
+            document_highlight_provider: Some(OneOf::Left(true)),
             document_symbol_provider: Some(OneOf::Left(true)),
-            workspace_symbol_provider: Some(OneOf::Left(true)),
+            hover_provider: Some(lsp_types::HoverProviderCapability::Simple(true)),
             inlay_hint_provider: Some(OneOf::Left(true)),
+            references_provider: Some(OneOf::Right(ReferencesOptions {
+                work_done_progress_options,
+            })),
             rename_provider: Some(OneOf::Right(RenameOptions {
                 prepare_provider: Some(true),
                 work_done_progress_options,
             })),
-            references_provider: Some(OneOf::Right(ReferencesOptions {
-                work_done_progress_options,
-            })),
+            text_document_sync: Some(lsp_types::TextDocumentSyncCapability::Kind(
+                TextDocumentSyncKind::INCREMENTAL,
+            )),
             workspace: Some(WorkspaceServerCapabilities {
                 workspace_folders: Some(WorkspaceFoldersServerCapabilities {
                     supported: Some(true),
@@ -133,18 +139,19 @@ impl LanguageServer {
                 }),
                 ..Default::default()
             }),
+            workspace_symbol_provider: Some(OneOf::Left(true)),
             ..Default::default()
         })
         .expect("Must be serializable");
         let init_params = self
             .connection
             .initialize_while(server_capabilities, || {
-                !self.engine_state.signals().interrupted()
+                !self.initial_engine_state.signals().interrupted()
             })
             .into_diagnostic()?;
         self.initialize_workspace_folders(init_params)?;
 
-        while !self.engine_state.signals().interrupted() {
+        while !self.initial_engine_state.signals().interrupted() {
             // first check new messages from child thread
             self.handle_internal_messages()?;
 
@@ -175,30 +182,22 @@ impl LanguageServer {
                     }
 
                     let resp = match request.method.as_str() {
+                        request::Completion::METHOD => {
+                            Self::handle_lsp_request(request, |params| self.complete(params))
+                        }
+                        request::DocumentHighlightRequest::METHOD => {
+                            Self::handle_lsp_request(request, |params| {
+                                self.document_highlight(params)
+                            })
+                        }
                         request::GotoDefinition::METHOD => {
                             Self::handle_lsp_request(request, |params| self.goto_definition(params))
                         }
                         request::HoverRequest::METHOD => {
                             Self::handle_lsp_request(request, |params| self.hover(params))
                         }
-                        request::Completion::METHOD => {
-                            Self::handle_lsp_request(request, |params| self.complete(params))
-                        }
-                        request::DocumentSymbolRequest::METHOD => {
-                            Self::handle_lsp_request(request, |params| self.document_symbol(params))
-                        }
-                        request::References::METHOD => {
-                            Self::handle_lsp_request(request, |params| {
-                                self.references(params, 5000)
-                            })
-                        }
-                        request::WorkspaceSymbolRequest::METHOD => {
-                            Self::handle_lsp_request(request, |params| {
-                                self.workspace_symbol(params)
-                            })
-                        }
-                        request::Rename::METHOD => {
-                            Self::handle_lsp_request(request, |params| self.rename(params))
+                        request::InlayHintRequest::METHOD => {
+                            Self::handle_lsp_request(request, |params| self.get_inlay_hints(params))
                         }
                         request::PrepareRenameRequest::METHOD => {
                             let id = request.id.clone();
@@ -207,8 +206,21 @@ impl LanguageServer {
                             }
                             continue;
                         }
-                        request::InlayHintRequest::METHOD => {
-                            Self::handle_lsp_request(request, |params| self.get_inlay_hints(params))
+                        request::References::METHOD => {
+                            Self::handle_lsp_request(request, |params| {
+                                self.references(params, 5000)
+                            })
+                        }
+                        request::Rename::METHOD => {
+                            Self::handle_lsp_request(request, |params| self.rename(params))
+                        }
+                        request::DocumentSymbolRequest::METHOD => {
+                            Self::handle_lsp_request(request, |params| self.document_symbol(params))
+                        }
+                        request::WorkspaceSymbolRequest::METHOD => {
+                            Self::handle_lsp_request(request, |params| {
+                                self.workspace_symbol(params)
+                            })
                         }
                         _ => {
                             continue;
@@ -223,6 +235,7 @@ impl LanguageServer {
                 Message::Response(_) => {}
                 Message::Notification(notification) => {
                     if let Some(updated_file) = self.handle_lsp_notification(notification) {
+                        self.need_parse = true;
                         self.symbol_cache.mark_dirty(updated_file.clone(), true);
                         self.publish_diagnostics_for_file(updated_file)?;
                     }
@@ -274,9 +287,19 @@ impl LanguageServer {
     }
 
     pub fn new_engine_state(&self) -> EngineState {
-        let mut engine_state = self.engine_state.clone();
+        let mut engine_state = self.initial_engine_state.clone();
         let cwd = std::env::current_dir().expect("Could not get current working directory.");
         engine_state.add_env_var("PWD".into(), Value::test_string(cwd.to_string_lossy()));
+        // merge the cached `StateDelta` if text not changed
+        if !self.need_parse {
+            engine_state
+                .merge_delta(
+                    self.cached_state_delta
+                        .to_owned()
+                        .expect("Tried to merge a non-existing state delta"),
+                )
+                .expect("Failed to merge state delta");
+        }
         engine_state
     }
 
@@ -286,7 +309,7 @@ impl LanguageServer {
         uri: &Uri,
         pos: Position,
     ) -> Result<(StateWorkingSet<'a>, Id, Span, usize)> {
-        let (block, file_offset, mut working_set) = self
+        let (block, file_span, working_set) = self
             .parse_file(engine_state, uri, false)
             .ok_or_else(|| miette!("\nFailed to parse current file"))?;
 
@@ -297,12 +320,10 @@ impl LanguageServer {
         let file = docs
             .get_document(uri)
             .ok_or_else(|| miette!("\nFailed to get document"))?;
-        let location = file.offset_at(pos) as usize + file_offset;
+        let location = file.offset_at(pos) as usize + file_span.start;
         let (id, span) = find_id(&block, &working_set, &location)
             .ok_or_else(|| miette!("\nFailed to find current name"))?;
-        // add block to working_set for later references
-        working_set.add_block(block);
-        Ok((working_set, id, span, file_offset))
+        Ok((working_set, id, span, file_span.start))
     }
 
     pub fn parse_file<'a>(
@@ -310,7 +331,7 @@ impl LanguageServer {
         engine_state: &'a mut EngineState,
         uri: &Uri,
         need_hints: bool,
-    ) -> Option<(Arc<Block>, usize, StateWorkingSet<'a>)> {
+    ) -> Option<(Arc<Block>, Span, StateWorkingSet<'a>)> {
         let mut working_set = StateWorkingSet::new(engine_state);
         let docs = self.docs.lock().ok()?;
         let file = docs.get_document(uri)?;
@@ -319,15 +340,19 @@ impl LanguageServer {
         let contents = file.get_content(None).as_bytes();
         let _ = working_set.files.push(file_path.clone(), Span::unknown());
         let block = parse(&mut working_set, Some(file_path_str), contents, false);
-        let offset = working_set.get_span_for_filename(file_path_str)?.start;
-        // TODO: merge delta back to engine_state?
-        // self.engine_state.merge_delta(working_set.render());
-
+        let span = working_set.get_span_for_filename(file_path_str)?;
         if need_hints {
-            let file_inlay_hints = self.extract_inlay_hints(&working_set, &block, offset, file);
+            let file_inlay_hints = self.extract_inlay_hints(&working_set, &block, span.start, file);
             self.inlay_hints.insert(uri.clone(), file_inlay_hints);
         }
-        Some((block, offset, working_set))
+        if self.need_parse {
+            // TODO: incremental parsing
+            // add block to working_set for later references
+            working_set.add_block(block.clone());
+            self.cached_state_delta = Some(working_set.delta.clone());
+            self.need_parse = false;
+        }
+        Some((block, span, working_set))
     }
 
     fn get_location_by_span<'a>(
@@ -352,7 +377,7 @@ impl LanguageServer {
                     let temp_doc = FullTextDocument::new(
                         "nu".to_string(),
                         0,
-                        String::from_utf8((*cached_file.content).to_vec()).expect("Invalid UTF-8"),
+                        String::from_utf8_lossy(cached_file.content.as_ref()).to_string(),
                     );
                     return Some(Location {
                         uri: target_uri,
@@ -587,8 +612,10 @@ impl LanguageServer {
         let docs = self.docs.lock().ok()?;
         let file = docs.get_document(&path_uri)?;
 
-        let mut completer =
-            NuCompleter::new(Arc::new(self.engine_state.clone()), Arc::new(Stack::new()));
+        let mut completer = NuCompleter::new(
+            Arc::new(self.initial_engine_state.clone()),
+            Arc::new(Stack::new()),
+        );
 
         let location = file.offset_at(params.text_document_position.position) as usize;
         let results = completer.fetch_completions_at(&file.get_content(None)[..location], location);
diff --git a/crates/nu-lsp/src/symbols.rs b/crates/nu-lsp/src/symbols.rs
index 625a0250d3..c2952f34db 100644
--- a/crates/nu-lsp/src/symbols.rs
+++ b/crates/nu-lsp/src/symbols.rs
@@ -203,16 +203,17 @@ impl SymbolCache {
                     continue;
                 }
                 let target_uri = path_to_uri(path);
-                let new_symbols = if let Some(doc) = docs.get_document(&target_uri) {
-                    Self::extract_all_symbols(&working_set, doc, cached_file)
-                } else {
-                    let temp_doc = FullTextDocument::new(
-                        "nu".to_string(),
-                        0,
-                        String::from_utf8((*cached_file.content).to_vec()).expect("Invalid UTF-8"),
-                    );
-                    Self::extract_all_symbols(&working_set, &temp_doc, cached_file)
-                };
+                let new_symbols = Self::extract_all_symbols(
+                    &working_set,
+                    docs.get_document(&target_uri)
+                        .unwrap_or(&FullTextDocument::new(
+                            "nu".to_string(),
+                            0,
+                            String::from_utf8((*cached_file.content).to_vec())
+                                .expect("Invalid UTF-8"),
+                        )),
+                    cached_file,
+                );
                 self.cache.insert(target_uri.clone(), new_symbols);
                 self.mark_dirty(target_uri, false);
             }
diff --git a/crates/nu-lsp/src/workspace.rs b/crates/nu-lsp/src/workspace.rs
index dc3bb7330a..3abd7ddaf4 100644
--- a/crates/nu-lsp/src/workspace.rs
+++ b/crates/nu-lsp/src/workspace.rs
@@ -8,12 +8,14 @@ use std::{
 };
 
 use crate::{
-    ast::find_reference_by_id, path_to_uri, span_to_range, uri_to_path, Id, LanguageServer,
+    ast::{find_id, find_reference_by_id},
+    path_to_uri, span_to_range, uri_to_path, Id, LanguageServer,
 };
 use crossbeam_channel::{Receiver, Sender};
 use lsp_server::{Message, Request, Response};
 use lsp_types::{
-    Location, PrepareRenameResponse, ProgressToken, Range, ReferenceParams, RenameParams,
+    DocumentHighlight, DocumentHighlightKind, DocumentHighlightParams, Location,
+    PrepareRenameResponse, ProgressToken, Range, ReferenceParams, RenameParams,
     TextDocumentPositionParams, TextEdit, Uri, WorkspaceEdit, WorkspaceFolder,
 };
 use miette::{miette, IntoDiagnostic, Result};
@@ -69,7 +71,7 @@ fn find_reference_in_file(
 }
 
 impl LanguageServer {
-    /// get initial workspace folders from initialization response
+    /// Get initial workspace folders from initialization response
     pub fn initialize_workspace_folders(&mut self, init_params: Value) -> Result<()> {
         if let Some(array) = init_params.get("workspaceFolders") {
             let folders: Vec<WorkspaceFolder> =
@@ -81,6 +83,43 @@ impl LanguageServer {
         Ok(())
     }
 
+    /// Highlight all occurrences of the text at cursor, in current file
+    pub fn document_highlight(
+        &mut self,
+        params: &DocumentHighlightParams,
+    ) -> Option<Vec<DocumentHighlight>> {
+        let mut engine_state = self.new_engine_state();
+        let path_uri = params
+            .text_document_position_params
+            .text_document
+            .uri
+            .to_owned();
+        let (block, file_span, working_set) =
+            self.parse_file(&mut engine_state, &path_uri, false)?;
+        let docs = &self.docs.lock().ok()?;
+        let file = docs.get_document(&path_uri)?;
+        let location = file.offset_at(params.text_document_position_params.position) as usize
+            + file_span.start;
+        let (id, cursor_span) = find_id(&block, &working_set, &location)?;
+        let mut refs = find_reference_by_id(&block, &working_set, &id);
+        let definition_span = Self::find_definition_span_by_id(&working_set, &id);
+        if let Some(extra_span) =
+            Self::reference_not_in_ast(&id, &working_set, definition_span, file_span, cursor_span)
+        {
+            if !refs.contains(&extra_span) {
+                refs.push(extra_span);
+            }
+        }
+        Some(
+            refs.iter()
+                .map(|span| DocumentHighlight {
+                    range: span_to_range(span, file, file_span.start),
+                    kind: Some(DocumentHighlightKind::TEXT),
+                })
+                .collect(),
+        )
+    }
+
     /// The rename request only happens after the client received a `PrepareRenameResponse`,
     /// and a new name typed in, could happen before ranges ready for all files in the workspace folder
     pub fn rename(&mut self, params: &RenameParams) -> Option<WorkspaceEdit> {
@@ -118,7 +157,7 @@ impl LanguageServer {
         self.occurrences = BTreeMap::new();
         let mut engine_state = self.new_engine_state();
         let path_uri = params.text_document_position.text_document.uri.to_owned();
-        let (working_set, id, span, _) = self
+        let (_, id, span, _) = self
             .parse_and_find(
                 &mut engine_state,
                 &path_uri,
@@ -126,8 +165,7 @@ impl LanguageServer {
             )
             .ok()?;
         // have to clone it again in order to move to another thread
-        let mut engine_state = self.new_engine_state();
-        engine_state.merge_delta(working_set.render()).ok()?;
+        let engine_state = self.new_engine_state();
         let current_workspace_folder = self.get_workspace_folder_by_uri(&path_uri)?;
         let token = params
             .work_done_progress_params
@@ -235,6 +273,33 @@ impl LanguageServer {
         Ok(())
     }
 
+    /// NOTE: for arguments whose declaration is in a signature
+    /// which is not covered in the AST
+    fn reference_not_in_ast(
+        id: &Id,
+        working_set: &StateWorkingSet,
+        definition_span: Option<Span>,
+        file_span: Span,
+        sample_span: Span,
+    ) -> Option<Span> {
+        if let (Id::Variable(_), Some(decl_span)) = (&id, definition_span) {
+            if file_span.contains_span(decl_span) && decl_span.end > decl_span.start {
+                let leading_dashes = working_set
+                    .get_span_contents(decl_span)
+                    .iter()
+                    // remove leading dashes for flags
+                    .take_while(|c| *c == &b'-')
+                    .count();
+                let start = decl_span.start + leading_dashes;
+                return Some(Span {
+                    start,
+                    end: start + sample_span.end - sample_span.start,
+                });
+            }
+        }
+        None
+    }
+
     fn find_reference_in_workspace(
         &self,
         engine_state: EngineState,
@@ -310,24 +375,15 @@ impl LanguageServer {
                     let file_span = working_set
                         .get_span_for_filename(fp.to_string_lossy().as_ref())
                         .unwrap_or(Span::unknown());
-                    // NOTE: for arguments whose declaration is in a signature
-                    // which is not covered in the AST
-                    if let (Id::Variable(_), Some(decl_span)) = (&id, definition_span) {
-                        if file_span.contains_span(decl_span)
-                            && decl_span.end > decl_span.start
-                            && !refs.contains(&decl_span)
-                        {
-                            let leading_dashes = working_set
-                                .get_span_contents(decl_span)
-                                .iter()
-                                // remove leading dashes for flags
-                                .take_while(|c| *c == &b'-')
-                                .count();
-                            let start = decl_span.start + leading_dashes;
-                            refs.push(Span {
-                                start,
-                                end: start + span.end - span.start,
-                            });
+                    if let Some(extra_span) = Self::reference_not_in_ast(
+                        &id,
+                        &working_set,
+                        definition_span,
+                        file_span,
+                        span,
+                    ) {
+                        if !refs.contains(&extra_span) {
+                            refs.push(extra_span)
                         }
                     }
                     let ranges = refs
@@ -367,12 +423,12 @@ impl LanguageServer {
 mod tests {
     use assert_json_diff::assert_json_eq;
     use lsp_server::{Connection, Message};
-    use lsp_types::RenameParams;
     use lsp_types::{
         request, request::Request, InitializeParams, PartialResultParams, Position,
         ReferenceContext, ReferenceParams, TextDocumentIdentifier, TextDocumentPositionParams, Uri,
         WorkDoneProgressParams, WorkspaceFolder,
     };
+    use lsp_types::{DocumentHighlightParams, RenameParams};
     use nu_parser::parse;
     use nu_protocol::engine::StateWorkingSet;
     use nu_test_support::fs::fixtures;
@@ -482,6 +538,35 @@ mod tests {
             .unwrap()
     }
 
+    fn send_document_highlight_request(
+        client_connection: &Connection,
+        uri: Uri,
+        line: u32,
+        character: u32,
+    ) -> Message {
+        client_connection
+            .sender
+            .send(Message::Request(lsp_server::Request {
+                id: 1.into(),
+                method: request::DocumentHighlightRequest::METHOD.to_string(),
+                params: serde_json::to_value(DocumentHighlightParams {
+                    text_document_position_params: TextDocumentPositionParams {
+                        text_document: TextDocumentIdentifier { uri },
+                        position: Position { line, character },
+                    },
+                    partial_result_params: PartialResultParams::default(),
+                    work_done_progress_params: WorkDoneProgressParams::default(),
+                })
+                .unwrap(),
+            }))
+            .unwrap();
+
+        client_connection
+            .receiver
+            .recv_timeout(std::time::Duration::from_secs(2))
+            .unwrap()
+    }
+
     #[test]
     fn command_reference_in_workspace() {
         let mut script = fixtures();
@@ -803,4 +888,28 @@ mod tests {
             .unwrap();
         assert!(working_set.find_block_by_span(span_foo).is_some())
     }
+
+    #[test]
+    fn document_highlight_variable() {
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("workspace");
+        script.push("foo.nu");
+        let script = path_to_uri(&script);
+
+        let (client_connection, _recv) = initialize_language_server(None);
+        open_unchecked(&client_connection, script.clone());
+
+        let message = send_document_highlight_request(&client_connection, script.clone(), 3, 5);
+        let Message::Response(r) = message else {
+            panic!("unexpected message type");
+        };
+        assert_json_eq!(
+            r.result,
+            serde_json::json!([
+                { "range": { "start": { "line": 3, "character": 3 }, "end": { "line": 3, "character": 8 } }, "kind": 1 },
+                { "range": { "start": { "line": 1, "character": 4 }, "end": { "line": 1, "character": 9 } }, "kind": 1 }
+            ]),
+        );
+    }
 }
diff --git a/crates/nu-protocol/src/engine/state_delta.rs b/crates/nu-protocol/src/engine/state_delta.rs
index 972c5d6e93..d6f699e3a5 100644
--- a/crates/nu-protocol/src/engine/state_delta.rs
+++ b/crates/nu-protocol/src/engine/state_delta.rs
@@ -14,6 +14,7 @@ use crate::{PluginRegistryItem, RegisteredPlugin};
 /// A delta (or change set) between the current global state and a possible future global state. Deltas
 /// can be applied to the global state to update it to contain both previous state and the state held
 /// within the delta.
+#[derive(Clone)]
 pub struct StateDelta {
     pub(super) files: Vec<CachedFile>,
     pub(super) virtual_paths: Vec<(String, VirtualPath)>,
diff --git a/tests/fixtures/lsp/symbols/foo.nu b/tests/fixtures/lsp/symbols/foo.nu
index 9fc8112ea0..71e9639c5f 100644
--- a/tests/fixtures/lsp/symbols/foo.nu
+++ b/tests/fixtures/lsp/symbols/foo.nu
@@ -1,4 +1,4 @@
-use bar.nu [ var_bar def_bar ]
+use bar.nu [ def_bar ]
 
 let var_foo = 1
 def_bar

From cdbb3ee7b9efce69f5022bc7f17bbacbf3e4e1f1 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 23 Jan 2025 08:23:17 -0600
Subject: [PATCH 0950/1072] add `version check` command (#14880)

# Description

This PR supersedes https://github.com/nushell/nushell/pull/14813 by
making it a built-in command instead of checking for the latest version
at some interval when nushell starts.

This is what it looks like.

![image](https://github.com/user-attachments/assets/35629425-b332-4078-aea5-4931cfb0471f)

This example shows the output when the running version was
0.101.1-nightly.10

![image](https://github.com/user-attachments/assets/71216635-fb75-4251-a443-bf0d0b9a1c07)


Description from old PR.
One key functionality that I thought was interesting with this and that
I worked with @hustcer on was to try and make sure it works with
nightlies. So, it should tell you when there's a new nightly version
that is available to download. This way, you can know about it without
checking.

What's key from a nightly perspective is (1) the tags are now semver
compliant and (2) hustcer now updates the Cargo.toml package.version
version number prior to compilation so you can know you're running a
nightly version, and this PR uses that information to know whether to
check the nightly repo or the nushell repo for updates.

This uses the
[update-informer](https://docs.rs/update-informer/latest/update_informer/)
crate. NOTE that this _informs_ you of updates but does not
automatically update. I kind of see this as the first step to eventually
having an auto updater.

There was caching of the version in the old PR since it ran on every
nushell startup. Since this PR makes it a command and therefore always
runs on-demand, I've removed the caching so that it always checks when
you run it.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock                                    |  56 +++++++
 Cargo.toml                                    |   1 +
 crates/nu-command/Cargo.toml                  |  22 +--
 crates/nu-command/src/default_context.rs      |   1 +
 crates/nu-command/src/network/mod.rs          |   5 +
 .../nu-command/src/network/version_check.rs   | 156 ++++++++++++++++++
 6 files changed, 231 insertions(+), 10 deletions(-)
 create mode 100644 crates/nu-command/src/network/version_check.rs

diff --git a/Cargo.lock b/Cargo.lock
index 7fe1c822b7..22d0e50d33 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1787,6 +1787,17 @@ version = "3.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f"
 
+[[package]]
+name = "etcetera"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
+dependencies = [
+ "cfg-if",
+ "home",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "ethnum"
 version = "1.5.0"
@@ -2504,6 +2515,22 @@ dependencies = [
  "tower-service",
 ]
 
+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper 1.5.1",
+ "hyper-util",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+]
+
 [[package]]
 name = "hyper-util"
 version = "0.1.10"
@@ -3768,6 +3795,7 @@ dependencies = [
  "umask",
  "unicode-segmentation",
  "unicode-width 0.2.0",
+ "update-informer",
  "ureq",
  "url",
  "uu_cp",
@@ -6026,6 +6054,7 @@ checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
 dependencies = [
  "base64 0.22.1",
  "bytes",
+ "futures-channel",
  "futures-core",
  "futures-util",
  "h2 0.4.7",
@@ -6034,11 +6063,13 @@ dependencies = [
  "http-body-util",
  "hyper 1.5.1",
  "hyper-rustls 0.27.3",
+ "hyper-tls",
  "hyper-util",
  "ipnet",
  "js-sys",
  "log",
  "mime",
+ "native-tls",
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
@@ -6052,6 +6083,7 @@ dependencies = [
  "serde_urlencoded",
  "sync_wrapper",
  "tokio",
+ "tokio-native-tls",
  "tokio-rustls 0.26.1",
  "tokio-util",
  "tower-service",
@@ -7346,6 +7378,16 @@ dependencies = [
  "syn 2.0.90",
 ]
 
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-rustls"
 version = "0.24.1"
@@ -7625,6 +7667,20 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
+[[package]]
+name = "update-informer"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53813bf5d5f0d8430794f8cc48e99521cc9e298066958d16383ccb8b39d182a7"
+dependencies = [
+ "etcetera",
+ "reqwest",
+ "semver",
+ "serde",
+ "serde_json",
+ "ureq",
+]
+
 [[package]]
 name = "ureq"
 version = "2.12.1"
diff --git a/Cargo.toml b/Cargo.toml
index c4c2b03237..e9234036dd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -162,6 +162,7 @@ tempfile = "3.15"
 titlecase = "3.0"
 toml = "0.8"
 trash = "5.2"
+update-informer = { version = "1.2.0", default-features = false, features = ["github", "native-tls", "ureq"] }
 umask = "2.1"
 unicode-segmentation = "1.12"
 unicode-width = "0.2"
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index bfbd091847..bd34f2f742 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -91,7 +91,8 @@ tabled = { workspace = true, features = ["ansi"], default-features = false }
 titlecase = { workspace = true }
 toml = { workspace = true, features = ["preserve_order"] }
 unicode-segmentation = { workspace = true }
-ureq = { workspace = true, default-features = false, features = ["charset", "gzip", "json"] }
+update-informer = { workspace = true, optional = true }
+ureq = { workspace = true, default-features = false, features = ["charset", "gzip", "json", "native-tls"], optional = true }
 url = { workspace = true }
 uu_cp = { workspace = true, optional = true }
 uu_mkdir = { workspace = true, optional = true }
@@ -142,7 +143,7 @@ os = [
 	# include other features
 	"js",
 	"network",
-	"nu-protocol/os", 
+	"nu-protocol/os",
 	"nu-utils/os",
 
 	# os-dependant dependencies
@@ -160,13 +161,13 @@ os = [
 	"which",
 ]
 
-# The dependencies listed below need 'getrandom'. 
-# They work with JS (usually with wasm-bindgen) or regular OS support. 
+# The dependencies listed below need 'getrandom'.
+# They work with JS (usually with wasm-bindgen) or regular OS support.
 # Hence they are also put under the 'os' feature to avoid repetition.
 js = [
-	"getrandom", 
-	"getrandom/js", 
-	"rand", 
+	"getrandom",
+	"getrandom/js",
+	"rand",
 	"uuid",
 ]
 
@@ -174,15 +175,16 @@ js = [
 # interface requires openssl which is not easy to embed into wasm,
 # using rustls could solve this issue.
 network = [
-	"multipart-rs", 
+	"multipart-rs",
 	"native-tls",
-	"ureq/native-tls",
+	"update-informer/native-tls",
+	"ureq",
 	"uuid",
 ]
 
 plugin = [
 	"nu-parser/plugin",
-	"os", 
+	"os",
 ]
 sqlite = ["rusqlite"]
 trash-support = ["trash"]
diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index ca06a4c04d..7175f7ff1e 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -404,6 +404,7 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             HttpPut,
             HttpOptions,
             Port,
+            VersionCheck,
         }
         bind_command! {
             Url,
diff --git a/crates/nu-command/src/network/mod.rs b/crates/nu-command/src/network/mod.rs
index ea46fd3dc8..2366fde594 100644
--- a/crates/nu-command/src/network/mod.rs
+++ b/crates/nu-command/src/network/mod.rs
@@ -3,6 +3,8 @@ mod http;
 #[cfg(feature = "network")]
 mod port;
 mod url;
+#[cfg(feature = "network")]
+mod version_check;
 
 #[cfg(feature = "network")]
 pub use self::http::*;
@@ -10,3 +12,6 @@ pub use self::url::*;
 
 #[cfg(feature = "network")]
 pub use port::SubCommand as Port;
+
+#[cfg(feature = "network")]
+pub use version_check::VersionCheck;
diff --git a/crates/nu-command/src/network/version_check.rs b/crates/nu-command/src/network/version_check.rs
new file mode 100644
index 0000000000..180bde9fd9
--- /dev/null
+++ b/crates/nu-command/src/network/version_check.rs
@@ -0,0 +1,156 @@
+use nu_engine::command_prelude::*;
+use serde::Deserialize;
+use update_informer::{
+    http_client::{GenericHttpClient, HttpClient},
+    registry, Check, Package, Registry, Result as UpdateResult,
+};
+
+#[derive(Clone)]
+pub struct VersionCheck;
+
+impl Command for VersionCheck {
+    fn name(&self) -> &str {
+        "version check"
+    }
+
+    fn description(&self) -> &str {
+        "Checks to see if you have the latest version of nushell."
+    }
+
+    fn extra_description(&self) -> &str {
+        "If you're running nushell nightly, `version check` will check to see if you are running the latest nightly version. If you are running the nushell release, `version check` will check to see if you're running the latest release version."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("version check")
+            .category(Category::Platform)
+            .input_output_types(vec![(Type::Nothing, Type::String)])
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![Example {
+            description: "Check if you have the latest version of nushell",
+            example: "version check",
+            result: None,
+        }]
+    }
+
+    fn run(
+        &self,
+        _engine_state: &EngineState,
+        _stack: &mut Stack,
+        _call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let version_check = check_for_latest_nushell_version();
+        Ok(version_check.into_pipeline_data())
+    }
+}
+
+pub struct NuShellNightly;
+
+impl Registry for NuShellNightly {
+    const NAME: &'static str = "nushell/nightly";
+
+    fn get_latest_version<T: HttpClient>(
+        http_client: GenericHttpClient<T>,
+        pkg: &Package,
+    ) -> UpdateResult<Option<String>> {
+        #[derive(Deserialize, Debug)]
+        struct Response {
+            tag_name: String,
+        }
+
+        let url = format!("https://api.github.com/repos/{}/releases", pkg);
+        let versions = http_client
+            .add_header("Accept", "application/vnd.github.v3+json")
+            .add_header("User-Agent", "update-informer")
+            .get::<Vec<Response>>(&url)?;
+
+        if let Some(v) = versions.first() {
+            // The nightly repo tags look like "0.101.1-nightly.4+23dc1b6"
+            // We want to return the "0.101.1-nightly.4" part because hustcer
+            // is changing the cargo.toml package.version to be that syntax
+            let up_through_plus = match v.tag_name.split('+').next() {
+                Some(v) => v,
+                None => &v.tag_name,
+            };
+            return Ok(Some(up_through_plus.to_string()));
+        }
+
+        Ok(None)
+    }
+}
+
+struct NativeTlsHttpClient;
+
+impl HttpClient for NativeTlsHttpClient {
+    fn get<T: serde::de::DeserializeOwned>(
+        url: &str,
+        timeout: std::time::Duration,
+        headers: update_informer::http_client::HeaderMap,
+    ) -> update_informer::Result<T> {
+        let agent = ureq::AgentBuilder::new()
+            .tls_connector(std::sync::Arc::new(native_tls::TlsConnector::new()?))
+            .build();
+
+        let mut req = agent.get(url).timeout(timeout);
+
+        for (header, value) in headers {
+            req = req.set(header, value);
+        }
+
+        let json = req.call()?.into_json()?;
+
+        Ok(json)
+    }
+}
+
+pub fn check_for_latest_nushell_version() -> Value {
+    let current_version = env!("CARGO_PKG_VERSION").to_string();
+
+    let mut rec = Record::new();
+
+    if current_version.contains("nightly") {
+        rec.push("channel", Value::test_string("nightly"));
+
+        let nightly_pkg_name = "nushell/nightly";
+        // The .interval() determines how long the cached check lives. Setting it to std::time::Duration::ZERO
+        // means that there is essentially no cache and it will check for a new version each time you run nushell.
+        // Since this is run on demand, there isn't really a need to cache the check.
+        let informer =
+            update_informer::new(NuShellNightly, nightly_pkg_name, current_version.clone())
+                .http_client(NativeTlsHttpClient)
+                .interval(std::time::Duration::ZERO);
+
+        if let Ok(Some(new_version)) = informer.check_version() {
+            rec.push("current", Value::test_bool(false));
+            rec.push("latest", Value::test_string(format!("{}", new_version)));
+            Value::test_record(rec)
+        } else {
+            rec.push("current", Value::test_bool(true));
+            rec.push("latest", Value::test_string(current_version.clone()));
+            Value::test_record(rec)
+        }
+    } else {
+        rec.push("channel", Value::test_string("release"));
+
+        let normal_pkg_name = "nushell/nushell";
+        // By default, this update request is cached for 24 hours so it won't check for a new version
+        // each time you run nushell. Since this is run on demand, there isn't really a need to cache the check which
+        // is why we set the interval to std::time::Duration::ZERO.
+        let informer =
+            update_informer::new(registry::GitHub, normal_pkg_name, current_version.clone())
+                .interval(std::time::Duration::ZERO);
+
+        if let Ok(Some(new_version)) = informer.check_version() {
+            rec.push("current", Value::test_bool(false));
+            rec.push("latest", Value::test_string(format!("{}", new_version)));
+            Value::test_record(rec)
+        } else {
+            rec.push("current", Value::test_bool(true));
+            rec.push("latest", Value::test_string(current_version.clone()));
+            Value::test_record(rec)
+        }
+    }
+}

From fd684a204cf3d7991cc3f6269610628fee0a7a1e Mon Sep 17 00:00:00 2001
From: anomius <swarajpurohit@gmail.com>
Date: Fri, 24 Jan 2025 06:44:31 +0530
Subject: [PATCH 0951/1072] non-HTTP(s) URLs now works with start (#14370)

# Description
this PR should close #14315
This PR enhances the start command in Nushell to handle both files and
URLs more effectively, including support for custom URL schemes.
Previously, the start command only reliably opened HTTP and HTTPS URLs,
and custom schemes like Spotify and Obsidian which were not handled
earlier.

1. **Custom URL Schemes Support:**
- Added support for opening custom URL schemes

2. **Detailed Error Messages:**
- Improved error reporting for failed external commands.

- Captures and displays error output from the system to aid in
debugging.

**Example**

**Opening a custom URL scheme (e.g., Spotify):**

```bash
start spotify:track:4PTG3Z6ehGkBFwjybzWkR8?si=f9b4cdfc1aa14831
```

Opens the specified track in the Spotify application.

**User-Facing Changes**

- **New Feature:** The start command now supports opening URLs with
custom schemes
---
 crates/nu-command/src/filesystem/start.rs | 145 +++++++++-------------
 crates/nu-command/tests/commands/start.rs | 120 ++++++++++++++++++
 2 files changed, 180 insertions(+), 85 deletions(-)
 create mode 100644 crates/nu-command/tests/commands/start.rs

diff --git a/crates/nu-command/src/filesystem/start.rs b/crates/nu-command/src/filesystem/start.rs
index b295b5f368..619865daed 100644
--- a/crates/nu-command/src/filesystem/start.rs
+++ b/crates/nu-command/src/filesystem/start.rs
@@ -1,9 +1,8 @@
 use itertools::Itertools;
 use nu_engine::{command_prelude::*, env_to_strings};
-use nu_path::canonicalize_with;
+use nu_protocol::ShellError;
 use std::{
     ffi::{OsStr, OsString},
-    path::Path,
     process::Stdio,
 };
 
@@ -16,7 +15,7 @@ impl Command for Start {
     }
 
     fn description(&self) -> &str {
-        "Open a folder, file or website in the default application or viewer."
+        "Open a folder, file, or website in the default application or viewer."
     }
 
     fn search_terms(&self) -> Vec<&str> {
@@ -26,7 +25,7 @@ impl Command for Start {
     fn signature(&self) -> nu_protocol::Signature {
         Signature::build("start")
             .input_output_types(vec![(Type::Nothing, Type::Any)])
-            .required("path", SyntaxShape::String, "Path to open.")
+            .required("path", SyntaxShape::String, "Path or URL to open.")
             .category(Category::FileSystem)
     }
 
@@ -42,59 +41,29 @@ impl Command for Start {
             item: nu_utils::strip_ansi_string_unlikely(path.item),
             span: path.span,
         };
-        let path_no_whitespace = &path.item.trim_end_matches(|x| matches!(x, '\x09'..='\x0d'));
-        // only check if file exists in current current directory
-        let file_path = Path::new(path_no_whitespace);
-        if file_path.exists() {
-            open_path(path_no_whitespace, engine_state, stack, path.span)?;
-        } else if file_path.starts_with("https://") || file_path.starts_with("http://") {
-            let url = url::Url::parse(&path.item).map_err(|_| ShellError::GenericError {
-                error: format!("Cannot parse url: {}", &path.item),
-                msg: "".to_string(),
-                span: Some(path.span),
-                help: Some("cannot parse".to_string()),
-                inner: vec![],
-            })?;
+        let path_no_whitespace = path.item.trim_end_matches(|x| matches!(x, '\x09'..='\x0d'));
+        // Attempt to parse the input as a URL
+        if let Ok(url) = url::Url::parse(path_no_whitespace) {
             open_path(url.as_str(), engine_state, stack, path.span)?;
-        } else {
-            // try to distinguish between file not found and opening url without prefix
-            let cwd = engine_state.cwd(Some(stack))?;
-            if let Ok(canon_path) = canonicalize_with(path_no_whitespace, cwd) {
-                open_path(canon_path, engine_state, stack, path.span)?;
-            } else {
-                // open crate does not allow opening URL without prefix
-                let path_with_prefix = Path::new("https://").join(&path.item);
-                let common_domains = ["com", "net", "org", "edu", "sh"];
-                if let Some(url) = path_with_prefix.to_str() {
-                    let url = url::Url::parse(url).map_err(|_| ShellError::GenericError {
-                        error: format!("Cannot parse url: {}", &path.item),
-                        msg: "".into(),
-                        span: Some(path.span),
-                        help: Some("cannot parse".into()),
-                        inner: vec![],
-                    })?;
-                    if let Some(domain) = url.host() {
-                        let domain = domain.to_string();
-                        let ext = Path::new(&domain).extension().and_then(|s| s.to_str());
-                        if let Some(url_ext) = ext {
-                            if common_domains.contains(&url_ext) {
-                                open_path(url.as_str(), engine_state, stack, path.span)?;
-                            }
-                        }
-                    }
-                    return Err(ShellError::GenericError {
-                        error: format!("Cannot find file or url: {}", &path.item),
-                        msg: "".into(),
-                        span: Some(path.span),
-                        help: Some("Use prefix https:// to disambiguate URLs from files".into()),
-                        inner: vec![],
-                    });
-                }
-            };
+            return Ok(PipelineData::Empty);
         }
-        Ok(PipelineData::Empty)
+        // If it's not a URL, treat it as a file path
+        let cwd = engine_state.cwd(Some(stack))?;
+        let full_path = cwd.join(path_no_whitespace);
+        // Check if the path exists or if it's a valid file/directory
+        if full_path.exists() {
+            open_path(full_path, engine_state, stack, path.span)?;
+            return Ok(PipelineData::Empty);
+        }
+        // If neither file nor URL, return an error
+        Err(ShellError::GenericError {
+            error: format!("Cannot find file or URL: {}", &path.item),
+            msg: "".into(),
+            span: Some(path.span),
+            help: Some("Ensure the path or URL is correct and try again.".into()),
+            inner: vec![],
+        })
     }
-
     fn examples(&self) -> Vec<nu_protocol::Example> {
         vec![
             Example {
@@ -113,15 +82,20 @@ impl Command for Start {
                 result: None,
             },
             Example {
-                description: "Open a pdf with the default pdf viewer",
+                description: "Open a PDF with the default PDF viewer",
                 example: "start file.pdf",
                 result: None,
             },
             Example {
-                description: "Open a website with default browser",
+                description: "Open a website with the default browser",
                 example: "start https://www.nushell.sh",
                 result: None,
             },
+            Example {
+                description: "Open an application-registered protocol URL",
+                example: "start obsidian://open?vault=Test",
+                result: None,
+            },
         ]
     }
 }
@@ -142,47 +116,48 @@ fn try_commands(
     span: Span,
 ) -> Result<(), ShellError> {
     let env_vars_str = env_to_strings(engine_state, stack)?;
-    let cmd_run_result = commands.into_iter().map(|mut cmd| {
+    let mut last_err = None;
+
+    for mut cmd in commands {
         let status = cmd
             .envs(&env_vars_str)
             .stdin(Stdio::null())
             .stdout(Stdio::null())
             .stderr(Stdio::null())
             .status();
-        match status {
-            Ok(status) if status.success() => Ok(()),
-            Ok(status) => Err(format!(
-                "\nCommand `{}` failed with {}",
-                format_command(&cmd),
-                status
-            )),
-            Err(err) => Err(format!(
-                "\nCommand `{}` failed with {}",
-                format_command(&cmd),
-                err
-            )),
-        }
-    });
 
-    for one_result in cmd_run_result {
-        if let Err(err_msg) = one_result {
-            return Err(ShellError::ExternalCommand {
-                label: "No command found to start with this path".to_string(),
-                help: "Try different path or install appropriate command\n".to_string() + &err_msg,
-                span,
-            });
-        } else if one_result.is_ok() {
-            break;
+        match status {
+            Ok(status) if status.success() => return Ok(()),
+            Ok(status) => {
+                last_err = Some(format!(
+                    "Command `{}` failed with exit code: {}",
+                    format_command(&cmd),
+                    status.code().unwrap_or(-1)
+                ));
+            }
+            Err(err) => {
+                last_err = Some(format!(
+                    "Command `{}` failed with error: {}",
+                    format_command(&cmd),
+                    err
+                ));
+            }
         }
     }
-    Ok(())
+
+    Err(ShellError::ExternalCommand {
+        label: "Failed to start the specified path or URL".to_string(),
+        help: format!(
+            "Try a different path or install the appropriate application.\n{}",
+            last_err.unwrap_or_default()
+        ),
+        span,
+    })
 }
 
 fn format_command(command: &std::process::Command) -> String {
-    let parts_iter = std::iter::repeat(command.get_program())
-        .take(1)
-        .chain(command.get_args());
-    Itertools::intersperse(parts_iter, " ".as_ref())
+    let parts_iter = std::iter::once(command.get_program()).chain(command.get_args());
+    Itertools::intersperse(parts_iter, OsStr::new(" "))
         .collect::<OsString>()
         .to_string_lossy()
         .into_owned()
diff --git a/crates/nu-command/tests/commands/start.rs b/crates/nu-command/tests/commands/start.rs
new file mode 100644
index 0000000000..60f8f057b1
--- /dev/null
+++ b/crates/nu-command/tests/commands/start.rs
@@ -0,0 +1,120 @@
+use super::*;
+use nu_protocol::{
+    ast::Call,
+    engine::{EngineState, Stack, StateWorkingSet},
+    PipelineData, Span, Spanned, Type, Value,
+};
+use nu_engine::test_help::{convert_single_value_to_cmd_args, eval_block_with_input};
+use nu_engine::{current_dir, eval_expression};
+use std::path::PathBuf;
+
+/// Create a minimal test engine state and stack to run commands against.
+fn create_test_context() -> (EngineState, Stack) {
+    let mut engine_state = EngineState::new();
+    let mut stack = Stack::new();
+
+    // A working set is needed for storing definitions in the engine state.
+    let _working_set = StateWorkingSet::new(&mut engine_state);
+
+    // Add the `Start` command to the engine state so we can run it.
+    let start_cmd = Start;
+    engine_state.add_cmd(Box::new(start_cmd));
+
+    (engine_state, stack)
+}
+
+#[test]
+fn test_start_valid_url() {
+    let (engine_state, mut stack) = create_test_context();
+
+    // For safety in tests, we won't actually open anything,
+    // but we can still check that the command resolves as a URL
+    // and attempts to run. Typically, you'd mock `open::commands` if needed.
+
+    // Create call for: `start https://www.example.com`
+    let path = "https://www.example.com".to_string();
+    let span = Span::test_data(); 
+    let call = Call::test(
+        "start",
+        // The arguments for `start` are just the path in this case
+        vec![Value::string(path, span)],
+    );
+
+    let result = Start.run(
+        &engine_state,
+        &mut stack,
+        &call,
+        PipelineData::Empty,
+    );
+
+    assert!(
+        result.is_ok(),
+        "Expected successful run with a valid URL, got error: {:?}",
+        result.err()
+    );
+}
+
+#[test]
+fn test_start_valid_local_path() {
+    let (engine_state, mut stack) = create_test_context();
+
+    // Here we'll simulate opening the current directory (`.`).
+    let path = ".".to_string();
+    let span = Span::test_data();
+    let call = Call::test(
+        "start",
+        vec![Value::string(path, span)],
+    );
+
+    let result = Start.run(
+        &engine_state,
+        &mut stack,
+        &call,
+        PipelineData::Empty,
+    );
+
+    // If the environment is correctly set, it should succeed.
+    // If you're running in a CI environment or restricted environment
+    // this might fail, so you may need to mock `open` calls.
+    assert!(
+        result.is_ok(),
+        "Expected successful run opening current directory, got error: {:?}",
+        result.err()
+    );
+}
+
+#[test]
+fn test_start_nonexistent_local_path() {
+    let (engine_state, mut stack) = create_test_context();
+
+    // Create an obviously invalid path
+    let path = "this_file_does_not_exist_hopefully.txt".to_string();
+    let span = Span::test_data();
+    let call = Call::test(
+        "start",
+        vec![Value::string(path, span)],
+    );
+
+    let result = Start.run(
+        &engine_state,
+        &mut stack,
+        &call,
+        PipelineData::Empty,
+    );
+
+    // We expect an error since the file does not exist
+    assert!(
+        result.is_err(),
+        "Expected an error for a non-existent file path"
+    );
+
+    if let Err(ShellError::GenericError { error, .. }) = result {
+        assert!(
+            error.contains("Cannot find file or URL"),
+            "Expected 'Cannot find file or URL' in error, found: {}",
+            error
+        );
+    } else {
+        panic!("Unexpected error type, expected ShellError::GenericError");
+    }
+}
\ No newline at end of file

From 299453ecb7bff2be8fbb3ca6402ce743a1060d03 Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Fri, 24 Jan 2025 20:44:55 +0800
Subject: [PATCH 0952/1072] feat(lsp): better completion item documentation
 (#14905)

# Description

This PR adds those markdown doc strings (previously only available via
hover) to completion items:

<img width="676" alt="image"
src="https://github.com/user-attachments/assets/58c44d7d-4b49-4955-b3f0-fa7a727a8bc0"
/>

It also refactors a bit, primarily to prevent namespace pollution.

# User-Facing Changes

# Tests + Formatting

# After Submitting
---
 crates/nu-lsp/src/ast.rs          |  27 +-
 crates/nu-lsp/src/diagnostics.rs  |   5 +-
 crates/nu-lsp/src/goto.rs         |   9 +-
 crates/nu-lsp/src/hints.rs        |  18 +-
 crates/nu-lsp/src/lib.rs          | 527 ++++++++++++++++--------------
 crates/nu-lsp/src/notification.rs |  36 +-
 crates/nu-lsp/src/symbols.rs      |  32 +-
 crates/nu-lsp/src/workspace.rs    | 181 +++++-----
 8 files changed, 431 insertions(+), 404 deletions(-)

diff --git a/crates/nu-lsp/src/ast.rs b/crates/nu-lsp/src/ast.rs
index e0925cab47..62d7b85f56 100644
--- a/crates/nu-lsp/src/ast.rs
+++ b/crates/nu-lsp/src/ast.rs
@@ -1,3 +1,4 @@
+use crate::Id;
 use nu_protocol::{
     ast::{
         Argument, Block, Call, Expr, Expression, ExternalArgument, ListItem, MatchPattern, Pattern,
@@ -6,9 +7,7 @@ use nu_protocol::{
     engine::StateWorkingSet,
     Span,
 };
-use std::{path::PathBuf, sync::Arc};
-
-use crate::Id;
+use std::sync::Arc;
 
 /// similar to flatten_block, but allows extra map function
 pub fn ast_flat_map<'a, T, F>(
@@ -243,7 +242,7 @@ fn try_find_id_in_mod(
     id_ref: Option<&Id>,
 ) -> Option<(Id, Span)> {
     let call_name = working_set.get_span_contents(call.head);
-    if call_name != "module".as_bytes() && call_name != "export module".as_bytes() {
+    if call_name != b"module" && call_name != b"export module" {
         return None;
     };
     let check_location = |span: &Span| location.map_or(true, |pos| span.contains(*pos));
@@ -283,7 +282,7 @@ fn try_find_id_in_use(
     id: Option<&Id>,
 ) -> Option<(Id, Span)> {
     let call_name = working_set.get_span_contents(call.head);
-    if call_name != "use".as_bytes() {
+    if call_name != b"use" {
         return None;
     }
     let find_by_name = |name: &[u8]| match id {
@@ -307,7 +306,7 @@ fn try_find_id_in_use(
     let get_module_id = |span: Span| {
         let span = strip_quotes(span, working_set);
         let name = String::from_utf8_lossy(working_set.get_span_contents(span));
-        let path = PathBuf::from(name.as_ref());
+        let path = std::path::PathBuf::from(name.as_ref());
         let stem = path.file_stem().and_then(|fs| fs.to_str()).unwrap_or(&name);
         let found_id = Id::Module(working_set.find_module(stem.as_bytes())?);
         id.map_or(true, |id_r| found_id == *id_r)
@@ -420,7 +419,7 @@ fn find_id_in_expr(
 }
 
 /// find the leaf node at the given location from ast
-pub fn find_id(
+pub(crate) fn find_id(
     ast: &Arc<Block>,
     working_set: &StateWorkingSet,
     location: &usize,
@@ -452,11 +451,9 @@ fn find_reference_by_id_in_expr(
                 .filter_map(|arg| arg.expr())
                 .flat_map(recur)
                 .collect();
-            if let Id::Declaration(decl_id) = id {
-                if *decl_id == call.decl_id {
-                    occurs.push(call.head);
-                    return Some(occurs);
-                }
+            if matches!(id, Id::Declaration(decl_id) if call.decl_id == *decl_id) {
+                occurs.push(call.head);
+                return Some(occurs);
             }
             if let Some((_, span_found)) = try_find_id_in_def(call, working_set, None, Some(id))
                 .or(try_find_id_in_mod(call, working_set, None, Some(id)))
@@ -470,7 +467,11 @@ fn find_reference_by_id_in_expr(
     }
 }
 
-pub fn find_reference_by_id(ast: &Arc<Block>, working_set: &StateWorkingSet, id: &Id) -> Vec<Span> {
+pub(crate) fn find_reference_by_id(
+    ast: &Arc<Block>,
+    working_set: &StateWorkingSet,
+    id: &Id,
+) -> Vec<Span> {
     ast_flat_map(ast, working_set, &|e| {
         find_reference_by_id_in_expr(e, working_set, id)
     })
diff --git a/crates/nu-lsp/src/diagnostics.rs b/crates/nu-lsp/src/diagnostics.rs
index 632521b024..70e94a7da2 100644
--- a/crates/nu-lsp/src/diagnostics.rs
+++ b/crates/nu-lsp/src/diagnostics.rs
@@ -49,11 +49,10 @@ impl LanguageServer {
 
 #[cfg(test)]
 mod tests {
-    use assert_json_diff::assert_json_eq;
-    use nu_test_support::fs::fixtures;
-
     use crate::path_to_uri;
     use crate::tests::{initialize_language_server, open_unchecked, update};
+    use assert_json_diff::assert_json_eq;
+    use nu_test_support::fs::fixtures;
 
     #[test]
     fn publish_diagnostics_variable_does_not_exists() {
diff --git a/crates/nu-lsp/src/goto.rs b/crates/nu-lsp/src/goto.rs
index a1a5527675..15e607477e 100644
--- a/crates/nu-lsp/src/goto.rs
+++ b/crates/nu-lsp/src/goto.rs
@@ -4,7 +4,10 @@ use nu_protocol::engine::StateWorkingSet;
 use nu_protocol::Span;
 
 impl LanguageServer {
-    pub fn find_definition_span_by_id(working_set: &StateWorkingSet, id: &Id) -> Option<Span> {
+    pub(crate) fn find_definition_span_by_id(
+        working_set: &StateWorkingSet,
+        id: &Id,
+    ) -> Option<Span> {
         match id {
             Id::Declaration(decl_id) => {
                 let block_id = working_set.get_decl(*decl_id).block_id()?;
@@ -22,7 +25,7 @@ impl LanguageServer {
         }
     }
 
-    pub fn goto_definition(
+    pub(crate) fn goto_definition(
         &mut self,
         params: &GotoDefinitionParams,
     ) -> Option<GotoDefinitionResponse> {
@@ -54,8 +57,8 @@ mod tests {
     use crate::tests::{initialize_language_server, open_unchecked};
     use assert_json_diff::assert_json_eq;
     use lsp_server::{Connection, Message};
-    use lsp_types::request::{GotoDefinition, Request};
     use lsp_types::{
+        request::{GotoDefinition, Request},
         GotoDefinitionParams, PartialResultParams, Position, TextDocumentIdentifier,
         TextDocumentPositionParams, Uri, WorkDoneProgressParams,
     };
diff --git a/crates/nu-lsp/src/hints.rs b/crates/nu-lsp/src/hints.rs
index 44f4ab66b7..a3ee410cf4 100644
--- a/crates/nu-lsp/src/hints.rs
+++ b/crates/nu-lsp/src/hints.rs
@@ -1,5 +1,3 @@
-use std::sync::Arc;
-
 use crate::ast::{ast_flat_map, expr_flat_map};
 use crate::{span_to_range, LanguageServer};
 use lsp_textdocument::FullTextDocument;
@@ -12,6 +10,7 @@ use nu_protocol::{
     engine::StateWorkingSet,
     Type,
 };
+use std::sync::Arc;
 
 fn type_short_name(t: &Type) -> String {
     match t {
@@ -145,12 +144,11 @@ fn extract_inlay_hints_from_expression(
 }
 
 impl LanguageServer {
-    pub fn get_inlay_hints(&mut self, params: &InlayHintParams) -> Option<Vec<InlayHint>> {
+    pub(crate) fn get_inlay_hints(&mut self, params: &InlayHintParams) -> Option<Vec<InlayHint>> {
         Some(self.inlay_hints.get(&params.text_document.uri)?.clone())
     }
 
-    pub fn extract_inlay_hints(
-        &self,
+    pub(crate) fn extract_inlay_hints(
         working_set: &StateWorkingSet,
         block: &Arc<Block>,
         offset: usize,
@@ -164,17 +162,15 @@ impl LanguageServer {
 
 #[cfg(test)]
 mod tests {
-    use assert_json_diff::assert_json_eq;
-    use lsp_types::request::Request;
-    use nu_test_support::fs::fixtures;
-
     use crate::path_to_uri;
     use crate::tests::{initialize_language_server, open_unchecked};
+    use assert_json_diff::assert_json_eq;
     use lsp_server::{Connection, Message};
     use lsp_types::{
-        request::InlayHintRequest, InlayHintParams, Position, Range, TextDocumentIdentifier, Uri,
-        WorkDoneProgressParams,
+        request::{InlayHintRequest, Request},
+        InlayHintParams, Position, Range, TextDocumentIdentifier, Uri, WorkDoneProgressParams,
     };
+    use nu_test_support::fs::fixtures;
 
     fn send_inlay_hint_request(client_connection: &Connection, uri: Uri) -> Message {
         client_connection
diff --git a/crates/nu-lsp/src/lib.rs b/crates/nu-lsp/src/lib.rs
index 788afd9e0e..14862fb6c5 100644
--- a/crates/nu-lsp/src/lib.rs
+++ b/crates/nu-lsp/src/lib.rs
@@ -1,33 +1,31 @@
 #![doc = include_str!("../README.md")]
-use ast::find_id;
-use crossbeam_channel::{Receiver, Sender};
 use lsp_server::{Connection, IoThreads, Message, Response, ResponseError};
 use lsp_textdocument::{FullTextDocument, TextDocuments};
 use lsp_types::{
     request::{self, Request},
-    CompletionItem, CompletionItemKind, CompletionParams, CompletionResponse, CompletionTextEdit,
-    Hover, HoverContents, HoverParams, InlayHint, Location, MarkupContent, MarkupKind, OneOf,
-    Position, Range, ReferencesOptions, RenameOptions, ServerCapabilities, TextDocumentSyncKind,
-    TextEdit, Uri, WorkDoneProgressOptions, WorkspaceFolder, WorkspaceFoldersServerCapabilities,
+    CompletionItem, CompletionItemKind, CompletionItemLabelDetails, CompletionParams,
+    CompletionResponse, CompletionTextEdit, Documentation, Hover, HoverContents, HoverParams,
+    InlayHint, Location, MarkupContent, MarkupKind, OneOf, Position, Range, ReferencesOptions,
+    RenameOptions, ServerCapabilities, TextDocumentSyncKind, TextEdit, Uri,
+    WorkDoneProgressOptions, WorkspaceFolder, WorkspaceFoldersServerCapabilities,
     WorkspaceServerCapabilities,
 };
 use miette::{miette, IntoDiagnostic, Result};
 use nu_cli::{NuCompleter, SuggestionKind};
-use nu_parser::parse;
 use nu_protocol::{
     ast::Block,
-    engine::{CachedFile, EngineState, Stack, StateDelta, StateWorkingSet},
-    DeclId, ModuleId, Span, Type, Value, VarId,
+    engine::{CachedFile, Command, EngineState, Stack, StateDelta, StateWorkingSet},
+    DeclId, ModuleId, Span, Type, VarId,
 };
-use std::{collections::BTreeMap, sync::Mutex};
 use std::{
+    collections::BTreeMap,
     path::{Path, PathBuf},
     str::FromStr,
     sync::Arc,
+    sync::Mutex,
     time::Duration,
 };
 use symbols::SymbolCache;
-use url::Url;
 use workspace::{InternalMessage, RangePerDoc};
 
 mod ast;
@@ -39,7 +37,7 @@ mod symbols;
 mod workspace;
 
 #[derive(Debug, Clone, Eq, PartialEq)]
-pub enum Id {
+pub(crate) enum Id {
     Variable(VarId),
     Declaration(DeclId),
     Value(Type),
@@ -56,30 +54,33 @@ pub struct LanguageServer {
     workspace_folders: BTreeMap<String, WorkspaceFolder>,
     /// for workspace wide requests
     occurrences: BTreeMap<Uri, Vec<Range>>,
-    channels: Option<(Sender<bool>, Arc<Receiver<InternalMessage>>)>,
+    channels: Option<(
+        crossbeam_channel::Sender<bool>,
+        Arc<crossbeam_channel::Receiver<InternalMessage>>,
+    )>,
     /// set to true when text changes
     need_parse: bool,
     /// cache `StateDelta` to avoid repeated parsing
     cached_state_delta: Option<StateDelta>,
 }
 
-pub fn path_to_uri(path: impl AsRef<Path>) -> Uri {
+pub(crate) fn path_to_uri(path: impl AsRef<Path>) -> Uri {
     Uri::from_str(
-        Url::from_file_path(path)
+        url::Url::from_file_path(path)
             .expect("Failed to convert path to Url")
             .as_str(),
     )
     .expect("Failed to convert Url to lsp_types::Uri.")
 }
 
-pub fn uri_to_path(uri: &Uri) -> PathBuf {
-    Url::from_str(uri.as_str())
+pub(crate) fn uri_to_path(uri: &Uri) -> PathBuf {
+    url::Url::from_str(uri.as_str())
         .expect("Failed to convert Uri to Url")
         .to_file_path()
         .expect("Failed to convert Url to path")
 }
 
-pub fn span_to_range(span: &Span, file: &FullTextDocument, offset: usize) -> Range {
+pub(crate) fn span_to_range(span: &Span, file: &FullTextDocument, offset: usize) -> Range {
     let start = file.position_at(span.start.saturating_sub(offset) as u32);
     let end = file.position_at(span.end.saturating_sub(offset) as u32);
     Range { start, end }
@@ -251,14 +252,14 @@ impl LanguageServer {
     }
 
     /// Send a cancel message to a running bg thread
-    pub fn cancel_background_thread(&mut self) {
+    pub(crate) fn cancel_background_thread(&mut self) {
         if let Some((sender, _)) = &self.channels {
             sender.send(true).ok();
         }
     }
 
     /// Check results from background thread
-    pub fn handle_internal_messages(&mut self) -> Result<bool> {
+    pub(crate) fn handle_internal_messages(&mut self) -> Result<bool> {
         let mut reset = false;
         if let Some((_, receiver)) = &self.channels {
             for im in receiver.try_iter() {
@@ -286,10 +287,13 @@ impl LanguageServer {
         Ok(reset)
     }
 
-    pub fn new_engine_state(&self) -> EngineState {
+    pub(crate) fn new_engine_state(&self) -> EngineState {
         let mut engine_state = self.initial_engine_state.clone();
         let cwd = std::env::current_dir().expect("Could not get current working directory.");
-        engine_state.add_env_var("PWD".into(), Value::test_string(cwd.to_string_lossy()));
+        engine_state.add_env_var(
+            "PWD".into(),
+            nu_protocol::Value::test_string(cwd.to_string_lossy()),
+        );
         // merge the cached `StateDelta` if text not changed
         if !self.need_parse {
             engine_state
@@ -303,7 +307,7 @@ impl LanguageServer {
         engine_state
     }
 
-    pub fn parse_and_find<'a>(
+    pub(crate) fn parse_and_find<'a>(
         &mut self,
         engine_state: &'a mut EngineState,
         uri: &Uri,
@@ -321,12 +325,12 @@ impl LanguageServer {
             .get_document(uri)
             .ok_or_else(|| miette!("\nFailed to get document"))?;
         let location = file.offset_at(pos) as usize + file_span.start;
-        let (id, span) = find_id(&block, &working_set, &location)
+        let (id, span) = ast::find_id(&block, &working_set, &location)
             .ok_or_else(|| miette!("\nFailed to find current name"))?;
         Ok((working_set, id, span, file_span.start))
     }
 
-    pub fn parse_file<'a>(
+    pub(crate) fn parse_file<'a>(
         &mut self,
         engine_state: &'a mut EngineState,
         uri: &Uri,
@@ -339,10 +343,11 @@ impl LanguageServer {
         let file_path_str = file_path.to_str()?;
         let contents = file.get_content(None).as_bytes();
         let _ = working_set.files.push(file_path.clone(), Span::unknown());
-        let block = parse(&mut working_set, Some(file_path_str), contents, false);
+        let block = nu_parser::parse(&mut working_set, Some(file_path_str), contents, false);
         let span = working_set.get_span_for_filename(file_path_str)?;
         if need_hints {
-            let file_inlay_hints = self.extract_inlay_hints(&working_set, &block, span.start, file);
+            let file_inlay_hints =
+                Self::extract_inlay_hints(&working_set, &block, span.start, file);
             self.inlay_hints.insert(uri.clone(), file_inlay_hints);
         }
         if self.need_parse {
@@ -418,6 +423,141 @@ impl LanguageServer {
         }
     }
 
+    fn get_decl_description(decl: &dyn Command) -> String {
+        let mut description = String::new();
+
+        // First description
+        description.push_str(&format!("{}\n", decl.description().replace('\r', "")));
+
+        // Additional description
+        if !decl.extra_description().is_empty() {
+            description.push_str(&format!("\n{}\n", decl.extra_description()));
+        }
+
+        // Usage
+        description.push_str("-----\n### Usage \n```nu\n");
+        let signature = decl.signature();
+        description.push_str(&format!("  {}", signature.name));
+        if !signature.named.is_empty() {
+            description.push_str(" {flags}");
+        }
+        for required_arg in &signature.required_positional {
+            description.push_str(&format!(" <{}>", required_arg.name));
+        }
+        for optional_arg in &signature.optional_positional {
+            description.push_str(&format!(" <{}?>", optional_arg.name));
+        }
+        if let Some(arg) = &signature.rest_positional {
+            description.push_str(&format!(" <...{}>", arg.name));
+        }
+        description.push_str("\n```\n");
+
+        // Flags
+        if !signature.named.is_empty() {
+            description.push_str("\n### Flags\n\n");
+            let mut first = true;
+            for named in &signature.named {
+                if first {
+                    first = false;
+                } else {
+                    description.push('\n');
+                }
+                description.push_str("  ");
+                if let Some(short_flag) = &named.short {
+                    description.push_str(&format!("`-{short_flag}`"));
+                }
+                if !named.long.is_empty() {
+                    if named.short.is_some() {
+                        description.push_str(", ");
+                    }
+                    description.push_str(&format!("`--{}`", named.long));
+                }
+                if let Some(arg) = &named.arg {
+                    description.push_str(&format!(" `<{}>`", arg.to_type()));
+                }
+                if !named.desc.is_empty() {
+                    description.push_str(&format!(" - {}", named.desc));
+                }
+                description.push('\n');
+            }
+            description.push('\n');
+        }
+
+        // Parameters
+        if !signature.required_positional.is_empty()
+            || !signature.optional_positional.is_empty()
+            || signature.rest_positional.is_some()
+        {
+            description.push_str("\n### Parameters\n\n");
+            let mut first = true;
+            for required_arg in &signature.required_positional {
+                if first {
+                    first = false;
+                } else {
+                    description.push('\n');
+                }
+                description.push_str(&format!(
+                    "  `{}: {}`",
+                    required_arg.name,
+                    required_arg.shape.to_type()
+                ));
+                if !required_arg.desc.is_empty() {
+                    description.push_str(&format!(" - {}", required_arg.desc));
+                }
+                description.push('\n');
+            }
+            for optional_arg in &signature.optional_positional {
+                if first {
+                    first = false;
+                } else {
+                    description.push('\n');
+                }
+                description.push_str(&format!(
+                    "  `{}: {}`",
+                    optional_arg.name,
+                    optional_arg.shape.to_type()
+                ));
+                if !optional_arg.desc.is_empty() {
+                    description.push_str(&format!(" - {}", optional_arg.desc));
+                }
+                description.push('\n');
+            }
+            if let Some(arg) = &signature.rest_positional {
+                if !first {
+                    description.push('\n');
+                }
+                description.push_str(&format!(" `...{}: {}`", arg.name, arg.shape.to_type()));
+                if !arg.desc.is_empty() {
+                    description.push_str(&format!(" - {}", arg.desc));
+                }
+                description.push('\n');
+            }
+            description.push('\n');
+        }
+
+        // Input/output types
+        if !signature.input_output_types.is_empty() {
+            description.push_str("\n### Input/output types\n");
+            description.push_str("\n```nu\n");
+            for input_output in &signature.input_output_types {
+                description.push_str(&format!(" {} | {}\n", input_output.0, input_output.1));
+            }
+            description.push_str("\n```\n");
+        }
+
+        // Examples
+        if !decl.examples().is_empty() {
+            description.push_str("### Example(s)\n");
+            for example in decl.examples() {
+                description.push_str(&format!(
+                    "  {}\n```nu\n  {}\n```\n",
+                    example.description, example.example
+                ));
+            }
+        }
+        description
+    }
+
     fn hover(&mut self, params: &HoverParams) -> Option<Hover> {
         let mut engine_state = self.new_engine_state();
 
@@ -448,150 +588,20 @@ impl LanguageServer {
         match id {
             Id::Variable(var_id) => {
                 let var = working_set.get_variable(var_id);
-                let contents =
-                    format!("{} `{}`", if var.mutable { "mutable " } else { "" }, var.ty);
+                let contents = format!(
+                    "{}{} `{}`",
+                    if var.const_val.is_some() {
+                        "const "
+                    } else {
+                        ""
+                    },
+                    if var.mutable { "mutable " } else { "" },
+                    var.ty,
+                );
                 markdown_hover(contents)
             }
             Id::Declaration(decl_id) => {
-                let decl = working_set.get_decl(decl_id);
-
-                let mut description = String::new();
-
-                // First description
-                description.push_str(&format!("{}\n", decl.description().replace('\r', "")));
-
-                // Additional description
-                if !decl.extra_description().is_empty() {
-                    description.push_str(&format!("\n{}\n", decl.extra_description()));
-                }
-
-                // Usage
-                description.push_str("-----\n### Usage \n```nu\n");
-                let signature = decl.signature();
-                description.push_str(&format!("  {}", signature.name));
-                if !signature.named.is_empty() {
-                    description.push_str(" {flags}");
-                }
-                for required_arg in &signature.required_positional {
-                    description.push_str(&format!(" <{}>", required_arg.name));
-                }
-                for optional_arg in &signature.optional_positional {
-                    description.push_str(&format!(" <{}?>", optional_arg.name));
-                }
-                if let Some(arg) = &signature.rest_positional {
-                    description.push_str(&format!(" <...{}>", arg.name));
-                }
-                description.push_str("\n```\n");
-
-                // Flags
-                if !signature.named.is_empty() {
-                    description.push_str("\n### Flags\n\n");
-                    let mut first = true;
-                    for named in &signature.named {
-                        if first {
-                            first = false;
-                        } else {
-                            description.push('\n');
-                        }
-                        description.push_str("  ");
-                        if let Some(short_flag) = &named.short {
-                            description.push_str(&format!("`-{short_flag}`"));
-                        }
-                        if !named.long.is_empty() {
-                            if named.short.is_some() {
-                                description.push_str(", ");
-                            }
-                            description.push_str(&format!("`--{}`", named.long));
-                        }
-                        if let Some(arg) = &named.arg {
-                            description.push_str(&format!(" `<{}>`", arg.to_type()));
-                        }
-                        if !named.desc.is_empty() {
-                            description.push_str(&format!(" - {}", named.desc));
-                        }
-                        description.push('\n');
-                    }
-                    description.push('\n');
-                }
-
-                // Parameters
-                if !signature.required_positional.is_empty()
-                    || !signature.optional_positional.is_empty()
-                    || signature.rest_positional.is_some()
-                {
-                    description.push_str("\n### Parameters\n\n");
-                    let mut first = true;
-                    for required_arg in &signature.required_positional {
-                        if first {
-                            first = false;
-                        } else {
-                            description.push('\n');
-                        }
-                        description.push_str(&format!(
-                            "  `{}: {}`",
-                            required_arg.name,
-                            required_arg.shape.to_type()
-                        ));
-                        if !required_arg.desc.is_empty() {
-                            description.push_str(&format!(" - {}", required_arg.desc));
-                        }
-                        description.push('\n');
-                    }
-                    for optional_arg in &signature.optional_positional {
-                        if first {
-                            first = false;
-                        } else {
-                            description.push('\n');
-                        }
-                        description.push_str(&format!(
-                            "  `{}: {}`",
-                            optional_arg.name,
-                            optional_arg.shape.to_type()
-                        ));
-                        if !optional_arg.desc.is_empty() {
-                            description.push_str(&format!(" - {}", optional_arg.desc));
-                        }
-                        description.push('\n');
-                    }
-                    if let Some(arg) = &signature.rest_positional {
-                        if !first {
-                            description.push('\n');
-                        }
-                        description.push_str(&format!(
-                            " `...{}: {}`",
-                            arg.name,
-                            arg.shape.to_type()
-                        ));
-                        if !arg.desc.is_empty() {
-                            description.push_str(&format!(" - {}", arg.desc));
-                        }
-                        description.push('\n');
-                    }
-                    description.push('\n');
-                }
-
-                // Input/output types
-                if !signature.input_output_types.is_empty() {
-                    description.push_str("\n### Input/output types\n");
-                    description.push_str("\n```nu\n");
-                    for input_output in &signature.input_output_types {
-                        description
-                            .push_str(&format!(" {} | {}\n", input_output.0, input_output.1));
-                    }
-                    description.push_str("\n```\n");
-                }
-
-                // Examples
-                if !decl.examples().is_empty() {
-                    description.push_str("### Example(s)\n");
-                    for example in decl.examples() {
-                        description.push_str(&format!(
-                            "  {}\n```nu\n  {}\n```\n",
-                            example.description, example.example
-                        ));
-                    }
-                }
-                markdown_hover(description)
+                markdown_hover(Self::get_decl_description(working_set.get_decl(decl_id)))
             }
             Id::Module(module_id) => {
                 let mut description = String::new();
@@ -612,40 +622,62 @@ impl LanguageServer {
         let docs = self.docs.lock().ok()?;
         let file = docs.get_document(&path_uri)?;
 
-        let mut completer = NuCompleter::new(
-            Arc::new(self.initial_engine_state.clone()),
-            Arc::new(Stack::new()),
-        );
+        let engine_state = Arc::new(self.initial_engine_state.clone());
+        let mut completer = NuCompleter::new(engine_state.clone(), Arc::new(Stack::new()));
 
         let location = file.offset_at(params.text_document_position.position) as usize;
         let results = completer.fetch_completions_at(&file.get_content(None)[..location], location);
-        if results.is_empty() {
-            None
-        } else {
-            Some(CompletionResponse::Array(
-                results
-                    .into_iter()
-                    .map(|r| {
-                        let mut start = params.text_document_position.position;
-                        start.character -= (r.suggestion.span.end - r.suggestion.span.start) as u32;
+        (!results.is_empty()).then_some(CompletionResponse::Array(
+            results
+                .into_iter()
+                .map(|r| {
+                    let mut start = params.text_document_position.position;
+                    start.character -= (r.suggestion.span.end - r.suggestion.span.start) as u32;
+                    let decl_id = r.kind.clone().and_then(|kind| {
+                        matches!(kind, SuggestionKind::Command(_))
+                            .then_some(engine_state.find_decl(r.suggestion.value.as_bytes(), &[])?)
+                    });
 
-                        CompletionItem {
-                            label: r.suggestion.value.clone(),
-                            detail: r.suggestion.description,
-                            kind: Self::lsp_completion_item_kind(r.kind),
-                            text_edit: Some(CompletionTextEdit::Edit(TextEdit {
-                                range: Range {
-                                    start,
-                                    end: params.text_document_position.position,
-                                },
-                                new_text: r.suggestion.value,
-                            })),
-                            ..Default::default()
-                        }
-                    })
-                    .collect(),
-            ))
-        }
+                    CompletionItem {
+                        label: r.suggestion.value.clone(),
+                        label_details: r
+                            .kind
+                            .clone()
+                            .map(|kind| match kind {
+                                SuggestionKind::Type(t) => t.to_string(),
+                                SuggestionKind::Command(cmd) => cmd.to_string(),
+                            })
+                            .map(|s| CompletionItemLabelDetails {
+                                detail: None,
+                                description: Some(s),
+                            }),
+                        detail: r.suggestion.description,
+                        documentation: r
+                            .suggestion
+                            .extra
+                            .map(|ex| ex.join("\n"))
+                            .or(decl_id.map(|decl_id| {
+                                Self::get_decl_description(engine_state.get_decl(decl_id))
+                            }))
+                            .map(|value| {
+                                Documentation::MarkupContent(MarkupContent {
+                                    kind: MarkupKind::Markdown,
+                                    value,
+                                })
+                            }),
+                        kind: Self::lsp_completion_item_kind(r.kind),
+                        text_edit: Some(CompletionTextEdit::Edit(TextEdit {
+                            range: Range {
+                                start,
+                                end: params.text_document_position.position,
+                            },
+                            new_text: r.suggestion.value,
+                        })),
+                        ..Default::default()
+                    }
+                })
+                .collect(),
+        ))
     }
 
     fn lsp_completion_item_kind(
@@ -681,8 +713,9 @@ mod tests {
     };
     use nu_test_support::fs::fixtures;
     use std::sync::mpsc::Receiver;
+    use std::time::Duration;
 
-    pub fn initialize_language_server(
+    pub(crate) fn initialize_language_server(
         params: Option<InitializeParams>,
     ) -> (Connection, Receiver<Result<()>>) {
         use std::sync::mpsc;
@@ -713,7 +746,7 @@ mod tests {
 
         let _initialize_response = client_connection
             .receiver
-            .recv_timeout(std::time::Duration::from_secs(2))
+            .recv_timeout(Duration::from_secs(2))
             .unwrap();
 
         (client_connection, recv)
@@ -739,17 +772,17 @@ mod tests {
             }))
             .unwrap();
 
-        assert!(recv
-            .recv_timeout(std::time::Duration::from_secs(2))
-            .unwrap()
-            .is_ok());
+        assert!(recv.recv_timeout(Duration::from_secs(2)).unwrap().is_ok());
     }
 
-    pub fn open_unchecked(client_connection: &Connection, uri: Uri) -> lsp_server::Notification {
+    pub(crate) fn open_unchecked(
+        client_connection: &Connection,
+        uri: Uri,
+    ) -> lsp_server::Notification {
         open(client_connection, uri).unwrap()
     }
 
-    pub fn open(
+    pub(crate) fn open(
         client_connection: &Connection,
         uri: Uri,
     ) -> Result<lsp_server::Notification, String> {
@@ -783,7 +816,7 @@ mod tests {
         }
     }
 
-    pub fn update(
+    pub(crate) fn update(
         client_connection: &Connection,
         uri: Uri,
         text: String,
@@ -822,7 +855,7 @@ mod tests {
         }
     }
 
-    pub fn send_hover_request(
+    pub(crate) fn send_hover_request(
         client_connection: &Connection,
         uri: Uri,
         line: u32,
@@ -846,7 +879,7 @@ mod tests {
 
         client_connection
             .receiver
-            .recv_timeout(std::time::Duration::from_secs(2))
+            .recv_timeout(Duration::from_secs(2))
             .unwrap()
     }
 
@@ -991,7 +1024,7 @@ mod tests {
 
         client_connection
             .receiver
-            .recv_timeout(std::time::Duration::from_secs(2))
+            .recv_timeout(Duration::from_secs(2))
             .unwrap()
     }
 
@@ -1014,20 +1047,18 @@ mod tests {
             panic!()
         };
 
-        assert_json_eq!(
-            result,
-            serde_json::json!([
+        assert_json_include!(
+            actual: result,
+            expected: serde_json::json!([
                 {
                     "label": "$greeting",
+                    "labelDetails": { "description": "string" },
                     "textEdit": {
-                    "newText": "$greeting",
-                    "range": {
-                    "start": { "character": 5, "line": 2 },
-                "end": { "character": 9, "line": 2 }
-            }
-            },
-                "kind": 6
-            }
+                        "newText": "$greeting",
+                        "range": { "start": { "character": 5, "line": 2 }, "end": { "character": 9, "line": 2 } }
+                    },
+                    "kind": 6
+                }
             ])
         );
     }
@@ -1051,21 +1082,17 @@ mod tests {
             panic!()
         };
 
-        assert_json_eq!(
-            result,
-            serde_json::json!([
+        assert_json_include!(
+            actual: result,
+            expected: serde_json::json!([
                 {
                     "label": "config nu",
                     "detail": "Edit nu configurations.",
-                    "textEdit": {
-                    "range": {
-                    "start": { "line": 0, "character": 0 },
-                "end": { "line": 0, "character": 8 },
-            },
-                "newText": "config nu"
-            },
-                "kind": 3
-            }
+                    "textEdit": { "range": { "start": { "line": 0, "character": 0 }, "end": { "line": 0, "character": 8 }, },
+                        "newText": "config nu"
+                    },
+                    "kind": 3
+                }
             ])
         );
     }
@@ -1089,21 +1116,19 @@ mod tests {
             panic!()
         };
 
-        assert_json_eq!(
-            result,
-            serde_json::json!([
+        assert_json_include!(
+            actual: result,
+            expected: serde_json::json!([
                 {
                     "label": "str trim",
+                    "labelDetails": { "description": "built-in" },
                     "detail": "Trim whitespace or specific character.",
                     "textEdit": {
-                    "range": {
-                    "start": { "line": 0, "character": 8 },
-                "end": { "line": 0, "character": 13 },
-            },
-                "newText": "str trim"
-            },
-                "kind": 3
-            }
+                        "range": { "start": { "line": 0, "character": 8 }, "end": { "line": 0, "character": 13 }, },
+                        "newText": "str trim"
+                    },
+                    "kind": 3
+                }
             ])
         );
     }
@@ -1132,15 +1157,13 @@ mod tests {
             expected: serde_json::json!([
                 {
                     "label": "overlay",
+                    "labelDetails": { "description": "keyword" },
                     "textEdit": {
-                    "newText": "overlay",
-                    "range": {
-                    "start": { "character": 0, "line": 0 },
-                "end": { "character": 2, "line": 0 }
-            }
-            },
-                "kind": 14
-            },
+                        "newText": "overlay",
+                        "range": { "start": { "character": 0, "line": 0 }, "end": { "character": 2, "line": 0 } }
+                    },
+                    "kind": 14
+                },
             ])
         );
     }
diff --git a/crates/nu-lsp/src/notification.rs b/crates/nu-lsp/src/notification.rs
index 399d1237f6..d64e5412ac 100644
--- a/crates/nu-lsp/src/notification.rs
+++ b/crates/nu-lsp/src/notification.rs
@@ -1,4 +1,4 @@
-use lsp_server::{Message, RequestId, Response, ResponseError};
+use crate::LanguageServer;
 use lsp_types::{
     notification::{
         DidChangeTextDocument, DidChangeWorkspaceFolders, DidCloseTextDocument,
@@ -8,8 +8,6 @@ use lsp_types::{
     DidOpenTextDocumentParams, ProgressParams, ProgressParamsValue, ProgressToken, Uri,
     WorkDoneProgress, WorkDoneProgressBegin, WorkDoneProgressEnd, WorkDoneProgressReport,
 };
-
-use crate::LanguageServer;
 use miette::{IntoDiagnostic, Result};
 
 impl LanguageServer {
@@ -57,7 +55,7 @@ impl LanguageServer {
         }
     }
 
-    pub fn send_progress_notification(
+    pub(crate) fn send_progress_notification(
         &self,
         token: ProgressToken,
         value: WorkDoneProgress,
@@ -74,7 +72,7 @@ impl LanguageServer {
             .into_diagnostic()
     }
 
-    pub fn send_progress_begin(&self, token: ProgressToken, title: String) -> Result<()> {
+    pub(crate) fn send_progress_begin(&self, token: ProgressToken, title: String) -> Result<()> {
         self.send_progress_notification(
             token,
             WorkDoneProgress::Begin(WorkDoneProgressBegin {
@@ -86,7 +84,7 @@ impl LanguageServer {
         )
     }
 
-    pub fn send_progress_report(
+    pub(crate) fn send_progress_report(
         &self,
         token: ProgressToken,
         percentage: u32,
@@ -102,20 +100,29 @@ impl LanguageServer {
         )
     }
 
-    pub fn send_progress_end(&self, token: ProgressToken, message: Option<String>) -> Result<()> {
+    pub(crate) fn send_progress_end(
+        &self,
+        token: ProgressToken,
+        message: Option<String>,
+    ) -> Result<()> {
         self.send_progress_notification(
             token,
             WorkDoneProgress::End(WorkDoneProgressEnd { message }),
         )
     }
 
-    pub fn send_error_message(&self, id: RequestId, code: i32, message: String) -> Result<()> {
+    pub(crate) fn send_error_message(
+        &self,
+        id: lsp_server::RequestId,
+        code: i32,
+        message: String,
+    ) -> Result<()> {
         self.connection
             .sender
-            .send(Message::Response(Response {
+            .send(lsp_server::Message::Response(lsp_server::Response {
                 id,
                 result: None,
-                error: Some(ResponseError {
+                error: Some(lsp_server::ResponseError {
                     code,
                     message,
                     data: None,
@@ -128,15 +135,14 @@ impl LanguageServer {
 
 #[cfg(test)]
 mod tests {
-    use assert_json_diff::assert_json_eq;
-    use lsp_server::Message;
-    use lsp_types::Range;
-    use nu_test_support::fs::fixtures;
-
     use crate::path_to_uri;
     use crate::tests::{
         initialize_language_server, open, open_unchecked, send_hover_request, update,
     };
+    use assert_json_diff::assert_json_eq;
+    use lsp_server::Message;
+    use lsp_types::Range;
+    use nu_test_support::fs::fixtures;
 
     #[test]
     fn hover_correct_documentation_on_let() {
diff --git a/crates/nu-lsp/src/symbols.rs b/crates/nu-lsp/src/symbols.rs
index c2952f34db..480acf6d40 100644
--- a/crates/nu-lsp/src/symbols.rs
+++ b/crates/nu-lsp/src/symbols.rs
@@ -1,21 +1,20 @@
-use std::collections::{BTreeMap, HashSet};
-use std::hash::{Hash, Hasher};
-
 use crate::{path_to_uri, span_to_range, uri_to_path, Id, LanguageServer};
 use lsp_textdocument::{FullTextDocument, TextDocuments};
 use lsp_types::{
     DocumentSymbolParams, DocumentSymbolResponse, Location, Range, SymbolInformation, SymbolKind,
     Uri, WorkspaceSymbolParams, WorkspaceSymbolResponse,
 };
-use nu_parser::parse;
-use nu_protocol::ModuleId;
 use nu_protocol::{
     engine::{CachedFile, EngineState, StateWorkingSet},
-    DeclId, Span, VarId,
+    DeclId, ModuleId, Span, VarId,
 };
 use nucleo_matcher::pattern::{AtomKind, CaseMatching, Normalization, Pattern};
 use nucleo_matcher::{Config, Matcher, Utf32Str};
-use std::{cmp::Ordering, path::Path};
+use std::{
+    cmp::Ordering,
+    collections::{BTreeMap, HashSet},
+    hash::{Hash, Hasher},
+};
 
 /// Struct stored in cache, uri not included
 #[derive(Clone, Debug, Eq, PartialEq)]
@@ -69,7 +68,7 @@ impl Symbol {
 }
 
 /// Cache symbols for each opened file to avoid repeated parsing
-pub struct SymbolCache {
+pub(crate) struct SymbolCache {
     /// Fuzzy matcher for symbol names
     matcher: Matcher,
     /// File Uri --> Symbols
@@ -187,7 +186,7 @@ impl SymbolCache {
                 .get_document_content(uri, None)
                 .expect("Failed to get_document_content!")
                 .as_bytes();
-            parse(
+            nu_parser::parse(
                 &mut working_set,
                 Some(
                     uri_to_path(uri)
@@ -198,7 +197,7 @@ impl SymbolCache {
                 false,
             );
             for cached_file in working_set.files() {
-                let path = Path::new(&*cached_file.name);
+                let path = std::path::Path::new(&*cached_file.name);
                 if !path.is_file() {
                     continue;
                 }
@@ -267,7 +266,7 @@ impl SymbolCache {
 }
 
 impl LanguageServer {
-    pub fn document_symbol(
+    pub(crate) fn document_symbol(
         &mut self,
         params: &DocumentSymbolParams,
     ) -> Option<DocumentSymbolResponse> {
@@ -280,7 +279,7 @@ impl LanguageServer {
         ))
     }
 
-    pub fn workspace_symbol(
+    pub(crate) fn workspace_symbol(
         &mut self,
         params: &WorkspaceSymbolParams,
     ) -> Option<WorkspaceSymbolResponse> {
@@ -298,17 +297,16 @@ impl LanguageServer {
 
 #[cfg(test)]
 mod tests {
-    use assert_json_diff::assert_json_eq;
-    use lsp_types::{PartialResultParams, TextDocumentIdentifier};
-    use nu_test_support::fs::fixtures;
-
     use crate::path_to_uri;
     use crate::tests::{initialize_language_server, open_unchecked, update};
+    use assert_json_diff::assert_json_eq;
     use lsp_server::{Connection, Message};
     use lsp_types::{
         request::{DocumentSymbolRequest, Request, WorkspaceSymbolRequest},
-        DocumentSymbolParams, Uri, WorkDoneProgressParams, WorkspaceSymbolParams,
+        DocumentSymbolParams, PartialResultParams, TextDocumentIdentifier, Uri,
+        WorkDoneProgressParams, WorkspaceSymbolParams,
     };
+    use nu_test_support::fs::fixtures;
 
     fn send_document_symbol_request(client_connection: &Connection, uri: Uri) -> Message {
         client_connection
diff --git a/crates/nu-lsp/src/workspace.rs b/crates/nu-lsp/src/workspace.rs
index 3abd7ddaf4..ed6d0bba8f 100644
--- a/crates/nu-lsp/src/workspace.rs
+++ b/crates/nu-lsp/src/workspace.rs
@@ -1,5 +1,18 @@
+use crate::{
+    ast::{find_id, find_reference_by_id},
+    path_to_uri, span_to_range, uri_to_path, Id, LanguageServer,
+};
 use lsp_textdocument::FullTextDocument;
-use nu_parser::parse;
+use lsp_types::{
+    DocumentHighlight, DocumentHighlightKind, DocumentHighlightParams, Location,
+    PrepareRenameResponse, ProgressToken, Range, ReferenceParams, RenameParams,
+    TextDocumentPositionParams, TextEdit, Uri, WorkspaceEdit, WorkspaceFolder,
+};
+use miette::{miette, IntoDiagnostic, Result};
+use nu_protocol::{
+    engine::{EngineState, StateWorkingSet},
+    Span,
+};
 use std::{
     collections::{BTreeMap, HashMap},
     fs,
@@ -7,72 +20,37 @@ use std::{
     sync::Arc,
 };
 
-use crate::{
-    ast::{find_id, find_reference_by_id},
-    path_to_uri, span_to_range, uri_to_path, Id, LanguageServer,
-};
-use crossbeam_channel::{Receiver, Sender};
-use lsp_server::{Message, Request, Response};
-use lsp_types::{
-    DocumentHighlight, DocumentHighlightKind, DocumentHighlightParams, Location,
-    PrepareRenameResponse, ProgressToken, Range, ReferenceParams, RenameParams,
-    TextDocumentPositionParams, TextEdit, Uri, WorkspaceEdit, WorkspaceFolder,
-};
-use miette::{miette, IntoDiagnostic, Result};
-use nu_glob::{glob, Paths};
-use nu_protocol::{
-    engine::{EngineState, StateWorkingSet},
-    Span,
-};
-use serde_json::Value;
-
 /// Message type indicating ranges of interest in each doc
 #[derive(Debug)]
-pub struct RangePerDoc {
+pub(crate) struct RangePerDoc {
     pub uri: Uri,
     pub ranges: Vec<Range>,
 }
 
 /// Message sent from background thread to main
 #[derive(Debug)]
-pub enum InternalMessage {
+pub(crate) enum InternalMessage {
     RangeMessage(RangePerDoc),
     Cancelled(ProgressToken),
     Finished(ProgressToken),
     OnGoing(ProgressToken, u32),
 }
 
-fn find_nu_scripts_in_folder(folder_uri: &Uri) -> Result<Paths> {
+fn find_nu_scripts_in_folder(folder_uri: &Uri) -> Result<nu_glob::Paths> {
     let path = uri_to_path(folder_uri);
     if !path.is_dir() {
         return Err(miette!("\nworkspace folder does not exist."));
     }
     let pattern = format!("{}/**/*.nu", path.to_string_lossy());
-    glob(&pattern).into_diagnostic()
-}
-
-fn find_reference_in_file(
-    working_set: &mut StateWorkingSet,
-    file: &FullTextDocument,
-    fp: &Path,
-    id: &Id,
-) -> Option<Vec<Span>> {
-    let block = parse(
-        working_set,
-        fp.to_str(),
-        file.get_content(None).as_bytes(),
-        false,
-    );
-    let references: Vec<Span> = find_reference_by_id(&block, working_set, id);
-
-    // add_block to avoid repeated parsing
-    working_set.add_block(block);
-    (!references.is_empty()).then_some(references)
+    nu_glob::glob(&pattern).into_diagnostic()
 }
 
 impl LanguageServer {
     /// Get initial workspace folders from initialization response
-    pub fn initialize_workspace_folders(&mut self, init_params: Value) -> Result<()> {
+    pub(crate) fn initialize_workspace_folders(
+        &mut self,
+        init_params: serde_json::Value,
+    ) -> Result<()> {
         if let Some(array) = init_params.get("workspaceFolders") {
             let folders: Vec<WorkspaceFolder> =
                 serde_json::from_value(array.clone()).into_diagnostic()?;
@@ -84,7 +62,7 @@ impl LanguageServer {
     }
 
     /// Highlight all occurrences of the text at cursor, in current file
-    pub fn document_highlight(
+    pub(crate) fn document_highlight(
         &mut self,
         params: &DocumentHighlightParams,
     ) -> Option<Vec<DocumentHighlight>> {
@@ -122,7 +100,7 @@ impl LanguageServer {
 
     /// The rename request only happens after the client received a `PrepareRenameResponse`,
     /// and a new name typed in, could happen before ranges ready for all files in the workspace folder
-    pub fn rename(&mut self, params: &RenameParams) -> Option<WorkspaceEdit> {
+    pub(crate) fn rename(&mut self, params: &RenameParams) -> Option<WorkspaceEdit> {
         let new_name = params.new_name.to_owned();
         // changes in WorkspaceEdit have mutable key
         #[allow(clippy::mutable_key_type)]
@@ -153,7 +131,11 @@ impl LanguageServer {
     /// - `timeout`: timeout in milliseconds, when timeout
     ///    1. Respond with all ranges found so far
     ///    2. Cancel the background thread
-    pub fn references(&mut self, params: &ReferenceParams, timeout: u128) -> Option<Vec<Location>> {
+    pub(crate) fn references(
+        &mut self,
+        params: &ReferenceParams,
+        timeout: u128,
+    ) -> Option<Vec<Location>> {
         self.occurrences = BTreeMap::new();
         let mut engine_state = self.new_engine_state();
         let path_uri = params.text_document_position.text_document.uri.to_owned();
@@ -213,7 +195,7 @@ impl LanguageServer {
     /// 1. Parse current file to find the content at the cursor that is suitable for a workspace wide renaming
     /// 2. Parse all nu scripts in the same workspace folder, with the variable/command name in it.
     /// 3. Store the results in `self.occurrences` for later rename quest
-    pub fn prepare_rename(&mut self, request: Request) -> Result<()> {
+    pub(crate) fn prepare_rename(&mut self, request: lsp_server::Request) -> Result<()> {
         let params: TextDocumentPositionParams =
             serde_json::from_value(request.params).into_diagnostic()?;
         self.occurrences = BTreeMap::new();
@@ -244,7 +226,7 @@ impl LanguageServer {
         let response = PrepareRenameResponse::Range(range);
         self.connection
             .sender
-            .send(Message::Response(Response {
+            .send(lsp_server::Message::Response(lsp_server::Response {
                 id: request.id,
                 result: serde_json::to_value(response).ok(),
                 error: None,
@@ -252,10 +234,7 @@ impl LanguageServer {
             .into_diagnostic()?;
 
         // have to clone it again in order to move to another thread
-        let mut engine_state = self.new_engine_state();
-        engine_state
-            .merge_delta(working_set.render())
-            .into_diagnostic()?;
+        let engine_state = self.new_engine_state();
         let current_workspace_folder = self
             .get_workspace_folder_by_uri(&path_uri)
             .ok_or_else(|| miette!("\nCurrent file is not in any workspace"))?;
@@ -273,6 +252,25 @@ impl LanguageServer {
         Ok(())
     }
 
+    fn find_reference_in_file(
+        working_set: &mut StateWorkingSet,
+        file: &FullTextDocument,
+        fp: &Path,
+        id: &Id,
+    ) -> Option<Vec<Span>> {
+        let block = nu_parser::parse(
+            working_set,
+            fp.to_str(),
+            file.get_content(None).as_bytes(),
+            false,
+        );
+        let references: Vec<Span> = find_reference_by_id(&block, working_set, id);
+
+        // add_block to avoid repeated parsing
+        working_set.add_block(block);
+        (!references.is_empty()).then_some(references)
+    }
+
     /// NOTE: for arguments whose declaration is in a signature
     /// which is not covered in the AST
     fn reference_not_in_ast(
@@ -300,6 +298,8 @@ impl LanguageServer {
         None
     }
 
+    /// Time consuming task running in a background thread
+    /// communicating with the main thread using `InternalMessage`
     fn find_reference_in_workspace(
         &self,
         engine_state: EngineState,
@@ -308,7 +308,10 @@ impl LanguageServer {
         span: Span,
         token: ProgressToken,
         message: String,
-    ) -> Result<(Sender<bool>, Arc<Receiver<InternalMessage>>)> {
+    ) -> Result<(
+        crossbeam_channel::Sender<bool>,
+        Arc<crossbeam_channel::Receiver<InternalMessage>>,
+    )> {
         let (data_sender, data_receiver) = crossbeam_channel::unbounded::<InternalMessage>();
         let (cancel_sender, cancel_receiver) = crossbeam_channel::bounded::<bool>(1);
         let engine_state = Arc::new(engine_state);
@@ -371,32 +374,34 @@ impl LanguageServer {
                     }
                     &FullTextDocument::new("nu".to_string(), 0, content_string.into())
                 };
-                let _ = find_reference_in_file(&mut working_set, file, fp, &id).map(|mut refs| {
-                    let file_span = working_set
-                        .get_span_for_filename(fp.to_string_lossy().as_ref())
-                        .unwrap_or(Span::unknown());
-                    if let Some(extra_span) = Self::reference_not_in_ast(
-                        &id,
-                        &working_set,
-                        definition_span,
-                        file_span,
-                        span,
-                    ) {
-                        if !refs.contains(&extra_span) {
-                            refs.push(extra_span)
+                let _ = Self::find_reference_in_file(&mut working_set, file, fp, &id).map(
+                    |mut refs| {
+                        let file_span = working_set
+                            .get_span_for_filename(fp.to_string_lossy().as_ref())
+                            .unwrap_or(Span::unknown());
+                        if let Some(extra_span) = Self::reference_not_in_ast(
+                            &id,
+                            &working_set,
+                            definition_span,
+                            file_span,
+                            span,
+                        ) {
+                            if !refs.contains(&extra_span) {
+                                refs.push(extra_span)
+                            }
                         }
-                    }
-                    let ranges = refs
-                        .iter()
-                        .map(|span| span_to_range(span, file, file_span.start))
-                        .collect();
-                    data_sender
-                        .send(InternalMessage::RangeMessage(RangePerDoc { uri, ranges }))
-                        .ok();
-                    data_sender
-                        .send(InternalMessage::OnGoing(token.clone(), percentage))
-                        .ok();
-                });
+                        let ranges = refs
+                            .iter()
+                            .map(|span| span_to_range(span, file, file_span.start))
+                            .collect();
+                        data_sender
+                            .send(InternalMessage::RangeMessage(RangePerDoc { uri, ranges }))
+                            .ok();
+                        data_sender
+                            .send(InternalMessage::OnGoing(token.clone(), percentage))
+                            .ok();
+                    },
+                );
             }
             data_sender
                 .send(InternalMessage::Finished(token.clone()))
@@ -421,21 +426,17 @@ impl LanguageServer {
 
 #[cfg(test)]
 mod tests {
+    use crate::path_to_uri;
+    use crate::tests::{initialize_language_server, open_unchecked, send_hover_request};
     use assert_json_diff::assert_json_eq;
     use lsp_server::{Connection, Message};
     use lsp_types::{
-        request, request::Request, InitializeParams, PartialResultParams, Position,
-        ReferenceContext, ReferenceParams, TextDocumentIdentifier, TextDocumentPositionParams, Uri,
-        WorkDoneProgressParams, WorkspaceFolder,
+        request, request::Request, DocumentHighlightParams, InitializeParams, PartialResultParams,
+        Position, ReferenceContext, ReferenceParams, RenameParams, TextDocumentIdentifier,
+        TextDocumentPositionParams, Uri, WorkDoneProgressParams, WorkspaceFolder,
     };
-    use lsp_types::{DocumentHighlightParams, RenameParams};
-    use nu_parser::parse;
-    use nu_protocol::engine::StateWorkingSet;
     use nu_test_support::fs::fixtures;
 
-    use crate::path_to_uri;
-    use crate::tests::{initialize_language_server, open_unchecked, send_hover_request};
-
     fn send_reference_request(
         client_connection: &Connection,
         uri: Uri,
@@ -873,8 +874,8 @@ mod tests {
             nu_protocol::Value::test_string(script_path.to_str().unwrap()),
         );
         script_path.push("bar.nu");
-        let mut working_set = StateWorkingSet::new(&engine_state);
-        parse(
+        let mut working_set = nu_protocol::engine::StateWorkingSet::new(&engine_state);
+        nu_parser::parse(
             &mut working_set,
             script_path.to_str(),
             std::fs::read(script_path.clone()).unwrap().as_slice(),

From 22a01d7e7616913c0ccee38b798ab9a25b4b468d Mon Sep 17 00:00:00 2001
From: Yash Thakur <45539777+ysthakur@users.noreply.github.com>
Date: Sat, 25 Jan 2025 09:12:47 -0500
Subject: [PATCH 0953/1072] Use single atom for fuzzy matching (fix #14904)
 (#14913)

# Description

Closes #14904. The bug there was introduced by #14846, which replaced
skim with Nucleo. It turns out that Nucleo's `Pattern::new` function
doesn't treat the needle as a single atom - it splits on spaces and
makes each word its own atom. This PR fixes the problem by creating a
single `Atom` for the whole needle rather than creating a `Pattern`.

Because of the bug, when you typed `lines <TAB>` (with a space at the
end), the suggestion `lines` was also matched. This suggestion was
shorter than the original typed needle, which would cause an
out-of-bounds error.

This also meant that if you typed `foo bar<TAB>`, `foo aaaaa bar` would
be shown before `foo bar aaa`. At the time, I didn't realize that it was
more intuitive to have `foo bar aaa` be put first.

# User-Facing Changes

Typing something like `lines <TAB>` should no longer cause a panic.

# Tests + Formatting

- Added a test to ensure spaces are respected when fuzzy matching
- Updated a test with the changed sort order for subcommand suggestions

# After Submitting

No need to update docs.
---
 .../src/completions/completion_options.rs     | 33 +++++++++++++++----
 crates/nu-cli/tests/completions/mod.rs        |  2 +-
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/crates/nu-cli/src/completions/completion_options.rs b/crates/nu-cli/src/completions/completion_options.rs
index 58fea194ec..cbe119e2c1 100644
--- a/crates/nu-cli/src/completions/completion_options.rs
+++ b/crates/nu-cli/src/completions/completion_options.rs
@@ -2,7 +2,7 @@ use nu_parser::trim_quotes_str;
 use nu_protocol::{CompletionAlgorithm, CompletionSort};
 use nu_utils::IgnoreCaseExt;
 use nucleo_matcher::{
-    pattern::{AtomKind, CaseMatching, Normalization, Pattern},
+    pattern::{Atom, AtomKind, CaseMatching, Normalization},
     Config, Matcher, Utf32Str,
 };
 use std::{borrow::Cow, fmt::Display};
@@ -38,9 +38,9 @@ enum State<T> {
     },
     Fuzzy {
         matcher: Matcher,
-        pat: Pattern,
+        atom: Atom,
         /// Holds (haystack, item, score)
-        items: Vec<(String, T, u32)>,
+        items: Vec<(String, T, u16)>,
     },
 }
 
@@ -65,7 +65,7 @@ impl<T> NuMatcher<T> {
                 }
             }
             MatchAlgorithm::Fuzzy => {
-                let pat = Pattern::new(
+                let atom = Atom::new(
                     needle,
                     if options.case_sensitive {
                         CaseMatching::Respect
@@ -74,13 +74,14 @@ impl<T> NuMatcher<T> {
                     },
                     Normalization::Smart,
                     AtomKind::Fuzzy,
+                    false,
                 );
                 NuMatcher {
                     options,
                     needle: needle.to_owned(),
                     state: State::Fuzzy {
                         matcher: Matcher::new(Config::DEFAULT),
-                        pat,
+                        atom,
                         items: Vec::new(),
                     },
                 }
@@ -115,13 +116,13 @@ impl<T> NuMatcher<T> {
             }
             State::Fuzzy {
                 matcher,
-                pat,
+                atom,
                 items,
             } => {
                 let mut haystack_buf = Vec::new();
                 let haystack_utf32 = Utf32Str::new(trim_quotes_str(haystack), &mut haystack_buf);
                 let mut indices = Vec::new();
-                let Some(score) = pat.indices(haystack_utf32, matcher, &mut indices) else {
+                let Some(score) = atom.indices(haystack_utf32, matcher, &mut indices) else {
                     return false;
                 };
                 if let Some(item) = item {
@@ -292,4 +293,22 @@ mod test {
         // Sort by score, then in alphabetical order
         assert_eq!(vec!["fob", "foo bar", "foo/bar"], matcher.results());
     }
+
+    #[test]
+    fn match_algorithm_fuzzy_sort_strip() {
+        let options = CompletionOptions {
+            match_algorithm: MatchAlgorithm::Fuzzy,
+            ..Default::default()
+        };
+        let mut matcher = NuMatcher::new("'love spaces' ", options);
+        for item in [
+            "'i love spaces'",
+            "'i love spaces' so much",
+            "'lovespaces' ",
+        ] {
+            matcher.add(item, item);
+        }
+        // Make sure the spaces are respected
+        assert_eq!(vec!["'i love spaces' so much"], matcher.results());
+    }
 }
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index fc2cc160b3..c8a3ea6d84 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -1038,8 +1038,8 @@ fn subcommand_completions() {
     match_suggestions(
         &vec![
             "food bar".to_string(),
-            "foo-test-command aagap bcr".to_string(),
             "foo-test-command bar".to_string(),
+            "foo-test-command aagap bcr".to_string(),
         ],
         &suggestions,
     );

From 926b0407c526ac8d5097cea46ec2820596781d58 Mon Sep 17 00:00:00 2001
From: pyz4 <42039243+pyz4@users.noreply.github.com>
Date: Sat, 25 Jan 2025 14:24:39 -0500
Subject: [PATCH 0954/1072] `seq date`: generalize to allow any duration for
 `--increment` argument (#14903)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
This PR seeks to generalize the `seq date` command so that it can
receive any duration as an `--increment`. Whereas the current command
can only output a list of dates spaced at least 1 day apart, the new
command can output a list of datetimes that are spaced apart by any
duration.

For example:
```
> seq date --begin-date 2025-01-01 --end-date 2025-01-02 --increment 6hr --output-format "%Y-%m-%d %H:%M:%S"
╭───┬─────────────────────╮
│ 0 │ 2025-01-01 00:00:00 │
│ 1 │ 2025-01-01 06:00:00 │
│ 2 │ 2025-01-01 12:00:00 │
│ 3 │ 2025-01-01 18:00:00 │
│ 4 │ 2025-01-02 00:00:00 │
╰───┴─────────────────────╯
```

Note that the default behavior remains unchanged:
```
> seq date --begin-date 2025-01-01 --end-date 2025-01-02
╭───┬────────────╮
│ 0 │ 2025-01-01 │
│ 1 │ 2025-01-02 │
╰───┴────────────╯
```

The default output format also remains unchanged:
```
> seq date --begin-date 2025-01-01 --end-date 2025-01-02 --increment 6hr
╭───┬────────────╮
│ 0 │ 2025-01-01 │
│ 1 │ 2025-01-01 │
│ 2 │ 2025-01-01 │
│ 3 │ 2025-01-01 │
│ 4 │ 2025-01-02 │
╰───┴────────────╯
```

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

## Breaking Changes
* The `--increment` argument no longer accepts just an integer and
requires a duration

```
# NEW BEHAVIOR
> seq date --begin-date 2025-01-01 --end-date 2025-01-02 --increment 1

Error: nu::parser::parse_mismatch

  × Parse mismatch during operation.
   ╭─[entry #13:1:68]
 1 │ seq date --begin-date 2025-01-01 --end-date 2025-01-02 --increment 1
   ·                                                                    ┬
   ·                                                                    ╰── expected duration with valid units
   ╰────
```

EDIT: Break Change is mitigated. `--increment` accepts either an integer
or duration.

## Bug Fix
* The `--days` argument had an off-by-one error and would print 1 too
many elements in the output. For example,

```
# OLD BEHAVIOR
> seq date -b 2025-01-01 --days 5 --increment 1
╭───┬────────────╮
│ 0 │ 2025-01-01 │
│ 1 │ 2025-01-02 │
│ 2 │ 2025-01-03 │
│ 3 │ 2025-01-04 │
│ 4 │ 2025-01-05 │
│ 5 │ 2025-01-06 │ <-- Extra element
╰───┴────────────╯

# NEW BEHAVIOR
> seq date -b 2025-01-01 --days 5 --increment 1day
╭───┬────────────╮
│ 0 │ 2025-01-01 │
│ 1 │ 2025-01-02 │
│ 2 │ 2025-01-03 │
│ 3 │ 2025-01-04 │
│ 4 │ 2025-01-05 │
╰───┴────────────╯
```

## New Argument
* A `--periods` argument is introduced to indicate the number of output
elements, regardless of the `--increment` value. Importantly, the
`--days` argument is ignored when `--periods` is set.
```
# NEW BEHAVIOR
> seq date -b 2025-01-01 --days 5 --periods 10 --increment 1day
╭───┬────────────╮
│ 0 │ 2025-01-01 │
│ 1 │ 2025-01-02 │
│ 2 │ 2025-01-03 │
│ 3 │ 2025-01-04 │
│ 4 │ 2025-01-05 │
│ 5 │ 2025-01-06 │
│ 6 │ 2025-01-07 │
│ 7 │ 2025-01-08 │
│ 8 │ 2025-01-09 │
│ 9 │ 2025-01-10 │
╰───┴────────────╯
```

Note that the `--days` and `--periods` arguments differ in their
functions. The `--periods` value determines the number of elements in
the output that are always spaced `--increment` apart. The `--days`
value determines the bookends `--begin-date` and `--end-date` when only
one is set, though the number of elements may differ based on the
`--increment` value.

```
# NEW BEHAVIOR
> seq date -e 2025-01-01 --days 2 --increment 5hr --output-format "%Y-%m-%d %H:%M:%S"

╭───┬─────────────────────╮
│ 0 │ 2025-01-23 22:25:05 │
│ 1 │ 2025-01-24 03:25:05 │
│ 2 │ 2025-01-24 08:25:05 │
│ 3 │ 2025-01-24 13:25:05 │
│ 4 │ 2025-01-24 18:25:05 │
╰───┴─────────────────────╯
```

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

I added several examples for each user-facing change in
`generators/seq_date.rs` and some tests in `tests/commands/seq_date.rs`.

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/generators/seq_date.rs | 202 +++++++++++++++----
 crates/nu-command/tests/commands/seq_date.rs |  15 +-
 2 files changed, 175 insertions(+), 42 deletions(-)

diff --git a/crates/nu-command/src/generators/seq_date.rs b/crates/nu-command/src/generators/seq_date.rs
index 4d378a73bb..ae91b8ad0c 100644
--- a/crates/nu-command/src/generators/seq_date.rs
+++ b/crates/nu-command/src/generators/seq_date.rs
@@ -1,9 +1,11 @@
-use chrono::{Duration, Local, NaiveDate};
+use chrono::{Duration, Local, NaiveDate, NaiveDateTime};
 use nu_engine::command_prelude::*;
 use nu_protocol::FromValue;
 
 use std::fmt::Write;
 
+const NANOSECONDS_IN_DAY: i64 = 1_000_000_000i64 * 60i64 * 60i64 * 24i64;
+
 #[derive(Clone)]
 pub struct SeqDate;
 
@@ -40,16 +42,22 @@ impl Command for SeqDate {
             .named("end-date", SyntaxShape::String, "ending date", Some('e'))
             .named(
                 "increment",
-                SyntaxShape::Int,
-                "increment dates by this number",
+                SyntaxShape::OneOf(vec![SyntaxShape::Duration, SyntaxShape::Int]),
+                "increment dates by this duration (defaults to days if integer)",
                 Some('n'),
             )
             .named(
                 "days",
                 SyntaxShape::Int,
-                "number of days to print",
+                "number of days to print (ignored if periods is used)",
                 Some('d'),
             )
+            .named(
+                "periods",
+                SyntaxShape::Int,
+                "number of periods to print",
+                Some('p'),
+            )
             .switch("reverse", "print dates in reverse", Some('r'))
             .category(Category::Generators)
     }
@@ -74,7 +82,8 @@ impl Command for SeqDate {
             },
             Example {
                 description: "Return the first 10 days in January, 2020",
-                example: "seq date --begin-date '2020-01-01' --end-date '2020-01-10'",
+                example:
+                    "seq date --begin-date '2020-01-01' --end-date '2020-01-10' --increment 1day",
                 result: Some(Value::list(
                     vec![
                         Value::test_string("2020-01-01"),
@@ -91,9 +100,45 @@ impl Command for SeqDate {
                     Span::test_data(),
                 )),
             },
+            Example {
+                description: "Return the first 10 days in January, 2020 using --days flag",
+                example:
+                    "seq date --begin-date '2020-01-01' --days 10 --increment 1day",
+                result: Some(Value::list(
+                    vec![
+                        Value::test_string("2020-01-01"),
+                        Value::test_string("2020-01-02"),
+                        Value::test_string("2020-01-03"),
+                        Value::test_string("2020-01-04"),
+                        Value::test_string("2020-01-05"),
+                        Value::test_string("2020-01-06"),
+                        Value::test_string("2020-01-07"),
+                        Value::test_string("2020-01-08"),
+                        Value::test_string("2020-01-09"),
+                        Value::test_string("2020-01-10"),
+                    ],
+                    Span::test_data(),
+                )),
+            },
+            Example {
+                description: "Return the first five 5-minute periods starting January 1, 2020",
+                example:
+                    "seq date --begin-date '2020-01-01' --periods 5 --increment 5min --output-format '%Y-%m-%d %H:%M:%S'",
+                result: Some(Value::list(
+                    vec![
+                        Value::test_string("2020-01-01 00:00:00"),
+                        Value::test_string("2020-01-01 00:05:00"),
+                        Value::test_string("2020-01-01 00:10:00"),
+                        Value::test_string("2020-01-01 00:15:00"),
+                        Value::test_string("2020-01-01 00:20:00"),
+                    ],
+                    Span::test_data(),
+                )),
+            },
             Example {
                 description: "print every fifth day between January 1st 2020 and January 31st 2020",
-                example: "seq date --begin-date '2020-01-01' --end-date '2020-01-31' --increment 5",
+                example:
+                    "seq date --begin-date '2020-01-01' --end-date '2020-01-31' --increment 5day",
                 result: Some(Value::list(
                     vec![
                         Value::test_string("2020-01-01"),
@@ -107,6 +152,42 @@ impl Command for SeqDate {
                     Span::test_data(),
                 )),
             },
+            Example {
+                description: "increment defaults to days if no duration is supplied",
+                example:
+                    "seq date --begin-date '2020-01-01' --end-date '2020-01-31' --increment 5",
+                result: Some(Value::list(
+                    vec![
+                        Value::test_string("2020-01-01"),
+                        Value::test_string("2020-01-06"),
+                        Value::test_string("2020-01-11"),
+                        Value::test_string("2020-01-16"),
+                        Value::test_string("2020-01-21"),
+                        Value::test_string("2020-01-26"),
+                        Value::test_string("2020-01-31"),
+                    ],
+                    Span::test_data(),
+                )),
+            },
+            Example {
+                description: "print every six hours starting January 1st, 2020 until January 3rd, 2020",
+                example:
+                    "seq date --begin-date '2020-01-01' --end-date '2020-01-03' --increment 6hr --output-format '%Y-%m-%d %H:%M:%S'",
+                result: Some(Value::list(
+                    vec![
+                        Value::test_string("2020-01-01 00:00:00"),
+                        Value::test_string("2020-01-01 06:00:00"),
+                        Value::test_string("2020-01-01 12:00:00"),
+                        Value::test_string("2020-01-01 18:00:00"),
+                        Value::test_string("2020-01-02 00:00:00"),
+                        Value::test_string("2020-01-02 06:00:00"),
+                        Value::test_string("2020-01-02 12:00:00"),
+                        Value::test_string("2020-01-02 18:00:00"),
+                        Value::test_string("2020-01-03 00:00:00"),
+                    ],
+                    Span::test_data(),
+                )),
+            },
         ]
     }
 
@@ -124,8 +205,28 @@ impl Command for SeqDate {
         let begin_date: Option<Spanned<String>> =
             call.get_flag(engine_state, stack, "begin-date")?;
         let end_date: Option<Spanned<String>> = call.get_flag(engine_state, stack, "end-date")?;
-        let increment: Option<Spanned<i64>> = call.get_flag(engine_state, stack, "increment")?;
+
+        let increment = match call.get_flag::<Value>(engine_state, stack, "increment")? {
+            Some(increment) => match increment {
+                Value::Int { val, internal_span } => Some(
+                    val.checked_mul(NANOSECONDS_IN_DAY)
+                        .ok_or_else(|| ShellError::GenericError {
+                            error: "increment is too large".into(),
+                            msg: "increment is too large".into(),
+                            span: Some(internal_span),
+                            help: None,
+                            inner: vec![],
+                        })?
+                        .into_spanned(internal_span),
+                ),
+                Value::Duration { val, internal_span } => Some(val.into_spanned(internal_span)),
+                _ => None,
+            },
+            None => None,
+        };
+
         let days: Option<Spanned<i64>> = call.get_flag(engine_state, stack, "days")?;
+        let periods: Option<Spanned<i64>> = call.get_flag(engine_state, stack, "periods")?;
         let reverse = call.has_flag(engine_state, stack, "reverse")?;
 
         let out_format = match output_format {
@@ -150,29 +251,41 @@ impl Command for SeqDate {
 
         let inc = match increment {
             Some(i) => Value::int(i.item, i.span),
-            _ => Value::int(1_i64, call.head),
+            _ => Value::int(NANOSECONDS_IN_DAY, call.head),
         };
 
         let day_count = days.map(|i| Value::int(i.item, i.span));
 
+        let period_count = periods.map(|i| Value::int(i.item, i.span));
+
         let mut rev = false;
         if reverse {
             rev = reverse;
         }
 
         Ok(run_seq_dates(
-            out_format, in_format, begin, end, inc, day_count, rev, call.head,
+            out_format,
+            in_format,
+            begin,
+            end,
+            inc,
+            day_count,
+            period_count,
+            rev,
+            call.head,
         )?
         .into_pipeline_data())
     }
 }
 
-pub fn parse_date_string(s: &str, format: &str) -> Result<NaiveDate, &'static str> {
-    let d = match NaiveDate::parse_from_str(s, format) {
-        Ok(d) => d,
-        Err(_) => return Err("Failed to parse date."),
-    };
-    Ok(d)
+#[allow(clippy::unnecessary_lazy_evaluations)]
+pub fn parse_date_string(s: &str, format: &str) -> Result<NaiveDateTime, &'static str> {
+    NaiveDateTime::parse_from_str(s, format).or_else(|_| {
+        // If parsing as DateTime fails, try parsing as Date before throwing error
+        let date = NaiveDate::parse_from_str(s, format).map_err(|_| "Failed to parse date.")?;
+        date.and_hms_opt(0, 0, 0)
+            .ok_or_else(|| "Failed to convert NaiveDate to NaiveDateTime.")
+    })
 }
 
 #[allow(clippy::too_many_arguments)]
@@ -183,10 +296,11 @@ pub fn run_seq_dates(
     ending_date: Option<String>,
     increment: Value,
     day_count: Option<Value>,
+    period_count: Option<Value>,
     reverse: bool,
     call_span: Span,
 ) -> Result<Value, ShellError> {
-    let today = Local::now().date_naive();
+    let today = Local::now().naive_local();
     // if cannot convert , it will return error
     let increment_span = increment.span();
     let mut step_size: i64 = i64::from_value(increment)?;
@@ -270,27 +384,44 @@ pub fn run_seq_dates(
         None => 0i64,
     };
 
+    let mut periods_to_output = match period_count {
+        Some(d) => i64::from_value(d)?,
+        None => 0i64,
+    };
+
     // Make the signs opposite if we're created dates in reverse direction
     if reverse {
         step_size *= -1;
         days_to_output *= -1;
+        periods_to_output *= -1;
     }
 
-    if days_to_output != 0 {
-        end_date = match Duration::try_days(days_to_output)
+    // --days is ignored when --periods is set
+    if periods_to_output != 0 {
+        end_date = periods_to_output
+            .checked_sub(1)
+            .and_then(|val| val.checked_mul(step_size.abs()))
+            .map(Duration::nanoseconds)
+            .and_then(|inc| start_date.checked_add_signed(inc))
+            .ok_or_else(|| ShellError::GenericError {
+                error: "incrementing by the number of periods is too large".into(),
+                msg: "incrementing by the number of periods is too large".into(),
+                span: Some(call_span),
+                help: None,
+                inner: vec![],
+            })?;
+    } else if days_to_output != 0 {
+        end_date = days_to_output
+            .checked_sub(1)
+            .and_then(Duration::try_days)
             .and_then(|days| start_date.checked_add_signed(days))
-        {
-            Some(date) => date,
-            None => {
-                return Err(ShellError::GenericError {
-                    error: "int value too large".into(),
-                    msg: "int value too large".into(),
-                    span: Some(call_span),
-                    help: None,
-                    inner: vec![],
-                });
-            }
-        }
+            .ok_or_else(|| ShellError::GenericError {
+                error: "int value too large".into(),
+                msg: "int value too large".into(),
+                span: Some(call_span),
+                help: None,
+                inner: vec![],
+            })?;
     }
 
     // conceptually counting down with a positive step or counting up with a negative step
@@ -302,15 +433,8 @@ pub fn run_seq_dates(
     let is_out_of_range =
         |next| (step_size > 0 && next > end_date) || (step_size < 0 && next < end_date);
 
-    let Some(step_size) = Duration::try_days(step_size) else {
-        return Err(ShellError::GenericError {
-            error: "increment magnitude is too large".into(),
-            msg: "increment magnitude is too large".into(),
-            span: Some(call_span),
-            help: None,
-            inner: vec![],
-        });
-    };
+    // Bounds are enforced by i64 conversion above
+    let step_size = Duration::nanoseconds(step_size);
 
     let mut next = start_date;
     if is_out_of_range(next) {
diff --git a/crates/nu-command/tests/commands/seq_date.rs b/crates/nu-command/tests/commands/seq_date.rs
index c333c87773..f9f6ca818f 100644
--- a/crates/nu-command/tests/commands/seq_date.rs
+++ b/crates/nu-command/tests/commands/seq_date.rs
@@ -1,8 +1,17 @@
 use nu_test_support::nu;
 
 #[test]
-fn fails_when_output_format_contains_time() {
-    let actual = nu!("seq date --output-format '%H-%M-%S'");
+fn fails_on_datetime_input() {
+    let actual = nu!("seq date --begin-date (date now)");
 
-    assert!(actual.err.contains("Invalid output format"));
+    assert!(actual.err.contains("Type mismatch"))
+}
+
+#[test]
+fn fails_when_increment_not_integer_or_duration() {
+    let actual = nu!("seq date --begin-date 2020-01-01 --increment 1.1");
+
+    assert!(actual
+        .err
+        .contains("expected one of a list of accepted shapes: [Duration, Int]"))
 }

From e3e2554b3deafb31d5745dc75852d04e58556b7c Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Sat, 25 Jan 2025 22:25:28 -0500
Subject: [PATCH 0955/1072] Link to Blog in the welcome banner (#14914)

# Description

With the fragmentation and proliferation of social media platforms,
we're attempting to consolidate our news and official Nushell
communications to:

* The Nushell website, with updates posted on the Blog
* Discord
* GitHub

This PR replaces Twitter with the Nushell Blog in the welcome banner.
The other links were already available.

# User-Facing Changes

Welcome banner

# Tests + Formatting

# After Submitting
---
 crates/nu-std/std/core/mod.nu | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-std/std/core/mod.nu b/crates/nu-std/std/core/mod.nu
index 5ac804da5b..3db296de2c 100644
--- a/crates/nu-std/std/core/mod.nu
+++ b/crates/nu-std/std/core/mod.nu
@@ -20,7 +20,7 @@ Version: (ansi green)($ver.version) \(($ver.build_os)\)
 Please join our (ansi purple)Discord(ansi reset) community at (ansi purple)https://discord.gg/NtAbbGn(ansi reset)
 Our (ansi green_bold)GitHub(ansi reset) repository is at (ansi green_bold)https://github.com/nushell/nushell(ansi reset)
 Our (ansi green)Documentation(ansi reset) is located at (ansi green)https://nushell.sh(ansi reset)
-(ansi cyan)Tweet(ansi reset) us at (ansi cyan_bold)@nu_shell(ansi reset)
+And the (ansi green)Latest Nushell News(ansi reset) at (ansi green)https://nushell.sh/blog/(ansi reset)
 Learn how to remove this at: (ansi green)https://nushell.sh/book/configuration.html#remove-welcome-message(ansi reset)
 
 It's been this long since (ansi green)Nushell(ansi reset)'s first commit:

From c783b07d5804c36dc4f9ad7bd16e453406632213 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Sun, 26 Jan 2025 04:30:58 +0000
Subject: [PATCH 0956/1072] Remove unsued types (#14916)

# Description

`Type::Block` and `Type::Signature` do not correspond to any `Value`
cases and should be able to be removed.
---
 .../src/database/commands/into_sqlite.rs           |  2 --
 crates/nu-parser/src/parse_keywords.rs             |  2 +-
 crates/nu-parser/src/parser.rs                     |  4 ++--
 crates/nu-parser/src/type_check.rs                 |  1 -
 crates/nu-protocol/src/syntax_shape.rs             |  4 ++--
 crates/nu-protocol/src/ty.rs                       | 14 ++------------
 6 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/crates/nu-command/src/database/commands/into_sqlite.rs b/crates/nu-command/src/database/commands/into_sqlite.rs
index 32128c9014..9d58f7ff3a 100644
--- a/crates/nu-command/src/database/commands/into_sqlite.rs
+++ b/crates/nu-command/src/database/commands/into_sqlite.rs
@@ -353,7 +353,6 @@ fn nu_value_to_sqlite_type(val: &Value) -> Result<&'static str, ShellError> {
 
         // intentionally enumerated so that any future types get handled
         Type::Any
-        | Type::Block
         | Type::CellPath
         | Type::Closure
         | Type::Custom(_)
@@ -361,7 +360,6 @@ fn nu_value_to_sqlite_type(val: &Value) -> Result<&'static str, ShellError> {
         | Type::List(_)
         | Type::Range
         | Type::Record(_)
-        | Type::Signature
         | Type::Glob
         | Type::Table(_) => Err(ShellError::OnlySupportsThisInputType {
             exp_input_type: "sql".into(),
diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index 997084569b..c1dc6ad98a 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -2259,7 +2259,7 @@ pub fn parse_module(
     module_comments.extend(inner_comments);
     let module_id = working_set.add_module(&module_name, module, module_comments);
 
-    let block_expr = Expression::new(working_set, Expr::Block(block_id), block_span, Type::Block);
+    let block_expr = Expression::new(working_set, Expr::Block(block_id), block_span, Type::Any);
 
     let module_decl_id = working_set
         .find_decl(b"module")
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 4ef6b1f2b1..ceb1b3d129 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -3498,7 +3498,7 @@ pub fn parse_signature(working_set: &mut StateWorkingSet, span: Span) -> Express
 
     let sig = parse_signature_helper(working_set, Span::new(start, end));
 
-    Expression::new(working_set, Expr::Signature(sig), span, Type::Signature)
+    Expression::new(working_set, Expr::Signature(sig), span, Type::Any)
 }
 
 pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) -> Box<Signature> {
@@ -4471,7 +4471,7 @@ pub fn parse_block_expression(working_set: &mut StateWorkingSet, span: Span) ->
 
     let block_id = working_set.add_block(Arc::new(output));
 
-    Expression::new(working_set, Expr::Block(block_id), span, Type::Block)
+    Expression::new(working_set, Expr::Block(block_id), span, Type::Any)
 }
 
 pub fn parse_match_block_expression(working_set: &mut StateWorkingSet, span: Span) -> Expression {
diff --git a/crates/nu-parser/src/type_check.rs b/crates/nu-parser/src/type_check.rs
index 413a3c3218..b0197589af 100644
--- a/crates/nu-parser/src/type_check.rs
+++ b/crates/nu-parser/src/type_check.rs
@@ -55,7 +55,6 @@ pub fn type_compatible(lhs: &Type, rhs: &Type) -> bool {
         (Type::Int, Type::Number) => true,
         (Type::Number, Type::Float) => true,
         (Type::Float, Type::Number) => true,
-        (Type::Closure, Type::Block) => true,
         (Type::Any, _) => true,
         (_, Type::Any) => true,
         (Type::Record(lhs), Type::Record(rhs)) | (Type::Table(lhs), Type::Table(rhs)) => {
diff --git a/crates/nu-protocol/src/syntax_shape.rs b/crates/nu-protocol/src/syntax_shape.rs
index 66bd77ddca..85f308e105 100644
--- a/crates/nu-protocol/src/syntax_shape.rs
+++ b/crates/nu-protocol/src/syntax_shape.rs
@@ -143,7 +143,7 @@ impl SyntaxShape {
 
         match self {
             SyntaxShape::Any => Type::Any,
-            SyntaxShape::Block => Type::Block,
+            SyntaxShape::Block => Type::Any,
             SyntaxShape::Closure(_) => Type::Closure,
             SyntaxShape::Binary => Type::Binary,
             SyntaxShape::CellPath => Type::Any,
@@ -176,7 +176,7 @@ impl SyntaxShape {
             SyntaxShape::Record(entries) => Type::Record(mk_ty(entries)),
             SyntaxShape::RowCondition => Type::Bool,
             SyntaxShape::Boolean => Type::Bool,
-            SyntaxShape::Signature => Type::Signature,
+            SyntaxShape::Signature => Type::Any,
             SyntaxShape::String => Type::String,
             SyntaxShape::Table(columns) => Type::Table(mk_ty(columns)),
             SyntaxShape::VarWithOptType => Type::Any,
diff --git a/crates/nu-protocol/src/ty.rs b/crates/nu-protocol/src/ty.rs
index 8f97c6f3fc..440bd24475 100644
--- a/crates/nu-protocol/src/ty.rs
+++ b/crates/nu-protocol/src/ty.rs
@@ -1,17 +1,14 @@
+use crate::SyntaxShape;
 use serde::{Deserialize, Serialize};
+use std::fmt::Display;
 #[cfg(test)]
 use strum_macros::EnumIter;
 
-use std::fmt::Display;
-
-use crate::SyntaxShape;
-
 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Hash)]
 #[cfg_attr(test, derive(EnumIter))]
 pub enum Type {
     Any,
     Binary,
-    Block,
     Bool,
     CellPath,
     Closure,
@@ -28,7 +25,6 @@ pub enum Type {
     Number,
     Range,
     Record(Box<[(String, Type)]>),
-    Signature,
     String,
     Glob,
     Table(Box<[(String, Type)]>),
@@ -113,7 +109,6 @@ impl Type {
             Type::Range => SyntaxShape::Range,
             Type::Bool => SyntaxShape::Boolean,
             Type::String => SyntaxShape::String,
-            Type::Block => SyntaxShape::Block, // FIXME needs more accuracy
             Type::Closure => SyntaxShape::Closure(None), // FIXME needs more accuracy
             Type::CellPath => SyntaxShape::CellPath,
             Type::Duration => SyntaxShape::Duration,
@@ -128,7 +123,6 @@ impl Type {
             Type::Error => SyntaxShape::Any,
             Type::Binary => SyntaxShape::Binary,
             Type::Custom(_) => SyntaxShape::Any,
-            Type::Signature => SyntaxShape::Signature,
             Type::Glob => SyntaxShape::GlobPattern,
         }
     }
@@ -137,7 +131,6 @@ impl Type {
     /// tables and records (get `list` instead of `list<any>`
     pub fn get_non_specified_string(&self) -> String {
         match self {
-            Type::Block => String::from("block"),
             Type::Closure => String::from("closure"),
             Type::Bool => String::from("bool"),
             Type::CellPath => String::from("cell-path"),
@@ -157,7 +150,6 @@ impl Type {
             Type::Error => String::from("error"),
             Type::Binary => String::from("binary"),
             Type::Custom(_) => String::from("custom"),
-            Type::Signature => String::from("signature"),
             Type::Glob => String::from("glob"),
         }
     }
@@ -166,7 +158,6 @@ impl Type {
 impl Display for Type {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Type::Block => write!(f, "block"),
             Type::Closure => write!(f, "closure"),
             Type::Bool => write!(f, "bool"),
             Type::CellPath => write!(f, "cell-path"),
@@ -214,7 +205,6 @@ impl Display for Type {
             Type::Error => write!(f, "error"),
             Type::Binary => write!(f, "binary"),
             Type::Custom(custom) => write!(f, "{custom}"),
-            Type::Signature => write!(f, "signature"),
             Type::Glob => write!(f, "glob"),
         }
     }

From a011791631b157abeadd41736db699c712e9e5a5 Mon Sep 17 00:00:00 2001
From: Yash Thakur <45539777+ysthakur@users.noreply.github.com>
Date: Sun, 26 Jan 2025 00:44:01 -0500
Subject: [PATCH 0957/1072] Fallback to file completer in custom/external
 completer (#14781)

# Description

Closes #14595. This modifies the behavior of both custom and external
completers so that if the custom/external completer returns an invalid
value, completions are suppressed and an error is logged. However, if
the completer returns `null` (which this PR treats as a special value),
we fall back to file completions.

Previously, custom completers and external completers had different
behavior. Any time an external completer returned an invalid value
(including `null`), we would fall back to file completions. Any time a
custom completer returned an invalid value (including `null`), we would
suppress completions.

I'm not too happy about the implementation, but it's the least intrusive
way I could think of to do it. I added a `fallback` field to
`CustomCompletions` that's checked after calling its `fetch()` method.
If `fallback` is true, then we use file completions afterwards.

An alternative would be to make `CustomCompletions` no longer implement
the `Completer` trait, and instead have its `fetch()` method return an
`Option<Vec<Suggestion>>`. But that resulted in a teeny bit of code
duplication.

# User-Facing Changes

For those using an external completer, if they want to fall back to file
completions on invalid values, their completer will have to explicitly
return `null`. Returning `"foo"` or something will no longer make
Nushell use file completions instead.

For those making custom completers, they now have the option to fall
back to file completions.

# Tests + Formatting

Added some tests and manually tested that if the completer returns an
invalid value or the completer throws an error, that gets logged and
completions are suppressed.

# After Submitting

The documentation for custom completions and external completers will
have to be updated after this.
---
 crates/nu-cli/src/completions/completer.rs    | 27 ++++++----
 .../src/completions/custom_completions.rs     | 48 ++++++++++++-----
 crates/nu-cli/tests/completions/mod.rs        | 52 +++++++++++++++++++
 3 files changed, 104 insertions(+), 23 deletions(-)

diff --git a/crates/nu-cli/src/completions/completer.rs b/crates/nu-cli/src/completions/completer.rs
index 16b1673a4f..f0cb6f3fda 100644
--- a/crates/nu-cli/src/completions/completer.rs
+++ b/crates/nu-cli/src/completions/completer.rs
@@ -99,18 +99,24 @@ impl NuCompleter {
         );
 
         match result.and_then(|data| data.into_value(span)) {
-            Ok(value) => {
-                if let Value::List { vals, .. } = value {
-                    let result =
-                        map_value_completions(vals.iter(), Span::new(span.start, span.end), offset);
-
-                    return Some(result);
-                }
+            Ok(Value::List { vals, .. }) => {
+                let result =
+                    map_value_completions(vals.iter(), Span::new(span.start, span.end), offset);
+                Some(result)
+            }
+            Ok(Value::Nothing { .. }) => None,
+            Ok(value) => {
+                log::error!(
+                    "External completer returned invalid value of type {}",
+                    value.get_type().to_string()
+                );
+                Some(vec![])
+            }
+            Err(err) => {
+                log::error!("failed to eval completer block: {err}");
+                Some(vec![])
             }
-            Err(err) => println!("failed to eval completer block: {err}"),
         }
-
-        None
     }
 
     fn completion_helper(&mut self, line: &str, pos: usize) -> Vec<SemanticSuggestion> {
@@ -319,6 +325,7 @@ impl NuCompleter {
                                     self.stack.clone(),
                                     *decl_id,
                                     initial_line,
+                                    FileCompletion::new(),
                                 );
 
                                 return self.process_completion(
diff --git a/crates/nu-cli/src/completions/custom_completions.rs b/crates/nu-cli/src/completions/custom_completions.rs
index 2a9c621192..852ea130f8 100644
--- a/crates/nu-cli/src/completions/custom_completions.rs
+++ b/crates/nu-cli/src/completions/custom_completions.rs
@@ -12,32 +12,34 @@ use std::collections::HashMap;
 
 use super::completion_options::NuMatcher;
 
-pub struct CustomCompletion {
+pub struct CustomCompletion<T: Completer> {
     stack: Stack,
     decl_id: DeclId,
     line: String,
+    fallback: T,
 }
 
-impl CustomCompletion {
-    pub fn new(stack: Stack, decl_id: DeclId, line: String) -> Self {
+impl<T: Completer> CustomCompletion<T> {
+    pub fn new(stack: Stack, decl_id: DeclId, line: String, fallback: T) -> Self {
         Self {
             stack,
             decl_id,
             line,
+            fallback,
         }
     }
 }
 
-impl Completer for CustomCompletion {
+impl<T: Completer> Completer for CustomCompletion<T> {
     fn fetch(
         &mut self,
         working_set: &StateWorkingSet,
-        _stack: &Stack,
+        stack: &Stack,
         prefix: &[u8],
         span: Span,
         offset: usize,
         pos: usize,
-        completion_options: &CompletionOptions,
+        orig_options: &CompletionOptions,
     ) -> Vec<SemanticSuggestion> {
         // Line position
         let line_pos = pos - offset;
@@ -66,13 +68,12 @@ impl Completer for CustomCompletion {
             PipelineData::empty(),
         );
 
-        let mut completion_options = completion_options.clone();
+        let mut completion_options = orig_options.clone();
         let mut should_sort = true;
 
         // Parse result
-        let suggestions = result
-            .and_then(|data| data.into_value(span))
-            .map(|value| match &value {
+        let suggestions = match result.and_then(|data| data.into_value(span)) {
+            Ok(value) => match &value {
                 Value::Record { val, .. } => {
                     let completions = val
                         .get("completions")
@@ -112,9 +113,30 @@ impl Completer for CustomCompletion {
                     completions
                 }
                 Value::List { vals, .. } => map_value_completions(vals.iter(), span, offset),
-                _ => vec![],
-            })
-            .unwrap_or_default();
+                Value::Nothing { .. } => {
+                    return self.fallback.fetch(
+                        working_set,
+                        stack,
+                        prefix,
+                        span,
+                        offset,
+                        pos,
+                        orig_options,
+                    );
+                }
+                _ => {
+                    log::error!(
+                        "Custom completer returned invalid value of type {}",
+                        value.get_type().to_string()
+                    );
+                    return vec![];
+                }
+            },
+            Err(e) => {
+                log::error!("Error getting custom completions: {e}");
+                return vec![];
+            }
+        };
 
         let mut matcher = NuMatcher::new(String::from_utf8_lossy(prefix), completion_options);
 
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index c8a3ea6d84..b9d9fdb573 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -234,6 +234,37 @@ fn customcompletions_no_sort() {
     match_suggestions(&expected, &suggestions);
 }
 
+/// Fallback to file completions if custom completer returns null
+#[test]
+fn customcompletions_fallback() {
+    let (_, _, mut engine, mut stack) = new_engine();
+    let command = r#"
+        def comp [] { null }
+        def my-command [arg: string@comp] {}"#;
+    assert!(support::merge_input(command.as_bytes(), &mut engine, &mut stack).is_ok());
+
+    let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
+    let completion_str = "my-command test";
+    let suggestions = completer.complete(completion_str, completion_str.len());
+    let expected: Vec<String> = vec![folder("test_a"), file("test_a_symlink"), folder("test_b")];
+    match_suggestions(&expected, &suggestions);
+}
+
+/// Suppress completions for invalid values
+#[test]
+fn customcompletions_invalid() {
+    let (_, _, mut engine, mut stack) = new_engine();
+    let command = r#"
+        def comp [] { 123 }
+        def my-command [arg: string@comp] {}"#;
+    assert!(support::merge_input(command.as_bytes(), &mut engine, &mut stack).is_ok());
+    let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
+
+    let completion_str = "my-command foo";
+    let suggestions = completer.complete(completion_str, completion_str.len());
+    assert!(suggestions.is_empty());
+}
+
 #[test]
 fn dotnu_completions() {
     // Create a new engine
@@ -312,6 +343,27 @@ fn external_completer_pass_flags() {
     assert_eq!("--", suggestions.get(2).unwrap().value);
 }
 
+/// Fallback to file completions when external completer returns null
+#[test]
+fn external_completer_fallback() {
+    let block = "{|spans| null}";
+    let input = "foo test".to_string();
+
+    let expected = vec![folder("test_a"), file("test_a_symlink"), folder("test_b")];
+    let suggestions = run_external_completion(block, &input);
+    match_suggestions(&expected, &suggestions);
+}
+
+/// Suppress completions when external completer returns invalid value
+#[test]
+fn external_completer_invalid() {
+    let block = "{|spans| 123}";
+    let input = "foo ".to_string();
+
+    let suggestions = run_external_completion(block, &input);
+    assert!(suggestions.is_empty());
+}
+
 #[test]
 fn file_completions() {
     // Create a new engine

From f88ed6ecd52c167485f50f1c1bd9dea2d2d8fc04 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Sun, 26 Jan 2025 08:20:39 -0500
Subject: [PATCH 0958/1072] Fix improperly escaped strings in stor update
 (#14921)

# Description

Fixes #14909 with the same technique used in #12820 for `stor insert`.
Single quotes (and others) now work properly in strings passed to `stor
update`. Also did some minor refactoring on `stor insert` so it matches
the changes in `stor update`.

# User-Facing Changes

Bug-fix.

# Tests + Formatting

Test added for this scenario.

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

N/A
---
 crates/nu-command/src/stor/insert.rs     | 24 ++++++--------
 crates/nu-command/src/stor/update.rs     | 42 +++++++-----------------
 crates/nu-command/tests/commands/mod.rs  |  1 +
 crates/nu-command/tests/commands/stor.rs | 37 +++++++++++++++++++++
 4 files changed, 59 insertions(+), 45 deletions(-)
 create mode 100644 crates/nu-command/tests/commands/stor.rs

diff --git a/crates/nu-command/src/stor/insert.rs b/crates/nu-command/src/stor/insert.rs
index 94b5bdf940..4a2ebf4928 100644
--- a/crates/nu-command/src/stor/insert.rs
+++ b/crates/nu-command/src/stor/insert.rs
@@ -161,27 +161,23 @@ fn process(
     let new_table_name = table_name.unwrap_or("table".into());
 
     if let Ok(conn) = db.open_connection() {
-        let mut create_stmt = format!("INSERT INTO {} ( ", new_table_name);
+        let mut create_stmt = format!("INSERT INTO {} (", new_table_name);
+        let mut column_placeholders: Vec<String> = Vec::new();
+
         let cols = record.columns();
         cols.for_each(|col| {
-            create_stmt.push_str(&format!("{}, ", col));
+            column_placeholders.push(col.to_string());
         });
-        if create_stmt.ends_with(", ") {
-            create_stmt.pop();
-            create_stmt.pop();
-        }
+
+        create_stmt.push_str(&column_placeholders.join(", "));
 
         // Values are set as placeholders.
-        create_stmt.push_str(") VALUES ( ");
+        create_stmt.push_str(") VALUES (");
+        let mut value_placeholders: Vec<String> = Vec::new();
         for (index, _) in record.columns().enumerate() {
-            create_stmt.push_str(&format!("?{}, ", index + 1));
+            value_placeholders.push(format!("?{}", index + 1));
         }
-
-        if create_stmt.ends_with(", ") {
-            create_stmt.pop();
-            create_stmt.pop();
-        }
-
+        create_stmt.push_str(&value_placeholders.join(", "));
         create_stmt.push(')');
 
         // dbg!(&create_stmt);
diff --git a/crates/nu-command/src/stor/update.rs b/crates/nu-command/src/stor/update.rs
index a158e0f7d0..8a77f41d51 100644
--- a/crates/nu-command/src/stor/update.rs
+++ b/crates/nu-command/src/stor/update.rs
@@ -1,6 +1,7 @@
-use crate::database::{SQLiteDatabase, MEMORY_DB};
+use crate::database::{values_to_sql, SQLiteDatabase, MEMORY_DB};
 use nu_engine::command_prelude::*;
 use nu_protocol::Signals;
+use rusqlite::params_from_iter;
 
 #[derive(Clone)]
 pub struct StorUpdate;
@@ -163,36 +164,12 @@ fn process(
         let mut update_stmt = format!("UPDATE {} ", new_table_name);
 
         update_stmt.push_str("SET ");
-        let vals = record.iter();
-        vals.for_each(|(key, val)| match val {
-            Value::Int { val, .. } => {
-                update_stmt.push_str(&format!("{} = {}, ", key, val));
-            }
-            Value::Float { val, .. } => {
-                update_stmt.push_str(&format!("{} = {}, ", key, val));
-            }
-            Value::String { val, .. } => {
-                update_stmt.push_str(&format!("{} = '{}', ", key, val));
-            }
-            Value::Date { val, .. } => {
-                update_stmt.push_str(&format!("{} = '{}', ", key, val));
-            }
-            Value::Bool { val, .. } => {
-                update_stmt.push_str(&format!("{} = {}, ", key, val));
-            }
-            _ => {
-                // return Err(ShellError::UnsupportedInput {
-                //     msg: format!("{} is not a valid datepart, expected one of year, month, day, hour, minute, second, millisecond, microsecond, nanosecond", part.item),
-                //     input: "value originates from here".to_string(),
-                //     msg_span: span,
-                //     input_span: val.span(),
-                // });
-            }
-        });
-        if update_stmt.ends_with(", ") {
-            update_stmt.pop();
-            update_stmt.pop();
+        let mut placeholders: Vec<String> = Vec::new();
+
+        for (index, (key, _)) in record.iter().enumerate() {
+            placeholders.push(format!("{} = ?{}", key, index + 1));
         }
+        update_stmt.push_str(&placeholders.join(", "));
 
         // Yup, this is a bit janky, but I'm not sure a better way to do this without having
         // --and and --or flags as well as supporting ==, !=, <>, is null, is not null, etc.
@@ -202,7 +179,10 @@ fn process(
         }
         // dbg!(&update_stmt);
 
-        conn.execute(&update_stmt, [])
+        // Get the params from the passed values
+        let params = values_to_sql(record.values().cloned())?;
+
+        conn.execute(&update_stmt, params_from_iter(params))
             .map_err(|err| ShellError::GenericError {
                 error: "Failed to open SQLite connection in memory from update".into(),
                 msg: err.to_string(),
diff --git a/crates/nu-command/tests/commands/mod.rs b/crates/nu-command/tests/commands/mod.rs
index 73d5d4577a..3b47b0eb90 100644
--- a/crates/nu-command/tests/commands/mod.rs
+++ b/crates/nu-command/tests/commands/mod.rs
@@ -105,6 +105,7 @@ mod sort_by;
 mod source_env;
 mod split_column;
 mod split_row;
+mod stor;
 mod str_;
 mod table;
 mod take;
diff --git a/crates/nu-command/tests/commands/stor.rs b/crates/nu-command/tests/commands/stor.rs
new file mode 100644
index 0000000000..4ed0c5dae0
--- /dev/null
+++ b/crates/nu-command/tests/commands/stor.rs
@@ -0,0 +1,37 @@
+use nu_test_support::{nu, pipeline};
+
+#[test]
+fn stor_insert() {
+    let actual = nu!(pipeline(
+        r#"
+            stor create --table-name test_table --columns { id: int, value: str };
+            stor insert -t test_table --data-record {
+                id: 1
+                value: "'Initial value'"
+            };
+            stor open | query db 'select value from test_table' | get 0.value
+        "#
+    ));
+
+    assert_eq!(actual.out, "'Initial value'");
+}
+
+#[test]
+fn stor_update_with_quote() {
+    let actual = nu!(pipeline(
+        r#"
+            stor create --table-name test_table --columns { id: int, value: str };
+            stor insert -t test_table --data-record {
+                id: 1
+                value: "'Initial value'"
+            };
+            stor update -t test_table --where-clause 'id = 1' --update-record {
+                id: 1
+                value: "This didn't work, but should now."
+            };
+            stor open | query db 'select value from test_table' | get 0.value
+        "#
+    ));
+
+    assert_eq!(actual.out, "This didn't work, but should now.");
+}

From f46f8b286bb58fd3136febd655cadd516af676ae Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Sun, 26 Jan 2025 21:43:34 +0800
Subject: [PATCH 0959/1072] refactor(parser): use var_id for most constants in
 `ResolvedImportPattern` (#14920)

# Description

This PR replaces most of the constants in `ResolvedImportPattern` from
values to VarIds, this has benefits of:
1. less duplicated variables in state
2. precise span of variable, for example when calling `goto def` on a
const imported by the `use` command, this allows it to find the original
definition, instead of where the `use` command is.

Note that the logic is different here for nested submodules, not all
values are flattened and propagated to the outmost record variable, but
I didn't find any differences in real world usage.

I noticed that it was changed from `VarId` to `Value` in #10049.
Maybe @kubouch can find some edge cases where this PR fails to work as
expected.

In my view, the record constants for `ResolvedImportPattern` should even
reduced to single entry, if not able to get rid of.

# User-Facing Changes

# Tests + Formatting

# After Submitting
---
 crates/nu-lsp/src/ast.rs               |  6 +--
 crates/nu-parser/src/parse_keywords.rs | 11 ++++-
 crates/nu-protocol/src/module.rs       | 65 ++++++++++++++++++--------
 3 files changed, 58 insertions(+), 24 deletions(-)

diff --git a/crates/nu-lsp/src/ast.rs b/crates/nu-lsp/src/ast.rs
index 62d7b85f56..56d67aa5f3 100644
--- a/crates/nu-lsp/src/ast.rs
+++ b/crates/nu-lsp/src/ast.rs
@@ -296,10 +296,10 @@ fn try_find_id_in_use(
             .find_module(name)
             .and_then(|module_id| (module_id == *module_id_ref).then_some(Id::Module(module_id))),
         None => working_set
-            .find_variable(name)
-            .map(Id::Variable)
+            .find_module(name)
+            .map(Id::Module)
             .or(working_set.find_decl(name).map(Id::Declaration))
-            .or(working_set.find_module(name).map(Id::Module)),
+            .or(working_set.find_variable(name).map(Id::Variable)),
         _ => None,
     };
     let check_location = |span: &Span| location.map_or(true, |pos| span.contains(*pos));
diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index c1dc6ad98a..4f0a91dd90 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -2468,7 +2468,11 @@ pub fn parse_use(
 
     let mut constants = vec![];
 
-    for (name, const_val) in definitions.constants {
+    for (name, const_vid) in definitions.constants {
+        constants.push((name, const_vid));
+    }
+
+    for (name, const_val) in definitions.constant_values {
         let const_var_id =
             working_set.add_variable(name.clone(), name_span, const_val.get_type(), false);
         working_set.set_variable_const_val(const_var_id, const_val);
@@ -2967,7 +2971,10 @@ pub fn parse_overlay_use(working_set: &mut StateWorkingSet, call: Box<Call>) ->
             )
         }
     } else {
-        (ResolvedImportPattern::new(vec![], vec![], vec![]), vec![])
+        (
+            ResolvedImportPattern::new(vec![], vec![], vec![], vec![]),
+            vec![],
+        )
     };
 
     if errors.is_empty() {
diff --git a/crates/nu-protocol/src/module.rs b/crates/nu-protocol/src/module.rs
index 0b1a371864..b5913f58da 100644
--- a/crates/nu-protocol/src/module.rs
+++ b/crates/nu-protocol/src/module.rs
@@ -9,19 +9,24 @@ use indexmap::IndexMap;
 pub struct ResolvedImportPattern {
     pub decls: Vec<(Vec<u8>, DeclId)>,
     pub modules: Vec<(Vec<u8>, ModuleId)>,
-    pub constants: Vec<(Vec<u8>, Value)>,
+    pub constants: Vec<(Vec<u8>, VarId)>,
+    /// TODO: for referencing module name as a record, e.g. `$module_name.const_name`
+    /// values got multiple duplicates in memory.
+    pub constant_values: Vec<(Vec<u8>, Value)>,
 }
 
 impl ResolvedImportPattern {
     pub fn new(
         decls: Vec<(Vec<u8>, DeclId)>,
         modules: Vec<(Vec<u8>, ModuleId)>,
-        constants: Vec<(Vec<u8>, Value)>,
+        constants: Vec<(Vec<u8>, VarId)>,
+        constant_values: Vec<(Vec<u8>, Value)>,
     ) -> Self {
         ResolvedImportPattern {
             decls,
             modules,
             constants,
+            constant_values,
         }
     }
 }
@@ -123,6 +128,7 @@ impl Module {
         } else {
             // Import pattern was just name without any members
             let mut decls = vec![];
+            let mut const_vids = vec![];
             let mut const_rows = vec![];
             let mut errors = vec![];
 
@@ -148,14 +154,18 @@ impl Module {
                     decls.push((new_name, sub_decl_id));
                 }
 
-                const_rows.extend(sub_results.constants);
+                const_vids.extend(sub_results.constants);
+                const_rows.extend(sub_results.constant_values);
             }
 
             decls.extend(self.decls_with_head(&final_name));
 
             for (name, var_id) in self.consts() {
                 match working_set.get_constant(var_id) {
-                    Ok(const_val) => const_rows.push((name, const_val.clone())),
+                    Ok(const_val) => {
+                        const_vids.push((name.clone(), var_id));
+                        const_rows.push((name, const_val.clone()))
+                    }
                     Err(err) => errors.push(err),
                 }
             }
@@ -163,7 +173,7 @@ impl Module {
             let span = self.span.unwrap_or(backup_span);
 
             // only needs to bring `$module` with a record value if it defines any constants.
-            let constants = if const_rows.is_empty() {
+            let constant_values = if const_rows.is_empty() {
                 vec![]
             } else {
                 vec![(
@@ -179,7 +189,12 @@ impl Module {
             };
 
             return (
-                ResolvedImportPattern::new(decls, vec![(final_name.clone(), self_id)], constants),
+                ResolvedImportPattern::new(
+                    decls,
+                    vec![(final_name.clone(), self_id)],
+                    const_vids,
+                    constant_values,
+                ),
                 errors,
             );
         };
@@ -204,32 +219,39 @@ impl Module {
                                 vec![(final_name, main_decl_id)],
                                 vec![],
                                 vec![],
+                                vec![],
                             ),
                             errors,
                         )
                     } else {
                         (
-                            ResolvedImportPattern::new(vec![], vec![], vec![]),
+                            ResolvedImportPattern::new(vec![], vec![], vec![], vec![]),
                             vec![ParseError::ExportNotFound(*span)],
                         )
                     }
                 } else if let Some(decl_id) = self.decls.get(name) {
                     (
-                        ResolvedImportPattern::new(vec![(name.clone(), *decl_id)], vec![], vec![]),
+                        ResolvedImportPattern::new(
+                            vec![(name.clone(), *decl_id)],
+                            vec![],
+                            vec![],
+                            vec![],
+                        ),
                         errors,
                     )
                 } else if let Some(var_id) = self.constants.get(name) {
                     match working_set.get_constant(*var_id) {
-                        Ok(const_val) => (
+                        Ok(_) => (
                             ResolvedImportPattern::new(
                                 vec![],
                                 vec![],
-                                vec![(name.clone(), const_val.clone())],
+                                vec![(name.clone(), *var_id)],
+                                vec![],
                             ),
                             errors,
                         ),
                         Err(err) => (
-                            ResolvedImportPattern::new(vec![], vec![], vec![]),
+                            ResolvedImportPattern::new(vec![], vec![], vec![], vec![]),
                             vec![err],
                         ),
                     }
@@ -245,7 +267,7 @@ impl Module {
                     )
                 } else {
                     (
-                        ResolvedImportPattern::new(vec![], vec![], vec![]),
+                        ResolvedImportPattern::new(vec![], vec![], vec![], vec![]),
                         vec![ParseError::ExportNotFound(*span)],
                     )
                 }
@@ -254,6 +276,7 @@ impl Module {
                 let mut decls = vec![];
                 let mut submodules = vec![];
                 let mut constants = vec![];
+                let mut constant_values = vec![];
                 let mut errors = vec![];
 
                 for (_, id) in &self.submodules {
@@ -270,23 +293,25 @@ impl Module {
 
                     submodules.extend(sub_results.modules);
                     constants.extend(sub_results.constants);
+                    constant_values.extend(sub_results.constant_values);
                     errors.extend(sub_errors);
                 }
 
                 decls.extend(self.decls());
-                constants.extend(self.constants.iter().filter_map(|(name, var_id)| {
+                for (name, var_id) in self.constants.iter() {
                     match working_set.get_constant(*var_id) {
-                        Ok(const_val) => Some((name.clone(), const_val.clone())),
+                        Ok(_) => {
+                            constants.push((name.clone(), *var_id));
+                        }
                         Err(err) => {
                             errors.push(err);
-                            None
                         }
                     }
-                }));
+                }
                 submodules.extend(self.submodules());
 
                 (
-                    ResolvedImportPattern::new(decls, submodules, constants),
+                    ResolvedImportPattern::new(decls, submodules, constants, constant_values),
                     errors,
                 )
             }
@@ -294,6 +319,7 @@ impl Module {
                 let mut decls = vec![];
                 let mut modules = vec![];
                 let mut constants = vec![];
+                let mut constant_values = vec![];
                 let mut errors = vec![];
 
                 for (name, span) in names {
@@ -307,7 +333,7 @@ impl Module {
                         decls.push((name.clone(), *decl_id));
                     } else if let Some(var_id) = self.constants.get(name) {
                         match working_set.get_constant(*var_id) {
-                            Ok(const_val) => constants.push((name.clone(), const_val.clone())),
+                            Ok(_) => constants.push((name.clone(), *var_id)),
                             Err(err) => errors.push(err),
                         }
                     } else if let Some(submodule_id) = self.submodules.get(name) {
@@ -324,6 +350,7 @@ impl Module {
                         decls.extend(sub_results.decls);
                         modules.extend(sub_results.modules);
                         constants.extend(sub_results.constants);
+                        constant_values.extend(sub_results.constant_values);
                         errors.extend(sub_errors);
                     } else {
                         errors.push(ParseError::ExportNotFound(*span));
@@ -331,7 +358,7 @@ impl Module {
                 }
 
                 (
-                    ResolvedImportPattern::new(decls, modules, constants),
+                    ResolvedImportPattern::new(decls, modules, constants, constant_values),
                     errors,
                 )
             }

From 7ea489551315a5ab68fd1e9e5a7ed5a0b3ef494a Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Sun, 26 Jan 2025 20:43:45 +0000
Subject: [PATCH 0960/1072] Use `ref-cast` crate to remove some `unsafe`
 (#14897)

# Description

In a few places, `nu-path` uses `unsafe` to do reference casts. This PR
adds the [`ref-cast`](https://crates.io/crates/ref-cast) crate to do
reference casts in a "safe" manner.
---
 Cargo.lock                 |  1 +
 crates/nu-path/Cargo.toml  |  3 ++-
 crates/nu-path/src/form.rs |  2 +-
 crates/nu-path/src/path.rs | 20 +++++++++++---------
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 22d0e50d33..4ac27d4dd8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3928,6 +3928,7 @@ dependencies = [
  "dirs",
  "omnipath",
  "pwd",
+ "ref-cast",
 ]
 
 [[package]]
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index 155e4168c9..ad64a0a4aa 100644
--- a/crates/nu-path/Cargo.toml
+++ b/crates/nu-path/Cargo.toml
@@ -13,6 +13,7 @@ bench = false
 
 [dependencies]
 dirs = { workspace = true }
+ref-cast = "1.0.23"
 
 [target.'cfg(windows)'.dependencies]
 omnipath = { workspace = true }
@@ -21,4 +22,4 @@ omnipath = { workspace = true }
 pwd = { workspace = true }
 
 [lints]
-workspace = true
\ No newline at end of file
+workspace = true
diff --git a/crates/nu-path/src/form.rs b/crates/nu-path/src/form.rs
index edec72c08c..260db74540 100644
--- a/crates/nu-path/src/form.rs
+++ b/crates/nu-path/src/form.rs
@@ -14,7 +14,7 @@ mod private {
 }
 
 /// A marker trait for the different kinds of path forms.
-/// Each form has its own invariants that are guaranteed be upheld.
+/// Each form has its own invariants that are guaranteed to be upheld.
 /// The list of path forms are:
 /// - [`Any`]: a path with no invariants. It may be a relative or an absolute path.
 /// - [`Relative`]: a strictly relative path.
diff --git a/crates/nu-path/src/path.rs b/crates/nu-path/src/path.rs
index 9d7b64af27..69b370a374 100644
--- a/crates/nu-path/src/path.rs
+++ b/crates/nu-path/src/path.rs
@@ -2,6 +2,7 @@ use crate::form::{
     Absolute, Any, Canonical, IsAbsolute, MaybeRelative, PathCast, PathForm, PathJoin, PathPush,
     PathSet, Relative,
 };
+use ref_cast::{ref_cast_custom, RefCastCustom};
 use std::{
     borrow::{Borrow, Cow},
     cmp::Ordering,
@@ -45,8 +46,9 @@ use std::{
 /// But this may cause third-party code to use [`std::env::current_dir`] to resolve
 /// the path which is almost always incorrect behavior. Extra care is needed to ensure that this
 /// is not the case after using [`as_relative_std_path`](Path::as_relative_std_path).
+#[derive(RefCastCustom)]
 #[repr(transparent)]
-pub struct Path<Form: PathForm = Any> {
+pub struct Path<Form = Any> {
     _form: PhantomData<Form>,
     inner: std::path::Path,
 }
@@ -162,11 +164,11 @@ impl<Form: PathForm> Path<Form> {
     /// Create a new path of any form without validating invariants.
     #[inline]
     fn new_unchecked<P: AsRef<OsStr> + ?Sized>(path: &P) -> &Self {
+        #[ref_cast_custom]
+        fn ref_cast<Form: PathForm>(path: &std::path::Path) -> &Path<Form>;
+
         debug_assert!(Form::invariants_satisfied(path));
-        // Safety: `Path<Form>` is a repr(transparent) wrapper around `std::path::Path`.
-        let path = std::path::Path::new(path.as_ref());
-        let ptr = std::ptr::from_ref(path) as *const Self;
-        unsafe { &*ptr }
+        ref_cast(std::path::Path::new(path))
     }
 
     /// Attempt to create a new [`Path`] from a reference of another type.
@@ -1900,10 +1902,10 @@ impl<Form: PathForm> Deref for PathBuf<Form> {
 impl DerefMut for PathBuf {
     #[inline]
     fn deref_mut(&mut self) -> &mut Self::Target {
-        // Safety: `Path<Form>` is a repr(transparent) wrapper around `std::path::Path`.
-        let path: &mut std::path::Path = &mut self.inner;
-        let ptr = std::ptr::from_mut(path) as *mut Path;
-        unsafe { &mut *ptr }
+        #[ref_cast_custom]
+        fn ref_cast<Form: PathForm>(path: &mut std::path::Path) -> &mut Path<Form>;
+
+        ref_cast(&mut self.inner)
     }
 }
 

From 0ad5f4389cce3df5dfe03dc25d27c46a16cf096d Mon Sep 17 00:00:00 2001
From: pyz4 <42039243+pyz4@users.noreply.github.com>
Date: Mon, 27 Jan 2025 07:02:18 -0500
Subject: [PATCH 0961/1072] nu_plugin_polars: add `polars into-repr` to display
 dataframe in portable repr format (#14917)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
This PR adds a new command that outputs a NuDataFrame or NuLazyFrame in
its repr format, which can then be ingested in another polars instance.
Advantages of serializing a dataframe in this format are that it can be
viewed as a table, carries type information, and can easily be copied to
the clipboard.

```nushell
# In Nushell
> [[a b]; [2025-01-01 2] [2025-01-02 4]] | polars into-df | polars into-lazy | polars into-repr

shape: (2, 2)
┌─────────────────────┬─────┐
│ a                   ┆ b   │
│ ---                 ┆ --- │
│ datetime[ns]        ┆ i64 │
╞═════════════════════╪═════╡
│ 2025-01-01 00:00:00 ┆ 2   │
│ 2025-01-02 00:00:00 ┆ 4   │
└─────────────────────┴─────┘
```

```python
# In python
>>> import polars as pl
>>> df = pl.from_repr("""
... shape: (2, 2)
... ┌─────────────────────┬─────┐
... │ a                   ┆ b   │
... │ ---                 ┆ --- │
... │ datetime[ns]        ┆ i64 │
... ╞═════════════════════╪═════╡
... │ 2025-01-01 00:00:00 ┆ 2   │
... │ 2025-01-02 00:00:00 ┆ 4   │
... └─────────────────────┴─────┘""")
shape: (2, 2)
┌─────────────────────┬─────┐
│ a                   ┆ b   │
│ ---                 ┆ --- │
│ datetime[ns]        ┆ i64 │
╞═════════════════════╪═════╡
│ 2025-01-01 00:00:00 ┆ 2   │
│ 2025-01-02 00:00:00 ┆ 4   │
└─────────────────────┴─────┘

>>> df.select(pl.col("a").dt.offset_by("12m"))
shape: (2, 1)
┌─────────────────────┐
│ a                   │
│ ---                 │
│ datetime[ns]        │
╞═════════════════════╡
│ 2025-01-01 00:12:00 │
│ 2025-01-02 00:12:00 │
└─────────────────────┘
```

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
A new command `polars into-repr` is added. No other commands are
impacted by the changes in this PR.

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->
Examples were added in the command definition.

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 .../src/dataframe/command/core/mod.rs         |   3 +
 .../src/dataframe/command/core/to_repr.rs     | 115 ++++++++++++++++++
 .../src/dataframe/values/nu_dataframe/mod.rs  |   7 ++
 3 files changed, 125 insertions(+)
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/core/to_repr.rs

diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/mod.rs b/crates/nu_plugin_polars/src/dataframe/command/core/mod.rs
index 1badf9d5f1..f71a3dfdbd 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/mod.rs
@@ -10,6 +10,7 @@ mod summary;
 mod to_df;
 mod to_lazy;
 mod to_nu;
+mod to_repr;
 
 use crate::PolarsPlugin;
 use nu_plugin::PluginCommand;
@@ -22,6 +23,7 @@ pub use summary::Summary;
 pub use to_df::ToDataFrame;
 pub use to_lazy::ToLazyFrame;
 pub use to_nu::ToNu;
+pub use to_repr::ToRepr;
 
 pub(crate) fn core_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin>>> {
     vec![
@@ -37,5 +39,6 @@ pub(crate) fn core_commands() -> Vec<Box<dyn PluginCommand<Plugin = PolarsPlugin
         Box::new(ToDataFrame),
         Box::new(save::SaveDF),
         Box::new(ToLazyFrame),
+        Box::new(ToRepr),
     ]
 }
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/to_repr.rs b/crates/nu_plugin_polars/src/dataframe/command/core/to_repr.rs
new file mode 100644
index 0000000000..d867f320cb
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/to_repr.rs
@@ -0,0 +1,115 @@
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{
+    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Type, Value,
+};
+
+use crate::{
+    values::{cant_convert_err, CustomValueSupport, NuLazyFrame, PolarsPluginType},
+    PolarsPlugin,
+};
+
+use crate::values::NuDataFrame;
+
+#[derive(Clone)]
+pub struct ToRepr;
+
+impl PluginCommand for ToRepr {
+    type Plugin = PolarsPlugin;
+
+    fn name(&self) -> &str {
+        "polars into-repr"
+    }
+
+    fn description(&self) -> &str {
+        "Display a dataframe in its repr format."
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build(self.name())
+            .input_output_types(vec![(Type::Custom("dataframe".into()), Type::String)])
+            .category(Category::Custom("dataframe".into()))
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                description: "Shows dataframe in repr format",
+                example:
+                    "[[a b]; [2025-01-01 2] [2025-01-02 4]] | polars into-df | polars into-repr",
+                result: Some(Value::string(
+                    r#"
+shape: (2, 2)
+┌─────────────────────┬─────┐
+│ a                   ┆ b   │
+│ ---                 ┆ --- │
+│ datetime[ns]        ┆ i64 │
+╞═════════════════════╪═════╡
+│ 2025-01-01 00:00:00 ┆ 2   │
+│ 2025-01-02 00:00:00 ┆ 4   │
+└─────────────────────┴─────┘"#
+                        .trim(),
+                    Span::test_data(),
+                )),
+            },
+            Example {
+                description: "Shows lazy dataframe in repr format",
+                example:
+                    "[[a b]; [2025-01-01 2] [2025-01-02 4]] | polars into-df | polars into-lazy | polars into-repr",
+                result: Some(Value::string(
+                    r#"
+shape: (2, 2)
+┌─────────────────────┬─────┐
+│ a                   ┆ b   │
+│ ---                 ┆ --- │
+│ datetime[ns]        ┆ i64 │
+╞═════════════════════╪═════╡
+│ 2025-01-01 00:00:00 ┆ 2   │
+│ 2025-01-02 00:00:00 ┆ 4   │
+└─────────────────────┴─────┘"#
+                        .trim(),
+                    Span::test_data(),
+                )),
+            },
+        ]
+    }
+
+    fn run(
+        &self,
+        plugin: &Self::Plugin,
+        _engine: &EngineInterface,
+        call: &EvaluatedCall,
+        input: PipelineData,
+    ) -> Result<PipelineData, LabeledError> {
+        let value = input.into_value(call.head)?;
+        if NuDataFrame::can_downcast(&value) || NuLazyFrame::can_downcast(&value) {
+            dataframe_command(plugin, call, value)
+        } else {
+            Err(cant_convert_err(
+                &value,
+                &[PolarsPluginType::NuDataFrame, PolarsPluginType::NuLazyFrame],
+            ))
+        }
+        .map_err(|e| e.into())
+    }
+}
+
+fn dataframe_command(
+    plugin: &PolarsPlugin,
+    call: &EvaluatedCall,
+    input: Value,
+) -> Result<PipelineData, ShellError> {
+    let df = NuDataFrame::try_from_value_coerce(plugin, &input, call.head)?;
+    let value = Value::string(format!("{}", df), call.head);
+    Ok(PipelineData::Value(value, None))
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::test::test_polars_plugin_command;
+
+    #[test]
+    fn test_examples() -> Result<(), ShellError> {
+        test_polars_plugin_command(&ToRepr)
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs
index 1138896d74..bb273a0a8a 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs
@@ -13,6 +13,7 @@ use polars::prelude::{
 };
 use polars_plan::prelude::{lit, Expr, Null};
 use polars_utils::total_ord::{TotalEq, TotalHash};
+use std::fmt;
 use std::{
     cmp::Ordering,
     collections::HashSet,
@@ -118,6 +119,12 @@ impl From<DataFrame> for NuDataFrame {
     }
 }
 
+impl fmt::Display for NuDataFrame {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.df)
+    }
+}
+
 impl NuDataFrame {
     pub fn new(from_lazy: bool, df: DataFrame) -> Self {
         let id = Uuid::new_v4();

From 5ca4e903c80c90586208e28824c09c60b8343028 Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Mon, 27 Jan 2025 20:20:09 +0800
Subject: [PATCH 0962/1072] fix(lsp): goto/hover on module name in some
 commands (#14924)

# Description
This PR enables basic goto def/hover features on module name in
commands:
1. hide
2. overlay use
3. overlay hide

## Some pending issues

1. Somewhat related to #14816
```nushell
overlay use foo as bar
                  # |_______ cursor here
```
fails to work, since the position of the cursor is outside of the whole
span of this call expression.
I'll try to fix #14816 later instead of implementing new weird
workarounds.

2. references/renaming however is still buggy on overlays with
`as`/`--prefix` features enabled.

# User-Facing Changes
# Tests + Formatting
3 more tests
# After Submitting
---
 crates/nu-lsp/src/ast.rs              | 141 ++++++++++++++++++++------
 crates/nu-lsp/src/goto.rs             |  82 ++++++++++++++-
 tests/fixtures/lsp/goto/use_module.nu |   3 +
 3 files changed, 194 insertions(+), 32 deletions(-)

diff --git a/crates/nu-lsp/src/ast.rs b/crates/nu-lsp/src/ast.rs
index 56d67aa5f3..21c6ddc71d 100644
--- a/crates/nu-lsp/src/ast.rs
+++ b/crates/nu-lsp/src/ast.rs
@@ -266,8 +266,8 @@ fn try_find_id_in_mod(
     })
 }
 
-/// Find id in use command
-/// `use foo.nu bar` or `use foo.nu [bar baz]`
+/// Find id in use/hide command
+/// `hide foo.nu bar` or `use foo.nu [bar baz]`
 /// NOTE: `call.parser_info` contains a 'import_pattern' field for `use` commands,
 /// but sometimes it is missing, so fall back to `call_name == "use"` here.
 /// One drawback is that the `module_id` is harder to get
@@ -282,9 +282,11 @@ fn try_find_id_in_use(
     id: Option<&Id>,
 ) -> Option<(Id, Span)> {
     let call_name = working_set.get_span_contents(call.head);
-    if call_name != b"use" {
+    if call_name != b"use" && call_name != b"hide" {
         return None;
     }
+    // TODO: for keyword `hide`, the decl/var is already hidden in working_set,
+    // this function will always return None.
     let find_by_name = |name: &[u8]| match id {
         Some(Id::Variable(var_id_ref)) => working_set
             .find_variable(name)
@@ -303,28 +305,21 @@ fn try_find_id_in_use(
         _ => None,
     };
     let check_location = |span: &Span| location.map_or(true, |pos| span.contains(*pos));
-    let get_module_id = |span: Span| {
-        let span = strip_quotes(span, working_set);
-        let name = String::from_utf8_lossy(working_set.get_span_contents(span));
-        let path = std::path::PathBuf::from(name.as_ref());
-        let stem = path.file_stem().and_then(|fs| fs.to_str()).unwrap_or(&name);
-        let found_id = Id::Module(working_set.find_module(stem.as_bytes())?);
-        id.map_or(true, |id_r| found_id == *id_r)
-            .then_some((found_id, span))
-    };
 
     // Get module id if required
     let module_name = call.arguments.first()?;
     let span = module_name.span();
     if let Some(Id::Module(_)) = id {
-        // still need to check the second argument
-        if let Some(res) = get_module_id(span) {
+        // still need to check the rest, if id not matched
+        if let Some(res) = get_matched_module_id(working_set, span, id) {
             return Some(res);
         }
     }
     if let Some(pos) = location {
-        if span.contains(*pos) {
-            return get_module_id(span);
+        // first argument of `use` should always be module name
+        // while it is optional in `hide`
+        if span.contains(*pos) && call_name == b"use" {
+            return get_matched_module_id(working_set, span, id);
         }
     }
 
@@ -343,26 +338,103 @@ fn try_find_id_in_use(
         })
     };
 
-    // the imported name is always at the second argument
-    let Argument::Positional(expr) = call.arguments.get(1)? else {
-        return None;
+    let arguments = if call_name == b"use" {
+        call.arguments.get(1..)?
+    } else {
+        call.arguments.as_slice()
     };
-    if !check_location(&expr.span) {
+
+    for arg in arguments {
+        let Argument::Positional(expr) = arg else {
+            continue;
+        };
+        if !check_location(&expr.span) {
+            continue;
+        }
+        let matched = match &expr.expr {
+            Expr::String(name) => {
+                find_by_name(name.as_bytes()).map(|id| (id, strip_quotes(expr.span, working_set)))
+            }
+            Expr::List(items) => search_in_list_items(items),
+            Expr::FullCellPath(fcp) => {
+                let Expr::List(items) = &fcp.head.expr else {
+                    return None;
+                };
+                search_in_list_items(items)
+            }
+            _ => None,
+        };
+        if matched.is_some() || location.is_some() {
+            return matched;
+        }
+    }
+    None
+}
+
+/// Find id in use/hide command
+///
+/// TODO: rename of `overlay use as new_name`, `overlay use --prefix`
+///
+/// # Arguments
+/// - `location`: None if no `contains` check required
+/// - `id`: None if no id equal check required
+fn try_find_id_in_overlay(
+    call: &Call,
+    working_set: &StateWorkingSet,
+    location: Option<&usize>,
+    id: Option<&Id>,
+) -> Option<(Id, Span)> {
+    let call_name = working_set.get_span_contents(call.head);
+    if call_name != b"overlay use" && call_name != b"overlay hide" {
         return None;
     }
-    match &expr.expr {
-        Expr::String(name) => {
-            find_by_name(name.as_bytes()).map(|id| (id, strip_quotes(expr.span, working_set)))
+    let check_location = |span: &Span| location.map_or(true, |pos| span.contains(*pos));
+    for arg in call.arguments.iter() {
+        let Argument::Positional(expr) = arg else {
+            continue;
+        };
+        if !check_location(&expr.span) {
+            continue;
+        };
+        let matched = match &expr.expr {
+            Expr::String(name) => {
+                let name = name.as_bytes();
+                get_matched_module_id(working_set, expr.span, id).or_else(|| {
+                    let found_id = Id::Module(working_set.find_overlay(name)?.origin);
+                    id.map_or(true, |id_r| found_id == *id_r)
+                        .then_some((found_id, strip_quotes(expr.span, working_set)))
+                })
+            }
+            // keyword 'as'
+            Expr::Keyword(kwd) => match &kwd.expr.expr {
+                Expr::String(name) => {
+                    let found_id = Id::Module(working_set.find_overlay(name.as_bytes())?.origin);
+                    id.map_or(true, |id_r| found_id == *id_r)
+                        .then_some((found_id, strip_quotes(kwd.expr.span, working_set)))
+                }
+                _ => None,
+            },
+            _ => None,
+        };
+        if matched.is_some() || location.is_some() {
+            return matched;
         }
-        Expr::List(items) => search_in_list_items(items),
-        Expr::FullCellPath(fcp) => {
-            let Expr::List(items) = &fcp.head.expr else {
-                return None;
-            };
-            search_in_list_items(items)
-        }
-        _ => None,
     }
+    None
+}
+
+fn get_matched_module_id(
+    working_set: &StateWorkingSet,
+    span: Span,
+    id: Option<&Id>,
+) -> Option<(Id, Span)> {
+    let span = strip_quotes(span, working_set);
+    let name = String::from_utf8_lossy(working_set.get_span_contents(span));
+    let path = std::path::PathBuf::from(name.as_ref());
+    let stem = path.file_stem().and_then(|fs| fs.to_str()).unwrap_or(&name);
+    let found_id = Id::Module(working_set.find_module(stem.as_bytes())?);
+    id.map_or(true, |id_r| found_id == *id_r)
+        .then_some((found_id, span))
 }
 
 fn find_id_in_expr(
@@ -396,6 +468,12 @@ fn find_id_in_expr(
                 try_find_id_in_def(call, working_set, Some(location), None)
                     .or(try_find_id_in_mod(call, working_set, Some(location), None))
                     .or(try_find_id_in_use(call, working_set, Some(location), None))
+                    .or(try_find_id_in_overlay(
+                        call,
+                        working_set,
+                        Some(location),
+                        None,
+                    ))
                     .map(|p| vec![p])
             }
         }
@@ -458,6 +536,7 @@ fn find_reference_by_id_in_expr(
             if let Some((_, span_found)) = try_find_id_in_def(call, working_set, None, Some(id))
                 .or(try_find_id_in_mod(call, working_set, None, Some(id)))
                 .or(try_find_id_in_use(call, working_set, None, Some(id)))
+                .or(try_find_id_in_overlay(call, working_set, None, Some(id)))
             {
                 occurs.push(span_found);
             }
diff --git a/crates/nu-lsp/src/goto.rs b/crates/nu-lsp/src/goto.rs
index 15e607477e..ef1bcb3101 100644
--- a/crates/nu-lsp/src/goto.rs
+++ b/crates/nu-lsp/src/goto.rs
@@ -55,7 +55,7 @@ impl LanguageServer {
 mod tests {
     use crate::path_to_uri;
     use crate::tests::{initialize_language_server, open_unchecked};
-    use assert_json_diff::assert_json_eq;
+    use assert_json_diff::{assert_json_eq, assert_json_include};
     use lsp_server::{Connection, Message};
     use lsp_types::{
         request::{GotoDefinition, Request},
@@ -413,4 +413,84 @@ mod tests {
             })
         );
     }
+
+    #[test]
+    fn goto_definition_of_module_in_hide() {
+        let (client_connection, _recv) = initialize_language_server(None);
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("goto");
+        script.push("use_module.nu");
+        let script = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script.clone());
+
+        let resp = send_goto_definition_request(&client_connection, script.clone(), 3, 6);
+        let result = if let Message::Response(response) = resp {
+            response.result
+        } else {
+            panic!()
+        };
+
+        assert_json_eq!(
+            result,
+            serde_json::json!({
+                "uri": script.to_string().replace("use_module", "module"),
+                "range": {
+                    "start": { "line": 1, "character": 29 },
+                    "end": { "line": 1, "character": 30 }
+                }
+            })
+        );
+    }
+
+    #[test]
+    fn goto_definition_of_module_in_overlay() {
+        let (client_connection, _recv) = initialize_language_server(None);
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("goto");
+        script.push("use_module.nu");
+        let script = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script.clone());
+
+        let resp = send_goto_definition_request(&client_connection, script.clone(), 1, 20);
+        let result = if let Message::Response(response) = resp {
+            response.result
+        } else {
+            panic!()
+        };
+
+        assert_json_include!(
+            actual: result,
+            expected: serde_json::json!({
+                "uri": script.to_string().replace("use_module", "module"),
+                "range": {
+                    "start": { "line": 0, "character": 0 },
+                    "end": { "line": 3 }
+                }
+            })
+        );
+
+        let resp = send_goto_definition_request(&client_connection, script.clone(), 2, 30);
+        let result = if let Message::Response(response) = resp {
+            response.result
+        } else {
+            panic!()
+        };
+
+        assert_json_include!(
+            actual: result,
+            expected: serde_json::json!({
+                "uri": script.to_string().replace("use_module", "module"),
+                "range": {
+                    "start": { "line": 0, "character": 0 },
+                    "end": { "line": 3 }
+                }
+            })
+        );
+    }
 }
diff --git a/tests/fixtures/lsp/goto/use_module.nu b/tests/fixtures/lsp/goto/use_module.nu
index 0bbc2e19a5..058e631fd7 100644
--- a/tests/fixtures/lsp/goto/use_module.nu
+++ b/tests/fixtures/lsp/goto/use_module.nu
@@ -1 +1,4 @@
 use module.nu "module name"
+overlay use module.nu as new_name
+overlay hide --keep-env [PWD] new_name
+hide "module name"

From b53271b86aa30150fd6b6e1e755cb964f8fa9050 Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Mon, 27 Jan 2025 23:13:48 +0800
Subject: [PATCH 0963/1072] fix(parser): span of keyword expression (#14928)

# Description

This PR fixes #14816 , so that expression-contains-position check won't
need special treatment for keyword expressions.
e.g.

```nushell
overlay use foo as bar
                  # |_______ cursor here

if true { } else { }
                # |_______ here
```

as mentioned in #14924

# User-Facing Changes

# Tests + Formatting

# After Submitting
---
 crates/nu-lsp/src/ast.rs       |  7 -------
 crates/nu-lsp/src/goto.rs      | 18 ++++++++++++++++++
 crates/nu-parser/src/parser.rs |  2 +-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/crates/nu-lsp/src/ast.rs b/crates/nu-lsp/src/ast.rs
index 21c6ddc71d..33e88d2d63 100644
--- a/crates/nu-lsp/src/ast.rs
+++ b/crates/nu-lsp/src/ast.rs
@@ -444,13 +444,6 @@ fn find_id_in_expr(
 ) -> Option<Vec<(Id, Span)>> {
     // skip the entire expression if the location is not in it
     if !expr.span.contains(*location) {
-        // TODO: the span of Keyword does not include its subsidiary expression
-        // resort to `expr_flat_map` if location found in its expr
-        if let Expr::Keyword(kw) = &expr.expr {
-            if kw.expr.span.contains(*location) {
-                return None;
-            }
-        }
         return Some(Vec::new());
     }
     let span = expr.span;
diff --git a/crates/nu-lsp/src/goto.rs b/crates/nu-lsp/src/goto.rs
index ef1bcb3101..1c761e4f82 100644
--- a/crates/nu-lsp/src/goto.rs
+++ b/crates/nu-lsp/src/goto.rs
@@ -475,6 +475,24 @@ mod tests {
             })
         );
 
+        let resp = send_goto_definition_request(&client_connection, script.clone(), 1, 25);
+        let result = if let Message::Response(response) = resp {
+            response.result
+        } else {
+            panic!()
+        };
+
+        assert_json_include!(
+            actual: result,
+            expected: serde_json::json!({
+                "uri": script.to_string().replace("use_module", "module"),
+                "range": {
+                    "start": { "line": 0, "character": 0 },
+                    "end": { "line": 3 }
+                }
+            })
+        );
+
         let resp = send_goto_definition_request(&client_connection, script.clone(), 2, 30);
         let result = if let Message::Response(response) = resp {
             response.result
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index ceb1b3d129..8744469f5d 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -919,7 +919,7 @@ pub fn parse_multispan_value(
             Expression::new(
                 working_set,
                 Expr::Keyword(Box::new(keyword.clone())),
-                arg_span,
+                keyword.span.merge(keyword.expr.span),
                 keyword.expr.ty,
             )
         }

From c0b4d19761db1a3a0976057e8c53c6e6624e25c5 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Mon, 27 Jan 2025 11:01:39 -0800
Subject: [PATCH 0964/1072] Polars upgrade to 0.46 (#14933)

Upgraded to Polars 0.46
---
 Cargo.lock                                    | 484 +++++++-----------
 crates/nu_plugin_polars/Cargo.toml            |  20 +-
 .../src/dataframe/command/core/save/arrow.rs  |   3 +-
 .../src/dataframe/command/core/save/csv.rs    |   3 +-
 .../src/dataframe/command/core/save/ndjson.rs |   3 +-
 .../dataframe/command/core/save/parquet.rs    |   3 +-
 .../src/dataframe/command/core/to_df.rs       |  34 +-
 .../src/dataframe/command/data/concat.rs      |   2 +
 .../dataframe/command/data/sort_by_expr.rs    |   2 +
 .../src/dataframe/command/data/sql_expr.rs    |   1 +
 .../src/dataframe/command/index/arg_sort.rs   |   2 +
 .../values/nu_dataframe/conversion.rs         |   9 +-
 .../src/dataframe/values/nu_dataframe/mod.rs  |   2 +-
 .../src/dataframe/values/nu_schema.rs         |   8 +-
 14 files changed, 223 insertions(+), 353 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4ac27d4dd8..f219d9a546 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -287,20 +287,11 @@ dependencies = [
  "syn 2.0.90",
 ]
 
-[[package]]
-name = "atoi"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "atoi_simd"
-version = "0.15.6"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ae037714f313c1353189ead58ef9eec30a8e8dc101b2622d461418fd59e28a9"
+checksum = "4790f9e8961209112beb783d85449b508673cf4a6a419c8449b210743ac4dbe9"
 
 [[package]]
 name = "atomic-waker"
@@ -671,6 +662,15 @@ dependencies = [
  "vsimd",
 ]
 
+[[package]]
+name = "bincode"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "bindgen"
 version = "0.70.1"
@@ -767,6 +767,17 @@ dependencies = [
  "brotli-decompressor",
 ]
 
+[[package]]
+name = "brotli"
+version = "7.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+ "brotli-decompressor",
+]
+
 [[package]]
 name = "brotli-decompressor"
 version = "4.0.1"
@@ -802,9 +813,9 @@ checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce"
 
 [[package]]
 name = "bytemuck"
-version = "1.20.0"
+version = "1.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a"
+checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3"
 dependencies = [
  "bytemuck_derive",
 ]
@@ -831,6 +842,9 @@ name = "bytes"
 version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "bytes-utils"
@@ -963,17 +977,6 @@ dependencies = [
  "chrono",
 ]
 
-[[package]]
-name = "chrono-tz"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e"
-dependencies = [
- "chrono",
- "chrono-tz-build 0.2.1",
- "phf",
-]
-
 [[package]]
 name = "chrono-tz"
 version = "0.10.0"
@@ -981,21 +984,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd6dd8046d00723a59a2f8c5f295c515b9bb9a331ee4f8f3d4dd49e428acd3b6"
 dependencies = [
  "chrono",
- "chrono-tz-build 0.4.0",
+ "chrono-tz-build",
  "phf",
 ]
 
-[[package]]
-name = "chrono-tz-build"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f"
-dependencies = [
- "parse-zoneinfo",
- "phf",
- "phf_codegen",
-]
-
 [[package]]
 name = "chrono-tz-build"
 version = "0.4.0"
@@ -1016,33 +1008,6 @@ dependencies = [
  "stacker",
 ]
 
-[[package]]
-name = "ciborium"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
-dependencies = [
- "ciborium-io",
- "ciborium-ll",
- "serde",
-]
-
-[[package]]
-name = "ciborium-io"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
-
-[[package]]
-name = "ciborium-ll"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
-dependencies = [
- "ciborium-io",
- "half",
-]
-
 [[package]]
 name = "clang-sys"
 version = "1.8.1"
@@ -1083,7 +1048,7 @@ version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
 dependencies = [
- "heck 0.5.0",
+ "heck",
  "proc-macro2",
  "quote",
  "syn 2.0.90",
@@ -1828,10 +1793,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "fast-float"
-version = "0.2.0"
+name = "fast-float2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c"
+checksum = "f8eb564c5c7423d25c886fb561d1e4ee69f72354d16918afa32c08811f6b6a55"
 
 [[package]]
 name = "fastrand"
@@ -1893,6 +1858,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
 dependencies = [
  "crc32fast",
+ "libz-rs-sys",
  "miniz_oxide",
 ]
 
@@ -1952,9 +1918,9 @@ dependencies = [
 
 [[package]]
 name = "fs4"
-version = "0.9.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c6b3bd49c37d2aa3f3f2220233b29a7cd23f79d1fe70e5337d25fb390793de"
+checksum = "c29c30684418547d476f0b48e84f4821639119c483b1eccd566c8cd0cd05f521"
 dependencies = [
  "rustix",
  "windows-sys 0.52.0",
@@ -2213,16 +2179,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "half"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
-dependencies = [
- "cfg-if",
- "crunchy",
-]
-
 [[package]]
 name = "halfbrown"
 version = "0.2.5"
@@ -2286,12 +2242,6 @@ dependencies = [
  "stable_deref_trait",
 ]
 
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -2745,12 +2695,6 @@ dependencies = [
  "web-time",
 ]
 
-[[package]]
-name = "indoc"
-version = "2.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
-
 [[package]]
 name = "inotify"
 version = "0.9.6"
@@ -2875,12 +2819,6 @@ version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
-[[package]]
-name = "itoap"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9028f49264629065d057f340a86acb84867925865f73bbf8d47b4d149a7e88b8"
-
 [[package]]
 name = "jobserver"
 version = "0.1.32"
@@ -3060,6 +2998,15 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "libz-rs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a90e19106f1b2c93f1fa6cdeec2e56facbf2e403559c1e1c0ddcc6d46e979cdf"
+dependencies = [
+ "zlib-rs",
+]
+
 [[package]]
 name = "libz-sys"
 version = "1.1.20"
@@ -3261,22 +3208,13 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memmap2"
-version = "0.7.1"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6"
+checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
 dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "memoffset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "miette"
 version = "7.4.0"
@@ -3409,28 +3347,6 @@ dependencies = [
  "uuid",
 ]
 
-[[package]]
-name = "multiversion"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4851161a11d3ad0bf9402d90ffc3967bf231768bfd7aeb61755ad06dbf1a142"
-dependencies = [
- "multiversion-macros",
- "target-features",
-]
-
-[[package]]
-name = "multiversion-macros"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79a74ddee9e0c27d2578323c13905793e91622148f138ba29738f9dddb835e90"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "target-features",
-]
-
 [[package]]
 name = "native-tls"
 version = "0.2.12"
@@ -3645,7 +3561,7 @@ name = "nu-cmd-extra"
 version = "0.101.1"
 dependencies = [
  "fancy-regex",
- "heck 0.5.0",
+ "heck",
  "itertools 0.13.0",
  "nu-ansi-term",
  "nu-cmd-base",
@@ -3707,14 +3623,14 @@ dependencies = [
  "alphanumeric-sort",
  "base64 0.22.1",
  "bracoxide",
- "brotli",
+ "brotli 6.0.0",
  "byteorder",
  "bytesize",
  "calamine",
  "chardetng",
  "chrono",
  "chrono-humanize",
- "chrono-tz 0.10.0",
+ "chrono-tz",
  "crossterm 0.28.1",
  "csv",
  "data-encoding",
@@ -3819,7 +3735,7 @@ dependencies = [
 name = "nu-derive-value"
 version = "0.101.1"
 dependencies = [
- "heck 0.5.0",
+ "heck",
  "proc-macro-error",
  "proc-macro2",
  "quote",
@@ -4020,14 +3936,14 @@ dependencies = [
 name = "nu-protocol"
 version = "0.101.1"
 dependencies = [
- "brotli",
+ "brotli 6.0.0",
  "bytes",
  "chrono",
  "chrono-humanize",
  "dirs",
  "dirs-sys",
  "fancy-regex",
- "heck 0.5.0",
+ "heck",
  "indexmap",
  "log",
  "lru",
@@ -4196,10 +4112,10 @@ dependencies = [
  "aws-config",
  "aws-credential-types",
  "chrono",
- "chrono-tz 0.10.0",
+ "chrono-tz",
  "env_logger 0.11.5",
  "fancy-regex",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.2",
  "indexmap",
  "log",
  "mimalloc",
@@ -4489,9 +4405,9 @@ dependencies = [
 
 [[package]]
 name = "object_store"
-version = "0.10.2"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6da452820c715ce78221e8202ccc599b4a52f3e1eb3eedb487b680c81a8e3f3"
+checksum = "3cfccb68961a56facde1163f9319e0d15743352344e7808a11795fb99698dcaf"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -4504,7 +4420,7 @@ dependencies = [
  "md-5",
  "parking_lot",
  "percent-encoding",
- "quick-xml 0.36.2",
+ "quick-xml 0.37.1",
  "rand",
  "reqwest",
  "ring",
@@ -4917,9 +4833,9 @@ dependencies = [
 
 [[package]]
 name = "polars"
-version = "0.44.2"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f65c6aa86d991a64c95416a61202f7952da2f8cccefa448f9a23c1b8f2301ecc"
+checksum = "72571dde488ecccbe799798bf99ab7308ebdb7cf5d95bcc498dbd5a132f0da4d"
 dependencies = [
  "getrandom",
  "polars-arrow",
@@ -4929,6 +4845,7 @@ dependencies = [
  "polars-lazy",
  "polars-ops",
  "polars-parquet",
+ "polars-plan",
  "polars-sql",
  "polars-time",
  "polars-utils",
@@ -4937,34 +4854,29 @@ dependencies = [
 
 [[package]]
 name = "polars-arrow"
-version = "0.44.2"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87dbb24d29ddea5abb73d7954df8b8d3d4bb7f02a3e5c96d1519cdad9e816a3d"
+checksum = "6611c758d52e799761cc25900666b71552e6c929d88052811bc9daad4b3321a8"
 dependencies = [
  "ahash",
- "atoi",
  "atoi_simd",
  "avro-schema",
  "bytemuck",
  "chrono",
- "chrono-tz 0.8.6",
+ "chrono-tz",
  "dyn-clone",
  "either",
  "ethnum",
- "fast-float",
  "getrandom",
  "hashbrown 0.15.2",
  "itoa",
- "itoap",
  "lz4",
- "multiversion",
  "num-traits",
  "parking_lot",
  "polars-arrow-format",
  "polars-error",
  "polars-schema",
  "polars-utils",
- "ryu",
  "serde",
  "simdutf8",
  "streaming-iterator",
@@ -4986,36 +4898,42 @@ dependencies = [
 
 [[package]]
 name = "polars-compute"
-version = "0.44.2"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbdb1071147452a4c4b25560f23d2fbaffef255b04757291131b22fc2c0d35b2"
+checksum = "332f2547dbb27599a8ffe68e56159f5996ba03d1dad0382ccb62c109ceacdeb6"
 dependencies = [
+ "atoi_simd",
  "bytemuck",
+ "chrono",
  "either",
+ "fast-float2",
+ "itoa",
  "num-traits",
  "polars-arrow",
  "polars-error",
  "polars-utils",
+ "ryu",
  "strength_reduce",
  "version_check",
 ]
 
 [[package]]
 name = "polars-core"
-version = "0.44.2"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd5df9b55e614088a3270b06f8649dce76537c268d6b1ca4d9c37008b2be5949"
+checksum = "796d06eae7e6e74ed28ea54a8fccc584ebac84e6cf0e1e9ba41ffc807b169a01"
 dependencies = [
  "ahash",
  "bitflags 2.6.0",
  "bytemuck",
  "chrono",
- "chrono-tz 0.8.6",
+ "chrono-tz",
  "comfy-table",
  "either",
  "hashbrown 0.14.5",
  "hashbrown 0.15.2",
  "indexmap",
+ "itoa",
  "num-traits",
  "once_cell",
  "polars-arrow",
@@ -5031,30 +4949,30 @@ dependencies = [
  "serde",
  "serde_json",
  "strum_macros",
- "thiserror 1.0.69",
+ "thiserror 2.0.6",
  "version_check",
  "xxhash-rust",
 ]
 
 [[package]]
 name = "polars-error"
-version = "0.44.2"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4643898a644f30c83737db85f942f8c8956b0c11190b39afec745218eae1746b"
+checksum = "19d6529cae0d1db5ed690e47de41fac9b35ae0c26d476830c2079f130887b847"
 dependencies = [
  "avro-schema",
  "object_store",
  "polars-arrow-format",
  "regex",
  "simdutf8",
- "thiserror 1.0.69",
+ "thiserror 2.0.6",
 ]
 
 [[package]]
 name = "polars-expr"
-version = "0.44.2"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea1b431ed816cba1120cff200f06b962748001bbb2e615ce53cfbbdf701cc136"
+checksum = "c8e639991a8ad4fb12880ab44bcc3cf44a5703df003142334d9caf86d77d77e7"
 dependencies = [
  "ahash",
  "bitflags 2.6.0",
@@ -5076,9 +4994,9 @@ dependencies = [
 
 [[package]]
 name = "polars-io"
-version = "0.44.2"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2fab2c016635cb416b49461fd6419b0208c6c13a4fd065bd65e4a87dbb66314"
+checksum = "719a77e94480f6be090512da196e378cbcbeb3584c6fe1134c600aee906e38ab"
 dependencies = [
  "ahash",
  "async-trait",
@@ -5086,8 +5004,8 @@ dependencies = [
  "blake3",
  "bytes",
  "chrono",
- "chrono-tz 0.8.6",
- "fast-float",
+ "chrono-tz",
+ "fast-float2",
  "flate2",
  "fs4",
  "futures",
@@ -5109,7 +5027,6 @@ dependencies = [
  "polars-schema",
  "polars-time",
  "polars-utils",
- "pyo3",
  "rayon",
  "regex",
  "reqwest",
@@ -5126,19 +5043,20 @@ dependencies = [
 
 [[package]]
 name = "polars-json"
-version = "0.44.2"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5c8c057ef04feaf34b6ce52096bdea3a766fa4725f50442078c8a4ee86397bf"
+checksum = "e30603ca81e317b66b4caac683a8325a6a82ea0489685dc37e22ae03720def98"
 dependencies = [
  "ahash",
  "chrono",
- "chrono-tz 0.8.6",
+ "chrono-tz",
  "fallible-streaming-iterator",
  "hashbrown 0.15.2",
  "indexmap",
  "itoa",
  "num-traits",
  "polars-arrow",
+ "polars-compute",
  "polars-error",
  "polars-utils",
  "ryu",
@@ -5148,12 +5066,13 @@ dependencies = [
 
 [[package]]
 name = "polars-lazy"
-version = "0.44.2"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a8ca74f42e7b47cad241b36b98d991cc7fbb51b8d0695a055eb937588d1f310"
+checksum = "a0a731a672dfc8ac38c1f73c9a4b2ae38d2fc8ac363bfb64c5f3a3e072ffc5ad"
 dependencies = [
  "ahash",
  "bitflags 2.6.0",
+ "chrono",
  "futures",
  "memchr",
  "once_cell",
@@ -5176,9 +5095,9 @@ dependencies = [
 
 [[package]]
 name = "polars-mem-engine"
-version = "0.44.2"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a32614e5b52c9b83856d80c7e2880b79d83055bfd59969bd1d0b148f9cfdc7a"
+checksum = "33442189bcbf2e2559aa7914db3835429030a13f4f18e43af5fba9d1b018cf12"
 dependencies = [
  "futures",
  "memmap2",
@@ -5192,23 +5111,22 @@ dependencies = [
  "polars-plan",
  "polars-time",
  "polars-utils",
- "pyo3",
  "rayon",
  "tokio",
 ]
 
 [[package]]
 name = "polars-ops"
-version = "0.44.2"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "035c800fbe5bbd820afeb8313713ed345853bb014e0f821a4025d40cf0d60e1a"
+checksum = "cbb83218b0c216104f0076cd1a005128be078f958125f3d59b094ee73d78c18e"
 dependencies = [
  "ahash",
  "argminmax",
  "base64 0.22.1",
  "bytemuck",
  "chrono",
- "chrono-tz 0.8.6",
+ "chrono-tz",
  "either",
  "hashbrown 0.15.2",
  "hex",
@@ -5216,6 +5134,7 @@ dependencies = [
  "jsonpath_lib_polars_vendor",
  "memchr",
  "num-traits",
+ "once_cell",
  "polars-arrow",
  "polars-compute",
  "polars-core",
@@ -5231,20 +5150,21 @@ dependencies = [
  "serde",
  "serde_json",
  "strum_macros",
+ "unicode-normalization",
  "unicode-reverse",
  "version_check",
 ]
 
 [[package]]
 name = "polars-parquet"
-version = "0.44.2"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91dcf1d9f048079376949eaf2e24e240b313ff4a102fb83b57c9a5f807cdca52"
+checksum = "5c60ee85535590a38db6c703a21be4cb25342e40f573f070d1e16f9d84a53ac7"
 dependencies = [
  "ahash",
  "async-stream",
  "base64 0.22.1",
- "brotli",
+ "brotli 7.0.0",
  "bytemuck",
  "ethnum",
  "flate2",
@@ -5276,9 +5196,9 @@ dependencies = [
 
 [[package]]
 name = "polars-pipe"
-version = "0.44.2"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05936f2b3981eecb2fe74d8ef092bb75a93d2a056b3e4f339f4ac20c71c9e331"
+checksum = "42d238fb76698f56e51ddfa89b135e4eda56a4767c6e8859eed0ab78386fcd52"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-queue",
@@ -5286,6 +5206,7 @@ dependencies = [
  "futures",
  "hashbrown 0.15.2",
  "num-traits",
+ "once_cell",
  "polars-arrow",
  "polars-compute",
  "polars-core",
@@ -5303,17 +5224,16 @@ dependencies = [
 
 [[package]]
 name = "polars-plan"
-version = "0.44.2"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23de436f33f4d1134c58f24e7059a221b957ec20730807e0ef0c80c8e4b3d06a"
+checksum = "4f03533a93aa66127fcb909a87153a3c7cfee6f0ae59f497e73d7736208da54c"
 dependencies = [
  "ahash",
  "bitflags 2.6.0",
  "bytemuck",
  "bytes",
  "chrono",
- "chrono-tz 0.8.6",
- "ciborium",
+ "chrono-tz",
  "either",
  "futures",
  "hashbrown 0.15.2",
@@ -5322,6 +5242,7 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "polars-arrow",
+ "polars-compute",
  "polars-core",
  "polars-io",
  "polars-json",
@@ -5329,7 +5250,6 @@ dependencies = [
  "polars-parquet",
  "polars-time",
  "polars-utils",
- "pyo3",
  "rayon",
  "recursive",
  "regex",
@@ -5340,21 +5260,23 @@ dependencies = [
 
 [[package]]
 name = "polars-row"
-version = "0.44.2"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3823d3de3e614509bba6929798f1f3d5ae05c1cdfc4eb7029d2ec6ad77201da2"
+checksum = "6bf47f7409f8e75328d7d034be390842924eb276716d0458607be0bddb8cc839"
 dependencies = [
+ "bitflags 2.6.0",
  "bytemuck",
  "polars-arrow",
+ "polars-compute",
  "polars-error",
  "polars-utils",
 ]
 
 [[package]]
 name = "polars-schema"
-version = "0.44.2"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d88667f770291cefa2e8cd366a54f29dc6fe362e9a263914c903db411a58ac1d"
+checksum = "416621ae82b84466cf4ff36838a9b0aeb4a67e76bd3065edc8c9cb7da19b1bc7"
 dependencies = [
  "indexmap",
  "polars-error",
@@ -5365,13 +5287,11 @@ dependencies = [
 
 [[package]]
 name = "polars-sql"
-version = "0.44.2"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69451f08363bb497407f6ebebe00bc01972a51716d20d115b75f9b5326f1f3c8"
+checksum = "edaab553b90aa4d6743bb538978e1982368acb58a94408d7dd3299cad49c7083"
 dependencies = [
  "hex",
- "once_cell",
- "polars-arrow",
  "polars-core",
  "polars-error",
  "polars-lazy",
@@ -5380,16 +5300,16 @@ dependencies = [
  "polars-time",
  "polars-utils",
  "rand",
+ "regex",
  "serde",
- "serde_json",
  "sqlparser",
 ]
 
 [[package]]
 name = "polars-stream"
-version = "0.44.2"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "188622b0a4bc4530cf91a288134254ffa065d18932e261075377914225e757c2"
+checksum = "498997b656c779610c1496b3d96a59fe569ef22a5b81ccfe5325cb3df8dff2fd"
 dependencies = [
  "atomic-waker",
  "crossbeam-deque",
@@ -5403,6 +5323,7 @@ dependencies = [
  "polars-expr",
  "polars-io",
  "polars-mem-engine",
+ "polars-ops",
  "polars-parquet",
  "polars-plan",
  "polars-utils",
@@ -5416,21 +5337,24 @@ dependencies = [
 
 [[package]]
 name = "polars-time"
-version = "0.44.2"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90f36e4d6b19f2c406faea585b9a1814f422fc5b310f65ccf8a55216df0754ef"
+checksum = "d192efbdab516d28b3fab1709a969e3385bd5cda050b7c9aa9e2502a01fda879"
 dependencies = [
- "atoi",
+ "atoi_simd",
  "bytemuck",
  "chrono",
- "chrono-tz 0.8.6",
+ "chrono-tz",
  "now",
+ "num-traits",
  "once_cell",
  "polars-arrow",
+ "polars-compute",
  "polars-core",
  "polars-error",
  "polars-ops",
  "polars-utils",
+ "rayon",
  "regex",
  "serde",
  "strum_macros",
@@ -5438,14 +5362,16 @@ dependencies = [
 
 [[package]]
 name = "polars-utils"
-version = "0.44.2"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96186b70bda00c90b5027bf2f69193c5c40571e80d3e8ec505c22cdc8e3e39aa"
+checksum = "a8f6c8166a4a7fbc15b87c81645ed9e1f0651ff2e8c96cafc40ac5bf43441a10"
 dependencies = [
  "ahash",
+ "bincode",
  "bytemuck",
  "bytes",
  "compact_str 0.8.0",
+ "flate2",
  "hashbrown 0.15.2",
  "indexmap",
  "libc",
@@ -5453,12 +5379,13 @@ dependencies = [
  "num-traits",
  "once_cell",
  "polars-error",
- "pyo3",
+ "rand",
  "raw-cpuid",
  "rayon",
  "serde",
+ "serde_json",
  "stacker",
- "sysinfo 0.31.4",
+ "sysinfo 0.33.1",
  "version_check",
 ]
 
@@ -5626,69 +5553,6 @@ dependencies = [
  "thiserror 1.0.69",
 ]
 
-[[package]]
-name = "pyo3"
-version = "0.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8"
-dependencies = [
- "cfg-if",
- "indoc",
- "libc",
- "memoffset",
- "parking_lot",
- "portable-atomic",
- "pyo3-build-config",
- "pyo3-ffi",
- "pyo3-macros",
- "unindent",
-]
-
-[[package]]
-name = "pyo3-build-config"
-version = "0.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50"
-dependencies = [
- "once_cell",
- "target-lexicon",
-]
-
-[[package]]
-name = "pyo3-ffi"
-version = "0.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403"
-dependencies = [
- "libc",
- "pyo3-build-config",
-]
-
-[[package]]
-name = "pyo3-macros"
-version = "0.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c"
-dependencies = [
- "proc-macro2",
- "pyo3-macros-backend",
- "quote",
- "syn 2.0.90",
-]
-
-[[package]]
-name = "pyo3-macros-backend"
-version = "0.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c"
-dependencies = [
- "heck 0.4.1",
- "proc-macro2",
- "pyo3-build-config",
- "quote",
- "syn 2.0.90",
-]
-
 [[package]]
 name = "quick-error"
 version = "1.2.3"
@@ -5727,7 +5591,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe"
 dependencies = [
  "memchr",
- "serde",
 ]
 
 [[package]]
@@ -5737,6 +5600,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f22f29bdff3987b4d8632ef95fd6424ec7e4e0a57e2f4fc63e489e75357f6a03"
 dependencies = [
  "memchr",
+ "serde",
 ]
 
 [[package]]
@@ -6824,24 +6688,23 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "snafu"
-version = "0.7.5"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6"
+checksum = "223891c85e2a29c3fe8fb900c1fae5e69c2e42415e3177752e8718475efa5019"
 dependencies = [
- "doc-comment",
  "snafu-derive",
 ]
 
 [[package]]
 name = "snafu-derive"
-version = "0.7.5"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf"
+checksum = "03c3c6b7927ffe7ecaa769ee0e3994da3b8cafc8f444578982c83ecb161af917"
 dependencies = [
- "heck 0.4.1",
+ "heck",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -6868,9 +6731,9 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 
 [[package]]
 name = "sqlparser"
-version = "0.49.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a404d0e14905361b918cb8afdb73605e25c1d5029312bd9785142dcb3aa49e"
+checksum = "05a528114c392209b3264855ad491fcce534b94a38771b0a0b97a79379275ce8"
 dependencies = [
  "log",
 ]
@@ -6987,7 +6850,7 @@ version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
 dependencies = [
- "heck 0.5.0",
+ "heck",
  "proc-macro2",
  "quote",
  "rustversion",
@@ -7093,19 +6956,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "sysinfo"
-version = "0.31.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be"
-dependencies = [
- "core-foundation-sys",
- "libc",
- "memchr",
- "ntapi",
- "windows 0.57.0",
-]
-
 [[package]]
 name = "sysinfo"
 version = "0.32.1"
@@ -7120,6 +6970,19 @@ dependencies = [
  "windows 0.57.0",
 ]
 
+[[package]]
+name = "sysinfo"
+version = "0.33.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fc858248ea01b66f19d8e8a6d55f41deaf91e9d495246fd01368d99935c6c01"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+ "memchr",
+ "ntapi",
+ "windows 0.57.0",
+]
+
 [[package]]
 name = "tabled"
 version = "0.17.0"
@@ -7152,18 +7015,6 @@ dependencies = [
  "thiserror 1.0.69",
 ]
 
-[[package]]
-name = "target-features"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1bbb9f3c5c463a01705937a24fdabc5047929ac764b2d5b9cf681c1f5041ed5"
-
-[[package]]
-name = "target-lexicon"
-version = "0.12.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
-
 [[package]]
 name = "tempfile"
 version = "3.15.0"
@@ -7612,6 +7463,15 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
 
+[[package]]
+name = "unicode-normalization"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
+dependencies = [
+ "tinyvec",
+]
+
 [[package]]
 name = "unicode-reverse"
 version = "1.0.9"
@@ -7656,12 +7516,6 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
-[[package]]
-name = "unindent"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
-
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -8757,6 +8611,12 @@ dependencies = [
  "zopfli",
 ]
 
+[[package]]
+name = "zlib-rs"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aada01553a9312bad4b9569035a1f12b05e5ec9770a1a4b323757356928944f8"
+
 [[package]]
 name = "zopfli"
 version = "0.8.1"
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 187eb3d124..971e25ec22 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -30,25 +30,25 @@ indexmap = { version = "2.7" }
 mimalloc = { version = "0.1.42" }
 num = {version = "0.4"}
 serde = { version = "1.0", features = ["derive"] }
-sqlparser = { version = "0.49"}
-polars-io = { version = "0.44", features = ["avro", "cloud", "aws"]}
-polars-arrow = { version = "0.44"}
-polars-ops = { version = "0.44", features = ["pivot"]}
-polars-plan = { version = "0.44", features = ["regex"]}
-polars-utils = { version = "0.44"}
+sqlparser = { version = "0.53"}
+polars-io = { version = "0.46", features = ["avro", "cloud", "aws"]}
+polars-arrow = { version = "0.46"}
+polars-ops = { version = "0.46", features = ["pivot"]}
+polars-plan = { version = "0.46", features = ["regex"]}
+polars-utils = { version = "0.46"}
 typetag = "0.2"
 env_logger = "0.11.3"
 log.workspace = true
 uuid = { version = "1.12", features = ["v4", "serde"] }
 
 # Do to a compile error with polars, this included to force the raw dependency
-hashbrown = { version = "0.14", features = ["rayon", "ahash", "serde", "raw"] }
+hashbrown = { version = "0.15", features = ["rayon", "serde"] }
 
 # Cloud support
 aws-config = { version = "1.5", features = ["sso"] }
 aws-credential-types = "1.2"
 tokio = { version = "1.43", features = ["full"] }
-object_store = { version = "0.10", default-features = false }
+object_store = { version = "0.11", default-features = false }
 url.workspace = true
 
 [dependencies.polars]
@@ -90,7 +90,7 @@ features = [
     "to_dummies",
 ]
 optional = false
-version = "0.44"
+version = "0.46"
 
 [dev-dependencies]
 nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.1" }
@@ -98,4 +98,4 @@ nu-engine = { path = "../nu-engine", version = "0.101.1" }
 nu-parser = { path = "../nu-parser", version = "0.101.1" }
 nu-command = { path = "../nu-command", version = "0.101.1" }
 nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.101.1" }
-tempfile.workspace = true
\ No newline at end of file
+tempfile.workspace = true
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/save/arrow.rs b/crates/nu_plugin_polars/src/dataframe/command/core/save/arrow.rs
index 54317edea3..2a9d1dd947 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/save/arrow.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/save/arrow.rs
@@ -16,7 +16,8 @@ pub(crate) fn command_lazy(
     file_span: Span,
 ) -> Result<(), ShellError> {
     lazy.to_polars()
-        .sink_ipc(file_path, IpcWriterOptions::default())
+        // todo - add cloud options
+        .sink_ipc(file_path, IpcWriterOptions::default(), None)
         .map_err(|e| polars_file_save_error(e, file_span))
 }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/save/csv.rs b/crates/nu_plugin_polars/src/dataframe/command/core/save/csv.rs
index 941967b469..0a4b79f0b3 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/save/csv.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/save/csv.rs
@@ -32,7 +32,8 @@ pub(crate) fn command_lazy(
     };
 
     lazy.to_polars()
-        .sink_csv(file_path, options)
+        // todo - add cloud options
+        .sink_csv(file_path, options, None)
         .map_err(|e| polars_file_save_error(e, file_span))
 }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/save/ndjson.rs b/crates/nu_plugin_polars/src/dataframe/command/core/save/ndjson.rs
index 55204436d8..37ffb4b4e4 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/save/ndjson.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/save/ndjson.rs
@@ -16,7 +16,8 @@ pub(crate) fn command_lazy(
     file_span: Span,
 ) -> Result<(), ShellError> {
     lazy.to_polars()
-        .sink_json(file_path, JsonWriterOptions::default())
+        // todo - add cloud options
+        .sink_json(file_path, JsonWriterOptions::default(), None)
         .map_err(|e| polars_file_save_error(e, file_span))
 }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/save/parquet.rs b/crates/nu_plugin_polars/src/dataframe/command/core/save/parquet.rs
index f77e7c4028..7a9766b3be 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/save/parquet.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/save/parquet.rs
@@ -16,7 +16,8 @@ pub(crate) fn command_lazy(
     file_span: Span,
 ) -> Result<(), ShellError> {
     lazy.to_polars()
-        .sink_parquet(file_path, ParquetWriteOptions::default())
+        // todo - add cloud options
+        .sink_parquet(&file_path, ParquetWriteOptions::default(), None)
         .map_err(|e| polars_file_save_error(e, file_span))
 }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/to_df.rs b/crates/nu_plugin_polars/src/dataframe/command/core/to_df.rs
index e99dfa83d9..f8fd9f4572 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/to_df.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/to_df.rs
@@ -163,23 +163,23 @@ impl PluginCommand for ToDataFrame {
                 example: "[[a b c]; [1 {d: [1 2 3]} [10 11 12] ]]| polars into-df -s {a: u8, b: {d: list<u64>}, c: list<u8>}",
                 result: Some(
                     NuDataFrame::try_from_series_vec(vec![
-                        Series::new("a".into(), &[1u8]),
-                        {
-                            let dtype = DataType::Struct(vec![Field::new("a".into(), DataType::List(Box::new(DataType::UInt64)))]);
-                            let vals = vec![AnyValue::StructOwned(
-                                Box::new((vec![AnyValue::List(Series::new("a".into(), &[1u64, 2, 3]))], vec![Field::new("a".into(), DataType::String)]))); 1];
-                            Series::from_any_values_and_dtype("b".into(), &vals, &dtype, false)
-                                .expect("Struct series should not fail")
-                        },
-                        {
-                            let dtype = DataType::List(Box::new(DataType::String));
-                            let vals = vec![AnyValue::List(Series::new("c".into(), &[10, 11, 12]))];
-                            Series::from_any_values_and_dtype("c".into(), &vals, &dtype, false)
-                                .expect("List series should not fail")
-                        }
-                    ], Span::test_data())
-                    .expect("simple df for test should not fail")
-                    .into_value(Span::test_data()),
+                    Series::new("a".into(), &[1u8]),
+                    {
+                        let dtype = DataType::Struct(vec![Field::new("d".into(), DataType::List(Box::new(DataType::UInt64)))]);
+                        let vals = vec![AnyValue::StructOwned(
+                            Box::new((vec![AnyValue::List(Series::new("d".into(), &[1u64, 2, 3]))], vec![Field::new("d".into(), DataType::String)]))); 1];
+                        Series::from_any_values_and_dtype("b".into(), &vals, &dtype, false)
+                            .expect("Struct series should not fail")
+                    },
+                    {
+                        let dtype = DataType::List(Box::new(DataType::String));
+                        let vals = vec![AnyValue::List(Series::new("c".into(), &[10, 11, 12]))];
+                        Series::from_any_values_and_dtype("c".into(), &vals, &dtype, false)
+                            .expect("List series should not fail")
+                    }
+                     ], Span::test_data())
+                     .expect("simple df for test should not fail")
+                     .into_value(Span::test_data()),
                 ),
             },
             Example {
diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/concat.rs b/crates/nu_plugin_polars/src/dataframe/command/data/concat.rs
index afb2a1733d..b2d24034f8 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/concat.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/concat.rs
@@ -133,6 +133,8 @@ fn command_lazy(
             to_supertypes,
             diagonal,
             from_partitioned_ds,
+            // todo - expose maintain order
+            ..Default::default()
         };
 
         let res: NuLazyFrame = polars::prelude::concat(&dataframes, args)
diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/sort_by_expr.rs b/crates/nu_plugin_polars/src/dataframe/command/data/sort_by_expr.rs
index 3a0f2dd2d0..50539c4ab1 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/sort_by_expr.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/sort_by_expr.rs
@@ -143,6 +143,8 @@ impl PluginCommand for LazySortBy {
             nulls_last: vec![nulls_last],
             multithreaded: true,
             maintain_order,
+            // todo - expose limit
+            limit: None,
         };
 
         let pipeline_value = input.into_value(call.head)?;
diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/sql_expr.rs b/crates/nu_plugin_polars/src/dataframe/command/data/sql_expr.rs
index 163e974a1a..465da5437c 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/sql_expr.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/sql_expr.rs
@@ -176,6 +176,7 @@ fn parse_sql_function(sql_function: &SQLFunction) -> Result<Expr> {
         .map(|arg| match arg {
             FunctionArg::Named { arg, .. } => arg,
             FunctionArg::Unnamed(arg) => arg,
+            FunctionArg::ExprNamed { arg, .. } => arg,
         })
         .collect::<Vec<_>>();
     Ok(
diff --git a/crates/nu_plugin_polars/src/dataframe/command/index/arg_sort.rs b/crates/nu_plugin_polars/src/dataframe/command/index/arg_sort.rs
index 88c4bafc81..9c01353e34 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/index/arg_sort.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/index/arg_sort.rs
@@ -113,6 +113,8 @@ fn command(
         nulls_last: call.has_flag("nulls-last")?,
         multithreaded: true,
         maintain_order: call.has_flag("maintain-order")?,
+        // todo - expose limit
+        limit: None,
     };
 
     let mut res = df
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
index d196ed8ba6..ad488b02d4 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
@@ -1,5 +1,6 @@
 use std::collections::HashMap;
 use std::ops::{Deref, DerefMut};
+use std::sync::Arc;
 
 use chrono::{DateTime, Duration, FixedOffset, NaiveTime, TimeZone, Utc};
 use chrono_tz::Tz;
@@ -8,7 +9,6 @@ use polars::chunked_array::builder::AnonymousOwnedListBuilder;
 use polars::chunked_array::object::builder::ObjectChunkedBuilder;
 use polars::chunked_array::ChunkedArray;
 use polars::datatypes::{AnyValue, PlSmallStr};
-use polars::export::arrow::Either;
 use polars::prelude::{
     ChunkAnyValue, Column as PolarsColumn, DataFrame, DataType, DatetimeChunked, Float32Type,
     Float64Type, Int16Type, Int32Type, Int64Type, Int8Type, IntoSeries, ListBooleanChunkedBuilder,
@@ -18,6 +18,7 @@ use polars::prelude::{
 };
 
 use nu_protocol::{Record, ShellError, Span, Value};
+use polars_arrow::Either;
 
 use crate::dataframe::values::NuSchema;
 
@@ -474,7 +475,7 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
             Ok(res.into_series())
         }
         DataType::Struct(fields) => {
-            let schema = Some(NuSchema::new(Schema::from_iter(fields.clone())));
+            let schema = Some(NuSchema::new(Arc::new(Schema::from_iter(fields.clone()))));
             // let mut structs: Vec<Series> = Vec::new();
             let mut structs: HashMap<PlSmallStr, Series> = HashMap::new();
 
@@ -599,7 +600,7 @@ fn input_type_list_to_series(
                     .map(|v| value_to_primitive!(v, $vec_type))
                     .collect::<Result<Vec<$vec_type>, _>>()
                     .map_err(inconsistent_error)?;
-                builder.append_iter_values(value_list.iter().copied());
+                builder.append_values_iter(value_list.iter().copied());
             }
             let res = builder.finish();
             Ok(res.into_series())
@@ -1359,8 +1360,8 @@ mod tests {
     use indexmap::indexmap;
     use nu_protocol::record;
     use polars::datatypes::CompatLevel;
-    use polars::export::arrow::array::{BooleanArray, PrimitiveArray};
     use polars::prelude::Field;
+    use polars_arrow::array::{BooleanArray, PrimitiveArray};
     use polars_io::prelude::StructArray;
 
     use super::*;
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs
index bb273a0a8a..de21abafdd 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs
@@ -450,7 +450,7 @@ impl NuDataFrame {
     }
 
     pub fn schema(&self) -> NuSchema {
-        NuSchema::new(self.df.schema())
+        NuSchema::new(Arc::clone(self.df.schema()))
     }
 
     /// This differs from try_from_value as it will attempt to coerce the type into a NuDataFrame.
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_schema.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_schema.rs
index 481eb917b9..cf425eb046 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_schema.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_schema.rs
@@ -12,10 +12,8 @@ pub struct NuSchema {
 }
 
 impl NuSchema {
-    pub fn new(schema: Schema) -> Self {
-        Self {
-            schema: Arc::new(schema),
-        }
+    pub fn new(schema: SchemaRef) -> Self {
+        Self { schema }
     }
 }
 
@@ -23,7 +21,7 @@ impl TryFrom<&Value> for NuSchema {
     type Error = ShellError;
     fn try_from(value: &Value) -> Result<Self, Self::Error> {
         let schema = value_to_schema(value, Span::unknown())?;
-        Ok(Self::new(schema))
+        Ok(Self::new(Arc::new(schema)))
     }
 }
 

From a2705f9eb57f7808e31e493d6c9cfd147afed4f5 Mon Sep 17 00:00:00 2001
From: Renan Ribeiro <55855728+cosineblast@users.noreply.github.com>
Date: Mon, 27 Jan 2025 20:23:44 -0300
Subject: [PATCH 0965/1072] Fix reject regression (#14931)

This PR solves the regression introduced by #14622 (sorry about that).
It also adds a test to cover the regression.
Closes #14929.
---
 crates/nu-command/src/filters/reject.rs    | 8 +++++++-
 crates/nu-command/tests/commands/reject.rs | 7 +++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/filters/reject.rs b/crates/nu-command/src/filters/reject.rs
index e15c6b65e4..b728ca828e 100644
--- a/crates/nu-command/src/filters/reject.rs
+++ b/crates/nu-command/src/filters/reject.rs
@@ -220,8 +220,14 @@ fn reject(
 
     new_columns.append(&mut new_rows);
 
+    let has_integer_path_member = new_columns.iter().any(|path| {
+        path.members
+            .iter()
+            .any(|member| matches!(member, PathMember::Int { .. }))
+    });
+
     match input {
-        PipelineData::ListStream(stream, ..) => {
+        PipelineData::ListStream(stream, ..) if !has_integer_path_member => {
             let result = stream
                 .into_iter()
                 .map(move |mut value| {
diff --git a/crates/nu-command/tests/commands/reject.rs b/crates/nu-command/tests/commands/reject.rs
index a2c052b3e1..47c5e86452 100644
--- a/crates/nu-command/tests/commands/reject.rs
+++ b/crates/nu-command/tests/commands/reject.rs
@@ -178,3 +178,10 @@ fn test_ignore_errors_flag_var() {
         nu!("let arg = [5 c]; [[a, b]; [1, 2], [3, 4], [5, 6]] | reject ...$arg -i | to nuon");
     assert_eq!(actual.out, "[[a, b]; [1, 2], [3, 4], [5, 6]]");
 }
+
+#[test]
+fn test_works_with_integer_path_and_stream() {
+    let actual = nu!("[[N u s h e l l]] | flatten | reject 1 | to nuon");
+
+    assert_eq!(actual.out, "[N, s, h, e, l, l]");
+}

From 4bc28f1752f54d21df762d70f044858541ce9f6b Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Tue, 28 Jan 2025 20:17:07 +0800
Subject: [PATCH 0966/1072] feat(lsp): show value on hover for const variables
 and CellPaths (#14940)

# Description

e.g.
<img width="299" alt="image"
src="https://github.com/user-attachments/assets/3c16835a-6d4d-48ec-b7d6-68d5bdb88ea2"
/>

and `goto def` on cell paths now finds the specific cell (only for
const) instead of doing nothing.

# User-Facing Changes
# Tests + Formatting
# After Submitting
---
 crates/nu-lsp/src/ast.rs                |  46 ++++--
 crates/nu-lsp/src/goto.rs               | 209 +++++++-----------------
 crates/nu-lsp/src/hints.rs              |  26 +--
 crates/nu-lsp/src/lib.rs                | 187 +++++++++++----------
 crates/nu-lsp/src/notification.rs       |  34 +---
 crates/nu-lsp/src/symbols.rs            |  42 +----
 crates/nu-lsp/src/workspace.rs          |   2 +-
 crates/nu-protocol/src/ast/cell_path.rs |   7 +
 tests/fixtures/lsp/hover/cell_path.nu   |   5 +
 9 files changed, 222 insertions(+), 336 deletions(-)
 create mode 100644 tests/fixtures/lsp/hover/cell_path.nu

diff --git a/crates/nu-lsp/src/ast.rs b/crates/nu-lsp/src/ast.rs
index 33e88d2d63..200988e9ef 100644
--- a/crates/nu-lsp/src/ast.rs
+++ b/crates/nu-lsp/src/ast.rs
@@ -1,8 +1,8 @@
 use crate::Id;
 use nu_protocol::{
     ast::{
-        Argument, Block, Call, Expr, Expression, ExternalArgument, ListItem, MatchPattern, Pattern,
-        PipelineRedirection, RecordItem,
+        Argument, Block, Call, Expr, Expression, ExternalArgument, ListItem, MatchPattern,
+        PathMember, Pattern, PipelineRedirection, RecordItem,
     },
     engine::StateWorkingSet,
     Span,
@@ -389,6 +389,11 @@ fn try_find_id_in_overlay(
         return None;
     }
     let check_location = |span: &Span| location.map_or(true, |pos| span.contains(*pos));
+    let module_from_overlay_name = |name: &str, span: Span| {
+        let found_id = Id::Module(working_set.find_overlay(name.as_bytes())?.origin);
+        id.map_or(true, |id_r| found_id == *id_r)
+            .then_some((found_id, strip_quotes(span, working_set)))
+    };
     for arg in call.arguments.iter() {
         let Argument::Positional(expr) = arg else {
             continue;
@@ -397,21 +402,11 @@ fn try_find_id_in_overlay(
             continue;
         };
         let matched = match &expr.expr {
-            Expr::String(name) => {
-                let name = name.as_bytes();
-                get_matched_module_id(working_set, expr.span, id).or_else(|| {
-                    let found_id = Id::Module(working_set.find_overlay(name)?.origin);
-                    id.map_or(true, |id_r| found_id == *id_r)
-                        .then_some((found_id, strip_quotes(expr.span, working_set)))
-                })
-            }
+            Expr::String(name) => get_matched_module_id(working_set, expr.span, id)
+                .or(module_from_overlay_name(name, expr.span)),
             // keyword 'as'
             Expr::Keyword(kwd) => match &kwd.expr.expr {
-                Expr::String(name) => {
-                    let found_id = Id::Module(working_set.find_overlay(name.as_bytes())?.origin);
-                    id.map_or(true, |id_r| found_id == *id_r)
-                        .then_some((found_id, strip_quotes(kwd.expr.span, working_set)))
-                }
+                Expr::String(name) => module_from_overlay_name(name, kwd.expr.span),
                 _ => None,
             },
             _ => None,
@@ -470,6 +465,27 @@ fn find_id_in_expr(
                     .map(|p| vec![p])
             }
         }
+        Expr::FullCellPath(fcp) => {
+            if fcp.head.span.contains(*location) {
+                None
+            } else {
+                let Expression {
+                    expr: Expr::Var(var_id),
+                    ..
+                } = fcp.head
+                else {
+                    return None;
+                };
+                let tail: Vec<PathMember> = fcp
+                    .tail
+                    .clone()
+                    .into_iter()
+                    .take_while(|pm| pm.span().start <= *location)
+                    .collect();
+                let span = tail.last()?.span();
+                Some(vec![(Id::CellPath(var_id, tail), span)])
+            }
+        }
         Expr::Overlay(Some(module_id)) => Some(vec![(Id::Module(*module_id), span)]),
         // terminal value expressions
         Expr::Bool(_)
diff --git a/crates/nu-lsp/src/goto.rs b/crates/nu-lsp/src/goto.rs
index 1c761e4f82..1a384dbce9 100644
--- a/crates/nu-lsp/src/goto.rs
+++ b/crates/nu-lsp/src/goto.rs
@@ -21,6 +21,16 @@ impl LanguageServer {
                 let module = working_set.get_module(*module_id);
                 module.span
             }
+            Id::CellPath(var_id, cell_path) => {
+                let var = working_set.get_variable(*var_id);
+                Some(
+                    var.const_val
+                        .clone()
+                        .and_then(|val| val.follow_cell_path(cell_path, false).ok())
+                        .map(|val| val.span())
+                        .unwrap_or(var.declaration_span),
+                )
+            }
             _ => None,
         }
     }
@@ -54,8 +64,8 @@ impl LanguageServer {
 #[cfg(test)]
 mod tests {
     use crate::path_to_uri;
-    use crate::tests::{initialize_language_server, open_unchecked};
-    use assert_json_diff::{assert_json_eq, assert_json_include};
+    use crate::tests::{initialize_language_server, open_unchecked, result_from_message};
+    use assert_json_diff::assert_json_eq;
     use lsp_server::{Connection, Message};
     use lsp_types::{
         request::{GotoDefinition, Request},
@@ -99,40 +109,10 @@ mod tests {
 
         let mut none_existent_path = root();
         none_existent_path.push("none-existent.nu");
+        let script = path_to_uri(&none_existent_path);
+        let resp = send_goto_definition_request(&client_connection, script.clone(), 0, 0);
 
-        client_connection
-            .sender
-            .send(Message::Request(lsp_server::Request {
-                id: 2.into(),
-                method: GotoDefinition::METHOD.to_string(),
-                params: serde_json::to_value(GotoDefinitionParams {
-                    text_document_position_params: TextDocumentPositionParams {
-                        text_document: TextDocumentIdentifier {
-                            uri: path_to_uri(&none_existent_path),
-                        },
-                        position: Position {
-                            line: 0,
-                            character: 0,
-                        },
-                    },
-                    work_done_progress_params: WorkDoneProgressParams::default(),
-                    partial_result_params: PartialResultParams::default(),
-                })
-                .unwrap(),
-            }))
-            .unwrap();
-
-        let resp = client_connection
-            .receiver
-            .recv_timeout(std::time::Duration::from_secs(2))
-            .unwrap();
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
-
-        assert_json_eq!(result, serde_json::json!(null));
+        assert_json_eq!(result_from_message(resp), serde_json::json!(null));
     }
 
     #[test]
@@ -146,16 +126,10 @@ mod tests {
         let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
-
         let resp = send_goto_definition_request(&client_connection, script.clone(), 2, 12);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
         assert_json_eq!(
-            result,
+            result_from_message(resp),
             serde_json::json!({
                 "uri": script,
                 "range": {
@@ -166,6 +140,31 @@ mod tests {
         );
     }
 
+    #[test]
+    fn goto_definition_of_cell_path() {
+        let (client_connection, _recv) = initialize_language_server(None);
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("hover");
+        script.push("cell_path.nu");
+        let script = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script.clone());
+
+        let resp = send_goto_definition_request(&client_connection, script.clone(), 4, 7);
+        assert_json_eq!(
+            result_from_message(resp).pointer("/range/start").unwrap(),
+            serde_json::json!({ "line": 1, "character": 10 })
+        );
+
+        let resp = send_goto_definition_request(&client_connection, script.clone(), 4, 9);
+        assert_json_eq!(
+            result_from_message(resp).pointer("/range/start").unwrap(),
+            serde_json::json!({ "line": 1, "character": 17 })
+        );
+    }
+
     #[test]
     fn goto_definition_of_command() {
         let (client_connection, _recv) = initialize_language_server(None);
@@ -177,16 +176,10 @@ mod tests {
         let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
-
         let resp = send_goto_definition_request(&client_connection, script.clone(), 4, 1);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
         assert_json_eq!(
-            result,
+            result_from_message(resp),
             serde_json::json!({
                 "uri": script,
                 "range": {
@@ -208,16 +201,10 @@ mod tests {
         let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
-
         let resp = send_goto_definition_request(&client_connection, script.clone(), 4, 2);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
         assert_json_eq!(
-            result,
+            result_from_message(resp),
             serde_json::json!({
                 "uri": script,
                 "range": {
@@ -239,16 +226,10 @@ mod tests {
         let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
-
         let resp = send_goto_definition_request(&client_connection, script.clone(), 1, 14);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
         assert_json_eq!(
-            result,
+            result_from_message(resp),
             serde_json::json!({
                 "uri": script,
                 "range": {
@@ -270,16 +251,10 @@ mod tests {
         let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
-
         let resp = send_goto_definition_request(&client_connection, script.clone(), 1, 21);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
         assert_json_eq!(
-            result,
+            result_from_message(resp),
             serde_json::json!({
                 "uri": script,
                 "range": {
@@ -301,16 +276,10 @@ mod tests {
         let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
-
         let resp = send_goto_definition_request(&client_connection, script.clone(), 2, 9);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
         assert_json_eq!(
-            result,
+            result_from_message(resp),
             serde_json::json!({
                 "uri": script,
                 "range": {
@@ -332,16 +301,10 @@ mod tests {
         let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
-
         let resp = send_goto_definition_request(&client_connection, script.clone(), 1, 16);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
         assert_json_eq!(
-            result,
+            result_from_message(resp),
             serde_json::json!({
                 "uri": script,
                 "range": {
@@ -363,16 +326,10 @@ mod tests {
         let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
-
         let resp = send_goto_definition_request(&client_connection, script.clone(), 3, 15);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
         assert_json_eq!(
-            result,
+            result_from_message(resp),
             serde_json::json!({
                 "uri": script,
                 "range": {
@@ -394,16 +351,10 @@ mod tests {
         let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
-
         let resp = send_goto_definition_request(&client_connection, script.clone(), 0, 23);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
         assert_json_eq!(
-            result,
+            result_from_message(resp),
             serde_json::json!({
                 "uri": script.to_string().replace("use_module", "module"),
                 "range": {
@@ -425,16 +376,10 @@ mod tests {
         let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
-
         let resp = send_goto_definition_request(&client_connection, script.clone(), 3, 6);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
         assert_json_eq!(
-            result,
+            result_from_message(resp),
             serde_json::json!({
                 "uri": script.to_string().replace("use_module", "module"),
                 "range": {
@@ -458,57 +403,21 @@ mod tests {
         open_unchecked(&client_connection, script.clone());
 
         let resp = send_goto_definition_request(&client_connection, script.clone(), 1, 20);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
-
-        assert_json_include!(
-            actual: result,
-            expected: serde_json::json!({
-                "uri": script.to_string().replace("use_module", "module"),
-                "range": {
-                    "start": { "line": 0, "character": 0 },
-                    "end": { "line": 3 }
-                }
-            })
+        assert_json_eq!(
+            result_from_message(resp).pointer("/range/start").unwrap(),
+            serde_json::json!({ "line": 0, "character": 0 })
         );
 
         let resp = send_goto_definition_request(&client_connection, script.clone(), 1, 25);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
-
-        assert_json_include!(
-            actual: result,
-            expected: serde_json::json!({
-                "uri": script.to_string().replace("use_module", "module"),
-                "range": {
-                    "start": { "line": 0, "character": 0 },
-                    "end": { "line": 3 }
-                }
-            })
+        assert_json_eq!(
+            result_from_message(resp).pointer("/range/start").unwrap(),
+            serde_json::json!({ "line": 0, "character": 0 })
         );
 
         let resp = send_goto_definition_request(&client_connection, script.clone(), 2, 30);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
-
-        assert_json_include!(
-            actual: result,
-            expected: serde_json::json!({
-                "uri": script.to_string().replace("use_module", "module"),
-                "range": {
-                    "start": { "line": 0, "character": 0 },
-                    "end": { "line": 3 }
-                }
-            })
+        assert_json_eq!(
+            result_from_message(resp).pointer("/range/start").unwrap(),
+            serde_json::json!({ "line": 0, "character": 0 })
         );
     }
 }
diff --git a/crates/nu-lsp/src/hints.rs b/crates/nu-lsp/src/hints.rs
index a3ee410cf4..96c191c7db 100644
--- a/crates/nu-lsp/src/hints.rs
+++ b/crates/nu-lsp/src/hints.rs
@@ -163,7 +163,7 @@ impl LanguageServer {
 #[cfg(test)]
 mod tests {
     use crate::path_to_uri;
-    use crate::tests::{initialize_language_server, open_unchecked};
+    use crate::tests::{initialize_language_server, open_unchecked, result_from_message};
     use assert_json_diff::assert_json_eq;
     use lsp_server::{Connection, Message};
     use lsp_types::{
@@ -213,16 +213,10 @@ mod tests {
         let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
-
         let resp = send_inlay_hint_request(&client_connection, script.clone());
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
         assert_json_eq!(
-            result,
+            result_from_message(resp),
             serde_json::json!([
                 { "position": { "line": 0, "character": 9 }, "label": ": int", "kind": 1 },
                 { "position": { "line": 1, "character": 7 }, "label": ": string", "kind": 1 },
@@ -246,16 +240,10 @@ mod tests {
         let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
-
         let resp = send_inlay_hint_request(&client_connection, script.clone());
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
         assert_json_eq!(
-            result,
+            result_from_message(resp),
             serde_json::json!([
                 { "position": { "line": 0, "character": 8 }, "label": ": int", "kind": 1 },
                 { "position": { "line": 1, "character": 10 }, "label": ": float", "kind": 1 },
@@ -280,16 +268,10 @@ mod tests {
         let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
-
         let resp = send_inlay_hint_request(&client_connection, script.clone());
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
         assert_json_eq!(
-            result,
+            result_from_message(resp),
             serde_json::json!([
                 {
                     "position": { "line": 9, "character": 9 },
diff --git a/crates/nu-lsp/src/lib.rs b/crates/nu-lsp/src/lib.rs
index 14862fb6c5..f053cfb9ac 100644
--- a/crates/nu-lsp/src/lib.rs
+++ b/crates/nu-lsp/src/lib.rs
@@ -13,7 +13,7 @@ use lsp_types::{
 use miette::{miette, IntoDiagnostic, Result};
 use nu_cli::{NuCompleter, SuggestionKind};
 use nu_protocol::{
-    ast::Block,
+    ast::{Block, PathMember},
     engine::{CachedFile, Command, EngineState, Stack, StateDelta, StateWorkingSet},
     DeclId, ModuleId, Span, Type, VarId,
 };
@@ -36,12 +36,13 @@ mod notification;
 mod symbols;
 mod workspace;
 
-#[derive(Debug, Clone, Eq, PartialEq)]
+#[derive(Debug, Clone, PartialEq)]
 pub(crate) enum Id {
     Variable(VarId),
     Declaration(DeclId),
     Value(Type),
     Module(ModuleId),
+    CellPath(VarId, Vec<PathMember>),
 }
 
 pub struct LanguageServer {
@@ -423,19 +424,20 @@ impl LanguageServer {
         }
     }
 
-    fn get_decl_description(decl: &dyn Command) -> String {
+    fn get_decl_description(decl: &dyn Command, skip_description: bool) -> String {
         let mut description = String::new();
 
-        // First description
-        description.push_str(&format!("{}\n", decl.description().replace('\r', "")));
+        if !skip_description {
+            // First description
+            description.push_str(&format!("{}\n", decl.description().replace('\r', "")));
 
-        // Additional description
-        if !decl.extra_description().is_empty() {
-            description.push_str(&format!("\n{}\n", decl.extra_description()));
+            // Additional description
+            if !decl.extra_description().is_empty() {
+                description.push_str(&format!("\n{}\n", decl.extra_description()));
+            }
         }
-
         // Usage
-        description.push_str("-----\n### Usage \n```nu\n");
+        description.push_str("---\n### Usage \n```nu\n");
         let signature = decl.signature();
         description.push_str(&format!("  {}", signature.name));
         if !signature.named.is_empty() {
@@ -588,29 +590,49 @@ impl LanguageServer {
         match id {
             Id::Variable(var_id) => {
                 let var = working_set.get_variable(var_id);
+                let value = var
+                    .const_val
+                    .clone()
+                    .and_then(|v| v.coerce_into_string().ok())
+                    .map(|s| format!("\n---\n{}", s))
+                    .unwrap_or_default();
                 let contents = format!(
-                    "{}{} `{}`",
-                    if var.const_val.is_some() {
-                        "const "
-                    } else {
-                        ""
-                    },
+                    "{} ```\n{}\n``` {}",
                     if var.mutable { "mutable " } else { "" },
                     var.ty,
+                    value
                 );
                 markdown_hover(contents)
             }
-            Id::Declaration(decl_id) => {
-                markdown_hover(Self::get_decl_description(working_set.get_decl(decl_id)))
+            Id::CellPath(var_id, cell_path) => {
+                let var = working_set.get_variable(var_id);
+                markdown_hover(
+                    var.const_val
+                        .clone()
+                        .and_then(|val| val.follow_cell_path(&cell_path, false).ok())
+                        .map(|val| {
+                            let ty = val.get_type().clone();
+                            let value_string = val
+                                .coerce_into_string()
+                                .ok()
+                                .map(|s| format!("\n---\n{}", s))
+                                .unwrap_or_default();
+                            format!("```\n{}\n```{}", ty, value_string)
+                        })
+                        .unwrap_or("`unknown`".into()),
+                )
             }
+            Id::Declaration(decl_id) => markdown_hover(Self::get_decl_description(
+                working_set.get_decl(decl_id),
+                false,
+            )),
             Id::Module(module_id) => {
-                let mut description = String::new();
-                for cmt_span in working_set.get_module_comments(module_id)? {
-                    description.push_str(
-                        String::from_utf8_lossy(working_set.get_span_contents(*cmt_span)).as_ref(),
-                    );
-                    description.push('\n');
-                }
+                let description = working_set
+                    .get_module_comments(module_id)?
+                    .iter()
+                    .map(|sp| String::from_utf8_lossy(working_set.get_span_contents(*sp)).into())
+                    .collect::<Vec<String>>()
+                    .join("\n");
                 markdown_hover(description)
             }
             Id::Value(t) => markdown_hover(format!("`{}`", t)),
@@ -657,7 +679,7 @@ impl LanguageServer {
                             .extra
                             .map(|ex| ex.join("\n"))
                             .or(decl_id.map(|decl_id| {
-                                Self::get_decl_description(engine_state.get_decl(decl_id))
+                                Self::get_decl_description(engine_state.get_decl(decl_id), true)
                             }))
                             .map(|value| {
                                 Documentation::MarkupContent(MarkupContent {
@@ -855,6 +877,13 @@ mod tests {
         }
     }
 
+    pub(crate) fn result_from_message(message: lsp_server::Message) -> serde_json::Value {
+        match message {
+            Message::Response(Response { result, .. }) => result.expect("Empty result!"),
+            _ => panic!("Unexpected message type!"),
+        }
+    }
+
     pub(crate) fn send_hover_request(
         client_connection: &Connection,
         uri: Uri,
@@ -894,17 +923,45 @@ mod tests {
         let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
-
         let resp = send_hover_request(&client_connection, script.clone(), 2, 0);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
         assert_json_eq!(
-            result,
-            serde_json::json!({ "contents": { "kind": "markdown", "value": " `table`" } })
+            result_from_message(resp),
+            serde_json::json!({ "contents": { "kind": "markdown", "value": " ```\ntable\n``` " } })
+        );
+    }
+
+    #[test]
+    fn hover_on_cell_path() {
+        let (client_connection, _recv) = initialize_language_server(None);
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("hover");
+        script.push("cell_path.nu");
+        let script = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script.clone());
+
+        let resp = send_hover_request(&client_connection, script.clone(), 4, 3);
+        let result = result_from_message(resp);
+        assert_json_eq!(
+            result.pointer("/contents/value").unwrap(),
+            serde_json::json!("```\nlist<any>\n```")
+        );
+
+        let resp = send_hover_request(&client_connection, script.clone(), 4, 7);
+        let result = result_from_message(resp);
+        assert_json_eq!(
+            result.pointer("/contents/value").unwrap(),
+            serde_json::json!("```\nrecord<bar: int>\n```")
+        );
+
+        let resp = send_hover_request(&client_connection, script.clone(), 4, 11);
+        let result = result_from_message(resp);
+        assert_json_eq!(
+            result.pointer("/contents/value").unwrap(),
+            serde_json::json!("```\nint\n```\n---\n2")
         );
     }
 
@@ -919,20 +976,14 @@ mod tests {
         let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
-
         let resp = send_hover_request(&client_connection, script.clone(), 3, 0);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
         assert_json_eq!(
-            result,
+            result_from_message(resp),
             serde_json::json!({
                     "contents": {
                     "kind": "markdown",
-                    "value": "Renders some greeting message\n-----\n### Usage \n```nu\n  hello {flags}\n```\n\n### Flags\n\n  `-h`, `--help` - Display the help message for this command\n\n"
+                    "value": "Renders some greeting message\n---\n### Usage \n```nu\n  hello {flags}\n```\n\n### Flags\n\n  `-h`, `--help` - Display the help message for this command\n\n"
                 }
             })
         );
@@ -949,20 +1000,14 @@ mod tests {
         let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
-
         let resp = send_hover_request(&client_connection, script.clone(), 5, 8);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
         assert_json_eq!(
-            result,
+            result_from_message(resp),
             serde_json::json!({
                     "contents": {
                     "kind": "markdown",
-                    "value": "Concatenate multiple strings into a single string, with an optional separator between each.\n-----\n### Usage \n```nu\n  str join {flags} <separator?>\n```\n\n### Flags\n\n  `-h`, `--help` - Display the help message for this command\n\n\n### Parameters\n\n  `separator: string` - Optional separator to use when creating string.\n\n\n### Input/output types\n\n```nu\n list<any> | string\n string | string\n\n```\n### Example(s)\n  Create a string from input\n```nu\n  ['nu', 'shell'] | str join\n```\n  Create a string from input with a separator\n```nu\n  ['nu', 'shell'] | str join '-'\n```\n"
+                    "value": "Concatenate multiple strings into a single string, with an optional separator between each.\n---\n### Usage \n```nu\n  str join {flags} <separator?>\n```\n\n### Flags\n\n  `-h`, `--help` - Display the help message for this command\n\n\n### Parameters\n\n  `separator: string` - Optional separator to use when creating string.\n\n\n### Input/output types\n\n```nu\n list<any> | string\n string | string\n\n```\n### Example(s)\n  Create a string from input\n```nu\n  ['nu', 'shell'] | str join\n```\n  Create a string from input with a separator\n```nu\n  ['nu', 'shell'] | str join '-'\n```\n"
                 }
             })
         );
@@ -979,22 +1024,16 @@ mod tests {
         let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
-
         let resp = send_hover_request(&client_connection, script.clone(), 3, 12);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
+        let result = result_from_message(resp);
 
         assert_eq!(
             result
-                .unwrap()
                 .pointer("/contents/value")
                 .unwrap()
                 .to_string()
                 .replace("\\r", ""),
-            "\"# module doc\\n\""
+            "\"# module doc\""
         );
     }
 
@@ -1039,16 +1078,10 @@ mod tests {
         let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
-
         let resp = send_complete_request(&client_connection, script, 2, 9);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
         assert_json_include!(
-            actual: result,
+            actual: result_from_message(resp),
             expected: serde_json::json!([
                 {
                     "label": "$greeting",
@@ -1074,16 +1107,10 @@ mod tests {
         let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
-
         let resp = send_complete_request(&client_connection, script, 0, 8);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
         assert_json_include!(
-            actual: result,
+            actual: result_from_message(resp),
             expected: serde_json::json!([
                 {
                     "label": "config nu",
@@ -1108,16 +1135,10 @@ mod tests {
         let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
-
         let resp = send_complete_request(&client_connection, script, 0, 13);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
         assert_json_include!(
-            actual: result,
+            actual: result_from_message(resp),
             expected: serde_json::json!([
                 {
                     "label": "str trim",
@@ -1144,16 +1165,10 @@ mod tests {
         let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
-
         let resp = send_complete_request(&client_connection, script, 0, 2);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
         assert_json_include!(
-            actual: result,
+            actual: result_from_message(resp),
             expected: serde_json::json!([
                 {
                     "label": "overlay",
diff --git a/crates/nu-lsp/src/notification.rs b/crates/nu-lsp/src/notification.rs
index d64e5412ac..123fae7728 100644
--- a/crates/nu-lsp/src/notification.rs
+++ b/crates/nu-lsp/src/notification.rs
@@ -137,10 +137,10 @@ impl LanguageServer {
 mod tests {
     use crate::path_to_uri;
     use crate::tests::{
-        initialize_language_server, open, open_unchecked, send_hover_request, update,
+        initialize_language_server, open, open_unchecked, result_from_message, send_hover_request,
+        update,
     };
     use assert_json_diff::assert_json_eq;
-    use lsp_server::Message;
     use lsp_types::Range;
     use nu_test_support::fs::fixtures;
 
@@ -155,20 +155,14 @@ mod tests {
         let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
-
         let resp = send_hover_request(&client_connection, script.clone(), 0, 0);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
         assert_json_eq!(
-            result,
+            result_from_message(resp),
             serde_json::json!({
                 "contents": {
                     "kind": "markdown",
-                    "value": "Create a variable and give it a value.\n\nThis command is a parser keyword. For details, check:\n  https://www.nushell.sh/book/thinking_in_nu.html\n-----\n### Usage \n```nu\n  let {flags} <var_name> <initial_value>\n```\n\n### Flags\n\n  `-h`, `--help` - Display the help message for this command\n\n\n### Parameters\n\n  `var_name: any` - Variable name.\n\n  `initial_value: any` - Equals sign followed by value.\n\n\n### Input/output types\n\n```nu\n any | nothing\n\n```\n### Example(s)\n  Set a variable to a value\n```nu\n  let x = 10\n```\n  Set a variable to the result of an expression\n```nu\n  let x = 10 + 100\n```\n  Set a variable based on the condition\n```nu\n  let x = if false { -1 } else { 1 }\n```\n"
+                    "value": "Create a variable and give it a value.\n\nThis command is a parser keyword. For details, check:\n  https://www.nushell.sh/book/thinking_in_nu.html\n---\n### Usage \n```nu\n  let {flags} <var_name> <initial_value>\n```\n\n### Flags\n\n  `-h`, `--help` - Display the help message for this command\n\n\n### Parameters\n\n  `var_name: any` - Variable name.\n\n  `initial_value: any` - Equals sign followed by value.\n\n\n### Input/output types\n\n```nu\n any | nothing\n\n```\n### Example(s)\n  Set a variable to a value\n```nu\n  let x = 10\n```\n  Set a variable to the result of an expression\n```nu\n  let x = 10 + 100\n```\n  Set a variable based on the condition\n```nu\n  let x = if false { -1 } else { 1 }\n```\n"
                 }
             })
         );
@@ -196,20 +190,14 @@ hello"#,
             ),
             None,
         );
-
         let resp = send_hover_request(&client_connection, script.clone(), 3, 0);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
         assert_json_eq!(
-            result,
+            result_from_message(resp),
             serde_json::json!({
                 "contents": {
                     "kind": "markdown",
-                    "value": "Renders some updated greeting message\n-----\n### Usage \n```nu\n  hello {flags}\n```\n\n### Flags\n\n  `-h`, `--help` - Display the help message for this command\n\n"
+                    "value": "Renders some updated greeting message\n---\n### Usage \n```nu\n  hello {flags}\n```\n\n### Flags\n\n  `-h`, `--help` - Display the help message for this command\n\n"
                 }
             })
         );
@@ -241,20 +229,14 @@ hello"#,
                 },
             }),
         );
-
         let resp = send_hover_request(&client_connection, script.clone(), 3, 0);
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
         assert_json_eq!(
-            result,
+            result_from_message(resp),
             serde_json::json!({
                 "contents": {
                     "kind": "markdown",
-                    "value": "Renders some updated greeting message\n-----\n### Usage \n```nu\n  hello {flags}\n```\n\n### Flags\n\n  `-h`, `--help` - Display the help message for this command\n\n"
+                    "value": "Renders some updated greeting message\n---\n### Usage \n```nu\n  hello {flags}\n```\n\n### Flags\n\n  `-h`, `--help` - Display the help message for this command\n\n"
                 }
             })
         );
diff --git a/crates/nu-lsp/src/symbols.rs b/crates/nu-lsp/src/symbols.rs
index 480acf6d40..4383e33738 100644
--- a/crates/nu-lsp/src/symbols.rs
+++ b/crates/nu-lsp/src/symbols.rs
@@ -298,7 +298,7 @@ impl LanguageServer {
 #[cfg(test)]
 mod tests {
     use crate::path_to_uri;
-    use crate::tests::{initialize_language_server, open_unchecked, update};
+    use crate::tests::{initialize_language_server, open_unchecked, result_from_message, update};
     use assert_json_diff::assert_json_eq;
     use lsp_server::{Connection, Message};
     use lsp_types::{
@@ -361,15 +361,9 @@ mod tests {
         let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
-
         let resp = send_document_symbol_request(&client_connection, script.clone());
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
-        assert_json_eq!(result, serde_json::json!([]));
+        assert_json_eq!(result_from_message(resp), serde_json::json!([]));
     }
 
     #[test]
@@ -383,16 +377,10 @@ mod tests {
         let script = path_to_uri(&script);
 
         open_unchecked(&client_connection, script.clone());
-
         let resp = send_document_symbol_request(&client_connection, script.clone());
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
         assert_json_eq!(
-            result,
+            result_from_message(resp),
             serde_json::json!([
               {
                 "name": "def_foo",
@@ -446,16 +434,10 @@ mod tests {
                 },
             }),
         );
-
         let resp = send_document_symbol_request(&client_connection, script.clone());
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
         assert_json_eq!(
-            result,
+            result_from_message(resp),
             serde_json::json!([
               {
                 "name": "var_bar",
@@ -490,16 +472,10 @@ mod tests {
 
         open_unchecked(&client_connection, script_foo.clone());
         open_unchecked(&client_connection, script_bar.clone());
-
         let resp = send_workspace_symbol_request(&client_connection, "br".to_string());
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
         assert_json_eq!(
-            result,
+            result_from_message(resp),
             serde_json::json!([
               {
                 "name": "def_bar",
@@ -556,16 +532,10 @@ mod tests {
 
         open_unchecked(&client_connection, script_foo.clone());
         open_unchecked(&client_connection, script_bar.clone());
-
         let resp = send_workspace_symbol_request(&client_connection, "foo".to_string());
-        let result = if let Message::Response(response) = resp {
-            response.result
-        } else {
-            panic!()
-        };
 
         assert_json_eq!(
-            result,
+            result_from_message(resp),
             serde_json::json!([
               {
                 "name": "def_foo",
diff --git a/crates/nu-lsp/src/workspace.rs b/crates/nu-lsp/src/workspace.rs
index ed6d0bba8f..9a8a943a03 100644
--- a/crates/nu-lsp/src/workspace.rs
+++ b/crates/nu-lsp/src/workspace.rs
@@ -846,7 +846,7 @@ mod tests {
                     serde_json::json!({
                             "contents": {
                             "kind": "markdown",
-                            "value": "\n-----\n### Usage \n```nu\n  foo str {flags}\n```\n\n### Flags\n\n  `-h`, `--help` - Display the help message for this command\n\n"
+                            "value": "\n---\n### Usage \n```nu\n  foo str {flags}\n```\n\n### Flags\n\n  `-h`, `--help` - Display the help message for this command\n\n"
                         }
                     }),
                 ),
diff --git a/crates/nu-protocol/src/ast/cell_path.rs b/crates/nu-protocol/src/ast/cell_path.rs
index 3c2e9b3dd7..a1c66ddd7e 100644
--- a/crates/nu-protocol/src/ast/cell_path.rs
+++ b/crates/nu-protocol/src/ast/cell_path.rs
@@ -68,6 +68,13 @@ impl PathMember {
             } => *optional = true,
         }
     }
+
+    pub fn span(&self) -> Span {
+        match self {
+            PathMember::String { span, .. } => *span,
+            PathMember::Int { span, .. } => *span,
+        }
+    }
 }
 
 impl PartialEq for PathMember {
diff --git a/tests/fixtures/lsp/hover/cell_path.nu b/tests/fixtures/lsp/hover/cell_path.nu
new file mode 100644
index 0000000000..0f11259edc
--- /dev/null
+++ b/tests/fixtures/lsp/hover/cell_path.nu
@@ -0,0 +1,5 @@
+const r = {
+  foo: [1 {bar : 2}]
+}
+
+$r.foo.1.bar

From 45f9d03025eff995642be1b7b17ad75e4cdc3f3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=B3bert=20Kalm=C3=A1r?= <rfrostkalmar@gmail.com>
Date: Tue, 28 Jan 2025 13:21:08 +0100
Subject: [PATCH 0967/1072] fix(explore): Fix esc immediately closing explore
 in expand and try view (#14941)

This fixes #14039

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

# User-Facing Changes
Pressing `esc` or `q` in expand and try view no longer closes explore.
This is not intentional
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-explore/src/pager/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-explore/src/pager/mod.rs b/crates/nu-explore/src/pager/mod.rs
index 2d4da2e1a7..eb4ff5c443 100644
--- a/crates/nu-explore/src/pager/mod.rs
+++ b/crates/nu-explore/src/pager/mod.rs
@@ -435,7 +435,7 @@ fn run_command(
 
             let new_view = cmd.spawn(engine_state, stack, value, &view_cfg)?;
             if let Some(view) = view_stack.curr_view.take() {
-                if !view.stackable {
+                if view.stackable {
                     view_stack.stack.push(view);
                 }
             }

From ec1f7deb23f2175f2e1cd9d20a2a2fbce8c1f8a9 Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Tue, 28 Jan 2025 16:30:15 +0300
Subject: [PATCH 0968/1072] fix(help operators): include `has` and `not-has`
 operators (#14943)

# Description

Realized the recently `has`/`not-has` operators were not shown with
`help operators`.


https://github.com/nushell/nushell/blob/45f9d03025eff995642be1b7b17ad75e4cdc3f3a/crates/nu-command/src/help/help_operators.rs#L117-L118

# User-Facing Changes

# Tests + Formatting

# After Submitting
---
 crates/nu-command/src/help/help_operators.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crates/nu-command/src/help/help_operators.rs b/crates/nu-command/src/help/help_operators.rs
index 9000bdacad..73368479c2 100644
--- a/crates/nu-command/src/help/help_operators.rs
+++ b/crates/nu-command/src/help/help_operators.rs
@@ -45,6 +45,8 @@ impl Command for HelpOperators {
             Operator::Comparison(Comparison::NotRegexMatch),
             Operator::Comparison(Comparison::In),
             Operator::Comparison(Comparison::NotIn),
+            Operator::Comparison(Comparison::Has),
+            Operator::Comparison(Comparison::NotHas),
             Operator::Comparison(Comparison::StartsWith),
             Operator::Comparison(Comparison::EndsWith),
             Operator::Math(Math::Plus),

From 66bc0542e04c90d282d53134c6aa6e0aca359ee4 Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Tue, 28 Jan 2025 23:03:31 +0100
Subject: [PATCH 0969/1072] Refactor I/O Errors (#14927)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

As mentioned in #10698, we have too many `ShellError` variants, with
some even overlapping in meaning. This PR simplifies and improves I/O
error handling by restructuring `ShellError` related to I/O issues.
Previously, `ShellError::IOError` only contained a message string,
making it convenient but overly generic. It was widely used without
providing spans (#4323).

This PR introduces a new `ShellError::Io` variant that consolidates
multiple I/O-related errors (except for `ShellError::NetworkFailure`,
which remains distinct for now). The new `ShellError::Io` variant
replaces the following:

- `FileNotFound`
- `FileNotFoundCustom`
- `IOInterrupted`
- `IOError`
- `IOErrorSpanned`
- `NotADirectory`
- `DirectoryNotFound`
- `MoveNotPossible`
- `CreateNotPossible`
- `ChangeAccessTimeNotPossible`
- `ChangeModifiedTimeNotPossible`
- `RemoveNotPossible`
- `ReadingFile`

## The `IoError`
`IoError` includes the following fields:

1. **`kind`**: Extends `std::io::ErrorKind` to specify the type of I/O
error without needing new `ShellError` variants. This aligns with the
approach used in `std::io::Error`. This adds a second dimension to error
reporting by combining the `kind` field with `ShellError` variants,
making it easier to describe errors in more detail. As proposed by
@kubouch in [#design-discussion on
Discord](https://discord.com/channels/601130461678272522/615329862395101194/1323699197165178930),
this helps reduce the number of `ShellError` variants. In the error
report, the `kind` field is displayed as the "source" of the error,
e.g., "I/O error," followed by the specific kind of I/O error.
2. **`span`**: A non-optional field to encourage providing spans for
better error reporting (#4323).
3. **`path`**: Optional `PathBuf` to give context about the file or
directory involved in the error (#7695). If provided, it’s shown as a
help entry in error reports.
4. **`additional_context`**: Allows adding custom messages when the
span, kind, and path are insufficient. This is rendered in the error
report at the labeled span.
5. **`location`**: Sometimes, I/O errors occur in the engine itself and
are not caused directly by user input. In such cases, if we don’t have a
span and must set it to `Span::unknown()`, we need another way to
reference the error. For this, the `location` field uses the new
`Location` struct, which records the Rust file and line number where the
error occurred. This ensures that we at least know the Rust code
location that failed, helping with debugging. To make this work, a new
`location!` macro was added, which retrieves `file!`, `line!`, and
`column!` values accurately. If `Location::new` is used directly, it
issues a warning to remind developers to use the macro instead, ensuring
consistent and correct usage.

### Constructor Behavior
`IoError` provides five constructor methods:
- `new` and `new_with_additional_context`: Used for errors caused by
user input and require a valid (non-unknown) span to ensure precise
error reporting.
- `new_internal` and `new_internal_with_path`: Used for internal errors
where a span is not available. These methods require additional context
and the `Location` struct to pinpoint the source of the error in the
engine code.
- `factory`: Returns a closure that maps an `std::io::Error` to an
`IoError`. This is useful for handling multiple I/O errors that share
the same span and path, streamlining error handling in such cases.

## New Report Look
This is simulation how the I/O errors look like (the `open crates` is
simulated to show how internal errors are referenced now):
![Screenshot 2025-01-25
190426](https://github.com/user-attachments/assets/a41b6aa6-a440-497d-bbcc-3ac0121c9226)

## `Span::test_data()`
To enable better testing, `Span::test_data()` now returns a value
distinct from `Span::unknown()`. Both `Span::test_data()` and
`Span::unknown()` refer to invalid source code, but having a separate
value for test data helps identify issues during testing while keeping
spans unique.

## Cursed Sneaky Error Transfers
I removed the conversions between `std::io::Error` and `ShellError` as
they often removed important information and were used too broadly to
handle I/O errors. This also removed the problematic implementation
found here:

https://github.com/nushell/nushell/blob/7ea489551315a5ab68fd1e9e5a7ed5a0b3ef494a/crates/nu-protocol/src/errors/shell_error.rs#L1534-L1583

which hid some downcasting from I/O errors and made it hard to trace
where `ShellError` was converted into `std::io::Error`. To address this,
I introduced a new struct called `ShellErrorBridge`, which explicitly
defines this transfer behavior. With `ShellErrorBridge`, we can now
easily grep the codebase to locate and manage such conversions.

## Miscellaneous
- Removed the OS error added in #14640, as it’s no longer needed.
- Improved error messages in `glob_from` (#14679).
- Trying to open a directory with `open` caused a permissions denied
error (it's just what the OS provides). I added a `is_dir` check to
provide a better error in that case.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

- Error outputs now include more detailed information and are formatted
differently, including updated error codes.
- The structure of `ShellError` has changed, requiring plugin authors
and embedders to update their implementations.

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

I updated tests to account for the new I/O error structure and
formatting changes.

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->

This PR closes #7695 and closes #14892 and partially addresses #4323 and
#10698.

---------

Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
---
 .../nu-cli/src/commands/history/history_.rs   |  20 +-
 .../src/commands/history/history_import.rs    |  75 ++--
 .../nu-cli/src/commands/keybindings_listen.rs |  59 ++-
 crates/nu-cli/src/config_files.rs             |  32 +-
 crates/nu-cli/src/eval_file.rs                |  43 +-
 crates/nu-cli/src/repl.rs                     |  20 +-
 .../src/extra/strings/format/bits.rs          |   8 +-
 crates/nu-cmd-lang/src/core_commands/do_.rs   |  18 +-
 .../nu-cmd-plugin/src/commands/plugin/add.rs  |  13 +-
 crates/nu-cmd-plugin/src/util.rs              |  40 +-
 crates/nu-command/src/bytes/ends_with.rs      |   3 +-
 crates/nu-command/src/bytes/starts_with.rs    |   3 +-
 .../nu-command/src/conversions/into/string.rs |   2 +-
 .../nu-command/src/database/values/sqlite.rs  |  25 +-
 crates/nu-command/src/env/config/config_.rs   |  15 +-
 .../nu-command/src/env/config/config_reset.rs |  47 +-
 crates/nu-command/src/env/source_env.rs       |  11 +-
 crates/nu-command/src/filesystem/cd.rs        |  47 +-
 crates/nu-command/src/filesystem/ls.rs        |  65 ++-
 crates/nu-command/src/filesystem/mktemp.rs    |  12 +-
 crates/nu-command/src/filesystem/open.rs      |  87 ++--
 crates/nu-command/src/filesystem/rm.rs        |  21 +-
 crates/nu-command/src/filesystem/save.rs      |  62 ++-
 crates/nu-command/src/filesystem/ucp.rs       |  11 +-
 crates/nu-command/src/filesystem/umv.rs       |  11 +-
 crates/nu-command/src/filesystem/utouch.rs    |  24 +-
 crates/nu-command/src/filesystem/watch.rs     |  44 +-
 crates/nu-command/src/filters/chunks.rs       |   7 +-
 crates/nu-command/src/filters/empty.rs        |   8 +-
 crates/nu-command/src/filters/first.rs        |   8 +-
 crates/nu-command/src/filters/interleave.rs   |   7 +-
 crates/nu-command/src/filters/last.rs         |   3 +-
 crates/nu-command/src/filters/tee.rs          |  37 +-
 crates/nu-command/src/formats/from/json.rs    |   4 +-
 crates/nu-command/src/formats/to/delimited.rs |   8 +-
 crates/nu-command/src/formats/to/msgpack.rs   |   4 +-
 crates/nu-command/src/formats/to/msgpackz.rs  |   4 +-
 crates/nu-command/src/formats/to/text.rs      |   9 +-
 crates/nu-command/src/misc/source.rs          |   9 +-
 crates/nu-command/src/network/http/client.rs  |  91 +++-
 crates/nu-command/src/network/port.rs         |  34 +-
 crates/nu-command/src/path/exists.rs          |  14 +-
 crates/nu-command/src/path/self_.rs           |  32 +-
 crates/nu-command/src/path/type.rs            |   4 +-
 crates/nu-command/src/platform/clear.rs       |  23 +-
 crates/nu-command/src/platform/dir_info.rs    |  15 +-
 .../nu-command/src/platform/input/input_.rs   |  37 +-
 .../src/platform/input/input_listen.rs        |  18 +-
 crates/nu-command/src/platform/input/list.rs  |  28 +-
 .../src/platform/term/term_query.rs           |  31 +-
 crates/nu-command/src/strings/str_/join.rs    |  11 +-
 crates/nu-command/src/system/nu_check.rs      |  39 +-
 .../nu-command/src/system/registry_query.rs   |   5 +-
 crates/nu-command/src/system/run_external.rs  |  66 ++-
 crates/nu-command/src/viewers/table.rs        |   5 +-
 crates/nu-command/tests/commands/cd.rs        |   6 +-
 crates/nu-command/tests/commands/du.rs        |   2 +-
 crates/nu-command/tests/commands/ls.rs        |   6 +-
 crates/nu-command/tests/commands/move_/umv.rs |   2 +-
 .../tests/commands/network/http/delete.rs     |   8 +-
 .../tests/commands/network/http/get.rs        |   8 +-
 .../tests/commands/network/http/mod.rs        |  11 -
 .../tests/commands/network/http/options.rs    |   8 +-
 .../tests/commands/network/http/patch.rs      |   8 +-
 .../tests/commands/network/http/post.rs       |   8 +-
 .../tests/commands/network/http/put.rs        |   8 +-
 crates/nu-command/tests/commands/nu_check.rs  |   2 +-
 crates/nu-command/tests/commands/open.rs      |  15 +-
 .../nu-command/tests/commands/path/self_.rs   |   2 +-
 crates/nu-command/tests/commands/rm.rs        |  10 +-
 crates/nu-command/tests/commands/save.rs      |   2 +-
 crates/nu-engine/src/command_prelude.rs       |   4 +-
 crates/nu-engine/src/env.rs                   |  19 +-
 crates/nu-engine/src/eval_ir.rs               |  11 +-
 crates/nu-engine/src/glob_from.rs             |  21 +-
 crates/nu-explore/src/nu_common/command.rs    |  26 +-
 .../src/communication_mode/mod.rs             |  51 ++-
 crates/nu-plugin-core/src/interface/mod.rs    |  30 +-
 crates/nu-plugin-core/src/interface/tests.rs  |   7 +-
 crates/nu-plugin-core/src/serializers/json.rs |  34 +-
 .../nu-plugin-core/src/serializers/msgpack.rs |  20 +-
 .../nu-plugin-core/src/serializers/tests.rs   |  16 +-
 crates/nu-plugin-engine/src/interface/mod.rs  |   9 +-
 .../nu-plugin-engine/src/interface/tests.rs   |  10 +-
 crates/nu-plugin-engine/src/persistent.rs     |  12 +-
 .../src/spawn_fake_plugin.rs                  |  26 +-
 crates/nu-plugin/src/plugin/interface/mod.rs  |   8 +-
 .../nu-plugin/src/plugin/interface/tests.rs   |  10 +-
 crates/nu-plugin/src/plugin/mod.rs            |   2 +-
 crates/nu-protocol/src/engine/engine_state.rs |  40 +-
 .../nu-protocol/src/errors/labeled_error.rs   |  12 +-
 crates/nu-protocol/src/errors/mod.rs          |   4 +-
 .../src/errors/shell_error/bridge.rs          |  47 ++
 .../nu-protocol/src/errors/shell_error/io.rs  | 418 ++++++++++++++++++
 .../src/errors/shell_error/location.rs        |  56 +++
 .../{shell_error.rs => shell_error/mod.rs}    | 268 ++---------
 crates/nu-protocol/src/eval_const.rs          |  26 +-
 .../nu-protocol/src/pipeline/byte_stream.rs   |  80 +++-
 .../nu-protocol/src/pipeline/pipeline_data.rs |  77 +++-
 crates/nu-protocol/src/process/child.rs       |  75 ++--
 crates/nu-protocol/src/span.rs                |  33 +-
 .../src/dataframe/command/core/open.rs        |  14 +-
 .../src/dataframe/command/core/save/mod.rs    |  14 +-
 src/ide.rs                                    |  23 +-
 src/main.rs                                   |   8 +-
 105 files changed, 1944 insertions(+), 1052 deletions(-)
 create mode 100644 crates/nu-protocol/src/errors/shell_error/bridge.rs
 create mode 100644 crates/nu-protocol/src/errors/shell_error/io.rs
 create mode 100644 crates/nu-protocol/src/errors/shell_error/location.rs
 rename crates/nu-protocol/src/errors/{shell_error.rs => shell_error/mod.rs} (87%)

diff --git a/crates/nu-cli/src/commands/history/history_.rs b/crates/nu-cli/src/commands/history/history_.rs
index 40d951966e..00efd547d4 100644
--- a/crates/nu-cli/src/commands/history/history_.rs
+++ b/crates/nu-cli/src/commands/history/history_.rs
@@ -1,5 +1,5 @@
 use nu_engine::command_prelude::*;
-use nu_protocol::HistoryFileFormat;
+use nu_protocol::{shell_error::io::IoError, HistoryFileFormat};
 use reedline::{
     FileBackedHistory, History as ReedlineHistory, HistoryItem, SearchDirection, SearchQuery,
     SqliteBackedHistory,
@@ -93,10 +93,11 @@ impl Command for History {
                         )
                     })
                 })
-                .ok_or(ShellError::FileNotFound {
-                    file: history_path.display().to_string(),
-                    span: head,
-                })?
+                .ok_or(IoError::new(
+                    std::io::ErrorKind::NotFound,
+                    head,
+                    history_path,
+                ))?
                 .into_pipeline_data(head, signals)),
             HistoryFileFormat::Sqlite => Ok(history_reader
                 .and_then(|h| {
@@ -109,10 +110,11 @@ impl Command for History {
                         .enumerate()
                         .map(move |(idx, entry)| create_history_record(idx, entry, long, head))
                 })
-                .ok_or(ShellError::FileNotFound {
-                    file: history_path.display().to_string(),
-                    span: head,
-                })?
+                .ok_or(IoError::new(
+                    std::io::ErrorKind::NotFound,
+                    head,
+                    history_path,
+                ))?
                 .into_pipeline_data(head, signals)),
         }
     }
diff --git a/crates/nu-cli/src/commands/history/history_import.rs b/crates/nu-cli/src/commands/history/history_import.rs
index 7666bd7eb7..b9764306f8 100644
--- a/crates/nu-cli/src/commands/history/history_import.rs
+++ b/crates/nu-cli/src/commands/history/history_import.rs
@@ -1,7 +1,10 @@
 use std::path::{Path, PathBuf};
 
 use nu_engine::command_prelude::*;
-use nu_protocol::HistoryFileFormat;
+use nu_protocol::{
+    shell_error::{self, io::IoError},
+    HistoryFileFormat,
+};
 
 use reedline::{
     FileBackedHistory, History, HistoryItem, ReedlineError, SearchQuery, SqliteBackedHistory,
@@ -69,17 +72,16 @@ Note that history item IDs are ignored when importing from file."#
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
+        let span = call.head;
         let ok = Ok(Value::nothing(call.head).into_pipeline_data());
 
         let Some(history) = engine_state.history_config() else {
             return ok;
         };
         let Some(current_history_path) = history.file_path() else {
-            return Err(ShellError::ConfigDirNotFound {
-                span: Some(call.head),
-            });
+            return Err(ShellError::ConfigDirNotFound { span: span.into() });
         };
-        if let Some(bak_path) = backup(&current_history_path)? {
+        if let Some(bak_path) = backup(&current_history_path, span)? {
             println!("Backed history to {}", bak_path.display());
         }
         match input {
@@ -216,7 +218,7 @@ fn item_from_record(mut rec: Record, span: Span) -> Result<HistoryItem, ShellErr
         hostname: get(rec, fields::HOSTNAME, |v| Ok(v.as_str()?.to_owned()))?,
         cwd: get(rec, fields::CWD, |v| Ok(v.as_str()?.to_owned()))?,
         exit_status: get(rec, fields::EXIT_STATUS, |v| v.as_int())?,
-        duration: get(rec, fields::DURATION, duration_from_value)?,
+        duration: get(rec, fields::DURATION, |v| duration_from_value(v, span))?,
         more_info: None,
         // TODO: Currently reedline doesn't let you create session IDs.
         session_id: None,
@@ -232,19 +234,21 @@ fn item_from_record(mut rec: Record, span: Span) -> Result<HistoryItem, ShellErr
     Ok(item)
 }
 
-fn duration_from_value(v: Value) -> Result<std::time::Duration, ShellError> {
+fn duration_from_value(v: Value, span: Span) -> Result<std::time::Duration, ShellError> {
     chrono::Duration::nanoseconds(v.as_duration()?)
         .to_std()
-        .map_err(|_| ShellError::IOError {
-            msg: "negative duration not supported".to_string(),
-        })
+        .map_err(|_| ShellError::NeedsPositiveValue { span })
 }
 
-fn find_backup_path(path: &Path) -> Result<PathBuf, ShellError> {
+fn find_backup_path(path: &Path, span: Span) -> Result<PathBuf, ShellError> {
     let Ok(mut bak_path) = path.to_path_buf().into_os_string().into_string() else {
         // This isn't fundamentally problem, but trying to work with OsString is a nightmare.
-        return Err(ShellError::IOError {
-            msg: "History path mush be representable as UTF-8".to_string(),
+        return Err(ShellError::GenericError {
+            error: "History path not UTF-8".to_string(),
+            msg: "History path must be representable as UTF-8".to_string(),
+            span: Some(span),
+            help: None,
+            inner: vec![],
         });
     };
     bak_path.push_str(".bak");
@@ -260,24 +264,45 @@ fn find_backup_path(path: &Path) -> Result<PathBuf, ShellError> {
             return Ok(PathBuf::from(bak_path));
         }
     }
-    Err(ShellError::IOError {
-        msg: "Too many existing backup files".to_string(),
+    Err(ShellError::GenericError {
+        error: "Too many backup files".to_string(),
+        msg: "Found too many existing backup files".to_string(),
+        span: Some(span),
+        help: None,
+        inner: vec![],
     })
 }
 
-fn backup(path: &Path) -> Result<Option<PathBuf>, ShellError> {
+fn backup(path: &Path, span: Span) -> Result<Option<PathBuf>, ShellError> {
     match path.metadata() {
         Ok(md) if md.is_file() => (),
         Ok(_) => {
-            return Err(ShellError::IOError {
-                msg: "history path exists but is not a file".to_string(),
-            })
+            return Err(IoError::new_with_additional_context(
+                shell_error::io::ErrorKind::NotAFile,
+                span,
+                PathBuf::from(path),
+                "history path exists but is not a file",
+            )
+            .into())
         }
         Err(e) if e.kind() == std::io::ErrorKind::NotFound => return Ok(None),
-        Err(e) => return Err(e.into()),
+        Err(e) => {
+            return Err(IoError::new_internal(
+                e.kind(),
+                "Could not get metadata",
+                nu_protocol::location!(),
+            )
+            .into())
+        }
     }
-    let bak_path = find_backup_path(path)?;
-    std::fs::copy(path, &bak_path)?;
+    let bak_path = find_backup_path(path, span)?;
+    std::fs::copy(path, &bak_path).map_err(|err| {
+        IoError::new_internal(
+            err.kind(),
+            "Could not copy backup",
+            nu_protocol::location!(),
+        )
+    })?;
     Ok(Some(bak_path))
 }
 
@@ -388,7 +413,7 @@ mod tests {
         for name in existing {
             std::fs::File::create_new(dir.path().join(name)).unwrap();
         }
-        let got = find_backup_path(&dir.path().join("history.dat")).unwrap();
+        let got = find_backup_path(&dir.path().join("history.dat"), Span::test_data()).unwrap();
         assert_eq!(got, dir.path().join(want))
     }
 
@@ -400,7 +425,7 @@ mod tests {
         write!(&mut history, "123").unwrap();
         let want_bak_path = dir.path().join("history.dat.bak");
         assert_eq!(
-            backup(&dir.path().join("history.dat")),
+            backup(&dir.path().join("history.dat"), Span::test_data()),
             Ok(Some(want_bak_path.clone()))
         );
         let got_data = String::from_utf8(std::fs::read(want_bak_path).unwrap()).unwrap();
@@ -410,7 +435,7 @@ mod tests {
     #[test]
     fn test_backup_no_file() {
         let dir = tempfile::tempdir().unwrap();
-        let bak_path = backup(&dir.path().join("history.dat")).unwrap();
+        let bak_path = backup(&dir.path().join("history.dat"), Span::test_data()).unwrap();
         assert!(bak_path.is_none());
     }
 }
diff --git a/crates/nu-cli/src/commands/keybindings_listen.rs b/crates/nu-cli/src/commands/keybindings_listen.rs
index 40cda5652d..ec7b33f296 100644
--- a/crates/nu-cli/src/commands/keybindings_listen.rs
+++ b/crates/nu-cli/src/commands/keybindings_listen.rs
@@ -2,6 +2,7 @@ use crossterm::{
     event::Event, event::KeyCode, event::KeyEvent, execute, terminal, QueueableCommand,
 };
 use nu_engine::command_prelude::*;
+use nu_protocol::shell_error::io::IoError;
 use std::io::{stdout, Write};
 
 #[derive(Clone)]
@@ -39,7 +40,13 @@ impl Command for KeybindingsListen {
         match print_events(engine_state) {
             Ok(v) => Ok(v.into_pipeline_data()),
             Err(e) => {
-                terminal::disable_raw_mode()?;
+                terminal::disable_raw_mode().map_err(|err| {
+                    IoError::new_internal(
+                        err.kind(),
+                        "Could not disable raw mode",
+                        nu_protocol::location!(),
+                    )
+                })?;
                 Err(ShellError::GenericError {
                     error: "Error with input".into(),
                     msg: "".into(),
@@ -63,8 +70,20 @@ impl Command for KeybindingsListen {
 pub fn print_events(engine_state: &EngineState) -> Result<Value, ShellError> {
     let config = engine_state.get_config();
 
-    stdout().flush()?;
-    terminal::enable_raw_mode()?;
+    stdout().flush().map_err(|err| {
+        IoError::new_internal(
+            err.kind(),
+            "Could not flush stdout",
+            nu_protocol::location!(),
+        )
+    })?;
+    terminal::enable_raw_mode().map_err(|err| {
+        IoError::new_internal(
+            err.kind(),
+            "Could not enable raw mode",
+            nu_protocol::location!(),
+        )
+    })?;
 
     if config.use_kitty_protocol {
         if let Ok(false) = crossterm::terminal::supports_keyboard_enhancement() {
@@ -94,7 +113,9 @@ pub fn print_events(engine_state: &EngineState) -> Result<Value, ShellError> {
     let mut stdout = std::io::BufWriter::new(std::io::stderr());
 
     loop {
-        let event = crossterm::event::read()?;
+        let event = crossterm::event::read().map_err(|err| {
+            IoError::new_internal(err.kind(), "Could not read event", nu_protocol::location!())
+        })?;
         if event == Event::Key(KeyCode::Esc.into()) {
             break;
         }
@@ -113,9 +134,25 @@ pub fn print_events(engine_state: &EngineState) -> Result<Value, ShellError> {
 
             _ => "".to_string(),
         };
-        stdout.queue(crossterm::style::Print(o))?;
-        stdout.queue(crossterm::style::Print("\r\n"))?;
-        stdout.flush()?;
+        stdout.queue(crossterm::style::Print(o)).map_err(|err| {
+            IoError::new_internal(
+                err.kind(),
+                "Could not print output record",
+                nu_protocol::location!(),
+            )
+        })?;
+        stdout
+            .queue(crossterm::style::Print("\r\n"))
+            .map_err(|err| {
+                IoError::new_internal(
+                    err.kind(),
+                    "Could not print linebreak",
+                    nu_protocol::location!(),
+                )
+            })?;
+        stdout.flush().map_err(|err| {
+            IoError::new_internal(err.kind(), "Could not flush", nu_protocol::location!())
+        })?;
     }
 
     if config.use_kitty_protocol {
@@ -125,7 +162,13 @@ pub fn print_events(engine_state: &EngineState) -> Result<Value, ShellError> {
         );
     }
 
-    terminal::disable_raw_mode()?;
+    terminal::disable_raw_mode().map_err(|err| {
+        IoError::new_internal(
+            err.kind(),
+            "Could not disable raw mode",
+            nu_protocol::location!(),
+        )
+    })?;
 
     Ok(Value::nothing(Span::unknown()))
 }
diff --git a/crates/nu-cli/src/config_files.rs b/crates/nu-cli/src/config_files.rs
index 28332fe998..bb54a860d6 100644
--- a/crates/nu-cli/src/config_files.rs
+++ b/crates/nu-cli/src/config_files.rs
@@ -18,7 +18,7 @@ const OLD_PLUGIN_FILE: &str = "plugin.nu";
 
 #[cfg(feature = "plugin")]
 pub fn read_plugin_file(engine_state: &mut EngineState, plugin_file: Option<Spanned<String>>) {
-    use nu_protocol::ShellError;
+    use nu_protocol::{shell_error::io::IoError, ShellError};
     use std::path::Path;
 
     let span = plugin_file.as_ref().map(|s| s.span);
@@ -78,16 +78,12 @@ pub fn read_plugin_file(engine_state: &mut EngineState, plugin_file: Option<Span
                 } else {
                     report_shell_error(
                         engine_state,
-                        &ShellError::GenericError {
-                            error: format!(
-                                "Error while opening plugin registry file: {}",
-                                plugin_path.display()
-                            ),
-                            msg: "plugin path defined here".into(),
-                            span,
-                            help: None,
-                            inner: vec![err.into()],
-                        },
+                        &ShellError::Io(IoError::new_internal_with_path(
+                            err.kind(),
+                            "Could not open plugin registry file",
+                            nu_protocol::location!(),
+                            plugin_path,
+                        )),
                     );
                     return;
                 }
@@ -234,8 +230,8 @@ pub fn eval_config_contents(
 #[cfg(feature = "plugin")]
 pub fn migrate_old_plugin_file(engine_state: &EngineState) -> bool {
     use nu_protocol::{
-        PluginExample, PluginIdentity, PluginRegistryItem, PluginRegistryItemData, PluginSignature,
-        ShellError,
+        shell_error::io::IoError, PluginExample, PluginIdentity, PluginRegistryItem,
+        PluginRegistryItemData, PluginSignature, ShellError,
     };
     use std::collections::BTreeMap;
 
@@ -324,7 +320,15 @@ pub fn migrate_old_plugin_file(engine_state: &EngineState) -> bool {
     // Write the new file
     let new_plugin_file_path = config_dir.join(PLUGIN_FILE);
     if let Err(err) = std::fs::File::create(&new_plugin_file_path)
-        .map_err(|e| e.into())
+        .map_err(|err| {
+            IoError::new_internal_with_path(
+                err.kind(),
+                "Could not create new plugin file",
+                nu_protocol::location!(),
+                new_plugin_file_path.clone(),
+            )
+        })
+        .map_err(ShellError::from)
         .and_then(|file| contents.write_to(file, None))
     {
         report_shell_error(
diff --git a/crates/nu-cli/src/eval_file.rs b/crates/nu-cli/src/eval_file.rs
index aa4dbfca78..8b252bf17e 100644
--- a/crates/nu-cli/src/eval_file.rs
+++ b/crates/nu-cli/src/eval_file.rs
@@ -7,9 +7,11 @@ use nu_protocol::{
     cli_error::report_compile_error,
     debugger::WithoutDebug,
     engine::{EngineState, Stack, StateWorkingSet},
-    report_parse_error, report_parse_warning, PipelineData, ShellError, Span, Value,
+    report_parse_error, report_parse_warning,
+    shell_error::io::IoError,
+    PipelineData, ShellError, Span, Value,
 };
-use std::sync::Arc;
+use std::{path::PathBuf, sync::Arc};
 
 /// Entry point for evaluating a file.
 ///
@@ -24,11 +26,14 @@ pub fn evaluate_file(
 ) -> Result<(), ShellError> {
     let cwd = engine_state.cwd_as_string(Some(stack))?;
 
-    let file_path =
-        canonicalize_with(&path, cwd).map_err(|err| ShellError::FileNotFoundCustom {
-            msg: format!("Could not access file '{path}': {err}"),
-            span: Span::unknown(),
-        })?;
+    let file_path = canonicalize_with(&path, cwd).map_err(|err| {
+        IoError::new_with_additional_context(
+            err.kind(),
+            Span::unknown(),
+            PathBuf::from(&path),
+            "Could not access file",
+        )
+    })?;
 
     let file_path_str = file_path
         .to_str()
@@ -40,18 +45,24 @@ pub fn evaluate_file(
             span: Span::unknown(),
         })?;
 
-    let file = std::fs::read(&file_path).map_err(|err| ShellError::FileNotFoundCustom {
-        msg: format!("Could not read file '{file_path_str}': {err}"),
-        span: Span::unknown(),
+    let file = std::fs::read(&file_path).map_err(|err| {
+        IoError::new_with_additional_context(
+            err.kind(),
+            Span::unknown(),
+            file_path.clone(),
+            "Could not read file",
+        )
     })?;
     engine_state.file = Some(file_path.clone());
 
-    let parent = file_path
-        .parent()
-        .ok_or_else(|| ShellError::FileNotFoundCustom {
-            msg: format!("The file path '{file_path_str}' does not have a parent"),
-            span: Span::unknown(),
-        })?;
+    let parent = file_path.parent().ok_or_else(|| {
+        IoError::new_with_additional_context(
+            std::io::ErrorKind::NotFound,
+            Span::unknown(),
+            file_path.clone(),
+            "The file path does not have a parent",
+        )
+    })?;
 
     stack.add_env_var(
         "FILE_PWD".to_string(),
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index b8fef7355d..72da95d449 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -21,6 +21,7 @@ use nu_color_config::StyleComputer;
 #[allow(deprecated)]
 use nu_engine::env_to_strings;
 use nu_parser::{lex, parse, trim_quotes_str};
+use nu_protocol::shell_error::io::IoError;
 use nu_protocol::{
     config::NuCursorShape,
     engine::{EngineState, Stack, StateWorkingSet},
@@ -846,21 +847,26 @@ fn do_auto_cd(
         if !path.exists() {
             report_shell_error(
                 engine_state,
-                &ShellError::DirectoryNotFound {
-                    dir: path.to_string_lossy().to_string(),
+                &ShellError::Io(IoError::new_with_additional_context(
+                    std::io::ErrorKind::NotFound,
                     span,
-                },
+                    PathBuf::from(&path),
+                    "Cannot change directory",
+                )),
             );
         }
         path.to_string_lossy().to_string()
     };
 
-    if let PermissionResult::PermissionDenied(reason) = have_permission(path.clone()) {
+    if let PermissionResult::PermissionDenied(_) = have_permission(path.clone()) {
         report_shell_error(
             engine_state,
-            &ShellError::IOError {
-                msg: format!("Cannot change directory to {path}: {reason}"),
-            },
+            &ShellError::Io(IoError::new_with_additional_context(
+                std::io::ErrorKind::PermissionDenied,
+                span,
+                PathBuf::from(path),
+                "Cannot change directory",
+            )),
         );
         return;
     }
diff --git a/crates/nu-cmd-extra/src/extra/strings/format/bits.rs b/crates/nu-cmd-extra/src/extra/strings/format/bits.rs
index 693c6905e8..b34d429c6c 100644
--- a/crates/nu-cmd-extra/src/extra/strings/format/bits.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/format/bits.rs
@@ -3,7 +3,7 @@ use std::io::{self, Read, Write};
 use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
 
-use nu_protocol::Signals;
+use nu_protocol::{shell_error::io::IoError, Signals};
 use num_traits::ToPrimitive;
 
 struct Arguments {
@@ -142,7 +142,11 @@ fn byte_stream_to_bits(stream: ByteStream, head: Span) -> ByteStream {
             ByteStreamType::String,
             move |buffer| {
                 let mut byte = [0];
-                if reader.read(&mut byte[..]).err_span(head)? > 0 {
+                if reader
+                    .read(&mut byte[..])
+                    .map_err(|err| IoError::new(err.kind(), head, None))?
+                    > 0
+                {
                     // Format the byte as bits
                     if is_first {
                         is_first = false;
diff --git a/crates/nu-cmd-lang/src/core_commands/do_.rs b/crates/nu-cmd-lang/src/core_commands/do_.rs
index 62ddea5324..fe788983da 100644
--- a/crates/nu-cmd-lang/src/core_commands/do_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/do_.rs
@@ -1,7 +1,9 @@
 use nu_engine::{command_prelude::*, get_eval_block_with_early_return, redirect_env};
 #[cfg(feature = "os")]
 use nu_protocol::process::{ChildPipe, ChildProcess};
-use nu_protocol::{engine::Closure, ByteStream, ByteStreamSource, OutDest};
+use nu_protocol::{
+    engine::Closure, shell_error::io::IoError, ByteStream, ByteStreamSource, OutDest,
+};
 
 use std::{
     io::{Cursor, Read},
@@ -143,10 +145,16 @@ impl Command for Do {
                                     .name("stdout consumer".to_string())
                                     .spawn(move || {
                                         let mut buf = Vec::new();
-                                        stdout.read_to_end(&mut buf)?;
+                                        stdout.read_to_end(&mut buf).map_err(|err| {
+                                            IoError::new_internal(
+                                                err.kind(),
+                                                "Could not read stdout to end",
+                                                nu_protocol::location!(),
+                                            )
+                                        })?;
                                         Ok::<_, ShellError>(buf)
                                     })
-                                    .err_span(head)
+                                    .map_err(|err| IoError::new(err.kind(), head, None))
                             })
                             .transpose()?;
 
@@ -156,7 +164,9 @@ impl Command for Do {
                             None => String::new(),
                             Some(mut stderr) => {
                                 let mut buf = String::new();
-                                stderr.read_to_string(&mut buf).err_span(span)?;
+                                stderr
+                                    .read_to_string(&mut buf)
+                                    .map_err(|err| IoError::new(err.kind(), span, None))?;
                                 buf
                             }
                         };
diff --git a/crates/nu-cmd-plugin/src/commands/plugin/add.rs b/crates/nu-cmd-plugin/src/commands/plugin/add.rs
index c603ddbb8c..301b88fdff 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/add.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/add.rs
@@ -1,8 +1,10 @@
 use crate::util::{get_plugin_dirs, modify_plugin_file};
 use nu_engine::command_prelude::*;
 use nu_plugin_engine::{GetPlugin, PersistentPlugin};
-use nu_protocol::{PluginGcConfig, PluginIdentity, PluginRegistryItem, RegisteredPlugin};
-use std::sync::Arc;
+use nu_protocol::{
+    shell_error::io::IoError, PluginGcConfig, PluginIdentity, PluginRegistryItem, RegisteredPlugin,
+};
+use std::{path::PathBuf, sync::Arc};
 
 #[derive(Clone)]
 pub struct PluginAdd;
@@ -86,11 +88,14 @@ apparent the next time `nu` is next launched with that plugin registry file.
         let filename_expanded = nu_path::locate_in_dirs(&filename.item, &cwd, || {
             get_plugin_dirs(engine_state, stack)
         })
-        .err_span(filename.span)?;
+        .map_err(|err| IoError::new(err.kind(), filename.span, PathBuf::from(filename.item)))?;
 
         let shell_expanded = shell
             .as_ref()
-            .map(|s| nu_path::canonicalize_with(&s.item, &cwd).err_span(s.span))
+            .map(|s| {
+                nu_path::canonicalize_with(&s.item, &cwd)
+                    .map_err(|err| IoError::new(err.kind(), s.span, None))
+            })
             .transpose()?;
 
         // Parse the plugin filename so it can be used to spawn the plugin
diff --git a/crates/nu-cmd-plugin/src/util.rs b/crates/nu-cmd-plugin/src/util.rs
index 57de225ace..053900ef19 100644
--- a/crates/nu-cmd-plugin/src/util.rs
+++ b/crates/nu-cmd-plugin/src/util.rs
@@ -1,6 +1,6 @@
 #[allow(deprecated)]
 use nu_engine::{command_prelude::*, current_dir};
-use nu_protocol::{engine::StateWorkingSet, PluginRegistryFile};
+use nu_protocol::{engine::StateWorkingSet, shell_error::io::IoError, PluginRegistryFile};
 use std::{
     fs::{self, File},
     path::PathBuf,
@@ -45,21 +45,16 @@ pub(crate) fn read_plugin_file(
     // Try to read the plugin file if it exists
     if fs::metadata(&plugin_registry_file_path).is_ok_and(|m| m.len() > 0) {
         PluginRegistryFile::read_from(
-            File::open(&plugin_registry_file_path).map_err(|err| ShellError::IOErrorSpanned {
-                msg: format!(
-                    "failed to read `{}`: {}",
-                    plugin_registry_file_path.display(),
-                    err
-                ),
-                span: file_span,
-            })?,
+            File::open(&plugin_registry_file_path)
+                .map_err(|err| IoError::new(err.kind(), file_span, plugin_registry_file_path))?,
             Some(file_span),
         )
     } else if let Some(path) = custom_path {
-        Err(ShellError::FileNotFound {
-            file: path.item.clone(),
-            span: path.span,
-        })
+        Err(ShellError::Io(IoError::new(
+            std::io::ErrorKind::NotFound,
+            path.span,
+            PathBuf::from(&path.item),
+        )))
     } else {
         Ok(PluginRegistryFile::default())
     }
@@ -80,13 +75,8 @@ pub(crate) fn modify_plugin_file(
     // Try to read the plugin file if it exists
     let mut contents = if fs::metadata(&plugin_registry_file_path).is_ok_and(|m| m.len() > 0) {
         PluginRegistryFile::read_from(
-            File::open(&plugin_registry_file_path).map_err(|err| ShellError::IOErrorSpanned {
-                msg: format!(
-                    "failed to read `{}`: {}",
-                    plugin_registry_file_path.display(),
-                    err
-                ),
-                span: file_span,
+            File::open(&plugin_registry_file_path).map_err(|err| {
+                IoError::new(err.kind(), file_span, plugin_registry_file_path.clone())
             })?,
             Some(file_span),
         )?
@@ -99,14 +89,8 @@ pub(crate) fn modify_plugin_file(
 
     // Save the modified file on success
     contents.write_to(
-        File::create(&plugin_registry_file_path).map_err(|err| ShellError::IOErrorSpanned {
-            msg: format!(
-                "failed to create `{}`: {}",
-                plugin_registry_file_path.display(),
-                err
-            ),
-            span: file_span,
-        })?,
+        File::create(&plugin_registry_file_path)
+            .map_err(|err| IoError::new(err.kind(), file_span, plugin_registry_file_path))?,
         Some(span),
     )?;
 
diff --git a/crates/nu-command/src/bytes/ends_with.rs b/crates/nu-command/src/bytes/ends_with.rs
index 774b45aefc..23167a7901 100644
--- a/crates/nu-command/src/bytes/ends_with.rs
+++ b/crates/nu-command/src/bytes/ends_with.rs
@@ -1,5 +1,6 @@
 use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
+use nu_protocol::shell_error::io::IoError;
 use std::{
     collections::VecDeque,
     io::{self, BufRead},
@@ -76,7 +77,7 @@ impl Command for BytesEndsWith {
                     Ok(&[]) => break,
                     Ok(buf) => buf,
                     Err(e) if e.kind() == io::ErrorKind::Interrupted => continue,
-                    Err(e) => return Err(e.into_spanned(span).into()),
+                    Err(e) => return Err(IoError::new(e.kind(), span, None).into()),
                 };
                 let len = buf.len();
                 if len >= cap {
diff --git a/crates/nu-command/src/bytes/starts_with.rs b/crates/nu-command/src/bytes/starts_with.rs
index 39db1a80ce..9681b4ccbe 100644
--- a/crates/nu-command/src/bytes/starts_with.rs
+++ b/crates/nu-command/src/bytes/starts_with.rs
@@ -1,5 +1,6 @@
 use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
+use nu_protocol::shell_error::io::IoError;
 use std::io::Read;
 
 struct Arguments {
@@ -71,7 +72,7 @@ impl Command for BytesStartsWith {
             reader
                 .take(pattern.len() as u64)
                 .read_to_end(&mut start)
-                .err_span(span)?;
+                .map_err(|err| IoError::new(err.kind(), span, None))?;
 
             Ok(Value::bool(start == pattern, head).into_pipeline_data())
         } else {
diff --git a/crates/nu-command/src/conversions/into/string.rs b/crates/nu-command/src/conversions/into/string.rs
index 460f6d973d..261afe1dd7 100644
--- a/crates/nu-command/src/conversions/into/string.rs
+++ b/crates/nu-command/src/conversions/into/string.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
-use nu_protocol::{into_code, Config};
+use nu_protocol::{shell_error::into_code, Config};
 use nu_utils::get_system_locale;
 use num_format::ToFormattedString;
 
diff --git a/crates/nu-command/src/database/values/sqlite.rs b/crates/nu-command/src/database/values/sqlite.rs
index 620ac95324..8959cf5998 100644
--- a/crates/nu-command/src/database/values/sqlite.rs
+++ b/crates/nu-command/src/database/values/sqlite.rs
@@ -2,7 +2,10 @@ use super::definitions::{
     db_column::DbColumn, db_constraint::DbConstraint, db_foreignkey::DbForeignKey,
     db_index::DbIndex, db_table::DbTable,
 };
-use nu_protocol::{CustomValue, PipelineData, Record, ShellError, Signals, Span, Spanned, Value};
+use nu_protocol::{
+    shell_error::io::IoError, CustomValue, PipelineData, Record, ShellError, Signals, Span,
+    Spanned, Value,
+};
 use rusqlite::{
     types::ValueRef, Connection, DatabaseName, Error as SqliteError, OpenFlags, Row, Statement,
     ToSql,
@@ -38,24 +41,22 @@ impl SQLiteDatabase {
     }
 
     pub fn try_from_path(path: &Path, span: Span, signals: Signals) -> Result<Self, ShellError> {
-        let mut file = File::open(path).map_err(|e| ShellError::ReadingFile {
-            msg: e.to_string(),
-            span,
-        })?;
+        let mut file =
+            File::open(path).map_err(|e| IoError::new(e.kind(), span, PathBuf::from(path)))?;
 
         let mut buf: [u8; 16] = [0; 16];
         file.read_exact(&mut buf)
-            .map_err(|e| ShellError::ReadingFile {
-                msg: e.to_string(),
-                span,
-            })
+            .map_err(|e| ShellError::Io(IoError::new(e.kind(), span, PathBuf::from(path))))
             .and_then(|_| {
                 if buf == SQLITE_MAGIC_BYTES {
                     Ok(SQLiteDatabase::new(path, signals))
                 } else {
-                    Err(ShellError::ReadingFile {
-                        msg: "Not a SQLite file".into(),
-                        span,
+                    Err(ShellError::GenericError {
+                        error: "Not a SQLite file".into(),
+                        msg: format!("Could not read '{}' as SQLite file", path.display()),
+                        span: Some(span),
+                        help: None,
+                        inner: vec![],
                     })
                 }
             })
diff --git a/crates/nu-command/src/env/config/config_.rs b/crates/nu-command/src/env/config/config_.rs
index 71afd57c5a..f60b4be290 100644
--- a/crates/nu-command/src/env/config/config_.rs
+++ b/crates/nu-command/src/env/config/config_.rs
@@ -60,6 +60,8 @@ pub(super) fn start_editor(
     call: &Call,
 ) -> Result<PipelineData, ShellError> {
     // Find the editor executable.
+
+    use nu_protocol::shell_error::io::IoError;
     let (editor_name, editor_args) = get_editor(engine_state, stack, call.head)?;
     let paths = nu_engine::env::path_str(engine_state, stack, call.head)?;
     let cwd = engine_state.cwd(Some(stack))?;
@@ -99,13 +101,22 @@ pub(super) fn start_editor(
     // Spawn the child process. On Unix, also put the child process to
     // foreground if we're in an interactive session.
     #[cfg(windows)]
-    let child = ForegroundChild::spawn(command)?;
+    let child = ForegroundChild::spawn(command);
     #[cfg(unix)]
     let child = ForegroundChild::spawn(
         command,
         engine_state.is_interactive,
         &engine_state.pipeline_externals_state,
-    )?;
+    );
+
+    let child = child.map_err(|err| {
+        IoError::new_with_additional_context(
+            err.kind(),
+            call.head,
+            None,
+            "Could not spawn foreground child",
+        )
+    })?;
 
     // Wrap the output into a `PipelineData::ByteStream`.
     let child = nu_protocol::process::ChildProcess::new(child, None, false, call.head)?;
diff --git a/crates/nu-command/src/env/config/config_reset.rs b/crates/nu-command/src/env/config/config_reset.rs
index 03c022c3d7..5215ac6a1d 100644
--- a/crates/nu-command/src/env/config/config_reset.rs
+++ b/crates/nu-command/src/env/config/config_reset.rs
@@ -1,8 +1,9 @@
 use chrono::Local;
 use nu_engine::command_prelude::*;
 
+use nu_protocol::shell_error::io::IoError;
 use nu_utils::{get_scaffold_config, get_scaffold_env};
-use std::io::Write;
+use std::{io::Write, path::PathBuf};
 
 #[derive(Clone)]
 pub struct ConfigReset;
@@ -58,19 +59,23 @@ impl Command for ConfigReset {
                     "oldconfig-{}.nu",
                     Local::now().format("%F-%H-%M-%S"),
                 ));
-                if std::fs::rename(nu_config.clone(), backup_path).is_err() {
-                    return Err(ShellError::FileNotFoundCustom {
-                        msg: "config.nu could not be backed up".into(),
+                if let Err(err) = std::fs::rename(nu_config.clone(), &backup_path) {
+                    return Err(ShellError::Io(IoError::new_with_additional_context(
+                        err.kind(),
                         span,
-                    });
+                        PathBuf::from(backup_path),
+                        "config.nu could not be backed up",
+                    )));
                 }
             }
-            if let Ok(mut file) = std::fs::File::create(nu_config) {
-                if writeln!(&mut file, "{config_file}").is_err() {
-                    return Err(ShellError::FileNotFoundCustom {
-                        msg: "config.nu could not be written to".into(),
+            if let Ok(mut file) = std::fs::File::create(&nu_config) {
+                if let Err(err) = writeln!(&mut file, "{config_file}") {
+                    return Err(ShellError::Io(IoError::new_with_additional_context(
+                        err.kind(),
                         span,
-                    });
+                        PathBuf::from(nu_config),
+                        "config.nu could not be written to",
+                    )));
                 }
             }
         }
@@ -81,19 +86,23 @@ impl Command for ConfigReset {
             if !no_backup {
                 let mut backup_path = config_path.clone();
                 backup_path.push(format!("oldenv-{}.nu", Local::now().format("%F-%H-%M-%S"),));
-                if std::fs::rename(env_config.clone(), backup_path).is_err() {
-                    return Err(ShellError::FileNotFoundCustom {
-                        msg: "env.nu could not be backed up".into(),
+                if let Err(err) = std::fs::rename(env_config.clone(), &backup_path) {
+                    return Err(ShellError::Io(IoError::new_with_additional_context(
+                        err.kind(),
                         span,
-                    });
+                        PathBuf::from(backup_path),
+                        "env.nu could not be backed up",
+                    )));
                 }
             }
-            if let Ok(mut file) = std::fs::File::create(env_config) {
-                if writeln!(&mut file, "{config_file}").is_err() {
-                    return Err(ShellError::FileNotFoundCustom {
-                        msg: "env.nu could not be written to".into(),
+            if let Ok(mut file) = std::fs::File::create(&env_config) {
+                if let Err(err) = writeln!(&mut file, "{config_file}") {
+                    return Err(ShellError::Io(IoError::new_with_additional_context(
+                        err.kind(),
                         span,
-                    });
+                        PathBuf::from(env_config),
+                        "env.nu could not be written to",
+                    )));
                 }
             }
         }
diff --git a/crates/nu-command/src/env/source_env.rs b/crates/nu-command/src/env/source_env.rs
index 342c31aed4..a16bbe557f 100644
--- a/crates/nu-command/src/env/source_env.rs
+++ b/crates/nu-command/src/env/source_env.rs
@@ -2,7 +2,7 @@ use nu_engine::{
     command_prelude::*, find_in_dirs_env, get_dirs_var_from_call, get_eval_block_with_early_return,
     redirect_env,
 };
-use nu_protocol::{engine::CommandType, BlockId};
+use nu_protocol::{engine::CommandType, shell_error::io::IoError, BlockId};
 use std::path::PathBuf;
 
 /// Source a file for environment variables.
@@ -65,10 +65,11 @@ impl Command for SourceEnv {
         )? {
             PathBuf::from(&path)
         } else {
-            return Err(ShellError::FileNotFound {
-                file: source_filename.item,
-                span: source_filename.span,
-            });
+            return Err(ShellError::Io(IoError::new(
+                std::io::ErrorKind::NotFound,
+                source_filename.span,
+                PathBuf::from(source_filename.item),
+            )));
         };
 
         if let Some(parent) = file_path.parent() {
diff --git a/crates/nu-command/src/filesystem/cd.rs b/crates/nu-command/src/filesystem/cd.rs
index 2af932bcb4..3ba438746d 100644
--- a/crates/nu-command/src/filesystem/cd.rs
+++ b/crates/nu-command/src/filesystem/cd.rs
@@ -1,4 +1,7 @@
+use std::path::PathBuf;
+
 use nu_engine::command_prelude::*;
+use nu_protocol::shell_error::{self, io::IoError};
 use nu_utils::filesystem::{have_permission, PermissionResult};
 
 #[derive(Clone)]
@@ -77,25 +80,39 @@ impl Command for Cd {
                     if physical {
                         if let Ok(path) = nu_path::canonicalize_with(path_no_whitespace, &cwd) {
                             if !path.is_dir() {
-                                return Err(ShellError::NotADirectory { span: v.span });
+                                return Err(shell_error::io::IoError::new(
+                                    shell_error::io::ErrorKind::NotADirectory,
+                                    v.span,
+                                    None,
+                                )
+                                .into());
                             };
                             path
                         } else {
-                            return Err(ShellError::DirectoryNotFound {
-                                dir: path_no_whitespace.to_string(),
-                                span: v.span,
-                            });
+                            return Err(shell_error::io::IoError::new(
+                                std::io::ErrorKind::NotFound,
+                                v.span,
+                                PathBuf::from(path_no_whitespace),
+                            )
+                            .into());
                         }
                     } else {
                         let path = nu_path::expand_path_with(path_no_whitespace, &cwd, true);
                         if !path.exists() {
-                            return Err(ShellError::DirectoryNotFound {
-                                dir: path_no_whitespace.to_string(),
-                                span: v.span,
-                            });
+                            return Err(shell_error::io::IoError::new(
+                                std::io::ErrorKind::NotFound,
+                                v.span,
+                                PathBuf::from(path_no_whitespace),
+                            )
+                            .into());
                         };
                         if !path.is_dir() {
-                            return Err(ShellError::NotADirectory { span: v.span });
+                            return Err(shell_error::io::IoError::new(
+                                shell_error::io::ErrorKind::NotADirectory,
+                                v.span,
+                                path,
+                            )
+                            .into());
                         };
                         path
                     }
@@ -117,13 +134,9 @@ impl Command for Cd {
                 stack.set_cwd(path)?;
                 Ok(PipelineData::empty())
             }
-            PermissionResult::PermissionDenied(reason) => Err(ShellError::IOError {
-                msg: format!(
-                    "Cannot change directory to {}: {}",
-                    path.to_string_lossy(),
-                    reason
-                ),
-            }),
+            PermissionResult::PermissionDenied(_) => {
+                Err(IoError::new(std::io::ErrorKind::PermissionDenied, call.head, path).into())
+            }
         }
     }
 
diff --git a/crates/nu-command/src/filesystem/ls.rs b/crates/nu-command/src/filesystem/ls.rs
index 68f35c5294..19418b1a70 100644
--- a/crates/nu-command/src/filesystem/ls.rs
+++ b/crates/nu-command/src/filesystem/ls.rs
@@ -5,7 +5,7 @@ use nu_engine::glob_from;
 use nu_engine::{command_prelude::*, env::current_dir};
 use nu_glob::MatchOptions;
 use nu_path::{expand_path_with, expand_to_real_path};
-use nu_protocol::{DataSource, NuGlob, PipelineMetadata, Signals};
+use nu_protocol::{shell_error::io::IoError, DataSource, NuGlob, PipelineMetadata, Signals};
 use pathdiff::diff_paths;
 use rayon::prelude::*;
 #[cfg(unix)]
@@ -254,10 +254,12 @@ fn ls_for_one_pattern(
         if let Some(path) = pattern_arg {
             // it makes no sense to list an empty string.
             if path.item.as_ref().is_empty() {
-                return Err(ShellError::FileNotFoundCustom {
-                    msg: "empty string('') directory or file does not exist".to_string(),
-                    span: path.span,
-                });
+                return Err(ShellError::Io(IoError::new_with_additional_context(
+                    std::io::ErrorKind::NotFound,
+                    path.span,
+                    PathBuf::from(path.item.to_string()),
+                    "empty string('') directory or file does not exist",
+                )));
             }
             match path.item {
                 NuGlob::DoNotExpand(p) => Some(Spanned {
@@ -283,10 +285,7 @@ fn ls_for_one_pattern(
                 nu_path::expand_path_with(pat.item.as_ref(), &cwd, pat.item.is_expand());
             // Avoid checking and pushing "*" to the path when directory (do not show contents) flag is true
             if !directory && tmp_expanded.is_dir() {
-                if read_dir(&tmp_expanded, p_tag, use_threads)?
-                    .next()
-                    .is_none()
-                {
+                if read_dir(tmp_expanded, p_tag, use_threads)?.next().is_none() {
                     return Ok(Value::test_nothing().into_pipeline_data());
                 }
                 just_read_dir = !(pat.item.is_expand() && nu_glob::is_glob(pat.item.as_ref()));
@@ -305,7 +304,7 @@ fn ls_for_one_pattern(
             // Avoid pushing "*" to the default path when directory (do not show contents) flag is true
             if directory {
                 (NuGlob::Expand(".".to_string()), false)
-            } else if read_dir(&cwd, p_tag, use_threads)?.next().is_none() {
+            } else if read_dir(cwd.clone(), p_tag, use_threads)?.next().is_none() {
                 return Ok(Value::test_nothing().into_pipeline_data());
             } else {
                 (NuGlob::Expand("*".to_string()), false)
@@ -318,7 +317,7 @@ fn ls_for_one_pattern(
     let path = pattern_arg.into_spanned(p_tag);
     let (prefix, paths) = if just_read_dir {
         let expanded = nu_path::expand_path_with(path.item.as_ref(), &cwd, path.item.is_expand());
-        let paths = read_dir(&expanded, p_tag, use_threads)?;
+        let paths = read_dir(expanded.clone(), p_tag, use_threads)?;
         // just need to read the directory, so prefix is path itself.
         (Some(expanded), paths)
     } else {
@@ -350,7 +349,16 @@ fn ls_for_one_pattern(
     let signals_clone = signals.clone();
 
     let pool = if use_threads {
-        let count = std::thread::available_parallelism()?.get();
+        let count = std::thread::available_parallelism()
+            .map_err(|err| {
+                IoError::new_with_additional_context(
+                    err.kind(),
+                    call_span,
+                    None,
+                    "Could not get available parallelism",
+                )
+            })?
+            .get();
         create_pool(count)?
     } else {
         create_pool(1)?
@@ -910,14 +918,12 @@ mod windows_helper {
                 &mut find_data,
             ) {
                 Ok(_) => Ok(find_data),
-                Err(e) => Err(ShellError::ReadingFile {
-                    msg: format!(
-                        "Could not read metadata for '{}':\n  '{}'",
-                        filename.to_string_lossy(),
-                        e
-                    ),
+                Err(e) => Err(ShellError::Io(IoError::new_with_additional_context(
+                    std::io::ErrorKind::Other,
                     span,
-                }),
+                    PathBuf::from(filename),
+                    format!("Could not read metadata: {e}"),
+                ))),
             }
         }
     }
@@ -950,28 +956,17 @@ mod windows_helper {
 
 #[allow(clippy::type_complexity)]
 fn read_dir(
-    f: &Path,
+    f: PathBuf,
     span: Span,
     use_threads: bool,
 ) -> Result<Box<dyn Iterator<Item = Result<PathBuf, ShellError>> + Send>, ShellError> {
     let items = f
         .read_dir()
-        .map_err(|error| {
-            if error.kind() == std::io::ErrorKind::PermissionDenied {
-                return ShellError::GenericError {
-                    error: "Permission denied".into(),
-                    msg: "The permissions may not allow access for this user".into(),
-                    span: Some(span),
-                    help: None,
-                    inner: vec![],
-                };
-            }
-
-            error.into()
-        })?
-        .map(|d| {
+        .map_err(|err| IoError::new(err.kind(), span, f.clone()))?
+        .map(move |d| {
             d.map(|r| r.path())
-                .map_err(|e| ShellError::IOError { msg: e.to_string() })
+                .map_err(|err| IoError::new(err.kind(), span, f.clone()))
+                .map_err(ShellError::from)
         });
     if !use_threads {
         let mut collected = items.collect::<Vec<_>>();
diff --git a/crates/nu-command/src/filesystem/mktemp.rs b/crates/nu-command/src/filesystem/mktemp.rs
index 9a0c041f15..5ebd054acb 100644
--- a/crates/nu-command/src/filesystem/mktemp.rs
+++ b/crates/nu-command/src/filesystem/mktemp.rs
@@ -106,14 +106,10 @@ impl Command for Mktemp {
         };
 
         let res = match uu_mktemp::mktemp(&options) {
-            Ok(res) => {
-                res.into_os_string()
-                    .into_string()
-                    .map_err(|e| ShellError::IOErrorSpanned {
-                        msg: e.to_string_lossy().to_string(),
-                        span,
-                    })?
-            }
+            Ok(res) => res
+                .into_os_string()
+                .into_string()
+                .map_err(|_| ShellError::NonUtf8 { span })?,
             Err(e) => {
                 return Err(ShellError::GenericError {
                     error: format!("{}", e),
diff --git a/crates/nu-command/src/filesystem/open.rs b/crates/nu-command/src/filesystem/open.rs
index db00f35d6d..a372d7e79e 100644
--- a/crates/nu-command/src/filesystem/open.rs
+++ b/crates/nu-command/src/filesystem/open.rs
@@ -1,7 +1,11 @@
 #[allow(deprecated)]
 use nu_engine::{command_prelude::*, current_dir, get_eval_block};
-use nu_protocol::{ast, DataSource, NuGlob, PipelineMetadata};
-use std::path::Path;
+use nu_protocol::{
+    ast,
+    shell_error::{self, io::IoError},
+    DataSource, NuGlob, PipelineMetadata,
+};
+use std::path::{Path, PathBuf};
 
 #[cfg(feature = "sqlite")]
 use crate::database::SQLiteDatabase;
@@ -87,25 +91,10 @@ impl Command for Open {
 
             for path in nu_engine::glob_from(&path, &cwd, call_span, None)
                 .map_err(|err| match err {
-                    ShellError::DirectoryNotFound { span, .. } => ShellError::FileNotFound {
-                        file: path.item.to_string(),
-                        span,
-                    },
-                    // that particular error in `nu_engine::glob_from` doesn't have a span attached
-                    // to it, so let's add it
-                    ShellError::GenericError {
-                        error,
-                        msg,
-                        span: _,
-                        help,
-                        inner,
-                    } if error.as_str() == "Permission denied" => ShellError::GenericError {
-                        error,
-                        msg,
-                        span: Some(arg_span),
-                        help,
-                        inner,
-                    },
+                    ShellError::Io(mut err) => {
+                        err.span = arg_span;
+                        err.into()
+                    }
                     _ => err,
                 })?
                 .1
@@ -114,24 +103,26 @@ impl Command for Open {
                 let path = Path::new(&path);
 
                 if permission_denied(path) {
+                    let err = IoError::new(
+                        std::io::ErrorKind::PermissionDenied,
+                        arg_span,
+                        PathBuf::from(path),
+                    );
+
                     #[cfg(unix)]
-                    let error_msg = match path.metadata() {
-                        Ok(md) => format!(
-                            "The permissions of {:o} does not allow access for this user",
-                            md.permissions().mode() & 0o0777
-                        ),
-                        Err(e) => e.to_string(),
+                    let err = {
+                        let mut err = err;
+                        err.additional_context = Some(match path.metadata() {
+                            Ok(md) => format!(
+                                "The permissions of {:o} does not allow access for this user",
+                                md.permissions().mode() & 0o0777
+                            ),
+                            Err(e) => e.to_string(),
+                        });
+                        err
                     };
 
-                    #[cfg(not(unix))]
-                    let error_msg = String::from("Permission denied");
-                    return Err(ShellError::GenericError {
-                        error: "Permission denied".into(),
-                        msg: error_msg,
-                        span: Some(arg_span),
-                        help: None,
-                        inner: vec![],
-                    });
+                    return Err(err.into());
                 } else {
                     #[cfg(feature = "sqlite")]
                     if !raw {
@@ -147,18 +138,18 @@ impl Command for Open {
                         }
                     }
 
-                    let file = match std::fs::File::open(path) {
-                        Ok(file) => file,
-                        Err(err) => {
-                            return Err(ShellError::GenericError {
-                                error: "Permission denied".into(),
-                                msg: err.to_string(),
-                                span: Some(arg_span),
-                                help: None,
-                                inner: vec![],
-                            });
-                        }
-                    };
+                    if path.is_dir() {
+                        // At least under windows this check ensures that we don't get a
+                        // permission denied error on directories
+                        return Err(ShellError::Io(IoError::new(
+                            shell_error::io::ErrorKind::IsADirectory,
+                            arg_span,
+                            PathBuf::from(path),
+                        )));
+                    }
+
+                    let file = std::fs::File::open(path)
+                        .map_err(|err| IoError::new(err.kind(), arg_span, PathBuf::from(path)))?;
 
                     // No content_type by default - Is added later if no converter is found
                     let stream = PipelineData::ByteStream(
diff --git a/crates/nu-command/src/filesystem/rm.rs b/crates/nu-command/src/filesystem/rm.rs
index 9a13442aa3..91daf99d8c 100644
--- a/crates/nu-command/src/filesystem/rm.rs
+++ b/crates/nu-command/src/filesystem/rm.rs
@@ -3,7 +3,11 @@ use super::util::try_interaction;
 use nu_engine::{command_prelude::*, env::current_dir};
 use nu_glob::MatchOptions;
 use nu_path::expand_path_with;
-use nu_protocol::{report_shell_error, NuGlob};
+use nu_protocol::{
+    report_shell_error,
+    shell_error::{self, io::IoError},
+    NuGlob,
+};
 #[cfg(unix)]
 use std::os::unix::prelude::FileTypeExt;
 use std::{
@@ -299,9 +303,17 @@ fn rm(
                 }
             }
             Err(e) => {
-                // glob_from may canonicalize path and return `DirectoryNotFound`
+                // glob_from may canonicalize path and return an error when a directory is not found
                 // nushell should suppress the error if `--force` is used.
-                if !(force && matches!(e, ShellError::DirectoryNotFound { .. })) {
+                if !(force
+                    && matches!(
+                        e,
+                        ShellError::Io(IoError {
+                            kind: shell_error::io::ErrorKind::Std(std::io::ErrorKind::NotFound),
+                            ..
+                        })
+                    ))
+                {
                     return Err(e);
                 }
             }
@@ -413,8 +425,7 @@ fn rm(
                 };
 
                 if let Err(e) = result {
-                    let msg = format!("Could not delete {:}: {e:}", f.to_string_lossy());
-                    Err(ShellError::RemoveNotPossible { msg, span })
+                    Err(ShellError::Io(IoError::new(e.kind(), span, f)))
                 } else if verbose {
                     let msg = if interactive && !confirmed {
                         "not deleted"
diff --git a/crates/nu-command/src/filesystem/save.rs b/crates/nu-command/src/filesystem/save.rs
index 67fd1a2271..bd580eec8c 100644
--- a/crates/nu-command/src/filesystem/save.rs
+++ b/crates/nu-command/src/filesystem/save.rs
@@ -4,8 +4,8 @@ use nu_engine::get_eval_block;
 use nu_engine::{command_prelude::*, current_dir};
 use nu_path::expand_path_with;
 use nu_protocol::{
-    ast, byte_stream::copy_with_signals, process::ChildPipe, ByteStreamSource, DataSource, OutDest,
-    PipelineMetadata, Signals,
+    ast, byte_stream::copy_with_signals, process::ChildPipe, shell_error::io::IoError,
+    ByteStreamSource, DataSource, OutDest, PipelineMetadata, Signals,
 };
 use std::{
     fs::File,
@@ -86,6 +86,7 @@ impl Command for Save {
                 span: arg.span,
             });
 
+        let from_io_error = IoError::factory(span, path.item.as_path());
         match input {
             PipelineData::ByteStream(stream, metadata) => {
                 check_saving_to_source_file(metadata.as_ref(), &path, stderr_path.as_ref())?;
@@ -129,7 +130,7 @@ impl Command for Save {
                                         io::copy(&mut tee, &mut io::stderr())
                                     }
                                 }
-                                .err_span(span)?;
+                                .map_err(|err| IoError::new(err.kind(), span, None))?;
                             }
                             Ok(())
                         }
@@ -153,7 +154,7 @@ impl Command for Save {
                                         )
                                     })
                                     .transpose()
-                                    .err_span(span)?;
+                                    .map_err(&from_io_error)?;
 
                                 let res = match stdout {
                                     ChildPipe::Pipe(pipe) => {
@@ -203,15 +204,10 @@ impl Command for Save {
                 let (mut file, _) = get_files(&path, stderr_path.as_ref(), append, force)?;
                 for val in ls {
                     file.write_all(&value_to_bytes(val)?)
-                        .map_err(|err| ShellError::IOError {
-                            msg: err.to_string(),
-                        })?;
-                    file.write_all("\n".as_bytes())
-                        .map_err(|err| ShellError::IOError {
-                            msg: err.to_string(),
-                        })?;
+                        .map_err(&from_io_error)?;
+                    file.write_all("\n".as_bytes()).map_err(&from_io_error)?;
                 }
-                file.flush()?;
+                file.flush().map_err(&from_io_error)?;
 
                 Ok(PipelineData::empty())
             }
@@ -232,11 +228,8 @@ impl Command for Save {
                 // Only open file after successful conversion
                 let (mut file, _) = get_files(&path, stderr_path.as_ref(), append, force)?;
 
-                file.write_all(&bytes).map_err(|err| ShellError::IOError {
-                    msg: err.to_string(),
-                })?;
-
-                file.flush()?;
+                file.write_all(&bytes).map_err(&from_io_error)?;
+                file.flush().map_err(&from_io_error)?;
 
                 Ok(PipelineData::empty())
             }
@@ -420,33 +413,27 @@ fn prepare_path(
 }
 
 fn open_file(path: &Path, span: Span, append: bool) -> Result<File, ShellError> {
-    let file = match (append, path.exists()) {
-        (true, true) => std::fs::OpenOptions::new().append(true).open(path),
+    let file: Result<File, nu_protocol::shell_error::io::ErrorKind> = match (append, path.exists())
+    {
+        (true, true) => std::fs::OpenOptions::new()
+            .append(true)
+            .open(path)
+            .map_err(|err| err.kind().into()),
         _ => {
             // This is a temporary solution until `std::fs::File::create` is fixed on Windows (rust-lang/rust#134893)
             // A TOCTOU problem exists here, which may cause wrong error message to be shown
             #[cfg(target_os = "windows")]
             if path.is_dir() {
-                // It should be `io::ErrorKind::IsADirectory` but it's not available in stable yet (1.83)
-                Err(io::Error::new(
-                    io::ErrorKind::Unsupported,
-                    "Is a directory (os error 21)",
-                ))
+                Err(nu_protocol::shell_error::io::ErrorKind::IsADirectory)
             } else {
-                std::fs::File::create(path)
+                std::fs::File::create(path).map_err(|err| err.kind().into())
             }
             #[cfg(not(target_os = "windows"))]
-            std::fs::File::create(path)
+            std::fs::File::create(path).map_err(|err| err.kind().into())
         }
     };
 
-    file.map_err(|e| ShellError::GenericError {
-        error: format!("Problem with [{}], Permission denied", path.display()),
-        msg: e.to_string(),
-        span: Some(span),
-        help: None,
-        inner: vec![],
-    })
+    file.map_err(|err_kind| ShellError::Io(IoError::new(err_kind, span, PathBuf::from(path))))
 }
 
 /// Get output file and optional stderr file
@@ -493,6 +480,9 @@ fn stream_to_file(
     span: Span,
     progress: bool,
 ) -> Result<(), ShellError> {
+    // TODO: maybe we can get a path in here
+    let from_io_error = IoError::factory(span, None);
+
     // https://github.com/nushell/nushell/pull/9377 contains the reason for not using `BufWriter`
     if progress {
         let mut bytes_processed = 0;
@@ -512,7 +502,7 @@ fn stream_to_file(
             match reader.fill_buf() {
                 Ok(&[]) => break Ok(()),
                 Ok(buf) => {
-                    file.write_all(buf).err_span(span)?;
+                    file.write_all(buf).map_err(&from_io_error)?;
                     let len = buf.len();
                     reader.consume(len);
                     bytes_processed += len as u64;
@@ -530,9 +520,9 @@ fn stream_to_file(
         if let Err(err) = res {
             let _ = file.flush();
             bar.abandoned_msg("# Error while saving #".to_owned());
-            Err(err.into_spanned(span).into())
+            Err(from_io_error(err).into())
         } else {
-            file.flush().err_span(span)?;
+            file.flush().map_err(&from_io_error)?;
             Ok(())
         }
     } else {
diff --git a/crates/nu-command/src/filesystem/ucp.rs b/crates/nu-command/src/filesystem/ucp.rs
index 40315d9e78..a65cbece66 100644
--- a/crates/nu-command/src/filesystem/ucp.rs
+++ b/crates/nu-command/src/filesystem/ucp.rs
@@ -1,6 +1,6 @@
 #[allow(deprecated)]
 use nu_engine::{command_prelude::*, current_dir};
-use nu_protocol::NuGlob;
+use nu_protocol::{shell_error::io::IoError, NuGlob};
 use std::path::PathBuf;
 use uu_cp::{BackupMode, CopyMode, UpdateMode};
 
@@ -197,10 +197,11 @@ impl Command for UCp {
                     .map(|f| f.1)?
                     .collect();
             if exp_files.is_empty() {
-                return Err(ShellError::FileNotFound {
-                    file: p.item.to_string(),
-                    span: p.span,
-                });
+                return Err(ShellError::Io(IoError::new(
+                    std::io::ErrorKind::NotFound,
+                    p.span,
+                    PathBuf::from(p.item.to_string()),
+                )));
             };
             let mut app_vals: Vec<PathBuf> = Vec::new();
             for v in exp_files {
diff --git a/crates/nu-command/src/filesystem/umv.rs b/crates/nu-command/src/filesystem/umv.rs
index cdf0c05b1f..c76ab9f376 100644
--- a/crates/nu-command/src/filesystem/umv.rs
+++ b/crates/nu-command/src/filesystem/umv.rs
@@ -1,7 +1,7 @@
 #[allow(deprecated)]
 use nu_engine::{command_prelude::*, current_dir};
 use nu_path::expand_path_with;
-use nu_protocol::NuGlob;
+use nu_protocol::{shell_error::io::IoError, NuGlob};
 use std::{ffi::OsString, path::PathBuf};
 use uu_mv::{BackupMode, UpdateMode};
 
@@ -138,10 +138,11 @@ impl Command for UMv {
                     .map(|f| f.1)?
                     .collect();
             if exp_files.is_empty() {
-                return Err(ShellError::FileNotFound {
-                    file: p.item.to_string(),
-                    span: p.span,
-                });
+                return Err(ShellError::Io(IoError::new(
+                    std::io::ErrorKind::NotFound,
+                    p.span,
+                    PathBuf::from(p.item.to_string()),
+                )));
             };
             let mut app_vals: Vec<PathBuf> = Vec::new();
             for v in exp_files {
diff --git a/crates/nu-command/src/filesystem/utouch.rs b/crates/nu-command/src/filesystem/utouch.rs
index 9fbf9805de..d887a5c411 100644
--- a/crates/nu-command/src/filesystem/utouch.rs
+++ b/crates/nu-command/src/filesystem/utouch.rs
@@ -3,8 +3,8 @@ use filetime::FileTime;
 use nu_engine::command_prelude::*;
 use nu_glob::{glob, is_glob};
 use nu_path::expand_path_with;
-use nu_protocol::NuGlob;
-use std::{io::ErrorKind, path::PathBuf};
+use nu_protocol::{shell_error::io::IoError, NuGlob};
+use std::path::PathBuf;
 use uu_touch::{error::TouchError, ChangeTimes, InputFile, Options, Source};
 
 #[derive(Clone)]
@@ -225,20 +225,12 @@ impl Command for UTouch {
                 },
                 TouchError::ReferenceFileInaccessible(reference_path, io_err) => {
                     let span = reference_span.expect("touch should've been given a reference file");
-                    if io_err.kind() == ErrorKind::NotFound {
-                        ShellError::FileNotFound {
-                            span,
-                            file: reference_path.display().to_string(),
-                        }
-                    } else {
-                        ShellError::GenericError {
-                            error: io_err.to_string(),
-                            msg: format!("Failed to read metadata of {}", reference_path.display()),
-                            span: Some(span),
-                            help: None,
-                            inner: Vec::new(),
-                        }
-                    }
+                    ShellError::Io(IoError::new_with_additional_context(
+                        io_err.kind(),
+                        span,
+                        reference_path,
+                        "failed to read metadata",
+                    ))
                 }
                 _ => ShellError::GenericError {
                     error: err.to_string(),
diff --git a/crates/nu-command/src/filesystem/watch.rs b/crates/nu-command/src/filesystem/watch.rs
index dd21304173..3028181a21 100644
--- a/crates/nu-command/src/filesystem/watch.rs
+++ b/crates/nu-command/src/filesystem/watch.rs
@@ -9,6 +9,7 @@ use nu_engine::{command_prelude::*, ClosureEval};
 use nu_protocol::{
     engine::{Closure, StateWorkingSet},
     format_shell_error,
+    shell_error::io::IoError,
 };
 use std::{
     path::PathBuf,
@@ -83,11 +84,12 @@ impl Command for Watch {
 
         let path = match nu_path::canonicalize_with(path_no_whitespace, cwd) {
             Ok(p) => p,
-            Err(_) => {
-                return Err(ShellError::DirectoryNotFound {
-                    dir: path_no_whitespace.to_string(),
-                    span: path_arg.span,
-                })
+            Err(err) => {
+                return Err(ShellError::Io(IoError::new(
+                    err.kind(),
+                    path_arg.span,
+                    PathBuf::from(path_no_whitespace),
+                )))
             }
         };
 
@@ -151,14 +153,22 @@ impl Command for Watch {
         let mut debouncer = match new_debouncer(debounce_duration, None, tx) {
             Ok(d) => d,
             Err(e) => {
-                return Err(ShellError::IOError {
-                    msg: format!("Failed to create watcher: {e}"),
-                })
+                return Err(ShellError::GenericError {
+                    error: "Failed to create watcher".to_string(),
+                    msg: e.to_string(),
+                    span: Some(call.head),
+                    help: None,
+                    inner: vec![],
+                });
             }
         };
         if let Err(e) = debouncer.watcher().watch(&path, recursive_mode) {
-            return Err(ShellError::IOError {
-                msg: format!("Failed to create watcher: {e}"),
+            return Err(ShellError::GenericError {
+                error: "Failed to create watcher".to_string(),
+                msg: e.to_string(),
+                span: Some(call.head),
+                help: None,
+                inner: vec![],
             });
         }
         // need to cache to make sure that rename event works.
@@ -249,13 +259,21 @@ impl Command for Watch {
                     }
                 }
                 Ok(Err(_)) => {
-                    return Err(ShellError::IOError {
+                    return Err(ShellError::GenericError {
+                        error: "Receiving events failed".to_string(),
                         msg: "Unexpected errors when receiving events".into(),
-                    })
+                        span: None,
+                        help: None,
+                        inner: vec![],
+                    });
                 }
                 Err(RecvTimeoutError::Disconnected) => {
-                    return Err(ShellError::IOError {
+                    return Err(ShellError::GenericError {
+                        error: "Disconnected".to_string(),
                         msg: "Unexpected disconnect from file watcher".into(),
+                        span: None,
+                        help: None,
+                        inner: vec![],
                     });
                 }
                 Err(RecvTimeoutError::Timeout) => {}
diff --git a/crates/nu-command/src/filters/chunks.rs b/crates/nu-command/src/filters/chunks.rs
index 93757c36e8..5149713644 100644
--- a/crates/nu-command/src/filters/chunks.rs
+++ b/crates/nu-command/src/filters/chunks.rs
@@ -1,5 +1,5 @@
 use nu_engine::command_prelude::*;
-use nu_protocol::ListStream;
+use nu_protocol::{shell_error::io::IoError, ListStream};
 use std::{
     io::{BufRead, Cursor, ErrorKind},
     num::NonZeroUsize,
@@ -119,6 +119,7 @@ pub fn chunks(
     chunk_size: NonZeroUsize,
     span: Span,
 ) -> Result<PipelineData, ShellError> {
+    let from_io_error = IoError::factory(span, None);
     match input {
         PipelineData::Value(Value::List { vals, .. }, metadata) => {
             let chunks = ChunksIter::new(vals, chunk_size, span);
@@ -136,7 +137,7 @@ pub fn chunks(
             };
             let value_stream = chunk_read.map(move |chunk| match chunk {
                 Ok(chunk) => Value::binary(chunk, span),
-                Err(e) => Value::error(e.into(), span),
+                Err(e) => Value::error(from_io_error(e).into(), span),
             });
             let pipeline_data_with_metadata = value_stream.into_pipeline_data_with_metadata(
                 span,
@@ -155,7 +156,7 @@ pub fn chunks(
                     };
                     let value_stream = chunk_read.map(move |chunk| match chunk {
                         Ok(chunk) => Value::binary(chunk, span),
-                        Err(e) => Value::error(e.into(), span),
+                        Err(e) => Value::error(from_io_error(e).into(), span),
                     });
                     value_stream.into_pipeline_data_with_metadata(
                         span,
diff --git a/crates/nu-command/src/filters/empty.rs b/crates/nu-command/src/filters/empty.rs
index f4dd428b77..92a540fa46 100644
--- a/crates/nu-command/src/filters/empty.rs
+++ b/crates/nu-command/src/filters/empty.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::shell_error::io::IoError;
 use std::io::Read;
 
 pub fn empty(
@@ -41,7 +42,12 @@ pub fn empty(
                 let span = stream.span();
                 match stream.reader() {
                     Some(reader) => {
-                        let is_empty = reader.bytes().next().transpose().err_span(span)?.is_none();
+                        let is_empty = reader
+                            .bytes()
+                            .next()
+                            .transpose()
+                            .map_err(|err| IoError::new(err.kind(), span, None))?
+                            .is_none();
                         if negate {
                             Ok(Value::bool(!is_empty, head).into_pipeline_data())
                         } else {
diff --git a/crates/nu-command/src/filters/first.rs b/crates/nu-command/src/filters/first.rs
index 5695f823c7..a1f15c64ce 100644
--- a/crates/nu-command/src/filters/first.rs
+++ b/crates/nu-command/src/filters/first.rs
@@ -1,5 +1,5 @@
 use nu_engine::command_prelude::*;
-use nu_protocol::Signals;
+use nu_protocol::{shell_error::io::IoError, Signals};
 use std::io::Read;
 
 #[derive(Clone)]
@@ -180,7 +180,11 @@ fn first_helper(
                     if return_single_element {
                         // Take a single byte
                         let mut byte = [0u8];
-                        if reader.read(&mut byte).err_span(span)? > 0 {
+                        if reader
+                            .read(&mut byte)
+                            .map_err(|err| IoError::new(err.kind(), span, None))?
+                            > 0
+                        {
                             Ok(Value::int(byte[0] as i64, head).into_pipeline_data())
                         } else {
                             Err(ShellError::AccessEmptyContent { span: head })
diff --git a/crates/nu-command/src/filters/interleave.rs b/crates/nu-command/src/filters/interleave.rs
index f31a3411ae..4f2b457af3 100644
--- a/crates/nu-command/src/filters/interleave.rs
+++ b/crates/nu-command/src/filters/interleave.rs
@@ -1,5 +1,5 @@
 use nu_engine::{command_prelude::*, ClosureEvalOnce};
-use nu_protocol::engine::Closure;
+use nu_protocol::{engine::Closure, shell_error::io::IoError};
 use std::{sync::mpsc, thread};
 
 #[derive(Clone)]
@@ -137,10 +137,7 @@ interleave
                             }
                         })
                         .map(|_| ())
-                        .map_err(|err| ShellError::IOErrorSpanned {
-                            msg: err.to_string(),
-                            span: head,
-                        })
+                        .map_err(|err| IoError::new(err.kind(), head, None).into())
                 })
             })?;
 
diff --git a/crates/nu-command/src/filters/last.rs b/crates/nu-command/src/filters/last.rs
index 127833dcd4..77b57880f6 100644
--- a/crates/nu-command/src/filters/last.rs
+++ b/crates/nu-command/src/filters/last.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::shell_error::io::IoError;
 use std::{collections::VecDeque, io::Read};
 
 #[derive(Clone)]
@@ -165,7 +166,7 @@ impl Command for Last {
                         let mut buf = VecDeque::with_capacity(rows + TAKE as usize);
                         loop {
                             let taken = std::io::copy(&mut (&mut reader).take(TAKE), &mut buf)
-                                .err_span(span)?;
+                                .map_err(|err| IoError::new(err.kind(), span, None))?;
                             if buf.len() > rows {
                                 buf.drain(..(buf.len() - rows));
                             }
diff --git a/crates/nu-command/src/filters/tee.rs b/crates/nu-command/src/filters/tee.rs
index e643939894..c6b61a2fb5 100644
--- a/crates/nu-command/src/filters/tee.rs
+++ b/crates/nu-command/src/filters/tee.rs
@@ -2,8 +2,8 @@ use nu_engine::{command_prelude::*, get_eval_block_with_early_return};
 #[cfg(feature = "os")]
 use nu_protocol::process::ChildPipe;
 use nu_protocol::{
-    byte_stream::copy_with_signals, engine::Closure, report_shell_error, ByteStream,
-    ByteStreamSource, OutDest, PipelineMetadata, Signals,
+    byte_stream::copy_with_signals, engine::Closure, report_shell_error, shell_error::io::IoError,
+    ByteStream, ByteStreamSource, OutDest, PipelineMetadata, Signals,
 };
 use std::{
     io::{self, Read, Write},
@@ -82,6 +82,7 @@ use it in your pipeline."#
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
+        let from_io_error = IoError::factory(head, None);
         let use_stderr = call.has_flag(engine_state, stack, "stderr")?;
 
         let closure: Spanned<Closure> = call.req(engine_state, stack, 0)?;
@@ -263,7 +264,7 @@ use it in your pipeline."#
                     let input = rx.into_pipeline_data_with_metadata(span, signals, metadata_clone);
                     eval_block(input)
                 })
-                .err_span(call.head)?
+                .map_err(&from_io_error)?
                 .map(move |result| result.unwrap_or_else(|err| Value::error(err, closure_span)))
                 .into_pipeline_data_with_metadata(
                     span,
@@ -278,7 +279,7 @@ use it in your pipeline."#
                 tee_once(engine_state_arc, move || {
                     eval_block(value_clone.into_pipeline_data_with_metadata(metadata_clone))
                 })
-                .err_span(call.head)?;
+                .map_err(&from_io_error)?;
                 Ok(value.into_pipeline_data_with_metadata(metadata))
             }
         }
@@ -439,7 +440,9 @@ fn spawn_tee(
             );
             eval_block(PipelineData::ByteStream(stream, info.metadata))
         })
-        .err_span(info.span)?;
+        .map_err(|err| {
+            IoError::new_with_additional_context(err.kind(), info.span, None, "Could not spawn tee")
+        })?;
 
     Ok(TeeThread { sender, thread })
 }
@@ -478,7 +481,15 @@ fn copy_on_thread(
             copy_with_signals(src, dest, span, &signals)?;
             Ok(())
         })
-        .map_err(|e| e.into_spanned(span).into())
+        .map_err(|err| {
+            IoError::new_with_additional_context(
+                err.kind(),
+                span,
+                None,
+                "Could not spawn stderr copier",
+            )
+            .into()
+        })
 }
 
 #[cfg(feature = "os")]
@@ -521,7 +532,12 @@ fn tee_forwards_errors_back_immediately() {
     use std::time::Duration;
     let slow_input = (0..100).inspect(|_| std::thread::sleep(Duration::from_millis(1)));
     let iter = tee(slow_input, |_| {
-        Err(ShellError::IOError { msg: "test".into() })
+        Err(ShellError::Io(IoError::new_with_additional_context(
+            std::io::ErrorKind::Other,
+            Span::test_data(),
+            None,
+            "test",
+        )))
     })
     .expect("io error");
     for result in iter {
@@ -548,7 +564,12 @@ fn tee_waits_for_the_other_thread() {
     let iter = tee(0..100, move |_| {
         std::thread::sleep(Duration::from_millis(10));
         waited_clone.store(true, Ordering::Relaxed);
-        Err(ShellError::IOError { msg: "test".into() })
+        Err(ShellError::Io(IoError::new_with_additional_context(
+            std::io::ErrorKind::Other,
+            Span::test_data(),
+            None,
+            "test",
+        )))
     })
     .expect("io error");
     let last = iter.last();
diff --git a/crates/nu-command/src/formats/from/json.rs b/crates/nu-command/src/formats/from/json.rs
index 36a05ea4e1..17a632d949 100644
--- a/crates/nu-command/src/formats/from/json.rs
+++ b/crates/nu-command/src/formats/from/json.rs
@@ -1,7 +1,7 @@
 use std::io::{BufRead, Cursor};
 
 use nu_engine::command_prelude::*;
-use nu_protocol::{ListStream, Signals};
+use nu_protocol::{shell_error::io::IoError, ListStream, Signals};
 
 #[derive(Clone)]
 pub struct FromJson;
@@ -134,7 +134,7 @@ fn read_json_lines(
         .lines()
         .filter(|line| line.as_ref().is_ok_and(|line| !line.trim().is_empty()) || line.is_err())
         .map(move |line| {
-            let line = line.err_span(span)?;
+            let line = line.map_err(|err| IoError::new(err.kind(), span, None))?;
             if strict {
                 convert_string_to_value_strict(&line, span)
             } else {
diff --git a/crates/nu-command/src/formats/to/delimited.rs b/crates/nu-command/src/formats/to/delimited.rs
index ac04739a3d..4054935098 100644
--- a/crates/nu-command/src/formats/to/delimited.rs
+++ b/crates/nu-command/src/formats/to/delimited.rs
@@ -1,16 +1,14 @@
 use csv::WriterBuilder;
 use nu_cmd_base::formats::to::delimited::merge_descriptors;
 use nu_protocol::{
-    ByteStream, ByteStreamType, Config, PipelineData, ShellError, Signals, Span, Spanned, Value,
+    shell_error::io::IoError, ByteStream, ByteStreamType, Config, PipelineData, ShellError,
+    Signals, Span, Spanned, Value,
 };
 use std::{iter, sync::Arc};
 
 fn make_csv_error(error: csv::Error, format_name: &str, head: Span) -> ShellError {
     if let csv::ErrorKind::Io(error) = error.kind() {
-        ShellError::IOErrorSpanned {
-            msg: error.to_string(),
-            span: head,
-        }
+        IoError::new(error.kind(), head, None).into()
     } else {
         ShellError::GenericError {
             error: format!("Failed to generate {format_name} data"),
diff --git a/crates/nu-command/src/formats/to/msgpack.rs b/crates/nu-command/src/formats/to/msgpack.rs
index f7c4c7df3d..ae1d11e542 100644
--- a/crates/nu-command/src/formats/to/msgpack.rs
+++ b/crates/nu-command/src/formats/to/msgpack.rs
@@ -5,7 +5,7 @@ use std::io;
 
 use byteorder::{BigEndian, WriteBytesExt};
 use nu_engine::command_prelude::*;
-use nu_protocol::{ast::PathMember, Signals, Spanned};
+use nu_protocol::{ast::PathMember, shell_error::io::IoError, Signals, Spanned};
 use rmp::encode as mp;
 
 /// Max recursion depth
@@ -138,7 +138,7 @@ impl From<WriteError> for ShellError {
                 help: None,
                 inner: vec![],
             },
-            WriteError::Io(err, span) => err.into_spanned(span).into(),
+            WriteError::Io(err, span) => ShellError::Io(IoError::new(err.kind(), span, None)),
             WriteError::Shell(err) => *err,
         }
     }
diff --git a/crates/nu-command/src/formats/to/msgpackz.rs b/crates/nu-command/src/formats/to/msgpackz.rs
index e4166b15d3..c6d667280f 100644
--- a/crates/nu-command/src/formats/to/msgpackz.rs
+++ b/crates/nu-command/src/formats/to/msgpackz.rs
@@ -1,6 +1,7 @@
 use std::io::Write;
 
 use nu_engine::command_prelude::*;
+use nu_protocol::shell_error::io::IoError;
 
 use super::msgpack::write_value;
 
@@ -80,7 +81,8 @@ impl Command for ToMsgpackz {
         );
 
         write_value(&mut out, &value, 0)?;
-        out.flush().err_span(call.head)?;
+        out.flush()
+            .map_err(|err| IoError::new(err.kind(), call.head, None))?;
         drop(out);
 
         Ok(Value::binary(out_buf, call.head).into_pipeline_data())
diff --git a/crates/nu-command/src/formats/to/text.rs b/crates/nu-command/src/formats/to/text.rs
index 2fc3046e4e..2736fe24e5 100644
--- a/crates/nu-command/src/formats/to/text.rs
+++ b/crates/nu-command/src/formats/to/text.rs
@@ -1,6 +1,8 @@
 use chrono_humanize::HumanTime;
 use nu_engine::command_prelude::*;
-use nu_protocol::{format_duration, ByteStream, Config, PipelineMetadata};
+use nu_protocol::{
+    format_duration, shell_error::io::IoError, ByteStream, Config, PipelineMetadata,
+};
 use std::io::Write;
 
 const LINE_ENDING: &str = if cfg!(target_os = "windows") {
@@ -72,6 +74,7 @@ impl Command for ToText {
             }
             PipelineData::ListStream(stream, meta) => {
                 let span = stream.span();
+                let from_io_error = IoError::factory(head, None);
                 let stream = if no_newline {
                     let mut first = true;
                     let mut iter = stream.into_inner();
@@ -87,7 +90,7 @@ impl Command for ToText {
                             if first {
                                 first = false;
                             } else {
-                                write!(buf, "{LINE_ENDING}").err_span(head)?;
+                                write!(buf, "{LINE_ENDING}").map_err(&from_io_error)?;
                             }
                             // TODO: write directly into `buf` instead of creating an intermediate
                             // string.
@@ -98,7 +101,7 @@ impl Command for ToText {
                                 &config,
                                 serialize_types,
                             );
-                            write!(buf, "{str}").err_span(head)?;
+                            write!(buf, "{str}").map_err(&from_io_error)?;
                             Ok(true)
                         },
                     )
diff --git a/crates/nu-command/src/misc/source.rs b/crates/nu-command/src/misc/source.rs
index c1be441bb0..de692c557c 100644
--- a/crates/nu-command/src/misc/source.rs
+++ b/crates/nu-command/src/misc/source.rs
@@ -1,6 +1,6 @@
 use nu_engine::{command_prelude::*, get_eval_block_with_early_return};
 use nu_path::canonicalize_with;
-use nu_protocol::{engine::CommandType, BlockId};
+use nu_protocol::{engine::CommandType, shell_error::io::IoError, BlockId};
 
 /// Source a file for environment variables.
 #[derive(Clone)]
@@ -55,11 +55,8 @@ impl Command for Source {
         let cwd = engine_state.cwd_as_string(Some(stack))?;
         let pb = std::path::PathBuf::from(block_id_name);
         let parent = pb.parent().unwrap_or(std::path::Path::new(""));
-        let file_path =
-            canonicalize_with(pb.as_path(), cwd).map_err(|err| ShellError::FileNotFoundCustom {
-                msg: format!("Could not access file '{}': {err}", pb.as_path().display()),
-                span: Span::unknown(),
-            })?;
+        let file_path = canonicalize_with(pb.as_path(), cwd)
+            .map_err(|err| IoError::new(err.kind(), call.head, pb.clone()))?;
 
         // Note: We intentionally left out PROCESS_PATH since it's supposed to
         // to work like argv[0] in C, which is the name of the program being executed.
diff --git a/crates/nu-command/src/network/http/client.rs b/crates/nu-command/src/network/http/client.rs
index a5cad69b2c..28a8bc8207 100644
--- a/crates/nu-command/src/network/http/client.rs
+++ b/crates/nu-command/src/network/http/client.rs
@@ -6,10 +6,11 @@ use base64::{
 };
 use multipart_rs::MultipartWriter;
 use nu_engine::command_prelude::*;
-use nu_protocol::{ByteStream, LabeledError, Signals};
+use nu_protocol::{shell_error::io::IoError, ByteStream, LabeledError, Signals};
 use serde_json::Value as JsonValue;
 use std::{
     collections::HashMap,
+    error::Error as StdError,
     io::Cursor,
     path::PathBuf,
     str::FromStr,
@@ -184,6 +185,7 @@ pub fn request_add_authorization_header(
     request
 }
 
+#[derive(Debug)]
 #[allow(clippy::large_enum_variant)]
 pub enum ShellErrorOrRequestError {
     ShellError(ShellError),
@@ -372,10 +374,10 @@ fn send_multipart_request(
         Value::Record { val, .. } => {
             let mut builder = MultipartWriter::new();
 
-            let err = |e| {
-                ShellErrorOrRequestError::ShellError(ShellError::IOError {
-                    msg: format!("failed to build multipart data: {}", e),
-                })
+            let err = |e: std::io::Error| {
+                ShellErrorOrRequestError::ShellError(
+                    IoError::new_with_additional_context(e.kind(), span, None, e).into(),
+                )
             };
 
             for (col, val) in val.into_owned() {
@@ -464,6 +466,14 @@ fn send_cancellable_request(
             let ret = request_fn();
             let _ = tx.send(ret); // may fail if the user has cancelled the operation
         })
+        .map_err(|err| {
+            IoError::new_with_additional_context(
+                err.kind(),
+                span,
+                None,
+                "Could not spawn HTTP requester",
+            )
+        })
         .map_err(ShellError::from)?;
 
     // ...and poll the channel for responses
@@ -519,6 +529,14 @@ fn send_cancellable_request_bytes(
             // may fail if the user has cancelled the operation
             let _ = tx.send(ret);
         })
+        .map_err(|err| {
+            IoError::new_with_additional_context(
+                err.kind(),
+                span,
+                None,
+                "Could not spawn HTTP requester",
+            )
+        })
         .map_err(ShellError::from)?;
 
     // ...and poll the channel for responses
@@ -618,27 +636,56 @@ pub fn request_add_custom_headers(
 
 fn handle_response_error(span: Span, requested_url: &str, response_err: Error) -> ShellError {
     match response_err {
-        Error::Status(301, _) => ShellError::NetworkFailure { msg: format!("Resource moved permanently (301): {requested_url:?}"), span },
-        Error::Status(400, _) => {
-            ShellError::NetworkFailure { msg: format!("Bad request (400) to {requested_url:?}"), span }
-        }
-        Error::Status(403, _) => {
-            ShellError::NetworkFailure { msg: format!("Access forbidden (403) to {requested_url:?}"), span }
-        }
-        Error::Status(404, _) => ShellError::NetworkFailure { msg: format!("Requested file not found (404): {requested_url:?}"), span },
-        Error::Status(408, _) => {
-            ShellError::NetworkFailure { msg: format!("Request timeout (408): {requested_url:?}"), span }
-        }
-        Error::Status(_, _) => ShellError::NetworkFailure { msg: format!(
+        Error::Status(301, _) => ShellError::NetworkFailure {
+            msg: format!("Resource moved permanently (301): {requested_url:?}"),
+            span,
+        },
+        Error::Status(400, _) => ShellError::NetworkFailure {
+            msg: format!("Bad request (400) to {requested_url:?}"),
+            span,
+        },
+        Error::Status(403, _) => ShellError::NetworkFailure {
+            msg: format!("Access forbidden (403) to {requested_url:?}"),
+            span,
+        },
+        Error::Status(404, _) => ShellError::NetworkFailure {
+            msg: format!("Requested file not found (404): {requested_url:?}"),
+            span,
+        },
+        Error::Status(408, _) => ShellError::NetworkFailure {
+            msg: format!("Request timeout (408): {requested_url:?}"),
+            span,
+        },
+        Error::Status(_, _) => ShellError::NetworkFailure {
+            msg: format!(
                 "Cannot make request to {:?}. Error is {:?}",
                 requested_url,
                 response_err.to_string()
-            ), span },
-
-        Error::Transport(t) => match t {
-            t if t.kind() == ErrorKind::ConnectionFailed => ShellError::NetworkFailure { msg: format!("Cannot make request to {requested_url}, there was an error establishing a connection.",), span },
-            t => ShellError::NetworkFailure { msg: t.to_string(), span },
+            ),
+            span,
         },
+
+        Error::Transport(t) => {
+            let generic_network_failure = || ShellError::NetworkFailure {
+                msg: t.to_string(),
+                span,
+            };
+            match t.kind() {
+                ErrorKind::ConnectionFailed => ShellError::NetworkFailure { msg: format!("Cannot make request to {requested_url}, there was an error establishing a connection.",), span },
+                ErrorKind::Io => 'io: {
+                    let Some(source) = t.source() else {
+                        break 'io generic_network_failure();
+                    };
+
+                    let Some(io_error) = source.downcast_ref::<std::io::Error>() else {
+                        break 'io generic_network_failure();
+                    };
+
+                    ShellError::Io(IoError::new(io_error.kind(), span, None))
+                }
+                _ => generic_network_failure()
+            }
+        }
     }
 }
 
diff --git a/crates/nu-command/src/network/port.rs b/crates/nu-command/src/network/port.rs
index eb77ab1d32..fe3c987b85 100644
--- a/crates/nu-command/src/network/port.rs
+++ b/crates/nu-command/src/network/port.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::shell_error::io::IoError;
 
 use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4, TcpListener};
 
@@ -61,12 +62,14 @@ fn get_free_port(
     stack: &mut Stack,
     call: &Call,
 ) -> Result<PipelineData, ShellError> {
+    let from_io_error = IoError::factory(call.head, None);
+
     let start_port: Option<Spanned<usize>> = call.opt(engine_state, stack, 0)?;
     let end_port: Option<Spanned<usize>> = call.opt(engine_state, stack, 1)?;
 
     let listener = if start_port.is_none() && end_port.is_none() {
         // get free port from system.
-        TcpListener::bind("127.0.0.1:0")?
+        TcpListener::bind("127.0.0.1:0").map_err(&from_io_error)?
     } else {
         let (start_port, start_span) = match start_port {
             Some(p) => (p.item, Some(p.span)),
@@ -118,20 +121,25 @@ fn get_free_port(
             });
         }
 
-        // try given port one by one.
-        match (start_port..=end_port)
-            .map(|port| SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::LOCALHOST, port)))
-            .find_map(|addr| TcpListener::bind(addr).ok())
-        {
-            Some(listener) => listener,
-            None => {
-                return Err(ShellError::IOError {
-                    msg: "Every port has been tried, but no valid one was found".to_string(),
-                })
+        'search: {
+            let mut last_err = None;
+            for port in start_port..=end_port {
+                let addr = SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::LOCALHOST, port));
+                match TcpListener::bind(addr) {
+                    Ok(listener) => break 'search Ok(listener),
+                    Err(err) => last_err = Some(err),
+                }
             }
-        }
+
+            Err(IoError::new_with_additional_context(
+                last_err.expect("range not empty, validated before").kind(),
+                range_span,
+                None,
+                "Every port has been tried, but no valid one was found",
+            ))
+        }?
     };
 
-    let free_port = listener.local_addr()?.port();
+    let free_port = listener.local_addr().map_err(&from_io_error)?.port();
     Ok(Value::int(free_port as i64, call.head).into_pipeline_data())
 }
diff --git a/crates/nu-command/src/path/exists.rs b/crates/nu-command/src/path/exists.rs
index 3e40bef28a..0c482a5fe5 100644
--- a/crates/nu-command/src/path/exists.rs
+++ b/crates/nu-command/src/path/exists.rs
@@ -2,7 +2,7 @@ use super::PathSubcommandArguments;
 #[allow(deprecated)]
 use nu_engine::{command_prelude::*, current_dir, current_dir_const};
 use nu_path::expand_path_with;
-use nu_protocol::engine::StateWorkingSet;
+use nu_protocol::{engine::StateWorkingSet, shell_error::io::IoError};
 use std::path::{Path, PathBuf};
 
 struct Arguments {
@@ -140,7 +140,7 @@ fn exists(path: &Path, span: Span, args: &Arguments) -> Value {
         // symlink_metadata returns true if the file/folder exists
         // whether it is a symbolic link or not. Sorry, but returns Err
         // in every other scenario including the NotFound
-        std::fs::symlink_metadata(path).map_or_else(
+        std::fs::symlink_metadata(&path).map_or_else(
             |e| match e.kind() {
                 std::io::ErrorKind::NotFound => Ok(false),
                 _ => Err(e),
@@ -153,15 +153,7 @@ fn exists(path: &Path, span: Span, args: &Arguments) -> Value {
     Value::bool(
         match exists {
             Ok(exists) => exists,
-            Err(err) => {
-                return Value::error(
-                    ShellError::IOErrorSpanned {
-                        msg: err.to_string(),
-                        span,
-                    },
-                    span,
-                )
-            }
+            Err(err) => return Value::error(IoError::new(err.kind(), span, path).into(), span),
         },
         span,
     )
diff --git a/crates/nu-command/src/path/self_.rs b/crates/nu-command/src/path/self_.rs
index 242fbea7a8..49c1de8624 100644
--- a/crates/nu-command/src/path/self_.rs
+++ b/crates/nu-command/src/path/self_.rs
@@ -1,6 +1,6 @@
 use nu_engine::command_prelude::*;
 use nu_path::expand_path_with;
-use nu_protocol::engine::StateWorkingSet;
+use nu_protocol::{engine::StateWorkingSet, shell_error::io::IoError};
 
 #[derive(Clone)]
 pub struct SubCommand;
@@ -54,23 +54,25 @@ impl Command for SubCommand {
     ) -> Result<PipelineData, ShellError> {
         let path: Option<String> = call.opt_const(working_set, 0)?;
         let cwd = working_set.permanent_state.cwd(None)?;
-        let current_file =
-            working_set
-                .files
-                .top()
-                .ok_or_else(|| ShellError::FileNotFoundCustom {
-                    msg: "Couldn't find current file".into(),
-                    span: call.head,
-                })?;
+        let current_file = working_set.files.top().ok_or_else(|| {
+            IoError::new_with_additional_context(
+                std::io::ErrorKind::NotFound,
+                call.head,
+                None,
+                "Couldn't find current file",
+            )
+        })?;
 
         let out = if let Some(path) = path {
             let dir = expand_path_with(
-                current_file
-                    .parent()
-                    .ok_or_else(|| ShellError::FileNotFoundCustom {
-                        msg: "Couldn't find current file's parent.".into(),
-                        span: call.head,
-                    })?,
+                current_file.parent().ok_or_else(|| {
+                    IoError::new_with_additional_context(
+                        std::io::ErrorKind::NotFound,
+                        call.head,
+                        current_file.to_owned(),
+                        "Couldn't find current file's parent.",
+                    )
+                })?,
                 &cwd,
                 true,
             );
diff --git a/crates/nu-command/src/path/type.rs b/crates/nu-command/src/path/type.rs
index 81cdaf8cfe..6abed1319a 100644
--- a/crates/nu-command/src/path/type.rs
+++ b/crates/nu-command/src/path/type.rs
@@ -1,7 +1,7 @@
 use super::PathSubcommandArguments;
 use nu_engine::command_prelude::*;
 use nu_path::AbsolutePathBuf;
-use nu_protocol::engine::StateWorkingSet;
+use nu_protocol::{engine::StateWorkingSet, shell_error::io::IoError};
 use std::{io, path::Path};
 
 struct Arguments {
@@ -108,7 +108,7 @@ fn path_type(path: &Path, span: Span, args: &Arguments) -> Value {
     match path.symlink_metadata() {
         Ok(metadata) => Value::string(get_file_type(&metadata), span),
         Err(err) if err.kind() == io::ErrorKind::NotFound => Value::nothing(span),
-        Err(err) => Value::error(err.into_spanned(span).into(), span),
+        Err(err) => Value::error(IoError::new(err.kind(), span, None).into(), span),
     }
 }
 
diff --git a/crates/nu-command/src/platform/clear.rs b/crates/nu-command/src/platform/clear.rs
index 21e3a3054c..38bb659df6 100644
--- a/crates/nu-command/src/platform/clear.rs
+++ b/crates/nu-command/src/platform/clear.rs
@@ -4,6 +4,7 @@ use crossterm::{
     QueueableCommand,
 };
 use nu_engine::command_prelude::*;
+use nu_protocol::shell_error::io::IoError;
 
 use std::io::Write;
 
@@ -41,19 +42,27 @@ impl Command for Clear {
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
+        let from_io_error = IoError::factory(call.head, None);
         match call.has_flag(engine_state, stack, "keep-scrollback")? {
             true => {
                 std::io::stdout()
-                    .queue(MoveTo(0, 0))?
-                    .queue(ClearCommand(ClearType::All))?
-                    .flush()?;
+                    .queue(MoveTo(0, 0))
+                    .map_err(&from_io_error)?
+                    .queue(ClearCommand(ClearType::All))
+                    .map_err(&from_io_error)?
+                    .flush()
+                    .map_err(&from_io_error)?;
             }
             _ => {
                 std::io::stdout()
-                    .queue(MoveTo(0, 0))?
-                    .queue(ClearCommand(ClearType::All))?
-                    .queue(ClearCommand(ClearType::Purge))?
-                    .flush()?;
+                    .queue(MoveTo(0, 0))
+                    .map_err(&from_io_error)?
+                    .queue(ClearCommand(ClearType::All))
+                    .map_err(&from_io_error)?
+                    .queue(ClearCommand(ClearType::Purge))
+                    .map_err(&from_io_error)?
+                    .flush()
+                    .map_err(&from_io_error)?;
             }
         };
 
diff --git a/crates/nu-command/src/platform/dir_info.rs b/crates/nu-command/src/platform/dir_info.rs
index 9b8ea1929e..d96e43403b 100644
--- a/crates/nu-command/src/platform/dir_info.rs
+++ b/crates/nu-command/src/platform/dir_info.rs
@@ -1,6 +1,6 @@
 use filesize::file_real_size_fast;
 use nu_glob::Pattern;
-use nu_protocol::{record, ShellError, Signals, Span, Value};
+use nu_protocol::{record, shell_error::io::IoError, ShellError, Signals, Span, Value};
 use std::path::PathBuf;
 
 #[derive(Debug, Clone)]
@@ -77,7 +77,7 @@ impl FileInfo {
                     long,
                 })
             }
-            Err(e) => Err(e.into()),
+            Err(e) => Err(IoError::new(e.kind(), tag, path).into()),
         }
     }
 }
@@ -91,6 +91,7 @@ impl DirInfo {
         signals: &Signals,
     ) -> Result<Self, ShellError> {
         let path = path.into();
+        let from_io_error = IoError::factory(span, path.as_path());
 
         let mut s = Self {
             dirs: Vec::new(),
@@ -99,7 +100,7 @@ impl DirInfo {
             size: 0,
             blocks: 0,
             tag: params.tag,
-            path,
+            path: path.clone(),
             long: params.long,
         };
 
@@ -108,7 +109,7 @@ impl DirInfo {
                 s.size = d.len(); // dir entry size
                 s.blocks = file_real_size_fast(&s.path, &d).ok().unwrap_or(0);
             }
-            Err(e) => s = s.add_error(e.into()),
+            Err(e) => s = s.add_error(from_io_error(e).into()),
         };
 
         match std::fs::read_dir(&s.path) {
@@ -122,13 +123,13 @@ impl DirInfo {
                                 s = s.add_dir(i.path(), depth, params, span, signals)?
                             }
                             Ok(_t) => s = s.add_file(i.path(), params),
-                            Err(e) => s = s.add_error(e.into()),
+                            Err(e) => s = s.add_error(from_io_error(e).into()),
                         },
-                        Err(e) => s = s.add_error(e.into()),
+                        Err(e) => s = s.add_error(from_io_error(e).into()),
                     }
                 }
             }
-            Err(e) => s = s.add_error(e.into()),
+            Err(e) => s = s.add_error(from_io_error(e).into()),
         }
         Ok(s)
     }
diff --git a/crates/nu-command/src/platform/input/input_.rs b/crates/nu-command/src/platform/input/input_.rs
index f792db992e..5e088098d2 100644
--- a/crates/nu-command/src/platform/input/input_.rs
+++ b/crates/nu-command/src/platform/input/input_.rs
@@ -7,6 +7,7 @@ use crossterm::{
 };
 use itertools::Itertools;
 use nu_engine::command_prelude::*;
+use nu_protocol::shell_error::io::IoError;
 
 use std::{io::Write, time::Duration};
 
@@ -69,6 +70,8 @@ impl Command for Input {
             span: call.head,
         });
 
+        let from_io_error = IoError::factory(call.head, None);
+
         if numchar.item < 1 {
             return Err(ShellError::UnsupportedInput {
                 msg: "Number of characters to read has to be positive".to_string(),
@@ -89,11 +92,11 @@ impl Command for Input {
 
         let mut buf = String::new();
 
-        crossterm::terminal::enable_raw_mode()?;
+        crossterm::terminal::enable_raw_mode().map_err(&from_io_error)?;
         // clear terminal events
-        while crossterm::event::poll(Duration::from_secs(0))? {
+        while crossterm::event::poll(Duration::from_secs(0)).map_err(&from_io_error)? {
             // If there's an event, read it to remove it from the queue
-            let _ = crossterm::event::read()?;
+            let _ = crossterm::event::read().map_err(&from_io_error)?;
         }
 
         loop {
@@ -110,10 +113,14 @@ impl Command for Input {
                                     || k.modifiers == KeyModifiers::CONTROL
                                 {
                                     if k.modifiers == KeyModifiers::CONTROL && c == 'c' {
-                                        crossterm::terminal::disable_raw_mode()?;
-                                        return Err(ShellError::IOError {
-                                            msg: "SIGINT".to_string(),
-                                        });
+                                        crossterm::terminal::disable_raw_mode()
+                                            .map_err(&from_io_error)?;
+                                        return Err(IoError::new(
+                                            std::io::ErrorKind::Interrupted,
+                                            call.head,
+                                            None,
+                                        )
+                                        .into());
                                     }
                                     continue;
                                 }
@@ -138,8 +145,8 @@ impl Command for Input {
                 },
                 Ok(_) => continue,
                 Err(event_error) => {
-                    crossterm::terminal::disable_raw_mode()?;
-                    return Err(event_error.into());
+                    crossterm::terminal::disable_raw_mode().map_err(&from_io_error)?;
+                    return Err(from_io_error(event_error).into());
                 }
             }
             if !suppress_output {
@@ -148,16 +155,18 @@ impl Command for Input {
                     std::io::stdout(),
                     terminal::Clear(ClearType::CurrentLine),
                     cursor::MoveToColumn(0),
-                )?;
+                )
+                .map_err(|err| IoError::new(err.kind(), call.head, None))?;
                 if let Some(prompt) = &prompt {
-                    execute!(std::io::stdout(), Print(prompt.to_string()))?;
+                    execute!(std::io::stdout(), Print(prompt.to_string()))
+                        .map_err(&from_io_error)?;
                 }
-                execute!(std::io::stdout(), Print(buf.to_string()))?;
+                execute!(std::io::stdout(), Print(buf.to_string())).map_err(&from_io_error)?;
             }
         }
-        crossterm::terminal::disable_raw_mode()?;
+        crossterm::terminal::disable_raw_mode().map_err(&from_io_error)?;
         if !suppress_output {
-            std::io::stdout().write_all(b"\n")?;
+            std::io::stdout().write_all(b"\n").map_err(&from_io_error)?;
         }
         match default_val {
             Some(val) if buf.is_empty() => Ok(Value::string(val, call.head).into_pipeline_data()),
diff --git a/crates/nu-command/src/platform/input/input_listen.rs b/crates/nu-command/src/platform/input/input_listen.rs
index 69e96e1966..56241d6689 100644
--- a/crates/nu-command/src/platform/input/input_listen.rs
+++ b/crates/nu-command/src/platform/input/input_listen.rs
@@ -5,6 +5,7 @@ use crossterm::event::{
 use crossterm::{execute, terminal};
 use nu_engine::command_prelude::*;
 
+use nu_protocol::shell_error::io::IoError;
 use num_traits::AsPrimitive;
 use std::io::stdout;
 
@@ -83,7 +84,7 @@ There are 4 `key_type` variants:
         let add_raw = call.has_flag(engine_state, stack, "raw")?;
         let config = engine_state.get_config();
 
-        terminal::enable_raw_mode()?;
+        terminal::enable_raw_mode().map_err(|err| IoError::new(err.kind(), head, None))?;
 
         if config.use_kitty_protocol {
             if let Ok(false) = crossterm::terminal::supports_keyboard_enhancement() {
@@ -111,7 +112,7 @@ There are 4 `key_type` variants:
             );
         }
 
-        let console_state = event_type_filter.enable_events()?;
+        let console_state = event_type_filter.enable_events(head)?;
         loop {
             let event = crossterm::event::read().map_err(|_| ShellError::GenericError {
                 error: "Error with user input".into(),
@@ -122,7 +123,7 @@ There are 4 `key_type` variants:
             })?;
             let event = parse_event(head, &event, &event_type_filter, add_raw);
             if let Some(event) = event {
-                terminal::disable_raw_mode()?;
+                terminal::disable_raw_mode().map_err(|err| IoError::new(err.kind(), head, None))?;
                 if config.use_kitty_protocol {
                     let _ = execute!(
                         std::io::stdout(),
@@ -226,17 +227,20 @@ impl EventTypeFilter {
     /// Enable capturing of all events allowed by this filter.
     /// Call [`DeferredConsoleRestore::restore`] when done capturing events to restore
     /// console state
-    fn enable_events(&self) -> Result<DeferredConsoleRestore, ShellError> {
+    fn enable_events(&self, span: Span) -> Result<DeferredConsoleRestore, ShellError> {
         if self.listen_mouse {
-            crossterm::execute!(stdout(), EnableMouseCapture)?;
+            crossterm::execute!(stdout(), EnableMouseCapture)
+                .map_err(|err| IoError::new(err.kind(), span, None))?;
         }
 
         if self.listen_paste {
-            crossterm::execute!(stdout(), EnableBracketedPaste)?;
+            crossterm::execute!(stdout(), EnableBracketedPaste)
+                .map_err(|err| IoError::new(err.kind(), span, None))?;
         }
 
         if self.listen_focus {
-            crossterm::execute!(stdout(), crossterm::event::EnableFocusChange)?;
+            crossterm::execute!(stdout(), crossterm::event::EnableFocusChange)
+                .map_err(|err| IoError::new(err.kind(), span, None))?;
         }
 
         Ok(DeferredConsoleRestore {
diff --git a/crates/nu-command/src/platform/input/list.rs b/crates/nu-command/src/platform/input/list.rs
index 7d9761f296..91a31aebd8 100644
--- a/crates/nu-command/src/platform/input/list.rs
+++ b/crates/nu-command/src/platform/input/list.rs
@@ -1,5 +1,6 @@
 use dialoguer::{console::Term, FuzzySelect, MultiSelect, Select};
 use nu_engine::command_prelude::*;
+use nu_protocol::shell_error::io::IoError;
 
 use std::fmt::{Display, Formatter};
 
@@ -141,8 +142,13 @@ impl Command for InputList {
                 .items(&options)
                 .report(false)
                 .interact_on_opt(&Term::stderr())
-                .map_err(|err| ShellError::IOError {
-                    msg: format!("{}: {}", INTERACT_ERROR, err),
+                .map_err(|dialoguer::Error::IO(err)| {
+                    IoError::new_with_additional_context(
+                        err.kind(),
+                        call.head,
+                        None,
+                        INTERACT_ERROR,
+                    )
                 })?,
             )
         } else if fuzzy {
@@ -158,8 +164,13 @@ impl Command for InputList {
                 .default(0)
                 .report(false)
                 .interact_on_opt(&Term::stderr())
-                .map_err(|err| ShellError::IOError {
-                    msg: format!("{}: {}", INTERACT_ERROR, err),
+                .map_err(|dialoguer::Error::IO(err)| {
+                    IoError::new_with_additional_context(
+                        err.kind(),
+                        call.head,
+                        None,
+                        INTERACT_ERROR,
+                    )
                 })?,
             )
         } else {
@@ -174,8 +185,13 @@ impl Command for InputList {
                 .default(0)
                 .report(false)
                 .interact_on_opt(&Term::stderr())
-                .map_err(|err| ShellError::IOError {
-                    msg: format!("{}: {}", INTERACT_ERROR, err),
+                .map_err(|dialoguer::Error::IO(err)| {
+                    IoError::new_with_additional_context(
+                        err.kind(),
+                        call.head,
+                        None,
+                        INTERACT_ERROR,
+                    )
                 })?,
             )
         };
diff --git a/crates/nu-command/src/platform/term/term_query.rs b/crates/nu-command/src/platform/term/term_query.rs
index 2cb11f1dc3..167f660c22 100644
--- a/crates/nu-command/src/platform/term/term_query.rs
+++ b/crates/nu-command/src/platform/term/term_query.rs
@@ -4,6 +4,7 @@ use std::{
 };
 
 use nu_engine::command_prelude::*;
+use nu_protocol::shell_error::io::IoError;
 
 const CTRL_C: u8 = 3;
 
@@ -98,15 +99,19 @@ The `prefix` is not included in the output."
         let prefix = prefix.unwrap_or_default();
         let terminator: Option<Vec<u8>> = call.get_flag(engine_state, stack, "terminator")?;
 
-        crossterm::terminal::enable_raw_mode()?;
+        crossterm::terminal::enable_raw_mode()
+            .map_err(|err| IoError::new(err.kind(), call.head, None))?;
         scopeguard::defer! {
             let _ = crossterm::terminal::disable_raw_mode();
         }
 
         // clear terminal events
-        while crossterm::event::poll(Duration::from_secs(0))? {
+        while crossterm::event::poll(Duration::from_secs(0))
+            .map_err(|err| IoError::new(err.kind(), call.head, None))?
+        {
             // If there's an event, read it to remove it from the queue
-            let _ = crossterm::event::read()?;
+            let _ = crossterm::event::read()
+                .map_err(|err| IoError::new(err.kind(), call.head, None))?;
         }
 
         let mut b = [0u8; 1];
@@ -115,13 +120,19 @@ The `prefix` is not included in the output."
 
         {
             let mut stdout = std::io::stdout().lock();
-            stdout.write_all(&query)?;
-            stdout.flush()?;
+            stdout
+                .write_all(&query)
+                .map_err(|err| IoError::new(err.kind(), call.head, None))?;
+            stdout
+                .flush()
+                .map_err(|err| IoError::new(err.kind(), call.head, None))?;
         }
 
         // Validate and skip prefix
         for bc in prefix {
-            stdin.read_exact(&mut b)?;
+            stdin
+                .read_exact(&mut b)
+                .map_err(|err| IoError::new(err.kind(), call.head, None))?;
             if b[0] != bc {
                 return Err(ShellError::GenericError {
                     error: "Input did not begin with expected sequence".into(),
@@ -138,7 +149,9 @@ The `prefix` is not included in the output."
 
         if let Some(terminator) = terminator {
             loop {
-                stdin.read_exact(&mut b)?;
+                stdin
+                    .read_exact(&mut b)
+                    .map_err(|err| IoError::new(err.kind(), call.head, None))?;
 
                 if b[0] == CTRL_C {
                     return Err(ShellError::InterruptedByUser {
@@ -158,7 +171,9 @@ The `prefix` is not included in the output."
             }
         } else {
             loop {
-                stdin.read_exact(&mut b)?;
+                stdin
+                    .read_exact(&mut b)
+                    .map_err(|err| IoError::new(err.kind(), call.head, None))?;
 
                 if b[0] == CTRL_C {
                     break;
diff --git a/crates/nu-command/src/strings/str_/join.rs b/crates/nu-command/src/strings/str_/join.rs
index e40ffb9417..e500da8343 100644
--- a/crates/nu-command/src/strings/str_/join.rs
+++ b/crates/nu-command/src/strings/str_/join.rs
@@ -1,5 +1,5 @@
 use nu_engine::command_prelude::*;
-use nu_protocol::Signals;
+use nu_protocol::{shell_error::io::IoError, Signals};
 
 use std::io::Write;
 
@@ -94,13 +94,15 @@ fn run(
         Signals::empty(),
         ByteStreamType::String,
         move |buffer| {
+            let from_io_error = IoError::factory(span, None);
+
             // Write each input to the buffer
             if let Some(value) = iter.next() {
                 // Write the separator if this is not the first
                 if first {
                     first = false;
                 } else if let Some(separator) = &separator {
-                    write!(buffer, "{}", separator)?;
+                    write!(buffer, "{}", separator).map_err(&from_io_error)?;
                 }
 
                 match value {
@@ -109,8 +111,9 @@ fn run(
                     }
                     // Hmm, not sure what we actually want.
                     // `to_expanded_string` formats dates as human readable which feels funny.
-                    Value::Date { val, .. } => write!(buffer, "{val:?}")?,
-                    value => write!(buffer, "{}", value.to_expanded_string("\n", &config))?,
+                    Value::Date { val, .. } => write!(buffer, "{val:?}").map_err(&from_io_error)?,
+                    value => write!(buffer, "{}", value.to_expanded_string("\n", &config))
+                        .map_err(&from_io_error)?,
                 }
                 Ok(true)
             } else {
diff --git a/crates/nu-command/src/system/nu_check.rs b/crates/nu-command/src/system/nu_check.rs
index ff3047a490..ca0d09965a 100644
--- a/crates/nu-command/src/system/nu_check.rs
+++ b/crates/nu-command/src/system/nu_check.rs
@@ -1,7 +1,10 @@
 use nu_engine::{command_prelude::*, find_in_dirs_env, get_dirs_var_from_call};
 use nu_parser::{parse, parse_module_block, parse_module_file_or_dir, unescape_unquote_string};
-use nu_protocol::engine::{FileStack, StateWorkingSet};
-use std::path::Path;
+use nu_protocol::{
+    engine::{FileStack, StateWorkingSet},
+    shell_error::io::IoError,
+};
+use std::path::{Path, PathBuf};
 
 #[derive(Clone)]
 pub struct NuCheck;
@@ -89,17 +92,15 @@ impl Command for NuCheck {
                         stack,
                         get_dirs_var_from_call(stack, call),
                     ) {
-                        Ok(path) => {
-                            if let Some(path) = path {
-                                path
-                            } else {
-                                return Err(ShellError::FileNotFound {
-                                    file: path_str.item,
-                                    span: path_span,
-                                });
-                            }
+                        Ok(Some(path)) => path,
+                        Ok(None) => {
+                            return Err(ShellError::Io(IoError::new(
+                                std::io::ErrorKind::NotFound,
+                                path_span,
+                                PathBuf::from(path_str.item),
+                            )))
                         }
-                        Err(error) => return Err(error),
+                        Err(err) => return Err(err),
                     };
 
                     let result = if as_module || path.is_dir() {
@@ -258,13 +259,13 @@ fn parse_file_script(
 ) -> Result<PipelineData, ShellError> {
     let filename = check_path(working_set, path_span, call_head)?;
 
-    if let Ok(contents) = std::fs::read(path) {
-        parse_script(working_set, Some(&filename), &contents, is_debug, call_head)
-    } else {
-        Err(ShellError::IOErrorSpanned {
-            msg: "Could not read path".to_string(),
-            span: path_span,
-        })
+    match std::fs::read(path) {
+        Ok(contents) => parse_script(working_set, Some(&filename), &contents, is_debug, call_head),
+        Err(err) => Err(ShellError::Io(IoError::new(
+            err.kind(),
+            path_span,
+            PathBuf::from(path),
+        ))),
     }
 }
 
diff --git a/crates/nu-command/src/system/registry_query.rs b/crates/nu-command/src/system/registry_query.rs
index 3365a7d440..cadb3aac29 100644
--- a/crates/nu-command/src/system/registry_query.rs
+++ b/crates/nu-command/src/system/registry_query.rs
@@ -1,5 +1,6 @@
 use nu_engine::command_prelude::*;
 
+use nu_protocol::shell_error::io::IoError;
 use windows::{core::PCWSTR, Win32::System::Environment::ExpandEnvironmentStringsW};
 use winreg::{enums::*, types::FromRegValue, RegKey};
 
@@ -90,7 +91,9 @@ fn registry_query(
     let registry_value: Option<Spanned<String>> = call.opt(engine_state, stack, 1)?;
 
     let reg_hive = get_reg_hive(engine_state, stack, call)?;
-    let reg_key = reg_hive.open_subkey(registry_key.item)?;
+    let reg_key = reg_hive
+        .open_subkey(registry_key.item)
+        .map_err(|err| IoError::new(err.kind(), *registry_key_span, None))?;
 
     if registry_value.is_none() {
         let mut reg_values = vec![];
diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index b917577ba9..70e423387a 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -2,7 +2,8 @@ use nu_cmd_base::hook::eval_hook;
 use nu_engine::{command_prelude::*, env_to_strings};
 use nu_path::{dots::expand_ndots_safe, expand_tilde, AbsolutePath};
 use nu_protocol::{
-    did_you_mean, process::ChildProcess, ByteStream, NuGlob, OutDest, Signals, UseAnsiColoring,
+    did_you_mean, process::ChildProcess, shell_error::io::IoError, ByteStream, NuGlob, OutDest,
+    Signals, UseAnsiColoring,
 };
 use nu_system::ForegroundChild;
 use nu_utils::IgnoreCaseExt;
@@ -169,7 +170,9 @@ impl Command for External {
 
             // canonicalize the path to the script so that tests pass
             let canon_path = if let Ok(cwd) = engine_state.cwd_as_string(None) {
-                canonicalize_with(&expanded_name, cwd)?
+                canonicalize_with(&expanded_name, cwd).map_err(|err| {
+                    IoError::new(err.kind(), call.head, PathBuf::from(&expanded_name))
+                })?
             } else {
                 // If we can't get the current working directory, just provide the expanded name
                 expanded_name
@@ -191,13 +194,22 @@ impl Command for External {
         let stdout = stack.stdout();
         let stderr = stack.stderr();
         let merged_stream = if matches!(stdout, OutDest::Pipe) && matches!(stderr, OutDest::Pipe) {
-            let (reader, writer) = os_pipe::pipe()?;
-            command.stdout(writer.try_clone()?);
+            let (reader, writer) =
+                os_pipe::pipe().map_err(|err| IoError::new(err.kind(), call.head, None))?;
+            command.stdout(
+                writer
+                    .try_clone()
+                    .map_err(|err| IoError::new(err.kind(), call.head, None))?,
+            );
             command.stderr(writer);
             Some(reader)
         } else {
-            command.stdout(Stdio::try_from(stdout)?);
-            command.stderr(Stdio::try_from(stderr)?);
+            command.stdout(
+                Stdio::try_from(stdout).map_err(|err| IoError::new(err.kind(), call.head, None))?,
+            );
+            command.stderr(
+                Stdio::try_from(stderr).map_err(|err| IoError::new(err.kind(), call.head, None))?,
+            );
             None
         };
 
@@ -231,13 +243,22 @@ impl Command for External {
         // Spawn the child process. On Unix, also put the child process to
         // foreground if we're in an interactive session.
         #[cfg(windows)]
-        let mut child = ForegroundChild::spawn(command)?;
+        let child = ForegroundChild::spawn(command);
         #[cfg(unix)]
-        let mut child = ForegroundChild::spawn(
+        let child = ForegroundChild::spawn(
             command,
             engine_state.is_interactive,
             &engine_state.pipeline_externals_state,
-        )?;
+        );
+
+        let mut child = child.map_err(|err| {
+            IoError::new_with_additional_context(
+                err.kind(),
+                Span::unknown(),
+                None,
+                "Could not spawn foreground child",
+            )
+        })?;
 
         // If we need to copy data into the child process, do it now.
         if let Some(data) = data_to_copy_into_stdin {
@@ -249,7 +270,14 @@ impl Command for External {
                 .spawn(move || {
                     let _ = write_pipeline_data(engine_state, stack, data, stdin);
                 })
-                .err_span(call.head)?;
+                .map_err(|err| {
+                    IoError::new_with_additional_context(
+                        err.kind(),
+                        call.head,
+                        None,
+                        "Could not spawn external stdin worker",
+                    )
+                })?;
         }
 
         // Wrap the output into a `PipelineData::ByteStream`.
@@ -414,7 +442,14 @@ fn write_pipeline_data(
     if let PipelineData::ByteStream(stream, ..) = data {
         stream.write_to(writer)?;
     } else if let PipelineData::Value(Value::Binary { val, .. }, ..) = data {
-        writer.write_all(&val)?;
+        writer.write_all(&val).map_err(|err| {
+            IoError::new_with_additional_context(
+                err.kind(),
+                Span::unknown(),
+                None,
+                "Could not write pipeline data",
+            )
+        })?;
     } else {
         stack.start_collect_value();
 
@@ -428,7 +463,14 @@ fn write_pipeline_data(
         // Write the output.
         for value in output {
             let bytes = value.coerce_into_binary()?;
-            writer.write_all(&bytes)?;
+            writer.write_all(&bytes).map_err(|err| {
+                IoError::new_with_additional_context(
+                    err.kind(),
+                    Span::unknown(),
+                    None,
+                    "Could not write pipeline data",
+                )
+            })?;
         }
     }
     Ok(())
diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
index bac035f94a..147555558e 100644
--- a/crates/nu-command/src/viewers/table.rs
+++ b/crates/nu-command/src/viewers/table.rs
@@ -13,7 +13,8 @@ use nu_engine::{command_prelude::*, env_to_string};
 use nu_path::form::Absolute;
 use nu_pretty_hex::HexConfig;
 use nu_protocol::{
-    ByteStream, Config, DataSource, ListStream, PipelineMetadata, Signals, TableMode, ValueIterator,
+    shell_error::io::IoError, ByteStream, Config, DataSource, ListStream, PipelineMetadata,
+    Signals, TableMode, ValueIterator,
 };
 use nu_table::{
     common::configure_table, CollapsedTable, ExpandedTable, JustTable, NuRecordsValue, NuTable,
@@ -518,7 +519,7 @@ fn pretty_hex_stream(stream: ByteStream, span: Span) -> ByteStream {
                 (&mut reader)
                     .take(cfg.width as u64)
                     .read_to_end(&mut read_buf)
-                    .err_span(span)?;
+                    .map_err(|err| IoError::new(err.kind(), span, None))?;
 
                 if !read_buf.is_empty() {
                     nu_pretty_hex::hex_write(&mut write_buf, &read_buf, cfg, Some(true))
diff --git a/crates/nu-command/tests/commands/cd.rs b/crates/nu-command/tests/commands/cd.rs
index 1b8e2dad5a..7dd648d135 100644
--- a/crates/nu-command/tests/commands/cd.rs
+++ b/crates/nu-command/tests/commands/cd.rs
@@ -188,7 +188,7 @@ fn filesystem_not_a_directory() {
             actual.err
         );
         assert!(
-            actual.err.contains("is not a directory"),
+            actual.err.contains("nu::shell::io::not_a_directory"),
             "actual={:?}",
             actual.err
         );
@@ -210,7 +210,7 @@ fn filesystem_directory_not_found() {
             actual.err
         );
         assert!(
-            actual.err.contains("directory not found"),
+            actual.err.contains("nu::shell::io::not_found"),
             "actual={:?}",
             actual.err
         );
@@ -282,7 +282,7 @@ fn cd_permission_denied_folder() {
                 cd banned
             "
         );
-        assert!(actual.err.contains("Cannot change directory to"));
+        assert!(actual.err.contains("nu::shell::io::permission_denied"));
         nu!(
             cwd: dirs.test(),
             "
diff --git a/crates/nu-command/tests/commands/du.rs b/crates/nu-command/tests/commands/du.rs
index c88eb546be..5289a1cc95 100644
--- a/crates/nu-command/tests/commands/du.rs
+++ b/crates/nu-command/tests/commands/du.rs
@@ -93,7 +93,7 @@ fn du_with_multiple_path() {
 
     // report errors if one path not exists
     let actual = nu!(cwd: "tests/fixtures", "du cp asdf | get path | path basename");
-    assert!(actual.err.contains("directory not found"));
+    assert!(actual.err.contains("nu::shell::io::not_found"));
     assert!(!actual.status.success());
 
     // du with spreading empty list should returns nothing.
diff --git a/crates/nu-command/tests/commands/ls.rs b/crates/nu-command/tests/commands/ls.rs
index 416a6aaf7f..736a504935 100644
--- a/crates/nu-command/tests/commands/ls.rs
+++ b/crates/nu-command/tests/commands/ls.rs
@@ -610,7 +610,7 @@ fn can_list_system_folder() {
 fn list_a_directory_not_exists() {
     Playground::setup("ls_test_directory_not_exists", |dirs, _sandbox| {
         let actual = nu!(cwd: dirs.test(), "ls a_directory_not_exists");
-        assert!(actual.err.contains("directory not found"));
+        assert!(actual.err.contains("nu::shell::io::not_found"));
     })
 }
 
@@ -735,7 +735,7 @@ fn list_with_tilde() {
         assert!(actual.out.contains("f2.txt"));
         assert!(actual.out.contains("~tilde"));
         let actual = nu!(cwd: dirs.test(), "ls ~tilde");
-        assert!(actual.err.contains("does not exist"));
+        assert!(actual.err.contains("nu::shell::io::not_found"));
 
         // pass variable
         let actual = nu!(cwd: dirs.test(), "let f = '~tilde'; ls $f");
@@ -762,7 +762,7 @@ fn list_with_multiple_path() {
 
         // report errors if one path not exists
         let actual = nu!(cwd: dirs.test(), "ls asdf f1.txt");
-        assert!(actual.err.contains("directory not found"));
+        assert!(actual.err.contains("nu::shell::io::not_found"));
         assert!(!actual.status.success());
 
         // ls with spreading empty list should returns nothing.
diff --git a/crates/nu-command/tests/commands/move_/umv.rs b/crates/nu-command/tests/commands/move_/umv.rs
index 98e2a753bf..82a2091c13 100644
--- a/crates/nu-command/tests/commands/move_/umv.rs
+++ b/crates/nu-command/tests/commands/move_/umv.rs
@@ -202,7 +202,7 @@ fn errors_if_source_doesnt_exist() {
             cwd: dirs.test(),
             "mv non-existing-file test_folder/"
         );
-        assert!(actual.err.contains("Directory not found"));
+        assert!(actual.err.contains("nu::shell::io::not_found"));
     })
 }
 
diff --git a/crates/nu-command/tests/commands/network/http/delete.rs b/crates/nu-command/tests/commands/network/http/delete.rs
index ec466944de..c503745346 100644
--- a/crates/nu-command/tests/commands/network/http/delete.rs
+++ b/crates/nu-command/tests/commands/network/http/delete.rs
@@ -140,10 +140,6 @@ fn http_delete_timeout() {
         format!("http delete --max-time 100ms {url}", url = server.url()).as_str()
     ));
 
-    assert!(&actual.err.contains("nu::shell::network_failure"));
-
-    #[cfg(not(target_os = "windows"))]
-    assert!(&actual.err.contains("timed out reading response"));
-    #[cfg(target_os = "windows")]
-    assert!(&actual.err.contains(super::WINDOWS_ERROR_TIMEOUT_SLOW_LINK));
+    assert!(&actual.err.contains("nu::shell::io::timed_out"));
+    assert!(&actual.err.contains("Timed out"));
 }
diff --git a/crates/nu-command/tests/commands/network/http/get.rs b/crates/nu-command/tests/commands/network/http/get.rs
index a4245ee4db..a789f1e93a 100644
--- a/crates/nu-command/tests/commands/network/http/get.rs
+++ b/crates/nu-command/tests/commands/network/http/get.rs
@@ -334,10 +334,6 @@ fn http_get_timeout() {
         format!("http get --max-time 100ms {url}", url = server.url()).as_str()
     ));
 
-    assert!(&actual.err.contains("nu::shell::network_failure"));
-
-    #[cfg(not(target_os = "windows"))]
-    assert!(&actual.err.contains("timed out reading response"));
-    #[cfg(target_os = "windows")]
-    assert!(&actual.err.contains(super::WINDOWS_ERROR_TIMEOUT_SLOW_LINK));
+    assert!(&actual.err.contains("nu::shell::io::timed_out"));
+    assert!(&actual.err.contains("Timed out"));
 }
diff --git a/crates/nu-command/tests/commands/network/http/mod.rs b/crates/nu-command/tests/commands/network/http/mod.rs
index 07a042f674..4a96a9c5ea 100644
--- a/crates/nu-command/tests/commands/network/http/mod.rs
+++ b/crates/nu-command/tests/commands/network/http/mod.rs
@@ -5,14 +5,3 @@ mod options;
 mod patch;
 mod post;
 mod put;
-
-/// String representation of the Windows error code for timeouts on slow links.
-///
-/// Use this constant in tests instead of matching partial error message content,
-/// such as `"did not properly respond after a period of time"`, which can vary by language.
-/// The specific string `"(os error 10060)"` is consistent across all locales, as it represents
-/// the raw error code rather than localized text.
-///
-/// For more details, see the [Microsoft docs](https://learn.microsoft.com/en-us/troubleshoot/windows-client/networking/10060-connection-timed-out-with-proxy-server).
-#[cfg(all(test, windows))]
-const WINDOWS_ERROR_TIMEOUT_SLOW_LINK: &str = "(os error 10060)";
diff --git a/crates/nu-command/tests/commands/network/http/options.rs b/crates/nu-command/tests/commands/network/http/options.rs
index cbe9c7bd8e..92ce747690 100644
--- a/crates/nu-command/tests/commands/network/http/options.rs
+++ b/crates/nu-command/tests/commands/network/http/options.rs
@@ -59,10 +59,6 @@ fn http_options_timeout() {
         format!("http options --max-time 100ms {url}", url = server.url()).as_str()
     ));
 
-    assert!(&actual.err.contains("nu::shell::network_failure"));
-
-    #[cfg(not(target_os = "windows"))]
-    assert!(&actual.err.contains("timed out reading response"));
-    #[cfg(target_os = "windows")]
-    assert!(&actual.err.contains(super::WINDOWS_ERROR_TIMEOUT_SLOW_LINK));
+    assert!(&actual.err.contains("nu::shell::io::timed_out"));
+    assert!(&actual.err.contains("Timed out"));
 }
diff --git a/crates/nu-command/tests/commands/network/http/patch.rs b/crates/nu-command/tests/commands/network/http/patch.rs
index 660f335864..6b1ed54d38 100644
--- a/crates/nu-command/tests/commands/network/http/patch.rs
+++ b/crates/nu-command/tests/commands/network/http/patch.rs
@@ -184,10 +184,6 @@ fn http_patch_timeout() {
         .as_str()
     ));
 
-    assert!(&actual.err.contains("nu::shell::network_failure"));
-
-    #[cfg(not(target_os = "windows"))]
-    assert!(&actual.err.contains("timed out reading response"));
-    #[cfg(target_os = "windows")]
-    assert!(&actual.err.contains(super::WINDOWS_ERROR_TIMEOUT_SLOW_LINK));
+    assert!(&actual.err.contains("nu::shell::io::timed_out"));
+    assert!(&actual.err.contains("Timed out"));
 }
diff --git a/crates/nu-command/tests/commands/network/http/post.rs b/crates/nu-command/tests/commands/network/http/post.rs
index 99ef44acaf..f90efba278 100644
--- a/crates/nu-command/tests/commands/network/http/post.rs
+++ b/crates/nu-command/tests/commands/network/http/post.rs
@@ -298,10 +298,6 @@ fn http_post_timeout() {
         .as_str()
     ));
 
-    assert!(&actual.err.contains("nu::shell::network_failure"));
-
-    #[cfg(not(target_os = "windows"))]
-    assert!(&actual.err.contains("timed out reading response"));
-    #[cfg(target_os = "windows")]
-    assert!(&actual.err.contains(super::WINDOWS_ERROR_TIMEOUT_SLOW_LINK));
+    assert!(&actual.err.contains("nu::shell::io::timed_out"));
+    assert!(&actual.err.contains("Timed out"));
 }
diff --git a/crates/nu-command/tests/commands/network/http/put.rs b/crates/nu-command/tests/commands/network/http/put.rs
index 3f3bae3998..b66330a18b 100644
--- a/crates/nu-command/tests/commands/network/http/put.rs
+++ b/crates/nu-command/tests/commands/network/http/put.rs
@@ -184,10 +184,6 @@ fn http_put_timeout() {
         .as_str()
     ));
 
-    assert!(&actual.err.contains("nu::shell::network_failure"));
-
-    #[cfg(not(target_os = "windows"))]
-    assert!(&actual.err.contains("timed out reading response"));
-    #[cfg(target_os = "windows")]
-    assert!(&actual.err.contains(super::WINDOWS_ERROR_TIMEOUT_SLOW_LINK));
+    assert!(&actual.err.contains("nu::shell::io::timed_out"));
+    assert!(&actual.err.contains("Timed out"));
 }
diff --git a/crates/nu-command/tests/commands/nu_check.rs b/crates/nu-command/tests/commands/nu_check.rs
index ee8bf32c24..971349778e 100644
--- a/crates/nu-command/tests/commands/nu_check.rs
+++ b/crates/nu-command/tests/commands/nu_check.rs
@@ -172,7 +172,7 @@ fn file_not_exist() {
             "
         ));
 
-        assert!(actual.err.contains("file not found"));
+        assert!(actual.err.contains("nu::shell::io::not_found"));
     })
 }
 
diff --git a/crates/nu-command/tests/commands/open.rs b/crates/nu-command/tests/commands/open.rs
index 986b621c99..09df04b97a 100644
--- a/crates/nu-command/tests/commands/open.rs
+++ b/crates/nu-command/tests/commands/open.rs
@@ -1,3 +1,5 @@
+use std::path::PathBuf;
+
 use nu_test_support::fs::Stub::EmptyFile;
 use nu_test_support::fs::Stub::FileWithContent;
 use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
@@ -248,14 +250,13 @@ fn errors_if_file_not_found() {
     //
     // This seems to be not directly affected by localization compared to the OS
     // provided error message
-    let expected = "File not found";
 
-    assert!(
-        actual.err.contains(expected),
-        "Error:\n{}\ndoes not contain{}",
-        actual.err,
-        expected
-    );
+    assert!(actual.err.contains("nu::shell::io::not_found"));
+    assert!(actual.err.contains(
+        &PathBuf::from_iter(["tests", "fixtures", "formats", "i_dont_exist.txt"])
+            .display()
+            .to_string()
+    ));
 }
 
 #[test]
diff --git a/crates/nu-command/tests/commands/path/self_.rs b/crates/nu-command/tests/commands/path/self_.rs
index b0c47195c8..6a70f72c77 100644
--- a/crates/nu-command/tests/commands/path/self_.rs
+++ b/crates/nu-command/tests/commands/path/self_.rs
@@ -60,5 +60,5 @@ fn self_path_runtime() {
 fn self_path_repl() {
     let actual = nu!("const foo = path self; $foo");
     assert!(!actual.status.success());
-    assert!(actual.err.contains("nu::shell::file_not_found"));
+    assert!(actual.err.contains("nu::shell::io::not_found"));
 }
diff --git a/crates/nu-command/tests/commands/rm.rs b/crates/nu-command/tests/commands/rm.rs
index fdd7258bd4..3bfc093bd0 100644
--- a/crates/nu-command/tests/commands/rm.rs
+++ b/crates/nu-command/tests/commands/rm.rs
@@ -454,14 +454,8 @@ fn rm_prints_filenames_on_error() {
 
         assert!(files_exist_at(&file_names, test_dir));
         for file_name in file_names {
-            let path = test_dir.join(file_name);
-            let substr = format!("Could not delete {}", path.to_string_lossy());
-            assert!(
-                actual.err.contains(&substr),
-                "Matching: {}\n=== Command stderr:\n{}\n=== End stderr",
-                substr,
-                actual.err
-            );
+            assert!(actual.err.contains("nu::shell::io::permission_denied"));
+            assert!(actual.err.contains(file_name));
         }
     });
 }
diff --git a/crates/nu-command/tests/commands/save.rs b/crates/nu-command/tests/commands/save.rs
index 8c2ea535b7..e37985eb38 100644
--- a/crates/nu-command/tests/commands/save.rs
+++ b/crates/nu-command/tests/commands/save.rs
@@ -532,5 +532,5 @@ fn force_save_to_dir() {
         "aaa" | save -f ..
         "#);
 
-    assert!(actual.err.contains("Is a directory"));
+    assert!(actual.err.contains("nu::shell::io::is_a_directory"));
 }
diff --git a/crates/nu-engine/src/command_prelude.rs b/crates/nu-engine/src/command_prelude.rs
index 0c5c250a27..9b9ed40477 100644
--- a/crates/nu-engine/src/command_prelude.rs
+++ b/crates/nu-engine/src/command_prelude.rs
@@ -2,7 +2,9 @@ pub use crate::CallExt;
 pub use nu_protocol::{
     ast::CellPath,
     engine::{Call, Command, EngineState, Stack, StateWorkingSet},
-    record, ByteStream, ByteStreamType, Category, ErrSpan, Example, IntoInterruptiblePipelineData,
+    record,
+    shell_error::io::IoError,
+    ByteStream, ByteStreamType, Category, ErrSpan, Example, IntoInterruptiblePipelineData,
     IntoPipelineData, IntoSpanned, IntoValue, PipelineData, Record, ShellError, Signature, Span,
     Spanned, SyntaxShape, Type, Value,
 };
diff --git a/crates/nu-engine/src/env.rs b/crates/nu-engine/src/env.rs
index 345d81d6f7..0242d0b6b0 100644
--- a/crates/nu-engine/src/env.rs
+++ b/crates/nu-engine/src/env.rs
@@ -3,6 +3,7 @@ use nu_path::canonicalize_with;
 use nu_protocol::{
     ast::Expr,
     engine::{Call, EngineState, Stack, StateWorkingSet},
+    shell_error::io::IoError,
     ShellError, Span, Type, Value, VarId,
 };
 use std::{
@@ -218,9 +219,12 @@ pub fn current_dir(engine_state: &EngineState, stack: &Stack) -> Result<PathBuf,
     // We're using `canonicalize_with` instead of `fs::canonicalize()` because
     // we still need to simplify Windows paths. "." is safe because `cwd` should
     // be an absolute path already.
-    canonicalize_with(&cwd, ".").map_err(|_| ShellError::DirectoryNotFound {
-        dir: cwd.to_string_lossy().to_string(),
-        span: Span::unknown(),
+    canonicalize_with(&cwd, ".").map_err(|err| {
+        ShellError::Io(IoError::new(
+            err.kind(),
+            Span::unknown(),
+            PathBuf::from(cwd),
+        ))
     })
 }
 
@@ -234,9 +238,12 @@ pub fn current_dir_const(working_set: &StateWorkingSet) -> Result<PathBuf, Shell
     // We're using `canonicalize_with` instead of `fs::canonicalize()` because
     // we still need to simplify Windows paths. "." is safe because `cwd` should
     // be an absolute path already.
-    canonicalize_with(&cwd, ".").map_err(|_| ShellError::DirectoryNotFound {
-        dir: cwd.to_string_lossy().to_string(),
-        span: Span::unknown(),
+    canonicalize_with(&cwd, ".").map_err(|err| {
+        ShellError::Io(IoError::new(
+            err.kind(),
+            Span::unknown(),
+            PathBuf::from(cwd),
+        ))
     })
 }
 
diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index 20672484fa..035f6a394d 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -8,9 +8,10 @@ use nu_protocol::{
         Argument, Closure, EngineState, ErrorHandler, Matcher, Redirection, Stack, StateWorkingSet,
     },
     ir::{Call, DataSlice, Instruction, IrAstRef, IrBlock, Literal, RedirectMode},
-    DataSource, DeclId, ErrSpan, Flag, IntoPipelineData, IntoSpanned, ListStream, OutDest,
-    PipelineData, PipelineMetadata, PositionalArg, Range, Record, RegId, ShellError, Signals,
-    Signature, Span, Spanned, Type, Value, VarId, ENV_VARIABLE_ID,
+    shell_error::io::IoError,
+    DataSource, DeclId, Flag, IntoPipelineData, IntoSpanned, ListStream, OutDest, PipelineData,
+    PipelineMetadata, PositionalArg, Range, Record, RegId, ShellError, Signals, Signature, Span,
+    Spanned, Type, Value, VarId, ENV_VARIABLE_ID,
 };
 use nu_utils::IgnoreCaseExt;
 
@@ -1489,8 +1490,8 @@ fn open_file(ctx: &EvalContext<'_>, path: &Value, append: bool) -> Result<Arc<Fi
     }
     let file = options
         .create(true)
-        .open(path_expanded)
-        .err_span(path.span())?;
+        .open(&path_expanded)
+        .map_err(|err| IoError::new(err.kind(), path.span(), path_expanded))?;
     Ok(Arc::new(file))
 }
 
diff --git a/crates/nu-engine/src/glob_from.rs b/crates/nu-engine/src/glob_from.rs
index 3765ab7c7b..1120499b43 100644
--- a/crates/nu-engine/src/glob_from.rs
+++ b/crates/nu-engine/src/glob_from.rs
@@ -1,9 +1,8 @@
 use nu_glob::MatchOptions;
 use nu_path::{canonicalize_with, expand_path_with};
-use nu_protocol::{NuGlob, ShellError, Span, Spanned};
+use nu_protocol::{shell_error::io::IoError, NuGlob, ShellError, Span, Spanned};
 use std::{
     fs,
-    io::ErrorKind,
     path::{Component, Path, PathBuf},
 };
 
@@ -28,6 +27,7 @@ pub fn glob_from(
     ShellError,
 > {
     let no_glob_for_pattern = matches!(pattern.item, NuGlob::DoNotExpand(_));
+    let pattern_span = pattern.span;
     let (prefix, pattern) = if nu_glob::is_glob(pattern.item.as_ref()) {
         // Pattern contains glob, split it
         let mut p = PathBuf::new();
@@ -80,22 +80,7 @@ pub fn glob_from(
                 }
                 Ok(p) => p,
                 Err(err) => {
-                    return match err.kind() {
-                        ErrorKind::PermissionDenied => Err(ShellError::GenericError {
-                            error: "Permission denied".into(),
-                            msg: err.to_string(),
-                            span: None,
-                            help: None,
-                            inner: vec![],
-                        }),
-                        // Previously, all these errors were treated as "directory not found."
-                        // Now, permission denied errors are handled separately.
-                        // TODO: Refine handling of I/O errors for more precise responses.
-                        _ => Err(ShellError::DirectoryNotFound {
-                            dir: path.to_string_lossy().to_string(),
-                            span: pattern.span,
-                        }),
-                    };
+                    return Err(IoError::new(err.kind(), pattern_span, path).into());
                 }
             };
             (path.parent().map(|parent| parent.to_path_buf()), path)
diff --git a/crates/nu-explore/src/nu_common/command.rs b/crates/nu-explore/src/nu_common/command.rs
index ef0157ac67..a41e7cf45b 100644
--- a/crates/nu-explore/src/nu_common/command.rs
+++ b/crates/nu-explore/src/nu_common/command.rs
@@ -14,16 +14,24 @@ pub fn run_command_with_value(
     stack: &mut Stack,
 ) -> Result<PipelineData, ShellError> {
     if is_ignored_command(command) {
-        return Err(ShellError::IOError {
-            msg: String::from("the command is ignored"),
+        return Err(ShellError::GenericError {
+            error: "Command ignored".to_string(),
+            msg: "the command is ignored".to_string(),
+            span: None,
+            help: None,
+            inner: vec![],
         });
     }
 
     let pipeline = PipelineData::Value(input.clone(), None);
     let pipeline = run_nu_command(engine_state, stack, command, pipeline)?;
     if let PipelineData::Value(Value::Error { error, .. }, ..) = pipeline {
-        Err(ShellError::IOError {
+        Err(ShellError::GenericError {
+            error: "Error from pipeline".to_string(),
             msg: error.to_string(),
+            span: None,
+            help: None,
+            inner: vec![*error],
         })
     } else {
         Ok(pipeline)
@@ -69,8 +77,12 @@ fn eval_source2(
         );
 
         if let Some(err) = working_set.parse_errors.first() {
-            return Err(ShellError::IOError {
+            return Err(ShellError::GenericError {
+                error: "Parse error".to_string(),
                 msg: err.to_string(),
+                span: None,
+                help: None,
+                inner: vec![],
             });
         }
 
@@ -79,8 +91,12 @@ fn eval_source2(
 
     // We need to merge different info other wise things like PIPEs etc will not work.
     if let Err(err) = engine_state.merge_delta(delta) {
-        return Err(ShellError::IOError {
+        return Err(ShellError::GenericError {
+            error: "Merge error".to_string(),
             msg: err.to_string(),
+            span: None,
+            help: None,
+            inner: vec![err],
         });
     }
 
diff --git a/crates/nu-plugin-core/src/communication_mode/mod.rs b/crates/nu-plugin-core/src/communication_mode/mod.rs
index 576cfe866c..19d89363bd 100644
--- a/crates/nu-plugin-core/src/communication_mode/mod.rs
+++ b/crates/nu-plugin-core/src/communication_mode/mod.rs
@@ -2,7 +2,8 @@ use std::ffi::OsStr;
 use std::io::{Stdin, Stdout};
 use std::process::{Child, ChildStdin, ChildStdout, Command, Stdio};
 
-use nu_protocol::ShellError;
+use nu_protocol::shell_error::io::IoError;
+use nu_protocol::{ShellError, Span};
 
 #[cfg(feature = "local-socket")]
 mod local_socket;
@@ -84,8 +85,15 @@ impl CommunicationMode {
 
                 let listener = interpret_local_socket_name(name)
                     .and_then(|name| ListenerOptions::new().name(name).create_sync())
-                    .map_err(|err| ShellError::IOError {
-                        msg: format!("failed to open socket for plugin: {err}"),
+                    .map_err(|err| {
+                        IoError::new_internal(
+                            err.kind(),
+                            format!(
+                                "Could not interpret local socket name {:?}",
+                                name.to_string_lossy()
+                            ),
+                            nu_protocol::location!(),
+                        )
                     })?;
                 Ok(PreparedServerCommunication::LocalSocket { listener })
             }
@@ -107,8 +115,15 @@ impl CommunicationMode {
 
                     interpret_local_socket_name(name)
                         .and_then(|name| ls::Stream::connect(name))
-                        .map_err(|err| ShellError::IOError {
-                            msg: format!("failed to connect to socket: {err}"),
+                        .map_err(|err| {
+                            ShellError::Io(IoError::new_internal(
+                                err.kind(),
+                                format!(
+                                    "Could not interpret local socket name {:?}",
+                                    name.to_string_lossy()
+                                ),
+                                nu_protocol::location!(),
+                            ))
                         })
                 };
                 // Reverse order from the server: read in, write out
@@ -171,7 +186,16 @@ impl PreparedServerCommunication {
                 // output) and one for write (the plugin input)
                 //
                 // Be non-blocking on Accept only, so we can timeout.
-                listener.set_nonblocking(ListenerNonblockingMode::Accept)?;
+                listener
+                    .set_nonblocking(ListenerNonblockingMode::Accept)
+                    .map_err(|err| {
+                        IoError::new_with_additional_context(
+                            err.kind(),
+                            Span::unknown(),
+                            None,
+                            "Could not set non-blocking mode accept for listener",
+                        )
+                    })?;
                 let mut get_socket = || {
                     let mut result = None;
                     while let Ok(None) = child.try_wait() {
@@ -179,7 +203,14 @@ impl PreparedServerCommunication {
                             Ok(stream) => {
                                 // Success! Ensure the stream is in nonblocking mode though, for
                                 // good measure. Had an issue without this on macOS.
-                                stream.set_nonblocking(false)?;
+                                stream.set_nonblocking(false).map_err(|err| {
+                                    IoError::new_with_additional_context(
+                                        err.kind(),
+                                        Span::unknown(),
+                                        None,
+                                        "Could not disable non-blocking mode for listener",
+                                    )
+                                })?;
                                 result = Some(stream);
                                 break;
                             }
@@ -187,7 +218,11 @@ impl PreparedServerCommunication {
                                 if !is_would_block_err(&err) {
                                     // `WouldBlock` is ok, just means it's not ready yet, but some other
                                     // kind of error should be reported
-                                    return Err(err.into());
+                                    return Err(ShellError::Io(IoError::new(
+                                        err.kind(),
+                                        Span::unknown(),
+                                        None,
+                                    )));
                                 }
                             }
                         }
diff --git a/crates/nu-plugin-core/src/interface/mod.rs b/crates/nu-plugin-core/src/interface/mod.rs
index de04bd6387..01f91b7c1c 100644
--- a/crates/nu-plugin-core/src/interface/mod.rs
+++ b/crates/nu-plugin-core/src/interface/mod.rs
@@ -2,8 +2,8 @@
 
 use nu_plugin_protocol::{ByteStreamInfo, ListStreamInfo, PipelineDataHeader, StreamMessage};
 use nu_protocol::{
-    engine::Sequence, ByteStream, IntoSpanned, ListStream, PipelineData, Reader, ShellError,
-    Signals,
+    engine::Sequence, shell_error::io::IoError, ByteStream, ListStream, PipelineData, Reader,
+    ShellError, Signals, Span,
 };
 use std::{
     io::{Read, Write},
@@ -80,8 +80,12 @@ where
     }
 
     fn flush(&self) -> Result<(), ShellError> {
-        self.0.lock().flush().map_err(|err| ShellError::IOError {
-            msg: err.to_string(),
+        self.0.lock().flush().map_err(|err| {
+            ShellError::Io(IoError::new_internal(
+                err.kind(),
+                "PluginWrite could not flush",
+                nu_protocol::location!(),
+            ))
         })
     }
 
@@ -106,8 +110,12 @@ where
         let mut lock = self.0.lock().map_err(|_| ShellError::NushellFailed {
             msg: "writer mutex poisoned".into(),
         })?;
-        lock.flush().map_err(|err| ShellError::IOError {
-            msg: err.to_string(),
+        lock.flush().map_err(|err| {
+            ShellError::Io(IoError::new_internal(
+                err.kind(),
+                "PluginWrite could not flush",
+                nu_protocol::location!(),
+            ))
         })
     }
 }
@@ -332,7 +340,7 @@ where
                 writer.write_all(std::iter::from_fn(move || match reader.read(buf) {
                     Ok(0) => None,
                     Ok(len) => Some(Ok(buf[..len].to_vec())),
-                    Err(err) => Some(Err(ShellError::from(err.into_spanned(span)))),
+                    Err(err) => Some(Err(ShellError::from(IoError::new(err.kind(), span, None)))),
                 }))?;
                 Ok(())
             }
@@ -357,6 +365,14 @@ where
                             log::warn!("Error while writing pipeline in background: {err}");
                         }
                         result
+                    })
+                    .map_err(|err| {
+                        IoError::new_with_additional_context(
+                            err.kind(),
+                            Span::unknown(),
+                            None,
+                            "Could not spawn plugin stream background writer",
+                        )
                     })?,
             )),
         }
diff --git a/crates/nu-plugin-core/src/interface/tests.rs b/crates/nu-plugin-core/src/interface/tests.rs
index 6b4ad85d7f..28093ecd62 100644
--- a/crates/nu-plugin-core/src/interface/tests.rs
+++ b/crates/nu-plugin-core/src/interface/tests.rs
@@ -8,8 +8,8 @@ use nu_plugin_protocol::{
     StreamMessage,
 };
 use nu_protocol::{
-    engine::Sequence, ByteStream, ByteStreamSource, ByteStreamType, DataSource, ListStream,
-    PipelineData, PipelineMetadata, ShellError, Signals, Span, Value,
+    engine::Sequence, shell_error::io::IoError, ByteStream, ByteStreamSource, ByteStreamType,
+    DataSource, ListStream, PipelineData, PipelineMetadata, ShellError, Signals, Span, Value,
 };
 use std::{path::Path, sync::Arc};
 
@@ -245,7 +245,8 @@ fn read_pipeline_data_byte_stream() -> Result<(), ShellError> {
             match stream.into_source() {
                 ByteStreamSource::Read(mut read) => {
                     let mut buf = Vec::new();
-                    read.read_to_end(&mut buf)?;
+                    read.read_to_end(&mut buf)
+                        .map_err(|err| IoError::new(err.kind(), test_span, None))?;
                     let iter = buf.chunks_exact(out_pattern.len());
                     assert_eq!(iter.len(), iterations);
                     for chunk in iter {
diff --git a/crates/nu-plugin-core/src/serializers/json.rs b/crates/nu-plugin-core/src/serializers/json.rs
index 7dc868b806..8dfadac2d0 100644
--- a/crates/nu-plugin-core/src/serializers/json.rs
+++ b/crates/nu-plugin-core/src/serializers/json.rs
@@ -1,5 +1,5 @@
 use nu_plugin_protocol::{PluginInput, PluginOutput};
-use nu_protocol::ShellError;
+use nu_protocol::{location, shell_error::io::IoError, ShellError};
 use serde::Deserialize;
 
 use crate::{Encoder, PluginEncoder};
@@ -26,8 +26,12 @@ impl Encoder<PluginInput> for JsonSerializer {
         writer: &mut impl std::io::Write,
     ) -> Result<(), nu_protocol::ShellError> {
         serde_json::to_writer(&mut *writer, plugin_input).map_err(json_encode_err)?;
-        writer.write_all(b"\n").map_err(|err| ShellError::IOError {
-            msg: err.to_string(),
+        writer.write_all(b"\n").map_err(|err| {
+            ShellError::Io(IoError::new_internal(
+                err.kind(),
+                "Failed to write final line break",
+                location!(),
+            ))
         })
     }
 
@@ -49,8 +53,12 @@ impl Encoder<PluginOutput> for JsonSerializer {
         writer: &mut impl std::io::Write,
     ) -> Result<(), ShellError> {
         serde_json::to_writer(&mut *writer, plugin_output).map_err(json_encode_err)?;
-        writer.write_all(b"\n").map_err(|err| ShellError::IOError {
-            msg: err.to_string(),
+        writer.write_all(b"\n").map_err(|err| {
+            ShellError::Io(IoError::new_internal(
+                err.kind(),
+                "JsonSerializer could not encode linebreak",
+                nu_protocol::location!(),
+            ))
         })
     }
 
@@ -68,9 +76,11 @@ impl Encoder<PluginOutput> for JsonSerializer {
 /// Handle a `serde_json` encode error.
 fn json_encode_err(err: serde_json::Error) -> ShellError {
     if err.is_io() {
-        ShellError::IOError {
-            msg: err.to_string(),
-        }
+        ShellError::Io(IoError::new_internal(
+            err.io_error_kind().expect("is io"),
+            "Could not encode with json",
+            nu_protocol::location!(),
+        ))
     } else {
         ShellError::PluginFailedToEncode {
             msg: err.to_string(),
@@ -83,9 +93,11 @@ fn json_decode_err<T>(err: serde_json::Error) -> Result<Option<T>, ShellError> {
     if err.is_eof() {
         Ok(None)
     } else if err.is_io() {
-        Err(ShellError::IOError {
-            msg: err.to_string(),
-        })
+        Err(ShellError::Io(IoError::new_internal(
+            err.io_error_kind().expect("is io"),
+            "Could not decode with json",
+            nu_protocol::location!(),
+        )))
     } else {
         Err(ShellError::PluginFailedToDecode {
             msg: err.to_string(),
diff --git a/crates/nu-plugin-core/src/serializers/msgpack.rs b/crates/nu-plugin-core/src/serializers/msgpack.rs
index bf136fd790..372511631c 100644
--- a/crates/nu-plugin-core/src/serializers/msgpack.rs
+++ b/crates/nu-plugin-core/src/serializers/msgpack.rs
@@ -1,7 +1,7 @@
 use std::io::ErrorKind;
 
 use nu_plugin_protocol::{PluginInput, PluginOutput};
-use nu_protocol::ShellError;
+use nu_protocol::{shell_error::io::IoError, ShellError};
 use serde::Deserialize;
 
 use crate::{Encoder, PluginEncoder};
@@ -64,9 +64,12 @@ fn rmp_encode_err(err: rmp_serde::encode::Error) -> ShellError {
     match err {
         rmp_serde::encode::Error::InvalidValueWrite(_) => {
             // I/O error
-            ShellError::IOError {
-                msg: err.to_string(),
-            }
+            ShellError::Io(IoError::new_internal(
+                // TODO: get a better kind here
+                std::io::ErrorKind::Other,
+                "Could not encode with rmp",
+                nu_protocol::location!(),
+            ))
         }
         _ => {
             // Something else
@@ -87,9 +90,12 @@ fn rmp_decode_err<T>(err: rmp_serde::decode::Error) -> Result<Option<T>, ShellEr
                 Ok(None)
             } else {
                 // I/O error
-                Err(ShellError::IOError {
-                    msg: err.to_string(),
-                })
+                Err(ShellError::Io(IoError::new_internal(
+                    // TODO: get a better kind here
+                    std::io::ErrorKind::Other,
+                    "Could not decode with rmp",
+                    nu_protocol::location!(),
+                )))
             }
         }
         _ => {
diff --git a/crates/nu-plugin-core/src/serializers/tests.rs b/crates/nu-plugin-core/src/serializers/tests.rs
index b27f852ee4..76503fa96e 100644
--- a/crates/nu-plugin-core/src/serializers/tests.rs
+++ b/crates/nu-plugin-core/src/serializers/tests.rs
@@ -36,18 +36,18 @@ macro_rules! generate_tests {
             let mut buffered = std::io::BufReader::new(ErrorProducer);
             match Encoder::<PluginInput>::decode(&encoder, &mut buffered) {
                 Ok(_) => panic!("decode: i/o error was not passed through"),
-                Err(ShellError::IOError { .. }) => (), // okay
+                Err(ShellError::Io(_)) => (), // okay
                 Err(other) => panic!(
                     "decode: got other error, should have been a \
-                    ShellError::IOError: {other:?}"
+                    ShellError::Io: {other:?}"
                 ),
             }
             match Encoder::<PluginOutput>::decode(&encoder, &mut buffered) {
                 Ok(_) => panic!("decode: i/o error was not passed through"),
-                Err(ShellError::IOError { .. }) => (), // okay
+                Err(ShellError::Io(_)) => (), // okay
                 Err(other) => panic!(
                     "decode: got other error, should have been a \
-                    ShellError::IOError: {other:?}"
+                    ShellError::Io: {other:?}"
                 ),
             }
         }
@@ -378,9 +378,11 @@ macro_rules! generate_tests {
                 .with_url("https://example.org/test/error")
                 .with_help("some help")
                 .with_label("msg", Span::new(2, 30))
-                .with_inner(ShellError::IOError {
-                    msg: "io error".into(),
-                });
+                .with_inner(ShellError::Io(IoError::new(
+                    std::io::ErrorKind::NotFound,
+                    Span::test_data(),
+                    None,
+                )));
 
             let response = PluginCallResponse::Error(error.clone());
             let output = PluginOutput::CallResponse(6, response);
diff --git a/crates/nu-plugin-engine/src/interface/mod.rs b/crates/nu-plugin-engine/src/interface/mod.rs
index 93d75d0ec9..9eebe6aaed 100644
--- a/crates/nu-plugin-engine/src/interface/mod.rs
+++ b/crates/nu-plugin-engine/src/interface/mod.rs
@@ -381,8 +381,13 @@ impl PluginInterfaceManager {
                 // don't block
                 this.state.writer.write(&PluginInput::EngineCallResponse(
                     engine_call_id,
-                    EngineCallResponse::Error(ShellError::IOError {
-                        msg: "Can't make engine call because the original caller hung up".into(),
+                    EngineCallResponse::Error(ShellError::GenericError {
+                        error: "Caller hung up".to_string(),
+                        msg: "Can't make engine call because the original caller hung up"
+                            .to_string(),
+                        span: None,
+                        help: None,
+                        inner: vec![],
                     }),
                 ))?;
                 this.state.writer.flush()
diff --git a/crates/nu-plugin-engine/src/interface/tests.rs b/crates/nu-plugin-engine/src/interface/tests.rs
index 4761da6824..de9f379305 100644
--- a/crates/nu-plugin-engine/src/interface/tests.rs
+++ b/crates/nu-plugin-engine/src/interface/tests.rs
@@ -6,6 +6,7 @@ use crate::{
     plugin_custom_value_with_source::WithSource, test_util::*, PluginCustomValueWithSource,
     PluginSource,
 };
+use nu_engine::command_prelude::IoError;
 use nu_plugin_core::{interface_test_util::TestCase, Interface, InterfaceManager};
 use nu_plugin_protocol::{
     test_util::{expected_test_custom_value, test_plugin_custom_value},
@@ -86,9 +87,12 @@ fn manager_consume_all_exits_after_streams_and_interfaces_are_dropped() -> Resul
 }
 
 fn test_io_error() -> ShellError {
-    ShellError::IOError {
-        msg: "test io error".into(),
-    }
+    ShellError::Io(IoError::new_with_additional_context(
+        std::io::ErrorKind::Other,
+        Span::test_data(),
+        None,
+        "test io error",
+    ))
 }
 
 fn check_test_io_error(error: &ShellError) {
diff --git a/crates/nu-plugin-engine/src/persistent.rs b/crates/nu-plugin-engine/src/persistent.rs
index e664b37f87..8d444a4d1c 100644
--- a/crates/nu-plugin-engine/src/persistent.rs
+++ b/crates/nu-plugin-engine/src/persistent.rs
@@ -7,8 +7,9 @@ use super::{PluginInterface, PluginSource};
 use nu_plugin_core::CommunicationMode;
 use nu_protocol::{
     engine::{EngineState, Stack},
+    shell_error::io::IoError,
     HandlerGuard, Handlers, PluginGcConfig, PluginIdentity, PluginMetadata, RegisteredPlugin,
-    ShellError,
+    ShellError, Span,
 };
 use std::{
     collections::HashMap,
@@ -184,7 +185,14 @@ impl PersistentPlugin {
         })?;
 
         // Start the plugin garbage collector
-        let gc = PluginGc::new(mutable.gc_config.clone(), &self)?;
+        let gc = PluginGc::new(mutable.gc_config.clone(), &self).map_err(|err| {
+            IoError::new_with_additional_context(
+                err.kind(),
+                Span::unknown(),
+                None,
+                "Could not start plugin gc",
+            )
+        })?;
 
         let pid = child.id();
         let interface = make_plugin_interface(
diff --git a/crates/nu-plugin-test-support/src/spawn_fake_plugin.rs b/crates/nu-plugin-test-support/src/spawn_fake_plugin.rs
index d954f6e683..710332fbec 100644
--- a/crates/nu-plugin-test-support/src/spawn_fake_plugin.rs
+++ b/crates/nu-plugin-test-support/src/spawn_fake_plugin.rs
@@ -4,7 +4,7 @@ use nu_plugin::Plugin;
 use nu_plugin_core::{InterfaceManager, PluginRead, PluginWrite};
 use nu_plugin_engine::{PluginInterfaceManager, PluginSource};
 use nu_plugin_protocol::{PluginInput, PluginOutput};
-use nu_protocol::{PluginIdentity, ShellError};
+use nu_protocol::{shell_error::io::IoError, PluginIdentity, ShellError};
 
 use crate::fake_persistent_plugin::FakePersistentPlugin;
 
@@ -21,8 +21,12 @@ impl<T: Clone + Send> PluginWrite<T> for FakePluginWrite<T> {
     fn write(&self, data: &T) -> Result<(), ShellError> {
         self.0
             .send(data.clone())
-            .map_err(|err| ShellError::IOError {
-                msg: err.to_string(),
+            .map_err(|e| ShellError::GenericError {
+                error: "Error sending data".to_string(),
+                msg: e.to_string(),
+                span: None,
+                help: None,
+                inner: vec![],
             })
     }
 
@@ -59,7 +63,14 @@ pub(crate) fn spawn_fake_plugin(
     // Start the interface reader on another thread
     std::thread::Builder::new()
         .name(format!("fake plugin interface reader ({name})"))
-        .spawn(move || manager.consume_all(output_read).expect("Plugin read error"))?;
+        .spawn(move || manager.consume_all(output_read).expect("Plugin read error"))
+        .map_err(|err| {
+            IoError::new_internal(
+                err.kind(),
+                format!("Could not spawn fake plugin interface reader ({name})"),
+                nu_protocol::location!(),
+            )
+        })?;
 
     // Start the plugin on another thread
     let name_string = name.to_owned();
@@ -73,6 +84,13 @@ pub(crate) fn spawn_fake_plugin(
                 move || output_write,
             )
             .expect("Plugin runner error")
+        })
+        .map_err(|err| {
+            IoError::new_internal(
+                err.kind(),
+                format!("Could not spawn fake plugin runner ({name})"),
+                nu_protocol::location!(),
+            )
         })?;
 
     Ok(reg_plugin)
diff --git a/crates/nu-plugin/src/plugin/interface/mod.rs b/crates/nu-plugin/src/plugin/interface/mod.rs
index be7b2e0dfc..c3052448b1 100644
--- a/crates/nu-plugin/src/plugin/interface/mod.rs
+++ b/crates/nu-plugin/src/plugin/interface/mod.rs
@@ -1046,8 +1046,12 @@ impl ForegroundGuard {
             {
                 use nix::unistd::{setpgid, Pid};
                 // This should always succeed, frankly, but handle the error just in case
-                setpgid(Pid::from_raw(0), Pid::from_raw(0)).map_err(|err| ShellError::IOError {
-                    msg: err.to_string(),
+                setpgid(Pid::from_raw(0), Pid::from_raw(0)).map_err(|err| {
+                    nu_protocol::shell_error::io::IoError::new_internal(
+                        std::io::Error::from(err).kind(),
+                        "Could not set pgid",
+                        nu_protocol::location!(),
+                    )
                 })?;
             }
             interface.leave_foreground()?;
diff --git a/crates/nu-plugin/src/plugin/interface/tests.rs b/crates/nu-plugin/src/plugin/interface/tests.rs
index 5ff9f6f6cd..b6bf267dcb 100644
--- a/crates/nu-plugin/src/plugin/interface/tests.rs
+++ b/crates/nu-plugin/src/plugin/interface/tests.rs
@@ -1,6 +1,7 @@
 use crate::test_util::TestCaseExt;
 
 use super::{EngineInterfaceManager, ReceivedPluginCall};
+use nu_engine::command_prelude::IoError;
 use nu_plugin_core::{interface_test_util::TestCase, Interface, InterfaceManager};
 use nu_plugin_protocol::{
     test_util::{expected_test_custom_value, test_plugin_custom_value, TestCustomValue},
@@ -88,9 +89,12 @@ fn manager_consume_all_exits_after_streams_and_interfaces_are_dropped() -> Resul
 }
 
 fn test_io_error() -> ShellError {
-    ShellError::IOError {
-        msg: "test io error".into(),
-    }
+    ShellError::Io(IoError::new_with_additional_context(
+        std::io::ErrorKind::Other,
+        Span::test_data(),
+        None,
+        "test io error",
+    ))
 }
 
 fn check_test_io_error(error: &ShellError) {
diff --git a/crates/nu-plugin/src/plugin/mod.rs b/crates/nu-plugin/src/plugin/mod.rs
index c5af681f5e..d01a0e2600 100644
--- a/crates/nu-plugin/src/plugin/mod.rs
+++ b/crates/nu-plugin/src/plugin/mod.rs
@@ -387,7 +387,7 @@ pub enum ServePluginError {
 impl From<ShellError> for ServePluginError {
     fn from(error: ShellError) -> Self {
         match error {
-            ShellError::IOError { .. } => ServePluginError::IOError(error),
+            ShellError::Io(_) => ServePluginError::IOError(error),
             ShellError::PluginFailedToLoad { .. } => ServePluginError::Incompatible(error),
             _ => ServePluginError::UnreportedError(error),
         }
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index 8270e4111a..dbded4eb63 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -7,6 +7,7 @@ use crate::{
         Variable, Visibility, DEFAULT_OVERLAY_NAME,
     },
     eval_const::create_nu_constant,
+    shell_error::io::IoError,
     BlockId, Category, Config, DeclId, FileId, GetSpan, Handlers, HistoryConfig, Module, ModuleId,
     OverlayId, ShellError, SignalAction, Signals, Signature, Span, SpanId, Type, Value, VarId,
     VirtualPathId,
@@ -322,8 +323,14 @@ impl EngineState {
         }
 
         let cwd = self.cwd(Some(stack))?;
-        // TODO: better error
-        std::env::set_current_dir(cwd)?;
+        std::env::set_current_dir(cwd).map_err(|err| {
+            IoError::new_with_additional_context(
+                err.kind(),
+                Span::unknown(),
+                None,
+                "Could not set current dir",
+            )
+        })?;
 
         if let Some(config) = stack.config.take() {
             // If config was updated in the stack, replace it.
@@ -514,13 +521,12 @@ impl EngineState {
                 if err.kind() == std::io::ErrorKind::NotFound {
                     Ok(PluginRegistryFile::default())
                 } else {
-                    Err(ShellError::GenericError {
-                        error: "Failed to open plugin file".into(),
-                        msg: "".into(),
-                        span: None,
-                        help: None,
-                        inner: vec![err.into()],
-                    })
+                    Err(ShellError::Io(IoError::new_with_additional_context(
+                        err.kind(),
+                        Span::unknown(),
+                        PathBuf::from(plugin_path),
+                        "Failed to open plugin file",
+                    )))
                 }
             }
         }?;
@@ -531,14 +537,14 @@ impl EngineState {
         }
 
         // Write it to the same path
-        let plugin_file =
-            File::create(plugin_path.as_path()).map_err(|err| ShellError::GenericError {
-                error: "Failed to write plugin file".into(),
-                msg: "".into(),
-                span: None,
-                help: None,
-                inner: vec![err.into()],
-            })?;
+        let plugin_file = File::create(plugin_path.as_path()).map_err(|err| {
+            IoError::new_with_additional_context(
+                err.kind(),
+                Span::unknown(),
+                PathBuf::from(plugin_path),
+                "Failed to write plugin file",
+            )
+        })?;
 
         contents.write_to(plugin_file, None)
     }
diff --git a/crates/nu-protocol/src/errors/labeled_error.rs b/crates/nu-protocol/src/errors/labeled_error.rs
index cdd990463b..7104a1a8b1 100644
--- a/crates/nu-protocol/src/errors/labeled_error.rs
+++ b/crates/nu-protocol/src/errors/labeled_error.rs
@@ -143,8 +143,16 @@ impl LabeledError {
     /// [`ShellError`] implements `miette::Diagnostic`:
     ///
     /// ```rust
-    /// # use nu_protocol::{ShellError, LabeledError};
-    /// let error = LabeledError::from_diagnostic(&ShellError::IOError { msg: "error".into() });
+    /// # use nu_protocol::{ShellError, LabeledError, shell_error::io::IoError, Span};
+    /// #
+    /// let error = LabeledError::from_diagnostic(
+    ///     &ShellError::Io(IoError::new_with_additional_context(
+    ///         std::io::ErrorKind::Other,
+    ///         Span::test_data(),
+    ///         None,
+    ///         "some error"
+    ///     ))
+    /// );
     /// assert!(error.to_string().contains("I/O error"));
     /// ```
     pub fn from_diagnostic(diag: &(impl miette::Diagnostic + ?Sized)) -> LabeledError {
diff --git a/crates/nu-protocol/src/errors/mod.rs b/crates/nu-protocol/src/errors/mod.rs
index 2e264066a9..5f385a21ee 100644
--- a/crates/nu-protocol/src/errors/mod.rs
+++ b/crates/nu-protocol/src/errors/mod.rs
@@ -4,7 +4,7 @@ mod config_error;
 mod labeled_error;
 mod parse_error;
 mod parse_warning;
-mod shell_error;
+pub mod shell_error;
 
 pub use cli_error::{
     format_shell_error, report_parse_error, report_parse_warning, report_shell_error,
@@ -15,4 +15,4 @@ pub use config_error::ConfigError;
 pub use labeled_error::{ErrorLabel, LabeledError};
 pub use parse_error::{DidYouMean, ParseError};
 pub use parse_warning::ParseWarning;
-pub use shell_error::*;
+pub use shell_error::ShellError;
diff --git a/crates/nu-protocol/src/errors/shell_error/bridge.rs b/crates/nu-protocol/src/errors/shell_error/bridge.rs
new file mode 100644
index 0000000000..eff8ba17e4
--- /dev/null
+++ b/crates/nu-protocol/src/errors/shell_error/bridge.rs
@@ -0,0 +1,47 @@
+use super::ShellError;
+use serde::{Deserialize, Serialize};
+use thiserror::Error;
+
+/// A bridge for transferring a [`ShellError`] between Nushell or similar processes.
+///
+/// This newtype encapsulates a [`ShellError`] to facilitate its transfer between Nushell processes
+/// or processes with similar behavior.
+/// By defining this type, we eliminate ambiguity about what is being transferred and avoid the
+/// need to implement [`From<io::Error>`](From) and [`Into<io::Error>`](Into) directly on
+/// `ShellError`.
+#[derive(Debug, Clone, PartialEq, Error, Serialize, Deserialize)]
+#[error("{0}")]
+pub struct ShellErrorBridge(pub ShellError);
+
+impl TryFrom<std::io::Error> for ShellErrorBridge {
+    type Error = std::io::Error;
+
+    fn try_from(value: std::io::Error) -> Result<Self, Self::Error> {
+        let kind = value.kind();
+        value
+            .downcast()
+            .inspect(|_| debug_assert_eq!(kind, std::io::ErrorKind::Other))
+    }
+}
+
+impl From<ShellErrorBridge> for std::io::Error {
+    fn from(value: ShellErrorBridge) -> Self {
+        std::io::Error::other(value)
+    }
+}
+
+#[test]
+fn test_bridge_io_error_roundtrip() {
+    let shell_error = ShellError::GenericError {
+        error: "some error".into(),
+        msg: "some message".into(),
+        span: None,
+        help: None,
+        inner: vec![],
+    };
+
+    let bridge = ShellErrorBridge(shell_error);
+    let io_error = std::io::Error::from(bridge.clone());
+    let bridge_again = ShellErrorBridge::try_from(io_error).unwrap();
+    assert_eq!(bridge.0, bridge_again.0);
+}
diff --git a/crates/nu-protocol/src/errors/shell_error/io.rs b/crates/nu-protocol/src/errors/shell_error/io.rs
new file mode 100644
index 0000000000..87eaabc74d
--- /dev/null
+++ b/crates/nu-protocol/src/errors/shell_error/io.rs
@@ -0,0 +1,418 @@
+use miette::{Diagnostic, LabeledSpan, SourceSpan};
+use std::{
+    fmt::Display,
+    path::{Path, PathBuf},
+};
+use thiserror::Error;
+
+use crate::Span;
+
+use super::{location::Location, ShellError};
+
+/// Represents an I/O error in the [`ShellError::Io`] variant.
+///
+/// This is the central I/O error for the [`ShellError::Io`] variant.
+/// It represents all I/O errors by encapsulating [`ErrorKind`], an extension of
+/// [`std::io::ErrorKind`].
+/// The `span` indicates where the error occurred in user-provided code.
+/// If the error is not tied to user-provided code, the `location` refers to the precise point in
+/// the Rust code where the error originated.
+/// The optional `path` provides the file or directory involved in the error.
+/// If [`ErrorKind`] alone doesn't provide enough detail, additional context can be added to clarify
+/// the issue.
+///
+/// For handling user input errors (e.g., commands), prefer using [`new`](Self::new).
+/// Alternatively, use the [`factory`](Self::factory) method to simplify error creation in repeated
+/// contexts.
+/// For internal errors, use [`new_internal`](Self::new_internal) to include the location in Rust
+/// code where the error originated.
+///
+/// # Examples
+///
+/// ## User Input Error
+/// ```rust
+/// # use nu_protocol::shell_error::io::{IoError, ErrorKind};
+/// # use nu_protocol::Span;
+/// use std::path::PathBuf;
+///
+/// # let span = Span::test_data();
+/// let path = PathBuf::from("/some/missing/file");
+/// let error = IoError::new(
+///     std::io::ErrorKind::NotFound,
+///     span,
+///     path
+/// );
+/// println!("Error: {:?}", error);
+/// ```
+///
+/// ## Internal Error
+/// ```rust
+/// # use nu_protocol::shell_error::io::{IoError, ErrorKind};
+//  #
+/// let error = IoError::new_internal(
+///     std::io::ErrorKind::UnexpectedEof,
+///     "Failed to read data from buffer",
+///     nu_protocol::location!()
+/// );
+/// println!("Error: {:?}", error);
+/// ```
+///
+/// ## Using the Factory Method
+/// ```rust
+/// # use nu_protocol::shell_error::io::{IoError, ErrorKind};
+/// # use nu_protocol::{Span, ShellError};
+/// use std::path::PathBuf;
+///
+/// # fn should_return_err() -> Result<(), ShellError> {
+/// # let span = Span::new(50, 60);
+/// let path = PathBuf::from("/some/file");
+/// let from_io_error = IoError::factory(span, Some(path.as_path()));
+///
+/// let content = std::fs::read_to_string(&path).map_err(from_io_error)?;
+/// # Ok(())
+/// # }
+/// #
+/// # assert!(should_return_err().is_err());
+/// ```
+///
+/// # ShellErrorBridge
+///
+/// The [`ShellErrorBridge`](super::bridge::ShellErrorBridge) struct is used to contain a
+/// [`ShellError`] inside a [`std::io::Error`].
+/// This allows seamless transfer of `ShellError` instances where `std::io::Error` is expected.
+/// When a `ShellError` needs to be packed into an I/O context, use this bridge.
+/// Similarly, when handling an I/O error that is expected to contain a `ShellError`,
+/// use the bridge to unpack it.
+///
+/// This approach ensures clarity about where such container transfers occur.
+/// All other I/O errors should be handled using the provided constructors for `IoError`.
+/// This way, the code explicitly indicates when and where a `ShellError` transfer might happen.
+#[derive(Debug, Clone, Error, PartialEq)]
+#[non_exhaustive]
+#[error("I/O error")]
+pub struct IoError {
+    /// The type of the underlying I/O error.
+    ///
+    /// [`std::io::ErrorKind`] provides detailed context about the type of I/O error that occurred
+    /// and is part of [`std::io::Error`].
+    /// If a kind cannot be represented by it, consider adding a new variant to [`ErrorKind`].
+    ///
+    /// Only in very rare cases should [`std::io::ErrorKind::Other`] be used, make sure you provide
+    /// `additional_context` to get useful errors in these cases.
+    pub kind: ErrorKind,
+
+    /// The source location of the error.
+    pub span: Span,
+
+    /// The path related to the I/O error, if applicable.
+    ///
+    /// Many I/O errors involve a file or directory path, but operating system error messages
+    /// often don't include the specific path.
+    /// Setting this to [`Some`] allows users to see which path caused the error.
+    pub path: Option<PathBuf>,
+
+    /// Additional details to provide more context about the error.
+    ///
+    /// Only set this field if it adds meaningful context.
+    /// If [`ErrorKind`] already contains all the necessary information, leave this as [`None`].
+    pub additional_context: Option<String>,
+
+    /// The precise location in the Rust code where the error originated.
+    ///
+    /// This field is particularly useful for debugging errors that stem from the Rust
+    /// implementation rather than user-provided Nushell code.
+    /// The original [`Location`] is converted to a string to more easily report the error
+    /// attributing the location.
+    ///
+    /// This value is only used if `span` is [`Span::unknown()`] as most of the time we want to
+    /// refer to user code than the Rust code.
+    pub location: Option<String>,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Diagnostic)]
+pub enum ErrorKind {
+    Std(std::io::ErrorKind),
+    // TODO: in Rust 1.83 this can be std::io::ErrorKind::NotADirectory
+    NotADirectory,
+    NotAFile,
+    // TODO: in Rust 1.83 this can be std::io::ErrorKind::IsADirectory
+    IsADirectory,
+}
+
+impl IoError {
+    /// Creates a new [`IoError`] with the given kind, span, and optional path.
+    ///
+    /// This constructor should be used in all cases where the combination of the error kind, span,
+    /// and path provides enough information to describe the error clearly.
+    /// For example, errors like "File not found" or "Permission denied" are typically
+    /// self-explanatory when paired with the file path and the location in user-provided
+    /// Nushell code (`span`).
+    ///
+    /// # Constraints
+    /// If `span` is unknown, use:
+    /// - `new_internal` if no path is available.
+    /// - `new_internal_with_path` if a path is available.
+    pub fn new(kind: impl Into<ErrorKind>, span: Span, path: impl Into<Option<PathBuf>>) -> Self {
+        let path = path.into();
+
+        if span == Span::unknown() {
+            debug_assert!(
+                path.is_some(),
+                "for unknown spans with paths, use `new_internal_with_path`"
+            );
+            debug_assert!(
+                path.is_none(),
+                "for unknown spans without paths, use `new_internal`"
+            );
+        }
+
+        Self {
+            kind: kind.into(),
+            span,
+            path,
+            additional_context: None,
+            location: None,
+        }
+    }
+
+    /// Creates a new [`IoError`] with additional context.
+    ///
+    /// Use this constructor when the error kind, span, and path are not sufficient to fully
+    /// explain the error, and additional context can provide meaningful details.
+    /// Avoid redundant context (e.g., "Permission denied" for an error kind of
+    /// [`ErrorKind::PermissionDenied`](std::io::ErrorKind::PermissionDenied)).
+    ///
+    /// # Constraints
+    /// If `span` is unknown, use:
+    /// - `new_internal` if no path is available.
+    /// - `new_internal_with_path` if a path is available.
+    pub fn new_with_additional_context(
+        kind: impl Into<ErrorKind>,
+        span: Span,
+        path: impl Into<Option<PathBuf>>,
+        additional_context: impl ToString,
+    ) -> Self {
+        let path = path.into();
+
+        if span == Span::unknown() {
+            debug_assert!(
+                path.is_some(),
+                "for unknown spans with paths, use `new_internal_with_path`"
+            );
+            debug_assert!(
+                path.is_none(),
+                "for unknown spans without paths, use `new_internal`"
+            );
+        }
+
+        Self {
+            kind: kind.into(),
+            span,
+            path,
+            additional_context: Some(additional_context.to_string()),
+            location: None,
+        }
+    }
+
+    /// Creates a new [`IoError`] for internal I/O errors without a user-provided span or path.
+    ///
+    /// This constructor is intended for internal errors in the Rust implementation that still need
+    /// to be reported to the end user.
+    /// Since these errors are not tied to user-provided Nushell code, they generally have no
+    /// meaningful span or path.
+    ///
+    /// Instead, these errors provide:
+    /// - `additional_context`:
+    ///   Details about what went wrong internally.
+    /// - `location`:
+    ///   The location in the Rust code where the error occurred, allowing us to trace and debug
+    ///   the issue.
+    ///   Use the [`nu_protocol::location!`](crate::location) macro to generate the location
+    ///   information.
+    ///
+    /// # Examples
+    /// ```rust
+    /// use nu_protocol::shell_error::io::IoError;
+    ///
+    /// let error = IoError::new_internal(
+    ///     std::io::ErrorKind::UnexpectedEof,
+    ///     "Failed to read from buffer",
+    ///     nu_protocol::location!(),
+    /// );
+    /// ```
+    pub fn new_internal(
+        kind: impl Into<ErrorKind>,
+        additional_context: impl ToString,
+        location: Location,
+    ) -> Self {
+        Self {
+            kind: kind.into(),
+            span: Span::unknown(),
+            path: None,
+            additional_context: Some(additional_context.to_string()),
+            location: Some(location.to_string()),
+        }
+    }
+
+    /// Creates a new `IoError` for internal I/O errors with a specific path.
+    ///
+    /// This constructor is similar to [`new_internal`] but also includes a file or directory
+    /// path relevant to the error. Use this function in rare cases where an internal error
+    /// involves a specific path, and the combination of path and additional context is helpful.
+    ///
+    /// # Examples
+    /// ```rust
+    /// use std::path::PathBuf;
+    /// use nu_protocol::shell_error::io::IoError;
+    ///
+    /// let error = IoError::new_internal_with_path(
+    ///     std::io::ErrorKind::NotFound,
+    ///     "Could not find special file",
+    ///     nu_protocol::location!(),
+    ///     PathBuf::from("/some/file"),
+    /// );
+    /// ```
+    pub fn new_internal_with_path(
+        kind: impl Into<ErrorKind>,
+        additional_context: impl ToString,
+        location: Location,
+        path: PathBuf,
+    ) -> Self {
+        Self {
+            kind: kind.into(),
+            span: Span::unknown(),
+            path: path.into(),
+            additional_context: Some(additional_context.to_string()),
+            location: Some(location.to_string()),
+        }
+    }
+
+    /// Creates a factory closure for constructing [`IoError`] instances from [`std::io::Error`] values.
+    ///
+    /// This method is particularly useful when you need to handle multiple I/O errors which all
+    /// take the same span and path.
+    /// Instead of calling `.map_err(|err| IoError::new(err.kind(), span, path))` every time, you
+    /// can create the factory closure once and pass that into `.map_err`.
+    pub fn factory<'p, P>(span: Span, path: P) -> impl Fn(std::io::Error) -> Self + use<'p, P>
+    where
+        P: Into<Option<&'p Path>>,
+    {
+        let path = path.into();
+        move |err: std::io::Error| IoError::new(err.kind(), span, path.map(PathBuf::from))
+    }
+}
+
+impl Display for ErrorKind {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            ErrorKind::Std(error_kind) => {
+                let msg = error_kind.to_string();
+                let (first, rest) = msg.split_at(1);
+                write!(f, "{}{}", first.to_uppercase(), rest)
+            }
+            ErrorKind::NotADirectory => write!(f, "Not a directory"),
+            ErrorKind::NotAFile => write!(f, "Not a file"),
+            ErrorKind::IsADirectory => write!(f, "Is a directory"),
+        }
+    }
+}
+
+impl std::error::Error for ErrorKind {}
+
+impl Diagnostic for IoError {
+    fn code<'a>(&'a self) -> Option<Box<dyn std::fmt::Display + 'a>> {
+        let mut code = String::from("nu::shell::io::");
+        match self.kind {
+            ErrorKind::Std(error_kind) => match error_kind {
+                std::io::ErrorKind::NotFound => code.push_str("not_found"),
+                std::io::ErrorKind::PermissionDenied => code.push_str("permission_denied"),
+                std::io::ErrorKind::ConnectionRefused => code.push_str("connection_refused"),
+                std::io::ErrorKind::ConnectionReset => code.push_str("connection_reset"),
+                std::io::ErrorKind::ConnectionAborted => code.push_str("connection_aborted"),
+                std::io::ErrorKind::NotConnected => code.push_str("not_connected"),
+                std::io::ErrorKind::AddrInUse => code.push_str("addr_in_use"),
+                std::io::ErrorKind::AddrNotAvailable => code.push_str("addr_not_available"),
+                std::io::ErrorKind::BrokenPipe => code.push_str("broken_pipe"),
+                std::io::ErrorKind::AlreadyExists => code.push_str("already_exists"),
+                std::io::ErrorKind::WouldBlock => code.push_str("would_block"),
+                std::io::ErrorKind::InvalidInput => code.push_str("invalid_input"),
+                std::io::ErrorKind::InvalidData => code.push_str("invalid_data"),
+                std::io::ErrorKind::TimedOut => code.push_str("timed_out"),
+                std::io::ErrorKind::WriteZero => code.push_str("write_zero"),
+                std::io::ErrorKind::Interrupted => code.push_str("interrupted"),
+                std::io::ErrorKind::Unsupported => code.push_str("unsupported"),
+                std::io::ErrorKind::UnexpectedEof => code.push_str("unexpected_eof"),
+                std::io::ErrorKind::OutOfMemory => code.push_str("out_of_memory"),
+                std::io::ErrorKind::Other => code.push_str("other"),
+                kind => code.push_str(&kind.to_string().to_lowercase().replace(" ", "_")),
+            },
+            ErrorKind::NotADirectory => code.push_str("not_a_directory"),
+            ErrorKind::NotAFile => code.push_str("not_a_file"),
+            ErrorKind::IsADirectory => code.push_str("is_a_directory"),
+        }
+
+        Some(Box::new(code))
+    }
+
+    fn help<'a>(&'a self) -> Option<Box<dyn std::fmt::Display + 'a>> {
+        self.path
+            .as_ref()
+            .map(|path| format!("The error occurred at '{}'", path.display()))
+            .map(|s| Box::new(s) as Box<dyn std::fmt::Display>)
+    }
+
+    fn labels(&self) -> Option<Box<dyn Iterator<Item = miette::LabeledSpan> + '_>> {
+        let span_is_unknown = self.span == Span::unknown();
+        let span = match (span_is_unknown, self.location.as_ref()) {
+            (true, None) => return None,
+            (false, _) => SourceSpan::from(self.span),
+            (true, Some(location)) => SourceSpan::new(0.into(), location.len()),
+        };
+
+        let label = match self.additional_context.as_ref() {
+            Some(ctx) => format!("{ctx}\n{}", self.kind),
+            None => self.kind.to_string(),
+        };
+        let label = LabeledSpan::new_with_span(Some(label), span);
+        Some(Box::new(std::iter::once(label)))
+    }
+
+    fn diagnostic_source(&self) -> Option<&dyn Diagnostic> {
+        Some(&self.kind as &dyn Diagnostic)
+    }
+
+    fn source_code(&self) -> Option<&dyn miette::SourceCode> {
+        let span_is_unknown = self.span == Span::unknown();
+        match (span_is_unknown, self.location.as_ref()) {
+            (true, None) | (false, _) => None,
+            (true, Some(location)) => Some(location as &dyn miette::SourceCode),
+        }
+    }
+}
+
+impl From<IoError> for ShellError {
+    fn from(value: IoError) -> Self {
+        ShellError::Io(value)
+    }
+}
+
+impl From<IoError> for std::io::Error {
+    fn from(value: IoError) -> Self {
+        Self::new(value.kind.into(), value)
+    }
+}
+
+impl From<std::io::ErrorKind> for ErrorKind {
+    fn from(value: std::io::ErrorKind) -> Self {
+        ErrorKind::Std(value)
+    }
+}
+
+impl From<ErrorKind> for std::io::ErrorKind {
+    fn from(value: ErrorKind) -> Self {
+        match value {
+            ErrorKind::Std(error_kind) => error_kind,
+            _ => std::io::ErrorKind::Other,
+        }
+    }
+}
diff --git a/crates/nu-protocol/src/errors/shell_error/location.rs b/crates/nu-protocol/src/errors/shell_error/location.rs
new file mode 100644
index 0000000000..340f9ada61
--- /dev/null
+++ b/crates/nu-protocol/src/errors/shell_error/location.rs
@@ -0,0 +1,56 @@
+use thiserror::Error;
+
+/// Represents a specific location in the Rust code.
+///
+/// This data structure is used to provide detailed information about where in the Rust code
+/// an error occurred.
+/// While most errors in [`ShellError`](super::ShellError) are related to user-provided Nushell
+/// code, some originate from the underlying Rust implementation.
+/// With this type, we can pinpoint the exact location of such errors, improving debugging
+/// and error reporting.
+#[derive(Debug, Clone, PartialEq, Eq, Error)]
+#[error("{file}:{line}:{column}")]
+pub struct Location {
+    file: &'static str,
+    line: u32,
+    column: u32,
+}
+
+impl Location {
+    /// Internal constructor for [`Location`].
+    ///
+    /// This function is not intended to be called directly.
+    /// Instead, use the [`location!`] macro to create instances.
+    #[doc(hidden)]
+    #[deprecated(
+        note = "This function is not meant to be called directly. Use `nu_protocol::location` instead."
+    )]
+    pub fn new(file: &'static str, line: u32, column: u32) -> Self {
+        Location { file, line, column }
+    }
+}
+
+/// Macro to create a new [`Location`] for the exact position in your code.
+///
+/// This macro captures the current file, line, and column during compilation,
+/// providing an easy way to associate errors with specific locations in the Rust code.
+///
+/// # Note
+/// This macro relies on the [`file!`], [`line!`], and [`column!`] macros to fetch the
+/// compilation context.
+#[macro_export]
+macro_rules! location {
+    () => {{
+        #[allow(deprecated)]
+        $crate::shell_error::location::Location::new(file!(), line!(), column!())
+    }};
+}
+
+#[test]
+fn test_location_macro() {
+    let location = crate::location!();
+    let line = line!() - 1; // Adjust for the macro call being on the previous line.
+    let file = file!();
+    assert_eq!(location.line, line);
+    assert_eq!(location.file, file);
+}
diff --git a/crates/nu-protocol/src/errors/shell_error.rs b/crates/nu-protocol/src/errors/shell_error/mod.rs
similarity index 87%
rename from crates/nu-protocol/src/errors/shell_error.rs
rename to crates/nu-protocol/src/errors/shell_error/mod.rs
index 208f2178f6..6f651836ca 100644
--- a/crates/nu-protocol/src/errors/shell_error.rs
+++ b/crates/nu-protocol/src/errors/shell_error/mod.rs
@@ -4,9 +4,13 @@ use crate::{
 };
 use miette::Diagnostic;
 use serde::{Deserialize, Serialize};
-use std::{io, num::NonZeroI32};
+use std::num::NonZeroI32;
 use thiserror::Error;
 
+pub mod bridge;
+pub mod io;
+pub mod location;
+
 /// The fundamental error type for the evaluation engine. These cases represent different kinds of errors
 /// the evaluator might face, along with helpful spans to label. An error renderer will take this error value
 /// and pass it into an error viewer to display to the user.
@@ -808,32 +812,6 @@ pub enum ShellError {
         span: Span,
     },
 
-    /// Failed to find a file during a nushell operation.
-    ///
-    /// ## Resolution
-    ///
-    /// Does the file in the error message exist? Is it readable and accessible? Is the casing right?
-    #[error("File not found")]
-    #[diagnostic(code(nu::shell::file_not_found), help("{file} does not exist"))]
-    FileNotFound {
-        file: String,
-        #[label("file not found")]
-        span: Span,
-    },
-
-    /// Failed to find a file during a nushell operation.
-    ///
-    /// ## Resolution
-    ///
-    /// Does the file in the error message exist? Is it readable and accessible? Is the casing right?
-    #[error("File not found")]
-    #[diagnostic(code(nu::shell::file_not_found))]
-    FileNotFoundCustom {
-        msg: String,
-        #[label("{msg}")]
-        span: Span,
-    },
-
     /// The registered plugin data for a plugin is invalid.
     ///
     /// ## Resolution
@@ -924,148 +902,14 @@ pub enum ShellError {
         span: Span,
     },
 
-    /// I/O operation interrupted.
-    ///
-    /// ## Resolution
-    ///
-    /// This is a generic error. Refer to the specific error message for further details.
-    #[error("I/O interrupted")]
-    #[diagnostic(code(nu::shell::io_interrupted))]
-    IOInterrupted {
-        msg: String,
-        #[label("{msg}")]
-        span: Span,
-    },
-
     /// An I/O operation failed.
     ///
     /// ## Resolution
     ///
-    /// This is a generic error. Refer to the specific error message for further details.
-    #[error("I/O error")]
-    #[diagnostic(code(nu::shell::io_error), help("{msg}"))]
-    IOError { msg: String },
-
-    /// An I/O operation failed.
-    ///
-    /// ## Resolution
-    ///
-    /// This is a generic error. Refer to the specific error message for further details.
-    #[error("I/O error")]
-    #[diagnostic(code(nu::shell::io_error))]
-    IOErrorSpanned {
-        msg: String,
-        #[label("{msg}")]
-        span: Span,
-    },
-
-    /// Tried to `cd` to a path that isn't a directory.
-    ///
-    /// ## Resolution
-    ///
-    /// Make sure the path is a directory. It currently exists, but is of some other type, like a file.
-    #[error("Cannot change to directory")]
-    #[diagnostic(code(nu::shell::cannot_cd_to_directory))]
-    NotADirectory {
-        #[label("is not a directory")]
-        span: Span,
-    },
-
-    /// Attempted to perform an operation on a directory that doesn't exist.
-    ///
-    /// ## Resolution
-    ///
-    /// Make sure the directory in the error message actually exists before trying again.
-    #[error("Directory not found")]
-    #[diagnostic(code(nu::shell::directory_not_found), help("{dir} does not exist"))]
-    DirectoryNotFound {
-        dir: String,
-        #[label("directory not found")]
-        span: Span,
-    },
-
-    /// The requested move operation cannot be completed. This is typically because both paths exist,
-    /// but are of different types. For example, you might be trying to overwrite an existing file with
-    /// a directory.
-    ///
-    /// ## Resolution
-    ///
-    /// Make sure the destination path does not exist before moving a directory.
-    #[error("Move not possible")]
-    #[diagnostic(code(nu::shell::move_not_possible))]
-    MoveNotPossible {
-        source_message: String,
-        #[label("{source_message}")]
-        source_span: Span,
-        destination_message: String,
-        #[label("{destination_message}")]
-        destination_span: Span,
-    },
-
-    /// Failed to create either a file or directory.
-    ///
-    /// ## Resolution
-    ///
-    /// This is a fairly generic error. Refer to the specific error message for further details.
-    #[error("Create not possible")]
-    #[diagnostic(code(nu::shell::create_not_possible))]
-    CreateNotPossible {
-        msg: String,
-        #[label("{msg}")]
-        span: Span,
-    },
-
-    /// Changing the access time ("atime") of this file is not possible.
-    ///
-    /// ## Resolution
-    ///
-    /// This can be for various reasons, such as your platform or permission flags. Refer to the specific error message for more details.
-    #[error("Not possible to change the access time")]
-    #[diagnostic(code(nu::shell::change_access_time_not_possible))]
-    ChangeAccessTimeNotPossible {
-        msg: String,
-        #[label("{msg}")]
-        span: Span,
-    },
-
-    /// Changing the modification time ("mtime") of this file is not possible.
-    ///
-    /// ## Resolution
-    ///
-    /// This can be for various reasons, such as your platform or permission flags. Refer to the specific error message for more details.
-    #[error("Not possible to change the modified time")]
-    #[diagnostic(code(nu::shell::change_modified_time_not_possible))]
-    ChangeModifiedTimeNotPossible {
-        msg: String,
-        #[label("{msg}")]
-        span: Span,
-    },
-
-    /// Unable to remove this item.
-    ///
-    /// ## Resolution
-    ///
-    /// Removal can fail for a number of reasons, such as permissions problems. Refer to the specific error message for more details.
-    #[error("Remove not possible")]
-    #[diagnostic(code(nu::shell::remove_not_possible))]
-    RemoveNotPossible {
-        msg: String,
-        #[label("{msg}")]
-        span: Span,
-    },
-
-    /// Error while trying to read a file
-    ///
-    /// ## Resolution
-    ///
-    /// The error will show the result from a file operation
-    #[error("Error trying to read file")]
-    #[diagnostic(code(nu::shell::error_reading_file))]
-    ReadingFile {
-        msg: String,
-        #[label("{msg}")]
-        span: Span,
-    },
+    /// This is the main I/O error, for further details check the error kind and additional context.
+    #[error(transparent)]
+    #[diagnostic(transparent)]
+    Io(io::IoError),
 
     /// A name was not found. Did you mean a different name?
     ///
@@ -1531,75 +1375,26 @@ impl ShellError {
     }
 }
 
-impl From<io::Error> for ShellError {
-    fn from(error: io::Error) -> ShellError {
-        if error.kind() == io::ErrorKind::Other {
-            match error.into_inner() {
-                Some(err) => match err.downcast() {
-                    Ok(err) => *err,
-                    Err(err) => Self::IOError {
-                        msg: err.to_string(),
-                    },
-                },
-                None => Self::IOError {
-                    msg: "unknown error".into(),
-                },
-            }
-        } else {
-            Self::IOError {
-                msg: error.to_string(),
-            }
-        }
-    }
-}
-
-impl From<Spanned<io::Error>> for ShellError {
-    fn from(error: Spanned<io::Error>) -> Self {
-        let Spanned { item: error, span } = error;
-        match error.kind() {
-            io::ErrorKind::Other => match error.into_inner() {
-                Some(err) => match err.downcast() {
-                    Ok(err) => *err,
-                    Err(err) => Self::IOErrorSpanned {
-                        msg: err.to_string(),
-                        span,
-                    },
-                },
-                None => Self::IOErrorSpanned {
-                    msg: "unknown error".into(),
-                    span,
-                },
-            },
-            io::ErrorKind::TimedOut => Self::NetworkFailure {
-                msg: error.to_string(),
-                span,
-            },
-            _ => Self::IOErrorSpanned {
-                msg: error.to_string(),
-                span,
-            },
-        }
-    }
-}
-
-impl From<ShellError> for io::Error {
-    fn from(error: ShellError) -> Self {
-        io::Error::new(io::ErrorKind::Other, error)
-    }
-}
-
 impl From<Box<dyn std::error::Error>> for ShellError {
     fn from(error: Box<dyn std::error::Error>) -> ShellError {
-        ShellError::IOError {
+        ShellError::GenericError {
+            error: format!("{error:?}"),
             msg: error.to_string(),
+            span: None,
+            help: None,
+            inner: vec![],
         }
     }
 }
 
 impl From<Box<dyn std::error::Error + Send + Sync>> for ShellError {
     fn from(error: Box<dyn std::error::Error + Send + Sync>) -> ShellError {
-        ShellError::IOError {
-            msg: format!("{error:?}"),
+        ShellError::GenericError {
+            error: format!("{error:?}"),
+            msg: error.to_string(),
+            span: None,
+            help: None,
+            inner: vec![],
         }
     }
 }
@@ -1682,3 +1477,26 @@ fn shell_error_serialize_roundtrip() {
         deserialized.help().map(|c| c.to_string())
     );
 }
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    impl From<std::io::Error> for ShellError {
+        fn from(_: std::io::Error) -> ShellError {
+            unimplemented!("This implementation is defined in the test module to ensure no other implementation exists.")
+        }
+    }
+
+    impl From<Spanned<std::io::Error>> for ShellError {
+        fn from(_: Spanned<std::io::Error>) -> Self {
+            unimplemented!("This implementation is defined in the test module to ensure no other implementation exists.")
+        }
+    }
+
+    impl From<ShellError> for std::io::Error {
+        fn from(_: ShellError) -> Self {
+            unimplemented!("This implementation is defined in the test module to ensure no other implementation exists.")
+        }
+    }
+}
diff --git a/crates/nu-protocol/src/eval_const.rs b/crates/nu-protocol/src/eval_const.rs
index 25f5d8404a..86ce4d7385 100644
--- a/crates/nu-protocol/src/eval_const.rs
+++ b/crates/nu-protocol/src/eval_const.rs
@@ -143,8 +143,12 @@ pub(crate) fn create_nu_constant(engine_state: &EngineState, span: Span) -> Valu
             Value::string(canon_home_path.to_string_lossy(), span)
         } else {
             Value::error(
-                ShellError::IOError {
+                ShellError::GenericError {
+                    error: "setting $nu.home-path failed".into(),
                     msg: "Could not get home path".into(),
+                    span: Some(span),
+                    help: None,
+                    inner: vec![],
                 },
                 span,
             )
@@ -159,8 +163,12 @@ pub(crate) fn create_nu_constant(engine_state: &EngineState, span: Span) -> Valu
             Value::string(canon_data_path.to_string_lossy(), span)
         } else {
             Value::error(
-                ShellError::IOError {
+                ShellError::GenericError {
+                    error: "setting $nu.data-dir failed".into(),
                     msg: "Could not get data path".into(),
+                    span: Some(span),
+                    help: None,
+                    inner: vec![],
                 },
                 span,
             )
@@ -175,8 +183,12 @@ pub(crate) fn create_nu_constant(engine_state: &EngineState, span: Span) -> Valu
             Value::string(canon_cache_path.to_string_lossy(), span)
         } else {
             Value::error(
-                ShellError::IOError {
+                ShellError::GenericError {
+                    error: "setting $nu.cache-dir failed".into(),
                     msg: "Could not get cache path".into(),
+                    span: Some(span),
+                    help: None,
+                    inner: vec![],
                 },
                 span,
             )
@@ -248,8 +260,12 @@ pub(crate) fn create_nu_constant(engine_state: &EngineState, span: Span) -> Valu
             Value::string(current_exe.to_string_lossy(), span)
         } else {
             Value::error(
-                ShellError::IOError {
-                    msg: "Could not get current executable path".to_string(),
+                ShellError::GenericError {
+                    error: "setting $nu.current-exe failed".into(),
+                    msg: "Could not get current executable path".into(),
+                    span: Some(span),
+                    help: None,
+                    inner: vec![],
                 },
                 span,
             )
diff --git a/crates/nu-protocol/src/pipeline/byte_stream.rs b/crates/nu-protocol/src/pipeline/byte_stream.rs
index b5cbbff237..e06a651088 100644
--- a/crates/nu-protocol/src/pipeline/byte_stream.rs
+++ b/crates/nu-protocol/src/pipeline/byte_stream.rs
@@ -1,7 +1,13 @@
 //! Module managing the streaming of raw bytes between pipeline elements
+//!
+//! This module also handles conversions the [`ShellError`] <-> [`io::Error`](std::io::Error),
+//! so remember the usage of [`ShellErrorBridge`] where applicable.
 #[cfg(feature = "os")]
 use crate::process::{ChildPipe, ChildProcess};
-use crate::{ErrSpan, IntRange, IntoSpanned, PipelineData, ShellError, Signals, Span, Type, Value};
+use crate::{
+    shell_error::{bridge::ShellErrorBridge, io::IoError},
+    IntRange, PipelineData, ShellError, Signals, Span, Type, Value,
+};
 use serde::{Deserialize, Serialize};
 use std::ops::Bound;
 #[cfg(unix)]
@@ -225,7 +231,8 @@ impl ByteStream {
         let known_size = self.known_size.map(|len| len.saturating_sub(n));
         if let Some(mut reader) = self.reader() {
             // Copy the number of skipped bytes into the sink before proceeding
-            io::copy(&mut (&mut reader).take(n), &mut io::sink()).err_span(span)?;
+            io::copy(&mut (&mut reader).take(n), &mut io::sink())
+                .map_err(|err| IoError::new(err.kind(), span, None))?;
             Ok(
                 ByteStream::read(reader, span, Signals::empty(), ByteStreamType::Binary)
                     .with_known_size(known_size),
@@ -346,7 +353,7 @@ impl ByteStream {
     /// binary.
     #[cfg(feature = "os")]
     pub fn stdin(span: Span) -> Result<Self, ShellError> {
-        let stdin = os_pipe::dup_stdin().err_span(span)?;
+        let stdin = os_pipe::dup_stdin().map_err(|err| IoError::new(err.kind(), span, None))?;
         let source = ByteStreamSource::File(convert_file(stdin));
         Ok(Self::new(
             source,
@@ -573,15 +580,16 @@ impl ByteStream {
     /// Any trailing new lines are kept in the returned [`Vec`].
     pub fn into_bytes(self) -> Result<Vec<u8>, ShellError> {
         // todo!() ctrlc
+        let from_io_error = IoError::factory(self.span, None);
         match self.stream {
             ByteStreamSource::Read(mut read) => {
                 let mut buf = Vec::new();
-                read.read_to_end(&mut buf).err_span(self.span)?;
+                read.read_to_end(&mut buf).map_err(&from_io_error)?;
                 Ok(buf)
             }
             ByteStreamSource::File(mut file) => {
                 let mut buf = Vec::new();
-                file.read_to_end(&mut buf).err_span(self.span)?;
+                file.read_to_end(&mut buf).map_err(&from_io_error)?;
                 Ok(buf)
             }
             #[cfg(feature = "os")]
@@ -759,7 +767,12 @@ where
         while let Some(cursor) = self.cursor.as_mut() {
             let read = cursor.read(buf)?;
             if read == 0 {
-                self.cursor = self.iter.next().transpose()?.map(Cursor::new);
+                self.cursor = self
+                    .iter
+                    .next()
+                    .transpose()
+                    .map_err(ShellErrorBridge)?
+                    .map(Cursor::new);
             } else {
                 return Ok(read);
             }
@@ -782,7 +795,7 @@ impl Reader {
 
 impl Read for Reader {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        self.signals.check(self.span)?;
+        self.signals.check(self.span).map_err(ShellErrorBridge)?;
         self.reader.read(buf)
     }
 }
@@ -826,7 +839,7 @@ impl Iterator for Lines {
                     trim_end_newline(&mut string);
                     Some(Ok(string))
                 }
-                Err(e) => Some(Err(e.into_spanned(self.span).into())),
+                Err(e) => Some(Err(IoError::new(e.kind(), self.span, None).into())),
             }
         }
     }
@@ -1022,7 +1035,15 @@ impl Iterator for SplitRead {
         if self.signals.interrupted() {
             return None;
         }
-        self.internal.next().map(|r| r.map_err(|e| e.into()))
+        self.internal.next().map(|r| {
+            r.map_err(|err| {
+                ShellError::Io(IoError::new_internal(
+                    err.kind(),
+                    "Could not get next value for SplitRead",
+                    crate::location!(),
+                ))
+            })
+        })
     }
 }
 
@@ -1057,12 +1078,17 @@ impl Chunks {
     }
 
     fn next_string(&mut self) -> Result<Option<String>, (Vec<u8>, ShellError)> {
+        let from_io_error = |err: std::io::Error| match ShellErrorBridge::try_from(err) {
+            Ok(err) => err.0,
+            Err(err) => IoError::new(err.kind(), self.span, None).into(),
+        };
+
         // Get some data from the reader
         let buf = self
             .reader
             .fill_buf()
-            .err_span(self.span)
-            .map_err(|err| (vec![], ShellError::from(err)))?;
+            .map_err(from_io_error)
+            .map_err(|err| (vec![], err))?;
 
         // If empty, this is EOF
         if buf.is_empty() {
@@ -1076,9 +1102,9 @@ impl Chunks {
         if buf.len() < 4 {
             consumed += buf.len();
             self.reader.consume(buf.len());
-            match self.reader.fill_buf().err_span(self.span) {
+            match self.reader.fill_buf() {
                 Ok(more_bytes) => buf.extend_from_slice(more_bytes),
-                Err(err) => return Err((buf, err.into())),
+                Err(err) => return Err((buf, from_io_error(err))),
             }
         }
 
@@ -1133,11 +1159,15 @@ impl Iterator for Chunks {
             match self.type_ {
                 // Binary should always be binary
                 ByteStreamType::Binary => {
-                    let buf = match self.reader.fill_buf().err_span(self.span) {
+                    let buf = match self.reader.fill_buf() {
                         Ok(buf) => buf,
                         Err(err) => {
                             self.error = true;
-                            return Some(Err(err.into()));
+                            return Some(Err(ShellError::Io(IoError::new(
+                                err.kind(),
+                                self.span,
+                                None,
+                            ))));
                         }
                     };
                     if !buf.is_empty() {
@@ -1206,15 +1236,19 @@ pub fn copy_with_signals(
     span: Span,
     signals: &Signals,
 ) -> Result<u64, ShellError> {
+    let from_io_error = IoError::factory(span, None);
     if signals.is_empty() {
         match io::copy(&mut reader, &mut writer) {
             Ok(n) => {
-                writer.flush().err_span(span)?;
+                writer.flush().map_err(&from_io_error)?;
                 Ok(n)
             }
             Err(err) => {
                 let _ = writer.flush();
-                Err(err.into_spanned(span).into())
+                match ShellErrorBridge::try_from(err) {
+                    Ok(ShellErrorBridge(shell_error)) => Err(shell_error),
+                    Err(err) => Err(from_io_error(err).into()),
+                }
             }
         }
     } else {
@@ -1224,7 +1258,7 @@ pub fn copy_with_signals(
         // }
         match generic_copy(&mut reader, &mut writer, span, signals) {
             Ok(len) => {
-                writer.flush().err_span(span)?;
+                writer.flush().map_err(&from_io_error)?;
                 Ok(len)
             }
             Err(err) => {
@@ -1242,6 +1276,7 @@ fn generic_copy(
     span: Span,
     signals: &Signals,
 ) -> Result<u64, ShellError> {
+    let from_io_error = IoError::factory(span, None);
     let buf = &mut [0; DEFAULT_BUF_SIZE];
     let mut len = 0;
     loop {
@@ -1250,10 +1285,13 @@ fn generic_copy(
             Ok(0) => break,
             Ok(n) => n,
             Err(e) if e.kind() == ErrorKind::Interrupted => continue,
-            Err(e) => return Err(e.into_spanned(span).into()),
+            Err(e) => match ShellErrorBridge::try_from(e) {
+                Ok(ShellErrorBridge(e)) => return Err(e),
+                Err(e) => return Err(from_io_error(e).into()),
+            },
         };
         len += n;
-        writer.write_all(&buf[..n]).err_span(span)?;
+        writer.write_all(&buf[..n]).map_err(&from_io_error)?;
     }
     Ok(len as u64)
 }
@@ -1278,7 +1316,7 @@ where
             self.buffer.set_position(0);
             self.buffer.get_mut().clear();
             // Ask the generator to generate data
-            if !(self.generator)(self.buffer.get_mut())? {
+            if !(self.generator)(self.buffer.get_mut()).map_err(ShellErrorBridge)? {
                 // End of stream
                 break;
             }
diff --git a/crates/nu-protocol/src/pipeline/pipeline_data.rs b/crates/nu-protocol/src/pipeline/pipeline_data.rs
index b9d523b3da..b4a1e9ca01 100644
--- a/crates/nu-protocol/src/pipeline/pipeline_data.rs
+++ b/crates/nu-protocol/src/pipeline/pipeline_data.rs
@@ -1,6 +1,7 @@
 use crate::{
     ast::{Call, PathMember},
     engine::{EngineState, Stack},
+    shell_error::io::IoError,
     ByteStream, ByteStreamType, Config, ListStream, OutDest, PipelineMetadata, Range, ShellError,
     Signals, Span, Type, Value,
 };
@@ -219,17 +220,47 @@ impl PipelineData {
             PipelineData::Empty => Ok(()),
             PipelineData::Value(value, ..) => {
                 let bytes = value_to_bytes(value)?;
-                dest.write_all(&bytes)?;
-                dest.flush()?;
+                dest.write_all(&bytes).map_err(|err| {
+                    IoError::new_internal(
+                        err.kind(),
+                        "Could not write PipelineData to dest",
+                        crate::location!(),
+                    )
+                })?;
+                dest.flush().map_err(|err| {
+                    IoError::new_internal(
+                        err.kind(),
+                        "Could not flush PipelineData to dest",
+                        crate::location!(),
+                    )
+                })?;
                 Ok(())
             }
             PipelineData::ListStream(stream, ..) => {
                 for value in stream {
                     let bytes = value_to_bytes(value)?;
-                    dest.write_all(&bytes)?;
-                    dest.write_all(b"\n")?;
+                    dest.write_all(&bytes).map_err(|err| {
+                        IoError::new_internal(
+                            err.kind(),
+                            "Could not write PipelineData to dest",
+                            crate::location!(),
+                        )
+                    })?;
+                    dest.write_all(b"\n").map_err(|err| {
+                        IoError::new_internal(
+                            err.kind(),
+                            "Could not write linebreak after PipelineData to dest",
+                            crate::location!(),
+                        )
+                    })?;
                 }
-                dest.flush()?;
+                dest.flush().map_err(|err| {
+                    IoError::new_internal(
+                        err.kind(),
+                        "Could not flush PipelineData to dest",
+                        crate::location!(),
+                    )
+                })?;
                 Ok(())
             }
             PipelineData::ByteStream(stream, ..) => stream.write_to(dest),
@@ -633,9 +664,23 @@ impl PipelineData {
     ) -> Result<(), ShellError> {
         if let PipelineData::Value(Value::Binary { val: bytes, .. }, _) = self {
             if to_stderr {
-                stderr_write_all_and_flush(bytes)?;
+                stderr_write_all_and_flush(bytes).map_err(|err| {
+                    IoError::new_with_additional_context(
+                        err.kind(),
+                        Span::unknown(),
+                        None,
+                        "Writing to stderr failed",
+                    )
+                })?
             } else {
-                stdout_write_all_and_flush(bytes)?;
+                stdout_write_all_and_flush(bytes).map_err(|err| {
+                    IoError::new_with_additional_context(
+                        err.kind(),
+                        Span::unknown(),
+                        None,
+                        "Writing to stdout failed",
+                    )
+                })?
             }
             Ok(())
         } else {
@@ -666,9 +711,23 @@ impl PipelineData {
                 }
 
                 if to_stderr {
-                    stderr_write_all_and_flush(out)?
+                    stderr_write_all_and_flush(out).map_err(|err| {
+                        IoError::new_with_additional_context(
+                            err.kind(),
+                            Span::unknown(),
+                            None,
+                            "Writing to stderr failed",
+                        )
+                    })?
                 } else {
-                    stdout_write_all_and_flush(out)?
+                    stdout_write_all_and_flush(out).map_err(|err| {
+                        IoError::new_with_additional_context(
+                            err.kind(),
+                            Span::unknown(),
+                            None,
+                            "Writing to stdout failed",
+                        )
+                    })?
                 }
             }
 
diff --git a/crates/nu-protocol/src/process/child.rs b/crates/nu-protocol/src/process/child.rs
index 8c4fb55c0d..1c0ef513ed 100644
--- a/crates/nu-protocol/src/process/child.rs
+++ b/crates/nu-protocol/src/process/child.rs
@@ -1,4 +1,4 @@
-use crate::{byte_stream::convert_file, ErrSpan, IntoSpanned, ShellError, Span};
+use crate::{byte_stream::convert_file, shell_error::io::IoError, ShellError, Span};
 use nu_system::{ExitStatus, ForegroundChild};
 use os_pipe::PipeReader;
 use std::{
@@ -74,13 +74,18 @@ impl ExitStatusFuture {
                         Ok(status)
                     }
                     Ok(Ok(status)) => Ok(status),
-                    Ok(Err(err)) => Err(ShellError::IOErrorSpanned {
-                        msg: format!("failed to get exit code: {err:?}"),
+                    Ok(Err(err)) => Err(ShellError::Io(IoError::new_with_additional_context(
+                        err.kind(),
                         span,
-                    }),
-                    Err(RecvError) => Err(ShellError::IOErrorSpanned {
+                        None,
+                        "failed to get exit code",
+                    ))),
+                    Err(err @ RecvError) => Err(ShellError::GenericError {
+                        error: err.to_string(),
                         msg: "failed to get exit code".into(),
-                        span,
+                        span: span.into(),
+                        help: None,
+                        inner: vec![],
                     }),
                 };
 
@@ -98,13 +103,19 @@ impl ExitStatusFuture {
             ExitStatusFuture::Running(receiver) => {
                 let code = match receiver.try_recv() {
                     Ok(Ok(status)) => Ok(Some(status)),
-                    Ok(Err(err)) => Err(ShellError::IOErrorSpanned {
-                        msg: format!("failed to get exit code: {err:?}"),
-                        span,
+                    Ok(Err(err)) => Err(ShellError::GenericError {
+                        error: err.to_string(),
+                        msg: "failed to get exit code".to_string(),
+                        span: span.into(),
+                        help: None,
+                        inner: vec![],
                     }),
-                    Err(TryRecvError::Disconnected) => Err(ShellError::IOErrorSpanned {
+                    Err(TryRecvError::Disconnected) => Err(ShellError::GenericError {
+                        error: "receiver disconnected".to_string(),
                         msg: "failed to get exit code".into(),
-                        span,
+                        span: span.into(),
+                        help: None,
+                        inner: vec![],
                     }),
                     Err(TryRecvError::Empty) => Ok(None),
                 };
@@ -180,7 +191,14 @@ impl ChildProcess {
         thread::Builder::new()
             .name("exit status waiter".into())
             .spawn(move || exit_status_sender.send(child.wait()))
-            .err_span(span)?;
+            .map_err(|err| {
+                IoError::new_with_additional_context(
+                    err.kind(),
+                    span,
+                    None,
+                    "Could now spawn exit status waiter",
+                )
+            })?;
 
         Ok(Self::from_raw(stdout, stderr, Some(exit_status), span))
     }
@@ -214,14 +232,17 @@ impl ChildProcess {
     pub fn into_bytes(mut self) -> Result<Vec<u8>, ShellError> {
         if self.stderr.is_some() {
             debug_assert!(false, "stderr should not exist");
-            return Err(ShellError::IOErrorSpanned {
-                msg: "internal error".into(),
-                span: self.span,
+            return Err(ShellError::GenericError {
+                error: "internal error".into(),
+                msg: "stderr should not exist".into(),
+                span: self.span.into(),
+                help: None,
+                inner: vec![],
             });
         }
 
         let bytes = if let Some(stdout) = self.stdout {
-            collect_bytes(stdout).err_span(self.span)?
+            collect_bytes(stdout).map_err(|err| IoError::new(err.kind(), self.span, None))?
         } else {
             Vec::new()
         };
@@ -236,6 +257,7 @@ impl ChildProcess {
     }
 
     pub fn wait(mut self) -> Result<(), ShellError> {
+        let from_io_error = IoError::factory(self.span, None);
         if let Some(stdout) = self.stdout.take() {
             let stderr = self
                 .stderr
@@ -246,7 +268,7 @@ impl ChildProcess {
                         .spawn(move || consume_pipe(stderr))
                 })
                 .transpose()
-                .err_span(self.span)?;
+                .map_err(&from_io_error)?;
 
             let res = consume_pipe(stdout);
 
@@ -254,7 +276,7 @@ impl ChildProcess {
                 handle
                     .join()
                     .map_err(|e| match e.downcast::<io::Error>() {
-                        Ok(io) => ShellError::from((*io).into_spanned(self.span)),
+                        Ok(io) => from_io_error(*io).into(),
                         Err(err) => ShellError::GenericError {
                             error: "Unknown error".into(),
                             msg: format!("{err:?}"),
@@ -263,12 +285,12 @@ impl ChildProcess {
                             inner: Vec::new(),
                         },
                     })?
-                    .err_span(self.span)?;
+                    .map_err(&from_io_error)?;
             }
 
-            res.err_span(self.span)?;
+            res.map_err(&from_io_error)?;
         } else if let Some(stderr) = self.stderr.take() {
-            consume_pipe(stderr).err_span(self.span)?;
+            consume_pipe(stderr).map_err(&from_io_error)?;
         }
 
         check_ok(
@@ -283,19 +305,20 @@ impl ChildProcess {
     }
 
     pub fn wait_with_output(mut self) -> Result<ProcessOutput, ShellError> {
+        let from_io_error = IoError::factory(self.span, None);
         let (stdout, stderr) = if let Some(stdout) = self.stdout {
             let stderr = self
                 .stderr
                 .map(|stderr| thread::Builder::new().spawn(move || collect_bytes(stderr)))
                 .transpose()
-                .err_span(self.span)?;
+                .map_err(&from_io_error)?;
 
-            let stdout = collect_bytes(stdout).err_span(self.span)?;
+            let stdout = collect_bytes(stdout).map_err(&from_io_error)?;
 
             let stderr = stderr
                 .map(|handle| {
                     handle.join().map_err(|e| match e.downcast::<io::Error>() {
-                        Ok(io) => ShellError::from((*io).into_spanned(self.span)),
+                        Ok(io) => from_io_error(*io).into(),
                         Err(err) => ShellError::GenericError {
                             error: "Unknown error".into(),
                             msg: format!("{err:?}"),
@@ -307,7 +330,7 @@ impl ChildProcess {
                 })
                 .transpose()?
                 .transpose()
-                .err_span(self.span)?;
+                .map_err(&from_io_error)?;
 
             (Some(stdout), stderr)
         } else {
@@ -315,7 +338,7 @@ impl ChildProcess {
                 .stderr
                 .map(collect_bytes)
                 .transpose()
-                .err_span(self.span)?;
+                .map_err(&from_io_error)?;
 
             (None, stderr)
         };
diff --git a/crates/nu-protocol/src/span.rs b/crates/nu-protocol/src/span.rs
index 9fe42c2530..dd465b5a63 100644
--- a/crates/nu-protocol/src/span.rs
+++ b/crates/nu-protocol/src/span.rs
@@ -115,10 +115,17 @@ impl Span {
         Self { start: 0, end: 0 }
     }
 
+    /// Span for testing purposes.
+    ///
+    /// The provided span does not point into any known source but is unequal to [`Span::unknown()`].
+    ///
     /// Note: Only use this for test data, *not* live data, as it will point into unknown source
-    /// when used in errors.
+    /// when used in errors
     pub const fn test_data() -> Self {
-        Self::unknown()
+        Self {
+            start: usize::MAX / 2,
+            end: usize::MAX / 2,
+        }
     }
 
     pub fn offset(&self, offset: usize) -> Self {
@@ -215,26 +222,14 @@ impl From<Span> for SourceSpan {
     }
 }
 
-/// An extension trait for `Result`, which adds a span to the error type.
+/// An extension trait for [`Result`], which adds a span to the error type.
+///
+/// This trait might be removed later, since the old [`Spanned<std::io::Error>`] to [`ShellError`]
+/// conversion was replaced by [`IoError`](io_error::IoError).
 pub trait ErrSpan {
     type Result;
 
-    /// Add the given span to the error type `E`, turning it into a `Spanned<E>`.
-    ///
-    /// Some auto-conversion methods to `ShellError` from other error types are available on spanned
-    /// errors, to give users better information about where an error came from. For example, it is
-    /// preferred when working with `std::io::Error`:
-    ///
-    /// ```no_run
-    /// use nu_protocol::{ErrSpan, ShellError, Span};
-    /// use std::io::Read;
-    ///
-    /// fn read_from(mut reader: impl Read, span: Span) -> Result<Vec<u8>, ShellError> {
-    ///     let mut vec = vec![];
-    ///     reader.read_to_end(&mut vec).err_span(span)?;
-    ///     Ok(vec)
-    /// }
-    /// ```
+    /// Adds the given span to the error type, turning it into a [`Spanned<E>`].
     fn err_span(self, span: Span) -> Self::Result;
 }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/open.rs b/crates/nu_plugin_polars/src/dataframe/command/core/open.rs
index 97a44d8f4f..b218530e64 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/open.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/open.rs
@@ -11,8 +11,8 @@ use url::Url;
 
 use nu_plugin::PluginCommand;
 use nu_protocol::{
-    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Spanned,
-    SyntaxShape, Type, Value,
+    shell_error::io::IoError, Category, Example, LabeledError, PipelineData, ShellError, Signature,
+    Span, Spanned, SyntaxShape, Type, Value,
 };
 
 use std::{fmt::Debug, fs::File, io::BufReader, num::NonZeroUsize, path::PathBuf, sync::Arc};
@@ -221,10 +221,12 @@ fn command(
                 blamed,
             )),
         },
-        None => Err(ShellError::FileNotFoundCustom {
-            msg: "File without extension".into(),
-            span: spanned_file.span,
-        }),
+        None => Err(ShellError::Io(IoError::new_with_additional_context(
+            std::io::ErrorKind::NotFound,
+            spanned_file.span,
+            PathBuf::from(spanned_file.item),
+            "File without extension",
+        ))),
     }
     .map(|value| PipelineData::Value(value, None))
 }
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/save/mod.rs b/crates/nu_plugin_polars/src/dataframe/command/core/save/mod.rs
index 8619ec9d42..775baca990 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/save/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/save/mod.rs
@@ -14,8 +14,8 @@ use crate::{
 use nu_path::expand_path_with;
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
-    Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, Spanned,
-    SyntaxShape, Type,
+    shell_error::io::IoError, Category, Example, LabeledError, PipelineData, ShellError, Signature,
+    Span, Spanned, SyntaxShape, Type,
 };
 use polars::error::PolarsError;
 
@@ -204,10 +204,12 @@ fn command(
                 blamed,
             )),
         },
-        None => Err(ShellError::FileNotFoundCustom {
-            msg: "File without extension".into(),
-            span: spanned_file.span,
-        }),
+        None => Err(ShellError::Io(IoError::new_with_additional_context(
+            std::io::ErrorKind::NotFound,
+            spanned_file.span,
+            spanned_file.item,
+            "File without extension",
+        ))),
     }?;
 
     Ok(PipelineData::empty())
diff --git a/src/ide.rs b/src/ide.rs
index 85023745fa..6ce7e69c6f 100644
--- a/src/ide.rs
+++ b/src/ide.rs
@@ -3,7 +3,9 @@ use nu_cli::NuCompleter;
 use nu_parser::{flatten_block, parse, FlatShape};
 use nu_protocol::{
     engine::{EngineState, Stack, StateWorkingSet},
-    report_shell_error, DeclId, ShellError, Span, Value, VarId,
+    report_shell_error,
+    shell_error::io::IoError,
+    DeclId, ShellError, Span, Value, VarId,
 };
 use reedline::Completer;
 use serde_json::{json, Value as JsonValue};
@@ -54,15 +56,16 @@ fn read_in_file<'a>(
     file_path: &str,
 ) -> (Vec<u8>, StateWorkingSet<'a>) {
     let file = std::fs::read(file_path)
-        .into_diagnostic()
-        .unwrap_or_else(|e| {
-            report_shell_error(
-                engine_state,
-                &ShellError::FileNotFoundCustom {
-                    msg: format!("Could not read file '{}': {:?}", file_path, e.to_string()),
-                    span: Span::unknown(),
-                },
-            );
+        .map_err(|err| {
+            ShellError::Io(IoError::new_with_additional_context(
+                err.kind(),
+                Span::unknown(),
+                PathBuf::from(file_path),
+                "Could not read file",
+            ))
+        })
+        .unwrap_or_else(|err| {
+            report_shell_error(engine_state, &err);
             std::process::exit(1);
         });
 
diff --git a/src/main.rs b/src/main.rs
index 0e7c656fc7..6beae6de77 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -428,7 +428,13 @@ fn main() -> Result<()> {
         for plugin_filename in plugins {
             // Make sure the plugin filenames are canonicalized
             let filename = canonicalize_with(&plugin_filename.item, &init_cwd)
-                .err_span(plugin_filename.span)
+                .map_err(|err| {
+                    nu_protocol::shell_error::io::IoError::new(
+                        err.kind(),
+                        plugin_filename.span,
+                        PathBuf::from(&plugin_filename.item),
+                    )
+                })
                 .map_err(ShellError::from)?;
 
             let identity = PluginIdentity::new(&filename, None)

From 080b501ba8a5615a862b704c9a0955655d64989c Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Wed, 29 Jan 2025 01:09:53 +0100
Subject: [PATCH 0970/1072] Fix `cargo doc` Warnings (#14948)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
As an avid `cargo doc` enjoyer I realized we had some doc warnings, so I
fixed them.

After this PR `cargo doc --workspace` should stop throwing warnings.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

No code changes.

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->

We could add a `cargo doc` CI pipeline but usually running a full `cargo
doc` takes like forever, so maybe we don't want that.
---
 crates/nu-plugin-core/src/serializers/mod.rs       |  4 ++--
 crates/nu-protocol/src/engine/engine_state.rs      |  8 ++++----
 crates/nu-protocol/src/engine/state_working_set.rs | 11 ++++++-----
 crates/nu-protocol/src/errors/shell_error/io.rs    |  7 ++++---
 crates/nu-protocol/src/pipeline/pipeline_data.rs   |  2 +-
 crates/nu-protocol/src/span.rs                     |  5 +++--
 crates/nu-protocol/src/ty.rs                       |  5 +++--
 crates/nu-protocol/src/value/mod.rs                |  2 +-
 8 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/crates/nu-plugin-core/src/serializers/mod.rs b/crates/nu-plugin-core/src/serializers/mod.rs
index 8fe09cc4f6..545aecbf7d 100644
--- a/crates/nu-plugin-core/src/serializers/mod.rs
+++ b/crates/nu-plugin-core/src/serializers/mod.rs
@@ -12,7 +12,7 @@ mod tests;
 pub trait Encoder<T>: Clone + Send + Sync {
     /// Serialize a value in the [`PluginEncoder`]s format
     ///
-    /// Returns [`ShellError::IOError`] if there was a problem writing, or
+    /// Returns [`ShellError::Io`] if there was a problem writing, or
     /// [`ShellError::PluginFailedToEncode`] for a serialization error.
     fn encode(&self, data: &T, writer: &mut impl std::io::Write) -> Result<(), ShellError>;
 
@@ -20,7 +20,7 @@ pub trait Encoder<T>: Clone + Send + Sync {
     ///
     /// Returns `None` if there is no more output to receive.
     ///
-    /// Returns [`ShellError::IOError`] if there was a problem reading, or
+    /// Returns [`ShellError::Io`] if there was a problem reading, or
     /// [`ShellError::PluginFailedToDecode`] for a deserialization error.
     fn decode(&self, reader: &mut impl std::io::BufRead) -> Result<Option<T>, ShellError>;
 }
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index dbded4eb63..5ee560f8f6 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -609,7 +609,7 @@ impl EngineState {
         }
     }
 
-    /// Find the [`DeclId`](nu_protocol::id::DeclId) corresponding to a declaration with `name`.
+    /// Find the [`DeclId`](crate::DeclId) corresponding to a declaration with `name`.
     ///
     /// Searches within active overlays, and filtering out overlays in `removed_overlays`.
     pub fn find_decl(&self, name: &[u8], removed_overlays: &[Vec<u8>]) -> Option<DeclId> {
@@ -649,21 +649,21 @@ impl EngineState {
         None
     }
 
-    /// Find the [`OverlayId`](nu_protocol::id::OverlayId) corresponding to `name`.
+    /// Find the [`OverlayId`](crate::OverlayId) corresponding to `name`.
     ///
     /// Searches all overlays, not just active overlays. To search only in active overlays, use [`find_active_overlay`](EngineState::find_active_overlay)
     pub fn find_overlay(&self, name: &[u8]) -> Option<OverlayId> {
         self.scope.find_overlay(name)
     }
 
-    /// Find the [`OverlayId`](nu_protocol::id::OverlayId) of the active overlay corresponding to `name`.
+    /// Find the [`OverlayId`](crate::OverlayId) of the active overlay corresponding to `name`.
     ///
     /// Searches only active overlays. To search in all overlays, use [`find_overlay`](EngineState::find_active_overlay)
     pub fn find_active_overlay(&self, name: &[u8]) -> Option<OverlayId> {
         self.scope.find_active_overlay(name)
     }
 
-    /// Find the [`ModuleId`](nu_protocol::id::ModuleId) corresponding to `name`.
+    /// Find the [`ModuleId`](crate::ModuleId) corresponding to `name`.
     ///
     /// Searches within active overlays, and filtering out overlays in `removed_overlays`.
     pub fn find_module(&self, name: &[u8], removed_overlays: &[Vec<u8>]) -> Option<ModuleId> {
diff --git a/crates/nu-protocol/src/engine/state_working_set.rs b/crates/nu-protocol/src/engine/state_working_set.rs
index f9895735b8..441e5350be 100644
--- a/crates/nu-protocol/src/engine/state_working_set.rs
+++ b/crates/nu-protocol/src/engine/state_working_set.rs
@@ -410,7 +410,7 @@ impl<'a> StateWorkingSet<'a> {
         self.delta.exit_scope();
     }
 
-    /// Find the [`DeclId`](nu_protocol::id::DeclId) corresponding to a predeclaration with `name`.
+    /// Find the [`DeclId`](crate::DeclId) corresponding to a predeclaration with `name`.
     pub fn find_predecl(&self, name: &[u8]) -> Option<DeclId> {
         let mut removed_overlays = vec![];
 
@@ -429,10 +429,11 @@ impl<'a> StateWorkingSet<'a> {
         None
     }
 
-    /// Find the [`DeclId`](nu_protocol::id::DeclId) corresponding to a declaration with `name`.
+    /// Find the [`DeclId`](crate::DeclId) corresponding to a declaration with `name`.
     ///
-    /// Extends [`EngineState::find_decl`] to also search for predeclarations (if [`StateWorkingSet::search_predecls`] is set),
-    /// and declarations from scopes existing only in [`StateDelta`].
+    /// Extends [`EngineState::find_decl`] to also search for predeclarations
+    /// (if [`StateWorkingSet::search_predecls`] is set), and declarations from scopes existing
+    /// only in [`StateDelta`].
     pub fn find_decl(&self, name: &[u8]) -> Option<DeclId> {
         let mut removed_overlays = vec![];
 
@@ -516,7 +517,7 @@ impl<'a> StateWorkingSet<'a> {
             .find_decl_name(decl_id, &removed_overlays)
     }
 
-    /// Find the [`ModuleId`](nu_protocol::id::ModuleId) corresponding to `name`.
+    /// Find the [`ModuleId`](crate::ModuleId) corresponding to `name`.
     ///
     /// Extends [`EngineState::find_module`] to also search for ,
     /// and declarations from scopes existing only in [`StateDelta`].
diff --git a/crates/nu-protocol/src/errors/shell_error/io.rs b/crates/nu-protocol/src/errors/shell_error/io.rs
index 87eaabc74d..88072ec45e 100644
--- a/crates/nu-protocol/src/errors/shell_error/io.rs
+++ b/crates/nu-protocol/src/errors/shell_error/io.rs
@@ -256,9 +256,10 @@ impl IoError {
 
     /// Creates a new `IoError` for internal I/O errors with a specific path.
     ///
-    /// This constructor is similar to [`new_internal`] but also includes a file or directory
-    /// path relevant to the error. Use this function in rare cases where an internal error
-    /// involves a specific path, and the combination of path and additional context is helpful.
+    /// This constructor is similar to [`new_internal`](Self::new_internal) but also includes a
+    /// file or directory path relevant to the error.
+    /// Use this function in rare cases where an internal error involves a specific path, and the
+    /// combination of path and additional context is helpful.
     ///
     /// # Examples
     /// ```rust
diff --git a/crates/nu-protocol/src/pipeline/pipeline_data.rs b/crates/nu-protocol/src/pipeline/pipeline_data.rs
index b4a1e9ca01..3ccfae4c85 100644
--- a/crates/nu-protocol/src/pipeline/pipeline_data.rs
+++ b/crates/nu-protocol/src/pipeline/pipeline_data.rs
@@ -126,7 +126,7 @@ impl PipelineData {
     /// Determine if the `PipelineData` is a [subtype](https://en.wikipedia.org/wiki/Subtyping) of `other`.
     ///
     /// This check makes no effort to collect a stream, so it may be a different result
-    /// than would be returned by calling [`Value::is_subtype()`] on the result of
+    /// than would be returned by calling [`Value::is_subtype_of()`] on the result of
     /// [`.into_value()`](Self::into_value).
     ///
     /// A `ListStream` acts the same as an empty list type: it is a subtype of any [`list`](Type::List)
diff --git a/crates/nu-protocol/src/span.rs b/crates/nu-protocol/src/span.rs
index dd465b5a63..77e5bab681 100644
--- a/crates/nu-protocol/src/span.rs
+++ b/crates/nu-protocol/src/span.rs
@@ -224,8 +224,9 @@ impl From<Span> for SourceSpan {
 
 /// An extension trait for [`Result`], which adds a span to the error type.
 ///
-/// This trait might be removed later, since the old [`Spanned<std::io::Error>`] to [`ShellError`]
-/// conversion was replaced by [`IoError`](io_error::IoError).
+/// This trait might be removed later, since the old [`Spanned<std::io::Error>`] to
+/// [`ShellError`](crate::ShellError) conversion was replaced by
+/// [`IoError`](crate::shell_error::io::IoError).
 pub trait ErrSpan {
     type Result;
 
diff --git a/crates/nu-protocol/src/ty.rs b/crates/nu-protocol/src/ty.rs
index 440bd24475..2308ce1579 100644
--- a/crates/nu-protocol/src/ty.rs
+++ b/crates/nu-protocol/src/ty.rs
@@ -49,8 +49,9 @@ impl Type {
 
     /// Determine of the [`Type`] is a [subtype](https://en.wikipedia.org/wiki/Subtyping) of `other`.
     ///
-    /// This should only be used at parse-time. If you have a concrete [`Value`](crate::Value) or [`PipelineData`](crate::PipelineData),
-    /// you should use their respective [`is_subtype_of`] methods instead.
+    /// This should only be used at parse-time.
+    /// If you have a concrete [`Value`](crate::Value) or [`PipelineData`](crate::PipelineData),
+    /// you should use their respective `is_subtype_of` methods instead.
     pub fn is_subtype_of(&self, other: &Type) -> bool {
         // Structural subtyping
         let is_subtype_collection = |this: &[(String, Type)], that: &[(String, Type)]| {
diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs
index 09ec0fb04f..f310055f1e 100644
--- a/crates/nu-protocol/src/value/mod.rs
+++ b/crates/nu-protocol/src/value/mod.rs
@@ -820,7 +820,7 @@ impl Value {
     /// This method is able to leverage that information encoded in a `Value` to provide more accurate
     /// type comparison than if one were to collect the type into [`Type`](crate::Type) value with [`Value::get_type`].
     ///
-    /// Empty lists are considered subtypes of all list<T> types.
+    /// Empty lists are considered subtypes of all `list<T>` types.
     ///
     /// Lists of mixed records where some column is present in all record is a subtype of `table<column>`.
     /// For example, `[{a: 1, b: 2}, {a: 1}]` is a subtype of `table<a: int>` (but not `table<a: int, b: int>`).

From 5fa79e6e5f1983c5efa8a443f517ca4893f59d7f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 Jan 2025 08:30:01 +0800
Subject: [PATCH 0971/1072] Bump brotli from 6.0.0 to 7.0.0 (#14949)

Bumps [brotli](https://github.com/dropbox/rust-brotli) from 6.0.0 to
7.0.0.
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a
href="https://github.com/dropbox/rust-brotli/commits">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=brotli&package-manager=cargo&previous-version=6.0.0&new-version=7.0.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 17 +++--------------
 Cargo.toml |  2 +-
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f219d9a546..c2902229a1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -756,17 +756,6 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbc0bcb5424e8e1f29c21a00f2d222df5e8e9779732ff03f840315d8fbac708e"
 
-[[package]]
-name = "brotli"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
- "brotli-decompressor",
-]
-
 [[package]]
 name = "brotli"
 version = "7.0.0"
@@ -3623,7 +3612,7 @@ dependencies = [
  "alphanumeric-sort",
  "base64 0.22.1",
  "bracoxide",
- "brotli 6.0.0",
+ "brotli",
  "byteorder",
  "bytesize",
  "calamine",
@@ -3936,7 +3925,7 @@ dependencies = [
 name = "nu-protocol"
 version = "0.101.1"
 dependencies = [
- "brotli 6.0.0",
+ "brotli",
  "bytes",
  "chrono",
  "chrono-humanize",
@@ -5164,7 +5153,7 @@ dependencies = [
  "ahash",
  "async-stream",
  "base64 0.22.1",
- "brotli 7.0.0",
+ "brotli",
  "bytemuck",
  "ethnum",
  "flate2",
diff --git a/Cargo.toml b/Cargo.toml
index e9234036dd..06781d7ad4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -67,7 +67,7 @@ ansi-str = "0.8"
 anyhow = "1.0.82"
 base64 = "0.22.1"
 bracoxide = "0.1.4"
-brotli = "6.0"
+brotli = "7.0"
 byteorder = "1.5"
 bytes = "1"
 bytesize = "1.3"

From 03bb14415088ab19db028c4231ab9e14f54dce92 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 Jan 2025 08:56:27 +0800
Subject: [PATCH 0972/1072] Bump shadow-rs from 0.37.0 to 0.38.0 (#14952)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [shadow-rs](https://github.com/baoyachi/shadow-rs) from 0.37.0 to
0.38.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/baoyachi/shadow-rs/releases">shadow-rs's
releases</a>.</em></p>
<blockquote>
<h2>v0.38.0</h2>
<h2>What's Changed</h2>
<ul>
<li>fix: ignore false-positive clippy lint trigger by <a
href="https://github.com/mchodzikiewicz"><code>@​mchodzikiewicz</code></a>
in <a
href="https://redirect.github.com/baoyachi/shadow-rs/pull/196">baoyachi/shadow-rs#196</a></li>
<li>Rename const define by <a
href="https://github.com/baoyachi"><code>@​baoyachi</code></a> in <a
href="https://redirect.github.com/baoyachi/shadow-rs/pull/198">baoyachi/shadow-rs#198</a></li>
<li>Update git2 to v0.20 by <a
href="https://github.com/jewlexx"><code>@​jewlexx</code></a> in <a
href="https://redirect.github.com/baoyachi/shadow-rs/pull/200">baoyachi/shadow-rs#200</a></li>
<li>Unit test ci by <a
href="https://github.com/baoyachi"><code>@​baoyachi</code></a> in <a
href="https://redirect.github.com/baoyachi/shadow-rs/pull/202">baoyachi/shadow-rs#202</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/baoyachi/shadow-rs/compare/v0.37.0...v0.38.0">https://github.com/baoyachi/shadow-rs/compare/v0.37.0...v0.38.0</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/e33e8c9b72fa1c90d74eb0186c7dc5ef02d8bee2"><code>e33e8c9</code></a>
Update Cargo.toml</li>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/3fec2d8656a83cdd472be3c746c4cc116c441b2c"><code>3fec2d8</code></a>
Merge pull request <a
href="https://redirect.github.com/baoyachi/shadow-rs/issues/202">#202</a>
from baoyachi/unit_test_ci</li>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/236f3f772a6fa95b675623356e237ac93d4ad9e3"><code>236f3f7</code></a>
fix ci</li>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/538f9e9b7dfcb2babf7977625c757ca4ef87d502"><code>538f9e9</code></a>
fix ci</li>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/e0ae6e3f869b8dddc9b3e5bf3671b44f6f1ca278"><code>e0ae6e3</code></a>
Merge pull request <a
href="https://redirect.github.com/baoyachi/shadow-rs/issues/200">#200</a>
from winpax/patch-1</li>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/0c6a61c32dd0bb703bb62fc3cf1ee0320fc391d5"><code>0c6a61c</code></a>
Update git2 to v0.20</li>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/15e2a231ad4780e8a1f790c9636ebbfba855f438"><code>15e2a23</code></a>
Merge pull request <a
href="https://redirect.github.com/baoyachi/shadow-rs/issues/198">#198</a>
from baoyachi/feature/use_define</li>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/311a081432ca7391404ae1d0d2eb9c876820ff4d"><code>311a081</code></a>
Rename const define</li>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/d8d857c8a980b9acfe6a0fc2d29d5ffb73d9b614"><code>d8d857c</code></a>
Merge pull request <a
href="https://redirect.github.com/baoyachi/shadow-rs/issues/196">#196</a>
from mchodzikiewicz/fix/nightly-clippy-lint</li>
<li><a
href="https://github.com/baoyachi/shadow-rs/commit/fe40af0ab6f6f59e9e36f1174612dbf3b82fe425"><code>fe40af0</code></a>
fix: ignore false-positive clippy lint trigger</li>
<li>See full diff in <a
href="https://github.com/baoyachi/shadow-rs/compare/v0.37.0...v0.38.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=shadow-rs&package-manager=cargo&previous-version=0.37.0&new-version=0.38.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                    | 4 ++--
 crates/nu-cmd-lang/Cargo.toml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c2902229a1..d2f6e4aa43 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6547,9 +6547,9 @@ dependencies = [
 
 [[package]]
 name = "shadow-rs"
-version = "0.37.0"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "974eb8222c62a8588bc0f02794dd1ba5b60b3ec88b58e050729d0907ed6af610"
+checksum = "69d433b5df1e1958a668457ebe4a9c5b7bcfe844f4eb2276ac43cf273baddd54"
 dependencies = [
  "const_format",
  "is_debug",
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index 6edef0c58a..88832cf0ed 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -21,10 +21,10 @@ nu-protocol = { path = "../nu-protocol", version = "0.101.1", default-features =
 nu-utils = { path = "../nu-utils", version = "0.101.1", default-features = false }
 
 itertools = { workspace = true }
-shadow-rs = { version = "0.37", default-features = false }
+shadow-rs = { version = "0.38", default-features = false }
 
 [build-dependencies]
-shadow-rs = { version = "0.37", default-features = false }
+shadow-rs = { version = "0.38", default-features = false }
 
 [features]
 default = ["os"]

From 08b5d5cce5ddbb6efa2d5e6bf8755a63b6f77b5f Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Wed, 29 Jan 2025 19:54:12 +0800
Subject: [PATCH 0973/1072] fix(completion): `DotNuCompletion` now completes nu
 scripts in const `$NU_LIB_DIRS` (#14955)

# Description

For nu scripts completion with command `use`/`overlay use`/`source-env`,
it now supports `nu --include-path`.

Also fixes some irrelevant clippy complaints.

# User-Facing Changes

# Tests + Formatting

# After Submitting
---
 .../src/completions/dotnu_completions.rs      | 39 ++++++++++---------
 crates/nu-cli/src/repl.rs                     |  4 +-
 crates/nu-cli/src/util.rs                     |  4 +-
 crates/nu-lsp/src/ast.rs                      |  6 +--
 4 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/crates/nu-cli/src/completions/dotnu_completions.rs b/crates/nu-cli/src/completions/dotnu_completions.rs
index b8134404d3..51fcd525fb 100644
--- a/crates/nu-cli/src/completions/dotnu_completions.rs
+++ b/crates/nu-cli/src/completions/dotnu_completions.rs
@@ -41,25 +41,28 @@ impl Completer for DotNuCompletion {
         let mut is_current_folder = false;
 
         // Fetch the lib dirs
-        let lib_dirs: Vec<String> = if let Some(lib_dirs) = working_set.get_env_var("NU_LIB_DIRS") {
-            lib_dirs
-                .as_list()
-                .into_iter()
-                .flat_map(|it| {
-                    it.iter().map(|x| {
-                        x.to_path()
-                            .expect("internal error: failed to convert lib path")
+        let lib_dirs: Vec<String> = working_set
+            .find_variable(b"$NU_LIB_DIRS")
+            .and_then(|vid| working_set.get_variable(vid).const_val.as_ref())
+            .or(working_set.get_env_var("NU_LIB_DIRS"))
+            .map(|lib_dirs| {
+                lib_dirs
+                    .as_list()
+                    .into_iter()
+                    .flat_map(|it| {
+                        it.iter().map(|x| {
+                            x.to_path()
+                                .expect("internal error: failed to convert lib path")
+                        })
                     })
-                })
-                .map(|it| {
-                    it.into_os_string()
-                        .into_string()
-                        .expect("internal error: failed to convert OS path")
-                })
-                .collect()
-        } else {
-            vec![]
-        };
+                    .map(|it| {
+                        it.into_os_string()
+                            .into_string()
+                            .expect("internal error: failed to convert OS path")
+                    })
+                    .collect()
+            })
+            .unwrap_or_default();
 
         // Check if the base_dir is a folder
         // rsplit_once removes the separator
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 72da95d449..a64ecbcefe 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -1159,7 +1159,7 @@ fn setup_history(
 /// Setup Reedline keybindingds based on the provided config
 ///
 fn setup_keybindings(engine_state: &EngineState, line_editor: Reedline) -> Reedline {
-    return match create_keybindings(engine_state.get_config()) {
+    match create_keybindings(engine_state.get_config()) {
         Ok(keybindings) => match keybindings {
             KeybindingsMode::Emacs(keybindings) => {
                 let edit_mode = Box::new(Emacs::new(keybindings));
@@ -1177,7 +1177,7 @@ fn setup_keybindings(engine_state: &EngineState, line_editor: Reedline) -> Reedl
             report_shell_error(engine_state, &e);
             line_editor
         }
-    };
+    }
 }
 
 ///
diff --git a/crates/nu-cli/src/util.rs b/crates/nu-cli/src/util.rs
index 6b0bade8c6..727a8290ed 100644
--- a/crates/nu-cli/src/util.rs
+++ b/crates/nu-cli/src/util.rs
@@ -132,7 +132,7 @@ fn gather_env_vars(
                     working_set.error(err);
                 }
 
-                if working_set.parse_errors.first().is_some() {
+                if !working_set.parse_errors.is_empty() {
                     report_capture_error(
                         engine_state,
                         &String::from_utf8_lossy(contents),
@@ -176,7 +176,7 @@ fn gather_env_vars(
                     working_set.error(err);
                 }
 
-                if working_set.parse_errors.first().is_some() {
+                if !working_set.parse_errors.is_empty() {
                     report_capture_error(
                         engine_state,
                         &String::from_utf8_lossy(contents),
diff --git a/crates/nu-lsp/src/ast.rs b/crates/nu-lsp/src/ast.rs
index 200988e9ef..511a25ca6b 100644
--- a/crates/nu-lsp/src/ast.rs
+++ b/crates/nu-lsp/src/ast.rs
@@ -282,7 +282,7 @@ fn try_find_id_in_use(
     id: Option<&Id>,
 ) -> Option<(Id, Span)> {
     let call_name = working_set.get_span_contents(call.head);
-    if call_name != b"use" && call_name != b"hide" {
+    if call_name != b"use" && call_name != b"export use" && call_name != b"hide" {
         return None;
     }
     // TODO: for keyword `hide`, the decl/var is already hidden in working_set,
@@ -318,7 +318,7 @@ fn try_find_id_in_use(
     if let Some(pos) = location {
         // first argument of `use` should always be module name
         // while it is optional in `hide`
-        if span.contains(*pos) && call_name == b"use" {
+        if span.contains(*pos) && call_name != b"hide" {
             return get_matched_module_id(working_set, span, id);
         }
     }
@@ -338,7 +338,7 @@ fn try_find_id_in_use(
         })
     };
 
-    let arguments = if call_name == b"use" {
+    let arguments = if call_name != b"hide" {
         call.arguments.get(1..)?
     } else {
         call.arguments.as_slice()

From aa62de78e6e8f654f091a6661d275d4e67491242 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Wed, 29 Jan 2025 10:06:37 -0500
Subject: [PATCH 0974/1072] Fix: Directories using a tilde to represent HOME
 will now be converted to an absolute-path before running an external (#14959)

Fixes #14780 - Directories using a tilde to represent HOME will now be converted to an absolute-path before running an external.
---
 crates/nu-engine/src/env.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/crates/nu-engine/src/env.rs b/crates/nu-engine/src/env.rs
index 0242d0b6b0..ee4401546b 100644
--- a/crates/nu-engine/src/env.rs
+++ b/crates/nu-engine/src/env.rs
@@ -140,18 +140,18 @@ pub fn env_to_string(
                     // Try to convert PATH/Path list to a string
                     match value {
                         Value::List { vals, .. } => {
-                            let paths = vals
+                            let paths: Vec<String> = vals
                                 .iter()
-                                .map(Value::coerce_str)
-                                .collect::<Result<Vec<_>, _>>()?;
+                                .filter_map(|v| v.coerce_str().ok())
+                                .map(|s| nu_path::expand_tilde(&*s).to_string_lossy().into_owned())
+                                .collect();
 
-                            match std::env::join_paths(paths.iter().map(AsRef::as_ref)) {
-                                Ok(p) => Ok(p.to_string_lossy().to_string()),
-                                Err(_) => Err(ShellError::EnvVarNotAString {
+                            std::env::join_paths(paths.iter().map(AsRef::<str>::as_ref))
+                                .map(|p| p.to_string_lossy().to_string())
+                                .map_err(|_| ShellError::EnvVarNotAString {
                                     envvar_name: env_name.to_string(),
                                     span: value.span(),
-                                }),
-                            }
+                                })
                         }
                         _ => Err(ShellError::EnvVarNotAString {
                             envvar_name: env_name.to_string(),

From cce12efe48cd5d6850536372aa7b9571786b5a17 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Wed, 29 Jan 2025 11:16:12 -0500
Subject: [PATCH 0975/1072] Rename `std/core` to `std/prelude` (#14962)

`std/core` is always loaded by Nushell during startup, and the
commands in it are always available. As such, it's renamed
`std/prelude`.

`scope modules` and `view files` now show `prelude` in place of
`core`.
---
 crates/nu-std/src/lib.rs                   | 10 +++++++---
 crates/nu-std/std/{core => prelude}/mod.nu |  0
 crates/nu-std/tests/test_core.nu           |  7 -------
 crates/nu-std/tests/test_prelude.nu        |  7 +++++++
 4 files changed, 14 insertions(+), 10 deletions(-)
 rename crates/nu-std/std/{core => prelude}/mod.nu (100%)
 delete mode 100644 crates/nu-std/tests/test_core.nu
 create mode 100644 crates/nu-std/tests/test_prelude.nu

diff --git a/crates/nu-std/src/lib.rs b/crates/nu-std/src/lib.rs
index b03b710cfc..58b1c98ff8 100644
--- a/crates/nu-std/src/lib.rs
+++ b/crates/nu-std/src/lib.rs
@@ -36,7 +36,11 @@ pub fn load_standard_library(
     // Submodules/subdirectories ... std/<module>/mod.nu
     let mut std_submodules = vec![
         // Loaded at startup - Not technically part of std
-        ("mod.nu", "std/core", include_str!("../std/core/mod.nu")),
+        (
+            "mod.nu",
+            "std/prelude",
+            include_str!("../std/prelude/mod.nu"),
+        ),
         // std submodules
         ("mod.nu", "std/assert", include_str!("../std/assert/mod.nu")),
         ("mod.nu", "std/bench", include_str!("../std/bench/mod.nu")),
@@ -81,12 +85,12 @@ pub fn load_standard_library(
     let (block, delta) = {
         let source = r#"
 # Prelude
-use std/core *
+use std/prelude *
 "#;
 
         // Add a placeholder file to the stack of files being evaluated.
         // The name of this file doesn't matter; it's only there to set the current working directory to NU_STDLIB_VIRTUAL_DIR.
-        let placeholder = PathBuf::from("load std/core");
+        let placeholder = PathBuf::from("load std/prelude");
         working_set.files = FileStack::with_file(placeholder);
 
         let block = parse(
diff --git a/crates/nu-std/std/core/mod.nu b/crates/nu-std/std/prelude/mod.nu
similarity index 100%
rename from crates/nu-std/std/core/mod.nu
rename to crates/nu-std/std/prelude/mod.nu
diff --git a/crates/nu-std/tests/test_core.nu b/crates/nu-std/tests/test_core.nu
deleted file mode 100644
index 654a1bcedf..0000000000
--- a/crates/nu-std/tests/test_core.nu
+++ /dev/null
@@ -1,7 +0,0 @@
-use std/assert
-
-#[test]
-def banner [] {
-    use std/core
-    assert ((core banner | lines | length) == 16)
-}
diff --git a/crates/nu-std/tests/test_prelude.nu b/crates/nu-std/tests/test_prelude.nu
new file mode 100644
index 0000000000..b163ddd15f
--- /dev/null
+++ b/crates/nu-std/tests/test_prelude.nu
@@ -0,0 +1,7 @@
+use std/assert
+
+#[test]
+def banner [] {
+    use std/prelude
+    assert ((prelude banner | lines | length) == 16)
+}

From 945e9511ce72a4dfef9b5a8b2d498ba63f8bfc3a Mon Sep 17 00:00:00 2001
From: Tyler Miller <tmillr@proton.me>
Date: Wed, 29 Jan 2025 22:15:38 -0800
Subject: [PATCH 0976/1072] fix(cli): completion in nested blocks (#14856)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

## Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

Fixes completion for when the cursor is inside a block:

```nu
foo | each { open -<Tab> }
```

```nu
print (open -<Tab>)
print [5, 'foo', (open -<Tab>)]
```

etc.

Fixes: #11084
Related: #13897 (partially fixes—leading `|` is a different issue)
Related: #14643 (different issue not fixed by this pr)
Related: #14822

## User-Facing Changes

Flag/command completion (internal) inside blocks has been fixed.

## Tests + Formatting
<!--
Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

As far as I can tell there is only 1 test that's failing (locally), but
it has nothing to do with my pr and is failing before my changes are
applied. The test is `completions::variables_completions`. It's because
I'm missing `$nu.user-autoload-dirs`.
---
 crates/nu-cli/src/completions/completer.rs | 39 ++++++++++++++++++----
 crates/nu-cli/tests/completions/mod.rs     | 28 ++++++++++++++++
 2 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/crates/nu-cli/src/completions/completer.rs b/crates/nu-cli/src/completions/completer.rs
index f0cb6f3fda..71125e04e9 100644
--- a/crates/nu-cli/src/completions/completer.rs
+++ b/crates/nu-cli/src/completions/completer.rs
@@ -2,6 +2,7 @@ use crate::completions::{
     CommandCompletion, Completer, CompletionOptions, CustomCompletion, DirectoryCompletion,
     DotNuCompletion, FileCompletion, FlagCompletion, OperatorCompletion, VariableCompletion,
 };
+use log::debug;
 use nu_color_config::{color_record_to_nustyle, lookup_ansi_color_style};
 use nu_engine::eval_block;
 use nu_parser::{flatten_pipeline_element, parse, FlatShape};
@@ -52,6 +53,11 @@ impl NuCompleter {
             ..Default::default()
         };
 
+        debug!(
+            "process_completion: prefix: {}, new_span: {new_span:?}, offset: {offset}, pos: {pos}",
+            String::from_utf8_lossy(prefix)
+        );
+
         completer.fetch(
             working_set,
             &self.stack,
@@ -134,9 +140,29 @@ impl NuCompleter {
 
         let config = self.engine_state.get_config();
 
-        let output = parse(&mut working_set, Some("completer"), line.as_bytes(), false);
+        let outermost_block = parse(&mut working_set, Some("completer"), line.as_bytes(), false);
 
-        for pipeline in &output.pipelines {
+        // Try to get the innermost block parsed (by span) so that we consider the correct context/scope.
+        let target_block = working_set
+            .delta
+            .blocks
+            .iter()
+            .filter_map(|block| match block.span {
+                Some(span) if span.contains(pos) => Some((block, span)),
+                _ => None,
+            })
+            .reduce(|prev, cur| {
+                // |(block, span), (block, span)|
+                match cur.1.start.cmp(&prev.1.start) {
+                    core::cmp::Ordering::Greater => cur,
+                    core::cmp::Ordering::Equal if cur.1.end < prev.1.end => cur,
+                    _ => prev,
+                }
+            })
+            .map(|(block, _)| block)
+            .unwrap_or(&outermost_block);
+
+        for pipeline in &target_block.pipelines {
             for pipeline_element in &pipeline.elements {
                 let flattened = flatten_pipeline_element(&working_set, pipeline_element);
                 let mut spans: Vec<String> = vec![];
@@ -146,10 +172,10 @@ impl NuCompleter {
                         .first()
                         .filter(|content| content.as_str() == "sudo" || content.as_str() == "doas")
                         .is_some();
-                    // Read the current spam to string
-                    let current_span = working_set.get_span_contents(flat.0).to_vec();
-                    let current_span_str = String::from_utf8_lossy(&current_span);
 
+                    // Read the current span to string
+                    let current_span = working_set.get_span_contents(flat.0);
+                    let current_span_str = String::from_utf8_lossy(current_span);
                     let is_last_span = pos >= flat.0.start && pos < flat.0.end;
 
                     // Skip the last 'a' as span item
@@ -176,9 +202,8 @@ impl NuCompleter {
                         let new_span = Span::new(flat.0.start, flat.0.end - 1);
 
                         // Parses the prefix. Completion should look up to the cursor position, not after.
-                        let mut prefix = working_set.get_span_contents(flat.0);
                         let index = pos - flat.0.start;
-                        prefix = &prefix[..index];
+                        let prefix = &current_span[..index];
 
                         // Variables completion
                         if prefix.starts_with(b"$") || most_left_var.is_some() {
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index b9d9fdb573..fa868a1d11 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -1862,3 +1862,31 @@ fn alias_offset_bug_7754() {
     // This crashes before PR #7756
     let _suggestions = completer.complete("ll -a | c", 9);
 }
+
+#[rstest]
+fn nested_block(mut completer: NuCompleter) {
+    let expected: Vec<String> = vec!["--help".into(), "--mod".into(), "-h".into(), "-s".into()];
+
+    let suggestions = completer.complete("somecmd | lines | each { tst - }", 30);
+    match_suggestions(&expected, &suggestions);
+
+    let suggestions = completer.complete("somecmd | lines | each { tst -}", 30);
+    match_suggestions(&expected, &suggestions);
+}
+
+#[rstest]
+fn incomplete_nested_block(mut completer: NuCompleter) {
+    let suggestions = completer.complete("somecmd | lines | each { tst -", 30);
+    let expected: Vec<String> = vec!["--help".into(), "--mod".into(), "-h".into(), "-s".into()];
+    match_suggestions(&expected, &suggestions);
+}
+
+#[rstest]
+fn deeply_nested_block(mut completer: NuCompleter) {
+    let suggestions = completer.complete(
+        "somecmd | lines | each { print ([each (print) (tst -)]) }",
+        52,
+    );
+    let expected: Vec<String> = vec!["--help".into(), "--mod".into(), "-h".into(), "-s".into()];
+    match_suggestions(&expected, &suggestions);
+}

From 6be42d94d9f4b3868e795df90be342a55060e42a Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Thu, 30 Jan 2025 13:20:26 +0100
Subject: [PATCH 0977/1072] Replaced `IoError::new` calls that still had
 `Span::unknown()` (#14968)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

It seems in my PR #14927 I missed a few calls to `IoError::new` that had
`Span::unknown` inside them, which shouldn't be used but rather
`IoError::new_internal`. I replaced these calls.

Thanks to @132ikl to finding out that I forgot some. 😄

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

Pretty much none really.

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-engine/src/env.rs                         | 10 ++++++----
 crates/nu-plugin-core/src/communication_mode/mod.rs |  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/crates/nu-engine/src/env.rs b/crates/nu-engine/src/env.rs
index ee4401546b..2c4aec9fb3 100644
--- a/crates/nu-engine/src/env.rs
+++ b/crates/nu-engine/src/env.rs
@@ -220,9 +220,10 @@ pub fn current_dir(engine_state: &EngineState, stack: &Stack) -> Result<PathBuf,
     // we still need to simplify Windows paths. "." is safe because `cwd` should
     // be an absolute path already.
     canonicalize_with(&cwd, ".").map_err(|err| {
-        ShellError::Io(IoError::new(
+        ShellError::Io(IoError::new_internal_with_path(
             err.kind(),
-            Span::unknown(),
+            "Could not canonicalize current dir",
+            nu_protocol::location!(),
             PathBuf::from(cwd),
         ))
     })
@@ -239,9 +240,10 @@ pub fn current_dir_const(working_set: &StateWorkingSet) -> Result<PathBuf, Shell
     // we still need to simplify Windows paths. "." is safe because `cwd` should
     // be an absolute path already.
     canonicalize_with(&cwd, ".").map_err(|err| {
-        ShellError::Io(IoError::new(
+        ShellError::Io(IoError::new_internal_with_path(
             err.kind(),
-            Span::unknown(),
+            "Could not canonicalize current dir",
+            nu_protocol::location!(),
             PathBuf::from(cwd),
         ))
     })
diff --git a/crates/nu-plugin-core/src/communication_mode/mod.rs b/crates/nu-plugin-core/src/communication_mode/mod.rs
index 19d89363bd..2b1ec06884 100644
--- a/crates/nu-plugin-core/src/communication_mode/mod.rs
+++ b/crates/nu-plugin-core/src/communication_mode/mod.rs
@@ -218,10 +218,10 @@ impl PreparedServerCommunication {
                                 if !is_would_block_err(&err) {
                                     // `WouldBlock` is ok, just means it's not ready yet, but some other
                                     // kind of error should be reported
-                                    return Err(ShellError::Io(IoError::new(
+                                    return Err(ShellError::Io(IoError::new_internal(
                                         err.kind(),
-                                        Span::unknown(),
-                                        None,
+                                        "Accepting new data from listener failed",
+                                        nu_protocol::location!(),
                                     )));
                                 }
                             }

From 3836da0cf123b7c49b859c47f5b5d378f7ce4783 Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Thu, 30 Jan 2025 20:30:45 +0800
Subject: [PATCH 0978/1072] fix(parser): mixed side effects of different
 choices in `parse_oneof` (#14912)

# Description

This PR fixes #14784.

<img width="384" alt="image"
src="https://github.com/user-attachments/assets/aac063a0-645d-4adb-a399-525bdb004999"
/>

Also fixes the related behavior of lsp:

completion won't work in match/else blocks, because:

1. truncation in completion causes unmatched `{`, thus a parse error.
2. the parse error further leads to a state where the whole block
expression marked as garbage

<img width="453" alt="image"
src="https://github.com/user-attachments/assets/aaf86ccc-646e-4b91-bb27-4b1737100ff2"
/>

Related PR: #14856, @tmillr

I don't have any background knowledge of those `propagate_error`,
@sgvictorino you may want to review this.

# User-Facing Changes

# Tests + Formatting

# After Submitting
---
 crates/nu-parser/src/parser.rs        | 55 +++++++++++++++++----------
 crates/nu-parser/tests/test_parser.rs | 28 +++++++++++++-
 2 files changed, 61 insertions(+), 22 deletions(-)

diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 8744469f5d..fb8d5f7986 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -781,42 +781,57 @@ fn parse_oneof(
     possible_shapes: &Vec<SyntaxShape>,
     multispan: bool,
 ) -> Expression {
+    let starting_spans_idx = *spans_idx;
+    let mut best_guess = None;
+    let mut best_guess_errors = Vec::new();
+    let mut max_first_error_offset = 0;
+    let mut propagate_error = false;
     for shape in possible_shapes {
         let starting_error_count = working_set.parse_errors.len();
+        *spans_idx = starting_spans_idx;
         let value = match multispan {
             true => parse_multispan_value(working_set, spans, spans_idx, shape),
             false => parse_value(working_set, spans[*spans_idx], shape),
         };
 
-        if starting_error_count == working_set.parse_errors.len() {
+        let new_errors = working_set.parse_errors[starting_error_count..].to_vec();
+        // no new errors found means success
+        let Some(first_error_offset) = new_errors.iter().map(|e| e.span().start).min() else {
             return value;
-        }
-
-        // while trying the possible shapes, ignore Expected type errors
-        // unless they're inside a block, closure, or expression
-        let propagate_error = match working_set.parse_errors.last() {
-            Some(ParseError::Expected(_, error_span))
-            | Some(ParseError::ExpectedWithStringMsg(_, error_span)) => {
-                matches!(
-                    shape,
-                    SyntaxShape::Block | SyntaxShape::Closure(_) | SyntaxShape::Expression
-                ) && *error_span != spans[*spans_idx]
-            }
-            _ => true,
         };
-        if !propagate_error {
-            working_set.parse_errors.truncate(starting_error_count);
+
+        if first_error_offset > max_first_error_offset {
+            // while trying the possible shapes, ignore Expected type errors
+            // unless they're inside a block, closure, or expression
+            propagate_error = match working_set.parse_errors.last() {
+                Some(ParseError::Expected(_, error_span))
+                | Some(ParseError::ExpectedWithStringMsg(_, error_span)) => {
+                    matches!(
+                        shape,
+                        SyntaxShape::Block | SyntaxShape::Closure(_) | SyntaxShape::Expression
+                    ) && *error_span != spans[*spans_idx]
+                }
+                _ => true,
+            };
+            max_first_error_offset = first_error_offset;
+            best_guess = Some(value);
+            best_guess_errors = new_errors;
         }
+        working_set.parse_errors.truncate(starting_error_count);
     }
 
-    if working_set.parse_errors.is_empty() {
+    // if best_guess results in new errors further than current span, then accept it
+    // or propagate_error is marked as true for it
+    if max_first_error_offset > spans[starting_spans_idx].start || propagate_error {
+        working_set.parse_errors.extend(best_guess_errors);
+        best_guess.expect("best_guess should not be None here!")
+    } else {
         working_set.error(ParseError::ExpectedWithStringMsg(
             format!("one of a list of accepted shapes: {possible_shapes:?}"),
-            spans[*spans_idx],
+            spans[starting_spans_idx],
         ));
+        Expression::garbage(working_set, spans[starting_spans_idx])
     }
-
-    Expression::garbage(working_set, spans[*spans_idx])
 }
 
 pub fn parse_multispan_value(
diff --git a/crates/nu-parser/tests/test_parser.rs b/crates/nu-parser/tests/test_parser.rs
index 2ceabf8a1a..75d97e84a6 100644
--- a/crates/nu-parser/tests/test_parser.rs
+++ b/crates/nu-parser/tests/test_parser.rs
@@ -2426,7 +2426,7 @@ mod input_types {
         add_declarations(&mut engine_state);
 
         let mut working_set = StateWorkingSet::new(&engine_state);
-        parse(
+        let block = parse(
             &mut working_set,
             None,
             b"if false { 'a' } else { $foo }",
@@ -2437,6 +2437,30 @@ mod input_types {
             working_set.parse_errors.first(),
             Some(ParseError::VariableNotFound(_, _))
         ));
+
+        let element = &block
+            .pipelines
+            .first()
+            .unwrap()
+            .elements
+            .first()
+            .unwrap()
+            .expr;
+        let Expr::Call(call) = &element.expr else {
+            eprintln!("{:?}", element.expr);
+            panic!("Expected Expr::Call");
+        };
+        let Expr::Keyword(else_kwd) = &call
+            .arguments
+            .get(2)
+            .expect("This call of `if` should have 3 arguments")
+            .expr()
+            .unwrap()
+            .expr
+        else {
+            panic!("Expected Expr::Keyword");
+        };
+        assert!(!matches!(else_kwd.expr.expr, Expr::Garbage))
     }
 
     #[test]
@@ -2597,7 +2621,7 @@ mod record {
         let engine_state = EngineState::new();
         let mut working_set = StateWorkingSet::new(&engine_state);
         let block = parse(&mut working_set, None, expr, false);
-        assert!(working_set.parse_errors.first().is_none());
+        assert!(working_set.parse_errors.is_empty());
         let pipeline_el_expr = &block
             .pipelines
             .first()

From 5eae08ac7645833a3b95f55c767421bd8c0e3270 Mon Sep 17 00:00:00 2001
From: Coca <coca16622@gmail.com>
Date: Thu, 30 Jan 2025 14:32:26 +0200
Subject: [PATCH 0979/1072] Add `--first`/`--last` flags to `move` (#14961)

# Description

Closes #14957

Allows for moving columns to the start and end of a table/record. Adds
additional tests for the new flags and refactors the already existing
tests to assert on a vec of columns rather then asserting one by one.

# User-Facing Changes
Addition: New `--first` and `--last` flags for `move` which allow you to
move columns to the start or end without the need to specify the first
or last columns.

# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->

Could add one of the new flags to the already existing [Nushell
Fundamentals move
section](https://www.nushell.sh/book/working_with_tables.html#moving-columns).

---------

Signed-off-by: Coca <coca16622@gmail.com>
---
 crates/nu-command/src/filters/move_.rs | 370 +++++++++++++++----------
 1 file changed, 226 insertions(+), 144 deletions(-)

diff --git a/crates/nu-command/src/filters/move_.rs b/crates/nu-command/src/filters/move_.rs
index 83130e8150..48dd24b178 100644
--- a/crates/nu-command/src/filters/move_.rs
+++ b/crates/nu-command/src/filters/move_.rs
@@ -1,9 +1,13 @@
+use std::ops::Not;
+
 use nu_engine::command_prelude::*;
 
 #[derive(Clone, Debug)]
-enum BeforeOrAfter {
-    Before(String),
-    After(String),
+enum Location {
+    Before(Spanned<String>),
+    After(Spanned<String>),
+    Last,
+    First,
 }
 
 #[derive(Clone)]
@@ -15,7 +19,7 @@ impl Command for Move {
     }
 
     fn description(&self) -> &str {
-        "Move columns before or after other columns."
+        "Moves columns relative to other columns or make them the first/last columns. Flags are mutually exclusive."
     }
 
     fn signature(&self) -> nu_protocol::Signature {
@@ -37,6 +41,8 @@ impl Command for Move {
                 "the column that will be the next after the columns moved",
                 None,
             )
+            .switch("first", "makes the columns be the first ones", None)
+            .switch("last", "makes the columns be the last ones", None)
             .category(Category::Filters)
     }
 
@@ -113,29 +119,33 @@ impl Command for Move {
         let columns: Vec<Value> = call.rest(engine_state, stack, 0)?;
         let after: Option<Value> = call.get_flag(engine_state, stack, "after")?;
         let before: Option<Value> = call.get_flag(engine_state, stack, "before")?;
+        let first = call.has_flag(engine_state, stack, "first")?;
+        let last = call.has_flag(engine_state, stack, "last")?;
 
-        let before_or_after = match (after, before) {
-            (Some(v), None) => Spanned {
+        let location = match (after, before, first, last) {
+            (Some(v), None, false, false) => Location::After(Spanned {
                 span: v.span(),
-                item: BeforeOrAfter::After(v.coerce_into_string()?),
-            },
-            (None, Some(v)) => Spanned {
+                item: v.coerce_into_string()?,
+            }),
+            (None, Some(v), false, false) => Location::Before(Spanned {
                 span: v.span(),
-                item: BeforeOrAfter::Before(v.coerce_into_string()?),
-            },
-            (Some(_), Some(_)) => {
+                item: v.coerce_into_string()?,
+            }),
+            (None, None, true, false) => Location::First,
+            (None, None, false, true) => Location::Last,
+            (None, None, false, false) => {
                 return Err(ShellError::GenericError {
                     error: "Cannot move columns".into(),
-                    msg: "Use either --after, or --before, not both".into(),
+                    msg: "Missing required location flag".into(),
                     span: Some(head),
                     help: None,
                     inner: vec![],
                 })
             }
-            (None, None) => {
+            _ => {
                 return Err(ShellError::GenericError {
                     error: "Cannot move columns".into(),
-                    msg: "Missing --after or --before flag".into(),
+                    msg: "Use only a single flag".into(),
                     span: Some(head),
                     help: None,
                     inner: vec![],
@@ -148,12 +158,10 @@ impl Command for Move {
         match input {
             PipelineData::Value(Value::List { .. }, ..) | PipelineData::ListStream { .. } => {
                 let res = input.into_iter().map(move |x| match x.as_record() {
-                    Ok(record) => {
-                        match move_record_columns(record, &columns, &before_or_after, head) {
-                            Ok(val) => val,
-                            Err(error) => Value::error(error, head),
-                        }
-                    }
+                    Ok(record) => match move_record_columns(record, &columns, &location, head) {
+                        Ok(val) => val,
+                        Err(error) => Value::error(error, head),
+                    },
                     Err(error) => Value::error(error, head),
                 });
 
@@ -164,8 +172,7 @@ impl Command for Move {
                 ))
             }
             PipelineData::Value(Value::Record { val, .. }, ..) => {
-                Ok(move_record_columns(&val, &columns, &before_or_after, head)?
-                    .into_pipeline_data())
+                Ok(move_record_columns(&val, &columns, &location, head)?.into_pipeline_data())
             }
             _ => Err(ShellError::PipelineMismatch {
                 exp_input_type: "record or table".to_string(),
@@ -180,27 +187,11 @@ impl Command for Move {
 fn move_record_columns(
     record: &Record,
     columns: &[Value],
-    before_or_after: &Spanned<BeforeOrAfter>,
+    location: &Location,
     span: Span,
 ) -> Result<Value, ShellError> {
     let mut column_idx: Vec<usize> = Vec::with_capacity(columns.len());
 
-    let pivot = match &before_or_after.item {
-        BeforeOrAfter::Before(before) => before,
-        BeforeOrAfter::After(after) => after,
-    };
-
-    // check if pivot exists
-    if !record.contains(pivot) {
-        return Err(ShellError::GenericError {
-            error: "Cannot move columns".into(),
-            msg: "column does not exist".into(),
-            span: Some(before_or_after.span),
-            help: None,
-            inner: vec![],
-        });
-    }
-
     // Find indices of columns to be moved
     for column in columns.iter() {
         if let Some(idx) = record.index_of(column.coerce_string()?) {
@@ -214,50 +205,95 @@ fn move_record_columns(
                 inner: vec![],
             });
         }
-
-        let column_as_string = column.coerce_string()?;
-        // check if column is also pivot
-        if &column_as_string == pivot {
-            return Err(ShellError::IncompatibleParameters {
-                left_message: "Column cannot be moved".to_string(),
-                left_span: column.span(),
-                right_message: "relative to itself".to_string(),
-                right_span: before_or_after.span,
-            });
-        }
     }
 
     let mut out = Record::with_capacity(record.len());
 
-    for (i, (inp_col, inp_val)) in record.iter().enumerate() {
-        if inp_col == pivot {
-            if matches!(&before_or_after.item, BeforeOrAfter::After(..)) {
-                out.push(inp_col.clone(), inp_val.clone());
+    match &location {
+        Location::Before(pivot) | Location::After(pivot) => {
+            // Check if pivot exists
+            if !record.contains(&pivot.item) {
+                return Err(ShellError::GenericError {
+                    error: "Cannot move columns".into(),
+                    msg: "column does not exist".into(),
+                    span: Some(pivot.span),
+                    help: None,
+                    inner: vec![],
+                });
             }
 
-            for idx in column_idx.iter() {
-                if let Some((col, val)) = record.get_index(*idx) {
-                    out.push(col.clone(), val.clone());
-                } else {
-                    return Err(ShellError::NushellFailedSpanned {
-                        msg: "Error indexing input columns".to_string(),
-                        label: "originates from here".to_string(),
-                        span,
-                    });
+            for (i, (inp_col, inp_val)) in record.iter().enumerate() {
+                if inp_col == &pivot.item {
+                    // Check if this pivot is also a column we are supposed to move
+                    if column_idx.contains(&i) {
+                        return Err(ShellError::IncompatibleParameters {
+                            left_message: "Column cannot be moved".to_string(),
+                            left_span: inp_val.span(),
+                            right_message: "relative to itself".to_string(),
+                            right_span: pivot.span,
+                        });
+                    }
+
+                    if matches!(location, Location::After(..)) {
+                        out.push(inp_col.clone(), inp_val.clone());
+                    }
+
+                    insert_moved(record, span, &column_idx, &mut out)?;
+
+                    if matches!(location, Location::Before(..)) {
+                        out.push(inp_col.clone(), inp_val.clone());
+                    }
+                } else if !column_idx.contains(&i) {
+                    out.push(inp_col.clone(), inp_val.clone());
                 }
             }
-
-            if matches!(&before_or_after.item, BeforeOrAfter::Before(..)) {
-                out.push(inp_col.clone(), inp_val.clone());
-            }
-        } else if !column_idx.contains(&i) {
-            out.push(inp_col.clone(), inp_val.clone());
         }
-    }
+        Location::First => {
+            insert_moved(record, span, &column_idx, &mut out)?;
+
+            out.extend(where_unmoved(record, &column_idx));
+        }
+        Location::Last => {
+            out.extend(where_unmoved(record, &column_idx));
+
+            insert_moved(record, span, &column_idx, &mut out)?;
+        }
+    };
 
     Ok(Value::record(out, span))
 }
 
+fn where_unmoved<'a>(
+    record: &'a Record,
+    column_idx: &'a [usize],
+) -> impl Iterator<Item = (String, Value)> + use<'a> {
+    record
+        .iter()
+        .enumerate()
+        .filter(|(i, _)| column_idx.contains(i).not())
+        .map(|(_, (c, v))| (c.clone(), v.clone()))
+}
+
+fn insert_moved(
+    record: &Record,
+    span: Span,
+    column_idx: &[usize],
+    out: &mut Record,
+) -> Result<(), ShellError> {
+    for idx in column_idx.iter() {
+        if let Some((col, val)) = record.get_index(*idx) {
+            out.push(col.clone(), val.clone());
+        } else {
+            return Err(ShellError::NushellFailedSpanned {
+                msg: "Error indexing input columns".to_string(),
+                label: "originates from here".to_string(),
+                span,
+            });
+        }
+    }
+    Ok(())
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
@@ -285,140 +321,186 @@ mod test {
     fn move_after_with_single_column() {
         let test_span = Span::test_data();
         let test_record = get_test_record(vec!["a", "b", "c", "d"], vec![1, 2, 3, 4]);
-        let after: Spanned<BeforeOrAfter> = Spanned {
-            item: BeforeOrAfter::After("c".to_string()),
+        let after: Location = Location::After(Spanned {
+            item: "c".to_string(),
             span: test_span,
-        };
-        let columns = [Value::test_string("a")];
+        });
+        let columns = ["a"].map(Value::test_string);
 
         // corresponds to: {a: 1, b: 2, c: 3, d: 4} | move a --after c
         let result = move_record_columns(&test_record, &columns, &after, test_span);
 
         assert!(result.is_ok());
 
-        let result_rec_tmp = result.unwrap();
-        let result_record = result_rec_tmp.as_record().unwrap();
+        let result_record = result.unwrap().into_record().unwrap();
+        let result_columns = result_record.into_columns().collect::<Vec<String>>();
 
-        assert_eq!(*result_record.get_index(0).unwrap().0, "b".to_string());
-        assert_eq!(*result_record.get_index(1).unwrap().0, "c".to_string());
-        assert_eq!(*result_record.get_index(2).unwrap().0, "a".to_string());
-        assert_eq!(*result_record.get_index(3).unwrap().0, "d".to_string());
+        assert_eq!(result_columns, ["b", "c", "a", "d"]);
     }
 
     #[test]
     fn move_after_with_multiple_columns() {
         let test_span = Span::test_data();
         let test_record = get_test_record(vec!["a", "b", "c", "d", "e"], vec![1, 2, 3, 4, 5]);
-        let after: Spanned<BeforeOrAfter> = Spanned {
-            item: BeforeOrAfter::After("c".to_string()),
+        let after: Location = Location::After(Spanned {
+            item: "c".to_string(),
             span: test_span,
-        };
-        let columns = [Value::test_string("b"), Value::test_string("e")];
+        });
+        let columns = ["b", "e"].map(Value::test_string);
 
         // corresponds to: {a: 1, b: 2, c: 3, d: 4, e: 5} | move b e --after c
         let result = move_record_columns(&test_record, &columns, &after, test_span);
 
         assert!(result.is_ok());
 
-        let result_rec_tmp = result.unwrap();
-        let result_record = result_rec_tmp.as_record().unwrap();
+        let result_record = result.unwrap().into_record().unwrap();
+        let result_columns = result_record.into_columns().collect::<Vec<String>>();
 
-        assert_eq!(*result_record.get_index(0).unwrap().0, "a".to_string());
-        assert_eq!(*result_record.get_index(1).unwrap().0, "c".to_string());
-        assert_eq!(*result_record.get_index(2).unwrap().0, "b".to_string());
-        assert_eq!(*result_record.get_index(3).unwrap().0, "e".to_string());
-        assert_eq!(*result_record.get_index(4).unwrap().0, "d".to_string());
+        assert_eq!(result_columns, ["a", "c", "b", "e", "d"]);
     }
 
     #[test]
     fn move_before_with_single_column() {
         let test_span = Span::test_data();
         let test_record = get_test_record(vec!["a", "b", "c", "d"], vec![1, 2, 3, 4]);
-        let after: Spanned<BeforeOrAfter> = Spanned {
-            item: BeforeOrAfter::Before("b".to_string()),
+        let before: Location = Location::Before(Spanned {
+            item: "b".to_string(),
             span: test_span,
-        };
-        let columns = [Value::test_string("d")];
+        });
+        let columns = ["d"].map(Value::test_string);
 
         // corresponds to: {a: 1, b: 2, c: 3, d: 4} | move d --before b
-        let result = move_record_columns(&test_record, &columns, &after, test_span);
+        let result = move_record_columns(&test_record, &columns, &before, test_span);
 
         assert!(result.is_ok());
 
-        let result_rec_tmp = result.unwrap();
-        let result_record = result_rec_tmp.as_record().unwrap();
+        let result_record = result.unwrap().into_record().unwrap();
+        let result_columns = result_record.into_columns().collect::<Vec<String>>();
 
-        assert_eq!(*result_record.get_index(0).unwrap().0, "a".to_string());
-        assert_eq!(*result_record.get_index(1).unwrap().0, "d".to_string());
-        assert_eq!(*result_record.get_index(2).unwrap().0, "b".to_string());
-        assert_eq!(*result_record.get_index(3).unwrap().0, "c".to_string());
+        assert_eq!(result_columns, ["a", "d", "b", "c"]);
     }
 
     #[test]
     fn move_before_with_multiple_columns() {
         let test_span = Span::test_data();
         let test_record = get_test_record(vec!["a", "b", "c", "d", "e"], vec![1, 2, 3, 4, 5]);
-        let after: Spanned<BeforeOrAfter> = Spanned {
-            item: BeforeOrAfter::Before("b".to_string()),
+        let before: Location = Location::Before(Spanned {
+            item: "b".to_string(),
             span: test_span,
-        };
-        let columns = [Value::test_string("c"), Value::test_string("e")];
+        });
+        let columns = ["c", "e"].map(Value::test_string);
 
         // corresponds to: {a: 1, b: 2, c: 3, d: 4, e: 5} | move c e --before b
-        let result = move_record_columns(&test_record, &columns, &after, test_span);
+        let result = move_record_columns(&test_record, &columns, &before, test_span);
 
         assert!(result.is_ok());
 
-        let result_rec_tmp = result.unwrap();
-        let result_record = result_rec_tmp.as_record().unwrap();
+        let result_record = result.unwrap().into_record().unwrap();
+        let result_columns = result_record.into_columns().collect::<Vec<String>>();
 
-        assert_eq!(*result_record.get_index(0).unwrap().0, "a".to_string());
-        assert_eq!(*result_record.get_index(1).unwrap().0, "c".to_string());
-        assert_eq!(*result_record.get_index(2).unwrap().0, "e".to_string());
-        assert_eq!(*result_record.get_index(3).unwrap().0, "b".to_string());
-        assert_eq!(*result_record.get_index(4).unwrap().0, "d".to_string());
+        assert_eq!(result_columns, ["a", "c", "e", "b", "d"]);
+    }
+
+    #[test]
+    fn move_first_with_single_column() {
+        let test_span = Span::test_data();
+        let test_record = get_test_record(vec!["a", "b", "c", "d"], vec![1, 2, 3, 4]);
+        let columns = ["c"].map(Value::test_string);
+
+        // corresponds to: {a: 1, b: 2, c: 3, d: 4} | move c --first
+        let result = move_record_columns(&test_record, &columns, &Location::First, test_span);
+
+        assert!(result.is_ok());
+
+        let result_record = result.unwrap().into_record().unwrap();
+        let result_columns = result_record.into_columns().collect::<Vec<String>>();
+
+        assert_eq!(result_columns, ["c", "a", "b", "d"]);
+    }
+
+    #[test]
+    fn move_first_with_multiple_columns() {
+        let test_span = Span::test_data();
+        let test_record = get_test_record(vec!["a", "b", "c", "d", "e"], vec![1, 2, 3, 4, 5]);
+        let columns = ["c", "e"].map(Value::test_string);
+
+        // corresponds to: {a: 1, b: 2, c: 3, d: 4, e: 5} | move c e --first
+        let result = move_record_columns(&test_record, &columns, &Location::First, test_span);
+
+        assert!(result.is_ok());
+
+        let result_record = result.unwrap().into_record().unwrap();
+        let result_columns = result_record.into_columns().collect::<Vec<String>>();
+
+        assert_eq!(result_columns, ["c", "e", "a", "b", "d"]);
+    }
+
+    #[test]
+    fn move_last_with_single_column() {
+        let test_span = Span::test_data();
+        let test_record = get_test_record(vec!["a", "b", "c", "d"], vec![1, 2, 3, 4]);
+        let columns = ["b"].map(Value::test_string);
+
+        // corresponds to: {a: 1, b: 2, c: 3, d: 4} | move b --last
+        let result = move_record_columns(&test_record, &columns, &Location::Last, test_span);
+
+        assert!(result.is_ok());
+
+        let result_record = result.unwrap().into_record().unwrap();
+        let result_columns = result_record.into_columns().collect::<Vec<String>>();
+
+        assert_eq!(result_columns, ["a", "c", "d", "b"]);
+    }
+
+    #[test]
+    fn move_last_with_multiple_columns() {
+        let test_span = Span::test_data();
+        let test_record = get_test_record(vec!["a", "b", "c", "d", "e"], vec![1, 2, 3, 4, 5]);
+        let columns = ["c", "d"].map(Value::test_string);
+
+        // corresponds to: {a: 1, b: 2, c: 3, d: 4, e: 5} | move c d --last
+        let result = move_record_columns(&test_record, &columns, &Location::Last, test_span);
+
+        assert!(result.is_ok());
+
+        let result_record = result.unwrap().into_record().unwrap();
+        let result_columns = result_record.into_columns().collect::<Vec<String>>();
+
+        assert_eq!(result_columns, ["a", "b", "e", "c", "d"]);
     }
 
     #[test]
     fn move_with_multiple_columns_reorders_columns() {
         let test_span = Span::test_data();
         let test_record = get_test_record(vec!["a", "b", "c", "d", "e"], vec![1, 2, 3, 4, 5]);
-        let after: Spanned<BeforeOrAfter> = Spanned {
-            item: BeforeOrAfter::After("e".to_string()),
+        let after: Location = Location::After(Spanned {
+            item: "e".to_string(),
             span: test_span,
-        };
-        let columns = [
-            Value::test_string("d"),
-            Value::test_string("c"),
-            Value::test_string("a"),
-        ];
+        });
+        let columns = ["d", "c", "a"].map(Value::test_string);
 
         // corresponds to: {a: 1, b: 2, c: 3, d: 4, e: 5} | move d c a --after e
         let result = move_record_columns(&test_record, &columns, &after, test_span);
 
         assert!(result.is_ok());
 
-        let result_rec_tmp = result.unwrap();
-        let result_record = result_rec_tmp.as_record().unwrap();
+        let result_record = result.unwrap().into_record().unwrap();
+        let result_columns = result_record.into_columns().collect::<Vec<String>>();
 
-        assert_eq!(*result_record.get_index(0).unwrap().0, "b".to_string());
-        assert_eq!(*result_record.get_index(1).unwrap().0, "e".to_string());
-        assert_eq!(*result_record.get_index(2).unwrap().0, "d".to_string());
-        assert_eq!(*result_record.get_index(3).unwrap().0, "c".to_string());
-        assert_eq!(*result_record.get_index(4).unwrap().0, "a".to_string());
+        assert_eq!(result_columns, ["b", "e", "d", "c", "a"]);
     }
 
     #[test]
     fn move_fails_when_pivot_not_present() {
         let test_span = Span::test_data();
         let test_record = get_test_record(vec!["a", "b"], vec![1, 2]);
-        let after: Spanned<BeforeOrAfter> = Spanned {
-            item: BeforeOrAfter::Before("non-existent".to_string()),
+        let before: Location = Location::Before(Spanned {
+            item: "non-existent".to_string(),
             span: test_span,
-        };
-        let columns = [Value::test_string("a")];
+        });
+        let columns = ["a"].map(Value::test_string);
 
-        let result = move_record_columns(&test_record, &columns, &after, test_span);
+        let result = move_record_columns(&test_record, &columns, &before, test_span);
 
         assert!(result.is_err());
     }
@@ -427,13 +509,13 @@ mod test {
     fn move_fails_when_column_not_present() {
         let test_span = Span::test_data();
         let test_record = get_test_record(vec!["a", "b"], vec![1, 2]);
-        let after: Spanned<BeforeOrAfter> = Spanned {
-            item: BeforeOrAfter::Before("b".to_string()),
+        let before: Location = Location::Before(Spanned {
+            item: "b".to_string(),
             span: test_span,
-        };
-        let columns = [Value::test_string("a"), Value::test_string("non-existent")];
+        });
+        let columns = ["a", "non-existent"].map(Value::test_string);
 
-        let result = move_record_columns(&test_record, &columns, &after, test_span);
+        let result = move_record_columns(&test_record, &columns, &before, test_span);
 
         assert!(result.is_err());
     }
@@ -442,11 +524,11 @@ mod test {
     fn move_fails_when_column_is_also_pivot() {
         let test_span = Span::test_data();
         let test_record = get_test_record(vec!["a", "b", "c", "d"], vec![1, 2, 3, 4]);
-        let after: Spanned<BeforeOrAfter> = Spanned {
-            item: BeforeOrAfter::After("b".to_string()),
+        let after: Location = Location::After(Spanned {
+            item: "b".to_string(),
             span: test_span,
-        };
-        let columns = [Value::test_string("b"), Value::test_string("d")];
+        });
+        let columns = ["b", "d"].map(Value::test_string);
 
         let result = move_record_columns(&test_record, &columns, &after, test_span);
 

From f4205132c74f5bee077ca353ed4fbcbad3fdb4e5 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Thu, 30 Jan 2025 20:34:56 +0800
Subject: [PATCH 0980/1072] add tests with display_error=True (#14939)

# Description
This is a follow up for pr:
https://github.com/nushell/nushell/pull/13873

In that pr, I left 2 TODOs about tests, this pr is going to resolve
them.

# User-Facing Changes
NaN
# Tests + Formatting
Added 2 tests
---
 tests/shell/pipeline/commands/external.rs | 40 +++++++++++++++++++++--
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/tests/shell/pipeline/commands/external.rs b/tests/shell/pipeline/commands/external.rs
index 172ac8cbfc..7268133ab0 100644
--- a/tests/shell/pipeline/commands/external.rs
+++ b/tests/shell/pipeline/commands/external.rs
@@ -1,4 +1,4 @@
-use nu_test_support::fs::Stub::EmptyFile;
+use nu_test_support::fs::Stub::{EmptyFile, FileWithContent};
 use nu_test_support::nu;
 use nu_test_support::playground::Playground;
 use pretty_assertions::assert_eq;
@@ -627,7 +627,6 @@ fn exit_code_stops_execution_closure() {
     assert!(actual.err.contains("exited with code 1"));
 }
 
-// TODO: need to add tests under display_error.exit_code = true
 #[test]
 fn exit_code_stops_execution_custom_command() {
     let actual = nu!("def cmd [] { nu -c 'exit 42'; 'ok1' }; cmd; print 'ok2'");
@@ -635,7 +634,6 @@ fn exit_code_stops_execution_custom_command() {
     assert!(!actual.err.contains("exited with code 42"));
 }
 
-// TODO: need to add tests under display_error.exit_code = true
 #[test]
 fn exit_code_stops_execution_for_loop() {
     let actual = nu!("for x in [0 1] { nu -c 'exit 42'; print $x }");
@@ -643,6 +641,42 @@ fn exit_code_stops_execution_for_loop() {
     assert!(!actual.err.contains("exited with code 42"));
 }
 
+#[test]
+fn display_error_with_exit_code_stops() {
+    Playground::setup("errexit", |dirs, sandbox| {
+        sandbox.with_files(&[FileWithContent(
+            "tmp_env.nu",
+            "$env.config.display_errors.exit_code = true",
+        )]);
+
+        let actual = nu!(
+            env_config: "tmp_env.nu",
+            cwd: dirs.test(),
+            "def cmd [] { nu -c 'exit 42'; 'ok1' }; cmd; print 'ok2'",
+        );
+        assert!(actual.err.contains("exited with code"));
+        assert_eq!(actual.out, "");
+    });
+}
+
+#[test]
+fn display_error_exit_code_stops_execution_for_loop() {
+    Playground::setup("errexit", |dirs, sandbox| {
+        sandbox.with_files(&[FileWithContent(
+            "tmp_env.nu",
+            "$env.config.display_errors.exit_code = true",
+        )]);
+
+        let actual = nu!(
+            env_config: "tmp_env.nu",
+            cwd: dirs.test(),
+            "for x in [0 1] { nu -c 'exit 42'; print $x }",
+        );
+        assert!(actual.err.contains("exited with code"));
+        assert_eq!(actual.out, "");
+    });
+}
+
 #[test]
 fn arg_dont_run_subcommand_if_surrounded_with_quote() {
     let actual = nu!("nu --testbin cococo `(echo aa)`");

From 948965d42fe8bde84e589c660ef9b73f15ee8469 Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Thu, 30 Jan 2025 07:47:22 -0500
Subject: [PATCH 0981/1072] Immediately return error if detected as pipeline
 input or positional argument (#14874)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

This PR returns error values while checking pipeline input types and
positional argument types. This should help return non-nested errors
earlier and prevent confusing errors.

The positional argument change is directly related to an example given
on Discord. Before this PR, this is the error shown:

```
Error: nu::shell::cant_convert

  × Can't convert to record.
    ╭─[/home/rose/tmp/script.nu:23:5]
 22 │         let entry = $in
 23 │ ╭─▶     {
 24 │ │         name: $entry,
 25 │ │         details: {
 26 │ │           context: $context
 27 │ │         }
 28 │ ├─▶     }
    · ╰──── can't convert error to record
 29 │       }
    ╰────
```

After this PR, this is the error shown:

```
Error: nu::shell::eval_block_with_input

  × Eval block failed with pipeline input
    ╭─[/home/rose/tmp/script.nu:23:5]
 22 │         let entry = $in
 23 │ ╭─▶     {
 24 │ │         name: $entry,
 25 │ │         details: {
 26 │ │           context: $context
 27 │ │         }
 28 │ ├─▶     }
    · ╰──── source value
 29 │       }
    ╰────

Error: nu::shell::type_mismatch

  × Type mismatch.
   ╭─[/home/rose/tmp/much.nu:3:38]
 2 │   $in | each { |elem|
 3 │     print $elem.details.context.yaml.0
   ·                                      ┬
   ·                                      ╰── Can't access record values with a row index. Try specifying a column name instead
 4 │   } | each { |elem|
   ╰────
```

I'm not certain if the pipeline input error check actually can ever be
triggered, but it seems to be a good defensive error handling strategy
regardless. My addition of the `Value::Error` case in the first place
would suggest it can be, but after looking at it more closely the error
that caused me to add the case in the first place was actually unrelated
to input typechecking.

Additionally, this PR does not affect the handling of nested errors, so
something like:

```nushell
try { ... } catch {|e| $e | reject raw | to nuon }
```

works the same before and after this PR.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

Errors values detected as arguments to commands or as pipeline input to
commands are immediately thrown, rather than passed to the command.

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
N/A
---
 crates/nu-engine/src/eval_ir.rs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index 035f6a394d..4cc8cef782 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -1251,15 +1251,15 @@ fn gather_arguments(
 
 /// Type check helper. Produces `CantConvert` error if `val` is not compatible with `ty`.
 fn check_type(val: &Value, ty: &Type) -> Result<(), ShellError> {
-    if val.is_subtype_of(ty) {
-        Ok(())
-    } else {
-        Err(ShellError::CantConvert {
+    match val {
+        Value::Error { error, .. } => Err(*error.clone()),
+        _ if val.is_subtype_of(ty) => Ok(()),
+        _ => Err(ShellError::CantConvert {
             to_type: ty.to_string(),
             from_type: val.get_type().to_string(),
             span: val.span(),
             help: None,
-        })
+        }),
     }
 }
 
@@ -1284,12 +1284,12 @@ fn check_input_types(
         _ => (),
     }
 
-    // Errors and custom values bypass input type checking
-    if matches!(
-        input,
-        PipelineData::Value(Value::Error { .. } | Value::Custom { .. }, ..)
-    ) {
-        return Ok(());
+    match input {
+        // early return error directly if detected
+        PipelineData::Value(Value::Error { error, .. }, ..) => return Err(*error.clone()),
+        // bypass run-time typechecking for custom types
+        PipelineData::Value(Value::Custom { .. }, ..) => return Ok(()),
+        _ => (),
     }
 
     // Check if the input type is compatible with *any* of the command's possible input types

From b55ed69c92b0eecdf4c33b7ee65790f0f57802e9 Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Thu, 30 Jan 2025 15:50:01 +0300
Subject: [PATCH 0982/1072] fix range bugs in `str substring`, `str index-of`,
 `slice`, `bytes at` (#14863)

- fixes #14769

# Description

## Bugs

-   `str substring 0..<0`

When passed a range containing no elements, for non-zero cases `str
substring` behaves correctly:

    ```nushell
    ("hello world" | str substring 1..<1) == ""
    # => true
    ```

    but if the range is `0..<0`, it returns the whole string instead

    ```nushell
    "hello world" | str substring 0..<0
    # => hello world
    ```
-   `[0 1 2] | range 0..<0`
    Similar behavior to `str substring`
-   `str index-of`
    - off-by-one on end bounds
    - underflow on negative start bounds
- `bytes at` has inconsistent behavior, works correctly when the size is
known, returns one byte less when it's not known (streaming)
This can be demonstrated by comparing the outputs of following snippets
    ```nushell
    "hello world" | into binary | bytes at ..<5 | decode
    # => hello

"hello world" | into binary | chunks 1 | bytes collect | bytes at ..<5 |
decode
    # => hell
    ```
- `bytes at` panics on decreasing (`5..3`) ranges if the input size is
known. Does not panic with streaming input.

## Changes

- implement `FromValue` for `IntRange`, as it is very common to use
integer ranges as arguments
- `IntRange::absolute_start` can now point one-past-end
- `IntRange::absolute_end` converts relative `Included` bounds to
absolute `Excluded` bounds
- `IntRange::absolute_bounds` is a convenience method that calls the
other `absolute_*` methods and transforms reverse ranges to empty at
`start` (`5..3` => `5..<5`)
- refactored `str substring` tests to allow empty exclusive range tests
- fix the `0..<0` case for `str substring` and `str index-of`
- `IntRange::distance` never returns `Included(0)`

  As a general rule `Included(n) == Excluded(n + 1)`.

This makes returning `Included(0)` bug prone as users of the function
will likely rely on this general rule and cause bugs.
- `ByteStream::slice` no longer has an off-by-one on inputs without a
known size. This affected `bytes at`.
- `bytes at` no longer panics on reverse ranges
- `bytes at` is now consistent between streaming and non streaming
inputs.

# User-Facing Changes
There should be no noticeable changes other than the bugfix.

# Tests + Formatting

- :green_circle: toolkit fmt
- :green_circle: toolkit clippy
- :green_circle: toolkit test
- :green_circle: toolkit test stdlib

# After Submitting
N/A
---
 crates/nu-command/src/bytes/at.rs             |   9 +-
 crates/nu-command/src/filters/slice.rs        |  91 +++----
 .../nu-command/src/strings/str_/index_of.rs   |  91 ++++---
 .../nu-command/src/strings/str_/substring.rs  | 228 +++++++++---------
 crates/nu-command/tests/commands/bytes/at.rs  |   9 +-
 crates/nu-command/tests/commands/slice.rs     |  14 ++
 .../nu-protocol/src/pipeline/byte_stream.rs   |   4 +-
 crates/nu-protocol/src/value/range.rs         |  50 +++-
 .../nu-protocol/tests/pipeline/byte_stream.rs |  17 ++
 9 files changed, 281 insertions(+), 232 deletions(-)

diff --git a/crates/nu-command/src/bytes/at.rs b/crates/nu-command/src/bytes/at.rs
index 9663e545a4..b89be18d1e 100644
--- a/crates/nu-command/src/bytes/at.rs
+++ b/crates/nu-command/src/bytes/at.rs
@@ -141,7 +141,7 @@ fn map_value(input: &Value, args: &Arguments, head: Span) -> Value {
         Value::Binary { val, .. } => {
             let len = val.len() as u64;
             let start: u64 = range.absolute_start(len);
-            let start: usize = match start.try_into() {
+            let _start: usize = match start.try_into() {
                 Ok(start) => start,
                 Err(_) => {
                     let span = input.span();
@@ -159,10 +159,11 @@ fn map_value(input: &Value, args: &Arguments, head: Span) -> Value {
                 }
             };
 
-            let bytes: Vec<u8> = match range.absolute_end(len) {
+            let (start, end) = range.absolute_bounds(val.len());
+            let bytes: Vec<u8> = match end {
                 Bound::Unbounded => val[start..].into(),
-                Bound::Included(end) => val[start..=end as usize].into(),
-                Bound::Excluded(end) => val[start..end as usize].into(),
+                Bound::Included(end) => val[start..=end].into(),
+                Bound::Excluded(end) => val[start..end].into(),
             };
 
             Value::binary(bytes, head)
diff --git a/crates/nu-command/src/filters/slice.rs b/crates/nu-command/src/filters/slice.rs
index e3f49a4bb3..638d6dfca3 100644
--- a/crates/nu-command/src/filters/slice.rs
+++ b/crates/nu-command/src/filters/slice.rs
@@ -1,5 +1,5 @@
 use nu_engine::command_prelude::*;
-use nu_protocol::Range;
+use nu_protocol::IntRange;
 use std::ops::Bound;
 
 #[derive(Clone)]
@@ -66,68 +66,49 @@ impl Command for Slice {
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
         let metadata = input.metadata();
-        let rows: Spanned<Range> = call.req(engine_state, stack, 0)?;
+        let range: IntRange = call.req(engine_state, stack, 0)?;
 
-        match rows.item {
-            Range::IntRange(range) => {
-                let start = range.start();
-                let end = match range.end() {
-                    Bound::Included(end) => end,
-                    Bound::Excluded(end) => end - 1,
-                    Bound::Unbounded => {
-                        if range.step() < 0 {
-                            i64::MIN
-                        } else {
-                            i64::MAX
-                        }
-                    }
-                };
+        // only collect the input if we have any negative indices
+        if range.is_relative() {
+            let v: Vec<_> = input.into_iter().collect();
 
-                // only collect the input if we have any negative indices
-                if start < 0 || end < 0 {
-                    let v: Vec<_> = input.into_iter().collect();
-                    let vlen: i64 = v.len() as i64;
+            let (from, to) = range.absolute_bounds(v.len());
 
-                    let from = if start < 0 {
-                        (vlen + start) as usize
+            let count = match to {
+                Bound::Excluded(to) => to.saturating_sub(from),
+                Bound::Included(to) => to.saturating_sub(from) + 1,
+                Bound::Unbounded => usize::MAX,
+            };
+
+            if count == 0 {
+                Ok(PipelineData::Value(Value::list(vec![], head), None))
+            } else {
+                let iter = v.into_iter().skip(from).take(count);
+                Ok(iter.into_pipeline_data(head, engine_state.signals().clone()))
+            }
+        } else {
+            let from = range.start() as usize;
+            let count = match range.end() {
+                Bound::Excluded(to) | Bound::Included(to) if range.start() > to => 0,
+                Bound::Excluded(to) => (to as usize).saturating_sub(from),
+                Bound::Included(to) => (to as usize).saturating_sub(from) + 1,
+                Bound::Unbounded => {
+                    if range.step() < 0 {
+                        0
                     } else {
-                        start as usize
-                    };
-
-                    let to = if end < 0 {
-                        (vlen + end) as usize
-                    } else if end > v.len() as i64 {
-                        v.len()
-                    } else {
-                        end as usize
-                    };
-
-                    if from > to {
-                        Ok(PipelineData::Value(Value::nothing(head), None))
-                    } else {
-                        let iter = v.into_iter().skip(from).take(to - from + 1);
-                        Ok(iter.into_pipeline_data(head, engine_state.signals().clone()))
-                    }
-                } else {
-                    let from = start as usize;
-                    let to = end as usize;
-
-                    if from > to {
-                        Ok(PipelineData::Value(Value::nothing(head), None))
-                    } else {
-                        let iter = input.into_iter().skip(from).take(to - from + 1);
-                        Ok(iter.into_pipeline_data(head, engine_state.signals().clone()))
+                        usize::MAX
                     }
                 }
-                .map(|x| x.set_metadata(metadata))
+            };
+
+            if count == 0 {
+                Ok(PipelineData::Value(Value::list(vec![], head), None))
+            } else {
+                let iter = input.into_iter().skip(from).take(count);
+                Ok(iter.into_pipeline_data(head, engine_state.signals().clone()))
             }
-            Range::FloatRange(_) => Err(ShellError::UnsupportedInput {
-                msg: "float range".into(),
-                input: "value originates from here".into(),
-                msg_span: call.head,
-                input_span: rows.span,
-            }),
         }
+        .map(|x| x.set_metadata(metadata))
     }
 }
 
diff --git a/crates/nu-command/src/strings/str_/index_of.rs b/crates/nu-command/src/strings/str_/index_of.rs
index eace6c0494..efd9540158 100644
--- a/crates/nu-command/src/strings/str_/index_of.rs
+++ b/crates/nu-command/src/strings/str_/index_of.rs
@@ -1,16 +1,15 @@
+use std::ops::Bound;
+
 use crate::{grapheme_flags, grapheme_flags_const};
-use nu_cmd_base::{
-    input_handler::{operate, CmdArgument},
-    util,
-};
+use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
-use nu_protocol::{engine::StateWorkingSet, Range};
+use nu_protocol::{engine::StateWorkingSet, IntRange};
 use unicode_segmentation::UnicodeSegmentation;
 
 struct Arguments {
     end: bool,
     substring: String,
-    range: Option<Spanned<Range>>,
+    range: Option<Spanned<IntRange>>,
     cell_paths: Option<Vec<CellPath>>,
     graphemes: bool,
 }
@@ -170,46 +169,44 @@ fn action(
 ) -> Value {
     match input {
         Value::String { val: s, .. } => {
-            let mut range_span = head;
-            let (start_index, end_index) = if let Some(spanned_range) = range {
-                range_span = spanned_range.span;
+            let (search_str, start_index) = if let Some(spanned_range) = range {
+                let range_span = spanned_range.span;
                 let range = &spanned_range.item;
-                match util::process_range(range) {
-                    Ok(r) => {
-                        // `process_range()` returns `isize::MAX` if the range is open-ended,
-                        // which is not ideal for us
-                        let end = if r.1 as usize > s.len() {
-                            s.len()
-                        } else {
-                            r.1 as usize
-                        };
-                        (r.0 as usize, end)
-                    }
-                    Err(processing_error) => {
-                        let err = processing_error("could not find `index-of`", head);
-                        return Value::error(err, head);
-                    }
-                }
-            } else {
-                (0usize, s.len())
-            };
 
-            if s.get(start_index..end_index).is_none() {
-                return Value::error(
-                    ShellError::OutOfBounds {
-                        left_flank: start_index.to_string(),
-                        right_flank: end_index.to_string(),
-                        span: range_span,
-                    },
-                    head,
-                );
-            }
+                let (start, end) = range.absolute_bounds(s.len());
+                let s = match end {
+                    Bound::Excluded(end) => s.get(start..end),
+                    Bound::Included(end) => s.get(start..=end),
+                    Bound::Unbounded => s.get(start..),
+                };
+
+                let s = match s {
+                    Some(s) => s,
+                    None => {
+                        return Value::error(
+                            ShellError::OutOfBounds {
+                                left_flank: start.to_string(),
+                                right_flank: match range.end() {
+                                    Bound::Unbounded => "".to_string(),
+                                    Bound::Included(end) => format!("={end}"),
+                                    Bound::Excluded(end) => format!("<{end}"),
+                                },
+                                span: range_span,
+                            },
+                            head,
+                        )
+                    }
+                };
+                (s, start)
+            } else {
+                (s.as_str(), 0)
+            };
 
             // When the -e flag is present, search using rfind instead of find.s
             if let Some(result) = if *end {
-                s[start_index..end_index].rfind(&**substring)
+                search_str.rfind(&**substring)
             } else {
-                s[start_index..end_index].find(&**substring)
+                search_str.find(&**substring)
             } {
                 let result = result + start_index;
                 Value::int(
@@ -294,7 +291,7 @@ mod tests {
     #[test]
     fn returns_index_of_next_substring() {
         let word = Value::test_string("Cargo.Cargo");
-        let range = Range::new(
+        let range = IntRange::new(
             Value::int(1, Span::test_data()),
             Value::nothing(Span::test_data()),
             Value::nothing(Span::test_data()),
@@ -324,7 +321,7 @@ mod tests {
     #[test]
     fn index_does_not_exist_due_to_end_index() {
         let word = Value::test_string("Cargo.Banana");
-        let range = Range::new(
+        let range = IntRange::new(
             Value::nothing(Span::test_data()),
             Value::nothing(Span::test_data()),
             Value::int(5, Span::test_data()),
@@ -354,7 +351,7 @@ mod tests {
     #[test]
     fn returns_index_of_nums_in_middle_due_to_index_limit_from_both_ends() {
         let word = Value::test_string("123123123");
-        let range = Range::new(
+        let range = IntRange::new(
             Value::int(2, Span::test_data()),
             Value::nothing(Span::test_data()),
             Value::int(6, Span::test_data()),
@@ -384,7 +381,7 @@ mod tests {
     #[test]
     fn index_does_not_exists_due_to_strict_bounds() {
         let word = Value::test_string("123456");
-        let range = Range::new(
+        let range = IntRange::new(
             Value::int(2, Span::test_data()),
             Value::nothing(Span::test_data()),
             Value::int(5, Span::test_data()),
@@ -431,7 +428,7 @@ mod tests {
     fn index_is_not_a_char_boundary() {
         let word = Value::string(String::from("💛"), Span::test_data());
 
-        let range = Range::new(
+        let range = IntRange::new(
             Value::int(0, Span::test_data()),
             Value::int(1, Span::test_data()),
             Value::int(2, Span::test_data()),
@@ -462,7 +459,7 @@ mod tests {
     fn index_is_out_of_bounds() {
         let word = Value::string(String::from("hello"), Span::test_data());
 
-        let range = Range::new(
+        let range = IntRange::new(
             Value::int(-1, Span::test_data()),
             Value::int(1, Span::test_data()),
             Value::int(3, Span::test_data()),
@@ -486,6 +483,6 @@ mod tests {
         };
 
         let actual = action(&word, &options, Span::test_data());
-        assert!(actual.is_error());
+        assert_eq!(actual, Value::test_int(-1));
     }
 }
diff --git a/crates/nu-command/src/strings/str_/substring.rs b/crates/nu-command/src/strings/str_/substring.rs
index 58f32391fa..57e4426f49 100644
--- a/crates/nu-command/src/strings/str_/substring.rs
+++ b/crates/nu-command/src/strings/str_/substring.rs
@@ -1,17 +1,16 @@
+use std::ops::Bound;
+
 use crate::{grapheme_flags, grapheme_flags_const};
-use nu_cmd_base::{
-    input_handler::{operate, CmdArgument},
-    util,
-};
+use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
-use nu_protocol::{engine::StateWorkingSet, Range};
+use nu_protocol::{engine::StateWorkingSet, IntRange};
 use unicode_segmentation::UnicodeSegmentation;
 
 #[derive(Clone)]
 pub struct SubCommand;
 
 struct Arguments {
-    indexes: Substring,
+    range: IntRange,
     cell_paths: Option<Vec<CellPath>>,
     graphemes: bool,
 }
@@ -22,15 +21,6 @@ impl CmdArgument for Arguments {
     }
 }
 
-#[derive(Clone)]
-struct Substring(isize, isize);
-
-impl From<(isize, isize)> for Substring {
-    fn from(input: (isize, isize)) -> Substring {
-        Substring(input.0, input.1)
-    }
-}
-
 impl Command for SubCommand {
     fn name(&self) -> &str {
         "str substring"
@@ -87,19 +77,12 @@ impl Command for SubCommand {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let range: Range = call.req(engine_state, stack, 0)?;
-
-        let indexes = match util::process_range(&range) {
-            Ok(idxs) => idxs.into(),
-            Err(processing_error) => {
-                return Err(processing_error("could not perform substring", call.head))
-            }
-        };
+        let range: IntRange = call.req(engine_state, stack, 0)?;
 
         let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
         let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
         let args = Arguments {
-            indexes,
+            range,
             cell_paths,
             graphemes: grapheme_flags(engine_state, stack, call)?,
         };
@@ -112,19 +95,12 @@ impl Command for SubCommand {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let range: Range = call.req_const(working_set, 0)?;
-
-        let indexes = match util::process_range(&range) {
-            Ok(idxs) => idxs.into(),
-            Err(processing_error) => {
-                return Err(processing_error("could not perform substring", call.head))
-            }
-        };
+        let range: IntRange = call.req_const(working_set, 0)?;
 
         let cell_paths: Vec<CellPath> = call.rest_const(working_set, 1)?;
         let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
         let args = Arguments {
-            indexes,
+            range,
             cell_paths,
             graphemes: grapheme_flags_const(working_set, call)?,
         };
@@ -160,58 +136,38 @@ impl Command for SubCommand {
 }
 
 fn action(input: &Value, args: &Arguments, head: Span) -> Value {
-    let options = &args.indexes;
     match input {
         Value::String { val: s, .. } => {
-            let len: isize = s.len() as isize;
+            let s = if args.graphemes {
+                let indices = s
+                    .grapheme_indices(true)
+                    .map(|(idx, s)| (idx, s.len()))
+                    .collect::<Vec<_>>();
 
-            let start: isize = if options.0 < 0 {
-                options.0 + len
-            } else {
-                options.0
-            };
-            let end: isize = if options.1 < 0 {
-                options.1 + len
-            } else {
-                options.1
-            };
+                let (idx_start, idx_end) = args.range.absolute_bounds(indices.len());
+                let idx_range = match idx_end {
+                    Bound::Excluded(end) => &indices[idx_start..end],
+                    Bound::Included(end) => &indices[idx_start..=end],
+                    Bound::Unbounded => &indices[idx_start..],
+                };
 
-            if start > end {
-                Value::string("", head)
+                if let Some((start, end)) = idx_range.first().zip(idx_range.last()) {
+                    let start = start.0;
+                    let end = end.0 + end.1;
+                    s[start..end].to_owned()
+                } else {
+                    String::new()
+                }
             } else {
-                Value::string(
-                    {
-                        if end == isize::MAX {
-                            if args.graphemes {
-                                s.graphemes(true)
-                                    .skip(start as usize)
-                                    .collect::<Vec<&str>>()
-                                    .join("")
-                            } else {
-                                String::from_utf8_lossy(
-                                    &s.bytes().skip(start as usize).collect::<Vec<_>>(),
-                                )
-                                .to_string()
-                            }
-                        } else if args.graphemes {
-                            s.graphemes(true)
-                                .skip(start as usize)
-                                .take((end - start + 1) as usize)
-                                .collect::<Vec<&str>>()
-                                .join("")
-                        } else {
-                            String::from_utf8_lossy(
-                                &s.bytes()
-                                    .skip(start as usize)
-                                    .take((end - start + 1) as usize)
-                                    .collect::<Vec<_>>(),
-                            )
-                            .to_string()
-                        }
-                    },
-                    head,
-                )
-            }
+                let (start, end) = args.range.absolute_bounds(s.len());
+                let s = match end {
+                    Bound::Excluded(end) => &s.as_bytes()[start..end],
+                    Bound::Included(end) => &s.as_bytes()[start..=end],
+                    Bound::Unbounded => &s.as_bytes()[start..],
+                };
+                String::from_utf8_lossy(s).into_owned()
+            };
+            Value::string(s, head)
         }
         // Propagate errors by explicitly matching them before the final case.
         Value::Error { .. } => input.clone(),
@@ -228,8 +184,11 @@ fn action(input: &Value, args: &Arguments, head: Span) -> Value {
 }
 
 #[cfg(test)]
+#[allow(clippy::reversed_empty_ranges)]
 mod tests {
-    use super::{action, Arguments, Span, SubCommand, Substring, Value};
+    use nu_protocol::IntRange;
+
+    use super::{action, Arguments, Span, SubCommand, Value};
 
     #[test]
     fn test_examples() {
@@ -237,21 +196,66 @@ mod tests {
 
         test_examples(SubCommand {})
     }
+
+    #[derive(Clone, Copy, Debug)]
+    struct RangeHelper {
+        start: i64,
+        end: i64,
+        inclusion: nu_protocol::ast::RangeInclusion,
+    }
+
     #[derive(Debug)]
     struct Expectation<'a> {
-        options: (isize, isize),
+        range: RangeHelper,
         expected: &'a str,
     }
 
-    impl Expectation<'_> {
-        fn options(&self) -> Substring {
-            Substring(self.options.0, self.options.1)
+    impl From<std::ops::RangeInclusive<i64>> for RangeHelper {
+        fn from(value: std::ops::RangeInclusive<i64>) -> Self {
+            RangeHelper {
+                start: *value.start(),
+                end: *value.end(),
+                inclusion: nu_protocol::ast::RangeInclusion::Inclusive,
+            }
         }
     }
 
-    fn expectation(word: &str, indexes: (isize, isize)) -> Expectation {
+    impl From<std::ops::Range<i64>> for RangeHelper {
+        fn from(value: std::ops::Range<i64>) -> Self {
+            RangeHelper {
+                start: value.start,
+                end: value.end,
+                inclusion: nu_protocol::ast::RangeInclusion::RightExclusive,
+            }
+        }
+    }
+
+    impl From<RangeHelper> for IntRange {
+        fn from(value: RangeHelper) -> Self {
+            match IntRange::new(
+                Value::test_int(value.start),
+                Value::test_int(value.start + (if value.start <= value.end { 1 } else { -1 })),
+                Value::test_int(value.end),
+                value.inclusion,
+                Span::test_data(),
+            ) {
+                Ok(val) => val,
+                Err(e) => {
+                    panic!("{value:?}: {e:?}")
+                }
+            }
+        }
+    }
+
+    impl Expectation<'_> {
+        fn range(&self) -> IntRange {
+            self.range.into()
+        }
+    }
+
+    fn expectation(word: &str, range: impl Into<RangeHelper>) -> Expectation {
         Expectation {
-            options: indexes,
+            range: range.into(),
             expected: word,
         }
     }
@@ -261,30 +265,31 @@ mod tests {
         let word = Value::test_string("andres");
 
         let cases = vec![
-            expectation("a", (0, 0)),
-            expectation("an", (0, 1)),
-            expectation("and", (0, 2)),
-            expectation("andr", (0, 3)),
-            expectation("andre", (0, 4)),
-            expectation("andres", (0, 5)),
-            expectation("andres", (0, 6)),
-            expectation("a", (0, -6)),
-            expectation("an", (0, -5)),
-            expectation("and", (0, -4)),
-            expectation("andr", (0, -3)),
-            expectation("andre", (0, -2)),
-            expectation("andres", (0, -1)),
+            expectation("", 0..0),
+            expectation("a", 0..=0),
+            expectation("an", 0..=1),
+            expectation("and", 0..=2),
+            expectation("andr", 0..=3),
+            expectation("andre", 0..=4),
+            expectation("andres", 0..=5),
+            expectation("andres", 0..=6),
+            expectation("a", 0..=-6),
+            expectation("an", 0..=-5),
+            expectation("and", 0..=-4),
+            expectation("andr", 0..=-3),
+            expectation("andre", 0..=-2),
+            expectation("andres", 0..=-1),
             // str substring [ -4 , _ ]
             // str substring   -4 ,
-            expectation("dres", (-4, isize::MAX)),
-            expectation("", (0, -110)),
-            expectation("", (6, 0)),
-            expectation("", (6, -1)),
-            expectation("", (6, -2)),
-            expectation("", (6, -3)),
-            expectation("", (6, -4)),
-            expectation("", (6, -5)),
-            expectation("", (6, -6)),
+            expectation("dres", -4..=i64::MAX),
+            expectation("", 0..=-110),
+            expectation("", 6..=0),
+            expectation("", 6..=-1),
+            expectation("", 6..=-2),
+            expectation("", 6..=-3),
+            expectation("", 6..=-4),
+            expectation("", 6..=-5),
+            expectation("", 6..=-6),
         ];
 
         for expectation in &cases {
@@ -293,7 +298,7 @@ mod tests {
             let actual = action(
                 &word,
                 &Arguments {
-                    indexes: expectation.options(),
+                    range: expectation.range(),
                     cell_paths: None,
                     graphemes: false,
                 },
@@ -308,9 +313,10 @@ mod tests {
     fn use_utf8_bytes() {
         let word = Value::string(String::from("🇯🇵ほげ ふが ぴよ"), Span::test_data());
 
+        let range: RangeHelper = (4..=5).into();
         let options = Arguments {
             cell_paths: None,
-            indexes: Substring(4, 5),
+            range: range.into(),
             graphemes: false,
         };
 
diff --git a/crates/nu-command/tests/commands/bytes/at.rs b/crates/nu-command/tests/commands/bytes/at.rs
index 4a8d034b3f..c01beeb6f0 100644
--- a/crates/nu-command/tests/commands/bytes/at.rs
+++ b/crates/nu-command/tests/commands/bytes/at.rs
@@ -15,7 +15,12 @@ pub fn returns_error_for_relative_range_on_infinite_stream() {
 pub fn returns_bytes_for_fixed_range_on_infinite_stream_including_end() {
     let actual = nu!("nu --testbin iecho 3 | bytes at ..10 | decode");
     assert_eq!(
-        actual.out, "33333",
+        actual.out, "333333",
+        "Expected bytes from index 0 to 10, but got different output"
+    );
+    let actual = nu!("nu --testbin iecho 3 | bytes at ..10 | decode");
+    assert_eq!(
+        actual.out, "333333",
         "Expected bytes from index 0 to 10, but got different output"
     );
 }
@@ -24,7 +29,7 @@ pub fn returns_bytes_for_fixed_range_on_infinite_stream_including_end() {
 pub fn returns_bytes_for_fixed_range_on_infinite_stream_excluding_end() {
     let actual = nu!("nu --testbin iecho 3 | bytes at ..<9 | decode");
     assert_eq!(
-        actual.out, "3333",
+        actual.out, "33333",
         "Expected bytes from index 0 to 8, but got different output"
     );
 }
diff --git a/crates/nu-command/tests/commands/slice.rs b/crates/nu-command/tests/commands/slice.rs
index d7639ad8dc..d6a3e0b888 100644
--- a/crates/nu-command/tests/commands/slice.rs
+++ b/crates/nu-command/tests/commands/slice.rs
@@ -66,3 +66,17 @@ fn negative_indices() {
         assert_eq!(actual.out, "1");
     });
 }
+
+#[test]
+fn zero_to_zero_exclusive() {
+    let actual = nu!(r#"[0 1 2 3] | slice 0..<0 | to nuon"#);
+
+    assert_eq!(actual.out, "[]");
+}
+
+#[test]
+fn to_negative_one_inclusive() {
+    let actual = nu!(r#"[0 1 2 3] | slice 2..-1 | to nuon"#);
+
+    assert_eq!(actual.out, "[2, 3]");
+}
diff --git a/crates/nu-protocol/src/pipeline/byte_stream.rs b/crates/nu-protocol/src/pipeline/byte_stream.rs
index e06a651088..adefbdf9f0 100644
--- a/crates/nu-protocol/src/pipeline/byte_stream.rs
+++ b/crates/nu-protocol/src/pipeline/byte_stream.rs
@@ -295,8 +295,8 @@ impl ByteStream {
 
             match range.distance() {
                 Bound::Unbounded => stream,
-                Bound::Included(distance) => stream.and_then(|s| s.take(val_span, distance)),
-                Bound::Excluded(distance) => stream.and_then(|s| s.take(val_span, distance - 1)),
+                Bound::Included(distance) => stream.and_then(|s| s.take(val_span, distance + 1)),
+                Bound::Excluded(distance) => stream.and_then(|s| s.take(val_span, distance)),
             }
         }
     }
diff --git a/crates/nu-protocol/src/value/range.rs b/crates/nu-protocol/src/value/range.rs
index 268b24b623..9ce9c6fa54 100644
--- a/crates/nu-protocol/src/value/range.rs
+++ b/crates/nu-protocol/src/value/range.rs
@@ -5,10 +5,12 @@ use serde::{Deserialize, Serialize};
 use std::{cmp::Ordering, fmt::Display};
 
 mod int_range {
-    use crate::{ast::RangeInclusion, ShellError, Signals, Span, Value};
+    use crate::{ast::RangeInclusion, FromValue, ShellError, Signals, Span, Value};
     use serde::{Deserialize, Serialize};
     use std::{cmp::Ordering, fmt::Display, ops::Bound};
 
+    use super::Range;
+
     #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
     pub struct IntRange {
         pub(crate) start: i64,
@@ -83,10 +85,9 @@ mod int_range {
 
         // Resolves the absolute start position given the length of the input value
         pub fn absolute_start(&self, len: u64) -> u64 {
-            let max_index = len - 1;
             match self.start {
                 start if start < 0 => len.saturating_sub(start.unsigned_abs()),
-                start => max_index.min(start as u64),
+                start => len.min(start.unsigned_abs()),
             }
         }
 
@@ -95,8 +96,9 @@ mod int_range {
         pub fn distance(&self) -> Bound<u64> {
             match self.end {
                 Bound::Unbounded => Bound::Unbounded,
-                Bound::Included(end) if self.start > end => Bound::Included(0),
-                Bound::Excluded(end) if self.start > end => Bound::Excluded(0),
+                Bound::Included(end) | Bound::Excluded(end) if self.start > end => {
+                    Bound::Excluded(0)
+                }
                 Bound::Included(end) => Bound::Included((end - self.start) as u64),
                 Bound::Excluded(end) => Bound::Excluded((end - self.start) as u64),
             }
@@ -107,20 +109,32 @@ mod int_range {
         }
 
         pub fn absolute_end(&self, len: u64) -> Bound<u64> {
-            let max_index = len - 1;
             match self.end {
                 Bound::Unbounded => Bound::Unbounded,
-                Bound::Included(i) => Bound::Included(match i {
-                    i if i < 0 => len.saturating_sub(i.unsigned_abs()),
-                    i => max_index.min(i as u64),
-                }),
+                Bound::Included(i) => match i {
+                    i if i < 0 => Bound::Excluded(len.saturating_sub((i + 1).unsigned_abs())),
+                    i => Bound::Included((len - 1).min(i.unsigned_abs())),
+                },
                 Bound::Excluded(i) => Bound::Excluded(match i {
                     i if i < 0 => len.saturating_sub(i.unsigned_abs()),
-                    i => len.min(i as u64),
+                    i => len.min(i.unsigned_abs()),
                 }),
             }
         }
 
+        pub fn absolute_bounds(&self, len: usize) -> (usize, Bound<usize>) {
+            let start = self.absolute_start(len as u64) as usize;
+            let end = self.absolute_end(len as u64).map(|e| e as usize);
+            match end {
+                Bound::Excluded(end) | Bound::Included(end) if end < start => {
+                    (start, Bound::Excluded(start))
+                }
+                Bound::Excluded(end) => (start, Bound::Excluded(end)),
+                Bound::Included(end) => (start, Bound::Included(end)),
+                Bound::Unbounded => (start, Bound::Unbounded),
+            }
+        }
+
         pub fn step(&self) -> i64 {
             self.step
         }
@@ -246,6 +260,20 @@ mod int_range {
         }
     }
 
+    impl FromValue for IntRange {
+        fn from_value(v: Value) -> Result<Self, ShellError> {
+            let span = v.span();
+            let range = Range::from_value(v)?;
+            match range {
+                Range::IntRange(v) => Ok(v),
+                Range::FloatRange(_) => Err(ShellError::TypeMismatch {
+                    err_message: "expected an int range".into(),
+                    span,
+                }),
+            }
+        }
+    }
+
     pub struct Iter {
         current: Option<i64>,
         step: i64,
diff --git a/crates/nu-protocol/tests/pipeline/byte_stream.rs b/crates/nu-protocol/tests/pipeline/byte_stream.rs
index 3d06573461..7478d8184a 100644
--- a/crates/nu-protocol/tests/pipeline/byte_stream.rs
+++ b/crates/nu-protocol/tests/pipeline/byte_stream.rs
@@ -16,6 +16,23 @@ pub fn test_simple_positive_slice_exclusive() {
     assert_eq!(result, "Hello");
 }
 
+#[test]
+pub fn test_simple_positive_slice_exclusive_streaming() {
+    let data = b"Hello World".to_vec();
+    let stream = ByteStream::read_binary(data, Span::test_data(), Signals::empty());
+    let sliced = stream
+        .with_known_size(None)
+        .slice(
+            Span::test_data(),
+            Span::test_data(),
+            create_range(0, 5, RangeInclusion::RightExclusive),
+        )
+        .unwrap();
+    let result = sliced.into_bytes().unwrap();
+    let result = String::from_utf8(result).unwrap();
+    assert_eq!(result, "Hello");
+}
+
 #[test]
 pub fn test_negative_start_exclusive() {
     let data = b"Hello World".to_vec();

From 1349187e17b20e554bcc1a37ce6e10494b23c6bc Mon Sep 17 00:00:00 2001
From: Mudada <mael.nicolas77@gmail.com>
Date: Fri, 31 Jan 2025 01:27:55 +0100
Subject: [PATCH 0983/1072] Add --raw to find command (#14970)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
When using `find`, we insert ansi code.

This is great for visual but it make comparison a tedious task.

For exemple

```nu
> ([{a: 1 b: 1}] | find 1 | get 0 | get a) == 1
# false
```
The documentation recommand using the `ansi strip` command but you then
lose your typing converting it to a string.
```nu
> [{a: 1 b: 1}] | find 1 | get 0 | get a | ansi strip | describe
# string
```
And this makes me very sad 😢 .

The idea here is to have a simple option to keep the usage of `find`
without the ansi marking.
```nu
> ([{a: 1 b: 1}] | find --raw 1 | get 0 | get a) == 1
# true
```

Tbh I think we could also do a fix on the parser to really escape the
ansi makers but this sounded like way more work so I would like your
opinion on this before working on it.

Also note that this is my first time writting rust and trying to
contribute to nushell so if you see any weird shenanigans be sure to
tell me !
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
A new flag for find
# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->
For testing I updated all the previous `find` test to also run them with
this new flag just to be sure that we didn't lose any other
functionalities
# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->

---------

Co-authored-by: Tangui <mael.nicolas@clever-cloud.com>
---
 crates/nu-command/src/filters/find.rs    | 45 ++++++++++----
 crates/nu-command/tests/commands/find.rs | 79 +++++++++++++++++++++++-
 2 files changed, 112 insertions(+), 12 deletions(-)

diff --git a/crates/nu-command/src/filters/find.rs b/crates/nu-command/src/filters/find.rs
index 78a84274ab..0ce386b93e 100644
--- a/crates/nu-command/src/filters/find.rs
+++ b/crates/nu-command/src/filters/find.rs
@@ -52,6 +52,11 @@ impl Command for Find {
                 "column names to be searched (with rest parameter, not regex yet)",
                 Some('c'),
             )
+            .switch(
+                "no-highlight",
+                "no-highlight mode: find without marking with ascii code",
+                Some('n'),
+            )
             .switch("invert", "invert the match", Some('v'))
             .rest("rest", SyntaxShape::Any, "Terms to search.")
             .category(Category::Filters)
@@ -161,8 +166,15 @@ impl Command for Find {
             },
             Example {
                 description: "Remove ANSI sequences from result",
-                example: "[[foo bar]; [abc 123] [def 456]] | find 123 | get bar | ansi strip",
-                result: None, // This is None because ansi strip is not available in tests
+                example:"[[foo bar]; [abc 123] [def 456]] | find --no-highlight 123",
+                result: Some(Value::list(
+                    vec![Value::test_record(record! {
+                        "foo" => Value::test_string("abc"),
+                        "bar" => Value::test_int(123)
+                    }
+                    )],
+                    Span::test_data(),
+                ))
             },
             Example {
                 description: "Find and highlight text in specific columns",
@@ -350,6 +362,7 @@ fn find_with_rest_and_highlight(
     let span = call.head;
     let config = stack.get_config(engine_state);
     let filter_config = config.clone();
+    let no_highlight = call.has_flag(engine_state, stack, "no-highlight")?;
     let invert = call.has_flag(engine_state, stack, "invert")?;
     let terms = call.rest::<Value>(engine_state, stack, 0)?;
     let lower_terms = terms
@@ -377,6 +390,9 @@ fn find_with_rest_and_highlight(
             .map(
                 move |mut x| {
                     let span = x.span();
+                    if no_highlight {
+                        return x;
+                    };
                     match &mut x {
                         Value::Record { val, .. } => highlight_terms_in_record_with_search_columns(
                             &cols_to_search_in_map,
@@ -417,6 +433,9 @@ fn find_with_rest_and_highlight(
             let stream = stream.modify(|iter| {
                 iter.map(move |mut x| {
                     let span = x.span();
+                    if no_highlight {
+                        return x;
+                    };
                     match &mut x {
                         Value::Record { val, .. } => highlight_terms_in_record_with_search_columns(
                             &cols_to_search_in_map,
@@ -458,15 +477,19 @@ fn find_with_rest_and_highlight(
                     let lower_val = line.to_lowercase();
                     for term in &terms {
                         if lower_val.contains(term) {
-                            output.push(Value::string(
-                                highlight_search_string(
-                                    &line,
-                                    term,
-                                    &string_style,
-                                    &highlight_style,
-                                )?,
-                                span,
-                            ))
+                            if no_highlight {
+                                output.push(Value::string(&line, span))
+                            } else {
+                                output.push(Value::string(
+                                    highlight_search_string(
+                                        &line,
+                                        term,
+                                        &string_style,
+                                        &highlight_style,
+                                    )?,
+                                    span,
+                                ))
+                            }
                         }
                     }
                 }
diff --git a/crates/nu-command/tests/commands/find.rs b/crates/nu-command/tests/commands/find.rs
index bc8f166eb9..37ba13ac3e 100644
--- a/crates/nu-command/tests/commands/find.rs
+++ b/crates/nu-command/tests/commands/find.rs
@@ -3,78 +3,103 @@ use nu_test_support::nu;
 #[test]
 fn find_with_list_search_with_string() {
     let actual = nu!("[moe larry curly] | find moe | get 0");
+    let actual_no_highlight = nu!("[moe larry curly] | find --no-highlight moe | get 0");
 
     assert_eq!(
         actual.out,
         "\u{1b}[37m\u{1b}[0m\u{1b}[41;37mmoe\u{1b}[0m\u{1b}[37m\u{1b}[0m"
     );
+    assert_eq!(actual_no_highlight.out, "moe");
 }
 
 #[test]
 fn find_with_list_search_with_char() {
     let actual = nu!("[moe larry curly] | find l | to json -r");
+    let actual_no_highlight = nu!("[moe larry curly] | find --no-highlight l | to json -r");
 
     assert_eq!(actual.out, "[\"\\u001b[37m\\u001b[0m\\u001b[41;37ml\\u001b[0m\\u001b[37marry\\u001b[0m\",\"\\u001b[37mcur\\u001b[0m\\u001b[41;37ml\\u001b[0m\\u001b[37my\\u001b[0m\"]");
+    assert_eq!(actual_no_highlight.out, "[\"larry\",\"curly\"]");
 }
 
 #[test]
 fn find_with_bytestream_search_with_char() {
     let actual =
         nu!("\"ABC\" | save foo.txt; let res = open foo.txt | find abc; rm foo.txt; $res | get 0");
+    let actual_no_highlight =
+        nu!("\"ABC\" | save foo.txt; let res = open foo.txt | find --no-highlight abc; rm foo.txt; $res | get 0");
+
     assert_eq!(
         actual.out,
         "\u{1b}[37m\u{1b}[0m\u{1b}[41;37mABC\u{1b}[0m\u{1b}[37m\u{1b}[0m"
-    )
+    );
+    assert_eq!(actual_no_highlight.out, "ABC");
 }
 
 #[test]
 fn find_with_list_search_with_number() {
     let actual = nu!("[1 2 3 4 5] | find 3 | get 0");
+    let actual_no_highlight = nu!("[1 2 3 4 5] | find --no-highlight 3 | get 0");
 
     assert_eq!(actual.out, "3");
+    assert_eq!(actual_no_highlight.out, "3");
 }
 
 #[test]
 fn find_with_string_search_with_string() {
     let actual = nu!("echo Cargo.toml | find toml");
+    let actual_no_highlight = nu!("echo Cargo.toml | find --no-highlight toml");
 
     assert_eq!(
         actual.out,
         "\u{1b}[37mCargo.\u{1b}[0m\u{1b}[41;37mtoml\u{1b}[0m\u{1b}[37m\u{1b}[0m"
     );
+    assert_eq!(actual_no_highlight.out, "Cargo.toml");
 }
 
 #[test]
 fn find_with_string_search_with_string_not_found() {
     let actual = nu!("[moe larry curly] | find shemp | is-empty");
+    let actual_no_highlight = nu!("[moe larry curly] | find --no-highlight shemp | is-empty");
 
     assert_eq!(actual.out, "true");
+    assert_eq!(actual_no_highlight.out, "true");
 }
 
 #[test]
 fn find_with_filepath_search_with_string() {
     let actual =
         nu!(r#"["amigos.txt","arepas.clu","los.txt","tres.txt"] | find arep | to json -r"#);
+    let actual_no_highlight = nu!(
+        r#"["amigos.txt","arepas.clu","los.txt","tres.txt"] | find --no-highlight arep | to json -r"#
+    );
 
     assert_eq!(
         actual.out,
         "[\"\\u001b[37m\\u001b[0m\\u001b[41;37marep\\u001b[0m\\u001b[37mas.clu\\u001b[0m\"]"
     );
+    assert_eq!(actual_no_highlight.out, "[\"arepas.clu\"]");
 }
 
 #[test]
 fn find_with_filepath_search_with_multiple_patterns() {
     let actual =
         nu!(r#"["amigos.txt","arepas.clu","los.txt","tres.txt"] | find arep ami | to json -r"#);
+    let actual_no_highlight = nu!(
+        r#"["amigos.txt","arepas.clu","los.txt","tres.txt"] | find --no-highlight arep ami | to json -r"#
+    );
 
     assert_eq!(actual.out, "[\"\\u001b[37m\\u001b[0m\\u001b[41;37mami\\u001b[0m\\u001b[37mgos.txt\\u001b[0m\",\"\\u001b[37m\\u001b[0m\\u001b[41;37marep\\u001b[0m\\u001b[37mas.clu\\u001b[0m\"]");
+    assert_eq!(actual_no_highlight.out, "[\"amigos.txt\",\"arepas.clu\"]");
 }
 
 #[test]
 fn find_takes_into_account_linebreaks_in_string() {
     let actual = nu!(r#""atest\nanothertest\nnohit\n" | find a | length"#);
+    let actual_no_highlight =
+        nu!(r#""atest\nanothertest\nnohit\n" | find --no-highlight a | length"#);
 
     assert_eq!(actual.out, "2");
+    assert_eq!(actual_no_highlight.out, "2");
 }
 
 #[test]
@@ -82,8 +107,12 @@ fn find_with_regex_in_table_keeps_row_if_one_column_matches() {
     let actual = nu!(
         "[[name nickname]; [Maurice moe] [Laurence larry]] | find --regex ce | get name | to json -r"
     );
+    let actual_no_highlight = nu!(
+        "[[name nickname]; [Maurice moe] [Laurence larry]] | find --no-highlight --regex ce | get name | to json -r"
+    );
 
     assert_eq!(actual.out, r#"["Maurice","Laurence"]"#);
+    assert_eq!(actual_no_highlight.out, r#"["Maurice","Laurence"]"#);
 }
 
 #[test]
@@ -91,8 +120,12 @@ fn inverted_find_with_regex_in_table_keeps_row_if_none_of_the_columns_matches()
     let actual = nu!(
         "[[name nickname]; [Maurice moe] [Laurence larry]] | find --regex moe --invert | get name | to json -r"
     );
+    let actual_no_highlight = nu!(
+        "[[name nickname]; [Maurice moe] [Laurence larry]] | find --no-highlight --regex moe --invert | get name | to json -r"
+    );
 
     assert_eq!(actual.out, r#"["Laurence"]"#);
+    assert_eq!(actual_no_highlight.out, r#"["Laurence"]"#);
 }
 
 #[test]
@@ -100,9 +133,14 @@ fn find_in_table_only_keep_rows_with_matches_on_selected_columns() {
     let actual = nu!(
         "[[name nickname]; [Maurice moe] [Laurence larry]] | find r --columns [nickname] | get name | to json -r"
     );
+    let actual_no_highlight = nu!(
+        "[[name nickname]; [Maurice moe] [Laurence larry]] | find r --no-highlight --columns [nickname] | get name | to json -r"
+    );
 
     assert!(actual.out.contains("Laurence"));
     assert!(!actual.out.contains("Maurice"));
+    assert!(actual_no_highlight.out.contains("Laurence"));
+    assert!(!actual_no_highlight.out.contains("Maurice"));
 }
 
 #[test]
@@ -110,23 +148,34 @@ fn inverted_find_in_table_keeps_row_if_none_of_the_selected_columns_matches() {
     let actual = nu!(
         "[[name nickname]; [Maurice moe] [Laurence larry]] | find r --columns [nickname] --invert | get name | to json -r"
     );
+    let actual_no_highlight = nu!(
+        "[[name nickname]; [Maurice moe] [Laurence larry]] | find r --no-highlight --columns [nickname] --invert | get name | to json -r"
+    );
 
     assert_eq!(actual.out, r#"["Maurice"]"#);
+    assert_eq!(actual_no_highlight.out, r#"["Maurice"]"#);
 }
 
 #[test]
 fn find_in_table_keeps_row_with_single_matched_and_keeps_other_columns() {
     let actual = nu!("[[name nickname Age]; [Maurice moe 23] [Laurence larry 67] [William will 18]] | find Maurice");
+    let actual_no_highlight = nu!("[[name nickname Age]; [Maurice moe 23] [Laurence larry 67] [William will 18]] | find --no-highlight Maurice");
 
     println!("{:?}", actual.out);
     assert!(actual.out.contains("moe"));
     assert!(actual.out.contains("Maurice"));
     assert!(actual.out.contains("23"));
+
+    println!("{:?}", actual_no_highlight.out);
+    assert!(actual_no_highlight.out.contains("moe"));
+    assert!(actual_no_highlight.out.contains("Maurice"));
+    assert!(actual_no_highlight.out.contains("23"));
 }
 
 #[test]
 fn find_in_table_keeps_row_with_multiple_matched_and_keeps_other_columns() {
     let actual = nu!("[[name nickname Age]; [Maurice moe 23] [Laurence larry 67] [William will 18] [William bill 60]] | find moe William");
+    let actual_no_highlight = nu!("[[name nickname Age]; [Maurice moe 23] [Laurence larry 67] [William will 18] [William bill 60]] | find --no-highlight moe William");
 
     println!("{:?}", actual.out);
     assert!(actual.out.contains("moe"));
@@ -137,64 +186,92 @@ fn find_in_table_keeps_row_with_multiple_matched_and_keeps_other_columns() {
     assert!(actual.out.contains("18"));
     assert!(actual.out.contains("bill"));
     assert!(actual.out.contains("60"));
+
+    println!("{:?}", actual_no_highlight.out);
+    assert!(actual_no_highlight.out.contains("moe"));
+    assert!(actual_no_highlight.out.contains("Maurice"));
+    assert!(actual_no_highlight.out.contains("23"));
+    assert!(actual_no_highlight.out.contains("William"));
+    assert!(actual_no_highlight.out.contains("will"));
+    assert!(actual_no_highlight.out.contains("18"));
+    assert!(actual_no_highlight.out.contains("bill"));
+    assert!(actual_no_highlight.out.contains("60"));
 }
 
 #[test]
 fn find_with_string_search_with_special_char_1() {
     let actual = nu!("[[d]; [a?b] [a*b] [a{1}b] ] | find '?' | to json -r");
+    let actual_no_highlight =
+        nu!("[[d]; [a?b] [a*b] [a{1}b] ] | find --no-highlight '?' | to json -r");
 
     assert_eq!(
         actual.out,
         "[{\"d\":\"\\u001b[37ma\\u001b[0m\\u001b[41;37m?\\u001b[0m\\u001b[37mb\\u001b[0m\"}]"
     );
+    assert_eq!(actual_no_highlight.out, "[{\"d\":\"a?b\"}]");
 }
 
 #[test]
 fn find_with_string_search_with_special_char_2() {
     let actual = nu!("[[d]; [a?b] [a*b] [a{1}b]] | find '*' | to json -r");
+    let actual_no_highlight =
+        nu!("[[d]; [a?b] [a*b] [a{1}b]] | find --no-highlight '*' | to json -r");
 
     assert_eq!(
         actual.out,
         "[{\"d\":\"\\u001b[37ma\\u001b[0m\\u001b[41;37m*\\u001b[0m\\u001b[37mb\\u001b[0m\"}]"
     );
+    assert_eq!(actual_no_highlight.out, "[{\"d\":\"a*b\"}]");
 }
 
 #[test]
 fn find_with_string_search_with_special_char_3() {
     let actual = nu!("[[d]; [a?b] [a*b] [a{1}b] ] | find '{1}' | to json -r");
+    let actual_no_highlight =
+        nu!("[[d]; [a?b] [a*b] [a{1}b] ] | find --no-highlight '{1}' | to json -r");
 
     assert_eq!(
         actual.out,
         "[{\"d\":\"\\u001b[37ma\\u001b[0m\\u001b[41;37m{1}\\u001b[0m\\u001b[37mb\\u001b[0m\"}]"
     );
+    assert_eq!(actual_no_highlight.out, "[{\"d\":\"a{1}b\"}]");
 }
 
 #[test]
 fn find_with_string_search_with_special_char_4() {
     let actual = nu!("[{d: a?b} {d: a*b} {d: a{1}b} {d: a[]b}] | find '[' | to json -r");
+    let actual_no_highlight =
+        nu!("[{d: a?b} {d: a*b} {d: a{1}b} {d: a[]b}] | find --no-highlight '[' | to json -r");
 
     assert_eq!(
         actual.out,
         "[{\"d\":\"\\u001b[37ma\\u001b[0m\\u001b[41;37m[\\u001b[0m\\u001b[37m]b\\u001b[0m\"}]"
     );
+    assert_eq!(actual_no_highlight.out, "[{\"d\":\"a[]b\"}]");
 }
 
 #[test]
 fn find_with_string_search_with_special_char_5() {
     let actual = nu!("[{d: a?b} {d: a*b} {d: a{1}b} {d: a[]b}] | find ']' | to json -r");
+    let actual_no_highlight =
+        nu!("[{d: a?b} {d: a*b} {d: a{1}b} {d: a[]b}] | find --no-highlight ']' | to json -r");
 
     assert_eq!(
         actual.out,
         "[{\"d\":\"\\u001b[37ma[\\u001b[0m\\u001b[41;37m]\\u001b[0m\\u001b[37mb\\u001b[0m\"}]"
     );
+    assert_eq!(actual_no_highlight.out, "[{\"d\":\"a[]b\"}]");
 }
 
 #[test]
 fn find_with_string_search_with_special_char_6() {
     let actual = nu!("[{d: a?b} {d: a*b} {d: a{1}b} {d: a[]b}] | find '[]' | to json -r");
+    let actual_no_highlight =
+        nu!("[{d: a?b} {d: a*b} {d: a{1}b} {d: a[]b}] | find --no-highlight '[]' | to json -r");
 
     assert_eq!(
         actual.out,
         "[{\"d\":\"\\u001b[37ma\\u001b[0m\\u001b[41;37m[]\\u001b[0m\\u001b[37mb\\u001b[0m\"}]"
     );
+    assert_eq!(actual_no_highlight.out, "[{\"d\":\"a[]b\"}]");
 }

From 4540f3829ecb1f42ceedbce2ac52a842e1744467 Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Fri, 31 Jan 2025 20:35:11 +0800
Subject: [PATCH 0984/1072] Bump lsp-textdocument from 0.4.0 to 0.4.1 (#14974)

# Description

This upstream upgrade fixes a crashing bug.

# User-Facing Changes
# Tests + Formatting
# After Submitting
---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d2f6e4aa43..6858f0fa25 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3084,9 +3084,9 @@ dependencies = [
 
 [[package]]
 name = "lsp-textdocument"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8dc223af95101fe950a871d4d567b6f98a1ecfcee5861f4b57644581aaa980d"
+checksum = "9a17dcde15cae78fb2e54166da22cd6c53f48033a0391cc392b22f2437805792"
 dependencies = [
  "lsp-types",
  "serde_json",
diff --git a/Cargo.toml b/Cargo.toml
index 06781d7ad4..a8b456d3c9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -104,7 +104,7 @@ lru = "0.12"
 lscolors = { version = "0.17", default-features = false }
 lsp-server = "0.7.8"
 lsp-types = { version = "0.97.0", features = ["proposed"] }
-lsp-textdocument = "0.4.0"
+lsp-textdocument = "0.4.1"
 mach2 = "0.4"
 md5 = { version = "0.10", package = "md-5" }
 miette = "7.3"

From 63fa6a6df7ac08b8005d15b881d73f8d0defaf21 Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Sat, 1 Feb 2025 21:15:58 +0800
Subject: [PATCH 0985/1072] fix(completion): dotnu_completion for nested
 folders/scripts (#14978)

# Description

Fixes #14213
and some of #14956

<img width="314" alt="image"
src="https://github.com/user-attachments/assets/e79d0882-da90-4592-8af5-7ab0c1d2f96a"
/>

# User-Facing Changes

# Tests + Formatting

# After Submitting
---
 crates/nu-cli/src/completions/base.rs         |  1 +
 .../src/completions/completion_common.rs      |  3 -
 .../src/completions/dotnu_completions.rs      | 97 ++++++++-----------
 crates/nu-cli/tests/completions/mod.rs        | 21 ++++
 crates/nu-lsp/src/lib.rs                      |  2 +
 .../dir_module/sub_module/sub.nu              |  0
 6 files changed, 66 insertions(+), 58 deletions(-)
 create mode 100644 tests/fixtures/dotnu_completions/dir_module/sub_module/sub.nu

diff --git a/crates/nu-cli/src/completions/base.rs b/crates/nu-cli/src/completions/base.rs
index 68f10a7387..359c2208b0 100644
--- a/crates/nu-cli/src/completions/base.rs
+++ b/crates/nu-cli/src/completions/base.rs
@@ -31,6 +31,7 @@ pub struct SemanticSuggestion {
 pub enum SuggestionKind {
     Command(nu_protocol::engine::CommandType),
     Type(nu_protocol::Type),
+    Module,
 }
 
 impl From<Suggestion> for SemanticSuggestion {
diff --git a/crates/nu-cli/src/completions/completion_common.rs b/crates/nu-cli/src/completions/completion_common.rs
index 6212196627..e45ff9cf97 100644
--- a/crates/nu-cli/src/completions/completion_common.rs
+++ b/crates/nu-cli/src/completions/completion_common.rs
@@ -157,7 +157,6 @@ pub struct FileSuggestion {
     pub span: nu_protocol::Span,
     pub path: String,
     pub style: Option<Style>,
-    pub cwd: PathBuf,
 }
 
 /// # Parameters
@@ -261,7 +260,6 @@ pub fn complete_item(
         if should_collapse_dots {
             p = collapse_ndots(p);
         }
-        let cwd = p.cwd.clone();
         let path = original_cwd.apply(p, path_separator);
         let style = ls_colors.as_ref().map(|lsc| {
             lsc.style_for_path_with_metadata(
@@ -277,7 +275,6 @@ pub fn complete_item(
             span,
             path: escape_path(path, want_directory),
             style,
-            cwd,
         }
     })
     .collect()
diff --git a/crates/nu-cli/src/completions/dotnu_completions.rs b/crates/nu-cli/src/completions/dotnu_completions.rs
index 51fcd525fb..c626e8b1d2 100644
--- a/crates/nu-cli/src/completions/dotnu_completions.rs
+++ b/crates/nu-cli/src/completions/dotnu_completions.rs
@@ -4,9 +4,9 @@ use nu_protocol::{
     Span,
 };
 use reedline::Suggestion;
-use std::path::{is_separator, Path, MAIN_SEPARATOR as SEP, MAIN_SEPARATOR_STR};
+use std::path::{is_separator, PathBuf, MAIN_SEPARATOR as SEP, MAIN_SEPARATOR_STR};
 
-use super::SemanticSuggestion;
+use super::{SemanticSuggestion, SuggestionKind};
 
 #[derive(Clone, Default)]
 pub struct DotNuCompletion {}
@@ -29,19 +29,16 @@ impl Completer for DotNuCompletion {
         options: &CompletionOptions,
     ) -> Vec<SemanticSuggestion> {
         let prefix_str = String::from_utf8_lossy(prefix).replace('`', "");
-        let mut search_dirs: Vec<String> = vec![];
+        let mut search_dirs: Vec<PathBuf> = vec![];
 
         // If prefix_str is only a word we want to search in the current dir
         let (base, partial) = prefix_str
             .rsplit_once(is_separator)
             .unwrap_or((".", &prefix_str));
         let base_dir = base.replace(is_separator, MAIN_SEPARATOR_STR);
-        let mut partial = partial.to_string();
-        // On windows, this standardizes paths to use \
-        let mut is_current_folder = false;
 
         // Fetch the lib dirs
-        let lib_dirs: Vec<String> = working_set
+        let lib_dirs: Vec<PathBuf> = working_set
             .find_variable(b"$NU_LIB_DIRS")
             .and_then(|vid| working_set.get_variable(vid).const_val.as_ref())
             .or(working_set.get_env_var("NU_LIB_DIRS"))
@@ -55,36 +52,27 @@ impl Completer for DotNuCompletion {
                                 .expect("internal error: failed to convert lib path")
                         })
                     })
-                    .map(|it| {
-                        it.into_os_string()
-                            .into_string()
-                            .expect("internal error: failed to convert OS path")
-                    })
                     .collect()
             })
             .unwrap_or_default();
 
         // Check if the base_dir is a folder
         // rsplit_once removes the separator
+        let cwd = working_set.permanent_state.cwd(None);
         if base_dir != "." {
-            // Add the base dir into the directories to be searched
-            search_dirs.push(base_dir.clone());
-
-            // Reset the partial adding the basic dir back
-            // in order to make the span replace work properly
-            let mut base_dir_partial = base_dir;
-            base_dir_partial.push_str(&partial);
-
-            partial = base_dir_partial;
+            // Search in base_dir as well as lib_dirs
+            if let Ok(mut cwd) = cwd {
+                cwd.push(&base_dir);
+                search_dirs.push(cwd.into_std_path_buf());
+            }
+            search_dirs.extend(lib_dirs.into_iter().map(|mut dir| {
+                dir.push(&base_dir);
+                dir
+            }));
         } else {
-            // Fetch the current folder
-            #[allow(deprecated)]
-            let current_folder = working_set.permanent_state.current_work_dir();
-            is_current_folder = true;
-
-            // Add the current folder and the lib dirs into the
-            // directories to be searched
-            search_dirs.push(current_folder);
+            if let Ok(cwd) = cwd {
+                search_dirs.push(cwd.into_std_path_buf());
+            }
             search_dirs.extend(lib_dirs);
         }
 
@@ -93,40 +81,39 @@ impl Completer for DotNuCompletion {
 
         let completions = file_path_completion(
             span,
-            &partial,
-            &search_dirs.iter().map(|d| d.as_str()).collect::<Vec<_>>(),
+            partial,
+            &search_dirs
+                .iter()
+                .map(|d| d.to_str().unwrap_or_default())
+                .collect::<Vec<_>>(),
             options,
             working_set.permanent_state,
             stack,
         );
         completions
             .into_iter()
-            .filter(move |it| {
-                // Different base dir, so we list the .nu files or folders
-                if !is_current_folder {
-                    it.path.ends_with(".nu") || it.path.ends_with(SEP)
+            // Different base dir, so we list the .nu files or folders
+            .filter(|it| it.path.ends_with(".nu") || it.path.ends_with(SEP))
+            .map(|x| {
+                let append_whitespace = x.path.ends_with(".nu");
+                // Re-calculate the span to replace
+                let span_offset = if base_dir == "." {
+                    0
                 } else {
-                    // Lib dirs, so we filter only the .nu files or directory modules
-                    if it.path.ends_with(SEP) {
-                        Path::new(&it.cwd).join(&it.path).join("mod.nu").exists()
-                    } else {
-                        it.path.ends_with(".nu")
-                    }
-                }
-            })
-            .map(move |x| SemanticSuggestion {
-                suggestion: Suggestion {
-                    value: x.path,
-                    style: x.style,
-                    span: reedline::Span {
-                        start: x.span.start - offset,
-                        end: x.span.end - offset,
+                    base_dir.len() + 1
+                } + prefix.iter().take_while(|c| **c == b'`').count();
+                let end = x.span.end - offset;
+                let start = std::cmp::min(end, x.span.start - offset + span_offset);
+                SemanticSuggestion {
+                    suggestion: Suggestion {
+                        value: x.path,
+                        style: x.style,
+                        span: reedline::Span { start, end },
+                        append_whitespace,
+                        ..Suggestion::default()
                     },
-                    append_whitespace: true,
-                    ..Suggestion::default()
-                },
-                // TODO????
-                kind: None,
+                    kind: Some(SuggestionKind::Module),
+                }
             })
             .collect::<Vec<_>>()
     }
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index fa868a1d11..d878d312d2 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -273,6 +273,15 @@ fn dotnu_completions() {
     // Instantiate a new completer
     let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
 
+    // Test nested nu script
+    #[cfg(windows)]
+    let completion_str = "use .\\dir_module\\sub_module\\".to_string();
+    #[cfg(not(windows))]
+    let completion_str = "use ./dir_module/sub_module/".to_string();
+    let suggestions = completer.complete(&completion_str, completion_str.len());
+
+    match_suggestions(&vec!["sub.nu".into()], &suggestions);
+
     let expected = vec![
         "asdf.nu".into(),
         "bar.nu".into(),
@@ -283,6 +292,18 @@ fn dotnu_completions() {
         #[cfg(not(windows))]
         "dir_module/".into(),
         "foo.nu".into(),
+        #[cfg(windows)]
+        "lib-dir1\\".into(),
+        #[cfg(not(windows))]
+        "lib-dir1/".into(),
+        #[cfg(windows)]
+        "lib-dir2\\".into(),
+        #[cfg(not(windows))]
+        "lib-dir2/".into(),
+        #[cfg(windows)]
+        "lib-dir3\\".into(),
+        #[cfg(not(windows))]
+        "lib-dir3/".into(),
         "spam.nu".into(),
         "xyzzy.nu".into(),
     ];
diff --git a/crates/nu-lsp/src/lib.rs b/crates/nu-lsp/src/lib.rs
index f053cfb9ac..5ba35e75ce 100644
--- a/crates/nu-lsp/src/lib.rs
+++ b/crates/nu-lsp/src/lib.rs
@@ -668,6 +668,7 @@ impl LanguageServer {
                             .map(|kind| match kind {
                                 SuggestionKind::Type(t) => t.to_string(),
                                 SuggestionKind::Command(cmd) => cmd.to_string(),
+                                SuggestionKind::Module => "".to_string(),
                             })
                             .map(|s| CompletionItemLabelDetails {
                                 detail: None,
@@ -715,6 +716,7 @@ impl LanguageServer {
                 nu_protocol::engine::CommandType::Builtin => Some(CompletionItemKind::FUNCTION),
                 _ => None,
             },
+            SuggestionKind::Module => Some(CompletionItemKind::MODULE),
         })
     }
 }
diff --git a/tests/fixtures/dotnu_completions/dir_module/sub_module/sub.nu b/tests/fixtures/dotnu_completions/dir_module/sub_module/sub.nu
new file mode 100644
index 0000000000..e69de29bb2

From 5291f978c28e05c165f2af6e8331ed4c24732e8b Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Sun, 2 Feb 2025 21:54:09 +0800
Subject: [PATCH 0986/1072] fix(completion): dotnu_completion dir with space,
 expand tilde (#14983)

# Description

This PR closes #14956, only one known issue on that list remains.

# User-Facing Changes
# Tests + Formatting
new cases added
# After Submitting
---
 .../src/completions/dotnu_completions.rs      | 48 ++++++++++++-------
 crates/nu-cli/tests/completions/mod.rs        | 24 ++++++++--
 .../{sub_module => sub module}/sub.nu         |  0
 3 files changed, 52 insertions(+), 20 deletions(-)
 rename tests/fixtures/dotnu_completions/dir_module/{sub_module => sub module}/sub.nu (100%)

diff --git a/crates/nu-cli/src/completions/dotnu_completions.rs b/crates/nu-cli/src/completions/dotnu_completions.rs
index c626e8b1d2..f06b85f5ed 100644
--- a/crates/nu-cli/src/completions/dotnu_completions.rs
+++ b/crates/nu-cli/src/completions/dotnu_completions.rs
@@ -1,4 +1,5 @@
 use crate::completions::{file_path_completion, Completer, CompletionOptions};
+use nu_path::expand_tilde;
 use nu_protocol::{
     engine::{Stack, StateWorkingSet},
     Span,
@@ -28,7 +29,10 @@ impl Completer for DotNuCompletion {
         _pos: usize,
         options: &CompletionOptions,
     ) -> Vec<SemanticSuggestion> {
-        let prefix_str = String::from_utf8_lossy(prefix).replace('`', "");
+        let prefix_str = String::from_utf8_lossy(prefix);
+        let start_with_backquote = prefix_str.starts_with('`');
+        let end_with_backquote = prefix_str.ends_with('`');
+        let prefix_str = prefix_str.replace('`', "");
         let mut search_dirs: Vec<PathBuf> = vec![];
 
         // If prefix_str is only a word we want to search in the current dir
@@ -46,12 +50,8 @@ impl Completer for DotNuCompletion {
                 lib_dirs
                     .as_list()
                     .into_iter()
-                    .flat_map(|it| {
-                        it.iter().map(|x| {
-                            x.to_path()
-                                .expect("internal error: failed to convert lib path")
-                        })
-                    })
+                    .flat_map(|it| it.iter().filter_map(|x| x.to_path().ok()))
+                    .map(expand_tilde)
                     .collect()
             })
             .unwrap_or_default();
@@ -78,13 +78,12 @@ impl Completer for DotNuCompletion {
 
         // Fetch the files filtering the ones that ends with .nu
         // and transform them into suggestions
-
         let completions = file_path_completion(
             span,
             partial,
             &search_dirs
                 .iter()
-                .map(|d| d.to_str().unwrap_or_default())
+                .filter_map(|d| d.to_str())
                 .collect::<Vec<_>>(),
             options,
             working_set.permanent_state,
@@ -93,20 +92,35 @@ impl Completer for DotNuCompletion {
         completions
             .into_iter()
             // Different base dir, so we list the .nu files or folders
-            .filter(|it| it.path.ends_with(".nu") || it.path.ends_with(SEP))
+            .filter(|it| {
+                // for paths with spaces in them
+                let path = it.path.trim_end_matches('`');
+                path.ends_with(".nu") || path.ends_with(SEP)
+            })
             .map(|x| {
-                let append_whitespace = x.path.ends_with(".nu");
+                let append_whitespace =
+                    x.path.ends_with(".nu") && (!start_with_backquote || end_with_backquote);
                 // Re-calculate the span to replace
-                let span_offset = if base_dir == "." {
-                    0
-                } else {
-                    base_dir.len() + 1
-                } + prefix.iter().take_while(|c| **c == b'`').count();
+                let mut span_offset = 0;
+                let mut value = x.path.to_string();
+                // Complete only the last path component
+                if base_dir != "." {
+                    span_offset = base_dir.len() + 1
+                }
+                // Retain only one '`'
+                if start_with_backquote {
+                    value = value.trim_start_matches('`').to_string();
+                    span_offset += 1;
+                }
+                // Add the backquote back
+                if end_with_backquote && !value.ends_with('`') {
+                    value.push('`');
+                }
                 let end = x.span.end - offset;
                 let start = std::cmp::min(end, x.span.start - offset + span_offset);
                 SemanticSuggestion {
                     suggestion: Suggestion {
-                        value: x.path,
+                        value,
                         style: x.style,
                         span: reedline::Span { start, end },
                         append_whitespace,
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index d878d312d2..ab9152172e 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -275,12 +275,30 @@ fn dotnu_completions() {
 
     // Test nested nu script
     #[cfg(windows)]
-    let completion_str = "use .\\dir_module\\sub_module\\".to_string();
+    let completion_str = "use `.\\dir_module\\".to_string();
     #[cfg(not(windows))]
-    let completion_str = "use ./dir_module/sub_module/".to_string();
+    let completion_str = "use `./dir_module/".to_string();
     let suggestions = completer.complete(&completion_str, completion_str.len());
 
-    match_suggestions(&vec!["sub.nu".into()], &suggestions);
+    match_suggestions(
+        &vec![
+            "mod.nu".into(),
+            #[cfg(windows)]
+            "sub module\\`".into(),
+            #[cfg(not(windows))]
+            "sub module/`".into(),
+        ],
+        &suggestions,
+    );
+
+    // Test nested nu script, with ending '`'
+    #[cfg(windows)]
+    let completion_str = "use `.\\dir_module\\sub module\\`".to_string();
+    #[cfg(not(windows))]
+    let completion_str = "use `./dir_module/sub module/`".to_string();
+    let suggestions = completer.complete(&completion_str, completion_str.len());
+
+    match_suggestions(&vec!["sub.nu`".into()], &suggestions);
 
     let expected = vec![
         "asdf.nu".into(),
diff --git a/tests/fixtures/dotnu_completions/dir_module/sub_module/sub.nu b/tests/fixtures/dotnu_completions/dir_module/sub module/sub.nu
similarity index 100%
rename from tests/fixtures/dotnu_completions/dir_module/sub_module/sub.nu
rename to tests/fixtures/dotnu_completions/dir_module/sub module/sub.nu

From 339c5b7c83560da4b631997f98b3075b9f048456 Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Sun, 2 Feb 2025 21:56:54 +0800
Subject: [PATCH 0987/1072] fix: clippy warning of rust 1.8.4 (#14984)

# Description

I'm on rust toolchain 1.8.4, and I can see clippy warnings that can't be
caught by the ci workflow, primarily related to lifetime params.

I think it doesn't hurt to fix those in advance.

# User-Facing Changes

# Tests + Formatting

# After Submitting
---
 crates/nu-color-config/src/style_computer.rs  |  2 +-
 crates/nu-engine/src/scope.rs                 |  4 ++--
 crates/nu-glob/src/lib.rs                     |  8 +++-----
 crates/nu-json/src/de.rs                      |  8 ++++----
 crates/nu-json/src/ser.rs                     | 20 +++++++++----------
 crates/nu-json/src/value.rs                   |  2 +-
 crates/nu-path/src/tilde.rs                   |  4 ++--
 crates/nu-protocol/src/engine/engine_state.rs |  8 ++++----
 crates/nu-protocol/src/engine/overlay.rs      |  2 +-
 .../nu-protocol/src/engine/stack_out_dest.rs  | 12 +++++------
 .../src/engine/state_working_set.rs           |  6 +++---
 crates/nu-protocol/src/errors/cli_error.rs    |  2 +-
 crates/nu-protocol/src/ir/display.rs          | 10 +++++-----
 crates/nu-protocol/src/value/mod.rs           |  2 +-
 crates/nu-protocol/src/value/record.rs        | 16 +++++++--------
 crates/nu-utils/src/flatten_json.rs           |  4 ++--
 16 files changed, 54 insertions(+), 56 deletions(-)

diff --git a/crates/nu-color-config/src/style_computer.rs b/crates/nu-color-config/src/style_computer.rs
index 8ea7fc75b7..bddc1bbf94 100644
--- a/crates/nu-color-config/src/style_computer.rs
+++ b/crates/nu-color-config/src/style_computer.rs
@@ -169,7 +169,7 @@ impl<'a> StyleComputer<'a> {
 
 // Because EngineState doesn't have Debug (Dec 2022),
 // this incomplete representation must be used.
-impl<'a> Debug for StyleComputer<'a> {
+impl Debug for StyleComputer<'_> {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result {
         f.debug_struct("StyleComputer")
             .field("map", &self.map)
diff --git a/crates/nu-engine/src/scope.rs b/crates/nu-engine/src/scope.rs
index 8774a8996b..2e21ac3242 100644
--- a/crates/nu-engine/src/scope.rs
+++ b/crates/nu-engine/src/scope.rs
@@ -529,14 +529,14 @@ impl<'e, 's> ScopeData<'e, 's> {
 }
 
 fn extract_custom_completion_from_arg(engine_state: &EngineState, shape: &SyntaxShape) -> String {
-    return match shape {
+    match shape {
         SyntaxShape::CompleterWrapper(_, custom_completion_decl_id) => {
             let custom_completion_command = engine_state.get_decl(*custom_completion_decl_id);
             let custom_completion_command_name: &str = custom_completion_command.name();
             custom_completion_command_name.to_string()
         }
         _ => "".to_string(),
-    };
+    }
 }
 
 fn sort_rows(decls: &mut [Value]) {
diff --git a/crates/nu-glob/src/lib.rs b/crates/nu-glob/src/lib.rs
index 30eec9f9e9..04cab26a77 100644
--- a/crates/nu-glob/src/lib.rs
+++ b/crates/nu-glob/src/lib.rs
@@ -294,7 +294,6 @@ pub fn glob_with(pattern: &str, options: MatchOptions) -> Result<Paths, PatternE
 /// This is provided primarily for testability, so multithreaded test runners can
 /// test pattern matches in different test directories at the same time without
 /// having to append the parent to the pattern under test.
-
 pub fn glob_with_parent(
     pattern: &str,
     options: MatchOptions,
@@ -790,7 +789,7 @@ impl Pattern {
     /// `Pattern` using the default match options (i.e. `MatchOptions::default()`).
     pub fn matches_path(&self, path: &Path) -> bool {
         // FIXME (#9639): This needs to handle non-utf8 paths
-        path.to_str().map_or(false, |s| self.matches(s))
+        path.to_str().is_some_and(|s| self.matches(s))
     }
 
     /// Return if the given `str` matches this `Pattern` using the specified
@@ -803,8 +802,7 @@ impl Pattern {
     /// `Pattern` using the specified match options.
     pub fn matches_path_with(&self, path: &Path, options: MatchOptions) -> bool {
         // FIXME (#9639): This needs to handle non-utf8 paths
-        path.to_str()
-            .map_or(false, |s| self.matches_with(s, options))
+        path.to_str().is_some_and(|s| self.matches_with(s, options))
     }
 
     /// Access the original glob pattern.
@@ -1069,7 +1067,7 @@ fn chars_eq(a: char, b: char, case_sensitive: bool) -> bool {
         true
     } else if !case_sensitive && a.is_ascii() && b.is_ascii() {
         // FIXME: work with non-ascii chars properly (issue #9084)
-        a.to_ascii_lowercase() == b.to_ascii_lowercase()
+        a.eq_ignore_ascii_case(&b)
     } else {
         a == b
     }
diff --git a/crates/nu-json/src/de.rs b/crates/nu-json/src/de.rs
index fff4da0d6f..d3edf86d3b 100644
--- a/crates/nu-json/src/de.rs
+++ b/crates/nu-json/src/de.rs
@@ -505,7 +505,7 @@ where
     }
 }
 
-impl<'de, 'a, Iter> de::Deserializer<'de> for &'a mut Deserializer<Iter>
+impl<'de, Iter> de::Deserializer<'de> for &mut Deserializer<Iter>
 where
     Iter: Iterator<Item = u8>,
 {
@@ -565,7 +565,7 @@ impl<'a, Iter: Iterator<Item = u8>> SeqVisitor<'a, Iter> {
     }
 }
 
-impl<'de, 'a, Iter> de::SeqAccess<'de> for SeqVisitor<'a, Iter>
+impl<'de, Iter> de::SeqAccess<'de> for SeqVisitor<'_, Iter>
 where
     Iter: Iterator<Item = u8>,
 {
@@ -616,7 +616,7 @@ impl<'a, Iter: Iterator<Item = u8>> MapVisitor<'a, Iter> {
     }
 }
 
-impl<'de, 'a, Iter> de::MapAccess<'de> for MapVisitor<'a, Iter>
+impl<'de, Iter> de::MapAccess<'de> for MapVisitor<'_, Iter>
 where
     Iter: Iterator<Item = u8>,
 {
@@ -671,7 +671,7 @@ where
     }
 }
 
-impl<'de, 'a, Iter> de::VariantAccess<'de> for &'a mut Deserializer<Iter>
+impl<'de, Iter> de::VariantAccess<'de> for &mut Deserializer<Iter>
 where
     Iter: Iterator<Item = u8>,
 {
diff --git a/crates/nu-json/src/ser.rs b/crates/nu-json/src/ser.rs
index 4b15740602..6d8f39a647 100644
--- a/crates/nu-json/src/ser.rs
+++ b/crates/nu-json/src/ser.rs
@@ -310,7 +310,7 @@ where
     }
 }
 
-impl<'a, W, F> ser::SerializeSeq for Compound<'a, W, F>
+impl<W, F> ser::SerializeSeq for Compound<'_, W, F>
 where
     W: io::Write,
     F: Formatter,
@@ -337,7 +337,7 @@ where
     }
 }
 
-impl<'a, W, F> ser::SerializeTuple for Compound<'a, W, F>
+impl<W, F> ser::SerializeTuple for Compound<'_, W, F>
 where
     W: io::Write,
     F: Formatter,
@@ -357,7 +357,7 @@ where
     }
 }
 
-impl<'a, W, F> ser::SerializeTupleStruct for Compound<'a, W, F>
+impl<W, F> ser::SerializeTupleStruct for Compound<'_, W, F>
 where
     W: io::Write,
     F: Formatter,
@@ -377,7 +377,7 @@ where
     }
 }
 
-impl<'a, W, F> ser::SerializeTupleVariant for Compound<'a, W, F>
+impl<W, F> ser::SerializeTupleVariant for Compound<'_, W, F>
 where
     W: io::Write,
     F: Formatter,
@@ -401,7 +401,7 @@ where
     }
 }
 
-impl<'a, W, F> ser::SerializeMap for Compound<'a, W, F>
+impl<W, F> ser::SerializeMap for Compound<'_, W, F>
 where
     W: io::Write,
     F: Formatter,
@@ -438,7 +438,7 @@ where
     }
 }
 
-impl<'a, W, F> ser::SerializeStruct for Compound<'a, W, F>
+impl<W, F> ser::SerializeStruct for Compound<'_, W, F>
 where
     W: io::Write,
     F: Formatter,
@@ -458,7 +458,7 @@ where
     }
 }
 
-impl<'a, W, F> ser::SerializeStructVariant for Compound<'a, W, F>
+impl<W, F> ser::SerializeStructVariant for Compound<'_, W, F>
 where
     W: io::Write,
     F: Formatter,
@@ -486,7 +486,7 @@ struct MapKeySerializer<'a, W: 'a, F: 'a> {
     ser: &'a mut Serializer<W, F>,
 }
 
-impl<'a, W, F> ser::Serializer for MapKeySerializer<'a, W, F>
+impl<W, F> ser::Serializer for MapKeySerializer<'_, W, F>
 where
     W: io::Write,
     F: Formatter,
@@ -694,7 +694,7 @@ struct HjsonFormatter<'a> {
     braces_same_line: bool,
 }
 
-impl<'a> Default for HjsonFormatter<'a> {
+impl Default for HjsonFormatter<'_> {
     fn default() -> Self {
         Self::new()
     }
@@ -719,7 +719,7 @@ impl<'a> HjsonFormatter<'a> {
     }
 }
 
-impl<'a> Formatter for HjsonFormatter<'a> {
+impl Formatter for HjsonFormatter<'_> {
     fn open<W>(&mut self, writer: &mut W, ch: u8) -> Result<()>
     where
         W: io::Write,
diff --git a/crates/nu-json/src/value.rs b/crates/nu-json/src/value.rs
index 88f878f260..41d2a66543 100644
--- a/crates/nu-json/src/value.rs
+++ b/crates/nu-json/src/value.rs
@@ -432,7 +432,7 @@ struct WriterFormatter<'a, 'b: 'a> {
     inner: &'a mut fmt::Formatter<'b>,
 }
 
-impl<'a, 'b> io::Write for WriterFormatter<'a, 'b> {
+impl io::Write for WriterFormatter<'_, '_> {
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
         fn io_error<E>(_: E) -> io::Error {
             // Value does not matter because fmt::Debug and fmt::Display impls
diff --git a/crates/nu-path/src/tilde.rs b/crates/nu-path/src/tilde.rs
index 638a7797b6..5bae92424a 100644
--- a/crates/nu-path/src/tilde.rs
+++ b/crates/nu-path/src/tilde.rs
@@ -126,7 +126,7 @@ fn is_termux() -> bool {
 }
 
 fn expand_tilde_with_another_user_home(path: &Path) -> PathBuf {
-    return match path.to_str() {
+    match path.to_str() {
         Some(file_path) => {
             let mut file = file_path.to_string();
             match file_path.find(['/', '\\']) {
@@ -147,7 +147,7 @@ fn expand_tilde_with_another_user_home(path: &Path) -> PathBuf {
             }
         }
         None => path.to_path_buf(),
-    };
+    }
 }
 
 /// Expand tilde ("~") into a home directory if it is the first path component
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index 5ee560f8f6..c93f2d5c8f 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -354,7 +354,7 @@ impl EngineState {
     pub fn active_overlay_ids<'a, 'b>(
         &'b self,
         removed_overlays: &'a [Vec<u8>],
-    ) -> impl DoubleEndedIterator<Item = &OverlayId> + 'a
+    ) -> impl DoubleEndedIterator<Item = &'b OverlayId> + 'a
     where
         'b: 'a,
     {
@@ -368,7 +368,7 @@ impl EngineState {
     pub fn active_overlays<'a, 'b>(
         &'b self,
         removed_overlays: &'a [Vec<u8>],
-    ) -> impl DoubleEndedIterator<Item = &OverlayFrame> + 'a
+    ) -> impl DoubleEndedIterator<Item = &'b OverlayFrame> + 'a
     where
         'b: 'a,
     {
@@ -379,7 +379,7 @@ impl EngineState {
     pub fn active_overlay_names<'a, 'b>(
         &'b self,
         removed_overlays: &'a [Vec<u8>],
-    ) -> impl DoubleEndedIterator<Item = &[u8]> + 'a
+    ) -> impl DoubleEndedIterator<Item = &'b [u8]> + 'a
     where
         'b: 'a,
     {
@@ -1061,7 +1061,7 @@ impl EngineState {
     }
 }
 
-impl<'a> GetSpan for &'a EngineState {
+impl GetSpan for &EngineState {
     /// Get existing span
     fn get_span(&self, span_id: SpanId) -> Span {
         *self
diff --git a/crates/nu-protocol/src/engine/overlay.rs b/crates/nu-protocol/src/engine/overlay.rs
index 9e52cffcea..b3ccf33f80 100644
--- a/crates/nu-protocol/src/engine/overlay.rs
+++ b/crates/nu-protocol/src/engine/overlay.rs
@@ -120,7 +120,7 @@ impl ScopeFrame {
     pub fn active_overlays<'a, 'b>(
         &'b self,
         removed_overlays: &'a mut Vec<Vec<u8>>,
-    ) -> impl DoubleEndedIterator<Item = &OverlayFrame> + 'a
+    ) -> impl DoubleEndedIterator<Item = &'b OverlayFrame> + 'a
     where
         'b: 'a,
     {
diff --git a/crates/nu-protocol/src/engine/stack_out_dest.rs b/crates/nu-protocol/src/engine/stack_out_dest.rs
index 98944aa233..6d049e00c4 100644
--- a/crates/nu-protocol/src/engine/stack_out_dest.rs
+++ b/crates/nu-protocol/src/engine/stack_out_dest.rs
@@ -153,7 +153,7 @@ impl<'a> StackIoGuard<'a> {
     }
 }
 
-impl<'a> Deref for StackIoGuard<'a> {
+impl Deref for StackIoGuard<'_> {
     type Target = Stack;
 
     fn deref(&self) -> &Self::Target {
@@ -161,7 +161,7 @@ impl<'a> Deref for StackIoGuard<'a> {
     }
 }
 
-impl<'a> DerefMut for StackIoGuard<'a> {
+impl DerefMut for StackIoGuard<'_> {
     fn deref_mut(&mut self) -> &mut Self::Target {
         self.stack
     }
@@ -202,7 +202,7 @@ impl<'a> StackCollectValueGuard<'a> {
     }
 }
 
-impl<'a> Deref for StackCollectValueGuard<'a> {
+impl Deref for StackCollectValueGuard<'_> {
     type Target = Stack;
 
     fn deref(&self) -> &Self::Target {
@@ -210,7 +210,7 @@ impl<'a> Deref for StackCollectValueGuard<'a> {
     }
 }
 
-impl<'a> DerefMut for StackCollectValueGuard<'a> {
+impl DerefMut for StackCollectValueGuard<'_> {
     fn deref_mut(&mut self) -> &mut Self::Target {
         self.stack
     }
@@ -258,7 +258,7 @@ impl<'a> StackCallArgGuard<'a> {
     }
 }
 
-impl<'a> Deref for StackCallArgGuard<'a> {
+impl Deref for StackCallArgGuard<'_> {
     type Target = Stack;
 
     fn deref(&self) -> &Self::Target {
@@ -266,7 +266,7 @@ impl<'a> Deref for StackCallArgGuard<'a> {
     }
 }
 
-impl<'a> DerefMut for StackCallArgGuard<'a> {
+impl DerefMut for StackCallArgGuard<'_> {
     fn deref_mut(&mut self) -> &mut Self::Target {
         self.stack
     }
diff --git a/crates/nu-protocol/src/engine/state_working_set.rs b/crates/nu-protocol/src/engine/state_working_set.rs
index 441e5350be..8db525a2a1 100644
--- a/crates/nu-protocol/src/engine/state_working_set.rs
+++ b/crates/nu-protocol/src/engine/state_working_set.rs
@@ -399,7 +399,7 @@ impl<'a> StateWorkingSet<'a> {
         }
 
         // if no files with span were found, fall back on permanent ones
-        return self.permanent_state.get_span_contents(span);
+        self.permanent_state.get_span_contents(span)
     }
 
     pub fn enter_scope(&mut self) {
@@ -1105,13 +1105,13 @@ impl<'a> GetSpan for &'a StateWorkingSet<'a> {
     }
 }
 
-impl<'a> miette::SourceCode for &StateWorkingSet<'a> {
+impl miette::SourceCode for &StateWorkingSet<'_> {
     fn read_span<'b>(
         &'b self,
         span: &miette::SourceSpan,
         context_lines_before: usize,
         context_lines_after: usize,
-    ) -> Result<Box<dyn miette::SpanContents + 'b>, miette::MietteError> {
+    ) -> Result<Box<dyn miette::SpanContents<'b> + 'b>, miette::MietteError> {
         let debugging = std::env::var("MIETTE_DEBUG").is_ok();
         if debugging {
             let finding_span = "Finding span in StateWorkingSet";
diff --git a/crates/nu-protocol/src/errors/cli_error.rs b/crates/nu-protocol/src/errors/cli_error.rs
index ecf35e247d..7439d1df79 100644
--- a/crates/nu-protocol/src/errors/cli_error.rs
+++ b/crates/nu-protocol/src/errors/cli_error.rs
@@ -96,7 +96,7 @@ impl std::fmt::Debug for CliError<'_> {
     }
 }
 
-impl<'src> miette::Diagnostic for CliError<'src> {
+impl miette::Diagnostic for CliError<'_> {
     fn code<'a>(&'a self) -> Option<Box<dyn std::fmt::Display + 'a>> {
         self.0.code()
     }
diff --git a/crates/nu-protocol/src/ir/display.rs b/crates/nu-protocol/src/ir/display.rs
index 98ea68db9d..89891db403 100644
--- a/crates/nu-protocol/src/ir/display.rs
+++ b/crates/nu-protocol/src/ir/display.rs
@@ -7,7 +7,7 @@ pub struct FmtIrBlock<'a> {
     pub(super) ir_block: &'a IrBlock,
 }
 
-impl<'a> fmt::Display for FmtIrBlock<'a> {
+impl fmt::Display for FmtIrBlock<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let plural = |count| if count == 1 { "" } else { "s" };
         writeln!(
@@ -55,7 +55,7 @@ pub struct FmtInstruction<'a> {
     pub(super) data: &'a [u8],
 }
 
-impl<'a> fmt::Display for FmtInstruction<'a> {
+impl fmt::Display for FmtInstruction<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         const WIDTH: usize = 22;
 
@@ -321,7 +321,7 @@ impl fmt::Display for RedirectMode {
 
 struct FmtData<'a>(&'a [u8], DataSlice);
 
-impl<'a> fmt::Display for FmtData<'a> {
+impl fmt::Display for FmtData<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         if let Ok(s) = std::str::from_utf8(&self.0[self.1]) {
             // Write as string
@@ -338,7 +338,7 @@ struct FmtLiteral<'a> {
     data: &'a [u8],
 }
 
-impl<'a> fmt::Display for FmtLiteral<'a> {
+impl fmt::Display for FmtLiteral<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self.literal {
             Literal::Bool(b) => write!(f, "bool({b:?})"),
@@ -387,7 +387,7 @@ struct FmtPattern<'a> {
     pattern: &'a Pattern,
 }
 
-impl<'a> fmt::Display for FmtPattern<'a> {
+impl fmt::Display for FmtPattern<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self.pattern {
             Pattern::Record(bindings) => {
diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs
index f310055f1e..6b9e90d97e 100644
--- a/crates/nu-protocol/src/value/mod.rs
+++ b/crates/nu-protocol/src/value/mod.rs
@@ -2512,7 +2512,7 @@ impl PartialOrd for Value {
 
 impl PartialEq for Value {
     fn eq(&self, other: &Self) -> bool {
-        self.partial_cmp(other).map_or(false, Ordering::is_eq)
+        self.partial_cmp(other).is_some_and(Ordering::is_eq)
     }
 }
 
diff --git a/crates/nu-protocol/src/value/record.rs b/crates/nu-protocol/src/value/record.rs
index f4e963737f..2b667a7cf0 100644
--- a/crates/nu-protocol/src/value/record.rs
+++ b/crates/nu-protocol/src/value/record.rs
@@ -440,13 +440,13 @@ impl<'a> Iterator for Iter<'a> {
     }
 }
 
-impl<'a> DoubleEndedIterator for Iter<'a> {
+impl DoubleEndedIterator for Iter<'_> {
     fn next_back(&mut self) -> Option<Self::Item> {
         self.iter.next_back().map(|(col, val): &(_, _)| (col, val))
     }
 }
 
-impl<'a> ExactSizeIterator for Iter<'a> {
+impl ExactSizeIterator for Iter<'_> {
     fn len(&self) -> usize {
         self.iter.len()
     }
@@ -482,13 +482,13 @@ impl<'a> Iterator for IterMut<'a> {
     }
 }
 
-impl<'a> DoubleEndedIterator for IterMut<'a> {
+impl DoubleEndedIterator for IterMut<'_> {
     fn next_back(&mut self) -> Option<Self::Item> {
         self.iter.next_back().map(|(col, val)| (&*col, val))
     }
 }
 
-impl<'a> ExactSizeIterator for IterMut<'a> {
+impl ExactSizeIterator for IterMut<'_> {
     fn len(&self) -> usize {
         self.iter.len()
     }
@@ -524,13 +524,13 @@ impl<'a> Iterator for Columns<'a> {
     }
 }
 
-impl<'a> DoubleEndedIterator for Columns<'a> {
+impl DoubleEndedIterator for Columns<'_> {
     fn next_back(&mut self) -> Option<Self::Item> {
         self.iter.next_back().map(|(col, _)| col)
     }
 }
 
-impl<'a> ExactSizeIterator for Columns<'a> {
+impl ExactSizeIterator for Columns<'_> {
     fn len(&self) -> usize {
         self.iter.len()
     }
@@ -584,13 +584,13 @@ impl<'a> Iterator for Values<'a> {
     }
 }
 
-impl<'a> DoubleEndedIterator for Values<'a> {
+impl DoubleEndedIterator for Values<'_> {
     fn next_back(&mut self) -> Option<Self::Item> {
         self.iter.next_back().map(|(_, val)| val)
     }
 }
 
-impl<'a> ExactSizeIterator for Values<'a> {
+impl ExactSizeIterator for Values<'_> {
     fn len(&self) -> usize {
         self.iter.len()
     }
diff --git a/crates/nu-utils/src/flatten_json.rs b/crates/nu-utils/src/flatten_json.rs
index 2614359faa..6176f3c18f 100644
--- a/crates/nu-utils/src/flatten_json.rs
+++ b/crates/nu-utils/src/flatten_json.rs
@@ -31,7 +31,7 @@ pub struct JsonFlattener<'a> {
     pub preserve_arrays: bool,
 }
 
-impl<'a> Default for JsonFlattener<'a> {
+impl Default for JsonFlattener<'_> {
     fn default() -> Self {
         JsonFlattener {
             separator: ".",
@@ -56,7 +56,7 @@ impl<'a> Default for JsonFlattener<'a> {
 ///
 /// let flattened_example = flattener.flatten(&example);
 /// ```
-impl<'a> JsonFlattener<'a> {
+impl JsonFlattener<'_> {
     /// Returns a flattener with the default arguments
     /// # Examples
     /// ```

From 13d5a15f7562fc3ade6cb77512806c1651eab05f Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Sun, 2 Feb 2025 15:51:47 -0500
Subject: [PATCH 0988/1072] Run-time pipeline input typechecking tweaks
 (#14922)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

This PR makes two changes related to [run-time pipeline input type
checking](https://github.com/nushell/nushell/pull/14741):

1. The check which bypasses type checking for commands with only
`Type::Nothing` input types has been expanded to work with commands with
multiple `Type::Nothing` inputs for different outputs. For example,
`ast` has three input/output type pairs, but all of the inputs are
`Type::Nothing`:
  ```
  ╭───┬─────────┬────────╮
  │ # │  input  │ output │
  ├───┼─────────┼────────┤
  │ 0 │ nothing │ table  │
  │ 1 │ nothing │ record │
  │ 2 │ nothing │ string │
  ╰───┴─────────┴────────╯
  ```
Before this PR, passing a value (which would otherwise be ignored) to
`ast` caused a run-time type error:
  ```
    Error: nu::shell::only_supports_this_input_type

    × Input type not supported.
     ╭─[entry #1:1:6]
   1 │ echo 123 | ast -j -f "hi"
     ·      ─┬─   ─┬─
· │ ╰── only nothing, nothing, and nothing input data is supported
     ·       ╰── input type: int
     ╰────

  ```

  After this PR, no error is raised.

This doesn't really matter for `ast` (the only other built-in command
with a similar input/output type signature is `cal`), but it's more
logically consistent.

2. Bypasses input type-checking (parse-time ***and*** run-time) for some
(not all, see below) commands which have both a `Type::Nothing` input
and some other non-nothing `Type` input. This is accomplished by adding
a `Type::Any` input with the same output as the corresponding
`Type::Nothing` input/output pair.
  &nbsp;
This is necessary because some commands are intended to operate on an
argument with empty pipeline input, or operate on an empty pipeline
input with no argument. This causes issues when a value is implicitly
passed to one of these commands. I [discovered this
issue](https://discord.com/channels/601130461678272522/615962413203718156/1329945784346611712)
when working with an example where the `open` command is used in
`sort-by` closure:
```nushell
ls | sort-by { open -r $in.name | lines | length }
```

Before this PR (but after the run-time input type checking PR), this
error is raised:

```
Error: nu::shell::only_supports_this_input_type

  × Input type not supported.
   ╭─[entry #1:1:1]
 1 │ ls | sort-by { open -r $in.name | lines | length }
   · ─┬             ──┬─
   ·  │               ╰── only nothing and string input data is supported
   ·  ╰── input type: record<name: string, type: string, size: filesize, modified: date>
   ╰────
```

While this error is technically correct, we don't actually want to
return an error here since `open` ignores its pipeline input when an
argument is passed. This would be a parse-time error as well if the
parser was able to infer that the closure input type was a record, but
our type inference isn't that robust currently, so this technically
incorrect form snuck by type checking until #14741.

However, there are some commands with the same kind of type signature
where this behavior is actually desirable. This means we can't just
bypass type-checking for any command with a `Type::Nothing` input. These
commands operate on true `null` values, rather than ignoring their
input. For example, `length` returns `0` when passed a `null` value.
It's correct, and even desirable, to throw a run-time error when
`length` is passed an unexpected type. For example, a string, which
should instead be measured with `str length`:

```nushell
["hello" "world"] | sort-by { length }
# => Error: nu::shell::only_supports_this_input_type
# =>
# =>   × Input type not supported.
# =>    ╭─[entry #32:1:10]
# =>  1 │ ["hello" "world"] | sort-by { length }
# =>    ·          ───┬───              ───┬──
# =>    ·             │                    ╰── only list<any>, binary, and nothing input data is supported
# =>    ·             ╰── input type: string
# =>    ╰────
```

We need a more robust way for commands to express how they handle the
`Type::Nothing` input case. I think a possible solution here is to allow
commands to express that they operate on `PipelineData::Empty`, rather
than `Value::Nothing`. Then, a command like `open` could have an empty
pipeline input type rather than a `Type::Nothing`, and the parse-time
and run-time pipeline input type checks know that `open` will safely
ignore an incorrectly typed input.

That being said, we have a release coming up and the above solution
might take a while to implement, so while unfortunate, bypassing input
type-checking for these problematic commands serves as a workaround to
avoid breaking changes in the release until a more robust solution is
implemented.

This PR bypasses input type-checking for the following commands:
* `load-env`: can take record of envvars as input or argument
* `nu-check`: checks input string or filename argument
* `open`: can take filename as input or argument
* `polars when`: can be used with input, or can be chained with another
`polars when`
* `stor insert`: data record can be passed as input or argument
* `stor update`: data record can be passed as input or argument
* `format date`: `--list` ignores input value
* `into datetime`: `--list` ignores input value (also added a
`Type::Nothing` input which was missing from this command)

These commands have a similar input/output signature to the above
commands, but are working as intended:
* `cd`: The input/output signature was actually incorrect, `cd` always
ignores its input. I fixed this in this PR.
* `generate`
* `get`
* `history import`
* `interleave`
* `into bool`
* `length`

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

As a temporary workaround, pipeline input type-checking for the
following commands has been bypassed to avoid undesirable run-time input
type checking errors which were previously not caught at parse-time:
* `open`
* `load-env`
* `format date`
* `into datetime`
* `nu-check`
* `stor insert`
* `stor update`
* `polars when`

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->
CI became green in the time it took me to type the description :smile:

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->

N/A
---
 crates/nu-command/src/conversions/into/datetime.rs        | 5 +++++
 crates/nu-command/src/env/load_env.rs                     | 3 +++
 crates/nu-command/src/filesystem/cd.rs                    | 4 ----
 crates/nu-command/src/filesystem/open.rs                  | 8 +++++++-
 crates/nu-command/src/stor/insert.rs                      | 3 +++
 crates/nu-command/src/stor/update.rs                      | 3 +++
 crates/nu-command/src/strings/format/date.rs              | 4 ++++
 crates/nu-command/src/system/nu_check.rs                  | 3 +++
 crates/nu-engine/src/eval_ir.rs                           | 7 ++-----
 .../src/dataframe/command/boolean/when.rs                 | 3 +++
 10 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/crates/nu-command/src/conversions/into/datetime.rs b/crates/nu-command/src/conversions/into/datetime.rs
index 2b274c3ea5..0fc9725bcf 100644
--- a/crates/nu-command/src/conversions/into/datetime.rs
+++ b/crates/nu-command/src/conversions/into/datetime.rs
@@ -65,6 +65,11 @@ impl Command for SubCommand {
             (Type::List(Box::new(Type::String)), Type::List(Box::new(Type::Date))),
             (Type::table(), Type::table()),
             (Type::record(), Type::record()),
+            (Type::Nothing, Type::table()),
+            // FIXME Type::Any input added to disable pipeline input type checking, as run-time checks can raise undesirable type errors
+            // which aren't caught by the parser. see https://github.com/nushell/nushell/pull/14922 for more details
+            // only applicable for --list flag
+            (Type::Any, Type::table()),
         ])
         .allow_variants_without_examples(true)
         .named(
diff --git a/crates/nu-command/src/env/load_env.rs b/crates/nu-command/src/env/load_env.rs
index f35b1d08ea..b508aa6f3b 100644
--- a/crates/nu-command/src/env/load_env.rs
+++ b/crates/nu-command/src/env/load_env.rs
@@ -17,6 +17,9 @@ impl Command for LoadEnv {
             .input_output_types(vec![
                 (Type::record(), Type::Nothing),
                 (Type::Nothing, Type::Nothing),
+                // FIXME Type::Any input added to disable pipeline input type checking, as run-time checks can raise undesirable type errors
+                // which aren't caught by the parser. see https://github.com/nushell/nushell/pull/14922 for more details
+                (Type::Any, Type::Nothing),
             ])
             .allow_variants_without_examples(true)
             .optional(
diff --git a/crates/nu-command/src/filesystem/cd.rs b/crates/nu-command/src/filesystem/cd.rs
index 3ba438746d..c4f540010e 100644
--- a/crates/nu-command/src/filesystem/cd.rs
+++ b/crates/nu-command/src/filesystem/cd.rs
@@ -25,10 +25,6 @@ impl Command for Cd {
             .input_output_types(vec![(Type::Nothing, Type::Nothing)])
             .switch("physical", "use the physical directory structure; resolve symbolic links before processing instances of ..", Some('P'))
             .optional("path", SyntaxShape::Directory, "The path to change to.")
-            .input_output_types(vec![
-                (Type::Nothing, Type::Nothing),
-                (Type::String, Type::Nothing),
-            ])
             .allow_variants_without_examples(true)
             .category(Category::FileSystem)
     }
diff --git a/crates/nu-command/src/filesystem/open.rs b/crates/nu-command/src/filesystem/open.rs
index a372d7e79e..a2a63f180b 100644
--- a/crates/nu-command/src/filesystem/open.rs
+++ b/crates/nu-command/src/filesystem/open.rs
@@ -35,7 +35,13 @@ impl Command for Open {
 
     fn signature(&self) -> nu_protocol::Signature {
         Signature::build("open")
-            .input_output_types(vec![(Type::Nothing, Type::Any), (Type::String, Type::Any)])
+            .input_output_types(vec![
+                (Type::Nothing, Type::Any),
+                (Type::String, Type::Any),
+                // FIXME Type::Any input added to disable pipeline input type checking, as run-time checks can raise undesirable type errors
+                // which aren't caught by the parser. see https://github.com/nushell/nushell/pull/14922 for more details
+                (Type::Any, Type::Any),
+            ])
             .rest(
                 "files",
                 SyntaxShape::OneOf(vec![SyntaxShape::GlobPattern, SyntaxShape::String]),
diff --git a/crates/nu-command/src/stor/insert.rs b/crates/nu-command/src/stor/insert.rs
index 4a2ebf4928..1d0f5ae6c0 100644
--- a/crates/nu-command/src/stor/insert.rs
+++ b/crates/nu-command/src/stor/insert.rs
@@ -17,6 +17,9 @@ impl Command for StorInsert {
                 (Type::Nothing, Type::table()),
                 (Type::record(), Type::table()),
                 (Type::table(), Type::table()),
+                // FIXME Type::Any input added to disable pipeline input type checking, as run-time checks can raise undesirable type errors
+                // which aren't caught by the parser. see https://github.com/nushell/nushell/pull/14922 for more details
+                (Type::Any, Type::table()),
             ])
             .required_named(
                 "table-name",
diff --git a/crates/nu-command/src/stor/update.rs b/crates/nu-command/src/stor/update.rs
index 8a77f41d51..98652bae2a 100644
--- a/crates/nu-command/src/stor/update.rs
+++ b/crates/nu-command/src/stor/update.rs
@@ -16,6 +16,9 @@ impl Command for StorUpdate {
             .input_output_types(vec![
                 (Type::Nothing, Type::table()),
                 (Type::record(), Type::table()),
+                // FIXME Type::Any input added to disable pipeline input type checking, as run-time checks can raise undesirable type errors
+                // which aren't caught by the parser. see https://github.com/nushell/nushell/pull/14922 for more details
+                (Type::Any, Type::table()),
             ])
             .required_named(
                 "table-name",
diff --git a/crates/nu-command/src/strings/format/date.rs b/crates/nu-command/src/strings/format/date.rs
index 658823aa6a..fa7911361c 100644
--- a/crates/nu-command/src/strings/format/date.rs
+++ b/crates/nu-command/src/strings/format/date.rs
@@ -19,6 +19,10 @@ impl Command for FormatDate {
                 (Type::Date, Type::String),
                 (Type::String, Type::String),
                 (Type::Nothing, Type::table()),
+                // FIXME Type::Any input added to disable pipeline input type checking, as run-time checks can raise undesirable type errors
+                // which aren't caught by the parser. see https://github.com/nushell/nushell/pull/14922 for more details
+                // only applicable for --list flag
+                (Type::Any, Type::table()),
             ])
             .allow_variants_without_examples(true) // https://github.com/nushell/nushell/issues/7032
             .switch("list", "lists strftime cheatsheet", Some('l'))
diff --git a/crates/nu-command/src/system/nu_check.rs b/crates/nu-command/src/system/nu_check.rs
index ca0d09965a..f3ecdd004d 100644
--- a/crates/nu-command/src/system/nu_check.rs
+++ b/crates/nu-command/src/system/nu_check.rs
@@ -20,6 +20,9 @@ impl Command for NuCheck {
                 (Type::Nothing, Type::Bool),
                 (Type::String, Type::Bool),
                 (Type::List(Box::new(Type::Any)), Type::Bool),
+                // FIXME Type::Any input added to disable pipeline input type checking, as run-time checks can raise undesirable type errors
+                // which aren't caught by the parser. see https://github.com/nushell/nushell/pull/14922 for more details
+                (Type::Any, Type::Bool),
             ])
             // type is string to avoid automatically canonicalizing the path
             .optional("path", SyntaxShape::String, "File path to parse.")
diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index 4cc8cef782..ecdebbac51 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -1277,11 +1277,8 @@ fn check_input_types(
     }
 
     // If a command only has a nothing input type, then allow any input data
-    match io_types.first() {
-        Some((Type::Nothing, _)) if io_types.len() == 1 => {
-            return Ok(());
-        }
-        _ => (),
+    if io_types.iter().all(|(intype, _)| intype == &Type::Nothing) {
+        return Ok(());
     }
 
     match input {
diff --git a/crates/nu_plugin_polars/src/dataframe/command/boolean/when.rs b/crates/nu_plugin_polars/src/dataframe/command/boolean/when.rs
index 9c6976aa54..e6c70ec73d 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/boolean/when.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/boolean/when.rs
@@ -41,6 +41,9 @@ impl PluginCommand for ExprWhen {
                     Type::Custom("expression".into()),
                     Type::Custom("expression".into()),
                 ),
+                // FIXME Type::Any input added to disable pipeline input type checking, as run-time checks can raise undesirable type errors
+                // which aren't caught by the parser. see https://github.com/nushell/nushell/pull/14922 for more details
+                (Type::Any, Type::Custom("expression".into())),
             ])
             .category(Category::Custom("expression".into()))
     }

From 34c09d8b35f25d38fadac5614ed4d571dd904a9a Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Sun, 2 Feb 2025 19:42:04 -0600
Subject: [PATCH 0989/1072] manually revert from serde_yml to serde_yaml
 (#14987)

# Description

This reverts back to serde_yaml from serde_yml.
Closes https://github.com/nushell/nushell/issues/14934

Reopen https://github.com/nushell/nushell/pull/14630

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock                                    | 28 ++++------
 Cargo.toml                                    |  2 +-
 crates/nu-command/Cargo.toml                  |  2 +-
 crates/nu-command/src/formats/from/yaml.rs    | 48 ++++++++--------
 crates/nu-command/src/formats/to/yaml.rs      | 56 ++++++++++---------
 .../tests/format_conversions/yaml.rs          |  1 +
 6 files changed, 67 insertions(+), 70 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6858f0fa25..f96f254ea2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2977,16 +2977,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "libyml"
-version = "0.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3302702afa434ffa30847a83305f0a69d6abd74293b6554c18ec85c7ef30c980"
-dependencies = [
- "anyhow",
- "version_check",
-]
-
 [[package]]
 name = "libz-rs-sys"
 version = "0.4.1"
@@ -3689,7 +3679,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
- "serde_yml",
+ "serde_yaml",
  "sha2",
  "sysinfo 0.32.1",
  "tabled",
@@ -6486,18 +6476,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "serde_yml"
-version = "0.0.12"
+name = "serde_yaml"
+version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59e2dd588bf1597a252c3b920e0143eb99b0f76e4e082f4c92ce34fbc9e71ddd"
+checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
  "indexmap",
  "itoa",
- "libyml",
- "memchr",
  "ryu",
  "serde",
- "version_check",
+ "unsafe-libyaml",
 ]
 
 [[package]]
@@ -7505,6 +7493,12 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
+[[package]]
+name = "unsafe-libyaml"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
+
 [[package]]
 name = "untrusted"
 version = "0.9.0"
diff --git a/Cargo.toml b/Cargo.toml
index a8b456d3c9..350007a885 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -152,7 +152,7 @@ scopeguard = { version = "1.2.0" }
 serde = { version = "1.0" }
 serde_json = "1.0"
 serde_urlencoded = "0.7.1"
-serde_yml = "0.0.12"
+serde_yaml = "0.9.33"
 sha2 = "0.10"
 strip-ansi-escapes = "0.2.0"
 syn = "2.0"
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index bd34f2f742..4efa13c131 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -84,7 +84,7 @@ scopeguard = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true, features = ["preserve_order"] }
 serde_urlencoded = { workspace = true }
-serde_yml = { workspace = true }
+serde_yaml = { workspace = true }
 sha2 = { workspace = true }
 sysinfo = { workspace = true }
 tabled = { workspace = true, features = ["ansi"], default-features = false }
diff --git a/crates/nu-command/src/formats/from/yaml.rs b/crates/nu-command/src/formats/from/yaml.rs
index fb639802a0..649f7e83ac 100644
--- a/crates/nu-command/src/formats/from/yaml.rs
+++ b/crates/nu-command/src/formats/from/yaml.rs
@@ -72,7 +72,7 @@ impl Command for FromYml {
 }
 
 fn convert_yaml_value_to_nu_value(
-    v: &serde_yml::Value,
+    v: &serde_yaml::Value,
     span: Span,
     val_span: Span,
 ) -> Result<Value, ShellError> {
@@ -83,22 +83,22 @@ fn convert_yaml_value_to_nu_value(
         input_span: val_span,
     };
     Ok(match v {
-        serde_yml::Value::Bool(b) => Value::bool(*b, span),
-        serde_yml::Value::Number(n) if n.is_i64() => {
+        serde_yaml::Value::Bool(b) => Value::bool(*b, span),
+        serde_yaml::Value::Number(n) if n.is_i64() => {
             Value::int(n.as_i64().ok_or(err_not_compatible_number)?, span)
         }
-        serde_yml::Value::Number(n) if n.is_f64() => {
+        serde_yaml::Value::Number(n) if n.is_f64() => {
             Value::float(n.as_f64().ok_or(err_not_compatible_number)?, span)
         }
-        serde_yml::Value::String(s) => Value::string(s.to_string(), span),
-        serde_yml::Value::Sequence(a) => {
+        serde_yaml::Value::String(s) => Value::string(s.to_string(), span),
+        serde_yaml::Value::Sequence(a) => {
             let result: Result<Vec<Value>, ShellError> = a
                 .iter()
                 .map(|x| convert_yaml_value_to_nu_value(x, span, val_span))
                 .collect();
             Value::list(result?, span)
         }
-        serde_yml::Value::Mapping(t) => {
+        serde_yaml::Value::Mapping(t) => {
             // Using an IndexMap ensures consistent ordering
             let mut collected = IndexMap::new();
 
@@ -111,19 +111,19 @@ fn convert_yaml_value_to_nu_value(
                     input_span: val_span,
                 };
                 match (k, v) {
-                    (serde_yml::Value::Number(k), _) => {
+                    (serde_yaml::Value::Number(k), _) => {
                         collected.insert(
                             k.to_string(),
                             convert_yaml_value_to_nu_value(v, span, val_span)?,
                         );
                     }
-                    (serde_yml::Value::Bool(k), _) => {
+                    (serde_yaml::Value::Bool(k), _) => {
                         collected.insert(
                             k.to_string(),
                             convert_yaml_value_to_nu_value(v, span, val_span)?,
                         );
                     }
-                    (serde_yml::Value::String(k), _) => {
+                    (serde_yaml::Value::String(k), _) => {
                         collected.insert(
                             k.clone(),
                             convert_yaml_value_to_nu_value(v, span, val_span)?,
@@ -132,16 +132,16 @@ fn convert_yaml_value_to_nu_value(
                     // Hard-code fix for cases where "v" is a string without quotations with double curly braces
                     // e.g. k = value
                     // value: {{ something }}
-                    // Strangely, serde_yml returns
+                    // Strangely, serde_yaml returns
                     // "value" -> Mapping(Mapping { map: {Mapping(Mapping { map: {String("something"): Null} }): Null} })
-                    (serde_yml::Value::Mapping(m), serde_yml::Value::Null) => {
+                    (serde_yaml::Value::Mapping(m), serde_yaml::Value::Null) => {
                         return m
                             .iter()
                             .take(1)
                             .collect_vec()
                             .first()
                             .and_then(|e| match e {
-                                (serde_yml::Value::String(s), serde_yml::Value::Null) => {
+                                (serde_yaml::Value::String(s), serde_yaml::Value::Null) => {
                                     Some(Value::string("{{ ".to_owned() + s.as_str() + " }}", span))
                                 }
                                 _ => None,
@@ -156,22 +156,22 @@ fn convert_yaml_value_to_nu_value(
 
             Value::record(collected.into_iter().collect(), span)
         }
-        serde_yml::Value::Tagged(t) => {
+        serde_yaml::Value::Tagged(t) => {
             let tag = &t.tag;
             let value = match &t.value {
-                serde_yml::Value::String(s) => {
+                serde_yaml::Value::String(s) => {
                     let val = format!("{} {}", tag, s).trim().to_string();
                     Value::string(val, span)
                 }
-                serde_yml::Value::Number(n) => {
+                serde_yaml::Value::Number(n) => {
                     let val = format!("{} {}", tag, n).trim().to_string();
                     Value::string(val, span)
                 }
-                serde_yml::Value::Bool(b) => {
+                serde_yaml::Value::Bool(b) => {
                     let val = format!("{} {}", tag, b).trim().to_string();
                     Value::string(val, span)
                 }
-                serde_yml::Value::Null => {
+                serde_yaml::Value::Null => {
                     let val = format!("{}", tag).trim().to_string();
                     Value::string(val, span)
                 }
@@ -180,7 +180,7 @@ fn convert_yaml_value_to_nu_value(
 
             value
         }
-        serde_yml::Value::Null => Value::nothing(span),
+        serde_yaml::Value::Null => Value::nothing(span),
         x => unimplemented!("Unsupported YAML case: {:?}", x),
     })
 }
@@ -188,9 +188,9 @@ fn convert_yaml_value_to_nu_value(
 pub fn from_yaml_string_to_value(s: &str, span: Span, val_span: Span) -> Result<Value, ShellError> {
     let mut documents = vec![];
 
-    for document in serde_yml::Deserializer::from_str(s) {
-        let v: serde_yml::Value =
-            serde_yml::Value::deserialize(document).map_err(|x| ShellError::UnsupportedInput {
+    for document in serde_yaml::Deserializer::from_str(s) {
+        let v: serde_yaml::Value =
+            serde_yaml::Value::deserialize(document).map_err(|x| ShellError::UnsupportedInput {
                 msg: format!("Could not load YAML: {x}"),
                 input: "value originates from here".into(),
                 msg_span: span,
@@ -393,8 +393,8 @@ mod test {
         ];
 
         for test_case in test_cases {
-            let doc = serde_yml::Deserializer::from_str(test_case.input);
-            let v: serde_yml::Value = serde_yml::Value::deserialize(doc.last().unwrap()).unwrap();
+            let doc = serde_yaml::Deserializer::from_str(test_case.input);
+            let v: serde_yaml::Value = serde_yaml::Value::deserialize(doc.last().unwrap()).unwrap();
             let result = convert_yaml_value_to_nu_value(&v, Span::test_data(), Span::test_data());
             assert!(result.is_ok());
             assert!(result.ok().unwrap() == test_case.expected.ok().unwrap());
diff --git a/crates/nu-command/src/formats/to/yaml.rs b/crates/nu-command/src/formats/to/yaml.rs
index 977e49c389..cf4cde4fb9 100644
--- a/crates/nu-command/src/formats/to/yaml.rs
+++ b/crates/nu-command/src/formats/to/yaml.rs
@@ -51,27 +51,29 @@ pub fn value_to_yaml_value(
     engine_state: &EngineState,
     v: &Value,
     serialize_types: bool,
-) -> Result<serde_yml::Value, ShellError> {
+) -> Result<serde_yaml::Value, ShellError> {
     Ok(match &v {
-        Value::Bool { val, .. } => serde_yml::Value::Bool(*val),
-        Value::Int { val, .. } => serde_yml::Value::Number(serde_yml::Number::from(*val)),
-        Value::Filesize { val, .. } => serde_yml::Value::Number(serde_yml::Number::from(val.get())),
-        Value::Duration { val, .. } => serde_yml::Value::String(val.to_string()),
-        Value::Date { val, .. } => serde_yml::Value::String(val.to_string()),
-        Value::Range { .. } => serde_yml::Value::Null,
-        Value::Float { val, .. } => serde_yml::Value::Number(serde_yml::Number::from(*val)),
+        Value::Bool { val, .. } => serde_yaml::Value::Bool(*val),
+        Value::Int { val, .. } => serde_yaml::Value::Number(serde_yaml::Number::from(*val)),
+        Value::Filesize { val, .. } => {
+            serde_yaml::Value::Number(serde_yaml::Number::from(val.get()))
+        }
+        Value::Duration { val, .. } => serde_yaml::Value::String(val.to_string()),
+        Value::Date { val, .. } => serde_yaml::Value::String(val.to_string()),
+        Value::Range { .. } => serde_yaml::Value::Null,
+        Value::Float { val, .. } => serde_yaml::Value::Number(serde_yaml::Number::from(*val)),
         Value::String { val, .. } | Value::Glob { val, .. } => {
-            serde_yml::Value::String(val.clone())
+            serde_yaml::Value::String(val.clone())
         }
         Value::Record { val, .. } => {
-            let mut m = serde_yml::Mapping::new();
+            let mut m = serde_yaml::Mapping::new();
             for (k, v) in &**val {
                 m.insert(
-                    serde_yml::Value::String(k.clone()),
+                    serde_yaml::Value::String(k.clone()),
                     value_to_yaml_value(engine_state, v, serialize_types)?,
                 );
             }
-            serde_yml::Value::Mapping(m)
+            serde_yaml::Value::Mapping(m)
         }
         Value::List { vals, .. } => {
             let mut out = vec![];
@@ -80,7 +82,7 @@ pub fn value_to_yaml_value(
                 out.push(value_to_yaml_value(engine_state, value, serialize_types)?);
             }
 
-            serde_yml::Value::Sequence(out)
+            serde_yaml::Value::Sequence(out)
         }
         Value::Closure { val, .. } => {
             if serialize_types {
@@ -88,36 +90,36 @@ pub fn value_to_yaml_value(
                 if let Some(span) = block.span {
                     let contents_bytes = engine_state.get_span_contents(span);
                     let contents_string = String::from_utf8_lossy(contents_bytes);
-                    serde_yml::Value::String(contents_string.to_string())
+                    serde_yaml::Value::String(contents_string.to_string())
                 } else {
-                    serde_yml::Value::String(format!(
+                    serde_yaml::Value::String(format!(
                         "unable to retrieve block contents for yaml block_id {}",
                         val.block_id.get()
                     ))
                 }
             } else {
-                serde_yml::Value::Null
+                serde_yaml::Value::Null
             }
         }
-        Value::Nothing { .. } => serde_yml::Value::Null,
+        Value::Nothing { .. } => serde_yaml::Value::Null,
         Value::Error { error, .. } => return Err(*error.clone()),
-        Value::Binary { val, .. } => serde_yml::Value::Sequence(
+        Value::Binary { val, .. } => serde_yaml::Value::Sequence(
             val.iter()
-                .map(|x| serde_yml::Value::Number(serde_yml::Number::from(*x)))
+                .map(|x| serde_yaml::Value::Number(serde_yaml::Number::from(*x)))
                 .collect(),
         ),
-        Value::CellPath { val, .. } => serde_yml::Value::Sequence(
+        Value::CellPath { val, .. } => serde_yaml::Value::Sequence(
             val.members
                 .iter()
                 .map(|x| match &x {
-                    PathMember::String { val, .. } => Ok(serde_yml::Value::String(val.clone())),
+                    PathMember::String { val, .. } => Ok(serde_yaml::Value::String(val.clone())),
                     PathMember::Int { val, .. } => {
-                        Ok(serde_yml::Value::Number(serde_yml::Number::from(*val)))
+                        Ok(serde_yaml::Value::Number(serde_yaml::Number::from(*val)))
                     }
                 })
-                .collect::<Result<Vec<serde_yml::Value>, ShellError>>()?,
+                .collect::<Result<Vec<serde_yaml::Value>, ShellError>>()?,
         ),
-        Value::Custom { .. } => serde_yml::Value::Null,
+        Value::Custom { .. } => serde_yaml::Value::Null,
     })
 }
 
@@ -135,9 +137,9 @@ fn to_yaml(
     let value = input.into_value(head)?;
 
     let yaml_value = value_to_yaml_value(engine_state, &value, serialize_types)?;
-    match serde_yml::to_string(&yaml_value) {
-        Ok(serde_yml_string) => {
-            Ok(Value::string(serde_yml_string, head)
+    match serde_yaml::to_string(&yaml_value) {
+        Ok(serde_yaml_string) => {
+            Ok(Value::string(serde_yaml_string, head)
                 .into_pipeline_data_with_metadata(Some(metadata)))
         }
         _ => Ok(Value::error(
diff --git a/crates/nu-command/tests/format_conversions/yaml.rs b/crates/nu-command/tests/format_conversions/yaml.rs
index 146890012e..e713ae87fe 100644
--- a/crates/nu-command/tests/format_conversions/yaml.rs
+++ b/crates/nu-command/tests/format_conversions/yaml.rs
@@ -50,6 +50,7 @@ fn convert_dict_to_yaml_with_integer_floats_key() {
 }
 
 #[test]
+#[ignore]
 fn convert_bool_to_yaml_in_yaml_spec_1_2() {
     let actual = nu!(pipeline(
         r#"

From c58b432c2131e2d4edb9c5f4d50c110ea4a31f05 Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Mon, 3 Feb 2025 20:27:33 +0800
Subject: [PATCH 0990/1072] fix: security_audit, bump openssl from 0.10.68 to
 0.10.70 (#14991)

# Description

should fix the workflow
---
 Cargo.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f96f254ea2..4dcc7ce5fe 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4449,9 +4449,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.68"
+version = "0.10.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
+checksum = "61cfb4e166a8bb8c9b55c500bc2308550148ece889be90f609377e58140f42c6"
 dependencies = [
  "bitflags 2.6.0",
  "cfg-if",
@@ -4490,9 +4490,9 @@ dependencies = [
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.104"
+version = "0.9.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
+checksum = "8b22d5b84be05a8d6947c7cb71f7c849aa0f112acd4bf51c2a7c1c988ac0a9dc"
 dependencies = [
  "cc",
  "libc",

From 8b431e3a2ea3ad4e3e2b4388e599a6a4e52b8090 Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Mon, 3 Feb 2025 20:28:41 +0800
Subject: [PATCH 0991/1072] fix(completion): expand_tilde when path contains
 glob chars (#14992)

# Description

Fixes #13905 by expanding tilde directly on completion.

Before:

<img width="565" alt="image"
src="https://github.com/user-attachments/assets/5410ee2c-37bf-4733-b100-7037471d96f3"
/>

After:

<img width="576" alt="image"
src="https://github.com/user-attachments/assets/140e60d8-ae51-43f6-8cde-beaf9333aca0"
/>

# User-Facing Changes

# Tests + Formatting

# After Submitting
---
 crates/nu-cli/src/completions/completion_common.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crates/nu-cli/src/completions/completion_common.rs b/crates/nu-cli/src/completions/completion_common.rs
index e45ff9cf97..0a060666b8 100644
--- a/crates/nu-cli/src/completions/completion_common.rs
+++ b/crates/nu-cli/src/completions/completion_common.rs
@@ -284,6 +284,8 @@ pub fn complete_item(
 pub fn escape_path(path: String, dir: bool) -> String {
     // make glob pattern have the highest priority.
     if nu_glob::is_glob(path.as_str()) {
+        let pathbuf = nu_path::expand_tilde(path);
+        let path = pathbuf.to_string_lossy();
         return if path.contains('\'') {
             // decide to use double quote, also need to escape `"` in path
             // or else users can't do anything with completed path either.

From 4424481487b4ba52cff579ee52d5c463690b8d73 Mon Sep 17 00:00:00 2001
From: Bruce Weirdan <weirdan@gmail.com>
Date: Mon, 3 Feb 2025 13:32:57 +0100
Subject: [PATCH 0992/1072] Supply `metadata.content_type` for `to html` output
 (#14990)

# Description

Adds pipeline metadata to the `to html` command output (hardcoded to
`text/html; charset=utf-8`)

# User-Facing Changes

Pipeline metadata is now included with the `to html` command output.
---
 Cargo.lock                                         | 1 +
 crates/nu-cmd-extra/Cargo.toml                     | 3 ++-
 crates/nu-cmd-extra/src/extra/formats/to/html.rs   | 7 ++++++-
 crates/nu-command/tests/format_conversions/html.rs | 9 +++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4dcc7ce5fe..a3d91219e0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3542,6 +3542,7 @@ dependencies = [
  "fancy-regex",
  "heck",
  "itertools 0.13.0",
+ "mime",
  "nu-ansi-term",
  "nu-cmd-base",
  "nu-cmd-lang",
diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml
index ec6cfae4e3..f6a6c83311 100644
--- a/crates/nu-cmd-extra/Cargo.toml
+++ b/crates/nu-cmd-extra/Cargo.toml
@@ -34,8 +34,9 @@ serde = { workspace = true }
 serde_urlencoded = { workspace = true }
 v_htmlescape = { workspace = true }
 itertools = { workspace = true }
+mime = { workspace = true }
 
 [dev-dependencies]
 nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.1" }
 nu-command = { path = "../nu-command", version = "0.101.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.101.1" }
\ No newline at end of file
+nu-test-support = { path = "../nu-test-support", version = "0.101.1" }
diff --git a/crates/nu-cmd-extra/src/extra/formats/to/html.rs b/crates/nu-cmd-extra/src/extra/formats/to/html.rs
index b047b386f1..81a5309ae5 100644
--- a/crates/nu-cmd-extra/src/extra/formats/to/html.rs
+++ b/crates/nu-cmd-extra/src/extra/formats/to/html.rs
@@ -330,7 +330,12 @@ fn to_html(
         output_string = run_regexes(&regex_hm, &output_string);
     }
 
-    Ok(Value::string(output_string, head).into_pipeline_data())
+    let metadata = PipelineMetadata {
+        data_source: nu_protocol::DataSource::None,
+        content_type: Some(mime::TEXT_HTML_UTF_8.to_string()),
+    };
+
+    Ok(Value::string(output_string, head).into_pipeline_data_with_metadata(metadata))
 }
 
 fn theme_demo(span: Span) -> PipelineData {
diff --git a/crates/nu-command/tests/format_conversions/html.rs b/crates/nu-command/tests/format_conversions/html.rs
index 9f6644a812..27b9660fd4 100644
--- a/crates/nu-command/tests/format_conversions/html.rs
+++ b/crates/nu-command/tests/format_conversions/html.rs
@@ -14,6 +14,15 @@ fn out_html_simple() {
     );
 }
 
+#[test]
+fn out_html_metadata() {
+    let actual = nu!(r#"
+            echo 3 | to html | metadata | get content_type
+        "#);
+
+    assert_eq!(actual.out, r#"text/html; charset=utf-8"#);
+}
+
 #[test]
 fn out_html_partial() {
     let actual = nu!(r#"

From 30b3c42b3715007243cb91dd00a997877413e237 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Mon, 3 Feb 2025 20:33:23 +0800
Subject: [PATCH 0993/1072] update sysinfo to 0.33.1 (#14982)

Noticed by #14951 , there are some breaking changes in sysinfo 0.33. So
I create a pr manually to update it
---
 Cargo.lock                               | 23 +++++------------------
 Cargo.toml                               |  2 +-
 crates/nu-command/src/debug/info.rs      |  2 +-
 crates/nu-command/src/system/sys/cpu.rs  |  4 ++--
 crates/nu-command/src/system/sys/temp.rs |  4 ++--
 5 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a3d91219e0..5ef32ca59c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3516,7 +3516,7 @@ dependencies = [
  "percent-encoding",
  "reedline",
  "rstest",
- "sysinfo 0.32.1",
+ "sysinfo",
  "tempfile",
  "unicode-segmentation",
  "uuid",
@@ -3682,7 +3682,7 @@ dependencies = [
  "serde_urlencoded",
  "serde_yaml",
  "sha2",
- "sysinfo 0.32.1",
+ "sysinfo",
  "tabled",
  "tempfile",
  "titlecase",
@@ -3975,7 +3975,7 @@ dependencies = [
  "nix 0.29.0",
  "ntapi",
  "procfs",
- "sysinfo 0.32.1",
+ "sysinfo",
  "web-time",
  "windows 0.56.0",
 ]
@@ -5365,7 +5365,7 @@ dependencies = [
  "serde",
  "serde_json",
  "stacker",
- "sysinfo 0.33.1",
+ "sysinfo",
  "version_check",
 ]
 
@@ -6934,20 +6934,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "sysinfo"
-version = "0.32.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c33cd241af0f2e9e3b5c32163b873b29956890b5342e6745b917ce9d490f4af"
-dependencies = [
- "core-foundation-sys",
- "libc",
- "memchr",
- "ntapi",
- "rayon",
- "windows 0.57.0",
-]
-
 [[package]]
 name = "sysinfo"
 version = "0.33.1"
@@ -6958,6 +6944,7 @@ dependencies = [
  "libc",
  "memchr",
  "ntapi",
+ "rayon",
  "windows 0.57.0",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 350007a885..f4082f9e80 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -156,7 +156,7 @@ serde_yaml = "0.9.33"
 sha2 = "0.10"
 strip-ansi-escapes = "0.2.0"
 syn = "2.0"
-sysinfo = "0.32"
+sysinfo = "0.33"
 tabled = { version = "0.17.0", default-features = false }
 tempfile = "3.15"
 titlecase = "3.0"
diff --git a/crates/nu-command/src/debug/info.rs b/crates/nu-command/src/debug/info.rs
index 4912da8a1d..955381bdf2 100644
--- a/crates/nu-command/src/debug/info.rs
+++ b/crates/nu-command/src/debug/info.rs
@@ -54,7 +54,7 @@ impl Command for DebugInfo {
 }
 
 fn all_columns(span: Span) -> Value {
-    let rk = RefreshKind::new()
+    let rk = RefreshKind::nothing()
         .with_processes(ProcessRefreshKind::everything())
         .with_memory(MemoryRefreshKind::everything());
 
diff --git a/crates/nu-command/src/system/sys/cpu.rs b/crates/nu-command/src/system/sys/cpu.rs
index de24efd898..09e6c836be 100644
--- a/crates/nu-command/src/system/sys/cpu.rs
+++ b/crates/nu-command/src/system/sys/cpu.rs
@@ -54,9 +54,9 @@ fn cpu(long: bool, span: Span) -> Value {
         // In theory we could just sleep MINIMUM_CPU_UPDATE_INTERVAL, but I've noticed that
         // that gives poor results (error of ~5%). Decided to wait 2x that long, somewhat arbitrarily
         std::thread::sleep(MINIMUM_CPU_UPDATE_INTERVAL * 2);
-        sys.refresh_cpu_specifics(CpuRefreshKind::new().with_cpu_usage());
+        sys.refresh_cpu_specifics(CpuRefreshKind::nothing().with_cpu_usage());
     } else {
-        sys.refresh_cpu_specifics(CpuRefreshKind::new().with_frequency());
+        sys.refresh_cpu_specifics(CpuRefreshKind::nothing().with_frequency());
     }
 
     let cpus = sys
diff --git a/crates/nu-command/src/system/sys/temp.rs b/crates/nu-command/src/system/sys/temp.rs
index e743779e84..b3d9d58bef 100644
--- a/crates/nu-command/src/system/sys/temp.rs
+++ b/crates/nu-command/src/system/sys/temp.rs
@@ -49,8 +49,8 @@ fn temp(span: Span) -> Value {
         .map(|component| {
             let mut record = record! {
                 "unit" => Value::string(component.label(), span),
-                "temp" => Value::float(component.temperature().into(), span),
-                "high" => Value::float(component.max().into(), span),
+                "temp" => Value::float(component.temperature().unwrap_or(f32::NAN).into(), span),
+                "high" => Value::float(component.max().unwrap_or(f32::NAN).into(), span),
             };
 
             if let Some(critical) = component.critical() {

From f04db2a7a3814cbf582715e97cfec96dc388eb30 Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Mon, 3 Feb 2025 09:55:54 -0500
Subject: [PATCH 0994/1072] Swap additional context and label in I/O errors
 (#14954)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

Tweaks the error style for I/O errors introduced #14927. Moves the
additional context to below the text that says "I/O error", and always
shows the error kind in the label.

Additional context|Before PR|After PR
:-:|:-:|:-:

yes|![image](https://github.com/user-attachments/assets/df4f2e28-fdf5-4693-b60c-255d019af25f)
|
![image](https://github.com/user-attachments/assets/5915e9d0-78d4-49a6-b495-502d0c6444fa)
no|
![image](https://github.com/user-attachments/assets/e4ecaada-ec8c-4940-b08a-bbfaa45083d5)
|
![image](https://github.com/user-attachments/assets/467163d8-ab39-47f0-a74f-e2effe2fe6af)



# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

N/A, as this is a follow-up to #14927 which has not been included in a
release

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->
N/A

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
N/A

---------

Co-authored-by: Piepmatz <git+github@cptpiepmatz.de>
---
 crates/nu-command/src/filesystem/open.rs      | 17 ++++++-----
 .../nu-protocol/src/errors/shell_error/io.rs  | 28 ++++++++++++-------
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/crates/nu-command/src/filesystem/open.rs b/crates/nu-command/src/filesystem/open.rs
index a2a63f180b..f1ea73c6c8 100644
--- a/crates/nu-command/src/filesystem/open.rs
+++ b/crates/nu-command/src/filesystem/open.rs
@@ -118,13 +118,16 @@ impl Command for Open {
                     #[cfg(unix)]
                     let err = {
                         let mut err = err;
-                        err.additional_context = Some(match path.metadata() {
-                            Ok(md) => format!(
-                                "The permissions of {:o} does not allow access for this user",
-                                md.permissions().mode() & 0o0777
-                            ),
-                            Err(e) => e.to_string(),
-                        });
+                        err.additional_context = Some(
+                            match path.metadata() {
+                                Ok(md) => format!(
+                                    "The permissions of {:o} does not allow access for this user",
+                                    md.permissions().mode() & 0o0777
+                                ),
+                                Err(e) => e.to_string(),
+                            }
+                            .into(),
+                        );
                         err
                     };
 
diff --git a/crates/nu-protocol/src/errors/shell_error/io.rs b/crates/nu-protocol/src/errors/shell_error/io.rs
index 88072ec45e..83836bff73 100644
--- a/crates/nu-protocol/src/errors/shell_error/io.rs
+++ b/crates/nu-protocol/src/errors/shell_error/io.rs
@@ -115,7 +115,7 @@ pub struct IoError {
     ///
     /// Only set this field if it adds meaningful context.
     /// If [`ErrorKind`] already contains all the necessary information, leave this as [`None`].
-    pub additional_context: Option<String>,
+    pub additional_context: Option<AdditionalContext>,
 
     /// The precise location in the Rust code where the error originated.
     ///
@@ -139,6 +139,16 @@ pub enum ErrorKind {
     IsADirectory,
 }
 
+#[derive(Debug, Clone, PartialEq, Eq, Error, Diagnostic)]
+#[error("{0}")]
+pub struct AdditionalContext(String);
+
+impl From<String> for AdditionalContext {
+    fn from(value: String) -> Self {
+        AdditionalContext(value)
+    }
+}
+
 impl IoError {
     /// Creates a new [`IoError`] with the given kind, span, and optional path.
     ///
@@ -209,7 +219,7 @@ impl IoError {
             kind: kind.into(),
             span,
             path,
-            additional_context: Some(additional_context.to_string()),
+            additional_context: Some(additional_context.to_string().into()),
             location: None,
         }
     }
@@ -249,7 +259,7 @@ impl IoError {
             kind: kind.into(),
             span: Span::unknown(),
             path: None,
-            additional_context: Some(additional_context.to_string()),
+            additional_context: Some(additional_context.to_string().into()),
             location: Some(location.to_string()),
         }
     }
@@ -283,7 +293,7 @@ impl IoError {
             kind: kind.into(),
             span: Span::unknown(),
             path: path.into(),
-            additional_context: Some(additional_context.to_string()),
+            additional_context: Some(additional_context.to_string().into()),
             location: Some(location.to_string()),
         }
     }
@@ -370,16 +380,14 @@ impl Diagnostic for IoError {
             (true, Some(location)) => SourceSpan::new(0.into(), location.len()),
         };
 
-        let label = match self.additional_context.as_ref() {
-            Some(ctx) => format!("{ctx}\n{}", self.kind),
-            None => self.kind.to_string(),
-        };
-        let label = LabeledSpan::new_with_span(Some(label), span);
+        let label = LabeledSpan::new_with_span(Some(self.kind.to_string()), span);
         Some(Box::new(std::iter::once(label)))
     }
 
     fn diagnostic_source(&self) -> Option<&dyn Diagnostic> {
-        Some(&self.kind as &dyn Diagnostic)
+        self.additional_context
+            .as_ref()
+            .map(|ctx| ctx as &dyn Diagnostic)
     }
 
     fn source_code(&self) -> Option<&dyn miette::SourceCode> {

From 1aa2ed1947a0b891398558fcf4e4289849cc5a1d Mon Sep 17 00:00:00 2001
From: Yash Thakur <45539777+ysthakur@users.noreply.github.com>
Date: Tue, 4 Feb 2025 10:49:35 -0500
Subject: [PATCH 0995/1072] Bump version to 0.102.0 (#14998)

---
 Cargo.lock                                    | 74 +++++++++----------
 Cargo.toml                                    | 40 +++++-----
 crates/nu-cli/Cargo.toml                      | 26 +++----
 crates/nu-cmd-base/Cargo.toml                 | 10 +--
 crates/nu-cmd-extra/Cargo.toml                | 22 +++---
 crates/nu-cmd-lang/Cargo.toml                 | 10 +--
 crates/nu-cmd-plugin/Cargo.toml               | 10 +--
 crates/nu-color-config/Cargo.toml             | 10 +--
 crates/nu-command/Cargo.toml                  | 34 ++++-----
 .../nu-command/src/network/version_check.rs   |  4 +-
 crates/nu-derive-value/Cargo.toml             |  2 +-
 crates/nu-engine/Cargo.toml                   | 10 +--
 crates/nu-explore/Cargo.toml                  | 20 ++---
 crates/nu-glob/Cargo.toml                     |  2 +-
 crates/nu-json/Cargo.toml                     |  6 +-
 crates/nu-lsp/Cargo.toml                      | 16 ++--
 crates/nu-parser/Cargo.toml                   | 12 +--
 crates/nu-path/Cargo.toml                     |  2 +-
 crates/nu-plugin-core/Cargo.toml              |  6 +-
 crates/nu-plugin-engine/Cargo.toml            | 14 ++--
 crates/nu-plugin-protocol/Cargo.toml          |  6 +-
 crates/nu-plugin-test-support/Cargo.toml      | 18 ++---
 crates/nu-plugin/Cargo.toml                   | 12 +--
 crates/nu-pretty-hex/Cargo.toml               |  2 +-
 crates/nu-protocol/Cargo.toml                 | 14 ++--
 crates/nu-std/Cargo.toml                      |  8 +-
 crates/nu-system/Cargo.toml                   |  2 +-
 crates/nu-table/Cargo.toml                    | 12 +--
 crates/nu-term-grid/Cargo.toml                |  4 +-
 crates/nu-test-support/Cargo.toml             |  8 +-
 crates/nu-utils/Cargo.toml                    |  2 +-
 .../src/default_files/default_config.nu       |  2 +-
 .../nu-utils/src/default_files/default_env.nu |  2 +-
 .../nu-utils/src/default_files/doc_config.nu  |  2 +-
 crates/nu-utils/src/default_files/doc_env.nu  |  2 +-
 .../src/default_files/scaffold_config.nu      |  2 +-
 .../src/default_files/scaffold_env.nu         |  2 +-
 crates/nu_plugin_custom_values/Cargo.toml     |  6 +-
 crates/nu_plugin_example/Cargo.toml           | 10 +--
 crates/nu_plugin_formats/Cargo.toml           |  8 +-
 crates/nu_plugin_gstat/Cargo.toml             |  6 +-
 crates/nu_plugin_inc/Cargo.toml               |  6 +-
 .../nu_plugin_nu_example.nu                   |  2 +-
 crates/nu_plugin_polars/Cargo.toml            | 20 ++---
 .../nu_plugin_python_example.py               |  2 +-
 crates/nu_plugin_query/Cargo.toml             |  6 +-
 crates/nu_plugin_stress_internals/Cargo.toml  |  2 +-
 crates/nuon/Cargo.toml                        | 10 +--
 48 files changed, 254 insertions(+), 254 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5ef32ca59c..ec0ed8ae78 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3435,7 +3435,7 @@ dependencies = [
 
 [[package]]
 name = "nu"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "assert_cmd",
  "crossterm 0.28.1",
@@ -3490,7 +3490,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cli"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "chrono",
  "crossterm 0.28.1",
@@ -3525,7 +3525,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-base"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "indexmap",
  "miette",
@@ -3537,7 +3537,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-extra"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "fancy-regex",
  "heck",
@@ -3563,7 +3563,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-lang"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "itertools 0.13.0",
  "nu-engine",
@@ -3575,7 +3575,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-plugin"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "itertools 0.13.0",
  "nu-engine",
@@ -3586,7 +3586,7 @@ dependencies = [
 
 [[package]]
 name = "nu-color-config"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "nu-ansi-term",
  "nu-engine",
@@ -3598,7 +3598,7 @@ dependencies = [
 
 [[package]]
 name = "nu-command"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "alphanumeric-sort",
  "base64 0.22.1",
@@ -3713,7 +3713,7 @@ dependencies = [
 
 [[package]]
 name = "nu-derive-value"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -3724,7 +3724,7 @@ dependencies = [
 
 [[package]]
 name = "nu-engine"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "log",
  "nu-glob",
@@ -3735,7 +3735,7 @@ dependencies = [
 
 [[package]]
 name = "nu-explore"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "ansi-str",
  "anyhow",
@@ -3759,14 +3759,14 @@ dependencies = [
 
 [[package]]
 name = "nu-glob"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "doc-comment",
 ]
 
 [[package]]
 name = "nu-json"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "fancy-regex",
  "linked-hash-map",
@@ -3779,7 +3779,7 @@ dependencies = [
 
 [[package]]
 name = "nu-lsp"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "assert-json-diff",
  "crossbeam-channel",
@@ -3802,7 +3802,7 @@ dependencies = [
 
 [[package]]
 name = "nu-parser"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "bytesize",
  "chrono",
@@ -3819,7 +3819,7 @@ dependencies = [
 
 [[package]]
 name = "nu-path"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "dirs",
  "omnipath",
@@ -3829,7 +3829,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "log",
  "nix 0.29.0",
@@ -3845,7 +3845,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-core"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "interprocess",
  "log",
@@ -3859,7 +3859,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-engine"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "log",
  "nu-engine",
@@ -3875,7 +3875,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-protocol"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "nu-protocol",
  "nu-utils",
@@ -3887,7 +3887,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-test-support"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "nu-ansi-term",
  "nu-cmd-lang",
@@ -3905,7 +3905,7 @@ dependencies = [
 
 [[package]]
 name = "nu-pretty-hex"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "heapless",
  "nu-ansi-term",
@@ -3914,7 +3914,7 @@ dependencies = [
 
 [[package]]
 name = "nu-protocol"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "brotli",
  "bytes",
@@ -3953,7 +3953,7 @@ dependencies = [
 
 [[package]]
 name = "nu-std"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "log",
  "miette",
@@ -3964,7 +3964,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "chrono",
  "itertools 0.13.0",
@@ -3982,7 +3982,7 @@ dependencies = [
 
 [[package]]
 name = "nu-table"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "fancy-regex",
  "nu-ansi-term",
@@ -3995,7 +3995,7 @@ dependencies = [
 
 [[package]]
 name = "nu-term-grid"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "nu-utils",
  "unicode-width 0.2.0",
@@ -4003,7 +4003,7 @@ dependencies = [
 
 [[package]]
 name = "nu-test-support"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -4015,7 +4015,7 @@ dependencies = [
 
 [[package]]
 name = "nu-utils"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "crossterm 0.28.1",
  "crossterm_winapi",
@@ -4044,7 +4044,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_example"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "nu-cmd-lang",
  "nu-plugin",
@@ -4054,7 +4054,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_formats"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "chrono",
  "eml-parser",
@@ -4069,7 +4069,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_gstat"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "git2",
  "nu-plugin",
@@ -4078,7 +4078,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_inc"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -4087,7 +4087,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_polars"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "aws-config",
  "aws-credential-types",
@@ -4127,7 +4127,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_query"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "gjson",
  "nu-plugin",
@@ -4142,7 +4142,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_stress_internals"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "interprocess",
  "serde",
@@ -4266,7 +4266,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "nuon"
-version = "0.101.1"
+version = "0.102.0"
 dependencies = [
  "chrono",
  "nu-engine",
diff --git a/Cargo.toml b/Cargo.toml
index f4082f9e80..03501dbe8a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
 rust-version = "1.82.0"
-version = "0.101.1"
+version = "0.102.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -195,22 +195,22 @@ unchecked_duration_subtraction = "warn"
 workspace = true
 
 [dependencies]
-nu-cli = { path = "./crates/nu-cli", version = "0.101.1" }
-nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.101.1" }
-nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.101.1" }
-nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.101.1", optional = true }
-nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.101.1" }
-nu-command = { path = "./crates/nu-command", version = "0.101.1" }
-nu-engine = { path = "./crates/nu-engine", version = "0.101.1" }
-nu-explore = { path = "./crates/nu-explore", version = "0.101.1" }
-nu-lsp = { path = "./crates/nu-lsp/", version = "0.101.1" }
-nu-parser = { path = "./crates/nu-parser", version = "0.101.1" }
-nu-path = { path = "./crates/nu-path", version = "0.101.1" }
-nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.101.1" }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.101.1" }
-nu-std = { path = "./crates/nu-std", version = "0.101.1" }
-nu-system = { path = "./crates/nu-system", version = "0.101.1" }
-nu-utils = { path = "./crates/nu-utils", version = "0.101.1" }
+nu-cli = { path = "./crates/nu-cli", version = "0.102.0" }
+nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.102.0" }
+nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.102.0" }
+nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.102.0", optional = true }
+nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.102.0" }
+nu-command = { path = "./crates/nu-command", version = "0.102.0" }
+nu-engine = { path = "./crates/nu-engine", version = "0.102.0" }
+nu-explore = { path = "./crates/nu-explore", version = "0.102.0" }
+nu-lsp = { path = "./crates/nu-lsp/", version = "0.102.0" }
+nu-parser = { path = "./crates/nu-parser", version = "0.102.0" }
+nu-path = { path = "./crates/nu-path", version = "0.102.0" }
+nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.102.0" }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.102.0" }
+nu-std = { path = "./crates/nu-std", version = "0.102.0" }
+nu-system = { path = "./crates/nu-system", version = "0.102.0" }
+nu-utils = { path = "./crates/nu-utils", version = "0.102.0" }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
 crossterm = { workspace = true }
@@ -240,9 +240,9 @@ nix = { workspace = true, default-features = false, features = [
 ] }
 
 [dev-dependencies]
-nu-test-support = { path = "./crates/nu-test-support", version = "0.101.1" }
-nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.101.1" }
-nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.101.1" }
+nu-test-support = { path = "./crates/nu-test-support", version = "0.102.0" }
+nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.102.0" }
+nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.102.0" }
 assert_cmd = "2.0"
 dirs = { workspace = true }
 tango-bench = "0.6"
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 01f749b322..3d890c7f28 100644
--- a/crates/nu-cli/Cargo.toml
+++ b/crates/nu-cli/Cargo.toml
@@ -5,28 +5,28 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cli"
 edition = "2021"
 license = "MIT"
 name = "nu-cli"
-version = "0.101.1"
+version = "0.102.0"
 
 [lib]
 bench = false
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.1" }
-nu-command = { path = "../nu-command", version = "0.101.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.101.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.102.0" }
+nu-command = { path = "../nu-command", version = "0.102.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.102.0" }
 rstest = { workspace = true, default-features = false }
 tempfile = { workspace = true }
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.101.1" }
-nu-engine = { path = "../nu-engine", version = "0.101.1", features = ["os"] }
-nu-glob = { path = "../nu-glob", version = "0.101.1" }
-nu-path = { path = "../nu-path", version = "0.101.1" }
-nu-parser = { path = "../nu-parser", version = "0.101.1" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.101.1", optional = true }
-nu-protocol = { path = "../nu-protocol", version = "0.101.1", features = ["os"] }
-nu-utils = { path = "../nu-utils", version = "0.101.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.101.1" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.102.0" }
+nu-engine = { path = "../nu-engine", version = "0.102.0", features = ["os"] }
+nu-glob = { path = "../nu-glob", version = "0.102.0" }
+nu-path = { path = "../nu-path", version = "0.102.0" }
+nu-parser = { path = "../nu-parser", version = "0.102.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.102.0", optional = true }
+nu-protocol = { path = "../nu-protocol", version = "0.102.0", features = ["os"] }
+nu-utils = { path = "../nu-utils", version = "0.102.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.102.0" }
 nu-ansi-term = { workspace = true }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
diff --git a/crates/nu-cmd-base/Cargo.toml b/crates/nu-cmd-base/Cargo.toml
index 02fc662a8a..5ec2246955 100644
--- a/crates/nu-cmd-base/Cargo.toml
+++ b/crates/nu-cmd-base/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-base"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-base"
-version = "0.101.1"
+version = "0.102.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,10 +13,10 @@ version = "0.101.1"
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.101.1", default-features = false }
-nu-parser = { path = "../nu-parser", version = "0.101.1" }
-nu-path = { path = "../nu-path", version = "0.101.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.1", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.102.0", default-features = false }
+nu-parser = { path = "../nu-parser", version = "0.102.0" }
+nu-path = { path = "../nu-path", version = "0.102.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.0", default-features = false }
 
 indexmap = { workspace = true }
 miette = { workspace = true }
diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml
index f6a6c83311..18a29f69c7 100644
--- 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.101.1"
+version = "0.102.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,13 +16,13 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.101.1" }
-nu-engine = { path = "../nu-engine", version = "0.101.1", default-features = false }
-nu-json = { version = "0.101.1", path = "../nu-json" }
-nu-parser = { path = "../nu-parser", version = "0.101.1" }
-nu-pretty-hex = { version = "0.101.1", path = "../nu-pretty-hex" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.1", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.101.1", default-features = false }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.102.0" }
+nu-engine = { path = "../nu-engine", version = "0.102.0", default-features = false }
+nu-json = { version = "0.102.0", path = "../nu-json" }
+nu-parser = { path = "../nu-parser", version = "0.102.0" }
+nu-pretty-hex = { version = "0.102.0", path = "../nu-pretty-hex" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.102.0", default-features = false }
 
 # Potential dependencies for extras
 heck = { workspace = true }
@@ -37,6 +37,6 @@ itertools = { workspace = true }
 mime = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.1" }
-nu-command = { path = "../nu-command", version = "0.101.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.101.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.102.0" }
+nu-command = { path = "../nu-command", version = "0.102.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.102.0" }
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index 88832cf0ed..5cfe6f8491 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -6,7 +6,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-lang"
 edition = "2021"
 license = "MIT"
 name = "nu-cmd-lang"
-version = "0.101.1"
+version = "0.102.0"
 
 [lib]
 bench = false
@@ -15,10 +15,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.101.1", default-features = false }
-nu-parser = { path = "../nu-parser", version = "0.101.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.1", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.101.1", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.102.0", default-features = false }
+nu-parser = { path = "../nu-parser", version = "0.102.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.102.0", default-features = false }
 
 itertools = { workspace = true }
 shadow-rs = { version = "0.38", default-features = false }
diff --git a/crates/nu-cmd-plugin/Cargo.toml b/crates/nu-cmd-plugin/Cargo.toml
index 08c6d0c251..88eb78d381 100644
--- a/crates/nu-cmd-plugin/Cargo.toml
+++ b/crates/nu-cmd-plugin/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-plugin"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-plugin"
-version = "0.101.1"
+version = "0.102.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,10 +13,10 @@ version = "0.101.1"
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.101.1" }
-nu-path = { path = "../nu-path", version = "0.101.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.1", features = ["plugin"] }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.101.1" }
+nu-engine = { path = "../nu-engine", version = "0.102.0" }
+nu-path = { path = "../nu-path", version = "0.102.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.0", features = ["plugin"] }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.102.0" }
 
 itertools = { workspace = true }
 
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index 8987837cf7..ea346db7d7 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-color-confi
 edition = "2021"
 license = "MIT"
 name = "nu-color-config"
-version = "0.101.1"
+version = "0.102.0"
 
 [lib]
 bench = false
@@ -14,12 +14,12 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.101.1", default-features = false }
-nu-engine = { path = "../nu-engine", version = "0.101.1", default-features = false }
-nu-json = { path = "../nu-json", version = "0.101.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.0", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.102.0", default-features = false }
+nu-json = { path = "../nu-json", version = "0.102.0" }
 nu-ansi-term = { workspace = true }
 
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.101.1" }
\ No newline at end of file
+nu-test-support = { path = "../nu-test-support", version = "0.102.0" }
\ No newline at end of file
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 4efa13c131..2ce7c7a8f0 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-command"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
-version = "0.101.1"
+version = "0.102.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,21 +16,21 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.101.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.101.1" }
-nu-engine = { path = "../nu-engine", version = "0.101.1", default-features = false }
-nu-glob = { path = "../nu-glob", version = "0.101.1" }
-nu-json = { path = "../nu-json", version = "0.101.1" }
-nu-parser = { path = "../nu-parser", version = "0.101.1" }
-nu-path = { path = "../nu-path", version = "0.101.1" }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.101.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.1", default-features = false }
-nu-system = { path = "../nu-system", version = "0.101.1" }
-nu-table = { path = "../nu-table", version = "0.101.1" }
-nu-term-grid = { path = "../nu-term-grid", version = "0.101.1" }
-nu-utils = { path = "../nu-utils", version = "0.101.1", default-features = false }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.102.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.102.0" }
+nu-engine = { path = "../nu-engine", version = "0.102.0", default-features = false }
+nu-glob = { path = "../nu-glob", version = "0.102.0" }
+nu-json = { path = "../nu-json", version = "0.102.0" }
+nu-parser = { path = "../nu-parser", version = "0.102.0" }
+nu-path = { path = "../nu-path", version = "0.102.0" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.102.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.0", default-features = false }
+nu-system = { path = "../nu-system", version = "0.102.0" }
+nu-table = { path = "../nu-table", version = "0.102.0" }
+nu-term-grid = { path = "../nu-term-grid", version = "0.102.0" }
+nu-utils = { path = "../nu-utils", version = "0.102.0", default-features = false }
 nu-ansi-term = { workspace = true }
-nuon = { path = "../nuon", version = "0.101.1" }
+nuon = { path = "../nuon", version = "0.102.0" }
 
 alphanumeric-sort = { workspace = true }
 base64 = { workspace = true }
@@ -190,8 +190,8 @@ sqlite = ["rusqlite"]
 trash-support = ["trash"]
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.101.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.102.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.102.0" }
 
 dirs = { workspace = true }
 mockito = { workspace = true, default-features = false }
diff --git a/crates/nu-command/src/network/version_check.rs b/crates/nu-command/src/network/version_check.rs
index 180bde9fd9..3f1944dfc2 100644
--- a/crates/nu-command/src/network/version_check.rs
+++ b/crates/nu-command/src/network/version_check.rs
@@ -68,8 +68,8 @@ impl Registry for NuShellNightly {
             .get::<Vec<Response>>(&url)?;
 
         if let Some(v) = versions.first() {
-            // The nightly repo tags look like "0.101.1-nightly.4+23dc1b6"
-            // We want to return the "0.101.1-nightly.4" part because hustcer
+            // The nightly repo tags look like "0.102.0-nightly.4+23dc1b6"
+            // We want to return the "0.102.0-nightly.4" part because hustcer
             // is changing the cargo.toml package.version to be that syntax
             let up_through_plus = match v.tag_name.split('+').next() {
                 Some(v) => v,
diff --git a/crates/nu-derive-value/Cargo.toml b/crates/nu-derive-value/Cargo.toml
index c66337429c..b563f8c3ea 100644
--- a/crates/nu-derive-value/Cargo.toml
+++ b/crates/nu-derive-value/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-derive-value"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-derive-value"
-version = "0.101.1"
+version = "0.102.0"
 
 [lib]
 proc-macro = true
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index 3285d1ae70..b16628ce19 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-engine"
 edition = "2021"
 license = "MIT"
 name = "nu-engine"
-version = "0.101.1"
+version = "0.102.0"
 
 [lib]
 bench = false
@@ -14,10 +14,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.101.1", default-features = false }
-nu-path = { path = "../nu-path", version = "0.101.1" }
-nu-glob = { path = "../nu-glob", version = "0.101.1" }
-nu-utils = { path = "../nu-utils", version = "0.101.1", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.102.0", default-features = false }
+nu-path = { path = "../nu-path", version = "0.102.0" }
+nu-glob = { path = "../nu-glob", version = "0.102.0" }
+nu-utils = { path = "../nu-utils", version = "0.102.0", default-features = false }
 log = { workspace = true }
 
 [features]
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index 3303763302..b3ac80c607 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-explore"
 edition = "2021"
 license = "MIT"
 name = "nu-explore"
-version = "0.101.1"
+version = "0.102.0"
 
 [lib]
 bench = false
@@ -14,16 +14,16 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.101.1" }
-nu-parser = { path = "../nu-parser", version = "0.101.1" }
-nu-path = { path = "../nu-path", version = "0.101.1" }
-nu-color-config = { path = "../nu-color-config", version = "0.101.1" }
-nu-engine = { path = "../nu-engine", version = "0.101.1" }
-nu-table = { path = "../nu-table", version = "0.101.1" }
-nu-json = { path = "../nu-json", version = "0.101.1" }
-nu-utils = { path = "../nu-utils", version = "0.101.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.0" }
+nu-parser = { path = "../nu-parser", version = "0.102.0" }
+nu-path = { path = "../nu-path", version = "0.102.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.102.0" }
+nu-engine = { path = "../nu-engine", version = "0.102.0" }
+nu-table = { path = "../nu-table", version = "0.102.0" }
+nu-json = { path = "../nu-json", version = "0.102.0" }
+nu-utils = { path = "../nu-utils", version = "0.102.0" }
 nu-ansi-term = { workspace = true }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.101.1" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.102.0" }
 
 anyhow = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-glob/Cargo.toml b/crates/nu-glob/Cargo.toml
index facfce1357..492ee015df 100644
--- a/crates/nu-glob/Cargo.toml
+++ b/crates/nu-glob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-glob"
-version = "0.101.1"
+version = "0.102.0"
 authors = ["The Nushell Project Developers", "The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 description = """
diff --git a/crates/nu-json/Cargo.toml b/crates/nu-json/Cargo.toml
index c633d8ed71..c1d7fb2026 100644
--- a/crates/nu-json/Cargo.toml
+++ b/crates/nu-json/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-json"
 edition = "2021"
 license = "MIT"
 name = "nu-json"
-version = "0.101.1"
+version = "0.102.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -26,8 +26,8 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.101.1" }
-nu-path = { path = "../nu-path", version = "0.101.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.102.0" }
+nu-path = { path = "../nu-path", version = "0.102.0" }
 serde_json = "1.0"
 fancy-regex = "0.14.0"
 
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index 33a15c8ebb..a5e1f31a35 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -3,15 +3,15 @@ authors = ["The Nushell Project Developers"]
 description = "Nushell's integrated LSP server"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-lsp"
 name = "nu-lsp"
-version = "0.101.1"
+version = "0.102.0"
 edition = "2021"
 license = "MIT"
 
 [dependencies]
-nu-cli = { path = "../nu-cli", version = "0.101.1" }
-nu-glob = { path = "../nu-glob", version = "0.101.1" }
-nu-parser = { path = "../nu-parser", version = "0.101.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.1" }
+nu-cli = { path = "../nu-cli", version = "0.102.0" }
+nu-glob = { path = "../nu-glob", version = "0.102.0" }
+nu-parser = { path = "../nu-parser", version = "0.102.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.0" }
 
 crossbeam-channel = { workspace = true }
 lsp-server = { workspace = true }
@@ -24,9 +24,9 @@ serde_json = { workspace = true }
 url = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.1" }
-nu-command = { path = "../nu-command", version = "0.101.1" }
-nu-test-support = { path = "../nu-test-support", version = "0.101.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.102.0" }
+nu-command = { path = "../nu-command", version = "0.102.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.102.0" }
 
 assert-json-diff = "2.0"
 
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index 044cba4076..9615540d71 100644
--- a/crates/nu-parser/Cargo.toml
+++ b/crates/nu-parser/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-parser"
 edition = "2021"
 license = "MIT"
 name = "nu-parser"
-version = "0.101.1"
+version = "0.102.0"
 exclude = ["/fuzz"]
 
 [lib]
@@ -15,11 +15,11 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.101.1", default-features = false }
-nu-path = { path = "../nu-path", version = "0.101.1" }
-nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.101.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.1", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.101.1", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.102.0", default-features = false }
+nu-path = { path = "../nu-path", version = "0.102.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.102.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.102.0", default-features = false }
 
 bytesize = { workspace = true }
 chrono = { default-features = false, features = ['std'], workspace = true }
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index ad64a0a4aa..d519df099d 100644
--- a/crates/nu-path/Cargo.toml
+++ b/crates/nu-path/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-path"
 edition = "2021"
 license = "MIT"
 name = "nu-path"
-version = "0.101.1"
+version = "0.102.0"
 exclude = ["/fuzz"]
 
 [lib]
diff --git a/crates/nu-plugin-core/Cargo.toml b/crates/nu-plugin-core/Cargo.toml
index 04c2101464..1fd01297f3 100644
--- a/crates/nu-plugin-core/Cargo.toml
+++ b/crates/nu-plugin-core/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-core
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-core"
-version = "0.101.1"
+version = "0.102.0"
 
 [lib]
 bench = false
@@ -14,8 +14,8 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.101.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.101.1", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.102.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.102.0", default-features = false }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true }
diff --git a/crates/nu-plugin-engine/Cargo.toml b/crates/nu-plugin-engine/Cargo.toml
index 3971ebac62..ba82b2453b 100644
--- a/crates/nu-plugin-engine/Cargo.toml
+++ b/crates/nu-plugin-engine/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-engi
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-engine"
-version = "0.101.1"
+version = "0.102.0"
 
 [lib]
 bench = false
@@ -14,12 +14,12 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.101.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.1" }
-nu-system = { path = "../nu-system", version = "0.101.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.101.1" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.101.1", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.101.1" }
+nu-engine = { path = "../nu-engine", version = "0.102.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.0" }
+nu-system = { path = "../nu-system", version = "0.102.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.102.0" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.102.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.102.0" }
 
 serde = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-plugin-protocol/Cargo.toml b/crates/nu-plugin-protocol/Cargo.toml
index 54e0f567ac..a53328f908 100644
--- a/crates/nu-plugin-protocol/Cargo.toml
+++ b/crates/nu-plugin-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-prot
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-protocol"
-version = "0.101.1"
+version = "0.102.0"
 
 [lib]
 bench = false
@@ -14,8 +14,8 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.101.1", features = ["plugin"] }
-nu-utils = { path = "../nu-utils", version = "0.101.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.0", features = ["plugin"] }
+nu-utils = { path = "../nu-utils", version = "0.102.0" }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
diff --git a/crates/nu-plugin-test-support/Cargo.toml b/crates/nu-plugin-test-support/Cargo.toml
index 8e220af0ce..54f2992102 100644
--- a/crates/nu-plugin-test-support/Cargo.toml
+++ b/crates/nu-plugin-test-support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-plugin-test-support"
-version = "0.101.1"
+version = "0.102.0"
 edition = "2021"
 license = "MIT"
 description = "Testing support for Nushell plugins"
@@ -15,14 +15,14 @@ workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.101.1", features = ["plugin"] }
-nu-protocol = { path = "../nu-protocol", version = "0.101.1", features = ["plugin"] }
-nu-parser = { path = "../nu-parser", version = "0.101.1", features = ["plugin"] }
-nu-plugin = { path = "../nu-plugin", version = "0.101.1" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.101.1" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.101.1" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.101.1" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.1" }
+nu-engine = { path = "../nu-engine", version = "0.102.0", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.102.0", features = ["plugin"] }
+nu-parser = { path = "../nu-parser", version = "0.102.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.102.0" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.102.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.102.0" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.102.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.102.0" }
 nu-ansi-term = { workspace = true }
 similar = "2.7"
 
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index f8dd8bef9c..7f8986aad0 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin"
 edition = "2021"
 license = "MIT"
 name = "nu-plugin"
-version = "0.101.1"
+version = "0.102.0"
 
 [lib]
 bench = false
@@ -14,11 +14,11 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.101.1", features = ["plugin"] }
-nu-protocol = { path = "../nu-protocol", version = "0.101.1", features = ["plugin"] }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.101.1" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.101.1", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.101.1" }
+nu-engine = { path = "../nu-engine", version = "0.102.0", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.102.0", features = ["plugin"] }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.102.0" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.102.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.102.0" }
 
 log = { workspace = true }
 thiserror = "2.0"
diff --git a/crates/nu-pretty-hex/Cargo.toml b/crates/nu-pretty-hex/Cargo.toml
index 27b6ca4b7a..3bd0627154 100644
--- a/crates/nu-pretty-hex/Cargo.toml
+++ b/crates/nu-pretty-hex/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-pretty-hex"
 edition = "2021"
 license = "MIT"
 name = "nu-pretty-hex"
-version = "0.101.1"
+version = "0.102.0"
 
 [lib]
 doctest = false
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 384b677d1b..747b780c8e 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-protocol"
 edition = "2021"
 license = "MIT"
 name = "nu-protocol"
-version = "0.101.1"
+version = "0.102.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,10 +16,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.101.1", default-features = false }
-nu-path = { path = "../nu-path", version = "0.101.1" }
-nu-system = { path = "../nu-system", version = "0.101.1" }
-nu-derive-value = { path = "../nu-derive-value", version = "0.101.1" }
+nu-utils = { path = "../nu-utils", version = "0.102.0", default-features = false }
+nu-path = { path = "../nu-path", version = "0.102.0" }
+nu-system = { path = "../nu-system", version = "0.102.0" }
+nu-derive-value = { path = "../nu-derive-value", version = "0.102.0" }
 
 brotli = { workspace = true, optional = true }
 bytes = { workspace = true }
@@ -66,8 +66,8 @@ plugin = [
 serde_json = { workspace = true }
 strum = "0.26"
 strum_macros = "0.26"
-nu-test-support = { path = "../nu-test-support", version = "0.101.1" }
-nu-utils = { path = "../nu-utils", version = "0.101.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.102.0" }
+nu-utils = { path = "../nu-utils", version = "0.102.0" }
 pretty_assertions = { workspace = true }
 rstest = { workspace = true }
 tempfile = { workspace = true }
diff --git a/crates/nu-std/Cargo.toml b/crates/nu-std/Cargo.toml
index 1c557c99b7..afde326426 100644
--- a/crates/nu-std/Cargo.toml
+++ b/crates/nu-std/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-std"
 edition = "2021"
 license = "MIT"
 name = "nu-std"
-version = "0.101.1"
+version = "0.102.0"
 
 [dependencies]
-nu-parser = { version = "0.101.1", path = "../nu-parser" }
-nu-protocol = { version = "0.101.1", path = "../nu-protocol", default-features = false }
-nu-engine = { version = "0.101.1", path = "../nu-engine", default-features = false }
+nu-parser = { version = "0.102.0", path = "../nu-parser" }
+nu-protocol = { version = "0.102.0", path = "../nu-protocol", default-features = false }
+nu-engine = { version = "0.102.0", path = "../nu-engine", default-features = false }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
 
 log = "0.4"
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index c1134e9796..c15e9cca1e 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["The Nushell Project Developers", "procs creators"]
 description = "Nushell system querying"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-system"
 name = "nu-system"
-version = "0.101.1"
+version = "0.102.0"
 edition = "2021"
 license = "MIT"
 
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index e20c38ca77..ac84fa2e53 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-table"
 edition = "2021"
 license = "MIT"
 name = "nu-table"
-version = "0.101.1"
+version = "0.102.0"
 
 [lib]
 bench = false
@@ -14,13 +14,13 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.101.1", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.101.1", default-features = false }
-nu-engine = { path = "../nu-engine", version = "0.101.1", default-features = false }
-nu-color-config = { path = "../nu-color-config", version = "0.101.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.102.0", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.102.0", default-features = false }
+nu-color-config = { path = "../nu-color-config", version = "0.102.0" }
 nu-ansi-term = { workspace = true }
 fancy-regex = { workspace = true }
 tabled = { workspace = true, features = ["ansi"], default-features = false }
 
 [dev-dependencies]
-# nu-test-support = { path="../nu-test-support", version = "0.101.1"  }
\ No newline at end of file
+# nu-test-support = { path="../nu-test-support", version = "0.102.0"  }
\ No newline at end of file
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index ea88eb78d7..eef695f808 100644
--- a/crates/nu-term-grid/Cargo.toml
+++ b/crates/nu-term-grid/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-term-grid"
 edition = "2021"
 license = "MIT"
 name = "nu-term-grid"
-version = "0.101.1"
+version = "0.102.0"
 
 [lib]
 bench = false
@@ -14,6 +14,6 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.101.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.102.0", default-features = false }
 
 unicode-width = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml
index 2f4c085aa0..fb8dcb7a88 100644
--- a/crates/nu-test-support/Cargo.toml
+++ b/crates/nu-test-support/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-test-suppor
 edition = "2021"
 license = "MIT"
 name = "nu-test-support"
-version = "0.101.1"
+version = "0.102.0"
 
 [lib]
 doctest = false
@@ -15,9 +15,9 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-path = { path = "../nu-path", version = "0.101.1" }
-nu-glob = { path = "../nu-glob", version = "0.101.1" }
-nu-utils = { path = "../nu-utils", version = "0.101.1" }
+nu-path = { path = "../nu-path", version = "0.102.0" }
+nu-glob = { path = "../nu-glob", version = "0.102.0" }
+nu-utils = { path = "../nu-utils", version = "0.102.0" }
 
 num-format = { workspace = true }
 which = { workspace = true }
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index 7dbda5d7e6..163408cb10 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-utils"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-utils"
-version = "0.101.1"
+version = "0.102.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
diff --git a/crates/nu-utils/src/default_files/default_config.nu b/crates/nu-utils/src/default_files/default_config.nu
index 81845d23a9..e63f32ca9f 100644
--- a/crates/nu-utils/src/default_files/default_config.nu
+++ b/crates/nu-utils/src/default_files/default_config.nu
@@ -1,6 +1,6 @@
 # Nushell Config File
 #
-# version = "0.101.1"
+# version = "0.102.0"
 $env.config.color_config = {
     separator: white
     leading_trailing_space_bg: { attr: n }
diff --git a/crates/nu-utils/src/default_files/default_env.nu b/crates/nu-utils/src/default_files/default_env.nu
index 8ab8dfcd81..f2a6d5d74a 100644
--- a/crates/nu-utils/src/default_files/default_env.nu
+++ b/crates/nu-utils/src/default_files/default_env.nu
@@ -1,7 +1,7 @@
 # Default Nushell Environment Config File
 # These "sensible defaults" are set before the user's `env.nu` is loaded
 #
-# version = "0.101.1"
+# version = "0.102.0"
 
 $env.PROMPT_COMMAND = $env.PROMPT_COMMAND? | default {||
     let dir = match (do -i { $env.PWD | path relative-to $nu.home-path }) {
diff --git a/crates/nu-utils/src/default_files/doc_config.nu b/crates/nu-utils/src/default_files/doc_config.nu
index 1a2443960f..78e6e72557 100644
--- a/crates/nu-utils/src/default_files/doc_config.nu
+++ b/crates/nu-utils/src/default_files/doc_config.nu
@@ -3,7 +3,7 @@
 # Warning: This file is intended for documentation purposes only and
 # is not intended to be used as an actual configuration file as-is.
 #
-# version = "0.101.1"
+# version = "0.102.0"
 #
 # A `config.nu` file is used to override default Nushell settings,
 # define (or import) custom commands, or run any other startup tasks.
diff --git a/crates/nu-utils/src/default_files/doc_env.nu b/crates/nu-utils/src/default_files/doc_env.nu
index 0e0f4932af..af840ff914 100644
--- a/crates/nu-utils/src/default_files/doc_env.nu
+++ b/crates/nu-utils/src/default_files/doc_env.nu
@@ -1,6 +1,6 @@
 # Nushell Environment Config File Documentation
 #
-# version = "0.101.1"
+# version = "0.102.0"
 #
 # Previously, environment variables were typically configured in `env.nu`.
 # In general, most configuration can and should be performed in `config.nu`
diff --git a/crates/nu-utils/src/default_files/scaffold_config.nu b/crates/nu-utils/src/default_files/scaffold_config.nu
index 3b6f92cfc1..a9b3da179d 100644
--- a/crates/nu-utils/src/default_files/scaffold_config.nu
+++ b/crates/nu-utils/src/default_files/scaffold_config.nu
@@ -1,7 +1,7 @@
 # config.nu
 #
 # Installed by:
-# version = "0.101.1"
+# version = "0.102.0"
 #
 # This file is used to override default Nushell settings, define
 # (or import) custom commands, or run any other startup tasks.
diff --git a/crates/nu-utils/src/default_files/scaffold_env.nu b/crates/nu-utils/src/default_files/scaffold_env.nu
index 9ebc7fad11..b45964260e 100644
--- a/crates/nu-utils/src/default_files/scaffold_env.nu
+++ b/crates/nu-utils/src/default_files/scaffold_env.nu
@@ -1,7 +1,7 @@
 # env.nu
 #
 # Installed by:
-# version = "0.101.1"
+# version = "0.102.0"
 #
 # Previously, environment variables were typically configured in `env.nu`.
 # In general, most configuration can and should be performed in `config.nu`
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index 55d78441a4..93b346e337 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -10,10 +10,10 @@ name = "nu_plugin_custom_values"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.101.1", features = [] }
-nu-protocol = { path = "../nu-protocol", version = "0.101.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.102.0", features = [] }
+nu-protocol = { path = "../nu-protocol", version = "0.102.0", features = ["plugin"] }
 serde = { workspace = true }
 typetag = "0.2"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.101.1" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.102.0" }
\ No newline at end of file
diff --git a/crates/nu_plugin_example/Cargo.toml b/crates/nu_plugin_example/Cargo.toml
index a783b71b1a..4e6f12f8c6 100644
--- a/crates/nu_plugin_example/Cargo.toml
+++ b/crates/nu_plugin_example/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_exam
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_example"
-version = "0.101.1"
+version = "0.102.0"
 
 [[bin]]
 name = "nu_plugin_example"
@@ -15,9 +15,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.101.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.102.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.0", features = ["plugin"] }
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.101.1" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.1" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.102.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.102.0" }
\ No newline at end of file
diff --git a/crates/nu_plugin_formats/Cargo.toml b/crates/nu_plugin_formats/Cargo.toml
index 05c70c400a..5dafae929f 100644
--- a/crates/nu_plugin_formats/Cargo.toml
+++ b/crates/nu_plugin_formats/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_form
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_formats"
-version = "0.101.1"
+version = "0.102.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.101.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.102.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.0", features = ["plugin"] }
 
 indexmap = { workspace = true }
 eml-parser = "0.1"
@@ -20,4 +20,4 @@ plist = "1.7"
 chrono = "0.4"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.101.1" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.102.0" }
\ No newline at end of file
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index 6bfeea838b..92812fe612 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gsta
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_gstat"
-version = "0.101.1"
+version = "0.102.0"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_gstat"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.101.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.102.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.0" }
 
 git2 = "0.20"
\ No newline at end of file
diff --git a/crates/nu_plugin_inc/Cargo.toml b/crates/nu_plugin_inc/Cargo.toml
index c99afbb5e4..63517ac95e 100644
--- a/crates/nu_plugin_inc/Cargo.toml
+++ b/crates/nu_plugin_inc/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_inc"
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_inc"
-version = "0.101.1"
+version = "0.102.0"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_inc"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.101.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.102.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.0", features = ["plugin"] }
 
 semver = "1.0"
\ No newline at end of file
diff --git a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
index 680b31f0f5..2c6ff4414c 100755
--- a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
+++ b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
@@ -6,7 +6,7 @@
 # it also allows us to test the plugin interface with something manually implemented in a scripting
 # language without adding any extra dependencies to our tests.
 
-const NUSHELL_VERSION = "0.101.1"
+const NUSHELL_VERSION = "0.102.0"
 const PLUGIN_VERSION = "0.1.1" # bump if you change commands!
 
 def main [--stdio] {
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 971e25ec22..527f85069d 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu_plugin_polars"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_polars"
-version = "0.101.1"
+version = "0.102.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -17,10 +17,10 @@ bench = false
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.101.1" }
-nu-plugin = { path = "../nu-plugin", version = "0.101.1" }
-nu-path = { path = "../nu-path", version = "0.101.1" }
-nu-utils = { path = "../nu-utils", version = "0.101.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.0" }
+nu-plugin = { path = "../nu-plugin", version = "0.102.0" }
+nu-path = { path = "../nu-path", version = "0.102.0" }
+nu-utils = { path = "../nu-utils", version = "0.102.0" }
 
 # Potential dependencies for extras
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
@@ -93,9 +93,9 @@ optional = false
 version = "0.46"
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.101.1" }
-nu-engine = { path = "../nu-engine", version = "0.101.1" }
-nu-parser = { path = "../nu-parser", version = "0.101.1" }
-nu-command = { path = "../nu-command", version = "0.101.1" }
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.101.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.102.0" }
+nu-engine = { path = "../nu-engine", version = "0.102.0" }
+nu-parser = { path = "../nu-parser", version = "0.102.0" }
+nu-command = { path = "../nu-command", version = "0.102.0" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.102.0" }
 tempfile.workspace = true
diff --git a/crates/nu_plugin_python/nu_plugin_python_example.py b/crates/nu_plugin_python/nu_plugin_python_example.py
index 87660da8cc..5b42696159 100755
--- a/crates/nu_plugin_python/nu_plugin_python_example.py
+++ b/crates/nu_plugin_python/nu_plugin_python_example.py
@@ -27,7 +27,7 @@ import sys
 import json
 
 
-NUSHELL_VERSION = "0.101.1"
+NUSHELL_VERSION = "0.102.0"
 PLUGIN_VERSION = "0.1.1"  # bump if you change commands!
 
 
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index 924d260112..38ba5c8f16 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_quer
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_query"
-version = "0.101.1"
+version = "0.102.0"
 
 [lib]
 doctest = false
@@ -16,8 +16,8 @@ name = "nu_plugin_query"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.101.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.102.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.0" }
 
 gjson = "0.8"
 scraper = { default-features = false, version = "0.22" }
diff --git a/crates/nu_plugin_stress_internals/Cargo.toml b/crates/nu_plugin_stress_internals/Cargo.toml
index 5236e2a659..ef6ba5ce99 100644
--- a/crates/nu_plugin_stress_internals/Cargo.toml
+++ b/crates/nu_plugin_stress_internals/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_stre
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_stress_internals"
-version = "0.101.1"
+version = "0.102.0"
 
 [[bin]]
 name = "nu_plugin_stress_internals"
diff --git a/crates/nuon/Cargo.toml b/crates/nuon/Cargo.toml
index e7686aefde..d32101efea 100644
--- a/crates/nuon/Cargo.toml
+++ b/crates/nuon/Cargo.toml
@@ -5,15 +5,15 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nuon"
 edition = "2021"
 license = "MIT"
 name = "nuon"
-version = "0.101.1"
+version = "0.102.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-parser = { path = "../nu-parser", version = "0.101.1" }
-nu-protocol = { path = "../nu-protocol", version = "0.101.1", default-features = false }
-nu-engine = { path = "../nu-engine", version = "0.101.1", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.101.1", default-features = false }
+nu-parser = { path = "../nu-parser", version = "0.102.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.0", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.102.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.102.0", default-features = false }
 
 [dev-dependencies]
 chrono = { workspace = true }

From 803a348f41d3f39aea67349d75be9ab4303c0693 Mon Sep 17 00:00:00 2001
From: Yash Thakur <45539777+ysthakur@users.noreply.github.com>
Date: Wed, 5 Feb 2025 00:19:48 -0500
Subject: [PATCH 0996/1072] Bump to 0.102.1 dev version (#15012)

---
 Cargo.lock                                    | 74 +++++++++----------
 Cargo.toml                                    | 40 +++++-----
 crates/nu-cli/Cargo.toml                      | 26 +++----
 crates/nu-cmd-base/Cargo.toml                 | 10 +--
 crates/nu-cmd-extra/Cargo.toml                | 22 +++---
 crates/nu-cmd-lang/Cargo.toml                 | 10 +--
 crates/nu-cmd-plugin/Cargo.toml               | 10 +--
 crates/nu-color-config/Cargo.toml             | 10 +--
 crates/nu-command/Cargo.toml                  | 34 ++++-----
 crates/nu-derive-value/Cargo.toml             |  2 +-
 crates/nu-engine/Cargo.toml                   | 10 +--
 crates/nu-explore/Cargo.toml                  | 20 ++---
 crates/nu-glob/Cargo.toml                     |  2 +-
 crates/nu-json/Cargo.toml                     |  6 +-
 crates/nu-lsp/Cargo.toml                      | 16 ++--
 crates/nu-parser/Cargo.toml                   | 12 +--
 crates/nu-path/Cargo.toml                     |  2 +-
 crates/nu-plugin-core/Cargo.toml              |  6 +-
 crates/nu-plugin-engine/Cargo.toml            | 14 ++--
 crates/nu-plugin-protocol/Cargo.toml          |  6 +-
 crates/nu-plugin-test-support/Cargo.toml      | 18 ++---
 crates/nu-plugin/Cargo.toml                   | 12 +--
 crates/nu-pretty-hex/Cargo.toml               |  2 +-
 crates/nu-protocol/Cargo.toml                 | 14 ++--
 crates/nu-std/Cargo.toml                      |  8 +-
 crates/nu-system/Cargo.toml                   |  2 +-
 crates/nu-table/Cargo.toml                    | 12 +--
 crates/nu-term-grid/Cargo.toml                |  4 +-
 crates/nu-test-support/Cargo.toml             |  8 +-
 crates/nu-utils/Cargo.toml                    |  2 +-
 .../src/default_files/default_config.nu       |  2 +-
 .../nu-utils/src/default_files/default_env.nu |  2 +-
 .../nu-utils/src/default_files/doc_config.nu  |  2 +-
 crates/nu-utils/src/default_files/doc_env.nu  |  2 +-
 .../src/default_files/scaffold_config.nu      |  2 +-
 .../src/default_files/scaffold_env.nu         |  2 +-
 crates/nu_plugin_custom_values/Cargo.toml     |  6 +-
 crates/nu_plugin_example/Cargo.toml           | 10 +--
 crates/nu_plugin_formats/Cargo.toml           |  8 +-
 crates/nu_plugin_gstat/Cargo.toml             |  6 +-
 crates/nu_plugin_inc/Cargo.toml               |  6 +-
 .../nu_plugin_nu_example.nu                   |  2 +-
 crates/nu_plugin_polars/Cargo.toml            | 20 ++---
 .../nu_plugin_python_example.py               |  2 +-
 crates/nu_plugin_query/Cargo.toml             |  6 +-
 crates/nu_plugin_stress_internals/Cargo.toml  |  2 +-
 crates/nuon/Cargo.toml                        | 10 +--
 47 files changed, 252 insertions(+), 252 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ec0ed8ae78..7fc0e18689 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3435,7 +3435,7 @@ dependencies = [
 
 [[package]]
 name = "nu"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "assert_cmd",
  "crossterm 0.28.1",
@@ -3490,7 +3490,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cli"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "chrono",
  "crossterm 0.28.1",
@@ -3525,7 +3525,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-base"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "indexmap",
  "miette",
@@ -3537,7 +3537,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-extra"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "fancy-regex",
  "heck",
@@ -3563,7 +3563,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-lang"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "itertools 0.13.0",
  "nu-engine",
@@ -3575,7 +3575,7 @@ dependencies = [
 
 [[package]]
 name = "nu-cmd-plugin"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "itertools 0.13.0",
  "nu-engine",
@@ -3586,7 +3586,7 @@ dependencies = [
 
 [[package]]
 name = "nu-color-config"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "nu-ansi-term",
  "nu-engine",
@@ -3598,7 +3598,7 @@ dependencies = [
 
 [[package]]
 name = "nu-command"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "alphanumeric-sort",
  "base64 0.22.1",
@@ -3713,7 +3713,7 @@ dependencies = [
 
 [[package]]
 name = "nu-derive-value"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -3724,7 +3724,7 @@ dependencies = [
 
 [[package]]
 name = "nu-engine"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "log",
  "nu-glob",
@@ -3735,7 +3735,7 @@ dependencies = [
 
 [[package]]
 name = "nu-explore"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "ansi-str",
  "anyhow",
@@ -3759,14 +3759,14 @@ dependencies = [
 
 [[package]]
 name = "nu-glob"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "doc-comment",
 ]
 
 [[package]]
 name = "nu-json"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "fancy-regex",
  "linked-hash-map",
@@ -3779,7 +3779,7 @@ dependencies = [
 
 [[package]]
 name = "nu-lsp"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "assert-json-diff",
  "crossbeam-channel",
@@ -3802,7 +3802,7 @@ dependencies = [
 
 [[package]]
 name = "nu-parser"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "bytesize",
  "chrono",
@@ -3819,7 +3819,7 @@ dependencies = [
 
 [[package]]
 name = "nu-path"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "dirs",
  "omnipath",
@@ -3829,7 +3829,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "log",
  "nix 0.29.0",
@@ -3845,7 +3845,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-core"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "interprocess",
  "log",
@@ -3859,7 +3859,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-engine"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "log",
  "nu-engine",
@@ -3875,7 +3875,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-protocol"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "nu-protocol",
  "nu-utils",
@@ -3887,7 +3887,7 @@ dependencies = [
 
 [[package]]
 name = "nu-plugin-test-support"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "nu-ansi-term",
  "nu-cmd-lang",
@@ -3905,7 +3905,7 @@ dependencies = [
 
 [[package]]
 name = "nu-pretty-hex"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "heapless",
  "nu-ansi-term",
@@ -3914,7 +3914,7 @@ dependencies = [
 
 [[package]]
 name = "nu-protocol"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "brotli",
  "bytes",
@@ -3953,7 +3953,7 @@ dependencies = [
 
 [[package]]
 name = "nu-std"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "log",
  "miette",
@@ -3964,7 +3964,7 @@ dependencies = [
 
 [[package]]
 name = "nu-system"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "chrono",
  "itertools 0.13.0",
@@ -3982,7 +3982,7 @@ dependencies = [
 
 [[package]]
 name = "nu-table"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "fancy-regex",
  "nu-ansi-term",
@@ -3995,7 +3995,7 @@ dependencies = [
 
 [[package]]
 name = "nu-term-grid"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "nu-utils",
  "unicode-width 0.2.0",
@@ -4003,7 +4003,7 @@ dependencies = [
 
 [[package]]
 name = "nu-test-support"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "nu-glob",
  "nu-path",
@@ -4015,7 +4015,7 @@ dependencies = [
 
 [[package]]
 name = "nu-utils"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "crossterm 0.28.1",
  "crossterm_winapi",
@@ -4044,7 +4044,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_example"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "nu-cmd-lang",
  "nu-plugin",
@@ -4054,7 +4054,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_formats"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "chrono",
  "eml-parser",
@@ -4069,7 +4069,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_gstat"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "git2",
  "nu-plugin",
@@ -4078,7 +4078,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_inc"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "nu-plugin",
  "nu-protocol",
@@ -4087,7 +4087,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_polars"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "aws-config",
  "aws-credential-types",
@@ -4127,7 +4127,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_query"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "gjson",
  "nu-plugin",
@@ -4142,7 +4142,7 @@ dependencies = [
 
 [[package]]
 name = "nu_plugin_stress_internals"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "interprocess",
  "serde",
@@ -4266,7 +4266,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "nuon"
-version = "0.102.0"
+version = "0.102.1"
 dependencies = [
  "chrono",
  "nu-engine",
diff --git a/Cargo.toml b/Cargo.toml
index 03501dbe8a..f96c0a8950 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
 rust-version = "1.82.0"
-version = "0.102.0"
+version = "0.102.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -195,22 +195,22 @@ unchecked_duration_subtraction = "warn"
 workspace = true
 
 [dependencies]
-nu-cli = { path = "./crates/nu-cli", version = "0.102.0" }
-nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.102.0" }
-nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.102.0" }
-nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.102.0", optional = true }
-nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.102.0" }
-nu-command = { path = "./crates/nu-command", version = "0.102.0" }
-nu-engine = { path = "./crates/nu-engine", version = "0.102.0" }
-nu-explore = { path = "./crates/nu-explore", version = "0.102.0" }
-nu-lsp = { path = "./crates/nu-lsp/", version = "0.102.0" }
-nu-parser = { path = "./crates/nu-parser", version = "0.102.0" }
-nu-path = { path = "./crates/nu-path", version = "0.102.0" }
-nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.102.0" }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.102.0" }
-nu-std = { path = "./crates/nu-std", version = "0.102.0" }
-nu-system = { path = "./crates/nu-system", version = "0.102.0" }
-nu-utils = { path = "./crates/nu-utils", version = "0.102.0" }
+nu-cli = { path = "./crates/nu-cli", version = "0.102.1" }
+nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.102.1" }
+nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.102.1" }
+nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.102.1", optional = true }
+nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.102.1" }
+nu-command = { path = "./crates/nu-command", version = "0.102.1" }
+nu-engine = { path = "./crates/nu-engine", version = "0.102.1" }
+nu-explore = { path = "./crates/nu-explore", version = "0.102.1" }
+nu-lsp = { path = "./crates/nu-lsp/", version = "0.102.1" }
+nu-parser = { path = "./crates/nu-parser", version = "0.102.1" }
+nu-path = { path = "./crates/nu-path", version = "0.102.1" }
+nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.102.1" }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.102.1" }
+nu-std = { path = "./crates/nu-std", version = "0.102.1" }
+nu-system = { path = "./crates/nu-system", version = "0.102.1" }
+nu-utils = { path = "./crates/nu-utils", version = "0.102.1" }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
 crossterm = { workspace = true }
@@ -240,9 +240,9 @@ nix = { workspace = true, default-features = false, features = [
 ] }
 
 [dev-dependencies]
-nu-test-support = { path = "./crates/nu-test-support", version = "0.102.0" }
-nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.102.0" }
-nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.102.0" }
+nu-test-support = { path = "./crates/nu-test-support", version = "0.102.1" }
+nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.102.1" }
+nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.102.1" }
 assert_cmd = "2.0"
 dirs = { workspace = true }
 tango-bench = "0.6"
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 3d890c7f28..813b7c5ed7 100644
--- a/crates/nu-cli/Cargo.toml
+++ b/crates/nu-cli/Cargo.toml
@@ -5,28 +5,28 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cli"
 edition = "2021"
 license = "MIT"
 name = "nu-cli"
-version = "0.102.0"
+version = "0.102.1"
 
 [lib]
 bench = false
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.102.0" }
-nu-command = { path = "../nu-command", version = "0.102.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.102.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.102.1" }
+nu-command = { path = "../nu-command", version = "0.102.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.102.1" }
 rstest = { workspace = true, default-features = false }
 tempfile = { workspace = true }
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.102.0" }
-nu-engine = { path = "../nu-engine", version = "0.102.0", features = ["os"] }
-nu-glob = { path = "../nu-glob", version = "0.102.0" }
-nu-path = { path = "../nu-path", version = "0.102.0" }
-nu-parser = { path = "../nu-parser", version = "0.102.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.102.0", optional = true }
-nu-protocol = { path = "../nu-protocol", version = "0.102.0", features = ["os"] }
-nu-utils = { path = "../nu-utils", version = "0.102.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.102.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.102.1" }
+nu-engine = { path = "../nu-engine", version = "0.102.1", features = ["os"] }
+nu-glob = { path = "../nu-glob", version = "0.102.1" }
+nu-path = { path = "../nu-path", version = "0.102.1" }
+nu-parser = { path = "../nu-parser", version = "0.102.1" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.102.1", optional = true }
+nu-protocol = { path = "../nu-protocol", version = "0.102.1", features = ["os"] }
+nu-utils = { path = "../nu-utils", version = "0.102.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.102.1" }
 nu-ansi-term = { workspace = true }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
diff --git a/crates/nu-cmd-base/Cargo.toml b/crates/nu-cmd-base/Cargo.toml
index 5ec2246955..fa73f6d015 100644
--- a/crates/nu-cmd-base/Cargo.toml
+++ b/crates/nu-cmd-base/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-base"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-base"
-version = "0.102.0"
+version = "0.102.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,10 +13,10 @@ version = "0.102.0"
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.102.0", default-features = false }
-nu-parser = { path = "../nu-parser", version = "0.102.0" }
-nu-path = { path = "../nu-path", version = "0.102.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.102.0", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.102.1", default-features = false }
+nu-parser = { path = "../nu-parser", version = "0.102.1" }
+nu-path = { path = "../nu-path", version = "0.102.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.1", default-features = false }
 
 indexmap = { workspace = true }
 miette = { workspace = true }
diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml
index 18a29f69c7..6fa95a3949 100644
--- a/crates/nu-cmd-extra/Cargo.toml
+++ b/crates/nu-cmd-extra/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-extra"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-extra"
-version = "0.102.0"
+version = "0.102.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,13 +16,13 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.102.0" }
-nu-engine = { path = "../nu-engine", version = "0.102.0", default-features = false }
-nu-json = { version = "0.102.0", path = "../nu-json" }
-nu-parser = { path = "../nu-parser", version = "0.102.0" }
-nu-pretty-hex = { version = "0.102.0", path = "../nu-pretty-hex" }
-nu-protocol = { path = "../nu-protocol", version = "0.102.0", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.102.0", default-features = false }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.102.1" }
+nu-engine = { path = "../nu-engine", version = "0.102.1", default-features = false }
+nu-json = { version = "0.102.1", path = "../nu-json" }
+nu-parser = { path = "../nu-parser", version = "0.102.1" }
+nu-pretty-hex = { version = "0.102.1", path = "../nu-pretty-hex" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.102.1", default-features = false }
 
 # Potential dependencies for extras
 heck = { workspace = true }
@@ -37,6 +37,6 @@ itertools = { workspace = true }
 mime = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.102.0" }
-nu-command = { path = "../nu-command", version = "0.102.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.102.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.102.1" }
+nu-command = { path = "../nu-command", version = "0.102.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.102.1" }
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index 5cfe6f8491..0cf277bb82 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -6,7 +6,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-lang"
 edition = "2021"
 license = "MIT"
 name = "nu-cmd-lang"
-version = "0.102.0"
+version = "0.102.1"
 
 [lib]
 bench = false
@@ -15,10 +15,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.102.0", default-features = false }
-nu-parser = { path = "../nu-parser", version = "0.102.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.102.0", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.102.0", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.102.1", default-features = false }
+nu-parser = { path = "../nu-parser", version = "0.102.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.102.1", default-features = false }
 
 itertools = { workspace = true }
 shadow-rs = { version = "0.38", default-features = false }
diff --git a/crates/nu-cmd-plugin/Cargo.toml b/crates/nu-cmd-plugin/Cargo.toml
index 88eb78d381..3618a6a584 100644
--- a/crates/nu-cmd-plugin/Cargo.toml
+++ b/crates/nu-cmd-plugin/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-plugin"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-plugin"
-version = "0.102.0"
+version = "0.102.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,10 +13,10 @@ version = "0.102.0"
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.102.0" }
-nu-path = { path = "../nu-path", version = "0.102.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.102.0", features = ["plugin"] }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.102.0" }
+nu-engine = { path = "../nu-engine", version = "0.102.1" }
+nu-path = { path = "../nu-path", version = "0.102.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.1", features = ["plugin"] }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.102.1" }
 
 itertools = { workspace = true }
 
diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml
index ea346db7d7..4702443b00 100644
--- a/crates/nu-color-config/Cargo.toml
+++ b/crates/nu-color-config/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-color-confi
 edition = "2021"
 license = "MIT"
 name = "nu-color-config"
-version = "0.102.0"
+version = "0.102.1"
 
 [lib]
 bench = false
@@ -14,12 +14,12 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.102.0", default-features = false }
-nu-engine = { path = "../nu-engine", version = "0.102.0", default-features = false }
-nu-json = { path = "../nu-json", version = "0.102.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.1", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.102.1", default-features = false }
+nu-json = { path = "../nu-json", version = "0.102.1" }
 nu-ansi-term = { workspace = true }
 
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.102.0" }
\ No newline at end of file
+nu-test-support = { path = "../nu-test-support", version = "0.102.1" }
\ No newline at end of file
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 2ce7c7a8f0..12f197798d 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-command"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
-version = "0.102.0"
+version = "0.102.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,21 +16,21 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.102.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.102.0" }
-nu-engine = { path = "../nu-engine", version = "0.102.0", default-features = false }
-nu-glob = { path = "../nu-glob", version = "0.102.0" }
-nu-json = { path = "../nu-json", version = "0.102.0" }
-nu-parser = { path = "../nu-parser", version = "0.102.0" }
-nu-path = { path = "../nu-path", version = "0.102.0" }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.102.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.102.0", default-features = false }
-nu-system = { path = "../nu-system", version = "0.102.0" }
-nu-table = { path = "../nu-table", version = "0.102.0" }
-nu-term-grid = { path = "../nu-term-grid", version = "0.102.0" }
-nu-utils = { path = "../nu-utils", version = "0.102.0", default-features = false }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.102.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.102.1" }
+nu-engine = { path = "../nu-engine", version = "0.102.1", default-features = false }
+nu-glob = { path = "../nu-glob", version = "0.102.1" }
+nu-json = { path = "../nu-json", version = "0.102.1" }
+nu-parser = { path = "../nu-parser", version = "0.102.1" }
+nu-path = { path = "../nu-path", version = "0.102.1" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.102.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.1", default-features = false }
+nu-system = { path = "../nu-system", version = "0.102.1" }
+nu-table = { path = "../nu-table", version = "0.102.1" }
+nu-term-grid = { path = "../nu-term-grid", version = "0.102.1" }
+nu-utils = { path = "../nu-utils", version = "0.102.1", default-features = false }
 nu-ansi-term = { workspace = true }
-nuon = { path = "../nuon", version = "0.102.0" }
+nuon = { path = "../nuon", version = "0.102.1" }
 
 alphanumeric-sort = { workspace = true }
 base64 = { workspace = true }
@@ -190,8 +190,8 @@ sqlite = ["rusqlite"]
 trash-support = ["trash"]
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.102.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.102.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.102.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.102.1" }
 
 dirs = { workspace = true }
 mockito = { workspace = true, default-features = false }
diff --git a/crates/nu-derive-value/Cargo.toml b/crates/nu-derive-value/Cargo.toml
index b563f8c3ea..8a6b2ce9da 100644
--- a/crates/nu-derive-value/Cargo.toml
+++ b/crates/nu-derive-value/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-derive-value"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-derive-value"
-version = "0.102.0"
+version = "0.102.1"
 
 [lib]
 proc-macro = true
diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml
index b16628ce19..39ff1e4954 100644
--- a/crates/nu-engine/Cargo.toml
+++ b/crates/nu-engine/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-engine"
 edition = "2021"
 license = "MIT"
 name = "nu-engine"
-version = "0.102.0"
+version = "0.102.1"
 
 [lib]
 bench = false
@@ -14,10 +14,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.102.0", default-features = false }
-nu-path = { path = "../nu-path", version = "0.102.0" }
-nu-glob = { path = "../nu-glob", version = "0.102.0" }
-nu-utils = { path = "../nu-utils", version = "0.102.0", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.102.1", default-features = false }
+nu-path = { path = "../nu-path", version = "0.102.1" }
+nu-glob = { path = "../nu-glob", version = "0.102.1" }
+nu-utils = { path = "../nu-utils", version = "0.102.1", default-features = false }
 log = { workspace = true }
 
 [features]
diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml
index b3ac80c607..bf6f4c8225 100644
--- a/crates/nu-explore/Cargo.toml
+++ b/crates/nu-explore/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-explore"
 edition = "2021"
 license = "MIT"
 name = "nu-explore"
-version = "0.102.0"
+version = "0.102.1"
 
 [lib]
 bench = false
@@ -14,16 +14,16 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.102.0" }
-nu-parser = { path = "../nu-parser", version = "0.102.0" }
-nu-path = { path = "../nu-path", version = "0.102.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.102.0" }
-nu-engine = { path = "../nu-engine", version = "0.102.0" }
-nu-table = { path = "../nu-table", version = "0.102.0" }
-nu-json = { path = "../nu-json", version = "0.102.0" }
-nu-utils = { path = "../nu-utils", version = "0.102.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.1" }
+nu-parser = { path = "../nu-parser", version = "0.102.1" }
+nu-path = { path = "../nu-path", version = "0.102.1" }
+nu-color-config = { path = "../nu-color-config", version = "0.102.1" }
+nu-engine = { path = "../nu-engine", version = "0.102.1" }
+nu-table = { path = "../nu-table", version = "0.102.1" }
+nu-json = { path = "../nu-json", version = "0.102.1" }
+nu-utils = { path = "../nu-utils", version = "0.102.1" }
 nu-ansi-term = { workspace = true }
-nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.102.0" }
+nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.102.1" }
 
 anyhow = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-glob/Cargo.toml b/crates/nu-glob/Cargo.toml
index 492ee015df..4ca8051930 100644
--- a/crates/nu-glob/Cargo.toml
+++ b/crates/nu-glob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-glob"
-version = "0.102.0"
+version = "0.102.1"
 authors = ["The Nushell Project Developers", "The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 description = """
diff --git a/crates/nu-json/Cargo.toml b/crates/nu-json/Cargo.toml
index c1d7fb2026..92dabeae13 100644
--- a/crates/nu-json/Cargo.toml
+++ b/crates/nu-json/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-json"
 edition = "2021"
 license = "MIT"
 name = "nu-json"
-version = "0.102.0"
+version = "0.102.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -26,8 +26,8 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.102.0" }
-nu-path = { path = "../nu-path", version = "0.102.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.102.1" }
+nu-path = { path = "../nu-path", version = "0.102.1" }
 serde_json = "1.0"
 fancy-regex = "0.14.0"
 
diff --git a/crates/nu-lsp/Cargo.toml b/crates/nu-lsp/Cargo.toml
index a5e1f31a35..e235527056 100644
--- a/crates/nu-lsp/Cargo.toml
+++ b/crates/nu-lsp/Cargo.toml
@@ -3,15 +3,15 @@ authors = ["The Nushell Project Developers"]
 description = "Nushell's integrated LSP server"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-lsp"
 name = "nu-lsp"
-version = "0.102.0"
+version = "0.102.1"
 edition = "2021"
 license = "MIT"
 
 [dependencies]
-nu-cli = { path = "../nu-cli", version = "0.102.0" }
-nu-glob = { path = "../nu-glob", version = "0.102.0" }
-nu-parser = { path = "../nu-parser", version = "0.102.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.102.0" }
+nu-cli = { path = "../nu-cli", version = "0.102.1" }
+nu-glob = { path = "../nu-glob", version = "0.102.1" }
+nu-parser = { path = "../nu-parser", version = "0.102.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.1" }
 
 crossbeam-channel = { workspace = true }
 lsp-server = { workspace = true }
@@ -24,9 +24,9 @@ serde_json = { workspace = true }
 url = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.102.0" }
-nu-command = { path = "../nu-command", version = "0.102.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.102.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.102.1" }
+nu-command = { path = "../nu-command", version = "0.102.1" }
+nu-test-support = { path = "../nu-test-support", version = "0.102.1" }
 
 assert-json-diff = "2.0"
 
diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml
index 9615540d71..967d610444 100644
--- a/crates/nu-parser/Cargo.toml
+++ b/crates/nu-parser/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-parser"
 edition = "2021"
 license = "MIT"
 name = "nu-parser"
-version = "0.102.0"
+version = "0.102.1"
 exclude = ["/fuzz"]
 
 [lib]
@@ -15,11 +15,11 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.102.0", default-features = false }
-nu-path = { path = "../nu-path", version = "0.102.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.102.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.102.0", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.102.0", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.102.1", default-features = false }
+nu-path = { path = "../nu-path", version = "0.102.1" }
+nu-plugin-engine = { path = "../nu-plugin-engine", optional = true, version = "0.102.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.102.1", default-features = false }
 
 bytesize = { workspace = true }
 chrono = { default-features = false, features = ['std'], workspace = true }
diff --git a/crates/nu-path/Cargo.toml b/crates/nu-path/Cargo.toml
index d519df099d..33199de15a 100644
--- a/crates/nu-path/Cargo.toml
+++ b/crates/nu-path/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-path"
 edition = "2021"
 license = "MIT"
 name = "nu-path"
-version = "0.102.0"
+version = "0.102.1"
 exclude = ["/fuzz"]
 
 [lib]
diff --git a/crates/nu-plugin-core/Cargo.toml b/crates/nu-plugin-core/Cargo.toml
index 1fd01297f3..bd0642e0fe 100644
--- a/crates/nu-plugin-core/Cargo.toml
+++ b/crates/nu-plugin-core/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-core
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-core"
-version = "0.102.0"
+version = "0.102.1"
 
 [lib]
 bench = false
@@ -14,8 +14,8 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.102.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.102.0", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.102.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.102.1", default-features = false }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true }
diff --git a/crates/nu-plugin-engine/Cargo.toml b/crates/nu-plugin-engine/Cargo.toml
index ba82b2453b..90d166510c 100644
--- a/crates/nu-plugin-engine/Cargo.toml
+++ b/crates/nu-plugin-engine/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-engi
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-engine"
-version = "0.102.0"
+version = "0.102.1"
 
 [lib]
 bench = false
@@ -14,12 +14,12 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.102.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.102.0" }
-nu-system = { path = "../nu-system", version = "0.102.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.102.0" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.102.0", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.102.0" }
+nu-engine = { path = "../nu-engine", version = "0.102.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.1" }
+nu-system = { path = "../nu-system", version = "0.102.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.102.1" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.102.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.102.1" }
 
 serde = { workspace = true }
 log = { workspace = true }
diff --git a/crates/nu-plugin-protocol/Cargo.toml b/crates/nu-plugin-protocol/Cargo.toml
index a53328f908..36b00e29aa 100644
--- a/crates/nu-plugin-protocol/Cargo.toml
+++ b/crates/nu-plugin-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin-prot
 edition = "2021"
 license = "MIT"
 name = "nu-plugin-protocol"
-version = "0.102.0"
+version = "0.102.1"
 
 [lib]
 bench = false
@@ -14,8 +14,8 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.102.0", features = ["plugin"] }
-nu-utils = { path = "../nu-utils", version = "0.102.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.1", features = ["plugin"] }
+nu-utils = { path = "../nu-utils", version = "0.102.1" }
 
 rmp-serde = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
diff --git a/crates/nu-plugin-test-support/Cargo.toml b/crates/nu-plugin-test-support/Cargo.toml
index 54f2992102..1e63b65de6 100644
--- a/crates/nu-plugin-test-support/Cargo.toml
+++ b/crates/nu-plugin-test-support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu-plugin-test-support"
-version = "0.102.0"
+version = "0.102.1"
 edition = "2021"
 license = "MIT"
 description = "Testing support for Nushell plugins"
@@ -15,14 +15,14 @@ workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.102.0", features = ["plugin"] }
-nu-protocol = { path = "../nu-protocol", version = "0.102.0", features = ["plugin"] }
-nu-parser = { path = "../nu-parser", version = "0.102.0", features = ["plugin"] }
-nu-plugin = { path = "../nu-plugin", version = "0.102.0" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.102.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.102.0" }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.102.0" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.102.0" }
+nu-engine = { path = "../nu-engine", version = "0.102.1", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.102.1", features = ["plugin"] }
+nu-parser = { path = "../nu-parser", version = "0.102.1", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.102.1" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.102.1" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.102.1" }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.102.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.102.1" }
 nu-ansi-term = { workspace = true }
 similar = "2.7"
 
diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml
index 7f8986aad0..083946933a 100644
--- a/crates/nu-plugin/Cargo.toml
+++ b/crates/nu-plugin/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-plugin"
 edition = "2021"
 license = "MIT"
 name = "nu-plugin"
-version = "0.102.0"
+version = "0.102.1"
 
 [lib]
 bench = false
@@ -14,11 +14,11 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.102.0", features = ["plugin"] }
-nu-protocol = { path = "../nu-protocol", version = "0.102.0", features = ["plugin"] }
-nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.102.0" }
-nu-plugin-core = { path = "../nu-plugin-core", version = "0.102.0", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.102.0" }
+nu-engine = { path = "../nu-engine", version = "0.102.1", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.102.1", features = ["plugin"] }
+nu-plugin-protocol = { path = "../nu-plugin-protocol", version = "0.102.1" }
+nu-plugin-core = { path = "../nu-plugin-core", version = "0.102.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.102.1" }
 
 log = { workspace = true }
 thiserror = "2.0"
diff --git a/crates/nu-pretty-hex/Cargo.toml b/crates/nu-pretty-hex/Cargo.toml
index 3bd0627154..4397f7bb3a 100644
--- a/crates/nu-pretty-hex/Cargo.toml
+++ b/crates/nu-pretty-hex/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-pretty-hex"
 edition = "2021"
 license = "MIT"
 name = "nu-pretty-hex"
-version = "0.102.0"
+version = "0.102.1"
 
 [lib]
 doctest = false
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index 747b780c8e..16d649d337 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-protocol"
 edition = "2021"
 license = "MIT"
 name = "nu-protocol"
-version = "0.102.0"
+version = "0.102.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,10 +16,10 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.102.0", default-features = false }
-nu-path = { path = "../nu-path", version = "0.102.0" }
-nu-system = { path = "../nu-system", version = "0.102.0" }
-nu-derive-value = { path = "../nu-derive-value", version = "0.102.0" }
+nu-utils = { path = "../nu-utils", version = "0.102.1", default-features = false }
+nu-path = { path = "../nu-path", version = "0.102.1" }
+nu-system = { path = "../nu-system", version = "0.102.1" }
+nu-derive-value = { path = "../nu-derive-value", version = "0.102.1" }
 
 brotli = { workspace = true, optional = true }
 bytes = { workspace = true }
@@ -66,8 +66,8 @@ plugin = [
 serde_json = { workspace = true }
 strum = "0.26"
 strum_macros = "0.26"
-nu-test-support = { path = "../nu-test-support", version = "0.102.0" }
-nu-utils = { path = "../nu-utils", version = "0.102.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.102.1" }
+nu-utils = { path = "../nu-utils", version = "0.102.1" }
 pretty_assertions = { workspace = true }
 rstest = { workspace = true }
 tempfile = { workspace = true }
diff --git a/crates/nu-std/Cargo.toml b/crates/nu-std/Cargo.toml
index afde326426..5ebc9e8a2d 100644
--- a/crates/nu-std/Cargo.toml
+++ b/crates/nu-std/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-std"
 edition = "2021"
 license = "MIT"
 name = "nu-std"
-version = "0.102.0"
+version = "0.102.1"
 
 [dependencies]
-nu-parser = { version = "0.102.0", path = "../nu-parser" }
-nu-protocol = { version = "0.102.0", path = "../nu-protocol", default-features = false }
-nu-engine = { version = "0.102.0", path = "../nu-engine", default-features = false }
+nu-parser = { version = "0.102.1", path = "../nu-parser" }
+nu-protocol = { version = "0.102.1", path = "../nu-protocol", default-features = false }
+nu-engine = { version = "0.102.1", path = "../nu-engine", default-features = false }
 miette = { workspace = true, features = ["fancy-no-backtrace"] }
 
 log = "0.4"
diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml
index c15e9cca1e..fac29b7715 100644
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["The Nushell Project Developers", "procs creators"]
 description = "Nushell system querying"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-system"
 name = "nu-system"
-version = "0.102.0"
+version = "0.102.1"
 edition = "2021"
 license = "MIT"
 
diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml
index ac84fa2e53..27a752c217 100644
--- a/crates/nu-table/Cargo.toml
+++ b/crates/nu-table/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-table"
 edition = "2021"
 license = "MIT"
 name = "nu-table"
-version = "0.102.0"
+version = "0.102.1"
 
 [lib]
 bench = false
@@ -14,13 +14,13 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.102.0", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.102.0", default-features = false }
-nu-engine = { path = "../nu-engine", version = "0.102.0", default-features = false }
-nu-color-config = { path = "../nu-color-config", version = "0.102.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.102.1", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.102.1", default-features = false }
+nu-color-config = { path = "../nu-color-config", version = "0.102.1" }
 nu-ansi-term = { workspace = true }
 fancy-regex = { workspace = true }
 tabled = { workspace = true, features = ["ansi"], default-features = false }
 
 [dev-dependencies]
-# nu-test-support = { path="../nu-test-support", version = "0.102.0"  }
\ No newline at end of file
+# nu-test-support = { path="../nu-test-support", version = "0.102.1"  }
\ No newline at end of file
diff --git a/crates/nu-term-grid/Cargo.toml b/crates/nu-term-grid/Cargo.toml
index eef695f808..51a47f985c 100644
--- a/crates/nu-term-grid/Cargo.toml
+++ b/crates/nu-term-grid/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-term-grid"
 edition = "2021"
 license = "MIT"
 name = "nu-term-grid"
-version = "0.102.0"
+version = "0.102.1"
 
 [lib]
 bench = false
@@ -14,6 +14,6 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-utils = { path = "../nu-utils", version = "0.102.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.102.1", default-features = false }
 
 unicode-width = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-test-support/Cargo.toml b/crates/nu-test-support/Cargo.toml
index fb8dcb7a88..ff5bd2ba0f 100644
--- a/crates/nu-test-support/Cargo.toml
+++ b/crates/nu-test-support/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-test-suppor
 edition = "2021"
 license = "MIT"
 name = "nu-test-support"
-version = "0.102.0"
+version = "0.102.1"
 
 [lib]
 doctest = false
@@ -15,9 +15,9 @@ bench = false
 workspace = true
 
 [dependencies]
-nu-path = { path = "../nu-path", version = "0.102.0" }
-nu-glob = { path = "../nu-glob", version = "0.102.0" }
-nu-utils = { path = "../nu-utils", version = "0.102.0" }
+nu-path = { path = "../nu-path", version = "0.102.1" }
+nu-glob = { path = "../nu-glob", version = "0.102.1" }
+nu-utils = { path = "../nu-utils", version = "0.102.1" }
 
 num-format = { workspace = true }
 which = { workspace = true }
diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml
index 163408cb10..0e146d21f1 100644
--- a/crates/nu-utils/Cargo.toml
+++ b/crates/nu-utils/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-utils"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-utils"
-version = "0.102.0"
+version = "0.102.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
diff --git a/crates/nu-utils/src/default_files/default_config.nu b/crates/nu-utils/src/default_files/default_config.nu
index e63f32ca9f..8998c980d1 100644
--- a/crates/nu-utils/src/default_files/default_config.nu
+++ b/crates/nu-utils/src/default_files/default_config.nu
@@ -1,6 +1,6 @@
 # Nushell Config File
 #
-# version = "0.102.0"
+# version = "0.102.1"
 $env.config.color_config = {
     separator: white
     leading_trailing_space_bg: { attr: n }
diff --git a/crates/nu-utils/src/default_files/default_env.nu b/crates/nu-utils/src/default_files/default_env.nu
index f2a6d5d74a..c5302ef4dd 100644
--- a/crates/nu-utils/src/default_files/default_env.nu
+++ b/crates/nu-utils/src/default_files/default_env.nu
@@ -1,7 +1,7 @@
 # Default Nushell Environment Config File
 # These "sensible defaults" are set before the user's `env.nu` is loaded
 #
-# version = "0.102.0"
+# version = "0.102.1"
 
 $env.PROMPT_COMMAND = $env.PROMPT_COMMAND? | default {||
     let dir = match (do -i { $env.PWD | path relative-to $nu.home-path }) {
diff --git a/crates/nu-utils/src/default_files/doc_config.nu b/crates/nu-utils/src/default_files/doc_config.nu
index 78e6e72557..461878a790 100644
--- a/crates/nu-utils/src/default_files/doc_config.nu
+++ b/crates/nu-utils/src/default_files/doc_config.nu
@@ -3,7 +3,7 @@
 # Warning: This file is intended for documentation purposes only and
 # is not intended to be used as an actual configuration file as-is.
 #
-# version = "0.102.0"
+# version = "0.102.1"
 #
 # A `config.nu` file is used to override default Nushell settings,
 # define (or import) custom commands, or run any other startup tasks.
diff --git a/crates/nu-utils/src/default_files/doc_env.nu b/crates/nu-utils/src/default_files/doc_env.nu
index af840ff914..43cb12904d 100644
--- a/crates/nu-utils/src/default_files/doc_env.nu
+++ b/crates/nu-utils/src/default_files/doc_env.nu
@@ -1,6 +1,6 @@
 # Nushell Environment Config File Documentation
 #
-# version = "0.102.0"
+# version = "0.102.1"
 #
 # Previously, environment variables were typically configured in `env.nu`.
 # In general, most configuration can and should be performed in `config.nu`
diff --git a/crates/nu-utils/src/default_files/scaffold_config.nu b/crates/nu-utils/src/default_files/scaffold_config.nu
index a9b3da179d..100f56a233 100644
--- a/crates/nu-utils/src/default_files/scaffold_config.nu
+++ b/crates/nu-utils/src/default_files/scaffold_config.nu
@@ -1,7 +1,7 @@
 # config.nu
 #
 # Installed by:
-# version = "0.102.0"
+# version = "0.102.1"
 #
 # This file is used to override default Nushell settings, define
 # (or import) custom commands, or run any other startup tasks.
diff --git a/crates/nu-utils/src/default_files/scaffold_env.nu b/crates/nu-utils/src/default_files/scaffold_env.nu
index b45964260e..83e83e2028 100644
--- a/crates/nu-utils/src/default_files/scaffold_env.nu
+++ b/crates/nu-utils/src/default_files/scaffold_env.nu
@@ -1,7 +1,7 @@
 # env.nu
 #
 # Installed by:
-# version = "0.102.0"
+# version = "0.102.1"
 #
 # Previously, environment variables were typically configured in `env.nu`.
 # In general, most configuration can and should be performed in `config.nu`
diff --git a/crates/nu_plugin_custom_values/Cargo.toml b/crates/nu_plugin_custom_values/Cargo.toml
index 93b346e337..fe5e2e8acb 100644
--- a/crates/nu_plugin_custom_values/Cargo.toml
+++ b/crates/nu_plugin_custom_values/Cargo.toml
@@ -10,10 +10,10 @@ name = "nu_plugin_custom_values"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.102.0", features = [] }
-nu-protocol = { path = "../nu-protocol", version = "0.102.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.102.1", features = [] }
+nu-protocol = { path = "../nu-protocol", version = "0.102.1", features = ["plugin"] }
 serde = { workspace = true }
 typetag = "0.2"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.102.0" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.102.1" }
\ No newline at end of file
diff --git a/crates/nu_plugin_example/Cargo.toml b/crates/nu_plugin_example/Cargo.toml
index 4e6f12f8c6..681eadf3cb 100644
--- a/crates/nu_plugin_example/Cargo.toml
+++ b/crates/nu_plugin_example/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_exam
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_example"
-version = "0.102.0"
+version = "0.102.1"
 
 [[bin]]
 name = "nu_plugin_example"
@@ -15,9 +15,9 @@ bench = false
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.102.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.102.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.102.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.1", features = ["plugin"] }
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.102.0" }
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.102.0" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.102.1" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.102.1" }
\ No newline at end of file
diff --git a/crates/nu_plugin_formats/Cargo.toml b/crates/nu_plugin_formats/Cargo.toml
index 5dafae929f..6f5101e2d5 100644
--- a/crates/nu_plugin_formats/Cargo.toml
+++ b/crates/nu_plugin_formats/Cargo.toml
@@ -5,12 +5,12 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_form
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_formats"
-version = "0.102.0"
+version = "0.102.1"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.102.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.102.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.102.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.1", features = ["plugin"] }
 
 indexmap = { workspace = true }
 eml-parser = "0.1"
@@ -20,4 +20,4 @@ plist = "1.7"
 chrono = "0.4"
 
 [dev-dependencies]
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.102.0" }
\ No newline at end of file
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.102.1" }
\ No newline at end of file
diff --git a/crates/nu_plugin_gstat/Cargo.toml b/crates/nu_plugin_gstat/Cargo.toml
index 92812fe612..69a704862e 100644
--- a/crates/nu_plugin_gstat/Cargo.toml
+++ b/crates/nu_plugin_gstat/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gsta
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_gstat"
-version = "0.102.0"
+version = "0.102.1"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_gstat"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.102.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.102.0" }
+nu-plugin = { path = "../nu-plugin", version = "0.102.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.1" }
 
 git2 = "0.20"
\ No newline at end of file
diff --git a/crates/nu_plugin_inc/Cargo.toml b/crates/nu_plugin_inc/Cargo.toml
index 63517ac95e..10c9ba248f 100644
--- a/crates/nu_plugin_inc/Cargo.toml
+++ b/crates/nu_plugin_inc/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_inc"
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_inc"
-version = "0.102.0"
+version = "0.102.1"
 
 [lib]
 doctest = false
@@ -16,7 +16,7 @@ name = "nu_plugin_inc"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.102.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.102.0", features = ["plugin"] }
+nu-plugin = { path = "../nu-plugin", version = "0.102.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.1", features = ["plugin"] }
 
 semver = "1.0"
\ No newline at end of file
diff --git a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
index 2c6ff4414c..c0ef4cfe4f 100755
--- a/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
+++ b/crates/nu_plugin_nu_example/nu_plugin_nu_example.nu
@@ -6,7 +6,7 @@
 # it also allows us to test the plugin interface with something manually implemented in a scripting
 # language without adding any extra dependencies to our tests.
 
-const NUSHELL_VERSION = "0.102.0"
+const NUSHELL_VERSION = "0.102.1"
 const PLUGIN_VERSION = "0.1.1" # bump if you change commands!
 
 def main [--stdio] {
diff --git a/crates/nu_plugin_polars/Cargo.toml b/crates/nu_plugin_polars/Cargo.toml
index 527f85069d..2590e63358 100644
--- a/crates/nu_plugin_polars/Cargo.toml
+++ b/crates/nu_plugin_polars/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu_plugin_polars"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_polars"
-version = "0.102.0"
+version = "0.102.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -17,10 +17,10 @@ bench = false
 bench = false
 
 [dependencies]
-nu-protocol = { path = "../nu-protocol", version = "0.102.0" }
-nu-plugin = { path = "../nu-plugin", version = "0.102.0" }
-nu-path = { path = "../nu-path", version = "0.102.0" }
-nu-utils = { path = "../nu-utils", version = "0.102.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.1" }
+nu-plugin = { path = "../nu-plugin", version = "0.102.1" }
+nu-path = { path = "../nu-path", version = "0.102.1" }
+nu-utils = { path = "../nu-utils", version = "0.102.1" }
 
 # Potential dependencies for extras
 chrono = { workspace = true, features = ["std", "unstable-locales"], default-features = false }
@@ -93,9 +93,9 @@ optional = false
 version = "0.46"
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.102.0" }
-nu-engine = { path = "../nu-engine", version = "0.102.0" }
-nu-parser = { path = "../nu-parser", version = "0.102.0" }
-nu-command = { path = "../nu-command", version = "0.102.0" }
-nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.102.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.102.1" }
+nu-engine = { path = "../nu-engine", version = "0.102.1" }
+nu-parser = { path = "../nu-parser", version = "0.102.1" }
+nu-command = { path = "../nu-command", version = "0.102.1" }
+nu-plugin-test-support = { path = "../nu-plugin-test-support", version = "0.102.1" }
 tempfile.workspace = true
diff --git a/crates/nu_plugin_python/nu_plugin_python_example.py b/crates/nu_plugin_python/nu_plugin_python_example.py
index 5b42696159..2f3b9c3428 100755
--- a/crates/nu_plugin_python/nu_plugin_python_example.py
+++ b/crates/nu_plugin_python/nu_plugin_python_example.py
@@ -27,7 +27,7 @@ import sys
 import json
 
 
-NUSHELL_VERSION = "0.102.0"
+NUSHELL_VERSION = "0.102.1"
 PLUGIN_VERSION = "0.1.1"  # bump if you change commands!
 
 
diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml
index 38ba5c8f16..06c2fdcc4a 100644
--- a/crates/nu_plugin_query/Cargo.toml
+++ b/crates/nu_plugin_query/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_quer
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_query"
-version = "0.102.0"
+version = "0.102.1"
 
 [lib]
 doctest = false
@@ -16,8 +16,8 @@ name = "nu_plugin_query"
 bench = false
 
 [dependencies]
-nu-plugin = { path = "../nu-plugin", version = "0.102.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.102.0" }
+nu-plugin = { path = "../nu-plugin", version = "0.102.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.1" }
 
 gjson = "0.8"
 scraper = { default-features = false, version = "0.22" }
diff --git a/crates/nu_plugin_stress_internals/Cargo.toml b/crates/nu_plugin_stress_internals/Cargo.toml
index ef6ba5ce99..8ca7198e7e 100644
--- a/crates/nu_plugin_stress_internals/Cargo.toml
+++ b/crates/nu_plugin_stress_internals/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_stre
 edition = "2021"
 license = "MIT"
 name = "nu_plugin_stress_internals"
-version = "0.102.0"
+version = "0.102.1"
 
 [[bin]]
 name = "nu_plugin_stress_internals"
diff --git a/crates/nuon/Cargo.toml b/crates/nuon/Cargo.toml
index d32101efea..a71ef74e36 100644
--- a/crates/nuon/Cargo.toml
+++ b/crates/nuon/Cargo.toml
@@ -5,15 +5,15 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nuon"
 edition = "2021"
 license = "MIT"
 name = "nuon"
-version = "0.102.0"
+version = "0.102.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-parser = { path = "../nu-parser", version = "0.102.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.102.0", default-features = false }
-nu-engine = { path = "../nu-engine", version = "0.102.0", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.102.0", default-features = false }
+nu-parser = { path = "../nu-parser", version = "0.102.1" }
+nu-protocol = { path = "../nu-protocol", version = "0.102.1", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.102.1", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.102.1", default-features = false }
 
 [dev-dependencies]
 chrono = { workspace = true }

From 192ee59c754ec5c9b66e28cca94a75d643501be7 Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Wed, 5 Feb 2025 20:27:17 +0800
Subject: [PATCH 0997/1072] Fix tests of docker image and Update Nu LICENSE
 (#15015)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

- Fix docker image tests failure for [nightly
build](https://github.com/nushell/nightly/actions/runs/13150680863) and
[release
build](https://github.com/nushell/nightly/actions/runs/13156381344). I
have test them locally to make sure it works
- Update Nushell LICENSE by the way
---
 LICENSE               | 2 +-
 docker/test_docker.nu | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/LICENSE b/LICENSE
index ae174e8595..1ecbafd78c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 - 2023 The Nushell Project Developers
+Copyright (c) 2019 - 2025 The Nushell Project Developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/docker/test_docker.nu b/docker/test_docker.nu
index 64adbba0c9..374455c0a8 100755
--- a/docker/test_docker.nu
+++ b/docker/test_docker.nu
@@ -148,6 +148,6 @@ def "test config initialised" [] {
     let env_size = $files | where file == "env.nu" | get size | first
     let config_size = $files | where file == "config.nu" | get size | first
 
-    assert greater $env_size 1KiB
-    assert greater $config_size 1KiB
+    assert greater $env_size 300B
+    assert greater $config_size 350B
 }

From 0f0e1e2068f5ed7d801ba2cfebf045c541963558 Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Wed, 5 Feb 2025 23:33:49 -0500
Subject: [PATCH 0998/1072] Add search terms for hide and hide-env (#15017)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

Adds search terms for hide and hide-env.

Rel: #15013

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
N/A

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->
N/A

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
N/A
---
 crates/nu-cmd-lang/src/core_commands/hide.rs     | 4 ++++
 crates/nu-cmd-lang/src/core_commands/hide_env.rs | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/crates/nu-cmd-lang/src/core_commands/hide.rs b/crates/nu-cmd-lang/src/core_commands/hide.rs
index b51a21e979..8524f26b41 100644
--- a/crates/nu-cmd-lang/src/core_commands/hide.rs
+++ b/crates/nu-cmd-lang/src/core_commands/hide.rs
@@ -32,6 +32,10 @@ This command is a parser keyword. For details, check:
   https://www.nushell.sh/book/thinking_in_nu.html"#
     }
 
+    fn search_terms(&self) -> Vec<&str> {
+        vec!["unset"]
+    }
+
     fn command_type(&self) -> CommandType {
         CommandType::Keyword
     }
diff --git a/crates/nu-cmd-lang/src/core_commands/hide_env.rs b/crates/nu-cmd-lang/src/core_commands/hide_env.rs
index 3d47a84a36..857343ed35 100644
--- a/crates/nu-cmd-lang/src/core_commands/hide_env.rs
+++ b/crates/nu-cmd-lang/src/core_commands/hide_env.rs
@@ -29,6 +29,10 @@ impl Command for HideEnv {
         "Hide environment variables in the current scope."
     }
 
+    fn search_terms(&self) -> Vec<&str> {
+        vec!["unset", "drop"]
+    }
+
     fn run(
         &self,
         engine_state: &EngineState,

From a56906ca6d8ed3ac16349dcad0d2aaa2eb4e8d50 Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Thu, 6 Feb 2025 18:59:19 +0800
Subject: [PATCH 0999/1072] update miette to 7.5 (#15014)

---
 Cargo.lock                              | 8 ++++----
 Cargo.toml                              | 2 +-
 crates/nu-protocol/tests/test_config.rs | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7fc0e18689..1f62f5853d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3196,9 +3196,9 @@ dependencies = [
 
 [[package]]
 name = "miette"
-version = "7.4.0"
+version = "7.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317f146e2eb7021892722af37cf1b971f0a70c8406f487e24952667616192c64"
+checksum = "1a955165f87b37fd1862df2a59547ac542c77ef6d17c666f619d1ad22dd89484"
 dependencies = [
  "backtrace",
  "backtrace-ext",
@@ -3216,9 +3216,9 @@ dependencies = [
 
 [[package]]
 name = "miette-derive"
-version = "7.4.0"
+version = "7.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23c9b935fbe1d6cbd1dac857b54a688145e2d93f48db36010514d0f612d0ad67"
+checksum = "bf45bf44ab49be92fd1227a3be6fc6f617f1a337c06af54981048574d8783147"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index f96c0a8950..c2fc1ece5a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -107,7 +107,7 @@ lsp-types = { version = "0.97.0", features = ["proposed"] }
 lsp-textdocument = "0.4.1"
 mach2 = "0.4"
 md5 = { version = "0.10", package = "md-5" }
-miette = "7.3"
+miette = "7.5"
 mime = "0.3.17"
 mime_guess = "2.0"
 mockito = { version = "1.6", default-features = false }
diff --git a/crates/nu-protocol/tests/test_config.rs b/crates/nu-protocol/tests/test_config.rs
index f6d0aef67d..49ad1cdec6 100644
--- a/crates/nu-protocol/tests/test_config.rs
+++ b/crates/nu-protocol/tests/test_config.rs
@@ -60,7 +60,7 @@ fn fancy_default_errors() {
 
     assert_eq!(
         actual.err,
-        "Error: \n  \u{1b}[31m×\u{1b}[0m oh no!\n   ╭─[\u{1b}[36;1;4mline2:1:13\u{1b}[0m]\n \u{1b}[2m1\u{1b}[0m │ force_error \"My error\"\n   · \u{1b}[35;1m            ─────┬────\u{1b}[0m\n   ·                  \u{1b}[35;1m╰── \u{1b}[35;1mhere's the error\u{1b}[0m\u{1b}[0m\n   ╰────\n\n"
+        "Error:   \u{1b}[31m×\u{1b}[0m oh no!\n   ╭─[\u{1b}[36;1;4mline2:1:13\u{1b}[0m]\n \u{1b}[2m1\u{1b}[0m │ force_error \"My error\"\n   · \u{1b}[35;1m            ─────┬────\u{1b}[0m\n   ·                  \u{1b}[35;1m╰── \u{1b}[35;1mhere's the error\u{1b}[0m\u{1b}[0m\n   ╰────\n\n"
     );
 }
 

From 30ed63667b5dae7b39637df23c6299f49fc9680b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Feb 2025 11:00:19 +0000
Subject: [PATCH 1000/1072] build(deps): bump bytes from 1.9.0 to 1.10.0
 (#15010)

---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1f62f5853d..d9242600cc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -828,9 +828,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
+checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
 dependencies = [
  "serde",
 ]

From 81de8ecd70016676fa8548e2168c1d7153923af3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Feb 2025 11:01:07 +0000
Subject: [PATCH 1001/1072] build(deps): bump crate-ci/typos from 1.29.4 to
 1.29.5 (#15006)

---
 .github/workflows/typos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index 50d8edbc79..3644649e89 100644
--- a/.github/workflows/typos.yml
+++ b/.github/workflows/typos.yml
@@ -10,4 +10,4 @@ jobs:
         uses: actions/checkout@v4.1.7
 
       - name: Check spelling
-        uses: crate-ci/typos@v1.29.4
+        uses: crate-ci/typos@v1.29.5

From 5f6f18076c741dbddf1a8e66861b84a9446ccb8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C5=BD=C3=A1dn=C3=ADk?= <kubouch@gmail.com>
Date: Thu, 6 Feb 2025 13:49:57 +0200
Subject: [PATCH 1002/1072] Remove Twitter from README (#15026)

# Description
Removes Twitter mentions from the README
---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 81834052b5..8e37b97f51 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,6 @@
 [![Nightly Build](https://github.com/nushell/nushell/actions/workflows/nightly-build.yml/badge.svg)](https://github.com/nushell/nushell/actions/workflows/nightly-build.yml)
 [![Discord](https://img.shields.io/discord/601130461678272522.svg?logo=discord)](https://discord.gg/NtAbbGn)
 [![The Changelog #363](https://img.shields.io/badge/The%20Changelog-%23363-61c192.svg)](https://changelog.com/podcast/363)
-[![@nu_shell](https://img.shields.io/badge/twitter-@nu_shell-1DA1F3?style=flat-square)](https://twitter.com/nu_shell)
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/m/nushell/nushell)](https://github.com/nushell/nushell/graphs/commit-activity)
 [![GitHub contributors](https://img.shields.io/github/contributors/nushell/nushell)](https://github.com/nushell/nushell/graphs/contributors)
 
@@ -35,7 +34,7 @@ This project has reached a minimum-viable-product level of quality. Many people
 
 The [Nushell book](https://www.nushell.sh/book/) is the primary source of Nushell documentation. You can find [a full list of Nu commands in the book](https://www.nushell.sh/commands/), and we have many examples of using Nu in our [cookbook](https://www.nushell.sh/cookbook/).
 
-We're also active on [Discord](https://discord.gg/NtAbbGn) and [Twitter](https://twitter.com/nu_shell); come and chat with us!
+We're also active on [Discord](https://discord.gg/NtAbbGn); come and chat with us!
 
 ## Installation
 

From 0b2d1327d2641484e04083649c7d7811ed1f9fcf Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Thu, 6 Feb 2025 14:56:40 +0300
Subject: [PATCH 1003/1072] fix extern commands' extra description (#14996)

# Description

- Remove redundant fields from KnownExternal
- Command::extra_description and Command::search_terms using the
signature field

# User-Facing Changes

`extern` commands extra description is now shown in help text.

# Tests + Formatting

# After Submitting
---
 crates/nu-parser/src/known_external.rs | 19 ++++++++++++++-----
 crates/nu-parser/src/parse_keywords.rs | 13 ++++---------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/crates/nu-parser/src/known_external.rs b/crates/nu-parser/src/known_external.rs
index 7ba73f453b..6cf61fff91 100644
--- a/crates/nu-parser/src/known_external.rs
+++ b/crates/nu-parser/src/known_external.rs
@@ -7,15 +7,12 @@ use nu_protocol::{
 
 #[derive(Clone)]
 pub struct KnownExternal {
-    pub name: String,
     pub signature: Box<Signature>,
-    pub description: String,
-    pub extra_description: String,
 }
 
 impl Command for KnownExternal {
     fn name(&self) -> &str {
-        &self.name
+        &self.signature.name
     }
 
     fn signature(&self) -> Signature {
@@ -23,7 +20,19 @@ impl Command for KnownExternal {
     }
 
     fn description(&self) -> &str {
-        &self.description
+        &self.signature.description
+    }
+
+    fn extra_description(&self) -> &str {
+        &self.signature.extra_description
+    }
+
+    fn search_terms(&self) -> Vec<&str> {
+        self.signature
+            .search_terms
+            .iter()
+            .map(String::as_str)
+            .collect()
     }
 
     fn command_type(&self) -> CommandType {
diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index 4f0a91dd90..5eb845523a 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -758,9 +758,9 @@ pub fn parse_extern(
                     name.clone()
                 };
 
-                signature.name.clone_from(&external_name);
-                signature.description.clone_from(&description);
-                signature.extra_description.clone_from(&extra_description);
+                signature.name = external_name;
+                signature.description = description;
+                signature.extra_description = extra_description;
                 signature.allows_unknown_args = true;
 
                 if let Some(block_id) = body.and_then(|x| x.as_block()) {
@@ -785,12 +785,7 @@ pub fn parse_extern(
                         );
                     }
 
-                    let decl = KnownExternal {
-                        name: external_name,
-                        description,
-                        extra_description,
-                        signature,
-                    };
+                    let decl = KnownExternal { signature };
 
                     *declaration = Box::new(decl);
                 }

From 164a0896564eae74d80ecc0d04167af292a275eb Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Thu, 6 Feb 2025 20:49:13 +0800
Subject: [PATCH 1004/1072] refactor(completion): AST traverse to find the
 inner-most expression to complete (#14973)

# Description

As discussed
[here](https://github.com/nushell/nushell/pull/14856#issuecomment-2623393017)
and [here](https://github.com/nushell/nushell/discussions/14868).

I feel this method is generally better. As for the new-parser, we can
simply modify the implementation in `traverse.rs` to accommodate.

Next, I'm gonna overhaul the `Completer` trait, so before it gets really
messy, I' think this is the step to put this open for review so we can
check if I'm on track.

This PR closes #13897 (the `|` part)

# User-Facing Changes

# After Submitting
---
 crates/nu-cli/src/completions/completer.rs | 573 +++++++++++----------
 crates/nu-lsp/src/ast.rs                   | 201 +-------
 crates/nu-lsp/src/hints.rs                 |  18 +-
 crates/nu-protocol/src/ast/call.rs         |   9 +
 crates/nu-protocol/src/ast/mod.rs          |   2 +
 crates/nu-protocol/src/ast/traverse.rs     | 282 ++++++++++
 6 files changed, 619 insertions(+), 466 deletions(-)
 create mode 100644 crates/nu-protocol/src/ast/traverse.rs

diff --git a/crates/nu-cli/src/completions/completer.rs b/crates/nu-cli/src/completions/completer.rs
index 71125e04e9..9ab0cba566 100644
--- a/crates/nu-cli/src/completions/completer.rs
+++ b/crates/nu-cli/src/completions/completer.rs
@@ -5,8 +5,9 @@ use crate::completions::{
 use log::debug;
 use nu_color_config::{color_record_to_nustyle, lookup_ansi_color_style};
 use nu_engine::eval_block;
-use nu_parser::{flatten_pipeline_element, parse, FlatShape};
+use nu_parser::{flatten_expression, parse, FlatShape};
 use nu_protocol::{
+    ast::{Expr, Expression, FindMapResult, Traverse},
     debugger::WithoutDebug,
     engine::{Closure, EngineState, Stack, StateWorkingSet},
     PipelineData, Span, Value,
@@ -16,6 +17,51 @@ use std::{str, sync::Arc};
 
 use super::base::{SemanticSuggestion, SuggestionKind};
 
+fn find_pipeline_element_by_position<'a>(
+    expr: &'a Expression,
+    working_set: &'a StateWorkingSet,
+    pos: usize,
+) -> FindMapResult<&'a Expression> {
+    // skip the entire expression if the position is not in it
+    if !expr.span.contains(pos) {
+        return FindMapResult::Stop;
+    }
+    let closure = |expr: &'a Expression| find_pipeline_element_by_position(expr, working_set, pos);
+    match &expr.expr {
+        Expr::Call(call) => call
+            .arguments
+            .iter()
+            .find_map(|arg| arg.expr().and_then(|e| e.find_map(working_set, &closure)))
+            // if no inner call/external_call found, then this is the inner-most one
+            .or(Some(expr))
+            .map(FindMapResult::Found)
+            .unwrap_or_default(),
+        // TODO: clear separation of internal/external completion logic
+        Expr::ExternalCall(head, arguments) => arguments
+            .iter()
+            .find_map(|arg| arg.expr().find_map(working_set, &closure))
+            .or(head.as_ref().find_map(working_set, &closure))
+            .or(Some(expr))
+            .map(FindMapResult::Found)
+            .unwrap_or_default(),
+        // complete the operator
+        Expr::BinaryOp(lhs, _, rhs) => lhs
+            .find_map(working_set, &closure)
+            .or(rhs.find_map(working_set, &closure))
+            .or(Some(expr))
+            .map(FindMapResult::Found)
+            .unwrap_or_default(),
+        Expr::FullCellPath(fcp) => fcp
+            .head
+            .find_map(working_set, &closure)
+            .or(Some(expr))
+            .map(FindMapResult::Found)
+            .unwrap_or_default(),
+        Expr::Var(_) => FindMapResult::Found(expr),
+        _ => FindMapResult::Continue,
+    }
+}
+
 #[derive(Clone)]
 pub struct NuCompleter {
     engine_state: Arc<EngineState>,
@@ -140,139 +186,144 @@ impl NuCompleter {
 
         let config = self.engine_state.get_config();
 
-        let outermost_block = parse(&mut working_set, Some("completer"), line.as_bytes(), false);
+        let block = parse(&mut working_set, Some("completer"), line.as_bytes(), false);
+        let Some(element_expression) = block.find_map(&working_set, &|expr: &Expression| {
+            find_pipeline_element_by_position(expr, &working_set, pos)
+        }) else {
+            return vec![];
+        };
 
-        // Try to get the innermost block parsed (by span) so that we consider the correct context/scope.
-        let target_block = working_set
-            .delta
-            .blocks
-            .iter()
-            .filter_map(|block| match block.span {
-                Some(span) if span.contains(pos) => Some((block, span)),
-                _ => None,
-            })
-            .reduce(|prev, cur| {
-                // |(block, span), (block, span)|
-                match cur.1.start.cmp(&prev.1.start) {
-                    core::cmp::Ordering::Greater => cur,
-                    core::cmp::Ordering::Equal if cur.1.end < prev.1.end => cur,
-                    _ => prev,
+        let flattened = flatten_expression(&working_set, element_expression);
+        let mut spans: Vec<String> = vec![];
+
+        for (flat_idx, (span, shape)) in flattened.iter().enumerate() {
+            let is_passthrough_command = spans
+                .first()
+                .filter(|content| content.as_str() == "sudo" || content.as_str() == "doas")
+                .is_some();
+
+            // Read the current span to string
+            let current_span = working_set.get_span_contents(*span);
+            let current_span_str = String::from_utf8_lossy(current_span);
+            let is_last_span = span.contains(pos);
+
+            // Skip the last 'a' as span item
+            if is_last_span {
+                let offset = pos - span.start;
+                if offset == 0 {
+                    spans.push(String::new())
+                } else {
+                    let mut current_span_str = current_span_str.to_string();
+                    current_span_str.remove(offset);
+                    spans.push(current_span_str);
                 }
-            })
-            .map(|(block, _)| block)
-            .unwrap_or(&outermost_block);
+            } else {
+                spans.push(current_span_str.to_string());
+            }
 
-        for pipeline in &target_block.pipelines {
-            for pipeline_element in &pipeline.elements {
-                let flattened = flatten_pipeline_element(&working_set, pipeline_element);
-                let mut spans: Vec<String> = vec![];
+            // Complete based on the last span
+            if is_last_span {
+                // Context variables
+                let most_left_var = most_left_variable(flat_idx, &working_set, flattened.clone());
 
-                for (flat_idx, flat) in flattened.iter().enumerate() {
-                    let is_passthrough_command = spans
-                        .first()
-                        .filter(|content| content.as_str() == "sudo" || content.as_str() == "doas")
-                        .is_some();
+                // Create a new span
+                let new_span = Span::new(span.start, span.end - 1);
 
-                    // Read the current span to string
-                    let current_span = working_set.get_span_contents(flat.0);
-                    let current_span_str = String::from_utf8_lossy(current_span);
-                    let is_last_span = pos >= flat.0.start && pos < flat.0.end;
+                // Parses the prefix. Completion should look up to the cursor position, not after.
+                let index = pos - span.start;
+                let prefix = &current_span[..index];
 
-                    // Skip the last 'a' as span item
-                    if is_last_span {
-                        let offset = pos - flat.0.start;
-                        if offset == 0 {
-                            spans.push(String::new())
-                        } else {
-                            let mut current_span_str = current_span_str.to_string();
-                            current_span_str.remove(offset);
-                            spans.push(current_span_str);
-                        }
-                    } else {
-                        spans.push(current_span_str.to_string());
+                // Variables completion
+                if prefix.starts_with(b"$") || most_left_var.is_some() {
+                    let mut variable_names_completer =
+                        VariableCompletion::new(most_left_var.unwrap_or((vec![], vec![])));
+
+                    let mut variable_completions = self.process_completion(
+                        &mut variable_names_completer,
+                        &working_set,
+                        prefix,
+                        new_span,
+                        fake_offset,
+                        pos,
+                    );
+
+                    let mut variable_operations_completer =
+                        OperatorCompletion::new(element_expression.clone());
+
+                    let mut variable_operations_completions = self.process_completion(
+                        &mut variable_operations_completer,
+                        &working_set,
+                        prefix,
+                        new_span,
+                        fake_offset,
+                        pos,
+                    );
+
+                    variable_completions.append(&mut variable_operations_completions);
+                    return variable_completions;
+                }
+
+                // Flags completion
+                if prefix.starts_with(b"-") {
+                    // Try to complete flag internally
+                    let mut completer = FlagCompletion::new(element_expression.clone());
+                    let result = self.process_completion(
+                        &mut completer,
+                        &working_set,
+                        prefix,
+                        new_span,
+                        fake_offset,
+                        pos,
+                    );
+
+                    if !result.is_empty() {
+                        return result;
                     }
 
-                    // Complete based on the last span
-                    if is_last_span {
-                        // Context variables
-                        let most_left_var =
-                            most_left_variable(flat_idx, &working_set, flattened.clone());
-
-                        // Create a new span
-                        let new_span = Span::new(flat.0.start, flat.0.end - 1);
-
-                        // Parses the prefix. Completion should look up to the cursor position, not after.
-                        let index = pos - flat.0.start;
-                        let prefix = &current_span[..index];
-
-                        // Variables completion
-                        if prefix.starts_with(b"$") || most_left_var.is_some() {
-                            let mut variable_names_completer =
-                                VariableCompletion::new(most_left_var.unwrap_or((vec![], vec![])));
-
-                            let mut variable_completions = self.process_completion(
-                                &mut variable_names_completer,
-                                &working_set,
-                                prefix,
-                                new_span,
-                                fake_offset,
-                                pos,
-                            );
-
-                            let mut variable_operations_completer =
-                                OperatorCompletion::new(pipeline_element.expr.clone());
-
-                            let mut variable_operations_completions = self.process_completion(
-                                &mut variable_operations_completer,
-                                &working_set,
-                                prefix,
-                                new_span,
-                                fake_offset,
-                                pos,
-                            );
-
-                            variable_completions.append(&mut variable_operations_completions);
-                            return variable_completions;
-                        }
-
-                        // Flags completion
-                        if prefix.starts_with(b"-") {
-                            // Try to complete flag internally
-                            let mut completer = FlagCompletion::new(pipeline_element.expr.clone());
-                            let result = self.process_completion(
-                                &mut completer,
-                                &working_set,
-                                prefix,
-                                new_span,
-                                fake_offset,
-                                pos,
-                            );
-
-                            if !result.is_empty() {
-                                return result;
-                            }
-
-                            // We got no results for internal completion
-                            // now we can check if external completer is set and use it
-                            if let Some(closure) = config.completions.external.completer.as_ref() {
-                                if let Some(external_result) =
-                                    self.external_completion(closure, &spans, fake_offset, new_span)
-                                {
-                                    return external_result;
-                                }
-                            }
-                        }
-
-                        // specially check if it is currently empty - always complete commands
-                        if (is_passthrough_command && flat_idx == 1)
-                            || (flat_idx == 0 && working_set.get_span_contents(new_span).is_empty())
+                    // We got no results for internal completion
+                    // now we can check if external completer is set and use it
+                    if let Some(closure) = config.completions.external.completer.as_ref() {
+                        if let Some(external_result) =
+                            self.external_completion(closure, &spans, fake_offset, new_span)
                         {
-                            let mut completer = CommandCompletion::new(
-                                flattened.clone(),
-                                // flat_idx,
-                                FlatShape::String,
-                                true,
-                            );
+                            return external_result;
+                        }
+                    }
+                }
+
+                // specially check if it is currently empty - always complete commands
+                if (is_passthrough_command && flat_idx == 1)
+                    || (flat_idx == 0 && working_set.get_span_contents(new_span).is_empty())
+                {
+                    let mut completer = CommandCompletion::new(
+                        flattened.clone(),
+                        // flat_idx,
+                        FlatShape::String,
+                        true,
+                    );
+                    return self.process_completion(
+                        &mut completer,
+                        &working_set,
+                        prefix,
+                        new_span,
+                        fake_offset,
+                        pos,
+                    );
+                }
+
+                // Completions that depends on the previous expression (e.g: use, source-env)
+                if (is_passthrough_command && flat_idx > 1) || flat_idx > 0 {
+                    if let Some(previous_expr) = flattened.get(flat_idx - 1) {
+                        // Read the content for the previous expression
+                        let prev_expr_str = working_set.get_span_contents(previous_expr.0).to_vec();
+
+                        // Completion for .nu files
+                        if prev_expr_str == b"use"
+                            || prev_expr_str == b"overlay use"
+                            || prev_expr_str == b"source-env"
+                        {
+                            let mut completer = DotNuCompletion::new();
+
                             return self.process_completion(
                                 &mut completer,
                                 &working_set,
@@ -281,164 +332,132 @@ impl NuCompleter {
                                 fake_offset,
                                 pos,
                             );
-                        }
+                        } else if prev_expr_str == b"ls" {
+                            let mut completer = FileCompletion::new();
 
-                        // Completions that depends on the previous expression (e.g: use, source-env)
-                        if (is_passthrough_command && flat_idx > 1) || flat_idx > 0 {
-                            if let Some(previous_expr) = flattened.get(flat_idx - 1) {
-                                // Read the content for the previous expression
-                                let prev_expr_str =
-                                    working_set.get_span_contents(previous_expr.0).to_vec();
+                            return self.process_completion(
+                                &mut completer,
+                                &working_set,
+                                prefix,
+                                new_span,
+                                fake_offset,
+                                pos,
+                            );
+                        } else if matches!(
+                            previous_expr.1,
+                            FlatShape::Float
+                                | FlatShape::Int
+                                | FlatShape::String
+                                | FlatShape::List
+                                | FlatShape::Bool
+                                | FlatShape::Variable(_)
+                        ) {
+                            let mut completer = OperatorCompletion::new(element_expression.clone());
 
-                                // Completion for .nu files
-                                if prev_expr_str == b"use"
-                                    || prev_expr_str == b"overlay use"
-                                    || prev_expr_str == b"source-env"
-                                {
-                                    let mut completer = DotNuCompletion::new();
-
-                                    return self.process_completion(
-                                        &mut completer,
-                                        &working_set,
-                                        prefix,
-                                        new_span,
-                                        fake_offset,
-                                        pos,
-                                    );
-                                } else if prev_expr_str == b"ls" {
-                                    let mut completer = FileCompletion::new();
-
-                                    return self.process_completion(
-                                        &mut completer,
-                                        &working_set,
-                                        prefix,
-                                        new_span,
-                                        fake_offset,
-                                        pos,
-                                    );
-                                } else if matches!(
-                                    previous_expr.1,
-                                    FlatShape::Float
-                                        | FlatShape::Int
-                                        | FlatShape::String
-                                        | FlatShape::List
-                                        | FlatShape::Bool
-                                        | FlatShape::Variable(_)
-                                ) {
-                                    let mut completer =
-                                        OperatorCompletion::new(pipeline_element.expr.clone());
-
-                                    let operator_suggestion = self.process_completion(
-                                        &mut completer,
-                                        &working_set,
-                                        prefix,
-                                        new_span,
-                                        fake_offset,
-                                        pos,
-                                    );
-                                    if !operator_suggestion.is_empty() {
-                                        return operator_suggestion;
-                                    }
-                                }
+                            let operator_suggestion = self.process_completion(
+                                &mut completer,
+                                &working_set,
+                                prefix,
+                                new_span,
+                                fake_offset,
+                                pos,
+                            );
+                            if !operator_suggestion.is_empty() {
+                                return operator_suggestion;
                             }
                         }
-
-                        // Match other types
-                        match &flat.1 {
-                            FlatShape::Custom(decl_id) => {
-                                let mut completer = CustomCompletion::new(
-                                    self.stack.clone(),
-                                    *decl_id,
-                                    initial_line,
-                                    FileCompletion::new(),
-                                );
-
-                                return self.process_completion(
-                                    &mut completer,
-                                    &working_set,
-                                    prefix,
-                                    new_span,
-                                    fake_offset,
-                                    pos,
-                                );
-                            }
-                            FlatShape::Directory => {
-                                let mut completer = DirectoryCompletion::new();
-
-                                return self.process_completion(
-                                    &mut completer,
-                                    &working_set,
-                                    prefix,
-                                    new_span,
-                                    fake_offset,
-                                    pos,
-                                );
-                            }
-                            FlatShape::Filepath | FlatShape::GlobPattern => {
-                                let mut completer = FileCompletion::new();
-
-                                return self.process_completion(
-                                    &mut completer,
-                                    &working_set,
-                                    prefix,
-                                    new_span,
-                                    fake_offset,
-                                    pos,
-                                );
-                            }
-                            flat_shape => {
-                                let mut completer = CommandCompletion::new(
-                                    flattened.clone(),
-                                    // flat_idx,
-                                    flat_shape.clone(),
-                                    false,
-                                );
-
-                                let mut out: Vec<_> = self.process_completion(
-                                    &mut completer,
-                                    &working_set,
-                                    prefix,
-                                    new_span,
-                                    fake_offset,
-                                    pos,
-                                );
-
-                                if !out.is_empty() {
-                                    return out;
-                                }
-
-                                // Try to complete using an external completer (if set)
-                                if let Some(closure) =
-                                    config.completions.external.completer.as_ref()
-                                {
-                                    if let Some(external_result) = self.external_completion(
-                                        closure,
-                                        &spans,
-                                        fake_offset,
-                                        new_span,
-                                    ) {
-                                        return external_result;
-                                    }
-                                }
-
-                                // Check for file completion
-                                let mut completer = FileCompletion::new();
-                                out = self.process_completion(
-                                    &mut completer,
-                                    &working_set,
-                                    prefix,
-                                    new_span,
-                                    fake_offset,
-                                    pos,
-                                );
-
-                                if !out.is_empty() {
-                                    return out;
-                                }
-                            }
-                        };
                     }
                 }
+
+                // Match other types
+                match shape {
+                    FlatShape::Custom(decl_id) => {
+                        let mut completer = CustomCompletion::new(
+                            self.stack.clone(),
+                            *decl_id,
+                            initial_line,
+                            FileCompletion::new(),
+                        );
+
+                        return self.process_completion(
+                            &mut completer,
+                            &working_set,
+                            prefix,
+                            new_span,
+                            fake_offset,
+                            pos,
+                        );
+                    }
+                    FlatShape::Directory => {
+                        let mut completer = DirectoryCompletion::new();
+
+                        return self.process_completion(
+                            &mut completer,
+                            &working_set,
+                            prefix,
+                            new_span,
+                            fake_offset,
+                            pos,
+                        );
+                    }
+                    FlatShape::Filepath | FlatShape::GlobPattern => {
+                        let mut completer = FileCompletion::new();
+
+                        return self.process_completion(
+                            &mut completer,
+                            &working_set,
+                            prefix,
+                            new_span,
+                            fake_offset,
+                            pos,
+                        );
+                    }
+                    flat_shape => {
+                        let mut completer = CommandCompletion::new(
+                            flattened.clone(),
+                            // flat_idx,
+                            flat_shape.clone(),
+                            false,
+                        );
+
+                        let mut out: Vec<_> = self.process_completion(
+                            &mut completer,
+                            &working_set,
+                            prefix,
+                            new_span,
+                            fake_offset,
+                            pos,
+                        );
+
+                        if !out.is_empty() {
+                            return out;
+                        }
+
+                        // Try to complete using an external completer (if set)
+                        if let Some(closure) = config.completions.external.completer.as_ref() {
+                            if let Some(external_result) =
+                                self.external_completion(closure, &spans, fake_offset, new_span)
+                            {
+                                return external_result;
+                            }
+                        }
+
+                        // Check for file completion
+                        let mut completer = FileCompletion::new();
+                        out = self.process_completion(
+                            &mut completer,
+                            &working_set,
+                            prefix,
+                            new_span,
+                            fake_offset,
+                            pos,
+                        );
+
+                        if !out.is_empty() {
+                            return out;
+                        }
+                    }
+                };
             }
         }
 
diff --git a/crates/nu-lsp/src/ast.rs b/crates/nu-lsp/src/ast.rs
index 511a25ca6b..775093c133 100644
--- a/crates/nu-lsp/src/ast.rs
+++ b/crates/nu-lsp/src/ast.rs
@@ -1,172 +1,11 @@
 use crate::Id;
 use nu_protocol::{
-    ast::{
-        Argument, Block, Call, Expr, Expression, ExternalArgument, ListItem, MatchPattern,
-        PathMember, Pattern, PipelineRedirection, RecordItem,
-    },
+    ast::{Argument, Block, Call, Expr, Expression, FindMapResult, ListItem, PathMember, Traverse},
     engine::StateWorkingSet,
     Span,
 };
 use std::sync::Arc;
 
-/// similar to flatten_block, but allows extra map function
-pub fn ast_flat_map<'a, T, F>(
-    ast: &'a Arc<Block>,
-    working_set: &'a StateWorkingSet,
-    f_special: &F,
-) -> Vec<T>
-where
-    F: Fn(&'a Expression) -> Option<Vec<T>>,
-{
-    ast.pipelines
-        .iter()
-        .flat_map(|pipeline| {
-            pipeline.elements.iter().flat_map(|element| {
-                expr_flat_map(&element.expr, working_set, f_special)
-                    .into_iter()
-                    .chain(
-                        element
-                            .redirection
-                            .as_ref()
-                            .map(|redir| redirect_flat_map(redir, working_set, f_special))
-                            .unwrap_or_default(),
-                    )
-            })
-        })
-        .collect()
-}
-
-/// generic function that do flat_map on an expression
-/// concats all recursive results on sub-expressions
-///
-/// # Arguments
-/// * `f_special` - function that overrides the default behavior
-pub fn expr_flat_map<'a, T, F>(
-    expr: &'a Expression,
-    working_set: &'a StateWorkingSet,
-    f_special: &F,
-) -> Vec<T>
-where
-    F: Fn(&'a Expression) -> Option<Vec<T>>,
-{
-    // behavior overridden by f_special
-    if let Some(vec) = f_special(expr) {
-        return vec;
-    }
-    let recur = |expr| expr_flat_map(expr, working_set, f_special);
-    match &expr.expr {
-        Expr::RowCondition(block_id)
-        | Expr::Subexpression(block_id)
-        | Expr::Block(block_id)
-        | Expr::Closure(block_id) => {
-            let block = working_set.get_block(block_id.to_owned());
-            ast_flat_map(block, working_set, f_special)
-        }
-        Expr::Range(range) => [&range.from, &range.next, &range.to]
-            .iter()
-            .filter_map(|e| e.as_ref())
-            .flat_map(recur)
-            .collect(),
-        Expr::Call(call) => call
-            .arguments
-            .iter()
-            .filter_map(|arg| arg.expr())
-            .flat_map(recur)
-            .collect(),
-        Expr::ExternalCall(head, args) => recur(head)
-            .into_iter()
-            .chain(args.iter().flat_map(|arg| match arg {
-                ExternalArgument::Regular(e) | ExternalArgument::Spread(e) => recur(e),
-            }))
-            .collect(),
-        Expr::UnaryNot(expr) | Expr::Collect(_, expr) => recur(expr),
-        Expr::BinaryOp(lhs, op, rhs) => recur(lhs)
-            .into_iter()
-            .chain(recur(op))
-            .chain(recur(rhs))
-            .collect(),
-        Expr::MatchBlock(matches) => matches
-            .iter()
-            .flat_map(|(pattern, expr)| {
-                match_pattern_flat_map(pattern, working_set, f_special)
-                    .into_iter()
-                    .chain(recur(expr))
-            })
-            .collect(),
-        Expr::List(items) => items
-            .iter()
-            .flat_map(|item| match item {
-                ListItem::Item(expr) | ListItem::Spread(_, expr) => recur(expr),
-            })
-            .collect(),
-        Expr::Record(items) => items
-            .iter()
-            .flat_map(|item| match item {
-                RecordItem::Spread(_, expr) => recur(expr),
-                RecordItem::Pair(key, val) => [key, val].into_iter().flat_map(recur).collect(),
-            })
-            .collect(),
-        Expr::Table(table) => table
-            .columns
-            .iter()
-            .flat_map(recur)
-            .chain(table.rows.iter().flat_map(|row| row.iter().flat_map(recur)))
-            .collect(),
-        Expr::ValueWithUnit(vu) => recur(&vu.expr),
-        Expr::FullCellPath(fcp) => recur(&fcp.head),
-        Expr::Keyword(kw) => recur(&kw.expr),
-        Expr::StringInterpolation(vec) | Expr::GlobInterpolation(vec, _) => {
-            vec.iter().flat_map(recur).collect()
-        }
-
-        _ => Vec::new(),
-    }
-}
-
-/// flat_map on match patterns
-fn match_pattern_flat_map<'a, T, F>(
-    pattern: &'a MatchPattern,
-    working_set: &'a StateWorkingSet,
-    f_special: &F,
-) -> Vec<T>
-where
-    F: Fn(&'a Expression) -> Option<Vec<T>>,
-{
-    let recur = |expr| expr_flat_map(expr, working_set, f_special);
-    let recur_match = |p| match_pattern_flat_map(p, working_set, f_special);
-    match &pattern.pattern {
-        Pattern::Expression(expr) => recur(expr),
-        Pattern::List(patterns) | Pattern::Or(patterns) => {
-            patterns.iter().flat_map(recur_match).collect()
-        }
-        Pattern::Record(entries) => entries.iter().flat_map(|(_, p)| recur_match(p)).collect(),
-        _ => Vec::new(),
-    }
-    .into_iter()
-    .chain(pattern.guard.as_ref().map(|g| recur(g)).unwrap_or_default())
-    .collect()
-}
-
-/// flat_map on redirections
-fn redirect_flat_map<'a, T, F>(
-    redir: &'a PipelineRedirection,
-    working_set: &'a StateWorkingSet,
-    f_special: &F,
-) -> Vec<T>
-where
-    F: Fn(&'a Expression) -> Option<Vec<T>>,
-{
-    let recur = |expr| expr_flat_map(expr, working_set, f_special);
-    match redir {
-        PipelineRedirection::Single { target, .. } => target.expr().map(recur).unwrap_or_default(),
-        PipelineRedirection::Separate { out, err } => [out, err]
-            .iter()
-            .filter_map(|t| t.expr())
-            .flat_map(recur)
-            .collect(),
-    }
-}
-
 /// Adjust span if quoted
 fn strip_quotes(span: Span, working_set: &StateWorkingSet) -> Span {
     let text = String::from_utf8_lossy(working_set.get_span_contents(span));
@@ -436,22 +275,22 @@ fn find_id_in_expr(
     expr: &Expression,
     working_set: &StateWorkingSet,
     location: &usize,
-) -> Option<Vec<(Id, Span)>> {
+) -> FindMapResult<(Id, Span)> {
     // skip the entire expression if the location is not in it
     if !expr.span.contains(*location) {
-        return Some(Vec::new());
+        return FindMapResult::Stop;
     }
     let span = expr.span;
     match &expr.expr {
-        Expr::VarDecl(var_id) => Some(vec![(Id::Variable(*var_id), span)]),
+        Expr::VarDecl(var_id) => FindMapResult::Found((Id::Variable(*var_id), span)),
         // trim leading `$` sign
-        Expr::Var(var_id) => Some(vec![(
+        Expr::Var(var_id) => FindMapResult::Found((
             Id::Variable(*var_id),
             Span::new(span.start.saturating_add(1), span.end),
-        )]),
+        )),
         Expr::Call(call) => {
             if call.head.contains(*location) {
-                Some(vec![(Id::Declaration(call.decl_id), call.head)])
+                FindMapResult::Found((Id::Declaration(call.decl_id), call.head))
             } else {
                 try_find_id_in_def(call, working_set, Some(location), None)
                     .or(try_find_id_in_mod(call, working_set, Some(location), None))
@@ -462,19 +301,20 @@ fn find_id_in_expr(
                         Some(location),
                         None,
                     ))
-                    .map(|p| vec![p])
+                    .map(FindMapResult::Found)
+                    .unwrap_or_default()
             }
         }
         Expr::FullCellPath(fcp) => {
             if fcp.head.span.contains(*location) {
-                None
+                FindMapResult::Continue
             } else {
                 let Expression {
                     expr: Expr::Var(var_id),
                     ..
                 } = fcp.head
                 else {
-                    return None;
+                    return FindMapResult::Continue;
                 };
                 let tail: Vec<PathMember> = fcp
                     .tail
@@ -482,11 +322,13 @@ fn find_id_in_expr(
                     .into_iter()
                     .take_while(|pm| pm.span().start <= *location)
                     .collect();
-                let span = tail.last()?.span();
-                Some(vec![(Id::CellPath(var_id, tail), span)])
+                let Some(span) = tail.last().map(|pm| pm.span()) else {
+                    return FindMapResult::Stop;
+                };
+                FindMapResult::Found((Id::CellPath(var_id, tail), span))
             }
         }
-        Expr::Overlay(Some(module_id)) => Some(vec![(Id::Module(*module_id), span)]),
+        Expr::Overlay(Some(module_id)) => FindMapResult::Found((Id::Module(*module_id), span)),
         // terminal value expressions
         Expr::Bool(_)
         | Expr::Binary(_)
@@ -500,8 +342,8 @@ fn find_id_in_expr(
         | Expr::Nothing
         | Expr::RawString(_)
         | Expr::Signature(_)
-        | Expr::String(_) => Some(vec![(Id::Value(expr.ty.clone()), span)]),
-        _ => None,
+        | Expr::String(_) => FindMapResult::Found((Id::Value(expr.ty.clone()), span)),
+        _ => FindMapResult::Continue,
     }
 }
 
@@ -512,7 +354,7 @@ pub(crate) fn find_id(
     location: &usize,
 ) -> Option<(Id, Span)> {
     let closure = |e| find_id_in_expr(e, working_set, location);
-    ast_flat_map(ast, working_set, &closure).first().cloned()
+    ast.find_map(working_set, &closure)
 }
 
 fn find_reference_by_id_in_expr(
@@ -521,7 +363,6 @@ fn find_reference_by_id_in_expr(
     id: &Id,
 ) -> Option<Vec<Span>> {
     let closure = |e| find_reference_by_id_in_expr(e, working_set, id);
-    let recur = |expr| expr_flat_map(expr, working_set, &closure);
     match (&expr.expr, id) {
         (Expr::Var(vid1), Id::Variable(vid2)) if *vid1 == *vid2 => Some(vec![Span::new(
             // we want to exclude the `$` sign for renaming
@@ -536,7 +377,7 @@ fn find_reference_by_id_in_expr(
                 .arguments
                 .iter()
                 .filter_map(|arg| arg.expr())
-                .flat_map(recur)
+                .flat_map(|e| e.flat_map(working_set, &closure))
                 .collect();
             if matches!(id, Id::Declaration(decl_id) if call.decl_id == *decl_id) {
                 occurs.push(call.head);
@@ -560,7 +401,7 @@ pub(crate) fn find_reference_by_id(
     working_set: &StateWorkingSet,
     id: &Id,
 ) -> Vec<Span> {
-    ast_flat_map(ast, working_set, &|e| {
+    ast.flat_map(working_set, &|e| {
         find_reference_by_id_in_expr(e, working_set, id)
     })
 }
diff --git a/crates/nu-lsp/src/hints.rs b/crates/nu-lsp/src/hints.rs
index 96c191c7db..581a2e70b0 100644
--- a/crates/nu-lsp/src/hints.rs
+++ b/crates/nu-lsp/src/hints.rs
@@ -1,4 +1,3 @@
-use crate::ast::{ast_flat_map, expr_flat_map};
 use crate::{span_to_range, LanguageServer};
 use lsp_textdocument::FullTextDocument;
 use lsp_types::{
@@ -6,7 +5,7 @@ use lsp_types::{
     MarkupKind, Position, Range,
 };
 use nu_protocol::{
-    ast::{Argument, Block, Expr, Expression, Operator},
+    ast::{Argument, Block, Expr, Expression, Operator, Traverse},
     engine::StateWorkingSet,
     Type,
 };
@@ -29,11 +28,12 @@ fn extract_inlay_hints_from_expression(
     file: &FullTextDocument,
 ) -> Option<Vec<InlayHint>> {
     let closure = |e| extract_inlay_hints_from_expression(e, working_set, offset, file);
-    let recur = |expr| expr_flat_map(expr, working_set, &closure);
     match &expr.expr {
         Expr::BinaryOp(lhs, op, rhs) => {
-            let mut hints: Vec<InlayHint> =
-                [lhs, op, rhs].into_iter().flat_map(|e| recur(e)).collect();
+            let mut hints: Vec<InlayHint> = [lhs, op, rhs]
+                .into_iter()
+                .flat_map(|e| e.flat_map(working_set, &closure))
+                .collect();
             if let Expr::Operator(Operator::Assignment(_)) = op.expr {
                 let position = span_to_range(&lhs.span, file, *offset).end;
                 let type_rhs = type_short_name(&rhs.ty);
@@ -103,13 +103,13 @@ fn extract_inlay_hints_from_expression(
                 match arg {
                     // skip the rest when spread/unknown arguments encountered
                     Argument::Spread(expr) | Argument::Unknown(expr) => {
-                        hints.extend(recur(expr));
+                        hints.extend(expr.flat_map(working_set, &closure));
                         sig_idx = signatures.len();
                         continue;
                     }
                     // skip current for flags
                     Argument::Named((_, _, Some(expr))) => {
-                        hints.extend(recur(expr));
+                        hints.extend(expr.flat_map(working_set, &closure));
                         continue;
                     }
                     Argument::Positional(expr) => {
@@ -130,7 +130,7 @@ fn extract_inlay_hints_from_expression(
                                 padding_right: None,
                             });
                         }
-                        hints.extend(recur(expr));
+                        hints.extend(expr.flat_map(working_set, &closure));
                     }
                     _ => {
                         continue;
@@ -154,7 +154,7 @@ impl LanguageServer {
         offset: usize,
         file: &FullTextDocument,
     ) -> Vec<InlayHint> {
-        ast_flat_map(block, working_set, &|e| {
+        block.flat_map(working_set, &|e| {
             extract_inlay_hints_from_expression(e, working_set, &offset, file)
         })
     }
diff --git a/crates/nu-protocol/src/ast/call.rs b/crates/nu-protocol/src/ast/call.rs
index 0c42583c5c..7a0d2b0cb4 100644
--- a/crates/nu-protocol/src/ast/call.rs
+++ b/crates/nu-protocol/src/ast/call.rs
@@ -76,6 +76,15 @@ pub enum ExternalArgument {
     Spread(Expression),
 }
 
+impl ExternalArgument {
+    pub fn expr(&self) -> &Expression {
+        match self {
+            ExternalArgument::Regular(expr) => expr,
+            ExternalArgument::Spread(expr) => expr,
+        }
+    }
+}
+
 /// Parsed call of a `Command`
 ///
 /// As we also implement some internal keywords in terms of the `Command` trait, this type stores the passed arguments as [`Expression`].
diff --git a/crates/nu-protocol/src/ast/mod.rs b/crates/nu-protocol/src/ast/mod.rs
index cb09168805..0138431ec6 100644
--- a/crates/nu-protocol/src/ast/mod.rs
+++ b/crates/nu-protocol/src/ast/mod.rs
@@ -11,6 +11,7 @@ mod operator;
 mod pipeline;
 mod range;
 mod table;
+mod traverse;
 mod unit;
 mod value_with_unit;
 
@@ -26,5 +27,6 @@ pub use operator::*;
 pub use pipeline::*;
 pub use range::*;
 pub use table::Table;
+pub use traverse::*;
 pub use unit::*;
 pub use value_with_unit::*;
diff --git a/crates/nu-protocol/src/ast/traverse.rs b/crates/nu-protocol/src/ast/traverse.rs
new file mode 100644
index 0000000000..2c9e6dbaa1
--- /dev/null
+++ b/crates/nu-protocol/src/ast/traverse.rs
@@ -0,0 +1,282 @@
+use crate::engine::StateWorkingSet;
+
+use super::{
+    Block, Expr, Expression, ListItem, MatchPattern, Pattern, PipelineRedirection, RecordItem,
+};
+
+/// Result of find_map closure
+#[derive(Default)]
+pub enum FindMapResult<T> {
+    Found(T),
+    #[default]
+    Continue,
+    Stop,
+}
+
+/// Trait for traversing the AST
+pub trait Traverse {
+    /// Generic function that do flat_map on an AST node
+    /// concatenates all recursive results on sub-expressions
+    ///
+    /// # Arguments
+    /// * `f` - function that overrides the default behavior
+    fn flat_map<'a, T, F>(&'a self, working_set: &'a StateWorkingSet, f: &F) -> Vec<T>
+    where
+        F: Fn(&'a Expression) -> Option<Vec<T>>;
+
+    /// Generic function that do find_map on an AST node
+    /// return the first Some
+    ///
+    /// # Arguments
+    /// * `f` - function that overrides the default behavior
+    fn find_map<'a, T, F>(&'a self, working_set: &'a StateWorkingSet, f: &F) -> Option<T>
+    where
+        F: Fn(&'a Expression) -> FindMapResult<T>;
+}
+
+impl Traverse for Block {
+    fn flat_map<'a, T, F>(&'a self, working_set: &'a StateWorkingSet, f: &F) -> Vec<T>
+    where
+        F: Fn(&'a Expression) -> Option<Vec<T>>,
+    {
+        self.pipelines
+            .iter()
+            .flat_map(|pipeline| {
+                pipeline.elements.iter().flat_map(|element| {
+                    element.expr.flat_map(working_set, f).into_iter().chain(
+                        element
+                            .redirection
+                            .as_ref()
+                            .map(|redir| redir.flat_map(working_set, f))
+                            .unwrap_or_default(),
+                    )
+                })
+            })
+            .collect()
+    }
+
+    fn find_map<'a, T, F>(&'a self, working_set: &'a StateWorkingSet, f: &F) -> Option<T>
+    where
+        F: Fn(&'a Expression) -> FindMapResult<T>,
+    {
+        self.pipelines.iter().find_map(|pipeline| {
+            pipeline.elements.iter().find_map(|element| {
+                element.expr.find_map(working_set, f).or(element
+                    .redirection
+                    .as_ref()
+                    .and_then(|redir| redir.find_map(working_set, f)))
+            })
+        })
+    }
+}
+
+impl Traverse for PipelineRedirection {
+    fn flat_map<'a, T, F>(&'a self, working_set: &'a StateWorkingSet, f: &F) -> Vec<T>
+    where
+        F: Fn(&'a Expression) -> Option<Vec<T>>,
+    {
+        let recur = |expr: &'a Expression| expr.flat_map(working_set, f);
+        match self {
+            PipelineRedirection::Single { target, .. } => {
+                target.expr().map(recur).unwrap_or_default()
+            }
+            PipelineRedirection::Separate { out, err } => [out, err]
+                .iter()
+                .filter_map(|t| t.expr())
+                .flat_map(recur)
+                .collect(),
+        }
+    }
+
+    fn find_map<'a, T, F>(&'a self, working_set: &'a StateWorkingSet, f: &F) -> Option<T>
+    where
+        F: Fn(&'a Expression) -> FindMapResult<T>,
+    {
+        let recur = |expr: &'a Expression| expr.find_map(working_set, f);
+        match self {
+            PipelineRedirection::Single { target, .. } => {
+                target.expr().map(recur).unwrap_or_default()
+            }
+            PipelineRedirection::Separate { out, err } => {
+                [out, err].iter().filter_map(|t| t.expr()).find_map(recur)
+            }
+        }
+    }
+}
+
+impl Traverse for Expression {
+    fn flat_map<'a, T, F>(&'a self, working_set: &'a StateWorkingSet, f: &F) -> Vec<T>
+    where
+        F: Fn(&'a Expression) -> Option<Vec<T>>,
+    {
+        // behavior overridden by f
+        if let Some(vec) = f(self) {
+            return vec;
+        }
+        let recur = |expr: &'a Expression| expr.flat_map(working_set, f);
+        match &self.expr {
+            Expr::RowCondition(block_id)
+            | Expr::Subexpression(block_id)
+            | Expr::Block(block_id)
+            | Expr::Closure(block_id) => {
+                let block = working_set.get_block(block_id.to_owned());
+                block.flat_map(working_set, f)
+            }
+            Expr::Range(range) => [&range.from, &range.next, &range.to]
+                .iter()
+                .filter_map(|e| e.as_ref())
+                .flat_map(recur)
+                .collect(),
+            Expr::Call(call) => call
+                .arguments
+                .iter()
+                .filter_map(|arg| arg.expr())
+                .flat_map(recur)
+                .collect(),
+            Expr::ExternalCall(head, args) => recur(head.as_ref())
+                .into_iter()
+                .chain(args.iter().flat_map(|arg| recur(arg.expr())))
+                .collect(),
+            Expr::UnaryNot(expr) | Expr::Collect(_, expr) => recur(expr.as_ref()),
+            Expr::BinaryOp(lhs, op, rhs) => recur(lhs)
+                .into_iter()
+                .chain(recur(op))
+                .chain(recur(rhs))
+                .collect(),
+            Expr::MatchBlock(matches) => matches
+                .iter()
+                .flat_map(|(pattern, expr)| {
+                    pattern
+                        .flat_map(working_set, f)
+                        .into_iter()
+                        .chain(recur(expr))
+                })
+                .collect(),
+            Expr::List(items) => items
+                .iter()
+                .flat_map(|item| match item {
+                    ListItem::Item(expr) | ListItem::Spread(_, expr) => recur(expr),
+                })
+                .collect(),
+            Expr::Record(items) => items
+                .iter()
+                .flat_map(|item| match item {
+                    RecordItem::Spread(_, expr) => recur(expr),
+                    RecordItem::Pair(key, val) => [key, val].into_iter().flat_map(recur).collect(),
+                })
+                .collect(),
+            Expr::Table(table) => table
+                .columns
+                .iter()
+                .flat_map(recur)
+                .chain(table.rows.iter().flat_map(|row| row.iter().flat_map(recur)))
+                .collect(),
+            Expr::ValueWithUnit(vu) => recur(&vu.expr),
+            Expr::FullCellPath(fcp) => recur(&fcp.head),
+            Expr::Keyword(kw) => recur(&kw.expr),
+            Expr::StringInterpolation(vec) | Expr::GlobInterpolation(vec, _) => {
+                vec.iter().flat_map(recur).collect()
+            }
+
+            _ => Vec::new(),
+        }
+    }
+
+    fn find_map<'a, T, F>(&'a self, working_set: &'a StateWorkingSet, f: &F) -> Option<T>
+    where
+        F: Fn(&'a Expression) -> FindMapResult<T>,
+    {
+        // behavior overridden by f
+        match f(self) {
+            FindMapResult::Found(t) => Some(t),
+            FindMapResult::Stop => None,
+            FindMapResult::Continue => {
+                let recur = |expr: &'a Expression| expr.find_map(working_set, f);
+                match &self.expr {
+                    Expr::RowCondition(block_id)
+                    | Expr::Subexpression(block_id)
+                    | Expr::Block(block_id)
+                    | Expr::Closure(block_id) => {
+                        let block = working_set.get_block(block_id.to_owned());
+                        block.find_map(working_set, f)
+                    }
+                    Expr::Range(range) => [&range.from, &range.next, &range.to]
+                        .iter()
+                        .find_map(|e| e.as_ref().and_then(recur)),
+                    Expr::Call(call) => call
+                        .arguments
+                        .iter()
+                        .find_map(|arg| arg.expr().and_then(recur)),
+                    Expr::ExternalCall(head, args) => {
+                        recur(head.as_ref()).or(args.iter().find_map(|arg| recur(arg.expr())))
+                    }
+                    Expr::UnaryNot(expr) | Expr::Collect(_, expr) => recur(expr.as_ref()),
+                    Expr::BinaryOp(lhs, op, rhs) => recur(lhs).or(recur(op)).or(recur(rhs)),
+                    Expr::MatchBlock(matches) => matches.iter().find_map(|(pattern, expr)| {
+                        pattern.find_map(working_set, f).or(recur(expr))
+                    }),
+                    Expr::List(items) => items.iter().find_map(|item| match item {
+                        ListItem::Item(expr) | ListItem::Spread(_, expr) => recur(expr),
+                    }),
+                    Expr::Record(items) => items.iter().find_map(|item| match item {
+                        RecordItem::Spread(_, expr) => recur(expr),
+                        RecordItem::Pair(key, val) => [key, val].into_iter().find_map(recur),
+                    }),
+                    Expr::Table(table) => table
+                        .columns
+                        .iter()
+                        .find_map(recur)
+                        .or(table.rows.iter().find_map(|row| row.iter().find_map(recur))),
+                    Expr::ValueWithUnit(vu) => recur(&vu.expr),
+                    Expr::FullCellPath(fcp) => recur(&fcp.head),
+                    Expr::Keyword(kw) => recur(&kw.expr),
+                    Expr::StringInterpolation(vec) | Expr::GlobInterpolation(vec, _) => {
+                        vec.iter().find_map(recur)
+                    }
+
+                    _ => None,
+                }
+            }
+        }
+    }
+}
+
+impl Traverse for MatchPattern {
+    fn flat_map<'a, T, F>(&'a self, working_set: &'a StateWorkingSet, f: &F) -> Vec<T>
+    where
+        F: Fn(&'a Expression) -> Option<Vec<T>>,
+    {
+        let recur = |expr: &'a Expression| expr.flat_map(working_set, f);
+        let recur_pattern = |pattern: &'a MatchPattern| pattern.flat_map(working_set, f);
+        match &self.pattern {
+            Pattern::Expression(expr) => recur(expr),
+            Pattern::List(patterns) | Pattern::Or(patterns) => {
+                patterns.iter().flat_map(recur_pattern).collect()
+            }
+            Pattern::Record(entries) => {
+                entries.iter().flat_map(|(_, p)| recur_pattern(p)).collect()
+            }
+            _ => Vec::new(),
+        }
+        .into_iter()
+        .chain(self.guard.as_ref().map(|g| recur(g)).unwrap_or_default())
+        .collect()
+    }
+
+    fn find_map<'a, T, F>(&'a self, working_set: &'a StateWorkingSet, f: &F) -> Option<T>
+    where
+        F: Fn(&'a Expression) -> FindMapResult<T>,
+    {
+        let recur = |expr: &'a Expression| expr.find_map(working_set, f);
+        let recur_pattern = |pattern: &'a MatchPattern| pattern.find_map(working_set, f);
+        match &self.pattern {
+            Pattern::Expression(expr) => recur(expr),
+            Pattern::List(patterns) | Pattern::Or(patterns) => {
+                patterns.iter().find_map(recur_pattern)
+            }
+            Pattern::Record(entries) => entries.iter().find_map(|(_, p)| recur_pattern(p)),
+            _ => None,
+        }
+        .or(self.guard.as_ref().and_then(|g| recur(g)))
+    }
+}

From c7d3014849a73a5381523dd4a270b64c6f4047ba Mon Sep 17 00:00:00 2001
From: Tyler Miller <tmillr@proton.me>
Date: Thu, 6 Feb 2025 04:53:32 -0800
Subject: [PATCH 1005/1072] feat(cli): add vi solidus `/` keybinding (#14908)

# Description

- Add keybinding for `/` when in vi normal mode which activates the
history menu.
- Make keybinding `mode` (`edit_mode`) case-insensitive.

This keybinding exists both in vim and GNU Readline (e.g. bash) when in
vi normal mode. The reason this keybinding is getting added here (and
not in `reedline`) is because it triggers the history menu, and should
only be defined when the history menu exists. Menus are defined
externally to `reedline`.

# User-Facing Changes

Added keybinding for `/` when in vi normal mode which activates the
history menu.

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting

TODO: Update docs
---
 crates/nu-cli/src/reedline_config.rs | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/crates/nu-cli/src/reedline_config.rs b/crates/nu-cli/src/reedline_config.rs
index 4012876ac0..ea5af59c16 100644
--- a/crates/nu-cli/src/reedline_config.rs
+++ b/crates/nu-cli/src/reedline_config.rs
@@ -707,6 +707,11 @@ pub(crate) fn create_keybindings(config: &Config) -> Result<KeybindingsMode, She
         EditBindings::Vi => {
             add_menu_keybindings(&mut insert_keybindings);
             add_menu_keybindings(&mut normal_keybindings);
+            normal_keybindings.add_binding(
+                KeyModifiers::NONE,
+                KeyCode::Char('/'),
+                ReedlineEvent::Menu("history_menu".to_string()),
+            );
         }
     }
     for keybinding in parsed_keybindings {
@@ -740,9 +745,15 @@ fn add_keybinding(
     let span = mode.span();
     match &mode {
         Value::String { val, .. } => match val.as_str() {
-            "emacs" => add_parsed_keybinding(emacs_keybindings, keybinding, config),
-            "vi_insert" => add_parsed_keybinding(insert_keybindings, keybinding, config),
-            "vi_normal" => add_parsed_keybinding(normal_keybindings, keybinding, config),
+            str if str.eq_ignore_ascii_case("emacs") => {
+                add_parsed_keybinding(emacs_keybindings, keybinding, config)
+            }
+            str if str.eq_ignore_ascii_case("vi_insert") => {
+                add_parsed_keybinding(insert_keybindings, keybinding, config)
+            }
+            str if str.eq_ignore_ascii_case("vi_normal") => {
+                add_parsed_keybinding(normal_keybindings, keybinding, config)
+            }
             str => Err(ShellError::InvalidValue {
                 valid: "'emacs', 'vi_insert', or 'vi_normal'".into(),
                 actual: format!("'{str}'"),

From 5be818b5eebbc2466524e823f296bbfe448e6871 Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Thu, 6 Feb 2025 15:56:30 +0300
Subject: [PATCH 1006/1072] make `echo` const (#14997)

# Description

Make `echo` const.
- It's a very simple command, there is no reason for it to not be const.
- It's return type `any` is utilized in tests to type erase values, this
might be useful for testing const evaluation too.
- The upcoming custom command attribute feature can make use of it as a
stopgap replacement for `const def` commands.

# User-Facing Changes

`echo` can be used in const contexts.

# Tests + Formatting

# After Submitting
N/A
---
 crates/nu-cmd-lang/src/core_commands/echo.rs | 32 +++++++++++++++-----
 crates/nu-command/tests/commands/echo.rs     |  6 ++++
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/crates/nu-cmd-lang/src/core_commands/echo.rs b/crates/nu-cmd-lang/src/core_commands/echo.rs
index d4ebeb2aa8..6ee46153e5 100644
--- a/crates/nu-cmd-lang/src/core_commands/echo.rs
+++ b/crates/nu-cmd-lang/src/core_commands/echo.rs
@@ -34,13 +34,22 @@ little reason to use this over just writing the values as-is."#
         call: &Call,
         _input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let mut args = call.rest(engine_state, stack, 0)?;
-        let value = match args.len() {
-            0 => Value::string("", call.head),
-            1 => args.pop().expect("one element"),
-            _ => Value::list(args, call.head),
-        };
-        Ok(value.into_pipeline_data())
+        let args = call.rest(engine_state, stack, 0)?;
+        echo_impl(args, call.head)
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let args = call.rest_const(working_set, 0)?;
+        echo_impl(args, call.head)
+    }
+
+    fn is_const(&self) -> bool {
+        true
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -63,6 +72,15 @@ little reason to use this over just writing the values as-is."#
     }
 }
 
+fn echo_impl(mut args: Vec<Value>, head: Span) -> Result<PipelineData, ShellError> {
+    let value = match args.len() {
+        0 => Value::string("", head),
+        1 => args.pop().expect("one element"),
+        _ => Value::list(args, head),
+    };
+    Ok(value.into_pipeline_data())
+}
+
 #[cfg(test)]
 mod test {
     #[test]
diff --git a/crates/nu-command/tests/commands/echo.rs b/crates/nu-command/tests/commands/echo.rs
index 44e6d81459..a03928d4e3 100644
--- a/crates/nu-command/tests/commands/echo.rs
+++ b/crates/nu-command/tests/commands/echo.rs
@@ -34,3 +34,9 @@ fn echo_range_handles_exclusive_down() {
 
     assert_eq!(actual.out, "[3,2]");
 }
+
+#[test]
+fn echo_is_const() {
+    let actual = nu!(r#"const val = echo 1..3; $val | to json --raw"#);
+    assert_eq!(actual.out, "[1,2,3]");
+}

From 1a1a9608360a93da254a9995f1758ec56d08d5e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=B3bert=20Kalm=C3=A1r?= <rfrostkalmar@gmail.com>
Date: Thu, 6 Feb 2025 13:56:53 +0100
Subject: [PATCH 1007/1072] feat(explore): Allow expanding selected cell with
 'e' (#15000)

Closes #14993
<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

# User-Facing Changes
New keybinding has been added to `explore`
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-explore/src/views/record/mod.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/crates/nu-explore/src/views/record/mod.rs b/crates/nu-explore/src/views/record/mod.rs
index e003348258..3e7d00615d 100644
--- a/crates/nu-explore/src/views/record/mod.rs
+++ b/crates/nu-explore/src/views/record/mod.rs
@@ -414,10 +414,7 @@ impl CursorMoveHandler for RecordView {
         Transition::Ok
     }
     fn handle_expand(&mut self) -> Transition {
-        match self.mode {
-            UIMode::View => Transition::Cmd(String::from("expand")),
-            _ => Transition::None,
-        }
+        Transition::Cmd(String::from("expand"))
     }
     fn handle_transpose(&mut self) -> Transition {
         match self.mode {

From 0705fb9cd19dec723798f53bdf2ba90b9d8b0412 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Thu, 6 Feb 2025 04:59:39 -0800
Subject: [PATCH 1008/1072] Added S3 support for `polars save` (#15005)

# Description
Parquet, CSV, NDJSON, and Arrow files can be written to AWS S3 via
`polars save`. This mirrors the s3 functionality provided by `polars
open`.

```nushell
ls | polars into-df | polars save s3://my-bucket/test.parquet
```

# User-Facing Changes
- S3 urls are now supported by `polars save`
---
 .../src/dataframe/command/core/mod.rs         |  6 +-
 .../src/dataframe/command/core/open.rs        | 70 ++-------------
 .../src/dataframe/command/core/resource.rs    | 85 +++++++++++++++++++
 .../src/dataframe/command/core/save/arrow.rs  | 29 ++++---
 .../src/dataframe/command/core/save/avro.rs   |  9 +-
 .../src/dataframe/command/core/save/csv.rs    | 22 +++--
 .../src/dataframe/command/core/save/mod.rs    | 76 +++++++++--------
 .../src/dataframe/command/core/save/ndjson.rs | 29 ++++---
 .../dataframe/command/core/save/parquet.rs    | 31 ++++---
 9 files changed, 207 insertions(+), 150 deletions(-)
 create mode 100644 crates/nu_plugin_polars/src/dataframe/command/core/resource.rs

diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/mod.rs b/crates/nu_plugin_polars/src/dataframe/command/core/mod.rs
index f71a3dfdbd..fecbba2d69 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/mod.rs
@@ -3,6 +3,7 @@ mod columns;
 mod fetch;
 mod open;
 mod profile;
+mod resource;
 mod save;
 mod schema;
 mod shape;
@@ -12,11 +13,10 @@ mod to_lazy;
 mod to_nu;
 mod to_repr;
 
-use crate::PolarsPlugin;
-use nu_plugin::PluginCommand;
-
 pub use self::open::OpenDataFrame;
+use crate::PolarsPlugin;
 use fetch::LazyFetch;
+use nu_plugin::PluginCommand;
 pub use schema::SchemaCmd;
 pub use shape::ShapeDF;
 pub use summary::Summary;
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/open.rs b/crates/nu_plugin_polars/src/dataframe/command/core/open.rs
index b218530e64..f9620290db 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/open.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/open.rs
@@ -1,13 +1,11 @@
 use crate::{
-    cloud::build_cloud_options,
+    command::core::resource::Resource,
     dataframe::values::NuSchema,
     values::{CustomValueSupport, NuDataFrame, NuLazyFrame, PolarsFileType},
     EngineWrapper, PolarsPlugin,
 };
 use log::debug;
-use nu_path::expand_path_with;
 use nu_utils::perf;
-use url::Url;
 
 use nu_plugin::PluginCommand;
 use nu_protocol::{
@@ -15,7 +13,7 @@ use nu_protocol::{
     Span, Spanned, SyntaxShape, Type, Value,
 };
 
-use std::{fmt::Debug, fs::File, io::BufReader, num::NonZeroUsize, path::PathBuf, sync::Arc};
+use std::{fs::File, io::BufReader, num::NonZeroUsize, path::PathBuf, sync::Arc};
 
 use polars::{
     lazy::frame::LazyJsonLineReader,
@@ -25,7 +23,7 @@ use polars::{
     },
 };
 
-use polars_io::{avro::AvroReader, cloud::CloudOptions, csv::read::CsvReadOptions, HiveOptions};
+use polars_io::{avro::AvroReader, csv::read::CsvReadOptions, HiveOptions};
 
 const DEFAULT_INFER_SCHEMA: usize = 100;
 
@@ -116,61 +114,6 @@ impl PluginCommand for OpenDataFrame {
     }
 }
 
-struct Resource {
-    path: String,
-    extension: Option<String>,
-    cloud_options: Option<CloudOptions>,
-    span: Span,
-}
-
-impl Debug for Resource {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        // We can't print out the cloud options as it might have
-        // secrets in it.. So just print whether or not it was defined
-        f.debug_struct("Resource")
-            .field("path", &self.path)
-            .field("extension", &self.extension)
-            .field("has_cloud_options", &self.cloud_options.is_some())
-            .field("span", &self.span)
-            .finish()
-    }
-}
-
-impl Resource {
-    fn new(
-        plugin: &PolarsPlugin,
-        engine: &nu_plugin::EngineInterface,
-        spanned_path: &Spanned<String>,
-    ) -> Result<Self, ShellError> {
-        let mut path = spanned_path.item.clone();
-        let (path_buf, cloud_options) = if let Ok(url) = path.parse::<Url>() {
-            let cloud_options =
-                build_cloud_options(plugin, &url)?.ok_or(ShellError::GenericError {
-                    error: format!("Could not determine a supported cloud type from url: {url}"),
-                    msg: "".into(),
-                    span: None,
-                    help: None,
-                    inner: vec![],
-                })?;
-            let p: PathBuf = url.path().into();
-            (p, Some(cloud_options))
-        } else {
-            let new_path = expand_path_with(path, engine.get_current_dir()?, true);
-            path = new_path.to_string_lossy().to_string();
-            (new_path, None)
-        };
-        let extension = path_buf
-            .extension()
-            .and_then(|s| s.to_str().map(|s| s.to_string()));
-        Ok(Self {
-            path,
-            extension,
-            cloud_options,
-            span: spanned_path.span,
-        })
-    }
-}
-
 fn command(
     plugin: &PolarsPlugin,
     engine: &nu_plugin::EngineInterface,
@@ -242,7 +185,7 @@ fn from_parquet(
     let file_span = resource.span;
     if !is_eager {
         let args = ScanArgsParquet {
-            cloud_options: resource.cloud_options.clone(),
+            cloud_options: resource.cloud_options,
             ..Default::default()
         };
         let df: NuLazyFrame = LazyFrame::scan_parquet(file_path, args)
@@ -345,7 +288,7 @@ fn from_arrow(
             cache: true,
             rechunk: false,
             row_index: None,
-            cloud_options: resource.cloud_options.clone(),
+            cloud_options: resource.cloud_options,
             include_file_paths: None,
             hive_options: HiveOptions::default(),
         };
@@ -544,8 +487,7 @@ fn from_csv(
     let truncate_ragged_lines: bool = call.has_flag("truncate-ragged-lines")?;
 
     if !is_eager {
-        let csv_reader =
-            LazyCsvReader::new(file_path).with_cloud_options(resource.cloud_options.clone());
+        let csv_reader = LazyCsvReader::new(file_path).with_cloud_options(resource.cloud_options);
 
         let csv_reader = match delimiter {
             None => csv_reader,
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/resource.rs b/crates/nu_plugin_polars/src/dataframe/command/core/resource.rs
new file mode 100644
index 0000000000..e5cbaf7cb4
--- /dev/null
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/resource.rs
@@ -0,0 +1,85 @@
+use std::path::{Component, Path, PathBuf};
+
+use crate::{cloud::build_cloud_options, PolarsPlugin};
+use nu_path::expand_path_with;
+use nu_protocol::{ShellError, Span, Spanned};
+use polars_io::cloud::CloudOptions;
+use url::Url;
+
+pub(crate) struct Resource {
+    pub(crate) path: String,
+    pub(crate) extension: Option<String>,
+    pub(crate) cloud_options: Option<CloudOptions>,
+    pub(crate) span: Span,
+}
+
+impl std::fmt::Debug for Resource {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        // We can't print out the cloud options as it might have
+        // secrets in it.. So just print whether or not it was defined
+        f.debug_struct("Resource")
+            .field("path", &self.path)
+            .field("extension", &self.extension)
+            .field("has_cloud_options", &self.cloud_options.is_some())
+            .field("span", &self.span)
+            .finish()
+    }
+}
+
+impl Resource {
+    pub(crate) fn new(
+        plugin: &PolarsPlugin,
+        engine: &nu_plugin::EngineInterface,
+        spanned_path: &Spanned<String>,
+    ) -> Result<Self, ShellError> {
+        let mut path = spanned_path.item.clone();
+
+        let (path_buf, cloud_options) = match path.parse::<Url>() {
+            Ok(url) if !is_windows_path(&path) => {
+                let cloud_options =
+                    build_cloud_options(plugin, &url)?.ok_or(ShellError::GenericError {
+                        error: format!(
+                            "Could not determine a supported cloud type from url: {url}"
+                        ),
+                        msg: "".into(),
+                        span: None,
+                        help: None,
+                        inner: vec![],
+                    })?;
+                let p: PathBuf = url.path().into();
+                (p, Some(cloud_options))
+            }
+            _ => {
+                let new_path = expand_path_with(path, engine.get_current_dir()?, true);
+                path = new_path.to_string_lossy().to_string();
+                (new_path, None)
+            }
+        };
+
+        let extension = path_buf
+            .extension()
+            .and_then(|s| s.to_str().map(|s| s.to_string()));
+        Ok(Self {
+            path,
+            extension,
+            cloud_options,
+            span: spanned_path.span,
+        })
+    }
+}
+
+// This is needed because Url parses windows paths as
+// valid URLs.
+fn is_windows_path(path: &str) -> bool {
+    // Only window spath will
+    if path.contains('\\') {
+        return true;
+    }
+
+    let path = Path::new(path);
+    match path.components().next() {
+        // This will only occur if their is a drive prefix
+        Some(Component::Prefix(_)) => true,
+        _ => false,
+    }
+}
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/save/arrow.rs b/crates/nu_plugin_polars/src/dataframe/command/core/save/arrow.rs
index 2a9d1dd947..35b21968d1 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/save/arrow.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/save/arrow.rs
@@ -1,31 +1,36 @@
-use std::{fs::File, path::Path};
+use std::fs::File;
 
 use nu_plugin::EvaluatedCall;
-use nu_protocol::{ShellError, Span};
+use nu_protocol::ShellError;
 use polars::prelude::{IpcWriter, SerWriter};
 use polars_io::ipc::IpcWriterOptions;
 
-use crate::values::{NuDataFrame, NuLazyFrame};
+use crate::{
+    command::core::resource::Resource,
+    values::{NuDataFrame, NuLazyFrame},
+};
 
 use super::polars_file_save_error;
 
 pub(crate) fn command_lazy(
     _call: &EvaluatedCall,
     lazy: &NuLazyFrame,
-    file_path: &Path,
-    file_span: Span,
+    resource: Resource,
 ) -> Result<(), ShellError> {
+    let file_path = resource.path;
+    let file_span = resource.span;
     lazy.to_polars()
-        // todo - add cloud options
-        .sink_ipc(file_path, IpcWriterOptions::default(), None)
+        .sink_ipc(
+            file_path,
+            IpcWriterOptions::default(),
+            resource.cloud_options,
+        )
         .map_err(|e| polars_file_save_error(e, file_span))
 }
 
-pub(crate) fn command_eager(
-    df: &NuDataFrame,
-    file_path: &Path,
-    file_span: Span,
-) -> Result<(), ShellError> {
+pub(crate) fn command_eager(df: &NuDataFrame, resource: Resource) -> Result<(), ShellError> {
+    let file_path = resource.path;
+    let file_span = resource.span;
     let mut file = File::create(file_path).map_err(|e| ShellError::GenericError {
         error: format!("Error with file name: {e}"),
         msg: "".into(),
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/save/avro.rs b/crates/nu_plugin_polars/src/dataframe/command/core/save/avro.rs
index ef5c0cdca2..d3012aa685 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/save/avro.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/save/avro.rs
@@ -1,11 +1,11 @@
 use std::fs::File;
-use std::path::Path;
 
 use nu_plugin::EvaluatedCall;
-use nu_protocol::{ShellError, Span};
+use nu_protocol::ShellError;
 use polars_io::avro::{AvroCompression, AvroWriter};
 use polars_io::SerWriter;
 
+use crate::command::core::resource::Resource;
 use crate::values::NuDataFrame;
 
 fn get_compression(call: &EvaluatedCall) -> Result<Option<AvroCompression>, ShellError> {
@@ -31,9 +31,10 @@ fn get_compression(call: &EvaluatedCall) -> Result<Option<AvroCompression>, Shel
 pub(crate) fn command_eager(
     call: &EvaluatedCall,
     df: &NuDataFrame,
-    file_path: &Path,
-    file_span: Span,
+    resource: Resource,
 ) -> Result<(), ShellError> {
+    let file_path = resource.path;
+    let file_span = resource.span;
     let compression = get_compression(call)?;
 
     let file = File::create(file_path).map_err(|e| ShellError::GenericError {
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/save/csv.rs b/crates/nu_plugin_polars/src/dataframe/command/core/save/csv.rs
index 0a4b79f0b3..c2c6a37ce0 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/save/csv.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/save/csv.rs
@@ -1,20 +1,24 @@
-use std::{fs::File, path::Path};
+use std::fs::File;
 
 use nu_plugin::EvaluatedCall;
-use nu_protocol::{ShellError, Span, Spanned};
+use nu_protocol::{ShellError, Spanned};
 use polars::prelude::{CsvWriter, SerWriter};
 use polars_io::csv::write::{CsvWriterOptions, SerializeOptions};
 
-use crate::values::{NuDataFrame, NuLazyFrame};
+use crate::{
+    command::core::resource::Resource,
+    values::{NuDataFrame, NuLazyFrame},
+};
 
 use super::polars_file_save_error;
 
 pub(crate) fn command_lazy(
     call: &EvaluatedCall,
     lazy: &NuLazyFrame,
-    file_path: &Path,
-    file_span: Span,
+    resource: Resource,
 ) -> Result<(), ShellError> {
+    let file_path = resource.path;
+    let file_span = resource.span;
     let delimiter: Option<Spanned<String>> = call.get_flag("csv-delimiter")?;
     let separator = delimiter
         .and_then(|d| d.item.chars().next().map(|c| c as u8))
@@ -32,17 +36,17 @@ pub(crate) fn command_lazy(
     };
 
     lazy.to_polars()
-        // todo - add cloud options
-        .sink_csv(file_path, options, None)
+        .sink_csv(file_path, options, resource.cloud_options)
         .map_err(|e| polars_file_save_error(e, file_span))
 }
 
 pub(crate) fn command_eager(
     call: &EvaluatedCall,
     df: &NuDataFrame,
-    file_path: &Path,
-    file_span: Span,
+    resource: Resource,
 ) -> Result<(), ShellError> {
+    let file_path = resource.path;
+    let file_span = resource.span;
     let delimiter: Option<Spanned<String>> = call.get_flag("csv-delimiter")?;
     let no_header: bool = call.has_flag("csv-no-header")?;
 
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/save/mod.rs b/crates/nu_plugin_polars/src/dataframe/command/core/save/mod.rs
index 775baca990..f5fad3b495 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/save/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/save/mod.rs
@@ -7,11 +7,12 @@ mod parquet;
 use std::path::PathBuf;
 
 use crate::{
+    command::core::resource::Resource,
     values::{cant_convert_err, PolarsFileType, PolarsPluginObject, PolarsPluginType},
     PolarsPlugin,
 };
 
-use nu_path::expand_path_with;
+use log::debug;
 use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
 use nu_protocol::{
     shell_error::io::IoError, Category, Example, LabeledError, PipelineData, ShellError, Signature,
@@ -35,7 +36,7 @@ impl PluginCommand for SaveDF {
 
     fn signature(&self) -> Signature {
         Signature::build(self.name())
-            .required("path", SyntaxShape::Filepath, "Path to write to.")
+            .required("path", SyntaxShape::String, "Path or cloud url to write to")
             .named(
                 "type",
                 SyntaxShape::String,
@@ -127,70 +128,77 @@ impl PluginCommand for SaveDF {
 }
 
 fn command(
-    _plugin: &PolarsPlugin,
+    plugin: &PolarsPlugin,
     engine: &EngineInterface,
     call: &EvaluatedCall,
     polars_object: PolarsPluginObject,
 ) -> Result<PipelineData, ShellError> {
-    let spanned_file: Spanned<PathBuf> = call.req(0)?;
-    let file_path = expand_path_with(&spanned_file.item, engine.get_current_dir()?, true);
-    let file_span = spanned_file.span;
+    let spanned_file: Spanned<String> = call.req(0)?;
+    debug!("file: {}", spanned_file.item);
+
+    let resource = Resource::new(plugin, engine, &spanned_file)?;
     let type_option: Option<(String, Span)> = call
         .get_flag("type")?
         .map(|t: Spanned<String>| (t.item, t.span))
-        .or_else(|| {
-            file_path
-                .extension()
-                .map(|e| (e.to_string_lossy().into_owned(), spanned_file.span))
-        });
+        .or_else(|| resource.extension.clone().map(|e| (e, resource.span)));
+    debug!("resource: {resource:?}");
 
     match type_option {
         Some((ext, blamed)) => match PolarsFileType::from(ext.as_str()) {
             PolarsFileType::Parquet => match polars_object {
                 PolarsPluginObject::NuLazyFrame(ref lazy) => {
-                    parquet::command_lazy(call, lazy, &file_path, file_span)
+                    parquet::command_lazy(call, lazy, resource)
                 }
-                PolarsPluginObject::NuDataFrame(ref df) => {
-                    parquet::command_eager(df, &file_path, file_span)
+                PolarsPluginObject::NuDataFrame(ref df) if resource.cloud_options.is_some() => {
+                    parquet::command_lazy(call, &df.lazy(), resource)
                 }
-                _ => Err(unknown_file_save_error(file_span)),
+                PolarsPluginObject::NuDataFrame(ref df) => parquet::command_eager(df, resource),
+                _ => Err(unknown_file_save_error(resource.span)),
             },
             PolarsFileType::Arrow => match polars_object {
                 PolarsPluginObject::NuLazyFrame(ref lazy) => {
-                    arrow::command_lazy(call, lazy, &file_path, file_span)
+                    arrow::command_lazy(call, lazy, resource)
                 }
-                PolarsPluginObject::NuDataFrame(ref df) => {
-                    arrow::command_eager(df, &file_path, file_span)
+                PolarsPluginObject::NuDataFrame(ref df) if resource.cloud_options.is_some() => {
+                    arrow::command_lazy(call, &df.lazy(), resource)
                 }
-                _ => Err(unknown_file_save_error(file_span)),
+                PolarsPluginObject::NuDataFrame(ref df) => arrow::command_eager(df, resource),
+                _ => Err(unknown_file_save_error(resource.span)),
             },
             PolarsFileType::NdJson => match polars_object {
                 PolarsPluginObject::NuLazyFrame(ref lazy) => {
-                    ndjson::command_lazy(call, lazy, &file_path, file_span)
+                    ndjson::command_lazy(call, lazy, resource)
                 }
-                PolarsPluginObject::NuDataFrame(ref df) => {
-                    ndjson::command_eager(df, &file_path, file_span)
+                PolarsPluginObject::NuDataFrame(ref df) if resource.cloud_options.is_some() => {
+                    ndjson::command_lazy(call, &df.lazy(), resource)
                 }
-                _ => Err(unknown_file_save_error(file_span)),
+                PolarsPluginObject::NuDataFrame(ref df) => ndjson::command_eager(df, resource),
+                _ => Err(unknown_file_save_error(resource.span)),
             },
             PolarsFileType::Avro => match polars_object {
+                _ if resource.cloud_options.is_some() => Err(ShellError::GenericError {
+                    error: "Cloud URLS are not supported with Avro".into(),
+                    msg: "".into(),
+                    span: call.get_flag_span("eager"),
+                    help: Some("Remove flag".into()),
+                    inner: vec![],
+                }),
                 PolarsPluginObject::NuLazyFrame(lazy) => {
                     let df = lazy.collect(call.head)?;
-                    avro::command_eager(call, &df, &file_path, file_span)
+                    avro::command_eager(call, &df, resource)
                 }
-                PolarsPluginObject::NuDataFrame(ref df) => {
-                    avro::command_eager(call, df, &file_path, file_span)
-                }
-                _ => Err(unknown_file_save_error(file_span)),
+                PolarsPluginObject::NuDataFrame(ref df) => avro::command_eager(call, df, resource),
+                _ => Err(unknown_file_save_error(resource.span)),
             },
             PolarsFileType::Csv => match polars_object {
                 PolarsPluginObject::NuLazyFrame(ref lazy) => {
-                    csv::command_lazy(call, lazy, &file_path, file_span)
+                    csv::command_lazy(call, lazy, resource)
                 }
-                PolarsPluginObject::NuDataFrame(ref df) => {
-                    csv::command_eager(call, df, &file_path, file_span)
+                PolarsPluginObject::NuDataFrame(ref df) if resource.cloud_options.is_some() => {
+                    csv::command_lazy(call, &df.lazy(), resource)
                 }
-                _ => Err(unknown_file_save_error(file_span)),
+                PolarsPluginObject::NuDataFrame(ref df) => csv::command_eager(call, df, resource),
+                _ => Err(unknown_file_save_error(resource.span)),
             },
             _ => Err(PolarsFileType::build_unsupported_error(
                 &ext,
@@ -206,8 +214,8 @@ fn command(
         },
         None => Err(ShellError::Io(IoError::new_with_additional_context(
             std::io::ErrorKind::NotFound,
-            spanned_file.span,
-            spanned_file.item,
+            resource.span,
+            Some(PathBuf::from(resource.path)),
             "File without extension",
         ))),
     }?;
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/save/ndjson.rs b/crates/nu_plugin_polars/src/dataframe/command/core/save/ndjson.rs
index 37ffb4b4e4..c5732843bb 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/save/ndjson.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/save/ndjson.rs
@@ -1,31 +1,36 @@
-use std::{fs::File, io::BufWriter, path::Path};
+use std::{fs::File, io::BufWriter};
 
 use nu_plugin::EvaluatedCall;
-use nu_protocol::{ShellError, Span};
+use nu_protocol::ShellError;
 use polars::prelude::{JsonWriter, SerWriter};
 use polars_io::json::JsonWriterOptions;
 
-use crate::values::{NuDataFrame, NuLazyFrame};
+use crate::{
+    command::core::resource::Resource,
+    values::{NuDataFrame, NuLazyFrame},
+};
 
 use super::polars_file_save_error;
 
 pub(crate) fn command_lazy(
     _call: &EvaluatedCall,
     lazy: &NuLazyFrame,
-    file_path: &Path,
-    file_span: Span,
+    resource: Resource,
 ) -> Result<(), ShellError> {
+    let file_path = resource.path;
+    let file_span = resource.span;
     lazy.to_polars()
-        // todo - add cloud options
-        .sink_json(file_path, JsonWriterOptions::default(), None)
+        .sink_json(
+            file_path,
+            JsonWriterOptions::default(),
+            resource.cloud_options,
+        )
         .map_err(|e| polars_file_save_error(e, file_span))
 }
 
-pub(crate) fn command_eager(
-    df: &NuDataFrame,
-    file_path: &Path,
-    file_span: Span,
-) -> Result<(), ShellError> {
+pub(crate) fn command_eager(df: &NuDataFrame, resource: Resource) -> Result<(), ShellError> {
+    let file_path = resource.path;
+    let file_span = resource.span;
     let file = File::create(file_path).map_err(|e| ShellError::GenericError {
         error: format!("Error with file name: {e}"),
         msg: "".into(),
diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/save/parquet.rs b/crates/nu_plugin_polars/src/dataframe/command/core/save/parquet.rs
index 7a9766b3be..6dce612c7c 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/save/parquet.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/save/parquet.rs
@@ -1,31 +1,38 @@
-use std::{fs::File, path::Path};
+use std::fs::File;
 
+use log::debug;
 use nu_plugin::EvaluatedCall;
-use nu_protocol::{ShellError, Span};
+use nu_protocol::ShellError;
 use polars::prelude::ParquetWriter;
 use polars_io::parquet::write::ParquetWriteOptions;
 
-use crate::values::{NuDataFrame, NuLazyFrame};
+use crate::{
+    command::core::resource::Resource,
+    values::{NuDataFrame, NuLazyFrame},
+};
 
 use super::polars_file_save_error;
 
 pub(crate) fn command_lazy(
     _call: &EvaluatedCall,
     lazy: &NuLazyFrame,
-    file_path: &Path,
-    file_span: Span,
+    resource: Resource,
 ) -> Result<(), ShellError> {
+    let file_path = resource.path;
+    let file_span = resource.span;
+    debug!("Writing parquet file {file_path}");
     lazy.to_polars()
-        // todo - add cloud options
-        .sink_parquet(&file_path, ParquetWriteOptions::default(), None)
+        .sink_parquet(
+            &file_path,
+            ParquetWriteOptions::default(),
+            resource.cloud_options,
+        )
         .map_err(|e| polars_file_save_error(e, file_span))
 }
 
-pub(crate) fn command_eager(
-    df: &NuDataFrame,
-    file_path: &Path,
-    file_span: Span,
-) -> Result<(), ShellError> {
+pub(crate) fn command_eager(df: &NuDataFrame, resource: Resource) -> Result<(), ShellError> {
+    let file_path = resource.path;
+    let file_span = resource.span;
     let file = File::create(file_path).map_err(|e| ShellError::GenericError {
         error: "Error with file name".into(),
         msg: e.to_string(),

From 3770a5eed1ce6d194031257539ce99c23659910f Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Thu, 6 Feb 2025 21:00:25 +0800
Subject: [PATCH 1009/1072] remove duplicate code in math/log.rs (#15022)

# Description
I have investigated all const commands and found that math log contains
some duplicate code, which can be eliminated by introducing a new helper
function. So this pr is going to do this


# User-Facing Changes
NaN

# Tests + Formatting
NaN

# After Submitting
NaN
---
 crates/nu-command/src/math/log.rs | 63 ++++++++++++-------------------
 1 file changed, 25 insertions(+), 38 deletions(-)

diff --git a/crates/nu-command/src/math/log.rs b/crates/nu-command/src/math/log.rs
index 4c262017ca..daf231a497 100644
--- a/crates/nu-command/src/math/log.rs
+++ b/crates/nu-command/src/math/log.rs
@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::Signals;
 
 #[derive(Clone)]
 pub struct SubCommand;
@@ -45,26 +46,8 @@ impl Command for SubCommand {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let head = call.head;
         let base: Spanned<f64> = call.req(engine_state, stack, 0)?;
-
-        if base.item <= 0.0f64 {
-            return Err(ShellError::UnsupportedInput {
-                msg: "Base has to be greater 0".into(),
-                input: "value originates from here".into(),
-                msg_span: head,
-                input_span: base.span,
-            });
-        }
-        // This doesn't match explicit nulls
-        if matches!(input, PipelineData::Empty) {
-            return Err(ShellError::PipelineEmpty { dst_span: head });
-        }
-        let base = base.item;
-        input.map(
-            move |value| operate(value, head, base),
-            engine_state.signals(),
-        )
+        log(base, call.head, input, engine_state.signals())
     }
 
     fn run_const(
@@ -73,26 +56,8 @@ impl Command for SubCommand {
         call: &Call,
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
-        let head = call.head;
         let base: Spanned<f64> = call.req_const(working_set, 0)?;
-
-        if base.item <= 0.0f64 {
-            return Err(ShellError::UnsupportedInput {
-                msg: "Base has to be greater 0".into(),
-                input: "value originates from here".into(),
-                msg_span: head,
-                input_span: base.span,
-            });
-        }
-        // This doesn't match explicit nulls
-        if matches!(input, PipelineData::Empty) {
-            return Err(ShellError::PipelineEmpty { dst_span: head });
-        }
-        let base = base.item;
-        input.map(
-            move |value| operate(value, head, base),
-            working_set.permanent().signals(),
-        )
+        log(base, call.head, input, working_set.permanent().signals())
     }
 
     fn examples(&self) -> Vec<Example> {
@@ -118,6 +83,28 @@ impl Command for SubCommand {
     }
 }
 
+fn log(
+    base: Spanned<f64>,
+    head: Span,
+    input: PipelineData,
+    signals: &Signals,
+) -> Result<PipelineData, ShellError> {
+    if base.item <= 0.0f64 {
+        return Err(ShellError::UnsupportedInput {
+            msg: "Base has to be greater 0".into(),
+            input: "value originates from here".into(),
+            msg_span: head,
+            input_span: base.span,
+        });
+    }
+    // This doesn't match explicit nulls
+    if matches!(input, PipelineData::Empty) {
+        return Err(ShellError::PipelineEmpty { dst_span: head });
+    }
+    let base = base.item;
+    input.map(move |value| operate(value, head, base), signals)
+}
+
 fn operate(value: Value, head: Span, base: f64) -> Value {
     let span = value.span();
     match value {

From bdc767bf231c2f51d77202d8ba9060098cbbefe0 Mon Sep 17 00:00:00 2001
From: eggcaker <eggcaker@gmail.com>
Date: Thu, 6 Feb 2025 21:01:09 +0800
Subject: [PATCH 1010/1072] fix polars save example typo (#15008)

# Description
 fix polars save example dfr -> polars

I'm wondering why the commands `polars open` and `polars save` don't
have the same flags?
---
 .../nu_plugin_polars/src/dataframe/command/core/save/mod.rs   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/command/core/save/mod.rs b/crates/nu_plugin_polars/src/dataframe/command/core/save/mod.rs
index f5fad3b495..ce56acd984 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/core/save/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/core/save/mod.rs
@@ -94,12 +94,12 @@ impl PluginCommand for SaveDF {
             },
             Example {
                 description: "Saves dataframe to CSV file",
-                example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr save test.csv",
+                example: "[[a b]; [1 2] [3 4]] | polars into-df | polars save test.csv",
                 result: None,
             },
             Example {
                 description: "Saves dataframe to CSV file using other delimiter",
-                example: "[[a b]; [1 2] [3 4]] | dfr into-df | dfr save test.csv --delimiter '|'",
+                example: "[[a b]; [1 2] [3 4]] | polars into-df | polars save test.csv --csv-delimiter '|'",
                 result: None,
             },
         ]

From 2f18b9c85650ddeb6d13d3efa99cf4593518c07c Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Thu, 6 Feb 2025 22:05:58 +0800
Subject: [PATCH 1011/1072] Enable nushell error with backtrace (#14945)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description
After this pr, nushell is able to raise errors with a backtrace, which
should make users easier to debug. To enable the feature, users need to
set env variable via `$env.NU_BACKTRACE = 1`. But yeah it might not work
perfectly, there are some corner cases which might not be handled.

I think it should close #13379 in another way.

### About the change

The implementation mostly contained with 2 parts:
1. introduce a new `ChainedError` struct as well as a new
`ShellError::ChainedError` variant. If `eval_instruction` returned an
error, it converts the error to `ShellError::ChainedError`.
`ChainedError` struct is responsable to display errors properly. It
needs to handle the following 2 cases:
- if we run a function which runs `error make` internally, it needs to
display the error itself along with caller span.
- if we run a `error make` directly, or some commands directly returns
an error, we just want nushell raise an error about `error make`.

2. Attach caller spans to `ListStream` and `ByteStream`, because they
are lazy streams, and *only* contains the span that runs it
directly(like `^false`, for example), so nushell needs to add all caller
spans to the stream.
For example: in `def a [] { ^false }; def b [] { a; 33 }; b`, when we
run `b`, which runs `a`, which runs `^false`, the `ByteStream` only
contains the span of `^false`, we need to make it contains the span of
`a`, so nushell is able to get all spans if something bad happened.
This behavior is happened after running `Instruction::Call`, if it
returns a `ByteStream` and `ListStream`, it will call `push_caller_span`
method to attach call spans.

# User-Facing Changes
It's better to demostrate how it works by examples, given the following
definition:
```nushell
> $env.NU_BACKTRACE = 1
> def a [x] { if $x == 3 { error make {msg: 'a custom error'}}}
> def a_2 [x] { if $x == 3 { ^false } else { $x } }
> def a_3 [x] { if $x == 3 { [1 2 3] | each {error make {msg: 'a custom error inside list stream'} } } }
> def b [--list-stream --external] {
    if $external == true {
        # error with non-zero exit code, which is generated from external command.
        a_2 1; a_2 3; a_2 2
    } else if $list_stream == true {
        # error generated by list-stream
        a_3 1; a_3 3; a_3 2
    } else {
        # error generated by command directly
        a 1; a 2; a 3
    }
}
```

Run `b` directly shows the following error:

<details>

```nushell
Error: chained_error

  × oops
   ╭─[entry #27:1:1]
 1 │ b
   · ┬
   · ╰── error happened when running this
   ╰────

Error: chained_error

  × oops
    ╭─[entry #26:10:19]
  9 │         # error generated by command directly
 10 │         a 1; a 2; a 3
    ·                   ┬
    ·                   ╰── error happened when running this
 11 │     }
    ╰────

Error:
  × a custom error
   ╭─[entry #6:1:26]
 1 │ def a [x] { if $x == 3 { error make {msg: 'a custom error'}}}
   ·                          ─────┬────
   ·                               ╰── originates from here
   ╰────
```

</details>

Run `b --list-stream` shows the following error

<details>

```nushell
Error: chained_error

  × oops
   ╭─[entry #28:1:1]
 1 │ b --list-stream
   · ┬
   · ╰── error happened when running this
   ╰────

Error: nu::shell::eval_block_with_input

  × Eval block failed with pipeline input
   ╭─[entry #26:7:16]
 6 │         # error generated by list-stream
 7 │         a_3 1; a_3 3; a_3 2
   ·                ─┬─
   ·                 ╰── source value
 8 │     } else {
   ╰────

Error: nu::shell::eval_block_with_input

  × Eval block failed with pipeline input
   ╭─[entry #23:1:29]
 1 │ def a_3 [x] { if $x == 3 { [1 2 3] | each {error make {msg: 'a custom error inside list stream'} } } }
   ·                             ┬
   ·                             ╰── source value
   ╰────

Error:
  × a custom error inside list stream
   ╭─[entry #23:1:44]
 1 │ def a_3 [x] { if $x == 3 { [1 2 3] | each {error make {msg: 'a custom error inside list stream'} } } }
   ·                                            ─────┬────
   ·                                                 ╰── originates from here
   ╰────
```

</details>

Run `b --external` shows the following error:

<details>

```nushell
Error: chained_error

  × oops
   ╭─[entry #29:1:1]
 1 │ b --external
   · ┬
   · ╰── error happened when running this
   ╰────

Error: nu::shell::eval_block_with_input

  × Eval block failed with pipeline input
   ╭─[entry #26:4:16]
 3 │         # error with non-zero exit code, which is generated from external command.
 4 │         a_2 1; a_2 3; a_2 2
   ·                ─┬─
   ·                 ╰── source value
 5 │     } else if $list_stream == true {
   ╰────

Error: nu::shell::non_zero_exit_code

  × External command had a non-zero exit code
   ╭─[entry #7:1:29]
 1 │ def a_2 [x] { if $x == 3 { ^false } else { $x } }
   ·                             ──┬──
   ·                               ╰── exited with code 1
   ╰────
```

</details>

It also added a message to guide the usage of NU_BACKTRACE, see the last
line in the following example:
```shell
 ls asdfasd
Error: nu::shell::io::not_found

  × I/O error
  ╰─▶   × Entity not found

   ╭─[entry #17:1:4]
 1 │ ls asdfasd
   ·    ───┬───
   ·       ╰── Entity not found
   ╰────
  help: The error occurred at '/home/windsoilder/projects/nushell/asdfasd'

set the `NU_BACKTRACE=1` environment variable to display a backtrace.
```
# Tests + Formatting
Added some tests for the behavior.

# After Submitting
---
 crates/nu-engine/src/eval_ir.rs               |  49 ++++++-
 .../nu-protocol/src/errors/chained_error.rs   | 120 ++++++++++++++++++
 crates/nu-protocol/src/errors/cli_error.rs    |   4 +
 crates/nu-protocol/src/errors/mod.rs          |   1 +
 .../nu-protocol/src/errors/shell_error/mod.rs |  15 +++
 .../nu-protocol/src/pipeline/byte_stream.rs   |  14 ++
 .../nu-protocol/src/pipeline/list_stream.rs   |  15 +++
 crates/nu-protocol/tests/test_config.rs       |   3 +-
 tests/shell/pipeline/commands/external.rs     |  31 +++++
 tests/shell/pipeline/commands/internal.rs     |  82 +++++++++++-
 10 files changed, 326 insertions(+), 8 deletions(-)
 create mode 100644 crates/nu-protocol/src/errors/chained_error.rs

diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index ecdebbac51..25b4cc1921 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -187,6 +187,7 @@ fn eval_ir_block_impl<D: DebugContext>(
 
     // Program counter, starts at zero.
     let mut pc = 0;
+    let need_backtrace = ctx.engine_state.get_env_var("NU_BACKTRACE").is_some();
 
     while pc < ir_block.instructions.len() {
         let instruction = &ir_block.instructions[pc];
@@ -195,7 +196,7 @@ fn eval_ir_block_impl<D: DebugContext>(
 
         D::enter_instruction(ctx.engine_state, ir_block, pc, ctx.registers);
 
-        let result = eval_instruction::<D>(ctx, instruction, span, ast);
+        let result = eval_instruction::<D>(ctx, instruction, span, ast, need_backtrace);
 
         D::leave_instruction(
             ctx.engine_state,
@@ -228,8 +229,10 @@ fn eval_ir_block_impl<D: DebugContext>(
                     // If an error handler is set, branch there
                     prepare_error_handler(ctx, error_handler, Some(err.into_spanned(*span)));
                     pc = error_handler.handler_index;
+                } else if need_backtrace {
+                    let err = ShellError::into_chainned(err, *span);
+                    return Err(err);
                 } else {
-                    // If not, exit the block with the error
                     return Err(err);
                 }
             }
@@ -285,6 +288,7 @@ fn eval_instruction<D: DebugContext>(
     instruction: &Instruction,
     span: &Span,
     ast: &Option<IrAstRef>,
+    need_backtrace: bool,
 ) -> Result<InstructionResult, ShellError> {
     use self::InstructionResult::*;
 
@@ -548,7 +552,14 @@ fn eval_instruction<D: DebugContext>(
         }
         Instruction::Call { decl_id, src_dst } => {
             let input = ctx.take_reg(*src_dst);
-            let result = eval_call::<D>(ctx, *decl_id, *span, input)?;
+            let mut result = eval_call::<D>(ctx, *decl_id, *span, input)?;
+            if need_backtrace {
+                match &mut result {
+                    PipelineData::ByteStream(s, ..) => s.push_caller_span(*span),
+                    PipelineData::ListStream(s, ..) => s.push_caller_span(*span),
+                    _ => (),
+                };
+            }
             ctx.put_reg(*src_dst, result);
             Ok(Continue)
         }
@@ -1457,14 +1468,40 @@ fn drain(ctx: &mut EvalContext<'_>, data: PipelineData) -> Result<InstructionRes
     match data {
         PipelineData::ByteStream(stream, ..) => {
             let span = stream.span();
-            if let Err(err) = stream.drain() {
+            let callback_spans = stream.get_caller_spans().clone();
+            if let Err(mut err) = stream.drain() {
                 ctx.stack.set_last_error(&err);
-                return Err(err);
+                if callback_spans.is_empty() {
+                    return Err(err);
+                } else {
+                    for s in callback_spans {
+                        err = ShellError::EvalBlockWithInput {
+                            span: s,
+                            sources: vec![err],
+                        }
+                    }
+                    return Err(err);
+                }
             } else {
                 ctx.stack.set_last_exit_code(0, span);
             }
         }
-        PipelineData::ListStream(stream, ..) => stream.drain()?,
+        PipelineData::ListStream(stream, ..) => {
+            let callback_spans = stream.get_caller_spans().clone();
+            if let Err(mut err) = stream.drain() {
+                if callback_spans.is_empty() {
+                    return Err(err);
+                } else {
+                    for s in callback_spans {
+                        err = ShellError::EvalBlockWithInput {
+                            span: s,
+                            sources: vec![err],
+                        }
+                    }
+                    return Err(err);
+                }
+            }
+        }
         PipelineData::Value(..) | PipelineData::Empty => {}
     }
     Ok(Continue)
diff --git a/crates/nu-protocol/src/errors/chained_error.rs b/crates/nu-protocol/src/errors/chained_error.rs
new file mode 100644
index 0000000000..ad45c44157
--- /dev/null
+++ b/crates/nu-protocol/src/errors/chained_error.rs
@@ -0,0 +1,120 @@
+use super::shell_error::ShellError;
+use crate::Span;
+use miette::{LabeledSpan, Severity, SourceCode};
+use thiserror::Error;
+
+/// An error struct that contains source errors.
+///
+/// However, it's a bit special; if the error is constructed for the first time using
+/// [`ChainedError::new`], it will behave the same as the single source error.
+///
+/// If it's constructed nestedly using [`ChainedError::new_chained`], it will treat all underlying errors as related.
+///
+/// For a usage example, please check [`ShellError::into_chainned`].
+#[derive(Debug, Clone, PartialEq, Error)]
+pub struct ChainedError {
+    first: bool,
+    pub(crate) sources: Vec<ShellError>,
+    span: Span,
+}
+
+impl std::fmt::Display for ChainedError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        if self.first {
+            write!(f, "{}", self.sources[0])
+        } else {
+            write!(f, "oops")
+        }
+    }
+}
+
+impl ChainedError {
+    pub fn new(source: ShellError, span: Span) -> Self {
+        Self {
+            first: true,
+            sources: vec![source],
+            span,
+        }
+    }
+
+    pub fn new_chained(sources: Self, span: Span) -> Self {
+        Self {
+            first: false,
+            sources: vec![ShellError::ChainedError(sources)],
+            span,
+        }
+    }
+}
+
+impl miette::Diagnostic for ChainedError {
+    fn related<'a>(&'a self) -> Option<Box<dyn Iterator<Item = &'a dyn miette::Diagnostic> + 'a>> {
+        if self.first {
+            self.sources[0].related()
+        } else {
+            Some(Box::new(self.sources.iter().map(|s| s as _)))
+        }
+    }
+
+    fn code<'a>(&'a self) -> Option<Box<dyn std::fmt::Display + 'a>> {
+        if self.first {
+            self.sources[0].code()
+        } else {
+            Some(Box::new("chained_error"))
+        }
+    }
+
+    fn severity(&self) -> Option<Severity> {
+        if self.first {
+            self.sources[0].severity()
+        } else {
+            None
+        }
+    }
+
+    fn help<'a>(&'a self) -> Option<Box<dyn std::fmt::Display + 'a>> {
+        if self.first {
+            self.sources[0].help()
+        } else {
+            None
+        }
+    }
+
+    fn url<'a>(&'a self) -> Option<Box<dyn std::fmt::Display + 'a>> {
+        if self.first {
+            self.sources[0].url()
+        } else {
+            None
+        }
+    }
+
+    fn labels<'a>(&'a self) -> Option<Box<dyn Iterator<Item = LabeledSpan> + 'a>> {
+        if self.first {
+            self.sources[0].labels()
+        } else {
+            Some(Box::new(
+                vec![LabeledSpan::new_with_span(
+                    Some("error happened when running this".to_string()),
+                    self.span,
+                )]
+                .into_iter(),
+            ))
+        }
+    }
+
+    // Finally, we redirect the source_code method to our own source.
+    fn source_code(&self) -> Option<&dyn SourceCode> {
+        if self.first {
+            self.sources[0].source_code()
+        } else {
+            None
+        }
+    }
+
+    fn diagnostic_source(&self) -> Option<&dyn miette::Diagnostic> {
+        if self.first {
+            self.sources[0].diagnostic_source()
+        } else {
+            None
+        }
+    }
+}
diff --git a/crates/nu-protocol/src/errors/cli_error.rs b/crates/nu-protocol/src/errors/cli_error.rs
index 7439d1df79..a53fec0600 100644
--- a/crates/nu-protocol/src/errors/cli_error.rs
+++ b/crates/nu-protocol/src/errors/cli_error.rs
@@ -50,6 +50,10 @@ pub fn report_compile_error(working_set: &StateWorkingSet, error: &CompileError)
 
 fn report_error(working_set: &StateWorkingSet, error: &dyn miette::Diagnostic) {
     eprintln!("Error: {:?}", CliError(error, working_set));
+    let have_no_backtrace = working_set.get_env_var("NU_BACKTRACE").is_none();
+    if have_no_backtrace {
+        eprintln!("set the `NU_BACKTRACE=1` environment variable to display a backtrace.")
+    }
     // reset vt processing, aka ansi because illbehaved externals can break it
     #[cfg(windows)]
     {
diff --git a/crates/nu-protocol/src/errors/mod.rs b/crates/nu-protocol/src/errors/mod.rs
index 5f385a21ee..9c729dc8f4 100644
--- a/crates/nu-protocol/src/errors/mod.rs
+++ b/crates/nu-protocol/src/errors/mod.rs
@@ -1,3 +1,4 @@
+mod chained_error;
 pub mod cli_error;
 mod compile_error;
 mod config_error;
diff --git a/crates/nu-protocol/src/errors/shell_error/mod.rs b/crates/nu-protocol/src/errors/shell_error/mod.rs
index 6f651836ca..c7be1dfec5 100644
--- a/crates/nu-protocol/src/errors/shell_error/mod.rs
+++ b/crates/nu-protocol/src/errors/shell_error/mod.rs
@@ -1,3 +1,4 @@
+use super::chained_error::ChainedError;
 use crate::{
     ast::Operator, engine::StateWorkingSet, format_shell_error, record, ConfigError, LabeledError,
     ParseError, Span, Spanned, Type, Value,
@@ -1325,6 +1326,10 @@ On Windows, this would be %USERPROFILE%\AppData\Roaming"#
         #[label = "while running this code"]
         span: Option<Span>,
     },
+
+    #[error(transparent)]
+    #[diagnostic(transparent)]
+    ChainedError(ChainedError),
 }
 
 impl ShellError {
@@ -1373,6 +1378,16 @@ impl ShellError {
             span,
         )
     }
+
+    /// Convert self error to a [`ShellError::ChainedError`] variant.
+    pub fn into_chainned(self, span: Span) -> Self {
+        match self {
+            ShellError::ChainedError(inner) => {
+                ShellError::ChainedError(ChainedError::new_chained(inner, span))
+            }
+            other => ShellError::ChainedError(ChainedError::new(other, span)),
+        }
+    }
 }
 
 impl From<Box<dyn std::error::Error>> for ShellError {
diff --git a/crates/nu-protocol/src/pipeline/byte_stream.rs b/crates/nu-protocol/src/pipeline/byte_stream.rs
index adefbdf9f0..2a7c79e128 100644
--- a/crates/nu-protocol/src/pipeline/byte_stream.rs
+++ b/crates/nu-protocol/src/pipeline/byte_stream.rs
@@ -193,6 +193,7 @@ pub struct ByteStream {
     signals: Signals,
     type_: ByteStreamType,
     known_size: Option<u64>,
+    caller_spans: Vec<Span>,
 }
 
 impl ByteStream {
@@ -209,9 +210,22 @@ impl ByteStream {
             signals,
             type_,
             known_size: None,
+            caller_spans: vec![],
         }
     }
 
+    /// Push a caller [`Span`] to the bytestream, it's useful to construct a backtrace.
+    pub fn push_caller_span(&mut self, span: Span) {
+        if span != self.span {
+            self.caller_spans.push(span)
+        }
+    }
+
+    /// Get all caller [`Span`], it's useful to construct a backtrace.
+    pub fn get_caller_spans(&self) -> &Vec<Span> {
+        &self.caller_spans
+    }
+
     /// Create a [`ByteStream`] from an arbitrary reader. The type must be provided.
     pub fn read(
         reader: impl Read + Send + 'static,
diff --git a/crates/nu-protocol/src/pipeline/list_stream.rs b/crates/nu-protocol/src/pipeline/list_stream.rs
index 55ae4bfee0..f300a443d6 100644
--- a/crates/nu-protocol/src/pipeline/list_stream.rs
+++ b/crates/nu-protocol/src/pipeline/list_stream.rs
@@ -15,6 +15,7 @@ pub type ValueIterator = Box<dyn Iterator<Item = Value> + Send + 'static>;
 pub struct ListStream {
     stream: ValueIterator,
     span: Span,
+    caller_spans: Vec<Span>,
 }
 
 impl ListStream {
@@ -27,6 +28,7 @@ impl ListStream {
         Self {
             stream: Box::new(InterruptIter::new(iter, signals)),
             span,
+            caller_spans: vec![],
         }
     }
 
@@ -35,6 +37,18 @@ impl ListStream {
         self.span
     }
 
+    /// Push a caller [`Span`] to the bytestream, it's useful to construct a backtrace.
+    pub fn push_caller_span(&mut self, span: Span) {
+        if span != self.span {
+            self.caller_spans.push(span)
+        }
+    }
+
+    /// Get all caller [`Span`], it's useful to construct a backtrace.
+    pub fn get_caller_spans(&self) -> &Vec<Span> {
+        &self.caller_spans
+    }
+
     /// Changes the [`Span`] associated with this [`ListStream`].
     pub fn with_span(mut self, span: Span) -> Self {
         self.span = span;
@@ -94,6 +108,7 @@ impl ListStream {
         Self {
             stream: Box::new(f(self.stream)),
             span: self.span,
+            caller_spans: self.caller_spans,
         }
     }
 
diff --git a/crates/nu-protocol/tests/test_config.rs b/crates/nu-protocol/tests/test_config.rs
index 49ad1cdec6..18e79635cf 100644
--- a/crates/nu-protocol/tests/test_config.rs
+++ b/crates/nu-protocol/tests/test_config.rs
@@ -60,7 +60,7 @@ fn fancy_default_errors() {
 
     assert_eq!(
         actual.err,
-        "Error:   \u{1b}[31m×\u{1b}[0m oh no!\n   ╭─[\u{1b}[36;1;4mline2:1:13\u{1b}[0m]\n \u{1b}[2m1\u{1b}[0m │ force_error \"My error\"\n   · \u{1b}[35;1m            ─────┬────\u{1b}[0m\n   ·                  \u{1b}[35;1m╰── \u{1b}[35;1mhere's the error\u{1b}[0m\u{1b}[0m\n   ╰────\n\n"
+        "Error:   \u{1b}[31m×\u{1b}[0m oh no!\n   ╭─[\u{1b}[36;1;4mline2:1:13\u{1b}[0m]\n \u{1b}[2m1\u{1b}[0m │ force_error \"My error\"\n   · \u{1b}[35;1m            ─────┬────\u{1b}[0m\n   ·                  \u{1b}[35;1m╰── \u{1b}[35;1mhere's the error\u{1b}[0m\u{1b}[0m\n   ╰────\n\nset the `NU_BACKTRACE=1` environment variable to display a backtrace.\n"
     );
 }
 
@@ -92,6 +92,7 @@ snippet line 1: force_error "my error"
     label at line 1, columns 13 to 22: here's the error
 
 
+set the `NU_BACKTRACE=1` environment variable to display a backtrace.
 "#,
     );
 }
diff --git a/tests/shell/pipeline/commands/external.rs b/tests/shell/pipeline/commands/external.rs
index 7268133ab0..e5c6915565 100644
--- a/tests/shell/pipeline/commands/external.rs
+++ b/tests/shell/pipeline/commands/external.rs
@@ -686,3 +686,34 @@ fn arg_dont_run_subcommand_if_surrounded_with_quote() {
     let actual = nu!("nu --testbin cococo '(echo aa)'");
     assert_eq!(actual.out, "(echo aa)");
 }
+
+#[test]
+fn external_error_with_backtrace() {
+    Playground::setup("external error with backtrace", |dirs, sandbox| {
+        sandbox.with_files(&[FileWithContent("tmp_env.nu", "$env.NU_BACKTRACE = 1")]);
+
+        let actual = nu!(
+            env_config: "tmp_env.nu",
+            cwd: dirs.test(),
+            r#"def a [x] { if $x == 3 { nu --testbin --fail }};def b [] {a 1; a 3; a 2}; b"#);
+        let chained_error_cnt: Vec<&str> = actual
+            .err
+            .matches("diagnostic code: chained_error")
+            .collect();
+        assert_eq!(chained_error_cnt.len(), 1);
+        assert!(actual.err.contains("non_zero_exit_code"));
+        let eval_with_input_cnt: Vec<&str> = actual.err.matches("eval_block_with_input").collect();
+        assert_eq!(eval_with_input_cnt.len(), 1);
+
+        let actual = nu!(
+            env_config: "tmp_env.nu",
+            cwd: dirs.test(),
+            r#"nu --testbin --fail"#);
+        let chained_error_cnt: Vec<&str> = actual
+            .err
+            .matches("diagnostic code: chained_error")
+            .collect();
+        // run error make directly, show no backtrace is available
+        assert_eq!(chained_error_cnt.len(), 0);
+    });
+}
diff --git a/tests/shell/pipeline/commands/internal.rs b/tests/shell/pipeline/commands/internal.rs
index 833dcaab8d..aa90fbf681 100644
--- a/tests/shell/pipeline/commands/internal.rs
+++ b/tests/shell/pipeline/commands/internal.rs
@@ -1,4 +1,4 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
+use nu_test_support::fs::Stub::{FileWithContent, FileWithContentToBeTrimmed};
 use nu_test_support::playground::Playground;
 use nu_test_support::{nu, pipeline};
 use pretty_assertions::assert_eq;
@@ -1135,3 +1135,83 @@ fn error_on_out_greater_pipe() {
         .err
         .contains("Redirecting stdout to a pipe is the same as normal piping"))
 }
+
+#[test]
+fn error_with_backtrace() {
+    Playground::setup("error with backtrace", |dirs, sandbox| {
+        sandbox.with_files(&[FileWithContent("tmp_env.nu", "$env.NU_BACKTRACE = 1")]);
+
+        let actual = nu!(
+            env_config: "tmp_env.nu",
+            cwd: dirs.test(),
+            r#"def a [x] { if $x == 3 { error make {msg: 'a custom error'}}};a 3"#);
+        let chained_error_cnt: Vec<&str> = actual
+            .err
+            .matches("diagnostic code: chained_error")
+            .collect();
+        // run `a 3`, and it raises error, so there should be 1.
+        assert_eq!(chained_error_cnt.len(), 1);
+        assert!(actual.err.contains("a custom error"));
+
+        let actual = nu!(
+            env_config: "tmp_env.nu",
+            cwd: dirs.test(),
+            r#"def a [x] { if $x == 3 { error make {msg: 'a custom error'}}};def b [] { a 1; a 3; a 2 };b"#);
+
+        let chained_error_cnt: Vec<&str> = actual
+            .err
+            .matches("diagnostic code: chained_error")
+            .collect();
+        // run `b`, it runs `a 3`, and it raises error, so there should be 2.
+        assert_eq!(chained_error_cnt.len(), 2);
+        assert!(actual.err.contains("a custom error"));
+
+        let actual = nu!(
+            env_config: "tmp_env.nu",
+            cwd: dirs.test(),
+            r#"error make {msg: 'a custom err'}"#);
+        let chained_error_cnt: Vec<&str> = actual
+            .err
+            .matches("diagnostic code: chained_error")
+            .collect();
+        // run error make directly, show no backtrace is available
+        assert_eq!(chained_error_cnt.len(), 0);
+    });
+}
+
+#[test]
+fn liststream_error_with_backtrace() {
+    Playground::setup("liststream error with backtrace", |dirs, sandbox| {
+        sandbox.with_files(&[FileWithContent("tmp_env.nu", "$env.NU_BACKTRACE = 1")]);
+
+        let actual = nu!(
+            env_config: "tmp_env.nu",
+            cwd: dirs.test(),
+            r#"def a [x] { if $x == 3 { [1] | each {error make {'msg': 'a custom error'}}}};a 3"#);
+        assert!(actual.err.contains("a custom error"));
+
+        let actual = nu!(
+            env_config: "tmp_env.nu",
+            cwd: dirs.test(),
+            r#"def a [x] { if $x == 3 { [1] | each {error make {'msg': 'a custom error'}}}};def b [] { a 1; a 3; a 2 };b"#);
+        let chained_error_cnt: Vec<&str> = actual
+            .err
+            .matches("diagnostic code: chained_error")
+            .collect();
+        assert_eq!(chained_error_cnt.len(), 1);
+        assert!(actual.err.contains("a custom error"));
+        let eval_with_input_cnt: Vec<&str> = actual.err.matches("eval_block_with_input").collect();
+        assert_eq!(eval_with_input_cnt.len(), 2);
+
+        let actual = nu!(
+            env_config: "tmp_env.nu",
+            cwd: dirs.test(),
+            r#"[1] | each { error make {msg: 'a custom err'} }"#);
+        let chained_error_cnt: Vec<&str> = actual
+            .err
+            .matches("diagnostic code: chained_error")
+            .collect();
+        // run error make directly, show no backtrace is available
+        assert_eq!(chained_error_cnt.len(), 0);
+    });
+}

From 2ce5de58e69c0721a69b3186d63548a6348be8bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrej=20Kol=C4=8Din?= <self@kaathewise.net>
Date: Thu, 6 Feb 2025 23:32:42 +0300
Subject: [PATCH 1012/1072] Fix an integer overflow bug in `into duration`
 (#15031)

Fixes #15028

# Description

The current implementation of `into duration` uses bare pointer
arithmetic instead of wrapping one. This works fine on 64-bit platforms,
since the pointers don't take up all of the 64 bits, but fails on 32 bit
ones.


# Tests + Formatting

All of the affected tests pass on my end, but it's `x86_84`, so they
were also passing before that.
---
 .../src/conversions/into/duration.rs          | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/crates/nu-command/src/conversions/into/duration.rs b/crates/nu-command/src/conversions/into/duration.rs
index d11cfeffc2..3d11b83afb 100644
--- a/crates/nu-command/src/conversions/into/duration.rs
+++ b/crates/nu-command/src/conversions/into/duration.rs
@@ -170,16 +170,20 @@ fn into_duration(
     )
 }
 
-// convert string list of duration values to duration NS.
-// technique for getting substrings and span based on: https://stackoverflow.com/a/67098851/2036651
-#[inline]
-fn addr_of(s: &str) -> usize {
-    s.as_ptr() as usize
-}
-
 fn split_whitespace_indices(s: &str, span: Span) -> impl Iterator<Item = (&str, Span)> {
     s.split_whitespace().map(move |sub| {
-        let start_offset = span.start + addr_of(sub) - addr_of(s);
+        // Gets the offset of the `sub` substring inside the string `s`.
+        // `wrapping_` operations are necessary because the pointers can
+        // overflow on 32-bit platforms.  The result will not overflow, because
+        // `sub` is within `s`, and the end of `s` has to be a valid memory
+        // address.
+        //
+        // XXX: this should be replaced with `str::substr_range` from the
+        // standard library when it's stabilized.
+        let start_offset = span
+            .start
+            .wrapping_add(sub.as_ptr() as usize)
+            .wrapping_sub(s.as_ptr() as usize);
         (sub, Span::new(start_offset, start_offset + sub.len()))
     })
 }

From fb8ac4198b14dc56ac12d0a7dfc30e4a10e0f8ac Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Fri, 7 Feb 2025 19:30:25 +0800
Subject: [PATCH 1013/1072] fix: clippy warnings with `--all-features` (#15035)

# Description

Some more `cargo clippy --all-features` warnings from rust toolchain
1.84.1 that I forgot to fix in #14984
---
 crates/nu-cmd-lang/src/example_support.rs       | 2 +-
 crates/nu-command/src/filters/find.rs           | 4 ++--
 crates/nu-command/src/platform/ulimit.rs        | 2 +-
 crates/nu-command/src/strings/guess_width.rs    | 4 ++--
 crates/nu-command/src/strings/str_/stats.rs     | 4 ++--
 crates/nu-plugin-engine/src/context.rs          | 2 +-
 crates/nu-plugin-engine/src/util/mutable_cow.rs | 6 +++---
 crates/nu-test-support/src/playground/play.rs   | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/crates/nu-cmd-lang/src/example_support.rs b/crates/nu-cmd-lang/src/example_support.rs
index 0ff4428d1a..b3a64dc168 100644
--- a/crates/nu-cmd-lang/src/example_support.rs
+++ b/crates/nu-cmd-lang/src/example_support.rs
@@ -221,7 +221,7 @@ impl PartialEq for DebuggableValue<'_> {
     }
 }
 
-impl<'a> std::fmt::Debug for DebuggableValue<'a> {
+impl std::fmt::Debug for DebuggableValue<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self.0 {
             Value::Bool { val, .. } => {
diff --git a/crates/nu-command/src/filters/find.rs b/crates/nu-command/src/filters/find.rs
index 0ce386b93e..fcd21efff0 100644
--- a/crates/nu-command/src/filters/find.rs
+++ b/crates/nu-command/src/filters/find.rs
@@ -543,12 +543,12 @@ fn value_should_be_printed(
 
 fn term_contains_value(term: &Value, value: &Value, span: Span) -> bool {
     term.r#in(span, value, span)
-        .map_or(false, |value| value.is_true())
+        .is_ok_and(|value| value.is_true())
 }
 
 fn term_equals_value(term: &Value, value: &Value, span: Span) -> bool {
     term.eq(span, value, span)
-        .map_or(false, |value| value.is_true())
+        .is_ok_and(|value| value.is_true())
 }
 
 fn record_matches_term(
diff --git a/crates/nu-command/src/platform/ulimit.rs b/crates/nu-command/src/platform/ulimit.rs
index d823e10898..1b6be2a4fb 100644
--- a/crates/nu-command/src/platform/ulimit.rs
+++ b/crates/nu-command/src/platform/ulimit.rs
@@ -42,7 +42,7 @@ impl<'a> ResourceInfo<'a> {
     }
 }
 
-impl<'a> Default for ResourceInfo<'a> {
+impl Default for ResourceInfo<'_> {
     fn default() -> Self {
         Self {
             name: "file-size",
diff --git a/crates/nu-command/src/strings/guess_width.rs b/crates/nu-command/src/strings/guess_width.rs
index 2eefb7d3f0..0af33866cd 100644
--- a/crates/nu-command/src/strings/guess_width.rs
+++ b/crates/nu-command/src/strings/guess_width.rs
@@ -6,7 +6,7 @@
 /// The width seems to be a fixed length, but it doesn't always fit.
 /// GuessWidth finds the column separation position
 /// from the reference line(header) and multiple lines(body).
-
+///
 /// Briefly, the algorithm uses a histogram of spaces to find widths.
 /// blanks, lines, and pos are variables used in the algorithm. The other
 /// items names below are just for reference.
@@ -19,7 +19,7 @@
 /// spaces = "      ^        ^        ^"
 ///    pos =  6 15 24 <- the carets show these positions
 /// the items in pos map to 3's in the blanks array
-
+///
 /// Now that we have pos, we can let split() use this pos array to figure out
 /// how to split all lines by comparing each index to see if there's a space.
 /// So, it looks at position 6, 15, 24 and sees if it has a space in those
diff --git a/crates/nu-command/src/strings/str_/stats.rs b/crates/nu-command/src/strings/str_/stats.rs
index 8722a030d4..6566b566c6 100644
--- a/crates/nu-command/src/strings/str_/stats.rs
+++ b/crates/nu-command/src/strings/str_/stats.rs
@@ -148,7 +148,7 @@ fn counter(contents: &str, span: Span) -> Value {
     Value::record(record, span)
 }
 
-/// Take all the counts in `other_counts` and sum them into `accum`.
+// /// Take all the counts in `other_counts` and sum them into `accum`.
 // pub fn sum_counts(accum: &mut Counted, other_counts: &Counted) {
 //     for (counter, count) in other_counts {
 //         let entry = accum.entry(*counter).or_insert(0);
@@ -156,7 +156,7 @@ fn counter(contents: &str, span: Span) -> Value {
 //     }
 // }
 
-/// Sums all the `Counted` instances into a new one.
+// /// Sums all the `Counted` instances into a new one.
 // pub fn sum_all_counts<'a, I>(counts: I) -> Counted
 // where
 //     I: IntoIterator<Item = &'a Counted>,
diff --git a/crates/nu-plugin-engine/src/context.rs b/crates/nu-plugin-engine/src/context.rs
index 5870ab7d47..48600d7937 100644
--- a/crates/nu-plugin-engine/src/context.rs
+++ b/crates/nu-plugin-engine/src/context.rs
@@ -84,7 +84,7 @@ impl<'a> PluginExecutionCommandContext<'a> {
     }
 }
 
-impl<'a> PluginExecutionContext for PluginExecutionCommandContext<'a> {
+impl PluginExecutionContext for PluginExecutionCommandContext<'_> {
     fn span(&self) -> Span {
         self.call.head
     }
diff --git a/crates/nu-plugin-engine/src/util/mutable_cow.rs b/crates/nu-plugin-engine/src/util/mutable_cow.rs
index 100847dcfb..3227a2eeb2 100644
--- a/crates/nu-plugin-engine/src/util/mutable_cow.rs
+++ b/crates/nu-plugin-engine/src/util/mutable_cow.rs
@@ -5,7 +5,7 @@ pub enum MutableCow<'a, T> {
     Owned(T),
 }
 
-impl<'a, T: Clone> MutableCow<'a, T> {
+impl<T: Clone> MutableCow<'_, T> {
     pub fn owned(&self) -> MutableCow<'static, T> {
         match self {
             MutableCow::Borrowed(r) => MutableCow::Owned((*r).clone()),
@@ -14,7 +14,7 @@ impl<'a, T: Clone> MutableCow<'a, T> {
     }
 }
 
-impl<'a, T> std::ops::Deref for MutableCow<'a, T> {
+impl<T> std::ops::Deref for MutableCow<'_, T> {
     type Target = T;
 
     fn deref(&self) -> &T {
@@ -25,7 +25,7 @@ impl<'a, T> std::ops::Deref for MutableCow<'a, T> {
     }
 }
 
-impl<'a, T> std::ops::DerefMut for MutableCow<'a, T> {
+impl<T> std::ops::DerefMut for MutableCow<'_, T> {
     fn deref_mut(&mut self) -> &mut Self::Target {
         match self {
             MutableCow::Borrowed(r) => r,
diff --git a/crates/nu-test-support/src/playground/play.rs b/crates/nu-test-support/src/playground/play.rs
index a876fbd3dc..cb66f2bcb5 100644
--- a/crates/nu-test-support/src/playground/play.rs
+++ b/crates/nu-test-support/src/playground/play.rs
@@ -52,7 +52,7 @@ impl Dirs {
     }
 }
 
-impl<'a> Playground<'a> {
+impl Playground<'_> {
     pub fn root(&self) -> &AbsolutePath {
         &self.dirs.root
     }

From 942030199dc570dab0be6e59b053cf60598e6bcd Mon Sep 17 00:00:00 2001
From: Solomon <git@solomonvictorino.com>
Date: Fri, 7 Feb 2025 04:56:07 -0700
Subject: [PATCH 1014/1072] check signals while printing values (#14980)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #14960

# User-Facing Changes

- The output of non-streaming values can now be interrupted with ctrl-c:

```nushell
~> use std repeat; random chars --length 100kb | repeat 2000 | str join ' ' | collect
<data omitted>^C
Error:
  × Operation interrupted
   ╭─[entry #1:1:61]
 1 │ use std repeat; random chars --length 100kb | repeat 2000 | str join ' ' | collect
   ·                                                             ────┬───
   ·                                                                 ╰── This operation was interrupted
   ╰────
```

- When IO errors occur while printing data, nushell no longer panics:

```diff
 $ nu -c "true | print" | -

-Error:
-  x Main thread panicked.
-  |-> at crates/nu-protocol/src/errors/shell_error/io.rs:198:13
-  `-> for unknown spans with paths, use `new_internal_with_path`
+Error: nu::shell::io::broken_pipe
+
+  x I/O error
+  `->   x Broken pipe
+
+   ,-[source:1:1]
+ 1 | true | print
+   : ^^|^
+   :   `-| Writing to stdout failed
+   :     | Broken pipe
+   `----
```
---
 crates/nu-command/tests/commands/start.rs     |   4 +-
 .../nu-protocol/src/pipeline/pipeline_data.rs | 101 ++++++++++++------
 2 files changed, 69 insertions(+), 36 deletions(-)

diff --git a/crates/nu-command/tests/commands/start.rs b/crates/nu-command/tests/commands/start.rs
index 60f8f057b1..55507be5d6 100644
--- a/crates/nu-command/tests/commands/start.rs
+++ b/crates/nu-command/tests/commands/start.rs
@@ -1,11 +1,11 @@
 use super::*;
+use nu_engine::test_help::{convert_single_value_to_cmd_args, eval_block_with_input};
+use nu_engine::{current_dir, eval_expression};
 use nu_protocol::{
     ast::Call,
     engine::{EngineState, Stack, StateWorkingSet},
     PipelineData, Span, Spanned, Type, Value,
 };
-use nu_engine::test_help::{convert_single_value_to_cmd_args, eval_block_with_input};
-use nu_engine::{current_dir, eval_expression};
 use std::path::PathBuf;
 
 /// Create a minimal test engine state and stack to run commands against.
diff --git a/crates/nu-protocol/src/pipeline/pipeline_data.rs b/crates/nu-protocol/src/pipeline/pipeline_data.rs
index 3ccfae4c85..ce688c18e3 100644
--- a/crates/nu-protocol/src/pipeline/pipeline_data.rs
+++ b/crates/nu-protocol/src/pipeline/pipeline_data.rs
@@ -1,11 +1,11 @@
 use crate::{
     ast::{Call, PathMember},
     engine::{EngineState, Stack},
-    shell_error::io::IoError,
+    location,
+    shell_error::{io::IoError, location::Location},
     ByteStream, ByteStreamType, Config, ListStream, OutDest, PipelineMetadata, Range, ShellError,
     Signals, Span, Type, Value,
 };
-use nu_utils::{stderr_write_all_and_flush, stdout_write_all_and_flush};
 use std::io::Write;
 
 const LINE_ENDING_PATTERN: &[char] = &['\r', '\n'];
@@ -662,25 +662,24 @@ impl PipelineData {
         no_newline: bool,
         to_stderr: bool,
     ) -> Result<(), ShellError> {
+        let span = self.span();
         if let PipelineData::Value(Value::Binary { val: bytes, .. }, _) = self {
             if to_stderr {
-                stderr_write_all_and_flush(bytes).map_err(|err| {
-                    IoError::new_with_additional_context(
-                        err.kind(),
-                        Span::unknown(),
-                        None,
-                        "Writing to stderr failed",
-                    )
-                })?
+                write_all_and_flush(
+                    bytes,
+                    &mut std::io::stderr().lock(),
+                    "stderr",
+                    span,
+                    engine_state.signals(),
+                )?;
             } else {
-                stdout_write_all_and_flush(bytes).map_err(|err| {
-                    IoError::new_with_additional_context(
-                        err.kind(),
-                        Span::unknown(),
-                        None,
-                        "Writing to stdout failed",
-                    )
-                })?
+                write_all_and_flush(
+                    bytes,
+                    &mut std::io::stdout().lock(),
+                    "stdout",
+                    span,
+                    engine_state.signals(),
+                )?;
             }
             Ok(())
         } else {
@@ -694,6 +693,7 @@ impl PipelineData {
         no_newline: bool,
         to_stderr: bool,
     ) -> Result<(), ShellError> {
+        let span = self.span();
         if let PipelineData::ByteStream(stream, ..) = self {
             // Copy ByteStreams directly
             stream.print(to_stderr)
@@ -711,23 +711,21 @@ impl PipelineData {
                 }
 
                 if to_stderr {
-                    stderr_write_all_and_flush(out).map_err(|err| {
-                        IoError::new_with_additional_context(
-                            err.kind(),
-                            Span::unknown(),
-                            None,
-                            "Writing to stderr failed",
-                        )
-                    })?
+                    write_all_and_flush(
+                        out,
+                        &mut std::io::stderr().lock(),
+                        "stderr",
+                        span,
+                        engine_state.signals(),
+                    )?;
                 } else {
-                    stdout_write_all_and_flush(out).map_err(|err| {
-                        IoError::new_with_additional_context(
-                            err.kind(),
-                            Span::unknown(),
-                            None,
-                            "Writing to stdout failed",
-                        )
-                    })?
+                    write_all_and_flush(
+                        out,
+                        &mut std::io::stdout().lock(),
+                        "stdout",
+                        span,
+                        engine_state.signals(),
+                    )?;
                 }
             }
 
@@ -764,6 +762,41 @@ impl PipelineData {
     }
 }
 
+pub fn write_all_and_flush<T>(
+    data: T,
+    destination: &mut impl Write,
+    destination_name: &str,
+    span: Option<Span>,
+    signals: &Signals,
+) -> Result<(), ShellError>
+where
+    T: AsRef<[u8]>,
+{
+    let io_error_map = |err: std::io::Error, location: Location| {
+        let context = format!("Writing to {} failed", destination_name);
+        match span {
+            None => IoError::new_internal(err.kind(), context, location),
+            Some(span) if span == Span::unknown() => {
+                IoError::new_internal(err.kind(), context, location)
+            }
+            Some(span) => IoError::new_with_additional_context(err.kind(), span, None, context),
+        }
+    };
+
+    let span = span.unwrap_or(Span::unknown());
+    const OUTPUT_CHUNK_SIZE: usize = 8192;
+    for chunk in data.as_ref().chunks(OUTPUT_CHUNK_SIZE) {
+        signals.check(span)?;
+        destination
+            .write_all(chunk)
+            .map_err(|err| io_error_map(err, location!()))?;
+    }
+    destination
+        .flush()
+        .map_err(|err| io_error_map(err, location!()))?;
+    Ok(())
+}
+
 enum PipelineIteratorInner {
     Empty,
     Value(Value),

From d007b10fbf08eddaae5c50eea6da73ddc0347559 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Fri, 7 Feb 2025 19:10:13 +0100
Subject: [PATCH 1015/1072] Use build_target information in startup banner
 (#15046)

# Description
The `(version).build_os` variable inherits from `shadow_rs` `BUILD_OS`
which points to the OS on which the binary was built but does not
reflect the target if it was cross-compiled. We cross-compile several of
the targets for our binary releases. Thus the info in the banner was
misleading.

# User-Facing Changes
By changing to `build_target` the target triple is shown instead.
This is slightly more verbose but should also allow disambiguation
between the `musl` and `glibc` builds.


![grafik](https://github.com/user-attachments/assets/24dd43d7-9717-463b-809b-b81b44f9ab52)

# Tests + Formatting
(-)
---
 crates/nu-std/std/prelude/mod.nu | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-std/std/prelude/mod.nu b/crates/nu-std/std/prelude/mod.nu
index 3db296de2c..f3c66192ed 100644
--- a/crates/nu-std/std/prelude/mod.nu
+++ b/crates/nu-std/std/prelude/mod.nu
@@ -16,7 +16,7 @@ let banner_msg = match $short {
 (ansi green)'|, . ,'   (ansi reset)based on the (ansi green)nu(ansi reset) language,
 (ansi green) !_-\(_\\    (ansi reset)where all data is structured!
 
-Version: (ansi green)($ver.version) \(($ver.build_os)\)
+Version: (ansi green)($ver.version) \(($ver.build_target)\)
 Please join our (ansi purple)Discord(ansi reset) community at (ansi purple)https://discord.gg/NtAbbGn(ansi reset)
 Our (ansi green_bold)GitHub(ansi reset) repository is at (ansi green_bold)https://github.com/nushell/nushell(ansi reset)
 Our (ansi green)Documentation(ansi reset) is located at (ansi green)https://nushell.sh(ansi reset)

From e60dac8957cf009459c819ae0c2d8ca45953df62 Mon Sep 17 00:00:00 2001
From: Solomon <git@solomonvictorino.com>
Date: Fri, 7 Feb 2025 13:31:59 -0700
Subject: [PATCH 1016/1072] remove `nu-check` examples with the `--all` flag
 (#15047)

# Description

Deletes example usage of `nu-check`'s `--all` flag, which was removed in
5e937ca1afc6aee2296615f64330331952c7cd53.
---
 crates/nu-command/src/system/nu_check.rs | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/crates/nu-command/src/system/nu_check.rs b/crates/nu-command/src/system/nu_check.rs
index f3ecdd004d..d988974589 100644
--- a/crates/nu-command/src/system/nu_check.rs
+++ b/crates/nu-command/src/system/nu_check.rs
@@ -168,16 +168,6 @@ impl Command for NuCheck {
                 example: "$'two(char nl)lines' | nu-check ",
                 result: None,
             },
-            Example {
-                description: "Heuristically parse which begins with script first, if it sees a failure, try module afterwards",
-                example: "nu-check -a script.nu",
-                result: None,
-            },
-            Example {
-                description: "Heuristically parse by showing error message",
-                example: "open foo.nu | lines | nu-check --all --debug",
-                result: None,
-            },
         ]
     }
 }

From 17246db38b581a4420a35afc8e732643729092d7 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Fri, 7 Feb 2025 23:50:33 +0100
Subject: [PATCH 1017/1072] Fix usages of `fmt` to `format number` (#15041)

Those slipped through the cracks with
https://github.com/nushell/nushell/pull/14875

Avoids deprecation warning and failure after
https://github.com/nushell/nushell/pull/15040
---
 crates/nu-std/std/input/mod.nu | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/nu-std/std/input/mod.nu b/crates/nu-std/std/input/mod.nu
index a323d7111a..0a79210c19 100644
--- a/crates/nu-std/std/input/mod.nu
+++ b/crates/nu-std/std/input/mod.nu
@@ -4,7 +4,7 @@ def format-event [ ] {
   # Replace numeric value of raw_code with hex string
   let record = match $record {
     {raw_code: $code} => {
-      $record | update raw_code {|| $in | fmt | get upperhex}
+      $record | update raw_code {|| $in | format number | get upperhex}
     }
     _ => $record
   }
@@ -12,7 +12,7 @@ def format-event [ ] {
   # Replace numeric value of raw_modifiers with binary string
   let record = match $record {
     {raw_modifiers: $flags} => {
-      $record | update raw_modifiers {|| $in | fmt | get binary}
+      $record | update raw_modifiers {|| $in | format number | get binary}
     }
     _ => $record
   }

From 55c72468301738989b5adca6b2bc5c52e2640e10 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Fri, 7 Feb 2025 23:50:47 +0100
Subject: [PATCH 1018/1072] Fuzz more realistically with keyword const eval
 (#15036)

# Description
The parsing logic for several of our keywords is conditional on the
particular commands for those keywords being in scope:


https://github.com/nushell/nushell/blob/942030199dc570dab0be6e59b053cf60598e6bcd/crates/nu-parser/src/parse_keywords.rs#L272-L279

Thus the following involved parsing logic was not fuzzed by the existing
`parse` fuzz target so far.

This adds an additional fuzz target `parse_with_keywords` that loads the
commands from `nu-cmd-lang`. Those are primarily the keyword
implementations, thus the relevant code paths in the parser that depend
on those `DeclId`s and the potential const eval of `if` etc. get
unlocked.

The existing `parse` target is preserved if you have concerns about the
fuzzing breaking containment in some form due to those commands.

# Tests + Formatting
Found https://github.com/nushell/nushell/issues/14972 with this target
---
 crates/nu-parser/fuzz/Cargo.toml                   |  9 ++++++++-
 crates/nu-parser/fuzz/README.md                    | 10 +++++++---
 .../fuzz/fuzz_targets/parse_with_keywords.rs       | 14 ++++++++++++++
 3 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 crates/nu-parser/fuzz/fuzz_targets/parse_with_keywords.rs

diff --git a/crates/nu-parser/fuzz/Cargo.toml b/crates/nu-parser/fuzz/Cargo.toml
index 45216accc9..3966ba83ef 100644
--- a/crates/nu-parser/fuzz/Cargo.toml
+++ b/crates/nu-parser/fuzz/Cargo.toml
@@ -10,6 +10,7 @@ cargo-fuzz = true
 [dependencies]
 libfuzzer-sys = "0.4"
 nu-protocol = { path = "../../nu-protocol" }
+nu-cmd-lang = { path = "../../nu-cmd-lang" }
 
 
 [dependencies.nu-parser]
@@ -26,4 +27,10 @@ debug = 1
 name = "parse"
 path = "fuzz_targets/parse.rs"
 test = false
-doc = false
\ No newline at end of file
+doc = false
+
+[[bin]]
+name = "parse_with_keywords"
+path = "fuzz_targets/parse_with_keywords.rs"
+test = false
+doc = false
diff --git a/crates/nu-parser/fuzz/README.md b/crates/nu-parser/fuzz/README.md
index 131fb50237..ffad6e0928 100644
--- a/crates/nu-parser/fuzz/README.md
+++ b/crates/nu-parser/fuzz/README.md
@@ -4,6 +4,10 @@
 
 # Quick start guide
 - Install cargo-fuzz by `cargo install cargo-fuzz`
-- Run `gather_seeds.nu` for preparing the initial seeds corpus
-- Make output directory `mkdir out`
-- Run the fuzzer with `cargo fuzz run parse out seeds`
+- Run `gather_seeds.nu` for preparing the initial seeds corpus. This pulls `.nu` files in the nushell repository as checked out and uses them as a starting of point. You can add additional files to increase diversity.
+- Make an output directory `mkdir out`
+- Run the fuzzer with `cargo fuzz run parse out seeds` where `parse` is the name of the target
+
+# Targets
+- `parse` just pulls in `nu-parser` and reaches the lexing and parsing logic. No command gets executed.
+- `parse_with_keywords` also loads `nu-cmd-lang` providing the command implementations for the core keywords. This permits the fuzzer to reach more code paths as some parts depend on the availability of those declarations. This may also execute the const eval code paths of the keyword commands. As of now this command set should not have negative side effects upon const eval. The overall code is not executed by this target.
diff --git a/crates/nu-parser/fuzz/fuzz_targets/parse_with_keywords.rs b/crates/nu-parser/fuzz/fuzz_targets/parse_with_keywords.rs
new file mode 100644
index 0000000000..3dfd3accf1
--- /dev/null
+++ b/crates/nu-parser/fuzz/fuzz_targets/parse_with_keywords.rs
@@ -0,0 +1,14 @@
+#![no_main]
+
+use libfuzzer_sys::fuzz_target;
+
+use nu_cmd_lang::create_default_context;
+use nu_parser::*;
+use nu_protocol::engine::StateWorkingSet;
+
+fuzz_target!(|data: &[u8]| {
+    let engine_state = create_default_context();
+    let mut working_set = StateWorkingSet::new(&engine_state);
+
+    let _block = parse(&mut working_set, None, &data, true);
+});

From 2891867de98d232c03a25d6b22588447eb0d0dfa Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Fri, 7 Feb 2025 23:51:01 +0100
Subject: [PATCH 1019/1072] Trigger tests for patch release branch pushes
 (#15037)

Make sure that when creating a cherry-picked or otherwise diverging
patch release branch the final product still gets checked via CI before
a release is cut.

To trigger this patch release branches MUST follow the pattern:
`patch-release-*` (e.g. `patch-release-0.102.1`)
---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2976f97b54..8777bd01e0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - 'patch-release-*'
 
 name: continuous-integration
 

From 9fa2f43d066483c0351578316c0903c9f843e3ee Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Sat, 8 Feb 2025 20:49:38 +0800
Subject: [PATCH 1020/1072] fix(lsp): exit on null root_dir (#15051)

# Description

This PR fixes one reported bug of recent lsp changes.

It exit unexpectedly with empty `root_dir` settings in neovim.

# User-Facing Changes

# Tests + Formatting

+1 test case

# After Submitting
---
 crates/nu-lsp/src/lib.rs       |   8 +--
 crates/nu-lsp/src/workspace.rs | 107 +++++++++++++++++++++------------
 2 files changed, 72 insertions(+), 43 deletions(-)

diff --git a/crates/nu-lsp/src/lib.rs b/crates/nu-lsp/src/lib.rs
index 5ba35e75ce..4762cc6ed8 100644
--- a/crates/nu-lsp/src/lib.rs
+++ b/crates/nu-lsp/src/lib.rs
@@ -151,7 +151,7 @@ impl LanguageServer {
                 !self.initial_engine_state.signals().interrupted()
             })
             .into_diagnostic()?;
-        self.initialize_workspace_folders(init_params)?;
+        self.initialize_workspace_folders(init_params);
 
         while !self.initial_engine_state.signals().interrupted() {
             // first check new messages from child thread
@@ -730,7 +730,7 @@ mod tests {
             DidChangeTextDocument, DidOpenTextDocument, Exit, Initialized, Notification,
         },
         request::{Completion, HoverRequest, Initialize, Request, Shutdown},
-        CompletionParams, DidChangeTextDocumentParams, DidOpenTextDocumentParams, InitializeParams,
+        CompletionParams, DidChangeTextDocumentParams, DidOpenTextDocumentParams,
         InitializedParams, PartialResultParams, Position, TextDocumentContentChangeEvent,
         TextDocumentIdentifier, TextDocumentItem, TextDocumentPositionParams,
         WorkDoneProgressParams,
@@ -740,7 +740,7 @@ mod tests {
     use std::time::Duration;
 
     pub(crate) fn initialize_language_server(
-        params: Option<InitializeParams>,
+        params: Option<serde_json::Value>,
     ) -> (Connection, Receiver<Result<()>>) {
         use std::sync::mpsc;
         let (client_connection, server_connection) = Connection::memory();
@@ -757,7 +757,7 @@ mod tests {
             .send(Message::Request(lsp_server::Request {
                 id: 1.into(),
                 method: Initialize::METHOD.to_string(),
-                params: serde_json::to_value(params.unwrap_or_default()).unwrap(),
+                params: params.unwrap_or(serde_json::Value::Null),
             }))
             .unwrap();
         client_connection
diff --git a/crates/nu-lsp/src/workspace.rs b/crates/nu-lsp/src/workspace.rs
index 9a8a943a03..65095bfe0b 100644
--- a/crates/nu-lsp/src/workspace.rs
+++ b/crates/nu-lsp/src/workspace.rs
@@ -50,15 +50,14 @@ impl LanguageServer {
     pub(crate) fn initialize_workspace_folders(
         &mut self,
         init_params: serde_json::Value,
-    ) -> Result<()> {
+    ) -> Option<()> {
         if let Some(array) = init_params.get("workspaceFolders") {
-            let folders: Vec<WorkspaceFolder> =
-                serde_json::from_value(array.clone()).into_diagnostic()?;
+            let folders: Vec<WorkspaceFolder> = serde_json::from_value(array.clone()).ok()?;
             for folder in folders {
                 self.workspace_folders.insert(folder.name.clone(), folder);
             }
         }
-        Ok(())
+        Some(())
     }
 
     /// Highlight all occurrences of the text at cursor, in current file
@@ -568,18 +567,36 @@ mod tests {
             .unwrap()
     }
 
+    /// Should not exit on malformed init_params
+    #[test]
+    fn malformed_init_params() {
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("workspace");
+        let (client_connection, _recv) = initialize_language_server(Some(
+            serde_json::json!({ "workspaceFolders": serde_json::Value::Null }),
+        ));
+        script.push("foo.nu");
+        let script = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script.clone());
+    }
+
     #[test]
     fn command_reference_in_workspace() {
         let mut script = fixtures();
         script.push("lsp");
         script.push("workspace");
-        let (client_connection, _recv) = initialize_language_server(Some(InitializeParams {
-            workspace_folders: Some(vec![WorkspaceFolder {
-                uri: path_to_uri(&script),
-                name: "random name".to_string(),
-            }]),
-            ..Default::default()
-        }));
+        let (client_connection, _recv) = initialize_language_server(
+            serde_json::to_value(InitializeParams {
+                workspace_folders: Some(vec![WorkspaceFolder {
+                    uri: path_to_uri(&script),
+                    name: "random name".to_string(),
+                }]),
+                ..Default::default()
+            })
+            .ok(),
+        );
         script.push("foo.nu");
         let script = path_to_uri(&script);
 
@@ -620,13 +637,16 @@ mod tests {
         let mut script = fixtures();
         script.push("lsp");
         script.push("workspace");
-        let (client_connection, _recv) = initialize_language_server(Some(InitializeParams {
-            workspace_folders: Some(vec![WorkspaceFolder {
-                uri: path_to_uri(&script),
-                name: "random name".to_string(),
-            }]),
-            ..Default::default()
-        }));
+        let (client_connection, _recv) = initialize_language_server(
+            serde_json::to_value(InitializeParams {
+                workspace_folders: Some(vec![WorkspaceFolder {
+                    uri: path_to_uri(&script),
+                    name: "random name".to_string(),
+                }]),
+                ..Default::default()
+            })
+            .ok(),
+        );
         script.push("foo.nu");
         let script = path_to_uri(&script);
 
@@ -667,13 +687,16 @@ mod tests {
         let mut script = fixtures();
         script.push("lsp");
         script.push("workspace");
-        let (client_connection, _recv) = initialize_language_server(Some(InitializeParams {
-            workspace_folders: Some(vec![WorkspaceFolder {
-                uri: path_to_uri(&script),
-                name: "random name".to_string(),
-            }]),
-            ..Default::default()
-        }));
+        let (client_connection, _recv) = initialize_language_server(
+            serde_json::to_value(InitializeParams {
+                workspace_folders: Some(vec![WorkspaceFolder {
+                    uri: path_to_uri(&script),
+                    name: "random name".to_string(),
+                }]),
+                ..Default::default()
+            })
+            .ok(),
+        );
         script.push("foo.nu");
         let script = path_to_uri(&script);
 
@@ -742,13 +765,16 @@ mod tests {
         let mut script = fixtures();
         script.push("lsp");
         script.push("workspace");
-        let (client_connection, _recv) = initialize_language_server(Some(InitializeParams {
-            workspace_folders: Some(vec![WorkspaceFolder {
-                uri: path_to_uri(&script),
-                name: "random name".to_string(),
-            }]),
-            ..Default::default()
-        }));
+        let (client_connection, _recv) = initialize_language_server(
+            serde_json::to_value(InitializeParams {
+                workspace_folders: Some(vec![WorkspaceFolder {
+                    uri: path_to_uri(&script),
+                    name: "random name".to_string(),
+                }]),
+                ..Default::default()
+            })
+            .ok(),
+        );
         script.push("foo.nu");
         let script = path_to_uri(&script);
 
@@ -807,13 +833,16 @@ mod tests {
         let mut script = fixtures();
         script.push("lsp");
         script.push("workspace");
-        let (client_connection, _recv) = initialize_language_server(Some(InitializeParams {
-            workspace_folders: Some(vec![WorkspaceFolder {
-                uri: path_to_uri(&script),
-                name: "random name".to_string(),
-            }]),
-            ..Default::default()
-        }));
+        let (client_connection, _recv) = initialize_language_server(
+            serde_json::to_value(InitializeParams {
+                workspace_folders: Some(vec![WorkspaceFolder {
+                    uri: path_to_uri(&script),
+                    name: "random name".to_string(),
+                }]),
+                ..Default::default()
+            })
+            .ok(),
+        );
         script.push("foo.nu");
         let script = path_to_uri(&script);
 

From 4b0b4ddce1c525b9f62bee7b21b084da20f8cfea Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Sat, 8 Feb 2025 16:23:28 +0100
Subject: [PATCH 1021/1072] Replaced `IoError::new_with_additional_context`
 calls that still had `Span::unknown()` (#15056)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
In #14968 I grepped the code for `IoError::new` calls with unknown
spans, but I forgot to also grep for
`IoError::new_with_additional_context`, so I missed some. Hopefullly
this is the last P.S. to #14968.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

N/A

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->

N/A
---
 crates/nu-cli/src/eval_file.rs                | 18 +++++++++---------
 crates/nu-command/src/system/run_external.rs  | 15 ++++++---------
 .../src/communication_mode/mod.rs             | 12 +++++-------
 crates/nu-plugin-core/src/interface/mod.rs    |  7 +++----
 crates/nu-plugin-engine/src/persistent.rs     |  7 +++----
 crates/nu-protocol/src/engine/engine_state.rs | 19 +++++++------------
 6 files changed, 33 insertions(+), 45 deletions(-)

diff --git a/crates/nu-cli/src/eval_file.rs b/crates/nu-cli/src/eval_file.rs
index 8b252bf17e..8a761df0a9 100644
--- a/crates/nu-cli/src/eval_file.rs
+++ b/crates/nu-cli/src/eval_file.rs
@@ -27,11 +27,11 @@ pub fn evaluate_file(
     let cwd = engine_state.cwd_as_string(Some(stack))?;
 
     let file_path = canonicalize_with(&path, cwd).map_err(|err| {
-        IoError::new_with_additional_context(
+        IoError::new_internal_with_path(
             err.kind(),
-            Span::unknown(),
-            PathBuf::from(&path),
             "Could not access file",
+            nu_protocol::location!(),
+            PathBuf::from(&path),
         )
     })?;
 
@@ -46,21 +46,21 @@ pub fn evaluate_file(
         })?;
 
     let file = std::fs::read(&file_path).map_err(|err| {
-        IoError::new_with_additional_context(
+        IoError::new_internal_with_path(
             err.kind(),
-            Span::unknown(),
-            file_path.clone(),
             "Could not read file",
+            nu_protocol::location!(),
+            file_path.clone(),
         )
     })?;
     engine_state.file = Some(file_path.clone());
 
     let parent = file_path.parent().ok_or_else(|| {
-        IoError::new_with_additional_context(
+        IoError::new_internal_with_path(
             std::io::ErrorKind::NotFound,
-            Span::unknown(),
-            file_path.clone(),
             "The file path does not have a parent",
+            nu_protocol::location!(),
+            file_path.clone(),
         )
     })?;
 
diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs
index 70e423387a..64563a8aef 100644
--- a/crates/nu-command/src/system/run_external.rs
+++ b/crates/nu-command/src/system/run_external.rs
@@ -252,11 +252,10 @@ impl Command for External {
         );
 
         let mut child = child.map_err(|err| {
-            IoError::new_with_additional_context(
+            IoError::new_internal(
                 err.kind(),
-                Span::unknown(),
-                None,
                 "Could not spawn foreground child",
+                nu_protocol::location!(),
             )
         })?;
 
@@ -443,11 +442,10 @@ fn write_pipeline_data(
         stream.write_to(writer)?;
     } else if let PipelineData::Value(Value::Binary { val, .. }, ..) = data {
         writer.write_all(&val).map_err(|err| {
-            IoError::new_with_additional_context(
+            IoError::new_internal(
                 err.kind(),
-                Span::unknown(),
-                None,
                 "Could not write pipeline data",
+                nu_protocol::location!(),
             )
         })?;
     } else {
@@ -464,11 +462,10 @@ fn write_pipeline_data(
         for value in output {
             let bytes = value.coerce_into_binary()?;
             writer.write_all(&bytes).map_err(|err| {
-                IoError::new_with_additional_context(
+                IoError::new_internal(
                     err.kind(),
-                    Span::unknown(),
-                    None,
                     "Could not write pipeline data",
+                    nu_protocol::location!(),
                 )
             })?;
         }
diff --git a/crates/nu-plugin-core/src/communication_mode/mod.rs b/crates/nu-plugin-core/src/communication_mode/mod.rs
index 2b1ec06884..0e72712793 100644
--- a/crates/nu-plugin-core/src/communication_mode/mod.rs
+++ b/crates/nu-plugin-core/src/communication_mode/mod.rs
@@ -3,7 +3,7 @@ use std::io::{Stdin, Stdout};
 use std::process::{Child, ChildStdin, ChildStdout, Command, Stdio};
 
 use nu_protocol::shell_error::io::IoError;
-use nu_protocol::{ShellError, Span};
+use nu_protocol::ShellError;
 
 #[cfg(feature = "local-socket")]
 mod local_socket;
@@ -189,11 +189,10 @@ impl PreparedServerCommunication {
                 listener
                     .set_nonblocking(ListenerNonblockingMode::Accept)
                     .map_err(|err| {
-                        IoError::new_with_additional_context(
+                        IoError::new_internal(
                             err.kind(),
-                            Span::unknown(),
-                            None,
                             "Could not set non-blocking mode accept for listener",
+                            nu_protocol::location!(),
                         )
                     })?;
                 let mut get_socket = || {
@@ -204,11 +203,10 @@ impl PreparedServerCommunication {
                                 // Success! Ensure the stream is in nonblocking mode though, for
                                 // good measure. Had an issue without this on macOS.
                                 stream.set_nonblocking(false).map_err(|err| {
-                                    IoError::new_with_additional_context(
+                                    IoError::new_internal(
                                         err.kind(),
-                                        Span::unknown(),
-                                        None,
                                         "Could not disable non-blocking mode for listener",
+                                        nu_protocol::location!(),
                                     )
                                 })?;
                                 result = Some(stream);
diff --git a/crates/nu-plugin-core/src/interface/mod.rs b/crates/nu-plugin-core/src/interface/mod.rs
index 01f91b7c1c..cbbaaeb62c 100644
--- a/crates/nu-plugin-core/src/interface/mod.rs
+++ b/crates/nu-plugin-core/src/interface/mod.rs
@@ -3,7 +3,7 @@
 use nu_plugin_protocol::{ByteStreamInfo, ListStreamInfo, PipelineDataHeader, StreamMessage};
 use nu_protocol::{
     engine::Sequence, shell_error::io::IoError, ByteStream, ListStream, PipelineData, Reader,
-    ShellError, Signals, Span,
+    ShellError, Signals,
 };
 use std::{
     io::{Read, Write},
@@ -367,11 +367,10 @@ where
                         result
                     })
                     .map_err(|err| {
-                        IoError::new_with_additional_context(
+                        IoError::new_internal(
                             err.kind(),
-                            Span::unknown(),
-                            None,
                             "Could not spawn plugin stream background writer",
+                            nu_protocol::location!(),
                         )
                     })?,
             )),
diff --git a/crates/nu-plugin-engine/src/persistent.rs b/crates/nu-plugin-engine/src/persistent.rs
index 8d444a4d1c..8bbd3d36b0 100644
--- a/crates/nu-plugin-engine/src/persistent.rs
+++ b/crates/nu-plugin-engine/src/persistent.rs
@@ -9,7 +9,7 @@ use nu_protocol::{
     engine::{EngineState, Stack},
     shell_error::io::IoError,
     HandlerGuard, Handlers, PluginGcConfig, PluginIdentity, PluginMetadata, RegisteredPlugin,
-    ShellError, Span,
+    ShellError,
 };
 use std::{
     collections::HashMap,
@@ -186,11 +186,10 @@ impl PersistentPlugin {
 
         // Start the plugin garbage collector
         let gc = PluginGc::new(mutable.gc_config.clone(), &self).map_err(|err| {
-            IoError::new_with_additional_context(
+            IoError::new_internal(
                 err.kind(),
-                Span::unknown(),
-                None,
                 "Could not start plugin gc",
+                nu_protocol::location!(),
             )
         })?;
 
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index c93f2d5c8f..184f1d5343 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -324,12 +324,7 @@ impl EngineState {
 
         let cwd = self.cwd(Some(stack))?;
         std::env::set_current_dir(cwd).map_err(|err| {
-            IoError::new_with_additional_context(
-                err.kind(),
-                Span::unknown(),
-                None,
-                "Could not set current dir",
-            )
+            IoError::new_internal(err.kind(), "Could not set current dir", crate::location!())
         })?;
 
         if let Some(config) = stack.config.take() {
@@ -521,11 +516,11 @@ impl EngineState {
                 if err.kind() == std::io::ErrorKind::NotFound {
                     Ok(PluginRegistryFile::default())
                 } else {
-                    Err(ShellError::Io(IoError::new_with_additional_context(
+                    Err(ShellError::Io(IoError::new_internal_with_path(
                         err.kind(),
-                        Span::unknown(),
-                        PathBuf::from(plugin_path),
                         "Failed to open plugin file",
+                        crate::location!(),
+                        PathBuf::from(plugin_path),
                     )))
                 }
             }
@@ -538,11 +533,11 @@ impl EngineState {
 
         // Write it to the same path
         let plugin_file = File::create(plugin_path.as_path()).map_err(|err| {
-            IoError::new_with_additional_context(
+            IoError::new_internal_with_path(
                 err.kind(),
-                Span::unknown(),
-                PathBuf::from(plugin_path),
                 "Failed to write plugin file",
+                crate::location!(),
+                PathBuf::from(plugin_path),
             )
         })?;
 

From 5a7707cb521df6cbf8815f0d8f8740ac173ee521 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Sat, 8 Feb 2025 14:02:15 -0500
Subject: [PATCH 1022/1072] Remove `--no-default-features` for
 `std-lib-and-python-virtualenv` CI (#15045)

# Description

Current CI tests `std-lib-and-python-virtualenv` using Nushell installed
with:

```
cargo install --path . --locked --no-default-features --force
```

However, this disables certain features that may be utilized in `std` or
(now) `std-rfc`; namely `stor` and `into sqlite`.

This PR simply removes the `--no-default-features` flag, which *should*
allow #15042 CI to complete successfully.

Historically, I believe that this was set up to mirror
[`pypa/virtualenv`
CI](https://github.com/pypa/virtualenv/pulls?q=is%3Apr+is%3Amerged+nushell).
However, with all Nushell binary builds now including these features, it
seems to me that a more accurate CI will test with default features. Let
me know if my understanding is off here, and we can look for
alternatives.

# User-Facing Changes

None

# Tests + Formatting

CI Update

# After Submitting

N/A
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8777bd01e0..65b349867b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -97,7 +97,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
 
       - name: Install Nushell
-        run: cargo install --path . --locked --no-default-features --force
+        run: cargo install --path . --locked --force
 
       - name: Standard library tests
         run: nu -c 'use crates/nu-std/testing.nu; testing run-tests --path crates/nu-std'

From 26897b287c59464a90202073885405a4dd5333f7 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Sat, 8 Feb 2025 16:23:51 -0500
Subject: [PATCH 1023/1072] Adds platform agnostic EoL separator to `char`
 command (#15059)

Adds `char eol`, `char line_sep`, and `char lsep` (synonyms) to represent
the platform specific line ending character(s).
---
 crates/nu-command/src/strings/char_.rs             | 14 ++++++++++++++
 crates/nu-command/tests/commands/platform/char_.rs |  2 +-
 crates/nu-command/tests/commands/platform/mod.rs   |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/strings/char_.rs b/crates/nu-command/src/strings/char_.rs
index ef27d221d8..b14ebd7b4f 100644
--- a/crates/nu-command/src/strings/char_.rs
+++ b/crates/nu-command/src/strings/char_.rs
@@ -12,6 +12,13 @@ const ENV_PATH_SEPARATOR_CHAR: char = ';';
 #[cfg(not(target_family = "windows"))]
 const ENV_PATH_SEPARATOR_CHAR: char = ':';
 
+// Character used to separate directories in a Path Environment variable on windows is ";"
+#[cfg(target_family = "windows")]
+const LINE_SEPARATOR_CHAR: &str = "\r\n";
+// Character used to separate directories in a Path Environment variable on linux/mac/unix is ":"
+#[cfg(not(target_family = "windows"))]
+const LINE_SEPARATOR_CHAR: char = '\n';
+
 #[derive(Clone)]
 pub struct Char;
 
@@ -59,6 +66,10 @@ static CHAR_MAP: LazyLock<IndexMap<&'static str, String>> = LazyLock::new(|| {
         "path_sep" => std::path::MAIN_SEPARATOR.to_string(),
         "psep" => std::path::MAIN_SEPARATOR.to_string(),
         "separator" => std::path::MAIN_SEPARATOR.to_string(),
+        "eol" => LINE_SEPARATOR_CHAR.to_string(),
+        "lsep" => LINE_SEPARATOR_CHAR.to_string(),
+        "line_sep" => LINE_SEPARATOR_CHAR.to_string(),
+        "lsep" => '\n'.to_string(),
         "esep" => ENV_PATH_SEPARATOR_CHAR.to_string(),
         "env_sep" => ENV_PATH_SEPARATOR_CHAR.to_string(),
         "tilde" => '~'.to_string(),                                // ~
@@ -163,6 +174,9 @@ static NO_OUTPUT_CHARS: LazyLock<HashSet<&'static str>> = LazyLock::new(|| {
         "crlf",
         "bel",
         "backspace",
+        "lsep",
+        "line_sep",
+        "eol",
     ]
     .into_iter()
     .collect()
diff --git a/crates/nu-command/tests/commands/platform/char_.rs b/crates/nu-command/tests/commands/platform/char_.rs
index 7a6bdc1309..eeaffd4e4a 100644
--- a/crates/nu-command/tests/commands/platform/char_.rs
+++ b/crates/nu-command/tests/commands/platform/char_.rs
@@ -8,5 +8,5 @@ fn test_char_list_outputs_table() {
         "#
     ));
 
-    assert_eq!(actual.out, "107");
+    assert_eq!(actual.out, "113");
 }
diff --git a/crates/nu-command/tests/commands/platform/mod.rs b/crates/nu-command/tests/commands/platform/mod.rs
index c37cc28c8c..d9d4c4cfc4 100644
--- a/crates/nu-command/tests/commands/platform/mod.rs
+++ b/crates/nu-command/tests/commands/platform/mod.rs
@@ -1,2 +1,3 @@
 mod ansi_;
+mod char_;
 mod kill;

From 31e1f49cb6a43f2e439992a591a06e63e5356e74 Mon Sep 17 00:00:00 2001
From: Solomon <git@solomonvictorino.com>
Date: Sat, 8 Feb 2025 17:57:28 -0700
Subject: [PATCH 1024/1072] fix ranges over zero-length input (#15062)

Fixes #15061

# User-Facing Changes

Fixes panics when slicing empty input with inclusive ranges:

```nushell
> random binary 0 | bytes at 0..0
Error:   x Main thread panicked.
  |-> at crates/nu-protocol/src/value/range.rs:118:42
  `-> attempt to subtract with overflow
```
---
 crates/nu-command/tests/commands/str_/mod.rs | 7 +++++++
 crates/nu-protocol/src/value/range.rs        | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/tests/commands/str_/mod.rs b/crates/nu-command/tests/commands/str_/mod.rs
index 2aeabfd04a..9a361f7d43 100644
--- a/crates/nu-command/tests/commands/str_/mod.rs
+++ b/crates/nu-command/tests/commands/str_/mod.rs
@@ -388,6 +388,13 @@ fn substring_by_negative_index() {
     })
 }
 
+#[test]
+fn substring_of_empty_string() {
+    let actual = nu!("'' | str substring ..0");
+    assert_eq!(actual.err, "");
+    assert_eq!(actual.out, "");
+}
+
 #[test]
 fn str_reverse() {
     let actual = nu!(r#"
diff --git a/crates/nu-protocol/src/value/range.rs b/crates/nu-protocol/src/value/range.rs
index 9ce9c6fa54..5524a79fe3 100644
--- a/crates/nu-protocol/src/value/range.rs
+++ b/crates/nu-protocol/src/value/range.rs
@@ -112,8 +112,9 @@ mod int_range {
             match self.end {
                 Bound::Unbounded => Bound::Unbounded,
                 Bound::Included(i) => match i {
+                    _ if len == 0 => Bound::Excluded(0),
                     i if i < 0 => Bound::Excluded(len.saturating_sub((i + 1).unsigned_abs())),
-                    i => Bound::Included((len - 1).min(i.unsigned_abs())),
+                    i => Bound::Included((len.saturating_sub(1)).min(i.unsigned_abs())),
                 },
                 Bound::Excluded(i) => Bound::Excluded(match i {
                     i if i < 0 => len.saturating_sub(i.unsigned_abs()),

From bfe398ca362bada151747e35a542fdd812c81b09 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Sun, 9 Feb 2025 07:19:11 -0500
Subject: [PATCH 1025/1072] Fix `char lsep` assignment (#15065)

Fix `char eol` issue where there was still a hardcoded `\n` taking
effect on Windows.
---
 crates/nu-command/src/strings/char_.rs             |  1 -
 crates/nu-command/tests/commands/platform/char_.rs | 10 ++++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/strings/char_.rs b/crates/nu-command/src/strings/char_.rs
index b14ebd7b4f..6a0fe3d57a 100644
--- a/crates/nu-command/src/strings/char_.rs
+++ b/crates/nu-command/src/strings/char_.rs
@@ -69,7 +69,6 @@ static CHAR_MAP: LazyLock<IndexMap<&'static str, String>> = LazyLock::new(|| {
         "eol" => LINE_SEPARATOR_CHAR.to_string(),
         "lsep" => LINE_SEPARATOR_CHAR.to_string(),
         "line_sep" => LINE_SEPARATOR_CHAR.to_string(),
-        "lsep" => '\n'.to_string(),
         "esep" => ENV_PATH_SEPARATOR_CHAR.to_string(),
         "env_sep" => ENV_PATH_SEPARATOR_CHAR.to_string(),
         "tilde" => '~'.to_string(),                                // ~
diff --git a/crates/nu-command/tests/commands/platform/char_.rs b/crates/nu-command/tests/commands/platform/char_.rs
index eeaffd4e4a..b51a6b06d5 100644
--- a/crates/nu-command/tests/commands/platform/char_.rs
+++ b/crates/nu-command/tests/commands/platform/char_.rs
@@ -10,3 +10,13 @@ fn test_char_list_outputs_table() {
 
     assert_eq!(actual.out, "113");
 }
+
+#[test]
+fn test_char_eol() {
+    let actual = nu!(r#"
+        let expected = if ($nu.os-info.name == 'windows') { "\r\n" } else { "\n" }
+        ((char lsep) == $expected) and ((char line_sep) == $expected) and ((char eol) == $expected)
+    "#);
+
+    assert_eq!(actual.out, "true");
+}

From 5b4dd775d41fb9103c34b4b94cb7d110659ae1a6 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Sun, 9 Feb 2025 09:03:37 -0500
Subject: [PATCH 1026/1072] Move `std-rfc` into Nushell (#15042)

Move `std-rfc` into Nushell.  `use std-rfc/<submodule>` now works "out-of-the-box"
---
 Cargo.toml                                    |   2 +-
 crates/nu-std/Cargo.toml                      |   6 +-
 crates/nu-std/src/lib.rs                      |  81 ++++-
 crates/nu-std/std-rfc/clip/mod.nu             |  71 ++++
 crates/nu-std/std-rfc/conversions/mod.nu      | 121 +++++++
 crates/nu-std/std-rfc/kv/mod.nu               | 210 +++++++++++
 crates/nu-std/std-rfc/mod.nu                  |   9 +
 crates/nu-std/std-rfc/path/mod.nu             |  71 ++++
 crates/nu-std/std-rfc/str/mod.nu              | 136 +++++++
 crates/nu-std/std-rfc/tables/mod.nu           | 221 ++++++++++++
 crates/nu-std/testing.nu                      |   2 +-
 .../nu-std/tests/test_std-rfc_conversions.nu  | 110 ++++++
 crates/nu-std/tests/test_std-rfc_kv.nu        | 283 +++++++++++++++
 crates/nu-std/tests/test_std-rfc_path.nu      |  38 ++
 crates/nu-std/tests/test_std-rfc_str.nu       | 292 +++++++++++++++
 crates/nu-std/tests/test_std-rfc_tables.nu    | 331 ++++++++++++++++++
 16 files changed, 1967 insertions(+), 17 deletions(-)
 create mode 100644 crates/nu-std/std-rfc/clip/mod.nu
 create mode 100644 crates/nu-std/std-rfc/conversions/mod.nu
 create mode 100644 crates/nu-std/std-rfc/kv/mod.nu
 create mode 100644 crates/nu-std/std-rfc/mod.nu
 create mode 100644 crates/nu-std/std-rfc/path/mod.nu
 create mode 100644 crates/nu-std/std-rfc/str/mod.nu
 create mode 100644 crates/nu-std/std-rfc/tables/mod.nu
 create mode 100644 crates/nu-std/tests/test_std-rfc_conversions.nu
 create mode 100644 crates/nu-std/tests/test_std-rfc_kv.nu
 create mode 100644 crates/nu-std/tests/test_std-rfc_path.nu
 create mode 100644 crates/nu-std/tests/test_std-rfc_str.nu
 create mode 100644 crates/nu-std/tests/test_std-rfc_tables.nu

diff --git a/Cargo.toml b/Cargo.toml
index c2fc1ece5a..06cebda215 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -294,7 +294,7 @@ system-clipboard = [
 trash-support = ["nu-command/trash-support", "nu-cmd-lang/trash-support"]
 
 # SQLite commands for nushell
-sqlite = ["nu-command/sqlite", "nu-cmd-lang/sqlite"]
+sqlite = ["nu-command/sqlite", "nu-cmd-lang/sqlite", "nu-std/sqlite"]
 
 [profile.release]
 opt-level = "s"     # Optimize for size
diff --git a/crates/nu-std/Cargo.toml b/crates/nu-std/Cargo.toml
index 5ebc9e8a2d..ffab3bc9cd 100644
--- a/crates/nu-std/Cargo.toml
+++ b/crates/nu-std/Cargo.toml
@@ -16,4 +16,8 @@ miette = { workspace = true, features = ["fancy-no-backtrace"] }
 log = "0.4"
 
 [lints]
-workspace = true
\ No newline at end of file
+workspace = true
+
+[features]
+sqlite = []
+
diff --git a/crates/nu-std/src/lib.rs b/crates/nu-std/src/lib.rs
index 58b1c98ff8..58dc72b12d 100644
--- a/crates/nu-std/src/lib.rs
+++ b/crates/nu-std/src/lib.rs
@@ -1,11 +1,9 @@
 #![doc = include_str!("../README.md")]
 use log::trace;
-use nu_engine::eval_block;
 use nu_parser::parse;
 use nu_protocol::{
-    debugger::WithoutDebug,
-    engine::{FileStack, Stack, StateWorkingSet, VirtualPath},
-    report_parse_error, PipelineData, VirtualPathId,
+    engine::{FileStack, StateWorkingSet, VirtualPath},
+    report_parse_error, VirtualPathId,
 };
 use std::path::PathBuf;
 
@@ -22,6 +20,7 @@ pub fn load_standard_library(
     trace!("load_standard_library");
 
     let mut working_set = StateWorkingSet::new(engine_state);
+
     // Contents of the std virtual directory
     let mut std_virt_paths = vec![];
 
@@ -81,8 +80,70 @@ pub fn load_standard_library(
     let std_dir = PathBuf::from("std").to_string_lossy().to_string();
     let _ = working_set.add_virtual_path(std_dir, VirtualPath::Dir(std_virt_paths));
 
+    // Add std-rfc files
+    let mut std_rfc_virt_paths = vec![];
+
+    // std-rfc/mod.nu
+    let std_rfc_mod_virt_file_id = create_virt_file(
+        &mut working_set,
+        "std-rfc/mod.nu",
+        include_str!("../std-rfc/mod.nu"),
+    );
+    std_rfc_virt_paths.push(std_rfc_mod_virt_file_id);
+
+    // Submodules/subdirectories ... std-rfc/<module>/mod.nu
+    let mut std_rfc_submodules = vec![
+        (
+            "mod.nu",
+            "std-rfc/clip",
+            include_str!("../std-rfc/clip/mod.nu"),
+        ),
+        (
+            "mod.nu",
+            "std-rfc/conversions",
+            include_str!("../std-rfc/conversions/mod.nu"),
+        ),
+        #[cfg(feature = "sqlite")]
+        ("mod.nu", "std-rfc/kv", include_str!("../std-rfc/kv/mod.nu")),
+        (
+            "mod.nu",
+            "std-rfc/path",
+            include_str!("../std-rfc/path/mod.nu"),
+        ),
+        (
+            "mod.nu",
+            "std-rfc/str",
+            include_str!("../std-rfc/str/mod.nu"),
+        ),
+        (
+            "mod.nu",
+            "std-rfc/tables",
+            include_str!("../std-rfc/tables/mod.nu"),
+        ),
+    ];
+
+    for (filename, std_rfc_subdir_name, content) in std_rfc_submodules.drain(..) {
+        let mod_dir = PathBuf::from(std_rfc_subdir_name);
+        let name = mod_dir.join(filename);
+        let virt_file_id = create_virt_file(&mut working_set, &name.to_string_lossy(), content);
+
+        // Place file in virtual subdir
+        let mod_dir_filelist = vec![virt_file_id];
+
+        let virt_dir_id = working_set.add_virtual_path(
+            mod_dir.to_string_lossy().to_string(),
+            VirtualPath::Dir(mod_dir_filelist),
+        );
+        // Add the subdir to the list of paths in std
+        std_rfc_virt_paths.push(virt_dir_id);
+    }
+
+    // Create std virtual dir with all subdirs and files
+    let std_rfc_dir = PathBuf::from("std-rfc").to_string_lossy().to_string();
+    let _ = working_set.add_virtual_path(std_rfc_dir, VirtualPath::Dir(std_rfc_virt_paths));
+
     // Load prelude
-    let (block, delta) = {
+    let (_, delta) = {
         let source = r#"
 # Prelude
 use std/prelude *
@@ -95,7 +156,7 @@ use std/prelude *
 
         let block = parse(
             &mut working_set,
-            Some("loading stdlib"),
+            Some("loading stdlib prelude"),
             source.as_bytes(),
             false,
         );
@@ -112,13 +173,5 @@ use std/prelude *
 
     engine_state.merge_delta(delta)?;
 
-    // We need to evaluate the module in order to run the `export-env` blocks.
-    let mut stack = Stack::new();
-    let pipeline_data = PipelineData::Empty;
-
-    eval_block::<WithoutDebug>(engine_state, &mut stack, &block, pipeline_data)?;
-
-    engine_state.merge_env(&mut stack)?;
-
     Ok(())
 }
diff --git a/crates/nu-std/std-rfc/clip/mod.nu b/crates/nu-std/std-rfc/clip/mod.nu
new file mode 100644
index 0000000000..2c48562783
--- /dev/null
+++ b/crates/nu-std/std-rfc/clip/mod.nu
@@ -0,0 +1,71 @@
+# Commands for interacting with the system clipboard
+#
+# > These commands require your terminal to support OSC 52
+# > Terminal multiplexers such as screen, tmux, zellij etc may interfere with this command
+
+# Copy input to system clipboard
+#
+# # Example
+# ```nushell
+# >_ "Hello" | clip copy
+# ```
+export def copy [
+  --ansi (-a)                 # Copy ansi formatting
+]: any -> nothing {
+  let input = $in | collect
+  let text = match ($input | describe -d | get type) {
+    $type if $type in [ table, record, list ] => {
+      $input | table -e
+    }
+    _ => {$input}
+  }
+
+  let do_strip_ansi = match $ansi {
+    true  => {{||}}
+    false => {{|| ansi strip }}
+  }
+
+  let output = (
+    $text
+    | do $do_strip_ansi
+    | encode base64
+  )
+
+	print -n $'(ansi osc)52;c;($output)(ansi st)'
+}
+
+# Paste contents of system clipboard
+#
+# # Example
+# ```nushell
+# >_ clip paste
+# "Hello"
+# ```
+export def paste []: [nothing -> string] {
+	try {
+		term query $'(ansi osc)52;c;?(ansi st)' -p $'(ansi osc)52;c;' -t (ansi st)
+	} catch {
+		error make -u {
+			msg: "Terminal did not responds to OSC 52 paste request."
+			help: $"Check if your terminal supports OSC 52."
+		}
+	}
+	| decode
+	| decode base64
+	| decode
+}
+
+# Add a prefix to each line of the content to be copied
+#
+# # Example: Format output for Nushell doc
+# ls | clip prefix '# => ' | clip copy
+export def prefix [prefix: string]: any -> string {
+  let input = $in | collect
+  match ($input | describe -d | get type) {
+    $type if $type in [ table, record, list ] => {
+      $input | table -e
+    }
+    _ => {$input}
+  }
+  | str replace -r --all '(?m)(.*)' $'($prefix)$1'
+}
diff --git a/crates/nu-std/std-rfc/conversions/mod.nu b/crates/nu-std/std-rfc/conversions/mod.nu
new file mode 100644
index 0000000000..2d18699164
--- /dev/null
+++ b/crates/nu-std/std-rfc/conversions/mod.nu
@@ -0,0 +1,121 @@
+# Convert a Nushell value to a list
+# 
+# Primary useful for range-to-list, but other types are accepted as well.
+# 
+# Example:
+#
+# 1..10 | into list
+export def "into list" []: any -> list {
+  let input = $in
+  let type = ($input | describe --detailed | get type)
+  match $type {
+    range => {$input | each {||}}
+    list => $input
+    table => $input
+    _ => [ $input ]
+  }
+}
+
+# Convert a list of columns into a table
+#
+# Examples:
+#
+# [
+#  ([ 1 2 3 ] | wrap a)
+#  ([ 4 5 6 ] | wrap b)
+#  ([ 7 8 9 ] | wrap c)
+# ] | columns-into-table 
+# => ╭───┬───┬───┬───╮
+# => │ # │ a │ b │ c │
+# => ├───┼───┼───┼───┤
+# => │ 0 │ 1 │ 4 │ 7 │
+# => │ 1 │ 2 │ 5 │ 8 │
+# => │ 2 │ 3 │ 6 │ 9 │
+# => ╰───┴───┴───┴───╯
+#
+# Can roundtrip with `table-into-columns`
+# 
+# ls | table-into-columns | columns-into-table
+# => ╭───┬────────────────────────┬──────┬────────┬────────────────╮
+# => │ # │          name          │ type │  size  │    modified    │
+# => ├───┼────────────────────────┼──────┼────────┼────────────────┤
+# => │ 0 │ into-list.nu           │ file │  378 B │ 40 minutes ago │
+# => │ 1 │ mod.nu                 │ file │   28 B │ 41 minutes ago │
+# => │ 2 │ name-values.nu         │ file │  394 B │ 34 minutes ago │
+# => │ 3 │ record-into-columns.nu │ file │ 1.3 kB │ 27 minutes ago │
+# => ╰───┴────────────────────────┴──────┴────────┴────────────────╯
+export def columns-into-table []: [list<table> -> table] {
+    reduce {|it| merge $it}
+}
+
+# Convert a record, where each value is a list, into a list of columns.
+# { a: [ 1 2 3 ], b: [ 4 5 6 ] } | record-into-columns
+# => ╭───┬───────────╮
+# => │ 0 │ ╭───┬───╮ │
+# => │   │ │ # │ a │ │
+# => │   │ ├───┼───┤ │
+# => │   │ │ 0 │ 1 │ │
+# => │   │ │ 1 │ 2 │ │
+# => │   │ │ 2 │ 3 │ │
+# => │   │ ╰───┴───╯ │
+# => │ 1 │ ╭───┬───╮ │
+# => │   │ │ # │ b │ │
+# => │   │ ├───┼───┤ │
+# => │   │ │ 0 │ 4 │ │
+# => │   │ │ 1 │ 5 │ │
+# => │   │ │ 2 │ 6 │ │
+# => │   │ ╰───┴───╯ │
+# => ╰───┴───────────╯
+# =>
+# This can be especially useful when combined with `columns-into-table`, as in:
+#
+# { a: [ 1 2 3 ], b: [ 4 5 6 ] } | record-into-columns
+# | columns-into-table
+# => ╭───┬───┬───╮
+# => │ # │ a │ b │
+# => ├───┼───┼───┤
+# => │ 0 │ 1 │ 4 │
+# => │ 1 │ 2 │ 5 │
+# => │ 2 │ 3 │ 6 │
+# => ╰───┴───┴───╯
+# =>
+export def record-into-columns []: [record -> list] {
+    items {|key, val| $val | wrap $key}
+}
+
+# Convert/split a table into a list of columns
+#
+# Examples:
+# ls | table-into-columns 
+# => Returns a list of 4 tables, one for each of the `ls` columns
+#
+# Can be roundtripped with `columns-into-table`
+#
+# ls | table-into-columns | columns-into-table
+# => ╭───┬────────────────────────┬──────┬────────┬────────────────╮
+# => │ # │          name          │ type │  size  │    modified    │
+# => ├───┼────────────────────────┼──────┼────────┼────────────────┤
+# => │ 0 │ into-list.nu           │ file │  378 B │ 40 minutes ago │
+# => │ 1 │ mod.nu                 │ file │   28 B │ 41 minutes ago │
+# => │ 2 │ name-values.nu         │ file │  394 B │ 34 minutes ago │
+# => │ 3 │ record-into-columns.nu │ file │ 1.3 kB │ 27 minutes ago │
+# => ╰───┴────────────────────────┴──────┴────────┴────────────────╯
+export def table-into-columns []: [table -> list<table>] {
+    let IN = $in
+    $IN | columns | each {|col| $IN | select $col}
+}
+
+# Assign keynames to a list of values, effectively converting the list to a record.
+#
+# Example:
+#
+# [ 1 2 3 ] | name-values a b c
+# => ╭───┬───╮
+# => │ a │ 1 │
+# => │ b │ 2 │
+# => │ c │ 3 │
+# => ╰───┴───╯
+export def name-values [...names: string]: [list -> record] {
+    let IN = $in
+    0.. | zip $IN | into record | rename ...$names
+}
diff --git a/crates/nu-std/std-rfc/kv/mod.nu b/crates/nu-std/std-rfc/kv/mod.nu
new file mode 100644
index 0000000000..b0b78cf684
--- /dev/null
+++ b/crates/nu-std/std-rfc/kv/mod.nu
@@ -0,0 +1,210 @@
+# kv module
+#
+# use std-rfc/kv *
+#
+# Easily store and retrieve key-value pairs
+# in a pipeline.
+#
+# A common request is to be able to assign a
+# pipeline result to a variable. While it's
+# not currently possible to use a "let" statement
+# within a pipeline, this module provides an
+# alternative. Think of each key as a variable
+# that can be set and retrieved.
+
+# Stores the pipeline value for later use
+#
+# If the key already exists, it is updated
+# to the new value provided.
+#
+# Usage:
+# <input> | kv set <key> <value?>
+#
+# Example:
+# ls ~ | kv set "home snapshot"
+# kv set foo 5
+export def "kv set" [
+  key: string
+  value_or_closure?: any
+  --return (-r): string   # Whether and what to return to the pipeline output
+  --universal (-u)
+] {
+  # Pipeline input is preferred, but prioritize
+  # parameter if present. This allows $in to be
+  # used in the parameter if needed.
+  let input = $in
+
+  # If passed a closure, execute it
+  let arg_type = ($value_or_closure | describe)
+  let value = match $arg_type {
+    closure => { $input | do $value_or_closure }
+    _ => ($value_or_closure | default $input)
+  }
+
+  # Store values as nuons for type-integrity
+  let kv_pair = {
+    session: ''   # Placeholder
+    key: $key
+    value: ($value | to nuon)
+  }
+
+  let db_open = (db_setup --universal=$universal)
+  try {
+    # Delete the existing key if it does exist
+    do $db_open | query db $"DELETE FROM std_kv_store WHERE key = '($key)'"
+  }
+
+  match $universal {
+    true  => { $kv_pair | into sqlite (universal_db_path) -t std_kv_store }
+    false => { $kv_pair | stor insert -t std_kv_store }
+  }
+
+  # The value that should be returned from `kv set`
+  # By default, this is the input to `kv set`, even if
+  # overridden by a positional parameter.
+  # This can also be:
+  # input: (Default) The pipeline input to `kv set`, even if
+  #        overridden by a positional parameter. `null` if no
+  #        pipeline input was used.
+  # ---
+  # value: If a positional parameter was used for the value, then
+  #        return it, otherwise return the input (whatever was set).
+  #        If the positional was a closure, return the result of the
+  #        closure on the pipeline input.
+  # ---
+  # all: The entire contents of the existing kv table are returned
+  match ($return | default 'input') {
+    'all' => (kv list --universal=$universal)
+    'a' => (kv list --universal=$universal)
+    'value' => $value
+    'v' => $value
+    'input' => $input
+    'in' => $input
+    'i' => $input
+    _  => {
+      error make {
+        msg: "Invalid --return option"
+        label: {
+          text: "Must be 'all'/'a', 'value'/'v', or 'input'/'in'/'i'"
+          span: (metadata $return).span
+        }
+      }
+    }
+  }
+}
+
+# Retrieves a stored value by key
+#
+# Counterpart of "kv set". Returns null
+# if the key is not found.
+# 
+# Usage:
+# kv get <key> | <pipeline>
+export def "kv get" [
+  key: string # Key of the kv-pair to retrieve
+  --universal (-u)
+] {
+  let db_open = (db_setup --universal=$universal)
+  do $db_open
+    # Hack to turn a SQLiteDatabase into a table
+  | $in.std_kv_store | wrap temp | get temp
+  | where key == $key
+    # Should only be one occurrence of each key in the stor
+  | get -i value.0
+  | match $in {
+      # Key not found
+      null => null
+      # Key found
+      _ => { from nuon }
+  }
+}
+
+# List the currently stored key-value pairs
+#
+# Returns results as the Nushell value rather
+# than the stored nuon.
+export def "kv list" [
+  --universal (-u)
+] {
+  let db_open = (db_setup --universal=$universal)
+
+  do $db_open | $in.std_kv_store? | each {|kv_pair|
+    {
+      key: $kv_pair.key
+      value: ($kv_pair.value | from nuon )
+    }
+  }
+}
+
+# Returns and removes a key-value pair
+export def --env "kv drop" [
+  key: string   # Key of the kv-pair to drop
+  --universal (-u)
+] {
+  let db_open = (db_setup --universal=$universal)
+
+  let value = (kv get --universal=$universal $key)
+
+  try {
+    do $db_open
+      # Hack to turn a SQLiteDatabase into a table
+    | query db $"DELETE FROM std_kv_store WHERE key = '($key)'"
+  }
+
+  if $universal and ($env.NU_KV_UNIVERSALS? | default false) {
+    hide-env $key
+  }
+
+  $value
+}
+
+def universal_db_path [] {
+  $env.NU_UNIVERSAL_KV_PATH?
+  | default (
+      $nu.data-dir | path join "std_kv_variables.sqlite3"
+  )
+}
+
+def db_setup [
+  --universal
+] : nothing -> closure {
+  try {
+    match $universal {
+      true  => {
+        # Ensure universal sqlite db and table exists
+        let uuid = (random uuid)
+        let dummy_record = {
+          session: ''
+          key: $uuid
+          value: ''
+        }
+        $dummy_record | into sqlite (universal_db_path) -t std_kv_store
+        open (universal_db_path) | query db $"DELETE FROM std_kv_store WHERE key = '($uuid)'"
+      }
+      false => {
+        # Create the stor table if it doesn't exist
+        stor create -t std_kv_store -c {session: str, key: str, value: str} | ignore
+      }
+    }
+  }
+
+  # Return the correct closure for opening on-disk vs. in-memory
+  match $universal {
+    true  => {|| {|| open (universal_db_path)}}
+    false => {|| {|| stor open}}
+  }
+}
+
+# This hook can be added to $env.config.hooks.pre_execution to enable
+# "universal variables" similar to the Fish shell. Adding, changing, or
+# removing a universal variable will immediately update the corresponding
+# environment variable in all running Nushell sessions.
+export def "kv universal-variable-hook" [] {
+{||
+  kv list --universal
+  | transpose -dr
+  | load-env
+
+  $env.NU_KV_UNIVERSALS = true
+}
+}
diff --git a/crates/nu-std/std-rfc/mod.nu b/crates/nu-std/std-rfc/mod.nu
new file mode 100644
index 0000000000..6d2e26c427
--- /dev/null
+++ b/crates/nu-std/std-rfc/mod.nu
@@ -0,0 +1,9 @@
+export use conversions *
+export use tables *
+export use path *
+export module clip
+export module str
+
+# kv module depends on sqlite feature, which may not be available in some builds
+const kv_module = if ("sqlite" in (version).features) { "std-rfc/kv" } else { null }
+export use $kv_module *
diff --git a/crates/nu-std/std-rfc/path/mod.nu b/crates/nu-std/std-rfc/path/mod.nu
new file mode 100644
index 0000000000..791e83a395
--- /dev/null
+++ b/crates/nu-std/std-rfc/path/mod.nu
@@ -0,0 +1,71 @@
+# Helper function for `path with` commands
+def with-field [field: string, value: string] {
+  path parse
+  | update $field $value
+  | path join
+}
+
+# Replace extension of input file paths.
+#
+# Note that it doesn't change the file name locally.
+#
+# # Example
+# - setting path ext to `rs`
+# ```nushell
+# > "ab.txt" | path with-extension "rs"
+# ab.rs
+# > "ab.txt" | path with-extension ".rs"
+# ab.rs
+#
+# - setting a list of input path ext to `rs`
+# > ["ab.txt", "cd.exe"] | path with-extension "rs"
+# ╭───┬──────────╮
+# │ 0 │ ab.rs    │
+# │ 1 │ cd.rs    │
+# ╰───┴──────────╯
+# ```
+export def with-extension [ext: string] {
+  let path = $in
+  let ext_trim = if $ext starts-with "." {
+    $ext | str substring 1..
+  } else {
+    $ext
+  }
+  $path | with-field extension $ext_trim
+}
+
+# Replace stem of input file paths.
+#
+# Note that it doesn't change the file name locally.
+#
+# # Example
+# - replace stem with "share"
+# ```nushell
+# > "/usr/bin" | path with-stem "share"
+# /usr/share
+#
+# - replace stem with "nushell"
+# > ["/home/alice/", "/home/bob/secret.txt"] | path with-stem "nushell"
+# ╭───┬───────────────────────╮
+# │ 0 │ /home/nushell         │
+# │ 1 │ /home/bob/nushell.txt │
+# ╰───┴───────────────────────╯
+# ```
+export def with-stem [stem: string] { with-field stem $stem }
+
+# Replace parent field of input file paths.
+#
+# # Example
+# - replace parent path with `/usr/share`
+# ```nushell
+# > "/etc/foobar" | path with-parent "/usr/share/"
+# /usr/share/foobar
+#
+# - replace parent path with `/root/` for all filenames in list
+# > ["/home/rose/meow", "/home/fdncred/"] | path with-parent "/root/"
+# ╭───┬───────────────╮
+# │ 0 │ /root/meow    │
+# │ 1 │ /root/fdncred │
+# ╰───┴───────────────╯
+# ```
+export def with-parent [parent: string] { with-field parent $parent }
diff --git a/crates/nu-std/std-rfc/str/mod.nu b/crates/nu-std/std-rfc/str/mod.nu
new file mode 100644
index 0000000000..49dc1abc6a
--- /dev/null
+++ b/crates/nu-std/std-rfc/str/mod.nu
@@ -0,0 +1,136 @@
+# Removes common indent from a multi-line string based on the number of spaces on the last line.
+# 
+# Example - Two leading spaces are removed from all lines:
+#
+# > let s = "
+#      Heading
+#        Indented Line
+#        Another Indented Line
+#
+#      Another Heading
+#      "
+# > $a | str dedent
+#
+# # => Heading
+# # =>   Indented Line
+# # =>   Another Indented Line
+# # => 
+# # => Another Heading
+export def dedent [
+    --tabs (-t)
+]: string -> string {
+    let string = $in
+
+    if ($string !~ $'^\s*(char lsep)') {
+        return (error make {
+            msg: 'First line must be empty'
+        })
+    }
+
+    if ($string !~ $'(char lsep)[ \t]*$') {
+        return (error make {
+            msg: 'Last line must contain only whitespace indicating the dedent'
+        })
+     }
+
+    # Get indent characters from the last line
+    let indent_chars = $string
+        | str replace -r $"\(?s\).*(char lsep)\([ \t]*\)$" '$1'
+
+    # Skip the first and last lines
+    let lines = (
+        $string
+        | lines
+        | skip
+        | # Only drop if there is whitespace. Otherwise, `lines`
+        | # drops a 0-length line anyway
+        | if ($indent_chars | str length) > 0 { drop } else {}
+        | enumerate
+        | rename lineNumber text
+    )
+
+    # Has to be done outside the replacement block or the error
+    # is converted to text. This is probably a Nushell bug, and
+    # this code can be recombined with the next iterator when
+    # the Nushell behavior is fixed.
+    for line in $lines {
+        # Skip lines with whitespace-only
+        if $line.text like '^\s*$' { continue }
+        # Error if any line doesn't start with enough indentation
+        if ($line.text | parse -r $"^\(($indent_chars)\)" | get capture0?.0?) != $indent_chars {
+            error make {
+                msg: $"Line ($line.lineNumber + 1) must have an indent of ($indent_chars | str length) or more."
+            }
+        }
+    }
+
+    $lines
+    | each {|line|
+        # Don't operate on lines containing only whitespace
+        if ($line.text not-like '^\s*$') {
+            $line.text | str replace $indent_chars ''
+        } else {
+            $line.text
+        }
+      }
+    | str join (char line_sep)
+}
+
+# Remove common indent from a multi-line string based on the line with the smallest indent
+# 
+# Example - Two leading spaces are removed from all lines:
+#
+# > let s = "
+#      Heading
+#        Indented Line
+#        Another Indented Line
+#
+#      Another Heading
+#   "
+# > $a | str dedent
+#
+# # => Heading
+# # =>   Indented Line
+# # =>   Another Indented Line
+# # =>
+# # => Another Heading
+#
+export def unindent [
+    --tabs (-t)            # String uses tabs instead of spaces for indentation
+]: string -> string {
+    let indent_char = match $tabs {
+        true => '\t'
+        false => ' '
+    }
+
+    let text = (
+        $in
+        | # Remove the first line if it is only whitespace (tabs or spaces)
+        | str replace -r $'^[ \t]*(char lsep)' ''
+        | # Remove the last line if it is only whitespace (tabs or spaces)
+        | str replace -r $'(char lsep)[ \t]*$' ''
+    )
+
+    # Early return if there is only a single, empty (other than whitespace) line
+    if ($text like '^[ \t]*$') {
+        return $text
+    }
+
+    let minimumIndent = (
+        $text
+        | lines
+        | # Ignore indentation in any line that is only whitespace
+        | where $it not-like '^[ \t]*$'
+        | # Replaces the text with its indentation
+        | each {
+            str replace -r $"^\(($indent_char)*\).*" '$1'
+            | str length
+        }
+        | math min
+    )
+
+    let indent_chars = ('' | fill -c $indent_char -w $minimumIndent)
+
+    $text
+    | str replace -r --all $"\(?m\)^($indent_chars)" ''
+}
diff --git a/crates/nu-std/std-rfc/tables/mod.nu b/crates/nu-std/std-rfc/tables/mod.nu
new file mode 100644
index 0000000000..6ec8f4010d
--- /dev/null
+++ b/crates/nu-std/std-rfc/tables/mod.nu
@@ -0,0 +1,221 @@
+# Run aggregate operations on output of `group-by --to-table`.
+#
+# # Example
+#
+# - group files by type and extension, and get stats about their sizes
+# ```nushell
+# >_ ls | group-by type { get name | path parse | get extension } --to-table | aggregate size
+# ```
+# 
+# - group data by multiple columns, and run custom aggregate operations
+# ```nushell
+# >_ open movies.csv
+#    | group-by Lead_Studio Genre --to-table
+#    | aggregate Worldwide_Gross Profitability --ops {avg: {math avg}, std: {math stddev}}
+# ```
+#
+# - run aggregate operations without grouping the input
+# ```nushell
+# >_ open movies.csv | aggregate Year
+# ```
+export def aggregate [
+    --ops: record, # default = {min: {math min}, avg: {math avg}, max: {math max}, sum: {math sum}}  
+    ...columns: cell-path, # columns to perform aggregations on
+]: [
+    table -> table<count: int>,
+    record -> error,
+] {
+  def aggregate-default-ops [] {
+      {
+          min: {math min},
+          avg: {math avg},
+          max: {math max},
+          sum: {math sum},
+      }
+  }
+
+  def aggregate-col-name [col: cell-path, op_name: string]: [nothing -> string] {
+      $col | split cell-path | get value | str join "." | $"($in)_($op_name)"
+  }
+
+  def get-item-with-error [
+      col: cell-path,
+      opts: record<span: record<start: int, end: int>, items: bool>
+  ]: [table -> any] {
+      try {
+          get $col
+      } catch {
+          let full_cellpath = if $opts.items {
+              $col
+              | split cell-path
+              | prepend {value: items, optional: false}
+              | into cell-path
+          } else {
+              $col
+          }
+          error make {
+              msg: $"Cannot find column '($full_cellpath)'",
+              label: {
+                  text: "value originates here",
+                  span: $opts.span
+              },
+          }
+      }
+  }
+
+  def "error not-a-table" [span: record<start: int, end:int>] {
+      error make {
+          msg: "input must be a table",
+          label: {
+              text: "from here",
+              span: $span
+          },
+          help: "Are you using `group-by`? Make sure to use its `--to-table` flag."
+      }
+  }
+
+    let IN = $in
+    let md = metadata $in
+
+    let first = try { $IN | first } catch { error not-a-table $md.span }
+    if not (($first | describe) starts-with record) {
+        error not-a-table $md.span
+    }
+
+    let grouped = "items" in $first
+
+    let IN = if $grouped {
+        $IN
+    } else {
+        [{items: $IN}]
+    }
+
+    let agg_ops = $ops | default (aggregate-default-ops)
+
+    let results = $IN
+    | update items {|group|
+        let column_results = $columns
+        | each {|col| # col: cell-path
+            let column = $group.items | get-item-with-error $col {span: $md.span, items: $grouped}
+            let agg_results = $agg_ops | items {|op_name, op| # op_name: string, op: closure
+                $column | do $op | wrap (aggregate-col-name $col $op_name)
+            }
+
+            for r in $agg_results {
+                if ($r | describe) == error {
+                    return $r
+                }
+            }
+
+            $agg_results
+            | reduce {|it| merge $it}
+        }
+
+        # Manually propagate errors
+        for r in $column_results {
+            if ($r | describe) == error {
+                return $r
+            }
+        }
+
+        $column_results
+        | reduce --fold {} {|it| merge $it}
+        | insert count ($group.items | length)
+        | roll right  # put count as the first column
+    }
+
+    # Manually propagate errors
+    for r in $results {
+        if ($r.items | describe) == error {
+            return $r.items
+        }
+    }
+
+    $results | flatten items
+}
+
+# Used in reject-column-slices and select-column-slices
+def col-indices [ ...slices ] {
+  use std-rfc/conversions *
+
+  let indices = (
+    $slices
+    | reduce -f [] {|slice,indices|
+      $indices ++ ($slice | into list)
+    }
+  )
+
+  $in | columns
+  | select slices $indices 
+  | get item
+}
+
+# Used in select-row-slices and reject-row-slices
+def row-indices [ ...slices ] {
+  use std-rfc/conversions *
+
+  $slices
+  | reduce -f [] {|slice,indices|
+    $indices ++ ($slice | into list)
+  }
+}
+
+# Selects one or more rows while keeping the original indices.
+#
+# Example - Selects the first, fifth, and sixth rows from the table:
+#
+# ls / | select slices 0 4..5
+#
+# Example - Select the 4th row.
+#
+# Note that the difference between this and `select 3` is that the index (#) column shows the *original* (pre-select) position in the table.
+#
+# ls | select slices 3
+export def "select slices" [ ...slices ] {
+  enumerate
+  | flatten
+  | select ...(row-indices ...$slices)
+}
+
+# Rejects one or more rows while keeping the original indices.
+#
+# Example - Rejects the first, fifth, and sixth rows from the table:
+#
+# ls / | reject slices 0 4..5
+export def "reject slices" [ ...slices ] {
+  enumerate
+  | flatten
+  | collect
+  | reject ...(row-indices ...$slices)
+}
+
+# Select one or more columns by their indices
+#
+# Example:
+# 
+# ls -l | select column-slices 0 10..12 | first 3
+# # => ╭───┬────────────────────┬──────────────┬─────────────┬──────────────╮
+# # => │ # │        name        │   created    │  accessed   │   modified   │
+# # => ├───┼────────────────────┼──────────────┼─────────────┼──────────────┤
+# # => │ 0 │ CITATION.cff       │ 3 months ago │ 4 hours ago │ 3 months ago │
+# # => │ 1 │ CODE_OF_CONDUCT.md │ 7 months ago │ 4 hours ago │ 7 months ago │
+# # => │ 2 │ CONTRIBUTING.md    │ 3 months ago │ 4 hours ago │ 3 months ago │
+# # => ╰───┴────────────────────┴──────────────┴─────────────┴──────────────╯
+export def "select column-slices" [
+    ...slices
+] {
+    let column_selector = ($in | col-indices ...$slices)
+    $in | select ...$column_selector
+}
+
+# Reject one or more columns by their indices
+#
+# Example:
+#
+# ls | reject column-slices 0 4 5 | first 3
+export def "reject column-slices" [
+    ...slices
+] {
+    let column_selector = ($in | col-indices ...$slices)
+    $in | reject ...$column_selector
+}
diff --git a/crates/nu-std/testing.nu b/crates/nu-std/testing.nu
index 71a634333a..2b55646df7 100644
--- a/crates/nu-std/testing.nu
+++ b/crates/nu-std/testing.nu
@@ -164,7 +164,7 @@ export def ($test_function_name) [] {
     open $test.file
     | lines
     | append ($test_function)
-    | str join (char nl)
+    | str join (char lsep)
     | save $rendered_module_path
 
     let result = (
diff --git a/crates/nu-std/tests/test_std-rfc_conversions.nu b/crates/nu-std/tests/test_std-rfc_conversions.nu
new file mode 100644
index 0000000000..e2c50437cc
--- /dev/null
+++ b/crates/nu-std/tests/test_std-rfc_conversions.nu
@@ -0,0 +1,110 @@
+use std assert
+use std-rfc/conversions *
+
+#[test]
+def range-into-list [] {
+  assert equal (
+    1..10 | into list
+  ) (
+    [ 1 2 3 4 5 6 7 8 9 10 ]
+  )
+}
+
+#[test]
+def string-into-list [] {
+  assert equal (
+    "foo" | into list
+  ) (
+    [ foo ]
+  )
+}
+
+#[test]
+def range-stride-into-list [] {
+  assert equal (
+    0..2..10 | into list
+  ) (
+    [ 0 2 4 6 8 10 ]
+  )
+}
+
+#[test]
+def null-into-list [] {
+  assert equal (
+    null | into list | get 0 | describe
+  ) (
+    "nothing"
+  )
+}
+
+#[test]
+def list-into-list [] {
+  assert equal (
+    [ foo bar baz ] | into list
+  ) (
+    [ foo bar baz ]
+  )
+
+}
+
+#[test]
+def table-into-columns--roundtrip [] {
+  assert equal (
+    ls
+  ) (
+    ls | table-into-columns | columns-into-table
+  )
+}
+
+const test_record_of_lists = {
+  a: [ 1 2 3 ]
+  b: [ 4 5 6 ]
+}
+
+#[test]
+def record-into-columns--simple [] {
+  let actual = (
+    $test_record_of_lists
+    | record-into-columns
+    | get 1.b.2
+  )
+
+  let expected = 6
+
+  assert equal $actual $expected
+}
+
+#[test]
+def table-into-columns--simple [] {
+  let actual = (
+    ls | table-into-columns | get 1 | columns | get 0
+  )
+  let expected = 'type'
+
+  assert equal $actual $expected
+}
+
+#[test]
+def name-values--simple [] {
+  let actual = (
+    [ 1 2 3 ] | name-values one two three
+    | get 'two'
+  )
+
+  let expected = 2
+
+  assert equal $actual $expected
+}
+
+#[test]
+def name-values--missing-keyname [] {
+  let actual = (
+    [ 1 2 3 ] | name-values one two
+    | columns
+  )
+
+  # Column/key names are strings, even those that came from the index ('2')
+  let expected = [ 'one' 'two' '2' ]
+
+  assert equal $actual $expected
+}
diff --git a/crates/nu-std/tests/test_std-rfc_kv.nu b/crates/nu-std/tests/test_std-rfc_kv.nu
new file mode 100644
index 0000000000..d19809d230
--- /dev/null
+++ b/crates/nu-std/tests/test_std-rfc_kv.nu
@@ -0,0 +1,283 @@
+use std/assert
+const kv_module = if ("sqlite" in (version).features) { "std-rfc/kv" } else { null }
+use $kv_module *
+
+# It's important to use random keys and to clean-up
+# after since the user running these tests may have
+# either an existing local stor or universal db.
+
+#[test]
+def simple-local-set [] {
+    if ('sqlite' not-in (version).features) { return }
+
+    let key = (random uuid)
+
+    kv set $key 42
+    let actual = (kv get $key)
+    let expected = 42
+    assert equal $actual $expected
+
+    kv drop $key | ignore
+}
+
+#[test]
+def local-pipeline_set_returns_value [] {
+    if ('sqlite' not-in (version).features) { return }
+
+    let key = (random uuid)
+    let actual = (42 | kv set $key)
+    let expected = 42
+    assert equal $actual $expected
+
+    let actual = (kv get $key)
+    let expected = 42
+    assert equal $actual $expected
+
+    kv drop $key | ignore
+}
+
+#[test]
+def local-multiple_assignment [] {
+    if ('sqlite' not-in (version).features) { return }
+
+    let key1 = (random uuid)
+    let key2 = (random uuid)
+    let key3 = (random uuid)
+
+    "test value" | kv set $key1 | kv set $key2 | kv set $key3
+    let expected = "test value"
+    assert equal (kv get $key1) $expected
+    assert equal (kv get $key2) $expected
+    assert equal (kv get $key3) $expected
+    assert equal (kv get $key3) (kv get $key1)
+
+    kv drop $key1
+    kv drop $key2
+    kv drop $key3
+}
+
+#[test]
+def local-transpose_to_record [] {
+    if ('sqlite' not-in (version).features) { return }
+
+    let key1 = (random uuid)
+    let key2 = (random uuid)
+    let key3 = (random uuid)
+
+    "test value" | kv set $key1 | kv set $key2 | kv set $key3
+
+    let record = (kv list | transpose -dr)
+    let actual = ($record | select $key1)
+    let expected = { $key1: "test value" }
+
+    assert equal $actual $expected
+
+    kv drop $key1
+    kv drop $key2
+    kv drop $key3
+}
+
+#[test]
+def local-using_closure [] {
+    if ('sqlite' not-in (version).features) { return }
+
+    let name_key = (random uuid)
+    let size_key = (random uuid)
+
+    ls
+    | kv set $name_key { get name }
+    | kv set $size_key { get size }
+
+    let expected = "list<string>"
+    let actual = (kv get $name_key | describe)
+    assert equal $actual $expected
+
+    let expected = "list<filesize>"
+    let actual = (kv get $size_key | describe)
+    assert equal $actual $expected
+
+    kv drop $name_key
+    kv drop $size_key
+}
+
+#[test]
+def local-return-entire-list [] {
+    if ('sqlite' not-in (version).features) { return }
+
+    let key1 = (random uuid)
+    let key2 = (random uuid)
+
+    let expected = 'value1'
+    $expected | kv set $key1
+
+    let actual = (
+        'value2'
+        | kv set --return all $key2   # Set $key2, but return the entire kv store
+        | transpose -dr  # Convert to record for easier retrieval
+        | get $key1      # Attempt to retrieve key1 (set previously)
+    )
+
+    assert equal $actual $expected
+    kv drop $key1
+    kv drop $key2
+}
+
+#[test]
+def local-return_value_only [] {
+    if ('sqlite' not-in (version).features) { return }
+
+    let key = (random uuid)
+
+    let expected = 'VALUE'
+    let actual = ('value' | kv set -r v $key {str upcase})
+
+    assert equal $actual $expected
+
+    kv drop $key
+
+}
+
+#[test]
+def universal-simple_set [] {
+    if ('sqlite' not-in (version).features) { return }
+    $env.NU_UNIVERSAL_KV_PATH = (mktemp -t --suffix .sqlite3)
+
+    let key = (random uuid)
+
+    kv set -u $key 42
+    let actual = (kv get -u $key)
+    let expected = 42
+    assert equal $actual $expected
+
+    kv drop -u $key | ignore
+    rm $env.NU_UNIVERSAL_KV_PATH
+}
+
+#[test]
+def universal-pipeline_set_returns_value [] {
+    if ('sqlite' not-in (version).features) { return }
+    $env.NU_UNIVERSAL_KV_PATH = (mktemp -t --suffix .sqlite3)
+
+    let key = (random uuid)
+    let actual = (42 | kv set -u $key)
+    let expected = 42
+    assert equal $actual $expected
+
+    let actual = (kv get -u $key)
+    let expected = 42
+    assert equal $actual $expected
+
+    kv drop -u $key | ignore
+    rm $env.NU_UNIVERSAL_KV_PATH
+}
+
+#[test]
+def universal-multiple_assignment [] {
+    if ('sqlite' not-in (version).features) { return }
+    $env.NU_UNIVERSAL_KV_PATH = (mktemp -t --suffix .sqlite3)
+
+    let key1 = (random uuid)
+    let key2 = (random uuid)
+    let key3 = (random uuid)
+
+    "test value" | kv set -u $key1 | kv set -u $key2 | kv set -u $key3
+    let expected = "test value"
+    assert equal (kv get -u $key1) $expected
+    assert equal (kv get -u $key2) $expected
+    assert equal (kv get -u $key3) $expected
+    assert equal (kv get $key3) (kv get $key1)
+
+    kv drop -u $key1
+    kv drop -u $key2
+    kv drop -u $key3
+    rm $env.NU_UNIVERSAL_KV_PATH
+}
+
+#[test]
+def universal-transpose_to_record [] {
+    if ('sqlite' not-in (version).features) { return }
+    $env.NU_UNIVERSAL_KV_PATH = (mktemp -t --suffix .sqlite3)
+
+    let key1 = (random uuid)
+    let key2 = (random uuid)
+    let key3 = (random uuid)
+
+    "test value" | kv set -u $key1 | kv set -u $key2 | kv set -u $key3
+
+    let record = (kv list -u | transpose -dr)
+    let actual = ($record | select $key1)
+    let expected = { $key1: "test value" }
+
+    assert equal $actual $expected
+
+    kv drop -u $key1
+    kv drop -u $key2
+    kv drop -u $key3
+    rm $env.NU_UNIVERSAL_KV_PATH
+}
+
+#[test]
+def universal-using_closure [] {
+    if ('sqlite' not-in (version).features) { return }
+    $env.NU_UNIVERSAL_KV_PATH = (mktemp -t --suffix .sqlite3)
+
+    let name_key = (random uuid)
+    let size_key = (random uuid)
+
+    ls
+    | kv set -u $name_key { get name }
+    | kv set -u $size_key { get size }
+
+    let expected = "list<string>"
+    let actual = (kv get -u $name_key | describe)
+    assert equal $actual $expected
+
+    let expected = "list<filesize>"
+    let actual = (kv get -u $size_key | describe)
+    assert equal $actual $expected
+
+    kv drop -u $name_key
+    kv drop -u $size_key
+    rm $env.NU_UNIVERSAL_KV_PATH
+}
+
+#[test]
+def universal-return-entire-list [] {
+    if ('sqlite' not-in (version).features) { return }
+    $env.NU_UNIVERSAL_KV_PATH = (mktemp -t --suffix .sqlite3)
+
+    let key1 = (random uuid)
+    let key2 = (random uuid)
+
+    let expected = 'value1'
+    $expected | kv set -u $key1
+
+    let actual = (
+        'value2'
+        | kv set -u --return all $key2   # Set $key2, but return the entire kv store
+        | transpose -dr  # Convert to record for easier retrieval
+        | get $key1      # Attempt to retrieve key1 (set previously)
+    )
+
+    assert equal $actual $expected
+    kv drop --universal $key1
+    kv drop --universal $key2
+    rm $env.NU_UNIVERSAL_KV_PATH
+}
+
+#[test]
+def universal-return_value_only [] {
+    if ('sqlite' not-in (version).features) { return }
+    $env.NU_UNIVERSAL_KV_PATH = (mktemp -t --suffix .sqlite3)
+
+    let key = (random uuid)
+
+    let expected = 'VALUE'
+    let actual = ('value' | kv set --universal -r v $key {str upcase})
+
+    assert equal $actual $expected
+
+    kv drop --universal $key
+    rm $env.NU_UNIVERSAL_KV_PATH
+}
+
diff --git a/crates/nu-std/tests/test_std-rfc_path.nu b/crates/nu-std/tests/test_std-rfc_path.nu
new file mode 100644
index 0000000000..b521742ba6
--- /dev/null
+++ b/crates/nu-std/tests/test_std-rfc_path.nu
@@ -0,0 +1,38 @@
+use std-rfc/path
+use std/assert
+
+#[test]
+def path_with_extension [] {
+    let new_path = "ab.txt" | path with-extension "rs"
+    assert equal $new_path "ab.rs"
+
+    let new_path = "ab.txt" | path with-extension ".rs"
+    assert equal $new_path "ab.rs"
+}
+
+#[test]
+def path_with_extension_for_list [] {
+    let new_path = ["ab.txt", "cd.exe"] | path with-extension "rs"
+    assert equal $new_path ["ab.rs", "cd.rs"]
+
+    let new_path = ["ab.txt", "cd.exe"] | path with-extension ".rs"
+    assert equal $new_path ["ab.rs", "cd.rs"]
+}
+
+#[test]
+def path_with_stem [] {
+    let new_path = $"(char psep)usr(char psep)bin" | path with-stem "share"
+    assert equal $new_path $"(char psep)usr(char psep)share"
+
+    let new_path = [$"(char psep)home(char psep)alice(char psep)", $"(char psep)home(char psep)bob(char psep)secret.txt"] | path with-stem "nushell"
+    assert equal $new_path [$"(char psep)home(char psep)nushell", $"(char psep)home(char psep)bob(char psep)nushell.txt"]
+}
+
+#[test]
+def path_with_parent [] {
+    let new_path = $"(char psep)etc(char psep)foobar" | path with-parent $"(char psep)usr(char psep)share(char psep)"
+    assert equal $new_path $"(char psep)usr(char psep)share(char psep)foobar"
+
+    let new_path = [$"(char psep)home(char psep)rose(char psep)meow", $"(char psep)home(char psep)fdncred(char psep)"] | path with-parent $"(char psep)root(char psep)"
+    assert equal $new_path [$"(char psep)root(char psep)meow", $"(char psep)root(char psep)fdncred"]
+}
diff --git a/crates/nu-std/tests/test_std-rfc_str.nu b/crates/nu-std/tests/test_std-rfc_str.nu
new file mode 100644
index 0000000000..21d4a1e551
--- /dev/null
+++ b/crates/nu-std/tests/test_std-rfc_str.nu
@@ -0,0 +1,292 @@
+use std/assert
+use std-rfc/str
+
+#[test]
+def str-dedent_simple [] {
+    
+    # Test 1:
+    # Should start with "Heading" in the first character position
+    # Should not end with a line-break
+    # The blank line has no extra spaces
+    assert equal (
+        do {
+            let s = "   
+                Heading
+
+                    one
+                    two
+                "
+            $s | str dedent
+        }
+    ) $"Heading(char lsep)(char lsep)    one(char lsep)    two"
+}
+
+#[test]
+def str-dedent_leave_blankline_whitespace [] {
+    # Test 2:
+    # Same as #1, but the blank line has leftover whitespace
+    # indentation (16 spaces) which is left in the result
+    assert equal (
+        do {
+            let s = "   
+                Heading
+                
+                    one
+                    two
+                "
+            $s | str dedent
+        }
+    ) $"Heading(char lsep)                (char lsep)    one(char lsep)    two"
+}
+
+#[test]
+def str-dedent_leave_blankline_tab [] {
+    # Test 3:
+    # Same, but with a single tab character on the "blank" line
+    assert equal (
+        do {
+            let s = $"   
+                Heading
+(char tab)
+                    one
+                    two
+                "
+            $s | str dedent
+        }
+    ) $"Heading(char lsep)(char tab)(char lsep)    one(char lsep)    two"
+}
+
+#[test]
+def str-dedent_ends_with_newline [] {
+    # Test 4:
+    # Ends with line-break
+    assert equal (
+        do {
+            let s = "   
+                Heading
+
+                    one
+                    two
+
+                "
+            $s | str dedent
+        }
+    ) $"Heading(char lsep)(char lsep)    one(char lsep)    two(char lsep)"
+}
+
+#[test]
+def str-dedent_identity [] {
+    # Test 5:
+    # Identity - Returns the original string sans first and last empty lines
+    # No other whitespace should be removed
+    assert equal (
+        do {
+            let s = $"(char lsep)  Identity  (char lsep)"
+            $s | str dedent
+        }
+    ) "  Identity  "
+}
+
+#[test]
+def str-dedent_error-no_blank_lines [] {
+    # Test 6:
+    # Error - Does not contain an empty first line
+    assert error {||
+        let s = "Error"
+        $s | str dedent
+    }
+
+    # Test 6.1:
+    # Error - Does not contain an empty first line
+    assert error {||
+        let s = $"Error(char lsep) (char lsep)Testing(char lsep)"
+        $s | str dedent
+    }
+}
+
+#[test]
+def str-dedent_error-no_blank_first_line [] {
+    # Test 7:
+    # Error - Does not contain an empty last line
+    assert error {||
+        let s = "
+            Error"
+        $s | str dedent
+    }
+}
+
+#[test]
+def str-dedent_error-missing_last_empty_line [] {
+    # Test 7.1:
+    # Error - Does not contain an empty last line
+    assert error {||
+        let s = "
+
+            Error"
+        $s | str dedent
+    }
+}
+
+#[test]
+def str-dedent_error-not_enough_indentation [] {
+    # Test 8:
+    # Error - Line 1 does not have enough indentation
+    assert error {||
+        let s = "   
+           Line 1
+            Line 2
+            "
+        $s | str dedent
+    }
+}
+
+#[test]
+def str-dedent_error-not_enough_indentation2 [] {
+    # Test 8.1:
+    # Error - Line 2 does not have enough indentation
+    assert error {||
+        let s = "   
+            Line 1
+           Line 2
+            "
+        $s | str dedent
+    }
+}
+
+#[test]
+def str-dedent_error-not_enough_indentation3 [] {
+    # Test 8.2:
+    # Error - Line does not have enough indentation
+    assert error {||
+        let s = "   
+           Line  
+            "
+        $s | str dedent
+    }
+}
+
+#[test]
+def str-dedent_first_line_whitespace_allowed [] {
+    # Test 9:
+    # "Hidden" whitespace on the first line is allowed
+    assert equal (
+        do {
+            let s = $"   (char tab) (char lsep)  Identity  (char lsep)"
+            $s | str dedent
+        }
+    ) "  Identity  "
+}
+
+#[test]
+def str-dedent_using_tabs [] {
+    # Test 10:
+    # If the indentation on the last line uses tabs, then the number of tabs
+    # will be used instead of spaces
+    let actual = (
+        $"(char lsep)(char tab)(char tab)First line(char lsep)(char tab)(char tab)(char tab)Second line(char lsep)(char tab)(char tab)"
+        | str dedent
+    )
+
+    let expected = $"First line(char lsep)(char tab)Second line"
+
+    assert equal $actual $expected
+}
+
+#[test]
+def str-unindent_simple [] {
+    # Test 1:
+    # Should start with "Heading" in the first character position
+    # Should not end with a line-break
+    # The blank line has no extra spaces
+    let actual = (
+        "   
+            Heading
+
+                one
+                two
+        "
+        | str unindent
+    )
+
+    let expected = $"Heading(char lsep)(char lsep)    one(char lsep)    two"
+
+    assert equal $actual $expected
+}
+
+#[test]
+def str-unindent_ignore_first_and_last_whitespace [] {
+    # Test 2:
+    # If the first and/or last line are only whitespace
+    # then they shouldn't be included in the result
+
+    let actual = "   
+            Heading
+
+                one
+                two
+        "
+        | str unindent
+
+    let expected = "            Heading
+
+                one
+                two"
+        | str unindent
+
+    assert equal $actual $expected
+}
+
+#[test]
+def str-unindent_keep_extra_line [] {
+  # Test 3:
+  # Keep intentional blank lines at start and/or end
+
+  let actual = "
+
+  Content
+
+  " | str unindent
+
+  let expected = $"(char lsep)Content(char lsep)"
+
+  assert equal $actual $expected
+}
+
+#[test]
+def str-unindent_works_on_single_line [] {
+    # Test 4:
+    # Works on a single-line string
+    # And trailing whitespace is preserved
+
+    let actual = ("    Content  " | str unindent)
+    let expected = "Content  "
+
+    assert equal $actual $expected
+}
+
+#[test]
+def str-unindent_whitespace_only_single_line [] {
+    # Test 4:
+    # Works on a single-line string with whitespace-only
+    # Returns the original string
+
+    let actual = ("   " | str unindent)
+    let expected = "   "
+
+    assert equal $actual $expected
+}
+    
+#[test]
+def str-unindent_whitespace_works_with_tabs [] {
+    # Test 4:
+    # Works with tabs for indentation
+
+    let actual = (
+        $"(char lsep)(char tab)(char tab)Content(char lsep)"
+        | str unindent --tabs
+    )
+
+    let expected = "Content"
+
+    assert equal $actual $expected
+}
diff --git a/crates/nu-std/tests/test_std-rfc_tables.nu b/crates/nu-std/tests/test_std-rfc_tables.nu
new file mode 100644
index 0000000000..4f90d751e4
--- /dev/null
+++ b/crates/nu-std/tests/test_std-rfc_tables.nu
@@ -0,0 +1,331 @@
+use std/assert
+use std-rfc/tables *
+
+const test_table = [
+  [ col-a     col-b     col-c     col-d     col-e     col-f ];
+  [  'a0'      'b0'      'c0'      'd0'      'e0'      'f0' ]
+  [  'a1'      'b1'      'c1'      'd1'      'e1'      'f1' ]
+  [  'a2'      'b2'      'c2'      'd2'      'e2'      'f2' ]
+  [  'a3'      'b3'      'c3'      'd3'      'e3'      'f3' ]
+  [  'a4'      'b4'      'c4'      'd4'      'e4'      'f4' ]
+  [  'a5'      'b5'      'c5'      'd5'      'e5'      'f5' ]
+  [  'a6'      'b6'      'c6'      'd6'      'e6'      'f6' ]
+  [  'a7'      'b7'      'c7'      'd7'      'e7'      'f7' ]
+  [  'a8'      'b8'      'c8'      'd8'      'e8'      'f8' ]
+  [  'a9'      'b9'      'c9'      'd9'      'e9'      'f9' ]
+]
+
+const enumerated_table = [
+  [ index      col-a     col-b     col-c     col-d     col-e     col-f ];
+  [   0         'a0'      'b0'      'c0'      'd0'      'e0'      'f0' ]
+  [   1         'a1'      'b1'      'c1'      'd1'      'e1'      'f1' ]
+  [   2         'a2'      'b2'      'c2'      'd2'      'e2'      'f2' ]
+  [   3         'a3'      'b3'      'c3'      'd3'      'e3'      'f3' ]
+  [   4         'a4'      'b4'      'c4'      'd4'      'e4'      'f4' ]
+  [   5         'a5'      'b5'      'c5'      'd5'      'e5'      'f5' ]
+  [   6         'a6'      'b6'      'c6'      'd6'      'e6'      'f6' ]
+  [   7         'a7'      'b7'      'c7'      'd7'      'e7'      'f7' ]
+  [   8         'a8'      'b8'      'c8'      'd8'      'e8'      'f8' ]
+  [   9         'a9'      'b9'      'c9'      'd9'      'e9'      'f9' ]
+]
+
+#[test]
+def select-slice--single_int [] {
+  assert equal (
+    $test_table | select slices 1
+  ) (
+    $enumerated_table | select 1
+  )
+}
+
+#[test]
+def select-slice--single_slice [] {
+  assert equal (
+    $test_table | select slices 2..4
+  ) (
+    $enumerated_table | select 2 3 4 
+  )
+}
+
+#[test]
+def select-slice--complex [] {
+  assert equal (
+    # First and every following third-row + second row
+    $test_table | select slices 1 0..3..100
+  ) (
+    $enumerated_table | select 0 1 3 6 9
+  )
+}
+
+#[test]
+def select-slice--out_of_bounds [] {
+  assert equal (
+    $test_table | select slices 100
+  ) (
+    []
+  )
+}
+
+#[test]
+def reject-slice--single_index [] {
+  assert equal (
+    $test_table | reject slices 4
+  ) (
+    $enumerated_table | reject 4
+  )
+}
+
+#[test]
+def reject-slice--slices [] {
+  assert equal (
+    # Reject rows 0-3 and 5-9, leaving only 4
+    $test_table | reject slices 0..3 5..9
+  ) (
+    $enumerated_table | select 4
+  )
+}
+
+#[test]
+def reject-slice--out_of_bounds [] {
+  assert error {
+    $test_table | reject slices 1000
+  }
+}
+
+#[test]
+def select-col--index [] {
+  assert equal (
+    $test_table | select column-slices 2
+  ) (
+    $test_table | select col-c
+  )
+}
+
+#[test]
+def select-col--indices [] {
+  assert equal (
+    $test_table | select column-slices 2 4
+  ) (
+    $test_table | select col-c col-e
+  )
+}
+
+#[test]
+def select-col--slices_and_index [] {
+  assert equal (
+    $test_table | select column-slices 0..2..5 1
+  ) (
+    $test_table | select col-a col-c col-e col-b
+  )
+}
+
+#[test]
+def reject-col--slices_and_index [] {
+  assert equal (
+    $test_table | reject column-slices 0..2..5 1
+  ) (
+    $enumerated_table | select col-d col-f
+  )
+}
+
+#[test]
+def reject-col--out_of_bounds [] {
+  assert equal (
+    $test_table | reject column-slices 1_000
+  ) (
+    $test_table
+  )
+}
+
+const movies = [
+    [ Film, Genre, Lead_Studio, Audience_score_%, Profitability, Rotten_Tomatoes_%, Worldwide_Gross, Year ];
+    [ "Youth in Revolt", Comedy, "The Weinstein Company", 52, 1.09, 68, 19.62, 2010 ],
+    [ "You Will Meet a Tall Dark Stranger", Comedy, Independent, 35, 1.211818182, 43, 26.66, 2010 ],
+    [ "When in Rome", Comedy, Disney, 44, 0, 15, 43.04, 2010 ],
+    [ "What Happens in Vegas", Comedy, Fox, 72, 6.267647029, 28, 219.37, 2008 ],
+    [ "Water For Elephants", Drama, "20th Century Fox", 72, 3.081421053, 60, 117.09, 2011 ],
+    [ WALL-E, Animation, Disney, 89, 2.896019067, 96, 521.28, 2008 ],
+    [ Waitress, Romance, Independent, 67, 11.0897415, 89, 22.18, 2007 ],
+    [ "Waiting For Forever", Romance, Independent, 53, 0.005, 6, 0.03, 2011 ],
+    [ "Valentine's Day", Comedy, "Warner Bros.", 54, 4.184038462, 17, 217.57, 2010 ],
+    [ "Tyler Perry's Why Did I get Married", Romance, Independent, 47, 3.7241924, 46, 55.86, 2007 ],
+    [ "Twilight: Breaking Dawn", Romance, Independent, 68, 6.383363636, 26, 702.17, 2011 ],
+    [ Twilight, Romance, Summit, 82, 10.18002703, 49, 376.66, 2008 ],
+    [ "The Ugly Truth", Comedy, Independent, 68, 5.402631579, 14, 205.3, 2009 ],
+    [ "The Twilight Saga: New Moon", Drama, Summit, 78, 14.1964, 27, 709.82, 2009 ],
+    [ "The Time Traveler's Wife", Drama, Paramount, 65, 2.598205128, 38, 101.33, 2009 ],
+    [ "The Proposal", Comedy, Disney, 74, 7.8675, 43, 314.7, 2009 ],
+    [ "The Invention of Lying", Comedy, "Warner Bros.", 47, 1.751351351, 56, 32.4, 2009 ],
+    [ "The Heartbreak Kid", Comedy, Paramount, 41, 2.129444167, 30, 127.77, 2007 ],
+    [ "The Duchess", Drama, Paramount, 68, 3.207850222, 60, 43.31, 2008 ],
+    [ "The Curious Case of Benjamin Button", Fantasy, "Warner Bros.", 81, 1.78394375, 73, 285.43, 2008 ],
+    [ "The Back-up Plan", Comedy, CBS, 47, 2.202571429, 20, 77.09, 2010 ],
+    [ Tangled, Animation, Disney, 88, 1.365692308, 89, 355.01, 2010 ],
+    [ "Something Borrowed", Romance, Independent, 48, 1.719514286, 15, 60.18, 2011 ],
+    [ "She's Out of My League", Comedy, Paramount, 60, 2.4405, 57, 48.81, 2010 ],
+    [ "Sex and the City Two", Comedy, "Warner Bros.", 49, 2.8835, 15, 288.35, 2010 ],
+    [ "Sex and the City 2", Comedy, "Warner Bros.", 49, 2.8835, 15, 288.35, 2010 ],
+    [ "Sex and the City", Comedy, "Warner Bros.", 81, 7.221795791, 49, 415.25, 2008 ],
+    [ "Remember Me", Drama, Summit, 70, 3.49125, 28, 55.86, 2010 ],
+    [ "Rachel Getting Married", Drama, Independent, 61, 1.384166667, 85, 16.61, 2008 ],
+    [ Penelope, Comedy, Summit, 74, 1.382799733, 52, 20.74, 2008 ],
+    [ "P.S. I Love You", Romance, Independent, 82, 5.103116833, 21, 153.09, 2007 ],
+    [ "Over Her Dead Body", Comedy, "New Line", 47, 2.071, 15, 20.71, 2008 ],
+    [ "Our Family Wedding", Comedy, Independent, 49, 0, 14, 21.37, 2010 ],
+    [ "One Day", Romance, Independent, 54, 3.682733333, 37, 55.24, 2011 ],
+    [ "Not Easily Broken", Drama, Independent, 66, 2.14, 34, 10.7, 2009 ],
+    [ "No Reservations", Comedy, "Warner Bros.", 64, 3.307180357, 39, 92.6, 2007 ],
+    [ "Nick and Norah's Infinite Playlist", Comedy, Sony, 67, 3.3527293, 73, 33.53, 2008 ],
+    [ "New Year's Eve", Romance, "Warner Bros.", 48, 2.536428571, 8, 142.04, 2011 ],
+    [ "My Week with Marilyn", Drama, "The Weinstein Company", 84, 0.8258, 83, 8.26, 2011 ],
+    [ "Music and Lyrics", Romance, "Warner Bros.", 70, 3.64741055, 63, 145.9, 2007 ],
+    [ "Monte Carlo", Romance, "20th Century Fox", 50, 1.9832, 38, 39.66, 2011 ],
+    [ "Miss Pettigrew Lives for a Day", Comedy, Independent, 70, 0.2528949, 78, 15.17, 2008 ],
+    [ "Midnight in Paris", Romence, Sony, 84, 8.744705882, 93, 148.66, 2011 ],
+    [ "Marley and Me", Comedy, Fox, 77, 3.746781818, 63, 206.07, 2008 ],
+    [ "Mamma Mia!", Comedy, Universal, 76, 9.234453864, 53, 609.47, 2008 ],
+    [ "Mamma Mia!", Comedy, Universal, 76, 9.234453864, 53, 609.47, 2008 ],
+    [ "Made of Honor", Comdy, Sony, 61, 2.64906835, 13, 105.96, 2008 ],
+    [ "Love Happens", Drama, Universal, 40, 2.004444444, 18, 36.08, 2009 ],
+    [ "Love & Other Drugs", Comedy, Fox, 55, 1.817666667, 48, 54.53, 2010 ],
+    [ "Life as We Know It", Comedy, Independent, 62, 2.530526316, 28, 96.16, 2010 ],
+    [ "License to Wed", Comedy, "Warner Bros.", 55, 1.9802064, 8, 69.31, 2007 ],
+    [ "Letters to Juliet", Comedy, Summit, 62, 2.639333333, 40, 79.18, 2010 ],
+    [ "Leap Year", Comedy, Universal, 49, 1.715263158, 21, 32.59, 2010 ],
+    [ "Knocked Up", Comedy, Universal, 83, 6.636401848, 91, 219, 2007 ],
+    [ Killers, Action, Lionsgate, 45, 1.245333333, 11, 93.4, 2010 ],
+    [ "Just Wright", Comedy, Fox, 58, 1.797416667, 45, 21.57, 2010 ],
+    [ "Jane Eyre", Romance, Universal, 77, 0, 85, 30.15, 2011 ],
+    [ "It's Complicated", Comedy, Universal, 63, 2.642352941, 56, 224.6, 2009 ],
+    [ "I Love You Phillip Morris", Comedy, Independent, 57, 1.34, 71, 20.1, 2010 ],
+    [ "High School Musical 3: Senior Year", Comedy, Disney, 76, 22.91313646, 65, 252.04, 2008 ],
+    [ "He's Just Not That Into You", Comedy, "Warner Bros.", 60, 7.1536, 42, 178.84, 2009 ],
+    [ "Good Luck Chuck", Comedy, Lionsgate, 61, 2.36768512, 3, 59.19, 2007 ],
+    [ "Going the Distance", Comedy, "Warner Bros.", 56, 1.3140625, 53, 42.05, 2010 ],
+    [ "Gnomeo and Juliet", Animation, Disney, 52, 5.387972222, 56, 193.97, 2011 ],
+    [ "Gnomeo and Juliet", Animation, Disney, 52, 5.387972222, 56, 193.97, 2011 ],
+    [ "Ghosts of Girlfriends Past", Comedy, "Warner Bros.", 47, 2.0444, 27, 102.22, 2009 ],
+    [ "Four Christmases", Comedy, "Warner Bros.", 52, 2.022925, 26, 161.83, 2008 ],
+    [ Fireproof, Drama, Independent, 51, 66.934, 40, 33.47, 2008 ],
+    [ Enchanted, Comedy, Disney, 80, 4.005737082, 93, 340.49, 2007 ],
+    [ "Dear John", Drama, Sony, 66, 4.5988, 29, 114.97, 2010 ],
+    [ Beginners, Comedy, Independent, 80, 4.471875, 84, 14.31, 2011 ],
+    [ "Across the Universe", romance, Independent, 84, 0.652603178, 54, 29.37, 2007 ],
+    [ "A Serious Man", Drama, Universal, 64, 4.382857143, 89, 30.68, 2009 ],
+    [ "A Dangerous Method", Drama, Independent, 89, 0.44864475, 79, 8.97, 2011 ],
+    [ "27 Dresses", Comedy, Fox, 71, 5.3436218, 40, 160.31, 2008 ],
+    [ "(500) Days of Summer", comedy, Fox, 81, 8.096, 87, 60.72, 2009 ]
+]
+
+#[test]
+def count_movies_by_Lead_Studio [] {
+    let grouped = $movies | group-by Lead_Studio --to-table
+    let out = $grouped | aggregate
+    # let expected = $grouped | insert count {get items | length} | select Lead_Studio count
+    let expected = [
+        [ Lead_Studio, count ];
+        [ "The Weinstein Company", 2 ],
+        [ Independent, 19 ],
+        [ Disney, 8 ],
+        [ Fox, 6 ],
+        [ "20th Century Fox", 2 ],
+        [ "Warner Bros.", 14 ],
+        [ Summit, 5 ],
+        [ Paramount, 4 ],
+        [ CBS, 1 ],
+        [ "New Line", 1 ],
+        [ Sony, 4 ],
+        [ Universal, 8 ],
+        [ Lionsgate, 2 ]
+    ]
+
+    assert equal $out $expected
+}
+
+#[test]
+def average_gross_by_Genre [] {
+    let grouped = $movies | group-by Genre --to-table
+    let out = $grouped | aggregate --ops {avg: {math avg}} Worldwide_Gross | select Genre Worldwide_Gross_avg
+    # let expected = $grouped | insert Worldwide_Gross_avg {get items.Worldwide_Gross | math avg} | select Genre Worldwide_Gross_avg
+
+    # Round to 2 digits of precision to keep floating point operations consistent between platforms.
+    let out = $out | update Worldwide_Gross_avg {math round --precision 2}
+    let expected = [
+        [ Genre, Worldwide_Gross_avg ];
+        [ Comedy, 148.33 ],
+        [ Drama, 99.01 ],
+        [ Animation, 316.06 ],
+        [ Romance, 148.60 ],
+        [ Fantasy, 285.43 ],
+        [ Romence, 148.66 ],
+        [ Comdy, 105.96 ],
+        [ Action, 93.40 ],
+        [ romance, 29.37 ],
+        [ comedy, 60.72 ]
+    ]
+
+    assert equal $out $expected
+}
+
+#[test]
+def aggregate_default_ops [] {
+    let grouped = $movies | group-by Genre --to-table
+    let out = $grouped | aggregate Worldwide_Gross
+
+    # Round to 2 digits of precision to keep floating point operations consistent between platforms.
+    let out = $out | update cells -c [Worldwide_Gross_min, Worldwide_Gross_avg, Worldwide_Gross_max, Worldwide_Gross_sum] { math round --precision 2 }
+
+    let expected = [
+        [Genre    , count, Worldwide_Gross_min, Worldwide_Gross_avg, Worldwide_Gross_max, Worldwide_Gross_sum];
+        [Comedy   ,    41,               14.31,              148.33,              609.47,             6081.73],
+        [Drama    ,    13,                8.26,               99.01,              709.82,             1287.15],
+        [Animation,     4,              193.97,              316.06,              521.28,             1264.23],
+        [Romance  ,    12,                0.03,              148.60,              702.17,             1783.16],
+        [Fantasy  ,     1,              285.43,              285.43,              285.43,              285.43],
+        [Romence  ,     1,              148.66,              148.66,              148.66,              148.66],
+        [Comdy    ,     1,              105.96,              105.96,              105.96,              105.96],
+        [Action   ,     1,               93.40,               93.40,               93.40,               93.40],
+        [romance  ,     1,               29.37,               29.37,               29.37,               29.37],
+        [comedy   ,     1,               60.72,               60.72,               60.72,               60.72],
+    ]
+
+    assert equal $out $expected
+}
+
+#[test]
+def throw_error_on_non-table_input [] {
+    # without --to-table
+    let out = try {
+        $movies | group-by Genre | aggregate Worldwide_Gross
+    } catch {|e|
+        $e.msg
+    }
+
+    assert equal $out "input must be a table"
+}
+
+#[test]
+def throw_error_on_non-existing_column [] {
+    let grouped = $movies | group-by Genre --to-table
+    let error = try {
+        $grouped | aggregate --ops {avg: {math avg}} NotInTheDataSet
+    } catch {|e|
+        $e.json | from json
+    }
+
+    assert equal $error.inner.0.msg "Cannot find column '$.items.NotInTheDataSet'"
+}
+
+#[test]
+def aggregate_stats_without_grouping [] {
+    let out = $movies | aggregate Year | update cells -c [Year_min Year_avg Year_max Year_sum] {math round -p 2}
+    let expected = [{
+        count: 76,
+        Year_min: 2007,
+        Year_avg: 2009.09,
+        Year_max: 2011,
+        Year_sum: 152691
+    }]
+
+    assert equal $out $expected
+}

From 720813339f3b1de6f7f73fd50409ff84b72bac26 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Sun, 9 Feb 2025 11:21:56 -0500
Subject: [PATCH 1027/1072] Add `std-rfc` README (#15066)

Copied the old README from `nu_scripts/stdlib-candidate/std-rfc` over to `nu-std/std-rfc` and
updated it with the latest info.
---
 crates/nu-std/std-rfc/README.md | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 crates/nu-std/std-rfc/README.md

diff --git a/crates/nu-std/std-rfc/README.md b/crates/nu-std/std-rfc/README.md
new file mode 100644
index 0000000000..75e20159ba
--- /dev/null
+++ b/crates/nu-std/std-rfc/README.md
@@ -0,0 +1,30 @@
+# `std-rfc`
+
+## Overview and Requirements
+
+This module includes potential candidate commands (and other definitions) for inclusion in the Standard Library (`std`) that is built in to Nushell. As a general guideline, candidates should:
+
+* Be general purpose features that will be useful to a number of users
+* Include doc comments for definitions and parameters that can be used with `help <command>`
+* Include tests
+* Since doc comments are fairly limited, additional documentation can be included
+  in a GitHub discussion. This documentation can then be moved to the main website when the feature
+  is promoted to `std`. See [this example](https://github.com/nushell/nushell/discussions/14935#discussion-7882769) for some `table` helpers.
+
+## Showcase and Discussion
+
+While primary feedback should take place in the PR, we have also established a [Drawing Board Discord Showcase](https://discord.gg/C3eMKV58MQ) which can be used for several purposes:
+
+* Ideation before a PR is submitted
+* Raise awareness of the feature
+* Short-term questions and discussion
+
+Note: The Drawing Board is not just for `std-rfc`. Please tag your topic with `std-library` if it is about a Standard Library idea.
+
+## Promotion Evaluation
+
+In general, new `std-rfc` features will be evaluated after they have been trialed for a sufficient period, which may vary depending on the feature. After that period, the feature may be:
+
+* Promoted to `std`
+* Removed from `std-rfc`
+* Or changes may be requested and then reevaluated later

From 6e88b3f8d67a88202fef74632360e7c6ee74d510 Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Mon, 10 Feb 2025 11:26:41 +0800
Subject: [PATCH 1028/1072] refactor(completion): expression based
 variable/cell_path completion (#15033)

# Description

fixes #14643 , as well as some nested cell path cases:

```nushell
let foo = {a: [1 {a: 1}]}

$foo.a.1.#<tab>

const bar = {a: 1, b: 2}
$bar.#<tab>
```

So my plan of the refactoring process is that:
1. gradually move those rules of flattened shapes into expression match
branches, until they are gone
2. keep each PR focused, easier to review and track.

# User-Facing Changes

# Tests + Formatting

+2

# After Submitting
---
 .../src/completions/cell_path_completions.rs  |  97 ++++++++
 crates/nu-cli/src/completions/completer.rs    | 154 ++++++------
 crates/nu-cli/src/completions/mod.rs          |   2 +
 .../src/completions/variable_completions.rs   | 220 ++----------------
 crates/nu-cli/tests/completions/mod.rs        |  52 +++++
 5 files changed, 243 insertions(+), 282 deletions(-)
 create mode 100644 crates/nu-cli/src/completions/cell_path_completions.rs

diff --git a/crates/nu-cli/src/completions/cell_path_completions.rs b/crates/nu-cli/src/completions/cell_path_completions.rs
new file mode 100644
index 0000000000..3d921e8bbd
--- /dev/null
+++ b/crates/nu-cli/src/completions/cell_path_completions.rs
@@ -0,0 +1,97 @@
+use crate::completions::{Completer, CompletionOptions, SemanticSuggestion, SuggestionKind};
+use nu_engine::{column::get_columns, eval_variable};
+use nu_protocol::{
+    ast::{Expr, FullCellPath, PathMember},
+    engine::{Stack, StateWorkingSet},
+    eval_const::eval_constant,
+    Span, Value,
+};
+use reedline::Suggestion;
+
+use super::completion_options::NuMatcher;
+
+pub struct CellPathCompletion<'a> {
+    pub full_cell_path: &'a FullCellPath,
+}
+
+impl Completer for CellPathCompletion<'_> {
+    fn fetch(
+        &mut self,
+        working_set: &StateWorkingSet,
+        stack: &Stack,
+        _prefix: &[u8],
+        _span: Span,
+        offset: usize,
+        _pos: usize,
+        options: &CompletionOptions,
+    ) -> Vec<SemanticSuggestion> {
+        // empty tail is already handled as variable names completion
+        let Some((prefix_member, path_members)) = self.full_cell_path.tail.split_last() else {
+            return vec![];
+        };
+        let (mut prefix_str, span) = match prefix_member {
+            PathMember::String { val, span, .. } => (val.clone(), span),
+            PathMember::Int { val, span, .. } => (val.to_string(), span),
+        };
+        // strip the placeholder
+        prefix_str.pop();
+        let true_end = std::cmp::max(span.start, span.end - 1);
+        let span = Span::new(span.start, true_end);
+        let current_span = reedline::Span {
+            start: span.start - offset,
+            end: true_end - offset,
+        };
+
+        let mut matcher = NuMatcher::new(prefix_str, options.clone());
+
+        // evaluate the head expression to get its value
+        let value = if let Expr::Var(var_id) = self.full_cell_path.head.expr {
+            working_set
+                .get_variable(var_id)
+                .const_val
+                .to_owned()
+                .or_else(|| eval_variable(working_set.permanent_state, stack, var_id, span).ok())
+        } else {
+            eval_constant(working_set, &self.full_cell_path.head).ok()
+        }
+        .unwrap_or_default();
+
+        for suggestion in nested_suggestions(&value, path_members, current_span) {
+            matcher.add_semantic_suggestion(suggestion);
+        }
+        matcher.results()
+    }
+}
+
+// Find recursively the values for cell_path
+fn nested_suggestions(
+    val: &Value,
+    path_members: &[PathMember],
+    current_span: reedline::Span,
+) -> Vec<SemanticSuggestion> {
+    let value = val
+        .clone()
+        .follow_cell_path(path_members, false)
+        .unwrap_or_default();
+
+    let kind = SuggestionKind::Type(value.get_type());
+    let str_to_suggestion = |s: String| SemanticSuggestion {
+        suggestion: Suggestion {
+            value: s,
+            span: current_span,
+            ..Suggestion::default()
+        },
+        kind: Some(kind.to_owned()),
+    };
+    match value {
+        Value::Record { val, .. } => val
+            .columns()
+            .map(|s| str_to_suggestion(s.to_string()))
+            .collect(),
+        Value::List { vals, .. } => get_columns(vals.as_slice())
+            .into_iter()
+            .map(str_to_suggestion)
+            .collect(),
+        _ => vec![],
+    }
+}
diff --git a/crates/nu-cli/src/completions/completer.rs b/crates/nu-cli/src/completions/completer.rs
index 9ab0cba566..9fe5d05001 100644
--- a/crates/nu-cli/src/completions/completer.rs
+++ b/crates/nu-cli/src/completions/completer.rs
@@ -1,6 +1,7 @@
 use crate::completions::{
-    CommandCompletion, Completer, CompletionOptions, CustomCompletion, DirectoryCompletion,
-    DotNuCompletion, FileCompletion, FlagCompletion, OperatorCompletion, VariableCompletion,
+    CellPathCompletion, CommandCompletion, Completer, CompletionOptions, CustomCompletion,
+    DirectoryCompletion, DotNuCompletion, FileCompletion, FlagCompletion, OperatorCompletion,
+    VariableCompletion,
 };
 use log::debug;
 use nu_color_config::{color_record_to_nustyle, lookup_ansi_color_style};
@@ -17,6 +18,10 @@ use std::{str, sync::Arc};
 
 use super::base::{SemanticSuggestion, SuggestionKind};
 
+/// Used as the function `f` in find_map Traverse
+///
+/// returns the inner-most pipeline_element of interest
+/// i.e. the one that contains given position and needs completion
 fn find_pipeline_element_by_position<'a>(
     expr: &'a Expression,
     working_set: &'a StateWorkingSet,
@@ -62,6 +67,15 @@ fn find_pipeline_element_by_position<'a>(
     }
 }
 
+/// Before completion, an additional character `a` is added to the source as a placeholder for correct parsing results.
+/// This function helps to strip it
+fn strip_placeholder<'a>(working_set: &'a StateWorkingSet, span: &Span) -> (Span, &'a [u8]) {
+    let new_end = std::cmp::max(span.end - 1, span.start);
+    let new_span = Span::new(span.start, new_end);
+    let prefix = working_set.get_span_contents(new_span);
+    (new_span, prefix)
+}
+
 #[derive(Clone)]
 pub struct NuCompleter {
     engine_state: Arc<EngineState>,
@@ -80,6 +94,28 @@ impl NuCompleter {
         self.completion_helper(line, pos)
     }
 
+    fn variable_names_completion_helper(
+        &self,
+        working_set: &StateWorkingSet,
+        span: Span,
+        offset: usize,
+    ) -> Vec<SemanticSuggestion> {
+        let (new_span, prefix) = strip_placeholder(working_set, &span);
+        if !prefix.starts_with(b"$") {
+            return vec![];
+        }
+        let mut variable_names_completer = VariableCompletion {};
+        self.process_completion(
+            &mut variable_names_completer,
+            working_set,
+            prefix,
+            new_span,
+            offset,
+            // pos is not required
+            0,
+        )
+    }
+
     // Process the completion for a given completer
     fn process_completion<T: Completer>(
         &self,
@@ -193,6 +229,37 @@ impl NuCompleter {
             return vec![];
         };
 
+        match &element_expression.expr {
+            Expr::Var(_) => {
+                return self.variable_names_completion_helper(
+                    &working_set,
+                    element_expression.span,
+                    fake_offset,
+                );
+            }
+            Expr::FullCellPath(full_cell_path) => {
+                // e.g. `$e<tab>` parsed as FullCellPath
+                if full_cell_path.tail.is_empty() {
+                    return self.variable_names_completion_helper(
+                        &working_set,
+                        element_expression.span,
+                        fake_offset,
+                    );
+                } else {
+                    let mut cell_path_completer = CellPathCompletion { full_cell_path };
+                    return self.process_completion(
+                        &mut cell_path_completer,
+                        &working_set,
+                        &[],
+                        element_expression.span,
+                        fake_offset,
+                        pos,
+                    );
+                }
+            }
+            _ => (),
+        }
+
         let flattened = flatten_expression(&working_set, element_expression);
         let mut spans: Vec<String> = vec![];
 
@@ -223,9 +290,6 @@ impl NuCompleter {
 
             // Complete based on the last span
             if is_last_span {
-                // Context variables
-                let most_left_var = most_left_variable(flat_idx, &working_set, flattened.clone());
-
                 // Create a new span
                 let new_span = Span::new(span.start, span.end - 1);
 
@@ -233,36 +297,6 @@ impl NuCompleter {
                 let index = pos - span.start;
                 let prefix = &current_span[..index];
 
-                // Variables completion
-                if prefix.starts_with(b"$") || most_left_var.is_some() {
-                    let mut variable_names_completer =
-                        VariableCompletion::new(most_left_var.unwrap_or((vec![], vec![])));
-
-                    let mut variable_completions = self.process_completion(
-                        &mut variable_names_completer,
-                        &working_set,
-                        prefix,
-                        new_span,
-                        fake_offset,
-                        pos,
-                    );
-
-                    let mut variable_operations_completer =
-                        OperatorCompletion::new(element_expression.clone());
-
-                    let mut variable_operations_completions = self.process_completion(
-                        &mut variable_operations_completer,
-                        &working_set,
-                        prefix,
-                        new_span,
-                        fake_offset,
-                        pos,
-                    );
-
-                    variable_completions.append(&mut variable_operations_completions);
-                    return variable_completions;
-                }
-
                 // Flags completion
                 if prefix.starts_with(b"-") {
                     // Try to complete flag internally
@@ -474,56 +508,6 @@ impl ReedlineCompleter for NuCompleter {
     }
 }
 
-// reads the most left variable returning it's name (e.g: $myvar)
-// and the depth (a.b.c)
-fn most_left_variable(
-    idx: usize,
-    working_set: &StateWorkingSet<'_>,
-    flattened: Vec<(Span, FlatShape)>,
-) -> Option<(Vec<u8>, Vec<Vec<u8>>)> {
-    // Reverse items to read the list backwards and truncate
-    // because the only items that matters are the ones before the current index
-    let mut rev = flattened;
-    rev.truncate(idx);
-    rev = rev.into_iter().rev().collect();
-
-    // Store the variables and sub levels found and reverse to correct order
-    let mut variables_found: Vec<Vec<u8>> = vec![];
-    let mut found_var = false;
-    for item in rev.clone() {
-        let result = working_set.get_span_contents(item.0).to_vec();
-
-        match item.1 {
-            FlatShape::Variable(_) => {
-                variables_found.push(result);
-                found_var = true;
-
-                break;
-            }
-            FlatShape::String => {
-                variables_found.push(result);
-            }
-            _ => {
-                break;
-            }
-        }
-    }
-
-    // If most left var was not found
-    if !found_var {
-        return None;
-    }
-
-    // Reverse the order back
-    variables_found = variables_found.into_iter().rev().collect();
-
-    // Extract the variable and the sublevels
-    let var = variables_found.first().unwrap_or(&vec![]).to_vec();
-    let sublevels: Vec<Vec<u8>> = variables_found.into_iter().skip(1).collect();
-
-    Some((var, sublevels))
-}
-
 pub fn map_value_completions<'a>(
     list: impl Iterator<Item = &'a Value>,
     span: Span,
diff --git a/crates/nu-cli/src/completions/mod.rs b/crates/nu-cli/src/completions/mod.rs
index 7c9f9ff483..6122657b28 100644
--- a/crates/nu-cli/src/completions/mod.rs
+++ b/crates/nu-cli/src/completions/mod.rs
@@ -1,4 +1,5 @@
 mod base;
+mod cell_path_completions;
 mod command_completions;
 mod completer;
 mod completion_common;
@@ -12,6 +13,7 @@ mod operator_completions;
 mod variable_completions;
 
 pub use base::{Completer, SemanticSuggestion, SuggestionKind};
+pub use cell_path_completions::CellPathCompletion;
 pub use command_completions::CommandCompletion;
 pub use completer::NuCompleter;
 pub use completion_options::{CompletionOptions, MatchAlgorithm};
diff --git a/crates/nu-cli/src/completions/variable_completions.rs b/crates/nu-cli/src/completions/variable_completions.rs
index 69e0985e80..b251f451e4 100644
--- a/crates/nu-cli/src/completions/variable_completions.rs
+++ b/crates/nu-cli/src/completions/variable_completions.rs
@@ -1,124 +1,34 @@
 use crate::completions::{Completer, CompletionOptions, SemanticSuggestion, SuggestionKind};
-use nu_engine::{column::get_columns, eval_variable};
 use nu_protocol::{
     engine::{Stack, StateWorkingSet},
-    Span, Value,
+    Span, VarId,
 };
 use reedline::Suggestion;
-use std::str;
 
 use super::completion_options::NuMatcher;
 
-#[derive(Clone)]
-pub struct VariableCompletion {
-    var_context: (Vec<u8>, Vec<Vec<u8>>), // tuple with $var and the sublevels (.b.c.d)
-}
-
-impl VariableCompletion {
-    pub fn new(var_context: (Vec<u8>, Vec<Vec<u8>>)) -> Self {
-        Self { var_context }
-    }
-}
+pub struct VariableCompletion {}
 
 impl Completer for VariableCompletion {
     fn fetch(
         &mut self,
         working_set: &StateWorkingSet,
-        stack: &Stack,
+        _stack: &Stack,
         prefix: &[u8],
         span: Span,
         offset: usize,
         _pos: usize,
         options: &CompletionOptions,
     ) -> Vec<SemanticSuggestion> {
-        let builtins = ["$nu", "$in", "$env"];
-        let var_str = std::str::from_utf8(&self.var_context.0).unwrap_or("");
-        let var_id = working_set.find_variable(&self.var_context.0);
+        let prefix_str = String::from_utf8_lossy(prefix);
+        let mut matcher = NuMatcher::new(prefix_str, options.clone());
         let current_span = reedline::Span {
             start: span.start - offset,
             end: span.end - offset,
         };
-        let sublevels_count = self.var_context.1.len();
-        let prefix_str = String::from_utf8_lossy(prefix);
-        let mut matcher = NuMatcher::new(prefix_str, options.clone());
-
-        // Completions for the given variable
-        if !var_str.is_empty() {
-            // Completion for $env.<tab>
-            if var_str == "$env" {
-                let env_vars = stack.get_env_vars(working_set.permanent_state);
-
-                // Return nested values
-                if sublevels_count > 0 {
-                    // Extract the target var ($env.<target-var>)
-                    let target_var = self.var_context.1[0].clone();
-                    let target_var_str =
-                        str::from_utf8(&target_var).unwrap_or_default().to_string();
-
-                    // Everything after the target var is the nested level ($env.<target-var>.<nested_levels>...)
-                    let nested_levels: Vec<Vec<u8>> =
-                        self.var_context.1.clone().into_iter().skip(1).collect();
-
-                    if let Some(val) = env_vars.get(&target_var_str) {
-                        for suggestion in nested_suggestions(val, &nested_levels, current_span) {
-                            matcher.add_semantic_suggestion(suggestion);
-                        }
-
-                        return matcher.results();
-                    }
-                } else {
-                    // No nesting provided, return all env vars
-                    for env_var in env_vars {
-                        matcher.add_semantic_suggestion(SemanticSuggestion {
-                            suggestion: Suggestion {
-                                value: env_var.0,
-                                span: current_span,
-                                ..Suggestion::default()
-                            },
-                            kind: Some(SuggestionKind::Type(env_var.1.get_type())),
-                        });
-                    }
-
-                    return matcher.results();
-                }
-            }
-
-            // Completions for $nu.<tab>
-            if var_str == "$nu" {
-                // Eval nu var
-                if let Ok(nuval) = eval_variable(
-                    working_set.permanent_state,
-                    stack,
-                    nu_protocol::NU_VARIABLE_ID,
-                    nu_protocol::Span::new(current_span.start, current_span.end),
-                ) {
-                    for suggestion in nested_suggestions(&nuval, &self.var_context.1, current_span)
-                    {
-                        matcher.add_semantic_suggestion(suggestion);
-                    }
-
-                    return matcher.results();
-                }
-            }
-
-            // Completion other variable types
-            if let Some(var_id) = var_id {
-                // Extract the variable value from the stack
-                let var = stack.get_var(var_id, Span::new(span.start, span.end));
-
-                // If the value exists and it's of type Record
-                if let Ok(value) = var {
-                    for suggestion in nested_suggestions(&value, &self.var_context.1, current_span)
-                    {
-                        matcher.add_semantic_suggestion(suggestion);
-                    }
-
-                    return matcher.results();
-                }
-            }
-        }
 
         // Variable completion (e.g: $en<tab> to complete $env)
+        let builtins = ["$nu", "$in", "$env"];
         for builtin in builtins {
             matcher.add_semantic_suggestion(SemanticSuggestion {
                 suggestion: Suggestion {
@@ -131,27 +41,30 @@ impl Completer for VariableCompletion {
             });
         }
 
+        let mut add_candidate = |name, var_id: &VarId| {
+            matcher.add_semantic_suggestion(SemanticSuggestion {
+                suggestion: Suggestion {
+                    value: String::from_utf8_lossy(name).to_string(),
+                    span: current_span,
+                    ..Suggestion::default()
+                },
+                kind: Some(SuggestionKind::Type(
+                    working_set.get_variable(*var_id).ty.clone(),
+                )),
+            })
+        };
+
         // TODO: The following can be refactored (see find_commands_by_predicate() used in
         // command_completions).
         let mut removed_overlays = vec![];
         // Working set scope vars
         for scope_frame in working_set.delta.scope.iter().rev() {
             for overlay_frame in scope_frame.active_overlays(&mut removed_overlays).rev() {
-                for v in &overlay_frame.vars {
-                    matcher.add_semantic_suggestion(SemanticSuggestion {
-                        suggestion: Suggestion {
-                            value: String::from_utf8_lossy(v.0).to_string(),
-                            span: current_span,
-                            ..Suggestion::default()
-                        },
-                        kind: Some(SuggestionKind::Type(
-                            working_set.get_variable(*v.1).ty.clone(),
-                        )),
-                    });
+                for (name, var_id) in &overlay_frame.vars {
+                    add_candidate(name, var_id);
                 }
             }
         }
-
         // Permanent state vars
         // for scope in &self.engine_state.scope {
         for overlay_frame in working_set
@@ -159,98 +72,11 @@ impl Completer for VariableCompletion {
             .active_overlays(&removed_overlays)
             .rev()
         {
-            for v in &overlay_frame.vars {
-                matcher.add_semantic_suggestion(SemanticSuggestion {
-                    suggestion: Suggestion {
-                        value: String::from_utf8_lossy(v.0).to_string(),
-                        span: current_span,
-                        ..Suggestion::default()
-                    },
-                    kind: Some(SuggestionKind::Type(
-                        working_set.get_variable(*v.1).ty.clone(),
-                    )),
-                });
+            for (name, var_id) in &overlay_frame.vars {
+                add_candidate(name, var_id);
             }
         }
 
         matcher.results()
     }
 }
-
-// Find recursively the values for sublevels
-// if no sublevels are set it returns the current value
-fn nested_suggestions(
-    val: &Value,
-    sublevels: &[Vec<u8>],
-    current_span: reedline::Span,
-) -> Vec<SemanticSuggestion> {
-    let mut output: Vec<SemanticSuggestion> = vec![];
-    let value = recursive_value(val, sublevels).unwrap_or_else(Value::nothing);
-
-    let kind = SuggestionKind::Type(value.get_type());
-    match value {
-        Value::Record { val, .. } => {
-            // Add all the columns as completion
-            for col in val.columns() {
-                output.push(SemanticSuggestion {
-                    suggestion: Suggestion {
-                        value: col.clone(),
-                        span: current_span,
-                        ..Suggestion::default()
-                    },
-                    kind: Some(kind.clone()),
-                });
-            }
-
-            output
-        }
-        Value::List { vals, .. } => {
-            for column_name in get_columns(vals.as_slice()) {
-                output.push(SemanticSuggestion {
-                    suggestion: Suggestion {
-                        value: column_name,
-                        span: current_span,
-                        ..Suggestion::default()
-                    },
-                    kind: Some(kind.clone()),
-                });
-            }
-
-            output
-        }
-        _ => output,
-    }
-}
-
-// Extracts the recursive value (e.g: $var.a.b.c)
-fn recursive_value(val: &Value, sublevels: &[Vec<u8>]) -> Result<Value, Span> {
-    // Go to next sublevel
-    if let Some((sublevel, next_sublevels)) = sublevels.split_first() {
-        let span = val.span();
-        match val {
-            Value::Record { val, .. } => {
-                if let Some((_, value)) = val.iter().find(|(key, _)| key.as_bytes() == sublevel) {
-                    // If matches try to fetch recursively the next
-                    recursive_value(value, next_sublevels)
-                } else {
-                    // Current sublevel value not found
-                    Err(span)
-                }
-            }
-            Value::List { vals, .. } => {
-                for col in get_columns(vals.as_slice()) {
-                    if col.as_bytes() == *sublevel {
-                        let val = val.get_data_by_key(&col).ok_or(span)?;
-                        return recursive_value(&val, next_sublevels);
-                    }
-                }
-
-                // Current sublevel value not found
-                Err(span)
-            }
-            _ => Ok(val.clone()),
-        }
-    } else {
-        Ok(val.clone())
-    }
-}
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index ab9152172e..fdea8b521e 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -1554,6 +1554,58 @@ fn variables_completions() {
     match_suggestions(&expected, &suggestions);
 }
 
+#[test]
+fn record_cell_path_completions() {
+    let (_, _, mut engine, mut stack) = new_engine();
+    let command = r#"let foo = {a: [1 {a: 2}]}; const bar = {a: [1 {a: 2}]}"#;
+    assert!(support::merge_input(command.as_bytes(), &mut engine, &mut stack).is_ok());
+    let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
+
+    let expected: Vec<String> = vec!["a".into()];
+    let completion_str = "$foo.";
+    let suggestions = completer.complete(completion_str, completion_str.len());
+    match_suggestions(&expected, &suggestions);
+
+    let completion_str = "$foo.a.1.";
+    let suggestions = completer.complete(completion_str, completion_str.len());
+    match_suggestions(&expected, &suggestions);
+
+    let completion_str = "$bar.";
+    let suggestions = completer.complete(completion_str, completion_str.len());
+    match_suggestions(&expected, &suggestions);
+
+    let completion_str = "$bar.a.1.";
+    let suggestions = completer.complete(completion_str, completion_str.len());
+    match_suggestions(&expected, &suggestions);
+
+    let completion_str = "{a: [1 {a: 2}]}.a.1.";
+    let suggestions = completer.complete(completion_str, completion_str.len());
+    match_suggestions(&expected, &suggestions);
+}
+
+#[test]
+fn table_cell_path_completions() {
+    let (_, _, mut engine, mut stack) = new_engine();
+    let command = r#"let foo = [{a:{b:1}}, {a:{b:2}}]; const bar = [[a b]; [1 2]]"#;
+    assert!(support::merge_input(command.as_bytes(), &mut engine, &mut stack).is_ok());
+    let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
+
+    let expected: Vec<String> = vec!["a".into()];
+    let completion_str = "$foo.";
+    let suggestions = completer.complete(completion_str, completion_str.len());
+    match_suggestions(&expected, &suggestions);
+
+    let expected: Vec<String> = vec!["b".into()];
+    let completion_str = "$foo.a.";
+    let suggestions = completer.complete(completion_str, completion_str.len());
+    match_suggestions(&expected, &suggestions);
+
+    let expected: Vec<String> = vec!["a".into(), "b".into()];
+    let completion_str = "$bar.";
+    let suggestions = completer.complete(completion_str, completion_str.len());
+    match_suggestions(&expected, &suggestions);
+}
+
 #[test]
 fn alias_of_command_and_flags() {
     let (_, _, mut engine, mut stack) = new_engine();

From d4675d9138e748c0317ddeb156e6cb5103dbebfe Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Mon, 10 Feb 2025 15:32:05 +0800
Subject: [PATCH 1029/1072] allow `export alias` in repl (#15054)

# Description
Fixes: #15048
The issue is happened while `parse_export_in_block`, it makes a call to
`parse_internal_call`, which may be an error.
But in reality, these errors are not useful, all useful errors will be
generated by `parse_xxx` at the end of the function.

# User-Facing Changes
The following code should no longer raise error:
```
export alias a = overlay use
```

# Tests + Formatting
Added 1 test.

# After Submitting
NaN
---
 crates/nu-command/tests/commands/alias.rs | 6 ++++++
 crates/nu-parser/src/parse_keywords.rs    | 7 ++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/crates/nu-command/tests/commands/alias.rs b/crates/nu-command/tests/commands/alias.rs
index 03df53ae42..9711225f9c 100644
--- a/crates/nu-command/tests/commands/alias.rs
+++ b/crates/nu-command/tests/commands/alias.rs
@@ -163,3 +163,9 @@ fn alias_default_help() {
     let first_help_line = actual.out.lines().next().unwrap();
     assert!(first_help_line.starts_with("Alias for `echo 'I am a beautiful teapot'`"));
 }
+
+#[test]
+fn export_alias_with_overlay_use_works() {
+    let actual = nu!("export alias teapot = overlay use");
+    assert!(actual.err.is_empty())
+}
diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index 5eb845523a..057443c141 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -1147,6 +1147,7 @@ pub fn parse_export_in_block(
     }
 
     if let Some(decl_id) = working_set.find_decl(full_name.as_bytes()) {
+        let starting_error_count = working_set.parse_errors.len();
         let ParsedInternalCall { call, output, .. } = parse_internal_call(
             working_set,
             if full_name == "export" {
@@ -1161,12 +1162,12 @@ pub fn parse_export_in_block(
             },
             decl_id,
         );
+        // don't need errors generated by parse_internal_call
+        // further error will be generated by detail `parse_xxx` function.
+        working_set.parse_errors.truncate(starting_error_count);
 
         let decl = working_set.get_decl(decl_id);
-
-        let starting_error_count = working_set.parse_errors.len();
         check_call(working_set, call_span, &decl.signature(), &call);
-
         let Ok(is_help) = has_flag_const(working_set, &call, "help") else {
             return garbage_pipeline(working_set, &lite_command.parts);
         };

From 7d7dbd8b2cde73e559d24360fc34b51bb2cfdb7d Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Mon, 10 Feb 2025 16:27:50 +0800
Subject: [PATCH 1030/1072] Fix `missing required overlay` error (#15058)

# Description
Fixes: #15049

The error occurs when using an alias with a module prefix, it can
initially pass through alias checking, but if the alias leads to
commands which have side effects, it doesn't call these functions to
apply side effects.
This pr ensure that in such cases, nushell still calls
`parse_overlay_xxx` functions to apply the side effects.

I want to make my test easier to write, so this pr depends on
https://github.com/nushell/nushell/pull/15054.

# User-Facing Changes
The following code will no longer raise an error:
```
module inner {}
module spam { export alias b = overlay use inner }
use spam
spam b
```

# Tests + Formatting
Added 2 tests.

# After Submitting
NaN
---
 crates/nu-parser/src/parser.rs | 25 ++++++++++++++++++++++
 tests/overlays/mod.rs          | 38 ++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index fb8d5f7986..4c90338d75 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -5781,6 +5781,31 @@ pub fn parse_builtin_commands(
         _ => {
             let element = parse_pipeline_element(working_set, lite_command);
 
+            // There is still a chance to make `parse_pipeline_element` parse into
+            // some keyword that should apply side effects first, Example:
+            //
+            // module a { export alias b = overlay use first.nu };
+            // use a
+            // a b
+            //
+            // In this case, `a b` will be parsed as a pipeline element, which leads
+            // to the `overlay use` command.
+            // In this case, we need to ensure that the side effects of these keywords
+            // are applied.
+            if let Expression {
+                expr: Expr::Call(call),
+                ..
+            } = &element.expr
+            {
+                // Apply parse keyword side effects
+                let cmd = working_set.get_decl(call.decl_id);
+                match cmd.name() {
+                    "overlay hide" => return parse_overlay_hide(working_set, call.clone()),
+                    "overlay new" => return parse_overlay_new(working_set, call.clone()),
+                    "overlay use" => return parse_overlay_use(working_set, call.clone()),
+                    _ => { /* this alias is not a parser keyword */ }
+                }
+            }
             Pipeline {
                 elements: vec![element],
             }
diff --git a/tests/overlays/mod.rs b/tests/overlays/mod.rs
index a04f44641b..f3126c8140 100644
--- a/tests/overlays/mod.rs
+++ b/tests/overlays/mod.rs
@@ -1287,6 +1287,44 @@ fn alias_overlay_use() {
     assert_eq!(actual_repl.out, "foo");
 }
 
+#[test]
+fn alias_overlay_use_2() {
+    let inp = &[
+        "module inner {}",
+        "module spam { export alias b = overlay use inner }",
+        "use spam",
+        "spam b",
+        "overlay list | get 1",
+    ];
+
+    let actual = nu!(&inp.join("; "));
+    let actual_repl = nu!(nu_repl_code(inp));
+
+    assert!(actual.err.is_empty());
+    assert!(actual_repl.err.is_empty());
+    assert_eq!(actual.out, "inner");
+    assert_eq!(actual_repl.out, "inner");
+}
+
+#[test]
+fn alias_overlay_use_3() {
+    let inp = &[
+        "module inner {}",
+        "module spam { export alias b = overlay use inner }",
+        "use spam b",
+        "b",
+        "overlay list | get 1",
+    ];
+
+    let actual = nu!(&inp.join("; "));
+    let actual_repl = nu!(nu_repl_code(inp));
+
+    assert!(actual.err.is_empty());
+    assert!(actual_repl.err.is_empty());
+    assert_eq!(actual.out, "inner");
+    assert_eq!(actual_repl.out, "inner");
+}
+
 #[test]
 fn alias_overlay_new() {
     let inp = &[

From 00713c93399122a368b905c8c7db40f8fe1c55e6 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Mon, 10 Feb 2025 09:05:05 -0500
Subject: [PATCH 1031/1072] Update README.md

Fix Drawing-Board link/description
---
 crates/nu-std/std-rfc/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-std/std-rfc/README.md b/crates/nu-std/std-rfc/README.md
index 75e20159ba..0e93dd41e8 100644
--- a/crates/nu-std/std-rfc/README.md
+++ b/crates/nu-std/std-rfc/README.md
@@ -13,7 +13,7 @@ This module includes potential candidate commands (and other definitions) for in
 
 ## Showcase and Discussion
 
-While primary feedback should take place in the PR, we have also established a [Drawing Board Discord Showcase](https://discord.gg/C3eMKV58MQ) which can be used for several purposes:
+While primary feedback should take place in the PR, we have also established a [Drawing Board]([https://discord.gg/C3eMKV58MQ](https://discord.com/channels/601130461678272522/1313988919477538888)) Discord channel which can be used for several purposes:
 
 * Ideation before a PR is submitted
 * Raise awareness of the feature

From a7830ac1fdc7f5df7fbdeee737b88b3381759149 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Mon, 10 Feb 2025 09:06:09 -0500
Subject: [PATCH 1032/1072] Update README.md

Fix link
---
 crates/nu-std/std-rfc/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-std/std-rfc/README.md b/crates/nu-std/std-rfc/README.md
index 0e93dd41e8..acebe4daa9 100644
--- a/crates/nu-std/std-rfc/README.md
+++ b/crates/nu-std/std-rfc/README.md
@@ -13,7 +13,7 @@ This module includes potential candidate commands (and other definitions) for in
 
 ## Showcase and Discussion
 
-While primary feedback should take place in the PR, we have also established a [Drawing Board]([https://discord.gg/C3eMKV58MQ](https://discord.com/channels/601130461678272522/1313988919477538888)) Discord channel which can be used for several purposes:
+While primary feedback should take place in the PR, we have also established a [Drawing Board](https://discord.com/channels/601130461678272522/1313988919477538888) Discord channel which can be used for several purposes:
 
 * Ideation before a PR is submitted
 * Raise awareness of the feature

From c6fc6bd5a791d2ab25c7a66aa7fa641fbba900d7 Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Mon, 10 Feb 2025 23:15:03 +0800
Subject: [PATCH 1033/1072] fix(lsp): inlay hints span issue with user config
 scripts (#15071)

# Description

Fixes this:

![image](https://github.com/user-attachments/assets/98b523dd-df30-4e85-b069-20aaad0d9bf5)

# User-Facing Changes

# Tests + Formatting

I can't figure out how to test this atm.
Happy to do it if someone show me some hints how.

# After Submitting
---
 crates/nu-lsp/src/hints.rs                         |  1 +
 crates/nu-protocol/src/engine/engine_state.rs      |  4 +++-
 crates/nu-protocol/src/engine/state_working_set.rs | 10 +++++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/crates/nu-lsp/src/hints.rs b/crates/nu-lsp/src/hints.rs
index 581a2e70b0..564430bad2 100644
--- a/crates/nu-lsp/src/hints.rs
+++ b/crates/nu-lsp/src/hints.rs
@@ -160,6 +160,7 @@ impl LanguageServer {
     }
 }
 
+/// TODO: test for files loaded as user config
 #[cfg(test)]
 mod tests {
     use crate::path_to_uri;
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index 184f1d5343..bc6d7a2eb1 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -880,7 +880,9 @@ impl EngineState {
         }
     }
 
-    pub fn files(&self) -> impl Iterator<Item = &CachedFile> {
+    pub fn files(
+        &self,
+    ) -> impl DoubleEndedIterator<Item = &CachedFile> + ExactSizeIterator<Item = &CachedFile> {
         self.files.iter()
     }
 
diff --git a/crates/nu-protocol/src/engine/state_working_set.rs b/crates/nu-protocol/src/engine/state_working_set.rs
index 8db525a2a1..c7643b501b 100644
--- a/crates/nu-protocol/src/engine/state_working_set.rs
+++ b/crates/nu-protocol/src/engine/state_working_set.rs
@@ -368,7 +368,15 @@ impl<'a> StateWorkingSet<'a> {
     }
 
     pub fn get_span_for_filename(&self, filename: &str) -> Option<Span> {
-        let file_id = self.files().position(|file| &*file.name == filename)?;
+        let predicate = |file: &CachedFile| &*file.name == filename;
+        // search from end to start, in case there're duplicated files with the same name
+        let file_id = self
+            .delta
+            .files
+            .iter()
+            .rposition(predicate)
+            .map(|idx| idx + self.permanent_state.num_files())
+            .or_else(|| self.permanent_state.files().rposition(predicate))?;
         let file_id = FileId::new(file_id);
 
         Some(self.get_span_for_file(file_id))

From a2e335dcd72ae9edc4f1d98d2855d84eaaea4817 Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Tue, 11 Feb 2025 00:26:02 +0300
Subject: [PATCH 1034/1072] fix block spans for the module keyword (#15078)

# Description
I noticed that the following code snippet wasn't being highlighted
correctly. Spans used for parsing contents of the block was also
incorrectly used for the expression.

# User-Facing Changes
The block following the module keyword is now highlighted correctly.

| Before | After |
|--------|--------|
|
![image](https://github.com/user-attachments/assets/8d1040f5-5002-4880-bb71-47549a67a804)
|
![image](https://github.com/user-attachments/assets/0dc28e25-2da3-4411-82ae-3e4e129fd42f)
|

# Tests + Formatting

- :green_circle: toolkit fmt
- :green_circle: toolkit clippy
- :green_circle: toolkit test
- :green_circle: toolkit test stdlib

# After Submitting
N/A
---
 crates/nu-parser/src/parse_keywords.rs | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index 057443c141..cbd26e1a1f 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -2227,15 +2227,15 @@ pub fn parse_module(
 
     let module_name = module_name_or_path;
 
-    let block_span = spans[split_id + 1];
-    let block_bytes = working_set.get_span_contents(block_span);
-    let mut start = block_span.start;
-    let mut end = block_span.end;
+    let block_expr_span = spans[split_id + 1];
+    let block_bytes = working_set.get_span_contents(block_expr_span);
+    let mut start = block_expr_span.start;
+    let mut end = block_expr_span.end;
 
     if block_bytes.starts_with(b"{") {
         start += 1;
     } else {
-        working_set.error(ParseError::Expected("block", block_span));
+        working_set.error(ParseError::Expected("block", block_expr_span));
         return (garbage_pipeline(working_set, spans), None);
     }
 
@@ -2245,17 +2245,22 @@ pub fn parse_module(
         working_set.error(ParseError::Unclosed("}".into(), Span::new(end, end)));
     }
 
-    let block_span = Span::new(start, end);
+    let block_content_span = Span::new(start, end);
 
     let (block, module, inner_comments) =
-        parse_module_block(working_set, block_span, module_name.as_bytes());
+        parse_module_block(working_set, block_content_span, module_name.as_bytes());
 
     let block_id = working_set.add_block(Arc::new(block));
 
     module_comments.extend(inner_comments);
     let module_id = working_set.add_module(&module_name, module, module_comments);
 
-    let block_expr = Expression::new(working_set, Expr::Block(block_id), block_span, Type::Any);
+    let block_expr = Expression::new(
+        working_set,
+        Expr::Block(block_id),
+        block_expr_span,
+        Type::Any,
+    );
 
     let module_decl_id = working_set
         .find_decl(b"module")

From 781c4bd1d7947846c2ebf0d10dbf817c6e16193a Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Tue, 11 Feb 2025 00:26:42 +0300
Subject: [PATCH 1035/1072] use 0-indexing in `explore` (#15079)

# Description
The index in `explore --index` starting with 1 is inconsistent with rest
of nushell. Also it tripped me up a few times when I wanted to select a
row with `:nu get n`

# User-Facing Changes
Index in `explore --index` now starts with 0.

# Tests + Formatting

- :green_circle: toolkit fmt
- :green_circle: toolkit clippy
- :green_circle: toolkit test
- :green_circle: toolkit test stdlib

# After Submitting
N/A
---
 crates/nu-explore/src/views/record/table_widget.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-explore/src/views/record/table_widget.rs b/crates/nu-explore/src/views/record/table_widget.rs
index 588377c9f8..9f56702d0b 100644
--- a/crates/nu-explore/src/views/record/table_widget.rs
+++ b/crates/nu-explore/src/views/record/table_widget.rs
@@ -502,7 +502,7 @@ impl<'a> IndexColumn<'a> {
 impl Widget for IndexColumn<'_> {
     fn render(self, area: Rect, buf: &mut Buffer) {
         for row in 0..area.height {
-            let i = 1 + row as usize + self.start;
+            let i = row as usize + self.start;
             let text = i.to_string();
             let style = nu_style_to_tui(self.style_computer.compute(
                 "row_index",

From 553c951a60476e7ca22cdff5fa5ac4cb191e16b6 Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Tue, 11 Feb 2025 04:35:23 -0500
Subject: [PATCH 1036/1072] Fix match running closures as block (#15032)

# Description
This PR makes `match` no longer run closures as if they were blocks.
This also allows returning closures from `match` without needing to wrap
in an outer subexpression or block.

Before PR:
```nushell
match 1 { _ => {|| print hi} }
# => hi
```

After PR:
```nushell
match 1 { _ => {|| print hi} }
# => closure_1090
```

# User-Facing Changes

* `match` no longer runs closures as if they were blocks

# Tests + Formatting

N/A

# After Submitting

N/A
---
 crates/nu-engine/src/compile/keyword.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-engine/src/compile/keyword.rs b/crates/nu-engine/src/compile/keyword.rs
index b22e055a21..7d5b2abf29 100644
--- a/crates/nu-engine/src/compile/keyword.rs
+++ b/crates/nu-engine/src/compile/keyword.rs
@@ -255,7 +255,7 @@ pub(crate) fn compile_match(
         builder.drop_reg(match_reg)?;
 
         // Execute match right hand side expression
-        if let Some(block_id) = expr.as_block() {
+        if let Expr::Block(block_id) = expr.expr {
             let block = working_set.get_block(block_id);
             compile_block(
                 working_set,

From 18e3a5d40b6e13b1076912bd7543f535df901cec Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Tue, 11 Feb 2025 11:16:57 +0100
Subject: [PATCH 1037/1072] Fix `match` blocks in `std-rfc/kv` implementation
 (#15089)

Fixes failure surfaced by merging
https://github.com/nushell/nushell/pull/15032
---
 crates/nu-std/std-rfc/kv/mod.nu | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/nu-std/std-rfc/kv/mod.nu b/crates/nu-std/std-rfc/kv/mod.nu
index b0b78cf684..d01f2f6238 100644
--- a/crates/nu-std/std-rfc/kv/mod.nu
+++ b/crates/nu-std/std-rfc/kv/mod.nu
@@ -190,8 +190,8 @@ def db_setup [
 
   # Return the correct closure for opening on-disk vs. in-memory
   match $universal {
-    true  => {|| {|| open (universal_db_path)}}
-    false => {|| {|| stor open}}
+    true  => {{|| open (universal_db_path)}}
+    false => {{|| stor open}}
   }
 }
 

From a5d7d6dd4603b0b013ff0e295bd9ff517d283bd3 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Tue, 11 Feb 2025 11:33:29 +0100
Subject: [PATCH 1038/1072] Bump yanked dependencies (#15090)

Seen in the `cargo install --locked` step of the stdlib ci
- `scc`
- `sdd` [according to changelog potential use after
free](https://github.com/wvwwvwwv/scalable-delayed-dealloc/blob/main/CHANGELOG.md)

Should only be part of the `dev-dependencies` due to `serial_test`
---
 Cargo.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d9242600cc..92c94f4e69 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6272,9 +6272,9 @@ dependencies = [
 
 [[package]]
 name = "scc"
-version = "2.2.5"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66b202022bb57c049555430e11fc22fea12909276a80a4c3d368da36ac1d88ed"
+checksum = "ea091f6cac2595aa38993f04f4ee692ed43757035c36e67c180b6828356385b1"
 dependencies = [
  "sdd",
 ]
@@ -6346,9 +6346,9 @@ dependencies = [
 
 [[package]]
 name = "sdd"
-version = "3.0.4"
+version = "3.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49c1eeaf4b6a87c7479688c6d52b9f1153cedd3c489300564f932b065c6eab95"
+checksum = "b07779b9b918cc05650cb30f404d4d7835d26df37c235eded8a6832e2fb82cca"
 
 [[package]]
 name = "security-framework"

From 2a3d5a9d4294ba4758f2d3d606495967f6ded136 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Tue, 11 Feb 2025 11:33:48 +0100
Subject: [PATCH 1039/1072] Bump `bytesize` to fix `into filesize` (#15088)

# Description
Closes https://github.com/nushell/nushell/issues/14866

Incorporates https://github.com/bytesize-rs/bytesize/pull/59 with
bytesize version 1.3.1

# User-Facing Changes
Now rejected strings
```
"1.3 1.3 kB" | into filesize
"1 420 kB" | into filesize
```
# Tests + Formatting
Added test with invalid input that was silently ignored before
---
 Cargo.lock                                        | 4 ++--
 Cargo.toml                                        | 2 +-
 crates/nu-command/tests/commands/into_filesize.rs | 7 +++++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 92c94f4e69..afad2c8875 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -847,9 +847,9 @@ dependencies = [
 
 [[package]]
 name = "bytesize"
-version = "1.3.0"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc"
+checksum = "2d2c12f985c78475a6b8d629afd0c360260ef34cfef52efccdcfd31972f81c2e"
 
 [[package]]
 name = "calamine"
diff --git a/Cargo.toml b/Cargo.toml
index 06cebda215..fb803dd17c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -70,7 +70,7 @@ bracoxide = "0.1.4"
 brotli = "7.0"
 byteorder = "1.5"
 bytes = "1"
-bytesize = "1.3"
+bytesize = "1.3.1"
 calamine = "0.26.1"
 chardetng = "0.1.17"
 chrono = { default-features = false, version = "0.4.34" }
diff --git a/crates/nu-command/tests/commands/into_filesize.rs b/crates/nu-command/tests/commands/into_filesize.rs
index 6ed6047935..9d8dcb0881 100644
--- a/crates/nu-command/tests/commands/into_filesize.rs
+++ b/crates/nu-command/tests/commands/into_filesize.rs
@@ -128,3 +128,10 @@ fn wrong_positive_str() {
 
     assert!(actual.err.contains("can't convert string to filesize"));
 }
+
+#[test]
+fn invalid_str() {
+    let actual = nu!("'42.0 42.0 kB' | into filesize");
+
+    assert!(actual.err.contains("can't convert string to filesize"));
+}

From a58d9b0b3a5703b2ebd7fffd7f5715aa661da5d9 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Tue, 11 Feb 2025 11:36:36 +0100
Subject: [PATCH 1040/1072] Refactor/fix tests affecting the whole command set
 (#15073)

# Description
Pre-cratification of `nu-command` we added tests that covered the whole
command set to ensure consistent documentation style choices and that
the search terms which are added are not uselessly redundant. These
tests are now moved into the suite of the main binary to truly cover all
commands.

- **Move parser quickcheck "fuzz" to `nu-cmd-lang`**
- **Factor out creation of full engine state for tests**
- **Move all-command tests to main context creation**
- **Fix all descriptions**
- **Fix search term duplicate**

# User-Facing Changes
As a result I had to fix a few command argument descriptions. (Doesn't
mean I fully stand behind this choice, but) positionals
(rest/required/optional) and top level descriptions should start with a
capital letter and end with a period. This is not enforced for flags.

# Tests + Formatting
Furthermore I moved our poor-peoples-fuzzer that runs in CI with
`quicktest` over the parser to `nu-cmd-lang` reducing its command set to
just the keywords (similar to
https://github.com/nushell/nushell/pull/15036). Thus this should also
run slightly faster (maybe a slight parallel build cost due to earlier
dependency on quicktest)
---
 Cargo.lock                                    |   4 +-
 .../nu-cli/src/commands/commandline/edit.rs   |   2 +-
 .../src/commands/commandline/set_cursor.rs    |   2 +-
 .../src/commands/history/history_import.rs    |   2 +-
 crates/nu-cmd-extra/src/extra/bits/and.rs     |   2 +-
 crates/nu-cmd-extra/src/extra/bits/into.rs    |   2 +-
 crates/nu-cmd-extra/src/extra/bits/or.rs      |   2 +-
 .../src/extra/bits/rotate_left.rs             |   2 +-
 .../src/extra/bits/rotate_right.rs            |   2 +-
 .../nu-cmd-extra/src/extra/bits/shift_left.rs |   2 +-
 .../src/extra/bits/shift_right.rs             |   2 +-
 crates/nu-cmd-extra/src/extra/bits/xor.rs     |   2 +-
 .../src/extra/filters/each_while.rs           |   2 +-
 .../nu-cmd-extra/src/extra/filters/rotate.rs  |   2 +-
 .../src/extra/filters/update_cells.rs         |   2 +-
 .../src/extra/platform/ansi/gradient.rs       |   2 +-
 .../src/extra/strings/format/bits.rs          |   2 +-
 .../src/extra/strings/format/command.rs       |   2 +-
 .../src/extra/strings/format/number.rs        |   2 +-
 .../src/extra/strings/str_/case/camel_case.rs |   2 +-
 .../src/extra/strings/str_/case/kebab_case.rs |   2 +-
 .../extra/strings/str_/case/pascal_case.rs    |   2 +-
 .../strings/str_/case/screaming_snake_case.rs |   2 +-
 .../src/extra/strings/str_/case/snake_case.rs |   2 +-
 .../src/extra/strings/str_/case/title_case.rs |   2 +-
 crates/nu-cmd-lang/Cargo.toml                 |   6 +-
 crates/nu-cmd-lang/src/lib.rs                 |   2 +
 crates/nu-cmd-lang/src/parse_const_test.rs    |  19 ++
 .../nu-cmd-plugin/src/commands/plugin/add.rs  |   2 +-
 .../nu-cmd-plugin/src/commands/plugin/rm.rs   |   2 +-
 .../nu-cmd-plugin/src/commands/plugin/stop.rs |   2 +-
 .../nu-cmd-plugin/src/commands/plugin/use_.rs |   2 +-
 crates/nu-command/Cargo.toml                  |   2 -
 crates/nu-command/tests/main.rs               | 244 ------------------
 src/command_context.rs                        | 239 +++++++++++++++++
 src/main.rs                                   |  18 +-
 36 files changed, 299 insertions(+), 291 deletions(-)
 create mode 100644 crates/nu-cmd-lang/src/parse_const_test.rs
 create mode 100644 src/command_context.rs

diff --git a/Cargo.lock b/Cargo.lock
index afad2c8875..749bf7babf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3570,6 +3570,8 @@ dependencies = [
  "nu-parser",
  "nu-protocol",
  "nu-utils",
+ "quickcheck",
+ "quickcheck_macros",
  "shadow-rs",
 ]
 
@@ -3666,8 +3668,6 @@ dependencies = [
  "print-positions",
  "procfs",
  "quick-xml 0.37.1",
- "quickcheck",
- "quickcheck_macros",
  "rand",
  "rand_chacha",
  "rayon",
diff --git a/crates/nu-cli/src/commands/commandline/edit.rs b/crates/nu-cli/src/commands/commandline/edit.rs
index 64f3ae2a08..9afd52d946 100644
--- a/crates/nu-cli/src/commands/commandline/edit.rs
+++ b/crates/nu-cli/src/commands/commandline/edit.rs
@@ -29,7 +29,7 @@ impl Command for SubCommand {
             .required(
                 "str",
                 SyntaxShape::String,
-                "the string to perform the operation with",
+                "The string to perform the operation with.",
             )
             .category(Category::Core)
     }
diff --git a/crates/nu-cli/src/commands/commandline/set_cursor.rs b/crates/nu-cli/src/commands/commandline/set_cursor.rs
index 411d42de57..bf54674b44 100644
--- a/crates/nu-cli/src/commands/commandline/set_cursor.rs
+++ b/crates/nu-cli/src/commands/commandline/set_cursor.rs
@@ -18,7 +18,7 @@ impl Command for SubCommand {
                 "set the current cursor position to the end of the buffer",
                 Some('e'),
             )
-            .optional("pos", SyntaxShape::Int, "Cursor position to be set")
+            .optional("pos", SyntaxShape::Int, "Cursor position to be set.")
             .category(Category::Core)
     }
 
diff --git a/crates/nu-cli/src/commands/history/history_import.rs b/crates/nu-cli/src/commands/history/history_import.rs
index b9764306f8..80237acb87 100644
--- a/crates/nu-cli/src/commands/history/history_import.rs
+++ b/crates/nu-cli/src/commands/history/history_import.rs
@@ -21,7 +21,7 @@ impl Command for HistoryImport {
     }
 
     fn description(&self) -> &str {
-        "Import command line history"
+        "Import command line history."
     }
 
     fn extra_description(&self) -> &str {
diff --git a/crates/nu-cmd-extra/src/extra/bits/and.rs b/crates/nu-cmd-extra/src/extra/bits/and.rs
index a87508732d..dfac65af72 100644
--- a/crates/nu-cmd-extra/src/extra/bits/and.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/and.rs
@@ -26,7 +26,7 @@ impl Command for BitsAnd {
             .required(
                 "target",
                 SyntaxShape::OneOf(vec![SyntaxShape::Binary, SyntaxShape::Int]),
-                "right-hand side of the operation",
+                "Right-hand side of the operation.",
             )
             .named(
                 "endian",
diff --git a/crates/nu-cmd-extra/src/extra/bits/into.rs b/crates/nu-cmd-extra/src/extra/bits/into.rs
index 631637a44e..d3979f0e47 100644
--- a/crates/nu-cmd-extra/src/extra/bits/into.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/into.rs
@@ -26,7 +26,7 @@ impl Command for BitsInto {
             .rest(
                 "rest",
                 SyntaxShape::CellPath,
-                "for a data structure input, convert data at the given cell paths",
+                "For a data structure input, convert data at the given cell paths.",
             )
             .category(Category::Deprecated)
     }
diff --git a/crates/nu-cmd-extra/src/extra/bits/or.rs b/crates/nu-cmd-extra/src/extra/bits/or.rs
index 287b841750..d3859bb90e 100644
--- a/crates/nu-cmd-extra/src/extra/bits/or.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/or.rs
@@ -27,7 +27,7 @@ impl Command for BitsOr {
             .required(
                 "target",
                 SyntaxShape::OneOf(vec![SyntaxShape::Binary, SyntaxShape::Int]),
-                "right-hand side of the operation",
+                "Right-hand side of the operation.",
             )
             .named(
                 "endian",
diff --git a/crates/nu-cmd-extra/src/extra/bits/rotate_left.rs b/crates/nu-cmd-extra/src/extra/bits/rotate_left.rs
index 59e772df64..dffd09d4b0 100644
--- a/crates/nu-cmd-extra/src/extra/bits/rotate_left.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/rotate_left.rs
@@ -37,7 +37,7 @@ impl Command for BitsRol {
                 ),
             ])
             .allow_variants_without_examples(true)
-            .required("bits", SyntaxShape::Int, "number of bits to rotate left")
+            .required("bits", SyntaxShape::Int, "Number of bits to rotate left.")
             .switch(
                 "signed",
                 "always treat input number as a signed number",
diff --git a/crates/nu-cmd-extra/src/extra/bits/rotate_right.rs b/crates/nu-cmd-extra/src/extra/bits/rotate_right.rs
index 6017d0b5cf..df2bc84547 100644
--- a/crates/nu-cmd-extra/src/extra/bits/rotate_right.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/rotate_right.rs
@@ -37,7 +37,7 @@ impl Command for BitsRor {
                 ),
             ])
             .allow_variants_without_examples(true)
-            .required("bits", SyntaxShape::Int, "number of bits to rotate right")
+            .required("bits", SyntaxShape::Int, "Number of bits to rotate right.")
             .switch(
                 "signed",
                 "always treat input number as a signed number",
diff --git a/crates/nu-cmd-extra/src/extra/bits/shift_left.rs b/crates/nu-cmd-extra/src/extra/bits/shift_left.rs
index 155e20a429..0f1f0114e1 100644
--- a/crates/nu-cmd-extra/src/extra/bits/shift_left.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/shift_left.rs
@@ -40,7 +40,7 @@ impl Command for BitsShl {
                 ),
             ])
             .allow_variants_without_examples(true)
-            .required("bits", SyntaxShape::Int, "number of bits to shift left")
+            .required("bits", SyntaxShape::Int, "Number of bits to shift left.")
             .switch(
                 "signed",
                 "always treat input number as a signed number",
diff --git a/crates/nu-cmd-extra/src/extra/bits/shift_right.rs b/crates/nu-cmd-extra/src/extra/bits/shift_right.rs
index bc4f165d61..b99a9618f3 100644
--- a/crates/nu-cmd-extra/src/extra/bits/shift_right.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/shift_right.rs
@@ -37,7 +37,7 @@ impl Command for BitsShr {
                 ),
             ])
             .allow_variants_without_examples(true)
-            .required("bits", SyntaxShape::Int, "number of bits to shift right")
+            .required("bits", SyntaxShape::Int, "Number of bits to shift right.")
             .switch(
                 "signed",
                 "always treat input number as a signed number",
diff --git a/crates/nu-cmd-extra/src/extra/bits/xor.rs b/crates/nu-cmd-extra/src/extra/bits/xor.rs
index 2474bf27f1..d4e1d96abf 100644
--- a/crates/nu-cmd-extra/src/extra/bits/xor.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/xor.rs
@@ -27,7 +27,7 @@ impl Command for BitsXor {
             .required(
                 "target",
                 SyntaxShape::OneOf(vec![SyntaxShape::Binary, SyntaxShape::Int]),
-                "right-hand side of the operation",
+                "Right-hand side of the operation.",
             )
             .named(
                 "endian",
diff --git a/crates/nu-cmd-extra/src/extra/filters/each_while.rs b/crates/nu-cmd-extra/src/extra/filters/each_while.rs
index cc5c066185..58d1eae9e8 100644
--- a/crates/nu-cmd-extra/src/extra/filters/each_while.rs
+++ b/crates/nu-cmd-extra/src/extra/filters/each_while.rs
@@ -26,7 +26,7 @@ impl Command for EachWhile {
             .required(
                 "closure",
                 SyntaxShape::Closure(Some(vec![SyntaxShape::Any])),
-                "the closure to run",
+                "The closure to run.",
             )
             .category(Category::Filters)
     }
diff --git a/crates/nu-cmd-extra/src/extra/filters/rotate.rs b/crates/nu-cmd-extra/src/extra/filters/rotate.rs
index 4c25e82d37..43c83d42b5 100644
--- a/crates/nu-cmd-extra/src/extra/filters/rotate.rs
+++ b/crates/nu-cmd-extra/src/extra/filters/rotate.rs
@@ -20,7 +20,7 @@ impl Command for Rotate {
             .rest(
                 "rest",
                 SyntaxShape::String,
-                "the names to give columns once rotated",
+                "The names to give columns once rotated.",
             )
             .category(Category::Filters)
             .allow_variants_without_examples(true)
diff --git a/crates/nu-cmd-extra/src/extra/filters/update_cells.rs b/crates/nu-cmd-extra/src/extra/filters/update_cells.rs
index 7cfc20de23..a3edf7754a 100644
--- a/crates/nu-cmd-extra/src/extra/filters/update_cells.rs
+++ b/crates/nu-cmd-extra/src/extra/filters/update_cells.rs
@@ -16,7 +16,7 @@ impl Command for UpdateCells {
             .required(
                 "closure",
                 SyntaxShape::Closure(Some(vec![SyntaxShape::Any])),
-                "the closure to run an update for each cell",
+                "The closure to run an update for each cell.",
             )
             .named(
                 "columns",
diff --git a/crates/nu-cmd-extra/src/extra/platform/ansi/gradient.rs b/crates/nu-cmd-extra/src/extra/platform/ansi/gradient.rs
index 433757e6c7..b3aecef034 100644
--- a/crates/nu-cmd-extra/src/extra/platform/ansi/gradient.rs
+++ b/crates/nu-cmd-extra/src/extra/platform/ansi/gradient.rs
@@ -38,7 +38,7 @@ impl Command for SubCommand {
             .rest(
                 "cell path",
                 SyntaxShape::CellPath,
-                "for a data structure input, add a gradient to strings at the given cell paths",
+                "For a data structure input, add a gradient to strings at the given cell paths.",
             )
             .input_output_types(vec![
                 (Type::String, Type::String),
diff --git a/crates/nu-cmd-extra/src/extra/strings/format/bits.rs b/crates/nu-cmd-extra/src/extra/strings/format/bits.rs
index b34d429c6c..1010477139 100644
--- a/crates/nu-cmd-extra/src/extra/strings/format/bits.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/format/bits.rs
@@ -40,7 +40,7 @@ impl Command for FormatBits {
             .rest(
                 "rest",
                 SyntaxShape::CellPath,
-                "for a data structure input, convert data at the given cell paths",
+                "For a data structure input, convert data at the given cell paths.",
             )
             .category(Category::Conversions)
     }
diff --git a/crates/nu-cmd-extra/src/extra/strings/format/command.rs b/crates/nu-cmd-extra/src/extra/strings/format/command.rs
index 522fc6b05d..18206acba6 100644
--- a/crates/nu-cmd-extra/src/extra/strings/format/command.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/format/command.rs
@@ -18,7 +18,7 @@ impl Command for FormatPattern {
             .required(
                 "pattern",
                 SyntaxShape::String,
-                "the pattern to output. e.g.) \"{foo}: {bar}\"",
+                "The pattern to output. e.g.) \"{foo}: {bar}\".",
             )
             .allow_variants_without_examples(true)
             .category(Category::Strings)
diff --git a/crates/nu-cmd-extra/src/extra/strings/format/number.rs b/crates/nu-cmd-extra/src/extra/strings/format/number.rs
index e99d19606d..9c77a6006f 100644
--- a/crates/nu-cmd-extra/src/extra/strings/format/number.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/format/number.rs
@@ -20,7 +20,7 @@ impl Command for FormatNumber {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["display", "render", "format"]
+        vec!["display", "render", "fmt"]
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-cmd-extra/src/extra/strings/str_/case/camel_case.rs b/crates/nu-cmd-extra/src/extra/strings/str_/case/camel_case.rs
index 781848d7d8..279e3a7bb5 100644
--- a/crates/nu-cmd-extra/src/extra/strings/str_/case/camel_case.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/str_/case/camel_case.rs
@@ -25,7 +25,7 @@ impl Command for SubCommand {
             .rest(
                 "rest",
                 SyntaxShape::CellPath,
-                "For a data structure input, convert strings at the given cell paths",
+                "For a data structure input, convert strings at the given cell paths.",
             )
             .category(Category::Strings)
     }
diff --git a/crates/nu-cmd-extra/src/extra/strings/str_/case/kebab_case.rs b/crates/nu-cmd-extra/src/extra/strings/str_/case/kebab_case.rs
index 74c2d031e5..89a3429d7a 100644
--- a/crates/nu-cmd-extra/src/extra/strings/str_/case/kebab_case.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/str_/case/kebab_case.rs
@@ -25,7 +25,7 @@ impl Command for SubCommand {
             .rest(
                 "rest",
                 SyntaxShape::CellPath,
-                "For a data structure input, convert strings at the given cell paths",
+                "For a data structure input, convert strings at the given cell paths.",
             )
             .category(Category::Strings)
     }
diff --git a/crates/nu-cmd-extra/src/extra/strings/str_/case/pascal_case.rs b/crates/nu-cmd-extra/src/extra/strings/str_/case/pascal_case.rs
index 1372537ed5..9d081fa314 100644
--- a/crates/nu-cmd-extra/src/extra/strings/str_/case/pascal_case.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/str_/case/pascal_case.rs
@@ -25,7 +25,7 @@ impl Command for SubCommand {
             .rest(
                 "rest",
                 SyntaxShape::CellPath,
-                "For a data structure input, convert strings at the given cell paths",
+                "For a data structure input, convert strings at the given cell paths.",
             )
             .category(Category::Strings)
     }
diff --git a/crates/nu-cmd-extra/src/extra/strings/str_/case/screaming_snake_case.rs b/crates/nu-cmd-extra/src/extra/strings/str_/case/screaming_snake_case.rs
index c8b918b37f..aa8d55fd48 100644
--- a/crates/nu-cmd-extra/src/extra/strings/str_/case/screaming_snake_case.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/str_/case/screaming_snake_case.rs
@@ -25,7 +25,7 @@ impl Command for SubCommand {
             .rest(
                 "rest",
                 SyntaxShape::CellPath,
-                "For a data structure input, convert strings at the given cell paths",
+                "For a data structure input, convert strings at the given cell paths.",
             )
             .category(Category::Strings)
     }
diff --git a/crates/nu-cmd-extra/src/extra/strings/str_/case/snake_case.rs b/crates/nu-cmd-extra/src/extra/strings/str_/case/snake_case.rs
index 56a9b8b754..f2d5fb61c7 100644
--- a/crates/nu-cmd-extra/src/extra/strings/str_/case/snake_case.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/str_/case/snake_case.rs
@@ -25,7 +25,7 @@ impl Command for SubCommand {
             .rest(
                 "rest",
                 SyntaxShape::CellPath,
-                "For a data structure input, convert strings at the given cell paths",
+                "For a data structure input, convert strings at the given cell paths.",
             )
             .category(Category::Strings)
     }
diff --git a/crates/nu-cmd-extra/src/extra/strings/str_/case/title_case.rs b/crates/nu-cmd-extra/src/extra/strings/str_/case/title_case.rs
index 02d7efcb2e..827a3dd594 100644
--- a/crates/nu-cmd-extra/src/extra/strings/str_/case/title_case.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/str_/case/title_case.rs
@@ -25,7 +25,7 @@ impl Command for SubCommand {
             .rest(
                 "rest",
                 SyntaxShape::CellPath,
-                "For a data structure input, convert strings at the given cell paths",
+                "For a data structure input, convert strings at the given cell paths.",
             )
             .category(Category::Strings)
     }
diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml
index 0cf277bb82..2cc86bd782 100644
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -26,6 +26,10 @@ shadow-rs = { version = "0.38", default-features = false }
 [build-dependencies]
 shadow-rs = { version = "0.38", default-features = false }
 
+[dev-dependencies]
+quickcheck = { workspace = true }
+quickcheck_macros = { workspace = true }
+
 [features]
 default = ["os"]
 os = [
@@ -42,4 +46,4 @@ mimalloc = []
 trash-support = []
 sqlite = []
 static-link-openssl = []
-system-clipboard = []
\ No newline at end of file
+system-clipboard = []
diff --git a/crates/nu-cmd-lang/src/lib.rs b/crates/nu-cmd-lang/src/lib.rs
index 1a46c0a350..3d6f506015 100644
--- a/crates/nu-cmd-lang/src/lib.rs
+++ b/crates/nu-cmd-lang/src/lib.rs
@@ -4,6 +4,8 @@ mod core_commands;
 mod default_context;
 pub mod example_support;
 mod example_test;
+#[cfg(test)]
+mod parse_const_test;
 
 pub use core_commands::*;
 pub use default_context::*;
diff --git a/crates/nu-cmd-lang/src/parse_const_test.rs b/crates/nu-cmd-lang/src/parse_const_test.rs
new file mode 100644
index 0000000000..7870b37648
--- /dev/null
+++ b/crates/nu-cmd-lang/src/parse_const_test.rs
@@ -0,0 +1,19 @@
+use nu_protocol::{engine::StateWorkingSet, Span};
+use quickcheck_macros::quickcheck;
+
+#[quickcheck]
+fn quickcheck_parse(data: String) -> bool {
+    let (tokens, err) = nu_parser::lex(data.as_bytes(), 0, b"", b"", true);
+
+    if err.is_none() {
+        let context = crate::create_default_context();
+        {
+            let mut working_set = StateWorkingSet::new(&context);
+            let _ = working_set.add_file("quickcheck".into(), data.as_bytes());
+
+            let _ =
+                nu_parser::parse_block(&mut working_set, &tokens, Span::new(0, 0), false, false);
+        }
+    }
+    true
+}
diff --git a/crates/nu-cmd-plugin/src/commands/plugin/add.rs b/crates/nu-cmd-plugin/src/commands/plugin/add.rs
index 301b88fdff..33e00c8eee 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/add.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/add.rs
@@ -33,7 +33,7 @@ impl Command for PluginAdd {
             .required(
                 "filename",
                 SyntaxShape::String,
-                "Path to the executable for the plugin",
+                "Path to the executable for the plugin.",
             )
             .category(Category::Plugin)
     }
diff --git a/crates/nu-cmd-plugin/src/commands/plugin/rm.rs b/crates/nu-cmd-plugin/src/commands/plugin/rm.rs
index a82b41524a..82b909a5ff 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/rm.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/rm.rs
@@ -28,7 +28,7 @@ impl Command for PluginRm {
             .required(
                 "name",
                 SyntaxShape::String,
-                "The name, or filename, of the plugin to remove",
+                "The name, or filename, of the plugin to remove.",
             )
             .category(Category::Plugin)
     }
diff --git a/crates/nu-cmd-plugin/src/commands/plugin/stop.rs b/crates/nu-cmd-plugin/src/commands/plugin/stop.rs
index 3c8383db93..343729436b 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/stop.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/stop.rs
@@ -16,7 +16,7 @@ impl Command for PluginStop {
             .required(
                 "name",
                 SyntaxShape::String,
-                "The name, or filename, of the plugin to stop",
+                "The name, or filename, of the plugin to stop.",
             )
             .category(Category::Plugin)
     }
diff --git a/crates/nu-cmd-plugin/src/commands/plugin/use_.rs b/crates/nu-cmd-plugin/src/commands/plugin/use_.rs
index df6ddb4507..0d66afce9a 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/use_.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/use_.rs
@@ -25,7 +25,7 @@ impl Command for PluginUse {
             .required(
                 "name",
                 SyntaxShape::String,
-                "The name, or filename, of the plugin to load",
+                "The name, or filename, of the plugin to load.",
             )
             .category(Category::Plugin)
     }
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 12f197798d..b3106f7be9 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -195,8 +195,6 @@ nu-test-support = { path = "../nu-test-support", version = "0.102.1" }
 
 dirs = { workspace = true }
 mockito = { workspace = true, default-features = false }
-quickcheck = { workspace = true }
-quickcheck_macros = { workspace = true }
 rstest = { workspace = true, default-features = false }
 rstest_reuse = { workspace = true }
 pretty_assertions = { workspace = true }
diff --git a/crates/nu-command/tests/main.rs b/crates/nu-command/tests/main.rs
index fa2a7168b5..e5dec74e6e 100644
--- a/crates/nu-command/tests/main.rs
+++ b/crates/nu-command/tests/main.rs
@@ -1,247 +1,3 @@
-use nu_protocol::{
-    engine::{EngineState, StateWorkingSet},
-    Category, PositionalArg, Span,
-};
-use quickcheck_macros::quickcheck;
-
 mod commands;
 mod format_conversions;
 mod sort_utils;
-
-fn create_default_context() -> EngineState {
-    nu_command::add_shell_command_context(nu_cmd_lang::create_default_context())
-}
-
-#[quickcheck]
-fn quickcheck_parse(data: String) -> bool {
-    let (tokens, err) = nu_parser::lex(data.as_bytes(), 0, b"", b"", true);
-
-    if err.is_none() {
-        let context = create_default_context();
-        {
-            let mut working_set = StateWorkingSet::new(&context);
-            let _ = working_set.add_file("quickcheck".into(), data.as_bytes());
-
-            let _ =
-                nu_parser::parse_block(&mut working_set, &tokens, Span::new(0, 0), false, false);
-        }
-    }
-    true
-}
-
-#[test]
-fn arguments_end_period() {
-    fn ends_period(cmd_name: &str, ty: &str, arg: PositionalArg, failures: &mut Vec<String>) {
-        let arg_name = arg.name;
-        let desc = arg.desc;
-        if !desc.ends_with('.') {
-            failures.push(format!(
-                "{cmd_name} {ty} argument \"{arg_name}\": \"{desc}\""
-            ));
-        }
-    }
-
-    let ctx = crate::create_default_context();
-    let decls = ctx.get_decls_sorted(true);
-    let mut failures = Vec::new();
-
-    for (name_bytes, decl_id) in decls {
-        let cmd = ctx.get_decl(decl_id);
-        let cmd_name = String::from_utf8_lossy(&name_bytes);
-        let signature = cmd.signature();
-
-        for arg in signature.required_positional {
-            ends_period(&cmd_name, "required", arg, &mut failures);
-        }
-
-        for arg in signature.optional_positional {
-            ends_period(&cmd_name, "optional", arg, &mut failures);
-        }
-
-        if let Some(arg) = signature.rest_positional {
-            ends_period(&cmd_name, "rest", arg, &mut failures);
-        }
-    }
-
-    assert!(
-        failures.is_empty(),
-        "Command argument description does not end with a period:\n{}",
-        failures.join("\n")
-    );
-}
-
-#[test]
-fn arguments_start_uppercase() {
-    fn starts_uppercase(cmd_name: &str, ty: &str, arg: PositionalArg, failures: &mut Vec<String>) {
-        let arg_name = arg.name;
-        let desc = arg.desc;
-
-        // Check lowercase to allow usage to contain syntax like:
-        //
-        // "`as` keyword …"
-        if desc.starts_with(|u: char| u.is_lowercase()) {
-            failures.push(format!(
-                "{cmd_name} {ty} argument \"{arg_name}\": \"{desc}\""
-            ));
-        }
-    }
-
-    let ctx = crate::create_default_context();
-    let decls = ctx.get_decls_sorted(true);
-    let mut failures = Vec::new();
-
-    for (name_bytes, decl_id) in decls {
-        let cmd = ctx.get_decl(decl_id);
-        let cmd_name = String::from_utf8_lossy(&name_bytes);
-        let signature = cmd.signature();
-
-        for arg in signature.required_positional {
-            starts_uppercase(&cmd_name, "required", arg, &mut failures);
-        }
-
-        for arg in signature.optional_positional {
-            starts_uppercase(&cmd_name, "optional", arg, &mut failures);
-        }
-
-        if let Some(arg) = signature.rest_positional {
-            starts_uppercase(&cmd_name, "rest", arg, &mut failures);
-        }
-    }
-
-    assert!(
-        failures.is_empty(),
-        "Command argument description does not end with a period:\n{}",
-        failures.join("\n")
-    );
-}
-
-#[test]
-fn signature_name_matches_command_name() {
-    let ctx = create_default_context();
-    let decls = ctx.get_decls_sorted(true);
-    let mut failures = Vec::new();
-
-    for (name_bytes, decl_id) in decls {
-        let cmd = ctx.get_decl(decl_id);
-        let cmd_name = String::from_utf8_lossy(&name_bytes);
-        let sig_name = cmd.signature().name;
-        let category = cmd.signature().category;
-
-        if cmd_name != sig_name {
-            failures.push(format!(
-                "{cmd_name} ({category:?}): Signature name \"{sig_name}\" is not equal to the command name \"{cmd_name}\""
-            ));
-        }
-    }
-
-    assert!(
-        failures.is_empty(),
-        "Name mismatch:\n{}",
-        failures.join("\n")
-    );
-}
-
-#[test]
-fn commands_declare_input_output_types() {
-    let ctx = create_default_context();
-    let decls = ctx.get_decls_sorted(true);
-    let mut failures = Vec::new();
-
-    for (_, decl_id) in decls {
-        let cmd = ctx.get_decl(decl_id);
-        let sig_name = cmd.signature().name;
-        let category = cmd.signature().category;
-
-        if matches!(category, Category::Removed) {
-            // Deprecated/Removed commands don't have to conform
-            continue;
-        }
-
-        if cmd.signature().input_output_types.is_empty() {
-            failures.push(format!(
-                "{sig_name} ({category:?}): No pipeline input/output type signatures found"
-            ));
-        }
-    }
-
-    assert!(
-        failures.is_empty(),
-        "Command missing type annotations:\n{}",
-        failures.join("\n")
-    );
-}
-
-#[test]
-fn no_search_term_duplicates() {
-    let ctx = crate::create_default_context();
-    let decls = ctx.get_decls_sorted(true);
-    let mut failures = Vec::new();
-
-    for (name_bytes, decl_id) in decls {
-        let cmd = ctx.get_decl(decl_id);
-        let cmd_name = String::from_utf8_lossy(&name_bytes);
-        let search_terms = cmd.search_terms();
-        let category = cmd.signature().category;
-
-        for search_term in search_terms {
-            if cmd_name.contains(search_term) {
-                failures.push(format!("{cmd_name} ({category:?}): Search term \"{search_term}\" is substring of command name \"{cmd_name}\""));
-            }
-        }
-    }
-
-    assert!(
-        failures.is_empty(),
-        "Duplication in search terms:\n{}",
-        failures.join("\n")
-    );
-}
-
-#[test]
-fn description_end_period() {
-    let ctx = crate::create_default_context();
-    let decls = ctx.get_decls_sorted(true);
-    let mut failures = Vec::new();
-
-    for (name_bytes, decl_id) in decls {
-        let cmd = ctx.get_decl(decl_id);
-        let cmd_name = String::from_utf8_lossy(&name_bytes);
-        let description = cmd.description();
-
-        if !description.ends_with('.') {
-            failures.push(format!("{cmd_name}: \"{description}\""));
-        }
-    }
-
-    assert!(
-        failures.is_empty(),
-        "Command description does not end with a period:\n{}",
-        failures.join("\n")
-    );
-}
-
-#[test]
-fn description_start_uppercase() {
-    let ctx = crate::create_default_context();
-    let decls = ctx.get_decls_sorted(true);
-    let mut failures = Vec::new();
-
-    for (name_bytes, decl_id) in decls {
-        let cmd = ctx.get_decl(decl_id);
-        let cmd_name = String::from_utf8_lossy(&name_bytes);
-        let description = cmd.description();
-
-        // Check lowercase to allow description to contain syntax like:
-        //
-        // "`$env.FOO = ...`"
-        if description.starts_with(|u: char| u.is_lowercase()) {
-            failures.push(format!("{cmd_name}: \"{description}\""));
-        }
-    }
-
-    assert!(
-        failures.is_empty(),
-        "Command description does not start with an uppercase letter:\n{}",
-        failures.join("\n")
-    );
-}
diff --git a/src/command_context.rs b/src/command_context.rs
new file mode 100644
index 0000000000..28d991d924
--- /dev/null
+++ b/src/command_context.rs
@@ -0,0 +1,239 @@
+use nu_protocol::engine::EngineState;
+
+pub(crate) fn get_engine_state() -> EngineState {
+    let engine_state = nu_cmd_lang::create_default_context();
+    #[cfg(feature = "plugin")]
+    let engine_state = nu_cmd_plugin::add_plugin_command_context(engine_state);
+    let engine_state = nu_command::add_shell_command_context(engine_state);
+    let engine_state = nu_cmd_extra::add_extra_command_context(engine_state);
+    let engine_state = nu_cli::add_cli_context(engine_state);
+    nu_explore::add_explore_context(engine_state)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use nu_protocol::{Category, PositionalArg};
+
+    #[test]
+    fn arguments_end_period() {
+        fn ends_period(cmd_name: &str, ty: &str, arg: PositionalArg, failures: &mut Vec<String>) {
+            let arg_name = arg.name;
+            let desc = arg.desc;
+            if !desc.ends_with('.') {
+                failures.push(format!(
+                    "{cmd_name} {ty} argument \"{arg_name}\": \"{desc}\""
+                ));
+            }
+        }
+
+        let ctx = get_engine_state();
+        let decls = ctx.get_decls_sorted(true);
+        let mut failures = Vec::new();
+
+        for (name_bytes, decl_id) in decls {
+            let cmd = ctx.get_decl(decl_id);
+            let cmd_name = String::from_utf8_lossy(&name_bytes);
+            let signature = cmd.signature();
+
+            for arg in signature.required_positional {
+                ends_period(&cmd_name, "required", arg, &mut failures);
+            }
+
+            for arg in signature.optional_positional {
+                ends_period(&cmd_name, "optional", arg, &mut failures);
+            }
+
+            if let Some(arg) = signature.rest_positional {
+                ends_period(&cmd_name, "rest", arg, &mut failures);
+            }
+        }
+
+        assert!(
+            failures.is_empty(),
+            "Command argument description does not end with a period:\n{}",
+            failures.join("\n")
+        );
+    }
+
+    #[test]
+    fn arguments_start_uppercase() {
+        fn starts_uppercase(
+            cmd_name: &str,
+            ty: &str,
+            arg: PositionalArg,
+            failures: &mut Vec<String>,
+        ) {
+            let arg_name = arg.name;
+            let desc = arg.desc;
+
+            // Check lowercase to allow usage to contain syntax like:
+            //
+            // "`as` keyword …"
+            if desc.starts_with(|u: char| u.is_lowercase()) {
+                failures.push(format!(
+                    "{cmd_name} {ty} argument \"{arg_name}\": \"{desc}\""
+                ));
+            }
+        }
+
+        let ctx = get_engine_state();
+        let decls = ctx.get_decls_sorted(true);
+        let mut failures = Vec::new();
+
+        for (name_bytes, decl_id) in decls {
+            let cmd = ctx.get_decl(decl_id);
+            let cmd_name = String::from_utf8_lossy(&name_bytes);
+            let signature = cmd.signature();
+
+            for arg in signature.required_positional {
+                starts_uppercase(&cmd_name, "required", arg, &mut failures);
+            }
+
+            for arg in signature.optional_positional {
+                starts_uppercase(&cmd_name, "optional", arg, &mut failures);
+            }
+
+            if let Some(arg) = signature.rest_positional {
+                starts_uppercase(&cmd_name, "rest", arg, &mut failures);
+            }
+        }
+
+        assert!(
+            failures.is_empty(),
+            "Command argument description does not end with a period:\n{}",
+            failures.join("\n")
+        );
+    }
+
+    #[test]
+    fn signature_name_matches_command_name() {
+        let ctx = get_engine_state();
+        let decls = ctx.get_decls_sorted(true);
+        let mut failures = Vec::new();
+
+        for (name_bytes, decl_id) in decls {
+            let cmd = ctx.get_decl(decl_id);
+            let cmd_name = String::from_utf8_lossy(&name_bytes);
+            let sig_name = cmd.signature().name;
+            let category = cmd.signature().category;
+
+            if cmd_name != sig_name {
+                failures.push(format!(
+                "{cmd_name} ({category:?}): Signature name \"{sig_name}\" is not equal to the command name \"{cmd_name}\""
+            ));
+            }
+        }
+
+        assert!(
+            failures.is_empty(),
+            "Name mismatch:\n{}",
+            failures.join("\n")
+        );
+    }
+
+    #[test]
+    fn commands_declare_input_output_types() {
+        let ctx = get_engine_state();
+        let decls = ctx.get_decls_sorted(true);
+        let mut failures = Vec::new();
+
+        for (_, decl_id) in decls {
+            let cmd = ctx.get_decl(decl_id);
+            let sig_name = cmd.signature().name;
+            let category = cmd.signature().category;
+
+            if matches!(category, Category::Removed) {
+                // Deprecated/Removed commands don't have to conform
+                continue;
+            }
+
+            if cmd.signature().input_output_types.is_empty() {
+                failures.push(format!(
+                    "{sig_name} ({category:?}): No pipeline input/output type signatures found"
+                ));
+            }
+        }
+
+        assert!(
+            failures.is_empty(),
+            "Command missing type annotations:\n{}",
+            failures.join("\n")
+        );
+    }
+
+    #[test]
+    fn no_search_term_duplicates() {
+        let ctx = get_engine_state();
+        let decls = ctx.get_decls_sorted(true);
+        let mut failures = Vec::new();
+
+        for (name_bytes, decl_id) in decls {
+            let cmd = ctx.get_decl(decl_id);
+            let cmd_name = String::from_utf8_lossy(&name_bytes);
+            let search_terms = cmd.search_terms();
+            let category = cmd.signature().category;
+
+            for search_term in search_terms {
+                if cmd_name.contains(search_term) {
+                    failures.push(format!("{cmd_name} ({category:?}): Search term \"{search_term}\" is substring of command name \"{cmd_name}\""));
+                }
+            }
+        }
+
+        assert!(
+            failures.is_empty(),
+            "Duplication in search terms:\n{}",
+            failures.join("\n")
+        );
+    }
+
+    #[test]
+    fn description_end_period() {
+        let ctx = get_engine_state();
+        let decls = ctx.get_decls_sorted(true);
+        let mut failures = Vec::new();
+
+        for (name_bytes, decl_id) in decls {
+            let cmd = ctx.get_decl(decl_id);
+            let cmd_name = String::from_utf8_lossy(&name_bytes);
+            let description = cmd.description();
+
+            if !description.ends_with('.') {
+                failures.push(format!("{cmd_name}: \"{description}\""));
+            }
+        }
+
+        assert!(
+            failures.is_empty(),
+            "Command description does not end with a period:\n{}",
+            failures.join("\n")
+        );
+    }
+
+    #[test]
+    fn description_start_uppercase() {
+        let ctx = get_engine_state();
+        let decls = ctx.get_decls_sorted(true);
+        let mut failures = Vec::new();
+
+        for (name_bytes, decl_id) in decls {
+            let cmd = ctx.get_decl(decl_id);
+            let cmd_name = String::from_utf8_lossy(&name_bytes);
+            let description = cmd.description();
+
+            // Check lowercase to allow description to contain syntax like:
+            //
+            // "`$env.FOO = ...`"
+            if description.starts_with(|u: char| u.is_lowercase()) {
+                failures.push(format!("{cmd_name}: \"{description}\""));
+            }
+        }
+
+        assert!(
+            failures.is_empty(),
+            "Command description does not start with an uppercase letter:\n{}",
+            failures.join("\n")
+        );
+    }
+}
diff --git a/src/main.rs b/src/main.rs
index 6beae6de77..0862529039 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,5 @@
 mod command;
+mod command_context;
 mod config_files;
 mod ide;
 mod logger;
@@ -25,9 +26,8 @@ use nu_engine::convert_env_values;
 use nu_lsp::LanguageServer;
 use nu_path::canonicalize_with;
 use nu_protocol::{
-    engine::{EngineState, Stack},
-    record, report_shell_error, ByteStream, Config, IntoValue, PipelineData, ShellError, Span,
-    Spanned, Type, Value,
+    engine::Stack, record, report_shell_error, ByteStream, Config, IntoValue, PipelineData,
+    ShellError, Span, Spanned, Type, Value,
 };
 use nu_std::load_standard_library;
 use nu_utils::perf;
@@ -35,16 +35,6 @@ use run::{run_commands, run_file, run_repl};
 use signals::ctrlc_protection;
 use std::{path::PathBuf, str::FromStr, sync::Arc};
 
-fn get_engine_state() -> EngineState {
-    let engine_state = nu_cmd_lang::create_default_context();
-    #[cfg(feature = "plugin")]
-    let engine_state = nu_cmd_plugin::add_plugin_command_context(engine_state);
-    let engine_state = nu_command::add_shell_command_context(engine_state);
-    let engine_state = nu_cmd_extra::add_extra_command_context(engine_state);
-    let engine_state = nu_cli::add_cli_context(engine_state);
-    nu_explore::add_explore_context(engine_state)
-}
-
 /// Get the directory where the Nushell executable is located.
 fn current_exe_directory() -> PathBuf {
     let mut path = std::env::current_exe().expect("current_exe() should succeed");
@@ -76,7 +66,7 @@ fn main() -> Result<()> {
         miette_hook(x);
     }));
 
-    let mut engine_state = get_engine_state();
+    let mut engine_state = command_context::get_engine_state();
 
     // Get the current working directory from the environment.
     let init_cwd = current_dir_from_environment();

From 442df9e39c7672f1bd7accd96041a926dafc92f3 Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Tue, 11 Feb 2025 15:34:51 +0300
Subject: [PATCH 1041/1072] Custom command attributes (#14906)

# Description
Add custom command attributes.

- Attributes are placed before a command definition and start with a `@`
character.
- Attribute invocations consist of const command call. The command's
name must start with "attr ", but this prefix is not used in the
invocation.
- A command named `attr example` is invoked as an attribute as
`@example`
-   Several built-in attribute commands are provided as part of this PR
    -   `attr example`: Attaches an example to the commands help text
        ```nushell
        # Double numbers
        @example "double an int"  { 5 | double }   --result 10
        @example "double a float" { 0.5 | double } --result 1.0
        def double []: [number -> number] {
            $in * 2
        }
        ```
    -   `attr search-terms`: Adds search terms to a command
    -   ~`attr env`: Equivalent to using `def --env`~
- ~`attr wrapped`: Equivalent to using `def --wrapped`~ shelved for
later discussion
    -   several testing related attributes in `std/testing`
- If an attribute has no internal/special purpose, it's stored as
command metadata that can be obtained with `scope commands`.
- This allows having attributes like `@test` which can be used by test
runners.
-   Used the `@example` attribute for `std` examples.
-   Updated the std tests and test runner to use `@test` attributes
-   Added completions for attributes

# User-Facing Changes
Users can add examples to their own command definitions, and add other
arbitrary attributes.

# Tests + Formatting

- :green_circle: toolkit fmt
- :green_circle: toolkit clippy
- :green_circle: toolkit test
- :green_circle: toolkit test stdlib

# After Submitting
- Add documentation about the attribute syntax and built-in attributes
- `help attributes`

---------

Co-authored-by: 132ikl <132@ikl.sh>
---
 .../src/completions/attribute_completions.rs  |  97 +++
 crates/nu-cli/src/completions/completer.rs    |  38 +-
 crates/nu-cli/src/completions/mod.rs          |   2 +
 crates/nu-cli/src/syntax_highlight.rs         |  23 +
 crates/nu-cli/tests/completions/mod.rs        |  38 ++
 .../src/core_commands/attr/example.rs         | 159 +++++
 .../nu-cmd-lang/src/core_commands/attr/mod.rs |   5 +
 .../src/core_commands/attr/search_terms.rs    |  57 ++
 crates/nu-cmd-lang/src/core_commands/mod.rs   |   2 +
 crates/nu-cmd-lang/src/default_context.rs     |   2 +
 crates/nu-engine/src/compile/expression.rs    |   8 +
 crates/nu-engine/src/scope.rs                 |  15 +
 crates/nu-parser/src/flatten.rs               |   6 +
 crates/nu-parser/src/known_external.rs        |  14 +
 crates/nu-parser/src/lite_parser.rs           | 498 ++++++++-------
 crates/nu-parser/src/parse_keywords.rs        | 574 ++++++++++++------
 crates/nu-parser/src/parse_patterns.rs        |   2 +-
 crates/nu-parser/src/parser.rs                | 237 ++++++--
 crates/nu-parser/tests/test_parser.rs         | 386 ++++++++----
 crates/nu-protocol/src/ast/attribute.rs       |  13 +
 crates/nu-protocol/src/ast/expr.rs            |   6 +-
 crates/nu-protocol/src/ast/expression.rs      |   3 +
 crates/nu-protocol/src/ast/mod.rs             |   2 +
 crates/nu-protocol/src/ast/traverse.rs        |  11 +
 crates/nu-protocol/src/debugger/profiler.rs   |   1 +
 crates/nu-protocol/src/engine/command.rs      |   8 +-
 crates/nu-protocol/src/errors/parse_error.rs  |   8 +
 crates/nu-protocol/src/eval_base.rs           |   1 +
 crates/nu-protocol/src/signature.rs           |  55 +-
 crates/nu-std/src/lib.rs                      |   5 +
 crates/nu-std/std/assert/mod.nu               | 144 ++---
 crates/nu-std/std/bench/mod.nu                |  51 +-
 crates/nu-std/std/dt/mod.nu                   |  40 +-
 crates/nu-std/std/iter/mod.nu                 | 141 ++---
 crates/nu-std/std/mod.nu                      |   1 +
 crates/nu-std/std/testing/mod.nu              |  17 +
 crates/nu-std/std/util/mod.nu                 |  51 +-
 crates/nu-std/testing.nu                      |  52 +-
 .../tests/logger_tests/test_basic_commands.nu |  21 +-
 .../tests/logger_tests/test_log_custom.nu     |   7 +-
 .../logger_tests/test_log_format_flag.nu      |   3 +-
 .../tests/logger_tests/test_logger_env.nu     |  11 +-
 crates/nu-std/tests/test_asserts.nu           |  23 +-
 crates/nu-std/tests/test_dirs.nu              |  15 +-
 crates/nu-std/tests/test_dt.nu                |  17 +-
 crates/nu-std/tests/test_formats.nu           |  35 +-
 crates/nu-std/tests/test_help.nu              |   5 +-
 crates/nu-std/tests/test_iter.nu              |  17 +-
 crates/nu-std/tests/test_prelude.nu           |   3 +-
 crates/nu-std/tests/test_setup_teardown.nu    |  11 +-
 crates/nu-std/tests/test_std_formats.nu       |  35 +-
 crates/nu-std/tests/test_std_postload.nu      |   5 +-
 crates/nu-std/tests/test_std_preload.nu       |   5 +-
 crates/nu-std/tests/test_std_util.nu          |   7 +-
 crates/nu-std/tests/test_util.nu              |   7 +-
 crates/nu-std/tests/test_xml.nu               |   9 +-
 crates/nuon/src/from.rs                       |   6 +
 57 files changed, 2028 insertions(+), 987 deletions(-)
 create mode 100644 crates/nu-cli/src/completions/attribute_completions.rs
 create mode 100644 crates/nu-cmd-lang/src/core_commands/attr/example.rs
 create mode 100644 crates/nu-cmd-lang/src/core_commands/attr/mod.rs
 create mode 100644 crates/nu-cmd-lang/src/core_commands/attr/search_terms.rs
 create mode 100644 crates/nu-protocol/src/ast/attribute.rs
 create mode 100644 crates/nu-std/std/testing/mod.nu

diff --git a/crates/nu-cli/src/completions/attribute_completions.rs b/crates/nu-cli/src/completions/attribute_completions.rs
new file mode 100644
index 0000000000..237b5bcbb3
--- /dev/null
+++ b/crates/nu-cli/src/completions/attribute_completions.rs
@@ -0,0 +1,97 @@
+use super::{completion_options::NuMatcher, SemanticSuggestion};
+use crate::{
+    completions::{Completer, CompletionOptions},
+    SuggestionKind,
+};
+use nu_protocol::{
+    engine::{Stack, StateWorkingSet},
+    Span,
+};
+use reedline::Suggestion;
+
+pub struct AttributeCompletion;
+pub struct AttributableCompletion;
+
+impl Completer for AttributeCompletion {
+    fn fetch(
+        &mut self,
+        working_set: &StateWorkingSet,
+        _stack: &Stack,
+        _prefix: &[u8],
+        span: Span,
+        offset: usize,
+        _pos: usize,
+        options: &CompletionOptions,
+    ) -> Vec<SemanticSuggestion> {
+        let partial = working_set.get_span_contents(span);
+        let mut matcher = NuMatcher::new(String::from_utf8_lossy(partial), options.clone());
+
+        let attr_commands = working_set.find_commands_by_predicate(
+            |s| {
+                s.strip_prefix(b"attr ")
+                    .map(String::from_utf8_lossy)
+                    .is_some_and(|name| matcher.matches(&name))
+            },
+            true,
+        );
+
+        for (name, desc, ty) in attr_commands {
+            let name = name.strip_prefix(b"attr ").unwrap_or(&name);
+            matcher.add_semantic_suggestion(SemanticSuggestion {
+                suggestion: Suggestion {
+                    value: String::from_utf8_lossy(name).into_owned(),
+                    description: desc,
+                    style: None,
+                    extra: None,
+                    span: reedline::Span {
+                        start: span.start - offset,
+                        end: span.end - offset,
+                    },
+                    append_whitespace: false,
+                },
+                kind: Some(SuggestionKind::Command(ty)),
+            });
+        }
+
+        matcher.results()
+    }
+}
+
+impl Completer for AttributableCompletion {
+    fn fetch(
+        &mut self,
+        working_set: &StateWorkingSet,
+        _stack: &Stack,
+        _prefix: &[u8],
+        span: Span,
+        offset: usize,
+        _pos: usize,
+        options: &CompletionOptions,
+    ) -> Vec<SemanticSuggestion> {
+        let partial = working_set.get_span_contents(span);
+        let mut matcher = NuMatcher::new(String::from_utf8_lossy(partial), options.clone());
+
+        for s in ["def", "extern", "export def", "export extern"] {
+            let decl_id = working_set
+                .find_decl(s.as_bytes())
+                .expect("internal error, builtin declaration not found");
+            let cmd = working_set.get_decl(decl_id);
+            matcher.add_semantic_suggestion(SemanticSuggestion {
+                suggestion: Suggestion {
+                    value: cmd.name().into(),
+                    description: Some(cmd.description().into()),
+                    style: None,
+                    extra: None,
+                    span: reedline::Span {
+                        start: span.start - offset,
+                        end: span.end - offset,
+                    },
+                    append_whitespace: false,
+                },
+                kind: Some(SuggestionKind::Command(cmd.command_type())),
+            });
+        }
+
+        matcher.results()
+    }
+}
diff --git a/crates/nu-cli/src/completions/completer.rs b/crates/nu-cli/src/completions/completer.rs
index 9fe5d05001..dc89df1906 100644
--- a/crates/nu-cli/src/completions/completer.rs
+++ b/crates/nu-cli/src/completions/completer.rs
@@ -1,7 +1,7 @@
 use crate::completions::{
-    CellPathCompletion, CommandCompletion, Completer, CompletionOptions, CustomCompletion,
-    DirectoryCompletion, DotNuCompletion, FileCompletion, FlagCompletion, OperatorCompletion,
-    VariableCompletion,
+    AttributableCompletion, AttributeCompletion, CellPathCompletion, CommandCompletion, Completer,
+    CompletionOptions, CustomCompletion, DirectoryCompletion, DotNuCompletion, FileCompletion,
+    FlagCompletion, OperatorCompletion, VariableCompletion,
 };
 use log::debug;
 use nu_color_config::{color_record_to_nustyle, lookup_ansi_color_style};
@@ -63,6 +63,15 @@ fn find_pipeline_element_by_position<'a>(
             .map(FindMapResult::Found)
             .unwrap_or_default(),
         Expr::Var(_) => FindMapResult::Found(expr),
+        Expr::AttributeBlock(ab) => ab
+            .attributes
+            .iter()
+            .map(|attr| &attr.expr)
+            .chain(Some(ab.item.as_ref()))
+            .find_map(|expr| expr.find_map(working_set, &closure))
+            .or(Some(expr))
+            .map(FindMapResult::Found)
+            .unwrap_or_default(),
         _ => FindMapResult::Continue,
     }
 }
@@ -297,6 +306,29 @@ impl NuCompleter {
                 let index = pos - span.start;
                 let prefix = &current_span[..index];
 
+                if let Expr::AttributeBlock(ab) = &element_expression.expr {
+                    let last_attr = ab.attributes.last().expect("at least one attribute");
+                    if let Expr::Garbage = last_attr.expr.expr {
+                        return self.process_completion(
+                            &mut AttributeCompletion,
+                            &working_set,
+                            prefix,
+                            new_span,
+                            fake_offset,
+                            pos,
+                        );
+                    } else {
+                        return self.process_completion(
+                            &mut AttributableCompletion,
+                            &working_set,
+                            prefix,
+                            new_span,
+                            fake_offset,
+                            pos,
+                        );
+                    }
+                }
+
                 // Flags completion
                 if prefix.starts_with(b"-") {
                     // Try to complete flag internally
diff --git a/crates/nu-cli/src/completions/mod.rs b/crates/nu-cli/src/completions/mod.rs
index 6122657b28..5f16338bc2 100644
--- a/crates/nu-cli/src/completions/mod.rs
+++ b/crates/nu-cli/src/completions/mod.rs
@@ -1,3 +1,4 @@
+mod attribute_completions;
 mod base;
 mod cell_path_completions;
 mod command_completions;
@@ -12,6 +13,7 @@ mod flag_completions;
 mod operator_completions;
 mod variable_completions;
 
+pub use attribute_completions::{AttributableCompletion, AttributeCompletion};
 pub use base::{Completer, SemanticSuggestion, SuggestionKind};
 pub use cell_path_completions::CellPathCompletion;
 pub use command_completions::CommandCompletion;
diff --git a/crates/nu-cli/src/syntax_highlight.rs b/crates/nu-cli/src/syntax_highlight.rs
index b8f7abe0c5..283a06f97e 100644
--- a/crates/nu-cli/src/syntax_highlight.rs
+++ b/crates/nu-cli/src/syntax_highlight.rs
@@ -309,6 +309,7 @@ fn find_matching_block_end_in_expr(
             .unwrap_or(expression.span.start);
 
         return match &expression.expr {
+            // TODO: Can't these be handled with an `_ => None` branch? Refactor
             Expr::Bool(_) => None,
             Expr::Int(_) => None,
             Expr::Float(_) => None,
@@ -335,6 +336,28 @@ fn find_matching_block_end_in_expr(
             Expr::Nothing => None,
             Expr::Garbage => None,
 
+            Expr::AttributeBlock(ab) => ab
+                .attributes
+                .iter()
+                .find_map(|attr| {
+                    find_matching_block_end_in_expr(
+                        line,
+                        working_set,
+                        &attr.expr,
+                        global_span_offset,
+                        global_cursor_offset,
+                    )
+                })
+                .or_else(|| {
+                    find_matching_block_end_in_expr(
+                        line,
+                        working_set,
+                        &ab.item,
+                        global_span_offset,
+                        global_cursor_offset,
+                    )
+                }),
+
             Expr::Table(table) => {
                 if expr_last == global_cursor_offset {
                     // cursor is at table end
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index fdea8b521e..3e07a6e266 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -1213,6 +1213,44 @@ fn flag_completions() {
     match_suggestions(&expected, &suggestions);
 }
 
+#[test]
+fn attribute_completions() {
+    // Create a new engine
+    let (_, _, engine, stack) = new_engine();
+
+    // Instantiate a new completer
+    let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
+    // Test completions for the 'ls' flags
+    let suggestions = completer.complete("@", 1);
+
+    // Only checking for the builtins and not the std attributes
+    let expected: Vec<String> = vec!["example".into(), "search-terms".into()];
+
+    // Match results
+    match_suggestions(&expected, &suggestions);
+}
+
+#[test]
+fn attributable_completions() {
+    // Create a new engine
+    let (_, _, engine, stack) = new_engine();
+
+    // Instantiate a new completer
+    let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
+    // Test completions for the 'ls' flags
+    let suggestions = completer.complete("@example; ", 10);
+
+    let expected: Vec<String> = vec![
+        "def".into(),
+        "export def".into(),
+        "export extern".into(),
+        "extern".into(),
+    ];
+
+    // Match results
+    match_suggestions(&expected, &suggestions);
+}
+
 #[test]
 fn folder_with_directorycompletions() {
     // Create a new engine
diff --git a/crates/nu-cmd-lang/src/core_commands/attr/example.rs b/crates/nu-cmd-lang/src/core_commands/attr/example.rs
new file mode 100644
index 0000000000..a12f83d746
--- /dev/null
+++ b/crates/nu-cmd-lang/src/core_commands/attr/example.rs
@@ -0,0 +1,159 @@
+use nu_engine::command_prelude::*;
+
+#[derive(Clone)]
+pub struct AttrExample;
+
+impl Command for AttrExample {
+    fn name(&self) -> &str {
+        "attr example"
+    }
+
+    // TODO: When const closure are available, switch to using them for the `example` argument
+    // rather than a block. That should remove the need for `requires_ast_for_arguments` to be true
+    fn signature(&self) -> Signature {
+        Signature::build("attr example")
+            .input_output_types(vec![(
+                Type::Nothing,
+                Type::Record(
+                    [
+                        ("description".into(), Type::String),
+                        ("example".into(), Type::String),
+                    ]
+                    .into(),
+                ),
+            )])
+            .allow_variants_without_examples(true)
+            .required(
+                "description",
+                SyntaxShape::String,
+                "Description of the example.",
+            )
+            .required(
+                "example",
+                SyntaxShape::OneOf(vec![SyntaxShape::Block, SyntaxShape::String]),
+                "Example code snippet.",
+            )
+            .named(
+                "result",
+                SyntaxShape::Any,
+                "Expected output of example.",
+                None,
+            )
+            .category(Category::Core)
+    }
+
+    fn description(&self) -> &str {
+        "Attribute for adding examples to custom commands."
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let description: Spanned<String> = call.req(engine_state, stack, 0)?;
+        let result: Option<Value> = call.get_flag(engine_state, stack, "result")?;
+
+        let example_string: Result<String, _> = call.req(engine_state, stack, 1);
+        let example_expr = call
+            .positional_nth(stack, 1)
+            .ok_or(ShellError::MissingParameter {
+                param_name: "example".into(),
+                span: call.head,
+            })?;
+
+        let working_set = StateWorkingSet::new(engine_state);
+
+        attr_example_impl(
+            example_expr,
+            example_string,
+            &working_set,
+            call,
+            description,
+            result,
+        )
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let description: Spanned<String> = call.req_const(working_set, 0)?;
+        let result: Option<Value> = call.get_flag_const(working_set, "result")?;
+
+        let example_string: Result<String, _> = call.req_const(working_set, 1);
+        let example_expr =
+            call.assert_ast_call()?
+                .positional_nth(1)
+                .ok_or(ShellError::MissingParameter {
+                    param_name: "example".into(),
+                    span: call.head,
+                })?;
+
+        attr_example_impl(
+            example_expr,
+            example_string,
+            working_set,
+            call,
+            description,
+            result,
+        )
+    }
+
+    fn is_const(&self) -> bool {
+        true
+    }
+
+    fn requires_ast_for_arguments(&self) -> bool {
+        true
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![Example {
+            description: "Add examples to custom command",
+            example: r###"# Double numbers
+    @example "double an int" { 2 | double } --result 4
+    @example "double a float" { 0.25 | double } --result 0.5
+    def double []: [number -> number] { $in * 2 }"###,
+            result: None,
+        }]
+    }
+}
+
+fn attr_example_impl(
+    example_expr: &nu_protocol::ast::Expression,
+    example_string: Result<String, ShellError>,
+    working_set: &StateWorkingSet<'_>,
+    call: &Call<'_>,
+    description: Spanned<String>,
+    result: Option<Value>,
+) -> Result<PipelineData, ShellError> {
+    let example_content = match example_expr.as_block() {
+        Some(block_id) => {
+            let block = working_set.get_block(block_id);
+            let contents =
+                working_set.get_span_contents(block.span.expect("a block must have a span"));
+            let contents = contents
+                .strip_prefix(b"{")
+                .and_then(|x| x.strip_suffix(b"}"))
+                .unwrap_or(contents)
+                .trim_ascii();
+            String::from_utf8_lossy(contents).into_owned()
+        }
+        None => example_string?,
+    };
+
+    let mut rec = record! {
+        "description" => Value::string(description.item, description.span),
+        "example" => Value::string(example_content, example_expr.span),
+    };
+    if let Some(result) = result {
+        rec.push("result", result);
+    }
+
+    Ok(Value::record(rec, call.head).into_pipeline_data())
+}
diff --git a/crates/nu-cmd-lang/src/core_commands/attr/mod.rs b/crates/nu-cmd-lang/src/core_commands/attr/mod.rs
new file mode 100644
index 0000000000..0d2a0e6d3c
--- /dev/null
+++ b/crates/nu-cmd-lang/src/core_commands/attr/mod.rs
@@ -0,0 +1,5 @@
+mod example;
+mod search_terms;
+
+pub use example::AttrExample;
+pub use search_terms::AttrSearchTerms;
diff --git a/crates/nu-cmd-lang/src/core_commands/attr/search_terms.rs b/crates/nu-cmd-lang/src/core_commands/attr/search_terms.rs
new file mode 100644
index 0000000000..767bbead50
--- /dev/null
+++ b/crates/nu-cmd-lang/src/core_commands/attr/search_terms.rs
@@ -0,0 +1,57 @@
+use nu_engine::command_prelude::*;
+
+#[derive(Clone)]
+pub struct AttrSearchTerms;
+
+impl Command for AttrSearchTerms {
+    fn name(&self) -> &str {
+        "attr search-terms"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("attr search-terms")
+            .input_output_type(Type::Nothing, Type::list(Type::String))
+            .allow_variants_without_examples(true)
+            .rest("terms", SyntaxShape::String, "Search terms.")
+            .category(Category::Core)
+    }
+
+    fn description(&self) -> &str {
+        "Attribute for adding search terms to custom commands."
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let args = call.rest(engine_state, stack, 0)?;
+        Ok(Value::list(args, call.head).into_pipeline_data())
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let args = call.rest_const(working_set, 0)?;
+        Ok(Value::list(args, call.head).into_pipeline_data())
+    }
+
+    fn is_const(&self) -> bool {
+        true
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![Example {
+            description: "Add search terms to a custom command",
+            example: r###"# Double numbers
+    @search-terms multiply times
+    def double []: [number -> number] { $in * 2 }"###,
+            result: None,
+        }]
+    }
+}
diff --git a/crates/nu-cmd-lang/src/core_commands/mod.rs b/crates/nu-cmd-lang/src/core_commands/mod.rs
index 2b865641e8..7ec42ea379 100644
--- a/crates/nu-cmd-lang/src/core_commands/mod.rs
+++ b/crates/nu-cmd-lang/src/core_commands/mod.rs
@@ -1,4 +1,5 @@
 mod alias;
+mod attr;
 mod break_;
 mod collect;
 mod const_;
@@ -35,6 +36,7 @@ mod version;
 mod while_;
 
 pub use alias::Alias;
+pub use attr::*;
 pub use break_::Break;
 pub use collect::Collect;
 pub use const_::Const;
diff --git a/crates/nu-cmd-lang/src/default_context.rs b/crates/nu-cmd-lang/src/default_context.rs
index 43fa0ddbf5..f98f7ee39a 100644
--- a/crates/nu-cmd-lang/src/default_context.rs
+++ b/crates/nu-cmd-lang/src/default_context.rs
@@ -16,6 +16,8 @@ pub fn create_default_context() -> EngineState {
         // Core
         bind_command! {
             Alias,
+            AttrExample,
+            AttrSearchTerms,
             Break,
             Collect,
             Const,
diff --git a/crates/nu-engine/src/compile/expression.rs b/crates/nu-engine/src/compile/expression.rs
index 0badb76b45..ac5496f289 100644
--- a/crates/nu-engine/src/compile/expression.rs
+++ b/crates/nu-engine/src/compile/expression.rs
@@ -72,6 +72,14 @@ pub(crate) fn compile_expression(
     };
 
     match &expr.expr {
+        Expr::AttributeBlock(ab) => compile_expression(
+            working_set,
+            builder,
+            &ab.item,
+            redirect_modes,
+            in_reg,
+            out_reg,
+        ),
         Expr::Bool(b) => lit(builder, Literal::Bool(*b)),
         Expr::Int(i) => lit(builder, Literal::Int(*i)),
         Expr::Float(f) => lit(builder, Literal::Float(*f)),
diff --git a/crates/nu-engine/src/scope.rs b/crates/nu-engine/src/scope.rs
index 2e21ac3242..5109612b16 100644
--- a/crates/nu-engine/src/scope.rs
+++ b/crates/nu-engine/src/scope.rs
@@ -106,12 +106,27 @@ impl<'e, 's> ScopeData<'e, 's> {
                     })
                     .collect();
 
+                let attributes = decl
+                    .attributes()
+                    .into_iter()
+                    .map(|(name, value)| {
+                        Value::record(
+                            record! {
+                                "name" => Value::string(name, span),
+                                "value" => value,
+                            },
+                            span,
+                        )
+                    })
+                    .collect();
+
                 let record = record! {
                     "name" => Value::string(String::from_utf8_lossy(command_name), span),
                     "category" => Value::string(signature.category.to_string(), span),
                     "signatures" => self.collect_signatures(&signature, span),
                     "description" => Value::string(decl.description(), span),
                     "examples" => Value::list(examples, span),
+                    "attributes" => Value::list(attributes, span),
                     "type" => Value::string(decl.command_type().to_string(), span),
                     "is_sub" => Value::bool(decl.is_sub(), span),
                     "is_const" => Value::bool(decl.is_const(), span),
diff --git a/crates/nu-parser/src/flatten.rs b/crates/nu-parser/src/flatten.rs
index 731ab52984..46cf901f9a 100644
--- a/crates/nu-parser/src/flatten.rs
+++ b/crates/nu-parser/src/flatten.rs
@@ -189,6 +189,12 @@ fn flatten_expression_into(
     }
 
     match &expr.expr {
+        Expr::AttributeBlock(ab) => {
+            for attr in &ab.attributes {
+                flatten_expression_into(working_set, &attr.expr, output);
+            }
+            flatten_expression_into(working_set, &ab.item, output);
+        }
         Expr::BinaryOp(lhs, op, rhs) => {
             flatten_expression_into(working_set, lhs, output);
             flatten_expression_into(working_set, op, output);
diff --git a/crates/nu-parser/src/known_external.rs b/crates/nu-parser/src/known_external.rs
index 6cf61fff91..2c341152a2 100644
--- a/crates/nu-parser/src/known_external.rs
+++ b/crates/nu-parser/src/known_external.rs
@@ -3,11 +3,14 @@ use nu_protocol::{
     ast::{self, Expr, Expression},
     engine::{self, CallImpl, CommandType, UNKNOWN_SPAN_ID},
     ir::{self, DataSlice},
+    CustomExample,
 };
 
 #[derive(Clone)]
 pub struct KnownExternal {
     pub signature: Box<Signature>,
+    pub attributes: Vec<(String, Value)>,
+    pub examples: Vec<CustomExample>,
 }
 
 impl Command for KnownExternal {
@@ -84,6 +87,17 @@ impl Command for KnownExternal {
             }
         }
     }
+
+    fn attributes(&self) -> Vec<(String, Value)> {
+        self.attributes.clone()
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        self.examples
+            .iter()
+            .map(CustomExample::to_example)
+            .collect()
+    }
 }
 
 /// Transform the args from an `ast::Call` onto a `run-external` call
diff --git a/crates/nu-parser/src/lite_parser.rs b/crates/nu-parser/src/lite_parser.rs
index 1a89271af2..f199375579 100644
--- a/crates/nu-parser/src/lite_parser.rs
+++ b/crates/nu-parser/src/lite_parser.rs
@@ -3,7 +3,7 @@
 
 use crate::{Token, TokenContents};
 use itertools::{Either, Itertools};
-use nu_protocol::{ast::RedirectionSource, ParseError, Span};
+use nu_protocol::{ast::RedirectionSource, engine::StateWorkingSet, ParseError, Span};
 use std::mem;
 
 #[derive(Debug, Clone, Copy)]
@@ -65,6 +65,8 @@ pub struct LiteCommand {
     pub comments: Vec<Span>,
     pub parts: Vec<Span>,
     pub redirection: Option<LiteRedirection>,
+    /// one past the end indices of attributes
+    pub attribute_idx: Vec<usize>,
 }
 
 impl LiteCommand {
@@ -146,6 +148,25 @@ impl LiteCommand {
             )
             .sorted_unstable_by_key(|a| (a.start, a.end))
     }
+
+    pub fn command_parts(&self) -> &[Span] {
+        let command_start = self.attribute_idx.last().copied().unwrap_or(0);
+        &self.parts[command_start..]
+    }
+
+    pub fn has_attributes(&self) -> bool {
+        !self.attribute_idx.is_empty()
+    }
+
+    pub fn attribute_commands(&'_ self) -> impl Iterator<Item = LiteCommand> + '_ {
+        std::iter::once(0)
+            .chain(self.attribute_idx.iter().copied())
+            .tuple_windows()
+            .map(|(s, e)| LiteCommand {
+                parts: self.parts[s..e].to_owned(),
+                ..Default::default()
+            })
+    }
 }
 
 #[derive(Debug, Clone, Default)]
@@ -188,7 +209,17 @@ fn last_non_comment_token(tokens: &[Token], cur_idx: usize) -> Option<TokenConte
     None
 }
 
-pub fn lite_parse(tokens: &[Token]) -> (LiteBlock, Option<ParseError>) {
+#[derive(PartialEq, Eq)]
+enum Mode {
+    Assignment,
+    Attribute,
+    Normal,
+}
+
+pub fn lite_parse(
+    tokens: &[Token],
+    working_set: &StateWorkingSet,
+) -> (LiteBlock, Option<ParseError>) {
     if tokens.is_empty() {
         return (LiteBlock::default(), None);
     }
@@ -200,220 +231,263 @@ pub fn lite_parse(tokens: &[Token]) -> (LiteBlock, Option<ParseError>) {
     let mut last_token = TokenContents::Eol;
     let mut file_redirection = None;
     let mut curr_comment: Option<Vec<Span>> = None;
-    let mut is_assignment = false;
+    let mut mode = Mode::Normal;
     let mut error = None;
 
     for (idx, token) in tokens.iter().enumerate() {
-        if is_assignment {
-            match &token.contents {
-                // Consume until semicolon or terminating EOL. Assignments absorb pipelines and
-                // redirections.
-                TokenContents::Eol => {
-                    // Handle `[Command] [Pipe] ([Comment] | [Eol])+ [Command]`
-                    //
-                    // `[Eol]` branch checks if previous token is `[Pipe]` to construct pipeline
-                    // and so `[Comment] | [Eol]` should be ignore to make it work
-                    let actual_token = last_non_comment_token(tokens, idx);
-                    if actual_token != Some(TokenContents::Pipe) {
-                        is_assignment = false;
-                        pipeline.push(&mut command);
-                        block.push(&mut pipeline);
+        match mode {
+            Mode::Attribute => {
+                match &token.contents {
+                    // Consume until semicolon or terminating EOL. Attributes can't contain pipelines or redirections.
+                    TokenContents::Eol | TokenContents::Semicolon => {
+                        command.attribute_idx.push(command.parts.len());
+                        mode = Mode::Normal;
+                        if matches!(last_token, TokenContents::Eol | TokenContents::Semicolon) {
+                            // Clear out the comment as we're entering a new comment
+                            curr_comment = None;
+                            pipeline.push(&mut command);
+                            block.push(&mut pipeline);
+                        }
                     }
-
-                    if last_token == TokenContents::Eol {
-                        // Clear out the comment as we're entering a new comment
-                        curr_comment = None;
-                    }
-                }
-                TokenContents::Semicolon => {
-                    is_assignment = false;
-                    pipeline.push(&mut command);
-                    block.push(&mut pipeline);
-                }
-                TokenContents::Comment => {
-                    command.comments.push(token.span);
-                    curr_comment = None;
-                }
-                _ => command.push(token.span),
-            }
-        } else if let Some((source, append, span)) = file_redirection.take() {
-            match &token.contents {
-                TokenContents::PipePipe => {
-                    error = error.or(Some(ParseError::ShellOrOr(token.span)));
-                    command.push(span);
-                    command.push(token.span);
-                }
-                TokenContents::Item => {
-                    let target = LiteRedirectionTarget::File {
-                        connector: span,
-                        file: token.span,
-                        append,
-                    };
-                    if let Err(err) = command.try_add_redirection(source, target) {
-                        error = error.or(Some(err));
-                        command.push(span);
-                        command.push(token.span)
-                    }
-                }
-                TokenContents::AssignmentOperator => {
-                    error = error.or(Some(ParseError::Expected("redirection target", token.span)));
-                    command.push(span);
-                    command.push(token.span);
-                }
-                TokenContents::OutGreaterThan
-                | TokenContents::OutGreaterGreaterThan
-                | TokenContents::ErrGreaterThan
-                | TokenContents::ErrGreaterGreaterThan
-                | TokenContents::OutErrGreaterThan
-                | TokenContents::OutErrGreaterGreaterThan => {
-                    error = error.or(Some(ParseError::Expected("redirection target", token.span)));
-                    command.push(span);
-                    command.push(token.span);
-                }
-                TokenContents::Pipe
-                | TokenContents::ErrGreaterPipe
-                | TokenContents::OutErrGreaterPipe => {
-                    error = error.or(Some(ParseError::Expected("redirection target", token.span)));
-                    command.push(span);
-                    pipeline.push(&mut command);
-                    command.pipe = Some(token.span);
-                }
-                TokenContents::Eol => {
-                    error = error.or(Some(ParseError::Expected("redirection target", token.span)));
-                    command.push(span);
-                    pipeline.push(&mut command);
-                }
-                TokenContents::Semicolon => {
-                    error = error.or(Some(ParseError::Expected("redirection target", token.span)));
-                    command.push(span);
-                    pipeline.push(&mut command);
-                    block.push(&mut pipeline);
-                }
-                TokenContents::Comment => {
-                    error = error.or(Some(ParseError::Expected("redirection target", span)));
-                    command.push(span);
-                    command.comments.push(token.span);
-                    curr_comment = None;
-                }
-            }
-        } else {
-            match &token.contents {
-                TokenContents::PipePipe => {
-                    error = error.or(Some(ParseError::ShellOrOr(token.span)));
-                    command.push(token.span);
-                }
-                TokenContents::Item => {
-                    // This is commented out to preserve old parser behavior,
-                    // but we should probably error here.
-                    //
-                    // if element.redirection.is_some() {
-                    //     error = error.or(Some(ParseError::LabeledError(
-                    //         "Unexpected positional".into(),
-                    //         "cannot add positional arguments after output redirection".into(),
-                    //         token.span,
-                    //     )));
-                    // }
-                    //
-                    // For example, this is currently allowed: ^echo thing o> out.txt extra_arg
-
-                    // If we have a comment, go ahead and attach it
-                    if let Some(curr_comment) = curr_comment.take() {
-                        command.comments = curr_comment;
-                    }
-                    command.push(token.span);
-                }
-                TokenContents::AssignmentOperator => {
-                    // When in assignment mode, we'll just consume pipes or redirections as part of
-                    // the command.
-                    is_assignment = true;
-                    if let Some(curr_comment) = curr_comment.take() {
-                        command.comments = curr_comment;
-                    }
-                    command.push(token.span);
-                }
-                TokenContents::OutGreaterThan => {
-                    error = error.or(command.check_accepts_redirection(token.span));
-                    file_redirection = Some((RedirectionSource::Stdout, false, token.span));
-                }
-                TokenContents::OutGreaterGreaterThan => {
-                    error = error.or(command.check_accepts_redirection(token.span));
-                    file_redirection = Some((RedirectionSource::Stdout, true, token.span));
-                }
-                TokenContents::ErrGreaterThan => {
-                    error = error.or(command.check_accepts_redirection(token.span));
-                    file_redirection = Some((RedirectionSource::Stderr, false, token.span));
-                }
-                TokenContents::ErrGreaterGreaterThan => {
-                    error = error.or(command.check_accepts_redirection(token.span));
-                    file_redirection = Some((RedirectionSource::Stderr, true, token.span));
-                }
-                TokenContents::OutErrGreaterThan => {
-                    error = error.or(command.check_accepts_redirection(token.span));
-                    file_redirection =
-                        Some((RedirectionSource::StdoutAndStderr, false, token.span));
-                }
-                TokenContents::OutErrGreaterGreaterThan => {
-                    error = error.or(command.check_accepts_redirection(token.span));
-                    file_redirection = Some((RedirectionSource::StdoutAndStderr, true, token.span));
-                }
-                TokenContents::ErrGreaterPipe => {
-                    let target = LiteRedirectionTarget::Pipe {
-                        connector: token.span,
-                    };
-                    if let Err(err) = command.try_add_redirection(RedirectionSource::Stderr, target)
-                    {
-                        error = error.or(Some(err));
-                    }
-                    pipeline.push(&mut command);
-                    command.pipe = Some(token.span);
-                }
-                TokenContents::OutErrGreaterPipe => {
-                    let target = LiteRedirectionTarget::Pipe {
-                        connector: token.span,
-                    };
-                    if let Err(err) =
-                        command.try_add_redirection(RedirectionSource::StdoutAndStderr, target)
-                    {
-                        error = error.or(Some(err));
-                    }
-                    pipeline.push(&mut command);
-                    command.pipe = Some(token.span);
-                }
-                TokenContents::Pipe => {
-                    pipeline.push(&mut command);
-                    command.pipe = Some(token.span);
-                }
-                TokenContents::Eol => {
-                    // Handle `[Command] [Pipe] ([Comment] | [Eol])+ [Command]`
-                    //
-                    // `[Eol]` branch checks if previous token is `[Pipe]` to construct pipeline
-                    // and so `[Comment] | [Eol]` should be ignore to make it work
-                    let actual_token = last_non_comment_token(tokens, idx);
-                    if actual_token != Some(TokenContents::Pipe) {
-                        pipeline.push(&mut command);
-                        block.push(&mut pipeline);
-                    }
-
-                    if last_token == TokenContents::Eol {
-                        // Clear out the comment as we're entering a new comment
-                        curr_comment = None;
-                    }
-                }
-                TokenContents::Semicolon => {
-                    pipeline.push(&mut command);
-                    block.push(&mut pipeline);
-                }
-                TokenContents::Comment => {
-                    // Comment is beside something
-                    if last_token != TokenContents::Eol {
+                    TokenContents::Comment => {
                         command.comments.push(token.span);
                         curr_comment = None;
-                    } else {
-                        // Comment precedes something
-                        if let Some(curr_comment) = &mut curr_comment {
-                            curr_comment.push(token.span);
-                        } else {
-                            curr_comment = Some(vec![token.span]);
+                    }
+                    _ => command.push(token.span),
+                }
+            }
+            Mode::Assignment => {
+                match &token.contents {
+                    // Consume until semicolon or terminating EOL. Assignments absorb pipelines and
+                    // redirections.
+                    TokenContents::Eol => {
+                        // Handle `[Command] [Pipe] ([Comment] | [Eol])+ [Command]`
+                        //
+                        // `[Eol]` branch checks if previous token is `[Pipe]` to construct pipeline
+                        // and so `[Comment] | [Eol]` should be ignore to make it work
+                        let actual_token = last_non_comment_token(tokens, idx);
+                        if actual_token != Some(TokenContents::Pipe) {
+                            mode = Mode::Normal;
+                            pipeline.push(&mut command);
+                            block.push(&mut pipeline);
+                        }
+
+                        if last_token == TokenContents::Eol {
+                            // Clear out the comment as we're entering a new comment
+                            curr_comment = None;
+                        }
+                    }
+                    TokenContents::Semicolon => {
+                        mode = Mode::Normal;
+                        pipeline.push(&mut command);
+                        block.push(&mut pipeline);
+                    }
+                    TokenContents::Comment => {
+                        command.comments.push(token.span);
+                        curr_comment = None;
+                    }
+                    _ => command.push(token.span),
+                }
+            }
+            Mode::Normal => {
+                if let Some((source, append, span)) = file_redirection.take() {
+                    match &token.contents {
+                        TokenContents::PipePipe => {
+                            error = error.or(Some(ParseError::ShellOrOr(token.span)));
+                            command.push(span);
+                            command.push(token.span);
+                        }
+                        TokenContents::Item => {
+                            let target = LiteRedirectionTarget::File {
+                                connector: span,
+                                file: token.span,
+                                append,
+                            };
+                            if let Err(err) = command.try_add_redirection(source, target) {
+                                error = error.or(Some(err));
+                                command.push(span);
+                                command.push(token.span)
+                            }
+                        }
+                        TokenContents::AssignmentOperator => {
+                            error = error
+                                .or(Some(ParseError::Expected("redirection target", token.span)));
+                            command.push(span);
+                            command.push(token.span);
+                        }
+                        TokenContents::OutGreaterThan
+                        | TokenContents::OutGreaterGreaterThan
+                        | TokenContents::ErrGreaterThan
+                        | TokenContents::ErrGreaterGreaterThan
+                        | TokenContents::OutErrGreaterThan
+                        | TokenContents::OutErrGreaterGreaterThan => {
+                            error = error
+                                .or(Some(ParseError::Expected("redirection target", token.span)));
+                            command.push(span);
+                            command.push(token.span);
+                        }
+                        TokenContents::Pipe
+                        | TokenContents::ErrGreaterPipe
+                        | TokenContents::OutErrGreaterPipe => {
+                            error = error
+                                .or(Some(ParseError::Expected("redirection target", token.span)));
+                            command.push(span);
+                            pipeline.push(&mut command);
+                            command.pipe = Some(token.span);
+                        }
+                        TokenContents::Eol => {
+                            error = error
+                                .or(Some(ParseError::Expected("redirection target", token.span)));
+                            command.push(span);
+                            pipeline.push(&mut command);
+                        }
+                        TokenContents::Semicolon => {
+                            error = error
+                                .or(Some(ParseError::Expected("redirection target", token.span)));
+                            command.push(span);
+                            pipeline.push(&mut command);
+                            block.push(&mut pipeline);
+                        }
+                        TokenContents::Comment => {
+                            error =
+                                error.or(Some(ParseError::Expected("redirection target", span)));
+                            command.push(span);
+                            command.comments.push(token.span);
+                            curr_comment = None;
+                        }
+                    }
+                } else {
+                    match &token.contents {
+                        TokenContents::PipePipe => {
+                            error = error.or(Some(ParseError::ShellOrOr(token.span)));
+                            command.push(token.span);
+                        }
+                        TokenContents::Item => {
+                            // FIXME: This is commented out to preserve old parser behavior,
+                            // but we should probably error here.
+                            //
+                            // if element.redirection.is_some() {
+                            //     error = error.or(Some(ParseError::LabeledError(
+                            //         "Unexpected positional".into(),
+                            //         "cannot add positional arguments after output redirection".into(),
+                            //         token.span,
+                            //     )));
+                            // }
+                            //
+                            // For example, this is currently allowed: ^echo thing o> out.txt extra_arg
+
+                            if working_set.get_span_contents(token.span).starts_with(b"@") {
+                                if matches!(
+                                    last_token,
+                                    TokenContents::Eol | TokenContents::Semicolon
+                                ) {
+                                    mode = Mode::Attribute;
+                                }
+                                command.push(token.span);
+                            } else {
+                                // If we have a comment, go ahead and attach it
+                                if let Some(curr_comment) = curr_comment.take() {
+                                    command.comments = curr_comment;
+                                }
+                                command.push(token.span);
+                            }
+                        }
+                        TokenContents::AssignmentOperator => {
+                            // When in assignment mode, we'll just consume pipes or redirections as part of
+                            // the command.
+                            mode = Mode::Assignment;
+                            if let Some(curr_comment) = curr_comment.take() {
+                                command.comments = curr_comment;
+                            }
+                            command.push(token.span);
+                        }
+                        TokenContents::OutGreaterThan => {
+                            error = error.or(command.check_accepts_redirection(token.span));
+                            file_redirection = Some((RedirectionSource::Stdout, false, token.span));
+                        }
+                        TokenContents::OutGreaterGreaterThan => {
+                            error = error.or(command.check_accepts_redirection(token.span));
+                            file_redirection = Some((RedirectionSource::Stdout, true, token.span));
+                        }
+                        TokenContents::ErrGreaterThan => {
+                            error = error.or(command.check_accepts_redirection(token.span));
+                            file_redirection = Some((RedirectionSource::Stderr, false, token.span));
+                        }
+                        TokenContents::ErrGreaterGreaterThan => {
+                            error = error.or(command.check_accepts_redirection(token.span));
+                            file_redirection = Some((RedirectionSource::Stderr, true, token.span));
+                        }
+                        TokenContents::OutErrGreaterThan => {
+                            error = error.or(command.check_accepts_redirection(token.span));
+                            file_redirection =
+                                Some((RedirectionSource::StdoutAndStderr, false, token.span));
+                        }
+                        TokenContents::OutErrGreaterGreaterThan => {
+                            error = error.or(command.check_accepts_redirection(token.span));
+                            file_redirection =
+                                Some((RedirectionSource::StdoutAndStderr, true, token.span));
+                        }
+                        TokenContents::ErrGreaterPipe => {
+                            let target = LiteRedirectionTarget::Pipe {
+                                connector: token.span,
+                            };
+                            if let Err(err) =
+                                command.try_add_redirection(RedirectionSource::Stderr, target)
+                            {
+                                error = error.or(Some(err));
+                            }
+                            pipeline.push(&mut command);
+                            command.pipe = Some(token.span);
+                        }
+                        TokenContents::OutErrGreaterPipe => {
+                            let target = LiteRedirectionTarget::Pipe {
+                                connector: token.span,
+                            };
+                            if let Err(err) = command
+                                .try_add_redirection(RedirectionSource::StdoutAndStderr, target)
+                            {
+                                error = error.or(Some(err));
+                            }
+                            pipeline.push(&mut command);
+                            command.pipe = Some(token.span);
+                        }
+                        TokenContents::Pipe => {
+                            pipeline.push(&mut command);
+                            command.pipe = Some(token.span);
+                        }
+                        TokenContents::Eol => {
+                            // Handle `[Command] [Pipe] ([Comment] | [Eol])+ [Command]`
+                            //
+                            // `[Eol]` branch checks if previous token is `[Pipe]` to construct pipeline
+                            // and so `[Comment] | [Eol]` should be ignore to make it work
+                            let actual_token = last_non_comment_token(tokens, idx);
+                            if actual_token != Some(TokenContents::Pipe) {
+                                pipeline.push(&mut command);
+                                block.push(&mut pipeline);
+                            }
+
+                            if last_token == TokenContents::Eol {
+                                // Clear out the comment as we're entering a new comment
+                                curr_comment = None;
+                            }
+                        }
+                        TokenContents::Semicolon => {
+                            pipeline.push(&mut command);
+                            block.push(&mut pipeline);
+                        }
+                        TokenContents::Comment => {
+                            // Comment is beside something
+                            if last_token != TokenContents::Eol {
+                                command.comments.push(token.span);
+                                curr_comment = None;
+                            } else {
+                                // Comment precedes something
+                                if let Some(curr_comment) = &mut curr_comment {
+                                    curr_comment.push(token.span);
+                                } else {
+                                    curr_comment = Some(vec![token.span]);
+                                }
+                            }
                         }
                     }
                 }
@@ -428,6 +502,10 @@ pub fn lite_parse(tokens: &[Token]) -> (LiteBlock, Option<ParseError>) {
         error = error.or(Some(ParseError::Expected("redirection target", span)));
     }
 
+    if let Mode::Attribute = mode {
+        command.attribute_idx.push(command.parts.len());
+    }
+
     pipeline.push(&mut command);
     block.push(&mut pipeline);
 
diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index cbd26e1a1f..7396b4ea93 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -1,7 +1,7 @@
 use crate::{
     exportable::Exportable,
     parse_block,
-    parser::{parse_redirection, redirecting_builtin_error},
+    parser::{parse_attribute, parse_redirection, redirecting_builtin_error},
     type_check::{check_block_input_output, type_compatible},
 };
 use itertools::Itertools;
@@ -9,14 +9,14 @@ use log::trace;
 use nu_path::canonicalize_with;
 use nu_protocol::{
     ast::{
-        Argument, Block, Call, Expr, Expression, ImportPattern, ImportPatternHead,
+        Argument, AttributeBlock, Block, Call, Expr, Expression, ImportPattern, ImportPatternHead,
         ImportPatternMember, Pipeline, PipelineElement,
     },
     engine::{StateWorkingSet, DEFAULT_OVERLAY_NAME},
     eval_const::eval_constant,
     parser_path::ParserPath,
-    Alias, BlockId, DeclId, Module, ModuleId, ParseError, PositionalArg, ResolvedImportPattern,
-    Span, Spanned, SyntaxShape, Type, Value, VarId,
+    Alias, BlockId, CustomExample, DeclId, FromValue, Module, ModuleId, ParseError, PositionalArg,
+    ResolvedImportPattern, ShellError, Span, Spanned, SyntaxShape, Type, Value, VarId,
 };
 use std::{
     collections::{HashMap, HashSet},
@@ -363,16 +363,166 @@ fn verify_not_reserved_variable_name(working_set: &mut StateWorkingSet, name: &s
     }
 }
 
+// This is meant for parsing attribute blocks without an accompanying `def` or `extern`. It's
+// necessary to provide consistent syntax highlighting, completions, and helpful errors
+//
+// There is no need to run the const evaluation here
+pub fn parse_attribute_block(
+    working_set: &mut StateWorkingSet,
+    lite_command: &LiteCommand,
+) -> Pipeline {
+    let attributes = lite_command
+        .attribute_commands()
+        .map(|cmd| parse_attribute(working_set, &cmd).0)
+        .collect::<Vec<_>>();
+
+    let last_attr_span = attributes
+        .last()
+        .expect("Attribute block must contain at least one attribute")
+        .expr
+        .span;
+
+    working_set.error(ParseError::AttributeRequiresDefinition(last_attr_span));
+    let cmd_span = if lite_command.command_parts().is_empty() {
+        last_attr_span.past()
+    } else {
+        Span::concat(lite_command.command_parts())
+    };
+    let cmd_expr = garbage(working_set, cmd_span);
+    let ty = cmd_expr.ty.clone();
+
+    let attr_block_span = Span::merge_many(
+        attributes
+            .first()
+            .map(|x| x.expr.span)
+            .into_iter()
+            .chain(Some(cmd_span)),
+    );
+
+    Pipeline::from_vec(vec![Expression::new(
+        working_set,
+        Expr::AttributeBlock(AttributeBlock {
+            attributes,
+            item: Box::new(cmd_expr),
+        }),
+        attr_block_span,
+        ty,
+    )])
+}
+
 // Returns also the parsed command name and ID
 pub fn parse_def(
     working_set: &mut StateWorkingSet,
     lite_command: &LiteCommand,
     module_name: Option<&[u8]>,
 ) -> (Pipeline, Option<(Vec<u8>, DeclId)>) {
-    let spans = &lite_command.parts[..];
+    let mut attributes = vec![];
+    let mut attribute_vals = vec![];
+
+    for attr_cmd in lite_command.attribute_commands() {
+        let (attr, name) = parse_attribute(working_set, &attr_cmd);
+        if let Some(name) = name {
+            let val = eval_constant(working_set, &attr.expr);
+            match val {
+                Ok(val) => attribute_vals.push((name, val)),
+                Err(e) => working_set.error(e.wrap(working_set, attr.expr.span)),
+            }
+        }
+        attributes.push(attr);
+    }
+
+    let (expr, decl) = parse_def_inner(working_set, attribute_vals, lite_command, module_name);
+
+    let ty = expr.ty.clone();
+
+    let attr_block_span = Span::merge_many(
+        attributes
+            .first()
+            .map(|x| x.expr.span)
+            .into_iter()
+            .chain(Some(expr.span)),
+    );
+
+    let expr = if attributes.is_empty() {
+        expr
+    } else {
+        Expression::new(
+            working_set,
+            Expr::AttributeBlock(AttributeBlock {
+                attributes,
+                item: Box::new(expr),
+            }),
+            attr_block_span,
+            ty,
+        )
+    };
+
+    (Pipeline::from_vec(vec![expr]), decl)
+}
+
+pub fn parse_extern(
+    working_set: &mut StateWorkingSet,
+    lite_command: &LiteCommand,
+    module_name: Option<&[u8]>,
+) -> Pipeline {
+    let mut attributes = vec![];
+    let mut attribute_vals = vec![];
+
+    for attr_cmd in lite_command.attribute_commands() {
+        let (attr, name) = parse_attribute(working_set, &attr_cmd);
+        if let Some(name) = name {
+            let val = eval_constant(working_set, &attr.expr);
+            match val {
+                Ok(val) => attribute_vals.push((name, val)),
+                Err(e) => working_set.error(e.wrap(working_set, attr.expr.span)),
+            }
+        }
+        attributes.push(attr);
+    }
+
+    let expr = parse_extern_inner(working_set, attribute_vals, lite_command, module_name);
+
+    let ty = expr.ty.clone();
+
+    let attr_block_span = Span::merge_many(
+        attributes
+            .first()
+            .map(|x| x.expr.span)
+            .into_iter()
+            .chain(Some(expr.span)),
+    );
+
+    let expr = if attributes.is_empty() {
+        expr
+    } else {
+        Expression::new(
+            working_set,
+            Expr::AttributeBlock(AttributeBlock {
+                attributes,
+                item: Box::new(expr),
+            }),
+            attr_block_span,
+            ty,
+        )
+    };
+
+    Pipeline::from_vec(vec![expr])
+}
+
+// Returns also the parsed command name and ID
+fn parse_def_inner(
+    working_set: &mut StateWorkingSet,
+    attributes: Vec<(String, Value)>,
+    lite_command: &LiteCommand,
+    module_name: Option<&[u8]>,
+) -> (Expression, Option<(Vec<u8>, DeclId)>) {
+    let spans = lite_command.command_parts();
 
     let (desc, extra_desc) = working_set.build_desc(&lite_command.comments);
 
+    let (attribute_vals, examples, search_terms) =
+        handle_special_attributes(attributes, working_set);
+
     // Checking that the function is used with the correct name
     // Maybe this is not necessary but it is a sanity check
     // Note: "export def" is treated the same as "def"
@@ -390,11 +540,11 @@ pub fn parse_def(
             "internal error: Wrong call name for def function".into(),
             Span::concat(spans),
         ));
-        return (garbage_pipeline(working_set, spans), None);
+        return (garbage(working_set, Span::concat(spans)), None);
     }
     if let Some(redirection) = lite_command.redirection.as_ref() {
         working_set.error(redirecting_builtin_error("def", redirection));
-        return (garbage_pipeline(working_set, spans), None);
+        return (garbage(working_set, Span::concat(spans)), None);
     }
 
     // Parsing the spans and checking that they match the register signature
@@ -406,7 +556,7 @@ pub fn parse_def(
                 "internal error: def declaration not found".into(),
                 Span::concat(spans),
             ));
-            return (garbage_pipeline(working_set, spans), None);
+            return (garbage(working_set, Span::concat(spans)), None);
         }
         Some(decl_id) => {
             working_set.enter_scope();
@@ -430,7 +580,7 @@ pub fn parse_def(
                     String::from_utf8_lossy(&def_call).as_ref(),
                 ) {
                     working_set.error(err);
-                    return (garbage_pipeline(working_set, spans), None);
+                    return (garbage(working_set, Span::concat(spans)), None);
                 }
             }
 
@@ -474,17 +624,12 @@ pub fn parse_def(
             working_set.parse_errors.append(&mut new_errors);
 
             let Ok(is_help) = has_flag_const(working_set, &call, "help") else {
-                return (garbage_pipeline(working_set, spans), None);
+                return (garbage(working_set, Span::concat(spans)), None);
             };
 
             if starting_error_count != working_set.parse_errors.len() || is_help {
                 return (
-                    Pipeline::from_vec(vec![Expression::new(
-                        working_set,
-                        Expr::Call(call),
-                        call_span,
-                        output,
-                    )]),
+                    Expression::new(working_set, Expr::Call(call), call_span, output),
                     None,
                 );
             }
@@ -494,10 +639,10 @@ pub fn parse_def(
     };
 
     let Ok(has_env) = has_flag_const(working_set, &call, "env") else {
-        return (garbage_pipeline(working_set, spans), None);
+        return (garbage(working_set, Span::concat(spans)), None);
     };
     let Ok(has_wrapped) = has_flag_const(working_set, &call, "wrapped") else {
-        return (garbage_pipeline(working_set, spans), None);
+        return (garbage(working_set, Span::concat(spans)), None);
     };
 
     // All positional arguments must be in the call positional vector by this point
@@ -517,12 +662,7 @@ pub fn parse_def(
                     name_expr_span,
                 ));
                 return (
-                    Pipeline::from_vec(vec![Expression::new(
-                        working_set,
-                        Expr::Call(call),
-                        call_span,
-                        Type::Any,
-                    )]),
+                    Expression::new(working_set, Expr::Call(call), call_span, Type::Any),
                     None,
                 );
             }
@@ -534,7 +674,7 @@ pub fn parse_def(
             "Could not get string from string expression".into(),
             name_expr.span,
         ));
-        return (garbage_pipeline(working_set, spans), None);
+        return (garbage(working_set, Span::concat(spans)), None);
     };
 
     let mut result = None;
@@ -567,12 +707,7 @@ pub fn parse_def(
                             format!("...rest-like positional argument used in 'def --wrapped' supports only strings. Change the type annotation of ...{} to 'string'.", &rest.name)));
 
                         return (
-                            Pipeline::from_vec(vec![Expression::new(
-                                working_set,
-                                Expr::Call(call),
-                                call_span,
-                                Type::Any,
-                            )]),
+                            Expression::new(working_set, Expr::Call(call), call_span, Type::Any),
                             result,
                         );
                     }
@@ -581,12 +716,7 @@ pub fn parse_def(
                 working_set.error(ParseError::MissingPositional("...rest-like positional argument".to_string(), name_expr.span, "def --wrapped must have a ...rest-like positional argument. Add '...rest: string' to the command's signature.".to_string()));
 
                 return (
-                    Pipeline::from_vec(vec![Expression::new(
-                        working_set,
-                        Expr::Call(call),
-                        call_span,
-                        Type::Any,
-                    )]),
+                    Expression::new(working_set, Expr::Call(call), call_span, Type::Any),
                     result,
                 );
             }
@@ -602,8 +732,11 @@ pub fn parse_def(
             signature.description = desc;
             signature.extra_description = extra_desc;
             signature.allows_unknown_args = has_wrapped;
+            signature.search_terms = search_terms;
 
-            *declaration = signature.clone().into_block_command(block_id);
+            *declaration = signature
+                .clone()
+                .into_block_command(block_id, attribute_vals, examples);
 
             let block = working_set.get_block_mut(block_id);
             block.signature = signature;
@@ -637,25 +770,25 @@ pub fn parse_def(
     working_set.merge_predecl(name.as_bytes());
 
     (
-        Pipeline::from_vec(vec![Expression::new(
-            working_set,
-            Expr::Call(call),
-            call_span,
-            Type::Any,
-        )]),
+        Expression::new(working_set, Expr::Call(call), call_span, Type::Any),
         result,
     )
 }
 
-pub fn parse_extern(
+fn parse_extern_inner(
     working_set: &mut StateWorkingSet,
+    attributes: Vec<(String, Value)>,
     lite_command: &LiteCommand,
     module_name: Option<&[u8]>,
-) -> Pipeline {
-    let spans = &lite_command.parts;
+) -> Expression {
+    let spans = lite_command.command_parts();
+    let concat_span = Span::concat(spans);
 
     let (description, extra_description) = working_set.build_desc(&lite_command.comments);
 
+    let (attribute_vals, examples, search_terms) =
+        handle_special_attributes(attributes, working_set);
+
     // Checking that the function is used with the correct name
     // Maybe this is not necessary but it is a sanity check
 
@@ -672,11 +805,11 @@ pub fn parse_extern(
             "internal error: Wrong call name for extern command".into(),
             Span::concat(spans),
         ));
-        return garbage_pipeline(working_set, spans);
+        return garbage(working_set, concat_span);
     }
     if let Some(redirection) = lite_command.redirection.as_ref() {
         working_set.error(redirecting_builtin_error("extern", redirection));
-        return garbage_pipeline(working_set, spans);
+        return garbage(working_set, concat_span);
     }
 
     // Parsing the spans and checking that they match the register signature
@@ -688,7 +821,7 @@ pub fn parse_extern(
                 "internal error: def declaration not found".into(),
                 Span::concat(spans),
             ));
-            return garbage_pipeline(working_set, spans);
+            return garbage(working_set, concat_span);
         }
         Some(decl_id) => {
             working_set.enter_scope();
@@ -702,7 +835,7 @@ pub fn parse_extern(
                     String::from_utf8_lossy(&extern_call).as_ref(),
                 ) {
                     working_set.error(err);
-                    return garbage_pipeline(working_set, spans);
+                    return garbage(working_set, concat_span);
                 }
             }
 
@@ -736,12 +869,7 @@ pub fn parse_extern(
                         "main".to_string(),
                         name_expr_span,
                     ));
-                    return Pipeline::from_vec(vec![Expression::new(
-                        working_set,
-                        Expr::Call(call),
-                        call_span,
-                        Type::Any,
-                    )]);
+                    return Expression::new(working_set, Expr::Call(call), call_span, Type::Any);
                 }
             }
 
@@ -761,6 +889,7 @@ pub fn parse_extern(
                 signature.name = external_name;
                 signature.description = description;
                 signature.extra_description = extra_description;
+                signature.search_terms = search_terms;
                 signature.allows_unknown_args = true;
 
                 if let Some(block_id) = body.and_then(|x| x.as_block()) {
@@ -770,7 +899,11 @@ pub fn parse_extern(
                             name_expr.span,
                         ));
                     } else {
-                        *declaration = signature.clone().into_block_command(block_id);
+                        *declaration = signature.clone().into_block_command(
+                            block_id,
+                            attribute_vals,
+                            examples,
+                        );
 
                         working_set.get_block_mut(block_id).signature = signature;
                     }
@@ -785,7 +918,11 @@ pub fn parse_extern(
                         );
                     }
 
-                    let decl = KnownExternal { signature };
+                    let decl = KnownExternal {
+                        signature,
+                        attributes: attribute_vals,
+                        examples,
+                    };
 
                     *declaration = Box::new(decl);
                 }
@@ -807,12 +944,54 @@ pub fn parse_extern(
         }
     }
 
-    Pipeline::from_vec(vec![Expression::new(
-        working_set,
-        Expr::Call(call),
-        call_span,
-        Type::Any,
-    )])
+    Expression::new(working_set, Expr::Call(call), call_span, Type::Any)
+}
+
+fn handle_special_attributes(
+    attributes: Vec<(String, Value)>,
+    working_set: &mut StateWorkingSet<'_>,
+) -> (Vec<(String, Value)>, Vec<CustomExample>, Vec<String>) {
+    let mut attribute_vals = vec![];
+    let mut examples = vec![];
+    let mut search_terms = vec![];
+
+    for (name, value) in attributes {
+        let val_span = value.span();
+        match name.as_str() {
+            "example" => match CustomExample::from_value(value) {
+                Ok(example) => examples.push(example),
+                Err(_) => {
+                    let e = ShellError::GenericError {
+                        error: "nu::shell::invalid_example".into(),
+                        msg: "Value couldn't be converted to an example".into(),
+                        span: Some(val_span),
+                        help: Some("Is `attr example` shadowed?".into()),
+                        inner: vec![],
+                    };
+                    working_set.error(e.wrap(working_set, val_span));
+                }
+            },
+            "search-terms" => match <Vec<String>>::from_value(value) {
+                Ok(mut terms) => {
+                    search_terms.append(&mut terms);
+                }
+                Err(_) => {
+                    let e = ShellError::GenericError {
+                        error: "nu::shell::invalid_search_terms".into(),
+                        msg: "Value couldn't be converted to search-terms".into(),
+                        span: Some(val_span),
+                        help: Some("Is `attr search-terms` shadowed?".into()),
+                        inner: vec![],
+                    };
+                    working_set.error(e.wrap(working_set, val_span));
+                }
+            },
+            _ => {
+                attribute_vals.push((name, value));
+            }
+        }
+    }
+    (attribute_vals, examples, search_terms)
 }
 
 fn check_alias_name<'a>(working_set: &mut StateWorkingSet, spans: &'a [Span]) -> Option<&'a Span> {
@@ -1126,8 +1305,9 @@ pub fn parse_export_in_block(
 ) -> Pipeline {
     let call_span = Span::concat(&lite_command.parts);
 
-    let full_name = if lite_command.parts.len() > 1 {
-        let sub = working_set.get_span_contents(lite_command.parts[1]);
+    let parts = lite_command.command_parts();
+    let full_name = if parts.len() > 1 {
+        let sub = working_set.get_span_contents(parts[1]);
         match sub {
             b"alias" => "export alias",
             b"def" => "export def",
@@ -1146,64 +1326,62 @@ pub fn parse_export_in_block(
         return garbage_pipeline(working_set, &lite_command.parts);
     }
 
-    if let Some(decl_id) = working_set.find_decl(full_name.as_bytes()) {
-        let starting_error_count = working_set.parse_errors.len();
-        let ParsedInternalCall { call, output, .. } = parse_internal_call(
-            working_set,
-            if full_name == "export" {
-                lite_command.parts[0]
-            } else {
-                Span::concat(&lite_command.parts[0..2])
-            },
-            if full_name == "export" {
-                &lite_command.parts[1..]
-            } else {
-                &lite_command.parts[2..]
-            },
-            decl_id,
-        );
-        // don't need errors generated by parse_internal_call
-        // further error will be generated by detail `parse_xxx` function.
-        working_set.parse_errors.truncate(starting_error_count);
+    // No need to care for this when attributes are present, parse_attribute_block will throw the
+    // necessary error
+    if !lite_command.has_attributes() {
+        if let Some(decl_id) = working_set.find_decl(full_name.as_bytes()) {
+            let starting_error_count = working_set.parse_errors.len();
+            let ParsedInternalCall { call, output, .. } = parse_internal_call(
+                working_set,
+                if full_name == "export" {
+                    parts[0]
+                } else {
+                    Span::concat(&parts[0..2])
+                },
+                if full_name == "export" {
+                    &parts[1..]
+                } else {
+                    &parts[2..]
+                },
+                decl_id,
+            );
+            // don't need errors generated by parse_internal_call
+            // further error will be generated by detail `parse_xxx` function.
+            working_set.parse_errors.truncate(starting_error_count);
 
-        let decl = working_set.get_decl(decl_id);
-        check_call(working_set, call_span, &decl.signature(), &call);
-        let Ok(is_help) = has_flag_const(working_set, &call, "help") else {
+            let decl = working_set.get_decl(decl_id);
+            check_call(working_set, call_span, &decl.signature(), &call);
+            let Ok(is_help) = has_flag_const(working_set, &call, "help") else {
+                return garbage_pipeline(working_set, &lite_command.parts);
+            };
+
+            if starting_error_count != working_set.parse_errors.len() || is_help {
+                return Pipeline::from_vec(vec![Expression::new(
+                    working_set,
+                    Expr::Call(call),
+                    call_span,
+                    output,
+                )]);
+            }
+        } else {
+            working_set.error(ParseError::UnknownState(
+                format!("internal error: '{full_name}' declaration not found",),
+                Span::concat(&lite_command.parts),
+            ));
             return garbage_pipeline(working_set, &lite_command.parts);
         };
-
-        if starting_error_count != working_set.parse_errors.len() || is_help {
-            return Pipeline::from_vec(vec![Expression::new(
-                working_set,
-                Expr::Call(call),
-                call_span,
-                output,
-            )]);
-        }
-    } else {
-        working_set.error(ParseError::UnknownState(
-            format!("internal error: '{full_name}' declaration not found",),
-            Span::concat(&lite_command.parts),
-        ));
-        return garbage_pipeline(working_set, &lite_command.parts);
-    };
-
-    if full_name == "export" {
-        // export by itself is meaningless
-        working_set.error(ParseError::UnexpectedKeyword(
-            "export".into(),
-            lite_command.parts[0],
-        ));
-        return garbage_pipeline(working_set, &lite_command.parts);
     }
 
     match full_name {
-        "export alias" => parse_alias(working_set, lite_command, None),
+        // `parse_def` and `parse_extern` work both with and without attributes
         "export def" => parse_def(working_set, lite_command, None).0,
+        "export extern" => parse_extern(working_set, lite_command, None),
+        // Other definitions can't have attributes, so we handle attributes here with parse_attribute_block
+        _ if lite_command.has_attributes() => parse_attribute_block(working_set, lite_command),
+        "export alias" => parse_alias(working_set, lite_command, None),
         "export const" => parse_const(working_set, &lite_command.parts[1..]).0,
         "export use" => parse_use(working_set, lite_command, None).0,
         "export module" => parse_module(working_set, lite_command, None).0,
-        "export extern" => parse_extern(working_set, lite_command, None),
         _ => {
             working_set.error(ParseError::UnexpectedKeyword(
                 full_name.into(),
@@ -1222,7 +1400,7 @@ pub fn parse_export_in_module(
     module_name: &[u8],
     parent_module: &mut Module,
 ) -> (Pipeline, Vec<Exportable>) {
-    let spans = &lite_command.parts[..];
+    let spans = lite_command.command_parts();
 
     let export_span = if let Some(sp) = spans.first() {
         if working_set.get_span_contents(*sp) != b"export" {
@@ -1259,18 +1437,15 @@ pub fn parse_export_in_module(
         parser_info: HashMap::new(),
     });
 
+    let mut out_pipeline = None;
+
     let exportables = if let Some(kw_span) = spans.get(1) {
         let kw_name = working_set.get_span_contents(*kw_span);
         match kw_name {
+            // `parse_def` and `parse_extern` work both with and without attributes
             b"def" => {
-                let lite_command = LiteCommand {
-                    comments: lite_command.comments.clone(),
-                    parts: spans[1..].to_vec(),
-                    pipe: lite_command.pipe,
-                    redirection: lite_command.redirection.clone(),
-                };
-                let (pipeline, cmd_result) =
-                    parse_def(working_set, &lite_command, Some(module_name));
+                let (mut pipeline, cmd_result) =
+                    parse_def(working_set, lite_command, Some(module_name));
 
                 let mut result = vec![];
 
@@ -1292,30 +1467,37 @@ pub fn parse_export_in_module(
                 };
 
                 // Trying to warp the 'def' call into the 'export def' in a very clumsy way
-                if let Some(Expr::Call(def_call)) = pipeline.elements.first().map(|e| &e.expr.expr)
-                {
-                    call.clone_from(def_call);
-                    call.head = Span::concat(&spans[0..=1]);
-                    call.decl_id = export_def_decl_id;
-                } else {
+                // TODO: Rather than this, handle `export def` correctly in `parse_def`
+                'warp: {
+                    match pipeline.elements.first_mut().map(|e| &mut e.expr.expr) {
+                        Some(Expr::Call(def_call)) => {
+                            def_call.head = Span::concat(&spans[0..=1]);
+                            def_call.decl_id = export_def_decl_id;
+                            break 'warp;
+                        }
+                        Some(Expr::AttributeBlock(ab)) => {
+                            if let Expr::Call(def_call) = &mut ab.item.expr {
+                                def_call.head = Span::concat(&spans[0..=1]);
+                                def_call.decl_id = export_def_decl_id;
+                                break 'warp;
+                            }
+                        }
+                        _ => {}
+                    };
+
                     working_set.error(ParseError::InternalError(
                         "unexpected output from parsing a definition".into(),
                         Span::concat(&spans[1..]),
                     ));
-                };
+                }
 
+                out_pipeline = Some(pipeline);
                 result
             }
             b"extern" => {
-                let lite_command = LiteCommand {
-                    comments: lite_command.comments.clone(),
-                    parts: spans[1..].to_vec(),
-                    pipe: lite_command.pipe,
-                    redirection: lite_command.redirection.clone(),
-                };
                 let extern_name = [b"export ", kw_name].concat();
 
-                let pipeline = parse_extern(working_set, &lite_command, Some(module_name));
+                let mut pipeline = parse_extern(working_set, lite_command, Some(module_name));
 
                 let export_def_decl_id = if let Some(id) = working_set.find_decl(&extern_name) {
                     id
@@ -1327,18 +1509,30 @@ pub fn parse_export_in_module(
                     return (garbage_pipeline(working_set, spans), vec![]);
                 };
 
-                // Trying to warp the 'def' call into the 'export def' in a very clumsy way
-                if let Some(Expr::Call(def_call)) = pipeline.elements.first().map(|e| &e.expr.expr)
-                {
-                    call.clone_from(def_call);
-                    call.head = Span::concat(&spans[0..=1]);
-                    call.decl_id = export_def_decl_id;
-                } else {
+                // Trying to warp the 'extern' call into the 'export extern' in a very clumsy way
+                // TODO: Rather than this, handle `export extern` correctly in `parse_extern`
+                'warp: {
+                    match pipeline.elements.first_mut().map(|e| &mut e.expr.expr) {
+                        Some(Expr::Call(def_call)) => {
+                            def_call.head = Span::concat(&spans[0..=1]);
+                            def_call.decl_id = export_def_decl_id;
+                            break 'warp;
+                        }
+                        Some(Expr::AttributeBlock(ab)) => {
+                            if let Expr::Call(def_call) = &mut ab.item.expr {
+                                def_call.head = Span::concat(&spans[0..=1]);
+                                def_call.decl_id = export_def_decl_id;
+                                break 'warp;
+                            }
+                        }
+                        _ => {}
+                    };
+
                     working_set.error(ParseError::InternalError(
                         "unexpected output from parsing a definition".into(),
                         Span::concat(&spans[1..]),
                     ));
-                };
+                }
 
                 let mut result = vec![];
 
@@ -1360,14 +1554,21 @@ pub fn parse_export_in_module(
                     ));
                 }
 
+                out_pipeline = Some(pipeline);
                 result
             }
+            // Other definitions can't have attributes, so we handle attributes here with parse_attribute_block
+            _ if lite_command.has_attributes() => {
+                out_pipeline = Some(parse_attribute_block(working_set, lite_command));
+                vec![]
+            }
             b"alias" => {
                 let lite_command = LiteCommand {
                     comments: lite_command.comments.clone(),
                     parts: spans[1..].to_vec(),
                     pipe: lite_command.pipe,
                     redirection: lite_command.redirection.clone(),
+                    attribute_idx: vec![],
                 };
                 let pipeline = parse_alias(working_set, &lite_command, Some(module_name));
 
@@ -1425,6 +1626,7 @@ pub fn parse_export_in_module(
                     parts: spans[1..].to_vec(),
                     pipe: lite_command.pipe,
                     redirection: lite_command.redirection.clone(),
+                    attribute_idx: vec![],
                 };
                 let (pipeline, exportables) =
                     parse_use(working_set, &lite_command, Some(parent_module));
@@ -1580,15 +1782,13 @@ pub fn parse_export_in_module(
         vec![]
     };
 
-    (
-        Pipeline::from_vec(vec![Expression::new(
-            working_set,
-            Expr::Call(call),
-            Span::concat(spans),
-            Type::Any,
-        )]),
-        exportables,
-    )
+    let out_pipeline = out_pipeline.unwrap_or(Pipeline::from_vec(vec![Expression::new(
+        working_set,
+        Expr::Call(call),
+        Span::concat(spans),
+        Type::Any,
+    )]));
+    (out_pipeline, exportables)
 }
 
 pub fn parse_export_env(
@@ -1724,14 +1924,14 @@ pub fn parse_module_block(
 
     let module_comments = collect_first_comments(&output);
 
-    let (output, err) = lite_parse(&output);
+    let (output, err) = lite_parse(&output, working_set);
     if let Some(err) = err {
         working_set.error(err)
     }
 
     for pipeline in &output.block {
         if pipeline.commands.len() == 1 {
-            parse_def_predecl(working_set, &pipeline.commands[0].parts);
+            parse_def_predecl(working_set, pipeline.commands[0].command_parts());
         }
     }
 
@@ -1744,9 +1944,14 @@ pub fn parse_module_block(
         if pipeline.commands.len() == 1 {
             let command = &pipeline.commands[0];
 
-            let name = working_set.get_span_contents(command.parts[0]);
+            let name = command
+                .command_parts()
+                .first()
+                .map(|s| working_set.get_span_contents(*s))
+                .unwrap_or(b"");
 
             match name {
+                // `parse_def` and `parse_extern` work both with and without attributes
                 b"def" => {
                     block.pipelines.push(
                         parse_def(
@@ -1757,33 +1962,10 @@ pub fn parse_module_block(
                         .0,
                     )
                 }
-                b"const" => block
-                    .pipelines
-                    .push(parse_const(working_set, &command.parts).0),
                 b"extern" => block
                     .pipelines
                     .push(parse_extern(working_set, command, None)),
-                b"alias" => {
-                    block.pipelines.push(parse_alias(
-                        working_set,
-                        command,
-                        None, // using aliases named as the module locally is OK
-                    ))
-                }
-                b"use" => {
-                    let (pipeline, _) = parse_use(working_set, command, Some(&mut module));
-
-                    block.pipelines.push(pipeline)
-                }
-                b"module" => {
-                    let (pipeline, _) = parse_module(
-                        working_set,
-                        command,
-                        None, // using modules named as the module locally is OK
-                    );
-
-                    block.pipelines.push(pipeline)
-                }
+                // `parse_export_in_module` also handles attributes by itself
                 b"export" => {
                     let (pipe, exportables) =
                         parse_export_in_module(working_set, command, module_name, &mut module);
@@ -1864,6 +2046,34 @@ pub fn parse_module_block(
 
                     block.pipelines.push(pipe)
                 }
+                // Other definitions can't have attributes, so we handle attributes here with parse_attribute_block
+                _ if command.has_attributes() => block
+                    .pipelines
+                    .push(parse_attribute_block(working_set, command)),
+                b"const" => block
+                    .pipelines
+                    .push(parse_const(working_set, &command.parts).0),
+                b"alias" => {
+                    block.pipelines.push(parse_alias(
+                        working_set,
+                        command,
+                        None, // using aliases named as the module locally is OK
+                    ))
+                }
+                b"use" => {
+                    let (pipeline, _) = parse_use(working_set, command, Some(&mut module));
+
+                    block.pipelines.push(pipeline)
+                }
+                b"module" => {
+                    let (pipeline, _) = parse_module(
+                        working_set,
+                        command,
+                        None, // using modules named as the module locally is OK
+                    );
+
+                    block.pipelines.push(pipeline)
+                }
                 b"export-env" => {
                     let (pipe, maybe_env_block) = parse_export_env(working_set, &command.parts);
 
diff --git a/crates/nu-parser/src/parse_patterns.rs b/crates/nu-parser/src/parse_patterns.rs
index 05193c6696..4c856a06a5 100644
--- a/crates/nu-parser/src/parse_patterns.rs
+++ b/crates/nu-parser/src/parse_patterns.rs
@@ -99,7 +99,7 @@ pub fn parse_list_pattern(working_set: &mut StateWorkingSet, span: Span) -> Matc
         working_set.error(err);
     }
 
-    let (output, err) = lite_parse(&output);
+    let (output, err) = lite_parse(&output, working_set);
     if let Some(err) = err {
         working_set.error(err);
     }
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 4c90338d75..d2d3e5c6e1 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -14,8 +14,8 @@ use log::trace;
 use nu_engine::DIR_VAR_PARSER_INFO;
 use nu_protocol::{
     ast::*, engine::StateWorkingSet, eval_const::eval_constant, BlockId, DeclId, DidYouMean,
-    FilesizeUnit, Flag, ParseError, PositionalArg, Signature, Span, Spanned, SyntaxShape, Type,
-    Value, VarId, ENV_VARIABLE_ID, IN_VARIABLE_ID,
+    FilesizeUnit, Flag, ParseError, PositionalArg, ShellError, Signature, Span, Spanned,
+    SyntaxShape, Type, Value, VarId, ENV_VARIABLE_ID, IN_VARIABLE_ID,
 };
 use std::{
     collections::{HashMap, HashSet},
@@ -1283,51 +1283,7 @@ pub fn parse_call(working_set: &mut StateWorkingSet, spans: &[Span], head: Span)
         return garbage(working_set, head);
     }
 
-    let mut pos = 0;
-    let cmd_start = pos;
-    let mut name_spans = vec![];
-    let mut name = vec![];
-
-    for word_span in spans[cmd_start..].iter() {
-        // Find the longest group of words that could form a command
-
-        name_spans.push(*word_span);
-
-        let name_part = working_set.get_span_contents(*word_span);
-        if name.is_empty() {
-            name.extend(name_part);
-        } else {
-            name.push(b' ');
-            name.extend(name_part);
-        }
-
-        pos += 1;
-    }
-
-    let mut maybe_decl_id = working_set.find_decl(&name);
-
-    while maybe_decl_id.is_none() {
-        // Find the longest command match
-        if name_spans.len() <= 1 {
-            // Keep the first word even if it does not match -- could be external command
-            break;
-        }
-
-        name_spans.pop();
-        pos -= 1;
-
-        let mut name = vec![];
-        for name_span in &name_spans {
-            let name_part = working_set.get_span_contents(*name_span);
-            if name.is_empty() {
-                name.extend(name_part);
-            } else {
-                name.push(b' ');
-                name.extend(name_part);
-            }
-        }
-        maybe_decl_id = working_set.find_decl(&name);
-    }
+    let (cmd_start, pos, _name, maybe_decl_id) = find_longest_decl(working_set, spans);
 
     if let Some(decl_id) = maybe_decl_id {
         // Before the internal parsing we check if there is no let or alias declarations
@@ -1424,6 +1380,172 @@ pub fn parse_call(working_set: &mut StateWorkingSet, spans: &[Span], head: Span)
     }
 }
 
+pub fn find_longest_decl(
+    working_set: &mut StateWorkingSet<'_>,
+    spans: &[Span],
+) -> (
+    usize,
+    usize,
+    Vec<u8>,
+    Option<nu_protocol::Id<nu_protocol::marker::Decl>>,
+) {
+    find_longest_decl_with_prefix(working_set, spans, b"")
+}
+
+pub fn find_longest_decl_with_prefix(
+    working_set: &mut StateWorkingSet<'_>,
+    spans: &[Span],
+    prefix: &[u8],
+) -> (
+    usize,
+    usize,
+    Vec<u8>,
+    Option<nu_protocol::Id<nu_protocol::marker::Decl>>,
+) {
+    let mut pos = 0;
+    let cmd_start = pos;
+    let mut name_spans = vec![];
+    let mut name = vec![];
+    name.extend(prefix);
+
+    for word_span in spans[cmd_start..].iter() {
+        // Find the longest group of words that could form a command
+
+        name_spans.push(*word_span);
+
+        let name_part = working_set.get_span_contents(*word_span);
+        if name.is_empty() {
+            name.extend(name_part);
+        } else {
+            name.push(b' ');
+            name.extend(name_part);
+        }
+
+        pos += 1;
+    }
+
+    let mut maybe_decl_id = working_set.find_decl(&name);
+
+    while maybe_decl_id.is_none() {
+        // Find the longest command match
+        if name_spans.len() <= 1 {
+            // Keep the first word even if it does not match -- could be external command
+            break;
+        }
+
+        name_spans.pop();
+        pos -= 1;
+
+        // TODO: Refactor to avoid recreating name with an inner loop.
+        name.clear();
+        name.extend(prefix);
+        for name_span in &name_spans {
+            let name_part = working_set.get_span_contents(*name_span);
+            if name.is_empty() {
+                name.extend(name_part);
+            } else {
+                name.push(b' ');
+                name.extend(name_part);
+            }
+        }
+        maybe_decl_id = working_set.find_decl(&name);
+    }
+    (cmd_start, pos, name, maybe_decl_id)
+}
+
+pub fn parse_attribute(
+    working_set: &mut StateWorkingSet,
+    lite_command: &LiteCommand,
+) -> (Attribute, Option<String>) {
+    let _ = lite_command
+        .parts
+        .first()
+        .filter(|s| working_set.get_span_contents(**s).starts_with(b"@"))
+        .expect("Attributes always start with an `@`");
+
+    assert!(
+        lite_command.attribute_idx.is_empty(),
+        "attributes can't have attributes"
+    );
+
+    let mut spans = lite_command.parts.clone();
+    if let Some(first) = spans.first_mut() {
+        first.start += 1;
+    }
+    let spans = spans.as_slice();
+    let attr_span = Span::concat(spans);
+
+    let (cmd_start, cmd_end, mut name, decl_id) =
+        find_longest_decl_with_prefix(working_set, spans, b"attr");
+
+    debug_assert!(name.starts_with(b"attr "));
+    let _ = name.drain(..(b"attr ".len()));
+
+    let name_span = Span::concat(&spans[cmd_start..cmd_end]);
+
+    let Ok(name) = String::from_utf8(name) else {
+        working_set.error(ParseError::NonUtf8(name_span));
+        return (
+            Attribute {
+                expr: garbage(working_set, attr_span),
+            },
+            None,
+        );
+    };
+
+    let Some(decl_id) = decl_id else {
+        working_set.error(ParseError::UnknownCommand(name_span));
+        return (
+            Attribute {
+                expr: garbage(working_set, attr_span),
+            },
+            None,
+        );
+    };
+
+    let decl = working_set.get_decl(decl_id);
+
+    let parsed_call = match decl.as_alias() {
+        // TODO: Once `const def` is available, we should either disallow aliases as attributes OR
+        // allow them but rather than using the aliases' name, use the name of the aliased command
+        Some(alias) => match &alias.clone().wrapped_call {
+            Expression {
+                expr: Expr::ExternalCall(..),
+                ..
+            } => {
+                let shell_error = ShellError::NotAConstCommand { span: name_span };
+                working_set.error(shell_error.wrap(working_set, attr_span));
+                return (
+                    Attribute {
+                        expr: garbage(working_set, Span::concat(spans)),
+                    },
+                    None,
+                );
+            }
+            _ => {
+                trace!("parsing: alias of internal call");
+                parse_internal_call(working_set, name_span, &spans[cmd_end..], decl_id)
+            }
+        },
+        None => {
+            trace!("parsing: internal call");
+            parse_internal_call(working_set, name_span, &spans[cmd_end..], decl_id)
+        }
+    };
+
+    (
+        Attribute {
+            expr: Expression::new(
+                working_set,
+                Expr::Call(parsed_call.call),
+                Span::concat(spans),
+                parsed_call.output,
+            ),
+        },
+        Some(name),
+    )
+}
+
 pub fn parse_binary(working_set: &mut StateWorkingSet, span: Span) -> Expression {
     trace!("parsing: binary");
     let contents = working_set.get_span_contents(span);
@@ -4166,7 +4288,7 @@ pub fn parse_list_expression(
         working_set.error(err)
     }
 
-    let (mut output, err) = lite_parse(&output);
+    let (mut output, err) = lite_parse(&output, working_set);
     if let Some(err) = err {
         working_set.error(err)
     }
@@ -5728,11 +5850,20 @@ pub fn parse_builtin_commands(
     }
 
     trace!("parsing: checking for keywords");
-    let name = working_set.get_span_contents(lite_command.parts[0]);
+    let name = lite_command
+        .command_parts()
+        .first()
+        .map(|s| working_set.get_span_contents(*s))
+        .unwrap_or(b"");
 
     match name {
+        // `parse_def` and `parse_extern` work both with and without attributes
         b"def" => parse_def(working_set, lite_command, None).0,
         b"extern" => parse_extern(working_set, lite_command, None),
+        // `parse_export_in_block` also handles attributes by itself
+        b"export" => parse_export_in_block(working_set, lite_command),
+        // Other definitions can't have attributes, so we handle attributes here with parse_attribute_block
+        _ if lite_command.has_attributes() => parse_attribute_block(working_set, lite_command),
         b"let" => parse_let(
             working_set,
             &lite_command
@@ -5761,7 +5892,6 @@ pub fn parse_builtin_commands(
             parse_keyword(working_set, lite_command)
         }
         b"source" | b"source-env" => parse_source(working_set, lite_command),
-        b"export" => parse_export_in_block(working_set, lite_command),
         b"hide" => parse_hide(working_set, lite_command),
         b"where" => parse_where(working_set, lite_command),
         // Only "plugin use" is a keyword
@@ -6154,7 +6284,7 @@ pub fn parse_block(
     scoped: bool,
     is_subexpression: bool,
 ) -> Block {
-    let (lite_block, err) = lite_parse(tokens);
+    let (lite_block, err) = lite_parse(tokens, working_set);
     if let Some(err) = err {
         working_set.error(err);
     }
@@ -6169,7 +6299,7 @@ pub fn parse_block(
     // that share the same block can see each other
     for pipeline in &lite_block.block {
         if pipeline.commands.len() == 1 {
-            parse_def_predecl(working_set, &pipeline.commands[0].parts)
+            parse_def_predecl(working_set, pipeline.commands[0].command_parts())
         }
     }
 
@@ -6354,6 +6484,9 @@ pub fn discover_captures_in_expr(
     output: &mut Vec<(VarId, Span)>,
 ) -> Result<(), ParseError> {
     match &expr.expr {
+        Expr::AttributeBlock(ab) => {
+            discover_captures_in_expr(working_set, &ab.item, seen, seen_blocks, output)?;
+        }
         Expr::BinaryOp(lhs, _, rhs) => {
             discover_captures_in_expr(working_set, lhs, seen, seen_blocks, output)?;
             discover_captures_in_expr(working_set, rhs, seen, seen_blocks, output)?;
diff --git a/crates/nu-parser/tests/test_parser.rs b/crates/nu-parser/tests/test_parser.rs
index 75d97e84a6..8d3249ade2 100644
--- a/crates/nu-parser/tests/test_parser.rs
+++ b/crates/nu-parser/tests/test_parser.rs
@@ -1,109 +1,12 @@
 use nu_parser::*;
 use nu_protocol::{
     ast::{Argument, Expr, Expression, ExternalArgument, PathMember, Range},
-    engine::{Call, Command, EngineState, Stack, StateWorkingSet},
-    Category, DeclId, ParseError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
+    engine::{Command, EngineState, Stack, StateWorkingSet},
+    DeclId, ParseError, Signature, Span, SyntaxShape, Type,
 };
 use rstest::rstest;
 
-#[cfg(test)]
-#[derive(Clone)]
-pub struct Let;
-
-#[cfg(test)]
-impl Command for Let {
-    fn name(&self) -> &str {
-        "let"
-    }
-
-    fn description(&self) -> &str {
-        "Create a variable and give it a value."
-    }
-
-    fn signature(&self) -> nu_protocol::Signature {
-        Signature::build("let")
-            .required("var_name", SyntaxShape::VarWithOptType, "variable name")
-            .required(
-                "initial_value",
-                SyntaxShape::Keyword(b"=".to_vec(), Box::new(SyntaxShape::MathExpression)),
-                "equals sign followed by value",
-            )
-    }
-
-    fn run(
-        &self,
-        _engine_state: &EngineState,
-        _stack: &mut Stack,
-        _call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        todo!()
-    }
-}
-
-#[cfg(test)]
-#[derive(Clone)]
-pub struct Mut;
-
-#[cfg(test)]
-impl Command for Mut {
-    fn name(&self) -> &str {
-        "mut"
-    }
-
-    fn description(&self) -> &str {
-        "Mock mut command."
-    }
-
-    fn signature(&self) -> nu_protocol::Signature {
-        Signature::build("mut")
-            .required("var_name", SyntaxShape::VarWithOptType, "variable name")
-            .required(
-                "initial_value",
-                SyntaxShape::Keyword(b"=".to_vec(), Box::new(SyntaxShape::MathExpression)),
-                "equals sign followed by value",
-            )
-    }
-
-    fn run(
-        &self,
-        _engine_state: &EngineState,
-        _stack: &mut Stack,
-        _call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        todo!()
-    }
-}
-
-#[derive(Clone)]
-pub struct ToCustom;
-
-impl Command for ToCustom {
-    fn name(&self) -> &str {
-        "to-custom"
-    }
-
-    fn description(&self) -> &str {
-        "Mock converter command."
-    }
-
-    fn signature(&self) -> nu_protocol::Signature {
-        Signature::build(self.name())
-            .input_output_type(Type::Any, Type::Custom("custom".into()))
-            .category(Category::Custom("custom".into()))
-    }
-
-    fn run(
-        &self,
-        _engine_state: &EngineState,
-        _stack: &mut Stack,
-        _call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        todo!()
-    }
-}
+use mock::{Alias, AttrEcho, Def, Let, Mut, ToCustom};
 
 fn test_int(
     test_tag: &str,     // name of sub-test
@@ -758,6 +661,129 @@ pub fn parse_call_missing_req_flag() {
     ));
 }
 
+#[test]
+pub fn parse_attribute_block_check_spans() {
+    let engine_state = EngineState::new();
+    let mut working_set = StateWorkingSet::new(&engine_state);
+
+    let source = br#"
+    @foo a 1 2
+    @bar b 3 4
+    echo baz
+    "#;
+    let block = parse(&mut working_set, None, source, true);
+
+    // There SHOULD be errors here, we're using nonexistent commands
+    assert!(!working_set.parse_errors.is_empty());
+
+    assert_eq!(block.len(), 1);
+
+    let pipeline = &block.pipelines[0];
+    assert_eq!(pipeline.len(), 1);
+    let element = &pipeline.elements[0];
+    assert!(element.redirection.is_none());
+
+    let Expr::AttributeBlock(ab) = &element.expr.expr else {
+        panic!("Couldn't parse attribute block");
+    };
+
+    assert_eq!(
+        working_set.get_span_contents(ab.attributes[0].expr.span),
+        b"foo a 1 2"
+    );
+    assert_eq!(
+        working_set.get_span_contents(ab.attributes[1].expr.span),
+        b"bar b 3 4"
+    );
+    assert_eq!(working_set.get_span_contents(ab.item.span), b"echo baz");
+}
+
+#[test]
+pub fn parse_attributes_check_values() {
+    let engine_state = EngineState::new();
+    let mut working_set = StateWorkingSet::new(&engine_state);
+
+    working_set.add_decl(Box::new(Def));
+    working_set.add_decl(Box::new(AttrEcho));
+
+    let source = br#"
+    @echo "hello world"
+    @echo 42
+    def foo [] {}
+    "#;
+    let _ = parse(&mut working_set, None, source, false);
+
+    assert!(working_set.parse_errors.is_empty());
+
+    let decl_id = working_set.find_decl(b"foo").unwrap();
+    let cmd = working_set.get_decl(decl_id);
+    let attributes = cmd.attributes();
+
+    let (name, val) = &attributes[0];
+    assert_eq!(name, "echo");
+    assert_eq!(val.as_str(), Ok("hello world"));
+
+    let (name, val) = &attributes[1];
+    assert_eq!(name, "echo");
+    assert_eq!(val.as_int(), Ok(42));
+}
+
+#[test]
+pub fn parse_attributes_alias() {
+    let engine_state = EngineState::new();
+    let mut working_set = StateWorkingSet::new(&engine_state);
+
+    working_set.add_decl(Box::new(Def));
+    working_set.add_decl(Box::new(Alias));
+    working_set.add_decl(Box::new(AttrEcho));
+
+    let source = br#"
+    alias "attr test" = attr echo
+
+    @test null
+    def foo [] {}
+    "#;
+    let _ = parse(&mut working_set, None, source, false);
+
+    assert!(working_set.parse_errors.is_empty());
+
+    let decl_id = working_set.find_decl(b"foo").unwrap();
+    let cmd = working_set.get_decl(decl_id);
+    let attributes = cmd.attributes();
+
+    let (name, val) = &attributes[0];
+    assert_eq!(name, "test");
+    assert!(val.is_nothing());
+}
+
+#[test]
+pub fn parse_attributes_external_alias() {
+    let engine_state = EngineState::new();
+    let mut working_set = StateWorkingSet::new(&engine_state);
+
+    working_set.add_decl(Box::new(Def));
+    working_set.add_decl(Box::new(Alias));
+    working_set.add_decl(Box::new(AttrEcho));
+
+    let source = br#"
+    alias "attr test" = ^echo
+
+    @test null
+    def foo [] {}
+    "#;
+    let _ = parse(&mut working_set, None, source, false);
+
+    assert!(!working_set.parse_errors.is_empty());
+
+    let ParseError::LabeledError(shell_error, parse_error, _span) = &working_set.parse_errors[0]
+    else {
+        panic!("Expected LabeledError");
+    };
+
+    assert!(shell_error.contains("nu::shell::not_a_const_command"));
+    assert!(parse_error.contains("Encountered error during parse-time evaluation"));
+}
+
 fn test_external_call(input: &str, tag: &str, f: impl FnOnce(&Expression, &[ExternalArgument])) {
     let engine_state = EngineState::new();
     let mut working_set = StateWorkingSet::new(&engine_state);
@@ -1943,10 +1969,78 @@ mod range {
 }
 
 #[cfg(test)]
-mod input_types {
+mod mock {
     use super::*;
-    use nu_protocol::{ast::Argument, engine::Call, Category, PipelineData, ShellError, Type};
+    use nu_engine::CallExt;
+    use nu_protocol::{
+        engine::Call, Category, IntoPipelineData, PipelineData, ShellError, Type, Value,
+    };
 
+    #[derive(Clone)]
+    pub struct Let;
+
+    impl Command for Let {
+        fn name(&self) -> &str {
+            "let"
+        }
+
+        fn description(&self) -> &str {
+            "Create a variable and give it a value."
+        }
+
+        fn signature(&self) -> nu_protocol::Signature {
+            Signature::build("let")
+                .required("var_name", SyntaxShape::VarWithOptType, "variable name")
+                .required(
+                    "initial_value",
+                    SyntaxShape::Keyword(b"=".to_vec(), Box::new(SyntaxShape::MathExpression)),
+                    "equals sign followed by value",
+                )
+        }
+
+        fn run(
+            &self,
+            _engine_state: &EngineState,
+            _stack: &mut Stack,
+            _call: &Call,
+            _input: PipelineData,
+        ) -> Result<PipelineData, ShellError> {
+            todo!()
+        }
+    }
+
+    #[derive(Clone)]
+    pub struct Mut;
+
+    impl Command for Mut {
+        fn name(&self) -> &str {
+            "mut"
+        }
+
+        fn description(&self) -> &str {
+            "Mock mut command."
+        }
+
+        fn signature(&self) -> nu_protocol::Signature {
+            Signature::build("mut")
+                .required("var_name", SyntaxShape::VarWithOptType, "variable name")
+                .required(
+                    "initial_value",
+                    SyntaxShape::Keyword(b"=".to_vec(), Box::new(SyntaxShape::MathExpression)),
+                    "equals sign followed by value",
+                )
+        }
+
+        fn run(
+            &self,
+            _engine_state: &EngineState,
+            _stack: &mut Stack,
+            _call: &Call,
+            _input: PipelineData,
+        ) -> Result<PipelineData, ShellError> {
+            todo!()
+        }
+    }
     #[derive(Clone)]
     pub struct LsTest;
 
@@ -2006,6 +2100,87 @@ mod input_types {
         }
     }
 
+    #[derive(Clone)]
+    pub struct Alias;
+
+    impl Command for Alias {
+        fn name(&self) -> &str {
+            "alias"
+        }
+
+        fn description(&self) -> &str {
+            "Mock alias command."
+        }
+
+        fn signature(&self) -> nu_protocol::Signature {
+            Signature::build("alias")
+                .input_output_types(vec![(Type::Nothing, Type::Nothing)])
+                .required("name", SyntaxShape::String, "Name of the alias.")
+                .required(
+                    "initial_value",
+                    SyntaxShape::Keyword(b"=".to_vec(), Box::new(SyntaxShape::Expression)),
+                    "Equals sign followed by value.",
+                )
+                .category(Category::Core)
+        }
+
+        fn run(
+            &self,
+            _engine_state: &EngineState,
+            _stack: &mut Stack,
+            _call: &Call,
+            _input: PipelineData,
+        ) -> Result<PipelineData, ShellError> {
+            todo!()
+        }
+    }
+
+    #[derive(Clone)]
+    pub struct AttrEcho;
+
+    impl Command for AttrEcho {
+        fn name(&self) -> &str {
+            "attr echo"
+        }
+
+        fn signature(&self) -> Signature {
+            Signature::build("attr echo").required(
+                "value",
+                SyntaxShape::Any,
+                "Value to store as an attribute",
+            )
+        }
+
+        fn description(&self) -> &str {
+            "Add an arbitrary value as an attribute to a command"
+        }
+
+        fn run(
+            &self,
+            engine_state: &EngineState,
+            stack: &mut Stack,
+            call: &Call,
+            _input: PipelineData,
+        ) -> Result<PipelineData, ShellError> {
+            let value: Value = call.req(engine_state, stack, 0)?;
+            Ok(value.into_pipeline_data())
+        }
+
+        fn is_const(&self) -> bool {
+            true
+        }
+
+        fn run_const(
+            &self,
+            working_set: &StateWorkingSet,
+            call: &Call,
+            _input: PipelineData,
+        ) -> Result<PipelineData, ShellError> {
+            let value: Value = call.req_const(working_set, 0)?;
+            Ok(value.into_pipeline_data())
+        }
+    }
+
     #[derive(Clone)]
     pub struct GroupBy;
 
@@ -2255,6 +2430,13 @@ mod input_types {
             todo!()
         }
     }
+}
+
+#[cfg(test)]
+mod input_types {
+    use super::*;
+    use mock::*;
+    use nu_protocol::ast::Argument;
 
     fn add_declarations(engine_state: &mut EngineState) {
         let delta = {
diff --git a/crates/nu-protocol/src/ast/attribute.rs b/crates/nu-protocol/src/ast/attribute.rs
new file mode 100644
index 0000000000..85b89256ee
--- /dev/null
+++ b/crates/nu-protocol/src/ast/attribute.rs
@@ -0,0 +1,13 @@
+use super::Expression;
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+pub struct Attribute {
+    pub expr: Expression,
+}
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+pub struct AttributeBlock {
+    pub attributes: Vec<Attribute>,
+    pub item: Box<Expression>,
+}
diff --git a/crates/nu-protocol/src/ast/expr.rs b/crates/nu-protocol/src/ast/expr.rs
index 62a2f3ad37..1f9579de20 100644
--- a/crates/nu-protocol/src/ast/expr.rs
+++ b/crates/nu-protocol/src/ast/expr.rs
@@ -2,8 +2,8 @@ use chrono::FixedOffset;
 use serde::{Deserialize, Serialize};
 
 use super::{
-    Call, CellPath, Expression, ExternalArgument, FullCellPath, Keyword, MatchPattern, Operator,
-    Range, Table, ValueWithUnit,
+    AttributeBlock, Call, CellPath, Expression, ExternalArgument, FullCellPath, Keyword,
+    MatchPattern, Operator, Range, Table, ValueWithUnit,
 };
 use crate::{
     ast::ImportPattern, engine::StateWorkingSet, BlockId, ModuleId, OutDest, Signature, Span, VarId,
@@ -12,6 +12,7 @@ use crate::{
 /// An [`Expression`] AST node
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub enum Expr {
+    AttributeBlock(AttributeBlock),
     Bool(bool),
     Int(i64),
     Float(f64),
@@ -67,6 +68,7 @@ impl Expr {
         working_set: &StateWorkingSet,
     ) -> (Option<OutDest>, Option<OutDest>) {
         match self {
+            Expr::AttributeBlock(ab) => ab.item.expr.pipe_redirection(working_set),
             Expr::Call(call) => working_set.get_decl(call.decl_id).pipe_redirection(),
             Expr::Collect(_, _) => {
                 // A collect expression always has default redirection, it's just going to collect
diff --git a/crates/nu-protocol/src/ast/expression.rs b/crates/nu-protocol/src/ast/expression.rs
index e1a761ed2f..7d08f62533 100644
--- a/crates/nu-protocol/src/ast/expression.rs
+++ b/crates/nu-protocol/src/ast/expression.rs
@@ -104,6 +104,7 @@ impl Expression {
 
     pub fn has_in_variable(&self, working_set: &StateWorkingSet) -> bool {
         match &self.expr {
+            Expr::AttributeBlock(ab) => ab.item.has_in_variable(working_set),
             Expr::BinaryOp(left, _, right) => {
                 left.has_in_variable(working_set) || right.has_in_variable(working_set)
             }
@@ -280,6 +281,7 @@ impl Expression {
             self.span = new_span;
         }
         match &mut self.expr {
+            Expr::AttributeBlock(ab) => ab.item.replace_span(working_set, replaced, new_span),
             Expr::BinaryOp(left, _, right) => {
                 left.replace_span(working_set, replaced, new_span);
                 right.replace_span(working_set, replaced, new_span);
@@ -428,6 +430,7 @@ impl Expression {
 
     pub fn replace_in_variable(&mut self, working_set: &mut StateWorkingSet, new_var_id: VarId) {
         match &mut self.expr {
+            Expr::AttributeBlock(ab) => ab.item.replace_in_variable(working_set, new_var_id),
             Expr::Bool(_) => {}
             Expr::Int(_) => {}
             Expr::Float(_) => {}
diff --git a/crates/nu-protocol/src/ast/mod.rs b/crates/nu-protocol/src/ast/mod.rs
index 0138431ec6..950c9a7c81 100644
--- a/crates/nu-protocol/src/ast/mod.rs
+++ b/crates/nu-protocol/src/ast/mod.rs
@@ -1,4 +1,5 @@
 //! Types representing parsed Nushell code (the Abstract Syntax Tree)
+mod attribute;
 mod block;
 mod call;
 mod cell_path;
@@ -15,6 +16,7 @@ mod traverse;
 mod unit;
 mod value_with_unit;
 
+pub use attribute::*;
 pub use block::*;
 pub use call::*;
 pub use cell_path::*;
diff --git a/crates/nu-protocol/src/ast/traverse.rs b/crates/nu-protocol/src/ast/traverse.rs
index 2c9e6dbaa1..814e8ded7b 100644
--- a/crates/nu-protocol/src/ast/traverse.rs
+++ b/crates/nu-protocol/src/ast/traverse.rs
@@ -177,6 +177,12 @@ impl Traverse for Expression {
             Expr::StringInterpolation(vec) | Expr::GlobInterpolation(vec, _) => {
                 vec.iter().flat_map(recur).collect()
             }
+            Expr::AttributeBlock(ab) => ab
+                .attributes
+                .iter()
+                .flat_map(|attr| recur(&attr.expr))
+                .chain(recur(&ab.item))
+                .collect(),
 
             _ => Vec::new(),
         }
@@ -233,6 +239,11 @@ impl Traverse for Expression {
                     Expr::StringInterpolation(vec) | Expr::GlobInterpolation(vec, _) => {
                         vec.iter().find_map(recur)
                     }
+                    Expr::AttributeBlock(ab) => ab
+                        .attributes
+                        .iter()
+                        .find_map(|attr| recur(&attr.expr))
+                        .or_else(|| recur(&ab.item)),
 
                     _ => None,
                 }
diff --git a/crates/nu-protocol/src/debugger/profiler.rs b/crates/nu-protocol/src/debugger/profiler.rs
index 6ac71f996f..6f8df16905 100644
--- a/crates/nu-protocol/src/debugger/profiler.rs
+++ b/crates/nu-protocol/src/debugger/profiler.rs
@@ -310,6 +310,7 @@ fn profiler_error(msg: impl Into<String>, span: Span) -> ShellError {
 
 fn expr_to_string(engine_state: &EngineState, expr: &Expr) -> String {
     match expr {
+        Expr::AttributeBlock(ab) => expr_to_string(engine_state, &ab.item.expr),
         Expr::Binary(_) => "binary".to_string(),
         Expr::BinaryOp(_, _, _) => "binary operation".to_string(),
         Expr::Block(_) => "block".to_string(),
diff --git a/crates/nu-protocol/src/engine/command.rs b/crates/nu-protocol/src/engine/command.rs
index be80a18bc4..d10a6210a9 100644
--- a/crates/nu-protocol/src/engine/command.rs
+++ b/crates/nu-protocol/src/engine/command.rs
@@ -1,5 +1,7 @@
 use super::{EngineState, Stack, StateWorkingSet};
-use crate::{engine::Call, Alias, BlockId, Example, OutDest, PipelineData, ShellError, Signature};
+use crate::{
+    engine::Call, Alias, BlockId, Example, OutDest, PipelineData, ShellError, Signature, Value,
+};
 use std::fmt::Display;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -73,6 +75,10 @@ pub trait Command: Send + Sync + CommandClone {
         vec![]
     }
 
+    fn attributes(&self) -> Vec<(String, Value)> {
+        vec![]
+    }
+
     // Whether can run in const evaluation in the parser
     fn is_const(&self) -> bool {
         false
diff --git a/crates/nu-protocol/src/errors/parse_error.rs b/crates/nu-protocol/src/errors/parse_error.rs
index f7de9f4890..2f9b7b3ed4 100644
--- a/crates/nu-protocol/src/errors/parse_error.rs
+++ b/crates/nu-protocol/src/errors/parse_error.rs
@@ -543,6 +543,13 @@ pub enum ParseError {
         help("try assigning to a variable or a cell path of a variable")
     )]
     AssignmentRequiresVar(#[label("needs to be a variable")] Span),
+
+    #[error("Attributes must be followed by a definition.")]
+    #[diagnostic(
+        code(nu::parser::attribute_requires_definition),
+        help("try following this line with a `def` or `extern` definition")
+    )]
+    AttributeRequiresDefinition(#[label("must be followed by a definition")] Span),
 }
 
 impl ParseError {
@@ -634,6 +641,7 @@ impl ParseError {
             ParseError::ExtraTokensAfterClosingDelimiter(s) => *s,
             ParseError::AssignmentRequiresVar(s) => *s,
             ParseError::AssignmentRequiresMutableVar(s) => *s,
+            ParseError::AttributeRequiresDefinition(s) => *s,
         }
     }
 }
diff --git a/crates/nu-protocol/src/eval_base.rs b/crates/nu-protocol/src/eval_base.rs
index 65f4dd7da0..0e7916bd3c 100644
--- a/crates/nu-protocol/src/eval_base.rs
+++ b/crates/nu-protocol/src/eval_base.rs
@@ -27,6 +27,7 @@ pub trait Eval {
         let expr_span = expr.span(&state);
 
         match &expr.expr {
+            Expr::AttributeBlock(ab) => Self::eval::<D>(state, mut_state, &ab.item),
             Expr::Bool(b) => Ok(Value::bool(*b, expr_span)),
             Expr::Int(i) => Ok(Value::int(*i, expr_span)),
             Expr::Float(f) => Ok(Value::float(*f, expr_span)),
diff --git a/crates/nu-protocol/src/signature.rs b/crates/nu-protocol/src/signature.rs
index 549e23743f..bc975848f8 100644
--- a/crates/nu-protocol/src/signature.rs
+++ b/crates/nu-protocol/src/signature.rs
@@ -1,10 +1,16 @@
 use crate::{
     engine::{Call, Command, CommandType, EngineState, Stack},
-    BlockId, PipelineData, ShellError, SyntaxShape, Type, Value, VarId,
+    BlockId, Example, PipelineData, ShellError, SyntaxShape, Type, Value, VarId,
 };
+use nu_derive_value::FromValue;
 use serde::{Deserialize, Serialize};
 use std::fmt::Write;
 
+// Make nu_protocol available in this namespace, consumers of this crate will
+// have this without such an export.
+// The `FromValue` derive macro fully qualifies paths to "nu_protocol".
+use crate as nu_protocol;
+
 /// The signature definition of a named flag that either accepts a value or acts as a toggle flag
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Flag {
@@ -560,10 +566,17 @@ impl Signature {
     }
 
     /// Combines a signature and a block into a runnable block
-    pub fn into_block_command(self, block_id: BlockId) -> Box<dyn Command> {
+    pub fn into_block_command(
+        self,
+        block_id: BlockId,
+        attributes: Vec<(String, Value)>,
+        examples: Vec<CustomExample>,
+    ) -> Box<dyn Command> {
         Box::new(BlockCommand {
             signature: self,
             block_id,
+            attributes,
+            examples,
         })
     }
 
@@ -651,10 +664,29 @@ fn get_positional_short_name(arg: &PositionalArg, is_required: bool) -> String {
     }
 }
 
+#[derive(Clone, FromValue)]
+pub struct CustomExample {
+    pub example: String,
+    pub description: String,
+    pub result: Option<Value>,
+}
+
+impl CustomExample {
+    pub fn to_example(&self) -> Example<'_> {
+        Example {
+            example: self.example.as_str(),
+            description: self.description.as_str(),
+            result: self.result.clone(),
+        }
+    }
+}
+
 #[derive(Clone)]
 struct BlockCommand {
     signature: Signature,
     block_id: BlockId,
+    attributes: Vec<(String, Value)>,
+    examples: Vec<CustomExample>,
 }
 
 impl Command for BlockCommand {
@@ -697,4 +729,23 @@ impl Command for BlockCommand {
     fn block_id(&self) -> Option<BlockId> {
         Some(self.block_id)
     }
+
+    fn attributes(&self) -> Vec<(String, Value)> {
+        self.attributes.clone()
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        self.examples
+            .iter()
+            .map(CustomExample::to_example)
+            .collect()
+    }
+
+    fn search_terms(&self) -> Vec<&str> {
+        self.signature
+            .search_terms
+            .iter()
+            .map(String::as_str)
+            .collect()
+    }
 }
diff --git a/crates/nu-std/src/lib.rs b/crates/nu-std/src/lib.rs
index 58dc72b12d..cf14140ca1 100644
--- a/crates/nu-std/src/lib.rs
+++ b/crates/nu-std/src/lib.rs
@@ -58,6 +58,11 @@ pub fn load_standard_library(
         ("mod.nu", "std/util", include_str!("../std/util/mod.nu")),
         ("mod.nu", "std/xml", include_str!("../std/xml/mod.nu")),
         ("mod.nu", "std/config", include_str!("../std/config/mod.nu")),
+        (
+            "mod.nu",
+            "std/testing",
+            include_str!("../std/testing/mod.nu"),
+        ),
     ];
 
     for (filename, std_subdir_name, content) in std_submodules.drain(..) {
diff --git a/crates/nu-std/std/assert/mod.nu b/crates/nu-std/std/assert/mod.nu
index 19ca65dd64..8d10e1e34b 100644
--- a/crates/nu-std/std/assert/mod.nu
+++ b/crates/nu-std/std/assert/mod.nu
@@ -7,32 +7,16 @@
 # Universal assert command
 #
 # If the condition is not true, it generates an error.
-#
-# # Example
-#
-# ```nushell
-# >_ assert (3 == 3)
-# >_ assert (42 == 3)
-# Error:
-#   × Assertion failed:
-#     ╭─[myscript.nu:11:1]
-#  11 │ assert (3 == 3)
-#  12 │ assert (42 == 3)
-#     ·         ───┬────
-#     ·            ╰── It is not true.
-#  13 │
-#     ╰────
-# ```
-#
-# The --error-label flag can be used if you want to create a custom assert command:
-# ```
-# def "assert even" [number: int] {
-#     assert ($number mod 2 == 0) --error-label {
-#         text: $"($number) is not an even number",
-#         span: (metadata $number).span,
-#     }
-# }
-# ```
+@example "This assert passes" { assert (3 == 3) }
+@example "This assert fails" { assert (42 == 3) }
+@example "The --error-label flag can be used if you want to create a custom assert command:" {
+    def "assert even" [number: int] {
+        assert ($number mod 2 == 0) --error-label {
+            text: $"($number) is not an even number",
+            span: (metadata $number).span,
+        }
+    }
+}
 export def main [
     condition: bool, # Condition, which should be true
     message?: string, # Optional error message
@@ -52,32 +36,16 @@ export def main [
 # Negative assertion
 #
 # If the condition is not false, it generates an error.
-#
-# # Examples
-#
-# >_ assert (42 == 3)
-# >_ assert (3 == 3)
-# Error:
-#   × Assertion failed:
-#     ╭─[myscript.nu:11:1]
-#  11 │ assert (42 == 3)
-#  12 │ assert (3 == 3)
-#     ·         ───┬────
-#     ·            ╰── It is not false.
-#  13 │
-#     ╰────
-#
-#
-# The --error-label flag can be used if you want to create a custom assert command:
-# ```
-# def "assert not even" [number: int] {
-#     assert not ($number mod 2 == 0) --error-label {
-#         span: (metadata $number).span,
-#         text: $"($number) is an even number",
-#     }
-# }
-# ```
-#
+@example "This assert passes" { assert (42 == 3) }
+@example "This assert fails" { assert (3 == 3) }
+@example "The --error-label flag can be used if you want to create a custom assert command:" {
+    def "assert not even" [number: int] {
+        assert not ($number mod 2 == 0) --error-label {
+            span: (metadata $number).span,
+            text: $"($number) is an even number",
+        }
+    }
+}
 export def not [
     condition: bool, # Condition, which should be false
     message?: string, # Optional error message
@@ -95,14 +63,12 @@ export def not [
     }
 }
 
+
 # Assert that executing the code generates an error
 #
 # For more documentation see the assert command
-#
-# # Examples
-#
-# > assert error {|| missing_command} # passes
-# > assert error {|| 12} # fails
+@example "This assert passes" { assert error {|| missing_command} }
+@example "This assert fails" { assert error {|| 12} }
 export def error [
     code: closure,
     message?: string
@@ -120,12 +86,9 @@ export def error [
 # Assert $left == $right
 #
 # For more documentation see the assert command
-#
-# # Examples
-#
-# > assert equal 1 1 # passes
-# > assert equal (0.1 + 0.2) 0.3
-# > assert equal 1 2 # fails
+@example "This assert passes" { assert equal 1 1 }
+@example "This assert passes" { assert equal (0.1 + 0.2) 0.3 }
+@example "This assert fails" { assert equal 1 2 }
 export def equal [left: any, right: any, message?: string] {
     main ($left == $right) $message --error-label {
         span: {
@@ -143,12 +106,9 @@ export def equal [left: any, right: any, message?: string] {
 # Assert $left != $right
 #
 # For more documentation see the assert command
-#
-# # Examples
-#
-# > assert not equal 1 2 # passes
-# > assert not equal 1 "apple" # passes
-# > assert not equal 7 7 # fails
+@example "This assert passes" { assert not equal 1 2 }
+@example "This assert passes" { assert not equal 1 "apple" }
+@example "This assert fails" { assert not equal 7 7 }
 export def "not equal" [left: any, right: any, message?: string] {
     main ($left != $right) $message --error-label {
         span: {
@@ -162,12 +122,9 @@ export def "not equal" [left: any, right: any, message?: string] {
 # Assert $left <= $right
 #
 # For more documentation see the assert command
-#
-# # Examples
-#
-# > assert less or equal 1 2 # passes
-# > assert less or equal 1 1 # passes
-# > assert less or equal 1 0 # fails
+@example "This assert passes" { assert less or equal 1 2 }
+@example "This assert passes" { assert less or equal 1 1 }
+@example "This assert fails" { assert less or equal 1 0 }
 export def "less or equal" [left: any, right: any, message?: string] {
     main ($left <= $right) $message --error-label {
         span: {
@@ -185,11 +142,8 @@ export def "less or equal" [left: any, right: any, message?: string] {
 # Assert $left < $right
 #
 # For more documentation see the assert command
-#
-# # Examples
-#
-# > assert less 1 2 # passes
-# > assert less 1 1 # fails
+@example "This assert passes" { assert less 1 2 }
+@example "This assert fails" { assert less 1 1 }
 export def less [left: any, right: any, message?: string] {
     main ($left < $right) $message --error-label {
         span: {
@@ -207,11 +161,8 @@ export def less [left: any, right: any, message?: string] {
 # Assert $left > $right
 #
 # For more documentation see the assert command
-#
-# # Examples
-#
-# > assert greater 2 1 # passes
-# > assert greater 2 2 # fails
+@example "This assert passes" { assert greater 2 1 }
+@example "This assert fails" { assert greater 2 2 }
 export def greater [left: any, right: any, message?: string] {
     main ($left > $right) $message --error-label {
         span: {
@@ -229,12 +180,9 @@ export def greater [left: any, right: any, message?: string] {
 # Assert $left >= $right
 #
 # For more documentation see the assert command
-#
-# # Examples
-#
-# > assert greater or equal 2 1 # passes
-# > assert greater or equal 2 2 # passes
-# > assert greater or equal 1 2 # fails
+@example "This assert passes" { assert greater or equal 2 1 }
+@example "This assert passes" { assert greater or equal 2 2 }
+@example "This assert fails" { assert greater or equal 1 2 }
 export def "greater or equal" [left: any, right: any, message?: string] {
     main ($left >= $right) $message --error-label {
         span: {
@@ -253,11 +201,8 @@ alias "core length" = length
 # Assert length of $left is $right
 #
 # For more documentation see the assert command
-#
-# # Examples
-#
-# > assert length [0, 0] 2 # passes
-# > assert length [0] 3 # fails
+@example "This assert passes" { assert length [0, 0] 2 }
+@example "This assert fails" { assert length [0] 3 }
 export def length [left: list, right: int, message?: string] {
     main (($left | core length) == $right) $message --error-label {
         span: {
@@ -277,11 +222,8 @@ alias "core str contains" = str contains
 # Assert that ($left | str contains $right)
 #
 # For more documentation see the assert command
-#
-# # Examples
-#
-# > assert str contains "arst" "rs" # passes
-# > assert str contains "arst" "k" # fails
+@example "This assert passes" { assert str contains "arst" "rs" }
+@example "This assert fails" { assert str contains "arst" "k" }
 export def "str contains" [left: string, right: string, message?: string] {
     main ($left | core str contains $right) $message --error-label {
         span: {
diff --git a/crates/nu-std/std/bench/mod.nu b/crates/nu-std/std/bench/mod.nu
index 25994ded58..a32e041ac1 100644
--- a/crates/nu-std/std/bench/mod.nu
+++ b/crates/nu-std/std/bench/mod.nu
@@ -1,45 +1,34 @@
 # run a piece of `nushell` code multiple times and measure the time of execution.
 #
 # this command returns a benchmark report of the following form:
-# ```
-# record<
-#   mean: duration
-#   std: duration
-#   times: list<duration>
-# >
-# ```
 #
 # > **Note**
 # > `std bench --pretty` will return a `string`.
-#
-# # Examples
-#     measure the performance of simple addition
-#     > std bench { 1 + 2 } -n 10 | table -e
-#     ╭───────┬────────────────────╮
-#     │ mean  │ 4µs 956ns          │
-#     │ std   │ 4µs 831ns          │
-#     │       │ ╭───┬────────────╮ │
-#     │ times │ │ 0 │ 19µs 402ns │ │
-#     │       │ │ 1 │  4µs 322ns │ │
-#     │       │ │ 2 │  3µs 352ns │ │
-#     │       │ │ 3 │  2µs 966ns │ │
-#     │       │ │ 4 │        3µs │ │
-#     │       │ │ 5 │   3µs 86ns │ │
-#     │       │ │ 6 │   3µs 84ns │ │
-#     │       │ │ 7 │  3µs 604ns │ │
-#     │       │ │ 8 │   3µs 98ns │ │
-#     │       │ │ 9 │  3µs 653ns │ │
-#     │       │ ╰───┴────────────╯ │
-#     ╰───────┴────────────────────╯
-#
-#     get a pretty benchmark report
-#     > std bench { 1 + 2 } --pretty
-#     3µs 125ns +/- 2µs 408ns
+@example "measure the performance of simple addition" { bench { 1 + 2 } -n 10 } --result {
+    mean: (4µs + 956ns)
+    std: (4µs + 831ns)
+    times: [
+        (19µs + 402ns)
+        ( 4µs + 322ns)
+        ( 3µs + 352ns)
+        ( 2µs + 966ns)
+        ( 3µs        )
+        ( 3µs +  86ns)
+        ( 3µs +  84ns)
+        ( 3µs + 604ns)
+        ( 3µs +  98ns)
+        ( 3µs + 653ns)
+    ]
+}
+@example "get a pretty benchmark report" { bench { 1 + 2 } --pretty } --result "3µs 125ns +/- 2µs 408ns"
 export def main [
     code: closure  # the piece of `nushell` code to measure the performance of
     --rounds (-n): int = 50  # the number of benchmark rounds (hopefully the more rounds the less variance)
     --verbose (-v) # be more verbose (namely prints the progress)
     --pretty # shows the results in human-readable format: "<mean> +/- <stddev>"
+]: [
+    nothing -> record<mean: duration, std: duration, times: list<duration>>
+    nothing -> string
 ] {
     let times: list<duration> = (
         seq 1 $rounds | each {|i|
diff --git a/crates/nu-std/std/dt/mod.nu b/crates/nu-std/std/dt/mod.nu
index 682fa9587c..95a2a9cb48 100644
--- a/crates/nu-std/std/dt/mod.nu
+++ b/crates/nu-std/std/dt/mod.nu
@@ -89,23 +89,23 @@ def borrow-second [from: record, current: record] {
 }
 
 # Subtract later from earlier datetime and return the unit differences as a record
-# Example:
-# > dt datetime-diff 2023-05-07T04:08:45+12:00 2019-05-10T09:59:12-07:00
-# ╭─────────────┬────╮
-# │ year        │ 3  │
-# │ month       │ 11 │
-# │ day         │ 26 │
-# │ hour        │ 23 │
-# │ minute      │ 9  │
-# │ second      │ 33 │
-# │ millisecond │ 0  │
-# │ microsecond │ 0  │
-# │ nanosecond  │ 0  │
-# ╰─────────────┴────╯
+@example "Get the difference between two dates" {
+    dt datetime-diff 2023-05-07T04:08:45+12:00 2019-05-10T09:59:12-07:00
+} --result {
+    year: 3,
+    month: 11,
+    day: 26,
+    hour: 23,
+    minute: 9,
+    second: 33,
+    millisecond: 0,
+    microsecond: 0,
+    nanosecond: 0,
+}
 export def datetime-diff [
-        later: datetime, # a later datetime
-        earlier: datetime  # earlier (starting) datetime
-    ] {
+    later: datetime, # a later datetime
+    earlier: datetime  # earlier (starting) datetime
+]: [nothing -> record] {
     if $earlier > $later {
         let start = (metadata $later).span.start
         let end = (metadata $earlier).span.end
@@ -162,10 +162,10 @@ export def datetime-diff [
 }
 
 # Convert record from datetime-diff into humanized string
-# Example:
-# > dt pretty-print-duration (dt datetime-diff 2023-05-07T04:08:45+12:00 2019-05-10T09:59:12+12:00)
-# 3yrs 11months 27days 18hrs 9mins 33secs
-export def pretty-print-duration [dur: record] {
+@example "Format the difference between two dates into a human readable string" {
+    dt pretty-print-duration (dt datetime-diff 2023-05-07T04:08:45+12:00 2019-05-10T09:59:12+12:00)
+} --result "3yrs 11months 27days 18hrs 9mins 33secs"
+export def pretty-print-duration [dur: record]: [nothing -> string] {
     mut result = ""
     if $dur.year != 0 {
         if $dur.year > 1 {
diff --git a/crates/nu-std/std/iter/mod.nu b/crates/nu-std/std/iter/mod.nu
index df5e03bd7b..d96852882c 100644
--- a/crates/nu-std/std/iter/mod.nu
+++ b/crates/nu-std/std/iter/mod.nu
@@ -14,21 +14,12 @@
 # > The closure also has to be valid for the types it receives
 # > These will be flagged as errors later as closure annotations
 # > are implemented
-#
-# # Example
-# ```
-# use std ["assert equal" "iter find"]
-#
-# let haystack = ["shell", "abc", "around", "nushell", "std"] 
-#
-# let found = ($haystack | iter find {|e| $e starts-with "a" })
-# let not_found = ($haystack | iter find {|e| $e mod 2 == 0})
-# 
-# assert equal $found "abc"
-# assert equal $not_found null
-# ```
-export def find [ # -> any | null  
-    fn: closure          # the closure used to perform the search 
+@example "Find an element starting with 'a'" {
+    ["shell", "abc", "around", "nushell", "std"] | iter find {|e| $e starts-with "a" }
+} --result "abc"
+@example "Try to find an element starting with 'a'" { ["shell", "abc", "around", "nushell", "std"] | iter find {|e| $e mod 2 == 0} } --result null
+export def find [
+    fn: closure # the closure used to perform the search 
 ] {
     filter {|e| try {do $fn $e} } | try { first }
 }
@@ -38,23 +29,14 @@ export def find [ # -> any | null
 #
 # # Invariant
 # > The closure has to return a bool
-#
-# # Example
-# ```nu
-# use std ["assert equal" "iter find-index"]
-#
-# let res = (
-#     ["iter", "abc", "shell", "around", "nushell", "std"]
-#     | iter find-index {|x| $x starts-with 's'}
-# )
-# assert equal $res 2
-#
-# let is_even = {|x| $x mod 2 == 0}
-# let res = ([3 5 13 91] | iter find-index $is_even)
-# assert equal $res -1
-# ```
-export def find-index [ # -> int
-    fn: closure                # the closure used to perform the search
+@example "Find the index of an element starting with 's'" {
+    ["iter", "abc", "shell", "around", "nushell", "std"] | iter find-index {|x| $x starts-with 's'}
+} --result 2
+@example "Try to find the index of an element starting with 's'" {
+    [3 5 13 91] | iter find-index {|x| $x mod 2 == 0}
+} --result -1
+export def find-index [
+    fn: closure # the closure used to perform the search
 ] {
     enumerate
     | find {|e| $e.item | do $fn $e.item }
@@ -63,16 +45,11 @@ export def find-index [ # -> int
 
 # Returns a new list with the separator between adjacent
 # items of the original list
-#
-# # Example
-# ```
-# use std ["assert equal" "iter intersperse"]
-#
-# let res = ([1 2 3 4] | iter intersperse 0)
-# assert equal $res [1 0 2 0 3 0 4]
-# ```
-export def intersperse [ # -> list<any>
-    separator: any              # the separator to be used
+@example "Intersperse the list with `0`" {
+    [1 2 3 4] | iter intersperse 0
+} --result [1 0 2 0 3 0 4]
+export def intersperse [
+    separator: any # the separator to be used
 ] {
     reduce --fold [] {|e, acc|
          $acc ++ [$e, $separator]
@@ -89,20 +66,12 @@ export def intersperse [ # -> list<any>
 # being the list element in the current iteration and the second
 # the internal state.
 # The internal state is also provided as pipeline input.
-#
-# # Example
-# ```
-# use std ["assert equal" "iter scan"]
-# let scanned = ([1 2 3] | iter scan 0 {|x, y| $x + $y})
-#
-# assert equal $scanned [0, 1, 3, 6]
-#
-# # use the --noinit(-n) flag to remove the initial value from
-# # the final result
-# let scanned = ([1 2 3] | iter scan 0 {|x, y| $x + $y} -n)
-#
-# assert equal $scanned [1, 3, 6]
-# ```
+@example "Get a running sum of the input list" {
+    [1 2 3] | iter scan 0 {|x, y| $x + $y}
+} --result [0, 1, 3, 6]
+@example "use the `--noinit(-n)` flag to remove the initial value from the final result" {
+    [1 2 3] | iter scan 0 {|x, y| $x + $y} -n
+} --result [1, 3, 6]
 export def scan [ # -> list<any>
     init: any            # initial value to seed the initial state
     fn: closure          # the closure to perform the scan
@@ -118,16 +87,10 @@ export def scan [ # -> list<any>
 # Returns a list of values for which the supplied closure does not
 # return `null` or an error. It is equivalent to 
 #     `$in | each $fn | filter $fn`
-#
-# # Example
-# ```nu
-# use std ["assert equal" "iter filter-map"]
-#
-# let res = ([2 5 "4" 7] | iter filter-map {|e| $e ** 2})
-#
-# assert equal $res [4 25 49]
-# ```
-export def filter-map [ # -> list<any>
+@example "Get the squares of elements that can be squared" {
+    [2 5 "4" 7] | iter filter-map {|e| $e ** 2}
+} --result [4, 25, 49]
+export def filter-map [
     fn: closure                # the closure to apply to the input
 ] {
     each {|$e|
@@ -143,16 +106,9 @@ export def filter-map [ # -> list<any>
 }
 
 # Maps a closure to each nested structure and flattens the result
-#
-# # Example
-# ```nu
-# use std ["assert equal" "iter flat-map"]
-#
-# let res = (
-#     [[1 2 3] [2 3 4] [5 6 7]] | iter flat-map {|e| $e | math sum}
-# )
-# assert equal $res [6 9 18]
-# ```
+@example "Get the sums of list elements" {
+    [[1 2 3] [2 3 4] [5 6 7]] | iter flat-map {|e| $e | math sum}
+} --result [6, 9, 18]
 export def flat-map [ # -> list<any>
     fn: closure              # the closure to map to the nested structures
 ] {
@@ -160,18 +116,10 @@ export def flat-map [ # -> list<any>
 }
 
 # Zips two structures and applies a closure to each of the zips
-#
-# # Example
-# ```nu
-# use std ["assert equal" "iter iter zip-with"]
-#
-# let res = (
-#     [1 2 3] | iter zip-with [2 3 4] {|a, b| $a + $b }
-# )
-#
-# assert equal $res [3 5 7]
-# ```
-export def zip-with [ # -> list<any>
+@example "Add two lists element-wise" {
+    [1 2 3] | iter zip-with [2 3 4] {|a, b| $a + $b }
+} --result [3, 5, 7]
+export def  zip-with [ # -> list<any>
     other: any               # the structure to zip with
     fn: closure              # the closure to apply to the zips
 ] {
@@ -182,20 +130,9 @@ export def zip-with [ # -> list<any>
 }
 
 # Zips two lists and returns a record with the first list as headers
-#
-# # Example
-# ```nu
-# use std ["assert equal" "iter iter zip-into-record"]
-#
-# let res = (
-#     [1 2 3] | iter zip-into-record [2 3 4]
-# )
-#
-# assert equal $res [
-#     [1 2 3];
-#     [2 3 4]
-# ]
-# ```
+@example "Create record from two lists" {
+    [1 2 3] | iter zip-into-record [2 3 4]
+} --result [{1: 2, 2: 3, 3: 4}]
 export def zip-into-record [ # -> table<any>
     other: list                     # the values to zip with
 ] {
diff --git a/crates/nu-std/std/mod.nu b/crates/nu-std/std/mod.nu
index 89454ee1f3..3251b8cc61 100644
--- a/crates/nu-std/std/mod.nu
+++ b/crates/nu-std/std/mod.nu
@@ -15,6 +15,7 @@ export module std/log
 export module std/math
 export module std/xml
 export module std/config
+export module std/testing
 
 # Load main dirs command and all subcommands
 export use std/dirs main
diff --git a/crates/nu-std/std/testing/mod.nu b/crates/nu-std/std/testing/mod.nu
new file mode 100644
index 0000000000..576d76d80e
--- /dev/null
+++ b/crates/nu-std/std/testing/mod.nu
@@ -0,0 +1,17 @@
+# Mark command as a test
+export alias "attr test" = echo
+
+# Mark a test command to be ignored
+export alias "attr ignore" = echo
+
+# Mark a command to be run before each test
+export alias "attr before-each" = echo
+
+# Mark a command to be run once before all tests
+export alias "attr before-all" = echo
+
+# Mark a command to be run after each test
+export alias "attr after-each" = echo
+
+# Mark a command to be run once after all tests
+export alias "attr after-all" = echo
diff --git a/crates/nu-std/std/util/mod.nu b/crates/nu-std/std/util/mod.nu
index 3a7e6c0dcd..5b196c0892 100644
--- a/crates/nu-std/std/util/mod.nu
+++ b/crates/nu-std/std/util/mod.nu
@@ -1,29 +1,15 @@
 # Add the given paths to the PATH.
-#
-# # Example
-# - adding some dummy paths to an empty PATH
-# ```nushell
-# >_ with-env { PATH: [] } {
-#     std path add "foo"
-#     std path add "bar" "baz"
-#     std path add "fooo" --append
-#
-#     assert equal $env.PATH ["bar" "baz" "foo" "fooo"]
-#
-#     print (std path add "returned" --ret)
-# }
-# ╭───┬──────────╮
-# │ 0 │ returned │
-# │ 1 │ bar      │
-# │ 2 │ baz      │
-# │ 3 │ foo      │
-# │ 4 │ fooo     │
-# ╰───┴──────────╯
-# ```
-# - adding paths based on the operating system
-# ```nushell
-# >_ std path add {linux: "foo", windows: "bar", darwin: "baz"}
-# ```
+@example "adding some dummy paths to an empty PATH" {
+    with-env { PATH: [] } {
+        path add "foo"
+        path add "bar" "baz"
+        path add "fooo" --append
+        path add "returned" --ret
+    }
+} --result [returned bar baz foo fooo]
+@example "adding paths based on the operating system" {
+    path add {linux: "foo", windows: "bar", darwin: "baz"}
+}
 export def --env "path add" [
     --ret (-r)  # return $env.PATH, useful in pipelines to avoid scoping.
     --append (-a)  # append to $env.PATH instead of prepending to.
@@ -82,11 +68,9 @@ export def ellie [] {
 }
 
 # repeat anything a bunch of times, yielding a list of *n* times the input
-#
-# # Examples
-#     repeat a string
-#     > "foo" | std repeat 3 | str join
-#     "foofoofoo"
+@example "repeat a string" {
+    "foo" | std repeat 3 | str join
+} --result "foofoofoo"
 export def repeat [
     n: int  # the number of repetitions, must be positive
 ]: any -> list<any> {
@@ -118,10 +102,9 @@ export const null_device = if $nu.os-info.name == "windows" {
 }
 
 # return a null device file.
-#
-# # Examples
-#     run a command and ignore it's stderr output
-#     > cat xxx.txt e> (null-device)
+@example "run a command and ignore it's stderr output" {
+    cat xxx.txt e> (null-device)
+}
 export def null-device []: nothing -> path {
     $null_device
 }
diff --git a/crates/nu-std/testing.nu b/crates/nu-std/testing.nu
index 2b55646df7..44d1867afe 100644
--- a/crates/nu-std/testing.nu
+++ b/crates/nu-std/testing.nu
@@ -14,43 +14,29 @@ def "nu-complete threads" [] {
 # test and test-skip annotations may be used multiple times throughout the module as the function names are stored in a list
 # Other annotations should only be used once within a module file
 # If you find yourself in need of multiple before- or after- functions it's a sign your test suite probably needs redesign
-def valid-annotations [] {
-    {
-        "#[test]": "test",
-        "#[ignore]": "test-skip",
-        "#[before-each]": "before-each"
-        "#[before-all]": "before-all"
-        "#[after-each]": "after-each"
-        "#[after-all]": "after-all"
-    }
+const valid_annotations = {
+    "test": "test",
+    "ignore": "test-skip",
+    "before-each": "before-each"
+    "before-all": "before-all"
+    "after-each": "after-each"
+    "after-all": "after-all"
 }
 
 # Returns a table containing the list of function names together with their annotations (comments above the declaration)
 def get-annotated [
     file: path
 ]: nothing -> table<function_name: string, annotation: string> {
-    let raw_file = (
-        open $file
-        | lines
-        | enumerate
-        | flatten
-    )
-
-    $raw_file
-    | where item starts-with def and index > 0
-    | insert annotation {|x|
-        $raw_file
-        | get ($x.index - 1)
-        | get item
-        | str trim
-    }
-    | where annotation in (valid-annotations|columns)
-    | reject index
-    | update item {
-        split column --collapse-empty ' '
-        | get column2.0
-    }
-    | rename function_name
+    ^$nu.current-exe -c $'
+        source `($file)`
+        scope commands
+        | select name attributes
+        | where attributes != []
+        | to nuon
+    '
+    | from nuon
+    | update attributes { get name | each {|x| $valid_annotations | get -i $x } | first }
+    | rename function_name annotation
 }
 
 # Takes table of function names and their annotations such as the one returned by get-annotated
@@ -72,10 +58,6 @@ def create-test-record []: nothing -> record<before-each: string, after-each: st
 
     let test_record = (
         $input
-        | update annotation {|x|
-            valid-annotations
-            | get $x.annotation
-        }
         | group-by --to-table annotation
         | update items {|x|
             $x.items.function_name
diff --git a/crates/nu-std/tests/logger_tests/test_basic_commands.nu b/crates/nu-std/tests/logger_tests/test_basic_commands.nu
index 3e22e10bb2..e1616b7f18 100644
--- a/crates/nu-std/tests/logger_tests/test_basic_commands.nu
+++ b/crates/nu-std/tests/logger_tests/test_basic_commands.nu
@@ -1,3 +1,4 @@
+use std/testing *
 use std/assert
 
 def run [
@@ -41,57 +42,57 @@ def "assert message short" [
     assert str contains $output "test message"
 }
 
-#[test]
+@test
 def critical [] {
     assert no message 99 critical
     assert message CRITICAL critical CRT
 }
 
-#[test]
+@test
 def critical_short [] {
     assert message short CRITICAL critical C
 }
 
-#[test]
+@test
 def error [] {
     assert no message CRITICAL error
     assert message ERROR error ERR
 }
 
-#[test]
+@test
 def error_short [] {
     assert message short ERROR error E
 }
 
-#[test]
+@test
 def warning [] {
     assert no message ERROR warning
     assert message WARNING warning WRN
 }
 
-#[test]
+@test
 def warning_short [] {
     assert message short WARNING warning W
 }
 
-#[test]
+@test
 def info [] {
     assert no message WARNING info
     assert message INFO info "INF" # INF has to be quoted, otherwise it is the `inf` float
 }
 
-#[test]
+@test
 def info_short [] {
     assert message short INFO info I
 }
 
-#[test]
+@test
 def debug [] {
     assert no message INFO debug
     assert message DEBUG debug DBG
 }
 
-#[test]
+@test
 def debug_short [] {
     assert message short DEBUG debug D
 }
diff --git a/crates/nu-std/tests/logger_tests/test_log_custom.nu b/crates/nu-std/tests/logger_tests/test_log_custom.nu
index 3965752734..be9c8a30fc 100644
--- a/crates/nu-std/tests/logger_tests/test_log_custom.nu
+++ b/crates/nu-std/tests/logger_tests/test_log_custom.nu
@@ -1,3 +1,4 @@
+use std/testing *
 use std/assert
 use commons.nu *
 
@@ -21,14 +22,14 @@ def run-command [
     | complete | get --ignore-errors stderr
 }
 
-#[test]
+@test
 def errors_during_deduction [] {
     assert str contains (run-command "DEBUG" "msg" "%MSG%" 25) "Cannot deduce log level prefix for given log level"
     assert str contains (run-command "DEBUG" "msg" "%MSG%" 25 --ansi (ansi red)) "Cannot deduce log level prefix for given log level"
     assert str contains (run-command "DEBUG" "msg" "%MSG%" 25 --level-prefix "abc") "Cannot deduce ansi for given log level"
 }
 
-#[test]
+@test
 def valid_calls [] {
     use std/log *
     assert equal (run-command "DEBUG" "msg" "%MSG%" 25 --level-prefix "abc" --ansi (ansi default) | str trim --right) "msg"
@@ -37,7 +38,7 @@ def valid_calls [] {
     assert equal (run-command "INFO" "msg" "%ANSI_START%%LEVEL% %MSG%%ANSI_STOP%" ((log-level).CRITICAL) | str trim --right) $"((log-ansi).CRITICAL)CRT msg(ansi reset)"
 }
 
-#[test]
+@test
 def log-level_handling [] {
     use std/log *
     assert equal (run-command "DEBUG" "msg" "%LEVEL% %MSG%" 20 | str trim --right) $"((log-prefix).INFO) msg"
diff --git a/crates/nu-std/tests/logger_tests/test_log_format_flag.nu b/crates/nu-std/tests/logger_tests/test_log_format_flag.nu
index 112f42dbea..76b1725e04 100644
--- a/crates/nu-std/tests/logger_tests/test_log_format_flag.nu
+++ b/crates/nu-std/tests/logger_tests/test_log_format_flag.nu
@@ -1,3 +1,4 @@
+use std/testing *
 use std *
 use std/log *
 use std/assert
@@ -40,7 +41,7 @@ def "assert formatted" [
     assert equal ($output | str trim --right) (format-message $message $format $prefix $ansi)
 }
 
-#[test]
+@test
 def format_flag [] {
     assert formatted "test" "25 %MSG% %ANSI_START% %LEVEL%%ANSI_STOP%" critical
     assert formatted "test" "25 %MSG% %ANSI_START% %LEVEL%%ANSI_STOP%" error
diff --git a/crates/nu-std/tests/logger_tests/test_logger_env.nu b/crates/nu-std/tests/logger_tests/test_logger_env.nu
index 2890dd8929..a8c2c55bed 100644
--- a/crates/nu-std/tests/logger_tests/test_logger_env.nu
+++ b/crates/nu-std/tests/logger_tests/test_logger_env.nu
@@ -1,8 +1,9 @@
+use std/testing *
 use std/assert
 use std/log
 use std/log *
 
-#[test]
+@test
 def env_log-ansi [] {
     assert equal (log-ansi).CRITICAL (ansi red_bold)
     assert equal (log-ansi).ERROR (ansi red)
@@ -11,7 +12,7 @@ def env_log-ansi [] {
     assert equal (log-ansi).DEBUG (ansi default_dimmed)
 }
 
-#[test]
+@test
 def env_log-level [] {
     assert equal (log-level).CRITICAL 50
     assert equal (log-level).ERROR 40
@@ -20,7 +21,7 @@ def env_log-level [] {
     assert equal (log-level).DEBUG 10
 }
 
-#[test]
+@test
 def env_log-prefix [] {
     assert equal (log-prefix).CRITICAL "CRT"
     assert equal (log-prefix).ERROR "ERR"
@@ -29,7 +30,7 @@ def env_log-prefix [] {
     assert equal (log-prefix).DEBUG "DBG"
 }
 
-#[test]
+@test
 def env_log-short-prefix [] {
     assert equal (log-short-prefix).CRITICAL "C"
     assert equal (log-short-prefix).ERROR "E"
@@ -38,7 +39,7 @@ def env_log-short-prefix [] {
     assert equal (log-short-prefix).DEBUG "D"
 }
 
-#[test]
+@test
 def env_log_format [] {
     assert equal $env.NU_LOG_FORMAT $"%ANSI_START%%DATE%|%LEVEL%|%MSG%%ANSI_STOP%"
 }
diff --git a/crates/nu-std/tests/test_asserts.nu b/crates/nu-std/tests/test_asserts.nu
index bc748891ba..69715dfaa9 100644
--- a/crates/nu-std/tests/test_asserts.nu
+++ b/crates/nu-std/tests/test_asserts.nu
@@ -1,7 +1,8 @@
+use std/testing *
 use std *
 use std/assert
 
-#[test]
+@test
 def assert_basic [] {
     assert true
     assert (1 + 2 == 3)
@@ -9,7 +10,7 @@ def assert_basic [] {
     assert error { assert (1 + 2 == 4) }
 }
 
-#[test]
+@test
 def assert_not [] {
     assert not false
     assert not (1 + 2 == 4)
@@ -17,7 +18,7 @@ def assert_not [] {
     assert error { assert not (1 + 2 == 3) }
 }
 
-#[test]
+@test
 def assert_equal [] {
     assert equal (1 + 2) 3
     assert equal (0.1 + 0.2 | into string | into float) 0.3 # 0.30000000000000004 == 0.3
@@ -25,7 +26,7 @@ def assert_equal [] {
     assert error { assert equal (1 + 2) 4 }
 }
 
-#[test]
+@test
 def assert_not_equal [] {
     assert not equal (1 + 2) 4
     assert not equal 1 "foo"
@@ -33,7 +34,7 @@ def assert_not_equal [] {
     assert error { assert not equal 1 1 }
 }
 
-#[test]
+@test
 def assert_error [] {
     let failing_code = {|| missing_code_to_run}
     assert error $failing_code
@@ -43,39 +44,39 @@ def assert_error [] {
     assert $assert_error_raised "The assert error should be false if there is no error in the executed code."
 }
 
-#[test]
+@test
 def assert_less [] {
     assert less 1 2
     assert error { assert less 1 1 }
 }
 
-#[test]
+@test
 def assert_less_or_equal [] {
     assert less or equal 1 2
     assert less or equal 1 1
     assert error { assert less or equal 1 0 }
 }
 
-#[test]
+@test
 def assert_greater [] {
     assert greater 2 1
     assert error { assert greater 2 2 }
 }
 
-#[test]
+@test
 def assert_greater_or_equal [] {
     assert greater or equal 1 1
     assert greater or equal 2 1
     assert error { assert greater or equal 0 1 }
 }
 
-#[test]
+@test
 def assert_length [] {
     assert length [0, 0, 0]  3
     assert error { assert length [0, 0] 3 }
 }
 
-#[ignore]
+@ignore
 def assert_skip [] {
     assert true # This test case is skipped on purpose
 }
diff --git a/crates/nu-std/tests/test_dirs.nu b/crates/nu-std/tests/test_dirs.nu
index c3ceb772e1..4c5b891829 100644
--- a/crates/nu-std/tests/test_dirs.nu
+++ b/crates/nu-std/tests/test_dirs.nu
@@ -1,3 +1,4 @@
+use std/testing *
 use std/assert
 use std/log
 
@@ -5,7 +6,7 @@ use std/log
 # Each 'use' for that module in the test script will execute the def --env block.
 # PWD at the time of the `use` will be what the export def --env block will see.
 
-#[before-each]
+@before-each
 def before-each [] {
     # need some directories to play with
     let base_path = ($nu.temp-path | path join $"test_dirs_(random uuid)")
@@ -17,7 +18,7 @@ def before-each [] {
     {base_path: $base_path, path_a: $path_a, path_b: $path_b}
 }
 
-#[after-each]
+@after-each
 def after-each [] {
     let base_path = $in.base_path
     cd $base_path
@@ -36,7 +37,7 @@ def cur_ring_check [expect_dir:string, expect_position: int scenario:string] {
     assert equal $expect_position $env.DIRS_POSITION $"position in ring after ($scenario)"
 }
 
-#[test]
+@test
 def dirs_command [] {
     # careful with order of these statements!
     # must capture value of $in before executing `use`s
@@ -87,7 +88,7 @@ def dirs_command [] {
     assert equal $env.PWD $c.base_path "drop changes PWD (regression test for #9449)"
 }
 
-#[test]
+@test
 def dirs_next [] {
     # must capture value of $in before executing `use`s
     let $c = $in
@@ -109,7 +110,7 @@ def dirs_next [] {
 
 }
 
-#[test]
+@test
 def dirs_cd [] {
     # must capture value of $in before executing `use`s
     let $c = $in
@@ -134,7 +135,7 @@ def dirs_cd [] {
     assert equal [$c.path_b $c.path_b] $env.DIRS_LIST "cd updated both positions in ring"
 }
 
-#[test]
+@test
 def dirs_goto_bug10696 [] {
     let $c = $in
     cd $c.base_path
@@ -148,7 +149,7 @@ def dirs_goto_bug10696 [] {
     assert equal $env.PWD $c.path_b "goto other, then goto to come back returns to same directory"
 }
 
-#[test]
+@test
 def dirs_goto [] {
     let $c = $in
     cd $c.base_path
diff --git a/crates/nu-std/tests/test_dt.nu b/crates/nu-std/tests/test_dt.nu
index 28f3201839..137d7538b1 100644
--- a/crates/nu-std/tests/test_dt.nu
+++ b/crates/nu-std/tests/test_dt.nu
@@ -1,44 +1,45 @@
+use std/testing *
 use std/assert
 use std/dt *
 
-#[test]
+@test
 def equal_times [] {
     let t1 = (date now)
     assert equal (datetime-diff $t1 $t1) ({year:0, month:0, day:0, hour:0, minute:0, second:0, millisecond:0, microsecond:0 nanosecond:0})
 }
 
-#[test]
+@test
 def one_ns_later [] {
     let t1 = (date now)
     assert equal (datetime-diff ($t1 + 1ns) $t1) ({year:0, month:0, day:0, hour:0, minute:0, second:0, millisecond:0, microsecond:0 nanosecond:1})
 }
 
-#[test]
+@test
 def one_yr_later [] {
     let t1 = ('2022-10-1T0:1:2z' | into datetime)   # a date for which one year later is 365 days, since duration doesn't support year or month
     assert equal (datetime-diff ($t1 + 365day) $t1) ({year:1, month:0, day:0, hour:0, minute:0, second:0, millisecond:0, microsecond:0 nanosecond:0})
 }
 
-#[test]
+@test
 def carry_ripples [] {
     let t1 = ('2023-10-9T0:0:0z' | into datetime)
     let t2 = ('2022-10-9T0:0:0.000000001z' | into datetime)
     assert equal (datetime-diff $t1 $t2) ({year:0, month:11, day:30, hour:23, minute:59, second:59, millisecond:999, microsecond:999 nanosecond:999})
 }
 
-#[test]
+@test
 def earlier_arg_must_be_less_or_equal_later [] {
     let t1 = ('2022-10-9T0:0:0.000000001z' | into datetime)
     let t2 = ('2023-10-9T0:0:0z' | into datetime)
     assert error {|| (datetime-diff $t1 $t2)} 
 }
 
-#[test]
+@test
 def pp_skips_zeros [] {
     assert equal (pretty-print-duration {year:1, month:0, day:0, hour:0, minute:0, second:0, millisecond:0, microsecond:0 nanosecond:0}) "1yr "
 }
 
-#[test]
+@test
 def pp_doesnt_skip_neg [] { # datetime-diff can't return negative units, but prettyprint shouldn't skip them (if passed handcrafted record)
     assert equal (pretty-print-duration {year:-1, month:0, day:0, hour:0, minute:0, second:0, millisecond:0, microsecond:0 nanosecond:0}) "-1yr "
-}
\ No newline at end of file
+}
diff --git a/crates/nu-std/tests/test_formats.nu b/crates/nu-std/tests/test_formats.nu
index 44a89eeaad..fb186f8ea7 100644
--- a/crates/nu-std/tests/test_formats.nu
+++ b/crates/nu-std/tests/test_formats.nu
@@ -1,4 +1,5 @@
 # Test std/formats when importing module-only
+use std/testing *
 use std/assert
 use std/formats *
 
@@ -30,113 +31,113 @@ def test_data_multiline [--nuon] {
   }
 }
 
-#[test]
+@test
 def from_ndjson_multiple_objects [] {
   let result = test_data_multiline | from ndjson
   let expect = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}]
   assert equal $result $expect "could not convert from NDJSON"
 }
 
-#[test]
+@test
 def from_ndjson_single_object [] {
   let result = '{"a": 1}' | from ndjson
   let expect = [{a:1}]
   assert equal $result $expect "could not convert from NDJSON"
 }
 
-#[test]
+@test
 def from_ndjson_invalid_object [] {
   assert error { '{"a":1' | from ndjson }
 }
 
-#[test]
+@test
 def from_jsonl_multiple_objects [] {
   let result = test_data_multiline | from jsonl
   let expect = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}]
   assert equal $result $expect "could not convert from JSONL"
 }
 
-#[test]
+@test
 def from_jsonl_single_object [] {
   let result = '{"a": 1}' | from jsonl
   let expect = [{a:1}]
   assert equal $result $expect "could not convert from JSONL"
 }
 
-#[test]
+@test
 def from_jsonl_invalid_object [] {
   assert error { '{"a":1' | from jsonl }
 }
 
-#[test]
+@test
 def to_ndjson_multiple_objects [] {
   let result = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}] | to ndjson | str trim
   let expect = test_data_multiline
   assert equal $result $expect "could not convert to NDJSON"
 }
 
-#[test]
+@test
 def to_ndjson_single_object [] {
   let result = [{a:1}] | to ndjson | str trim
   let expect = "{\"a\":1}"
   assert equal $result $expect "could not convert to NDJSON"
 }
 
-#[test]
+@test
 def to_jsonl_multiple_objects [] {
   let result = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}] | to jsonl | str trim
   let expect = test_data_multiline
   assert equal $result $expect "could not convert to JSONL"
 }
 
-#[test]
+@test
 def to_jsonl_single_object [] {
   let result = [{a:1}] | to jsonl | str trim
   let expect = "{\"a\":1}"
   assert equal $result $expect "could not convert to JSONL"
 }
 
-#[test]
+@test
 def from_ndnuon_multiple_objects [] {
   let result = test_data_multiline | from ndnuon
   let expect = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}]
   assert equal $result $expect "could not convert from NDNUON"
 }
 
-#[test]
+@test
 def from_ndnuon_single_object [] {
   let result = '{a: 1}' | from ndnuon
   let expect = [{a:1}]
   assert equal $result $expect "could not convert from NDNUON"
 }
 
-#[test]
+@test
 def from_ndnuon_invalid_object [] {
   assert error { '{"a":1' | formats from ndnuon }
 }
 
-#[test]
+@test
 def to_ndnuon_multiple_objects [] {
   let result = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}] | to ndnuon | str trim
   let expect = test_data_multiline --nuon
   assert equal $result $expect "could not convert to NDNUON"
 }
 
-#[test]
+@test
 def to_ndnuon_single_object [] {
   let result = [{a:1}] | to ndnuon | str trim
   let expect = "{a: 1}"
   assert equal $result $expect "could not convert to NDNUON"
 }
 
-#[test]
+@test
 def to_ndnuon_multiline_strings [] {
   let result = "foo\n\\n\nbar" | to ndnuon
   let expect = '"foo\n\\n\nbar"'
   assert equal $result $expect "could not convert multiline string to NDNUON"
 }
 
-#[test]
+@test
 def from_ndnuon_multiline_strings [] {
   let result = '"foo\n\\n\nbar"' | from ndnuon
   let expect = ["foo\n\\n\nbar"]
diff --git a/crates/nu-std/tests/test_help.nu b/crates/nu-std/tests/test_help.nu
index 07ea7c6e4c..3e62bef630 100644
--- a/crates/nu-std/tests/test_help.nu
+++ b/crates/nu-std/tests/test_help.nu
@@ -1,13 +1,14 @@
+use std/testing *
 use std/assert
 use std/help
 
-#[test]
+@test
 def show_help_on_commands [] {
     let help_result = (help alias)
     assert ("item not found" not-in $help_result)
 }
 
-#[test]
+@test
 def show_help_on_error_make [] {
     let help_result = (help error make)
     assert ("Error: nu::shell::eval_block_with_input" not-in $help_result)
diff --git a/crates/nu-std/tests/test_iter.nu b/crates/nu-std/tests/test_iter.nu
index 291ecffe90..8a2d94506c 100644
--- a/crates/nu-std/tests/test_iter.nu
+++ b/crates/nu-std/tests/test_iter.nu
@@ -1,7 +1,8 @@
+use std/testing *
 use std *
 use std/assert
 
-#[test]
+@test
 def iter_find [] {
     let hastack1 = [1 2 3 4 5 6 7]
     let hastack2 = [nushell rust shell iter std]
@@ -20,7 +21,7 @@ def iter_find [] {
     assert equal $res null
 }
 
-#[test]
+@test
 def iter_intersperse [] {
     let res = ([1 2 3 4] | iter intersperse 0)
     assert equal $res [1 0 2 0 3 0 4]
@@ -41,7 +42,7 @@ def iter_intersperse [] {
     assert equal $res [4]
 }
 
-#[test]
+@test
 def iter_scan [] {
     let scanned = ([1 2 3] | iter scan 0 {|x, y| $x + $y} -n)
     assert equal $scanned [1, 3, 6]
@@ -56,7 +57,7 @@ def iter_scan [] {
     assert equal $scanned ["a" "ab" "abc" "abcd"]
 }
 
-#[test]
+@test
 def iter_filter_map [] {
     let res = ([2 5 "4" 7] | iter filter-map {|it| $it ** 2})
     assert equal $res [4 25 49]
@@ -68,7 +69,7 @@ def iter_filter_map [] {
     assert equal $res [3 42 69]
 }
 
-#[test]
+@test
 def iter_find_index [] {
     let res = (
          ["iter", "abc", "shell", "around", "nushell", "std"]
@@ -84,7 +85,7 @@ def iter_find_index [] {
     assert equal $res 0
 }
 
-#[test]
+@test
 def iter_zip_with [] {
     let res = (
         [1 2 3] | iter zip-with [2 3 4] {|a, b| $a + $b }
@@ -111,7 +112,7 @@ def iter_zip_with [] {
     ]
 }
 
-#[test]
+@test
 def iter_flat_map [] {
     let res = (
         [[1 2 3] [2 3 4] [5 6 7]] | iter flat-map {|it| $it | math sum}
@@ -122,7 +123,7 @@ def iter_flat_map [] {
     assert equal $res [11 22 33]
 }
 
-#[test]
+@test
 def iter_zip_into_record [] {
     let headers = [name repo position]
     let values = [rust github 1]
diff --git a/crates/nu-std/tests/test_prelude.nu b/crates/nu-std/tests/test_prelude.nu
index b163ddd15f..3d5d04aecb 100644
--- a/crates/nu-std/tests/test_prelude.nu
+++ b/crates/nu-std/tests/test_prelude.nu
@@ -1,6 +1,7 @@
+use std/testing *
 use std/assert
 
-#[test]
+@test
 def banner [] {
     use std/prelude
     assert ((prelude banner | lines | length) == 16)
diff --git a/crates/nu-std/tests/test_setup_teardown.nu b/crates/nu-std/tests/test_setup_teardown.nu
index d19ba915fb..e39994169b 100644
--- a/crates/nu-std/tests/test_setup_teardown.nu
+++ b/crates/nu-std/tests/test_setup_teardown.nu
@@ -1,28 +1,29 @@
+use std/testing *
 use std/log
 use std/assert
 
-#[before-each]
+@before-each
 def before-each [] {
     log debug "Setup is running"
     {msg: "This is the context"}
 }
 
-#[after-each]
+@after-each
 def after-each [] {
     log debug $"Teardown is running. Context: ($in)"
 }
 
-#[test]
+@test
 def assert_pass [] {
     log debug $"Assert is running. Context: ($in)"
 }
 
-#[ignore]
+@ignore
 def assert_skip [] {
     log debug $"Assert is running. Context: ($in)"
 }
 
-#[ignore]
+@ignore
 def assert_fail_skipped_by_default [] {
     # Change test-skip to test if you want to see what happens if a test fails
     log debug $"Assert is running. Context: ($in)"
diff --git a/crates/nu-std/tests/test_std_formats.nu b/crates/nu-std/tests/test_std_formats.nu
index 1ca7516c20..44853672fb 100644
--- a/crates/nu-std/tests/test_std_formats.nu
+++ b/crates/nu-std/tests/test_std_formats.nu
@@ -1,4 +1,5 @@
 # Test std/formats when importing `use std *`
+use std/testing *
 use std *
 
 def test_data_multiline [--nuon] {
@@ -30,113 +31,113 @@ def test_data_multiline [--nuon] {
   }
 }
 
-#[test]
+@test
 def from_ndjson_multiple_objects [] {
   let result = test_data_multiline | formats from ndjson
   let expect = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}]
   assert equal $result $expect "could not convert from NDJSON"
 }
 
-#[test]
+@test
 def from_ndjson_single_object [] {
   let result = '{"a": 1}' | formats from ndjson
   let expect = [{a:1}]
   assert equal $result $expect "could not convert from NDJSON"
 }
 
-#[test]
+@test
 def from_ndjson_invalid_object [] {
   assert error { '{"a":1' | formats from ndjson }
 }
 
-#[test]
+@test
 def from_jsonl_multiple_objects [] {
   let result = test_data_multiline | formats from jsonl
   let expect = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}]
   assert equal $result $expect "could not convert from JSONL"
 }
 
-#[test]
+@test
 def from_jsonl_single_object [] {
   let result = '{"a": 1}' | formats from jsonl
   let expect = [{a:1}]
   assert equal $result $expect "could not convert from JSONL"
 }
 
-#[test]
+@test
 def from_jsonl_invalid_object [] {
   assert error { '{"a":1' | formats from jsonl }
 }
 
-#[test]
+@test
 def to_ndjson_multiple_objects [] {
   let result = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}] | formats to ndjson | str trim
   let expect = test_data_multiline
   assert equal $result $expect "could not convert to NDJSON"
 }
 
-#[test]
+@test
 def to_ndjson_single_object [] {
   let result = [{a:1}] | formats to ndjson | str trim
   let expect = "{\"a\":1}"
   assert equal $result $expect "could not convert to NDJSON"
 }
 
-#[test]
+@test
 def to_jsonl_multiple_objects [] {
   let result = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}] | formats to jsonl | str trim
   let expect = test_data_multiline
   assert equal $result $expect "could not convert to JSONL"
 }
 
-#[test]
+@test
 def to_jsonl_single_object [] {
   let result = [{a:1}] | formats to jsonl | str trim
   let expect = "{\"a\":1}"
   assert equal $result $expect "could not convert to JSONL"
 }
 
-#[test]
+@test
 def from_ndnuon_multiple_objects [] {
   let result = test_data_multiline | formats from ndnuon
   let expect = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}]
   assert equal $result $expect "could not convert from NDNUON"
 }
 
-#[test]
+@test
 def from_ndnuon_single_object [] {
   let result = '{a: 1}' | formats from ndnuon
   let expect = [{a:1}]
   assert equal $result $expect "could not convert from NDNUON"
 }
 
-#[test]
+@test
 def from_ndnuon_invalid_object [] {
   assert error { '{"a":1' | formats from ndnuon }
 }
 
-#[test]
+@test
 def to_ndnuon_multiple_objects [] {
   let result = [{a:1},{a:2},{a:3},{a:4},{a:5},{a:6}] | formats to ndnuon | str trim
   let expect = test_data_multiline --nuon
   assert equal $result $expect "could not convert to NDNUON"
 }
 
-#[test]
+@test
 def to_ndnuon_single_object [] {
   let result = [{a:1}] | formats to ndnuon | str trim
   let expect = "{a: 1}"
   assert equal $result $expect "could not convert to NDNUON"
 }
 
-#[test]
+@test
 def to_ndnuon_multiline_strings [] {
   let result = "foo\n\\n\nbar" | formats to ndnuon
   let expect = '"foo\n\\n\nbar"'
   assert equal $result $expect "could not convert multiline string to NDNUON"
 }
 
-#[test]
+@test
 def from_ndnuon_multiline_strings [] {
   let result = '"foo\n\\n\nbar"' | formats from ndnuon
   let expect = ["foo\n\\n\nbar"]
diff --git a/crates/nu-std/tests/test_std_postload.nu b/crates/nu-std/tests/test_std_postload.nu
index 6b1352350e..3ce6578d20 100644
--- a/crates/nu-std/tests/test_std_postload.nu
+++ b/crates/nu-std/tests/test_std_postload.nu
@@ -1,11 +1,12 @@
+use std/testing *
 use std/assert
 export use std *
 
-#[test]
+@test
 def std_post_import [] {
   assert length (scope commands | where name == "path add") 1
   assert length (scope commands | where name == "ellie") 1
   assert length (scope commands | where name == "repeat") 1
   assert length (scope commands | where name == "formats from jsonl") 1
   assert length (scope commands | where name == "dt datetime-diff") 1
-}
\ No newline at end of file
+}
diff --git a/crates/nu-std/tests/test_std_preload.nu b/crates/nu-std/tests/test_std_preload.nu
index a1f88249b6..af697f635c 100644
--- a/crates/nu-std/tests/test_std_preload.nu
+++ b/crates/nu-std/tests/test_std_preload.nu
@@ -1,6 +1,7 @@
+use std/testing *
 use std/assert
 
-#[test]
+@test
 def std_pre_import [] {
   # These commands shouldn't exist without an import
   assert length (scope commands | where name == "path add") 0
@@ -8,4 +9,4 @@ def std_pre_import [] {
   assert length (scope commands | where name == "repeat") 0
   assert length (scope commands | where name == "from jsonl") 0
   assert length (scope commands | where name == "datetime-diff") 0
-}
\ No newline at end of file
+}
diff --git a/crates/nu-std/tests/test_std_util.nu b/crates/nu-std/tests/test_std_util.nu
index 2ba4fb3950..2b3203d667 100644
--- a/crates/nu-std/tests/test_std_util.nu
+++ b/crates/nu-std/tests/test_std_util.nu
@@ -1,6 +1,7 @@
+use std/testing *
 use std *
 
-#[test]
+@test
 def path_add [] {
     use std/assert
 
@@ -44,7 +45,7 @@ def path_add [] {
     }
 }
 
-#[test]
+@test
 def path_add_expand [] {
     use std/assert
 
@@ -70,7 +71,7 @@ def path_add_expand [] {
     rm $real_dir $link_dir
 }
 
-#[test]
+@test
 def repeat_things [] {
     use std/assert
     assert error { "foo" | repeat -1 }
diff --git a/crates/nu-std/tests/test_util.nu b/crates/nu-std/tests/test_util.nu
index fe819bc400..ca99e2f654 100644
--- a/crates/nu-std/tests/test_util.nu
+++ b/crates/nu-std/tests/test_util.nu
@@ -1,6 +1,7 @@
+use std/testing *
 use std/util *
 
-#[test]
+@test
 def path_add [] {
     use std/assert
 
@@ -44,7 +45,7 @@ def path_add [] {
     }
 }
 
-#[test]
+@test
 def path_add_expand [] {
     use std/assert
 
@@ -70,7 +71,7 @@ def path_add_expand [] {
     rm $real_dir $link_dir
 }
 
-#[test]
+@test
 def repeat_things [] {
     use std/assert
     assert error { "foo" | repeat -1 }
diff --git a/crates/nu-std/tests/test_xml.nu b/crates/nu-std/tests/test_xml.nu
index 16cbb712bc..9de1d356a5 100644
--- a/crates/nu-std/tests/test_xml.nu
+++ b/crates/nu-std/tests/test_xml.nu
@@ -1,7 +1,8 @@
+use std/testing *
 use std/xml *
 use std/assert
 
-#[before-each]
+@before-each
 def before-each [] {
     {sample_xml: ('
         <a>
@@ -17,7 +18,7 @@ def before-each [] {
     }
 }
 
-#[test]
+@test
 def xml_xaccess [] {
     let sample_xml = $in.sample_xml
 
@@ -28,7 +29,7 @@ def xml_xaccess [] {
     assert equal ($sample_xml | xaccess [* * * {|e| $e.attributes != {}}]) [[tag, attributes, content]; [c, {a: b}, []]]
 }
 
-#[test]
+@test
 def xml_xupdate [] {
     let sample_xml = $in.sample_xml
 
@@ -37,7 +38,7 @@ def xml_xupdate [] {
     assert equal ($sample_xml | xupdate [* * * {|e| $e.attributes != {}}] {|x| $x | update content ['xml']}) {tag: a, attributes: {}, content: [[tag, attributes, content]; [b, {}, [[tag, attributes, content]; [c, {a: b}, [xml]]]], [c, {}, []], [d, {}, [[tag, attributes, content]; [e, {}, [[tag, attributes, content]; [null, null, z]]], [e, {}, [[tag, attributes, content]; [null, null, x]]]]]]}
 }
 
-#[test]
+@test
 def xml_xinsert [] {
     let sample_xml = $in.sample_xml
 
diff --git a/crates/nuon/src/from.rs b/crates/nuon/src/from.rs
index 0c94434a1a..04fec72e3f 100644
--- a/crates/nuon/src/from.rs
+++ b/crates/nuon/src/from.rs
@@ -118,6 +118,12 @@ fn convert_to_value(
     original_text: &str,
 ) -> Result<Value, ShellError> {
     match expr.expr {
+        Expr::AttributeBlock(..) => Err(ShellError::OutsideSpannedLabeledError {
+            src: original_text.to_string(),
+            error: "Error when loading".into(),
+            msg: "attributes not supported in nuon".into(),
+            span: expr.span,
+        }),
         Expr::BinaryOp(..) => Err(ShellError::OutsideSpannedLabeledError {
             src: original_text.to_string(),
             error: "Error when loading".into(),

From 81243c48f08efdfd98c1ff12c9908370219b328d Mon Sep 17 00:00:00 2001
From: Wind <WindSoilder@outlook.com>
Date: Tue, 11 Feb 2025 20:40:15 +0800
Subject: [PATCH 1042/1072] make plugin compatible with nightly nushell version
 (#15084)

# Description
Close: #15083

This pr will set `pre` field of version to `Prerelease::EMPTY`, as
nushell does not require this level of checking currently.

# User-Facing Changes
NaN

# Tests + Formatting
Added 1 test

# After Submitting
NaN
---
 crates/nu-plugin-protocol/src/protocol_info.rs |  7 +++++++
 crates/nu-plugin-protocol/src/tests.rs         | 17 +++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/crates/nu-plugin-protocol/src/protocol_info.rs b/crates/nu-plugin-protocol/src/protocol_info.rs
index eb64bd6925..a84b3578d0 100644
--- a/crates/nu-plugin-protocol/src/protocol_info.rs
+++ b/crates/nu-plugin-protocol/src/protocol_info.rs
@@ -1,4 +1,5 @@
 use nu_protocol::ShellError;
+use semver::Prerelease;
 use serde::{Deserialize, Serialize};
 
 /// Protocol information, sent as a `Hello` message on initialization. This determines the
@@ -42,6 +43,12 @@ impl ProtocolInfo {
 
         versions.sort();
 
+        // The version may be a nightly version (1.2.3-nightly.1).
+        // It's good to mark the prerelease field as empty, so plugins
+        // can work with a nightly version of Nushell.
+        versions[1].pre = Prerelease::EMPTY;
+        versions[0].pre = Prerelease::EMPTY;
+
         // For example, if the lower version is 1.1.0, and the higher version is 1.2.3, the
         // requirement is that 1.2.3 matches ^1.1.0 (which it does)
         Ok(semver::Comparator {
diff --git a/crates/nu-plugin-protocol/src/tests.rs b/crates/nu-plugin-protocol/src/tests.rs
index 19410d317b..65b8b9fadc 100644
--- a/crates/nu-plugin-protocol/src/tests.rs
+++ b/crates/nu-plugin-protocol/src/tests.rs
@@ -33,3 +33,20 @@ fn protocol_info_incompatible() -> Result<(), ShellError> {
     assert!(!ver_1_1_0.is_compatible_with(&ver_2_0_0)?);
     Ok(())
 }
+
+#[test]
+fn protocol_info_compatible_with_nightly() -> Result<(), ShellError> {
+    let ver_1_2_3 = ProtocolInfo {
+        protocol: Protocol::NuPlugin,
+        version: "1.2.3".into(),
+        features: vec![],
+    };
+    let ver_1_1_0 = ProtocolInfo {
+        protocol: Protocol::NuPlugin,
+        version: "1.1.0-nightly.1".into(),
+        features: vec![],
+    };
+    assert!(ver_1_1_0.is_compatible_with(&ver_1_2_3)?);
+    assert!(ver_1_2_3.is_compatible_with(&ver_1_1_0)?);
+    Ok(())
+}

From 1128fa137f8a1b1f222088c5af0fa7b07d7aad0f Mon Sep 17 00:00:00 2001
From: Yash Thakur <45539777+ysthakur@users.noreply.github.com>
Date: Tue, 11 Feb 2025 09:51:34 -0500
Subject: [PATCH 1043/1072] Fix spread operator lexing in records (#15023)

# Description

Zyphys found that when parsing `{...{}, ...{}, a: 1}`, the `a:` would be
considered one token, leading to a parse error ([Discord
message](https://discord.com/channels/601130461678272522/614593951969574961/1336762075535511573)).
This PR fixes that.

What would happen is that while getting tokens, the following would
happen in a loop:
1. Get the next two tokens while treating `:` as a special character (so
we get the next field key and a colon token)
2. Get the next token while not treating `:` as a special character (so
we get the next value)

I didn't update this when I added the spread operator. With `{...{},
...{}, a: 1}`, the first two tokens would be `...{}` and `...{}`, and
the next token would be `a:`. This PR changes this loop to first get a
single token, check if it's spreading a record, and move on if so.

Alternatives considered:
- Treat `:` as a special character when getting the value too. This
would simplify the loop greatly, but would mean you can't use colons in
values.
- Merge the loop for getting tokens and the loop for parsing those
tokens. I tried this, but it complicates things if you run into a syntax
error and want to create a garbage span going to the end of the record.

# User-Facing Changes

Nothing new
---
 crates/nu-parser/src/parser.rs | 32 +++++++++++++++++++++-----------
 tests/repl/test_spread.rs      |  1 +
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index d2d3e5c6e1..30c014718a 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -6013,20 +6013,30 @@ pub fn parse_record(working_set: &mut StateWorkingSet, span: Span) -> Expression
         error: None,
         span_offset: start,
     };
-    let mut lex_n = |additional_whitespace, special_tokens, max_tokens| {
-        lex_n_tokens(
-            &mut lex_state,
-            additional_whitespace,
-            special_tokens,
-            true,
-            max_tokens,
-        )
-    };
     loop {
-        if lex_n(&[b'\n', b'\r', b','], &[b':'], 2) < 2 {
+        let additional_whitespace = &[b'\n', b'\r', b','];
+        if lex_n_tokens(&mut lex_state, additional_whitespace, &[b':'], true, 1) < 1 {
             break;
         };
-        if lex_n(&[b'\n', b'\r', b','], &[], 1) < 1 {
+        let span = lex_state
+            .output
+            .last()
+            .expect("should have gotten 1 token")
+            .span;
+        let contents = working_set.get_span_contents(span);
+        if contents.len() > 3
+            && contents.starts_with(b"...")
+            && (contents[3] == b'$' || contents[3] == b'{' || contents[3] == b'(')
+        {
+            // This was a spread operator, so there's no value
+            continue;
+        }
+        // Get token for colon
+        if lex_n_tokens(&mut lex_state, additional_whitespace, &[b':'], true, 1) < 1 {
+            break;
+        };
+        // Get token for value
+        if lex_n_tokens(&mut lex_state, additional_whitespace, &[], true, 1) < 1 {
             break;
         };
     }
diff --git a/tests/repl/test_spread.rs b/tests/repl/test_spread.rs
index 5c3311caf4..96628d2284 100644
--- a/tests/repl/test_spread.rs
+++ b/tests/repl/test_spread.rs
@@ -65,6 +65,7 @@ fn spread_type_list() -> TestResult {
 
 #[test]
 fn spread_in_record() -> TestResult {
+    run_test(r#"{...{} ...{}, a: 1} | to nuon"#, "{a: 1}").unwrap();
     run_test(r#"{...{...{...{}}}} | to nuon"#, "{}").unwrap();
     run_test(
         r#"{foo: bar ...{a: {x: 1}} b: 3} | to nuon"#,

From 0430167f1cc0189573df2873f8078819514f8d7d Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Tue, 11 Feb 2025 21:13:34 +0100
Subject: [PATCH 1044/1072] Use `proc-macro-error2` instead of
 `proc-macro-error` (#15093)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

This PR replaces the usage of `proc-macro-error` with
`proc-macro-error2`. At the time of writing `nu-derive-value` this
wasn't an option, at least it wasn't clear that it is the direction to
go. This shouldn't change any of the usage of `nu-derive-value` in any
way but removes one security warning.

`proc-macro-error` depends on `syn 1`, that's why I initially had the
default features for `proc-macro-error` disabled. `proc-macro-error2`
uses `syn 2` as mostly everything. So we can use that.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

Same interface, no changes.

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

The tests for `nu-derive-value` do not test spans, so maybe something
changed now but probably not.

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->

We still have `quickcheck` which depends on `syn 1` but it seems we need
that for `nu-cmd-lang`. Would be great if, in the future, we can get rid
of `syn 1` as that should improve build times a bit.
---
 Cargo.lock                          | 19 +++++++++----------
 Cargo.toml                          |  2 +-
 crates/nu-derive-value/Cargo.toml   |  2 +-
 crates/nu-derive-value/src/error.rs |  2 +-
 crates/nu-derive-value/src/lib.rs   |  2 +-
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 749bf7babf..58a8ed9c49 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3716,7 +3716,7 @@ name = "nu-derive-value"
 version = "0.102.1"
 dependencies = [
  "heck",
- "proc-macro-error",
+ "proc-macro-error2",
  "proc-macro2",
  "quote",
  "syn 2.0.90",
@@ -5452,26 +5452,25 @@ dependencies = [
 ]
 
 [[package]]
-name = "proc-macro-error"
-version = "1.0.4"
+name = "proc-macro-error-attr2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
 dependencies = [
- "proc-macro-error-attr",
  "proc-macro2",
  "quote",
- "version_check",
 ]
 
 [[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
+name = "proc-macro-error2"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
 dependencies = [
+ "proc-macro-error-attr2",
  "proc-macro2",
  "quote",
- "version_check",
+ "syn 2.0.90",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index fb803dd17c..259e4c1371 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -127,7 +127,7 @@ pathdiff = "0.2"
 percent-encoding = "2"
 pretty_assertions = "1.4"
 print-positions = "0.6"
-proc-macro-error = { version = "1.0", default-features = false }
+proc-macro-error2 = "2.0"
 proc-macro2 = "1.0"
 procfs = "0.17.0"
 pwd = "1.3"
diff --git a/crates/nu-derive-value/Cargo.toml b/crates/nu-derive-value/Cargo.toml
index 8a6b2ce9da..a8b25de68c 100644
--- a/crates/nu-derive-value/Cargo.toml
+++ b/crates/nu-derive-value/Cargo.toml
@@ -20,5 +20,5 @@ workspace = true
 proc-macro2 = { workspace = true }
 syn = { workspace = true }
 quote = { workspace = true }
-proc-macro-error = { workspace = true }
+proc-macro-error2 = { workspace = true }
 heck = { workspace = true }
\ No newline at end of file
diff --git a/crates/nu-derive-value/src/error.rs b/crates/nu-derive-value/src/error.rs
index cde155044e..d5f3587b33 100644
--- a/crates/nu-derive-value/src/error.rs
+++ b/crates/nu-derive-value/src/error.rs
@@ -1,7 +1,7 @@
 use std::{any, fmt::Debug, marker::PhantomData};
 
 use proc_macro2::Span;
-use proc_macro_error::{Diagnostic, Level};
+use proc_macro_error2::{Diagnostic, Level};
 
 #[derive(Debug)]
 pub enum DeriveError<M> {
diff --git a/crates/nu-derive-value/src/lib.rs b/crates/nu-derive-value/src/lib.rs
index 5d87951927..611f713b64 100644
--- a/crates/nu-derive-value/src/lib.rs
+++ b/crates/nu-derive-value/src/lib.rs
@@ -29,7 +29,7 @@
 
 use proc_macro::TokenStream;
 use proc_macro2::TokenStream as TokenStream2;
-use proc_macro_error::{proc_macro_error, Diagnostic};
+use proc_macro_error2::{proc_macro_error, Diagnostic};
 
 mod attributes;
 mod case;

From f7d5162582314a6d8a10eff978fdb2c9f59a6af6 Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Wed, 12 Feb 2025 01:33:27 +0300
Subject: [PATCH 1045/1072] docs(std-rfc): use actual examples rather than doc
 comments (#15097)

# Description
Update examples with attributes.

# User-Facing Changes
`std-rfc` commands now have examples.

# Tests + Formatting
N/A

# After Submitting
N/A
---
 crates/nu-std/std-rfc/clip/mod.nu        |  31 +++---
 crates/nu-std/std-rfc/conversions/mod.nu | 120 +++++++----------------
 crates/nu-std/std-rfc/kv/mod.nu          |  22 +++--
 crates/nu-std/std-rfc/path/mod.nu        |  71 +++++---------
 crates/nu-std/std-rfc/str/mod.nu         |  65 ++++++------
 crates/nu-std/std-rfc/tables/mod.nu      |  79 ++++++---------
 6 files changed, 151 insertions(+), 237 deletions(-)

diff --git a/crates/nu-std/std-rfc/clip/mod.nu b/crates/nu-std/std-rfc/clip/mod.nu
index 2c48562783..60e8d0fefe 100644
--- a/crates/nu-std/std-rfc/clip/mod.nu
+++ b/crates/nu-std/std-rfc/clip/mod.nu
@@ -4,11 +4,9 @@
 # > Terminal multiplexers such as screen, tmux, zellij etc may interfere with this command
 
 # Copy input to system clipboard
-#
-# # Example
-# ```nushell
-# >_ "Hello" | clip copy
-# ```
+@example "Copy a string to the clipboard" {
+  "Hello" | clip copy
+}
 export def copy [
   --ansi (-a)                 # Copy ansi formatting
 ]: any -> nothing {
@@ -35,12 +33,9 @@ export def copy [
 }
 
 # Paste contents of system clipboard
-#
-# # Example
-# ```nushell
-# >_ clip paste
-# "Hello"
-# ```
+@example "Paste a string from the clipboard" {
+  clip paste
+} --result "Hello"
 export def paste []: [nothing -> string] {
 	try {
 		term query $'(ansi osc)52;c;?(ansi st)' -p $'(ansi osc)52;c;' -t (ansi st)
@@ -56,9 +51,17 @@ export def paste []: [nothing -> string] {
 }
 
 # Add a prefix to each line of the content to be copied
-#
-# # Example: Format output for Nushell doc
-# ls | clip prefix '# => ' | clip copy
+@example "Format output for Nushell doc" {
+  [1 2 3] | clip prefix '# => '
+} --result "# => ╭───┬───╮
+# => │ 0 │ 1 │
+# => │ 1 │ 2 │
+# => │ 2 │ 3 │
+# => ╰───┴───╯
+# => "
+@example "Format output for Nushell doc and copy it" {
+  ls | clip prefix '# => ' | clip copy
+}
 export def prefix [prefix: string]: any -> string {
   let input = $in | collect
   match ($input | describe -d | get type) {
diff --git a/crates/nu-std/std-rfc/conversions/mod.nu b/crates/nu-std/std-rfc/conversions/mod.nu
index 2d18699164..586597276f 100644
--- a/crates/nu-std/std-rfc/conversions/mod.nu
+++ b/crates/nu-std/std-rfc/conversions/mod.nu
@@ -1,10 +1,9 @@
 # Convert a Nushell value to a list
 # 
 # Primary useful for range-to-list, but other types are accepted as well.
-# 
-# Example:
-#
-# 1..10 | into list
+@example "Convert a range to a list" {
+    1..10 | into list
+} --result [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
 export def "into list" []: any -> list {
   let input = $in
   let type = ($input | describe --detailed | get type)
@@ -17,104 +16,53 @@ export def "into list" []: any -> list {
 }
 
 # Convert a list of columns into a table
-#
-# Examples:
-#
-# [
-#  ([ 1 2 3 ] | wrap a)
-#  ([ 4 5 6 ] | wrap b)
-#  ([ 7 8 9 ] | wrap c)
-# ] | columns-into-table 
-# => ╭───┬───┬───┬───╮
-# => │ # │ a │ b │ c │
-# => ├───┼───┼───┼───┤
-# => │ 0 │ 1 │ 4 │ 7 │
-# => │ 1 │ 2 │ 5 │ 8 │
-# => │ 2 │ 3 │ 6 │ 9 │
-# => ╰───┴───┴───┴───╯
-#
-# Can roundtrip with `table-into-columns`
-# 
-# ls | table-into-columns | columns-into-table
-# => ╭───┬────────────────────────┬──────┬────────┬────────────────╮
-# => │ # │          name          │ type │  size  │    modified    │
-# => ├───┼────────────────────────┼──────┼────────┼────────────────┤
-# => │ 0 │ into-list.nu           │ file │  378 B │ 40 minutes ago │
-# => │ 1 │ mod.nu                 │ file │   28 B │ 41 minutes ago │
-# => │ 2 │ name-values.nu         │ file │  394 B │ 34 minutes ago │
-# => │ 3 │ record-into-columns.nu │ file │ 1.3 kB │ 27 minutes ago │
-# => ╰───┴────────────────────────┴──────┴────────┴────────────────╯
+@example "Construct a columns" {
+    [
+        ([1, 2, 3] | wrap a)
+        ([4, 5, 6] | wrap b)
+        ([7, 8, 9] | wrap c)
+    ] | columns-into-table 
+} --result [[a b c]; [1 4 7] [2 5 8] [3 6 9]]
+@example "Can roundtrip with `table-into-columns`" {
+  ls | table-into-columns | columns-into-table
+}
 export def columns-into-table []: [list<table> -> table] {
     reduce {|it| merge $it}
 }
 
 # Convert a record, where each value is a list, into a list of columns.
-# { a: [ 1 2 3 ], b: [ 4 5 6 ] } | record-into-columns
-# => ╭───┬───────────╮
-# => │ 0 │ ╭───┬───╮ │
-# => │   │ │ # │ a │ │
-# => │   │ ├───┼───┤ │
-# => │   │ │ 0 │ 1 │ │
-# => │   │ │ 1 │ 2 │ │
-# => │   │ │ 2 │ 3 │ │
-# => │   │ ╰───┴───╯ │
-# => │ 1 │ ╭───┬───╮ │
-# => │   │ │ # │ b │ │
-# => │   │ ├───┼───┤ │
-# => │   │ │ 0 │ 4 │ │
-# => │   │ │ 1 │ 5 │ │
-# => │   │ │ 2 │ 6 │ │
-# => │   │ ╰───┴───╯ │
-# => ╰───┴───────────╯
-# =>
-# This can be especially useful when combined with `columns-into-table`, as in:
-#
-# { a: [ 1 2 3 ], b: [ 4 5 6 ] } | record-into-columns
-# | columns-into-table
-# => ╭───┬───┬───╮
-# => │ # │ a │ b │
-# => ├───┼───┼───┤
-# => │ 0 │ 1 │ 4 │
-# => │ 1 │ 2 │ 5 │
-# => │ 2 │ 3 │ 6 │
-# => ╰───┴───┴───╯
-# =>
+@example "Convert record of lists into list of columns" {
+    { a: [1, 2, 3], b: [4, 5, 6] } | record-into-columns
+} --result [[[a]; [1], [2], [3]], [[b]; [4], [5], [6]]]
+@example "This can be especially useful when combined with `columns-into-table`" {
+    { a: [1, 2, 3], b: [4, 5, 6] } | record-into-columns | columns-into-table
+} --result [[a, b]; [1, 4], [2, 5], [3, 6]]
 export def record-into-columns []: [record -> list] {
     items {|key, val| $val | wrap $key}
 }
 
 # Convert/split a table into a list of columns
-#
-# Examples:
-# ls | table-into-columns 
-# => Returns a list of 4 tables, one for each of the `ls` columns
-#
-# Can be roundtripped with `columns-into-table`
-#
-# ls | table-into-columns | columns-into-table
-# => ╭───┬────────────────────────┬──────┬────────┬────────────────╮
-# => │ # │          name          │ type │  size  │    modified    │
-# => ├───┼────────────────────────┼──────┼────────┼────────────────┤
-# => │ 0 │ into-list.nu           │ file │  378 B │ 40 minutes ago │
-# => │ 1 │ mod.nu                 │ file │   28 B │ 41 minutes ago │
-# => │ 2 │ name-values.nu         │ file │  394 B │ 34 minutes ago │
-# => │ 3 │ record-into-columns.nu │ file │ 1.3 kB │ 27 minutes ago │
-# => ╰───┴────────────────────────┴──────┴────────┴────────────────╯
+@example "Return a list of 4 tables, one for each of the `ls` columns" {
+    ls | table-into-columns 
+}
+@example "Can be roundtripped with `columns-into-table`" {
+    ls | table-into-columns | columns-into-table
+} --result [
+    [name, type, size, modified];
+    ["into-list.nu", file, "378 B", 2025-02-09T20:52:38+03:00],
+    ["mod.nu", file, "28 B", 2025-02-09T20:51:38+03:00],
+    ["name-values.nu", file, "394 B", 2025-02-09T20:58:38+03:00],
+    ["record-into-columns.nu", file, "1.3 kB", 2025-02-09T21:05:38+03:00]
+]
 export def table-into-columns []: [table -> list<table>] {
     let IN = $in
     $IN | columns | each {|col| $IN | select $col}
 }
 
 # Assign keynames to a list of values, effectively converting the list to a record.
-#
-# Example:
-#
-# [ 1 2 3 ] | name-values a b c
-# => ╭───┬───╮
-# => │ a │ 1 │
-# => │ b │ 2 │
-# => │ c │ 3 │
-# => ╰───┴───╯
+@example "Name the items in a list" {
+    [1, 2, 3] | name-values a b c
+} --result {a: 1, b: 2, c: 3}
 export def name-values [...names: string]: [list -> record] {
     let IN = $in
     0.. | zip $IN | into record | rename ...$names
diff --git a/crates/nu-std/std-rfc/kv/mod.nu b/crates/nu-std/std-rfc/kv/mod.nu
index d01f2f6238..30088dba4d 100644
--- a/crates/nu-std/std-rfc/kv/mod.nu
+++ b/crates/nu-std/std-rfc/kv/mod.nu
@@ -16,13 +16,15 @@
 #
 # If the key already exists, it is updated
 # to the new value provided.
-#
-# Usage:
-# <input> | kv set <key> <value?>
-#
-# Example:
-# ls ~ | kv set "home snapshot"
-# kv set foo 5
+@example "Store the list of files in the home directory" {
+  ls ~ | kv set "home snapshot"
+}
+@example "Store a number" {
+  kv set foo 5
+}
+@example "Update a number" {
+  kv set foo { $in + 1 }
+}
 export def "kv set" [
   key: string
   value_or_closure?: any
@@ -97,9 +99,9 @@ export def "kv set" [
 #
 # Counterpart of "kv set". Returns null
 # if the key is not found.
-# 
-# Usage:
-# kv get <key> | <pipeline>
+@example "Retrieve a stored value" {
+  kv get foo
+}
 export def "kv get" [
   key: string # Key of the kv-pair to retrieve
   --universal (-u)
diff --git a/crates/nu-std/std-rfc/path/mod.nu b/crates/nu-std/std-rfc/path/mod.nu
index 791e83a395..2cc1458016 100644
--- a/crates/nu-std/std-rfc/path/mod.nu
+++ b/crates/nu-std/std-rfc/path/mod.nu
@@ -5,25 +5,20 @@ def with-field [field: string, value: string] {
   | path join
 }
 
+alias "path with-extension" = with-extension
+
 # Replace extension of input file paths.
 #
 # Note that it doesn't change the file name locally.
-#
-# # Example
-# - setting path ext to `rs`
-# ```nushell
-# > "ab.txt" | path with-extension "rs"
-# ab.rs
-# > "ab.txt" | path with-extension ".rs"
-# ab.rs
-#
-# - setting a list of input path ext to `rs`
-# > ["ab.txt", "cd.exe"] | path with-extension "rs"
-# ╭───┬──────────╮
-# │ 0 │ ab.rs    │
-# │ 1 │ cd.rs    │
-# ╰───┴──────────╯
-# ```
+@example "setting path ext to `rs`" {
+    "ab.txt" | path with-extension "rs"
+} --result ab.rs
+@example "leading dot can be included" {
+    "ab.txt" | path with-extension ".rs"
+} --result ab.rs
+@example "setting a list of input path ext to `rs`" {
+    ["ab.txt", "cd.exe"] | path with-extension "rs"
+} --result [ab.rs, cd.rs]
 export def with-extension [ext: string] {
   let path = $in
   let ext_trim = if $ext starts-with "." {
@@ -34,38 +29,26 @@ export def with-extension [ext: string] {
   $path | with-field extension $ext_trim
 }
 
+alias "path with-stem" = with-stem
+
 # Replace stem of input file paths.
 #
 # Note that it doesn't change the file name locally.
-#
-# # Example
-# - replace stem with "share"
-# ```nushell
-# > "/usr/bin" | path with-stem "share"
-# /usr/share
-#
-# - replace stem with "nushell"
-# > ["/home/alice/", "/home/bob/secret.txt"] | path with-stem "nushell"
-# ╭───┬───────────────────────╮
-# │ 0 │ /home/nushell         │
-# │ 1 │ /home/bob/nushell.txt │
-# ╰───┴───────────────────────╯
-# ```
+@example "replace stem with 'share'" {
+    "/usr/bin" | path with-stem "share"
+} --result /usr/share
+@example "replace stem with 'nushell'" {
+    ["/home/alice/", "/home/bob/secret.txt"] | path with-stem "nushell"
+} --result [/home/nushell, /home/bob/nushell.txt]
 export def with-stem [stem: string] { with-field stem $stem }
 
+alias "path with-parent" = with-parent
+
 # Replace parent field of input file paths.
-#
-# # Example
-# - replace parent path with `/usr/share`
-# ```nushell
-# > "/etc/foobar" | path with-parent "/usr/share/"
-# /usr/share/foobar
-#
-# - replace parent path with `/root/` for all filenames in list
-# > ["/home/rose/meow", "/home/fdncred/"] | path with-parent "/root/"
-# ╭───┬───────────────╮
-# │ 0 │ /root/meow    │
-# │ 1 │ /root/fdncred │
-# ╰───┴───────────────╯
-# ```
+@example "replace parent path with `/usr/share`" {
+    "/etc/foobar" | path with-parent "/usr/share/"
+} --result "/usr/share/foobar"
+@example "replace parent path with `/root/` for all filenames in list" {
+    ["/home/rose/meow", "/home/fdncred/"] | path with-parent "/root/"
+} --result [/root/meow, /root/fdncred]
 export def with-parent [parent: string] { with-field parent $parent }
diff --git a/crates/nu-std/std-rfc/str/mod.nu b/crates/nu-std/std-rfc/str/mod.nu
index 49dc1abc6a..4c9995594f 100644
--- a/crates/nu-std/std-rfc/str/mod.nu
+++ b/crates/nu-std/std-rfc/str/mod.nu
@@ -1,21 +1,19 @@
+alias "str dedent" = dedent
+
 # Removes common indent from a multi-line string based on the number of spaces on the last line.
-# 
-# Example - Two leading spaces are removed from all lines:
-#
-# > let s = "
-#      Heading
-#        Indented Line
-#        Another Indented Line
-#
-#      Another Heading
-#      "
-# > $a | str dedent
-#
-# # => Heading
-# # =>   Indented Line
-# # =>   Another Indented Line
-# # => 
-# # => Another Heading
+@example "Two leading spaces are removed from all lines" {
+  "
+  Heading
+    Indented Line
+    Another Indented Line
+
+  Another Heading
+  " | str dedent
+} --result "Heading
+  Indented Line
+  Another Indented Line
+
+Another Heading"
 export def dedent [
     --tabs (-t)
 ]: string -> string {
@@ -76,25 +74,22 @@ export def dedent [
     | str join (char line_sep)
 }
 
+alias "str unindent" = unindent
+
 # Remove common indent from a multi-line string based on the line with the smallest indent
-# 
-# Example - Two leading spaces are removed from all lines:
-#
-# > let s = "
-#      Heading
-#        Indented Line
-#        Another Indented Line
-#
-#      Another Heading
-#   "
-# > $a | str dedent
-#
-# # => Heading
-# # =>   Indented Line
-# # =>   Another Indented Line
-# # =>
-# # => Another Heading
-#
+@example "Two leading spaces are removed from all lines" {
+"
+  Heading
+    Indented Line
+    Another Indented Line
+
+  Another Heading
+" | str unindent
+} --result "Heading
+  Indented Line
+  Another Indented Line
+
+Another Heading"
 export def unindent [
     --tabs (-t)            # String uses tabs instead of spaces for indentation
 ]: string -> string {
diff --git a/crates/nu-std/std-rfc/tables/mod.nu b/crates/nu-std/std-rfc/tables/mod.nu
index 6ec8f4010d..96a5e11845 100644
--- a/crates/nu-std/std-rfc/tables/mod.nu
+++ b/crates/nu-std/std-rfc/tables/mod.nu
@@ -1,23 +1,15 @@
 # Run aggregate operations on output of `group-by --to-table`.
-#
-# # Example
-#
-# - group files by type and extension, and get stats about their sizes
-# ```nushell
-# >_ ls | group-by type { get name | path parse | get extension } --to-table | aggregate size
-# ```
-# 
-# - group data by multiple columns, and run custom aggregate operations
-# ```nushell
-# >_ open movies.csv
-#    | group-by Lead_Studio Genre --to-table
-#    | aggregate Worldwide_Gross Profitability --ops {avg: {math avg}, std: {math stddev}}
-# ```
-#
-# - run aggregate operations without grouping the input
-# ```nushell
-# >_ open movies.csv | aggregate Year
-# ```
+@example "group files by type and extension, and get stats about their sizes" {
+    ls | group-by type { get name | path parse | get extension } --to-table | aggregate size
+}
+@example "group data by multiple columns, and run custom aggregate operations" {
+    open movies.csv
+    | group-by Lead_Studio Genre --to-table
+    | aggregate Worldwide_Gross Profitability --ops {avg: {math avg}, std: {math stddev}}
+}
+@example "run aggregate operations without grouping the input" {
+    open movies.csv | aggregate Year
+}
 export def aggregate [
     --ops: record, # default = {min: {math min}, avg: {math avg}, max: {math max}, sum: {math sum}}  
     ...columns: cell-path, # columns to perform aggregations on
@@ -161,16 +153,12 @@ def row-indices [ ...slices ] {
 }
 
 # Selects one or more rows while keeping the original indices.
-#
-# Example - Selects the first, fifth, and sixth rows from the table:
-#
-# ls / | select slices 0 4..5
-#
-# Example - Select the 4th row.
-#
-# Note that the difference between this and `select 3` is that the index (#) column shows the *original* (pre-select) position in the table.
-#
-# ls | select slices 3
+@example "Selects the first, fifth, and sixth rows from the table" {
+    ls / | select slices 0 4..5
+}
+@example "Select the 4th row (difference to `select 3` is that the index (#) column shows the *original* (pre-select) position in the table)" {
+    ls | select slices 3
+}
 export def "select slices" [ ...slices ] {
   enumerate
   | flatten
@@ -178,10 +166,9 @@ export def "select slices" [ ...slices ] {
 }
 
 # Rejects one or more rows while keeping the original indices.
-#
-# Example - Rejects the first, fifth, and sixth rows from the table:
-#
-# ls / | reject slices 0 4..5
+@example "Rejects the first, fifth, and sixth rows from the table" {
+    ls / | reject slices 0 4..5
+}
 export def "reject slices" [ ...slices ] {
   enumerate
   | flatten
@@ -190,17 +177,14 @@ export def "reject slices" [ ...slices ] {
 }
 
 # Select one or more columns by their indices
-#
-# Example:
-# 
-# ls -l | select column-slices 0 10..12 | first 3
-# # => ╭───┬────────────────────┬──────────────┬─────────────┬──────────────╮
-# # => │ # │        name        │   created    │  accessed   │   modified   │
-# # => ├───┼────────────────────┼──────────────┼─────────────┼──────────────┤
-# # => │ 0 │ CITATION.cff       │ 3 months ago │ 4 hours ago │ 3 months ago │
-# # => │ 1 │ CODE_OF_CONDUCT.md │ 7 months ago │ 4 hours ago │ 7 months ago │
-# # => │ 2 │ CONTRIBUTING.md    │ 3 months ago │ 4 hours ago │ 3 months ago │
-# # => ╰───┴────────────────────┴──────────────┴─────────────┴──────────────╯
+@example "Select column [0, 10, 11, 12]" {
+    ls -l | select column-slices 0 10..12 | first 3
+} --result [
+    [name, created, accessed, modified];
+    ["CITATION.cff", 2024-11-09T21:58:12+03:00, 2025-02-09T17:58:12+03:00, 2024-11-09T21:58:12+03:00],
+    ["CODE_OF_CONDUCT.md", 2024-07-09T21:58:12+03:00, 2025-02-09T17:58:12+03:00, 2024-07-09T21:58:12+03:00],
+    ["CONTRIBUTING.md", 2024-11-09T21:58:12+03:00, 2025-02-09T17:58:12+03:00, 2024-11-09T21:58:12+03:00]
+]
 export def "select column-slices" [
     ...slices
 ] {
@@ -209,10 +193,9 @@ export def "select column-slices" [
 }
 
 # Reject one or more columns by their indices
-#
-# Example:
-#
-# ls | reject column-slices 0 4 5 | first 3
+@example "Reject columns [0, 4, 5]" {
+    ls | reject column-slices 0 4 5 | first 3
+}
 export def "reject column-slices" [
     ...slices
 ] {

From d577074da97a836af9f09d032180ab28d5d8fb2a Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Wed, 12 Feb 2025 03:51:43 +0300
Subject: [PATCH 1046/1072] feat(std/dirs): retain state in subshells or with
 exec-restarts (#15080)

Persist `std/dirs`'s state in subshells and also when restarting the
shell with `exec $nu.current-exe`
---
 crates/nu-std/std/dirs/mod.nu    | 14 +++++++++++---
 crates/nu-std/tests/test_dirs.nu |  8 ++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/crates/nu-std/std/dirs/mod.nu b/crates/nu-std/std/dirs/mod.nu
index ab3403f36c..8585838c99 100644
--- a/crates/nu-std/std/dirs/mod.nu
+++ b/crates/nu-std/std/dirs/mod.nu
@@ -17,8 +17,16 @@
 # This situation could arise if we started with [/a, /b, /c], then
 # we changed directories from /b to /var/tmp.
 export-env {
-    $env.DIRS_POSITION = 0
-    $env.DIRS_LIST = [($env.PWD | path expand)]
+    $env.ENV_CONVERSIONS.DIRS_LIST = {
+        from_string: {|| split row (char esep)}
+        to_string: {|| str join (char esep)}
+    }
+    $env.ENV_CONVERSIONS.DIRS_POSITION = {
+        from_string: {|| into int}
+        to_string: {|| into string}
+    }
+    $env.DIRS_POSITION = $env.DIRS_POSITION? | default (0)
+    $env.DIRS_LIST = $env.DIRS_LIST? | default [($env.PWD | path expand)]
 }
 
 # Add one or more directories to the list.
@@ -145,4 +153,4 @@ export module shells-aliases {
     export alias p = prev
     export alias n = next
     export alias g = goto
-}
\ No newline at end of file
+}
diff --git a/crates/nu-std/tests/test_dirs.nu b/crates/nu-std/tests/test_dirs.nu
index 4c5b891829..eaf56ec777 100644
--- a/crates/nu-std/tests/test_dirs.nu
+++ b/crates/nu-std/tests/test_dirs.nu
@@ -46,6 +46,8 @@ def dirs_command [] {
     # must set PWD *before* doing `use` that will run the def --env block in dirs module.
     cd $c.base_path
 
+    # hide existing variables to prevent the state from outside affecting the tests
+    hide-env -i DIRS_LIST DIRS_POSITION
     # must execute these uses for the UOT commands *after* the test and *not* just put them at top of test module.
     # the def --env gets messed up
     use std/dirs
@@ -96,6 +98,7 @@ def dirs_next [] {
     cd $c.base_path
     assert equal $env.PWD $c.base_path "test setup"
 
+    hide-env -i DIRS_LIST DIRS_POSITION
     use std/dirs
     cur_dir_check $c.base_path "use module test setup"
 
@@ -117,6 +120,7 @@ def dirs_cd [] {
     # must set PWD *before* doing `use` that will run the def --env block in dirs module.
     cd $c.base_path
 
+    hide-env -i DIRS_LIST DIRS_POSITION
     use std/dirs
 
     cur_dir_check $c.base_path "use module test setup"
@@ -139,6 +143,8 @@ def dirs_cd [] {
 def dirs_goto_bug10696 [] {
     let $c = $in
     cd $c.base_path
+
+    hide-env -i DIRS_LIST DIRS_POSITION
     use std/dirs
 
     dirs add $c.path_a
@@ -153,6 +159,8 @@ def dirs_goto_bug10696 [] {
 def dirs_goto [] {
     let $c = $in
     cd $c.base_path
+
+    hide-env -i DIRS_LIST DIRS_POSITION
     use std/dirs
 
     # check that goto can move *from* any position in the ring *to* any other position (correctly)

From e74ce72f090f2d943331500f6f32aaca9d1dc4ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Feb 2025 12:45:27 +0800
Subject: [PATCH 1047/1072] build(deps): bump data-encoding from 2.7.0 to 2.8.0
 (#15101)

Bumps [data-encoding](https://github.com/ia0/data-encoding) from 2.7.0
to 2.8.0.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/ia0/data-encoding/commit/284f84626abdf0169a060fcc8d3199d6f09acefa"><code>284f846</code></a>
Release 2.8.0 (<a
href="https://redirect.github.com/ia0/data-encoding/issues/134">#134</a>)</li>
<li><a
href="https://github.com/ia0/data-encoding/commit/b6f9f3b9d602ca03643047a7e2ad2241b6e33d35"><code>b6f9f3b</code></a>
Remove MSRV for unpublished crates (<a
href="https://redirect.github.com/ia0/data-encoding/issues/133">#133</a>)</li>
<li><a
href="https://github.com/ia0/data-encoding/commit/c060e6873ca210c6dd443562e15c613b64434356"><code>c060e68</code></a>
Delete outdated cargo cache to force save (<a
href="https://redirect.github.com/ia0/data-encoding/issues/132">#132</a>)</li>
<li><a
href="https://github.com/ia0/data-encoding/commit/d62d722222b825d476a5e8e4061f1fbcdfe957e3"><code>d62d722</code></a>
Remove top-level Makefile (<a
href="https://redirect.github.com/ia0/data-encoding/issues/131">#131</a>)</li>
<li><a
href="https://github.com/ia0/data-encoding/commit/5e86676a3444967f183f9772c91bd17370265ba1"><code>5e86676</code></a>
Improve CI workflow (<a
href="https://redirect.github.com/ia0/data-encoding/issues/130">#130</a>)</li>
<li><a
href="https://github.com/ia0/data-encoding/commit/8a9537cf6473b6260ec7dfa321cd38509c561d24"><code>8a9537c</code></a>
Improve fuzzing (<a
href="https://redirect.github.com/ia0/data-encoding/issues/129">#129</a>)</li>
<li><a
href="https://github.com/ia0/data-encoding/commit/27a68f43cd92b6cb0bd9a15a09cedc79b5759843"><code>27a68f4</code></a>
Add missing safety documentation and assertions for testing and fuzzing
(<a
href="https://redirect.github.com/ia0/data-encoding/issues/128">#128</a>)</li>
<li><a
href="https://github.com/ia0/data-encoding/commit/06b0d89b115c25937f0564a00df4cc21c33f2239"><code>06b0d89</code></a>
Add BASE32_NOPAD_NOCASE and BASE32_NOPAD_VISUAL (<a
href="https://redirect.github.com/ia0/data-encoding/issues/127">#127</a>)</li>
<li>See full diff in <a
href="https://github.com/ia0/data-encoding/compare/v2.7.0...v2.8.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=data-encoding&package-manager=cargo&previous-version=2.7.0&new-version=2.8.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock                   | 4 ++--
 crates/nu-command/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 58a8ed9c49..6802f81e72 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1427,9 +1427,9 @@ dependencies = [
 
 [[package]]
 name = "data-encoding"
-version = "2.7.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e60eed09d8c01d3cee5b7d30acb059b76614c918fa0f992e0dd6eeb10daad6f"
+checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010"
 
 [[package]]
 name = "deranged"
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index b3106f7be9..224662df6e 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -106,7 +106,7 @@ v_htmlescape = { workspace = true }
 wax = { workspace = true }
 which = { workspace = true, optional = true }
 unicode-width = { workspace = true }
-data-encoding = { version = "2.7.0", features = ["alloc"] }
+data-encoding = { version = "2.8.0", features = ["alloc"] }
 web-time = { workspace = true }
 
 [target.'cfg(windows)'.dependencies]

From 3eae657121f256954f10cca8263d0849369f485c Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Wed, 12 Feb 2025 06:48:41 -0500
Subject: [PATCH 1048/1072] Update `std-rfc` tests for to use `@test`
 attributes (#15098)

After #14906, the test runner was updated to use attributes, along with
the existing `std` modules. However, since that PR was started before
`std-rfc` was in main, it didn't include updates to those tests. Once
#14906 was merged, the `std-rfc` tests no longer ran in CI. This PR
updates the tests accordingly.
---
 crates/nu-std/testing.nu                      | 20 ++++---
 .../nu-std/tests/test_std-rfc_conversions.nu  | 23 ++++----
 crates/nu-std/tests/test_std-rfc_kv.nu        | 53 +++++++++++++------
 crates/nu-std/tests/test_std-rfc_path.nu      |  9 ++--
 crates/nu-std/tests/test_std-rfc_str.nu       | 39 +++++++-------
 crates/nu-std/tests/test_std-rfc_tables.nu    | 37 ++++++-------
 6 files changed, 106 insertions(+), 75 deletions(-)

diff --git a/crates/nu-std/testing.nu b/crates/nu-std/testing.nu
index 44d1867afe..077902c55d 100644
--- a/crates/nu-std/testing.nu
+++ b/crates/nu-std/testing.nu
@@ -8,12 +8,18 @@ def "nu-complete threads" [] {
     seq 1 (sys cpu | length)
 }
 
-# Here we store the map of annotations internal names and the annotation actually used during test creation
-# The reason we do that is to allow annotations to be easily renamed without modifying rest of the code
-# Functions with no annotations or with annotations not on the list are rejected during module evaluation
-# test and test-skip annotations may be used multiple times throughout the module as the function names are stored in a list
-# Other annotations should only be used once within a module file
-# If you find yourself in need of multiple before- or after- functions it's a sign your test suite probably needs redesign
+# Here we store the map of annotations' internal names along with the annotation actually
+# used during test creation. We do this to allow annotations to be easily renamed without
+# modifying rest of the code.
+# Functions with no annotations or with annotations not on the list are rejected during module evaluation.
+#
+# `test` and `test-skip` annotations may be used multiple times throughout the module as the function names
+# are stored in a list.
+#
+# Other annotations should only be used once within a module file.
+#
+# If you find yourself in need of multiple `before-*` or `after-*` functions, it's a sign your test suite
+# probably needs redesign.
 const valid_annotations = {
     "test": "test",
     "ignore": "test-skip",
@@ -23,7 +29,7 @@ const valid_annotations = {
     "after-all": "after-all"
 }
 
-# Returns a table containing the list of function names together with their annotations (comments above the declaration)
+# Returns a table containing the list of command names along with their attributes. 
 def get-annotated [
     file: path
 ]: nothing -> table<function_name: string, annotation: string> {
diff --git a/crates/nu-std/tests/test_std-rfc_conversions.nu b/crates/nu-std/tests/test_std-rfc_conversions.nu
index e2c50437cc..728b2b089d 100644
--- a/crates/nu-std/tests/test_std-rfc_conversions.nu
+++ b/crates/nu-std/tests/test_std-rfc_conversions.nu
@@ -1,7 +1,8 @@
-use std assert
+use std/assert
+use std/testing *
 use std-rfc/conversions *
 
-#[test]
+@test
 def range-into-list [] {
   assert equal (
     1..10 | into list
@@ -10,7 +11,7 @@ def range-into-list [] {
   )
 }
 
-#[test]
+@test
 def string-into-list [] {
   assert equal (
     "foo" | into list
@@ -19,7 +20,7 @@ def string-into-list [] {
   )
 }
 
-#[test]
+@test
 def range-stride-into-list [] {
   assert equal (
     0..2..10 | into list
@@ -28,7 +29,7 @@ def range-stride-into-list [] {
   )
 }
 
-#[test]
+@test
 def null-into-list [] {
   assert equal (
     null | into list | get 0 | describe
@@ -37,7 +38,7 @@ def null-into-list [] {
   )
 }
 
-#[test]
+@test
 def list-into-list [] {
   assert equal (
     [ foo bar baz ] | into list
@@ -47,7 +48,7 @@ def list-into-list [] {
 
 }
 
-#[test]
+@test
 def table-into-columns--roundtrip [] {
   assert equal (
     ls
@@ -61,7 +62,7 @@ const test_record_of_lists = {
   b: [ 4 5 6 ]
 }
 
-#[test]
+@test
 def record-into-columns--simple [] {
   let actual = (
     $test_record_of_lists
@@ -74,7 +75,7 @@ def record-into-columns--simple [] {
   assert equal $actual $expected
 }
 
-#[test]
+@test
 def table-into-columns--simple [] {
   let actual = (
     ls | table-into-columns | get 1 | columns | get 0
@@ -84,7 +85,7 @@ def table-into-columns--simple [] {
   assert equal $actual $expected
 }
 
-#[test]
+@test
 def name-values--simple [] {
   let actual = (
     [ 1 2 3 ] | name-values one two three
@@ -96,7 +97,7 @@ def name-values--simple [] {
   assert equal $actual $expected
 }
 
-#[test]
+@test
 def name-values--missing-keyname [] {
   let actual = (
     [ 1 2 3 ] | name-values one two
diff --git a/crates/nu-std/tests/test_std-rfc_kv.nu b/crates/nu-std/tests/test_std-rfc_kv.nu
index d19809d230..84467fceee 100644
--- a/crates/nu-std/tests/test_std-rfc_kv.nu
+++ b/crates/nu-std/tests/test_std-rfc_kv.nu
@@ -1,12 +1,14 @@
-use std/assert
 const kv_module = if ("sqlite" in (version).features) { "std-rfc/kv" } else { null }
 use $kv_module *
 
+use std/assert
+use std/testing *
+
 # It's important to use random keys and to clean-up
 # after since the user running these tests may have
 # either an existing local stor or universal db.
 
-#[test]
+@test
 def simple-local-set [] {
     if ('sqlite' not-in (version).features) { return }
 
@@ -20,10 +22,11 @@ def simple-local-set [] {
     kv drop $key | ignore
 }
 
-#[test]
+@test
 def local-pipeline_set_returns_value [] {
     if ('sqlite' not-in (version).features) { return }
 
+    let key = (random uuid)
     let key = (random uuid)
     let actual = (42 | kv set $key)
     let expected = 42
@@ -36,10 +39,11 @@ def local-pipeline_set_returns_value [] {
     kv drop $key | ignore
 }
 
-#[test]
+@test
 def local-multiple_assignment [] {
     if ('sqlite' not-in (version).features) { return }
 
+    let key = (random uuid)
     let key1 = (random uuid)
     let key2 = (random uuid)
     let key3 = (random uuid)
@@ -56,10 +60,11 @@ def local-multiple_assignment [] {
     kv drop $key3
 }
 
-#[test]
+@test
 def local-transpose_to_record [] {
     if ('sqlite' not-in (version).features) { return }
 
+    let key = (random uuid)
     let key1 = (random uuid)
     let key2 = (random uuid)
     let key3 = (random uuid)
@@ -77,10 +82,11 @@ def local-transpose_to_record [] {
     kv drop $key3
 }
 
-#[test]
+@test
 def local-using_closure [] {
     if ('sqlite' not-in (version).features) { return }
 
+    let key = (random uuid)
     let name_key = (random uuid)
     let size_key = (random uuid)
 
@@ -100,10 +106,11 @@ def local-using_closure [] {
     kv drop $size_key
 }
 
-#[test]
+@test
 def local-return-entire-list [] {
     if ('sqlite' not-in (version).features) { return }
 
+    let key = (random uuid)
     let key1 = (random uuid)
     let key2 = (random uuid)
 
@@ -122,10 +129,11 @@ def local-return-entire-list [] {
     kv drop $key2
 }
 
-#[test]
+@test
 def local-return_value_only [] {
     if ('sqlite' not-in (version).features) { return }
 
+    let key = (random uuid)
     let key = (random uuid)
 
     let expected = 'VALUE'
@@ -137,9 +145,11 @@ def local-return_value_only [] {
 
 }
 
-#[test]
+@test
 def universal-simple_set [] {
     if ('sqlite' not-in (version).features) { return }
+
+    let key = (random uuid)
     $env.NU_UNIVERSAL_KV_PATH = (mktemp -t --suffix .sqlite3)
 
     let key = (random uuid)
@@ -153,9 +163,11 @@ def universal-simple_set [] {
     rm $env.NU_UNIVERSAL_KV_PATH
 }
 
-#[test]
+@test
 def universal-pipeline_set_returns_value [] {
     if ('sqlite' not-in (version).features) { return }
+
+    let key = (random uuid)
     $env.NU_UNIVERSAL_KV_PATH = (mktemp -t --suffix .sqlite3)
 
     let key = (random uuid)
@@ -171,9 +183,11 @@ def universal-pipeline_set_returns_value [] {
     rm $env.NU_UNIVERSAL_KV_PATH
 }
 
-#[test]
+@test
 def universal-multiple_assignment [] {
     if ('sqlite' not-in (version).features) { return }
+
+    let key = (random uuid)
     $env.NU_UNIVERSAL_KV_PATH = (mktemp -t --suffix .sqlite3)
 
     let key1 = (random uuid)
@@ -193,9 +207,11 @@ def universal-multiple_assignment [] {
     rm $env.NU_UNIVERSAL_KV_PATH
 }
 
-#[test]
+@test
 def universal-transpose_to_record [] {
     if ('sqlite' not-in (version).features) { return }
+
+    let key = (random uuid)
     $env.NU_UNIVERSAL_KV_PATH = (mktemp -t --suffix .sqlite3)
 
     let key1 = (random uuid)
@@ -216,9 +232,11 @@ def universal-transpose_to_record [] {
     rm $env.NU_UNIVERSAL_KV_PATH
 }
 
-#[test]
+@test
 def universal-using_closure [] {
     if ('sqlite' not-in (version).features) { return }
+
+    let key = (random uuid)
     $env.NU_UNIVERSAL_KV_PATH = (mktemp -t --suffix .sqlite3)
 
     let name_key = (random uuid)
@@ -241,9 +259,11 @@ def universal-using_closure [] {
     rm $env.NU_UNIVERSAL_KV_PATH
 }
 
-#[test]
+@test
 def universal-return-entire-list [] {
     if ('sqlite' not-in (version).features) { return }
+
+    let key = (random uuid)
     $env.NU_UNIVERSAL_KV_PATH = (mktemp -t --suffix .sqlite3)
 
     let key1 = (random uuid)
@@ -265,9 +285,11 @@ def universal-return-entire-list [] {
     rm $env.NU_UNIVERSAL_KV_PATH
 }
 
-#[test]
+@test
 def universal-return_value_only [] {
     if ('sqlite' not-in (version).features) { return }
+
+    let key = (random uuid)
     $env.NU_UNIVERSAL_KV_PATH = (mktemp -t --suffix .sqlite3)
 
     let key = (random uuid)
@@ -280,4 +302,3 @@ def universal-return_value_only [] {
     kv drop --universal $key
     rm $env.NU_UNIVERSAL_KV_PATH
 }
-
diff --git a/crates/nu-std/tests/test_std-rfc_path.nu b/crates/nu-std/tests/test_std-rfc_path.nu
index b521742ba6..a27c487b7a 100644
--- a/crates/nu-std/tests/test_std-rfc_path.nu
+++ b/crates/nu-std/tests/test_std-rfc_path.nu
@@ -1,7 +1,8 @@
 use std-rfc/path
 use std/assert
+use std/testing *
 
-#[test]
+@test
 def path_with_extension [] {
     let new_path = "ab.txt" | path with-extension "rs"
     assert equal $new_path "ab.rs"
@@ -10,7 +11,7 @@ def path_with_extension [] {
     assert equal $new_path "ab.rs"
 }
 
-#[test]
+@test
 def path_with_extension_for_list [] {
     let new_path = ["ab.txt", "cd.exe"] | path with-extension "rs"
     assert equal $new_path ["ab.rs", "cd.rs"]
@@ -19,7 +20,7 @@ def path_with_extension_for_list [] {
     assert equal $new_path ["ab.rs", "cd.rs"]
 }
 
-#[test]
+@test
 def path_with_stem [] {
     let new_path = $"(char psep)usr(char psep)bin" | path with-stem "share"
     assert equal $new_path $"(char psep)usr(char psep)share"
@@ -28,7 +29,7 @@ def path_with_stem [] {
     assert equal $new_path [$"(char psep)home(char psep)nushell", $"(char psep)home(char psep)bob(char psep)nushell.txt"]
 }
 
-#[test]
+@test
 def path_with_parent [] {
     let new_path = $"(char psep)etc(char psep)foobar" | path with-parent $"(char psep)usr(char psep)share(char psep)"
     assert equal $new_path $"(char psep)usr(char psep)share(char psep)foobar"
diff --git a/crates/nu-std/tests/test_std-rfc_str.nu b/crates/nu-std/tests/test_std-rfc_str.nu
index 21d4a1e551..3620854fc7 100644
--- a/crates/nu-std/tests/test_std-rfc_str.nu
+++ b/crates/nu-std/tests/test_std-rfc_str.nu
@@ -1,7 +1,8 @@
 use std/assert
+use std/testing *
 use std-rfc/str
 
-#[test]
+@test
 def str-dedent_simple [] {
     
     # Test 1:
@@ -21,7 +22,7 @@ def str-dedent_simple [] {
     ) $"Heading(char lsep)(char lsep)    one(char lsep)    two"
 }
 
-#[test]
+@test
 def str-dedent_leave_blankline_whitespace [] {
     # Test 2:
     # Same as #1, but the blank line has leftover whitespace
@@ -39,7 +40,7 @@ def str-dedent_leave_blankline_whitespace [] {
     ) $"Heading(char lsep)                (char lsep)    one(char lsep)    two"
 }
 
-#[test]
+@test
 def str-dedent_leave_blankline_tab [] {
     # Test 3:
     # Same, but with a single tab character on the "blank" line
@@ -56,7 +57,7 @@ def str-dedent_leave_blankline_tab [] {
     ) $"Heading(char lsep)(char tab)(char lsep)    one(char lsep)    two"
 }
 
-#[test]
+@test
 def str-dedent_ends_with_newline [] {
     # Test 4:
     # Ends with line-break
@@ -74,7 +75,7 @@ def str-dedent_ends_with_newline [] {
     ) $"Heading(char lsep)(char lsep)    one(char lsep)    two(char lsep)"
 }
 
-#[test]
+@test
 def str-dedent_identity [] {
     # Test 5:
     # Identity - Returns the original string sans first and last empty lines
@@ -87,7 +88,7 @@ def str-dedent_identity [] {
     ) "  Identity  "
 }
 
-#[test]
+@test
 def str-dedent_error-no_blank_lines [] {
     # Test 6:
     # Error - Does not contain an empty first line
@@ -104,7 +105,7 @@ def str-dedent_error-no_blank_lines [] {
     }
 }
 
-#[test]
+@test
 def str-dedent_error-no_blank_first_line [] {
     # Test 7:
     # Error - Does not contain an empty last line
@@ -115,7 +116,7 @@ def str-dedent_error-no_blank_first_line [] {
     }
 }
 
-#[test]
+@test
 def str-dedent_error-missing_last_empty_line [] {
     # Test 7.1:
     # Error - Does not contain an empty last line
@@ -127,7 +128,7 @@ def str-dedent_error-missing_last_empty_line [] {
     }
 }
 
-#[test]
+@test
 def str-dedent_error-not_enough_indentation [] {
     # Test 8:
     # Error - Line 1 does not have enough indentation
@@ -140,7 +141,7 @@ def str-dedent_error-not_enough_indentation [] {
     }
 }
 
-#[test]
+@test
 def str-dedent_error-not_enough_indentation2 [] {
     # Test 8.1:
     # Error - Line 2 does not have enough indentation
@@ -153,7 +154,7 @@ def str-dedent_error-not_enough_indentation2 [] {
     }
 }
 
-#[test]
+@test
 def str-dedent_error-not_enough_indentation3 [] {
     # Test 8.2:
     # Error - Line does not have enough indentation
@@ -165,7 +166,7 @@ def str-dedent_error-not_enough_indentation3 [] {
     }
 }
 
-#[test]
+@test
 def str-dedent_first_line_whitespace_allowed [] {
     # Test 9:
     # "Hidden" whitespace on the first line is allowed
@@ -177,7 +178,7 @@ def str-dedent_first_line_whitespace_allowed [] {
     ) "  Identity  "
 }
 
-#[test]
+@test
 def str-dedent_using_tabs [] {
     # Test 10:
     # If the indentation on the last line uses tabs, then the number of tabs
@@ -192,7 +193,7 @@ def str-dedent_using_tabs [] {
     assert equal $actual $expected
 }
 
-#[test]
+@test
 def str-unindent_simple [] {
     # Test 1:
     # Should start with "Heading" in the first character position
@@ -213,7 +214,7 @@ def str-unindent_simple [] {
     assert equal $actual $expected
 }
 
-#[test]
+@test
 def str-unindent_ignore_first_and_last_whitespace [] {
     # Test 2:
     # If the first and/or last line are only whitespace
@@ -236,7 +237,7 @@ def str-unindent_ignore_first_and_last_whitespace [] {
     assert equal $actual $expected
 }
 
-#[test]
+@test
 def str-unindent_keep_extra_line [] {
   # Test 3:
   # Keep intentional blank lines at start and/or end
@@ -252,7 +253,7 @@ def str-unindent_keep_extra_line [] {
   assert equal $actual $expected
 }
 
-#[test]
+@test
 def str-unindent_works_on_single_line [] {
     # Test 4:
     # Works on a single-line string
@@ -264,7 +265,7 @@ def str-unindent_works_on_single_line [] {
     assert equal $actual $expected
 }
 
-#[test]
+@test
 def str-unindent_whitespace_only_single_line [] {
     # Test 4:
     # Works on a single-line string with whitespace-only
@@ -276,7 +277,7 @@ def str-unindent_whitespace_only_single_line [] {
     assert equal $actual $expected
 }
     
-#[test]
+@test
 def str-unindent_whitespace_works_with_tabs [] {
     # Test 4:
     # Works with tabs for indentation
diff --git a/crates/nu-std/tests/test_std-rfc_tables.nu b/crates/nu-std/tests/test_std-rfc_tables.nu
index 4f90d751e4..3d622b01ec 100644
--- a/crates/nu-std/tests/test_std-rfc_tables.nu
+++ b/crates/nu-std/tests/test_std-rfc_tables.nu
@@ -1,4 +1,5 @@
 use std/assert
+use std/testing *
 use std-rfc/tables *
 
 const test_table = [
@@ -29,7 +30,7 @@ const enumerated_table = [
   [   9         'a9'      'b9'      'c9'      'd9'      'e9'      'f9' ]
 ]
 
-#[test]
+@test
 def select-slice--single_int [] {
   assert equal (
     $test_table | select slices 1
@@ -38,7 +39,7 @@ def select-slice--single_int [] {
   )
 }
 
-#[test]
+@test
 def select-slice--single_slice [] {
   assert equal (
     $test_table | select slices 2..4
@@ -47,7 +48,7 @@ def select-slice--single_slice [] {
   )
 }
 
-#[test]
+@test
 def select-slice--complex [] {
   assert equal (
     # First and every following third-row + second row
@@ -57,7 +58,7 @@ def select-slice--complex [] {
   )
 }
 
-#[test]
+@test
 def select-slice--out_of_bounds [] {
   assert equal (
     $test_table | select slices 100
@@ -66,7 +67,7 @@ def select-slice--out_of_bounds [] {
   )
 }
 
-#[test]
+@test
 def reject-slice--single_index [] {
   assert equal (
     $test_table | reject slices 4
@@ -75,7 +76,7 @@ def reject-slice--single_index [] {
   )
 }
 
-#[test]
+@test
 def reject-slice--slices [] {
   assert equal (
     # Reject rows 0-3 and 5-9, leaving only 4
@@ -85,14 +86,14 @@ def reject-slice--slices [] {
   )
 }
 
-#[test]
+@test
 def reject-slice--out_of_bounds [] {
   assert error {
     $test_table | reject slices 1000
   }
 }
 
-#[test]
+@test
 def select-col--index [] {
   assert equal (
     $test_table | select column-slices 2
@@ -101,7 +102,7 @@ def select-col--index [] {
   )
 }
 
-#[test]
+@test
 def select-col--indices [] {
   assert equal (
     $test_table | select column-slices 2 4
@@ -110,7 +111,7 @@ def select-col--indices [] {
   )
 }
 
-#[test]
+@test
 def select-col--slices_and_index [] {
   assert equal (
     $test_table | select column-slices 0..2..5 1
@@ -119,7 +120,7 @@ def select-col--slices_and_index [] {
   )
 }
 
-#[test]
+@test
 def reject-col--slices_and_index [] {
   assert equal (
     $test_table | reject column-slices 0..2..5 1
@@ -128,7 +129,7 @@ def reject-col--slices_and_index [] {
   )
 }
 
-#[test]
+@test
 def reject-col--out_of_bounds [] {
   assert equal (
     $test_table | reject column-slices 1_000
@@ -217,7 +218,7 @@ const movies = [
     [ "(500) Days of Summer", comedy, Fox, 81, 8.096, 87, 60.72, 2009 ]
 ]
 
-#[test]
+@test
 def count_movies_by_Lead_Studio [] {
     let grouped = $movies | group-by Lead_Studio --to-table
     let out = $grouped | aggregate
@@ -242,7 +243,7 @@ def count_movies_by_Lead_Studio [] {
     assert equal $out $expected
 }
 
-#[test]
+@test
 def average_gross_by_Genre [] {
     let grouped = $movies | group-by Genre --to-table
     let out = $grouped | aggregate --ops {avg: {math avg}} Worldwide_Gross | select Genre Worldwide_Gross_avg
@@ -267,7 +268,7 @@ def average_gross_by_Genre [] {
     assert equal $out $expected
 }
 
-#[test]
+@test
 def aggregate_default_ops [] {
     let grouped = $movies | group-by Genre --to-table
     let out = $grouped | aggregate Worldwide_Gross
@@ -292,7 +293,7 @@ def aggregate_default_ops [] {
     assert equal $out $expected
 }
 
-#[test]
+@test
 def throw_error_on_non-table_input [] {
     # without --to-table
     let out = try {
@@ -304,7 +305,7 @@ def throw_error_on_non-table_input [] {
     assert equal $out "input must be a table"
 }
 
-#[test]
+@test
 def throw_error_on_non-existing_column [] {
     let grouped = $movies | group-by Genre --to-table
     let error = try {
@@ -316,7 +317,7 @@ def throw_error_on_non-existing_column [] {
     assert equal $error.inner.0.msg "Cannot find column '$.items.NotInTheDataSet'"
 }
 
-#[test]
+@test
 def aggregate_stats_without_grouping [] {
     let out = $movies | aggregate Year | update cells -c [Year_min Year_avg Year_max Year_sum] {math round -p 2}
     let expected = [{

From 2e1b6acc0ea1ca796061163dfa322dac382cc9fd Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Wed, 12 Feb 2025 18:59:51 +0300
Subject: [PATCH 1049/1072] feat(const): implement run_const for `const`
 (#15082)

- fixes #14559

# Description
Allow using `const` keyword in const contexts. The `run_const` body is
basically empty as the actual logic is already handled by the parser.

# User-Facing Changes
`const` keyword can now be used in `const` contexts.

# Tests + Formatting

I'll add some tests before marking this ready.

- :green_circle: toolkit fmt
- :green_circle: toolkit clippy
- :green_circle: toolkit test
- :green_circle: toolkit test stdlib

# After Submitting
N/A

---------

Co-authored-by: Bahex <17417311+Bahex@users.noreply.github.com>
---
 crates/nu-cmd-lang/src/core_commands/const_.rs | 13 +++++++++++++
 tests/const_/mod.rs                            |  9 +++++++++
 2 files changed, 22 insertions(+)

diff --git a/crates/nu-cmd-lang/src/core_commands/const_.rs b/crates/nu-cmd-lang/src/core_commands/const_.rs
index 67182faedd..5727938c84 100644
--- a/crates/nu-cmd-lang/src/core_commands/const_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/const_.rs
@@ -72,6 +72,19 @@ impl Command for Const {
         }
     }
 
+    fn run_const(
+        &self,
+        _working_set: &StateWorkingSet,
+        _call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        Ok(PipelineData::empty())
+    }
+
+    fn is_const(&self) -> bool {
+        true
+    }
+
     fn examples(&self) -> Vec<Example> {
         vec![
             Example {
diff --git a/tests/const_/mod.rs b/tests/const_/mod.rs
index fec81eba78..d76c18d07b 100644
--- a/tests/const_/mod.rs
+++ b/tests/const_/mod.rs
@@ -433,3 +433,12 @@ fn const_takes_pipeline() {
     let actual = nu!(r#"const list = 'bar_baz_quux' | split row '_'; $list | length"#);
     assert_eq!(actual.out, "3");
 }
+
+#[test]
+fn const_const() {
+    let actual = nu!(r#"const y = (const x = "foo"; $x + $x); $y"#);
+    assert_eq!(actual.out, "foofoo");
+
+    let actual = nu!(r#"const y = (const x = "foo"; $x + $x); $x"#);
+    assert!(actual.err.contains("nu::parser::variable_not_found"));
+}

From 62e56d35812335b41d2d7975ca90ea02068708e3 Mon Sep 17 00:00:00 2001
From: Ian Manske <ian.manske@pm.me>
Date: Thu, 13 Feb 2025 04:03:40 +0000
Subject: [PATCH 1050/1072] Rework operator type errors (#14429)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

This PR adds two new `ParseError` and `ShellError` cases for type errors
relating to operators.
- `OperatorUnsupportedType` is used when a type is not supported by an
operator in any way, shape, or form. E.g., `+` does not support `bool`.
- `OperatorIncompatibleTypes` is used when a operator is used with types
it supports, but the combination of types provided cannot be used
together. E.g., `filesize + duration` is not a valid combination.

The other preexisting error cases related to operators have been removed
and replaced with the new ones above. Namely:

- `ShellError::OperatorMismatch`
- `ShellError::UnsupportedOperator`
- `ParseError::UnsupportedOperationLHS`
- `ParseError::UnsupportedOperationRHS`
- `ParseError::UnsupportedOperationTernary`

# User-Facing Changes

- `help operators` now lists the precedence of `not` as 55 instead of 0
(above the other boolean operators). Fixes #13675.
- `math median` and `math mode` now ignore NaN values so that `[NaN NaN]
| math median` and `[NaN NaN] | math mode` no longer trigger a type
error. Instead, it's now an empty input error. Fixing this in earnest
can be left for a future PR.
- Comparisons with `nan` now return false instead of causing an error.
E.g., `1 == nan` is now `false`.
- All the operator type errors have been standardized and reworked. In
particular, they can now have a help message, which is currently used
for types errors relating to `++`.

```nu
[1] ++ 2
```
```
Error: nu::parser::operator_unsupported_type

  × The '++' operator does not work on values of type 'int'.
   ╭─[entry #1:1:5]
 1 │ [1] ++ 2
   ·     ─┬ ┬
   ·      │ ╰── int
   ·      ╰── does not support 'int'
   ╰────
  help: if you meant to append a value to a list or a record to a table, use the `append` command or wrap the value in a list. For example: `$list ++ $value` should be
        `$list ++ [$value]` or `$list | append $value`.
```
---
 crates/nu-color-config/src/style_computer.rs  |    4 +-
 crates/nu-command/src/help/help_operators.rs  |   42 +-
 crates/nu-command/src/math/median.rs          |   41 +-
 crates/nu-command/src/math/mode.rs            |   19 +-
 crates/nu-command/src/math/reducers.rs        |   28 +-
 .../tests/commands/assignment/concat.rs       |    8 +-
 crates/nu-command/tests/commands/reduce.rs    |    4 +-
 crates/nu-engine/src/compile/expression.rs    |    4 +-
 crates/nu-engine/src/compile/operator.rs      |    6 +-
 crates/nu-engine/src/eval.rs                  |    6 +-
 crates/nu-engine/src/eval_ir.rs               |   10 +-
 crates/nu-parser/src/parser.rs                |   26 +-
 crates/nu-parser/src/type_check.rs            | 1666 +++++++----------
 crates/nu-parser/tests/test_parser.rs         |   15 +-
 .../nu-plugin-engine/src/interface/tests.rs   |    4 +-
 crates/nu-protocol/src/ast/operator.rs        |  208 +-
 crates/nu-protocol/src/errors/parse_error.rs  |   72 +-
 .../nu-protocol/src/errors/shell_error/mod.rs |   53 +-
 crates/nu-protocol/src/eval_base.rs           |    8 +-
 crates/nu-protocol/src/value/custom_value.rs  |   12 +-
 crates/nu-protocol/src/value/mod.rs           |  865 +++++----
 crates/nu-std/std/help/mod.nu                 |   81 +-
 .../src/cool_custom_value.rs                  |   26 +-
 .../src/dataframe/values/mod.rs               |   22 +-
 .../values/nu_dataframe/between_values.rs     |  180 +-
 .../values/nu_expression/custom_value.rs      |   18 +-
 tests/const_/mod.rs                           |    2 +-
 tests/repl/test_ranges.rs                     |    2 +-
 tests/repl/test_regex.rs                      |    4 +-
 tests/repl/test_strings.rs                    |    4 +-
 tests/repl/test_type_check.rs                 |   10 +-
 tests/shell/pipeline/commands/internal.rs     |    6 +-
 32 files changed, 1684 insertions(+), 1772 deletions(-)

diff --git a/crates/nu-color-config/src/style_computer.rs b/crates/nu-color-config/src/style_computer.rs
index bddc1bbf94..b055a6a46c 100644
--- a/crates/nu-color-config/src/style_computer.rs
+++ b/crates/nu-color-config/src/style_computer.rs
@@ -240,7 +240,9 @@ fn test_computable_style_closure_errors() {
     ];
     let actual_repl = nu!(nu_repl_code(&inp));
     // Check that the error was printed
-    assert!(actual_repl.err.contains("type mismatch for operator"));
+    assert!(actual_repl
+        .err
+        .contains("nu::shell::operator_incompatible_types"));
     // Check that the value was printed
     assert!(actual_repl.out.contains("bell"));
 }
diff --git a/crates/nu-command/src/help/help_operators.rs b/crates/nu-command/src/help/help_operators.rs
index 73368479c2..eeea7ace67 100644
--- a/crates/nu-command/src/help/help_operators.rs
+++ b/crates/nu-command/src/help/help_operators.rs
@@ -30,11 +30,11 @@ impl Command for HelpOperators {
         let head = call.head;
         let mut operators = [
             Operator::Assignment(Assignment::Assign),
-            Operator::Assignment(Assignment::PlusAssign),
-            Operator::Assignment(Assignment::ConcatAssign),
-            Operator::Assignment(Assignment::MinusAssign),
+            Operator::Assignment(Assignment::AddAssign),
+            Operator::Assignment(Assignment::SubtractAssign),
             Operator::Assignment(Assignment::MultiplyAssign),
             Operator::Assignment(Assignment::DivideAssign),
+            Operator::Assignment(Assignment::ConcatenateAssign),
             Operator::Comparison(Comparison::Equal),
             Operator::Comparison(Comparison::NotEqual),
             Operator::Comparison(Comparison::LessThan),
@@ -49,22 +49,22 @@ impl Command for HelpOperators {
             Operator::Comparison(Comparison::NotHas),
             Operator::Comparison(Comparison::StartsWith),
             Operator::Comparison(Comparison::EndsWith),
-            Operator::Math(Math::Plus),
-            Operator::Math(Math::Concat),
-            Operator::Math(Math::Minus),
+            Operator::Math(Math::Add),
+            Operator::Math(Math::Subtract),
             Operator::Math(Math::Multiply),
             Operator::Math(Math::Divide),
+            Operator::Math(Math::FloorDivide),
             Operator::Math(Math::Modulo),
-            Operator::Math(Math::FloorDivision),
             Operator::Math(Math::Pow),
+            Operator::Math(Math::Concatenate),
             Operator::Bits(Bits::BitOr),
             Operator::Bits(Bits::BitXor),
             Operator::Bits(Bits::BitAnd),
             Operator::Bits(Bits::ShiftLeft),
             Operator::Bits(Bits::ShiftRight),
-            Operator::Boolean(Boolean::And),
             Operator::Boolean(Boolean::Or),
             Operator::Boolean(Boolean::Xor),
+            Operator::Boolean(Boolean::And),
         ]
         .into_iter()
         .map(|op| {
@@ -87,7 +87,7 @@ impl Command for HelpOperators {
                 "operator" => Value::string("not", head),
                 "name" => Value::string("Not", head),
                 "description" => Value::string("Negates a value or expression.", head),
-                "precedence" => Value::int(0, head),
+                "precedence" => Value::int(55, head),
             },
             head,
         ));
@@ -151,32 +151,32 @@ fn description(operator: &Operator) -> &'static str {
         }
         Operator::Comparison(Comparison::StartsWith) => "Checks if a string starts with another.",
         Operator::Comparison(Comparison::EndsWith) => "Checks if a string ends with another.",
-        Operator::Math(Math::Plus) => "Adds two values.",
-        Operator::Math(Math::Concat) => {
-            "Concatenates two lists, two strings, or two binary values."
-        }
-        Operator::Math(Math::Minus) => "Subtracts two values.",
+        Operator::Math(Math::Add) => "Adds two values.",
+        Operator::Math(Math::Subtract) => "Subtracts two values.",
         Operator::Math(Math::Multiply) => "Multiplies two values.",
         Operator::Math(Math::Divide) => "Divides two values.",
+        Operator::Math(Math::FloorDivide) => "Divides two values and floors the result.",
         Operator::Math(Math::Modulo) => "Divides two values and returns the remainder.",
-        Operator::Math(Math::FloorDivision) => "Divides two values and floors the result.",
         Operator::Math(Math::Pow) => "Raises one value to the power of another.",
-        Operator::Boolean(Boolean::And) => "Checks if both values are true.",
+        Operator::Math(Math::Concatenate) => {
+            "Concatenates two lists, two strings, or two binary values."
+        }
         Operator::Boolean(Boolean::Or) => "Checks if either value is true.",
         Operator::Boolean(Boolean::Xor) => "Checks if one value is true and the other is false.",
+        Operator::Boolean(Boolean::And) => "Checks if both values are true.",
         Operator::Bits(Bits::BitOr) => "Performs a bitwise OR on two values.",
         Operator::Bits(Bits::BitXor) => "Performs a bitwise XOR on two values.",
         Operator::Bits(Bits::BitAnd) => "Performs a bitwise AND on two values.",
         Operator::Bits(Bits::ShiftLeft) => "Bitwise shifts a value left by another.",
         Operator::Bits(Bits::ShiftRight) => "Bitwise shifts a value right by another.",
         Operator::Assignment(Assignment::Assign) => "Assigns a value to a variable.",
-        Operator::Assignment(Assignment::PlusAssign) => "Adds a value to a variable.",
-        Operator::Assignment(Assignment::ConcatAssign) => {
-            "Concatenates two lists, two strings, or two binary values."
-        }
-        Operator::Assignment(Assignment::MinusAssign) => "Subtracts a value from a variable.",
+        Operator::Assignment(Assignment::AddAssign) => "Adds a value to a variable.",
+        Operator::Assignment(Assignment::SubtractAssign) => "Subtracts a value from a variable.",
         Operator::Assignment(Assignment::MultiplyAssign) => "Multiplies a variable by a value.",
         Operator::Assignment(Assignment::DivideAssign) => "Divides a variable by a value.",
+        Operator::Assignment(Assignment::ConcatenateAssign) => {
+            "Concatenates a list, a string, or a binary value to a variable of the same type."
+        }
     }
 }
 
diff --git a/crates/nu-command/src/math/median.rs b/crates/nu-command/src/math/median.rs
index 653ebb59ba..7b88fab346 100644
--- a/crates/nu-command/src/math/median.rs
+++ b/crates/nu-command/src/math/median.rs
@@ -91,45 +91,26 @@ pub fn median(values: &[Value], span: Span, head: Span) -> Result<Value, ShellEr
         Pick::Median
     };
 
-    let mut sorted = vec![];
-
-    for item in values {
-        sorted.push(item.clone());
-    }
-
-    if let Some(Err(values)) = values
-        .windows(2)
-        .map(|elem| {
-            if elem[0].partial_cmp(&elem[1]).is_none() {
-                return Err(ShellError::OperatorMismatch {
-                    op_span: head,
-                    lhs_ty: elem[0].get_type().to_string(),
-                    lhs_span: elem[0].span(),
-                    rhs_ty: elem[1].get_type().to_string(),
-                    rhs_span: elem[1].span(),
-                });
-            }
-            Ok(elem[0].partial_cmp(&elem[1]).unwrap_or(Ordering::Equal))
-        })
-        .find(|elem| elem.is_err())
-    {
-        return Err(values);
-    }
+    let mut sorted = values
+        .iter()
+        .filter(|x| !x.as_float().is_ok_and(f64::is_nan))
+        .collect::<Vec<_>>();
 
     sorted.sort_by(|a, b| a.partial_cmp(b).unwrap_or(Ordering::Equal));
 
     match take {
         Pick::Median => {
             let idx = (values.len() as f64 / 2.0).floor() as usize;
-            let out = sorted
+            Ok(sorted
                 .get(idx)
                 .ok_or_else(|| ShellError::UnsupportedInput {
                     msg: "Empty input".to_string(),
                     input: "value originates from here".into(),
                     msg_span: head,
                     input_span: span,
-                })?;
-            Ok(out.clone())
+                })?
+                .to_owned()
+                .to_owned())
         }
         Pick::MedianAverage => {
             let idx_end = values.len() / 2;
@@ -143,7 +124,8 @@ pub fn median(values: &[Value], span: Span, head: Span) -> Result<Value, ShellEr
                     msg_span: head,
                     input_span: span,
                 })?
-                .clone();
+                .to_owned()
+                .to_owned();
 
             let right = sorted
                 .get(idx_end)
@@ -153,7 +135,8 @@ pub fn median(values: &[Value], span: Span, head: Span) -> Result<Value, ShellEr
                     msg_span: head,
                     input_span: span,
                 })?
-                .clone();
+                .to_owned()
+                .to_owned();
 
             average(&[left, right], span, head)
         }
diff --git a/crates/nu-command/src/math/mode.rs b/crates/nu-command/src/math/mode.rs
index cf4ae36b2d..6f42d0bfd5 100644
--- a/crates/nu-command/src/math/mode.rs
+++ b/crates/nu-command/src/math/mode.rs
@@ -111,29 +111,12 @@ impl Command for SubCommand {
 }
 
 pub fn mode(values: &[Value], _span: Span, head: Span) -> Result<Value, ShellError> {
-    if let Some(Err(values)) = values
-        .windows(2)
-        .map(|elem| {
-            if elem[0].partial_cmp(&elem[1]).is_none() {
-                return Err(ShellError::OperatorMismatch {
-                    op_span: head,
-                    lhs_ty: elem[0].get_type().to_string(),
-                    lhs_span: elem[0].span(),
-                    rhs_ty: elem[1].get_type().to_string(),
-                    rhs_span: elem[1].span(),
-                });
-            }
-            Ok(elem[0].partial_cmp(&elem[1]).unwrap_or(Ordering::Equal))
-        })
-        .find(|elem| elem.is_err())
-    {
-        return Err(values);
-    }
     //In e-q, Value doesn't implement Hash or Eq, so we have to get the values inside
     // But f64 doesn't implement Hash, so we get the binary representation to use as
     // key in the HashMap
     let hashable_values = values
         .iter()
+        .filter(|x| !x.as_float().is_ok_and(f64::is_nan))
         .map(|val| match val {
             Value::Int { val, .. } => Ok(HashableType::new(val.to_ne_bytes(), NumberTypes::Int)),
             Value::Duration { val, .. } => {
diff --git a/crates/nu-command/src/math/reducers.rs b/crates/nu-command/src/math/reducers.rs
index 6bda6fa632..b076ca7567 100644
--- a/crates/nu-command/src/math/reducers.rs
+++ b/crates/nu-command/src/math/reducers.rs
@@ -32,18 +32,8 @@ pub fn max(data: Vec<Value>, span: Span, head: Span) -> Result<Value, ShellError
         .clone();
 
     for value in &data {
-        if let Some(result) = value.partial_cmp(&biggest) {
-            if result == Ordering::Greater {
-                biggest = value.clone();
-            }
-        } else {
-            return Err(ShellError::OperatorMismatch {
-                op_span: head,
-                lhs_ty: biggest.get_type().to_string(),
-                lhs_span: biggest.span(),
-                rhs_ty: value.get_type().to_string(),
-                rhs_span: value.span(),
-            });
+        if value.partial_cmp(&biggest) == Some(Ordering::Greater) {
+            biggest = value.clone();
         }
     }
     Ok(biggest)
@@ -61,18 +51,8 @@ pub fn min(data: Vec<Value>, span: Span, head: Span) -> Result<Value, ShellError
         .clone();
 
     for value in &data {
-        if let Some(result) = value.partial_cmp(&smallest) {
-            if result == Ordering::Less {
-                smallest = value.clone();
-            }
-        } else {
-            return Err(ShellError::OperatorMismatch {
-                op_span: head,
-                lhs_ty: smallest.get_type().to_string(),
-                lhs_span: smallest.span(),
-                rhs_ty: value.get_type().to_string(),
-                rhs_span: value.span(),
-            });
+        if value.partial_cmp(&smallest) == Some(Ordering::Less) {
+            smallest = value.clone();
         }
     }
     Ok(smallest)
diff --git a/crates/nu-command/tests/commands/assignment/concat.rs b/crates/nu-command/tests/commands/assignment/concat.rs
index 603a486f14..73a39571fa 100644
--- a/crates/nu-command/tests/commands/assignment/concat.rs
+++ b/crates/nu-command/tests/commands/assignment/concat.rs
@@ -62,7 +62,9 @@ fn concat_assign_type_mismatch() {
         $a ++= 'str'
     "#);
 
-    assert!(actual.err.contains("nu::parser::unsupported_operation"));
+    assert!(actual
+        .err
+        .contains("nu::parser::operator_incompatible_types"));
 }
 
 #[test]
@@ -72,5 +74,7 @@ fn concat_assign_runtime_type_mismatch() {
         $a ++= if true { 'str' }
     "#);
 
-    assert!(actual.err.contains("nu::shell::type_mismatch"));
+    assert!(actual
+        .err
+        .contains("nu::shell::operator_incompatible_types"));
 }
diff --git a/crates/nu-command/tests/commands/reduce.rs b/crates/nu-command/tests/commands/reduce.rs
index 4e3c6caff5..8c290dfcda 100644
--- a/crates/nu-command/tests/commands/reduce.rs
+++ b/crates/nu-command/tests/commands/reduce.rs
@@ -107,7 +107,9 @@ fn error_reduce_fold_type_mismatch() {
         "echo a b c | reduce --fold 0 { |it, acc| $acc + $it }"
     ));
 
-    assert!(actual.err.contains("mismatch"));
+    assert!(actual
+        .err
+        .contains("nu::shell::operator_incompatible_types"));
 }
 
 #[test]
diff --git a/crates/nu-engine/src/compile/expression.rs b/crates/nu-engine/src/compile/expression.rs
index ac5496f289..82fbcf9022 100644
--- a/crates/nu-engine/src/compile/expression.rs
+++ b/crates/nu-engine/src/compile/expression.rs
@@ -164,13 +164,13 @@ pub(crate) fn compile_expression(
             Ok(())
         }
         Expr::BinaryOp(lhs, op, rhs) => {
-            if let Expr::Operator(ref operator) = op.expr {
+            if let Expr::Operator(operator) = op.expr {
                 drop_input(builder)?;
                 compile_binary_op(
                     working_set,
                     builder,
                     lhs,
-                    operator.clone().into_spanned(op.span),
+                    operator.into_spanned(op.span),
                     rhs,
                     expr.span,
                     out_reg,
diff --git a/crates/nu-engine/src/compile/operator.rs b/crates/nu-engine/src/compile/operator.rs
index d03d81b966..6e127c8d5b 100644
--- a/crates/nu-engine/src/compile/operator.rs
+++ b/crates/nu-engine/src/compile/operator.rs
@@ -150,11 +150,11 @@ pub(crate) fn compile_binary_op(
 pub(crate) fn decompose_assignment(assignment: Assignment) -> Option<Operator> {
     match assignment {
         Assignment::Assign => None,
-        Assignment::PlusAssign => Some(Operator::Math(Math::Plus)),
-        Assignment::ConcatAssign => Some(Operator::Math(Math::Concat)),
-        Assignment::MinusAssign => Some(Operator::Math(Math::Minus)),
+        Assignment::AddAssign => Some(Operator::Math(Math::Add)),
+        Assignment::SubtractAssign => Some(Operator::Math(Math::Subtract)),
         Assignment::MultiplyAssign => Some(Operator::Math(Math::Multiply)),
         Assignment::DivideAssign => Some(Operator::Math(Math::Divide)),
+        Assignment::ConcatenateAssign => Some(Operator::Math(Math::Concatenate)),
     }
 }
 
diff --git a/crates/nu-engine/src/eval.rs b/crates/nu-engine/src/eval.rs
index 3f47e4a42e..01f7b69f7a 100644
--- a/crates/nu-engine/src/eval.rs
+++ b/crates/nu-engine/src/eval.rs
@@ -520,11 +520,11 @@ impl Eval for EvalRuntime {
 
         let rhs = match assignment {
             Assignment::Assign => rhs,
-            Assignment::PlusAssign => {
+            Assignment::AddAssign => {
                 let lhs = eval_expression::<D>(engine_state, stack, lhs)?;
                 lhs.add(op_span, &rhs, op_span)?
             }
-            Assignment::MinusAssign => {
+            Assignment::SubtractAssign => {
                 let lhs = eval_expression::<D>(engine_state, stack, lhs)?;
                 lhs.sub(op_span, &rhs, op_span)?
             }
@@ -536,7 +536,7 @@ impl Eval for EvalRuntime {
                 let lhs = eval_expression::<D>(engine_state, stack, lhs)?;
                 lhs.div(op_span, &rhs, op_span)?
             }
-            Assignment::ConcatAssign => {
+            Assignment::ConcatenateAssign => {
                 let lhs = eval_expression::<D>(engine_state, stack, lhs)?;
                 lhs.concat(op_span, &rhs, op_span)?
             }
diff --git a/crates/nu-engine/src/eval_ir.rs b/crates/nu-engine/src/eval_ir.rs
index 25b4cc1921..8252497a53 100644
--- a/crates/nu-engine/src/eval_ir.rs
+++ b/crates/nu-engine/src/eval_ir.rs
@@ -970,19 +970,19 @@ fn binary_op(
             Comparison::EndsWith => lhs_val.ends_with(op_span, &rhs_val, span)?,
         },
         Operator::Math(mat) => match mat {
-            Math::Plus => lhs_val.add(op_span, &rhs_val, span)?,
-            Math::Concat => lhs_val.concat(op_span, &rhs_val, span)?,
-            Math::Minus => lhs_val.sub(op_span, &rhs_val, span)?,
+            Math::Add => lhs_val.add(op_span, &rhs_val, span)?,
+            Math::Subtract => lhs_val.sub(op_span, &rhs_val, span)?,
             Math::Multiply => lhs_val.mul(op_span, &rhs_val, span)?,
             Math::Divide => lhs_val.div(op_span, &rhs_val, span)?,
+            Math::FloorDivide => lhs_val.floor_div(op_span, &rhs_val, span)?,
             Math::Modulo => lhs_val.modulo(op_span, &rhs_val, span)?,
-            Math::FloorDivision => lhs_val.floor_div(op_span, &rhs_val, span)?,
             Math::Pow => lhs_val.pow(op_span, &rhs_val, span)?,
+            Math::Concatenate => lhs_val.concat(op_span, &rhs_val, span)?,
         },
         Operator::Boolean(bl) => match bl {
-            Boolean::And => lhs_val.and(op_span, &rhs_val, span)?,
             Boolean::Or => lhs_val.or(op_span, &rhs_val, span)?,
             Boolean::Xor => lhs_val.xor(op_span, &rhs_val, span)?,
+            Boolean::And => lhs_val.and(op_span, &rhs_val, span)?,
         },
         Operator::Bits(bit) => match bit {
             Bits::BitOr => lhs_val.bit_or(op_span, &rhs_val, span)?,
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 30c014718a..7c2b162c37 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -5136,11 +5136,11 @@ pub fn parse_assignment_operator(working_set: &mut StateWorkingSet, span: Span)
 
     let operator = match contents {
         b"=" => Operator::Assignment(Assignment::Assign),
-        b"+=" => Operator::Assignment(Assignment::PlusAssign),
-        b"++=" => Operator::Assignment(Assignment::ConcatAssign),
-        b"-=" => Operator::Assignment(Assignment::MinusAssign),
+        b"+=" => Operator::Assignment(Assignment::AddAssign),
+        b"-=" => Operator::Assignment(Assignment::SubtractAssign),
         b"*=" => Operator::Assignment(Assignment::MultiplyAssign),
         b"/=" => Operator::Assignment(Assignment::DivideAssign),
+        b"++=" => Operator::Assignment(Assignment::ConcatenateAssign),
         _ => {
             working_set.error(ParseError::Expected("assignment operator", span));
             return garbage(working_set, span);
@@ -5276,28 +5276,28 @@ pub fn parse_operator(working_set: &mut StateWorkingSet, span: Span) -> Expressi
         b">=" => Operator::Comparison(Comparison::GreaterThanOrEqual),
         b"=~" | b"like" => Operator::Comparison(Comparison::RegexMatch),
         b"!~" | b"not-like" => Operator::Comparison(Comparison::NotRegexMatch),
-        b"+" => Operator::Math(Math::Plus),
-        b"++" => Operator::Math(Math::Concat),
-        b"-" => Operator::Math(Math::Minus),
-        b"*" => Operator::Math(Math::Multiply),
-        b"/" => Operator::Math(Math::Divide),
-        b"//" => Operator::Math(Math::FloorDivision),
         b"in" => Operator::Comparison(Comparison::In),
         b"not-in" => Operator::Comparison(Comparison::NotIn),
         b"has" => Operator::Comparison(Comparison::Has),
         b"not-has" => Operator::Comparison(Comparison::NotHas),
+        b"starts-with" => Operator::Comparison(Comparison::StartsWith),
+        b"ends-with" => Operator::Comparison(Comparison::EndsWith),
+        b"+" => Operator::Math(Math::Add),
+        b"-" => Operator::Math(Math::Subtract),
+        b"*" => Operator::Math(Math::Multiply),
+        b"/" => Operator::Math(Math::Divide),
+        b"//" => Operator::Math(Math::FloorDivide),
         b"mod" => Operator::Math(Math::Modulo),
+        b"**" => Operator::Math(Math::Pow),
+        b"++" => Operator::Math(Math::Concatenate),
         b"bit-or" => Operator::Bits(Bits::BitOr),
         b"bit-xor" => Operator::Bits(Bits::BitXor),
         b"bit-and" => Operator::Bits(Bits::BitAnd),
         b"bit-shl" => Operator::Bits(Bits::ShiftLeft),
         b"bit-shr" => Operator::Bits(Bits::ShiftRight),
-        b"starts-with" => Operator::Comparison(Comparison::StartsWith),
-        b"ends-with" => Operator::Comparison(Comparison::EndsWith),
-        b"and" => Operator::Boolean(Boolean::And),
         b"or" => Operator::Boolean(Boolean::Or),
         b"xor" => Operator::Boolean(Boolean::Xor),
-        b"**" => Operator::Math(Math::Pow),
+        b"and" => Operator::Boolean(Boolean::And),
         // WARNING: not actual operators below! Error handling only
         pow @ (b"^" | b"pow") => {
             working_set.error(ParseError::UnknownOperator(
diff --git a/crates/nu-parser/src/type_check.rs b/crates/nu-parser/src/type_check.rs
index b0197589af..c04033047d 100644
--- a/crates/nu-parser/src/type_check.rs
+++ b/crates/nu-parser/src/type_check.rs
@@ -1,12 +1,45 @@
 use nu_protocol::{
-    ast::{
-        Assignment, Bits, Block, Boolean, Comparison, Expr, Expression, Math, Operator, Pipeline,
-        Range,
-    },
+    ast::{Block, Comparison, Expr, Expression, Math, Operator, Pipeline, Range},
     engine::StateWorkingSet,
-    ParseError, Type,
+    ParseError, Span, Type,
 };
 
+fn type_error(
+    op: Operator,
+    op_span: Span,
+    lhs: &Expression,
+    rhs: &Expression,
+    is_supported: fn(&Type) -> bool,
+) -> (Type, Option<ParseError>) {
+    let is_supported = |ty| is_supported(ty) || matches!(ty, Type::Any | Type::Custom(_));
+    let err = match (is_supported(&lhs.ty), is_supported(&rhs.ty)) {
+        (true, true) => ParseError::OperatorIncompatibleTypes {
+            op: op.as_str(),
+            lhs: lhs.ty.clone(),
+            rhs: rhs.ty.clone(),
+            op_span,
+            lhs_span: lhs.span,
+            rhs_span: rhs.span,
+            help: None,
+        },
+        (true, false) => ParseError::OperatorUnsupportedType {
+            op: op.as_str(),
+            unsupported: rhs.ty.clone(),
+            op_span,
+            unsupported_span: rhs.span,
+            help: None,
+        },
+        (false, _) => ParseError::OperatorUnsupportedType {
+            op: op.as_str(),
+            unsupported: lhs.ty.clone(),
+            op_span,
+            unsupported_span: lhs.span,
+            help: None,
+        },
+    };
+    (Type::Any, Some(err))
+}
+
 pub fn type_compatible(lhs: &Type, rhs: &Type) -> bool {
     // Structural subtyping
     let is_compatible = |expected: &[(String, Type)], found: &[(String, Type)]| {
@@ -65,899 +98,648 @@ pub fn type_compatible(lhs: &Type, rhs: &Type) -> bool {
     }
 }
 
+// TODO: rework type checking for Custom values
 pub fn math_result_type(
     working_set: &mut StateWorkingSet,
     lhs: &mut Expression,
     op: &mut Expression,
     rhs: &mut Expression,
 ) -> (Type, Option<ParseError>) {
-    match &op.expr {
-        Expr::Operator(operator) => match operator {
-            Operator::Math(Math::Plus) => match (&lhs.ty, &rhs.ty) {
-                (Type::Int, Type::Int) => (Type::Int, None),
-                (Type::Float, Type::Int) => (Type::Float, None),
-                (Type::Int, Type::Float) => (Type::Float, None),
-                (Type::Float, Type::Float) => (Type::Float, None),
-                (Type::Number, Type::Number) => (Type::Number, None),
-                (Type::Number, Type::Int) => (Type::Number, None),
-                (Type::Int, Type::Number) => (Type::Number, None),
-                (Type::Number, Type::Float) => (Type::Number, None),
-                (Type::Float, Type::Number) => (Type::Number, None),
-                (Type::String, Type::String) => (Type::String, None),
-                (Type::Date, Type::Duration) => (Type::Date, None),
-                (Type::Duration, Type::Date) => (Type::Date, None),
-                (Type::Duration, Type::Duration) => (Type::Duration, None),
-                (Type::Filesize, Type::Filesize) => (Type::Filesize, None),
-
-                (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
-                (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
-
-                (Type::Any, _) => (Type::Any, None),
-                (_, Type::Any) => (Type::Any, None),
-                (
-                    Type::Int
-                    | Type::Float
-                    | Type::String
-                    | Type::Date
-                    | Type::Duration
-                    | Type::Filesize,
-                    _,
-                ) => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationRHS(
-                            "addition".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                            rhs.span,
-                            rhs.ty.clone(),
-                        )),
+    let &Expr::Operator(operator) = &op.expr else {
+        *op = Expression::garbage(working_set, op.span);
+        return (
+            Type::Any,
+            Some(ParseError::IncompleteMathExpression(op.span)),
+        );
+    };
+    match operator {
+        Operator::Math(Math::Add) => match (&lhs.ty, &rhs.ty) {
+            (Type::Int, Type::Int) => (Type::Int, None),
+            (Type::Float, Type::Int) => (Type::Float, None),
+            (Type::Int, Type::Float) => (Type::Float, None),
+            (Type::Float, Type::Float) => (Type::Float, None),
+            (Type::Number, Type::Number) => (Type::Number, None),
+            (Type::Number, Type::Int) => (Type::Number, None),
+            (Type::Int, Type::Number) => (Type::Number, None),
+            (Type::Number, Type::Float) => (Type::Number, None),
+            (Type::Float, Type::Number) => (Type::Number, None),
+            (Type::String, Type::String) => (Type::String, None),
+            // TODO: should this include glob
+            (Type::Date, Type::Duration) => (Type::Date, None),
+            (Type::Duration, Type::Date) => (Type::Date, None),
+            (Type::Duration, Type::Duration) => (Type::Duration, None),
+            (Type::Filesize, Type::Filesize) => (Type::Filesize, None),
+            (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
+            (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
+            (Type::Any, _) => (Type::Any, None),
+            (_, Type::Any) => (Type::Any, None),
+            _ => {
+                *op = Expression::garbage(working_set, op.span);
+                type_error(operator, op.span, lhs, rhs, |ty| {
+                    matches!(
+                        ty,
+                        Type::Int
+                            | Type::Float
+                            | Type::Number
+                            | Type::String
+                            | Type::Date
+                            | Type::Duration
+                            | Type::Filesize,
                     )
-                }
-                _ => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationLHS(
-                            "addition".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                        )),
-                    )
-                }
-            },
-            Operator::Math(Math::Concat) => check_concat(working_set, lhs, rhs, op),
-            Operator::Math(Math::Minus) => match (&lhs.ty, &rhs.ty) {
-                (Type::Int, Type::Int) => (Type::Int, None),
-                (Type::Float, Type::Int) => (Type::Float, None),
-                (Type::Int, Type::Float) => (Type::Float, None),
-                (Type::Float, Type::Float) => (Type::Float, None),
-                (Type::Number, Type::Number) => (Type::Number, None),
-                (Type::Number, Type::Int) => (Type::Number, None),
-                (Type::Int, Type::Number) => (Type::Number, None),
-                (Type::Number, Type::Float) => (Type::Number, None),
-                (Type::Float, Type::Number) => (Type::Number, None),
-                (Type::Date, Type::Date) => (Type::Duration, None),
-                (Type::Date, Type::Duration) => (Type::Date, None),
-                (Type::Duration, Type::Duration) => (Type::Duration, None),
-                (Type::Filesize, Type::Filesize) => (Type::Filesize, None),
-
-                (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
-                (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
-
-                (Type::Any, _) => (Type::Any, None),
-                (_, Type::Any) => (Type::Any, None),
-                (Type::Int | Type::Float | Type::Date | Type::Duration | Type::Filesize, _) => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationRHS(
-                            "subtraction".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                            rhs.span,
-                            rhs.ty.clone(),
-                        )),
-                    )
-                }
-                _ => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationLHS(
-                            "subtraction".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                        )),
-                    )
-                }
-            },
-            Operator::Math(Math::Multiply) => match (&lhs.ty, &rhs.ty) {
-                (Type::Int, Type::Int) => (Type::Int, None),
-                (Type::Float, Type::Int) => (Type::Float, None),
-                (Type::Int, Type::Float) => (Type::Float, None),
-                (Type::Float, Type::Float) => (Type::Float, None),
-                (Type::Number, Type::Number) => (Type::Number, None),
-                (Type::Number, Type::Int) => (Type::Number, None),
-                (Type::Int, Type::Number) => (Type::Number, None),
-                (Type::Number, Type::Float) => (Type::Number, None),
-                (Type::Float, Type::Number) => (Type::Number, None),
-                (Type::Filesize, Type::Int) => (Type::Filesize, None),
-                (Type::Int, Type::Filesize) => (Type::Filesize, None),
-                (Type::Filesize, Type::Float) => (Type::Filesize, None),
-                (Type::Float, Type::Filesize) => (Type::Filesize, None),
-                (Type::Duration, Type::Int) => (Type::Duration, None),
-                (Type::Int, Type::Duration) => (Type::Duration, None),
-                (Type::Duration, Type::Float) => (Type::Duration, None),
-                (Type::Float, Type::Duration) => (Type::Duration, None),
-
-                (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
-                (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
-
-                (Type::Any, _) => (Type::Any, None),
-                (_, Type::Any) => (Type::Any, None),
-                (Type::Int, _)
-                | (Type::Float, _)
-                | (Type::String, _)
-                | (Type::Date, _)
-                | (Type::Duration, _)
-                | (Type::Filesize, _)
-                | (Type::List(_), _) => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationRHS(
-                            "multiplication".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                            rhs.span,
-                            rhs.ty.clone(),
-                        )),
-                    )
-                }
-                _ => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationLHS(
-                            "multiplication".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                        )),
-                    )
-                }
-            },
-            Operator::Math(Math::Pow) => match (&lhs.ty, &rhs.ty) {
-                (Type::Int, Type::Int) => (Type::Int, None),
-                (Type::Float, Type::Int) => (Type::Float, None),
-                (Type::Int, Type::Float) => (Type::Float, None),
-                (Type::Float, Type::Float) => (Type::Float, None),
-                (Type::Number, Type::Number) => (Type::Number, None),
-                (Type::Number, Type::Int) => (Type::Number, None),
-                (Type::Int, Type::Number) => (Type::Number, None),
-                (Type::Number, Type::Float) => (Type::Number, None),
-                (Type::Float, Type::Number) => (Type::Number, None),
-
-                (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
-                (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
-
-                (Type::Any, _) => (Type::Any, None),
-                (_, Type::Any) => (Type::Any, None),
-                (Type::Int | Type::Float, _) => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationRHS(
-                            "exponentiation".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                            rhs.span,
-                            rhs.ty.clone(),
-                        )),
-                    )
-                }
-                _ => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationLHS(
-                            "exponentiation".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                        )),
-                    )
-                }
-            },
-            Operator::Math(Math::Divide) => match (&lhs.ty, &rhs.ty) {
-                (Type::Int, Type::Int) => (Type::Float, None),
-                (Type::Float, Type::Int) => (Type::Float, None),
-                (Type::Int, Type::Float) => (Type::Float, None),
-                (Type::Float, Type::Float) => (Type::Float, None),
-                (Type::Number, Type::Number) => (Type::Float, None),
-                (Type::Number, Type::Int) => (Type::Float, None),
-                (Type::Int, Type::Number) => (Type::Float, None),
-                (Type::Number, Type::Float) => (Type::Float, None),
-                (Type::Float, Type::Number) => (Type::Float, None),
-                (Type::Filesize, Type::Filesize) => (Type::Float, None),
-                (Type::Filesize, Type::Int) => (Type::Filesize, None),
-                (Type::Filesize, Type::Float) => (Type::Filesize, None),
-                (Type::Duration, Type::Duration) => (Type::Float, None),
-                (Type::Duration, Type::Int) => (Type::Duration, None),
-                (Type::Duration, Type::Float) => (Type::Duration, None),
-
-                (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
-                (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
-
-                (Type::Any, _) => (Type::Any, None),
-                (_, Type::Any) => (Type::Any, None),
-                (Type::Int | Type::Float | Type::Filesize | Type::Duration, _) => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationRHS(
-                            "division".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                            rhs.span,
-                            rhs.ty.clone(),
-                        )),
-                    )
-                }
-                _ => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationLHS(
-                            "division".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                        )),
-                    )
-                }
-            },
-            Operator::Math(Math::Modulo) => match (&lhs.ty, &rhs.ty) {
-                (Type::Int, Type::Int) => (Type::Int, None),
-                (Type::Float, Type::Int) => (Type::Float, None),
-                (Type::Int, Type::Float) => (Type::Float, None),
-                (Type::Float, Type::Float) => (Type::Float, None),
-                (Type::Number, Type::Number) => (Type::Number, None),
-                (Type::Number, Type::Int) => (Type::Number, None),
-                (Type::Int, Type::Number) => (Type::Number, None),
-                (Type::Number, Type::Float) => (Type::Number, None),
-                (Type::Float, Type::Number) => (Type::Number, None),
-                (Type::Filesize, Type::Filesize) => (Type::Filesize, None),
-                (Type::Filesize, Type::Int) => (Type::Filesize, None),
-                (Type::Filesize, Type::Float) => (Type::Filesize, None),
-                (Type::Duration, Type::Duration) => (Type::Duration, None),
-                (Type::Duration, Type::Int) => (Type::Duration, None),
-                (Type::Duration, Type::Float) => (Type::Duration, None),
-
-                (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
-                (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
-
-                (Type::Any, _) => (Type::Any, None),
-                (_, Type::Any) => (Type::Any, None),
-                (Type::Int | Type::Float | Type::Filesize | Type::Duration, _) => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationRHS(
-                            "division".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                            rhs.span,
-                            rhs.ty.clone(),
-                        )),
-                    )
-                }
-                _ => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationLHS(
-                            "division".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                        )),
-                    )
-                }
-            },
-            Operator::Math(Math::FloorDivision) => match (&lhs.ty, &rhs.ty) {
-                (Type::Int, Type::Int) => (Type::Int, None),
-                (Type::Float, Type::Int) => (Type::Float, None),
-                (Type::Int, Type::Float) => (Type::Float, None),
-                (Type::Float, Type::Float) => (Type::Float, None),
-                (Type::Number, Type::Number) => (Type::Number, None),
-                (Type::Number, Type::Int) => (Type::Number, None),
-                (Type::Int, Type::Number) => (Type::Number, None),
-                (Type::Number, Type::Float) => (Type::Number, None),
-                (Type::Float, Type::Number) => (Type::Number, None),
-                (Type::Filesize, Type::Filesize) => (Type::Int, None),
-                (Type::Filesize, Type::Int) => (Type::Filesize, None),
-                (Type::Filesize, Type::Float) => (Type::Filesize, None),
-                (Type::Duration, Type::Duration) => (Type::Int, None),
-                (Type::Duration, Type::Int) => (Type::Duration, None),
-                (Type::Duration, Type::Float) => (Type::Duration, None),
-
-                (Type::Any, _) => (Type::Any, None),
-                (_, Type::Any) => (Type::Any, None),
-                (Type::Int | Type::Float | Type::Filesize | Type::Duration, _) => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationRHS(
-                            "floor division".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                            rhs.span,
-                            rhs.ty.clone(),
-                        )),
-                    )
-                }
-                _ => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationLHS(
-                            "floor division".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                        )),
-                    )
-                }
-            },
-            Operator::Boolean(Boolean::And)
-            | Operator::Boolean(Boolean::Or)
-            | Operator::Boolean(Boolean::Xor) => {
-                match (&lhs.ty, &rhs.ty) {
-                    (Type::Bool, Type::Bool) => (Type::Bool, None),
-
-                    (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
-                    (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
-
-                    (Type::Any, _) => (Type::Any, None),
-                    (_, Type::Any) => (Type::Any, None),
-
-                    // FIX ME. This is added because there is no type output for custom function
-                    // definitions. As soon as that syntax is added this should be removed
-                    (a, b) if a == b => (Type::Bool, None),
-                    (Type::Bool, _) => {
-                        *op = Expression::garbage(working_set, op.span);
-                        (
-                            Type::Any,
-                            Some(ParseError::UnsupportedOperationRHS(
-                                "boolean operation".into(),
-                                op.span,
-                                lhs.span,
-                                lhs.ty.clone(),
-                                rhs.span,
-                                rhs.ty.clone(),
-                            )),
-                        )
-                    }
-                    _ => {
-                        *op = Expression::garbage(working_set, op.span);
-                        (
-                            Type::Any,
-                            Some(ParseError::UnsupportedOperationLHS(
-                                "boolean operation".into(),
-                                op.span,
-                                lhs.span,
-                                lhs.ty.clone(),
-                            )),
-                        )
-                    }
-                }
+                })
             }
-            Operator::Comparison(Comparison::LessThan) => match (&lhs.ty, &rhs.ty) {
-                (Type::Int, Type::Int) => (Type::Bool, None),
-                (Type::Float, Type::Int) => (Type::Bool, None),
-                (Type::Int, Type::Float) => (Type::Bool, None),
-                (Type::Float, Type::Float) => (Type::Bool, None),
-                (Type::Number, Type::Number) => (Type::Bool, None),
-                (Type::Number, Type::Int) => (Type::Bool, None),
-                (Type::Int, Type::Number) => (Type::Bool, None),
-                (Type::Number, Type::Float) => (Type::Bool, None),
-                (Type::Float, Type::Number) => (Type::Bool, None),
-                (Type::String, Type::String) => (Type::Bool, None),
-                (Type::Duration, Type::Duration) => (Type::Bool, None),
-                (Type::Date, Type::Date) => (Type::Bool, None),
-                (Type::Filesize, Type::Filesize) => (Type::Bool, None),
-                (Type::Bool, Type::Bool) => (Type::Bool, None),
-
-                (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
-                (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
-
-                (Type::Nothing, _) => (Type::Nothing, None),
-                (_, Type::Nothing) => (Type::Nothing, None),
-
-                (Type::Any, _) => (Type::Bool, None),
-                (_, Type::Any) => (Type::Bool, None),
-                (Type::Int | Type::Float | Type::Duration | Type::Filesize, _) => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationRHS(
-                            "less-than comparison".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                            rhs.span,
-                            rhs.ty.clone(),
-                        )),
-                    )
-                }
-                _ => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationLHS(
-                            "less-than comparison".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                        )),
-                    )
-                }
-            },
-            Operator::Comparison(Comparison::LessThanOrEqual) => match (&lhs.ty, &rhs.ty) {
-                (Type::Int, Type::Int) => (Type::Bool, None),
-                (Type::Float, Type::Int) => (Type::Bool, None),
-                (Type::Int, Type::Float) => (Type::Bool, None),
-                (Type::Float, Type::Float) => (Type::Bool, None),
-                (Type::Number, Type::Number) => (Type::Bool, None),
-                (Type::Number, Type::Int) => (Type::Bool, None),
-                (Type::Int, Type::Number) => (Type::Bool, None),
-                (Type::Number, Type::Float) => (Type::Bool, None),
-                (Type::Float, Type::Number) => (Type::Bool, None),
-                (Type::String, Type::String) => (Type::Bool, None),
-                (Type::Duration, Type::Duration) => (Type::Bool, None),
-                (Type::Date, Type::Date) => (Type::Bool, None),
-                (Type::Filesize, Type::Filesize) => (Type::Bool, None),
-                (Type::Bool, Type::Bool) => (Type::Bool, None),
-
-                (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
-                (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
-
-                (Type::Nothing, _) => (Type::Nothing, None),
-                (_, Type::Nothing) => (Type::Nothing, None),
-
-                (Type::Any, _) => (Type::Bool, None),
-                (_, Type::Any) => (Type::Bool, None),
-                (Type::Int | Type::Float | Type::Duration | Type::Filesize, _) => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationRHS(
-                            "less-than or equal comparison".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                            rhs.span,
-                            rhs.ty.clone(),
-                        )),
-                    )
-                }
-                _ => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationLHS(
-                            "less-than or equal comparison".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                        )),
-                    )
-                }
-            },
-            Operator::Comparison(Comparison::GreaterThan) => match (&lhs.ty, &rhs.ty) {
-                (Type::Int, Type::Int) => (Type::Bool, None),
-                (Type::Float, Type::Int) => (Type::Bool, None),
-                (Type::Int, Type::Float) => (Type::Bool, None),
-                (Type::Float, Type::Float) => (Type::Bool, None),
-                (Type::Number, Type::Number) => (Type::Bool, None),
-                (Type::Number, Type::Int) => (Type::Bool, None),
-                (Type::Int, Type::Number) => (Type::Bool, None),
-                (Type::Number, Type::Float) => (Type::Bool, None),
-                (Type::Float, Type::Number) => (Type::Bool, None),
-                (Type::String, Type::String) => (Type::Bool, None),
-                (Type::Duration, Type::Duration) => (Type::Bool, None),
-                (Type::Date, Type::Date) => (Type::Bool, None),
-                (Type::Filesize, Type::Filesize) => (Type::Bool, None),
-                (Type::Bool, Type::Bool) => (Type::Bool, None),
-
-                (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
-                (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
-
-                (Type::Any, _) => (Type::Bool, None),
-                (_, Type::Any) => (Type::Bool, None),
-
-                (Type::Nothing, _) => (Type::Nothing, None),
-                (_, Type::Nothing) => (Type::Nothing, None),
-                (Type::Int | Type::Float | Type::Duration | Type::Filesize, _) => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationRHS(
-                            "greater-than comparison".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                            rhs.span,
-                            rhs.ty.clone(),
-                        )),
-                    )
-                }
-                _ => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationLHS(
-                            "greater-than comparison".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                        )),
-                    )
-                }
-            },
-            Operator::Comparison(Comparison::GreaterThanOrEqual) => match (&lhs.ty, &rhs.ty) {
-                (Type::Int, Type::Int) => (Type::Bool, None),
-                (Type::Float, Type::Int) => (Type::Bool, None),
-                (Type::Int, Type::Float) => (Type::Bool, None),
-                (Type::Float, Type::Float) => (Type::Bool, None),
-                (Type::Number, Type::Number) => (Type::Bool, None),
-                (Type::Number, Type::Int) => (Type::Bool, None),
-                (Type::Int, Type::Number) => (Type::Bool, None),
-                (Type::Number, Type::Float) => (Type::Bool, None),
-                (Type::Float, Type::Number) => (Type::Bool, None),
-                (Type::String, Type::String) => (Type::Bool, None),
-                (Type::Duration, Type::Duration) => (Type::Bool, None),
-                (Type::Date, Type::Date) => (Type::Bool, None),
-                (Type::Filesize, Type::Filesize) => (Type::Bool, None),
-                (Type::Bool, Type::Bool) => (Type::Bool, None),
-
-                (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
-                (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
-
-                (Type::Any, _) => (Type::Bool, None),
-                (_, Type::Any) => (Type::Bool, None),
-
-                (Type::Nothing, _) => (Type::Nothing, None),
-                (_, Type::Nothing) => (Type::Nothing, None),
-                (Type::Int | Type::Float | Type::Duration | Type::Filesize, _) => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationRHS(
-                            "greater-than or equal comparison".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                            rhs.span,
-                            rhs.ty.clone(),
-                        )),
-                    )
-                }
-                _ => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationLHS(
-                            "greater-than or equal comparison".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                        )),
-                    )
-                }
-            },
-            Operator::Comparison(Comparison::Equal) => match (&lhs.ty, &rhs.ty) {
-                (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
-                (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
-
-                _ => (Type::Bool, None),
-            },
-            Operator::Comparison(Comparison::NotEqual) => match (&lhs.ty, &rhs.ty) {
-                (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
-                (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
-
-                _ => (Type::Bool, None),
-            },
-            Operator::Comparison(Comparison::RegexMatch) => match (&lhs.ty, &rhs.ty) {
-                (Type::String, Type::String) => (Type::Bool, None),
-                (Type::Any, _) => (Type::Bool, None),
-                (_, Type::Any) => (Type::Bool, None),
-
-                (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
-                (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
-
-                (Type::String, _) => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationRHS(
-                            "regex matching".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                            rhs.span,
-                            rhs.ty.clone(),
-                        )),
-                    )
-                }
-                _ => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationLHS(
-                            "regex matching".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                        )),
-                    )
-                }
-            },
-            Operator::Comparison(Comparison::NotRegexMatch) => match (&lhs.ty, &rhs.ty) {
-                (Type::String, Type::String) => (Type::Bool, None),
-                (Type::Any, _) => (Type::Bool, None),
-                (_, Type::Any) => (Type::Bool, None),
-
-                (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
-                (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
-
-                (Type::String, _) => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationRHS(
-                            "regex matching".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                            rhs.span,
-                            rhs.ty.clone(),
-                        )),
-                    )
-                }
-                _ => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationLHS(
-                            "regex matching".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                        )),
-                    )
-                }
-            },
-            Operator::Comparison(Comparison::StartsWith) => match (&lhs.ty, &rhs.ty) {
-                (Type::String, Type::String) => (Type::Bool, None),
-                (Type::Any, _) => (Type::Bool, None),
-                (_, Type::Any) => (Type::Bool, None),
-
-                (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
-                (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
-
-                (Type::String, _) => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationRHS(
-                            "starts-with comparison".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                            rhs.span,
-                            rhs.ty.clone(),
-                        )),
-                    )
-                }
-                _ => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationLHS(
-                            "starts-with comparison".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                        )),
-                    )
-                }
-            },
-            Operator::Comparison(Comparison::EndsWith) => match (&lhs.ty, &rhs.ty) {
-                (Type::String, Type::String) => (Type::Bool, None),
-                (Type::Any, _) => (Type::Bool, None),
-                (_, Type::Any) => (Type::Bool, None),
-
-                (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
-                (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
-
-                (Type::String, _) => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationRHS(
-                            "ends-with comparison".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                            rhs.span,
-                            rhs.ty.clone(),
-                        )),
-                    )
-                }
-                _ => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationLHS(
-                            "ends-with comparison".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                        )),
-                    )
-                }
-            },
-            Operator::Comparison(Comparison::In | Comparison::NotIn) => match (&lhs.ty, &rhs.ty) {
-                (t, Type::List(u)) if type_compatible(t, u) => (Type::Bool, None),
-                (Type::Int | Type::Float | Type::Number, Type::Range) => (Type::Bool, None),
-                (Type::String, Type::String) => (Type::Bool, None),
-                (Type::String, Type::Record(_)) => (Type::Bool, None),
-
-                (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
-                (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
-
-                (Type::Any, _) => (Type::Bool, None),
-                (_, Type::Any) => (Type::Bool, None),
-                (Type::Int | Type::Float | Type::String, _) => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationRHS(
-                            "subset comparison".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                            rhs.span,
-                            rhs.ty.clone(),
-                        )),
-                    )
-                }
-                _ => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationLHS(
-                            "subset comparison".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                        )),
-                    )
-                }
-            },
-            Operator::Comparison(Comparison::Has | Comparison::NotHas) => {
-                let container = lhs;
-                let element = rhs;
-                match (&element.ty, &container.ty) {
-                    (t, Type::List(u)) if type_compatible(t, u) => (Type::Bool, None),
-                    (Type::Int | Type::Float | Type::Number, Type::Range) => (Type::Bool, None),
-                    (Type::String, Type::String) => (Type::Bool, None),
-                    (Type::String, Type::Record(_)) => (Type::Bool, None),
-
-                    (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
-                    (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
-
-                    (Type::Any, _) => (Type::Bool, None),
-                    (_, Type::Any) => (Type::Bool, None),
-                    (Type::Int | Type::Float | Type::String, _) => {
-                        *op = Expression::garbage(working_set, op.span);
-                        (
-                            Type::Any,
-                            Some(ParseError::UnsupportedOperationLHS(
-                                "subset comparison".into(),
-                                op.span,
-                                element.span,
-                                element.ty.clone(),
-                            )),
-                        )
-                    }
-                    _ => {
-                        *op = Expression::garbage(working_set, op.span);
-                        (
-                            Type::Any,
-                            Some(ParseError::UnsupportedOperationRHS(
-                                "subset comparison".into(),
-                                op.span,
-                                element.span,
-                                element.ty.clone(),
-                                container.span,
-                                container.ty.clone(),
-                            )),
-                        )
-                    }
-                }
-            }
-            Operator::Bits(Bits::ShiftLeft)
-            | Operator::Bits(Bits::ShiftRight)
-            | Operator::Bits(Bits::BitOr)
-            | Operator::Bits(Bits::BitXor)
-            | Operator::Bits(Bits::BitAnd) => match (&lhs.ty, &rhs.ty) {
-                (Type::Int, Type::Int) => (Type::Int, None),
-
-                (Type::Any, _) => (Type::Any, None),
-                (_, Type::Any) => (Type::Any, None),
-                (Type::Int, _) => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationRHS(
-                            "bit operations".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                            rhs.span,
-                            rhs.ty.clone(),
-                        )),
-                    )
-                }
-                _ => {
-                    *op = Expression::garbage(working_set, op.span);
-                    (
-                        Type::Any,
-                        Some(ParseError::UnsupportedOperationLHS(
-                            "bit operations".into(),
-                            op.span,
-                            lhs.span,
-                            lhs.ty.clone(),
-                        )),
-                    )
-                }
-            },
-            Operator::Assignment(Assignment::ConcatAssign) => {
-                check_concat(working_set, lhs, rhs, op)
-            }
-            Operator::Assignment(_) => match (&lhs.ty, &rhs.ty) {
-                (x, y) if x == y => (Type::Nothing, None),
-                (Type::Any, _) => (Type::Nothing, None),
-                (_, Type::Any) => (Type::Nothing, None),
-                (Type::List(_), Type::List(_)) => (Type::Nothing, None),
-                (x, y) => (
-                    Type::Nothing,
-                    Some(ParseError::Mismatch(x.to_string(), y.to_string(), rhs.span)),
-                ),
-            },
         },
-        _ => {
-            *op = Expression::garbage(working_set, op.span);
-
-            (
-                Type::Any,
-                Some(ParseError::IncompleteMathExpression(op.span)),
-            )
+        Operator::Math(Math::Subtract) => match (&lhs.ty, &rhs.ty) {
+            (Type::Int, Type::Int) => (Type::Int, None),
+            (Type::Float, Type::Int) => (Type::Float, None),
+            (Type::Int, Type::Float) => (Type::Float, None),
+            (Type::Float, Type::Float) => (Type::Float, None),
+            (Type::Number, Type::Number) => (Type::Number, None),
+            (Type::Number, Type::Int) => (Type::Number, None),
+            (Type::Int, Type::Number) => (Type::Number, None),
+            (Type::Number, Type::Float) => (Type::Number, None),
+            (Type::Float, Type::Number) => (Type::Number, None),
+            (Type::Date, Type::Date) => (Type::Duration, None),
+            (Type::Date, Type::Duration) => (Type::Date, None),
+            (Type::Duration, Type::Duration) => (Type::Duration, None),
+            (Type::Filesize, Type::Filesize) => (Type::Filesize, None),
+            (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
+            (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
+            (Type::Any, _) => (Type::Any, None),
+            (_, Type::Any) => (Type::Any, None),
+            _ => {
+                *op = Expression::garbage(working_set, op.span);
+                type_error(operator, op.span, lhs, rhs, |ty| {
+                    matches!(
+                        ty,
+                        Type::Int
+                            | Type::Float
+                            | Type::Number
+                            | Type::Date
+                            | Type::Duration
+                            | Type::Filesize
+                    )
+                })
+            }
+        },
+        Operator::Math(Math::Multiply) => match (&lhs.ty, &rhs.ty) {
+            (Type::Int, Type::Int) => (Type::Int, None),
+            (Type::Float, Type::Int) => (Type::Float, None),
+            (Type::Int, Type::Float) => (Type::Float, None),
+            (Type::Float, Type::Float) => (Type::Float, None),
+            (Type::Number, Type::Number) => (Type::Number, None),
+            (Type::Number, Type::Int) => (Type::Number, None),
+            (Type::Int, Type::Number) => (Type::Number, None),
+            (Type::Number, Type::Float) => (Type::Number, None),
+            (Type::Float, Type::Number) => (Type::Number, None),
+            (Type::Filesize, Type::Int) => (Type::Filesize, None),
+            (Type::Int, Type::Filesize) => (Type::Filesize, None),
+            (Type::Filesize, Type::Float) => (Type::Filesize, None),
+            (Type::Float, Type::Filesize) => (Type::Filesize, None),
+            (Type::Duration, Type::Int) => (Type::Duration, None),
+            (Type::Int, Type::Duration) => (Type::Duration, None),
+            (Type::Duration, Type::Float) => (Type::Duration, None),
+            (Type::Float, Type::Duration) => (Type::Duration, None),
+            (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
+            (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
+            (Type::Any, _) => (Type::Any, None),
+            (_, Type::Any) => (Type::Any, None),
+            _ => {
+                *op = Expression::garbage(working_set, op.span);
+                type_error(operator, op.span, lhs, rhs, |ty| {
+                    matches!(
+                        ty,
+                        Type::Int | Type::Float | Type::Number | Type::Duration | Type::Filesize,
+                    )
+                })
+            }
+        },
+        Operator::Math(Math::Divide) => match (&lhs.ty, &rhs.ty) {
+            (Type::Int, Type::Int) => (Type::Float, None),
+            (Type::Float, Type::Int) => (Type::Float, None),
+            (Type::Int, Type::Float) => (Type::Float, None),
+            (Type::Float, Type::Float) => (Type::Float, None),
+            (Type::Number, Type::Number) => (Type::Float, None),
+            (Type::Number, Type::Int) => (Type::Float, None),
+            (Type::Int, Type::Number) => (Type::Float, None),
+            (Type::Number, Type::Float) => (Type::Float, None),
+            (Type::Float, Type::Number) => (Type::Float, None),
+            (Type::Filesize, Type::Filesize) => (Type::Float, None),
+            (Type::Filesize, Type::Int) => (Type::Filesize, None),
+            (Type::Filesize, Type::Float) => (Type::Filesize, None),
+            (Type::Duration, Type::Duration) => (Type::Float, None),
+            (Type::Duration, Type::Int) => (Type::Duration, None),
+            (Type::Duration, Type::Float) => (Type::Duration, None),
+            (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
+            (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
+            (Type::Any, _) => (Type::Any, None),
+            (_, Type::Any) => (Type::Any, None),
+            _ => {
+                *op = Expression::garbage(working_set, op.span);
+                type_error(operator, op.span, lhs, rhs, |ty| {
+                    matches!(
+                        ty,
+                        Type::Int | Type::Float | Type::Number | Type::Filesize | Type::Duration
+                    )
+                })
+            }
+        },
+        Operator::Math(Math::FloorDivide) => match (&lhs.ty, &rhs.ty) {
+            (Type::Int, Type::Int) => (Type::Int, None),
+            (Type::Float, Type::Int) => (Type::Float, None),
+            (Type::Int, Type::Float) => (Type::Float, None),
+            (Type::Float, Type::Float) => (Type::Float, None),
+            (Type::Number, Type::Number) => (Type::Number, None),
+            (Type::Number, Type::Int) => (Type::Number, None),
+            (Type::Int, Type::Number) => (Type::Number, None),
+            (Type::Number, Type::Float) => (Type::Number, None),
+            (Type::Float, Type::Number) => (Type::Number, None),
+            (Type::Filesize, Type::Filesize) => (Type::Int, None),
+            (Type::Filesize, Type::Int) => (Type::Filesize, None),
+            (Type::Filesize, Type::Float) => (Type::Filesize, None),
+            (Type::Duration, Type::Duration) => (Type::Int, None),
+            (Type::Duration, Type::Int) => (Type::Duration, None),
+            (Type::Duration, Type::Float) => (Type::Duration, None),
+            (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
+            (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
+            (Type::Any, _) => (Type::Any, None),
+            (_, Type::Any) => (Type::Any, None),
+            _ => {
+                *op = Expression::garbage(working_set, op.span);
+                type_error(operator, op.span, lhs, rhs, |ty| {
+                    matches!(
+                        ty,
+                        Type::Int | Type::Float | Type::Number | Type::Filesize | Type::Duration
+                    )
+                })
+            }
+        },
+        Operator::Math(Math::Modulo) => match (&lhs.ty, &rhs.ty) {
+            (Type::Int, Type::Int) => (Type::Int, None),
+            (Type::Float, Type::Int) => (Type::Float, None),
+            (Type::Int, Type::Float) => (Type::Float, None),
+            (Type::Float, Type::Float) => (Type::Float, None),
+            (Type::Number, Type::Number) => (Type::Number, None),
+            (Type::Number, Type::Int) => (Type::Number, None),
+            (Type::Int, Type::Number) => (Type::Number, None),
+            (Type::Number, Type::Float) => (Type::Number, None),
+            (Type::Float, Type::Number) => (Type::Number, None),
+            (Type::Filesize, Type::Filesize) => (Type::Filesize, None),
+            (Type::Filesize, Type::Int) => (Type::Filesize, None),
+            (Type::Filesize, Type::Float) => (Type::Filesize, None),
+            (Type::Duration, Type::Duration) => (Type::Duration, None),
+            (Type::Duration, Type::Int) => (Type::Duration, None),
+            (Type::Duration, Type::Float) => (Type::Duration, None),
+            (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
+            (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
+            (Type::Any, _) => (Type::Any, None),
+            (_, Type::Any) => (Type::Any, None),
+            _ => {
+                *op = Expression::garbage(working_set, op.span);
+                type_error(operator, op.span, lhs, rhs, |ty| {
+                    matches!(
+                        ty,
+                        Type::Int | Type::Float | Type::Number | Type::Filesize | Type::Duration
+                    )
+                })
+            }
+        },
+        Operator::Math(Math::Pow) => match (&lhs.ty, &rhs.ty) {
+            (Type::Int, Type::Int) => (Type::Int, None),
+            (Type::Float, Type::Int) => (Type::Float, None),
+            (Type::Int, Type::Float) => (Type::Float, None),
+            (Type::Float, Type::Float) => (Type::Float, None),
+            (Type::Number, Type::Number) => (Type::Number, None),
+            (Type::Number, Type::Int) => (Type::Number, None),
+            (Type::Int, Type::Number) => (Type::Number, None),
+            (Type::Number, Type::Float) => (Type::Number, None),
+            (Type::Float, Type::Number) => (Type::Number, None),
+            (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
+            (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
+            (Type::Any, _) => (Type::Any, None),
+            (_, Type::Any) => (Type::Any, None),
+            _ => {
+                *op = Expression::garbage(working_set, op.span);
+                type_error(operator, op.span, lhs, rhs, |ty| {
+                    matches!(ty, Type::Int | Type::Float | Type::Number)
+                })
+            }
+        },
+        Operator::Math(Math::Concatenate) => match (&lhs.ty, &rhs.ty) {
+            (Type::List(a), Type::List(b)) => {
+                if a == b {
+                    (Type::list(a.as_ref().clone()), None)
+                } else {
+                    (Type::list(Type::Any), None)
+                }
+            }
+            (Type::Table(a), Type::Table(_)) => (Type::Table(a.clone()), None),
+            (Type::Table(table), Type::List(list)) => {
+                if matches!(list.as_ref(), Type::Record(..)) {
+                    (Type::Table(table.clone()), None)
+                } else {
+                    (Type::list(Type::Any), None)
+                }
+            }
+            (Type::List(list), Type::Table(_)) => {
+                if matches!(list.as_ref(), Type::Record(..)) {
+                    (Type::list(list.as_ref().clone()), None)
+                } else {
+                    (Type::list(Type::Any), None)
+                }
+            }
+            (Type::String, Type::String) => (Type::String, None),
+            // TODO: should this include glob
+            (Type::Binary, Type::Binary) => (Type::Binary, None),
+            (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
+            (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
+            (Type::Any, _) | (_, Type::Any) => (Type::Any, None),
+            _ => {
+                *op = Expression::garbage(working_set, op.span);
+                let is_supported = |ty: &Type| {
+                    matches!(
+                        ty,
+                        Type::List(_)
+                            | Type::Table(_)
+                            | Type::String
+                            | Type::Binary
+                            | Type::Any
+                            | Type::Custom(_)
+                    )
+                };
+                let help = if matches!(lhs.ty, Type::List(_) | Type::Table(_))
+                    || matches!(rhs.ty, Type::List(_) | Type::Table(_))
+                {
+                    Some("if you meant to append a value to a list or a record to a table, use the `append` command or wrap the value in a list. For example: `$list ++ $value` should be `$list ++ [$value]` or `$list | append $value`.")
+                } else {
+                    None
+                };
+                let err = match (is_supported(&lhs.ty), is_supported(&rhs.ty)) {
+                    (true, true) => ParseError::OperatorIncompatibleTypes {
+                        op: operator.as_str(),
+                        lhs: lhs.ty.clone(),
+                        rhs: rhs.ty.clone(),
+                        op_span: op.span,
+                        lhs_span: lhs.span,
+                        rhs_span: rhs.span,
+                        help,
+                    },
+                    (true, false) => ParseError::OperatorUnsupportedType {
+                        op: operator.as_str(),
+                        unsupported: rhs.ty.clone(),
+                        op_span: op.span,
+                        unsupported_span: rhs.span,
+                        help,
+                    },
+                    (false, _) => ParseError::OperatorUnsupportedType {
+                        op: operator.as_str(),
+                        unsupported: lhs.ty.clone(),
+                        op_span: op.span,
+                        unsupported_span: lhs.span,
+                        help,
+                    },
+                };
+                (Type::Any, Some(err))
+            }
+        },
+        Operator::Boolean(_) => match (&lhs.ty, &rhs.ty) {
+            (Type::Bool, Type::Bool) => (Type::Bool, None),
+            (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
+            (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
+            (Type::Any, _) => (Type::Any, None),
+            (_, Type::Any) => (Type::Any, None),
+            _ => {
+                *op = Expression::garbage(working_set, op.span);
+                type_error(operator, op.span, lhs, rhs, |ty| matches!(ty, Type::Bool))
+            }
+        },
+        Operator::Comparison(Comparison::LessThan) => match (&lhs.ty, &rhs.ty) {
+            (Type::Int, Type::Int) => (Type::Bool, None),
+            (Type::Float, Type::Int) => (Type::Bool, None),
+            (Type::Int, Type::Float) => (Type::Bool, None),
+            (Type::Float, Type::Float) => (Type::Bool, None),
+            (Type::Number, Type::Number) => (Type::Bool, None),
+            (Type::Number, Type::Int) => (Type::Bool, None),
+            (Type::Int, Type::Number) => (Type::Bool, None),
+            (Type::Number, Type::Float) => (Type::Bool, None),
+            (Type::Float, Type::Number) => (Type::Bool, None),
+            (Type::String, Type::String) => (Type::Bool, None),
+            (Type::Duration, Type::Duration) => (Type::Bool, None),
+            (Type::Date, Type::Date) => (Type::Bool, None),
+            (Type::Filesize, Type::Filesize) => (Type::Bool, None),
+            (Type::Bool, Type::Bool) => (Type::Bool, None),
+            (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
+            (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
+            (Type::Nothing, _) => (Type::Nothing, None), // TODO: is this right
+            (_, Type::Nothing) => (Type::Nothing, None), // TODO: is this right
+            // TODO: should this include:
+            // - binary
+            // - glob
+            // - list
+            // - table
+            // - record
+            // - range
+            (Type::Any, _) => (Type::Bool, None),
+            (_, Type::Any) => (Type::Bool, None),
+            _ => {
+                *op = Expression::garbage(working_set, op.span);
+                type_error(operator, op.span, lhs, rhs, |ty| {
+                    matches!(
+                        ty,
+                        Type::Int
+                            | Type::Float
+                            | Type::Number
+                            | Type::String
+                            | Type::Filesize
+                            | Type::Duration
+                            | Type::Date
+                            | Type::Bool
+                            | Type::Nothing
+                    )
+                })
+            }
+        },
+        Operator::Comparison(Comparison::LessThanOrEqual) => match (&lhs.ty, &rhs.ty) {
+            (Type::Int, Type::Int) => (Type::Bool, None),
+            (Type::Float, Type::Int) => (Type::Bool, None),
+            (Type::Int, Type::Float) => (Type::Bool, None),
+            (Type::Float, Type::Float) => (Type::Bool, None),
+            (Type::Number, Type::Number) => (Type::Bool, None),
+            (Type::Number, Type::Int) => (Type::Bool, None),
+            (Type::Int, Type::Number) => (Type::Bool, None),
+            (Type::Number, Type::Float) => (Type::Bool, None),
+            (Type::Float, Type::Number) => (Type::Bool, None),
+            (Type::String, Type::String) => (Type::Bool, None),
+            (Type::Duration, Type::Duration) => (Type::Bool, None),
+            (Type::Date, Type::Date) => (Type::Bool, None),
+            (Type::Filesize, Type::Filesize) => (Type::Bool, None),
+            (Type::Bool, Type::Bool) => (Type::Bool, None),
+            (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
+            (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
+            (Type::Nothing, _) => (Type::Nothing, None), // TODO: is this right
+            (_, Type::Nothing) => (Type::Nothing, None), // TODO: is this right
+            // TODO: should this include:
+            // - binary
+            // - glob
+            // - list
+            // - table
+            // - record
+            // - range
+            (Type::Any, _) => (Type::Bool, None),
+            (_, Type::Any) => (Type::Bool, None),
+            _ => {
+                *op = Expression::garbage(working_set, op.span);
+                type_error(operator, op.span, lhs, rhs, |ty| {
+                    matches!(
+                        ty,
+                        Type::Int
+                            | Type::Float
+                            | Type::Number
+                            | Type::String
+                            | Type::Filesize
+                            | Type::Duration
+                            | Type::Date
+                            | Type::Bool
+                            | Type::Nothing
+                    )
+                })
+            }
+        },
+        Operator::Comparison(Comparison::GreaterThan) => match (&lhs.ty, &rhs.ty) {
+            (Type::Int, Type::Int) => (Type::Bool, None),
+            (Type::Float, Type::Int) => (Type::Bool, None),
+            (Type::Int, Type::Float) => (Type::Bool, None),
+            (Type::Float, Type::Float) => (Type::Bool, None),
+            (Type::Number, Type::Number) => (Type::Bool, None),
+            (Type::Number, Type::Int) => (Type::Bool, None),
+            (Type::Int, Type::Number) => (Type::Bool, None),
+            (Type::Number, Type::Float) => (Type::Bool, None),
+            (Type::Float, Type::Number) => (Type::Bool, None),
+            (Type::String, Type::String) => (Type::Bool, None),
+            (Type::Duration, Type::Duration) => (Type::Bool, None),
+            (Type::Date, Type::Date) => (Type::Bool, None),
+            (Type::Filesize, Type::Filesize) => (Type::Bool, None),
+            (Type::Bool, Type::Bool) => (Type::Bool, None),
+            (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
+            (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
+            (Type::Nothing, _) => (Type::Nothing, None), // TODO: is this right
+            (_, Type::Nothing) => (Type::Nothing, None), // TODO: is this right
+            // TODO: should this include:
+            // - binary
+            // - glob
+            // - list
+            // - table
+            // - record
+            // - range
+            (Type::Any, _) => (Type::Bool, None),
+            (_, Type::Any) => (Type::Bool, None),
+            _ => {
+                *op = Expression::garbage(working_set, op.span);
+                type_error(operator, op.span, lhs, rhs, |ty| {
+                    matches!(
+                        ty,
+                        Type::Int
+                            | Type::Float
+                            | Type::Number
+                            | Type::String
+                            | Type::Filesize
+                            | Type::Duration
+                            | Type::Date
+                            | Type::Bool
+                            | Type::Nothing
+                    )
+                })
+            }
+        },
+        Operator::Comparison(Comparison::GreaterThanOrEqual) => match (&lhs.ty, &rhs.ty) {
+            (Type::Int, Type::Int) => (Type::Bool, None),
+            (Type::Float, Type::Int) => (Type::Bool, None),
+            (Type::Int, Type::Float) => (Type::Bool, None),
+            (Type::Float, Type::Float) => (Type::Bool, None),
+            (Type::Number, Type::Number) => (Type::Bool, None),
+            (Type::Number, Type::Int) => (Type::Bool, None),
+            (Type::Int, Type::Number) => (Type::Bool, None),
+            (Type::Number, Type::Float) => (Type::Bool, None),
+            (Type::Float, Type::Number) => (Type::Bool, None),
+            (Type::String, Type::String) => (Type::Bool, None),
+            (Type::Duration, Type::Duration) => (Type::Bool, None),
+            (Type::Date, Type::Date) => (Type::Bool, None),
+            (Type::Filesize, Type::Filesize) => (Type::Bool, None),
+            (Type::Bool, Type::Bool) => (Type::Bool, None),
+            (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
+            (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
+            (Type::Nothing, _) => (Type::Nothing, None), // TODO: is this right
+            (_, Type::Nothing) => (Type::Nothing, None), // TODO: is this right
+            // TODO: should this include:
+            // - binary
+            // - glob
+            // - list
+            // - table
+            // - record
+            // - range
+            (Type::Any, _) => (Type::Bool, None),
+            (_, Type::Any) => (Type::Bool, None),
+            _ => {
+                *op = Expression::garbage(working_set, op.span);
+                type_error(operator, op.span, lhs, rhs, |ty| {
+                    matches!(
+                        ty,
+                        Type::Int
+                            | Type::Float
+                            | Type::Number
+                            | Type::String
+                            | Type::Filesize
+                            | Type::Duration
+                            | Type::Date
+                            | Type::Bool
+                            | Type::Nothing
+                    )
+                })
+            }
+        },
+        Operator::Comparison(Comparison::Equal | Comparison::NotEqual) => {
+            match (&lhs.ty, &rhs.ty) {
+                (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
+                (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
+                _ => (Type::Bool, None),
+            }
         }
+        Operator::Comparison(Comparison::RegexMatch | Comparison::NotRegexMatch) => {
+            match (&lhs.ty, &rhs.ty) {
+                (Type::String | Type::Any, Type::String | Type::Any) => (Type::Bool, None),
+                // TODO: should this include glob?
+                (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
+                (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
+                _ => {
+                    *op = Expression::garbage(working_set, op.span);
+                    type_error(operator, op.span, lhs, rhs, |ty| matches!(ty, Type::String))
+                }
+            }
+        }
+        Operator::Comparison(Comparison::StartsWith | Comparison::EndsWith) => {
+            match (&lhs.ty, &rhs.ty) {
+                (Type::String | Type::Any, Type::String | Type::Any) => (Type::Bool, None),
+                // TODO: should this include glob?
+                (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
+                (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
+                _ => {
+                    *op = Expression::garbage(working_set, op.span);
+                    type_error(operator, op.span, lhs, rhs, |ty| matches!(ty, Type::String))
+                }
+            }
+        }
+        Operator::Comparison(Comparison::In | Comparison::NotIn) => match (&lhs.ty, &rhs.ty) {
+            (t, Type::List(u)) if type_compatible(t, u) => (Type::Bool, None),
+            (Type::Int | Type::Float | Type::Number, Type::Range) => (Type::Bool, None),
+            (Type::String, Type::String) => (Type::Bool, None),
+            (Type::String, Type::Record(_)) => (Type::Bool, None),
+            (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
+            (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
+            (Type::Any, _) => (Type::Bool, None),
+            (_, Type::Any) => (Type::Bool, None),
+            _ => {
+                let err = if matches!(
+                    &rhs.ty,
+                    Type::List(_)
+                        | Type::Range
+                        | Type::String
+                        | Type::Record(_)
+                        | Type::Custom(_)
+                        | Type::Any
+                ) {
+                    ParseError::OperatorIncompatibleTypes {
+                        op: operator.as_str(),
+                        lhs: lhs.ty.clone(),
+                        rhs: rhs.ty.clone(),
+                        op_span: op.span,
+                        lhs_span: lhs.span,
+                        rhs_span: rhs.span,
+                        help: None,
+                    }
+                } else {
+                    ParseError::OperatorUnsupportedType {
+                        op: operator.as_str(),
+                        unsupported: rhs.ty.clone(),
+                        op_span: op.span,
+                        unsupported_span: rhs.span,
+                        help: None,
+                    }
+                };
+                *op = Expression::garbage(working_set, op.span);
+                (Type::Any, Some(err))
+            }
+        },
+        Operator::Comparison(Comparison::Has | Comparison::NotHas) => match (&lhs.ty, &rhs.ty) {
+            (Type::List(u), t) if type_compatible(u, t) => (Type::Bool, None),
+            (Type::Range, Type::Int | Type::Float | Type::Number) => (Type::Bool, None),
+            (Type::String, Type::String) => (Type::Bool, None),
+            (Type::Record(_), Type::String) => (Type::Bool, None),
+            (Type::Custom(a), Type::Custom(b)) if a == b => (Type::Custom(a.clone()), None),
+            (Type::Custom(a), _) => (Type::Custom(a.clone()), None),
+            (Type::Any, _) => (Type::Bool, None),
+            (_, Type::Any) => (Type::Bool, None),
+            _ => {
+                *op = Expression::garbage(working_set, op.span);
+                let err = if matches!(
+                    &lhs.ty,
+                    Type::List(_)
+                        | Type::Range
+                        | Type::String
+                        | Type::Record(_)
+                        | Type::Custom(_)
+                        | Type::Any
+                ) {
+                    ParseError::OperatorIncompatibleTypes {
+                        op: operator.as_str(),
+                        lhs: lhs.ty.clone(),
+                        rhs: rhs.ty.clone(),
+                        op_span: op.span,
+                        lhs_span: lhs.span,
+                        rhs_span: rhs.span,
+                        help: None,
+                    }
+                } else {
+                    ParseError::OperatorUnsupportedType {
+                        op: operator.as_str(),
+                        unsupported: lhs.ty.clone(),
+                        op_span: op.span,
+                        unsupported_span: lhs.span,
+                        help: None,
+                    }
+                };
+                (Type::Any, Some(err))
+            }
+        },
+        Operator::Bits(_) => match (&lhs.ty, &rhs.ty) {
+            (Type::Int, Type::Int) => (Type::Int, None),
+            (Type::Any, _) => (Type::Any, None),
+            (_, Type::Any) => (Type::Any, None),
+            _ => {
+                *op = Expression::garbage(working_set, op.span);
+                type_error(operator, op.span, lhs, rhs, |ty| matches!(ty, Type::Int))
+            }
+        },
+        // TODO: fix this
+        Operator::Assignment(_) => match (&lhs.ty, &rhs.ty) {
+            (x, y) if x == y => (Type::Nothing, None),
+            (Type::Any, _) => (Type::Nothing, None),
+            (_, Type::Any) => (Type::Nothing, None),
+            (Type::List(_) | Type::Table(_), Type::List(_) | Type::Table(_)) => {
+                (Type::Nothing, None)
+            }
+            _ => {
+                let err = ParseError::OperatorIncompatibleTypes {
+                    op: operator.as_str(),
+                    lhs: lhs.ty.clone(),
+                    rhs: rhs.ty.clone(),
+                    op_span: op.span,
+                    lhs_span: lhs.span,
+                    rhs_span: rhs.span,
+                    help: None,
+                };
+                (Type::Nothing, Some(err))
+            }
+        },
     }
 }
 
@@ -1086,54 +868,6 @@ pub fn check_block_input_output(working_set: &StateWorkingSet, block: &Block) ->
     output_errors
 }
 
-fn check_concat(
-    working_set: &mut StateWorkingSet,
-    lhs: &Expression,
-    rhs: &Expression,
-    op: &mut Expression,
-) -> (Type, Option<ParseError>) {
-    match (&lhs.ty, &rhs.ty) {
-        (Type::List(a), Type::List(b)) => {
-            if a == b {
-                (Type::List(a.clone()), None)
-            } else {
-                (Type::List(Box::new(Type::Any)), None)
-            }
-        }
-        (Type::Table(a), Type::Table(_)) => (Type::Table(a.clone()), None),
-        (Type::String, Type::String) => (Type::String, None),
-        (Type::Binary, Type::Binary) => (Type::Binary, None),
-        (Type::Any, _) | (_, Type::Any) => (Type::Any, None),
-        (Type::Table(_) | Type::List(_) | Type::String | Type::Binary, _)
-        | (_, Type::Table(_) | Type::List(_) | Type::String | Type::Binary) => {
-            *op = Expression::garbage(working_set, op.span);
-            (
-                Type::Any,
-                Some(ParseError::UnsupportedOperationRHS(
-                    "concatenation".into(),
-                    op.span,
-                    lhs.span,
-                    lhs.ty.clone(),
-                    rhs.span,
-                    rhs.ty.clone(),
-                )),
-            )
-        }
-        _ => {
-            *op = Expression::garbage(working_set, op.span);
-            (
-                Type::Any,
-                Some(ParseError::UnsupportedOperationLHS(
-                    "concatenation".into(),
-                    op.span,
-                    lhs.span,
-                    lhs.ty.clone(),
-                )),
-            )
-        }
-    }
-}
-
 /// If one of the parts of the range isn't a number, a parse error is added to the working set
 pub fn check_range_types(working_set: &mut StateWorkingSet, range: &mut Range) {
     let next_op_span = if range.next.is_some() {
@@ -1145,49 +879,35 @@ pub fn check_range_types(working_set: &mut StateWorkingSet, range: &mut Range) {
         (Some(expr), _, _) | (None, Some(expr), Some(_)) | (None, None, Some(expr))
             if !type_compatible(&Type::Number, &expr.ty) =>
         {
-            working_set.error(ParseError::UnsupportedOperationLHS(
-                String::from("range"),
-                next_op_span,
-                expr.span,
-                expr.ty.clone(),
-            ));
+            working_set.error(ParseError::OperatorUnsupportedType {
+                op: "..",
+                unsupported: expr.ty.clone(),
+                op_span: next_op_span,
+                unsupported_span: expr.span,
+                help: None,
+            });
             *expr = Expression::garbage(working_set, expr.span);
         }
-        (Some(lhs), Some(rhs), _) if !type_compatible(&Type::Number, &rhs.ty) => {
-            working_set.error(ParseError::UnsupportedOperationRHS(
-                String::from("range"),
-                next_op_span,
-                lhs.span,
-                lhs.ty.clone(),
-                rhs.span,
-                rhs.ty.clone(),
-            ));
-            *rhs = Expression::garbage(working_set, rhs.span);
-        }
-        (Some(lhs), Some(rhs), _) | (Some(lhs), None, Some(rhs)) | (None, Some(lhs), Some(rhs))
+        (Some(_), Some(rhs), _) | (Some(_), None, Some(rhs)) | (None, Some(_), Some(rhs))
             if !type_compatible(&Type::Number, &rhs.ty) =>
         {
-            working_set.error(ParseError::UnsupportedOperationRHS(
-                String::from("range"),
-                range.operator.span,
-                lhs.span,
-                lhs.ty.clone(),
-                rhs.span,
-                rhs.ty.clone(),
-            ));
+            working_set.error(ParseError::OperatorUnsupportedType {
+                op: "..",
+                unsupported: rhs.ty.clone(),
+                op_span: next_op_span,
+                unsupported_span: rhs.span,
+                help: None,
+            });
             *rhs = Expression::garbage(working_set, rhs.span);
         }
-        (Some(from), Some(next), Some(to)) if !type_compatible(&Type::Number, &to.ty) => {
-            working_set.error(ParseError::UnsupportedOperationTernary(
-                String::from("range"),
-                range.operator.span,
-                from.span,
-                from.ty.clone(),
-                next.span,
-                next.ty.clone(),
-                to.span,
-                to.ty.clone(),
-            ));
+        (Some(_), Some(_), Some(to)) if !type_compatible(&Type::Number, &to.ty) => {
+            working_set.error(ParseError::OperatorUnsupportedType {
+                op: "..",
+                unsupported: to.ty.clone(),
+                op_span: next_op_span,
+                unsupported_span: to.span,
+                help: None,
+            });
             *to = Expression::garbage(working_set, to.span);
         }
         _ => (),
diff --git a/crates/nu-parser/tests/test_parser.rs b/crates/nu-parser/tests/test_parser.rs
index 8d3249ade2..ac9bb512ba 100644
--- a/crates/nu-parser/tests/test_parser.rs
+++ b/crates/nu-parser/tests/test_parser.rs
@@ -1934,17 +1934,10 @@ mod range {
 
         let _ = parse(&mut working_set, None, code.as_bytes(), true);
 
-        assert!(
-            working_set.parse_errors.len() == 1,
-            "Errors: {:?}",
-            working_set.parse_errors
-        );
-        let err = &working_set.parse_errors[0].to_string();
-        assert!(
-            err.contains("range is not supported"),
-            "Expected unsupported operation error, got {}",
-            err
-        );
+        assert!(matches!(
+            &working_set.parse_errors[..],
+            [ParseError::OperatorUnsupportedType { .. }]
+        ),);
     }
 
     #[test]
diff --git a/crates/nu-plugin-engine/src/interface/tests.rs b/crates/nu-plugin-engine/src/interface/tests.rs
index de9f379305..f3b0e5a2b6 100644
--- a/crates/nu-plugin-engine/src/interface/tests.rs
+++ b/crates/nu-plugin-engine/src/interface/tests.rs
@@ -1489,7 +1489,7 @@ fn prepare_plugin_call_custom_value_op() {
                     span,
                 },
                 CustomValueOp::Operation(
-                    Operator::Math(Math::Concat).into_spanned(span),
+                    Operator::Math(Math::Concatenate).into_spanned(span),
                     cv_ok_val.clone(),
                 ),
             ),
@@ -1502,7 +1502,7 @@ fn prepare_plugin_call_custom_value_op() {
                     span,
                 },
                 CustomValueOp::Operation(
-                    Operator::Math(Math::Concat).into_spanned(span),
+                    Operator::Math(Math::Concatenate).into_spanned(span),
                     cv_bad_val.clone(),
                 ),
             ),
diff --git a/crates/nu-protocol/src/ast/operator.rs b/crates/nu-protocol/src/ast/operator.rs
index 0f6fd0b556..e68ece0de1 100644
--- a/crates/nu-protocol/src/ast/operator.rs
+++ b/crates/nu-protocol/src/ast/operator.rs
@@ -1,11 +1,9 @@
-use crate::{ShellError, Span};
-
-use serde::{Deserialize, Serialize};
-use std::fmt::Display;
-
 use super::{Expr, Expression};
+use crate::{ShellError, Span};
+use serde::{Deserialize, Serialize};
+use std::fmt;
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Comparison {
     Equal,
     NotEqual,
@@ -23,26 +21,90 @@ pub enum Comparison {
     EndsWith,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+impl Comparison {
+    pub const fn as_str(&self) -> &'static str {
+        match self {
+            Self::Equal => "==",
+            Self::NotEqual => "!=",
+            Self::LessThan => "<",
+            Self::GreaterThan => ">",
+            Self::LessThanOrEqual => "<=",
+            Self::GreaterThanOrEqual => ">=",
+            Self::RegexMatch => "=~",
+            Self::NotRegexMatch => "!~",
+            Self::In => "in",
+            Self::NotIn => "not-in",
+            Self::Has => "has",
+            Self::NotHas => "not-has",
+            Self::StartsWith => "starts-with",
+            Self::EndsWith => "ends-with",
+        }
+    }
+}
+
+impl fmt::Display for Comparison {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.write_str(self.as_str())
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Math {
-    Plus,
-    Concat,
-    Minus,
+    Add,
+    Subtract,
     Multiply,
     Divide,
+    FloorDivide,
     Modulo,
-    FloorDivision,
     Pow,
+    Concatenate,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+impl Math {
+    pub const fn as_str(&self) -> &'static str {
+        match self {
+            Self::Add => "+",
+            Self::Subtract => "-",
+            Self::Multiply => "*",
+            Self::Divide => "/",
+            Self::FloorDivide => "//",
+            Self::Modulo => "mod",
+            Self::Pow => "**",
+            Self::Concatenate => "++",
+        }
+    }
+}
+
+impl fmt::Display for Math {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.write_str(self.as_str())
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Boolean {
-    And,
     Or,
     Xor,
+    And,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+impl Boolean {
+    pub const fn as_str(&self) -> &'static str {
+        match self {
+            Self::Or => "or",
+            Self::Xor => "xor",
+            Self::And => "and",
+        }
+    }
+}
+
+impl fmt::Display for Boolean {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.write_str(self.as_str())
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Bits {
     BitOr,
     BitXor,
@@ -51,17 +113,54 @@ pub enum Bits {
     ShiftRight,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub enum Assignment {
-    Assign,
-    PlusAssign,
-    ConcatAssign,
-    MinusAssign,
-    MultiplyAssign,
-    DivideAssign,
+impl Bits {
+    pub const fn as_str(&self) -> &'static str {
+        match self {
+            Self::BitOr => "bit-or",
+            Self::BitXor => "bit-xor",
+            Self::BitAnd => "bit-and",
+            Self::ShiftLeft => "bit-shl",
+            Self::ShiftRight => "bit-shr",
+        }
+    }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+impl fmt::Display for Bits {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.write_str(self.as_str())
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+pub enum Assignment {
+    Assign,
+    AddAssign,
+    SubtractAssign,
+    MultiplyAssign,
+    DivideAssign,
+    ConcatenateAssign,
+}
+
+impl Assignment {
+    pub const fn as_str(&self) -> &'static str {
+        match self {
+            Self::Assign => "=",
+            Self::AddAssign => "+=",
+            Self::SubtractAssign => "-=",
+            Self::MultiplyAssign => "*=",
+            Self::DivideAssign => "/=",
+            Self::ConcatenateAssign => "++=",
+        }
+    }
+}
+
+impl fmt::Display for Assignment {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.write_str(self.as_str())
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Operator {
     Comparison(Comparison),
     Math(Math),
@@ -71,14 +170,24 @@ pub enum Operator {
 }
 
 impl Operator {
-    pub fn precedence(&self) -> u8 {
+    pub const fn as_str(&self) -> &'static str {
+        match self {
+            Self::Comparison(comparison) => comparison.as_str(),
+            Self::Math(math) => math.as_str(),
+            Self::Boolean(boolean) => boolean.as_str(),
+            Self::Bits(bits) => bits.as_str(),
+            Self::Assignment(assignment) => assignment.as_str(),
+        }
+    }
+
+    pub const fn precedence(&self) -> u8 {
         match self {
             Self::Math(Math::Pow) => 100,
             Self::Math(Math::Multiply)
             | Self::Math(Math::Divide)
             | Self::Math(Math::Modulo)
-            | Self::Math(Math::FloorDivision) => 95,
-            Self::Math(Math::Plus) | Self::Math(Math::Minus) => 90,
+            | Self::Math(Math::FloorDivide) => 95,
+            Self::Math(Math::Add) | Self::Math(Math::Subtract) => 90,
             Self::Bits(Bits::ShiftLeft) | Self::Bits(Bits::ShiftRight) => 85,
             Self::Comparison(Comparison::NotRegexMatch)
             | Self::Comparison(Comparison::RegexMatch)
@@ -94,7 +203,7 @@ impl Operator {
             | Self::Comparison(Comparison::NotIn)
             | Self::Comparison(Comparison::Has)
             | Self::Comparison(Comparison::NotHas)
-            | Self::Math(Math::Concat) => 80,
+            | Self::Math(Math::Concatenate) => 80,
             Self::Bits(Bits::BitAnd) => 75,
             Self::Bits(Bits::BitXor) => 70,
             Self::Bits(Bits::BitOr) => 60,
@@ -106,46 +215,9 @@ impl Operator {
     }
 }
 
-impl Display for Operator {
+impl fmt::Display for Operator {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Operator::Assignment(Assignment::Assign) => write!(f, "="),
-            Operator::Assignment(Assignment::PlusAssign) => write!(f, "+="),
-            Operator::Assignment(Assignment::ConcatAssign) => write!(f, "++="),
-            Operator::Assignment(Assignment::MinusAssign) => write!(f, "-="),
-            Operator::Assignment(Assignment::MultiplyAssign) => write!(f, "*="),
-            Operator::Assignment(Assignment::DivideAssign) => write!(f, "/="),
-            Operator::Comparison(Comparison::Equal) => write!(f, "=="),
-            Operator::Comparison(Comparison::NotEqual) => write!(f, "!="),
-            Operator::Comparison(Comparison::LessThan) => write!(f, "<"),
-            Operator::Comparison(Comparison::GreaterThan) => write!(f, ">"),
-            Operator::Comparison(Comparison::RegexMatch) => write!(f, "=~ or like"),
-            Operator::Comparison(Comparison::NotRegexMatch) => write!(f, "!~ or not-like"),
-            Operator::Comparison(Comparison::LessThanOrEqual) => write!(f, "<="),
-            Operator::Comparison(Comparison::GreaterThanOrEqual) => write!(f, ">="),
-            Operator::Comparison(Comparison::StartsWith) => write!(f, "starts-with"),
-            Operator::Comparison(Comparison::EndsWith) => write!(f, "ends-with"),
-            Operator::Comparison(Comparison::In) => write!(f, "in"),
-            Operator::Comparison(Comparison::NotIn) => write!(f, "not-in"),
-            Operator::Comparison(Comparison::Has) => write!(f, "has"),
-            Operator::Comparison(Comparison::NotHas) => write!(f, "not-has"),
-            Operator::Math(Math::Plus) => write!(f, "+"),
-            Operator::Math(Math::Concat) => write!(f, "++"),
-            Operator::Math(Math::Minus) => write!(f, "-"),
-            Operator::Math(Math::Multiply) => write!(f, "*"),
-            Operator::Math(Math::Divide) => write!(f, "/"),
-            Operator::Math(Math::Modulo) => write!(f, "mod"),
-            Operator::Math(Math::FloorDivision) => write!(f, "//"),
-            Operator::Math(Math::Pow) => write!(f, "**"),
-            Operator::Boolean(Boolean::And) => write!(f, "and"),
-            Operator::Boolean(Boolean::Or) => write!(f, "or"),
-            Operator::Boolean(Boolean::Xor) => write!(f, "xor"),
-            Operator::Bits(Bits::BitOr) => write!(f, "bit-or"),
-            Operator::Bits(Bits::BitXor) => write!(f, "bit-xor"),
-            Operator::Bits(Bits::BitAnd) => write!(f, "bit-and"),
-            Operator::Bits(Bits::ShiftLeft) => write!(f, "bit-shl"),
-            Operator::Bits(Bits::ShiftRight) => write!(f, "bit-shr"),
-        }
+        f.write_str(self.as_str())
     }
 }
 
@@ -162,7 +234,7 @@ pub struct RangeOperator {
     pub next_op_span: Span,
 }
 
-impl Display for RangeOperator {
+impl fmt::Display for RangeOperator {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self.inclusion {
             RangeInclusion::Inclusive => write!(f, ".."),
@@ -176,7 +248,7 @@ pub fn eval_operator(op: &Expression) -> Result<Operator, ShellError> {
         Expression {
             expr: Expr::Operator(operator),
             ..
-        } => Ok(operator.clone()),
+        } => Ok(*operator),
         Expression { span, expr, .. } => Err(ShellError::UnknownOperator {
             op_token: format!("{expr:?}"),
             span: *span,
diff --git a/crates/nu-protocol/src/errors/parse_error.rs b/crates/nu-protocol/src/errors/parse_error.rs
index 2f9b7b3ed4..34a481a113 100644
--- a/crates/nu-protocol/src/errors/parse_error.rs
+++ b/crates/nu-protocol/src/errors/parse_error.rs
@@ -1,11 +1,10 @@
+use crate::{ast::RedirectionSource, did_you_mean, Span, Type};
+use miette::Diagnostic;
+use serde::{Deserialize, Serialize};
 use std::{
     fmt::Display,
     str::{from_utf8, Utf8Error},
 };
-
-use crate::{ast::RedirectionSource, did_you_mean, Span, Type};
-use miette::Diagnostic;
-use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
 #[derive(Clone, Debug, Error, Diagnostic, Serialize, Deserialize)]
@@ -115,38 +114,36 @@ pub enum ParseError {
         span: Span,
     },
 
-    #[error("{0} is not supported on values of type {3}")]
-    #[diagnostic(code(nu::parser::unsupported_operation))]
-    UnsupportedOperationLHS(
-        String,
-        #[label = "doesn't support this value"] Span,
-        #[label("{3}")] Span,
-        Type,
-    ),
+    /// One or more of the values have types not supported by the operator.
+    #[error("The '{op}' operator does not work on values of type '{unsupported}'.")]
+    #[diagnostic(code(nu::parser::operator_unsupported_type))]
+    OperatorUnsupportedType {
+        op: &'static str,
+        unsupported: Type,
+        #[label = "does not support '{unsupported}'"]
+        op_span: Span,
+        #[label("{unsupported}")]
+        unsupported_span: Span,
+        #[help]
+        help: Option<&'static str>,
+    },
 
-    #[error("{0} is not supported between {3} and {5}.")]
-    #[diagnostic(code(nu::parser::unsupported_operation))]
-    UnsupportedOperationRHS(
-        String,
-        #[label = "doesn't support these values"] Span,
-        #[label("{3}")] Span,
-        Type,
-        #[label("{5}")] Span,
-        Type,
-    ),
-
-    #[error("{0} is not supported between {3}, {5}, and {7}.")]
-    #[diagnostic(code(nu::parser::unsupported_operation))]
-    UnsupportedOperationTernary(
-        String,
-        #[label = "doesn't support these values"] Span,
-        #[label("{3}")] Span,
-        Type,
-        #[label("{5}")] Span,
-        Type,
-        #[label("{7}")] Span,
-        Type,
-    ),
+    /// The operator supports the types of both values, but not the specific combination of their types.
+    #[error("Types '{lhs}' and '{rhs}' are not compatible for the '{op}' operator.")]
+    #[diagnostic(code(nu::parser::operator_incompatible_types))]
+    OperatorIncompatibleTypes {
+        op: &'static str,
+        lhs: Type,
+        rhs: Type,
+        #[label = "does not operate between '{lhs}' and '{rhs}'"]
+        op_span: Span,
+        #[label("{lhs}")]
+        lhs_span: Span,
+        #[label("{rhs}")]
+        rhs_span: Span,
+        #[help]
+        help: Option<&'static str>,
+    },
 
     #[error("Capture of mutable variable.")]
     #[diagnostic(code(nu::parser::expected_keyword))]
@@ -564,9 +561,8 @@ impl ParseError {
             ParseError::ExpectedWithStringMsg(_, s) => *s,
             ParseError::ExpectedWithDidYouMean(_, _, s) => *s,
             ParseError::Mismatch(_, _, s) => *s,
-            ParseError::UnsupportedOperationLHS(_, _, s, _) => *s,
-            ParseError::UnsupportedOperationRHS(_, _, _, _, s, _) => *s,
-            ParseError::UnsupportedOperationTernary(_, _, _, _, _, _, s, _) => *s,
+            ParseError::OperatorUnsupportedType { op_span, .. } => *op_span,
+            ParseError::OperatorIncompatibleTypes { op_span, .. } => *op_span,
             ParseError::ExpectedKeyword(_, s) => *s,
             ParseError::UnexpectedKeyword(_, s) => *s,
             ParseError::CantAliasKeyword(_, s) => *s,
diff --git a/crates/nu-protocol/src/errors/shell_error/mod.rs b/crates/nu-protocol/src/errors/shell_error/mod.rs
index c7be1dfec5..cd0afba474 100644
--- a/crates/nu-protocol/src/errors/shell_error/mod.rs
+++ b/crates/nu-protocol/src/errors/shell_error/mod.rs
@@ -17,22 +17,35 @@ pub mod location;
 /// and pass it into an error viewer to display to the user.
 #[derive(Debug, Clone, Error, Diagnostic, PartialEq)]
 pub enum ShellError {
-    /// An operator received two arguments of incompatible types.
-    ///
-    /// ## Resolution
-    ///
-    /// Check each argument's type and convert one or both as needed.
-    #[error("Type mismatch during operation.")]
-    #[diagnostic(code(nu::shell::type_mismatch))]
-    OperatorMismatch {
-        #[label = "type mismatch for operator"]
+    /// One or more of the values have types not supported by the operator.
+    #[error("The '{op}' operator does not work on values of type '{unsupported}'.")]
+    #[diagnostic(code(nu::shell::operator_unsupported_type))]
+    OperatorUnsupportedType {
+        op: Operator,
+        unsupported: Type,
+        #[label = "does not support '{unsupported}'"]
         op_span: Span,
-        lhs_ty: String,
-        #[label("{lhs_ty}")]
+        #[label("{unsupported}")]
+        unsupported_span: Span,
+        #[help]
+        help: Option<&'static str>,
+    },
+
+    /// The operator supports the types of both values, but not the specific combination of their types.
+    #[error("Types '{lhs}' and '{rhs}' are not compatible for the '{op}' operator.")]
+    #[diagnostic(code(nu::shell::operator_incompatible_types))]
+    OperatorIncompatibleTypes {
+        op: Operator,
+        lhs: Type,
+        rhs: Type,
+        #[label = "does not operate between '{lhs}' and '{rhs}'"]
+        op_span: Span,
+        #[label("{lhs}")]
         lhs_span: Span,
-        rhs_ty: String,
-        #[label("{rhs_ty}")]
+        #[label("{rhs}")]
         rhs_span: Span,
+        #[help]
+        help: Option<&'static str>,
     },
 
     /// An arithmetic operation's resulting value overflowed its possible size.
@@ -156,20 +169,6 @@ pub enum ShellError {
         call_span: Span,
     },
 
-    /// This value cannot be used with this operator.
-    ///
-    /// ## Resolution
-    ///
-    /// Not all values, for example custom values, can be used with all operators. Either
-    /// implement support for the operator on this type, or convert the type to a supported one.
-    #[error("Unsupported operator: {operator}.")]
-    #[diagnostic(code(nu::shell::unsupported_operator))]
-    UnsupportedOperator {
-        operator: Operator,
-        #[label = "unsupported operator"]
-        span: Span,
-    },
-
     /// Invalid assignment left-hand side
     ///
     /// ## Resolution
diff --git a/crates/nu-protocol/src/eval_base.rs b/crates/nu-protocol/src/eval_base.rs
index 0e7916bd3c..15fc5105d3 100644
--- a/crates/nu-protocol/src/eval_base.rs
+++ b/crates/nu-protocol/src/eval_base.rs
@@ -235,14 +235,14 @@ pub trait Eval {
                         let rhs = Self::eval::<D>(state, mut_state, rhs)?;
 
                         match math {
-                            Math::Plus => lhs.add(op_span, &rhs, expr_span),
-                            Math::Minus => lhs.sub(op_span, &rhs, expr_span),
+                            Math::Add => lhs.add(op_span, &rhs, expr_span),
+                            Math::Subtract => lhs.sub(op_span, &rhs, expr_span),
                             Math::Multiply => lhs.mul(op_span, &rhs, expr_span),
                             Math::Divide => lhs.div(op_span, &rhs, expr_span),
-                            Math::Concat => lhs.concat(op_span, &rhs, expr_span),
+                            Math::FloorDivide => lhs.floor_div(op_span, &rhs, expr_span),
                             Math::Modulo => lhs.modulo(op_span, &rhs, expr_span),
-                            Math::FloorDivision => lhs.floor_div(op_span, &rhs, expr_span),
                             Math::Pow => lhs.pow(op_span, &rhs, expr_span),
+                            Math::Concatenate => lhs.concat(op_span, &rhs, expr_span),
                         }
                     }
                     Operator::Comparison(comparison) => {
diff --git a/crates/nu-protocol/src/value/custom_value.rs b/crates/nu-protocol/src/value/custom_value.rs
index 480ca0018e..fbfc4ee911 100644
--- a/crates/nu-protocol/src/value/custom_value.rs
+++ b/crates/nu-protocol/src/value/custom_value.rs
@@ -1,6 +1,6 @@
 use std::{cmp::Ordering, fmt};
 
-use crate::{ast::Operator, ShellError, Span, Value};
+use crate::{ast::Operator, ShellError, Span, Type, Value};
 
 /// Trait definition for a custom [`Value`](crate::Value) type
 #[typetag::serde(tag = "type")]
@@ -68,7 +68,7 @@ pub trait CustomValue: fmt::Debug + Send + Sync {
     ///
     /// The Operator enum is used to indicate the expected operation.
     ///
-    /// Default impl raises [`ShellError::UnsupportedOperator`].
+    /// Default impl raises [`ShellError::OperatorUnsupportedType`].
     fn operation(
         &self,
         lhs_span: Span,
@@ -77,7 +77,13 @@ pub trait CustomValue: fmt::Debug + Send + Sync {
         right: &Value,
     ) -> Result<Value, ShellError> {
         let _ = (lhs_span, right);
-        Err(ShellError::UnsupportedOperator { operator, span: op })
+        Err(ShellError::OperatorUnsupportedType {
+            op: operator,
+            unsupported: Type::Custom(self.type_name().into()),
+            op_span: op,
+            unsupported_span: lhs_span,
+            help: None,
+        })
     }
 
     /// For custom values in plugins: return `true` here if you would like to be notified when all
diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs
index 6b9e90d97e..a03b1ddb4e 100644
--- a/crates/nu-protocol/src/value/mod.rs
+++ b/crates/nu-protocol/src/value/mod.rs
@@ -2542,7 +2542,6 @@ impl Value {
             (Value::String { val: lhs, .. }, Value::String { val: rhs, .. }) => {
                 Ok(Value::string(lhs.to_string() + rhs, span))
             }
-
             (Value::Duration { val: lhs, .. }, Value::Date { val: rhs, .. }) => {
                 if let Some(val) = rhs.checked_add_signed(chrono::Duration::nanoseconds(*lhs)) {
                     Ok(Value::date(val, span))
@@ -2587,43 +2586,26 @@ impl Value {
                     })
                 }
             }
-
             (Value::Custom { val: lhs, .. }, rhs) => {
-                lhs.operation(self.span(), Operator::Math(Math::Plus), op, rhs)
+                lhs.operation(self.span(), Operator::Math(Math::Add), op, rhs)
             }
-
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            }),
-        }
-    }
-
-    pub fn concat(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
-        match (self, rhs) {
-            (Value::List { vals: lhs, .. }, Value::List { vals: rhs, .. }) => {
-                Ok(Value::list([lhs.as_slice(), rhs.as_slice()].concat(), span))
-            }
-            (Value::String { val: lhs, .. }, Value::String { val: rhs, .. }) => {
-                Ok(Value::string([lhs.as_str(), rhs.as_str()].join(""), span))
-            }
-            (Value::Binary { val: lhs, .. }, Value::Binary { val: rhs, .. }) => Ok(Value::binary(
-                [lhs.as_slice(), rhs.as_slice()].concat(),
-                span,
+            _ => Err(operator_type_error(
+                Operator::Math(Math::Add),
+                op,
+                self,
+                rhs,
+                |val| {
+                    matches!(
+                        val,
+                        Value::Int { .. }
+                            | Value::Float { .. }
+                            | Value::String { .. }
+                            | Value::Date { .. }
+                            | Value::Duration { .. }
+                            | Value::Filesize { .. },
+                    )
+                },
             )),
-            (Value::Custom { val: lhs, .. }, rhs) => {
-                lhs.operation(self.span(), Operator::Math(Math::Concat), op, rhs)
-            }
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            }),
         }
     }
 
@@ -2651,7 +2633,6 @@ impl Value {
             }
             (Value::Date { val: lhs, .. }, Value::Date { val: rhs, .. }) => {
                 let result = lhs.signed_duration_since(*rhs);
-
                 if let Some(v) = result.num_nanoseconds() {
                     Ok(Value::duration(v, span))
                 } else {
@@ -2694,18 +2675,25 @@ impl Value {
                     })
                 }
             }
-
             (Value::Custom { val: lhs, .. }, rhs) => {
-                lhs.operation(self.span(), Operator::Math(Math::Minus), op, rhs)
+                lhs.operation(self.span(), Operator::Math(Math::Subtract), op, rhs)
             }
-
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            }),
+            _ => Err(operator_type_error(
+                Operator::Math(Math::Subtract),
+                op,
+                self,
+                rhs,
+                |val| {
+                    matches!(
+                        val,
+                        Value::Int { .. }
+                            | Value::Float { .. }
+                            | Value::Date { .. }
+                            | Value::Duration { .. }
+                            | Value::Filesize { .. },
+                    )
+                },
+            )),
         }
     }
 
@@ -2790,13 +2778,21 @@ impl Value {
             (Value::Custom { val: lhs, .. }, rhs) => {
                 lhs.operation(self.span(), Operator::Math(Math::Multiply), op, rhs)
             }
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            }),
+            _ => Err(operator_type_error(
+                Operator::Math(Math::Multiply),
+                op,
+                self,
+                rhs,
+                |val| {
+                    matches!(
+                        val,
+                        Value::Int { .. }
+                            | Value::Float { .. }
+                            | Value::Duration { .. }
+                            | Value::Filesize { .. },
+                    )
+                },
+            )),
         }
     }
 
@@ -2904,14 +2900,21 @@ impl Value {
             (Value::Custom { val: lhs, .. }, rhs) => {
                 lhs.operation(self.span(), Operator::Math(Math::Divide), op, rhs)
             }
-
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            }),
+            _ => Err(operator_type_error(
+                Operator::Math(Math::Divide),
+                op,
+                self,
+                rhs,
+                |val| {
+                    matches!(
+                        val,
+                        Value::Int { .. }
+                            | Value::Float { .. }
+                            | Value::Duration { .. }
+                            | Value::Filesize { .. },
+                    )
+                },
+            )),
         }
     }
 
@@ -3060,13 +3063,21 @@ impl Value {
             (Value::Custom { val: lhs, .. }, rhs) => {
                 lhs.operation(self.span(), Operator::Math(Math::Divide), op, rhs)
             }
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            }),
+            _ => Err(operator_type_error(
+                Operator::Math(Math::FloorDivide),
+                op,
+                self,
+                rhs,
+                |val| {
+                    matches!(
+                        val,
+                        Value::Int { .. }
+                            | Value::Float { .. }
+                            | Value::Duration { .. }
+                            | Value::Filesize { .. },
+                    )
+                },
+            )),
         }
     }
 
@@ -3216,14 +3227,117 @@ impl Value {
             (Value::Custom { val: lhs, .. }, rhs) => {
                 lhs.operation(span, Operator::Math(Math::Modulo), op, rhs)
             }
+            _ => Err(operator_type_error(
+                Operator::Math(Math::Modulo),
+                op,
+                self,
+                rhs,
+                |val| {
+                    matches!(
+                        val,
+                        Value::Int { .. }
+                            | Value::Float { .. }
+                            | Value::Duration { .. }
+                            | Value::Filesize { .. },
+                    )
+                },
+            )),
+        }
+    }
 
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            }),
+    pub fn pow(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
+        match (self, rhs) {
+            (Value::Int { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
+                if let Some(val) = lhs.checked_pow(*rhs as u32) {
+                    Ok(Value::int(val, span))
+                } else {
+                    Err(ShellError::OperatorOverflow {
+                        msg: "pow operation overflowed".into(),
+                        span,
+                        help: Some("Consider using floating point values for increased range by promoting operand with 'into float'. Note: float has reduced precision!".into()),
+                    })
+                }
+            }
+            (Value::Int { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
+                Ok(Value::float((*lhs as f64).powf(*rhs), span))
+            }
+            (Value::Float { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
+                Ok(Value::float(lhs.powf(*rhs as f64), span))
+            }
+            (Value::Float { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
+                Ok(Value::float(lhs.powf(*rhs), span))
+            }
+            (Value::Custom { val: lhs, .. }, rhs) => {
+                lhs.operation(span, Operator::Math(Math::Pow), op, rhs)
+            }
+            _ => Err(operator_type_error(
+                Operator::Math(Math::Pow),
+                op,
+                self,
+                rhs,
+                |val| matches!(val, Value::Int { .. } | Value::Float { .. }),
+            )),
+        }
+    }
+
+    pub fn concat(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
+        match (self, rhs) {
+            (Value::List { vals: lhs, .. }, Value::List { vals: rhs, .. }) => {
+                Ok(Value::list([lhs.as_slice(), rhs.as_slice()].concat(), span))
+            }
+            (Value::String { val: lhs, .. }, Value::String { val: rhs, .. }) => {
+                Ok(Value::string([lhs.as_str(), rhs.as_str()].join(""), span))
+            }
+            (Value::Binary { val: lhs, .. }, Value::Binary { val: rhs, .. }) => Ok(Value::binary(
+                [lhs.as_slice(), rhs.as_slice()].concat(),
+                span,
+            )),
+            (Value::Custom { val: lhs, .. }, rhs) => {
+                lhs.operation(self.span(), Operator::Math(Math::Concatenate), op, rhs)
+            }
+            _ => {
+                let help = if matches!(self, Value::List { .. })
+                    || matches!(rhs, Value::List { .. })
+                {
+                    Some("if you meant to append a value to a list or a record to a table, use the `append` command or wrap the value in a list. For example: `$list ++ $value` should be `$list ++ [$value]` or `$list | append $value`.")
+                } else {
+                    None
+                };
+                let is_supported = |val: &Value| {
+                    matches!(
+                        val,
+                        Value::List { .. }
+                            | Value::String { .. }
+                            | Value::Binary { .. }
+                            | Value::Custom { .. }
+                    )
+                };
+                Err(match (is_supported(self), is_supported(rhs)) {
+                    (true, true) => ShellError::OperatorIncompatibleTypes {
+                        op: Operator::Math(Math::Concatenate),
+                        lhs: self.get_type(),
+                        rhs: rhs.get_type(),
+                        op_span: op,
+                        lhs_span: self.span(),
+                        rhs_span: rhs.span(),
+                        help,
+                    },
+                    (true, false) => ShellError::OperatorUnsupportedType {
+                        op: Operator::Math(Math::Concatenate),
+                        unsupported: rhs.get_type(),
+                        op_span: op,
+                        unsupported_span: rhs.span(),
+                        help,
+                    },
+                    (false, _) => ShellError::OperatorUnsupportedType {
+                        op: Operator::Math(Math::Concatenate),
+                        unsupported: self.get_type(),
+                        op_span: op,
+                        unsupported_span: self.span(),
+                        help,
+                    },
+                })
+            }
         }
     }
 
@@ -3241,30 +3355,32 @@ impl Value {
             return Ok(Value::nothing(span));
         }
 
-        if !type_compatible(self.get_type(), rhs.get_type())
-            && (self.get_type() != Type::Any)
-            && (rhs.get_type() != Type::Any)
-        {
-            return Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            });
+        if !type_compatible(self.get_type(), rhs.get_type()) {
+            return Err(operator_type_error(
+                Operator::Comparison(Comparison::LessThan),
+                op,
+                self,
+                rhs,
+                |val| {
+                    matches!(
+                        val,
+                        Value::Int { .. }
+                            | Value::Float { .. }
+                            | Value::String { .. }
+                            | Value::Filesize { .. }
+                            | Value::Duration { .. }
+                            | Value::Date { .. }
+                            | Value::Bool { .. }
+                            | Value::Nothing { .. }
+                    )
+                },
+            ));
         }
 
-        if let Some(ordering) = self.partial_cmp(rhs) {
-            Ok(Value::bool(matches!(ordering, Ordering::Less), span))
-        } else {
-            Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            })
-        }
+        Ok(Value::bool(
+            matches!(self.partial_cmp(rhs), Some(Ordering::Less)),
+            span,
+        ))
     }
 
     pub fn lte(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
@@ -3281,28 +3397,35 @@ impl Value {
             return Ok(Value::nothing(span));
         }
 
-        if !type_compatible(self.get_type(), rhs.get_type())
-            && (self.get_type() != Type::Any)
-            && (rhs.get_type() != Type::Any)
-        {
-            return Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            });
+        if !type_compatible(self.get_type(), rhs.get_type()) {
+            return Err(operator_type_error(
+                Operator::Comparison(Comparison::LessThanOrEqual),
+                op,
+                self,
+                rhs,
+                |val| {
+                    matches!(
+                        val,
+                        Value::Int { .. }
+                            | Value::Float { .. }
+                            | Value::String { .. }
+                            | Value::Filesize { .. }
+                            | Value::Duration { .. }
+                            | Value::Date { .. }
+                            | Value::Bool { .. }
+                            | Value::Nothing { .. }
+                    )
+                },
+            ));
         }
 
-        self.partial_cmp(rhs)
-            .map(|ordering| Value::bool(matches!(ordering, Ordering::Less | Ordering::Equal), span))
-            .ok_or(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            })
+        Ok(Value::bool(
+            matches!(
+                self.partial_cmp(rhs),
+                Some(Ordering::Less | Ordering::Equal)
+            ),
+            span,
+        ))
     }
 
     pub fn gt(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
@@ -3319,28 +3442,32 @@ impl Value {
             return Ok(Value::nothing(span));
         }
 
-        if !type_compatible(self.get_type(), rhs.get_type())
-            && (self.get_type() != Type::Any)
-            && (rhs.get_type() != Type::Any)
-        {
-            return Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            });
+        if !type_compatible(self.get_type(), rhs.get_type()) {
+            return Err(operator_type_error(
+                Operator::Comparison(Comparison::GreaterThan),
+                op,
+                self,
+                rhs,
+                |val| {
+                    matches!(
+                        val,
+                        Value::Int { .. }
+                            | Value::Float { .. }
+                            | Value::String { .. }
+                            | Value::Filesize { .. }
+                            | Value::Duration { .. }
+                            | Value::Date { .. }
+                            | Value::Bool { .. }
+                            | Value::Nothing { .. }
+                    )
+                },
+            ));
         }
 
-        self.partial_cmp(rhs)
-            .map(|ordering| Value::bool(matches!(ordering, Ordering::Greater), span))
-            .ok_or(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            })
+        Ok(Value::bool(
+            matches!(self.partial_cmp(rhs), Some(Ordering::Greater)),
+            span,
+        ))
     }
 
     pub fn gte(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
@@ -3357,32 +3484,35 @@ impl Value {
             return Ok(Value::nothing(span));
         }
 
-        if !type_compatible(self.get_type(), rhs.get_type())
-            && (self.get_type() != Type::Any)
-            && (rhs.get_type() != Type::Any)
-        {
-            return Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            });
+        if !type_compatible(self.get_type(), rhs.get_type()) {
+            return Err(operator_type_error(
+                Operator::Comparison(Comparison::GreaterThanOrEqual),
+                op,
+                self,
+                rhs,
+                |val| {
+                    matches!(
+                        val,
+                        Value::Int { .. }
+                            | Value::Float { .. }
+                            | Value::String { .. }
+                            | Value::Filesize { .. }
+                            | Value::Duration { .. }
+                            | Value::Date { .. }
+                            | Value::Bool { .. }
+                            | Value::Nothing { .. }
+                    )
+                },
+            ));
         }
 
-        match self.partial_cmp(rhs) {
-            Some(ordering) => Ok(Value::bool(
-                matches!(ordering, Ordering::Greater | Ordering::Equal),
-                span,
-            )),
-            None => Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            }),
-        }
+        Ok(Value::bool(
+            matches!(
+                self.partial_cmp(rhs),
+                Some(Ordering::Greater | Ordering::Equal)
+            ),
+            span,
+        ))
     }
 
     pub fn eq(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
@@ -3395,22 +3525,10 @@ impl Value {
             );
         }
 
-        if let Some(ordering) = self.partial_cmp(rhs) {
-            Ok(Value::bool(matches!(ordering, Ordering::Equal), span))
-        } else {
-            match (self, rhs) {
-                (Value::Nothing { .. }, _) | (_, Value::Nothing { .. }) => {
-                    Ok(Value::bool(false, span))
-                }
-                _ => Err(ShellError::OperatorMismatch {
-                    op_span: op,
-                    lhs_ty: self.get_type().to_string(),
-                    lhs_span: self.span(),
-                    rhs_ty: rhs.get_type().to_string(),
-                    rhs_span: rhs.span(),
-                }),
-            }
-        }
+        Ok(Value::bool(
+            matches!(self.partial_cmp(rhs), Some(Ordering::Equal)),
+            span,
+        ))
     }
 
     pub fn ne(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
@@ -3423,22 +3541,10 @@ impl Value {
             );
         }
 
-        if let Some(ordering) = self.partial_cmp(rhs) {
-            Ok(Value::bool(!matches!(ordering, Ordering::Equal), span))
-        } else {
-            match (self, rhs) {
-                (Value::Nothing { .. }, _) | (_, Value::Nothing { .. }) => {
-                    Ok(Value::bool(true, span))
-                }
-                _ => Err(ShellError::OperatorMismatch {
-                    op_span: op,
-                    lhs_ty: self.get_type().to_string(),
-                    lhs_span: self.span(),
-                    rhs_ty: rhs.get_type().to_string(),
-                    rhs_span: rhs.span(),
-                }),
-            }
-        }
+        Ok(Value::bool(
+            !matches!(self.partial_cmp(rhs), Some(Ordering::Equal)),
+            span,
+        ))
     }
 
     pub fn r#in(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
@@ -3479,13 +3585,34 @@ impl Value {
             (Value::Custom { val: lhs, .. }, rhs) => {
                 lhs.operation(self.span(), Operator::Comparison(Comparison::In), op, rhs)
             }
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            }),
+            (lhs, rhs) => Err(
+                if matches!(
+                    rhs,
+                    Value::List { .. }
+                        | Value::Range { .. }
+                        | Value::String { .. }
+                        | Value::Record { .. }
+                        | Value::Custom { .. }
+                ) {
+                    ShellError::OperatorIncompatibleTypes {
+                        op: Operator::Comparison(Comparison::In),
+                        lhs: lhs.get_type(),
+                        rhs: rhs.get_type(),
+                        op_span: op,
+                        lhs_span: lhs.span(),
+                        rhs_span: rhs.span(),
+                        help: None,
+                    }
+                } else {
+                    ShellError::OperatorUnsupportedType {
+                        op: Operator::Comparison(Comparison::In),
+                        unsupported: rhs.get_type(),
+                        op_span: op,
+                        unsupported_span: rhs.span(),
+                        help: None,
+                    }
+                },
+            ),
         }
     }
 
@@ -3530,13 +3657,34 @@ impl Value {
                 op,
                 rhs,
             ),
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            }),
+            (lhs, rhs) => Err(
+                if matches!(
+                    rhs,
+                    Value::List { .. }
+                        | Value::Range { .. }
+                        | Value::String { .. }
+                        | Value::Record { .. }
+                        | Value::Custom { .. }
+                ) {
+                    ShellError::OperatorIncompatibleTypes {
+                        op: Operator::Comparison(Comparison::NotIn),
+                        lhs: lhs.get_type(),
+                        rhs: rhs.get_type(),
+                        op_span: op,
+                        lhs_span: lhs.span(),
+                        rhs_span: rhs.span(),
+                        help: None,
+                    }
+                } else {
+                    ShellError::OperatorUnsupportedType {
+                        op: Operator::Comparison(Comparison::NotIn),
+                        unsupported: rhs.get_type(),
+                        op_span: op,
+                        unsupported_span: rhs.span(),
+                        help: None,
+                    }
+                },
+            ),
         }
     }
 
@@ -3606,13 +3754,17 @@ impl Value {
                 op,
                 rhs,
             ),
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            }),
+            _ => Err(operator_type_error(
+                if invert {
+                    Operator::Comparison(Comparison::NotRegexMatch)
+                } else {
+                    Operator::Comparison(Comparison::RegexMatch)
+                },
+                op,
+                self,
+                rhs,
+                |val| matches!(val, Value::String { .. }),
+            )),
         }
     }
 
@@ -3627,13 +3779,13 @@ impl Value {
                 op,
                 rhs,
             ),
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            }),
+            _ => Err(operator_type_error(
+                Operator::Comparison(Comparison::StartsWith),
+                op,
+                self,
+                rhs,
+                |val| matches!(val, Value::String { .. }),
+            )),
         }
     }
 
@@ -3648,13 +3800,67 @@ impl Value {
                 op,
                 rhs,
             ),
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            }),
+            _ => Err(operator_type_error(
+                Operator::Comparison(Comparison::EndsWith),
+                op,
+                self,
+                rhs,
+                |val| matches!(val, Value::String { .. }),
+            )),
+        }
+    }
+
+    pub fn bit_or(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
+        match (self, rhs) {
+            (Value::Int { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
+                Ok(Value::int(*lhs | rhs, span))
+            }
+            (Value::Custom { val: lhs, .. }, rhs) => {
+                lhs.operation(span, Operator::Bits(Bits::BitOr), op, rhs)
+            }
+            _ => Err(operator_type_error(
+                Operator::Bits(Bits::BitOr),
+                op,
+                self,
+                rhs,
+                |val| matches!(val, Value::Int { .. }),
+            )),
+        }
+    }
+
+    pub fn bit_xor(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
+        match (self, rhs) {
+            (Value::Int { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
+                Ok(Value::int(*lhs ^ rhs, span))
+            }
+            (Value::Custom { val: lhs, .. }, rhs) => {
+                lhs.operation(span, Operator::Bits(Bits::BitXor), op, rhs)
+            }
+            _ => Err(operator_type_error(
+                Operator::Bits(Bits::BitXor),
+                op,
+                self,
+                rhs,
+                |val| matches!(val, Value::Int { .. }),
+            )),
+        }
+    }
+
+    pub fn bit_and(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
+        match (self, rhs) {
+            (Value::Int { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
+                Ok(Value::int(*lhs & rhs, span))
+            }
+            (Value::Custom { val: lhs, .. }, rhs) => {
+                lhs.operation(span, Operator::Bits(Bits::BitAnd), op, rhs)
+            }
+            _ => Err(operator_type_error(
+                Operator::Bits(Bits::BitAnd),
+                op,
+                self,
+                rhs,
+                |val| matches!(val, Value::Int { .. }),
+            )),
         }
     }
 
@@ -3677,13 +3883,13 @@ impl Value {
             (Value::Custom { val: lhs, .. }, rhs) => {
                 lhs.operation(span, Operator::Bits(Bits::ShiftLeft), op, rhs)
             }
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            }),
+            _ => Err(operator_type_error(
+                Operator::Bits(Bits::ShiftLeft),
+                op,
+                self,
+                rhs,
+                |val| matches!(val, Value::Int { .. }),
+            )),
         }
     }
 
@@ -3706,85 +3912,13 @@ impl Value {
             (Value::Custom { val: lhs, .. }, rhs) => {
                 lhs.operation(span, Operator::Bits(Bits::ShiftRight), op, rhs)
             }
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            }),
-        }
-    }
-
-    pub fn bit_or(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
-        match (self, rhs) {
-            (Value::Int { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
-                Ok(Value::int(*lhs | rhs, span))
-            }
-            (Value::Custom { val: lhs, .. }, rhs) => {
-                lhs.operation(span, Operator::Bits(Bits::BitOr), op, rhs)
-            }
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            }),
-        }
-    }
-
-    pub fn bit_xor(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
-        match (self, rhs) {
-            (Value::Int { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
-                Ok(Value::int(*lhs ^ rhs, span))
-            }
-            (Value::Custom { val: lhs, .. }, rhs) => {
-                lhs.operation(span, Operator::Bits(Bits::BitXor), op, rhs)
-            }
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            }),
-        }
-    }
-
-    pub fn bit_and(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
-        match (self, rhs) {
-            (Value::Int { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
-                Ok(Value::int(*lhs & rhs, span))
-            }
-            (Value::Custom { val: lhs, .. }, rhs) => {
-                lhs.operation(span, Operator::Bits(Bits::BitAnd), op, rhs)
-            }
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            }),
-        }
-    }
-
-    pub fn and(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
-        match (self, rhs) {
-            (Value::Bool { val: lhs, .. }, Value::Bool { val: rhs, .. }) => {
-                Ok(Value::bool(*lhs && *rhs, span))
-            }
-            (Value::Custom { val: lhs, .. }, rhs) => {
-                lhs.operation(span, Operator::Boolean(Boolean::And), op, rhs)
-            }
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            }),
+            _ => Err(operator_type_error(
+                Operator::Bits(Bits::ShiftRight),
+                op,
+                self,
+                rhs,
+                |val| matches!(val, Value::Int { .. }),
+            )),
         }
     }
 
@@ -3796,13 +3930,13 @@ impl Value {
             (Value::Custom { val: lhs, .. }, rhs) => {
                 lhs.operation(span, Operator::Boolean(Boolean::Or), op, rhs)
             }
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            }),
+            _ => Err(operator_type_error(
+                Operator::Boolean(Boolean::Or),
+                op,
+                self,
+                rhs,
+                |val| matches!(val, Value::Bool { .. }),
+            )),
         }
     }
 
@@ -3814,49 +3948,31 @@ impl Value {
             (Value::Custom { val: lhs, .. }, rhs) => {
                 lhs.operation(span, Operator::Boolean(Boolean::Xor), op, rhs)
             }
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            }),
+            _ => Err(operator_type_error(
+                Operator::Boolean(Boolean::Xor),
+                op,
+                self,
+                rhs,
+                |val| matches!(val, Value::Bool { .. }),
+            )),
         }
     }
 
-    pub fn pow(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
+    pub fn and(&self, op: Span, rhs: &Value, span: Span) -> Result<Value, ShellError> {
         match (self, rhs) {
-            (Value::Int { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
-                if let Some(val) = lhs.checked_pow(*rhs as u32) {
-                    Ok(Value::int(val, span))
-                } else {
-                    Err(ShellError::OperatorOverflow {
-                        msg: "pow operation overflowed".into(),
-                        span,
-                        help: Some("Consider using floating point values for increased range by promoting operand with 'into float'. Note: float has reduced precision!".into()),
-                    })
-                }
-            }
-            (Value::Int { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
-                Ok(Value::float((*lhs as f64).powf(*rhs), span))
-            }
-            (Value::Float { val: lhs, .. }, Value::Int { val: rhs, .. }) => {
-                Ok(Value::float(lhs.powf(*rhs as f64), span))
-            }
-            (Value::Float { val: lhs, .. }, Value::Float { val: rhs, .. }) => {
-                Ok(Value::float(lhs.powf(*rhs), span))
+            (Value::Bool { val: lhs, .. }, Value::Bool { val: rhs, .. }) => {
+                Ok(Value::bool(*lhs && *rhs, span))
             }
             (Value::Custom { val: lhs, .. }, rhs) => {
-                lhs.operation(span, Operator::Math(Math::Pow), op, rhs)
+                lhs.operation(span, Operator::Boolean(Boolean::And), op, rhs)
             }
-
-            _ => Err(ShellError::OperatorMismatch {
-                op_span: op,
-                lhs_ty: self.get_type().to_string(),
-                lhs_span: self.span(),
-                rhs_ty: rhs.get_type().to_string(),
-                rhs_span: rhs.span(),
-            }),
+            _ => Err(operator_type_error(
+                Operator::Boolean(Boolean::And),
+                op,
+                self,
+                rhs,
+                |val| matches!(val, Value::Bool { .. }),
+            )),
         }
     }
 }
@@ -3871,6 +3987,41 @@ fn type_compatible(a: Type, b: Type) -> bool {
     matches!((a, b), (Type::Int, Type::Float) | (Type::Float, Type::Int))
 }
 
+fn operator_type_error(
+    op: Operator,
+    op_span: Span,
+    lhs: &Value,
+    rhs: &Value,
+    is_supported: fn(&Value) -> bool,
+) -> ShellError {
+    let is_supported = |val| is_supported(val) || matches!(val, Value::Custom { .. });
+    match (is_supported(lhs), is_supported(rhs)) {
+        (true, true) => ShellError::OperatorIncompatibleTypes {
+            op,
+            lhs: lhs.get_type(),
+            rhs: rhs.get_type(),
+            op_span,
+            lhs_span: lhs.span(),
+            rhs_span: rhs.span(),
+            help: None,
+        },
+        (true, false) => ShellError::OperatorUnsupportedType {
+            op,
+            unsupported: rhs.get_type(),
+            op_span,
+            unsupported_span: rhs.span(),
+            help: None,
+        },
+        (false, _) => ShellError::OperatorUnsupportedType {
+            op,
+            unsupported: lhs.get_type(),
+            op_span,
+            unsupported_span: lhs.span(),
+            help: None,
+        },
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::{Record, Value};
diff --git a/crates/nu-std/std/help/mod.nu b/crates/nu-std/std/help/mod.nu
index 85edd3790d..c57decbb15 100644
--- a/crates/nu-std/std/help/mod.nu
+++ b/crates/nu-std/std/help/mod.nu
@@ -32,45 +32,48 @@ def command-not-found-error [span: record] {
     throw-error "std::help::command_not_found" "command not found" $span
 }
 
-def get-all-operators [] { return [
-    [type, operator, name, description, precedence];
-
-    [Assignment, =, Assign, "Assigns a value to a variable.", 10]
-    [Assignment, +=, PlusAssign, "Adds a value to a variable.", 10]
-    [Assignment, ++=, ConcatAssign, "Concatenate two lists, two strings, or two binary values.", 10]
-    [Assignment, -=, MinusAssign, "Subtracts a value from a variable.", 10]
-    [Assignment, *=, MultiplyAssign, "Multiplies a variable by a value.", 10]
-    [Assignment, /=, DivideAssign, "Divides a variable by a value.", 10]
-    [Comparison, ==, Equal, "Checks if two values are equal.", 80]
-    [Comparison, !=, NotEqual, "Checks if two values are not equal.", 80]
-    [Comparison, <, LessThan, "Checks if a value is less than another.", 80]
-    [Comparison, <=, LessThanOrEqual, "Checks if a value is less than or equal to another.", 80]
-    [Comparison, >, GreaterThan, "Checks if a value is greater than another.", 80]
-    [Comparison, >=, GreaterThanOrEqual, "Checks if a value is greater than or equal to another.", 80]
-    [Comparison, '=~ or like', RegexMatch, "Checks if a value matches a regular expression.", 80]
-    [Comparison, '!~ or not-like', NotRegexMatch, "Checks if a value does not match a regular expression.", 80]
-    [Comparison, in, In, "Checks if a value is in a list or string.", 80]
-    [Comparison, not-in, NotIn, "Checks if a value is not in a list or string.", 80]
-    [Comparison, starts-with, StartsWith, "Checks if a string starts with another.", 80]
-    [Comparison, ends-with, EndsWith, "Checks if a string ends with another.", 80]
-    [Comparison, not, UnaryNot, "Negates a value or expression.", 0]
-    [Math, +, Plus, "Adds two values.", 90]
-    [Math, ++, Concat, "Concatenate two lists, two strings, or two binary values.", 80]
-    [Math, -, Minus, "Subtracts two values.", 90]
-    [Math, *, Multiply, "Multiplies two values.", 95]
-    [Math, /, Divide, "Divides two values.", 95]
-    [Math, //, FloorDivision, "Divides two values and floors the result.", 95]
-    [Math, mod, Modulo, "Divides two values and returns the remainder.", 95]
-    [Math, **, "Pow ", "Raises one value to the power of another.", 100]
-    [Bitwise, bit-or, BitOr, "Performs a bitwise OR on two values.", 60]
-    [Bitwise, bit-xor, BitXor, "Performs a bitwise XOR on two values.", 70]
-    [Bitwise, bit-and, BitAnd, "Performs a bitwise AND on two values.", 75]
-    [Bitwise, bit-shl, ShiftLeft, "Shifts a value left by another.", 85]
-    [Bitwise, bit-shr, ShiftRight, "Shifts a value right by another.", 85]
-    [Boolean, and, And, "Checks if two values are true.", 50]
-    [Boolean, or, Or, "Checks if either value is true.", 40]
-    [Boolean, xor, Xor, "Checks if one value is true and the other is false.", 45]
-]}
+def get-all-operators [] {
+    [
+        [type, operator, name, description, precedence];
+        [Assignment, =, Assign, 'Assigns a value to a variable.', 10]
+        [Assignment, +=, AddAssign, 'Adds a value to a variable.', 10]
+        [Assignment, -=, SubtractAssign, 'Subtracts a value from a variable.', 10]
+        [Assignment, *=, MultiplyAssign, 'Multiplies a variable by a value.', 10]
+        [Assignment, /=, DivideAssign, 'Divides a variable by a value.', 10]
+        [Assignment, ++=, ConcatenateAssign, 'Concatenates a list, a string, or a binary value to a variable of the same type.', 10]
+        [Comparison, ==, Equal, 'Checks if two values are equal.', 80]
+        [Comparison, !=, NotEqual, 'Checks if two values are not equal.', 80]
+        [Comparison, <, LessThan, 'Checks if a value is less than another.', 80]
+        [Comparison, >, GreaterThan, 'Checks if a value is greater than another.', 80]
+        [Comparison, <=, LessThanOrEqual, 'Checks if a value is less than or equal to another.', 80]
+        [Comparison, >=, GreaterThanOrEqual, 'Checks if a value is greater than or equal to another.', 80]
+        [Comparison, '=~ or like', RegexMatch, 'Checks if a value matches a regular expression.', 80]
+        [Comparison, '!~ or not-like', NotRegexMatch, 'Checks if a value does not match a regular expression.', 80]
+        [Comparison, in, In, 'Checks if a value is in a list, is part of a string, or is a key in a record.', 80]
+        [Comparison, not-in, NotIn, 'Checks if a value is not in a list, is not part of a string, or is not a key in a record.', 80]
+        [Comparison, has, Has, 'Checks if a list contains a value, a string contains another, or if a record has a key.', 80]
+        [Comparison, not-has, NotHas, 'Checks if a list does not contains a value, a string does not contains another, or if a record does not have a key.', 80]
+        [Comparison, starts-with, StartsWith, 'Checks if a string starts with another.', 80]
+        [Comparison, ends-with, EndsWith, 'Checks if a string ends with another.', 80]
+        [Math, +, Add, 'Adds two values.', 90]
+        [Math, -, Subtract, 'Subtracts two values.', 90]
+        [Math, *, Multiply, 'Multiplies two values.', 95]
+        [Math, /, Divide, 'Divides two values.', 95]
+        [Math, //, FloorDivide, 'Divides two values and floors the result.', 95]
+        [Math, mod, Modulo, 'Divides two values and returns the remainder.', 95]
+        [Math, **, Pow, 'Raises one value to the power of another.', 100]
+        [Math, ++, Concatenate, 'Concatenates two lists, two strings, or two binary values.', 80]
+        [Bitwise, bit-or, BitOr, 'Performs a bitwise OR on two values.', 60]
+        [Bitwise, bit-xor, BitXor, 'Performs a bitwise XOR on two values.', 70]
+        [Bitwise, bit-and, BitAnd, 'Performs a bitwise AND on two values.', 75]
+        [Bitwise, bit-shl, ShiftLeft, 'Bitwise shifts a value left by another.', 85]
+        [Bitwise, bit-shr, ShiftRight, 'Bitwise shifts a value right by another.', 85]
+        [Boolean, or, Or, 'Checks if either value is true.', 40]
+        [Boolean, xor, Xor, 'Checks if one value is true and the other is false.', 45]
+        [Boolean, and, And, 'Checks if both values are true.', 50]
+        [Boolean, not, Not, 'Negates a value or expression.', 55]
+    ]
+}
 
 def "nu-complete list-aliases" [] {
     scope aliases | select name description | rename value description
diff --git a/crates/nu_plugin_custom_values/src/cool_custom_value.rs b/crates/nu_plugin_custom_values/src/cool_custom_value.rs
index cd160e0d0c..a6ee6f4168 100644
--- a/crates/nu_plugin_custom_values/src/cool_custom_value.rs
+++ b/crates/nu_plugin_custom_values/src/cool_custom_value.rs
@@ -1,4 +1,7 @@
-use nu_protocol::{ast, CustomValue, ShellError, Span, Value};
+use nu_protocol::{
+    ast::{self, Math, Operator},
+    CustomValue, ShellError, Span, Type, Value,
+};
 use serde::{Deserialize, Serialize};
 use std::cmp::Ordering;
 
@@ -112,7 +115,7 @@ impl CustomValue for CoolCustomValue {
     ) -> Result<Value, ShellError> {
         match operator {
             // Append the string inside `cool`
-            ast::Operator::Math(ast::Math::Concat) => {
+            Operator::Math(Math::Concatenate) => {
                 if let Some(right) = right
                     .as_custom_value()
                     .ok()
@@ -125,18 +128,21 @@ impl CustomValue for CoolCustomValue {
                         op_span,
                     ))
                 } else {
-                    Err(ShellError::OperatorMismatch {
+                    Err(ShellError::OperatorUnsupportedType {
+                        op: Operator::Math(Math::Concatenate),
+                        unsupported: right.get_type(),
                         op_span,
-                        lhs_ty: self.typetag_name().into(),
-                        lhs_span,
-                        rhs_ty: right.get_type().to_string(),
-                        rhs_span: right.span(),
+                        unsupported_span: right.span(),
+                        help: None,
                     })
                 }
             }
-            _ => Err(ShellError::UnsupportedOperator {
-                operator,
-                span: op_span,
+            _ => Err(ShellError::OperatorUnsupportedType {
+                op: Operator::Math(Math::Concatenate),
+                unsupported: Type::Custom(self.type_name().into()),
+                op_span,
+                unsupported_span: lhs_span,
+                help: None,
             }),
         }
     }
diff --git a/crates/nu_plugin_polars/src/dataframe/values/mod.rs b/crates/nu_plugin_polars/src/dataframe/values/mod.rs
index 42fb8dace1..fec45fe1bb 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/mod.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/mod.rs
@@ -7,20 +7,21 @@ mod nu_schema;
 mod nu_when;
 pub mod utils;
 
+use crate::{Cacheable, PolarsPlugin};
+use nu_plugin::EngineInterface;
+use nu_protocol::{
+    ast::Operator, CustomValue, PipelineData, ShellError, Span, Spanned, Type, Value,
+};
 use std::{cmp::Ordering, fmt};
+use uuid::Uuid;
 
 pub use file_type::PolarsFileType;
 pub use nu_dataframe::{Axis, Column, NuDataFrame, NuDataFrameCustomValue};
 pub use nu_expression::{NuExpression, NuExpressionCustomValue};
 pub use nu_lazyframe::{NuLazyFrame, NuLazyFrameCustomValue};
 pub use nu_lazygroupby::{NuLazyGroupBy, NuLazyGroupByCustomValue};
-use nu_plugin::EngineInterface;
-use nu_protocol::{ast::Operator, CustomValue, PipelineData, ShellError, Span, Spanned, Value};
 pub use nu_schema::{str_to_dtype, NuSchema};
 pub use nu_when::{NuWhen, NuWhenCustomValue, NuWhenType};
-use uuid::Uuid;
-
-use crate::{Cacheable, PolarsPlugin};
 
 #[derive(Debug, Clone)]
 pub enum PolarsPluginType {
@@ -217,13 +218,16 @@ pub trait PolarsPluginCustomValue: CustomValue {
         &self,
         _plugin: &PolarsPlugin,
         _engine: &EngineInterface,
-        _lhs_span: Span,
+        lhs_span: Span,
         operator: Spanned<Operator>,
         _right: Value,
     ) -> Result<Value, ShellError> {
-        Err(ShellError::UnsupportedOperator {
-            operator: operator.item,
-            span: operator.span,
+        Err(ShellError::OperatorUnsupportedType {
+            op: operator.item,
+            unsupported: Type::Custom(self.type_name().into()),
+            op_span: operator.span,
+            unsupported_span: lhs_span,
+            help: None,
         })
     }
 
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/between_values.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/between_values.rs
index 507107c7ae..918276818c 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/between_values.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/between_values.rs
@@ -18,15 +18,15 @@ pub(super) fn between_dataframes(
     rhs: &NuDataFrame,
 ) -> Result<NuDataFrame, ShellError> {
     match operator.item {
-        Operator::Math(Math::Plus) => {
+        Operator::Math(Math::Add) => {
             lhs.append_df(rhs, Axis::Row, Span::merge(left.span(), right.span()))
         }
-        _ => Err(ShellError::OperatorMismatch {
+        op => Err(ShellError::OperatorUnsupportedType {
+            op,
+            unsupported: left.get_type(),
             op_span: operator.span,
-            lhs_ty: left.get_type().to_string(),
-            lhs_span: left.span(),
-            rhs_ty: right.get_type().to_string(),
-            rhs_span: right.span(),
+            unsupported_span: left.span(),
+            help: None,
         }),
     }
 }
@@ -40,7 +40,7 @@ pub(super) fn compute_between_series(
 ) -> Result<NuDataFrame, ShellError> {
     let operation_span = Span::merge(left.span(), right.span());
     match operator.item {
-        Operator::Math(Math::Plus) => {
+        Operator::Math(Math::Add) => {
             let mut res = (lhs + rhs).map_err(|e| ShellError::GenericError {
                 error: format!("Addition error: {e}"),
                 msg: "".into(),
@@ -52,7 +52,7 @@ pub(super) fn compute_between_series(
             res.rename(name.into());
             NuDataFrame::try_from_series(res, operation_span)
         }
-        Operator::Math(Math::Minus) => {
+        Operator::Math(Math::Subtract) => {
             let mut res = (lhs - rhs).map_err(|e| ShellError::GenericError {
                 error: format!("Subtraction error: {e}"),
                 msg: "".into(),
@@ -181,12 +181,12 @@ pub(super) fn compute_between_series(
                 span: operation_span,
             }),
         },
-        _ => Err(ShellError::OperatorMismatch {
+        op => Err(ShellError::OperatorUnsupportedType {
+            op,
+            unsupported: left.get_type(),
             op_span: operator.span,
-            lhs_ty: left.get_type().to_string(),
-            lhs_span: left.span(),
-            rhs_ty: right.get_type().to_string(),
-            rhs_span: right.span(),
+            unsupported_span: left.span(),
+            help: None,
         }),
     }
 }
@@ -222,12 +222,12 @@ pub(super) fn compute_series_single_value(
     right: &Value,
 ) -> Result<NuDataFrame, ShellError> {
     if !lhs.is_series() {
-        return Err(ShellError::OperatorMismatch {
+        return Err(ShellError::OperatorUnsupportedType {
+            op: operator.item,
+            unsupported: left.get_type(),
             op_span: operator.span,
-            lhs_ty: left.get_type().to_string(),
-            lhs_span: left.span(),
-            rhs_ty: right.get_type().to_string(),
-            rhs_span: right.span(),
+            unsupported_span: left.span(),
+            help: None,
         });
     }
 
@@ -235,7 +235,7 @@ pub(super) fn compute_series_single_value(
     let lhs = lhs.as_series(lhs_span)?;
 
     match operator.item {
-        Operator::Math(Math::Plus) => match &right {
+        Operator::Math(Math::Add) => match &right {
             Value::Int { val, .. } => {
                 compute_series_i64(&lhs, *val, <ChunkedArray<Int64Type>>::add, lhs_span)
             }
@@ -243,27 +243,27 @@ pub(super) fn compute_series_single_value(
                 compute_series_float(&lhs, *val, <ChunkedArray<Float64Type>>::add, lhs_span)
             }
             Value::String { val, .. } => add_string_to_series(&lhs, val, lhs_span),
-            _ => Err(ShellError::OperatorMismatch {
+            _ => Err(ShellError::OperatorUnsupportedType {
+                op: operator.item,
+                unsupported: right.get_type(),
                 op_span: operator.span,
-                lhs_ty: left.get_type().to_string(),
-                lhs_span: left.span(),
-                rhs_ty: right.get_type().to_string(),
-                rhs_span: right.span(),
+                unsupported_span: right.span(),
+                help: None,
             }),
         },
-        Operator::Math(Math::Minus) => match &right {
+        Operator::Math(Math::Subtract) => match &right {
             Value::Int { val, .. } => {
                 compute_series_i64(&lhs, *val, <ChunkedArray<Int64Type>>::sub, lhs_span)
             }
             Value::Float { val, .. } => {
                 compute_series_float(&lhs, *val, <ChunkedArray<Float64Type>>::sub, lhs_span)
             }
-            _ => Err(ShellError::OperatorMismatch {
+            _ => Err(ShellError::OperatorUnsupportedType {
+                op: operator.item,
+                unsupported: right.get_type(),
                 op_span: operator.span,
-                lhs_ty: left.get_type().to_string(),
-                lhs_span: left.span(),
-                rhs_ty: right.get_type().to_string(),
-                rhs_span: right.span(),
+                unsupported_span: right.span(),
+                help: None,
             }),
         },
         Operator::Math(Math::Multiply) => match &right {
@@ -273,12 +273,12 @@ pub(super) fn compute_series_single_value(
             Value::Float { val, .. } => {
                 compute_series_float(&lhs, *val, <ChunkedArray<Float64Type>>::mul, lhs_span)
             }
-            _ => Err(ShellError::OperatorMismatch {
+            _ => Err(ShellError::OperatorUnsupportedType {
+                op: operator.item,
+                unsupported: right.get_type(),
                 op_span: operator.span,
-                lhs_ty: left.get_type().to_string(),
-                lhs_span: left.span(),
-                rhs_ty: right.get_type().to_string(),
-                rhs_span: right.span(),
+                unsupported_span: right.span(),
+                help: None,
             }),
         },
         Operator::Math(Math::Divide) => {
@@ -298,12 +298,12 @@ pub(super) fn compute_series_single_value(
                         compute_series_float(&lhs, *val, <ChunkedArray<Float64Type>>::div, lhs_span)
                     }
                 }
-                _ => Err(ShellError::OperatorMismatch {
+                _ => Err(ShellError::OperatorUnsupportedType {
+                    op: operator.item,
+                    unsupported: right.get_type(),
                     op_span: operator.span,
-                    lhs_ty: left.get_type().to_string(),
-                    lhs_span: left.span(),
-                    rhs_ty: right.get_type().to_string(),
-                    rhs_span: right.span(),
+                    unsupported_span: right.span(),
+                    help: None,
                 }),
             }
         }
@@ -319,12 +319,12 @@ pub(super) fn compute_series_single_value(
             Value::Date { val, .. } => {
                 compare_series_i64(&lhs, val.timestamp_millis(), ChunkedArray::equal, lhs_span)
             }
-            _ => Err(ShellError::OperatorMismatch {
+            _ => Err(ShellError::OperatorUnsupportedType {
+                op: operator.item,
+                unsupported: right.get_type(),
                 op_span: operator.span,
-                lhs_ty: left.get_type().to_string(),
-                lhs_span: left.span(),
-                rhs_ty: right.get_type().to_string(),
-                rhs_span: right.span(),
+                unsupported_span: right.span(),
+                help: None,
             }),
         },
         Operator::Comparison(Comparison::NotEqual) => match &right {
@@ -344,12 +344,12 @@ pub(super) fn compute_series_single_value(
                 ChunkedArray::not_equal,
                 lhs_span,
             ),
-            _ => Err(ShellError::OperatorMismatch {
+            _ => Err(ShellError::OperatorUnsupportedType {
+                op: operator.item,
+                unsupported: right.get_type(),
                 op_span: operator.span,
-                lhs_ty: left.get_type().to_string(),
-                lhs_span: left.span(),
-                rhs_ty: right.get_type().to_string(),
-                rhs_span: right.span(),
+                unsupported_span: right.span(),
+                help: None,
             }),
         },
         Operator::Comparison(Comparison::LessThan) => match &right {
@@ -360,12 +360,12 @@ pub(super) fn compute_series_single_value(
             Value::Date { val, .. } => {
                 compare_series_i64(&lhs, val.timestamp_millis(), ChunkedArray::lt, lhs_span)
             }
-            _ => Err(ShellError::OperatorMismatch {
+            _ => Err(ShellError::OperatorUnsupportedType {
+                op: operator.item,
+                unsupported: right.get_type(),
                 op_span: operator.span,
-                lhs_ty: left.get_type().to_string(),
-                lhs_span: left.span(),
-                rhs_ty: right.get_type().to_string(),
-                rhs_span: right.span(),
+                unsupported_span: right.span(),
+                help: None,
             }),
         },
         Operator::Comparison(Comparison::LessThanOrEqual) => match &right {
@@ -376,12 +376,12 @@ pub(super) fn compute_series_single_value(
             Value::Date { val, .. } => {
                 compare_series_i64(&lhs, val.timestamp_millis(), ChunkedArray::lt_eq, lhs_span)
             }
-            _ => Err(ShellError::OperatorMismatch {
+            _ => Err(ShellError::OperatorUnsupportedType {
+                op: operator.item,
+                unsupported: right.get_type(),
                 op_span: operator.span,
-                lhs_ty: left.get_type().to_string(),
-                lhs_span: left.span(),
-                rhs_ty: right.get_type().to_string(),
-                rhs_span: right.span(),
+                unsupported_span: right.span(),
+                help: None,
             }),
         },
         Operator::Comparison(Comparison::GreaterThan) => match &right {
@@ -392,12 +392,12 @@ pub(super) fn compute_series_single_value(
             Value::Date { val, .. } => {
                 compare_series_i64(&lhs, val.timestamp_millis(), ChunkedArray::gt, lhs_span)
             }
-            _ => Err(ShellError::OperatorMismatch {
+            _ => Err(ShellError::OperatorUnsupportedType {
+                op: operator.item,
+                unsupported: right.get_type(),
                 op_span: operator.span,
-                lhs_ty: left.get_type().to_string(),
-                lhs_span: left.span(),
-                rhs_ty: right.get_type().to_string(),
-                rhs_span: right.span(),
+                unsupported_span: right.span(),
+                help: None,
             }),
         },
         Operator::Comparison(Comparison::GreaterThanOrEqual) => match &right {
@@ -408,23 +408,23 @@ pub(super) fn compute_series_single_value(
             Value::Date { val, .. } => {
                 compare_series_i64(&lhs, val.timestamp_millis(), ChunkedArray::gt_eq, lhs_span)
             }
-            _ => Err(ShellError::OperatorMismatch {
+            _ => Err(ShellError::OperatorUnsupportedType {
+                op: operator.item,
+                unsupported: right.get_type(),
                 op_span: operator.span,
-                lhs_ty: left.get_type().to_string(),
-                lhs_span: left.span(),
-                rhs_ty: right.get_type().to_string(),
-                rhs_span: right.span(),
+                unsupported_span: right.span(),
+                help: None,
             }),
         },
         // TODO: update this to do a regex match instead of a simple contains?
         Operator::Comparison(Comparison::RegexMatch) => match &right {
             Value::String { val, .. } => contains_series_pat(&lhs, val, lhs_span),
-            _ => Err(ShellError::OperatorMismatch {
+            _ => Err(ShellError::OperatorUnsupportedType {
+                op: operator.item,
+                unsupported: right.get_type(),
                 op_span: operator.span,
-                lhs_ty: left.get_type().to_string(),
-                lhs_span: left.span(),
-                rhs_ty: right.get_type().to_string(),
-                rhs_span: right.span(),
+                unsupported_span: right.span(),
+                help: None,
             }),
         },
         Operator::Comparison(Comparison::StartsWith) => match &right {
@@ -432,12 +432,12 @@ pub(super) fn compute_series_single_value(
                 let starts_with_pattern = format!("^{}", fancy_regex::escape(val));
                 contains_series_pat(&lhs, &starts_with_pattern, lhs_span)
             }
-            _ => Err(ShellError::OperatorMismatch {
+            _ => Err(ShellError::OperatorUnsupportedType {
+                op: operator.item,
+                unsupported: right.get_type(),
                 op_span: operator.span,
-                lhs_ty: left.get_type().to_string(),
-                lhs_span: left.span(),
-                rhs_ty: right.get_type().to_string(),
-                rhs_span: right.span(),
+                unsupported_span: right.span(),
+                help: None,
             }),
         },
         Operator::Comparison(Comparison::EndsWith) => match &right {
@@ -445,20 +445,20 @@ pub(super) fn compute_series_single_value(
                 let ends_with_pattern = format!("{}$", fancy_regex::escape(val));
                 contains_series_pat(&lhs, &ends_with_pattern, lhs_span)
             }
-            _ => Err(ShellError::OperatorMismatch {
+            _ => Err(ShellError::OperatorUnsupportedType {
+                op: operator.item,
+                unsupported: right.get_type(),
                 op_span: operator.span,
-                lhs_ty: left.get_type().to_string(),
-                lhs_span: left.span(),
-                rhs_ty: right.get_type().to_string(),
-                rhs_span: right.span(),
+                unsupported_span: right.span(),
+                help: None,
             }),
         },
-        _ => Err(ShellError::OperatorMismatch {
+        _ => Err(ShellError::OperatorUnsupportedType {
+            op: operator.item,
+            unsupported: left.get_type(),
             op_span: operator.span,
-            lhs_ty: left.get_type().to_string(),
-            lhs_span: left.span(),
-            rhs_ty: right.get_type().to_string(),
-            rhs_span: right.span(),
+            unsupported_span: left.span(),
+            help: None,
         }),
     }
 }
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_expression/custom_value.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_expression/custom_value.rs
index a9371f03f2..e0da3012c5 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_expression/custom_value.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_expression/custom_value.rs
@@ -81,14 +81,14 @@ fn with_operator(
     left: &NuExpression,
     right: &NuExpression,
     lhs_span: Span,
-    rhs_span: Span,
+    _rhs_span: Span,
     op_span: Span,
 ) -> Result<Value, ShellError> {
     match operator {
-        Operator::Math(Math::Plus) => {
+        Operator::Math(Math::Add) => {
             apply_arithmetic(plugin, engine, left, right, lhs_span, Add::add)
         }
-        Operator::Math(Math::Minus) => {
+        Operator::Math(Math::Subtract) => {
             apply_arithmetic(plugin, engine, left, right, lhs_span, Sub::sub)
         }
         Operator::Math(Math::Multiply) => {
@@ -100,7 +100,7 @@ fn with_operator(
         Operator::Math(Math::Modulo) => {
             apply_arithmetic(plugin, engine, left, right, lhs_span, Rem::rem)
         }
-        Operator::Math(Math::FloorDivision) => {
+        Operator::Math(Math::FloorDivide) => {
             apply_arithmetic(plugin, engine, left, right, lhs_span, Div::div)
         }
         Operator::Comparison(Comparison::Equal) => Ok(left
@@ -133,12 +133,12 @@ fn with_operator(
             .apply_with_expr(right.clone(), Expr::lt_eq)
             .cache(plugin, engine, lhs_span)?
             .into_value(lhs_span)),
-        _ => Err(ShellError::OperatorMismatch {
+        op => Err(ShellError::OperatorUnsupportedType {
+            op,
+            unsupported: Type::Custom(TYPE_NAME.into()),
             op_span,
-            lhs_ty: Type::Custom(TYPE_NAME.into()).to_string(),
-            lhs_span,
-            rhs_ty: Type::Custom(TYPE_NAME.into()).to_string(),
-            rhs_span,
+            unsupported_span: lhs_span,
+            help: None,
         }),
     }
 }
diff --git a/tests/const_/mod.rs b/tests/const_/mod.rs
index d76c18d07b..dabf3892f8 100644
--- a/tests/const_/mod.rs
+++ b/tests/const_/mod.rs
@@ -167,7 +167,7 @@ fn const_binary_operator(#[case] inp: &[&str], #[case] expect: &str) {
 #[case(&["const x = 1 / 0", "$x"], "division by zero")]
 #[case(&["const x = 10 ** 10000000", "$x"], "pow operation overflowed")]
 #[case(&["const x = 2 ** 62 * 2", "$x"], "multiply operation overflowed")]
-#[case(&["const x = 1 ++ 0", "$x"], "doesn't support this value")]
+#[case(&["const x = 1 ++ 0", "$x"], "nu::parser::operator_unsupported_type")]
 fn const_operator_error(#[case] inp: &[&str], #[case] expect: &str) {
     let actual = nu!(&inp.join("; "));
     assert!(actual.err.contains(expect));
diff --git a/tests/repl/test_ranges.rs b/tests/repl/test_ranges.rs
index 8e7a557738..2f3f26b07a 100644
--- a/tests/repl/test_ranges.rs
+++ b/tests/repl/test_ranges.rs
@@ -27,7 +27,7 @@ fn float_in_dec_range() -> TestResult {
 
 #[test]
 fn non_number_in_range() -> TestResult {
-    fail_test(r#"'a' in 1..3"#, "subset comparison is not supported")
+    fail_test(r#"'a' in 1..3"#, "nu::parser::operator_incompatible_types")
 }
 
 #[test]
diff --git a/tests/repl/test_regex.rs b/tests/repl/test_regex.rs
index 6f9063c81a..7dff6d7710 100644
--- a/tests/repl/test_regex.rs
+++ b/tests/repl/test_regex.rs
@@ -73,10 +73,10 @@ fn invalid_not_regex_fails() -> TestResult {
 
 #[test]
 fn regex_on_int_fails() -> TestResult {
-    fail_test(r#"33 =~ foo"#, "is not supported")
+    fail_test(r#"33 =~ foo"#, "nu::parser::operator_unsupported_type")
 }
 
 #[test]
 fn not_regex_on_int_fails() -> TestResult {
-    fail_test(r#"33 !~ foo"#, "is not supported")
+    fail_test(r#"33 !~ foo"#, "nu::parser::operator_unsupported_type")
 }
diff --git a/tests/repl/test_strings.rs b/tests/repl/test_strings.rs
index 1c573f03ae..967086a592 100644
--- a/tests/repl/test_strings.rs
+++ b/tests/repl/test_strings.rs
@@ -20,7 +20,7 @@ fn string_in_string() -> TestResult {
 
 #[test]
 fn non_string_in_string() -> TestResult {
-    fail_test(r#"42 in 'abc'"#, "is not supported")
+    fail_test(r#"42 in 'abc'"#, "nu::parser::operator_incompatible_types")
 }
 
 #[test]
@@ -32,7 +32,7 @@ fn string_in_record() -> TestResult {
 fn non_string_in_record() -> TestResult {
     fail_test(
         r#"4 in ('{ "a": 13, "b": 14 }' | from json)"#,
-        "mismatch during operation",
+        "nu::shell::operator_incompatible_types",
     )
 }
 
diff --git a/tests/repl/test_type_check.rs b/tests/repl/test_type_check.rs
index 07a8d99495..86216c15a9 100644
--- a/tests/repl/test_type_check.rs
+++ b/tests/repl/test_type_check.rs
@@ -13,7 +13,10 @@ fn type_in_list_of_this_type() -> TestResult {
 
 #[test]
 fn type_in_list_of_non_this_type() -> TestResult {
-    fail_test(r#"'hello' in [41 42 43]"#, "is not supported")
+    fail_test(
+        r#"'hello' in [41 42 43]"#,
+        "nu::parser::operator_incompatible_types",
+    )
 }
 
 #[test]
@@ -40,7 +43,10 @@ fn date_minus_duration() -> TestResult {
 
 #[test]
 fn duration_minus_date_not_supported() -> TestResult {
-    fail_test("2day - 2023-04-22", "doesn't support these values")
+    fail_test(
+        "2day - 2023-04-22",
+        "nu::parser::operator_incompatible_types",
+    )
 }
 
 #[test]
diff --git a/tests/shell/pipeline/commands/internal.rs b/tests/shell/pipeline/commands/internal.rs
index aa90fbf681..e78a0947b3 100644
--- a/tests/shell/pipeline/commands/internal.rs
+++ b/tests/shell/pipeline/commands/internal.rs
@@ -770,8 +770,10 @@ fn filesize_math() {
 
 #[test]
 fn filesize_math2() {
-    let actual = nu!("100 / 10kb");
-    assert!(actual.err.contains("doesn't support"));
+    let actual = nu!("100 / 10kB");
+    assert!(actual
+        .err
+        .contains("nu::parser::operator_incompatible_types"));
 }
 
 #[test]

From 4ac4f71a375222b760b526d2a7390447fc975fc4 Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Thu, 13 Feb 2025 13:55:03 +0300
Subject: [PATCH 1051/1072] feat(overlay): expose constants with `overlay use`
 (#15081)

# Description

`overlay use` now imports constants exported from modules, just like
`use`.

```nushell
# foo.nu
export const a = 1
export const b = 2
```

- `overlay use foo.nu` being equivalent to `use foo.nu *` and exposing
constants `$a = 1` and `$b = 2`
- `overlay use foo.nu -p` being equivalent to `use foo.nu` and exposing
the constant `$foo = {a: 1, b: 2}`

# User-Facing Changes

`overlay use` now imports constants just like `use`.

# Tests + Formatting

- :green_circle: toolkit fmt
- :green_circle: toolkit clippy
- :green_circle: toolkit test
- :green_circle: toolkit test stdlib

# After Submitting
N/A
---
 crates/nu-parser/src/parse_keywords.rs        |  6 ++--
 .../src/engine/state_working_set.rs           | 31 +++++++++++++++----
 tests/const_/mod.rs                           |  9 ++++--
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index 7396b4ea93..dbe8c7292c 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -2977,8 +2977,7 @@ pub fn parse_overlay_new(working_set: &mut StateWorkingSet, call: Box<Call>) ->
     working_set.add_overlay(
         overlay_name.as_bytes().to_vec(),
         module_id,
-        vec![],
-        vec![],
+        ResolvedImportPattern::new(vec![], vec![], vec![], vec![]),
         false,
     );
 
@@ -3192,8 +3191,7 @@ pub fn parse_overlay_use(working_set: &mut StateWorkingSet, call: Box<Call>) ->
         working_set.add_overlay(
             final_overlay_name.as_bytes().to_vec(),
             origin_module_id,
-            definitions.decls,
-            definitions.modules,
+            definitions,
             has_prefix,
         );
     } else {
diff --git a/crates/nu-protocol/src/engine/state_working_set.rs b/crates/nu-protocol/src/engine/state_working_set.rs
index c7643b501b..11be80efb9 100644
--- a/crates/nu-protocol/src/engine/state_working_set.rs
+++ b/crates/nu-protocol/src/engine/state_working_set.rs
@@ -5,7 +5,8 @@ use crate::{
         StateDelta, Variable, VirtualPath, Visibility,
     },
     BlockId, Category, CompileError, Config, DeclId, FileId, GetSpan, Module, ModuleId, OverlayId,
-    ParseError, ParseWarning, Signature, Span, SpanId, Type, Value, VarId, VirtualPathId,
+    ParseError, ParseWarning, ResolvedImportPattern, Signature, Span, SpanId, Type, Value, VarId,
+    VirtualPathId,
 };
 use core::panic;
 use std::{
@@ -915,7 +916,12 @@ impl<'a> StateWorkingSet<'a> {
             let name = self.last_overlay_name().to_vec();
             let origin = overlay_frame.origin;
             let prefixed = overlay_frame.prefixed;
-            self.add_overlay(name, origin, vec![], vec![], prefixed);
+            self.add_overlay(
+                name,
+                origin,
+                ResolvedImportPattern::new(vec![], vec![], vec![], vec![]),
+                prefixed,
+            );
         }
 
         self.delta
@@ -952,8 +958,7 @@ impl<'a> StateWorkingSet<'a> {
         &mut self,
         name: Vec<u8>,
         origin: ModuleId,
-        decls: Vec<(Vec<u8>, DeclId)>,
-        modules: Vec<(Vec<u8>, ModuleId)>,
+        definitions: ResolvedImportPattern,
         prefixed: bool,
     ) {
         let last_scope_frame = self.delta.last_scope_frame_mut();
@@ -980,8 +985,22 @@ impl<'a> StateWorkingSet<'a> {
 
         self.move_predecls_to_overlay();
 
-        self.use_decls(decls);
-        self.use_modules(modules);
+        self.use_decls(definitions.decls);
+        self.use_modules(definitions.modules);
+
+        let mut constants = vec![];
+
+        for (name, const_vid) in definitions.constants {
+            constants.push((name, const_vid));
+        }
+
+        for (name, const_val) in definitions.constant_values {
+            let const_var_id =
+                self.add_variable(name.clone(), Span::unknown(), const_val.get_type(), false);
+            self.set_variable_const_val(const_var_id, const_val);
+            constants.push((name, const_var_id));
+        }
+        self.use_variables(constants);
     }
 
     pub fn remove_overlay(&mut self, name: &[u8], keep_custom: bool) {
diff --git a/tests/const_/mod.rs b/tests/const_/mod.rs
index dabf3892f8..b969c2c6f1 100644
--- a/tests/const_/mod.rs
+++ b/tests/const_/mod.rs
@@ -347,9 +347,8 @@ fn const_captures_in_closures_work() {
     assert_eq!(actual.out, "hello world");
 }
 
-#[ignore = "TODO: Need to fix `overlay hide` to hide the constants brought by `overlay use`"]
 #[test]
-fn complex_const_overlay_use_hide() {
+fn complex_const_overlay_use() {
     let inp = &[MODULE_SETUP, "overlay use spam", "$X"];
     let actual = nu!(&inp.join("; "));
     assert_eq!(actual.out, "x");
@@ -365,11 +364,15 @@ fn complex_const_overlay_use_hide() {
     let inp = &[
         MODULE_SETUP,
         "overlay use spam",
-        "($eggs.bacon.none | is-empty)",
+        "($eggs.bacon not-has 'none')",
     ];
     let actual = nu!(&inp.join("; "));
     assert_eq!(actual.out, "true");
+}
 
+#[ignore = "TODO: `overlay hide` should be possible to use after `overlay use` in the same source unit."]
+#[test]
+fn overlay_use_hide_in_single_source_unit() {
     let inp = &[MODULE_SETUP, "overlay use spam", "overlay hide", "$eggs"];
     let actual = nu!(&inp.join("; "));
     assert!(actual.err.contains("nu::parser::variable_not_found"));

From 879258039cbb66e38ddc55e9528757f3bb00174e Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Thu, 13 Feb 2025 16:29:08 +0100
Subject: [PATCH 1052/1072] Revert `/` vi binding due to priority bug (#15111)

Manually added bindings take priority to the vi-mode state machine in
reedline thus this addition blocked the use of `f/`/`t/` etc.

Partial revert of #14908

Addresses #15096 with a temporary fix. The full solution of that should
resolve it on the reedline side so you can have both the search option
and the availability of `/` in normal mode bindings
---
 crates/nu-cli/src/reedline_config.rs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/crates/nu-cli/src/reedline_config.rs b/crates/nu-cli/src/reedline_config.rs
index ea5af59c16..69be71eaf7 100644
--- a/crates/nu-cli/src/reedline_config.rs
+++ b/crates/nu-cli/src/reedline_config.rs
@@ -707,11 +707,6 @@ pub(crate) fn create_keybindings(config: &Config) -> Result<KeybindingsMode, She
         EditBindings::Vi => {
             add_menu_keybindings(&mut insert_keybindings);
             add_menu_keybindings(&mut normal_keybindings);
-            normal_keybindings.add_binding(
-                KeyModifiers::NONE,
-                KeyCode::Char('/'),
-                ReedlineEvent::Menu("history_menu".to_string()),
-            );
         }
     }
     for keybinding in parsed_keybindings {

From a8a0c78a329a7eb9cdb86bb4afd0be8f5ea96072 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Thu, 13 Feb 2025 16:51:21 +0100
Subject: [PATCH 1053/1072] Bump Ubuntu runners to 22.04 LTS for tests (#15109)

The release workflow is already on 22.04 for a while. But our tests
where still with 20.04 which is close to end of life

Closes #15052
---
 .github/workflows/ci.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 65b349867b..05fb18ed86 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,14 +22,14 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        # Pinning to Ubuntu 20.04 because building on newer Ubuntu versions causes linux-gnu
+        # Pinning to Ubuntu 22.04 because building on newer Ubuntu versions causes linux-gnu
         # builds to link against a too-new-for-many-Linux-installs glibc version. Consider
-        # revisiting this when 20.04 is closer to EOL (April 2025)
+        # revisiting this when 22.04 is closer to EOL (June 2027)
         #
         # Using macOS 13 runner because 14 is based on the M1 and has half as much RAM (7 GB,
         # instead of 14 GB) which is too little for us right now. Revisit when `dfr` commands are
         # removed and we're only building the `polars` plugin instead
-        platform: [windows-latest, macos-13, ubuntu-20.04]
+        platform: [windows-latest, macos-13, ubuntu-22.04]
 
     runs-on: ${{ matrix.platform }}
 
@@ -57,7 +57,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        platform: [windows-latest, macos-latest, ubuntu-20.04]
+        platform: [windows-latest, macos-latest, ubuntu-22.04]
 
     runs-on: ${{ matrix.platform }}
 
@@ -84,7 +84,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        platform: [ubuntu-20.04, macos-latest, windows-latest]
+        platform: [ubuntu-22.04, macos-latest, windows-latest]
         py:
           - py
 
@@ -137,7 +137,7 @@ jobs:
         # instead of 14 GB) which is too little for us right now.
         #
         # Failure occurring with clippy for rust 1.77.2
-        platform: [windows-latest, macos-13, ubuntu-20.04]
+        platform: [windows-latest, macos-13, ubuntu-22.04]
 
     runs-on: ${{ matrix.platform }}
 

From e1c5ae3cd5a1f9e5574ad3c7542d50d04174a79d Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Thu, 13 Feb 2025 22:23:14 +0300
Subject: [PATCH 1054/1072] fix(test stdlib): scanning tests shouldn't be
 affected by user config (#15113)

# Description

# User-Facing Changes

# Tests + Formatting

# After Submitting

Co-authored-by: Bahex <17417311+Bahex@users.noreply.github.com>
---
 crates/nu-std/testing.nu | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-std/testing.nu b/crates/nu-std/testing.nu
index 077902c55d..b8ee4b3329 100644
--- a/crates/nu-std/testing.nu
+++ b/crates/nu-std/testing.nu
@@ -33,7 +33,7 @@ const valid_annotations = {
 def get-annotated [
     file: path
 ]: nothing -> table<function_name: string, annotation: string> {
-    ^$nu.current-exe -c $'
+    ^$nu.current-exe --no-config-file -c $'
         source `($file)`
         scope commands
         | select name attributes

From 453e294883264b7cc06405c066879519813d61f5 Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Fri, 14 Feb 2025 12:23:59 +0800
Subject: [PATCH 1055/1072] Refactor `kv` commands: replace inline params in
 SQL queries (#15108)

# Description

Update some comments and fix potential security issue:

SQL Injection in DELETE statements: The code constructs SQL queries by
interpolating the $key variable directly into the string. If a key
contains malicious input could lead to SQL injection. Need to use
parameterized queries or escaping.
---
 crates/nu-std/std-rfc/kv/mod.nu | 41 +++++++++++++++------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/crates/nu-std/std-rfc/kv/mod.nu b/crates/nu-std/std-rfc/kv/mod.nu
index 30088dba4d..95d90282e1 100644
--- a/crates/nu-std/std-rfc/kv/mod.nu
+++ b/crates/nu-std/std-rfc/kv/mod.nu
@@ -14,8 +14,7 @@
 
 # Stores the pipeline value for later use
 #
-# If the key already exists, it is updated
-# to the new value provided.
+# If the key already exists, it is updated to the new value provided.
 @example "Store the list of files in the home directory" {
   ls ~ | kv set "home snapshot"
 }
@@ -29,7 +28,7 @@ export def "kv set" [
   key: string
   value_or_closure?: any
   --return (-r): string   # Whether and what to return to the pipeline output
-  --universal (-u)
+  --universal (-u)        # Store the key-value pair in a universal database
 ] {
   # Pipeline input is preferred, but prioritize
   # parameter if present. This allows $in to be
@@ -53,7 +52,7 @@ export def "kv set" [
   let db_open = (db_setup --universal=$universal)
   try {
     # Delete the existing key if it does exist
-    do $db_open | query db $"DELETE FROM std_kv_store WHERE key = '($key)'"
+    do $db_open | query db "DELETE FROM std_kv_store WHERE key = :key" --params { key: $key }
   }
 
   match $universal {
@@ -97,36 +96,34 @@ export def "kv set" [
 
 # Retrieves a stored value by key
 #
-# Counterpart of "kv set". Returns null
-# if the key is not found.
+# Counterpart of "kv set". Returns null if the key is not found.
 @example "Retrieve a stored value" {
   kv get foo
 }
 export def "kv get" [
-  key: string # Key of the kv-pair to retrieve
-  --universal (-u)
+  key: string       # Key of the kv-pair to retrieve
+  --universal (-u)  # Whether to use the universal db
 ] {
   let db_open = (db_setup --universal=$universal)
   do $db_open
     # Hack to turn a SQLiteDatabase into a table
-  | $in.std_kv_store | wrap temp | get temp
-  | where key == $key
+    | $in.std_kv_store | wrap temp | get temp
+    | where key == $key
     # Should only be one occurrence of each key in the stor
-  | get -i value.0
-  | match $in {
+    | get -i value.0
+    | match $in {
       # Key not found
       null => null
       # Key found
       _ => { from nuon }
-  }
+    }
 }
 
 # List the currently stored key-value pairs
 #
-# Returns results as the Nushell value rather
-# than the stored nuon.
+# Returns results as the Nushell value rather than the stored nuon.
 export def "kv list" [
-  --universal (-u)
+  --universal (-u)  # Whether to use the universal db
 ] {
   let db_open = (db_setup --universal=$universal)
 
@@ -140,8 +137,8 @@ export def "kv list" [
 
 # Returns and removes a key-value pair
 export def --env "kv drop" [
-  key: string   # Key of the kv-pair to drop
-  --universal (-u)
+  key: string       # Key of the kv-pair to drop
+  --universal (-u)  # Whether to use the universal db
 ] {
   let db_open = (db_setup --universal=$universal)
 
@@ -150,7 +147,7 @@ export def --env "kv drop" [
   try {
     do $db_open
       # Hack to turn a SQLiteDatabase into a table
-    | query db $"DELETE FROM std_kv_store WHERE key = '($key)'"
+      | query db "DELETE FROM std_kv_store WHERE key = :key" --params { key: $key }
   }
 
   if $universal and ($env.NU_KV_UNIVERSALS? | default false) {
@@ -163,12 +160,12 @@ export def --env "kv drop" [
 def universal_db_path [] {
   $env.NU_UNIVERSAL_KV_PATH?
   | default (
-      $nu.data-dir | path join "std_kv_variables.sqlite3"
+    $nu.data-dir | path join "std_kv_variables.sqlite3"
   )
 }
 
 def db_setup [
-  --universal
+  --universal   # Whether to use the universal db
 ] : nothing -> closure {
   try {
     match $universal {
@@ -181,7 +178,7 @@ def db_setup [
           value: ''
         }
         $dummy_record | into sqlite (universal_db_path) -t std_kv_store
-        open (universal_db_path) | query db $"DELETE FROM std_kv_store WHERE key = '($uuid)'"
+        open (universal_db_path) | query db "DELETE FROM std_kv_store WHERE key = :key" --params { key: $uuid }
       }
       false => {
         # Create the stor table if it doesn't exist

From 2a8f92b709b051629aed3efff9025ec9021fcbdf Mon Sep 17 00:00:00 2001
From: Bahex <Bahex@users.noreply.github.com>
Date: Fri, 14 Feb 2025 15:29:45 +0300
Subject: [PATCH 1056/1072] docs(chunks): make `chunks` easier to discover for
 binary data (#15117)

# Description
There has been multiple instances of users being unable to discover that
`chunks` can be used with binary data.
This should make it easier for users to discover that (using `help -f`).

# User-Facing Changes
Help text of `chunks` updated as mentioned above.

# Tests + Formatting

- :green_circle: toolkit fmt
- :green_circle: toolkit clippy
- :green_circle: toolkit test
- :green_circle: toolkit test stdlib

# After Submitting

Should we consider mentioning commands that can work with binary input
(first, take, chunks, etc) in the help text for `bytes`?

Co-authored-by: Bahex <17417311+Bahex@users.noreply.github.com>
---
 crates/nu-command/src/filters/chunks.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/nu-command/src/filters/chunks.rs b/crates/nu-command/src/filters/chunks.rs
index 5149713644..bfac65e358 100644
--- a/crates/nu-command/src/filters/chunks.rs
+++ b/crates/nu-command/src/filters/chunks.rs
@@ -25,7 +25,7 @@ impl Command for Chunks {
     }
 
     fn description(&self) -> &str {
-        "Divide a list or table into chunks of `chunk_size`."
+        "Divide a list, table or binary input into chunks of `chunk_size`."
     }
 
     fn extra_description(&self) -> &str {
@@ -33,7 +33,7 @@ impl Command for Chunks {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["batch", "group"]
+        vec!["batch", "group", "split", "bytes"]
     }
 
     fn examples(&self) -> Vec<Example> {

From d4aeadbb446e22f595c206e55a07aed588f922c2 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Fri, 14 Feb 2025 10:19:16 -0500
Subject: [PATCH 1057/1072] Enable theming the Welcome Banner (#15095)

The banner will now use three new `$env.config.color_config` settings:
- `banner_foreground`: The primary color of the banner text
- `banner_highlight1`: Used for the first set of highlights, e.g.,
`Nushell`, `nu`, `GitHub`, et. al
- `banner_highlight2`: Used for the second set of highlights, e.g.
`Discord`, `Documentation`, et. al.

If the settings above are not defined, `banner` continues to use the
default green/purple/foreground. However, two more lines use the
purple/highlight2 in order to give more separation and consistency to
the colorization.
---
 crates/nu-std/std/prelude/mod.nu              | 33 ++++++++++---------
 .../nu-utils/src/default_files/doc_config.nu  |  7 ++++
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/crates/nu-std/std/prelude/mod.nu b/crates/nu-std/std/prelude/mod.nu
index f3c66192ed..6c72bf2791 100644
--- a/crates/nu-std/std/prelude/mod.nu
+++ b/crates/nu-std/std/prelude/mod.nu
@@ -4,29 +4,32 @@ use std/dt [datetime-diff, pretty-print-duration]
 export def banner [
     --short    # Only show startup time
 ] {
+let foreground = $env.config.color_config?.banner_foreground? | default "attr_normal"
+let highlight1 = $env.config.color_config?.banner_highlight1? | default "green"
+let highlight2 = $env.config.color_config?.banner_highlight2? | default "purple"
 let dt = (datetime-diff (date now) 2019-05-10T09:59:12-07:00)
 let ver = (version)
-let startup_time = $"(ansi green_bold)Startup Time: (ansi reset)($nu.startup-time)"
+let startup_time = $"(ansi $highlight1)(ansi attr_bold)Startup Time: (ansi reset)(ansi $foreground)($nu.startup-time)(ansi reset)"
 
 let banner_msg = match $short {
-    true => $"($startup_time)(char newline)"
+    true => $"($startup_time)(char eol)"
 
-    false => $"(ansi green)     __  ,(ansi reset)
-(ansi green) .--\(\)°'.' (ansi reset)Welcome to (ansi green)Nushell(ansi reset),
-(ansi green)'|, . ,'   (ansi reset)based on the (ansi green)nu(ansi reset) language,
-(ansi green) !_-\(_\\    (ansi reset)where all data is structured!
+    false => $"(ansi $highlight1)     __  ,(ansi reset)
+(ansi $highlight1) .--\(\)°'.' (ansi reset)(ansi $foreground)Welcome to (ansi $highlight1)Nushell(ansi reset)(ansi $foreground),(ansi reset)
+(ansi $highlight1)'|, . ,'   (ansi reset)(ansi $foreground)based on the (ansi $highlight1)nu(ansi reset)(ansi $foreground) language,(ansi reset)
+(ansi $highlight1) !_-\(_\\    (ansi reset)(ansi $foreground)where all data is structured!
 
-Version: (ansi green)($ver.version) \(($ver.build_target)\)
-Please join our (ansi purple)Discord(ansi reset) community at (ansi purple)https://discord.gg/NtAbbGn(ansi reset)
-Our (ansi green_bold)GitHub(ansi reset) repository is at (ansi green_bold)https://github.com/nushell/nushell(ansi reset)
-Our (ansi green)Documentation(ansi reset) is located at (ansi green)https://nushell.sh(ansi reset)
-And the (ansi green)Latest Nushell News(ansi reset) at (ansi green)https://nushell.sh/blog/(ansi reset)
-Learn how to remove this at: (ansi green)https://nushell.sh/book/configuration.html#remove-welcome-message(ansi reset)
+(ansi $foreground)Version: (ansi $highlight1)($ver.version) \(($ver.build_target)\)(ansi reset)
+(ansi $foreground)Please join our (ansi $highlight2)Discord(ansi reset)(ansi $foreground) community at (ansi $highlight2)https://discord.gg/NtAbbGn(ansi reset)
+(ansi $foreground)Our (ansi $highlight1)(ansi attr_bold)GitHub(ansi reset)(ansi $foreground) repository is at (ansi $highlight1)(ansi attr_bold)https://github.com/nushell/nushell(ansi reset)
+(ansi $foreground)Our (ansi $highlight2)Documentation(ansi reset)(ansi $foreground) is located at (ansi $highlight2)https://nushell.sh(ansi reset)
+(ansi $foreground)And the (ansi $highlight1)Latest Nushell News(ansi reset)(ansi $foreground) at (ansi $highlight1)https://nushell.sh/blog/(ansi reset)
+(ansi $foreground)Learn how to remove this at: (ansi $highlight2)https://nushell.sh/book/configuration.html#remove-welcome-message(ansi reset)
 
-It's been this long since (ansi green)Nushell(ansi reset)'s first commit:
-(pretty-print-duration $dt)
+(ansi $foreground)It's been this long since (ansi $highlight1)Nushell(ansi reset)(ansi $foreground)'s first commit:(ansi reset)
+(ansi $foreground)(pretty-print-duration $dt)
 
-($startup_time)
+($startup_time)(ansi reset)
 "
 }
 
diff --git a/crates/nu-utils/src/default_files/doc_config.nu b/crates/nu-utils/src/default_files/doc_config.nu
index 461878a790..0486774894 100644
--- a/crates/nu-utils/src/default_files/doc_config.nu
+++ b/crates/nu-utils/src/default_files/doc_config.nu
@@ -785,6 +785,13 @@ $env.config.color_config.empty
 # Use { attr: n } to disable.
 $env.config.color_config.leading_trailing_space_bg = { bg: 'red' }
 
+# banner_foreground: The default text style for the Welcome Banner displayed at startup
+$env.config.color_config.banner_foreground = "attr_normal"
+
+# banner_highlight1 and banner_highlight2: Colors for highlighted text in the Welcome Banner
+$env.config.color_config.banner_highlight1 = "green"
+$env.config.color_config.banner_highlight2 = "purple"
+
 # ------------------------
 # `explore` command colors
 # ------------------------

From fb7b0a8c1188282f8d4a43bcbb10e9964a200b07 Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Sat, 15 Feb 2025 00:59:46 +0800
Subject: [PATCH 1058/1072] feat(lsp): hover on external command shows manpage
 (#15115)

# Description

<img width="642" alt="image"
src="https://github.com/user-attachments/assets/a97e4f33-df12-4240-a221-d4b97a171de0"
/>

Not particularly useful, but better than showing nothing I guess. #14464

Also fixed a markdown syntax issue for mutable variable hovering

# User-Facing Changes

# Tests + Formatting

+1

# After Submitting

---------

Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
---
 crates/nu-lsp/src/ast.rs            | 61 +++++++++++++++--------------
 crates/nu-lsp/src/hints.rs          |  2 +-
 crates/nu-lsp/src/lib.rs            | 57 ++++++++++++++++++++++-----
 crates/nu-lsp/src/symbols.rs        |  6 +--
 tests/fixtures/lsp/hover/command.nu |  3 +-
 5 files changed, 85 insertions(+), 44 deletions(-)

diff --git a/crates/nu-lsp/src/ast.rs b/crates/nu-lsp/src/ast.rs
index 775093c133..91f1114060 100644
--- a/crates/nu-lsp/src/ast.rs
+++ b/crates/nu-lsp/src/ast.rs
@@ -19,6 +19,26 @@ fn strip_quotes(span: Span, working_set: &StateWorkingSet) -> Span {
     }
 }
 
+fn try_find_id_in_misc(
+    call: &Call,
+    working_set: &StateWorkingSet,
+    location: Option<&usize>,
+    id_ref: Option<&Id>,
+) -> Option<(Id, Span)> {
+    let call_name = working_set.get_span_contents(call.head);
+    match call_name {
+        b"def" | b"export def" => try_find_id_in_def(call, working_set, location, id_ref),
+        b"module" | b"export module" => try_find_id_in_mod(call, working_set, location, id_ref),
+        b"use" | b"export use" | b"hide" => {
+            try_find_id_in_use(call, working_set, location, id_ref, call_name)
+        }
+        b"overlay use" | b"overlay hide" => {
+            try_find_id_in_overlay(call, working_set, location, id_ref)
+        }
+        _ => None,
+    }
+}
+
 /// For situations like
 /// ```nushell
 /// def foo [] {}
@@ -35,10 +55,6 @@ fn try_find_id_in_def(
     location: Option<&usize>,
     id_ref: Option<&Id>,
 ) -> Option<(Id, Span)> {
-    let call_name = working_set.get_span_contents(call.head);
-    if call_name != b"def" && call_name != b"export def" {
-        return None;
-    };
     let mut span = None;
     for arg in call.arguments.iter() {
         if location.map_or(true, |pos| arg.span().contains(*pos)) {
@@ -80,10 +96,6 @@ fn try_find_id_in_mod(
     location: Option<&usize>,
     id_ref: Option<&Id>,
 ) -> Option<(Id, Span)> {
-    let call_name = working_set.get_span_contents(call.head);
-    if call_name != b"module" && call_name != b"export module" {
-        return None;
-    };
     let check_location = |span: &Span| location.map_or(true, |pos| span.contains(*pos));
 
     call.arguments.first().and_then(|arg| {
@@ -119,11 +131,8 @@ fn try_find_id_in_use(
     working_set: &StateWorkingSet,
     location: Option<&usize>,
     id: Option<&Id>,
+    call_name: &[u8],
 ) -> Option<(Id, Span)> {
-    let call_name = working_set.get_span_contents(call.head);
-    if call_name != b"use" && call_name != b"export use" && call_name != b"hide" {
-        return None;
-    }
     // TODO: for keyword `hide`, the decl/var is already hidden in working_set,
     // this function will always return None.
     let find_by_name = |name: &[u8]| match id {
@@ -223,10 +232,6 @@ fn try_find_id_in_overlay(
     location: Option<&usize>,
     id: Option<&Id>,
 ) -> Option<(Id, Span)> {
-    let call_name = working_set.get_span_contents(call.head);
-    if call_name != b"overlay use" && call_name != b"overlay hide" {
-        return None;
-    }
     let check_location = |span: &Span| location.map_or(true, |pos| span.contains(*pos));
     let module_from_overlay_name = |name: &str, span: Span| {
         let found_id = Id::Module(working_set.find_overlay(name.as_bytes())?.origin);
@@ -292,19 +297,19 @@ fn find_id_in_expr(
             if call.head.contains(*location) {
                 FindMapResult::Found((Id::Declaration(call.decl_id), call.head))
             } else {
-                try_find_id_in_def(call, working_set, Some(location), None)
-                    .or(try_find_id_in_mod(call, working_set, Some(location), None))
-                    .or(try_find_id_in_use(call, working_set, Some(location), None))
-                    .or(try_find_id_in_overlay(
-                        call,
-                        working_set,
-                        Some(location),
-                        None,
-                    ))
+                try_find_id_in_misc(call, working_set, Some(location), None)
                     .map(FindMapResult::Found)
                     .unwrap_or_default()
             }
         }
+        Expr::ExternalCall(head, _) => {
+            if head.span.contains(*location) {
+                if let Expr::GlobPattern(cmd, _) = &head.expr {
+                    return FindMapResult::Found((Id::External(cmd.clone()), head.span));
+                }
+            }
+            FindMapResult::Continue
+        }
         Expr::FullCellPath(fcp) => {
             if fcp.head.span.contains(*location) {
                 FindMapResult::Continue
@@ -383,11 +388,7 @@ fn find_reference_by_id_in_expr(
                 occurs.push(call.head);
                 return Some(occurs);
             }
-            if let Some((_, span_found)) = try_find_id_in_def(call, working_set, None, Some(id))
-                .or(try_find_id_in_mod(call, working_set, None, Some(id)))
-                .or(try_find_id_in_use(call, working_set, None, Some(id)))
-                .or(try_find_id_in_overlay(call, working_set, None, Some(id)))
-            {
+            if let Some((_, span_found)) = try_find_id_in_misc(call, working_set, None, Some(id)) {
                 occurs.push(span_found);
             }
             Some(occurs)
diff --git a/crates/nu-lsp/src/hints.rs b/crates/nu-lsp/src/hints.rs
index 564430bad2..807206a9f5 100644
--- a/crates/nu-lsp/src/hints.rs
+++ b/crates/nu-lsp/src/hints.rs
@@ -145,7 +145,7 @@ fn extract_inlay_hints_from_expression(
 
 impl LanguageServer {
     pub(crate) fn get_inlay_hints(&mut self, params: &InlayHintParams) -> Option<Vec<InlayHint>> {
-        Some(self.inlay_hints.get(&params.text_document.uri)?.clone())
+        self.inlay_hints.get(&params.text_document.uri).cloned()
     }
 
     pub(crate) fn extract_inlay_hints(
diff --git a/crates/nu-lsp/src/lib.rs b/crates/nu-lsp/src/lib.rs
index 4762cc6ed8..6d75ab0e3a 100644
--- a/crates/nu-lsp/src/lib.rs
+++ b/crates/nu-lsp/src/lib.rs
@@ -43,6 +43,7 @@ pub(crate) enum Id {
     Value(Type),
     Module(ModuleId),
     CellPath(VarId, Vec<PathMember>),
+    External(String),
 }
 
 pub struct LanguageServer {
@@ -594,14 +595,12 @@ impl LanguageServer {
                     .const_val
                     .clone()
                     .and_then(|v| v.coerce_into_string().ok())
-                    .map(|s| format!("\n---\n{}", s))
-                    .unwrap_or_default();
-                let contents = format!(
-                    "{} ```\n{}\n``` {}",
-                    if var.mutable { "mutable " } else { "" },
-                    var.ty,
-                    value
-                );
+                    .unwrap_or(String::from(if var.mutable {
+                        "mutable"
+                    } else {
+                        "immutable"
+                    }));
+                let contents = format!("```\n{}\n``` \n---\n{}", var.ty, value);
                 markdown_hover(contents)
             }
             Id::CellPath(var_id, cell_path) => {
@@ -636,6 +635,20 @@ impl LanguageServer {
                 markdown_hover(description)
             }
             Id::Value(t) => markdown_hover(format!("`{}`", t)),
+            Id::External(cmd) => {
+                let command_output = if cfg!(windows) {
+                    std::process::Command::new("powershell.exe")
+                        .args(["-NoProfile", "-Command", "help", &cmd])
+                        .output()
+                } else {
+                    std::process::Command::new("man").arg(&cmd).output()
+                };
+                let manpage_str = match command_output {
+                    Ok(output) => String::from_utf8_lossy(&output.stdout).to_string(),
+                    Err(_) => format!("No command help found for {}", &cmd),
+                };
+                markdown_hover(manpage_str)
+            }
         }
     }
 
@@ -929,7 +942,7 @@ mod tests {
 
         assert_json_eq!(
             result_from_message(resp),
-            serde_json::json!({ "contents": { "kind": "markdown", "value": " ```\ntable\n``` " } })
+            serde_json::json!({ "contents": { "kind": "markdown", "value": "```\ntable\n``` \n---\nimmutable" } })
         );
     }
 
@@ -991,6 +1004,32 @@ mod tests {
         );
     }
 
+    #[test]
+    fn hover_on_external_command() {
+        let (client_connection, _recv) = initialize_language_server(None);
+
+        let mut script = fixtures();
+        script.push("lsp");
+        script.push("hover");
+        script.push("command.nu");
+        let script = path_to_uri(&script);
+
+        open_unchecked(&client_connection, script.clone());
+        let resp = send_hover_request(&client_connection, script.clone(), 6, 2);
+
+        let hover_text = result_from_message(resp)
+            .pointer("/contents/value")
+            .unwrap()
+            .as_str()
+            .unwrap()
+            .to_string();
+
+        #[cfg(not(windows))]
+        assert!(hover_text.starts_with("SLEEP(1)"));
+        #[cfg(windows)]
+        assert!(hover_text.starts_with("NAME\r\n    Start-Sleep"));
+    }
+
     #[test]
     fn hover_on_str_join() {
         let (client_connection, _recv) = initialize_language_server(None);
diff --git a/crates/nu-lsp/src/symbols.rs b/crates/nu-lsp/src/symbols.rs
index 4383e33738..13f48b51c4 100644
--- a/crates/nu-lsp/src/symbols.rs
+++ b/crates/nu-lsp/src/symbols.rs
@@ -274,9 +274,9 @@ impl LanguageServer {
         let uri = params.text_document.uri.to_owned();
         let docs = self.docs.lock().ok()?;
         self.symbol_cache.update(&uri, &engine_state, &docs);
-        Some(DocumentSymbolResponse::Flat(
-            self.symbol_cache.get_symbols_by_uri(&uri)?,
-        ))
+        self.symbol_cache
+            .get_symbols_by_uri(&uri)
+            .map(DocumentSymbolResponse::Flat)
     }
 
     pub(crate) fn workspace_symbol(
diff --git a/tests/fixtures/lsp/hover/command.nu b/tests/fixtures/lsp/hover/command.nu
index 688eaf5f17..d9df49ba4d 100644
--- a/tests/fixtures/lsp/hover/command.nu
+++ b/tests/fixtures/lsp/hover/command.nu
@@ -1,6 +1,7 @@
 # Renders some greeting message
-def hello [] {}
+def hello [] { }
 
 hello
 
 [""] | str join
+^sleep

From 2cb059146b0da8da96a16dfd10143dcfb3cae231 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Fri, 14 Feb 2025 18:51:54 -0500
Subject: [PATCH 1059/1072] Add `buffer_editor` example with arguments in
 `config nu --doc` (#15122)

Counterpart to https://github.com/nushell/nushell.github.io/pull/1810 -
Adds an example to the `config nu --doc` for using a `buffer_editor`
with arguments.

Closes https://github.com/nushell/nushell.github.io/issues/1660 and
resolves the main issue in #14893, but we'll leave it open based on
[this
suggestion](https://github.com/nushell/nushell/issues/14893#issuecomment-2607670442)
---
 crates/nu-utils/src/default_files/doc_config.nu | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crates/nu-utils/src/default_files/doc_config.nu b/crates/nu-utils/src/default_files/doc_config.nu
index 0486774894..b5817985e4 100644
--- a/crates/nu-utils/src/default_files/doc_config.nu
+++ b/crates/nu-utils/src/default_files/doc_config.nu
@@ -97,6 +97,8 @@ $env.config.edit_mode = "emacs"
 # Tip: Set to "editor" to use the default editor on Unix platforms using
 #      the Alternatives system or equivalent
 $env.config.buffer_editor = "editor"
+# To set arguments for the editor, a list can be used:
+$env.config.buffer_editor = ["emacsclient", "-s", "light", "-t"]
 
 # cursor_shape_* (string)
 # -----------------------

From 2b8fb4fe0033242c6750655d79b3b1feb7c3fd7d Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Sat, 15 Feb 2025 18:55:33 -0500
Subject: [PATCH 1060/1072] Fix failing test when using man version 2.13.0
 (#15123)

The test added in #15115 fails on systems using later versions of `man`
(2.13.0 triggers the issue, at least). This updates the test to ignore
formatting characters.

Thanks to @fdncred and @blindFS for the debugging assistance.
---
 crates/nu-lsp/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/nu-lsp/src/lib.rs b/crates/nu-lsp/src/lib.rs
index 6d75ab0e3a..336496e719 100644
--- a/crates/nu-lsp/src/lib.rs
+++ b/crates/nu-lsp/src/lib.rs
@@ -1025,7 +1025,7 @@ mod tests {
             .to_string();
 
         #[cfg(not(windows))]
-        assert!(hover_text.starts_with("SLEEP(1)"));
+        assert!(hover_text.contains("SLEEP"));
         #[cfg(windows)]
         assert!(hover_text.starts_with("NAME\r\n    Start-Sleep"));
     }

From 273226d6662e8dc03f6a8a377cd5ad717be6b289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
 <ng.hong.quan@gmail.com>
Date: Tue, 18 Feb 2025 00:52:07 +0700
Subject: [PATCH 1061/1072] Provide more directories autocomplete for "overlay
 use" (#15057)

## Description

- Fixes #12891
- An escape for #12835

Currently, Nushell is not very friendly to Python workflow, because
Python developers very often need to activate a virtual environment, and
in some workflow, the _activate.nu_ script is not near to "current
working directory" (especially ones who use
[virtualenvwrapper](https://virtualenvwrapper.readthedocs.io/en/latest/)
and [Poetry](https://python-poetry.org/)), and hence, is not
auto-completed for `overlay use`.
Though Nu v0.102.0 has improved auto-complete for `overlay use`, it
doesn't work if user starts the file path with `~` or `/`, like:

```nu
> overlay use /h
```
```nu
> overlay use ~/W
```

### Before:


![image](https://github.com/user-attachments/assets/8b668c21-0f3a-4d6f-9cd2-8cc92460525c)

### After:


![image](https://github.com/user-attachments/assets/ca491e64-774a-48d4-8f4f-58d647e011df)


![image](https://github.com/user-attachments/assets/4e097008-b5e1-4f63-af80-c1697025d4ad)



## User-Facing Changes

No

## Tests + Formatting

Passed

---------

Co-authored-by: blindfs <blindfs19@gmail.com>
---
 .../src/completions/dotnu_completions.rs      |  76 +++++++++----
 crates/nu-cli/tests/completions/mod.rs        | 101 +++++++++++++++++-
 .../support/completions_helpers.rs            |  32 ++++--
 3 files changed, 174 insertions(+), 35 deletions(-)

diff --git a/crates/nu-cli/src/completions/dotnu_completions.rs b/crates/nu-cli/src/completions/dotnu_completions.rs
index f06b85f5ed..7bb3458fe0 100644
--- a/crates/nu-cli/src/completions/dotnu_completions.rs
+++ b/crates/nu-cli/src/completions/dotnu_completions.rs
@@ -5,7 +5,10 @@ use nu_protocol::{
     Span,
 };
 use reedline::Suggestion;
-use std::path::{is_separator, PathBuf, MAIN_SEPARATOR as SEP, MAIN_SEPARATOR_STR};
+use std::{
+    collections::HashSet,
+    path::{is_separator, PathBuf, MAIN_SEPARATOR as SEP, MAIN_SEPARATOR_STR},
+};
 
 use super::{SemanticSuggestion, SuggestionKind};
 
@@ -33,47 +36,76 @@ impl Completer for DotNuCompletion {
         let start_with_backquote = prefix_str.starts_with('`');
         let end_with_backquote = prefix_str.ends_with('`');
         let prefix_str = prefix_str.replace('`', "");
+        // e.g. `./`, `..\`, `/`
+        let not_lib_dirs = prefix_str
+            .chars()
+            .find(|c| *c != '.')
+            .is_some_and(is_separator);
         let mut search_dirs: Vec<PathBuf> = vec![];
 
-        // If prefix_str is only a word we want to search in the current dir
-        let (base, partial) = prefix_str
-            .rsplit_once(is_separator)
-            .unwrap_or((".", &prefix_str));
+        let (base, partial) = if let Some((parent, remain)) = prefix_str.rsplit_once(is_separator) {
+            // If prefix_str is only a word we want to search in the current dir.
+            // "/xx" should be split to "/" and "xx".
+            if parent.is_empty() {
+                (MAIN_SEPARATOR_STR, remain)
+            } else {
+                (parent, remain)
+            }
+        } else {
+            (".", prefix_str.as_str())
+        };
         let base_dir = base.replace(is_separator, MAIN_SEPARATOR_STR);
 
         // Fetch the lib dirs
-        let lib_dirs: Vec<PathBuf> = working_set
+        // NOTE: 2 ways to setup `NU_LIB_DIRS`
+        // 1. `const NU_LIB_DIRS = [paths]`, equal to `nu -I paths`
+        // 2. `$env.NU_LIB_DIRS = [paths]`
+        let const_lib_dirs = working_set
             .find_variable(b"$NU_LIB_DIRS")
-            .and_then(|vid| working_set.get_variable(vid).const_val.as_ref())
-            .or(working_set.get_env_var("NU_LIB_DIRS"))
-            .map(|lib_dirs| {
+            .and_then(|vid| working_set.get_variable(vid).const_val.as_ref());
+        let env_lib_dirs = working_set.get_env_var("NU_LIB_DIRS");
+        let lib_dirs: HashSet<PathBuf> = [const_lib_dirs, env_lib_dirs]
+            .into_iter()
+            .flatten()
+            .flat_map(|lib_dirs| {
                 lib_dirs
                     .as_list()
                     .into_iter()
                     .flat_map(|it| it.iter().filter_map(|x| x.to_path().ok()))
                     .map(expand_tilde)
-                    .collect()
             })
-            .unwrap_or_default();
+            .collect();
 
         // Check if the base_dir is a folder
-        // rsplit_once removes the separator
         let cwd = working_set.permanent_state.cwd(None);
         if base_dir != "." {
-            // Search in base_dir as well as lib_dirs
+            let expanded_base_dir = expand_tilde(&base_dir);
+            let is_base_dir_relative = expanded_base_dir.is_relative();
+            // Search in base_dir as well as lib_dirs.
+            // After expanded, base_dir can be a relative path or absolute path.
+            // If relative, we join "current working dir" with it to get subdirectory and add to search_dirs.
+            // If absolute, we add it to search_dirs.
             if let Ok(mut cwd) = cwd {
-                cwd.push(&base_dir);
-                search_dirs.push(cwd.into_std_path_buf());
+                if is_base_dir_relative {
+                    cwd.push(&base_dir);
+                    search_dirs.push(cwd.into_std_path_buf());
+                } else {
+                    search_dirs.push(expanded_base_dir);
+                }
+            }
+            if !not_lib_dirs {
+                search_dirs.extend(lib_dirs.into_iter().map(|mut dir| {
+                    dir.push(&base_dir);
+                    dir
+                }));
             }
-            search_dirs.extend(lib_dirs.into_iter().map(|mut dir| {
-                dir.push(&base_dir);
-                dir
-            }));
         } else {
             if let Ok(cwd) = cwd {
                 search_dirs.push(cwd.into_std_path_buf());
             }
-            search_dirs.extend(lib_dirs);
+            if !not_lib_dirs {
+                search_dirs.extend(lib_dirs);
+            }
         }
 
         // Fetch the files filtering the ones that ends with .nu
@@ -104,7 +136,9 @@ impl Completer for DotNuCompletion {
                 let mut span_offset = 0;
                 let mut value = x.path.to_string();
                 // Complete only the last path component
-                if base_dir != "." {
+                if base_dir == MAIN_SEPARATOR_STR {
+                    span_offset = base_dir.len()
+                } else if base_dir != "." {
                     span_offset = base_dir.len() + 1
                 }
                 // Retain only one '`'
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index 3e07a6e266..dfc8f3d679 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -1,20 +1,62 @@
 pub mod support;
 
+use std::{
+    fs::{read_dir, FileType, ReadDir},
+    path::{PathBuf, MAIN_SEPARATOR},
+    sync::Arc,
+};
+
 use nu_cli::NuCompleter;
 use nu_engine::eval_block;
 use nu_parser::parse;
+use nu_path::expand_tilde;
 use nu_protocol::{debugger::WithoutDebug, engine::StateWorkingSet, PipelineData};
 use reedline::{Completer, Suggestion};
 use rstest::{fixture, rstest};
-use std::{
-    path::{PathBuf, MAIN_SEPARATOR},
-    sync::Arc,
-};
 use support::{
     completions_helpers::{new_dotnu_engine, new_partial_engine, new_quote_engine},
     file, folder, match_suggestions, new_engine,
 };
 
+// Match a list of suggestions with the content of a directory.
+// This helper is for DotNutCompletion, so actually it only retrieves
+// *.nu files and subdirectories.
+pub fn match_dir_content_for_dotnu(dir: ReadDir, suggestions: &[Suggestion]) {
+    let actual_dir_entries: Vec<_> = dir.filter_map(|c| c.ok()).collect();
+    let type_name_pairs: Vec<(FileType, String)> = actual_dir_entries
+        .into_iter()
+        .filter_map(|t| t.file_type().ok().zip(t.file_name().into_string().ok()))
+        .collect();
+    let mut simple_dir_entries: Vec<&str> = type_name_pairs
+        .iter()
+        .filter_map(|(t, n)| {
+            if t.is_dir() || n.ends_with(".nu") {
+                Some(n.as_str())
+            } else {
+                None
+            }
+        })
+        .collect();
+    simple_dir_entries.sort();
+    let mut pure_suggestions: Vec<&str> = suggestions
+        .iter()
+        .map(|s| {
+            // The file names in suggestions contain some extra characters,
+            // we clean them to compare more exactly with read_dir result.
+            s.value
+                .as_str()
+                .trim_end_matches('`')
+                .trim_end_matches('/')
+                .trim_end_matches('\\')
+                .trim_start_matches('`')
+                .trim_start_matches("~/")
+                .trim_start_matches("~\\")
+        })
+        .collect();
+    pure_suggestions.sort();
+    assert_eq!(simple_dir_entries, pure_suggestions);
+}
+
 #[fixture]
 fn completer() -> NuCompleter {
     // Create a new engine
@@ -343,6 +385,57 @@ fn dotnu_completions() {
     let suggestions = completer.complete(&completion_str, completion_str.len());
 
     match_suggestions(&expected, &suggestions);
+
+    // Test special paths
+    #[cfg(windows)]
+    {
+        let completion_str = "use \\".to_string();
+        let dir_content = read_dir("\\").unwrap();
+        let suggestions = completer.complete(&completion_str, completion_str.len());
+        match_dir_content_for_dotnu(dir_content, &suggestions);
+    }
+
+    let completion_str = "use /".to_string();
+    let suggestions = completer.complete(&completion_str, completion_str.len());
+    let dir_content = read_dir("/").unwrap();
+    match_dir_content_for_dotnu(dir_content, &suggestions);
+
+    let completion_str = "use ~".to_string();
+    let dir_content = read_dir(expand_tilde("~")).unwrap();
+    let suggestions = completer.complete(&completion_str, completion_str.len());
+    match_dir_content_for_dotnu(dir_content, &suggestions);
+}
+
+#[test]
+fn dotnu_completions_const_nu_lib_dirs() {
+    let (_, _, engine, stack) = new_dotnu_engine();
+    let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
+
+    // file in `lib-dir1/`, set by `const NU_LIB_DIRS`
+    let completion_str = "use xyzz".to_string();
+    let suggestions = completer.complete(&completion_str, completion_str.len());
+    match_suggestions(&vec!["xyzzy.nu".into()], &suggestions);
+
+    // file in `lib-dir2/`, set by `$env.NU_LIB_DIRS`
+    let completion_str = "use asdf".to_string();
+    let suggestions = completer.complete(&completion_str, completion_str.len());
+    match_suggestions(&vec!["asdf.nu".into()], &suggestions);
+
+    // file in `lib-dir3/`, set by both, should not replicate
+    let completion_str = "use spam".to_string();
+    let suggestions = completer.complete(&completion_str, completion_str.len());
+    match_suggestions(&vec!["spam.nu".into()], &suggestions);
+
+    // if `./` specified by user, file in `lib-dir*` should be ignored
+    #[cfg(windows)]
+    {
+        let completion_str = "use .\\asdf".to_string();
+        let suggestions = completer.complete(&completion_str, completion_str.len());
+        assert!(suggestions.is_empty());
+    }
+    let completion_str = "use ./asdf".to_string();
+    let suggestions = completer.complete(&completion_str, completion_str.len());
+    assert!(suggestions.is_empty());
 }
 
 #[test]
diff --git a/crates/nu-cli/tests/completions/support/completions_helpers.rs b/crates/nu-cli/tests/completions/support/completions_helpers.rs
index 83e4dfddf3..ed541997a3 100644
--- a/crates/nu-cli/tests/completions/support/completions_helpers.rs
+++ b/crates/nu-cli/tests/completions/support/completions_helpers.rs
@@ -86,6 +86,23 @@ pub fn new_dotnu_engine() -> (AbsolutePathBuf, String, EngineState, Stack) {
     // Add $nu
     engine_state.generate_nu_constant();
 
+    // const $NU_LIB_DIRS
+    let mut working_set = StateWorkingSet::new(&engine_state);
+    let var_id = working_set.add_variable(
+        b"$NU_LIB_DIRS".into(),
+        Span::unknown(),
+        nu_protocol::Type::List(Box::new(nu_protocol::Type::String)),
+        false,
+    );
+    working_set.set_variable_const_val(
+        var_id,
+        Value::test_list(vec![
+            Value::string(file(dir.join("lib-dir1")), dir_span),
+            Value::string(file(dir.join("lib-dir3")), dir_span),
+        ]),
+    );
+    let _ = engine_state.merge_delta(working_set.render());
+
     // New stack
     let mut stack = Stack::new();
 
@@ -95,17 +112,12 @@ pub fn new_dotnu_engine() -> (AbsolutePathBuf, String, EngineState, Stack) {
         "TEST".to_string(),
         Value::string("NUSHELL".to_string(), dir_span),
     );
-
     stack.add_env_var(
-        "NU_LIB_DIRS".to_string(),
-        Value::list(
-            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),
-            ],
-            dir_span,
-        ),
+        "NU_LIB_DIRS".into(),
+        Value::test_list(vec![
+            Value::string(file(dir.join("lib-dir2")), dir_span),
+            Value::string(file(dir.join("lib-dir3")), dir_span),
+        ]),
     );
 
     // Merge environment into the permanent state

From 5d1e2b1df1fcb385146a531332b0335f02dc5b02 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Mon, 17 Feb 2025 14:10:38 -0500
Subject: [PATCH 1062/1072] Replace "function" with "command" in several
 user-facing doc (#15129)

---
 .../nu-cmd-lang/src/core_commands/return_.rs  |  2 +-
 crates/nu-std/std/assert/mod.nu               |  1 -
 crates/nu-std/std/formats/mod.nu              | 20 ++++----
 crates/nu-std/std/iter/mod.nu                 | 47 ++++++++++---------
 crates/nu-std/std/log/mod.nu                  |  4 +-
 crates/nu-std/std/mod.nu                      |  2 +-
 crates/nu-std/std/prelude/mod.nu              |  2 +-
 crates/nu-std/std/util/mod.nu                 |  6 +--
 crates/nu-std/std/xml/mod.nu                  |  7 ++-
 9 files changed, 44 insertions(+), 47 deletions(-)

diff --git a/crates/nu-cmd-lang/src/core_commands/return_.rs b/crates/nu-cmd-lang/src/core_commands/return_.rs
index 86863cd3d0..2569d81dfe 100644
--- a/crates/nu-cmd-lang/src/core_commands/return_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/return_.rs
@@ -10,7 +10,7 @@ impl Command for Return {
     }
 
     fn description(&self) -> &str {
-        "Return early from a function."
+        "Return early from a custom command."
     }
 
     fn signature(&self) -> nu_protocol::Signature {
diff --git a/crates/nu-std/std/assert/mod.nu b/crates/nu-std/std/assert/mod.nu
index 8d10e1e34b..297e66ba52 100644
--- a/crates/nu-std/std/assert/mod.nu
+++ b/crates/nu-std/std/assert/mod.nu
@@ -32,7 +32,6 @@ export def main [
     }
 }
 
-
 # Negative assertion
 #
 # If the condition is not false, it generates an error.
diff --git a/crates/nu-std/std/formats/mod.nu b/crates/nu-std/std/formats/mod.nu
index a0484e42f4..429b867741 100644
--- a/crates/nu-std/std/formats/mod.nu
+++ b/crates/nu-std/std/formats/mod.nu
@@ -1,40 +1,40 @@
 # formats.nu
 #
-# This file contains functions for formatting data in various ways.
+# This file contains helpers for formatting data in various ways.
 #
 # Usage:
-#   use std format *
-#   use std format <function name>
+#   use std/format *
+#   use std/format <command name>
 #
-# These functions help `open` the files with unsupported extensions such as ndjson.
+# These custom commands help `open` the files with unsupported extensions such as ndjson.
 #
 
-# Convert from [NDJSON](https://github.com/ndjson/ndjson-spec) to structured data.
+# Convert from NDJSON (https://github.com/ndjson/ndjson-spec) to structured data.
 export def "from ndjson" []: string -> any {
     from json --objects
 }
 
-# Convert from [JSONL](https://jsonlines.org/) to structured data.
+# Convert from JSONL (https://jsonlines.org/) to structured data.
 export def "from jsonl" []: string -> any {
     from json --objects
 }
 
-# Convert structured data to [NDJSON](https://github.com/ndjson/ndjson-spec).
+# Convert structured data to NDJSON (https://github.com/ndjson/ndjson-spec).
 export def "to ndjson" []: any -> string {
     each { to json --raw } | to text
 }
 
-# Convert structured data to [JSONL](https://jsonlines.org/).
+# Convert structured data to JSONL (https://jsonlines.org/).
 export def "to jsonl" []: any -> string {
     each { to json --raw } | to text
 }
 
-# Convert from NDNUON (newline-delimited NUON), to structured data
+# Convert from NDNUON (newline-delimited NUON) to structured data
 export def "from ndnuon" []: [string -> any] {
     lines | each { from nuon }
 }
 
-# Convert structured data to NDNUON, i.e. newline-delimited NUON
+# Convert structured data to newline-delimited NUON (NDNUON)
 export def "to ndnuon" []: [any -> string] {
     each { to nuon --raw | str replace --all "\n" '\n' } | to text
 }
diff --git a/crates/nu-std/std/iter/mod.nu b/crates/nu-std/std/iter/mod.nu
index d96852882c..2278c1d8af 100644
--- a/crates/nu-std/std/iter/mod.nu
+++ b/crates/nu-std/std/iter/mod.nu
@@ -1,19 +1,16 @@
 # | Filter Extensions
 # 
-# This module implements extensions to the `filters` commands
+# This module implements extensions to the `filters` commands.
 #
-# They are prefixed with `iter` so as to avoid conflicts with 
-# the inbuilt filters
+# They are prefixed with `iter` so as to avoid conflicts with the inbuilt filters.
 
-# Returns the first element of the list that matches the
-# closure predicate, `null` otherwise
+# Returns the first element of the list that matches the closure predicate, `null` otherwise
 #
 # # Invariant
-# > The closure has to be a predicate (returning a bool value)
-# > else `null` is returned
-# > The closure also has to be valid for the types it receives
-# > These will be flagged as errors later as closure annotations
-# > are implemented
+#
+# The closure must be a predicate (returning a bool value), otherwise `null` is returned.
+# The closure also has to be valid for the types it receives.
+# These will be flagged as errors later as closure annotations are implemented.
 @example "Find an element starting with 'a'" {
     ["shell", "abc", "around", "nushell", "std"] | iter find {|e| $e starts-with "a" }
 } --result "abc"
@@ -24,11 +21,11 @@ export def find [
     filter {|e| try {do $fn $e} } | try { first }
 }
 
-# Returns the index of the first element that matches the predicate or
-# -1 if none
+# Returns the index of the first element that matches the predicate or -1 if none
 #
 # # Invariant
-# > The closure has to return a bool
+#
+# The closure must return a bool
 @example "Find the index of an element starting with 's'" {
     ["iter", "abc", "shell", "around", "nushell", "std"] | iter find-index {|x| $x starts-with 's'}
 } --result 2
@@ -43,8 +40,7 @@ export def find-index [
     | try { get index } catch { -1 }
 }
 
-# Returns a new list with the separator between adjacent
-# items of the original list
+# Returns a new list with the separator between adjacent items of the original list
 @example "Intersperse the list with `0`" {
     [1 2 3 4] | iter intersperse 0
 } --result [1 0 2 0 3 0 4]
@@ -60,11 +56,14 @@ export def intersperse [
     }
 }
 
-# Returns a list of intermediate steps performed by `reduce`
-# (`fold`). It takes two arguments, an initial value to seed the
-# initial state and a closure that takes two arguments, the first
-# being the list element in the current iteration and the second
-# the internal state.
+# Returns a list of intermediate steps performed by `reduce` (`fold`).
+#
+# It takes two arguments:
+# * an initial value to seed the initial state
+# * a closure that takes two arguments
+#   1. the list element in the current iteration
+#   2. the internal state
+#
 # The internal state is also provided as pipeline input.
 @example "Get a running sum of the input list" {
     [1 2 3] | iter scan 0 {|x, y| $x + $y}
@@ -84,9 +83,11 @@ export def scan [ # -> list<any>
     | if not $noinit { prepend $init } else { }
 }
 
-# Returns a list of values for which the supplied closure does not
-# return `null` or an error. It is equivalent to 
-#     `$in | each $fn | filter $fn`
+# Returns a list of values for which the supplied closure does not return `null` or an error.
+#
+# This is equivalent to 
+#
+#     $in | each $fn | filter $fn
 @example "Get the squares of elements that can be squared" {
     [2 5 "4" 7] | iter filter-map {|e| $e ** 2}
 } --result [4, 25, 49]
diff --git a/crates/nu-std/std/log/mod.nu b/crates/nu-std/std/log/mod.nu
index 2af8c1d7b7..6686301dd8 100644
--- a/crates/nu-std/std/log/mod.nu
+++ b/crates/nu-std/std/log/mod.nu
@@ -77,7 +77,6 @@ def log-types [] {
     )
 }
 
-
 def parse-string-level [
     level: string
 ] {
@@ -96,7 +95,6 @@ def parse-string-level [
     }
 }
 
-
 def parse-int-level [
     level: int,
     --short (-s)
@@ -320,6 +318,6 @@ def "nu-complete log-level" [] {
 
 # Change logging level
 export def --env set-level [level: int@"nu-complete log-level"] {
-    # Keep it as a string so it  can be passed to child processes
+    # Keep it as a string so it can be passed to child processes
     $env.NU_LOG_LEVEL = $level | into string
 }
diff --git a/crates/nu-std/std/mod.nu b/crates/nu-std/std/mod.nu
index 3251b8cc61..9c45021f1c 100644
--- a/crates/nu-std/std/mod.nu
+++ b/crates/nu-std/std/mod.nu
@@ -1,4 +1,4 @@
-# std.nu, `used` to load all standard library components
+# std.nu, `use`d to load all standard library components
 
 # Top-level commands: ellie, repeat, null-device, and "path add"
 export use std/util *
diff --git a/crates/nu-std/std/prelude/mod.nu b/crates/nu-std/std/prelude/mod.nu
index 6c72bf2791..2080d3348e 100644
--- a/crates/nu-std/std/prelude/mod.nu
+++ b/crates/nu-std/std/prelude/mod.nu
@@ -1,6 +1,6 @@
 use std/dt [datetime-diff, pretty-print-duration]
 
-# Print a banner for nushell with information about the project
+# Print a banner for Nushell with information about the project
 export def banner [
     --short    # Only show startup time
 ] {
diff --git a/crates/nu-std/std/util/mod.nu b/crates/nu-std/std/util/mod.nu
index 5b196c0892..c25af22542 100644
--- a/crates/nu-std/std/util/mod.nu
+++ b/crates/nu-std/std/util/mod.nu
@@ -55,7 +55,7 @@ export def --env "path add" [
     }
 }
 
-# the cute and friendly mascot of Nushell :)
+# The cute and friendly mascot of Nushell :)
 export def ellie [] {
     let ellie = [
         "     __  ,",
@@ -67,7 +67,7 @@ export def ellie [] {
     $ellie | str join "\n" | $"(ansi green)($in)(ansi reset)"
 }
 
-# repeat anything a bunch of times, yielding a list of *n* times the input
+# Repeat anything a bunch of times, yielding a list of *n* times the input
 @example "repeat a string" {
     "foo" | std repeat 3 | str join
 } --result "foofoofoo"
@@ -101,7 +101,7 @@ export const null_device = if $nu.os-info.name == "windows" {
 	'/dev/null'
 }
 
-# return a null device file.
+# Return a null device file.
 @example "run a command and ignore it's stderr output" {
     cat xxx.txt e> (null-device)
 }
diff --git a/crates/nu-std/std/xml/mod.nu b/crates/nu-std/std/xml/mod.nu
index a6e308266f..6cf8159afd 100644
--- a/crates/nu-std/std/xml/mod.nu
+++ b/crates/nu-std/std/xml/mod.nu
@@ -1,5 +1,4 @@
-# Utility functions to read, change and create XML data in format supported
-# by `to xml` and `from xml` commands
+# Custom commands to read, change and create XML data in format supported by the `to xml` and `from xml` commands
 
 # Get all xml entries matching simple xpath-inspired query
 export def xaccess [
@@ -152,7 +151,7 @@ def xupdate-internal [ path: list updater: closure ] {
 
 }
 
-# Update xml data entries matching simple xpath-inspired query
+# Update XML data entries matching simple xpath-inspired query
 export def xupdate [
     path: list  # List of steps. Each step can be a
                 # 1. String with tag name. Finds all children with specified name. Equivalent to `child::A` in xpath
@@ -164,7 +163,7 @@ export def xupdate [
     {tag:? attributes:? content: [$in]} | xupdate-internal $path $updater | get content.0
 }
 
-# Get type of an xml entry
+# Get type of an XML entry
 #
 # Possible types are 'tag', 'text', 'pi' and 'comment'
 export def xtype [] {

From 7636963732a29f7682461e4c6edda14989770f60 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Tue, 18 Feb 2025 15:35:52 -0600
Subject: [PATCH 1063/1072] add `attr category` `@category` to custom command
 attributes (#15137)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Description

This PR adds the `@category` attribute to nushell for use with custom
commands.

### Example Code
```nushell
# Some example with category
@category "math"
@search-terms "addition"
@example "add two numbers together" {
    blah 5 6
} --result 11
def blah [
  a: int # First number to add
  b: int # Second number to add
  ] {
    $a + $b
}
```
#### Source & Help
```nushell
❯ source blah.nu
❯ help blah
Some example with category

Search terms: addition

Usage:
  > blah <a> <b>

Flags:
  -h, --help: Display the help message for this command

Parameters:
  a <int>: First number to add
  b <int>: Second number to add

Input/output types:
  ╭─#─┬─input─┬─output─╮
  │ 0 │ any   │ any    │
  ╰───┴───────┴────────╯

Examples:
  add two numbers together
  > blah 5 6
  11
```
#### Show the category
```nushell
❯ help commands | where name == blah
╭─#─┬─name─┬─category─┬─command_type─┬────────description─────────┬─────params─────┬──input_output──┬─search_terms─┬─is_const─╮
│ 0 │ blah │ math     │ custom       │ Some example with category │ [table 3 rows] │ [list 0 items] │ addition     │ false    │
╰───┴──────┴──────────┴──────────────┴────────────────────────────┴────────────────┴────────────────┴──────────────┴──────────╯
```

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->

/cc @Bahex
---
 crates/nu-cli/tests/completions/mod.rs        |  2 +-
 .../src/core_commands/attr/category.rs        | 61 +++++++++++++++++++
 .../nu-cmd-lang/src/core_commands/attr/mod.rs |  2 +
 crates/nu-cmd-lang/src/default_context.rs     |  1 +
 crates/nu-lsp/src/lib.rs                      |  2 +-
 crates/nu-parser/src/parse_keywords.rs        | 33 ++++++++--
 crates/nu-protocol/src/signature.rs           | 37 +++++++++++
 7 files changed, 132 insertions(+), 6 deletions(-)
 create mode 100644 crates/nu-cmd-lang/src/core_commands/attr/category.rs

diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index dfc8f3d679..d97916f2c9 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -1317,7 +1317,7 @@ fn attribute_completions() {
     let suggestions = completer.complete("@", 1);
 
     // Only checking for the builtins and not the std attributes
-    let expected: Vec<String> = vec!["example".into(), "search-terms".into()];
+    let expected: Vec<String> = vec!["category".into(), "example".into(), "search-terms".into()];
 
     // Match results
     match_suggestions(&expected, &suggestions);
diff --git a/crates/nu-cmd-lang/src/core_commands/attr/category.rs b/crates/nu-cmd-lang/src/core_commands/attr/category.rs
new file mode 100644
index 0000000000..1633f43f28
--- /dev/null
+++ b/crates/nu-cmd-lang/src/core_commands/attr/category.rs
@@ -0,0 +1,61 @@
+use nu_engine::command_prelude::*;
+
+#[derive(Clone)]
+pub struct AttrCategory;
+
+impl Command for AttrCategory {
+    fn name(&self) -> &str {
+        "attr category"
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::build("attr category")
+            .input_output_type(Type::Nothing, Type::list(Type::String))
+            .allow_variants_without_examples(true)
+            .required(
+                "category",
+                SyntaxShape::String,
+                "Category of the custom command.",
+            )
+            .category(Category::Core)
+    }
+
+    fn description(&self) -> &str {
+        "Attribute for adding a category to custom commands."
+    }
+
+    fn run(
+        &self,
+        engine_state: &EngineState,
+        stack: &mut Stack,
+        call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let arg: String = call.req(engine_state, stack, 0)?;
+        Ok(Value::string(arg, call.head).into_pipeline_data())
+    }
+
+    fn run_const(
+        &self,
+        working_set: &StateWorkingSet,
+        call: &Call,
+        _input: PipelineData,
+    ) -> Result<PipelineData, ShellError> {
+        let arg: String = call.req_const(working_set, 0)?;
+        Ok(Value::string(arg, call.head).into_pipeline_data())
+    }
+
+    fn is_const(&self) -> bool {
+        true
+    }
+
+    fn examples(&self) -> Vec<Example> {
+        vec![Example {
+            description: "Add a category to a custom command",
+            example: r###"# Double numbers
+    @category math
+    def double []: [number -> number] { $in * 2 }"###,
+            result: None,
+        }]
+    }
+}
diff --git a/crates/nu-cmd-lang/src/core_commands/attr/mod.rs b/crates/nu-cmd-lang/src/core_commands/attr/mod.rs
index 0d2a0e6d3c..6d8c641b35 100644
--- a/crates/nu-cmd-lang/src/core_commands/attr/mod.rs
+++ b/crates/nu-cmd-lang/src/core_commands/attr/mod.rs
@@ -1,5 +1,7 @@
+mod category;
 mod example;
 mod search_terms;
 
+pub use category::AttrCategory;
 pub use example::AttrExample;
 pub use search_terms::AttrSearchTerms;
diff --git a/crates/nu-cmd-lang/src/default_context.rs b/crates/nu-cmd-lang/src/default_context.rs
index f98f7ee39a..8929f75fa0 100644
--- a/crates/nu-cmd-lang/src/default_context.rs
+++ b/crates/nu-cmd-lang/src/default_context.rs
@@ -16,6 +16,7 @@ pub fn create_default_context() -> EngineState {
         // Core
         bind_command! {
             Alias,
+            AttrCategory,
             AttrExample,
             AttrSearchTerms,
             Break,
diff --git a/crates/nu-lsp/src/lib.rs b/crates/nu-lsp/src/lib.rs
index 336496e719..4e1f4d37ff 100644
--- a/crates/nu-lsp/src/lib.rs
+++ b/crates/nu-lsp/src/lib.rs
@@ -1027,7 +1027,7 @@ mod tests {
         #[cfg(not(windows))]
         assert!(hover_text.contains("SLEEP"));
         #[cfg(windows)]
-        assert!(hover_text.starts_with("NAME\r\n    Start-Sleep"));
+        assert!(hover_text.contains("Start-Sleep"));
     }
 
     #[test]
diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs
index dbe8c7292c..31dfbb6ea3 100644
--- a/crates/nu-parser/src/parse_keywords.rs
+++ b/crates/nu-parser/src/parse_keywords.rs
@@ -12,6 +12,7 @@ use nu_protocol::{
         Argument, AttributeBlock, Block, Call, Expr, Expression, ImportPattern, ImportPatternHead,
         ImportPatternMember, Pipeline, PipelineElement,
     },
+    category_from_string,
     engine::{StateWorkingSet, DEFAULT_OVERLAY_NAME},
     eval_const::eval_constant,
     parser_path::ParserPath,
@@ -520,7 +521,7 @@ fn parse_def_inner(
 
     let (desc, extra_desc) = working_set.build_desc(&lite_command.comments);
 
-    let (attribute_vals, examples, search_terms) =
+    let (attribute_vals, examples, search_terms, category) =
         handle_special_attributes(attributes, working_set);
 
     // Checking that the function is used with the correct name
@@ -733,6 +734,7 @@ fn parse_def_inner(
             signature.extra_description = extra_desc;
             signature.allows_unknown_args = has_wrapped;
             signature.search_terms = search_terms;
+            signature.category = category_from_string(&category);
 
             *declaration = signature
                 .clone()
@@ -786,7 +788,7 @@ fn parse_extern_inner(
 
     let (description, extra_description) = working_set.build_desc(&lite_command.comments);
 
-    let (attribute_vals, examples, search_terms) =
+    let (attribute_vals, examples, search_terms, category) =
         handle_special_attributes(attributes, working_set);
 
     // Checking that the function is used with the correct name
@@ -891,6 +893,7 @@ fn parse_extern_inner(
                 signature.extra_description = extra_description;
                 signature.search_terms = search_terms;
                 signature.allows_unknown_args = true;
+                signature.category = category_from_string(&category);
 
                 if let Some(block_id) = body.and_then(|x| x.as_block()) {
                     if signature.rest_positional.is_none() {
@@ -947,13 +950,20 @@ fn parse_extern_inner(
     Expression::new(working_set, Expr::Call(call), call_span, Type::Any)
 }
 
+#[allow(clippy::type_complexity)]
 fn handle_special_attributes(
     attributes: Vec<(String, Value)>,
     working_set: &mut StateWorkingSet<'_>,
-) -> (Vec<(String, Value)>, Vec<CustomExample>, Vec<String>) {
+) -> (
+    Vec<(String, Value)>,
+    Vec<CustomExample>,
+    Vec<String>,
+    String,
+) {
     let mut attribute_vals = vec![];
     let mut examples = vec![];
     let mut search_terms = vec![];
+    let mut category = String::new();
 
     for (name, value) in attributes {
         let val_span = value.span();
@@ -986,12 +996,27 @@ fn handle_special_attributes(
                     working_set.error(e.wrap(working_set, val_span));
                 }
             },
+            "category" => match <String>::from_value(value) {
+                Ok(term) => {
+                    category.push_str(&term);
+                }
+                Err(_) => {
+                    let e = ShellError::GenericError {
+                        error: "nu::shell::invalid_category".into(),
+                        msg: "Value couldn't be converted to category".into(),
+                        span: Some(val_span),
+                        help: Some("Is `attr category` shadowed?".into()),
+                        inner: vec![],
+                    };
+                    working_set.error(e.wrap(working_set, val_span));
+                }
+            },
             _ => {
                 attribute_vals.push((name, value));
             }
         }
     }
-    (attribute_vals, examples, search_terms)
+    (attribute_vals, examples, search_terms, category)
 }
 
 fn check_alias_name<'a>(working_set: &mut StateWorkingSet, spans: &'a [Span]) -> Option<&'a Span> {
diff --git a/crates/nu-protocol/src/signature.rs b/crates/nu-protocol/src/signature.rs
index bc975848f8..8405846eb2 100644
--- a/crates/nu-protocol/src/signature.rs
+++ b/crates/nu-protocol/src/signature.rs
@@ -113,6 +113,43 @@ impl std::fmt::Display for Category {
     }
 }
 
+pub fn category_from_string(category: &str) -> Category {
+    match category {
+        "bits" => Category::Bits,
+        "bytes" => Category::Bytes,
+        "chart" => Category::Chart,
+        "conversions" => Category::Conversions,
+        // Let's protect our own "core" commands by preventing scripts from having this category.
+        "core" => Category::Custom("custom_core".to_string()),
+        "database" => Category::Database,
+        "date" => Category::Date,
+        "debug" => Category::Debug,
+        "default" => Category::Default,
+        "deprecated" => Category::Deprecated,
+        "removed" => Category::Removed,
+        "env" => Category::Env,
+        "experimental" => Category::Experimental,
+        "filesystem" => Category::FileSystem,
+        "filter" => Category::Filters,
+        "formats" => Category::Formats,
+        "generators" => Category::Generators,
+        "hash" => Category::Hash,
+        "history" => Category::History,
+        "math" => Category::Math,
+        "misc" => Category::Misc,
+        "network" => Category::Network,
+        "path" => Category::Path,
+        "platform" => Category::Platform,
+        "plugin" => Category::Plugin,
+        "random" => Category::Random,
+        "shells" => Category::Shells,
+        "strings" => Category::Strings,
+        "system" => Category::System,
+        "viewers" => Category::Viewers,
+        _ => Category::Custom(category.to_string()),
+    }
+}
+
 /// Signature information of a [`Command`]
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct Signature {

From f8ac9db15bf9c4a56fdbcc413eca82ea50da2833 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Wed, 19 Feb 2025 07:34:13 -0600
Subject: [PATCH 1064/1072] update to the latest reedline (#15139)

# Description

This PR updates nushell to the latest reedline commit
[4ca1ed9](https://github.com/nushell/reedline/commit/4ca1ed960f8b3a1c9c28e1b5dbfd9e2fd6ae3907)

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.lock | 3 +--
 Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6802f81e72..1be8d8902c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5809,8 +5809,7 @@ dependencies = [
 [[package]]
 name = "reedline"
 version = "0.38.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bfa8cb0ad84c396c936d8abb814703d7042a433d2da75a0c7060cbdc89109f3"
+source = "git+https://github.com/nushell/reedline?branch=main#4ca1ed960f8b3a1c9c28e1b5dbfd9e2fd6ae3907"
 dependencies = [
  "arboard",
  "chrono",
diff --git a/Cargo.toml b/Cargo.toml
index 259e4c1371..64e54b192e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -324,7 +324,7 @@ 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`

From 8b46ba8b6bb0b2e8a40c0cd1b3bab1b5db3a2717 Mon Sep 17 00:00:00 2001
From: "A. Taha Baki" <atahabaki.dev@pm.me>
Date: Wed, 19 Feb 2025 16:35:10 +0300
Subject: [PATCH 1065/1072] Feature+: Bracoxide Zero Padding for Numeric Ranges
 (#15125)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

adds feature spécified in bracoxide#6

```
$ echo {01..10}
01 02 03 04 05 06 07 08 09 10
$ echo {1..010}
001 002 003 004 005 006 007 008 009 010
```

I'm going to update the examples, but I'm currently on mobile. Will land
in a couple of days.
---
 Cargo.lock                                   |  4 ++--
 Cargo.toml                                   |  2 +-
 crates/nu-command/src/strings/str_/expand.rs | 19 +++++++++++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1be8d8902c..c580a197d6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -752,9 +752,9 @@ dependencies = [
 
 [[package]]
 name = "bracoxide"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc0bcb5424e8e1f29c21a00f2d222df5e8e9779732ff03f840315d8fbac708e"
+checksum = "7f52991c481aa9d7518254cfb6ce5726d24ff8c5d383d6422cd3793729b0962a"
 
 [[package]]
 name = "brotli"
diff --git a/Cargo.toml b/Cargo.toml
index 64e54b192e..d1950edf0f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -66,7 +66,7 @@ alphanumeric-sort = "1.5"
 ansi-str = "0.8"
 anyhow = "1.0.82"
 base64 = "0.22.1"
-bracoxide = "0.1.4"
+bracoxide = "0.1.5"
 brotli = "7.0"
 byteorder = "1.5"
 bytes = "1"
diff --git a/crates/nu-command/src/strings/str_/expand.rs b/crates/nu-command/src/strings/str_/expand.rs
index 34d2feb7d8..ea98f887ad 100644
--- a/crates/nu-command/src/strings/str_/expand.rs
+++ b/crates/nu-command/src/strings/str_/expand.rs
@@ -175,6 +175,25 @@ impl Command for SubCommand {
                     ],
                     Span::test_data()
                 )),
+            },
+
+            Example {
+                description: "Supports zero padding in numeric ranges.",
+                example: "\"A{08..10}B{11..013}C\" | str expand",
+                result: Some(Value::list(
+                    vec![
+                        Value::test_string("A08B011C"),
+                        Value::test_string("A08B012C"),
+                        Value::test_string("A08B013C"),
+                        Value::test_string("A09B011C"),
+                        Value::test_string("A09B012C"),
+                        Value::test_string("A09B013C"),
+                        Value::test_string("A10B011C"),
+                        Value::test_string("A10B012C"),
+                        Value::test_string("A10B013C"),
+                    ],
+                    Span::test_data()
+                )),
             }
         ]
     }

From c504c93a1d16caf2c62a398999202cf895e69609 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Wed, 19 Feb 2025 09:47:21 -0800
Subject: [PATCH 1066/1072] Polars: Minor code cleanup (#15144)

# Description
Removing todos and deadcode from a previous refactor
---
 crates/nu_plugin_polars/src/cache/mod.rs              | 4 ++--
 crates/nu_plugin_polars/src/dataframe/values/utils.rs | 6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/crates/nu_plugin_polars/src/cache/mod.rs b/crates/nu_plugin_polars/src/cache/mod.rs
index 0fbf49f46f..49a76927e5 100644
--- a/crates/nu_plugin_polars/src/cache/mod.rs
+++ b/crates/nu_plugin_polars/src/cache/mod.rs
@@ -197,11 +197,11 @@ mod test {
 
     impl EngineWrapper for &MockEngineWrapper {
         fn get_env_var(&self, _key: &str) -> Option<String> {
-            todo!()
+            unimplemented!()
         }
 
         fn use_color(&self) -> bool {
-            todo!()
+            unimplemented!()
         }
 
         fn set_gc_disabled(&self, disabled: bool) -> Result<(), ShellError> {
diff --git a/crates/nu_plugin_polars/src/dataframe/values/utils.rs b/crates/nu_plugin_polars/src/dataframe/values/utils.rs
index 52704b82cf..5db17afbee 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/utils.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/utils.rs
@@ -6,8 +6,6 @@ pub const DEFAULT_ROWS: usize = 5;
 
 // Converts a Vec<Value> to a Vec<Spanned<String>> with a Span marking the whole
 // location of the columns for error referencing
-// todo - fix
-#[allow(dead_code)]
 pub(crate) fn convert_columns(
     columns: Vec<Value>,
     span: Span,
@@ -49,8 +47,6 @@ pub(crate) fn convert_columns(
 
 // Converts a Vec<Value> to a Vec<String> with a Span marking the whole
 // location of the columns for error referencing
-// todo - fix
-#[allow(dead_code)]
 pub(crate) fn convert_columns_string(
     columns: Vec<Value>,
     span: Span,
@@ -92,8 +88,6 @@ pub(crate) fn convert_columns_string(
 
 // Converts a Vec<Value> to a Vec<String> with a Span marking the whole
 // location of the columns for error referencing
-// todo - fix
-#[allow(dead_code)]
 pub(crate) fn convert_columns_sm_str(
     columns: Vec<Value>,
     span: Span,

From 3d58c3f70e45797e92160388964ec71562d331db Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Wed, 19 Feb 2025 19:50:57 -0800
Subject: [PATCH 1067/1072] Expose flag to not maintain order on `polars
 concat` (#15145)

---
 .../src/dataframe/command/data/concat.rs                 | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/crates/nu_plugin_polars/src/dataframe/command/data/concat.rs b/crates/nu_plugin_polars/src/dataframe/command/data/concat.rs
index b2d24034f8..5757ec3a22 100644
--- a/crates/nu_plugin_polars/src/dataframe/command/data/concat.rs
+++ b/crates/nu_plugin_polars/src/dataframe/command/data/concat.rs
@@ -34,6 +34,11 @@ impl PluginCommand for ConcatDF {
             .switch("rechunk", "Rechunk the resulting dataframe", None)
             .switch("to-supertypes", "Cast to supertypes", None)
             .switch("diagonal", "Concatenate dataframes diagonally", None)
+            .switch(
+                "no-maintain-order",
+                "Do not maintain order. The default behavior is to maintain order.",
+                None,
+            )
             .switch(
                 "from-partitioned-ds",
                 "Concatenate dataframes from a partitioned dataset",
@@ -109,6 +114,7 @@ fn command_lazy(
     let to_supertypes = call.has_flag("to-supertypes")?;
     let diagonal = call.has_flag("diagonal")?;
     let from_partitioned_ds = call.has_flag("from-partitioned-ds")?;
+    let maintain_order = !call.has_flag("no-maintain-order")?;
     let mut dataframes = call
         .rest::<Value>(0)?
         .iter()
@@ -133,8 +139,7 @@ fn command_lazy(
             to_supertypes,
             diagonal,
             from_partitioned_ds,
-            // todo - expose maintain order
-            ..Default::default()
+            maintain_order,
         };
 
         let res: NuLazyFrame = polars::prelude::concat(&dataframes, args)

From 4a967d19a9e5cae205ce426b646daa500ba33d06 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Thu, 20 Feb 2025 02:59:11 -0500
Subject: [PATCH 1068/1072] Remove BACKTRACE message for non-panic errors
 (#15143)

# Description

Resolves #15070 by removing the `BACKTRACE` message from all Nushell
(non-panic) errors. This was added in #14945 and is useful for
debugging, but not all that helpful to the typical shell user,
especially since most shell errors won't have a backtrace anyway.

At some point it would be nice to display this message only when there
*is* a backtrace available.

# User-Facing Changes

Error messages will be more concise.

# Tests + Formatting

Updated tests.

- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`

# After Submitting

We should include information in the *"Custom Commands"* chapter of the
documentation on how to enable this for debugging.
---
 crates/nu-protocol/src/errors/cli_error.rs | 4 ----
 crates/nu-protocol/tests/test_config.rs    | 3 +--
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/crates/nu-protocol/src/errors/cli_error.rs b/crates/nu-protocol/src/errors/cli_error.rs
index a53fec0600..7439d1df79 100644
--- a/crates/nu-protocol/src/errors/cli_error.rs
+++ b/crates/nu-protocol/src/errors/cli_error.rs
@@ -50,10 +50,6 @@ pub fn report_compile_error(working_set: &StateWorkingSet, error: &CompileError)
 
 fn report_error(working_set: &StateWorkingSet, error: &dyn miette::Diagnostic) {
     eprintln!("Error: {:?}", CliError(error, working_set));
-    let have_no_backtrace = working_set.get_env_var("NU_BACKTRACE").is_none();
-    if have_no_backtrace {
-        eprintln!("set the `NU_BACKTRACE=1` environment variable to display a backtrace.")
-    }
     // reset vt processing, aka ansi because illbehaved externals can break it
     #[cfg(windows)]
     {
diff --git a/crates/nu-protocol/tests/test_config.rs b/crates/nu-protocol/tests/test_config.rs
index 18e79635cf..49ad1cdec6 100644
--- a/crates/nu-protocol/tests/test_config.rs
+++ b/crates/nu-protocol/tests/test_config.rs
@@ -60,7 +60,7 @@ fn fancy_default_errors() {
 
     assert_eq!(
         actual.err,
-        "Error:   \u{1b}[31m×\u{1b}[0m oh no!\n   ╭─[\u{1b}[36;1;4mline2:1:13\u{1b}[0m]\n \u{1b}[2m1\u{1b}[0m │ force_error \"My error\"\n   · \u{1b}[35;1m            ─────┬────\u{1b}[0m\n   ·                  \u{1b}[35;1m╰── \u{1b}[35;1mhere's the error\u{1b}[0m\u{1b}[0m\n   ╰────\n\nset the `NU_BACKTRACE=1` environment variable to display a backtrace.\n"
+        "Error:   \u{1b}[31m×\u{1b}[0m oh no!\n   ╭─[\u{1b}[36;1;4mline2:1:13\u{1b}[0m]\n \u{1b}[2m1\u{1b}[0m │ force_error \"My error\"\n   · \u{1b}[35;1m            ─────┬────\u{1b}[0m\n   ·                  \u{1b}[35;1m╰── \u{1b}[35;1mhere's the error\u{1b}[0m\u{1b}[0m\n   ╰────\n\n"
     );
 }
 
@@ -92,7 +92,6 @@ snippet line 1: force_error "my error"
     label at line 1, columns 13 to 22: here's the error
 
 
-set the `NU_BACKTRACE=1` environment variable to display a backtrace.
 "#,
     );
 }

From 2f6b4c5e9bbd09b7c704e0b456eb817b4ac6c2de Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Thu, 20 Feb 2025 16:34:09 -0600
Subject: [PATCH 1069/1072] bump the rust toolchain to 1.83.0 (#15148)

# Description

This PR bumps the rust toolchain to 1.83.0 and fixes a clippy lint. We
do this because Rust 1.85.0 was released today, and we try and stay 2
versions behind.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 Cargo.toml                                         |  2 +-
 crates/nu-command/src/filesystem/cd.rs             |  6 ++++--
 crates/nu-command/src/filesystem/open.rs           |  2 +-
 crates/nu-command/src/filesystem/save.rs           |  4 +++-
 .../tests/commands/database/into_sqlite.rs         |  2 +-
 crates/nu-command/tests/commands/rm.rs             |  2 +-
 crates/nu-explore/src/views/record/table_widget.rs |  2 +-
 crates/nu-protocol/src/errors/shell_error/io.rs    |  8 --------
 crates/nu_plugin_query/src/query_webpage_info.rs   | 14 +++++++-------
 rust-toolchain.toml                                |  2 +-
 tests/repl/test_config_path.rs                     |  4 ++--
 11 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index d1950edf0f..7d453e7913 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ homepage = "https://www.nushell.sh"
 license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
-rust-version = "1.82.0"
+rust-version = "1.83.0"
 version = "0.102.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/crates/nu-command/src/filesystem/cd.rs b/crates/nu-command/src/filesystem/cd.rs
index c4f540010e..d8e6713199 100644
--- a/crates/nu-command/src/filesystem/cd.rs
+++ b/crates/nu-command/src/filesystem/cd.rs
@@ -77,7 +77,9 @@ impl Command for Cd {
                         if let Ok(path) = nu_path::canonicalize_with(path_no_whitespace, &cwd) {
                             if !path.is_dir() {
                                 return Err(shell_error::io::IoError::new(
-                                    shell_error::io::ErrorKind::NotADirectory,
+                                    shell_error::io::ErrorKind::Std(
+                                        std::io::ErrorKind::NotADirectory,
+                                    ),
                                     v.span,
                                     None,
                                 )
@@ -104,7 +106,7 @@ impl Command for Cd {
                         };
                         if !path.is_dir() {
                             return Err(shell_error::io::IoError::new(
-                                shell_error::io::ErrorKind::NotADirectory,
+                                shell_error::io::ErrorKind::Std(std::io::ErrorKind::NotADirectory),
                                 v.span,
                                 path,
                             )
diff --git a/crates/nu-command/src/filesystem/open.rs b/crates/nu-command/src/filesystem/open.rs
index f1ea73c6c8..2be2314835 100644
--- a/crates/nu-command/src/filesystem/open.rs
+++ b/crates/nu-command/src/filesystem/open.rs
@@ -151,7 +151,7 @@ impl Command for Open {
                         // At least under windows this check ensures that we don't get a
                         // permission denied error on directories
                         return Err(ShellError::Io(IoError::new(
-                            shell_error::io::ErrorKind::IsADirectory,
+                            shell_error::io::ErrorKind::Std(std::io::ErrorKind::IsADirectory),
                             arg_span,
                             PathBuf::from(path),
                         )));
diff --git a/crates/nu-command/src/filesystem/save.rs b/crates/nu-command/src/filesystem/save.rs
index bd580eec8c..1cbf75373f 100644
--- a/crates/nu-command/src/filesystem/save.rs
+++ b/crates/nu-command/src/filesystem/save.rs
@@ -424,7 +424,9 @@ fn open_file(path: &Path, span: Span, append: bool) -> Result<File, ShellError>
             // A TOCTOU problem exists here, which may cause wrong error message to be shown
             #[cfg(target_os = "windows")]
             if path.is_dir() {
-                Err(nu_protocol::shell_error::io::ErrorKind::IsADirectory)
+                Err(nu_protocol::shell_error::io::ErrorKind::Std(
+                    std::io::ErrorKind::IsADirectory,
+                ))
             } else {
                 std::fs::File::create(path).map_err(|err| err.kind().into())
             }
diff --git a/crates/nu-command/tests/commands/database/into_sqlite.rs b/crates/nu-command/tests/commands/database/into_sqlite.rs
index 5c0f5f6c60..856757e768 100644
--- a/crates/nu-command/tests/commands/database/into_sqlite.rs
+++ b/crates/nu-command/tests/commands/database/into_sqlite.rs
@@ -405,7 +405,7 @@ impl From<TestRow> for Value {
     }
 }
 
-impl<'r> TryFrom<&rusqlite::Row<'r>> for TestRow {
+impl TryFrom<&rusqlite::Row<'_>> for TestRow {
     type Error = rusqlite::Error;
 
     fn try_from(row: &rusqlite::Row) -> Result<Self, Self::Error> {
diff --git a/crates/nu-command/tests/commands/rm.rs b/crates/nu-command/tests/commands/rm.rs
index 3bfc093bd0..ca3b367a34 100644
--- a/crates/nu-command/tests/commands/rm.rs
+++ b/crates/nu-command/tests/commands/rm.rs
@@ -419,7 +419,7 @@ fn set_dir_read_only(directory: &AbsolutePath, read_only: bool) {
 }
 
 #[cfg(not(windows))]
-impl<'a> Drop for Cleanup<'a> {
+impl Drop for Cleanup<'_> {
     /// Restores write permissions to the given directory so that the Playground can be successfully
     /// cleaned up.
     fn drop(&mut self) {
diff --git a/crates/nu-explore/src/views/record/table_widget.rs b/crates/nu-explore/src/views/record/table_widget.rs
index 9f56702d0b..39ff34b4ec 100644
--- a/crates/nu-explore/src/views/record/table_widget.rs
+++ b/crates/nu-explore/src/views/record/table_widget.rs
@@ -87,7 +87,7 @@ impl StatefulWidget for TableWidget<'_> {
 }
 
 // todo: refactoring these to methods as they have quite a bit in common.
-impl<'a> TableWidget<'a> {
+impl TableWidget<'_> {
     // header at the top; header is always 1 line
     fn render_table_horizontal(self, area: Rect, buf: &mut Buffer, state: &mut TableWidgetState) {
         let padding_l = self.config.column_padding_left as u16;
diff --git a/crates/nu-protocol/src/errors/shell_error/io.rs b/crates/nu-protocol/src/errors/shell_error/io.rs
index 83836bff73..71b9726bc0 100644
--- a/crates/nu-protocol/src/errors/shell_error/io.rs
+++ b/crates/nu-protocol/src/errors/shell_error/io.rs
@@ -132,11 +132,7 @@ pub struct IoError {
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Diagnostic)]
 pub enum ErrorKind {
     Std(std::io::ErrorKind),
-    // TODO: in Rust 1.83 this can be std::io::ErrorKind::NotADirectory
-    NotADirectory,
     NotAFile,
-    // TODO: in Rust 1.83 this can be std::io::ErrorKind::IsADirectory
-    IsADirectory,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Error, Diagnostic)]
@@ -321,9 +317,7 @@ impl Display for ErrorKind {
                 let (first, rest) = msg.split_at(1);
                 write!(f, "{}{}", first.to_uppercase(), rest)
             }
-            ErrorKind::NotADirectory => write!(f, "Not a directory"),
             ErrorKind::NotAFile => write!(f, "Not a file"),
-            ErrorKind::IsADirectory => write!(f, "Is a directory"),
         }
     }
 }
@@ -357,9 +351,7 @@ impl Diagnostic for IoError {
                 std::io::ErrorKind::Other => code.push_str("other"),
                 kind => code.push_str(&kind.to_string().to_lowercase().replace(" ", "_")),
             },
-            ErrorKind::NotADirectory => code.push_str("not_a_directory"),
             ErrorKind::NotAFile => code.push_str("not_a_file"),
-            ErrorKind::IsADirectory => code.push_str("is_a_directory"),
         }
 
         Some(Box::new(code))
diff --git a/crates/nu_plugin_query/src/query_webpage_info.rs b/crates/nu_plugin_query/src/query_webpage_info.rs
index 74a7be94c3..2c8bb4de23 100644
--- a/crates/nu_plugin_query/src/query_webpage_info.rs
+++ b/crates/nu_plugin_query/src/query_webpage_info.rs
@@ -302,7 +302,7 @@ impl<'a> MapSerializer<'a> {
     }
 }
 
-impl<'a> serde::ser::SerializeStruct for MapSerializer<'a> {
+impl serde::ser::SerializeStruct for MapSerializer<'_> {
     type Ok = Value;
     type Error = Error;
 
@@ -320,7 +320,7 @@ impl<'a> serde::ser::SerializeStruct for MapSerializer<'a> {
     }
 }
 
-impl<'a> serde::ser::SerializeMap for MapSerializer<'a> {
+impl serde::ser::SerializeMap for MapSerializer<'_> {
     type Ok = Value;
     type Error = Error;
 
@@ -351,7 +351,7 @@ impl<'a> serde::ser::SerializeMap for MapSerializer<'a> {
     }
 }
 
-impl<'a> serde::ser::SerializeStructVariant for MapSerializer<'a> {
+impl serde::ser::SerializeStructVariant for MapSerializer<'_> {
     type Ok = Value;
     type Error = Error;
 
@@ -385,7 +385,7 @@ impl<'a> SeqSerializer<'a> {
     }
 }
 
-impl<'a> serde::ser::SerializeSeq for SeqSerializer<'a> {
+impl serde::ser::SerializeSeq for SeqSerializer<'_> {
     type Ok = Value;
     type Error = Error;
 
@@ -402,7 +402,7 @@ impl<'a> serde::ser::SerializeSeq for SeqSerializer<'a> {
     }
 }
 
-impl<'a> serde::ser::SerializeTuple for SeqSerializer<'a> {
+impl serde::ser::SerializeTuple for SeqSerializer<'_> {
     type Ok = Value;
     type Error = Error;
 
@@ -419,7 +419,7 @@ impl<'a> serde::ser::SerializeTuple for SeqSerializer<'a> {
     }
 }
 
-impl<'a> serde::ser::SerializeTupleStruct for SeqSerializer<'a> {
+impl serde::ser::SerializeTupleStruct for SeqSerializer<'_> {
     type Ok = Value;
     type Error = Error;
 
@@ -436,7 +436,7 @@ impl<'a> serde::ser::SerializeTupleStruct for SeqSerializer<'a> {
     }
 }
 
-impl<'a> serde::ser::SerializeTupleVariant for SeqSerializer<'a> {
+impl serde::ser::SerializeTupleVariant for SeqSerializer<'_> {
     type Ok = Value;
     type Error = Error;
 
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 3c1ce2370b..2f6272a99b 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -16,4 +16,4 @@ profile = "default"
 # use in nushell, we may opt to use the bleeding edge stable version of rust.
 # I believe rust is on a 6 week release cycle and nushell is on a 4 week release cycle.
 # So, every two nushell releases, this version number should be bumped by one.
-channel = "1.82.0"
+channel = "1.83.0"
diff --git a/tests/repl/test_config_path.rs b/tests/repl/test_config_path.rs
index 29c090db17..8ed90f913a 100644
--- a/tests/repl/test_config_path.rs
+++ b/tests/repl/test_config_path.rs
@@ -78,9 +78,9 @@ fn run_interactive_stderr(xdg_config_home: impl AsRef<Path>) -> String {
         .output()
         .expect("Should have outputted");
 
-    return String::from_utf8_lossy(&child_output.stderr)
+    String::from_utf8_lossy(&child_output.stderr)
         .trim()
-        .to_string();
+        .to_string()
 }
 
 fn test_config_path_helper(

From d16946c6e8bfe230893242b04c5f166adacd5b56 Mon Sep 17 00:00:00 2001
From: Renan Ribeiro <55855728+cosineblast@users.noreply.github.com>
Date: Fri, 21 Feb 2025 01:34:26 -0300
Subject: [PATCH 1070/1072] Transpose now rejects streams with non-record
 values (#15151)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description

Closes #13765

Transpose now checks if the input consists entirely of records before
doing its things, which is fine since it already `.collects()` all of
its input already.

<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting

Adds `rejects_non_table_stream_input` test to cover regressions.
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/filters/transpose.rs    | 20 +++++++++++++++----
 crates/nu-command/tests/commands/transpose.rs |  8 ++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/crates/nu-command/src/filters/transpose.rs b/crates/nu-command/src/filters/transpose.rs
index 873a21c90d..a85e95863e 100644
--- a/crates/nu-command/src/filters/transpose.rs
+++ b/crates/nu-command/src/filters/transpose.rs
@@ -175,10 +175,22 @@ pub fn transpose(
 
     let metadata = input.metadata();
     let input: Vec<_> = input.into_iter().collect();
-    // Ensure error values are propagated
-    for i in input.iter() {
-        if let Value::Error { .. } = i {
-            return Ok(i.clone().into_pipeline_data_with_metadata(metadata));
+
+    // Ensure error values are propagated and non-record values are rejected
+    for value in input.iter() {
+        match value {
+            Value::Error { .. } => {
+                return Ok(value.clone().into_pipeline_data_with_metadata(metadata))
+            }
+            Value::Record { .. } => {} // go on, this is what we're looking for
+            _ => {
+                return Err(ShellError::OnlySupportsThisInputType {
+                    exp_input_type: "table or record".into(),
+                    wrong_type: "list<any>".into(),
+                    dst_span: call.head,
+                    src_span: value.span(),
+                })
+            }
         }
     }
 
diff --git a/crates/nu-command/tests/commands/transpose.rs b/crates/nu-command/tests/commands/transpose.rs
index 29a7632af3..c4448fdaf6 100644
--- a/crates/nu-command/tests/commands/transpose.rs
+++ b/crates/nu-command/tests/commands/transpose.rs
@@ -32,3 +32,11 @@ fn throw_inner_error() {
 
     assert!(actual.err.contains(error.as_str()));
 }
+
+#[test]
+fn rejects_non_table_stream_input() {
+    let actual = nu!("[1 2 3] | each { |it| ($it * 2) } | transpose | to nuon");
+
+    assert!(actual.out.is_empty());
+    assert!(actual.err.contains("only table"));
+}

From 1d4484397092907deca96fb116646abe575cfcd8 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Fri, 21 Feb 2025 10:08:10 -0500
Subject: [PATCH 1071/1072] Remove inheritance for PROMPT variables created in
 `default_env.nu` (#15130)

This PR always sets a fresh `PROMPT_COMMAND` and `PROMPT_COMMAND_RIGHT`
during startup in `default_env.nu`. This is a more "sensible default",
and can then be overridden with user config later in the startup.
---
 crates/nu-utils/src/default_files/default_env.nu | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/nu-utils/src/default_files/default_env.nu b/crates/nu-utils/src/default_files/default_env.nu
index c5302ef4dd..f4582825c0 100644
--- a/crates/nu-utils/src/default_files/default_env.nu
+++ b/crates/nu-utils/src/default_files/default_env.nu
@@ -3,7 +3,7 @@
 #
 # version = "0.102.1"
 
-$env.PROMPT_COMMAND = $env.PROMPT_COMMAND? | default {||
+$env.PROMPT_COMMAND = {||
     let dir = match (do -i { $env.PWD | path relative-to $nu.home-path }) {
         null => $env.PWD
         '' => '~'
@@ -17,7 +17,7 @@ $env.PROMPT_COMMAND = $env.PROMPT_COMMAND? | default {||
     $path_segment | str replace --all (char path_sep) $"($separator_color)(char path_sep)($path_color)"
 }
 
-$env.PROMPT_COMMAND_RIGHT = $env.PROMPT_COMMAND_RIGHT? | default {||
+$env.PROMPT_COMMAND_RIGHT = {||
     # create a right prompt in magenta with green separators and am/pm underlined
     let time_segment = ([
         (ansi reset)

From bda324572501565597cd8ac36bec3ce4d8c36741 Mon Sep 17 00:00:00 2001
From: Piepmatz <git+github@cptpiepmatz.de>
Date: Sat, 22 Feb 2025 17:42:44 +0100
Subject: [PATCH 1072/1072] More precise `ErrorKind::NotFound` errors (#15149)

In this PR, the two new variants for `ErrorKind`, `FileNotFound`
and `DirectoryNotFound` with a nice `not_found_as` method for the
`ErrorKind` to easily specify the `NotFound` errors. I also updated some
places where I could of think of with these new variants and the message
for `NotFound` is no longer "Entity not found" but "Not found" to be
less strange.

closes #15142
closes #15055
---
 crates/nu-cli/src/eval_file.rs                |   8 +-
 .../nu-command/src/env/config/config_reset.rs |  10 +-
 crates/nu-command/src/filesystem/cd.rs        |   4 +-
 crates/nu-command/src/filesystem/open.rs      |   1 +
 crates/nu-command/src/misc/source.rs          |   9 +-
 crates/nu-command/src/system/nu_check.rs      |   4 +-
 crates/nu-command/tests/commands/cd.rs        |   2 +-
 crates/nu-command/tests/commands/nu_check.rs  |   2 +-
 crates/nu-command/tests/commands/open.rs      |   2 +-
 crates/nu-engine/src/command_prelude.rs       |   2 +-
 crates/nu-engine/src/env.rs                   |   6 +-
 .../nu-protocol/src/errors/shell_error/io.rs  | 121 ++++++++++++++++--
 src/ide.rs                                    |   4 +-
 13 files changed, 139 insertions(+), 36 deletions(-)

diff --git a/crates/nu-cli/src/eval_file.rs b/crates/nu-cli/src/eval_file.rs
index 8a761df0a9..f302111b93 100644
--- a/crates/nu-cli/src/eval_file.rs
+++ b/crates/nu-cli/src/eval_file.rs
@@ -8,7 +8,7 @@ use nu_protocol::{
     debugger::WithoutDebug,
     engine::{EngineState, Stack, StateWorkingSet},
     report_parse_error, report_parse_warning,
-    shell_error::io::IoError,
+    shell_error::io::*,
     PipelineData, ShellError, Span, Value,
 };
 use std::{path::PathBuf, sync::Arc};
@@ -28,7 +28,7 @@ pub fn evaluate_file(
 
     let file_path = canonicalize_with(&path, cwd).map_err(|err| {
         IoError::new_internal_with_path(
-            err.kind(),
+            err.kind().not_found_as(NotFound::File),
             "Could not access file",
             nu_protocol::location!(),
             PathBuf::from(&path),
@@ -47,7 +47,7 @@ pub fn evaluate_file(
 
     let file = std::fs::read(&file_path).map_err(|err| {
         IoError::new_internal_with_path(
-            err.kind(),
+            err.kind().not_found_as(NotFound::File),
             "Could not read file",
             nu_protocol::location!(),
             file_path.clone(),
@@ -57,7 +57,7 @@ pub fn evaluate_file(
 
     let parent = file_path.parent().ok_or_else(|| {
         IoError::new_internal_with_path(
-            std::io::ErrorKind::NotFound,
+            ErrorKind::DirectoryNotFound,
             "The file path does not have a parent",
             nu_protocol::location!(),
             file_path.clone(),
diff --git a/crates/nu-command/src/env/config/config_reset.rs b/crates/nu-command/src/env/config/config_reset.rs
index 5215ac6a1d..eeed056812 100644
--- a/crates/nu-command/src/env/config/config_reset.rs
+++ b/crates/nu-command/src/env/config/config_reset.rs
@@ -1,7 +1,5 @@
 use chrono::Local;
 use nu_engine::command_prelude::*;
-
-use nu_protocol::shell_error::io::IoError;
 use nu_utils::{get_scaffold_config, get_scaffold_env};
 use std::{io::Write, path::PathBuf};
 
@@ -61,7 +59,7 @@ impl Command for ConfigReset {
                 ));
                 if let Err(err) = std::fs::rename(nu_config.clone(), &backup_path) {
                     return Err(ShellError::Io(IoError::new_with_additional_context(
-                        err.kind(),
+                        err.kind().not_found_as(NotFound::Directory),
                         span,
                         PathBuf::from(backup_path),
                         "config.nu could not be backed up",
@@ -71,7 +69,7 @@ impl Command for ConfigReset {
             if let Ok(mut file) = std::fs::File::create(&nu_config) {
                 if let Err(err) = writeln!(&mut file, "{config_file}") {
                     return Err(ShellError::Io(IoError::new_with_additional_context(
-                        err.kind(),
+                        err.kind().not_found_as(NotFound::File),
                         span,
                         PathBuf::from(nu_config),
                         "config.nu could not be written to",
@@ -88,7 +86,7 @@ impl Command for ConfigReset {
                 backup_path.push(format!("oldenv-{}.nu", Local::now().format("%F-%H-%M-%S"),));
                 if let Err(err) = std::fs::rename(env_config.clone(), &backup_path) {
                     return Err(ShellError::Io(IoError::new_with_additional_context(
-                        err.kind(),
+                        err.kind().not_found_as(NotFound::Directory),
                         span,
                         PathBuf::from(backup_path),
                         "env.nu could not be backed up",
@@ -98,7 +96,7 @@ impl Command for ConfigReset {
             if let Ok(mut file) = std::fs::File::create(&env_config) {
                 if let Err(err) = writeln!(&mut file, "{config_file}") {
                     return Err(ShellError::Io(IoError::new_with_additional_context(
-                        err.kind(),
+                        err.kind().not_found_as(NotFound::File),
                         span,
                         PathBuf::from(env_config),
                         "env.nu could not be written to",
diff --git a/crates/nu-command/src/filesystem/cd.rs b/crates/nu-command/src/filesystem/cd.rs
index d8e6713199..5ef3e4eb5e 100644
--- a/crates/nu-command/src/filesystem/cd.rs
+++ b/crates/nu-command/src/filesystem/cd.rs
@@ -88,7 +88,7 @@ impl Command for Cd {
                             path
                         } else {
                             return Err(shell_error::io::IoError::new(
-                                std::io::ErrorKind::NotFound,
+                                ErrorKind::DirectoryNotFound,
                                 v.span,
                                 PathBuf::from(path_no_whitespace),
                             )
@@ -98,7 +98,7 @@ impl Command for Cd {
                         let path = nu_path::expand_path_with(path_no_whitespace, &cwd, true);
                         if !path.exists() {
                             return Err(shell_error::io::IoError::new(
-                                std::io::ErrorKind::NotFound,
+                                ErrorKind::DirectoryNotFound,
                                 v.span,
                                 PathBuf::from(path_no_whitespace),
                             )
diff --git a/crates/nu-command/src/filesystem/open.rs b/crates/nu-command/src/filesystem/open.rs
index 2be2314835..27dbf5723a 100644
--- a/crates/nu-command/src/filesystem/open.rs
+++ b/crates/nu-command/src/filesystem/open.rs
@@ -98,6 +98,7 @@ impl Command for Open {
             for path in nu_engine::glob_from(&path, &cwd, call_span, None)
                 .map_err(|err| match err {
                     ShellError::Io(mut err) => {
+                        err.kind = err.kind.not_found_as(NotFound::File);
                         err.span = arg_span;
                         err.into()
                     }
diff --git a/crates/nu-command/src/misc/source.rs b/crates/nu-command/src/misc/source.rs
index de692c557c..d507345f6e 100644
--- a/crates/nu-command/src/misc/source.rs
+++ b/crates/nu-command/src/misc/source.rs
@@ -55,8 +55,13 @@ impl Command for Source {
         let cwd = engine_state.cwd_as_string(Some(stack))?;
         let pb = std::path::PathBuf::from(block_id_name);
         let parent = pb.parent().unwrap_or(std::path::Path::new(""));
-        let file_path = canonicalize_with(pb.as_path(), cwd)
-            .map_err(|err| IoError::new(err.kind(), call.head, pb.clone()))?;
+        let file_path = canonicalize_with(pb.as_path(), cwd).map_err(|err| {
+            IoError::new(
+                err.kind().not_found_as(NotFound::File),
+                call.head,
+                pb.clone(),
+            )
+        })?;
 
         // Note: We intentionally left out PROCESS_PATH since it's supposed to
         // to work like argv[0] in C, which is the name of the program being executed.
diff --git a/crates/nu-command/src/system/nu_check.rs b/crates/nu-command/src/system/nu_check.rs
index d988974589..8280232c1a 100644
--- a/crates/nu-command/src/system/nu_check.rs
+++ b/crates/nu-command/src/system/nu_check.rs
@@ -98,7 +98,7 @@ impl Command for NuCheck {
                         Ok(Some(path)) => path,
                         Ok(None) => {
                             return Err(ShellError::Io(IoError::new(
-                                std::io::ErrorKind::NotFound,
+                                ErrorKind::FileNotFound,
                                 path_span,
                                 PathBuf::from(path_str.item),
                             )))
@@ -255,7 +255,7 @@ fn parse_file_script(
     match std::fs::read(path) {
         Ok(contents) => parse_script(working_set, Some(&filename), &contents, is_debug, call_head),
         Err(err) => Err(ShellError::Io(IoError::new(
-            err.kind(),
+            err.kind().not_found_as(NotFound::File),
             path_span,
             PathBuf::from(path),
         ))),
diff --git a/crates/nu-command/tests/commands/cd.rs b/crates/nu-command/tests/commands/cd.rs
index 7dd648d135..2ad25f5aa6 100644
--- a/crates/nu-command/tests/commands/cd.rs
+++ b/crates/nu-command/tests/commands/cd.rs
@@ -210,7 +210,7 @@ fn filesystem_directory_not_found() {
             actual.err
         );
         assert!(
-            actual.err.contains("nu::shell::io::not_found"),
+            actual.err.contains("nu::shell::io::directory_not_found"),
             "actual={:?}",
             actual.err
         );
diff --git a/crates/nu-command/tests/commands/nu_check.rs b/crates/nu-command/tests/commands/nu_check.rs
index 971349778e..ed082aeedc 100644
--- a/crates/nu-command/tests/commands/nu_check.rs
+++ b/crates/nu-command/tests/commands/nu_check.rs
@@ -172,7 +172,7 @@ fn file_not_exist() {
             "
         ));
 
-        assert!(actual.err.contains("nu::shell::io::not_found"));
+        assert!(actual.err.contains("nu::shell::io::file_not_found"));
     })
 }
 
diff --git a/crates/nu-command/tests/commands/open.rs b/crates/nu-command/tests/commands/open.rs
index 09df04b97a..529da6c28c 100644
--- a/crates/nu-command/tests/commands/open.rs
+++ b/crates/nu-command/tests/commands/open.rs
@@ -251,7 +251,7 @@ fn errors_if_file_not_found() {
     // This seems to be not directly affected by localization compared to the OS
     // provided error message
 
-    assert!(actual.err.contains("nu::shell::io::not_found"));
+    assert!(actual.err.contains("nu::shell::io::file_not_found"));
     assert!(actual.err.contains(
         &PathBuf::from_iter(["tests", "fixtures", "formats", "i_dont_exist.txt"])
             .display()
diff --git a/crates/nu-engine/src/command_prelude.rs b/crates/nu-engine/src/command_prelude.rs
index 9b9ed40477..39124af1d4 100644
--- a/crates/nu-engine/src/command_prelude.rs
+++ b/crates/nu-engine/src/command_prelude.rs
@@ -3,7 +3,7 @@ pub use nu_protocol::{
     ast::CellPath,
     engine::{Call, Command, EngineState, Stack, StateWorkingSet},
     record,
-    shell_error::io::IoError,
+    shell_error::io::*,
     ByteStream, ByteStreamType, Category, ErrSpan, Example, IntoInterruptiblePipelineData,
     IntoPipelineData, IntoSpanned, IntoValue, PipelineData, Record, ShellError, Signature, Span,
     Spanned, SyntaxShape, Type, Value,
diff --git a/crates/nu-engine/src/env.rs b/crates/nu-engine/src/env.rs
index 2c4aec9fb3..5a2a201911 100644
--- a/crates/nu-engine/src/env.rs
+++ b/crates/nu-engine/src/env.rs
@@ -3,7 +3,7 @@ use nu_path::canonicalize_with;
 use nu_protocol::{
     ast::Expr,
     engine::{Call, EngineState, Stack, StateWorkingSet},
-    shell_error::io::IoError,
+    shell_error::io::{ErrorKindExt, IoError, NotFound},
     ShellError, Span, Type, Value, VarId,
 };
 use std::{
@@ -221,7 +221,7 @@ pub fn current_dir(engine_state: &EngineState, stack: &Stack) -> Result<PathBuf,
     // be an absolute path already.
     canonicalize_with(&cwd, ".").map_err(|err| {
         ShellError::Io(IoError::new_internal_with_path(
-            err.kind(),
+            err.kind().not_found_as(NotFound::Directory),
             "Could not canonicalize current dir",
             nu_protocol::location!(),
             PathBuf::from(cwd),
@@ -241,7 +241,7 @@ pub fn current_dir_const(working_set: &StateWorkingSet) -> Result<PathBuf, Shell
     // be an absolute path already.
     canonicalize_with(&cwd, ".").map_err(|err| {
         ShellError::Io(IoError::new_internal_with_path(
-            err.kind(),
+            err.kind().not_found_as(NotFound::Directory),
             "Could not canonicalize current dir",
             nu_protocol::location!(),
             PathBuf::from(cwd),
diff --git a/crates/nu-protocol/src/errors/shell_error/io.rs b/crates/nu-protocol/src/errors/shell_error/io.rs
index 71b9726bc0..6ad8935685 100644
--- a/crates/nu-protocol/src/errors/shell_error/io.rs
+++ b/crates/nu-protocol/src/errors/shell_error/io.rs
@@ -1,6 +1,7 @@
 use miette::{Diagnostic, LabeledSpan, SourceSpan};
 use std::{
-    fmt::Display,
+    error::Error as StdError,
+    fmt::{self, Display, Formatter},
     path::{Path, PathBuf},
 };
 use thiserror::Error;
@@ -37,11 +38,7 @@ use super::{location::Location, ShellError};
 ///
 /// # let span = Span::test_data();
 /// let path = PathBuf::from("/some/missing/file");
-/// let error = IoError::new(
-///     std::io::ErrorKind::NotFound,
-///     span,
-///     path
-/// );
+/// let error = IoError::new(std::io::ErrorKind::NotFound, span, path);
 /// println!("Error: {:?}", error);
 /// ```
 ///
@@ -87,9 +84,8 @@ use super::{location::Location, ShellError};
 /// This approach ensures clarity about where such container transfers occur.
 /// All other I/O errors should be handled using the provided constructors for `IoError`.
 /// This way, the code explicitly indicates when and where a `ShellError` transfer might happen.
-#[derive(Debug, Clone, Error, PartialEq)]
+#[derive(Debug, Clone, PartialEq)]
 #[non_exhaustive]
-#[error("I/O error")]
 pub struct IoError {
     /// The type of the underlying I/O error.
     ///
@@ -133,6 +129,9 @@ pub struct IoError {
 pub enum ErrorKind {
     Std(std::io::ErrorKind),
     NotAFile,
+    // use these variants in cases where we know precisely whether a file or directory was expected
+    FileNotFound,
+    DirectoryNotFound,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Error, Diagnostic)]
@@ -269,8 +268,8 @@ impl IoError {
     ///
     /// # Examples
     /// ```rust
-    /// use std::path::PathBuf;
     /// use nu_protocol::shell_error::io::IoError;
+    /// use std::path::PathBuf;
     ///
     /// let error = IoError::new_internal_with_path(
     ///     std::io::ErrorKind::NotFound,
@@ -309,15 +308,30 @@ impl IoError {
     }
 }
 
+impl StdError for IoError {}
+impl Display for IoError {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        match self.kind {
+            ErrorKind::Std(std::io::ErrorKind::NotFound) => write!(f, "Not found"),
+            ErrorKind::FileNotFound => write!(f, "File not found"),
+            ErrorKind::DirectoryNotFound => write!(f, "Directory not found"),
+            _ => write!(f, "I/O error"),
+        }
+    }
+}
+
 impl Display for ErrorKind {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         match self {
+            ErrorKind::Std(std::io::ErrorKind::NotFound) => write!(f, "Not found"),
             ErrorKind::Std(error_kind) => {
                 let msg = error_kind.to_string();
                 let (first, rest) = msg.split_at(1);
                 write!(f, "{}{}", first.to_uppercase(), rest)
             }
             ErrorKind::NotAFile => write!(f, "Not a file"),
+            ErrorKind::FileNotFound => write!(f, "File not found"),
+            ErrorKind::DirectoryNotFound => write!(f, "Directory not found"),
         }
     }
 }
@@ -352,15 +366,28 @@ impl Diagnostic for IoError {
                 kind => code.push_str(&kind.to_string().to_lowercase().replace(" ", "_")),
             },
             ErrorKind::NotAFile => code.push_str("not_a_file"),
+            ErrorKind::FileNotFound => code.push_str("file_not_found"),
+            ErrorKind::DirectoryNotFound => code.push_str("directory_not_found"),
         }
 
         Some(Box::new(code))
     }
 
     fn help<'a>(&'a self) -> Option<Box<dyn std::fmt::Display + 'a>> {
+        let make_msg = |path: &Path| {
+            let path = format!("'{}'", path.display());
+            match self.kind {
+                ErrorKind::NotAFile => format!("{path} is not a file"),
+                ErrorKind::Std(std::io::ErrorKind::NotFound)
+                | ErrorKind::FileNotFound
+                | ErrorKind::DirectoryNotFound => format!("{path} does not exist"),
+                _ => format!("The error occurred at {path}"),
+            }
+        };
+
         self.path
             .as_ref()
-            .map(|path| format!("The error occurred at '{}'", path.display()))
+            .map(|path| make_msg(path))
             .map(|s| Box::new(s) as Box<dyn std::fmt::Display>)
     }
 
@@ -417,3 +444,75 @@ impl From<ErrorKind> for std::io::ErrorKind {
         }
     }
 }
+
+/// More specific variants of [`NotFound`](std::io::ErrorKind).
+///
+/// Use these to define how a `NotFound` error maps to our custom [`ErrorKind`].
+pub enum NotFound {
+    /// Map into [`FileNotFound`](ErrorKind::FileNotFound).
+    File,
+    /// Map into [`DirectoryNotFound`](ErrorKind::DirectoryNotFound).
+    Directory,
+}
+
+/// Extension trait for working with [`std::io::ErrorKind`].
+pub trait ErrorKindExt {
+    /// Map [`NotFound`](std::io::ErrorKind) variants into more precise variants.
+    ///
+    /// The OS doesn't know when an entity was not found whether it was meant to be a file or a
+    /// directory or something else.
+    /// But sometimes we, the application, know what we expect and with this method, we can further
+    /// specify it.
+    ///
+    /// # Examples
+    /// Reading a file.
+    /// If the file isn't found, return [`FileNotFound`](ErrorKind::FileNotFound).
+    /// ```rust
+    /// # use nu_protocol::{
+    /// #     shell_error::io::{ErrorKind, ErrorKindExt, IoError, NotFound},
+    /// #     ShellError, Span,
+    /// # };
+    /// # use std::{fs, path::PathBuf};
+    /// #
+    /// # fn example() -> Result<(), ShellError> {
+    /// #     let span = Span::test_data();
+    /// let a_file = PathBuf::from("scripts/ellie.nu");
+    /// let ellie = fs::read_to_string(&a_file).map_err(|err| {
+    ///     ShellError::Io(IoError::new(
+    ///         err.kind().not_found_as(NotFound::File),
+    ///         span,
+    ///         a_file,
+    ///     ))
+    /// })?;
+    /// #     Ok(())
+    /// # }
+    /// #
+    /// # assert!(matches!(
+    /// #     example(),
+    /// #     Err(ShellError::Io(IoError {
+    /// #         kind: ErrorKind::FileNotFound,
+    /// #         ..
+    /// #     }))
+    /// # ));
+    /// ```
+    fn not_found_as(self, kind: NotFound) -> ErrorKind;
+}
+
+impl ErrorKindExt for std::io::ErrorKind {
+    fn not_found_as(self, kind: NotFound) -> ErrorKind {
+        match (kind, self) {
+            (NotFound::File, Self::NotFound) => ErrorKind::FileNotFound,
+            (NotFound::Directory, Self::NotFound) => ErrorKind::DirectoryNotFound,
+            _ => ErrorKind::Std(self),
+        }
+    }
+}
+
+impl ErrorKindExt for ErrorKind {
+    fn not_found_as(self, kind: NotFound) -> ErrorKind {
+        match self {
+            Self::Std(std_kind) => std_kind.not_found_as(kind),
+            _ => self,
+        }
+    }
+}
diff --git a/src/ide.rs b/src/ide.rs
index 6ce7e69c6f..8d64fdd487 100644
--- a/src/ide.rs
+++ b/src/ide.rs
@@ -4,7 +4,7 @@ use nu_parser::{flatten_block, parse, FlatShape};
 use nu_protocol::{
     engine::{EngineState, Stack, StateWorkingSet},
     report_shell_error,
-    shell_error::io::IoError,
+    shell_error::io::{ErrorKindExt, IoError, NotFound},
     DeclId, ShellError, Span, Value, VarId,
 };
 use reedline::Completer;
@@ -58,7 +58,7 @@ fn read_in_file<'a>(
     let file = std::fs::read(file_path)
         .map_err(|err| {
             ShellError::Io(IoError::new_with_additional_context(
-                err.kind(),
+                err.kind().not_found_as(NotFound::File),
                 Span::unknown(),
                 PathBuf::from(file_path),
                 "Could not read file",